Index: tags/2.0.1/AUTHORS
===================================================================
--- tags/2.0.1/AUTHORS	(nonexistent)
+++ tags/2.0.1/AUTHORS	(revision 18980)
@@ -0,0 +1,13 @@
+pcb-rnd maintainer: Tibor 'Igor2' Palinkas
+email:      pcb-rnd (at) igor2.repo.hu
+Chat, IRC:  http://repo.hu/projects/pcb-rnd/irc.html
+
+An always up-to-date list of developers and contributors can be found at
+http://repo.hu/cgi-bin/pcb-rnd-people.cgi
+
+PCB was originally written by Thomas Nau
+Development was later taken over by harry eaton
+The port to GTK was done by Bill Wilson
+Dan McMahill converted the build system from imake to autoconf/automake.
+DJ Delorie wrote the trace optimizer, added symbolic flag support and
+many other improvements.
Index: tags/2.0.1/COPYING
===================================================================
--- tags/2.0.1/COPYING	(nonexistent)
+++ tags/2.0.1/COPYING	(revision 18980)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser 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 General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new 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 you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive 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) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice 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 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 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 at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be 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, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy 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 sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the 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 rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the 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 Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the 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 from a designated place, then offering equivalent
+access to copy the source 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 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.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the 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 particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain 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 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the 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 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE 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.
+
+                     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
+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.>
+    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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+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 called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+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 Lesser General
+Public License instead of this License.
Index: tags/2.0.1/Changelog
===================================================================
--- tags/2.0.1/Changelog	(nonexistent)
+++ tags/2.0.1/Changelog	(revision 18980)
@@ -0,0 +1,866 @@
+pcb-rnd 2.0.1 (r18980)
+~~~~~~~~~~~~~~~~~~~~~~
+	[bbox]
+		-Add: naked bbox for every object (does not include clearance or other invisible effects)
+
+	[cam]
+		-Add: common interface to tell export plugins what layers to export in which file
+
+	[cli]
+		-Add: multi-language/multi-syntax CLI
+		-Add: configurable prompt
+		-Add: hid_gtk* includes the cli prompt
+		-Add: hid_batch includes the cli prompt
+		-Add: hid_lesstif prints the central prompt
+		-Add: mode stack with mode enter/leave helpers
+
+	[conf]
+		-Del: default_layer_name[] - should be coming from the default board, code shouldn't assume uninitialized layers have initialized layer names
+		-Del: default groups from config - depend on default board instead
+		-Del: route styles from the config - default board should bring it
+		-Del: via-specific select color
+		-Del: remove pin-specific selected color
+		-Del: remove subc-specific selected color
+		-Del: element selected color
+		-Del: remove rat-specific selected color
+		-Del: obsolete color setting: element-nonetlist
+		-Del: unused color conf node: black
+		-Del: remove the white color (not used)
+		-Del: remove unused color.invisible_mark
+
+	[core]
+		-Optimize: implement dynamic Level-of-Details in text rendering - draw less lines for small text
+		-Optimize: dynamic level-of-detail for padstack marks
+		-Optimize: thin draw poly contour: level-of-detail control: skip points too dense
+		-Optimize: draw helper poly clipping: if a polygon is fully within the clip box, do not do the expensive clipping
+		-Optimize: level-of-detail control for subc dashed bbox
+		-Optimize: draw logics: use cheaper storage for do_group
+		-Optimize: cheaper return from width calculation if string is NULL
+		-Optimize: simpler, cheaper term label draw with low level text draw call
+		-Cleanup: memory leak in path subst
+		-Cleanup: memory leak on conflist overwrite
+		-Cleanup: memory leak: uninit ui layers
+		-Cleanup: memory leak on dynamic hid callbacks on native config nodes
+		-Cleanup: memory leak: conf files hash
+		-Cleanup: memory leak on board dummy layers
+		-Cleanup: memory leak on plugin dir init
+		-Cleanup: pcb_lrealpath contains an strdup, an extra strdup on caller's side makes a mem leak
+		-Cleanup: memory leak on pcb_snprintf
+		-Cleanup: memory leak on hid cfg init by brave.c
+		-Cleanup: memory leak in layer vis hid reg
+		-Cleanup: layer name memory leak
+		-Cleanup: memory leaks in pcb_snprintf() and pcb_vsnprintf()
+		-Cleanup: rtree memory leak
+		-Cleanup: find.c memory leak on padstack lists
+		-Fix: label text centering corner case on mirrored view and vertical text
+		-Fix: delayed heavy terminal draw for polygon, text, line, arc
+		-Fix: do not call pcb_notify_crosshair_change(pcb_true) twice in a row when the crosshair moves - this is an error condition that will lead to most HIDs doing an expensive full redraw
+		-Fix: when an object is selected or unselected, make sure it is redrawn
+		-Fix: restore the crosshair colour after drawing the drc outline around the line shape
+		-Fix: restore the crosshair colour after drawing the drc outline for an attached arc tool shape
+		-Fix: FreeRotateBuffer() refuses to rotate angles too large (to avoid double precision floating number instability)
+		-Fix: mark the board changed on layer group operations that changes the layer stackup
+		-Fix: When drawing the UI layer, call set_drawing_mode (flush) before calling end_layer, instead of after.
+		-Fix: find.c padstack intersection bug: circular shape vs. arc typos made intersections not detected
+		-Fix: don't call NetlistShow() if there's no net name available
+		-Fix: make sure the board's file format is not affected by a backup save
+		-Fix: copy+paste crosshair range uses the naked bbox of the buffer, allowing objects to be moved near the edge of the drawing area even if clearance is beyond the drawing area
+		-Fix: don't use O(n^2) algo for finding duplicate arcs when we have rtrees
+		-Fix: crosshair saves original object x;y only on move-start so it doesn't interfere with the original functionality
+		-Fix: also set tx;ty to the current crosshair coord before a move so a double click doesn't reuse an old target coord from the previous operation (or a 0;0 in the first op)
+		-Fix: PromptFor() should return a string
+		-Fix: redraw the screen after buffer operations (should fix delayed draw on lesstif/irix)
+		-Fix: arrow tool: remember click coords even before the mouse is moved; fixes random object jumpyness on click-move-in-place
+		-Fix: pstk's flag change op shouldn't quit if padstack is locked - let the higher-level caller decide whether locked objects should be ignored
+		-Fix: allow locked objects to be deselected, not "locking the selected flag"
+		-Fix: locked objects shouldn't be removed on move or cut-to-buffer operations
+		-Fix: when a new board is loaded, rebind all buffer layers to avoid dangling bound layer pointers (still pointing to the previous boards' layers)
+		-Fix: text, arc, poly low level move should update naked bbox as well
+		-Fix: text bbox calculation typo with arc's Y
+		-Del: remove the erase color - with the drawing mode API the rendering mechanism doesn't depend on this hack any more
+		-Del: holes_after mechanism from the rendering code: always assume it is set to 1
+		-Del: remove SelectedElements from Flip() action's syntax description (old terminology)
+		-Del: action handler for ExecCommand - merged with System()
+		-Del: action_act.c and action_helper.c
+		-Del: all-in-one about box content string (last user was the lesstif hid's home-grown about box)
+		-Move: pcb_act_PCBChanged() to oldactions
+		-Move: pcb_act_RouteStylesChanged(), pcb_act_NetlistChanged() and pcb_act_LibraryChanged to oldactions (pcb-rnd has an event system)
+		-Move: pcb_act_MinMaskGap() to oldactions
+		-Move: pcb_act_ChangePaste() and pcb_act_ChangeHole() to oldactions
+		-Move: deprecated actions for changing octagon/square flag moved to oldactions
+		-Split: low level text string draw function from pcb_text_t draw function to make calls cheaper where the caller is not drawing an existing text object
+		-Add: helper funciton to calculate text string height
+		-Add: draw API and infrastructure for delayed heavy term rendering
+		-Add: save last seen raw mouse pointer coords in the crosshair struct
+		-Add: make terminal label printout size configurable
+		-Add: default menu: layer group context popup contains a del group item
+		-Add: cli: hook for the /tab action
+		-Add: actions: cli edit hook
+		-Add: use putenv() if setenv() is not available
+		-Add: expose the low level id search that doesn't throw a hace on not-found
+		-Add: zoom to selection and zoom to found in the menu
+
+	[ddraft]
+		-Add: new action: trim(): cutting edge objects to remove excess segments of lines and arcs
+		-Add: new action: split(): cutting edge objects to split lines and arcs into multiple objects
+		-Add: new action: constraint() for line drawing (angle and length)
+		-Add: new action: perp and paral and tang to constraint lines 
+		-Add: constraint GUI: dialog box to set or reset constraints
+		-Add: new action: ddraft() with a custom, 2d drawing mini-language
+		-Add: new CLI mode that uses the ddraft() syntax
+
+	[dialog]
+		-Fix: flag edit dialog refuses to operate on locked objects (it would get out of sync very fast)
+		-Fix: padstack editor now allows setting clearance to 0
+		-Add: new export dialog with tabs on the left
+		-Add: new about box
+		-Add: layer binding dialog: enforce current layer model limitations: when the user selects outline, make it global; when the users selects anything else but copper, reset stack offset
+
+	[distalign]
+		-Fix: Distribute() accepts optional gridless as the last argument
+
+	[doc]
+		-Add: document the new PCB_HID_COMP_POSITIVE_XOR drawing mode
+		-Add: template reference for padstack prototype
+		-Add: fungw action doc
+		-Add: explain how fungw functions are allowed to change their arguments
+		-Add: writeup on lib64/
+		-Add: fungw actions: raw example of extended coordinate load
+		-Add: developer doc with code snippets for fungw based action implementation
+		-Add: fungw action: calling other actions
+		-Add: introducing the CAM feature
+		-Add: a section for scripting (fungw)
+		-Add: document ddraft
+		-Add: EasyEDA on bridges
+		-Add: explain what the lock flag does
+		-Update: new version of GPL2 (from Debian's /usr/share) with the right FSF address and some white space fixups
+		-Update: datasheet: update list of supported scripting languages, replace gpmi with fungw
+		-Update: datasheet: file formats
+
+	[draw]
+		-Optimize: batch subc and padstack mark draws into one large xor draw session; batch subc and padtsack label draw in a separate non-xor draw session for now
+		-Optimize: do not use delay draw for padstack labels - they are drawn in a separate pass anyway
+
+	[draw_csect]
+		-Add: button for creating outline layer when it's not available
+
+	[export_ps]
+		-Add: show-toc option (default on, works only in single-file mode)
+		-Add: --single-page option to merge multiple layer groups (useful with --cam)
+
+	[fontmode]
+		-Fix: set layer color from defaults for the layers created for font editing to avoid a crash
+
+	[fp_fs]
+		-Fix: memory leak on non-existing paths
+
+	[fp_wget]
+		-Add: cache dir patch is configurable
+
+	[gl]
+		-Optimize: do not draw sophisticated round end caps for objects thinner than 1 pixel
+		-Optimize: do not use triangles for lines too thin - use plain old lines
+		-Optimize: tesselate with less number of points for polygons, when contour points are too dense
+		-Change: inline low level gl drawing functions to cut back on function call overhead
+		-Add: Support for XOR drawing mode
+
+	[gtk]
+		-Optimize: cheaper rendering of single-pixel objects
+		-Cleanup: memleak on config hid reg
+		-Fix: race-condition-free window position/size query
+		-Fix: when entering the drawing area, do a full redraw (invalidate-all) so the code does not depend on "xor-undraw" of the corsshair attached object
+		-Fix: all active top window widgets should let the central key handler handle all keyoard input
+		-Fix: don't change layer colors without the explicit request of the user
+		-Fix: property editor configures the preview layer name/color for all layers it uses
+		-Fix: for a context-popup, find subcircuits padstacks first and proceed to anythign non-subc-part only if none found; this allows right-clicking on subc padstacks
+		-Fix: get coords shall not change the input parameters if the user exits with an esc
+		-Fix: when handing keyboard presses (e.g. esc) in get coord, be more careful not to interfere with previous or next GUI interaction: accept only keys that are pressed _and_ released during the loop
+		-Fix: side correct zoom to window shall update .pcb_x and .pcb_y because get_coords think the coords are available
+		-Fix: advanced search expression build table: subcircuit footprint, refdes and value are all attributes, not properties
+		-Del: action LayerGroupsChanged (switched to events)
+		-Del: separate config subtree for selection colors; now that there is only one selection color, it shuld go in the main colors
+		-Del: get rid of the local About box implementation in favor of the central one
+		-Del: local ExportGUI implementation in favor of the central one
+		-Update: the layer selector widget uses layer's real color instead of guessing
+		-Add: action: ZoomTo(selected) and ZoomTo(found)
+		-Add: SwapSides() second arg S option for changing layer selection when swapping side
+		-Add: advanced search wizard table: common flags
+		-Add: when zooming to window, move the crosshair to the center of the window
+		-Add: attribute dialog: implement PCB_HATF_LEFT_TAB
+		-Add: implement the command entry hooks (tab, mouse clicks, editing)
+		-Change: property editor dialog's main tree is scrollable
+		-Change: mark the separate command window deprecated on the GUI
+
+	[gtk2_gdk]
+		-Optimize: draw dot instead of complex object when object is too small
+		-Optimize: omit too dense polygon corners (level-of-details control)
+		-Optimize: detect axis aligned rectangles and draw them cheaper
+		-Fix: crosshair coord rounding error
+		-Add: render burst sets zoom level in core for optimization
+
+	[gtk2_gl]
+		-Cleanup: more static functions to avoid name pollution
+		-Cleanup: use int from GL, not gint from GLib
+
+	[hid]
+		-Optimize: use centrally cached cap style and line width set to remove some load from the HIDs
+		-Optimize: centrally cached xor/faded hid calls
+		-Cleanup: rename cap styles with pcb_ prefix and avoid CamelCase
+		-Cleanup: centralize action GetXY - it does nothing HID-specific by now
+		-Cleanup: centralize the printer calibration action - has nothing HID-specific
+		-Move: clip.[ch] out from core, to lib_hid_common, as an inline function: it's used exclusively by renderers for line clipping
+		-Del: Trace_Cap: same as Round_Cap, no reason for the case/code duplication
+		-Del: Beveled_Cap: this hack was apperantly used for octagonal pins - padstacks don't have secial casing for octagons
+		-Del: API CHANGE: x and y coords are no longer passed as action arguments - only a few actions need coords and there are two different kind of coords (crosshair and pointer) so actions shall query for coords when they need it
+		-Del: API CHANGE: needs-coord from action registration: semi-automatic, central coord query for actions got removed already
+		-Del: remove the "erase" color and rely on the drawing mode for negative draw
+		-Del: holes_after from the API: it's always enabled now
+		-Change: API CHANGE: get coords can be forced to query the user for a new set of coords - some actions may need two, distinct set of coordinates
+		-Add: central gc cache struct in all hid gcs
+		-Add: centralize hid creation and destroy so that the core-side cache can be maintained
+		-Add: new API to make GUI zoom level available for core
+		-Add: comment that recommends updating the core zoom level in burst start
+		-Add: introduce PCB_HID_COMP_POSITIVE_XOR to help non-sw-render HIDs optimizing their XOR draws
+		-Add: PCB_HATF_LEFT_TAB for moving TABBED's tabs to the left (for a vertical align that works better when there are a lot of tabs)
+		-Add: DAD helper macro to build a DAD entry dupping an existing attr
+		-Add: extend the mouse input event API with a flag for whether the command line is open at the time of the event; this will be used for mouse integration with cli modes
+		-Add: API to query or change command line entry
+
+	[import_fpcb_nl]
+		-Add: import freepcb netlist (import schematics from EasyEDA)
+
+	[io_lihata]
+		-Fix: saving font should not write invalid nodes
+		-Add: read layer color from v5 boards
+
+	[layer]
+		-Fix: properly clreate new (missing) layer groups when upgrading the stack for padstack
+		-Fix: when creating new layer groups for a padstack upgrade, make sure new bottom paste and bottom silk and bottom mask end up below bottom copper
+		-Fix: don't overwrite silk's color permanently while rendering
+		-Fix: when composite drawing mask and paste, set the base color to the first layer's color
+		-Fix: when drawing bound layers, use the real layer's actual color (if real layer is available) instead of default color
+		-Fix: creating a new layer should set the change flag on the board
+		-Split: create intern misc layer code: separate the logic (where/why to create) from the mechanical part (low level data field fill in)
+		-Del: per layer selected color - use a global layer-object-selected-color instead
+		-Del: vtlayer - use vtp0 instead because UI layer pointers must be persistent because of object parent links
+		-Change: layer color is dynamically alloced (because it is loaded from the board file)
+		-Change: multi layer composite draw respects each layers own color and doesn't force using the same color
+		-Add: API for unified string-to-layer-id conversion
+		-Add: helper function to determine the default color of a new layer
+		-Add: force flag to enforce loading default layer colors (useful for loading old/alien formats without proper layer color support)
+		-Add: helper functions for change layer color
+		-Add: ui layer vector and ui layer lookup by id
+		-Add: when new layer is created, set its color to default
+		-Add: DelGroup() action, similar to EditGroup
+
+	[lesstif]
+		-Optimize: direct rendering mode optimization
+		-Fix: issue a (delayed) redraw on entering the drawing area so that the crosshair attached object is drawn properly
+		-Fix: draw attached objects from the crosshair change notification callback
+		-Fix: at the end of a full redraw, draw crosshair-attached objects only once, without drawing mode setting
+		-Fix: draw crosshair attached objects on the leave notification to keep the xor drawn objects coherent
+		-Fix: attached object redraw on leave happens only if crosshair is on
+		-Fix: when leaving the drawing area, refresh the mark so it remains on the screen
+		-Del: action LoadVendorFrom() - done in the vendor plugin
+		-Del: get rid of the local About box implementation in favor of the central one
+		-Del: local ExportGUI implementation (in favor of the new, central export dialog)
+		-Del: command entry action comment shouldn't explain action syntax, especially that that's only one of the backends
+		-Change: mark the lesstif-specific LibraryShow action deprecated
+		-Change: gui command entry + mouse clicking: command entry should not close or lose keyboard focus
+		-Add: action ZoomTo(selected)
+		-Add: action ZoomTo(found)
+		-Add: SwapSides() second arg S option for changing layer selection when swap sides
+		-Add: when zooming to window, move the crosshair to the center of the window
+		-Add: set core zoom level in render burst
+		-Add: command entry: support for cli /edit hook
+
+	[lib_compat_help]
+		-Fix: padstack->pad conversion: centralize the *2 on clearance value, that's how the old formats store it
+		-Fix: padstack->pad conversion: determine polygon shaped mask size properly
+
+	[mincut]
+		-Optimize: do not run mincut if there surely won't be a solution (no cuttable objects in between S and T)
+		-Fix: free up the graph after use to cut back on mem leaks
+		-Fix: memory leak on network names
+		-Fix: solver free's cloned graph on error return to avoid memleak
+
+	[propedit]
+		-Add: color field for real layers
+		-Add: map and set object flags
+
+	[pstk]
+		-Optimize: unplated hole graphics: use a smaller circle within the hole, so XOR can be avoided
+		-Fix: set line cap and width for drawing holes
+		-Fix: remove excess xor draw setup
+		-Fix: set line end cap before thin drawing padstack shapes - on some layers there's nothing else drawn that'd set the cap
+		-Change: display teminal name centered for padstacks - same happens with heavy terminals
+		-Add: action for breaking up a padstack
+		-Add: when bbox is vertical, print vertical term label so the label is aligned with pad orientation
+
+	[query]
+		-Fix: qyery() action sets the result field and returns success instead of returning the version number (which would mean error)
+		-Fix: don't execute the callback if current object is NULL
+		-Fix: don't let common bounding box based area accessor block the more precise, per object code
+		-Add: line length square (cheaper calculations)
+		-Add: line area accessor
+		-Add: arc length^2
+		-Add: arc area
+		-Add: return true area of polygons
+		-Add: support for executing flag lookups
+
+	[report]
+		-Fix: report(subc) should report only about subcircuits and nothing else
+
+	[scconfig]
+		-Add: print help of scconfig default args
+		-Add: detect putenv() if setenv() is not available
+
+	[script]
+		-Add: new action: ListScripts()
+		-Add: new action: LoadScript()
+		-Add: new action: UnLoadScript()
+		-Add: CLI mode for script oneliners
+		-Change: switch over all actions to the fungw API
+
+	[subc]
+		-Fix: get rotation angle inversion bug (fixes e.g. sch reimport rotation messup problem)
+		-Add: use subc_nonetlist for drawing the dashed outline of subcircuits with the nonetlist flag set
+		-Add: configuration setting for showing only visible-side subc marks (default on)
+
+	[tool]
+		-Fix: use the naked bbox for moving objs so they can reach the sides of the drawing area
+		-Del: pcb_adjust_attached_object(): was a wrapper around the tool's implementation, use that directly
+		-Del: the 'none' tool menu: there's no such tool, use the arrow tool instead
+		-Move: old tool related helpers pcb_release_mode() and pcb_notify_mode() to tool.[ch] to clean up action_helper
+		-Cleanup: pcb_act_ChkMode() should use the tool infra for converting string to tool id instead of a local list of tool names
+		-Split: separate target x,y fields in crosshair for move/copy; this allows detaching where the object will land from the current crosshair coord (allowing plugins to recalculate or restrict the target coords)
+		-Add: before a selected-move, store the starting coordinates so plugins, e.g. ddraft/constraint can calculate how far the move went
+		-Add: when the command line is open, override the normal notify/release action and try the cli backend first; perform the normal actions only if the backend did not handle it
+
+	[thermal]
+		-Fix: thermal arc angle overflow corner case, on line end caps (reported by Ade)
+
+pcb-rnd 2.0.0 (r17177)
+~~~~~~~~~~~~~~~~~~~~~~
+
+	-Del: old data model
+	-Cleanup: use macro.h only where it is really needed, do not include it from central headers (reduce unnecessary dependencies)
+	-Cleanup: remove doxygen
+
+	[grid]
+		-Add: SetValue() can double or halve the current grid
+		-Add: extend board grid set API for explicit offset
+		-Add: grid() action
+		-Add: conf setting: grids_idx for remembering which grid is selected from the list
+		-Add: helper function to create the anchored menus
+		-Add: action to select specific grid by index
+		-Add: initialize update_on and checked for the dynamic grid menus
+		-Add: grid index invalidate (on custom grid setting)
+		-Add: update the dynamic menu on gui init event
+		-Add: update the grid dynamic menu when the config changes
+
+	[menu]
+		-Fix: make cut-to-buffer undoable by not depending on the special move buffer function
+		-Add: new default multi-stroke menu file for both gtk and lesstif
+		-Add: context menu (per object type)
+		-Add: quickplace: via, line and arc
+		-Add: submenu for displaying different subcircuit IDs
+		-Add: extend the API so menu items can be inserted after an existing menu item (opposed to appending at the end of the menu)
+		-Add: new default menu file for the configurable grid
+		-Add: buffer normalization menu
+		-Change: edit attributes of current layer uses the property editor instead of the obsolete attribute editor
+		-Change: edit layer attributes from the popup menu uses the property editor instead of the obsolete attribute editor
+		-Change: use propedit for editing board attributes
+		-Rename: buffer #5 to scratchpad (the code often overwrites it as side effect of other operations)
+
+	[autocrop]
+		-Change: rewrite the whole code to use core functions instead of local reimplementation of moves; simpler logic for rounding coords
+		-Add: do not do anything if no change is required
+		-Add: clip polys and draw screen only once, not for each move
+
+	[autoroute]
+		-Fix: line end coord flicker that killed rubber band
+
+	[conf]
+		-Fix: hide_names description: it really hides floaters
+		-Fix: iterator should increase the index counter
+		-Fix: prepend list items in the reverse order so the final order of items is the same as in the file
+		-Fix: array merging: do not overwrite non-NULL items with NULL items - this lets a config entry modify something in the middle of an array without removing the first many items
+		-Fix: check for node type in tree traversal to avoid assert in liblihata; throw an error for invalid subtrees and remove them
+		-Fix: buffer overrun on conf node names too long
+		-Fix: buffer overrun on conf path too long
+		-Change: mark [pin/pad] show_number obsolete
+		-Cleanup: rewrite the missing node ignore mechanism so it works for whole subtrees and can be applied to both old and optional subtrees
+		-Cleanup: remove drc and conf sections from the default boards; default config should be coming from internal and system config files so that the user can easily override them (config settings coming from the default board have the DESIGN role that is hard to override)
+		-Add: conf_set_dry() "mkdirp" flag for auto-creating policy subtrees; conf_set() auto-creates the subtree
+		-Add: more exact error messages on conf parse error (list and array item must be text)
+		-Add: infrastructure for loading custom (per plugin) config files from system and user dirs
+		-Add: remember the name of list items - on some lists, like export_xy's templates this matters
+		-Add: publish conf file reg/unreg API
+
+	[core]
+		-Fix: change.c should include change.h to detect API mismatch
+		-Fix: auto-via is created as a padstack to avoid depending on vias
+		-Fix: when moving a line to another layer and an auto-via is added, use padstacks, not via
+		-Fix: do not merge new line to an existing line if the existing line is part of a subc or has term set
+		-Fix: do not announce which menu file has been loaded: action PrintFiles will tell
+		-Fix: when rotating buffer, do not expect text or padstack rtree to be non-NULL - if they are NULL, just skip the administration
+		-Fix: the actions that change layer visibility/selection should invalidate the drawing and send out layer change event to get everything redrawn
+		-Fix: The 'Text Tool scale' key mappings were reversed with regards to + & -
+		-Fix: do not crash in layer select action when invalid layer number is chosen
+		-Fix: do not call route styles changed event when only the active route style is selected - the conf events will be picked up
+		-Fix: make sure to emit the routes changed event when the routes are initialized (on load or new board creation)
+		-Fix: when loading a footprint-as-board, set the board size to make sure the footprint fits
+		-Fix: search: prefer padstacks that have copper shape on the right side, then padstacks that have any shape on the right side then ones with shape on the current layer and only then any other padstack over the given location
+		-Fix: data_is_empty: because of buffers: if global lists are empty, it's enough to check layers for pure emptiness, no global side effects should be checked
+		-Fix: don't segfault if element attr is attempted to set on a non-existing subc
+		-Fix: clip polys only when clip inhibit decreases to 0
+		-Fix: pcb_chg_obj_name_query() doesn't handle dyntext floater subc parts as terminals
+		-Fix: operation on selected objects can recurse to subcircuits if SUBC_PART is part of target type
+		-Fix: don't execute operation twice on subc parts (by r16304)
+		-Fix: allow rotate function to operate on subc floaters
+		-Fix: do not let the user to select-move or select-remove subc parts (not even floaters, because parent could not be tracked over the buffer)
+		-Fix: consider a padstack for screen search only if it has a shape on a visible layer
+		-Fix: allow padstacks to change (global) clearance
+		-Fix: text object: don't crash if a non-subc dyntext tries to reference parent subc
+		-Fix: MoveToCurrentLayer on a subc part (floater) object keeps the object within the subcircuit, either by using an existing subc layer or allocating a new bound layer
+		-Fix: make sure redo never adds new undo entries (would render the rest of the redo stack unusable)
+		-Fix: search-by-location shouldn't find floaters when they are locked
+		-Fix: do not find hidden floaters on click
+		-Fix: hide floaters works on non-silk objects as well
+		-Fix: call get_export_options() when invoking the exporter using -x, to make sure the options are initialized before the cli processor goes through them; the nogui version shouldn't throw an error, the fallback is a nop
+		-Fix: SaveTo() with no args shouldn't segfault
+		-Fix: SaveTo(Layout) shouldn't tolerate file name or format; when specified, it would be ignored; to avoid confusion, rather throw an error
+		-Fix: emergency format typo - use the configured format
+		-Fix: on footprint import always use the footprint attribute instead of the name attribute
+		-Fix: search on padstacks: accept the padstack found if it has hole on the current layer
+		-Fix: temporary turn off flip/solder-side-view while replacing subcircuits from ElementList(), to avoid coord flip confusion and wrong y coord of the replacement subc
+		-Fix: freeze undo while rotating buffer to make sure nothing ends up on the undo (buffer operations are not undoable)
+		-Fix: when moving an unselected subc with drag&drop it should never snap to any object in the original subc
+		-Fix: when mirroring data, provide an option for mirroring text coords only without mirroring the text graphics ("onsolder" flag); this needs to be used for subc and buffer mirroring to keep text objects in place
+		-Fix: flag_str: when converting to string in compatibility mode, permit hidename for subcircuits
+		-Fix: 2 layer default board typos
+		-Fix: find.c: rat vs. padstack intersection must consider whether padstack has shape on the given layer
+		-Del: obj_all_op.h, obj_all_list.h, trunk/src/obj_all.h - include the op headers directly
+		-Del: old data model: PCB_OBJ_* constants for the old model
+		-Del: obsolete API: get_unit_list()
+		-Del: increments config type (the new grid code handles these)
+		-Del: remove mask from the ToggleView() help - mask is not a special layer anymore
+		-Del: redundant drc settings from pcb_board_t - they are only in config now
+		-Del: redundant board meta: poly_isle_area
+		-Del: remove conf vs. board header redundancy: max_width and max_height are board parameters, not config
+		-Del: default thermal style from pcb_board_t - used only by the autorouter, this should be a local setting there
+		-Del: the line object should have no Number field - use the term attribute to indicate terminal ID instead
+		-Cleanup: simplify the API of pcb_chg_obj_name_query() (remove type/ptr1/ptr2/ptr3)
+		-Cleanup: move loop end macros from macro.h to obj_common.h - because it's much less general than it was originally and layers are becoming objects anyway
+		-Cleanup: rename PCB_ANYOBJFIELDS to PCB_ANY_PRIMITIVE_FIELDS to make room for generalization (any object may be non-drawing-primitive)
+		-Change: old data model: drc enforce line vs. padstack, while drawing, switched over to the new data model
+		-Change: padstack search precedence: current layer has prio over side
+		-Move: ListRotations to the oldactions plugin - this feature is redundant with the query function and the xy exporters
+		-Add: warn and return error on copy or move to buffer with empty selection
+		-Add: missing element->subc transition on rats patch footprint replace
+		-Add: old data model: rewrite SaveTo(AllUnusedPins, ...) for the new data model
+		-Add: check and warn on uninit if any of the plug chains are non-empty - such bugs can lead to uninit-crash with plugins
+		-Add: pass on background and foreground color on dynamic menu creation
+		-Add: ChkRst() action for route style checkbox menus
+		-Add: net structs, pcb_layer_t, pcb_layergrp_t are now compatible with pcb_any_obj_t
+		-Add: enable action EditGroup(attrib, key=value)
+		-Add: virtual layer button: padstacks (pstk_on controls whether padstack shapes are drawn, not only holes)
+		-Add: pcb api ver to avoid loading mismatching plugins
+		-Add: pcb_chg_obj_name_query() special case: when changing a subc part dyn text that contains %a.parent.refdes%, assume it's a change on the parent subc's refdes
+		-Add: pcb_chg_obj_name_query() won't edit subc refdes immediately on "refdes text", it asks first, giving the user a chance to change the dyntext template
+		-Add: config setting for also drawing the bounding box when xor-drawing a text object (e.g. for move)
+		-Add: optional, runtime HID fallback mechanism (if there is no X, the batch HID will start)
+		-Add: helper function to print the current key sequence in a string (for status line indication)
+		-Add: Buffer(Push) and Buffer(Pop) to let actions temporarily switch buffer then go back
+		-Add: PasteBuffer(normalize) - to clean up after an import
+		-Add: inline func for coord abs (portable implementation to replace labs()/llabs())
+		-Add: system() sets PCB_RND_BOARD_FILE_NAME; exports crosshair X, Y and current layer's name in env vars
+		-Add: command line option for dumping all object flag names per object type
+		-Add: action Rotate90
+		-Add: hid_nogui prints progress bar to stderr if verbosity level is high enough
+		-Add: progress bar on data poly clipping after 2 seconds; poly clipping can be cancelled (at a cost of exiting pcb-rnd)
+		-Add: assert() on invalid menu ID
+		-Add: throw an error for any plugin conf field that is unregistered - such bugs cause segfault with dynamic loaded plugins
+		-Add: extend the padstack mirror API so that x mirroring can be disabled
+
+	[diag]
+		-Fix: integrity: do not check more layers than what the parent has (e.g. few subc layers vs. a lot of board layers where the subc is hosted)
+		-Fix: missing newlines at the end of error messages
+		-Fix: respect prefix when printing lihata dump section headers
+		-Add: integrity test on layer's parent
+		-Add: integrity checks for object's ->type field
+		-Add: integrity test on layer group type/parent
+		-Add: integrity tests for non-global outline layers
+		-Add: print comments about which section of the emitted lihata dump is for main and for plugin trees
+
+	[dialogs]
+		-Fix: padstack shape copy does not bloat the shape
+		-Fix: padstack dialog uses real tabs instead of local button based implementation
+		-Fix: shape gen sets clearance to 0
+		-Fix: flag edit prints object type in text, not in magic number
+		-Add: padstack editor, 3rd tab: auto generate common cases
+		-Add: padstackedit can be invoked with a selected tab open
+		-Add: include optional prototype name in instance proto button text
+
+	[distaligntext]
+		-Cleanup: remove doxygen
+		-Cleanup: don't repeat the file name in comment
+		-Change: rewrite element loops to subc loops - floater text on the first level considered
+
+	[doc]
+		-Fix: use $(MAKE) instead of hardwired make
+		-Del: old Debian list generation: we don't do custom Debian packaging anymore
+		-Update: wishlist: data model rewrite done
+		-Add: user manual, ui: explain multi-stroke key bindings, prepare the key tree
+		-Add: multi-stroke key assignment: document non-leaf choices
+		-Add: document new key tree nodes
+		-Add: keytree flat list
+		-Add: document what's new in lihata v5
+		-Add: manual page for fp2subc
+		-Add: document lihata board v5 news: route style via proto ID
+		-Add: document lihata v5 padstack proto name feature
+		-Add: lihata -> html render script for the file format doc
+		-Add: lihata board and friends file format spec
+		-Add: technical details on the xy exporter templates
+		-Add: mods3: explain plugin status words
+		-Add: link mods3 tables from plugin creation howto for classes and status words
+		-Add: document the new stroke plugin
+		-Add: document the polystitch plugin
+		-Add: minimalistic user documentation for the autoplace plugin
+		-Add: minimalistic user manual for the autoroute plugin
+		-Add: list svn mirrors, explain when the mirrors should be used
+
+	[export_bom]
+		-Fix: use the centralized footprint name lookup
+
+	[export_dsn]
+		-Fix: do not x-flip padstack placement within subc - that swaps the pads
+		-Fix: y flip in padstack placement within subcircuit
+		-Fix: mirror x shapes of padstacks when parent subcircuit is on the other side (freerouting dsn import bug workaround)
+		-Fix: padstack mirrored x placement as a workaround for freerouting's dsn importer bug
+		-Fix: heavy terminal placement within subcircuits, including proper y flip
+		-Fix: make sure layer names are unique by prefixing group name with group ID
+		-Workaround: subc front/back and inverted padstack layer stackup to work around a bug in freerouting.net dsn importer
+		-Cleanup: rewrite layer support to use core data directly (also removes glib dependency)
+
+	[export_dxf]
+		-Fix: arc angles for all positive and negative deltas (simplify the code to remove bugs)
+
+	[export_ipcd356]
+		-Change: full rewrite
+
+	[export_png]
+		-Fix: in photo mode, use the slower, but more accurate line drawing method for zero-length lines
+
+	[export_ps]
+		-Fix: ps_bloat now works
+		-Del: polygrid export option - PolyHatch() does it better
+
+	[export_xy]
+		-Fix: don't count subcircuits in int, use pcb_cardinal_t (int may be 16 bit)
+		-Fix: use central subc footprint name mechanism
+		-Fix: unregister conf nodes in uninit
+		-Add: local plugin configuration for templates
+		-Add: conf list parser for templates
+		-Add: lihata conf version of the original templates
+		-Add: compile and install export_xy.conf
+		-Cleanup: terminology in template field names: subc/terminal instead of elem/pad
+		-Cleanup: rename "elem." to "subc." and "pad." to "term." in the template for consistency
+		-Cleanup: rename subc.name to subc.refdes and subc.desc to subc.footprint for consistency with code terminology
+		-Cleanup: rename element_num to count for consistency in the terminology
+
+	[fp_board]
+		-Fix: C89 forbids mixed declarations and code
+
+	[fp_wget]
+		-Fix: error messages are not sent to stdout
+		-Add: common helper function for searching the index for a footprint name
+		-Add: gedasymbols: if path is the cookie, accept it and search for the footprint short name in the index
+		-Add: footprint path search for edakrill
+
+	[gpmi]
+		-Fix: remove the old MAX_LAYERS+2 hack - silks are not special any more
+		-Del: debug draw API
+		-Update: new menu creation API
+		-Update: plugin dependencies
+
+	[gtk]
+		-Fix: do not discriminate keypad keys
+		-Fix: SEL -> ARR in mode button icon for consistency with the code/doc terminology
+		-Fix: emit layer vis change event from wt_layersel on any visibility affecting changes to keep menus in sync
+		-Fix: when removing a menu widget, also remove its action from the action list
+		-Fix: bindings so that the route style widget is updated when the route style selection changes (from the menu or via the action)
+		-Fix: pinout window: do not enforce window sizes too large for large footprints
+		-Fix: coord correctness: zoom/pan coord conversion doesn't cast coords to gint
+		-Fix: drc window reset shall remove old report widgets
+		-Fix: coord entry: let the user change units
+		-Fix: side-correct zoom-to-win
+		-Fix: do not include file name for SaveTo(Layout) - it knows the file name
+		-Fix: advanced search non-integer fields are retyped to DOUBLE from INT
+		-Fix: allow negative integers in config pov's spinbox (e.g. subc dash_freq can be set to -1)
+		-Fix: give focus to the drawing window before entering the main loop so key presses are handled even if the mouse cursor haven't yet entered the drawing area
+		-Change: mouse button assignment is in sync with the default menu file
+		-Add: option for context-sensitive popups: per object type under the cursor
+		-Add: status line: display key sequence
+		-Add: low level zoom action feature: zoom(x1,y1,x2,y2) and high level ZoomTo() action  that doesn't try to query the new center
+		-Add: advanced search: subc and host subc fields
+		-Add: advanced search: subcircuit rotation and side field
+		-Add: advanced search: padstack fields in the advanced search
+		-Add: missing action EditLayerGroups for compatibility with lesstif
+
+	[hid]
+		-Fix: gtk or lesstif X initialization failure does not result in exit() from the HID code but returns error so that main.c has the chance to handle it later
+		-Fix: coord correctness: set_crosshair() takes coords, not ints
+		-Cleanup: API indentation and excess _ in argument names
+		-Del: debug draw API - use UI layers instead
+		-Del: radio menu support - gui logic is implemented deeper, no toolkit support required
+		-Move: centralize SetUnits action from the lesstif and gtk hids into core
+		-Change: pass on menu properties as a struct, not as a bunch of const char *args, to make the API easier to extend
+		-Change: parse arg/command line API has an integer return value so HIDs are not forced to exit but can indicate if initialization fails
+		-Add: publish the main hid config for each GUI hids so that anchored menus can be added from the outside, without the GUI hids knowing about all anchors by name
+		-Add: API to look up and map @anchor menus
+		-Add: API for removing menu items under an anchor
+		-Add: remove menu subtree by lihata node (for removing under-anchored menu items)
+		-Add: checked and update_on fields for dynamic menus
+		-Add: background and foreground color fields in dynamic menu struct
+		-Add: API to force a global menu checkbox update
+		-Add: wrap pcb_gui->attribute_dialog as it may not be always available
+
+	[import_dsn]
+		-Update: load layer group id__names as exported by export_dsn
+
+	[import_hpgl]
+		-Fix: Y flip
+
+	[import_ipcd356]
+		-Add: new plugin to load terminals and netlist for test points
+
+	[io_lihata]
+		-Fix: test route style entry type before use
+		-Fix: throw an error when a padstack references to an invalid prototype
+		-Fix: handle buggy input: no data in subc
+		-Fix: don't segfault if poly padstack proto shape contains invalid coordinate
+		-Fix: when setting up new layer groups, set parent and type properly
+		-Fix: v4: save heavy terminal thermals (and warn if saving to <v4)
+		-Fix: v4: write subcircuit v4 for board v5
+		-Fix: remove invalid nodes (placeholders) from the tree before saving a subcircuit file to avoid broken output
+		-Fix: initialize zoom to 0, as the conversion may fail
+		-Fix: throw an error if font allocation fails (instead of segf)
+		-Fix: quit parsing on floating point conv errors
+		-Fix: be more pedantic on basic field parsing errors (such as coords, ints or floats): distinguish between optional and required fields; always throw an error on existing but broken value, throw an useful error on missing required fields
+		-Fix: early exit on error to avoid asserts in padstack creation
+		-Fix: require layer group to be a hash
+		-Fix: don't load polygon with no geometry
+		-Fix: do not crash if element objects is missing or not a list
+		-Fix: do not accept polygons with broken coord table
+		-Fix: buffer overrun on too many input layers
+		-Fix: uninitialized fields: optional fields should be set to a default value before parsing them
+		-Fix: rat line attribute is loaded into the newly initialized rat line, not into an uninited temp
+		-Fix: make sure basic objects are hashes on load, throw meaningful error if they are not
+		-Fix: more pedantic error message generation on missing values
+		-Fix: require subc.ID to be a hash, throw a meaningful error message if not
+		-Fix: place dummy clearance node while saving polygon to make sure a clearance removed will be removed from the file
+		-Fix: do not warn for missing bool in layer visibility and flags
+		-Fix: flag default value, when not set, is false
+		-Fix: moving a pad to the other side should happen only if the pad itself is marked onsolder (subc side does not matter)
+		-Fix: missing space in parse error message
+		-Change: do not save cursor; warn if cursor is loaded
+		-Add: layer stackup validation: cross-link checks
+		-Add: validate layer stackup for the few remaining restrictions
+		-Add: v5: save & load layer group and netlist network attributes
+		-Add: warn for (suspected) version incompatibilities on saving objects with new attributes
+		-Add: v5: save layer color
+		-Add: v5: warn for loading old data model objects from lihata v5+
+		-Add: v5: load/save route style via proto
+		-Add: v5: load/save padstack proto name
+		-Add: when loading old (below-v5) lihata files, process board meta once again after loading the configs, because board meta should override conf
+		-Add: unify parser error reporting, with file name : line number . col number
+		-Add: explicit error messages on conditions that used to be silent parse errors
+
+	[io_pcb]
+		-Fix: conf conversion bug: isle area is not coords because of the square, put it in the config as %f
+		-Fix: do not x-mirror on-solder pads, data read from the file is already mirrored
+		-Fix: handle element hidename flag on load
+		-Fix: when there's no subc refdes text found, write the element with refdes text at 0;0
+		-Fix: preserve refdes text coords and directions in a round trip when hidename is active
+		-Fix: proper load/save round trip on element pad clearance
+		-Add: when saving an old element, export the hidename flag when there's no refdes text
+
+	[layer]
+		-Fix: don't crash when layer group references non-existing layer
+		-Move: centralize menu-button-only virtual layers
+		-Add: ChkView() action to return whether a layer is visible, for the menu 'checked' infrastructure
+		-Add: ChkLayer() action for returning the current selection
+		-Add: virtual layer menu button abbreviated names
+		-Add: utility function for layer menu button lookup by name
+		-Add: support virtual menu layers in select/check actions
+		-Add: support virtual layer menu entries in layer view actions
+		-Add: gui actions for layer view can handle ui layer with the ui: prefix
+		-Add: workaround for non-global outline layers (invalid combination) on layer binding
+
+	[lesstif]
+		-Fix: remove menu node by lihata node should call the by-node remover in core
+		-Fix: do not discriminate keypad
+		-Fix: top silk layer visibility (remove special casing)
+		-Fix: coord correctness: zoom/pan works with pcb_coord_t instead of int
+		-Fix: do not configure scroll bars with invalid size (integer overflow)
+		-Fix: do not pass filename to SaveTo(Layout), that action knows the file name
+		-Fix: fallback progress bar while the gui is not initialized
+		-Fix: make sure to initialize the lesstif menu in core only once to avoid invalid IDs
+		-Fix: unregister hid attributes on uninit
+		-Fix: use a separate cookie for registering the menuconfig hid - double registering with the same cookie would result in id -1 that in turn crashes the menu system
+		-Del: old route style code
+		-Add: ZoomTo() action (and a low level zoom-to-window function)
+		-Add: implement menu feature: update_on
+
+	[lib_compat_help]
+		-Fix: uninitialized memory on refpins in element rotation rev engineering
+		-Fix: old pin objects with no plating still can have masks (e.g. mounting holes)
+
+	[lib_hid_common]
+		-Add: enable central generation of layer menus with background color
+		-Add: central code for listing route styles under the @routstyle menu anchor
+		-Add: refresh the menus when new board is loaded
+
+	[lib_padstack_hash]
+		-Del: the new data model has built-in padstacks, no need to emulate padstacks using pins/pads any more
+
+	[libuhpgl]
+		-Fix: accept 1 or 2 arguments for VS
+		-Add: ignore unknown instruction WU
+		-Add: ignore unknown instruction PW - probably pen width?
+		-Add: accept space as separator between coords (number lists) - there is a dialect out there that does this
+		-Add: ignore LT (line type: dash pattern) for now
+
+	[padstack]
+		-Fix: avoid reusing free'd memory when a polyline needs to be inverted for a padstack shape
+		-Fix: change clear size op took clearance with a *2 factor
+		-Fix: zero length line pad conversion bug
+		-Fix: do not clamp relative clearance change values to absolute minimum clearance
+		-Fix: relative clearance change op in positive direction
+		-Fix: wrong clamping on negative clearance change - don't *2 the minimal values
+		-Fix: set padstack proto on insert_or_free()
+		-Fix: make clearance minimum enforcement symmetric
+		-Fix: when making a modification on an in-buffer padstack, such as rotation, force generating the transformed shape and update ->shapei
+		-Fix: rotate op needs to invert angle if padstack is x-mirrored, because padstack transformation data is interpreted as "rotate first, then mirror"
+		-Fix: for mirroring y_offs=0 does not mean "no coord change": the y coord can still be non-zero in which case it needs to be mirrored. Introduce a special y_offs value to indicate "don't mirror coords"
+		-Add: event on creating padstacks
+		-Add: low level function for changing prototype name
+
+	[plugins]
+		-Fix: better corner case handling for hook unregister for the case the target pointer is the head of the list
+		-Fix: unregister all plugin hooks to avoid quit-time-segfault (dangling pointers left on the plug chains, backing structs already unmapped by dlclose)
+
+	[polystitch]
+		-Fix: pcb_coord_t correctness
+		-Change: rewrite the core of the plugin so that it doesn't try to generate a (self-intersecting, invalid) polygon, but converts the inner polygon into a valid hole in the outer polygon
+		-Cleanup: do not use global variables when no global state is necessary for the task
+
+	[propedit]
+		-Fix: attempt to change layer properties only on prefix match or attributes
+		-Fix: mark layers being edited as the first step, do not trust storing the pointers
+		-Fix: clearance value halving on set
+		-Add: propedit(layers) and propedit(layer:id) so layer attributes can be edited
+		-Add: accept multiple layer IDs
+		-Add: layer id "current" means the current layer
+		-Add: operate on layer groups
+		-Add: operate on boards
+		-Add: allow editing subc part padstack in loose subc mode
+		-Add: extend loose subc editing to all subc part objects (not limited to padstack)
+		-Add: allow editing subc parts that are freely editable (terminals, floaters or anything in loose subc mode)
+
+	[query]
+		-Fix: properly compare NULL string to empty string (they should be the same for now)
+		-Fix: make subcircuit access recursive - subcircuit parts should be dealt with
+		-Fix: do not segfault on uninitialized variables
+		-Add: padstack shape accessor
+		-Add: new field: subc (references to the direct parent subc)
+		-Add: generalize accessing the common fields; subc field access works on parent subcircuits
+		-Add: more sophisticated eval printout: take only coords as bools, print the value of the rest; void is always false
+		-Add: subc rotation access
+		-Add: access subc side (TOP or BOTTOM)
+
+	[renumber]
+		-Cleanup: remove doxygen
+		-Cleanup: const correctness
+
+	[report]
+		-Fix: report all net lengths using pcb_message() instead of direct log writes so the user has more control
+		-Fix: use pcb_message() instead of direct logging for more control
+		-Fix: excess undo interfering with user's undo
+		-Update: use the new data model for looking up net name for found objects
+		-Cleanup: split and simplify the net name lookup code
+		-Cleanup: get rid of DrillInfoTypePtr - use * for pointers
+		-Cleanup: get rid of CamelCase
+
+	[rtree]
+		-Del: old rtree implementation in favor of genrtree
+
+	[rubberband]
+		-Fix: don't mix var decl with code, C89 doesn't allow that
+		-Fix: the event PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE was using int where it should have been using pcb_coord_t
+
+	[scconfig]
+		-Fix: use detected host cc to compile puplug utils
+		-Fix: do not hardwire inline - use the detection from scconfig
+		-Change: force lib_compat_help to be a builtin because core temporarily depends on it
+		-Change: use local coord abs implementation instead of labs/llabs because llabs is not c89 and leads to feature macro hell on GNU
+		-Del: export_dsn -> glib dependency
+
+	[shape]
+		-Fix: use tabbed widget instead of local tab implementation (works better on small screen)
+		-Fix: don't warn on start for invalid dia
+		-Fix: roundrect: don't crash on missing arg
+		-Fix: avoid generating self intersecting polygons when round rect rounding radius is 0
+		-Fix: placing round rect: if there's only one arg, it should be the size
+
+	[stroke]
+		-Rewrite: new, configuration+action based stroke implementation, rewritten from scratch
+		-Fix: gesture direction should not invert when board is flipped
+		-Fix: coord type correctness: event coords are passed as pcb_coord_t, not as int
+		-Fix: don't use bit shift on coords, c89 doesn't guarantee that would work on signed ints
+		-Fix: warn only once for missing libstroke, and only if the gesture is large enough
+		-Change: API CHANGE: stroke finish returns integer; 0 on success (gesture recognized)
+		-Add: hack when processing mouse button release action: return 1 if stroke is enabled and gesture is recognized so that the context popup menu is not opened
+		-Add: bind right mouse button press/release to stroke in the menu file
+		-Add: rotation gestures
+		-Add: stroke() action with stroke(gesture, seq)
+		-Add: bindings for zoom in and out
+		-Add: stopline feature, also supports poly and poly hole
+		-Add: the config explains the dial pad idea of sequence descriptions
+		-Add: option for warning on unknown/unconfigured sequences
+
+	[subc]
+		-Fix: const correctness: host transf can't take const subc because of the subc cache updates
+		-Fix: when rotating all subc parts, restore undo to avoid padstack rotations getting on the undo list separately
+		-Fix: unified handling of subc_op undo - subc size change operations are undo-batched
+		-Fix: undo strategy: when subc-only undo/redo is done, freeze undo adds
+		-Fix: don't let flag change of subcircuit already in buffer get on the undo list - buffer flags changes won't be undoable
+		-Add: menu item for controlling the loose subc flag
+		-Add: update subc when part padstack is changed
+		-Add: configurable subc visible bbox dash frequency
+		-Add: helper function to return the footprint name of a subc
+
+	[teardrops]
+		-Fix: c89 forbids mixed declarations and code
+
+	[tool]
+		-Fix: move: do not perform the move if dx==0 and dy==0
+		-Fix: dereference pointer in pcb_tool_get macro
+		-Fix: reset crosshair bounds after placing a drag&drop move so the crosshair move is not limited
+		-Split: define in tool files if the tool can be selected in rat drawing mode
+		-Split: tool (un)init code into tool files
+		-Move: pcb_crosshair_save/restore_mode to tool.[ch] as pcb_tool_save/restore
+
+	[util]
+		-Del: old, resource file based keylist -> html converter (pcb-rnd long ago switched to lht)
+		-Add: keylist graphviz drawing for multikey combos
+		-Add: keylist can generate a boxed html version (each box is a starting letter)
+		-Add: keylist script uses css magic for the boxed version to get boxes float
+
+	[vendor]
+		-Fix: count total number of holes again
+		-Fix: re-enable route style tuning
+		-Fix: re-enable setting the current 'pen' via drill
+		-Add: event for tuning newly placed padstacks when vendor drill mapping is enabled (replaces the stub)
Index: tags/2.0.1/Changelog.1.0.x.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/Changelog.1.0.x.gz
===================================================================
--- tags/2.0.1/Changelog.1.0.x.gz	(nonexistent)
+++ tags/2.0.1/Changelog.1.0.x.gz	(revision 18980)

Property changes on: tags/2.0.1/Changelog.1.0.x.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/Changelog.1.1.x.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/Changelog.1.1.x.gz
===================================================================
--- tags/2.0.1/Changelog.1.1.x.gz	(nonexistent)
+++ tags/2.0.1/Changelog.1.1.x.gz	(revision 18980)

Property changes on: tags/2.0.1/Changelog.1.1.x.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/Changelog.1.2.x.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/Changelog.1.2.x.gz
===================================================================
--- tags/2.0.1/Changelog.1.2.x.gz	(nonexistent)
+++ tags/2.0.1/Changelog.1.2.x.gz	(revision 18980)

Property changes on: tags/2.0.1/Changelog.1.2.x.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/INSTALL
===================================================================
--- tags/2.0.1/INSTALL	(nonexistent)
+++ tags/2.0.1/INSTALL	(revision 18980)
@@ -0,0 +1,69 @@
+1. Installation
+
+Run ./configure.
+
+Run make.
+
+Run make install.
+
+For compile-time options run ./configure --help
+
+2. Running from source
+
+cd src && ./pcb-rnd
+
+(Note: it is important to cd to src to run pcb-rnd from source; src/pcb-rnd
+won't work unless pcb-rnd is installed).
+
+If this doesn't work, please refer to doc/UNIX.txt or doc-rnd/mac.txt
+
+--
+
+PCB is organized into:
+  src/            a core program that deals with all of the internal
+                  database procedures
+  src_plugins/    a collection of plugins
+  src_3rd/        third-party minilibs (dependencies, not integral parts)
+  pcblib/         a basic footprint library
+  tests/          automated tests to check whether pcb-rnd works properly
+  util/           utility programs like gsch2pcb-rnd
+
+
+./configure will try to static link most plugins and disable ones that
+have missing dependencies. This process can be controlled using configure
+command line switches, see ./configure --help.
+
+After running ./configure with your selected options, run
+
+  make
+
+to build pcb-rnd.  You can try out the program by running
+
+  cd src
+  ./pcb-rnd
+
+prior to installation (CWD _must_ be src/).
+
+To install PCB after it has been built run:
+
+  make install
+
+from the top level directory. An alternative installation method
+is the link-install, which places symlinks instead of copying files so
+no subsequent make install is needed after a recompilation if no new
+files appeared (useful for developers):
+
+  make linstall
+
+-------- Summary of dependencies --------------------
+For users:
+ - C compiler
+ - make
+ - optional: glib and gtk if you are using the gtk frontend
+ - motif or lesstif if you are using the lesstif frontend
+ - gdlib if you are using the png HID
+
+For developers:
+ - flex
+ - bison
+
Index: tags/2.0.1/Makefile
===================================================================
--- tags/2.0.1/Makefile	(nonexistent)
+++ tags/2.0.1/Makefile	(revision 18980)
@@ -0,0 +1,56 @@
+all: FORCE
+	cd src_3rd/puplug/util && $(MAKE) CC=$(PCB_RND_HOST_CC)
+	cd src && $(MAKE)
+	cd util && $(MAKE)
+	cd pcblib && $(MAKE)
+#	cd doc && $(MAKE)
+
+test: FORCE
+	cd tests && $(MAKE) test
+
+clean: FORCE
+	cd src && $(MAKE) clean
+	cd util && $(MAKE) clean
+	cd pcblib && $(MAKE) clean
+#	cd doc && $(MAKE) clean
+	cd tests && $(MAKE) clean
+	cd src_3rd/sphash && $(MAKE) clean
+	cd src_3rd/puplug && $(MAKE) clean
+	cd src_3rd/libminuid && $(MAKE) clean ; true
+	cd src_3rd/libuundo && $(MAKE) clean ; true
+
+distclean: FORCE
+	$(MAKE) clean ; true
+#	cd doc && $(MAKE) distclean
+	cd src && $(MAKE) distclean
+	cd util/gsch2pcb-rnd && $(MAKE) distclean
+	cd src_3rd/genlist && $(MAKE) clean ; true
+	cd src_3rd/genregex && $(MAKE) clean ; true
+	cd src_3rd/genvector && $(MAKE) clean ; true
+	cd src_3rd/liblihata && $(MAKE) clean ; true
+	cd src_3rd/liblihata/genht && $(MAKE) clean ; true
+	cd src_3rd/qparse && $(MAKE) clean ; true
+	cd scconfig && $(MAKE) distclean ; true
+
+
+install: FORCE
+	cd src && $(MAKE) install
+	cd util && $(MAKE) install
+	cd pcblib && $(MAKE) install
+	cd doc && $(MAKE) install
+
+linstall: FORCE
+	cd src && $(MAKE) linstall
+	cd util && $(MAKE) linstall
+	cd pcblib && $(MAKE) linstall
+	cd doc && $(MAKE) linstall
+
+uninstall: FORCE
+	cd src && $(MAKE) uninstall
+	cd util && $(MAKE) uninstall
+	cd pcblib && $(MAKE) uninstall
+	cd doc && $(MAKE) uninstall
+
+include Makefile.conf
+
+FORCE:
Index: tags/2.0.1/Makefile.conf.in
===================================================================
--- tags/2.0.1/Makefile.conf.in	(nonexistent)
+++ tags/2.0.1/Makefile.conf.in	(revision 18980)
@@ -0,0 +1,26 @@
+print [@# generated by ./configure, do not modify
+
+# Compatibility with autotools on DESTDIR - Debian really wants this
+# Still keep install_root as well, because that has a better name
+Install_root=$(install_root)$(DESTDIR)
+
+# prefix is @/local/prefix@
+DOCDIR=$(Install_root)@/local/prefix@/share/doc/pcb-rnd
+LIBDIR=$(Install_root)@/local/prefix@/lib/pcb-rnd
+BINDIR=$(Install_root)@/local/prefix@/bin
+ETCDIR=$(Install_root)/etc
+DATADIR=$(Install_root)@/local/prefix@/share/pcb-rnd
+MAN1DIR=$(Install_root)@/local/prefix@/share/man/man1
+RM=@/host/fstools/rm@
+CP=@/host/fstools/cp@
+LN=@/host/fstools/ln@
+MKDIR=@/host/fstools/mkdir@
+SCCBOX=$(ROOT)/scconfig/sccbox
+EXE=@/target/sys/ext_exe@
+PCB_RND_HOST_CC=@/host/cc/cc@
+
+# The installation directoried to be used from within binaries (with
+# install_root/DESTDIR removed)
+LIBDIR_INSTALLED=@/local/prefix@/lib/pcb-rnd
+
+@]
Index: tags/2.0.1/README
===================================================================
--- tags/2.0.1/README	(nonexistent)
+++ tags/2.0.1/README	(revision 18980)
@@ -0,0 +1,28 @@
+pcb-rnd is a modular PCB layout editor.
+
+It is hosted at http://repo.hu/projects/pcb-rnd
+Soruce code: svn://repo.hu/pcb-rnd/trunk
+
+For installing the release refer to the file 'INSTALL'.
+For additional information read the manual (doc-orig/pcb.pdf) 
+
+If you are updating you may wish to read the ChangeLog
+
+Contact:
+	email:       pcb-rnd (a) igor2.repo.hu
+	chat & IRC:  http://repo.hu/projects/pcb-rnd/irc.html
+
+
+Pcb-rnd was forked from gEDA/PCB in 2013
+-------------------------------------------------------------------------
+                            COPYRIGHT
+
+PCB is covered by the GNU General Public License.  See the individual
+files for the exact copyright notices.
+
+  Contact addresses for paper mail and Email:
+  harry eaton
+  6697 Buttonhole Court
+  Columbia, MD 21044
+  haceaton@aplcomm.jhuapl.edu
+
Index: tags/2.0.1/Release_notes
===================================================================
--- tags/2.0.1/Release_notes	(nonexistent)
+++ tags/2.0.1/Release_notes	(revision 18980)
@@ -0,0 +1,36 @@
+pcb-rnd 2.0.1
+~~~~~~~~~~~~~
+
+Focus of this release is infrastructural cleanups, bugfixes
+and GUI rendering optimization. The new features added in this
+release are all about extending the infrastructure to get the
+flexibility of pcb-rnd to the next level.
+
+New feature highlights:
+
+1. Cam exporting interface: a simple, unified interface to tell
+any exporter what layers to export to what file names.
+
+2. Command line modes: the command line interpreter can be switched
+to interpret syntax different from pcb actions.
+
+3. Scripting support upgrade to using fungw (10 scripting languages,
+including awk, python, perl, ruby, javascript, lisp). Support for
+switching the command line into script mode using any of the
+supported scripting languages (the user can enter script one-liners directly).
+
+4. ddraft: angle/length constraint actions and GUI, trim() and split() actions,
+a new command line mode with a syntax designed for 2d drafting. Similar
+to those in mechanical cads, with actions to draw lines perpendicular or
+parallel to existing lines.
+
+5. Command line GUI upgrade: more seamless integration of command line
+editing and mouse actions.
+
+6. New, single-stage, non-modal export dialog with tabs available exporters
+(also available in lesstif).
+
+7. Import plugin: freepcb netlist - schematics from EasyEDA can be imported
+
+8. Persistent layer color, saved with the board. Layer colors from the
+configuration are used only as initial color for new layers.
Index: tags/2.0.1/config.h.in
===================================================================
--- tags/2.0.1/config.h.in	(nonexistent)
+++ tags/2.0.1/config.h.in	(revision 18980)
@@ -0,0 +1,265 @@
+print [@ /***** Generated by scconfig - DO NOT EDIT *****/
+
+/* Source: config.h.in; to regenerate run ./configure */
+
+#ifndef PCB_CONFIG_H
+#define PCB_CONFIG_H
+
+/****************************************************************************/
+/* Static defines to enable extra features on some systems; once we get
+   testers on those systems, we can remove them and see if scconfig figured
+   everything. */
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+/****************************************************************************/
+/* Package properties */
+
+/* Name of package */
+#define PCB_PACKAGE "pcb"
+
+/* Name of this program's gettext domain */
+#define GETTEXT_PACKAGE "pcb"
+
+/****************************************************************************/
+/* These ones are already autodetected by scconfig */
+@]
+
+print {\n\n/* Macro to add a funciton attribute to suppress "function unused" for static inline functions declared in .h files */\n}
+print_ternary ?cc/func_attr/unused/presents {#define PCB_FUNC_UNUSED __attribute__((unused))} {#define PCB_FUNC_UNUSED}
+
+print {\n\n/* inline, as detected ("inline" or empty) */\n}
+print_ternary ?cc/inline {#define PCB_INLINE_DETECTED inline} {#define PCB_INLINE_DETECTED /* no inline */}
+
+print {\n\n/* final, combined keywords and attributes for an inline function */\n}
+print {#define PCB_INLINE static PCB_INLINE_DETECTED PCB_FUNC_UNUSED\n\n}
+
+print {\n\n/* Wether setenv() works */\n}
+print_ternary ?libs/env/setenv/presents {#define PCB_HAVE_SETENV 1} {/* #undef PCB_HAVE_SETENV */}
+
+print {\n\n/* Wether putenv() works */\n}
+print_ternary ?libs/env/putenv/presents {#define PCB_HAVE_PUTENV 1} {/* #undef PCB_HAVE_PUTENV */}
+
+print {\n\n/* Wether usleep() works */\n}
+print_ternary ?libs/time/usleep/presents {#define PCB_HAVE_USLEEP 1} {/* #undef PCB_HAVE_USLEEP */}
+
+print {\n\n/* Wether win32 Sleep() works */\n}
+print_ternary ?libs/time/Sleep/presents {#define PCB_HAVE_WSLEEP 1} {/* #undef PCB_HAVE_WSLEEP */}
+
+print {\n\n/* Define to 1 if you have the `snprintf' function. */\n}
+print_ternary ?libs/snprintf {#define HAVE_SNPRINTF 1} {/* #undef HAVE_SNPRINTF */}
+
+print {\n\n/* Define to 1 if you have the `vsnprintf' function. */\n}
+print_ternary ?libs/vsnprintf {#define HAVE_VSNPRINTF 1} {/* #undef HAVE_VSNPRINTF */}
+
+print {\n\n/* Define to 1 if you have the `getcwd' function. */\n}
+print_ternary ?libs/fs/getcwd/presents {#define HAVE_GETCWD 1} {/* #undef HAVE_GETCWD */}
+
+print {\n\n/* Define to 1 if you have the `_getcwd' function. */\n}
+print_ternary ?libs/fs/_getcwd/presents {#define HAVE__GETCWD 1} {/* #undef HAVE__GETCWD */}
+
+print {\n\n/* Define to 1 if you have the `getwd' function. */\n}
+print_ternary ?libs/fs/_getwd/presents {#define HAVE_GETWD 1} {/* #undef HAVE_GETWD */}
+
+print {\n\n/* Define to 1 if you have the <gd.h> header file. */\n}
+print_ternary ?libs/gui/gd/presents {#define HAVE_GD_H 1} {/* #undef HAVE_GD_H */}
+
+print {\n\n/* Define to 1 if you have the `gdImageGif' function. */\n}
+print_ternary ?libs/gui/gd/gdImageGif/presents {#define HAVE_GDIMAGEGIF 1} {/* #undef HAVE_GDIMAGEGIF */}
+
+print {\n\n/* Define to 1 if you have the `gdImageJpeg' function. */\n}
+print_ternary ?libs/gui/gd/gdImageJpeg/presents {#define HAVE_GDIMAGEJPEG 1} {/* #undef HAVE_GDIMAGEJPEG */}
+
+print {\n\n/* Define to 1 if you have the `gdImagePng' function. */\n}
+print_ternary ?libs/gui/gd/gdImagePng/presents {#define HAVE_GDIMAGEPNG 1} {/* #undef HAVE_GDIMAGEPNG */}
+
+print {\n\n/* Define to 1 if you have the `getpwuid' function. */\n}
+print_ternary ?libs/userpass/getpwuid/presents {#define HAVE_GETPWUID 1} {/* #undef HAVE_GETPWUID */}
+
+print {\n\n/* Define to 1 if you have the `rint' function. */\n}
+print_ternary ?libs/math/rint/presents {#define HAVE_RINT 1} {/* #undef HAVE_RINT */}
+
+print {\n\n/* Define to 1 if you have the `round' function. */\n}
+print_ternary ?libs/math/round/presents {#define HAVE_ROUND 1} {/* #undef HAVE_ROUND */}
+
+print {\n\n/* Wrapper for S_ISLNK(x); always return 0 if S_ISLNK doesn't exist */\n}
+switch ?/target/libs/fs/stat/macros/S_ISLNK
+	case {^$} print {#define WRAP_S_ISLNK(x) 0}; end;
+	default print [@#define WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end;
+end;
+
+print {\n\n/* Define to 1 if Xinerama is available */\n}
+print_ternary ?libs/gui/xinerama/presents {#define HAVE_XINERAMA 1} {/*#undef HAVE_XINERAMA */}
+
+print {\n\n/* Define to 1 if Xrender is available */\n}
+print_ternary ?libs/gui/xrender/presents {#define HAVE_XRENDER 1} {/*#undef HAVE_XRENDER */}
+
+print {\n\n/* Define to 1 if translation of program messages to the user's native language is requested. */\n}
+print_ternary ?/local/pcb/want_nls {#define ENABLE_NLS 1} {/*#undef ENABLE_NLS */}
+
+print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n}
+print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */}
+
+print {\n\n/* Define to 1 if we should use mkdtemp for creating temp files. */\n}
+print_ternary ?libs/fs/mkdtemp/presents {#define HAVE_MKDTEMP 1} {/* #undef HAVE_MKDTEMP */}
+
+print {\n\n/* Define to 1 if you have the `realpath' function. */\n}
+print_ternary ?libs/fs/realpath/presents {#define HAVE_REALPATH 1} {/* #undef HAVE_REALPATH */}
+
+print {\n\n/* Select which mechanism to use for running child processes. */\n}
+print_ternary ?/target/libs/proc/wait/presents     {#define USE_FORK_WAIT 1} {/* #undef USE_FORK_WAIT */}
+print {\n}
+print_ternary ?/target/libs/proc/_spawnvp/presents {#define USE_SPAWNVP 1}   {/* #undef USE_SPAWNVP */}
+
+print {\n\n/* Select which mechanism to use for creating a directory. */\n}
+print_ternary ?/target/libs/fs/mkdir/presents     {#define USE_MKDIR 1} {/* #undef USE_MKDIR */}
+print {\n}
+print_ternary ?/target/libs/fs/_mkdir/presents    {#define USE__MKDIR 1} {/* #undef USE__MKDIR */}
+print [@
+#define MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@
+@]
+
+print {\n\n/* Define whether we have specific signals. */\n}
+print_ternary ?signal/names/SIGSEGV/presents    {#define PCB_HAVE_SIGSEGV 1} {/* #undef PCB_HAVE_SIGSEGV */}
+print {\n}
+print_ternary ?signal/names/SIGABRT/presents    {#define PCB_HAVE_SIGABRT 1} {/* #undef PCB_HAVE_SIGABRT */}
+print {\n}
+print_ternary ?signal/names/SIGINT/presents     {#define PCB_HAVE_SIGINT 1}  {/* #undef PCB_HAVE_SIGINT */}
+print {\n}
+print_ternary ?signal/names/SIGHUP/presents     {#define PCB_HAVE_SIGHUP 1}  {/* #undef PCB_HAVE_SIGHUP */}
+print {\n}
+print_ternary ?signal/names/SIGTERM/presents    {#define PCB_HAVE_SIGTERM 1} {/* #undef PCB_HAVE_SIGTERM */}
+print {\n}
+print_ternary ?signal/names/SIGQUIT/presents    {#define PCB_HAVE_SIGQUIT 1} {/* #undef PCB_HAVE_SIGQUIT */}
+print {\n}
+
+print [@
+
+/* The host "triplet" - it's really a pair now: machine-os */
+#define HOST "@sys/sysid@"
+
+/* Directory separator char */
+#define PCB_DIR_SEPARATOR_C '@sys/path_sep@'
+
+/* Directory separator string */
+#define PCB_DIR_SEPARATOR_S "@sys/path_sep@"
+
+/* Search path separator string */
+#define PCB_PATH_DELIMETER ":"
+
+/****************************************************************************/
+/* These are static; they are kept "just in case", for further porting */
+
+/* C89 has atexit() */
+#define HAS_ATEXIT 1
+
+/* C89 has this */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `canonicalize_file_name' function.
+   It's a GNU extension, assume we don't have it and fall back to
+   realpath() */
+/* #define HAVE_CANONICALIZE_FILE_NAME 1 */
+/* Define if canonicalize_file_name is not declared in system header files. */
+/* #undef NEED_DECLARATION_CANONICALIZE_FILE_NAME */
+
+/****************************************************************************/
+/* Paths */
+
+#define PCB_PREFIX "@/local/prefix@"
+#define PCBSHAREDIR PCB_PREFIX "/share/pcb-rnd"
+#define PCBLIBDIR PCB_PREFIX "/lib/pcb-rnd"
+
+#define BINDIR PCB_PREFIX "/bin"
+
+/* Relative path from bindir to exec_prefix */
+#define BINDIR_TO_EXECPREFIX ".."
+
+/* Version number of package */
+#define PCB_VERSION "@/local/version@"
+#define PCB_REVISION "@/local/revision@"
+
+/* Format: abccrrrrr where a, b and c are pcb-rnd version numbers and r is
+   the svn revision number (optional) */
+#define PCB_API_VER @/local/apiver@
+
+
+/* Define to 1 if you have the `dmalloc' library (-ldmalloc);
+   (memory debugging without valgrind) */
+@]
+
+print_ternary libs/sul/dmalloc/presents {#define HAVE_LIBDMALLOC 1} {/*#undef HAVE_LIBDMALLOC */}
+
+print [@
+/*
+The documentation says it's not necessary to include dmalloc.h.
+Pros: getting source line info
+Cons: can't include from here, needs to be included from the bottom of the #include list from each file
+#ifdef HAVE_LIBDMALLOC
+#include <dmalloc.h>
+#endif
+*/
+
+@?/local/pcb/include_stdint@
+
+/* Coordinate type and properties, as detected by scconfig */
+typedef @/local/pcb/coord_type@ pcb_coord_t;
+#define COORD_MAX @/local/pcb/coord_max@
+#define coord_abs pcb_coord_abs
+
+/* Other autodetected types */
+typedef @/local/pcb/long64@    pcb_long64_t;
+
+/* the dot-dir: where to save user config under ther user's home; it's used
+   as ~/DOT_PCB_RND/ */
+#define DOT_PCB_RND "@/local/pcb/dot_pcb_rnd@"
+
+/* ./configure --workaround requests: */
+@?/local/pcb/workaround_defs@
+
+/* Make sure to catch usage of non-portable functions in debug mode
+   This is in here only because config.h should be included from every source
+   file. */
+#ifndef NDEBUG
+#	undef strdup
+#	undef strndup
+#	undef snprintf
+#	undef round
+#	undef strcasecmp
+#	define strdup      never_use_strdup__use_pcb_strdup
+#	define strndup     never_use_strndup__use_pcb_strndup
+#	define snprintf    never_use_snprintf__use_pcb_snprintf
+#	define round       never_use_round__use_pcb_round
+#	define strcasecmp  never_use_strcasecmp__use_pcb_strcasecmp
+#	ifndef PCB_SAFE_FS
+#		undef fopen
+#		undef popen
+#		undef system
+#		undef remove
+#		undef rename
+#		define fopen       never_use_fopen__use_pcb_fopen
+#		define popen       never_use_popen__use_pcb_popen
+#		define system      never_use_system__use_pcb_system
+#		define remove      never_use_remove__use_pcb_remove
+#		define rename      never_use_rename__use_pcb_rename
+#	endif
+
+#endif
+
+#endif
+@]
Index: tags/2.0.1/configure
===================================================================
--- tags/2.0.1/configure	(nonexistent)
+++ tags/2.0.1/configure	(revision 18980)
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd scconfig
+make
+./configure "$@"

Property changes on: tags/2.0.1/configure
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/data/Makefile
===================================================================
--- tags/2.0.1/data/Makefile	(nonexistent)
+++ tags/2.0.1/data/Makefile	(revision 18980)
@@ -0,0 +1,64 @@
+# This Makefile is a plain old hand written one; all configuration settings
+# are included from ../Makefile.conf which is scconfig generated
+
+theme = hicolor
+
+app_icon = pcb
+
+mime_icons = \
+	application-x-pcb-layout \
+	application-x-pcb-footprint \
+	application-x-pcb-netlist \
+	application-x-gerber \
+	application-x-excellon
+
+app_icon_files = \
+	$(app_icon:%=%-48.png) \
+	$(app_icon:%=%.svg)
+#	$(app_icon:%=%-16.png)
+#	$(app_icon:%=%-22.png)
+#	$(app_icon:%=%-24.png)
+#	$(app_icon:%=%-32.png)
+
+mime_icon_files = \
+	$(mime_icons:%=%-16.png) \
+	$(mime_icons:%=%-22.png) \
+	$(mime_icons:%=%-24.png) \
+	$(mime_icons:%=%-32.png) \
+	$(mime_icons:%=%-48.png) \
+	$(mime_icons:%=%.svg)
+
+mime_icon_sources = \
+	$(mime_icons:%=%-16.svg) \
+	$(mime_icons:%=%-22.svg) \
+	$(mime_icons:%=%-32.svg) \
+	$(mime_icons:%=%-48.svg)
+
+theme_icons = \
+	$(mime_icon_files:%=mimetypes,%) \
+	$(app_icon_files:%=apps,%)
+
+all:
+
+install_:
+	./icon-theme-installer \
+		-t $(theme) \
+		-m "$(MKDIR)" \
+		-s `pwd` \
+		-d x \
+		-b "$(themedir)" \
+		-x "$(CPC)" \
+		-i $(theme_icons)
+
+install:
+	$(MAKE) install_ CPC="$(CP)"
+
+linstall:
+	$(MAKE) install_ CPC="$(LN)"
+
+uninstall:
+	$(RM) $(DOCDIR)/examples/tut1.pcb
+
+include ../Makefile.conf
+themedir=$(DATADIR)/icons/$(theme)
+
Index: tags/2.0.1/data/README
===================================================================
--- tags/2.0.1/data/README	(nonexistent)
+++ tags/2.0.1/data/README	(revision 18980)
@@ -0,0 +1,56 @@
+
+PCB
+------------------------------------------------------------------------------
+
+README for icon data
+
+This file describes where the various icons came from and their license.
+
+The PCB layout and gerber icons and mime registration data were contributed
+by Tomaz Solc, and subsequently modified by Peter Clifton, including
+creation of an excellon icon file with a ruler element taken from
+Tomaz's gerber icon. The footprint and netlist icons were drawn by
+Peter Clifton.
+
+The page outline featured in all the above icons is from the GNOME icon
+theme's text-x-generic icon by Jakub Steiner.
+
+The icons are licensed under the GPL2 license.
+
+Scalable versions: (128x128 canvas for the "hicolor" fallback theme).
+These were scaled up from the 48x48 pixel targeted version.
+
+application-x-excellon.svg
+application-x-gerber.svg
+application-x-pcb-footprint.svg
+application-x-pcb-layout.svg
+application-x-pcb-netlist.svg
+
+Pixel targeted varients:
+
+application-x-excellon-{16,22,32,48}.svg
+application-x-gerber-{16,22,32,48}.svg
+application-x-pcb-footprint-{16,22,32,48}.svg
+application-x-pcb-layout-{16,22,32,48}.svg
+application-x-pcb-netlist-{16,22,32,48}.svg
+
+
+PNG versions of the above icons were exported from Inkscape. The 24x24 pixel
+versions are copied from the 22x22 version, with a 1 pixel border added:
+
+application-x-excellon-{16,22,24,32,48}.png
+application-x-gerber-{16,22,24,32,48}.png
+application-x-pcb-footprint-{16,22,24,32,48}.png
+application-x-pcb-layout-{16,22,24,32,48}.png
+application-x-pcb-netlist-{16,22,24,32,48}.png
+
+The script "regen_files" will re-export the SVG drawings to PNG and also
+regenerate the windows icon file.
+
+The PCB application icons were created by Peter Clifton, based upon the
+Gnome "text-editor" icon created by Lapo Calamandrei. The PCB specific
+additions are from the mime-type icons by Tomaz Solc.
+These icons are licensed under the GPL2 license.
+
+pcb.svg
+pcb-48.png
Index: tags/2.0.1/data/application-x-excellon-16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-excellon-16.png
===================================================================
--- tags/2.0.1/data/application-x-excellon-16.png	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-16.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-excellon-16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-excellon-16.svg
===================================================================
--- tags/2.0.1/data/application-x-excellon-16.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-16.svg	(revision 18980)
@@ -0,0 +1,1271 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="16"
+   width="16"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="24.343483"
+       x2="23.599062"
+       y1="24.191589"
+       x1="26.116739"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4158"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.240394"
+       x2="25.726562"
+       y1="13.291025"
+       x1="26.868286"
+       id="linearGradient4149"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2825">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop2827" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop2829" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2831"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient2833">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop2835" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop2837" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2839"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2849"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         id="stop2855"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2857" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2859"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2875">
+      <stop
+         id="stop2877"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2879"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2881">
+      <stop
+         id="stop2883"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2885"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2887">
+      <stop
+         id="stop2889"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2891"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2895"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2901"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2903"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2911">
+      <stop
+         id="stop2913"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2915" />
+      <stop
+         id="stop2917"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2923"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2929"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2931"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2935"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2768"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2766"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3245"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3243"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3241"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3239"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3237"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2759"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2757"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2755"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2747">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2749" />
+      <stop
+         id="stop2751"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2753" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-30.95756,-25.612946)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2739"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,20.68511,-9.3175274)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2737"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,15.73026,-12.552287)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2735"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2726">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2728" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2730" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2720">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2722" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2724" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2714">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2716" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2718" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-5.084646,22.928153)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2712"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3145"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop5056" />
+      <stop
+         id="stop5052"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3147"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5060"
+       inkscape:collect="always">
+      <stop
+         id="stop5062"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5064"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3149"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3151"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2683">
+      <stop
+         id="stop2685"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop2687"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3153"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2676">
+      <stop
+         id="stop2678"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop2680"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4143">
+      <stop
+         id="stop4145"
+         offset="0"
+         style="stop-color:#6f7368;stop-opacity:1;" />
+      <stop
+         id="stop4147"
+         offset="1"
+         style="stop-color:#cccec9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4699">
+      <stop
+         style="stop-color:#ffe71a;stop-opacity:1;"
+         offset="0"
+         id="stop4701" />
+      <stop
+         style="stop-color:#c7a51e;stop-opacity:1;"
+         offset="1"
+         id="stop4703" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2930"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2932"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2961"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2963"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2965"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2967"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2969"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2971"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2973"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2975"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2977"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.4476299,-4.4892272e-4,-7.7121596)"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2979"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4699"
+       id="linearGradient3028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3524229,0,0,0.358209,-0.4361232,-0.4179105)"
+       x1="35.5625"
+       y1="33.125"
+       x2="22.75"
+       y2="26.625" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="203"
+     inkscape:window-x="21"
+     inkscape:window-height="666"
+     inkscape:window-width="872"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="11.49354"
+     inkscape:cx="9.6075209"
+     inkscape:zoom="17.481619"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="16px"
+     height="16px"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Excellon file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient2270);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2272);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 1.9283192,0.50572542 L 13.823415,0.50000003 C 14.14841,0.4998436 14.5,0.84206075 14.5,1.0753168 L 14.5,15.07896 C 14.5,15.312218 14.30897,15.5 14.07168,15.5 L 1.9283192,15.5 C 1.6910303,15.5 1.5,15.312218 1.5,15.07896 L 1.5,0.92676521 C 1.5,0.69350923 1.6910303,0.50572542 1.9283192,0.50572542 z "
+       id="rect15391"
+       sodipodi:nodetypes="czccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2267);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 2.5498879,1.5291309 L 13.358707,1.4999999 C 13.358707,1.4999999 13.500063,1.6718479 13.499999,1.6993481 L 13.470416,14.45036 C 13.470416,14.47786 13.448165,14.499999 13.420529,14.499999 L 2.5498879,14.499999 C 2.5222499,14.499999 2.4999999,14.47786 2.4999999,14.45036 L 2.4999999,1.5787708 C 2.4999999,1.5512704 2.5222499,1.5291309 2.5498879,1.5291309 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccscccccc" />
+    <rect
+       rx="0.45982891"
+       y="2"
+       x="3"
+       height="12"
+       width="10"
+       id="rect4669"
+       style="fill:url(#linearGradient3028);fill-opacity:1;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52836752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3040"
+       sodipodi:cx="-19.519127"
+       sodipodi:cy="16.811073"
+       sodipodi:rx="2.2922819"
+       sodipodi:ry="2.2922819"
+       d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+       sodipodi:start="4.2429731"
+       sodipodi:end="10.524328"
+       sodipodi:open="true"
+       transform="matrix(-0.6542891,0,0,-0.6542968,-0.7711699,22.999431)"
+       inkscape:transform-center-y="3.2632507" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52836752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3038"
+       sodipodi:cx="-19.519127"
+       sodipodi:cy="16.811073"
+       sodipodi:rx="2.2922819"
+       sodipodi:ry="2.2922819"
+       d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+       sodipodi:start="4.2429731"
+       sodipodi:end="10.524328"
+       sodipodi:open="true"
+       transform="matrix(-0.6542891,0,0,-0.6542968,-6.7711699,22.999431)"
+       inkscape:transform-center-y="3.2632507" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4208"
+       d="M 5.791865,-0.46928089 L 4.7500001,8.113408 L 6.0666863,9.7711787 L 7.791587,8.5948552 L 9.0407016,0.080884306"
+       style="fill:#d3d7cf;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1.50000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <g
+       style="fill:url(#linearGradient2961);fill-opacity:1;display:inline"
+       transform="matrix(1.2931815,0.2057418,-7.5417718e-2,0.6606822,-24.58908,-16.749366)"
+       id="g4115">
+      <g
+         style="fill:url(#linearGradient2963);fill-opacity:1"
+         id="g4151">
+        <path
+           sodipodi:nodetypes="cccczcc"
+           id="path4107"
+           d="M 24.375,29.21875 L 24.359375,30.03125 L 25.29525,31.751311 L 26.890625,28.390625 L 26.84375,27.265625 C 26.809535,26.444455 26.25,26.296875 26.25,26.296875 L 24.375,29.21875 z "
+           style="fill:url(#linearGradient2965);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cczczcc"
+           id="path4111"
+           d="M 24.453125,24.484375 L 24.46875,25.34375 C 24.46875,25.34375 24.598474,27.12898 24.953125,26.609375 L 26.96875,23.65625 L 26.921875,22.53125 C 26.88766,21.71008 26.328125,21.5625 26.328125,21.5625 L 24.453125,24.484375 z "
+           style="fill:url(#linearGradient2967);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:transform-center-x="0.40625"
+           inkscape:transform-center-y="2.5708492"
+           sodipodi:nodetypes="cczczcc"
+           id="path4113"
+           d="M 24.566405,20.003369 L 24.55078,20.886182 C 24.55078,20.886182 24.627261,22.641145 24.980468,22.120557 L 27,19.143995 L 27.011718,17.761182 C 27.015842,17.274511 26.433593,16.667432 26.433593,16.667432 L 24.566405,20.003369 z "
+           style="fill:url(#linearGradient2969);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      </g>
+      <path
+         style="fill:url(#linearGradient2971);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 24.411556,30 L 24.411556,27.640625 C 24.418043,25.968596 26.964528,24.413691 26.984375,23.28125 L 26.953125,25.064296 C 26.828816,26.620424 24.411556,28.192478 24.411556,30 z "
+         id="path3130"
+         sodipodi:nodetypes="cczcz" />
+      <path
+         style="fill:url(#linearGradient2973);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 24.427181,25.296875 L 24.427181,22.9375 C 24.433668,21.265471 26.980153,19.710566 27,18.578125 L 26.96875,20.361171 C 26.844441,21.917299 24.427181,23.489353 24.427181,25.296875 z "
+         id="path4101"
+         sodipodi:nodetypes="cczcz"
+         inkscape:transform-center-y="1.4375" />
+      <path
+         style="fill:url(#linearGradient2975);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 24.55734,21 L 24.55734,18.640625 C 24.782577,16.593596 27.045565,13.805709 27.036409,14.328125 L 27.005159,16.111171 C 26.88085,17.667299 24.55734,19.192478 24.55734,21 z "
+         id="path4103"
+         sodipodi:nodetypes="cczcz" />
+      <rect
+         transform="matrix(1,0,2.6056413e-5,1,0,0)"
+         style="opacity:1;fill:url(#linearGradient2977);fill-opacity:1;stroke:#2e3436;stroke-width:0.10721753;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect4105"
+         width="2.4375"
+         height="10.450078"
+         x="24.655802"
+         y="6.7641392"
+         rx="4.3645973"
+         ry="0" />
+      <path
+         style="fill:url(#linearGradient2979);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.1072175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 25.30598,31.811622 C 25.687467,30.702093 26.891555,28.930237 26.90625,27.9375 L 26.875,30.048671 L 25.731221,31.83095 L 25.30598,31.811622 z "
+         id="path4109"
+         sodipodi:nodetypes="czccc" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13.5,6.90247 L 13.5,13.5"
+       id="path3042"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-excellon-22.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-excellon-22.png
===================================================================
--- tags/2.0.1/data/application-x-excellon-22.png	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-22.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-excellon-22.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-excellon-22.svg
===================================================================
--- tags/2.0.1/data/application-x-excellon-22.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-22.svg	(revision 18980)
@@ -0,0 +1,1571 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="22"
+   width="22"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="24.343483"
+       x2="23.599062"
+       y1="24.191589"
+       x1="26.116739"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4007"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="13.240394"
+       x2="25.726562"
+       y1="13.291025"
+       x1="26.868286"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4005"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="24.343483"
+       x2="23.599062"
+       y1="24.191589"
+       x1="26.116739"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2963"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="13.240394"
+       x2="25.726562"
+       y1="13.291025"
+       x1="26.868286"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2961"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4699">
+      <stop
+         id="stop4701"
+         offset="0"
+         style="stop-color:#ffe71a;stop-opacity:1;" />
+      <stop
+         id="stop4703"
+         offset="1"
+         style="stop-color:#c7a51e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4143">
+      <stop
+         style="stop-color:#6f7368;stop-opacity:1;"
+         offset="0"
+         id="stop4145" />
+      <stop
+         style="stop-color:#cccec9;stop-opacity:1;"
+         offset="1"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2629">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop2631" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop2633" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3153"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient2636">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop2638" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop2640" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3151"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3145"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient4225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-5.084646,22.928153)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2666">
+      <stop
+         id="stop2668"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2670"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2672">
+      <stop
+         id="stop2674"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2676"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2678">
+      <stop
+         id="stop2680"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2682"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.2500002,0.579507)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0,0,1.041132,-0.1035528,-6.694e-2)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient4211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,15.73026,-12.552287)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient4209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,20.68511,-9.3175274)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4207"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-30.95756,-25.612946)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2699">
+      <stop
+         id="stop2701"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2703" />
+      <stop
+         id="stop2705"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2707"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2711"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2718"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2943"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2941"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2939"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2937"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2935"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2933"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2931"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2929"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2927"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2925"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2923"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2921"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2919"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2911">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2913" />
+      <stop
+         id="stop2915"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2917" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2903"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2901"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2899"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2897"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2895"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2893"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2887">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2889" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2891" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2881">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2883" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2885" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2875">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2877" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2879" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2859"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2855" />
+      <stop
+         id="stop2857"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2849"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2841"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2839"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2833">
+      <stop
+         id="stop2835"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop2837"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2825">
+      <stop
+         id="stop2827"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop2829"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4149"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4158"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4141"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4139"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4137"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4129">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop4131" />
+      <stop
+         id="stop4133"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4135" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4121"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4119"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4113">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4115" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4117" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4107">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4109" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop4111" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4101">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4103" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4105" />
+    </linearGradient>
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4087"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4081">
+      <stop
+         id="stop4083"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop4085"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4079"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4073">
+      <stop
+         id="stop4075"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop4077"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4383"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4385"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4699"
+       id="linearGradient4446"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4933921,0,0,0.5074627,-0.8105739,-1.425373)"
+       x1="35.5625"
+       y1="33.125"
+       x2="4.7477508"
+       y2="20.317982" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4450"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4452"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4454"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4456"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4458"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4460"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(0.9979686,-0.1028865,5.9911427e-2,0.9958589,-1.9843688,2.1678402)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4462"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(0.9979686,-0.1028865,5.9911427e-2,0.9958589,-1.9843688,2.1678402)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4464"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(0.9979686,-0.1028865,5.9911427e-2,0.9958589,-1.9843688,2.1678402)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9979686,-0.1028865,8.6767217e-2,1.4416312,-2.4470638,-5.5123156)"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4468"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(0.9979686,-0.1028865,5.9911427e-2,0.9958589,-1.9843688,2.1678402)" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="123"
+     inkscape:window-x="151"
+     inkscape:window-height="815"
+     inkscape:window-width="876"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="21.102805"
+     inkscape:cx="12.263783"
+     inkscape:zoom="12.361371"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="22px"
+     height="22px"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="horizontal"
+       position="53.999577"
+       id="guide4448" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Excellon file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g2354"
+       inkscape:label="Shadow"
+       transform="matrix(0.5199887,0,0,0.2954903,-1.4208371,7.7713745)">
+      <g
+         id="g2356"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2358"
+           style="opacity:1;fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect2360"
+           style="opacity:1;fill:url(#radialGradient2372);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect2362"
+           style="opacity:1;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.0601086,0.50760946 L 18.963359,0.5 C 19.144215,0.5 19.5,0.8400659 19.5,1.1500805 L 19.5,19.876525 C 19.5,20.18654 19.250191,20.436118 18.939889,20.436118 L 3.0601086,20.436118 C 2.7498079,20.436118 2.499999,20.18654 2.499999,19.876525 L 2.499999,1.0672027 C 2.499999,0.75718813 2.7498079,0.50760946 3.0601086,0.50760946 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       style="fill:url(#linearGradient4446);fill-opacity:1;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4669"
+       width="14"
+       height="17"
+       x="4"
+       y="2"
+       rx="0.64376038" />
+    <g
+       id="g3104"
+       transform="matrix(-1.1478494,0,0,-1.1478494,39.422379,38.082977)">
+      <path
+         transform="matrix(0.3800087,0,0,0.3800132,35.817333,21.47887)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3983"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3800087,0,0,0.3800132,35.817333,17.122898)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3985"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3800087,0,0,0.3800131,35.817333,12.766928)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3987"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255128;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,12.766925)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3989"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,17.122898)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3991"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,21.47887)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3993"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.5682125,1.5536151 L 18.43423,1.5131665 C 18.520034,1.5274672 18.540449,1.5370178 18.540449,1.5752023 L 18.5,19.494799 C 18.5,19.532984 18.469577,19.563724 18.431788,19.563724 L 3.5682125,19.563724 C 3.5304227,19.563724 3.4999999,19.532984 3.4999999,19.494799 L 3.4999999,1.6225403 C 3.4999999,1.5843558 3.5304227,1.5536151 3.5682125,1.5536151 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       transform="translate(20.367762,-27.201283)"
+       id="g5326"
+       style="opacity:0.38500001;display:inline" />
+    <path
+       style="fill:#d3d7cf;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.321071,1.5486532 L 8.5676603,13.443305 L 9.7171422,14.672724 L 11.38332,13.879946 L 13.325344,2.0644945"
+       id="path4208"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g4115"
+       transform="matrix(1.1786472,0.2804816,-0.2019289,0.9022082,-13.991976,-20.006169)"
+       style="fill:url(#linearGradient4450);fill-opacity:1">
+      <g
+         id="g4151"
+         style="fill:url(#linearGradient4452);fill-opacity:1"
+         transform="matrix(0.9979686,-0.1028865,5.9911427e-2,0.9958589,-1.9843688,2.1678402)">
+        <path
+           style="fill:url(#linearGradient4454);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 24.375,29.21875 L 24.359375,30.03125 L 25.282326,31.027198 L 26.890625,28.390625 L 26.84375,27.265625 C 26.809535,26.444455 26.25,26.296875 26.25,26.296875 L 24.375,29.21875 z "
+           id="path4107"
+           sodipodi:nodetypes="cccczcc" />
+        <path
+           style="fill:url(#linearGradient4456);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.453125,24.484375 L 24.46875,25.34375 C 24.46875,25.34375 24.598474,27.12898 24.953125,26.609375 L 26.96875,23.65625 L 26.921875,22.53125 C 26.88766,21.71008 26.328125,21.5625 26.328125,21.5625 L 24.453125,24.484375 z "
+           id="path4111"
+           sodipodi:nodetypes="cczczcc" />
+        <path
+           style="fill:url(#linearGradient4458);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.566405,20.003369 L 24.55078,20.886182 C 24.55078,20.886182 24.627261,22.641145 24.980468,22.120557 L 27,19.143995 L 27.011718,17.761182 C 27.015842,17.274511 26.433593,16.667432 26.433593,16.667432 L 24.566405,20.003369 z "
+           id="path4113"
+           sodipodi:nodetypes="cczczcc"
+           inkscape:transform-center-y="2.5708492"
+           inkscape:transform-center-x="0.40625" />
+      </g>
+      <path
+         sodipodi:nodetypes="cczcz"
+         id="path3130"
+         d="M 24.174939,29.531986 L 24.033586,27.182381 C 23.939886,25.516609 26.388041,23.706144 26.340002,22.576351 L 26.41564,24.355228 C 26.384814,25.917702 24.066648,27.731949 24.174939,29.531986 z "
+         style="fill:url(#linearGradient4460);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:transform-center-y="1.4330632"
+         sodipodi:nodetypes="cczcz"
+         id="path4101"
+         d="M 23.908761,24.846729 L 23.767408,22.497125 C 23.673708,20.831352 26.121864,19.020888 26.073824,17.891094 L 26.149463,19.669972 C 26.118636,21.232445 23.80047,23.046692 23.908761,24.846729 z "
+         style="fill:url(#linearGradient4462);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         inkscape:transform-center-x="-0.11284996" />
+      <path
+         sodipodi:nodetypes="cczcz"
+         id="path4103"
+         d="M 23.781224,20.554257 L 23.639871,18.204652 C 23.74201,16.142926 25.833374,13.133753 25.855536,13.654948 L 25.931174,15.433825 C 25.900347,16.996299 23.672933,18.75422 23.781224,20.554257 z "
+         style="fill:url(#linearGradient4464);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <path
+         sodipodi:nodetypes="cscccc"
+         id="rect4105"
+         d="M 23.248084,10.054367 C 23.747229,10.569122 24.130006,10.473134 24.511317,9.9909255 C 24.761424,9.674638 25.208435,8.830077 25.722106,8.982516 L 26.085672,16.523187 L 23.653122,16.773973 L 23.248084,10.054367 z "
+         style="fill:url(#linearGradient4466);stroke:#2e3436;stroke-width:0.09449018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czccc"
+         id="path4109"
+         d="M 25.108322,30.489774 C 25.42256,29.34559 26.585809,28.211494 26.540998,27.221356 L 26.636295,29.327 L 25.533857,30.46527 L 25.108322,30.489774 z "
+         style="fill:url(#linearGradient4468);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       id="g4320"
+       inkscape:label="Text"
+       style="display:inline"
+       transform="translate(28.961512,-16.718176)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-excellon-24.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-excellon-24.png
===================================================================
--- tags/2.0.1/data/application-x-excellon-24.png	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-24.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-excellon-24.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-excellon-32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-excellon-32.png
===================================================================
--- tags/2.0.1/data/application-x-excellon-32.png	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-32.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-excellon-32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-excellon-32.svg
===================================================================
--- tags/2.0.1/data/application-x-excellon-32.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-32.svg	(revision 18980)
@@ -0,0 +1,1406 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="32"
+   width="32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       y2="24.343483"
+       x2="23.599062"
+       y1="24.191589"
+       x1="26.116739"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4158"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="13.240394"
+       x2="25.726562"
+       y1="13.291025"
+       x1="26.868286"
+       id="linearGradient4149"
+       xlink:href="#linearGradient4143"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2825">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop2827" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop2829" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2831"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient2833">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop2835" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop2837" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2839"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2849"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2853" />
+      <stop
+         id="stop2855"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2857" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2859"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2875">
+      <stop
+         id="stop2877"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2879"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2881">
+      <stop
+         id="stop2883"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2885"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2887">
+      <stop
+         id="stop2889"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2891"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2895"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2897"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2901"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2903"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2911">
+      <stop
+         id="stop2913"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2915" />
+      <stop
+         id="stop2917"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2923"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2929"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2931"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient2935"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient2937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient2939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient2943"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2720"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2718"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3245"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3243"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3241"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3239"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3237"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2711"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2709"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2707"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2699">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2701" />
+      <stop
+         id="stop2703"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2705" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-30.95756,-25.612946)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient4796"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,20.68511,-9.3175274)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5352"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,15.73026,-12.552287)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2688"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.960493,0,0,1.041132,-0.1035528,-6.694e-2)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2686"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.2500002,0.579507)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2684"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2678">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2680" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2682" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2672">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2674" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2676" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2666">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2668" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2670" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-5.084646,22.928153)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8166"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3145"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop5056" />
+      <stop
+         id="stop5052"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3147"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5060"
+       inkscape:collect="always">
+      <stop
+         id="stop5062"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5064"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3149"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3151"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2636">
+      <stop
+         id="stop2638"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop2640"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3153"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2629">
+      <stop
+         id="stop2631"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop2633"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4143">
+      <stop
+         id="stop4145"
+         offset="0"
+         style="stop-color:#6f7368;stop-opacity:1;" />
+      <stop
+         id="stop4147"
+         offset="1"
+         style="stop-color:#cccec9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4699">
+      <stop
+         style="stop-color:#ffe71a;stop-opacity:1;"
+         offset="0"
+         id="stop4701" />
+      <stop
+         style="stop-color:#c7a51e;stop-opacity:1;"
+         offset="1"
+         id="stop4703" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2961"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2963"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2965"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2967"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2969"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2971"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2973"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2975"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2977"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.4476299,-4.4892272e-4,-7.7121596)"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient2979"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4699"
+       id="linearGradient3004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7048458,0,0,0.7164179,-0.8722467,-0.8358206)"
+       x1="35.5625"
+       y1="33.125"
+       x2="11.588099"
+       y2="19.867088" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4005"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4007"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="7.5109921"
+     inkscape:cx="55.883583"
+     inkscape:zoom="6.6095375"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     gridtolerance="0.4"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Excellon file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="matrix(0.722222,0,0,0.444445,-1.2474509,10.111099)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <rect
+       rx="0.91965771"
+       y="4"
+       x="6"
+       height="24"
+       width="20"
+       id="rect4669"
+       style="fill:url(#linearGradient3004);fill-opacity:1;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       transform="matrix(-1.1478494,0,0,-1.1478494,41.09879,41.487463)"
+       id="g3104">
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3102"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,35.817332,23.221258)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3983"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,35.817333,19.736481)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3985"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,35.817333,16.251703)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3987"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,35.817333,12.766926)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3989"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,12.766925)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3991"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,16.251703)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3993"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,19.736481)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3995"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,27.105388,23.221259)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3997"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,21.878222,23.221259)" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:2.29255104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         id="path3999"
+         sodipodi:cx="-19.519127"
+         sodipodi:cy="16.811073"
+         sodipodi:rx="2.2922819"
+         sodipodi:ry="2.2922819"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:start="4.2429731"
+         sodipodi:end="10.524328"
+         sodipodi:open="true"
+         transform="matrix(0.3800087,0,0,0.3800132,21.878222,12.766925)" />
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.2577956,2.5103056 L 26.775661,2.5 C 27.191545,2.4998008 27.5,2.8726783 27.5,3.2925332 L 27.5,28.742131 C 27.5,29.161992 27.162024,29.500002 26.742205,29.500002 L 5.2577956,29.500002 C 4.8379769,29.500002 4.5,29.161992 4.5,28.742131 L 4.5,3.2681771 C 4.5,2.8483163 4.8379769,2.5103056 5.2577956,2.5103056 z "
+       id="rect15391"
+       sodipodi:nodetypes="czscccccc" />
+    <g
+       style="display:inline;opacity:0.385"
+       id="g5326"
+       transform="translate(-8.59375,-10.483107)" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.5954975,3.5 L 26.307144,3.5 C 26.439726,3.5 26.500001,3.5982653 26.500001,3.6511397 L 26.500001,28.343295 C 26.500001,28.396168 26.457409,28.438736 26.404502,28.438736 L 5.5954975,28.438736 C 5.5425918,28.438736 5.5000003,28.396168 5.5000003,28.343295 L 5.5000003,3.5954413 C 5.5000003,3.5425669 5.5425918,3.5 5.5954975,3.5 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="29"
+       height="5"
+       x="1.5"
+       y="21.5" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="27"
+       height="3"
+       x="2.5"
+       y="22.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 28.5,21.5 L 28.5,24.5"
+       id="path3131" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.5,21.5 L 24.5,24.5"
+       id="path3133" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 20.5,21.5 L 20.5,24.5"
+       id="path3135" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 16.5,21.5 L 16.5,24.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 12.5,21.5 L 12.5,24.5"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 8.499996,21.5 L 8.499996,24.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 4.5,21.5 L 4.5,24.5"
+       id="path3143" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4208"
+       d="M 13.79348,6.2643059 L 11.111699,17.984595 L 12.161117,19.300459 L 13.884388,18.640931 L 16.747985,7.0144044"
+       style="fill:#d3d7cf;fill-rule:evenodd;stroke:#8f5902;stroke-width:1.49999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       style="fill:url(#linearGradient4005);fill-opacity:1"
+       transform="matrix(1.1786472,0.2804816,-0.2019289,0.9022082,-11.630277,-15.95571)"
+       id="g4115">
+      <g
+         style="fill:url(#linearGradient4007);fill-opacity:1"
+         id="g4151">
+        <path
+           sodipodi:nodetypes="cccczcc"
+           id="path4107"
+           d="M 24.375,29.21875 L 24.359375,30.03125 L 25.282326,31.027198 L 26.890625,28.390625 L 26.84375,27.265625 C 26.809535,26.444455 26.25,26.296875 26.25,26.296875 L 24.375,29.21875 z "
+           style="fill:url(#linearGradient2965);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cczczcc"
+           id="path4111"
+           d="M 24.453125,24.484375 L 24.46875,25.34375 C 24.46875,25.34375 24.598474,27.12898 24.953125,26.609375 L 26.96875,23.65625 L 26.921875,22.53125 C 26.88766,21.71008 26.328125,21.5625 26.328125,21.5625 L 24.453125,24.484375 z "
+           style="fill:url(#linearGradient2967);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:transform-center-x="0.40625"
+           inkscape:transform-center-y="2.5708492"
+           sodipodi:nodetypes="cczczcc"
+           id="path4113"
+           d="M 24.566405,20.003369 L 24.55078,20.886182 C 24.55078,20.886182 24.627261,22.641145 24.980468,22.120557 L 27,19.143995 L 27.011718,17.761182 C 27.015842,17.274511 26.433593,16.667432 26.433593,16.667432 L 24.566405,20.003369 z "
+           style="fill:url(#linearGradient2969);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      </g>
+      <path
+         style="fill:url(#linearGradient2971);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 24.411556,30 L 24.411556,27.640625 C 24.418043,25.968596 26.964528,24.413691 26.984375,23.28125 L 26.953125,25.064296 C 26.828816,26.620424 24.411556,28.192478 24.411556,30 z "
+         id="path3130"
+         sodipodi:nodetypes="cczcz" />
+      <path
+         style="fill:url(#linearGradient2973);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 24.427181,25.296875 L 24.427181,22.9375 C 24.433668,21.265471 26.980153,19.710566 27,18.578125 L 26.96875,20.361171 C 26.844441,21.917299 24.427181,23.489353 24.427181,25.296875 z "
+         id="path4101"
+         sodipodi:nodetypes="cczcz"
+         inkscape:transform-center-y="1.4375" />
+      <path
+         style="fill:url(#linearGradient2975);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 24.55734,21 L 24.55734,18.640625 C 24.782577,16.593596 27.045565,13.805709 27.036409,14.328125 L 27.005159,16.111171 C 26.88085,17.667299 24.55734,19.192478 24.55734,21 z "
+         id="path4103"
+         sodipodi:nodetypes="cczcz" />
+      <path
+         transform="matrix(1,0,2.6056413e-5,1,0,0)"
+         style="fill:url(#linearGradient2977);stroke:#2e3436;stroke-width:0.09449018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 24.655198,10.466587 C 25.121422,11.031651 25.508366,10.975241 25.916999,10.533243 C 26.185027,10.243331 26.680807,9.4464758 27.183213,9.651455 L 27.093303,17.214216 L 24.655802,17.214216 L 24.655198,10.466587 z "
+         id="rect4105"
+         sodipodi:nodetypes="cscccc" />
+      <path
+         style="fill:url(#linearGradient2979);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09449017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 25.283691,31.051875 C 25.665178,29.942346 26.891555,28.930237 26.90625,27.9375 L 26.875,30.048671 L 25.708932,31.071203 L 25.283691,31.051875 z "
+         id="path4109"
+         sodipodi:nodetypes="czccc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-excellon-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-excellon-48.png
===================================================================
--- tags/2.0.1/data/application-x-excellon-48.png	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-excellon-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-excellon-48.svg
===================================================================
--- tags/2.0.1/data/application-x-excellon-48.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon-48.svg	(revision 18980)
@@ -0,0 +1,1283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4699">
+      <stop
+         id="stop4701"
+         offset="0"
+         style="stop-color:#ffe71a;stop-opacity:1;" />
+      <stop
+         id="stop4703"
+         offset="1"
+         style="stop-color:#c7a51e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4143">
+      <stop
+         style="stop-color:#6f7368;stop-opacity:1;"
+         offset="0"
+         id="stop4145" />
+      <stop
+         style="stop-color:#cccec9;stop-opacity:1;"
+         offset="1"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3153"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3151"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3145"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-5.084646,22.928153)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.2500002,0.579507)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0,0,1.041132,-0.1035528,-6.694e-2)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,15.73026,-12.552287)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,20.68511,-9.3175274)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-30.95756,-25.612946)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2943"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2941"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2939"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2937"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2935"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2933"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2931"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2929"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2927"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2925"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2923"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2921"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2919"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2911">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2913" />
+      <stop
+         id="stop2915"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2917" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2903"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2901"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2899"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2897"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2895"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2893"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2887">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2889" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2891" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2881">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2883" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2885" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2875">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2877" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2879" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2859"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2855" />
+      <stop
+         id="stop2857"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2849"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2841"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2839"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2833">
+      <stop
+         id="stop2835"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop2837"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2825">
+      <stop
+         id="stop2827"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop2829"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4149"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4158"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4182"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4184"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4186"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4188"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4190"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4192"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4194"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(1,0,0,1.4476299,-4.4892272e-4,-7.7121596)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4196"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4699"
+       id="linearGradient4697"
+       x1="35.5625"
+       y1="33.125"
+       x2="22.75"
+       y2="26.625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0572687,0,0,1.0223881,-1.3083701,-0.9011194)" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="5"
+     inkscape:window-height="967"
+     inkscape:window-width="993"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="34.454858"
+     inkscape:cx="38.982143"
+     inkscape:zoom="8"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Excellon file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="translate(-2e-6,2.838692e-5)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 7.6490486,3.5795062 L 40.096063,3.5638812 C 40.846303,3.5635199 41.375,4.232605 41.375,4.869166 L 41.375,43.350952 C 41.375,43.987525 40.862524,44.5 40.225951,44.5 L 7.6490486,44.5 C 7.0124757,44.5 6.5,43.987525 6.5,43.350952 L 6.5,4.7285548 C 6.5,4.0919819 7.0124757,3.5795062 7.6490486,3.5795062 z "
+       id="rect15391"
+       sodipodi:nodetypes="csscccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.8151023,4.5839462 L 40.128994,4.5839462 C 40.128994,4.5839462 40.44194,4.792873 40.44194,4.875446 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="opacity:1;fill:url(#linearGradient4697);fill-opacity:1;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4669"
+       width="30"
+       height="34.25"
+       x="9"
+       y="6"
+       rx="1.3794866" />
+    <path
+       style="fill:#d3d7cf;fill-rule:evenodd;stroke:#8f5902;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 18.8125,12.75 L 15.125,28.375 L 16.75,29.625 L 18.9375,29.25 L 22.875,13.75"
+       id="path4208"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g3104"
+       transform="matrix(-1.5006961,0,0,-1.5006961,56.271231,57.208221)">
+      <path
+         inkscape:transform-center-y="3.264765"
+         transform="matrix(0.4361927,0,0,0.436198,27.014112,14.167043)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3076"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.4361926,0,0,0.4361979,27.014111,10.167045)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3078"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-y="3.264765"
+         transform="matrix(0.4361927,0,0,0.436198,27.014113,22.167043)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3092"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.4361926,0,0,0.4361979,27.014112,18.167045)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3094"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-y="3.264765"
+         transform="matrix(0.4361927,0,0,0.436198,38.014111,14.167043)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3096"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.4361926,0,0,0.4361979,38.01411,10.167045)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3098"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.4361926,0,0,0.4361979,38.014111,18.167045)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3100"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.4361926,0,0,0.4361979,38.014111,22.167045)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path3102"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-y="3.264765"
+         transform="matrix(0.4361927,0,0,0.436198,21.390672,10.13155)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path4200"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-y="3.264765"
+         transform="matrix(0.4361927,0,0,0.436198,21.390672,22.125984)"
+         sodipodi:open="true"
+         sodipodi:end="10.524328"
+         sodipodi:start="4.2429731"
+         d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+         sodipodi:ry="2.2922819"
+         sodipodi:rx="2.2922819"
+         sodipodi:cy="16.811073"
+         sodipodi:cx="-19.519127"
+         id="path4204"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g4115"
+       transform="matrix(1.6206621,0.3739264,-0.2776561,1.2027862,-16.145643,-16.872796)"
+       style="fill:url(#linearGradient4149);fill-opacity:1">
+      <g
+         id="g4151"
+         style="fill:url(#linearGradient4158);fill-opacity:1">
+        <path
+           style="fill:url(#linearGradient4182);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 24.375,29.21875 L 24.359375,30.03125 L 25.515625,30.703125 L 26.890625,28.390625 L 26.84375,27.265625 C 26.809535,26.444455 26.25,26.296875 26.25,26.296875 L 24.375,29.21875 z "
+           id="path4107"
+           sodipodi:nodetypes="cccczcc" />
+        <path
+           style="fill:url(#linearGradient4184);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.453125,24.484375 L 24.46875,25.34375 C 24.46875,25.34375 24.598474,27.12898 24.953125,26.609375 L 26.96875,23.65625 L 26.921875,22.53125 C 26.88766,21.71008 26.328125,21.5625 26.328125,21.5625 L 24.453125,24.484375 z "
+           id="path4111"
+           sodipodi:nodetypes="cczczcc" />
+        <path
+           style="fill:url(#linearGradient4186);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.566405,20.003369 L 24.55078,20.886182 C 24.55078,20.886182 24.627261,22.641145 24.980468,22.120557 L 27,19.143995 L 27.011718,17.761182 C 27.015842,17.274511 26.433593,16.667432 26.433593,16.667432 L 24.566405,20.003369 z "
+           id="path4113"
+           sodipodi:nodetypes="cczczcc"
+           inkscape:transform-center-y="2.5708492"
+           inkscape:transform-center-x="0.40625" />
+      </g>
+      <path
+         sodipodi:nodetypes="cczcz"
+         id="path3130"
+         d="M 24.411556,30 L 24.411556,27.640625 C 24.418043,25.968596 26.964528,24.413691 26.984375,23.28125 L 26.953125,25.064296 C 26.828816,26.620424 24.411556,28.192478 24.411556,30 z "
+         style="fill:url(#linearGradient4188);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:transform-center-y="1.4375"
+         sodipodi:nodetypes="cczcz"
+         id="path4101"
+         d="M 24.427181,25.296875 L 24.427181,22.9375 C 24.433668,21.265471 26.980153,19.710566 27,18.578125 L 26.96875,20.361171 C 26.844441,21.917299 24.427181,23.489353 24.427181,25.296875 z "
+         style="fill:url(#linearGradient4190);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <path
+         sodipodi:nodetypes="cczcz"
+         id="path4103"
+         d="M 24.55734,21 L 24.55734,18.640625 C 24.782577,16.593596 27.045565,13.805709 27.036409,14.328125 L 27.005159,16.111171 C 26.88085,17.667299 24.55734,19.192478 24.55734,21 z "
+         style="fill:url(#linearGradient4192);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <rect
+         ry="0"
+         rx="4.3645973"
+         y="6.7641392"
+         x="24.655802"
+         height="10.450078"
+         width="2.4375"
+         id="rect4105"
+         style="opacity:1;fill:url(#linearGradient4194);fill-opacity:1;stroke:#2e3436;stroke-width:0.06978973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(1,0,2.6056413e-5,1,0,0)" />
+      <path
+         sodipodi:nodetypes="czccc"
+         id="path4109"
+         d="M 25.427181,30.671875 C 25.808668,29.562346 26.891555,28.930237 26.90625,27.9375 L 26.875,30.048671 L 25.852422,30.691203 L 25.427181,30.671875 z "
+         style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       style="display:inline"
+       transform="matrix(2.105461e-2,0,0,2.086758e-2,43.101716,38.66252)"
+       id="g3081">
+      <rect
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect3083"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
+      <path
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path3085"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path3087"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3356);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="40"
+       height="6.0000005"
+       x="4.5"
+       y="35.5" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="38"
+       height="4"
+       x="5.5"
+       y="36.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 39.5,35.5 L 39.5,38.5"
+       id="path3131" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 34.499995,35.5 L 34.499995,38.5"
+       id="path3133" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 29.499995,35.5 L 29.499995,38.5"
+       id="path3135" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.499995,35.5 L 24.499995,38.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 19.499995,35.5 L 19.499995,38.5"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 14.499996,35.5 L 14.499996,38.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.499995,35.5 L 9.499995,38.5"
+       id="path3143" />
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-excellon.svg
===================================================================
--- tags/2.0.1/data/application-x-excellon.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-excellon.svg	(revision 18980)
@@ -0,0 +1,1289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="128"
+   width="128"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient4699">
+      <stop
+         id="stop4701"
+         offset="0"
+         style="stop-color:#ffe71a;stop-opacity:1;" />
+      <stop
+         id="stop4703"
+         offset="1"
+         style="stop-color:#c7a51e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4143">
+      <stop
+         style="stop-color:#6f7368;stop-opacity:1;"
+         offset="0"
+         id="stop4145" />
+      <stop
+         style="stop-color:#cccec9;stop-opacity:1;"
+         offset="1"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3153"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3151"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3145"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-5.084646,22.928153)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.2500002,0.579507)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0,0,1.041132,-0.1035528,-6.694e-2)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,15.73026,-12.552287)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,20.68511,-9.3175274)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-30.95756,-25.612946)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2943"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2941"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2939"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2937"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2935"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2933"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientTransform="translate(0.2499915,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2931"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2929"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2927"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2925"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2923"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2921"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2919"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2911">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2913" />
+      <stop
+         id="stop2915"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2917" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2903"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2901"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2899"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2897"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2895"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2893"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2887">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2889" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2891" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2881">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2883" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2885" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2875">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2877" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2879" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2859"
+       xlink:href="#linearGradient5048"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         id="stop2853"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2855" />
+      <stop
+         id="stop2857"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2849"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2841"
+       xlink:href="#linearGradient5060"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="14.544756"
+       x2="6.256557"
+       y1="14.544756"
+       x1="43.421204"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2839"
+       xlink:href="#linearGradient10424"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2833">
+      <stop
+         id="stop2835"
+         offset="0"
+         style="stop-color:#d8c100;stop-opacity:1;" />
+      <stop
+         id="stop2837"
+         offset="1"
+         style="stop-color:#ffe501;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(44.874995,-2.75)"
+       y2="11.919756"
+       x2="4.6249981"
+       y1="17.482256"
+       x1="44.625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2831"
+       xlink:href="#linearGradient10440"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2825">
+      <stop
+         id="stop2827"
+         offset="0"
+         style="stop-color:#605400;stop-opacity:1;" />
+      <stop
+         id="stop2829"
+         offset="1"
+         style="stop-color:#887800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4149"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4158"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4182"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4184"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4186"
+       gradientUnits="userSpaceOnUse"
+       x1="26.116739"
+       y1="24.191589"
+       x2="23.599062"
+       y2="24.343483" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4188"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4190"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4192"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4194"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394"
+       gradientTransform="matrix(1,0,0,1.4476299,-4.4892272e-4,-7.7121596)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4143"
+       id="linearGradient4196"
+       gradientUnits="userSpaceOnUse"
+       x1="26.868286"
+       y1="13.291025"
+       x2="25.726562"
+       y2="13.240394" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4699"
+       id="linearGradient4697"
+       x1="35.5625"
+       y1="33.125"
+       x2="22.75"
+       y2="26.625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0572687,0,0,1.0223881,-1.3083701,-0.9011194)" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="5"
+     inkscape:window-height="967"
+     inkscape:window-width="993"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="51.789128"
+     inkscape:cx="5.8207974"
+     inkscape:zoom="2"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     width="128px"
+     height="128px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Excellon file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2357"
+       transform="scale(2.6667,2.6667)">
+      <g
+         transform="translate(-2e-6,2.838692e-5)"
+         inkscape:label="Shadow"
+         id="g2033"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           style="opacity:0.4"
+           id="g3712">
+          <rect
+             style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect2801"
+             width="5"
+             height="7"
+             x="38"
+             y="40" />
+          <rect
+             style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3696"
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)" />
+          <rect
+             style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3700"
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40" />
+        </g>
+      </g>
+      <path
+         sodipodi:nodetypes="csscccccc"
+         id="rect15391"
+         d="M 7.6490486,3.5795062 L 40.096063,3.5638812 C 40.846303,3.5635199 41.375,4.232605 41.375,4.869166 L 41.375,43.350952 C 41.375,43.987525 40.862524,44.5 40.225951,44.5 L 7.6490486,44.5 C 7.0124757,44.5 6.5,43.987525 6.5,43.350952 L 6.5,4.7285548 C 6.5,4.0919819 7.0124757,3.5795062 7.6490486,3.5795062 z "
+         style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15660"
+         d="M 7.8151023,4.5839462 L 40.128994,4.5839462 C 40.128994,4.5839462 40.44194,4.792873 40.44194,4.875446 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <rect
+         rx="1.3794866"
+         y="6"
+         x="9"
+         height="34.25"
+         width="30"
+         id="rect4669"
+         style="opacity:1;fill:url(#linearGradient4697);fill-opacity:1;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path4208"
+         d="M 18.8125,12.75 L 15.125,28.375 L 16.75,29.625 L 18.9375,29.25 L 22.875,13.75"
+         style="fill:#d3d7cf;fill-rule:evenodd;stroke:#8f5902;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <g
+         transform="matrix(-1.5006961,0,0,-1.5006961,56.271231,57.208221)"
+         id="g3104"
+         style="display:inline">
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3076"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361927,0,0,0.436198,27.014112,14.167043)"
+           inkscape:transform-center-y="3.264765" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3078"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361926,0,0,0.4361979,27.014111,10.167045)" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3092"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361927,0,0,0.436198,27.014113,22.167043)"
+           inkscape:transform-center-y="3.264765" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3094"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361926,0,0,0.4361979,27.014112,18.167045)" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3096"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361927,0,0,0.436198,38.014111,14.167043)"
+           inkscape:transform-center-y="3.264765" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3098"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361926,0,0,0.4361979,38.01411,10.167045)" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3100"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361926,0,0,0.4361979,38.014111,18.167045)" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765882;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3102"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361926,0,0,0.4361979,38.014111,22.167045)" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path4200"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361927,0,0,0.436198,21.390672,10.13155)"
+           inkscape:transform-center-y="3.264765" />
+        <path
+           sodipodi:type="arc"
+           style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.52765846;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path4204"
+           sodipodi:cx="-19.519127"
+           sodipodi:cy="16.811073"
+           sodipodi:rx="2.2922819"
+           sodipodi:ry="2.2922819"
+           d="M -20.556076,14.766741 A 2.2922819,2.2922819 0 1 1 -20.559816,14.768643"
+           sodipodi:start="4.2429731"
+           sodipodi:end="10.524328"
+           sodipodi:open="true"
+           transform="matrix(0.4361927,0,0,0.436198,21.390672,22.125984)"
+           inkscape:transform-center-y="3.264765" />
+      </g>
+      <g
+         style="fill:url(#linearGradient4149);fill-opacity:1;display:inline"
+         transform="matrix(1.6206621,0.3739264,-0.2776561,1.2027862,-16.145643,-16.872796)"
+         id="g4115">
+        <g
+           style="fill:url(#linearGradient4158);fill-opacity:1"
+           id="g4151">
+          <path
+             sodipodi:nodetypes="cccczcc"
+             id="path4107"
+             d="M 24.375,29.21875 L 24.359375,30.03125 L 25.515625,30.703125 L 26.890625,28.390625 L 26.84375,27.265625 C 26.809535,26.444455 26.25,26.296875 26.25,26.296875 L 24.375,29.21875 z "
+             style="fill:url(#linearGradient4182);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cczczcc"
+             id="path4111"
+             d="M 24.453125,24.484375 L 24.46875,25.34375 C 24.46875,25.34375 24.598474,27.12898 24.953125,26.609375 L 26.96875,23.65625 L 26.921875,22.53125 C 26.88766,21.71008 26.328125,21.5625 26.328125,21.5625 L 24.453125,24.484375 z "
+             style="fill:url(#linearGradient4184);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+          <path
+             inkscape:transform-center-x="0.40625"
+             inkscape:transform-center-y="2.5708492"
+             sodipodi:nodetypes="cczczcc"
+             id="path4113"
+             d="M 24.566405,20.003369 L 24.55078,20.886182 C 24.55078,20.886182 24.627261,22.641145 24.980468,22.120557 L 27,19.143995 L 27.011718,17.761182 C 27.015842,17.274511 26.433593,16.667432 26.433593,16.667432 L 24.566405,20.003369 z "
+             style="fill:url(#linearGradient4186);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+        </g>
+        <path
+           style="fill:url(#linearGradient4188);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 24.411556,30 L 24.411556,27.640625 C 24.418043,25.968596 26.964528,24.413691 26.984375,23.28125 L 26.953125,25.064296 C 26.828816,26.620424 24.411556,28.192478 24.411556,30 z "
+           id="path3130"
+           sodipodi:nodetypes="cczcz" />
+        <path
+           style="fill:url(#linearGradient4190);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.427181,25.296875 L 24.427181,22.9375 C 24.433668,21.265471 26.980153,19.710566 27,18.578125 L 26.96875,20.361171 C 26.844441,21.917299 24.427181,23.489353 24.427181,25.296875 z "
+           id="path4101"
+           sodipodi:nodetypes="cczcz"
+           inkscape:transform-center-y="1.4375" />
+        <path
+           style="fill:url(#linearGradient4192);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 24.55734,21 L 24.55734,18.640625 C 24.782577,16.593596 27.045565,13.805709 27.036409,14.328125 L 27.005159,16.111171 C 26.88085,17.667299 24.55734,19.192478 24.55734,21 z "
+           id="path4103"
+           sodipodi:nodetypes="cczcz" />
+        <rect
+           transform="matrix(1,0,2.6056413e-5,1,0,0)"
+           style="opacity:1;fill:url(#linearGradient4194);fill-opacity:1;stroke:#2e3436;stroke-width:0.06978973;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect4105"
+           width="2.4375"
+           height="10.450078"
+           x="24.655802"
+           y="6.7641392"
+           rx="4.3645973"
+           ry="0" />
+        <path
+           style="fill:url(#linearGradient4196);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.06978972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 25.427181,30.671875 C 25.808668,29.562346 26.891555,28.930237 26.90625,27.9375 L 26.875,30.048671 L 25.852422,30.691203 L 25.427181,30.671875 z "
+           id="path4109"
+           sodipodi:nodetypes="czccc" />
+      </g>
+      <g
+         id="g3081"
+         transform="matrix(2.105461e-2,0,0,2.086758e-2,43.101716,38.66252)"
+         style="display:inline">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect3083"
+           style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           sodipodi:nodetypes="cccc"
+           id="path3085"
+           d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3356);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+           id="path3087"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <rect
+         y="35.5"
+         x="4.5"
+         height="6.0000005"
+         width="40"
+         id="rect3127"
+         style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <rect
+         ry="0"
+         y="36.5"
+         x="5.5"
+         height="4"
+         width="38"
+         id="rect3129"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3131"
+         d="M 39.5,35.5 L 39.5,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3133"
+         d="M 34.499995,35.5 L 34.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3135"
+         d="M 29.499995,35.5 L 29.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3137"
+         d="M 24.499995,35.5 L 24.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3139"
+         d="M 19.499995,35.5 L 19.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3141"
+         d="M 14.499996,35.5 L 14.499996,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3143"
+         d="M 9.499995,35.5 L 9.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-gerber-16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-gerber-16.png
===================================================================
--- tags/2.0.1/data/application-x-gerber-16.png	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-16.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-gerber-16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-gerber-16.svg
===================================================================
--- tags/2.0.1/data/application-x-gerber-16.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-16.svg	(revision 18980)
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-gerber-16.png"
+   sodipodi:docname="application-x-gerber-16.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="16"
+   width="16"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.6727452,-1.187499,1.7316091)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.6727452,-1.187499,1.7316091)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="666"
+     inkscape:window-width="872"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="8.0395256"
+     inkscape:cx="3.1008866"
+     inkscape:zoom="24.722742"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="16px"
+     height="16px"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gerber file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient2270);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2272);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 1.9283192,0.50572542 L 10.668425,0.50000003 C 10.668425,0.50000003 14.5,3.9970506 14.5,4.2303066 L 14.5,15.07896 C 14.5,15.312218 14.30897,15.5 14.07168,15.5 L 1.9283192,15.5 C 1.6910303,15.5 1.5,15.312218 1.5,15.07896 L 1.5,0.92676521 C 1.5,0.69350923 1.6910303,0.50572542 1.9283192,0.50572542 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3089"
+       style="opacity:0.38461537;display:inline"
+       transform="translate(-19.541195,-20.514447)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path3091"
+         d="M 24.041195,22.9574 L 26.027797,24.941006 L 25.987348,27.897462"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3099"
+         d="M 25.527797,27.4574 L 25.527797,28.514447"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3103"
+         d="M 29.527797,27.4574 L 29.527797,28.509514"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4406"
+         d="M 28.045802,23.017338 L 28.027769,24.029366 L 29.027769,25.000944 L 28.987047,27.9574"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2267);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 2.5498879,1.5291309 L 10.284614,1.4999999 C 10.284614,1.4999999 13.499999,4.4628004 13.499999,4.4903007 L 13.470416,14.45036 C 13.470416,14.47786 13.448165,14.499999 13.420529,14.499999 L 2.5498879,14.499999 C 2.5222499,14.499999 2.4999999,14.47786 2.4999999,14.45036 L 2.4999999,1.5787708 C 2.4999999,1.5512704 2.5222499,1.5291309 2.5498879,1.5291309 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g2455"
+       transform="matrix(0.7602792,0,0,0.7602792,-9.226339,5.4615348)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2254);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2256);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2258);stroke-width:1.31530643;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2260);stroke-width:1.3153069;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.385087,-3.7201259 C 29.050095,-4.3394746 29.205755,-3.8768359 28.321508,-4.4457758 C 28.316997,-3.9329987 28.412206,-4.339708 28.300666,-3.7332338 C 28.300666,-3.7332338 29.026021,-3.7946863 29.385087,-3.7201259 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="15"
+       height="4.0000048"
+       x="0.49999988"
+       y="9.4999952" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999976;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="13.000001"
+       height="2.0000002"
+       x="1.5"
+       y="10.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 12.5,9.6339912 L 12.5,11.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.5,9.5 L 9.5,11.505824"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.5,9.5575468 L 6.5,11.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 3.5,9.5510749 L 3.5,11.5"
+       id="path3143" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-gerber-22.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-gerber-22.png
===================================================================
--- tags/2.0.1/data/application-x-gerber-22.png	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-22.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-gerber-22.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-gerber-22.svg
===================================================================
--- tags/2.0.1/data/application-x-gerber-22.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-22.svg	(revision 18980)
@@ -0,0 +1,608 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-gerber-22.png"
+   sodipodi:docname="application-x-gerber-22.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="22"
+   width="22"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5249999,0,0,0.6727441,-1.8624985,5.7316257)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5249999,0,0,0.6727441,-1.8624985,5.7316257)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="815"
+     inkscape:window-width="876"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="11.283134"
+     inkscape:cx="8.5279741"
+     inkscape:zoom="12.361371"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="22px"
+     height="22px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gerber file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g2354"
+       inkscape:label="Shadow"
+       transform="matrix(0.5199887,0,0,0.2954903,-1.4208371,7.7713745)">
+      <g
+         id="g2356"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2358"
+           style="opacity:1;fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect2360"
+           style="opacity:1;fill:url(#radialGradient2372);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect2362"
+           style="opacity:1;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.0601086,0.50760946 L 14.489478,0.5 C 14.489478,0.5 19.5,5.1478405 19.5,5.4578551 L 19.5,19.876525 C 19.5,20.18654 19.250191,20.436118 18.939889,20.436118 L 3.0601086,20.436118 C 2.7498079,20.436118 2.499999,20.18654 2.499999,19.876525 L 2.499999,1.0672027 C 2.499999,0.75718813 2.7498079,0.50760946 3.0601086,0.50760946 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.5682125,1.5536151 L 14.144009,1.5131665 C 14.144009,1.5131665 18.540449,5.6270281 18.540449,5.6652126 L 18.5,19.494799 C 18.5,19.532984 18.469577,19.563724 18.431788,19.563724 L 3.5682125,19.563724 C 3.5304227,19.563724 3.4999999,19.532984 3.4999999,19.494799 L 3.4999999,1.6225403 C 3.4999999,1.5843558 3.5304227,1.5536151 3.5682125,1.5536151 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3089"
+       style="opacity:0.38461537;display:inline"
+       transform="translate(-14.543631,-17.428931)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path3091"
+         d="M 23.027797,19.959636 L 24.043632,21.262263 L 24.043632,27.928932"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3093"
+         d="M 27.043631,27.928932 L 27.043631,20.298886 L 26.679245,19.951361"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         sodipodi:nodetypes="ccc" />
+      <path
+         id="path3095"
+         d="M 31.043631,28.101234 L 31.043631,21.917918"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path3099"
+         d="M 24.501906,27.37074 L 24.501906,28.443166"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3101"
+         d="M 27.543631,27.40046 L 27.543631,28.4574"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3103"
+         d="M 30.543631,27.376817 L 30.543631,28.428931"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3109"
+         d="M 30.543631,34.335929 L 30.543631,35.392869"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3111"
+         d="M 27.543631,34.383937 L 27.543631,35.428931"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3113"
+         d="M 24.460185,34.322516 L 24.460185,35.412448"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path3123"
+         d="M 19.018435,20.900329 L 20.245896,20.92893 L 21.960181,22.535218 L 21.960181,30.516767 L 19.051124,30.48704 L 19.018435,20.900329 z "
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+    <g
+       id="g2455"
+       transform="translate(-11.707402,7.0259378)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2460);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2462);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2464);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2466);stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.611197,-3.4408139 C 29.276205,-4.0601626 28.899842,-4.3423558 28.015595,-4.9112957 C 28.011084,-4.3985186 28.119593,-4.0470954 28.008053,-3.4406212 C 28.008053,-3.4406212 29.252131,-3.5153743 29.611197,-3.4408139 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="21"
+       height="3.9999986"
+       x="0.5"
+       y="13.500001" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="19.000002"
+       height="2.0000002"
+       x="1.4999999"
+       y="14.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 18.5,13.5 L 18.5,15.5"
+       id="path3133" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 15.5,13.5 L 15.5,15.5"
+       id="path3135" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 12.5,13.5 L 12.5,15.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.5,13.5 L 9.5,15.5"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.5,13.5 L 6.5,15.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 3.5,13.5 L 3.5,15.5"
+       id="path3143" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-gerber-24.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-gerber-24.png
===================================================================
--- tags/2.0.1/data/application-x-gerber-24.png	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-24.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-gerber-24.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-gerber-32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-gerber-32.png
===================================================================
--- tags/2.0.1/data/application-x-gerber-32.png	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-32.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-gerber-32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-gerber-32.svg
===================================================================
--- tags/2.0.1/data/application-x-gerber-32.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-32.svg	(revision 18980)
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-gerber-32.png"
+   sodipodi:docname="application-x-gerber-32.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="32"
+   width="32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.725,0,0,0.8409306,-1.762498,11.789529)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer6"
+     inkscape:cy="16.161771"
+     inkscape:cx="22.452405"
+     inkscape:zoom="22.627418"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     gridtolerance="0.4"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gerber file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="matrix(0.722222,0,0,0.444445,-1.2474509,10.111099)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.2577956,2.5103056 L 20.72106,2.5 C 20.72106,2.5 27.5,8.7946913 27.5,9.2145522 L 27.5,28.742131 C 27.5,29.161992 27.162024,29.500002 26.742205,29.500002 L 5.2577956,29.500002 C 4.8379769,29.500002 4.5,29.161992 4.5,28.742131 L 4.5,3.2681771 C 4.5,2.8483163 4.8379769,2.5103056 5.2577956,2.5103056 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       style="display:inline;opacity:0.385"
+       id="g5326"
+       transform="translate(-8.59375,-10.483107)">
+      <g
+         id="g3535"
+         transform="translate(9.375e-2,-1.6893e-2)"
+         style="stroke:#000000;stroke-opacity:1">
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 17.862214,14.088389 L 21.088388,19.946991 L 21,24.170409"
+           id="path2828"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 23.922661,23.884311 L 23.911612,18.875864 L 21.116332,14.176777"
+           id="path2830"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 26.966854,23.97833 L 27,17.751728 L 25.000213,14.176777"
+           id="path2832"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 29.977903,23.768621 L 30,15"
+           id="path2890"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20,32 L 20,36 L 17.125,38.8125"
+           id="path2910"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 23,32 L 23,38.875"
+           id="path2912"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 26,32 L 26,36 L 28.823223,38.867417"
+           id="path2914"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 29,32 L 29.015625,34.953125 L 32.414214,38.458408 L 34.916973,38.458408"
+           id="path2916"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 14.452123,14.56451 L 17.044194,19.266016 L 17.003906,34.988281 L 14.960937,37 L 14.428686,36.97076 L 14.452123,14.56451 z "
+           id="path2918"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           id="path3242"
+           d="M 34,33.5 L 33,33.5 L 33,30.5 L 33,21.5 L 32,20.5 L 32.007812,18.164062 L 34.007812,18.164062 L 34,33.5 z "
+           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      </g>
+      <g
+         id="g5316"
+         transform="translate(9.3749881e-2,5.7522119e-2)">
+        <path
+           id="path2894"
+           d="M 20.5,23.446973 L 20.5,25.415546"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3217"
+           d="M 23.5,23.454221 L 23.5,25.380507"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3219"
+           d="M 26.5,23.44207 L 26.5,25.392078"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3221"
+           d="M 29.5,23.449979 L 29.5,25.415975"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3223"
+           d="M 20.5,30.508643 L 20.5,32.358325"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3225"
+           d="M 23.5,30.463383 L 23.5,32.410451"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3227"
+           d="M 26.5,30.408095 L 26.5,32.376612"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3229"
+           d="M 29.5,30.44328 L 29.5,32.369651"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.5954975,3.5 L 21.534173,3.5 C 21.534173,3.5 26.500001,8.6364009 26.500001,8.6892753 L 26.500001,28.343295 C 26.500001,28.396168 26.457409,28.438736 26.404502,28.438736 L 5.5954975,28.438736 C 5.5425918,28.438736 5.5000003,28.396168 5.5000003,28.343295 L 5.5000003,3.5954413 C 5.5000003,3.5425669 5.5425918,3.5 5.5954975,3.5 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="29"
+       height="5"
+       x="1.5"
+       y="21.5" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="27"
+       height="3"
+       x="2.5"
+       y="22.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 28.5,21.5 L 28.5,24.5"
+       id="path3131" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.5,21.5 L 24.5,24.5"
+       id="path3133" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 20.5,21.5 L 20.5,24.5"
+       id="path3135" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 16.5,21.5 L 16.5,24.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 12.5,21.5 L 12.5,24.5"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 8.499996,21.5 L 8.499996,24.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 4.5,21.5 L 4.5,24.5"
+       id="path3143" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2232"
+       transform="matrix(0.6665574,0,0,0.6665574,0.5640292,0.7438964)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 39.985189,12.861445 C 39.256827,11.514817 33.882221,9.130934 31.084635,8.3314083 C 31.254143,9.904354 30.961856,14.649439 30.961856,14.649439 C 33.024356,13.274439 39.204485,12.699331 39.985189,12.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2237);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 40.410559,12.739267 C 40.423724,11.324125 34.058025,2.5320142 30.175441,2.6354934 C 31.148479,2.8684884 31.925796,8.803523 30.536076,11.616023 C 33.286076,11.616023 39.446694,10.881093 40.410559,12.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient2239);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2241);stroke-width:1.50024605;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2243);stroke-width:1.50024641;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 37.558971,9.9767321 C 36.830609,8.6301041 34.525619,5.9151604 32.603033,4.6781344 C 32.654442,6.2680727 33.116647,7.3994674 32.54789,10.055612 C 32.54789,10.055612 36.731384,9.8849421 37.558971,9.9767321 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-gerber-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-gerber-48.png
===================================================================
--- tags/2.0.1/data/application-x-gerber-48.png	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-gerber-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-gerber-48.svg
===================================================================
--- tags/2.0.1/data/application-x-gerber-48.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber-48.svg	(revision 18980)
@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-gerber-48.png"
+   sodipodi:docname="application-x-gerber.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3153"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3151"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3145"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="3"
+     inkscape:window-height="967"
+     inkscape:window-width="993"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="27.526762"
+     inkscape:cx="30.878981"
+     inkscape:zoom="10.179605"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gerber file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="translate(-2e-6,2.838692e-5)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3089"
+       style="opacity:0.38461537;display:inline"
+       transform="translate(0.2499915,0)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path3091"
+         d="M 10.5,7.5 L 15.5,7.5 L 20.5,12.5 L 20.5,22.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3093"
+         d="M 24.5,22.5 L 24.5,10.5 L 21.5,7.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3095"
+         d="M 28.5,22.5 L 28.5,8.5 L 27.5,7.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3097"
+         d="M 32.5,22.5 L 32.5,7.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3099"
+         d="M 20.5,22.5 L 20.5,24.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3101"
+         d="M 24.5,22.5 L 24.5,24.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3103"
+         d="M 28.5,22.5 L 28.5,24.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3105"
+         d="M 32.5,22.5 L 32.5,24.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3107"
+         d="M 32.5,31.5 L 32.5,33.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3109"
+         d="M 28.5,31.5 L 28.5,33.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3111"
+         d="M 24.5,31.5 L 24.5,33.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3113"
+         d="M 20.5,31.5 L 20.5,33.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3115"
+         d="M 20.5,33.5 L 20.5,37.5 L 17.5,40.5 L 10.5,40.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3117"
+         d="M 24.5,33.5 L 24.5,40.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3119"
+         d="M 28.5,33.5 L 28.5,37.5 L 31.5,40.5 L 37.5,40.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3121"
+         d="M 32.5,33.5 L 34.5,35.5 L 37.5,35.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3123"
+         d="M 10.5,10.5 L 14.5,10.5 L 17.5,13.5 L 17.5,35.5 L 15.5,37.5 L 10.5,37.5 L 10.5,10.5 z "
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="path3125"
+         d="M 37.5,32.5 L 36.5,32.5 L 36.5,29.5 L 36.5,20.5 L 35.5,19.5 L 35.5,9.5 L 37.5,9.5 L 37.5,32.5 z "
+         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <path
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+       id="path5348"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:1"
+       d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+       id="path2210"
+       sodipodi:nodetypes="cccc"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path2247"
+       d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <g
+       style="display:inline"
+       transform="matrix(2.105461e-2,0,0,2.086758e-2,43.101716,38.66252)"
+       id="g3081">
+      <rect
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect3083"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
+      <path
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path3085"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path3087"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3356);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <rect
+       style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3127"
+       width="40"
+       height="6.0000005"
+       x="4.5"
+       y="35.5" />
+    <rect
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       id="rect3129"
+       width="38"
+       height="4"
+       x="5.5"
+       y="36.5"
+       ry="0" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 39.5,35.5 L 39.5,38.5"
+       id="path3131" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 34.499995,35.5 L 34.499995,38.5"
+       id="path3133" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 29.499995,35.5 L 29.499995,38.5"
+       id="path3135" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 24.499995,35.5 L 24.499995,38.5"
+       id="path3137" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 19.499995,35.5 L 19.499995,38.5"
+       id="path3139" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 14.499996,35.5 L 14.499996,38.5"
+       id="path3141" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.499995,35.5 L 9.499995,38.5"
+       id="path3143" />
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-gerber.svg
===================================================================
--- tags/2.0.1/data/application-x-gerber.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-gerber.svg	(revision 18980)
@@ -0,0 +1,712 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-gerber-48.png"
+   sodipodi:docname="application-x-gerber.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="128"
+   width="128"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10440">
+      <stop
+         style="stop-color:#605400;stop-opacity:1;"
+         offset="0"
+         id="stop10442" />
+      <stop
+         style="stop-color:#887800;stop-opacity:1;"
+         offset="1"
+         id="stop10444" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3153"
+       gradientUnits="userSpaceOnUse"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <linearGradient
+       id="linearGradient10424">
+      <stop
+         style="stop-color:#d8c100;stop-opacity:1;"
+         offset="0"
+         id="stop10426" />
+      <stop
+         style="stop-color:#ffe501;stop-opacity:1;"
+         offset="1"
+         id="stop10428" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3151"
+       gradientUnits="userSpaceOnUse"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756"
+       gradientTransform="translate(44.874995,-2.75)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3145"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.2499915,0)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10424"
+       id="linearGradient3348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="43.421204"
+       y1="14.544756"
+       x2="6.256557"
+       y2="14.544756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10440"
+       id="linearGradient3350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0091168,2.5347553e-6,23.847433)"
+       x1="44.625"
+       y1="17.482256"
+       x2="4.6249981"
+       y2="11.919756" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient3352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="3"
+     inkscape:window-height="967"
+     inkscape:window-width="993"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="-17.698378"
+     inkscape:cx="-8.6571082"
+     inkscape:zoom="2"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     width="128px"
+     height="128px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gerber file</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2548"
+       transform="scale(2.6667,2.66667)">
+      <g
+         transform="translate(-2e-6,2.838692e-5)"
+         inkscape:label="Shadow"
+         id="g2033"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           style="opacity:0.4"
+           id="g3712">
+          <rect
+             style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect2801"
+             width="5"
+             height="7"
+             x="38"
+             y="40" />
+          <rect
+             style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3696"
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)" />
+          <rect
+             style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3700"
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40" />
+        </g>
+      </g>
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15391"
+         d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+         style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15660"
+         d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <g
+         transform="translate(0.2499915,0)"
+         style="opacity:0.38461537;display:inline"
+         id="g3089">
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 10.5,7.5 L 15.5,7.5 L 20.5,12.5 L 20.5,22.5"
+           id="path3091"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,22.5 L 24.5,10.5 L 21.5,7.5"
+           id="path3093" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,22.5 L 28.5,8.5 L 27.5,7.5"
+           id="path3095" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,22.5 L 32.5,7.5"
+           id="path3097" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20.5,22.5 L 20.5,24.5"
+           id="path3099" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,22.5 L 24.5,24.5"
+           id="path3101" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,22.5 L 28.5,24.5"
+           id="path3103" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,22.5 L 32.5,24.5"
+           id="path3105" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,31.5 L 32.5,33.5"
+           id="path3107" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,31.5 L 28.5,33.5"
+           id="path3109" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,31.5 L 24.5,33.5"
+           id="path3111" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20.5,31.5 L 20.5,33.5"
+           id="path3113" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20.5,33.5 L 20.5,37.5 L 17.5,40.5 L 10.5,40.5"
+           id="path3115" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,33.5 L 24.5,40.5"
+           id="path3117" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,33.5 L 28.5,37.5 L 31.5,40.5 L 37.5,40.5"
+           id="path3119" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,33.5 L 34.5,35.5 L 37.5,35.5"
+           id="path3121" />
+        <path
+           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 10.5,10.5 L 14.5,10.5 L 17.5,13.5 L 17.5,35.5 L 15.5,37.5 L 10.5,37.5 L 10.5,10.5 z "
+           id="path3123"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 37.5,32.5 L 36.5,32.5 L 36.5,29.5 L 36.5,20.5 L 35.5,19.5 L 35.5,9.5 L 37.5,9.5 L 37.5,32.5 z "
+           id="path3125"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+      <g
+         id="g3081"
+         transform="matrix(2.105461e-2,0,0,2.086758e-2,43.101716,38.66252)"
+         style="display:inline">
+        <rect
+           y="-150.69685"
+           x="-1559.2523"
+           height="478.35718"
+           width="1339.6335"
+           id="rect3083"
+           style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           sodipodi:nodetypes="cccc"
+           id="path3085"
+           d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3354);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3356);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+           id="path3087"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <rect
+         y="35.5"
+         x="4.5"
+         height="6.0000005"
+         width="40"
+         id="rect3127"
+         style="opacity:1;color:#000000;fill:url(#linearGradient3348);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3350);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <rect
+         ry="0"
+         y="36.5"
+         x="5.5"
+         height="4"
+         width="38"
+         id="rect3129"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fff171;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3131"
+         d="M 39.5,35.5 L 39.5,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3133"
+         d="M 34.499995,35.5 L 34.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3135"
+         d="M 29.499995,35.5 L 29.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3137"
+         d="M 24.499995,35.5 L 24.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3139"
+         d="M 19.499995,35.5 L 19.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3141"
+         d="M 14.499996,35.5 L 14.499996,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path3143"
+         d="M 9.499995,35.5 L 9.499995,38.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#756700;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-footprint-16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-footprint-16.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-16.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-16.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-footprint-16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-footprint-16.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-16.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-16.svg	(revision 18980)
@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="16"
+   width="16"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100475,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2607"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2605"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2603"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2595">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2597" />
+      <stop
+         id="stop2599"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2601" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2587"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2585"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2583"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2574">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2576" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2578" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2568">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2570" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2562">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2564" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2566" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2560"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="g3292"
+     inkscape:cy="9.2955506"
+     inkscape:cx="13.413815"
+     inkscape:zoom="32"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="16px"
+     height="16px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB footprint</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient2270);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2272);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 1.9283192,0.50572542 L 10.668425,0.50000003 C 10.668425,0.50000003 14.5,3.9970506 14.5,4.2303066 L 14.5,15.07896 C 14.5,15.312218 14.30897,15.5 14.07168,15.5 L 1.9283192,15.5 C 1.6910303,15.5 1.5,15.312218 1.5,15.07896 L 1.5,0.92676521 C 1.5,0.69350923 1.6910303,0.50572542 1.9283192,0.50572542 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2267);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 2.5498889,1.529131 L 10.284615,1.5 C 10.284615,1.5 13.5,4.4628005 13.5,4.4903008 L 13.470417,14.45036 C 13.470417,14.47786 13.448166,14.499999 13.42053,14.499999 L 2.5498889,14.499999 C 2.5222509,14.499999 2.5000009,14.47786 2.5000009,14.45036 L 2.5000009,1.5787709 C 2.5000009,1.5512705 2.5222509,1.529131 2.5498889,1.529131 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g2455"
+       transform="matrix(0.7602792,0,0,0.7602792,-9.226339,5.4615348)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2254);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2256);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2258);stroke-width:1.31530643;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2260);stroke-width:1.3153069;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.385087,-3.7201259 C 29.050095,-4.3394746 29.205755,-3.8768359 28.321508,-4.4457758 C 28.316997,-3.9329987 28.412206,-4.339708 28.300666,-3.7332338 C 28.300666,-3.7332338 29.026021,-3.7946863 29.385087,-3.7201259 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g2609"
+       transform="translate(10.427253,-5.1308212)">
+      <g
+         style="display:inline"
+         id="g3292"
+         transform="matrix(0.497233,0,0,0.4736428,-14.112229,1.3428589)">
+        <path
+           id="path3280"
+           d="M 22,18.5 L 25,18.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3286"
+           d="M 22,15.5 L 25,15.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.73953015"
+           y="13.275748"
+           x="21.5"
+           height="8.2242517"
+           width="4"
+           id="rect3272"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:2.06060433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           id="path3282"
+           d="M 16.9375,30.5 L 19.9375,30.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3288"
+           d="M 17.0625,33.5 L 20.0625,33.5 L 20.0625,33.5 L 20.0625,33.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.80928588"
+           y="27.5"
+           x="16.5"
+           height="9"
+           width="4"
+           id="rect3274"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:2.06060433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+        <path
+           id="path3284"
+           d="M 27.0625,30.5 L 30.0625,30.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3290"
+           d="M 27,33.5 L 30,33.5"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:2.0606041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.80928588"
+           y="27.5"
+           x="26.5"
+           height="9"
+           width="4"
+           id="rect3276"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:2.06060433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+        <rect
+           ry="1.1612128"
+           y="21.720932"
+           x="15.442717"
+           height="6.3338876"
+           width="16.114565"
+           id="rect3270"
+           style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:2.06060386;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-footprint-22.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-footprint-22.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-22.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-22.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-footprint-22.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-footprint-22.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-22.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-22.svg	(revision 18980)
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="22"
+   width="22"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5352"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient3095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient3093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient3091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="g3292"
+     inkscape:cy="6.627056"
+     inkscape:cx="14.281477"
+     inkscape:zoom="24.722741"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="22px"
+     height="22px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB footprint</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g2354"
+       inkscape:label="Shadow"
+       transform="matrix(0.5199887,0,0,0.2954903,-1.4208371,7.7713745)">
+      <g
+         id="g2356"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2358"
+           style="opacity:1;fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect2360"
+           style="opacity:1;fill:url(#radialGradient2372);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect2362"
+           style="opacity:1;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.0601086,0.50760946 L 14.489478,0.5 C 14.489478,0.5 19.5,5.1478405 19.5,5.4578551 L 19.5,19.876525 C 19.5,20.18654 19.250191,20.436118 18.939889,20.436118 L 3.0601086,20.436118 C 2.7498079,20.436118 2.499999,20.18654 2.499999,19.876525 L 2.499999,1.0672027 C 2.499999,0.75718813 2.7498079,0.50760946 3.0601086,0.50760946 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.5682125,1.5536151 L 14.144009,1.5131665 C 14.144009,1.5131665 18.540449,5.6270281 18.540449,5.6652126 L 18.5,19.494799 C 18.5,19.532984 18.469577,19.563724 18.431788,19.563724 L 3.5682125,19.563724 C 3.5304227,19.563724 3.4999999,19.532984 3.4999999,19.494799 L 3.4999999,1.6225403 C 3.4999999,1.5843558 3.5304227,1.5536151 3.5682125,1.5536151 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g2455"
+       transform="translate(-11.707402,7.0259378)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2460);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2462);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2464);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2466);stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.611197,-3.4408139 C 29.276205,-4.0601626 28.899842,-4.3423558 28.015595,-4.9112957 C 28.011084,-4.3985186 28.119593,-4.0470954 28.008053,-3.4406212 C 28.008053,-3.4406212 29.252131,-3.5153743 29.611197,-3.4408139 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="display:inline"
+       transform="translate(11.895702,-6.1130246)"
+       id="g3195">
+      <g
+         style="display:inline"
+         id="g3292"
+         transform="matrix(0.6157597,0,0,0.6253183,-15.33186,1.3753342)">
+        <path
+           id="path3280"
+           d="M 21.008454,19.570339 L 25.36758,19.570339"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.61154997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.89251548"
+           y="13.173595"
+           x="21.008453"
+           height="9.9255896"
+           width="4.8720284"
+           id="rect3272"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.61155021;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           id="path3282"
+           d="M 16.136421,30.764637 L 20.284715,30.764637"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.61154997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.86875755"
+           y="27.500002"
+           x="16.136421"
+           height="9.6613798"
+           width="4.8720307"
+           id="rect3274"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.61155021;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+        <path
+           id="path3284"
+           d="M 26.524928,30.764637 L 29.961978,30.764637"
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.61155009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           ry="0.86875755"
+           y="27.500002"
+           x="25.880484"
+           height="9.6613798"
+           width="4.8720326"
+           id="rect3276"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.61155033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+        <rect
+           ry="1.4659203"
+           y="21.169523"
+           x="14.5"
+           height="7.9959288"
+           width="18"
+           id="rect3270"
+           style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:1.61154985;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path
+           id="path3286"
+           d="M 21.008454,16.371968 L 25.36758,16.371968"
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.61154997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3288"
+           d="M 16.136421,33.963008 L 20.346981,33.963008 L 20.346981,33.963008 L 20.346981,33.963008"
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.61154997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3290"
+           d="M 26.591647,33.963008 L 30.61419,33.963008"
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.61155009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-footprint-24.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-footprint-24.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-24.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-24.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-footprint-24.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-footprint-32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-footprint-32.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-32.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-32.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-footprint-32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-footprint-32.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-32.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-32.svg	(revision 18980)
@@ -0,0 +1,2302 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="32"
+   width="32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316114)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.105238)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2560"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2562">
+      <stop
+         id="stop2564"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2566"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2568">
+      <stop
+         id="stop2570"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2572"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2574">
+      <stop
+         id="stop2576"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2578"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2587"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2595">
+      <stop
+         id="stop2597"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2599" />
+      <stop
+         id="stop2601"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2603"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2605"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2607"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2272"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2270"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100475,18.786557)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2260"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2258"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2256"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2254"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2352"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2348"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2346"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2505">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2507" />
+      <stop
+         id="stop2509"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2511" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2493">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2495" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2497" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2487">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2489" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2491" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2481">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2483" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2485" />
+    </linearGradient>
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3021"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3019"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3017"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3009">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop3011" />
+      <stop
+         id="stop3013"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3015" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient4796"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5352"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2998"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2996"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2994"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2988">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2990" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2992" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2982">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2984" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2986" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2978" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2980" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8166"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient3091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient3093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient3095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5220"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5218"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5216"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5214"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5206">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5208" />
+      <stop
+         id="stop5210"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5212" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient5198"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5196"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5194"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5192"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5186">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5188" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5190" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5180">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5182" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop5184" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5174">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5176" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5178" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5172"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5158"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5156"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5154"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5152"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5150"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5148"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5146"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5144"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5142"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5140"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5263"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient5267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2696"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2694"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2692"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2690"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2688"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2686"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2684"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2682"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2674">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2676" />
+      <stop
+         id="stop2678"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2680" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2666"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2664"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2662"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2660"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2654">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2656" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2658" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2648">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2650" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2652" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2642">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2644" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2646" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2640"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2626"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2624"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2622"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2620"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2618"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2616"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2614"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2612"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2610"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2608"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2606"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4206"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4204"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4202"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4200"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4198"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4196"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4194"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4186">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop4188" />
+      <stop
+         id="stop4190"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4192" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4178"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4176"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4174"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4168">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4170" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4172" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4162">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4164" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop4166" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4156">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4158" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4160" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4505"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4503"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4501"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4499"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4497"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4495"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4493"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4485">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop4487" />
+      <stop
+         id="stop4489"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4491" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4477"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4475"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4473"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4467">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4469" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4471" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4461">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4463" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop4465" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4455">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4457" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4459" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4547"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4549"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient4551"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient4553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.105238)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient4555"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316114)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient4557"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4559"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient4561"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient4563"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient4565"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2466"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2464"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2462"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2460"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2687"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2685"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2683"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2681"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2673">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2675" />
+      <stop
+         id="stop2677"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2679" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2665"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2663"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2661"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2659"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2653">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2655" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2657" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2647">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2649" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2651" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2641">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2643" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2645" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2638"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2370"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2372"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2374"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2621"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2619"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2617"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2615"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2613"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2611"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2607"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2727"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.105238)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2729"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316114)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2731"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="11.767484"
+     inkscape:cx="13.931195"
+     inkscape:zoom="45.254836"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     gridtolerance="0.4"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB footprint</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="matrix(0.6999997,0,0,0.444445,-0.8000002,9.673599)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.2577956,2.5103036 L 20.72106,2.499998 C 20.72106,2.499998 27.5,8.7946893 27.5,9.2145502 L 27.5,28.742129 C 27.5,29.16199 27.162024,29.5 26.742205,29.5 L 5.2577956,29.5 C 4.8379769,29.5 4.5,29.16199 4.5,28.742129 L 4.5,3.2681751 C 4.5,2.8483143 4.8379769,2.5103036 5.2577956,2.5103036 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.5954975,3.5 L 21.534173,3.5 C 21.534173,3.5 26.500001,8.6364009 26.500001,8.6892753 L 26.500001,28.343295 C 26.500001,28.396168 26.457409,28.438736 26.404502,28.438736 L 5.5954975,28.438736 C 5.5425918,28.438736 5.5000003,28.396168 5.5000003,28.343295 L 5.5000003,3.5954413 C 5.5000003,3.5425669 5.5425918,3.5 5.5954975,3.5 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3195"
+       transform="matrix(0,0.8213957,-0.8278753,0,29.448067,21.75745)"
+       style="display:inline">
+      <g
+         transform="matrix(0.8191474,0,0,0.8681563,-20.713146,-5.0724305)"
+         id="g2718"
+         style="display:inline">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 22.357111,18.292677 L 25.701123,18.292677"
+           id="path2720" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect2722"
+           width="4.4586825"
+           height="8.7727346"
+           x="21.931139"
+           y="12.727267"
+           ry="0.78885001" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 16.674769,30.814849 L 19.674769,30.814849"
+           id="path2724" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect2726"
+           width="4.513773"
+           height="9"
+           x="15.931138"
+           y="27.380259"
+           ry="0.80928588" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27.095341,30.814849 L 30.095341,30.814849"
+           id="path2728" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect2730"
+           width="4.4586835"
+           height="8.8802586"
+           x="26.389828"
+           y="27.5"
+           ry="0.79851866" />
+        <rect
+           style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:1.43800819;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect2732"
+           width="19.326784"
+           height="9.7394676"
+           x="14.499999"
+           y="19.684029"
+           ry="1.7855691" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 22.422793,15.509972 L 25.766805,15.509972"
+           id="path2734" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 16.62746,33.597554 L 20.228288,33.597554 L 20.228288,33.597554 L 20.228288,33.597554"
+           id="path2736" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.43800819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 27.042953,33.597553 L 30.217723,33.597553"
+           id="path2738" />
+      </g>
+    </g>
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.5489685,6.5000002 L 23.5,6.5000002"
+       id="path4573" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.5493115,8.5000002 L 23.328059,8.5000002"
+       id="path4575" />
+    <path
+       style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 7.3756535,10.5 L 15.496391,10.5"
+       id="path4577"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2232"
+       transform="matrix(0.6665574,0,0,0.6665574,0.5640292,0.7438964)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 39.985189,12.861445 C 39.256827,11.514817 33.882221,9.130934 31.084635,8.3314083 C 31.254143,9.904354 30.961856,14.649439 30.961856,14.649439 C 33.024356,13.274439 39.204485,12.699331 39.985189,12.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2237);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 40.410559,12.739267 C 40.423724,11.324125 34.058025,2.5320142 30.175441,2.6354934 C 31.148479,2.8684884 31.925796,8.803523 30.536076,11.616023 C 33.286076,11.616023 39.446694,10.881093 40.410559,12.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient2239);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2241);stroke-width:1.50024605;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2243);stroke-width:1.50024641;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 37.558971,9.9767321 C 36.830609,8.6301041 34.525619,5.9151604 32.603033,4.6781344 C 32.654442,6.2680727 33.116647,7.3994674 32.54789,10.055612 C 32.54789,10.055612 36.731384,9.8849421 37.558971,9.9767321 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-footprint-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-footprint-48.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-48.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-footprint-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-footprint-48.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint-48.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint-48.svg	(revision 18980)
@@ -0,0 +1,674 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2775"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2773"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2771"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2763">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2765" />
+      <stop
+         id="stop2767"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2769" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2755"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2753"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2751"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2749"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2747"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient15656"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2740">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2742" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2744" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2734">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2736" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2738" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2728">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2730" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2732" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2726"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2822"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2824"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="11.11853"
+     inkscape:cx="29.101167"
+     inkscape:zoom="5.6568543"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB footprint</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="translate(-2e-6,2.838692e-5)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3292"
+       transform="matrix(0,1,-1,0,48,7)">
+      <rect
+         ry="0.80928588"
+         y="12.5"
+         x="21.5"
+         height="9"
+         width="4"
+         id="rect3272"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0.80928588"
+         y="27.5"
+         x="16.5"
+         height="9"
+         width="4"
+         id="rect3274"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+      <rect
+         ry="0.80928588"
+         y="27.5"
+         x="26.5"
+         height="9"
+         width="4"
+         id="rect3276"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+      <rect
+         ry="1.4552083"
+         y="20.5625"
+         x="14.5"
+         height="7.9374995"
+         width="18"
+         id="rect3270"
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         id="path3280"
+         d="M 22,18.5 L 25,18.5"
+         style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3282"
+         d="M 16.9375,30.5 L 19.9375,30.5"
+         style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3284"
+         d="M 27.0625,30.5 L 30.0625,30.5"
+         style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3286"
+         d="M 22,15.5 L 25,15.5"
+         style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3288"
+         d="M 17.0625,33.5 L 20.0625,33.5 L 20.0625,33.5 L 20.0625,33.5"
+         style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3290"
+         d="M 27,33.5 L 30,33.5"
+         style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       transform="translate(-3.0000002,2.3841858e-7)"
+       id="g2836"
+       style="stroke:#888a85;display:inline">
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 15.5,9.5 L 36.5,9.5"
+         id="path2855" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 15.5,11.5 L 36.5,11.5"
+         id="path2857" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 15.5,13.5 L 36.5,13.5"
+         id="path2859" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 15.5,15.5 L 27.5,15.5"
+         id="path2861"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <path
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+       id="path5348"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:1"
+       d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+       id="path2210"
+       sodipodi:nodetypes="cccc"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path2247"
+       d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-footprint.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-footprint.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-footprint.svg	(revision 18980)
@@ -0,0 +1,680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="128"
+   width="128"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2775"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2773"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2771"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2763">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2765" />
+      <stop
+         id="stop2767"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2769" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2755"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2753"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2751"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2749"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2747"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient15656"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2740">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2742" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2744" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2734">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2736" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2738" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2728">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2730" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2732" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2726"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2822"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2824"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="80.451323"
+     inkscape:cx="37.062201"
+     inkscape:zoom="2.8284272"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="128px"
+     height="128px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB footprint</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2271"
+       transform="scale(2.6667,2.6667)">
+      <g
+         transform="translate(-2e-6,2.838692e-5)"
+         inkscape:label="Shadow"
+         id="g2033"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           style="opacity:0.4"
+           id="g3712">
+          <rect
+             style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect2801"
+             width="5"
+             height="7"
+             x="38"
+             y="40" />
+          <rect
+             style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3696"
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)" />
+          <rect
+             style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3700"
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40" />
+        </g>
+      </g>
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15391"
+         d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+         style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15660"
+         d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <g
+         transform="matrix(0,1,-1,0,48,7)"
+         id="g3292"
+         style="display:inline">
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3272"
+           width="4"
+           height="9"
+           x="21.5"
+           y="12.5"
+           ry="0.80928588" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect3274"
+           width="4"
+           height="9"
+           x="16.5"
+           y="27.5"
+           ry="0.80928588" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#888a85;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="rect3276"
+           width="4"
+           height="9"
+           x="26.5"
+           y="27.5"
+           ry="0.80928588" />
+        <rect
+           style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3270"
+           width="18"
+           height="7.9374995"
+           x="14.5"
+           y="20.5625"
+           ry="1.4552083" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 22,18.5 L 25,18.5"
+           id="path3280" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 16.9375,30.5 L 19.9375,30.5"
+           id="path3282" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 27.0625,30.5 L 30.0625,30.5"
+           id="path3284" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 22,15.5 L 25,15.5"
+           id="path3286" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 17.0625,33.5 L 20.0625,33.5 L 20.0625,33.5 L 20.0625,33.5"
+           id="path3288" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 27,33.5 L 30,33.5"
+           id="path3290" />
+      </g>
+      <g
+         style="stroke:#888a85;display:inline"
+         id="g2836"
+         transform="translate(-3.0000002,2.3841858e-7)">
+        <path
+           id="path2855"
+           d="M 15.5,9.5 L 36.5,9.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2857"
+           d="M 15.5,11.5 L 36.5,11.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2859"
+           d="M 15.5,13.5 L 36.5,13.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path2861"
+           d="M 15.5,15.5 L 27.5,15.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-layout-16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-layout-16.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-16.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-16.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-layout-16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-layout-16.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-16.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-16.svg	(revision 18980)
@@ -0,0 +1,1333 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-pcb-16.png"
+   sodipodi:docname="application-x-pcb-16.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="16"
+   width="16"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2871"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2869"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2762"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         id="stop2784"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2786"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2788">
+      <stop
+         id="stop2790"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2792"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2794">
+      <stop
+         id="stop2796"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2798"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2804"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2816" />
+      <stop
+         id="stop2818"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2824"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.1296478e-2,-0.2660144,0.3444364,-8.7244696e-3,27.683344,23.53042)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2494981,0,0,0.2714449,28.137815,14.512333)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1115779,7.7416911e-3,-8.3064858e-3,0.1245599,31.864361,16.99391)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3066"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9755905,0,0,0.6187301,4.6058755,12.758469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3064"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0,-1.5160988,-1.1387138,0,65.407506,72.437718)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3062"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0,-1.503917,-1.1479369,0,66.120269,77.688631)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3060"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient5135"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient5133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient5131"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient5129"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2655">
+      <stop
+         id="stop2657"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2659"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2661">
+      <stop
+         id="stop2663"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2665"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         id="stop2669"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2671"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5116"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient5114"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         id="stop2684"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2686" />
+      <stop
+         id="stop2688"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient5108"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient5106"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient5104"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient5102"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5098"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient5096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5001"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4999"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4997"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4995"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4993"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4991"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4989"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4987"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4985"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4983"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2429"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2427"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2425"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2423"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2421"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2419"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2417"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2415"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2413"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0,0.6202002,-0.6629454,0,-1.222397,-12.387324)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4231"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4228"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4226"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4169"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4167"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2265"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2263"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2261"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5055">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5057" />
+      <stop
+         id="stop5059"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5061" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5043">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5045" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5047" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5037">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5039" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop5041" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5031">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5033" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5035" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient15668"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient15656"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="8.3777682"
+     inkscape:cx="9.2042411"
+     inkscape:zoom="32"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="16px"
+     height="16px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB layout</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2272);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 1.9283192,0.50572542 C 1.9283192,0.50572542 13.767842,0.49693148 14.071376,0.50000003 C 14.374821,0.50306768 14.511049,0.64934194 14.511049,0.88259794 L 14.5,15.07896 C 14.5,15.312218 14.30897,15.5 14.07168,15.5 L 1.9283192,15.5 C 1.6910303,15.5 1.5,15.312218 1.5,15.07896 L 1.5,0.92676521 C 1.5,0.69350923 1.6910303,0.50572542 1.9283192,0.50572542 z "
+       id="rect15391"
+       sodipodi:nodetypes="czccccccc" />
+    <g
+       id="g3089"
+       style="opacity:1;stroke:#5fc500;stroke-opacity:1;display:inline"
+       transform="translate(-20.478695,-17.514447)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path3091"
+         d="M 23.394018,22.310223 L 26.027797,24.941006 L 25.987348,27.897462"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4406"
+         d="M 25.948019,18.987096 L 26.023736,21.082163 L 29.027769,23.989729 L 28.987047,27.9574"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3099"
+         d="M 25.527797,27.4574 L 25.527797,28.514447"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3103"
+         d="M 28.527797,27.4574 L 28.527797,28.509514"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path3471"
+         d="M 29.059228,19.169143 L 29.041195,20.29546 L 32.045228,22.968651 L 32.028196,28.000838"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3467"
+         d="M 31.527797,27.405286 L 31.527797,28.4574"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2267);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:1"
+       d="M 2.5498879,1.5291309 L 13.49974,1.4999999 C 13.49974,1.4999999 13.511048,1.5459849 13.511048,1.5734852 L 13.470416,14.45036 C 13.470416,14.47786 13.448165,14.499999 13.420529,14.499999 L 2.5498879,14.499999 C 2.5222499,14.499999 2.4999999,14.47786 2.4999999,14.45036 L 2.4999999,1.5787708 C 2.4999999,1.5512704 2.5222499,1.5291309 2.5498879,1.5291309 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path2247"
+       d="M 56.700902,-5.6584474 C 55.97254,-7.0050754 52.542366,-10.727997 50.61978,-11.965023 C 50.85872,-10.539174 51.156835,-8.2825948 50.541195,-5.7202154 C 50.541195,-5.7202154 55.920198,-5.8205614 56.700902,-5.6584474 z "
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-layout-22.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-layout-22.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-22.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-22.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-layout-22.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-layout-22.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-22.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-22.svg	(revision 18980)
@@ -0,0 +1,1423 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-pcb-22.png"
+   sodipodi:docname="application-x-pcb-22.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="22"
+   width="22"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-2.3312251,55.152293)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2871"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2869"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2762"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         id="stop2784"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2786"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2788">
+      <stop
+         id="stop2790"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2792"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2794">
+      <stop
+         id="stop2796"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2798"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2804"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2816" />
+      <stop
+         id="stop2818"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2824"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.1296478e-2,-0.2660144,0.3444364,-8.7244696e-3,27.683344,23.53042)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2494981,0,0,0.2714449,28.137815,14.512333)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1115779,7.7416911e-3,-8.3064858e-3,0.1245599,31.864361,16.99391)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3066"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9755905,0,0,0.6187301,4.6058755,12.758469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3064"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0,-1.5160988,-1.1387138,0,65.407506,72.437718)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3062"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0,-1.503917,-1.1479369,0,66.120269,77.688631)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3060"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient4616"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4614"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient4610"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2655">
+      <stop
+         id="stop2657"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2659"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2661">
+      <stop
+         id="stop2663"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2665"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         id="stop2669"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2671"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient4599"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient4597"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4595"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         id="stop2684"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2686" />
+      <stop
+         id="stop2688"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4587"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient4585"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient4581"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient4579"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient4577"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5001"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4999"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4997"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4995"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4993"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4991"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4989"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4987"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4985"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4983"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2429"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2427"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2425"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2423"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2421"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2419"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2417"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2415"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2413"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0,0.6202002,-0.6629454,0,-1.222397,-12.387324)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4231"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4228"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4226"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4169"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4167"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2265"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2263"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2261"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4537">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop4539" />
+      <stop
+         id="stop4541"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4543" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4525">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4527" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4529" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4519">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4521" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop4523" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4513">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4515" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4517" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4499"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4497"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="811"
+     inkscape:window-width="1020"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="15.455928"
+     inkscape:cx="17.128316"
+     inkscape:zoom="17.481619"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="22px"
+     height="22px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB layout</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g2354"
+       inkscape:label="Shadow"
+       transform="matrix(0.5199887,0,0,0.2954903,-1.4208371,7.7713745)">
+      <g
+         id="g2356"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2358"
+           style="opacity:1;fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect2360"
+           style="opacity:1;fill:url(#radialGradient2372);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect2362"
+           style="opacity:1;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.0601086,0.50760946 C 3.0601086,0.50760946 18.599074,0.48873598 18.865503,0.5 C 19.132153,0.51127336 19.514301,0.8147177 19.514301,1.1247323 L 19.5,19.876525 C 19.5,20.18654 19.250191,20.436118 18.939889,20.436118 L 3.0601086,20.436118 C 2.7498079,20.436118 2.499999,20.18654 2.499999,19.876525 L 2.499999,1.0672027 C 2.499999,0.75718813 2.7498079,0.50760946 3.0601086,0.50760946 z "
+       id="rect15391"
+       sodipodi:nodetypes="czccccccc" />
+    <g
+       id="g3089"
+       style="opacity:1;stroke:#5fc500;stroke-opacity:1;display:inline"
+       transform="translate(-16.518435,-18.451361)">
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path3091"
+         d="M 23.027797,19.959636 L 24.043632,21.262263 L 24.043632,27.928932"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3093"
+         d="M 27.043631,27.928932 L 27.043631,20.298886 L 26.679245,19.951361"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         sodipodi:nodetypes="ccc" />
+      <path
+         id="path3095"
+         d="M 31.043631,28.033955 L 31.043631,21.018638"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path3099"
+         d="M 24.501906,27.37074 L 24.501906,28.443166"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3101"
+         d="M 27.543631,27.40046 L 27.543631,28.4574"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3103"
+         d="M 30.543631,27.376817 L 30.543631,28.428931"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3479"
+         d="M 30.018435,34.928931 L 30.018435,38.0578"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3109"
+         d="M 30.543631,34.398508 L 30.543631,35.423293"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3477"
+         d="M 27.018435,34.928931 L 27.018435,38.0578"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3111"
+         d="M 27.518435,34.414153 L 27.518435,35.443706"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:1.99999976;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3475"
+         d="M 24.373463,34.961856 L 22.735295,37.807585"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3113"
+         d="M 24.518435,34.428931 L 24.518435,35.518863"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3123"
+         d="M 20.245896,20.92893 L 21.960181,22.535218 L 21.967596,24.02587 L 22.017384,34.034748 L 20.993315,35.915959 L 19.999037,35.945013 L 20.245896,20.92893 z "
+         style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3507"
+         d="M 34.018435,23.951361 L 34.018435,27.08023"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3485"
+         d="M 33.518435,27.356505 L 33.518435,28.428931"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path3505"
+         d="M 33.018435,34.951361 L 33.018435,38.08023"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path3487"
+         d="M 33.518435,34.405358 L 33.518435,35.452504"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.5682125,1.5536151 C 3.5682125,1.5536151 18.36725,1.4864215 18.462831,1.4988658 C 18.559203,1.5114129 18.526148,1.5513185 18.526148,1.589503 L 18.5,19.494799 C 18.5,19.532984 18.469577,19.563724 18.431788,19.563724 L 3.5682125,19.563724 C 3.5304227,19.563724 3.4999999,19.532984 3.4999999,19.494799 L 3.4999999,1.6225403 C 3.4999999,1.5843558 3.5304227,1.5536151 3.5682125,1.5536151 z "
+       id="rect15660"
+       sodipodi:nodetypes="czccccccc" />
+    <g
+       style="stroke:#eeeeec;stroke-width:0.88475299;stroke-opacity:0.74509804;display:inline"
+       id="g3495"
+       transform="matrix(0.7772363,0,0,0.903468,55.223689,-13.598285)">
+      <rect
+         rx="1.7463098"
+         ry="1.5023171"
+         y="22.255915"
+         x="-63.969288"
+         height="14.373751"
+         width="16.706825"
+         id="rect3489"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.19334769;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.74509804;visibility:visible;display:block;overflow:visible" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-layout-24.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-layout-24.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-24.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-24.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-layout-24.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-layout-32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-layout-32.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-32.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-32.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-layout-32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-layout-32.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-32.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-32.svg	(revision 18980)
@@ -0,0 +1,1362 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-pcb-32.png"
+   sodipodi:docname="application-x-pcb-32.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="32"
+   width="32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,2.7369165,0.9724875)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2871"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2869"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2762"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         id="stop2784"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2786"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2788">
+      <stop
+         id="stop2790"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2792"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2794">
+      <stop
+         id="stop2796"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2798"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2804"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2816" />
+      <stop
+         id="stop2818"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2824"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.1296478e-2,-0.2660144,0.3444364,-8.7244696e-3,27.683344,23.53042)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2494981,0,0,0.2714449,28.137815,14.512333)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1115779,7.7416911e-3,-8.3064858e-3,0.1245599,31.864361,16.99391)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3066"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9755905,0,0,0.6187301,4.6058755,12.758469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3064"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0,-1.5160988,-1.1387138,0,65.407506,72.437718)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3062"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0,-1.503917,-1.1479369,0,66.120269,77.688631)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3060"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2655">
+      <stop
+         id="stop2657"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2659"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2661">
+      <stop
+         id="stop2663"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2665"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         id="stop2669"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2671"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         id="stop2684"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2686" />
+      <stop
+         id="stop2688"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4076"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient4074"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient4072"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5001"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4999"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4997"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4995"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4993"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4991"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4989"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4987"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4985"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4983"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2429"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2427"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2425"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2423"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2421"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2419"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2417"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2415"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2413"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0,0.6202002,-0.6629454,0,-1.222397,-12.387324)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4231"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4228"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4226"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4169"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4167"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2265"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2263"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2261"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4028">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop4030" />
+      <stop
+         id="stop4032"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4034" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4016">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4018" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4020" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4010">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4012" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop4014" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4004">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4006" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4008" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3990"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3988"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="18.219677"
+     inkscape:cx="22.724888"
+     inkscape:zoom="16"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     gridtolerance="0.4"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB layout</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="matrix(0.722222,0,0,0.4444449,-1.215281,10.111103)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.2577956,2.5103056 C 5.2577956,2.5103056 26.39323,2.5030175 26.775662,2.5 C 27.15257,2.4969825 27.5,2.8717059 27.5,3.2915668 L 27.5,28.742131 C 27.5,29.161992 27.162024,29.500002 26.742205,29.500002 L 5.2577956,29.500002 C 4.8379769,29.500002 4.5,29.161992 4.5,28.742131 L 4.5,3.2681771 C 4.5,2.8483163 4.8379769,2.5103056 5.2577956,2.5103056 z "
+       id="rect15391"
+       sodipodi:nodetypes="czccccccc" />
+    <g
+       style="display:inline"
+       id="g5326"
+       transform="translate(-8.5,-10.5)">
+      <g
+         id="g3535">
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20,14.038563 L 20,23"
+           id="path2828"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 23,23 L 22.977903,13.983107"
+           id="path2830"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 26,23.994369 L 25.977903,14.016039"
+           id="path2832"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 29,23 L 29.022097,14.231379"
+           id="path2890"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20,32 L 20,36 L 17.125,38.8125"
+           id="path2910"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 23,32 L 23,38.875"
+           id="path2912"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 26,32 L 26,36 L 29,39"
+           id="path2914"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 29,32 L 29.015625,34.953125 L 31,37 L 35.09375,37"
+           id="path2916"
+           sodipodi:nodetypes="cccc" />
+        <path
+           style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 14.327123,14.47076 L 16.996094,14.503906 L 17.003906,34.988281 L 14.960937,37 L 14.334936,37.00201 L 14.327123,14.47076 z "
+           id="path2918"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           id="path3125"
+           d="M 34,33.5 L 33,33.5 L 33,30.5 L 33,21.5 L 32,20.5 L 32.007812,14.529091 L 34.007812,14.529091 L 34,33.5 z "
+           style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <rect
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           id="rect2920"
+           width="13.999999"
+           height="13.999999"
+           x="18"
+           y="21"
+           ry="2.6516502"
+           rx="2.65165" />
+        <path
+           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 18.489223,29 C 19.97156,28.98973 19.954809,27.035528 18.46875,27.000001"
+           id="path2228"
+           sodipodi:nodetypes="cs" />
+      </g>
+      <g
+         id="g5316"
+         style="stroke:#d3d7cf;stroke-opacity:1">
+        <path
+           id="path2894"
+           d="M 20.5,23.425585 L 20.5,24.487751"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3217"
+           d="M 23.5,23.437834 L 23.5,24.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3219"
+           d="M 26.5,23.437834 L 26.5,24.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3221"
+           d="M 29.5,23.437834 L 29.5,24.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3223"
+           d="M 20.5,31.5 L 20.5,32.562166"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3225"
+           d="M 23.5,31.5 L 23.5,32.562166"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3227"
+           d="M 26.5,31.5 L 26.5,32.562166"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path3229"
+           d="M 29.5,31.5 L 29.5,32.562166"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.5954975,3.5000001 C 5.5954975,3.5000001 26.362107,3.5088312 26.409173,3.5078126 C 26.452334,3.5068785 26.506473,3.5936879 26.506473,3.6466921 L 26.500001,28.404325 C 26.500001,28.457328 26.457409,28.500001 26.404502,28.500001 L 5.5954975,28.500001 C 5.5425918,28.500001 5.5000003,28.457328 5.5000003,28.404325 L 5.5000003,3.5956758 C 5.5000003,3.5426715 5.5425918,3.5000001 5.5954975,3.5000001 z "
+       id="rect15660"
+       sodipodi:nodetypes="czccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-layout-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-layout-48.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-48.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-layout-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-layout-48.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout-48.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout-48.svg	(revision 18980)
@@ -0,0 +1,1341 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-pcb-48.png"
+   sodipodi:docname="application-x-pcb-48.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,43.812504,1.5156258)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0,0,1.041132,40.458951,0.8691785)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <linearGradient
+       id="linearGradient2937">
+      <stop
+         style="stop-color:#3e5512;stop-opacity:1;"
+         offset="0"
+         id="stop2939" />
+      <stop
+         style="stop-color:#567619;stop-opacity:1;"
+         offset="1"
+         id="stop2941" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9747957,0,0,1.032679,3.1601082,0.6484425)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-0.9575584,7.0216417)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2871"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2869"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2762"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         id="stop2784"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2786"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2788">
+      <stop
+         id="stop2790"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2792"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2794">
+      <stop
+         id="stop2796"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2798"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2804"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2816" />
+      <stop
+         id="stop2818"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2824"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.1296478e-2,-0.2660144,0.3444364,-8.7244696e-3,27.683344,23.53042)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2494981,0,0,0.2714449,28.137815,14.512333)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1115779,7.7416911e-3,-8.3064858e-3,0.1245599,31.864361,16.99391)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3066"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9755905,0,0,0.6187301,4.6058755,12.758469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3064"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0,-1.5160988,-1.1387138,0,65.407506,72.437718)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3062"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0,-1.503917,-1.1479369,0,66.120269,77.688631)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3060"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2655">
+      <stop
+         id="stop2657"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2659"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2661">
+      <stop
+         id="stop2663"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2665"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         id="stop2669"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2671"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient3426"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         id="stop2684"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2686" />
+      <stop
+         id="stop2688"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3420"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3418"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient3416"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5001"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4999"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4997"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4995"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4993"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4991"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4989"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4987"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4985"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4983"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2429"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2427"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2425"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2423"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2421"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2419"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2417"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2415"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2413"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0,0.6202002,-0.6629454,0,-1.222397,-12.387324)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4231"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4228"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4226"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4169"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4167"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2265"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2263"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2261"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3372">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop3374" />
+      <stop
+         id="stop3376"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3378" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3360">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop3362" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3364" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3354">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop3356" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop3358" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3348">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop3350" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3352" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2251"
+       inkscape:collect="always">
+      <stop
+         id="stop2253"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2255"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3337"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3335"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1112"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="24.583022"
+     inkscape:cx="1.8270777"
+     inkscape:zoom="7.9999995"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB layout</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="translate(-2e-6,2.838692e-5)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:1.00064719;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 7.6527627,3.646744 C 7.6527627,3.646744 40.30775,3.5066827 40.325214,3.5061448 C 40.979007,3.4860074 41.509479,4.0028484 41.509479,4.6383714 L 41.478229,43.352526 C 41.478229,43.988047 40.964242,44.499676 40.32579,44.499676 L 7.6527627,44.499676 C 7.0143114,44.499676 6.5003236,43.988047 6.5003236,43.352526 L 6.5003236,4.7938955 C 6.5003236,4.1583736 7.0143114,3.646744 7.6527627,3.646744 z "
+       id="rect15391"
+       sodipodi:nodetypes="csccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1.00331986;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 7.6517125,4.5856061 C 7.6517125,4.5856061 40.280989,4.4960918 40.430059,4.5074811 C 40.563591,4.5176832 40.513965,4.6219735 40.513965,4.7045395 L 40.49834,43.379635 C 40.49834,43.462201 40.431417,43.528671 40.348288,43.528671 L 7.6517125,43.528671 C 7.5685833,43.528671 7.5016599,43.462201 7.5016599,43.379635 L 7.5016599,4.734642 C 7.5016599,4.6520761 7.5685833,4.5856061 7.6517125,4.5856061 z "
+       id="rect15660"
+       sodipodi:nodetypes="czccccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       style="display:inline"
+       id="g5326">
+      <g
+         id="g3535">
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 10.5,7.5 L 15.5,7.5 L 20.5,12.5 L 20.5,22.5"
+           id="path2828"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,22.5 L 24.5,10.5 L 21.5,7.5"
+           id="path2830" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,22.5 L 28.5,8.5 L 27.5,7.5"
+           id="path2832" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,22.5 L 32.5,7.5"
+           id="path2890" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 20.5,33.5 L 20.5,37.5 L 17.5,40.5 L 10.5,40.5"
+           id="path2910" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 24.5,33.5 L 24.5,40.5"
+           id="path2912" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 28.5,33.5 L 28.5,37.5 L 31.5,40.5 L 37.5,40.5"
+           id="path2914" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 32.5,33.5 L 34.5,35.5 L 37.5,35.5"
+           id="path2916" />
+        <path
+           style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           d="M 10.5,10.5 L 14.5,10.5 L 17.5,13.5 L 17.5,35.5 L 15.5,37.5 L 10.5,37.5 L 10.5,10.5 z "
+           id="path2918"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           id="path3125"
+           d="M 37.460937,32.476562 L 36.5,32.5 L 36.5,29.5 L 36.5,20.5 L 35.460937,19.476562 L 35.492187,7.5078124 L 37.492187,7.5078124 L 37.460937,32.476562 z "
+           style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <rect
+           style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+           id="rect2920"
+           width="18"
+           height="17"
+           x="17.5"
+           y="19.5"
+           ry="2.6516504"
+           rx="2.6516504" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+           d="M 17.906251,29.515624 C 20.055187,29.499999 20.030903,26.526597 17.876571,26.47254"
+           id="path2228"
+           sodipodi:nodetypes="cs" />
+      </g>
+      <g
+         id="g5316"
+         style="stroke:#d3d7cf;stroke-opacity:1;fill:#ffffff;fill-opacity:1">
+        <path
+           id="path2894"
+           d="M 20.5,22.5 L 20.5,24.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2896"
+           d="M 24.5,22.5 L 24.5,24.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2898"
+           d="M 28.5,22.5 L 28.5,24.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2900"
+           d="M 32.5,22.5 L 32.5,24.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2902"
+           d="M 32.5,31.5 L 32.5,33.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2904"
+           d="M 28.5,31.5 L 28.5,33.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2906"
+           d="M 24.5,31.5 L 24.5,33.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+        <path
+           id="path2908"
+           d="M 20.5,31.5 L 20.5,33.5"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-layout.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-layout.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-layout.svg	(revision 18980)
@@ -0,0 +1,1346 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:export-filename="/home/pcjc2/gedawork/tomazicons/gnomemime/pngs/application-x-pcb-48.png"
+   sodipodi:docname="application-x-pcb.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="128"
+   width="128"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,43.812504,1.5156258)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960493,0,0,1.041132,40.458951,0.8691785)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <linearGradient
+       id="linearGradient2937">
+      <stop
+         style="stop-color:#3e5512;stop-opacity:1;"
+         offset="0"
+         id="stop2939" />
+      <stop
+         style="stop-color:#567619;stop-opacity:1;"
+         offset="1"
+         id="stop2941" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9747957,0,0,1.032679,3.1601082,0.6484425)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-0.9575584,7.0216417)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2873"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2871"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2869"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2762"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2766"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.1303227,52.687269)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2782">
+      <stop
+         id="stop2784"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2786"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2788">
+      <stop
+         id="stop2790"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2792"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2794">
+      <stop
+         id="stop2796"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2798"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2804"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2812">
+      <stop
+         id="stop2814"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2816" />
+      <stop
+         id="stop2818"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2822"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2824"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2946"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2944"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100485,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.1296478e-2,-0.2660144,0.3444364,-8.7244696e-3,27.683344,23.53042)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2494981,0,0,0.2714449,28.137815,14.512333)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3068"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1115779,7.7416911e-3,-8.3064858e-3,0.1245599,31.864361,16.99391)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3066"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9755905,0,0,0.6187301,4.6058755,12.758469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3064"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0,-1.5160988,-1.1387138,0,65.407506,72.437718)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3062"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0,-1.503917,-1.1479369,0,66.120269,77.688631)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3060"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2655">
+      <stop
+         id="stop2657"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2659"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2661">
+      <stop
+         id="stop2663"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2665"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2667">
+      <stop
+         id="stop2669"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2671"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-31.601449,25.72011)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-26.646599,28.95487)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2917"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         id="stop2684"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2686" />
+      <stop
+         id="stop2688"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2911"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,23.640708,19.053842)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2909"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-15.664448,-140.85384)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2907"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(-4.3474219,36.453842)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5001"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4999"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4997"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4995"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4993"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4991"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4989"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4987"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4985"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4983"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-2.5484665e-2,-0.6941277,0.7770427,-2.2765299e-2,11.97476,39.615529)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2429"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.2579108,0,0,0.2730106,27.935961,15.089164)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2427"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.1153401,7.7863457e-3,-8.5865667e-3,0.1252783,31.78816,17.585055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2425"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.3563984,0,0,0.9905858,-8.4045503,5.0457243)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2423"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(1.1521472,0,0,0.7955298,-0.6314408,8.4669847)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2421"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(1.1377199,0,0,0.80732,-0.2968403,8.1670973)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2419"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(1.1285784,0,0,0.8138589,-4.2372621,7.6617659)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2417"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2415"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2413"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0,0.6202002,-0.6629454,0,-1.222397,-12.387324)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4231"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4228"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4226"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4169"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4167"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2269"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2265"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2263"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2261"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2259"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2257"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2863">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2865" />
+      <stop
+         id="stop2867"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2869" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2851">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2853" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2855" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2845">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2847" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2849" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2839">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2841" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2843" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2251"
+       inkscape:collect="always">
+      <stop
+         id="stop2253"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2255"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6629415,-34.825583,-13.027495)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2828"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,-35.205869,-13.468369)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2826"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1112"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="83.042965"
+     inkscape:cx="44.74224"
+     inkscape:zoom="4"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="128px"
+     height="128px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB layout</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Tomaz Solc, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2225"
+       transform="scale(2.6667,2.6667)">
+      <g
+         transform="translate(-2e-6,2.838692e-5)"
+         inkscape:label="Shadow"
+         id="g2033"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           style="opacity:0.4"
+           id="g3712">
+          <rect
+             style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect2801"
+             width="5"
+             height="7"
+             x="38"
+             y="40" />
+          <rect
+             style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3696"
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)" />
+          <rect
+             style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3700"
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40" />
+        </g>
+      </g>
+      <path
+         sodipodi:nodetypes="csccccccc"
+         id="rect15391"
+         d="M 7.6527627,3.646744 C 7.6527627,3.646744 40.30775,3.5066827 40.325214,3.5061448 C 40.979007,3.4860074 41.509479,4.0028484 41.509479,4.6383714 L 41.478229,43.352526 C 41.478229,43.988047 40.964242,44.499676 40.32579,44.499676 L 7.6527627,44.499676 C 7.0143114,44.499676 6.5003236,43.988047 6.5003236,43.352526 L 6.5003236,4.7938955 C 6.5003236,4.1583736 7.0143114,3.646744 7.6527627,3.646744 z "
+         style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:1.00064719;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="czccccccc"
+         id="rect15660"
+         d="M 7.6517125,4.5856061 C 7.6517125,4.5856061 40.280989,4.4960918 40.430059,4.5074811 C 40.563591,4.5176832 40.513965,4.6219735 40.513965,4.7045395 L 40.49834,43.379635 C 40.49834,43.462201 40.431417,43.528671 40.348288,43.528671 L 7.6517125,43.528671 C 7.5685833,43.528671 7.5016599,43.462201 7.5016599,43.379635 L 7.5016599,4.734642 C 7.5016599,4.6520761 7.5685833,4.5856061 7.6517125,4.5856061 z "
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1.00331986;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <g
+         id="g5326"
+         style="display:inline">
+        <g
+           id="g3535">
+          <path
+             sodipodi:nodetypes="ccc"
+             id="path2828"
+             d="M 10.5,7.5 L 15.5,7.5 L 20.5,12.5 L 20.5,22.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2830"
+             d="M 24.5,22.5 L 24.5,10.5 L 21.5,7.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2832"
+             d="M 28.5,22.5 L 28.5,8.5 L 27.5,7.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2890"
+             d="M 32.5,22.5 L 32.5,7.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2910"
+             d="M 20.5,33.5 L 20.5,37.5 L 17.5,40.5 L 10.5,40.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2912"
+             d="M 24.5,33.5 L 24.5,40.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2914"
+             d="M 28.5,33.5 L 28.5,37.5 L 31.5,40.5 L 37.5,40.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             id="path2916"
+             d="M 32.5,33.5 L 34.5,35.5 L 37.5,35.5"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             sodipodi:nodetypes="ccccccc"
+             id="path2918"
+             d="M 10.5,10.5 L 14.5,10.5 L 17.5,13.5 L 17.5,35.5 L 15.5,37.5 L 10.5,37.5 L 10.5,10.5 z "
+             style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             style="opacity:1;color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 37.460937,32.476562 L 36.5,32.5 L 36.5,29.5 L 36.5,20.5 L 35.460937,19.476562 L 35.492187,7.5078124 L 37.492187,7.5078124 L 37.460937,32.476562 z "
+             id="path3125"
+             sodipodi:nodetypes="cccccccc" />
+          <rect
+             rx="2.6516504"
+             ry="2.6516504"
+             y="19.5"
+             x="17.5"
+             height="17"
+             width="18"
+             id="rect2920"
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+          <path
+             sodipodi:nodetypes="cs"
+             id="path2228"
+             d="M 17.906251,29.515624 C 20.055187,29.499999 20.030903,26.526597 17.876571,26.47254"
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <g
+           id="g5316"
+           style="stroke:#d3d7cf;stroke-opacity:1">
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 20.5,22.5 L 20.5,24.5"
+             id="path2894" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 24.5,22.5 L 24.5,24.5"
+             id="path2896" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 28.5,22.5 L 28.5,24.5"
+             id="path2898" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 32.5,22.5 L 32.5,24.5"
+             id="path2900" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 32.5,31.5 L 32.5,33.5"
+             id="path2902" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 28.5,31.5 L 28.5,33.5"
+             id="path2904" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 24.5,31.5 L 24.5,33.5"
+             id="path2906" />
+          <path
+             style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+             d="M 20.5,31.5 L 20.5,33.5"
+             id="path2908" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-netlist-16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-netlist-16.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-16.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-16.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-netlist-16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-netlist-16.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-16.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-16.svg	(revision 18980)
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="16"
+   width="16"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient2267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100475,18.786557)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2607"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2605"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2603"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2595">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2597" />
+      <stop
+         id="stop2599"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2601" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient2587"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2585"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2583"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2574">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2576" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2578" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2568">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2570" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2572" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2562">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2564" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2566" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2560"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="g2609"
+     inkscape:cy="-3.9705098"
+     inkscape:cx="15.489981"
+     inkscape:zoom="16"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="16px"
+     height="16px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB netlist</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient2270);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2272);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 1.9283192,0.50572542 L 10.668425,0.50000003 C 10.668425,0.50000003 14.5,3.9970506 14.5,4.2303066 L 14.5,15.07896 C 14.5,15.312218 14.30897,15.5 14.07168,15.5 L 1.9283192,15.5 C 1.6910303,15.5 1.5,15.312218 1.5,15.07896 L 1.5,0.92676521 C 1.5,0.69350923 1.6910303,0.50572542 1.9283192,0.50572542 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2267);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 2.5498889,1.529131 L 10.284615,1.5 C 10.284615,1.5 13.5,4.4628005 13.5,4.4903008 L 13.470417,14.45036 C 13.470417,14.47786 13.448166,14.499999 13.42053,14.499999 L 2.5498889,14.499999 C 2.5222509,14.499999 2.5000009,14.47786 2.5000009,14.45036 L 2.5000009,1.5787709 C 2.5000009,1.5512705 2.5222509,1.529131 2.5498889,1.529131 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g2455"
+       transform="matrix(0.7602792,0,0,0.7602792,-9.226339,5.4615348)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2254);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2256);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2258);stroke-width:1.31530643;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2260);stroke-width:1.3153069;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.385087,-3.7201259 C 29.050095,-4.3394746 29.205755,-3.8768359 28.321508,-4.4457758 C 28.316997,-3.9329987 28.412206,-4.339708 28.300666,-3.7332338 C 28.300666,-3.7332338 29.026021,-3.7946863 29.385087,-3.7201259 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g2609"
+       transform="translate(10.427253,-5.1308212)">
+      <g
+         style="display:inline"
+         id="g3237"
+         transform="translate(-17.927253,1.130821)">
+        <path
+           id="path2214"
+           d="M 11.631551,8.6500002 L 16.378846,8.6500002"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#555753;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2217"
+           d="M 13.000001,12.5 L 16.562499,12.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2219"
+           d="M 13.000001,14.5 L 16.562499,14.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2221"
+           d="M 13.000001,16.5 L 16.562499,16.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 13.25,10.797923 L 13.25,16.202078"
+           id="path2225" />
+        <path
+           id="path3197"
+           d="M 17.942183,12.5 L 19.423966,12.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3199"
+           d="M 17.893319,14.5 L 18.556751,14.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3201"
+           d="M 17.944234,16.5 L 19.836613,16.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-netlist-22.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-netlist-22.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-22.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-22.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-netlist-22.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-netlist-22.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-22.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-22.svg	(revision 18980)
@@ -0,0 +1,567 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="22"
+   width="22"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5352"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient3095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient3093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient3091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2374"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="g3197"
+     inkscape:cy="14.106678"
+     inkscape:cx="19.38641"
+     inkscape:zoom="24.722741"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="22px"
+     height="22px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB netlist</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g2354"
+       inkscape:label="Shadow"
+       transform="matrix(0.5199887,0,0,0.2954903,-1.4208371,7.7713745)">
+      <g
+         id="g2356"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2358"
+           style="opacity:1;fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect2360"
+           style="opacity:1;fill:url(#radialGradient2372);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect2362"
+           style="opacity:1;fill:url(#linearGradient2374);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.0601086,0.50760946 L 14.489478,0.5 C 14.489478,0.5 19.5,5.1478405 19.5,5.4578551 L 19.5,19.876525 C 19.5,20.18654 19.250191,20.436118 18.939889,20.436118 L 3.0601086,20.436118 C 2.7498079,20.436118 2.499999,20.18654 2.499999,19.876525 L 2.499999,1.0672027 C 2.499999,0.75718813 2.7498079,0.50760946 3.0601086,0.50760946 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 3.5682125,1.5536151 L 14.144009,1.5131665 C 14.144009,1.5131665 18.540449,5.6270281 18.540449,5.6652126 L 18.5,19.494799 C 18.5,19.532984 18.469577,19.563724 18.431788,19.563724 L 3.5682125,19.563724 C 3.5304227,19.563724 3.4999999,19.532984 3.4999999,19.494799 L 3.4999999,1.6225403 C 3.4999999,1.5843558 3.5304227,1.5536151 3.5682125,1.5536151 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g2455"
+       transform="translate(-11.707402,7.0259378)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path2364"
+         d="M 31.011754,-1.8223442 C 30.676762,-2.441693 28.204843,-3.5381018 26.918162,-3.9058239 C 26.996123,-3.1823862 26.861692,-1 26.861692,-1 C 27.810289,-1.6323977 30.652688,-1.8969046 31.011754,-1.8223442 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2460);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2366"
+         d="M 31.207393,-1.878537 C 31.213448,-2.5293972 28.2857,-6.5731136 26.5,-6.525521 C 26.947525,-6.4183606 27.305033,-3.6886865 26.665865,-2.3951458 C 27.930661,-2.3951458 30.764087,-2.7331589 31.207393,-1.878537 z "
+         style="color:#000000;fill:url(#radialGradient2462);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2464);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2466);stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 29.611197,-3.4408139 C 29.276205,-4.0601626 28.899842,-4.3423558 28.015595,-4.9112957 C 28.011084,-4.3985186 28.119593,-4.0470954 28.008053,-3.4406212 C 28.008053,-3.4406212 29.252131,-3.5153743 29.611197,-3.4408139 z "
+         id="path2368"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="display:inline"
+       transform="translate(11.895702,-6.1130246)"
+       id="g3195">
+      <g
+         transform="translate(-17.927253,1.130821)"
+         id="g3197"
+         style="display:inline">
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 11.631551,9.6541256 L 18.191702,9.6541256"
+           id="path3200" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 13.286361,12.43428 L 17.515172,12.43428"
+           id="path3202" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 13.28636,14.464407 L 17.515171,14.464407"
+           id="path3206" />
+        <path
+           id="path3208"
+           d="M 13.457757,11.524013 L 13.457757,14.330454"
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.29999983;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 19.000345,12.482203 L 22.515171,12.482203"
+           id="path3210" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 19.143987,14.464407 L 22.515171,14.464407"
+           id="path3214" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 11.631551,17.260857 L 18.191702,17.260857"
+           id="path4185" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 13.302741,19.452077 L 17.531552,19.452077"
+           id="path4187" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 13.31912,21.482204 L 17.547931,21.482204"
+           id="path4189" />
+        <path
+           id="path4193"
+           d="M 13.474137,18.960161 L 13.474137,21.414818"
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.30000019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 19.016725,19.5 L 22.531551,19.5"
+           id="path4195" />
+        <path
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#989a96;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           d="M 19.016725,21.5 L 20.821819,21.5"
+           id="path4197" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline" />
+</svg>
Index: tags/2.0.1/data/application-x-pcb-netlist-24.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-netlist-24.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-24.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-24.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-netlist-24.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-netlist-32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-netlist-32.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-32.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-32.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-netlist-32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-netlist-32.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-32.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-32.svg	(revision 18980)
@@ -0,0 +1,1310 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="32"
+   width="32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-27.58256,-4.478359)"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,24.06011,11.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,19.10526,8.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-1.709646,44.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient2560"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient2562">
+      <stop
+         id="stop2564"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2566"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2568">
+      <stop
+         id="stop2570"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2572"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2574">
+      <stop
+         id="stop2576"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2578"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient2583"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient2585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient2587"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2595">
+      <stop
+         id="stop2597"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop2599" />
+      <stop
+         id="stop2601"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2603"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2605"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2607"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.3609333,0,0,0.3784312,0.2885314,-0.5454831)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2272"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.3580332,0,0,0.3814965,-0.9615384,-0.7823571)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2270"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.7008044,0,0,0.7437981,-9.9100475,18.786557)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2267"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2260"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2258"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2256"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2254"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2352"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2348"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2346"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2505">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2507" />
+      <stop
+         id="stop2509"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2511" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2493">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2495" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2497" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2487">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2489" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2491" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2481">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2483" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2485" />
+    </linearGradient>
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2370"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2372"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2374"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3021"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3019"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3017"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3009">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop3011" />
+      <stop
+         id="stop3013"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3015" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient4796"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5352"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5350"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2998"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="scale(0.960493,1.041132)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2996"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.8244190"
+       cy="3.7561285"
+       cx="8.8244190"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2994"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2988">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2990" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2992" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2982">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2984" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop2986" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2978" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2980" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8166"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient3087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient3089"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient3091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient3093"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient3095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-1.5076076e-2,-0.4596786,0.4596786,-1.5076076e-2,11.835232,12.52793)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2466"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.1525734,0,0,0.1627359,21.40854,-3.7904327)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2464"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.708450"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(6.8232262e-2,4.6412794e-3,-5.0795931e-3,7.467582e-2,23.687403,-2.3026837)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2462"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929165"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(0.8024106,0,0,0.5904677,-6.43832e-2,-9.7973641)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2460"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-86.361543,21.058056)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5220"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="2.3667307"
+       fx="31.863327"
+       cy="2.3667307"
+       cx="31.863327"
+       gradientTransform="matrix(0.331735,0,0,0.353831,-65.457201,-42.426155)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5218"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="14.9373"
+       fx="30.653816"
+       cy="14.9373"
+       cx="30.653816"
+       gradientTransform="matrix(0.148355,1.0091369e-2,-1.1044379e-2,0.162365,-60.502351,-39.191396)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5216"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-112.23446,-27.483048)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5214"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5206">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5208" />
+      <stop
+         id="stop5210"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5212" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-43.582576,21.39082)"
+       r="4.2929163"
+       fy="12.98915"
+       fx="37.030354"
+       cy="12.98915"
+       cx="37.030354"
+       id="radialGradient5198"
+       xlink:href="#linearGradient4790"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.9582194,0,0,1.0327671,-13.46843,25.515628)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5196"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.4681973,0,0,0.5070371,-0.7189363,-1.2043482)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5194"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.4719897,0,0,0.5029633,0.9157706,-0.8895248)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5192"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5186">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5188" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5190" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5180">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5182" />
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1;"
+         offset="1"
+         id="stop5184" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5174">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop5176" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5178" />
+    </linearGradient>
+    <linearGradient
+       y2="38.070381"
+       x2="34.170048"
+       y1="36.921333"
+       x1="33.396004"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-17.709662,69.931924)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5172"
+       xlink:href="#linearGradient2251"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5158"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5156"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5154"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5152"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <radialGradient
+       r="2.5"
+       fy="43.5"
+       fx="4.9929786"
+       cy="43.5"
+       cx="4.9929786"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5150"
+       xlink:href="#linearGradient3688"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="39.999443"
+       x2="25.058096"
+       y1="47.027729"
+       x1="25.058096"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5148"
+       xlink:href="#linearGradient3702"
+       inkscape:collect="always" />
+    <radialGradient
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5146"
+       xlink:href="#linearGradient259"
+       inkscape:collect="always" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5144"
+       xlink:href="#linearGradient269"
+       inkscape:collect="always" />
+    <radialGradient
+       r="38.158695"
+       fy="7.2678967"
+       fx="8.1435566"
+       cy="7.2678967"
+       cx="8.1435566"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5142"
+       xlink:href="#linearGradient15662"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5140"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5263"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6334434,0,0,0.6866935,0.1449688,0.10524)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6385744,0,0,0.6811763,2.356631,0.5316134)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient5267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.620387,0,0,0.6613169,2.7369165,0.9786813)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="6.1548492"
+     inkscape:cx="24.106316"
+     inkscape:zoom="11.313709"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     gridtolerance="0.4"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB netlist</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="matrix(0.6999997,0,0,0.444445,-0.8000002,9.673599)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.2577956,2.5103056 L 20.72106,2.5 C 20.72106,2.5 27.5,8.7946913 27.5,9.2145522 L 27.5,28.742131 C 27.5,29.161992 27.162024,29.500002 26.742205,29.500002 L 5.2577956,29.500002 C 4.8379769,29.500002 4.5,29.161992 4.5,28.742131 L 4.5,3.2681771 C 4.5,2.8483163 4.8379769,2.5103056 5.2577956,2.5103056 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+       d="M 5.5954975,3.5 L 21.534173,3.5 C 21.534173,3.5 26.500001,8.6364009 26.500001,8.6892753 L 26.500001,28.343295 C 26.500001,28.396168 26.457409,28.438736 26.404502,28.438736 L 5.5954975,28.438736 C 5.5425918,28.438736 5.5000003,28.396168 5.5000003,28.343295 L 5.5000003,3.5954413 C 5.5000003,3.5425669 5.5425918,3.5 5.5954975,3.5 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       transform="translate(-3.0166979,-1.9999996)"
+       style="display:inline"
+       id="g5269">
+      <path
+         id="path5271"
+         d="M 10.497033,9.4999998 L 16.986368,9.4999998"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5273"
+         d="M 12.516697,12.499999 L 18.029335,12.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5275"
+         d="M 12.516697,14.499999 L 18.029335,14.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5277"
+         d="M 12.516697,16.499999 L 18.029335,16.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 12.766698,11.170414 L 12.766698,16.249999"
+         id="path5279" />
+      <path
+         id="path5281"
+         d="M 20.114815,12.499999 L 24.531619,12.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5283"
+         d="M 20.114815,14.499999 L 26.074757,14.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5285"
+         d="M 20.074758,16.499999 L 25.054586,16.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5287"
+         d="M 10.485328,20.5 L 16.081213,20.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5289"
+         d="M 12.562118,23.499999 L 18.074755,23.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5291"
+         d="M 12.562118,25.499999 L 18.074755,25.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5293"
+         d="M 12.562118,27.499999 L 18.074755,27.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 12.824373,22.170414 L 12.824373,27.249999"
+         id="path5295" />
+      <path
+         id="path5297"
+         d="M 20.090623,23.499999 L 23.695122,23.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5299"
+         d="M 20.136025,25.499999 L 25.766765,25.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5301"
+         d="M 20.101821,27.499999 L 23.163048,27.499999"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         id="path5303"
+         d="M 10.5,31.5 L 19.740165,31.5"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2232"
+       transform="matrix(0.6665574,0,0,0.6665574,0.5640292,0.7438964)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 39.985189,12.861445 C 39.256827,11.514817 33.882221,9.130934 31.084635,8.3314083 C 31.254143,9.904354 30.961856,14.649439 30.961856,14.649439 C 33.024356,13.274439 39.204485,12.699331 39.985189,12.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient2237);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 40.410559,12.739267 C 40.423724,11.324125 34.058025,2.5320142 30.175441,2.6354934 C 31.148479,2.8684884 31.925796,8.803523 30.536076,11.616023 C 33.286076,11.616023 39.446694,10.881093 40.410559,12.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient2239);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient2241);stroke-width:1.50024605;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2243);stroke-width:1.50024641;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 37.558971,9.9767321 C 36.830609,8.6301041 34.525619,5.9151604 32.603033,4.6781344 C 32.654442,6.2680727 33.116647,7.3994674 32.54789,10.055612 C 32.54789,10.055612 36.731384,9.8849421 37.558971,9.9767321 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-netlist-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/application-x-pcb-netlist-48.png
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-48.png	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/application-x-pcb-netlist-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/application-x-pcb-netlist-48.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist-48.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist-48.svg	(revision 18980)
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48.000000px"
+   width="48.000000px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.8244190"
+       cy="3.7561285"
+       fx="8.8244190"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0.000000,0.000000,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,-2.3449e-17,2.501087e-17,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.708450" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929165"
+       gradientTransform="matrix(1.744653,2.313551e-22,-1.663e-22,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="26"
+     inkscape:window-x="0"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="50.568876"
+     inkscape:cx="10.481007"
+     inkscape:zoom="4"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB netlist</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow">
+    <g
+       style="display:inline"
+       id="g2033"
+       inkscape:label="Shadow"
+       transform="translate(-2e-6,2.838692e-5)">
+      <g
+         id="g3712"
+         style="opacity:0.4"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           y="40"
+           x="38"
+           height="7"
+           width="5"
+           id="rect2801"
+           style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5"
+           id="rect3696"
+           style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28"
+           id="rect3700"
+           style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1">
+    <path
+       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+       id="rect15391"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:block;overflow:visible"
+       d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+       id="rect15660"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g3237">
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 10.5,9.4999998 L 18.634649,9.4999998"
+         id="path2214" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.518412,12.5 L 20.518411,12.5"
+         id="path2217" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.518412,14.5 L 20.518411,14.5"
+         id="path2219" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.518412,16.5 L 20.518411,16.5"
+         id="path2221" />
+      <path
+         id="path2225"
+         d="M 13.768412,11.170415 L 13.768412,16.25"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.518412,12.5 L 29.77733,12.5"
+         id="path3197" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.518412,14.5 L 31.964064,14.5"
+         id="path3199" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.461649,16.5 L 30.518412,16.5"
+         id="path3201" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 10.485328,20.5 L 17.5,20.5"
+         id="path3205" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.576087,23.5 L 20.576086,23.5"
+         id="path3207" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.576087,25.5 L 20.576086,25.5"
+         id="path3209" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.576087,27.5 L 20.576086,27.5"
+         id="path3211" />
+      <path
+         id="path3213"
+         d="M 13.826087,22.170415 L 13.826087,27.25"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.484131,23.5 L 28.591957,23.5"
+         id="path3215" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.548469,25.5 L 31.527618,25.5"
+         id="path3217" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.5,27.5 L 27.837971,27.5"
+         id="path3219" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 10.5,31.5 L 19.740165,31.5"
+         id="path3221" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.5,34.5 L 20.499999,34.5"
+         id="path3223" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.5,36.5 L 20.499999,36.5"
+         id="path3225" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 13.5,38.5 L 20.499999,38.5"
+         id="path3227" />
+      <path
+         id="path3229"
+         d="M 13.75,33.170415 L 13.75,38.25"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.412349,34.5 L 28.574064,34.5"
+         id="path3231" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.5,36.5 L 28.852639,36.5"
+         id="path3233" />
+      <path
+         style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 23.443237,38.5 L 30.5,38.5"
+         id="path3235" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <path
+       inkscape:r_cy="true"
+       inkscape:r_cx="true"
+       style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+       id="path5348"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:1"
+       d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+       id="path2210"
+       sodipodi:nodetypes="cccc"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path2247"
+       d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true" />
+  </g>
+</svg>
Index: tags/2.0.1/data/application-x-pcb-netlist.svg
===================================================================
--- tags/2.0.1/data/application-x-pcb-netlist.svg	(nonexistent)
+++ tags/2.0.1/data/application-x-pcb-netlist.svg	(revision 18980)
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="90"
+   inkscape:export-xdpi="90"
+   inkscape:version="0.45.1"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="128"
+   width="128"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docname="application-x-pcb-netlist.svg"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons/gnomemime/pcb_netlist_ideas"
+   version="1.0">
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4790">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4792" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2251"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.277938e-2,-0.999463,0.999463,-3.277938e-2,-0.709646,45.06274)"
+       x1="33.396004"
+       y1="36.921333"
+       x2="34.170048"
+       y2="38.070381" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient15656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient15658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(0.960493,1.041132)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.968273,0,0,1.032767,3.353553,0.646447)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient269"
+       id="radialGradient5350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.331735,0,0,0.353831,20.10526,9.5823)"
+       cx="31.863327"
+       cy="2.3667307"
+       fx="31.863327"
+       fy="2.3667307"
+       r="37.751713" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.148355,1.009137e-2,-1.104438e-2,0.162365,25.06011,12.81706)"
+       cx="30.653816"
+       cy="14.9373"
+       fx="30.653816"
+       fy="14.9373"
+       r="86.70845" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4790"
+       id="radialGradient4796"
+       cx="37.030354"
+       cy="12.98915"
+       fx="37.030354"
+       fy="12.98915"
+       r="4.2929163"
+       gradientTransform="matrix(1.744653,0,0,1.283833,-26.58256,-3.478359)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3688"
+       inkscape:collect="always">
+      <stop
+         id="stop3690"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3692"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="52"
+     inkscape:window-x="289"
+     inkscape:window-height="967"
+     inkscape:window-width="1086"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer5"
+     inkscape:cy="50.568876"
+     inkscape:cx="10.481007"
+     inkscape:zoom="4"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.25490196"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:showpageshadow="false"
+     width="128px"
+     height="128px" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>PCB netlist</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peter Clifton, Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       id="g2258"
+       transform="scale(2.6667,2.6667)">
+      <g
+         transform="translate(-2e-6,2.838692e-5)"
+         inkscape:label="Shadow"
+         id="g2033"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           style="opacity:0.4"
+           id="g3712">
+          <rect
+             style="opacity:1;fill:url(#radialGradient2088);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect2801"
+             width="5"
+             height="7"
+             x="38"
+             y="40" />
+          <rect
+             style="opacity:1;fill:url(#radialGradient2090);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3696"
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)" />
+          <rect
+             style="opacity:1;fill:url(#linearGradient2092);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect3700"
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40" />
+        </g>
+      </g>
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15391"
+         d="M 7.7526014,3.6464462 L 31.199616,3.6308212 C 31.199616,3.6308212 41.478553,13.174533 41.478553,13.811106 L 41.478553,43.417892 C 41.478553,44.054465 40.966077,44.56694 40.329504,44.56694 L 7.7526014,44.56694 C 7.1160285,44.56694 6.6035528,44.054465 6.6035528,43.417892 L 6.6035528,4.7954948 C 6.6035528,4.1589219 7.1160285,3.6464462 7.7526014,3.6464462 z "
+         style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="rect15660"
+         d="M 7.8151023,4.5839462 L 32.691494,4.5839462 C 32.691494,4.5839462 40.44194,12.605373 40.44194,12.687946 L 40.44194,43.381282 C 40.44194,43.463855 40.375465,43.530331 40.292892,43.530331 L 7.8151023,43.530331 C 7.7325294,43.530331 7.6660538,43.463855 7.6660538,43.381282 L 7.6660538,4.7329948 C 7.6660538,4.6504219 7.7325294,4.5839462 7.8151023,4.5839462 z "
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <g
+         id="g3237"
+         style="display:inline">
+        <path
+           id="path2214"
+           d="M 10.5,9.4999998 L 18.634649,9.4999998"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2217"
+           d="M 13.518412,12.5 L 20.518411,12.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2219"
+           d="M 13.518412,14.5 L 20.518411,14.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path2221"
+           d="M 13.518412,16.5 L 20.518411,16.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 13.768412,11.170415 L 13.768412,16.25"
+           id="path2225" />
+        <path
+           id="path3197"
+           d="M 23.518412,12.5 L 29.77733,12.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3199"
+           d="M 23.518412,14.5 L 31.964064,14.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3201"
+           d="M 23.461649,16.5 L 30.518412,16.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3205"
+           d="M 10.485328,20.5 L 17.5,20.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3207"
+           d="M 13.576087,23.5 L 20.576086,23.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3209"
+           d="M 13.576087,25.5 L 20.576086,25.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3211"
+           d="M 13.576087,27.5 L 20.576086,27.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 13.826087,22.170415 L 13.826087,27.25"
+           id="path3213" />
+        <path
+           id="path3215"
+           d="M 23.484131,23.5 L 28.591957,23.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3217"
+           d="M 23.548469,25.5 L 31.527618,25.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3219"
+           d="M 23.5,27.5 L 27.837971,27.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3221"
+           d="M 10.5,31.5 L 19.740165,31.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3223"
+           d="M 13.5,34.5 L 20.499999,34.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3225"
+           d="M 13.5,36.5 L 20.499999,36.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3227"
+           d="M 13.5,38.5 L 20.499999,38.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           d="M 13.75,33.170415 L 13.75,38.25"
+           id="path3229" />
+        <path
+           id="path3231"
+           d="M 23.412349,34.5 L 28.574064,34.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3233"
+           d="M 23.5,36.5 L 28.852639,36.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <path
+           id="path3235"
+           d="M 23.443237,38.5 L 30.5,38.5"
+           style="opacity:1;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path5348"
+         d="M 40.985189,13.861445 C 40.256827,12.514817 34.882221,10.130934 32.084635,9.3314083 C 32.254143,10.904354 31.961856,15.649439 31.961856,15.649439 C 34.024356,14.274439 40.204485,13.699331 40.985189,13.861445 z "
+         style="opacity:0.35714285;color:#000000;fill:url(#radialGradient4796);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:nodetypes="cccc"
+         id="path2210"
+         d="M 41.410559,13.739267 C 41.423724,12.324125 35.058025,3.5320142 31.175441,3.6354934 C 32.148479,3.8684884 32.925796,9.803523 31.536076,12.616023 C 34.286076,12.616023 40.446694,11.881093 41.410559,13.739267 z "
+         style="opacity:1;color:#000000;fill:url(#radialGradient5352);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5350);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 39.121563,11.586207 C 38.393201,10.239579 34.963027,6.5166576 33.040441,5.2796316 C 33.279381,6.7054805 33.577496,8.9620596 32.961856,11.524439 C 32.961856,11.524439 38.340859,11.424093 39.121563,11.586207 z "
+         id="path2247"
+         sodipodi:nodetypes="cccc" />
+    </g>
+  </g>
+</svg>
Index: tags/2.0.1/data/icon-theme-installer
===================================================================
--- tags/2.0.1/data/icon-theme-installer	(nonexistent)
+++ tags/2.0.1/data/icon-theme-installer	(revision 18980)
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+# icon-theme-installer
+# Copyright (C) 2006 Novell, Inc.
+# Written by Aaron Bockover <abock@gnome.org>
+# Licensed under the MIT/X11 license
+#
+# Modified by Peter Clifton to allow icons with numerals in the filename
+#
+# This script is meant to be invoked from within a Makefile/Makefile.am
+# in the install-data-local and uninstall-data sections. It handles the
+# task of properly installing icons into the icon theme. It requires a
+# few arguments to set up its environment, and a list of files to be
+# installed. The format of the file list is critical:
+#
+# <category>,<local-src-file-name>
+#
+#   apps,music-player-banshee.svg
+#   apps,music-player-banshee-16.png
+#   apps,music-player-banshee-22.png
+#
+# <category> is the icon theme category, for instance, apps, devices,
+# actions, emblems...
+#
+# <local-src-file-name> must have a basename in the form of:
+#
+#   proper-theme-name[-<SIZE>].<EXTENSION>
+#
+# Where <SIZE> should be either nothing, which will default to scalable
+# or \-[0-9]{2}, which will expand to <SIZE>x<SIZE>. For example:
+#
+#   music-player-banshee-16.png
+#
+# The <SIZE> here is -16 and will expand to 16x16 per the icon theme spec
+#
+# What follows is an example Makefile.am for icon theme installation:
+#
+# ---------------
+# theme=hicolor
+# themedir=$(datadir)/icons/$(theme)
+# theme_icons = \
+#	apps,music-player-banshee.svg \
+#	apps,music-player-banshee-16.png \
+#	apps,music-player-banshee-22.png \
+#	apps,music-player-banshee-24.png \
+#	apps,music-player-banshee-32.png
+#
+# install_icon_exec = $(top_srcdir)/build/icon-theme-installer -t $(theme) -s $(srcdir) -d "x$(DESTDIR)" -b $(themedir) -m "$(mkinstalldirs)" -x "$(INSTALL_DATA)"
+# install-data-local:
+#	$(install_icon_exec) -i $(theme_icons)
+#
+#	uninstall-hook:
+#		$(install_icon_exec) -u $(theme_icons)
+#
+#	MAINTAINERCLEANFILES = Makefile.in
+#	EXTRA_DIST = $(wildcard *.svg *.png)
+# ---------------
+#
+# Arguments to this program:
+#
+# -i         : Install
+# -u         : Uninstall
+# -t <theme> : Theme name (hicolor)
+# -b <dir>   : Theme installation dest directory [x$(DESTDIR)] - Always prefix
+#              this argument with x; it will be stripped but will act as a
+#              placeholder for zero $DESTDIRs (only set by packagers)
+# -d <dir>   : Theme installation directory [$(hicolordir)]
+# -s <dir>   : Source directory [$(srcdir)]
+# -m <exec>  : Command to exec for directory creation [$(mkinstalldirs)]
+# -x <exec>  : Command to exec for single file installation [$(INSTALL_DATA)]
+# <remainging> : All remainging should be category,filename pairs
+
+while getopts "iut:b:d:s:m:x:" flag; do
+	case "$flag" in
+		i) INSTALL=yes ;;
+		u) UNINSTALL=yes ;;
+		t) THEME_NAME=$OPTARG ;;
+		d) INSTALL_DEST_DIR="`echo $OPTARG | sed 's;^x;;'`" ;;
+		b) INSTALL_BASE_DIR=$OPTARG ;;
+		s) SRC_DIR=$OPTARG ;;
+		m) MKINSTALLDIRS_EXEC=$OPTARG ;;
+		x) INSTALL_DATA_EXEC=$OPTARG ;;
+	esac
+done
+
+shift `expr $OPTIND - 1`
+
+if test "x$INSTALL" = "xyes" -a "x$UNINSTALL" = "xyes"; then
+	echo "Cannot pass both -i and -u"
+	exit 1
+elif test "x$INSTALL" = "x" -a "x$UNINSTALL" = "x"; then
+	echo "Must path either -i or -u"
+	exit 1
+fi
+
+if test -z "$THEME_NAME"; then
+	echo "Theme name required (-t hicolor)"
+	exit 1
+fi
+
+if test -z "$INSTALL_BASE_DIR"; then
+	echo "Base theme directory required [-d \$(hicolordir)]"
+	exit 1
+fi
+
+#if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
+#	echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+#	exit 1
+#fi
+
+#if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
+#	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+#	exit 1
+#fi
+
+if test -z "$SRC_DIR"; then
+	SRC_DIR=.
+fi
+
+for icon in $@; do
+	size=`echo $icon | sed -n 's/.*-\([0-9]*\).*/\1/p'`
+	category=`echo $icon | cut -d, -f1`
+	build_name=`echo $icon | cut -d, -f2`
+	install_name=`echo $build_name | sed 's/-[0-9]\+//g'`
+	install_name=`basename $install_name`
+
+	if test -z $size; then 
+		size=scalable;
+	else
+		size=${size}x${size};
+	fi
+	
+	install_dir=${INSTALL_DEST_DIR}${INSTALL_BASE_DIR}/$size/$category
+	install_path=$install_dir/$install_name
+	
+	if test "x$INSTALL" = "xyes"; then
+		echo "Installing $size $install_name into $THEME_NAME icon theme"
+		
+		$MKINSTALLDIRS_EXEC $install_dir || {
+			echo "Failed to create directory $install_dir"
+			exit 1
+		}
+		
+		$INSTALL_DATA_EXEC $SRC_DIR/$build_name $install_path || {
+			echo "Failed to install $SRC_DIR/$build_name into $install_path"
+			exit 1
+		}
+
+		if test ! -e $install_path; then
+			echo "Failed to install $SRC_DIR/$build_name into $install_path"
+			exit 1
+		fi
+	else
+		if test -e $install_path; then
+			echo "Removing $size $install_name from $THEME_NAME icon theme"
+
+			rm $install_path || { 
+				echo "Failed to remove $install_path"
+				exit 1
+			}
+		fi
+	fi
+done
+
+if test "x$INSTALL" = "xyes"; then
+	gtk_update_icon_cache_bin="`(which gtk-update-icon-cache || echo /opt/gnome/bin/gtk-update-icon-cache)2>/dev/null`"
+	gtk_update_icon_cache_bin="${GTK_UPDATE_ICON_CACHE_BIN:-$gtk_update_icon_cache_bin}"
+
+	gtk_update_icon_cache="$gtk_update_icon_cache_bin -f -t $INSTALL_BASE_DIR"
+
+	if test -z "$INSTALL_DEST_DIR"; then 
+		if test -x $gtk_update_icon_cache_bin; then 
+			echo "Updating GTK icon cache"
+			$gtk_update_icon_cache
+		else
+			echo "*** Icon cache not updated. Could not execute $gtk_update_icon_cache_bin"
+		fi
+	else
+		echo "*** Icon cache not updated. After install, run this:"
+		echo "***   $gtk_update_icon_cache"
+	fi
+fi
+

Property changes on: tags/2.0.1/data/icon-theme-installer
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/data/pcb-48.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/pcb-48.png
===================================================================
--- tags/2.0.1/data/pcb-48.png	(nonexistent)
+++ tags/2.0.1/data/pcb-48.png	(revision 18980)

Property changes on: tags/2.0.1/data/pcb-48.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/pcb.desktop
===================================================================
--- tags/2.0.1/data/pcb.desktop	(nonexistent)
+++ tags/2.0.1/data/pcb.desktop	(revision 18980)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=pcb-rnd PCB Designer
+GenericName=PCB Design
+Comment=Create and edit printed circuit board designs
+Type=Application
+Exec=pcb-rnd %f
+Icon=pcb
+MimeType=application/x-pcb-layout;application/x-pcb-footprint;
+Categories=Engineering;Electronics;
Index: tags/2.0.1/data/pcb.svg
===================================================================
--- tags/2.0.1/data/pcb.svg	(nonexistent)
+++ tags/2.0.1/data/pcb.svg	(revision 18980)
@@ -0,0 +1,1070 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/pcjc2/gedawork/tomazicons"
+   sodipodi:docname="pcb.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6445">
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="0"
+         id="stop6447" />
+      <stop
+         style="stop-color:#ce5c00"
+         offset="1"
+         id="stop6449" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6437">
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="0"
+         id="stop6439" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6441" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4700">
+      <stop
+         id="stop4702"
+         offset="0"
+         style="stop-color:#32362e;stop-opacity:1;" />
+      <stop
+         id="stop4704"
+         offset="1"
+         style="stop-color:#376c04;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4682">
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop4684" />
+      <stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop4686" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4333">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop4335" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop4337" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3415">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop3417" />
+      <stop
+         id="stop3423"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3419" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3399">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3401" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3403" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2919">
+      <stop
+         style="stop-color:#3f7b04;stop-opacity:1;"
+         offset="0"
+         id="stop2921" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2923" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2301"
+       inkscape:collect="always">
+      <stop
+         id="stop2303"
+         offset="0"
+         style="stop-color:#ce5c00;stop-opacity:1" />
+      <stop
+         id="stop2305"
+         offset="1"
+         style="stop-color:#ce5c00" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1813"
+       inkscape:collect="always">
+      <stop
+         id="stop1815"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop1817"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3399"
+       id="radialGradient3439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,2.166667,0,-46.08333)"
+       cx="6"
+       cy="39.5"
+       fx="6"
+       fy="39.5"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3399"
+       id="radialGradient3441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,2.166667,-45,-125.0833)"
+       cx="6"
+       cy="39.5"
+       fx="6"
+       fy="39.5"
+       r="3" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3415"
+       id="linearGradient3443"
+       gradientUnits="userSpaceOnUse"
+       x1="18"
+       y1="46"
+       x2="18"
+       y2="32.999397" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4333"
+       id="radialGradient3445"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.226496,0,25.67067)"
+       cx="37.375"
+       cy="33.1875"
+       fx="37.375"
+       fy="33.1875"
+       r="14.625" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4682"
+       id="linearGradient3449"
+       gradientUnits="userSpaceOnUse"
+       x1="6.7928934"
+       y1="32.963203"
+       x2="7.9215727"
+       y2="54.448856" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1813"
+       id="linearGradient3451"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.415008,6.5485,26.7669)"
+       x1="18.1875"
+       y1="18.53828"
+       x2="32.9375"
+       y2="18.392296" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6445"
+       id="linearGradient3453"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6.39225,12.18459)"
+       x1="28.078697"
+       y1="12.338078"
+       x2="30.432114"
+       y2="14.691495" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2301"
+       id="linearGradient3455"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6.39225,12.18459)"
+       x1="23.447809"
+       y1="21.481258"
+       x2="22.810215"
+       y2="22.118853" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6437"
+       id="linearGradient3457"
+       gradientUnits="userSpaceOnUse"
+       x1="26.379272"
+       y1="34.389839"
+       x2="25.485056"
+       y2="32.714375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2919"
+       id="linearGradient4449"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.489708,-24.78509,-59.695126)"
+       x1="11.949747"
+       y1="40.664974"
+       x2="94.364037"
+       y2="47.897068" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4700"
+       id="linearGradient4568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-22.78509,-37.142866)"
+       x1="5.6568546"
+       y1="53.320892"
+       x2="4"
+       y2="16.003418" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#afafaf"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="217.79117"
+     inkscape:cy="8.6973454"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="48px"
+     height="48px"
+     gridspacingx="0.5px"
+     gridspacingy="0.5px"
+     inkscape:showpageshadow="true"
+     borderlayer="true"
+     gridempspacing="2"
+     inkscape:window-width="1051"
+     inkscape:window-height="797"
+     inkscape:window-x="57"
+     inkscape:window-y="79"
+     showgrid="true"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:grid-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:title>Text editor</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(23.785088,38.119518)">
+    <g
+       id="g2637"
+       inkscape:label="base"
+       style="display:inline"
+       transform="translate(60.78337,49.43458)" />
+    <path
+       style="fill:#4e9a06;fill-opacity:1;stroke:url(#linearGradient4568);stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       d="M -14.51732,-26.619518 L 13.94712,-26.619518 C 14.92646,-26.619518 15.64391,-25.866843 15.71489,-24.851751 L 17.65239,2.857134 L 17.71491,6.357134 L -18.28509,6.357134 L -18.28509,2.857134 L -16.28509,-24.851751 C -16.21502,-25.822602 -15.49667,-26.619518 -14.51732,-26.619518 z "
+       id="path2997"
+       sodipodi:nodetypes="cczcccczc" />
+    <g
+       id="g5565"
+       transform="translate(-16.097588,-83.182018)">
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5567"
+         d="M 10,73 L 10,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5569"
+         d="M 13,73 L 13,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5571"
+         d="M 16,73 L 16,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5573"
+         d="M 19,73 L 19,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5575"
+         d="M 10,70 L 10,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5577"
+         d="M 13,70 L 13,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5579"
+         d="M 16,70 L 16,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5581"
+         d="M 19,70 L 19,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5583"
+         d="M 10,67 L 10,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5585"
+         d="M 13,67 L 13,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5587"
+         d="M 16,67 L 16,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5589"
+         d="M 19,67 L 19,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5591"
+         d="M 10,64 L 10,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5593"
+         d="M 13,64 L 13,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5595"
+         d="M 16,64 L 16,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5597"
+         d="M 19,64 L 19,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5599"
+         d="M 22,73 L 22,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5601"
+         d="M 25,73 L 25,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5603"
+         d="M 28,73 L 28,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5605"
+         d="M 31,73 L 31,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5607"
+         d="M 22,70 L 22,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5609"
+         d="M 25,70 L 25,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5611"
+         d="M 28,70 L 28,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5613"
+         d="M 31,70 L 31,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5615"
+         d="M 22,67 L 22,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5617"
+         d="M 25,67 L 25,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5619"
+         d="M 28,67 L 28,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5621"
+         d="M 31,67 L 31,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5623"
+         d="M 22,64 L 22,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5625"
+         d="M 25,64 L 25,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5627"
+         d="M 28,64 L 28,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5629"
+         d="M 31,64 L 31,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5631"
+         d="M 10,61 L 10,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5633"
+         d="M 13,61 L 13,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5635"
+         d="M 16,61 L 16,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5637"
+         d="M 19,61 L 19,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5639"
+         d="M 10,58 L 10,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5641"
+         d="M 13,58 L 13,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5643"
+         d="M 16,58 L 16,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5645"
+         d="M 19,58 L 19,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5647"
+         d="M 22,61 L 22,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5649"
+         d="M 25,61 L 25,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5651"
+         d="M 28,61 L 28,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5653"
+         d="M 31,61 L 31,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5655"
+         d="M 22,58 L 22,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5657"
+         d="M 25,58 L 25,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5659"
+         d="M 28,58 L 28,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5661"
+         d="M 10,85 L 10,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5663"
+         d="M 13,85 L 13,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5665"
+         d="M 16,85 L 16,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5667"
+         d="M 19,85 L 19,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5669"
+         d="M 10,82 L 10,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5671"
+         d="M 13,82 L 13,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5673"
+         d="M 16,82 L 16,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5675"
+         d="M 19,82 L 19,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5677"
+         d="M 10,79 L 10,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5679"
+         d="M 13,79 L 13,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5681"
+         d="M 16,79 L 16,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5683"
+         d="M 19,79 L 19,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5685"
+         d="M 10,76 L 10,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5687"
+         d="M 13,76 L 13,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5689"
+         d="M 16,76 L 16,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5691"
+         d="M 19,76 L 19,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5693"
+         d="M 22,85 L 22,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5695"
+         d="M 25,85 L 25,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5697"
+         d="M 28,85 L 28,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5699"
+         d="M 31,85 L 31,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5701"
+         d="M 22,82 L 22,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5703"
+         d="M 25,82 L 25,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5705"
+         d="M 28,82 L 28,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5707"
+         d="M 31,82 L 31,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5709"
+         d="M 22,79 L 22,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5711"
+         d="M 25,79 L 25,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5713"
+         d="M 28,79 L 28,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5715"
+         d="M 31,79 L 31,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5717"
+         d="M 22,76 L 22,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5719"
+         d="M 25,76 L 25,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5721"
+         d="M 28,76 L 28,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5723"
+         d="M 31,76 L 31,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5725"
+         d="M 4,73 L 4,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5727"
+         d="M 7,73 L 7,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5729"
+         d="M 4,70 L 4,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5731"
+         d="M 7,70 L 7,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5733"
+         d="M 4,67 L 4,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5735"
+         d="M 7,67 L 7,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5737"
+         d="M 4,64 L 4,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5739"
+         d="M 7,64 L 7,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5741"
+         d="M 4,61 L 4,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5743"
+         d="M 7,61 L 7,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5745"
+         d="M 4,58 L 4,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5747"
+         d="M 7,58 L 7,58"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5749"
+         d="M 4,85 L 4,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5751"
+         d="M 7,85 L 7,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5753"
+         d="M 4,82 L 4,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5755"
+         d="M 7,82 L 7,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5757"
+         d="M 4,79 L 4,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5759"
+         d="M 7,79 L 7,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5761"
+         d="M 4,76 L 4,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5763"
+         d="M 7,76 L 7,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5765"
+         d="M 1,73 L 1,73"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5767"
+         d="M 1,70 L 1,70"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5769"
+         d="M 1,67 L 1,67"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5771"
+         d="M 1,64 L 1,64"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5773"
+         d="M 1,61 L 1,61"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5775"
+         d="M 1,85 L 1,85"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5777"
+         d="M 1,82 L 1,82"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5779"
+         d="M 1,79 L 1,79"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5781"
+         d="M 1,76 L 1,76"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#316400;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <g
+       id="g5792"
+       transform="translate(-4,48.676777)">
+      <path
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M -7.911735,-72.09947 L -4.2637154,-72.144203 L -0.98581343,-68.498826 L -1.726049,-61.118607"
+         id="path2828"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 1.1923678,-61.154394 L 2.0806498,-70.010656 L 0.1139084,-72.197882"
+         id="path2830" />
+      <path
+         style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 4.1107838,-61.19018 L 5.1471128,-71.522486 L 4.4915318,-72.251562"
+         id="path2832" />
+      <path
+         style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 7.0291988,-61.225967 L 8.1395518,-72.296295"
+         id="path2890" />
+      <path
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M -2.5403079,-53.000368 L -2.8364022,-50.04828 L -5.2472848,-47.807374 L -10.354512,-47.744748"
+         id="path2910" />
+      <path
+         style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 0.3781084,-53.036154 L -0.1400566,-47.87"
+         id="path2912" />
+      <path
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 3.2965248,-53.07194 L 3.0004298,-50.119853 L 4.9671708,-47.932626 L 9.344794,-47.986306"
+         id="path2914" />
+      <path
+         style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M 6.2149398,-53.107727 L 7.5260988,-51.649575 L 9.714912,-51.676415"
+         id="path2916" />
+      <path
+         style="color:#000000;fill:#5fc500;fill-opacity:1;fill-rule:nonzero;stroke:#5fc500;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         d="M -8.1338058,-69.885404 L -5.2153901,-69.92119 L -3.248649,-67.733963 L -4.8771671,-51.497483 L -6.484422,-50.003547 L -10.132442,-49.958814 L -8.1338058,-69.885404 z "
+         id="path2918"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         transform="matrix(0.9999248,-1.2261314e-2,-9.9799219e-2,0.9950076,0,0)"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.00316036;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+         id="rect2920"
+         width="13.133858"
+         height="12.609322"
+         x="-10.055484"
+         y="-63.747379"
+         ry="1.9667948" />
+      <path
+         id="path2894"
+         d="M -1.726049,-61.118607 L -1.8740961,-59.642563"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2896"
+         d="M 1.1923678,-61.154394 L 1.0443198,-59.67835"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2898"
+         d="M 4.1107838,-61.19018 L 3.9627358,-59.714137"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2900"
+         d="M 7.0291988,-61.225967 L 6.8811508,-59.749923"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2902"
+         d="M 6.3629868,-54.58377 L 6.2149398,-53.107727"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2904"
+         d="M 3.4445718,-54.547983 L 3.2965248,-53.07194"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2906"
+         d="M 0.5261554,-54.512197 L 0.3781084,-53.036154"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+      <path
+         id="path2908"
+         d="M -2.3922609,-54.476411 L -2.5403079,-53.000368"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    </g>
+    <g
+       id="g2999"
+       transform="matrix(1.0416677,0,0,0.4579337,-23.72259,-12.731239)"
+       style="opacity:0.4">
+      <rect
+         y="33"
+         x="3"
+         height="13"
+         width="3"
+         id="rect3001"
+         style="opacity:1;fill:url(#radialGradient3439);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1" />
+      <rect
+         transform="scale(-1,-1)"
+         y="-46"
+         x="-42"
+         height="13"
+         width="3"
+         id="rect3003"
+         style="opacity:1;fill:url(#radialGradient3441);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1" />
+      <rect
+         y="33"
+         x="6"
+         height="13"
+         width="33"
+         id="rect3005"
+         style="opacity:1;fill:url(#linearGradient3443);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.07000002;fill:url(#radialGradient3445);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1"
+       id="path3007"
+       sodipodi:cx="37.375"
+       sodipodi:cy="33.1875"
+       sodipodi:rx="14.625"
+       sodipodi:ry="3.3125"
+       d="M 52 33.1875 A 14.625 3.3125 0 1 1  22.75,33.1875 A 14.625 3.3125 0 1 1  52 33.1875 z"
+       transform="matrix(0.897436,0,0,0.981132,-21.45176,-35.454187)" />
+    <rect
+       style="fill:url(#linearGradient4449);fill-opacity:1;stroke:none;stroke-width:1.00199997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1"
+       id="rect3009"
+       width="35"
+       height="3.0103984"
+       x="-17.785091"
+       y="2.8571317" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.9722718"
+       inkscape:original="M 8.28125 10.53125 C 7.301907 10.53125 6.570075 11.310399 6.5 12.28125 L 4.5 40 L 4.5 43.5 L 40.5 43.5 L 40.4375 40 L 38.5 12.28125 C 38.429021 11.266158 37.698095 10.53125 36.71875 10.53125 L 8.28125 10.53125 z "
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient3449);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3011"
+       d="M 8.28125,11.5 C 7.8175892,11.5 7.5065211,11.820452 7.46875,12.34375 L 5.46875,40 L 5.46875,40.0625 L 5.46875,42.53125 L 39.5,42.53125 L 39.46875,40.0625 L 39.46875,40.03125 L 37.53125,12.34375 C 37.490391,11.75941 37.211695,11.5 36.71875,11.5 L 8.28125,11.5 z "
+       transform="translate(-22.78509,-37.142866)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#c17d11;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -18.28509,6.357134 L 17.71491,6.357134"
+       id="path3013"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g3047"
+       transform="translate(-22.78509,-37.142866)">
+      <path
+         id="path3049"
+         d="M 41.07975,28.46584 L 26.07975,32.938753 L 25.95475,33.003598 L 25.861,33.081412 L 23.111,35.93459 L 30.5485,35.091606 L 30.82975,35.065668 L 31.01725,34.987854 L 41.07975,32.304661 L 41.07975,28.46584 z "
+         style="opacity:0.4;fill:url(#linearGradient3451);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         sodipodi:nodetypes="cccccccccc" />
+      <g
+         id="g3051">
+        <g
+           id="g3053">
+          <path
+             style="fill:url(#linearGradient3453);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3455);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 25.89225,30.18459 L 42.89225,13.18459 C 45.067299,13.544551 45.976969,14.916815 46.39225,16.68459 L 29.39225,33.68459 L 24.776133,34.389095 L 25.89225,30.18459 z "
+             id="path3055"
+             sodipodi:nodetypes="cccccc" />
+          <path
+             style="opacity:0.28235294;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             d="M 26.792248,30.68459 L 43.289998,14.286842 C 44.379743,14.465277 44.807259,15.274786 45.289998,16.286842 L 28.89225,32.784592 L 25.592247,33.684593 L 26.792248,30.68459 z "
+             id="path3057"
+             sodipodi:nodetypes="cccccc" />
+        </g>
+        <g
+           id="g3059">
+          <path
+             style="fill:url(#linearGradient3457);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.31200001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 24.549577,34.633026 L 26.215899,30.452717 C 26.215899,30.452717 27.415434,30.698077 28.148076,31.427806 C 28.880718,32.157535 29.146467,33.371634 29.146467,33.371634 L 24.549577,34.633026 z "
+             id="path3061"
+             sodipodi:nodetypes="cczcc" />
+          <path
+             style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#e9b96e;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="M 23,21.5 L 17.5,23 L 19.5,18"
+             id="path3063"
+             sodipodi:nodetypes="ccc"
+             transform="translate(6.39225,12.18459)" />
+          <path
+             sodipodi:nodetypes="cccsc"
+             style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             d="M 23.95475,33.68459 L 23.0485,35.93459 L 25.39225,35.27834 C 25.39427,35.246503 25.39225,35.216934 25.39225,35.18459 C 25.39225,34.382465 24.746942,33.724789 23.95475,33.68459 z "
+             id="path3065" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="layer6"
+       inkscape:label="Shadow"
+       transform="translate(29.464908,-40.795033)" />
+    <g
+       id="layer5"
+       inkscape:label="Text"
+       style="display:inline"
+       transform="translate(29.464908,-40.795033)" />
+  </g>
+</svg>
Index: tags/2.0.1/data/pcb.xml
===================================================================
--- tags/2.0.1/data/pcb.xml	(nonexistent)
+++ tags/2.0.1/data/pcb.xml	(revision 18980)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-pcb-layout">
+    <sub-class-of type="text/plain"/>
+    <comment>PCB layout</comment>
+    <glob pattern="*.pcb"/>
+    <magic priority="50">
+      <match value="# release: pcb " type="string" offset="0"/>
+    </magic>
+  </mime-type>
+  <mime-type type="application/x-pcb-footprint">
+    <sub-class-of type="text/plain"/>
+    <comment>PCB footprint</comment>
+    <glob pattern="*.fp"/>
+    <magic priority="50">
+      <match value="Element[" type="string" offset="0:20"/>
+    </magic>
+  </mime-type>
+  <mime-type type="application/x-pcb-netlist">
+    <sub-class-of type="text/plain"/>
+    <comment>PCB netlist</comment>
+    <glob pattern="*.net"/>
+  </mime-type>
+  <mime-type type="application/x-gerber">
+    <sub-class-of type="text/plain"/>
+    <comment>Gerber file</comment>
+    <glob pattern="*.gbr"/>
+    <magic priority="50">
+      <match value="G04" type="string" offset="0"/>
+    </magic>
+  </mime-type>
+  <mime-type type="application/x-excellon">
+    <sub-class-of type="text/plain"/>
+    <comment>Excellon drill file</comment>
+    <glob pattern="*.cnc"/>
+    <magic priority="50">
+      <match value="M48" type="string" offset="0"/>
+    </magic>
+  </mime-type>
+</mime-info>
Index: tags/2.0.1/data/pcb_icon.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/data/pcb_icon.ico
===================================================================
--- tags/2.0.1/data/pcb_icon.ico	(nonexistent)
+++ tags/2.0.1/data/pcb_icon.ico	(revision 18980)

Property changes on: tags/2.0.1/data/pcb_icon.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/data/regen_files
===================================================================
--- tags/2.0.1/data/regen_files	(nonexistent)
+++ tags/2.0.1/data/regen_files	(revision 18980)
@@ -0,0 +1,165 @@
+#!/bin/sh
+#
+
+CONVERT=${CONVERT:-convert}
+COMPOSITE=${COMPOSITE:-composite}
+INKSCAPE=${INKSCAPE:-inkscape}
+PPMTOWINICON=${PPMTOWINICON:-ppmtowinicon}
+
+do_inkscape=yes
+do_convert=yes
+do_winicon=yes
+
+usage() {
+cat << EOF
+
+$0 -- Regenerate desktop icon files and windows icon files
+
+Options
+
+  --help          Displays this message and exits
+
+  --skip-png      Skips the regeneration of the .png file(s)
+
+  --skip-winicon  Skips the regneration of the Windows icon file(s)
+
+EOF
+
+}
+
+while test $# -ne 0 ; do
+	case $1 in
+		--help)
+			usage
+			exit 0
+			;;
+
+		--skip-png)
+			do_inkscape=no
+			shift
+			;;
+
+		--skip-winicon)
+			do_convert=no
+			do_winicon=no
+			shift
+			;;
+
+		-*)
+			echo "$0:  Unknown option $1"
+			usage
+			exit 1
+			;;
+
+		*)
+			break
+			;;
+	esac
+done
+
+if test $? -ne 0 ; then
+	usage
+	exit 1
+fi
+
+##
+## Export the SVG graphics
+##
+
+# see if we have inkscape
+if test $do_inkscape = yes ; then
+${INKSCAPE} --version 2>&1 >/dev/null
+if test $? -ne 0 ; then
+	echo "\"${INKSCAPE} --version\" failed."
+	echo "Make sure that inkscape is installed and functional on your system."
+	echo "Skipping the SVG -> PNG conversion."
+	do_inkscape=no
+fi
+fi
+
+if test $do_inkscape = yes ; then
+	echo "Export SVG graphics to png..."
+
+	for r in 16 22 24 32 48 ; do
+		case ${r} in 
+			24)
+				x=-1
+				y=23
+				rs=22
+				;;
+			*)
+				x=0
+				y=${r}
+				rs=${r}
+				;;
+		esac
+		for f in *-${rs}.svg ; do
+			fb=`basename ${f} ${rs}.svg`
+			p="${fb}${r}.png"
+			echo "${f} -> ${p}"
+			${INKSCAPE} --export-png=${p} --export-area=${x}:${x}:${y}:${y} ${f}
+		done
+	done
+fi
+
+##
+## Generate the windows icon file
+##
+
+app_icon="application-x-pcb-layout"
+
+if test $do_convert = yes ; then
+# see if we have ImageMagick
+${CONVERT} --version 2>&1 >/dev/null
+if test $? -ne 0 ; then
+	echo "\"${CONVERT} --version\" failed."
+	echo "Make sure that ImageMagick is installed and functional on your system."
+	echo "Skipping the PNG -> PPM conversion."
+	do_convert=no
+fi
+fi
+
+if test $do_convert = yes ; then
+echo "Creating windows pbm mask files..."
+${CONVERT} -channel matte -separate +matte ${app_icon}-48.png - |
+  ${CONVERT} -threshold 65534 -negate - 48_mask.pbm
+${CONVERT} -channel matte -separate +matte ${app_icon}-32.png - |
+  ${CONVERT} -threshold 65534 -negate - 32_mask.pbm
+${CONVERT} -channel matte -separate +matte ${app_icon}-16.png - |
+  ${CONVERT} -threshold 65534 -negate - 16_mask.pbm
+
+echo "Creating windows ppm flattened files..."
+${CONVERT} -flatten -colors 16 ${app_icon}-48.png 48_16.ppm
+${CONVERT} -flatten -colors 256 ${app_icon}-48.png 48_256.ppm
+${CONVERT} -flatten -colors 16 ${app_icon}-32.png 32_16.ppm
+${CONVERT} -flatten -colors 256 ${app_icon}-32.png 32_256.ppm
+${CONVERT} -flatten -colors 16 ${app_icon}-16.png 16_16.ppm
+${CONVERT} -flatten -colors 256 ${app_icon}-16.png 16_256.ppm
+fi
+
+# see if we have netpbm
+if test $do_winicon = yes ; then
+${PPMTOWINICON} --version 2>&1 >/dev/null
+if test $? -ne 0 ; then
+	echo "\"${PPMTOWINICON} --version\" failed."
+	echo "Make sure that netpbm is installed and functional on your system."
+	echo "Skipping the pbm -> windows icon conversion."
+	do_winicon=no
+fi
+fi
+
+if test $do_winicon = yes ; then
+echo "Creating windows icon file..."
+${PPMTOWINICON} -output pcb_icon.ico -andpgms\
+    48_16.ppm 48_mask.pbm 48_256.ppm 48_mask.pbm\
+    32_16.ppm 32_mask.pbm 32_256.ppm 32_mask.pbm\
+    16_16.ppm 16_mask.pbm 16_256.ppm 16_mask.pbm
+fi
+
+rm -f \
+    48_16.ppm 48_256.ppm 48_mask.pbm\
+    32_16.ppm 32_256.ppm 32_mask.pbm\
+    16_16.ppm 16_256.ppm 16_mask.pbm
+
+echo "All done"
+

Property changes on: tags/2.0.1/data/regen_files
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/data/x-excellon.desktop
===================================================================
--- tags/2.0.1/data/x-excellon.desktop	(nonexistent)
+++ tags/2.0.1/data/x-excellon.desktop	(revision 18980)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Excellon drill file
+MimeType=application/x-excellon
+Type=MimeType
+Icon=application-x-excellon
+Patterns=*.cnc
+X-KDE-IsAlso=text/plain
Index: tags/2.0.1/data/x-gerber.desktop
===================================================================
--- tags/2.0.1/data/x-gerber.desktop	(nonexistent)
+++ tags/2.0.1/data/x-gerber.desktop	(revision 18980)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Gerber file
+MimeType=application/x-gerber
+Type=MimeType
+Icon=application-x-gerber
+Patterns=*.gbr
+X-KDE-IsAlso=text/plain
Index: tags/2.0.1/data/x-pcb-footprint.desktop
===================================================================
--- tags/2.0.1/data/x-pcb-footprint.desktop	(nonexistent)
+++ tags/2.0.1/data/x-pcb-footprint.desktop	(revision 18980)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=PCB footprint
+MimeType=application/x-pcb-footprint
+Type=MimeType
+Icon=application-x-pcb-footprint
+Patterns=*.fp
+X-KDE-IsAlso=text/plain
Index: tags/2.0.1/data/x-pcb-layout.desktop
===================================================================
--- tags/2.0.1/data/x-pcb-layout.desktop	(nonexistent)
+++ tags/2.0.1/data/x-pcb-layout.desktop	(revision 18980)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=PCB layout
+MimeType=application/x-pcb-layout
+Type=MimeType
+Icon=application-x-pcb-layout
+Patterns=*.pcb
+X-KDE-IsAlso=text/plain
Index: tags/2.0.1/data/x-pcb-netlist.desktop
===================================================================
--- tags/2.0.1/data/x-pcb-netlist.desktop	(nonexistent)
+++ tags/2.0.1/data/x-pcb-netlist.desktop	(revision 18980)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=PCB netlist
+MimeType=application/x-pcb-netlist
+Type=MimeType
+Icon=application-x-pcb-netlist
+Patterns=*.net
+X-KDE-IsAlso=text/plain
Index: tags/2.0.1/doc/Autostyle.html
===================================================================
--- tags/2.0.1/doc/Autostyle.html	(nonexistent)
+++ tags/2.0.1/doc/Autostyle.html	(revision 18980)
@@ -0,0 +1,16 @@
+<!--AUTO head begin-->
+	<link rel="icon" href="$ROOT$resources/logo16.png">
+<!--AUTO head end-->
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="$ROOT$index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="$ROOT$news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="$ROOT$doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="$ROOT$support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="$ROOT$resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
Index: tags/2.0.1/doc/Autostyle.sh
===================================================================
--- tags/2.0.1/doc/Autostyle.sh	(nonexistent)
+++ tags/2.0.1/doc/Autostyle.sh	(revision 18980)
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+autostyle()
+{
+	awk -v "template=$1" -v "root=$ROOT" '
+	BEGIN {
+		while((getline < template) > 0) {
+			if (parse_auto(RES, $0)) {
+				if (RES["action"] == "begin")
+					curr = RES["ID"]
+				else
+					reset_curr = 1
+			}
+			if (curr != "")
+				AUTO[curr] = AUTO[curr] var_subs($0) "\n"
+			if (reset_curr) {
+				curr = ""
+				reset_curr = 0
+			}
+		}
+	}
+
+	function var_subs(s)
+	{
+		gsub("[$]ROOT[$]", root, s)
+		return s
+	}
+
+	function parse_auto(RES, line     ,tmp)
+	{
+		if (!(line ~ "<!--AUTO"))
+			return 0
+		sub(".*<!--AUTO[ \t]*", "", line)
+		sub("[ \t]*-->.*", "", line)
+		line = tolower(line)
+		tmp = line
+		sub("[ \t].*$", "", tmp)
+		RES["ID"] = tmp
+		tmp = line
+		sub("^[^ \t]*[ \t]*", "", tmp)
+		RES["action"] = tmp
+		return 1
+	}
+
+	{
+		if (parse_auto(RES, $0)) {
+			if (RES["action"] == "begin")
+				skip = 1
+			else if (RES["action"] == "end") {
+				printf("%s", AUTO[RES["ID"]])
+				skip = 0
+			}
+			next
+		}
+	}
+
+	(!skip) { print $0 }
+
+	'
+}
+
+for html in $*
+do
+	case $html in
+		Autostyle.html) ;;
+		*)
+			mv $html $html.tmp
+			autostyle "Autostyle.html" < $html.tmp > $html
+			if test $? = 0
+			then
+				rm $html.tmp
+			else
+				echo "Failed on $html, keeping the original version."
+				mv $html.tmp $html
+			fi
+	esac
+done

Property changes on: tags/2.0.1/doc/Autostyle.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/Makefile
===================================================================
--- tags/2.0.1/doc/Makefile	(nonexistent)
+++ tags/2.0.1/doc/Makefile	(revision 18980)
@@ -0,0 +1,67 @@
+MENU_RES=../src/pcb-menu-default.lht
+KEYLIST=../util/keylist.sh
+DEBLIST=../util/devhelpers/deblist.sh
+ROOT=..
+
+all: keys.html user/05_ui/06_common/keytree.svg user/05_ui/06_common/keytree.txt
+	ROOT="" ./Autostyle.sh *.html
+
+include ../Makefile.conf
+
+user/05_ui/06_common/keytree.svg: $(MENU_RES) $(KEYLIST)
+	$(KEYLIST) --dot user/05_ui/06_common/src/node_names.txt $(MENU_RES) > user/05_ui/06_common/keytree.dot
+	dot -Tsvg < user/05_ui/06_common/keytree.dot >user/05_ui/06_common/keytree.svg
+
+user/05_ui/06_common/keytree.txt: $(MENU_RES) $(KEYLIST)
+	$(KEYLIST) --lst $(MENU_RES) > user/05_ui/06_common/keytree.txt
+
+
+keys.html: $(MENU_RES) $(KEYLIST)
+	$(KEYLIST) $(MENU_RES) > keys.html
+
+install_main:
+	$(SCCBOX) $(HOW) *.html *.txt TODO $(DOCDIR)/
+
+install:
+	$(SCCBOX) mkdir -p "$(DOCDIR)"
+	cd man && $(MAKE) install
+	cd user && $(MAKE) install
+	cd tutorials && $(MAKE) install
+	cd security && $(MAKE) install
+	cd conf && $(MAKE) install
+	cd developer && $(MAKE) install
+	$(MAKE) install_main HOW="install -f -d"
+
+linstall:
+	cd man && $(MAKE) linstall
+	cd user && $(MAKE) linstall
+	cd tutorials && $(MAKE) linstall
+	cd security && $(MAKE) linstall
+	cd conf && $(MAKE) linstall
+	cd developer && $(MAKE) linstall
+	$(MAKE) install_main HOW="install -f -l -d"
+
+uninstall:
+	cd man && $(MAKE) uninstall
+	cd user && $(MAKE) uninstall
+	cd tutorials && $(MAKE) uninstall
+	cd security && $(MAKE) uninstall
+	cd conf && $(MAKE) uninstall
+	cd developer && $(MAKE) uninstall
+	$(MAKE) install_main HOW="install -f -u -d"
+
+clean:
+	cd man && $(MAKE) clean
+	cd user && $(MAKE) clean
+	cd tutorials && $(MAKE) clean
+	cd security && $(MAKE) clean
+	cd conf && $(MAKE) clean
+	cd developer && $(MAKE) clean
+
+distclean:
+	cd man && $(MAKE) distclean
+	cd user && $(MAKE) distclean
+	cd tutorials && $(MAKE) distclean
+	cd security && $(MAKE) distclean
+	cd conf && $(MAKE) distclean
+	cd developer && $(MAKE) distclean
Index: tags/2.0.1/doc/README
===================================================================
--- tags/2.0.1/doc/README	(nonexistent)
+++ tags/2.0.1/doc/README	(revision 18980)
@@ -0,0 +1,12 @@
+pcb-rnd documentation: work in progress.
+
+Most notable subdirectories:
+	conf/               documentation of the configuration system
+	developer/          documentation for developers
+	devlog/             random thoughts and articles
+	man/                UNIX manual pages
+	resources/          logos, screenshots, artwork
+	security/           notifications about security-critical bugs
+	tutorials/          my-first-board tutorials
+	user/               user reference manual
+
Index: tags/2.0.1/doc/TODO
===================================================================
--- tags/2.0.1/doc/TODO	(nonexistent)
+++ tags/2.0.1/doc/TODO	(revision 18980)
@@ -0,0 +1,291 @@
+0. For the upcoming release ===============================================================================
++ BUG: mincut memory over-allocation: bug_files/mincut.lht [report: James]
+	+ if a short consists of terminals only, do not even start the algo, just mark the terminals
+	+ after that if there are too many shorted networks left, revert to the dump algorithm
++ feature: an action for switching layer to current side; see also ML/1955 [report: James]
++ BUG: padstack clearance can not be set to zero in the padstackeditor: tab 1, set to 0, tab 2, change some other value, close dialog -> 0 is forgotten (probably it generally won't accept 0) ML/1954 [report: Casey]
++ BUG: crosshair vs. grid - one pixel off, see ML 1801 [report: pstuge]
++ BUG: gtk: keyboard handling in top window; ML 1811 [report: pstuge]
++ BUG: press {t t} (or any other invalid key seq) while the mouse cursor is not in the drawing area but over the top window: crosshair is drawn (it shouldn't appear until the mosue cursor enters the drawing area) [report: pstuge]
++ BUG: lesstif: when gtk is not compiled in, there are tons of warnigns see bug_files/lesstif_menu.txt [report: rqsall]
+	+> long term: need per plugin menus and/or implement local grid in lesstif
+	+> suppressed the error message for now, the menu gets disabled anyway
+- BUG:  gtk: 'tab' drifts cursor when used repeatedly, video repro: http://scififaster.net/wantitthatway_pcb-rnd.ogg [report: Miloh]
++ feature: fp_wget cache dir configurable [report: agaran]
++ BUG: Locked objects can be moved when selected. [Report: Ade]
+	+> solution: locked objects are not removed on buffer/move operations (but they are still copied)
++ BUG: property editor window too tall: add scroll ML/2047 [report: gpaubert]
++ BUG: unwanted file format change. Reprod: new board; place a rectangle; save as pcb/mainline; place a 1206 from the lib; {f s} -> saved as lihata v5 [report: Richard]
+
+2. For later releases ===============================================================================
+- FEATURE: Scale() buffer objects (with an option to affect coords only) [report: celem]
+- FEATURE: rendering transformations (to be used with cam, for Bdale's stencil use case)
+- CLEANUP: move import_sch to import_sch_old and start a new, generic plugin
+- FEATURE: relay events to multi-actions so that scripts can bind to events by defining actions
+- CLEANUP: Remove separate command entry window from gtk
+- FEATURE: padstack bbox:
+	- per layer: keep a bbox per transformed shape per prototype, then getting the bbox of a padstack ref on a specific layer is looking up the shape, then 4 integer additions [report: Wojciech]
+	- when calculating overall padstack bbox, ignore layers that are not present? but then a layer change would require a recalc (but this is true for subcs too!) [report: Wojciech]
+- XOR rendering upgrade:
+		- experiment with 'emboss' kind of drawing instead of xor so rendering can stay 'direct'
+		- if worked: allow padstack xor draw to draw all shapes on all layers
+- FEATURE: introduce new layer types:
+	- doc
+	- keepout
+	- decide where to store global layers
+- CLEANUP: rewrite the preview API:
+	- instead of various hardwired methods (board, virtual layer, pinout), core should support callbacks
+	- there should be a view context in core associated with this, that contains flips so the view can be decoupled from board flip config (library preview)
+	- ... but there also should be an option for going with board flip (drc view)
+- FEATURE: fungw: DAD dialog: mini parser from text
+- CLEANUP: remove mnemonic from the menu system
+	- check the central code and struct fields
+	- remove "m=" fields from the menu lihata files
+- CAM:
+	- CLEANUP: move the hackish gerber layer suffix functions into CAM configs
+	- CLEANUP: split gerber and drill file generation (make gerber depend on drill, for backward compatibility)
+	- FEATURE: export_gerber: add a true gerber drill output
+	- FEATURE: make the drill exporter sort drills by attributes, an user configured table telling which drill (by attribute) ends up in which file
+	- FEATURE: invent a generic API for both the drill attrib config table
+	- CLEANUP: remove the gerber->drill dep and ask users to use the CAM instead
+	- CLEANUP: unify how output files are accessed/checked: confirmation on overwrite
+- opengl:
+	- BUG: heavy swapd +/- crash with radeon AMD GL driver, fixed by exporting LIBGL_ALWAYS_SOFTWARE=t GALLIUM_DRIVER=llvmpipe [report: erich] 
+	- BUG: --gui gtk2_gl pcb-rnd library preview pane is black (  doWindows(library) ) [report: Miloh] 
+- FEATURE: draw on move: 'Crosshair shows DRC clearance' should show the clearance also when moving a ... (not only when placing it) [report: wojciechk8]
+	- need to precalculate and cache clearance shape in crosshair (polyarea!) because recalculating these for padstacks would be expensive (also rewrite lines and arcs)
+	- padstack
+	- clearing polygon
+	- text
+- BUG: undo operation while drawing a multiple segment line doesn't change segment attached to the crosshair [report:wojciechk8]
+	- tool_line.c depends on pcb_undo()'s return value; can be fixed only when the old undo system is removed
+- FEATURE: route style upgrade to prototypes:
+	- BUG: set same {e s s} doesn't work on padstacks [report: Igor2]
+- BUG: Rubberband move line endpoints ignores connected arc endpoints. [Fixing:Ade]
+- BUG: gtk2_gl: RTT/arc_sizes.lht - elliptical arc corner case render bug [report: Wed]
+- CLEANUP: DRC rewrite: extend the DRC window to be a generic location list (or rather rewrite with DAD!)
+	- buttons to select one or all items or all items including locked
+	- io infra for save incompatibility note with DRC list
+	- import sch. shouldn't select elements to be removed but put them on a drc list
+	- display number of items at top of drc window
+	- export to file 
+	- BUG: DRC hilight: for each drc error, have two groups of objects with different color highlight. SetThing assumes there will be only 1 object; this was broken in the original design [report: Igor2]
+- find.c rewrite:
+	- CLEANUP: a new "report(NetLength)" should not care about netlists but depend on find.c only
+	- CLEANUP: netlist rewrite
+		- when no netlist is loaded, new rats can't be drawn [report: agaran]
+- FEATURE: lesstif does not allow "save as" in non alien format [report: erich]
+- SUBC: element removal:
+	- BUG? check if drc outline is drawn on padstacks XorDraw*DRC in draw.c in the old code [report: igor2]
+	- FEATURE: "thermal recipe" so a padstack thermal can be put in a subc and it is change with the layer binding [report: jg]
+	- CLEANUP: convert pcblib to subcircuits:
+		- revise the value attribute - should be empty by default
+		- remove old install elements
+		- dir rename trunk/pcblib/tru-hole should handle make correctly and not walk on existing web services or user installs
+- CLEANUP: When a subc or padstack is renamed or removed (PCB_EVENT_RUBBER_REMOVE_SUBC & PCB_EVENT_RUBBER_RENAME), any connected rats are removed by the rubberband plugin. Remove this feature from the rubberband plugin and add an alternative method of updating rats. [report: Ade]
+- FEATURE: key rewrite: (base key swap bug (q<->a, y<->z))
+	- for <char> (punctuation): learn key for non-US users
+	- lesstif code upgrade for the new API
+	- menu file fixup on punctuation in lesstif
+- FEATURE: extedit: when editing subc with pcb, save configuration and load it in the external pcb-rnd so that grid sizes and other settings are preserved [report: jg]
+- CLEANUP: propedit revamp:
+	- move the property editor out from gtk, using the DAD, into propedit
+	- test under lesstif
+	- remove Attribute()
+- CLEANUP: retire the nelma plugin - nelma is unfinished and not maintained
+- FEATURE: subc/term: new terminal attribute: "pretend not connected to the same subc copper" (agaran's coil example)
+- FEATURE: HID: option for using a fixed background color for the preview widget renders; using the user configured one goes wrong when it's set to dark [report: Alain]
+- FEATURE: fontsel: ttf import?
+- FEATURE: library window: allow long tags and long location text to split
+- FEATURE: undo on new layer from right-click menu in gtk layersel doesn't work
+- FEATUER: gtk layersel: consider to provide a config setting for making open-group-name horizontal [report: istankovic]
+- layer rewrite:
+	- BUG: catch the layer change signal from polygons and reclip; Evan's test case:
+	  draw a line on a layer and a poly on another and change whether they are in
+	  the same layer group
+	- FEATURE: do not require top and bottom silk (also grep for TODO #tbs)
+- GTK Preferences->User PoV->Layers : Hit 'v' to "zoom fit" the preview [report: Alain]
+		- CLEANUP: allow GTK to handle keys in preview
+		- CLEANUP: use the zoompan engine for the zooming. Modifiy API if necessary
+- CLEANUP: resources:
+- conf:
+	- FEATURE: preferences dialog, config pov: change prio
+	- (BUG: gtk preferences: check what takes 131 megs of VIRT ram (on top); destroy the dialog structures when closed)
+	- (BUG: gtk preferences: poly isle area widget missing from the sizes tab)
+	- CLEANUP: fp_fs_search: kill anything that gets ':' separated string as path list, get a config list instead
+	- switch the lesstif HID over from attribs to conf
+- CLEANUP: Mark
+	- see pool node mark_cleanup
+	- mark bug - ortho shouldn't use it, it should use last point (crosshair.X2); make sure nothing else abuses it [James]
+- unravel the undo code
+	- FEATURE: grid size change should be undoable? [report:Evan]
+	- FEATURE: maybe other conf settings too?
+- CLEANUP: pcb_act_Attributes -> remove; this should be handled by the property editor when lesstif already supports it.
+- CLEANUP: layer group rewrite: remove PCB_MAX_LAYERGRP and PCB_MAX_LAYER and make them dynamic
+- FEATURE: io_pcb: new, optional "layer tag" field in mainline's file format
+- CLEANUP: fp_board: extend the API so that the element can be presented without saving to a file
+- FEATURE: layer binding dialog: manual layer binding (reuse csect?)
+- res/menu:
+	- FEATURE: load/swap menus (TODO#1)
+	- CLEANUP: search for vendor in the hid plugins, there should be no trace of it (vendor should register its in submenus with anchors)
+	- CLEANUP: re-add dynamic menus after a gui change:
+		- either remember dynamic menus in a separate list so they can be rebuilt
+		- or provide hooks and let plugins deal with it
+	- FEATURE: fungw: auto-remove menus by cookie (TODO#2)
+	- FEATURE: load new res on the fly (replace the menu system):
+		- low level reload code (re-add the dynamic menus too!)
+		- action to reload if file name is known
+		- gui load dialog with tags listed
+- CLENAUP: decide about exporter policy:
+	- png exports selection (even in not-as-shown), others don't
+	- extend png hid attribs with a flag for this, maybe do the same for others
+	- document the decision in "hacking"
+- CLEANUP: reduce
+		- export_bom: rewrite the string list code using htsp and/or lists
+		- hash in hid_attrib.c?
+		- nelma and gcode both invent .png name locally
+		- get rid of gcode/lists.h,  and vector.[ch] (autorouter)
+		- vendordrill
+			- search for /units, replace it with pcb-printf something
+			- add round down
+			- replace ignore_refdes, ignore_value and ignore_descr with genvector
+- FEATURE: project specific menus from extra lihata files - maybe from project.lht
+- vendor drill plugin:
+	- CLEANUP: check if we want to keep vendor name
+	- FEATURE: vendor: be able to load multiple vendor files (project spec for skips, central for vendor) [report: celem]
+- BUG: Lihata persistent save:
+	- flag compatibility: save unknown, string-flags as loaded by io_pcb
+	- ind: FONTS: second font indents incorrectly
+	- ind: indentation bug in inline struct therm: closing } is preceded by indentation whitespace for some reason
+	- keep numeric format: test all
+	- keep unknown subtrees
+	- doc/user/02_model/src/obj_arc.lht: Open/Save : Font section is embedded. Once manually removed, the file shows many diffs w.r.t original. Lihata V1 file. [report: Alain]
+	- BUG: lhtpers indentation: bug_files/lhtpers_ins/; breakpoint in pers_table.c:34 and debug why the newline is getting in [report: Igor2]
+- query & advanced search
+	- FEATURE: search expr wizard should pick up the expression from the button when clicked
+	- CLEANUP: make a run on a large board, speed test, with -O0 and -O3:
+		- iteration speed (a simple @)
+		- eval speed (a simple @ with a lot of constants in an expr)
+		- geo speed
+		- regex and string cmp match speed vs. select by name
+- feature plugins:
+	- FEATURE: autocrop doesnt undo (new layout, add some -maskmanaul content, autocrop(), & undo: gui view shifts, board size unchanged [report: Miloh]
+	- BUG: distalign pcb_crosshair option doesn't work as a reference point  [report:Miloh]
+	- BUG: can't undo after boardflip(), (ERROR: Attempt to pcb_undo() with Serial == 0) [report:Miloh]
+- FEATURE: padstack edit swap shapes - low level for a "solder mask defined pad" [report: ehennes]
+- BUG: rewrite layer undo; take it out from old_undo; layer del breaks on undo: can't save where it was added before. Consider the whole layer move and -1 business obsolete and rather add a separate insert and remove call?
+	- BUG: add new layer in main window, pcb-rnd issues pcb_warning yet action is placed on undo stack [report: Miloh]
+- BUG: gtk: preferences/user POV/sizes is not in sync with preferences/config POV/ [report: Alain]
+	- rewrite using DAD
+	- in sizes, add an apply button so the new settings can be applied from the non-modal preferences without closing
+	- react on conf change events, refresh the fields
+- FEATURE: lihata v6:
+	- new doc layer types
+	- remove pcb_board_t Zoom/x/y
+	- remove via geometry from route style
+	- remove real layer visible flag (UI is always reset)
+	- add text object line width factor
+- CLEANUP: parent subc update:
+	- inhibit mechanism to speed things up:
+		- under inhibit, pcb_subc_part_changed(ps) should mark subcircuits dirty
+		- when inhibit drops to zero, revisit all subcircuits that are dirty
+		- get a common inhibit function for batch processing that turn on draw, poly clip and pcb_subc_part_changed inhibit
+- export_dsn:
+	- missing global padstack (via) export:
+		- FEATURE: need to think over and check the spec for how to do this with no-hole padstacks
+		- RTT tests: thermal_layer.dsn, comp1.dsn, padstack.dsn
+	- BUG: elem_pads_ds: do not export line shape in padstacks as polygons, that kills round cap lines
+- feautres/cleanup: hid:
+		- FEATURE: holes should be drawn below silk and mask (maybe this could be a config setting)
+- BUG: I/O bugs:
+	- kicad:
+		- BUG:  segfault when loading kicad_pcb in work/alien_formats/A20*.kicad_pcb gdb at http://scififaster.net/kicad_pcb_gdb.txt - see bug_files/A20-minimal.kicad_pcb [report: miloh flag: erichvk_]
+	- eagle:
+		- BUG: eagle binary library load fails with assert when pad dimension == 0, drill != zero. Bug arises from uninitiliased st.ms_width minimum feature width DRC value. This does not manifest in XML load as it initiliased to default value of 10mil before the DRC block is read, and updated if specified in the DRC block. There is no DRC block in an eagle binary library, so a decision has to be made wrt to where a default minimum feature size is to be referred to, so that the pad/hole reading code can apply it when pad dimension is not specified at line 824 in read.c. If dimension is not present, but drill is, read.c correctly applies the DRC derived rv_pad_top at line 818 dia = eagle_get_attrc(st, subtree, "diameter", drill * (1.0+st->rv_pad_top*2.0)); Planned changes to rectangle parsing to geenrate copper rectangles, not four lines, will alter +/- eliminate the need for the rectangle read routine to have ms_width available pre DRC read. See bug_files/e-motoren.lbr. [report: Erich]
+		- BUG: text rotations not quite right in eagle binary format layouts. See bug_files/tvbgone3-brd-in-eagle.png. Seems 180 and 270ccw rotation are rendered as upright an 90ccw rotation. Hmm. [erich]
+		- BUG: valgrind shows memory leaks relating to binary load. See bug_files/e-motoren.lbr [report: erich]
+		- BUG: on loading bug_files/diode.lbr, pcb-rnd's clipping polygon out of existence routine seems to go into a non terminating loop [report: erich]
+		- layers for top and bottom soldermask, if not present in loaded eagle file, i.e. tvbgone3.brd, do not export on creating gerbers, and cannot be added easily to layout via layer prefs, since ability to add a soldermask group is lacking [erich].
+		- eagle XML import fails on polygon import reported by miloh, test file alien_formats/eagle/OSHW_XML_examples/eagle_polygon_crash.brd [report: erich], due to input file containing an invalid polygon: a self intersecting poly in line 156 - consider handling "width"?
+		- eagle rectangle parsing should generate a rectangular feature, not a four line rectangular outline [erich]
+		- eagle XML wire elements need to have "curve" attribute processed, if present. i.e. arcs. Can see translate2geda for hints [report: erich]
+		- eagle binary format appended text block needs to be parsed and the text strings allocated to ASCII-127 references in preceding text blocks [erich] 
+		- eagle binary format v3 and libraries do not have a DRC block specifying restring or minimum feature widths. Binary loader should add a DRC block in these cases to the tree with the minimum settings needed for padstacks and features to load sensibly. [erich].
+		- bin: padstack clearances for element pins will rely on connectivity to other polygons layer by layer defined in the netlist 
+		- bin: need to refine naming of library (.lbr) elements in loaded .lbr files; any text names in the binary tree, if starting with ASCII 127, sequentially reference strings in the text block which comes immediately after the board/design tree. In later eagle binary versions, the text block seems to become a node of the tree, but a node of arbitrary length, not 24 bytes, with length of block still encoded in first few bytes. 
+		- bin: need to add support for non top silk (tPlace), tDocu and top copper text in read.c
+		- bin: layouts, once loaded, have issue where deselection of elements only deselects element pins/pads. click-drag of element or saving the layout to .lht and reloading fixes the deselection issue. Example FTSH.... library file for a header exhibits this behaviour.
+
+3. Long term ===============================================================================
+- BUG: draw a large padstack poly (as a subc term); put some vias (padtsacks) on top of it; with gdk and gl, after the 6th via some via rings will disappear [report: James]
+	-> reason: order of padstack shape rendering is random
+	-> we should probably render large objects first then smaller ones
+
+Lesstif:
+	- the notebook widget is not portable; detect it from scconfig and provide some hackish alternative if not found [report: rqsall]
+
+GTK2:
+	- next_gui: keep them open, hide
+
+FEATURES
+- BUILD: menuconfig and a config file for scconfig
+- menu item for export of multiple selected layout elements to discrete .fp files
+
+4. Low prio ===============================================================================
+- BUG: 1. place 0603; 2. select; 3. cut to buffer; 4. undo -> 0603 put back but selection is lost; reason: the flag is removed in the buffer, but not in an undoable way as we don't have undo on buffer [report: igor2, miloh]
+- BUG?: Far-side silk text can be selected and moved when the mouse is over front-side subcircuit. (but this is what we had with elements too! -> rewrite search.c to be a 'script' config) bug_files/farsilk.lht [report: Ade]
+- BUG: RTT/arc_sizes.lht - unable to move arcs which have different width and height [report: Ade] - rewrite pcb_is_point_on_arc() elliptical case at the bottom
+- BUG: main.c: SIGPIPE - detect it (needed for popen)
+- FEATURE: padstack label smarter print: in case of full overlap of a bottom and top "pad", arrange other-side labels to avoid overlaps [report: al3x]
+- FEATURE: advanced grid settings: make it possible to edit the lists in preferences
+- improve locking:
+	- FEATURE: consider a move-only lock?
+	- BUG: when thermal and some other operations are applied on a locked element, indicate it
+- BUG: Erich's gtk lag report: press 's' a lot then move the mouse - 's' ends up in the new loc!
+- BUG: the TAB bug: (over ssh -X) press tab for a good 15 seconds; release; it won't work again for a fraction of a second
+- BUG: rubberband_orig: draw a 90 deg arc, a 45 deg line that ends in the endpoints of the arc; enable rubber band, move the arc: only one endpoint of the line is moved [fixing:Ade]
+- BUG: draw overlapping lines, a short fully under a long; click on the short, it gets selected but it's not visible because the long hides it [report:Evan]
+- FEATURE: "save as" dialog: there should be an "auto" or "guess by extension" option in the save dialog format
+- CLEANUP: insert drag&drop strangeness (mainline too):
+	insert should just insert a new point and stop there, not starting a drag&drop
+	move; the new point should be marked somehow (e.g. green-find one half of the
+	object, like arc split does) lines can be inserted mostly only in all-dir-line
+	which is strange
+- FEATURE: missing rotate polygon (mainline too)
+- BUG: zoom in too deep onto board edge and the implicit outline rectangle behaves strangely [report:Evan]
+- FEATURE: scconfig: check if it picks up settings from env vars (for a gentoo build)
+- CLEANUP: replace mkdtemp() with something safer
+- FEATURE: display net names on pins, vias (and maybe tracks?) when zoomed in enough
+- FEATURE: DRC should warn for thin poly hair
+- FEATURE: new examples
+	- blinking led with parametric footprints
+	- example of nonetlist: 1206 jumpers and logos
+- CLEANUP: In-line help needs update/re-structuration <lib_gtk_common/dlg_command.c>
+- CLEANUP: rethink/rewrite the action/change infrastructure - too many void *ptr1
+  pointers, too many code duplication
+- BUG: double sided board, poly on both layers; grab existing lines on one layer and
+  move then around. If all layers are visible, redraw of the far side layer
+  is slow and causes flickering elements from that layer until the front is
+  redrawn. Maybe we should have less flushes?
+- CLEANUP: win32 port {large}
+	- clean up central Makefile.in rules:
+		- remove cat, sed, grep where possible, use scconfig instead
+- BUG: arc bug: draw an arc with one end out of the drawing area; it will be jumpy and can not be placed properly
+	-> AttachForCopy() calls SetCrosshairRange() that then sets crosshair max* which
+	limits the arc to move freely. Problem: this is not arc-specific, this happens with any buffer copy! going for no-design-limit is probably better
+- FEATURE: while drawing a line, the temporary outline should reflect the layer color
+- FEATURE: push&shove
+	- keep 45-deg knee when grabbing a point for drag&drop in non-all-dir
+- CLEANUP: unify gui invocation options: pcb-rnd --help gtk_[gdk|gl] and pcb-rnd --help lesstif both show and use different input methods [report:miloh]
+- FEATURE: consider a simple all in one function to create a default layer stackup for static/predictable layer formats being imported, to simplify importer coding
+- FEATURE: trace length calculator:
+	- click a line or arc or via
+	- start a search in two directions mapping lines, arcs and vias connected (green-highlight them, marking them found)
+	- stop at the first junction (anywhere where more than 2 objects are connected)
+	- stop at polygons
+	- display the number of vias and net trace length along the found objects
+- BUG: miter bug;  miter crosses SMT pads under certain conditions [report: celem/miloh] 
+- BUG: redrawbug1: grap c1, the diagonal trace gets drawn over U1's silk [report:Evan]
+	-> it's redrawn because of the overlapping bounding box with C1, while U1 has no overlap; it would be too expensive to calculate what else to redraw
+- CLEANUP: core lib splitup:
+	- gsch2pcb: generalize plugin/buildin loading for external tools, check if gsch2pcb can work from plugins
Index: tags/2.0.1/doc/TODO.cleanup
===================================================================
--- tags/2.0.1/doc/TODO.cleanup	(nonexistent)
+++ tags/2.0.1/doc/TODO.cleanup	(revision 18980)
@@ -0,0 +1,3 @@
+- rename:
+	- conf_*
+- move the GetXY action to central
Index: tags/2.0.1/doc/TODO.gtk3
===================================================================
--- tags/2.0.1/doc/TODO.gtk3	(nonexistent)
+++ tags/2.0.1/doc/TODO.gtk3	(revision 18980)
@@ -0,0 +1,16 @@
+GUI:
+	+ overlapping objects (e.g. 2 fat lines crossing on silk) are darker on the overlap; we need uniform color
+	+ mouse scroll wheel doesn't work in cross section
+	- zoom hangs: press {z z} on the drawing area -> hang
+	+ xor draw fails after {w l} library footprint placement; in fail mode there's no xor outline of buffer; drawing a line fixes it
+	- layer selector vertical layer group name truncation
+	- main window resize scroll bar warnings
+	- component draw "flicker", depending on pan: http://igor2.repo.hu/tmp/gtk3_bug1a.jpg http://igor2.repo.hu/tmp/gtk3_bug1a.jpg
+	- missing grid points: http://igor2.repo.hu/tmp/gtk3_bug2.png
+
+low prio/optional:
+	- elliptic arc rendering
+
+scconfig:
+	- ./configure --buildin-hid_gtk3_cairo ends up depending on hid_gl; have to use --disable-lib_hid_gl
+	- detect gtk3 calls the code depends on
Index: tags/2.0.1/doc/TODO.hid
===================================================================
--- tags/2.0.1/doc/TODO.hid	(nonexistent)
+++ tags/2.0.1/doc/TODO.hid	(revision 18980)
@@ -0,0 +1,19 @@
+HID API simplification, first stage
+
+- blockers:
+	- implementing a list/tree/table "widget" for lesstif
+	- implementing and testing the PCB_HATT_TREE in gtk
+	- implementing and testing the PCB_HATT_TREE in lesstif
+	- implement and test a new text/log entry HATT (API not yet specified) in lesstif
+	- implement and test a new text/log entry HATT (API not yet specified) in gtk
+
+- DAD conversion:
+	- rewriting the about box as DAD, in dialogs/
+	- rewriting the route style dialog as DAD
+	- rewriting the external command entry window as DAD
+	- write a DAD based confirm window for fallback
+	- rewrite the user input window as DAD
+	- rewrite the log dialog (depends on the text/log HATT)
+	(- rewrite the pinout dialog as DAD (depends on a preview HATT, which is a bigger chunk))
+	- rewrite the report dialog as DAD
+
Index: tags/2.0.1/doc/TODO.user
===================================================================
--- tags/2.0.1/doc/TODO.user	(nonexistent)
+++ tags/2.0.1/doc/TODO.user	(revision 18980)
@@ -0,0 +1,9 @@
+- TEST:
+	- smartdisperse 
+		- compare to 1.2.4; term changes
+		- test subcircuits
+	- autoplace (compare to 1.2.4; term changes)
+	- autoroute (compare to 1.2.4; term changes)
+	- pcb_pstk_shape_hole_break(): min ring DRC rules on padstack, especially with asymmetric (non-centered) shapes
+	- test advanced search with padstacks
+	- query on subc
Index: tags/2.0.1/doc/UNIX.txt
===================================================================
--- tags/2.0.1/doc/UNIX.txt	(nonexistent)
+++ tags/2.0.1/doc/UNIX.txt	(revision 18980)
@@ -0,0 +1,31 @@
+State on UNIX systems
+~~~~~~~~~~~~~~~~~~~~~
+
+Source releases starting from 1.1.2 should compile and run out-of-the-box
+on old UNIX systems, such as IRIX. Does NOT require any GNU installed.
+
+Requirements:
+  - x11 and motif (for the GUI)
+  - an awk implementation that supports gsub(), e.g. nawk
+
+1. If your C compiler does not support #warning, run a script to patch
+   the source:
+
+     # cwd is the root of the distribution
+     util/workarounds/unwarn_all.sh
+
+   This will take a while and will modify a lot of .c files.
+
+2. ./configure
+
+3. make
+
+Considerations listed in ../INSTALL apply.
+
+The above procedure has been tested on IRIX 5.3 on IP22.
+
+Expected compilation times [minute:second]:
+
+./configure       compile, -O0     compile -O3   system
+-------------------------------------------------------------------------------
+1:55              7:40             14:27         IRIX 5.3, IP22 @ 100 MHz
Index: tags/2.0.1/doc/conf/Makefile
===================================================================
--- tags/2.0.1/doc/conf/Makefile	(nonexistent)
+++ tags/2.0.1/doc/conf/Makefile	(revision 18980)
@@ -0,0 +1,27 @@
+ROOT=../..
+CFDIR=$(DOCDIR)/conf
+
+
+all:
+
+install_all:
+	$(SCCBOX) mkdir -p $(CFDIR)/tree
+	$(SCCBOX) $(HOW) *.html *.png $(CFDIR)/
+	$(SCCBOX) $(HOW) tree/*.html $(CFDIR)/tree/
+
+
+install:
+	$(MAKE) install_all HOW="install -f -d"
+
+linstall:
+	$(MAKE) install_all HOW="install -f -l -d"
+
+uninstall:
+	$(MAKE) install_all HOW="install -u"
+
+clean:
+
+distclean:
+
+
+include $(ROOT)/Makefile.conf
Index: tags/2.0.1/doc/conf/groups.html
===================================================================
--- tags/2.0.1/doc/conf/groups.html	(nonexistent)
+++ tags/2.0.1/doc/conf/groups.html	(revision 18980)
@@ -0,0 +1,122 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config groups </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> grouping - flat vs. tree </H2>
+The original settings and HID attribute system in pcb were both flat:
+basically a list of type:key=val triplets. All settings in a few big bags;
+which bag sometimes doesn't depend on some logical categorizing, but
+historical reasons (e.g. which part of the code needs the given setting).
+<p>
+This works well for a small amount of settings but lack of categories or
+hierarchy (or sets or groups) makes it harder to understand what setting does
+what and orients users to just accept defaults. After a while it also
+makes programmers think twice before adding a new setting, increasing the
+crowd in a bag. This in turn results in a less configurable
+system.
+<p>
+Introducing a hierarchy of settings can solve these problems by grouping
+and categorizing settings. If the user is interested in how footprints are
+searched, they can ignore the settings the editor/ subtree has. It is also
+easier to save and reload selectively: when the hierarchy is done right,
+closely related settings end up in the same category (thus the same subtree).
+Thus saving or loading a subtree can fully save or restore a property of the
+program, even if that property is affected by multiple settings.
+
+<h2 id="tree"> pcb-rnd config tree </h2>
+The config tree, the full tree is, something that exists in memory. Actual
+config files often contain only a subset of the tree. Multiple config files
+(e.g. system level, user level, settings from the board file) are loaded and
+merged to form the final config tree. The hierarchy of the tree is represented
+by setting groups, which are like directories on a file system. Actual settings
+are always leaves of the tree, placed in a specific group at any level (just
+like in file systems). A full <i>path</i> to a setting is written like a
+path on a file system: group1/group2/item, where group1 and group2 are
+names of setting groups and item is the name of the setting. Note: unlike
+with real file systems, the leading slash (representing the root) is omitted.
+<p>
+Details/constraints: <small>
+A valid path unambiguously identifies a setting (or a setting group). Settings
+and groups always have exactly one parent (except for the root group that
+has no parent). There is only one root of the config tree. </small>
+<p>
+The main groups in the logical tree are:
+
+<dl><dd>
+<table border=0 cellspacing=0 cellpadding=0>
+<tr><td colspan=2> (root)              <td width="30%"> &nbsp; <td> (config root)
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- rc               <td> <a href="tree/rc.html"> run control (program startup) </a>
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- path        <td> <a href="tree/rc_path.html">paths automatically set up by the program at startup - do not specify these </a>
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- design           <td>  <a href="tree/design.html">some default settings of a new design; minimum/maximum value of some design settings </a>
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- editor           <td> <a href="tree/editor.html"> how the pcb editor <i>behaves</i> - independent of HIDs or the GUI </a>
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- increments_mm  <td> interactive increment/decrement steps when active unit is mm
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- increments_mil <td> interactive increment/decrement steps when active unit is mil
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- view           <td> <a href="tree/editor_view.html">default view parameters</a>
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- appearance       <td> <a href="tree/appearance.html">how the GUI <i>looks like</i> - common to all GUI HIDs </a>
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- color    <td> <a href="tree/appearance_color.html">layer colors, GUI colors, misc design colors </a>
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- pinout   <td> <a href="tree/pinout.html">pin label properties </a>
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- messages <td> <a href="tree/messages.html">message window properties </a>
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- misc     <td> <a href="tree/misc.html">non-GUI settings handled by the GUI HIDs </a>
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- plugins          <td> dynamic subtree for various plugin settings
+<tr><td> | &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td> | &nbsp;<td colspan=2> +- <i>foo</i> <td> all settings of the imaginary <i>foo</i> plugin are registered in this group
+<tr><td> | &nbsp;<td colspan=2> &nbsp; <td> &nbsp;
+<tr><td colspan=3> +- utils            <td> dynamic subtree for various plugin settings
+<tr><td>   &nbsp;<td colspan=2> |      <td> &nbsp;
+<tr><td>   &nbsp;<td colspan=2> +- <i>bar</i> <td> all settings of the imaginary <i>bar</i> utility are registered in this group
+</table>
+</dl>
+
+<h2> dynamic subtrees </h2>
+
+The plugins/ and utils/ subtree are <i>dynamic</i>, which means their contents
+are not defined by core pcb.
+<p>
+In plugins/ each plugin should create a group for its own settings. What
+this subtree should contain depends on what plugins are actually loaded.
+The benefit of this approach is that plugins can use the central config
+infrastructure instead of inventing their own config files. This makes
+user's life easier on many levels: single config syntax to learn; uniform
+GUI (gtk HID's preferences window) to change all settings; uniform way to
+save/restore parts of the settings.
+<p>
+The utils/ subtree is very similar in all aspects except that it is for
+external utility programs. Utils that are closely related to pcb-rnd, such
+as gsch2pcb-rnd, should work from the same configuration.
+If they already load the
+pcb-rnd config files it's easier to keep their settings in the same tree,
+in the same format.
+<p>
+Pcb-rnd doesn't generate warning for unrecognized settings in dynamic subtrees.
+This lets the user configure plugins that are not always loaded and let util
+settings sit in their subtree.
+
+<h2> what happens to all these settings </h2>
+
+After loading all config files they are merged: if the same setting is
+described in multiple files, the higher priority wins or if the setting is
+a list (e.g. library search paths) the items are merged in a final list.
+At this point the full logical config tree is built. Next the textual values
+from the logical tree are converted into binary (native C values like
+"long int" or "double") and are saved in C variables for the code to
+access them directly. 
+</body>
+</html>
Index: tags/2.0.1/doc/conf/index.html
===================================================================
--- tags/2.0.1/doc/conf/index.html	(nonexistent)
+++ tags/2.0.1/doc/conf/index.html	(revision 18980)
@@ -0,0 +1,83 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config system </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Why, what was wrong with the old one? </H2>
+The old config system had several limitations that would have been
+hard to fix keeping the original design:
+<ul>
+	<li> config settings were specified in a flat list - no <a href="groups.html"> grouping </a>
+	<li> the core had a rather static system - HIDs or plugins couldn't extend it, thus they had <a href="noextend.html"> to invent their own </a> config files
+	<li> ... this led to a variety of configuration formats; using one format not always because it was better suited for the task, but for historical reasons
+	<li> ... this also led to a collection of config files - again not always split by boundaries of settings, but often by arbitrary boundaries of code
+	<li> the old system didn't support lists or arrays well
+	<li> it didn't have a coherent concept of how settings from different <a href="sources.html"> sources </a> would override each other
+	<li> ... this resulted in the rigid structure that most of the settings could come from only one place (e.g. if it's an user setting, the design won't be able to override it)
+</ul>
+
+<H2> What the new system offers </H2>
+<ul>
+	<li> unified format: <a href="http://repo.hu/projects/lihata"> lihata </a> ...
+	<li> ... more future proof: generic markup language - easier to extend without having to worry about breaking the syntax
+	<li> ... the configuration is represented in a tree, grouped by the nature of settings
+	<li> ... there are <a href="lists.html">arrays and lists</a>
+	<li> ... a config file can overwrite a list or <a href="lists.html">prepend/append</a> to it (e.g. design-level config prepending an extra library path keeping system set paths as well)
+	<li> there are different <a href="sources.html"> sources </a> of configuration, e.g. system-wise, user-wise, project-wise, etc.
+	<li> the user has the power to change default config <a href="prio.html">priority per setting</a>; e.g. normally design config overrides user config, but it's possible to mark a setting from user config so strong that it overrides even the setting read from the board file
+	<li> the way settings are stored is flexible and extensible so that a plugin can define their subtree of settings
+	<li> ... since the API even makes it easier to access such settings (vs. parsing your own config file), plugins will tend to use the unified config format/system instead of inventing their own
+	<li> ... the GUI (gtk's preferences dialog) thus can automatically handle the new settings
+	<li> ... plugins don't have to implement actions to set/toggle/query their settings for the menu system, there are generic config set/toggle/query actions the menu config can use
+	<li> ... plugins also get the multi-source, <a href="prio.html">priority-based config mechanism</a>
+	<li> ... which also means plugin settings can be automatically saved as user setting, project setting or even design setting
+	<li> all these are true for all kind of settings, be them GUI preferences, paths, layer colors, grid settings; there should be no exception
+</ul>
+
+<H2> How to get started </H2>
+<ul>
+	<li> If you are an user, read the <a href="index_user.html">user documentation</a>
+	<li> If you are an programmer, read the <a href="index_user.html">user documentation</a> and the <a href="index_prog.html">programmer documentation</a>
+	<li> If you are a plugin programmer, there's a <a href="plugin_chk.html"> plugin programmer's conf checklist </a> that summarizes what to do
+	<li> In any case, these links may help: <a href="syntax.html">syntax</a>, <a href="sources.html">config files</a>, <a href="prio.html">priority handling</a>
+</ul>
+
+
+<H2> But isn't this more complicated for the user? </H2>
+Hopefully not much. There are a few extra features, like
+multiple <a href="sources.html"> sources </a> with levels that did not
+exist in pcb and <a href="lists.html">lists with prepend/append</a>. Some of these
+features present in other software so users should be comfortable with the ideas.
+The learning curve is probably compensated by the more orthogonal system.
+The syntax is also geared for simplicity and easy use with text editors.
+Finally, the new preferences dialog in the GTK HID and config actions help
+the user to explore how settings got used from all the config sources. There's
+an intended layering in complexity: simple things can be done easily without
+having to understand the whole system.
+<p>
+All in all, the extra features the user needs to learn is comparable with
+the old customs that he/she can forget.
+
+<H2> And did it make the code more complicated? </H2>
+The size of the code did not change much after the initial config rewrite.
+The new system has new features, some of which brought in a few hundred lines of
+code, but a similar amount of old code could be removed. What came in is
+infrastructure, what had to go was a bunch of repetitive config parsing,
+boolean-setting-accessor-action code. This means on the long run, the more
+settings are added, the more the new system pays back.
+<p>
+Read access, which is far the most common way to use the config in the
+code (e.g. if (setting == true) { }) is very similar to the old Settings
+system. Write access needs to go through a function call API, but this
+is usually a single call per setting (instead of directly modifying a
+variable).
+<p>
+For plugin programmers, the new system makes life much easier as they can
+plug their settings in.
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/index_prog.html
===================================================================
--- tags/2.0.1/doc/conf/index_prog.html	(nonexistent)
+++ tags/2.0.1/doc/conf/index_prog.html	(revision 18980)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config programmer's index </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Programmer's documentation </H2>
+
+TODO
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/index_user.html
===================================================================
--- tags/2.0.1/doc/conf/index_user.html	(nonexistent)
+++ tags/2.0.1/doc/conf/index_user.html	(revision 18980)
@@ -0,0 +1,99 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config for users </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The pcb-rnd config system</H1>
+<H2> User documentation </H2>
+As of 1.1.0, pcb-rnd switched to a <a href="syntax.html">lihata</a> based configuration system.
+The purpose of this document is to describes the basic system design going into
+enough details to provide the user with full control over the configuration.
+The other side, how the system is implemented is described in the
+<a href="index_prog.html"> programmer's manual </a> and there is also a
+<a href="plugin_chk.html">checklist</a> to assist plugin programmers.
+
+<h2> Architecture: data flows, merging, dispatching </h2>
+The final configuration is a collection of values for
+<a href="groups.html"> all known settings, arranged in a tree</a>. The <i>config
+tree</i> is a theoretical concept; different representations of the tree are
+actually built runtime, in-memory. Pcb-rnd code, plugins and utilities
+are constantly reading these in-memory representations to decide how to
+carry out their tasks.
+<p>
+Config settings are imported from multiple sources: from different files,
+from environment variables, from command line arguments, from the opened (.pcb
+or .lht) files on load. Any source can define any part of the <i>config tree</i>.
+When the configuration is processed, each source is read into a temporary
+tree and then all the temporary trees are merged into the final
+<i>config tree</i>. The following diagram demonstrates all configuration
+related data flows.
+<p>
+<img src="merging.png" alt="[diagram]">
+</p>
+The leftmost column of nodes are the sources. (Note: paths mentioned there are
+the default paths, for reference, it is possible to change them compile-time.)
+Along the black arrows, from left to right, each source is imported into a
+tree representing a <i>role</i>: the role or 
+<a href="sources.html">purpose of the source</a>. The next
+step is following the red arrows in two steps:
+<ul>
+	<li> first merge all the role trees into a flat list; this determines the value of each setting;
+	<li> then dispatch the values to the right component of the code.
+</ul>
+Some components may change some of the settings run-time. The trivial example
+is the GUI (hid_gtk on this diagram) that provides menus and dialog boxes for
+the user to change settings. Such a change is always fed back (blue arrow)
+to the design role tree directly, from where the new value is again merged
+and dispatched along the red arrows. Changes in the design role are saved
+with the board file (thus the bidirectional black arrow between the source and
+the in-memory tree for the design role). Occasionally the user wants to
+save parts of the setting as a <a href="sources.html"> project setting or
+as an user setting</a> - in this case, along the dashed blue lines, the
+corresponding project or user roles are modified. This again results in updating
+the hash and the binary representation; these roles also have
+bidirectional black arrows and their changes are also saved in the original
+source.
+
+<h2> Merge details </h2>
+In the new system it is up to the user to decide what settings are
+system-level and what settings are user- or project-level. This is possible
+because any source can define any setting. In the merging step (red arrows
+between roles and the hash) it may turn out that there are overlaps (multiple
+sources defining value for the same setting) or blind spots (no source
+sets a given item).
+
+<h3> overlaps </h3>
+Each setting in each source has a <a href="prio.html">priority.</a> The
+priority can be defined in the source, or if it is not defined, each source
+inherits a fallback default priority. The fallback is designed to provide
+the intuitive order: cli &gt; design &gt; project &gt; user &gt; system.
+<p>
+When multiple sources are describing a value for the same setting,
+priority decides the final value. Most settings are scalar:
+a single integer, string or a single "yes/no" or "on/off" value (e.g.
+the background color or whether polygons are thin-drawn). For scalars
+the rule is simple: the higher priority value wins and all lower priority
+values are discarded when putting the values into the hash. More
+details: <a href="scalars.html"> how different roles and priorities
+can be used with scalars.</a>
+
+<p>
+There are some settings that are represented as an array or list of
+values. They are described in a lihata list item ("li:") in the config
+files and are generally called lists in this document. How lists
+are merged is controlled by the merging <i>policy</i>, which can be
+in each source, just like the priority is set. Check out the
+<a href="lists.html">list merging section</a> for more details.
+
+<h3> blind spots </h3>
+At the end the code does need a value for each setting, so in the final
+render (after the hash) every setting must have a value. To avoid blind spots,
+values not initialized, there is a built-in configuration file, compiled into
+the executable. This file is loaded into role <i>CFR_INTERNAL</i>, and has
+the lowest priority. This configuration file contains the default value for
+all settings.
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/lists.html
===================================================================
--- tags/2.0.1/doc/conf/lists.html	(nonexistent)
+++ tags/2.0.1/doc/conf/lists.html	(revision 18980)
@@ -0,0 +1,133 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config lists </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Lists and arrays </H2>
+
+Non-scalar settings are arrays or lists. Arrays can be explicitly indexed
+
+The default <i>policy</i> is always <i>overwrite</i>.
+<p>
+There are three active policies: <i>overwrite</i>, <i>prepend</i> and <i>append</i>.
+When dealing with lists:
+<ul>
+	<li> step 1: the output list is reset to empty
+	<li> step 2: all sources that describe the list are sorted by priority 
+	<li> step 3: sources are applied in order
+</ul>
+Step 3 is straight-forward: if policy is <i>overwrite</i>, reset the output
+list and copy the source's list into the output list. If policy is
+<i>prepend</i> (or <i>append</i>), keep the current output list and prepend
+(or append) the list provided  by the source. 
+<p>
+In practice this means the user can replace, prepend or append ordered lists
+from various sources. A common example is setting the library search paths.
+
+<h2> examples </h2>
+
+<h3> simple overwrite </h3>
+Config sources (ordered by priority):
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A,B,C
+	<tr><td> user    <td> 400      <td> overwrite <th> (not defined)
+	<tr><td> project <td> 600      <td> overwrite <th> D,E
+</table>
+<p>Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A,B,C   <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> A,B,C   <td> "not defined" doesn't mean "empty", so the list is not deleted - no change
+	<tr><td> 3.   <td> apply <i>project</i><td> D,E     <td> replace the original output because of the overwrite policy
+</table>
+<p>Example scenario: the project is restricted to local footprint libs; this setup
+makes sure no system or user configuration injects external footprint paths.
+
+<h3> empty overwrite </h3>
+Config sources (ordered by priority):
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A,B,C
+	<tr><td> user    <td> 400      <td> overwrite <th> (not defined)
+	<tr><td> project <td> 600      <td> overwrite <th> defined to be an empty list
+</table>
+<p>Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A,B,C   <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> A,B,C   <td> "not defined" doesn't mean "empty", so the list is not deleted - no change
+	<tr><td> 3.   <td> apply <i>project</i><td> (empty) <td> replace the original output because of the overwrite policy
+</table>
+
+<h3> prepend </h3>
+Config sources (ordered by priority):
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A,B,C
+	<tr><td> user    <td> 400      <td> prepend   <th> (not defined)
+	<tr><td> project <td> 600      <td> prepend   <th> D,E
+</table>
+<p>Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A,B,C   <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> A,B,C   <td> "not defined" doesn't mean "empty", so the list is not deleted - no change
+	<tr><td> 3.   <td> apply <i>project</i><td> D,E,A,B,C <td> &nbsp;
+</table>
+<p>Example scenario: the project has its own footprint libs with two paths; these
+should be searched before system and user paths, still, system path is also
+kept so stock footprints can be found.
+<p>
+This is better than hardwiring A,B,C in the project's list: A, B and C may
+depend on the installation on a given system. A project file has no idea
+about how the system is installed but it is assumed system installation
+and the system configuration file are consistent.
+
+<h3> append </h3>
+Config sources (ordered by priority):
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A,B,C
+	<tr><td> user    <td> 400      <td> append   <th> (not defined)
+	<tr><td> project <td> 600      <td> append   <th> D,E
+</table>
+<p>Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A,B,C   <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> A,B,C   <td> "not defined" doesn't mean "empty", so the list is not deleted - no change
+	<tr><td> 3.   <td> apply <i>project</i><td> A,B,C,D,E <td> &nbsp;
+</table>
+<p>Example scenario: the project has its own footprint libs with two paths; these
+should be searched after system and user paths. This means the local footprint
+lib has lower priority than the stock footprints. See system-dependent
+installation remarks in the previous point.
+
+
+<h3> prepend+append </h3>
+Config sources (ordered by priority):
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A,B,C
+	<tr><td> user    <td> 400      <td> prepend   <th> X,Y,Z
+	<tr><td> project <td> 600      <td> append    <th> D,E
+</table>
+<p>Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A,B,C   <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> X,Y,Z,A,B,C <td> &nbsp;
+	<tr><td> 3.   <td> apply <i>project</i><td> X,Y,Z,A,B,C,D,E <td> &nbsp;
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/merging.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/conf/merging.png
===================================================================
--- tags/2.0.1/doc/conf/merging.png	(nonexistent)
+++ tags/2.0.1/doc/conf/merging.png	(revision 18980)

Property changes on: tags/2.0.1/doc/conf/merging.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/conf/noextend.html
===================================================================
--- tags/2.0.1/doc/conf/noextend.html	(nonexistent)
+++ tags/2.0.1/doc/conf/noextend.html	(revision 18980)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - old config </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The OLD config system in pcb-rnd </H1>
+<H2> If the config system is too static </H2>
+
+This document describes the old situation, focusing on drawbacks for
+a purpose: to give a hint on why some of the design decisions are made
+the way they are, in the new conf system.
+
+<h3> Settings, preferences, colors, and... </h3>
+The core implemented a so called Settings. It was a flat list of items,
+each bound to a C variable. There was a bunch of metadata attached to
+the items: name, type, description. Generic code could query or change
+the value of any setting, the C code could read and write them directly
+too. The content was saved to ~/.pcb/settings.
+<p>
+On the downside, the actual items this system knew about was pretty much
+static, hardwired in core. A plugin could not register its own settings.
+Multiple parallel methods were present in the code to overcome this
+limitation:
+<ul>
+	<li> HID attributes: another way to describe name-type-metadata lists; this
+	was used to pass on some rc-like parameters to the GUI HIDs. It's also the
+	main API to describe export parameters for the export HIDs. However,
+	HID attributes is not well suited for saving plugin (or HID) user
+	preferences, it is more about a per action configuration.
+
+	<li> The gtk HID also saved its own settings to a separate file called
+	~/.pcb/preferences.
+
+	<li> Some gtk HID settings didn't quiet fit in the preferences - the color
+	scheme can be saved in another file, usually under ~/.pcb/colors
+
+	<li> A random plugin could either use the HID attributes to get a limited
+	service or like the gtk HID did, had to implement its own save-restore of
+	persistent settings.
+</ul>
+
+<h3> Meta-drawbacks </h3>
+This also introduced a more subtle drawback: the configuration was now
+scattered into different files, <i>randomly</i> (looking from the
+user's point of view). In other words, the actual structure did not reflect
+some logical grouping, but mostly historical or source code organizational
+reasons.
+<p>
+In turn, this also limited (again somewhat randomly) what settings can be
+stored system-wise, user-wise, or on project or design level.
+<p>
+Finally, handling of file search paths was not very sophisticated. There
+was the system and user configuration that reflected where the stock
+library or the user's generic library were installed.  And then
+there was the per-project local footprint libs that had to be somehow
+added too.
+<p>
+There was a hardwired way of handling the situation where multiple set
+of paths were specified. In practice it was usually possible to get this
+to work for the simpler cases, but it was not powerful enough to express
+things like "use all system and user libraries first, then the project's local
+library" vs. "the project's local library has priority over system libraries".
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/plugin_chk.html
===================================================================
--- tags/2.0.1/doc/conf/plugin_chk.html	(nonexistent)
+++ tags/2.0.1/doc/conf/plugin_chk.html	(revision 18980)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config plugin checklist </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Plugin programmer's checklist </H2>
+
+TODO
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/prio.html
===================================================================
--- tags/2.0.1/doc/conf/prio.html	(nonexistent)
+++ tags/2.0.1/doc/conf/prio.html	(revision 18980)
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config priorities </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Priorities </H2>
+
+Priority is an integer property of each config root.
+<a href="syntax.html">Syntax-wise</a> it is part of the name of the config
+root. In the lihata config file it is either specified or omitted. When
+omitted,  <a href="sources.html"> a role dependent default value</a> is
+used. The default values are chosen in an intuitive way, thus most
+commonly the priority value is omitted.
+<p>
+For <a href="scalars.html">scalar</a> settings, the highest priority
+value determines the final value of a setting after the merge. If there
+is a tie, role decides: the role closer to the CLI is stronger.
+<p>
+For <a href="lists.html">lists</a> and arrays, priority determines the
+order of merge, which changes the order of items in the final list as
+config roots prepend and append items.
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/scalars.html
===================================================================
--- tags/2.0.1/doc/conf/scalars.html	(nonexistent)
+++ tags/2.0.1/doc/conf/scalars.html	(revision 18980)
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config scalars </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Scalars </H2>
+
+Scalar settings have only one value after the merge. The only <i>policy</i>
+available is <i>overwrite</i> - this policy is applied regardless of the
+current policy setting.
+
+<h2> examples </h2>
+
+<h3> simple overwrite </h3>
+Config sources:
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A
+	<tr><td> user    <td> 400      <td> overwrite <th> (not defined)
+	<tr><td> project <td> 600      <td> overwrite <th> Q
+</table>
+<p>
+Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A       <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>user</i>   <td> A       <td> "not defined" doesn't mean "empty", so the list is not deleted - no change
+	<tr><td> 3.   <td> apply <i>project</i><td> Q       <td> replace the original output because of the overwrite policy
+</table>
+<p>Example scenario: system default overridden by a project setting.
+
+<h3> user-forced value </h3>
+Config sources append:
+<table border=1>
+	<tr><th> role    <th> priority <th> policy    <th> content
+	<tr><td> system  <td> 200      <td> overwrite <th> A
+	<tr><td> user    <td> 650      <td> overwrite <th> E
+	<tr><td> project <td> 600      <td> overwrite <th> Q
+</table>
+<p>
+Merge iterations:
+<table border=1>
+	<tr><th> step <th> description         <th> output list after executing this step <th> remarks
+	<tr><td> 0.   <td> reset the output    <td> (empty) <td> &nbsp;
+	<tr><td> 1.   <td> apply <i>system</i> <td> A       <td> &nbsp;
+	<tr><td> 2.   <td> apply <i>project</i><td> Q       <td> &nbsp;
+	<tr><td> 3.   <td> apply <i>user</i>   <td> E       <td> &nbsp;
+</table>
+<p>Example scenario: user preference enforced: even if the project file would use
+'Q' for the given setting, the user prefers 'E'. This affects runtime
+(the value of the setting after the merge, in other words how pcb-rnd works),
+but does not change the project configuration. This allows the given user to
+always use 'E' for the given setting while lets other users working on the
+same project use the value set in the project file.
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/sources.html
===================================================================
--- tags/2.0.1/doc/conf/sources.html	(nonexistent)
+++ tags/2.0.1/doc/conf/sources.html	(revision 18980)
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config sources </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Sources </H2>
+There are different sources of configuration settings. These are
+different configuration files, sometimes located on the file system.
+The full list of config sources is:
+
+<table border=1>
+<tr><th> role     <th> default<br>setting<br>prio <th> location <th> presence <th> remarks
+<tr><td> internal
+    <td> 100
+    <td> (compiled into the executable)
+    <td> always
+    <td> the ultimate fallback; allows pcb-rnd even if no other configuration file is found
+
+
+<tr><td> system
+    <td> 200
+    <td> /usr/share/pcb-rnd/pcb-conf.lht
+    <td> recommended
+    <td> should hold system and installation specific settings, e.g. path to the system-wise installed footprint library
+
+<tr><td> default board
+    <td> 300
+    <td> /usr/share/pcb-rnd/default4.lht<a href="#footnote1"><sup>1</sup></a>
+    <td> deprecated<a href="#footnote2"><sup>2</sup></a>
+    <td> pcb editable defaults
+
+<tr><td> user
+    <td> 400
+    <td> ~/.pcb-rnd/pcb-conf.lht
+    <td> recommended
+    <td> store user preferences, user's common footprint lib path, etc; this is the first file the user can modify (even from the GUI)
+
+<tr><td> environment
+    <td> 500
+    <td> environment variables (TODO)
+    <td> occasional
+    <td> inject the same (temporary) settings in multiple pcb-rnd sessions without having to change config files
+
+<tr><td> project
+    <td> 600
+    <td> project.lht in the project directory
+    <td> optional
+    <td> local project settings - useful for large projects with multiple board (.lht) files
+
+<tr><td> design
+    <td> 700
+    <td> saved in the board (.lht) file
+    <td> optional, common
+    <td> per design deviation from the user+system config
+
+<tr><td> cli
+    <td> 800
+    <td> command line argument
+    <td> occasional
+    <td> inject/change a setting for a single session; useful in batch/automated processing
+</table>
+
+<p>
+Pcb-rnd reads them all, then merges all settings into a master binary
+representation. If a setting is specified in multiple sources, the one
+with the higher priority wins, except for lists where it is also possible
+to prepend/append items. Default priorities are designed to result
+precedence in an intuitive way (e.g. design settings overwrite user settings).
+However, <a href="prio.html">priority can be changed</a> per setting, resulting
+in weak settings ("use this value if it was not already set") or strong settings
+("I always want to use mincut, so I enable it from my user's config with high
+priority and a version controlled project setting can not turn it off")
+
+<p>
+Footnotes:
+<ul>
+	<li id="footnote1"> <sup>1</sup>: the name of the default board is default4.lht for
+	the default 4 layer board. The standard installation also ships default2.lht
+	as a similar 2 layer board. The name of the default baordfile is configured
+	in config node rc/default_pcb_file.
+	<li id="footnote2"> <sup>2</sup>: default pcb should not contain a config subtree; it is
+	easier to maintain the config tree if default configuration is coming from
+	config files only.
+</ul>
+</body>
+</html>
Index: tags/2.0.1/doc/conf/src/Makefile
===================================================================
--- tags/2.0.1/doc/conf/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/conf/src/Makefile	(revision 18980)
@@ -0,0 +1,2 @@
+../merging.png: merging.dot
+	dot -Tpng merging.dot > ../merging.png
\ No newline at end of file
Index: tags/2.0.1/doc/conf/src/merging.dot
===================================================================
--- tags/2.0.1/doc/conf/src/merging.dot	(nonexistent)
+++ tags/2.0.1/doc/conf/src/merging.dot	(revision 18980)
@@ -0,0 +1,103 @@
+digraph g {
+	rankdir=LR;
+
+	subgraph cluster_memtree {
+		label="in-memory lihata trees"
+		bgcolor=grey
+		rank=same
+		CFR_INTERNAL    [label="CFR_INTERNAL\nultimate fallback"]
+		CFR_SYSTEM      [label="CFR_SYSTEM\nsystem level configuration"]
+		CFR_DEFAULTPCB  [label="CFR_DEFAULTPCB"]
+		CFR_USER        [label="CFR_USER\nuser level configuration"]
+		CFR_ENV         [label="CFR_ENV"]
+		CFR_PROJECT     [label="CFR_PROJECT\nproject level configuration"]
+		CFR_DESIGN      [label="CFR_DESIGN"]
+		CFR_CLI         [label="CFR_CLI"]
+	}
+
+	subgraph cluster_fields {
+		label="string -> conf_native_t hash"
+		bgcolor=grey
+		conf_fields     [label="conf_fields\ncentral hash\nof all\nknown settings"]
+	}
+
+	subgraph cluster_native {
+		label="native C structures\nper module"
+		bgcolor=grey
+		conf_core       [label="conf_core\npcb-rnd core settings"]
+		conf_hid_gtk    [label="conf_hid_gtk\nthe hid_gtk plugin's settings"]
+		conf_mincut     [label="conf_mincut\nthe mincut plugin's settings"]
+		conf_report     [label="conf_report\nthe report plugin's settings"]
+		conf_other      [label="...\nother plugin's settings"]
+	}
+
+	CFR_INTERNAL    -> conf_fields [color=red]
+	CFR_SYSTEM      -> conf_fields [color=red]
+	CFR_DEFAULTPCB  -> conf_fields [color=red]
+	CFR_USER        -> conf_fields [color=red]
+	CFR_ENV         -> conf_fields [color=red]
+	CFR_PROJECT     -> conf_fields [color=red]
+	CFR_DESIGN      -> conf_fields [color=red]
+	CFR_CLI         -> conf_fields [color=red]
+
+
+#	CFR_INTERNAL    -> CFR_SYSTEM
+#	CFR_SYSTEM      -> CFR_DEFAULTPCB
+#	CFR_DEFAULTPCB  -> CFR_USER
+#	CFR_USER        -> CFR_ENV
+#	CFR_ENV         -> CFR_PROJECT
+#	CFR_PROJECT     -> CFR_DESIGN
+#	CFR_DESIGN      -> CFR_CLI
+
+	conf_fields -> conf_core      [color=red]
+	conf_fields -> conf_hid_gtk   [color=red]
+	conf_fields -> conf_mincut    [color=red]
+	conf_fields -> conf_report    [color=red]
+	conf_fields -> conf_other     [color=red]
+
+
+
+	subgraph cluster_files {
+		label="config files"
+		bgcolor=grey
+		lht_system        [label="/usr/share/pcb-rnd/pcb-conf.lht" shape=hexagon]
+		pcb_default       [label="/usr/share/pcb-rnd/default.pcb" shape=hexagon]
+		project           [label="./project.lht" shape=hexagon]
+		lht_user          [label="~/.pcb-rnd/pcb-conf.lht" shape=hexagon]
+	}
+
+	subgraph cluster_exec_env {
+		label="execution environment"
+		bgcolor=grey
+		env               [label="environmental variables"]
+		cli               [label="command line arguments\ne.g. -c or\npluginspecific args"]
+	}
+
+	lht_internal      [label="hardwired\nin the\nexecutable"]
+	design            [label="settings\nin the\n.pcb file" shape=hexagon]
+
+	lht_internal -> CFR_INTERNAL    [label="program startup"]
+	lht_system   -> CFR_SYSTEM      [label="loaded at startup"]
+	pcb_default  -> CFR_DEFAULTPCB  [label="loadad in CreateNewPCB()"]
+	lht_user     -> CFR_USER        [label="loaded at startup" dir=both]
+	env          -> CFR_ENV         [label="built at startup"]
+	project      -> CFR_PROJECT     [label="loaded when a\nnew .pcb or project\nis loaded" dir=both]
+	design       -> CFR_DESIGN      [label="extracted when loading a design" dir=both]
+	cli          -> CFR_CLI         [label="built during\ncommand line argument\nparsing"]
+
+
+	hid_gtk [label="the GTK HID"]
+
+	conf_core     -> hid_gtk [weight=100]
+	conf_hid_gtk  -> hid_gtk
+
+	hid_gtk -> CFR_DESIGN  [color=blue weigth=0]
+	hid_gtk -> CFR_PROJECT [color=blue weigth=0 style=dashed]
+	hid_gtk -> CFR_USER    [color=blue weigth=0 style=dashed]
+
+
+	editor  [label="core:\nediting pcb"]
+	conf_core -> editor   [weight=100]
+	editor -> CFR_DESIGN  [color=blue weigth=0]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/conf/syntax.html
===================================================================
--- tags/2.0.1/doc/conf/syntax.html	(nonexistent)
+++ tags/2.0.1/doc/conf/syntax.html	(revision 18980)
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - config syntax </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> The new config system in pcb-rnd </H1>
+<H2> Config file syntax </H2>
+
+The config file syntax is <a href="http://repo.hu/projects/lihata">lihata</a>.
+Most users don't need to understand most of the syntax, just follow the
+patterns seen in the examples. A few thumb of rules:
+<ul>
+	<li> structural nodes usually start with a ha: or li: prefix; which one needs to be used is pretty much tied to the node name; thus casual users don't need to care about what they are for, just remember them as part of the name
+	<li> non-structural nodes are usually given in the form of name = value; use braces around the value if it contains any non-alphanumeric, non-whitespace character
+	<li> list and array members should better be braced
+	<li> list and array separator should be semicolon (not comma)
+</ul>
+
+<H3> config root syntax </H3>
+<p>
+A pcb-rnd config file, (or <i>document</i> for short) has a single root
+node whose name must be li:pcb-rnd-conf-v1 - this is the signature of the
+document. It is a flat list of one or more <i>config root/</i> subtrees.
+TODO: is this really a list or a hash?
+<p>
+Each config root is a partial description of the
+<a href="index_user.html"> config tree </a> (which is the logical
+configuration of all possible settings). Config roots have a policy and
+a <a href="prio.html">priority</a> attached. This is done in the name
+of the config root, which must be of the form of <i>policy-priority</i>,
+e.g. "overwrite-300" or "append-125". The priority part (with the dash)
+can be omitted (and then the per role default priority is used), e.g.
+"overwrite" or "append" are valid config root names.
+<p>
+Under the config root, a tree of sections (hashes) and setting values
+(text nodes) are built. These structures and values are in 1:1 
+correspondence with <a href="groups.html">the config tree</a>. Excess
+(unknown) keys are considered a warning (except in the plugin/ and
+utils/ subtrees). Missing keys or missing subtrees is normal because a config
+root can be partial.
+<p>
+TODO: examples
+
+<H3> list syntax </h3>
+TODO: list syntax
+
+<H3> in project files </H3>
+TODO
+
+</body>
+</html>
Index: tags/2.0.1/doc/conf/tree/CFN_BOOLEAN.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_BOOLEAN.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_BOOLEAN.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: boolean</h2>
+Boolean value: true or false. Most often used for determining whether a
+feature or a (display mode) is enabled.
+<p>
+Example values: true, false, on, off, yes, no, 1, 0.
Index: tags/2.0.1/doc/conf/tree/CFN_COLOR.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_COLOR.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_COLOR.html	(revision 18980)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: color</h2>
+A color description. Use the "webcolor" format: #rrggbb, where
+rr, gg and bb are 2 digit hexadecimal values for red, green and blue
+components.
+<p>
+Example values: #ff0000 for red, #555555 for grey.
Index: tags/2.0.1/doc/conf/tree/CFN_COORD.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_COORD.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_COORD.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: coord</h2>
+A coordinate: size, distance, spacing. A decimal number with an unit. Unit
+can be metric (e.g. mm, cm, m) or imperial (e.g. mil). 
+<p>
+Example values: 1.5mm, 15 mil
+
+
Index: tags/2.0.1/doc/conf/tree/CFN_INCREMENTS.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_INCREMENTS.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_INCREMENTS.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: increments</h2>
+A collection of coordinates representing an increment configuration.
+<p>
+TODO
+
Index: tags/2.0.1/doc/conf/tree/CFN_INTEGER.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_INTEGER.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_INTEGER.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: integer</h2>
+A decimal integer value without unit. The value might be stored in a
+32 bit integer; safe range is approximately -2^31 .. 2^31.
+<p>
+Example values: 4, 1500, 2545343, -6
+
+
Index: tags/2.0.1/doc/conf/tree/CFN_LIST.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_LIST.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_LIST.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: list</h2>
+An ordered list of strings.
+<p>
+Example values: 
+<pre>
+li:{ foo; bar; {foo/bar/with-punctuation}; 123}
+</pre>
Index: tags/2.0.1/doc/conf/tree/CFN_REAL.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_REAL.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_REAL.html	(revision 18980)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: real</h2>
+A decimal numeric value without unit. 
+<p>
+Example values: 3.141592654, 5, -12, 0
+
+
Index: tags/2.0.1/doc/conf/tree/CFN_STRING.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_STRING.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_STRING.html	(revision 18980)
@@ -0,0 +1,13 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: string</h2>
+Text value.
+<p>
+Example values:
+<pre>
+foo
+bar
+{long text with / punctuation?}
+</pre>
+
Index: tags/2.0.1/doc/conf/tree/CFN_UNIT.html
===================================================================
--- tags/2.0.1/doc/conf/tree/CFN_UNIT.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/CFN_UNIT.html	(revision 18980)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<h1>pcb-rnd conf tree</h1>
+<h2>type: unit</h2>
+Name of a unit.
+<p>
+Example values: mm, cm, m, mil
+
+
Index: tags/2.0.1/doc/conf/tree/appearance.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance.html	(revision 18980)
@@ -0,0 +1,13 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> rat_thickness <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <rat_thickness>
+<tr><td> mark_size <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> relative marker size
+<tr><td> layer_alpha <td><a href="CFN_REAL.html"> real </a><td> 0 <td> alpha value for layer drawing
+<tr><td> drill_alpha <td><a href="CFN_REAL.html"> real </a><td> 0 <td> alpha value for drill drawing
+<tr><td> text_host_bbox <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> when moving a text object, the outline thin-draw should also include the bounding box
+<tr><td> term_label_size <td><a href="CFN_REAL.html"> real </a><td> 0 <td> size of terminal labels, in pcb font scale (100 is for the normal size)
+<tr><td> subc_layer_per_side <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> hide top or bottom placed subcircuit annotations if the view is showing the other side
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_color.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_color.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_color.html	(revision 18980)
@@ -0,0 +1,26 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/color</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> background <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> background and cursor color ...
+<tr><td> crosshair <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> different object colors
+<tr><td> cross <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> crosshair, drc outline color
+<tr><td> selected <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> generic object selection color
+<tr><td> via <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> non-terminal padstack shape on current layer
+<tr><td> pin <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> terminal padstack shape on current layer
+<tr><td> pin_name <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen terminal number/name labels
+<tr><td> subc <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen subcircuit marks
+<tr><td> subc_nonetlist <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen subcircuit marks for subcircuits with the nonetlist flag
+<tr><td> padstackmark <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen center mark cross for padstacks
+<tr><td> rat <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen rat lines
+<tr><td> invisible_objects <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> other-side objects and padstack shapes on non-current layer
+<tr><td> connected <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> 'connected' highlight (galvanic connections found)
+<tr><td> warn <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> warning highlight (e.g. object found to cause a short)
+<tr><td> off_limit <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen background beyond the configured drawing area
+<tr><td> grid <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> on-screen grid
+<tr><td> layer <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> default layer colors; when a new layer is created, a color from this list is assigned initially
+<tr><td> mask <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> default mask layer color (when a new mask layer is created)
+<tr><td> paste <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> default paste layer color (when a new paste layer is created)
+<tr><td> element <td><a href="CFN_COLOR.html"> color </a><td> 0 <td> default silk layer color (when a new silk layer is created)
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_loglevels.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_loglevels.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_loglevels.html	(revision 18980)
@@ -0,0 +1,14 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/loglevels</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> debug_tag <td><a href="CFN_STRING.html"> string </a><td> 0 <td> log style tag of debug messages
+<tr><td> debug_popup <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> whether a debug line should pop up the log window
+<tr><td> info_tag <td><a href="CFN_STRING.html"> string </a><td> 0 <td> log style tag of info messages
+<tr><td> info_popup <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> whether an info line should pop up the log window
+<tr><td> warning_tag <td><a href="CFN_STRING.html"> string </a><td> 0 <td> log style tag of warnings
+<tr><td> warning_popup <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> whether a warning should pop up the log window
+<tr><td> error_tag <td><a href="CFN_STRING.html"> string </a><td> 0 <td> log style tag of errors
+<tr><td> error_popup <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> whether an error should pop up the log window
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_messages.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_messages.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_messages.html	(revision 18980)
@@ -0,0 +1,7 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/messages</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> char_per_line <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> width of an output line in characters (used by separator drawing in find.c)
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_misc.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_misc.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_misc.html	(revision 18980)
@@ -0,0 +1,7 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/misc</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> volume <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> the speakers volume -100..100
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_padstack.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_padstack.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_padstack.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/padstack</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> cross_thick <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> cross thickness in pixels - 0 means disable crosses
+<tr><td> cross_size <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> cross size in word coords - size of one arm of the cross (minus the hole radius)
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_pinout.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_pinout.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_pinout.html	(revision 18980)
@@ -0,0 +1,12 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/pinout</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> name_length <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> <name_length>
+<tr><td> zoom <td><a href="CFN_REAL.html"> real </a><td> 0 <td> <zoom>
+<tr><td> offset_x <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> X offset of origin
+<tr><td> offset_y <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> Y offset of origin
+<tr><td> text_offset_x <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> X offset of text from pin center
+<tr><td> text_offset_y <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> Y offset of text from pin center
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/appearance_subc.html
===================================================================
--- tags/2.0.1/doc/conf/tree/appearance_subc.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/appearance_subc.html	(revision 18980)
@@ -0,0 +1,7 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: appearance/subc</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> dash_freq <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> how dense the dashed outline should be; -1 means do not display the dashed outline; 0 means solid outline; 1..32 means dashed outline
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/design.html
===================================================================
--- tags/2.0.1/doc/conf/tree/design.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/design.html	(revision 18980)
@@ -0,0 +1,23 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: design</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> via_thickness <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <via_thickness>
+<tr><td> via_drilling_hole <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <via_drilling_hole>
+<tr><td> line_thickness <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <line_thickness>
+<tr><td> clearance <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <clearance>
+<tr><td> alignment_distance <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> default drc size
+<tr><td> bloat <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> default drc size
+<tr><td> shrink <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <shrink>
+<tr><td> min_wid <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <min_wid>
+<tr><td> min_slk <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <min_slk>
+<tr><td> min_drill <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <min_drill>
+<tr><td> min_ring <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> <min_ring>
+<tr><td> text_scale <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> text scaling in %
+<tr><td> text_font_id <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> <text_font_id>
+<tr><td> poly_isle_area <td><a href="CFN_REAL.html"> real </a><td> 0 <td> polygon min area
+<tr><td> fab_author <td><a href="CFN_STRING.html"> string </a><td> 0 <td> Full name of author for FAB drawings
+<tr><td> initial_layer_stack <td><a href="CFN_STRING.html"> string </a><td> 0 <td> deprecated.
+<tr><td> paste_adjust <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> Adjust paste thickness
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/editor.html
===================================================================
--- tags/2.0.1/doc/conf/tree/editor.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/editor.html	(revision 18980)
@@ -0,0 +1,56 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: editor</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> grid_unit <td><a href="CFN_UNIT.html"> unit </a><td> 0 <td> select whether you draw in mm or mil
+<tr><td> grid <td><a href="CFN_COORD.html"> coord </a><td> 0 <td> grid in pcb-units
+<tr><td> grids <td><a href="CFN_LIST.html"> list </a><td> 0 <td> grid in grid-string format
+<tr><td> grids_idx <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> the index of the currently active grid from grids
+<tr><td> zoom <td><a href="CFN_REAL.html"> real </a><td> 0 <td> default zoom
+<tr><td> mode <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> currently active mode
+<tr><td> buffer_number <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> number of the current buffer
+<tr><td> clear_line <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new lines/arc clear polygons.
+<tr><td> clear_polypoly <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new polygons clear polygons.
+<tr><td> full_poly <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> new polygons are full polygons.
+<tr><td> unique_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> OBSOLETE: force unique names
+<tr><td> snap_pin <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> snap to pins and pads
+<tr><td> snap_offgrid_line <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> Snap to certain off-grid points along a line.
+<tr><td> marker_snaps <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> marker snaps to grid or snap points, as any other click
+<tr><td> highlight_on_point <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> Highlight if crosshair is on endpoints.
+<tr><td> show_solder_side <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> mirror output
+<tr><td> save_last_command <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> the command entry editline always starts with the last command entered by user in the current session
+<tr><td> line_refraction <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> value for line lookahead setting
+<tr><td> save_in_tmp <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> emergency save unsaved PCB data (despite the user clicks don't save) when: user starts a new PCB; user quits pcb-rnd. Does not affect the on-crash emergency save.
+<tr><td> draw_grid <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> draw grid points
+<tr><td> all_direction_lines <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> enable lines to all directions
+<tr><td> rubber_band_mode <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> move, rotate use rubberband connections
+<tr><td> rubber_band_keep_midlinedir <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> keep line direction when a middle line is moved
+<tr><td> swap_start_direction <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> change starting direction after each click
+<tr><td> show_drc <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> show drc region on crosshair
+<tr><td> auto_drc <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> when set, PCB doesn't let you place copper that violates DRC.
+<tr><td> show_number <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> OBSOLETE: pinout shows number
+<tr><td> orthogonal_moves <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> move items orthogonally.
+<tr><td> reset_after_element <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> reset connections after each element while saving all connections
+<tr><td> auto_place <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> flag which says we should force placement of the windows on startup
+<tr><td> lock_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> lock down text so they can not be moved or selected
+<tr><td> only_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> lock down everything else but text so only text objects can be moved or selected
+<tr><td> thin_draw <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> if set, objects on the screen are drawn as outlines (lines are drawn as center-lines).  This lets you see line endpoints hidden under pins, for example.
+<tr><td> thin_draw_poly <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> if set, polygons on the screen are drawn as outlines.
+<tr><td> wireframe_draw <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> if set, lines and arcs on the screen are drawn as outlines.
+<tr><td> local_ref <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> use local reference for moves, by setting the mark at the beginning of each move.
+<tr><td> check_planes <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> when set, only polygons and their clearances are drawn, to see if polygons have isolated regions.
+<tr><td> hide_names <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> when set, subc floater text objects (typical use case: refdes text) are not drawn.
+<tr><td> description <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> obsolete - DO NOT USE - kept for compatibility
+<tr><td> name_on_pcb <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> obsolete - DO NOT USE - kept for compatibility
+<tr><td> subc_id <td><a href="CFN_STRING.html"> string </a><td> 0 <td> subcircuit ID template for diplaying the subcircuit label on the subcircuit layer; default to displaying the refes, if empty; syntax if the same as for DYNTEXT
+<tr><td> fullscreen <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> hide widgets to make more room for the drawing
+<tr><td> move_linepoint_uses_route <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> Moving a line point calculates a new line route. This allows 45/90 line modes when editing lines.
+<tr><td> auto_via <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> when drawing traces and switching layers or when moving an object from one layer to another, try to keep connections by automatically inserting vias.
+<tr><td> route_radius <td><a href="CFN_REAL.html"> real </a><td> 0 <td> temporary: route draw helper's arc radius at corners (factor of the trace thickness)
+<tr><td> click_time <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> default time for click expiration, in ms
+<tr><td> enable_stroke <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> Enable libstroke gestures on middle mouse button when non-zero
+<tr><td> live_routing <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> autorouter shows tracks in progress
+<tr><td> beep_when_finished <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> flag if a signal should be produced when searching of  connections is done
+<tr><td> undo_warning_size <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> warn the user when undo list exceeds this amount of kilobytes in memory
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/editor_selection.html
===================================================================
--- tags/2.0.1/doc/conf/tree/editor_selection.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/editor_selection.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: editor/selection</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> disable_negative <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> selection box behaviour: disable the negative-direction selection - any selection box will select only what's fully within the box
+<tr><td> symmetric_negative <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> selection box behaviour: when set, the selection direction is considered negative only if the box has negative size in the X direction
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/editor_view.html
===================================================================
--- tags/2.0.1/doc/conf/tree/editor_view.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/editor_view.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: editor/view</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> flip_x <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> view: flip the board along the X (horizontal) axis
+<tr><td> flip_y <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> view: flip the board along the Y (vertical) axis
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/rc.html
===================================================================
--- tags/2.0.1/doc/conf/tree/rc.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/rc.html	(revision 18980)
@@ -0,0 +1,35 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: rc</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> verbose <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> <verbose>
+<tr><td> quiet <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> print only errors on stderr
+<tr><td> backup_interval <td><a href="CFN_INTEGER.html"> integer </a><td> 0 <td> time between two backups in seconds; 0 means disabled (no backups)
+<tr><td> hid_fallback <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> if there is no explicitly specified HID (--gui) and the preferred GUI fails, automatically fall back on other HIDs, eventually running in batch mode
+<tr><td> brave <td><a href="CFN_STRING.html"> string </a><td> 0 <td> brave mode flags: when non-empty, enable various experimental (unstable) features - useful for testers
+<tr><td> font_command <td><a href="CFN_STRING.html"> string </a><td> 0 <td> file name template; if not empty, run this command and read its output for loading the font; %f is the file name
+<tr><td> file_command <td><a href="CFN_STRING.html"> string </a><td> 0 <td> file name template; if not empty, run this command and read its output for loading a pcb file; %f is the file name, %p is the conf setting rc.file_path
+<tr><td> file_path <td><a href="CFN_STRING.html"> string </a><td> 0 <td> <file_path>
+<tr><td> library_shell <td><a href="CFN_STRING.html"> string </a><td> 0 <td> <library_shell>
+<tr><td> library_search_paths <td><a href="CFN_LIST.html"> list </a><td> 0 <td> <library_search_paths>
+<tr><td> menu_file <td><a href="CFN_STRING.html"> string </a><td> 0 <td> where to load the default menu file from. If empty/unset, fall back to the legacy 'per hid ow menu file' setup. If contains slash, take it as a full path, if no slash, do a normal menu search for pcb-menu-NAME.lht
+<tr><td> emergency_name <td><a href="CFN_STRING.html"> string </a><td> 0 <td> file name template for emergency save anonymous .pcb files (when pcb-rnd crashes); optional field: %ld --> pid; must be shorter than 240 characters. Don't do emergency save if this item is empty.
+<tr><td> emergency_format <td><a href="CFN_STRING.html"> string </a><td> 0 <td> if set, use this format for the backups; if unset, use the default format
+<tr><td> backup_name <td><a href="CFN_STRING.html"> string </a><td> 0 <td> file name template for periodic backup anonymous .pcb files; optional fields: %P --> pid
+<tr><td> backup_format <td><a href="CFN_STRING.html"> string </a><td> 0 <td> if set, use this format for the backups; if unset or set to 'original', use the original format
+<tr><td> save_command <td><a href="CFN_STRING.html"> string </a><td> 0 <td> command to pipe the pcb, footprint or buffer file into, when saving (makes lihata persist impossible)
+<tr><td> keep_save_backups <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> a copy is made before a save operation overwrites an existing file; if this setting is true, keep the copy even after a successful save
+<tr><td> default_font_file <td><a href="CFN_LIST.html"> list </a><td> 0 <td> name of default font file (list of names to search)
+<tr><td> default_pcb_file <td><a href="CFN_LIST.html"> list </a><td> 0 <td> <default_pcb_file>
+<tr><td> script_filename <td><a href="CFN_STRING.html"> string </a><td> 0 <td> PCB Actions script to execute on startup
+<tr><td> action_string <td><a href="CFN_STRING.html"> string </a><td> 0 <td> PCB Actions string to execute on startup
+<tr><td> rat_path <td><a href="CFN_STRING.html"> string </a><td> 0 <td> <rat_path>
+<tr><td> rat_command <td><a href="CFN_STRING.html"> string </a><td> 0 <td> file name template; if not empty, run this command and read its output for loading a rats; %f is the file name, %p is the rc.rat_path conf setting
+<tr><td> preferred_gui <td><a href="CFN_LIST.html"> list </a><td> 0 <td> if set, try GUI HIDs in this order when no GUI is explicitly selected
+<tr><td> save_final_fallback_fmt <td><a href="CFN_STRING.html"> string </a><td> 0 <td> when a new file is created (by running pcb-rnd with the file name) there won't be a known format; pcb-rnd will guess from the file name (extension) but eventhat may fail. This format is the final fallback that'll be used if no other guessing mechanism worked. The user can override this by save as.
+<tr><td> save_fp_fmt <td><a href="CFN_STRING.html"> string </a><td> 0 <td> when saving a buffer element/subcircuit, prefer this format by default
+<tr><td> cli_prompt <td><a href="CFN_STRING.html"> string </a><td> 0 <td> plain text prompt to prefix the command entry
+<tr><td> cli_backend <td><a href="CFN_STRING.html"> string </a><td> 0 <td> command parser action
+<tr><td> have_regex <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> whether we have regex compiled in
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/rc_path.html
===================================================================
--- tags/2.0.1/doc/conf/tree/rc_path.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/rc_path.html	(revision 18980)
@@ -0,0 +1,13 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: rc/path</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> prefix <td><a href="CFN_STRING.html"> string </a><td> 0 <td> e.g. /usr/local
+<tr><td> lib <td><a href="CFN_STRING.html"> string </a><td> 0 <td> e.g. /usr/lib/pcb-rnd
+<tr><td> bin <td><a href="CFN_STRING.html"> string </a><td> 0 <td> e.g. /usr/bin
+<tr><td> share <td><a href="CFN_STRING.html"> string </a><td> 0 <td> e.g. /usr/share/pcb-rnd
+<tr><td> home <td><a href="CFN_STRING.html"> string </a><td> 0 <td> user's home dir, determined run-time
+<tr><td> exec_prefix <td><a href="CFN_STRING.html"> string </a><td> 0 <td> exec prefix path (extracted from argv[0])
+<tr><td> design <td><a href="CFN_STRING.html"> string </a><td> 0 <td> directory path of the current design, or <invalid> if the current design doesn't have a file name yet
+</table></body></html>
Index: tags/2.0.1/doc/conf/tree/temp.html
===================================================================
--- tags/2.0.1/doc/conf/tree/temp.html	(nonexistent)
+++ tags/2.0.1/doc/conf/tree/temp.html	(revision 18980)
@@ -0,0 +1,7 @@
+<html><body>
+<h1>pcb-rnd conf tree</h1>
+<h2>subtree: temp</h2>
+<table border=1>
+<tr><th>node name <th> type <td> flags <td> description
+<tr><td> rat_warn <td><a href="CFN_BOOLEAN.html"> boolean </a><td> 0 <td> rats nest has set warnings
+</table></body></html>
Index: tags/2.0.1/doc/contrib.html
===================================================================
--- tags/2.0.1/doc/contrib.html	(nonexistent)
+++ tags/2.0.1/doc/contrib.html	(revision 18980)
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<title> pcb-rnd - contribution </title>
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<h1> pcb-rnd - contribution </h1>
+
+If you are interested to help out, please contact me using
+<a href="irc.html"> the live chat (CET daytime)</a> or mail to:
+pcb-rnd (at) igor2.repo.hu.
+
+<H2> Contributing as a user </h2>
+Using pcb-rnd in production and just reporting bugs is already a huge contribution.
+<p>
+More dedicated users can join in scheduled, systematic testing. Such testing
+is split up into independent chunks that each can be done in an hour.
+<p>
+Even more dedicated users can join developing the documentation.
+<p>
+None of the above requires or assumes any programming skill.
+
+<H2> Contributing as a developer </h2>
+
+The project is lead in an autocratic way by Igor2.
+
+Developer freedom taken away:
+<ul>
+	<li> the basic concept of pcb-rnd is set and won't change
+	<li> the toolchain is chosen, and won't change; the usual hot topics: svn, scconfig, <a href="developer/c89.html">C</a>.
+	<li> don't add code that restricts usability for others; add code that increases usability for some; thus prefer to add code in plugins!
+</ul>
+<p>
+Developer freedom promptly granted:
+<ul>
+	<li> svn commit access from day 0
+	<li> work together in trunk/, not alone in a branch
+	<li> pcb-rnd has a strong plugin support; want to implement a strange/controversial feature? In a plugin, almost anything goes
+	<li> especially in plugins, work on whatever you want, even if noone else needs that feature
+</ul>
+<p>
+Coding style/indentation: there's an <a href="developer/indent.html">unified style</a>
+in core and core plugins. If you work on those parts, try to stick to it. If you
+are working on a new plugin, it's still the preferred style but you can use
+a different style. However, the rule is that if someone else starts hacking
+that part too, he is allowed to convert the code to the unified format; but
+unified format can not be converted to anything else. So it's a one way
+process which long term grants unified style while not demotivates a plugin
+developer by forcing a style on him in the early, "when the bulk of the code
+is written" phase.
+</body>
+</html>
Index: tags/2.0.1/doc/datasheet.html
===================================================================
--- tags/2.0.1/doc/datasheet.html	(nonexistent)
+++ tags/2.0.1/doc/datasheet.html	(revision 18980)
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - datasheet </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<h1> pcb-rnd - datasheet </h1>
+
+<table border=1 cellspacing=0 cellpadding=5>
+<tr>
+	<td bgcolor="#ccccff"> layout characteristics
+	<td bgcolor="#ddddff"> multiple layers (16 copper, compile time tunable limit)
+                         <br> smd and through-hole components
+                         <br> solder mask, paste, assembly drawings
+                         <br> board size up to 2x2 meter at nanometer precision
+                         <br> arbitrary amount of routing styles
+                         <br> Design Rule Checker
+<tr>
+	<td bgcolor="#ccccff"> native file format
+	<td bgcolor="#ddddff"> lihata (structured text tree); support for loading and saving <b>all</b> old file versions
+<tr>
+	<td bgcolor="#ccccff"> board file formats
+	<td bgcolor="#ddddff"> lihata (native), geda/PCB's .pcb, KiCad's s-expr kicad_pcb, Eagle (binary and xml, read-only), Protel/Autotrax (read-only), Mentor Graphics Hyperlynx
+<tr>
+	<td bgcolor="#ccccff"> other native formats
+	<td bgcolor="#ddddff"> geda/PCB's .fp for footprints (native)
+<tr>
+	<td bgcolor="#ccccff"> import formats
+	<td bgcolor="#ddddff"> gEDA/gaf sch, gEDA/gaf netlist, EasyEDA netlist, dsn, edif, ipcd356, HP-GL, tEDAx
+<tr>
+	<td bgcolor="#ccccff"> export formats
+	<td bgcolor="#ddddff"> gerber, png, ps, svg, bom, xy, bboard, dsn, gcode, ipcd356, lpr, nelma, dxf, kicad old pcb format, tEDAx
+<tr>
+	<td bgcolor="#ccccff"> UI options
+	<td bgcolor="#ddddff"> gtk2, lesstif (motif), batch (automated processing)
+                         <br> configurable menus, keyboard and mouse actions
+<tr>
+	<td bgcolor="#ccccff"> footprint library
+	<td bgcolor="#ddddff"> parametric footprints written in any programming language
+	                       <br>optionally per system, per user, per project libs
+	                       <br>footprints from local files
+	                       <br>footprints from the web (gedasymbols.org)
+<tr>
+	<td bgcolor="#ccccff"> scripting
+	<td bgcolor="#ddddff"> embedded scripting using fungw (awk, python, lua, tcl, ruby, perl, javascript, lisp, shell)
+<tr>
+	<td bgcolor="#ccccff"> layout helpers
+	<td bgcolor="#ddddff"> basic autorouter, basic autoplace, place objects in aligned grid,
+	                       asymmetric pin shapes, back annotation tracking,
+	                       trace puller, teardrops
+	                       <br>understands internal connections in footprints
+	                       <br>query mini-language for finding and selecting objects by rules
+	                       <br>command line mode for 2d drafting
+<tr>
+	<td bgcolor="#ccccff"> misc
+	<td bgcolor="#ddddff"> flexible configuration system
+	                       <br>support for small screen (800x600)
+	                       <br>strong support for automated processing
+                         <br>modularity (most code implemented in plugins)
+                         <br>slim code, reduced external dependency, portability
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/Makefile
===================================================================
--- tags/2.0.1/doc/developer/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/Makefile	(revision 18980)
@@ -0,0 +1,28 @@
+ROOT=../..
+DEVDIR=$(DOCDIR)/developer
+
+all:
+
+install_all:
+	$(SCCBOX) mkdir -p $(DEVDIR)/alien_formats $(DEVDIR)/ddrc $(DEVDIR)/hid_gtk3 $(DEVDIR)/hid_remote $(DEVDIR)/mods3
+	$(SCCBOX) $(HOW) alien_formats/*.txt $(DEVDIR)/alien_formats/
+	$(SCCBOX) $(HOW) ddrc/*.txt $(DEVDIR)/ddrc/
+	$(SCCBOX) $(HOW) hid_gtk3/*.html hid_gtk3/*.png $(DEVDIR)/hid_gtk3/
+	$(SCCBOX) $(HOW) hid_remote/*.html hid_remote/*.svg $(DEVDIR)/hid_remote/
+	$(SCCBOX) $(HOW) mods3/*.html mods3/*.png $(DEVDIR)/mods3/
+
+install:
+	$(MAKE) install_all HOW="install -f -d"
+
+linstall:
+	$(MAKE) install_all HOW="install -f -l -d"
+
+uninstall:
+	$(MAKE) install_all HOW="install -u"
+
+clean:
+
+distclean:
+
+
+include $(ROOT)/Makefile.conf
Index: tags/2.0.1/doc/developer/alien_formats/hyp.txt
===================================================================
--- tags/2.0.1/doc/developer/alien_formats/hyp.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/alien_formats/hyp.txt	(revision 18980)
@@ -0,0 +1,630 @@
+A serias of mails sent by Koen to Igor2:
+
+--
+
+The BOARD section comes after the header. The board section provides 
+enough information to draw the board outline.
+The BOARD section corresponds to the pcb-rnd "outline" layer. The syntax 
+looks like this:
+
+{BOARD
+  (PERIMETER_SEGMENT X1=x1 Y1=y1 X2=x2 Y2=y2)
+  (PERIMETER_ARC X1=x1 Y1=y1 X2=x2 Y2=y2 XC=xc YC=yc R=r)
+}
+
+PERIMETER_SEGMENT is a straight line from (x1, y1) to (x2, y2).
+PERIMETER_ARC is a counterclockwise circle arc (x1, y1) to (x2, y2) with 
+center (xc, yc) and radius r.
+x1, y1. x2, y2, xc, yc, and r are in the unit you chose in the UNITS 
+statement (cm or inch).
+The example above shows only two, but a BOARD section typically has many 
+PERIMETER_SEGMENT and PERIMETER_ARC statements.
+
+Test the correct orientation for the arc: counterclockwise.
+You can mix the PERIMETER_SEGMENT and PERIMETER_ARC any way you want. 
+The order does not matter. Just print one PERIMETER_SEGMENT or 
+PERIMETER_ARC per line.
+
+
+--
+
+
+The STACKUP section defines all layers, both copper and dielectric. This 
+is an example of a two-sided board:
+
+{STACKUP
+  (SIGNAL T=0.003500 L="component")
+  (DIELECTRIC T=0.160000 L="dielectric layer 1")
+  (SIGNAL T=0.003500 L="solder")
+}
+
+The above corresponds to 35um copper on 1.6mm FR4.
+
+Apart from SIGNAL and DIELECTRIC, there's a third type of copper layer, 
+PLANE, not shown here. The difference between SIGNAL and PLANE is that a 
+SIGNAL layer is empty by default, unless you draw something on it, while 
+a PLANE layer is full of copper by default. This can be used for power 
+and ground planes. 
+
+The thickness T is in cm, as that is the UNIT you chose.
+
+The STACKUP is where you can define the properties of the material. Most 
+common are the bulk resistivity of the copper (BR=), or the dielectric 
+constant of the dielectric (ER=).
+  (SIGNAL T=0.000700 BR=resistivity L="component")
+  (DIELECTRIC T=0.002000 ER=epsilon L="dielectric layer 1")
+If you don't say anything, the values default to copper on FR4, which is 
+what most people want.
+
+Look at the layer name. This is the first time we have to print a 
+string.
+Hyperlynx will accept many strings without double quotes, but if the 
+string contains characters like } or ) you may have a problem.
+To avoid these problems, always print a string between double quotes 
+("").
+eg. LAYER="Component"
+If the string contains a double quote, print two double quotes.
+e.g "This is a ""string"" with double quotes."
+
+Give all layers a name. If you don't choose a name, Hyperlynx will 
+choose a name for you, and it probably won't be what you want.
+
+--
+
+A hyperlynx file looks something like this:
+- header
+- board outline
+- stackup: definition of all layers of the board, both copper and 
+dielectric
+- devices: parts list.
+- padstack: definition of the shape of vias, pins and pads
+- net: definition of all copper. A 'net' is connected copper.
+  - straight lines
+  - arcs
+  - polygons
+  - vias: references a padstack.
+  - pins and pads: each pin or pad references a padstack and a device.
+
+  - unrouted segments
+- footer
+
+I'd split this in different functions, so that the order can be changed 
+easily if you want to re-use the code for another export module.
+
+The difference between vias, pins and pads is:
+  - a via has a hole but is not associated with a device
+  - a pin has a hole and a device
+  - a pad does not have a hole, but has a device.
+
+The first piece of code is writing the header and the footer.
+
+The header looks like this:
+
+* test.hyp exported by pcb-rnd 1.2.3 on 01.01.1999 12:45
+{VERSION=2.0}
+{DATA_MODE=DETAILED}
+{UNITS=METRIC LENGTH}
+
+A line that begins with "*" is a comment.
+
+This says you are using centimeters for coordinates and for layer 
+thickness.
+If you would prefer to export coordinates in inches, and layer thickness 
+in ounces per square foot, you could use:
+{UNITS=ENGLISH WEIGHT}
+Your choice.
+
+and the footer is:
+
+{END}
+
+If you want to, tomorrow I'll send the info for the board outline. If 
+there are any questions, just ask.
+
+--
+
+After the STACKUP section, there's the DEVICES section. The DEVICES 
+section is the parts list of the board.
+
+{DEVICES
+  (? REF="U1" NAME="BC548" L="Top")
+  (? REF="R2" NAME="1K2" L="Top")
+  ...
+}
+
+This is where we say which side of the board the component is soldered 
+on. The exact coordinates of the component are specified later, when we 
+handle the PINs and PADs.
+
+The L=layer is the layer the component is soldered on. Use the same 
+layer name as in the STACKUP section.
+
+A board needs at least one component, else there are no pins or pads to 
+connect the simulation to.
+
+--
+
+A PADSTACK section describes the pads of a pin, via or pad.
+You describe the pads of a via, pin or pad once, and refer to it 
+multiple times when creating vias, pins or pads.
+
+A padstack looks like this:
+
+{PADSTACK=name,
+  (layer, shape, x-size, y-size, angle, type)
+  ... more layers
+}
+
+where shape is 0 for circle/ellipse, 1 for square/rectangle, 2 for 
+oblong. angle is the rotation in degrees, counterclockwise.
+
+The "type" parameter is M, A, T.
+M Metal: ordinary copper pad,
+A Antipad: hole around the pad on PLANE layers,
+T Thermal: thermal relief.
+
+Thermal relief is when a pin connects to a ground plane with short, 
+stubby tracks, like spokes on a wheel. This makes the pin easier to 
+solder. If you simply connect the pin to a solid copper  polygon it is 
+difficult to solder, because the direct connection to a big copper 
+surface copper cools the pin too much.
+You don't have to specify the type parameter, but it doesn't hurt.
+
+An example:
+
+{PADSTACK="pad1"
+  ("Top", 1, 0.5, 0.5, 0, M)
+}
+
+The padstack called "pad1" consists of a single pad on the "Top" layer, 
+0.5 cm square.
+
+If the padstack describes a pin or via, you have to specify the diameter 
+of the drill hole:
+
+{PADSTACK=name, diameter
+  (layer, shape, x-size, y-size, angle, type)
+  ... more layers
+}
+
+{PADSTACK="stack2", 0.2
+  ("Top", 0, 0.5, 0.5, 0, M)
+  ("Bottom", 0, 0.5, 0.5, 0, M)
+}
+
+There are two special layer names: MDEF and ADEF.
+If the layer is MDEF (without quotes) this means: size of metal pad on 
+all SIGNAL layers.
+ADEF (without quotes) means size of the hole in the copper on all PLANE 
+layers.
+Using MDEF and ADEF you can define a padstack for a via or pin which 
+will always work, even if layers are added, removed or changed in name. 
+Example:
+
+{PADSTACK="pin1", 0.2
+  (MDEF, 0, 0.5, 0.5, 0, M)
+  (ADEF, 0, 0.5, 0.5, 0, A)
+}
+
+For completeness: You could define thermal relief around a pad.
+
+  (layer, shape copper, x-size copper, y-size copper, angle copper, 
+shape thermal relief, x-size thermal relief, y-size thermal relief, 
+angle thermal relief, T)
+So a single layer may appear up to three times in the same PADSTACK: 
+once for each type (M - metal, A - antipad, T - thermal)
+
+The two padstacks to remember when exporting are the "pad1" and "pin1" 
+examples.
+
+A hyperlynx file contains multiple PADSTACK sections, one per padstack.
+
+When exporting, you have to loop over all vias, pins and pads of the 
+board twice: once when creating the padstacks, and once when creating 
+the vias, pins and pads.
+
+--
+
+The NET section specifies a network of connected copper. A NET is not 
+limited to a single layer, but may be on multiple layers.
+
+The NET section contains subsections:
+ - SEG and ARC to draw line segments and circle arcs
+ - PIN to draw component pads and pins
+ - VIA for vias
+ - POLYGON and POLYVOID to draw polygons with holes
+ - POLYLINE to draw a sequence of line segments and circle arcs
+ - USEG to draw unrouted segments
+
+Each net has a name, e.g. "VCC","CLK", "GND".
+
+{NET="I2C_SCL"
+  (SEG X1=6.500000 Y1=3.000000 X2=6.625000 Y2=3.000000 
+W=0.008333 L="Top")
+  ... other SEG, ARC, PIN, VIA, POLYGON, POLYVOID, POLYLINE, USEG 
+records ...
+}
+
+A hyperlynx file contains multiple NET sections, one per network.
+
+Next: the subsections of the NET section.
+
+--
+
+Often a copper trace is a sequence of straight lines and arcs, all of 
+the same width.
+
+If you have a sequence of line segments and arcs, all of the same net, 
+all on the same layer, all of the same width, you can draw the whole 
+trace as a POLYLINE:
+
+
+{NET=name
+  {POLYLINE L=layer W=width ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    (CURVE X1=x2 Y1=y2 X2=x3 Y2=y3 XC=xc YC=yc R=r)
+    (LINE X=x4 Y=y4)
+    ...
+  }
+...
+}
+
+integer_id is a number, which is different for each polyline (and 
+polygon).
+For integer_id, just initialize a number to 0, and increase it id++ 
+every time you draw a polyline or polygon.
+
+How is the POLYLINE above drawn?
+
+First a line from (x0, y0) to (x1, y1) on layer "layer" and width w is 
+drawn.
+Then an arc counterclockwise from (x2, y2) to (x3, y3) with center (xc, 
+yc) and radius r is drawn.
+Where the next LINE begins depends on where the CURVE ends.
+The CURVE begins where the previous segment ends.
+If (x1, y1) is the same as (x2, y2) the CURVE ends at (x3, y3) and a 
+line from (x3, y3) to (x4, y4) is drawn.
+If (x1, y1) is the same as (x3, y3) the CURVE ends at (x2, y2) and a 
+line from (x2, y2) to (x4, y4) is drawn.
+
+An example:
+
+{NET="VCC"
+  {POLYLINE L="component" W=0.1 ID=1 X=6.000000 Y=5.000000
+    (LINE X=8.000000 Y=5.000000)
+    (CURVE X1=8.000000 Y1=5.000000 X2=8.000000 Y2=5.500000 
+XC=8.000000 YC=5.250000 R=0.250000)
+    (LINE X=6.000000 Y=5.500000)
+    ...
+  }
+...
+}
+
+You can have as many LINE and CURVE substatements as you like, and in
+any order.
+
+--
+
+A trace can be defined, not by its shape, but by its delay, 
+characteristic impedance and resistance. This is the unrouted segment 
+USEG.
+
+{NET=net_name
+  (USEG X1=x1 Y1=y1 L1=layer1 X2=x2 Y2=y2 L2=layer2 
+Z=characteristic_impedance D=delay R=resistance )
+  =85
+}
+
+This unrouted segment begins on one layer L1= and end on another L2= 
+.
+
+Another way of defining a trace is by giving width, length and layer.
+The delay and characteristic impedance can be calculated from trace 
+width, trace length and the thickness and epsilon of the dielectric 
+above and below the trace.
+
+  (USEG X1=x1 Y1=y1 L1=layer1 X2=x2 Y2=y2 L2=layer2 
+ZL=trace_layer ZW=trace_width ZLEN=trace_length)
+
+This unrouted segment is a transmission line which begins on one layer 
+L1= and end on another L2= . The microstrip itself is drawn on layer 
+ZL=.
+
+This way you can simulate a trace as a lossy transmission line.
+[ Note: When simulating power supply and ground planes, which are mostly 
+copper, the simulation model is not a transmission line but its 
+two-dimensional equivalent, the transmission plane. ]
+
+--
+
+The difference between a PIN and a VIA is that a PIN belongs to a 
+device.
+
+  (VIA X=x0 Y=y0 P=padstack0)
+
+puts a via at coordinates (x0, y0) according to padstack "padstack0".
+The shape of the pads, whether the via is a through-hole via, a blind or 
+a buried via, is all defined in the padstack.
+
+Example:
+
+  (VIA X=11.750000 Y=5.250000 P="0802pad")
+
+A pin
+
+  (PIN X=x0 Y=y0 R=ref P=padstack0)
+
+puts a pin or pad at coordinates (x0, y0) according to padstack 
+"padstack0".
+The reference is of the format "device_name.pin_name". This requires 
+that "device_name" has been defined in the "DEVICES" section.
+
+Example:
+
+  (PIN X=15 Y=1 R="U1.2" P="smd04")
+
+Here U1.1 is pin "2" of device "U1". To avoid problems, it is better if 
+device and pin names do not contain the "." character.
+
+The shape of the pads, whether the pin is smd or through hole is defined 
+in the padstack.
+
+The simulation connects signal sources to the board at PINs, and 
+measures voltages at PINs.
+
+--
+
+When all else fails, you can always represent copper as a POLYGON.
+
+The POLYGON syntax is very similar to the POLYLINE syntax. Just change 
+POLYLINE into POLYGON.
+
+{NET=name
+  {POLYGON L=layer T=POUR W=width ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    (CURVE X1=x2 Y1=y2 X2=x3 Y2=y3 XC=xc YC=yc R=r)
+    (LINE X=x4 Y=y4)
+    ...
+    (LINE X=xn Y=yn)
+  }
+...
+}
+
+The difference is that a POLYGON is closed. A POLYLINE ends at the last 
+point (xn, yn).
+A POLYGON draws a line from the last point (xn, yn) back to (x0, y0).
+
+The T=POUR parameter says the inside of the polygon is filled with 
+copper.
+
+A Hyperlynx polygon has an outline of straight line segments and circle 
+arcs.
+The W=width parameter gives the line width of the outline. You can 
+make a polygon bigger this way.
+
+In the often occurring case of a polygon of only line segments, and zero 
+border width, we get:
+
+{NET=name
+...
+  {POLYGON L=layer T=POUR W=0.0 ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    ...
+    (LINE X=xn Y=yn)
+  }
+...
+}
+
+Example:
+
+{NET="VCC"
+  {POLYGON L="TOP" W=0.0 ID=1 X=9.000000 Y=6.500000
+     (LINE X=10.000000 Y=6.500000)
+     (LINE X=10.000000 Y=7.000000)
+     (LINE X=9.500000 Y=7.000000)
+     (LINE X=9.500000 Y=7.500000)
+     (LINE X=9.000000 Y=7.500000)
+     (LINE X=9.000000 Y=6.500000)
+  }
+}
+
+Do not forget that all polygons and polylines should have a different 
+ID= value.
+
+--
+
+A POLYVOID is a hole in a POLYGON. The hole itself is shaped like a 
+polygon, too. The shape of the hole is a sequence of straight lines and 
+circle arcs:
+
+{NET=name
+...
+  {POLYVOID ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    (CURVE X1=x2 Y1=y2 X2=x3 Y2=y3 XC=xc YC=yc R=r)
+    (LINE X=x4 Y=y4)
+    ...
+    (LINE X=xn Y=yn)
+  }
+...
+}
+
+The ID= value of the POLYVOID hole is the same as the ID=  value of 
+the POLYGON you want to make a hole in.
+You do not have to specify the layer of the hole, because the hole is on 
+the same layer as the polygon you make a hole in.
+
+Example:
+
+{NET="Ground"
+  {POLYGON L="component" T=POUR W=0.0 ID=3 X=9.000000 
+Y=6.500000
+     (LINE X=10.000000 Y=6.500000)
+     (LINE X=10.000000 Y=7.000000)
+     (LINE X=9.500000 Y=7.000000)
+     (LINE X=9.500000 Y=7.500000)
+     (LINE X=9.000000 Y=7.500000)
+     (LINE X=9.000000 Y=6.500000)
+  }
+  {POLYVOID ID=3 X=9.125000 Y=6.625000
+     (LINE X=9.625000 Y=6.625000)
+     (LINE X=9.625000 Y=6.875000)
+     (LINE X=9.375000 Y=6.875000)
+     (LINE X=9.375000 Y=7.125000)
+     (LINE X=9.125000 Y=7.125000)
+     (LINE X=9.125000 Y=6.625000)
+  }
+}
+
+A polygon can have several holes. Just write several POLYVOID sections.
+In practice, if you only export polygons consisting of straight lines of 
+zero width, you get the following:
+
+{NET=name
+...
+  {POLYGON L=layer T=POUR W=0.0 ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    ...
+  }
+  {POLYVOID ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    ...
+  }
+  {POLYVOID ID=integer_id X=x0 Y=y0
+    (LINE X=x1 Y=y1)
+    ...
+  }
+...
+}
+
+Where integer_id is the same for the POLYGON and its POLYVOIDs.
+
+Don't forget to end your exported file with {END}
+
+This ends the Hyperlynx exporting HOWTO.
+
+--
+
+Result (sent by Igor2 to Koen):
+
+> The STACKUP section defines all layers, both copper and dielectric. This is an example of a two-sided board:
+>
+> {STACKUP
+>  (SIGNAL T=0.003500 L="component")
+>  (DIELECTRIC T=0.160000 L="dielectric layer 1")
+>  (SIGNAL T=0.003500 L="solder")
+> }
+>
+> The above corresponds to 35um copper on 1.6mm FR4.
+
+Deviation: we don't yet store metadata like layer thickness. We are very 
+close to have it, but still don't have it, so I just hardwired these 
+default values for now.
+
+> Look at the layer name. This is the first time we have to print a string.
+> Hyperlynx will accept many strings without double quotes, but if the string contains characters like } or ) you may have a problem.
+> To avoid these problems, always print a string between double quotes ("").
+> eg. LAYER="Component"
+
+Because of io_kicad, pcb_printf() supports %mq, which gets a list of 
+characters that need quoting and a string and can decide whether quoting 
+is needed or not. So instead of quoting everything, I just configured this 
+to what seemed reasonable and we quote only what needs to be quoted.
+
+The list of characters that need quoting is specified only once; if we 
+figure there's a character left out, it's trivial to add.
+
+--
+
+> A PADSTACK section describes the pads of a pin, via or pad.
+> You describe the pads of a via, pin or pad once, and refer to it multiple times when creating vias, pins or pads.
+>
+> A padstack looks like this:
+>
+> {PADSTACK=name,
+>  (layer, shape, x-size, y-size, angle, type)
+>  ... more layers
+> }
+
+For this I had to write a pad stack hash - in pcb-rnd we don't have 
+central lib/list of geometry, each via and pin specifies its own. This pad 
+stack hash is a hyp-independent lib, I'll move it into a separate plugin 
+this week.
+
+
+>
+> where shape is 0 for circle/ellipse, 1 for square/rectangle, 2 for oblong. angle is the rotation in degrees, counterclockwise.
+
+This is on my TODO; we have more shapes, some are asymmetrical, will have 
+to figure this.
+
+> There are two special layer names: MDEF and ADEF.
+> If the layer is MDEF (without quotes) this means: size of metal pad on all SIGNAL layers.
+> ADEF (without quotes) means size of the hole in the copper on all PLANE layers.
+> Using MDEF and ADEF you can define a padstack for a via or pin which will always work, even if layers are added, removed or changed in name. Example:
+>
+> {PADSTACK="pin1", 0.2
+>  (MDEF, 0, 0.5, 0.5, 0, M)
+>  (ADEF, 0, 0.5, 0.5, 0, A)
+> }
+
+Diversion: at the moment pcb-rnd doesn't support anything else for 
+pins/vias just "same copper ring on all layers", so I used MDEF here.
+
+--
+
+> Apart from SIGNAL and DIELECTRIC, there's a third type of copper layer, PLANE, not shown here. The difference between SIGNAL and PLANE is that a SIGNAL layer is empty by default, unless you draw something on it, while a PLANE layer is full of copper by default. This can be used for power and ground planes.
+
+Diversion: pcb-rnd doesn't support negative drawn copper, so I used SIGNAL 
+and DIELECTRIC only.
+
+--
+
+> Often a copper trace is a sequence of straight lines and arcs, all of the same width.
+>
+> If you have a sequence of line segments and arcs, all of the same net, all on the same layer, all of the same width, you can draw the whole trace as a POLYLINE:
+>
+>
+> {NET=name
+>  {POLYLINE L=layer W=width ID=integer_id X=x0 Y=y0
+>    (LINE X=x1 Y=y1)
+>    (CURVE X1=x2 Y1=y2 X2=x3 Y2=y3 XC=xc YC=yc R=r)
+>    (LINE X=x4 Y=y4)
+>    ...
+>  }
+
+It's good to know; however pcb-rnd doesn't have polylines of any sort, so 
+we are not using this feature.
+
+--
+
+>
+> A trace can be defined, not by its shape, but by its delay, characteristic impedance and resistance. This is the unrouted segment USEG.
+>
+> {NET=net_name
+>  (USEG X1=x1 Y1=y1 L1=layer1 X2=x2 Y2=y2 L2=layer2 Z=characteristic_impedance D=delay R=resistance )
+>  ?
+> }
+>
+> This unrouted segment begins on one layer L1= and end on another L2= .
+
+Question: is USEG the same as rat lines in pcb-rnd? Indication of a 
+logical connection that is derived from the netlist but is not (yet) 
+realized in copper?
+
+--
+
+The netlist feature now works.
+
+We're getting there. I've run some tests, and there are some 
+conclusions:
+
+- all internal layers are called "Intern" instead of the real layer 
+names. This is a problem, because no two layer names may be the same.
+- the board is upside down
+
+The easiest way to check is by importing the 
+io_hyp/tests/test00/test00.hyp file, exporting it as hyperlynx, and 
+importing again.
+
+--
Index: tags/2.0.1/doc/developer/bisect.txt
===================================================================
--- tags/2.0.1/doc/developer/bisect.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/bisect.txt	(revision 18980)
@@ -0,0 +1,62 @@
+How to bisect
+~~~~~~~~~~~~~
+
+Because of the svn externs in src_3rd, it's not trivial to do bisecting
+manually. There is a script to automate the process.
+
+Realizing disk space is cheap but developer time is expensive, the script
+not just automates the checkout and compilation of specific revisions, it
+also saves the resulting executable in a cache so that it can be reused
+easily without a new checkout/compilation.
+
+
+1. requirements
+
+Install the usual tools required for building pcb-rnd, plus gawk, xz,
+subversion.
+
+
+2. setup
+
+cd trunk/util/bisecter
+cp bisecter.conf.in bisecter.conf
+
+edit bisecter.conf as needed (you might want to change the cache path)
+
+3. recommended process
+
+Open two shells, cd to trunk/util/bisecter on both.
+
+In the first shell, run './bisecter bisect' - this will run and
+interactive script that makes suggestions on which revisions should
+be tested.
+
+In the second shell, type './bisecter run rev args' where rev is the
+revision the script in the first shell suggested, args are arguments
+you'd pass to pcb-rnd. It will check out, compile and run pcb-rnd in
+trunk/util/bisecter. Reproduce the bug and decide if the given revision
+is broken or not. 
+
+If it is not broken, type "good"  in the first shell and press enter;
+if it is broken, type "bad" in the first shell and press enter. The
+script in the first shell will make a new suggestion.
+
+Repeat the process until the script in the first shell prints the results
+and exits.
+
+
+4. Tips and tricks
+
+You do not have to accept the suggested revision, you can pick the revision
+you test. In that case instead of a plain "good" or "bad", type "rev good"
+or "rev bad", e.g. "8663 good" or "8110 bad".
+
+List the executables available in your cache dir. Especially early in the
+bisecting process, rather find an existing cached rev to test instead of
+a new one - this will speed up the process. You can use "./bisecter near rev"
+to find cached revisions near rev.
+
+Not all revisions can be compiled - there are a few that are broken. When
+you find a broken one, try the previous or next revision until you find
+one that works.
+
Index: tags/2.0.1/doc/developer/blog_queue.txt
===================================================================
--- tags/2.0.1/doc/developer/blog_queue.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/blog_queue.txt	(revision 18980)
@@ -0,0 +1,16 @@
+Ready to blog:
+
+less urgent, almost finished:
+- braille font
+- unicode bdf bitmap dot matrix glyph insertion
+- eeschema import (needs testing?)
+- subcircuit support for outline aka edge cut layers, i.e. mousebites, outlines
+- up vs down swipe selection blog writeup
+
+pre-planned/TO-DO:
+- CJK glyph insertion dialogue
+- FidoCadJ font creation plugin
+- pcb-rnd -> MUCS export module based on existing C++ helper app
+- metafont glyph -> stroked font converter
+
+
Index: tags/2.0.1/doc/developer/bridges/index.html
===================================================================
--- tags/2.0.1/doc/developer/bridges/index.html	(nonexistent)
+++ tags/2.0.1/doc/developer/bridges/index.html	(revision 18980)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> pcb-rnd developer manual </title>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+This document has been moved to the
+<a href="../../user/09_appendix/bridges.svg">user doc</a>.
+</body>
+</html>
Index: tags/2.0.1/doc/developer/bugreport.html
===================================================================
--- tags/2.0.1/doc/developer/bugreport.html	(nonexistent)
+++ tags/2.0.1/doc/developer/bugreport.html	(revision 18980)
@@ -0,0 +1,149 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - reporting bugs </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html"> Doc </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a> & <a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline"> timeline </a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<H1> pcb-rnd - reporting bugs </H1>
+Pcb-rnd, like any other biggish piece of software, is not a free of bugs.
+When you find a bug, please report it and we will try to fix it as soon as
+possible.For reporting bugs you can use any medium you can reach us on:
+mostly IRC and email, whichever is easier for you.
+<p>
+Using the below table you can <b>optionally</b> increase the efficiency of your
+bugreport by sending enough data in the initial report that we won't need
+to ask for clarification.
+
+<table border=1 cellspacing=0>
+<tr><th>what went wrong <th> optional extra info to help debugging
+
+<tr><td>
+	0. For any report, please include
+<td>
+	what version of pcb-rnd are you using: release tarball version
+	number or the output of "svn info" in trunk/.
+
+<tr><td>
+	1. Configuration problems:
+	<ul>
+		<li> ./configure failed
+		<li> ./configure didn't find a optional package XY
+		<li> ./configure didn't do what I wanted it to do
+	<ul>
+<td>
+	include your scconfig/config.log
+
+<tr><td>
+	2. Build problems:
+	make fails
+<td>
+	<ul>
+		<li> include your scconfig/config.log
+		<li> run <tt>make clean; make >make.log 2>&amp;1</tt> ; send the resulting make.log
+	</ul>
+
+<tr><td>
+	3. Installation problems:
+	make install fails
+<td>
+	<ul>
+		<li> include your scconfig/config.log
+		<li> run <tt>make install >makei.log 2>&amp;1</tt> ; send the resulting makei.log
+		<li> if the error is not an obvious failure of an operation with a clear error
+		     message, please explain, in details, what you expected to happen
+		     (what files should have copied/linked where) and what happened instead.
+	</ul>
+
+<tr><td>
+	4. pcb-rnd doesn't find a file
+<td>
+	Please make sure you have installed pcb-rnd before running it, or if
+	you are running it from source, make sure to cd to trunk/src and
+	running it as ./pcb-rnd. Only these two ways are supported. If it still
+	fails running by one of those two, please jump to point 5.
+
+<tr><td>
+	5. pcb-rnd run time error, non-gui-related
+<td>
+	<ul>
+		<li> run pcb-rnd from the command line; append <tt> >run.log 2>&amp;1 </tt> to the command line, reproduce the error and include run.log
+		<li> if the error is not an obvious failure of an operation with a clear error
+		     message, please explain, in details, what you expected to happen
+		     and what happened instead.
+	</ul>
+
+<tr><td>
+	6. pcb-rnd run time error, gui-related
+<td>
+	<ul>
+		<li> if you are using the gtk-gl hid, please also try the gdk hid with
+		     the command line argument <tt> --gui gtk2_gdk </tt>. Please include
+		     a sentence about whether the bug affects both HIDs or is gl-only.
+		<li> even for the most obvious-looking problem, please explain, in
+		     details, what you expected to happen and what happened instead.
+	</ul>
+
+<tr><td>
+	7. pcb-rnd crashes (segfault, assertion, abortion)
+<td>
+	<ul>
+	<li> Re-run ./configure with <tt>--debug</tt> and recompile (and reinstall).
+	<li> Run pcb-rnd from gdb:
+	<li> <ul>
+			<li> if you are running the installed version: <tt> gdb pcb-rnd </tt>
+			<li> if you are running from source: <tt> cd trunk/src; gdb ./pcb-rnd </tt>
+		</ul>
+	<li> Type this in the gdb prompt: <tt>run</tt> (optionally append a space
+	and the command line arguments you would have used for starting pcb-rnd)
+	<li> reproduce the problem
+	<li> type <tt>bt</tt>, copy&paste the result and include it in the bugreport
+	<li> if the problem is reproducible, please include a description how to
+	trigger it, preferrably on an empty board on a fresh start, alternatively
+	with an example file included
+	</ul>
+	<font size=-1>
+	Altnerative method with core dumps:
+	<ul>
+		<li> <tt>./configure --debug</tt>
+		<li> <tt>ulimit -c unlimited</tt>
+		<li> on Linux, check your core pattern (<tt>man 5 core </tt>, search for pattern; changing the core pattern requires root)
+		<li> in src/ run ./pcb-rnd, trigger the bug
+		<li> in src <tt>gdb ./pcb-rnd core</tt> (<tt>core</tt> is the default core file name, you may have a different name depending on the core pattern, see above)
+	</ul>
+	If you are on MacOSX, you may need to use lldb instead of gdb: <tt>lldb --core /cores/core.52381</tt>
+	and the backtrace command is <tt>bt all</tt> instead od just <tt>bt</tt>.
+	</font>
+
+<tr><td>
+	8. pcb-rnd can't load my file
+<td>
+	Please include the file in your bugreport
+
+<tr><td>
+	9. pcb-rnd loads my file but it doesn't look good
+<td>
+	Please include the file in your bugreport; please include a screenshot
+	of the file (even open in another software) to demonstrate how it
+	should look and a screenshot how it looked in pcb-rnd; please mark
+	the difference visually.
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/c89.html
===================================================================
--- tags/2.0.1/doc/developer/c89.html	(nonexistent)
+++ tags/2.0.1/doc/developer/c89.html	(revision 18980)
@@ -0,0 +1,12 @@
+<html>
+<body>
+<h1> pcb-rnd - C89 </h1>
+
+Most of the code base is written in C89, with a few exceptions
+written in C99 (gtk, because it's not C89-compatible). When adding
+new code, keep it C89. Especially watch out for these:
+<ul>
+	<li> comment: always use /* */, never //
+	<li> don't mix variable declaration with code - open a new {} block, which will also scope your new variables, or better yet, split up the function into smaller, static functions, the compiler will inline them anyway
+	<li> try to avoid vararg macros, use vararg functions instead
+</ul>
Index: tags/2.0.1/doc/developer/data.html
===================================================================
--- tags/2.0.1/doc/developer/data.html	(nonexistent)
+++ tags/2.0.1/doc/developer/data.html	(revision 18980)
@@ -0,0 +1,214 @@
+<html>
+<body>
+
+<h1> pcb-rnd internals </h1>
+
+<h2> concepts </h2>
+
+<p>
+Convention: typedef'd types are called pcb_*_t - the corresponding struct
+is pcb_*_s.
+
+<h3> board </h3>
+<p>
+There is only one board being edited. A board is the model of the whole world
+for pcb-rnd - any other, auxiliary data is only a partial description of a board.
+The data struct for board is <i>pcb_board_t</i>. As of now, pcb-rnd edits only one
+board at a time, and it is stored in a global variable called <i>PCB</i>.
+The code is single threaded and is not reentrant.
+<p>
+Half of the board structure describes global board properties:
+<ul>
+	<li> layer stack
+	<li> netlist
+	<li> editor settings (e.g. routing styles, which layers are visible)
+	<li> metadata (such as name of the author, size of the board).
+</ul>
+The other half is the actual board data, stored in a <i>pcb_data_t</i> field.
+<p>
+Relevant structs, variables and functions are in board.[ch].
+
+<h3> data </h3>
+<p>
+A <i>pcb_data_t</i> contains everything to describe the 2d geometry of
+an existing board:
+<ul>
+	<li> per-layer objects (lines, arcs, polygons, text objects)
+	<li> global objects (subcircuits, padstacks)
+	<li> temporary logical connections (rat lines)
+	<li> padstack prototypes (padstack shapes referenced by padstack references/instances)
+</ul>
+<p>
+Relevant structs, variables and functions are in data.[ch].
+<p>
+However, it does not contain the layer stackup, but references to it.
+This means a data_t can be copied or moved from within one board to
+another, even with mismatching layer stack. When a pcb_data_t is within a
+pcb_board_t, the layer references are fixed, pointing to actual layers
+within the board's layer stack (e.g. "layer 3 in the stack"). Such a layer is
+also called a <i>real</i> layer. When a
+pcb_data_t is used outside of a board (e.g. as a buffer), a generalized,
+recipe-like layer description is used (e.g. "second copper layer counted
+from the top"). Such a layer is not a <i>real</i> layer, but can be <i>bound</i>
+to a real layer. The binding means that while it keeps it's recipe-like
+description, it is also referring to an actual layer of the stack of the
+current PCB structure. (This happens to subcircuits: they are specified
+with generalized, recipe-like layers that are bound to the board's layer stack
+once the subcircuit is placed on the board.)
+
+<h3> buffers </h3>
+<p>
+Paste buffers are <i>pcb_buffer_t</i>; the main field is <i>pcb_data_t</i>.
+<p>
+Relevant structs, variables and functions are in buffer.[ch].
+<p>
+A paste buffer doesn't have a layer stack. When data is copied from a board
+to a buffer, the layer references are generalized.
+
+<h3> terminology: layers and layer groups</h3>
+<p>
+<i>Layers</i> are abstract canvases also serving as a logical grouping
+of drawing primitives. Every <i>layer</i> is part of exactly one <i>layer
+group</i>. A <i>layer group</i> is close to what a physical layer is on
+the FR4.
+<p>
+Limitations:
+<ul>
+	<li> as of now pcb-rnd does not have Z-coordinate: layers have no thickness;
+	<li> substrate is not represented at all in the layers stack.
+</ul>
+<p>
+The location of a <i>layer group</i> on of (flags are in layer.h):
+<ul>
+	<li> top (component) side - PCB_LYT_TOP
+	<li> bottom (solder) side - PCB_LYT_BOTTOM
+	<li> inner or internal (e.g. signal) - PCB_LYT_INTERN
+	<li> global (affects all locations, e.g. the outline layer for routing) - 0
+</ul>
+<p>
+In pcb-rnd most layer types are fully explicit:
+<ul>
+	<li> copper - PCB_LYT_COPPER (not composite)
+	<li> silk screen - PCB_LYT_SILK
+	<li> mask - PCB_LYT_MASK
+	<li> paste - PCB_LYT_PASTE
+	<li> outline - PCB_LYT_OUTLINE (not composite)
+</ul>
+<p>
+The layers of a composite layer group are combined + and -, depending
+on the PCB_LYC_SUB in their comb field.
+<p>
+Assumptions: there are two silk layers, one for the top and one for the bottom
+side and there are always a top and a bottom copper layer. (Long term
+assumptions will be removed.) The outline layer has to be global.
+<p>
+The rest of the layers are virtual layers, often just GUI hacks, e.g.:
+<ul>
+	<li> Subcircuit dashed outline, subcricuit parts - no layer struct, calculated on-the-fly from the subc list
+	<li> fab - no layer struct, calculated on-the-fly from drill/hole data
+</ul>
+
+<h3> pcb_data_t: global data </h3>
+<p>
+Global data affect all layers. The most trivial example is
+<i>padstack</i>: it has a hole and potentially a copper ring on all
+layers. A padstack
+directly under the board's pcb_data_t is considered a "via" (by convention,
+by purpose), a padstack under subcircuit's pcb_data_t is usually a "pin"
+or "pad" (when has a term ID) or a "via". The quoted terms don't exist
+in the code, they are just conventions. Padtsacks are vertical constructions,
+they may affect multiple layers.
+<p>
+The other global object is subcircuit; using its own layer list, it potentially
+can affect all layers of the board. The children objects of a subcircuit is
+a pcb_data_t, which allows arbitrary (loop-free) recursion in data.
+
+<h3> pcb_data_t: layer-local data </h3>
+<p>
+The data struct has a <i>pcb_layer_t</i> for each logical layer, to host
+the per layer objects (drawing primitives).
+
+<h3> the layer struct </h3>
+<p>
+Layer data is stored in struct <i>pcb_layer_t</i>. A layer has a list
+for each object type (drawing primitive type): arcs, lines, polygons, etc.
+These lists are local: in a tree of subcircuits, the layer list contains only
+what's strictly directly on the given layer, there's no recursion.
+<p>
+Relevant structs, variables and functions are in layer.[ch].
+
+<h2> map </h2>
+<img src="data1.png">
+
+
+<h2> tree </h2>
+<p>
+A tree can be built using subcircuits. The top level is always a board or
+a buffer, which are essentially just different wrappers around pcb_data_t.
+Then pcb_data_t can host subcircuits in it global data. A subcircuit
+is also just a 3rd kind of wrapper around a pcb_data_t, which means it
+opens a new level of the tree.
+<p>
+When we will start supporting subc-in-sunc this means the root is:
+<ul>
+	<li> a PCB board: pcb_board_t
+	<li> a paste buffer: pcb_buffer_t
+</ul>
+<p>
+(When the user opens a subcircuit for editing, the root is still a pcb_board_t,
+it just has a field that tells it is a fake board for a single subc. Still
+the real subc to edit is in the fake board's pcb_data_t. This is needed so
+we have all the global states stored in pcb_baord_t.)
+<p>
+Then the next levels are arbitrary encapsulation of subcircuits.
+
+
+<h2> list vs. rtree </h2>
+<p>
+Each level of pcb_data_t has its own lists storing the local objects.
+<p>
+The root of the tree also ha an rtrees for each object type. An rtree is
+a spatial data structure that provides efficient coordinate lookups. All objects,
+recursively, are added in these rtrees. That means, if there's a line on the
+board, that's really a line stored on a pcb_layer_t's list, and the
+full tree path is somehting like this:
+<pre>
+	pcb_board_t -> pcb_data_t -> pcb_layer_t -> linelist_t
+</pre>
+<p>
+The same line is also added in the same layer's rtree (called line_tree for lines):
+<pre>
+	pcb_board_t -> pcb_data_t -> pcb_layer_t -> pcb_rtree_t
+</pre>
+<p>
+On subsequent levels, the list is the same. If a line is part of
+a subcircuit, it's sitting on one of the linelists on one of the bound
+layers provided by the subc:
+<pre>
+	pcb_board_t -> pcb_data_t -> pcb_subclist_t -> pcb_data_t -> pcb_layer_t -> pcb_linelist_t
+</pre>
+<p>
+The subcircuit's pcb_layer_t would also have an rtree. But instead of having
+it's own rtree, it's rather linked to the root's rtree. Which means any access
+to any rtree under a subc is really access to the corresponding rtree of the root!
+In other words, <b>object lists are level-local, but rtrees are tree-global</b>.
+<p>
+This also means as a programmer, you can alsways do two kind of searches or
+iterations:
+<ul>
+	<li> level-local (only linear iteration is possible)
+	<li> global (both linear iteration and efficient, bounding box based, geometrical rtree lookups are possible)
+</ul>
+<p>
+Rationale: this way if we need to look up what's on a specific coord
+(e.g. the user clicks or find.c needs to check what is connected to a given
+point), we can use the global rtree's and we will get the answers without having
+to recurse into subcircuits.
+<p>
+Note: layer bindings complicate this a bit. A subc layer is bound to one of
+the root's real layers. When that binding is created, the rtrees are also
+linked together, and all subc layer objects on the given layer are added
+in the common rtree. When the layer binding needs to change, that means
+we first need to unbind the subcircuit's bound layer from the root's real
+layer: when we do that, we need to unlink the rtrees <b>and</b> remove all
+the objects we added to the global tree from our subcircuit layer.
Index: tags/2.0.1/doc/developer/data1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/data1.png
===================================================================
--- tags/2.0.1/doc/developer/data1.png	(nonexistent)
+++ tags/2.0.1/doc/developer/data1.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/data1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/ddrc/examples1.txt
===================================================================
--- tags/2.0.1/doc/developer/ddrc/examples1.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/ddrc/examples1.txt	(revision 18980)
@@ -0,0 +1,54 @@
+# Example 1: Sensitive RF elements should be close
+#
+# e1 is the list of elements that have the user tag RF
+# e2 is a copy of e1; it's needed to get two loops (e1 vs. e2 objects form pairs)
+# Assert that any two components are closer than 25 mm to each other
+
+rule sensitive RF elements
+	let e1 (type(@, element)) && (@.a.group == "RF")
+	let e2 e1
+	assert (distance(e1, e2) < 25 mm)
+
+# Example 2: matched trace lengths on dram data 0
+#
+# e1 is the list of dram traces
+# e2 is a copy of e1 (see Example 1)
+# Assert that any two net lengths are matched within 2 mm
+
+rule matched length dram traces
+	let e1 (type(@, net)) && (@.a.group == "dram_data_0")
+	let e2 e1
+	assert abs(netlen(e1) - netlen(e2)) < 2 mm
+
+# Example 3: check if isolation gap is maintained between any HV and LV nets
+# (Lazy: assume any copper is part of a network, compare net-to-net only)
+#
+# hv  is the list of high voltage nets
+# lv  is a list of non-hv networks
+#
+
+rule isolation gap 1
+	let hv  (type(@, net)) && (@.a.high_voltage)
+	let lv  (type(@, net)) && !(@.a.high_voltage)
+	assert !is_closer(lv, hv, 4 mm) 
+
+# Example 4: check if isolation gap is maintained between any HV and LV nets
+# (Proper way: do not forget about copper not part of any network!)
+#
+# hv  is the list of high voltage nets
+# hvo is a list of all objects found in hv
+# cp  is a list of all copper object
+# There are two iterators in the assert: cp (all copper objects) and hv.
+# For each hv and cp pair:
+#   - lcomplement returns a cp object if the cp object is not in hv (i.e.
+#     the object is low voltage); else the return value is empty and is_closer
+#     returns invalid which is not a violation
+#   - hvo is required because cp is an object while hv is a list of nets
+#     (so cp is never on the hv list)
+#   - if there was a valid (low voltage) cp object found, 
+
+rule isolation gap 2
+	let hv  (type(@, net)) && (@.a.high_voltage)
+	let hvo lobjs(hv)
+	let cp  (type(@, copper))
+	assert !is_closer(lcomplement(cp, hvo), hv, 4 mm) 
Index: tags/2.0.1/doc/developer/ddrc/proposal1.txt
===================================================================
--- tags/2.0.1/doc/developer/ddrc/proposal1.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/ddrc/proposal1.txt	(revision 18980)
@@ -0,0 +1,242 @@
+Dynamic DRC proposal 1: a Declarative DRC language.
+
+P0  A DRC program is an unordered list of rules. Rules are evaluated and
+    violations reported. The advantage of a declarative language is that
+    intermediate results can be cached and reused.
+
+P1  The language is intended to be human readable and human writable, but
+    the main goal is to let programs and scripts (e.g. netlisters) to
+    generate it.
+
+P2  A rule consists of three parts:
+     - the rule keyword; syntax: rule NAME
+     - build variables (lists) using search statements
+     - state assertions about those lists.
+     - comments, empty lines
+
+P3  Variables are named by the user and are local to the rule (TODO)
+
+P4  Lists are ordered.
+
+P5  A list is consists of zero or more objects. An object is:
+P6   - the board
+P7   - a layer
+P8   - a board drawing primitive (line, arc, polygon, via, text)
+P9   - an element primitive (element line, element arc(?), pin, pad, element name)
+P10  - an element as a whole
+P11  - a net
+P61  - a 2D coordinate with or without layer information
+
+P12 Objects have named properties (or fields):
+P13  - core attributes: for each object type a predefined set of key=value
+       pairs that always exist (e.g. thickness of a line, start angle of
+       an arc); these field names starts with "p."
+P14  - user attributes: free-form key=value pairs optionally assigned by
+       the user; these field names start with "a."
+
+P15 Note: the language is case sensitive with keywords and builtins using
+    lowercase only. For better readability, in syntax description in this
+    document uppercase words are user chosen identifiers or fields. Whitespace
+    character sequences are usually treated as a single whitespace. (This
+    does not mean identifiers have to be uppercase in a program.)
+
+    The syntax of a search statement is:
+
+P16   let LISTNAME EXPR
+
+P17 It creates a list called LISTNAME and evaluates expression EXPR to all
+    available objects and adds the objects that match EXPR to the list. Each
+    matching object is added only once. The particular order of objects on
+    the list is random. Object "matches EXPR" when the EXPR evaluated on
+    the object yields true.
+
+P18 The current object used in the iteration during the search is called
+    @.
+
+P19 An expression returns a value. A value can be:
+P20   - an object
+P21   - a list
+P22   - scalar: a number or string (might be suffixed, like "42 mm")
+P23   - void (empty, also known as false)
+
+P23 A value is considered true if:
+P24  - it is an existing object
+P25  - it is a non-empty list
+P26  - it is a non-zero number or non-empty string
+P69  - it is a valid coordinate
+
+    An expression is one of:
+
+    syntax                      meaning
+    ----------------------------------------------------------------
+P27 (EXPR)                      change precedence
+P28 EXPR || EXPR                logical OR (result: number)
+P29 EXPR && EXPR                logical AND (result: number)
+P30 EXPR + EXPR                 add (number only)
+P31 EXPR - EXPR                 subtract (number only)
+P32 EXPR * EXPR                 multiply or ... (number only)
+P32 EXPR / EXPR                 multiply or ... (number only)
+P32 EXPR == EXPR                the two values are equal
+P33 EXPR != EXPR                the two values are not equal
+P71 EXPR ~ string               regex match left EXPR using pattern right string
+P34 EXPR > EXPR                 left EXPR is greater than right EXPR (number only)
+P35 EXPR >= EXPR                left EXPR is greater than or equal to right EXPR (number only)
+P36 EXPR < EXPR                 left EXPR is less than right EXPR (number only)
+P37 EXPR <= EXPR                left EXPR is less than or equal to right EXPR (number only)
+P38 !EXPR                       logical NOT (result: number, 0 or 1)
+P39 FUNC(EXPR, EXPR, ...)       call a function with 0 or more arguments
+P40 EXPR.field                  evaluated to the value of an object field (see P45, P46)
+
+    The syntax of an assertion is:
+
+P41   assert EXPR
+
+P42 If the EXPR in an assert evaluates to false, a DRC violation is generated.
+
+P43 If an assert EXPR is a list anywhere else than in a function argument, it is
+    evaluated for all valid members of the list (see P45, P46). For example
+    if there is a variable called FOO, which is a list of objects
+    (built using a search statement), expression
+
+      FOO.p.thickness
+
+    is evaluated as many times as many objects are on the list, and the
+    full assert is checked each case. If there is another similar list
+    called BAR, an expression:
+
+     (FOO.p.thickness < BAR.p.thickness)
+
+    will compare each possible pair of FOO and BAR objects. That is, if
+    FOO has 4 objects and BAR has 15 objects, that is 4*15 = 60 comparisons.
+
+P44 However, each list is iterated only once, even if it is referenced multiple
+    times in the same expression. For example, with the above lists:
+
+    (FOO.p.clearance > 10 mil) && (FOO.p.thickness < BAR.p.thickness)
+
+    the potential number of iterations is still 4*15, and not 4*4*15. In
+    practice the engine leverages lazy evaluation so if FOO.p.clearance
+    is smaller than 10 mil, the right size is not evaluated. See also: P45, P46.
+
+P45 A field reference is valid if the field exists. For example a line object
+    has a thickness attribute, thus the .p.thickness is valid, but a polygon
+    object does not have a thickness and .p.thickness on a polygon is invalid.
+    An user attribute reference (e.g. field .a.baz) is valid if the attribute
+    key exists in the given object.
+
+P46 Invalid fields are skipped in iterations. Thus if variable BLOBB is a list
+    that consists of 3 line, 2 arc and a layer objects, the following assert
+    will result in 2 comparisons only:
+
+      (BLOBB.p.width >= 10 mm)
+
+    (because only arc objects have valid .p.width field).
+
+P47. An invalid field in an expression is never considered an
+     error. In an assert statement it causes skipping an iteration. In a
+     search statement it evaluates to void.
+
+P48. A void value is never equal to anything. A void value is not equal
+     even to another void value.
+
+P49. Comments are lines starting with #
+
+
+     BUILTIN FUNCTIONS
+
+P70 list(LISTNAME)
+    Within an expression, a reference to a list may become an iterator and
+    refer to a single object. In case the expression needs the list, the
+    list() function protects LISTNAME from becoming an iterator. For
+    example llen(list(@)) is the number of all objects the design consists.
+
+P50 llen(EXPR)
+    Returns to the number of items of a list (an integer number >= 0).
+
+P51 lvalid(EXPR, field)
+    Returns a list of items on the list for which field is valid.
+    EXPR can be a list or an object.
+
+P52 lunion(EXPR1, EXPR2)
+    A new list is created; items of EXPR1 are copied to the new list in order.
+    Those items from EXPR2 that are not on the list already are appended,
+    keeping their order. The new list is returned.
+
+    Both EXPR1 and EXPR2 can be either a list or an object.
+
+    Note: order of arguments does matter (affects order of objects on the
+    resulting list).
+
+P53 lintersect(EXPR1, EXPR2)
+    A new list is created; items that are present on both EXPR1 and EXPR2
+    are copied onto the new list. The new list is returned.
+
+    Both EXPR1 and EXPR2 can be either a list or an object.
+
+    Note 1: this function can be used as "is this object on the list" query:
+    list_intersection(LIST, OBJ) will result an empty list (which means false)
+    if OBJ is not on the list.
+
+    Note 2: similarly, if both argument are objects, the result is false
+    if the two arguments are not the same object.
+
+P54 lcomplement(EXPR1, EXPR2)
+    Creates a new list with all items that are present in EXPR1 but not in
+    EXPR2. The new list is returned.
+
+    Both EXPR1 and EXPR2 can be either a list or an object.
+
+
+P55 ldiff(EXPR1, EXPR2)
+    Creates a new list with all items that are present either in EXPR1 or in
+    EXPR2 but not in both. The new list is returned.
+
+
+P56 distance(EXPR1, EXPR2)
+    Calculates the shortest distance between two objects. Returns a number.
+
+    Note: if any expression is a layer, the stack distance is calculated
+    (which will be 0 for now, as pcb-rnd doesn't yet know about layer thickness).
+    If the expression is a net, the whole shape of the net is used
+    (expensive! use is_closer() instead)
+    If the expression is the board, the operation is invalid (see P46).
+
+P57 is_closer(EXPR1, EXPR2, NUMBER)
+    Checks if EXPR1 and EXPR2 are closer to each-other than NUMBER. It uses
+    the classic bloat-and-find algorithm originally used by the classic DRC,
+    thus it is much cheaper than distance(EXPR1, EXPR2) < NUMBER.
+
+P58 netlen(EXPR)
+    Network length of EXRP1: sum of all non-overlapping trace/arc lengths that
+    make up a network; polygons are approximated with their average diameter
+    (TODO). If EXPR is an object, its length is returned.
+
+P59 netobjs(EXPR)
+    Creates and returns a list of objects consists of a net.
+
+P60 type(EXPR, TYPENAME)
+    EXPR is an object. Returns the object if it's type matches TYPENAME, else
+    returns void (a.k.a. false). This call is useful to decide whether an
+    object is of a specific type. TYPENAME is one of:
+     - drawing primitive type: arc, line, polygon, text, via, element
+     - element primitive type: element_line, element_name, pin, pad
+     - misc type: layer, net
+     - meta-type, or a group:
+       - copper: primitive that results in copper (arc, line, polygon, text (on copper), via, pin, pad)
+       - drilled: anything that drills the board (via, pin)
+
+P62 gridup(EXPR, NUM1, NUM2)
+    If expression is an object, return a list of coordinates that are on
+    the object, evenly spaced:
+P63  - for lines and arcs, the points are evenly spaced on the centerlane with
+        a gap of NUM1, starting from both endpoints, having the corner case in
+        the middle; if NUM2 is 0, the gap at the middle may be larger than NUM1,
+        else it may be smaller than NUM1.
+P64  - for polygons take a grid of NUM1*NUM2 spacing (NUM1 is always axis
+       aligned to X, NUM2 to Y). The offset of the grid is unspecified
+P65  - element and text are ignored
+P66  - a pad or pin is approximated with a polygon
+P67  - for networks, iterate over all objects and append unique coordinates on
+       the resulting list
+P68 There's no guarantee on the particular order of the list.
+
Index: tags/2.0.1/doc/developer/ddrc/requirements.txt
===================================================================
--- tags/2.0.1/doc/developer/ddrc/requirements.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/ddrc/requirements.txt	(revision 18980)
@@ -0,0 +1,23 @@
+The Dynamic DRC should be able to solve at least these tasks:
+	- check start grounding
+	- require element placement on same layer 
+		- specify element proximity to each other on same layer
+		- specify element proximity to the edge
+		- specify element proximity to network or other copper feature
+		on the same layer
+	- perform copper vs. copper checks
+		- minimal gap between an object or network and anything else
+		- minimal gap between high voltage and low voltage networks
+	- perform copper geometry checks
+		- detect minimal width (high current)
+		- detect poly hairpin
+		- number and length of stubs (hight freq)
+		- "via cage": a given network needs to be surrounded by a set of gnd vias
+	- network related copper checks
+		- matched length lines (e.g. fast dram bus)
+		- balanced transmission line (distance between the tracks)
+		- match and/or limit number of vias
+		- limit layer usage
+		- require layer stackup properties, e.g. microstrip, stripline
+			- e.g. require ground poly on the next layer
+			- e.g. number of gaps in the ground poly the line jumps
Index: tags/2.0.1/doc/developer/distros.txt
===================================================================
--- tags/2.0.1/doc/developer/distros.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/distros.txt	(revision 18980)
@@ -0,0 +1,47 @@
+How to request packaging (distros sorted by popularity, 2016):
+
+Ubuntu:
+	easiest is to get in Debian, Ubuntu picks up packages from sid
+	alternative: ubuntu-devel-discuss@lists.ubuntu.com (pending)
+	alternative: https://bugs.launchpad.net/ubuntu/+filebug?no-redirect&field.tag=needs-packaging
+
+linux mint
+	https://blueprints.launchpad.net/linuxmint
+	(same maintainer as debian?)
+
+slackware:
+	Promised (AFK, ask again in 3rd week of sept)
+	geda/pcb maintainer: pfeifer[dot]felix[at]googlemail[dot]com (sent mail)
+	https://slackbuilds.org/guidelines/
+	needs an existing package
+	<MLanden> since the slackbuild needs slackware's pkgtools usually at the end of a ./configure --prefix=/usr --extrastuff..make.. make install DESTDIR=/tmp/NAMEOFPACKAGE..cd /tmp/NAMEOFPACKAGE..makepkg -l y -c n ../NAMEOFPACKAGE-123.txz
+	installwatch can build a package
+	check out #slackbuilds
+
+Debian:
+	Bdale?
+	(alternative: pkg-electronics-devel@lists.alioth.debian.org - pending)
+	(alternative: RFP through reportbug)
+
+fedora:
+	https://fedoraproject.org/wiki/Package_maintainers_wishlist?rd=PackageMaintainers/WishList
+	(wrote mail to cicku)
+
+OpenSuse:
+	adrian [at] suse.de (mail sent)
+
+Arch:
+	DONE! needs to be modularized
+	Kyle Keen <keenerd [at] gmail.com> (mail sent)
+
+Manjaro:
+	Same as arch
+
+----
+FreeBSD:
+	hrs [at] freebsd.org (Hiroki Sato - mail sent)
+
+OpenBSD:
+	andreas.bihlmaier [at] gmx.de -> ENOTIME, he suggests ports@openbsd.org
+
+
Index: tags/2.0.1/doc/developer/fungw_actions.txt
===================================================================
--- tags/2.0.1/doc/developer/fungw_actions.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/fungw_actions.txt	(revision 18980)
@@ -0,0 +1,129 @@
+Actions implemented as fungw functions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Intro
+
+All pcb-rnd actions are fungw functions by now. This helps the code to do
+all the data type conversions easier, save a few conversions where we
+don't need conversions. More importantly, this makes a more seamless
+integration between user scripts and C code, whether scripts are calling
+C actions or the user is executing script defined actions.
+
+To stay compatible with the old action mechanism, the current version
+applies the following restrictions:
+
+- we have only one large fungw object (pcb_fgw_obj) that hosts all
+  functions; this emulates the old central hash of functions
+
+- before a function enters the object or a function is looked up in the
+  object, the function name is converted to lowercase; this emulates the
+  case intensity of the old action system, which is still essential for
+  the user interface (GUI or CLI command entry and menu).
+
+- temporarily, for the transition, there are two helper macros
+  PCB_OLD_ACT_BEGIN and PCB_OLD_ACT_END that can wrap old function
+  code, converting all arguments to a char **argv. Such old actions
+  should return non-zero on error, while the value of ores will always be
+  FGW_INT/0. New action code shall NOT use the compatibility API.
+
+- a single action call will result in a single fungw function call; that
+  is, the fungw function that serves the action is free to convert any
+  of the arguments.
+
+2. converting arguments
+
+Arguments are normally converted using PCB_ACT_CONVARG(); the last
+argument is a statement that can make the value assignment to a local
+variable if the conversion was succesful. For example fetching the 2nd
+argument into a local coord:
+
+{
+	pcb_coord_t c;
+	PCB_ACT_CONVARG(2, FGW_COORD, ActioName, c = fgw_coord(&argv[2]));
+}
+
+If conversion fails or the argument is not available, the macro returns
+from the function with error. Anoter variant of the macro called
+PCB_ACT_MAY_CONVARG() omits the error-return part, allowing the code
+to have optional arguments.
+
+When the coordinate conversion needs to keep extra info, e.g. whether
+the coordinate was specified in absolute or relative, the special type
+fgw_coords_t shall be used:
+
+{
+	fgw_coords_t *crd;
+	PCB_ACT_CONVARG(1, FGW_COORDS, d1, crd = fgw_coords(&argv[1]));
+}
+
+
+3. returning
+
+An action function has two return values: the C function return value
+and the "res" argument. If the action could not start executing code
+because of a calling error, e.g. there are not enough arguments or
+arguments can not be converted or the function is invoked out-of-context,
+it should retrun a fungw error using the C return value. This indicates
+that performing the call itself failed.
+
+Else, if actual action code runs, the C return value should be 0 and the
+res argument should be loaded with the return value of the action. This
+indicates that the call took place, the action was executed and the conclusion
+is stored in res. The semantic of the result is action-specifiec. The common
+convention is returning int, 0 meaning success. The shortnad for this:
+
+{
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+PCB_ACT_IRES() loads res with type and value. There are other similar,
+type-specific macros available.
+
+4. multi-call
+
+Currently pcb-rnd does not depend on fungw's multi-call, thus actions are
+free to convert their arguments - the same arguments will not be reused in
+other actions.
+
+5. calling an action from another action
+
+There are two common cases: wrapping/dispatching and invoking.
+
+In the wrap/dispatch setup an outer action is called that does not alter
+the arguments (not even converting them!), but has to call another action
+with exactly the same arguments. This can be done by using the macro
+PCB_ACT_CALL_C().
+
+When an action code needs to invoke another action, there are three ways
+doing it.
+
+5.1. string call
+
+The slow, string parsing way using pcb_actionl() or the more
+efficient direct call.
+
+
+5.2. direct C call
+
+Direct C function call is possible only if both the caller and callee
+actions are in core, or are in the same plugin. Before the direct call
+the caller needs to set up a fungw argv array and after the call the
+array members need to be free'd using fgw_argv_free() to avoid
+leaking argument memory. This needs to be done even if the caller did
+not allocate any memory for argv members - the callee can allocate memory
+by converting arguments.
+
+5.3. indirect C call
+
+Call pcb_find_action() to get an fgw_func_t * to the action - this holds
+the C function pointer. Set up argv, make sure argv[0] is set up to be
+the target function:
+
+  fgw_func_t *fn = pcb_find_action(...);
+  argv[0].type = FGW_FUNC;
+  argv[0].val.func = fn;
+
+Call pcb_actionv_() with fn and the arguments. Always call fgw_argv_free()
+afterward. Also call fgw_arg_free() on the res.
+
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk2-edit_route_styles_001.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk2-edit_route_styles_001.png
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/gtk2-edit_route_styles_001.png	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/gtk2-edit_route_styles_001.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/hid_gtk3/gtk2-edit_route_styles_001.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk2-pcb-rnd_001.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk2-pcb-rnd_001.png
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/gtk2-pcb-rnd_001.png	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/gtk2-pcb-rnd_001.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/hid_gtk3/gtk2-pcb-rnd_001.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk_hid_architecture.html
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/gtk_hid_architecture.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/gtk_hid_architecture.html	(revision 18980)
@@ -0,0 +1,336 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>GTK HID architecture</title>
+</head>
+<body >
+<div id="header">
+<h1>GTK HID architecture</h1>
+<div >
+<span id="author" >Alain, Igor2</span><br>
+</div>
+<div id="content">
+<div >
+<h2 id="_situation_code_pcb_rnd_code_v1_2_1">Situation @ <code>pcb-rnd</code> v1.2.1</h2>
+<div >
+<div >
+<p>The HIDs are plug-ins, sitting in <code>src_plugins/hid_*</code> ; GTK2 one is called <code>hid_gtk</code>.</p>
+</div>
+<div >
+<p>First, get an instance of the main HID structure <code>pcb_hid_t</code>.
+This structure is general enough. Nothing too entangled to GTK2 nor GTK3 there.</p>
+</div>
+<div >
+<div >
+<pre ><code  >pcb_hid_t pcb_gui = pcb_hid_find_gui ()</code></pre>
+</div>
+</div>
+<div >
+<p>Q: How GTK HID is initialized ?</p>
+</div>
+<div >
+<p>A: <code>hid_hid_gtk_init ()</code> in <code>&lt;hid_gtk/gtkhid-main.c&gt;</code></p>
+</div>
+<div >
+<p>The GUI seems to start building from <code>ghid_do_export ()</code></p>
+</div>
+<div >
+<p>There are 2 big structures for GTK2 GUI:</p>
+</div>
+<div >
+<div >
+<pre ><code  >GhidGui _ghidgui, *ghidgui = &amp;_ghidgui;
+
+GHidPort ghid_port, *gport;</code></pre>
+</div>
+</div>
+<div >
+<p>GTK3 compatibility within these 2 structures:</p>
+</div>
+<table >
+<caption >Table 1. <code>GhidGui</code> structure study (portion)</caption>
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th >Type</th>
+<th >GTK3 compatible</th>
+<th >GTK3 replacement</th>
+<th >GTK2 compatible ?</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td ><p >GtkWidget</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ></td>
+<td ></td>
+</tr>
+<tr>
+<td ><p >GtkObject</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GObject</p></td>
+<td ><p >could be</p></td>
+</tr>
+<tr>
+<td ><p >GdkPixmap</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GdkPixbuf</p></td>
+<td ><p >could be</p></td>
+</tr>
+<tr>
+<td ><p >GtkAction</p></td>
+<td ><p >deprecated</p></td>
+<td ><p >GAction (gio)</p></td>
+<td ><p >could be (not desired)</p></td>
+</tr>
+<tr>
+<td ><p >GtkActionGroup</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GActionGroup</p></td>
+<td ><p ><span ><i ></i></span> (not desired)</p></td>
+</tr>
+<tr>
+<td ><p >GtkEntry</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ></td>
+<td ></td>
+</tr>
+<tr>
+<td ><p >GTimeVal</p></td>
+<td ><p ><span ><i ></i></span> (glib)</p></td>
+<td ></td>
+<td ></td>
+</tr>
+</tbody>
+</table>
+<table >
+<caption >Table 2. <code>GHidPort</code> structure study (portion)</caption>
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th >Type</th>
+<th >GTK+3 compatible</th>
+<th >GTK+3 replacement</th>
+<th >GTK+2 compatible ?</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td ><p >GtkWidget</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ></td>
+<td ></td>
+</tr>
+<tr>
+<td ><p >GdkPixmap</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GdkPixbuf</p></td>
+<td ><p >could be</p></td>
+</tr>
+<tr>
+<td ><p >GdkDrawable</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >Cairo surface</p></td>
+<td ><p ><span ><i ></i></span> (not desired)</p></td>
+</tr>
+<tr>
+<td ><p >GdkColor</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GdkRGBA</p></td>
+<td ><p ><span ><i ></i></span><sup>1</sup></p></td>
+</tr>
+<tr>
+<td ><p >GdkColormap</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >GdkVisual</p></td>
+<td ><p ><span ><i ></i></span><sup>1</sup></p></td>
+</tr>
+</tbody>
+</table>
+<div >
+<p><sup>1</sup> An abstracted structure was envisioned, but abandoned due to scarce use of color objects.</p>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_drawing_primitives_using_gdkx">Drawing primitives using GDKx</h2>
+<div >
+<div >
+<h3 id="_gdk2">GDK2</h3>
+<div >
+<p><code>pcb-rnd</code> v1.2.1 is using <code>gdk_draw</code> functions, on an already abstracted
+<code>pcb_hid_t</code> intance of <code>hid_gc_s</code> structure.</p>
+</div>
+<table >
+<caption >Table 3. <code>hid_gc_s</code> structure study (portion)</caption>
+<colgroup>
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+<col style="width: 25%;">
+</colgroup>
+<thead>
+<tr>
+<th >Type</th>
+<th >GTK+3 compatible</th>
+<th >GTK+3 replacement</th>
+<th >GTK+2 compatible ?</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td ><p >GdkGC</p></td>
+<td ><p ><span ><i ></i></span></p></td>
+<td ><p >Cairo context</p></td>
+<td ><p >could be (not desired)</p></td>
+</tr>
+</tbody>
+</table>
+<div >
+<p>Indirectly, a <code>GdkGC</code> needs a <code>GdkDrawable</code> which is also deprecated in GTK3.
+A good replacement is a <code>GdkWindow</code>. Unfortunately <code>pcb-rnd</code> is making more use
+of deprecated <code>GdkPixmap</code> objects than <code>GdkWindow</code>.</p>
+</div>
+<div >
+<p><code>gdk_draw_line</code> has been deprecated since GTK+ 2.22. Use <code>cairo_line_to</code>
+ and <code>cairo_stroke</code> instead. <code>gdk_gc_new</code> has been deprecated since GTK+ 2.22.
+ Use Cairo for rendering.</p>
+</div>
+<div >
+<p>Cairo API needs a context:</p>
+</div>
+<div >
+<div >
+<pre ><code  >cairo_line_to (cairo_t *cr,
+               double x,
+               double y);
+cairo_t *
+cairo_create (cairo_surface_t *target);</code></pre>
+</div>
+</div>
+<div >
+<p>and then pops-up the <strong>Cairo Surface</strong> !</p>
+</div>
+<div >
+<p>A <code>cairo_surface_t</code> represents an image, either as the destination of a
+drawing operation or as source when drawing onto another surface.</p>
+</div>
+<div >
+<p>GDK does not wrap the cairo API, instead it allows to create cairo contexts
+which can be used to draw on <code>GdkWindow</code>. Additional functions allow use
+<code>GdkRectangles</code> with cairo and to use <code>GdkColors</code>, <code>GdkRGBAs</code>, <code>GdkPixbufs</code>
+and <code>GdkWindows</code> as sources for drawing operations.</p>
+</div>
+</div>
+<div >
+<h3 id="_gdk3">GDK3</h3>
+
+</div>
+<div >
+<h3 id="_cairo_interaction">Cairo Interaction</h3>
+<div >
+<p>Cairo is a graphics library that supports vector graphics and image compositing
+that can be used with GDK. GTK+ does all of its drawing using cairo.
+But I guess, it is also the case with late GDK2 !</p>
+</div>
+</div>
+<div >
+<h3 id="_open_gl">Open GL</h3>
+<div >
+<p><code>GdkGLContext</code> is an object representing the platform-specific OpenGL drawing context.</p>
+</div>
+</div>
+<div >
+<h3 id="_very_modern_gdk3">Very modern GDK3</h3>
+<div >
+<p><code>GdkDrawingContext</code> is an object that represents the current drawing state of a <code>GdkWindow</code>.
+It's possible to use a <code>GdkDrawingContext</code> to draw on a <code>GdkWindow</code> via
+rendering API like Cairo or OpenGL.</p>
+</div>
+<div >
+<p>Since: 3.22</p>
+</div>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_plans_for_code_pcb_rnd_code_v1_2_2">Plans for <code>pcb-rnd</code> v1.2.2 ?</h2>
+<div >
+<div >
+<ol >
+<li>
+<p>What we must have:</p>
+<div >
+<ol  type="a">
+<li>
+<p>the old gtk2 HID, with pixmaps and all the existing obsolete code - for
+existing/old systems. We won't remove or change this, there's absolutely
+no reason to risk running on older systems. We probably won't remove
+it in any time soon, because some people love to run real OLD systems.</p>
+</li>
+<li>
+<p>whichever gtk HID with <strong>gl</strong> rendering; let's say <em>gtk2+gl</em>, because gtk2 is
+what we have working today. This seems to be real appealing for many users.</p>
+</li>
+</ol>
+</div>
+</li>
+<li>
+<p><a id="future"></a> What extras we could have and totally makes sense:</p>
+<div >
+<ol  type="a">
+<li>
+<p>the new, gtk3 HID, with Cairo for sw rendering, because as far as
+I understand there's no other option for sw rendering in gtk3</p>
+</li>
+<li>
+<p>the new, gtk3 HID with <strong>gl</strong> rendering</p>
+</li>
+</ol>
+</div>
+</li>
+<li>
+<p>What we could temporarily have, if it helped us on our way to <a href="#future">previous</a>:</p>
+<div >
+<ol  type="a">
+<li>
+<p>a temporary, hidden, development <em>gtk2+cairo</em> implementation so
+that cairo can be done in something that's already there before
+gtk3 happens. This must not interfere with the gdk/pixmap implementation.
+This must not remain for long in the repo, and must be converted into
+the <em>gtk3+cairo</em> hid ASAP.</p>
+</li>
+</ol>
+</div>
+</li>
+<li>
+<p>What we shouldn't have because it doesn't make much sense but increases the
+confusion and development/maintainance costs:</p>
+<div >
+<ol  type="a">
+<li>
+<p>a permanent, advertised gtk2+cairo HID. gtk2 works perfectly fine with
+existing installation and the existing code. Cairo can only add slowdown
+to this and introduces new build risks. Old systems don't need cairo to work.
+New systems will have gtk3 sooner or layer anyway. Other than a few "obsolete"
+marks in the manual, there's absolutely no issue with a <em>gtk2+pixmap</em>.</p>
+</li>
+</ol>
+</div>
+</li>
+</ol>
+</div>
+</div>
+</div>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_gtk3/gtk_preferences_dialog.html
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/gtk_preferences_dialog.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/gtk_preferences_dialog.html	(revision 18980)
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>GTK "Preferences Dialog"</title>
+</head>
+<body >
+<div id="header">
+<h1>GTK "Preferences Dialog"</h1>
+<div >
+<span id="author" >Alain</span><br>
+</div>
+<div id="content">
+<div >
+<h2 id="_requirements">Requirements</h2>
+<div >
+<div >
+<ul>
+<li>
+<p>The window should fit 800x600 screen configurations.</p>
+</li>
+<li>
+<p>The preferences should be consistent troughout the dialog, honored and refreshed.</p>
+</li>
+<li>
+<p>All preferences types should be "bug free" !</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_current_implementation">Current implementation</h2>
+<div >
+<div >
+<h3 id="_size">Size</h3>
+<div >
+<p>Size requested: 780x550. Realized so far : 780x591</p>
+</div>
+<div >
+<p>There is a "dynamic area" in <code>Config PoV</code> where all the widgets needed to edit
+different data types are created, but then, only displayed</p>
+</div>
+<div >
+<p>GTK realizes all those widgets, which is taking a lot of Y space, while
+during real user interaction, only a few widgets are displayed, minimising the
+required Y space. I tried to connect a <code>realize</code> signal to recalculate
+the widget size, but does not seem to work :(</p>
+</div>
+</div>
+<div >
+<h3 id="_jump_on_code_save_code">Jump on <code>Save</code></h3>
+<div >
+<p>In <code>User PoV</code>, when clicking on <code>Save in config</code> ?? (else too ?) there is an ugly workaround:</p>
+</div>
+<div >
+<p>The whole preferences dialog was designed to be built up once, with all
+values copied from core to GTK then copied back from GTK to core on dialog close.
+This means if any value is updated on the fly, it's not trivial to make sure the
+gtk mirror is updated.</p>
+</div>
+<div >
+<p>As a workaround, we just force it in a state that the tabs need to be re-created.</p>
+</div>
+<div >
+<p>This is not nice, but the real fix would be very expensive. The config system
+is strong on this, it supports calling back functions on config value changes,
+so it would be easy to get the conf system to notify the gtk code when the
+change happens. But on the GTK side we don't have any infra or code for this.
+And a partial solution wouldn't help - if we wanted to do this, we'd need to
+do this for all values, including the tricky ones (prio lists even in the config pov section).
+Would take weeks or even months to get it right. Not sure it is worth the effort.</p>
+</div>
+<div >
+<p>So, on save, the dialog is destroyed and recreated, jumping at the same tab in
+the tree view. This has some bugs. FIXME them !</p>
+</div>
+<div >
+<p>On the other hand, there could be yet another workaround on this: we could
+remember what tree node was open when we triggered this, and then after the
+rebuild, we could just open that again. Go Alain !</p>
+</div>
+</div>
+<div >
+<h3 id="_problems_with_some_types">Problems with some types</h3>
+<div >
+<ul>
+<li>
+<p>increments</p>
+</li>
+<li>
+<p>layers</p>
+</li>
+<li>
+<p>groups</p>
+</li>
+</ul>
+</div>
+</div>
+<div >
+<h3 id="_code_explanation">Code explanation</h3>
+<div >
+<p><code>static GtkWidget *config_window;</code></p>
+</div>
+<div >
+<p>is the total dialog window.</p>
+</div>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_todo">TODO</h2>
+<div >
+
+</div>
+</div>
+</div>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_gtk3/includes_directives.html
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/includes_directives.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/includes_directives.html	(revision 18980)
@@ -0,0 +1,80 @@
+<html>
+<body>
+
+<h1> Some coding rule-of-thumbs in pcb-rnd </h1>
+
+<h2> When writing .h files </h2>
+
+<p><b>Rule 1</b>
+
+ Look at the .h file only (ingore any .c); #include everything you need in that given file,
+ directly, to let the compiler understands the structures and function
+ protoypes used there.
+
+<p><b>Rule 2</b>
+
+ Don't be afraid to have redundant #includes (e.g. "a.h is including b.h and
+ c.h while b.h also includes c.h). See also: rule 1 and rule 4.
+
+<p><b>Rule 3</b>
+
+ Circular #include: a.h includes b.h which in turn includes a.h - it is
+ fine, just make sure typedefs and structs are available in the right order
+ (relative to the #include).
+
+<p><b>Rule 4</b>
+
+ Frame your .h code with the usual watchdig #define's as needed:
+
+<pre>
+#ifdef  PCB_FILEA_H
+#define PCB_FILEA_H
+
+the code
+
+#endif  /* PCB_FILEA_H */
+</pre>
+
+<p><b>Rule 6</b>
+
+ Use pcb_ or PCB prefixing. E.g. in gtk plugins, PCB_GTK?? according to following table:
+
+<table>
+<tr><th>Directory        <th>Prefix
+<tr><td>lib_gtk_common   <td>PCB_GTK_
+<tr><td>lib_gtk_config   <td>PCB_GTK_
+<tr><td>hid_gtk          <td>PCB_GTK2_
+<tr><td>hid_gtk3         <td>PCB_GTK3_
+</table>
+
+<h2> In .c files </h2>
+
+<p><b>Rule 1</b>
+
+ Always #include "config.h", and make it the first include (put it
+ before even &lt;stdlib&gt;). This is an essential mechanism for portability.
+
+<p><b>Rule 2</b>
+
+ Source a.c must include it's own header (if there is one), e.g.
+ #include "a.h". This is required to get warnings if API in the header
+ starts to diverge from the implementation.
+
+<p><b>Rule 3</b>
+
+ Look at the .c file only (ingore any .h); #include everything you need in that given file
+ directly. Don't depend on random header files would include what the .c file
+ needs as a side effect - the only exception is the own API definition header
+ of the .c file.
+ <p>
+ Header rules 2 and 3 from above also apply.
+
+<p><b>Rule 4</b>
+
+ Please do not remove obj_*.h in favor of obj_all.h - obj_all.h is a
+ temporary construct that will be gone. Do not invent such convenient
+ "include all whatever headers" just to reduce the number of includes.
+ Always incldue what you need directly.
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_gtk3/index.html
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/index.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/index.html	(revision 18980)
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>GTK{2 | 3 | 4} GUI related topics</title>
+</head>
+<body >
+<div id="header">
+<h1>GTK{2 | 3 | 4} GUI related topics</h1>
+<div >
+<span id="author" >Alain</span><br>
+</div>
+<div id="toc" >
+<div id="toctitle">Table of Contents</div>
+<ul >
+<li><a href="#_custom_widgets">Custom widgets</a></li>
+<li><a href="#_dialogs">Dialogs</a></li>
+<li><a href="#_gtk4_new_design">GTK4 new design ?</a></li>
+<li><a href="#_developer_tips">Developer tips</a></li>
+</ul>
+</div>
+</div>
+<div id="content">
+<div id="preamble">
+<div >
+<div >
+<ul>
+<li>
+<p>My understanding/roadmap for <a href="gtk_hid_architecture.html">GTKx HID architecture</a>.</p>
+<div >
+<ul>
+<li>
+<p>GTK3 using <code>cairo</code> back-end versus GDK</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Menus, Actions
+The configurable menus system needs to be kept.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_custom_widgets">Custom widgets</h2>
+<div >
+<div >
+<ul>
+<li>
+<p><a href="route_style.html">Route styles</a> dialog + widget. Concepts</p>
+</li>
+<li>
+<p>Preview widget</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_dialogs">Dialogs</h2>
+<div >
+<div >
+<ul>
+<li>
+<p><a href="gtk_preferences_dialog.html">Preferences Dialog</a></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_gtk4_new_design">GTK4 new design ?</h2>
+<div >
+
+</div>
+</div>
+<div >
+<h2 id="_developer_tips">Developer tips</h2>
+<div >
+<div >
+<ul>
+<li>
+<p><code>#include</code> directives <a href="includes_directives.html">policy</a>.</p>
+</li>
+<li>
+<p>./configure --debug, then: valgrind --track-origins=yes -v ./pcb-rnd 2&gt;Valg.log</p>
+</li>
+<li>
+<p>Policy about copyrights ?</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_gtk3/init_sequence.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: tags/2.0.1/doc/developer/hid_gtk3/init_sequence.png
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/init_sequence.png	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/init_sequence.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/hid_gtk3/init_sequence.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Index: tags/2.0.1/doc/developer/hid_gtk3/route_style.html
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/route_style.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/route_style.html	(revision 18980)
@@ -0,0 +1,290 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>Route style GUI design</title>
+</head>
+<body >
+<div id="header">
+<h1>Route style GUI design</h1>
+<div >
+<span id="author" >Alain</span><br>
+</div>
+<div id="content">
+<div >
+<h2 id="_abstract">Abstract</h2>
+<div >
+<div >
+<p>This document is a WIP, working document, mixture of many sources of documentation
+linked to the <a href="#img-gtk2_gui">Route Style</a> GUI part, as presented to the user.</p>
+</div>
+<div >
+<p>PCB means PCB/gEDA, or mainline, <code>pcb-rnd</code> is the primary focus for this WIP.</p>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_introduction">1. Introduction</h2>
+<div >
+<div >
+<h3 id="_what_is_a_route_style">1.1. What is a Route Style</h3>
+<div >
+<p>The <code><span ><span >Edit</span> / <span >Route Styles</span></span></code> menu allows you to select a style which is a group
+of line thickness, via diameter, via drill size, and clearance (keepaway)
+(collectively called a <em>routing style</em>) to be copied to the <em>active</em> sizes.
+You can also change the names given to the routing styles and adjust their
+values from <code><span ><span >Edit</span> / <span >Route Styles</span> / <span >Edit</span></span></code> menu.</p>
+</div>
+<div >
+<p>The active sizes are also adjustable from this menu (How ?).
+The active sizes are shown in the status-line and control the initial size of
+new vias, drilling holes, lines, clearances, text-objects and also
+the maximum dimensions of the board layout.</p>
+</div>
+<div >
+<p>A routing style can be attributed to a net. (How ?, How am I sure all the
+nets/lines/tracks are affected to the selected routing style ?)</p>
+</div>
+</div>
+<div >
+<h3 id="_using_the_autorouter">1.2. Using the autorouter</h3>
+<div >
+<p>Do we still have the autorouter ? Is what is described next working elsewhere ?</p>
+</div>
+<div >
+<p>Use routing styles in the netlist to have per-net routing styles.
+Note that the routing style will be used for an entire net.
+This means if you have a wide metal setting for a power net you will need to
+manually route breakouts from any fine pitch parts on their power pins because
+the router will not be able to change to a narrow trace to connect to the part.</p>
+</div>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_design_intentions">2. Design intentions</h2>
+<div >
+<div >
+<h3 id="__code_pcb_rnd_code_goals">2.1. <code>pcb-rnd</code> goals</h3>
+<div >
+<ul>
+<li>
+<p>Alleviate the limitation of 4 only different route styles.</p>
+</li>
+<li>
+<p>Keep track of "current" route style</p>
+</li>
+</ul>
+</div>
+</div>
+<div >
+<h3 id="__code_pcb_rnd_code_implementation_prior_1_2_1">2.2. <code>pcb-rnd</code> implementation prior 1.2.1</h3>
+<div >
+<p>A radio-button area + extra <a href="#img-gtk2-edit_route">dialog</a></p>
+</div>
+<div >
+<h4 id="_add_a_new_route_style">2.2.1. Add a new route style</h4>
+<div >
+<p>This is ensured via the <code>&lt;New&gt;</code> selection</p>
+</div>
+<div id="img-gtk2-edit_route" >
+<div >
+<img src="gtk2-edit_route_styles_001.png" alt="gtk2 edit route styles 001">
+</div>
+<div >Figure 1. Edit route styles dialog</div>
+</div>
+<div >
+<p>Q: No <code>Add</code> button: historical reasons. The original code in mainline
+has 4 route styles, hardwired. It can not remove styles.
+We inherited the mechanism of adding style by selecting the <code>&lt;New&gt;</code>.
+(In mainline if you add styles more than 4, they are lost on save).</p>
+</div>
+<div >
+<p>The inherited code tries not to do modifications immediately but only when
+you close the window. This is a common pattern in the gtk hid at the
+moment: all data from core copied to some "hid_gtk-specific" mirror cache
+for the dialog, then the dialog works on the cache and it is copied back
+when you close the dialog.</p>
+</div>
+<div >
+<p>Igor2 thinks the idea was that the dialogs are modal and if the user says
+cancel, you just don't do the copy-back. It's a lot of extra code and complication.
+The strange &lt;new style&gt; mechanism might be a result of this: the dialog-cache
+is probably not smart enough to hold multiple new styles, but with
+the current mechanism you can add only one new style until you close the dialog.</p>
+</div>
+</div>
+<div >
+<h4 id="_keep_track_of_current_route_style">2.2.2. Keep track of current route style</h4>
+<div >
+<p>This is ensured via the <code>&lt;custom&gt;</code> selection in <a href="#img-gtk2-edit_route">dialog</a>.</p>
+</div>
+<div >
+<p>At the end you are not drawing with the selected style, you are drawing
+with a pen. When you change style, all parameters of the style
+are copied into the pen. However, you can change any parameter of
+the pen with hotkeys, which means you can easily end up drawing with a pen
+that does not match any of the currently existing styles.</p>
+</div>
+<div >
+<p>Mainline has this too, it's all inherited.</p>
+</div>
+<div >
+<p>Using such a custom pen is useful when you want to draw a
+single net of some special geometry - it is not worth adding a
+new style, but you may still want to set the temporary pen up properly.</p>
+</div>
+<div >
+<p>The problem was that when you used such a custom pen, you didn't really
+have a way to see your current setting and besides the <code>add +5 mils</code> kind of
+hotkeys, you couldn't really set it up, e.g.
+"I want 80 mil wide traces temporarily"
+was hard to do. So I introduced the <code>&lt;current&gt;</code> style, which shows the current
+settings of the pen so it is not hidden anymore.</p>
+</div>
+<div >
+<table>
+<tr>
+<td >
+<i  title="Note"></i>
+</td>
+<td >
+Lapsus here from Igor, who really means &lt;current&gt;. I suggest to rename it &lt;current&gt; ??
+</td>
+</tr>
+</table>
+</div>
+<div >
+<p>This way you can see and change all parameters of the pen, without having to
+create a new style or having to use CLI actions.</p>
+</div>
+<div >
+<p>Igor2 definitely wants to keep <code>&lt;custom&gt;</code> in the gtk2 hid, wants to add it in the
+lesstif hid and wants all new GUI hids to support it the same way.</p>
+</div>
+<div >
+<p><code>&lt;current&gt;</code> mode is indicated by not selecting any style (no radio button selected).
+As long as your pen matches any of the existing style, you are drawing with
+that style and the style is marked in the radio button.
+When you change your pen to something that doesn't match any existing style,
+the radio button turns off.</p>
+</div>
+<div >
+<p>This is by design, Igor2 likes it, miloh, with whom we coded it likes it too.
+Please do not change this.</p>
+</div>
+<div >
+<p>PCB Mainline does the same, except:</p>
+</div>
+<div >
+<ul>
+<li>
+<p>you can't see or modify the numeric fields of the <code>&lt;custom&gt;</code> style
+directly (only modification possible is via hotkeys)</p>
+</li>
+<li>
+<p>you can't explicitly switch to the <code>&lt;custom&gt;</code> style (you need to make a
+hotkey-modification of the pen)</p>
+</li>
+</ul>
+</div>
+<div >
+<p>But the pen concept exists there too: press <span ><kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>V</kbd></span>, it will change
+the via drill size of the pen. This will result in a pen not matching
+any existing style - radio button selection disappears.</p>
+</div>
+</div>
+</div>
+<div >
+<h3 id="_pcb">2.3. PCB</h3>
+<div >
+<p>mainline has no explicit &lt;custom&gt;, no delete button and has the hardwired number of 4 styles.</p>
+</div>
+</div>
+<div >
+<div >
+<h2 id="_gtk2_situation">3. GTK2 situation</h2>
+<div >
+<div >
+<h3 id="_user_manual">3.1. User manual</h3>
+<div >
+<p>Document this part. Most of the info are above. Select and create a section.
+See FIXME.</p>
+</div>
+<div >
+<p>Especially, document <code>Attributes</code></p>
+</div>
+<div >
+<ul>
+<li>
+<p>what for ?</p>
+</li>
+<li>
+<p>expected key, values ?</p>
+</li>
+<li>
+<p>format ? units ?</p>
+</li>
+</ul>
+</div>
+<div id="img-gtk2_gui" >
+<div >
+<img src="gtk2-pcb-rnd_001.png" alt="gtk2 pcb rnd 001">
+</div>
+<div >Figure 2. <code>pcb-rnd</code> on an empty design, with Edit Route Style dialog open</div>
+</div>
+<div >
+<table>
+<tr>
+<td >
+<i  title="Important"></i>
+</td>
+<td >
+Where is <code>saved "as default"</code> ? Documentation here ?
+</td>
+</tr>
+</table>
+</div>
+</div>
+<div >
+<h3 id="_short_term_improvements">3.2. Short-term improvements ?</h3>
+<div >
+<p>This seems to be low priority w.r.t. cairo and GTK3... Am I right ?</p>
+</div>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_gtk3_design_proposal">4. GTK3 design proposal</h2>
+<div >
+<div >
+<p>TODO: A mock-up (screenshot)</p>
+</div>
+<div >
+<p>A <code>GtkTreeView</code>, allowing the direct rename of style, allow sorting, or drag
+and drop the styles to change order.</p>
+</div>
+<div >
+<p>Can be selected (highlighted) to show the active route style.</p>
+</div>
+<div >
+<p><code>GtkButtonBox</code> with usual buttons : Add, Delete, Raise, Down</p>
+</div>
+<div >
+<p>Still another dialog is needed for other infos</p>
+</div>
+</div>
+</div>
+<div >
+<h2 id="_gtk2_retro_fit">5. GTK2 retro-fit ?</h2>
+<div >
+<div >
+<p>If so, then trade for a less advanced GtkTreeView</p>
+</div>
+<div >
+<p><code>GtkHButtonBox</code> i.s.o <code>GtkButtonBox</code>.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_gtk3/src/Makefile
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/src/Makefile	(revision 18980)
@@ -0,0 +1,4 @@
+
+../init_sequence.png: init_sequence.dot
+	dot -Tpng -o../init_sequence.png init_sequence.dot
+
Index: tags/2.0.1/doc/developer/hid_gtk3/src/init_sequence.dot
===================================================================
--- tags/2.0.1/doc/developer/hid_gtk3/src/init_sequence.dot	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_gtk3/src/init_sequence.dot	(revision 18980)
@@ -0,0 +1,33 @@
+digraph G
+{
+  node [shape=rect];
+
+  n_parse_arguments     [shape=record, label="<f0>\<main.c:517\> | pcb_gui-\>parse_arguments() | <f2>gtk3_cairo_parse_arguments()"];
+  n_do_export           [shape=record, label="<f0>\<main.c574\> | pcb_gui-\>do_export() | <f2>gtkhid_do_export()"];
+  n_create_pcb_widgets  [label="ghid_create_pcb_widgets()\n<src_plugins/lib_gtk_common/dlg_topwin.c>"];
+  n_build_top_window    [label="ghid_build_pcb_top_window()"];
+  n_drawing_area_new    [label="gtk_drawing_area_new()"];
+
+  "main() <src/main.c>" -> n_parse_arguments:f0;
+  n_parse_arguments:f0  -> n_do_export:f0 [weight=10];
+  n_do_export:f2        -> n_create_pcb_widgets;
+  n_create_pcb_widgets  -> n_build_top_window;
+  n_build_top_window    -> n_drawing_area_new;
+  n_drawing_area_new    -> drawing_area;
+
+  n_parse_arguments:f2 -> n_gtkhid_parse_arguments;
+  subgraph gtk3_cairo_parse_arguments {
+    n_gtkhid_parse_arguments  [label="gtkhid_parse_arguments()\n<src_plugins/lib_gtk_hid/glue_hid.c:209>"];
+    n_init_renderer           [shape=record, label="<f0>ghidgui-\>common.init_renderer | ghid_cairo_init_renderer()"];
+    n_init_top_window         [label="gport->top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);"]
+
+    n_gtkhid_parse_arguments -> n_init_renderer:f0;
+    n_gtkhid_parse_arguments -> n_init_top_window;
+    n_init_renderer -> "render_priv = g_new0(render_priv_t, 1);"
+  }
+  
+  subgraph drawing_area {
+    drawing_area -> "ghid_cairo_drawing_area_expose_cb()";
+    drawing_area -> "ghid_cairo_preview_expose()";
+  }
+}
Index: tags/2.0.1/doc/developer/hid_remote/Makefile
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/Makefile	(revision 18980)
@@ -0,0 +1,9 @@
+proto_parse.svg: proto_parse.dot fixlab.sh
+	./fixlab.sh < proto_parse.dot > .proto_parse.dot
+	dot -Tsvg .proto_parse.dot > proto_parse.svg
+
+
+proto_parse.png: proto_parse.dot fixlab.sh
+	./fixlab.sh < proto_parse.dot > .proto_parse.dot
+	dot -Tpng .proto_parse.dot > proto_parse.png
+
Index: tags/2.0.1/doc/developer/hid_remote/fixlab.sh
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/fixlab.sh	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/fixlab.sh	(revision 18980)
@@ -0,0 +1,43 @@
+#!/bin/sh
+awk '
+($2 == "->") {
+
+	if (NF > 3) {
+		attr=$0
+		if (!(attr ~ "[[]"))
+			attr = attr "[]"
+	}
+	else
+		attr = "[]"
+
+	tmp = "lbl" (++lbl)
+	if (attr ~ "label")
+		extra_label=""
+	else
+		extra_label="label=\"\""
+
+	tmp_attr = attr
+	attr1=attr
+	attr2=attr
+
+	if (extra_label == "")
+		sub("^[^[]*[[]", "[style=filled fillcolor=\"#fefefe\" shape=plaintext ", tmp_attr)
+	else {
+#		tmp_attr = "[fixedsize=true width=0 shape=plaintext " extra_label "]"
+		print $0
+		next
+	}
+
+	sub("^[^[]*[[]", "[", attr1)
+	sub("^[^[]*[[]", "[", attr2)
+	sub("label=\".*\"", "", attr1)
+	sub("label=\".*\"", "", attr2)
+	sub("[[]", "[arrowhead=none ", attr1)
+
+	print tmp, tmp_attr
+	print $1, "->", tmp, attr1
+	print tmp, "->", $3, attr2
+	next
+}
+{ print $0 }
+'
\ No newline at end of file

Property changes on: tags/2.0.1/doc/developer/hid_remote/fixlab.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/developer/hid_remote/proto_high.html
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/proto_high.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/proto_high.html	(revision 18980)
@@ -0,0 +1,236 @@
+<html>
+<body>
+<H1> remote HID protocol, high level </H1>
+
+<H2> reference </H2>
+
+<h3> ver(protver) </h3>
+Sends the protocol version the server will speak. If the client doesn't
+support that version, it should break the connection.
+<p>
+Arguments:
+<ul>
+	<li> protver: an integer value; 1 for the current version
+</ul>
+
+<h3> unit(abbrev) </h3>
+Sends the coordinate unit used in subsequent communication. This is not
+necessarily the unit used for displaying values on the user interface,
+but the unit used to interpret numeric coordinate values sent in commands.
+<p>
+Arguments:
+<ul>
+	<li> abbrev: unit name abbreviation; e.g. mm or nm or mil
+</ul>
+
+<h3> ready() </h3>
+Informs the client that the server is ready to start the session. The
+client needs to answer with a Ready() message before the server proceeds.
+<p>
+Arguments: none.
+
+
+<h3> brddim(w h) </h3>
+Announce board dimensions. Some layers may extend beyond the board.
+<p>
+Arguments:
+<ul>
+	<li> w: width  (x size) in coordinate units
+	<li> h: height (y size) in coordinate units
+</ul>
+
+<h3> inval(x1 x2 y1 y2) </h3>
+Invalidate a rectangular section of the screen; the client should redraw
+this area. Clients implementing their own mechanism to keep track on
+drawing are free to ignore these requests 
+<p>
+Arguments:
+<ul>
+	<li> x1: left coordinate
+	<li> x2: right coordinate
+	<li> y1: top coordinate
+	<li> y2: bottom coordinate
+</ul>
+
+<h3> inval() </h3>
+Same as inval(x1 x2 y1 y2) but invalidates the whole screen.
+<p>
+Arguments: none
+
+<h3> newlg(name group_id flags) </h3>
+Create a new layer group.
+<p>
+Arguments:
+<ul>
+	<li> name: name of the layer group - names are <b>not</b> unique
+	<li> group_id: unique group ID (decimal integer, may be large)
+	<li> flags: a list of 3 items: location, purpose and properties. Each item is a list of values (or an empty list).
+</ul>
+<p>
+Example:
+<pre>
+newlg(topassembly 16777219 ((top) (assy) (virtual)))
+</pre>
+Creates the top assembly virtual layer with ID 16777219 with the name
+of "topassembly"
+
+<h3> newly(name layer_id group_id) </h3>
+Create a new layer within an existing layer group.
+<p>
+Arguments:
+<ul>
+	<li> name: name of the layer (can be empty, <b>not</b> unique)
+	<li> layer_id: unique ID of this layer (decimal integer, may be large)
+	<li> group_id: reference to a previously created layer group which this layer is part of
+</ul>
+<p>
+Example:
+<pre>
+newly(soldergnd 3 11)
+</pre>
+Creates a layer 3 called "soldergnd" in group 11.
+
+<h3> setlg(group_id is_empty) </h3>
+Inform the client that the next set of drawing commands are for a specific
+layer group. (Note: the reason for announcing groups and not layers:
+all layers in that group are drawn at once; visibility
+of layers within the same group are switched together.)
+<p>
+Arguments:
+<ul>
+	<li> group_id: unique ID of the layer group
+	<li> is_empty: 1 if the layer group may be empty, 0 if the layer is not empty (TODO: this bit is not 100% reliable yet)
+</ul>
+
+<h3> makeGC() </h3>
+Request the client to make a new graphical context. The client should
+allocate a GC and return an integer ID using the MadeGC(ID) message.
+The ID uniquely identifies the GC; it should be small positive integer
+(between 0 and 31 for now).
+<p>
+Arguments: none
+
+<h3> delGC(ID) </h3>
+Inform the client that a given GC is not needed anymore. The server
+will not reference the GC again and the GC can be destroyed (but graphics
+drawn on the screen should not be affected). The ID may be reused by the
+client in a subsequent madeGC() message).
+<p>
+Arguments:
+<ul>
+	<li> ID: integer ID of the GC
+</ul>
+
+<h3> clr(gci colorstring) </h3>
+Change the color subsequent drawing commands of a given GC will use.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> colorstring: name of the color, specified in the usual "web" format: #rrggbb (with 3 hex numbers)
+</ul>
+
+<h3> cap(gci style) </h3>
+Set the line ending cap style. Note: the cap extends half-line-width beyond
+the end coordinates, e.g. the end point of a line is the center of the round-cap
+circle.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> style: r for round cap (circle), s for square cap, b for beveled (octagon)
+</ul>
+
+
+<h3> linwid(gci width) </h3>
+Sets line width (pen tip diameter).
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> width: diameter of the circular aperture of the pen in coord units
+</ul>
+
+<h3> setxor(gci state) </h3>
+Sets whether to perform "xor-drawing" for subsequent drawing commands in
+the selected GC.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> xor: 0 means normal drawing, 1 means xor drawing
+</ul>
+
+
+<h3> line(gci x1 y1 x2 y2) </h3>
+Draw a line using the current GC. The line inherits line width, color
+and cap style from the GC.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> x1: 1st endpoint's X coord (in coord units)
+	<li> y1: 1st endpoint's Y coord (in coord units)
+	<li> x2: 2nd endpoint's X coord (in coord units)
+	<li> y2: 2nd endpoint's Y coord (in coord units)
+</ul>
+
+<h3> rect(gci x1 y1 x2 y2 filled) </h3>
+Draw a rectangle. The rectangle inherits only color from the GC.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> x1: 1st corner X coord (in coord units); x1 &lt;= x2
+	<li> y1: 1st corner Y coord (in coord units); y1 &lt;= y2
+	<li> x2: 2nd corner X coord (in coord units)
+	<li> y2: 2nd corner Y coord (in coord units)
+	<li> filled: 1 if the rectangle should be filled; a non-filled rectangle is a frame of 1 pixel wide lines
+</ul>
+
+
+<h3> fcirc(gci cx cy r) </h3>
+Draw a filled circle. The circle inherits only color from the GC.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> cx1: center X coord (in coord units)
+	<li> cy1: center Y coord (in coord units)
+	<li> r: radius (in coord units)
+</ul>
+
+<h3> poly(gci len ptlist) </h3>
+Draw a filled polygon. The polygon inherits only color from the GC.
+<p>
+Arguments:
+<ul>
+	<li> gci: ID of the GC
+	<li> len: number of contour points
+	<li> ptlist: an ordered list of (x y) coordinates (all in coord units)
+</ul>
+
+<h3> umask(m) </h3>
+"use mask" m. The server uses this message to make an announcement before it
+starts drawing certain things.
+<p>
+Arguments:
+<ul>
+	<li> m: mask name:
+	<ul>
+		<li> off: flush the buffer and return to non-mask operation.
+		<li> before: Polygons being drawn before clears.
+		<li> clear: Clearances being drawn.
+		<li> after: Polygons being drawn after clears.
+	</ul>
+</ul>
+
+
+<!--
+<h3> () </h3>
+<p>
+Arguments:
+<ul>
+	<li>
+</ul>
+-->
Index: tags/2.0.1/doc/developer/hid_remote/proto_low.html
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/proto_low.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/proto_low.html	(revision 18980)
@@ -0,0 +1,146 @@
+<html>
+<body>
+<H1> remote HID protocol, low level </H1>
+
+In this document <b>bold</b> words are tokens and <i>italic</i> words
+are grammatic constructs.
+<p>
+The protocol is designed with the following goals in mind:
+<ul>
+	<li> for simple/text data: compact, text format
+	<li> for simple/text data: easy to read/write manually
+	<li> for text with special characters: avoid quoting and escaping
+	<li> be able to embed binary data without having to recode it (e.g. in base64)
+	<li> to some extent be able to mix simple text and binary fields even within a single message
+	<li> predictable parsing: always know how much memory to allocate in advance
+	<li> minimalism - keep things as simple as possible
+</ul>
+
+
+<H2> Tokens </H2>
+<table border=1>
+	<tr><th> token                 <th> description
+	<tr><td> <b>(</b>              <td> start a generic list
+	<tr><td> <b>)</b>              <td> end a generic list
+	<tr><td> <b>{</b>              <td> start a binary list
+	<tr><td> <b>}</b>              <td> end a binary list
+	<tr><td> <b>space</b>          <td> element separator: space (ASCII dec 32)
+	<tr><td> <b>\n</b>             <td> message separator: newline (ASCII dec 10)
+	<tr><td> <b>text-string</b>    <td> short, alphanumeric string
+	<tr><td> <b>binary-string</b>  <td> long and/or non-alnum string
+</table>
+
+<H2> Grammar </H2>
+The communication is a pair of asynchronous message stream. The message
+format is:
+<pre>
+<b>text-string</b> <i>generic-list</i> <b>\n</b>
+or
+<b>text-string</b> <i>binary-list</i> <b>\n</b>
+or
+# comment <b>\n</b>
+</pre>
+<p>
+where text-string is a command and <i>generic-list</i> is a list and holds
+the arguments of. The command name can not start with a hash mark ('#') and
+can not be empty. The list is the argument tree of the command. 
+<p>
+As a special exception, a line may start with a hash mark ('#') to indicate
+a comment. Characters up to the first newline are ignored.
+<p>
+Optional: a tolerant parser also accepts empty lines and whitespace before
+a message.
+<p>
+The language has two type of lists: generic and binary.
+A generic list is wrapped in parenthesis <b>()</b> and its children are:
+<ul>
+ <li> <b>text-string</b>,
+ <li> <i>generic-list</i>,
+ <li> <i>binary-list</i>.
+</ul>
+A binary-list is wrapped in braces <b>{}</b> and its children are:
+<ul>
+ <li> <b>binary-string</b>,
+ <li> <i>binary-list</i>.
+</ul>
+<p>
+Any list can be empty. There's no whitespace after the opening token and
+before the closing token, so the empty generic-list and the empty binary-list
+are written as, respectively:
+<pre>
+()
+{}
+</pre>
+Subsequent fields of a list has a single <b>space</b> in between, for
+separation (this is an intentional redundancy for a <i>binary-list</i>).
+<p>
+Note: a <i>generic-list</i> can host text and binary children, but a
+</i>binary list</i> can not host only binary children. This means if a node
+of the parse tree is a binary list, the subtree will contain only binary nodes.
+<p>
+A <b>text-string</b> contains only English alphanumeric characters (A..Z, a..z,
+0..9), underscores (_), plus and minus signs (+, -) periods (.) and 
+the hash mark ('#') and is at most 16 characters long.
+<p>
+A binary string encodes the length of the payload in base64 (A..Z, a..z, +, /),
+has a '=' for separator then the payload in binary format. For example
+<pre>
+F=hello
+</pre>
+means the 5 characters long string "hello". The maximum size of the base64
+encoded length field is 5, thus the longest binary data that can be
+packed in a single field is 1 gigabyte.
+
+<H2> Examples </H2>
+
+<H3> empty-argument messages </H3>
+<pre>
+hello()\n
+foo{}\n
+</pre>
+
+<H3> single-argument messages </H3>
+Text and binary alternative for the same content:
+<pre>
+hello(world)\n
+hello{F=world}\n
+</pre>
+
+<H3> multi-argument messages </H3>
+Text and binary alternative for the same content:
+<pre>
+print(hello world !)\n
+print{E=hello F=world B=!}\n
+</pre>
+
+Note: using <b>space</b> between list items; don't space
+before the first or after the last argument. Always emit one space between
+any two list items.
+
+<H3> lists in list </H3>
+Text and binary alternatives for the same content:
+<pre>
+line((14.55 3.1) (44.2 0) 5)\n
+line({F=14.55 D=3.1} (44.2 0) 5)\n
+line((14.55 3.1) {E=44.2 B=0} 5)\n
+line({F=14.55 D=3.1} {E=44.2 B=0} 5)\n
+line{{F=14.55 D=3.1} {E=44.2 B=0} B=5}\n
+</pre>
+The subtree assumed in this fictional message is two x;y coordinate pairs
+and a line width. In other words the arguments of line is a list (start
+point), another list (end point) and a scalar (width).
+<p>
+Since all data comply to the <b>text-string</b> token format,
+the first, simplest format is recommended. The other 4 lines demonstrate all
+other valid variants. 
+<p>
+It is important to note that there are constraints (derived from
+the grammar) on choosing which list items can be encoded in binary:
+<ul>
+	<li> a <b>binary-string</b> can be only on a <i>binary-list</i>
+	<li> a <b>text-string</b> can be only on a <i>generic-list</i>
+	<li> a <b>generic-list</b> can not be only under a <i>binary-list</i>
+</ul>
+Thus if the 3rd argument, (width in this example), must be encoded as a
+<b>binary-string</b>, it will turn it's parent, line's argument list
+binary too, which in turn enforces all arguments to be binary.
Index: tags/2.0.1/doc/developer/hid_remote/proto_parse.dot
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/proto_parse.dot	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/proto_parse.dot	(revision 18980)
@@ -0,0 +1,84 @@
+digraph parse_state_macine {
+
+
+MSG [label="MSG:\nmessage lead-in\nor\nbetween\nmessages" shape=box style=filled fillcolor=yellow]
+COMMENT [label="COMMENT:\nskipping comment" shape=box style=filled fillcolor=yellow]
+CMD [label="CMD:\nparsing command name" shape=box style=filled fillcolor=yellow]
+TSTR [label="TSTR:\nparsing test string" shape=box style=filled fillcolor=yellow]
+BSTR [label="BSTR:\nparsing bin string" shape=box style=filled fillcolor=yellow]
+LIST [label="LIST:\nin list" shape=box style=filled fillcolor=yellow]
+ERROR [label="ERROR:\nbad input" shape=box style=filled fillcolor=red]
+
+######## MSG
+
+init [shape="diamond" style=filled fillcolor=yellow]
+init -> MSG
+
+msg_append [label="store 1st\ncommand char"]
+
+MSG -> COMMENT [label="input==#" color=blue]
+MSG -> MSG [label="input==\\r\\n\\t\nspace" color=blue]
+MSG -> ERROR [label="input==binary"]
+MSG -> msg_append [label="input==text"]
+msg_append -> CMD
+
+######## COMMENT
+
+COMMENT -> MSG [label="input==\\n" color=blue]
+COMMENT -> COMMENT [color=blue]
+
+
+######## CMD
+cmd_list_new [label="create new list\nmake it arg tree\nroot and current"]
+cmd_list_new -> LIST
+cmd_append [label="append a character\nto command name"]
+cmd_append -> CMD [label="command name length\nis less than 16"]
+cmd_append -> ERROR [label="command name length\nis more than 16"]
+CMD -> cmd_list_new [label="input==({"]
+CMD -> ERROR [label="input==binary"]
+CMD -> cmd_append [label="input==text"]
+
+######## LIST
+got_msg [label="message fully parsed\nexecute message"  style=filled fillcolor=cyan]
+got_msg -> MSG
+pop [label="pop:\ncurrent_list = current_list->parent"]
+pop -> got_msg [label="input=\\n\nand\ncurrent_list == NULL\n(arg root closed)"]
+pop -> ERROR [label="input!=\\n\nand\ncurrent_list == NULL\n(unbalanced parenthesis)"]
+pop -> LIST
+push [label="push:\create new list\nappend it as current's sibling\nmake it current"]
+push->LIST
+new_str [label="create a new bin or text string\nnode and append it to\nthe current list"]
+new_str -> tstr_append [label="current is generic list"]
+new_str -> bstr_append [label="current is binary list"]
+
+LIST -> pop [label="input==)}"]
+LIST -> push [label="input==({"]
+LIST -> LIST [label="input==space\n(ignore)"]
+LIST -> ERROR [label="input!=\\n and current == NULL\n(unbalanced parenthesis)"]
+LIST -> new_str [label="input==text"]
+
+######## TSTR
+str_fin [label="finish current string\n"]
+str_fin -> LIST
+str_fin_pop [label="finish current string\n"]
+str_fin_pop -> pop
+tstr_append [label="append to current string\n"]
+tstr_append -> ERROR [label="string length > 16"]
+tstr_append -> TSTR
+TSTR -> str_fin [label="input==space"]
+TSTR -> str_fin_pop [label="input==)}"]
+TSTR -> ERROR [label="input==binary"]
+TSTR -> tstr_append [label="input==text"]
+
+######## BSTR
+read_base64 [label="store next digit\nof string length"]
+read_base64 -> BSTR
+bstr_append -> BSTR
+BSTR -> read_base64 [label="before the ="]
+BSTR -> bstr_append [label="after the ="]
+BSTR -> str_fin_pop [label="last char of the string"]
+
+######## ERR
+ERROR -> ERROR [label="can't recover"]
+
+}
Index: tags/2.0.1/doc/developer/hid_remote/proto_parse.html
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/proto_parse.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/proto_parse.html	(revision 18980)
@@ -0,0 +1,38 @@
+<html>
+<body>
+Protocol parser state machine of the reference implementation:
+<img src="proto_parse.svg">
+Legend:
+<ul>
+	<li> yellow boxes are states
+	<li> blue arrows are optional features for a more tolerant parser
+	<li> round nodes are actions that shall be taken
+	<li> arrow with text: execute action or switch state if condition is true
+	<li> arrow without text: do this if no other condition is met
+</ul>
+<h3>Notes on the reference implementation </H3>
+The reference implementation builds a <b>tree of nodes</b> for the arguments.
+Each node is either a list or a text. A node has a pointer to its parent, its
+first child and its next sibling. While parsing list-of-lists, the parser
+keeps a <i>current node</i>. A new node is either added as the last sibling of
+the <i>current node</i> (new argument on a list) or as the first
+child of the <i>current node</i> (first argument of a new list when the list is
+open).
+<p>
+When a list is closed, the parent of the <i>current node</i> becomes the
+new <i>current node</i>.
+<p>
+When parsing a new message, the current node is NULL until the argument list
+is open; the new <i>current node</i> also becomes the argument tree root.
+If the argument tree root is closed, a newline shall follow, because that's
+how a message is terminated.
+<p>
+The <b>binary string</b> part of the state machine has 2 more internal
+states:
+<ul>
+	<li> a boolean indicating whether we are parsing the length or the string (before or after the '=')
+	<li> an integer string length
+</ul>
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/hid_remote/proto_parse.svg
===================================================================
--- tags/2.0.1/doc/developer/hid_remote/proto_parse.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_remote/proto_parse.svg	(revision 18980)
@@ -0,0 +1,597 @@
+<?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">
+<!-- Generated by graphviz version 2.26.3 (20100126.1600)
+ -->
+<!-- Title: parse_state_macine Pages: 1 -->
+<svg width="1900pt" height="1666pt"
+ viewBox="0.00 0.00 1900.00 1666.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 1662)">
+<title>parse_state_macine</title>
+<polygon fill="white" stroke="white" points="-4,5 -4,-1662 1897,-1662 1897,5 -4,5"/>
+<!-- MSG -->
+<g id="node1" class="node"><title>MSG</title>
+<polygon fill="yellow" stroke="black" points="261,-1585.5 135,-1585.5 135,-1492.5 261,-1492.5 261,-1585.5"/>
+<text text-anchor="middle" x="198" y="-1568.9" font-family="Times Roman,serif" font-size="14.00">MSG:</text>
+<text text-anchor="middle" x="198" y="-1551.9" font-family="Times Roman,serif" font-size="14.00">message lead&#45;in</text>
+<text text-anchor="middle" x="198" y="-1534.9" font-family="Times Roman,serif" font-size="14.00">or</text>
+<text text-anchor="middle" x="198" y="-1517.9" font-family="Times Roman,serif" font-size="14.00">between</text>
+<text text-anchor="middle" x="198" y="-1500.9" font-family="Times Roman,serif" font-size="14.00">messages</text>
+</g>
+<!-- lbl2 -->
+<g id="node11" class="node"><title>lbl2</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="125,-1453 37,-1453 37,-1417 125,-1417 125,-1453"/>
+<text text-anchor="middle" x="81" y="-1430.9" font-family="Times Roman,serif" font-size="14.00">input==#</text>
+</g>
+<!-- MSG&#45;&gt;lbl2 -->
+<g id="edge4" class="edge"><title>MSG&#45;&gt;lbl2</title>
+<path fill="none" stroke="blue" d="M145.66,-1492.48C129.962,-1478.52 113.666,-1464.04 101.361,-1453.1"/>
+</g>
+<!-- lbl3 -->
+<g id="node14" class="node"><title>lbl3</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="253,-1456 143,-1456 143,-1414 253,-1414 253,-1456"/>
+<text text-anchor="middle" x="198" y="-1439.4" font-family="Times Roman,serif" font-size="14.00">input==\r\n\t</text>
+<text text-anchor="middle" x="198" y="-1422.4" font-family="Times Roman,serif" font-size="14.00">space</text>
+</g>
+<!-- MSG&#45;&gt;lbl3 -->
+<g id="edge8" class="edge"><title>MSG&#45;&gt;lbl3</title>
+<path fill="none" stroke="blue" d="M191.283,-1492.48C191.129,-1479.82 191.512,-1466.73 192.434,-1456.24"/>
+</g>
+<!-- lbl4 -->
+<g id="node17" class="node"><title>lbl4</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="332,-328 212,-328 212,-292 332,-292 332,-328"/>
+<text text-anchor="middle" x="272" y="-305.9" font-family="Times Roman,serif" font-size="14.00">input==binary</text>
+</g>
+<!-- MSG&#45;&gt;lbl4 -->
+<g id="edge12" class="edge"><title>MSG&#45;&gt;lbl4</title>
+<path fill="none" stroke="black" d="M240.148,-1492.37C248.51,-1481.11 256.418,-1468.65 262,-1456 281.673,-1411.41 281,-1396.74 281,-1348 281,-1348 281,-1348 281,-490 281,-430.707 276.068,-360.565 273.506,-328.125"/>
+</g>
+<!-- lbl5 -->
+<g id="node20" class="node"><title>lbl5</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="445,-1453 341,-1453 341,-1417 445,-1417 445,-1453"/>
+<text text-anchor="middle" x="393" y="-1430.9" font-family="Times Roman,serif" font-size="14.00">input==text</text>
+</g>
+<!-- MSG&#45;&gt;lbl5 -->
+<g id="edge16" class="edge"><title>MSG&#45;&gt;lbl5</title>
+<path fill="none" stroke="black" d="M261.042,-1505.38C293.645,-1487.99 332.147,-1467.45 359.12,-1453.07"/>
+</g>
+<!-- COMMENT -->
+<g id="node2" class="node"><title>COMMENT</title>
+<polygon fill="yellow" stroke="black" points="164,-1369 24,-1369 24,-1327 164,-1327 164,-1369"/>
+<text text-anchor="middle" x="94" y="-1352.4" font-family="Times Roman,serif" font-size="14.00">COMMENT:</text>
+<text text-anchor="middle" x="94" y="-1335.4" font-family="Times Roman,serif" font-size="14.00">skipping comment</text>
+</g>
+<!-- COMMENT&#45;&gt;COMMENT -->
+<g id="edge26" class="edge"><title>COMMENT&#45;&gt;COMMENT</title>
+<path fill="none" stroke="blue" d="M164.071,-1362.7C174.749,-1360.46 182,-1355.56 182,-1348 182,-1343.04 178.877,-1339.22 173.712,-1336.55"/>
+<polygon fill="blue" stroke="blue" points="174.665,-1333.18 164.071,-1333.3 172.425,-1339.81 174.665,-1333.18"/>
+</g>
+<!-- lbl7 -->
+<g id="node24" class="node"><title>lbl7</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="90,-1279 1.42109e-14,-1279 0,-1243 90,-1243 90,-1279"/>
+<text text-anchor="middle" x="45" y="-1256.9" font-family="Times Roman,serif" font-size="14.00">input==\n</text>
+</g>
+<!-- COMMENT&#45;&gt;lbl7 -->
+<g id="edge22" class="edge"><title>COMMENT&#45;&gt;lbl7</title>
+<path fill="none" stroke="blue" d="M82.1385,-1326.94C73.9246,-1312.36 63.1009,-1293.14 55.2589,-1279.21"/>
+</g>
+<!-- CMD -->
+<g id="node3" class="node"><title>CMD</title>
+<polygon fill="yellow" stroke="black" points="547,-1282 367,-1282 367,-1240 547,-1240 547,-1282"/>
+<text text-anchor="middle" x="457" y="-1265.4" font-family="Times Roman,serif" font-size="14.00">CMD:</text>
+<text text-anchor="middle" x="457" y="-1248.4" font-family="Times Roman,serif" font-size="14.00">parsing command name</text>
+</g>
+<!-- lbl12 -->
+<g id="node37" class="node"><title>lbl12</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1105,-1204 1015,-1204 1015,-1168 1105,-1168 1105,-1204"/>
+<text text-anchor="middle" x="1060" y="-1181.9" font-family="Times Roman,serif" font-size="14.00">input==({</text>
+</g>
+<!-- CMD&#45;&gt;lbl12 -->
+<g id="edge38" class="edge"><title>CMD&#45;&gt;lbl12</title>
+<path fill="none" stroke="black" d="M547.275,-1249.77C678.202,-1233.49 915.922,-1203.92 1014.88,-1191.61"/>
+</g>
+<!-- lbl13 -->
+<g id="node40" class="node"><title>lbl13</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="429,-1108 309,-1108 309,-1072 429,-1072 429,-1108"/>
+<text text-anchor="middle" x="369" y="-1085.9" font-family="Times Roman,serif" font-size="14.00">input==binary</text>
+</g>
+<!-- CMD&#45;&gt;lbl13 -->
+<g id="edge42" class="edge"><title>CMD&#45;&gt;lbl13</title>
+<path fill="none" stroke="black" d="M446.033,-1239.69C428.571,-1205.76 394.751,-1140.04 378.359,-1108.19"/>
+</g>
+<!-- lbl14 -->
+<g id="node43" class="node"><title>lbl14</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="615,-1204 511,-1204 511,-1168 615,-1168 615,-1204"/>
+<text text-anchor="middle" x="563" y="-1181.9" font-family="Times Roman,serif" font-size="14.00">input==text</text>
+</g>
+<!-- CMD&#45;&gt;lbl14 -->
+<g id="edge46" class="edge"><title>CMD&#45;&gt;lbl14</title>
+<path fill="none" stroke="black" d="M486.809,-1239.91C502.73,-1228.64 522.129,-1214.92 537.368,-1204.14"/>
+</g>
+<!-- TSTR -->
+<g id="node4" class="node"><title>TSTR</title>
+<polygon fill="yellow" stroke="black" points="930,-586 788,-586 788,-544 930,-544 930,-586"/>
+<text text-anchor="middle" x="859" y="-569.4" font-family="Times Roman,serif" font-size="14.00">TSTR:</text>
+<text text-anchor="middle" x="859" y="-552.4" font-family="Times Roman,serif" font-size="14.00">parsing test string</text>
+</g>
+<!-- lbl30 -->
+<g id="node90" class="node"><title>lbl30</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="758,-508 644,-508 644,-472 758,-472 758,-508"/>
+<text text-anchor="middle" x="701" y="-485.9" font-family="Times Roman,serif" font-size="14.00">input==space</text>
+</g>
+<!-- TSTR&#45;&gt;lbl30 -->
+<g id="edge102" class="edge"><title>TSTR&#45;&gt;lbl30</title>
+<path fill="none" stroke="black" d="M814.568,-543.909C790.745,-532.601 761.699,-518.813 738.945,-508.012"/>
+</g>
+<!-- lbl31 -->
+<g id="node93" class="node"><title>lbl31</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="904,-508 814,-508 814,-472 904,-472 904,-508"/>
+<text text-anchor="middle" x="859" y="-485.9" font-family="Times Roman,serif" font-size="14.00">input==)}</text>
+</g>
+<!-- TSTR&#45;&gt;lbl31 -->
+<g id="edge106" class="edge"><title>TSTR&#45;&gt;lbl31</title>
+<path fill="none" stroke="black" d="M859,-543.709C859,-532.449 859,-518.775 859,-508.042"/>
+</g>
+<!-- lbl32 -->
+<g id="node96" class="node"><title>lbl32</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="842,-328 722,-328 722,-292 842,-292 842,-328"/>
+<text text-anchor="middle" x="782" y="-305.9" font-family="Times Roman,serif" font-size="14.00">input==binary</text>
+</g>
+<!-- TSTR&#45;&gt;lbl32 -->
+<g id="edge110" class="edge"><title>TSTR&#45;&gt;lbl32</title>
+<path fill="none" stroke="black" d="M832.535,-543.784C822.209,-534.02 811.346,-521.585 805,-508 776.513,-447.017 778.036,-364.405 780.412,-328.232"/>
+</g>
+<!-- lbl33 -->
+<g id="node99" class="node"><title>lbl33</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1026,-508 922,-508 922,-472 1026,-472 1026,-508"/>
+<text text-anchor="middle" x="974" y="-485.9" font-family="Times Roman,serif" font-size="14.00">input==text</text>
+</g>
+<!-- TSTR&#45;&gt;lbl33 -->
+<g id="edge114" class="edge"><title>TSTR&#45;&gt;lbl33</title>
+<path fill="none" stroke="black" d="M891.34,-543.909C908.613,-532.644 929.659,-518.918 946.192,-508.136"/>
+</g>
+<!-- BSTR -->
+<g id="node5" class="node"><title>BSTR</title>
+<polygon fill="yellow" stroke="black" points="1306,-586 1170,-586 1170,-544 1306,-544 1306,-586"/>
+<text text-anchor="middle" x="1238" y="-569.4" font-family="Times Roman,serif" font-size="14.00">BSTR:</text>
+<text text-anchor="middle" x="1238" y="-552.4" font-family="Times Roman,serif" font-size="14.00">parsing bin string</text>
+</g>
+<!-- lbl36 -->
+<g id="node105" class="node"><title>lbl36</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1442,-508 1338,-508 1338,-472 1442,-472 1442,-508"/>
+<text text-anchor="middle" x="1390" y="-485.9" font-family="Times Roman,serif" font-size="14.00">before the =</text>
+</g>
+<!-- BSTR&#45;&gt;lbl36 -->
+<g id="edge122" class="edge"><title>BSTR&#45;&gt;lbl36</title>
+<path fill="none" stroke="black" d="M1280.74,-543.909C1303.66,-532.601 1331.61,-518.813 1353.5,-508.012"/>
+</g>
+<!-- lbl37 -->
+<g id="node108" class="node"><title>lbl37</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1138,-508 1044,-508 1044,-472 1138,-472 1138,-508"/>
+<text text-anchor="middle" x="1091" y="-485.9" font-family="Times Roman,serif" font-size="14.00">after the =</text>
+</g>
+<!-- BSTR&#45;&gt;lbl37 -->
+<g id="edge126" class="edge"><title>BSTR&#45;&gt;lbl37</title>
+<path fill="none" stroke="black" d="M1196.66,-543.909C1174.58,-532.644 1147.68,-518.918 1126.55,-508.136"/>
+</g>
+<!-- lbl38 -->
+<g id="node111" class="node"><title>lbl38</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1320,-508 1156,-508 1156,-472 1320,-472 1320,-508"/>
+<text text-anchor="middle" x="1238" y="-485.9" font-family="Times Roman,serif" font-size="14.00">last char of the string</text>
+</g>
+<!-- BSTR&#45;&gt;lbl38 -->
+<g id="edge130" class="edge"><title>BSTR&#45;&gt;lbl38</title>
+<path fill="none" stroke="black" d="M1238,-543.709C1238,-532.449 1238,-518.775 1238,-508.042"/>
+</g>
+<!-- LIST -->
+<g id="node6" class="node"><title>LIST</title>
+<polygon fill="yellow" stroke="black" points="1499,-1012 1445,-1012 1445,-970 1499,-970 1499,-1012"/>
+<text text-anchor="middle" x="1472" y="-995.4" font-family="Times Roman,serif" font-size="14.00">LIST:</text>
+<text text-anchor="middle" x="1472" y="-978.4" font-family="Times Roman,serif" font-size="14.00">in list</text>
+</g>
+<!-- lbl21 -->
+<g id="node67" class="node"><title>lbl21</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1702,-736 1612,-736 1612,-700 1702,-700 1702,-736"/>
+<text text-anchor="middle" x="1657" y="-713.9" font-family="Times Roman,serif" font-size="14.00">input==)}</text>
+</g>
+<!-- LIST&#45;&gt;lbl21 -->
+<g id="edge72" class="edge"><title>LIST&#45;&gt;lbl21</title>
+<path fill="none" stroke="black" d="M1499.13,-987.966C1558.19,-980.909 1696.06,-961.849 1733,-934 1792.4,-889.227 1815.19,-834.588 1775,-772 1758.99,-747.071 1728.3,-733.504 1702.22,-726.204"/>
+</g>
+<!-- lbl22 -->
+<g id="node70" class="node"><title>lbl22</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1554,-931 1464,-931 1464,-895 1554,-895 1554,-931"/>
+<text text-anchor="middle" x="1509" y="-908.9" font-family="Times Roman,serif" font-size="14.00">input==({</text>
+</g>
+<!-- LIST&#45;&gt;lbl22 -->
+<g id="edge76" class="edge"><title>LIST&#45;&gt;lbl22</title>
+<path fill="none" stroke="black" d="M1482.11,-969.686C1487.84,-957.598 1494.94,-942.633 1500.41,-931.115"/>
+</g>
+<!-- lbl23 -->
+<g id="node73" class="node"><title>lbl23</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1724,-934 1610,-934 1610,-892 1724,-892 1724,-934"/>
+<text text-anchor="middle" x="1667" y="-917.4" font-family="Times Roman,serif" font-size="14.00">input==space</text>
+<text text-anchor="middle" x="1667" y="-900.4" font-family="Times Roman,serif" font-size="14.00">(ignore)</text>
+</g>
+<!-- LIST&#45;&gt;lbl23 -->
+<g id="edge80" class="edge"><title>LIST&#45;&gt;lbl23</title>
+<path fill="none" stroke="black" d="M1499.03,-978.12C1527.55,-966.004 1573.12,-947.665 1609.64,-933.532"/>
+</g>
+<!-- lbl24 -->
+<g id="node76" class="node"><title>lbl24</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1518,-664 1278,-664 1278,-622 1518,-622 1518,-664"/>
+<text text-anchor="middle" x="1398" y="-647.4" font-family="Times Roman,serif" font-size="14.00">input!=\n and current == NULL</text>
+<text text-anchor="middle" x="1398" y="-630.4" font-family="Times Roman,serif" font-size="14.00">(unbalanced parenthesis)</text>
+</g>
+<!-- LIST&#45;&gt;lbl24 -->
+<g id="edge84" class="edge"><title>LIST&#45;&gt;lbl24</title>
+<path fill="none" stroke="black" d="M1447.54,-969.802C1437.86,-959.954 1427.71,-947.451 1422,-934 1382.11,-839.965 1390.15,-713.675 1395.38,-664.165"/>
+</g>
+<!-- lbl25 -->
+<g id="node79" class="node"><title>lbl25</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1330,-931 1226,-931 1226,-895 1330,-895 1330,-931"/>
+<text text-anchor="middle" x="1278" y="-908.9" font-family="Times Roman,serif" font-size="14.00">input==text</text>
+</g>
+<!-- LIST&#45;&gt;lbl25 -->
+<g id="edge88" class="edge"><title>LIST&#45;&gt;lbl25</title>
+<path fill="none" stroke="black" d="M1444.62,-979.99C1412.97,-967.266 1360.43,-946.14 1322.8,-931.014"/>
+</g>
+<!-- ERROR -->
+<g id="node7" class="node"><title>ERROR</title>
+<polygon fill="red" stroke="black" points="720,-123 638,-123 638,-81 720,-81 720,-123"/>
+<text text-anchor="middle" x="679" y="-106.4" font-family="Times Roman,serif" font-size="14.00">ERROR:</text>
+<text text-anchor="middle" x="679" y="-89.4" font-family="Times Roman,serif" font-size="14.00">bad input</text>
+</g>
+<!-- lbl39 -->
+<g id="node114" class="node"><title>lbl39</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="732,-36 626,-36 626,-1.06581e-14 732,-0 732,-36"/>
+<text text-anchor="middle" x="679" y="-13.9" font-family="Times Roman,serif" font-size="14.00">can&#39;t recover</text>
+</g>
+<!-- ERROR&#45;&gt;lbl39 -->
+<g id="edge134" class="edge"><title>ERROR&#45;&gt;lbl39</title>
+<path fill="none" stroke="black" d="M673.048,-80.8033C671.895,-67.0002 671.992,-49.1868 673.339,-36.0588"/>
+</g>
+<!-- init -->
+<g id="node8" class="node"><title>init</title>
+<polygon fill="yellow" stroke="black" points="198,-1658 160.172,-1640 198,-1622 235.828,-1640 198,-1658"/>
+<text text-anchor="middle" x="198" y="-1635.9" font-family="Times Roman,serif" font-size="14.00">init</text>
+</g>
+<!-- init&#45;&gt;MSG -->
+<g id="edge2" class="edge"><title>init&#45;&gt;MSG</title>
+<path fill="none" stroke="black" d="M198,-1621.94C198,-1614.36 198,-1605.09 198,-1595.53"/>
+<polygon fill="black" stroke="black" points="201.5,-1595.51 198,-1585.51 194.5,-1595.51 201.5,-1595.51"/>
+</g>
+<!-- msg_append -->
+<g id="node10" class="node"><title>msg_append</title>
+<ellipse fill="none" stroke="black" cx="424" cy="-1348" rx="82.2301" ry="29.6985"/>
+<text text-anchor="middle" x="424" y="-1352.4" font-family="Times Roman,serif" font-size="14.00">store 1st</text>
+<text text-anchor="middle" x="424" y="-1335.4" font-family="Times Roman,serif" font-size="14.00">command char</text>
+</g>
+<!-- msg_append&#45;&gt;CMD -->
+<g id="edge20" class="edge"><title>msg_append&#45;&gt;CMD</title>
+<path fill="none" stroke="black" d="M435.172,-1318.55C438.46,-1309.88 442.064,-1300.38 445.379,-1291.64"/>
+<polygon fill="black" stroke="black" points="448.693,-1292.77 448.967,-1282.18 442.148,-1290.29 448.693,-1292.77"/>
+</g>
+<!-- lbl2&#45;&gt;COMMENT -->
+<g id="edge6" class="edge"><title>lbl2&#45;&gt;COMMENT</title>
+<path fill="none" stroke="blue" d="M83.6936,-1416.97C85.3205,-1406.09 87.4385,-1391.91 89.3311,-1379.25"/>
+<polygon fill="blue" stroke="blue" points="92.8357,-1379.47 90.852,-1369.07 85.9125,-1378.44 92.8357,-1379.47"/>
+</g>
+<!-- lbl3&#45;&gt;MSG -->
+<g id="edge10" class="edge"><title>lbl3&#45;&gt;MSG</title>
+<path fill="none" stroke="blue" d="M203.566,-1456.24C204.243,-1463.94 204.63,-1473.05 204.726,-1482.35"/>
+<polygon fill="blue" stroke="blue" points="201.226,-1482.47 204.717,-1492.48 208.226,-1482.48 201.226,-1482.47"/>
+</g>
+<!-- lbl4&#45;&gt;ERROR -->
+<g id="edge14" class="edge"><title>lbl4&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M276.037,-291.899C283.872,-261.23 304.175,-199.338 346,-168 389.875,-135.126 545.849,-115.176 627.819,-106.728"/>
+<polygon fill="black" stroke="black" points="628.318,-110.195 637.915,-105.707 627.614,-103.23 628.318,-110.195"/>
+</g>
+<!-- lbl5&#45;&gt;msg_append -->
+<g id="edge18" class="edge"><title>lbl5&#45;&gt;msg_append</title>
+<path fill="none" stroke="black" d="M399.423,-1416.97C402.546,-1408.21 406.428,-1397.31 410.178,-1386.79"/>
+<polygon fill="black" stroke="black" points="413.499,-1387.9 413.558,-1377.3 406.905,-1385.55 413.499,-1387.9"/>
+</g>
+<!-- lbl7&#45;&gt;MSG -->
+<g id="edge24" class="edge"><title>lbl7&#45;&gt;MSG</title>
+<path fill="none" stroke="blue" d="M32.5752,-1279.08C25.9336,-1289.85 18.4336,-1304.1 15,-1318 0.222419,-1377.81 -8.83346,-1406.62 28,-1456 51.6038,-1487.64 90.5199,-1507.87 125.166,-1520.43"/>
+<polygon fill="blue" stroke="blue" points="124.213,-1523.8 134.808,-1523.77 126.505,-1517.18 124.213,-1523.8"/>
+</g>
+<!-- cmd_list_new -->
+<g id="node28" class="node"><title>cmd_list_new</title>
+<ellipse fill="none" stroke="black" cx="1294" cy="-1090" rx="92.1303" ry="41.7193"/>
+<text text-anchor="middle" x="1294" y="-1102.9" font-family="Times Roman,serif" font-size="14.00">create new list</text>
+<text text-anchor="middle" x="1294" y="-1085.9" font-family="Times Roman,serif" font-size="14.00">make it arg tree</text>
+<text text-anchor="middle" x="1294" y="-1068.9" font-family="Times Roman,serif" font-size="14.00">root and current</text>
+</g>
+<!-- cmd_list_new&#45;&gt;LIST -->
+<g id="edge28" class="edge"><title>cmd_list_new&#45;&gt;LIST</title>
+<path fill="none" stroke="black" d="M1352.28,-1057.58C1379.79,-1042.28 1411.77,-1024.5 1435.75,-1011.16"/>
+<polygon fill="black" stroke="black" points="1437.48,-1014.2 1444.52,-1006.28 1434.08,-1008.08 1437.48,-1014.2"/>
+</g>
+<!-- cmd_append -->
+<g id="node30" class="node"><title>cmd_append</title>
+<ellipse fill="none" stroke="black" cx="590" cy="-1090" rx="104.86" ry="29.6985"/>
+<text text-anchor="middle" x="590" y="-1094.4" font-family="Times Roman,serif" font-size="14.00">append a character</text>
+<text text-anchor="middle" x="590" y="-1077.4" font-family="Times Roman,serif" font-size="14.00">to command name</text>
+</g>
+<!-- lbl10 -->
+<g id="node31" class="node"><title>lbl10</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="562,-1012 388,-1012 388,-970 562,-970 562,-1012"/>
+<text text-anchor="middle" x="475" y="-995.4" font-family="Times Roman,serif" font-size="14.00">command name length</text>
+<text text-anchor="middle" x="475" y="-978.4" font-family="Times Roman,serif" font-size="14.00">is less than 16</text>
+</g>
+<!-- cmd_append&#45;&gt;lbl10 -->
+<g id="edge30" class="edge"><title>cmd_append&#45;&gt;lbl10</title>
+<path fill="none" stroke="black" d="M557.353,-1061.9C539.026,-1046.12 516.527,-1026.75 499.679,-1012.25"/>
+</g>
+<!-- lbl11 -->
+<g id="node34" class="node"><title>lbl11</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="571,-835 397,-835 397,-793 571,-793 571,-835"/>
+<text text-anchor="middle" x="484" y="-818.4" font-family="Times Roman,serif" font-size="14.00">command name length</text>
+<text text-anchor="middle" x="484" y="-801.4" font-family="Times Roman,serif" font-size="14.00">is more than 16</text>
+</g>
+<!-- cmd_append&#45;&gt;lbl11 -->
+<g id="edge34" class="edge"><title>cmd_append&#45;&gt;lbl11</title>
+<path fill="none" stroke="black" d="M588.199,-1060.2C586.021,-1035.48 581.27,-999.703 571,-970 553.166,-918.418 518.732,-864.027 498.953,-835.07"/>
+</g>
+<!-- lbl10&#45;&gt;CMD -->
+<g id="edge32" class="edge"><title>lbl10&#45;&gt;CMD</title>
+<path fill="none" stroke="black" d="M473.594,-1012.09C470.446,-1059.31 462.815,-1173.78 459.101,-1229.49"/>
+<polygon fill="black" stroke="black" points="455.585,-1229.6 458.412,-1239.81 462.57,-1230.07 455.585,-1229.6"/>
+</g>
+<!-- lbl11&#45;&gt;ERROR -->
+<g id="edge36" class="edge"><title>lbl11&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M468.34,-792.839C446.89,-761.7 411,-700.942 411,-643 411,-643 411,-643 411,-310 411,-201.274 550.36,-141.195 628.092,-116.14"/>
+<polygon fill="black" stroke="black" points="629.222,-119.454 637.712,-113.117 627.123,-112.776 629.222,-119.454"/>
+</g>
+<!-- lbl12&#45;&gt;cmd_list_new -->
+<g id="edge40" class="edge"><title>lbl12&#45;&gt;cmd_list_new</title>
+<path fill="none" stroke="black" d="M1104.01,-1167.94C1135.62,-1154.97 1179.07,-1137.15 1216.44,-1121.82"/>
+<polygon fill="black" stroke="black" points="1217.87,-1125.02 1225.79,-1117.98 1215.21,-1118.54 1217.87,-1125.02"/>
+</g>
+<!-- lbl13&#45;&gt;ERROR -->
+<g id="edge44" class="edge"><title>lbl13&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M367.473,-1071.92C364.906,-1039.92 360,-971.153 360,-913 360,-913 360,-913 360,-310 360,-239.833 374.808,-212.572 429,-168 459.194,-143.166 564.035,-121.572 627.966,-110.306"/>
+<polygon fill="black" stroke="black" points="628.604,-113.747 637.858,-108.587 627.406,-106.85 628.604,-113.747"/>
+</g>
+<!-- lbl14&#45;&gt;cmd_append -->
+<g id="edge48" class="edge"><title>lbl14&#45;&gt;cmd_append</title>
+<path fill="none" stroke="black" d="M568.078,-1167.94C571.122,-1157.12 575.116,-1142.92 578.86,-1129.61"/>
+<polygon fill="black" stroke="black" points="582.316,-1130.25 581.654,-1119.67 575.577,-1128.35 582.316,-1130.25"/>
+</g>
+<!-- got_msg -->
+<g id="node46" class="node"><title>got_msg</title>
+<ellipse fill="cyan" stroke="black" cx="1779" cy="-102" rx="113.137" ry="29.6985"/>
+<text text-anchor="middle" x="1779" y="-106.4" font-family="Times Roman,serif" font-size="14.00">message fully parsed</text>
+<text text-anchor="middle" x="1779" y="-89.4" font-family="Times Roman,serif" font-size="14.00">execute message</text>
+</g>
+<!-- got_msg&#45;&gt;MSG -->
+<g id="edge50" class="edge"><title>got_msg&#45;&gt;MSG</title>
+<path fill="none" stroke="black" d="M1798.46,-131.118C1805.02,-142.23 1811.76,-155.29 1816,-168 1836.15,-228.401 1835,-246.326 1835,-310 1835,-1348 1835,-1348 1835,-1348 1835,-1507.75 589.215,-1534.13 271.198,-1538.27"/>
+<polygon fill="black" stroke="black" points="271.124,-1534.77 261.169,-1538.39 271.213,-1541.77 271.124,-1534.77"/>
+</g>
+<!-- pop -->
+<g id="node48" class="node"><title>pop</title>
+<ellipse fill="none" stroke="black" cx="1615" cy="-310" rx="181.934" ry="29.6985"/>
+<text text-anchor="middle" x="1615" y="-314.4" font-family="Times Roman,serif" font-size="14.00">pop:</text>
+<text text-anchor="middle" x="1615" y="-297.4" font-family="Times Roman,serif" font-size="14.00">current_list = current_list&#45;&gt;parent</text>
+</g>
+<!-- pop&#45;&gt;LIST -->
+<g id="edge60" class="edge"><title>pop&#45;&gt;LIST</title>
+<path fill="none" stroke="black" d="M1595.96,-339.564C1575.54,-374.182 1546,-433.942 1546,-490 1546,-565 1546,-565 1546,-565 1546,-609.803 1543.98,-622.541 1527,-664 1505.13,-717.383 1471.72,-716.786 1455,-772 1434.14,-840.911 1444.6,-862.755 1455,-934 1456.26,-942.645 1458.55,-951.801 1461.04,-960.187"/>
+<polygon fill="black" stroke="black" points="1457.77,-961.47 1464.13,-969.947 1464.45,-959.356 1457.77,-961.47"/>
+</g>
+<!-- lbl16 -->
+<g id="node49" class="node"><title>lbl16</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1807,-244 1641,-244 1641,-168 1807,-168 1807,-244"/>
+<text text-anchor="middle" x="1724" y="-227.4" font-family="Times Roman,serif" font-size="14.00">input=\n</text>
+<text text-anchor="middle" x="1724" y="-210.4" font-family="Times Roman,serif" font-size="14.00">and</text>
+<text text-anchor="middle" x="1724" y="-193.4" font-family="Times Roman,serif" font-size="14.00">current_list == NULL</text>
+<text text-anchor="middle" x="1724" y="-176.4" font-family="Times Roman,serif" font-size="14.00">(arg root closed)</text>
+</g>
+<!-- pop&#45;&gt;lbl16 -->
+<g id="edge52" class="edge"><title>pop&#45;&gt;lbl16</title>
+<path fill="none" stroke="black" d="M1645.65,-280.753C1657.49,-269.459 1671.2,-256.38 1683.81,-244.35"/>
+</g>
+<!-- lbl17 -->
+<g id="node52" class="node"><title>lbl17</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1623,-244 1433,-244 1433,-168 1623,-168 1623,-244"/>
+<text text-anchor="middle" x="1528" y="-227.4" font-family="Times Roman,serif" font-size="14.00">input!=\n</text>
+<text text-anchor="middle" x="1528" y="-210.4" font-family="Times Roman,serif" font-size="14.00">and</text>
+<text text-anchor="middle" x="1528" y="-193.4" font-family="Times Roman,serif" font-size="14.00">current_list == NULL</text>
+<text text-anchor="middle" x="1528" y="-176.4" font-family="Times Roman,serif" font-size="14.00">(unbalanced parenthesis)</text>
+</g>
+<!-- pop&#45;&gt;lbl17 -->
+<g id="edge56" class="edge"><title>pop&#45;&gt;lbl17</title>
+<path fill="none" stroke="black" d="M1590.53,-280.753C1581.09,-269.459 1570.14,-256.38 1560.08,-244.35"/>
+</g>
+<!-- lbl16&#45;&gt;got_msg -->
+<g id="edge54" class="edge"><title>lbl16&#45;&gt;got_msg</title>
+<path fill="none" stroke="black" d="M1744.17,-167.865C1748.9,-158.915 1753.95,-149.375 1758.69,-140.413"/>
+<polygon fill="black" stroke="black" points="1761.91,-141.809 1763.49,-131.333 1755.72,-138.537 1761.91,-141.809"/>
+</g>
+<!-- lbl17&#45;&gt;ERROR -->
+<g id="edge58" class="edge"><title>lbl17&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M1432.98,-171.356C1428.28,-170.122 1423.6,-168.992 1419,-168 1286.94,-139.548 875.539,-113.468 730.359,-104.928"/>
+<polygon fill="black" stroke="black" points="730.561,-101.434 720.374,-104.344 730.152,-108.422 730.561,-101.434"/>
+</g>
+<!-- push -->
+<g id="node56" class="node"><title>push</title>
+<ellipse fill="none" stroke="black" cx="1615" cy="-814" rx="150.821" ry="41.7193"/>
+<text text-anchor="middle" x="1615" y="-826.9" font-family="Times Roman,serif" font-size="14.00">push:create new list</text>
+<text text-anchor="middle" x="1615" y="-809.9" font-family="Times Roman,serif" font-size="14.00">append it as current&#39;s sibling</text>
+<text text-anchor="middle" x="1615" y="-792.9" font-family="Times Roman,serif" font-size="14.00">make it current</text>
+</g>
+<!-- push&#45;&gt;LIST -->
+<g id="edge62" class="edge"><title>push&#45;&gt;LIST</title>
+<path fill="none" stroke="black" d="M1603.88,-855.474C1595.65,-880.314 1582.46,-911.358 1563,-934 1548.13,-951.294 1526.7,-965.075 1508.36,-974.753"/>
+<polygon fill="black" stroke="black" points="1506.72,-971.661 1499.38,-979.303 1509.88,-977.905 1506.72,-971.661"/>
+</g>
+<!-- new_str -->
+<g id="node58" class="node"><title>new_str</title>
+<ellipse fill="none" stroke="black" cx="1165" cy="-814" rx="161.927" ry="41.7193"/>
+<text text-anchor="middle" x="1165" y="-826.9" font-family="Times Roman,serif" font-size="14.00">create a new bin or text string</text>
+<text text-anchor="middle" x="1165" y="-809.9" font-family="Times Roman,serif" font-size="14.00">node and append it to</text>
+<text text-anchor="middle" x="1165" y="-792.9" font-family="Times Roman,serif" font-size="14.00">the current list</text>
+</g>
+<!-- lbl19 -->
+<g id="node59" class="node"><title>lbl19</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="972,-736 810,-736 810,-700 972,-700 972,-736"/>
+<text text-anchor="middle" x="891" y="-713.9" font-family="Times Roman,serif" font-size="14.00">current is generic list</text>
+</g>
+<!-- new_str&#45;&gt;lbl19 -->
+<g id="edge64" class="edge"><title>new_str&#45;&gt;lbl19</title>
+<path fill="none" stroke="black" d="M1069.17,-780.424C1026.57,-765.501 978.129,-748.527 942.517,-736.05"/>
+</g>
+<!-- lbl20 -->
+<g id="node63" class="node"><title>lbl20</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="1242,-736 1088,-736 1088,-700 1242,-700 1242,-736"/>
+<text text-anchor="middle" x="1165" y="-713.9" font-family="Times Roman,serif" font-size="14.00">current is binary list</text>
+</g>
+<!-- new_str&#45;&gt;lbl20 -->
+<g id="edge68" class="edge"><title>new_str&#45;&gt;lbl20</title>
+<path fill="none" stroke="black" d="M1165,-772.451C1165,-759.884 1165,-746.716 1165,-736.478"/>
+</g>
+<!-- tstr_append -->
+<g id="node62" class="node"><title>tstr_append</title>
+<ellipse fill="none" stroke="black" cx="867" cy="-643" rx="128.053" ry="18"/>
+<text text-anchor="middle" x="867" y="-638.9" font-family="Times Roman,serif" font-size="14.00">append to current string</text>
+</g>
+<!-- lbl19&#45;&gt;tstr_append -->
+<g id="edge66" class="edge"><title>lbl19&#45;&gt;tstr_append</title>
+<path fill="none" stroke="black" d="M885.19,-699.845C882.39,-691.093 878.97,-680.405 875.854,-670.669"/>
+<polygon fill="black" stroke="black" points="879.138,-669.446 872.756,-660.988 872.471,-671.579 879.138,-669.446"/>
+</g>
+<!-- tstr_append&#45;&gt;TSTR -->
+<g id="edge100" class="edge"><title>tstr_append&#45;&gt;TSTR</title>
+<path fill="none" stroke="black" d="M865.145,-624.909C864.27,-616.382 863.201,-605.962 862.202,-596.218"/>
+<polygon fill="black" stroke="black" points="865.659,-595.622 861.157,-586.031 858.696,-596.336 865.659,-595.622"/>
+</g>
+<!-- lbl28 -->
+<g id="node86" class="node"><title>lbl28</title>
+<polygon fill="#fefefe" stroke="#fefefe" points="751,-224 607,-224 607,-188 751,-188 751,-224"/>
+<text text-anchor="middle" x="679" y="-201.9" font-family="Times Roman,serif" font-size="14.00">string length &gt; 16</text>
+</g>
+<!-- tstr_append&#45;&gt;lbl28 -->
+<g id="edge96" class="edge"><title>tstr_append&#45;&gt;lbl28</title>
+<path fill="none" stroke="black" d="M807.7,-627.032C751.982,-608.522 671.822,-572.029 635,-508 627.024,-494.13 630.218,-487.269 635,-472 640.822,-453.411 653.417,-454.334 660,-436 686.875,-361.146 683.496,-264.091 680.623,-224.269"/>
+</g>
+<!-- bstr_append -->
+<g id="node66" class="node"><title>bstr_append</title>
+<ellipse fill="none" stroke="black" cx="1165" cy="-643" rx="70.1831" ry="18"/>
+<text text-anchor="middle" x="1165" y="-638.9" font-family="Times Roman,serif" font-size="14.00">bstr_append</text>
+</g>
+<!-- lbl20&#45;&gt;bstr_append -->
+<g id="edge70" class="edge"><title>lbl20&#45;&gt;bstr_append</title>
+<path fill="none" stroke="black" d="M1165,-699.845C1165,-691.34 1165,-681.008 1165,-671.496"/>
+<polygon fill="black" stroke="black" points="1168.5,-671.248 1165,-661.248 1161.5,-671.248 1168.5,-671.248"/>
+</g>
+<!-- bstr_append&#45;&gt;BSTR -->
+<g id="edge120" class="edge"><title>bstr_append&#45;&gt;BSTR</title>
+<path fill="none" stroke="black" d="M1181.56,-625.301C1190.3,-615.969 1201.23,-604.29 1211.14,-593.703"/>
+<polygon fill="black" stroke="black" points="1213.85,-595.928 1218.13,-586.235 1208.74,-591.145 1213.85,-595.928"/>
+</g>
+<!-- lbl21&#45;&gt;pop -->
+<g id="edge74" class="edge"><title>lbl21&#45;&gt;pop</title>
+<path fill="none" stroke="black" d="M1651.47,-699.827C1643.31,-671.366 1629,-614.417 1629,-565 1629,-565 1629,-565 1629,-490 1629,-441.645 1623.92,-386.202 1619.88,-349.774"/>
+<polygon fill="black" stroke="black" points="1623.32,-349.108 1618.71,-339.567 1616.37,-349.898 1623.32,-349.108"/>
+</g>
+<!-- lbl22&#45;&gt;push -->
+<g id="edge78" class="edge"><title>lbl22&#45;&gt;push</title>
+<path fill="none" stroke="black" d="M1528.44,-894.842C1538.63,-885.323 1551.64,-873.176 1564.45,-861.209"/>
+<polygon fill="black" stroke="black" points="1567.03,-863.588 1571.95,-854.205 1562.26,-858.472 1567.03,-863.588"/>
+</g>
+<!-- lbl23&#45;&gt;LIST -->
+<g id="edge82" class="edge"><title>lbl23&#45;&gt;LIST</title>
+<path fill="none" stroke="black" d="M1620.43,-934.054C1586.31,-948.162 1540.72,-966.278 1509.04,-978.244"/>
+<polygon fill="black" stroke="black" points="1507.41,-975.115 1499.27,-981.9 1509.87,-981.671 1507.41,-975.115"/>
+</g>
+<!-- lbl24&#45;&gt;ERROR -->
+<g id="edge86" class="edge"><title>lbl24&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M1417.35,-621.685C1458.44,-573.782 1546.09,-455.584 1489,-376 1465.6,-343.386 903.485,-170.276 729.707,-117.371"/>
+<polygon fill="black" stroke="black" points="730.618,-113.99 720.033,-114.428 728.581,-120.687 730.618,-113.99"/>
+</g>
+<!-- lbl25&#45;&gt;new_str -->
+<g id="edge90" class="edge"><title>lbl25&#45;&gt;new_str</title>
+<path fill="none" stroke="black" d="M1257.27,-894.842C1246.31,-885.234 1232.29,-872.949 1218.5,-860.873"/>
+<polygon fill="black" stroke="black" points="1220.72,-858.162 1210.89,-854.205 1216.11,-863.427 1220.72,-858.162"/>
+</g>
+<!-- str_fin -->
+<g id="node82" class="node"><title>str_fin</title>
+<ellipse fill="none" stroke="black" cx="545" cy="-406" rx="105.818" ry="18"/>
+<text text-anchor="middle" x="545" y="-401.9" font-family="Times Roman,serif" font-size="14.00">finish current string</text>
+</g>
+<!-- str_fin&#45;&gt;LIST -->
+<g id="edge92" class="edge"><title>str_fin&#45;&gt;LIST</title>
+<path fill="none" stroke="black" d="M554.874,-424.094C573.354,-457.377 615.181,-530.025 658,-586 713.962,-659.157 729.053,-678.491 801,-736 960.946,-863.849 1020.11,-877.768 1217,-934 1293.56,-955.865 1385,-974.542 1434.94,-984.124"/>
+<polygon fill="black" stroke="black" points="1434.46,-987.597 1444.94,-986.029 1435.77,-980.72 1434.46,-987.597"/>
+</g>
+<!-- str_fin_pop -->
+<g id="node84" class="node"><title>str_fin_pop</title>
+<ellipse fill="none" stroke="black" cx="1184" cy="-406" rx="105.818" ry="18"/>
+<text text-anchor="middle" x="1184" y="-401.9" font-family="Times Roman,serif" font-size="14.00">finish current string</text>
+</g>
+<!-- str_fin_pop&#45;&gt;pop -->
+<g id="edge94" class="edge"><title>str_fin_pop&#45;&gt;pop</title>
+<path fill="none" stroke="black" d="M1240.31,-390.719C1258.94,-385.821 1279.82,-380.503 1299,-376 1361.41,-361.352 1431.13,-346.617 1489.18,-334.798"/>
+<polygon fill="black" stroke="black" points="1490.03,-338.197 1499.13,-332.776 1488.63,-331.337 1490.03,-338.197"/>
+</g>
+<!-- lbl28&#45;&gt;ERROR -->
+<g id="edge98" class="edge"><title>lbl28&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M679,-187.885C679,-172.874 679,-151.191 679,-133.368"/>
+<polygon fill="black" stroke="black" points="682.5,-133.132 679,-123.132 675.5,-133.132 682.5,-133.132"/>
+</g>
+<!-- lbl30&#45;&gt;str_fin -->
+<g id="edge104" class="edge"><title>lbl30&#45;&gt;str_fin</title>
+<path fill="none" stroke="black" d="M667.534,-471.98C643.693,-459.143 611.505,-441.81 586.101,-428.132"/>
+<polygon fill="black" stroke="black" points="587.541,-424.932 577.077,-423.272 584.223,-431.095 587.541,-424.932"/>
+</g>
+<!-- lbl31&#45;&gt;str_fin_pop -->
+<g id="edge108" class="edge"><title>lbl31&#45;&gt;str_fin_pop</title>
+<path fill="none" stroke="black" d="M904.288,-474.601C907.228,-473.695 910.151,-472.82 913,-472 978.711,-453.082 1054.39,-434.953 1109.04,-422.498"/>
+<polygon fill="black" stroke="black" points="1110.01,-425.866 1118.99,-420.24 1108.46,-419.039 1110.01,-425.866"/>
+</g>
+<!-- lbl32&#45;&gt;ERROR -->
+<g id="edge112" class="edge"><title>lbl32&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M783.191,-291.608C784.188,-263.152 782.7,-207.609 760,-168 751.336,-152.881 737.768,-139.816 724.198,-129.391"/>
+<polygon fill="black" stroke="black" points="725.93,-126.322 715.791,-123.247 721.799,-131.974 725.93,-126.322"/>
+</g>
+<!-- lbl33&#45;&gt;tstr_append -->
+<g id="edge116" class="edge"><title>lbl33&#45;&gt;tstr_append</title>
+<path fill="none" stroke="black" d="M970.539,-508.032C965.953,-528.447 956.343,-561.981 939,-586 929.749,-598.812 916.867,-610.249 904.553,-619.454"/>
+<polygon fill="black" stroke="black" points="902.261,-616.79 896.17,-625.459 906.338,-622.48 902.261,-616.79"/>
+</g>
+<!-- read_base64 -->
+<g id="node102" class="node"><title>read_base64</title>
+<ellipse fill="none" stroke="black" cx="1394" cy="-406" rx="85.7684" ry="29.6985"/>
+<text text-anchor="middle" x="1394" y="-410.4" font-family="Times Roman,serif" font-size="14.00">store next digit</text>
+<text text-anchor="middle" x="1394" y="-393.4" font-family="Times Roman,serif" font-size="14.00">of string length</text>
+</g>
+<!-- read_base64&#45;&gt;BSTR -->
+<g id="edge118" class="edge"><title>read_base64&#45;&gt;BSTR</title>
+<path fill="none" stroke="black" d="M1426.96,-433.739C1448.24,-455.043 1468.91,-484.667 1451,-508 1434.32,-529.726 1369.74,-544.973 1316.02,-554.196"/>
+<polygon fill="black" stroke="black" points="1315.41,-550.748 1306.13,-555.848 1316.57,-557.653 1315.41,-550.748"/>
+</g>
+<!-- lbl36&#45;&gt;read_base64 -->
+<g id="edge124" class="edge"><title>lbl36&#45;&gt;read_base64</title>
+<path fill="none" stroke="black" d="M1390.87,-471.773C1391.23,-464.131 1391.67,-454.922 1392.1,-445.848"/>
+<polygon fill="black" stroke="black" points="1395.6,-445.905 1392.58,-435.75 1388.61,-445.572 1395.6,-445.905"/>
+</g>
+<!-- lbl37&#45;&gt;bstr_append -->
+<g id="edge128" class="edge"><title>lbl37&#45;&gt;bstr_append</title>
+<path fill="none" stroke="black" d="M1099.77,-508.128C1112.61,-534.685 1136.65,-584.375 1151.68,-615.462"/>
+<polygon fill="black" stroke="black" points="1148.72,-617.37 1156.22,-624.848 1155.02,-614.322 1148.72,-617.37"/>
+</g>
+<!-- lbl38&#45;&gt;str_fin_pop -->
+<g id="edge132" class="edge"><title>lbl38&#45;&gt;str_fin_pop</title>
+<path fill="none" stroke="black" d="M1226.28,-471.773C1218.87,-460.247 1209.17,-445.159 1200.93,-432.342"/>
+<polygon fill="black" stroke="black" points="1203.86,-430.422 1195.51,-423.903 1197.97,-434.207 1203.86,-430.422"/>
+</g>
+<!-- lbl39&#45;&gt;ERROR -->
+<g id="edge136" class="edge"><title>lbl39&#45;&gt;ERROR</title>
+<path fill="none" stroke="black" d="M684.661,-36.0588C685.693,-46.1099 685.991,-58.9075 685.557,-70.5491"/>
+<polygon fill="black" stroke="black" points="682.047,-70.6145 684.952,-80.8033 689.035,-71.0267 682.047,-70.6145"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/hid_render_comp.html
===================================================================
--- tags/2.0.1/doc/developer/hid_render_comp.html	(nonexistent)
+++ tags/2.0.1/doc/developer/hid_render_comp.html	(revision 18980)
@@ -0,0 +1,128 @@
+<html>
+<body>
+<h1> HID: rendering vs. composite layers </h1>
+<p>
+All rendering is driven by the core. The core understands the PCB stackup,
+layers, layer groups, compositions within the layer groups, extra labels,
+layer visibility, etc. The HID is a slave device that takes drawing
+instructions and blindly executes them.
+<p>
+However, the HID has a chance to alter which layer groups are drawn, using
+the <i>set_layer_group</i> hooks return value.
+
+<H2> Bursts and layer groups </H2>
+<p>
+The rendering is done in bursts. A burst may redraw only a small window
+of the screen. Each bursts draws multiple layer groups, in Z-order, from
+bottom (furthest from the eye of the user) to up (closest to the eye of
+the user). Each layer group is drawn on a transparent sketch canvas. In positive mode,
+objects are drawn with multiple colors on each sketch canvas. In negative mode
+pixels are erased from the sketch canvas, making the affected pixels transparent again. Drawing
+on a layer group (either positively or negatively) should
+<b>overwrite</b> pixels on the same layer group. In other words, there's
+no translucency between two overlapping objects drawn on the same layer
+group.
+
+<p>
+There is a so called <i>output</i> canvas, which shall be cleared to
+the background color upon <i>render_burst</i> / <i>start</i>. The background
+color shall be fetched from the config tree (appearance/color/background).
+<p>
+The following steps are taken by the core in a burst:
+<ul>
+	<li> 1. call to the <i>render_burst</i> hook with <i>start</i>
+	<li> 2. <i>set_layer_group</i> is called for the next layer; depending on the return value, the core will skip to step 7.
+	<li> 3. <i>set_drawing_mode</i> is called with <i>reset</i>
+	<li> 4. <i>set_drawing_mode</i> is called with <i>positive</i> or <i>negative</i> to set draw or erase
+	<li> 5. objects are drawn
+	<li> 6. if there are subsequent composite layers, the core will jump back to 3.
+	<li> 7. <i>set_drawing_mode</i> is called with <i>flush</i>
+	<li> 8. if there are further groups, the core jumps back to step 3.
+	<li> 9. call to the <i>render_burst</i> hook with <i>end</i>
+</ul>
+<p>
+When <i>set_drawing_mode</i> / <i>reset</i> is called, the HID needs to
+create a new sketch canvas, all pixels initialized to transparent. The
+core may switch between positive and negative draw any time. When
+<i>set_drawing_mode</i> / <i>flush</i> is called, the current sketch
+canvas needs to be blitted onto the output (in a HID-specific way) and
+the sketch canvas can be destroyed. The output canvas shall be flushed to
+the screen upon <i>render_burst</i> / <i>end</i>.
+<p>
+Optional optimization: the most common case is when only positively drawn
+layers are used to draw the final output. Drawing on separate sketch canvases and
+blitting them onto an output buffer is a waste in this setup. To give HIDs a
+chance to avoid the extra copies, <i>set_drawing_mode</i> calls have an
+argument called <i>direct</i>. When the <i>direct</i> is set, it is safe
+to directly draw on the output canvas, without allocating a sketch canvas. The
+core guarantees the followings:
+<ul>
+	<li> all calls of <i>set_drawing_mode</i> within drawing a layer group will have the same <i>direct</i> argument
+	<li> if <i>direct</i> is set for a layer group, <i>set_drawing_mode</i> will not be called with <i>negative</i>
+	<li> only the first N consecutive layer groups can be <i>direct</i>; once a group is drawn with <i>direct</i> unset, all subsequent groups will be drawn with <i>direct</i> unset
+</ul>
+<p>
+It is possible that the core would draw the whole board in <i>direct</i>
+mode. It is safe to ignore the <i>direct</i> argument and always use the
+more expensive, sketch-canvas+blitting method.
+
+<H2> GCs </H2>
+<p>
+The API contains Graphic Context, or GC for short.  A GC is a pen with
+properties like color and tip shape. The core will initialize multiple
+GCs for the drawing and will pass a GC pointer with each drawing command. 
+<p>
+Note: this concept is orthogonal to the above canvas based drawing.
+Regardless of which GC is used, the object being drawn always ends up
+making modifications to the currently active (sketch) canvas.
+<p>
+A GC can be initialized only after <i>render_burst</i> / <i>start</i>
+and all GCs will be uninitialized before <i>render_burst</i> / <i>end</i>.
+
+<H2> colors </H2>
+<p>
+In negative drawing mode, drawing an object always clear on the current canvas,
+regardless of the GC color.
+<p>
+In positive drawing mode, objects are drawn with whatever color the
+current GC has. The special color "drill" is used to draw holes that go thru
+all layers of the board. It is possible that a drill is drawn over existing
+objects and new objects are drawn on top of a drilled hole. To get the
+proper order, the HID shall set the .holes_after to 1.
+<p>
+(Note: there's no "erase" color anymore.)
+
+
+<H2> transition </H2>
+<p>
+When switching over an existing HID from the old use_mask() API to the new
+composite API:
+<ul>
+	<li> set .poly_before to 0
+	<li> set .poly_after to 0
+	<li> set .enable_fake_composite to 0
+	<li> set .holes_after to 1
+	<li> use an empty function for .use_mask for now
+</ul>
+
+<H2> XOR drawing </H2>
+<p>
+XOR draw is used as a mean to make an object always visible, no matter
+over what background it is drawns. It is <b>not</b> used as a cheap draw/erase
+mechanism, so HIDs are free to implement it with a different algorithm - as
+long as it is guaranteed that objects drawn on the same colored background
+will stick out. 
+<p>
+There are two places XOR draw takes place:
+<ul>
+	<li> in core's normal draw procedures (pcb_hid_expose*()), as the very last
+	     compsiting canvas (after everything else had been drawn)
+	<li> in pcb_draw_attached(), whenever it is called by the HID
+</ul>
+<p>
+In both cases the drawing mode is set to PCB_HID_COMP_POSITIVE_XOR, which does
+<b>not</b> clear the direct flag. The GC that is used for drawing the actual
+objects also has its xor mode set.
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/import.html
===================================================================
--- tags/2.0.1/doc/developer/import.html	(nonexistent)
+++ tags/2.0.1/doc/developer/import.html	(revision 18980)
@@ -0,0 +1,64 @@
+<html>
+<body>
+<h1> pcb-rnd hacking - how importers work </h1>
+
+<h2> Introduction </h2>
+This document describes the common aspects of import code, be it an
+import_ plugin or the load part of an io_plugin, importing a footprint,
+loading a board or a netlist.
+
+<h2> Data structures </h2>
+
+The board is stored in pcb_board_t *. Some import code, like the one
+that loads a design (an io plugin's ->parse_pcb function), gets the
+target in an argument. (Other, non-import code usually operate on
+the global variable that represents the current board:
+<i>pcb_board_t *PCB.</i>).
+<p>
+In either case, pcb_board_t's most important field is <i>pcb_data_t *data</i>,
+which holds lists and vectors to store <b>all objects on the board</b>. When
+the target is a buffer (e.g. io plugin's ->parse_element function), it's
+a <i>pcb_buffer_t *buf</i> which also have a <i>pcb_data_t *data</i> containing
+the same data a board could. 
+<p>
+A pcb_data_t struct in turn has three sets of important fields:
+<ul>
+	<li> lists for layer-independent objects (e.g. rat lines, padstacks, subcircuits)
+	<li> number of layers in use (LayerN) and an array of layers (see later)
+	<li> rtree structures - these are used for looking up objects for locations
+</ul>
+Each layer is a pcb_layer_t structure. A layer has the following fields:
+<ul>
+	<li> lists for lines, texts, arcs, polygons
+	<li> some generic layer attributes (colors, flags, key-value pairs)
+	<li> an rtree struct for each object type.
+</ul>
+<p>
+Any code that needs to create objects should use the functions in obj_*.h.
+The functions that operate layer-independently usually get a destination as
+<i>pcb_data_t</i>, so they can operate both on boards and buffers. A typical
+example is <i>pcb_pstk_t *pcb_pstk_new(pcb_data_t *data, ...)</i> that returns
+NULL or the pointer to the new via that is already added to the corresponding list
+of data and in the rtree.
+<p>
+Layer object creation is done referencing the layer as <i>pcb_layer_t *</i>. A
+typical example is <i>pcb_line_t *pcb_line_new(pcb_layer_t *layer...)</i>
+which returns NULL on error or a pointer to the new line object created (inserted
+in the layer's line list, added to the rtree).
+<p>
+Code should <b>avoid</b> manipulating the lists and rtree structures directly.
+<table border=1>
+<tr><td><img src="data1.png">
+<br>
+Figure 1. simplified map of object related data structures
+<br>
+<small>diamond: variable; rectangle: struct; round: struct field; green: drawing primitive</small>
+</table>
+
+
+<h2> Extra steps around creating a new board </h2>
+TODO: postproc, post*, other setup
+
+
+
+
Index: tags/2.0.1/doc/developer/indent.html
===================================================================
--- tags/2.0.1/doc/developer/indent.html	(nonexistent)
+++ tags/2.0.1/doc/developer/indent.html	(revision 18980)
@@ -0,0 +1,36 @@
+<html>
+<body>
+<h1> pcb-rnd - indentation </h1>
+
+As of r1022 all old code is converted using indent(1). Our preferred
+coding style is close to what the following command line produces, using
+our patched version of indent(1):
+<pre>
+indent --line-length256 -brs -br -nce --tab-size2 -ut -npsl  -npcs -hnl -cli2 -nsaf -sai -nsaw -ncs -c0 -cd0 -cp0
+</pre>
+<p>
+Contributors are kindly asked to follow this style or run the above
+commandline on their <b>new</b> code before sending a patch or committing
+to svn. The style of existing code lines should <b>not</b> be changed,
+not even the "surrounding" lines to a largish patch, especially not in the
+same patch/commit with actual code changes.
+<p>
+We do not put space between the pointer-asterisk and name; indent(1)
+unfortunately does this in function declaration:
+<table border=1>
+<tr><th>right <th>wrong
+<tr>
+	<td><code>int&nbsp;foo(char&nbsp;*bar);</code>
+	<td><code>int&nbsp;foo(char&nbsp;*&nbsp;bar);</code>
+</table>
+<p>
+We have a <a href="indent_fdecl.patch">patch</a> against indent 2.2.11 to
+fix this.
+<p>
+We do not use tabs for aligning code in columns; we use tabs exclusively
+to indicate levels logical alignment. indent(1) attempts to align the
+right-side comments using tabs. We have a <a href="indent_cmt.patch">patch</a>
+against indent 2.2.11 to change this when column is set to 0.
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/indent_cmt.patch
===================================================================
--- tags/2.0.1/doc/developer/indent_cmt.patch	(nonexistent)
+++ tags/2.0.1/doc/developer/indent_cmt.patch	(revision 18980)
@@ -0,0 +1,18 @@
+diff -uri indent-2.2.11.orig/src/comments.c indent-2.2.11/src/comments.c
+--- indent-2.2.11.orig/src/comments.c	2018-01-26 13:45:48.474640060 +0100
++++ indent-2.2.11/src/comments.c	2018-01-26 14:47:06.867653819 +0100
+@@ -339,7 +339,13 @@
+          start_column = count_columns (compute_label_target (), s_lab, NULL_CHAR);
+       }
+ 
+-      if (start_column < target)
++      if (target == 0)
++      {
++         /* 0 means start right after the end of the line, adding a space, no alignment */
++         *e_com++ = ' ';
++         column++;
++      }
++      else if (start_column < target)
+       {
+          start_column = target;
+       }
Index: tags/2.0.1/doc/developer/indent_fdecl.patch
===================================================================
--- tags/2.0.1/doc/developer/indent_fdecl.patch	(nonexistent)
+++ tags/2.0.1/doc/developer/indent_fdecl.patch	(revision 18980)
@@ -0,0 +1,17 @@
+diff -uri indent-2.2.11.orig/src/handletoken.c indent-2.2.11/src/handletoken.c
+--- indent-2.2.11.orig/src/handletoken.c	2018-01-26 13:45:48.477640023 +0100
++++ indent-2.2.11/src/handletoken.c	2018-01-26 14:23:38.923255546 +0100
+@@ -677,8 +677,11 @@
+         
+     }
+ #endif
+-    
+-    parser_state_tos->want_blank = true;
++    if (parser_state_tos->in_decl)
++        parser_state_tos->want_blank = false;
++    else
++        parser_state_tos->want_blank = true;
++
+ }
+ 
+ /**
Index: tags/2.0.1/doc/developer/io_lihata_ver.html
===================================================================
--- tags/2.0.1/doc/developer/io_lihata_ver.html	(nonexistent)
+++ tags/2.0.1/doc/developer/io_lihata_ver.html	(revision 18980)
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - io_lihata versions </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+
+<H1> pcb-rnd - io_lihata versions </H1>
+<p>
+History of io_lihata, per format version.
+
+<H2> lihata board </H2>
+	<H3> v1 </H3>
+	<p id="v1">
+	Feature-compatible with the gEDA/PCB file format, plus allows multiple
+	fonts. Same assumptions on layers: last two must be the silk layers.
+
+	<H3> v2 </H3>
+	<p id="v2">
+	Introduce the layer stack subtree and remove layer assumptions. Save
+	the combining field of layers.
+
+	<H3> v3 </H3>
+	<p id="v3">
+	New global object subtree: subcircuit. Global object element has been removed.
+	<p>
+	Intconn is not a flag, but a pin/pad/terminal attribute.
+
+	<H3> v4 </H3>
+	<p id="v4">
+	New subtree under data: padstack_prototypes, for storing padstack prototypes.
+	ID is the place of the padstack within the list.
+	<p>
+	New object type under : ha:padstack_ref.id.
+
+	<H3> v5 </H3>
+	<p id="v5">
+	Removed drc and isle_area_nm from the board header in favor of the config
+	subtree. Removed the cursor section from board header - cursor position and
+	zoom should not be saved or loaded.
+	<p>
+	Warn for the intnoconn attribute when saving pre-v5 - pcb-rnd versions
+	supporting v4 or lower will most probably not understand it.
+	<p>
+	Layer group and network attributes. Layer colors.
+	<p>
+	Optional route style via prototype ID.
+	<p>
+	Optional padstack prototype name for easier user identification of prototypes.
+	<p>
+	Remove old model objects: elements, element-lines, element-arcs,
+	pins, pads, vias. They are still loaded if they are found in v5,
+	but a warning is generated and the objects are force-converted to
+	the new model on save.
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/lihata_format/Makefile
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/Makefile	(revision 18980)
@@ -0,0 +1,23 @@
+DOTS = \
+ data.dot \
+ geda-project-v1.dot \
+ pcb-rnd-board-v.dot \
+ pcb-rnd-conf-v1.dot \
+ pcb-rnd-font-v1.dot \
+ pcb-rnd-subcircuit-v.dot \
+ submenu.dot
+
+all: tree.html tree.txt $(DOTS)
+
+%.dot: render/render.sh render/*.awk *.lht
+	cd render && ./render.sh dot
+	for n in *.dot; do dot -Tsvg $$n > $${n%%.dot}.svg; done
+
+tree.html: render/render.sh render/*.awk *.lht
+	cd render && ./render.sh html > ../tree.html
+
+tree.txt: tree.html
+	w3m -cols 256 tree.html > tree.txt
+
+comm_flags.lht: ../../../src/pcb-rnd render/gen_flags.sh
+	cd render && ./gen_flags.sh > ../comm_flags.lht
Index: tags/2.0.1/doc/developer/lihata_format/comm_attribs.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_attribs.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_attribs.lht	(revision 18980)
@@ -0,0 +1,22 @@
+ha:lht_tree_doc { ha:comm {
+
+	ha:attributes {
+		type=ha
+		hide=1
+		desc { a hash of attribute key=value pairs }
+		li:children {
+			ha:attrib-key { valtype=string; desc={attribute value}}
+		}
+	}
+	ha:attributes_v5p {
+		name=attributes
+		hide=1
+		type=ha
+		desc { a hash of attribute key=value pairs }
+		ver={>=5}
+		li:children {
+			ha:attrib-key { valtype=string; desc={attribute value}}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/comm_data.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_data.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_data.lht	(revision 18980)
@@ -0,0 +1,284 @@
+ha:lht_tree_doc { ha:comm {
+
+	ha:data {
+		type=ha
+		desc { Layers and global objects of the board }
+		li:children {
+			ha:objects {
+				type=li
+				desc { List of global (non-layer/multi-layer) objects }
+				li:children {
+					ha:padstack_ref.ID {
+						type=ha
+						ver={>=4}
+						desc { a padstack reference (instance) placed on the board (e.g. used as a via) }
+						li:children {
+							ha:proto      = { valtype=integer; desc={padstack prototype ID to use, from the parent data's proto list }}
+							ha:x          = { valtype=coord;   desc={place padstack with origin at this horizontal coordinate }}
+							ha:y          = { valtype=coord;   desc={place padstack with origin at this vertical coordinate }}
+							ha:clearance  = { valtype=coord;   desc={global clearance; if non-zero, overrides local (per shape) clearance }}
+							ha:rot        = { valtype=angle;   desc={rotation angle in degrees }}
+							ha:xmirror    = { valtype=integer; desc={0 or 1; if 1, mirror all shapes over the x (horizontal) axis (so that y coords are flipped)}}
+							ha:smirror    = { valtype=integer; desc={0 or 1; if 1, mirror the layer stackup: bottom becomes top, top becomes bottom (a.k.a. "place on the other side")}}
+							sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+							sy:flags@dup  = {/lht_tree_doc/comm/flags_padstack}
+							ha:thermal {
+								type=li
+								desc { list of thermal shapes, per layer }
+								li:children {
+									ha:LAYERID {
+										type=li
+										desc { integer layer ID the thermal affects; each word is a boolean flag that is either present on the list or is missing; only one shape may be present }
+										li:children {
+											ha:on         = { valtype=none;  desc={ thermal is present on this layer; if not present, all other thermal flags are ignored on this layer }}
+											ha:diag       = { valtype=none;  desc={ thermal graphics is not axis aligned but diagonal (rotated by 45 degrees) }}
+											ha:round      = { valtype=none;  desc={ shape: rounded edge fingers }}
+											ha:sharp      = { valtype=none;  desc={ shape: sharp edge fingers }}
+											ha:solid      = { valtype=none;  desc={ shape: no thermal relief, solid connection without clearance }}
+											ha:noshape    = { valtype=none;  desc={ shape: special: omit copper shape of the padstack on this layer }}
+										}
+									}
+								}
+							}
+						}
+					}
+					ha:via.ID {
+						type=ha
+						ver={<=4}
+						desc { an old via object (loaded as padstack in the new model) }
+						li:children {
+							ha:x          = { valtype=coord;   desc={place padstack with origin at this horizontal coordinate }}
+							ha:y          = { valtype=coord;   desc={place padstack with origin at this vertical coordinate }}
+							ha:thickness  = { valtype=coord;   desc={copper shape dimension (diameter) }}
+							ha:clearance  = { valtype=coord;   desc={copper clearance around the copper shape }}
+							ha:mask       = { valtype=coord;   desc={mask cutout shape dimension (diameter) }}
+							ha:hole       = { valtype=coord;   desc={drill/hole diameter }}
+							ha:name       = { valtype=string;  desc={optional name attribute }}
+							ha:number     = { valtype=string;  desc={for a pin (or to-be-pin) this is the terminal ID }}
+							sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+							sy:flags@dup  = {/lht_tree_doc/comm/flags_pinvia}
+						}
+					}
+				}
+			}
+			ha:layers {
+				type=li
+				desc={ordered list of layers; v1 required the order to be top-bottom physically; v1 also required silk layers to be at the end (same resrtictions as in the old .pcb format; only real (non-bound) layers have attributes)}
+				li:children {
+					ha:NAME {
+						type=ha
+						desc={a logical layer}
+						li:children {
+							ha:lid        = { valtype=integer;  ver={>=2} desc={layer ID}}
+							ha:visible    = { valtype=integer;  desc={only in real (non-boud) layers: 1 if the layer is visible, 0 if not (UI setting)}}
+							ha:group      = { valtype=integer;  desc={only in real (non-boud) layers: "parent" layer group ID }}
+							ha:color      = { valtype=string;  ver={>=5} desc={ layer color on UI, in #rrggbb format }}
+							ha:stack_offs = { valtype=integer;  desc={only in bound layers: match offset e.g. for internal copper layers}}
+							ha:type {
+								type=ha
+								desc={only for bound layers: try to bind to this type of layer on the host board}
+								sy:children {/lht_tree_doc/comm/layer_mask/children}
+							}
+							ha:combining {
+								ver={>=2}
+								desc={layer combination (compositing) flags}
+								sy:children {/lht_tree_doc/comm/combining/children}
+							}
+							sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+							ha:objects {
+								type=li
+								desc={list of drawing primitives put on this layer}
+								li:children {
+									ha:line.ID {
+										type=ha
+										desc={round cap line}
+										li:children {
+											ha:x1        = { valtype=coord;   desc={line first endpoint, horizontal offset }}
+											ha:y1        = { valtype=coord;   desc={line first endpoint, vertical offset }}
+											ha:x2        = { valtype=coord;   desc={line second endpoint, horizontal offset }}
+											ha:y2        = { valtype=coord;   desc={line second endpoint, vertical offset }}
+											ha:thickness = { valtype=coord;   desc={width of the line }}
+											ha:clearance = { valtype=coord;   desc={copper clearance around the object }}
+											sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+											sy:flags@dup  = {/lht_tree_doc/comm/flags_line}
+											sy:hvthr@dup  = {/lht_tree_doc/comm/thermal_heavy}
+										}
+									}
+									ha:arc.ID {
+										type=ha
+										desc={round cap elliptic arc (only width==height is fully supported at the moment)}
+										li:children {
+											ha:x         = { valtype=coord;   desc={center, X coord}}
+											ha:y         = { valtype=coord;   desc={center, Y coord}}
+											ha:width     = { valtype=coord;   desc={radius (of the centerline of the arc) in X direction }}
+											ha:height    = { valtype=coord;   desc={radius (of the centerline of the arc) in Y direction }}
+											ha:thickness = { valtype=coord;   desc={width of the pen the arc is drawn with }}
+											ha:clearance = { valtype=coord;   desc={copper clearance around the object }}
+											ha:astart    = { valtype=angle;   desc={ start angle}}
+											ha:adelta    = { valtype=angle;   desc={ delta angle}}
+											sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+											sy:flags@dup  = {/lht_tree_doc/comm/flags_arc}
+											sy:hvthr@dup  = {/lht_tree_doc/comm/thermal_heavy}
+										}
+									}
+									ha:polygon.ID {
+										type=ha
+										desc={polygon, as drawn (unclipped)}
+										li:children {
+											ha:clearance = { valtype=coord; ver={>=3} desc={copper clearance around the object }}
+											sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+											sy:flags@dup  = {/lht_tree_doc/comm/flags_polygon}
+											sy:hvthr@dup  = {/lht_tree_doc/comm/thermal_heavy}
+											ha:geometry {
+												type=li
+												desc={first item is the outer contour, subsequent, optional items are holes}
+												li:children {
+													ha:contour = { valtype=coordtbl;   desc={2 column table of x;y coords for the outer contour}}
+													ha:hole    = { valtype=coordtbl;   desc={2 column table of x;y coords for a hole}}
+												}
+											}
+										}
+									}
+									ha:text.ID {
+										type=ha
+										desc={single line text object}
+										li:children {
+											ha:x         = { valtype=coord;   desc={placement: X coord}}
+											ha:y         = { valtype=coord;   desc={placement: Y coord}}
+											ha:role      = { valtype=string;  desc={when part of an old element, determines which of the three hardwired text object role is used (footprint, refdes or value)}}
+											ha:string    = { valtype=string;  desc={text string (payload)}}
+											ha:fid       = { valtype=integer; desc={font ID}}
+											ha:scale     = { valtype=integer; desc={text size scale in %}}
+											ha:direction = { valtype=integer; desc={rotation in 90 degree steps (0 is horizontal)}}
+											sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+											sy:flags@dup  = {/lht_tree_doc/comm/flags_text}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			ha:padstack_prototypes {
+				type=li
+				ver = {>=4}
+				li:children {
+					ha:unused          = { valtype=none;  desc={placeholder for markign uunsed slot to keep slot indices for early lihata v4 }}
+					ha:ps_proto_v4.PID {
+						type=ha
+						desc={padstack prototype specification, as introduced in lihata board v4}
+						li:children {
+							ha:hdia       = { valtype=coord;   desc={hole diameter; 0 means no hole }}
+							ha:htop       = { valtype=integer; desc={hole start: copper layer index from the top (positive) or bottom (negative) copper layer (0 means top copper layer)}}
+							ha:hbottom    = { valtype=integer; desc={hole start: copper layer index from the bottom (positive) or top (negative) copper layer (0 means bottom copper layer)}}
+							ha:plated     = { valtype=integer; desc={0=unplated hole; 1=plated hole}}
+							ha:name       = { valtype=string; ver={>=5} desc={optional user assigned prototype name}}
+							ha:shape {
+								type=li
+								desc={shape per layer type definition}
+								li:children {
+									ha:ps_shape_v4 {
+										type=ha
+										desc={shape on a specific layer type (specified by layer_mask and combining), as specifie in lihata board v4; shape is either ps_poly, ps_line or ps_circ (only one of these will present per layer type); shape coords are relative to padstack origin}
+										li:children {
+											sy:layer_mask@dup = {/lht_tree_doc/comm/layer_mask}
+											ha:combining {
+												desc={layer compositing match}
+												sy:children   = {/lht_tree_doc/comm/combining/children}
+											}
+											ha:clearance  = { valtype=coord;   desc={local, per-layer-type clearance; applied if global padstack clearance is 0 }}
+											ha:ps_poly {
+												type=li
+												desc={arbitrary convex polygon shape; contains a list of x;y coordinates }
+											}
+											ha:ps_line {
+												type=ha
+												desc={straight line shape, round or square cap}
+												li:children {
+													ha:x1        = { valtype=coord;   desc={line first endpoint, horizontal offset }}
+													ha:y1        = { valtype=coord;   desc={line first endpoint, vertical offset }}
+													ha:x2        = { valtype=coord;   desc={line second endpoint, horizontal offset }}
+													ha:y2        = { valtype=coord;   desc={line second endpoint, vertical offset }}
+													ha:thickness = { valtype=coord;   desc={width of the line }}
+													ha:square    = { valtype=integer; desc={0=round cap; 1=square cap }}
+												}
+											}
+											ha:ps_circ {
+												type=ha
+												desc={filled circle shape}
+												li:children {
+													ha:x        = { valtype=coord;   desc={center, horizontal offset }}
+													ha:y        = { valtype=coord;   desc={center, vertical offset }}
+													ha:dia      = { valtype=coord;   desc={circle diameter }}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			sy:subc.ID@dup {/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID}
+			ha:element.ID {
+				type=ha
+				desc={an instance (full copy) of an obsolete element footprint}
+				ver = {<3}
+				li:children {
+					ha:x          = { valtype=coord;   desc={element origin (diamond), horizontal offset }}
+					ha:y          = { valtype=coord;   desc={element origin (diamond), vertical offset }}
+					sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+					sy:flags@dup  = {/lht_tree_doc/comm/flags_element}
+					ha:objects {
+						type=li
+						desc={list of special objects that make up the element; lines and arcs are always on a silk layer}
+						li:children {
+							sy:line.ID  = {/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID}
+							sy:arc.ID   = {/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID}
+							sy:text.ID  = {/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID}
+							ha:pad.ID {
+								type=ha
+								desc={SMD pad emulated using a line object; becomes a rectangle (but watch out for the cap-extended length!) when the square flag is set}
+								li:children {
+									ha:x1        = { valtype=coord;   desc={line first endpoint, horizontal offset }}
+									ha:y1        = { valtype=coord;   desc={line first endpoint, vertical offset }}
+									ha:x2        = { valtype=coord;   desc={line second endpoint, horizontal offset }}
+									ha:y2        = { valtype=coord;   desc={line second endpoint, vertical offset }}
+									ha:thickness = { valtype=coord;   desc={width of the line}}
+									ha:clearance = { valtype=coord;   desc={clearance around the line}}
+									ha:mask      = { valtype=coord;   desc={size of the mask cutout, as interpreted by gEDA/PCB}}
+									ha:name      = { valtype=string;  desc={symbolic name of the pad}}
+									ha:number    = { valtype=string;  desc={"pin number" for the netlist}}
+									sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+									sy:flags@dup  = {/lht_tree_doc/comm/flags_pad}
+								}
+							}
+							ha:pin.ID {
+								type=ha
+								desc={thru-hole pin; emulated as an old-style via }
+								sy:children = {/lht_tree_doc/comm/data/children/objects/children/via.ID}
+							}
+						}
+					}
+				}
+			}
+			ha:rat.ID {
+				type=ha
+				desc={global rat line}
+				li:children {
+					ha:x1        = { valtype=coord;   desc={line first endpoint, horizontal offset }}
+					ha:y1        = { valtype=coord;   desc={line first endpoint, vertical offset }}
+					ha:x2        = { valtype=coord;   desc={line second endpoint, horizontal offset }}
+					ha:y2        = { valtype=coord;   desc={line second endpoint, vertical offset }}
+					ha:lgrp1     = { valtype=integer; desc={first endpoint's layer group ID }}
+					ha:lgrp2     = { valtype=integer; desc={second endpoint's layer group ID }}
+					sy:attr@dup  = {/lht_tree_doc/comm/attributes}
+					sy:flags@dup  = {/lht_tree_doc/comm/flags_line}
+				}
+			}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/comm_flags.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_flags.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_flags.lht	(revision 18980)
@@ -0,0 +1,137 @@
+ha:lht_tree_doc { ha:comm {
+	ha:flags_arc {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a arc}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:rubberend { valtype=flag; desc={For lines, used internally for rubber band moves: indicates one end already rubber banding.}}
+			ha:usetherm { valtype=flag; desc={Obsolete, indicates that pins/vias should be drawn with thermal fingers.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_line {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a line}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:rubberend { valtype=flag; desc={For lines, used internally for rubber band moves: indicates one end already rubber banding.}}
+			ha:usetherm { valtype=flag; desc={Obsolete, indicates that pins/vias should be drawn with thermal fingers.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_polygon {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a polygon}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:clearpoly { valtype=flag; desc={For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection).  When clear, polygons will solidly connect to pins and vias. }}
+			ha:fullpoly { valtype=flag; desc={For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one).}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:clearpolypoly { valtype=flag; desc={For polygons, apply clearance to nearby polygons}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_text {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a text}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:onsolder { valtype=flag; desc={For text, indicates that it is on the solder side.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:dyntext { valtype=flag; desc={For text: dynamic string (substitute %patterns%)}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_subcircuit {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a subcircuit}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_padstack {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a padstack}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:hole { valtype=flag; desc={For pins and vias, this flag means that the pin or via is a hole without a copper annulus.}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:warn { valtype=flag; desc={For pins, vias, and pads, set to indicate a warning.}}
+			ha:usetherm { valtype=flag; desc={Obsolete, indicates that pins/vias should be drawn with thermal fingers.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+	ha:flags_ratline {
+		hide=1
+		name=flags
+		dot_group=1
+		desc={flag bits of a ratline}
+		type=ha
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:rat { valtype=flag; desc={If set for a line, indicates that this line is a rat line instead of a copper trace.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+		}
+	}
+} }
Index: tags/2.0.1/doc/developer/lihata_format/comm_flags_old.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_flags_old.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_flags_old.lht	(revision 18980)
@@ -0,0 +1,69 @@
+ha:lht_tree_doc { ha:comm {
+
+# these obsolete flags are only relevant in compatibility mode;
+# they are not generated by the flag dump but they will not change
+# thus this file is hand-written
+
+	ha:flags_element {
+		hide=1
+		desc={flag bits of an element}
+		type=ha
+		dot_group=1
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+			ha:onsolder { valtype=flag; desc={element is placed on the solder side}}
+		}
+	}
+	ha:flags_pinvia {
+		hide=1
+		desc={flag bits of a pin or via}
+		type=ha
+		dot_group=1
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:hole { valtype=flag; desc={For pins and vias, this flag means that the pin or via is a hole without a copper annulus.}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:warn { valtype=flag; desc={For pins, vias, and pads, set to indicate a warning.}}
+			ha:usetherm { valtype=flag; desc={Obsolete, indicates that pins/vias should be drawn with thermal fingers.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+			ha:pin { valtype=flag; desc={object is a pin (in an element)}}
+			ha:via { valtype=flag; desc={object is a via}}
+		}
+	}
+
+	ha:flags_pad {
+		hide=1
+		desc={flag bits of a pad}
+		type=ha
+		dot_group=1
+		li:children {
+			ha:found { valtype=flag; desc={If set, this object has been found by FindConnection()}}
+			ha:hole { valtype=flag; desc={For pins and vias, this flag means that the pin or via is a hole without a copper annulus.}}
+			ha:clearline { valtype=flag; desc={For lines and arcs, the line/arc will clear polygons instead of connecting to them.}}
+			ha:selected { valtype=flag; desc={Set when the object is selected.}}
+			ha:auto { valtype=flag; desc={For lines and vias, indicates that these were created by the autorouter.}}
+			ha:warn { valtype=flag; desc={For pins, vias, and pads, set to indicate a warning.}}
+			ha:usetherm { valtype=flag; desc={Obsolete, indicates that pins/vias should be drawn with thermal fingers.}}
+			ha:drc { valtype=flag; desc={Set for objects that fail DRC: flag like FOUND flag for DRC checking.}}
+			ha:lock { valtype=flag; desc={Set for locked objects.}}
+			ha:nonetlist { valtype=flag; desc={subcircuit is not on the netlist and should not interfere with the netlist }}
+			ha:termname { valtype=flag; desc={when set the names of pins are shown.}}
+			ha:floater { valtype=flag; desc={subc part can be moved after subc placing}}
+			ha:pin { valtype=flag; desc={object is a pin (in an element)}}
+			ha:via { valtype=flag; desc={object is a via}}
+		}
+	}
+} }
Index: tags/2.0.1/doc/developer/lihata_format/comm_lyt.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_lyt.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_lyt.lht	(revision 18980)
@@ -0,0 +1,41 @@
+ha:lht_tree_doc { ha:comm {
+
+	ha:layer_mask {
+		hide=1
+		type=ha
+		desc={layer type and location}
+		dot_group=1
+		li:children {
+			ha:top           { valtype=flag; desc={location: top side}}
+			ha:bottom        { valtype=flag; desc={location: bottom side}}
+			ha:intern        { valtype=flag; desc={location: internal}}
+			ha:logical       { valtype=flag; desc={location: logical (not in the actual stackup)}}
+			ha:copper        { valtype=flag; desc={material: copper}}
+			ha:silk          { valtype=flag; desc={material: silk}}
+			ha:mask          { valtype=flag; desc={material: mask}}
+			ha:paste         { valtype=flag; desc={material: paste}}
+			ha:outline       { valtype=flag; desc={"material": router path (board outline, slots, cutouts) }}
+			ha:substrate     { valtype=flag; desc={material: substrate or insulator}}
+
+#			ha:rat           { valtype=flag; desc={(virtual: rat lines)}}
+#			ha:invis         { valtype=flag; desc={(virtual: invisible)}}
+#			ha:assy          { valtype=flag; desc={(virtual: assembly drawing)}}
+#			ha:fab           { valtype=flag; desc={(virtual: fab drawing)}}
+#			ha:plateddrill   { valtype=flag; desc={(drills: plated)}}
+#			ha:unplateddrill { valtype=flag; desc={(drills: unplated)}}
+#			ha:cross-section { valtype=flag; desc={(virtual: cross section drawing)}}
+#			ha:misc          { valtype=flag; desc={(virtual: virtual misc layer)}}
+#			ha:virtual       { valtype=flag; desc={(if set, the layer is not a physical layer but a drawing or documentation)}}
+		}
+	}
+
+	ha:combining {
+		hide=1
+		dot_group=1
+		li:children {
+			ha:sub    { valtype=flag; desc={draw in negative}}
+			ha:auto   { valtype=flag; desc={padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag}}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/comm_thermal.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/comm_thermal.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/comm_thermal.lht	(revision 18980)
@@ -0,0 +1,17 @@
+ha:lht_tree_doc { ha:comm {
+
+	ha:thermal_heavy {
+		name=thermal
+		type=li
+		hide=1
+		desc { list of thermal flags for heavy terminals, on the single layer the object is on }
+		li:children {
+			ha:on      { valtype=none; desc={draw any thermal only if this string is present; else normal clearance is applied}}
+			ha:diag    { valtype=none; desc={if present, the thermal is diagonal (45 degree rotated)}}
+			ha:round   { valtype=none; desc={if present, thermal shape is rounded}}
+			ha:sharp   { valtype=none; desc={if present, thermal shape is sharp}}
+			ha:solid   { valtype=none; desc={if present, there is no thermal but a solid connection ("join")}}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/data.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/data.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/data.svg	(revision 18980)
@@ -0,0 +1,4708 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: ha:data Pages: 1 -->
+<svg width="11803pt" height="1769pt"
+ viewBox="0.00 0.00 11803.18 1768.99" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1764.99)">
+<title>ha:data</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1764.99 11799.2,-1764.99 11799.2,4 -4,4"/>
+<!-- /lht_tree_doc/comm/data -->
+<g id="node1" class="node"><title>/lht_tree_doc/comm/data</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/comm/data" xlink:title=" Layers and global objects of the board ">
+<ellipse fill="none" stroke="black" cx="7952.18" cy="-1733.41" rx="39.6962" ry="27.6545"/>
+<text text-anchor="middle" x="7952.18" y="-1737.71" font-family="Times,serif" font-size="14.00">ha:data</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects -->
+<g id="node2" class="node"><title>/lht_tree_doc/comm/data/children/objects</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects" xlink:title=" List of global (non&#45;layer/multi&#45;layer) objects ">
+<ellipse fill="none" stroke="black" cx="1483.18" cy="-1631.65" rx="46.8387" ry="27.6545"/>
+<text text-anchor="middle" x="1483.18" y="-1635.95" font-family="Times,serif" font-size="14.00">li:objects</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/objects -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/objects</title>
+<path fill="none" stroke="black" d="M7912.55,-1731.8C7403.22,-1723.94 2146.05,-1642.87 1540.03,-1633.52"/>
+<polygon fill="black" stroke="black" points="1539.86,-1630.02 1529.8,-1633.37 1539.75,-1637.02 1539.86,-1630.02"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers -->
+<g id="node60" class="node"><title>/lht_tree_doc/comm/data/children/layers</title>
+<g id="a_node60"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers" xlink:title="ordered list of layers; v1 required the order to be top&#45;bottom physically; v1 also required silk layers to be at the end (same resrtictions as in the old .pcb format; only real (non&#45;bound) layers have attributes)">
+<ellipse fill="none" stroke="black" cx="5035.18" cy="-1631.65" rx="42.3529" ry="27.6545"/>
+<text text-anchor="middle" x="5035.18" y="-1635.95" font-family="Times,serif" font-size="14.00">li:layers</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/layers -->
+<g id="edge83" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/layers</title>
+<path fill="none" stroke="black" d="M7912.61,-1731.06C7594.11,-1720.16 5451.5,-1646.89 5087.65,-1634.44"/>
+<polygon fill="black" stroke="black" points="5087.77,-1630.94 5077.65,-1634.1 5087.53,-1637.94 5087.77,-1630.94"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes -->
+<g id="node187" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes</title>
+<g id="a_node187"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes" xlink:title="li:padstack_prototypes\n\n&gt;=4">
+<ellipse fill="none" stroke="black" cx="7701.18" cy="-1631.65" rx="98.0761" ry="38.3684"/>
+<text text-anchor="middle" x="7701.18" y="-1643.45" font-family="Times,serif" font-size="14.00">li:padstack_prototypes</text>
+<text text-anchor="middle" x="7701.18" y="-1612.45" font-family="Times,serif" font-size="14.00">&gt;=4</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes -->
+<g id="edge260" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes</title>
+<path fill="none" stroke="black" d="M7918.33,-1718.95C7882.59,-1704.75 7825.04,-1681.88 7778.17,-1663.25"/>
+<polygon fill="black" stroke="black" points="7779.23,-1659.9 7768.64,-1659.46 7776.64,-1666.41 7779.23,-1659.9"/>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID -->
+<g id="node224" class="node"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID</title>
+<g id="a_node224"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID" xlink:title="an instance (full copy) of a subcircuit">
+<ellipse fill="none" stroke="black" cx="8204.18" cy="-1631.65" rx="53.9813" ry="38.3684"/>
+<text text-anchor="middle" x="8204.18" y="-1643.45" font-family="Times,serif" font-size="14.00">ha:subc.ID</text>
+<text text-anchor="middle" x="8204.18" y="-1612.45" font-family="Times,serif" font-size="14.00">&gt;=3</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID -->
+<g id="edge307" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID</title>
+<path fill="none" stroke="black" d="M7986.17,-1718.95C8027.69,-1702.52 8098.53,-1674.47 8148.16,-1654.83"/>
+<polygon fill="black" stroke="black" points="8149.47,-1658.07 8157.48,-1651.14 8146.89,-1651.56 8149.47,-1658.07"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID -->
+<g id="node238" class="node"><title>/lht_tree_doc/comm/data/children/element.ID</title>
+<g id="a_node238"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID" xlink:title="an instance (full copy) of an obsolete element footprint">
+<ellipse fill="none" stroke="black" cx="8673.18" cy="-1631.65" rx="67.3507" ry="38.3684"/>
+<text text-anchor="middle" x="8673.18" y="-1643.45" font-family="Times,serif" font-size="14.00">ha:element.ID</text>
+<text text-anchor="middle" x="8673.18" y="-1612.45" font-family="Times,serif" font-size="14.00">&lt;3</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/element.ID -->
+<g id="edge328" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/element.ID</title>
+<path fill="none" stroke="black" d="M7990.95,-1727.05C8105.82,-1711.15 8445.87,-1664.1 8598.06,-1643.04"/>
+<polygon fill="black" stroke="black" points="8598.83,-1646.47 8608.25,-1641.63 8597.87,-1639.54 8598.83,-1646.47"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID -->
+<g id="node310" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID</title>
+<g id="a_node310"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID" xlink:title="global rat line">
+<ellipse fill="none" stroke="black" cx="10712.2" cy="-1631.65" rx="45.9239" ry="27.6545"/>
+<text text-anchor="middle" x="10712.2" y="-1635.95" font-family="Times,serif" font-size="14.00">ha:rat.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID -->
+<g id="edge434" class="edge"><title>/lht_tree_doc/comm/data&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID</title>
+<path fill="none" stroke="black" d="M7991.73,-1730.98C8298.38,-1719.9 10294.4,-1647.75 10656,-1634.68"/>
+<polygon fill="black" stroke="black" points="10656.4,-1638.17 10666.3,-1634.31 10656.1,-1631.17 10656.4,-1638.17"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID -->
+<g id="node3" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID" xlink:title=" a padstack reference (instance) placed on the board (e.g. used as a via) ">
+<ellipse fill="none" stroke="black" cx="501.184" cy="-1519.28" rx="84.7059" ry="38.3684"/>
+<text text-anchor="middle" x="501.184" y="-1531.08" font-family="Times,serif" font-size="14.00">ha:padstack_ref.ID</text>
+<text text-anchor="middle" x="501.184" y="-1500.08" font-family="Times,serif" font-size="14.00">&gt;=4</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/comm/data/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID</title>
+<path fill="none" stroke="black" d="M1437.46,-1625.51C1285.91,-1608.48 798.031,-1553.64 593.143,-1530.62"/>
+<polygon fill="black" stroke="black" points="593.34,-1527.12 583.011,-1529.48 592.558,-1534.07 593.34,-1527.12"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID -->
+<g id="node34" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID</title>
+<g id="a_node34"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID" xlink:title=" an old via object (loaded as padstack in the new model) ">
+<ellipse fill="none" stroke="black" cx="1483.18" cy="-1519.28" rx="48.1667" ry="38.3684"/>
+<text text-anchor="middle" x="1483.18" y="-1531.08" font-family="Times,serif" font-size="14.00">ha:via.ID</text>
+<text text-anchor="middle" x="1483.18" y="-1500.08" font-family="Times,serif" font-size="14.00">&lt;=4</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID -->
+<g id="edge44" class="edge"><title>/lht_tree_doc/comm/data/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID</title>
+<path fill="none" stroke="black" d="M1483.18,-1603.93C1483.18,-1593.07 1483.18,-1580.17 1483.18,-1567.8"/>
+<polygon fill="black" stroke="black" points="1486.68,-1567.59 1483.18,-1557.59 1479.68,-1567.59 1486.68,-1567.59"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto -->
+<g id="node4" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto" xlink:title="padstack prototype ID to use, from the parent data&#39;s proto list ">
+<ellipse fill="none" stroke="black" cx="38.1838" cy="-1406.91" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="38.1838" y="-1410.71" font-family="Times,serif" font-size="14.00">proto</text>
+<text text-anchor="middle" x="38.1838" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto</title>
+<path fill="none" stroke="black" d="M416.341,-1515.49C329.669,-1509.91 192.903,-1493.42 85.1838,-1445.1 79.3278,-1442.47 73.565,-1438.95 68.1904,-1435.12"/>
+<polygon fill="black" stroke="black" points="70.1742,-1432.23 60.1067,-1428.93 65.9182,-1437.79 70.1742,-1432.23"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x -->
+<g id="node5" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x" xlink:title="place padstack with origin at this horizontal coordinate ">
+<ellipse fill="none" stroke="black" cx="127.184" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="127.184" y="-1410.71" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="127.184" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x -->
+<g id="edge4" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x</title>
+<path fill="none" stroke="black" d="M417.793,-1511.64C348.173,-1503.42 247.954,-1485.19 169.184,-1445.1 164.085,-1442.5 159.114,-1439.14 154.481,-1435.5"/>
+<polygon fill="black" stroke="black" points="156.437,-1432.57 146.553,-1428.75 151.899,-1437.9 156.437,-1432.57"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y -->
+<g id="node6" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y" xlink:title="place padstack with origin at this vertical coordinate ">
+<ellipse fill="none" stroke="black" cx="211.184" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="211.184" y="-1410.71" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="211.184" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y</title>
+<path fill="none" stroke="black" d="M422.877,-1504.37C372.266,-1493.21 306.198,-1474.46 253.184,-1445.1 248.285,-1442.38 243.468,-1439.01 238.943,-1435.42"/>
+<polygon fill="black" stroke="black" points="241.044,-1432.61 231.16,-1428.8 236.509,-1437.94 241.044,-1432.61"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance -->
+<g id="node7" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance</title>
+<g id="a_node7"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance" xlink:title="global clearance; if non&#45;zero, overrides local (per shape) clearance ">
+<ellipse fill="none" stroke="black" cx="310.184" cy="-1406.91" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="310.184" y="-1410.71" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="310.184" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance -->
+<g id="edge6" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M446.85,-1489.85C422.27,-1476.67 393.005,-1460.54 367.184,-1445.1 361.188,-1441.51 354.922,-1437.6 348.829,-1433.7"/>
+<polygon fill="black" stroke="black" points="350.377,-1430.53 340.079,-1428.04 346.575,-1436.41 350.377,-1430.53"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot -->
+<g id="node8" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot" xlink:title="rotation angle in degrees ">
+<ellipse fill="none" stroke="black" cx="409.184" cy="-1406.91" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="409.184" y="-1410.71" font-family="Times,serif" font-size="14.00">rot</text>
+<text text-anchor="middle" x="409.184" y="-1395.71" font-family="Times,serif" font-size="14.00">angle</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot -->
+<g id="edge7" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot</title>
+<path fill="none" stroke="black" d="M472.074,-1483.36C459.753,-1468.58 445.553,-1451.54 433.768,-1437.41"/>
+<polygon fill="black" stroke="black" points="436.232,-1434.9 427.141,-1429.45 430.855,-1439.38 436.232,-1434.9"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror -->
+<g id="node9" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror" xlink:title="0 or 1; if 1, mirror all shapes over the x (horizontal) axis (so that y coords are flipped)">
+<ellipse fill="none" stroke="black" cx="501.184" cy="-1406.91" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="501.184" y="-1410.71" font-family="Times,serif" font-size="14.00">xmirror</text>
+<text text-anchor="middle" x="501.184" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror -->
+<g id="edge8" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror</title>
+<path fill="none" stroke="black" d="M501.184,-1480.92C501.184,-1469.14 501.184,-1456.15 501.184,-1444.43"/>
+<polygon fill="black" stroke="black" points="504.684,-1444.09 501.184,-1434.09 497.684,-1444.09 504.684,-1444.09"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror -->
+<g id="node10" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror" xlink:title="0 or 1; if 1, mirror the layer stackup: bottom becomes top, top becomes bottom (a.k.a. &quot;place on the other side&quot;)">
+<ellipse fill="none" stroke="black" cx="601.184" cy="-1406.91" rx="40.1111" ry="26.7407"/>
+<text text-anchor="middle" x="601.184" y="-1410.71" font-family="Times,serif" font-size="14.00">smirror</text>
+<text text-anchor="middle" x="601.184" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror -->
+<g id="edge9" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror</title>
+<path fill="none" stroke="black" d="M532.55,-1483.66C545.889,-1468.94 561.292,-1451.94 574.123,-1437.78"/>
+<polygon fill="black" stroke="black" points="576.836,-1440 580.957,-1430.24 571.649,-1435.3 576.836,-1440"/>
+</g>
+<!-- dup20_/lht_tree_doc/comm/attributes -->
+<g id="node11" class="node"><title>dup20_/lht_tree_doc/comm/attributes</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="718.184" cy="-1406.91" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="718.184" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;dup20_/lht_tree_doc/comm/attributes -->
+<g id="edge10" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;dup20_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M558.434,-1490.89C586.268,-1477.38 620.123,-1460.69 650.184,-1445.1 657.322,-1441.39 664.834,-1437.39 672.155,-1433.44"/>
+<polygon fill="black" stroke="black" points="674.172,-1436.32 681.285,-1428.47 670.828,-1430.17 674.172,-1436.32"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack -->
+<g id="node13" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack" xlink:title="flag bits of a padstack">
+<ellipse fill="none" stroke="black" cx="836.184" cy="-1406.91" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="836.184" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack -->
+<g id="edge12" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack</title>
+<path fill="none" stroke="black" d="M581.144,-1506.32C639.909,-1495.51 720.606,-1476.4 786.184,-1445.1 791.95,-1442.34 797.717,-1438.88 803.177,-1435.19"/>
+<polygon fill="black" stroke="black" points="805.371,-1437.92 811.461,-1429.25 801.294,-1432.23 805.371,-1437.92"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal -->
+<g id="node26" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal</title>
+<g id="a_node26"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal" xlink:title=" list of thermal shapes, per layer ">
+<ellipse fill="none" stroke="black" cx="945.184" cy="-1406.91" rx="49.4949" ry="27.6545"/>
+<text text-anchor="middle" x="945.184" y="-1411.21" font-family="Times,serif" font-size="14.00">li:thermal</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal -->
+<g id="edge36" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal</title>
+<path fill="none" stroke="black" d="M584.695,-1511.72C664.658,-1503.3 787.528,-1484.75 887.184,-1445.1 894.06,-1442.36 901.001,-1438.77 907.573,-1434.91"/>
+<polygon fill="black" stroke="black" points="909.611,-1437.76 916.266,-1429.52 905.923,-1431.81 909.611,-1437.76"/>
+</g>
+<!-- dup20_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node12" class="node"><title>dup20_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="502.184" cy="-1305.15" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="502.184" y="-1308.95" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="502.184" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup20_/lht_tree_doc/comm/attributes&#45;&gt;dup20_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge11" class="edge"><title>dup20_/lht_tree_doc/comm/attributes&#45;&gt;dup20_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M681.897,-1385.03C671.76,-1379.48 660.651,-1373.66 650.184,-1368.73 611.214,-1350.36 599.778,-1349.71 560.184,-1332.73 556.123,-1330.99 551.919,-1329.14 547.716,-1327.27"/>
+<polygon fill="black" stroke="black" points="549.126,-1324.07 538.571,-1323.16 546.254,-1330.45 549.126,-1324.07"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/found -->
+<g id="node14" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/found</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="603.184" cy="-1305.15" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="603.184" y="-1308.95" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="603.184" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/found -->
+<g id="edge13" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/found</title>
+<path fill="none" stroke="black" d="M811.436,-1384.63C803.733,-1378.82 794.95,-1372.96 786.184,-1368.73 730.27,-1341.72 708.778,-1355.94 651.184,-1332.73 646.996,-1331.04 642.712,-1329.07 638.513,-1326.97"/>
+<polygon fill="black" stroke="black" points="640.005,-1323.8 629.524,-1322.25 636.75,-1330 640.005,-1323.8"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/hole -->
+<g id="node15" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/hole</title>
+<g id="a_node15"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/hole" xlink:title="For pins and vias, this flag means that the pin or via is a hole without a copper annulus.">
+<ellipse fill="none" stroke="black" cx="647.184" cy="-1204.1" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="647.184" y="-1207.9" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="647.184" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/hole -->
+<g id="edge14" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/hole</title>
+<path fill="none" stroke="black" d="M810.914,-1384.95C803.266,-1379.22 794.645,-1373.32 786.184,-1368.73 745.772,-1346.79 721.085,-1365.85 689.184,-1332.73 665.363,-1308 655.05,-1269.51 650.587,-1241.26"/>
+<polygon fill="black" stroke="black" points="654.001,-1240.41 649.146,-1230.99 647.068,-1241.38 654.001,-1240.41"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/clearline -->
+<g id="node16" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/clearline</title>
+<g id="a_node16"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="668.184" cy="-1103.75" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="668.184" y="-1107.55" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="668.184" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/clearline -->
+<g id="edge16" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/clearline</title>
+<path fill="none" stroke="black" d="M809.523,-1385.38C802.068,-1379.84 793.895,-1373.93 786.184,-1368.73 760.721,-1351.55 745.481,-1357.4 727.184,-1332.73 727.092,-1332.61 693.876,-1204.14 677.329,-1140.13"/>
+<polygon fill="black" stroke="black" points="680.716,-1139.25 674.825,-1130.44 673.939,-1141 680.716,-1139.25"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/selected -->
+<g id="node17" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/selected</title>
+<g id="a_node17"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="709.184" cy="-1014.01" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="709.184" y="-1017.81" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="709.184" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/selected -->
+<g id="edge18" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/selected</title>
+<path fill="none" stroke="black" d="M809.42,-1385.41C793.999,-1372.1 775.653,-1353.42 765.184,-1332.73 713.13,-1229.84 743.599,-1190.18 722.184,-1076.88 720.59,-1068.45 718.756,-1059.39 716.979,-1050.88"/>
+<polygon fill="black" stroke="black" points="720.351,-1049.91 714.858,-1040.85 713.502,-1051.36 720.351,-1049.91"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/auto -->
+<g id="node18" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/auto</title>
+<g id="a_node18"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="761.184" cy="-924.271" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="761.184" y="-928.071" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="761.184" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/auto -->
+<g id="edge20" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/auto</title>
+<path fill="none" stroke="black" d="M822.883,-1380.42C816.147,-1366.62 808.328,-1349.08 803.184,-1332.73 785.865,-1277.67 779.184,-1262.82 779.184,-1205.1 779.184,-1205.1 779.184,-1205.1 779.184,-1102.75 779.184,-1053.42 772.216,-996.773 766.951,-961.007"/>
+<polygon fill="black" stroke="black" points="770.402,-960.42 765.45,-951.054 763.48,-961.464 770.402,-960.42"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/warn -->
+<g id="node19" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/warn</title>
+<g id="a_node19"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/warn" xlink:title="For pins, vias, and pads, set to indicate a warning.">
+<ellipse fill="none" stroke="black" cx="796.184" cy="-834.531" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="796.184" y="-838.331" font-family="Times,serif" font-size="14.00">warn</text>
+<text text-anchor="middle" x="796.184" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/warn -->
+<g id="edge22" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/warn</title>
+<path fill="none" stroke="black" d="M832.061,-1379.35C826.473,-1340.99 817.184,-1267.78 817.184,-1205.1 817.184,-1205.1 817.184,-1205.1 817.184,-1013.01 817.184,-963.592 809.055,-906.964 802.912,-871.229"/>
+<polygon fill="black" stroke="black" points="806.342,-870.525 801.16,-861.284 799.448,-871.739 806.342,-870.525"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm -->
+<g id="node20" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm</title>
+<g id="a_node20"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="818.184" cy="-744.791" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="818.184" y="-748.591" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="818.184" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm -->
+<g id="edge24" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm</title>
+<path fill="none" stroke="black" d="M840.306,-1379.35C845.895,-1340.99 855.184,-1267.78 855.184,-1205.1 855.184,-1205.1 855.184,-1205.1 855.184,-923.271 855.184,-873.139 840.861,-816.685 830.038,-781.183"/>
+<polygon fill="black" stroke="black" points="833.276,-779.809 826.952,-771.308 826.594,-781.897 833.276,-779.809"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/drc -->
+<g id="node21" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/drc</title>
+<g id="a_node21"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="876.184" cy="-655.051" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="876.184" y="-658.851" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="876.184" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/drc -->
+<g id="edge26" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/drc</title>
+<path fill="none" stroke="black" d="M848.412,-1380.26C865.16,-1342.71 893.184,-1270.15 893.184,-1205.1 893.184,-1205.1 893.184,-1205.1 893.184,-833.531 893.184,-784.229 886.603,-727.573 881.63,-691.799"/>
+<polygon fill="black" stroke="black" points="885.087,-691.249 880.213,-681.842 878.157,-692.236 885.087,-691.249"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/lock -->
+<g id="node22" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/lock</title>
+<g id="a_node22"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="913.184" cy="-565.311" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="913.184" y="-569.111" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="913.184" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/lock -->
+<g id="edge28" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/lock</title>
+<path fill="none" stroke="black" d="M856.538,-1382.49C867.682,-1368.73 881.044,-1350.58 890.184,-1332.73 917.34,-1279.7 931.184,-1264.68 931.184,-1205.1 931.184,-1205.1 931.184,-1205.1 931.184,-743.791 931.184,-694.462 924.216,-637.812 918.951,-602.047"/>
+<polygon fill="black" stroke="black" points="922.402,-601.459 917.45,-592.093 915.48,-602.503 922.402,-601.459"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist -->
+<g id="node23" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist</title>
+<g id="a_node23"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="934.184" cy="-475.571" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="934.184" y="-479.371" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="934.184" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist -->
+<g id="edge30" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist</title>
+<path fill="none" stroke="black" d="M864.709,-1386.26C882.371,-1372.88 904.42,-1353.82 919.184,-1332.73 954.123,-1282.82 969.184,-1266.02 969.184,-1205.1 969.184,-1205.1 969.184,-1205.1 969.184,-654.051 969.184,-604.028 955.635,-547.548 945.397,-512.01"/>
+<polygon fill="black" stroke="black" points="948.667,-510.724 942.478,-502.124 941.953,-512.706 948.667,-510.724"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/termname -->
+<g id="node24" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/termname</title>
+<g id="a_node24"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="966.184" cy="-385.831" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="966.184" y="-389.631" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="966.184" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/termname -->
+<g id="edge32" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/termname</title>
+<path fill="none" stroke="black" d="M862.745,-1385.59C870.488,-1379.93 879.055,-1373.92 887.184,-1368.73 915.024,-1350.97 930.015,-1357.21 952.184,-1332.73 993.648,-1286.95 1007.18,-1266.87 1007.18,-1205.1 1007.18,-1205.1 1007.18,-1205.1 1007.18,-564.311 1007.18,-512.239 1001.18,-499.124 988.184,-448.701 985.91,-439.878 982.911,-430.534 979.862,-421.854"/>
+<polygon fill="black" stroke="black" points="983.133,-420.607 976.435,-412.399 976.553,-422.993 983.133,-420.607"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/floater -->
+<g id="node25" class="node"><title>dup21_/lht_tree_doc/comm/flags_padstack/children/floater</title>
+<g id="a_node25"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_padstack/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="1006.18" cy="-296.09" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="1006.18" y="-299.89" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="1006.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/floater -->
+<g id="edge34" class="edge"><title>dup21_/lht_tree_doc/comm/flags_padstack&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/floater</title>
+<path fill="none" stroke="black" d="M861.979,-1384.92C869.78,-1379.19 878.569,-1373.3 887.184,-1368.73 928.912,-1346.59 952.458,-1364.75 987.184,-1332.73 1032.99,-1290.49 1045.18,-1267.41 1045.18,-1205.1 1045.18,-1205.1 1045.18,-1205.1 1045.18,-474.571 1045.18,-424.179 1030,-367.575 1018.58,-332.13"/>
+<polygon fill="black" stroke="black" points="1021.79,-330.676 1015.33,-322.278 1015.14,-332.871 1021.79,-330.676"/>
+</g>
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/found&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/hole -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/hole&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/clearline -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/clearline&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/selected -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/selected&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/auto -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/auto&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/warn -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/warn&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/usetherm&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/drc -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/drc&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/lock -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/lock&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/nonetlist&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/termname -->
+<!-- dup21_/lht_tree_doc/comm/flags_padstack/children/termname&#45;&gt;dup21_/lht_tree_doc/comm/flags_padstack/children/floater -->
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID -->
+<g id="node27" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID</title>
+<g id="a_node27"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID" xlink:title=" integer layer ID the thermal affects; each word is a boolean flag that is either present on the list or is missing; only one shape may be present ">
+<ellipse fill="none" stroke="black" cx="1264.18" cy="-1305.15" rx="61.5366" ry="27.6545"/>
+<text text-anchor="middle" x="1264.18" y="-1309.45" font-family="Times,serif" font-size="14.00">li:LAYERID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID -->
+<g id="edge37" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID</title>
+<path fill="none" stroke="black" d="M974.77,-1384.63C983.871,-1378.82 994.144,-1372.97 1004.18,-1368.73 1066.67,-1342.36 1142.51,-1325.71 1196.11,-1316.27"/>
+<polygon fill="black" stroke="black" points="1196.93,-1319.68 1206.19,-1314.54 1195.74,-1312.78 1196.93,-1319.68"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on -->
+<g id="node28" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on</title>
+<g id="a_node28"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on" xlink:title=" thermal is present on this layer; if not present, all other thermal flags are ignored on this layer ">
+<ellipse fill="none" stroke="black" cx="1103.18" cy="-1204.1" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="1103.18" y="-1207.9" font-family="Times,serif" font-size="14.00">on</text>
+<text text-anchor="middle" x="1103.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on -->
+<g id="edge38" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on</title>
+<path fill="none" stroke="black" d="M1221.18,-1285.3C1197.33,-1274.03 1167.64,-1258.6 1143.18,-1241.57 1138.86,-1238.56 1134.51,-1235.12 1130.36,-1231.58"/>
+<polygon fill="black" stroke="black" points="1132.46,-1228.77 1122.66,-1224.74 1127.81,-1234 1132.46,-1228.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag -->
+<g id="node29" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag</title>
+<g id="a_node29"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag" xlink:title=" thermal graphics is not axis aligned but diagonal (rotated by 45 degrees) ">
+<ellipse fill="none" stroke="black" cx="1182.18" cy="-1204.1" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="1182.18" y="-1207.9" font-family="Times,serif" font-size="14.00">diag</text>
+<text text-anchor="middle" x="1182.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag -->
+<g id="edge39" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag</title>
+<path fill="none" stroke="black" d="M1243.49,-1279.16C1232.23,-1265.55 1218.23,-1248.64 1206.45,-1234.41"/>
+<polygon fill="black" stroke="black" points="1208.89,-1231.86 1199.81,-1226.39 1203.49,-1236.33 1208.89,-1231.86"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round -->
+<g id="node30" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round</title>
+<g id="a_node30"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round" xlink:title=" shape: rounded edge fingers ">
+<ellipse fill="none" stroke="black" cx="1264.18" cy="-1204.1" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="1264.18" y="-1207.9" font-family="Times,serif" font-size="14.00">round</text>
+<text text-anchor="middle" x="1264.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round -->
+<g id="edge40" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round</title>
+<path fill="none" stroke="black" d="M1264.18,-1277.35C1264.18,-1266.27 1264.18,-1253.25 1264.18,-1241.34"/>
+<polygon fill="black" stroke="black" points="1267.68,-1241.24 1264.18,-1231.24 1260.68,-1241.24 1267.68,-1241.24"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp -->
+<g id="node31" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp</title>
+<g id="a_node31"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp" xlink:title=" shape: sharp edge fingers ">
+<ellipse fill="none" stroke="black" cx="1348.18" cy="-1204.1" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="1348.18" y="-1207.9" font-family="Times,serif" font-size="14.00">sharp</text>
+<text text-anchor="middle" x="1348.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp -->
+<g id="edge41" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp</title>
+<path fill="none" stroke="black" d="M1285.38,-1279.16C1296.84,-1265.65 1311.06,-1248.88 1323.07,-1234.71"/>
+<polygon fill="black" stroke="black" points="1326.05,-1236.61 1329.85,-1226.72 1320.71,-1232.08 1326.05,-1236.61"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid -->
+<g id="node32" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid</title>
+<g id="a_node32"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid" xlink:title=" shape: no thermal relief, solid connection without clearance ">
+<ellipse fill="none" stroke="black" cx="1429.18" cy="-1204.1" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="1429.18" y="-1207.9" font-family="Times,serif" font-size="14.00">solid</text>
+<text text-anchor="middle" x="1429.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid -->
+<g id="edge42" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid</title>
+<path fill="none" stroke="black" d="M1308.51,-1285.96C1333.49,-1274.79 1364.7,-1259.25 1390.18,-1241.57 1394.25,-1238.75 1398.32,-1235.52 1402.22,-1232.17"/>
+<polygon fill="black" stroke="black" points="1404.83,-1234.52 1409.9,-1225.22 1400.14,-1229.33 1404.83,-1234.52"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape -->
+<g id="node33" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape</title>
+<g id="a_node33"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape" xlink:title=" shape: special: omit copper shape of the padstack on this layer ">
+<ellipse fill="none" stroke="black" cx="1521.18" cy="-1204.1" rx="43.2674" ry="26.7407"/>
+<text text-anchor="middle" x="1521.18" y="-1207.9" font-family="Times,serif" font-size="14.00">noshape</text>
+<text text-anchor="middle" x="1521.18" y="-1192.9" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape -->
+<g id="edge43" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape</title>
+<path fill="none" stroke="black" d="M1318.71,-1292.24C1360.8,-1281.92 1419.82,-1264.95 1468.18,-1241.57 1474.33,-1238.6 1480.57,-1234.97 1486.5,-1231.16"/>
+<polygon fill="black" stroke="black" points="1488.56,-1233.99 1494.92,-1225.51 1484.66,-1228.18 1488.56,-1233.99"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/x -->
+<g id="node35" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x</title>
+<g id="a_node35"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x" xlink:title="place padstack with origin at this horizontal coordinate ">
+<ellipse fill="none" stroke="black" cx="1046.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1046.18" y="-1410.71" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="1046.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x -->
+<g id="edge45" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x</title>
+<path fill="none" stroke="black" d="M1435.02,-1517.55C1357.95,-1514.63 1203.83,-1501.52 1088.18,-1445.1 1083.04,-1442.59 1078.05,-1439.27 1073.4,-1435.65"/>
+<polygon fill="black" stroke="black" points="1075.36,-1432.72 1065.47,-1428.92 1070.83,-1438.06 1075.36,-1432.72"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/y -->
+<g id="node36" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y</title>
+<g id="a_node36"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y" xlink:title="place padstack with origin at this vertical coordinate ">
+<ellipse fill="none" stroke="black" cx="1130.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1130.18" y="-1410.71" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="1130.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y -->
+<g id="edge46" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y</title>
+<path fill="none" stroke="black" d="M1435.33,-1514.13C1372.26,-1507.11 1259.23,-1489.07 1173.18,-1445.1 1167.89,-1442.39 1162.71,-1438.9 1157.88,-1435.15"/>
+<polygon fill="black" stroke="black" points="1160.04,-1432.39 1150.12,-1428.67 1155.55,-1437.76 1160.04,-1432.39"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness -->
+<g id="node37" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness</title>
+<g id="a_node37"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness" xlink:title="copper shape dimension (diameter) ">
+<ellipse fill="none" stroke="black" cx="1229.18" cy="-1406.91" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="1229.18" y="-1410.71" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="1229.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness -->
+<g id="edge47" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M1438.29,-1504.99C1397.33,-1492.09 1335.66,-1470.74 1285.18,-1445.1 1278.89,-1441.9 1272.45,-1438.14 1266.28,-1434.26"/>
+<polygon fill="black" stroke="black" points="1267.77,-1431.05 1257.47,-1428.54 1263.95,-1436.92 1267.77,-1431.05"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance -->
+<g id="node38" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance</title>
+<g id="a_node38"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance" xlink:title="copper clearance around the copper shape ">
+<ellipse fill="none" stroke="black" cx="1342.18" cy="-1406.91" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="1342.18" y="-1410.71" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="1342.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance -->
+<g id="edge48" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M1449.41,-1491.84C1427.74,-1474.88 1399.64,-1452.89 1377.64,-1435.67"/>
+<polygon fill="black" stroke="black" points="1379.57,-1432.73 1369.54,-1429.33 1375.26,-1438.25 1379.57,-1432.73"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask -->
+<g id="node39" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask</title>
+<g id="a_node39"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask" xlink:title="mask cutout shape dimension (diameter) ">
+<ellipse fill="none" stroke="black" cx="1441.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1441.18" y="-1410.71" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="1441.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask -->
+<g id="edge49" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask</title>
+<path fill="none" stroke="black" d="M1469.55,-1482.45C1464.62,-1469.51 1459.08,-1454.94 1454.21,-1442.14"/>
+<polygon fill="black" stroke="black" points="1457.46,-1440.85 1450.64,-1432.75 1450.92,-1443.34 1457.46,-1440.85"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole -->
+<g id="node40" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole</title>
+<g id="a_node40"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole" xlink:title="drill/hole diameter ">
+<ellipse fill="none" stroke="black" cx="1525.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1525.18" y="-1410.71" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="1525.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole -->
+<g id="edge50" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole</title>
+<path fill="none" stroke="black" d="M1496.82,-1482.45C1501.74,-1469.51 1507.29,-1454.94 1512.16,-1442.14"/>
+<polygon fill="black" stroke="black" points="1515.45,-1443.34 1515.73,-1432.75 1508.9,-1440.85 1515.45,-1443.34"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/name -->
+<g id="node41" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name</title>
+<g id="a_node41"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name" xlink:title="optional name attribute ">
+<ellipse fill="none" stroke="black" cx="1609.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1609.18" y="-1410.71" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="1609.18" y="-1395.71" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name -->
+<g id="edge51" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name</title>
+<path fill="none" stroke="black" d="M1515.15,-1490.54C1530.85,-1476.88 1550.04,-1460.16 1567.18,-1445.1 1571.3,-1441.48 1575.63,-1437.66 1579.89,-1433.9"/>
+<polygon fill="black" stroke="black" points="1582.24,-1436.49 1587.41,-1427.24 1577.6,-1431.25 1582.24,-1436.49"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID/children/number -->
+<g id="node42" class="node"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number</title>
+<g id="a_node42"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number" xlink:title="for a pin (or to&#45;be&#45;pin) this is the terminal ID ">
+<ellipse fill="none" stroke="black" cx="1702.18" cy="-1406.91" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="1702.18" y="-1410.71" font-family="Times,serif" font-size="14.00">number</text>
+<text text-anchor="middle" x="1702.18" y="-1395.71" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number -->
+<g id="edge52" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number</title>
+<path fill="none" stroke="black" d="M1526.55,-1502.42C1561.24,-1489.03 1610.61,-1468.35 1651.18,-1445.1 1656.8,-1441.88 1662.54,-1438.17 1668.04,-1434.36"/>
+<polygon fill="black" stroke="black" points="1670.35,-1437.01 1676.45,-1428.36 1666.28,-1431.32 1670.35,-1437.01"/>
+</g>
+<!-- dup22_/lht_tree_doc/comm/attributes -->
+<g id="node43" class="node"><title>dup22_/lht_tree_doc/comm/attributes</title>
+<g id="a_node43"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="1820.18" cy="-1406.91" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="1820.18" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;dup22_/lht_tree_doc/comm/attributes -->
+<g id="edge53" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;dup22_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M1529.68,-1509.27C1584.38,-1497.85 1677.36,-1475.88 1753.18,-1445.1 1760.98,-1441.93 1769.01,-1438.06 1776.69,-1434.03"/>
+<polygon fill="black" stroke="black" points="1778.38,-1437.09 1785.51,-1429.25 1775.05,-1430.94 1778.38,-1437.09"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia -->
+<g id="node45" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia</title>
+<g id="a_node45"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia" xlink:title="flag bits of a pin or via">
+<ellipse fill="none" stroke="black" cx="1967.18" cy="-1406.91" rx="70.922" ry="27.6545"/>
+<text text-anchor="middle" x="1967.18" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:flags_pinvia</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia -->
+<g id="edge55" class="edge"><title>/lht_tree_doc/comm/data/children/objects/children/via.ID&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia</title>
+<path fill="none" stroke="black" d="M1530.93,-1513.73C1607.68,-1505.53 1762.61,-1485.23 1888.18,-1445.1 1897.82,-1442.02 1907.8,-1438.01 1917.3,-1433.78"/>
+<polygon fill="black" stroke="black" points="1918.98,-1436.86 1926.6,-1429.5 1916.05,-1430.5 1918.98,-1436.86"/>
+</g>
+<!-- dup22_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node44" class="node"><title>dup22_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node44"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="1614.18" cy="-1305.15" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="1614.18" y="-1308.95" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="1614.18" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup22_/lht_tree_doc/comm/attributes&#45;&gt;dup22_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge54" class="edge"><title>dup22_/lht_tree_doc/comm/attributes&#45;&gt;dup22_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M1783.98,-1385.06C1774.09,-1379.57 1763.3,-1373.77 1753.18,-1368.73 1717.93,-1351.15 1708.09,-1348.93 1672.18,-1332.73 1668.32,-1330.99 1664.32,-1329.17 1660.3,-1327.34"/>
+<polygon fill="black" stroke="black" points="1661.52,-1324.05 1650.97,-1323.09 1658.62,-1330.42 1661.52,-1324.05"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/found -->
+<g id="node46" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/found</title>
+<g id="a_node46"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="1715.18" cy="-1305.15" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="1715.18" y="-1308.95" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="1715.18" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/found -->
+<g id="edge56" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/found</title>
+<path fill="none" stroke="black" d="M1925.08,-1384.58C1913.3,-1379.03 1900.38,-1373.32 1888.18,-1368.73 1834.08,-1348.35 1816.59,-1354.87 1763.18,-1332.73 1759.01,-1331 1754.74,-1329 1750.55,-1326.89"/>
+<polygon fill="black" stroke="black" points="1752.04,-1323.72 1741.56,-1322.15 1748.78,-1329.91 1752.04,-1323.72"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<g id="node47" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/hole</title>
+<g id="a_node47"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/hole" xlink:title="For pins and vias, this flag means that the pin or via is a hole without a copper annulus.">
+<ellipse fill="none" stroke="black" cx="1759.18" cy="-1204.1" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="1759.18" y="-1207.9" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="1759.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<g id="edge57" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/hole</title>
+<path fill="none" stroke="black" d="M1923.89,-1385.08C1912.34,-1379.65 1899.83,-1373.88 1888.18,-1368.73 1849.91,-1351.81 1829.65,-1363.4 1801.18,-1332.73 1777.89,-1307.64 1767.5,-1269.37 1762.88,-1241.28"/>
+<polygon fill="black" stroke="black" points="1766.29,-1240.45 1761.37,-1231.06 1759.37,-1241.47 1766.29,-1240.45"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<g id="node48" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline</title>
+<g id="a_node48"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="1780.18" cy="-1103.75" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="1780.18" y="-1107.55" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="1780.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<g id="edge59" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline</title>
+<path fill="none" stroke="black" d="M1922.88,-1385.21C1890.56,-1369.29 1850.53,-1347.58 1839.18,-1332.73 1839.09,-1332.61 1805.87,-1204.14 1789.33,-1140.13"/>
+<polygon fill="black" stroke="black" points="1792.72,-1139.25 1786.82,-1130.44 1785.94,-1141 1792.72,-1139.25"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<g id="node49" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/selected</title>
+<g id="a_node49"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="1821.18" cy="-1014.01" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="1821.18" y="-1017.81" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="1821.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<g id="edge61" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/selected</title>
+<path fill="none" stroke="black" d="M1928.27,-1383.58C1909.88,-1371 1889.34,-1353.61 1877.18,-1332.73 1819.16,-1233.09 1855.6,-1190.18 1834.18,-1076.88 1832.59,-1068.45 1830.76,-1059.39 1828.98,-1050.88"/>
+<polygon fill="black" stroke="black" points="1832.35,-1049.91 1826.86,-1040.85 1825.5,-1051.36 1832.35,-1049.91"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<g id="node50" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/auto</title>
+<g id="a_node50"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="1873.18" cy="-924.271" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="1873.18" y="-928.071" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="1873.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<g id="edge63" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/auto</title>
+<path fill="none" stroke="black" d="M1944.94,-1380.47C1934.38,-1367.1 1922.5,-1349.94 1915.18,-1332.73 1892.61,-1279.61 1891.18,-1262.82 1891.18,-1205.1 1891.18,-1205.1 1891.18,-1205.1 1891.18,-1102.75 1891.18,-1053.42 1884.22,-996.773 1878.95,-961.007"/>
+<polygon fill="black" stroke="black" points="1882.4,-960.42 1877.45,-951.054 1875.48,-961.464 1882.4,-960.42"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<g id="node51" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/warn</title>
+<g id="a_node51"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/warn" xlink:title="For pins, vias, and pads, set to indicate a warning.">
+<ellipse fill="none" stroke="black" cx="1908.18" cy="-834.531" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="1908.18" y="-838.331" font-family="Times,serif" font-size="14.00">warn</text>
+<text text-anchor="middle" x="1908.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<g id="edge65" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/warn</title>
+<path fill="none" stroke="black" d="M1958.84,-1379.26C1947.66,-1341.08 1929.18,-1268.43 1929.18,-1205.1 1929.18,-1205.1 1929.18,-1205.1 1929.18,-1013.01 1929.18,-963.592 1921.05,-906.964 1914.91,-871.229"/>
+<polygon fill="black" stroke="black" points="1918.34,-870.525 1913.16,-861.284 1911.45,-871.739 1918.34,-870.525"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<g id="node52" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm</title>
+<g id="a_node52"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="1930.18" cy="-744.791" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="1930.18" y="-748.591" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="1930.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<g id="edge67" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm</title>
+<path fill="none" stroke="black" d="M1967.18,-1379.28C1967.18,-1340.82 1967.18,-1267.5 1967.18,-1205.1 1967.18,-1205.1 1967.18,-1205.1 1967.18,-923.271 1967.18,-873.139 1952.86,-816.685 1942.04,-781.183"/>
+<polygon fill="black" stroke="black" points="1945.28,-779.809 1938.95,-771.308 1938.59,-781.897 1945.28,-779.809"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<g id="node53" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/drc</title>
+<g id="a_node53"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="1988.18" cy="-655.051" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="1988.18" y="-658.851" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="1988.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<g id="edge69" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/drc</title>
+<path fill="none" stroke="black" d="M1975.52,-1379.26C1986.71,-1341.08 2005.18,-1268.43 2005.18,-1205.1 2005.18,-1205.1 2005.18,-1205.1 2005.18,-833.531 2005.18,-784.229 1998.6,-727.573 1993.63,-691.799"/>
+<polygon fill="black" stroke="black" points="1997.09,-691.249 1992.21,-681.842 1990.16,-692.236 1997.09,-691.249"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<g id="node54" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/lock</title>
+<g id="a_node54"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="2025.18" cy="-565.311" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="2025.18" y="-569.111" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="2025.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<g id="edge71" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/lock</title>
+<path fill="none" stroke="black" d="M1984.05,-1379.83C2006.44,-1342.62 2043.18,-1271.45 2043.18,-1205.1 2043.18,-1205.1 2043.18,-1205.1 2043.18,-743.791 2043.18,-694.462 2036.22,-637.812 2030.95,-602.047"/>
+<polygon fill="black" stroke="black" points="2034.4,-601.459 2029.45,-592.093 2027.48,-602.503 2034.4,-601.459"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<g id="node55" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist</title>
+<g id="a_node55"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="2046.18" cy="-475.571" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="2046.18" y="-479.371" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="2046.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<g id="edge73" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist</title>
+<path fill="none" stroke="black" d="M1994.38,-1381.17C2007.78,-1367.85 2023.34,-1350.53 2034.18,-1332.73 2065.63,-1281.1 2081.18,-1265.55 2081.18,-1205.1 2081.18,-1205.1 2081.18,-1205.1 2081.18,-654.051 2081.18,-604.028 2067.64,-547.548 2057.4,-512.01"/>
+<polygon fill="black" stroke="black" points="2060.67,-510.724 2054.48,-502.124 2053.95,-512.706 2060.67,-510.724"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<g id="node56" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/termname</title>
+<g id="a_node56"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="2078.18" cy="-385.831" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="2078.18" y="-389.631" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="2078.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<g id="edge75" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/termname</title>
+<path fill="none" stroke="black" d="M2006.01,-1383.82C2025.82,-1370.98 2049.07,-1353.29 2065.18,-1332.73 2103.18,-1284.25 2119.18,-1266.69 2119.18,-1205.1 2119.18,-1205.1 2119.18,-1205.1 2119.18,-564.311 2119.18,-512.239 2113.18,-499.124 2100.18,-448.701 2097.91,-439.878 2094.91,-430.534 2091.86,-421.854"/>
+<polygon fill="black" stroke="black" points="2095.13,-420.607 2088.43,-412.399 2088.55,-422.993 2095.13,-420.607"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<g id="node57" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/floater</title>
+<g id="a_node57"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="2130.18" cy="-296.09" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="2130.18" y="-299.89" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="2130.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<g id="edge77" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/floater</title>
+<path fill="none" stroke="black" d="M2011.15,-1385.27C2044.25,-1369.06 2086.07,-1346.93 2099.18,-1332.73 2141.45,-1286.95 2157.18,-1267.41 2157.18,-1205.1 2157.18,-1205.1 2157.18,-1205.1 2157.18,-474.571 2157.18,-424.929 2146.73,-368.355 2138.83,-332.693"/>
+<polygon fill="black" stroke="black" points="2142.21,-331.747 2136.58,-322.77 2135.38,-333.296 2142.21,-331.747"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<g id="node58" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/pin</title>
+<g id="a_node58"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/pin" xlink:title="object is a pin (in an element)">
+<ellipse fill="none" stroke="black" cx="2178.18" cy="-206.35" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="2178.18" y="-210.15" font-family="Times,serif" font-size="14.00">pin</text>
+<text text-anchor="middle" x="2178.18" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<g id="edge79" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/pin</title>
+<path fill="none" stroke="black" d="M2011.03,-1385.08C2022.73,-1379.65 2035.39,-1373.88 2047.18,-1368.73 2085.91,-1351.82 2104.55,-1361.84 2135.18,-1332.73 2180.62,-1289.55 2195.18,-1267.78 2195.18,-1205.1 2195.18,-1205.1 2195.18,-1205.1 2195.18,-384.831 2195.18,-335.528 2188.6,-278.872 2183.63,-243.098"/>
+<polygon fill="black" stroke="black" points="2187.09,-242.548 2182.21,-233.142 2180.16,-243.535 2187.09,-242.548"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<g id="node59" class="node"><title>dup23_/lht_tree_doc/comm/flags_pinvia/children/via</title>
+<g id="a_node59"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/via" xlink:title="object is a via">
+<ellipse fill="none" stroke="black" cx="2206.18" cy="-116.61" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="2206.18" y="-120.41" font-family="Times,serif" font-size="14.00">via</text>
+<text text-anchor="middle" x="2206.18" y="-105.41" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<g id="edge81" class="edge"><title>dup23_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/via</title>
+<path fill="none" stroke="black" d="M2009.43,-1384.79C2021.47,-1379.18 2034.7,-1373.4 2047.18,-1368.73 2101.34,-1348.48 2128.07,-1370.09 2172.18,-1332.73 2220.16,-1292.1 2233.18,-1267.97 2233.18,-1205.1 2233.18,-1205.1 2233.18,-1205.1 2233.18,-295.09 2233.18,-245.307 2222.67,-188.552 2214.77,-152.907"/>
+<polygon fill="black" stroke="black" points="2218.14,-151.971 2212.51,-142.996 2211.32,-153.523 2218.14,-151.971"/>
+</g>
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/found&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/hole&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/clearline&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/selected&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/auto&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/warn&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/usetherm&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/drc&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/lock&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/nonetlist&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/termname&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/floater&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<!-- dup23_/lht_tree_doc/comm/flags_pinvia/children/pin&#45;&gt;dup23_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME -->
+<g id="node61" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME</title>
+<g id="a_node61"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME" xlink:title="a logical layer">
+<ellipse fill="none" stroke="black" cx="2528.18" cy="-1519.28" rx="52.1524" ry="27.6545"/>
+<text text-anchor="middle" x="2528.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:NAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME -->
+<g id="edge84" class="edge"><title>/lht_tree_doc/comm/data/children/layers&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME</title>
+<path fill="none" stroke="black" d="M4992.98,-1628.79C4697.81,-1615.8 2943.73,-1538.57 2590.24,-1523.01"/>
+<polygon fill="black" stroke="black" points="2590.34,-1519.51 2580.19,-1522.57 2590.03,-1526.51 2590.34,-1519.51"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/lid -->
+<g id="node62" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/lid</title>
+<g id="a_node62"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/lid" xlink:title="layer ID">
+<ellipse fill="none" stroke="black" cx="2094.18" cy="-1406.91" rx="38.3684" ry="37.4533"/>
+<text text-anchor="middle" x="2094.18" y="-1418.21" font-family="Times,serif" font-size="14.00">lid</text>
+<text text-anchor="middle" x="2094.18" y="-1403.21" font-family="Times,serif" font-size="14.00">integer</text>
+<text text-anchor="middle" x="2094.18" y="-1388.21" font-family="Times,serif" font-size="14.00">&gt;=2</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/lid -->
+<g id="edge85" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/lid</title>
+<path fill="none" stroke="black" d="M2476.04,-1516.29C2399.4,-1511.66 2253.31,-1496.26 2141.18,-1445.1 2137.35,-1443.35 2133.55,-1441.22 2129.88,-1438.88"/>
+<polygon fill="black" stroke="black" points="2131.77,-1435.93 2121.56,-1433.11 2127.78,-1441.68 2131.77,-1435.93"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/visible -->
+<g id="node63" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/visible</title>
+<g id="a_node63"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/visible" xlink:title="only in real (non&#45;boud) layers: 1 if the layer is visible, 0 if not (UI setting)">
+<ellipse fill="none" stroke="black" cx="2188.18" cy="-1406.91" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="2188.18" y="-1410.71" font-family="Times,serif" font-size="14.00">visible</text>
+<text text-anchor="middle" x="2188.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/visible -->
+<g id="edge86" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/visible</title>
+<path fill="none" stroke="black" d="M2477.48,-1512.26C2417.22,-1503.63 2314.81,-1484.26 2235.18,-1445.1 2229.68,-1442.39 2224.22,-1438.96 2219.08,-1435.28"/>
+<polygon fill="black" stroke="black" points="2220.83,-1432.22 2210.76,-1428.94 2216.59,-1437.79 2220.83,-1432.22"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/group -->
+<g id="node64" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/group</title>
+<g id="a_node64"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/group" xlink:title="only in real (non&#45;boud) layers: &quot;parent&quot; layer group ID ">
+<ellipse fill="none" stroke="black" cx="2282.18" cy="-1406.91" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="2282.18" y="-1410.71" font-family="Times,serif" font-size="14.00">group</text>
+<text text-anchor="middle" x="2282.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/group -->
+<g id="edge87" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/group</title>
+<path fill="none" stroke="black" d="M2482.13,-1505.88C2440.6,-1493.67 2378.63,-1472.81 2329.18,-1445.1 2323.95,-1442.16 2318.69,-1438.67 2313.68,-1435.01"/>
+<polygon fill="black" stroke="black" points="2315.6,-1432.07 2305.54,-1428.77 2311.35,-1437.63 2315.6,-1432.07"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/color -->
+<g id="node65" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/color</title>
+<g id="a_node65"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/color" xlink:title=" layer color on UI, in #rrggbb format ">
+<ellipse fill="none" stroke="black" cx="2371.18" cy="-1406.91" rx="33.4697" ry="37.4533"/>
+<text text-anchor="middle" x="2371.18" y="-1418.21" font-family="Times,serif" font-size="14.00">color</text>
+<text text-anchor="middle" x="2371.18" y="-1403.21" font-family="Times,serif" font-size="14.00">string</text>
+<text text-anchor="middle" x="2371.18" y="-1388.21" font-family="Times,serif" font-size="14.00">&gt;=5</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/color -->
+<g id="edge88" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/color</title>
+<path fill="none" stroke="black" d="M2493.78,-1498.34C2470.42,-1484.34 2439.17,-1464.68 2413.18,-1445.1 2410.21,-1442.86 2407.18,-1440.45 2404.19,-1437.99"/>
+<polygon fill="black" stroke="black" points="2406.3,-1435.18 2396.41,-1431.39 2401.77,-1440.52 2406.3,-1435.18"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs -->
+<g id="node66" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs</title>
+<g id="a_node66"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs" xlink:title="only in bound layers: match offset e.g. for internal copper layers">
+<ellipse fill="none" stroke="black" cx="2473.18" cy="-1406.91" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="2473.18" y="-1410.71" font-family="Times,serif" font-size="14.00">stack_offs</text>
+<text text-anchor="middle" x="2473.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs -->
+<g id="edge89" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs</title>
+<path fill="none" stroke="black" d="M2515.29,-1492.4C2507.86,-1477.49 2498.42,-1458.56 2490.37,-1442.39"/>
+<polygon fill="black" stroke="black" points="2493.4,-1440.64 2485.81,-1433.25 2487.14,-1443.76 2493.4,-1440.64"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type -->
+<g id="node67" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type</title>
+<g id="a_node67"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/type" xlink:title="only for bound layers: try to bind to this type of layer on the host board">
+<ellipse fill="none" stroke="black" cx="2582.18" cy="-1406.91" rx="39.6962" ry="27.6545"/>
+<text text-anchor="middle" x="2582.18" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:type</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/type -->
+<g id="edge90" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/type</title>
+<path fill="none" stroke="black" d="M2540.84,-1492.4C2548.14,-1477.49 2557.41,-1458.56 2565.31,-1442.39"/>
+<polygon fill="black" stroke="black" points="2568.54,-1443.77 2569.79,-1433.25 2562.25,-1440.69 2568.54,-1443.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/combining -->
+<g id="node78" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining</title>
+<g id="a_node78"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining" xlink:title="layer combination (compositing) flags">
+<ellipse fill="none" stroke="black" cx="2713.18" cy="-1406.91" rx="53.066" ry="38.3684"/>
+<text text-anchor="middle" x="2713.18" y="-1418.71" font-family="Times,serif" font-size="14.00">combining</text>
+<text text-anchor="middle" x="2713.18" y="-1387.71" font-family="Times,serif" font-size="14.00">&gt;=2</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining -->
+<g id="edge110" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining</title>
+<path fill="none" stroke="black" d="M2562.12,-1498.04C2590.72,-1480.97 2632.02,-1456.33 2664.21,-1437.13"/>
+<polygon fill="black" stroke="black" points="2666.23,-1440 2673.03,-1431.87 2662.65,-1433.99 2666.23,-1440"/>
+</g>
+<!-- dup26_/lht_tree_doc/comm/attributes -->
+<g id="node81" class="node"><title>dup26_/lht_tree_doc/comm/attributes</title>
+<g id="a_node81"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="2844.18" cy="-1406.91" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="2844.18" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;dup26_/lht_tree_doc/comm/attributes -->
+<g id="edge114" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;dup26_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M2575.61,-1507.33C2626.08,-1494.96 2707.79,-1472.89 2775.18,-1445.1 2783.14,-1441.82 2791.38,-1437.89 2799.27,-1433.83"/>
+<polygon fill="black" stroke="black" points="2801.13,-1436.8 2808.34,-1429.04 2797.86,-1430.61 2801.13,-1436.8"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects -->
+<g id="node83" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects</title>
+<g id="a_node83"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects" xlink:title="list of drawing primitives put on this layer">
+<ellipse fill="none" stroke="black" cx="4211.18" cy="-1406.91" rx="46.8387" ry="27.6545"/>
+<text text-anchor="middle" x="4211.18" y="-1411.21" font-family="Times,serif" font-size="14.00">li:objects</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects -->
+<g id="edge116" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects</title>
+<path fill="none" stroke="black" d="M2579.93,-1514.89C2828.18,-1498.61 3895.65,-1428.6 4154.49,-1411.63"/>
+<polygon fill="black" stroke="black" points="4155.03,-1415.1 4164.78,-1410.96 4154.57,-1408.12 4155.03,-1415.1"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="node68" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/top</title>
+<g id="a_node68"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/top" xlink:title="location: top side">
+<ellipse fill="none" stroke="black" cx="2299.18" cy="-1305.15" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="2299.18" y="-1308.95" font-family="Times,serif" font-size="14.00">top</text>
+<text text-anchor="middle" x="2299.18" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="edge91" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/top</title>
+<path fill="none" stroke="black" d="M2558.68,-1384.58C2551.02,-1378.63 2542.17,-1372.71 2533.18,-1368.73 2453.4,-1333.41 2421.22,-1365.08 2340.18,-1332.73 2336.48,-1331.25 2332.75,-1329.42 2329.13,-1327.41"/>
+<polygon fill="black" stroke="black" points="2330.82,-1324.34 2320.45,-1322.17 2327.2,-1330.33 2330.82,-1324.34"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="node69" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<g id="a_node69"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/bottom" xlink:title="location: bottom side">
+<ellipse fill="none" stroke="black" cx="2324.18" cy="-1204.1" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="2324.18" y="-1207.9" font-family="Times,serif" font-size="14.00">bottom</text>
+<text text-anchor="middle" x="2324.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="edge92" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<path fill="none" stroke="black" d="M2558.32,-1384.63C2550.72,-1378.75 2541.98,-1372.86 2533.18,-1368.73 2469.16,-1338.69 2432.3,-1378.26 2378.18,-1332.73 2350.72,-1309.62 2336.92,-1270.11 2330.2,-1241.15"/>
+<polygon fill="black" stroke="black" points="2333.54,-1240.06 2328.03,-1231.01 2326.7,-1241.52 2333.54,-1240.06"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="node70" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<g id="a_node70"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/intern" xlink:title="location: internal">
+<ellipse fill="none" stroke="black" cx="2368.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="2368.18" y="-1107.55" font-family="Times,serif" font-size="14.00">intern</text>
+<text text-anchor="middle" x="2368.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="edge94" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<path fill="none" stroke="black" d="M2557.88,-1384.82C2550.33,-1379.01 2541.74,-1373.11 2533.18,-1368.73 2484.77,-1343.9 2452.87,-1372.91 2416.18,-1332.73 2390.9,-1305.03 2377.06,-1197.82 2371.35,-1140.83"/>
+<polygon fill="black" stroke="black" points="2374.83,-1140.42 2370.38,-1130.81 2367.86,-1141.1 2374.83,-1140.42"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="node71" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<g id="a_node71"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/logical" xlink:title="location: logical (not in the actual stackup)">
+<ellipse fill="none" stroke="black" cx="2403.18" cy="-1014.01" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="2403.18" y="-1017.81" font-family="Times,serif" font-size="14.00">logical</text>
+<text text-anchor="middle" x="2403.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="edge96" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<path fill="none" stroke="black" d="M2557.25,-1385.31C2549.75,-1379.58 2541.34,-1373.6 2533.18,-1368.73 2500.06,-1348.95 2477.57,-1363.42 2454.18,-1332.73 2445.68,-1321.57 2419.09,-1132.11 2408.06,-1051.19"/>
+<polygon fill="black" stroke="black" points="2411.49,-1050.41 2406.67,-1040.97 2404.55,-1051.35 2411.49,-1050.41"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="node72" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<g id="a_node72"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/copper" xlink:title="material: copper">
+<ellipse fill="none" stroke="black" cx="2441.18" cy="-924.271" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="2441.18" y="-928.071" font-family="Times,serif" font-size="14.00">copper</text>
+<text text-anchor="middle" x="2441.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="edge98" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<path fill="none" stroke="black" d="M2555.91,-1386.04C2530.86,-1366.84 2496.33,-1339.69 2492.18,-1332.73 2462.66,-1283.13 2468.18,-1262.82 2468.18,-1205.1 2468.18,-1205.1 2468.18,-1205.1 2468.18,-1102.75 2468.18,-1053.11 2457.73,-996.536 2449.83,-960.873"/>
+<polygon fill="black" stroke="black" points="2453.21,-959.928 2447.58,-950.95 2446.38,-961.477 2453.21,-959.928"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="node73" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<g id="a_node73"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/silk" xlink:title="material: silk">
+<ellipse fill="none" stroke="black" cx="2489.18" cy="-834.531" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="2489.18" y="-838.331" font-family="Times,serif" font-size="14.00">silk</text>
+<text text-anchor="middle" x="2489.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="edge100" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<path fill="none" stroke="black" d="M2562.04,-1383.09C2550.99,-1369.39 2537.99,-1351.09 2530.18,-1332.73 2507.61,-1279.61 2506.18,-1262.82 2506.18,-1205.1 2506.18,-1205.1 2506.18,-1205.1 2506.18,-1013.01 2506.18,-963.709 2499.6,-907.053 2494.63,-871.279"/>
+<polygon fill="black" stroke="black" points="2498.09,-870.729 2493.21,-861.322 2491.16,-871.716 2498.09,-870.729"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="node74" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<g id="a_node74"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/mask" xlink:title="material: mask">
+<ellipse fill="none" stroke="black" cx="2521.18" cy="-744.791" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="2521.18" y="-748.591" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="2521.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="edge102" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<path fill="none" stroke="black" d="M2574.03,-1379.9C2562.87,-1341.89 2544.18,-1268.79 2544.18,-1205.1 2544.18,-1205.1 2544.18,-1205.1 2544.18,-923.271 2544.18,-873.783 2535.28,-817.173 2528.55,-781.459"/>
+<polygon fill="black" stroke="black" points="2531.97,-780.677 2526.63,-771.521 2525.09,-782.003 2531.97,-780.677"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="node75" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<g id="a_node75"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/paste" xlink:title="material: paste">
+<ellipse fill="none" stroke="black" cx="2561.18" cy="-655.051" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="2561.18" y="-658.851" font-family="Times,serif" font-size="14.00">paste</text>
+<text text-anchor="middle" x="2561.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="edge104" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<path fill="none" stroke="black" d="M2582.18,-1379.28C2582.18,-1340.82 2582.18,-1267.5 2582.18,-1205.1 2582.18,-1205.1 2582.18,-1205.1 2582.18,-833.531 2582.18,-784.111 2574.05,-727.484 2567.91,-691.748"/>
+<polygon fill="black" stroke="black" points="2571.34,-691.045 2566.16,-681.803 2564.45,-692.259 2571.34,-691.045"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="node76" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<g id="a_node76"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/outline" xlink:title="&quot;material&quot;: router path (board outline, slots, cutouts) ">
+<ellipse fill="none" stroke="black" cx="2592.18" cy="-565.311" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="2592.18" y="-569.111" font-family="Times,serif" font-size="14.00">outline</text>
+<text text-anchor="middle" x="2592.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="edge106" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<path fill="none" stroke="black" d="M2590.34,-1379.9C2601.5,-1341.89 2620.18,-1268.79 2620.18,-1205.1 2620.18,-1205.1 2620.18,-1205.1 2620.18,-743.791 2620.18,-694.107 2609.34,-637.544 2601.15,-601.895"/>
+<polygon fill="black" stroke="black" points="2604.52,-600.908 2598.82,-591.976 2597.7,-602.512 2604.52,-600.908"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="node77" class="node"><title>dup24_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<g id="a_node77"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/substrate" xlink:title="material: substrate or insulator">
+<ellipse fill="none" stroke="black" cx="2625.18" cy="-475.571" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="2625.18" y="-479.371" font-family="Times,serif" font-size="14.00">substrate</text>
+<text text-anchor="middle" x="2625.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="edge108" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/type&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<path fill="none" stroke="black" d="M2598.12,-1381.37C2620.4,-1344.62 2658.18,-1272.38 2658.18,-1205.1 2658.18,-1205.1 2658.18,-1205.1 2658.18,-654.051 2658.18,-604.132 2645.41,-547.627 2635.76,-512.054"/>
+<polygon fill="black" stroke="black" points="2639.06,-510.855 2633,-502.159 2632.31,-512.731 2639.06,-510.855"/>
+</g>
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/top&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/bottom&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/intern -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/intern&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/logical -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/logical&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/copper -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/copper&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/silk -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/silk&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/mask -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/mask&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/paste -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/paste&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/outline -->
+<!-- dup24_/lht_tree_doc/comm/layer_mask/children/outline&#45;&gt;dup24_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<!-- dup25_/lht_tree_doc/comm/combining/children/sub -->
+<g id="node79" class="node"><title>dup25_/lht_tree_doc/comm/combining/children/sub</title>
+<g id="a_node79"><a xlink:href="tree.html#/lht_tree_doc/comm/combining/children/sub" xlink:title="draw in negative">
+<ellipse fill="none" stroke="black" cx="2713.18" cy="-1305.15" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="2713.18" y="-1308.95" font-family="Times,serif" font-size="14.00">sub</text>
+<text text-anchor="middle" x="2713.18" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/combining&#45;&gt;dup25_/lht_tree_doc/comm/combining/children/sub -->
+<g id="edge111" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining&#45;&gt;dup25_/lht_tree_doc/comm/combining/children/sub</title>
+<path fill="none" stroke="black" d="M2713.18,-1368.48C2713.18,-1359.91 2713.18,-1350.82 2713.18,-1342.31"/>
+<polygon fill="black" stroke="black" points="2716.68,-1342.28 2713.18,-1332.28 2709.68,-1342.28 2716.68,-1342.28"/>
+</g>
+<!-- dup25_/lht_tree_doc/comm/combining/children/auto -->
+<g id="node80" class="node"><title>dup25_/lht_tree_doc/comm/combining/children/auto</title>
+<g id="a_node80"><a xlink:href="tree.html#/lht_tree_doc/comm/combining/children/auto" xlink:title="padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag">
+<ellipse fill="none" stroke="black" cx="2714.18" cy="-1204.1" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="2714.18" y="-1207.9" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="2714.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/combining&#45;&gt;dup25_/lht_tree_doc/comm/combining/children/auto -->
+<g id="edge112" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining&#45;&gt;dup25_/lht_tree_doc/comm/combining/children/auto</title>
+<path fill="none" stroke="black" d="M2733.99,-1371.77C2740.15,-1359.85 2746.07,-1346.11 2749.18,-1332.73 2754.74,-1308.85 2754.65,-1301.47 2749.18,-1277.57 2745.96,-1263.46 2739.61,-1248.91 2733.2,-1236.57"/>
+<polygon fill="black" stroke="black" points="2736.18,-1234.73 2728.33,-1227.62 2730.03,-1238.08 2736.18,-1234.73"/>
+</g>
+<!-- dup25_/lht_tree_doc/comm/combining/children/sub&#45;&gt;dup25_/lht_tree_doc/comm/combining/children/auto -->
+<!-- dup26_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node82" class="node"><title>dup26_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node82"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="2845.18" cy="-1305.15" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="2845.18" y="-1308.95" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="2845.18" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup26_/lht_tree_doc/comm/attributes&#45;&gt;dup26_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge115" class="edge"><title>dup26_/lht_tree_doc/comm/attributes&#45;&gt;dup26_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M2844.45,-1379.18C2844.56,-1367.93 2844.7,-1354.66 2844.82,-1342.54"/>
+<polygon fill="black" stroke="black" points="2848.32,-1342.3 2844.92,-1332.27 2841.32,-1342.23 2848.32,-1342.3"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID -->
+<g id="node84" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID</title>
+<g id="a_node84"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID" xlink:title="round cap line">
+<ellipse fill="none" stroke="black" cx="3202.18" cy="-1305.15" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="3202.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:line.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID -->
+<g id="edge117" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID</title>
+<path fill="none" stroke="black" d="M4165.21,-1401.37C4001.18,-1385.15 3444.78,-1330.14 3261.37,-1312"/>
+<polygon fill="black" stroke="black" points="3261.67,-1308.52 3251.37,-1311.02 3260.98,-1315.48 3261.67,-1308.52"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID -->
+<g id="node111" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID</title>
+<g id="a_node111"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID" xlink:title="round cap elliptic arc (only width==height is fully supported at the moment)">
+<ellipse fill="none" stroke="black" cx="4211.18" cy="-1305.15" rx="48.1667" ry="27.6545"/>
+<text text-anchor="middle" x="4211.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:arc.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID -->
+<g id="edge154" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID</title>
+<path fill="none" stroke="black" d="M4211.18,-1379.18C4211.18,-1368.11 4211.18,-1355.08 4211.18,-1343.12"/>
+<polygon fill="black" stroke="black" points="4214.68,-1342.96 4211.18,-1332.96 4207.68,-1342.96 4214.68,-1342.96"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID -->
+<g id="node140" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID</title>
+<g id="a_node140"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID" xlink:title="polygon, as drawn (unclipped)">
+<ellipse fill="none" stroke="black" cx="5475.18" cy="-1305.15" rx="67.3507" ry="27.6545"/>
+<text text-anchor="middle" x="5475.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:polygon.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID -->
+<g id="edge193" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID</title>
+<path fill="none" stroke="black" d="M4257.29,-1402.27C4446.29,-1387.36 5162.84,-1330.8 5399.11,-1312.16"/>
+<polygon fill="black" stroke="black" points="5399.63,-1315.63 5409.32,-1311.35 5399.08,-1308.65 5399.63,-1315.63"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID -->
+<g id="node165" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID</title>
+<g id="a_node165"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID" xlink:title="single line text object">
+<ellipse fill="none" stroke="black" cx="6350.18" cy="-1305.15" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="6350.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:text.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID -->
+<g id="edge228" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID</title>
+<path fill="none" stroke="black" d="M4257.85,-1403.74C4536.18,-1390.76 5975.77,-1323.61 6289.69,-1308.97"/>
+<polygon fill="black" stroke="black" points="6290.12,-1312.46 6299.95,-1308.49 6289.8,-1305.46 6290.12,-1312.46"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1 -->
+<g id="node85" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1</title>
+<g id="a_node85"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1" xlink:title="line first endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="2794.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2794.18" y="-1207.9" font-family="Times,serif" font-size="14.00">x1</text>
+<text text-anchor="middle" x="2794.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1 -->
+<g id="edge118" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1</title>
+<path fill="none" stroke="black" d="M3151.99,-1304C3079.01,-1301.97 2940.91,-1291.16 2836.18,-1241.57 2831.16,-1239.2 2826.28,-1236.05 2821.73,-1232.59"/>
+<polygon fill="black" stroke="black" points="2823.86,-1229.82 2813.92,-1226.15 2819.4,-1235.21 2823.86,-1229.82"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1 -->
+<g id="node86" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1</title>
+<g id="a_node86"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1" xlink:title="line first endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="2878.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2878.18" y="-1207.9" font-family="Times,serif" font-size="14.00">y1</text>
+<text text-anchor="middle" x="2878.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1 -->
+<g id="edge119" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1</title>
+<path fill="none" stroke="black" d="M3152.58,-1300.57C3094.23,-1294.72 2995.76,-1279.66 2920.18,-1241.57 2915.22,-1239.08 2910.37,-1235.86 2905.83,-1232.37"/>
+<polygon fill="black" stroke="black" points="2907.97,-1229.6 2898.04,-1225.91 2903.5,-1234.99 2907.97,-1229.6"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2 -->
+<g id="node87" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2</title>
+<g id="a_node87"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2" xlink:title="line second endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="2962.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2962.18" y="-1207.9" font-family="Times,serif" font-size="14.00">x2</text>
+<text text-anchor="middle" x="2962.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2 -->
+<g id="edge120" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2</title>
+<path fill="none" stroke="black" d="M3155.19,-1295C3113.63,-1285.62 3052.31,-1268.53 3004.18,-1241.57 2999.56,-1238.99 2994.99,-1235.83 2990.67,-1232.47"/>
+<polygon fill="black" stroke="black" points="2992.63,-1229.55 2982.7,-1225.86 2988.16,-1234.94 2992.63,-1229.55"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2 -->
+<g id="node88" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2</title>
+<g id="a_node88"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2" xlink:title="line second endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="3046.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="3046.18" y="-1207.9" font-family="Times,serif" font-size="14.00">y2</text>
+<text text-anchor="middle" x="3046.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2 -->
+<g id="edge121" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2</title>
+<path fill="none" stroke="black" d="M3165.47,-1286.17C3142.82,-1274.51 3113.54,-1258.4 3089.18,-1241.57 3084.65,-1238.44 3080.04,-1234.93 3075.59,-1231.35"/>
+<polygon fill="black" stroke="black" points="3077.76,-1228.6 3067.83,-1224.9 3073.29,-1233.98 3077.76,-1228.6"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness -->
+<g id="node89" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness</title>
+<g id="a_node89"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness" xlink:title="width of the line ">
+<ellipse fill="none" stroke="black" cx="3145.18" cy="-1204.1" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="3145.18" y="-1207.9" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="3145.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness -->
+<g id="edge122" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M3187.5,-1278.64C3180.48,-1266.44 3171.98,-1251.67 3164.45,-1238.58"/>
+<polygon fill="black" stroke="black" points="3167.44,-1236.76 3159.42,-1229.84 3161.37,-1240.25 3167.44,-1236.76"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance -->
+<g id="node90" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance</title>
+<g id="a_node90"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance" xlink:title="copper clearance around the object ">
+<ellipse fill="none" stroke="black" cx="3258.18" cy="-1204.1" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="3258.18" y="-1207.9" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="3258.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance -->
+<g id="edge123" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M3216.61,-1278.64C3223.5,-1266.44 3231.85,-1251.67 3239.25,-1238.58"/>
+<polygon fill="black" stroke="black" points="3242.32,-1240.26 3244.2,-1229.84 3236.23,-1236.82 3242.32,-1240.26"/>
+</g>
+<!-- dup27_/lht_tree_doc/comm/attributes -->
+<g id="node91" class="node"><title>dup27_/lht_tree_doc/comm/attributes</title>
+<g id="a_node91"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="3383.18" cy="-1204.1" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="3383.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup27_/lht_tree_doc/comm/attributes -->
+<g id="edge124" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup27_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M3237.08,-1285.05C3265.51,-1269.5 3305.88,-1247.41 3336.98,-1230.38"/>
+<polygon fill="black" stroke="black" points="3338.81,-1233.37 3345.9,-1225.5 3335.45,-1227.23 3338.81,-1233.37"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line -->
+<g id="node93" class="node"><title>dup28_/lht_tree_doc/comm/flags_line</title>
+<g id="a_node93"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line" xlink:title="flag bits of a line">
+<ellipse fill="none" stroke="black" cx="3501.18" cy="-1204.1" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="3501.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup28_/lht_tree_doc/comm/flags_line -->
+<g id="edge126" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup28_/lht_tree_doc/comm/flags_line</title>
+<path fill="none" stroke="black" d="M3250.84,-1297.58C3302.44,-1289.34 3385.4,-1272.41 3451.18,-1241.57 3456.87,-1238.91 3462.56,-1235.57 3467.96,-1231.99"/>
+<polygon fill="black" stroke="black" points="3469.99,-1234.84 3476.17,-1226.23 3465.97,-1229.11 3469.99,-1234.84"/>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy -->
+<g id="node105" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy</title>
+<g id="a_node105"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy" xlink:title=" list of thermal flags for heavy terminals, on the single layer the object is on ">
+<ellipse fill="none" stroke="black" cx="3641.18" cy="-1204.1" rx="49.4949" ry="27.6545"/>
+<text text-anchor="middle" x="3641.18" y="-1208.4" font-family="Times,serif" font-size="14.00">li:thermal</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy -->
+<g id="edge148" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy</title>
+<path fill="none" stroke="black" d="M3251.05,-1298.74C3319.4,-1290.42 3446.97,-1272.16 3552.18,-1241.57 3566.12,-1237.52 3580.85,-1232.02 3594.23,-1226.51"/>
+<polygon fill="black" stroke="black" points="3595.84,-1229.63 3603.7,-1222.53 3593.13,-1223.18 3595.84,-1229.63"/>
+</g>
+<!-- dup27_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node92" class="node"><title>dup27_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node92"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="3110.18" cy="-1103.75" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="3110.18" y="-1107.55" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="3110.18" y="-1092.55" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup27_/lht_tree_doc/comm/attributes&#45;&gt;dup27_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge125" class="edge"><title>dup27_/lht_tree_doc/comm/attributes&#45;&gt;dup27_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M3347.63,-1181.85C3337.41,-1176.35 3326.07,-1170.8 3315.18,-1166.62 3252.38,-1142.53 3231.82,-1152.41 3168.18,-1130.62 3164.14,-1129.24 3159.98,-1127.67 3155.85,-1126.02"/>
+<polygon fill="black" stroke="black" points="3156.87,-1122.66 3146.29,-1122.05 3154.18,-1129.12 3156.87,-1122.66"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/found -->
+<g id="node94" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/found</title>
+<g id="a_node94"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="3211.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="3211.18" y="-1107.55" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="3211.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/found -->
+<g id="edge127" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/found</title>
+<path fill="none" stroke="black" d="M3476.58,-1181.81C3468.88,-1176.1 3460.06,-1170.46 3451.18,-1166.62 3371.48,-1132.19 3341.04,-1159.56 3259.18,-1130.62 3255.12,-1129.18 3250.98,-1127.44 3246.92,-1125.54"/>
+<polygon fill="black" stroke="black" points="3248.18,-1122.26 3237.67,-1120.91 3245.05,-1128.52 3248.18,-1122.26"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/clearline -->
+<g id="node95" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/clearline</title>
+<g id="a_node95"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="3238.18" cy="-1014.01" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="3238.18" y="-1017.81" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="3238.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/clearline -->
+<g id="edge128" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/clearline</title>
+<path fill="none" stroke="black" d="M3476.21,-1181.87C3468.57,-1176.23 3459.88,-1170.61 3451.18,-1166.62 3387.29,-1137.32 3352.53,-1173.95 3297.18,-1130.62 3271.65,-1110.63 3256.18,-1076.59 3247.53,-1050.6"/>
+<polygon fill="black" stroke="black" points="3250.77,-1049.23 3244.44,-1040.73 3244.09,-1051.32 3250.77,-1049.23"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/selected -->
+<g id="node96" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/selected</title>
+<g id="a_node96"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="3279.18" cy="-924.271" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="3279.18" y="-928.071" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="3279.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/selected -->
+<g id="edge130" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/selected</title>
+<path fill="none" stroke="black" d="M3475.76,-1182.07C3468.18,-1176.5 3459.63,-1170.87 3451.18,-1166.62 3402.95,-1142.39 3372.69,-1169.45 3335.18,-1130.62 3323.31,-1118.33 3299.36,-1016.58 3286.98,-961.072"/>
+<polygon fill="black" stroke="black" points="3290.39,-960.283 3284.81,-951.278 3283.56,-961.798 3290.39,-960.283"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/auto -->
+<g id="node97" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/auto</title>
+<g id="a_node97"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="3331.18" cy="-834.531" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="3331.18" y="-838.331" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="3331.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/auto -->
+<g id="edge132" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/auto</title>
+<path fill="none" stroke="black" d="M3474.86,-1182.4C3467.41,-1176.96 3459.15,-1171.3 3451.18,-1166.62 3418.27,-1147.28 3395.98,-1161.25 3373.18,-1130.62 3343.13,-1090.25 3334.5,-940.864 3332.09,-871.435"/>
+<polygon fill="black" stroke="black" points="3335.58,-871.282 3331.76,-861.4 3328.59,-871.508 3335.58,-871.282"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<g id="node98" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/rubberend</title>
+<g id="a_node98"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/rubberend" xlink:title="For lines, used internally for rubber band moves: indicates one end already rubber banding.">
+<ellipse fill="none" stroke="black" cx="3347.18" cy="-744.791" rx="50.41" ry="26.7407"/>
+<text text-anchor="middle" x="3347.18" y="-748.591" font-family="Times,serif" font-size="14.00">rubberend</text>
+<text text-anchor="middle" x="3347.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<g id="edge134" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/rubberend</title>
+<path fill="none" stroke="black" d="M3474,-1182.7C3449.05,-1163.74 3415.34,-1137.43 3411.18,-1130.62 3383.81,-1085.85 3387.18,-1067.49 3387.18,-1015.01 3387.18,-1015.01 3387.18,-1015.01 3387.18,-923.271 3387.18,-872.963 3371.7,-816.553 3360,-781.108"/>
+<polygon fill="black" stroke="black" points="3363.18,-779.601 3356.66,-771.25 3356.55,-781.845 3363.18,-779.601"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<g id="node99" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/usetherm</title>
+<g id="a_node99"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="3388.18" cy="-655.051" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="3388.18" y="-658.851" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="3388.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<g id="edge136" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/usetherm</title>
+<path fill="none" stroke="black" d="M3480.64,-1179.83C3469.74,-1166.33 3457.02,-1148.49 3449.18,-1130.62 3428.1,-1082.57 3425.18,-1067.49 3425.18,-1015.01 3425.18,-1015.01 3425.18,-1015.01 3425.18,-833.531 3425.18,-783.399 3410.86,-726.945 3400.04,-691.443"/>
+<polygon fill="black" stroke="black" points="3403.28,-690.069 3396.95,-681.568 3396.59,-692.157 3403.28,-690.069"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/drc -->
+<g id="node100" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/drc</title>
+<g id="a_node100"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="3446.18" cy="-565.311" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="3446.18" y="-569.111" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="3446.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/drc -->
+<g id="edge138" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/drc</title>
+<path fill="none" stroke="black" d="M3492.47,-1176.96C3481.25,-1140.94 3463.18,-1073.81 3463.18,-1015.01 3463.18,-1015.01 3463.18,-1015.01 3463.18,-743.791 3463.18,-694.489 3456.6,-637.833 3451.63,-602.059"/>
+<polygon fill="black" stroke="black" points="3455.09,-601.509 3450.21,-592.102 3448.16,-602.496 3455.09,-601.509"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/lock -->
+<g id="node101" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/lock</title>
+<g id="a_node101"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="3483.18" cy="-475.571" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="3483.18" y="-479.371" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="3483.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/lock -->
+<g id="edge140" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/lock</title>
+<path fill="none" stroke="black" d="M3501.18,-1176.31C3501.18,-1139.83 3501.18,-1072.48 3501.18,-1015.01 3501.18,-1015.01 3501.18,-1015.01 3501.18,-654.051 3501.18,-604.722 3494.22,-548.072 3488.95,-512.307"/>
+<polygon fill="black" stroke="black" points="3492.4,-511.719 3487.45,-502.353 3485.48,-512.763 3492.4,-511.719"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<g id="node102" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/nonetlist</title>
+<g id="a_node102"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="3504.18" cy="-385.831" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="3504.18" y="-389.631" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="3504.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<g id="edge142" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/nonetlist</title>
+<path fill="none" stroke="black" d="M3509.9,-1176.96C3521.12,-1140.94 3539.18,-1073.81 3539.18,-1015.01 3539.18,-1015.01 3539.18,-1015.01 3539.18,-564.311 3539.18,-514.288 3525.64,-457.808 3515.4,-422.27"/>
+<polygon fill="black" stroke="black" points="3518.67,-420.984 3512.48,-412.384 3511.95,-422.966 3518.67,-420.984"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/termname -->
+<g id="node103" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/termname</title>
+<g id="a_node103"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="3536.18" cy="-296.09" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="3536.18" y="-299.89" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="3536.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/termname -->
+<g id="edge144" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/termname</title>
+<path fill="none" stroke="black" d="M3518.05,-1178.81C3540.44,-1144.15 3577.18,-1077.7 3577.18,-1015.01 3577.18,-1015.01 3577.18,-1015.01 3577.18,-474.571 3577.18,-422.499 3571.18,-409.384 3558.18,-358.96 3555.91,-350.138 3552.91,-340.793 3549.86,-332.113"/>
+<polygon fill="black" stroke="black" points="3553.13,-330.867 3546.43,-322.659 3546.55,-333.253 3553.13,-330.867"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/floater -->
+<g id="node104" class="node"><title>dup28_/lht_tree_doc/comm/flags_line/children/floater</title>
+<g id="a_node104"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="3575.18" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="3575.18" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="3575.18" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/floater -->
+<g id="edge146" class="edge"><title>dup28_/lht_tree_doc/comm/flags_line&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/floater</title>
+<path fill="none" stroke="black" d="M3526.07,-1181.56C3540.47,-1168.08 3558.07,-1149.68 3570.18,-1130.62 3599.75,-1084.08 3615.18,-1070.15 3615.18,-1015.01 3615.18,-1015.01 3615.18,-1015.01 3615.18,-384.831 3615.18,-334.378 3599.61,-277.789 3587.9,-242.364"/>
+<polygon fill="black" stroke="black" points="3591.09,-240.865 3584.56,-232.518 3584.46,-243.112 3591.09,-240.865"/>
+</g>
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/found&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/clearline -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/clearline&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/selected -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/selected&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/auto -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/auto&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/rubberend&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/usetherm&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/drc -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/drc&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/lock -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/lock&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/nonetlist&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/termname -->
+<!-- dup28_/lht_tree_doc/comm/flags_line/children/termname&#45;&gt;dup28_/lht_tree_doc/comm/flags_line/children/floater -->
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="node106" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<g id="a_node106"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/on" xlink:title="draw any thermal only if this string is present; else normal clearance is applied">
+<ellipse fill="none" stroke="black" cx="3673.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="3673.18" y="-1107.55" font-family="Times,serif" font-size="14.00">on</text>
+<text text-anchor="middle" x="3673.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="edge149" class="edge"><title>dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<path fill="none" stroke="black" d="M3649.76,-1176.74C3653.46,-1165.36 3657.85,-1151.89 3661.81,-1139.69"/>
+<polygon fill="black" stroke="black" points="3665.26,-1140.42 3665.03,-1129.82 3658.6,-1138.25 3665.26,-1140.42"/>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="node107" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<g id="a_node107"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/diag" xlink:title="if present, the thermal is diagonal (45 degree rotated)">
+<ellipse fill="none" stroke="black" cx="3752.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="3752.18" y="-1107.55" font-family="Times,serif" font-size="14.00">diag</text>
+<text text-anchor="middle" x="3752.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="edge150" class="edge"><title>dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<path fill="none" stroke="black" d="M3666.93,-1180.29C3683.81,-1165.33 3705.91,-1145.75 3723.38,-1130.27"/>
+<polygon fill="black" stroke="black" points="3725.88,-1132.73 3731.04,-1123.48 3721.24,-1127.49 3725.88,-1132.73"/>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="node108" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<g id="a_node108"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/round" xlink:title="if present, thermal shape is rounded">
+<ellipse fill="none" stroke="black" cx="3834.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="3834.18" y="-1107.55" font-family="Times,serif" font-size="14.00">round</text>
+<text text-anchor="middle" x="3834.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="edge151" class="edge"><title>dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<path fill="none" stroke="black" d="M3672.13,-1182.54C3681.01,-1177.04 3690.82,-1171.32 3700.18,-1166.62 3739.06,-1147.11 3752.19,-1149.9 3791.18,-1130.62 3793.91,-1129.27 3796.69,-1127.82 3799.46,-1126.3"/>
+<polygon fill="black" stroke="black" points="3801.23,-1129.31 3808.19,-1121.32 3797.77,-1123.23 3801.23,-1129.31"/>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="node109" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<g id="a_node109"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/sharp" xlink:title="if present, thermal shape is sharp">
+<ellipse fill="none" stroke="black" cx="3918.18" cy="-1103.75" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="3918.18" y="-1107.55" font-family="Times,serif" font-size="14.00">sharp</text>
+<text text-anchor="middle" x="3918.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="edge152" class="edge"><title>dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<path fill="none" stroke="black" d="M3671.03,-1181.82C3680.05,-1176.18 3690.22,-1170.57 3700.18,-1166.62 3774.82,-1137.05 3802.69,-1160.53 3877.18,-1130.62 3879.73,-1129.6 3882.3,-1128.42 3884.83,-1127.13"/>
+<polygon fill="black" stroke="black" points="3886.77,-1130.06 3893.8,-1122.13 3883.37,-1123.94 3886.77,-1130.06"/>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="node110" class="node"><title>dup29_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<g id="a_node110"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/solid" xlink:title="if present, there is no thermal but a solid connection (&quot;join&quot;)">
+<ellipse fill="none" stroke="black" cx="3999.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="3999.18" y="-1107.55" font-family="Times,serif" font-size="14.00">solid</text>
+<text text-anchor="middle" x="3999.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="edge153" class="edge"><title>dup29_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup29_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<path fill="none" stroke="black" d="M3670.57,-1181.61C3679.67,-1175.89 3689.99,-1170.29 3700.18,-1166.62 3809.94,-1127.1 3851.07,-1171.9 3960.18,-1130.62 3962.73,-1129.66 3965.28,-1128.5 3967.79,-1127.22"/>
+<polygon fill="black" stroke="black" points="3969.67,-1130.18 3976.6,-1122.16 3966.19,-1124.11 3969.67,-1130.18"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x -->
+<g id="node112" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x</title>
+<g id="a_node112"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x" xlink:title="center, X coord">
+<ellipse fill="none" stroke="black" cx="3742.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="3742.18" y="-1207.9" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="3742.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x -->
+<g id="edge155" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x</title>
+<path fill="none" stroke="black" d="M4163.55,-1300.56C4066.86,-1292.72 3851.09,-1272.28 3784.18,-1241.57 3779.14,-1239.26 3774.24,-1236.14 3769.68,-1232.7"/>
+<polygon fill="black" stroke="black" points="3771.81,-1229.93 3761.87,-1226.26 3767.36,-1235.33 3771.81,-1229.93"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y -->
+<g id="node113" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y</title>
+<g id="a_node113"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y" xlink:title="center, Y coord">
+<ellipse fill="none" stroke="black" cx="3826.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="3826.18" y="-1207.9" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="3826.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y -->
+<g id="edge156" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y</title>
+<path fill="none" stroke="black" d="M4162.98,-1303.29C4094.27,-1300.36 3965.72,-1288.42 3868.18,-1241.57 3863.18,-1239.17 3858.3,-1236.01 3853.75,-1232.54"/>
+<polygon fill="black" stroke="black" points="3855.89,-1229.77 3845.95,-1226.09 3851.42,-1235.16 3855.89,-1229.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width -->
+<g id="node114" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width</title>
+<g id="a_node114"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width" xlink:title="radius (of the centerline of the arc) in X direction ">
+<ellipse fill="none" stroke="black" cx="3910.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="3910.18" y="-1207.9" font-family="Times,serif" font-size="14.00">width</text>
+<text text-anchor="middle" x="3910.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width -->
+<g id="edge157" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width</title>
+<path fill="none" stroke="black" d="M4163.71,-1299.32C4110.14,-1292.38 4021.58,-1276.38 3953.18,-1241.57 3948.17,-1239.02 3943.23,-1235.78 3938.6,-1232.28"/>
+<polygon fill="black" stroke="black" points="3940.6,-1229.39 3930.63,-1225.8 3936.18,-1234.82 3940.6,-1229.39"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height -->
+<g id="node115" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height</title>
+<g id="a_node115"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height" xlink:title="radius (of the centerline of the arc) in Y direction ">
+<ellipse fill="none" stroke="black" cx="3997.18" cy="-1204.1" rx="35.2113" ry="26.7407"/>
+<text text-anchor="middle" x="3997.18" y="-1207.9" font-family="Times,serif" font-size="14.00">height</text>
+<text text-anchor="middle" x="3997.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height -->
+<g id="edge158" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height</title>
+<path fill="none" stroke="black" d="M4168.17,-1292.48C4132.95,-1281.95 4082.55,-1264.58 4042.18,-1241.57 4037.27,-1238.77 4032.34,-1235.44 4027.64,-1231.95"/>
+<polygon fill="black" stroke="black" points="4029.52,-1228.98 4019.49,-1225.57 4025.21,-1234.49 4029.52,-1228.98"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness -->
+<g id="node116" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness</title>
+<g id="a_node116"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness" xlink:title="width of the pen the arc is drawn with ">
+<ellipse fill="none" stroke="black" cx="4098.18" cy="-1204.1" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="4098.18" y="-1207.9" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="4098.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness -->
+<g id="edge159" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M4185.54,-1281.68C4169.39,-1267.52 4148.39,-1249.11 4131.03,-1233.89"/>
+<polygon fill="black" stroke="black" points="4133.16,-1231.1 4123.33,-1227.14 4128.55,-1236.37 4133.16,-1231.1"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance -->
+<g id="node117" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance</title>
+<g id="a_node117"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance" xlink:title="copper clearance around the object ">
+<ellipse fill="none" stroke="black" cx="4211.18" cy="-1204.1" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="4211.18" y="-1207.9" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="4211.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance -->
+<g id="edge160" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M4211.18,-1277.35C4211.18,-1266.27 4211.18,-1253.25 4211.18,-1241.34"/>
+<polygon fill="black" stroke="black" points="4214.68,-1241.24 4211.18,-1231.24 4207.68,-1241.24 4214.68,-1241.24"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart -->
+<g id="node118" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart</title>
+<g id="a_node118"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart" xlink:title=" start angle">
+<ellipse fill="none" stroke="black" cx="4310.18" cy="-1204.1" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="4310.18" y="-1207.9" font-family="Times,serif" font-size="14.00">astart</text>
+<text text-anchor="middle" x="4310.18" y="-1192.9" font-family="Times,serif" font-size="14.00">angle</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart -->
+<g id="edge161" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart</title>
+<path fill="none" stroke="black" d="M4234.39,-1280.93C4248.83,-1266.48 4267.48,-1247.83 4282.66,-1232.64"/>
+<polygon fill="black" stroke="black" points="4285.21,-1235.04 4289.8,-1225.49 4280.26,-1230.09 4285.21,-1235.04"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta -->
+<g id="node119" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta</title>
+<g id="a_node119"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta" xlink:title=" delta angle">
+<ellipse fill="none" stroke="black" cx="4395.18" cy="-1204.1" rx="34.7971" ry="26.7407"/>
+<text text-anchor="middle" x="4395.18" y="-1207.9" font-family="Times,serif" font-size="14.00">adelta</text>
+<text text-anchor="middle" x="4395.18" y="-1192.9" font-family="Times,serif" font-size="14.00">angle</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta -->
+<g id="edge162" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta</title>
+<path fill="none" stroke="black" d="M4251.31,-1289.89C4280.4,-1278.72 4320.09,-1261.72 4352.18,-1241.57 4356.85,-1238.65 4361.54,-1235.24 4366.02,-1231.72"/>
+<polygon fill="black" stroke="black" points="4368.31,-1234.37 4373.8,-1225.31 4363.86,-1228.96 4368.31,-1234.37"/>
+</g>
+<!-- dup30_/lht_tree_doc/comm/attributes -->
+<g id="node120" class="node"><title>dup30_/lht_tree_doc/comm/attributes</title>
+<g id="a_node120"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="4506.18" cy="-1204.1" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="4506.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup30_/lht_tree_doc/comm/attributes -->
+<g id="edge163" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup30_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M4256.32,-1295C4303.05,-1284.78 4377.7,-1266.36 4439.18,-1241.57 4446.61,-1238.58 4454.27,-1234.97 4461.63,-1231.19"/>
+<polygon fill="black" stroke="black" points="4463.56,-1234.13 4470.76,-1226.36 4460.29,-1227.94 4463.56,-1234.13"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc -->
+<g id="node122" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc</title>
+<g id="a_node122"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc" xlink:title="flag bits of a arc">
+<ellipse fill="none" stroke="black" cx="4624.18" cy="-1204.1" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="4624.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc -->
+<g id="edge165" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc</title>
+<path fill="none" stroke="black" d="M4259.25,-1302.79C4330.65,-1299.26 4467.74,-1286.64 4574.18,-1241.57 4580.03,-1239.1 4585.84,-1235.83 4591.32,-1232.25"/>
+<polygon fill="black" stroke="black" points="4593.41,-1235.06 4599.61,-1226.46 4589.41,-1229.32 4593.41,-1235.06"/>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy -->
+<g id="node134" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy</title>
+<g id="a_node134"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy" xlink:title=" list of thermal flags for heavy terminals, on the single layer the object is on ">
+<ellipse fill="none" stroke="black" cx="4916.18" cy="-1204.1" rx="49.4949" ry="27.6545"/>
+<text text-anchor="middle" x="4916.18" y="-1208.4" font-family="Times,serif" font-size="14.00">li:thermal</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy -->
+<g id="edge187" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy</title>
+<path fill="none" stroke="black" d="M4257.98,-1298.1C4341.72,-1287.2 4522.7,-1263.39 4675.18,-1241.57 4737.95,-1232.59 4809.81,-1221.63 4858.61,-1214.08"/>
+<polygon fill="black" stroke="black" points="4859.31,-1217.51 4868.66,-1212.52 4858.24,-1210.59 4859.31,-1217.51"/>
+</g>
+<!-- dup30_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node121" class="node"><title>dup30_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node121"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="4233.18" cy="-1103.75" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="4233.18" y="-1107.55" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="4233.18" y="-1092.55" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup30_/lht_tree_doc/comm/attributes&#45;&gt;dup30_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge164" class="edge"><title>dup30_/lht_tree_doc/comm/attributes&#45;&gt;dup30_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M4471.19,-1181.82C4461.11,-1176.32 4449.93,-1170.77 4439.18,-1166.62 4376.03,-1142.23 4355.25,-1152.5 4291.18,-1130.62 4287.13,-1129.24 4282.98,-1127.68 4278.84,-1126.03"/>
+<polygon fill="black" stroke="black" points="4279.87,-1122.67 4269.29,-1122.06 4277.18,-1129.13 4279.87,-1122.67"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/found -->
+<g id="node123" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/found</title>
+<g id="a_node123"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="4334.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="4334.18" y="-1107.55" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="4334.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/found -->
+<g id="edge166" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/found</title>
+<path fill="none" stroke="black" d="M4599.58,-1181.81C4591.88,-1176.1 4583.06,-1170.46 4574.18,-1166.62 4494.48,-1132.19 4464.04,-1159.56 4382.18,-1130.62 4378.12,-1129.18 4373.98,-1127.44 4369.92,-1125.54"/>
+<polygon fill="black" stroke="black" points="4371.18,-1122.26 4360.67,-1120.91 4368.05,-1128.52 4371.18,-1122.26"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/clearline -->
+<g id="node124" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/clearline</title>
+<g id="a_node124"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="4361.18" cy="-1014.01" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="4361.18" y="-1017.81" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="4361.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/clearline -->
+<g id="edge167" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/clearline</title>
+<path fill="none" stroke="black" d="M4599.21,-1181.87C4591.57,-1176.23 4582.88,-1170.61 4574.18,-1166.62 4510.29,-1137.32 4475.53,-1173.95 4420.18,-1130.62 4394.65,-1110.63 4379.18,-1076.59 4370.53,-1050.6"/>
+<polygon fill="black" stroke="black" points="4373.77,-1049.23 4367.44,-1040.73 4367.09,-1051.32 4373.77,-1049.23"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/selected -->
+<g id="node125" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/selected</title>
+<g id="a_node125"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="4402.18" cy="-924.271" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="4402.18" y="-928.071" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="4402.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/selected -->
+<g id="edge169" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/selected</title>
+<path fill="none" stroke="black" d="M4598.76,-1182.07C4591.18,-1176.5 4582.63,-1170.87 4574.18,-1166.62 4525.95,-1142.39 4495.69,-1169.45 4458.18,-1130.62 4446.31,-1118.33 4422.36,-1016.58 4409.98,-961.072"/>
+<polygon fill="black" stroke="black" points="4413.39,-960.283 4407.81,-951.278 4406.56,-961.798 4413.39,-960.283"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/auto -->
+<g id="node126" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/auto</title>
+<g id="a_node126"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="4454.18" cy="-834.531" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="4454.18" y="-838.331" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="4454.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/auto -->
+<g id="edge171" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/auto</title>
+<path fill="none" stroke="black" d="M4597.86,-1182.4C4590.41,-1176.96 4582.15,-1171.3 4574.18,-1166.62 4541.27,-1147.28 4518.98,-1161.25 4496.18,-1130.62 4466.13,-1090.25 4457.5,-940.864 4455.09,-871.435"/>
+<polygon fill="black" stroke="black" points="4458.58,-871.282 4454.76,-861.4 4451.59,-871.508 4458.58,-871.282"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/rubberend -->
+<g id="node127" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/rubberend</title>
+<g id="a_node127"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/rubberend" xlink:title="For lines, used internally for rubber band moves: indicates one end already rubber banding.">
+<ellipse fill="none" stroke="black" cx="4470.18" cy="-744.791" rx="50.41" ry="26.7407"/>
+<text text-anchor="middle" x="4470.18" y="-748.591" font-family="Times,serif" font-size="14.00">rubberend</text>
+<text text-anchor="middle" x="4470.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/rubberend -->
+<g id="edge173" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/rubberend</title>
+<path fill="none" stroke="black" d="M4597,-1182.7C4572.05,-1163.74 4538.34,-1137.43 4534.18,-1130.62 4506.81,-1085.85 4510.18,-1067.49 4510.18,-1015.01 4510.18,-1015.01 4510.18,-1015.01 4510.18,-923.271 4510.18,-872.963 4494.7,-816.553 4483,-781.108"/>
+<polygon fill="black" stroke="black" points="4486.18,-779.601 4479.66,-771.25 4479.55,-781.845 4486.18,-779.601"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/usetherm -->
+<g id="node128" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/usetherm</title>
+<g id="a_node128"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="4511.18" cy="-655.051" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="4511.18" y="-658.851" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="4511.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/usetherm -->
+<g id="edge175" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/usetherm</title>
+<path fill="none" stroke="black" d="M4603.64,-1179.83C4592.74,-1166.33 4580.02,-1148.49 4572.18,-1130.62 4551.1,-1082.57 4548.18,-1067.49 4548.18,-1015.01 4548.18,-1015.01 4548.18,-1015.01 4548.18,-833.531 4548.18,-783.399 4533.86,-726.945 4523.04,-691.443"/>
+<polygon fill="black" stroke="black" points="4526.28,-690.069 4519.95,-681.568 4519.59,-692.157 4526.28,-690.069"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/drc -->
+<g id="node129" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/drc</title>
+<g id="a_node129"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="4569.18" cy="-565.311" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="4569.18" y="-569.111" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="4569.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/drc -->
+<g id="edge177" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/drc</title>
+<path fill="none" stroke="black" d="M4615.47,-1176.96C4604.25,-1140.94 4586.18,-1073.81 4586.18,-1015.01 4586.18,-1015.01 4586.18,-1015.01 4586.18,-743.791 4586.18,-694.489 4579.6,-637.833 4574.63,-602.059"/>
+<polygon fill="black" stroke="black" points="4578.09,-601.509 4573.21,-592.102 4571.16,-602.496 4578.09,-601.509"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/lock -->
+<g id="node130" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/lock</title>
+<g id="a_node130"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="4606.18" cy="-475.571" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="4606.18" y="-479.371" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="4606.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/lock -->
+<g id="edge179" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/lock</title>
+<path fill="none" stroke="black" d="M4624.18,-1176.31C4624.18,-1139.83 4624.18,-1072.48 4624.18,-1015.01 4624.18,-1015.01 4624.18,-1015.01 4624.18,-654.051 4624.18,-604.722 4617.22,-548.072 4611.95,-512.307"/>
+<polygon fill="black" stroke="black" points="4615.4,-511.719 4610.45,-502.353 4608.48,-512.763 4615.4,-511.719"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist -->
+<g id="node131" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist</title>
+<g id="a_node131"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="4627.18" cy="-385.831" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="4627.18" y="-389.631" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="4627.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist -->
+<g id="edge181" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist</title>
+<path fill="none" stroke="black" d="M4632.9,-1176.96C4644.12,-1140.94 4662.18,-1073.81 4662.18,-1015.01 4662.18,-1015.01 4662.18,-1015.01 4662.18,-564.311 4662.18,-514.288 4648.64,-457.808 4638.4,-422.27"/>
+<polygon fill="black" stroke="black" points="4641.67,-420.984 4635.48,-412.384 4634.95,-422.966 4641.67,-420.984"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/termname -->
+<g id="node132" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/termname</title>
+<g id="a_node132"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="4659.18" cy="-296.09" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="4659.18" y="-299.89" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="4659.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/termname -->
+<g id="edge183" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/termname</title>
+<path fill="none" stroke="black" d="M4641.05,-1178.81C4663.44,-1144.15 4700.18,-1077.7 4700.18,-1015.01 4700.18,-1015.01 4700.18,-1015.01 4700.18,-474.571 4700.18,-422.499 4694.18,-409.384 4681.18,-358.96 4678.91,-350.138 4675.91,-340.793 4672.86,-332.113"/>
+<polygon fill="black" stroke="black" points="4676.13,-330.867 4669.43,-322.659 4669.55,-333.253 4676.13,-330.867"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/floater -->
+<g id="node133" class="node"><title>dup31_/lht_tree_doc/comm/flags_arc/children/floater</title>
+<g id="a_node133"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_arc/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="4698.18" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="4698.18" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="4698.18" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/floater -->
+<g id="edge185" class="edge"><title>dup31_/lht_tree_doc/comm/flags_arc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/floater</title>
+<path fill="none" stroke="black" d="M4649.07,-1181.56C4663.47,-1168.08 4681.07,-1149.68 4693.18,-1130.62 4722.75,-1084.08 4738.18,-1070.15 4738.18,-1015.01 4738.18,-1015.01 4738.18,-1015.01 4738.18,-384.831 4738.18,-334.378 4722.61,-277.789 4710.9,-242.364"/>
+<polygon fill="black" stroke="black" points="4714.09,-240.865 4707.56,-232.518 4707.46,-243.112 4714.09,-240.865"/>
+</g>
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/found&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/clearline -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/clearline&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/selected -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/selected&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/auto -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/auto&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/rubberend -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/rubberend&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/usetherm -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/usetherm&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/drc -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/drc&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/lock -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/lock&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/nonetlist&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/termname -->
+<!-- dup31_/lht_tree_doc/comm/flags_arc/children/termname&#45;&gt;dup31_/lht_tree_doc/comm/flags_arc/children/floater -->
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="node135" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<g id="a_node135"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/on" xlink:title="draw any thermal only if this string is present; else normal clearance is applied">
+<ellipse fill="none" stroke="black" cx="4796.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="4796.18" y="-1107.55" font-family="Times,serif" font-size="14.00">on</text>
+<text text-anchor="middle" x="4796.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="edge188" class="edge"><title>dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<path fill="none" stroke="black" d="M4888.95,-1180.78C4870.2,-1165.41 4845.28,-1144.99 4825.99,-1129.18"/>
+<polygon fill="black" stroke="black" points="4828.05,-1126.34 4818.1,-1122.71 4823.62,-1131.76 4828.05,-1126.34"/>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="node136" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<g id="a_node136"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/diag" xlink:title="if present, the thermal is diagonal (45 degree rotated)">
+<ellipse fill="none" stroke="black" cx="4875.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="4875.18" y="-1107.55" font-family="Times,serif" font-size="14.00">diag</text>
+<text text-anchor="middle" x="4875.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="edge189" class="edge"><title>dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<path fill="none" stroke="black" d="M4905.3,-1177C4900.39,-1165.21 4894.52,-1151.13 4889.27,-1138.55"/>
+<polygon fill="black" stroke="black" points="4892.49,-1137.16 4885.41,-1129.28 4886.03,-1139.85 4892.49,-1137.16"/>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="node137" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<g id="a_node137"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/round" xlink:title="if present, thermal shape is rounded">
+<ellipse fill="none" stroke="black" cx="4957.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="4957.18" y="-1107.55" font-family="Times,serif" font-size="14.00">round</text>
+<text text-anchor="middle" x="4957.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="edge190" class="edge"><title>dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<path fill="none" stroke="black" d="M4927.06,-1177C4931.89,-1165.42 4937.64,-1151.62 4942.82,-1139.21"/>
+<polygon fill="black" stroke="black" points="4946.2,-1140.19 4946.82,-1129.61 4939.74,-1137.5 4946.2,-1140.19"/>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="node138" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<g id="a_node138"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/sharp" xlink:title="if present, thermal shape is sharp">
+<ellipse fill="none" stroke="black" cx="5041.18" cy="-1103.75" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="5041.18" y="-1107.55" font-family="Times,serif" font-size="14.00">sharp</text>
+<text text-anchor="middle" x="5041.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="edge191" class="edge"><title>dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<path fill="none" stroke="black" d="M4944.24,-1181.03C4963.85,-1165.6 4990.04,-1144.99 5010.26,-1129.08"/>
+<polygon fill="black" stroke="black" points="5012.54,-1131.74 5018.24,-1122.8 5008.22,-1126.24 5012.54,-1131.74"/>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="node139" class="node"><title>dup32_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<g id="a_node139"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/solid" xlink:title="if present, there is no thermal but a solid connection (&quot;join&quot;)">
+<ellipse fill="none" stroke="black" cx="5122.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="5122.18" y="-1107.55" font-family="Times,serif" font-size="14.00">solid</text>
+<text text-anchor="middle" x="5122.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="edge192" class="edge"><title>dup32_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup32_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<path fill="none" stroke="black" d="M4956.6,-1187.88C4991.01,-1174.38 5041.38,-1153.32 5083.18,-1130.62 5085.43,-1129.4 5087.72,-1128.09 5090,-1126.72"/>
+<polygon fill="black" stroke="black" points="5092.04,-1129.57 5098.67,-1121.31 5088.34,-1123.64 5092.04,-1129.57"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance -->
+<g id="node141" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance</title>
+<g id="a_node141"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance" xlink:title="copper clearance around the object ">
+<ellipse fill="none" stroke="black" cx="5291.18" cy="-1204.1" rx="48.1667" ry="37.4533"/>
+<text text-anchor="middle" x="5291.18" y="-1215.4" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="5291.18" y="-1200.4" font-family="Times,serif" font-size="14.00">coord</text>
+<text text-anchor="middle" x="5291.18" y="-1185.4" font-family="Times,serif" font-size="14.00">&gt;=3</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance -->
+<g id="edge194" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M5431.36,-1284.04C5406.59,-1272.31 5375.27,-1256.85 5348.18,-1241.57 5344.22,-1239.34 5340.15,-1236.94 5336.1,-1234.49"/>
+<polygon fill="black" stroke="black" points="5337.65,-1231.34 5327.3,-1229.06 5333.98,-1237.29 5337.65,-1231.34"/>
+</g>
+<!-- dup33_/lht_tree_doc/comm/attributes -->
+<g id="node142" class="node"><title>dup33_/lht_tree_doc/comm/attributes</title>
+<g id="a_node142"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="5416.18" cy="-1204.1" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="5416.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup33_/lht_tree_doc/comm/attributes -->
+<g id="edge195" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup33_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M5459.68,-1278.13C5452.7,-1266.41 5444.37,-1252.41 5436.86,-1239.82"/>
+<polygon fill="black" stroke="black" points="5439.71,-1237.75 5431.58,-1230.95 5433.69,-1241.33 5439.71,-1237.75"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon -->
+<g id="node144" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon</title>
+<g id="a_node144"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon" xlink:title="flag bits of a polygon">
+<ellipse fill="none" stroke="black" cx="5534.18" cy="-1204.1" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="5534.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon -->
+<g id="edge197" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon</title>
+<path fill="none" stroke="black" d="M5490.69,-1278.13C5497.9,-1266.02 5506.56,-1251.47 5514.26,-1238.56"/>
+<polygon fill="black" stroke="black" points="5517.29,-1240.31 5519.4,-1229.93 5511.27,-1236.73 5517.29,-1240.31"/>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy -->
+<g id="node156" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy</title>
+<g id="a_node156"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy" xlink:title=" list of thermal flags for heavy terminals, on the single layer the object is on ">
+<ellipse fill="none" stroke="black" cx="5821.18" cy="-1204.1" rx="49.4949" ry="27.6545"/>
+<text text-anchor="middle" x="5821.18" y="-1208.4" font-family="Times,serif" font-size="14.00">li:thermal</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy -->
+<g id="edge219" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy</title>
+<path fill="none" stroke="black" d="M5529.25,-1288.67C5594.37,-1270.03 5703.09,-1238.91 5767.88,-1220.36"/>
+<polygon fill="black" stroke="black" points="5769.24,-1223.61 5777.89,-1217.49 5767.31,-1216.88 5769.24,-1223.61"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry -->
+<g id="node162" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry</title>
+<g id="a_node162"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry" xlink:title="first item is the outer contour, subsequent, optional items are holes">
+<ellipse fill="none" stroke="black" cx="5945.18" cy="-1204.1" rx="56.6372" ry="27.6545"/>
+<text text-anchor="middle" x="5945.18" y="-1208.4" font-family="Times,serif" font-size="14.00">li:geometry</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry -->
+<g id="edge225" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry</title>
+<path fill="none" stroke="black" d="M5541.6,-1300.99C5623.07,-1295.51 5764.5,-1280.76 5879.18,-1241.57 5887.02,-1238.9 5895.02,-1235.31 5902.61,-1231.44"/>
+<polygon fill="black" stroke="black" points="5904.48,-1234.41 5911.64,-1226.6 5901.18,-1228.24 5904.48,-1234.41"/>
+</g>
+<!-- dup33_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node143" class="node"><title>dup33_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node143"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="5219.18" cy="-1103.75" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="5219.18" y="-1107.55" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="5219.18" y="-1092.55" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup33_/lht_tree_doc/comm/attributes&#45;&gt;dup33_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge196" class="edge"><title>dup33_/lht_tree_doc/comm/attributes&#45;&gt;dup33_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M5378.93,-1182.73C5368.99,-1177.39 5358.22,-1171.72 5348.18,-1166.62 5320.79,-1152.71 5289.75,-1137.8 5264.98,-1126.1"/>
+<polygon fill="black" stroke="black" points="5266.36,-1122.88 5255.82,-1121.78 5263.37,-1129.21 5266.36,-1122.88"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/found -->
+<g id="node145" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/found</title>
+<g id="a_node145"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="5320.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="5320.18" y="-1107.55" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="5320.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/found -->
+<g id="edge198" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/found</title>
+<path fill="none" stroke="black" d="M5508.76,-1182.07C5501.18,-1176.5 5492.63,-1170.87 5484.18,-1166.62 5435.95,-1142.39 5417.95,-1151.52 5368.18,-1130.62 5364.21,-1128.95 5360.13,-1127.06 5356.1,-1125.07"/>
+<polygon fill="black" stroke="black" points="5357.39,-1121.8 5346.9,-1120.33 5354.18,-1128.02 5357.39,-1121.8"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly -->
+<g id="node146" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly</title>
+<g id="a_node146"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/clearpoly" xlink:title="For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). &#160;When clear, polygons will solidly connect to pins and vias. ">
+<ellipse fill="none" stroke="black" cx="5345.18" cy="-1014.01" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="5345.18" y="-1017.81" font-family="Times,serif" font-size="14.00">clearpoly</text>
+<text text-anchor="middle" x="5345.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly -->
+<g id="edge199" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly</title>
+<path fill="none" stroke="black" d="M5507.86,-1182.4C5500.41,-1176.96 5492.15,-1171.3 5484.18,-1166.62 5451.27,-1147.28 5433.89,-1156.89 5406.18,-1130.62 5382.78,-1108.43 5366.56,-1075.24 5356.76,-1050.11"/>
+<polygon fill="black" stroke="black" points="5359.98,-1048.71 5353.2,-1040.57 5353.42,-1051.16 5359.98,-1048.71"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly -->
+<g id="node147" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly</title>
+<g id="a_node147"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/fullpoly" xlink:title="For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one).">
+<ellipse fill="none" stroke="black" cx="5388.18" cy="-924.271" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="5388.18" y="-928.071" font-family="Times,serif" font-size="14.00">fullpoly</text>
+<text text-anchor="middle" x="5388.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly -->
+<g id="edge201" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly</title>
+<path fill="none" stroke="black" d="M5507.09,-1182.64C5482.21,-1163.64 5448.55,-1137.29 5444.18,-1130.62 5434.84,-1116.35 5409.85,-1015.88 5396.64,-960.95"/>
+<polygon fill="black" stroke="black" points="5399.98,-959.841 5394.24,-950.932 5393.17,-961.472 5399.98,-959.841"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/selected -->
+<g id="node148" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/selected</title>
+<g id="a_node148"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="5426.18" cy="-834.531" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="5426.18" y="-838.331" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="5426.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/selected -->
+<g id="edge203" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/selected</title>
+<path fill="none" stroke="black" d="M5513.49,-1179.9C5502.54,-1166.41 5489.82,-1148.58 5482.18,-1130.62 5440.91,-1033.64 5459.58,-1000.81 5439.18,-897.401 5437.52,-888.98 5435.66,-879.93 5433.88,-871.422"/>
+<polygon fill="black" stroke="black" points="5437.25,-870.453 5431.77,-861.39 5430.41,-871.897 5437.25,-870.453"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/auto -->
+<g id="node149" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/auto</title>
+<g id="a_node149"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="5478.18" cy="-744.791" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="5478.18" y="-748.591" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="5478.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/auto -->
+<g id="edge205" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/auto</title>
+<path fill="none" stroke="black" d="M5525.47,-1176.96C5514.25,-1140.94 5496.18,-1073.81 5496.18,-1015.01 5496.18,-1015.01 5496.18,-1015.01 5496.18,-923.271 5496.18,-873.942 5489.22,-817.292 5483.95,-781.527"/>
+<polygon fill="black" stroke="black" points="5487.4,-780.94 5482.45,-771.573 5480.48,-781.984 5487.4,-780.94"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/drc -->
+<g id="node150" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/drc</title>
+<g id="a_node150"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="5517.18" cy="-655.051" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="5517.18" y="-658.851" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="5517.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/drc -->
+<g id="edge207" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/drc</title>
+<path fill="none" stroke="black" d="M5534.18,-1176.31C5534.18,-1139.83 5534.18,-1072.48 5534.18,-1015.01 5534.18,-1015.01 5534.18,-1015.01 5534.18,-833.531 5534.18,-784.229 5527.6,-727.573 5522.63,-691.799"/>
+<polygon fill="black" stroke="black" points="5526.09,-691.249 5521.21,-681.842 5519.16,-692.236 5526.09,-691.249"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/lock -->
+<g id="node151" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/lock</title>
+<g id="a_node151"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="5554.18" cy="-565.311" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="5554.18" y="-569.111" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="5554.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/lock -->
+<g id="edge209" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/lock</title>
+<path fill="none" stroke="black" d="M5542.9,-1176.96C5554.12,-1140.94 5572.18,-1073.81 5572.18,-1015.01 5572.18,-1015.01 5572.18,-1015.01 5572.18,-743.791 5572.18,-694.462 5565.22,-637.812 5559.95,-602.047"/>
+<polygon fill="black" stroke="black" points="5563.4,-601.459 5558.45,-592.093 5556.48,-602.503 5563.4,-601.459"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist -->
+<g id="node152" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist</title>
+<g id="a_node152"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="5575.18" cy="-475.571" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="5575.18" y="-479.371" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="5575.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist -->
+<g id="edge211" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist</title>
+<path fill="none" stroke="black" d="M5551.05,-1178.81C5573.44,-1144.15 5610.18,-1077.7 5610.18,-1015.01 5610.18,-1015.01 5610.18,-1015.01 5610.18,-654.051 5610.18,-604.028 5596.64,-547.548 5586.4,-512.01"/>
+<polygon fill="black" stroke="black" points="5589.67,-510.724 5583.48,-502.124 5582.95,-512.706 5589.67,-510.724"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/termname -->
+<g id="node153" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/termname</title>
+<g id="a_node153"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="5607.18" cy="-385.831" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="5607.18" y="-389.631" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="5607.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/termname -->
+<g id="edge213" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/termname</title>
+<path fill="none" stroke="black" d="M5559.07,-1181.56C5573.47,-1168.08 5591.07,-1149.68 5603.18,-1130.62 5632.75,-1084.08 5648.18,-1070.15 5648.18,-1015.01 5648.18,-1015.01 5648.18,-1015.01 5648.18,-564.311 5648.18,-512.239 5642.18,-499.124 5629.18,-448.701 5626.91,-439.878 5623.91,-430.534 5620.86,-421.854"/>
+<polygon fill="black" stroke="black" points="5624.13,-420.607 5617.43,-412.399 5617.55,-422.993 5624.13,-420.607"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly -->
+<g id="node154" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly</title>
+<g id="a_node154"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/clearpolypoly" xlink:title="For polygons, apply clearance to nearby polygons">
+<ellipse fill="none" stroke="black" cx="5632.18" cy="-296.09" rx="64.1938" ry="26.7407"/>
+<text text-anchor="middle" x="5632.18" y="-299.89" font-family="Times,serif" font-size="14.00">clearpolypoly</text>
+<text text-anchor="middle" x="5632.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly -->
+<g id="edge215" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly</title>
+<path fill="none" stroke="black" d="M5565.97,-1186C5587.51,-1173.12 5615.37,-1153.74 5634.18,-1130.62 5669.75,-1086.92 5686.18,-1071.35 5686.18,-1015.01 5686.18,-1015.01 5686.18,-1015.01 5686.18,-474.571 5686.18,-422.499 5684.49,-408.071 5667.18,-358.96 5663.87,-349.545 5659.15,-339.901 5654.25,-331.114"/>
+<polygon fill="black" stroke="black" points="5657.18,-329.196 5649.13,-322.313 5651.13,-332.717 5657.18,-329.196"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/floater -->
+<g id="node155" class="node"><title>dup34_/lht_tree_doc/comm/flags_polygon/children/floater</title>
+<g id="a_node155"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_polygon/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="5678.18" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="5678.18" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="5678.18" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/floater -->
+<g id="edge217" class="edge"><title>dup34_/lht_tree_doc/comm/flags_polygon&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/floater</title>
+<path fill="none" stroke="black" d="M5570.87,-1190.51C5600.3,-1178.85 5641.04,-1159.01 5668.18,-1130.62 5707.64,-1089.36 5724.18,-1072.1 5724.18,-1015.01 5724.18,-1015.01 5724.18,-1015.01 5724.18,-384.831 5724.18,-332.759 5719.93,-319.159 5705.18,-269.22 5702.43,-259.893 5698.62,-250.112 5694.74,-241.151"/>
+<polygon fill="black" stroke="black" points="5697.83,-239.493 5690.53,-231.809 5691.45,-242.365 5697.83,-239.493"/>
+</g>
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/found&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/clearpoly&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/fullpoly&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/selected -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/selected&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/auto -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/auto&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/drc -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/drc&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/lock -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/lock&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/nonetlist&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/termname -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/termname&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly -->
+<!-- dup34_/lht_tree_doc/comm/flags_polygon/children/clearpolypoly&#45;&gt;dup34_/lht_tree_doc/comm/flags_polygon/children/floater -->
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="node157" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<g id="a_node157"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/on" xlink:title="draw any thermal only if this string is present; else normal clearance is applied">
+<ellipse fill="none" stroke="black" cx="5782.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="5782.18" y="-1107.55" font-family="Times,serif" font-size="14.00">on</text>
+<text text-anchor="middle" x="5782.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/on -->
+<g id="edge220" class="edge"><title>dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/on</title>
+<path fill="none" stroke="black" d="M5810.83,-1177C5806.21,-1165.33 5800.69,-1151.41 5795.73,-1138.92"/>
+<polygon fill="black" stroke="black" points="5798.85,-1137.28 5791.91,-1129.28 5792.34,-1139.86 5798.85,-1137.28"/>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="node158" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<g id="a_node158"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/diag" xlink:title="if present, the thermal is diagonal (45 degree rotated)">
+<ellipse fill="none" stroke="black" cx="5861.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="5861.18" y="-1107.55" font-family="Times,serif" font-size="14.00">diag</text>
+<text text-anchor="middle" x="5861.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/diag -->
+<g id="edge221" class="edge"><title>dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/diag</title>
+<path fill="none" stroke="black" d="M5831.8,-1177C5836.59,-1165.21 5842.32,-1151.13 5847.44,-1138.55"/>
+<polygon fill="black" stroke="black" points="5850.68,-1139.86 5851.21,-1129.28 5844.2,-1137.22 5850.68,-1139.86"/>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="node159" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<g id="a_node159"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/round" xlink:title="if present, thermal shape is rounded">
+<ellipse fill="none" stroke="black" cx="5943.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="5943.18" y="-1107.55" font-family="Times,serif" font-size="14.00">round</text>
+<text text-anchor="middle" x="5943.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/round -->
+<g id="edge222" class="edge"><title>dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/round</title>
+<path fill="none" stroke="black" d="M5848.56,-1181.03C5867.37,-1165.86 5892.39,-1145.7 5911.97,-1129.91"/>
+<polygon fill="black" stroke="black" points="5914.41,-1132.44 5920,-1123.44 5910.02,-1126.99 5914.41,-1132.44"/>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="node160" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<g id="a_node160"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/sharp" xlink:title="if present, thermal shape is sharp">
+<ellipse fill="none" stroke="black" cx="6027.18" cy="-1103.75" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="6027.18" y="-1107.55" font-family="Times,serif" font-size="14.00">sharp</text>
+<text text-anchor="middle" x="6027.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/sharp -->
+<g id="edge223" class="edge"><title>dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/sharp</title>
+<path fill="none" stroke="black" d="M5851.42,-1182.2C5860.14,-1176.69 5869.83,-1171.06 5879.18,-1166.62 5924.52,-1145.11 5940.87,-1152.16 5986.18,-1130.62 5988.66,-1129.44 5991.18,-1128.14 5993.68,-1126.78"/>
+<polygon fill="black" stroke="black" points="5995.69,-1129.66 6002.57,-1121.6 5992.17,-1123.6 5995.69,-1129.66"/>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="node161" class="node"><title>dup35_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<g id="a_node161"><a xlink:href="tree.html#/lht_tree_doc/comm/thermal_heavy/children/solid" xlink:title="if present, there is no thermal but a solid connection (&quot;join&quot;)">
+<ellipse fill="none" stroke="black" cx="6108.18" cy="-1103.75" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="6108.18" y="-1107.55" font-family="Times,serif" font-size="14.00">solid</text>
+<text text-anchor="middle" x="6108.18" y="-1092.55" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/solid -->
+<g id="edge224" class="edge"><title>dup35_/lht_tree_doc/comm/thermal_heavy&#45;&gt;dup35_/lht_tree_doc/comm/thermal_heavy/children/solid</title>
+<path fill="none" stroke="black" d="M5850.45,-1181.72C5859.32,-1176.08 5869.33,-1170.49 5879.18,-1166.62 5959.18,-1135.2 5989.58,-1163.02 6069.18,-1130.62 6071.71,-1129.59 6074.24,-1128.39 6076.73,-1127.08"/>
+<polygon fill="black" stroke="black" points="6078.65,-1130.01 6085.52,-1121.95 6075.12,-1123.97 6078.65,-1130.01"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour -->
+<g id="node163" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour</title>
+<g id="a_node163"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour" xlink:title="2 column table of x;y coords for the outer contour">
+<ellipse fill="none" stroke="black" cx="6200.18" cy="-1103.75" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="6200.18" y="-1107.55" font-family="Times,serif" font-size="14.00">contour</text>
+<text text-anchor="middle" x="6200.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coordtbl</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour -->
+<g id="edge226" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour</title>
+<path fill="none" stroke="black" d="M5979.68,-1181.95C5989.61,-1176.44 6000.61,-1170.87 6011.18,-1166.62 6069.21,-1143.32 6088.59,-1152.44 6147.18,-1130.62 6150.86,-1129.25 6154.62,-1127.72 6158.36,-1126.09"/>
+<polygon fill="black" stroke="black" points="6159.89,-1129.24 6167.54,-1121.92 6156.99,-1122.87 6159.89,-1129.24"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole -->
+<g id="node164" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole</title>
+<g id="a_node164"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole" xlink:title="2 column table of x;y coords for a hole">
+<ellipse fill="none" stroke="black" cx="6306.18" cy="-1103.75" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="6306.18" y="-1107.55" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="6306.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coordtbl</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole -->
+<g id="edge227" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole</title>
+<path fill="none" stroke="black" d="M5978.37,-1181.74C5988.55,-1176.03 6000.02,-1170.4 6011.18,-1166.62 6114.19,-1131.77 6149.33,-1162.85 6253.18,-1130.62 6257.03,-1129.43 6260.95,-1127.99 6264.83,-1126.41"/>
+<polygon fill="black" stroke="black" points="6266.56,-1129.47 6274.31,-1122.25 6263.75,-1123.06 6266.56,-1129.47"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x -->
+<g id="node166" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x</title>
+<g id="a_node166"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x" xlink:title="placement: X coord">
+<ellipse fill="none" stroke="black" cx="6053.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="6053.18" y="-1207.9" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="6053.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x -->
+<g id="edge229" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x</title>
+<path fill="none" stroke="black" d="M6300.77,-1299.04C6247.55,-1291.97 6161.57,-1275.96 6095.18,-1241.57 6090.25,-1239.02 6085.42,-1235.77 6080.88,-1232.27"/>
+<polygon fill="black" stroke="black" points="6083.02,-1229.5 6073.1,-1225.8 6078.55,-1234.88 6083.02,-1229.5"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y -->
+<g id="node167" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y</title>
+<g id="a_node167"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y" xlink:title="placement: Y coord">
+<ellipse fill="none" stroke="black" cx="6137.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="6137.18" y="-1207.9" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="6137.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y -->
+<g id="edge230" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y</title>
+<path fill="none" stroke="black" d="M6305.35,-1292.62C6269.65,-1282.32 6219.21,-1265.19 6179.18,-1241.57 6174.62,-1238.88 6170.09,-1235.67 6165.78,-1232.28"/>
+<polygon fill="black" stroke="black" points="6167.74,-1229.36 6157.82,-1225.65 6163.26,-1234.74 6167.74,-1229.36"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role -->
+<g id="node168" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role</title>
+<g id="a_node168"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role" xlink:title="when part of an old element, determines which of the three hardwired text object role is used (footprint, refdes or value)">
+<ellipse fill="none" stroke="black" cx="6221.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="6221.18" y="-1207.9" font-family="Times,serif" font-size="14.00">role</text>
+<text text-anchor="middle" x="6221.18" y="-1192.9" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role -->
+<g id="edge231" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role</title>
+<path fill="none" stroke="black" d="M6319.48,-1283.1C6302.59,-1271.26 6281.42,-1256 6263.18,-1241.57 6259.12,-1238.36 6254.92,-1234.89 6250.81,-1231.42"/>
+<polygon fill="black" stroke="black" points="6252.96,-1228.65 6243.1,-1224.79 6248.4,-1233.96 6252.96,-1228.65"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string -->
+<g id="node169" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string</title>
+<g id="a_node169"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string" xlink:title="text string (payload)">
+<ellipse fill="none" stroke="black" cx="6305.18" cy="-1204.1" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="6305.18" y="-1207.9" font-family="Times,serif" font-size="14.00">string</text>
+<text text-anchor="middle" x="6305.18" y="-1192.9" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string -->
+<g id="edge232" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string</title>
+<path fill="none" stroke="black" d="M6338.36,-1278.13C6332.92,-1266.16 6326.4,-1251.81 6320.59,-1239.01"/>
+<polygon fill="black" stroke="black" points="6323.63,-1237.24 6316.31,-1229.59 6317.26,-1240.14 6323.63,-1237.24"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid -->
+<g id="node170" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid</title>
+<g id="a_node170"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid" xlink:title="font ID">
+<ellipse fill="none" stroke="black" cx="6394.18" cy="-1204.1" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="6394.18" y="-1207.9" font-family="Times,serif" font-size="14.00">fid</text>
+<text text-anchor="middle" x="6394.18" y="-1192.9" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid -->
+<g id="edge233" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid</title>
+<path fill="none" stroke="black" d="M6361.74,-1278.13C6367.02,-1266.25 6373.34,-1252.03 6378.99,-1239.3"/>
+<polygon fill="black" stroke="black" points="6382.29,-1240.49 6383.16,-1229.93 6375.9,-1237.64 6382.29,-1240.49"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale -->
+<g id="node171" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale</title>
+<g id="a_node171"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale" xlink:title="text size scale in %">
+<ellipse fill="none" stroke="black" cx="6488.18" cy="-1204.1" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="6488.18" y="-1207.9" font-family="Times,serif" font-size="14.00">scale</text>
+<text text-anchor="middle" x="6488.18" y="-1192.9" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale -->
+<g id="edge234" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale</title>
+<path fill="none" stroke="black" d="M6381.24,-1283.44C6398.98,-1271.46 6421.53,-1255.94 6441.18,-1241.57 6445.77,-1238.22 6450.56,-1234.63 6455.24,-1231.05"/>
+<polygon fill="black" stroke="black" points="6457.72,-1233.55 6463.51,-1224.68 6453.45,-1228.01 6457.72,-1233.55"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction -->
+<g id="node172" class="node"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction</title>
+<g id="a_node172"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction" xlink:title="rotation in 90 degree steps (0 is horizontal)">
+<ellipse fill="none" stroke="black" cx="6590.18" cy="-1204.1" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="6590.18" y="-1207.9" font-family="Times,serif" font-size="14.00">direction</text>
+<text text-anchor="middle" x="6590.18" y="-1192.9" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction -->
+<g id="edge235" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction</title>
+<path fill="none" stroke="black" d="M6395.2,-1292.47C6433.48,-1281.72 6489.37,-1264.04 6535.18,-1241.57 6541.34,-1238.56 6547.61,-1234.96 6553.62,-1231.22"/>
+<polygon fill="black" stroke="black" points="6555.69,-1234.05 6562.19,-1225.68 6551.89,-1228.17 6555.69,-1234.05"/>
+</g>
+<!-- dup36_/lht_tree_doc/comm/attributes -->
+<g id="node173" class="node"><title>dup36_/lht_tree_doc/comm/attributes</title>
+<g id="a_node173"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="6713.18" cy="-1204.1" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="6713.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;dup36_/lht_tree_doc/comm/attributes -->
+<g id="edge236" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;dup36_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M6398.87,-1298.14C6458.33,-1289.82 6561.35,-1272.24 6645.18,-1241.57 6653.14,-1238.66 6661.32,-1234.96 6669.12,-1231.04"/>
+<polygon fill="black" stroke="black" points="6670.82,-1234.1 6678.07,-1226.37 6667.58,-1227.9 6670.82,-1234.1"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text -->
+<g id="node175" class="node"><title>dup37_/lht_tree_doc/comm/flags_text</title>
+<g id="a_node175"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text" xlink:title="flag bits of a text">
+<ellipse fill="none" stroke="black" cx="6831.18" cy="-1204.1" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="6831.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;dup37_/lht_tree_doc/comm/flags_text -->
+<g id="edge238" class="edge"><title>/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID&#45;&gt;dup37_/lht_tree_doc/comm/flags_text</title>
+<path fill="none" stroke="black" d="M6400.69,-1304.58C6483.35,-1303.6 6651.31,-1294.54 6781.18,-1241.57 6787.06,-1239.18 6792.89,-1235.95 6798.37,-1232.39"/>
+<polygon fill="black" stroke="black" points="6800.47,-1235.2 6806.67,-1226.61 6796.47,-1229.45 6800.47,-1235.2"/>
+</g>
+<!-- dup36_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node174" class="node"><title>dup36_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node174"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="6497.18" cy="-1103.75" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="6497.18" y="-1107.55" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="6497.18" y="-1092.55" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup36_/lht_tree_doc/comm/attributes&#45;&gt;dup36_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge237" class="edge"><title>dup36_/lht_tree_doc/comm/attributes&#45;&gt;dup36_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M6676.51,-1182.46C6666.47,-1177.07 6655.5,-1171.44 6645.18,-1166.62 6606.14,-1148.41 6594.86,-1147.4 6555.18,-1130.62 6551.36,-1129 6547.4,-1127.3 6543.43,-1125.57"/>
+<polygon fill="black" stroke="black" points="6544.78,-1122.34 6534.22,-1121.53 6541.97,-1128.75 6544.78,-1122.34"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/found -->
+<g id="node176" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/found</title>
+<g id="a_node176"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="6598.18" cy="-1103.75" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="6598.18" y="-1107.55" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="6598.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/found -->
+<g id="edge239" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/found</title>
+<path fill="none" stroke="black" d="M6806.13,-1182.04C6798.49,-1176.41 6789.81,-1170.74 6781.18,-1166.62 6725.15,-1139.87 6703.91,-1153.51 6646.18,-1130.62 6642.17,-1129.03 6638.07,-1127.19 6634.04,-1125.23"/>
+<polygon fill="black" stroke="black" points="6635.31,-1121.96 6624.82,-1120.53 6632.13,-1128.19 6635.31,-1121.96"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/clearline -->
+<g id="node177" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/clearline</title>
+<g id="a_node177"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="6625.18" cy="-1014.01" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="6625.18" y="-1017.81" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="6625.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/clearline -->
+<g id="edge240" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/clearline</title>
+<path fill="none" stroke="black" d="M6805.35,-1182.18C6797.83,-1176.67 6789.42,-1171.04 6781.18,-1166.62 6740.67,-1144.87 6718.54,-1161.19 6684.18,-1130.62 6660.26,-1109.33 6644.71,-1076.04 6635.62,-1050.65"/>
+<polygon fill="black" stroke="black" points="6638.87,-1049.33 6632.33,-1040.99 6632.24,-1051.59 6638.87,-1049.33"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/selected -->
+<g id="node178" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/selected</title>
+<g id="a_node178"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="6666.18" cy="-924.271" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="6666.18" y="-928.071" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="6666.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/selected -->
+<g id="edge242" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/selected</title>
+<path fill="none" stroke="black" d="M6804.22,-1182.81C6796.84,-1177.42 6788.78,-1171.7 6781.18,-1166.62 6755.64,-1149.55 6740.64,-1155.18 6722.18,-1130.62 6711.94,-1116.99 6687.35,-1016.24 6674.43,-961.099"/>
+<polygon fill="black" stroke="black" points="6677.76,-959.986 6672.09,-951.042 6670.95,-961.576 6677.76,-959.986"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/onsolder -->
+<g id="node179" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/onsolder</title>
+<g id="a_node179"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/onsolder" xlink:title="For text, indicates that it is on the solder side.">
+<ellipse fill="none" stroke="black" cx="6701.18" cy="-834.531" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="6701.18" y="-838.331" font-family="Times,serif" font-size="14.00">onsolder</text>
+<text text-anchor="middle" x="6701.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/onsolder -->
+<g id="edge244" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/onsolder</title>
+<path fill="none" stroke="black" d="M6804.53,-1182.78C6789.16,-1169.6 6770.81,-1151.1 6760.18,-1130.62 6711.63,-1037.07 6739.95,-1000.31 6717.18,-897.401 6715.29,-888.836 6713.04,-879.661 6710.83,-871.068"/>
+<polygon fill="black" stroke="black" points="6714.2,-870.113 6708.29,-861.321 6707.43,-871.881 6714.2,-870.113"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/auto -->
+<g id="node180" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/auto</title>
+<g id="a_node180"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="6756.18" cy="-744.791" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="6756.18" y="-748.591" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="6756.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/auto -->
+<g id="edge246" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/auto</title>
+<path fill="none" stroke="black" d="M6818,-1177.83C6811.29,-1164.15 6803.47,-1146.79 6798.18,-1130.62 6781.88,-1080.74 6774.18,-1067.49 6774.18,-1015.01 6774.18,-1015.01 6774.18,-1015.01 6774.18,-923.271 6774.18,-873.942 6767.22,-817.292 6761.95,-781.527"/>
+<polygon fill="black" stroke="black" points="6765.4,-780.94 6760.45,-771.573 6758.48,-781.984 6765.4,-780.94"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/drc -->
+<g id="node181" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/drc</title>
+<g id="a_node181"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="6795.18" cy="-655.051" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="6795.18" y="-658.851" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="6795.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/drc -->
+<g id="edge248" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/drc</title>
+<path fill="none" stroke="black" d="M6826.78,-1176.4C6821.16,-1140.01 6812.18,-1072.77 6812.18,-1015.01 6812.18,-1015.01 6812.18,-1015.01 6812.18,-833.531 6812.18,-784.229 6805.6,-727.573 6800.63,-691.799"/>
+<polygon fill="black" stroke="black" points="6804.09,-691.249 6799.21,-681.842 6797.16,-692.236 6804.09,-691.249"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/lock -->
+<g id="node182" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/lock</title>
+<g id="a_node182"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="6832.18" cy="-565.311" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="6832.18" y="-569.111" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="6832.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/lock -->
+<g id="edge250" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/lock</title>
+<path fill="none" stroke="black" d="M6835.59,-1176.4C6841.2,-1140.01 6850.18,-1072.77 6850.18,-1015.01 6850.18,-1015.01 6850.18,-1015.01 6850.18,-743.791 6850.18,-694.462 6843.22,-637.812 6837.95,-602.047"/>
+<polygon fill="black" stroke="black" points="6841.4,-601.459 6836.45,-592.093 6834.48,-602.503 6841.4,-601.459"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/nonetlist -->
+<g id="node183" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/nonetlist</title>
+<g id="a_node183"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="6853.18" cy="-475.571" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="6853.18" y="-479.371" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="6853.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/nonetlist -->
+<g id="edge252" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/nonetlist</title>
+<path fill="none" stroke="black" d="M6844.12,-1177.67C6860.94,-1142.2 6888.18,-1075.4 6888.18,-1015.01 6888.18,-1015.01 6888.18,-1015.01 6888.18,-654.051 6888.18,-604.028 6874.64,-547.548 6864.4,-512.01"/>
+<polygon fill="black" stroke="black" points="6867.67,-510.724 6861.48,-502.124 6860.95,-512.706 6867.67,-510.724"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/termname -->
+<g id="node184" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/termname</title>
+<g id="a_node184"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="6885.18" cy="-385.831" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="6885.18" y="-389.631" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="6885.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/termname -->
+<g id="edge254" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/termname</title>
+<path fill="none" stroke="black" d="M6851.8,-1180.06C6879.74,-1146.36 6926.18,-1080.49 6926.18,-1015.01 6926.18,-1015.01 6926.18,-1015.01 6926.18,-564.311 6926.18,-512.239 6920.18,-499.124 6907.18,-448.701 6904.91,-439.878 6901.91,-430.534 6898.86,-421.854"/>
+<polygon fill="black" stroke="black" points="6902.13,-420.607 6895.43,-412.399 6895.55,-422.993 6902.13,-420.607"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/dyntext -->
+<g id="node185" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/dyntext</title>
+<g id="a_node185"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/dyntext" xlink:title="For text: dynamic string (substitute %patterns%)">
+<ellipse fill="none" stroke="black" cx="6934.18" cy="-296.09" rx="40.1111" ry="26.7407"/>
+<text text-anchor="middle" x="6934.18" y="-299.89" font-family="Times,serif" font-size="14.00">dyntext</text>
+<text text-anchor="middle" x="6934.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/dyntext -->
+<g id="edge256" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/dyntext</title>
+<path fill="none" stroke="black" d="M6859.88,-1184.02C6877.98,-1170.79 6900.78,-1151.79 6916.18,-1130.62 6948.92,-1085.64 6964.18,-1070.65 6964.18,-1015.01 6964.18,-1015.01 6964.18,-1015.01 6964.18,-474.571 6964.18,-424.797 6952.57,-368.256 6943.8,-332.636"/>
+<polygon fill="black" stroke="black" points="6947.13,-331.565 6941.29,-322.726 6940.35,-333.279 6947.13,-331.565"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/floater -->
+<g id="node186" class="node"><title>dup37_/lht_tree_doc/comm/flags_text/children/floater</title>
+<g id="a_node186"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_text/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="6968.18" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="6968.18" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="6968.18" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/floater -->
+<g id="edge258" class="edge"><title>dup37_/lht_tree_doc/comm/flags_text&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/floater</title>
+<path fill="none" stroke="black" d="M6865.73,-1188.63C6891.52,-1176.37 6926.15,-1156.63 6949.18,-1130.62 6986.66,-1088.31 7002.18,-1071.54 7002.18,-1015.01 7002.18,-1015.01 7002.18,-1015.01 7002.18,-384.831 7002.18,-334.718 6988.95,-278.045 6978.99,-242.508"/>
+<polygon fill="black" stroke="black" points="6982.28,-241.274 6976.16,-232.629 6975.55,-243.206 6982.28,-241.274"/>
+</g>
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/found&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/clearline -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/clearline&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/selected -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/selected&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/onsolder -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/onsolder&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/auto -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/auto&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/drc -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/drc&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/lock -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/lock&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/nonetlist -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/nonetlist&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/termname -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/termname&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/dyntext -->
+<!-- dup37_/lht_tree_doc/comm/flags_text/children/dyntext&#45;&gt;dup37_/lht_tree_doc/comm/flags_text/children/floater -->
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/unused -->
+<g id="node188" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/unused</title>
+<g id="a_node188"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/unused" xlink:title="placeholder for markign uunsed slot to keep slot indices for early lihata v4 ">
+<ellipse fill="none" stroke="black" cx="7555.18" cy="-1519.28" rx="38.7821" ry="26.7407"/>
+<text text-anchor="middle" x="7555.18" y="-1523.08" font-family="Times,serif" font-size="14.00">unused</text>
+<text text-anchor="middle" x="7555.18" y="-1508.08" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/unused -->
+<g id="edge261" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/unused</title>
+<path fill="none" stroke="black" d="M7656.17,-1597.3C7639.48,-1584.86 7620.42,-1570.58 7603.18,-1557.46 7598.45,-1553.87 7593.48,-1550.05 7588.6,-1546.29"/>
+<polygon fill="black" stroke="black" points="7590.58,-1543.4 7580.53,-1540.05 7586.3,-1548.93 7590.58,-1543.4"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID -->
+<g id="node189" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID</title>
+<g id="a_node189"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID" xlink:title="padstack prototype specification, as introduced in lihata board v4">
+<ellipse fill="none" stroke="black" cx="7701.18" cy="-1519.28" rx="89.191" ry="27.6545"/>
+<text text-anchor="middle" x="7701.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:ps_proto_v4.PID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID -->
+<g id="edge262" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID</title>
+<path fill="none" stroke="black" d="M7701.18,-1593.28C7701.18,-1581.7 7701.18,-1568.94 7701.18,-1557.37"/>
+<polygon fill="black" stroke="black" points="7704.68,-1557.15 7701.18,-1547.15 7697.68,-1557.15 7704.68,-1557.15"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia -->
+<g id="node190" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia</title>
+<g id="a_node190"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia" xlink:title="hole diameter; 0 means no hole ">
+<ellipse fill="none" stroke="black" cx="7412.18" cy="-1406.91" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="7412.18" y="-1410.71" font-family="Times,serif" font-size="14.00">hdia</text>
+<text text-anchor="middle" x="7412.18" y="-1395.71" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia -->
+<g id="edge263" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia</title>
+<path fill="none" stroke="black" d="M7648.71,-1496.98C7634.1,-1491.43 7618.14,-1485.72 7603.18,-1481.1 7538.1,-1460.97 7514.59,-1476.61 7454.18,-1445.1 7449.22,-1442.51 7444.37,-1439.2 7439.82,-1435.64"/>
+<polygon fill="black" stroke="black" points="7441.92,-1432.83 7432.03,-1429.04 7437.4,-1438.17 7441.92,-1432.83"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop -->
+<g id="node191" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop</title>
+<g id="a_node191"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop" xlink:title="hole start: copper layer index from the top (positive) or bottom (negative) copper layer (0 means top copper layer)">
+<ellipse fill="none" stroke="black" cx="7501.18" cy="-1406.91" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="7501.18" y="-1410.71" font-family="Times,serif" font-size="14.00">htop</text>
+<text text-anchor="middle" x="7501.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop -->
+<g id="edge264" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop</title>
+<path fill="none" stroke="black" d="M7649.02,-1496.81C7618.71,-1483.48 7580.29,-1465.12 7548.18,-1445.1 7543.09,-1441.92 7537.91,-1438.29 7532.94,-1434.57"/>
+<polygon fill="black" stroke="black" points="7534.87,-1431.64 7524.82,-1428.29 7530.59,-1437.18 7534.87,-1431.64"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom -->
+<g id="node192" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom</title>
+<g id="a_node192"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom" xlink:title="hole start: copper layer index from the bottom (positive) or top (negative) copper layer (0 means bottom copper layer)">
+<ellipse fill="none" stroke="black" cx="7601.18" cy="-1406.91" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="7601.18" y="-1410.71" font-family="Times,serif" font-size="14.00">hbottom</text>
+<text text-anchor="middle" x="7601.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom -->
+<g id="edge265" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom</title>
+<path fill="none" stroke="black" d="M7677.74,-1492.4C7663.12,-1476.27 7644.24,-1455.43 7628.88,-1438.48"/>
+<polygon fill="black" stroke="black" points="7631.41,-1436.06 7622.1,-1431 7626.22,-1440.76 7631.41,-1436.06"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated -->
+<g id="node193" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated</title>
+<g id="a_node193"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated" xlink:title="0=unplated hole; 1=plated hole">
+<ellipse fill="none" stroke="black" cx="7701.18" cy="-1406.91" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="7701.18" y="-1410.71" font-family="Times,serif" font-size="14.00">plated</text>
+<text text-anchor="middle" x="7701.18" y="-1395.71" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated -->
+<g id="edge266" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated</title>
+<path fill="none" stroke="black" d="M7701.18,-1491.56C7701.18,-1477.36 7701.18,-1459.69 7701.18,-1444.26"/>
+<polygon fill="black" stroke="black" points="7704.68,-1444 7701.18,-1434 7697.68,-1444 7704.68,-1444"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name -->
+<g id="node194" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name</title>
+<g id="a_node194"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name" xlink:title="optional user assigned prototype name">
+<ellipse fill="none" stroke="black" cx="7790.18" cy="-1406.91" rx="33.4697" ry="37.4533"/>
+<text text-anchor="middle" x="7790.18" y="-1418.21" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="7790.18" y="-1403.21" font-family="Times,serif" font-size="14.00">string</text>
+<text text-anchor="middle" x="7790.18" y="-1388.21" font-family="Times,serif" font-size="14.00">&gt;=5</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name -->
+<g id="edge267" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name</title>
+<path fill="none" stroke="black" d="M7722.05,-1492.4C7733.86,-1477.76 7748.81,-1459.22 7761.69,-1443.25"/>
+<polygon fill="black" stroke="black" points="7764.65,-1445.15 7768.21,-1435.17 7759.2,-1440.75 7764.65,-1445.15"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape -->
+<g id="node195" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape</title>
+<g id="a_node195"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape" xlink:title="shape per layer type definition">
+<ellipse fill="none" stroke="black" cx="7883.18" cy="-1406.91" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="7883.18" y="-1411.21" font-family="Times,serif" font-size="14.00">li:shape</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape -->
+<g id="edge268" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape</title>
+<path fill="none" stroke="black" d="M7745.62,-1495.18C7771.35,-1481.38 7804.1,-1463.08 7832.18,-1445.1 7837.51,-1441.68 7843.03,-1437.92 7848.39,-1434.13"/>
+<polygon fill="black" stroke="black" points="7850.54,-1436.9 7856.61,-1428.22 7846.45,-1431.21 7850.54,-1436.9"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4 -->
+<g id="node196" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4</title>
+<g id="a_node196"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4" xlink:title="shape on a specific layer type (specified by layer_mask and combining), as specifie in lihata board v4; shape is either ps_poly, ps_line or ps_circ (only one of these will present per layer type); shape coords are relative to padstack origin">
+<ellipse fill="none" stroke="black" cx="7720.18" cy="-1305.15" rx="72.6644" ry="27.6545"/>
+<text text-anchor="middle" x="7720.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:ps_shape_v4</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4 -->
+<g id="edge269" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4</title>
+<path fill="none" stroke="black" d="M7856.61,-1385.61C7848.87,-1379.95 7840.3,-1373.93 7832.18,-1368.73 7812.59,-1356.18 7790.34,-1343.45 7770.86,-1332.78"/>
+<polygon fill="black" stroke="black" points="7772.3,-1329.58 7761.84,-1327.88 7768.95,-1335.73 7772.3,-1329.58"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask -->
+<g id="node197" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask</title>
+<g id="a_node197"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask" xlink:title="layer type and location">
+<ellipse fill="none" stroke="black" cx="7264.18" cy="-1204.1" rx="67.7647" ry="27.6545"/>
+<text text-anchor="middle" x="7264.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:layer_mask</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask -->
+<g id="edge270" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask</title>
+<path fill="none" stroke="black" d="M7657.25,-1291.23C7597.08,-1278.8 7503.85,-1259.32 7423.18,-1241.57 7393.25,-1234.99 7360.2,-1227.45 7332.03,-1220.94"/>
+<polygon fill="black" stroke="black" points="7332.81,-1217.53 7322.28,-1218.69 7331.23,-1224.35 7332.81,-1217.53"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining -->
+<g id="node208" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining</title>
+<g id="a_node208"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining" xlink:title="layer compositing match">
+<ellipse fill="none" stroke="black" cx="7485.18" cy="-1204.1" rx="53.066" ry="27.6545"/>
+<text text-anchor="middle" x="7485.18" y="-1208.4" font-family="Times,serif" font-size="14.00">combining</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining -->
+<g id="edge290" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining</title>
+<path fill="none" stroke="black" d="M7664.98,-1287.08C7630.48,-1275.71 7585.48,-1259.58 7547.18,-1241.57 7540.5,-1238.43 7533.6,-1234.8 7526.93,-1231.06"/>
+<polygon fill="black" stroke="black" points="7528.45,-1227.9 7518.04,-1225.95 7524.96,-1233.97 7528.45,-1227.9"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance -->
+<g id="node211" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance</title>
+<g id="a_node211"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance" xlink:title="local, per&#45;layer&#45;type clearance; applied if global padstack clearance is 0 ">
+<ellipse fill="none" stroke="black" cx="7604.18" cy="-1204.1" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="7604.18" y="-1207.9" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="7604.18" y="-1192.9" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance -->
+<g id="edge294" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance</title>
+<path fill="none" stroke="black" d="M7691.51,-1279.67C7675.25,-1265.78 7654.82,-1248.34 7637.81,-1233.81"/>
+<polygon fill="black" stroke="black" points="7639.64,-1230.77 7629.76,-1226.94 7635.1,-1236.1 7639.64,-1230.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly -->
+<g id="node212" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly</title>
+<g id="a_node212"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly" xlink:title="arbitrary convex polygon shape; contains a list of x;y coordinates ">
+<ellipse fill="none" stroke="black" cx="7720.18" cy="-1204.1" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="7720.18" y="-1208.4" font-family="Times,serif" font-size="14.00">li:ps_poly</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly -->
+<g id="edge295" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly</title>
+<path fill="none" stroke="black" d="M7720.18,-1277.35C7720.18,-1266.56 7720.18,-1253.93 7720.18,-1242.27"/>
+<polygon fill="black" stroke="black" points="7723.68,-1241.92 7720.18,-1231.92 7716.68,-1241.93 7723.68,-1241.92"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line -->
+<g id="node213" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line</title>
+<g id="a_node213"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line" xlink:title="straight line shape, round or square cap">
+<ellipse fill="none" stroke="black" cx="7839.18" cy="-1204.1" rx="50.8235" ry="27.6545"/>
+<text text-anchor="middle" x="7839.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:ps_line</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line -->
+<g id="edge296" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line</title>
+<path fill="none" stroke="black" d="M7749.6,-1279.67C7766.19,-1265.86 7787.02,-1248.52 7804.42,-1234.04"/>
+<polygon fill="black" stroke="black" points="7806.69,-1236.7 7812.14,-1227.61 7802.22,-1231.32 7806.69,-1236.7"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ -->
+<g id="node220" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ</title>
+<g id="a_node220"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ" xlink:title="filled circle shape">
+<ellipse fill="none" stroke="black" cx="8173.18" cy="-1204.1" rx="50.8235" ry="27.6545"/>
+<text text-anchor="middle" x="8173.18" y="-1208.4" font-family="Times,serif" font-size="14.00">ha:ps_circ</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ -->
+<g id="edge303" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ</title>
+<path fill="none" stroke="black" d="M7782.22,-1290.59C7870.47,-1271.29 8030.99,-1236.19 8116.31,-1217.53"/>
+<polygon fill="black" stroke="black" points="8117.32,-1220.9 8126.34,-1215.34 8115.82,-1214.06 8117.32,-1220.9"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="node198" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/top</title>
+<g id="a_node198"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/top" xlink:title="location: top side">
+<ellipse fill="none" stroke="black" cx="7057.18" cy="-1103.75" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="7057.18" y="-1107.55" font-family="Times,serif" font-size="14.00">top</text>
+<text text-anchor="middle" x="7057.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="edge271" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/top</title>
+<path fill="none" stroke="black" d="M7216.42,-1184.49C7182.76,-1170.84 7136.95,-1151.16 7098.18,-1130.62 7094.87,-1128.86 7091.46,-1126.93 7088.09,-1124.94"/>
+<polygon fill="black" stroke="black" points="7089.73,-1121.84 7079.38,-1119.61 7086.08,-1127.81 7089.73,-1121.84"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="node199" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<g id="a_node199"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/bottom" xlink:title="location: bottom side">
+<ellipse fill="none" stroke="black" cx="7082.18" cy="-1014.01" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="7082.18" y="-1017.81" font-family="Times,serif" font-size="14.00">bottom</text>
+<text text-anchor="middle" x="7082.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="edge272" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<path fill="none" stroke="black" d="M7216.21,-1184.57C7189.88,-1172.46 7158.2,-1154.43 7136.18,-1130.62 7115.03,-1107.75 7100.83,-1075.12 7092.31,-1050.35"/>
+<polygon fill="black" stroke="black" points="7095.56,-1049.02 7089.12,-1040.61 7088.91,-1051.21 7095.56,-1049.02"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="node200" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<g id="a_node200"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/intern" xlink:title="location: internal">
+<ellipse fill="none" stroke="black" cx="7126.18" cy="-924.271" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="7126.18" y="-928.071" font-family="Times,serif" font-size="14.00">intern</text>
+<text text-anchor="middle" x="7126.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="edge274" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<path fill="none" stroke="black" d="M7226.27,-1181.04C7207.92,-1168.49 7187.1,-1151.17 7174.18,-1130.62 7156.59,-1102.64 7139.94,-1011.97 7131.65,-960.969"/>
+<polygon fill="black" stroke="black" points="7135.09,-960.346 7130.06,-951.025 7128.18,-961.453 7135.09,-960.346"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="node201" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<g id="a_node201"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/logical" xlink:title="location: logical (not in the actual stackup)">
+<ellipse fill="none" stroke="black" cx="7161.18" cy="-834.531" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="7161.18" y="-838.331" font-family="Times,serif" font-size="14.00">logical</text>
+<text text-anchor="middle" x="7161.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="edge276" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<path fill="none" stroke="black" d="M7241.83,-1177.98C7231.24,-1164.76 7219.36,-1147.76 7212.18,-1130.62 7202.3,-1107.03 7177.47,-945.285 7166.52,-871.766"/>
+<polygon fill="black" stroke="black" points="7169.93,-870.964 7165,-861.586 7163.01,-871.992 7169.93,-870.964"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="node202" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<g id="a_node202"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/copper" xlink:title="material: copper">
+<ellipse fill="none" stroke="black" cx="7199.18" cy="-744.791" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="7199.18" y="-748.591" font-family="Times,serif" font-size="14.00">copper</text>
+<text text-anchor="middle" x="7199.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="edge278" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<path fill="none" stroke="black" d="M7255.37,-1176.65C7244.14,-1140.56 7226.18,-1073.64 7226.18,-1015.01 7226.18,-1015.01 7226.18,-1015.01 7226.18,-923.271 7226.18,-873.629 7215.73,-817.056 7207.83,-781.393"/>
+<polygon fill="black" stroke="black" points="7211.21,-780.448 7205.58,-771.47 7204.38,-781.997 7211.21,-780.448"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="node203" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<g id="a_node203"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/silk" xlink:title="material: silk">
+<ellipse fill="none" stroke="black" cx="7247.18" cy="-655.051" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="7247.18" y="-658.851" font-family="Times,serif" font-size="14.00">silk</text>
+<text text-anchor="middle" x="7247.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="edge280" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<path fill="none" stroke="black" d="M7264.18,-1176.31C7264.18,-1139.83 7264.18,-1072.48 7264.18,-1015.01 7264.18,-1015.01 7264.18,-1015.01 7264.18,-833.531 7264.18,-784.229 7257.6,-727.573 7252.63,-691.799"/>
+<polygon fill="black" stroke="black" points="7256.09,-691.249 7251.21,-681.842 7249.16,-692.236 7256.09,-691.249"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="node204" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<g id="a_node204"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/mask" xlink:title="material: mask">
+<ellipse fill="none" stroke="black" cx="7279.18" cy="-565.311" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="7279.18" y="-569.111" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="7279.18" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="edge282" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<path fill="none" stroke="black" d="M7273,-1176.65C7284.22,-1140.56 7302.18,-1073.64 7302.18,-1015.01 7302.18,-1015.01 7302.18,-1015.01 7302.18,-743.791 7302.18,-694.303 7293.28,-637.692 7286.55,-601.979"/>
+<polygon fill="black" stroke="black" points="7289.97,-601.196 7284.63,-592.041 7283.09,-602.523 7289.97,-601.196"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="node205" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<g id="a_node205"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/paste" xlink:title="material: paste">
+<ellipse fill="none" stroke="black" cx="7319.18" cy="-475.571" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="7319.18" y="-479.371" font-family="Times,serif" font-size="14.00">paste</text>
+<text text-anchor="middle" x="7319.18" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="edge284" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<path fill="none" stroke="black" d="M7282,-1177.34C7304.47,-1142.28 7340.18,-1076.82 7340.18,-1015.01 7340.18,-1015.01 7340.18,-1015.01 7340.18,-654.051 7340.18,-604.631 7332.05,-548.004 7325.91,-512.268"/>
+<polygon fill="black" stroke="black" points="7329.34,-511.565 7324.16,-502.323 7322.45,-512.779 7329.34,-511.565"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="node206" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<g id="a_node206"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/outline" xlink:title="&quot;material&quot;: router path (board outline, slots, cutouts) ">
+<ellipse fill="none" stroke="black" cx="7350.18" cy="-385.831" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="7350.18" y="-389.631" font-family="Times,serif" font-size="14.00">outline</text>
+<text text-anchor="middle" x="7350.18" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="edge286" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<path fill="none" stroke="black" d="M7292.11,-1178.69C7305.88,-1165.53 7321.91,-1148.36 7333.18,-1130.62 7362.75,-1084.08 7378.18,-1070.15 7378.18,-1015.01 7378.18,-1015.01 7378.18,-1015.01 7378.18,-564.311 7378.18,-514.626 7367.34,-458.064 7359.15,-422.415"/>
+<polygon fill="black" stroke="black" points="7362.52,-421.428 7356.82,-412.496 7355.7,-423.032 7362.52,-421.428"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="node207" class="node"><title>dup38_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<g id="a_node207"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/substrate" xlink:title="material: substrate or insulator">
+<ellipse fill="none" stroke="black" cx="7383.18" cy="-296.09" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="7383.18" y="-299.89" font-family="Times,serif" font-size="14.00">substrate</text>
+<text text-anchor="middle" x="7383.18" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="edge288" class="edge"><title>dup38_/lht_tree_doc/comm/layer_mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<path fill="none" stroke="black" d="M7303.63,-1181.3C7323.8,-1168.61 7347.54,-1151.08 7364.18,-1130.62 7399.75,-1086.92 7416.18,-1071.35 7416.18,-1015.01 7416.18,-1015.01 7416.18,-1015.01 7416.18,-474.571 7416.18,-424.652 7403.41,-368.147 7393.76,-332.574"/>
+<polygon fill="black" stroke="black" points="7397.06,-331.375 7391,-322.678 7390.31,-333.25 7397.06,-331.375"/>
+</g>
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/top&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/bottom&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/intern -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/intern&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/logical -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/logical&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/copper -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/copper&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/silk -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/silk&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/mask -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/mask&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/paste -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/paste&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/outline -->
+<!-- dup38_/lht_tree_doc/comm/layer_mask/children/outline&#45;&gt;dup38_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<!-- dup39_/lht_tree_doc/comm/combining/children/sub -->
+<g id="node209" class="node"><title>dup39_/lht_tree_doc/comm/combining/children/sub</title>
+<g id="a_node209"><a xlink:href="tree.html#/lht_tree_doc/comm/combining/children/sub" xlink:title="draw in negative">
+<ellipse fill="none" stroke="black" cx="7471.18" cy="-1103.75" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="7471.18" y="-1107.55" font-family="Times,serif" font-size="14.00">sub</text>
+<text text-anchor="middle" x="7471.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining&#45;&gt;dup39_/lht_tree_doc/comm/combining/children/sub -->
+<g id="edge291" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining&#45;&gt;dup39_/lht_tree_doc/comm/combining/children/sub</title>
+<path fill="none" stroke="black" d="M7481.4,-1176.48C7479.83,-1165.48 7477.99,-1152.56 7476.31,-1140.74"/>
+<polygon fill="black" stroke="black" points="7479.75,-1140.11 7474.88,-1130.71 7472.82,-1141.1 7479.75,-1140.11"/>
+</g>
+<!-- dup39_/lht_tree_doc/comm/combining/children/auto -->
+<g id="node210" class="node"><title>dup39_/lht_tree_doc/comm/combining/children/auto</title>
+<g id="a_node210"><a xlink:href="tree.html#/lht_tree_doc/comm/combining/children/auto" xlink:title="padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag">
+<ellipse fill="none" stroke="black" cx="7499.18" cy="-1014.01" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="7499.18" y="-1017.81" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="7499.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining&#45;&gt;dup39_/lht_tree_doc/comm/combining/children/auto -->
+<g id="edge292" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining&#45;&gt;dup39_/lht_tree_doc/comm/combining/children/auto</title>
+<path fill="none" stroke="black" d="M7495.25,-1176.68C7499.89,-1163.13 7504.87,-1146.23 7507.18,-1130.62 7510.69,-1107 7508.72,-1100.72 7507.18,-1076.88 7506.64,-1068.43 7505.68,-1059.37 7504.61,-1050.86"/>
+<polygon fill="black" stroke="black" points="7508.07,-1050.28 7503.28,-1040.83 7501.13,-1051.2 7508.07,-1050.28"/>
+</g>
+<!-- dup39_/lht_tree_doc/comm/combining/children/sub&#45;&gt;dup39_/lht_tree_doc/comm/combining/children/auto -->
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1 -->
+<g id="node214" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1</title>
+<g id="a_node214"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1" xlink:title="line first endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="7587.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="7587.18" y="-1107.55" font-family="Times,serif" font-size="14.00">x1</text>
+<text text-anchor="middle" x="7587.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1 -->
+<g id="edge297" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1</title>
+<path fill="none" stroke="black" d="M7808.39,-1181.87C7799.29,-1176.3 7789.1,-1170.71 7779.18,-1166.62 7715.8,-1140.5 7692.5,-1156.93 7629.18,-1130.62 7626.51,-1129.51 7623.82,-1128.25 7621.15,-1126.88"/>
+<polygon fill="black" stroke="black" points="7622.71,-1123.74 7612.26,-1121.97 7619.32,-1129.87 7622.71,-1123.74"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1 -->
+<g id="node215" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1</title>
+<g id="a_node215"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1" xlink:title="line first endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="7671.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="7671.18" y="-1107.55" font-family="Times,serif" font-size="14.00">y1</text>
+<text text-anchor="middle" x="7671.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1 -->
+<g id="edge298" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1</title>
+<path fill="none" stroke="black" d="M7806.34,-1182.75C7797.57,-1177.42 7788.06,-1171.73 7779.18,-1166.62 7750.23,-1149.94 7742.09,-1147.39 7713.18,-1130.62 7710.83,-1129.26 7708.42,-1127.84 7706,-1126.39"/>
+<polygon fill="black" stroke="black" points="7707.64,-1123.29 7697.27,-1121.11 7704.02,-1129.28 7707.64,-1123.29"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2 -->
+<g id="node216" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2</title>
+<g id="a_node216"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2" xlink:title="line second endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="7755.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="7755.18" y="-1107.55" font-family="Times,serif" font-size="14.00">x2</text>
+<text text-anchor="middle" x="7755.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2 -->
+<g id="edge299" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2</title>
+<path fill="none" stroke="black" d="M7818.42,-1178.79C7806.86,-1165.25 7792.39,-1148.31 7780.21,-1134.05"/>
+<polygon fill="black" stroke="black" points="7782.86,-1131.77 7773.71,-1126.44 7777.54,-1136.32 7782.86,-1131.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2 -->
+<g id="node217" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2</title>
+<g id="a_node217"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2" xlink:title="line second endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="7839.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="7839.18" y="-1107.55" font-family="Times,serif" font-size="14.00">y2</text>
+<text text-anchor="middle" x="7839.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2 -->
+<g id="edge300" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2</title>
+<path fill="none" stroke="black" d="M7839.18,-1176.48C7839.18,-1165.48 7839.18,-1152.56 7839.18,-1140.74"/>
+<polygon fill="black" stroke="black" points="7842.68,-1140.71 7839.18,-1130.71 7835.68,-1140.71 7842.68,-1140.71"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness -->
+<g id="node218" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness</title>
+<g id="a_node218"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness" xlink:title="width of the line ">
+<ellipse fill="none" stroke="black" cx="7938.18" cy="-1103.75" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="7938.18" y="-1107.55" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="7938.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness -->
+<g id="edge301" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness</title>
+<path fill="none" stroke="black" d="M7862.9,-1179.54C7876.44,-1166.09 7893.55,-1149.09 7908.04,-1134.69"/>
+<polygon fill="black" stroke="black" points="7910.72,-1136.97 7915.35,-1127.44 7905.78,-1132 7910.72,-1136.97"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square -->
+<g id="node219" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square</title>
+<g id="a_node219"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square" xlink:title="0=round cap; 1=square cap ">
+<ellipse fill="none" stroke="black" cx="8042.18" cy="-1103.75" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="8042.18" y="-1107.55" font-family="Times,serif" font-size="14.00">square</text>
+<text text-anchor="middle" x="8042.18" y="-1092.55" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square -->
+<g id="edge302" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square</title>
+<path fill="none" stroke="black" d="M7877.69,-1185.83C7909.24,-1171.51 7954.9,-1150.37 7994.18,-1130.62 7997.28,-1129.06 8000.47,-1127.42 8003.67,-1125.76"/>
+<polygon fill="black" stroke="black" points="8005.41,-1128.79 8012.62,-1121.03 8002.14,-1122.6 8005.41,-1128.79"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x -->
+<g id="node221" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x</title>
+<g id="a_node221"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x" xlink:title="center, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="8131.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="8131.18" y="-1107.55" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="8131.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x -->
+<g id="edge304" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x</title>
+<path fill="none" stroke="black" d="M8162.04,-1177C8157,-1165.21 8150.99,-1151.13 8145.62,-1138.55"/>
+<polygon fill="black" stroke="black" points="8148.8,-1137.1 8141.66,-1129.28 8142.37,-1139.85 8148.8,-1137.1"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y -->
+<g id="node222" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y</title>
+<g id="a_node222"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y" xlink:title="center, vertical offset ">
+<ellipse fill="none" stroke="black" cx="8215.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="8215.18" y="-1107.55" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="8215.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y -->
+<g id="edge305" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y</title>
+<path fill="none" stroke="black" d="M8184.33,-1177C8189.36,-1165.21 8195.38,-1151.13 8200.75,-1138.55"/>
+<polygon fill="black" stroke="black" points="8204,-1139.85 8204.71,-1129.28 8197.56,-1137.1 8204,-1139.85"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia -->
+<g id="node223" class="node"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia</title>
+<g id="a_node223"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia" xlink:title="circle diameter ">
+<ellipse fill="none" stroke="black" cx="8299.18" cy="-1103.75" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="8299.18" y="-1107.55" font-family="Times,serif" font-size="14.00">dia</text>
+<text text-anchor="middle" x="8299.18" y="-1092.55" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia -->
+<g id="edge306" class="edge"><title>/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ&#45;&gt;/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia</title>
+<path fill="none" stroke="black" d="M8201.46,-1181.03C8221.1,-1165.7 8247.29,-1145.25 8267.61,-1129.39"/>
+<polygon fill="black" stroke="black" points="8269.92,-1132.03 8275.65,-1123.12 8265.61,-1126.52 8269.92,-1132.03"/>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid -->
+<g id="node225" class="node"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid</title>
+<g id="a_node225"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/uid" xlink:title="UID assigned by the user to track subc history ">
+<ellipse fill="none" stroke="black" cx="8088.18" cy="-1519.28" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="8088.18" y="-1523.08" font-family="Times,serif" font-size="14.00">uid</text>
+<text text-anchor="middle" x="8088.18" y="-1508.08" font-family="Times,serif" font-size="14.00">minuid</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid -->
+<g id="edge308" class="edge"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid</title>
+<path fill="none" stroke="black" d="M8172.49,-1600.49C8155.5,-1584.33 8134.7,-1564.53 8118,-1548.65"/>
+<polygon fill="black" stroke="black" points="8120.31,-1546.02 8110.65,-1541.66 8115.49,-1551.09 8120.31,-1546.02"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/attributes -->
+<g id="node226" class="node"><title>dup40_/lht_tree_doc/comm/attributes</title>
+<g id="a_node226"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="8204.18" cy="-1519.28" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="8204.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/comm/attributes -->
+<g id="edge309" class="edge"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M8204.18,-1593.28C8204.18,-1581.7 8204.18,-1568.94 8204.18,-1557.37"/>
+<polygon fill="black" stroke="black" points="8207.68,-1557.15 8204.18,-1547.15 8200.68,-1557.15 8207.68,-1557.15"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit -->
+<g id="node228" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit</title>
+<g id="a_node228"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit" xlink:title="flag bits of a subcircuit">
+<ellipse fill="none" stroke="black" cx="8363.18" cy="-1519.28" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="8363.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit -->
+<g id="edge311" class="edge"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit</title>
+<path fill="none" stroke="black" d="M8242.27,-1604.21C8267.94,-1586.39 8301.6,-1563.03 8326.89,-1545.47"/>
+<polygon fill="black" stroke="black" points="8328.9,-1548.34 8335.12,-1539.76 8324.91,-1542.59 8328.9,-1548.34"/>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data -->
+<g id="node237" class="node"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data</title>
+<g id="a_node237"><a xlink:href="data.svg" xlink:title="data &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="8451.18" y="-1531.58" font-family="Times,serif" font-size="14.00">data &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data -->
+<g id="edge327" class="edge"><title>dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup40_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data</title>
+<path fill="none" stroke="black" d="M8255.41,-1619.7C8299.79,-1608.66 8364.51,-1588.72 8414.18,-1557.46 8416.13,-1556.24 8418.04,-1554.9 8419.92,-1553.48"/>
+<polygon fill="black" stroke="black" points="8422.47,-1555.91 8427.88,-1546.8 8417.97,-1550.55 8422.47,-1555.91"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node227" class="node"><title>dup40_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node227"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="8155.18" cy="-1406.91" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="8155.18" y="-1410.71" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="8155.18" y="-1395.71" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/attributes&#45;&gt;dup40_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge310" class="edge"><title>dup40_/lht_tree_doc/comm/attributes&#45;&gt;dup40_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M8192.57,-1492.12C8186.01,-1477.34 8177.72,-1458.68 8170.62,-1442.68"/>
+<polygon fill="black" stroke="black" points="8173.63,-1440.84 8166.38,-1433.12 8167.23,-1443.68 8173.63,-1440.84"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/found -->
+<g id="node229" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/found</title>
+<g id="a_node229"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="8256.18" cy="-1406.91" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="8256.18" y="-1410.71" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="8256.18" y="-1395.71" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/found -->
+<g id="edge312" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/found</title>
+<path fill="none" stroke="black" d="M8341.27,-1495.68C8324.58,-1478.46 8301.5,-1454.65 8283.59,-1436.18"/>
+<polygon fill="black" stroke="black" points="8285.73,-1433.36 8276.26,-1428.62 8280.71,-1438.24 8285.73,-1433.36"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<g id="node230" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected</title>
+<g id="a_node230"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="8286.18" cy="-1305.15" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="8286.18" y="-1308.95" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="8286.18" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<g id="edge313" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected</title>
+<path fill="none" stroke="black" d="M8353.74,-1492.27C8339.99,-1454.37 8314.4,-1383.88 8298.97,-1341.37"/>
+<polygon fill="black" stroke="black" points="8302.16,-1339.92 8295.46,-1331.71 8295.58,-1342.31 8302.16,-1339.92"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<g id="node231" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto</title>
+<g id="a_node231"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="8338.18" cy="-1204.1" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="8338.18" y="-1207.9" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="8338.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<g id="edge315" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto</title>
+<path fill="none" stroke="black" d="M8361.05,-1491.58C8356.57,-1435.39 8346.15,-1304.89 8341.07,-1241.27"/>
+<polygon fill="black" stroke="black" points="8344.56,-1240.98 8340.27,-1231.29 8337.58,-1241.54 8344.56,-1240.98"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<g id="node232" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc</title>
+<g id="a_node232"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="8377.18" cy="-1103.75" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="8377.18" y="-1107.55" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="8377.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<g id="edge317" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc</title>
+<path fill="none" stroke="black" d="M8365.71,-1491.54C8366.94,-1477.69 8368.33,-1460.5 8369.18,-1445.1 8375.35,-1334.36 8376.78,-1203.1 8377.1,-1140.9"/>
+<polygon fill="black" stroke="black" points="8380.6,-1140.84 8377.14,-1130.82 8373.6,-1140.8 8380.6,-1140.84"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<g id="node233" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock</title>
+<g id="a_node233"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="8414.18" cy="-1014.01" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="8414.18" y="-1017.81" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="8414.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<g id="edge319" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock</title>
+<path fill="none" stroke="black" d="M8377.15,-1493.02C8397.31,-1454.12 8432.18,-1376.64 8432.18,-1306.15 8432.18,-1306.15 8432.18,-1306.15 8432.18,-1203.1 8432.18,-1149.88 8424.95,-1088.57 8419.66,-1050.8"/>
+<polygon fill="black" stroke="black" points="8423.11,-1050.2 8418.22,-1040.8 8416.18,-1051.19 8423.11,-1050.2"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<g id="node234" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist</title>
+<g id="a_node234"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="8435.18" cy="-924.271" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="8435.18" y="-928.071" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="8435.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<g id="edge321" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist</title>
+<path fill="none" stroke="black" d="M8386.54,-1496.06C8399.74,-1482.42 8415.65,-1463.98 8426.18,-1445.1 8457.73,-1388.52 8470.18,-1370.93 8470.18,-1306.15 8470.18,-1306.15 8470.18,-1306.15 8470.18,-1102.75 8470.18,-1052.73 8456.64,-996.249 8446.4,-960.71"/>
+<polygon fill="black" stroke="black" points="8449.67,-959.424 8443.48,-950.825 8442.95,-961.407 8449.67,-959.424"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<g id="node235" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname</title>
+<g id="a_node235"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="8467.18" cy="-834.531" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="8467.18" y="-838.331" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="8467.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<g id="edge323" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname</title>
+<path fill="none" stroke="black" d="M8390.49,-1498.06C8417.97,-1477.63 8456.66,-1448.57 8459.18,-1445.1 8497.72,-1392.16 8508.18,-1371.63 8508.18,-1306.15 8508.18,-1306.15 8508.18,-1306.15 8508.18,-1013.01 8508.18,-960.94 8502.18,-947.825 8489.18,-897.401 8486.91,-888.578 8483.91,-879.234 8480.86,-870.554"/>
+<polygon fill="black" stroke="black" points="8484.13,-869.308 8477.43,-861.099 8477.55,-871.694 8484.13,-869.308"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+<g id="node236" class="node"><title>dup40_/lht_tree_doc/comm/flags_subcircuit/children/floater</title>
+<g id="a_node236"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="8506.18" cy="-744.791" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="8506.18" y="-748.591" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="8506.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+<g id="edge325" class="edge"><title>dup40_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/floater</title>
+<path fill="none" stroke="black" d="M8389.2,-1497.69C8397,-1491.96 8405.74,-1485.98 8414.18,-1481.1 8448.29,-1461.38 8468.27,-1473.86 8495.18,-1445.1 8540.13,-1397.06 8546.18,-1371.93 8546.18,-1306.15 8546.18,-1306.15 8546.18,-1306.15 8546.18,-923.271 8546.18,-872.819 8530.61,-816.23 8518.9,-780.805"/>
+<polygon fill="black" stroke="black" points="8522.09,-779.306 8515.56,-770.959 8515.46,-781.553 8522.09,-779.306"/>
+</g>
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/found&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/selected&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/auto&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/drc&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/lock&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<!-- dup40_/lht_tree_doc/comm/flags_subcircuit/children/termname&#45;&gt;dup40_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/x -->
+<g id="node239" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/x</title>
+<g id="a_node239"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/x" xlink:title="element origin (diamond), horizontal offset ">
+<ellipse fill="none" stroke="black" cx="8534.18" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="8534.18" y="-1523.08" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="8534.18" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/x -->
+<g id="edge329" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/x</title>
+<path fill="none" stroke="black" d="M8632.52,-1601.08C8614.95,-1588.02 8594.31,-1572.29 8576.18,-1557.46 8571.94,-1554 8567.54,-1550.26 8563.25,-1546.53"/>
+<polygon fill="black" stroke="black" points="8565.53,-1543.88 8555.7,-1539.91 8560.91,-1549.14 8565.53,-1543.88"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/y -->
+<g id="node240" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/y</title>
+<g id="a_node240"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/y" xlink:title="element origin (diamond), vertical offset ">
+<ellipse fill="none" stroke="black" cx="8618.18" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="8618.18" y="-1523.08" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="8618.18" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/y -->
+<g id="edge330" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/y</title>
+<path fill="none" stroke="black" d="M8655.33,-1594.81C8648.71,-1581.54 8641.25,-1566.57 8634.76,-1553.53"/>
+<polygon fill="black" stroke="black" points="8637.82,-1551.83 8630.22,-1544.44 8631.55,-1554.95 8637.82,-1551.83"/>
+</g>
+<!-- dup41_/lht_tree_doc/comm/attributes -->
+<g id="node241" class="node"><title>dup41_/lht_tree_doc/comm/attributes</title>
+<g id="a_node241"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="8728.18" cy="-1519.28" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="8728.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID&#45;&gt;dup41_/lht_tree_doc/comm/attributes -->
+<g id="edge331" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID&#45;&gt;dup41_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M8691.04,-1594.81C8697.29,-1582.28 8704.3,-1568.21 8710.53,-1555.7"/>
+<polygon fill="black" stroke="black" points="8713.79,-1557.01 8715.12,-1546.5 8707.53,-1553.89 8713.79,-1557.01"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element -->
+<g id="node243" class="node"><title>dup42_/lht_tree_doc/comm/flags_element</title>
+<g id="a_node243"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element" xlink:title="flag bits of an element">
+<ellipse fill="none" stroke="black" cx="8886.18" cy="-1519.28" rx="77.5641" ry="27.6545"/>
+<text text-anchor="middle" x="8886.18" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:flags_element</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID&#45;&gt;dup42_/lht_tree_doc/comm/flags_element -->
+<g id="edge333" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID&#45;&gt;dup42_/lht_tree_doc/comm/flags_element</title>
+<path fill="none" stroke="black" d="M8722.05,-1605.33C8755.65,-1587.92 8800.2,-1564.83 8834.41,-1547.11"/>
+<polygon fill="black" stroke="black" points="8836.05,-1550.2 8843.31,-1542.49 8832.83,-1543.99 8836.05,-1550.2"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects -->
+<g id="node253" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects</title>
+<g id="a_node253"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects" xlink:title="list of special objects that make up the element; lines and arcs are always on a silk layer">
+<ellipse fill="none" stroke="black" cx="9429.18" cy="-1519.28" rx="46.8387" ry="27.6545"/>
+<text text-anchor="middle" x="9429.18" y="-1523.58" font-family="Times,serif" font-size="14.00">li:objects</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects -->
+<g id="edge351" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects</title>
+<path fill="none" stroke="black" d="M8737.97,-1621.19C8884,-1599.87 9236.8,-1548.37 9373.64,-1528.39"/>
+<polygon fill="black" stroke="black" points="9374.49,-1531.8 9383.88,-1526.89 9373.48,-1524.88 9374.49,-1531.8"/>
+</g>
+<!-- dup41_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node242" class="node"><title>dup41_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node242"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="8623.18" cy="-1406.91" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="8623.18" y="-1410.71" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="8623.18" y="-1395.71" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup41_/lht_tree_doc/comm/attributes&#45;&gt;dup41_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge332" class="edge"><title>dup41_/lht_tree_doc/comm/attributes&#45;&gt;dup41_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M8704.88,-1493.79C8689.48,-1477.6 8669.16,-1456.24 8652.64,-1438.87"/>
+<polygon fill="black" stroke="black" points="8654.77,-1436.04 8645.34,-1431.21 8649.7,-1440.86 8654.77,-1436.04"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/found -->
+<g id="node244" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/found</title>
+<g id="a_node244"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="8724.18" cy="-1406.91" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="8724.18" y="-1410.71" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="8724.18" y="-1395.71" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/found -->
+<g id="edge334" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/found</title>
+<path fill="none" stroke="black" d="M8848.15,-1495.04C8825.72,-1481.05 8796.97,-1462.6 8772.18,-1445.1 8766.87,-1441.35 8761.33,-1437.24 8755.99,-1433.18"/>
+<polygon fill="black" stroke="black" points="8757.86,-1430.2 8747.8,-1426.87 8753.59,-1435.75 8757.86,-1430.2"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/selected -->
+<g id="node245" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/selected</title>
+<g id="a_node245"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="8754.18" cy="-1305.15" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="8754.18" y="-1308.95" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="8754.18" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/selected -->
+<g id="edge335" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/selected</title>
+<path fill="none" stroke="black" d="M8855.04,-1493.69C8839.95,-1480.54 8822.48,-1463.32 8810.18,-1445.1 8788.45,-1412.89 8773.01,-1370.96 8763.92,-1341.62"/>
+<polygon fill="black" stroke="black" points="8767.2,-1340.37 8760.97,-1331.8 8760.5,-1342.39 8767.2,-1340.37"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/auto -->
+<g id="node246" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/auto</title>
+<g id="a_node246"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="8806.18" cy="-1204.1" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="8806.18" y="-1207.9" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="8806.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/auto -->
+<g id="edge337" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/auto</title>
+<path fill="none" stroke="black" d="M8870.06,-1492.04C8862.38,-1478.47 8853.69,-1461.37 8848.18,-1445.1 8824.5,-1375.06 8813.58,-1288.79 8809.03,-1241.09"/>
+<polygon fill="black" stroke="black" points="8812.5,-1240.6 8808.11,-1230.96 8805.53,-1241.23 8812.5,-1240.6"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/drc -->
+<g id="node247" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/drc</title>
+<g id="a_node247"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="8845.18" cy="-1103.75" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="8845.18" y="-1107.55" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="8845.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/drc -->
+<g id="edge339" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/drc</title>
+<path fill="none" stroke="black" d="M8883.53,-1491.47C8876.4,-1419.61 8856.87,-1222.67 8848.78,-1140.99"/>
+<polygon fill="black" stroke="black" points="8852.23,-1140.31 8847.76,-1130.71 8845.26,-1141 8852.23,-1140.31"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/lock -->
+<g id="node248" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/lock</title>
+<g id="a_node248"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="8882.18" cy="-1014.01" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="8882.18" y="-1017.81" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="8882.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/lock -->
+<g id="edge341" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/lock</title>
+<path fill="none" stroke="black" d="M8889.08,-1491.53C8893.19,-1451.34 8900.18,-1372.96 8900.18,-1306.15 8900.18,-1306.15 8900.18,-1306.15 8900.18,-1203.1 8900.18,-1149.88 8892.95,-1088.57 8887.66,-1050.8"/>
+<polygon fill="black" stroke="black" points="8891.11,-1050.2 8886.22,-1040.8 8884.18,-1051.19 8891.11,-1050.2"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/nonetlist -->
+<g id="node249" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/nonetlist</title>
+<g id="a_node249"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="8903.18" cy="-924.271" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="8903.18" y="-928.071" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="8903.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/nonetlist -->
+<g id="edge343" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/nonetlist</title>
+<path fill="none" stroke="black" d="M8897.08,-1491.67C8912.33,-1451.98 8938.18,-1374.59 8938.18,-1306.15 8938.18,-1306.15 8938.18,-1306.15 8938.18,-1102.75 8938.18,-1052.73 8924.64,-996.249 8914.4,-960.71"/>
+<polygon fill="black" stroke="black" points="8917.67,-959.424 8911.48,-950.825 8910.95,-961.407 8917.67,-959.424"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/termname -->
+<g id="node250" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/termname</title>
+<g id="a_node250"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="8935.18" cy="-834.531" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="8935.18" y="-838.331" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="8935.18" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/termname -->
+<g id="edge345" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/termname</title>
+<path fill="none" stroke="black" d="M8906.87,-1492.41C8916.84,-1478.93 8928.32,-1461.8 8936.18,-1445.1 8963.55,-1386.95 8976.18,-1370.41 8976.18,-1306.15 8976.18,-1306.15 8976.18,-1306.15 8976.18,-1013.01 8976.18,-960.94 8970.18,-947.825 8957.18,-897.401 8954.91,-888.578 8951.91,-879.234 8948.86,-870.554"/>
+<polygon fill="black" stroke="black" points="8952.13,-869.308 8945.43,-861.099 8945.55,-871.694 8952.13,-869.308"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/floater -->
+<g id="node251" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/floater</title>
+<g id="a_node251"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="8987.18" cy="-744.791" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="8987.18" y="-748.591" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="8987.18" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/floater -->
+<g id="edge347" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/floater</title>
+<path fill="none" stroke="black" d="M8919.43,-1494.25C8935.43,-1481.24 8953.78,-1463.98 8966.18,-1445.1 9002.06,-1390.49 9014.18,-1371.49 9014.18,-1306.15 9014.18,-1306.15 9014.18,-1306.15 9014.18,-923.271 9014.18,-873.629 9003.73,-817.056 8995.83,-781.393"/>
+<polygon fill="black" stroke="black" points="8999.21,-780.448 8993.58,-771.47 8992.38,-781.997 8999.21,-780.448"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/onsolder -->
+<g id="node252" class="node"><title>dup42_/lht_tree_doc/comm/flags_element/children/onsolder</title>
+<g id="a_node252"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_element/children/onsolder" xlink:title="element is placed on the solder side">
+<ellipse fill="none" stroke="black" cx="9019.18" cy="-655.051" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="9019.18" y="-658.851" font-family="Times,serif" font-size="14.00">onsolder</text>
+<text text-anchor="middle" x="9019.18" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/onsolder -->
+<g id="edge349" class="edge"><title>dup42_/lht_tree_doc/comm/flags_element&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/onsolder</title>
+<path fill="none" stroke="black" d="M8932.94,-1497.16C8955.86,-1484.8 8982.31,-1467.24 9000.18,-1445.1 9041.6,-1393.79 9052.18,-1372.09 9052.18,-1306.15 9052.18,-1306.15 9052.18,-1306.15 9052.18,-833.531 9052.18,-783.613 9039.41,-727.107 9029.76,-691.535"/>
+<polygon fill="black" stroke="black" points="9033.06,-690.335 9027,-681.639 9026.31,-692.211 9033.06,-690.335"/>
+</g>
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/found&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/selected -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/selected&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/auto -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/auto&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/drc -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/drc&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/lock -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/lock&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/nonetlist -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/nonetlist&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/termname -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/termname&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/floater -->
+<!-- dup42_/lht_tree_doc/comm/flags_element/children/floater&#45;&gt;dup42_/lht_tree_doc/comm/flags_element/children/onsolder -->
+<!-- dup43_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/line.ID -->
+<g id="node254" class="node"><title>dup43_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/line.ID</title>
+<g id="a_node254"><a xlink:href="line.ID.svg" xlink:title="line.ID &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="9297.18" y="-1419.21" font-family="Times,serif" font-size="14.00">line.ID &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup43_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/line.ID -->
+<g id="edge352" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup43_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/line.ID</title>
+<path fill="none" stroke="black" d="M9402.79,-1496.21C9383.98,-1480.48 9358.35,-1459.05 9337.05,-1441.25"/>
+<polygon fill="black" stroke="black" points="9339.04,-1438.35 9329.13,-1434.62 9334.55,-1443.72 9339.04,-1438.35"/>
+</g>
+<!-- dup44_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/arc.ID -->
+<g id="node255" class="node"><title>dup44_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/arc.ID</title>
+<g id="a_node255"><a xlink:href="arc.ID.svg" xlink:title="arc.ID &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="9385.18" y="-1419.21" font-family="Times,serif" font-size="14.00">arc.ID &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup44_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/arc.ID -->
+<g id="edge353" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup44_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/arc.ID</title>
+<path fill="none" stroke="black" d="M9418.76,-1492.12C9413.03,-1477.77 9405.85,-1459.74 9399.59,-1444.06"/>
+<polygon fill="black" stroke="black" points="9402.8,-1442.64 9395.84,-1434.65 9396.29,-1445.23 9402.8,-1442.64"/>
+</g>
+<!-- dup45_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/text.ID -->
+<g id="node256" class="node"><title>dup45_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/text.ID</title>
+<g id="a_node256"><a xlink:href="text.ID.svg" xlink:title="text.ID &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="9473.18" y="-1419.21" font-family="Times,serif" font-size="14.00">text.ID &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup45_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/text.ID -->
+<g id="edge354" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;dup45_/lht_tree_doc/comm/data/children/element.ID/children/objects/children/text.ID</title>
+<path fill="none" stroke="black" d="M9439.61,-1492.12C9445.34,-1477.77 9452.52,-1459.74 9458.77,-1444.06"/>
+<polygon fill="black" stroke="black" points="9462.07,-1445.23 9462.53,-1434.65 9455.57,-1442.64 9462.07,-1445.23"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID -->
+<g id="node257" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID</title>
+<g id="a_node257"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID" xlink:title="SMD pad emulated using a line object; becomes a rectangle (but watch out for the cap&#45;extended length!) when the square flag is set">
+<ellipse fill="none" stroke="black" cx="9577.18" cy="-1406.91" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="9577.18" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:pad.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID -->
+<g id="edge355" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID</title>
+<path fill="none" stroke="black" d="M9457.37,-1497.26C9480.83,-1479.77 9514.42,-1454.72 9540.07,-1435.59"/>
+<polygon fill="black" stroke="black" points="9542.17,-1438.39 9548.09,-1429.61 9537.98,-1432.78 9542.17,-1438.39"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID -->
+<g id="node284" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID</title>
+<g id="a_node284"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID" xlink:title="thru&#45;hole pin; emulated as an old&#45;style via ">
+<ellipse fill="none" stroke="black" cx="10616.2" cy="-1406.91" rx="48.1667" ry="27.6545"/>
+<text text-anchor="middle" x="10616.2" y="-1411.21" font-family="Times,serif" font-size="14.00">ha:pin.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID -->
+<g id="edge395" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID</title>
+<path fill="none" stroke="black" d="M9475.35,-1513.99C9661.12,-1496.72 10353.8,-1432.31 10558.7,-1413.26"/>
+<polygon fill="black" stroke="black" points="10559.3,-1416.71 10569,-1412.3 10558.7,-1409.74 10559.3,-1416.71"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1 -->
+<g id="node258" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1</title>
+<g id="a_node258"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1" xlink:title="line first endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="9113.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9113.18" y="-1308.95" font-family="Times,serif" font-size="14.00">x1</text>
+<text text-anchor="middle" x="9113.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1 -->
+<g id="edge356" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1</title>
+<path fill="none" stroke="black" d="M9548.54,-1384.14C9539.3,-1378.16 9528.72,-1372.35 9518.18,-1368.73 9364.84,-1316.1 9308.48,-1385.5 9155.18,-1332.73 9152.08,-1331.66 9148.98,-1330.33 9145.94,-1328.82"/>
+<polygon fill="black" stroke="black" points="9147.52,-1325.7 9137.08,-1323.93 9144.14,-1331.83 9147.52,-1325.7"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1 -->
+<g id="node259" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1</title>
+<g id="a_node259"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1" xlink:title="line first endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="9197.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9197.18" y="-1308.95" font-family="Times,serif" font-size="14.00">y1</text>
+<text text-anchor="middle" x="9197.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1 -->
+<g id="edge357" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1</title>
+<path fill="none" stroke="black" d="M9548.17,-1384.13C9539,-1378.24 9528.55,-1372.46 9518.18,-1368.73 9400.54,-1326.41 9356.79,-1375.16 9239.18,-1332.73 9236.1,-1331.62 9233.01,-1330.25 9229.97,-1328.73"/>
+<polygon fill="black" stroke="black" points="9231.57,-1325.61 9221.13,-1323.79 9228.16,-1331.72 9231.57,-1325.61"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2 -->
+<g id="node260" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2</title>
+<g id="a_node260"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2" xlink:title="line second endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="9281.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9281.18" y="-1308.95" font-family="Times,serif" font-size="14.00">x2</text>
+<text text-anchor="middle" x="9281.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2 -->
+<g id="edge358" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2</title>
+<path fill="none" stroke="black" d="M9547.74,-1384.29C9538.64,-1378.47 9528.33,-1372.69 9518.18,-1368.73 9436.1,-1336.66 9405.24,-1364.88 9323.18,-1332.73 9320.3,-1331.6 9317.41,-1330.27 9314.55,-1328.81"/>
+<polygon fill="black" stroke="black" points="9316.1,-1325.66 9305.67,-1323.82 9312.67,-1331.77 9316.1,-1325.66"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2 -->
+<g id="node261" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2</title>
+<g id="a_node261"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2" xlink:title="line second endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="9365.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9365.18" y="-1308.95" font-family="Times,serif" font-size="14.00">y2</text>
+<text text-anchor="middle" x="9365.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2 -->
+<g id="edge359" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2</title>
+<path fill="none" stroke="black" d="M9546.76,-1384.74C9537.81,-1379.07 9527.83,-1373.26 9518.18,-1368.73 9471.63,-1346.85 9454.83,-1354.4 9408.18,-1332.73 9405.24,-1331.36 9402.25,-1329.83 9399.28,-1328.22"/>
+<polygon fill="black" stroke="black" points="9400.97,-1325.15 9390.55,-1323.2 9397.48,-1331.22 9400.97,-1325.15"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness -->
+<g id="node262" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness</title>
+<g id="a_node262"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness" xlink:title="width of the line">
+<ellipse fill="none" stroke="black" cx="9464.18" cy="-1305.15" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="9464.18" y="-1308.95" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="9464.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness -->
+<g id="edge360" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M9551.26,-1383.03C9535.1,-1368.76 9514.16,-1350.28 9496.87,-1335.01"/>
+<polygon fill="black" stroke="black" points="9499.02,-1332.24 9489.21,-1328.25 9494.39,-1337.49 9499.02,-1332.24"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance -->
+<g id="node263" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance</title>
+<g id="a_node263"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance" xlink:title="clearance around the line">
+<ellipse fill="none" stroke="black" cx="9577.18" cy="-1305.15" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="9577.18" y="-1308.95" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="9577.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance -->
+<g id="edge361" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M9577.18,-1379.18C9577.18,-1367.93 9577.18,-1354.66 9577.18,-1342.54"/>
+<polygon fill="black" stroke="black" points="9580.68,-1342.27 9577.18,-1332.27 9573.68,-1342.27 9580.68,-1342.27"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask -->
+<g id="node264" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask</title>
+<g id="a_node264"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask" xlink:title="size of the mask cutout, as interpreted by gEDA/PCB">
+<ellipse fill="none" stroke="black" cx="9676.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9676.18" y="-1308.95" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="9676.18" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask -->
+<g id="edge362" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask</title>
+<path fill="none" stroke="black" d="M9600.65,-1382.27C9615.09,-1367.71 9633.68,-1348.99 9648.79,-1333.75"/>
+<polygon fill="black" stroke="black" points="9651.35,-1336.15 9655.91,-1326.59 9646.38,-1331.22 9651.35,-1336.15"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name -->
+<g id="node265" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name</title>
+<g id="a_node265"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name" xlink:title="symbolic name of the pad">
+<ellipse fill="none" stroke="black" cx="9760.18" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="9760.18" y="-1308.95" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="9760.18" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name -->
+<g id="edge363" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name</title>
+<path fill="none" stroke="black" d="M9613.87,-1387.95C9642.6,-1373.63 9683.39,-1352.72 9718.18,-1332.73 9720.71,-1331.28 9723.3,-1329.75 9725.89,-1328.18"/>
+<polygon fill="black" stroke="black" points="9727.95,-1331.03 9734.63,-1322.81 9724.28,-1325.07 9727.95,-1331.03"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number -->
+<g id="node266" class="node"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number</title>
+<g id="a_node266"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number" xlink:title="&quot;pin number&quot; for the netlist">
+<ellipse fill="none" stroke="black" cx="9853.18" cy="-1305.15" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="9853.18" y="-1308.95" font-family="Times,serif" font-size="14.00">number</text>
+<text text-anchor="middle" x="9853.18" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number -->
+<g id="edge364" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number</title>
+<path fill="none" stroke="black" d="M9621.52,-1393.85C9667.48,-1380.81 9741.02,-1358.41 9802.18,-1332.73 9805.81,-1331.21 9809.52,-1329.53 9813.22,-1327.77"/>
+<polygon fill="black" stroke="black" points="9814.87,-1330.86 9822.29,-1323.29 9811.77,-1324.58 9814.87,-1330.86"/>
+</g>
+<!-- dup46_/lht_tree_doc/comm/attributes -->
+<g id="node267" class="node"><title>dup46_/lht_tree_doc/comm/attributes</title>
+<g id="a_node267"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="9971.18" cy="-1305.15" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="9971.18" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;dup46_/lht_tree_doc/comm/attributes -->
+<g id="edge365" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;dup46_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M9624.63,-1397.72C9688.8,-1386.1 9806.47,-1362.84 9904.18,-1332.73 9909.07,-1331.22 9914.1,-1329.52 9919.1,-1327.73"/>
+<polygon fill="black" stroke="black" points="9920.49,-1330.94 9928.65,-1324.18 9918.06,-1324.38 9920.49,-1330.94"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad -->
+<g id="node269" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad</title>
+<g id="a_node269"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad" xlink:title="flag bits of a pad">
+<ellipse fill="none" stroke="black" cx="10109.2" cy="-1305.15" rx="60.623" ry="27.6545"/>
+<text text-anchor="middle" x="10109.2" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:flags_pad</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad -->
+<g id="edge367" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad</title>
+<path fill="none" stroke="black" d="M9626.43,-1401.47C9711.64,-1393.05 9891.64,-1371.98 10039.2,-1332.73 10044.5,-1331.31 10050,-1329.63 10055.5,-1327.81"/>
+<polygon fill="black" stroke="black" points="10056.9,-1331.02 10065.2,-1324.42 10054.6,-1324.41 10056.9,-1331.02"/>
+</g>
+<!-- dup46_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node268" class="node"><title>dup46_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node268"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="9756.18" cy="-1204.1" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="9756.18" y="-1207.9" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="9756.18" y="-1192.9" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup46_/lht_tree_doc/comm/attributes&#45;&gt;dup46_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge366" class="edge"><title>dup46_/lht_tree_doc/comm/attributes&#45;&gt;dup46_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M9927.12,-1286.64C9881.15,-1268.37 9815.54,-1242.26 9814.18,-1241.57 9807.91,-1238.39 9801.45,-1234.73 9795.21,-1230.98"/>
+<polygon fill="black" stroke="black" points="9796.63,-1227.75 9786.28,-1225.48 9792.96,-1233.7 9796.63,-1227.75"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/found -->
+<g id="node270" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/found</title>
+<g id="a_node270"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="9857.18" cy="-1204.1" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="9857.18" y="-1207.9" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="9857.18" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/found -->
+<g id="edge368" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/found</title>
+<path fill="none" stroke="black" d="M10064.2,-1286.32C10056,-1283.26 10047.3,-1280.21 10039.2,-1277.57 9980.51,-1258.61 9960.55,-1268.74 9905.18,-1241.57 9899.26,-1238.67 9893.35,-1234.99 9887.8,-1231.08"/>
+<polygon fill="black" stroke="black" points="9889.54,-1228.01 9879.43,-1224.85 9885.36,-1233.63 9889.54,-1228.01"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/hole -->
+<g id="node271" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/hole</title>
+<g id="a_node271"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/hole" xlink:title="For pins and vias, this flag means that the pin or via is a hole without a copper annulus.">
+<ellipse fill="none" stroke="black" cx="9901.18" cy="-1103.75" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="9901.18" y="-1107.55" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="9901.18" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/hole -->
+<g id="edge369" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/hole</title>
+<path fill="none" stroke="black" d="M10063.6,-1286.83C10055.5,-1283.74 10047.1,-1280.56 10039.2,-1277.57 9996.55,-1261.49 9974.41,-1274.76 9943.18,-1241.57 9917.44,-1214.22 9907.46,-1171.46 9903.6,-1141.02"/>
+<polygon fill="black" stroke="black" points="9907.05,-1140.38 9902.47,-1130.82 9900.09,-1141.14 9907.05,-1140.38"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/clearline -->
+<g id="node272" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/clearline</title>
+<g id="a_node272"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="9922.18" cy="-1014.01" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="9922.18" y="-1017.81" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="9922.18" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/clearline -->
+<g id="edge371" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/clearline</title>
+<path fill="none" stroke="black" d="M10063.6,-1286.62C10031.5,-1273.44 9992.46,-1255.36 9981.18,-1241.57 9980.8,-1241.1 9948.03,-1114.76 9931.5,-1050.97"/>
+<polygon fill="black" stroke="black" points="9934.79,-1049.74 9928.9,-1040.93 9928.02,-1051.49 9934.79,-1049.74"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/selected -->
+<g id="node273" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/selected</title>
+<g id="a_node273"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="9963.18" cy="-924.271" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="9963.18" y="-928.071" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="9963.18" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/selected -->
+<g id="edge373" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/selected</title>
+<path fill="none" stroke="black" d="M10067.6,-1284.66C10049.9,-1274.31 10030.8,-1259.89 10019.2,-1241.57 9957.75,-1144.73 9997.53,-1099.82 9976.18,-987.141 9974.59,-978.708 9972.75,-969.653 9970.97,-961.144"/>
+<polygon fill="black" stroke="black" points="9974.35,-960.173 9968.85,-951.114 9967.5,-961.621 9974.35,-960.173"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/auto -->
+<g id="node274" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/auto</title>
+<g id="a_node274"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="10015.2" cy="-834.531" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="10015.2" y="-838.331" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="10015.2" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/auto -->
+<g id="edge375" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/auto</title>
+<path fill="none" stroke="black" d="M10083.8,-1279.77C10074,-1268.97 10063.7,-1255.55 10057.2,-1241.57 10031.3,-1185.55 10033.2,-1166.49 10033.2,-1104.75 10033.2,-1104.75 10033.2,-1104.75 10033.2,-1013.01 10033.2,-963.682 10026.2,-907.033 10021,-871.267"/>
+<polygon fill="black" stroke="black" points="10024.4,-870.68 10019.4,-861.314 10017.5,-871.724 10024.4,-870.68"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/warn -->
+<g id="node275" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/warn</title>
+<g id="a_node275"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/warn" xlink:title="For pins, vias, and pads, set to indicate a warning.">
+<ellipse fill="none" stroke="black" cx="10050.2" cy="-744.791" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="10050.2" y="-748.591" font-family="Times,serif" font-size="14.00">warn</text>
+<text text-anchor="middle" x="10050.2" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/warn -->
+<g id="edge377" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/warn</title>
+<path fill="none" stroke="black" d="M10100.8,-1277.69C10089.7,-1239.78 10071.2,-1167.66 10071.2,-1104.75 10071.2,-1104.75 10071.2,-1104.75 10071.2,-923.271 10071.2,-873.851 10063.1,-817.224 10056.9,-781.488"/>
+<polygon fill="black" stroke="black" points="10060.3,-780.785 10055.2,-771.543 10053.4,-781.999 10060.3,-780.785"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/usetherm -->
+<g id="node276" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/usetherm</title>
+<g id="a_node276"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="10072.2" cy="-655.051" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="10072.2" y="-658.851" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="10072.2" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/usetherm -->
+<g id="edge379" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/usetherm</title>
+<path fill="none" stroke="black" d="M10109.2,-1277.38C10109.2,-1239.11 10109.2,-1166.54 10109.2,-1104.75 10109.2,-1104.75 10109.2,-1104.75 10109.2,-833.531 10109.2,-783.399 10094.9,-726.945 10084,-691.443"/>
+<polygon fill="black" stroke="black" points="10087.3,-690.069 10081,-681.568 10080.6,-692.157 10087.3,-690.069"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/drc -->
+<g id="node277" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/drc</title>
+<g id="a_node277"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="10130.2" cy="-565.311" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="10130.2" y="-569.111" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="10130.2" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/drc -->
+<g id="edge381" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/drc</title>
+<path fill="none" stroke="black" d="M10117.5,-1277.69C10128.7,-1239.78 10147.2,-1167.66 10147.2,-1104.75 10147.2,-1104.75 10147.2,-1104.75 10147.2,-743.791 10147.2,-694.489 10140.6,-637.833 10135.6,-602.059"/>
+<polygon fill="black" stroke="black" points="10139.1,-601.509 10134.2,-592.102 10132.2,-602.496 10139.1,-601.509"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/lock -->
+<g id="node278" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/lock</title>
+<g id="a_node278"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="10167.2" cy="-475.571" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="10167.2" y="-479.371" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="10167.2" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/lock -->
+<g id="edge383" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/lock</title>
+<path fill="none" stroke="black" d="M10127.5,-1278.6C10134.7,-1267.61 10142.6,-1254.37 10148.2,-1241.57 10173.3,-1183.82 10185.2,-1167.75 10185.2,-1104.75 10185.2,-1104.75 10185.2,-1104.75 10185.2,-654.051 10185.2,-604.722 10178.2,-548.072 10173,-512.307"/>
+<polygon fill="black" stroke="black" points="10176.4,-511.719 10171.4,-502.353 10169.5,-512.763 10176.4,-511.719"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist -->
+<g id="node279" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist</title>
+<g id="a_node279"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="10188.2" cy="-385.831" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="10188.2" y="-389.631" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="10188.2" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist -->
+<g id="edge385" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist</title>
+<path fill="none" stroke="black" d="M10139.7,-1281.23C10152.4,-1270.38 10166.5,-1256.53 10176.2,-1241.57 10211.2,-1187.62 10223.2,-1169.05 10223.2,-1104.75 10223.2,-1104.75 10223.2,-1104.75 10223.2,-564.311 10223.2,-514.288 10209.6,-457.808 10199.4,-422.27"/>
+<polygon fill="black" stroke="black" points="10202.7,-420.984 10196.5,-412.384 10196,-422.966 10202.7,-420.984"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/termname -->
+<g id="node280" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/termname</title>
+<g id="a_node280"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="10220.2" cy="-296.09" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="10220.2" y="-299.89" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="10220.2" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/termname -->
+<g id="edge387" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/termname</title>
+<path fill="none" stroke="black" d="M10151.9,-1285.35C10171.6,-1274.88 10193.9,-1260.17 10209.2,-1241.57 10250.5,-1191.3 10261.2,-1169.81 10261.2,-1104.75 10261.2,-1104.75 10261.2,-1104.75 10261.2,-474.571 10261.2,-422.499 10255.2,-409.384 10242.2,-358.96 10239.9,-350.138 10236.9,-340.793 10233.9,-332.113"/>
+<polygon fill="black" stroke="black" points="10237.1,-330.867 10230.4,-322.659 10230.6,-333.253 10237.1,-330.867"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/floater -->
+<g id="node281" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/floater</title>
+<g id="a_node281"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="10272.2" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="10272.2" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="10272.2" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/floater -->
+<g id="edge389" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/floater</title>
+<path fill="none" stroke="black" d="M10155.4,-1287.19C10189.5,-1273.9 10232.1,-1255.4 10245.2,-1241.57 10290.1,-1194.09 10299.2,-1170.13 10299.2,-1104.75 10299.2,-1104.75 10299.2,-1104.75 10299.2,-384.831 10299.2,-335.188 10288.7,-278.615 10280.8,-242.953"/>
+<polygon fill="black" stroke="black" points="10284.2,-242.007 10278.6,-233.029 10277.4,-243.556 10284.2,-242.007"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/pin -->
+<g id="node282" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/pin</title>
+<g id="a_node282"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/pin" xlink:title="object is a pin (in an element)">
+<ellipse fill="none" stroke="black" cx="10320.2" cy="-116.61" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="10320.2" y="-120.41" font-family="Times,serif" font-size="14.00">pin</text>
+<text text-anchor="middle" x="10320.2" y="-105.41" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/pin -->
+<g id="edge391" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/pin</title>
+<path fill="none" stroke="black" d="M10154.7,-1286.68C10162.8,-1283.61 10171.2,-1280.47 10179.2,-1277.57 10224.7,-1260.97 10247.1,-1275.07 10282.2,-1241.57 10329.6,-1196.31 10337.2,-1170.29 10337.2,-1104.75 10337.2,-1104.75 10337.2,-1104.75 10337.2,-295.09 10337.2,-245.788 10330.6,-189.132 10325.6,-153.358"/>
+<polygon fill="black" stroke="black" points="10329.1,-152.808 10324.2,-143.402 10322.2,-153.795 10329.1,-152.808"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/via -->
+<g id="node283" class="node"><title>dup47_/lht_tree_doc/comm/flags_pad/children/via</title>
+<g id="a_node283"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pad/children/via" xlink:title="object is a via">
+<ellipse fill="none" stroke="black" cx="10348.2" cy="-26.8701" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="10348.2" y="-30.6701" font-family="Times,serif" font-size="14.00">via</text>
+<text text-anchor="middle" x="10348.2" y="-15.6701" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/via -->
+<g id="edge393" class="edge"><title>dup47_/lht_tree_doc/comm/flags_pad&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/via</title>
+<path fill="none" stroke="black" d="M10153.7,-1286.38C10162.1,-1283.27 10170.9,-1280.2 10179.2,-1277.57 10240.8,-1258.07 10271.5,-1284.19 10320.2,-1241.57 10369.5,-1198.39 10375.2,-1170.29 10375.2,-1104.75 10375.2,-1104.75 10375.2,-1104.75 10375.2,-205.35 10375.2,-155.566 10364.7,-98.8118 10356.8,-63.1671"/>
+<polygon fill="black" stroke="black" points="10360.1,-62.2313 10354.5,-53.2555 10353.3,-63.7825 10360.1,-62.2313"/>
+</g>
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/found&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/hole -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/hole&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/clearline -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/clearline&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/selected -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/selected&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/auto -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/auto&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/warn -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/warn&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/usetherm -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/usetherm&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/drc -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/drc&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/lock -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/lock&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/nonetlist&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/termname -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/termname&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/floater -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/floater&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/pin -->
+<!-- dup47_/lht_tree_doc/comm/flags_pad/children/pin&#45;&gt;dup47_/lht_tree_doc/comm/flags_pad/children/via -->
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x -->
+<g id="node285" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x</title>
+<g id="a_node285"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x" xlink:title="place padstack with origin at this horizontal coordinate ">
+<ellipse fill="none" stroke="black" cx="10221.2" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10221.2" y="-1308.95" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="10221.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x -->
+<g id="edge396" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x</title>
+<path fill="none" stroke="black" d="M10568.9,-1401.56C10499.7,-1393.99 10367.6,-1374.97 10263.2,-1332.73 10260.3,-1331.57 10257.4,-1330.21 10254.6,-1328.74"/>
+<polygon fill="black" stroke="black" points="10256.1,-1325.6 10245.7,-1323.72 10252.7,-1331.69 10256.1,-1325.6"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y -->
+<g id="node286" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y</title>
+<g id="a_node286"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y" xlink:title="place padstack with origin at this vertical coordinate ">
+<ellipse fill="none" stroke="black" cx="10305.2" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10305.2" y="-1308.95" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="10305.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y -->
+<g id="edge397" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y</title>
+<path fill="none" stroke="black" d="M10570.7,-1397.66C10516.3,-1386.84 10423.2,-1365.32 10348.2,-1332.73 10345,-1331.36 10341.8,-1329.78 10338.7,-1328.1"/>
+<polygon fill="black" stroke="black" points="10340.4,-1325.06 10330,-1323.15 10336.9,-1331.14 10340.4,-1325.06"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness -->
+<g id="node287" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness</title>
+<g id="a_node287"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness" xlink:title="copper shape dimension (diameter) ">
+<ellipse fill="none" stroke="black" cx="10404.2" cy="-1305.15" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="10404.2" y="-1308.95" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="10404.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness -->
+<g id="edge398" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M10579.6,-1388.81C10548,-1374 10501,-1352.01 10460.2,-1332.73 10456.6,-1331.02 10452.8,-1329.25 10449,-1327.47"/>
+<polygon fill="black" stroke="black" points="10450.3,-1324.17 10439.7,-1323.05 10447.3,-1330.49 10450.3,-1324.17"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance -->
+<g id="node288" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance</title>
+<g id="a_node288"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance" xlink:title="copper clearance around the copper shape ">
+<ellipse fill="none" stroke="black" cx="10517.2" cy="-1305.15" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="10517.2" y="-1308.95" font-family="Times,serif" font-size="14.00">clearance</text>
+<text text-anchor="middle" x="10517.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance -->
+<g id="edge399" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance</title>
+<path fill="none" stroke="black" d="M10593,-1382.52C10579.3,-1368.79 10562,-1351.29 10547.3,-1336.5"/>
+<polygon fill="black" stroke="black" points="10549.4,-1333.68 10539.9,-1329.05 10544.5,-1338.61 10549.4,-1333.68"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask -->
+<g id="node289" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask</title>
+<g id="a_node289"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask" xlink:title="mask cutout shape dimension (diameter) ">
+<ellipse fill="none" stroke="black" cx="10616.2" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10616.2" y="-1308.95" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="10616.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask -->
+<g id="edge400" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask</title>
+<path fill="none" stroke="black" d="M10616.2,-1379.18C10616.2,-1367.93 10616.2,-1354.66 10616.2,-1342.54"/>
+<polygon fill="black" stroke="black" points="10619.7,-1342.27 10616.2,-1332.27 10612.7,-1342.27 10619.7,-1342.27"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole -->
+<g id="node290" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole</title>
+<g id="a_node290"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole" xlink:title="drill/hole diameter ">
+<ellipse fill="none" stroke="black" cx="10700.2" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10700.2" y="-1308.95" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="10700.2" y="-1293.95" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole -->
+<g id="edge401" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole</title>
+<path fill="none" stroke="black" d="M10636.5,-1381.76C10648.2,-1367.85 10663,-1350.25 10675.4,-1335.54"/>
+<polygon fill="black" stroke="black" points="10678.3,-1337.61 10682,-1327.7 10672.9,-1333.1 10678.3,-1337.61"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name -->
+<g id="node291" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name</title>
+<g id="a_node291"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name" xlink:title="optional name attribute ">
+<ellipse fill="none" stroke="black" cx="10784.2" cy="-1305.15" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10784.2" y="-1308.95" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="10784.2" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name -->
+<g id="edge402" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name</title>
+<path fill="none" stroke="black" d="M10649.5,-1386.99C10675.1,-1372.41 10711,-1351.62 10742.2,-1332.73 10744.7,-1331.22 10747.2,-1329.64 10749.8,-1328.05"/>
+<polygon fill="black" stroke="black" points="10751.9,-1330.88 10758.5,-1322.61 10748.2,-1324.94 10751.9,-1330.88"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number -->
+<g id="node292" class="node"><title>dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number</title>
+<g id="a_node292"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number" xlink:title="for a pin (or to&#45;be&#45;pin) this is the terminal ID ">
+<ellipse fill="none" stroke="black" cx="10877.2" cy="-1305.15" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="10877.2" y="-1308.95" font-family="Times,serif" font-size="14.00">number</text>
+<text text-anchor="middle" x="10877.2" y="-1293.95" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number -->
+<g id="edge403" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number</title>
+<path fill="none" stroke="black" d="M10658.3,-1393.22C10701.2,-1379.83 10769.3,-1357.31 10826.2,-1332.73 10829.8,-1331.17 10833.5,-1329.46 10837.2,-1327.69"/>
+<polygon fill="black" stroke="black" points="10838.8,-1330.77 10846.2,-1323.19 10835.7,-1324.5 10838.8,-1330.77"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/attributes -->
+<g id="node293" class="node"><title>dup48_/lht_tree_doc/comm/attributes</title>
+<g id="a_node293"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="10995.2" cy="-1305.15" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="10995.2" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/attributes -->
+<g id="edge404" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M10661.4,-1397.48C10722.6,-1385.57 10834.9,-1362 10928.2,-1332.73 10933,-1331.22 10937.9,-1329.53 10942.9,-1327.76"/>
+<polygon fill="black" stroke="black" points="10944.1,-1331.02 10952.3,-1324.25 10941.7,-1324.46 10944.1,-1331.02"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia -->
+<g id="node295" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia</title>
+<g id="a_node295"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia" xlink:title="flag bits of a pin or via">
+<ellipse fill="none" stroke="black" cx="11142.2" cy="-1305.15" rx="70.922" ry="27.6545"/>
+<text text-anchor="middle" x="11142.2" y="-1309.45" font-family="Times,serif" font-size="14.00">ha:flags_pinvia</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia -->
+<g id="edge406" class="edge"><title>/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia</title>
+<path fill="none" stroke="black" d="M10663.3,-1400.75C10745.4,-1391.19 10919.5,-1368.41 11063.2,-1332.73 11069.3,-1331.22 11075.6,-1329.46 11081.8,-1327.58"/>
+<polygon fill="black" stroke="black" points="11083,-1330.86 11091.5,-1324.54 11081,-1324.17 11083,-1330.86"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node294" class="node"><title>dup48_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node294"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="10770.2" cy="-1204.1" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="10770.2" y="-1207.9" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="10770.2" y="-1192.9" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/attributes&#45;&gt;dup48_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge405" class="edge"><title>dup48_/lht_tree_doc/comm/attributes&#45;&gt;dup48_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M10951.7,-1286.65C10943.9,-1283.58 10935.8,-1280.45 10928.2,-1277.57 10884,-1260.86 10870.6,-1262.27 10828.2,-1241.57 10821.6,-1238.39 10814.9,-1234.64 10808.5,-1230.78"/>
+<polygon fill="black" stroke="black" points="10810.2,-1227.76 10799.9,-1225.49 10806.6,-1233.72 10810.2,-1227.76"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/found -->
+<g id="node296" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/found</title>
+<g id="a_node296"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="10871.2" cy="-1204.1" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="10871.2" y="-1207.9" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="10871.2" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/found -->
+<g id="edge407" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/found</title>
+<path fill="none" stroke="black" d="M11090.5,-1286.12C11081.5,-1283.14 11072.1,-1280.18 11063.2,-1277.57 10999.9,-1259.04 10978.7,-1270.11 10919.2,-1241.57 10913.2,-1238.72 10907.3,-1235.06 10901.8,-1231.17"/>
+<polygon fill="black" stroke="black" points="10903.5,-1228.1 10893.4,-1224.94 10899.3,-1233.72 10903.5,-1228.1"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<g id="node297" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/hole</title>
+<g id="a_node297"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/hole" xlink:title="For pins and vias, this flag means that the pin or via is a hole without a copper annulus.">
+<ellipse fill="none" stroke="black" cx="10915.2" cy="-1103.75" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="10915.2" y="-1107.55" font-family="Times,serif" font-size="14.00">hole</text>
+<text text-anchor="middle" x="10915.2" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<g id="edge408" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/hole</title>
+<path fill="none" stroke="black" d="M11089.8,-1286.5C11035.2,-1268.11 10957.5,-1241.89 10957.2,-1241.57 10930.9,-1214.56 10921,-1171.55 10917.3,-1140.97"/>
+<polygon fill="black" stroke="black" points="10920.8,-1140.3 10916.3,-1130.71 10913.8,-1141.02 10920.8,-1140.3"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<g id="node298" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline</title>
+<g id="a_node298"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="10936.2" cy="-1014.01" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="10936.2" y="-1017.81" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="10936.2" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<g id="edge410" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline</title>
+<path fill="none" stroke="black" d="M11092.5,-1285.51C11052.6,-1270.12 11002.1,-1249.56 10995.2,-1241.57 10994.8,-1241.11 10962,-1114.76 10945.5,-1050.98"/>
+<polygon fill="black" stroke="black" points="10948.8,-1049.74 10942.9,-1040.94 10942,-1051.49 10948.8,-1049.74"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<g id="node299" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/selected</title>
+<g id="a_node299"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="10977.2" cy="-924.271" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="10977.2" y="-928.071" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="10977.2" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<g id="edge412" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/selected</title>
+<path fill="none" stroke="black" d="M11090.8,-1286.06C11069.8,-1276.11 11047.2,-1261.63 11033.2,-1241.57 10967.6,-1147.48 11011.5,-1099.82 10990.2,-987.141 10988.6,-978.708 10986.8,-969.653 10985,-961.144"/>
+<polygon fill="black" stroke="black" points="10988.3,-960.173 10982.9,-951.114 10981.5,-961.621 10988.3,-960.173"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<g id="node300" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/auto</title>
+<g id="a_node300"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="11029.2" cy="-834.531" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="11029.2" y="-838.331" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="11029.2" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<g id="edge414" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/auto</title>
+<path fill="none" stroke="black" d="M11107.1,-1281.11C11093.9,-1270.61 11079.9,-1257.05 11071.2,-1241.57 11041,-1187.72 11047.2,-1166.49 11047.2,-1104.75 11047.2,-1104.75 11047.2,-1104.75 11047.2,-1013.01 11047.2,-963.682 11040.2,-907.033 11035,-871.267"/>
+<polygon fill="black" stroke="black" points="11038.4,-870.68 11033.4,-861.314 11031.5,-871.724 11038.4,-870.68"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<g id="node301" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/warn</title>
+<g id="a_node301"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/warn" xlink:title="For pins, vias, and pads, set to indicate a warning.">
+<ellipse fill="none" stroke="black" cx="11064.2" cy="-744.791" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="11064.2" y="-748.591" font-family="Times,serif" font-size="14.00">warn</text>
+<text text-anchor="middle" x="11064.2" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<g id="edge416" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/warn</title>
+<path fill="none" stroke="black" d="M11126.2,-1278.17C11120,-1267.22 11113.5,-1254.13 11109.2,-1241.57 11089.2,-1183.16 11085.2,-1166.49 11085.2,-1104.75 11085.2,-1104.75 11085.2,-1104.75 11085.2,-923.271 11085.2,-873.851 11077.1,-817.224 11070.9,-781.488"/>
+<polygon fill="black" stroke="black" points="11074.3,-780.785 11069.2,-771.543 11067.4,-781.999 11074.3,-780.785"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<g id="node302" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm</title>
+<g id="a_node302"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="11086.2" cy="-655.051" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="11086.2" y="-658.851" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="11086.2" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<g id="edge418" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm</title>
+<path fill="none" stroke="black" d="M11138,-1277.46C11132.4,-1239.28 11123.2,-1166.82 11123.2,-1104.75 11123.2,-1104.75 11123.2,-1104.75 11123.2,-833.531 11123.2,-783.399 11108.9,-726.945 11098,-691.443"/>
+<polygon fill="black" stroke="black" points="11101.3,-690.069 11095,-681.568 11094.6,-692.157 11101.3,-690.069"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<g id="node303" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/drc</title>
+<g id="a_node303"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="11144.2" cy="-565.311" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="11144.2" y="-569.111" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="11144.2" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<g id="edge420" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/drc</title>
+<path fill="none" stroke="black" d="M11146.4,-1277.46C11151.9,-1239.28 11161.2,-1166.82 11161.2,-1104.75 11161.2,-1104.75 11161.2,-1104.75 11161.2,-743.791 11161.2,-694.489 11154.6,-637.833 11149.6,-602.059"/>
+<polygon fill="black" stroke="black" points="11153.1,-601.509 11148.2,-592.102 11146.2,-602.496 11153.1,-601.509"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<g id="node304" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/lock</title>
+<g id="a_node304"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="11181.2" cy="-475.571" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="11181.2" y="-479.371" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="11181.2" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<g id="edge422" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/lock</title>
+<path fill="none" stroke="black" d="M11154.8,-1277.75C11171.6,-1240.21 11199.2,-1168.84 11199.2,-1104.75 11199.2,-1104.75 11199.2,-1104.75 11199.2,-654.051 11199.2,-604.722 11192.2,-548.072 11187,-512.307"/>
+<polygon fill="black" stroke="black" points="11190.4,-511.719 11185.4,-502.353 11183.5,-512.763 11190.4,-511.719"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<g id="node305" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist</title>
+<g id="a_node305"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="11202.2" cy="-385.831" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="11202.2" y="-389.631" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="11202.2" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<g id="edge424" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist</title>
+<path fill="none" stroke="black" d="M11167.4,-1279.12C11177.2,-1268.31 11187.8,-1255.07 11195.2,-1241.57 11225.7,-1185.76 11237.2,-1168.36 11237.2,-1104.75 11237.2,-1104.75 11237.2,-1104.75 11237.2,-564.311 11237.2,-514.288 11223.6,-457.808 11213.4,-422.27"/>
+<polygon fill="black" stroke="black" points="11216.7,-420.984 11210.5,-412.384 11210,-422.966 11216.7,-420.984"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<g id="node306" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/termname</title>
+<g id="a_node306"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="11234.2" cy="-296.09" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="11234.2" y="-299.89" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="11234.2" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<g id="edge426" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/termname</title>
+<path fill="none" stroke="black" d="M11181.4,-1282C11197.1,-1271.47 11214.3,-1257.65 11226.2,-1241.57 11264.6,-1189.66 11275.2,-1169.34 11275.2,-1104.75 11275.2,-1104.75 11275.2,-1104.75 11275.2,-474.571 11275.2,-422.499 11269.2,-409.384 11256.2,-358.96 11253.9,-350.138 11250.9,-340.793 11247.9,-332.113"/>
+<polygon fill="black" stroke="black" points="11251.1,-330.867 11244.4,-322.659 11244.6,-333.253 11251.1,-330.867"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<g id="node307" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/floater</title>
+<g id="a_node307"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="11286.2" cy="-206.35" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="11286.2" y="-210.15" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="11286.2" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<g id="edge428" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/floater</title>
+<path fill="none" stroke="black" d="M11194.5,-1286.4C11217.6,-1276.34 11243.4,-1261.67 11261.2,-1241.57 11304.3,-1192.88 11313.2,-1169.81 11313.2,-1104.75 11313.2,-1104.75 11313.2,-1104.75 11313.2,-384.831 11313.2,-335.188 11302.7,-278.615 11294.8,-242.953"/>
+<polygon fill="black" stroke="black" points="11298.2,-242.007 11292.6,-233.029 11291.4,-243.556 11298.2,-242.007"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<g id="node308" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/pin</title>
+<g id="a_node308"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/pin" xlink:title="object is a pin (in an element)">
+<ellipse fill="none" stroke="black" cx="11334.2" cy="-116.61" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="11334.2" y="-120.41" font-family="Times,serif" font-size="14.00">pin</text>
+<text text-anchor="middle" x="11334.2" y="-105.41" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<g id="edge430" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/pin</title>
+<path fill="none" stroke="black" d="M11204.3,-1291.7C11236,-1282.55 11273,-1267.11 11298.2,-1241.57 11344,-1195.19 11351.2,-1169.96 11351.2,-1104.75 11351.2,-1104.75 11351.2,-1104.75 11351.2,-295.09 11351.2,-245.788 11344.6,-189.132 11339.6,-153.358"/>
+<polygon fill="black" stroke="black" points="11343.1,-152.808 11338.2,-143.402 11336.2,-153.795 11343.1,-152.808"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<g id="node309" class="node"><title>dup48_/lht_tree_doc/comm/flags_pinvia/children/via</title>
+<g id="a_node309"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_pinvia/children/via" xlink:title="object is a via">
+<ellipse fill="none" stroke="black" cx="11361.2" cy="-26.8701" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="11361.2" y="-30.6701" font-family="Times,serif" font-size="14.00">via</text>
+<text text-anchor="middle" x="11361.2" y="-15.6701" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<g id="edge432" class="edge"><title>dup48_/lht_tree_doc/comm/flags_pinvia&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/via</title>
+<path fill="none" stroke="black" d="M11209.8,-1296.82C11250.7,-1289.17 11301.2,-1273.53 11335.2,-1241.57 11382.8,-1196.81 11389.2,-1170.13 11389.2,-1104.75 11389.2,-1104.75 11389.2,-1104.75 11389.2,-205.35 11389.2,-155.524 11378.3,-98.7798 11370.1,-63.1491"/>
+<polygon fill="black" stroke="black" points="11373.4,-62.1716 11367.7,-53.2417 11366.6,-63.778 11373.4,-62.1716"/>
+</g>
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/found&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/hole -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/hole&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/clearline&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/selected -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/selected&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/auto -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/auto&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/warn -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/warn&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/usetherm&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/drc -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/drc&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/lock -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/lock&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/nonetlist&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/termname -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/termname&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/floater -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/floater&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/pin -->
+<!-- dup48_/lht_tree_doc/comm/flags_pinvia/children/pin&#45;&gt;dup48_/lht_tree_doc/comm/flags_pinvia/children/via -->
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/x1 -->
+<g id="node311" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/x1</title>
+<g id="a_node311"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/x1" xlink:title="line first endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="10460.2" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10460.2" y="-1523.08" font-family="Times,serif" font-size="14.00">x1</text>
+<text text-anchor="middle" x="10460.2" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/x1 -->
+<g id="edge435" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/x1</title>
+<path fill="none" stroke="black" d="M10669.5,-1620.98C10625.5,-1609.86 10556,-1588.99 10502.2,-1557.46 10497.4,-1554.63 10492.6,-1551.2 10488.1,-1547.57"/>
+<polygon fill="black" stroke="black" points="10490.2,-1544.77 10480.3,-1540.93 10485.6,-1550.09 10490.2,-1544.77"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/y1 -->
+<g id="node312" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/y1</title>
+<g id="a_node312"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/y1" xlink:title="line first endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="10544.2" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10544.2" y="-1523.08" font-family="Times,serif" font-size="14.00">y1</text>
+<text text-anchor="middle" x="10544.2" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/y1 -->
+<g id="edge436" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/y1</title>
+<path fill="none" stroke="black" d="M10677.9,-1613.13C10651.9,-1599.28 10615.7,-1578.79 10586.2,-1557.46 10581.7,-1554.26 10577.2,-1550.66 10572.9,-1547.01"/>
+<polygon fill="black" stroke="black" points="10575.1,-1544.34 10565.3,-1540.44 10570.6,-1549.63 10575.1,-1544.34"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/x2 -->
+<g id="node313" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/x2</title>
+<g id="a_node313"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/x2" xlink:title="line second endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="10628.2" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10628.2" y="-1523.08" font-family="Times,serif" font-size="14.00">x2</text>
+<text text-anchor="middle" x="10628.2" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/x2 -->
+<g id="edge437" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/x2</title>
+<path fill="none" stroke="black" d="M10693.5,-1606.15C10681.1,-1589.78 10664.6,-1568.12 10651.3,-1550.65"/>
+<polygon fill="black" stroke="black" points="10653.9,-1548.3 10645.1,-1542.46 10648.3,-1552.53 10653.9,-1548.3"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/y2 -->
+<g id="node314" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/y2</title>
+<g id="a_node314"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/y2" xlink:title="line second endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="10712.2" cy="-1519.28" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="10712.2" y="-1523.08" font-family="Times,serif" font-size="14.00">y2</text>
+<text text-anchor="middle" x="10712.2" y="-1508.08" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/y2 -->
+<g id="edge438" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/y2</title>
+<path fill="none" stroke="black" d="M10712.2,-1603.93C10712.2,-1589.73 10712.2,-1572.06 10712.2,-1556.63"/>
+<polygon fill="black" stroke="black" points="10715.7,-1556.37 10712.2,-1546.37 10708.7,-1556.37 10715.7,-1556.37"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/lgrp1 -->
+<g id="node315" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/lgrp1</title>
+<g id="a_node315"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/lgrp1" xlink:title="first endpoint&#39;s layer group ID ">
+<ellipse fill="none" stroke="black" cx="10801.2" cy="-1519.28" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="10801.2" y="-1523.08" font-family="Times,serif" font-size="14.00">lgrp1</text>
+<text text-anchor="middle" x="10801.2" y="-1508.08" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/lgrp1 -->
+<g id="edge439" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/lgrp1</title>
+<path fill="none" stroke="black" d="M10731.7,-1606.43C10744.8,-1590.18 10762.2,-1568.63 10776.3,-1551.15"/>
+<polygon fill="black" stroke="black" points="10779.4,-1552.92 10782.9,-1542.94 10773.9,-1548.53 10779.4,-1552.92"/>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID/children/lgrp2 -->
+<g id="node316" class="node"><title>/lht_tree_doc/comm/data/children/rat.ID/children/lgrp2</title>
+<g id="a_node316"><a xlink:href="tree.html#/lht_tree_doc/comm/data/children/rat.ID/children/lgrp2" xlink:title="second endpoint&#39;s layer group ID ">
+<ellipse fill="none" stroke="black" cx="10895.2" cy="-1519.28" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="10895.2" y="-1523.08" font-family="Times,serif" font-size="14.00">lgrp2</text>
+<text text-anchor="middle" x="10895.2" y="-1508.08" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/lgrp2 -->
+<g id="edge440" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;/lht_tree_doc/comm/data/children/rat.ID/children/lgrp2</title>
+<path fill="none" stroke="black" d="M10747.5,-1613.78C10775.6,-1599.89 10815.4,-1579.04 10848.2,-1557.46 10853.2,-1554.17 10858.3,-1550.47 10863.3,-1546.72"/>
+<polygon fill="black" stroke="black" points="10865.6,-1549.32 10871.4,-1540.42 10861.4,-1543.79 10865.6,-1549.32"/>
+</g>
+<!-- dup49_/lht_tree_doc/comm/attributes -->
+<g id="node317" class="node"><title>dup49_/lht_tree_doc/comm/attributes</title>
+<g id="a_node317"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="11010.2" cy="-1519.28" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="11010.2" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;dup49_/lht_tree_doc/comm/attributes -->
+<g id="edge441" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;dup49_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M10754.2,-1619.9C10801,-1607.34 10878.4,-1584.74 10942.2,-1557.46 10949.9,-1554.15 10957.9,-1550.24 10965.6,-1546.22"/>
+<polygon fill="black" stroke="black" points="10967.3,-1549.29 10974.5,-1541.48 10964,-1543.12 10967.3,-1549.29"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line -->
+<g id="node319" class="node"><title>dup50_/lht_tree_doc/comm/flags_line</title>
+<g id="a_node319"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line" xlink:title="flag bits of a line">
+<ellipse fill="none" stroke="black" cx="11586.2" cy="-1519.28" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="11586.2" y="-1523.58" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/data/children/rat.ID&#45;&gt;dup50_/lht_tree_doc/comm/flags_line -->
+<g id="edge443" class="edge"><title>/lht_tree_doc/comm/data/children/rat.ID&#45;&gt;dup50_/lht_tree_doc/comm/flags_line</title>
+<path fill="none" stroke="black" d="M10757,-1624.98C10905.1,-1606.28 11378.1,-1546.55 11535,-1526.74"/>
+<polygon fill="black" stroke="black" points="11535.9,-1530.16 11545.4,-1525.44 11535,-1523.22 11535.9,-1530.16"/>
+</g>
+<!-- dup49_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node318" class="node"><title>dup49_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node318"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="11010.2" cy="-1406.91" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="11010.2" y="-1410.71" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="11010.2" y="-1395.71" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup49_/lht_tree_doc/comm/attributes&#45;&gt;dup49_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge442" class="edge"><title>dup49_/lht_tree_doc/comm/attributes&#45;&gt;dup49_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M11010.2,-1491.56C11010.2,-1477.36 11010.2,-1459.69 11010.2,-1444.26"/>
+<polygon fill="black" stroke="black" points="11013.7,-1444 11010.2,-1434 11006.7,-1444 11013.7,-1444"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/found -->
+<g id="node320" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/found</title>
+<g id="a_node320"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="11391.2" cy="-1406.91" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="11391.2" y="-1410.71" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="11391.2" y="-1395.71" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/found -->
+<g id="edge444" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/found</title>
+<path fill="none" stroke="black" d="M11551.9,-1503.53C11521.4,-1489.9 11476.1,-1468.28 11439.2,-1445.1 11433.4,-1441.48 11427.5,-1437.33 11421.9,-1433.14"/>
+<polygon fill="black" stroke="black" points="11424,-1430.34 11414,-1427.03 11419.8,-1435.89 11424,-1430.34"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/clearline -->
+<g id="node321" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/clearline</title>
+<g id="a_node321"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/clearline" xlink:title="For lines and arcs, the line/arc will clear polygons instead of connecting to them.">
+<ellipse fill="none" stroke="black" cx="11418.2" cy="-1305.15" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="11418.2" y="-1308.95" font-family="Times,serif" font-size="14.00">clearline</text>
+<text text-anchor="middle" x="11418.2" y="-1293.95" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/clearline -->
+<g id="edge445" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/clearline</title>
+<path fill="none" stroke="black" d="M11552.9,-1502.51C11529.1,-1489.84 11497.8,-1470.05 11477.2,-1445.1 11451.9,-1414.51 11435.9,-1371.51 11427,-1341.47"/>
+<polygon fill="black" stroke="black" points="11430.4,-1340.49 11424.3,-1331.82 11423.7,-1342.4 11430.4,-1340.49"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/selected -->
+<g id="node322" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/selected</title>
+<g id="a_node322"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="11459.2" cy="-1204.1" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="11459.2" y="-1207.9" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="11459.2" y="-1192.9" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/selected -->
+<g id="edge447" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/selected</title>
+<path fill="none" stroke="black" d="M11559.9,-1497.53C11544.6,-1484.14 11526.3,-1465.45 11515.2,-1445.1 11505.4,-1427.22 11479.2,-1303.18 11466.4,-1240.78"/>
+<polygon fill="black" stroke="black" points="11469.8,-1240.05 11464.4,-1230.96 11463,-1241.46 11469.8,-1240.05"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/auto -->
+<g id="node323" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/auto</title>
+<g id="a_node323"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="11511.2" cy="-1103.75" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="11511.2" y="-1107.55" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="11511.2" y="-1092.55" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/auto -->
+<g id="edge449" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/auto</title>
+<path fill="none" stroke="black" d="M11572.5,-1492.91C11565.6,-1479.14 11557.8,-1461.6 11553.2,-1445.1 11523,-1337.25 11514.5,-1204.12 11512.1,-1141.1"/>
+<polygon fill="black" stroke="black" points="11515.6,-1140.76 11511.7,-1130.89 11508.6,-1141 11515.6,-1140.76"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<g id="node324" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/rubberend</title>
+<g id="a_node324"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/rubberend" xlink:title="For lines, used internally for rubber band moves: indicates one end already rubber banding.">
+<ellipse fill="none" stroke="black" cx="11527.2" cy="-1014.01" rx="50.41" ry="26.7407"/>
+<text text-anchor="middle" x="11527.2" y="-1017.81" font-family="Times,serif" font-size="14.00">rubberend</text>
+<text text-anchor="middle" x="11527.2" y="-1002.81" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<g id="edge451" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/rubberend</title>
+<path fill="none" stroke="black" d="M11582.2,-1491.56C11576.7,-1451.41 11567.2,-1373.08 11567.2,-1306.15 11567.2,-1306.15 11567.2,-1306.15 11567.2,-1203.1 11567.2,-1146.37 11561.6,-1132.01 11548.2,-1076.88 11546,-1068.07 11543.2,-1058.73 11540.3,-1050.05"/>
+<polygon fill="black" stroke="black" points="11543.6,-1048.9 11537,-1040.6 11537,-1051.19 11543.6,-1048.9"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<g id="node325" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/usetherm</title>
+<g id="a_node325"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/usetherm" xlink:title="Obsolete, indicates that pins/vias should be drawn with thermal fingers.">
+<ellipse fill="none" stroke="black" cx="11568.2" cy="-924.271" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="11568.2" y="-928.071" font-family="Times,serif" font-size="14.00">usetherm</text>
+<text text-anchor="middle" x="11568.2" y="-913.071" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<g id="edge453" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/usetherm</title>
+<path fill="none" stroke="black" d="M11590.1,-1491.56C11595.7,-1451.41 11605.2,-1373.08 11605.2,-1306.15 11605.2,-1306.15 11605.2,-1306.15 11605.2,-1102.75 11605.2,-1052.62 11590.9,-996.166 11580,-960.663"/>
+<polygon fill="black" stroke="black" points="11583.3,-959.289 11577,-950.789 11576.6,-961.377 11583.3,-959.289"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/drc -->
+<g id="node326" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/drc</title>
+<g id="a_node326"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="11626.2" cy="-834.531" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="11626.2" y="-838.331" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="11626.2" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/drc -->
+<g id="edge455" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/drc</title>
+<path fill="none" stroke="black" d="M11597.7,-1492.75C11614.4,-1453.49 11643.2,-1375.56 11643.2,-1306.15 11643.2,-1306.15 11643.2,-1306.15 11643.2,-1013.01 11643.2,-963.709 11636.6,-907.053 11631.6,-871.279"/>
+<polygon fill="black" stroke="black" points="11635.1,-870.729 11630.2,-861.322 11628.2,-871.716 11635.1,-870.729"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/lock -->
+<g id="node327" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/lock</title>
+<g id="a_node327"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="11663.2" cy="-744.791" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="11663.2" y="-748.591" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="11663.2" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/lock -->
+<g id="edge457" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/lock</title>
+<path fill="none" stroke="black" d="M11606.7,-1494.94C11617.9,-1481.21 11631.3,-1463.05 11640.2,-1445.1 11668.8,-1387.44 11681.2,-1370.54 11681.2,-1306.15 11681.2,-1306.15 11681.2,-1306.15 11681.2,-923.271 11681.2,-873.942 11674.2,-817.292 11669,-781.527"/>
+<polygon fill="black" stroke="black" points="11672.4,-780.94 11667.4,-771.573 11665.5,-781.984 11672.4,-780.94"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<g id="node328" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/nonetlist</title>
+<g id="a_node328"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="11684.2" cy="-655.051" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="11684.2" y="-658.851" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="11684.2" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<g id="edge459" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/nonetlist</title>
+<path fill="none" stroke="black" d="M11615.3,-1499.27C11633.6,-1486.01 11656.4,-1466.85 11671.2,-1445.1 11707.9,-1391.04 11719.2,-1371.49 11719.2,-1306.15 11719.2,-1306.15 11719.2,-1306.15 11719.2,-833.531 11719.2,-783.508 11705.6,-727.028 11695.4,-691.49"/>
+<polygon fill="black" stroke="black" points="11698.7,-690.204 11692.5,-681.604 11692,-692.186 11698.7,-690.204"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/termname -->
+<g id="node329" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/termname</title>
+<g id="a_node329"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="11716.2" cy="-565.311" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="11716.2" y="-569.111" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="11716.2" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/termname -->
+<g id="edge461" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/termname</title>
+<path fill="none" stroke="black" d="M11621.3,-1504.25C11647.6,-1492.12 11682.8,-1472.25 11705.2,-1445.1 11747.1,-1394.19 11757.2,-1372.09 11757.2,-1306.15 11757.2,-1306.15 11757.2,-1306.15 11757.2,-743.791 11757.2,-691.719 11751.2,-678.604 11738.2,-628.181 11735.9,-619.358 11732.9,-610.014 11729.9,-601.334"/>
+<polygon fill="black" stroke="black" points="11733.1,-600.087 11726.4,-591.879 11726.6,-602.473 11733.1,-600.087"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/floater -->
+<g id="node330" class="node"><title>dup50_/lht_tree_doc/comm/flags_line/children/floater</title>
+<g id="a_node330"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_line/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="11755.2" cy="-475.571" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="11755.2" y="-479.371" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="11755.2" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/floater -->
+<g id="edge463" class="edge"><title>dup50_/lht_tree_doc/comm/flags_line&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/floater</title>
+<path fill="none" stroke="black" d="M11624.8,-1508.85C11659.5,-1498.55 11709.7,-1478.84 11741.2,-1445.1 11786.4,-1396.63 11795.2,-1372.4 11795.2,-1306.15 11795.2,-1306.15 11795.2,-1306.15 11795.2,-654.051 11795.2,-603.599 11779.6,-547.01 11767.9,-511.584"/>
+<polygon fill="black" stroke="black" points="11771.1,-510.086 11764.6,-501.738 11764.5,-512.333 11771.1,-510.086"/>
+</g>
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/found&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/clearline -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/clearline&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/selected -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/selected&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/auto -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/auto&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/rubberend -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/rubberend&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/usetherm -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/usetherm&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/drc -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/drc&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/lock -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/lock&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/nonetlist -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/nonetlist&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/termname -->
+<!-- dup50_/lht_tree_doc/comm/flags_line/children/termname&#45;&gt;dup50_/lht_tree_doc/comm/flags_line/children/floater -->
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/examples/board.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/examples/board.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/examples/board.lht	(revision 18980)
@@ -0,0 +1,284 @@
+ha:pcb-rnd-board-v5 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 2.0mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1.0mm
+    clearance = 20.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 500.0mil
+    y = 150.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+  }
+
+   li:objects {
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.8 {
+        x1=50.0mil; y1=75.0mil; x2=450.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+      color = {#8b2323}
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#3a5fcd}
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#104e8b}
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#cd3700}
+    }
+
+    ha:int-sig2 {
+     lid=4
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#548b54}
+    }
+
+    ha:int-sig1 {
+     lid=5
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#8b7355}
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#00868b}
+    }
+
+    ha:bottom-silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#cccccc}
+    }
+
+    ha:top-silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#000000}
+    }
+
+    ha:top-paste {
+     lid=9
+     group=0
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#3a5fcd}
+    }
+
+    ha:top-mask {
+     lid=10
+     group=2
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#104e8b}
+    }
+
+    ha:bottom-mask {
+     lid=11
+     group=11
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#cd3700}
+    }
+
+    ha:bottom-paste {
+     lid=12
+     group=13
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#548b54}
+    }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 9;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 10;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:6 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:8 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:9 {
+    name = global_outline
+    ha:type { outline=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 11;    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 12;    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    line_thickness = 10.00 mil
+    via_thickness = 2.0000 mm
+    via_drilling_hole = 31.50 mil
+    poly_isle_area = 200000000.0
+    clearance = 20.00 mil
+   }
+   ha:editor {
+    grids_idx = 4
+    grid = 25.00 mil
+     grid_unit = mil
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/developer/lihata_format/examples/conf.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/examples/conf.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/examples/conf.lht	(revision 18980)
@@ -0,0 +1,26 @@
+li:pcb-rnd-conf-v1 {
+ ha:overwrite {
+  ha:plugins {
+   ha:hid_gtk {
+    ha:window_geometry {
+     library_x = 1342
+     library_y = 316
+     library_width = 580
+     library_height = 448
+    }
+   }
+  }
+  ha:editor {
+   auto_place = {  1  }
+   save_in_tmp = {  0  }
+  }
+  ha:rc {
+   li:library_search_paths {
+    ?../pcblib
+    ?~/pcblib/
+    $(rc.path.share)/pcblib
+   }
+   backup_interval = {  60  }
+  }
+ }
+}
Index: tags/2.0.1/doc/developer/lihata_format/examples/subc.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/examples/subc.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/examples/subc.lht	(revision 18980)
@@ -0,0 +1,236 @@
+li:pcb-rnd-subcircuit-v4 {
+ ha:subc.4 {
+  ha:attributes {
+   value = 1206
+   footprint = Standard SMT resistor, capacitor etc
+  }
+  ha:data {
+   li:padstack_prototypes {
+    ha:ps_proto_v4.0 {
+     htop = 0
+     hdia = 0.0
+     li:shape {
+      ha:ps_shape_v4 {
+       clearance = 0.0
+       li:ps_poly {
+        0.649986mm
+        -0.94996mm
+        -0.649986mm
+        -0.94996mm
+        -0.649986mm
+        0.94996mm
+        0.649986mm
+        0.94996mm
+       }
+       ha:layer_mask {
+        copper = 1
+        top = 1
+       }
+       ha:combining {
+       }
+      }
+      ha:ps_shape_v4 {
+       clearance = 0.0
+       li:ps_poly {
+        0.726186mm
+        -1.02616mm
+        -0.726186mm
+        -1.02616mm
+        -0.726186mm
+        1.02616mm
+        0.726186mm
+        1.02616mm
+       }
+       ha:layer_mask {
+        top = 1
+        mask = 1
+       }
+       ha:combining {
+        sub = 1
+        auto = 1
+       }
+      }
+      ha:ps_shape_v4 {
+       clearance = 0.0
+       li:ps_poly {
+        0.649986mm
+        -0.94996mm
+        -0.649986mm
+        -0.94996mm
+        -0.649986mm
+        0.94996mm
+        0.649986mm
+        0.94996mm
+       }
+       ha:layer_mask {
+        top = 1
+        paste = 1
+       }
+       ha:combining {
+        auto = 1
+       }
+      }
+     }
+     hbottom = 0
+     hplated = 0
+    }
+   }
+   li:objects {
+    ha:padstack_ref.6 {
+     smirror = 0
+     ha:attributes {
+      term = 1
+      name = 1
+     }
+     proto = 0
+     xmirror = 0
+     x = -1.49987mm
+     rot = 0.000000
+     y = 0.0
+     li:thermal {
+     }
+     ha:flags {
+      clearline = 1
+     }
+     clearance = 10.0mil
+    }
+    ha:padstack_ref.7 {
+     smirror = 0
+     ha:attributes {
+      term = 2
+      name = 2
+     }
+     proto = 0
+     xmirror = 0
+     x = 1.49987mm
+     rot = 0.000000
+     y = 0.0
+     li:thermal {
+     }
+     ha:flags {
+      clearline = 1
+     }
+     clearance = 10.0mil
+    }
+   }
+   li:layers {
+    ha:top-silk {
+     lid = 0
+     ha:type {
+      silk = 1
+      top = 1
+     }
+     li:objects {
+      ha:line.8 {
+       clearance = 0.0
+       y2 = -0.94996mm
+       thickness = 8.0mil
+       ha:attributes {
+       }
+       x1 = -23.62mil
+       x2 = 23.62mil
+       ha:flags {
+       }
+       y1 = -0.94996mm
+      }
+      ha:line.11 {
+       clearance = 0.0
+       y2 = 0.94996mm
+       thickness = 8.0mil
+       ha:attributes {
+       }
+       x1 = -23.62mil
+       x2 = 23.62mil
+       ha:flags {
+       }
+       y1 = 0.94996mm
+      }
+      ha:text.5 {
+       scale = 100
+       ha:attributes {
+       }
+       direction = 0
+       x = -31.5mil
+       y = -31.5mil
+       string = %a.parent.refdes%
+       fid = 0
+       ha:flags {
+        dyntext = 1
+        floater = 1
+       }
+      }
+     }
+     ha:combining {
+     }
+    }
+    ha:subc-aux {
+     lid = 1
+     ha:type {
+      top = 1
+      misc = 1
+      virtual = 1
+     }
+     li:objects {
+      ha:line.14 {
+       clearance = 0.0
+       y2 = 0.0
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = pnp-origin
+       }
+       x1 = 0.0
+       x2 = 0.0
+       ha:flags {
+       }
+       y1 = 0.0
+      }
+      ha:line.17 {
+       clearance = 0.0
+       y2 = 0.0
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = origin
+       }
+       x1 = 0.0
+       x2 = 0.0
+       ha:flags {
+       }
+       y1 = 0.0
+      }
+      ha:line.20 {
+       clearance = 0.0
+       y2 = 0.0
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = x
+       }
+       x1 = 0.0
+       x2 = 1.0mm
+       ha:flags {
+       }
+       y1 = 0.0
+      }
+      ha:line.23 {
+       clearance = 0.0
+       y2 = 1.0mm
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = y
+       }
+       x1 = 0.0
+       x2 = 0.0
+       ha:flags {
+       }
+       y1 = 0.0
+      }
+     }
+     ha:combining {
+     }
+    }
+   }
+  }
+  uid = kazsgcWF3uqvvuDCYMsAAAAB
+  ha:flags {
+  }
+ }
+}
Index: tags/2.0.1/doc/developer/lihata_format/geda-project-v1.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/geda-project-v1.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/geda-project-v1.svg	(revision 18980)
@@ -0,0 +1,266 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: ha:geda&#45;project&#45;v1 Pages: 1 -->
+<svg width="858pt" height="426pt"
+ viewBox="0.00 0.00 858.47 426.36" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 422.357)">
+<title>ha:geda&#45;project&#45;v1</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-422.357 854.468,-422.357 854.468,4 -4,4"/>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1 -->
+<g id="node1" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1" xlink:title="Project file root. Except for &quot;common&quot;, each software package should create a single subtree under the root; the subtree shall be named after the software package ">
+<ellipse fill="none" stroke="black" cx="353.234" cy="-390.78" rx="84.2917" ry="27.6545"/>
+<text text-anchor="middle" x="353.234" y="-395.08" font-family="Times,serif" font-size="14.00">ha:geda&#45;project&#45;v1</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common -->
+<g id="node2" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common" xlink:title="project settings that should be common to all software packages">
+<ellipse fill="none" stroke="black" cx="285.234" cy="-299.626" rx="57.9655" ry="27.6545"/>
+<text text-anchor="middle" x="285.234" y="-303.926" font-family="Times,serif" font-size="14.00">ha:common</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common</title>
+<path fill="none" stroke="black" d="M333.2,-363.513C326.099,-354.204 318.015,-343.604 310.533,-333.795"/>
+<polygon fill="black" stroke="black" points="313.272,-331.615 304.425,-325.787 307.706,-335.861 313.272,-331.615"/>
+</g>
+<!-- dup16_/lht_tree_doc/roots/geda&#45;project&#45;v1/children/pcb&#45;rnd&#45;conf&#45;v1 -->
+<g id="node19" class="node"><title>dup16_/lht_tree_doc/roots/geda&#45;project&#45;v1/children/pcb&#45;rnd&#45;conf&#45;v1</title>
+<g id="a_node19"><a xlink:href="pcb-rnd-conf-v1.svg" xlink:title="pcb&#45;rnd&#45;conf&#45;v1 &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="422.234" y="-311.926" font-family="Times,serif" font-size="14.00">pcb&#45;rnd&#45;conf&#45;v1 &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1&#45;&gt;dup16_/lht_tree_doc/roots/geda&#45;project&#45;v1/children/pcb&#45;rnd&#45;conf&#45;v1 -->
+<g id="edge18" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1&#45;&gt;dup16_/lht_tree_doc/roots/geda&#45;project&#45;v1/children/pcb&#45;rnd&#45;conf&#45;v1</title>
+<path fill="none" stroke="black" d="M373.563,-363.513C380.389,-354.694 388.11,-344.717 395.359,-335.351"/>
+<polygon fill="black" stroke="black" points="398.22,-337.373 401.573,-327.322 392.684,-333.088 398.22,-337.373"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/name -->
+<g id="node3" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/name</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/name" xlink:title="long name of the project ">
+<ellipse fill="none" stroke="black" cx="33.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="33.234" y="-212.272" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="33.234" y="-197.272" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/name -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/name</title>
+<path fill="none" stroke="black" d="M232.883,-287.268C189.505,-276.867 126.83,-259.518 75.234,-236.049 72.4187,-234.768 69.5683,-233.325 66.748,-231.79"/>
+<polygon fill="black" stroke="black" points="68.3262,-228.659 57.9215,-226.662 64.8094,-234.712 68.3262,-228.659"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/desc -->
+<g id="node4" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/desc</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/desc" xlink:title="description of the project ">
+<ellipse fill="none" stroke="black" cx="117.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="117.234" y="-212.272" font-family="Times,serif" font-size="14.00">desc</text>
+<text text-anchor="middle" x="117.234" y="-197.272" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/desc -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/desc</title>
+<path fill="none" stroke="black" d="M244.678,-279.797C219.705,-267.881 187.224,-251.8 159.234,-236.049 156.696,-234.621 154.097,-233.107 151.498,-231.555"/>
+<polygon fill="black" stroke="black" points="153.102,-228.434 142.745,-226.202 149.45,-234.406 153.102,-228.434"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/url -->
+<g id="node5" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/url</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/url" xlink:title="homepage of the project ">
+<ellipse fill="none" stroke="black" cx="201.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="201.234" y="-212.272" font-family="Times,serif" font-size="14.00">url</text>
+<text text-anchor="middle" x="201.234" y="-197.272" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/url -->
+<g id="edge4" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/url</title>
+<path fill="none" stroke="black" d="M262.281,-274.264C251.681,-263.014 239.029,-249.585 227.998,-237.878"/>
+<polygon fill="black" stroke="black" points="230.426,-235.351 221.021,-230.473 225.331,-240.151 230.426,-235.351"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/vcs -->
+<g id="node6" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/vcs</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/vcs" xlink:title="main vcs url for the project ">
+<ellipse fill="none" stroke="black" cx="285.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="285.234" y="-212.272" font-family="Times,serif" font-size="14.00">vcs</text>
+<text text-anchor="middle" x="285.234" y="-197.272" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/vcs -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/vcs</title>
+<path fill="none" stroke="black" d="M285.234,-271.877C285.234,-263.619 285.234,-254.384 285.234,-245.603"/>
+<polygon fill="black" stroke="black" points="288.734,-245.588 285.234,-235.588 281.734,-245.588 288.734,-245.588"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/contact -->
+<g id="node7" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/contact</title>
+<g id="a_node7"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/contact" xlink:title="author/maintainer contact info ">
+<ellipse fill="none" stroke="black" cx="376.234" cy="-208.472" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="376.234" y="-212.272" font-family="Times,serif" font-size="14.00">contact</text>
+<text text-anchor="middle" x="376.234" y="-197.272" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/contact -->
+<g id="edge6" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/contact</title>
+<path fill="none" stroke="black" d="M310.1,-274.264C321.518,-263.078 335.135,-249.737 347.037,-238.077"/>
+<polygon fill="black" stroke="black" points="349.497,-240.566 354.191,-231.068 344.598,-235.566 349.497,-240.566"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files -->
+<g id="node8" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/files" xlink:title="ordered list of source files being used by the project">
+<ellipse fill="none" stroke="black" cx="470.234" cy="-208.472" rx="36.125" ry="27.6545"/>
+<text text-anchor="middle" x="470.234" y="-212.772" font-family="Times,serif" font-size="14.00">li:files</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files -->
+<g id="edge7" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files</title>
+<path fill="none" stroke="black" d="M328.097,-280.959C356.117,-269.047 393.303,-252.547 425.234,-236.049 427.967,-234.637 430.766,-233.132 433.564,-231.585"/>
+<polygon fill="black" stroke="black" points="435.454,-234.537 442.424,-226.557 431.999,-228.449 435.454,-234.537"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs -->
+<g id="node13" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs" xlink:title="ordered list of libraries the project depends on">
+<ellipse fill="none" stroke="black" cx="588.234" cy="-208.472" rx="33.4697" ry="27.6545"/>
+<text text-anchor="middle" x="588.234" y="-212.772" font-family="Times,serif" font-size="14.00">li:libs</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs -->
+<g id="edge12" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs</title>
+<path fill="none" stroke="black" d="M327.761,-280.576C335.809,-277.498 344.218,-274.506 352.234,-272.049 423.165,-250.301 444,-256.784 515.234,-236.049 526.339,-232.816 538.194,-228.767 549.052,-224.812"/>
+<polygon fill="black" stroke="black" points="550.537,-227.994 558.693,-221.231 548.1,-221.432 550.537,-227.994"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME -->
+<g id="node9" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME" xlink:title="a project member file">
+<ellipse fill="none" stroke="black" cx="439.234" cy="-117.317" rx="52.1524" ry="27.6545"/>
+<text text-anchor="middle" x="439.234" y="-121.617" font-family="Times,serif" font-size="14.00">ha:NAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME -->
+<g id="edge8" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME</title>
+<path fill="none" stroke="black" d="M461.268,-181.684C458.3,-173.149 454.941,-163.489 451.756,-154.33"/>
+<polygon fill="black" stroke="black" points="454.986,-152.961 448.395,-144.665 448.374,-155.26 454.986,-152.961"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/path -->
+<g id="node10" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/path</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/path" xlink:title="path to the file, relative to the project file ">
+<ellipse fill="none" stroke="black" cx="313.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="313.234" y="-30.6701" font-family="Times,serif" font-size="14.00">path</text>
+<text text-anchor="middle" x="313.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/path -->
+<g id="edge9" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/path</title>
+<path fill="none" stroke="black" d="M408.733,-94.9067C389.827,-81.6352 365.543,-64.5892 346.195,-51.0075"/>
+<polygon fill="black" stroke="black" points="348.159,-48.1097 337.963,-45.229 344.137,-53.8391 348.159,-48.1097"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/desc -->
+<g id="node11" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/desc</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/desc" xlink:title="description of the file ">
+<ellipse fill="none" stroke="black" cx="397.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="397.234" y="-30.6701" font-family="Times,serif" font-size="14.00">desc</text>
+<text text-anchor="middle" x="397.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/desc -->
+<g id="edge10" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/desc</title>
+<path fill="none" stroke="black" d="M426.86,-90.2586C422.577,-81.2393 417.715,-70.9999 413.185,-61.4619"/>
+<polygon fill="black" stroke="black" points="416.252,-59.7608 408.801,-52.2288 409.929,-62.7635 416.252,-59.7608"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/type -->
+<g id="node12" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/type</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/type" xlink:title="optional: type of the file; one of: &quot;pcb&quot;, &quot;schematic&quot;, &quot;doc&quot; ">
+<ellipse fill="none" stroke="black" cx="481.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="481.234" y="-30.6701" font-family="Times,serif" font-size="14.00">type</text>
+<text text-anchor="middle" x="481.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/type -->
+<g id="edge11" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/files/children/NAME/children/type</title>
+<path fill="none" stroke="black" d="M451.608,-90.2586C455.891,-81.2393 460.753,-70.9999 465.283,-61.4619"/>
+<polygon fill="black" stroke="black" points="468.539,-62.7635 469.667,-52.2288 462.216,-59.7608 468.539,-62.7635"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME -->
+<g id="node14" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME" xlink:title="a library">
+<ellipse fill="none" stroke="black" cx="649.234" cy="-117.317" rx="52.1524" ry="27.6545"/>
+<text text-anchor="middle" x="649.234" y="-121.617" font-family="Times,serif" font-size="14.00">ha:NAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME -->
+<g id="edge13" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME</title>
+<path fill="none" stroke="black" d="M604.261,-184.047C611.002,-174.196 618.97,-162.55 626.312,-151.818"/>
+<polygon fill="black" stroke="black" points="629.273,-153.689 632.032,-143.46 623.496,-149.736 629.273,-153.689"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/path -->
+<g id="node15" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/path</title>
+<g id="a_node15"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/path" xlink:title="path to the library, relative to the project file; all files and subdirectories under the root, recursively, are considered part of the library (must not be used together with url) ">
+<ellipse fill="none" stroke="black" cx="565.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="565.234" y="-30.6701" font-family="Times,serif" font-size="14.00">path</text>
+<text text-anchor="middle" x="565.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/path -->
+<g id="edge14" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/path</title>
+<path fill="none" stroke="black" d="M626.281,-92.1487C615.681,-80.9881 603.029,-67.6655 591.998,-56.0508"/>
+<polygon fill="black" stroke="black" points="594.446,-53.5456 585.021,-48.7048 589.37,-58.3661 594.446,-53.5456"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/url -->
+<g id="node16" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/url</title>
+<g id="a_node16"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/url" xlink:title="url to the library (must not be used together with path) ">
+<ellipse fill="none" stroke="black" cx="649.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="649.234" y="-30.6701" font-family="Times,serif" font-size="14.00">url</text>
+<text text-anchor="middle" x="649.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/url -->
+<g id="edge15" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/url</title>
+<path fill="none" stroke="black" d="M649.234,-89.2996C649.234,-81.2816 649.234,-72.3696 649.234,-63.8767"/>
+<polygon fill="black" stroke="black" points="652.734,-63.8132 649.234,-53.8132 645.734,-63.8133 652.734,-63.8132"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/desc -->
+<g id="node17" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/desc</title>
+<g id="a_node17"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/desc" xlink:title="description of the library ">
+<ellipse fill="none" stroke="black" cx="733.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="733.234" y="-30.6701" font-family="Times,serif" font-size="14.00">desc</text>
+<text text-anchor="middle" x="733.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/desc -->
+<g id="edge16" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/desc</title>
+<path fill="none" stroke="black" d="M672.187,-92.1487C682.787,-80.9881 695.439,-67.6655 706.47,-56.0508"/>
+<polygon fill="black" stroke="black" points="709.098,-58.3661 713.447,-48.7048 704.023,-53.5456 709.098,-58.3661"/>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/type -->
+<g id="node18" class="node"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/type</title>
+<g id="a_node18"><a xlink:href="tree.html#/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/type" xlink:title="optional: type of the library; one of: &quot;footprint&quot; (for pcb design), &quot;symbol&quot; (for schematic), &quot;sim&quot; (models and subcircuits for e.g. spice simulation) ">
+<ellipse fill="none" stroke="black" cx="817.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="817.234" y="-30.6701" font-family="Times,serif" font-size="14.00">type</text>
+<text text-anchor="middle" x="817.234" y="-15.6701" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/type -->
+<g id="edge17" class="edge"><title>/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME&#45;&gt;/lht_tree_doc/roots/geda&#45;project&#45;v1/children/common/children/libs/children/NAME/children/type</title>
+<path fill="none" stroke="black" d="M687.468,-98.4473C712.691,-86.386 746.295,-69.7955 775.234,-53.7401 777.761,-52.3379 780.352,-50.8558 782.946,-49.3392"/>
+<polygon fill="black" stroke="black" points="784.899,-52.2498 791.688,-44.1161 781.309,-46.2406 784.899,-52.2498"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/index.html
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/index.html	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/index.html	(revision 18980)
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> pcb-rnd developer manual - lihata file formats</title>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<h1> pcb-rnd native file formats </h1>
+<p>
+The native file format of pcb-rnd is <a href="http://repo.hu/projects/lihata">
+lihata </a> based. Lihata is a generic markup language that describes how
+a tree can be serialized into a file format. What the tree contains and
+what each node means is up to the user (pcb-rnd in this case). This document
+describes how the lihata trees are interpreted by pcb-rnd.
+<p>
+This document is halfway in between the low level lihata document and the
+high level <a href="../../user/02_model/index.html"> data model </a>
+specification. It is assumed that the reader is familiar with both: the
+lihata interface plugin doesn't do anything on its own, it only takes
+the data model from the memory and the lihata document on disk and
+converts the syntax between the two.
+<p>
+The following table is a summary of the native file formats the <b>core</b>
+handles. Various plugins will handle their own file formats, often also
+lihata based - those are each documented at the corresponding. Note:
+pcb-rnd does not try to recognize the purpose of the file by the file name,
+but by the root node name - files can be named anything, there's no
+"extension"; there are some files that are found by name (typically config
+files) - these are marked with bold.
+<p>
+<table border=1 cellspacing=0>
+
+<tr> <th> typical filename     <th> root node
+	<th> purpose (and documentation)
+
+<tr> <td> foo.lht              <td> ha:pcb-rnd-board-v*
+	<td> <a href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*">Printed circuit board</a>, self-contained
+	<br><a href="pcb-rnd-board-v.svg"> (struct drawing) </a>
+	<br><a href="examples/subc.lht"> (sample file) </a>
+
+<tr> <td> bar.lht, bar.fp      <td> li:pcb-rnd-subcircuit-v*
+	<td> <a href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*">A subcircuit</a>, self-contained, most often used as a footprint
+	<br><a href="pcb-rnd-subcircuit-v.svg"> (struct drawing) </a>
+	<br><a href="examples/board.lht"> (sample file) </a>
+
+<tr> <td> times.lht            <td> li:pcb-rnd-font-v1
+	<td> <a href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1">Vector font</a>
+	<br><a href="pcb-rnd-font-v1.svg"> (struct drawing) </a>
+
+<tr> <td> <b>pcb-conf.lht<b>   <td> li:pcb-rnd-conf-v1
+	<td> <a href="tree.html#/lht_tree_doc/roots/pcb-rnd-conf-v1">A configuration subtree</a>: system config (e.g. /usr/share/pcb-rnd/pcb-conf.lht) or user config (~/.pcb-rnd/pcb-conf.lht)
+	<br><a href="pcb-rnd-conf-v1.svg"> (struct drawing) </a>
+	<br><a href="examples/conf.lht"> (sample file) </a>
+
+<tr> <td> <b>project.lht<b>    <td> ha:geda-project-v1
+	<td> <a href="tree.html#/lht_tree_doc/roots/geda-project-v1">A project file</a> that describes configuration and source file names for various software
+	<br><a href="geda-project-v1.svg"> (struct drawing) </a>
+
+<tr> <td> <b>pcb-menu-default.lht<b>   <td> ha:
+	<td> <a href="tree.html#/lht_tree_doc/roots/menu">The main menu system</a>, including popup menus, all key and mouse bindings
+
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/lihata_format/pcb-rnd-board-v.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/pcb-rnd-board-v.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/pcb-rnd-board-v.svg	(revision 18980)
@@ -0,0 +1,926 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: ha:pcb&#45;rnd&#45;board&#45;v* Pages: 1 -->
+<svg width="2824pt" height="1346pt"
+ viewBox="0.00 0.00 2824.30 1346.39" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1342.39)">
+<title>ha:pcb&#45;rnd&#45;board&#45;v*</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1342.39 2820.3,-1342.39 2820.3,4 -4,4"/>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v* -->
+<g id="node1" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*" xlink:title=" &#160;&#160;&#160;The full, self&#45;contained description of a printed circuit board. &#160;&#160;&#160;This is the root of a board .lht file. The * after the v in the name &#160;&#160;&#160;is an integer which is the format version. &#160;&#160;">
+<ellipse fill="none" stroke="black" cx="1994.06" cy="-1310.81" rx="90.5193" ry="27.6545"/>
+<text text-anchor="middle" x="1994.06" y="-1315.11" font-family="Times,serif" font-size="14.00">ha:pcb&#45;rnd&#45;board&#45;v*</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta -->
+<g id="node2" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta" xlink:title=" Any meta&#45;data that won&#39;t directly turn into physical material (e.g. copper). ">
+<ellipse fill="none" stroke="black" cx="747.062" cy="-1219.65" rx="42.3529" ry="27.6545"/>
+<text text-anchor="middle" x="747.062" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:meta</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta</title>
+<path fill="none" stroke="black" d="M1906.38,-1303.54C1664.27,-1286.23 991.731,-1238.15 799.184,-1224.38"/>
+<polygon fill="black" stroke="black" points="799.273,-1220.88 789.049,-1223.66 798.774,-1227.86 799.273,-1220.88"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack -->
+<g id="node24" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack</title>
+<g id="a_node24"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack" xlink:title=" physical layer stack information: geometry and properties of physical layers ">
+<ellipse fill="none" stroke="black" cx="1712.06" cy="-1219.65" rx="67.3507" ry="27.6545"/>
+<text text-anchor="middle" x="1712.06" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:layer_stack</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack -->
+<g id="edge23" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack</title>
+<path fill="none" stroke="black" d="M1930.28,-1291.18C1889.48,-1279.07 1835.5,-1262.72 1788.06,-1247.23 1782.61,-1245.45 1776.96,-1243.56 1771.31,-1241.64"/>
+<polygon fill="black" stroke="black" points="1772.43,-1238.32 1761.84,-1238.39 1770.16,-1244.95 1772.43,-1238.32"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font -->
+<g id="node40" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font</title>
+<g id="a_node40"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/font" xlink:title=" font kit: all fonts used on the board (if no font specified, default font will be used) ">
+<ellipse fill="none" stroke="black" cx="1836.06" cy="-1219.65" rx="38.7821" ry="27.6545"/>
+<text text-anchor="middle" x="1836.06" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:font</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font -->
+<g id="edge48" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font</title>
+<path fill="none" stroke="black" d="M1952.14,-1286.15C1928.25,-1272.67 1898.51,-1255.89 1875.11,-1242.69"/>
+<polygon fill="black" stroke="black" points="1876.59,-1239.5 1866.16,-1237.64 1873.15,-1245.6 1876.59,-1239.5"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/styles -->
+<g id="node42" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/styles</title>
+<g id="a_node42"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/styles" xlink:title=" routing styles hash: collection of all available routing syles ">
+<ellipse fill="none" stroke="black" cx="1938.06" cy="-1219.65" rx="45.011" ry="27.6545"/>
+<text text-anchor="middle" x="1938.06" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:styles</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/styles -->
+<g id="edge50" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/styles</title>
+<path fill="none" stroke="black" d="M1977.56,-1283.54C1971.83,-1274.42 1965.32,-1264.06 1959.27,-1254.41"/>
+<polygon fill="black" stroke="black" points="1962.15,-1252.42 1953.87,-1245.82 1956.22,-1256.15 1962.15,-1252.42"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists -->
+<g id="node43" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists</title>
+<g id="a_node43"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists" xlink:title=" all availale netlists ">
+<ellipse fill="none" stroke="black" cx="2051.06" cy="-1219.65" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="2051.06" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:netlists</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists -->
+<g id="edge51" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists</title>
+<path fill="none" stroke="black" d="M2010.86,-1283.54C2016.69,-1274.42 2023.31,-1264.06 2029.48,-1254.41"/>
+<polygon fill="black" stroke="black" points="2032.54,-1256.13 2034.98,-1245.82 2026.64,-1252.36 2032.54,-1256.13"/>
+</g>
+<!-- dup4_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/conf -->
+<g id="node64" class="node"><title>dup4_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/conf</title>
+<g id="a_node64"><a xlink:href="pcb-rnd-conf-v1.svg" xlink:title="conf &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="2148.06" y="-1231.95" font-family="Times,serif" font-size="14.00">conf &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup4_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/conf -->
+<g id="edge72" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup4_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/conf</title>
+<path fill="none" stroke="black" d="M2039.37,-1286.92C2061.09,-1275.56 2087.27,-1261.28 2110.06,-1247.23 2110.25,-1247.12 2110.44,-1247 2110.63,-1246.88"/>
+<polygon fill="black" stroke="black" points="2112.74,-1249.68 2119.25,-1241.32 2108.95,-1243.8 2112.74,-1249.68"/>
+</g>
+<!-- dup5_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/data -->
+<g id="node65" class="node"><title>dup5_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/data</title>
+<g id="a_node65"><a xlink:href="data.svg" xlink:title="data &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="2223.06" y="-1231.95" font-family="Times,serif" font-size="14.00">data &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup5_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/data -->
+<g id="edge73" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup5_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/data</title>
+<path fill="none" stroke="black" d="M2062.72,-1292.61C2099.97,-1281.98 2146.2,-1266.65 2185.06,-1247.23 2185.48,-1247.02 2185.89,-1246.81 2186.31,-1246.6"/>
+<polygon fill="black" stroke="black" points="2188.05,-1249.63 2194.99,-1241.62 2184.57,-1243.56 2188.05,-1249.63"/>
+</g>
+<!-- dup6_/lht_tree_doc/comm/attributes -->
+<g id="node66" class="node"><title>dup6_/lht_tree_doc/comm/attributes</title>
+<g id="a_node66"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="2346.06" cy="-1219.65" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="2346.06" y="-1223.95" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup6_/lht_tree_doc/comm/attributes -->
+<g id="edge74" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*&#45;&gt;dup6_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M2066.37,-1294.21C2120.06,-1282.28 2194.94,-1264.93 2260.06,-1247.23 2269.35,-1244.71 2279.15,-1241.86 2288.68,-1238.99"/>
+<polygon fill="black" stroke="black" points="2289.92,-1242.27 2298.47,-1236 2287.88,-1235.57 2289.92,-1242.27"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/board_name -->
+<g id="node3" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/board_name</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/board_name" xlink:title="User assigned name of the board">
+<ellipse fill="none" stroke="black" cx="105.062" cy="-1128.5" rx="59.2941" ry="26.7407"/>
+<text text-anchor="middle" x="105.062" y="-1132.3" font-family="Times,serif" font-size="14.00">board_name</text>
+<text text-anchor="middle" x="105.062" y="-1117.3" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/board_name -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/board_name</title>
+<path fill="none" stroke="black" d="M704.631,-1217.84C608.591,-1215.17 367.774,-1203.85 173.062,-1156.08 167.463,-1154.7 161.707,-1152.98 156.027,-1151.07"/>
+<polygon fill="black" stroke="black" points="157.174,-1147.77 146.579,-1147.72 154.832,-1154.36 157.174,-1147.77"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid -->
+<g id="node4" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid" xlink:title=" User interface last grid settings ">
+<ellipse fill="none" stroke="black" cx="221.062" cy="-1128.5" rx="38.7821" ry="27.6545"/>
+<text text-anchor="middle" x="221.062" y="-1132.8" font-family="Times,serif" font-size="14.00">ha:grid</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid</title>
+<path fill="none" stroke="black" d="M706.226,-1211.73C610.313,-1195.48 371.058,-1154.92 268.719,-1137.58"/>
+<polygon fill="black" stroke="black" points="269.115,-1134.1 258.671,-1135.87 267.945,-1141 269.115,-1134.1"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size -->
+<g id="node8" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size" xlink:title=" object size related settings ">
+<ellipse fill="none" stroke="black" cx="516.062" cy="-1128.5" rx="38.3684" ry="27.6545"/>
+<text text-anchor="middle" x="516.062" y="-1132.8" font-family="Times,serif" font-size="14.00">ha:size</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size -->
+<g id="edge7" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size</title>
+<path fill="none" stroke="black" d="M711.222,-1204.82C670.105,-1188.95 602.726,-1162.95 558.883,-1146.03"/>
+<polygon fill="black" stroke="black" points="559.95,-1142.69 549.36,-1142.35 557.429,-1149.22 559.95,-1142.69"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc -->
+<g id="node13" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc" xlink:title=" design rule checker settings for the old DRC ">
+<ellipse fill="none" stroke="black" cx="977.062" cy="-1128.5" rx="35.2113" ry="27.6545"/>
+<text text-anchor="middle" x="977.062" y="-1132.8" font-family="Times,serif" font-size="14.00">ha:drc</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc -->
+<g id="edge12" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc</title>
+<path fill="none" stroke="black" d="M783,-1204.72C824.581,-1188.61 892.889,-1162.13 936.384,-1145.27"/>
+<polygon fill="black" stroke="black" points="937.745,-1148.49 945.804,-1141.62 935.215,-1141.97 937.745,-1148.49"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor -->
+<g id="node20" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor</title>
+<g id="a_node20"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor" xlink:title=" obsolete cursor/view state ">
+<ellipse fill="none" stroke="black" cx="1461.06" cy="-1128.5" rx="47.2526" ry="27.6545"/>
+<text text-anchor="middle" x="1461.06" y="-1132.8" font-family="Times,serif" font-size="14.00">ha:cursor</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor -->
+<g id="edge19" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor</title>
+<path fill="none" stroke="black" d="M788.536,-1213.48C910.197,-1198.28 1266.27,-1153.82 1404.91,-1136.51"/>
+<polygon fill="black" stroke="black" points="1405.41,-1139.98 1414.9,-1135.26 1404.54,-1133.03 1405.41,-1139.98"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_x -->
+<g id="node5" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_x</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/offs_x" xlink:title="grid origin: X offset from 0;0">
+<ellipse fill="none" stroke="black" cx="36.0624" cy="-1037.35" rx="36.125" ry="26.7407"/>
+<text text-anchor="middle" x="36.0624" y="-1041.15" font-family="Times,serif" font-size="14.00">offs_x</text>
+<text text-anchor="middle" x="36.0624" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_x -->
+<g id="edge4" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_x</title>
+<path fill="none" stroke="black" d="M191.68,-1110.43C185.601,-1107.12 179.183,-1103.8 173.062,-1100.92 133.324,-1082.25 120.537,-1084.15 81.0624,-1064.92 78.1258,-1063.49 75.1253,-1061.94 72.1368,-1060.33"/>
+<polygon fill="black" stroke="black" points="73.7185,-1057.2 63.2837,-1055.37 70.2972,-1063.31 73.7185,-1057.2"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_y -->
+<g id="node6" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_y</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/offs_y" xlink:title="grid origin: Y offset from 0;0">
+<ellipse fill="none" stroke="black" cx="126.062" cy="-1037.35" rx="36.125" ry="26.7407"/>
+<text text-anchor="middle" x="126.062" y="-1041.15" font-family="Times,serif" font-size="14.00">offs_y</text>
+<text text-anchor="middle" x="126.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_y -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/offs_y</title>
+<path fill="none" stroke="black" d="M198.066,-1105.92C185.185,-1093.83 168.994,-1078.64 155.23,-1065.72"/>
+<polygon fill="black" stroke="black" points="157.556,-1063.1 147.869,-1058.81 152.765,-1068.21 157.556,-1063.1"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/spacing -->
+<g id="node7" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/spacing</title>
+<g id="a_node7"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/spacing" xlink:title="distance between two grid points both in X and Y directions ">
+<ellipse fill="none" stroke="black" cx="221.062" cy="-1037.35" rx="41.0244" ry="26.7407"/>
+<text text-anchor="middle" x="221.062" y="-1041.15" font-family="Times,serif" font-size="14.00">spacing</text>
+<text text-anchor="middle" x="221.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/spacing -->
+<g id="edge6" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/grid/children/spacing</title>
+<path fill="none" stroke="black" d="M221.062,-1100.75C221.062,-1092.49 221.062,-1083.26 221.062,-1074.48"/>
+<polygon fill="black" stroke="black" points="224.563,-1074.46 221.062,-1064.46 217.563,-1074.46 224.563,-1074.46"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/x -->
+<g id="node9" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/x</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/x" xlink:title="drawing area size X (width)">
+<ellipse fill="none" stroke="black" cx="313.062" cy="-1037.35" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="313.062" y="-1041.15" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="313.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/x -->
+<g id="edge8" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/x</title>
+<path fill="none" stroke="black" d="M481.626,-1116.29C448.45,-1104.99 397.227,-1086.21 355.062,-1064.92 352.301,-1063.53 349.49,-1062 346.697,-1060.41"/>
+<polygon fill="black" stroke="black" points="348.301,-1057.3 337.92,-1055.18 344.717,-1063.31 348.301,-1057.3"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/y -->
+<g id="node10" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/y</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/y" xlink:title="drawing area size Y (height)">
+<ellipse fill="none" stroke="black" cx="397.062" cy="-1037.35" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="397.062" y="-1041.15" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="397.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/y -->
+<g id="edge9" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/y</title>
+<path fill="none" stroke="black" d="M490.241,-1108.16C472.378,-1094.77 448.475,-1076.86 429.352,-1062.54"/>
+<polygon fill="black" stroke="black" points="431.313,-1059.63 421.211,-1056.44 427.116,-1065.23 431.313,-1059.63"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/isle_area_nm2 -->
+<g id="node11" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/isle_area_nm2</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/isle_area_nm2" xlink:title="remove polygon islands smaller than this value, specified in mm&lt;sup&gt;2&lt;/sup&gt;">
+<ellipse fill="none" stroke="black" cx="516.062" cy="-1037.35" rx="67.7647" ry="26.7407"/>
+<text text-anchor="middle" x="516.062" y="-1041.15" font-family="Times,serif" font-size="14.00">isle_area_nm2</text>
+<text text-anchor="middle" x="516.062" y="-1026.15" font-family="Times,serif" font-size="14.00">double</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/isle_area_nm2 -->
+<g id="edge10" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/isle_area_nm2</title>
+<path fill="none" stroke="black" d="M516.062,-1100.75C516.062,-1092.49 516.062,-1083.26 516.062,-1074.48"/>
+<polygon fill="black" stroke="black" points="519.563,-1074.46 516.062,-1064.46 512.563,-1074.46 519.563,-1074.46"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/thermal_scale -->
+<g id="node12" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/thermal_scale</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/thermal_scale" xlink:title="scale all thermals on the board by this factor">
+<ellipse fill="none" stroke="black" cx="667.062" cy="-1037.35" rx="65.1077" ry="26.7407"/>
+<text text-anchor="middle" x="667.062" y="-1041.15" font-family="Times,serif" font-size="14.00">thermal_scale</text>
+<text text-anchor="middle" x="667.062" y="-1026.15" font-family="Times,serif" font-size="14.00">double</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/thermal_scale -->
+<g id="edge11" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/size/children/thermal_scale</title>
+<path fill="none" stroke="black" d="M545.177,-1110.31C566.93,-1097.47 597.071,-1079.67 621.937,-1064.99"/>
+<polygon fill="black" stroke="black" points="624.003,-1067.83 630.834,-1059.74 620.444,-1061.81 624.003,-1067.83"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/bloat -->
+<g id="node14" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/bloat</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/bloat" xlink:title="Minimum copper spacing">
+<ellipse fill="none" stroke="black" cx="783.062" cy="-1037.35" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="783.062" y="-1041.15" font-family="Times,serif" font-size="14.00">bloat</text>
+<text text-anchor="middle" x="783.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/bloat -->
+<g id="edge13" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/bloat</title>
+<path fill="none" stroke="black" d="M945.459,-1116.1C914.441,-1104.53 866.097,-1085.42 826.062,-1064.92 823.172,-1063.44 820.219,-1061.84 817.282,-1060.17"/>
+<polygon fill="black" stroke="black" points="818.989,-1057.11 808.596,-1055.06 815.439,-1063.15 818.989,-1057.11"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/shrink -->
+<g id="node15" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/shrink</title>
+<g id="a_node15"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/shrink" xlink:title="Minimum overlap between validly touching copper objects">
+<ellipse fill="none" stroke="black" cx="870.062" cy="-1037.35" rx="35.2113" ry="26.7407"/>
+<text text-anchor="middle" x="870.062" y="-1041.15" font-family="Times,serif" font-size="14.00">shrink</text>
+<text text-anchor="middle" x="870.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/shrink -->
+<g id="edge14" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/shrink</title>
+<path fill="none" stroke="black" d="M953.316,-1107.71C937.972,-1094.93 917.84,-1078.15 901.217,-1064.3"/>
+<polygon fill="black" stroke="black" points="903.298,-1061.48 893.375,-1057.77 898.817,-1066.86 903.298,-1061.48"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_width -->
+<g id="node16" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_width</title>
+<g id="a_node16"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_width" xlink:title="Minimum copper width">
+<ellipse fill="none" stroke="black" cx="977.062" cy="-1037.35" rx="53.9813" ry="26.7407"/>
+<text text-anchor="middle" x="977.062" y="-1041.15" font-family="Times,serif" font-size="14.00">min_width</text>
+<text text-anchor="middle" x="977.062" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_width -->
+<g id="edge15" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_width</title>
+<path fill="none" stroke="black" d="M977.062,-1100.75C977.062,-1092.49 977.062,-1083.26 977.062,-1074.48"/>
+<polygon fill="black" stroke="black" points="980.563,-1074.46 977.062,-1064.46 973.563,-1074.46 980.563,-1074.46"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_silk -->
+<g id="node17" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_silk</title>
+<g id="a_node17"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_silk" xlink:title="Minimum silk width">
+<ellipse fill="none" stroke="black" cx="1095.06" cy="-1037.35" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="1095.06" y="-1041.15" font-family="Times,serif" font-size="14.00">min_silk</text>
+<text text-anchor="middle" x="1095.06" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_silk -->
+<g id="edge16" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_silk</title>
+<path fill="none" stroke="black" d="M1002.09,-1108.59C1018.75,-1096 1040.89,-1079.27 1059.39,-1065.3"/>
+<polygon fill="black" stroke="black" points="1061.73,-1067.91 1067.6,-1059.09 1057.51,-1062.33 1061.73,-1067.91"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_drill -->
+<g id="node18" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_drill</title>
+<g id="a_node18"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_drill" xlink:title="Minimum drill diameter">
+<ellipse fill="none" stroke="black" cx="1207.06" cy="-1037.35" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="1207.06" y="-1041.15" font-family="Times,serif" font-size="14.00">min_drill</text>
+<text text-anchor="middle" x="1207.06" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_drill -->
+<g id="edge17" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_drill</title>
+<path fill="none" stroke="black" d="M1009.27,-1116.81C1044.27,-1104.98 1101.65,-1084.92 1150.06,-1064.92 1153.98,-1063.31 1158.02,-1061.57 1162.05,-1059.78"/>
+<polygon fill="black" stroke="black" points="1163.72,-1062.87 1171.4,-1055.57 1160.84,-1056.49 1163.72,-1062.87"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_ring -->
+<g id="node19" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_ring</title>
+<g id="a_node19"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_ring" xlink:title="Minimum annular ring width">
+<ellipse fill="none" stroke="black" cx="1320.06" cy="-1037.35" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="1320.06" y="-1041.15" font-family="Times,serif" font-size="14.00">min_ring</text>
+<text text-anchor="middle" x="1320.06" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_ring -->
+<g id="edge18" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/drc/children/min_ring</title>
+<path fill="none" stroke="black" d="M1011.77,-1122.56C1066.44,-1114.2 1175.5,-1095.15 1264.06,-1064.92 1268.24,-1063.5 1272.52,-1061.84 1276.76,-1060.07"/>
+<polygon fill="black" stroke="black" points="1278.17,-1063.28 1285.92,-1056.06 1275.36,-1056.87 1278.17,-1063.28"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/x -->
+<g id="node21" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/x</title>
+<g id="a_node21"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/x" xlink:title="last positin, X (horizontal)">
+<ellipse fill="none" stroke="black" cx="1419.06" cy="-1037.35" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1419.06" y="-1041.15" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="1419.06" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/x -->
+<g id="edge20" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/x</title>
+<path fill="none" stroke="black" d="M1448.91,-1101.71C1444.54,-1092.44 1439.55,-1081.83 1434.91,-1071.99"/>
+<polygon fill="black" stroke="black" points="1438.03,-1070.4 1430.61,-1062.85 1431.7,-1073.39 1438.03,-1070.4"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/y -->
+<g id="node22" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/y</title>
+<g id="a_node22"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/y" xlink:title="last positin, Y (horizontal)">
+<ellipse fill="none" stroke="black" cx="1503.06" cy="-1037.35" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1503.06" y="-1041.15" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="1503.06" y="-1026.15" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/y -->
+<g id="edge21" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/y</title>
+<path fill="none" stroke="black" d="M1473.21,-1101.71C1477.58,-1092.44 1482.58,-1081.83 1487.21,-1071.99"/>
+<polygon fill="black" stroke="black" points="1490.42,-1073.39 1491.52,-1062.85 1484.09,-1070.4 1490.42,-1073.39"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/zoom -->
+<g id="node23" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/zoom</title>
+<g id="a_node23"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/zoom" xlink:title="last view zoom factor">
+<ellipse fill="none" stroke="black" cx="1592.06" cy="-1037.35" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="1592.06" y="-1041.15" font-family="Times,serif" font-size="14.00">zoom</text>
+<text text-anchor="middle" x="1592.06" y="-1026.15" font-family="Times,serif" font-size="14.00">double</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/zoom -->
+<g id="edge22" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/meta/children/cursor/children/zoom</title>
+<path fill="none" stroke="black" d="M1491.12,-1107.05C1510.68,-1093.73 1536.28,-1076.31 1556.81,-1062.34"/>
+<polygon fill="black" stroke="black" points="1558.96,-1065.11 1565.26,-1056.59 1555.02,-1059.32 1558.96,-1065.11"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups -->
+<g id="node25" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups</title>
+<g id="a_node25"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups" xlink:title=" ordered list of physical layers from top to bottom ">
+<ellipse fill="none" stroke="black" cx="1712.06" cy="-1128.5" rx="45.9239" ry="27.6545"/>
+<text text-anchor="middle" x="1712.06" y="-1132.8" font-family="Times,serif" font-size="14.00">li:groups</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups -->
+<g id="edge24" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups</title>
+<path fill="none" stroke="black" d="M1712.06,-1191.91C1712.06,-1183.88 1712.06,-1174.94 1712.06,-1166.38"/>
+<polygon fill="black" stroke="black" points="1715.56,-1166.23 1712.06,-1156.23 1708.56,-1166.23 1715.56,-1166.23"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER -->
+<g id="node26" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER</title>
+<g id="a_node26"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER" xlink:title=" a layer group (a physical layer of the board); the ID of the layer group is the integer in the name of the node ">
+<ellipse fill="none" stroke="black" cx="1712.06" cy="-1037.35" rx="64.1938" ry="27.6545"/>
+<text text-anchor="middle" x="1712.06" y="-1041.65" font-family="Times,serif" font-size="14.00">ha:INTEGER</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER -->
+<g id="edge25" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER</title>
+<path fill="none" stroke="black" d="M1712.06,-1100.75C1712.06,-1092.73 1712.06,-1083.78 1712.06,-1075.23"/>
+<polygon fill="black" stroke="black" points="1715.56,-1075.08 1712.06,-1065.08 1708.56,-1075.08 1715.56,-1075.08"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/name -->
+<g id="node27" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/name</title>
+<g id="a_node27"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/name" xlink:title="user assigned name of the layer group, e.g. &quot;top copper&quot;">
+<ellipse fill="none" stroke="black" cx="1570.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="1570.06" y="-939.385" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="1570.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/name -->
+<g id="edge26" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/name</title>
+<path fill="none" stroke="black" d="M1674.52,-1014.87C1655.34,-1003.4 1631.91,-988.606 1612.06,-973.769 1607.67,-970.489 1603.19,-966.855 1598.86,-963.181"/>
+<polygon fill="black" stroke="black" points="1601.13,-960.516 1591.28,-956.593 1596.53,-965.798 1601.13,-960.516"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type -->
+<g id="node28" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type</title>
+<g id="a_node28"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/type" xlink:title=" a flag&#45;list of layer type flag bits ">
+<ellipse fill="none" stroke="black" cx="1661.06" cy="-935.585" rx="39.6962" ry="27.6545"/>
+<text text-anchor="middle" x="1661.06" y="-939.885" font-family="Times,serif" font-size="14.00">ha:type</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type -->
+<g id="edge27" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type</title>
+<path fill="none" stroke="black" d="M1698.66,-1010.13C1692.54,-998.15 1685.2,-983.791 1678.63,-970.955"/>
+<polygon fill="black" stroke="black" points="1681.69,-969.243 1674.02,-961.932 1675.46,-972.429 1681.69,-969.243"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/layers -->
+<g id="node39" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/layers</title>
+<g id="a_node39"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/layers" xlink:title=" ordered list of logical layer IDs hosted by this layer group ">
+<ellipse fill="none" stroke="black" cx="1761.06" cy="-935.585" rx="42.3529" ry="27.6545"/>
+<text text-anchor="middle" x="1761.06" y="-939.885" font-family="Times,serif" font-size="14.00">li:layers</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/layers -->
+<g id="edge47" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/layers</title>
+<path fill="none" stroke="black" d="M1724.94,-1010.13C1730.78,-998.243 1737.77,-984.014 1744.03,-971.253"/>
+<polygon fill="black" stroke="black" points="1747.18,-972.795 1748.44,-962.276 1740.89,-969.709 1747.18,-972.795"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="node29" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/top</title>
+<g id="a_node29"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/top" xlink:title="location: top side">
+<ellipse fill="none" stroke="black" cx="1454.06" cy="-834.531" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="1454.06" y="-838.331" font-family="Times,serif" font-size="14.00">top</text>
+<text text-anchor="middle" x="1454.06" y="-823.331" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/top -->
+<g id="edge28" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/top</title>
+<path fill="none" stroke="black" d="M1636.76,-913.489C1629.21,-907.684 1620.61,-901.787 1612.06,-897.401 1563.65,-872.576 1544.5,-884.116 1495.06,-861.401 1491.65,-859.833 1488.18,-858.026 1484.78,-856.11"/>
+<polygon fill="black" stroke="black" points="1486.4,-852.999 1476.02,-850.876 1482.81,-859.009 1486.4,-852.999"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="node30" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<g id="a_node30"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/bottom" xlink:title="location: bottom side">
+<ellipse fill="none" stroke="black" cx="1479.06" cy="-744.791" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="1479.06" y="-748.591" font-family="Times,serif" font-size="14.00">bottom</text>
+<text text-anchor="middle" x="1479.06" y="-733.591" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<g id="edge29" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/bottom</title>
+<path fill="none" stroke="black" d="M1636.13,-913.98C1628.63,-908.253 1620.22,-902.274 1612.06,-897.401 1578.94,-877.618 1560.47,-888.556 1533.06,-861.401 1510.79,-839.34 1496.64,-806.345 1488.44,-781.243"/>
+<polygon fill="black" stroke="black" points="1491.69,-779.885 1485.38,-771.367 1485,-781.955 1491.69,-779.885"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="node31" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<g id="a_node31"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/intern" xlink:title="location: internal">
+<ellipse fill="none" stroke="black" cx="1523.06" cy="-655.051" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="1523.06" y="-658.851" font-family="Times,serif" font-size="14.00">intern</text>
+<text text-anchor="middle" x="1523.06" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/intern -->
+<g id="edge31" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/intern</title>
+<path fill="none" stroke="black" d="M1634.85,-914.67C1609.85,-895.448 1575.36,-868.274 1571.06,-861.401 1553.54,-833.376 1536.85,-742.729 1528.54,-691.737"/>
+<polygon fill="black" stroke="black" points="1531.99,-691.115 1526.95,-681.797 1525.08,-692.225 1531.99,-691.115"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="node32" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<g id="a_node32"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/logical" xlink:title="location: logical (not in the actual stackup)">
+<ellipse fill="none" stroke="black" cx="1558.06" cy="-565.311" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="1558.06" y="-569.111" font-family="Times,serif" font-size="14.00">logical</text>
+<text text-anchor="middle" x="1558.06" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/logical -->
+<g id="edge33" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/logical</title>
+<path fill="none" stroke="black" d="M1640.81,-911.807C1629.73,-898.115 1616.73,-879.82 1609.06,-861.401 1599.23,-837.784 1574.37,-676.054 1563.4,-602.542"/>
+<polygon fill="black" stroke="black" points="1566.82,-601.739 1561.89,-592.363 1559.9,-602.769 1566.82,-601.739"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="node33" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<g id="a_node33"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/copper" xlink:title="material: copper">
+<ellipse fill="none" stroke="black" cx="1596.06" cy="-475.571" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="1596.06" y="-479.371" font-family="Times,serif" font-size="14.00">copper</text>
+<text text-anchor="middle" x="1596.06" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/copper -->
+<g id="edge35" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/copper</title>
+<path fill="none" stroke="black" d="M1652.44,-908.651C1641.23,-872.567 1623.06,-804.969 1623.06,-745.791 1623.06,-745.791 1623.06,-745.791 1623.06,-654.051 1623.06,-604.409 1612.61,-547.836 1604.71,-512.173"/>
+<polygon fill="black" stroke="black" points="1608.09,-511.227 1602.46,-502.25 1601.26,-512.776 1608.09,-511.227"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="node34" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<g id="a_node34"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/silk" xlink:title="material: silk">
+<ellipse fill="none" stroke="black" cx="1644.06" cy="-385.831" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="1644.06" y="-389.631" font-family="Times,serif" font-size="14.00">silk</text>
+<text text-anchor="middle" x="1644.06" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/silk -->
+<g id="edge37" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/silk</title>
+<path fill="none" stroke="black" d="M1661.06,-907.698C1661.06,-871.08 1661.06,-803.478 1661.06,-745.791 1661.06,-745.791 1661.06,-745.791 1661.06,-564.311 1661.06,-515.009 1654.48,-458.353 1649.51,-422.578"/>
+<polygon fill="black" stroke="black" points="1652.97,-422.029 1648.09,-412.622 1646.04,-423.015 1652.97,-422.029"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="node35" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<g id="a_node35"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/mask" xlink:title="material: mask">
+<ellipse fill="none" stroke="black" cx="1676.06" cy="-296.09" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="1676.06" y="-299.89" font-family="Times,serif" font-size="14.00">mask</text>
+<text text-anchor="middle" x="1676.06" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/mask -->
+<g id="edge39" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/mask</title>
+<path fill="none" stroke="black" d="M1669.69,-908.651C1680.9,-872.567 1699.06,-804.969 1699.06,-745.791 1699.06,-745.791 1699.06,-745.791 1699.06,-474.571 1699.06,-425.083 1690.16,-368.472 1683.43,-332.759"/>
+<polygon fill="black" stroke="black" points="1686.84,-331.976 1681.51,-322.82 1679.97,-333.303 1686.84,-331.976"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="node36" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<g id="a_node36"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/paste" xlink:title="material: paste">
+<ellipse fill="none" stroke="black" cx="1716.06" cy="-206.35" rx="31.2258" ry="26.7407"/>
+<text text-anchor="middle" x="1716.06" y="-210.15" font-family="Times,serif" font-size="14.00">paste</text>
+<text text-anchor="middle" x="1716.06" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/paste -->
+<g id="edge41" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/paste</title>
+<path fill="none" stroke="black" d="M1677.74,-910.494C1700.11,-875.765 1737.06,-808.86 1737.06,-745.791 1737.06,-745.791 1737.06,-745.791 1737.06,-384.831 1737.06,-335.411 1728.93,-278.783 1722.79,-243.048"/>
+<polygon fill="black" stroke="black" points="1726.22,-242.344 1721.04,-233.103 1719.33,-243.558 1726.22,-242.344"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="node37" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<g id="a_node37"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/outline" xlink:title="&quot;material&quot;: router path (board outline, slots, cutouts) ">
+<ellipse fill="none" stroke="black" cx="1747.06" cy="-116.61" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="1747.06" y="-120.41" font-family="Times,serif" font-size="14.00">outline</text>
+<text text-anchor="middle" x="1747.06" y="-105.41" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/outline -->
+<g id="edge43" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/outline</title>
+<path fill="none" stroke="black" d="M1684.68,-913.312C1718.07,-880.775 1775.06,-815.094 1775.06,-745.791 1775.06,-745.791 1775.06,-745.791 1775.06,-295.09 1775.06,-245.406 1764.22,-188.843 1756.03,-153.194"/>
+<polygon fill="black" stroke="black" points="1759.4,-152.207 1753.7,-143.275 1752.58,-153.811 1759.4,-152.207"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="node38" class="node"><title>dup1_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<g id="a_node38"><a xlink:href="tree.html#/lht_tree_doc/comm/layer_mask/children/substrate" xlink:title="material: substrate or insulator">
+<ellipse fill="none" stroke="black" cx="1780.06" cy="-26.8701" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="1780.06" y="-30.6701" font-family="Times,serif" font-size="14.00">substrate</text>
+<text text-anchor="middle" x="1780.06" y="-15.6701" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<g id="edge45" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/layer_stack/children/groups/children/INTEGER/children/type&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/substrate</title>
+<path fill="none" stroke="black" d="M1687.13,-914.541C1694.51,-908.941 1702.57,-902.889 1710.06,-897.401 1732.45,-881.013 1743.41,-882.81 1761.06,-861.401 1796.9,-817.927 1813.06,-802.132 1813.06,-745.791 1813.06,-745.791 1813.06,-745.791 1813.06,-205.35 1813.06,-155.432 1800.29,-98.9262 1790.64,-63.3539"/>
+<polygon fill="black" stroke="black" points="1793.93,-62.1546 1787.88,-53.458 1787.19,-64.0301 1793.93,-62.1546"/>
+</g>
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/top&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/bottom -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/bottom&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/intern -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/intern&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/logical -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/logical&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/copper -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/copper&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/silk -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/silk&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/mask -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/mask&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/paste -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/paste&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/outline -->
+<!-- dup1_/lht_tree_doc/comm/layer_mask/children/outline&#45;&gt;dup1_/lht_tree_doc/comm/layer_mask/children/substrate -->
+<!-- dup2_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font/children/FONT&#45;ID -->
+<g id="node41" class="node"><title>dup2_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font/children/FONT&#45;ID</title>
+<g id="a_node41"><a xlink:href="FONT-ID.svg" xlink:title="FONT&#45;ID &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="1836.06" y="-1140.8" font-family="Times,serif" font-size="14.00">FONT&#45;ID &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font&#45;&gt;dup2_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font/children/FONT&#45;ID -->
+<g id="edge49" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font&#45;&gt;dup2_/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/font/children/FONT&#45;ID</title>
+<path fill="none" stroke="black" d="M1836.06,-1191.91C1836.06,-1183.88 1836.06,-1174.94 1836.06,-1166.38"/>
+<polygon fill="black" stroke="black" points="1839.56,-1166.23 1836.06,-1156.23 1832.56,-1166.23 1839.56,-1166.23"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist -->
+<g id="node44" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist</title>
+<g id="a_node44"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist" xlink:title=" the input netlist (as seen in the last netlist import, a.k.a. forward annotation) ">
+<ellipse fill="none" stroke="black" cx="2026.06" cy="-1128.5" rx="43.2674" ry="27.6545"/>
+<text text-anchor="middle" x="2026.06" y="-1132.8" font-family="Times,serif" font-size="14.00">li:netlist</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist -->
+<g id="edge52" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist</title>
+<path fill="none" stroke="black" d="M2043.56,-1191.91C2041.24,-1183.63 2038.65,-1174.38 2036.18,-1165.58"/>
+<polygon fill="black" stroke="black" points="2039.54,-1164.61 2033.47,-1155.92 2032.8,-1166.5 2039.54,-1164.61"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch -->
+<g id="node50" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch</title>
+<g id="a_node50"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch" xlink:title=" a list of intentional deviations from the input netlist, a.k.a. material for back annotation ">
+<ellipse fill="none" stroke="black" cx="2278.06" cy="-1128.5" rx="68.6788" ry="27.6545"/>
+<text text-anchor="middle" x="2278.06" y="-1132.8" font-family="Times,serif" font-size="14.00">li:netlist_patch</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch -->
+<g id="edge58" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch</title>
+<path fill="none" stroke="black" d="M2088.67,-1201.26C2095.74,-1198.12 2103.1,-1194.94 2110.06,-1192.08 2145.54,-1177.5 2185.8,-1162.45 2218.01,-1150.77"/>
+<polygon fill="black" stroke="black" points="2219.52,-1153.94 2227.74,-1147.25 2217.14,-1147.36 2219.52,-1153.94"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME -->
+<g id="node45" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME</title>
+<g id="a_node45"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME" xlink:title=" a network ">
+<ellipse fill="none" stroke="black" cx="2001.06" cy="-1037.35" rx="70.922" ry="27.6545"/>
+<text text-anchor="middle" x="2001.06" y="-1041.65" font-family="Times,serif" font-size="14.00">ha:NETNAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME -->
+<g id="edge53" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME</title>
+<path fill="none" stroke="black" d="M2018.7,-1101.23C2016.37,-1092.95 2013.76,-1083.64 2011.28,-1074.78"/>
+<polygon fill="black" stroke="black" points="2014.62,-1073.73 2008.55,-1065.04 2007.88,-1075.62 2014.62,-1073.73"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn -->
+<g id="node46" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn</title>
+<g id="a_node46"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME/children/conn" xlink:title=" list of terminals connceted to the network ">
+<ellipse fill="none" stroke="black" cx="1886.06" cy="-935.585" rx="38.3684" ry="27.6545"/>
+<text text-anchor="middle" x="1886.06" y="-939.885" font-family="Times,serif" font-size="14.00">li:conn</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn -->
+<g id="edge54" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn</title>
+<path fill="none" stroke="black" d="M1972.93,-1011.94C1956.21,-997.435 1934.96,-978.999 1917.66,-963.993"/>
+<polygon fill="black" stroke="black" points="1919.87,-961.275 1910.02,-957.366 1915.28,-966.563 1919.87,-961.275"/>
+</g>
+<!-- dup3_/lht_tree_doc/comm/attributes_v5p -->
+<g id="node48" class="node"><title>dup3_/lht_tree_doc/comm/attributes_v5p</title>
+<g id="a_node48"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes_v5p" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="2001.06" cy="-935.585" rx="58.8803" ry="38.3684"/>
+<text text-anchor="middle" x="2001.06" y="-947.385" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+<text text-anchor="middle" x="2001.06" y="-916.385" font-family="Times,serif" font-size="14.00">&gt;=5</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME&#45;&gt;dup3_/lht_tree_doc/comm/attributes_v5p -->
+<g id="edge56" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME&#45;&gt;dup3_/lht_tree_doc/comm/attributes_v5p</title>
+<path fill="none" stroke="black" d="M2001.06,-1009.61C2001.06,-1001.73 2001.06,-992.857 2001.06,-984.083"/>
+<polygon fill="black" stroke="black" points="2004.56,-983.894 2001.06,-973.894 1997.56,-983.894 2004.56,-983.894"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter -->
+<g id="node47" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter</title>
+<g id="a_node47"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter" xlink:title="refdes&#45;terminal">
+<ellipse fill="none" stroke="black" cx="1887.06" cy="-834.531" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="1887.06" y="-838.331" font-family="Times,serif" font-size="14.00">diameter</text>
+<text text-anchor="middle" x="1887.06" y="-823.331" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter -->
+<g id="edge55" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter</title>
+<path fill="none" stroke="black" d="M1886.33,-907.78C1886.44,-896.701 1886.58,-883.686 1886.7,-871.777"/>
+<polygon fill="black" stroke="black" points="1890.2,-871.708 1886.8,-861.673 1883.2,-871.637 1890.2,-871.708"/>
+</g>
+<!-- dup3_/lht_tree_doc/comm/attributes_v5p/children/attrib&#45;key -->
+<g id="node49" class="node"><title>dup3_/lht_tree_doc/comm/attributes_v5p/children/attrib&#45;key</title>
+<g id="a_node49"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes_v5p/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="2001.06" cy="-834.531" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="2001.06" y="-838.331" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="2001.06" y="-823.331" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup3_/lht_tree_doc/comm/attributes_v5p&#45;&gt;dup3_/lht_tree_doc/comm/attributes_v5p/children/attrib&#45;key -->
+<g id="edge57" class="edge"><title>dup3_/lht_tree_doc/comm/attributes_v5p&#45;&gt;dup3_/lht_tree_doc/comm/attributes_v5p/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M2001.06,-897.137C2001.06,-888.816 2001.06,-880.011 2001.06,-871.741"/>
+<polygon fill="black" stroke="black" points="2004.56,-871.629 2001.06,-861.629 1997.56,-871.629 2004.56,-871.629"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info -->
+<g id="node51" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info</title>
+<g id="a_node51"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info" xlink:title=" describe the current state of a net, as seen on the input ">
+<ellipse fill="none" stroke="black" cx="2164.06" cy="-1037.35" rx="51.7379" ry="27.6545"/>
+<text text-anchor="middle" x="2164.06" y="-1041.65" font-family="Times,serif" font-size="14.00">li:net_info</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info -->
+<g id="edge59" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info</title>
+<path fill="none" stroke="black" d="M2247.51,-1103.61C2233.04,-1092.29 2215.65,-1078.69 2200.5,-1066.84"/>
+<polygon fill="black" stroke="black" points="2202.38,-1063.87 2192.35,-1060.47 2198.07,-1069.38 2202.38,-1063.87"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn -->
+<g id="node54" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn</title>
+<g id="a_node54"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn" xlink:title=" the &#39;as built&#39; network requires a new conncetion to be created during the back annotation ">
+<ellipse fill="none" stroke="black" cx="2294.06" cy="-1037.35" rx="60.623" ry="27.6545"/>
+<text text-anchor="middle" x="2294.06" y="-1041.65" font-family="Times,serif" font-size="14.00">ha:add_conn</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn -->
+<g id="edge62" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn</title>
+<path fill="none" stroke="black" d="M2282.86,-1100.75C2284.32,-1092.64 2285.94,-1083.59 2287.49,-1074.95"/>
+<polygon fill="black" stroke="black" points="2290.94,-1075.54 2289.27,-1065.08 2284.05,-1074.3 2290.94,-1075.54"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn -->
+<g id="node57" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn</title>
+<g id="a_node57"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn" xlink:title=" the &#39;as built&#39; network requires an existing conncetion to be removed during the back annotation ">
+<ellipse fill="none" stroke="black" cx="2447.06" cy="-1037.35" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="2447.06" y="-1041.65" font-family="Times,serif" font-size="14.00">ha:del_conn</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn -->
+<g id="edge65" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn</title>
+<path fill="none" stroke="black" d="M2318.54,-1106.15C2342.98,-1093.25 2374.23,-1076.77 2399.8,-1063.28"/>
+<polygon fill="black" stroke="black" points="2401.73,-1066.22 2408.94,-1058.46 2398.46,-1060.03 2401.73,-1066.22"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib -->
+<g id="node60" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib</title>
+<g id="a_node60"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib" xlink:title=" the &#39;as built&#39; network requires an attribute to be set or changed ">
+<ellipse fill="none" stroke="black" cx="2657.06" cy="-1037.35" rx="75.8212" ry="27.6545"/>
+<text text-anchor="middle" x="2657.06" y="-1041.65" font-family="Times,serif" font-size="14.00">ha:change_attrib</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib -->
+<g id="edge68" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib</title>
+<path fill="none" stroke="black" d="M2327.89,-1109.26C2336.87,-1106.27 2346.2,-1103.36 2355.06,-1100.92 2396.81,-1089.44 2506.35,-1067.49 2581.36,-1052.88"/>
+<polygon fill="black" stroke="black" points="2582.1,-1056.3 2591.25,-1050.96 2580.76,-1049.43 2582.1,-1056.3"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/net -->
+<g id="node52" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/net</title>
+<g id="a_node52"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info/children/net" xlink:title="net name; first item on the list, only once">
+<ellipse fill="none" stroke="black" cx="2111.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2111.06" y="-939.385" font-family="Times,serif" font-size="14.00">net</text>
+<text text-anchor="middle" x="2111.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/net -->
+<g id="edge60" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/net</title>
+<path fill="none" stroke="black" d="M2150.41,-1010.65C2143.74,-998.084 2135.62,-982.808 2128.5,-969.402"/>
+<polygon fill="black" stroke="black" points="2131.54,-967.665 2123.76,-960.476 2125.36,-970.949 2131.54,-967.665"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/term -->
+<g id="node53" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/term</title>
+<g id="a_node53"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info/children/term" xlink:title="terminal name; zero or more items starting from the second item">
+<ellipse fill="none" stroke="black" cx="2195.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2195.06" y="-939.385" font-family="Times,serif" font-size="14.00">term</text>
+<text text-anchor="middle" x="2195.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/term -->
+<g id="edge61" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/net_info/children/term</title>
+<path fill="none" stroke="black" d="M2172.29,-1009.87C2175.94,-998.122 2180.29,-984.129 2184.2,-971.535"/>
+<polygon fill="black" stroke="black" points="2187.6,-972.392 2187.23,-961.804 2180.92,-970.315 2187.6,-972.392"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/net -->
+<g id="node55" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/net</title>
+<g id="a_node55"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn/children/net" xlink:title="net name the terminal should be added to">
+<ellipse fill="none" stroke="black" cx="2279.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2279.06" y="-939.385" font-family="Times,serif" font-size="14.00">net</text>
+<text text-anchor="middle" x="2279.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/net -->
+<g id="edge63" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/net</title>
+<path fill="none" stroke="black" d="M2290.04,-1009.61C2288.32,-998.159 2286.28,-984.614 2284.44,-972.319"/>
+<polygon fill="black" stroke="black" points="2287.89,-971.727 2282.94,-962.359 2280.96,-972.768 2287.89,-971.727"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/term -->
+<g id="node56" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/term</title>
+<g id="a_node56"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn/children/term" xlink:title="terminal name">
+<ellipse fill="none" stroke="black" cx="2363.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2363.06" y="-939.385" font-family="Times,serif" font-size="14.00">term</text>
+<text text-anchor="middle" x="2363.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/term -->
+<g id="edge64" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/add_conn/children/term</title>
+<path fill="none" stroke="black" d="M2311.65,-1010.91C2320.71,-997.815 2331.84,-981.728 2341.42,-967.874"/>
+<polygon fill="black" stroke="black" points="2344.35,-969.798 2347.16,-959.583 2338.59,-965.816 2344.35,-969.798"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/net -->
+<g id="node58" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/net</title>
+<g id="a_node58"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn/children/net" xlink:title="net name the terminal should be removed from">
+<ellipse fill="none" stroke="black" cx="2447.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2447.06" y="-939.385" font-family="Times,serif" font-size="14.00">net</text>
+<text text-anchor="middle" x="2447.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/net -->
+<g id="edge66" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/net</title>
+<path fill="none" stroke="black" d="M2447.06,-1009.61C2447.06,-998.363 2447.06,-985.095 2447.06,-972.977"/>
+<polygon fill="black" stroke="black" points="2450.56,-972.702 2447.06,-962.702 2443.56,-972.702 2450.56,-972.702"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/term -->
+<g id="node59" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/term</title>
+<g id="a_node59"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn/children/term" xlink:title="terminal name">
+<ellipse fill="none" stroke="black" cx="2531.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2531.06" y="-939.385" font-family="Times,serif" font-size="14.00">term</text>
+<text text-anchor="middle" x="2531.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/term -->
+<g id="edge67" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/del_conn/children/term</title>
+<path fill="none" stroke="black" d="M2468.04,-1011.43C2479.69,-997.6 2494.24,-980.322 2506.42,-965.852"/>
+<polygon fill="black" stroke="black" points="2509.15,-968.045 2512.91,-958.141 2503.79,-963.536 2509.15,-968.045"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/net -->
+<g id="node61" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/net</title>
+<g id="a_node61"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/net" xlink:title="net name whose attribute needs to be changed ">
+<ellipse fill="none" stroke="black" cx="2615.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2615.06" y="-939.385" font-family="Times,serif" font-size="14.00">net</text>
+<text text-anchor="middle" x="2615.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/net -->
+<g id="edge69" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/net</title>
+<path fill="none" stroke="black" d="M2645.92,-1009.87C2640.84,-997.822 2634.78,-983.413 2629.37,-970.572"/>
+<polygon fill="black" stroke="black" points="2632.5,-968.982 2625.39,-961.124 2626.05,-971.699 2632.5,-968.982"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/key -->
+<g id="node62" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/key</title>
+<g id="a_node62"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/key" xlink:title="key (name) of the attribute">
+<ellipse fill="none" stroke="black" cx="2699.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2699.06" y="-939.385" font-family="Times,serif" font-size="14.00">key</text>
+<text text-anchor="middle" x="2699.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/key -->
+<g id="edge70" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/key</title>
+<path fill="none" stroke="black" d="M2668.21,-1009.87C2673.28,-997.822 2679.35,-983.413 2684.75,-970.572"/>
+<polygon fill="black" stroke="black" points="2688.08,-971.699 2688.73,-961.124 2681.63,-968.982 2688.08,-971.699"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/val -->
+<g id="node63" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/val</title>
+<g id="a_node63"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/val" xlink:title="new value of the attribute">
+<ellipse fill="none" stroke="black" cx="2783.06" cy="-935.585" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="2783.06" y="-939.385" font-family="Times,serif" font-size="14.00">val</text>
+<text text-anchor="middle" x="2783.06" y="-924.385" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/val -->
+<g id="edge71" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;board&#45;v*/children/netlists/children/netlist_patch/children/change_attrib/children/val</title>
+<path fill="none" stroke="black" d="M2690.67,-1012.31C2706.23,-1000.93 2724.83,-986.959 2741.06,-973.769 2745.31,-970.314 2749.72,-966.582 2754.02,-962.861"/>
+<polygon fill="black" stroke="black" points="2756.36,-965.466 2761.57,-956.24 2751.74,-960.205 2756.36,-965.466"/>
+</g>
+<!-- dup6_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node67" class="node"><title>dup6_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node67"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="2413.06" cy="-1128.5" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="2413.06" y="-1132.3" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="2413.06" y="-1117.3" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup6_/lht_tree_doc/comm/attributes&#45;&gt;dup6_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge75" class="edge"><title>dup6_/lht_tree_doc/comm/attributes&#45;&gt;dup6_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M2365.08,-1193.34C2372.47,-1183.51 2381.02,-1172.14 2388.84,-1161.73"/>
+<polygon fill="black" stroke="black" points="2391.71,-1163.74 2394.92,-1153.64 2386.11,-1159.54 2391.71,-1163.74"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/pcb-rnd-conf-v1.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/pcb-rnd-conf-v1.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/pcb-rnd-conf-v1.svg	(revision 18980)
@@ -0,0 +1,60 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: li:pcb&#45;rnd&#45;conf&#45;v1 Pages: 1 -->
+<svg width="375pt" height="154pt"
+ viewBox="0.00 0.00 375.02 154.31" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 150.309)">
+<title>li:pcb&#45;rnd&#45;conf&#45;v1</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-150.309 371.016,-150.309 371.016,4 -4,4"/>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1 -->
+<g id="node1" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-conf-v1" xlink:title="complete pcb&#45;rnd configuration tree">
+<ellipse fill="none" stroke="black" cx="193.104" cy="-118.731" rx="82.0488" ry="27.6545"/>
+<text text-anchor="middle" x="193.104" y="-123.031" font-family="Times,serif" font-size="14.00">li:pcb&#45;rnd&#45;conf&#45;v1</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/overwrite -->
+<g id="node2" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/overwrite</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-conf-v1/children/overwrite" xlink:title="overwrite values while merging; children: a full or partial &lt;a href=&quot;../../conf/groups.html#tree&quot;&gt;config tree&lt;/a&gt;">
+<ellipse fill="none" stroke="black" cx="60.1041" cy="-27.5772" rx="60.2083" ry="27.6545"/>
+<text text-anchor="middle" x="60.1041" y="-31.8772" font-family="Times,serif" font-size="14.00">ha:overwrite</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/overwrite -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/overwrite</title>
+<path fill="none" stroke="black" d="M157.463,-93.8398C140.27,-82.315 119.542,-68.4201 101.638,-56.4185"/>
+<polygon fill="black" stroke="black" points="103.359,-53.3585 93.1033,-50.6976 99.4609,-59.173 103.359,-53.3585"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/prepend -->
+<g id="node3" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/prepend</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-conf-v1/children/prepend" xlink:title="prepend values while merging; children: a full or partial &lt;a href=&quot;../../conf/groups.html#tree&quot;&gt;config tree&lt;/a&gt;">
+<ellipse fill="none" stroke="black" cx="193.104" cy="-27.5772" rx="54.3945" ry="27.6545"/>
+<text text-anchor="middle" x="193.104" y="-31.8772" font-family="Times,serif" font-size="14.00">ha:prepend</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/prepend -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/prepend</title>
+<path fill="none" stroke="black" d="M193.104,-90.9823C193.104,-82.96 193.104,-74.0155 193.104,-65.4608"/>
+<polygon fill="black" stroke="black" points="196.604,-65.3075 193.104,-55.3075 189.604,-65.3076 196.604,-65.3075"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/append -->
+<g id="node4" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/append</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-conf-v1/children/append" xlink:title="append values while merging; children: a full or partial &lt;a href=&quot;../../conf/groups.html#tree&quot;&gt;config tree&lt;/a&gt;">
+<ellipse fill="none" stroke="black" cx="316.104" cy="-27.5772" rx="50.8235" ry="27.6545"/>
+<text text-anchor="middle" x="316.104" y="-31.8772" font-family="Times,serif" font-size="14.00">ha:append</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/append -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;conf&#45;v1/children/append</title>
+<path fill="none" stroke="black" d="M226.714,-93.3697C242.584,-81.8669 261.597,-68.0858 278,-56.1962"/>
+<polygon fill="black" stroke="black" points="280.267,-58.8759 286.31,-50.1732 276.159,-53.2081 280.267,-58.8759"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/pcb-rnd-font-v1.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/pcb-rnd-font-v1.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/pcb-rnd-font-v1.svg	(revision 18980)
@@ -0,0 +1,364 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: li:pcb&#45;rnd&#45;font&#45;v1 Pages: 1 -->
+<svg width="976pt" height="609pt"
+ viewBox="0.00 0.00 975.88 608.67" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 604.666)">
+<title>li:pcb&#45;rnd&#45;font&#45;v1</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-604.666 971.882,-604.666 971.882,4 -4,4"/>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1 -->
+<g id="node1" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1" xlink:title="font description">
+<ellipse fill="none" stroke="black" cx="315.234" cy="-573.089" rx="80.7205" ry="27.6545"/>
+<text text-anchor="middle" x="315.234" y="-577.389" font-family="Times,serif" font-size="14.00">li:pcb&#45;rnd&#45;font&#45;v1</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID -->
+<g id="node2" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID" xlink:title=" the full description of a font; the node name is the integer font id or &quot;geda_pcb&quot; for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below ">
+<ellipse fill="none" stroke="black" cx="315.234" cy="-481.935" rx="61.5366" ry="27.6545"/>
+<text text-anchor="middle" x="315.234" y="-486.235" font-family="Times,serif" font-size="14.00">ha:FONT&#45;ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID</title>
+<path fill="none" stroke="black" d="M315.234,-545.34C315.234,-537.317 315.234,-528.373 315.234,-519.818"/>
+<polygon fill="black" stroke="black" points="318.734,-519.665 315.234,-509.665 311.734,-519.665 318.734,-519.665"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_height -->
+<g id="node3" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_height</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/cell_height" xlink:title="height of the tallest glyph">
+<ellipse fill="none" stroke="black" cx="81.234" cy="-390.78" rx="54.3945" ry="26.7407"/>
+<text text-anchor="middle" x="81.234" y="-394.58" font-family="Times,serif" font-size="14.00">cell_height</text>
+<text text-anchor="middle" x="81.234" y="-379.58" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_height -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_height</title>
+<path fill="none" stroke="black" d="M268.137,-464.183C233.904,-451.865 186.527,-434.523 145.234,-418.357 140.711,-416.587 136.022,-414.713 131.333,-412.814"/>
+<polygon fill="black" stroke="black" points="132.342,-409.445 121.761,-408.903 129.694,-415.925 132.342,-409.445"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_width -->
+<g id="node4" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_width</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/cell_width" xlink:title="width of the widest glyph">
+<ellipse fill="none" stroke="black" cx="206.234" cy="-390.78" rx="52.1524" ry="26.7407"/>
+<text text-anchor="middle" x="206.234" y="-394.58" font-family="Times,serif" font-size="14.00">cell_width</text>
+<text text-anchor="middle" x="206.234" y="-379.58" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_width -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/cell_width</title>
+<path fill="none" stroke="black" d="M286.596,-457.51C272.652,-446.105 255.768,-432.296 241.082,-420.284"/>
+<polygon fill="black" stroke="black" points="243.139,-417.444 233.182,-413.822 238.707,-422.862 243.139,-417.444"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/id -->
+<g id="node5" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/id</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/id" xlink:title="unique font ID within the fontkit; fonts are referenced by ID">
+<ellipse fill="none" stroke="black" cx="315.234" cy="-390.78" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="315.234" y="-394.58" font-family="Times,serif" font-size="14.00">id</text>
+<text text-anchor="middle" x="315.234" y="-379.58" font-family="Times,serif" font-size="14.00">integer</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/id -->
+<g id="edge4" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/id</title>
+<path fill="none" stroke="black" d="M315.234,-454.185C315.234,-445.928 315.234,-436.692 315.234,-427.911"/>
+<polygon fill="black" stroke="black" points="318.734,-427.897 315.234,-417.897 311.734,-427.897 318.734,-427.897"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/name -->
+<g id="node6" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/name</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/name" xlink:title="user specified, user readable font name">
+<ellipse fill="none" stroke="black" cx="404.234" cy="-390.78" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="404.234" y="-394.58" font-family="Times,serif" font-size="14.00">name</text>
+<text text-anchor="middle" x="404.234" y="-379.58" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/name -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/name</title>
+<path fill="none" stroke="black" d="M339.554,-456.573C351.061,-445.045 364.854,-431.229 376.74,-419.322"/>
+<polygon fill="black" stroke="black" points="379.27,-421.742 383.857,-412.192 374.315,-416.797 379.27,-421.742"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols -->
+<g id="node7" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols</title>
+<g id="a_node7"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols" xlink:title=" a collections of glyphs availbale in the font ">
+<ellipse fill="none" stroke="black" cx="511.234" cy="-390.78" rx="55.7232" ry="27.6545"/>
+<text text-anchor="middle" x="511.234" y="-395.08" font-family="Times,serif" font-size="14.00">ha:symbols</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols -->
+<g id="edge6" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols</title>
+<path fill="none" stroke="black" d="M357.763,-461.589C388.402,-447.653 429.828,-428.809 461.918,-414.212"/>
+<polygon fill="black" stroke="black" points="463.476,-417.349 471.129,-410.023 460.577,-410.977 463.476,-417.349"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER -->
+<g id="node8" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER" xlink:title=" Description of a glyph (symbol). Node name is a signel ASCII character or is of format &amp;xx where xx is a hex digit of the ASCII code of the character. Characters that must use the hex version are: codes below 33 or over 126, &amp;, #, {, }, /, :, ;, =, \, :">
+<ellipse fill="none" stroke="black" cx="511.234" cy="-299.626" rx="81.135" ry="27.6545"/>
+<text text-anchor="middle" x="511.234" y="-303.926" font-family="Times,serif" font-size="14.00">ha:CHARACTER</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER -->
+<g id="edge7" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER</title>
+<path fill="none" stroke="black" d="M511.234,-363.031C511.234,-355.009 511.234,-346.064 511.234,-337.51"/>
+<polygon fill="black" stroke="black" points="514.734,-337.356 511.234,-327.356 507.734,-337.356 514.734,-337.356"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/height -->
+<g id="node9" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/height</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/height" xlink:title="height of the glyph">
+<ellipse fill="none" stroke="black" cx="382.234" cy="-208.472" rx="35.2113" ry="26.7407"/>
+<text text-anchor="middle" x="382.234" y="-212.272" font-family="Times,serif" font-size="14.00">height</text>
+<text text-anchor="middle" x="382.234" y="-197.272" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/height -->
+<g id="edge8" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/height</title>
+<path fill="none" stroke="black" d="M476.325,-274.499C457.644,-261.589 434.736,-245.757 416.201,-232.947"/>
+<polygon fill="black" stroke="black" points="417.974,-229.918 407.758,-227.111 413.994,-235.676 417.974,-229.918"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/width -->
+<g id="node10" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/width</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/width" xlink:title="width of the glyph">
+<ellipse fill="none" stroke="black" cx="469.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="469.234" y="-212.272" font-family="Times,serif" font-size="14.00">width</text>
+<text text-anchor="middle" x="469.234" y="-197.272" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/width -->
+<g id="edge9" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/width</title>
+<path fill="none" stroke="black" d="M498.86,-272.359C494.496,-263.095 489.53,-252.554 484.928,-242.785"/>
+<polygon fill="black" stroke="black" points="488.087,-241.278 480.659,-233.723 481.754,-244.261 488.087,-241.278"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/delta -->
+<g id="node11" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/delta</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/delta" xlink:title="extra space always inserted after the current symbol, before the next character">
+<ellipse fill="none" stroke="black" cx="553.234" cy="-208.472" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="553.234" y="-212.272" font-family="Times,serif" font-size="14.00">delta</text>
+<text text-anchor="middle" x="553.234" y="-197.272" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/delta -->
+<g id="edge10" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/delta</title>
+<path fill="none" stroke="black" d="M523.608,-272.359C527.972,-263.095 532.938,-252.554 537.54,-242.785"/>
+<polygon fill="black" stroke="black" points="540.714,-244.261 541.809,-233.723 534.381,-241.278 540.714,-244.261"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects -->
+<g id="node12" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects" xlink:title="objects that make up the symbol; IDs are per symbol local IDs counted from 0">
+<ellipse fill="none" stroke="black" cx="651.234" cy="-208.472" rx="46.8387" ry="27.6545"/>
+<text text-anchor="middle" x="651.234" y="-212.772" font-family="Times,serif" font-size="14.00">li:objects</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects -->
+<g id="edge11" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects</title>
+<path fill="none" stroke="black" d="M548.384,-274.968C567.86,-262.566 591.723,-247.369 611.56,-234.737"/>
+<polygon fill="black" stroke="black" points="613.519,-237.639 620.074,-229.315 609.759,-231.734 613.519,-237.639"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID -->
+<g id="node13" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID" xlink:title="round cap line, simplified">
+<ellipse fill="none" stroke="black" cx="243.234" cy="-117.317" rx="50.41" ry="27.6545"/>
+<text text-anchor="middle" x="243.234" y="-121.617" font-family="Times,serif" font-size="14.00">ha:line.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID -->
+<g id="edge12" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID</title>
+<path fill="none" stroke="black" d="M617.169,-189.54C610.06,-186.303 602.512,-183.222 595.234,-180.894 495.216,-148.908 373.663,-131.869 302.72,-123.991"/>
+<polygon fill="black" stroke="black" points="302.948,-120.495 292.628,-122.894 302.192,-127.454 302.948,-120.495"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID -->
+<g id="node19" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID</title>
+<g id="a_node19"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID" xlink:title="round cap arc, simplified ">
+<ellipse fill="none" stroke="black" cx="651.234" cy="-117.317" rx="73.5782" ry="27.6545"/>
+<text text-anchor="middle" x="651.234" y="-121.617" font-family="Times,serif" font-size="14.00">ha:simplearc.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID -->
+<g id="edge18" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID</title>
+<path fill="none" stroke="black" d="M651.234,-180.722C651.234,-172.7 651.234,-163.756 651.234,-155.201"/>
+<polygon fill="black" stroke="black" points="654.734,-155.048 651.234,-145.048 647.734,-155.048 654.734,-155.048"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID -->
+<g id="node26" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID</title>
+<g id="a_node26"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID" xlink:title="round cap arc, simplified; contains a flat list of coords; each coord pair is an x;y corner of the outline of the polygon (odd indices are x coords, even indices are y coords) ">
+<ellipse fill="none" stroke="black" cx="818.234" cy="-117.317" rx="75.8212" ry="27.6545"/>
+<text text-anchor="middle" x="818.234" y="-121.617" font-family="Times,serif" font-size="14.00">li:simplepoly.ID</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID -->
+<g id="edge25" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID</title>
+<path fill="none" stroke="black" d="M685.029,-189.43C708.834,-176.722 741.112,-159.489 767.933,-145.171"/>
+<polygon fill="black" stroke="black" points="769.626,-148.235 776.799,-140.438 766.329,-142.06 769.626,-148.235"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1 -->
+<g id="node14" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1" xlink:title="line first endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="33.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="33.234" y="-30.6701" font-family="Times,serif" font-size="14.00">x1</text>
+<text text-anchor="middle" x="33.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1 -->
+<g id="edge13" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1</title>
+<path fill="none" stroke="black" d="M200.159,-102.864C165.637,-91.4716 116.346,-73.8186 75.234,-53.7401 72.6369,-52.4717 69.9946,-51.0881 67.3641,-49.6417"/>
+<polygon fill="black" stroke="black" points="68.9605,-46.5221 58.5492,-44.5584 65.4636,-52.5861 68.9605,-46.5221"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1 -->
+<g id="node15" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1</title>
+<g id="a_node15"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1" xlink:title="line first endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="117.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="117.234" y="-30.6701" font-family="Times,serif" font-size="14.00">y1</text>
+<text text-anchor="middle" x="117.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1 -->
+<g id="edge14" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1</title>
+<path fill="none" stroke="black" d="M213.054,-95.132C194.155,-81.8655 169.789,-64.7615 150.357,-51.1214"/>
+<polygon fill="black" stroke="black" points="152.284,-48.1979 142.089,-45.3172 148.263,-53.9273 152.284,-48.1979"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2 -->
+<g id="node16" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2</title>
+<g id="a_node16"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2" xlink:title="line second endpoint, horizontal offset ">
+<ellipse fill="none" stroke="black" cx="201.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="201.234" y="-30.6701" font-family="Times,serif" font-size="14.00">x2</text>
+<text text-anchor="middle" x="201.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2 -->
+<g id="edge15" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2</title>
+<path fill="none" stroke="black" d="M230.86,-90.2586C226.577,-81.2393 221.715,-70.9999 217.185,-61.4619"/>
+<polygon fill="black" stroke="black" points="220.252,-59.7608 212.801,-52.2288 213.929,-62.7635 220.252,-59.7608"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2 -->
+<g id="node17" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2</title>
+<g id="a_node17"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2" xlink:title="line second endpoint, vertical offset ">
+<ellipse fill="none" stroke="black" cx="285.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="285.234" y="-30.6701" font-family="Times,serif" font-size="14.00">y2</text>
+<text text-anchor="middle" x="285.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2 -->
+<g id="edge16" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2</title>
+<path fill="none" stroke="black" d="M255.608,-90.2586C259.891,-81.2393 264.753,-70.9999 269.283,-61.4619"/>
+<polygon fill="black" stroke="black" points="272.539,-62.7635 273.667,-52.2288 266.216,-59.7608 272.539,-62.7635"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness -->
+<g id="node18" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness</title>
+<g id="a_node18"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness" xlink:title="width of the line ">
+<ellipse fill="none" stroke="black" cx="384.234" cy="-26.8701" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="384.234" y="-30.6701" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="384.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness -->
+<g id="edge17" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M275.582,-96.0257C296.02,-83.2057 322.578,-66.5459 344.321,-52.9066"/>
+<polygon fill="black" stroke="black" points="346.394,-55.738 353.006,-47.4591 342.675,-49.8081 346.394,-55.738"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x -->
+<g id="node20" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x</title>
+<g id="a_node20"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x" xlink:title="center, X coord">
+<ellipse fill="none" stroke="black" cx="483.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="483.234" y="-30.6701" font-family="Times,serif" font-size="14.00">x</text>
+<text text-anchor="middle" x="483.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x -->
+<g id="edge19" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x</title>
+<path fill="none" stroke="black" d="M606.405,-95.2816C582.107,-83.5738 551.717,-68.4328 525.234,-53.7401 522.707,-52.3379 520.116,-50.8558 517.522,-49.3392"/>
+<polygon fill="black" stroke="black" points="519.159,-46.2406 508.78,-44.1161 515.569,-52.2498 519.159,-46.2406"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y -->
+<g id="node21" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y</title>
+<g id="a_node21"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y" xlink:title="center, Y coord">
+<ellipse fill="none" stroke="black" cx="567.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="567.234" y="-30.6701" font-family="Times,serif" font-size="14.00">y</text>
+<text text-anchor="middle" x="567.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y -->
+<g id="edge20" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y</title>
+<path fill="none" stroke="black" d="M627.388,-91.2084C616.984,-80.2535 604.739,-67.3607 594.022,-56.0766"/>
+<polygon fill="black" stroke="black" points="596.313,-53.4059 586.889,-48.5651 591.237,-58.2264 596.313,-53.4059"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r -->
+<g id="node22" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r</title>
+<g id="a_node22"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r" xlink:title="radius (of the centerline of the arc) ">
+<ellipse fill="none" stroke="black" cx="651.234" cy="-26.8701" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="651.234" y="-30.6701" font-family="Times,serif" font-size="14.00">r</text>
+<text text-anchor="middle" x="651.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r -->
+<g id="edge21" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r</title>
+<path fill="none" stroke="black" d="M651.234,-89.2996C651.234,-81.2816 651.234,-72.3696 651.234,-63.8767"/>
+<polygon fill="black" stroke="black" points="654.734,-63.8132 651.234,-53.8132 647.734,-63.8133 654.734,-63.8132"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness -->
+<g id="node23" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness</title>
+<g id="a_node23"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness" xlink:title="width of the pen the arc is drawn with ">
+<ellipse fill="none" stroke="black" cx="750.234" cy="-26.8701" rx="47.2526" ry="26.7407"/>
+<text text-anchor="middle" x="750.234" y="-30.6701" font-family="Times,serif" font-size="14.00">thickness</text>
+<text text-anchor="middle" x="750.234" y="-15.6701" font-family="Times,serif" font-size="14.00">coord</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness -->
+<g id="edge22" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness</title>
+<path fill="none" stroke="black" d="M678.811,-91.6798C690.94,-80.8434 705.27,-68.0409 717.899,-56.7583"/>
+<polygon fill="black" stroke="black" points="720.382,-59.2334 725.508,-49.9609 715.718,-54.0133 720.382,-59.2334"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart -->
+<g id="node24" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart</title>
+<g id="a_node24"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart" xlink:title=" start angle">
+<ellipse fill="none" stroke="black" cx="848.234" cy="-26.8701" rx="32.5538" ry="26.7407"/>
+<text text-anchor="middle" x="848.234" y="-30.6701" font-family="Times,serif" font-size="14.00">astart</text>
+<text text-anchor="middle" x="848.234" y="-15.6701" font-family="Times,serif" font-size="14.00">angle</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart -->
+<g id="edge23" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart</title>
+<path fill="none" stroke="black" d="M703.512,-97.7274C734.028,-86.2594 772.951,-70.5584 806.234,-53.7401 808.974,-52.3557 811.77,-50.8518 814.552,-49.289"/>
+<polygon fill="black" stroke="black" points="816.442,-52.2386 823.31,-44.1711 812.91,-46.1949 816.442,-52.2386"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta -->
+<g id="node25" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta</title>
+<g id="a_node25"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta" xlink:title=" delta angle">
+<ellipse fill="none" stroke="black" cx="933.234" cy="-26.8701" rx="34.7971" ry="26.7407"/>
+<text text-anchor="middle" x="933.234" y="-30.6701" font-family="Times,serif" font-size="14.00">adelta</text>
+<text text-anchor="middle" x="933.234" y="-15.6701" font-family="Times,serif" font-size="14.00">angle</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta -->
+<g id="edge24" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;font&#45;v1/children/FONT&#45;ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta</title>
+<path fill="none" stroke="black" d="M704.842,-98.1947C714.261,-95.2251 724.002,-92.2894 733.234,-89.7401 802.24,-70.6855 823.846,-80.527 890.234,-53.7401 893.052,-52.6032 895.9,-51.296 898.717,-49.8859"/>
+<polygon fill="black" stroke="black" points="900.409,-52.9501 907.54,-45.1145 897.079,-46.7928 900.409,-52.9501"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/pcb-rnd-subcircuit-v.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/pcb-rnd-subcircuit-v.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/pcb-rnd-subcircuit-v.svg	(revision 18980)
@@ -0,0 +1,220 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: li:pcb&#45;rnd&#45;subcircuit&#45;v* Pages: 1 -->
+<svg width="448pt" height="985pt"
+ viewBox="0.00 0.00 447.79 984.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 980.597)">
+<title>li:pcb&#45;rnd&#45;subcircuit&#45;v*</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-980.597 443.79,-980.597 443.79,4 -4,4"/>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v* -->
+<g id="node1" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*" xlink:title="footprint file containing a single subcircuit">
+<ellipse fill="none" stroke="black" cx="228.79" cy="-949.02" rx="103.476" ry="27.6545"/>
+<text text-anchor="middle" x="228.79" y="-953.32" font-family="Times,serif" font-size="14.00">li:pcb&#45;rnd&#45;subcircuit&#45;v*</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID -->
+<g id="node2" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID" xlink:title="an instance (full copy) of a subcircuit">
+<ellipse fill="none" stroke="black" cx="228.79" cy="-847.259" rx="53.9813" ry="38.3684"/>
+<text text-anchor="middle" x="228.79" y="-859.059" font-family="Times,serif" font-size="14.00">ha:subc.ID</text>
+<text text-anchor="middle" x="228.79" y="-828.059" font-family="Times,serif" font-size="14.00">&gt;=3</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID</title>
+<path fill="none" stroke="black" d="M228.79,-921.286C228.79,-913.404 228.79,-904.532 228.79,-895.758"/>
+<polygon fill="black" stroke="black" points="232.29,-895.568 228.79,-885.568 225.29,-895.568 232.29,-895.568"/>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid -->
+<g id="node3" class="node"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/uid" xlink:title="UID assigned by the user to track subc history ">
+<ellipse fill="none" stroke="black" cx="53.7904" cy="-745.498" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="53.7904" y="-749.298" font-family="Times,serif" font-size="14.00">uid</text>
+<text text-anchor="middle" x="53.7904" y="-734.298" font-family="Times,serif" font-size="14.00">minuid</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/uid</title>
+<path fill="none" stroke="black" d="M187.318,-822.617C158.498,-806.188 120.364,-784.449 92.2293,-768.411"/>
+<polygon fill="black" stroke="black" points="93.8915,-765.329 83.4705,-763.418 90.4247,-771.411 93.8915,-765.329"/>
+</g>
+<!-- dup17_/lht_tree_doc/comm/attributes -->
+<g id="node4" class="node"><title>dup17_/lht_tree_doc/comm/attributes</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes" xlink:title=" a hash of attribute key=value pairs ">
+<ellipse fill="none" stroke="black" cx="169.79" cy="-745.498" rx="58.8803" ry="27.6545"/>
+<text text-anchor="middle" x="169.79" y="-749.798" font-family="Times,serif" font-size="14.00">ha:attributes</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup17_/lht_tree_doc/comm/attributes -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup17_/lht_tree_doc/comm/attributes</title>
+<path fill="none" stroke="black" d="M208.321,-811.647C202.46,-801.738 196.073,-790.938 190.215,-781.033"/>
+<polygon fill="black" stroke="black" points="193.117,-779.064 185.014,-772.239 187.092,-782.628 193.117,-779.064"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit -->
+<g id="node6" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit" xlink:title="flag bits of a subcircuit">
+<ellipse fill="none" stroke="black" cx="287.79" cy="-745.498" rx="41.9398" ry="27.6545"/>
+<text text-anchor="middle" x="287.79" y="-749.798" font-family="Times,serif" font-size="14.00">ha:flags</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit</title>
+<path fill="none" stroke="black" d="M249.26,-811.647C255.223,-801.565 261.73,-790.562 267.671,-780.517"/>
+<polygon fill="black" stroke="black" points="270.858,-782.004 272.936,-771.615 264.833,-778.44 270.858,-782.004"/>
+</g>
+<!-- dup19_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data -->
+<g id="node15" class="node"><title>dup19_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data</title>
+<g id="a_node15"><a xlink:href="data.svg" xlink:title="data &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="375.79" y="-757.798" font-family="Times,serif" font-size="14.00">data &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup19_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data -->
+<g id="edge21" class="edge"><title>/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID&#45;&gt;dup19_/lht_tree_doc/roots/pcb&#45;rnd&#45;subcircuit&#45;v*/children/subc.ID/children/data</title>
+<path fill="none" stroke="black" d="M267.708,-820.855C288.857,-806.928 315.396,-789.252 338.79,-773.075 338.969,-772.952 339.149,-772.827 339.328,-772.703"/>
+<polygon fill="black" stroke="black" points="341.402,-775.523 347.583,-766.918 337.385,-769.791 341.402,-775.523"/>
+</g>
+<!-- dup17_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="node5" class="node"><title>dup17_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/comm/attributes/children/attrib-key" xlink:title="attribute value">
+<ellipse fill="none" stroke="black" cx="48.7904" cy="-655.051" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="48.7904" y="-658.851" font-family="Times,serif" font-size="14.00">attrib&#45;key</text>
+<text text-anchor="middle" x="48.7904" y="-643.851" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- dup17_/lht_tree_doc/comm/attributes&#45;&gt;dup17_/lht_tree_doc/comm/attributes/children/attrib&#45;key -->
+<g id="edge4" class="edge"><title>dup17_/lht_tree_doc/comm/attributes&#45;&gt;dup17_/lht_tree_doc/comm/attributes/children/attrib&#45;key</title>
+<path fill="none" stroke="black" d="M138.944,-721.95C122.697,-710.075 102.661,-695.429 85.606,-682.962"/>
+<polygon fill="black" stroke="black" points="87.6414,-680.114 77.5028,-677.039 83.5105,-685.766 87.6414,-680.114"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/found -->
+<g id="node7" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/found</title>
+<g id="a_node7"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/found" xlink:title="If set, this object has been found by FindConnection()">
+<ellipse fill="none" stroke="black" cx="149.79" cy="-655.051" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="149.79" y="-658.851" font-family="Times,serif" font-size="14.00">found</text>
+<text text-anchor="middle" x="149.79" y="-643.851" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/found -->
+<g id="edge6" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/found</title>
+<path fill="none" stroke="black" d="M258.524,-725.741C236.872,-711.863 207.3,-692.91 184.462,-678.273"/>
+<polygon fill="black" stroke="black" points="186.065,-675.143 175.757,-672.694 182.288,-681.036 186.065,-675.143"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<g id="node8" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/selected" xlink:title="Set when the object is selected.">
+<ellipse fill="none" stroke="black" cx="179.79" cy="-565.311" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="179.79" y="-569.111" font-family="Times,serif" font-size="14.00">selected</text>
+<text text-anchor="middle" x="179.79" y="-554.111" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<g id="edge7" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected</title>
+<path fill="none" stroke="black" d="M266.362,-721.475C256.37,-710.08 244.74,-695.815 235.79,-681.921 219.126,-656.049 204.157,-624.479 193.896,-600.87"/>
+<polygon fill="black" stroke="black" points="197.082,-599.418 189.931,-591.6 190.646,-602.171 197.082,-599.418"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<g id="node9" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/auto" xlink:title="For lines and vias, indicates that these were created by the autorouter.">
+<ellipse fill="none" stroke="black" cx="231.79" cy="-475.571" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="231.79" y="-479.371" font-family="Times,serif" font-size="14.00">auto</text>
+<text text-anchor="middle" x="231.79" y="-464.371" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<g id="edge9" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto</title>
+<path fill="none" stroke="black" d="M281.756,-718.031C279.246,-706.892 276.331,-693.787 273.79,-681.921 261.07,-622.51 247.076,-553.244 238.881,-512.251"/>
+<polygon fill="black" stroke="black" points="242.268,-511.335 236.878,-502.213 235.403,-512.705 242.268,-511.335"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<g id="node10" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/drc" xlink:title="Set for objects that fail DRC: flag like FOUND flag for DRC checking.">
+<ellipse fill="none" stroke="black" cx="270.79" cy="-385.831" rx="27" ry="26.7407"/>
+<text text-anchor="middle" x="270.79" y="-389.631" font-family="Times,serif" font-size="14.00">drc</text>
+<text text-anchor="middle" x="270.79" y="-374.631" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<g id="edge11" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc</title>
+<path fill="none" stroke="black" d="M286.526,-717.907C283.526,-654.771 275.967,-495.738 272.534,-423.522"/>
+<polygon fill="black" stroke="black" points="276.01,-422.934 272.04,-413.111 269.018,-423.266 276.01,-422.934"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<g id="node11" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/lock" xlink:title="Set for locked objects.">
+<ellipse fill="none" stroke="black" cx="307.79" cy="-296.09" rx="28.0702" ry="26.7407"/>
+<text text-anchor="middle" x="307.79" y="-299.89" font-family="Times,serif" font-size="14.00">lock</text>
+<text text-anchor="middle" x="307.79" y="-284.89" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<g id="edge13" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock</title>
+<path fill="none" stroke="black" d="M296.989,-718.305C308.235,-683.887 325.79,-621.349 325.79,-566.311 325.79,-566.311 325.79,-566.311 325.79,-474.571 325.79,-425.241 318.822,-368.592 313.557,-332.827"/>
+<polygon fill="black" stroke="black" points="317.008,-332.239 312.056,-322.873 310.087,-333.283 317.008,-332.239"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<g id="node12" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/nonetlist" xlink:title="subcircuit is not on the netlist and should not interfere with the netlist ">
+<ellipse fill="none" stroke="black" cx="328.79" cy="-206.35" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="328.79" y="-210.15" font-family="Times,serif" font-size="14.00">nonetlist</text>
+<text text-anchor="middle" x="328.79" y="-195.15" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<g id="edge15" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist</title>
+<path fill="none" stroke="black" d="M305.609,-720.23C328.072,-687.175 363.79,-625.334 363.79,-566.311 363.79,-566.311 363.79,-566.311 363.79,-384.831 363.79,-334.808 350.242,-278.328 340.004,-242.79"/>
+<polygon fill="black" stroke="black" points="343.273,-241.503 337.085,-232.904 336.56,-243.486 343.273,-241.503"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<g id="node13" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/termname" xlink:title="when set the names of pins are shown.">
+<ellipse fill="none" stroke="black" cx="360.79" cy="-116.61" rx="50.8235" ry="26.7407"/>
+<text text-anchor="middle" x="360.79" y="-120.41" font-family="Times,serif" font-size="14.00">termname</text>
+<text text-anchor="middle" x="360.79" y="-105.41" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<g id="edge17" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname</title>
+<path fill="none" stroke="black" d="M314.132,-724.055C327.368,-712.746 342.869,-697.79 353.79,-681.921 385.331,-636.091 401.79,-621.946 401.79,-566.311 401.79,-566.311 401.79,-566.311 401.79,-295.09 401.79,-243.019 395.787,-229.904 382.79,-179.48 380.516,-170.657 377.518,-161.313 374.469,-152.633"/>
+<polygon fill="black" stroke="black" points="377.74,-151.387 371.041,-143.178 371.159,-153.773 377.74,-151.387"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+<g id="node14" class="node"><title>dup18_/lht_tree_doc/comm/flags_subcircuit/children/floater</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/comm/flags_subcircuit/children/floater" xlink:title="subc part can be moved after subc placing">
+<ellipse fill="none" stroke="black" cx="399.79" cy="-26.8701" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="399.79" y="-30.6701" font-family="Times,serif" font-size="14.00">floater</text>
+<text text-anchor="middle" x="399.79" y="-15.6701" font-family="Times,serif" font-size="14.00">flag</text>
+</a>
+</g>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+<g id="edge19" class="edge"><title>dup18_/lht_tree_doc/comm/flags_subcircuit&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/floater</title>
+<path fill="none" stroke="black" d="M318.806,-727.004C343.272,-712.755 374.869,-693.211 384.79,-681.921 422.35,-639.179 439.79,-623.211 439.79,-566.311 439.79,-566.311 439.79,-566.311 439.79,-205.35 439.79,-154.898 424.218,-98.3092 412.505,-62.8836"/>
+<polygon fill="black" stroke="black" points="415.693,-61.3851 409.169,-53.0377 409.064,-63.632 415.693,-61.3851"/>
+</g>
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/found&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/selected&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/auto&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/drc&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/lock&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/nonetlist&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname -->
+<!-- dup18_/lht_tree_doc/comm/flags_subcircuit/children/termname&#45;&gt;dup18_/lht_tree_doc/comm/flags_subcircuit/children/floater -->
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/render/common.awk
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/common.awk	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/common.awk	(revision 18980)
@@ -0,0 +1,69 @@
+function get_name(node, ty, level)
+{
+	if (node "/name" in DATA)
+		nm = DATA[node "/name"]
+	else
+		nm = qstrip(NAME[node])
+	if (ty != "")
+		nm =  ty ":" nm
+	while(level > 0) {
+		nm = "&nbsp;" nm
+		level--
+	}
+	return nm
+}
+
+function dup_begin(DUPSAV)
+{
+	DUPSAV[1] = dupd_prefix
+	if (DUPSAV[1] == "")
+		dupd_prefix = "dup" ++uniq_node_name "_"
+}
+
+function dup_end(DUPSAV)
+{
+	dupd_prefix = DUPSAV[1]
+}
+
+function gen_sub(root, level, parent,   v, n, N, node, dst_children, DUPSAV)
+{
+	if (!(root in NAME)) {
+		print "Error: path not found: " root > "/dev/stderr"
+		return
+	}
+	if (parent == "")
+		parent = root
+	v = children(N, root "/children")
+	for(n = 1; n <= v; n++) {
+		node = N[n]
+		if (TYPE[node] == "symlink") {
+			# normal node symlink: generate a link
+#			print "SY:" node " " DATA[node] "^^^" sy_is_recursive(node) > "/dev/stderr"
+			dup_begin(DUPSAV)
+			if (NAME[node] ~ "@dup") {
+				tbl_entry(DATA[node], level, parent)
+				gen_sub(DATA[node], level+1)
+			}
+			else
+				tbl_entry_link(node, DATA[node], level, parent)
+			dup_end(DUPSAV)
+		}
+		else if ((node "/children") in NAME) {
+			tbl_entry(node, level, parent)
+			if (TYPE[node "/children"] == "symlink") {
+				dup_begin(DUPSAV)
+				dst_children = DATA[node "/children"]
+				sub("/children$", "", dst_children)
+				gen_sub(dst_children, level+1, node)
+				dup_end(DUPSAV)
+			}
+			else {
+				gen_sub(node, level+1)
+			}
+		}
+		else if (TYPE[node] == "hash")
+			tbl_entry(node, level, parent)
+		else
+			print "Unhandled child (unknown type): " node > "/dev/stderr"
+	}
+}
Index: tags/2.0.1/doc/developer/lihata_format/render/dot.awk
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/dot.awk	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/dot.awk	(revision 18980)
@@ -0,0 +1,99 @@
+BEGIN {
+	nl = "\\n"
+}
+
+function tbl_entry(node, level, parent     ,nm,vt,dsc,ty,vr, url, tip,duppar,grp,grp_parent)
+{
+	ty = DATA[node "/type"]
+	nm = get_name(node, ty, 0)
+	vt = DATA[node "/valtype"]
+	vr = DATA[node "/ver"]
+	grp_parent = parent(parent(node))
+	grp = DATA[grp_parent "/dot_group"]
+	dsc = qstrip(DATA[node "/desc"])
+	gsub("\"", "\\\"", dsc)
+	tip=" tooltip=" q dsc q
+	url=" URL=" q "tree.html#" node q
+
+	if (dupd_prefix != "") {
+		node = dupd_prefix node
+		DUPD[node] ++
+
+		if (parent != "") {
+			duppar = dupd_prefix parent
+			if (duppar in DUPD)
+				parent = duppar
+		}
+	}
+
+	print "	" q node q "	[label=" q nm nl vt nl vr q url tip "]" >fn
+	if (parent != "")
+		print "	" q parent q "	->	" q node q > fn
+	if (grp != "") {
+		if (LAST_GRP_SIBL[parent] != "") {
+			print "		" q LAST_GRP_SIBL[parent] q "	->	" q node q  "[style=invis]" > fn
+		}
+		LAST_GRP_SIBL[parent] = node
+	}
+}
+
+function tbl_entry_link(node, dst, level, parent     ,nm,vt,dsc,ty,vr,contid,url,tip,dr)
+{
+	ty = DATA[node "/type"]
+	nm = get_name(node, ty, 0)
+	vt = DATA[node "/valtype"]
+	vr = DATA[node "/ver"]
+	dsc = qstrip(DATA[node "/desc"])
+	gsub("\"", "\\\"", dsc)
+	dr = dst
+	sub("^.*/", "", dr)
+	url=" URL=" q dr ".svg" q
+	tip=" tooltip=" q dsc q
+
+
+	if (dupd_prefix != "") {
+		node = dupd_prefix node
+		DUPD[node] ++
+
+		if (parent != "") {
+			duppar = dupd_prefix parent
+			if (duppar in DUPD)
+				parent = duppar
+		}
+	}
+
+
+	print "	" q node q "	[label=" q nm " ->" nl vt nl vr nl q url tip " shape=plaintext]" >fn
+	if (parent != "")
+		print "	" q parent q "	->	" q node q > fn
+}
+
+function gen_graph(rpath,    v, n, N, name)
+{
+	name = get_name(rpath, DATA[rpath "/type"])
+	fn=name
+	sub(".*[:/]", "", fn)
+	gsub("[*]", "", fn)
+	fn = "../" fn ".dot"
+
+	print "digraph " q name q " {" > fn
+	tbl_entry(rpath, 0)
+	gen_sub(rpath, 1)
+	print "}" > fn
+	close(fn)
+}
+
+function gen_graphs(rpath,    v, n, N, name)
+{
+	v = children(N, rpath)
+	for(n = 1; n <= v; n++) {
+		if (N[n] "/hide" in NAME)
+			continue
+		gen_graph(N[n])
+	}
+}
+
+END {
+	gen_graphs("/lht_tree_doc/roots")
+	gen_graphs("/lht_tree_doc/comm")
+}
Index: tags/2.0.1/doc/developer/lihata_format/render/gen_flags.sh
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/gen_flags.sh	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/gen_flags.sh	(revision 18980)
@@ -0,0 +1,40 @@
+../../../../src/pcb-rnd --dump-oflags | awk '
+BEGIN {
+	print "ha:lht_tree_doc { ha:comm {"
+}
+
+function close_last()
+{
+	if (is_open) {
+		print "		}"
+		print "	}"
+	}
+	is_open = 0;
+}
+
+/^[^\t]/ {
+	close_last()
+	print "	ha:flags_" $1 " {"
+	print "		hide=1"
+	print "		name=flags"
+	print "		dot_group=1"
+	print "		desc={flag bits of a " $1 "}"
+	print "		type=ha"
+	print "		li:children {"
+	is_open=1
+}
+
+/^[\t]/ {
+	bit=$1
+	name=$2
+	help=$0
+	sub("^[\t ]*" $1 "[\t ]*" $2 "[\t ]*", "", help)
+	print "			ha:" name " { valtype=flag; desc={" help "}}"
+}
+
+END {
+	close_last()
+	print "} }"
+}
+
+'

Property changes on: tags/2.0.1/doc/developer/lihata_format/render/gen_flags.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/developer/lihata_format/render/html.awk
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/html.awk	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/html.awk	(revision 18980)
@@ -0,0 +1,115 @@
+BEGIN {
+	print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+	print "<html>"
+	print "<head>"
+	print "<title> pcb-rnd developer manual - lihata file formats</title>"
+	print "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=us-ascii\">"
+	print "</head>"
+	print "<body>"
+}
+
+function tbl_hdr(node, level)
+{
+	print "<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description"
+}
+
+function get_valtype(node,    vt)
+{
+	vt = DATA[node "/valtype"]
+	if (vt != "")
+		vt = "<a href=" q "#valtype:" vt q ">" vt "</a>"
+	else
+		vt = "&nbsp;"
+	return vt
+}
+
+function tbl_entry(node, level, parent     ,nm,vt,dsc,ty,vr)
+{
+	if (!(node in NAME)) {
+		print "Error: path not found: " node > "/dev/stderr"
+		return
+	}
+	ty = DATA[node "/type"]
+	nm = get_name(node, ty, level)
+	vt = get_valtype(node)
+	vr = DATA[node "/ver"]
+	if (vr == "") vr = "&nbsp;"
+	dsc = qstrip(DATA[node "/desc"])
+	print "<tr id=" q node q "><td> " nm " <td> " vt " <td> " vr " <td> " dsc
+}
+
+function tbl_entry_link(node, dst, level, parent     ,nm,vt,dsc,ty,vr)
+{
+	if (!(node in NAME)) {
+		print "Error: path not found: " node > "/dev/stderr"
+		return
+	}
+	if (!(dst in NAME)) {
+		print "Error: path not found: " dst > "/dev/stderr"
+		return
+	}
+
+	ty = DATA[dst "/type"]
+	nm = get_name(node, ty, level)
+	vt = get_valtype(dst)
+	vr = DATA[dst "/ver"]
+	if (vr == "") vr = "&nbsp;"
+	dsc = qstrip(DATA[dst "/desc"])
+	print "<tr id=" q node q "><td> " nm " <td> " vt " <td> " vr " <td> <a href=" q sy_href(dst) q ">" dsc " -&gt; </a>"
+}
+
+function gen_main(path,    v, n, N)
+{
+	print "<h3 id=" q path q ">"  DATA[path "/type"] ":" NAME[path] "</h3>"
+#	print "<p>"
+#	print qstrip(DATA[path "/desc"])
+	print "<p>"
+	print "<table border=0 cellspacing=0>"
+	tbl_hdr()
+	tbl_entry(path, 0)
+	gen_sub(path, 1)
+	print "</table>"
+}
+
+function gen_roots(rpath,    v, n, N)
+{
+	v = children(N, rpath)
+	for(n = 1; n <= v; n++) {
+		if (N[n] "/hide" in NAME)
+			continue
+		gen_main(N[n])
+	}
+}
+
+function gen_types(path,    v, n, N, node)
+{
+	print "<table border=1 width=700>"
+	print "<tr><th> type <th> description"
+
+	v = children(N, path)
+	for(n = 1; n <= v; n++) {
+		node = N[n]
+		print "<tr id=" q "valtype:" NAME[node] q ">"
+		print "	<td>" NAME[node]
+		print "	<td>" qstripnl(DATA[node])
+	}
+	print "</table>"
+}
+
+
+END {
+	print "<h2> File format root nodes </h2>"
+	print "<p>Each table below describes the full tree of one of the pcb-rnd file formats, from the root."
+	gen_roots("/lht_tree_doc/roots")
+
+	print "<h2> Common subtrees </h2>"
+	print "<p>Each table below describes a subtree that usually does not specify a whole tree (thus they are usually not a valid file on their own). These subtrees are described in a separate table because they are used from multiple other trees."
+	gen_roots("/lht_tree_doc/comm")
+
+	print "<h2 id=\"types\"> Types </h2>"
+	print "<p>"
+	gen_types("/lht_tree_doc/types")
+
+	print "</body>"
+	print "</html>"
+}
Index: tags/2.0.1/doc/developer/lihata_format/render/lht.awk
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/lht.awk	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/lht.awk	(revision 18980)
@@ -0,0 +1,62 @@
+BEGIN {
+	q="\""
+}
+
+function parent(path)
+{
+	sub("/[^/]*$", "", path)
+	return path
+}
+
+function children(DST, path)
+{
+	return split(CHILDREN[path], DST, "[|]")
+}
+
+function sy_is_recursive(path,  dp)
+{
+	dp = DATA[path]
+	gsub("/[0-9]::", "/", path)
+	if (path ~ dp)
+		rturn 1
+	return 0
+}
+
+function sy_href(path)
+{
+	return "#" path
+}
+
+(($1 == "open") || ($1 == "data")) {
+	path=$3
+	gsub("[0-9]+::", "", path)
+	TYPE[path] = $2
+	p = parent(path)
+	if (CHILDREN[p] == "")
+		CHILDREN[p] = path
+	else
+		CHILDREN[p] = CHILDREN[p] "|" path
+	data=$4
+	gsub("\\\\057", "/", data)
+	DATA[path] = data
+	
+	name=$3
+	sub("^.*/", "", name)
+	sub(".*::", "", name)
+	NAME[path] = name
+}
+
+function qstrip(s)
+{
+	gsub("[\\\\]+164", " ", s)
+	gsub("[\\\\]n", " ", s)
+	return s
+}
+
+function qstripnl(s)
+{
+	gsub("[\\\\]+164", " ", s)
+	gsub("[\\\\]n", "\n", s)
+	return s
+}
+
Index: tags/2.0.1/doc/developer/lihata_format/render/render.sh
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/render/render.sh	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/render/render.sh	(revision 18980)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for n in ../*.lht
+do
+	lhtflat < $n
+done | tee Flat | awk -F "[\t]" -f lht.awk -f common.awk -f $1.awk

Property changes on: tags/2.0.1/doc/developer/lihata_format/render/render.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/developer/lihata_format/root_board.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_board.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_board.lht	(revision 18980)
@@ -0,0 +1,182 @@
+ha:lht_tree_doc { ha:roots {
+
+	ha:pcb-rnd-board-v* {
+		type=ha
+		desc {
+			The full, self-contained description of a printed circuit board.
+			This is the root of a board .lht file. The * after the v in the name
+			is an integer which is the format version.
+		}
+		li:children {
+			ha:meta {
+				type=ha
+				desc { Any meta-data that won't directly turn into physical material (e.g. copper). }
+				li:children {
+					ha:board_name { valtype=string; desc={User assigned name of the board}}
+					ha:grid {
+						type=ha
+						desc { User interface last grid settings }
+						li:children {
+							ha:offs_x { valtype=coord; desc={grid origin: X offset from 0;0}}
+							ha:offs_y { valtype=coord; desc={grid origin: Y offset from 0;0}}
+							ha:spacing { valtype=coord; desc={distance between two grid points both in X and Y directions }}
+						}
+					}
+					ha:size {
+						type=ha
+						desc { object size related settings }
+						li:children {
+							ha:x { valtype=coord; desc={drawing area size X (width)}}
+							ha:y { valtype=coord; desc={drawing area size Y (height)}}
+							ha:isle_area_nm2 { valtype=double; desc={remove polygon islands smaller than this value, specified in nm<sup>2</sup>}}
+							ha:thermal_scale { valtype=double; desc={scale all thermals on the board by this factor}}
+						}
+					}
+					ha:drc {
+						type=ha
+						desc { design rule checker settings for the old DRC }
+						ver {<5}
+						li:children {
+							ha:bloat { valtype=coord; desc={Minimum copper spacing}}
+							ha:shrink { valtype=coord; desc={Minimum overlap between validly touching copper objects}}
+							ha:min_width { valtype=coord; desc={Minimum copper width}}
+							ha:min_silk { valtype=coord; desc={Minimum silk width}}
+							ha:min_drill { valtype=coord; desc={Minimum drill diameter}}
+							ha:min_ring { valtype=coord; desc={Minimum annular ring width}}
+						}
+					}
+					ha:cursor {
+						type=ha
+						desc { obsolete cursor/view state }
+						li:children {
+							ha:x { valtype=coord; obs=1; desc={last position, X (horizontal)}}
+							ha:y { valtype=coord; obs=1; desc={last position, Y (horizontal)}}
+							ha:zoom { valtype=double; obs=1; desc={last view zoom factor}}
+						}
+					}
+				}
+			}
+			ha:layer_stack {
+				type=ha
+				desc { physical layer stack information: geometry and properties of physical layers }
+				li:children {
+					ha:groups {
+						type=li
+						desc { ordered list of physical layers from top to bottom }
+						li:children {
+							ha:INTEGER {
+								li:name_patterns={p={[0-9]+}}
+								type=ha
+								desc { a layer group (a physical layer of the board); the ID of the layer group is the integer in the name of the node }
+								li:children {
+									ha:name { valtype=string; desc={user assigned name of the layer group, e.g. "top copper"}}
+									ha:type {
+										type=ha
+										desc { a flag-list of layer type flag bits }
+										sy:children = {/lht_tree_doc/comm/layer_mask/children}
+									}
+									ha:layers {
+										type=li
+										desc { ordered list of logical layer IDs hosted by this layer group }
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			ha:font {
+				type=ha
+				desc { font kit: all fonts used on the board (if no font specified, default font will be used) }
+				li:children {
+					sy:FONT-ID {/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID}
+				}
+			}
+			ha:styles {
+				type=ha
+				desc { routing styles hash: collection of all available routing syles }
+				ha:ROUTE-STYLE-NAME {
+					type=ha
+					desc { routing style: a collection of pen settings }
+					li:children {
+						ha:thickness   { valtype=coord; desc={default trace thickness (affects lines and arcs)}}
+						ha:clearance   { valtype=coord; desc={default clearance (affects lines, arcs and polygons)}}
+						ha:diameter    { valtype=coord; ver={<=5} desc={old round via outer diameter; removed in favor of padstack prototype based vias, see via_proto}}
+						ha:hole        { valtype=coord; ver={<=5} desc={old round via hole diameter; removed in favor of padstack prototype based vias, see via_proto}}
+						ha:via_proto   { valtype=integer; ver={>5} desc={padstack prototype ID used for placing new vias}}
+						sy:attr@dup    {/lht_tree_doc/comm/attributes}
+					}
+				}
+			}
+			ha:netlists {
+				type=ha
+				desc { all available netlists }
+				li:children {
+					ha:netlist {
+						type=li
+						desc { the input netlist (as seen in the last netlist import, a.k.a. forward annotation) }
+						li:children {
+							ha:NETNAME {
+								type=ha
+								desc { a network }
+								li:children {
+									ha:conn {
+										type=li
+										desc { list of terminals connected to the network }
+										li:children {
+											ha:diameter    { valtype=string; desc={refdes-terminal}}
+										}
+									}
+									sy:attr@dup   = {/lht_tree_doc/comm/attributes_v5p}
+								}
+							}
+						}
+					}
+					ha:netlist_patch {
+						type=li
+						desc { a list of intentional deviations from the input netlist, a.k.a. material for back annotation }
+						li:children {
+							ha:net_info {
+								type=li
+								desc { describe the current state of a net, as seen on the input }
+								li:children {
+									ha:net   { valtype=string; desc={net name; first item on the list, only once}}
+									ha:term  { valtype=string; desc={terminal name; zero or more items starting from the second item}}
+								}
+							}
+							ha:add_conn {
+								type=ha
+								desc { the 'as built' network requires a new connection to be created during the back annotation }
+								li:children {
+									ha:net   { valtype=string; desc={net name the terminal should be added to}}
+									ha:term  { valtype=string; desc={terminal name}}
+								}
+							}
+							ha:del_conn {
+								type=ha
+								desc { the 'as built' network requires an existing connection to be removed during the back annotation }
+								li:children {
+									ha:net   { valtype=string; desc={net name the terminal should be removed from}}
+									ha:term  { valtype=string; desc={terminal name}}
+								}
+							}
+							ha:change_attrib {
+								type=ha
+								desc { the 'as built' network requires an attribute to be set or changed }
+								li:children {
+									ha:net   { valtype=string; desc={net name whose attribute needs to be changed }}
+									ha:key   { valtype=string; desc={key (name) of the attribute}}
+									ha:val   { valtype=string; desc={new value of the attribute}}
+								}
+							}
+						}
+					}
+				}
+			}
+			sy:conf = {/lht_tree_doc/roots/pcb-rnd-conf-v1}
+			sy:data = {/lht_tree_doc/comm/data}
+			sy:attributes@dup = {/lht_tree_doc/comm/attributes}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/root_conf.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_conf.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_conf.lht	(revision 18980)
@@ -0,0 +1,22 @@
+ha:lht_tree_doc { ha:roots {
+
+	ha:pcb-rnd-conf-v1 {
+		type=li
+		desc=complete pcb-rnd configuration tree
+		li:children {
+			ha:overwrite {
+				type=ha
+				desc={overwrite values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>}
+			}
+			ha:prepend {
+				type=ha
+				desc={prepend values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>}
+			}
+			ha:append {
+				type=ha
+				desc={append values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>}
+			}
+		}
+	}
+
+}}
Index: tags/2.0.1/doc/developer/lihata_format/root_font.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_font.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_font.lht	(revision 18980)
@@ -0,0 +1,69 @@
+ha:lht_tree_doc { ha:roots {
+
+	ha:pcb-rnd-font-v1 {
+		type=li
+		desc={font description}
+		li:children {
+			ha:FONT-ID {
+				type=ha
+				li:name_patterns={p={geda_pcb}; p={[0-9]+}}
+				desc { the full description of a font; the node name is the integer font id or "geda_pcb" for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below }
+				li:children {
+					ha:cell_height { valtype=coord; desc={height of the tallest glyph}}
+					ha:cell_width { valtype=coord; desc={width of the widest glyph}}
+					ha:id { valtype=integer; desc={unique font ID within the fontkit; fonts are referenced by ID}}
+					ha:name { valtype=string; desc={user specified, user readable font name}}
+					ha:symbols {
+						type=ha
+						desc { a collections of glyphs availbale in the font }
+						li:children {
+							ha:CHARACTER {
+								type=ha
+								li:name_patterns={p={.}}
+								desc { Description of a glyph (symbol). Node name is a signel ASCII character or is of format &xx where xx is a hex digit of the ASCII code of the character. Characters that must use the hex version are: codes below 33 or over 126, &, #, {, \}, /, :, ;, =, \\, :}
+								li:children {
+									ha:height { valtype=coord; desc={height of the glyph}}
+									ha:width { valtype=coord; desc={width of the glyph}}
+									ha:delta { valtype=coord; desc={extra space always inserted after the current symbol, before the next character}}
+									ha:objects {
+										type=li
+										desc={objects that make up the symbol; IDs are per symbol local IDs counted from 0}
+										li:children {
+											ha:line.ID {
+												type=ha
+												desc={round cap line, simplified}
+												li:children {
+													ha:x1        = { valtype=coord;   desc={line first endpoint, horizontal offset }}
+													ha:y1        = { valtype=coord;   desc={line first endpoint, vertical offset }}
+													ha:x2        = { valtype=coord;   desc={line second endpoint, horizontal offset }}
+													ha:y2        = { valtype=coord;   desc={line second endpoint, vertical offset }}
+													ha:thickness = { valtype=coord;   desc={width of the line }}
+												}
+											}
+											ha:simplearc.ID {
+												type=ha
+												desc={round cap arc, simplified }
+												li:children {
+													ha:x         = { valtype=coord;   desc={center, X coord}}
+													ha:y         = { valtype=coord;   desc={center, Y coord}}
+													ha:r         = { valtype=coord;   desc={radius (of the centerline of the arc) }}
+													ha:thickness = { valtype=coord;   desc={width of the pen the arc is drawn with }}
+													ha:astart    = { valtype=angle;   desc={ start angle}}
+													ha:adelta    = { valtype=angle;   desc={ delta angle}}
+												}
+											}
+											ha:simplepoly.ID {
+												type=li
+												desc={round cap arc, simplified; contains a flat list of coords; each coord pair is an x;y corner of the outline of the polygon (odd indices are x coords, even indices are y coords) }
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}}
\ No newline at end of file
Index: tags/2.0.1/doc/developer/lihata_format/root_menu.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_menu.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_menu.lht	(revision 18980)
@@ -0,0 +1,151 @@
+ha:lht_tree_doc {
+
+ha:roots {
+	ha:menu {
+		type=ha
+		name={}
+		desc={Menu file}
+		li:children {
+			ha:mouse {
+				type=li
+				desc={mouse bindings}
+				li:children {
+					ha:left {
+						type=li
+						desc={actions to execute on left button click}
+						sy:children = {/lht_tree_doc/comm/mouse_actions/children}
+					}
+					ha:middle {
+						type=li
+						desc={actions to execute on middle button click}
+						sy:children = {/lht_tree_doc/comm/mouse_actions/children}
+					}
+					ha:right {
+						type=li
+						desc={actions to execute on right button click}
+						sy:children = {/lht_tree_doc/comm/mouse_actions/children}
+					}
+					ha:scroll-up {
+						type=li
+						desc={actions to execute on scroll wheel scolling up event}
+						sy:children = {/lht_tree_doc/comm/mouse_actions_scroll/children}
+					}
+					ha:scroll-down {
+						type=li
+						desc={actions to execute on scroll wheel scolling down event}
+						sy:children = {/lht_tree_doc/comm/mouse_actions_scroll/children}
+					}
+				}
+			}
+			ha:main_menu {
+				type=li
+				desc={root of the main pull-down menu system; ordered list of main menus}
+				li:children {
+					ha:MENUNAME {
+						type=ha
+						desc={main menu name, e.g. "File"}
+						li:children {
+							sy:m@dup = {/lht_tree_doc/comm/submenu/children/m}
+							sy:submenu = {/lht_tree_doc/comm/submenu}
+						}
+					}
+				}
+			}
+			ha:popups {
+				type=li
+				desc={collection of popup menus}
+				li:children {
+					ha:POPUPNAME {
+						type=ha
+						desc={popup menu name, e.g. "layer" for layer context menu}
+						li:children {
+							sy:m@dup = {/lht_tree_doc/comm/submenu/children/m}
+							sy:submenu = {/lht_tree_doc/comm/submenu}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+ha:comm {
+	ha:mouse_actions {
+		hide=1
+		li:children {
+			ha:press         { type=li; desc={actions to execute on mouse button press when no modifier is pressed} }
+			ha:press-shift   { type=li; desc={actions to execute on mouse button press when shift is pressed} }
+			ha:press-ctrl    { type=li; desc={actions to execute on mouse button press when control is pressed} }
+			ha:release       { type=li; desc={actions to execute on mouse button release when no modifier is pressed} }
+			ha:release-shift { type=li; desc={actions to execute on mouse button release when shift is pressed} }
+			ha:release-ctrl  { type=li; desc={actions to execute on mouse button release when control is pressed} }
+		}
+	}
+	ha:mouse_actions_scroll {
+		hide=1
+		li:children {
+			ha:press         { type=li; desc={actions to execute on mouse button press when no modifier is pressed} }
+			ha:press-shift   { type=li; desc={actions to execute on mouse button press when shift is pressed} }
+			ha:press-ctrl    { type=li; desc={actions to execute on mouse button press when control is pressed} }
+		}
+	}
+
+	ha:submenu {
+		type=li
+		desc={ordered list of menu items for a submenu}
+		li:children {
+			ha:m            = {valtype=string; desc={mnemonic: single character that should be underlined and used as a hot key in the menu name}}
+			ha:-            = {valtype=none; desc={horizontal separator}}
+			ha:@ANCHOR      = {valtype=none; desc={an anchor is an invisible placeholder where a dynamically generated set of menu items should be inserted runtime}}
+			ha:SUBSUBMENUNAME  = {
+				type=ha
+				desc={sub-submenu item: opens a new level of submenu when clicked}
+				li:children {
+					sy:m@dup = {/lht_tree_doc/comm/submenu/children/m}
+					sy:submenu = {/lht_tree_doc/comm/submenu}
+				}
+			}
+			ha:LEAFSUBMENUNAME  = {
+				type=ha
+				desc={leaf submenu item: executes an action when clicked}
+				li:children {
+					sy:m@dup = {/lht_tree_doc/comm/submenu/children/m}
+					ha:a1 {
+						type=li
+						name=a
+						desc={list of alternative hotkey sequences to activate the menu}
+					}
+					ha:a2 {
+						valtype=string
+						name=a
+						desc={a single hotkey sequences to activate the menu}
+					}
+					ha:action1 {
+						type=li
+						name=action
+						desc={list of actions to execute when the menu is activated}
+					}
+					ha:action2 {
+						valtype=string
+						name=action
+						desc={a single action to execute when the menu is activated}
+					}
+					ha:tip {
+						valtype=string
+						desc={tooltip text}
+					}
+					ha:checked {
+						valtype=string
+						desc={the menu item has a checkbox; value is the action to execute to determine whether the menu item's checkbox is checked or not}
+					}
+					ha:update_on {
+						valtype=string
+						desc={path of a conf node that triggers re-evaluation of the checkbox state}
+					}
+				}
+			}
+		}
+	}
+}
+}
+
Index: tags/2.0.1/doc/developer/lihata_format/root_project.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_project.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_project.lht	(revision 18980)
@@ -0,0 +1,54 @@
+ha:lht_tree_doc { ha:roots {
+
+	ha:geda-project-v1 {
+		type=ha
+		desc={Project file root. Except for "common", each software package should create a single subtree under the root; the subtree shall be named after the software package }
+		li:children {
+			ha:common {
+				type=ha
+				desc={project settings that should be common to all software packages}
+				li:children {
+					ha:name    { valtype=string; desc={long name of the project }}
+					ha:desc    { valtype=string; desc={description of the project }}
+					ha:url     { valtype=string; desc={homepage of the project }}
+					ha:vcs     { valtype=string; desc={main vcs url for the project }}
+					ha:contact { valtype=string; desc={author/maintainer contact info }}
+					ha:files {
+						type=li
+						desc={ordered list of source files being used by the project}
+						li:children {
+							ha:NAME {
+								type=ha
+								desc={a project member file}
+								li:children {
+									ha:path    { valtype=string; desc={path to the file, relative to the project file }}
+									ha:desc    { valtype=string; desc={description of the file }}
+									ha:type    { valtype=string; desc={optional: type of the file; one of: "pcb", "schematic", "doc" }}
+								}
+							}
+						}
+					}
+					ha:libs {
+						type=li
+						desc={ordered list of libraries the project depends on}
+						li:children {
+							ha:NAME {
+								type=ha
+								desc={a library}
+								li:children {
+									ha:path    { valtype=string; desc={path to the library, relative to the project file; all files and subdirectories under the root, recursively, are considered part of the library (must not be used together with url) }}
+									ha:url     { valtype=string; desc={url to the library (must not be used together with path) }}
+									ha:desc    { valtype=string; desc={description of the library }}
+									ha:type    { valtype=string; desc={optional: type of the library; one of: "footprint" (for pcb design), "symbol" (for schematic), "sim" (models and subcircuits for e.g. spice simulation) }}
+								}
+							}
+						}
+					}
+				}
+			}
+			sy:pcb-rnd-conf-v1 = {/lht_tree_doc/roots/pcb-rnd-conf-v1}
+		}
+	}
+
+}}
+
Index: tags/2.0.1/doc/developer/lihata_format/root_subc.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/root_subc.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/root_subc.lht	(revision 18980)
@@ -0,0 +1,20 @@
+ha:lht_tree_doc { ha:roots {
+
+	ha:pcb-rnd-subcircuit-v* {
+		type=li
+		desc={footprint file containing a single subcircuit}
+		li:children {
+			ha:subc.ID {
+				type=ha
+				desc={an instance (full copy) of a subcircuit}
+				ver = {>=3}
+				li:children {
+					ha:uid        = { valtype=minuid;   desc={UID assigned by the user to track subc history }}
+					sy:attr@dup   = {/lht_tree_doc/comm/attributes}
+					sy:flags@dup  = {/lht_tree_doc/comm/flags_subcircuit}
+					sy:data       = {/lht_tree_doc/comm/data}
+				}
+			}
+		}
+	}
+}}
\ No newline at end of file
Index: tags/2.0.1/doc/developer/lihata_format/submenu.svg
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/submenu.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/submenu.svg	(revision 18980)
@@ -0,0 +1,225 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: li:submenu Pages: 1 -->
+<svg width="1214pt" height="245pt"
+ viewBox="0.00 0.00 1213.85 245.46" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 241.463)">
+<title>li:submenu</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-241.463 1209.85,-241.463 1209.85,4 -4,4"/>
+<!-- /lht_tree_doc/comm/submenu -->
+<g id="node1" class="node"><title>/lht_tree_doc/comm/submenu</title>
+<g id="a_node1"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu" xlink:title="ordered list of menu items for a submenu">
+<ellipse fill="none" stroke="black" cx="224.234" cy="-209.886" rx="54.3945" ry="27.6545"/>
+<text text-anchor="middle" x="224.234" y="-214.186" font-family="Times,serif" font-size="14.00">li:submenu</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/m -->
+<g id="node2" class="node"><title>/lht_tree_doc/comm/submenu/children/m</title>
+<g id="a_node2"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/m" xlink:title="mnemonic: single character that should be underlined and used as a hot key in the menu name">
+<ellipse fill="none" stroke="black" cx="33.234" cy="-118.731" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="33.234" y="-122.531" font-family="Times,serif" font-size="14.00">m</text>
+<text text-anchor="middle" x="33.234" y="-107.531" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/m -->
+<g id="edge1" class="edge"><title>/lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/m</title>
+<path fill="none" stroke="black" d="M181.338,-192.772C151.358,-181.024 110.686,-164.105 76.234,-146.309 73.349,-144.818 70.3998,-143.204 67.465,-141.532"/>
+<polygon fill="black" stroke="black" points="69.1748,-138.477 58.7834,-136.411 65.6185,-144.506 69.1748,-138.477"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/&#45; -->
+<g id="node3" class="node"><title>/lht_tree_doc/comm/submenu/children/&#45;</title>
+<g id="a_node3"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/-" xlink:title="horizontal separator">
+<ellipse fill="none" stroke="black" cx="115.234" cy="-118.731" rx="30.3115" ry="26.7407"/>
+<text text-anchor="middle" x="115.234" y="-122.531" font-family="Times,serif" font-size="14.00">&#45;</text>
+<text text-anchor="middle" x="115.234" y="-107.531" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/&#45; -->
+<g id="edge2" class="edge"><title>/lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/&#45;</title>
+<path fill="none" stroke="black" d="M196.447,-186.158C180.763,-173.33 161.158,-157.294 145.14,-144.192"/>
+<polygon fill="black" stroke="black" points="147.086,-141.263 137.13,-137.641 142.655,-146.681 147.086,-141.263"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/@ANCHOR -->
+<g id="node4" class="node"><title>/lht_tree_doc/comm/submenu/children/@ANCHOR</title>
+<g id="a_node4"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/@ANCHOR" xlink:title="an anchor is an invisible placeholder where a dynamically generated set of menu items should be inserted runtime">
+<ellipse fill="none" stroke="black" cx="224.234" cy="-118.731" rx="60.623" ry="26.7407"/>
+<text text-anchor="middle" x="224.234" y="-122.531" font-family="Times,serif" font-size="14.00">@ANCHOR</text>
+<text text-anchor="middle" x="224.234" y="-107.531" font-family="Times,serif" font-size="14.00">none</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/@ANCHOR -->
+<g id="edge3" class="edge"><title>/lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/@ANCHOR</title>
+<path fill="none" stroke="black" d="M224.234,-182.137C224.234,-173.879 224.234,-164.644 224.234,-155.862"/>
+<polygon fill="black" stroke="black" points="227.734,-155.848 224.234,-145.848 220.734,-155.848 227.734,-155.848"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME -->
+<g id="node5" class="node"><title>/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME</title>
+<g id="a_node5"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME" xlink:title="sub&#45;submenu item: opens a new level of submenu when clicked">
+<ellipse fill="none" stroke="black" cx="421.234" cy="-118.731" rx="118.174" ry="27.6545"/>
+<text text-anchor="middle" x="421.234" y="-123.031" font-family="Times,serif" font-size="14.00">ha:SUBSUBMENUNAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME -->
+<g id="edge4" class="edge"><title>/lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME</title>
+<path fill="none" stroke="black" d="M264.1,-190.844C291.406,-178.486 328.165,-161.851 359.264,-147.777"/>
+<polygon fill="black" stroke="black" points="361.049,-150.811 368.717,-143.499 358.163,-144.433 361.049,-150.811"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME -->
+<g id="node8" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME</title>
+<g id="a_node8"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME" xlink:title="leaf submenu item: executes an action when clicked">
+<ellipse fill="none" stroke="black" cx="764.234" cy="-118.731" rx="123.073" ry="27.6545"/>
+<text text-anchor="middle" x="764.234" y="-123.031" font-family="Times,serif" font-size="14.00">ha:LEAFSUBMENUNAME</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME -->
+<g id="edge7" class="edge"><title>/lht_tree_doc/comm/submenu&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME</title>
+<path fill="none" stroke="black" d="M275.523,-200.418C362.755,-186.016 541.758,-156.462 657.219,-137.4"/>
+<polygon fill="black" stroke="black" points="657.852,-140.843 667.148,-135.76 656.712,-133.936 657.852,-140.843"/>
+</g>
+<!-- dup51_/lht_tree_doc/comm/submenu/children/m -->
+<g id="node6" class="node"><title>dup51_/lht_tree_doc/comm/submenu/children/m</title>
+<g id="a_node6"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/m" xlink:title="mnemonic: single character that should be underlined and used as a hot key in the menu name">
+<ellipse fill="none" stroke="black" cx="328.234" cy="-27.5772" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="328.234" y="-31.3772" font-family="Times,serif" font-size="14.00">m</text>
+<text text-anchor="middle" x="328.234" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME&#45;&gt;dup51_/lht_tree_doc/comm/submenu/children/m -->
+<g id="edge5" class="edge"><title>/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME&#45;&gt;dup51_/lht_tree_doc/comm/submenu/children/m</title>
+<path fill="none" stroke="black" d="M393.834,-91.4645C382.143,-80.2567 368.502,-67.1799 356.697,-55.8627"/>
+<polygon fill="black" stroke="black" points="358.884,-53.1109 349.243,-48.7172 354.039,-58.164 358.884,-53.1109"/>
+</g>
+<!-- dup52_/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME/children/submenu -->
+<g id="node7" class="node"><title>dup52_/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME/children/submenu</title>
+<g id="a_node7"><a xlink:href="submenu.svg" xlink:title="submenu &#45;&gt;\n\n\n">
+<text text-anchor="middle" x="421.234" y="-39.8772" font-family="Times,serif" font-size="14.00">submenu &#45;&gt;</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME&#45;&gt;dup52_/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME/children/submenu -->
+<g id="edge6" class="edge"><title>/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME&#45;&gt;dup52_/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME/children/submenu</title>
+<path fill="none" stroke="black" d="M421.234,-90.9823C421.234,-82.96 421.234,-74.0155 421.234,-65.4608"/>
+<polygon fill="black" stroke="black" points="424.734,-65.3075 421.234,-55.3075 417.734,-65.3076 424.734,-65.3075"/>
+</g>
+<!-- dup53_/lht_tree_doc/comm/submenu/children/m -->
+<g id="node9" class="node"><title>dup53_/lht_tree_doc/comm/submenu/children/m</title>
+<g id="a_node9"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/m" xlink:title="mnemonic: single character that should be underlined and used as a hot key in the menu name">
+<ellipse fill="none" stroke="black" cx="514.234" cy="-27.5772" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="514.234" y="-31.3772" font-family="Times,serif" font-size="14.00">m</text>
+<text text-anchor="middle" x="514.234" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;dup53_/lht_tree_doc/comm/submenu/children/m -->
+<g id="edge8" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;dup53_/lht_tree_doc/comm/submenu/children/m</title>
+<path fill="none" stroke="black" d="M681.104,-98.2852C642.266,-87.8072 595.942,-73.2794 556.234,-55.1543 553.42,-53.87 550.571,-52.4243 547.752,-50.8876"/>
+<polygon fill="black" stroke="black" points="549.331,-47.7571 538.927,-45.7556 545.812,-53.8083 549.331,-47.7571"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1 -->
+<g id="node10" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1</title>
+<g id="a_node10"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1" xlink:title="list of alternative hotkey sequences to activate the menu">
+<ellipse fill="none" stroke="black" cx="592.234" cy="-27.5772" rx="27" ry="27.6545"/>
+<text text-anchor="middle" x="592.234" y="-31.8772" font-family="Times,serif" font-size="14.00">li:a</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1 -->
+<g id="edge9" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1</title>
+<path fill="none" stroke="black" d="M706.339,-94.2225C681.681,-83.4181 652.961,-69.762 628.234,-55.1543 626.069,-53.8751 623.875,-52.4943 621.695,-51.0582"/>
+<polygon fill="black" stroke="black" points="623.657,-48.1596 613.444,-45.3424 619.671,-53.9139 623.657,-48.1596"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2 -->
+<g id="node11" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2</title>
+<g id="a_node11"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2" xlink:title="a single hotkey sequences to activate the menu">
+<ellipse fill="none" stroke="black" cx="670.234" cy="-27.5772" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="670.234" y="-31.3772" font-family="Times,serif" font-size="14.00">a</text>
+<text text-anchor="middle" x="670.234" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2 -->
+<g id="edge10" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2</title>
+<path fill="none" stroke="black" d="M736.793,-91.7047C724.766,-80.2978 710.659,-66.9186 698.536,-55.4202"/>
+<polygon fill="black" stroke="black" points="700.944,-52.8804 691.28,-48.5383 696.127,-57.9594 700.944,-52.8804"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1 -->
+<g id="node12" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1</title>
+<g id="a_node12"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1" xlink:title="list of actions to execute when the menu is activated">
+<ellipse fill="none" stroke="black" cx="764.234" cy="-27.5772" rx="43.2674" ry="27.6545"/>
+<text text-anchor="middle" x="764.234" y="-31.8772" font-family="Times,serif" font-size="14.00">li:action</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1 -->
+<g id="edge11" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1</title>
+<path fill="none" stroke="black" d="M764.234,-90.9823C764.234,-82.96 764.234,-74.0155 764.234,-65.4608"/>
+<polygon fill="black" stroke="black" points="767.734,-65.3075 764.234,-55.3075 760.734,-65.3076 767.734,-65.3075"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2 -->
+<g id="node13" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2</title>
+<g id="a_node13"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2" xlink:title="a single action to execute when the menu is activated">
+<ellipse fill="none" stroke="black" cx="860.234" cy="-27.5772" rx="35.2113" ry="26.7407"/>
+<text text-anchor="middle" x="860.234" y="-31.3772" font-family="Times,serif" font-size="14.00">action</text>
+<text text-anchor="middle" x="860.234" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2 -->
+<g id="edge12" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2</title>
+<path fill="none" stroke="black" d="M792.259,-91.7047C804.45,-80.383 818.734,-67.1181 831.052,-55.6779"/>
+<polygon fill="black" stroke="black" points="833.487,-58.1939 838.432,-48.8242 828.723,-53.0646 833.487,-58.1939"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip -->
+<g id="node14" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip</title>
+<g id="a_node14"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip" xlink:title="tooltip text">
+<ellipse fill="none" stroke="black" cx="947.234" cy="-27.5772" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="947.234" y="-31.3772" font-family="Times,serif" font-size="14.00">tip</text>
+<text text-anchor="middle" x="947.234" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip -->
+<g id="edge13" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip</title>
+<path fill="none" stroke="black" d="M821.255,-94.293C846.985,-83.197 877.529,-69.2945 904.234,-55.1543 907.104,-53.6348 910.042,-51.9994 912.969,-50.3132"/>
+<polygon fill="black" stroke="black" points="914.825,-53.2818 921.638,-45.168 911.253,-47.2622 914.825,-53.2818"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked -->
+<g id="node15" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked</title>
+<g id="a_node15"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked" xlink:title="the menu item has a checkbox; value is the action to execute to determine whether the menu item&#39;s checkbox is checked or not">
+<ellipse fill="none" stroke="black" cx="1041.23" cy="-27.5772" rx="43.2674" ry="26.7407"/>
+<text text-anchor="middle" x="1041.23" y="-31.3772" font-family="Times,serif" font-size="14.00">checked</text>
+<text text-anchor="middle" x="1041.23" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked -->
+<g id="edge14" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked</title>
+<path fill="none" stroke="black" d="M848.621,-98.5494C891.416,-87.7502 943.811,-72.8703 989.234,-55.1543 992.902,-53.7239 996.653,-52.116 1000.38,-50.4173"/>
+<polygon fill="black" stroke="black" points="1002,-53.5207 1009.52,-46.0575 998.989,-47.2023 1002,-53.5207"/>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on -->
+<g id="node16" class="node"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on</title>
+<g id="a_node16"><a xlink:href="tree.html#/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on" xlink:title="path of a conf node that triggers re&#45;evaluation of the checkbox state">
+<ellipse fill="none" stroke="black" cx="1154.23" cy="-27.5772" rx="51.7379" ry="26.7407"/>
+<text text-anchor="middle" x="1154.23" y="-31.3772" font-family="Times,serif" font-size="14.00">update_on</text>
+<text text-anchor="middle" x="1154.23" y="-16.3772" font-family="Times,serif" font-size="14.00">string</text>
+</a>
+</g>
+</g>
+<!-- /lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on -->
+<g id="edge15" class="edge"><title>/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME&#45;&gt;/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on</title>
+<path fill="none" stroke="black" d="M868.298,-104.015C933.754,-93.9033 1019.48,-77.9212 1093.23,-55.1543 1097.89,-53.7179 1102.66,-52.0338 1107.39,-50.2227"/>
+<polygon fill="black" stroke="black" points="1109.01,-53.3432 1116.99,-46.3651 1106.4,-46.8486 1109.01,-53.3432"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/lihata_format/tree.html
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/tree.html	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/tree.html	(revision 18980)
@@ -0,0 +1,644 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> pcb-rnd developer manual - lihata file formats</title>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<h2> File format root nodes </h2>
+<p>Each table below describes the full tree of one of the pcb-rnd file formats, from the root.
+<h3 id="/lht_tree_doc/roots/pcb-rnd-board-v*">ha:pcb-rnd-board-v*</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*"><td> ha:pcb-rnd-board-v* <td> &nbsp; <td> &nbsp; <td>     The full, self-contained description of a printed circuit board.    This is the root of a board .lht file. The * after the v in the name    is an integer which is the format version.   
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta"><td> &nbsp;ha:meta <td> &nbsp; <td> &nbsp; <td>  Any meta-data that won't directly turn into physical material (e.g. copper). 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/board_name"><td> &nbsp;&nbsp;board_name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> User assigned name of the board
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid"><td> &nbsp;&nbsp;ha:grid <td> &nbsp; <td> &nbsp; <td>  User interface last grid settings 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/offs_x"><td> &nbsp;&nbsp;&nbsp;offs_x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> grid origin: X offset from 0;0
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/offs_y"><td> &nbsp;&nbsp;&nbsp;offs_y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> grid origin: Y offset from 0;0
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/grid/children/spacing"><td> &nbsp;&nbsp;&nbsp;spacing <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> distance between two grid points both in X and Y directions 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size"><td> &nbsp;&nbsp;ha:size <td> &nbsp; <td> &nbsp; <td>  object size related settings 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/x"><td> &nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> drawing area size X (width)
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/y"><td> &nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> drawing area size Y (height)
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/isle_area_nm2"><td> &nbsp;&nbsp;&nbsp;isle_area_nm2 <td> <a href="#valtype:double">double</a> <td> &nbsp; <td> remove polygon islands smaller than this value, specified in mm<sup>2</sup>
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/size/children/thermal_scale"><td> &nbsp;&nbsp;&nbsp;thermal_scale <td> <a href="#valtype:double">double</a> <td> &nbsp; <td> scale all thermals on the board by this factor
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc"><td> &nbsp;&nbsp;ha:drc <td> &nbsp; <td> &lt;5 <td>  design rule checker settings for the old DRC 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/bloat"><td> &nbsp;&nbsp;&nbsp;bloat <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum copper spacing
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/shrink"><td> &nbsp;&nbsp;&nbsp;shrink <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum overlap between validly touching copper objects
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_width"><td> &nbsp;&nbsp;&nbsp;min_width <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum copper width
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_silk"><td> &nbsp;&nbsp;&nbsp;min_silk <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum silk width
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_drill"><td> &nbsp;&nbsp;&nbsp;min_drill <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum drill diameter
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/drc/children/min_ring"><td> &nbsp;&nbsp;&nbsp;min_ring <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> Minimum annular ring width
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor"><td> &nbsp;&nbsp;ha:cursor <td> &nbsp; <td> &nbsp; <td>  obsolete cursor/view state 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/x"><td> &nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> last positin, X (horizontal)
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/y"><td> &nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> last positin, Y (horizontal)
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/meta/children/cursor/children/zoom"><td> &nbsp;&nbsp;&nbsp;zoom <td> <a href="#valtype:double">double</a> <td> &nbsp; <td> last view zoom factor
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack"><td> &nbsp;ha:layer_stack <td> &nbsp; <td> &nbsp; <td>  physical layer stack information: geometry and properties of physical layers 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups"><td> &nbsp;&nbsp;li:groups <td> &nbsp; <td> &nbsp; <td>  ordered list of physical layers from top to bottom 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER"><td> &nbsp;&nbsp;&nbsp;ha:INTEGER <td> &nbsp; <td> &nbsp; <td>  a layer group (a physical layer of the board); the ID of the layer group is the integer in the name of the node 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/name"><td> &nbsp;&nbsp;&nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> user assigned name of the layer group, e.g. "top copper"
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/type"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:type <td> &nbsp; <td> &nbsp; <td>  a flag-list of layer type flag bits 
+<tr id="/lht_tree_doc/comm/layer_mask/children/top"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;top <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: top side
+<tr id="/lht_tree_doc/comm/layer_mask/children/bottom"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bottom <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: bottom side
+<tr id="/lht_tree_doc/comm/layer_mask/children/intern"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;intern <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: internal
+<tr id="/lht_tree_doc/comm/layer_mask/children/logical"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;logical <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: logical (not in the actual stackup)
+<tr id="/lht_tree_doc/comm/layer_mask/children/copper"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;copper <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: copper
+<tr id="/lht_tree_doc/comm/layer_mask/children/silk"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;silk <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: silk
+<tr id="/lht_tree_doc/comm/layer_mask/children/mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: mask
+<tr id="/lht_tree_doc/comm/layer_mask/children/paste"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;paste <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: paste
+<tr id="/lht_tree_doc/comm/layer_mask/children/outline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;outline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> "material": router path (board outline, slots, cutouts) 
+<tr id="/lht_tree_doc/comm/layer_mask/children/substrate"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;substrate <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: substrate or insulator
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/layer_stack/children/groups/children/INTEGER/children/layers"><td> &nbsp;&nbsp;&nbsp;&nbsp;li:layers <td> &nbsp; <td> &nbsp; <td>  ordered list of logical layer IDs hosted by this layer group 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/font"><td> &nbsp;ha:font <td> &nbsp; <td> &nbsp; <td>  font kit: all fonts used on the board (if no font specified, default font will be used) 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/font/children/FONT-ID"><td> &nbsp;&nbsp;ha:FONT-ID <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID"> the full description of a font; the node name is the integer font id or "geda_pcb" for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below  -&gt; </a>
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/styles"><td> &nbsp;ha:styles <td> &nbsp; <td> &nbsp; <td>  routing styles hash: collection of all available routing syles 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists"><td> &nbsp;ha:netlists <td> &nbsp; <td> &nbsp; <td>  all availale netlists 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist"><td> &nbsp;&nbsp;li:netlist <td> &nbsp; <td> &nbsp; <td>  the input netlist (as seen in the last netlist import, a.k.a. forward annotation) 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME"><td> &nbsp;&nbsp;&nbsp;ha:NETNAME <td> &nbsp; <td> &nbsp; <td>  a network 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME/children/conn"><td> &nbsp;&nbsp;&nbsp;&nbsp;li:conn <td> &nbsp; <td> &nbsp; <td>  list of terminals connceted to the network 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist/children/NETNAME/children/conn/children/diameter"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diameter <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> refdes-terminal
+<tr id="/lht_tree_doc/comm/attributes_v5p"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> >=5 <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes_v5p/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch"><td> &nbsp;&nbsp;li:netlist_patch <td> &nbsp; <td> &nbsp; <td>  a list of intentional deviations from the input netlist, a.k.a. material for back annotation 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info"><td> &nbsp;&nbsp;&nbsp;li:net_info <td> &nbsp; <td> &nbsp; <td>  describe the current state of a net, as seen on the input 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info/children/net"><td> &nbsp;&nbsp;&nbsp;&nbsp;net <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> net name; first item on the list, only once
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/net_info/children/term"><td> &nbsp;&nbsp;&nbsp;&nbsp;term <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> terminal name; zero or more items starting from the second item
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn"><td> &nbsp;&nbsp;&nbsp;ha:add_conn <td> &nbsp; <td> &nbsp; <td>  the 'as built' network requires a new conncetion to be created during the back annotation 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn/children/net"><td> &nbsp;&nbsp;&nbsp;&nbsp;net <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> net name the terminal should be added to
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/add_conn/children/term"><td> &nbsp;&nbsp;&nbsp;&nbsp;term <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> terminal name
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn"><td> &nbsp;&nbsp;&nbsp;ha:del_conn <td> &nbsp; <td> &nbsp; <td>  the 'as built' network requires an existing conncetion to be removed during the back annotation 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn/children/net"><td> &nbsp;&nbsp;&nbsp;&nbsp;net <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> net name the terminal should be removed from
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/del_conn/children/term"><td> &nbsp;&nbsp;&nbsp;&nbsp;term <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> terminal name
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib"><td> &nbsp;&nbsp;&nbsp;ha:change_attrib <td> &nbsp; <td> &nbsp; <td>  the 'as built' network requires an attribute to be set or changed 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/net"><td> &nbsp;&nbsp;&nbsp;&nbsp;net <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> net name whose attribute needs to be changed 
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/key"><td> &nbsp;&nbsp;&nbsp;&nbsp;key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> key (name) of the attribute
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/netlists/children/netlist_patch/children/change_attrib/children/val"><td> &nbsp;&nbsp;&nbsp;&nbsp;val <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> new value of the attribute
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/conf"><td> &nbsp;li:conf <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/roots/pcb-rnd-conf-v1">complete pcb-rnd configuration tree -&gt; </a>
+<tr id="/lht_tree_doc/roots/pcb-rnd-board-v*/children/data"><td> &nbsp;ha:data <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data"> Layers and global objects of the board  -&gt; </a>
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+</table>
+<h3 id="/lht_tree_doc/roots/pcb-rnd-conf-v1">li:pcb-rnd-conf-v1</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/pcb-rnd-conf-v1"><td> li:pcb-rnd-conf-v1 <td> &nbsp; <td> &nbsp; <td> complete pcb-rnd configuration tree
+<tr id="/lht_tree_doc/roots/pcb-rnd-conf-v1/children/overwrite"><td> &nbsp;ha:overwrite <td> &nbsp; <td> &nbsp; <td> overwrite values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>
+<tr id="/lht_tree_doc/roots/pcb-rnd-conf-v1/children/prepend"><td> &nbsp;ha:prepend <td> &nbsp; <td> &nbsp; <td> prepend values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>
+<tr id="/lht_tree_doc/roots/pcb-rnd-conf-v1/children/append"><td> &nbsp;ha:append <td> &nbsp; <td> &nbsp; <td> append values while merging; children: a full or partial <a href="../../conf/groups.html#tree">config tree</a>
+</table>
+<h3 id="/lht_tree_doc/roots/pcb-rnd-font-v1">li:pcb-rnd-font-v1</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1"><td> li:pcb-rnd-font-v1 <td> &nbsp; <td> &nbsp; <td> font description
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID"><td> &nbsp;ha:FONT-ID <td> &nbsp; <td> &nbsp; <td>  the full description of a font; the node name is the integer font id or "geda_pcb" for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/cell_height"><td> &nbsp;&nbsp;cell_height <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> height of the tallest glyph
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/cell_width"><td> &nbsp;&nbsp;cell_width <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the widest glyph
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/id"><td> &nbsp;&nbsp;id <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> unique font ID within the fontkit; fonts are referenced by ID
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/name"><td> &nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> user specified, user readable font name
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols"><td> &nbsp;&nbsp;ha:symbols <td> &nbsp; <td> &nbsp; <td>  a collections of glyphs availbale in the font 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER"><td> &nbsp;&nbsp;&nbsp;ha:CHARACTER <td> &nbsp; <td> &nbsp; <td>  Description of a glyph (symbol). Node name is a signel ASCII character or is of format &xx where xx is a hex digit of the ASCII code of the character. Characters that must use the hex version are: codes below 33 or over 126, &, #, {, }, /, :, ;, =, \, :
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/height"><td> &nbsp;&nbsp;&nbsp;&nbsp;height <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> height of the glyph
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/width"><td> &nbsp;&nbsp;&nbsp;&nbsp;width <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the glyph
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/delta"><td> &nbsp;&nbsp;&nbsp;&nbsp;delta <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> extra space always inserted after the current symbol, before the next character
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects"><td> &nbsp;&nbsp;&nbsp;&nbsp;li:objects <td> &nbsp; <td> &nbsp; <td> objects that make up the symbol; IDs are per symbol local IDs counted from 0
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:line.ID <td> &nbsp; <td> &nbsp; <td> round cap line, simplified
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, horizontal offset 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, vertical offset 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/x2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, horizontal offset 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/y2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, vertical offset 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/line.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the line 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:simplearc.ID <td> &nbsp; <td> &nbsp; <td> round cap arc, simplified 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/x"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, X coord
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/y"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, Y coord
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/r"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;r <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> radius (of the centerline of the arc) 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the pen the arc is drawn with 
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/astart"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;astart <td> <a href="#valtype:angle">angle</a> <td> &nbsp; <td>  start angle
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplearc.ID/children/adelta"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;adelta <td> <a href="#valtype:angle">angle</a> <td> &nbsp; <td>  delta angle
+<tr id="/lht_tree_doc/roots/pcb-rnd-font-v1/children/FONT-ID/children/symbols/children/CHARACTER/children/objects/children/simplepoly.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:simplepoly.ID <td> &nbsp; <td> &nbsp; <td> round cap arc, simplified; contains a flat list of coords; each coord pair is an x;y corner of the outline of the polygon (odd indices are x coords, even indices are y coords) 
+</table>
+<h3 id="/lht_tree_doc/roots/menu">ha:menu</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/menu"><td> ha: <td> &nbsp; <td> &nbsp; <td> Menu file
+<tr id="/lht_tree_doc/roots/menu/children/mouse"><td> &nbsp;li:mouse <td> &nbsp; <td> &nbsp; <td> mouse bindings
+<tr id="/lht_tree_doc/roots/menu/children/mouse/children/left"><td> &nbsp;&nbsp;li:left <td> &nbsp; <td> &nbsp; <td> actions to execute on left button click
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press"><td> &nbsp;&nbsp;&nbsp;li:press <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-shift"><td> &nbsp;&nbsp;&nbsp;li:press-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-ctrl"><td> &nbsp;&nbsp;&nbsp;li:press-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when control is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release"><td> &nbsp;&nbsp;&nbsp;li:release <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-shift"><td> &nbsp;&nbsp;&nbsp;li:release-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-ctrl"><td> &nbsp;&nbsp;&nbsp;li:release-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when control is pressed
+<tr id="/lht_tree_doc/roots/menu/children/mouse/children/middle"><td> &nbsp;&nbsp;li:middle <td> &nbsp; <td> &nbsp; <td> actions to execute on middle button click
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press"><td> &nbsp;&nbsp;&nbsp;li:press <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-shift"><td> &nbsp;&nbsp;&nbsp;li:press-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-ctrl"><td> &nbsp;&nbsp;&nbsp;li:press-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when control is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release"><td> &nbsp;&nbsp;&nbsp;li:release <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-shift"><td> &nbsp;&nbsp;&nbsp;li:release-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-ctrl"><td> &nbsp;&nbsp;&nbsp;li:release-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when control is pressed
+<tr id="/lht_tree_doc/roots/menu/children/mouse/children/right"><td> &nbsp;&nbsp;li:right <td> &nbsp; <td> &nbsp; <td> actions to execute on right button click
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press"><td> &nbsp;&nbsp;&nbsp;li:press <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-shift"><td> &nbsp;&nbsp;&nbsp;li:press-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/press-ctrl"><td> &nbsp;&nbsp;&nbsp;li:press-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when control is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release"><td> &nbsp;&nbsp;&nbsp;li:release <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-shift"><td> &nbsp;&nbsp;&nbsp;li:release-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions/children/release-ctrl"><td> &nbsp;&nbsp;&nbsp;li:release-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button release when control is pressed
+<tr id="/lht_tree_doc/roots/menu/children/mouse/children/scroll-up"><td> &nbsp;&nbsp;li:scroll-up <td> &nbsp; <td> &nbsp; <td> actions to execute on scroll wheel scolling up event
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press"><td> &nbsp;&nbsp;&nbsp;li:press <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press-shift"><td> &nbsp;&nbsp;&nbsp;li:press-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press-ctrl"><td> &nbsp;&nbsp;&nbsp;li:press-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when control is pressed
+<tr id="/lht_tree_doc/roots/menu/children/mouse/children/scroll-down"><td> &nbsp;&nbsp;li:scroll-down <td> &nbsp; <td> &nbsp; <td> actions to execute on scroll wheel scolling down event
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press"><td> &nbsp;&nbsp;&nbsp;li:press <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when no modifier is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press-shift"><td> &nbsp;&nbsp;&nbsp;li:press-shift <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when shift is pressed
+<tr id="/lht_tree_doc/comm/mouse_actions_scroll/children/press-ctrl"><td> &nbsp;&nbsp;&nbsp;li:press-ctrl <td> &nbsp; <td> &nbsp; <td> actions to execute on mouse button press when control is pressed
+<tr id="/lht_tree_doc/roots/menu/children/main_menu"><td> &nbsp;li:main_menu <td> &nbsp; <td> &nbsp; <td> root of the main pull-down menu system; ordered list of main menus
+<tr id="/lht_tree_doc/roots/menu/children/main_menu/children/MENUNAME"><td> &nbsp;&nbsp;ha:MENUNAME <td> &nbsp; <td> &nbsp; <td> main menu name, e.g. "File"
+<tr id="/lht_tree_doc/comm/submenu/children/m"><td> &nbsp;&nbsp;&nbsp;m <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> mnemonic: single character that should be underlined and used as a hot key in the menu name
+<tr id="/lht_tree_doc/roots/menu/children/main_menu/children/MENUNAME/children/submenu"><td> &nbsp;&nbsp;&nbsp;li:submenu <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/submenu">ordered list of menu items for a submenu -&gt; </a>
+<tr id="/lht_tree_doc/roots/menu/children/popups"><td> &nbsp;li:popups <td> &nbsp; <td> &nbsp; <td> collection of popup menus
+<tr id="/lht_tree_doc/roots/menu/children/popups/children/POPUPNAME"><td> &nbsp;&nbsp;ha:POPUPNAME <td> &nbsp; <td> &nbsp; <td> popup menu name, e.g. "layer" for layer context menu
+<tr id="/lht_tree_doc/comm/submenu/children/m"><td> &nbsp;&nbsp;&nbsp;m <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> mnemonic: single character that should be underlined and used as a hot key in the menu name
+<tr id="/lht_tree_doc/roots/menu/children/popups/children/POPUPNAME/children/submenu"><td> &nbsp;&nbsp;&nbsp;li:submenu <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/submenu">ordered list of menu items for a submenu -&gt; </a>
+</table>
+<h3 id="/lht_tree_doc/roots/geda-project-v1">ha:geda-project-v1</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/geda-project-v1"><td> ha:geda-project-v1 <td> &nbsp; <td> &nbsp; <td> Project file root. Except for "common", each software package should create a single subtree under the root; the subtree shall be named after the software package 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common"><td> &nbsp;ha:common <td> &nbsp; <td> &nbsp; <td> project settings that should be common to all software packages
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/name"><td> &nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> long name of the project 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/desc"><td> &nbsp;&nbsp;desc <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> description of the project 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/url"><td> &nbsp;&nbsp;url <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> homepage of the project 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/vcs"><td> &nbsp;&nbsp;vcs <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> main vcs url for the project 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/contact"><td> &nbsp;&nbsp;contact <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> author/maintainer contact info 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/files"><td> &nbsp;&nbsp;li:files <td> &nbsp; <td> &nbsp; <td> ordered list of source files being used by the project
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME"><td> &nbsp;&nbsp;&nbsp;ha:NAME <td> &nbsp; <td> &nbsp; <td> a project member file
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/path"><td> &nbsp;&nbsp;&nbsp;&nbsp;path <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> path to the file, relative to the project file 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/desc"><td> &nbsp;&nbsp;&nbsp;&nbsp;desc <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> description of the file 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/files/children/NAME/children/type"><td> &nbsp;&nbsp;&nbsp;&nbsp;type <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> optional: type of the file; one of: "pcb", "schematic", "doc" 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs"><td> &nbsp;&nbsp;li:libs <td> &nbsp; <td> &nbsp; <td> ordered list of libraries the project depends on
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME"><td> &nbsp;&nbsp;&nbsp;ha:NAME <td> &nbsp; <td> &nbsp; <td> a library
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/path"><td> &nbsp;&nbsp;&nbsp;&nbsp;path <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> path to the library, relative to the project file; all files and subdirectories under the root, recursively, are considered part of the library (must not be used together with url) 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/url"><td> &nbsp;&nbsp;&nbsp;&nbsp;url <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> url to the library (must not be used together with path) 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/desc"><td> &nbsp;&nbsp;&nbsp;&nbsp;desc <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> description of the library 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/common/children/libs/children/NAME/children/type"><td> &nbsp;&nbsp;&nbsp;&nbsp;type <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> optional: type of the library; one of: "footprint" (for pcb design), "symbol" (for schematic), "sim" (models and subcircuits for e.g. spice simulation) 
+<tr id="/lht_tree_doc/roots/geda-project-v1/children/pcb-rnd-conf-v1"><td> &nbsp;li:pcb-rnd-conf-v1 <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/roots/pcb-rnd-conf-v1">complete pcb-rnd configuration tree -&gt; </a>
+</table>
+<h3 id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*">li:pcb-rnd-subcircuit-v*</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*"><td> li:pcb-rnd-subcircuit-v* <td> &nbsp; <td> &nbsp; <td> footprint file containing a single subcircuit
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID"><td> &nbsp;ha:subc.ID <td> &nbsp; <td> >=3 <td> an instance (full copy) of a subcircuit
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/uid"><td> &nbsp;&nbsp;uid <td> <a href="#valtype:minuid">minuid</a> <td> &nbsp; <td> UID assigned by the user to track subc history 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_subcircuit"><td> &nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a subcircuit
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/found"><td> &nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/selected"><td> &nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/auto"><td> &nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/drc"><td> &nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/lock"><td> &nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/termname"><td> &nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/floater"><td> &nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/data"><td> &nbsp;&nbsp;ha:data <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data"> Layers and global objects of the board  -&gt; </a>
+</table>
+<h2> Common subtrees </h2>
+<p>Each table below describes a subtree that usually does not specify a whole tree (thus they are usually not a valid file on their own). These subtrees are described in a separate table because they are used from multiple other trees.
+<h3 id="/lht_tree_doc/comm/data">ha:data</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/comm/data"><td> ha:data <td> &nbsp; <td> &nbsp; <td>  Layers and global objects of the board 
+<tr id="/lht_tree_doc/comm/data/children/objects"><td> &nbsp;li:objects <td> &nbsp; <td> &nbsp; <td>  List of global (non-layer/multi-layer) objects 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID"><td> &nbsp;&nbsp;ha:padstack_ref.ID <td> &nbsp; <td> >=4 <td>  a padstack reference (instance) placed on the board (e.g. used as a via) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/proto"><td> &nbsp;&nbsp;&nbsp;proto <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> padstack prototype ID to use, from the parent data's proto list 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/x"><td> &nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this horizontal coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/y"><td> &nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this vertical coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> global clearance; if non-zero, overrides local (per shape) clearance 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/rot"><td> &nbsp;&nbsp;&nbsp;rot <td> <a href="#valtype:angle">angle</a> <td> &nbsp; <td> rotation angle in degrees 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/xmirror"><td> &nbsp;&nbsp;&nbsp;xmirror <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> 0 or 1; if 1, mirror all shapes over the x (horizontal) axis (so that y coords are flipped)
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/smirror"><td> &nbsp;&nbsp;&nbsp;smirror <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> 0 or 1; if 1, mirror the layer stackup: bottom becomes top, top becomes bottom (a.k.a. "place on the other side")
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_padstack"><td> &nbsp;&nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a padstack
+<tr id="/lht_tree_doc/comm/flags_padstack/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_padstack/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/warn"><td> &nbsp;&nbsp;&nbsp;&nbsp;warn <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins, vias, and pads, set to indicate a warning.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_padstack/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_padstack/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal"><td> &nbsp;&nbsp;&nbsp;li:thermal <td> &nbsp; <td> &nbsp; <td>  list of thermal shapes, per layer 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID"><td> &nbsp;&nbsp;&nbsp;&nbsp;li:LAYERID <td> &nbsp; <td> &nbsp; <td>  integer layer ID the thermal affects; each word is a boolean flag that is either present on the list or is missing; only one shape may be present 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/on"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;on <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  thermal is present on this layer; if not present, all other thermal flags are ignored on this layer 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/diag"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diag <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  thermal graphics is not axis aligned but diagonal (rotated by 45 degrees) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/round"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  shape: rounded edge fingers 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/sharp"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sharp <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  shape: sharp edge fingers 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/solid"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;solid <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  shape: no thermal relief, solid connection without clearance 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/padstack_ref.ID/children/thermal/children/LAYERID/children/noshape"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;noshape <td> <a href="#valtype:none">none</a> <td> &nbsp; <td>  shape: special: omit copper shape of the padstack on this layer 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID"><td> &nbsp;&nbsp;ha:via.ID <td> &nbsp; <td> <=4 <td>  an old via object (loaded as padstack in the new model) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x"><td> &nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this horizontal coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y"><td> &nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this vertical coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper shape dimension (diameter) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper clearance around the copper shape 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask"><td> &nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> mask cutout shape dimension (diameter) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole"><td> &nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> drill/hole diameter 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name"><td> &nbsp;&nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> optional name attribute 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number"><td> &nbsp;&nbsp;&nbsp;number <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> for a pin (or to-be-pin) this is the terminal ID 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_pinvia"><td> &nbsp;&nbsp;&nbsp;ha:flags_pinvia <td> &nbsp; <td> &nbsp; <td> flag bits of a pin or via
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/warn"><td> &nbsp;&nbsp;&nbsp;&nbsp;warn <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins, vias, and pads, set to indicate a warning.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/pin"><td> &nbsp;&nbsp;&nbsp;&nbsp;pin <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a pin (in an element)
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/via"><td> &nbsp;&nbsp;&nbsp;&nbsp;via <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a via
+<tr id="/lht_tree_doc/comm/data/children/layers"><td> &nbsp;li:layers <td> &nbsp; <td> &nbsp; <td> ordered list of layers; v1 required the order to be top-bottom physically; v1 also required silk layers to be at the end (same resrtictions as in the old .pcb format; only real (non-bound) layers have attributes)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME"><td> &nbsp;&nbsp;ha:NAME <td> &nbsp; <td> &nbsp; <td> a logical layer
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/lid"><td> &nbsp;&nbsp;&nbsp;lid <td> <a href="#valtype:integer">integer</a> <td> >=2 <td> layer ID
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/visible"><td> &nbsp;&nbsp;&nbsp;visible <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> only in real (non-boud) layers: 1 if the layer is visible, 0 if not (UI setting)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/group"><td> &nbsp;&nbsp;&nbsp;group <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> only in real (non-boud) layers: "parent" layer group ID 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/color"><td> &nbsp;&nbsp;&nbsp;color <td> <a href="#valtype:string">string</a> <td> >=5 <td>  layer color on UI, in #rrggbb format 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/stack_offs"><td> &nbsp;&nbsp;&nbsp;stack_offs <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> only in bound layers: match offset e.g. for internal copper layers
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/type"><td> &nbsp;&nbsp;&nbsp;ha:type <td> &nbsp; <td> &nbsp; <td> only for bound layers: try to bind to this type of layer on the host board
+<tr id="/lht_tree_doc/comm/layer_mask/children/top"><td> &nbsp;&nbsp;&nbsp;&nbsp;top <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: top side
+<tr id="/lht_tree_doc/comm/layer_mask/children/bottom"><td> &nbsp;&nbsp;&nbsp;&nbsp;bottom <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: bottom side
+<tr id="/lht_tree_doc/comm/layer_mask/children/intern"><td> &nbsp;&nbsp;&nbsp;&nbsp;intern <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: internal
+<tr id="/lht_tree_doc/comm/layer_mask/children/logical"><td> &nbsp;&nbsp;&nbsp;&nbsp;logical <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: logical (not in the actual stackup)
+<tr id="/lht_tree_doc/comm/layer_mask/children/copper"><td> &nbsp;&nbsp;&nbsp;&nbsp;copper <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: copper
+<tr id="/lht_tree_doc/comm/layer_mask/children/silk"><td> &nbsp;&nbsp;&nbsp;&nbsp;silk <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: silk
+<tr id="/lht_tree_doc/comm/layer_mask/children/mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: mask
+<tr id="/lht_tree_doc/comm/layer_mask/children/paste"><td> &nbsp;&nbsp;&nbsp;&nbsp;paste <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: paste
+<tr id="/lht_tree_doc/comm/layer_mask/children/outline"><td> &nbsp;&nbsp;&nbsp;&nbsp;outline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> "material": router path (board outline, slots, cutouts) 
+<tr id="/lht_tree_doc/comm/layer_mask/children/substrate"><td> &nbsp;&nbsp;&nbsp;&nbsp;substrate <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: substrate or insulator
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/combining"><td> &nbsp;&nbsp;&nbsp;combining <td> &nbsp; <td> >=2 <td> layer combination (compositing) flags
+<tr id="/lht_tree_doc/comm/combining/children/sub"><td> &nbsp;&nbsp;&nbsp;&nbsp;sub <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> draw in negative
+<tr id="/lht_tree_doc/comm/combining/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects"><td> &nbsp;&nbsp;&nbsp;li:objects <td> &nbsp; <td> &nbsp; <td> list of drawing primitives put on this layer
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:line.ID <td> &nbsp; <td> &nbsp; <td> round cap line
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/x2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/y2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the line 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper clearance around the object 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_line"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a line
+<tr id="/lht_tree_doc/comm/flags_line/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_line/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_line/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_line/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_line/children/rubberend"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rubberend <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines, used internally for rubber band moves: indicates one end already rubber banding.
+<tr id="/lht_tree_doc/comm/flags_line/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_line/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_line/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_line/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_line/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_line/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/thermal_heavy"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:thermal <td> &nbsp; <td> &nbsp; <td>  list of thermal flags for heavy terminals, on the single layer the object is on 
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/on"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;on <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> draw any thermal only if this string is present; else normal clearance is applied
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/diag"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diag <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, the thermal is diagonal (45 degree rotated)
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/round"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is rounded
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/sharp"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sharp <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is sharp
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/solid"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;solid <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, there is no thermal but a solid connection ("join")
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:arc.ID <td> &nbsp; <td> &nbsp; <td> round cap elliptic arc (only width==height is fully supported at the moment)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/x"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, X coord
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/y"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, Y coord
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/width"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;width <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> radius (of the centerline of the arc) in X direction 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/height"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;height <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> radius (of the centerline of the arc) in Y direction 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the pen the arc is drawn with 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper clearance around the object 
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/astart"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;astart <td> <a href="#valtype:angle">angle</a> <td> &nbsp; <td>  start angle
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID/children/adelta"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;adelta <td> <a href="#valtype:angle">angle</a> <td> &nbsp; <td>  delta angle
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_arc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a arc
+<tr id="/lht_tree_doc/comm/flags_arc/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_arc/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_arc/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_arc/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_arc/children/rubberend"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rubberend <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines, used internally for rubber band moves: indicates one end already rubber banding.
+<tr id="/lht_tree_doc/comm/flags_arc/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_arc/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_arc/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_arc/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_arc/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_arc/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/thermal_heavy"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:thermal <td> &nbsp; <td> &nbsp; <td>  list of thermal flags for heavy terminals, on the single layer the object is on 
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/on"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;on <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> draw any thermal only if this string is present; else normal clearance is applied
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/diag"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diag <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, the thermal is diagonal (45 degree rotated)
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/round"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is rounded
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/sharp"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sharp <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is sharp
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/solid"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;solid <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, there is no thermal but a solid connection ("join")
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:polygon.ID <td> &nbsp; <td> &nbsp; <td> polygon, as drawn (unclipped)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> >=3 <td> copper clearance around the object 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_polygon"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a polygon
+<tr id="/lht_tree_doc/comm/flags_polygon/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_polygon/children/clearpoly"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearpoly <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection).  When clear, polygons will solidly connect to pins and vias. 
+<tr id="/lht_tree_doc/comm/flags_polygon/children/fullpoly"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;fullpoly <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one).
+<tr id="/lht_tree_doc/comm/flags_polygon/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_polygon/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_polygon/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_polygon/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_polygon/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_polygon/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_polygon/children/clearpolypoly"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearpolypoly <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For polygons, apply clearance to nearby polygons
+<tr id="/lht_tree_doc/comm/flags_polygon/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/thermal_heavy"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:thermal <td> &nbsp; <td> &nbsp; <td>  list of thermal flags for heavy terminals, on the single layer the object is on 
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/on"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;on <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> draw any thermal only if this string is present; else normal clearance is applied
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/diag"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;diag <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, the thermal is diagonal (45 degree rotated)
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/round"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;round <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is rounded
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/sharp"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sharp <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, thermal shape is sharp
+<tr id="/lht_tree_doc/comm/thermal_heavy/children/solid"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;solid <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> if present, there is no thermal but a solid connection ("join")
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:geometry <td> &nbsp; <td> &nbsp; <td> first item is the outer contour, subsequent, optional items are holes
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/contour"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;contour <td> <a href="#valtype:coordtbl">coordtbl</a> <td> &nbsp; <td> 2 column table of x;y coords for the outer contour
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/polygon.ID/children/geometry/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:coordtbl">coordtbl</a> <td> &nbsp; <td> 2 column table of x;y coords for a hole
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:text.ID <td> &nbsp; <td> &nbsp; <td> single line text object
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/x"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> placement: X coord
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/y"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> placement: Y coord
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/role"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;role <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> when part of an old element, determines which of the three hardwired text object role is used (footprint, refdes or value)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/string"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> text string (payload)
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/fid"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;fid <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> font ID
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/scale"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;scale <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> text size scale in %
+<tr id="/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID/children/direction"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;direction <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> rotation in 90 degree steps (0 is horizontal)
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_text"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a text
+<tr id="/lht_tree_doc/comm/flags_text/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_text/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_text/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_text/children/onsolder"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;onsolder <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For text, indicates that it is on the solder side.
+<tr id="/lht_tree_doc/comm/flags_text/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_text/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_text/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_text/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_text/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_text/children/dyntext"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dyntext <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For text: dynamic string (substitute %patterns%)
+<tr id="/lht_tree_doc/comm/flags_text/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes"><td> &nbsp;li:padstack_prototypes <td> &nbsp; <td> >=4 <td> 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/unused"><td> &nbsp;&nbsp;unused <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> placeholder for markign uunsed slot to keep slot indices for early lihata v4 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID"><td> &nbsp;&nbsp;ha:ps_proto_v4.PID <td> &nbsp; <td> &nbsp; <td> padstack prototype specification, as introduced in lihata board v4
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hdia"><td> &nbsp;&nbsp;&nbsp;hdia <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> hole diameter; 0 means no hole 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/htop"><td> &nbsp;&nbsp;&nbsp;htop <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> hole start: copper layer index from the top (positive) or bottom (negative) copper layer (0 means top copper layer)
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/hbottom"><td> &nbsp;&nbsp;&nbsp;hbottom <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> hole start: copper layer index from the bottom (positive) or top (negative) copper layer (0 means bottom copper layer)
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/plated"><td> &nbsp;&nbsp;&nbsp;plated <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> 0=unplated hole; 1=plated hole
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/name"><td> &nbsp;&nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> >=5 <td> optional user assigned prototype name
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape"><td> &nbsp;&nbsp;&nbsp;li:shape <td> &nbsp; <td> &nbsp; <td> shape per layer type definition
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:ps_shape_v4 <td> &nbsp; <td> &nbsp; <td> shape on a specific layer type (specified by layer_mask and combining), as specifie in lihata board v4; shape is either ps_poly, ps_line or ps_circ (only one of these will present per layer type); shape coords are relative to padstack origin
+<tr id="/lht_tree_doc/comm/layer_mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:layer_mask <td> &nbsp; <td> &nbsp; <td> layer type and location
+<tr id="/lht_tree_doc/comm/layer_mask/children/top"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;top <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: top side
+<tr id="/lht_tree_doc/comm/layer_mask/children/bottom"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bottom <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: bottom side
+<tr id="/lht_tree_doc/comm/layer_mask/children/intern"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;intern <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: internal
+<tr id="/lht_tree_doc/comm/layer_mask/children/logical"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;logical <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> location: logical (not in the actual stackup)
+<tr id="/lht_tree_doc/comm/layer_mask/children/copper"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;copper <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: copper
+<tr id="/lht_tree_doc/comm/layer_mask/children/silk"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;silk <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: silk
+<tr id="/lht_tree_doc/comm/layer_mask/children/mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: mask
+<tr id="/lht_tree_doc/comm/layer_mask/children/paste"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;paste <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: paste
+<tr id="/lht_tree_doc/comm/layer_mask/children/outline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;outline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> "material": router path (board outline, slots, cutouts) 
+<tr id="/lht_tree_doc/comm/layer_mask/children/substrate"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;substrate <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> material: substrate or insulator
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/combining"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;combining <td> &nbsp; <td> &nbsp; <td> layer compositing match
+<tr id="/lht_tree_doc/comm/combining/children/sub"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sub <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> draw in negative
+<tr id="/lht_tree_doc/comm/combining/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> local, per-layer-type clearance; applied if global padstack clearance is 0 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_poly"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;li:ps_poly <td> &nbsp; <td> &nbsp; <td> arbitrary convex polygon shape; contains a list of x;y coordinates 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:ps_line <td> &nbsp; <td> &nbsp; <td> straight line shape, round or square cap
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y1"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/x2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/y2"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the line 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_line/children/square"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;square <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> 0=round cap; 1=square cap 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ha:ps_circ <td> &nbsp; <td> &nbsp; <td> filled circle shape
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/x"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/y"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> center, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/padstack_prototypes/children/ps_proto_v4.PID/children/shape/children/ps_shape_v4/children/ps_circ/children/dia"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;dia <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> circle diameter 
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID"><td> &nbsp;ha:subc.ID <td> &nbsp; <td> >=3 <td> an instance (full copy) of a subcircuit
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/uid"><td> &nbsp;&nbsp;uid <td> <a href="#valtype:minuid">minuid</a> <td> &nbsp; <td> UID assigned by the user to track subc history 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_subcircuit"><td> &nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a subcircuit
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/found"><td> &nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/selected"><td> &nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/auto"><td> &nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/drc"><td> &nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/lock"><td> &nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/termname"><td> &nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_subcircuit/children/floater"><td> &nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/roots/pcb-rnd-subcircuit-v*/children/subc.ID/children/data"><td> &nbsp;&nbsp;ha:data <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data"> Layers and global objects of the board  -&gt; </a>
+<tr id="/lht_tree_doc/comm/data/children/element.ID"><td> &nbsp;ha:element.ID <td> &nbsp; <td> <3 <td> an instance (full copy) of an obsolete element footprint
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/x"><td> &nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> element origin (diamond), horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/y"><td> &nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> element origin (diamond), vertical offset 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_element"><td> &nbsp;&nbsp;ha:flags_element <td> &nbsp; <td> &nbsp; <td> flag bits of an element
+<tr id="/lht_tree_doc/comm/flags_element/children/found"><td> &nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_element/children/selected"><td> &nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_element/children/auto"><td> &nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_element/children/drc"><td> &nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_element/children/lock"><td> &nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_element/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_element/children/termname"><td> &nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_element/children/floater"><td> &nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/flags_element/children/onsolder"><td> &nbsp;&nbsp;&nbsp;onsolder <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> element is placed on the solder side
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects"><td> &nbsp;&nbsp;li:objects <td> &nbsp; <td> &nbsp; <td> list of special objects that make up the element; lines and arcs are always on a silk layer
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/line.ID"><td> &nbsp;&nbsp;&nbsp;ha:line.ID <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/line.ID">round cap line -&gt; </a>
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/arc.ID"><td> &nbsp;&nbsp;&nbsp;ha:arc.ID <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/arc.ID">round cap elliptic arc (only width==height is fully supported at the moment) -&gt; </a>
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/text.ID"><td> &nbsp;&nbsp;&nbsp;ha:text.ID <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/data/children/layers/children/NAME/children/objects/children/text.ID">single line text object -&gt; </a>
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID"><td> &nbsp;&nbsp;&nbsp;ha:pad.ID <td> &nbsp; <td> &nbsp; <td> SMD pad emulated using a line object; becomes a rectangle (but watch out for the cap-extended length!) when the square flag is set
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x1"><td> &nbsp;&nbsp;&nbsp;&nbsp;x1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y1"><td> &nbsp;&nbsp;&nbsp;&nbsp;y1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/x2"><td> &nbsp;&nbsp;&nbsp;&nbsp;x2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/y2"><td> &nbsp;&nbsp;&nbsp;&nbsp;y2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> width of the line
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> clearance around the line
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> size of the mask cutout, as interpreted by gEDA/PCB
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/name"><td> &nbsp;&nbsp;&nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> symbolic name of the pad
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pad.ID/children/number"><td> &nbsp;&nbsp;&nbsp;&nbsp;number <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> "pin number" for the netlist
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_pad"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:flags_pad <td> &nbsp; <td> &nbsp; <td> flag bits of a pad
+<tr id="/lht_tree_doc/comm/flags_pad/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_pad/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+<tr id="/lht_tree_doc/comm/flags_pad/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_pad/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_pad/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_pad/children/warn"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;warn <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins, vias, and pads, set to indicate a warning.
+<tr id="/lht_tree_doc/comm/flags_pad/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_pad/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_pad/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_pad/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_pad/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_pad/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/flags_pad/children/pin"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;pin <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a pin (in an element)
+<tr id="/lht_tree_doc/comm/flags_pad/children/via"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;via <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a via
+<tr id="/lht_tree_doc/comm/data/children/element.ID/children/objects/children/pin.ID"><td> &nbsp;&nbsp;&nbsp;ha:pin.ID <td> &nbsp; <td> &nbsp; <td> thru-hole pin; emulated as an old-style via 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/x"><td> &nbsp;&nbsp;&nbsp;&nbsp;x <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this horizontal coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/y"><td> &nbsp;&nbsp;&nbsp;&nbsp;y <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> place padstack with origin at this vertical coordinate 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/thickness"><td> &nbsp;&nbsp;&nbsp;&nbsp;thickness <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper shape dimension (diameter) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/clearance"><td> &nbsp;&nbsp;&nbsp;&nbsp;clearance <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> copper clearance around the copper shape 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/mask"><td> &nbsp;&nbsp;&nbsp;&nbsp;mask <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> mask cutout shape dimension (diameter) 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> drill/hole diameter 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/name"><td> &nbsp;&nbsp;&nbsp;&nbsp;name <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> optional name attribute 
+<tr id="/lht_tree_doc/comm/data/children/objects/children/via.ID/children/number"><td> &nbsp;&nbsp;&nbsp;&nbsp;number <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> for a pin (or to-be-pin) this is the terminal ID 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_pinvia"><td> &nbsp;&nbsp;&nbsp;&nbsp;ha:flags_pinvia <td> &nbsp; <td> &nbsp; <td> flag bits of a pin or via
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/found"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/hole"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hole <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/clearline"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/selected"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/auto"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/warn"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;warn <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For pins, vias, and pads, set to indicate a warning.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/usetherm"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/drc"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/lock"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/termname"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/floater"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/pin"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;pin <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a pin (in an element)
+<tr id="/lht_tree_doc/comm/flags_pinvia/children/via"><td> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;via <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> object is a via
+<tr id="/lht_tree_doc/comm/data/children/rat.ID"><td> &nbsp;ha:rat.ID <td> &nbsp; <td> &nbsp; <td> global rat line
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/x1"><td> &nbsp;&nbsp;x1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/y1"><td> &nbsp;&nbsp;y1 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line first endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/x2"><td> &nbsp;&nbsp;x2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, horizontal offset 
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/y2"><td> &nbsp;&nbsp;y2 <td> <a href="#valtype:coord">coord</a> <td> &nbsp; <td> line second endpoint, vertical offset 
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/lgrp1"><td> &nbsp;&nbsp;lgrp1 <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> first endpoint's layer group ID 
+<tr id="/lht_tree_doc/comm/data/children/rat.ID/children/lgrp2"><td> &nbsp;&nbsp;lgrp2 <td> <a href="#valtype:integer">integer</a> <td> &nbsp; <td> second endpoint's layer group ID 
+<tr id="/lht_tree_doc/comm/attributes"><td> &nbsp;&nbsp;ha:attributes <td> &nbsp; <td> &nbsp; <td>  a hash of attribute key=value pairs 
+<tr id="/lht_tree_doc/comm/attributes/children/attrib-key"><td> &nbsp;&nbsp;&nbsp;attrib-key <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> attribute value
+<tr id="/lht_tree_doc/comm/flags_line"><td> &nbsp;&nbsp;ha:flags <td> &nbsp; <td> &nbsp; <td> flag bits of a line
+<tr id="/lht_tree_doc/comm/flags_line/children/found"><td> &nbsp;&nbsp;&nbsp;found <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> If set, this object has been found by FindConnection()
+<tr id="/lht_tree_doc/comm/flags_line/children/clearline"><td> &nbsp;&nbsp;&nbsp;clearline <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+<tr id="/lht_tree_doc/comm/flags_line/children/selected"><td> &nbsp;&nbsp;&nbsp;selected <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set when the object is selected.
+<tr id="/lht_tree_doc/comm/flags_line/children/auto"><td> &nbsp;&nbsp;&nbsp;auto <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines and vias, indicates that these were created by the autorouter.
+<tr id="/lht_tree_doc/comm/flags_line/children/rubberend"><td> &nbsp;&nbsp;&nbsp;rubberend <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> For lines, used internally for rubber band moves: indicates one end already rubber banding.
+<tr id="/lht_tree_doc/comm/flags_line/children/usetherm"><td> &nbsp;&nbsp;&nbsp;usetherm <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+<tr id="/lht_tree_doc/comm/flags_line/children/drc"><td> &nbsp;&nbsp;&nbsp;drc <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+<tr id="/lht_tree_doc/comm/flags_line/children/lock"><td> &nbsp;&nbsp;&nbsp;lock <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> Set for locked objects.
+<tr id="/lht_tree_doc/comm/flags_line/children/nonetlist"><td> &nbsp;&nbsp;&nbsp;nonetlist <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subcircuit is not on the netlist and should not interfere with the netlist 
+<tr id="/lht_tree_doc/comm/flags_line/children/termname"><td> &nbsp;&nbsp;&nbsp;termname <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> when set the names of pins are shown.
+<tr id="/lht_tree_doc/comm/flags_line/children/floater"><td> &nbsp;&nbsp;&nbsp;floater <td> <a href="#valtype:flag">flag</a> <td> &nbsp; <td> subc part can be moved after subc placing
+</table>
+<h3 id="/lht_tree_doc/comm/submenu">li:submenu</h3>
+<p>
+<table border=0 cellspacing=0>
+<tr><th align=left> type:name <th align=left> value <th align=left> ver <th align=left> description
+<tr id="/lht_tree_doc/comm/submenu"><td> li:submenu <td> &nbsp; <td> &nbsp; <td> ordered list of menu items for a submenu
+<tr id="/lht_tree_doc/comm/submenu/children/m"><td> &nbsp;m <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> mnemonic: single character that should be underlined and used as a hot key in the menu name
+<tr id="/lht_tree_doc/comm/submenu/children/-"><td> &nbsp;- <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> horizontal separator
+<tr id="/lht_tree_doc/comm/submenu/children/@ANCHOR"><td> &nbsp;@ANCHOR <td> <a href="#valtype:none">none</a> <td> &nbsp; <td> an anchor is an invisible placeholder where a dynamically generated set of menu items should be inserted runtime
+<tr id="/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME"><td> &nbsp;ha:SUBSUBMENUNAME <td> &nbsp; <td> &nbsp; <td> sub-submenu item: opens a new level of submenu when clicked
+<tr id="/lht_tree_doc/comm/submenu/children/m"><td> &nbsp;&nbsp;m <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> mnemonic: single character that should be underlined and used as a hot key in the menu name
+<tr id="/lht_tree_doc/comm/submenu/children/SUBSUBMENUNAME/children/submenu"><td> &nbsp;&nbsp;li:submenu <td> &nbsp; <td> &nbsp; <td> <a href="#/lht_tree_doc/comm/submenu">ordered list of menu items for a submenu -&gt; </a>
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME"><td> &nbsp;ha:LEAFSUBMENUNAME <td> &nbsp; <td> &nbsp; <td> leaf submenu item: executes an action when clicked
+<tr id="/lht_tree_doc/comm/submenu/children/m"><td> &nbsp;&nbsp;m <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> mnemonic: single character that should be underlined and used as a hot key in the menu name
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a1"><td> &nbsp;&nbsp;li:a <td> &nbsp; <td> &nbsp; <td> list of alternative hotkey sequences to activate the menu
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/a2"><td> &nbsp;&nbsp;a <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> a single hotkey sequences to activate the menu
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action1"><td> &nbsp;&nbsp;li:action <td> &nbsp; <td> &nbsp; <td> list of actions to execute when the menu is activated
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/action2"><td> &nbsp;&nbsp;action <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> a single action to execute when the menu is activated
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/tip"><td> &nbsp;&nbsp;tip <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> tooltip text
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/checked"><td> &nbsp;&nbsp;checked <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> the menu item has a checkbox; value is the action to execute to determine whether the menu item's checkbox is checked or not
+<tr id="/lht_tree_doc/comm/submenu/children/LEAFSUBMENUNAME/children/update_on"><td> &nbsp;&nbsp;update_on <td> <a href="#valtype:string">string</a> <td> &nbsp; <td> path of a conf node that triggers re-evaluation of the checkbox state
+</table>
+<h2 id="types"> Types </h2>
+<p>
+<table border=1 width=700>
+<tr><th> type <th> description
+<tr id="valtype:angle">
+	<td>angle
+	<td>
+ A decimal number without unit, representing an angle in degree. Can
+ be positive or negative.
+
+<tr id="valtype:coord">
+	<td>coord
+	<td>
+ A decimal number with a unit suffix. If the unit suffix is missing,
+ the coordinate is loaded in the internal units (which is nanometer as of 2018,
+ but could change in the future, thus files shall not depend on it). Depending
+ on the context, coordinates may have a sign (positive or negative).
+ <p>
+ Examples:
+<pre>
+x=10mil;
+y=1.5mm;
+dia=12cm;
+</pre>
+
+<tr id="valtype:coordtbl">
+	<td>coordtbl
+	<td>
+ A two-column table of coords. First column are X, second column are Y
+ coordinates.
+ <p>
+ Examples:
+<pre>
+ta:contour {
+ 1mm;   2.1mm;
+ 5mm;   5.2mm;
+ 3.7mm; 12mil;
+}
+ta:foo = { 1mm; 2.1mm;  5mm;   5.2mm;  3.7mm; 12mil; }
+</pre>
+
+<tr id="valtype:double">
+	<td>double
+	<td>
+ Unitless numeric value in decimal format. Depending on context it is
+ sometimes signed.
+
+<tr id="valtype:flag">
+	<td>flag
+	<td>
+ If the flag is set, the value is "1", if the flag is not set, the
+ whole key=value pair is omitted.
+
+<tr id="valtype:integer">
+	<td>integer
+	<td>
+ Unitless integer value in decimal format. Depending on context it is
+ sometimes signed.
+
+<tr id="valtype:minuid">
+	<td>minuid
+	<td>
+ An unique ID as generated by libminuid (24 ASCII characters).
+
+<tr id="valtype:none">
+	<td>none
+	<td>
+ No value.
+
+<tr id="valtype:string">
+	<td>string
+	<td>
+ Free form text data
+
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/lihata_format/tree.txt
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/tree.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/tree.txt	(revision 18980)
@@ -0,0 +1,601 @@
+File format root nodes
+
+Each table below describes the full tree of one of the pcb-rnd file formats, from the root.
+
+ha:pcb-rnd-board-v*
+
+type:name           value  ver description
+ha:pcb-rnd-board-v*            The full, self-contained description of a printed circuit board. This is the root of a board .lht file. The * after the v in the name is an integer which is the format version.
+ ha:meta                       Any meta-data that won't directly turn into physical material (e.g. copper).
+  board_name        string     User assigned name of the board
+  ha:grid                      User interface last grid settings
+   offs_x           coord      grid origin: X offset from 0;0
+   offs_y           coord      grid origin: Y offset from 0;0
+   spacing          coord      distance between two grid points both in X and Y directions
+  ha:size                      object size related settings
+   x                coord      drawing area size X (width)
+   y                coord      drawing area size Y (height)
+   isle_area_nm2    double     remove polygon islands smaller than this value, specified in mm^2
+   thermal_scale    double     scale all thermals on the board by this factor
+  ha:drc                       design rule checker settings for the old DRC
+   bloat            coord      Minimum copper spacing
+   shrink           coord      Minimum overlap between validly touching copper objects
+   min_width        coord      Minimum copper width
+   min_silk         coord      Minimum silk width
+   min_drill        coord      Minimum drill diameter
+   min_ring         coord      Minimum annular ring width
+  ha:cursor                    obsolete cursor/view state
+   x                coord      last positin, X (horizontal)
+   y                coord      last positin, Y (horizontal)
+   zoom             double     last view zoom factor
+ ha:layer_stack                physical layer stack information: geometry and properties of physical layers
+  li:groups                    ordered list of physical layers from top to bottom
+   ha:INTEGER                  a layer group (a physical layer of the board); the ID of the layer group is the integer in the name of the node
+    name            string     user assigned name of the layer group, e.g. "top copper"
+    ha:type                    a flag-list of layer type flag bits
+     top            flag       location: top side
+     bottom         flag       location: bottom side
+     intern         flag       location: internal
+     logical        flag       location: logical (not in the actual stackup)
+     copper         flag       material: copper
+     silk           flag       material: silk
+     mask           flag       material: mask
+     paste          flag       material: paste
+     outline        flag       "material": router path (board outline, slots, cutouts)
+     substrate      flag       material: substrate or insulator
+    li:layers                  ordered list of logical layer IDs hosted by this layer group
+ ha:font                       font kit: all fonts used on the board (if no font specified, default font will be used)
+  ha:FONT-ID                   the full description of a font; the node name is the integer font id or "geda_pcb" for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below ->
+ ha:styles                     routing styles hash: collection of all available routing syles
+ ha:netlists                   all availale netlists
+  li:netlist                   the input netlist (as seen in the last netlist import, a.k.a. forward annotation)
+   ha:NETNAME                  a network
+    li:conn                    list of terminals connceted to the network
+     diameter       string     refdes-terminal
+    ha:attributes          >=5 a hash of attribute key=value pairs
+     attrib-key     string     attribute value
+  li:netlist_patch             a list of intentional deviations from the input netlist, a.k.a. material for back annotation
+   li:net_info                 describe the current state of a net, as seen on the input
+    net             string     net name; first item on the list, only once
+    term            string     terminal name; zero or more items starting from the second item
+   ha:add_conn                 the 'as built' network requires a new conncetion to be created during the back annotation
+    net             string     net name the terminal should be added to
+    term            string     terminal name
+   ha:del_conn                 the 'as built' network requires an existing conncetion to be removed during the back annotation
+    net             string     net name the terminal should be removed from
+    term            string     terminal name
+   ha:change_attrib            the 'as built' network requires an attribute to be set or changed
+    net             string     net name whose attribute needs to be changed
+    key             string     key (name) of the attribute
+    val             string     new value of the attribute
+ li:conf                       complete pcb-rnd configuration tree ->
+ ha:data                       Layers and global objects of the board ->
+ ha:attributes                 a hash of attribute key=value pairs
+  attrib-key        string     attribute value
+
+li:pcb-rnd-conf-v1
+
+type:name           value ver description
+li:pcb-rnd-conf-v1            complete pcb-rnd configuration tree
+ ha:overwrite                 overwrite values while merging; children: a full or partial config tree
+ ha:prepend                   prepend values while merging; children: a full or partial config tree
+ ha:append                    append values while merging; children: a full or partial config tree
+
+li:pcb-rnd-font-v1
+
+type:name             value   ver description
+li:pcb-rnd-font-v1                font description
+ ha:FONT-ID                       the full description of a font; the node name is the integer font id or "geda_pcb" for font 0 (for historical reasons); the name is used only to make each node unique, the ID is also a field below
+  cell_height         coord       height of the tallest glyph
+  cell_width          coord       width of the widest glyph
+  id                  integer     unique font ID within the fontkit; fonts are referenced by ID
+  name                string      user specified, user readable font name
+  ha:symbols                      a collections of glyphs availbale in the font
+   ha:CHARACTER                   Description of a glyph (symbol). Node name is a signel ASCII character or is of format &xx where xx is a hex digit of the ASCII code of the character. Characters that must use the hex version are: codes below 33 or over
+                                  126, &, #, {, }, /, :, ;, =, \, :
+    height            coord       height of the glyph
+    width             coord       width of the glyph
+    delta             coord       extra space always inserted after the current symbol, before the next character
+    li:objects                    objects that make up the symbol; IDs are per symbol local IDs counted from 0
+     ha:line.ID                   round cap line, simplified
+      x1              coord       line first endpoint, horizontal offset
+      y1              coord       line first endpoint, vertical offset
+      x2              coord       line second endpoint, horizontal offset
+      y2              coord       line second endpoint, vertical offset
+      thickness       coord       width of the line
+     ha:simplearc.ID              round cap arc, simplified
+      x               coord       center, X coord
+      y               coord       center, Y coord
+      r               coord       radius (of the centerline of the arc)
+      thickness       coord       width of the pen the arc is drawn with
+      astart          angle       start angle
+      adelta          angle       delta angle
+     li:simplepoly.ID             round cap arc, simplified; contains a flat list of coords; each coord pair is an x;y corner of the outline of the polygon (odd indices are x coords, even indices are y coords)
+
+ha:menu
+
+type:name           value  ver description
+ha:                            Menu file
+ li:mouse                      mouse bindings
+  li:left                      actions to execute on left button click
+   li:press                    actions to execute on mouse button press when no modifier is pressed
+   li:press-shift              actions to execute on mouse button press when shift is pressed
+   li:press-ctrl               actions to execute on mouse button press when control is pressed
+   li:release                  actions to execute on mouse button release when no modifier is pressed
+   li:release-shift            actions to execute on mouse button release when shift is pressed
+   li:release-ctrl             actions to execute on mouse button release when control is pressed
+  li:middle                    actions to execute on middle button click
+   li:press                    actions to execute on mouse button press when no modifier is pressed
+   li:press-shift              actions to execute on mouse button press when shift is pressed
+   li:press-ctrl               actions to execute on mouse button press when control is pressed
+   li:release                  actions to execute on mouse button release when no modifier is pressed
+   li:release-shift            actions to execute on mouse button release when shift is pressed
+   li:release-ctrl             actions to execute on mouse button release when control is pressed
+  li:right                     actions to execute on right button click
+   li:press                    actions to execute on mouse button press when no modifier is pressed
+   li:press-shift              actions to execute on mouse button press when shift is pressed
+   li:press-ctrl               actions to execute on mouse button press when control is pressed
+   li:release                  actions to execute on mouse button release when no modifier is pressed
+   li:release-shift            actions to execute on mouse button release when shift is pressed
+   li:release-ctrl             actions to execute on mouse button release when control is pressed
+  li:scroll-up                 actions to execute on scroll wheel scolling up event
+   li:press                    actions to execute on mouse button press when no modifier is pressed
+   li:press-shift              actions to execute on mouse button press when shift is pressed
+   li:press-ctrl               actions to execute on mouse button press when control is pressed
+  li:scroll-down               actions to execute on scroll wheel scolling down event
+   li:press                    actions to execute on mouse button press when no modifier is pressed
+   li:press-shift              actions to execute on mouse button press when shift is pressed
+   li:press-ctrl               actions to execute on mouse button press when control is pressed
+ li:main_menu                  root of the main pull-down menu system; ordered list of main menus
+  ha:MENUNAME                  main menu name, e.g. "File"
+   m                string     mnemonic: single character that should be underlined and used as a hot key in the menu name
+   li:submenu                  ordered list of menu items for a submenu ->
+ li:popups                     collection of popup menus
+  ha:POPUPNAME                 popup menu name, e.g. "layer" for layer context menu
+   m                string     mnemonic: single character that should be underlined and used as a hot key in the menu name
+   li:submenu                  ordered list of menu items for a submenu ->
+
+ha:geda-project-v1
+
+type:name           value  ver description
+ha:geda-project-v1             Project file root. Except for "common", each software package should create a single subtree under the root; the subtree shall be named after the software package
+ ha:common                     project settings that should be common to all software packages
+  name              string     long name of the project
+  desc              string     description of the project
+  url               string     homepage of the project
+  vcs               string     main vcs url for the project
+  contact           string     author/maintainer contact info
+  li:files                     ordered list of source files being used by the project
+   ha:NAME                     a project member file
+    path            string     path to the file, relative to the project file
+    desc            string     description of the file
+    type            string     optional: type of the file; one of: "pcb", "schematic", "doc"
+  li:libs                      ordered list of libraries the project depends on
+   ha:NAME                     a library
+    path            string     path to the library, relative to the project file; all files and subdirectories under the root, recursively, are considered part of the library (must not be used together with url)
+    url             string     url to the library (must not be used together with path)
+    desc            string     description of the library
+    type            string     optional: type of the library; one of: "footprint" (for pcb design), "symbol" (for schematic), "sim" (models and subcircuits for e.g. spice simulation)
+ li:pcb-rnd-conf-v1            complete pcb-rnd configuration tree ->
+
+li:pcb-rnd-subcircuit-v*
+
+type:name                value  ver description
+li:pcb-rnd-subcircuit-v*            footprint file containing a single subcircuit
+ ha:subc.ID                     >=3 an instance (full copy) of a subcircuit
+  uid                    minuid     UID assigned by the user to track subc history
+  ha:attributes                     a hash of attribute key=value pairs
+   attrib-key            string     attribute value
+  ha:flags                          flag bits of a subcircuit
+   found                 flag       If set, this object has been found by FindConnection()
+   selected              flag       Set when the object is selected.
+   auto                  flag       For lines and vias, indicates that these were created by the autorouter.
+   drc                   flag       Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+   lock                  flag       Set for locked objects.
+   nonetlist             flag       subcircuit is not on the netlist and should not interfere with the netlist
+   termname              flag       when set the names of pins are shown.
+   floater               flag       subc part can be moved after subc placing
+  ha:data                           Layers and global objects of the board ->
+
+Common subtrees
+
+Each table below describes a subtree that usually does not specify a whole tree (thus they are usually not a valid file on their own). These subtrees are described in a separate table because they are used from multiple other trees.
+
+ha:data
+
+type:name               value    ver description
+ha:data                              Layers and global objects of the board
+ li:objects                          List of global (non-layer/multi-layer) objects
+  ha:padstack_ref.ID             >=4 a padstack reference (instance) placed on the board (e.g. used as a via)
+   proto                integer      padstack prototype ID to use, from the parent data's proto list
+   x                    coord        place padstack with origin at this horizontal coordinate
+   y                    coord        place padstack with origin at this vertical coordinate
+   clearance            coord        global clearance; if non-zero, overrides local (per shape) clearance
+   rot                  angle        rotation angle in degrees
+   xmirror              integer      0 or 1; if 1, mirror all shapes over the x (horizontal) axis (so that y coords are flipped)
+   smirror              integer      0 or 1; if 1, mirror the layer stackup: bottom becomes top, top becomes bottom (a.k.a. "place on the other side")
+   ha:attributes                     a hash of attribute key=value pairs
+    attrib-key          string       attribute value
+   ha:flags                          flag bits of a padstack
+    found               flag         If set, this object has been found by FindConnection()
+    hole                flag         For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+    clearline           flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+    selected            flag         Set when the object is selected.
+    auto                flag         For lines and vias, indicates that these were created by the autorouter.
+    warn                flag         For pins, vias, and pads, set to indicate a warning.
+    usetherm            flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+    drc                 flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+    lock                flag         Set for locked objects.
+    nonetlist           flag         subcircuit is not on the netlist and should not interfere with the netlist
+    termname            flag         when set the names of pins are shown.
+    floater             flag         subc part can be moved after subc placing
+   li:thermal                        list of thermal shapes, per layer
+    li:LAYERID                       integer layer ID the thermal affects; each word is a boolean flag that is either present on the list or is missing; only one shape may be present
+     on                 none         thermal is present on this layer; if not present, all other thermal flags are ignored on this layer
+     diag               none         thermal graphics is not axis aligned but diagonal (rotated by 45 degrees)
+     round              none         shape: rounded edge fingers
+     sharp              none         shape: sharp edge fingers
+     solid              none         shape: no thermal relief, solid connection without clearance
+     noshape            none         shape: special: omit copper shape of the padstack on this layer
+  ha:via.ID                      <=4 an old via object (loaded as padstack in the new model)
+   x                    coord        place padstack with origin at this horizontal coordinate
+   y                    coord        place padstack with origin at this vertical coordinate
+   thickness            coord        copper shape dimension (diameter)
+   clearance            coord        copper clearance around the copper shape
+   mask                 coord        mask cutout shape dimension (diameter)
+   hole                 coord        drill/hole diameter
+   name                 string       optional name attribute
+   number               string       for a pin (or to-be-pin) this is the terminal ID
+   ha:attributes                     a hash of attribute key=value pairs
+    attrib-key          string       attribute value
+   ha:flags_pinvia                   flag bits of a pin or via
+    found               flag         If set, this object has been found by FindConnection()
+    hole                flag         For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+    clearline           flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+    selected            flag         Set when the object is selected.
+    auto                flag         For lines and vias, indicates that these were created by the autorouter.
+    warn                flag         For pins, vias, and pads, set to indicate a warning.
+    usetherm            flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+    drc                 flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+    lock                flag         Set for locked objects.
+    nonetlist           flag         subcircuit is not on the netlist and should not interfere with the netlist
+    termname            flag         when set the names of pins are shown.
+    floater             flag         subc part can be moved after subc placing
+    pin                 flag         object is a pin (in an element)
+    via                 flag         object is a via
+ li:layers                           ordered list of layers; v1 required the order to be top-bottom physically; v1 also required silk layers to be at the end (same resrtictions as in the old .pcb format; only real (non-bound) layers have attributes)
+  ha:NAME                            a logical layer
+   lid                  integer  >=2 layer ID
+   visible              integer      only in real (non-boud) layers: 1 if the layer is visible, 0 if not (UI setting)
+   group                integer      only in real (non-boud) layers: "parent" layer group ID
+   color                string   >=5 layer color on UI, in #rrggbb format
+   stack_offs           integer      only in bound layers: match offset e.g. for internal copper layers
+   ha:type                           only for bound layers: try to bind to this type of layer on the host board
+    top                 flag         location: top side
+    bottom              flag         location: bottom side
+    intern              flag         location: internal
+    logical             flag         location: logical (not in the actual stackup)
+    copper              flag         material: copper
+    silk                flag         material: silk
+    mask                flag         material: mask
+    paste               flag         material: paste
+    outline             flag         "material": router path (board outline, slots, cutouts)
+    substrate           flag         material: substrate or insulator
+   combining                     >=2 layer combination (compositing) flags
+    sub                 flag         draw in negative
+    auto                flag         padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag
+   ha:attributes                     a hash of attribute key=value pairs
+    attrib-key          string       attribute value
+   li:objects                        list of drawing primitives put on this layer
+    ha:line.ID                       round cap line
+     x1                 coord        line first endpoint, horizontal offset
+     y1                 coord        line first endpoint, vertical offset
+     x2                 coord        line second endpoint, horizontal offset
+     y2                 coord        line second endpoint, vertical offset
+     thickness          coord        width of the line
+     clearance          coord        copper clearance around the object
+     ha:attributes                   a hash of attribute key=value pairs
+      attrib-key        string       attribute value
+     ha:flags                        flag bits of a line
+      found             flag         If set, this object has been found by FindConnection()
+      clearline         flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+      selected          flag         Set when the object is selected.
+      auto              flag         For lines and vias, indicates that these were created by the autorouter.
+      rubberend         flag         For lines, used internally for rubber band moves: indicates one end already rubber banding.
+      usetherm          flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+      drc               flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+      lock              flag         Set for locked objects.
+      nonetlist         flag         subcircuit is not on the netlist and should not interfere with the netlist
+      termname          flag         when set the names of pins are shown.
+      floater           flag         subc part can be moved after subc placing
+     li:thermal                      list of thermal flags for heavy terminals, on the single layer the object is on
+      on                none         draw any thermal only if this string is present; else normal clearance is applied
+      diag              none         if present, the thermal is diagonal (45 degree rotated)
+      round             none         if present, thermal shape is rounded
+      sharp             none         if present, thermal shape is sharp
+      solid             none         if present, there is no thermal but a solid connection ("join")
+    ha:arc.ID                        round cap elliptic arc (only width==height is fully supported at the moment)
+     x                  coord        center, X coord
+     y                  coord        center, Y coord
+     width              coord        radius (of the centerline of the arc) in X direction
+     height             coord        radius (of the centerline of the arc) in Y direction
+     thickness          coord        width of the pen the arc is drawn with
+     clearance          coord        copper clearance around the object
+     astart             angle        start angle
+     adelta             angle        delta angle
+     ha:attributes                   a hash of attribute key=value pairs
+      attrib-key        string       attribute value
+     ha:flags                        flag bits of a arc
+      found             flag         If set, this object has been found by FindConnection()
+      clearline         flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+      selected          flag         Set when the object is selected.
+      auto              flag         For lines and vias, indicates that these were created by the autorouter.
+      rubberend         flag         For lines, used internally for rubber band moves: indicates one end already rubber banding.
+      usetherm          flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+      drc               flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+      lock              flag         Set for locked objects.
+      nonetlist         flag         subcircuit is not on the netlist and should not interfere with the netlist
+      termname          flag         when set the names of pins are shown.
+      floater           flag         subc part can be moved after subc placing
+     li:thermal                      list of thermal flags for heavy terminals, on the single layer the object is on
+      on                none         draw any thermal only if this string is present; else normal clearance is applied
+      diag              none         if present, the thermal is diagonal (45 degree rotated)
+      round             none         if present, thermal shape is rounded
+      sharp             none         if present, thermal shape is sharp
+      solid             none         if present, there is no thermal but a solid connection ("join")
+    ha:polygon.ID                    polygon, as drawn (unclipped)
+     clearance          coord    >=3 copper clearance around the object
+     ha:attributes                   a hash of attribute key=value pairs
+      attrib-key        string       attribute value
+     ha:flags                        flag bits of a polygon
+      found             flag         If set, this object has been found by FindConnection()
+      clearpoly         flag         For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias.
+      fullpoly          flag         For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one).
+      selected          flag         Set when the object is selected.
+      auto              flag         For lines and vias, indicates that these were created by the autorouter.
+      drc               flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+      lock              flag         Set for locked objects.
+      nonetlist         flag         subcircuit is not on the netlist and should not interfere with the netlist
+      termname          flag         when set the names of pins are shown.
+      clearpolypoly     flag         For polygons, apply clearance to nearby polygons
+      floater           flag         subc part can be moved after subc placing
+     li:thermal                      list of thermal flags for heavy terminals, on the single layer the object is on
+      on                none         draw any thermal only if this string is present; else normal clearance is applied
+      diag              none         if present, the thermal is diagonal (45 degree rotated)
+      round             none         if present, thermal shape is rounded
+      sharp             none         if present, thermal shape is sharp
+      solid             none         if present, there is no thermal but a solid connection ("join")
+     li:geometry                     first item is the outer contour, subsequent, optional items are holes
+      contour           coordtbl     2 column table of x;y coords for the outer contour
+      hole              coordtbl     2 column table of x;y coords for a hole
+    ha:text.ID                       single line text object
+     x                  coord        placement: X coord
+     y                  coord        placement: Y coord
+     role               string       when part of an old element, determines which of the three hardwired text object role is used (footprint, refdes or value)
+     string             string       text string (payload)
+     fid                integer      font ID
+     scale              integer      text size scale in %
+     direction          integer      rotation in 90 degree steps (0 is horizontal)
+     ha:attributes                   a hash of attribute key=value pairs
+      attrib-key        string       attribute value
+     ha:flags                        flag bits of a text
+      found             flag         If set, this object has been found by FindConnection()
+      clearline         flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+      selected          flag         Set when the object is selected.
+      onsolder          flag         For text, indicates that it is on the solder side.
+      auto              flag         For lines and vias, indicates that these were created by the autorouter.
+      drc               flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+      lock              flag         Set for locked objects.
+      nonetlist         flag         subcircuit is not on the netlist and should not interfere with the netlist
+      termname          flag         when set the names of pins are shown.
+      dyntext           flag         For text: dynamic string (substitute %patterns%)
+      floater           flag         subc part can be moved after subc placing
+ li:padstack_prototypes          >=4
+  unused                none         placeholder for markign uunsed slot to keep slot indices for early lihata v4
+  ha:ps_proto_v4.PID                 padstack prototype specification, as introduced in lihata board v4
+   hdia                 coord        hole diameter; 0 means no hole
+   htop                 integer      hole start: copper layer index from the top (positive) or bottom (negative) copper layer (0 means top copper layer)
+   hbottom              integer      hole start: copper layer index from the bottom (positive) or top (negative) copper layer (0 means bottom copper layer)
+   plated               integer      0=unplated hole; 1=plated hole
+   name                 string   >=5 optional user assigned prototype name
+   li:shape                          shape per layer type definition
+    ha:ps_shape_v4                   shape on a specific layer type (specified by layer_mask and combining), as specifie in lihata board v4; shape is either ps_poly, ps_line or ps_circ (only one of these will present per layer type); shape coords are
+                                     relative to padstack origin
+     ha:layer_mask                   layer type and location
+      top               flag         location: top side
+      bottom            flag         location: bottom side
+      intern            flag         location: internal
+      logical           flag         location: logical (not in the actual stackup)
+      copper            flag         material: copper
+      silk              flag         material: silk
+      mask              flag         material: mask
+      paste             flag         material: paste
+      outline           flag         "material": router path (board outline, slots, cutouts)
+      substrate         flag         material: substrate or insulator
+     combining                       layer compositing match
+      sub               flag         draw in negative
+      auto              flag         padstacks draw their paste, mask and silk objects on the first layer (of matching type) that features the auto flag
+     clearance          coord        local, per-layer-type clearance; applied if global padstack clearance is 0
+     li:ps_poly                      arbitrary convex polygon shape; contains a list of x;y coordinates
+     ha:ps_line                      straight line shape, round or square cap
+      x1                coord        line first endpoint, horizontal offset
+      y1                coord        line first endpoint, vertical offset
+      x2                coord        line second endpoint, horizontal offset
+      y2                coord        line second endpoint, vertical offset
+      thickness         coord        width of the line
+      square            integer      0=round cap; 1=square cap
+     ha:ps_circ                      filled circle shape
+      x                 coord        center, horizontal offset
+      y                 coord        center, vertical offset
+      dia               coord        circle diameter
+ ha:subc.ID                      >=3 an instance (full copy) of a subcircuit
+  uid                   minuid       UID assigned by the user to track subc history
+  ha:attributes                      a hash of attribute key=value pairs
+   attrib-key           string       attribute value
+  ha:flags                           flag bits of a subcircuit
+   found                flag         If set, this object has been found by FindConnection()
+   selected             flag         Set when the object is selected.
+   auto                 flag         For lines and vias, indicates that these were created by the autorouter.
+   drc                  flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+   lock                 flag         Set for locked objects.
+   nonetlist            flag         subcircuit is not on the netlist and should not interfere with the netlist
+   termname             flag         when set the names of pins are shown.
+   floater              flag         subc part can be moved after subc placing
+  ha:data                            Layers and global objects of the board ->
+ ha:element.ID                   <3  an instance (full copy) of an obsolete element footprint
+  x                     coord        element origin (diamond), horizontal offset
+  y                     coord        element origin (diamond), vertical offset
+  ha:attributes                      a hash of attribute key=value pairs
+   attrib-key           string       attribute value
+  ha:flags_element                   flag bits of an element
+   found                flag         If set, this object has been found by FindConnection()
+   selected             flag         Set when the object is selected.
+   auto                 flag         For lines and vias, indicates that these were created by the autorouter.
+   drc                  flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+   lock                 flag         Set for locked objects.
+   nonetlist            flag         subcircuit is not on the netlist and should not interfere with the netlist
+   termname             flag         when set the names of pins are shown.
+   floater              flag         subc part can be moved after subc placing
+   onsolder             flag         element is placed on the solder side
+  li:objects                         list of special objects that make up the element; lines and arcs are always on a silk layer
+   ha:line.ID                        round cap line ->
+   ha:arc.ID                         round cap elliptic arc (only width==height is fully supported at the moment) ->
+   ha:text.ID                        single line text object ->
+   ha:pad.ID                         SMD pad emulated using a line object; becomes a rectangle (but watch out for the cap-extended length!) when the square flag is set
+    x1                  coord        line first endpoint, horizontal offset
+    y1                  coord        line first endpoint, vertical offset
+    x2                  coord        line second endpoint, horizontal offset
+    y2                  coord        line second endpoint, vertical offset
+    thickness           coord        width of the line
+    clearance           coord        clearance around the line
+    mask                coord        size of the mask cutout, as interpreted by gEDA/PCB
+    name                string       symbolic name of the pad
+    number              string       "pin number" for the netlist
+    ha:attributes                    a hash of attribute key=value pairs
+     attrib-key         string       attribute value
+    ha:flags_pad                     flag bits of a pad
+     found              flag         If set, this object has been found by FindConnection()
+     hole               flag         For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+     clearline          flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+     selected           flag         Set when the object is selected.
+     auto               flag         For lines and vias, indicates that these were created by the autorouter.
+     warn               flag         For pins, vias, and pads, set to indicate a warning.
+     usetherm           flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+     drc                flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+     lock               flag         Set for locked objects.
+     nonetlist          flag         subcircuit is not on the netlist and should not interfere with the netlist
+     termname           flag         when set the names of pins are shown.
+     floater            flag         subc part can be moved after subc placing
+     pin                flag         object is a pin (in an element)
+     via                flag         object is a via
+   ha:pin.ID                         thru-hole pin; emulated as an old-style via
+    x                   coord        place padstack with origin at this horizontal coordinate
+    y                   coord        place padstack with origin at this vertical coordinate
+    thickness           coord        copper shape dimension (diameter)
+    clearance           coord        copper clearance around the copper shape
+    mask                coord        mask cutout shape dimension (diameter)
+    hole                coord        drill/hole diameter
+    name                string       optional name attribute
+    number              string       for a pin (or to-be-pin) this is the terminal ID
+    ha:attributes                    a hash of attribute key=value pairs
+     attrib-key         string       attribute value
+    ha:flags_pinvia                  flag bits of a pin or via
+     found              flag         If set, this object has been found by FindConnection()
+     hole               flag         For pins and vias, this flag means that the pin or via is a hole without a copper annulus.
+     clearline          flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+     selected           flag         Set when the object is selected.
+     auto               flag         For lines and vias, indicates that these were created by the autorouter.
+     warn               flag         For pins, vias, and pads, set to indicate a warning.
+     usetherm           flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+     drc                flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+     lock               flag         Set for locked objects.
+     nonetlist          flag         subcircuit is not on the netlist and should not interfere with the netlist
+     termname           flag         when set the names of pins are shown.
+     floater            flag         subc part can be moved after subc placing
+     pin                flag         object is a pin (in an element)
+     via                flag         object is a via
+ ha:rat.ID                           global rat line
+  x1                    coord        line first endpoint, horizontal offset
+  y1                    coord        line first endpoint, vertical offset
+  x2                    coord        line second endpoint, horizontal offset
+  y2                    coord        line second endpoint, vertical offset
+  lgrp1                 integer      first endpoint's layer group ID
+  lgrp2                 integer      second endpoint's layer group ID
+  ha:attributes                      a hash of attribute key=value pairs
+   attrib-key           string       attribute value
+  ha:flags                           flag bits of a line
+   found                flag         If set, this object has been found by FindConnection()
+   clearline            flag         For lines and arcs, the line/arc will clear polygons instead of connecting to them.
+   selected             flag         Set when the object is selected.
+   auto                 flag         For lines and vias, indicates that these were created by the autorouter.
+   rubberend            flag         For lines, used internally for rubber band moves: indicates one end already rubber banding.
+   usetherm             flag         Obsolete, indicates that pins/vias should be drawn with thermal fingers.
+   drc                  flag         Set for objects that fail DRC: flag like FOUND flag for DRC checking.
+   lock                 flag         Set for locked objects.
+   nonetlist            flag         subcircuit is not on the netlist and should not interfere with the netlist
+   termname             flag         when set the names of pins are shown.
+   floater              flag         subc part can be moved after subc placing
+
+li:submenu
+
+type:name           value  ver description
+li:submenu                     ordered list of menu items for a submenu
+ m                  string     mnemonic: single character that should be underlined and used as a hot key in the menu name
+ -                  none       horizontal separator
+ @ANCHOR            none       an anchor is an invisible placeholder where a dynamically generated set of menu items should be inserted runtime
+ ha:SUBSUBMENUNAME             sub-submenu item: opens a new level of submenu when clicked
+  m                 string     mnemonic: single character that should be underlined and used as a hot key in the menu name
+  li:submenu                   ordered list of menu items for a submenu ->
+ ha:LEAFSUBMENUNAME            leaf submenu item: executes an action when clicked
+  m                 string     mnemonic: single character that should be underlined and used as a hot key in the menu name
+  li:a                         list of alternative hotkey sequences to activate the menu
+  a                 string     a single hotkey sequences to activate the menu
+  li:action                    list of actions to execute when the menu is activated
+  action            string     a single action to execute when the menu is activated
+  tip               string     tooltip text
+  checked           string     the menu item has a checkbox; value is the action to execute to determine whether the menu item's checkbox is checked or not
+  update_on         string     path of a conf node that triggers re-evaluation of the checkbox state
+
+Types
+
++--------------------------------------------------------------------------------------------------+
+|  type  |                                       description                                       |
+|--------+-----------------------------------------------------------------------------------------|
+|angle   |A decimal number without unit, representing an angle in degree. Can be positive or       |
+|        |negative.                                                                                |
+|--------+-----------------------------------------------------------------------------------------|
+|        |A decimal number with a unit suffix. If the unit suffix is missing, the coordinate is    |
+|        |loaded in the internal units (which is nanometer as of 2018, but could change in the     |
+|        |future, thus files shall not depend on it). Depending on the context, coordinates may    |
+|        |have a sign (positive or negative).                                                      |
+|coord   |                                                                                         |
+|        |Examples:                                                                                |
+|        |                                                                                         |
+|        |x=10mil;                                                                                 |
+|        |y=1.5mm;                                                                                 |
+|        |dia=12cm;                                                                                |
+|--------+-----------------------------------------------------------------------------------------|
+|        |A two-column table of coords. First column are X, second column are Y coordinates.       |
+|        |                                                                                         |
+|        |Examples:                                                                                |
+|        |                                                                                         |
+|coordtbl|ta:contour {                                                                             |
+|        | 1mm;   2.1mm;                                                                           |
+|        | 5mm;   5.2mm;                                                                           |
+|        | 3.7mm; 12mil;                                                                           |
+|        |}                                                                                        |
+|        |ta:foo = { 1mm; 2.1mm;  5mm;   5.2mm;  3.7mm; 12mil; }                                   |
+|--------+-----------------------------------------------------------------------------------------|
+|double  |Unitless numeric value in decimal format. Depending on context it is sometimes signed.   |
+|--------+-----------------------------------------------------------------------------------------|
+|flag    |If the flag is set, the value is "1", if the flag is not set, the whole key=value pair is|
+|        |omitted.                                                                                 |
+|--------+-----------------------------------------------------------------------------------------|
+|integer |Unitless integer value in decimal format. Depending on context it is sometimes signed.   |
+|--------+-----------------------------------------------------------------------------------------|
+|minuid  |An unique ID as generated by libminuid (24 ASCII characters).                            |
+|--------+-----------------------------------------------------------------------------------------|
+|none    |No value.                                                                                |
+|--------+-----------------------------------------------------------------------------------------|
+|string  |Free form text data                                                                      |
++--------------------------------------------------------------------------------------------------+
Index: tags/2.0.1/doc/developer/lihata_format/types.lht
===================================================================
--- tags/2.0.1/doc/developer/lihata_format/types.lht	(nonexistent)
+++ tags/2.0.1/doc/developer/lihata_format/types.lht	(revision 18980)
@@ -0,0 +1,65 @@
+ha:lht_tree_doc { ha:types {
+
+angle {
+	A decimal number without unit, representing an angle in degree. Can
+	be positive or negative.
+}
+
+coord {
+	A decimal number with a unit suffix. If the unit suffix is missing,
+	the coordinate is loaded in the internal units (which is nanometer as of 2018,
+	but could change in the future, thus files shall not depend on it). Depending
+	on the context, coordinates may have a sign (positive or negative).
+	<p>
+	Examples:
+<pre>
+x=10mil;
+y=1.5mm;
+dia=12cm;
+</pre>
+}
+
+coordtbl {
+	A two-column table of coords. First column are X, second column are Y
+	coordinates.
+	<p>
+	Examples:
+<pre>
+ta:contour {
+	1mm;   2.1mm;
+	5mm;   5.2mm;
+	3.7mm; 12mil;
+\}
+ta:foo = { 1mm; 2.1mm;  5mm;   5.2mm;  3.7mm; 12mil; \}
+</pre>
+}
+
+double {
+	Unitless numeric value in decimal format. Depending on context it is
+	sometimes signed.
+}
+
+flag {
+	If the flag is set, the value is "1", if the flag is not set, the
+	whole key=value pair is omitted.
+}
+
+integer {
+	Unitless integer value in decimal format. Depending on context it is
+	sometimes signed.
+}
+
+minuid {
+	An unique ID as generated by libminuid (24 ASCII characters).
+}
+
+none {
+	No value.
+}
+
+string {
+	Free form text data
+}
+
+}}
+
Index: tags/2.0.1/doc/developer/mods3/README
===================================================================
--- tags/2.0.1/doc/developer/mods3/README	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/README	(revision 18980)
@@ -0,0 +1,10 @@
+Run ./gne.sh to regenerate index.html.
+
+It depends on the following tools to be installed:
+
+- shell, awk
+- sloccount
+- netpbm
+- animator (svn://repo.hu/animator/trunk)
+- animpie - needs to be symlinked or copied to path from animator/test (sorry)
+
Index: tags/2.0.1/doc/developer/mods3/after.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/after.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/after.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/after.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/after.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/before.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/before.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/before.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/before.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/before.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/deps.svg
===================================================================
--- tags/2.0.1/doc/developer/mods3/deps.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/deps.svg	(revision 18980)
@@ -0,0 +1,1158 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: plugin_deps Pages: 1 -->
+<svg width="5484pt" height="4960pt"
+ viewBox="0.00 0.00 5484.35 4959.58" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 4955.58)">
+<title>plugin_deps</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-4955.58 5480.35,-4955.58 5480.35,4 -4,4"/>
+<!-- user -->
+<g id="node1" class="node"><title>user</title>
+<ellipse fill="none" stroke="black" cx="1540.08" cy="-2599.41" rx="27" ry="18"/>
+<text text-anchor="middle" x="1540.08" y="-2595.71" font-family="Times,serif" font-size="14.00">user</text>
+</g>
+<!-- acompnet -->
+<g id="node2" class="node"><title>acompnet</title>
+<ellipse fill="lightgrey" stroke="black" cx="4967" cy="-2205.37" rx="45.4919" ry="18"/>
+<text text-anchor="middle" x="4967" y="-2201.67" font-family="Times,serif" font-size="14.00">acompnet</text>
+</g>
+<!-- user&#45;&gt;acompnet -->
+<g id="edge1" class="edge"><title>user&#45;&gt;acompnet</title>
+<path fill="none" stroke="#a0a0a0" d="M1567.16,-2596.29C1863.56,-2562.21 4500.72,-2258.98 4912.92,-2211.59"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4913.54,-2215.04 4923.08,-2210.42 4912.74,-2208.09 4913.54,-2215.04"/>
+</g>
+<!-- autocrop -->
+<g id="node3" class="node"><title>autocrop</title>
+<ellipse fill="lightgrey" stroke="black" cx="4954.65" cy="-2366.28" rx="41.6928" ry="18"/>
+<text text-anchor="middle" x="4954.65" y="-2362.58" font-family="Times,serif" font-size="14.00">autocrop</text>
+</g>
+<!-- user&#45;&gt;autocrop -->
+<g id="edge2" class="edge"><title>user&#45;&gt;autocrop</title>
+<path fill="none" stroke="#a0a0a0" d="M1567.07,-2597.57C1863.02,-2577.36 4501.18,-2397.24 4903.34,-2369.78"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4903.77,-2373.26 4913.5,-2369.09 4903.29,-2366.28 4903.77,-2373.26"/>
+</g>
+<!-- autoplace -->
+<g id="node4" class="node"><title>autoplace</title>
+<ellipse fill="lightgrey" stroke="black" cx="4930.01" cy="-2525.77" rx="44.393" ry="18"/>
+<text text-anchor="middle" x="4930.01" y="-2522.07" font-family="Times,serif" font-size="14.00">autoplace</text>
+</g>
+<!-- user&#45;&gt;autoplace -->
+<g id="edge3" class="edge"><title>user&#45;&gt;autoplace</title>
+<path fill="none" stroke="#a0a0a0" d="M1567.37,-2598.81C1862.77,-2592.4 4465.11,-2535.87 4875.6,-2526.95"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4875.8,-2530.45 4885.72,-2526.73 4875.65,-2523.45 4875.8,-2530.45"/>
+</g>
+<!-- autoroute -->
+<g id="node5" class="node"><title>autoroute</title>
+<ellipse fill="lightgrey" stroke="black" cx="2200.97" cy="-2362.04" rx="44.393" ry="18"/>
+<text text-anchor="middle" x="2200.97" y="-2358.34" font-family="Times,serif" font-size="14.00">autoroute</text>
+</g>
+<!-- user&#45;&gt;autoroute -->
+<g id="edge5" class="edge"><title>user&#45;&gt;autoroute</title>
+<path fill="none" stroke="#a0a0a0" d="M1563.99,-2590.82C1661.66,-2555.74 2031.17,-2423.03 2157.96,-2377.49"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2159.49,-2380.66 2167.72,-2373.99 2157.12,-2374.07 2159.49,-2380.66"/>
+</g>
+<!-- boardflip -->
+<g id="node7" class="node"><title>boardflip</title>
+<ellipse fill="lightgrey" stroke="black" cx="4893.24" cy="-2682.91" rx="42.7926" ry="18"/>
+<text text-anchor="middle" x="4893.24" y="-2679.21" font-family="Times,serif" font-size="14.00">boardflip</text>
+</g>
+<!-- user&#45;&gt;boardflip -->
+<g id="edge6" class="edge"><title>user&#45;&gt;boardflip</title>
+<path fill="none" stroke="#a0a0a0" d="M1567.07,-2600.08C1859.43,-2607.36 4436.18,-2671.53 4840.08,-2681.59"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4840.22,-2685.09 4850.3,-2681.84 4840.4,-2678.09 4840.22,-2685.09"/>
+</g>
+<!-- diag -->
+<g id="node8" class="node"><title>diag</title>
+<ellipse fill="lightgrey" stroke="black" cx="4844.55" cy="-2836.77" rx="27" ry="18"/>
+<text text-anchor="middle" x="4844.55" y="-2833.07" font-family="Times,serif" font-size="14.00">diag</text>
+</g>
+<!-- user&#45;&gt;diag -->
+<g id="edge7" class="edge"><title>user&#45;&gt;diag</title>
+<path fill="none" stroke="#a0a0a0" d="M1567.16,-2601.35C1861.64,-2622.51 4464.74,-2809.49 4807.38,-2834.1"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4807.29,-2837.61 4817.52,-2834.83 4807.8,-2830.62 4807.29,-2837.61"/>
+</g>
+<!-- dialogs -->
+<g id="node9" class="node"><title>dialogs</title>
+<ellipse fill="lightgrey" stroke="black" cx="4784.22" cy="-2986.46" rx="36.2938" ry="18"/>
+<text text-anchor="middle" x="4784.22" y="-2982.76" font-family="Times,serif" font-size="14.00">dialogs</text>
+</g>
+<!-- user&#45;&gt;dialogs -->
+<g id="edge8" class="edge"><title>user&#45;&gt;dialogs</title>
+<path fill="none" stroke="#a0a0a0" d="M1566.67,-2602.58C1853.28,-2636.77 4367.59,-2936.75 4738.57,-2981.01"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4738.33,-2984.51 4748.67,-2982.21 4739.16,-2977.55 4738.33,-2984.51"/>
+</g>
+<!-- distalign -->
+<g id="node10" class="node"><title>distalign</title>
+<ellipse fill="lightgrey" stroke="black" cx="4712.61" cy="-3131.08" rx="40.8928" ry="18"/>
+<text text-anchor="middle" x="4712.61" y="-3127.38" font-family="Times,serif" font-size="14.00">distalign</text>
+</g>
+<!-- user&#45;&gt;distalign -->
+<g id="edge9" class="edge"><title>user&#45;&gt;distalign</title>
+<path fill="none" stroke="#a0a0a0" d="M1566.55,-2603.84C1848.15,-2651.04 4288.85,-3060.07 4664.24,-3122.97"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4663.79,-3126.45 4674.23,-3124.65 4664.95,-3119.55 4663.79,-3126.45"/>
+</g>
+<!-- distaligntext -->
+<g id="node11" class="node"><title>distaligntext</title>
+<ellipse fill="lightgrey" stroke="black" cx="4630.14" cy="-3269.8" rx="53.8905" ry="18"/>
+<text text-anchor="middle" x="4630.14" y="-3266.1" font-family="Times,serif" font-size="14.00">distaligntext</text>
+</g>
+<!-- user&#45;&gt;distaligntext -->
+<g id="edge10" class="edge"><title>user&#45;&gt;distaligntext</title>
+<path fill="none" stroke="#a0a0a0" d="M1565.87,-2605C1838.19,-2664.08 4183.69,-3172.94 4574.92,-3257.82"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4574.35,-3261.28 4584.86,-3259.98 4575.83,-3254.44 4574.35,-3261.28"/>
+</g>
+<!-- djopt -->
+<g id="node12" class="node"><title>djopt</title>
+<ellipse fill="lightgrey" stroke="black" cx="4537.29" cy="-3401.8" rx="28.6953" ry="18"/>
+<text text-anchor="middle" x="4537.29" y="-3398.1" font-family="Times,serif" font-size="14.00">djopt</text>
+</g>
+<!-- user&#45;&gt;djopt -->
+<g id="edge11" class="edge"><title>user&#45;&gt;djopt</title>
+<path fill="none" stroke="#a0a0a0" d="M1565.54,-2606.22C1836.2,-2678.68 4180.16,-3306.19 4500.97,-3392.08"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4500.13,-3395.48 4510.7,-3394.68 4501.94,-3388.71 4500.13,-3395.48"/>
+</g>
+<!-- draw_fab -->
+<g id="node14" class="node"><title>draw_fab</title>
+<ellipse fill="lightgrey" stroke="black" cx="4434.61" cy="-3526.31" rx="44.393" ry="18"/>
+<text text-anchor="middle" x="4434.61" y="-3522.61" font-family="Times,serif" font-size="14.00">draw_fab</text>
+</g>
+<!-- user&#45;&gt;draw_fab -->
+<g id="edge13" class="edge"><title>user&#45;&gt;draw_fab</title>
+<path fill="none" stroke="#a0a0a0" d="M1564.67,-2607.28C1823.46,-2690.15 4045.02,-3401.55 4389.75,-3511.94"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4388.8,-3515.31 4399.39,-3515.03 4390.94,-3508.65 4388.8,-3515.31"/>
+</g>
+<!-- report -->
+<g id="node15" class="node"><title>report</title>
+<ellipse fill="lightgrey" stroke="black" cx="4322.71" cy="-3642.59" rx="31.6951" ry="18"/>
+<text text-anchor="middle" x="4322.71" y="-3638.89" font-family="Times,serif" font-size="14.00">report</text>
+</g>
+<!-- user&#45;&gt;report -->
+<g id="edge127" class="edge"><title>user&#45;&gt;report</title>
+<path fill="none" stroke="#a0a0a0" d="M1563.72,-2608.27C1814.22,-2702.18 3977.73,-3513.26 4286.17,-3628.89"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4285.37,-3632.33 4295.96,-3632.56 4287.82,-3625.77 4285.37,-3632.33"/>
+</g>
+<!-- export_bboard -->
+<g id="node17" class="node"><title>export_bboard</title>
+<ellipse fill="#a0ffff" stroke="black" cx="4202.22" cy="-3749.96" rx="61.99" ry="18"/>
+<text text-anchor="middle" x="4202.22" y="-3746.26" font-family="Times,serif" font-size="14.00">export_bboard</text>
+</g>
+<!-- user&#45;&gt;export_bboard -->
+<g id="edge14" class="edge"><title>user&#45;&gt;export_bboard</title>
+<path fill="none" stroke="#a0a0a0" d="M1563.09,-2609.35C1802.26,-2712.72 3831.57,-3589.77 4157.99,-3730.84"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4157.02,-3734.23 4167.58,-3734.99 4159.79,-3727.81 4157.02,-3734.23"/>
+</g>
+<!-- export_bom -->
+<g id="node18" class="node"><title>export_bom</title>
+<ellipse fill="#a0ffff" stroke="black" cx="4073.88" cy="-3847.79" rx="53.8905" ry="18"/>
+<text text-anchor="middle" x="4073.88" y="-3844.09" font-family="Times,serif" font-size="14.00">export_bom</text>
+</g>
+<!-- user&#45;&gt;export_bom -->
+<g id="edge15" class="edge"><title>user&#45;&gt;export_bom</title>
+<path fill="none" stroke="#a0a0a0" d="M1561.98,-2610.2C1790.23,-2722.65 3731.38,-3679.05 4034.22,-3828.26"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4032.99,-3831.55 4043.5,-3832.83 4036.08,-3825.27 4032.99,-3831.55"/>
+</g>
+<!-- export_dsn -->
+<g id="node19" class="node"><title>export_dsn</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3938.42" cy="-3935.52" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="3938.42" y="-3931.82" font-family="Times,serif" font-size="14.00">export_dsn</text>
+</g>
+<!-- user&#45;&gt;export_dsn -->
+<g id="edge16" class="edge"><title>user&#45;&gt;export_dsn</title>
+<path fill="none" stroke="#a0a0a0" d="M1560.81,-2610.96C1777.2,-2731.51 3620.12,-3758.19 3902.25,-3915.37"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3900.81,-3918.57 3911.25,-3920.38 3904.22,-3912.46 3900.81,-3918.57"/>
+</g>
+<!-- export_dxf -->
+<g id="node20" class="node"><title>export_dxf</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3796.64" cy="-4012.61" rx="49.2915" ry="18"/>
+<text text-anchor="middle" x="3796.64" y="-4008.91" font-family="Times,serif" font-size="14.00">export_dxf</text>
+</g>
+<!-- user&#45;&gt;export_dxf -->
+<g id="edge17" class="edge"><title>user&#45;&gt;export_dxf</title>
+<path fill="none" stroke="#a0a0a0" d="M1559.93,-2611.84C1765.14,-2740.35 3497.56,-3825.31 3762.67,-3991.33"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3761.14,-3994.51 3771.47,-3996.85 3764.86,-3988.58 3761.14,-3994.51"/>
+</g>
+<!-- export_fidocadj -->
+<g id="node21" class="node"><title>export_fidocadj</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3420.34" cy="-1698.97" rx="66.0889" ry="18"/>
+<text text-anchor="middle" x="3420.34" y="-1695.27" font-family="Times,serif" font-size="14.00">export_fidocadj</text>
+</g>
+<!-- user&#45;&gt;export_fidocadj -->
+<g id="edge19" class="edge"><title>user&#45;&gt;export_fidocadj</title>
+<path fill="none" stroke="#a0a0a0" d="M1562.17,-2588.83C1752.87,-2497.5 3119.8,-1842.9 3378.24,-1719.13"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3379.8,-1722.27 3387.31,-1714.79 3376.78,-1715.95 3379.8,-1722.27"/>
+</g>
+<!-- export_gcode -->
+<g id="node22" class="node"><title>export_gcode</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3649.38" cy="-4078.63" rx="58.4896" ry="18"/>
+<text text-anchor="middle" x="3649.38" y="-4074.93" font-family="Times,serif" font-size="14.00">export_gcode</text>
+</g>
+<!-- user&#45;&gt;export_gcode -->
+<g id="edge20" class="edge"><title>user&#45;&gt;export_gcode</title>
+<path fill="none" stroke="#a0a0a0" d="M1558.96,-2612.65C1752.17,-2748.14 3368.4,-3881.58 3617.26,-4056.11"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3615.34,-4059.03 3625.53,-4061.91 3619.36,-4053.3 3615.34,-4059.03"/>
+</g>
+<!-- export_gerber -->
+<g id="node23" class="node"><title>export_gerber</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3497.49" cy="-4133.18" rx="59.5901" ry="18"/>
+<text text-anchor="middle" x="3497.49" y="-4129.48" font-family="Times,serif" font-size="14.00">export_gerber</text>
+</g>
+<!-- user&#45;&gt;export_gerber -->
+<g id="edge21" class="edge"><title>user&#45;&gt;export_gerber</title>
+<path fill="none" stroke="#a0a0a0" d="M1557.6,-2613.14C1737,-2753.71 3238.4,-3930.16 3468.07,-4110.12"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3465.97,-4112.92 3476,-4116.34 3470.29,-4107.41 3465.97,-4112.92"/>
+</g>
+<!-- export_ipcd356 -->
+<g id="node24" class="node"><title>export_ipcd356</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3451.29" cy="-1742.97" rx="65.7887" ry="18"/>
+<text text-anchor="middle" x="3451.29" y="-1739.27" font-family="Times,serif" font-size="14.00">export_ipcd356</text>
+</g>
+<!-- user&#45;&gt;export_ipcd356 -->
+<g id="edge23" class="edge"><title>user&#45;&gt;export_ipcd356</title>
+<path fill="none" stroke="#a0a0a0" d="M1562.54,-2589.34C1756.17,-2502.58 3142.84,-1881.19 3407.65,-1762.53"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3409.26,-1765.64 3416.95,-1758.36 3406.39,-1759.25 3409.26,-1765.64"/>
+</g>
+<!-- export_lpr -->
+<g id="node25" class="node"><title>export_lpr</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3341.88" cy="-4175.94" rx="47.3916" ry="18"/>
+<text text-anchor="middle" x="3341.88" y="-4172.24" font-family="Times,serif" font-size="14.00">export_lpr</text>
+</g>
+<!-- user&#45;&gt;export_lpr -->
+<g id="edge25" class="edge"><title>user&#45;&gt;export_lpr</title>
+<path fill="none" stroke="#a0a0a0" d="M1556.49,-2613.76C1722.99,-2759.45 3105.22,-3968.87 3315.19,-4152.59"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3313.14,-4155.45 3322.97,-4159.4 3317.75,-4150.18 3313.14,-4155.45"/>
+</g>
+<!-- export_ps -->
+<g id="node26" class="node"><title>export_ps</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3183.45" cy="-4206.67" rx="45.4919" ry="18"/>
+<text text-anchor="middle" x="3183.45" y="-4202.97" font-family="Times,serif" font-size="14.00">export_ps</text>
+</g>
+<!-- user&#45;&gt;export_ps -->
+<g id="edge32" class="edge"><title>user&#45;&gt;export_ps</title>
+<path fill="none" stroke="#a0a0a0" d="M1555.3,-2614.29C1708.25,-2763.89 2966.56,-3994.55 3158.84,-4182.6"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3156.62,-4185.33 3166.22,-4189.82 3161.52,-4180.32 3156.62,-4185.33"/>
+</g>
+<!-- export_nelma -->
+<g id="node27" class="node"><title>export_nelma</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3023.13" cy="-4225.18" rx="59.5901" ry="18"/>
+<text text-anchor="middle" x="3023.13" y="-4221.48" font-family="Times,serif" font-size="14.00">export_nelma</text>
+</g>
+<!-- user&#45;&gt;export_nelma -->
+<g id="edge26" class="edge"><title>user&#45;&gt;export_nelma</title>
+<path fill="none" stroke="#a0a0a0" d="M1554.28,-2614.98C1694.19,-2768.35 2824.31,-4007.22 3000.17,-4200"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2997.82,-4202.63 3007.15,-4207.65 3002.99,-4197.91 2997.82,-4202.63"/>
+</g>
+<!-- export_openems -->
+<g id="node28" class="node"><title>export_openems</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2861.87" cy="-4231.36" rx="69.5877" ry="18"/>
+<text text-anchor="middle" x="2861.87" y="-4227.66" font-family="Times,serif" font-size="14.00">export_openems</text>
+</g>
+<!-- user&#45;&gt;export_openems -->
+<g id="edge28" class="edge"><title>user&#45;&gt;export_openems</title>
+<path fill="none" stroke="#a0a0a0" d="M1552.95,-2615.3C1678.44,-2770.24 2682.8,-4010.27 2840.94,-4205.52"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2838.41,-4207.96 2847.42,-4213.53 2843.85,-4203.55 2838.41,-4207.96"/>
+</g>
+<!-- export_openscad -->
+<g id="node30" class="node"><title>export_openscad</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2700.6" cy="-4225.18" rx="70.3881" ry="18"/>
+<text text-anchor="middle" x="2700.6" y="-4221.48" font-family="Times,serif" font-size="14.00">export_openscad</text>
+</g>
+<!-- user&#45;&gt;export_openscad -->
+<g id="edge30" class="edge"><title>user&#45;&gt;export_openscad</title>
+<path fill="none" stroke="#a0a0a0" d="M1551.75,-2615.76C1663.5,-2772.31 2542.82,-4004.14 2682.06,-4199.2"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2679.29,-4201.34 2687.95,-4207.45 2684.99,-4197.28 2679.29,-4201.34"/>
+</g>
+<!-- export_png -->
+<g id="node31" class="node"><title>export_png</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2540.28" cy="-4206.67" rx="50.8918" ry="18"/>
+<text text-anchor="middle" x="2540.28" y="-4202.97" font-family="Times,serif" font-size="14.00">export_png</text>
+</g>
+<!-- user&#45;&gt;export_png -->
+<g id="edge31" class="edge"><title>user&#45;&gt;export_png</title>
+<path fill="none" stroke="#a0a0a0" d="M1550.47,-2616.1C1648.02,-2772.86 2402.28,-3984.91 2523.78,-4180.16"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2520.98,-4182.28 2529.24,-4188.92 2526.93,-4178.58 2520.98,-4182.28"/>
+</g>
+<!-- export_stat -->
+<g id="node32" class="node"><title>export_stat</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2381.85" cy="-4175.94" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="2381.85" y="-4172.24" font-family="Times,serif" font-size="14.00">export_stat</text>
+</g>
+<!-- user&#45;&gt;export_stat -->
+<g id="edge33" class="edge"><title>user&#45;&gt;export_stat</title>
+<path fill="none" stroke="#a0a0a0" d="M1549.25,-2616.58C1632.96,-2773.35 2264.11,-3955.42 2367.53,-4149.13"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2364.52,-4150.91 2372.32,-4158.08 2370.69,-4147.61 2364.52,-4150.91"/>
+</g>
+<!-- export_svg -->
+<g id="node33" class="node"><title>export_svg</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2226.24" cy="-4133.18" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="2226.24" y="-4129.48" font-family="Times,serif" font-size="14.00">export_svg</text>
+</g>
+<!-- user&#45;&gt;export_svg -->
+<g id="edge34" class="edge"><title>user&#45;&gt;export_svg</title>
+<path fill="none" stroke="#a0a0a0" d="M1547.9,-2616.9C1617.4,-2772.25 2128.46,-3914.61 2214.08,-4106.01"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2210.99,-4107.66 2218.27,-4115.36 2217.38,-4104.8 2210.99,-4107.66"/>
+</g>
+<!-- export_test -->
+<g id="node34" class="node"><title>export_test</title>
+<ellipse fill="#a0ffff" stroke="black" cx="2074.35" cy="-4078.63" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="2074.35" y="-4074.93" font-family="Times,serif" font-size="14.00">export_test</text>
+</g>
+<!-- user&#45;&gt;export_test -->
+<g id="edge35" class="edge"><title>user&#45;&gt;export_test</title>
+<path fill="none" stroke="#a0a0a0" d="M1546.45,-2617.05C1601.54,-2769.57 1996.81,-3863.93 2064.5,-4051.35"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2061.21,-4052.55 2067.9,-4060.76 2067.8,-4050.17 2061.21,-4052.55"/>
+</g>
+<!-- export_xy -->
+<g id="node35" class="node"><title>export_xy</title>
+<ellipse fill="#a0ffff" stroke="black" cx="1927.09" cy="-4012.61" rx="46.2923" ry="18"/>
+<text text-anchor="middle" x="1927.09" y="-4008.91" font-family="Times,serif" font-size="14.00">export_xy</text>
+</g>
+<!-- user&#45;&gt;export_xy -->
+<g id="edge37" class="edge"><title>user&#45;&gt;export_xy</title>
+<path fill="none" stroke="#a0a0a0" d="M1544.97,-2617.28C1585.79,-2766.31 1869.38,-3801.88 1919.52,-3984.98"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1916.16,-3985.95 1922.18,-3994.67 1922.91,-3984.1 1916.16,-3985.95"/>
+</g>
+<!-- extedit -->
+<g id="node36" class="node"><title>extedit</title>
+<ellipse fill="lightgrey" stroke="black" cx="4095.69" cy="-1453.74" rx="34.394" ry="18"/>
+<text text-anchor="middle" x="4095.69" y="-1450.04" font-family="Times,serif" font-size="14.00">extedit</text>
+</g>
+<!-- user&#45;&gt;extedit -->
+<g id="edge39" class="edge"><title>user&#45;&gt;extedit</title>
+<path fill="none" stroke="#a0a0a0" d="M1562.56,-2589.33C1795.69,-2484.82 3769.19,-1600.11 4059.97,-1469.76"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4061.53,-1472.9 4069.22,-1465.61 4058.66,-1466.51 4061.53,-1472.9"/>
+</g>
+<!-- io_lihata -->
+<g id="node37" class="node"><title>io_lihata</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="3478.78" cy="-1789.21" rx="41.6928" ry="18"/>
+<text text-anchor="middle" x="3478.78" y="-1785.51" font-family="Times,serif" font-size="14.00">io_lihata</text>
+</g>
+<!-- user&#45;&gt;io_lihata -->
+<g id="edge106" class="edge"><title>user&#45;&gt;io_lihata</title>
+<path fill="none" stroke="#a0a0a0" d="M1563.2,-2589.74C1762.08,-2506.63 3182.84,-1912.89 3439.19,-1805.76"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3440.62,-1808.95 3448.5,-1801.87 3437.92,-1802.49 3440.62,-1808.95"/>
+</g>
+<!-- fontmode -->
+<g id="node38" class="node"><title>fontmode</title>
+<ellipse fill="lightgrey" stroke="black" cx="1785.31" cy="-3935.52" rx="44.6926" ry="18"/>
+<text text-anchor="middle" x="1785.31" y="-3931.82" font-family="Times,serif" font-size="14.00">fontmode</text>
+</g>
+<!-- user&#45;&gt;fontmode -->
+<g id="edge40" class="edge"><title>user&#45;&gt;fontmode</title>
+<path fill="none" stroke="#a0a0a0" d="M1543.36,-2617.29C1569.76,-2761.13 1747.41,-3729 1780.14,-3907.31"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1776.71,-3908.03 1781.96,-3917.24 1783.6,-3906.77 1776.71,-3908.03"/>
+</g>
+<!-- fp_board -->
+<g id="node39" class="node"><title>fp_board</title>
+<ellipse fill="lightgrey" stroke="black" cx="1649.85" cy="-3847.79" rx="42.4939" ry="18"/>
+<text text-anchor="middle" x="1649.85" y="-3844.09" font-family="Times,serif" font-size="14.00">fp_board</text>
+</g>
+<!-- user&#45;&gt;fp_board -->
+<g id="edge41" class="edge"><title>user&#45;&gt;fp_board</title>
+<path fill="none" stroke="#a0a0a0" d="M1541.67,-2617.54C1553.87,-2756.24 1632.33,-3648.53 1647.37,-3819.5"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1643.88,-3819.83 1648.24,-3829.49 1650.86,-3819.22 1643.88,-3819.83"/>
+</g>
+<!-- fp_fs -->
+<g id="node40" class="node"><title>fp_fs</title>
+<ellipse fill="lightgrey" stroke="black" cx="1521.51" cy="-3749.96" rx="28.6953" ry="18"/>
+<text text-anchor="middle" x="1521.51" y="-3746.26" font-family="Times,serif" font-size="14.00">fp_fs</text>
+</g>
+<!-- user&#45;&gt;fp_fs -->
+<g id="edge42" class="edge"><title>user&#45;&gt;fp_fs</title>
+<path fill="none" stroke="#a0a0a0" d="M1539.79,-2617.48C1537.66,-2749.11 1524.58,-3559.8 1521.96,-3721.8"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1518.46,-3721.87 1521.8,-3731.93 1525.46,-3721.98 1518.46,-3721.87"/>
+</g>
+<!-- fp_wget -->
+<g id="node41" class="node"><title>fp_wget</title>
+<ellipse fill="lightgrey" stroke="black" cx="1401.03" cy="-3642.59" rx="39.7935" ry="18"/>
+<text text-anchor="middle" x="1401.03" y="-3638.89" font-family="Times,serif" font-size="14.00">fp_wget</text>
+</g>
+<!-- user&#45;&gt;fp_wget -->
+<g id="edge44" class="edge"><title>user&#45;&gt;fp_wget</title>
+<path fill="none" stroke="#a0a0a0" d="M1537.67,-2617.51C1521.17,-2741.3 1425.05,-3462.39 1404.78,-3614.44"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1401.3,-3614.02 1403.45,-3624.39 1408.24,-3614.94 1401.3,-3614.02"/>
+</g>
+<!-- gpmi -->
+<g id="node42" class="node"><title>gpmi</title>
+<ellipse fill="lightgrey" stroke="black" cx="3502.65" cy="-1837.42" rx="29.4969" ry="18"/>
+<text text-anchor="middle" x="3502.65" y="-1833.72" font-family="Times,serif" font-size="14.00">gpmi</text>
+</g>
+<!-- user&#45;&gt;gpmi -->
+<g id="edge46" class="edge"><title>user&#45;&gt;gpmi</title>
+<path fill="none" stroke="#a0a0a0" d="M1563.49,-2590.32C1766.32,-2511.57 3224.67,-1945.35 3468.21,-1850.79"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3469.57,-1854.02 3477.63,-1847.14 3467.04,-1847.49 3469.57,-1854.02"/>
+</g>
+<!-- hid_batch -->
+<g id="node43" class="node"><title>hid_batch</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="1289.12" cy="-3526.31" rx="45.4919" ry="18"/>
+<text text-anchor="middle" x="1289.12" y="-3522.61" font-family="Times,serif" font-size="14.00">hid_batch</text>
+</g>
+<!-- user&#45;&gt;hid_batch -->
+<g id="edge47" class="edge"><title>user&#45;&gt;hid_batch</title>
+<path fill="none" stroke="#a0a0a0" d="M1535.18,-2617.51C1504.14,-2732.16 1334.91,-3357.18 1296.76,-3498.08"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1293.29,-3497.52 1294.05,-3508.09 1300.04,-3499.35 1293.29,-3497.52"/>
+</g>
+<!-- hid_gtk2_gdk -->
+<g id="node44" class="node"><title>hid_gtk2_gdk</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="1051.03" cy="-3201.23" rx="59.5901" ry="18"/>
+<text text-anchor="middle" x="1051.03" y="-3197.53" font-family="Times,serif" font-size="14.00">hid_gtk2_gdk</text>
+</g>
+<!-- user&#45;&gt;hid_gtk2_gdk -->
+<g id="edge53" class="edge"><title>user&#45;&gt;hid_gtk2_gdk</title>
+<path fill="none" stroke="#a0a0a0" d="M1527,-2615.51C1459.92,-2698.05 1154.49,-3073.91 1071.75,-3175.73"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1068.9,-3173.68 1065.31,-3183.65 1074.34,-3178.1 1068.9,-3173.68"/>
+</g>
+<!-- hid_gtk2_gl -->
+<g id="node48" class="node"><title>hid_gtk2_gl</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="879.186" cy="-2836.77" rx="53.0913" ry="18"/>
+<text text-anchor="middle" x="879.186" y="-2833.07" font-family="Times,serif" font-size="14.00">hid_gtk2_gl</text>
+</g>
+<!-- user&#45;&gt;hid_gtk2_gl -->
+<g id="edge60" class="edge"><title>user&#45;&gt;hid_gtk2_gl</title>
+<path fill="none" stroke="#a0a0a0" d="M1516.17,-2608C1419.3,-2642.79 1055.05,-2773.61 925.378,-2820.18"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="923.958,-2816.97 915.73,-2823.65 926.324,-2823.56 923.958,-2816.97"/>
+</g>
+<!-- hid_gtk3_cairo -->
+<g id="node50" class="node"><title>hid_gtk3_cairo</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="830.493" cy="-2682.91" rx="63.8893" ry="18"/>
+<text text-anchor="middle" x="830.493" y="-2679.21" font-family="Times,serif" font-size="14.00">hid_gtk3_cairo</text>
+</g>
+<!-- user&#45;&gt;hid_gtk3_cairo -->
+<g id="edge66" class="edge"><title>user&#45;&gt;hid_gtk3_cairo</title>
+<path fill="none" stroke="#a0a0a0" d="M1513.13,-2602.58C1411.85,-2614.5 1052.08,-2656.83 899.595,-2674.78"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="898.941,-2671.33 889.419,-2675.98 899.759,-2678.28 898.941,-2671.33"/>
+</g>
+<!-- hid_gtk3_gl -->
+<g id="node51" class="node"><title>hid_gtk3_gl</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="793.722" cy="-2525.77" rx="53.0913" ry="18"/>
+<text text-anchor="middle" x="793.722" y="-2522.07" font-family="Times,serif" font-size="14.00">hid_gtk3_gl</text>
+</g>
+<!-- user&#45;&gt;hid_gtk3_gl -->
+<g id="edge73" class="edge"><title>user&#45;&gt;hid_gtk3_gl</title>
+<path fill="none" stroke="#a0a0a0" d="M1513.08,-2596.74C1405.91,-2586.17 1008.95,-2547.01 855.151,-2531.83"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="855.236,-2528.32 844.941,-2530.83 854.549,-2535.29 855.236,-2528.32"/>
+</g>
+<!-- hid_lesstif -->
+<g id="node52" class="node"><title>hid_lesstif</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="769.087" cy="-2366.28" rx="47.3916" ry="18"/>
+<text text-anchor="middle" x="769.087" y="-2362.58" font-family="Times,serif" font-size="14.00">hid_lesstif</text>
+</g>
+<!-- user&#45;&gt;hid_lesstif -->
+<g id="edge78" class="edge"><title>user&#45;&gt;hid_lesstif</title>
+<path fill="none" stroke="#a0a0a0" d="M1515.3,-2591.92C1405.57,-2558.74 962.415,-2424.74 816.17,-2380.52"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="817.153,-2377.16 806.568,-2377.61 815.127,-2383.86 817.153,-2377.16"/>
+</g>
+<!-- hid_remote -->
+<g id="node54" class="node"><title>hid_remote</title>
+<ellipse fill="#a0a0ff" stroke="black" cx="756.733" cy="-2205.37" rx="51.1914" ry="18"/>
+<text text-anchor="middle" x="756.733" y="-2201.67" font-family="Times,serif" font-size="14.00">hid_remote</text>
+</g>
+<!-- user&#45;&gt;hid_remote -->
+<g id="edge79" class="edge"><title>user&#45;&gt;hid_remote</title>
+<path fill="none" stroke="#a0a0a0" d="M1518.31,-2588.46C1410.7,-2534.33 935.168,-2295.13 795.457,-2224.85"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="796.873,-2221.64 786.367,-2220.28 793.728,-2227.9 796.873,-2221.64"/>
+</g>
+<!-- import_dsn -->
+<g id="node55" class="node"><title>import_dsn</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3522.76" cy="-1887.31" rx="51.1914" ry="18"/>
+<text text-anchor="middle" x="3522.76" y="-1883.61" font-family="Times,serif" font-size="14.00">import_dsn</text>
+</g>
+<!-- user&#45;&gt;import_dsn -->
+<g id="edge81" class="edge"><title>user&#45;&gt;import_dsn</title>
+<path fill="none" stroke="#a0a0a0" d="M1564.08,-2590.79C1767.48,-2517.73 3201.88,-2002.56 3477.14,-1903.7"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3478.58,-1906.9 3486.81,-1900.23 3476.22,-1900.31 3478.58,-1906.9"/>
+</g>
+<!-- import_edif -->
+<g id="node56" class="node"><title>import_edif</title>
+<ellipse fill="#a0ffff" stroke="black" cx="756.733" cy="-2043.99" rx="52.7911" ry="18"/>
+<text text-anchor="middle" x="756.733" y="-2040.29" font-family="Times,serif" font-size="14.00">import_edif</text>
+</g>
+<!-- user&#45;&gt;import_edif -->
+<g id="edge82" class="edge"><title>user&#45;&gt;import_edif</title>
+<path fill="none" stroke="#a0a0a0" d="M1521.49,-2586.23C1418.66,-2513.32 919.5,-2159.4 788.35,-2066.4"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="790.084,-2063.34 779.902,-2060.41 786.035,-2069.05 790.084,-2063.34"/>
+</g>
+<!-- import_hpgl -->
+<g id="node57" class="node"><title>import_hpgl</title>
+<ellipse fill="#a0ffff" stroke="black" cx="769.087" cy="-1883.08" rx="54.6905" ry="18"/>
+<text text-anchor="middle" x="769.087" y="-1879.38" font-family="Times,serif" font-size="14.00">import_hpgl</text>
+</g>
+<!-- user&#45;&gt;import_hpgl -->
+<g id="edge83" class="edge"><title>user&#45;&gt;import_hpgl</title>
+<path fill="none" stroke="#a0a0a0" d="M1524.33,-2584.77C1427.79,-2495.08 916.197,-2019.76 794.896,-1907.06"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="797.187,-1904.41 787.479,-1900.17 792.422,-1909.54 797.187,-1904.41"/>
+</g>
+<!-- import_ipcd356 -->
+<g id="node58" class="node"><title>import_ipcd356</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3538.99" cy="-1938.6" rx="67.6881" ry="18"/>
+<text text-anchor="middle" x="3538.99" y="-1934.9" font-family="Times,serif" font-size="14.00">import_ipcd356</text>
+</g>
+<!-- user&#45;&gt;import_ipcd356 -->
+<g id="edge85" class="edge"><title>user&#45;&gt;import_ipcd356</title>
+<path fill="none" stroke="#a0a0a0" d="M1564.28,-2591.41C1767.9,-2524.09 3195.21,-2052.25 3486.97,-1955.8"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3488.08,-1959.12 3496.47,-1952.66 3485.88,-1952.47 3488.08,-1959.12"/>
+</g>
+<!-- import_ltspice -->
+<g id="node59" class="node"><title>import_ltspice</title>
+<ellipse fill="#a0ffff" stroke="black" cx="793.722" cy="-1723.59" rx="61.99" ry="18"/>
+<text text-anchor="middle" x="793.722" y="-1719.89" font-family="Times,serif" font-size="14.00">import_ltspice</text>
+</g>
+<!-- user&#45;&gt;import_ltspice -->
+<g id="edge86" class="edge"><title>user&#45;&gt;import_ltspice</title>
+<path fill="none" stroke="#a0a0a0" d="M1526.49,-2583.46C1436.59,-2477.97 927.757,-1880.87 815.596,-1749.25"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="817.94,-1746.61 808.79,-1741.27 812.612,-1751.15 817.94,-1746.61"/>
+</g>
+<!-- import_mentor_sch -->
+<g id="node60" class="node"><title>import_mentor_sch</title>
+<ellipse fill="#a0ffff" stroke="black" cx="830.493" cy="-1566.45" rx="80.6858" ry="18"/>
+<text text-anchor="middle" x="830.493" y="-1562.75" font-family="Times,serif" font-size="14.00">import_mentor_sch</text>
+</g>
+<!-- user&#45;&gt;import_mentor_sch -->
+<g id="edge88" class="edge"><title>user&#45;&gt;import_mentor_sch</title>
+<path fill="none" stroke="#a0a0a0" d="M1528.65,-2582.76C1446.84,-2463.68 950.846,-1741.65 848.829,-1593.14"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="851.494,-1590.84 842.947,-1584.58 845.725,-1594.8 851.494,-1590.84"/>
+</g>
+<!-- import_mucs -->
+<g id="node62" class="node"><title>import_mucs</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3551.25" cy="-1990.98" rx="57.6901" ry="18"/>
+<text text-anchor="middle" x="3551.25" y="-1987.28" font-family="Times,serif" font-size="14.00">import_mucs</text>
+</g>
+<!-- user&#45;&gt;import_mucs -->
+<g id="edge90" class="edge"><title>user&#45;&gt;import_mucs</title>
+<path fill="none" stroke="#a0a0a0" d="M1564.78,-2591.93C1771.1,-2529.52 3207.38,-2095.01 3499.48,-2006.64"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3500.82,-2009.89 3509.38,-2003.65 3498.8,-2003.19 3500.82,-2009.89"/>
+</g>
+<!-- import_netlist -->
+<g id="node63" class="node"><title>import_netlist</title>
+<ellipse fill="#a0ffff" stroke="black" cx="879.186" cy="-1412.59" rx="60.3893" ry="18"/>
+<text text-anchor="middle" x="879.186" y="-1408.89" font-family="Times,serif" font-size="14.00">import_netlist</text>
+</g>
+<!-- user&#45;&gt;import_netlist -->
+<g id="edge91" class="edge"><title>user&#45;&gt;import_netlist</title>
+<path fill="none" stroke="#a0a0a0" d="M1530.48,-2582.17C1457.02,-2450.25 984.263,-1601.28 894.048,-1439.28"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="897.042,-1437.46 889.119,-1430.42 890.926,-1440.86 897.042,-1437.46"/>
+</g>
+<!-- import_sch -->
+<g id="node64" class="node"><title>import_sch</title>
+<ellipse fill="#a0ffff" stroke="black" cx="939.514" cy="-1262.9" rx="50.8918" ry="18"/>
+<text text-anchor="middle" x="939.514" y="-1259.2" font-family="Times,serif" font-size="14.00">import_sch</text>
+</g>
+<!-- user&#45;&gt;import_sch -->
+<g id="edge92" class="edge"><title>user&#45;&gt;import_sch</title>
+<path fill="none" stroke="#a0a0a0" d="M1532.27,-2582.02C1468.27,-2439.6 1030.73,-1465.91 951.728,-1290.08"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="954.829,-1288.45 947.537,-1280.76 948.444,-1291.31 954.829,-1288.45"/>
+</g>
+<!-- import_tinycad -->
+<g id="node65" class="node"><title>import_tinycad</title>
+<ellipse fill="#a0ffff" stroke="black" cx="1011.12" cy="-1118.28" rx="64.9885" ry="18"/>
+<text text-anchor="middle" x="1011.12" y="-1114.58" font-family="Times,serif" font-size="14.00">import_tinycad</text>
+</g>
+<!-- user&#45;&gt;import_tinycad -->
+<g id="edge93" class="edge"><title>user&#45;&gt;import_tinycad</title>
+<path fill="none" stroke="#a0a0a0" d="M1533.77,-2581.74C1479.29,-2429.19 1088.72,-1335.56 1021.09,-1146.18"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1024.35,-1144.9 1017.69,-1136.66 1017.76,-1147.26 1024.35,-1144.9"/>
+</g>
+<!-- io_autotrax -->
+<g id="node66" class="node"><title>io_autotrax</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1093.59" cy="-979.557" rx="50.8918" ry="18"/>
+<text text-anchor="middle" x="1093.59" y="-975.857" font-family="Times,serif" font-size="14.00">io_autotrax</text>
+</g>
+<!-- user&#45;&gt;io_autotrax -->
+<g id="edge96" class="edge"><title>user&#45;&gt;io_autotrax</title>
+<path fill="none" stroke="#a0a0a0" d="M1535.14,-2581.49C1490.46,-2419.38 1156.3,-1207.05 1101.26,-1007.36"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1104.61,-1006.34 1098.57,-997.628 1097.86,-1008.2 1104.61,-1006.34"/>
+</g>
+<!-- io_eagle -->
+<g id="node67" class="node"><title>io_eagle</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1186.44" cy="-847.557" rx="40.0939" ry="18"/>
+<text text-anchor="middle" x="1186.44" y="-843.857" font-family="Times,serif" font-size="14.00">io_eagle</text>
+</g>
+<!-- user&#45;&gt;io_eagle -->
+<g id="edge98" class="edge"><title>user&#45;&gt;io_eagle</title>
+<path fill="none" stroke="#a0a0a0" d="M1536.46,-2581.5C1502.16,-2411.58 1234.42,-1085.22 1192.07,-875.457"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1195.48,-874.649 1190.07,-865.54 1188.62,-876.034 1195.48,-874.649"/>
+</g>
+<!-- io_hyp -->
+<g id="node68" class="node"><title>io_hyp</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1289.12" cy="-723.051" rx="35.194" ry="18"/>
+<text text-anchor="middle" x="1289.12" y="-719.351" font-family="Times,serif" font-size="14.00">io_hyp</text>
+</g>
+<!-- user&#45;&gt;io_hyp -->
+<g id="edge100" class="edge"><title>user&#45;&gt;io_hyp</title>
+<path fill="none" stroke="#a0a0a0" d="M1537.68,-2581.44C1513.97,-2404.22 1322.31,-971.252 1292.9,-751.331"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1296.35,-750.69 1291.55,-741.242 1289.41,-751.618 1296.35,-750.69"/>
+</g>
+<!-- io_kicad -->
+<g id="node70" class="node"><title>io_kicad</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1401.03" cy="-606.771" rx="40.8928" ry="18"/>
+<text text-anchor="middle" x="1401.03" y="-603.071" font-family="Times,serif" font-size="14.00">io_kicad</text>
+</g>
+<!-- user&#45;&gt;io_kicad -->
+<g id="edge102" class="edge"><title>user&#45;&gt;io_kicad</title>
+<path fill="none" stroke="#a0a0a0" d="M1538.81,-2581.26C1525.94,-2396.8 1418.93,-863.262 1403,-635.108"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1406.48,-634.693 1402.3,-624.961 1399.5,-635.18 1406.48,-634.693"/>
+</g>
+<!-- io_kicad_legacy -->
+<g id="node71" class="node"><title>io_kicad_legacy</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1521.51" cy="-499.399" rx="68.4888" ry="18"/>
+<text text-anchor="middle" x="1521.51" y="-495.699" font-family="Times,serif" font-size="14.00">io_kicad_legacy</text>
+</g>
+<!-- user&#45;&gt;io_kicad_legacy -->
+<g id="edge104" class="edge"><title>user&#45;&gt;io_kicad_legacy</title>
+<path fill="none" stroke="#a0a0a0" d="M1539.92,-2581.25C1538.23,-2390.85 1523.83,-762.166 1521.76,-527.518"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1525.26,-527.378 1521.67,-517.41 1518.26,-527.44 1525.26,-527.378"/>
+</g>
+<!-- io_mentor_cell -->
+<g id="node72" class="node"><title>io_mentor_cell</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="1649.85" cy="-401.564" rx="64.189" ry="18"/>
+<text text-anchor="middle" x="1649.85" y="-397.864" font-family="Times,serif" font-size="14.00">io_mentor_cell</text>
+</g>
+<!-- user&#45;&gt;io_mentor_cell -->
+<g id="edge107" class="edge"><title>user&#45;&gt;io_mentor_cell</title>
+<path fill="none" stroke="#a0a0a0" d="M1540.98,-2581.39C1550.71,-2386.56 1636.34,-672.152 1648.44,-429.961"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1651.94,-430.01 1648.94,-419.848 1644.95,-429.661 1651.94,-430.01"/>
+</g>
+<!-- io_pcb -->
+<g id="node73" class="node"><title>io_pcb</title>
+<ellipse fill="#ffa0a0" stroke="black" cx="3559.46" cy="-2044.15" rx="34.394" ry="18"/>
+<text text-anchor="middle" x="3559.46" y="-2040.45" font-family="Times,serif" font-size="14.00">io_pcb</text>
+</g>
+<!-- user&#45;&gt;io_pcb -->
+<g id="edge109" class="edge"><title>user&#45;&gt;io_pcb</title>
+<path fill="none" stroke="#a0a0a0" d="M1565.25,-2592.49C1776.56,-2534.38 3253.8,-2128.19 3518.8,-2055.33"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3520.05,-2058.61 3528.77,-2052.58 3518.2,-2051.86 3520.05,-2058.61"/>
+</g>
+<!-- io_tedax -->
+<g id="node74" class="node"><title>io_tedax</title>
+<ellipse fill="#a0ffff" stroke="black" cx="3563.58" cy="-2097.78" rx="40.8928" ry="18"/>
+<text text-anchor="middle" x="3563.58" y="-2094.08" font-family="Times,serif" font-size="14.00">io_tedax</text>
+</g>
+<!-- user&#45;&gt;io_tedax -->
+<g id="edge111" class="edge"><title>user&#45;&gt;io_tedax</title>
+<path fill="none" stroke="#a0a0a0" d="M1565.66,-2593.07C1777.5,-2540.55 3240.18,-2177.95 3518.05,-2109.07"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3518.94,-2112.45 3527.81,-2106.65 3517.26,-2105.66 3518.94,-2112.45"/>
+</g>
+<!-- jostle -->
+<g id="node75" class="node"><title>jostle</title>
+<ellipse fill="lightgrey" stroke="black" cx="1785.31" cy="-313.842" rx="29.795" ry="18"/>
+<text text-anchor="middle" x="1785.31" y="-310.142" font-family="Times,serif" font-size="14.00">jostle</text>
+</g>
+<!-- user&#45;&gt;jostle -->
+<g id="edge112" class="edge"><title>user&#45;&gt;jostle</title>
+<path fill="none" stroke="#a0a0a0" d="M1542.02,-2581.34C1563.45,-2381.63 1755.85,-588.462 1782.3,-341.899"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1785.79,-342.255 1783.37,-331.938 1778.83,-341.508 1785.79,-342.255"/>
+</g>
+<!-- loghid -->
+<g id="node77" class="node"><title>loghid</title>
+<ellipse fill="lightgrey" stroke="black" cx="1927.09" cy="-236.746" rx="33.2948" ry="18"/>
+<text text-anchor="middle" x="1927.09" y="-233.046" font-family="Times,serif" font-size="14.00">loghid</text>
+</g>
+<!-- user&#45;&gt;loghid -->
+<g id="edge116" class="edge"><title>user&#45;&gt;loghid</title>
+<path fill="none" stroke="#a0a0a0" d="M1543.03,-2581.41C1576.32,-2378.19 1881.13,-517.354 1922.46,-265.021"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="1925.96,-265.279 1924.13,-254.844 1919.06,-264.147 1925.96,-265.279"/>
+</g>
+<!-- millpath -->
+<g id="node78" class="node"><title>millpath</title>
+<ellipse fill="lightgrey" stroke="black" cx="2074.35" cy="-170.729" rx="40.0939" ry="18"/>
+<text text-anchor="middle" x="2074.35" y="-167.029" font-family="Times,serif" font-size="14.00">millpath</text>
+</g>
+<!-- user&#45;&gt;millpath -->
+<g id="edge118" class="edge"><title>user&#45;&gt;millpath</title>
+<path fill="none" stroke="#a0a0a0" d="M1544,-2581.6C1589.24,-2375.94 2012.06,-453.889 2068.21,-198.673"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2071.67,-199.235 2070.4,-188.717 2064.83,-197.731 2071.67,-199.235"/>
+</g>
+<!-- mincut -->
+<g id="node79" class="node"><title>mincut</title>
+<ellipse fill="lightgrey" stroke="black" cx="2226.24" cy="-116.179" rx="35.9954" ry="18"/>
+<text text-anchor="middle" x="2226.24" y="-112.479" font-family="Times,serif" font-size="14.00">mincut</text>
+</g>
+<!-- user&#45;&gt;mincut -->
+<g id="edge119" class="edge"><title>user&#45;&gt;mincut</title>
+<path fill="none" stroke="#a0a0a0" d="M1545.02,-2581.54C1602.67,-2372.88 2147.26,-402.006 2218.55,-143.991"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2221.95,-144.83 2221.24,-134.259 2215.2,-142.965 2221.95,-144.83"/>
+</g>
+<!-- oldactions -->
+<g id="node80" class="node"><title>oldactions</title>
+<ellipse fill="lightgrey" stroke="black" cx="2381.85" cy="-73.4153" rx="46.5926" ry="18"/>
+<text text-anchor="middle" x="2381.85" y="-69.7153" font-family="Times,serif" font-size="14.00">oldactions</text>
+</g>
+<!-- user&#45;&gt;oldactions -->
+<g id="edge120" class="edge"><title>user&#45;&gt;oldactions</title>
+<path fill="none" stroke="#a0a0a0" d="M1546.02,-2581.58C1616.17,-2371.09 2285.55,-362.385 2372.55,-101.33"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2375.99,-102.085 2375.83,-91.4916 2369.35,-99.8721 2375.99,-102.085"/>
+</g>
+<!-- polycombine -->
+<g id="node81" class="node"><title>polycombine</title>
+<ellipse fill="lightgrey" stroke="black" cx="2540.28" cy="-42.6894" rx="57.3905" ry="18"/>
+<text text-anchor="middle" x="2540.28" y="-38.9894" font-family="Times,serif" font-size="14.00">polycombine</text>
+</g>
+<!-- user&#45;&gt;polycombine -->
+<g id="edge121" class="edge"><title>user&#45;&gt;polycombine</title>
+<path fill="none" stroke="#a0a0a0" d="M1547,-2581.72C1629.69,-2370.34 2427.36,-331.35 2529.53,-70.1762"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2532.87,-71.2569 2533.25,-60.669 2526.35,-68.7066 2532.87,-71.2569"/>
+</g>
+<!-- polystitch -->
+<g id="node82" class="node"><title>polystitch</title>
+<ellipse fill="lightgrey" stroke="black" cx="2700.6" cy="-24.1814" rx="45.4919" ry="18"/>
+<text text-anchor="middle" x="2700.6" y="-20.4814" font-family="Times,serif" font-size="14.00">polystitch</text>
+</g>
+<!-- user&#45;&gt;polystitch -->
+<g id="edge122" class="edge"><title>user&#45;&gt;polystitch</title>
+<path fill="none" stroke="#a0a0a0" d="M1547.95,-2581.94C1643.13,-2370.73 2571.32,-311.067 2688.47,-51.1026"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2691.67,-52.5298 2692.58,-41.9748 2685.28,-49.6538 2691.67,-52.5298"/>
+</g>
+<!-- propedit -->
+<g id="node83" class="node"><title>propedit</title>
+<ellipse fill="lightgrey" stroke="black" cx="2861.87" cy="-18" rx="40.0939" ry="18"/>
+<text text-anchor="middle" x="2861.87" y="-14.3" font-family="Times,serif" font-size="14.00">propedit</text>
+</g>
+<!-- user&#45;&gt;propedit -->
+<g id="edge123" class="edge"><title>user&#45;&gt;propedit</title>
+<path fill="none" stroke="#a0a0a0" d="M1548.87,-2582.24C1656.29,-2372.45 2714.47,-305.86 2848.03,-45.0129"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="2851.28,-46.3503 2852.72,-35.8541 2845.05,-43.1599 2851.28,-46.3503"/>
+</g>
+<!-- puller -->
+<g id="node84" class="node"><title>puller</title>
+<ellipse fill="lightgrey" stroke="black" cx="3023.13" cy="-24.1814" rx="31.3957" ry="18"/>
+<text text-anchor="middle" x="3023.13" y="-20.4814" font-family="Times,serif" font-size="14.00">puller</text>
+</g>
+<!-- user&#45;&gt;puller -->
+<g id="edge124" class="edge"><title>user&#45;&gt;puller</title>
+<path fill="none" stroke="#a0a0a0" d="M1549.94,-2582.28C1670.59,-2372.78 2860.2,-307.106 3008.07,-50.3318"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3011.3,-51.7441 3013.25,-41.3316 3005.23,-48.2507 3011.3,-51.7441"/>
+</g>
+<!-- query -->
+<g id="node85" class="node"><title>query</title>
+<ellipse fill="lightgrey" stroke="black" cx="3183.45" cy="-42.6894" rx="30.5947" ry="18"/>
+<text text-anchor="middle" x="3183.45" y="-38.9894" font-family="Times,serif" font-size="14.00">query</text>
+</g>
+<!-- user&#45;&gt;query -->
+<g id="edge125" class="edge"><title>user&#45;&gt;query</title>
+<path fill="none" stroke="#a0a0a0" d="M1550.79,-2582.74C1683.32,-2376.56 3004.03,-321.829 3166.99,-68.3006"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3170.03,-70.0382 3172.49,-59.7335 3164.14,-66.2532 3170.03,-70.0382"/>
+</g>
+<!-- renumber -->
+<g id="node86" class="node"><title>renumber</title>
+<ellipse fill="lightgrey" stroke="black" cx="3341.88" cy="-73.4153" rx="44.6926" ry="18"/>
+<text text-anchor="middle" x="3341.88" y="-69.7153" font-family="Times,serif" font-size="14.00">renumber</text>
+</g>
+<!-- user&#45;&gt;renumber -->
+<g id="edge126" class="edge"><title>user&#45;&gt;renumber</title>
+<path fill="none" stroke="#a0a0a0" d="M1551.82,-2582.94C1697.05,-2379.34 3143.61,-351.37 3323.54,-99.1219"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3326.45,-101.077 3329.41,-90.9037 3320.75,-97.0123 3326.45,-101.077"/>
+</g>
+<!-- rubberband_orig -->
+<g id="node87" class="node"><title>rubberband_orig</title>
+<ellipse fill="lightgrey" stroke="black" cx="3497.49" cy="-116.179" rx="69.5877" ry="18"/>
+<text text-anchor="middle" x="3497.49" y="-112.479" font-family="Times,serif" font-size="14.00">rubberband_orig</text>
+</g>
+<!-- user&#45;&gt;rubberband_orig -->
+<g id="edge128" class="edge"><title>user&#45;&gt;rubberband_orig</title>
+<path fill="none" stroke="#a0a0a0" d="M1552.84,-2583.22C1710.45,-2383.27 3278.87,-393.53 3476.97,-142.222"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3479.99,-144.041 3483.43,-134.021 3474.49,-139.708 3479.99,-144.041"/>
+</g>
+<!-- shand_cmd -->
+<g id="node88" class="node"><title>shand_cmd</title>
+<ellipse fill="lightgrey" stroke="black" cx="3649.38" cy="-170.729" rx="51.1914" ry="18"/>
+<text text-anchor="middle" x="3649.38" y="-167.029" font-family="Times,serif" font-size="14.00">shand_cmd</text>
+</g>
+<!-- user&#45;&gt;shand_cmd -->
+<g id="edge129" class="edge"><title>user&#45;&gt;shand_cmd</title>
+<path fill="none" stroke="#a0a0a0" d="M1553.83,-2583.58C1723.75,-2387.93 3415.46,-440.064 3627.57,-195.837"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3630.31,-198.024 3634.22,-188.179 3625.02,-193.434 3630.31,-198.024"/>
+</g>
+<!-- shape -->
+<g id="node89" class="node"><title>shape</title>
+<ellipse fill="lightgrey" stroke="black" cx="3796.64" cy="-236.746" rx="30.5947" ry="18"/>
+<text text-anchor="middle" x="3796.64" y="-233.046" font-family="Times,serif" font-size="14.00">shape</text>
+</g>
+<!-- user&#45;&gt;shape -->
+<g id="edge130" class="edge"><title>user&#45;&gt;shape</title>
+<path fill="none" stroke="#a0a0a0" d="M1554.79,-2584.01C1736.86,-2393.38 3552.07,-492.821 3774.37,-260.067"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3777.22,-262.145 3781.6,-252.496 3772.16,-257.311 3777.22,-262.145"/>
+</g>
+<!-- sketch_route -->
+<g id="node90" class="node"><title>sketch_route</title>
+<ellipse fill="lightgrey" stroke="black" cx="3938.42" cy="-313.842" rx="55.7903" ry="18"/>
+<text text-anchor="middle" x="3938.42" y="-310.142" font-family="Times,serif" font-size="14.00">sketch_route</text>
+</g>
+<!-- user&#45;&gt;sketch_route -->
+<g id="edge131" class="edge"><title>user&#45;&gt;sketch_route</title>
+<path fill="none" stroke="#a0a0a0" d="M1555.71,-2584.51C1748.72,-2400.58 3668.4,-571.163 3912.86,-338.201"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="3915.4,-340.613 3920.22,-331.181 3910.57,-335.546 3915.4,-340.613"/>
+</g>
+<!-- smartdisperse -->
+<g id="node91" class="node"><title>smartdisperse</title>
+<ellipse fill="lightgrey" stroke="black" cx="4073.88" cy="-401.564" rx="59.5901" ry="18"/>
+<text text-anchor="middle" x="4073.88" y="-397.864" font-family="Times,serif" font-size="14.00">smartdisperse</text>
+</g>
+<!-- user&#45;&gt;smartdisperse -->
+<g id="edge132" class="edge"><title>user&#45;&gt;smartdisperse</title>
+<path fill="none" stroke="#a0a0a0" d="M1556.59,-2585.08C1760.29,-2408.4 3784.43,-652.639 4046.07,-425.687"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4048.7,-428.035 4053.96,-418.839 4044.12,-422.747 4048.7,-428.035"/>
+</g>
+<!-- stroke -->
+<g id="node92" class="node"><title>stroke</title>
+<ellipse fill="lightgrey" stroke="black" cx="4202.22" cy="-499.399" rx="32.4942" ry="18"/>
+<text text-anchor="middle" x="4202.22" y="-495.699" font-family="Times,serif" font-size="14.00">stroke</text>
+</g>
+<!-- user&#45;&gt;stroke -->
+<g id="edge133" class="edge"><title>user&#45;&gt;stroke</title>
+<path fill="none" stroke="#a0a0a0" d="M1557.78,-2585.44C1774.45,-2414.53 3911.6,-728.656 4175.54,-520.453"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4177.78,-523.138 4183.47,-514.197 4173.45,-517.642 4177.78,-523.138"/>
+</g>
+<!-- teardrops -->
+<g id="node93" class="node"><title>teardrops</title>
+<ellipse fill="lightgrey" stroke="black" cx="4322.71" cy="-606.771" rx="43.5923" ry="18"/>
+<text text-anchor="middle" x="4322.71" y="-603.071" font-family="Times,serif" font-size="14.00">teardrops</text>
+</g>
+<!-- user&#45;&gt;teardrops -->
+<g id="edge134" class="edge"><title>user&#45;&gt;teardrops</title>
+<path fill="none" stroke="#a0a0a0" d="M1558.58,-2586.16C1784.47,-2424.4 4007.34,-832.607 4292.62,-628.316"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4294.76,-631.085 4300.86,-622.417 4290.69,-625.393 4294.76,-631.085"/>
+</g>
+<!-- vendordrill -->
+<g id="node94" class="node"><title>vendordrill</title>
+<ellipse fill="lightgrey" stroke="black" cx="4434.61" cy="-723.051" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="4434.61" y="-719.351" font-family="Times,serif" font-size="14.00">vendordrill</text>
+</g>
+<!-- user&#45;&gt;vendordrill -->
+<g id="edge135" class="edge"><title>user&#45;&gt;vendordrill</title>
+<path fill="none" stroke="#a0a0a0" d="M1559.72,-2586.68C1796.35,-2433.28 4097.35,-941.68 4401.49,-744.527"/>
+<polygon fill="#a0a0a0" stroke="#a0a0a0" points="4403.8,-747.195 4410.29,-738.819 4400,-741.321 4403.8,-747.195"/>
+</g>
+<!-- lib_compat_help -->
+<g id="node6" class="node"><title>lib_compat_help</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="2861.87" cy="-2124.68" rx="70.3881" ry="18"/>
+<text text-anchor="middle" x="2861.87" y="-2120.98" font-family="Times,serif" font-size="14.00">lib_compat_help</text>
+</g>
+<!-- autoroute&#45;&gt;lib_compat_help -->
+<g id="edge4" class="edge"><title>autoroute&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M2234.2,-2350.11C2341.85,-2311.44 2681.57,-2189.43 2811.06,-2142.93"/>
+<polygon fill="black" stroke="black" points="2812.51,-2146.12 2820.74,-2139.45 2810.15,-2139.54 2812.51,-2146.12"/>
+</g>
+<!-- draw_csect -->
+<g id="node13" class="node"><title>draw_csect</title>
+<ellipse fill="lightgrey" stroke="black" cx="627.964" cy="-3827.51" rx="50.0912" ry="18"/>
+<text text-anchor="middle" x="627.964" y="-3823.81" font-family="Times,serif" font-size="14.00">draw_csect</text>
+</g>
+<!-- draw_fab&#45;&gt;report -->
+<g id="edge12" class="edge"><title>draw_fab&#45;&gt;report</title>
+<path fill="none" stroke="black" d="M4418.1,-3543.46C4398.85,-3563.47 4366.92,-3596.65 4345.36,-3619.05"/>
+<polygon fill="black" stroke="black" points="4342.62,-3616.85 4338.2,-3626.48 4347.66,-3621.71 4342.62,-3616.85"/>
+</g>
+<!-- draw_fontsel -->
+<g id="node16" class="node"><title>draw_fontsel</title>
+<ellipse fill="lightgrey" stroke="black" cx="504.168" cy="-3651.51" rx="56.59" ry="18"/>
+<text text-anchor="middle" x="504.168" y="-3647.81" font-family="Times,serif" font-size="14.00">draw_fontsel</text>
+</g>
+<!-- export_fidocadj&#45;&gt;lib_compat_help -->
+<g id="edge18" class="edge"><title>export_fidocadj&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3397.76,-1716.19C3310.21,-1782.92 2993.15,-2024.61 2892.65,-2101.21"/>
+<polygon fill="black" stroke="black" points="2890.26,-2098.64 2884.42,-2107.48 2894.5,-2104.2 2890.26,-2098.64"/>
+</g>
+<!-- export_ipcd356&#45;&gt;lib_compat_help -->
+<g id="edge22" class="edge"><title>export_ipcd356&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3425.58,-1759.62C3331.3,-1820.68 3004.34,-2032.42 2896.6,-2102.19"/>
+<polygon fill="black" stroke="black" points="2894.53,-2099.35 2888.04,-2107.73 2898.34,-2105.23 2894.53,-2099.35"/>
+</g>
+<!-- export_lpr&#45;&gt;export_ps -->
+<g id="edge24" class="edge"><title>export_lpr&#45;&gt;export_ps</title>
+<path fill="none" stroke="black" d="M3299.42,-4184.18C3279.42,-4188.06 3255.39,-4192.72 3234.41,-4196.79"/>
+<polygon fill="black" stroke="black" points="3233.53,-4193.39 3224.38,-4198.73 3234.86,-4200.26 3233.53,-4193.39"/>
+</g>
+<!-- lib_polyhelp -->
+<g id="node29" class="node"><title>lib_polyhelp</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="2861.87" cy="-4933.58" rx="55.4913" ry="18"/>
+<text text-anchor="middle" x="2861.87" y="-4929.88" font-family="Times,serif" font-size="14.00">lib_polyhelp</text>
+</g>
+<!-- export_openems&#45;&gt;lib_polyhelp -->
+<g id="edge27" class="edge"><title>export_openems&#45;&gt;lib_polyhelp</title>
+<path fill="none" stroke="black" d="M2861.87,-4249.42C2861.87,-4344.57 2861.87,-4787.65 2861.87,-4905"/>
+<polygon fill="black" stroke="black" points="2858.37,-4905.32 2861.87,-4915.32 2865.37,-4905.32 2858.37,-4905.32"/>
+</g>
+<!-- export_openscad&#45;&gt;lib_polyhelp -->
+<g id="edge29" class="edge"><title>export_openscad&#45;&gt;lib_polyhelp</title>
+<path fill="none" stroke="black" d="M2704.75,-4243.4C2726.65,-4339.58 2828.78,-4788.24 2855.47,-4905.49"/>
+<polygon fill="black" stroke="black" points="2852.11,-4906.51 2857.75,-4915.48 2858.94,-4904.95 2852.11,-4906.51"/>
+</g>
+<!-- export_xy&#45;&gt;export_bom -->
+<g id="edge36" class="edge"><title>export_xy&#45;&gt;export_bom</title>
+<path fill="none" stroke="black" d="M1972.42,-4009.13C2247.39,-3988.02 3690.53,-3877.22 4010.86,-3852.63"/>
+<polygon fill="black" stroke="black" points="4011.19,-3856.12 4020.89,-3851.86 4010.65,-3849.14 4011.19,-3856.12"/>
+</g>
+<!-- extedit&#45;&gt;io_lihata -->
+<g id="edge38" class="edge"><title>extedit&#45;&gt;io_lihata</title>
+<path fill="none" stroke="black" d="M4071.51,-1466.89C3976.17,-1518.74 3626.08,-1709.11 3513.73,-1770.2"/>
+<polygon fill="black" stroke="black" points="3511.95,-1767.19 3504.83,-1775.04 3515.29,-1773.34 3511.95,-1767.19"/>
+</g>
+<!-- io_lihata&#45;&gt;lib_compat_help -->
+<g id="edge105" class="edge"><title>io_lihata&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3452.67,-1803.41C3355.76,-1856.11 3016.4,-2040.65 2900.78,-2103.52"/>
+<polygon fill="black" stroke="black" points="2899.01,-2100.5 2891.89,-2108.35 2902.35,-2106.65 2899.01,-2100.5"/>
+</g>
+<!-- fp_wget&#45;&gt;fp_fs -->
+<g id="edge43" class="edge"><title>fp_wget&#45;&gt;fp_fs</title>
+<path fill="none" stroke="black" d="M1419.06,-3658.66C1439.85,-3677.19 1474.11,-3707.72 1497.23,-3728.32"/>
+<polygon fill="black" stroke="black" points="1495.11,-3731.12 1504.9,-3735.16 1499.76,-3725.89 1495.11,-3731.12"/>
+</g>
+<!-- gpmi&#45;&gt;lib_compat_help -->
+<g id="edge45" class="edge"><title>gpmi&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3478.7,-1848.16C3383.48,-1890.84 3030.88,-2048.91 2906.03,-2104.88"/>
+<polygon fill="black" stroke="black" points="2904.44,-2101.76 2896.75,-2109.04 2907.3,-2108.15 2904.44,-2101.76"/>
+</g>
+<!-- hid_gtk2_gdk&#45;&gt;draw_csect -->
+<g id="edge51" class="edge"><title>hid_gtk2_gdk&#45;&gt;draw_csect</title>
+<path fill="none" stroke="black" d="M1039.05,-3218.97C979.598,-3306.97 716.298,-3696.74 645.527,-3801.51"/>
+<polygon fill="black" stroke="black" points="642.537,-3799.68 639.839,-3809.93 648.337,-3803.6 642.537,-3799.68"/>
+</g>
+<!-- hid_gtk2_gdk&#45;&gt;draw_fontsel -->
+<g id="edge52" class="edge"><title>hid_gtk2_gdk&#45;&gt;draw_fontsel</title>
+<path fill="none" stroke="black" d="M1030.26,-3218.33C945.994,-3287.72 629.519,-3548.3 532.573,-3628.12"/>
+<polygon fill="black" stroke="black" points="530.162,-3625.57 524.667,-3634.63 534.611,-3630.98 530.162,-3625.57"/>
+</g>
+<!-- lib_gtk_common -->
+<g id="node45" class="node"><title>lib_gtk_common</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="394.208" cy="-3466.55" rx="71.4873" ry="18"/>
+<text text-anchor="middle" x="394.208" y="-3462.85" font-family="Times,serif" font-size="14.00">lib_gtk_common</text>
+</g>
+<!-- hid_gtk2_gdk&#45;&gt;lib_gtk_common -->
+<g id="edge48" class="edge"><title>hid_gtk2_gdk&#45;&gt;lib_gtk_common</title>
+<path fill="none" stroke="black" d="M1015.25,-3215.68C904.364,-3260.48 566.43,-3396.98 441.386,-3447.49"/>
+<polygon fill="black" stroke="black" points="440.015,-3444.27 432.054,-3451.26 442.637,-3450.76 440.015,-3444.27"/>
+</g>
+<!-- lib_gtk_config -->
+<g id="node46" class="node"><title>lib_gtk_config</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="298.73" cy="-3273.71" rx="62.2891" ry="18"/>
+<text text-anchor="middle" x="298.73" y="-3270.01" font-family="Times,serif" font-size="14.00">lib_gtk_config</text>
+</g>
+<!-- hid_gtk2_gdk&#45;&gt;lib_gtk_config -->
+<g id="edge49" class="edge"><title>hid_gtk2_gdk&#45;&gt;lib_gtk_config</title>
+<path fill="none" stroke="black" d="M993.867,-3206.74C858,-3219.83 516.09,-3252.77 368.428,-3267"/>
+<polygon fill="black" stroke="black" points="367.756,-3263.55 358.138,-3267.99 368.427,-3270.51 367.756,-3263.55"/>
+</g>
+<!-- lib_gtk_hid -->
+<g id="node47" class="node"><title>lib_gtk_hid</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="5425" cy="-3273.71" rx="51.1914" ry="18"/>
+<text text-anchor="middle" x="5425" y="-3270.01" font-family="Times,serif" font-size="14.00">lib_gtk_hid</text>
+</g>
+<!-- hid_gtk2_gdk&#45;&gt;lib_gtk_hid -->
+<g id="edge50" class="edge"><title>hid_gtk2_gdk&#45;&gt;lib_gtk_hid</title>
+<path fill="none" stroke="black" d="M1110.78,-3202.22C1595.05,-3210.25 4871.69,-3264.54 5363.32,-3272.69"/>
+<polygon fill="black" stroke="black" points="5363.35,-3276.19 5373.41,-3272.86 5363.46,-3269.19 5363.35,-3276.19"/>
+</g>
+<!-- lib_gtk_common&#45;&gt;lib_gtk_config -->
+<g id="edge113" class="edge"><title>lib_gtk_common&#45;&gt;lib_gtk_config</title>
+<path fill="none" stroke="black" d="M385.226,-3448.41C368.372,-3414.37 331.927,-3340.76 312.15,-3300.82"/>
+<polygon fill="black" stroke="black" points="315.193,-3299.08 307.619,-3291.67 308.919,-3302.18 315.193,-3299.08"/>
+</g>
+<!-- lib_gtk_hid&#45;&gt;dialogs -->
+<g id="edge115" class="edge"><title>lib_gtk_hid&#45;&gt;dialogs</title>
+<path fill="none" stroke="black" d="M5393.23,-3259.47C5285.63,-3211.23 4935.35,-3054.21 4820.82,-3002.86"/>
+<polygon fill="black" stroke="black" points="4821.98,-2999.55 4811.42,-2998.65 4819.11,-3005.93 4821.98,-2999.55"/>
+</g>
+<!-- lib_hid_common -->
+<g id="node53" class="node"><title>lib_hid_common</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="71.4937" cy="-2446.81" rx="71.4873" ry="18"/>
+<text text-anchor="middle" x="71.4937" y="-2443.11" font-family="Times,serif" font-size="14.00">lib_hid_common</text>
+</g>
+<!-- lib_gtk_hid&#45;&gt;lib_hid_common -->
+<g id="edge114" class="edge"><title>lib_gtk_hid&#45;&gt;lib_hid_common</title>
+<path fill="none" stroke="black" d="M5377.91,-3266.44C4888.57,-3190.86 738.701,-2549.87 142.676,-2457.81"/>
+<polygon fill="black" stroke="black" points="142.926,-2454.31 132.509,-2456.24 141.858,-2461.22 142.926,-2454.31"/>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;draw_csect -->
+<g id="edge58" class="edge"><title>hid_gtk2_gl&#45;&gt;draw_csect</title>
+<path fill="none" stroke="black" d="M874.611,-2854.81C844.281,-2974.43 672.268,-3652.79 635.061,-3799.52"/>
+<polygon fill="black" stroke="black" points="631.59,-3798.97 632.525,-3809.52 638.375,-3800.69 631.59,-3798.97"/>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;draw_fontsel -->
+<g id="edge59" class="edge"><title>hid_gtk2_gl&#45;&gt;draw_fontsel</title>
+<path fill="none" stroke="black" d="M870.828,-2854.93C822.162,-2960.66 575.479,-3496.58 516.737,-3624.2"/>
+<polygon fill="black" stroke="black" points="513.387,-3623.11 512.385,-3633.66 519.746,-3626.04 513.387,-3623.11"/>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;lib_gtk_common -->
+<g id="edge54" class="edge"><title>hid_gtk2_gl&#45;&gt;lib_gtk_common</title>
+<path fill="none" stroke="black" d="M865.709,-2854.27C798.005,-2942.19 495.067,-3335.58 414.139,-3440.67"/>
+<polygon fill="black" stroke="black" points="411.179,-3438.78 407.85,-3448.83 416.725,-3443.05 411.179,-3438.78"/>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;lib_gtk_config -->
+<g id="edge55" class="edge"><title>hid_gtk2_gl&#45;&gt;lib_gtk_config</title>
+<path fill="none" stroke="black" d="M857.14,-2853.37C767.81,-2920.61 432.618,-3172.93 329.266,-3250.73"/>
+<polygon fill="black" stroke="black" points="326.994,-3248.06 321.109,-3256.87 331.204,-3253.65 326.994,-3248.06"/>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;lib_gtk_hid -->
+<g id="edge56" class="edge"><title>hid_gtk2_gl&#45;&gt;lib_gtk_hid</title>
+<path fill="none" stroke="black" d="M930.629,-2841.72C1395.51,-2886.4 4865.91,-3219.97 5365.23,-3267.97"/>
+<polygon fill="black" stroke="black" points="5365.16,-3271.48 5375.45,-3268.95 5365.83,-3264.51 5365.16,-3271.48"/>
+</g>
+<!-- lib_hid_gl -->
+<g id="node49" class="node"><title>lib_hid_gl</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="218.293" cy="-3074.14" rx="46.5926" ry="18"/>
+<text text-anchor="middle" x="218.293" y="-3070.44" font-family="Times,serif" font-size="14.00">lib_hid_gl</text>
+</g>
+<!-- hid_gtk2_gl&#45;&gt;lib_hid_gl -->
+<g id="edge57" class="edge"><title>hid_gtk2_gl&#45;&gt;lib_hid_gl</title>
+<path fill="none" stroke="black" d="M842.237,-2850.04C728.562,-2890.87 384.355,-3014.49 262.02,-3058.43"/>
+<polygon fill="black" stroke="black" points="260.806,-3055.15 252.578,-3061.82 263.172,-3061.74 260.806,-3055.15"/>
+</g>
+<!-- hid_gtk3_cairo&#45;&gt;draw_csect -->
+<g id="edge64" class="edge"><title>hid_gtk3_cairo&#45;&gt;draw_csect</title>
+<path fill="none" stroke="black" d="M827.312,-2700.89C804.166,-2831.7 661.74,-3636.62 633.011,-3798.98"/>
+<polygon fill="black" stroke="black" points="629.51,-3798.68 631.214,-3809.14 636.403,-3799.9 629.51,-3798.68"/>
+</g>
+<!-- hid_gtk3_cairo&#45;&gt;draw_fontsel -->
+<g id="edge65" class="edge"><title>hid_gtk3_cairo&#45;&gt;draw_fontsel</title>
+<path fill="none" stroke="black" d="M824.409,-2700.97C784.658,-2818.96 562.079,-3479.62 513.523,-3623.74"/>
+<polygon fill="black" stroke="black" points="510.086,-3622.98 510.21,-3633.57 516.72,-3625.22 510.086,-3622.98"/>
+</g>
+<!-- hid_gtk3_cairo&#45;&gt;lib_gtk_common -->
+<g id="edge61" class="edge"><title>hid_gtk3_cairo&#45;&gt;lib_gtk_common</title>
+<path fill="none" stroke="black" d="M820.561,-2700.75C763.574,-2803.11 478.286,-3315.53 409.262,-3439.51"/>
+<polygon fill="black" stroke="black" points="406.122,-3437.95 404.316,-3448.39 412.238,-3441.36 406.122,-3437.95"/>
+</g>
+<!-- hid_gtk3_cairo&#45;&gt;lib_gtk_config -->
+<g id="edge62" class="edge"><title>hid_gtk3_cairo&#45;&gt;lib_gtk_config</title>
+<path fill="none" stroke="black" d="M814.579,-2700.59C738.36,-2785.27 410.659,-3149.36 321.307,-3248.63"/>
+<polygon fill="black" stroke="black" points="318.671,-3246.33 314.582,-3256.1 323.874,-3251.01 318.671,-3246.33"/>
+</g>
+<!-- hid_gtk3_cairo&#45;&gt;lib_gtk_hid -->
+<g id="edge63" class="edge"><title>hid_gtk3_cairo&#45;&gt;lib_gtk_hid</title>
+<path fill="none" stroke="black" d="M888.585,-2690.38C1382.51,-2753.89 4871.46,-3202.53 5366.61,-3266.21"/>
+<polygon fill="black" stroke="black" points="5366.38,-3269.7 5376.74,-3267.51 5367.27,-3262.76 5366.38,-3269.7"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;draw_csect -->
+<g id="edge71" class="edge"><title>hid_gtk3_gl&#45;&gt;draw_csect</title>
+<path fill="none" stroke="black" d="M791.379,-2544.17C773.129,-2687.5 653.853,-3624.2 631.552,-3799.33"/>
+<polygon fill="black" stroke="black" points="628.072,-3798.95 630.281,-3809.31 635.016,-3799.84 628.072,-3798.95"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;draw_fontsel -->
+<g id="edge72" class="edge"><title>hid_gtk3_gl&#45;&gt;draw_fontsel</title>
+<path fill="none" stroke="black" d="M789.056,-2543.91C755.6,-2673.98 552.361,-3464.14 511.37,-3623.51"/>
+<polygon fill="black" stroke="black" points="507.907,-3622.92 508.805,-3633.48 514.686,-3624.67 507.907,-3622.92"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;lib_gtk_common -->
+<g id="edge67" class="edge"><title>hid_gtk3_gl&#45;&gt;lib_gtk_common</title>
+<path fill="none" stroke="black" d="M786.098,-2543.73C737.006,-2659.33 465.586,-3298.47 405.842,-3439.15"/>
+<polygon fill="black" stroke="black" points="402.6,-3437.83 401.912,-3448.41 409.043,-3440.57 402.6,-3437.83"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;lib_gtk_config -->
+<g id="edge68" class="edge"><title>hid_gtk3_gl&#45;&gt;lib_gtk_config</title>
+<path fill="none" stroke="black" d="M781.974,-2543.52C716.338,-2642.7 395.134,-3128.05 316.25,-3247.24"/>
+<polygon fill="black" stroke="black" points="313.187,-3245.53 310.587,-3255.8 319.025,-3249.39 313.187,-3245.53"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;lib_gtk_hid -->
+<g id="edge69" class="edge"><title>hid_gtk3_gl&#45;&gt;lib_gtk_hid</title>
+<path fill="none" stroke="black" d="M841.831,-2533.54C1299.09,-2607.39 4872.71,-3184.52 5368.1,-3264.52"/>
+<polygon fill="black" stroke="black" points="5367.79,-3268.02 5378.22,-3266.16 5368.91,-3261.11 5367.79,-3268.02"/>
+</g>
+<!-- hid_gtk3_gl&#45;&gt;lib_hid_gl -->
+<g id="edge70" class="edge"><title>hid_gtk3_gl&#45;&gt;lib_hid_gl</title>
+<path fill="none" stroke="black" d="M775.869,-2542.78C692.386,-2622.34 340.478,-2957.7 243.264,-3050.34"/>
+<polygon fill="black" stroke="black" points="240.762,-3047.89 235.937,-3057.32 245.591,-3052.96 240.762,-3047.89"/>
+</g>
+<!-- hid_lesstif&#45;&gt;dialogs -->
+<g id="edge77" class="edge"><title>hid_lesstif&#45;&gt;dialogs</title>
+<path fill="none" stroke="black" d="M813.15,-2373.09C1220.79,-2436.05 4328.53,-2916.07 4739.42,-2979.54"/>
+<polygon fill="black" stroke="black" points="4739.02,-2983.02 4749.43,-2981.08 4740.09,-2976.1 4739.02,-2983.02"/>
+</g>
+<!-- hid_lesstif&#45;&gt;draw_csect -->
+<g id="edge74" class="edge"><title>hid_lesstif&#45;&gt;draw_csect</title>
+<path fill="none" stroke="black" d="M767.328,-2384.49C752.531,-2537.7 648.914,-3610.58 630.696,-3799.22"/>
+<polygon fill="black" stroke="black" points="627.188,-3799.14 629.71,-3809.43 634.155,-3799.81 627.188,-3799.14"/>
+</g>
+<!-- hid_lesstif&#45;&gt;draw_fontsel -->
+<g id="edge75" class="edge"><title>hid_lesstif&#45;&gt;draw_fontsel</title>
+<path fill="none" stroke="black" d="M765.342,-2384.45C736.174,-2525.95 545.544,-3450.78 509.903,-3623.69"/>
+<polygon fill="black" stroke="black" points="506.462,-3623.04 507.871,-3633.54 513.318,-3624.46 506.462,-3623.04"/>
+</g>
+<!-- hid_lesstif&#45;&gt;lib_hid_common -->
+<g id="edge76" class="edge"><title>hid_lesstif&#45;&gt;lib_hid_common</title>
+<path fill="none" stroke="black" d="M723.585,-2371.53C606.152,-2385.09 291.95,-2421.36 146.852,-2438.11"/>
+<polygon fill="black" stroke="black" points="146.234,-2434.66 136.702,-2439.29 147.037,-2441.62 146.234,-2434.66"/>
+</g>
+<!-- import_dsn&#45;&gt;lib_compat_help -->
+<g id="edge80" class="edge"><title>import_dsn&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3486.76,-1900.24C3376.1,-1939.99 3040.74,-2060.43 2912.49,-2106.5"/>
+<polygon fill="black" stroke="black" points="2911.12,-2103.27 2902.89,-2109.94 2913.49,-2109.86 2911.12,-2103.27"/>
+</g>
+<!-- import_ipcd356&#45;&gt;lib_compat_help -->
+<g id="edge84" class="edge"><title>import_ipcd356&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3491.91,-1951.54C3371.34,-1984.67 3051.66,-2072.52 2919.89,-2108.73"/>
+<polygon fill="black" stroke="black" points="2918.7,-2105.43 2909.98,-2111.46 2920.55,-2112.18 2918.7,-2105.43"/>
+</g>
+<!-- lib_gensexpr -->
+<g id="node61" class="node"><title>lib_gensexpr</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="153.369" cy="-1380.37" rx="55.7903" ry="18"/>
+<text text-anchor="middle" x="153.369" y="-1376.67" font-family="Times,serif" font-size="14.00">lib_gensexpr</text>
+</g>
+<!-- import_mentor_sch&#45;&gt;lib_gensexpr -->
+<g id="edge87" class="edge"><title>import_mentor_sch&#45;&gt;lib_gensexpr</title>
+<path fill="none" stroke="black" d="M779.599,-1552.46C654.427,-1518.06 332.575,-1429.62 205.805,-1394.78"/>
+<polygon fill="black" stroke="black" points="206.513,-1391.35 195.943,-1392.07 204.658,-1398.1 206.513,-1391.35"/>
+</g>
+<!-- import_mucs&#45;&gt;lib_compat_help -->
+<g id="edge89" class="edge"><title>import_mucs&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3501.95,-2000.54C3380.33,-2024.13 3065.94,-2085.1 2928.19,-2111.82"/>
+<polygon fill="black" stroke="black" points="2927.33,-2108.42 2918.18,-2113.76 2928.67,-2115.29 2927.33,-2108.42"/>
+</g>
+<!-- io_autotrax&#45;&gt;boardflip -->
+<g id="edge94" class="edge"><title>io_autotrax&#45;&gt;boardflip</title>
+<path fill="none" stroke="black" d="M1125.3,-993.771C1467.86,-1147.34 4478.09,-2496.8 4854.62,-2665.6"/>
+<polygon fill="black" stroke="black" points="4853.21,-2668.8 4863.76,-2669.7 4856.07,-2662.41 4853.21,-2668.8"/>
+</g>
+<!-- io_autotrax&#45;&gt;lib_polyhelp -->
+<g id="edge95" class="edge"><title>io_autotrax&#45;&gt;lib_polyhelp</title>
+<path fill="none" stroke="black" d="M1101.67,-997.623C1224.14,-1271.47 2699.86,-4571.33 2849.63,-4906.21"/>
+<polygon fill="black" stroke="black" points="2846.57,-4907.96 2853.85,-4915.66 2852.96,-4905.1 2846.57,-4907.96"/>
+</g>
+<!-- io_eagle&#45;&gt;boardflip -->
+<g id="edge97" class="edge"><title>io_eagle&#45;&gt;boardflip</title>
+<path fill="none" stroke="black" d="M1213.62,-861.017C1529.06,-1017.2 4490.05,-2483.28 4856.16,-2664.55"/>
+<polygon fill="black" stroke="black" points="4854.77,-2667.77 4865.29,-2669.07 4857.88,-2661.5 4854.77,-2667.77"/>
+</g>
+<!-- lib_netmap -->
+<g id="node69" class="node"><title>lib_netmap</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="764.869" cy="-255.842" rx="50.8918" ry="18"/>
+<text text-anchor="middle" x="764.869" y="-252.142" font-family="Times,serif" font-size="14.00">lib_netmap</text>
+</g>
+<!-- io_hyp&#45;&gt;lib_netmap -->
+<g id="edge99" class="edge"><title>io_hyp&#45;&gt;lib_netmap</title>
+<path fill="none" stroke="black" d="M1271.37,-707.239C1193.78,-638.082 883.995,-362.007 791.241,-279.345"/>
+<polygon fill="black" stroke="black" points="793.489,-276.661 783.695,-272.62 788.832,-281.886 793.489,-276.661"/>
+</g>
+<!-- io_kicad&#45;&gt;lib_gensexpr -->
+<g id="edge101" class="edge"><title>io_kicad&#45;&gt;lib_gensexpr</title>
+<path fill="none" stroke="black" d="M1377.22,-621.534C1223.41,-716.9 370.814,-1245.55 187.92,-1358.95"/>
+<polygon fill="black" stroke="black" points="185.891,-1356.09 179.237,-1364.33 189.58,-1362.04 185.891,-1356.09"/>
+</g>
+<!-- io_kicad_legacy&#45;&gt;io_kicad -->
+<g id="edge103" class="edge"><title>io_kicad_legacy&#45;&gt;io_kicad</title>
+<path fill="none" stroke="black" d="M1501.88,-516.889C1481.48,-535.069 1449.45,-563.614 1426.97,-583.646"/>
+<polygon fill="black" stroke="black" points="1424.59,-581.08 1419.46,-590.346 1429.25,-586.306 1424.59,-581.08"/>
+</g>
+<!-- io_pcb&#45;&gt;lib_compat_help -->
+<g id="edge108" class="edge"><title>io_pcb&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3525.81,-2048.03C3418.99,-2060.36 3085.79,-2098.83 2936.05,-2116.11"/>
+<polygon fill="black" stroke="black" points="2935.56,-2112.65 2926.02,-2117.27 2936.36,-2119.6 2935.56,-2112.65"/>
+</g>
+<!-- io_tedax&#45;&gt;lib_compat_help -->
+<g id="edge110" class="edge"><title>io_tedax&#45;&gt;lib_compat_help</title>
+<path fill="none" stroke="black" d="M3522.56,-2099.35C3409.37,-2103.69 3091.13,-2115.89 2941.5,-2121.63"/>
+<polygon fill="black" stroke="black" points="2941.32,-2118.13 2931.46,-2122.01 2941.59,-2125.13 2941.32,-2118.13"/>
+</g>
+<!-- lib_legacy_func -->
+<g id="node76" class="node"><title>lib_legacy_func</title>
+<ellipse fill="#a0a0a0" stroke="black" cx="4843.87" cy="-1609.68" rx="67.6881" ry="18"/>
+<text text-anchor="middle" x="4843.87" y="-1605.98" font-family="Times,serif" font-size="14.00">lib_legacy_func</text>
+</g>
+<!-- millpath&#45;&gt;lib_polyhelp -->
+<g id="edge117" class="edge"><title>millpath&#45;&gt;lib_polyhelp</title>
+<path fill="none" stroke="black" d="M2077.36,-188.935C2127.75,-493.674 2794.6,-4526.75 2857.16,-4905.15"/>
+<polygon fill="black" stroke="black" points="2853.75,-4905.98 2858.84,-4915.27 2860.66,-4904.84 2853.75,-4905.98"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/mods3/export.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/export.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/export.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/export.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/export.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/feature.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/feature.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/feature.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/feature.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/feature.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/fp.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/fp.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/fp.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/fp.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/fp.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/gen.sh
===================================================================
--- tags/2.0.1/doc/developer/mods3/gen.sh	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/gen.sh	(revision 18980)
@@ -0,0 +1,188 @@
+#!/bin/sh
+
+path=../../../src_plugins
+
+sloc()
+{
+	(cd "$1" && sloccount .) | awk '/^Total Phys/ { size=$9; sub(",", "", size); print size }'
+}
+
+gen_pie()
+{
+	local bn=$1 code_size=$2 color=$3
+	echo ""
+	echo "@slice"
+	echo "$code_size"
+	echo "@label"
+	echo "$bn ($code_size)"
+	if test ! -z "$color"
+	then
+		echo "@color"
+		echo "$color"
+	fi
+}
+
+rm -f *.pie *.lines
+
+echo "#autogenerated by gen.sh" > mods.pie
+echo "#autogenerated by gen.sh" > after.pie
+
+echo Core >&2
+tmp=/tmp/pcb-mods-stat
+mkdir $tmp
+cp -r ../../../src/*.c ../../../src/*.h ../../../src/Makefile* $tmp
+code_size=`sloc $tmp`
+gen_pie "core" $code_size "#00ff88" >> after.pie
+
+#echo 3rd >&2
+#code_size=`sloc ../../src_3rd`
+#gen_pie "3rd" $code_size >> after.pie
+
+echo "" > classes
+echo '
+digraph plugin_deps {
+overlap=scale
+'> deps.dot
+
+(
+cat pre.html
+for n in $path/*
+do
+	if test -d "$n"
+	then
+		echo $n >&2
+		bn=`basename $n`
+		code_size=`sloc $n`
+		total=$(($total + $code_size))
+		class=`cat $n/*.pup | sed '
+		/^$class/ {
+			s/$class *//
+			s/[()]//g
+			p
+		}
+		{ d }
+		' `
+		echo "$class" >> classes
+
+		echo "$code_size" >> $class.lines
+		gen_pie $bn $code_size >> $class.pie
+
+#		case $bn in
+#			gpmi) echo "@pull" >> mods.pie; echo "0.1" >> mods.pie;;
+#		esac
+
+		echo "<tr><th align=left>$bn<td>$code_size"
+		cat $n/*.pup | awk -v "plugin=$n" '
+		 BEGIN {
+				q = "\""
+				dep="/dev/fd/3"
+				sub(".*/", "", plugin)
+		 }
+			/^[$]/ {
+				key=$1
+				sub("[$]", "", key)
+				$1=""
+				DB[key]=$0
+				next
+			}
+
+			/^dep/ {
+				print q plugin q "->" q $2 q >> dep
+			}
+
+			/^[A-Za-z]/ {
+				key=$1
+				$1=""
+				DB[key]=$0
+				next
+			}
+
+			function strip(s) {
+				sub("^[ \t]*", "", s)
+				sub("[ \t]*$", "", s)
+				return s
+			}
+
+			END {
+				st = DB["state"]
+				if (st ~ "partial")
+					clr = "bgcolor=\"yellow\""
+				else if (st ~ "works")
+					clr = "bgcolor=\"lightgreen\""
+				else if ((st ~ "fail") || (st ~ "disable"))
+					clr = "bgcolor=\"red\""
+				else
+					clr=""
+
+				clr2 = clr
+				if (clr2 != "") {
+					sub("bgcolor=\"", "", clr2)
+					sub("\"", "", clr2)
+					print "@color" >> "mods.pie"
+					print clr2 >> "mods.pie"
+				}
+
+				print "<td " clr " >" st
+				if (DB["lstate"] != "")
+					print "<br> (" strip(DB["lstate"]) ")"
+
+				dfl = DB["default"]
+				if (dfl ~ "buildin")
+					clr = "bgcolor=\"lightgreen\""
+				else if (dfl ~ "plugin")
+					clr = "bgcolor=\"yellow\""
+				else if ((dfl ~ "disable-all") || (dfl ~ "disable"))
+					clr = "bgcolor=\"red\""
+				else
+					clr=""
+
+				print "<td " clr ">" dfl
+				if (DB["ldefault"] != "")
+					print "<br> (" strip(DB["ldefault"]) ")"
+				print "<td>" DB["class"]
+				print "<td>" DB["long"]
+				if (int(DB["autoload"]))
+					print q "user" q "->" q plugin q " [color=\"#a0a0a0\"]" >> dep
+
+				class = DB["class"]
+				if (class ~ "io")
+					clr = "fillcolor=\"#ffa0a0\""
+				else if (class ~ "import")
+					clr = "fillcolor=\"#a0ffff\""
+				else if (class ~ "export")
+					clr = "fillcolor=\"#a0ffff\""
+				else if (class ~ "lib")
+					clr = "fillcolor=\"#a0a0a0\""
+				else if (class ~ "hid")
+					clr = "fillcolor=\"#a0a0ff\""
+				print q plugin q " [style=filled " clr "]" >> dep
+			}
+		'
+	fi
+done
+cat post.html
+gen_pie "plugins" "$total" "#0088ff" >> after.pie
+) > index.html 3>>deps.dot
+echo "}" >>deps.dot
+
+twopi -Tsvg deps.dot > deps.svg
+
+for n in *.lines
+do
+	lines=`awk '{ sum += $1 } END { print sum }' < $n`
+	bn=${n%%.lines}
+	gen_pie $bn $lines >> mods.pie
+done
+
+
+classes=`sort < classes | uniq`
+
+for n in $classes after mods
+do
+	animpie < $n.pie | animator -H -d $n
+	pngtopnm ${n}0000.png | pnmcrop | pnmtopng > $n.png
+	rm ${n}0000.png
+done
+
+
+rm classes

Property changes on: tags/2.0.1/doc/developer/mods3/gen.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/hid.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/hid.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/hid.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/hid.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/hid.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/import.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/import.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/import.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/import.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/import.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/index.html
===================================================================
--- tags/2.0.1/doc/developer/mods3/index.html	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/index.html	(revision 18980)
@@ -0,0 +1,587 @@
+<html>
+<head>
+	<title> pcb-rnd modularization </title>
+</head>
+<body>
+<H1> pcb-rnd modularization </H1>
+<H2> Why bother... </H2>
+I believe good software should be modular. This is especially important in
+the context of large software, such as CAD applications. There should be
+a thin core that can model the world and provide the basic operations defined
+on it but anything else should go in separate modules.
+<p>
+Fortunately PCB already had a strong infrastructure supporting this idea.
+It has dynamic loadable plugins and the GUI and exporters are in separate
+HID modules. While working on pcb-gpmi and later pcb-rnd, I added the
+gpmi module as a separate plugin.
+<p>
+In version 1.0.8 to 1.1.0 a considerable chunk of core code has been moved into
+<i>core plugins</i>. A <i>core plugin</i> is just a plugin that is
+maintained together with the core, in the same repository, still the code is
+somewhat detached from the core. More importantly, the user can choose, for
+each plugin, separately:
+<ul>
+	<li> to compile it as a buildin (static-link it into the pcb executable)
+	<li> to compile it as a plugin (dynamic-link it runtime, if the .so is installed in the plugins/ directory)
+	<li> to disable the plugin, so it is not compiled at all
+</ul>
+<p>
+I believe such modularization has benefits on multiple levels:
+<ul>
+	<li> it is possible to compile smaller, potentially faster executables by omitting features the specific user would never use anyway
+	<li> in a distribution dynamic-link plugins can be distributed as separate packages providing the user with the option to decide what features to install
+	<li> such plugins have to have some sort of APIs if they want to reference each other or if the code needs to reference them; such an API may not (and often did not) exist when the code is part of the core
+</ul>
+
+<H2> Progress in charts </H2>
+<h3> Before-after </h3>
+All numbers are in <a href="http://en.wikipedia.org/wiki/Source_lines_of_code">SLOC</a>
+and are acquired running sloccount on the given directory. While lines of
+code alone is not a true measure of complexity, it's a good estimation. The
+slices of pie charts are the major components of the pcb-rnd executable.
+<table border=1 cellspacing=0> <tr><td>
+	<table border=0>
+	<tr><td><img src="before.png"><td> &nbsp; &nbsp; &nbsp; &nbsp;<td><img src="after.png">
+	<tr><td>Before modularization: pcb-rnd version 1.0.7
+	        <br>Note: gpmi was already a plugin
+	    <td>
+	    <td> After modularization: current pcb-rnd
+	        <br>Note: gpmi is part of the "plugins" slice
+	</table>
+</table>
+<h3>Zooming on to the plugins</h3>
+<p>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="mods.png"><tr><td><b>total size per class</b></table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="io.png"><tr><td>IO plugins</table>
+</table>
+
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="feature.png"><tr><td>feature plugins </table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="export.png"><tr><td>export plugins</table>
+</table>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="hid.png"><tr><td>HID plugins</table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="import.png"><tr><td>import plugins</table>
+</table>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="lib.png"><tr><td>library plugins </table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="fp.png"><tr><td>footprint plugins</table>
+</table>
+
+<p>
+(Red means the plugin doesn't really work).
+
+<H2> Progress in numbers </H2>
+Below is a table with the summary of core plugins.
+<table border=1 cellspacing=0>
+<tr><th>module <th>size [sloc] <th> status <th> configure<br>default <th> class <th> description
+
+
+<tr><th align=left>acompnet<td>75
+<td  > WIP
+<td bgcolor="red"> disable
+<td> feature
+<td> Auto-complete the current network. A very limited autorouter/assistant.
+<tr><th align=left>autocrop<td>52
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Reduce the board dimensions to just enclose the objects on the board.
+<tr><th align=left>autoplace<td>672
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Automatically place subcircuits.
+<tr><th align=left>autoroute<td>4358
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Automatically route selected or all rats. This is the original autorouter.
+<tr><th align=left>boardflip<td>167
+<td  >
+<br> (doesn't update rtrees)
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> All objects on the board are up-down flipped.
+<tr><th align=left>diag<td>613
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable
+<td> feature
+<td> Actions for pcb-rnd core diagnostics, intended for developers. These are not in core because end users normally don't need these. As a plugin, due to dynamic loading, it can be dropped on an existing pcb-rnd installation with minimal risk of scaring away a reproducible bug.
+<tr><th align=left>dialogs<td>1138
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable
+<td> feature
+<td> Interactive core functionality: HID-independent GUI dialogs (enabled by GUI HIDs)
+<tr><th align=left>distalign<td>433
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Introducing Align() and Distribute(), which work much like the similarly named functions in Visio. Given that PCB does not have the concept of "first selected object" to draw on, the reference points can be selected by arguments.
+<tr><th align=left>distaligntext<td>469
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Same as distalign, operates on text objects.
+<tr><th align=left>djopt<td>2255
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Various board optimization algorithms.
+<tr><th align=left>draw_csect<td>741
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable
+<td> feature
+<td> Draw cross section and layer map.
+<tr><th align=left>draw_fab<td>282
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Draw the fab layer (for various exporters).
+<tr><th align=left>draw_fontsel<td>188
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable
+<td> feature
+<td> Draw the font selector GUI
+<tr><th align=left>export_bboard<td>439
+<td  > WIP
+<td bgcolor="red"> disable-all
+<td> export
+<td> Export breadboard
+<tr><th align=left>export_bom<td>235
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export bom (Bill of Materials)
+<tr><th align=left>export_dsn<td>451
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export specctra .dsn files
+<tr><th align=left>export_dxf<td>595
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export dxf
+<tr><th align=left>export_fidocadj<td>279
+<td  > WIP
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export to FidoCadJ format (.fcd)
+<tr><th align=left>export_gcode<td>2478
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export to gcode
+<tr><th align=left>export_gerber<td>1070
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export to gerber
+<tr><th align=left>export_ipcd356<td>371
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> IPC-D-356 Netlist export.
+<tr><th align=left>export_lpr<td>104
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export to lpr (using export_ps to generate postscript)
+<tr><th align=left>export_nelma<td>678
+<td  > deprecated
+<td bgcolor="red"> disable
+<td> export
+<td> Export to nelma (Numerical capacitance calculator) - the 3rd party software, Nelma is not maintained any more.
+<tr><th align=left>export_openems<td>1372
+<td  > WIP
+<td bgcolor="red"> disable
+<td> export
+<td> Export copper to OpenEMS simulation
+<tr><th align=left>export_openscad<td>725
+<td  > WIP
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export openscad
+<tr><th align=left>export_png<td>1382
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export to png, gif and jpeg
+<tr><th align=left>export_ps<td>1576
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export postscript or embedded postscript.
+<tr><th align=left>export_stat<td>295
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Export various board statistics in lihata format
+<tr><th align=left>export_svg<td>654
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Scalable Vector Graphics (SVG) exporter
+<tr><th align=left>export_test<td>94
+<td  > WIP
+<td bgcolor="red"> disable
+<td> export
+<td> A thin layer of code to dump exporter calls for testing the HID exporter API.
+<tr><th align=left>export_xy<td>718
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> export
+<td> Template based export of XY centroid subcircuit data e.g. for pick & place.
+<tr><th align=left>extedit<td>305
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> invoke external program to edit parts of the current board
+<tr><th align=left>fontmode<td>262
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Font editing actions.
+<tr><th align=left>fp_board<td>131
+<td  > WIP
+<td bgcolor="lightgreen"> buildin
+<td> fp
+<td> Footprint: load a board and expose all the unique subcircuits on that board as a footprint library
+<tr><th align=left>fp_fs<td>424
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> fp
+<td> Footprint: file system based implementation. Used to be called Newlib: load footprints from directories. Run external processes for the parametric footprints.
+<tr><th align=left>fp_wget<td>628
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> fp
+<td> Footprint: get static (file) footprints from the web, e.g. from http://gedasymbols.org
+<tr><th align=left>gpmi<td>2799
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Scriptable plugin system with about 10 scripting languages supported and dynamic load/unload of scripts that can manipulate the GUI, the board, can implement exporters, etc.
+<tr><th align=left>hid_batch<td>324
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> hid
+<td> HID without GUI: read actions from stdin.
+<tr><th align=left>hid_gtk2_gdk<td>1227
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> hid
+<td> GUI: GTK2 HID with GDK software rendering.
+<tr><th align=left>hid_gtk2_gl<td>924
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> hid
+<td> GUI: GTK2 with opengl rendering
+<tr><th align=left>hid_gtk3_cairo<td>1131
+<td  > WIP
+<td bgcolor="red"> disable-all
+<td> hid
+<td> GUI: the GTK3 HID, using cairo for rendering
+<tr><th align=left>hid_gtk3_gl<td>52
+<td  > WIP
+<td bgcolor="red"> disable-all
+<td> hid
+<td> GUI: the GTK3 HID, using gl for rendering
+<tr><th align=left>hid_lesstif<td>6595
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> hid
+<td> GUI: the lesstif HID.
+<tr><th align=left>hid_remote<td>1185
+<td  > WIP
+<td bgcolor="red"> disable-all
+<td> hid
+<td> Remote access HID: implement a protocol and use it to relay between a core and a remote HID implementation.
+<tr><th align=left>import_dsn<td>269
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import specctra .dsn files
+<tr><th align=left>import_edif<td>3628
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import plugin for netlists in the EDIF format.
+<tr><th align=left>import_hpgl<td>133
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Emulate a plotter and import the plot as lines, arcs and polygons.
+<tr><th align=left>import_ipcd356<td>378
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> IPC-D-356 Netlist and pad centroid import
+<tr><th align=left>import_ltspice<td>244
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import the netlist and footprints from an ltspice .asc and .net pair of files
+<tr><th align=left>import_mentor_sch<td>495
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import Mentor Graphics Design Capture from flattened .edf netlist, using a parts conversion table.
+<tr><th align=left>import_mucs<td>119
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import lines and vias from MUCS unixplot .pl files
+<tr><th align=left>import_netlist<td>141
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import plugin for netlists in the classic pcb netlist format.
+<tr><th align=left>import_sch<td>310
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Imports footprints and netlist data from the schematics (or some other source).
+<tr><th align=left>import_tinycad<td>151
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import the netlist and footprints from a tinycad netlist.
+<tr><th align=left>io_autotrax<td>1578
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Import and export autotrax layouts and footprints.
+<tr><th align=left>io_eagle<td>3902
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Load the design from eagle's xml and binary formats.
+<tr><th align=left>io_hyp<td>4065
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Import plugin for hyperlynx geometry (no polygons yet).
+<tr><th align=left>io_kicad<td>3478
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Load and save the design and footprints in Kicad's s-expression format - this is the new, currently preferred format in Kicad.
+<tr><th align=left>io_kicad_legacy<td>878
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Export the design and footprints in Kicad's legacy format.
+<tr><th align=left>io_lihata<td>3784
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Load and save the design and footprints in the lihata board format.
+<tr><th align=left>io_mentor_cell<td>400
+<td  > WIP
+<td bgcolor="red"> disable
+<td> io
+<td> Load Mentor Graphics cell footprint library and make footprints available (e.g. for fp_board)
+<tr><th align=left>io_pcb<td>2723
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> io
+<td> Load and save the design and footprints in the original gEDA/PCB text format.
+<tr><th align=left>io_tedax<td>831
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> import
+<td> Import and export tEDAx netlists and footprints.
+<tr><th align=left>jostle<td>432
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Pushes lines out of the way.
+<tr><th align=left>lib_compat_help<td>1155
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> lib
+<td> a library of functions providing a simplified API compatibility layer, mainly for I/O plugins
+<tr><th align=left>lib_gensexpr<td>13
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> S-expression parser lib
+<tr><th align=left>lib_gtk_common<td>10952
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> hid_gtk* common code (regardless of gtk version or drawing mechanism: for both gtk2 and gtk3 and for both sw rendering and gl)
+<tr><th align=left>lib_gtk_config<td>2395
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> hid_gtk* preferences dialog common code (regardless of gtk version)
+<tr><th align=left>lib_gtk_hid<td>1471
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> Generic gtk HID implementation, independent of GTK version (2 vs. 3) and rendering engine. Mostly a dispatcher that fills in all the glue to connect the parts. An actual gtk HID implementation may use this lib or replace parts of it or the whole with local implementation.
+<tr><th align=left>lib_hid_common<td>292
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> hid_* common helper functions
+<tr><th align=left>lib_hid_gl<td>1127
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> generic openGL renderer shared among GUI HIDs
+<tr><th align=left>lib_legacy_func<td>91
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> lib
+<td> Random collection of old/obsolete (legacy) functions. 3rd party plugins may depend on them. This module implements C functions and variables and does not register actions or flags.
+<tr><th align=left>lib_netmap<td>149
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable-all
+<td> lib
+<td> create disposable cross-reference maps between all objects and all nets
+<tr><th align=left>lib_polyhelp<td>703
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> lib
+<td> functions to help plugins processing polygons and PolyHatch() action
+<tr><th align=left>loghid<td>314
+<td  > WIP
+<td bgcolor="red"> disable
+<td> feature
+<td> Sits between a HID (or exporter) and the core and logs all core->plugin calls made through the HID structure.
+<tr><th align=left>millpath<td>230
+<td  > WIP
+<td bgcolor="red"> disable
+<td> feature
+<td> Calculate and simulate toolpath for milling away opper
+<tr><th align=left>mincut<td>886
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Use the minimal cut algorithm to indicate shorts: instead of highlighting two random pins/pads, try to highlight the least number of objects that connect the two networks.
+<tr><th align=left>oldactions<td>174
+<td bgcolor="lightgreen" > works
+<td bgcolor="red"> disable
+<td> feature
+<td> Random collection of old/obsolete actions. Bell(): audible feedback, DumpLibrary(): print footprint library on stdout, a set of debug actions useful for writing pcb scripts: Debug(), DebugXY(), Return(). Old plugin actions to toggle or set settings that are now accessible via the unified config system (vendordrill, djopt)
+<tr><th align=left>polycombine<td>209
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> The selected polygons are combined together according to the ordering of their points.
+<tr><th align=left>polystitch<td>96
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> The polygon under the cursor (based on closest-corner) is stitched together with the polygon surrounding it on the same layer. Use with pstoedit conversions where there's a "hole" in the shape - select the hole.
+<tr><th align=left>propedit<td>955
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> List and edit properties of a group of objects.
+<tr><th align=left>puller<td>1731
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Pull traces to minimize their length.
+<tr><th align=left>query<td>1898
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> pcb-rnd query language: execute expressions on objects and rules for the programmed drc.
+<tr><th align=left>renumber<td>331
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Renumber subcircuits (renaming them) and generate a text file for back annotation.
+<tr><th align=left>report<td>854
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Report() and ReportObject() actions - print a report about design objects.
+<tr><th align=left>rubberband_orig<td>1190
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> The original rubberband code.
+<tr><th align=left>shand_cmd<td>214
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> vi-like command shorthands (1..3 character long commands)
+<tr><th align=left>shape<td>686
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Generate objects of regular shape (regular polygons, circle, round rect)
+<tr><th align=left>sketch_route<td>28
+<td  > WIP
+<td bgcolor="red"> disable
+<td> feature
+<td> TODO
+<tr><th align=left>smartdisperse<td>172
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Improve the initial dispersion of subcircuits by choosing an order based on the netlist, rather than the arbitrary subcircuit order. This isn't the same as a global autoplace, it's more of a linear autoplace. It might make some useful local groupings. For example, you should not have to chase all over the board to find the resistor that goes with a given LED.
+<tr><th align=left>stroke<td>121
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Configurable gesture recognition with libstroke.
+<tr><th align=left>teardrops<td>210
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Draw teardrops on pins.
+<tr><th align=left>vendordrill<td>517
+<td bgcolor="lightgreen" > works
+<td bgcolor="lightgreen"> buildin
+<td> feature
+<td> Vendor drill mapping.
+</table>
+
+<H3> Classes </H3>
+<p>
+Each plugin implements a class (rarely a set of classes). Classes are:
+<table border=1 cellspacing=0>
+	<tr><th>name         <th> description
+	<tr><td>feature      <td> random features directly accessible for the user, usually actions
+	<tr><td>lib          <td> support code library for other plugins (core doesn't depend on these); functionality not directly accessible for the user but other plugins may depend on it
+	<tr><td>hid          <td> Human Interface Device: interactive user interface, usually GUI
+	<tr><td>import       <td> load alien formats into the design space
+	<tr><td>export       <td> save (parts of) the design space in alien formats
+	<tr><td>fp           <td> footprint (element) library implementation
+	<tr><td>io           <td> native file format (save & load) implementation
+</table>
+
+<H3> Status </H3>
+<p>
+Common status column values mean:
+<table border=1 cellspacing=0>
+	<tr><th>name         <th> description
+	<tr><td>works        <td> production quality code - configures, compiles, tested
+	<tr><td>WIP          <td> work in progress: the plugin may be avaialble for testing but is not yet production quality
+	<tr><td>abandoned    <td> unmaintained plugin; may be in working condition but there is no developer supporting it
+	<tr><td>deprecated   <td> legacy plugin scheduled for removal; may still work but will soon be removed; if your workflow depends on it, please report ASAP
+</table>
+
+<H3> Plugin dependency map </H3>
+<p>
+<img src="deps.svg" alt="pcb-rnd plugin dependency graph">
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/mods3/io.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/io.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/io.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/io.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/io.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/lib.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/lib.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/lib.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/lib.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/lib.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/mods.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/developer/mods3/mods.png
===================================================================
--- tags/2.0.1/doc/developer/mods3/mods.png	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/mods.png	(revision 18980)

Property changes on: tags/2.0.1/doc/developer/mods3/mods.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/developer/mods3/post.html
===================================================================
--- tags/2.0.1/doc/developer/mods3/post.html	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/post.html	(revision 18980)
@@ -0,0 +1,33 @@
+</table>
+
+<H3> Classes </H3>
+<p>
+Each plugin implements a class (rarely a set of classes). Classes are:
+<table border=1 cellspacing=0>
+	<tr><th>name         <th> description
+	<tr><td>feature      <td> random features directly accessible for the user, usually actions
+	<tr><td>lib          <td> support code library for other plugins (core doesn't depend on these); functionality not directly accessible for the user but other plugins may depend on it
+	<tr><td>hid          <td> Human Interface Device: interactive user interface, usually GUI
+	<tr><td>import       <td> load alien formats into the design space
+	<tr><td>export       <td> save (parts of) the design space in alien formats
+	<tr><td>fp           <td> footprint (element) library implementation
+	<tr><td>io           <td> native file format (save & load) implementation
+</table>
+
+<H3> Status </H3>
+<p>
+Common status column values mean:
+<table border=1 cellspacing=0>
+	<tr><th>name         <th> description
+	<tr><td>works        <td> production quality code - configures, compiles, tested
+	<tr><td>WIP          <td> work in progress: the plugin may be avaialble for testing but is not yet production quality
+	<tr><td>abandoned    <td> unmaintained plugin; may be in working condition but there is no developer supporting it
+	<tr><td>deprecated   <td> legacy plugin scheduled for removal; may still work but will soon be removed; if your workflow depends on it, please report ASAP
+</table>
+
+<H3> Plugin dependency map </H3>
+<p>
+<img src="deps.svg" alt="pcb-rnd plugin dependency graph">
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/mods3/pre.html
===================================================================
--- tags/2.0.1/doc/developer/mods3/pre.html	(nonexistent)
+++ tags/2.0.1/doc/developer/mods3/pre.html	(revision 18980)
@@ -0,0 +1,88 @@
+<html>
+<head>
+	<title> pcb-rnd modularization </title>
+</head>
+<body>
+<H1> pcb-rnd modularization </H1>
+<H2> Why bother... </H2>
+I believe good software should be modular. This is especially important in
+the context of large software, such as CAD applications. There should be
+a thin core that can model the world and provide the basic operations defined
+on it but anything else should go in separate modules.
+<p>
+Fortunately PCB already had a strong infrastructure supporting this idea.
+It has dynamic loadable plugins and the GUI and exporters are in separate
+HID modules. While working on pcb-gpmi and later pcb-rnd, I added the
+gpmi module as a separate plugin.
+<p>
+In version 1.0.8 to 1.1.0 a considerable chunk of core code has been moved into
+<i>core plugins</i>. A <i>core plugin</i> is just a plugin that is
+maintained together with the core, in the same repository, still the code is
+somewhat detached from the core. More importantly, the user can choose, for
+each plugin, separately:
+<ul>
+	<li> to compile it as a buildin (static-link it into the pcb executable)
+	<li> to compile it as a plugin (dynamic-link it runtime, if the .so is installed in the plugins/ directory)
+	<li> to disable the plugin, so it is not compiled at all
+</ul>
+<p>
+I believe such modularization has benefits on multiple levels:
+<ul>
+	<li> it is possible to compile smaller, potentially faster executables by omitting features the specific user would never use anyway
+	<li> in a distribution dynamic-link plugins can be distributed as separate packages providing the user with the option to decide what features to install
+	<li> such plugins have to have some sort of APIs if they want to reference each other or if the code needs to reference them; such an API may not (and often did not) exist when the code is part of the core
+</ul>
+
+<H2> Progress in charts </H2>
+<h3> Before-after </h3>
+All numbers are in <a href="http://en.wikipedia.org/wiki/Source_lines_of_code">SLOC</a>
+and are acquired running sloccount on the given directory. While lines of
+code alone is not a true measure of complexity, it's a good estimation. The
+slices of pie charts are the major components of the pcb-rnd executable.
+<table border=1 cellspacing=0> <tr><td>
+	<table border=0>
+	<tr><td><img src="before.png"><td> &nbsp; &nbsp; &nbsp; &nbsp;<td><img src="after.png">
+	<tr><td>Before modularization: pcb-rnd version 1.0.7
+	        <br>Note: gpmi was already a plugin
+	    <td>
+	    <td> After modularization: current pcb-rnd
+	        <br>Note: gpmi is part of the "plugins" slice
+	</table>
+</table>
+<h3>Zooming on to the plugins</h3>
+<p>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="mods.png"><tr><td><b>total size per class</b></table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="io.png"><tr><td>IO plugins</table>
+</table>
+
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="feature.png"><tr><td>feature plugins </table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="export.png"><tr><td>export plugins</table>
+</table>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="hid.png"><tr><td>HID plugins</table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="import.png"><tr><td>import plugins</table>
+</table>
+
+<table border=0 width="100%">
+<tr>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="lib.png"><tr><td>library plugins </table>
+	<td width="50%"><table border=1 cellspacing=0><tr><td><img src="fp.png"><tr><td>footprint plugins</table>
+</table>
+
+<p>
+(Red means the plugin doesn't really work).
+
+<H2> Progress in numbers </H2>
+Below is a table with the summary of core plugins.
+<table border=1 cellspacing=0>
+<tr><th>module <th>size [sloc] <th> status <th> configure<br>default <th> class <th> description
+
+
Index: tags/2.0.1/doc/developer/new_model_progress/Makefile
===================================================================
--- tags/2.0.1/doc/developer/new_model_progress/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/new_model_progress/Makefile	(revision 18980)
@@ -0,0 +1,2 @@
+roadmap.svg: roadmap.dot
+	dot -Tsvg < roadmap.dot > roadmap.svg
Index: tags/2.0.1/doc/developer/new_model_progress/remove_stats.txt
===================================================================
--- tags/2.0.1/doc/developer/new_model_progress/remove_stats.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/new_model_progress/remove_stats.txt	(revision 18980)
@@ -0,0 +1,8 @@
+with old model: 1.2.8
+SLOC=200842
+#warnings: 326
+c and h files in src/ and src_plugins/: 817
+
+after removal:
+SLOC=189893 (removed 10949 sloc, 5.4515% of the code in 1.2.8)
+
Index: tags/2.0.1/doc/developer/new_model_progress/roadmap.dot
===================================================================
--- tags/2.0.1/doc/developer/new_model_progress/roadmap.dot	(nonexistent)
+++ tags/2.0.1/doc/developer/new_model_progress/roadmap.dot	(revision 18980)
@@ -0,0 +1,72 @@
+digraph roadmap {
+	"2016_4" [label="2016\n4th\nquarter" shape=plaintext]
+	"2017_1" [label="2017\n1st\nquarter" shape=plaintext]
+	"2017_2" [label="2017\n2nd\nquarter" shape=plaintext]
+	"2017_3" [label="2017\n3rd\nquarter" shape=plaintext]
+	"2017_3b" [label="" shape=plaintext]
+	"2017_4" [label="2017\n4th\nquarter" shape=plaintext]
+	"2018_1" [label="2018\n1st\nquarter" shape=plaintext]
+	"2018_2" [label="2018\n2nd\nquarter" shape=plaintext]
+
+	"2016_4" -> "2017_1" [style=invisible arrowhead=none]
+	"2017_1" -> "2017_2" [style=invisible arrowhead=none]
+	"2017_2" -> "2017_3" [style=invisible arrowhead=none]
+	"2017_3" -> "2017_3b" [style=invisible arrowhead=none]
+	"2017_3b" -> "2017_4" [style=invisible arrowhead=none]
+	"2017_4" -> "2018_1" [style=invisible arrowhead=none]
+	"2018_1" -> "2018_2" [style=invisible arrowhead=none]
+
+	lihata [color=green label="Lihata:\nNew native file format\nso we can make our changes\nwithout breaking compatibilty\nor having to wait for mainline"]
+	layer [color=green label="layer rewrite:\nmuch more detailed model of\nphysical and logical layers"]
+	subcircuit [color=green label="subcircuit:\nfootprints without special objects"]
+	binding [color=green label="layer binding:\nabstract layer recipes\nthat are board-independent\nand can be applied on a\ngiven board's stackup"]
+	compositing [color=green label="layer compositing:\npositive/nagative drawn layers within a group\nallows drawing paste, mask, inverse silk, etc."]
+	term [color=green label="subcircuit terminals:\ngeneralized pin/pad idea\nthat allows any drawing primitive\nto be a pin or pad"]
+	elem_replace [color=green label="element replacement:\nreplace the old element model\nwith subcircuits\nmake sure subcircuits can do\nanything an element could do"]
+	elem_remove [color=red label="element removal:\nremove elements, element-lines, element-arcs\npins, pads and the old circular-only vias\nin favor of subcircuits and pad stacks"]
+	padstacks [color=green label="pad stacks:\na via (or pin or pad)\nthat can have different,\narbitrary copper shape\non different layer groups"]
+	bbvia [color=green label="blind/buried via:\na pad stack has per layer info on\ncopper shape, it can\nalso have such info about the drill ends"]
+
+	fp_nolimit [color=green shape=box label="goal:\nfootprints without limitations"]
+	clean [color=red shape=box label="goal:\nclean, tree based data structure"]
+
+	recur [color=red label="subcircuit in subcircuit"]
+	hier [color=red label="hierarchical netlists"]
+
+	{ rank=same; "2016_4" lihata}
+	{ rank=same; "2017_1" layer}
+	{ rank=same; "2017_2" compositing}
+	{ rank=same; "2017_3" subcircuit}
+	{ rank=same; "2017_3b" binding term}
+	{ rank=same; "2017_4" padstacks}
+	{ rank=same; "2018_1" elem_replace}
+	{ rank=same; "2018_2" elem_remove}
+
+	lihata -> layer
+	layer -> subcircuit
+	layer -> binding
+	layer -> compositing
+	subcircuit -> binding
+	subcircuit -> term
+	subcircuit -> elem_replace
+	padstacks -> elem_replace
+	padstacks -> bbvia
+	binding -> elem_replace
+	elem_replace -> elem_remove
+	elem_remove -> clean
+
+
+	compositing -> fp_nolimit
+	binding -> fp_nolimit
+	term -> fp_nolimit
+
+	compositing -> clean
+	binding -> clean
+	term -> clean
+
+	clean -> recur
+	recur -> hier
+
+
+
+}
Index: tags/2.0.1/doc/developer/new_model_progress/roadmap.svg
===================================================================
--- tags/2.0.1/doc/developer/new_model_progress/roadmap.svg	(nonexistent)
+++ tags/2.0.1/doc/developer/new_model_progress/roadmap.svg	(revision 18980)
@@ -0,0 +1,281 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: roadmap Pages: 1 -->
+<svg width="1237pt" height="1247pt"
+ viewBox="0.00 0.00 1237.13 1247.33" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1243.33)">
+<title>roadmap</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1243.33 1233.13,-1243.33 1233.13,4 -4,4"/>
+<!-- 2016_4 -->
+<g id="node1" class="node"><title>2016_4</title>
+<text text-anchor="middle" x="27.5" y="-1191.94" font-family="Times,serif" font-size="14.00">2016</text>
+<text text-anchor="middle" x="27.5" y="-1176.94" font-family="Times,serif" font-size="14.00">4th</text>
+<text text-anchor="middle" x="27.5" y="-1161.94" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2017_1 -->
+<g id="node2" class="node"><title>2017_1</title>
+<text text-anchor="middle" x="27.5" y="-1059.78" font-family="Times,serif" font-size="14.00">2017</text>
+<text text-anchor="middle" x="27.5" y="-1044.78" font-family="Times,serif" font-size="14.00">1st</text>
+<text text-anchor="middle" x="27.5" y="-1029.78" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2016_4&#45;&gt;2017_1 -->
+<g id="edge1" class="edge"><title>2016_4&#45;&gt;2017_1</title>
+</g>
+<!-- 2017_2 -->
+<g id="node3" class="node"><title>2017_2</title>
+<text text-anchor="middle" x="27.5" y="-948.822" font-family="Times,serif" font-size="14.00">2017</text>
+<text text-anchor="middle" x="27.5" y="-933.822" font-family="Times,serif" font-size="14.00">2nd</text>
+<text text-anchor="middle" x="27.5" y="-918.822" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2017_1&#45;&gt;2017_2 -->
+<g id="edge2" class="edge"><title>2017_1&#45;&gt;2017_2</title>
+</g>
+<!-- 2017_3 -->
+<g id="node4" class="node"><title>2017_3</title>
+<text text-anchor="middle" x="27.5" y="-848.476" font-family="Times,serif" font-size="14.00">2017</text>
+<text text-anchor="middle" x="27.5" y="-833.476" font-family="Times,serif" font-size="14.00">3rd</text>
+<text text-anchor="middle" x="27.5" y="-818.476" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2017_2&#45;&gt;2017_3 -->
+<g id="edge3" class="edge"><title>2017_2&#45;&gt;2017_3</title>
+</g>
+<!-- 2017_3b -->
+<g id="node5" class="node"><title>2017_3b</title>
+</g>
+<!-- 2017_3&#45;&gt;2017_3b -->
+<g id="edge4" class="edge"><title>2017_3&#45;&gt;2017_3b</title>
+</g>
+<!-- 2017_4 -->
+<g id="node6" class="node"><title>2017_4</title>
+<text text-anchor="middle" x="27.5" y="-573.536" font-family="Times,serif" font-size="14.00">2017</text>
+<text text-anchor="middle" x="27.5" y="-558.536" font-family="Times,serif" font-size="14.00">4th</text>
+<text text-anchor="middle" x="27.5" y="-543.536" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2017_3b&#45;&gt;2017_4 -->
+<g id="edge5" class="edge"><title>2017_3b&#45;&gt;2017_4</title>
+</g>
+<!-- 2018_1 -->
+<g id="node7" class="node"><title>2018_1</title>
+<text text-anchor="middle" x="27.5" y="-420.156" font-family="Times,serif" font-size="14.00">2018</text>
+<text text-anchor="middle" x="27.5" y="-405.156" font-family="Times,serif" font-size="14.00">1st</text>
+<text text-anchor="middle" x="27.5" y="-390.156" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2017_4&#45;&gt;2018_1 -->
+<g id="edge6" class="edge"><title>2017_4&#45;&gt;2018_1</title>
+</g>
+<!-- 2018_2 -->
+<g id="node8" class="node"><title>2018_2</title>
+<text text-anchor="middle" x="27.5" y="-277.383" font-family="Times,serif" font-size="14.00">2018</text>
+<text text-anchor="middle" x="27.5" y="-262.383" font-family="Times,serif" font-size="14.00">2nd</text>
+<text text-anchor="middle" x="27.5" y="-247.383" font-family="Times,serif" font-size="14.00">quarter</text>
+</g>
+<!-- 2018_1&#45;&gt;2018_2 -->
+<g id="edge7" class="edge"><title>2018_1&#45;&gt;2018_2</title>
+</g>
+<!-- lihata -->
+<g id="node9" class="node"><title>lihata</title>
+<ellipse fill="none" stroke="green" cx="539.5" cy="-1180.64" rx="128.887" ry="58.8803"/>
+<text text-anchor="middle" x="539.5" y="-1206.94" font-family="Times,serif" font-size="14.00">Lihata:</text>
+<text text-anchor="middle" x="539.5" y="-1191.94" font-family="Times,serif" font-size="14.00">New native file format</text>
+<text text-anchor="middle" x="539.5" y="-1176.94" font-family="Times,serif" font-size="14.00">so we can make our changes</text>
+<text text-anchor="middle" x="539.5" y="-1161.94" font-family="Times,serif" font-size="14.00">without breaking compatibilty</text>
+<text text-anchor="middle" x="539.5" y="-1146.94" font-family="Times,serif" font-size="14.00">or having to wait for mainline</text>
+</g>
+<!-- layer -->
+<g id="node10" class="node"><title>layer</title>
+<ellipse fill="none" stroke="green" cx="539.5" cy="-1048.48" rx="126.644" ry="37.4533"/>
+<text text-anchor="middle" x="539.5" y="-1059.78" font-family="Times,serif" font-size="14.00">layer rewrite:</text>
+<text text-anchor="middle" x="539.5" y="-1044.78" font-family="Times,serif" font-size="14.00">much more detailed model of</text>
+<text text-anchor="middle" x="539.5" y="-1029.78" font-family="Times,serif" font-size="14.00">physical and logical layers</text>
+</g>
+<!-- lihata&#45;&gt;layer -->
+<g id="edge8" class="edge"><title>lihata&#45;&gt;layer</title>
+<path fill="none" stroke="black" d="M539.5,-1121.79C539.5,-1113.29 539.5,-1104.63 539.5,-1096.39"/>
+<polygon fill="black" stroke="black" points="543,-1096.22 539.5,-1086.22 536,-1096.22 543,-1096.22"/>
+</g>
+<!-- subcircuit -->
+<g id="node11" class="node"><title>subcircuit</title>
+<ellipse fill="none" stroke="green" cx="706.5" cy="-837.176" rx="139.1" ry="26.7407"/>
+<text text-anchor="middle" x="706.5" y="-840.976" font-family="Times,serif" font-size="14.00">subcircuit:</text>
+<text text-anchor="middle" x="706.5" y="-825.976" font-family="Times,serif" font-size="14.00">footprints without special objects</text>
+</g>
+<!-- layer&#45;&gt;subcircuit -->
+<g id="edge9" class="edge"><title>layer&#45;&gt;subcircuit</title>
+<path fill="none" stroke="black" d="M568.208,-1011.5C599.42,-972.378 648.92,-910.341 679.461,-872.064"/>
+<polygon fill="black" stroke="black" points="682.548,-873.807 686.049,-863.807 677.076,-869.441 682.548,-873.807"/>
+</g>
+<!-- binding -->
+<g id="node12" class="node"><title>binding</title>
+<ellipse fill="none" stroke="green" cx="706.5" cy="-715.616" rx="114.603" ry="58.8803"/>
+<text text-anchor="middle" x="706.5" y="-741.916" font-family="Times,serif" font-size="14.00">layer binding:</text>
+<text text-anchor="middle" x="706.5" y="-726.916" font-family="Times,serif" font-size="14.00">abstract layer recipes</text>
+<text text-anchor="middle" x="706.5" y="-711.916" font-family="Times,serif" font-size="14.00">that are board&#45;independent</text>
+<text text-anchor="middle" x="706.5" y="-696.916" font-family="Times,serif" font-size="14.00">and can be applied on a</text>
+<text text-anchor="middle" x="706.5" y="-681.916" font-family="Times,serif" font-size="14.00">given board&#39;s stackup</text>
+</g>
+<!-- layer&#45;&gt;binding -->
+<g id="edge10" class="edge"><title>layer&#45;&gt;binding</title>
+<path fill="none" stroke="black" d="M532.898,-1010.7C526.034,-961.304 520.923,-872.542 558.5,-810.306 571.071,-789.484 590.234,-772.528 610.641,-759.055"/>
+<polygon fill="black" stroke="black" points="612.553,-761.987 619.134,-753.683 608.811,-756.071 612.553,-761.987"/>
+</g>
+<!-- compositing -->
+<g id="node13" class="node"><title>compositing</title>
+<ellipse fill="none" stroke="green" cx="261.5" cy="-937.522" rx="188.181" ry="37.4533"/>
+<text text-anchor="middle" x="261.5" y="-948.822" font-family="Times,serif" font-size="14.00">layer compositing:</text>
+<text text-anchor="middle" x="261.5" y="-933.822" font-family="Times,serif" font-size="14.00">positive/nagative drawn layers within a group</text>
+<text text-anchor="middle" x="261.5" y="-918.822" font-family="Times,serif" font-size="14.00">allows drawing paste, mask, inverse silk, etc.</text>
+</g>
+<!-- layer&#45;&gt;compositing -->
+<g id="edge11" class="edge"><title>layer&#45;&gt;compositing</title>
+<path fill="none" stroke="black" d="M464.635,-1018.13C430.681,-1004.83 390.188,-988.957 354.322,-974.901"/>
+<polygon fill="black" stroke="black" points="355.413,-971.57 344.825,-971.179 352.859,-978.087 355.413,-971.57"/>
+</g>
+<!-- subcircuit&#45;&gt;binding -->
+<g id="edge12" class="edge"><title>subcircuit&#45;&gt;binding</title>
+<path fill="none" stroke="black" d="M706.5,-810.233C706.5,-802.549 706.5,-793.752 706.5,-784.696"/>
+<polygon fill="black" stroke="black" points="710,-784.407 706.5,-774.407 703,-784.407 710,-784.407"/>
+</g>
+<!-- term -->
+<g id="node14" class="node"><title>term</title>
+<ellipse fill="none" stroke="green" cx="431.5" cy="-715.616" rx="142.257" ry="48.1667"/>
+<text text-anchor="middle" x="431.5" y="-734.416" font-family="Times,serif" font-size="14.00">subcircuit terminals:</text>
+<text text-anchor="middle" x="431.5" y="-719.416" font-family="Times,serif" font-size="14.00">generalized pin/pad idea</text>
+<text text-anchor="middle" x="431.5" y="-704.416" font-family="Times,serif" font-size="14.00">that allows any drawing primitive</text>
+<text text-anchor="middle" x="431.5" y="-689.416" font-family="Times,serif" font-size="14.00">to be a pin or pad</text>
+</g>
+<!-- subcircuit&#45;&gt;term -->
+<g id="edge13" class="edge"><title>subcircuit&#45;&gt;term</title>
+<path fill="none" stroke="black" d="M651.84,-812.412C616.162,-796.9 568.621,-776.231 526.833,-758.063"/>
+<polygon fill="black" stroke="black" points="528.024,-754.765 517.458,-753.987 525.233,-761.184 528.024,-754.765"/>
+</g>
+<!-- elem_replace -->
+<g id="node15" class="node"><title>elem_replace</title>
+<ellipse fill="none" stroke="green" cx="757.5" cy="-408.856" rx="128.887" ry="58.8803"/>
+<text text-anchor="middle" x="757.5" y="-435.156" font-family="Times,serif" font-size="14.00">element replacement:</text>
+<text text-anchor="middle" x="757.5" y="-420.156" font-family="Times,serif" font-size="14.00">replace the old element model</text>
+<text text-anchor="middle" x="757.5" y="-405.156" font-family="Times,serif" font-size="14.00">with subcircuits</text>
+<text text-anchor="middle" x="757.5" y="-390.156" font-family="Times,serif" font-size="14.00">make sure subcircuits can do</text>
+<text text-anchor="middle" x="757.5" y="-375.156" font-family="Times,serif" font-size="14.00">anything an element could do</text>
+</g>
+<!-- subcircuit&#45;&gt;elem_replace -->
+<g id="edge14" class="edge"><title>subcircuit&#45;&gt;elem_replace</title>
+<path fill="none" stroke="black" d="M782.226,-814.474C801.229,-805.248 819.362,-792.311 830.5,-774.306 887.996,-681.362 837.464,-551.882 796.677,-474.89"/>
+<polygon fill="black" stroke="black" points="799.585,-472.908 791.759,-465.766 793.423,-476.23 799.585,-472.908"/>
+</g>
+<!-- binding&#45;&gt;elem_replace -->
+<g id="edge17" class="edge"><title>binding&#45;&gt;elem_replace</title>
+<path fill="none" stroke="black" d="M716.153,-656.935C724.685,-605.949 737.139,-531.529 746.147,-477.7"/>
+<polygon fill="black" stroke="black" points="749.645,-478.001 747.844,-467.56 742.741,-476.846 749.645,-478.001"/>
+</g>
+<!-- fp_nolimit -->
+<g id="node19" class="node"><title>fp_nolimit</title>
+<polygon fill="none" stroke="green" points="473.5,-581.236 297.5,-581.236 297.5,-543.236 473.5,-543.236 473.5,-581.236"/>
+<text text-anchor="middle" x="385.5" y="-566.036" font-family="Times,serif" font-size="14.00">goal:</text>
+<text text-anchor="middle" x="385.5" y="-551.036" font-family="Times,serif" font-size="14.00">footprints without limitations</text>
+</g>
+<!-- binding&#45;&gt;fp_nolimit -->
+<g id="edge21" class="edge"><title>binding&#45;&gt;fp_nolimit</title>
+<path fill="none" stroke="black" d="M622.999,-675.238C562.616,-646.762 483.179,-609.3 433.218,-585.739"/>
+<polygon fill="black" stroke="black" points="434.476,-582.463 423.939,-581.363 431.49,-588.794 434.476,-582.463"/>
+</g>
+<!-- clean -->
+<g id="node20" class="node"><title>clean</title>
+<polygon fill="none" stroke="red" points="613,-182 428,-182 428,-144 613,-144 613,-182"/>
+<text text-anchor="middle" x="520.5" y="-166.8" font-family="Times,serif" font-size="14.00">goal:</text>
+<text text-anchor="middle" x="520.5" y="-151.8" font-family="Times,serif" font-size="14.00">clean, tree based data structure</text>
+</g>
+<!-- binding&#45;&gt;clean -->
+<g id="edge24" class="edge"><title>binding&#45;&gt;clean</title>
+<path fill="none" stroke="black" d="M683.37,-657.91C652.462,-580.903 597.111,-438.576 558.5,-314.167 545.451,-272.122 533.552,-222.446 526.669,-192.09"/>
+<polygon fill="black" stroke="black" points="530.054,-191.193 524.449,-182.202 523.224,-192.726 530.054,-191.193"/>
+</g>
+<!-- compositing&#45;&gt;fp_nolimit -->
+<g id="edge20" class="edge"><title>compositing&#45;&gt;fp_nolimit</title>
+<path fill="none" stroke="black" d="M255.589,-899.88C248.397,-844.226 241.582,-736.463 280.5,-656.926 294.749,-627.805 322.44,-603.699 345.808,-587.235"/>
+<polygon fill="black" stroke="black" points="347.899,-590.045 354.189,-581.52 343.955,-584.262 347.899,-590.045"/>
+</g>
+<!-- compositing&#45;&gt;clean -->
+<g id="edge23" class="edge"><title>compositing&#45;&gt;clean</title>
+<path fill="none" stroke="black" d="M251.217,-899.893C239.963,-856.514 223.5,-781.9 223.5,-716.616 223.5,-716.616 223.5,-716.616 223.5,-407.856 223.5,-289.695 365.656,-218.311 453.27,-185.537"/>
+<polygon fill="black" stroke="black" points="454.699,-188.741 462.883,-182.013 452.29,-182.169 454.699,-188.741"/>
+</g>
+<!-- term&#45;&gt;fp_nolimit -->
+<g id="edge22" class="edge"><title>term&#45;&gt;fp_nolimit</title>
+<path fill="none" stroke="black" d="M417.197,-667.548C409.582,-642.487 400.475,-612.516 393.98,-591.144"/>
+<polygon fill="black" stroke="black" points="397.276,-589.952 391.02,-581.402 390.579,-591.988 397.276,-589.952"/>
+</g>
+<!-- term&#45;&gt;clean -->
+<g id="edge25" class="edge"><title>term&#45;&gt;clean</title>
+<path fill="none" stroke="black" d="M461.728,-668.146C469.828,-653.577 477.669,-637.071 482.5,-620.926 529.272,-464.609 525.506,-265.676 522.147,-192.588"/>
+<polygon fill="black" stroke="black" points="525.63,-192.165 521.64,-182.35 518.639,-192.511 525.63,-192.165"/>
+</g>
+<!-- elem_remove -->
+<g id="node16" class="node"><title>elem_remove</title>
+<ellipse fill="none" stroke="red" cx="757.5" cy="-266.083" rx="190.424" ry="48.1667"/>
+<text text-anchor="middle" x="757.5" y="-284.883" font-family="Times,serif" font-size="14.00">element removal:</text>
+<text text-anchor="middle" x="757.5" y="-269.883" font-family="Times,serif" font-size="14.00">remove elements, element&#45;lines, element&#45;arcs</text>
+<text text-anchor="middle" x="757.5" y="-254.883" font-family="Times,serif" font-size="14.00">pins, pads and the old circular&#45;only vias</text>
+<text text-anchor="middle" x="757.5" y="-239.883" font-family="Times,serif" font-size="14.00">in favor of subcircuits and pad stacks</text>
+</g>
+<!-- elem_replace&#45;&gt;elem_remove -->
+<g id="edge18" class="edge"><title>elem_replace&#45;&gt;elem_remove</title>
+<path fill="none" stroke="black" d="M757.5,-349.786C757.5,-341.386 757.5,-332.745 757.5,-324.361"/>
+<polygon fill="black" stroke="black" points="761,-324.295 757.5,-314.295 754,-324.295 761,-324.295"/>
+</g>
+<!-- elem_remove&#45;&gt;clean -->
+<g id="edge19" class="edge"><title>elem_remove&#45;&gt;clean</title>
+<path fill="none" stroke="black" d="M662.127,-224.406C631.426,-211.311 598.57,-197.298 572.241,-186.068"/>
+<polygon fill="black" stroke="black" points="573.423,-182.767 562.852,-182.063 570.677,-189.206 573.423,-182.767"/>
+</g>
+<!-- padstacks -->
+<g id="node17" class="node"><title>padstacks</title>
+<ellipse fill="none" stroke="green" cx="1025.5" cy="-562.236" rx="107.46" ry="58.8803"/>
+<text text-anchor="middle" x="1025.5" y="-588.536" font-family="Times,serif" font-size="14.00">pad stacks:</text>
+<text text-anchor="middle" x="1025.5" y="-573.536" font-family="Times,serif" font-size="14.00">a via (or pin or pad)</text>
+<text text-anchor="middle" x="1025.5" y="-558.536" font-family="Times,serif" font-size="14.00">that can have different,</text>
+<text text-anchor="middle" x="1025.5" y="-543.536" font-family="Times,serif" font-size="14.00">arbitrary copper shape</text>
+<text text-anchor="middle" x="1025.5" y="-528.536" font-family="Times,serif" font-size="14.00">on different layer groups</text>
+</g>
+<!-- padstacks&#45;&gt;elem_replace -->
+<g id="edge15" class="edge"><title>padstacks&#45;&gt;elem_replace</title>
+<path fill="none" stroke="black" d="M951.558,-519.47C918.989,-501.073 880.451,-479.305 846.336,-460.035"/>
+<polygon fill="black" stroke="black" points="847.732,-456.804 837.304,-454.933 844.289,-462.899 847.732,-456.804"/>
+</g>
+<!-- bbvia -->
+<g id="node18" class="node"><title>bbvia</title>
+<ellipse fill="none" stroke="green" cx="1066.5" cy="-408.856" rx="162.769" ry="48.1667"/>
+<text text-anchor="middle" x="1066.5" y="-427.656" font-family="Times,serif" font-size="14.00">blind/buried via:</text>
+<text text-anchor="middle" x="1066.5" y="-412.656" font-family="Times,serif" font-size="14.00">a pad stack has per layer info on</text>
+<text text-anchor="middle" x="1066.5" y="-397.656" font-family="Times,serif" font-size="14.00">copper shape, it can</text>
+<text text-anchor="middle" x="1066.5" y="-382.656" font-family="Times,serif" font-size="14.00">also have such info about the drill ends</text>
+</g>
+<!-- padstacks&#45;&gt;bbvia -->
+<g id="edge16" class="edge"><title>padstacks&#45;&gt;bbvia</title>
+<path fill="none" stroke="black" d="M1041,-504.006C1044.33,-491.718 1047.84,-478.738 1051.17,-466.473"/>
+<polygon fill="black" stroke="black" points="1054.54,-467.385 1053.78,-456.817 1047.79,-465.555 1054.54,-467.385"/>
+</g>
+<!-- recur -->
+<g id="node21" class="node"><title>recur</title>
+<ellipse fill="none" stroke="red" cx="520.5" cy="-90" rx="91.784" ry="18"/>
+<text text-anchor="middle" x="520.5" y="-86.3" font-family="Times,serif" font-size="14.00">subcircuit in subcircuit</text>
+</g>
+<!-- clean&#45;&gt;recur -->
+<g id="edge26" class="edge"><title>clean&#45;&gt;recur</title>
+<path fill="none" stroke="black" d="M520.5,-143.716C520.5,-135.973 520.5,-126.789 520.5,-118.274"/>
+<polygon fill="black" stroke="black" points="524,-118.003 520.5,-108.003 517,-118.003 524,-118.003"/>
+</g>
+<!-- hier -->
+<g id="node22" class="node"><title>hier</title>
+<ellipse fill="none" stroke="red" cx="520.5" cy="-18" rx="79.0865" ry="18"/>
+<text text-anchor="middle" x="520.5" y="-14.3" font-family="Times,serif" font-size="14.00">hierarchical netlists</text>
+</g>
+<!-- recur&#45;&gt;hier -->
+<g id="edge27" class="edge"><title>recur&#45;&gt;hier</title>
+<path fill="none" stroke="black" d="M520.5,-71.6966C520.5,-63.9827 520.5,-54.7125 520.5,-46.1124"/>
+<polygon fill="black" stroke="black" points="524,-46.1043 520.5,-36.1043 517,-46.1044 524,-46.1043"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/developer/obj_func_naming.txt
===================================================================
--- tags/2.0.1/doc/developer/obj_func_naming.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/obj_func_naming.txt	(revision 18980)
@@ -0,0 +1,76 @@
+obj_* function naming conventions
+
+
+High level (new/destroy):
+
+	This is the recommended way of creating new objects.
+
+	pcb_*_new():
+		Calls pcb_*_alloc(), fills in fields from parameters and calls the post
+		processing (pcb_add_*_on_layer()) function as needed. Makes sanity checks
+		on the parameters and may fail upon that. 
+
+	pcb_*_new_*():
+		Same as pcb_*_new(), but may do clever things so the object created may
+		not be 1:1 what was requested or may not even be a new object (e.g.
+		overlapping line merging)
+
+	pcb_*_destroy()
+		free all fields of an object and properly remove it from the parent
+		(including rtree removal)
+
+Low level (alloc/free):
+
+	Use this in some special cases (like loading a file) when the extra checks
+	of a _new may interfere. 
+
+	pcb_*_alloc():
+		allocate a new objects within a parent (as of now: layer). Allocates
+		the struct of a new objects with all fields clean and links the object
+		in the parent list. Returns a pointer to the object. NOTE: some post
+		processing may be needed after filling in the fields
+		(see also: pcb_add_*_on_layer())
+
+	pcb_*_free():
+		free the struct memory (but not the fields!) of an object and remove
+		it from the parent list.
+
+	pcb_add_*_on_layer():
+		Postprocessing: call this after a new object is allocated and fields are
+		filled in. It mainly updates the rtree.
+
+	pcb_*_copy():
+		copy fields of a complex obj to a pre-allocated target obj
+
+
+Accessors:
+	pcb_*_get_*():
+		Return data that are not directly accessible as object struct fields but
+		require some sort of calculation
+
+	pcb_*_set_*():
+		Set object fields that require postprocessing because of side effects.
+		Use these instead of direct writes to the fields to get side effects
+		properly executed.
+
+	pcb_*_change_*():
+		Similar to pcb_*_set_*(), but instead of setting a field to a value
+		specified as a parameter, change the field to comply with some global
+		state, e.g. "change side" would move the object to the currently viewed
+		side.
+
+Transformations:
+	pcb_*_move():
+		move the object within its parent (x;y); it's often implemented as a
+		macro
+
+	pcb_*_mirror():
+		mirror the object within its parent (x;y)
+
+
+Misc:
+	pcb_*_bbox():
+		calculate and update the bounding box of an object
+
+	pcb_*_rotate90()
+		Rotate the object by n*90 degrees
Index: tags/2.0.1/doc/developer/packaging/desc
===================================================================
--- tags/2.0.1/doc/developer/packaging/desc	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging/desc	(revision 18980)
@@ -0,0 +1,105 @@
+@pcb-rnd
+	Standard installation of pcb-rnd
+
+	Install pcb-rnd core and the most commonly used plugins.
+
+@pcb-rnd-doc
+	Documentation for pcb-rnd
+	
+	User manual (html) and manual pages.
+
+@pcb-rnd-core
+	pcb-rnd executable with the core functionality
+
+	Includes the data model, the most common action commands, the native file
+	format and the CLI (batch HID). Does not contain GUI. Can be used in
+	headless mode or batch/scripted mode for automated processing.
+
+@pcb-rnd-auto
+	Autoroute and autoplace.
+
+	Feature plugins for automated component placing and track routing
+
+@pcb-rnd-cloud
+	Networking plugins.
+
+	'Cloud' footprint access plugin that integrates edakrill and gedasymbols.org.
+
+@pcb-rnd-debug
+	Debug and diagnostics.
+
+	Extra action commands to help debugging and diagnostize problems and bugs.
+
+@pcb-rnd-export-extra
+	Export formats: special/extra
+
+	Less commonly used export formats: fidocadj, ipc-356-d, direct printing with lpr.
+
+@pcb-rnd-export-sim
+	Export plugins to simulators
+
+	Export the board in formats that can be used for simulation: openems and nelma.
+
+@pcb-rnd-export
+	Common export plugins.
+
+	Export the board in vector graphics (svg, ps, eps), raster graphics
+	(png, jpeg, etc.), gerber, 3d model in openscad, xy for pick and place,
+	BoM, etc.
+
+@pcb-rnd-extra
+	Extra action commands and optional functionality.
+
+	Align objects in grid, optimize tracks, font editor, combine polygons,
+	renumber subcircuits, apply vendor drill mapping.
+
+@pcb-rnd-hid-gtk2-gdk
+	GUI: gtk2, software render
+
+	Software rendering on gtk2, using the gdk API.
+
+@pcb-rnd-hid-gtk2-gl
+	GUI: gtk2, opengl
+
+	Hardware accelerated (opengl) rendering on gtk2.
+
+@pcb-rnd-hid-lesstif
+	GUI: motif/lesstif, software render
+
+	Lightweight GUI and software rendering using the motif (lesstif) toolkit.
+
+@pcb-rnd-import-geo
+	Geometry import plugins.
+
+	Import geometry from HPGL plots. HPGL can be produced (plotted) with
+	most mechanical cads.
+
+@pcb-rnd-import-net
+	Netlist/schematics import plugins.
+
+	Import netlist and footprint information from edif, ltspice, mentor graphics,
+	gschem and tinycad.
+
+@pcb-rnd-io-alien
+	File format compatibility with other PCB board designers.
+
+	Load and/or save boards in file formats supported by other
+	EDA tools, such as KiCAD, Eagle, protel/autotrax, etc.
+
+@pcb-rnd-io-standard
+	Commonly used non-native board and footprint file formats
+
+	Plugins for tEDAx footprint format and the gEDA/PCB file formats
+	(footprint and board).
+
+@pcb-rnd-lib-gl
+	Support library for rendering with opengl.
+
+@pcb-rnd-lib-gtk
+	Support library for building the GUI with gtk.
+
+@pcb-rnd-lib-gui
+	Support library for building the GUI.
+
+@pcb-rnd-lib-io
+	Support library for alien file formats.
Index: tags/2.0.1/doc/developer/packaging/description.txt
===================================================================
--- tags/2.0.1/doc/developer/packaging/description.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging/description.txt	(revision 18980)
@@ -0,0 +1,55 @@
+Description-en: Modular Printed Circuit Board layout tool
+ pcb-rnd is a highly modular PCB (Printed Circuit Board) layout tool
+ with a rich set of plugins for communicating with various external
+ design tools and other EDA/CAD packages.
+ .
+ Feature highlights:
+   - subcircuits, pad stacks
+   - flexible footprint model; unrestricted pad shapes
+   - arbitrary copper, silk, paste and soldermask objects
+   - sophisticated, flexible layer model
+   - flexible/universal polygon model
+   - any object, even polygons, can have a clearance within a polygon
+   - advanced mil and mm grid, with support for mixed unit design
+   - strong CLI support
+   - static footprints and parametric (generated) footprints
+   - query language for advanced search & select
+   - layout optimizers such as teardrops and a trace puller
+   - footprint library from local file systems, HTTP and board files
+   - netlist management: imported and as-built; back annotation
+   - design rule checker
+ .
+ File formats and compatibility:
+   - text based, tree structured native file format
+   - gerber (export)
+   - KiCad, s-expr format boards (read, write)
+   - KiCad, s-expr format elements (write)
+   - KiCad, legacy text format boards (write)
+   - KiCad, eeschema netlist+footprint info (import)
+   - tEDAx footprints (read, write)
+   - tEDAx netlist (read)
+   - Autotrax (protel) pcb boards (read, write)
+   - Eagle XML format boards and libraries (read)
+   - Eagle binary format boards and libraries (read)
+   - Eagle DRU files (read)
+   - Mentor Graphics Hyperlynx (read/write)
+   - gEDA/PCB (read, write)
+   - Specctra DSN (partial import/export, for freerouting.net)
+   - flat EDIF netlist (import)
+   - HPGL plot files (import)
+   - openSCAD colored 3d model script (export)
+   - ltspice netlist+footprint info (import)
+   - Mentor Graphics Design Capture netlist+footprint info (import)
+   - MUCS unixplot (partial import: lines, vias)
+   - gEDA/gschem netlist+footprint info (import)
+   - TinyCAD netlist+footprint info (import)
+   - breadboard assembly drawing png (export)
+   - BoM (Bill of Materials; export)
+   - dxf, 2d drawings (export)
+   - fidocadj board (export)
+   - gcode (export)
+   - nelma (export)
+   - PNG, JPEG, GIF (export with photo-realistic render option)
+   - postscript: ps, eps (export)
+   - svg (export)
+   - xy: template based, multi-format footprint/coord list (export)
Index: tags/2.0.1/doc/developer/packaging/lib64.txt
===================================================================
--- tags/2.0.1/doc/developer/packaging/lib64.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging/lib64.txt	(revision 18980)
@@ -0,0 +1,23 @@
+Why pcb-rnd plusings are in /usr/lib/ and not /usr/lib64/
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On a 64 bit system where both 32 bit and 64 bit software needs to be run
+a separate set of 32 and 64 bit libraries are kept for two reasons:
+
+1. You may want to install both the 32 and the 64 bit version of the
+same lib (e.g. libc) without interference.
+
+2. You want the dynamic linker to find the right one for your app; so
+when linking a 32 bit app, you want to look only for 32 bit libs and
+when linking a 64 bit app, you want to look only for 64 bit libs.
+Linking means the dynamic linker's automatic run when a dynamic linked
+executable is started up.
+
+What we do in our plugin dir is neither of those. We never want to have
+both 32 and 64 bit pcb-rnds live side by side on a 64 bit system. And
+these .so files are never read by the dynamic linker on executable
+startup. The only one way they are loaded is by explicit path, using
+dlopen, from within pcb-rnd. Because they are plugins, not general
+purpose shared libs. So it is safe to put them in a common lib/, we do
+not need to install them in different libdirs per system.
+
Index: tags/2.0.1/doc/developer/packaging/packages.html
===================================================================
--- tags/2.0.1/doc/developer/packaging/packages.html	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging/packages.html	(revision 18980)
@@ -0,0 +1,142 @@
+
+<html>
+<body>
+
+<h3> Package summary and dependencies </h3>
+<table border=1>
+<tr><th> package <th> depends on (packages) <th> consists of (plugins)
+<tr><th>pcb-rnd-debug<td> pcb-rnd-core<td> diag
+<tr><th>pcb-rnd-export<td> pcb-rnd-core<td> cam export_bom export_dxf export_gcode export_gerber export_openscad export_png export_ps export_stat export_svg export_xy
+<tr><th>pcb-rnd-doc<td><td>&nbsp;
+<tr><th>pcb-rnd-export-sim<td> pcb-rnd-core<td> export_openems
+<tr><th>pcb-rnd-lib-gl<td> pcb-rnd-core<td> lib_hid_gl
+<tr><th>pcb-rnd-import-geo<td> pcb-rnd-core<td> import_hpgl
+<tr><th>pcb-rnd-hid-gtk2-gl<td> pcb-rnd-core pcb-rnd-lib-gtk pcb-rnd-lib-gl pcb-rnd-lib-gui<td> hid_gtk2_gl
+<tr><th>pcb-rnd-import-net<td> pcb-rnd-core pcb-rnd-lib-io<td> import_edif import_fpcb_nl import_ipcd356 import_ltspice import_mentor_sch import_netlist import_sch import_tinycad
+<tr><th>pcb-rnd<td>pcb-rnd-core pcb-rnd-io-standard pcb-rnd-io-alien pcb-rnd-hid-gtk2-dl pcb-rnd-hid-gtk2-gdk pcb-rnd-export pcb-rnd-export-sim pcb-rnd-export-extra pcb-rnd-auto pcb-rnd-extra pcb-rnd-cloud pcb-rnd-doc<td>&lt;metapackage&gt;
+<tr><th>pcb-rnd-auto<td> pcb-rnd-core<td> autoplace autoroute export_dsn import_dsn import_mucs smartdisperse
+<tr><th>pcb-rnd-lib-io<td> pcb-rnd-core<td> lib_gensexpr lib_netmap
+<tr><th>pcb-rnd-io-standard<td> pcb-rnd-core<td> io_pcb io_tedax
+<tr><th>pcb-rnd-lib-gui<td> pcb-rnd-core<td> dialogs draw_fontsel lib_hid_common
+<tr><th>pcb-rnd-core<td><td> autocrop boardflip ddraft draw_csect draw_fab extedit fp_board fp_fs hid_batch io_lihata lib_compat_help lib_polyhelp mincut propedit query report rubberband_orig script shape
+<tr><th>pcb-rnd-lib-gtk<td> pcb-rnd-core pcb-rnd-lib-gui<td> lib_gtk_common lib_gtk_config lib_gtk_hid
+<tr><th>pcb-rnd-hid-lesstif<td> pcb-rnd-core pcb-rnd-lib-gui<td> hid_lesstif
+<tr><th>pcb-rnd-io-alien<td> pcb-rnd-core pcb-rnd-lib-io<td> io_autotrax io_eagle io_hyp io_kicad io_kicad_legacy
+<tr><th>pcb-rnd-cloud<td> pcb-rnd-core<td> fp_wget
+<tr><th>pcb-rnd-export-extra<td> pcb-rnd-core pcb-rnd-export<td> export_fidocadj export_ipcd356 export_lpr
+<tr><th>pcb-rnd-hid-gtk2-gdk<td> pcb-rnd-core pcb-rnd-lib-gtk pcb-rnd-lib-gui<td> hid_gtk2_gdk
+<tr><th>pcb-rnd-extra<td> pcb-rnd-core<td> distalign distaligntext djopt fontmode jostle polycombine polystitch puller renumber shand_cmd teardrops vendordrill
+</table>
+<h3> Package description and files </h3>
+<table border=1>
+<tr><th> package <th> files <th> short <th> long
+<tr><th>pcb-rnd-debug<td> diag.pup diag.so<td>	Debug and diagnostics.<td> 	Extra action commands to help debugging and diagnostize problems and bugs.  
+<tr><th>pcb-rnd-export<td> cam.pup cam.so export_bom.pup export_bom.so export_dxf.pup export_dxf.so export_gcode.pup export_gcode.so export_gerber.pup export_gerber.so export_openscad.pup export_openscad.so export_png.pup export_png.so export_ps.pup export_ps.so export_stat.pup export_stat.so export_svg.pup export_svg.so export_xy.pup export_xy.so<td>	Common export plugins.<td> 	Export the board in vector graphics (svg, ps, eps), raster graphics 	(png, jpeg, etc.), gerber, 3d model in openscad, xy for pick and place, 	BoM, etc.  
+<tr><th>pcb-rnd-doc<td>/usr/share/doc/*<td>	Documentation for pcb-rnd<td>	 	User manual (html) and manual pages.  
+<tr><th>pcb-rnd-export-sim<td> export_openems.pup export_openems.so<td>	Export plugins to simulators<td> 	Export the board in formats that can be used for simulation: openems and nelma.  
+<tr><th>pcb-rnd-lib-gl<td> lib_hid_gl.pup lib_hid_gl.so<td>	Support library for rendering with opengl.<td> 
+<tr><th>pcb-rnd-import-geo<td> import_hpgl.pup import_hpgl.so<td>	Geometry import plugins.<td> 	Import geometry from HPGL plots. HPGL can be produced (plotted) with 	most mechanical cads.  
+<tr><th>pcb-rnd-hid-gtk2-gl<td> hid_gtk2_gl.pup hid_gtk2_gl.so<td>	GUI: gtk2, opengl<td> 	Hardware accelerated (opengl) rendering on gtk2.  
+<tr><th>pcb-rnd-import-net<td> import_edif.pup import_edif.so import_fpcb_nl.pup import_fpcb_nl.so import_ipcd356.pup import_ipcd356.so import_ltspice.pup import_ltspice.so import_mentor_sch.pup import_mentor_sch.so import_netlist.pup import_netlist.so import_sch.pup import_sch.so import_tinycad.pup import_tinycad.so<td>	Netlist/schematics import plugins.<td> 	Import netlist and footprint information from edif, ltspice, mentor graphics, 	gschem and tinycad.  
+<tr><th>pcb-rnd<td><td>	Standard installation of pcb-rnd<td> 	Install pcb-rnd core and the most commonly used plugins.  
+<tr><th>pcb-rnd-auto<td> autoplace.pup autoplace.so autoroute.pup autoroute.so export_dsn.pup export_dsn.so import_dsn.pup import_dsn.so import_mucs.pup import_mucs.so smartdisperse.pup smartdisperse.so<td>	Autoroute and autoplace.<td> 	Feature plugins for automated component placing and track routing  
+<tr><th>pcb-rnd-lib-io<td> lib_gensexpr.pup lib_gensexpr.so lib_netmap.pup lib_netmap.so<td>	Support library for alien file formats.<td>&nbsp;
+<tr><th>pcb-rnd-io-standard<td> io_pcb.pup io_pcb.so io_tedax.pup io_tedax.so<td>	Commonly used non-native board and footprint file formats<td> 	Plugins for tEDAx footprint format and the gEDA/PCB file formats 	(footprint and board).  
+<tr><th>pcb-rnd-lib-gui<td> dialogs.pup dialogs.so draw_fontsel.pup draw_fontsel.so lib_hid_common.pup lib_hid_common.so<td>	Support library for building the GUI.<td> 
+<tr><th>pcb-rnd-core<td> autocrop.pup autocrop.so boardflip.pup boardflip.so ddraft.pup ddraft.so draw_csect.pup draw_csect.so draw_fab.pup draw_fab.so extedit.pup extedit.so fp_board.pup fp_board.so fp_fs.pup fp_fs.so hid_batch.pup hid_batch.so io_lihata.pup io_lihata.so lib_compat_help.pup lib_compat_help.so lib_polyhelp.pup lib_polyhelp.so mincut.pup mincut.so propedit.pup propedit.so query.pup query.so report.pup report.so rubberband_orig.pup rubberband_orig.so script.pup script.so shape.pup shape.so<td>	pcb-rnd executable with the core functionality<td> 	Includes the data model, the most common action commands, the native file 	format and the CLI (batch HID). Does not contain GUI. Can be used in 	headless mode or batch/scripted mode for automated processing.  
+<tr><th>pcb-rnd-lib-gtk<td> lib_gtk_common.pup lib_gtk_common.so lib_gtk_config.pup lib_gtk_config.so lib_gtk_hid.pup lib_gtk_hid.so<td>	Support library for building the GUI with gtk.<td> 
+<tr><th>pcb-rnd-hid-lesstif<td> hid_lesstif.pup hid_lesstif.so<td>	GUI: motif/lesstif, software render<td> 	Lightweight GUI and software rendering using the motif (lesstif) toolkit.  
+<tr><th>pcb-rnd-io-alien<td> io_autotrax.pup io_autotrax.so io_eagle.pup io_eagle.so io_hyp.pup io_hyp.so io_kicad.pup io_kicad.so io_kicad_legacy.pup io_kicad_legacy.so<td>	File format compatibility with other PCB board designers.<td> 	Load and/or save boards in file formats supported by other 	EDA tools, such as KiCAD, Eagle, protel/autotrax, etc.  
+<tr><th>pcb-rnd-cloud<td> fp_wget.pup fp_wget.so<td>	Networking plugins.<td> 	'Cloud' footprint access plugin that integrates edakrill and gedasymbols.org.  
+<tr><th>pcb-rnd-export-extra<td> export_fidocadj.pup export_fidocadj.so export_ipcd356.pup export_ipcd356.so export_lpr.pup export_lpr.so<td>	Export formats: special/extra<td> 	Less commonly used export formats: fidocadj, ipc-356-d, direct printing with lpr.  
+<tr><th>pcb-rnd-hid-gtk2-gdk<td> hid_gtk2_gdk.pup hid_gtk2_gdk.so<td>	GUI: gtk2, software render<td> 	Software rendering on gtk2, using the gdk API.  
+<tr><th>pcb-rnd-extra<td> distalign.pup distalign.so distaligntext.pup distaligntext.so djopt.pup djopt.so fontmode.pup fontmode.so jostle.pup jostle.so polycombine.pup polycombine.so polystitch.pup polystitch.so puller.pup puller.so renumber.pup renumber.so shand_cmd.pup shand_cmd.so teardrops.pup teardrops.so vendordrill.pup vendordrill.so<td>	Extra action commands and optional functionality.<td> 	Align objects in grid, optimize tracks, font editor, combine polygons, 	renumber subcircuits, apply vendor drill mapping.  
+</table>
+<h3> ./configure arguments </h3>
+--all=disable
+--buildin-script
+--buildin-fp_fs
+--buildin-draw_fab
+--buildin-boardflip
+--buildin-mincut
+--buildin-report
+--buildin-rubberband_orig
+--buildin-fp_board
+--buildin-propedit
+--buildin-io_lihata
+--buildin-autocrop
+--buildin-lib_polyhelp
+--buildin-draw_csect
+--buildin-ddraft
+--buildin-hid_batch
+--buildin-query
+--buildin-lib_compat_help
+--buildin-shape
+--buildin-extedit
+--plugin-export_fidocadj
+--plugin-export_lpr
+--plugin-export_stat
+--plugin-io_kicad_legacy
+--plugin-io_eagle
+--plugin-io_tedax
+--plugin-io_kicad
+--plugin-import_mucs
+--plugin-renumber
+--plugin-smartdisperse
+--plugin-draw_fontsel
+--plugin-polycombine
+--plugin-export_gcode
+--plugin-export_bom
+--plugin-import_sch
+--plugin-teardrops
+--plugin-shand_cmd
+--plugin-import_tinycad
+--plugin-export_openems
+--plugin-import_ltspice
+--plugin-export_dxf
+--plugin-lib_gtk_common
+--plugin-lib_gtk_config
+--plugin-export_ipcd356
+--plugin-import_dsn
+--plugin-import_mentor_sch
+--plugin-export_ps
+--plugin-hid_gtk2_gdk
+--plugin-djopt
+--plugin-hid_gtk2_gl
+--plugin-import_edif
+--plugin-hid_lesstif
+--plugin-lib_gtk_hid
+--plugin-lib_gensexpr
+--plugin-diag
+--plugin-lib_hid_gl
+--plugin-autoplace
+--plugin-export_svg
+--plugin-fp_wget
+--plugin-fontmode
+--plugin-import_netlist
+--plugin-polystitch
+--plugin-dialogs
+--plugin-export_xy
+--plugin-export_png
+--plugin-import_hpgl
+--plugin-import_ipcd356
+--plugin-distaligntext
+--plugin-export_dsn
+--plugin-lib_netmap
+--plugin-lib_hid_common
+--plugin-io_hyp
+--plugin-cam
+--plugin-puller
+--plugin-import_fpcb_nl
+--plugin-io_pcb
+--plugin-distalign
+--plugin-export_openscad
+--plugin-jostle
+--plugin-autoroute
+--plugin-io_autotrax
+--plugin-vendordrill
+--plugin-export_gerber
+
+</body>
+</html>
+
Index: tags/2.0.1/doc/developer/packaging/packages.sh
===================================================================
--- tags/2.0.1/doc/developer/packaging/packages.sh	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging/packages.sh	(revision 18980)
@@ -0,0 +1,139 @@
+#!/bin/sh
+proot=../../../src_plugins
+
+meta_deps="core io-standard io-alien hid-gtk2-dl hid-gtk2-gdk export export-sim export-extra auto extra cloud doc"
+
+(echo '
+<html>
+<body>
+'
+
+for n in $proot/*/*.pup
+do
+	pkg=`basename $n`
+	sed "s/^/$pkg /" < $n
+done | awk -v "meta_deps=$meta_deps" '
+	BEGIN {
+		gsub(" ", " pcb-rnd-", meta_deps)
+		sub("^", "pcb-rnd-", meta_deps)
+		while((getline < "desc") == 1) {
+			if ($0 ~ "^@") {
+				pkg=$0
+				sub("^@", "", pkg)
+				getline SHORT[pkg] < "desc"
+				continue
+			}
+			LONG[pkg] = LONG[pkg] $0 " "
+		}
+	}
+
+	{
+		pkg = $1;
+		sub("[.]pup$", "", pkg)
+		if (pkg == "(core)") pkg="core"
+		
+
+		val=$3
+		if (val == "(core)") val="core"
+		cfg = pkg
+		pkg = "pcb-rnd-" pkg
+		val = "pcb-rnd-" val
+	}
+
+	($2 == "$package") {
+		PKG[val] = PKG[val] " " cfg;
+		PLUGIN[pkg] = val;
+		IFILES[val] = IFILES[val] " " cfg ".pup " cfg ".so"
+		if (val == "pcb-rnd-core") CFG_BUILDIN[cfg]++
+		else CFG_PLUGIN[cfg]++
+	}
+	($2 == "dep") { PLUGIN_DEP[pkg] = PLUGIN_DEP[pkg] " " val }
+
+	function add_dep(pkg, depson,    ds)
+	{
+		if (pkg != depson) {
+			ds = pkg "::" depson
+			if (!(ds in DEP_SEEN)) {
+				DEP_SEEN[ds] = 1
+				PKG_DEP[pkg] = PKG_DEP[pkg] " " depson
+			}
+		}
+	}
+
+	function strip(s) {
+		sub("^[ \t]*", "", s)
+		sub("[ \t]*$", "", s)
+		return s
+	}
+
+	END {
+	
+		# everything depends on core
+		for(pkg in PKG)
+			add_dep(pkg, "pcb-rnd-core")
+
+		# calculate dependencies
+		for(plg in PLUGIN_DEP) {
+			v = split(PLUGIN_DEP[plg], A, " ")
+			pkg = PLUGIN[plg]
+			if (pkg == "") continue
+			for(n = 1; n <= v; n++) {
+				if (A[n] == "") continue
+				depson = PLUGIN[A[n]]
+				if (depson == "")
+					depson = "!!!" A[n]
+				add_dep(pkg, depson)
+			}
+		}
+
+		PKG_DEP["core"] = ""
+		PKG_DEP["doc"] = ""
+		PKG_DEP["pcb-rnd"] = meta_deps
+		PKG["pcb-rnd"] = "&lt;metapackage&gt;"
+		PKG["pcb-rnd-doc"] = "&nbsp;"
+		IFILES["pcb-rnd-doc"] = "/usr/share/doc/*"
+
+		print "<h3> Package summary and dependencies </h3>"
+		print "<table border=1>"
+		print "<tr><th> package <th> depends on (packages) <th> consists of (plugins)"
+
+		for(pkg in PKG) {
+			print "<tr><th>" pkg "<td>" PKG_DEP[pkg] "<td>" PKG[pkg]
+			print strip(PKG_DEP[pkg]) >  "auto/" pkg ".deps"
+			print pkg > "auto/List"
+		}
+		print "</table>"
+
+		print "<h3> Package description and files </h3>"
+		print "<table border=1>"
+		print "<tr><th> package <th> files <th> short <th> long"
+		for(pkg in PKG) {
+			if (SHORT[pkg] == "") SHORT[pkg] = "&nbsp;"
+			if (LONG[pkg] == "") LONG[pkg] = "&nbsp;"
+			print "<tr><th>" pkg "<td>" IFILES[pkg] "<td>" SHORT[pkg]  "<td>" LONG[pkg]
+			print strip(IFILES[pkg]) > "auto/" pkg ".files"
+			print strip(SHORT[pkg]) > "auto/" pkg ".short"
+			print strip(LONG[pkg]) > "auto/" pkg ".long"
+		}
+		print "</table>"
+
+		print "<h3> ./configure arguments </h3>"
+		print "--all=disable"
+		print "--all=disable" > "auto/Configure.args"
+
+		for(p in CFG_BUILDIN) {
+			print "--buildin-" p
+			print "--buildin-" p > "auto/Configure.args"
+		}
+		for(p in CFG_PLUGIN) {
+			print "--plugin-" p
+			print "--plugin-" p > "auto/Configure.args"
+		}
+	}
+'
+
+echo '
+</body>
+</html>
+') > packages.html
+

Property changes on: tags/2.0.1/doc/developer/packaging/packages.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/developer/packaging.txt
===================================================================
--- tags/2.0.1/doc/developer/packaging.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/packaging.txt	(revision 18980)
@@ -0,0 +1,94 @@
+Packaging pcb-rnd for a distribution
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1. program, libs, desktop integration
+
+Pcb-rnd is an interactive printed circuit board editor program. A typical
+user is an electric engineer. This sort of programs are often called EDA,
+Electronics Design Automation.
+
+Pcb-rnd has different frontends: graphical and stdio/text based batch
+processing. There are different graphical frontends - pcb-rnd does not
+depend on gtk or motif, the specific frontend modules may depend on them.
+
+Pcb-rnd is scriptable if libgpmi is available. Since libgpmi is not
+a mainstream library for the scripting feature it should also be packaged.
+
+Pcb-rnd is intended for UNIX-fans. It is heavily keyboard-oriented and it
+doesn't assume its users don't want to understand or learn how it works.
+Many typical user workflows include Makefiles and it's a common thing to
+start pcb-rnd from a shell. Thus desktop integration is not in focus
+at the moment. If you fixed things for this while packaging, please let
+us know, we may merge your patches (see below).
+
+2. options, plugins, dependencies
+
+Pcb-rnd is a modular software with a lot of options. Majority of these options
+are selected by the state of a module. A module has three states:
+ - disable: (not compiled at all)
+ - buildin: enabled and static linked
+ - plugin: enabled and dynamic loaded (from a .so)
+
+The configure script takes --disable-*, --building-* and --plugin-*
+arguments with * substituted with the name of the module. The configure
+script also determines the dependencies according to the selection. Special
+arguments --all=plugin and --all=buildin are provided in configure to select
+all working modules to be plugins or buildins.
+
+For binary distributions it's strongly recommended to have most of the
+modules compiled as plugins and have them in separate packages. This
+would let the user to install a core pcb-rnd package and then the GTK
+or the lesstif plugin (or both) from separate packages. This also reduces
+package dependencies.
+
+The preferred package splitup is documented in packaging/,
+please follow that as closely as possible so different systems can
+deliver similar pcb-rnd packages.
+
+This is less relevant for source distributions, if the user has full control
+over the configuration.
+
+If non-critical dependencies are not met, modules are automatically disabled
+by ./configure. 
+
+3. typical ./configure options - scconfig vs. auto*
+
+./configure --prefix works as expected. DESTDIR works as expected.
+
+Typical commands for configuring pcb-rnd for packaging would be:
+
+  ./configure --all=plugin --prefix=/usr
+  make all
+  DESTDIR=/tmp/pkg_tmp make install
+
+We are happy with scconfig. Please don't write about how much better
+autoconf or cmake would be, we won't switch.
+
+4. release cycles, tarballs, svn trunk - what to package
+
+Development happens in svn trunk/, there are usually no branches. While
+we try to keep trunk/ compilable any time, it's not guaranteed that it
+would work out-of-the-box between releases. It is not recommended to
+package trunk/ - please package stable releases instead.
+
+We follow the "release early, release often" rule. Source release tarballs
+are always considered stable. Beside the project web page, releases are
+also accessible as svn tags: svn://repo.hu/pcb-rnd/tags .
+
+Sometimes we have minor releases with 1..2 month period, sometimes a
+longer period passes between releases.
+
+There's no automated release notification at the moment; if you want to
+get notified about new releases, please contact me (email
+pcb-rnd (at) igor2.repo.hu)
+
+5. bug reporting and fixes for packaging
+
+There's no special method for reporting packaging related bugs and
+feature requests, please follow the normal bug report instructions or just
+drop me a mail. Please mention that the issue is related to packaging, this
+usually gives it a higher priority.
+
+We are willing to make minor changes to make packaging easier - if you bump
+into something you'd need to work around while packaging, please let us know,
+we may just fix it "upstream".
+
Index: tags/2.0.1/doc/developer/plugin_conf.h
===================================================================
--- tags/2.0.1/doc/developer/plugin_conf.h	(nonexistent)
+++ tags/2.0.1/doc/developer/plugin_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_VENDOR_CONF_H
+#define PCB_VENDOR_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct vendor {
+			CFT_BOOLEAN enable;         /* Enable vendor mapping */
+		} vendor;
+	} plugins;
+} conf_vendor_t;
+
+#endif
Index: tags/2.0.1/doc/developer/plugin_core_simple.html
===================================================================
--- tags/2.0.1/doc/developer/plugin_core_simple.html	(nonexistent)
+++ tags/2.0.1/doc/developer/plugin_core_simple.html	(revision 18980)
@@ -0,0 +1,68 @@
+<html>
+<body>
+<h1> pcb-rnd hacking - simple core plugins </h1>
+
+<h2> Introduction </h2>
+
+<h2> Setting up a new core plugin </h2>
+<ul>
+	<li> 1. make up a name for the plugin. There are a few <a href="plugin_naming.html"> conventions. </a> This document will refer to the name as <i>plg</i>, always replace it with your chosen name.
+	<li> 2. cd src_plugins; svn mkdir <i>plg</i>
+	<li> 3. copy Makefile, Plug.tmpasm and .pup from another, small plugin, for example from the <i>report</i> plugin (the next points will assume you picked this plugin as the source of the copy)
+	<li> 4. edit Makefile: replace <b>report</b> to <i>plg</i>
+	<li> 5. edit <i>plg</i>.pup; there should be short summary about the purpose of the plugin then "#key: value" pairs for statistics:
+		<ul>
+			<li> <i>$class</i> the same as the plugin name prefix (see <a href="plugin_naming.html"> conventions. </a>) or <b>(feature)</b> for feature plugins; it's redundant but is kept for supporting external plugins - see <a href="mods3/post.html">mods3</a> for a short list of all classes
+			<li> <i>$short</i> short description - should be less than 32 characters; this shows up in the configure summary
+			<li> <i>$long</i> long description - used for documantation; no length limitation, but must be a single line
+			<li> <i>$state</i> <b>works</b>, <b>WIP</b>, <b>abandoned</b> or <b>deprecated</b> - see <a href="mods3/post.html">mods3</a> for explanation
+			<li> <i>$lstate</i> [optional] a chance to explain why the value of default is what it is; e.g. why a plugin is disabled
+			<li> <i>$package</i> when pcb-rnd is packaged for a distribution or OS, which package this plugin should end up in (see also: trunk/doc/developer/packaging/)
+			<li> <i>$fmt-native</i> only for io_ plugins: whether this format is considered native (see also: io_lihata's pup)
+			<li> <i>$fmt-feature-r</i> only for io_ plugins: a read/load feature supported by the plugin (multiple entries of this should be added; see also: io_lihata's pup)
+			<li> <i>$fmt-feature-w</i> only for io_ plugins: a write/save feature supported by the plugin (multiple entries of this should be added; see also: io_lihata's pup)
+			<li> <i>default</i> <b>disable-all</b> or <b>disable</b> or <b>buildin</b> or <b>plugin</b>
+			<li> <i>dep</i> [optional] a single plugin name on which <i>plg</i> depends; multiple dep lines can be added
+			<li> <i>conflict</i> [optional] a single plugin name on which <i>plg</i> conflicts with; multiple dep lines can be added
+			<li> <i>autoload</i> [optional] when 1, the plugin is automatically loaded and initialized (when not disabled); do not set this on libs and other code that are accessible only as a dependency of other plugins; set this 1 on HID, io, import, export, feature plugins
+		</ul>
+		Values of default:
+		<ul>
+		<ul>
+			<li> buildin - unless the user requests otherwise, your plugin is linked into the executable
+			<li> plugin - unless the user requests otherwise, your plugin is dynamically linked; not recommended: the policy is to let users explicitly request dynamic linking
+			<li> disable - unless the user requests otherwise, your plugin is not compiled (recommended until the plugin gets some user testing)
+			<li> disable-all - the plugin stays disabled even with ./configure --all=* and the only way to enable it is to excplicitly name it
+		</ul>
+		IMPORTANT: all fields are single-line, do not use semicolon (';') in any of the fields.
+	</ul>
+	<li> 6. edit Plug.tmpasm:
+		<pre>
+put /local/pcb/mod {<i>plg</i>}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/<i>plg</i>/foo.o $(PLUGDIR)/<i>plg</i>/bar.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/<i>plg</i>/foo_conf.h}
+put /local/pcb/mod/YACC [@ $(PLUGDIR)/<i>plg</i>/bary @]
+put /local/pcb/mod/LEX  [@ $(PLUGDIR)/<i>plg</i>/barl @]
+		</pre>
+
+		<ul>
+			<li> /local/pcb/mod: the name of the module we are compiling
+			<li> /local/pcb/mod/OBJS: a space separated list of object files to compile 
+			<li> /local/pcb/mod/CONF: optional: the name of the <a href="plugin_conf.h"> conf struct header </a> - if the plugin doesn't have runtime configuration settings, remove this line
+			<li> /local/pcb/mod/YACC: optional: if you have files for yacc-processing, list them without the .y suffix here (space separated)
+			<li> /local/pcb/mod/LEX: optional: if you have files for lex-processing, list them without the .l suffix here (space separated)
+			<li> Leave the switch part on the bottom intact.
+		</ul>
+	<li> 7. create your C sources and headers in src_plugins/<i>plg</i>/
+	The order of entries in the file is the same as the order in the summary table
+	at the end of ./configure; insert your plugin in the right group!
+	<li> 8. run "make map_plugins" in src/ to get your new plugin on the plugin list
+	<li> 9. run ./configure --buildin-<i>plg</i>
+	<li> 10. run make to see if it compiles and test
+	<li> (11. while developing, you can run make from src_plugins/<i>plg</i> - if
+	your plugin is a builtin, it will recompile pcb-rnd. For some of us it's convenient
+	to run make in the same directory where all the source files are.)
+</ul>
+
+</body>
+</html>
Index: tags/2.0.1/doc/developer/plugin_naming.html
===================================================================
--- tags/2.0.1/doc/developer/plugin_naming.html	(nonexistent)
+++ tags/2.0.1/doc/developer/plugin_naming.html	(revision 18980)
@@ -0,0 +1,13 @@
+<html>
+<body>
+<h1> pcb-rnd hacking - plugin naming conventions </h1>
+	<ul>
+		<li> export plugins start with export_; these render to a non-native format that can not be then loaded
+		<li> native formats are prefixed with io_; even if your plugin can now only load or save, if it's possible to do a load-save-load round-trip without data loss, it's an io_
+		<li> interactive, often GUI, frontends are prefixed with hid_
+		<li> footprint access plugins start with fp_
+		<li> lib_ plugins are libraries used by other plugins; they are disabled by default and are enabled through the plugin dependency system
+		<li> anything else is considered a feature plugin and has no specific prefix.
+	</ul>
+</body>
+</html>
Index: tags/2.0.1/doc/developer/polygon.html
===================================================================
--- tags/2.0.1/doc/developer/polygon.html	(nonexistent)
+++ tags/2.0.1/doc/developer/polygon.html	(revision 18980)
@@ -0,0 +1,160 @@
+<h2> different faces of a polygon </H2>
+<p>
+In pcb-rnd polygons have three possible appearance:
+<ul>
+	<li> points: the as-drawn version
+	<li> clipped: the as-shown version, with holes
+	<li> no-holes: the as-shown version, without holes
+</ul>
+
+<H3> The as-drawn version </H3>
+<p>
+The as-drawn version is a list of points (corners), as drawn
+by the user. The points are stored in an array of x;y coordinates.
+There is a single, continous, dynamically allocated array for all points,
+including the outer contour and the holes.
+<p>
+The points are stored in the <i>Points[]</i> field. The HoleIndex[]
+field lists the starting index of each hole. For example a
+rectangular polygon with 2 triangle holes is stored as:
+<p>
+<table border=1 cellspacing=0>
+	<tr><th> index          <th> 0. <th> 1. <th> 2. <th> 3. <th> 4.   <th> 5.   <th> 6.   <th> 7.   <th> 8.   <th> 9.
+	<tr><th> Points[] value <td> c1 <td> c2 <td> c3 <td> c4 <td> h1.1 <td> h1.2 <td> h1.3 <td> h2.1 <td> h2.2 <td> h2.3
+	<tr><th> part of  <td colspan=4> outer contour  <td colspan=3> hole 1       <td colspan=3> hole 2
+</table>
+<p>
+The array length of Points[] is 10, the length of the correspoding HoleIndex[] is 2.
+The values of HoleIndex[] is {4, 7}, indicating that the corners of first hole
+starts at 4 while the corners of the second hole starts at 7.
+<p>
+If HoldeIndex[] is NULL, there are no holes and all points are part of the
+outer contour. The Outer contour must contain at least 3 points.
+<p>
+The as-drawn version always contains the contour of a single island
+and 0 or more holes - none of them can intersect or touch any contour or
+hole of the same polygon. This also means a contour or hole can not be
+self-intersecting.
+<p>
+The as-drawn version is stored to make editing possible. It is
+not affected by other objects (e.g. clearances) or flags of the polygon.
+The as-drawn points exist and are stored even if they are not visible
+(clipped). The UI maniulates the as-drawn version.
+
+
+<H3> The clipped version </H3>
+<p>
+The polygon is clipped by an object if both the polygon and the object have
+the correspoding 'clear' flag set. A clipped polygon typically has a much
+more complex shape than the as-drawn polygon, due to the clearance cutouts
+(not to be confused with user drawn holes). The clipped polygon is the actual
+"in-copper" shape of the polygon.
+<p>
+In some cases the clearance cutouts slice the polygon in multiple components
+or in other word <i>islands</i>. If the polygon is <i>full</i> (set by
+a polygon flag), all islands are kept, else only the largest island is kept.
+(Note: the find code handles all islands of a full polygon as one polygon: it
+indicates connection between them even if there is no connection, which makes
+full polygons dangerous on copper layers.)
+<p>
+The clipped polygon is stored in the polyarea field Clipped. It is a doubly
+linked circular list (link fields are .f for forward and .b for backward). Each
+item on the list is an island of the polygon. If Clipped is NULL, the
+polygon clipping is not yet compiled for the given polygon; call pcb_poly_init_clip().
+<p>
+Each island is a polyarea, which consists of an outer contour and 0 or more
+holes - all correspoding to the actual cutouts created by user-drawn polygon
+holes and/or clearance cutouts. These contours are stored in a singly linked
+list of plines. The first element of the list is the pline for the outer
+contour and always exists. The next 0 or more plines, using the .next field
+of the pline, are the contours of the cutouts (holes).
+<p>
+A pline consists of a circular, doubly linked list of points; traversing using
+the .next field, the points are ordered in counter-clockwise.
+<p>
+The clipped polygon shall be updated by any code that changes:
+<ul>
+	<li> the as-drawn points of the polygon
+	<li> geomerty of any object that may overlap with the polygon (so that clearance changes are applied)
+</ul>
+<p>
+When some code forgets to update clippig, the clipped polygon doesn't match
+the clearances dictated by other objects; a reload of the board "fixes" the
+problem by forcing the clip. (Native save files contain the as-drawn poly only,
+not the (outdated) clipped poly).
+
+<H3> The no-holes version </H3>
+<p>
+Some export plugins (and/or export formats) don't support holes in polygons.
+The no-hole version of the polygon is stored in the .NoHoles filed and is
+a list of islands, each specified with an outer countour that are crafted
+to include the holes. This is done by slicing an island at each hole. 
+TODO: check how it looks, include image
+
+<H3> Further comments by Ben Jackson </H3>
+As extracted from the original code comments:
+<pre>
+The first pcb_polyarea_t in pcb_polygon_t.Clipped is what is used for the vast
+majority of Polygon related tests.  The basic logic for an
+intersection is "is the target shape inside pcb_polyarea_t.contours and NOT
+fully enclosed in any of pcb_polyarea_t.contours.next... (the holes)".
+
+The polygon dicer (NoHolesPolygonDicer and r_NoHolesPolygonDicer)
+emits a series of "simple" pcb_pline_t shapes.  That is, the pcb_pline_t isn't
+linked to any other "holes" outlines).  That's the meaning of the first
+test in r_NoHolesPolygonDicer.  It is testing to see if the pcb_pline_t
+contour (the first, making it a solid outline) has a valid next
+pointer (which would point to one or more holes).  The dicer works by
+recursively chopping the polygon in half through the first hole it
+sees (which is guaranteed to eliminate at least that one hole).  The
+dicer output is used for HIDs which cannot render things with holes
+(which would require erasure).
+</pre>
+
+<h2> How to code with polygons </h2>
+
+<h3> Iterators: looping on clipped polygon geometry </H3>
+
+The following code prints all contours and holes of a polygon, using loops
+iterators. The same iterator holds all states, so that it points to:
+<ul>
+	<li> one polygon
+	<li> one of the islands of that polygon
+	<li> either the outer contour or one of the holes in that polygon (cntr)
+	<li> one of the points in cntr
+</ul>
+
+<pre>
+void print_poly(pcb_polygon_t *polygon)
+{
+	pcb_poly_it_t it;
+	pcb_polyarea_t *pa;
+
+	/* first, iterate over all islands of a polygon */
+	for(pa = pcb_poly_island_first(polygon, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+		pcb_coord_t x, y;
+		pcb_pline_t *pl;
+		int go;
+
+		printf(" island\n");
+		/* check if we have a contour for the given island */
+		pl = pcb_poly_contour(&it);
+		if (pl != NULL) {
+			printf("  contour:\n");
+			/* iterate over the vectors of the contour */
+			for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y)) {
+				pcb_printf("   %mm %mm\n", x, y);
+			}
+			
+			/* iterate over all holes within this island */
+			for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it)) {
+				printf("  hole:\n");
+				/* iterate over the vectors of the given hole */
+				for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y)) {
+					pcb_printf("   %mm %mm\n", x, y);
+				}
+			}
+		}
+	}
+}
+</pre>
Index: tags/2.0.1/doc/developer/releasing.txt
===================================================================
--- tags/2.0.1/doc/developer/releasing.txt	(nonexistent)
+++ tags/2.0.1/doc/developer/releasing.txt	(revision 18980)
@@ -0,0 +1,11 @@
+release check list
+
+0. test compile and test run a clean checkout on a clean system
+   configure with --debug --all=buildin, then without
+1. check next version number and previous revision in tags/
+2. update the changelog
+3. rewrite the release notes
+4. modify version number in scconfig
+5. commit trunk
+6. svn tag using URLs
+7. update the timeline, events and doc/news.html
Index: tags/2.0.1/doc/developer/renames
===================================================================
--- tags/2.0.1/doc/developer/renames	(nonexistent)
+++ tags/2.0.1/doc/developer/renames	(revision 18980)
@@ -0,0 +1,1781 @@
+Name differences between mainline -> pcb_rnd
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#types:
+
+PCBTypePtr -> pcb_board_t *
+PCBType -> pcb_board_t
+DataTypePtr -> pcb_data_t *
+DataType -> pcb_data_t
+LayerGroupTypePtr -> pcb_layer_group_t *
+LayerGroupType -> pcb_layer_group_t
+LayerTypePtr -> pcb_layer_t *
+LayerType -> pcb_layer_t
+BufferTypePtr -> pcb_buffer_t *
+BufferType -> pcb_buffer_t
+NetTypePtr -> pcb_net_t *
+NetType -> pcb_net_t
+ConnectionTypePtr -> pcb_connection_t *
+ConnectionType -> pcb_connection_t
+BoxTypePtr -> pcb_box_t *
+BoxType -> pcb_box_t
+BoxListTypePtr -> pcb_box_list_t *
+BoxListType -> pcb_box_list_t
+FontTypePtr -> pcb_font_t *
+FontType -> pcb_font_t
+LineTypePtr -> pcb_line_t *
+LineType -> pcb_line_t
+AttachedObjectTypePtr -> pcb_attached_obj_t *
+AttachedObjectType -> pcb_attached_obj_t
+AttachedLineTypePtr -> pcb_attached_line_t *
+AttachedLineType -> pcb_attached_line_t
+CrosshairTypePtr -> pcb_crosshair_t *
+CrosshairType -> pcb_crosshair_t
+MarkTypePtr -> pcb_mark_t *
+MarkType -> pcb_mark_t
+ArcTypePtr -> pcb_arc_t *
+ArcType -> pcb_arc_t
+PointTypePtr -> pcb_point_t *
+PointType -> pcb_point_t
+RatTypePtr -> pcb_rat_t *
+RatType -> pcb_rat_t
+PolygonTypePtr -> pcb_polygon_t *
+PolygonType -> pcb_polygon_t
+PadTypePtr -> pcb_pad_t *
+PadType -> pcb_pad_t
+PinTypeType -> pcb_pin_t *
+PinType -> pcb_pin_t
+ElementTypeHandle -> pcb_element_t **
+ElementTypePtr -> pcb_element_t *
+ElementType -> pcb_element_t
+TextTypePtr -> pcb_text_t *
+TextType -> pcb_text_t
+AttributeListTypePtr -> pcb_attribute_list_t *
+AttributeListType -> pcb_attribute_list_t
+AttributeTypePtr -> pcb_attribute_t *
+AttributeType -> pcb_attribute_t
+OutputTypePtr -> pcb_output_t *
+OutputType -> pcb_output_t
+DrcViolationTypePtr -> pcb_drc_violation_t *
+DrcViolationType -> pcb_drc_violation_t
+FlagBitsTypePtr -> pcb_flag_bits_t *
+FlagBitsType -> pcb_flag_bits_t
+FlagTypePtr -> pcb_flag_t *
+FlagType -> pcb_flag_t
+SymbolTypePtr -> pcb_symbol_t *
+SymbolType -> pcb_symbol_t
+FunctionID -> pcb_function_id_t
+EndCapStyle -> pcb_cap_style_t
+hidval -> pcb_hidval_t
+HID_Action -> pcb_hid_action_t
+PCBWatchFlags -> pcb_watch_flags_t
+HID_DRC_GUI -> pcb_hid_drc_gui_t
+HID -> pcb_hid_t
+hid_gc_struct -> hid_gc_s
+hidGC -> pcb_hid_gc_t
+HID_Attr_Val -> pcb_hid_attr_val_t
+HID_Attribute -> pcb_hid_attribute_t
+HID_AttrNode -> pcb_hid_attr_node_t
+LibraryEntryTypePtr -> pcb_lib_entry_t *
+LibraryEntryType -> pcb_lib_entry_t
+LibraryMenuTypePtr -> pcb_lib_menu_t *
+LibraryMenuType -> pcb_lib_menu_t
+LibraryTypePtr -> pcb_lib_t *
+LibraryType -> pcb_lib_t
+UnitList -> pcb_unit_list_t
+unitflags -> pcb_unit_flags_e
+UnitList -> pcb_unit_list_t
+NetListTypePtr -> pcb_netlist_t *
+NetListType -> pcb_netlist_t
+NetListListTypePtr -> pcb_netlist_list_t *
+NetListListType -> pcb_netlist_list_t
+AnyObjectTypePtr -> pcb_any_obj_t *
+AnyObjectType -> pcb_any_obj_t
+AnyLineObjectTypePtr -> pcb_any_line_t *
+AnyLineObjectType -> pcb_any_line_t
+AttachedLineTypePtr -> pcb_attached_line_t
+AttachedLineType -> pcb_attached_line_t *
+Vector -> pcb_vector_t
+vertex -> pcb_vertex_t
+CVCList -> pcb_cvc_list_t
+VNODE -> pcb_vnode_t
+PLINE -> pcb_pline_t
+POLYAREA -> pcb_polyarea_t
+PolygonBooleanOperation -> pcb_poly_bool_op_e
+RubberbandType -> pcb_rubberband_t
+Unit -> pcb_unit_t
+Increments -> pcb_increments_t
+Angle -> pcb_angle_t
+Coord -> pcb_coord_t
+RouteStyleTypePtr -> pcb_route_style_t *
+RouteStyleType -> pcb_route_style_t
+heap_t -> pcb_heap_t
+cost_t -> pcb_cost_t
+
+# functions:
+EventMoveCrosshair -> pcb_event_move_crosshair
+AdjustAttachedObjects -> pcb_adjust_attached_objects
+
+warpNoWhere -> pcb_warp_nowhere
+get_style_size -> pcb_get_style_size
+NotifyLine -> pcb_notify_line
+NotifyBlock -> pcb_notify_block
+NotifyMode -> pcb_notify_mode
+ClearWarnings -> pcb_clear_warnings
+ReleaseMode -> pcb_release_mode
+AFAIL -> PCB_AFAIL
+ACTION_ARG -> PCB_ACTION_ARG
+AttributeGetFromList -> pcb_attribute_get
+AttributePutToList -> pcb_attribute_put
+AttributeRemoveFromList -> pcb_attribute_remove
+FreeAttributeListMemory -> pcb_attribute_free
+AttributeGet -> pcb_attrib_get
+AttributePut -> pcb_attrib_put
+AttributeRemove -> pcb_attrib_remove
+FreePCBMemory -> pcb_board_free
+CreateNewPCB_ -> pcb_board_new_
+CreateNewPCB -> pcb_board_new
+CreateNewPCBPost -> pcb_board_new_postproc
+CountHoles -> pcb_board_count_holes
+SWAP_X -> PCB_SWAP_X
+SWAP_Y -> PCB_SWAP_Y
+ROTATEBOX_CW -> PCB_BOX_ROTATE_CW
+ROTATEBOX_TO_NORTH -> PCB_BOX_ROTATE_TO_NORTH
+ROTATEBOX_FROM_NORTH -> PCB_BOX_ROTATE_FROM_NORTH
+CENTER_X -> PCB_BOX_CENTER_X
+CENTER_Y -> PCB_BOX_CENTER_Y
+MOVE_BOX_LOWLEVEL -> PCB_BOX_MOVE_LOWLEVEL
+point_in_box -> pcb_point_in_box
+point_in_closed_box -> pcb_point_in_closed_box
+box_is_good -> pcb_box_is_good
+box_intersect -> pcb_box_intersect
+closest_pcb_point_in_box -> pcb_closest_pcb_point_in_box
+box_in_box -> pcb_box_in_box
+clip_box -> pcb_clip_box
+shrink_box -> pcb_shrink_box
+bloat_box -> pcb_bloat_box
+box_center -> pcb_box_center
+box_corner -> pcb_box_corner
+point_box -> pcb_point_box
+close_box -> pcb_close_box
+dist2_to_box -> pcb_dist2_to_box
+GetBoxMemory -> pcb_box_new
+FreeBoxListMemory -> pcb_box_free
+SetPointBoundingBox -> pcb_set_point_bounding_box
+SwapBuffer -> pcb_swap_buffer
+SetBufferBoundingBox -> pcb_set_buffer_bbox
+ClearBuffer -> pcb_buffer_clear
+pcb_swap_buffer -> pcb_buffer_swap
+pcb_buffer_set_bbox -> 
+AddSelectedToBuffer -> pcb_buffer_add_selected
+LoadLayoutToBuffer -> pcb_buffer_load_layout
+RotateBuffer -> pcb_buffer_rotate
+SelectPasteBuffer -> pcb_buffer_select_paste
+MirrorBuffer -> pcb_buffer_mirror
+InitBuffers -> pcb_init_buffers
+UninitBuffers -> pcb_uninit_buffers
+MoveObjectToBuffer -> pcb_move_obj_to_buffer
+CopyObjectToBuffer -> pcb_copy_obj_to_buffer
+LoadFootprint -> pcb_load_footprint
+CreateNewBuffer -> pcb_buffer_new
+PASTEBUFFER -> PCB_PASTEBUFFER
+QuitApplication -> pcb_quit_app
+GetInfoString -> pcb_get_infostr
+ChangeLayoutName -> pcb_board_change_name
+ChangeLayerName -> pcb_layer_change_name
+ChangeSelectedSize -> pcb_chg_selected_size
+ChangeSelectedClearSize -> pcb_chg_selected_clear_size
+ChangeSelected2ndSize -> pcb_chg_selected_2nd_size
+ChangeSelectedMaskSize -> pcb_chg_selected_mask_size
+ChangeSelectedJoin -> pcb_chg_selected_join
+SetSelectedJoin -> pcb_set_selected_join
+ClrSelectedJoin -> pcb_clr_selected_join
+ChangeSelectedNonetlist -> pcb_chg_selected_nonetlist
+ChangeSelectedSquare -> pcb_chg_selected_square
+SetSelectedSquare -> pcb_set_selected_square
+ClrSelectedSquare -> pcb_clr_selected_square
+ChangeSelectedThermals -> pcb_chg_selected_thermals
+ChangeSelectedHole -> pcb_chg_selected_hole
+ChangeSelectedPaste -> pcb_chg_selected_paste
+ChangeSelectedOctagon -> pcb_chg_selected_octagon
+SetSelectedOctagon -> pcb_set_selected_octagon
+ClrSelectedOctagon -> pcb_clr_selected_octagon
+ChangeObjectSize -> pcb_chg_obj_size
+ChangeObject1stSize -> pcb_chg_obj_1st_size
+ChangeObjectThermal -> pcb_chg_obj_thermal
+ChangeObjectClearSize -> pcb_chg_obj_clear_size
+ChangeObject2ndSize -> pcb_chg_obj_2nd_size
+ChangeObjectMaskSize -> pcb_chg_obj_mask_size
+ChangeObjectJoin -> pcb_chg_obj_join
+SetObjectJoin -> pcb_set_obj_join
+ClrObjectJoin -> pcb_clr_obj_join
+ChangeObjectNonetlist -> pcb_chg_obj_nonetlist
+ChangeObjectSquare -> pcb_chg_obj_square
+SetObjectSquare -> pcb_set_obj_square
+ClrObjectSquare -> pcb_clr_obj_square
+ChangeObjectOctagon -> pcb_chg_obj_octagon
+SetObjectOctagon -> pcb_set_obj_octagon
+ClrObjectOctagon -> pcb_clr_obj_octagon
+ChangeObjectName -> pcb_chg_obj_name
+QueryInputAndChangeObjectName -> pcb_chg_obj_name_query
+ChangeObjectPinnum -> pcb_chg_obj_pinnum
+ChangeObjectRadius -> pcb_chg_obj_radius
+ChangeObjectAngle -> pcb_chg_obj_angle
+ChangeSelectedAngle -> pcb_chg_selected_angle
+ChangeSelectedRadius -> pcb_chg_selected_radius
+QueryInputAndpcb_chg_obj_name -> pcb_chg_obj_name_query
+ChangePCBSize -> pcb_board_resize
+ClipLine -> pcb_line_clip
+GetWorkingDirectory -> pcb_get_wd
+tempfile_name_new -> pcb_tempfile_name_new
+tempfile_unlink -> pcb_tempfile_unlink
+lrealpath -> pcb_lrealpath
+get_user_name -> pcb_get_user_name
+CopyPastebufferToLayout -> pcb_buffer_copy_to_layout
+CopyObject -> pcb_copy_obj
+GridFit -> pcb_grid_fit
+notify_crosshair_change -> pcb_notify_crosshair_change
+notify_mark_change -> pcb_notify_mark_change
+HideCrosshair -> pcb_crosshair_hide
+RestoreCrosshair -> pcb_crosshair_restore
+DrawAttached -> pcb_draw_attached
+DrawMark -> pcb_draw_mark
+MoveCrosshairRelative -> pcb_crosshair_move_relative
+MoveCrosshairAbsolute -> pcb_crosshair_move_absolute
+SetCrosshairRange -> pcb_crosshair_set_range
+InitCrosshair -> pcb_crosshair_init
+DestroyCrosshair -> pcb_crosshair_uninit
+FitCrosshairIntoGrid -> pcb_crosshair_grid_fit
+CenterDisplay -> pcb_center_display
+FreeDataMemory -> pcb_data_free
+IsDataEmpty -> pcb_data_is_empty
+GetDataBoundingBox -> pcb_data_bbox
+Draw -> pcb_draw
+Redraw -> pcb_redraw
+DrawObject -> pcb_draw_obj
+DrawLayer -> pcb_draw_layer
+EraseObject -> pcb_erase_obj
+LightenColor -> pcb_lighten_color
+Message -> pcb_message
+OpenErrorpcb_messag -> pcb_open_error_message
+PopenErrorpcb_message -> pcb_popen_error_message
+OpendirErrorpcb_message -> pcb_opendir_error_message
+ChdirErrorpcb_message -> ocb_chdir_error_message
+OpenErrorpcb_message -> pcb_open_error_message
+CatchSignal -> pcb_catch_signal
+events_init -> pcb_events_init
+events_uninit -> pcb_events_uninit
+event_bind -> pcb_event_bind
+event_unbind -> pcb_event_unbind
+event_unbind_cookie -> pcb_event_unbind_cookie
+event_unbind_allcookie -> pcb_event_unbind_allcookie
+event -> pcb_event
+LineLineIntersect -> pcb_intersect_line_line
+LineArcIntersect -> pcb_intersect_line_arc
+PinLineIntersect -> pcb_intersect_line_pin
+LinePadIntersect -> pcb_intersect_line_pad
+ArcPadIntersect -> pcb_intersect_arc_pad
+IsPolygonInPolygon -> pcb_is_poly_in_poly
+LookupElementConnections -> pcb_lookup_element_conns
+LookupConnectionsToAllElements -> pcb_lookup_conns_to_all_elements
+LookupConnection -> pcb_lookup_conn
+LookupConnectionByPin -> pcb_lookup_conn_by_pin
+LookupUnusedPins -> pcb_lookup_unused_pins
+ResetFoundLinesAndPolygons -> pcb_reset_found_lines_polys
+ResetFoundPinsViasAndPads -> pcb_reset_found_pins_vias_pads
+ResetConnections -> pcb_reset_conns
+InitConnectionLookup -> pcb_conn_lookup_init
+InitComponentLookup -> pcb_component_lookup_init
+InitLayoutLookup -> pcb_layout_lookup_init
+FreeConnectionLookupMemory -> pcb_conn_lookup_uninit
+FreeComponentLookupMemory -> pcb_component_lookup_uninit
+FreeLayoutLookupMemory -> pcb_layout_lookup_uninit
+RatFindHook -> pcb_rat_find_hook
+SaveFindFlag -> pcb_save_find_flag
+RestoreFindFlag -> pcb_restore_find_flag
+DRCAll -> pcb_drc_all
+IsLineInPolygon -> pcb_is_line_in_poly
+IsArcInPolygon -> pcb_is_arc_in_poly
+IsPadInPolygon -> pcb_is_pad_in_poly
+ClearFlagOnPinsViasAndPads -> pcb_clear_flag_on_pins_vias_pads
+ClearFlagOnLinesAndPolygons -> pcb_clear_flag_on_lines_polys
+ClearFlagOnAllObjects -> pcb_clear_flag_on_all_objs
+MakeFlags -> pcb_flag_make
+OldFlags -> pcb_flag_old
+AddFlags -> pcb_flag_add
+MaskFlags -> pcb_flag_mask
+EraseFlags -> pcb_flag_erase
+NoFlags -> pcb_no_flags
+mem_any_set -> pcb_mem_any_set
+SET_FLAG -> PCB_FLAG_SET
+CLEAR_FLAG -> PCB_FLAG_CLEAR
+TEST_FLAG -> PCB_FLAG_TEST
+TOGGLE_FLAG -> PCB_FLAG_TOGGLE
+ASSIGN_FLAG -> PCB_FLAG_ASSIGN
+TEST_FLAGS -> PCB_FLAGS_TEST
+CHANGE_FLAG -> PCB_FLAG_CHANGE
+FLAGS_EQUAL -> PCB_FLAG_EQ
+THERMFLAG -> PCB_FLAG_THERM
+TEST_THERM -> PCB_FLAG_THERM_TEST
+GET_THERM -> PCB_FLAG_THERM_GET
+CLEAR_THERM -> PCB_FLAG_THERM_CLEAR
+ASSIGN_THERM -> PCB_FLAG_THERM_ASSIGN
+GET_SQUARE -> PCB_FLAG_SQUARE_GET
+CLEAR_SQUARE -> PCB_FLAG_SQUARE_CLEAR
+ASSIGN_SQUARE -> PCB_FLAG_SQUARE_ASSIGN
+GET_INTCONN -> PCB_FLAG_INTCONN_GET
+TEST_ANY_THERMS -> PCB_FLAG_THERM_TEST_ANY
+common_string_to_flags -> pcb_strflg_common_s2f
+common_flags_to_string -> pcb_strflg_common_f2s
+uninit_strflags_buf -> pcb_strflg_uninit_buf
+uninit_strflags_layerlist -> pcb_strflg_uninit_layerlist
+pcbflags_to_string -> pcb_strflg_board_f2s
+string_to_pcbflags -> pcb_strflg_board_s2f
+string_to_flags -> pcb_strflg_s2f
+flags_to_string -> pcb_strflg_f2s
+CreateDefaultFont -> pcb_font_create_default
+SetFontInfo -> pcb_font_set_info
+CreateNewLineInSymbol -> pcb_font_new_line_in_sym
+leaky_init -> pcb_leaky_init
+leaky_uninit -> pcb_leaky_uninit
+leaky_malloc -> pcb_leaky_malloc
+leaky_calloc -> pcb_leaky_calloc
+leaky_realloc -> pcb_leaky_realloc
+leaky_strdup -> pcb_leaky_strdup
+funchash_get -> pcb_funchash_get
+funchash_set -> pcb_funchash_set
+funchash_set_table -> pcb_funchash_set_table
+funchash_remove_cookie -> pcb_funchash_remove_cookie
+funchash_init -> pcb_funchash_init
+funchash_uninit -> pcb_funchash_uninit
+heap_create -> pcb_heap_create
+heap_destroy -> pcb_heap_destroy
+heap_free -> pcb_heap_free
+heap_insert -> pcb_heap_insert
+heap_remove_smallest -> pcb_heap_remove_smallest
+heap_replace -> pcb_heap_replace
+heap_is_empty -> pcb_heap_is_empty
+heap_size -> pcb_heap_size
+hid_register_action -> pcb_hid_register_action
+hid_register_actions -> pcb_hid_register_actions
+REGISTER_ACTIONS -> PCB_REGISTER_ACTIONS
+HIDCONCAT -> PCB_HIDCONCAT
+hid_expose_callback -> pcb_hid_expose_callback
+hid_actions_init -> pcb_hid_actions_init
+hid_actions_uninit -> pcb_hid_actions_uninit
+REGISTER_ATTRIBUTES -> PCB_REGISTER_ATTRIBUTES
+print_actions -> pcb_print_actions
+dump_actions -> pcb_dump_actions
+hid_find_action -> pcb_hid_find_action
+hid_remove_actions -> pcb_hid_remove_actions
+hid_remove_action -> pcb_hid_remove_action
+hid_remove_actions_by_cookie -> pcb_hid_remove_actions_by_cookie
+hid_action -> pcb_hid_action
+hid_actionl -> pcb_hid_actionl
+hid_actionv -> pcb_hid_actionv
+hid_actionv_ -> pcb_hid_actionv_
+hid_parse_command -> pcb_hid_parse_command
+hid_parse_actions -> pcb_hid_parse_actions
+hid_register_attributes -> pcb_hid_register_attributes
+hid_remove_attributes_by_cookie -> pcb_hid_remove_attributes_by_cookie
+hid_attributes_uninit -> pcb_hid_attributes_uninit
+hid_usage -> pcb_hid_usage
+hid_usage_option -> pcb_hid_usage_option
+hid_cfg_create_menu -> pcb_hid_cfg_create_menu
+hid_cfg_remove_menu -> pcb_hid_cfg_remove_menu
+hid_cfg_load -> pcb_hid_cfg_load
+hid_cfg_load_lht -> pcb_hid_cfg_load_lht
+hid_cfg_load_str -> pcb_hid_cfg_load_str
+hid_cfg_get_menu -> pcb_hid_cfg_get_menu
+hid_cfg_get_menu_at -> pcb_hid_cfg_get_menu_at
+hid_cfg_menu_field_path -> pcb_hid_cfg_menu_field_path
+hid_cfg_menu_field_str -> pcb_hid_cfg_menu_field_str
+hid_cfg_menu_field -> pcb_hid_cfg_menu_field
+hid_cfg_has_submenus -> pcb_hid_cfg_has_submenus
+hid_cfg_create_hash_node -> pcb_hid_cfg_create_hash_node
+hid_cfg_extend_hash_nodev -> pcb_hid_cfg_extend_hash_nodev
+hid_cfg_extend_hash_node -> pcb_hid_cfg_extend_hash_node
+hid_cfg_dfs -> pcb_hid_cfg_dfs
+hid_cfg_error -> pcb_hid_cfg_error
+hid_cfg_action -> pcb_hid_cfg_action
+hid_cfg_keys_init -> pcb_hid_cfg_keys_init
+hid_cfg_keys_uninit -> pcb_hid_cfg_keys_uninit
+hid_cfg_keys_add_under -> pcb_hid_cfg_keys_add_under
+hid_cfg_keys_add_by_desc -> pcb_hid_cfg_keys_add_by_desc
+hid_cfg_keys_add_by_strdesc -> pcb_hid_cfg_keys_add_by_strdesc
+hid_cfg_keys_gen_accel -> pcb_hid_cfg_keys_gen_accel
+hid_cfg_keys_input -> pcb_hid_cfg_keys_input
+hid_cfg_keys_action -> pcb_hid_cfg_keys_action
+hid_cache_color -> pcb_hid_cache_color
+common_fill_pcb_polygon -> pcb_dhlp_fill_pcb_polygon
+common_thindraw_pcb_polygon -> pcb_dhlp_thindraw_pcb_polygon
+common_fill_pcb_pad -> pcb_dhlp_fill_pcb_pad
+common_thindraw_pcb_pad -> pcb_dhlp_thindraw_pcb_pad
+common_fill_pcb_pv -> pcb_dhlp_fill_pcb_pv
+common_thindraw_pcb_pv -> pcb_dhlp_thindraw_pcb_pv
+common_draw_helpers_init -> pcb_dhlp_draw_helpers_init
+hid_get_extents -> pcb_hid_get_extents
+hid_save_and_show_layer_ons -> pcb_hid_save_and_show_layer_ons
+hid_restore_layer_ons -> pcb_hid_restore_layer_ons
+hid_get_flag -> pcb_hid_get_flag
+derive_default_filename -> pcb_derive_default_filename
+layer_type_to_file_name -> pcb_layer_type_to_file_name
+hid_init -> pcb_hid_init
+hid_uninit -> pcb_hid_uninit
+hid_find_gui -> pcb_hid_find_gui
+hid_find_printer -> pcb_hid_find_printer
+hid_find_exporter -> pcb_hid_find_exporter
+hid_enumerate -> pcb_hid_enumerate
+hid_parse_command_line -> pcb_hid_parse_command_line
+hid_register_hid -> pcb_hid_register_hid
+hid_remove_hid -> pcb_hid_remove_hid
+common_nogui_init -> pcb_hid_nogui_init
+hid_nogui_get_hid -> pcb_hid_nogui_get_hid
+InsertPointIntoObject -> pcb_insert_point_in_object
+AdjustInsertPoint -> pcb_adjust_insert_point
+ComputeIntersectionArea -> pcb_intersect_box_box
+ComputeUnionArea -> pcb_union_box_box
+GetLibraryMenuMemory -> pcb_lib_menu_new
+GetLibraryEntryMemory -> pcb_lib_entry_new
+FreeLibraryMemory -> pcb_lib_free
+DeleteLibraryMenuMemory -> pcb_lib_menu_free
+CreateNewNet -> pcb_lib_net_new
+CreateNewConnection -> pcb_lib_conn_new
+ENTRIES -> PCB_ENTRIES
+UNKNOWN -> PCB_UNKNOWN
+NSTRCMP -> PCB_NSTRCMP
+EMPTY -> PCB_EMPTY
+EMPTY_STRING_P -> PCB_EMPTY_STRING_P
+XOR -> PCB_XOR
+SQUARE -> PCB_SQUARE
+OBJECT_ID -> PCB_OBJECT_ID
+FRONT -> PCB_FRONT
+ON_SIDE -> PCB_ON_SIDE
+TO_RADIANS -> PCB_TO_RADIANS
+MAKEMIN -> PCB_MAKE_MIN
+MAKEMAX -> PCB_MAKE_MAX
+SGNZ -> PCB_SGNZ
+SWAP_SIGN_X -> PCB_SWAP_SIGN_X
+SWAP_SIGN_Y -> PCB_SWAP_SIGN_Y
+Distance2 -> pcb_distance2
+Distance -> pcb_distance
+GetValue -> pcb_get_value
+GetValueEx -> pcb_get_value_ex
+GetNum -> pcb_get_num
+Concat -> pcb_concat
+StripWhiteSpaceAndDup -> pcb_strdup_strip_wspace
+MoveLayer -> pcb_layer_move
+MOVE -> PCB_MOVE
+MoveObject -> pcb_move_obj
+MoveObjectToLayer -> pcb_move_obj_to_layer
+MoveObjectAndRubberband -> pcb_move_obj_and_rubberband
+MoveSelectedObjectsToLayer -> pcb_move_selected_objs_to_layer
+GetNetMemory -> pcb_net_new
+GetNetListMemory -> pcb_netlist_new
+FreeNetListListMemory -> pcb_netlist_list_free
+FreeNetListMemory -> pcb_netlist_free
+FreeNetMemory -> pcb_net_free
+NETLIST_LOOP -> PCB_NETLIST_LOOP
+NET_LOOP -> PCB_NET_LOOP
+GetArcMemory -> pcb_arc_new
+GetElementArcMemory -> pcb_element_arc_new
+RemoveFreeArc -> pcb_arc_free
+GetElementMemory -> pcb_element_new
+RemoveFreeElement -> pcb_element_free
+FreeElementMemory -> pcb_element_free_fields
+GetElementLineMemory -> pcb_element_line_new
+GetLineMemory -> pcb_line_new
+RemoveFreeLine -> pcb_line_free
+CreateNewLineOnLayer -> pcb_line_new_on_layer
+CreateDrawnLineOnLayer -> pcb_line_new_on_layer_merge
+GetPadMemory -> pcb_pad_new
+RemoveFreePad -> pcb_pad_free
+CreateNewPad -> pcb_pad_new_in_element
+SetPadBoundingBox -> pcb_pad_bbox
+GetViaMemory -> pcb_via_new
+RemoveFreeVia -> pcb_via_free
+GetPinMemory -> pcb_pin_new
+RemoveFreePin -> pcb_pin_free
+CreateNewVia -> pcb_via_new_on_board
+CreateNewPin -> pcb_pin_new_in_element
+SetPinBoundingBox -> pcb_pin_bbox
+GetPolygonMemory -> pcb_poly_alloc
+RemoveFreePolygon -> pcb_poly_free
+GetPointMemoryInPolygon -> pcb_poly_point_alloc
+GetHoleIndexMemoryInPolygon -> pcb_poly_holeidx_new
+FreePolygonMemory -> pcb_poly_free_fields
+SetPolygonBoundingBox -> pcb_poly_bbox
+CreateNewPolygonFromRectangle -> pcb_poly_new_from_rectangle
+CreateNewPolygon -> pcb_poly_new
+CreateNewPointInPolygon -> pcb_poly_point_new
+CreateNewHoleInPolygon -> pcb_poly_hole_new
+RemovePolygon -> pcb_poly_remove
+GetRatMemory -> pcb_rat_alloc
+RemoveFreeRat -> pcb_rat_free
+CreateNewRat -> pcb_rat_new
+DeleteRats -> pcb_rats_delete
+GetTextMemory -> pcb_text_alloc
+RemoveFreeText -> pcb_text_free
+CreateNewText -> pcb_text_new
+pcb_arc_new -> pcb_arc_alloc
+CreateNewArcOnLayer -> pcb_arc_new
+RemoveArc -> pcb_arc_destroy
+pcb_element_arc_new -> pcb_element_arc_alloc
+pcb_element_new -> pcb_element_alloc
+pcb_element_free_fields -> pcb_element_destroy
+pcb_line_new -> pcb_line_alloc
+pcb_line_new_on_layer_merge -> pcb_line_new_merge
+pcb_line_new_on_layer -> pcb_line_new
+RemoveLine -> pcb_line_destroy
+pcb_pad_new -> pcb_pad_alloc
+pcb_pad_new_in_element -> pcb_element_pad_new
+pcb_via_new -> pcb_via_alloc
+pcb_pin_new -> pcb_pin_alloc
+pcb_via_new_on_board -> pcb_via_new
+pcb_pin_new_in_element -> pcb_element_pin_new
+pcb_rats_delete -> pcb_rats_destroy
+RemoveText -> pcb_text_destroy
+SetArcBoundingBox -> pcb_arc_bbox
+SetElementBoundingBox -> pcb_element_bbox
+SetLineBoundingBox -> pcb_line_bbox
+SetTextBoundingBox -> pcb_text_bbox
+RotateArcLowLevel -> pcb_arc_rotate90
+RotateElementLowLevel -> pcb_element_rotate90
+RotateLineLowLevel -> pcb_line_rotate90
+RotatePolygonLowLevel -> pcb_poly_rotate90
+RotateTextLowLevel -> pcb_text_rotate90
+Freepcb_element_rotate90 -> pcb_element_rotate
+Freepcb_element_rotate90 -> pcb_element_rotate
+Freepcb_buffer_rotate -> pcb_buffer_free_rotate
+GetArcEnds -> pcb_arc_get_ends
+ChangeArcAngles -> pcb_arc_set_angles
+ChangeArcRadii -> pcb_arc_set_radii
+ChangeElementSide -> pcb_element_change_side
+ChangeSelectedElementSide -> pcb_selected_element_change_side
+ElementOrientation -> pcb_element_get_orientation
+ChangePaste -> pcb_pad_change_paste
+ChangeHole -> pcb_pin_change_hole
+CreateNewElement -> pcb_element_new
+CreateNewArcInElement -> pcb_element_arc_new
+CreateNewLineInElement -> pcb_element_line_new
+RemoveElement -> pcb_element_remove
+MoveElementLowLevel -> pcb_element_move
+MirrorElementCoordinates -> pcb_element_mirror
+MovePolygonLowLevel -> pcb_poly_move
+CopyPolygonLowLevel -> pcb_poly_copy
+MOVE_TEXT_LOWLEVEL -> pcb_text_move
+TEXT_IS_VISIBLE -> pcb_text_is_visible
+MOVE_ARC_LOWLEVEL -> pcb_arc_move
+MOVE_LINE_LOWLEVEL -> pcb_line_move
+MOVE_PAD_LOWLEVEL -> pcb_pad_move
+MOVE_PIN_LOWLEVEL -> pcb_pin_move
+MOVE_VIA_LOWLEVEL -> pcb_via_move
+ALLARC_LOOP -> PCB_ARC_ALL_LOOP
+COPPERARC_LOOP -> PCB_ARC_COPPER_LOOP
+SILKARC_LOOP -> PCB_ARC_SILK_LOOP
+VISIBLEARC_LOOP -> PCB_ARC_VISIBLE_LOOP
+ARC_LOOP -> PCB_ARC_LOOP
+ELEMENTTEXT_LOOP -> PCB_ELEMENT_TEXT_LOOP
+ELEMENTNAME_LOOP -> PCB_ELEMENT_NAME_LOOP
+ELEMENTLINE_LOOP -> PCB_ELEMENT_LINE_LOOP
+ELEMENTPCB_ARC_LOOP -> PCB_ELEMENT_ARC_LOOP
+ELEMENT_LOOP -> PCB_ELEMENT_LOOP
+ALLLINE_LOOP -> PCB_LINE_ALL_LOOP
+COPPERLINE_LOOP -> PCB_LINE_COPPER_LOOP
+SILKLINE_LOOP -> PCB_LINE_SILK_LOOP
+VISIBLELINE_LOOP -> PCB_LINE_VISIBLE_LOOP
+LINE_LOOP -> PCB_LINE_LOOP
+ALLPAD_LOOP -> PCB_PAD_ALL_LOOP
+PAD_LOOP -> PCB_PAD_LOOP
+ALLPIN_LOOP -> PCB_PIN_ALL_LOOP
+VIA_LOOP -> PCB_VIA_LOOP
+PIN_LOOP -> PCB_PIN_LOOP
+POLYGONPOINT_LOOP -> PCB_POLY_POINT_LOOP
+ALLPOLYGON_LOOP -> PCB_POLY_ALL_LOOP
+COPPERPOLYGON_LOOP -> PCB_POLY_COPPER_LOOP
+SILKPOLYGON_LOOP -> PCB_POLY_SILK_LOOP
+VISIBLEPOLYGON_LOOP -> PCB_POLY_VISIBLE_LOOP
+POLYGON_LOOP -> PCB_POLY_LOOP
+ALLTEXT_LOOP -> PCB_TEXT_ALL_LOOP
+VISIBLETEXT_LOOP -> PCB_TEXT_VISIBLE_LOOP
+TEXT_LOOP -> PCB_TEXT_LOOP
+LoadElementToBuffer -> pcb_element_load_to_buffer
+LoadFootprintByName -> pcb_element_load_footprint_by_name
+SmashBufferElement -> pcb_element_smash_buffer
+ConvertBufferToElement -> pcb_element_convert_from_buffer
+CopyElementLowLevel -> pcb_element_copy
+UniqueElementName -> pcb_element_uniq_name
+AddTextToElement -> pcb_element_text_set
+ChangeElementText -> pcb_element_text_change
+resolve_path -> pcb_path_resolve
+resolve_path_inplace -> pcb_path_resolve_inplace
+resolve_paths -> pcb_paths_resolve
+resolve_all_paths -> pcb_paths_resolve_all
+fp_fopen -> pcb_fp_fopen
+fp_fclose -> pcb_fp_fclose
+fp_dupname -> pcb_fp_dupname
+fp_tagname -> pcb_fp_tagname
+fp_uninit -> pcb_fp_uninit
+fp_tag -> pcb_fp_tag
+fp_init -> pcb_fp_init
+get_library_memory -> pcb_get_library_memory
+fp_free_children -> pcb_fp_free_children
+fp_sort_children -> pcb_fp_sort_children
+fp_rmdir -> pcb_fp_rmdir
+fp_mkdir_p -> pcb_fp_mkdir_p
+fp_mkdir_len -> pcb_fp_mkdir_len
+fp_lib_search -> pcb_fp_lib_search
+fp_append_entry -> pcb_fp_append_entry
+fp_read_lib_all -> pcb_fp_read_lib_all
+fp_default_search_path -> pcb_fp_default_search_path
+fp_host_uninit -> pcb_fp_host_uninit
+fp_rehash -> pcb_fp_rehash
+ImportNetlist -> pcb_import_netlist
+ParsePCB -> pcb_parse_pcb
+ParseElement -> pcb_parse_element
+ParseFont -> pcb_parse_font
+WriteBuffer -> pcb_write_buffer
+WriteElementData -> pcb_write_element_data
+CheckAndOpenFile -> pcb_check_and_open_file
+OpenConnectionDataFile -> pcb_open_connection_file
+SavePCB -> pcb_save_pcb
+LoadPCB -> pcb_load_pcb
+EnableAutosave -> pcb_enable_autosave
+Backup -> pcb_backup
+SaveInTMP -> pcb_save_in_tmp
+EmergencySave -> pcb_emergency_save
+DisableEmergencySave -> pcb_disable_emergency_save
+RevertPCB -> pcb_revert_pcb
+SaveBufferElements -> pcb_save_buffer_elements
+PrintQuotedString -> pcb_print_quoted_string
+sort_library -> pcb_library_sort
+set_some_route_style -> pcb_set_some_route_style
+WritePCBFile -> pcb_write_pcb_file
+WritePipe -> pcb_write_pipe
+SaveTMPData -> pcb_tmp_data_save
+RemoveTMPData -> pcb_tmp_data_remove
+plugins_init -> pcb_plugins_init
+plugins_uninit -> pcb_plugins_uninit
+plugin_register -> pcb_plugin_register
+HOOK_CALL_DO -> PCB_HOOK_CALL_DO
+HOOK_CALL_ALL -> PCB_HOOK_CALL_ALL
+HOOK_UNREGISTER -> PCB_HOOK_UNREGISTER
+HOOK_CALL -> PCB_HOOK_CALL
+HOOK_REGISTER -> PCB_HOOK_REGISTER
+poly_NewContour -> pcb_poly_contour_new
+poly_IniContour -> pcb_poly_contour_init
+poly_ClrContour -> pcb_poly_contour_clear
+poly_DelContour -> pcb_poly_contour_del
+poly_CopyContour -> pcb_poly_contour_copy
+poly_PreContour -> pcb_poly_contour_pre
+poly_InvContour -> pcb_poly_contour_inv
+poly_CreateNode -> pcb_poly_node_create
+poly_InclVertex -> pcb_poly_vertex_include
+poly_ExclVertex -> pcb_poly_vertex_exclude
+poly_M_Copy0 -> pcb_poly_m_copy0
+poly_M_Incl -> pcb_poly_m_include
+poly_Copy0 -> pcb_poly_copy0
+poly_Copy1 -> pcb_poly_copy1
+poly_InclContour -> pcb_poly_contour_include
+poly_ExclContour -> pcb_poly_contour_exclide
+poly_ChkContour -> pcb_poly_contour_check
+poly_CheckInside -> pcb_poly_contour_inside
+Touching -> pcb_poly_touching
+pcb_poly_m_copy0 -> pcb_polyarea_m_copy0
+pcb_poly_m_include -> pcb_polyarea_m_include
+pcb_poly_copy0 -> pcb_polyarea_copy0
+pcb_poly_copy1 -> pcb_polyarea_copy1
+pcb_poly_contour_include -> pcb_polyarea_contour_include
+pcb_poly_contour_exclide -> pcb_polyarea_contour_exclide
+pcb_poly_contour_check -> pcb_polyarea_contour_check
+pcb_poly_contour_inside -> pcb_polyarea_contour_inside
+pcb_poly_touching -> pcb_polyarea_touching
+poly_InsideContour -> pcb_poly_contour_inside
+poly_ContourInContour -> pcb_poly_contour_in_contour
+poly_Create -> pcb_polyarea_create
+poly_Free -> pcb_polyarea_free
+poly_Init -> pcb_polyarea_init
+poly_FreeContours -> pcb_poly_contours_free
+poly_Valid -> pcb_poly_valid
+vect_dist2 -> pcb_vect_dist2
+vect_det2 -> pcb_vect_det2
+vect_len2 -> pcb_vect_len2
+vect_inters2 -> pcb_vect_inters2
+poly_Boolean -> pcb_polyarea_boolean
+poly_Boolean_free -> pcb_polyarea_boolean_free
+poly_AndSubtract_free -> pcb_polyarea_and_subtract_free
+poly_bbox -> pcb_polyarea_bbox
+Savepcb_polyarea_t -> pcb_polyarea_save
+polygon_init -> pcb_polygon_init
+polygon_point_idx -> pcb_poly_point_idx
+polygon_point_contour -> pcb_poly_contour_point
+prev_contour_point -> pcb_poly_contour_prev_point
+next_contour_point -> pcb_poly_contour_next_point
+GetLowestDistancePolygonPoint -> pcb_poly_get_lowest_distance_point
+RemoveExcessPolygonPoints -> pcb_poly_remove_excess_points
+GoToPreviousPoint -> pcb_polygon_go_to_prev_point
+ClosePolygon -> pcb_polygon_close_poly
+CopyAttachedPolygonToLayer -> pcb_polygon_copy_attached_to_layer
+PolygonHoles -> pcb_poly_holes
+PlowsPolygon -> pcb_poly_plows
+ComputeNoHoles -> pcb_poly_compute_no_holes
+ContourToPoly -> pcb_poly_from_contour
+PolygonToPoly -> pcb_poly_from_poly
+RectPoly -> pcb_poly_from_rect
+CirclePoly -> pcb_poly_from_circle
+OctagonPoly -> pcb_poly_from_octagon
+LinePoly -> pcb_poly_from_line
+ArcPoly -> pcb_poly_from_arc
+PinPoly -> pcb_poly_from_pin
+BoxPolyBloated -> pcb_poly_from_box_bloated
+ContourToPoly -> pcb_poly_from_contour
+PolygonToPoly -> pcb_poly_from_poly
+RectPoly -> pcb_poly_from_rect
+CirclePoly -> pcb_poly_from_circle
+OctagonPoly -> pcb_poly_from_octagon
+LinePoly -> pcb_poly_from_line
+ArcPoly -> pcb_poly_from_arc
+PinPoly -> pcb_poly_from_pin
+BoxPolyBloated -> pcb_poly_from_box_bloated
+frac_circle -> pcb_poly_frac_circle
+InitClip -> pcb_poly_init_clip
+RestoreToPolygon -> pcb_poly_restore_to_poly
+ClearFromPolygon -> pcb_poly_clear_from_poly
+IsPointInPolygon -> pcb_poly_is_point_in_p
+IsPointInPolygonIgnoreHoles -> pcb_poly_is_point_in_p_ignore_holes
+IsRectangleInPolygon -> pcb_poly_is_rect_in_p
+isects -> pcb_poly_isects_poly
+MorphPolygon -> pcb_poly_morph
+NoHolesPolygonDicer -> pcb_poly_no_holes_dicer
+PolyToPolygonsOnLayer -> pcb_poly_to_polygons_on_layer
+square_pin_factors -> pcb_poly_square_pin_factors
+AddNet -> pcb_rat_add_net
+ConnectionName -> pcb_connection_name
+AddAllRats -> pcb_rat_add_all
+SeekPad -> pcb_rat_seek_pad
+ProcNetlist -> pcb_rat_proc_netlist
+CollectSubnets -> pcb_rat_collect_subnets
+GetConnectionMemory -> pcb_rat_connection_alloc
+CONNECTION_LOOP -> PCB_CONNECTION_LOOP
+RAT_LOOP -> PCB_RAT_LOOP
+rats_patch_append -> pcb_ratspatch_append
+rats_patch_destroy -> pcb_ratspatch_destroy
+rats_patch_append_optimize -> pcb_ratspatch_append_optimize
+rats_patch_make_edited -> pcb_ratspatch_make_edited
+rats_patch_apply -> pcb_ratspatch_apply
+rats_patch_fexport -> pcb_ratspatch_fexport
+RemovePCB -> pcb_board_remove
+RemoveSelected -> pcb_remove_selected
+RemoveObject -> pcb_remove_object
+DestroyObject -> pcb_destroy_object
+ROTATE -> PCB_ROTATE90
+PIN_ROTATE -> PCB_PIN_ROTATE_SHAPE
+ROTATE_VIA_LOWLEVEL -> PCB_VIA_ROTATE90
+ROTATE_PIN_LOWLEVEL -> PCB_PIN_ROTATE90
+ROTATE_PAD_LOWLEVEL -> PCB_PAD_ROTATE90
+RotateBoxLowLevel -> pcb_box_rotate90
+RotateObject -> pcb_obj_rotate90
+RotateScreenObject -> pcb_screen_obj_rotate90
+RotatePointLowLevel -> pcb_point_rotate90
+free_rotate -> pcb_rotate
+PCB_ROTATE90 -> PCB_COORD_ROTATE90
+ParseRoutingString1 -> pcb_route_string_parse1
+ParseRouteString -> pcb_route_string_parse
+make_route_string -> pcb_route_string_make
+r_create_tree -> pcb_r_create_tree
+r_destroy_tree -> pcb_r_destroy_tree
+r_delete_entry -> pcb_r_delete_entry
+r_insert_entry -> pcb_r_insert_entry
+r_search -> pcb_r_search
+r_region_is_empty -> pcb_r_region_is_empty
+__r_dump_tree -> pcb_r_dump_tree
+LookupRubberbandLines -> pcb_rubber_band_lookup_lines
+LookupRatLines -> pcb_rubber_band_lookup_rat_lines
+GetRubberbandMemory -> pcb_rubber_band_alloc
+CreateNewRubberbandEntry -> pcb_rubber_band_create
+IsPointOnLine -> pcb_is_point_on_line
+IsPointOnPin -> pcb_is_point_in_pin
+IsPointOnArc -> pcb_is_point_on_arc
+IsPointOnLineEnd -> pcb_is_point_on_line_end
+IsLineInRectangle -> pcb_is_line_in_rectangle
+IsLineInQuadrangle -> pcb_is_line_in_quadrangle
+IsArcInRectangle -> pcb_is_arc_in_rectangle
+IsPointInPad -> pcb_is_point_in_pad
+IsPointInBox -> pcb_is_point_in_box
+lines_intersect -> pcb_lines_intersect
+POINT_IN_BOX -> PCB_POINT_IN_BOX
+VIA_OR_PIN_IN_BOX -> PCB_VIA_OR_PIN_IN_BOX
+LINE_IN_BOX -> PCB_LINE_IN_BOX
+PAD_IN_BOX -> PCB_PAD_IN_BOX
+BOX_IN_BOX -> PCB_BOX_IN_BOX
+TEXT_IN_BOX -> PCB_TEXT_IN_BOX
+POLYGON_IN_BOX -> PCB_POLYGON_IN_BOX
+ELEMENT_IN_BOX -> PCB_ELEMENT_IN_BOX
+ARC_IN_BOX -> PCB_ARC_IN_BOX
+POINT_IN_CIRCLE -> PCB_POINT_IN_CIRCLE
+CIRCLE_TOUCHES_BOX -> PCB_CIRCLE_TOUCHES_BOX
+VIA_OR_PIN_TOUCHES_BOX -> PCB_VIA_OR_PIN_TOUCHES_BOX
+LINE_TOUCHES_BOX -> PCB_LINE_TOUCHES_BOX
+PAD_TOUCHES_BOX -> PCB_PAD_TOUCHES_BOX
+BOX_TOUCHES_BOX -> PCB_BOX_TOUCHES_BOX
+TEXT_TOUCHES_BOX -> PCB_TEXT_TOUCHES_BOX
+POLYGON_TOUCHES_BOX -> PCB_POLYGON_TOUCHES_BOX
+ELEMENT_TOUCHES_BOX -> PCB_ELEMENT_TOUCHES_BOX
+ARC_TOUCHES_BOX -> PCB_ARC_TOUCHES_BOX
+IS_BOX_NEGATIVE -> PCB_IS_BOX_NEGATIVE
+BOX_NEAR_BOX -> PCB_BOX_NEAR_BOX
+VIA_OR_PIN_NEAR_BOX -> PCB_VIA_OR_PIN_NEAR_BOX
+LINE_NEAR_BOX -> PCB_LINE_NEAR_BOX
+PAD_NEAR_BOX -> PCB_PAD_NEAR_BOX
+TEXT_NEAR_BOX -> PCB_TEXT_NEAR_BOX
+POLYGON_NEAR_BOX -> PCB_POLYGON_NEAR_BOX
+ELEMENT_NEAR_BOX -> PCB_ELEMENT_NEAR_BOX
+ARC_NEAR_BOX -> PCB_ARC_NEAR_BOX
+SearchObjectByLocation -> pcb_search_obj_by_location
+SearchScreen -> pcb_search_screen
+SearchScreenGridSlop -> pcb_search_grid_slop
+SearchObjectByID -> pcb_search_obj_by_id
+SearchElementByName -> pcb_search_elem_by_name
+SelectObject -> pcb_select_object
+SelectBlock -> pcb_select_block
+ListBlock -> pcb_list_block
+ObjectOperation -> pcb_object_operation
+SelectedOperation -> pcb_selected_operation
+SelectConnection -> pcb_select_connection
+SelectObjectByName -> pcb_select_object_by_name
+SetTextScale -> pcb_text_set_scale
+SetGrid -> pcb_board_set_grid
+SetLineSize -> pcb_line_set_size
+SetViaSize -> pcb_via_set_size
+SetViaDrillingHole -> pcb_via_set_drilling_hole
+SetClearanceWidth -> pcb_conf_set_clearance_width
+SetChangedFlag -> pcb_board_set_changed_flag
+SetBufferNumber -> pcb_buffer_set_number
+SetMode -> pcb_crosshair_set_mode
+SetCrosshairRangeToBuffer -> pcb_crosshair_range_to_buffer
+SetLocalRef -> pcb_crosshair_set_local_ref
+SaveMode -> pcb_crosshair_save_mode
+RestoreMode -> pcb_crosshair_restore_mode
+pcb_text_set_scale -> pcb_board_set_text_scale
+pcb_line_set_size -> pcb_board_set_line_width
+pcb_via_set_size -> pcb_board_set_via_size
+pcb_via_set_drilling_hole -> pcb_board_set_via_drilling_hole
+pcb_conf_set_clearance_width -> pcb_board_set_clearance
+stub_DrawFab_overhang -> pcb_stub_draw_fab_overhang
+stub_DrawFab -> pcb_stub_draw_fab
+stub_rat_found_short -> pcb_stub_rat_found_short
+stub_rat_proc_shorts -> pcb_stub_rat_proc_shorts
+Undo -> pcb_undo
+Redo -> pcb_redo
+IncrementUndoSerialNumber -> pcb_undo_inc_serial
+SaveUndoSerialNumber -> pcb_undo_save_serial
+RestoreUndoSerialNumber -> pcb_undo_restore_serial
+ClearUndoList -> pcb_undo_clear_list
+LockUndo -> pcb_undo_lock
+UnlockUndo -> pcb_undo_unlock
+Undoing -> pcb_undoing
+MoveObjectToRemoveUndoList -> pcb_undo_move_obj_to_remove
+AddObjectToRemovePointUndoList -> pcb_undo_add_obj_to_remove_point
+AddObjectToInsertPointUndoList -> pcb_undo_add_obj_to_insert_point
+AddObjectToRemoveContourUndoList -> pcb_undo_add_obj_to_remove_contour
+AddObjectToInsertContourUndoList -> pcb_undo_add_obj_to_insert_contour
+AddObjectToMoveUndoList -> pcb_undo_add_obj_to_move
+AddObjectToChangeNameUndoList -> pcb_undo_add_obj_to_change_name
+AddObjectToChangePinnumUndoList -> pcb_undo_add_obj_to_change_pinnum
+AddObjectToRotateUndoList -> pcb_undo_add_obj_to_rotate
+AddObjectToCreateUndoList -> pcb_undo_add_obj_to_create
+AddObjectToMirrorUndoList -> pcb_undo_add_obj_to_mirror
+AddObjectToMoveToLayerUndoList -> pcb_undo_add_obj_to_move_to_layer
+AddObjectToFlagUndoList -> pcb_undo_add_obj_to_flag
+AddObjectToSizeUndoList -> pcb_undo_add_obj_to_size
+AddObjectTo2ndSizeUndoList -> pcb_undo_add_obj_to_2nd_size
+AddObjectToClearSizeUndoList -> pcb_undo_add_obj_to_clear_size
+AddObjectToMaskSizeUndoList -> pcb_undo_add_obj_to_mask_size
+AddObjectToChangeAnglesUndoList -> pcb_undo_add_obj_to_change_angles
+AddObjectToChangeRadiiUndoList -> pcb_undo_add_obj_to_change_radii
+AddObjectToClearPolyUndoList -> pcb_undo_add_obj_to_clear_poly
+AddLayerChangeToUndoList -> pcb_undo_add_layer_change
+AddNetlistLibToUndoList -> pcb_undo_add_netlist_lib
+get_n_units -> pcb_get_n_units
+coord_to_unit -> pcb_coord_to_unit
+unit_to_factor -> pcb_unit_to_factor
+unit_to_coord -> pcb_unit_to_coord
+get_increments_struct -> pcb_get_increments_struct
+NormalizeAngle -> pcb_normalize_angle
+initialize_units -> pcb_units_init
+UNDO_CHANGENAME -> PCB_UNDO_CHANGENAME
+UNDO_MOVE -> PCB_UNDO_MOVE
+UNDO_REMOVE -> PCB_UNDO_REMOVE
+UNDO_REMOVE_POINT -> PCB_UNDO_REMOVE_POINT
+UNDO_INSERT_POINT -> PCB_UNDO_INSERT_POINT
+UNDO_REMOVE_CONTOUR -> PCB_UNDO_REMOVE_CONTOUR
+UNDO_INSERT_CONTOUR -> PCB_UNDO_INSERT_CONTOUR
+UNDO_ROTATE -> PCB_UNDO_ROTATE
+UNDO_CREATE -> PCB_UNDO_CREATE
+UNDO_MOVETOLAYER -> PCB_UNDO_MOVETOLAYER
+UNDO_FLAG -> PCB_UNDO_FLAG
+UNDO_CHANGESIZE -> PCB_UNDO_CHANGESIZE
+UNDO_CHANGE2NDSIZE -> PCB_UNDO_CHANGE2NDSIZE
+UNDO_MIRROR -> PCB_UNDO_MIRROR
+UNDO_CHANGECLEARSIZE -> PCB_UNDO_CHANGECLEARSIZE
+UNDO_CHANGEMASKSIZE -> PCB_UNDO_CHANGEMASKSIZE
+UNDO_CHANGEANGLES -> PCB_UNDO_CHANGEANGLES
+UNDO_LAYERCHANGE -> PCB_UNDO_LAYERCHANGE
+UNDO_CLEAR -> PCB_UNDO_CLEAR
+UNDO_NETLISTCHANGE -> PCB_UNDO_NETLISTCHANGE
+UNDO_CHANGEPINNUM -> PCB_UNDO_CHANGEPINNUM
+UNDO_CHANGERADII -> PCB_UNDO_CHANGERADII
+ROTATE_TYPES -> PCB_ROTATE_TYPES
+CHANGENAME_TYPES -> PCB_CHANGENAME_TYPES
+CHANGESIZE_TYPES -> PCB_CHANGESIZE_TYPES
+CHANGE2NDSIZE_TYPES -> PCB_CHANGE2NDSIZE_TYPES
+CHANGECLEARSIZE_TYPES -> PCB_CHANGECLEARSIZE_TYPES
+CHANGENONETLIST_TYPES -> PCB_CHANGENONETLIST_TYPES
+CHANGESQUARE_TYPES -> PCB_CHANGESQUARE_TYPES
+CHANGEOCTAGON_TYPES -> PCB_CHANGEOCTAGON_TYPES
+CHANGEJOIN_TYPES -> PCB_CHANGEJOIN_TYPES
+CHANGETHERMAL_TYPES -> PCB_CHANGETHERMAL_TYPES
+CHANGEMASKSIZE_TYPES -> PCB_CHANGEMASKSIZE_TYPES
+SELECT_TYPES -> PCB_SELECT_TYPES
+MOVE_TYPES -> PCB_MOVE_TYPES
+MOVETOLAYER_TYPES -> PCB_MOVETOLAYER_TYPES
+INSERT_TYPES -> PCB_INSERT_TYPES
+COPY_TYPES -> PCB_COPY_TYPES
+REMOVE_TYPES -> PCB_REMOVE_TYPES
+NETLIST_INPUT -> PCB_NETLIST_INPUT
+NETLIST_EDITED -> PCB_NETLIST_EDITED
+NUM_NETLISTS -> PCB_NUM_NETLISTS
+ATTRIBUTE_UNUSED -> PCB_ATTRIBUTE_UNUSED
+UNLIKELY -> PCB_UNLIKELY
+LIKELY -> PCB_LIKELY
+STATE_FIRST -> PCB_CH_STATE_FIRST
+STATE_SECOND -> PCB_CH_STATE_SECOND
+STATE_THIRD -> PCB_CH_STATE_THIRD
+Basic_Crosshair_Shape -> pcb_ch_shape_basic
+Union_Jack_Crosshair_Shape -> pcb_ch_shape_union_jack
+Dozen_Crosshair_Shape -> pcb_ch_shape_dozen
+Crosshair_Shapes_Number -> pcb_ch_shape_NUM
+Crosshair -> pcb_crosshair
+Marked -> pcb_marked
+max_group -> pcb_max_group
+max_copper_layer -> pcb_max_copper_layer
+solder_silk_layer -> pcb_solder_silk_layer
+component_silk_layer -> pcb_component_silk_layer
+Buffers -> pcb_buffers
+addedLines -> pcb_added_lines
+LayerStack -> pcb_layer_stack
+Bumped -> pcb_bumped
+STATUS_OK -> 0
+STATUS_ERROR -> -1
+EVENT_GUI_INIT -> PCB_EVENT_GUI_INIT
+EVENT_CLI_ENTER -> PCB_EVENT_CLI_ENTER
+EVENT_SAVE_PRE -> PCB_EVENT_SAVE_PRE
+EVENT_SAVE_POST -> PCB_EVENT_SAVE_POST
+EVENT_LOAD_PRE -> PCB_EVENT_LOAD_PRE
+EVENT_LOAD_POST -> PCB_EVENT_LOAD_POST
+EVENT_last -> PCB_EVENT_last
+ARG_INT -> PCB_EVARG_INT
+ARG_DOUBLE -> PCB_EVARG_DOUBLE
+ARG_STR -> PCB_EVARG_STR
+LOOKUP_FIRST -> PCB_LOOKUP_FIRST
+LOOKUP_MORE -> PCB_LOOKUP_MORE
+SILK_TYPE -> PCB_SILK_TYPE
+FCT_COPPER -> PCB_FCT_COPPER
+FCT_INTERNAL -> PCB_FCT_INTERNAL
+FCT_RAT -> PCB_FCT_RAT
+FCT_ELEMENT -> PCB_FCT_ELEMENT
+FCT_START -> PCB_FCT_START
+find_callback_t -> pcb_find_callback_t
+find_callback -> pcb_find_callback
+SHOWNUMBERFLAG -> PCB_SHOWNUMBERFLAG
+LOCALREFFLAG -> PCB_LOCALREFFLAG
+CHECKPLANESFLAG -> PCB_CHECKPLANESFLAG
+SHOWPCB_FLAG_DRC -> PCB_SHOWPCB_FLAG_DRC
+RUBBERBANDFLAG -> PCB_RUBBERBANDFLAG
+DESCRIPTIONFLAG -> PCB_DESCRIPTIONFLAG
+NAMEONPCBFLAG -> PCB_NAMEONPCBFLAG
+AUTOPCB_FLAG_DRC -> PCB_AUTOPCB_FLAG_DRC
+ALLDIRECTIONFLAG -> PCB_ALLDIRECTIONFLAG
+SWAPSTARTDIRFLAG -> PCB_SWAPSTARTDIRFLAG
+UNIQUENAMEFLAG -> PCB_UNIQUENAMEFLAG
+CLEARNEWFLAG -> PCB_CLEARNEWFLAG
+SNAPPCB_FLAG_PIN -> PCB_SNAPPCB_FLAG_PIN
+SHOWMASKFLAG -> PCB_SHOWMASKFLAG
+THINDRAWFLAG -> PCB_THINDRAWFLAG
+ORTHOMOVEFLAG -> PCB_ORTHOMOVEFLAG
+LIVEROUTEFLAG -> PCB_LIVEROUTEFLAG
+THINDRAWPOLYFLAG -> PCB_THINDRAWPOLYFLAG
+LOCKNAMESFLAG -> PCB_LOCKNAMESFLAG
+ONLYNAMESFLAG -> PCB_ONLYNAMESFLAG
+NEWPCB_FLAG_FULLPOLY -> PCB_NEWPCB_FLAG_FULLPOLY
+HIDENAMESFLAG -> PCB_HIDENAMESFLAG
+ENABLEPCB_FLAG_MINCUT -> PCB_ENABLEPCB_FLAG_MINCUT
+GROUNDPLANEFRAME -> PCB_GROUNDPLANEFRAME
+MASKFRAME -> PCB_MASKFRAME
+LARGE_VALUE -> PCB_LARGE_VALUE
+MAX_LAYER -> PCB_MAX_LAYER
+MIN_LINESIZE -> PCB_MIN_LINESIZE
+MAX_LINESIZE -> PCB_MAX_LINESIZE
+MIN_ARCSIZE -> PCB_MIN_ARCSIZE
+MAX_ARCSIZE -> PCB_MAX_ARCSIZE
+MIN_TEXTSCALE -> PCB_MIN_TEXTSCALE
+MAX_TEXTSCALE -> PCB_MAX_TEXTSCALE
+MIN_PINORVIASIZE -> PCB_MIN_PINORVIASIZE
+MIN_PINORVIAHOLE -> PCB_MIN_PINORVIAHOLE
+MAX_PINORVIASIZE -> PCB_MAX_PINORVIASIZE
+MIN_PINORVIACOPPER -> PCB_MIN_PINORVIACOPPER
+MIN_PADSIZE -> PCB_MIN_PADSIZE
+MAX_PADSIZE -> PCB_MAX_PADSIZE
+MIN_DRC_VALUE -> PCB_MIN_DRC_VALUE
+MAX_DRC_VALUE -> PCB_MAX_DRC_VALUE
+MIN_DRC_SILK -> PCB_MIN_DRC_SILK
+MAX_DRC_SILK -> PCB_MAX_DRC_SILK
+MIN_DRC_DRILL -> PCB_MIN_DRC_DRILL
+MAX_DRC_DRILL -> PCB_MAX_DRC_DRILL
+MIN_DRC_RING -> PCB_MIN_DRC_RING
+MAX_DRC_RING -> PCB_MAX_DRC_RING
+MIN_GRID -> PCB_MIN_GRID
+MAX_GRID -> PCB_MAX_GRID
+MAX_FONTPOSITION -> PCB_MAX_FONTPOSITION
+MAX_COORD -> PCB_MAX_COORD
+MIN_SIZE -> PCB_MIN_SIZE
+MAX_SIZE -> PCB_MAX_SIZE
+MAX_BUFFER -> PCB_MAX_BUFFER
+DEFAULT_DRILLINGHOLE -> PCB_DEFAULT_DRILLINGHOLE
+MAXPATHLEN -> PCB_PATH_MAX
+MAX_LINE_POINT_DISTANCE -> PCB_MAX_LINE_POINT_DISTANCE
+MAX_POLYGON_POINT_DISTANCE -> PCB_MAX_POLYGON_POINT_DISTANCE
+MAX_ELEMENTNAMES -> PCB_MAX_ELEMENTNAMES
+MAX_NETLIST_LINE_LENGTH -> PCB_MAX_NETLIST_LINE_LENGTH
+MAX_MODESTACK_DEPTH -> PCB_MAX_MODESTACK_DEPTH
+MIN_GRID_DISTANCE -> PCB_MIN_GRID_DISTANCE
+EMARK_SIZE -> PCB_EMARK_SIZE
+FONT_CAPHEIGHT -> PCB_FONT_CAPHEIGHT
+DEFAULT_CELLSIZE -> PCB_DEFAULT_CELLSIZE
+next_gui -> pcb_next_gui
+current_action -> pcb_current_action
+pixel_slop -> pcb_pixel_slop
+MF_ACCELERATOR -> PCB_MF_ACCELERATOR
+MF_MNEMONIC -> PCB_MF_MNEMONIC
+MF_SUBMENU -> PCB_MF_SUBMENU
+MF_CHECKED -> PCB_MF_CHECKED
+MF_UPDATE_ON -> PCB_MF_UPDATE_ON
+MF_SENSITIVE -> PCB_MF_SENSITIVE
+MF_TIP -> PCB_MF_TIP
+MF_ACTIVE -> PCB_MF_ACTIVE
+MF_ACTION -> PCB_MF_ACTION
+MF_FOREGROUND -> PCB_MF_FOREGROUND
+MF_BACKGROUND -> PCB_MF_BACKGROUND
+MF_FONT -> PCB_MF_FONT
+M_Shift -> PCB_M_Shift
+M_Ctrl -> PCB_M_Ctrl
+M_Alt -> PCB_M_Alt
+M_Mod1 -> PCB_M_Mod1
+M_Release -> PCB_M_Release
+MB_LEFT -> PCB_MB_LEFT
+MB_MIDDLE -> PCB_MB_MIDDLE
+MB_RIGHT -> PCB_MB_RIGHT
+MB_SCROLL_UP -> PCB_MB_SCROLL_UP
+MB_SCROLL_DOWN -> PCB_MB_SCROLL_DOWN
+MB_SCROLL_LEFT -> PCB_MB_SCROLL_LEFT
+MB_SCROLL_RIGHT -> PCB_MB_SCROLL_RIGHT
+MB_ANY -> PCB_MB_ANY
+M_ANY -> PCB_M_ANY
+hid_list -> pcb_hid_list
+hid_num_hids -> pcb_hid_num_hids
+MENU_LOOP -> PCB_MENU_LOOP
+ENTRY_LOOP -> PCB_ENTRY_LOOP
+SWAP_IDENT -> PCB_SWAP_IDENT
+END_LOOP -> PCB_END_LOOP
+ENDALL_LOOP -> PCB_ENDALL_LOOP
+pcb_create_be_lenient -> pcb_create_being_lenient
+CreateBeLenient -> pcb_create_be_lenient
+CreateIDBump -> pcb_create_ID_bump
+CreateIDReset -> pcb_create_ID_reset
+CreateIDGet -> pcb_create_ID_get
+DESCRIPTION_INDEX -> PCB_ELEMNAME_IDX_DESCRIPTION
+NAMEONPCB_INDEX -> PCB_ELEMNAME_IDX_REFDES
+VALUE_INDEX -> PCB_ELEMNAME_IDX_VALUE
+NAME_INDEX -> PCB_ELEMNAME_IDX_VISIBLE
+ELEMENT_NAME -> PCB_ELEM_NAME_VISIBLE
+DESCRIPTION_NAME -> PCB_ELEM_NAME_DESCRIPTION
+NAMEONPCB_NAME -> PCB_ELEM_NAME_REFDES
+VALUE_NAME -> PCB_ELEM_NAME_VALUE
+ELEMENT_TEXT -> PCB_ELEM_TEXT_VISIBLE
+DESCRIPTION_TEXT -> PCB_ELEM_TEXT_DESCRIPTION
+NAMEONPCB_TEXT -> PCB_ELEM_TEXT_REFDES
+VALUE_TEXT -> PCB_ELEM_TEXT_VALUE
+AdjustAttachedLine -> pcb_line_adjust_attached
+AdjustTwoLine -> pcb_line_adjust_attached_2lines
+FortyFiveLine -> pcb_line_45
+EnforceLineDRC -> pcb_line_enforce_drc
+library -> pcb_library
+gui -> pcb_gui
+exporter -> pcb_exporter
+plug_fp_chain -> pcb_plug_fp_chain
+plug_import_chain -> pcb_plug_import_chain
+plug_io_chain -> pcb_plug_io_chain
+PLF_DIR -> PCB_PLF_DIR
+PLF_INV -> PCB_PLF_INV
+PLF_MARK -> PCB_PLF_MARK
+VertexEqu -> pcb_vertex_equ
+VertexCpy -> pcb_vertex_cpy
+err_no_memory -> pcb_err_no_memory
+err_bad_parm -> pcb_err_bad_parm
+err_ok -> pcb_err_ok
+PBO_UNITE -> PCB_PBO_UNITE
+PBO_ISECT -> PCB_PBO_ISECT
+PBO_SUB -> PCB_PBO_SUB
+PBO_XOR -> PCB_PBO_XOR
+POLY_CIRC_SEGS -> PCB_POLY_CIRC_SEGS
+POLY_CIRC_SEGS_F -> PCB_POLY_CIRC_SEGS_F
+POLY_CIRC_RADIUS_ADJ -> PCB_POLY_CIRC_RADIUS_ADJ
+POLY_ARC_MAX_DEVIATION -> PCB_POLY_ARC_MAX_DEVIATION
+R_DIR_NOT_FOUND -> PCB_R_DIR_NOT_FOUND
+R_DIR_FOUND_CONTINUE -> PCB_R_DIR_FOUND_CONTINUE
+R_DIR_CANCEL -> PCB_R_DIR_CANCEL
+SLOP -> PCB_SLOP
+SM_REGEX -> PCB_SM_REGEX
+SM_LIST -> PCB_SM_LIST
+SWAP_ANGLE -> PCB_SWAP_ANGLE
+SWAP_DELTA -> PCB_SWAP_DELTA
+METRIC -> PCB_UNIT_METRIC
+IMPERIAL -> PCB_UNIT_IMPERIAL
+NO_SUFFIX -> PCB_UNIT_NO_SUFFIX
+SUFFIX -> PCB_UNIT_SUFFIX
+FILE_MODE -> PCB_UNIT_FILE_MODE
+NO_PRINT -> PCB_UNIT_NO_PRINT
+ALLOW_NM -> PCB_UNIT_ALLOW_NM
+ALLOW_UM -> PCB_UNIT_ALLOW_UM
+ALLOW_MM -> PCB_UNIT_ALLOW_MM
+ALLOW_CM -> PCB_UNIT_ALLOW_CM
+ALLOW_M -> PCB_UNIT_ALLOW_M
+ALLOW_KM -> PCB_UNIT_ALLOW_KM
+ALLOW_CMIL -> PCB_UNIT_ALLOW_CMIL
+ALLOW_MIL -> PCB_UNIT_ALLOW_MIL
+ALLOW_IN -> PCB_UNIT_ALLOW_IN
+ALLOW_DMIL -> PCB_UNIT_ALLOW_DMIL
+ALLOW_METRIC -> PCB_UNIT_ALLOW_METRIC
+ALLOW_IMPERIAL -> PCB_UNIT_ALLOW_IMPERIAL
+ALLOW_READABLE -> PCB_UNIT_ALLOW_READABLE
+ALLOW_NATURAL -> PCB_UNIT_ALLOW_NATURAL
+ALLOW_ALL -> PCB_UNIT_ALLOW_ALL
+ActionExecuteFile -> pcb_act_ExecuteFile
+executefile_help -> pcb_acth_ExecuteFile
+executefile_syntax -> pcb_acts_ExecuteFile
+ActionChangeAngle -> pcb_act_ChangeAngle
+changeangle_help -> pcb_acth_ChangeAngle
+changeangle_syntax -> pcb_acts_ChangeAngle
+ActionChangeClearSize -> pcb_act_ChangeClearSize
+changeclearsize_help -> pcb_acth_ChangeClearSize
+changeclearsize_syntax -> pcb_acts_ChangeClearSize
+ActionChange2ndSize -> pcb_act_Change2ndSize
+change2ndsize_help -> pcb_acth_Change2ndSize
+change2ndsize_syntax -> pcb_acts_Change2ndSize
+ActionChangeHole -> pcb_act_ChangeHole
+changehole_help -> pcb_acth_ChangeHole
+changehole_syntax -> pcb_acts_ChangeHole
+ActionChangeJoin -> pcb_act_ChangeJoin
+changejoin_help -> pcb_acth_ChangeJoin
+changejoin_syntax -> pcb_acts_ChangeJoin
+ActionChangeName -> pcb_act_ChangeName
+changename_help -> pcb_acth_ChangeName
+changename_syntax -> pcb_acts_ChangeName
+ActionChangePaste -> pcb_act_ChangePaste
+changepaste_help -> pcb_acth_ChangePaste
+changepaste_syntax -> pcb_acts_ChangePaste
+ActionChangePinName -> pcb_act_ChangePinName
+changepinname_help -> pcb_acth_ChangePinName
+changepinname_syntax -> pcb_acts_ChangePinName
+ActionChangeRadius -> pcb_act_ChangeRadius
+changeradius_help -> pcb_acth_ChangeRadius
+changeradius_syntax -> pcb_acts_ChangeRadius
+ActionChangeSize -> pcb_act_ChangeSize
+changesize_help -> pcb_acth_ChangeSize
+changesize_syntax -> pcb_acts_ChangeSize
+ActionChangeSizes -> pcb_act_ChangeSizes
+changesizes_help -> pcb_acth_ChangeSizes
+changesizes_syntax -> pcb_acts_ChangeSizes
+ActionChangeNonetlist -> pcb_act_ChangeNonetlist
+changenonetlist_help -> pcb_acth_ChangeNonetlist
+changenonetlist_syntax -> pcb_acts_ChangeNonetlist
+ActionChangeSquare -> pcb_act_ChangeSquare
+changesquare_help -> pcb_acth_ChangeSquare
+changesquare_syntax -> pcb_acts_ChangeSquare
+ActionChangeOctagon -> pcb_act_ChangeOctagon
+changeoctagon_help -> pcb_acth_ChangeOctagon
+changeoctagon_syntax -> pcb_acts_ChangeOctagon
+ActionChangeFlag -> pcb_act_ChangeFlag
+changeflag_help -> pcb_acth_ChangeFlag
+changeflag_syntax -> pcb_acts_ChangeFlag
+ActionClearSquare -> pcb_act_ClearSquare
+clearsquare_help -> pcb_acth_ClearSquare
+clearsquare_syntax -> pcb_acts_ClearSquare
+ActionClearOctagon -> pcb_act_ClearOctagon
+clearoctagon_help -> pcb_acth_ClearOctagon
+clearoctagon_syntax -> pcb_acts_ClearOctagon
+ActionSetSquare -> pcb_act_SetSquare
+setsquare_help -> pcb_acth_SetSquare
+setsquare_syntax -> pcb_acts_SetSquare
+ActionSetOctagon -> pcb_act_SetOctagon
+setoctagon_help -> pcb_acth_SetOctagon
+setoctagon_syntax -> pcb_acts_SetOctagon
+ActionSetThermal -> pcb_act_SetThermal
+setthermal_help -> pcb_acth_SetThermal
+setthermal_syntax -> pcb_acts_SetThermal
+ActionSetValue -> pcb_act_SetValue
+setvalue_help -> pcb_acth_SetValue
+setvalue_syntax -> pcb_acts_SetValue
+ActionSetFlag -> pcb_act_SetFlag
+setflag_help -> pcb_acth_SetFlag
+setflag_syntax -> pcb_acts_SetFlag
+ActionClrFlag -> pcb_act_ClrFlag
+clrflag_help -> pcb_acth_ClrFlag
+clrflag_syntax -> pcb_acts_ClrFlag
+ActionExecCommand -> pcb_act_ExecCommand
+execcommand_help -> pcb_acth_ExecCommand
+execcommand_syntax -> pcb_acts_ExecCommand
+ActionLoadFrom -> pcb_act_LoadFrom
+loadfrom_help -> pcb_acth_LoadFrom
+loadfrom_syntax -> pcb_acts_LoadFrom
+ActionNew -> pcb_act_New
+new_help -> pcb_acth_New
+new_syntax -> pcb_acts_New
+ActionSaveTo -> pcb_act_SaveTo
+saveto_help -> pcb_acth_SaveTo
+saveto_syntax -> pcb_acts_SaveTo
+ActionQuit -> pcb_act_Quit
+quit_help -> pcb_acth_Quit
+quit_syntax -> pcb_acts_Quit
+ActionDRCheck -> pcb_act_DRCheck
+drcheck_help -> pcb_acth_DRCheck
+drcheck_syntax -> pcb_acts_DRCheck
+ActionDisplay -> pcb_act_Display
+display_help -> pcb_acth_Display
+display_syntax -> pcb_acts_Display
+ActionCycleDrag -> pcb_act_CycleDrag
+cycledrag_help -> pcb_acth_CycleDrag
+cycledrag_syntax -> pcb_acts_CycleDrag
+FullScreen -> pcb_act_FullScreen
+fullscreen_help -> pcb_acth_FullScreen
+fullscreen_syntax -> pcb_acts_FullScreen
+ActionMarkCrosshair -> pcb_act_MarkCrosshair
+markcrosshair_help -> pcb_acth_MarkCrosshair
+markcrosshair_syntax -> pcb_acts_MarkCrosshair
+ActionMessage -> pcb_act_Message
+message_help -> pcb_acth_Message
+message_syntax -> pcb_acts_Message
+ActionMode -> pcb_act_Mode
+mode_help -> pcb_acth_Mode
+mode_syntax -> pcb_acts_Mode
+ActionToggleHideName -> pcb_act_ToggleHideName
+togglehidename_help -> pcb_acth_ToggleHideName
+togglehidename_syntax -> pcb_acts_ToggleHideName
+ActionSetSame -> pcb_act_SetSame
+setsame_help -> pcb_acth_SetSame
+setsame_syntax -> pcb_acts_SetSame
+ActionRouteStyle -> pcb_act_RouteStyle
+routestyle_help -> pcb_acth_RouteStyle
+routestyle_syntax -> pcb_acts_RouteStyle
+ActionCreateMenu -> pcb_act_CreateMenu
+createmenu_help -> pcb_acth_CreateMenu
+createmenu_syntax -> pcb_acts_CreateMenu
+ActionRemoveMenu -> pcb_act_RemoveMenu
+removemenu_help -> pcb_acth_RemoveMenu
+removemenu_syntax -> pcb_acts_RemoveMenu
+ActionSwitchHID -> pcb_act_SwitchHID
+switchhid_help -> pcb_acth_SwitchHID
+switchhid_syntax -> pcb_acts_SwitchHID
+ActionPrintActions -> pcb_act_PrintActions
+printactions_help -> pcb_acth_PrintActions
+printactions_syntax -> pcb_acts_PrintActions
+ActionDumpActions -> pcb_act_DumpActions
+dumpactions_help -> pcb_acth_DumpActions
+dumpactions_syntax -> pcb_acts_DumpActions
+ActionPrintUsage -> pcb_act_PrintUsage
+printusage_help -> pcb_acth_PrintUsage
+printusage_syntax -> pcb_acts_PrintUsage
+ActionPrintVersion -> pcb_act_PrintVersion
+printversion_help -> pcb_acth_PrintVersion
+printversion_syntax -> pcb_acts_PrintVersion
+ActionPrintCopyright -> pcb_act_PrintCopyright
+printcopyright_help -> pcb_acth_PrintCopyright
+printcopyright_syntax -> pcb_acts_PrintCopyright
+ActionPrintPaths -> pcb_act_PrintPaths
+printpaths_help -> pcb_acth_PrintPaths
+printpaths_syntax -> pcb_acts_PrintPaths
+ActionNetlist -> pcb_act_Netlist
+netlist_help -> pcb_acth_Netlist
+netlist_syntax -> pcb_acts_Netlist
+ActionNetlist -> pcb_act_Netlist
+netlist_help -> pcb_acth_Netlist
+netlist_syntax -> pcb_acts_Netlist
+ActionAttributes -> pcb_act_Attributes
+attributes_help -> pcb_acth_Attributes
+attributes_syntax -> pcb_acts_Attributes
+ActionDisperseElements -> pcb_act_DisperseElements
+disperseelements_help -> pcb_acth_DisperseElements
+disperseelements_syntax -> pcb_acts_DisperseElements
+ActionFlip -> pcb_act_Flip
+flip_help -> pcb_acth_Flip
+flip_syntax -> pcb_acts_Flip
+ActionListRotations -> pcb_act_ListRotations
+listrotations_help -> pcb_acth_ListRotations
+listrotations_syntax -> pcb_acts_ListRotations
+ActionMoveObject -> pcb_act_MoveObject
+moveobject_help -> pcb_acth_MoveObject
+moveobject_syntax -> pcb_acts_MoveObject
+ActionMoveToCurrentLayer -> pcb_act_MoveToCurrentLayer
+movetocurrentlayer_help -> pcb_acth_MoveToCurrentLayer
+movetocurrentlayer_syntax -> pcb_acts_MoveToCurrentLayer
+ActionElementList -> pcb_act_ElementList
+elementlist_help -> pcb_acth_ElementList
+elementlist_syntax -> pcb_acts_ElementList
+ActionElementSetAttr -> pcb_act_ElementSetAttr
+elementsetattr_help -> pcb_acth_ElementSetAttr
+elementsetattr_syntax -> pcb_acts_ElementSetAttr
+ActionRipUp -> pcb_act_RipUp
+ripup_help -> pcb_acth_RipUp
+ripup_syntax -> pcb_acts_RipUp
+ActionMinMaskGap -> pcb_act_MinMaskGap
+minmaskgap_help -> pcb_acth_MinMaskGap
+minmaskgap_syntax -> pcb_acts_MinMaskGap
+ActionMinClearGap -> pcb_act_MinClearGap
+mincleargap_help -> pcb_acth_MinClearGap
+mincleargap_syntax -> pcb_acts_MinClearGap
+MoveLayerAction -> pcb_act_MoveLayerAction
+movelayeraction_help -> pcb_acth_MoveLayerAction
+movelayeraction_syntax -> pcb_acts_MoveLayerAction
+Action_fp_rehash -> pcb_act__fp_rehash
+_fp_rehash_help -> pcb_acth__fp_rehash
+_fp_rehash_syntax -> pcb_acts__fp_rehash
+ActionMorphPolygon -> pcb_act_MorphPolygon
+morphpolygon_help -> pcb_acth_MorphPolygon
+morphpolygon_syntax -> pcb_acts_MorphPolygon
+ActionPolygon -> pcb_act_Polygon
+polygon_help -> pcb_acth_Polygon
+polygon_syntax -> pcb_acts_Polygon
+ActionAddRats -> pcb_act_AddRats
+addrats_help -> pcb_acth_AddRats
+addrats_syntax -> pcb_acts_AddRats
+ActionConnection -> pcb_act_Connection
+connection_help -> pcb_acth_Connection
+connection_syntax -> pcb_acts_Connection
+ActionDeleteRats -> pcb_act_DeleteRats
+deleterats_help -> pcb_acth_DeleteRats
+deleterats_syntax -> pcb_acts_DeleteRats
+ActionDelete -> pcb_act_Delete
+delete_help -> pcb_acth_Delete
+delete_syntax -> pcb_acts_Delete
+ActionRemoveSelected -> pcb_act_RemoveSelected
+removeselected_help -> pcb_acth_RemoveSelected
+removeselected_syntax -> pcb_acts_RemoveSelected
+ActionSelect -> pcb_act_Select
+select_help -> pcb_acth_Select
+select_syntax -> pcb_acts_Select
+ActionUnselect -> pcb_act_Unselect
+unselect_help -> pcb_acth_Unselect
+unselect_syntax -> pcb_acts_Unselect
+ActionAtomic -> pcb_act_Atomic
+atomic_help -> pcb_acth_Atomic
+atomic_syntax -> pcb_acts_Atomic
+ActionUndo -> pcb_act_Undo
+undo_help -> pcb_acth_Undo
+undo_syntax -> pcb_acts_Undo
+ActionRedo -> pcb_act_Redo
+redo_help -> pcb_acth_Redo
+redo_syntax -> pcb_acts_Redo
+ActionReplaceFootprint -> pcb_act_ReplaceFootprint
+replacefootprint_help -> pcb_acth_ReplaceFootprint
+replacefootprint_syntax -> pcb_acts_ReplaceFootprint
+ActionSavePatch -> pcb_act_SavePatch
+savepatch_help -> pcb_acth_SavePatch
+savepatch_syntax -> pcb_acts_SavePatch
+ActionManagePlugins -> pcb_act_ManagePlugins
+manageplugins_help -> pcb_acth_ManagePlugins
+manageplugins_syntax -> pcb_acts_ManagePlugins
+ActionConf -> pcb_act_Conf
+conf_help -> pcb_acth_Conf
+conf_syntax -> pcb_acts_Conf
+ActionGetStyle -> pcb_act_GetStyle
+getstyle_help -> pcb_acth_GetStyle
+getstyle_syntax -> pcb_acts_GetStyle
+ActionChkMode -> pcb_act_ChkMode
+chkmode_help -> pcb_acth_ChkMode
+chkmode_syntax -> pcb_acts_ChkMode
+ActionChkGridSize -> pcb_act_ChkGridSize
+chkgridsize_help -> pcb_acth_ChkGridSize
+chkgridsize_syntax -> pcb_acts_ChkGridSize
+ActionChkElementName -> pcb_act_ChkElementName
+chkelementname_help -> pcb_acth_ChkElementName
+chkelementname_syntax -> pcb_acts_ChkElementName
+ActionChkGridUnits -> pcb_act_ChkGridUnits
+chkgridunits_help -> pcb_acth_ChkGridUnits
+chkgridunits_syntax -> pcb_acts_ChkGridUnits
+ActionChkBuffer -> pcb_act_ChkBuffer
+chkbuffer_help -> pcb_acth_ChkBuffer
+chkbuffer_syntax -> pcb_acts_ChkBuffer
+ActionFreeRotateBuffer -> pcb_act_FreeRotateBuffer
+freerotatebuffer_help -> pcb_acth_FreeRotateBuffer
+freerotatebuffer_syntax -> pcb_acts_FreeRotateBuffer
+ActionPasteBuffer -> pcb_act_PasteBuffer
+pastebuffer_help -> pcb_acth_PasteBuffer
+pastebuffer_syntax -> pcb_acts_PasteBuffer
+ActionDumpLibrary -> pcb_act_DumpLibrary
+dumplibrary_help -> pcb_acth_DumpLibrary
+dumplibrary_syntax -> pcb_acts_DumpLibrary
+ActionBell -> pcb_act_Bell
+bell_help -> pcb_acth_Bell
+bell_syntax -> pcb_acts_Bell
+ActionToggleVendor -> pcb_act_ToggleVendor
+togglevendor_help -> pcb_acth_ToggleVendor
+togglevendor_syntax -> pcb_acts_ToggleVendor
+ActionEnableVendor -> pcb_act_EnableVendor
+enablevendor_help -> pcb_acth_EnableVendor
+enablevendor_syntax -> pcb_acts_EnableVendor
+ActionDisableVendor -> pcb_act_DisableVendor
+disablevendor_help -> pcb_acth_DisableVendor
+disablevendor_syntax -> pcb_acts_DisableVendor
+ActionImport -> pcb_act_Import
+import_help -> pcb_acth_Import
+import_syntax -> pcb_acts_Import
+ActionLoadhypFrom -> pcb_act_LoadhypFrom
+loadhypfrom_help -> pcb_acth_LoadhypFrom
+loadhypfrom_syntax -> pcb_acts_LoadhypFrom
+ActionRenumber -> pcb_act_Renumber
+renumber_help -> pcb_acth_Renumber
+renumber_syntax -> pcb_acts_Renumber
+ActionRenumberBlock -> pcb_act_RenumberBlock
+renumberblock_help -> pcb_acth_RenumberBlock
+renumberblock_syntax -> pcb_acts_RenumberBlock
+ActionRenumberBuffer -> pcb_act_RenumberBuffer
+renumberbuffer_help -> pcb_acth_RenumberBuffer
+renumberbuffer_syntax -> pcb_acts_RenumberBuffer
+ActionLoadDsnFrom -> pcb_act_LoadDsnFrom
+loaddsnfrom_help -> pcb_acth_LoadDsnFrom
+loaddsnfrom_syntax -> pcb_acts_LoadDsnFrom
+ActionDumpConf -> pcb_act_DumpConf
+dumpconf_help -> pcb_acth_DumpConf
+dumpconf_syntax -> pcb_acts_DumpConf
+ActionDumpLayers -> pcb_act_DumpLayers
+dumplayers_help -> pcb_acth_DumpLayers
+dumplayers_syntax -> pcb_acts_DumpLayers
+ActionEvalConf -> pcb_act_EvalConf
+evalconf_help -> pcb_acth_EvalConf
+evalconf_syntax -> pcb_acts_EvalConf
+ActionPSCalib -> pcb_act_PSCalib
+pscalib_help -> pcb_acth_PSCalib
+pscalib_syntax -> pcb_acts_PSCalib
+ActionApplyVendor -> pcb_act_ApplyVendor
+applyvendor_help -> pcb_acth_ApplyVendor
+applyvendor_syntax -> pcb_acts_ApplyVendor
+ActionUnloadVendor -> pcb_act_UnloadVendor
+unloadvendor_help -> pcb_acth_UnloadVendor
+unloadvendor_syntax -> pcb_acts_UnloadVendor
+ActionLoadVendorFrom -> pcb_act_LoadVendorFrom
+loadvendorfrom_help -> pcb_acth_LoadVendorFrom
+loadvendorfrom_syntax -> pcb_acts_LoadVendorFrom
+ActionAutoRoute -> pcb_act_AutoRoute
+autoroute_help -> pcb_acth_AutoRoute
+autoroute_syntax -> pcb_acts_AutoRoute
+GlobalPuller -> pcb_act_GlobalPuller
+globalpuller_help -> pcb_acth_GlobalPuller
+globalpuller_syntax -> pcb_acts_GlobalPuller
+Puller -> pcb_act_Puller
+puller_help -> pcb_acth_Puller
+puller_syntax -> pcb_acts_Puller
+ActionAutoPlaceSelected -> pcb_act_AutoPlaceSelected
+autoplaceselected_help -> pcb_acth_AutoPlaceSelected
+autoplaceselected_syntax -> pcb_acts_AutoPlaceSelected
+ActionDJopt -> pcb_act_DJopt
+djopt_help -> pcb_acth_DJopt
+djopt_syntax -> pcb_acts_DJopt
+h_str -> pcb_hash_str
+h_coordox -> pcb_hash_element_ox
+h_coordoy -> pcb_hash_element_oy
+h_coord -> pcb_hash_coord
+pcb_buffer_swap -> pcb_buffer_flip_side
+pcb_swap_buffers -> pcb_buffers_flip_side
+LAYER_IS_PCB_EMPTY -> PCB_LAYER_IS_EMPTY
+LAYER_IS_PCB_EMPTY -> PCB_LAYER_IS_EMPTY
+IsLayerEmpty -> pcb_layer_is_empty_
+IsLayerNumEmpty -> pcb_layer_is_empty
+IsLayerGroupEmpty -> pcb_is_layergrp_empty
+ParseGroupString -> pcb_layer_parse_group_string
+GetLayerNumber -> pcb_layer_id
+GetGroupOfLayer -> pcb_layer_get_group
+GetLayerGroupNumberByPointer -> pcb_layer_get_group_
+GetLayerGroupNumberByNumber -> pcb_layer_get_group
+IsPasteEmpty -> pcb_layer_is_paste_empty
+SOLDER_LAYER -> PCB_SOLDER_SIDE
+COMPONENT_LAYER -> PCB_COMPONENT_SIDE
+LayerStringToLayerStack -> pcb_layervis_parse_string
+ChangeGroupVisibility -> pcb_layervis_change_group_vis
+ResetStackAndVisibility -> pcb_layervis_reset_stack
+SaveStackAndVisibility -> pcb_layervis_save_stack
+RestoreStackAndVisibility -> pcb_layervis_restore_stack
+AddArcToBuffer -> pcb_arcop_add_to_buffer
+MoveArcToBuffer -> pcb_arcop_move_to_buffer
+ChangeArcSize -> pcb_arcop_change_size
+ChangeArcClearSize -> pcb_arcop_change_clear_size
+ChangeArcRadius -> pcb_arcop_change_radius
+ChangeArcAngle -> pcb_arcop_change_angle
+ChangeArcJoin -> pcb_arcop_change_join
+SetArcJoin -> pcb_arcop_set_join
+ClrArcJoin -> pcb_arcop_clear_join
+CopyArc -> pcb_arcop_copy
+MoveArc -> pcb_arcop_move
+MoveArcToLayerLowLevel -> pcb_arcop_move_to_layer_low
+MoveArcToLayer -> pcb_arcop_move_to_layer
+DestroyArc -> pcb_arcop_destroy
+RemoveArc_op -> pcb_arcop_remove
+RemoveArcPoint_op -> pcb_arcop_remove_point
+Rotate90Arc -> pcb_arcop_rotate90
+ChgFlagArc -> pcb_arcop_change_flag
+AddLineToBuffer -> pcb_lineop_add_to_buffer
+ChangeLineSize -> pcb_lineop_change_size
+ChangeLineClearSize -> pcb_lineop_change_clear_size
+ChangeLineName -> pcb_lineop_change_name
+ChangeLineJoin -> pcb_lineop_change_join
+SetLineJoin -> pcb_lineop_set_join
+ClrLineJoin -> pcb_lineop_clear_join
+InsertPointIntoLine -> pcb_lineop_insert_point
+MoveLineToBuffer -> pcb_lineop_move_to_buffer
+CopyLine -> pcb_lineop_copy
+MoveLine -> pcb_lineop_move
+MoveLinePoint -> pcb_lineop_move_point
+MoveLinePointWithRoute -> pcb_lineop_move_point_with_route
+MoveLineToLayerLowLevel -> pcb_lineop_move_to_layer_low
+MoveLineToLayer -> pcb_lineop_move_to_layer
+DestroyLine -> pcb_lineop_destroy
+RemoveLinePoint -> pcb_lineop_remove_point
+RemoveLine_op -> pcb_lineop_remove
+Rotate90LinePoint -> pcb_lineop_rotate90_point
+Rotate90Line -> pcb_lineop_rotate90
+ChgFlagLine -> pcb_lineop_change_flag
+AddArcToBuffer -> pcb_arcop_add_to_buffer
+MoveArcToBuffer -> pcb_arcop_move_to_buffer
+ChangeArcSize -> pcb_arcop_change_size
+ChangeArcClearSize -> pcb_arcop_change_clear_size
+ChangeArcRadius -> pcb_arcop_change_radius
+ChangeArcAngle -> pcb_arcop_change_angle
+ChangeArcJoin -> pcb_arcop_change_join
+SetArcJoin -> pcb_arcop_set_join
+ClrArcJoin -> pcb_arcop_clear_join
+CopyArc -> pcb_arcop_copy
+MoveArc -> pcb_arcop_move
+MoveArcToLayerLowLevel -> pcb_arcop_move_to_layer_low
+MoveArcToLayer -> pcb_arcop_move_to_layer
+DestroyArc -> pcb_arcop_destroy
+RemoveArc_op -> pcb_arcop_remove
+RemoveArcPoint_op -> pcb_arcop_remove_point
+Rotate90Arc -> pcb_arcop_rotate90
+ChgFlagArc -> pcb_arcop_change_flag
+AddElementToBuffer -> pcb_elemop_add_to_buffer
+MoveElementToBuffer -> pcb_elemop_move_to_buffer
+ClrElementOctagon -> pcb_elemop_clear_octagon
+SetElementOctagon -> pcb_elemop_set_octagon
+ChangeElementOctagon -> pcb_elemop_change_octagon
+ClrElementSquare -> pcb_elemop_clear_square
+SetElementSquare -> pcb_elemop_set_square
+ChangeElementSquare -> pcb_elemop_change_square
+ChangeElementNonetlist -> pcb_elemop_change_nonetlist
+ChangeElementName -> pcb_elemop_change_name
+ChangeElementNameSize -> pcb_elemop_change_name_size
+ChangeElementSize -> pcb_elemop_change_size
+ChangeElementClearSize -> pcb_elemop_change_clear_size
+ChangeElement1stSize -> pcb_elemop_change_1st_size
+ChangeElement2ndSize -> pcb_elemop_change_2nd_size
+CopyElement -> pcb_elemop_copy
+MoveElementName -> pcb_elemop_move_name
+MoveElement -> pcb_elemop_move
+DestroyElement -> pcb_elemop_destroy
+RemoveElement_op -> pcb_elemop_remove
+Rotate90Element -> pcb_elemop_rotate90
+Rotate90ElementName -> pcb_elemop_rotate90_name
+ChangePadSize -> pcb_padop_change_size
+ChangePadClearSize -> pcb_padop_change_clear_size
+ChangePadName -> pcb_padop_change_name
+ChangePadNum -> pcb_padop_change_num
+ChangePadSquare -> pcb_padop_change_square
+SetPadSquare -> pcb_padop_set_square
+ClrPadSquare -> pcb_padop_clear_square
+ChangePadMaskSize -> pcb_padop_change_mask_size
+AddViaToBuffer -> pcb_viaop_add_to_buffer
+MoveViaToBuffer -> pcb_viaop_move_to_buffer
+ChangeViaThermal -> pcb_viaop_change_thermal
+ChangePinThermal -> pcb_pinop_change_thermal
+ChangeViaSize -> pcb_viaop_change_size
+ChangeVia2ndSize -> pcb_viaop_change_2nd_size
+ChangePin2ndSize -> pcb_pinop_change_2nd_size
+ChangeViaClearSize -> pcb_viaop_change_clear_size
+ChangePinSize -> pcb_pinop_change_size
+ChangePinClearSize -> pcb_pinop_change_clear_size
+ChangeViaName -> pcb_viaop_change_name
+ChangePinName -> pcb_pinop_change_name
+ChangePinNum -> pcb_pinop_change_num
+ChangeViaSquare -> pcb_viaop_change_square
+ChangePinSquare -> pcb_pinop_change_square
+SetPinSquare -> pcb_pinop_set_square
+ClrPinSquare -> pcb_pinop_clear_square
+ChangeViaOctagon -> pcb_viaop_change_octagon
+SetViaOctagon -> pcb_viaop_set_octagon
+ClrViaOctagon -> pcb_viaop_clear_octagon
+ChangePinOctagon -> pcb_pinop_change_octagon
+SetPinOctagon -> pcb_pinop_set_octagon
+ClrPinOctagon -> pcb_pinop_clear_octagon
+ChangePinMaskSize -> pcb_pinop_change_mask_size
+ChangeViaMaskSize -> pcb_viaop_change_mask_size
+CopyVia -> pcb_viaop_copy
+MoveVia -> pcb_viaop_move
+DestroyVia -> pcb_viaop_destroy
+RemoveVia -> pcb_viaop_remove
+AddPolygonToBuffer -> pcb_polyop_add_to_buffer
+MovePolygonToBuffer -> pcb_polyop_move_to_buffer
+ChangePolygonClearSize -> pcb_polyop_change_clear_size
+ChangePolyClear -> pcb_polyop_change_clear
+InsertPointIntoPolygon -> pcb_polyop_insert_point
+MovePolygon -> pcb_polyop_move
+MovePolygonPoint -> pcb_polyop_move_point
+MovePolygonToLayerLowLevel -> pcb_polyop_move_to_layer_low
+MovePolygonToLayer -> pcb_polyop_move_to_layer
+DestroyPolygon -> pcb_polyop_destroy
+DestroyPolygonPoint -> pcb_polyop_destroy_point
+RemovePolygon_op -> pcb_polyop_remove
+RemovePolygonContour -> pcb_polyop_remove_counter
+RemovePolygonPoint -> pcb_polyop_remove_point
+CopyPolygon -> pcb_polyop_copy
+Rotate90Polygon -> pcb_polyop_rotate90
+ChgFlagPolygon -> pcb_polyop_change_flag
+AddRatToBuffer -> pcb_ratop_add_to_buffer
+MoveRatToBuffer -> pcb_ratop_move_to_buffer
+InsertPointIntoRat -> pcb_ratop_insert_point
+MoveRatToLayer -> pcb_ratop_move_to_layer
+DestroyRat -> pcb_ratop_destroy
+RemoveRat -> pcb_ratop_remove
+CopySubc -> pcb_subcop_copy
+MoveSubc -> pcb_subcop_move
+Rotate90Subc -> pcb_subcop_rotate90
+MoveSubcToBuffer -> pcb_subcop_move_to_buffer
+AddSubcToBuffer -> pcb_subcop_add_to_buffer
+ChangeSubcSize -> pcb_subcop_change_size
+ChangeSubcClearSize -> pcb_subcop_change_clear_size
+ChangeSubc1stSize -> pcb_subcop_change_1st_size
+ChangeSubc2ndSize -> pcb_subcop_change_2nd_size
+ChangeSubcNonetlist -> pcb_subcop_change_nonetlist
+ChangeSubcName -> pcb_subcop_change_name
+DestroySubc -> pcb_subcop_destroy
+RemoveSubc_op -> pcb_subcop_remove
+ClrSubcOctagon -> pcb_subcop_clear_octagon
+SetSubcOctagon -> pcb_subcop_set_octagon
+ChangeSubcOctagon -> pcb_subcop_change_octagon
+ClrSubcSquare -> pcb_subcop_clear_square
+SetSubcSquare -> pcb_subcop_set_square
+ChangeSubcSquare -> pcb_subcop_change_square
+ChgFlagSubc -> pcb_subcop_change_flag
+AddTextToBuffer -> pcb_textop_add_to_buffer
+MoveTextToBuffer -> pcb_textop_move_to_buffer
+ChangeTextSize -> pcb_textop_change_size
+ChangeTextName -> pcb_textop_change_name
+ChangeTextJoin -> pcb_textop_change_join
+SetTextJoin -> pcb_textop_set_join
+ClrTextJoin -> pcb_textop_clear_join
+CopyText -> pcb_textop_copy
+MoveText -> pcb_textop_move
+MoveTextToLayerLowLevel -> pcb_textop_move_to_layer_low
+MoveTextToLayer -> pcb_textop_move_to_layer
+DestroyText -> pcb_textop_destroy
+RemoveText_op -> pcb_textop_remove
+Rotate90Text -> pcb_textop_rotate90
+ChgFlagText -> pcb_textop_change_flag
+EraseArc -> pcb_arc_invalidate_erase
+DrawArc -> pcb_arc_invalidate_draw
+_draw_arc -> pcb_arc_draw_
+draw_arc -> pcb_arc_draw
+draw_line_callback -> pcb_line_draw_callback
+_draw_line -> pcb_line_draw_
+draw_line -> pcb_line_draw
+EraseLine -> pcb_line_invalidate_erase
+DrawLine -> pcb_line_invalidate_draw
+draw_poly_callback -> pcb_poly_draw_callback
+ErasePolygon -> pcb_poly_invalidate_erase
+DrawPolygon -> pcb_poly_invalidate_draw
+draw_rat_callback -> pcb_rat_draw_callback
+EraseRat -> pcb_rat_invalidate_erase
+DrawRat -> pcb_rat_invalidate_draw
+draw_text_callback -> pcb_text_draw_callback
+XORDrawText -> pcb_text_draw_xor
+DrawTextLowLevel -> pcb_text_draw
+EraseText -> pcb_text_invalidate_erase
+DrawText -> pcb_text_invalidate_draw
+draw_arc_callback -> pcb_arc_draw_callback
+draw_pad_name_callback -> pcb_pad_name_draw_callback
+pcb_draw_paste_auto -> pcb_pad_paste_draw
+ErasePadName -> pcb_pad_name_invalidate_erase
+DrawPadName -> pcb_pad_name_invalidate_draw
+draw_pad_callback -> pcb_pad_draw_callback
+clear_pad_callback -> pcb_pad_clear_callback
+draw_pad -> pcb_pad_draw
+ErasePad -> pcb_pad_invalidate_erase
+DrawPad -> pcb_pad_invalidate_draw
+draw_pin_name_callback -> pcb_pin_name_draw_callback
+EraseViaName -> pcb_via_name_invalidate_erase
+ErasePinName -> pcb_pin_name_invalidate_erase
+DrawViaName -> pcb_via_name_invalidate_draw
+DrawPinName -> pcb_pin_name_invalidate_draw
+draw_pin_callback -> pcb_pin_draw_callback
+clear_pin_callback -> pcb_pin_clear_callback
+draw_via_callback -> pcb_via_draw_callback
+draw_hole_callback -> pcb_hole_draw_callback
+draw_pin -> pcb_pin_draw
+EraseVia -> pcb_via_invalidate_erase
+ErasePin -> pcb_pin_invalidate_erase
+DrawVia -> pcb_via_invalidate_draw
+DrawPin -> pcb_pin_invalidate_draw
+draw_element_name_callback -> pcb_elem_name_draw_callback
+draw_element_mark_callback -> pcb_elem_mark_draw_callback
+draw_element_callback -> pcb_elem_draw_callback
+draw_element_pins_and_pads -> pcb_elem_pp_draw
+draw_element_package -> pcb_elem_package_draw
+draw_element_name -> pcb_elem_name_draw
+draw_element -> pcb_elem_draw
+EraseElementPinsAndPads -> pcb_elem_pp_invalidate_erase
+EraseElementName -> pcb_elem_name_invalidate_erase
+EraseElement -> pcb_elem_invalidate_erase
+DrawElementPinsAndPads -> pcb_elem_pp_invalidate_draw
+DrawElementPackage -> pcb_elem_package_invalidate_draw
+DrawElementName -> pcb_elem_name_invalidate_draw
+DrawElement -> pcb_elem_invalidate_draw
+pcb_polygon_t -> pcb_poly_t
+pcb_polygon_s -> pcb_poly_s
+pcb_add_polygon_on_layer -> pcb_add_poly_on_layer
+GetObjectBoundingBox -> pcb_obj_get_bbox
+PCB_TYPE_ -> PCB_OBJ_
+PCB_OBJ_NONE -> PCB_OBJ_VOID
+pcb_obj_tpye_t -> pcb_objtype_t
+PCB_TYPEMASK_ALL -> PCB_OBJ_ANY
+PCB_OBJ_RATLINE -> PCB_OBJ_RAT
+PCB_OBJ_SUBC_FLOATER -> PCB_OBJ_FLOATER
+PCB_TYPEMASK_ -> PCB_OBJ_CLASS_
+XORDrawAttachedLine -> pcb_xordraw_attached_line
+XORPolygon -> pcb_xordraw_poly
+XORPolygon_subc -> pcb_xordraw_poly_subc
+XORDrawAttachedArc -> pcb_xordraw_attached_arc
+XORDrawBuffer -> pcb_xordraw_buffer
+XORDrawMoveOrCopy -> pcb_xordraw_movecopy
+XORDrawInsertPointObject -> pcb_xordraw_insert_pt_obj
+XORDrawSubc -> pcb_xordraw_subc
+pcb_hid_find_action -> pcb_find_action
+pcb_hid_remove_actions -> pcb_remove_actions
+pcb_hid_remove_action -> pcb_remove_action
+pcb_hid_remove_actions_by_cookie -> pcb_remove_actions_by_cookie
+pcb_hid_action -> pcb_action
+pcb_hid_actionl -> pcb_actionl
+pcb_hid_actionv -> pcb_actionv
+pcb_hid_actionv_ -> pcb_actionv_
+pcb_hid_parse_command -> pcb_parse_command
+pcb_hid_parse_actions -> pcb_parse_actions
+pcb_hid_register_action -> pcb_register_action
+pcb_hid_register_actions -> pcb_register_actions
+pcb_hid_actions_uninit -> pcb_actions_uninit
+pcb_hid_actions_init -> pcb_actions_init
Index: tags/2.0.1/doc/developer/src/Makefile
===================================================================
--- tags/2.0.1/doc/developer/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/developer/src/Makefile	(revision 18980)
@@ -0,0 +1,2 @@
+../data1.png: data1.dot
+	dot -Tpng $^ > $@
Index: tags/2.0.1/doc/developer/src/data1.dot
===================================================================
--- tags/2.0.1/doc/developer/src/data1.dot	(nonexistent)
+++ tags/2.0.1/doc/developer/src/data1.dot	(revision 18980)
@@ -0,0 +1,79 @@
+digraph pcb_data {
+	ranksep=1.3
+	PCBType_misc [label="misc fields:\nID\nName\nFileName\ncolors\ndrc settings\ncursor coords\ngrid\nlayergroups\nroute styles\npadstack protos\n..."]
+	PCBType_flags [label="flags:\nChanged\nViaOn (vias drawn?)\n..."]
+	pcb_board_t -> PCBType_misc
+	pcb_board_t -> PCBType_flags
+	pcb_board_t -> pcb_data_t
+	pcb_board_t [shape=box]
+
+	pcb_subc_t [shape=box style=filled color="#aaffaa"]
+	pcb_rat_line_t [shape=box style=filled color="#aaffaa"]
+	pcb_pstk_t [shape=box style=filled color="#aaffaa"]
+	pcb_arc_t [shape=box style=filled color="#aaffaa"]
+	pcb_line_t [shape=box style=filled color="#aaffaa"]
+	pcb_text_t [shape=box style=filled color="#aaffaa"]
+	pcb_poly_t [shape=box style=filled color="#aaffaa"]
+
+	PCB [label="extern pcb_board_t PCB\nglobal variable\nholding the current\nboard" shape=diamond]
+	PCB -> pcb_board_t
+
+	Buffers [label="extern pcb_buffer_t Buffers[]\nglobal variable holding\nall paste buffers" shape=diamond]
+	Buffers -> pcb_buffer_t
+
+	BufferType_misc [label="misc fields:\nbounding box\noffset"]
+	pcb_buffer_t -> BufferType_misc
+	pcb_buffer_t -> pcb_data_t
+	pcb_buffer_t [shape=box]
+
+	DataType_listrt [label="layer-independent lists and rtrees"]
+	DataType_LayerN [label="LayerN: number of\nlayers in use"]
+	DataType_layers [label="an array of layers"]
+	DataType_misc [label="misc fields"]
+
+	pcb_data_t -> DataType_misc    [tailport=s]
+	pcb_data_t -> DataType_LayerN  [tailport=s]
+	pcb_data_t -> DataType_layers  [tailport=s]
+	pcb_data_t -> DataType_listrt  [tailport=s]
+	pcb_data_t -> DataType_rtrees  [tailport=s]
+	pcb_data_t [shape=box]
+
+	DataType_layers -> pcb_layer_t
+
+	DataType_listrt -> pcb_subc_t
+	DataType_listrt -> pcb_rat_line_t
+	DataType_listrt -> pcb_pstk_t
+
+	pcb_subc_t -> pcb_data_t [color=blue constraint=0 tailport=s]
+
+	LayerType_lines [label="list and rtree of lines"]
+	LayerType_arcs [label="list and rtree of arcs"]
+	LayerType_texts [label="list and rtree of text objects"]
+	LayerType_polygons [label="list and rtree of polygons"]
+	LayerType_misc [label="misc fields:\nflags\ncolors"]
+
+	LayerType_lines -> pcb_line_t
+	LayerType_arcs -> pcb_arc_t
+	LayerType_polygons -> pcb_poly_t
+	LayerType_texts -> pcb_text_t
+
+	pcb_layer_t -> LayerType_misc
+	pcb_layer_t -> LayerType_lines
+	pcb_layer_t -> LayerType_arcs
+	pcb_layer_t -> LayerType_texts
+	pcb_layer_t -> LayerType_polygons
+	pcb_layer_t [shape=box]
+
+	subgraph "cluster_1" {
+		label="LEGEND"
+		style=filled
+		bgcolor=grey
+		round [label="round:\nstruct field"]
+		struct [label="box:\nstruct" shape=box]
+		diamond [label="diamond:\nglobal variable" shape=diamond]
+		grn [label="green:\ndrawing primitive" shape=box style=filled color="#aaffaa"]
+
+	}
+
+	pcb_poly_t -> struct [style=invis]
+}
Index: tags/2.0.1/doc/devlog/20150820b_qf.html
===================================================================
--- tags/2.0.1/doc/devlog/20150820b_qf.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20150820b_qf.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+<h2> qf() </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=param_qf">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20150821a_parametric_requirements.html
===================================================================
--- tags/2.0.1/doc/devlog/20150821a_parametric_requirements.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20150821a_parametric_requirements.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+<h2> requirements for parametric footprint generation </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=param_when">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20150830a_fork_faq.html
===================================================================
--- tags/2.0.1/doc/devlog/20150830a_fork_faq.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20150830a_fork_faq.html	(revision 18980)
@@ -0,0 +1,13 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> Fork FAQ </H2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=fork_faq">
+the knowledge pool</a>.
+
Index: tags/2.0.1/doc/devlog/20150830b_back_ann.html
===================================================================
--- tags/2.0.1/doc/devlog/20150830b_back_ann.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20150830b_back_ann.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> back annotation </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=backann">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20150901a_back_ann.html
===================================================================
--- tags/2.0.1/doc/devlog/20150901a_back_ann.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20150901a_back_ann.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> back annotation </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=backann">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20151028_glib.html
===================================================================
--- tags/2.0.1/doc/devlog/20151028_glib.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20151028_glib.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> why glib is a bad idea </H2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=glib">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160101_cschem.html
===================================================================
--- tags/2.0.1/doc/devlog/20160101_cschem.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160101_cschem.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> cschem </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/projects/cschem/plans/20160101_cschem.html">
+the cschem repository</a>.
Index: tags/2.0.1/doc/devlog/20160313_unglib.html
===================================================================
--- tags/2.0.1/doc/devlog/20160313_unglib.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160313_unglib.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> unglib: glib removal </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=glib">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160314_valgrind_flex.html
===================================================================
--- tags/2.0.1/doc/devlog/20160314_valgrind_flex.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160314_valgrind_flex.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> "valgrinding" flex/bison parsers </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=valg_flex">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160716_sprint.html
===================================================================
--- tags/2.0.1/doc/devlog/20160716_sprint.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160716_sprint.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> Testing guide for the test sprint </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=testsprint">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160802.html
===================================================================
--- tags/2.0.1/doc/devlog/20160802.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160802.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> Languages and libs </H2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=langs">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160823_lhtpers.html
===================================================================
--- tags/2.0.1/doc/devlog/20160823_lhtpers.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160823_lhtpers.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> File format vs. VCS vs. script and manual editing </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=persistent">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20160826_virtusers.html
===================================================================
--- tags/2.0.1/doc/devlog/20160826_virtusers.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160826_virtusers.html	(revision 18980)
@@ -0,0 +1,8 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=virtuser">
+the knowledge pool</a>.
+
Index: tags/2.0.1/doc/devlog/20160921_gl.html
===================================================================
--- tags/2.0.1/doc/devlog/20160921_gl.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20160921_gl.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> what's missing for: opengl </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+(Updated in March 2017)
+Nothing. Use a sufficiently recent version and use the gtk2_gl hid.
Index: tags/2.0.1/doc/devlog/20170205_schimp.html
===================================================================
--- tags/2.0.1/doc/devlog/20170205_schimp.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170205_schimp.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> what's needed for schematics -&gt; pcb-rnd </H2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=schimp">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170212_ecosys.html
===================================================================
--- tags/2.0.1/doc/devlog/20170212_ecosys.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170212_ecosys.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> The FOS EDA ecosystem and pcb-rnd in it</H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=ecosys_prop">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170213_edacore1.html
===================================================================
--- tags/2.0.1/doc/devlog/20170213_edacore1.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170213_edacore1.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> "Edacore" minimum commons</H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=ecosys_fmt">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170213_edacore2.html
===================================================================
--- tags/2.0.1/doc/devlog/20170213_edacore2.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170213_edacore2.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> "Edacore" - extras </H2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=ecosys_edakrill">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170608_github.html
===================================================================
--- tags/2.0.1/doc/devlog/20170608_github.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170608_github.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<H2> How github promotes confusion </H2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=github">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170629_subc.html
===================================================================
--- tags/2.0.1/doc/devlog/20170629_subc.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170629_subc.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> subcircuit: how does this clean things up today </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=subc2">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170711_elem.html
===================================================================
--- tags/2.0.1/doc/devlog/20170711_elem.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170711_elem.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> element-resrtictions: why is it not a file format issue? </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=data2">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170712_native.html
===================================================================
--- tags/2.0.1/doc/devlog/20170712_native.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170712_native.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> Native file format vs. alien file formats </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=alien">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170712_sql.html
===================================================================
--- tags/2.0.1/doc/devlog/20170712_sql.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170712_sql.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> why not sql? </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=sql">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170809_undo.html
===================================================================
--- tags/2.0.1/doc/devlog/20170809_undo.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170809_undo.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> undo cleanup </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=undo">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170813_prim.html
===================================================================
--- tags/2.0.1/doc/devlog/20170813_prim.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170813_prim.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> drawing primitives roadmap </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=data1">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170815_footprint.html
===================================================================
--- tags/2.0.1/doc/devlog/20170815_footprint.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170815_footprint.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> Why is it called subcircuit and not footprint? </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=footprint">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170816_void.html
===================================================================
--- tags/2.0.1/doc/devlog/20170816_void.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170816_void.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> The Type/ptr1/ptr2/ptr3 construction and void * </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=void">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20170924_term.html
===================================================================
--- tags/2.0.1/doc/devlog/20170924_term.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20170924_term.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> Heavy vs. light subcircuit terminals </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=term_heavy">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20171004_plan_mark.html
===================================================================
--- tags/2.0.1/doc/devlog/20171004_plan_mark.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171004_plan_mark.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> How to clean up the mark </h2>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=mark_cleanup">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20171004_plan_menu.html
===================================================================
--- tags/2.0.1/doc/devlog/20171004_plan_menu.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171004_plan_menu.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> How to clean up the menu system </h2>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=menu_reorg">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20171019_floaters.html
===================================================================
--- tags/2.0.1/doc/devlog/20171019_floaters.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171019_floaters.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> subc refdes text: dyntext and floater </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=floater">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20171103_polyrat.html
===================================================================
--- tags/2.0.1/doc/devlog/20171103_polyrat.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171103_polyrat.html	(revision 18980)
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> unfixable polygon rat bug </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=polyratbug">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/20171104_padstack.html
===================================================================
--- tags/2.0.1/doc/devlog/20171104_padstack.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171104_padstack.html	(revision 18980)
@@ -0,0 +1,15 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> Pad stacks announcement </h2>
+<p><font size=-2>by Igor2</font></p>
+<p>
+
+<p>
+This article has been moved to the knowledge pool:
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=padstack">padstack</a>,
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=thermals">thermals</a>,
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=bbvia">bbvia</a>,
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=padstack_imp">padstack_imp</a>.
+
Index: tags/2.0.1/doc/devlog/20171117_chgstat.html
===================================================================
--- tags/2.0.1/doc/devlog/20171117_chgstat.html	(nonexistent)
+++ tags/2.0.1/doc/devlog/20171117_chgstat.html	(revision 18980)
@@ -0,0 +1,11 @@
+<html>
+<body>
+<h1> pcb-rnd <a href="http://repo.hu/projects/pcb-rnd/devlog">devlog</a> </h1>
+
+<h2> Code change statistics </h2>
+<p><font size=-2>by Igor2</font></p>
+
+<p>
+This article has been moved to
+<a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=chgstat">
+the knowledge pool</a>.
Index: tags/2.0.1/doc/devlog/README
===================================================================
--- tags/2.0.1/doc/devlog/README	(nonexistent)
+++ tags/2.0.1/doc/devlog/README	(revision 18980)
@@ -0,0 +1,7 @@
+The content of this obsolete directory has been moved into the pcb-rnd
+knowledge pool (accessible from http://pcb-rnd.repo.hu clicking on the pool
+in the menu)
+
+This directory is kept to reduce the number of broken links, for some of
+the articles that got external links pointing to them.
+
Index: tags/2.0.1/doc/doc.html
===================================================================
--- tags/2.0.1/doc/doc.html	(nonexistent)
+++ tags/2.0.1/doc/doc.html	(revision 18980)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - news </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<br>
+<!--content-->
+<h1> pcb-rnd documentation </h1>
+
+<ul>
+	<li> <a href="user/index.html"> user manual (work in progress) </a>
+	<li> <a href="developer/"> developer's corner </a>
+	<li> <a href="http://repo.hu/projects/pcb-rnd-aux/pool">pcbrnd knowledge pool</a>
+</ul>
+
+</body>
+</html>
Index: tags/2.0.1/doc/help.html
===================================================================
--- tags/2.0.1/doc/help.html	(nonexistent)
+++ tags/2.0.1/doc/help.html	(revision 18980)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - help wanted </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<h1> pcb-rnd - help wanted </h1>
+The project is looking for volunteers for the features listed below. If
+you want to contribute, you will need to have an svn client and an email
+client. Furthermore an IRC client is strongly recommended. 
+<p>
+You will become part of the team and get svn commit right immediately
+when you start working.
+<p>
+<b>Don't have much free time?</b> Don't worry: the tasks below are split up in
+very small (1..2 hours) chunks. Coordination is granted, the administrative
+overhead is almost zero - you can focus on the task, and finish it whenever
+you have a free hour.
+<p>
+Worrying about your <b>contribution to go in /dev/null?</b> Don't: pcb-rnd
+has very short loops; you start contributing and get immediate feedback. Your
+work is part of the official thing immediately and revised and accepted (or
+rarely refused) within hours or at most days.
+<b>There are no bitrotting branches.</b>
+<p>
+You are not confident enough with your skills? pcb-rnd is an optimal
+project for learning. If you start contributing, you get support. There
+are small and simple entry level tasks. Most of the tasks don't require
+any programming skills.
+<p>
+Sign up: mail to pcb-rnd (at) igor2.repo.hu .
+If you want to work on a feature not listed below, feel free to drop me
+a mail.
+<p>
+<table border=1 cellspacing=0 cellpadding=0>
+<tr><th> ID        <th> skill required <th> description
+<tr><td> validation<td> user           <td> reference output valudation (gerber and other formats)
+<tr><td> tutorial  <td> user           <td> tutorial projects
+<tr><td> windows   <td> user           <td> generic testing on windows
+<tr><td> mtest     <td> user           <td> systematic manual testing
+<tr><td> doc       <td> user, html     <td> write sections of user documentation
+<tr><td> logo      <td> designer       <td> the official pcb-rnd logo
+<tr><td> banner    <td> designer       <td> pcb-rnd banner for the homepage
+<tr><td> icons     <td> designer       <td> icons, other graphical elements for the GTK HID
+<tr><td> css       <td> designer       <td> CSS for the homepage (only design/style, no content).
+<tr><td> atest     <td> C/beginner     <td> program automated test cases
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/index.html
===================================================================
--- tags/2.0.1/doc/index.html	(nonexistent)
+++ tags/2.0.1/doc/index.html	(revision 18980)
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - main </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<br>
+<!--content-->
+<table border=0 cellpadding=10> <tr>
+<td valign=top bgcolor="#f2f2f2">
+	<h2> Summary </h2>
+	<table border=0 cellpadding=20>
+	<tr><th align=right valign=top bgcolor="#ccccff"> 
+		<table border=0 width="100%" cellpadding=0 cellspacing=0><tr><td align=left><img src="resources/logo128.png" alt="[pcb-rnd logo]"><th align=right>pcb-rnd</table>
+		<td bgcolor="#ddddff">
+		    <b>is a <a href="license.html"> free/open source</a>, flexible, modular Printed Circuit Board editor</b>
+		<p>is <a href="datasheet.html"> feature-rich </a> and <a href="user/09_appendix/bridges.svg">compatible</a>
+		<p>has a long <a href="user/01_intro/history.html">history</a>, fast paced development, and big plans.
+
+	<tr><th align=right valign=top bgcolor="#ccccff"> Version Control              <td bgcolor="#ddddff"> <a href="http://igor2.repo.hu/cgi-bin/minisvn.cgi?cmd=browse&amp;repo=pcb-rnd&amp;path=trunk"> svn://repo.hu/pcb-rnd/trunk </a> <a href="mirrors.html">(mirrors)</a>
+	<tr><th align=right valign=top bgcolor="#ccccff"> Download                     <td bgcolor="#ddddff"> <a href="releases/"> source releases </a>
+	<tr><th align=right valign=top bgcolor="#ccccff"> Comments, feedback, patches  <td bgcolor="#ddddff"> <a href="irc.html"> live chat with the developer </a><br>or mail to: pcb-rnd (at) igor2.repo.hu<br>Mailing list: pcb-rnd (at) list.repo.hu (send a mail with subject: subscribe) <a href="http://repo.hu/cgi-bin/web_mail_arch.cgi?mlist=pcb-rnd&cmd=flat&id=-15"> (archives) </a>
+	<tr><th align=right valign=top bgcolor="#ccccff"> Contribution and support     <td bgcolor="#ddddff">
+		    How to <a href="contrib.html"> join or contribute </a>
+		<br>We are looking for <a href="help.html"> help</a> and <a href="https://sponsor.pcbrnd.repo.hu">sponsoration/donation</a>.
+		<br>Do you have a <a href="myfeature.html">feature request</a>?
+
+	<tr><th align=right valign=top bgcolor="#ccccff"> Key features <td bgcolor="#ddddff">
+		     editor for multilayer Printed Circuit Boards
+		<br> scriptable in 10+ different scripting languages
+		<br> <a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=pcblib">parametric footprint</a> generation, <a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=fp_wget"> web footprints </a>
+		<br> <a href="developer/mods3/">modular code</a> with a flexible plugin system
+		<br> fits well in a UNIXy workflow
+		<br> supports CLI and server applications
+		<br> active development, frequent releases
+		<br> friendly and efficient developer and user community
+		<br> <a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline"> predictable development cycles </a>
+		<br> compatible with <b>KiCad</b> and <b>gEDA/PCB</b>
+
+	<tr><th align=right valign=top bgcolor="#ccccff"> Supported platforms <td bgcolor="#ddddff">
+		<table border=0 width="100%">
+		<tr><td>
+			     Linux desktop (various distributions, from source)
+			<br> official packages in Debian and Ubuntu
+			<br> <a href="https://aur.archlinux.org/packages/pcb-rnd-svn/"> Arch Linux (user package) </a>
+			<br> <a href="mac.txt"> Mac OS X </a>
+<!--			<br> <a href="windows.txt"> Windows </a> -->
+			<br> <a href="UNIX.txt"> IRIX 5.3 </a>
+			<br> OpenBSD
+			<br> (Likely: any 90's UNIX system with motif)
+			<br> Screen resolution as small as 800x600
+			<br> GUI options: motif/lesstif, gtk-gdk, gtk-gl
+		<td width="10px">
+		<td valign="bottom" align="right">
+			<img src="resources/screenshot.jpg" alt="screenshot of pcb-rnd running on Debian GNU/Linux">
+		</table>
+</table>
+
+<!-- spacer -->
+	<td width=0>
+
+<!-- rnd -->
+	<td width="20%" bgcolor="#f2f2f2">
+	<h2> What is -rnd? </h2>
+	<br>
+
+	<table border=0 cellspacing=10 cellpadding=0  bgcolor="#ccffcc">
+	<tr>
+	<td><font size="+2"><b>R</b>espo<b>N</b>sive <b>D</b>evelopers</font>
+	<td> Developers try to respond on user needs, adding features that are actually needed by current users.
+	</table>
+
+	<p>
+
+	<table border=0 cellspacing=10 cellpadding=0  bgcolor="#ccffcc">
+	<tr><td>
+	<font size="+2"><b>R</b>esponse <b>N</b>ot <b>D</b>elayed</font>
+	<td> Bugreports, user requests and patches submitted are answered ASAP. There are no patches bitrotting for months. There are no forgotten bugreports.
+	</table>
+
+	<p>
+
+	<table border=0 cellspacing=10 cellpadding=0  bgcolor="#ccffcc" width=400>
+	<tr>
+	<td><font size="+2"><b>R</b>esearch <br><b>&amp;</b> <br><b>D</b>evelopment</font>
+	<br>
+	<br>
+	<b>R</b>&aacute;z&oacute;s, <br><b>N</b>eh&eacute;z <br><b>D</b>&ouml;nt&eacute;sek <br><small>(Brave, hard decisions)</small>
+	<td> There is a constant experimentation with new features and directions. We are willing to try strange/unusual ideas without risking the stability of the daily workflow.
+	</table>
+
+	<p>
+
+	<table border=0 cellspacing=10 cellpadding=0  bgcolor="#ccffcc">
+	<tr>
+	<td><font size="+2"><b>R</b>ants <br><b>N</b>ow <br><b>D</b>issipating</font>
+	<td> Instead of talking and ranting a lot about what could work better, we just sit down and make it work better.
+	</table>
+
+	<p>
+
+	<table border=0 cellspacing=10 cellpadding=0  bgcolor="#ccffcc">
+	<tr>
+	<td><font size="+2"><b>R</b>ather <br><b>N</b>icely <br><b>D</b>ecentralized</font>
+	<td> <a href="developer/mods3/"> Slim, generic core</a>; most of the code organized in replacable plugins. Most plugins depend only on the core.
+	</table>
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/irc.html
===================================================================
--- tags/2.0.1/doc/irc.html	(nonexistent)
+++ tags/2.0.1/doc/irc.html	(revision 18980)
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - IRC </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<H1> Live support via IRC (chat) </H1>
+<br>Irc <b>server</b>: repo.hu &nbsp; &nbsp; &nbsp; <b>Port</b>: 6667 &nbsp; &nbsp; &nbsp; <b>Channel</b>: #pcb-rnd
+<br> &nbsp;
+<p>I'm normally online as Igor2 between 5:00 CET and 19:00 CET; on Sunday there's an AFK-window between 11:00 CET and 16:00 CET. If I don't answer in a few minutes I'm probably away doing something, please be patient; say hi before you type your long question so you see if I'm available.
+<hr>
+<p>
+Below is an iframe of <a href="https://kiwiirc.com/client/repo.hu/?nick=pcbuser|?#pcb-rnd">
+kiwiirc </a> irc client configured with the above settings. If it doesn't
+work, please visit their <a href="https://kiwiirc.com"> page </a> and
+try to manually configure it, it's just 4 fields.
+<p>
+Using the web client: you should change your nickname (or using the
+<i>/nick myname</i> command if you are already connected); there's no password
+or registration or channel key or ssl of any form. Your real IP won't be
+shown on the IRC network (check kiwiirc's page about their privacy
+policy).
+<p>
+Connecting with the web client may take some time, give it a minute.
+<hr>
+
+<iframe src="https://kiwiirc.com/client/repo.hu/?nick=pcbuser|?#pcb-rnd" style="border:0; width:100%; height:450px;"></iframe>
+
+</body>
+</html>
Index: tags/2.0.1/doc/keys.html
===================================================================
--- tags/2.0.1/doc/keys.html	(nonexistent)
+++ tags/2.0.1/doc/keys.html	(revision 18980)
@@ -0,0 +1,815 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- This file is generated by util/keylist.sh. DO NOT EDIT. -->
+<head>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<title> Key to action bindings </title>
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+<h1> Key to action bindings </h1>
+<table border=1 cellspacing=0>
+<tr><th> key <th>pcb-menu-default.lht
+<tr bgcolor="#DDFFFF">
+	<th align=left>+
+	<td> <I>Zoom In 20%</I><br>Zoom(-1.2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>,
+	<td> <I>Cycle object being dragged</I><br>CycleDrag() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>-
+	<td> <I>Zoom Out 20%</I><br>Zoom(+1.2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>.
+	<td> <I>'All-direction' lines</I><br>conf(toggle, editor/all_direction_lines, design)
+<tr bgcolor="#DDFFFF">
+	<th align=left>0
+	<td> <I>Select Layer 10</I><br>SelectLayer(10) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>0-alt
+	<td> <I>Select Layer 20</I><br>SelectLayer(20) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>0-alt-ctrl
+	<td> <I>Toggle Layer 20</I><br>ToggleView(20) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>0-ctrl
+	<td> <I>Toggle Layer 10</I><br>ToggleView(10) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>1
+	<td> <I>Select Layer 1</I><br>SelectLayer(1) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>1-alt
+	<td> <I>Select Layer 11</I><br>SelectLayer(11) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>1-alt-ctrl
+	<td> <I>Toggle Layer 11</I><br>ToggleView(11) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>1-ctrl
+	<td> <I>Toggle Layer 1</I><br>ToggleView(1) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>2
+	<td> <I>Select Layer 2</I><br>SelectLayer(2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>2-alt
+	<td> <I>Select Layer 12</I><br>SelectLayer(12) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>2-alt-ctrl
+	<td> <I>Toggle Layer 12</I><br>ToggleView(12) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>2-ctrl
+	<td> <I>Toggle Layer 2</I><br>ToggleView(2) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>3
+	<td> <I>Select Layer 3</I><br>SelectLayer(3) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>3-alt
+	<td> <I>Select Layer 13</I><br>SelectLayer(13) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>3-alt-ctrl
+	<td> <I>Toggle Layer 13</I><br>ToggleView(13) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>3-ctrl
+	<td> <I>Toggle Layer 3</I><br>ToggleView(3) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>4
+	<td> <I>Select Layer 4</I><br>SelectLayer(4) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>4-alt
+	<td> <I>Select Layer 14</I><br>SelectLayer(14) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>4-alt-ctrl
+	<td> <I>Toggle Layer 14</I><br>ToggleView(14) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>4-ctrl
+	<td> <I>Toggle Layer 4</I><br>ToggleView(4) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>5
+	<td> <I>Select Layer 5</I><br>SelectLayer(5) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>5-alt
+	<td> <I>Select Layer 15</I><br>SelectLayer(15) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>5-alt-ctrl
+	<td> <I>Toggle Layer 15</I><br>ToggleView(15) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>5-ctrl
+	<td> <I>Toggle Layer 5</I><br>ToggleView(5) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>6
+	<td> <I>Select Layer 6</I><br>SelectLayer(6) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>6-alt
+	<td> <I>Select Layer 16</I><br>SelectLayer(16) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>6-alt-ctrl
+	<td> <I>Toggle Layer 16</I><br>ToggleView(16) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>6-ctrl
+	<td> <I>Toggle Layer 6</I><br>ToggleView(6) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>7
+	<td> <I>Select Layer 7</I><br>SelectLayer(7) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>7-alt
+	<td> <I>Select Layer 17</I><br>SelectLayer(17) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>7-alt-ctrl
+	<td> <I>Toggle Layer 17</I><br>ToggleView(17) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>7-ctrl
+	<td> <I>Toggle Layer 7</I><br>ToggleView(7) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>8
+	<td> <I>Select Layer 8</I><br>SelectLayer(8) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>8-alt
+	<td> <I>Select Layer 18</I><br>SelectLayer(18) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>8-alt-ctrl
+	<td> <I>Toggle Layer 18</I><br>ToggleView(18) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>8-ctrl
+	<td> <I>Toggle Layer 8</I><br>ToggleView(8) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>9
+	<td> <I>Select Layer 9</I><br>SelectLayer(9) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>9-alt
+	<td> <I>Select Layer 19</I><br>SelectLayer(19) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>9-alt-ctrl
+	<td> <I>Toggle Layer 19</I><br>ToggleView(19) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>9-ctrl
+	<td> <I>Toggle Layer 9</I><br>ToggleView(9) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>:
+	<td> <I>Command Entry</I><br>Command() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>[
+	<td> <I>Previous grid</I><br>Grid(down) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>\
+	<td> <I>Full screen</I><br>fullscreen(toggle) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>/
+	<td> <I>Cycle line clip/refraction</I><br>Display(CycleClip) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>]
+	<td> <I>Next grid</I><br>Grid(up) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;a
+	<td> <I>Start routing an arc</I><br>Mode(Save); Mode(Arc); Mode(Notify)
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;b<br>&nbsp;&nbsp;f<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Replace footprint</I><br>ReplaceFootprint() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;b<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Swap nets on two selected pins</I><br>net(swap) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;b<br>&nbsp;&nbsp;x
+	<td> <I>netlist patch for back annotation</I><br>SavePatch() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;d<br>&nbsp;&nbsp;a<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Disperse all subcircuits</I><br>DisperseElements(All) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;d<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Disperse selected subcircuits</I><br>DisperseElements(Selected) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;l
+	<td> <I>Start routing a line</I><br>Mode(Save); Mode(Line); Mode(Notify)
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;m
+	<td> <I>Place mark</I><br>MarkCrosshair() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;a<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Auto-Optimize</I><br>djopt(auto) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;d<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Debumpify</I><br>djopt(debumpify) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;m<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Miter</I><br>djopt(miter) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;n<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Vianudge</I><br>djopt(vianudge) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;o<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Ortho pull</I><br>djopt(orthopull) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;p<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Puller</I><br>Puller() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Simple optimization</I><br>djopt(simple) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;t<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Viatrim</I><br>djopt(viatrim) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;o<br>&nbsp;&nbsp;u<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Unjaggy</I><br>djopt(unjaggy) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;p<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Auto-place selected subcircuits</I><br>AutoPlaceSelected() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;r<br>&nbsp;&nbsp;a<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Auto-route all rats</I><br>AutoRoute(AllRats) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;r<br>&nbsp;&nbsp;r<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Rip up all auto-routed tracks</I><br>RipUp(All) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;r<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Auto-route selected rats</I><br>AutoRoute(SelectedRats) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;r<br>&nbsp;&nbsp;t<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Rip up selected auto-routed tracks</I><br>RipUp(Selected) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;v
+	<td> <I>Place via</I><br>Mode(Save); Mode(Via); Mode(Notify); Mode(Restore)
+<tr bgcolor="#DDFFFF">
+	<th align=left>a<br>&nbsp;w
+	<td> <I>Place mark</I><br>MarkCrosshair() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>a<br>&nbsp;x<br>&nbsp;&nbsp;
+	<td> <I>Design Rule Checker</I><br>DRC() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;1<br>&nbsp;&nbsp;
+	<td> <I>Select Buffer #1</I><br>PasteBuffer(1)
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;2<br>&nbsp;&nbsp;
+	<td> <I>Select Buffer #2</I><br>PasteBuffer(2)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;3<br>&nbsp;&nbsp;
+	<td> <I>Select Buffer #3</I><br>PasteBuffer(3)
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;4<br>&nbsp;&nbsp;
+	<td> <I>Select Buffer #4</I><br>PasteBuffer(4)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;5<br>&nbsp;&nbsp;
+	<td> <I>Select scratchpad</I><br>PasteBuffer(5)
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;b<br>&nbsp;&nbsp;
+	<td> <I>Layer bindings...</I><br>LayerBinding(buffer) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;c<br>&nbsp;&nbsp;c<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Clear buffer</I><br>PasteBuffer(Clear) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;c<br>&nbsp;&nbsp;p
+	<td> <I>Convert buffer to padstack</I><br>PadstackConvert(buffer); Mode(PasteBuffer)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;c<br>&nbsp;&nbsp;s
+	<td> <I>Convert buffer to subcircuit</I><br>PasteBuffer(ConvertSubc) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;m<br>&nbsp;&nbsp;l
+	<td> <I>Mirror buffer (left/right)</I><br>Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Mirror); PasteBuffer(Rotate,3)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;m<br>&nbsp;&nbsp;u
+	<td> <I>Mirror buffer (up/down)</I><br>Mode(PasteBuffer); PasteBuffer(Mirror)
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;n
+	<td> <I>Normalize</I><br>Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Normalize)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;r<br>&nbsp;&nbsp;a
+	<td> <I>Arbitrarily Rotate Buffer</I><br>Mode(PasteBuffer); FreeRotateBuffer()
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;r<br>&nbsp;&nbsp;l
+	<td> <I>Rotate buffer 90 deg CCW (left)</I><br>Mode(PasteBuffer); PasteBuffer(Rotate,1)
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;r<br>&nbsp;&nbsp;r
+	<td> <I>Rotate buffer 90 deg CW (right)</I><br>Mode(PasteBuffer); PasteBuffer(Rotate,3)
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;s<br>&nbsp;&nbsp;b
+	<td> <I>Break buffer subcircuits to pieces</I><br>PasteBuffer(Restore) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>b<br>&nbsp;s<br>&nbsp;&nbsp;p
+	<td> <I>Break buffer padstacks to pieces</I><br>PadstackBreakup(buffer) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>b<br>&nbsp;s<br>&nbsp;&nbsp;s
+	<td> <I>Save buffer subcircuits to file</I><br>Save(PasteBuffer) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>c-ctrl<br>&nbsp;
+	<td> <I>Copy selection to buffer</I><br>GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer)
+<tr bgcolor="#FFFFFF">
+	<th align=left>c<br>&nbsp;c<br>&nbsp;&nbsp;
+	<td> <I>Clear/reset lookup</I><br>Connection(Reset); Display(Redraw)
+<tr bgcolor="#DDFFFF">
+	<th align=left>c<br>&nbsp;d<br>&nbsp;&nbsp;
+	<td> <I>Del/Remove Connected</I><br>Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)
+<tr bgcolor="#FFFFFF">
+	<th align=left>c<br>&nbsp;e<br>&nbsp;&nbsp;
+	<td> <I>Erase rats nest</I><br>DeleteRats(AllRats) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>c<br>&nbsp;f<br>&nbsp;&nbsp;
+	<td> <I>Find Connections</I><br>Connection(Reset); Connection(Find)
+<tr bgcolor="#FFFFFF">
+	<th align=left>c<br>&nbsp;r<br>&nbsp;&nbsp;
+	<td> <I>Optimize rats nest</I><br>Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(AllRats); Atomic(Block)
+<tr bgcolor="#DDFFFF">
+	<th align=left>c<br>&nbsp;s<br>&nbsp;&nbsp;
+	<td> <I>Select shortest rat</I><br>AddRats(Close) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>delete
+	<td> <I>Remove object</I><br>Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)
+<tr bgcolor="#DDFFFF">
+	<th align=left>down
+	<td> <I>Step Down</I><br>Cursor(Warp,0,-1,grid) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>down-shift
+	<td> <I>Step +Down</I><br>Cursor(Pan,0,-50,view) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;c
+	<td> <I>Copy selection to buffer</I><br>GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer)
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;d
+	<td> <I>Remove object</I><br>Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;f
+	<td> <I>Object flags...</I><br>FlagEdit() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;c
+	<td> <I>Clearance +2 mil</I><br>ChangeClearSize(Object,+2,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;c-shift
+	<td> <I>Clearance -2 mil</I><br>ChangeClearSize(Object,-2,mil) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;d
+	<td> <I>ChangeDrill +5 mil</I><br>ChangeDrillSize(Object,+5,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;d-shift
+	<td> <I>ChangeDrill -5 mil</I><br>ChangeDrillSize(Object,-5,mil) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;s
+	<td> <I>ChangeSize +5 mil</I><br>ChangeSize(Object,+5,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;s-shift
+	<td> <I>ChangeSize -5 mil</I><br>ChangeSize(Object,-5,mil) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;g<br>&nbsp;&nbsp;y
+	<td> <I>ChangeSizes to Route style</I><br>ChangeSizes(Object,style,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;i
+	<td> <I>Flip Object</I><br>Flip(Object) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;j
+	<td> <I>ChangeJoin Object</I><br>ChangeJoin(Object) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;l
+	<td> <I>Move to current layer</I><br>MoveToCurrentLayer(Object) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;o
+	<td> <I>Edit name of/Change font on layout</I><br>FontSel(Object) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;p
+	<td> <I>Object Properties...</I><br>PropEdit() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;s<br>&nbsp;&nbsp;b
+	<td> <I>Layer bindings...</I><br>LayerBinding() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;s<br>&nbsp;&nbsp;e
+	<td> <I>External editor...</I><br>GetXY(Click on the subcircuit to edit); extedit(object)
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;s<br>&nbsp;&nbsp;r
+	<td> <I>Refdes</I><br>ChangeName(Subc) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;s<br>&nbsp;&nbsp;s
+	<td> <I>Set Same Style</I><br>SetSame() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;t
+	<td> <I>text or name</I><br>ChangeName(Object) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;v
+	<td> <I>Paste buffer to layout</I><br>Mode(PasteBuffer) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>e<br>&nbsp;x
+	<td> <I>Cut selection to buffer</I><br>GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Unselect(All); Mode(PasteBuffer)
+<tr bgcolor="#DDFFFF">
+	<th align=left>e<br>&nbsp;y<br>&nbsp;&nbsp;
+	<td> <I>Cycle object being dragged</I><br>CycleDrag() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>enter
+	<td> <I>Click</I><br>Mode(Notify); Mode(Release)
+<tr bgcolor="#DDFFFF">
+	<th align=left>escape
+	<td> <I>Cancel</I><br>Mode(Escape) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>f1
+	<td> <I>Via</I><br>Mode(Via)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f10
+	<td> <I>Thermal</I><br>Mode(Thermal)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f11
+	<td> <I>Arrow</I><br>Mode(Arrow)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f12
+	<td> <I>Lock</I><br>Mode(Lock)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f2
+	<td> <I>Line</I><br>Mode(Line)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f3
+	<td> <I>Arc</I><br>Mode(Arc)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f4
+	<td> <I>Text</I><br>Mode(Text)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f5
+	<td> <I>Rectangle</I><br>Mode(Rectangle)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f6
+	<td> <I>Polygon</I><br>Mode(Polygon)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f7
+	<td> <I>Buffer</I><br>Mode(PasteBuffer)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f7-shift
+	<td> <I>Rotate buffer 90 deg CCW (left)</I><br>Mode(PasteBuffer); PasteBuffer(Rotate,1)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f8
+	<td> <I>Del/Remove</I><br>Mode(Remove)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f9
+	<td> <I>Rotate</I><br>Mode(Rotate)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;a
+	<td> <I>Save Layout As...</I><br>Save(LayoutAs)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f<br>&nbsp;c<br>&nbsp;&nbsp;p<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Manage plugins...</I><br>ManagePlugins() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;e
+	<td> <I>Export layout...</I><br>ExportGUI()
+<tr bgcolor="#FFFFFF">
+	<th align=left>f<br>&nbsp;l
+	<td> <I>Load layout...</I><br>Load(Layout)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;n
+	<td> <I>Start New Layout</I><br>New() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>f<br>&nbsp;o
+	<td> <I>Load layout...</I><br>Load(Layout)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;p
+	<td> <I>Print layout...</I><br>Print()
+<tr bgcolor="#FFFFFF">
+	<th align=left>f<br>&nbsp;q
+	<td> <I>Quit Program</I><br>Quit() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;r
+	<td> <I>Revert</I><br>Load(Revert,none)
+<tr bgcolor="#FFFFFF">
+	<th align=left>f<br>&nbsp;s
+	<td> <I>Save Layout</I><br>Save(Layout)
+<tr bgcolor="#DDFFFF">
+	<th align=left>f<br>&nbsp;x<br>&nbsp;&nbsp;p
+	<td> <I>netlist patch for back annotation</I><br>SavePatch() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>g<br>&nbsp;b
+	<td> <I>Previous grid</I><br>Grid(down) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>g<br>&nbsp;d
+	<td> <I>Grid *2</I><br>SetValue(Grid,*2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>g<br>&nbsp;f
+	<td> <I>Next grid</I><br>Grid(up) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>g<br>&nbsp;h
+	<td> <I>Grid /2</I><br>SetValue(Grid,/2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>g<br>&nbsp;i
+	<td> <I>mil</I><br>SetUnits(mil)
+<tr bgcolor="#DDFFFF">
+	<th align=left>g<br>&nbsp;l
+	<td> <I>Enable local grid</I><br>conf(toggle, plugins/hid_gtk/local_grid/enable, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>g<br>&nbsp;m
+	<td> <I>mm</I><br>SetUnits(mm)
+<tr bgcolor="#DDFFFF">
+	<th align=left>g<br>&nbsp;r
+	<td> <I>Realign grid</I><br> GetXY(Click to set the grid origin);  Display(ToggleGrid) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>g<br>&nbsp;v
+	<td> <I>Enable visible grid</I><br>conf(toggle, editor/draw_grid, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>i<br>&nbsp;a
+	<td> <I>About...</I><br>About() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>i<br>&nbsp;c<br>&nbsp;&nbsp;c
+	<td> <I>Calibrate Printer...</I><br>PrintCalibrate() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>i<br>&nbsp;c<br>&nbsp;&nbsp;p
+	<td> <I>Preferences...</I><br>DoWindows(Preferences)
+<tr bgcolor="#FFFFFF">
+	<th align=left>i<br>&nbsp;c<br>&nbsp;&nbsp;r
+	<td> <I>Re-scan the footprint library</I><br>fp_rehash() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>i<br>&nbsp;d
+	<td> <I>Generate drill summary</I><br>Report(DrillReport) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>i<br>&nbsp;f
+	<td> <I>Report found padstacks</I><br>Report(FoundPins) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>i<br>&nbsp;r
+	<td> <I>Generate object report</I><br>ReportObject() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>insert
+	<td> <I>Insert Point</I><br>Mode(InsertPoint)
+<tr bgcolor="#DDFFFF">
+	<th align=left>left
+	<td> <I>Step Left</I><br>Cursor(Warp,-1,0,grid) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>left-shift
+	<td> <I>Step +Left</I><br>Cursor(Pan,-50,0,view) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;c<br>&nbsp;&nbsp;c
+	<td> <I>Crosshair shows DRC clearance</I><br>conf(toggle, editor/show_drc, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;c<br>&nbsp;&nbsp;o
+	<td> <I>Orthogonal moves</I><br>conf(toggle, editor/orthogonal_moves, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;c<br>&nbsp;&nbsp;p
+	<td> <I>Crosshair snaps to padstacks</I><br>conf(toggle, editor/snap_pin, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;c<br>&nbsp;&nbsp;s
+	<td> <I>Crosshair snaps to off-grid points on lines</I><br>conf(toggle, editor/snap_offgrid_line, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;a
+	<td> <I>Show autorouter trials</I><br>conf(toggle, editor/live_routing, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;c
+	<td> <I>Check polygons</I><br>conf(toggle, editor/check_planes, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;h
+	<td> <I>Highlighting on line, arc points</I><br>conf(toggle, editor/highlight_on_point, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;p
+	<td> <I>Thin draw poly</I><br>conf(toggle, editor/thin_draw_poly, design)
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;t
+	<td> <I>Thin draw</I><br>conf(toggle, editor/thin_draw, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;d<br>&nbsp;&nbsp;w
+	<td> <I>Wireframe draw</I><br>conf(toggle, editor/wireframe_draw, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;f<br>&nbsp;&nbsp;h
+	<td> <I>Hide floaters</I><br>conf(toggle, editor/hide_names, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;f<br>&nbsp;&nbsp;l
+	<td> <I>Lock floaters</I><br>conf(toggle, editor/lock_names, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;f<br>&nbsp;&nbsp;o
+	<td> <I>Only floaters</I><br>conf(toggle, editor/only_names, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;k<br>&nbsp;&nbsp;s
+	<td> <I>Loose subcircuits (no subc lock)</I><br>subc(loose, toggle)
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;+
+	<td> <I>Line Tool size +5 mil</I><br>SetValue(LineSize,+5,mil) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;-
+	<td> <I>Line Tool size -5 mil</I><br>SetValue(LineSize,-5,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;a
+	<td> <I>'All-direction' lines</I><br>conf(toggle, editor/all_direction_lines, design)
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;c
+	<td> <I>New lines, arcs clear polygons</I><br>conf(toggle, editor/clear_line, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;d
+	<td> <I>Auto enforce DRC clearance</I><br>conf(toggle, editor/auto_drc, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;l<br>&nbsp;&nbsp;f
+	<td> <I>Cycle line clip/refraction</I><br>Display(CycleClip) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;p<br>&nbsp;&nbsp;c
+	<td> <I>New polygons clear polygons</I><br>conf(toggle, editor/clear_polypoly, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;p<br>&nbsp;&nbsp;f
+	<td> <I>New polygons are full ones</I><br>conf(toggle, editor/full_poly, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;r<br>&nbsp;&nbsp;m
+	<td> <I>Rubber band keeps middle line dir</I><br>conf(toggle, editor/rubber_band_keep_midlinedir, design) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;r<br>&nbsp;&nbsp;r
+	<td> <I>Rubber band mode</I><br>conf(toggle, editor/rubber_band_mode, design) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>m<br>&nbsp;t<br>&nbsp;&nbsp;+
+	<td> <I>Text Tool scale +10 mil</I><br>SetValue(TextScale,+10,mil) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>m<br>&nbsp;t<br>&nbsp;&nbsp;-
+	<td> <I>Text Tool scale -10 mil</I><br>SetValue(TextScale,-10,mil) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>n-ctrl
+	<td> <I>Start New Layout</I><br>New() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>q-ctrl
+	<td> <I>Quit Program</I><br>Quit() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>r<br>&nbsp;r<br>&nbsp;&nbsp;+
+	<td> <I>Route radius +0.5</I><br>conf(delta, editor/route_radius, +0.5, design)
+<tr bgcolor="#FFFFFF">
+	<th align=left>r<br>&nbsp;r<br>&nbsp;&nbsp;-
+	<td> <I>Route radius -0.5</I><br>conf(delta, editor/route_radius, -0.5, design)
+<tr bgcolor="#DDFFFF">
+	<th align=left>r<br>&nbsp;r<br>&nbsp;&nbsp;m
+	<td> <I>Route radius -0.5</I><br>conf(delta, editor/route_radius, -0.5, design)
+<tr bgcolor="#FFFFFF">
+	<th align=left>r<br>&nbsp;r<br>&nbsp;&nbsp;p
+	<td> <I>Route radius +0.5</I><br>conf(delta, editor/route_radius, +0.5, design)
+<tr bgcolor="#DDFFFF">
+	<th align=left>right
+	<td> <I>Step Right</I><br>Cursor(Warp,1,0,grid) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>right-shift
+	<td> <I>Step +Right</I><br>Cursor(Pan,50,0,view) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>s-ctrl
+	<td> <I>Save Layout</I><br>Save(Layout)
+<tr bgcolor="#FFFFFF">
+	<th align=left>s-ctrl-shift
+	<td> <I>Save Layout As...</I><br>Save(LayoutAs)
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;a<br>&nbsp;&nbsp;a<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Select all visible objects</I><br>Select(All) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;a<br>&nbsp;&nbsp;c<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Select all connected objects</I><br>Select(Connection) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;b<br>&nbsp;&nbsp;p
+	<td> <I>Break selection padstack to pieces</I><br>PadstackBreakup(selected) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;b<br>&nbsp;&nbsp;s
+	<td> <I>Break selection subcircuits to pieces</I><br>PasteBuffer(Push); PasteBuffer(5); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); PasteBuffer(Restore); PasteBuffer(ToLayout, crosshair); PasteBuffer(Clear); PasteBuffer(Pop)
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;c<br>&nbsp;&nbsp;p<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Convert selection to padstack</I><br>PadstackConvert(selected); Mode(PasteBuffer)
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;c<br>&nbsp;&nbsp;s<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Convert selection to subcircuit</I><br>Select(ConvertSubc) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;f<br>&nbsp;&nbsp;
+	<td> <I>Move selected subcircuits to other side</I><br>Flip(SelectedElements) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;l<br>&nbsp;&nbsp;
+	<td> <I>Move selected objects to current layer</I><br>MoveToCurrentLayer(Selected) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;r<br>&nbsp;&nbsp;
+	<td> <I>Remove selected objects</I><br>RemoveSelected() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;s<br>&nbsp;&nbsp;
+	<td> <I>Advanced search and select</I><br>DoWindows(search) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>s<br>&nbsp;u<br>&nbsp;&nbsp;a<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>Unselect all objects</I><br>Unselect(All) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>s<br>&nbsp;u<br>&nbsp;&nbsp;c<br>&nbsp;&nbsp;&nbsp;
+	<td> <I>unselect all connected objects</I><br>Unselect(Connection) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>space
+	<td> <I>Arrow</I><br>Mode(Arrow)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;a
+	<td> <I>Arc</I><br>Mode(Arc)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;b
+	<td> <I>Buffer</I><br>Mode(PasteBuffer)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;c
+	<td> <I>Copy</I><br>Mode(Copy)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;d
+	<td> <I>Del/Remove</I><br>Mode(Remove)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;e
+	<td> <I>Thermal</I><br>Mode(Thermal)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;h
+	<td> <I>Polygon Hole</I><br>Mode(PolygonHole)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;i
+	<td> <I>Insert Point</I><br>Mode(InsertPoint)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;k
+	<td> <I>Lock</I><br>Mode(Lock)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;l
+	<td> <I>Line</I><br>Mode(Line)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;m
+	<td> <I>Move</I><br>Mode(Move)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;n
+	<td> <I>Arrow</I><br>Mode(Arrow)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;o
+	<td> <I>Rotate</I><br>Mode(Rotate)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;p
+	<td> <I>Polygon</I><br>Mode(Polygon)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;r
+	<td> <I>Rectangle</I><br>Mode(Rectangle)
+<tr bgcolor="#FFFFFF">
+	<th align=left>t<br>&nbsp;t
+	<td> <I>Text</I><br>Mode(Text)
+<tr bgcolor="#DDFFFF">
+	<th align=left>t<br>&nbsp;v
+	<td> <I>Via</I><br>Mode(Via)
+<tr bgcolor="#FFFFFF">
+	<th align=left>tab
+	<td> <I>Flip up/down</I><br>SwapSides(V) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>tab-ctrl
+	<td> <I>Spin 180 degrees</I><br>SwapSides(R) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>tab-ctrl-shift
+	<td> <I>Swap Sides</I><br>SwapSides() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>tab-shift
+	<td> <I>Flip left/right</I><br>SwapSides(H) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>u<br>&nbsp;c
+	<td> <I>Clear undo-buffer</I><br>Undo(ClearList) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>u<br>&nbsp;r
+	<td> <I>Redo last undone operation</I><br>Redo() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>u<br>&nbsp;u
+	<td> <I>Undo last operation</I><br>Undo() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>up
+	<td> <I>Step Up</I><br>Cursor(Warp,0,1,grid) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>up-shift
+	<td> <I>Step +Up</I><br>Cursor(Pan,0,50,view) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>v<br>&nbsp;c
+	<td> <I>Center cursor</I><br>Center() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>v<br>&nbsp;f
+	<td> <I>Zoom Extents</I><br>Zoom() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>v<br>&nbsp;n
+	<td> <I>Show padstack numbers in a subc</I><br>Display(PinOrPadName) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>v<br>&nbsp;s<br>&nbsp;&nbsp;f
+	<td> <I>footprint</I><br>Display(SubcID,"%a.footprint%")
+<tr bgcolor="#DDFFFF">
+	<th align=left>v<br>&nbsp;s<br>&nbsp;&nbsp;r
+	<td> <I>refdes</I><br>Display(SubcID)
+<tr bgcolor="#FFFFFF">
+	<th align=left>v<br>&nbsp;s<br>&nbsp;&nbsp;s
+	<td> <I>refdes+value</I><br>Display(SubcID,"%a.refdes%\\n%a.value%")
+<tr bgcolor="#DDFFFF">
+	<th align=left>v<br>&nbsp;s<br>&nbsp;&nbsp;v
+	<td> <I>value</I><br>Display(SubcID,"%a.value%")
+<tr bgcolor="#FFFFFF">
+	<th align=left>w<br>&nbsp;a
+	<td> <I>About...</I><br>About() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>w<br>&nbsp;d
+	<td> <I>DRC Check</I><br>DoWindows(DRC) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>w<br>&nbsp;f
+	<td> <I>Font selector</I><br>FontSel() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>w<br>&nbsp;l
+	<td> <I>Library</I><br>DoWindows(Library) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>w<br>&nbsp;m
+	<td> <I>Message Log</I><br>DoWindows(Log) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>w<br>&nbsp;n
+	<td> <I>Netlist</I><br>DoWindows(Netlist) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>w<br>&nbsp;p
+	<td> <I>Pinout</I><br>Display(Pinout) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>y-ctrl
+	<td> <I>Redo last undone operation</I><br>Redo() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>z-ctrl
+	<td> <I>Undo last operation</I><br>Undo() 
+<tr bgcolor="#DDFFFF">
+	<th align=left>z<br>&nbsp;e<br>&nbsp;&nbsp;
+	<td> <I>Zoom Extents</I><br>Zoom() 
+<tr bgcolor="#FFFFFF">
+	<th align=left>z<br>&nbsp;f<br>&nbsp;&nbsp;
+	<td> <I>Zoom to found</I><br>ZoomTo(found) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>z<br>&nbsp;s<br>&nbsp;&nbsp;
+	<td> <I>Zoom to selection</I><br>ZoomTo(selected) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>z<br>&nbsp;x<br>&nbsp;&nbsp;
+	<td> <I>Zoom Out 20%</I><br>Zoom(+1.2) 
+<tr bgcolor="#DDFFFF">
+	<th align=left>z<br>&nbsp;z<br>&nbsp;&nbsp;
+	<td> <I>Zoom In 20%</I><br>Zoom(-1.2) 
+<tr bgcolor="#FFFFFF">
+	<th align=left>|
+	<td> <I>Wireframe draw</I><br>conf(toggle, editor/wireframe_draw, design) 
+</table>
+
+</body></html>
Index: tags/2.0.1/doc/license.html
===================================================================
--- tags/2.0.1/doc/license.html	(nonexistent)
+++ tags/2.0.1/doc/license.html	(revision 18980)
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - license </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<H1> pcb-rnd - license </H1>
+Pcb-rnd is a Free Software, Open source, under the terms of GPL version 2.
+<p>
+Pcb-rnd started as a fork of gEDA/PCB thus inherited its GPL2+ license.
+See file <a href="http://igor2.repo.hu/cgi-bin/minisvn.cgi?cmd=cat&amp;repo=pcb-rnd&amp;path=trunk/COPYING">
+trunk/COPYING</a> for more details on the license terms. Pcb-rnd
+incorporates a few mini-libs with various, GPL-compatible licenses, mostly
+BSD, MIT and public domain - the official Debian package has a great index of these.
+<p>
+<b>For users</b>: the resulting software is distributable under the GNU GPL version 2
+(or later versions), the usual GPL terms and conditions apply.
+<p>
+<b>Contribution:</b> by contributing, you agree to submit patches that are conforming
+to the license terms (e.g. don't copy random code from other projects). We
+are keeping track of copyright: each contributor holds the copyright for and
+is responsible for their part. Contributors agree to license their contribution
+under the same term as the subproject they are adding to, which is typically
+GPL2+ for core and plugins and utilities.
+<p>
+<b>Re-licensing under different conditions:</b> pcb-rnd's GPL2+ allows the user
+to upgrade to GPL3 or later versions of the GPL (as long as new versions
+don't contradict with the license of the mini-libs). It is not possible to
+change pcb-rnd's license to anything else unless all past developers agree
+(but there's not even a index of all the names!). It is possible to request
+relicensing of the files that are brand new in pcb-rnd (they are all marked
+in the copyright banner on the top of the file) - this requires the agreement
+of all copyright holders listed in the file, and wouldn't affect other files.
+Same rules apply for mini-libs.
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/mac.txt
===================================================================
--- tags/2.0.1/doc/mac.txt	(nonexistent)
+++ tags/2.0.1/doc/mac.txt	(revision 18980)
@@ -0,0 +1,22 @@
+State on MacOSX
+~~~~~~~~~~~~~~~
+
+Source releases starting from 1.1.0 should compile and run out-of-the-box.
+
+Requirements for GUI:  x11 and gtk+
+  - X11 server and client libraries for OS X are available from the XQuartz 
+     download and install
+  - gtk+ is available from brew
+     * brew install dependencies (gtk+ and libgd) with the following commands
+       brew install libgd
+       brew install gtk+
+     * if you want to use gEDA with PCB-RND you may want to install it as well
+       via brew
+       brew install homebrew/science/geda-gaf
+
+Known issues:
+  - application window opens behind other windows; it seems to be a gtk bug
+    that can not be worked around from the application
+  - slow rendering and error messages about invalid numerics on the console
+
+Considerations listed in ../INSTALL apply.
Index: tags/2.0.1/doc/man/Makefile
===================================================================
--- tags/2.0.1/doc/man/Makefile	(nonexistent)
+++ tags/2.0.1/doc/man/Makefile	(revision 18980)
@@ -0,0 +1,63 @@
+# This Makefile is a plain old hand written one; all configuration settings
+# are included from $(ROOT)/Makefile.conf which is scconfig generated
+ROOT=../..
+
+IN=pcb-rnd.1.mml pcb-strip.1.mml pcb-prj2lht.1.mml fp2anim.1.mml fp2subc.1.mml
+OUT_HTML = pcb-rnd.1.html pcb-strip.1.html pcb-prj2lht.1.html fp2anim.1.html fp2subc.1.html
+OUT_MAN1 = pcb-rnd.1 pcb-strip.1 pcb-prj2lht.1 fp2anim.1  fp2subc.1
+OUT_LINT = pcb-rnd.1.lint pcb-strip.1.lint pcb-prj2lht.1.lint fp2anim.1.lint fp2subc.1.lint
+
+OUTPUT = $(OUT_HTML) $(OUT_MAN1) index.html
+MML = /usr/bin/mml
+
+all: $(OUTPUT)
+
+lint: $(OUT_LINT)
+
+.SUFFIXES: .html .mml .lint
+
+.mml.html: .mml_linkmap
+	$(MML) -i copyright.mml -f html $<  > $@
+
+.mml:
+	$(MML) -i copyright.mml -f man $<  > $@
+
+.mml_linkmap:
+	$(MML) -i copyright.mml -f linkmap $(IN) > $@
+
+index.html: $(IN)
+	@echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' > $@
+	@echo '<HTML><HEAD><meta http-equiv="Content-Type" content="text/html;charset=us-ascii"><TITLE>man page index - pcb-rnd</TITLE></HEAD><BODY><UL>' >> $@
+	$(MML) -i copyright.mml -f indexhtml $(IN) >> $@
+	@echo "</UL></BODY></HTML>" >> $@
+
+clean:
+
+distclean:
+
+genclean:
+	rm $(OUTPUT) 2>/dev/null ; true
+
+.mml.lint:
+	$(MML) -i copyright.mml -f lint $<
+
+install_all:
+	$(SCCBOX) mkdir -p "$(MAN1DIR)"
+	$(SCCBOX) $(HOW) "pcb-rnd.1" "$(MAN1DIR)/pcb-rnd.1"
+	$(SCCBOX) $(HOW) "pcb-strip.1" "$(MAN1DIR)/pcb-strip.1"
+	$(SCCBOX) $(HOW) "pcb-prj2lht.1" "$(MAN1DIR)/pcb-prj2lht.1"
+	$(SCCBOX) $(HOW) "gsch2pcb-rnd.1" "$(MAN1DIR)/gsch2pcb-rnd.1"
+	$(SCCBOX) $(HOW) "fp2anim.1" "$(MAN1DIR)/fp2anim.1"
+	$(SCCBOX) $(HOW) "fp2subc.1" "$(MAN1DIR)/fp2subc.1"
+
+install:
+	$(MAKE) install_all HOW="install -f"
+
+linstall:
+	$(MAKE) install_all HOW="linstall -f"
+
+uninstall:
+	$(MAKE) install_all HOW="uninstall"
+
+include $(ROOT)/Makefile.conf
+
Index: tags/2.0.1/doc/man/README
===================================================================
--- tags/2.0.1/doc/man/README	(nonexistent)
+++ tags/2.0.1/doc/man/README	(revision 18980)
@@ -0,0 +1,10 @@
+Manual pages are written in the manual markup format and are compiled into
+manual and html using mml. Do not edit the generated manual or html pages.
+
+The generated files are commited in the repository so dependencies are not
+required for casual users to build the project.
+
+The required tools and dependencies are:
+ svn://repo.hu/libmawk/trunk
+ svn://repo.hu/web3.0/trunk
+ svn://repo.hu/shscripts/trunk/manmarkup
Index: tags/2.0.1/doc/man/copyright.mml
===================================================================
--- tags/2.0.1/doc/man/copyright.mml	(nonexistent)
+++ tags/2.0.1/doc/man/copyright.mml	(revision 18980)
@@ -0,0 +1,21 @@
+<copyright>
+pcb-rnd - manual\n
+Copyright (C) 2016  Tibor 'Igor2' Palinkas\n
+\n
+This program is free software; you can redistribute it and/or modify\n
+it under the terms of the GNU General Public License as published by\n
+the Free Software Foundation; either version 2 of the License, or\n
+(at your option) any later version.\n
+\n
+This program is distributed in the hope that it will be useful,\n
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n
+GNU General Public License for more details.\n
+\n
+You should have received a copy of the GNU General Public License along\n
+with this program; if not, write to the Free Software Foundation, Inc.,\n
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n
+\n
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+</copyright>
+<manual>pcb-rnd manual</manual>
Index: tags/2.0.1/doc/man/fp2anim.1
===================================================================
--- tags/2.0.1/doc/man/fp2anim.1	(nonexistent)
+++ tags/2.0.1/doc/man/fp2anim.1	(revision 18980)
@@ -0,0 +1,67 @@
+.\" pcb-rnd - manual
+.\" Copyright (C) 2016 Tibor 'Igor2' Palinkas
+.\" 
+.\" 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 2 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, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" 
+.\" Contact: pcb-rnd[removethis]@igor2.repo.hu
+.TH fp2anim 1 2016-12-27 "" "pcb-rnd manual"
+.SH NAME
+fp2anim - convert a gEDA/PCB footprint to animator script
+.SH SYNPOSIS
+.nf
+.sp
+\fBfp2anim [\fIoptions\fB] [\fIinputfile\fB]
+.fi
+.SH DECSRIPTION
+
+.BR fp2anim
+converts a footprint to a script that can be run through animator(1). It's main use is to have a automated, light-weight footprint preview generator on hosts where installing pcb-rnd would be too expensive (e.g. on web servers). 
+.PP
+If \fIinputfile\fR is not specified, 
+.BR fp2anim
+reads its STDIN for the footprint.
+.SH OPTIONS
+
+
+.TP
+
+.B --photo 
+draw the footprint in "photo realistic mode" 
+.TP
+
+.B -p 
+same as --photo 
+.TP
+
+.B --grid unit 
+set grid unit e.g. to mm or mil 
+.TP
+
+.B -g unit 
+same as --grid 
+.TP
+
+.B --mm 
+use an mm grid instead of a mil grid; shorthand for -g mm 
+.TP
+
+.B --diamond 
+draw a small diamond to mark at footprint origin 
+.TP
+
+.B --annotation types 
+turn on annotation types; types is a string that may consist "pins" for pin numbers, "dimname" and "dimvalue" for dimension names and values and "background" for drawing a background under annotation text
+.PP
+
Index: tags/2.0.1/doc/man/fp2anim.1.html
===================================================================
--- tags/2.0.1/doc/man/fp2anim.1.html	(nonexistent)
+++ tags/2.0.1/doc/man/fp2anim.1.html	(revision 18980)
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<title>fp2anim - pcb-rnd manual</title>
+</HEAD><BODY>
+<!--
+pcb-rnd - manual
+Copyright (C) 2016 Tibor 'Igor2' Palinkas
+
+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 2 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, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+-->
+<table width="100%">
+<TR>
+		<TH align="left">   fp2anim 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+
+<H3>NAME</H3>
+<blockquote>
+fp2anim - convert a gEDA/PCB footprint to animator script
+</blockquote>
+
+<H3>SYNPOSIS</H3>
+<blockquote>
+<P>
+<tt><B>fp2anim</B> [<I>options</I>] [<I>inputfile</I>]</tt>
+
+
+
+</blockquote>
+
+<H3>DESCRIPTION</H3>
+<blockquote>
+<B>fp2anim</B> converts a footprint to a script that can be run through animator(1). It's main use is to have a automated, light-weight footprint preview generator on hosts where installing pcb-rnd would be too expensive (e.g. on web servers). 
+<P>
+If <I>inputfile</I> is not specified, <B>fp2anim</B> reads its STDIN for the footprint.
+
+</blockquote>
+
+
+<H3>OPTIONS</H3>
+<blockquote>
+
+<table border=1>
+
+	<TR>
+
+		<TD> --photo 
+		<TD> draw the footprint in "photo realistic mode" 
+	<TR>
+
+		<TD> -p 
+		<TD> same as --photo 
+	<TR>
+
+		<TD> --grid unit 
+		<TD> set grid unit e.g. to mm or mil 
+	<TR>
+
+		<TD> -g unit 
+		<TD> same as --grid 
+	<TR>
+
+		<TD> --mm 
+		<TD> use an mm grid instead of a mil grid; shorthand for -g mm 
+	<TR>
+
+		<TD> --diamond 
+		<TD> draw a small diamond to mark at footprint origin 
+	<TR>
+
+		<TD> --annotation types 
+		<TD> turn on annotation types; types is a string that may consist "pins" for pin numbers, "dimname" and "dimvalue" for dimension names and values and "background" for drawing a background under annotation text
+</table>
+</blockquote>
+<P>
+<table width="100%">
+<TR>
+		<TH align="left">   fp2anim 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+</BODY></HTML>
Index: tags/2.0.1/doc/man/fp2anim.1.mml
===================================================================
--- tags/2.0.1/doc/man/fp2anim.1.mml	(nonexistent)
+++ tags/2.0.1/doc/man/fp2anim.1.mml	(revision 18980)
@@ -0,0 +1,58 @@
+<title>fp2anim</title>
+<sect>1</sect>
+<date>2016-12-27</date>
+
+<name> fp2anim - convert a gEDA/PCB footprint to animator script </name>
+<syn> <call>fp2anim</call> [<arg>options</arg>] [<arg>inputfile</arg>] </syn>
+
+<description>
+<call>fp2anim</call> converts a footprint to a script that can be run through
+animator(1). It's main use is to have a automated, light-weight footprint
+preview generator on hosts where installing pcb-rnd would be too expensive
+(e.g. on web servers).
+<p>
+If <arg>inputfile</arg> is not specified, <call>fp2anim</call> reads its
+STDIN for the footprint.
+</description>
+
+<options>
+<kvlist>
+
+	<item>
+		<key> --photo </key>
+		<value> draw the footprint in "photo realistic mode" </value>
+	</item>
+	<item>
+		<key> -p </key>
+		<value> same as --photo
+	</item>
+
+	<item>
+		<key> --grid unit </key>
+		<value> set grid unit e.g. to mm or mil </value>
+	</item>
+	<item>
+		<key> -g unit </key>
+		<value> same as --grid
+	</item>
+
+	<item>
+		<key> --mm </key>
+		<value> use an mm grid instead of a mil grid; shorthand for -g mm</value>
+	</item>
+
+	<item>
+		<key> --diamond </key>
+		<value> draw a small diamond to mark at footprint origin</value>
+	</item>
+
+	<item>
+		<key> --annotation types </key>
+		<value> turn on annotation types; types is a string that may consist
+		        "pins" for pin numbers, "dimname" and "dimvalue" for dimension
+		        names and values and "background" for drawing a background under
+		        annotation text </value>
+	</item>
+
+</kvlist>
+</options>
Index: tags/2.0.1/doc/man/fp2subc.1
===================================================================
--- tags/2.0.1/doc/man/fp2subc.1	(nonexistent)
+++ tags/2.0.1/doc/man/fp2subc.1	(revision 18980)
@@ -0,0 +1,65 @@
+.\" pcb-rnd - manual
+.\" Copyright (C) 2016 Tibor 'Igor2' Palinkas
+.\" 
+.\" 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 2 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, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" 
+.\" Contact: pcb-rnd[removethis]@igor2.repo.hu
+.TH fp2subc 1 2018-04-08 "" "pcb-rnd manual"
+.SH NAME
+fp2subc - convert any footprint into a pcb-rnd subcircuit
+.SH SYNPOSIS
+.nf
+.sp
+\fBfp2subc [\fIoptions\fB] \fIinfile\fB [\fIoutfile\fB]
+.fi
+.SH DECSRIPTION
+
+.BR fp2subc
+executes pcb-rnd in batch mode to load a footprint (typically specified in an alien format) and save it as a native pcb-rnd subcircuit. The script is useful for mass-converting old footprint libraries. 
+.PP
+If \fIoutfile\fR is not specified, its name is guessed from \fIinfile\fR
+.SH OPTIONS
+
+
+.TP
+
+.B --lib 
+\fIinfile\fR is not a path but a footprint name that should be searched in the library 
+.TP
+
+.B -l 
+same as --lib 
+.TP
+
+.B --pcb-rnd exepath 
+run exepath for invoking pcb-rnd (default is "pcb-rnd", which depends on $PATH) 
+.TP
+
+.B -p exepath 
+same as --pcb-rnd 
+.TP
+
+.B --debugger exepath 
+insert exepath before pcb-rnd on the command line; useful for running the process e.g. in valgrind 
+.TP
+
+.B -d exepath 
+same as --debugger 
+.TP
+
+.B -c key=val 
+pass on a -c key=val CLI config setting to pcb-rnd; useful for setting up library paths
+.PP
+
Index: tags/2.0.1/doc/man/fp2subc.1.html
===================================================================
--- tags/2.0.1/doc/man/fp2subc.1.html	(nonexistent)
+++ tags/2.0.1/doc/man/fp2subc.1.html	(revision 18980)
@@ -0,0 +1,102 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<title>fp2subc - pcb-rnd manual</title>
+</HEAD><BODY>
+<!--
+pcb-rnd - manual
+Copyright (C) 2016 Tibor 'Igor2' Palinkas
+
+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 2 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, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+-->
+<table width="100%">
+<TR>
+		<TH align="left">   fp2subc 1
+		<TH align="center"> 2018-04-08
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+
+<H3>NAME</H3>
+<blockquote>
+fp2subc - convert any footprint into a pcb-rnd subcircuit
+</blockquote>
+
+<H3>SYNPOSIS</H3>
+<blockquote>
+<P>
+<tt><B>fp2subc</B> [<I>options</I>] <I>infile</I> [<I>outfile</I>]</tt>
+
+
+
+</blockquote>
+
+<H3>DESCRIPTION</H3>
+<blockquote>
+<B>fp2subc</B> executes pcb-rnd in batch mode to load a footprint (typically specified in an alien format) and save it as a native pcb-rnd subcircuit. The script is useful for mass-converting old footprint libraries. 
+<P>
+If <I>outfile</I> is not specified, its name is guessed from <I>infile</I>
+
+</blockquote>
+
+
+<H3>OPTIONS</H3>
+<blockquote>
+
+<table border=1>
+
+	<TR>
+
+		<TD> --lib 
+		<TD> <I>infile</I> is not a path but a footprint name that should be searched in the library 
+	<TR>
+
+		<TD> -l 
+		<TD> same as --lib 
+	<TR>
+
+		<TD> --pcb-rnd exepath 
+		<TD> run exepath for invoking pcb-rnd (default is "pcb-rnd", which depends on $PATH) 
+	<TR>
+
+		<TD> -p exepath 
+		<TD> same as --pcb-rnd 
+	<TR>
+
+		<TD> --debugger exepath 
+		<TD> insert exepath before pcb-rnd on the command line; useful for running the process e.g. in valgrind 
+	<TR>
+
+		<TD> -d exepath 
+		<TD> same as --debugger 
+	<TR>
+
+		<TD> -c key=val 
+		<TD> pass on a -c key=val CLI config setting to pcb-rnd; useful for setting up library paths
+</table>
+</blockquote>
+<P>
+<table width="100%">
+<TR>
+		<TH align="left">   fp2subc 1
+		<TH align="center"> 2018-04-08
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+</BODY></HTML>
Index: tags/2.0.1/doc/man/fp2subc.1.mml
===================================================================
--- tags/2.0.1/doc/man/fp2subc.1.mml	(nonexistent)
+++ tags/2.0.1/doc/man/fp2subc.1.mml	(revision 18980)
@@ -0,0 +1,58 @@
+<title>fp2subc</title>
+<sect>1</sect>
+<date>2018-04-08</date>
+
+<name> fp2subc - convert any footprint into a pcb-rnd subcircuit </name>
+<syn> <call>fp2subc</call> [<arg>options</arg>] <arg>infile</arg> [<arg>outfile</arg>] </syn>
+
+<description>
+<call>fp2subc</call> executes pcb-rnd in batch mode to load a footprint
+(typically specified in an alien format) and save it as a native pcb-rnd
+subcircuit. The script is useful for mass-converting old footprint
+libraries.
+<p>
+If <arg>outfile</arg> is not specified, its name is guessed from
+<arg>infile</arg>
+</description>
+
+<options>
+<kvlist>
+
+	<item>
+		<key> --lib </key>
+		<value> <arg>infile</arg> is not a path but a footprint name that
+		        should be searched in the library </value>
+	</item>
+	<item>
+		<key> -l </key>
+		<value> same as --lib
+	</item>
+
+	<item>
+		<key> --pcb-rnd exepath </key>
+		<value> run exepath for invoking pcb-rnd (default is "pcb-rnd", which
+		        depends on $PATH) </value>
+	</item>
+	<item>
+		<key> -p exepath </key>
+		<value> same as --pcb-rnd
+	</item>
+
+	<item>
+		<key> --debugger exepath </key>
+		<value> insert exepath before pcb-rnd on the command line; useful
+		        for running the process e.g. in valgrind </value>
+	</item>
+	<item>
+		<key> -d exepath </key>
+		<value> same as --debugger
+	</item>
+
+	<item>
+		<key> -c key=val </key>
+		<value> pass on a -c key=val CLI config setting to pcb-rnd; useful for
+		        setting up library paths </value>
+	</item>
+
+</kvlist>
+</options>
Index: tags/2.0.1/doc/man/gsch2pcb-rnd.1
===================================================================
--- tags/2.0.1/doc/man/gsch2pcb-rnd.1	(nonexistent)
+++ tags/2.0.1/doc/man/gsch2pcb-rnd.1	(revision 18980)
@@ -0,0 +1,134 @@
+.TH gsch2pcb-rnd 1 "September 25th, 2013" "gEDA Project" 1.8.2.20130925
+.SH NAME
+gsch2pcb-rnd - Update pcb-rnd layouts from gEDA/gaf schematics
+.SH SYNOPSIS
+\fBgsch2pcb-rnd\fR [\fIOPTION\fR ...] {\fIPROJECT\fR | \fIFILE\fR ...}
+.SH DESCRIPTION
+.PP
+\fBgsch2pcb-rnd\fR is a frontend to \fBgnetlist\fR(1) which aids in
+creating and updating \fBpcb-rnd\fR(1) printed circuit board layouts based
+on a set of electronic schematics created with \fBgschem\fR(1).
+
+.PP
+Instead of specifying all options and input gEDA schematic \fIFILE\fRs
+on the command line, \fBgsch2pcb-rnd\fR can use a \fIPROJECT\fR file
+instead.
+
+.PP
+\fBgsch2pcb-rnd\fR first runs \fBgnetlist\fR(1) with the `PCB' backend to
+create a `<name>.net' file containing a \fBpcb-rnd\fR(1) formatted netlist for
+the design.
+
+.PP
+The second step is to run \fBgnetlist\fR(1) again with the `gsch2pcb-rnd'
+backend to find any \fBM4\fR(1) elements required by the schematics.
+Any missing elements are found by searching a set of file element
+directories.  If no `<name>.pcb' file exists for the design yet, it is
+created with the required elements; otherwise, any new elements
+are output to a `<name>.new.pcb' file.
+
+.PP
+If a `<name>.pcb' file exists, it is searched for elements with a
+non-empty element name with no matching schematic symbol.  These
+elements are removed from the `<name>.pcb' file, with a backup in a
+`<name>.pcb.bak' file.
+
+.PP
+Finally, \fBgnetlist\fR(1) is run a third time with the `pcbpins'
+backend to create a `<name>.cmd' file.  This can be loaded into
+\fBpcb-rnd\fR(1) to rename all pin names in the PCB layout to match the
+schematic.
+
+.SH OPTIONS
+.TP 8
+\fB-o\fR, \fB--output-name\fR=\fIBASENAME\fR
+Use output filenames `\fIBASENAME\fR.net', `\fIBASENAME\fR.pcb', and
+`\fIBASENAME\fR.new.pcb'.  By default, the basename of the first
+schematic file in the list of input files is used.
+.TP 8
+\fB-d\fR, \fB--elements-dir\fR=\fIDIRECTORY\fR
+Add \fIDIRECTORY\fR to the list of directories to search for PCB file
+elements.
+.TP 8
+\fB-r\fR, \fB--remove-unfound\fR
+Don't include references to unfound elements in the generated `.pcb'
+files.  Use if you want \fBpcb-rnd\fR(1) to be able to load the
+(incomplete) `.pcb' file.  This is enabled by default.
+.TP 8
+\fB-k\fR, \fB--keep-unfound\fR
+Keep include references to unfound elements in the generated `.pcb'
+files.  Use if you want to hand edit or otherwise preprocess the
+generated `.pcb' file before running \fBpcb\fR(1).
+.TP 8
+\fB-p\fR, \fB--preserve\fR
+Preserve elements in PCB files which are not found in the schematics.
+Since elements with an empty element name (schematic "refdes") are
+never deleted, this option is rarely useful.
+.TP 8
+\fB--gnetlist\fR \fIBACKEND\fR
+In addition to the default backends, run \fBgnetlist\fR(1) with `\-g
+\fIBACKEND\fR', with output to `<name>.\fIBACKEND\fR'.
+.TP 8
+\fB--gnetlist-arg\fR \fIARG\fR
+Pass \fIARG\fR as an additional argument to \fBgnetlist\fR(1).
+.TP 8
+\fB--empty-footprint\fR \fINAME\fR
+If \fINAME\fR is not `none', \fBgsch2pcb-rnd\fR will not add elements for
+components with that name to the PCB file.  Note that if the omitted
+components have net connections, they will still appear in the netlist
+and \fBpcb-rnd\fR(1) will warn that they are missing.
+.TP 8
+\fB--fix-elements\fR
+If a schematic component's `footprint' attribute is not equal to the
+`Description' of the corresponding PCB element, update the
+`Description' instead of replacing the element.
+.TP 8
+\fB-q\fR, \fB--quiet\fR
+Don't output information on steps to take after running \fBgsch2pcb-rnd\fR.
+.TP 8
+\fB-v\fR, \fB--verbose\fR
+Output extra debugging information.  This option can be specified
+twice (`\-v \-v') to obtain additional debugging for file elements.
+.TP 8
+\fB-h\fR, \fB--help\fR
+Print a help message.
+.TP 8
+\fB-V\fR, \fB--version\fR
+Print \fBgsch2pcb-rnd\fR version information.
+
+.SH PROJECT FILES
+.PP
+A \fBgsch2pcb-rnd\fR project file is a file (not ending in `.sch')
+containing a list of schematics to process and some options.  Any
+long-form command line option can appear in the project file with the
+leading `\-\-' removed, with the exception of `\-\-gnetlist-arg',
+`\-\-fix-elements', `\-\-verbose', and `\-\-version'.  Schematics should be
+listed on a line beginning with `schematics'.
+.PP
+An example project file might look like:
+
+.nf
+	schematics partA.sch partB.sch
+	output-name design
+.ad b
+
+.SH ENVIRONMENT
+.TP 8
+.B GNETLIST
+specifies the \fBgnetlist\fR(1) program to run.  The default is
+`gnetlist'.
+
+.SH AUTHORS
+See the `AUTHORS' file included with this program.
+
+.SH COPYRIGHT
+.nf
+Copyright \(co 1999-2011 gEDA Contributors.  License GPLv2+: GNU GPL
+version 2 or later.  Please see the `COPYING' file included with this
+program for full details.
+.PP
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+.SH SEE ALSO
+\fBgschem\fR(1), \fBgnetlist\fR(1), \fBpcb-rnd\fR(1)
Index: tags/2.0.1/doc/man/index.html
===================================================================
--- tags/2.0.1/doc/man/index.html	(nonexistent)
+++ tags/2.0.1/doc/man/index.html	(revision 18980)
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD><meta http-equiv="Content-Type" content="text/html;charset=us-ascii"><TITLE>man page index - pcb-rnd</TITLE></HEAD><BODY><UL>
+		<LI> <a href="pcb-rnd.1.html">pcb-rnd</a> <I>(1)</I> -- pcb-rnd - Printed Circuit Board editor
+		<LI> <a href="pcb-strip.1.html">pcb-strip</a> <I>(1)</I> -- pcb-strip - remove sections of a pcb file
+		<LI> <a href="pcb-prj2lht.1.html">pcb-prj2lht</a> <I>(1)</I> -- pcb-prj2lht - convert old gsch2pcb project file to pcb-rnd project
+		<LI> <a href="fp2anim.1.html">fp2anim</a> <I>(1)</I> -- fp2anim - convert a gEDA/PCB footprint to animator script
+		<LI> <a href="fp2subc.1.html">fp2subc</a> <I>(1)</I> -- fp2subc - convert any footprint into a pcb-rnd subcircuit
+</UL></BODY></HTML>
Index: tags/2.0.1/doc/man/pcb-prj2lht.1
===================================================================
--- tags/2.0.1/doc/man/pcb-prj2lht.1	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-prj2lht.1	(revision 18980)
@@ -0,0 +1,32 @@
+.\" pcb-rnd - manual
+.\" Copyright (C) 2016 Tibor 'Igor2' Palinkas
+.\" 
+.\" 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 2 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, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" 
+.\" Contact: pcb-rnd[removethis]@igor2.repo.hu
+.TH pcb-prj2lht 1 2016-12-27 "" "pcb-rnd manual"
+.SH NAME
+pcb-prj2lht - convert old gsch2pcb project file to pcb-rnd project
+.SH SYNPOSIS
+.nf
+.sp
+\fBpcb-prj2lht [\fIinputfile\fB]
+.fi
+.SH DECSRIPTION
+
+.BR pcb-prj2lht
+converts the old gsch2pcb project file to the new, lihata project file format that is usable with pcb-rnd and gsch2pcb-rnd. If \fIinputfile\fR is specified, the file is modified in-place, else 
+.BR pcb-prj2lht
+reads from STDIN and writes the result to STDOUT.
Index: tags/2.0.1/doc/man/pcb-prj2lht.1.html
===================================================================
--- tags/2.0.1/doc/man/pcb-prj2lht.1.html	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-prj2lht.1.html	(revision 18980)
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<title>pcb-prj2lht - pcb-rnd manual</title>
+</HEAD><BODY>
+<!--
+pcb-rnd - manual
+Copyright (C) 2016 Tibor 'Igor2' Palinkas
+
+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 2 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, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+-->
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-prj2lht 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+
+<H3>NAME</H3>
+<blockquote>
+pcb-prj2lht - convert old gsch2pcb project file to pcb-rnd project
+</blockquote>
+
+<H3>SYNPOSIS</H3>
+<blockquote>
+<P>
+<tt><B>pcb-prj2lht</B> [<I>inputfile</I>]</tt>
+
+
+
+</blockquote>
+
+<H3>DESCRIPTION</H3>
+<blockquote>
+<B>pcb-prj2lht</B> converts the old gsch2pcb project file to the new, lihata project file format that is usable with pcb-rnd and gsch2pcb-rnd. If <I>inputfile</I> is specified, the file is modified in-place, else <B>pcb-prj2lht</B> reads from STDIN and writes the result to STDOUT.
+</blockquote>
+<P>
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-prj2lht 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+</BODY></HTML>
Index: tags/2.0.1/doc/man/pcb-prj2lht.1.mml
===================================================================
--- tags/2.0.1/doc/man/pcb-prj2lht.1.mml	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-prj2lht.1.mml	(revision 18980)
@@ -0,0 +1,14 @@
+<title>pcb-prj2lht</title>
+<sect>1</sect>
+<date>2016-12-27</date>
+
+<name> pcb-prj2lht - convert old gsch2pcb project file to pcb-rnd project </name>
+<syn> <call>pcb-prj2lht</call> [<arg>inputfile</arg>] </syn>
+
+<description>
+<call>pcb-prj2lht</call> converts the old gsch2pcb project file to the
+new, lihata project file format that is usable with pcb-rnd and
+gsch2pcb-rnd. If <arg>inputfile</arg> is specified, the file is modified
+in-place, else <call>pcb-prj2lht</call> reads from STDIN and writes the
+result to STDOUT.
+</description>
Index: tags/2.0.1/doc/man/pcb-rnd.1
===================================================================
--- tags/2.0.1/doc/man/pcb-rnd.1	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-rnd.1	(revision 18980)
@@ -0,0 +1,51 @@
+.\" pcb-rnd - manual
+.\" Copyright (C) 2016 Tibor 'Igor2' Palinkas
+.\" 
+.\" 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 2 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, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" 
+.\" Contact: pcb-rnd[removethis]@igor2.repo.hu
+.TH pcb-rnd 1 2018-01-01 "" "pcb-rnd manual"
+.SH NAME
+pcb-rnd - Printed Circuit Board editor
+.SH SYNPOSIS
+.nf
+.sp
+\fBpcb-rnd [\fIoptions\fB] [\fIinputfile\fB]
+.fi
+.SH DECSRIPTION
+
+.BR pcb-rnd
+is a modular PCB editor. The main use is interactive editing. If no \fI-x\fR is specified on the command line, the graphical editor mode is initiated. Automated, headless processing is also possible with \fI-x\fR or \fI--gui batch\fR.
+.SH OPTIONS
+
+
+.TP
+
+.B --help \fItopic\fR 
+Print help about \fItopic\fR and exit; if no topic is specified, print available topics. 
+.TP
+
+.B -x \fIexporter\fR [\fIexportflags] \fIinputfile\fR\fR 
+Instead of interactive editing, export the design (loaded from \fIinputfile\fR) to a file using the specified \fIexporter\fR plugin. A list of exporter-specific parameters may follow to control the details of the process. 
+.TP
+
+.B --gui \fIhid\fR 
+Use the \fIhid\fR plugin for the "gui" frontend. Common choices are "gtk" or "lesstif" for graphical user interfaces and "batch" for a headless command-line interface (or automated batch processing). 
+.TP
+
+.B -c \fIpath=val\fR 
+Set a config node in role CFR_CLI. The path of the node is \fIpath\fR (e.g. editor/grid) and the new value is \fIval\fR (e.g. 5mm).
+.PP
+
Index: tags/2.0.1/doc/man/pcb-rnd.1.html
===================================================================
--- tags/2.0.1/doc/man/pcb-rnd.1.html	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-rnd.1.html	(revision 18980)
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<title>pcb-rnd - pcb-rnd manual</title>
+</HEAD><BODY>
+<!--
+pcb-rnd - manual
+Copyright (C) 2016 Tibor 'Igor2' Palinkas
+
+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 2 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, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+-->
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-rnd 1
+		<TH align="center"> 2018-01-01
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+
+<H3>NAME</H3>
+<blockquote>
+pcb-rnd - Printed Circuit Board editor
+</blockquote>
+
+<H3>SYNPOSIS</H3>
+<blockquote>
+<P>
+<tt><B>pcb-rnd</B> [<I>options</I>] [<I>inputfile</I>]</tt>
+
+
+
+</blockquote>
+
+<H3>DESCRIPTION</H3>
+<blockquote>
+<B>pcb-rnd</B> is a modular PCB editor. The main use is interactive editing. If no <I>-x</I> is specified on the command line, the graphical editor mode is initiated. Automated, headless processing is also possible with <I>-x</I> or <I>--gui batch</I>.
+</blockquote>
+
+
+<H3>OPTIONS</H3>
+<blockquote>
+
+<table border=1>
+
+	<TR>
+
+		<TD> --help <I>topic</I> 
+		<TD> Print help about <I>topic</I> and exit; if no topic is specified, print available topics. 
+	<TR>
+
+		<TD> -x <I>exporter</I> [<I>exportflags] <I>inputfile</I></I> 
+		<TD> Instead of interactive editing, export the design (loaded from <I>inputfile</I>) to a file using the specified <I>exporter</I> plugin. A list of exporter-specific parameters may follow to control the details of the process. 
+	<TR>
+
+		<TD> --gui <I>hid</I> 
+		<TD> Use the <I>hid</I> plugin for the "gui" frontend. Common choices are "gtk" or "lesstif" for graphical user interfaces and "batch" for a headless command-line interface (or automated batch processing). 
+	<TR>
+
+		<TD> -c <I>path=val</I> 
+		<TD> Set a config node in role CFR_CLI. The path of the node is <I>path</I> (e.g. editor/grid) and the new value is <I>val</I> (e.g. 5mm).
+</table>
+</blockquote>
+<P>
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-rnd 1
+		<TH align="center"> 2018-01-01
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+</BODY></HTML>
Index: tags/2.0.1/doc/man/pcb-rnd.1.mml
===================================================================
--- tags/2.0.1/doc/man/pcb-rnd.1.mml	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-rnd.1.mml	(revision 18980)
@@ -0,0 +1,43 @@
+<title>pcb-rnd</title>
+<sect>1</sect>
+<date>2018-01-01</date>
+
+<name> pcb-rnd - Printed Circuit Board editor </name>
+<syn> <call>pcb-rnd</call> [<arg>options</arg>] [<arg>inputfile</arg>] </syn>
+
+<description>
+<call>pcb-rnd</call> is a modular PCB editor. The main use is interactive
+editing. If no <arg>-x</arg> is specified on the command line, the
+graphical editor mode is initiated. Automated, headless processing
+is also possible with <arg>-x</arg> or <arg>--gui batch</arg>.
+</description>
+
+<options>
+<kvlist>
+	<item>
+		<key> --help <arg>topic</arg> </key>
+		<value> Print help about <arg>topic</arg> and exit; if no topic is
+		        specified, print available topics.
+	</item>
+	<item>
+		<key> -x <arg>exporter</arg> [<arg>exportflags] <arg>inputfile</arg> </key>
+		<value> Instead of interactive editing, export the design (loaded from
+		        <arg>inputfile</arg>) to a file using the specified
+		        <arg>exporter</arg> plugin. A list of exporter-specific parameters
+		        may follow to control the details of the process. </value>
+	</item>
+	<item>
+		<key> --gui <arg>hid</arg> </key>
+		<value> Use the <arg>hid</arg> plugin for the "gui" frontend. Common
+		        choices are "gtk" or "lesstif" for graphical user interfaces
+		        and "batch" for a headless command-line interface (or automated
+		        batch processing). </value>
+	</item>
+	<item>
+		<key> -c <arg>path=val</arg> </key>
+		<value> Set a config node in role CFR_CLI. The path of the node is
+		        <arg>path</arg> (e.g. editor/grid) and the new value is
+		        <arg>val</arg> (e.g. 5mm). </value>
+	</item>
+</kvlist>
+</options>
Index: tags/2.0.1/doc/man/pcb-strip.1
===================================================================
--- tags/2.0.1/doc/man/pcb-strip.1	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-strip.1	(revision 18980)
@@ -0,0 +1,45 @@
+.\" pcb-rnd - manual
+.\" Copyright (C) 2016 Tibor 'Igor2' Palinkas
+.\" 
+.\" 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 2 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, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" 
+.\" Contact: pcb-rnd[removethis]@igor2.repo.hu
+.TH pcb-strip 1 2016-12-27 "" "pcb-rnd manual"
+.SH NAME
+pcb-strip - remove sections of a pcb file
+.SH SYNPOSIS
+.nf
+.sp
+\fBpcb-strip [\fIoptions\fB] [\fIinputfile\fB]
+.fi
+.SH DECSRIPTION
+
+.BR pcb-strip
+removes sections of a pcb file. If \fIinputfile\fR is specified, the file is modified in-place, else 
+.BR pcb-strip
+reads from STDIN and writes the result to STDOUT.
+.SH OPTIONS
+
+
+.TP
+
+.B -s 
+Remove symbols (the font). The pcb file stops being self-containing, pcb-rnd (or pcb) will load and apply the default font when the file is loaded. Useful for reducing the file size for test input and example files where font correctness is not required. 
+.TP
+
+.B -a 
+Remove board attributes. Useful for deleting local configuration
+.PP
+
Index: tags/2.0.1/doc/man/pcb-strip.1.html
===================================================================
--- tags/2.0.1/doc/man/pcb-strip.1.html	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-strip.1.html	(revision 18980)
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML><HEAD>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<title>pcb-strip - pcb-rnd manual</title>
+</HEAD><BODY>
+<!--
+pcb-rnd - manual
+Copyright (C) 2016 Tibor 'Igor2' Palinkas
+
+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 2 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, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Contact: pcb-rnd[removethis]@igor2.repo.hu
+-->
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-strip 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+
+<H3>NAME</H3>
+<blockquote>
+pcb-strip - remove sections of a pcb file
+</blockquote>
+
+<H3>SYNPOSIS</H3>
+<blockquote>
+<P>
+<tt><B>pcb-strip</B> [<I>options</I>] [<I>inputfile</I>]</tt>
+
+
+
+</blockquote>
+
+<H3>DESCRIPTION</H3>
+<blockquote>
+<B>pcb-strip</B> removes sections of a pcb file. If <I>inputfile</I> is specified, the file is modified in-place, else <B>pcb-strip</B> reads from STDIN and writes the result to STDOUT.
+</blockquote>
+
+
+<H3>OPTIONS</H3>
+<blockquote>
+
+<table border=1>
+
+	<TR>
+
+		<TD> -s 
+		<TD> Remove symbols (the font). The pcb file stops being self-containing, pcb-rnd (or pcb) will load and apply the default font when the file is loaded. Useful for reducing the file size for test input and example files where font correctness is not required. 
+	<TR>
+
+		<TD> -a 
+		<TD> Remove board attributes. Useful for deleting local configuration
+</table>
+</blockquote>
+<P>
+<table width="100%">
+<TR>
+		<TH align="left">   pcb-strip 1
+		<TH align="center"> 2016-12-27
+		<TH align="right">  pcb-rnd manual
+</table>
+
+
+</BODY></HTML>
Index: tags/2.0.1/doc/man/pcb-strip.1.mml
===================================================================
--- tags/2.0.1/doc/man/pcb-strip.1.mml	(nonexistent)
+++ tags/2.0.1/doc/man/pcb-strip.1.mml	(revision 18980)
@@ -0,0 +1,30 @@
+<title>pcb-strip</title>
+<sect>1</sect>
+<date>2016-12-27</date>
+
+<name> pcb-strip - remove sections of a pcb file </name>
+<syn> <call>pcb-strip</call> [<arg>options</arg>] [<arg>inputfile</arg>] </syn>
+
+<description>
+<call>pcb-strip</call> removes sections of a pcb file. If <arg>inputfile</arg>
+is specified, the file is modified in-place, else <call>pcb-strip</call>
+reads from STDIN and writes the result to STDOUT.
+</description>
+
+<options>
+<kvlist>
+	<item>
+		<key> -s </key>
+		<value> Remove symbols (the font). The pcb file stops being self-containing,
+		        pcb-rnd (or pcb) will load and apply the default font when the file
+		        is loaded. Useful for reducing the file size for test input and
+		        example files where font correctness is not required.
+		        </value>
+	</item>
+	<item>
+		<key> -a </key>
+		<value> Remove board attributes. Useful for deleting local configuration
+		        </value>
+	</item>
+</kvlist>
+</options>
Index: tags/2.0.1/doc/mirrors.html
===================================================================
--- tags/2.0.1/doc/mirrors.html	(nonexistent)
+++ tags/2.0.1/doc/mirrors.html	(revision 18980)
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - main </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<br>
+<!--content-->
+<h1> read-only svn mirrors </h1>
+<p>
+Master repository: svn://repo.hu/pcb-rnd
+<p>
+<table border=1 cellspacing=0>
+<tr> <th> url
+     <th> update frequency <th> location
+<tr> <td> svn://timesausage.com/pcb-rnd
+     <td> 10 minutes
+     <td> U.S., west coast
+<tr> <td> svn://igor3.repo.hu/pcb-rnd
+     <td> manual/random (every few days)
+     <td> Budapest, Hungary
+</table>
+<p>
+Note: svn mirrors are always read-only and lag behind the master
+repository. The latest commits are often accessible only in the master
+repo, until mirrors sync, which may take anything between minutes and
+days. <b>You should almost always use the master repository.</b>
+There are situations when using a mirror may help, tho:
+<ul>
+	<li> if you need to do a lot of checkouts of past revisions, e.g. for
+	     bisecting an old bug, you should pick the mirror that is fastest
+	     for you
+	<li> the master repositry is not accessible for some reason and your
+	     svn access can not wait until it is restored
+</ul>
+
+</body>
+</html>
Index: tags/2.0.1/doc/motivation.html
===================================================================
--- tags/2.0.1/doc/motivation.html	(nonexistent)
+++ tags/2.0.1/doc/motivation.html	(revision 18980)
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - motivation </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<H1> pcb-rnd motivation </H1>
+
+<H2> Phase 4: expansion (2017)  </H2>
+<p>
+Late 2016 and during 2017 there was a major expansion in number of developers,
+users and the amount of time spent on pcb-rnd. Our community is not tiny
+any more, and is very active: there is a lot of on-topic discussion going
+on on IRC every day, which result in bugs fixed and features implemented.
+Newcomers are intergated fast.
+
+<p>
+We started to rewrite the data model by slowly replacing elements with
+more generic subcircuits.
+
+
+<H2> Phase 3: community requested features (2016)  </H2>
+Overlapping phase 2 there <b>was</b>
+<a href="http://igor2.repo.hu/cgi-bin/pcb-rnd-poll.cgi"> feature poll </a>. If there
+are enough <b>active</b> users/testers for a feature, it gets implemented in
+phase 3.
+<p>
+There is a small, active, constructive community forming around pcb-rnd. Future
+directions will be mainly set by their need.
+
+<H2> Phase 2: major cleanups (2015..2016) </H2>
+In the first phase I was mostly implementing a set of small features and fixes.
+As I got more familiar with the code base, I decided to bite the bullet and
+do some refactoring:
+<ul>
+	<li> replaced the <a href="http://repo.hu/cgi-bin/pool.cgi?node=parametric">footprint mapping/loading code</a>; instead of a hardwired m4 dependency, parametric (generated-on-the-fly) footprints can be written in any language
+	<li> replaced the default footprint library shipped with the software; the <a href="http://repo.hu/cgi-bin/pool.cgi?node=pcblib"> new library </a> ships a small, well organized collection of essentials, omitting special/rarely used footprints
+	<li> got the code much more modular - <a href="developer/mods3"> a lot of core code got converted into plugins </a>
+	<li> threw out the resource parser and file format (menu.res and friends) in favor of lihata; this removed a lot of code duplication and a strangely designed resource tree data structure I really hated; as a side effect the gtk hid has multi-stroke hotkeys
+	<li> <a href="http://repo.hu/cgi-bin/pool.cgi?node=glib">replaced glib</a> with a set of <a href="http://repo.hu/projects/articles/minilibs"> mini libs </a> in core and most of the plugins; at the end only the gtk hid should depend on glib; this made the code easier to maintain and debug; a lot of checks are now compile-time (through the C type system) instead of runtime (glib lists)
+	<li> replaced the settings/rc/preferences system with a central, <a href="conf/"> lihata based configuration system </a> - long term hid attributes will be converted too
+</ul>
+<p>
+Plans for the future includes:
+<ul>
+	<li> turning most of the core code into a library for external tools to reuse
+	<li> extending the core to provide an infrastructure for composite objects handled by plugins
+	<li> support for saving and loading pcb and footprint files in the lihata format
+	<li> plans for a set of smallish features that can be implemented in a weekend or two each.
+</ul>
+
+
+<H2> Phase 1: At the beginning... (2013..2014)</H2>
+I use PCB a lot on various computers. I used to try to join the mainstream
+development with small contribution (minor patches) and was active on
+IRC and the mailing lists for a while. However, it didn't work out well,
+and:
+<ul>
+	<li> PCB already knew 95% of everything I'd ever need years ago
+	<li> the remaining 5% was not on the TODO list of developers and generally no one shown much interest in getting patches for those
+	<li> meanwhile a lot of new features have been added, from which most I find totally useless:
+		<ul>
+			<li> dbus
+			<li> gl - transparency makes even simple 2 sided boards unusable; slower than the classic version sw render on all my computers
+			<li> preparation for a C++ transition
+			<li> 3d support in core (I believe communication to 3d cad programs should be via exporter plugins)
+		</ul>
+	<li> the official Debian package enables (requires, depends on) both dbus and gl
+	<li> DVCS - it almost always results in chaos, and has no benefit for such a small group of developers; there are posts from time to time on the mailing list about how to handle the chaos; my choice is to stick with a simple, centralized version control system
+	<li> DVCS <b>always</b> results in increased administration, which I hate to spend my time on - I'd rather invest the time in bugfixing, documentation or implementing new features
+	<li> it's nearly impossible to get small patches applied^1:
+		<ul>
+			<li> often no one has the time to revise and commit them
+			<li> communication requires web2.0 (lp)
+			<li> there are too many cycles of "please fix this and change that first"
+			<li> with the chaos VCS, it's too likely that new feature patches would require ongoing maintenance while sitting in a "feature branch", to avoid that a large scale merge (or rebase, whatever) breaks it when it finally hits the official branch
+			<li> there are too much pondering and too less prototyping; there are features that are being considered for years (for example back annotation, internal connections) with multiple concurrent ideas, but no code. Instead, I'd like to implement some code from the early phase of the idea, test it, and deprecate it if it didn't work out well.
+			<li> I wouldn't even dream about getting larger patches in the official release
+		</ul>
+	<li> no stable release for years; maintaining a set of patches (like pcb-gpmi) and porting them to new releases is too much hassle
+</ul>
+I was pondering a fork for years. The trigger was that one day I've upgraded
+Debian on my lab computer and the new version of PCB came with gl enabled; this
+made PCB absolutely unusable (had to wait like 10 seconds for a scroll) while
+all the transparent polys over traces made the whole screen a mess. I should
+have recompiled everything and built a new Debian package with gl disabled or
+install from source (but I have too many computers for that). My decision
+was to set up my own .deb but then build it from a fork (it's not much of
+an extra effort), so I can add some of the features I miss in daily use.
+My plans with this fork:
+<ul>
+	<li> I stick with my fork and will use it on all my computers for all my designs
+	<li> Because of that, there's no emphasis on keeping the file formats compatible - breaking compatibility is not a goal either; as long as mainline doesn't change the format, pcb-rnd is about 98% compatible (the 2% is where pcb-rnd features are not supported by mainline)
+	<li> I won't actively seek ways to get my changes into the mainstream; I will keep on using my svn repo in a manner that (as a side effect) makes such merges easier, tho. If PCB developers decide to pick them up from svn and merge them in the official repo, it's fine (but I personally will keep using my fork anyway).
+	<li> Most probably I won't merge anything back from the mainstream to my fork - the past few years showed that it's unlikely there would be new features I'd need
+	<li> My plans for new features were:
+		<ul>
+			<li> pin shapes (a preliminary version was already implemented - as of 2017, it's obsolete because of padstacks)
+			<li> 1206 jumpers without having to add them on the schematics/netlist (done: [intconn] and [nonetlist] are the pcb-rnd-side features for this)
+			<li> merge pcb-gpmi; GPMI would be an optional addon, it'd probably stay a plugin, but there should not be a separate repo (<a href="user/06_feature/gpmi/index.html"> done </a>)
+		</ul>
+</ul>
+<p>
+Footnotes:
+<ul>
+	<li> ^1: this may have changed lately and pcb developers are more open to newcomers; there seems to be a shortage of developers tho, which still makes it slow to get bigger patches through
+</ul>
+
+</body>
+</html>
Index: tags/2.0.1/doc/myfeature.html
===================================================================
--- tags/2.0.1/doc/myfeature.html	(nonexistent)
+++ tags/2.0.1/doc/myfeature.html	(revision 18980)
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - my feature </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<h1> pcb-rnd - how to get my favorite feature implemented </h1>
+
+The list below is sorted: top items have higher priority, but you
+are free to choose any.
+
+<H3> 1. If you are a programmer with free time to spend </H3>
+Read the <a href="contrib.html"> contribution howto</a> and join the project.
+You are welcome to work only on the feature you are interested in. You get
+all the support (e.g. for understanding the API, to get a blank plugin
+set up so you need to fill in only the feature-specific parts, etc.). Success
+rate should be near to 100%.
+
+<H3> 2. If you are not a programmer and have free time </H3>
+You can join and work on things you don't need that much, but others do.
+This will build your reputation in the community which in turns encourages
+others to implement your favorite feature even if they wouldn't do it for
+themselves. The success rate is somewhat more random, obviously.
+
+<H3> 3. If you don't have free time </H3>
+Consider donation: buy someone else's time, e.g.
+<a href="https://sponsor.pcbrnd.repo.hu"> sponsor the
+project with small donations.</a>
+<p>
+You can also directly buy the development time <i>for the feature you need</i>;
+contact me (see the <a href="contrib.html"> contribution
+howto</a> page). Since you don't need to cover all costs and the hourly
+rates are much lower on a pet project, and your feature may be simpler
+than it looks, and someone who already knows the code also saves the
+learning curve, it may all be cheaper than you think. The success rate
+should be close to 100%.
+
+
+
+<H3> 4. If you don't have anything to contribute with </H3>
+[DEL:Vote for it in the <a href="http://igor2.repo.hu/cgi-bin/pcb-rnd-poll.cgi">
+feature poll</a>. If your feature is not there, ask on the mailing list.
+Chance for success: if it's a popular demand on the feature poll, chances
+are somewhat good. Else chances are very low, but not zero.:DEL]
+<p>
+Because of 100% passivity of the geda community, I decided not to spend more
+time on community-related tasks there. The poll is available, you can use it,
+but you will have to organize at least 5 active, capable users who are
+committed enough to spend significant time on testing/supporting development.
+I will consider implementing your feature only if you can bring and keep
+those people motivated and active.
+
+<H3> 5. If you tried everything, even point 4. and all failed... </H3>
+Complain loudly on the mailing list, advertise your opinion, try pushing
+the thing - a.k.a. go trolling. <b>Success rate is exactly 0%</b>,
+you make a lot of good <del>friends</del> enemies that will make it harder
+to ask or contribute later for another feature, but it may make you feel
+better. &lt;/irony&gt;.
+
Index: tags/2.0.1/doc/news.html
===================================================================
--- tags/2.0.1/doc/news.html	(nonexistent)
+++ tags/2.0.1/doc/news.html	(revision 18980)
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - news </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<br>
+<!--content-->
+<h1> News </h1>
+<table border=0 cellpadding=20 width="100%">
+<tr><td align=right valign=top bgcolor="#eeeeee"> 
+	<table border=0 width="100%" cellpadding=15 cellspacing=15>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2018-06-06
+			<br>
+			release: 2.0.0
+		<td bgcolor="#ddddff">
+			Release 2.0.0 <a href="releases"> available: old data model fully removed; new default menu and key bindings. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2018-03-21
+			<br>
+			release: 1.2.8
+		<td bgcolor="#ddddff">
+			Release 1.2.8 <a href="releases"> available, with all parts of the code handling the new data model. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-12-26
+			<br>
+			release: 1.2.7
+		<td bgcolor="#ddddff">
+			Release 1.2.7 <a href="releases"> available, with padstacks. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-10-11
+			<br>
+			release: 1.2.6
+		<td bgcolor="#ddddff">
+			Release 1.2.6 <a href="releases"> available, with subcircuit terminals, dxf, hpgl, openscad and poly-clears-poly support. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-09-15
+			<br>
+			release: 1.2.5b
+		<td bgcolor="#ddddff">
+			Release 1.2.5b is <a href="releases"> is an 1.2.5 with a <b><a href="security/bug1.html">security fix</a>, please upgrade as soon as possible!</b>  </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-08-21
+			<br>
+			release: 1.2.5
+		<td bgcolor="#ddddff">
+			Release 1.2.5 is <a href="releases"> available: it is an 1.2.4 with a few critical bugfixes  </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-08-07
+			<br>
+			release: 1.2.4
+		<td bgcolor="#ddddff">
+			Release 1.2.4 is <a href="releases"> available, with subcircuit, eagle binary and protel autotrax support. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-05-30
+			<br>
+			release: 1.2.3
+		<td bgcolor="#ddddff">
+			Release 1.2.3 is <a href="releases"> available, with a new plugin system and editable soldermask and paste layers. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-04-10
+			<br>
+			release: 1.2.2
+		<td bgcolor="#ddddff"> 
+			Release 1.2.2 is <a href="releases"> available. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-03-12
+			<br>
+			opengl
+		<td bgcolor="#ddddff"> 
+			Opengl support available in svn HEAD. Thanks to Keith Packard.
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2017-02-17
+			<br>
+			EDA ecosystem, release: 1.2.1
+		<td bgcolor="#ddddff"> 
+			Release 1.2.1 is <a href="releases"> available. </a>
+			<br>
+			We've strengthen our connections to other EDA tools, trying to
+			contribute more to the <a href="devlog/20170212_ecosys.html">
+			EDA ecosystem</a>, by implementing more import and export plugins.
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2016-12-28
+			<br>
+			release: 1.2.0
+		<td bgcolor="#ddddff"> 
+			Release 1.2.0 is <a href="releases"> available. </a>
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2016-12-20
+			<br>
+			Official Debian packaging
+		<td bgcolor="#ddddff"> 
+			Dima Kogan volunteered to do the packaging for Debian. We may get in
+			testing, or if we are lucky, in the next stable. To ease packaging
+			an unscheduled intermediate version 1.1.4 was released. Thank you Dima!
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2016-11-02
+			<br>
+			Release: 1.1.3
+		<td bgcolor="#ddddff"> 
+			Available at <a href="releases/"> the download page </a>.
+			<br>
+			Features kicad compatibility, advanced search and the
+			lihata board format.
+
+		<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2016-09-04
+			<br>
+			Rebranding
+		<td bgcolor="#ddddff"> 
+			We have a new main page reflecting the transition how we regard pcb-rnd:
+			it is not much of just a fork of geda/pcb by now, but a separate PCB
+			editor with its own team and own course. File save/load compatibility is
+			maintained.
+
+	<tr>
+		<th align=right valign=top bgcolor="#ccccff" width="20%">
+			2016-08-24
+			<br>
+			Release 1.1.1
+		<td bgcolor="#ddddff">
+			Available at <a href="releases/"> the download page </a>.
+			<br>
+			The next development cycle will focus on editable/searchable attributes
+			and a new native file format.
+
+	</table>
+</table>
+
+</body>
+</html>
Index: tags/2.0.1/doc/plan.txt
===================================================================
--- tags/2.0.1/doc/plan.txt	(nonexistent)
+++ tags/2.0.1/doc/plan.txt	(revision 18980)
@@ -0,0 +1,136 @@
+user manual
+	1. intro: what is pcb-rnd; place in the generic workflow
+	2. model of the world
+		intro
+			real boards (terminology)
+			pcb-rnd terminology
+			limitations
+		board, global properties
+		layer groups and layers
+		atomic objects
+			lines
+			arcs
+			vias
+			polygons
+		composite objects
+			elements
+	3. where data is
+		board
+		paste buffers
+		footprint libraries
+			pcblib
+				static footprints
+				generated footprints
+		file formats
+			board
+				lihata
+				pcb
+				kicadl
+				kicad
+			footprint
+			import
+			export
+	4. invocation
+		TODO
+	5. user interface (hid plugins)
+		under the hood: actions
+		gtk
+			main window
+			menu + keys
+			misc dialogs
+				log window
+				cli
+			library dialog
+			propedit dialog
+			preferences dialog
+		batch
+		(lesstif: low prio)
+		(remote: not finished yet)
+		(sdl: not even started yet)
+	6. feature plugins							 included,buildin   name	     DocDraftComplete?
+ 		net auto-completion             no              [acompnet]			y
+ 		crop board to fit objects       yes, buildin    [autocrop]			y
+ 		auto place components           yes, buildin    [autoplace]
+ 		the original autorouter         yes, buildin    [autoroute]
+ 		flip board objects              yes, buildin    [boardflip]
+ 		diagnostic acts. for devs       no              [diag]
+ 		HID-independent GUI dialogs     yes, buildin    [dialogs]
+ 		distribute and align text       yes, buildin    [distaligntext]			y
+ 		distribute and align objs       yes, buildin    [distalign]
+ 		djopt board optimization        yes, buildin    [djopt]				y
+ 		draw cross-section (layers)     yes, buildin    [draw_csect]
+ 		fab layer in some exports       yes, buildin    [draw_fab]
+ 		font selection GUI              yes, buildin    [draw_fontsel]
+ 		font editor                     yes, buildin    [fontmode]
+ 		GPMI scripting                  yes, buildin    [gpmi]				y
+ 		push lines out of the way       yes, buildin    [jostle]
+ 		diagnostics: log HID calls      no              [loghid]
+ 		calculate toolpath for milling  no              [millpath]
+ 		minimal cut shorts              yes, buildin    [mincut]
+ 		old/obsolete actions            no              [oldactions]
+ 		combine selected polygons       yes, buildin    [polycombine]
+ 		stitch polygon at cursor        no              [polystitch]
+ 		object property editor          yes, buildin    [propedit]
+ 		puller                          yes, buildin    [puller]
+ 		query language                  yes, buildin    [query]				y
+ 		renumber action                 yes, buildin    [renumber]
+ 		report actions                  yes, buildin    [report]
+ 		the original rubberband         yes, buildin    [rubberband_orig]
+ 		command shorthands              yes, buildin    [shand_cmd]
+ 		netlist based dispenser         yes, buildin    [smartdisperse]
+ 		libstroke gestures              no              [stroke]
+ 		draw teardrops on pins          yes, buildin    [teardrops]
+ 		vendor drill mapping            yes, buildin    [vendordrill]			y
+	7. io and import plugins
+		Comparison table (build from data like tests/RTT/RTT_kicad*)
+		intro: io_lihata extra attention to pcb-rnd's native format
+		IO & Import plugins sorted by capability: Boards, footprints, and netlists parens=(in development)
+			Boards: io plugins that deal with boards  
+				lihata
+				pcb
+				kicadl
+				kicad
+				protel autotrax
+				(eagle)
+			Footprints: io plugins that deal with footprints
+				lihata
+				fp  -- handled by pcb
+				kicadl
+				kicad
+				protel autotrax -- 'components'
+				(eagle)
+				(mentor-cell)
+			Netlists: there are import and io plugins dealing with netlists
+				lihata
+				specctra dsn
+				geda  -- import_netlist plugin
+				tinycad
+				ltspice .net + .asc
+				kicadl
+				kicad
+				tinycad .net 
+				protel autotrax
+				Mentor graphics schematic
+				Electronic Design Interchange Format (EDIF import plugin)
+				tEDAx
+				mucs routing
+				(eagle)
+	8. utilities
+	9. appendix
+		glossary
+		full index/catalog of actions (generated)
+		full index/catalog of all plugins
+		how to build
+
+		
+_styleguide notes:_
+urls all lowercased (eg. GTK becomes gtk)
+pronouns: write to avoid pronouns, use user/developer, use she
+organization:  hierarchical with lots of links for people who have tunneled deep?
+navigation: don't add navigation in page, rely on browser navs
+html strict:  use standard html 1.0 
+css:  use css for looks without content modification 
+assets: generate assets (use dot, etc), assume make and same system is able to build pcb-rnd
+tables: use zebra styling for ease of reading 
+deps/requirements for pcb-rnd itself (we need an appendix table to live create the actions list)
+naming sections: despite lowercasing urls, keep naming concise so links have names that lead to sections with same names
Index: tags/2.0.1/doc/resources/logo.pcb
===================================================================
--- tags/2.0.1/doc/resources/logo.pcb	(nonexistent)
+++ tags/2.0.1/doc/resources/logo.pcb	(revision 18980)
@@ -0,0 +1,91 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 15240000nm 15240000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[13335000nm 8890000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,254000nm,1999996nm,800100nm,508000nm:Power,508000nm,2199894nm,999998nm,508000nm:Fat,2032000nm,3500120nm,1199896nm,635000nm:Sig-tight,254000nm,1625600nm,800100nm,304800nm"]
+
+Symbol['r' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+)
+Symbol['n' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+)
+Symbol['d' 304800nm]
+(
+	SymbolLine[508000nm 254000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+)
+
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/buffer_number" "0")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::conf::editor/show_solder_side" "0")
+Attribute("PCB::conf::editor/view/flip_x" "0")
+Attribute("PCB::conf::editor/view/flip_y" "0")
+
+Element["" "dip(2)" "rnd" "2*300" 0 6985000nm 6350000nm 635000nm 0 115 ""]
+(
+	Pin[7620000nm 0 2540000nm 1270000nm 2692400nm 999998nm "" "2" "thermal(0X,1X)"]
+
+	)
+Layer(1 "component")
+(
+	Polygon("clearpoly")
+	(
+		[635000nm 635000nm] [14605000nm 635000nm] [14605000nm 14605000nm] [635000nm 14605000nm] 
+	)
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/doc/resources/logo.svg
===================================================================
--- tags/2.0.1/doc/resources/logo.svg	(nonexistent)
+++ tags/2.0.1/doc/resources/logo.svg	(revision 18980)
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1300.4800" height="1300.4800" viewBox="-2.0000 -2.0000 10.0800 10.0800">
+<rect x="0.0000" y="0.0000" width="5.0800" height="5.0800" fill="#464646" stroke="none"/>
+<g id="layer_7_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="5.0800" height="5.0800" stroke-width="0.2540" stroke="#228b22" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <circle cx="2.6200" cy="2.5000" r="1.2700" stroke-width="0.2540" fill="#cccccc" stroke="none"/>
+ <circle cx="2.6200" cy="2.5000" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_8_bottom">
+<!--normal-->
+ <circle cx="2.6200" cy="2.5000" r="1.2700" stroke-width="0.2540" fill="#cccccc" stroke="none"/>
+ <circle cx="2.6200" cy="2.5000" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="4.1496,0.0000 5.0800,0.0000 5.0800,5.0800 4.1496,5.0800 4.1496,3.4089 4.1677,3.4059 4.2151,3.3901 4.2594,3.3671 4.2997,3.3374 4.3347,3.3018 4.3638,3.2612 4.3853,3.2161 4.4481,3.0436 4.4919,2.8652 4.5184,2.6835 4.5272,2.5000 4.5184,2.3165 4.4919,2.1348 4.4481,1.9564 4.3873,1.7830 4.3651,1.7380 4.3359,1.6972 4.3006,1.6614 4.2602,1.6316 4.2157,1.6085 4.1680,1.5926 4.1496,1.5896 " stroke-width="0.010" stroke="#008800" fill="#008800"/>
+ <polygon points="2.6207,0.0000 4.1496,0.0000 4.1496,1.5896 4.1185,1.5844 4.0683,1.5841 4.0186,1.5916 3.9708,1.6067 3.9259,1.6292 3.8850,1.6584 3.8493,1.6936 3.8195,1.7340 3.7964,1.7786 3.7805,1.8263 3.7723,1.8758 3.7719,1.9260 3.7794,1.9756 3.7955,2.0231 3.8373,2.1380 3.8665,2.2568 3.8841,2.3778 3.8900,2.5000 3.8841,2.6222 3.8665,2.7432 3.8373,2.8620 3.7968,2.9774 3.7808,3.0247 3.7734,3.0741 3.7738,3.1241 3.7819,3.1734 3.7977,3.2208 3.8207,3.2652 3.8504,3.3054 3.8860,3.3405 3.9266,3.3695 3.9713,3.3919 4.0190,3.4070 4.0684,3.4145 4.1184,3.4141 4.1496,3.4089 4.1496,5.0800 2.6207,5.0800 2.6207,4.4072 2.8035,4.3984 2.9852,4.3719 3.1636,4.3281 3.3370,4.2673 3.3820,4.2451 3.4228,4.2159 3.4586,4.1806 3.4884,4.1402 3.5115,4.0957 3.5274,4.0480 3.5356,3.9985 3.5359,3.9483 3.5284,3.8986 3.5133,3.8508 3.4908,3.8059 3.4616,3.7650 3.4264,3.7293 3.3859,3.6995 3.3414,3.6764 3.2937,3.6605 3.2442,3.6523 3.1940,3.6519 3.1444,3.6594 3.0969,3.6755 2.9820,3.7173 2.8632,3.7465 2.7422,3.7641 2.6207,3.7700 2.6207,1.2300 2.7422,1.2359 2.8632,1.2535 2.9820,1.2827 3.0974,1.3232 3.1447,1.3392 3.1941,1.3466 3.2441,1.3462 3.2934,1.3381 3.3408,1.3223 3.3852,1.2993 3.4254,1.2696 3.4605,1.2340 3.4895,1.1934 3.5119,1.1487 3.5270,1.1010 3.5345,1.0516 3.5341,1.0016 3.5259,0.9523 3.5101,0.9049 3.4871,0.8606 3.4574,0.8203 3.4218,0.7853 3.3812,0.7562 3.3361,0.7347 3.1636,0.6719 2.9852,0.6281 2.8035,0.6016 2.6207,0.5928 " stroke-width="0.010" stroke="#008800" fill="#008800"/>
+ <polygon points="1.0904,0.0000 2.6207,0.0000 2.6207,0.5928 2.6200,0.5928 2.4365,0.6016 2.2548,0.6281 2.0764,0.6719 1.9030,0.7327 1.8580,0.7549 1.8172,0.7841 1.7814,0.8194 1.7516,0.8598 1.7285,0.9043 1.7127,0.9520 1.7044,1.0015 1.7041,1.0517 1.7116,1.1014 1.7267,1.1492 1.7492,1.1941 1.7784,1.2350 1.8136,1.2707 1.8540,1.3005 1.8986,1.3236 1.9463,1.3395 1.9958,1.3477 2.0460,1.3481 2.0956,1.3406 2.1431,1.3245 2.2580,1.2827 2.3768,1.2535 2.4978,1.2359 2.6200,1.2300 2.6207,1.2300 2.6207,3.7700 2.6200,3.7700 2.4978,3.7641 2.3768,3.7465 2.2580,3.7173 2.1426,3.6768 2.0953,3.6608 2.0459,3.6534 1.9959,3.6538 1.9466,3.6619 1.8992,3.6777 1.8548,3.7007 1.8146,3.7304 1.7795,3.7660 1.7505,3.8066 1.7281,3.8513 1.7130,3.8990 1.7055,3.9484 1.7059,3.9984 1.7141,4.0477 1.7299,4.0951 1.7529,4.1394 1.7826,4.1797 1.8182,4.2147 1.8588,4.2438 1.9039,4.2653 2.0764,4.3281 2.2548,4.3719 2.4365,4.3984 2.6200,4.4072 2.6207,4.4072 2.6207,5.0800 1.0904,5.0800 1.0904,3.4104 1.1215,3.4156 1.1717,3.4159 1.2214,3.4084 1.2692,3.3933 1.3141,3.3708 1.3550,3.3416 1.3907,3.3064 1.4205,3.2660 1.4436,3.2214 1.4595,3.1737 1.4677,3.1242 1.4681,3.0740 1.4606,3.0244 1.4445,2.9769 1.4027,2.8620 1.3735,2.7432 1.3559,2.6222 1.3500,2.5000 1.3559,2.3778 1.3735,2.2568 1.4027,2.1380 1.4432,2.0226 1.4592,1.9753 1.4666,1.9259 1.4663,1.8759 1.4581,1.8266 1.4423,1.7792 1.4193,1.7348 1.3896,1.6946 1.3540,1.6595 1.3134,1.6305 1.2687,1.6081 1.2210,1.5930 1.1716,1.5855 1.1216,1.5859 1.0904,1.5911 " stroke-width="0.010" stroke="#008800" fill="#008800"/>
+ <polygon points="0.0000,0.0000 1.0904,0.0000 1.0904,1.5911 1.0723,1.5941 1.0249,1.6099 0.9806,1.6329 0.9403,1.6626 0.9053,1.6982 0.8762,1.7388 0.8547,1.7839 0.7919,1.9564 0.7481,2.1348 0.7216,2.3165 0.7128,2.5000 0.7216,2.6835 0.7481,2.8652 0.7919,3.0436 0.8527,3.2170 0.8749,3.2620 0.9041,3.3028 0.9394,3.3386 0.9798,3.3684 1.0243,3.3915 1.0720,3.4073 1.0904,3.4104 1.0904,5.0800 0.0000,5.0800 " stroke-width="0.010" stroke="#008800" fill="#008800"/>
+ <circle cx="2.6200" cy="2.5000" r="1.2700" stroke-width="0.2540" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.6200" cy="2.5000" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_2_topmask" opacity="0.25">
+<!--normal-->
+<!-- Composite: reset -->
+<defs>
+<g id="comp_pixel_1">
+ <rect x="0.0000" y="0.0000" width="5.0800" height="5.0800" fill="#00ff00" stroke="none"/>
+ <circle cx="2.6200" cy="2.5000" r="1.3462" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+</g>
+<mask id="comp_clip_1" maskUnits="userSpaceOnUse" x="0" y="0" width="5.0800" height="5.0800">
+<rect x="0.0000" y="0.0000" width="5.0800" height="5.0800" fill="#FFFFFF" stroke="none"/>
+<circle cx="2.6200" cy="2.5000" r="1.3462" stroke-width="0.0000" fill="#000000" stroke="none"/>
+</mask>
+</defs>
+<use xlink:href="#comp_pixel_1" mask="url(#comp_clip_1)"/>
+<!-- Composite: finished -->
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+<!-- Composite: reset -->
+<defs>
+<g id="comp_pixel_2">
+ <line x1="1.4961" y1="3.8653" x2="1.4961" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="1.4961" y1="3.8653" x2="1.6421" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="1.6421" y1="3.7192" x2="1.9342" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="1.3500" y1="3.7192" x2="1.4961" y2="3.8653" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.4308" y1="3.8653" x2="2.4308" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.4308" y1="3.8653" x2="2.5768" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.5768" y1="3.7192" x2="2.7229" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.7229" y1="3.7192" x2="2.8689" y2="3.8653" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.8689" y1="3.8653" x2="2.8689" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="2.2847" y1="3.7192" x2="2.4308" y2="3.8653" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.8036" y1="3.1350" x2="3.8036" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.6576" y1="4.3034" x2="3.8036" y2="4.1574" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.3655" y1="4.3034" x2="3.6576" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.2194" y1="4.1574" x2="3.3655" y2="4.3034" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.2194" y1="3.8653" x2="3.2194" y2="4.1574" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.2194" y1="3.8653" x2="3.3655" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.3655" y1="3.7192" x2="3.6576" y2="3.7192" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+ <line x1="3.6576" y1="3.7192" x2="3.8036" y2="3.8653" stroke-width="0.1778" stroke="#ffffff" stroke-linecap="round"/>
+</g>
+<mask id="comp_clip_2" maskUnits="userSpaceOnUse" x="0" y="0" width="5.0800" height="5.0800">
+<line x1="1.4961" y1="3.8653" x2="1.4961" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="1.4961" y1="3.8653" x2="1.6421" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="1.6421" y1="3.7192" x2="1.9342" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="1.3500" y1="3.7192" x2="1.4961" y2="3.8653" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.4308" y1="3.8653" x2="2.4308" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.4308" y1="3.8653" x2="2.5768" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.5768" y1="3.7192" x2="2.7229" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.7229" y1="3.7192" x2="2.8689" y2="3.8653" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.8689" y1="3.8653" x2="2.8689" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="2.2847" y1="3.7192" x2="2.4308" y2="3.8653" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.8036" y1="3.1350" x2="3.8036" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.6576" y1="4.3034" x2="3.8036" y2="4.1574" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.3655" y1="4.3034" x2="3.6576" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.2194" y1="4.1574" x2="3.3655" y2="4.3034" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.2194" y1="3.8653" x2="3.2194" y2="4.1574" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.2194" y1="3.8653" x2="3.3655" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.3655" y1="3.7192" x2="3.6576" y2="3.7192" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+<line x1="3.6576" y1="3.7192" x2="3.8036" y2="3.8653" stroke-width="0.1778" stroke="#FFFFFF" stroke-linecap="round"/>
+</mask>
+</defs>
+<use xlink:href="#comp_pixel_2" mask="url(#comp_clip_2)"/>
+<!-- Composite: finished -->
+<!-- Composite: reset -->
+<defs>
+<g id="comp_pixel_3">
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.6200" cy="2.5000" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<mask id="comp_clip_3" maskUnits="userSpaceOnUse" x="0" y="0" width="5.0800" height="5.0800">
+<circle cx="2.6200" cy="2.5000" r="0.5000" stroke-width="0.0000" fill="#FFFFFF" stroke="none"/>
+</mask>
+</defs>
+<use xlink:href="#comp_pixel_3" mask="url(#comp_clip_3)"/>
+<!-- Composite: finished -->
+</g>
+</svg>
Index: tags/2.0.1/doc/resources/logo128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/logo128.png
===================================================================
--- tags/2.0.1/doc/resources/logo128.png	(nonexistent)
+++ tags/2.0.1/doc/resources/logo128.png	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/logo128.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/resources/logo16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/logo16.png
===================================================================
--- tags/2.0.1/doc/resources/logo16.png	(nonexistent)
+++ tags/2.0.1/doc/resources/logo16.png	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/logo16.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/resources/logo256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/logo256.png
===================================================================
--- tags/2.0.1/doc/resources/logo256.png	(nonexistent)
+++ tags/2.0.1/doc/resources/logo256.png	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/logo256.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/resources/logo32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/logo32.png
===================================================================
--- tags/2.0.1/doc/resources/logo32.png	(nonexistent)
+++ tags/2.0.1/doc/resources/logo32.png	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/logo32.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/resources/logo32.xpm
===================================================================
--- tags/2.0.1/doc/resources/logo32.xpm	(nonexistent)
+++ tags/2.0.1/doc/resources/logo32.xpm	(revision 18980)
@@ -0,0 +1,295 @@
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 256 2",
+/* colors */
+"   c #000000",
+" . c #838D91",
+" X c #365938",
+" o c #5F6767",
+" O c #E2E0E1",
+" + c #799A7D",
+" @ c #9FA9B3",
+" # c #2F5331",
+" $ c #B1C3B4",
+" % c #2B552D",
+" & c #2D512F",
+" * c #6B6F76",
+" = c #DBDADA",
+" - c #2A532C",
+" ; c #2B512D",
+" : c #99A3AD",
+" > c #AEBFB1",
+" , c #2A4F2C",
+" < c #729276",
+" 1 c #294F2B",
+" 2 c #859396",
+" 3 c #284F2A",
+" 4 c #709274",
+" 5 c #6C9870",
+" 6 c #274F29",
+" 7 c #264F28",
+" 8 c #254F27",
+" 9 c #264D28",
+" 0 c #254D27",
+" q c #244D26",
+" w c #234D25",
+" e c #939DA7",
+" r c #244B26",
+" t c #6A8C6E",
+" y c #8F99A3",
+" u c #8F97A3",
+" i c #6E737C",
+" p c #8D97A1",
+" a c #1B451D",
+" s c #8B959F",
+" d c #608C64",
+" f c #9FAFA2",
+" g c #89939D",
+" h c #9DAFA0",
+" j c #5D8861",
+" k c #87919B",
+" l c #708E77",
+" z c #96AB99",
+" x c #727B83",
+" c c #113D13",
+" v c #58785C",
+" b c #547458",
+" n c #537457",
+" m c #57645B",
+" M c #4B6C4F",
+" N c #101112",
+" B c #747C7E",
+" V c #7D9D80",
+" C c #73787D",
+" Z c #7B9288",
+" A c #B1C2B3",
+" S c #879497",
+" D c #55625C",
+" F c #636A6D",
+" G c #274828",
+" H c #244C25",
+" J c #9FB6A1",
+" K c #A0B0A2",
+" L c #9DAE9F",
+" P c #709376",
+" I c #87909A",
+" U c #5B855E",
+" Y c #858E98",
+" T c #558558",
+" R c #7E9987",
+" E c #678B6D",
+" W c #CAD3CB",
+" Q c #4E7B51",
+" ! c #49794C",
+" ~ c #728D7B",
+" ^ c #4C6D4F",
+" / c #496F4C",
+" ( c #B8C1B9",
+" ) c #6E7577",
+" _ c #465749",
+" ` c #B3BBB4",
+" ' c #37693A",
+" ] c #3B5D3E",
+" [ c #646D6D",
+" { c #E7E6E7",
+" } c #E2E4E2",
+" | c #38513B",
+".  c #E1E2E1",
+".. c #9099A2",
+".X c #384D3B",
+".o c #7D858C",
+".O c #6C6F78",
+".+ c #DBDCDB",
+".@ c #729877",
+".# c #2C512F",
+".$ c #879399",
+".% c #719476",
+".& c #709475",
+".* c #D8D8D8",
+".= c #719276",
+".- c #709275",
+".; c #6F9274",
+".: c #6E9073",
+".> c #949FA9",
+"., c #6D9072",
+".< c #6D8E72",
+".1 c #6A8E6F",
+".2 c #6B8C70",
+".3 c #67926C",
+".4 c #303133",
+".5 c #909BA5",
+".6 c #678C6C",
+".7 c #8E99A3",
+".8 c #68886D",
+".9 c #8D97A2",
+".0 c #CDCECD",
+".q c #517A53",
+".w c #8EA18F",
+".e c #9BB39F",
+".r c #686F77",
+".t c #517053",
+".y c #2C2F32",
+".u c #F3EDF2",
+".i c #456047",
+".p c #426444",
+".a c #3C6A3E",
+".s c #58645D",
+".d c #161719",
+".f c #39683B",
+".g c #969EA7",
+".h c #39543B",
+".j c #7B9B7F",
+".k c #2D562F",
+".l c #B1C2B4",
+".z c #2D522F",
+".x c #6B7076",
+".c c #677F68",
+".v c #658166",
+".b c #677B68",
+".n c #89909A",
+".m c #6F9773",
+".M c #2E4830",
+".N c #98A2AC",
+".B c #565E5E",
+".V c #265028",
+".C c #274E29",
+".Z c #6F9173",
+".A c #264E28",
+".S c #254E27",
+".D c #6E8F72",
+".F c #244E26",
+".G c #254C27",
+".H c #274829",
+".J c #244C26",
+".K c #234C25",
+".L c #234A25",
+".P c #214A23",
+".I c #909AA4",
+".U c #69896D",
+".Y c #6F747D",
+".T c #8E98A2",
+".R c #577758",
+".E c #68876C",
+".W c #8C96A0",
+".Q c #658769",
+".! c #7B828C",
+".~ c #5E8D62",
+".^ c #9EB0A1",
+"./ c #9DAEA0",
+".( c #7F9789",
+".) c #456746",
+"._ c #C2CFC4",
+".` c #859E88",
+".' c #1D2022",
+".] c #315732",
+".[ c #426746",
+".{ c #7C927F",
+".} c #B1C1B3",
+".| c #8B919B",
+"X  c #2E4D2F",
+"X. c #2A512B",
+"XX c #264F27",
+"Xo c #224B23",
+"XO c #7F878F",
+"X+ c #8D97A0",
+"X@ c #74947A",
+"X# c #88919B",
+"X$ c #6B9071",
+"X% c #62696F",
+"X& c #57845A",
+"X* c #6B8C71",
+"X= c #698E6F",
+"X- c #678C6D",
+"X; c #638A69",
+"X: c #1A1B1B",
+"X> c #697179",
+"X, c #477A4A",
+"X< c #5E7E64",
+"X1 c #467649",
+"X2 c #2F3336",
+"X3 c #F6F1F6",
+"X4 c #416A44",
+"X5 c #6D7876",
+"X6 c #436446",
+"X7 c #8E949D",
+"X8 c #060707",
+"X9 c #415644",
+"X0 c #385C3B",
+"Xq c #3E5241",
+"Xw c #355A38",
+"Xe c #355838",
+"Xr c #E2E3E2",
+"Xt c #7B9B80",
+"Xy c #7A997F",
+"Xu c #8E9AA0",
+"Xi c #E0DFE0",
+"Xp c #DFDFDF",
+"Xa c #315434",
+"Xs c #DDDFDD",
+"Xd c #739B78",
+"Xf c #729577",
+"Xg c #739378",
+"Xh c #D9D9D9",
+"Xj c #D8D9D8",
+"Xk c #709375",
+"Xl c #6F9374",
+"Xz c #6F9174",
+"Xx c #6E9173",
+"Xc c #6B9570",
+"Xv c #6D8F72",
+"Xb c #919CA6",
+"Xn c #698D6E",
+"Xm c #909AA5",
+"XM c #8F9AA4",
+"XN c #69896E",
+"XB c #8E98A3",
+"XV c #8D96A2",
+"XC c #8C96A1",
+"XZ c #7C848E",
+"XA c #8B96A0",
+"XS c #65856A",
+"XD c #CACDCA",
+"XF c #5F7F64",
+"XG c #879E88",
+"XH c #899A8A",
+"XJ c #889889",
+"XK c #2B2E31",
+"XL c #446546",
+"XP c #EDE8EC",
+"XI c #546359",
+"XU c None",
+/* pixels */
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXkXf.<.<Xk.&.;XxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXx.< n ] & 1 3.# X ^.UXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXx.2.z.A 6 6 6 6 6 6 7 9 tXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXx v.S 6 6 6 6 6 6 6 6 6 Q.:XxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXS H 7.H.XXI mXqX .F.L.~XxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXx.;X<X5X7 :XM.9.>.n BX;XlXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXv.8XvXx ~XC s s p s.W p pXA u.(.,.;XSXNXxXxXxXxXxXx",
+"XxXxXxXxXx.2 #.KXw lXC p.W.W.W p.W.W p p pXV RX6 q 9.QXxXxXxXxXx",
+"XxXxXxXx.; M 7 6Xo ..W.W p.W p y y p.W.W p.W IX. 6 6X4XzXxXxXxXx",
+"XxXxXxXx PXa 6 6.M.g p.W.W.T xX2XKX> y p.W.WX#X9 7 6 7.@XxXxXxXx",
+"XxXxXxXxX*.C 6 7.s y p.W p.r        X%.W.W.WXM o.F 6 r.3XxXxXxXx",
+"XxXxXxXx.E H 6XX ).W.W.W.5.d         N e p p.T * - 6.G jXxXxXxXx",
+"XxXxXxXxXF 0 6 8 C s p p pX8           @ p.W p.O.k 6 9X&.:XxXxXx",
+"XxXxXxXxXN.K 6 7 [ p.W.W.I.y        .4.I.W p p.x.V 6.G dXxXxXxXx",
+"XxXxXxXxXv , 6 6 _Xm s.W p k.'    X:...W.W p y D.S 6.L 5XxXxXxXx",
+"XxXxXxXx.%Xe 6 6 G.| s.W.W.WXbXO.o.N.W p.W p Y.h 6 6 %XdXxXxXxXx",
+"XxXxXxXxXx b.S 6.P Z p p.W.W p.W p.W.W p p.W S q 6.C !.:XxXxXxXx",
+"XxXxXxXxXx.Z /.f T.,.$.W p.W.W p.W.W.W p.TX+.e.{.aX1.mXxXxXxXxXx",
+"XxXxXxXxXxXxXz.-XxXx.: 2 sXB.W p.W.W.7 gXuX@.l h.-XzXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXzXL |.B i.!XZ.Y FX9X0.D $./XxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXt.6.`.R.] w.p.i.b ;.V q.) V._ hXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXn.+ W.0 `.c.t.*XsXDXH.K.vXp (Xi.^XxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXx.j =X$.[.F.J.wXJ aX3 cXr.qXc.} hXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXx.jXj.1.;Xl U JXG '.uX, }XyX- A LXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXx +XhX=XxXxXx > f EXP.6 z O.  { KXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXx.,.-XxXxXxXx.,.-XxXzXx.,.=Xg < 4XxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx",
+"XxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXxXx"
+};
Index: tags/2.0.1/doc/resources/logo64.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/logo64.png
===================================================================
--- tags/2.0.1/doc/resources/logo64.png	(nonexistent)
+++ tags/2.0.1/doc/resources/logo64.png	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/logo64.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/resources/logo64.xpm
===================================================================
--- tags/2.0.1/doc/resources/logo64.xpm	(nonexistent)
+++ tags/2.0.1/doc/resources/logo64.xpm	(revision 18980)
@@ -0,0 +1,618 @@
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"64 64 547 2",
+/* colors */
+"   c #000000",
+" . c #829C86",
+" X c #3F4941",
+" o c #365738",
+" O c #75A879",
+" + c #365538",
+" @ c #B4C7B7",
+" # c #7A987E",
+" $ c #E0DEDF",
+" % c #79987D",
+" & c #305532",
+" * c #E0DCDF",
+" = c #77987B",
+" - c #DEDCDD",
+" ; c #729C76",
+" : c #344736",
+" > c #749478",
+" , c #2B512D",
+" < c #709674",
+" 1 c #28512A",
+" 2 c #294F2B",
+" 3 c #275129",
+" 4 c #274F29",
+" 5 c #6F9273",
+" 6 c #264F28",
+" 7 c #607C61",
+" 8 c #264D28",
+" 9 c #6E9072",
+" 0 c #669C6A",
+" q c #254D27",
+" w c #244D26",
+" e c #D5D2D4",
+" r c #244B26",
+" t c #234B25",
+" y c #224B24",
+" u c #6B8C6F",
+" i c #919BA5",
+" p c #224924",
+" a c #6A8C6E",
+" s c #204922",
+" d c #619665",
+" f c #1F4921",
+" g c #8F99A3",
+" h c #7B9682",
+" j c #8E97A2",
+" k c #1D471F",
+" l c #8D97A1",
+" z c #799480",
+" x c #1C471E",
+" c c #8C95A0",
+" v c #91969B",
+" b c #1B451D",
+" n c #8B959F",
+" m c #8A959E",
+" M c #8A939E",
+" N c #89939D",
+" B c #638267",
+" V c #174119",
+" C c #87919B",
+" Z c #8B9095",
+" A c #607C64",
+" S c #646B72",
+" D c #54595F",
+" F c #5F7C63",
+" G c #5E7A62",
+" H c #989EA5",
+" J c #CDDACF",
+" K c #75767C",
+" L c #697A70",
+" P c #547058",
+" I c #537057",
+" U c #4F7453",
+" Y c #516C55",
+" T c #575C5B",
+" R c #888E95",
+" E c #777C81",
+" W c #4C6A50",
+" Q c #4B6A4F",
+" ! c #4B684F",
+" ~ c #BACCBC",
+" ^ c #374C38",
+" / c #446248",
+" ( c #9CA6AF",
+" ) c #415E45",
+" _ c #2B542C",
+" ` c #69A16C",
+" ' c #285229",
+" ] c #68A16B",
+" [ c #2A482B",
+" { c #264E27",
+" } c #254E26",
+" | c #959EA8",
+".  c #949EA7",
+".. c #254C26",
+".X c #A9B8AB",
+".o c #939CA6",
+".O c #828A92",
+".+ c #629B65",
+".@ c #639966",
+".# c #A7B6A9",
+".$ c #909AA3",
+".% c #808890",
+".& c #7D868D",
+".* c #5D9360",
+".= c #5C935F",
+".- c #879D90",
+".; c #686E75",
+".: c #719377",
+".> c #8D9196",
+"., c #588F5B",
+".< c #9AAE9C",
+".1 c #869099",
+".2 c #858E98",
+".3 c #6D9173",
+".4 c #848E97",
+".5 c #838C96",
+".6 c #828C95",
+".7 c #727A82",
+".8 c #707880",
+".9 c #92A894",
+".0 c #69896F",
+".q c #7D8690",
+".w c #4D8350",
+".e c #474C51",
+".r c #97A9A6",
+".t c #575F5A",
+".y c #FAF8FA",
+".u c #58575B",
+".i c #A7B1B9",
+".p c #F9F6F9",
+".a c #A6AFB8",
+".s c #74797D",
+".d c #1E2022",
+".f c #0E0E0F",
+".g c #525555",
+".h c #A3ABB5",
+".j c #4C5D4F",
+".k c #515354",
+".l c #416544",
+".z c #4E4F51",
+".x c #8A9B99",
+".c c #435F46",
+".v c #B6BDB7",
+".b c #B5BDB6",
+".n c #EDECED",
+".m c #B1BFB2",
+".M c #ECEAEC",
+".N c #3F5D42",
+".B c #56635C",
+".V c #38673B",
+".C c #585B5E",
+".Z c #365F39",
+".A c #E6E6E6",
+".S c #54575A",
+".D c #37593A",
+".F c #38573B",
+".G c #E4E4E4",
+".H c #E5E2E5",
+".J c #37573A",
+".K c #535359",
+".L c #525358",
+".P c #E2E2E2",
+".I c #E1E0E1",
+".U c #335536",
+".Y c #E0E0E0",
+".T c #E0DEE0",
+".R c #315534",
+".E c #2F5332",
+".W c #77967C",
+".Q c #DDDCDD",
+".! c #DCDCDC",
+".~ c #719C76",
+".^ c #2B552E",
+"./ c #749679",
+".( c #DBDADB",
+".) c #709A75",
+"._ c #DADADA",
+".` c #DBD8DB",
+".' c #719676",
+".] c #59905B",
+".[ c #719476",
+".{ c #709475",
+".} c #709275",
+".| c #5D845F",
+"X  c #859197",
+"X. c #6F9274",
+"XX c #6E9273",
+"Xo c #656B71",
+"XO c #6E9073",
+"X+ c #6B9470",
+"X@ c #848D96",
+"X# c #6D9072",
+"X$ c #6E8E73",
+"X% c #97AB98",
+"X& c #6C9071",
+"X* c #D1D8D1",
+"X= c #939DA8",
+"X- c #6C8E71",
+"X; c #95A996",
+"X: c #D2D2D2",
+"X> c #6B8C70",
+"X, c #94A995",
+"X< c #698E6E",
+"X1 c #909BA5",
+"X2 c #93A794",
+"X3 c #698A6E",
+"X4 c #678C6C",
+"X5 c #94A395",
+"X6 c #7E8790",
+"X7 c #68886D",
+"X8 c #67886C",
+"X9 c #4E8450",
+"X0 c #658A6A",
+"Xq c #7C858E",
+"Xw c #82848A",
+"Xe c #8C95A1",
+"Xr c #8B95A0",
+"Xt c #CBCCCB",
+"Xy c #65846A",
+"Xu c #8A959F",
+"Xi c #4B7E4D",
+"Xp c #FEFBFD",
+"Xa c #777F89",
+"Xs c #899F8A",
+"Xd c #767F88",
+"Xf c #666D75",
+"Xg c #7C7E84",
+"Xh c #555B61",
+"Xj c #607E65",
+"Xk c #585C5A",
+"Xl c #5F7C64",
+"Xz c #636B72",
+"Xx c #F9F7F8",
+"Xc c #555C57",
+"Xv c #A7B0B8",
+"Xb c #67666C",
+"Xn c #437445",
+"Xm c #A5AEB6",
+"XM c #4F555B",
+"XN c #2E3134",
+"XB c #A3ACB4",
+"XV c #3D4146",
+"XC c #4C5C4E",
+"XZ c #476449",
+"XA c #57745C",
+"XS c #3D703F",
+"XD c #436645",
+"XF c #465C48",
+"XG c #416443",
+"XH c #050505",
+"XJ c #3F5E41",
+"XK c #38663A",
+"XL c #3C5E3E",
+"XP c #575A5C",
+"XI c #111314",
+"XU c #375E39",
+"XY c #809F84",
+"XT c #365E38",
+"XR c #336035",
+"XE c #809B84",
+"XW c #3B523D",
+"XQ c #326034",
+"X! c #7F9B83",
+"X~ c #76A97A",
+"X^ c #38543A",
+"X/ c #708571",
+"X( c #525257",
+"X) c #75A579",
+"X_ c #335835",
+"X` c #3D423F",
+"X' c #7A977E",
+"X] c #4F5054",
+"X[ c #315433",
+"X{ c #3C423E",
+"X} c #79977D",
+"X| c #39463B",
+"o  c #6B816C",
+"o. c #38463A",
+"oX c #70A374",
+"oo c #39443B",
+"oO c #6FA373",
+"o+ c #2D562F",
+"o@ c #729D76",
+"o# c #6DA571",
+"o$ c #364638",
+"o% c #374439",
+"o& c #697F6A",
+"o* c #709F74",
+"o= c #2E5230",
+"o- c #778A85",
+"o; c #2D522F",
+"o: c #6DA171",
+"o> c #2B542D",
+"o, c #2B522D",
+"o< c #DBD9DA",
+"o1 c #719775",
+"o2 c #709774",
+"o3 c #2A502C",
+"o4 c #DAD7D9",
+"o5 c #28522A",
+"o6 c #98A2AC",
+"o7 c #29502B",
+"o8 c #28502A",
+"o9 c #294E2B",
+"o0 c #2C482E",
+"oq c #275029",
+"ow c #265028",
+"oe c #2A482C",
+"or c #264E28",
+"ot c #55585D",
+"oy c #254E27",
+"ou c #235025",
+"oi c #254C27",
+"op c #54565C",
+"oa c #244C26",
+"os c #264828",
+"od c #234C25",
+"of c #244A26",
+"og c #929CA6",
+"oh c #234A25",
+"oj c #808C91",
+"ok c #61666C",
+"ol c #214A23",
+"oz c #224824",
+"ox c #204A22",
+"oc c #214823",
+"ov c #629566",
+"ob c #688B6C",
+"on c #658F69",
+"om c #8F98A3",
+"oM c #204622",
+"oN c #3E4043",
+"oB c #8E98A2",
+"oV c #1D481F",
+"oC c #6D747B",
+"oZ c #8D96A1",
+"oA c #618F65",
+"oS c #8C96A0",
+"oD c #8B969F",
+"oF c #8B949F",
+"oG c #909E90",
+"oH c #8A949E",
+"oJ c #788089",
+"oK c #628166",
+"oL c #869D90",
+"oP c #728F79",
+"oI c #7B7D82",
+"oU c #607D64",
+"oY c #96AE99",
+"oT c #133C15",
+"oR c #56875A",
+"oE c #707881",
+"oW c #6B8972",
+"oQ c #58755C",
+"o! c #557959",
+"o~ c #7F8589",
+"o^ c #8BA28E",
+"o/ c #536F57",
+"o( c #415D42",
+"o) c #637D6A",
+"o_ c #88A08B",
+"o` c #4D6B51",
+"o' c #57595B",
+"o] c #212426",
+"o[ c #859A88",
+"o{ c #385B39",
+"o} c #959DA5",
+"o| c #728672",
+"O  c #49674D",
+"O. c #0B0C0D",
+"OX c #46634A",
+"Oo c #3F4140",
+"OO c #B2C5B4",
+"O+ c #B4BDB6",
+"O@ c #EBEEEC",
+"O# c #9BA5AE",
+"O$ c #9AA3AD",
+"O% c #274F28",
+"O& c #679C6A",
+"O* c #959FA8",
+"O= c #7F9C85",
+"O- c #659A68",
+"O; c #929BA5",
+"O: c #525359",
+"O> c #224923",
+"O, c #254126",
+"O< c #629665",
+"O1 c #8D97A0",
+"O2 c #DBE2DC",
+"O3 c #8B959E",
+"O4 c #5B5F65",
+"O5 c #D9E0DA",
+"O6 c #9DB59F",
+"O7 c #5A5D64",
+"O8 c #59905C",
+"O9 c #88919B",
+"O0 c #87919A",
+"Oq c #676D74",
+"Ow c #868F99",
+"Oe c #848D97",
+"Or c #838D96",
+"Ot c #6B9071",
+"Oy c #95AB97",
+"Ou c #828B95",
+"Oi c #717981",
+"Op c #698E6F",
+"Oa c #6B8871",
+"Os c #6F777F",
+"Od c #C9D2CA",
+"Of c #517C54",
+"Og c #7B858E",
+"Oh c #81848A",
+"Oj c #8B9E97",
+"Ok c #C7D0C8",
+"Ol c #FDFBFD",
+"Oz c #FAF9FA",
+"Ox c #69686F",
+"Oc c #F9F7F9",
+"Ov c #212325",
+"Ob c #A7AEB9",
+"On c #F8F5F8",
+"Om c #6E8477",
+"OM c #F5F5F5",
+"ON c #427245",
+"OB c #A3ACB5",
+"OV c #829184",
+"OC c #0B0B0C",
+"OZ c #F2F1F2",
+"OA c #71747A",
+"OS c #436246",
+"OD c #3C6C3F",
+"OF c #8D949C",
+"OG c #415E44",
+"OH c #405E43",
+"OJ c #4B4C4E",
+"OK c #3B663E",
+"OL c #E9E7E9",
+"OP c #E7E7E7",
+"OI c #E6E5E6",
+"OU c #39583C",
+"OY c #E5E5E5",
+"OT c #E4E3E4",
+"OR c #365839",
+"OE c #365639",
+"OW c #808C8F",
+"OQ c #525258",
+"O! c #335636",
+"O~ c #515057",
+"O^ c #E0DFE0",
+"O/ c #325435",
+"O( c #DFDFDF",
+"O) c #485A4E",
+"O_ c #2E5231",
+"O` c #DCDBDC",
+"O' c #75957A",
+"O] c #729977",
+"O[ c #749579",
+"O{ c #D8DDD8",
+"O} c #DAD9DA",
+"O| c #709775",
+"+  c #719576",
+"+. c #DAD7DA",
+"+X c #29502C",
+"+o c #588F5A",
+"+O c #6F9574",
+"++ c #709375",
+"+@ c #849D8C",
+"+# c #6F9374",
+"+$ c #6F9174",
+"+% c #D2DDD2",
+"+& c #849096",
+"+* c #6E9173",
+"+= c #6D9172",
+"+- c #D5D5D5",
+"+; c #6E8F73",
+"+: c #D6D3D6",
+"+> c #646A70",
+"+, c #D5D3D5",
+"+< c #838C95",
+"+1 c #6C8F71",
+"+2 c #D5D1D5",
+"+3 c #6B8F70",
+"+4 c #818A93",
+"+5 c #698D6E",
+"+6 c #D1D1D1",
+"+7 c #6A8B6F",
+"+8 c #5B755D",
+"+9 c #8F9AA4",
+"+0 c #CED1CE",
+"+q c #8F98A4",
+"+w c #68896D",
+"+e c #1E4821",
+"+r c #668B6B",
+"+t c #8E98A3",
+"+y c #84858C",
+"+u c #1D4820",
+"+i c #67876C",
+"+p c #65896A",
+"+a c #8D96A2",
+"+s c #82858A",
+"+d c #8C96A1",
+"+f c #66856B",
+"+g c #929E93",
+"+h c #7B848D",
+"+j c #65856A",
+"+k c #818389",
+"+l c #4C814E",
+"+z c #4D7F4F",
+"+x c #909E91",
+"+c c #4C7F4E",
+"+v c #8A949F",
+"+b c #CACBCA",
+"+n c #19441C",
+"+m c #89949E",
+"+M c #697078",
+"+N c #88929D",
+"+B c #628167",
+"+V c #778089",
+"+C c #8A9E8B",
+"+Z c #9CA3AA",
+"+A c #617F66",
+"+S c #607D65",
+"+D c #728B7A",
+"+F c #89988A",
+"+G c #5E7D63",
+"+H c #A9B1BA",
+"+J c #F9F6F8",
+"+K c #5C7B61",
+"+L c #829883",
+"+P c #466948",
+"+I c #8FAA93",
+"+U c #4D5D4F",
+"+Y c #4C5D4E",
+"+T c #58755D",
+"+R c #4A5D4C",
+"+E c #1B1C1E",
+"+W c #EDECEC",
+"+Q c #445746",
+"+! c #788E79",
+"+~ c #141617",
+"+^ c #3D5F3F",
+"+/ c #38673A",
+"+( c #595D5E",
+"+) c #84A288",
+"+_ c #83A287",
+"+` c #3A5D3C",
+"+' c None",
+/* pixels */
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+#.{+ +iX7X7X7X-.{++X.+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*.{Xy GO OE.FX[O_O_o= o.J.N I+AX-X.+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+* 9Xl /.R wor 4 4 4 4 4 4 4 4 6oy+X.J PX8+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+* !o7or 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 }ORX.+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X.XA 6 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4or U+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*++ /or 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4XRO]+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*.{OU 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4oMX~+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X. Wor 4 4 4 4oqoyocoeo0o0o0or t 6 4 4 4 4 4.Vo@+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+Ao3 4 4oyosX|OoOxXgXw+sOhXb.k XX^ y 4 4oh.,+O+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X.oK.ZO,X{ K v.iO$.$ n+moH | (OFOA.z ^ '.] <+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+7o-ObXmO*+d l noBoSoS loSoSoBXrO#.h.r./+=+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X..0X XroB noS n l loSoSoS loS l l l loHoBom hX#+*+*+*+*+*X.X.+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*.{Xj+KoU+BX.+*+*Oa coDoB l loS noSoS noSoSoS loS l l l loSoBXeoLX&+*+*X- Fo/oQ+i+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+* Y ,oy wo; B+* a.1oSoS l noSoS n loS loB noS n loSoSoSoB l n n+qO=X# u.N 4oy w.DX>+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*XX+T 6 4 4 4 4 2obojoHoB l noS noS loSoSoS l loS loS loB n l l loS lom = )oy 4 4 4O%.lX.+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*X-.J 4 4 4 4 4oro) joSoSoS l loSoS n l l n noS l l g loS loS l l loHoSOWo, 4 4 4 4 4O>.)+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+* A+X 4 4 4 4 4of+k+voSoB n l l loS l loB+doB noBoH l n loSoSoSoSoS l lXao( 4 4 4 4 4 4OfXO+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+#O or 4 4 4 4oq : ZoHoBoH noSoS loS noBoH+h DXhoEOe l loS l loS loB n lXd.tod 4 4 4 4 4XQ.[+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*.J 4 4 4 4 4odOJ.aoSoSoB loS noSoS g.7XN        o]Xf+toS loSoH l noS lO0O:+^ 4 4 4 4 4 po*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*X7o= 4 4 4 4 4 [ K.ooS loS n n loSoBOiO.              Xz n l l l noS n n g+>+Roy 4 4 4 4oi dXO+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+Ao3 4 4 4 4oq :.>+N l n l loS l l+4XI                  oBoHoS loS l noBoBXdXc w 4 4 4 4 8oRXO+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*Xloy 4 4 4 4oqo% H loSoHoSoSoS lX1XM                    .eoSoH l l noB n lOg T 1 4 4 4 4 4.w+;+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*X.+Toy 4 4 4 4owX`OB loS l l l NoSO9Ov                    .fo6 l loSoS l l l.5O~XU 4 4 4 4 4ON+#+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*X. Qor 4 4 4 4owX`OB noS l loH loS.2+~                      +HoS l l n n l nX@OQXT 4 4 4 4 4XK ;+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*X.o`or 4 4 4 4owX`XBoBoSoSoS loS l.4+E                      Xv loSoS n loS lOrOQXT 4 4 4 4 4OD.~+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+Soy 4 4 4 4oqooo} l noSoS loS l+9XV                    oN. oSoSoSoS loS lOuXPo+ 4 4 4 4 4X9X$+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*Xl w 4 4 4 4oqo$ R+doS noS loSoSoSX6XH                  +ZoSoS n l loSoS n+VXk w 4 4 4 4 4+l+;+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+f.E 4 4 4 4 4o0oI+m l n noS l l lO3 S                .sO;oSoB noS l l noBoCXC q 4 4 4 4oa.@XO+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*X3.U 4 4 4 4 4ol.uX=oBoSoSoSoS l loS lOs.d        OCo~ ioBoS n noSoS noS lO7XJ 4 4 4 4 4 r 0XO+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*.{.N 6 4 4 4 4oqo..O n noSoH goSoSoSoSoSog.%.S.C E+HO1oSoSoBoSoS loBoS l.q+( 3 4 4 4 4 4 4 O+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*X. I } 4 4 4 4 4os+yoHoS noSoS noBoBoSoSoSoSoHoHXuoS l n loS l n n loS noJXFor 4 4 4 4 4XnO|+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+j.R 4 4 4 4 4oq L n noBoS l loSoSoS loSoSoS l loSoS loH l noSoB noBoS.& _ 4 4 4 4 4oi.++;+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*.{OX { 4 4 4 4ozO- C loH l loSoS loSoS l loS loS l l l noSoSoSoSoSoB+a zO/ 4 4 4 4 4o>X)+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+wO!oa 4 8 pO8O|oWoS l loBoS l n loSoS l loSoS l noSoS loS l noSoZ.-+_o[o9.. 4 q.^ ]+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+$oA+c+oO&o2+*X.Om+qoS noS loS l loSoSoS loS n n n loS l l goF.xX4Oz+:+povXi.*oX+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+;+;XO+*+*+*+#+D M m l l n noHoSoS loSoS loSoS l l noSoZOj 5X0+J+,X<XO+;+;XO+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*oP+&Ow.6 l loSoSoS l loSoS n l lOwOu l+@+1+*X0+J+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+7XZO)X]O4.8Or noB goB+9+9+<Xq+M.K.BOS+GXX+*X0+J+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+7OHoyoy &XW.gX(otokOq.;Xoop.Lo'XC+^od 4o3oK+*X0+J+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X.o/ w 4 4 4 4o5X_.c+Q.j+Y+UOGXLo+oy 4 4 4 4OKo1X0+J+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+)oYX#X4OO.#X,X; 7or 4o8+C f bXsX2+L f 4 4 4 4o8+PX%O6 ~ @OZ+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+r.y -o_ J.A.Y.Y.Y * k yOk.IX5.mOP.Y.IoGox 4 4o8XGOMO(.Y.YO(O(+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*.3o^ $OIOYXtOVX/o|o oa 4+`+-OTOY+bo&X:.P+xoa 4XDOM.Q+g+!Oy+0.Y+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X#.<.GXt.W++ +or 4 4 4 4o{.MO}+8 4o{.M.`oV sX*.!+F+e `XX %OL+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+I.nO+X&+*.}o!XQ t 4 4+nXp+. x 4+nXpo4+uoxOdO`.|o#XO+*X0Oc+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+I+W.bOt+*+*+*.:on+z+/oTOl+. boi VOl+.ouXS+%O}XYXO+*+*X0+J+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+I+W.bOt+*+*+*+*+*+;.'o:On+:.=O<.,.p eoOX+O2._.X+rOpOp+5Xx+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+I+W.bOt+*+*+*+*+*+*+*X0+J+,+5XO+p+J+,X<+=.9.TO^O{O5O5O@.Y+,X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+).H.v+3+*+*+*+*+*+*+*X4OI+2X<+*X4OI+2X<+*X# .+6.(o<o<.(O`+2X<+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*X#X'O'+*+*+*+*+*+*+*+*+* > #+*+*+* > #+*+*+*+*O[X!X!X!XEX} #+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*",
+"+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*+*"
+};
Index: tags/2.0.1/doc/resources/logo_made_with.lht
===================================================================
--- tags/2.0.1/doc/resources/logo_made_with.lht	(nonexistent)
+++ tags/2.0.1/doc/resources/logo_made_with.lht	(revision 18980)
@@ -0,0 +1,555 @@
+li:pcb-rnd-subcircuit-v4 {
+ ha:subc.438 {
+  ha:attributes {
+   refdes = U0
+  }
+  ha:data {
+   li:padstack_prototypes {
+   }
+   li:objects {
+   }
+   li:layers {
+    ha:silk {
+     lid = 0
+     ha:type {
+      silk = 1
+      top = 1
+     }
+     li:objects {
+      ha:line.338 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.3in
+       x2 = 2.31in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.96in
+      }
+      ha:line.341 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.3in
+       x2 = 2.31in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.344 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 59.436mm
+       x2 = 2.31in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.347 {
+       clearance = 20.0mil
+       y2 = 1.88in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 59.436mm
+       x2 = 59.436mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.350 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.31in
+       x2 = 59.436mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.353 {
+       clearance = 20.0mil
+       y2 = 1.96in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.3in
+       x2 = 2.3in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.356 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.28in
+       x2 = 2.27in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.359 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.28in
+       x2 = 2.28in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.362 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.25in
+       x2 = 2.27in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.365 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.24in
+       x2 = 2.25in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.368 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.24in
+       x2 = 2.24in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.371 {
+       clearance = 20.0mil
+       y2 = 1.96in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 49.53mm
+       x2 = 1.96in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.374 {
+       clearance = 20.0mil
+       y2 = 1.94in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 49.53mm
+       x2 = 1.96in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.377 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.08in
+       x2 = 52.578mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.96in
+      }
+      ha:line.380 {
+       clearance = 20.0mil
+       y2 = 1.94in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 52.578mm
+       x2 = 2.08in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.383 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.98in
+       x2 = 1.99in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.96in
+      }
+      ha:line.386 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.98in
+       x2 = 1.99in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.389 {
+       clearance = 20.0mil
+       y2 = 2.01in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.92in
+       x2 = 1.92in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.392 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 52.578mm
+       x2 = 2.04in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.395 {
+       clearance = 20.0mil
+       y2 = 1.94in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.08in
+       x2 = 2.08in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.96in
+      }
+      ha:line.398 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.04in
+       x2 = 52.578mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.401 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.04in
+       x2 = 2.04in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.88in
+      }
+      ha:line.404 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.99in
+       x2 = 2.02in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.407 {
+       clearance = 20.0mil
+       y2 = 1.96in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.98in
+       x2 = 1.98in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.410 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.99in
+       x2 = 2.02in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.413 {
+       clearance = 20.0mil
+       y2 = 1.96in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.96in
+       x2 = 1.96in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.416 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 49.53mm
+       x2 = 1.92in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.97in
+      }
+      ha:line.419 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 1.92in
+       x2 = 49.53mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.422 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 55.626mm
+       x2 = 2.22in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.425 {
+       clearance = 20.0mil
+       y2 = 1.93in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.18in
+       x2 = 55.626mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.94in
+      }
+      ha:line.428 {
+       clearance = 20.0mil
+       y2 = 1.97in
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 2.18in
+       x2 = 2.18in
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 1.93in
+      }
+      ha:line.431 {
+       clearance = 20.0mil
+       y2 = 49.53mm
+       thickness = 10.0mil
+       ha:attributes {
+       }
+       x1 = 53.594mm
+       x2 = 54.61mm
+       ha:flags {
+        clearline = 1
+       }
+       y1 = 49.53mm
+      }
+      ha:arc.434 {
+       astart = 0
+       thickness = 10.0mil
+       width = 10.0mil
+       height = 10.0mil
+       ha:attributes {
+       }
+       x = 59.436mm
+       y = 1.87in
+       adelta = 360
+       ha:flags {
+        clearline = 1
+       }
+       clearance = 20.0mil
+      }
+      ha:arc.435 {
+       astart = 0
+       thickness = 10.0mil
+       width = 10.0mil
+       height = 10.0mil
+       ha:attributes {
+       }
+       x = 2.04in
+       y = 1.87in
+       adelta = 360
+       ha:flags {
+        clearline = 1
+       }
+       clearance = 20.0mil
+      }
+      ha:arc.436 {
+       astart = 0
+       thickness = 10.0mil
+       width = 10.0mil
+       height = 10.0mil
+       ha:attributes {
+       }
+       x = 1.92in
+       y = 2.02in
+       adelta = 360
+       ha:flags {
+        clearline = 1
+       }
+       clearance = 20.0mil
+      }
+      ha:text.437 {
+       scale = 100
+       ha:attributes {
+       }
+       direction = 0
+       x = 2.06in
+       y = 1.86in
+       string = made with
+       fid = 0
+       ha:flags {
+        clearline = 1
+       }
+      }
+     }
+     ha:combining {
+      auto = 1
+     }
+    }
+    ha:subc-aux {
+     lid = 1
+     ha:type {
+      top = 1
+      misc = 1
+      virtual = 1
+     }
+     li:objects {
+      ha:line.439 {
+       clearance = 0.0
+       y2 = 1.93in
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = origin
+       }
+       x1 = 2.04in
+       x2 = 2.04in
+       ha:flags {
+       }
+       y1 = 1.93in
+      }
+      ha:line.442 {
+       clearance = 0.0
+       y2 = 1.93in
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = x
+       }
+       x1 = 2.04in
+       x2 = 52.816mm
+       ha:flags {
+       }
+       y1 = 1.93in
+      }
+      ha:line.445 {
+       clearance = 0.0
+       y2 = 50.022mm
+       thickness = 0.1mm
+       ha:attributes {
+        subc-role = y
+       }
+       x1 = 2.04in
+       x2 = 2.04in
+       ha:flags {
+       }
+       y1 = 1.93in
+      }
+     }
+     ha:combining {
+     }
+    }
+   }
+  }
+  uid = NhAIKQfa5EkLmJw7dscAAAAE
+  ha:flags {
+  }
+ }
+}
Index: tags/2.0.1/doc/resources/logo_made_with.pcb
===================================================================
--- tags/2.0.1/doc/resources/logo_made_with.pcb	(nonexistent)
+++ tags/2.0.1/doc/resources/logo_made_with.pcb	(revision 18980)
@@ -0,0 +1,82 @@
+# release: pcb 20140316
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20091103]
+
+PCB["" 6000.00mil 5000.00mil]
+
+Grid[1000.000000 0.0000 0.0000 0]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[10.00mil 10.00mil 10.00mil 10.00mil 15.00mil 10.00mil]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2:3:4:5:6,s:7:8")
+Styles["Signal,10.00mil,36.00mil,20.00mil,10.00mil:Power,25.00mil,60.00mil,35.00mil,10.00mil:Fat,40.00mil,60.00mil,35.00mil,10.00mil:Skinny,6.00mil,24.02mil,11.81mil,6.00mil"]
+
+Attribute("PCB::grid::unit" "mil")
+Layer(1 "top")
+(
+)
+Layer(2 "ground")
+(
+)
+Layer(3 "signal2")
+(
+)
+Layer(4 "signal3")
+(
+)
+Layer(5 "power")
+(
+)
+Layer(6 "bottom")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "spare")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[2110.00mil 1950.00mil 2150.00mil 1950.00mil 10.00mil 20.00mil "clearline"]
+	Line[2180.00mil 1930.00mil 2180.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2180.00mil 1940.00mil 2190.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2190.00mil 1930.00mil 2220.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[1920.00mil 1930.00mil 1950.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[1950.00mil 1970.00mil 1920.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[1960.00mil 1940.00mil 1960.00mil 1960.00mil 10.00mil 20.00mil "clearline"]
+	Line[1990.00mil 1930.00mil 2020.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[1980.00mil 1940.00mil 1980.00mil 1960.00mil 10.00mil 20.00mil "clearline"]
+	Line[1990.00mil 1970.00mil 2020.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2040.00mil 1880.00mil 2040.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2040.00mil 1970.00mil 2070.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2080.00mil 1960.00mil 2080.00mil 1940.00mil 10.00mil 20.00mil "clearline"]
+	Line[2070.00mil 1930.00mil 2040.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[1920.00mil 1930.00mil 1920.00mil 2010.00mil 10.00mil 20.00mil "clearline"]
+	Line[1980.00mil 1940.00mil 1990.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[1980.00mil 1960.00mil 1990.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2070.00mil 1930.00mil 2080.00mil 1940.00mil 10.00mil 20.00mil "clearline"]
+	Line[2080.00mil 1960.00mil 2070.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[1950.00mil 1930.00mil 1960.00mil 1940.00mil 10.00mil 20.00mil "clearline"]
+	Line[1950.00mil 1970.00mil 1960.00mil 1960.00mil 10.00mil 20.00mil "clearline"]
+	Line[2240.00mil 1930.00mil 2240.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2240.00mil 1940.00mil 2250.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2250.00mil 1930.00mil 2270.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2280.00mil 1940.00mil 2280.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2280.00mil 1940.00mil 2270.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2300.00mil 1940.00mil 2300.00mil 1960.00mil 10.00mil 20.00mil "clearline"]
+	Line[2310.00mil 1970.00mil 2340.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Line[2340.00mil 1970.00mil 2340.00mil 1880.00mil 10.00mil 20.00mil "clearline"]
+	Line[2340.00mil 1930.00mil 2310.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2300.00mil 1940.00mil 2310.00mil 1930.00mil 10.00mil 20.00mil "clearline"]
+	Line[2300.00mil 1960.00mil 2310.00mil 1970.00mil 10.00mil 20.00mil "clearline"]
+	Arc[1920.00mil 2020.00mil 10.00mil 10.00mil 10.00mil 20.00mil 0 360 "clearline"]
+	Arc[2040.00mil 1870.00mil 10.00mil 10.00mil 10.00mil 20.00mil 0 360 "clearline"]
+	Arc[2340.00mil 1870.00mil 10.00mil 10.00mil 10.00mil 20.00mil 0 360 "clearline"]
+	Text[2060.00mil 1860.00mil 0 100 "made with" "clearline"]
+)
Index: tags/2.0.1/doc/resources/logo_svg.pcb
===================================================================
--- tags/2.0.1/doc/resources/logo_svg.pcb	(nonexistent)
+++ tags/2.0.1/doc/resources/logo_svg.pcb	(revision 18980)
@@ -0,0 +1,105 @@
+# release: pcb-rnd 1.2.6
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 5080000nm 5080000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[4445000nm 3175000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("9:11:1,3,4,c:7:8:2,5,6,s:12:10")
+Styles["Signal,254000nm,1999996nm,800100nm,508000nm:Power,508000nm,2199894nm,999998nm,508000nm:Fat,2032000nm,3500120nm,1199896nm,635000nm:Sig-tight,254000nm,1625600nm,800100nm,304800nm"]
+
+Symbol['d' 304800nm]
+(
+	SymbolLine[508000nm 0 508000nm 1016000nm 203200nm]
+	SymbolLine[381000nm 1016000nm 508000nm 889000nm 203200nm]
+	SymbolLine[127000nm 1016000nm 381000nm 1016000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 1016000nm 203200nm]
+	SymbolLine[0 635000nm 0 889000nm 203200nm]
+	SymbolLine[0 635000nm 127000nm 508000nm 203200nm]
+	SymbolLine[127000nm 508000nm 381000nm 508000nm 203200nm]
+	SymbolLine[381000nm 508000nm 508000nm 635000nm 203200nm]
+)
+Symbol['n' 304800nm]
+(
+	SymbolLine[127000nm 635000nm 127000nm 1016000nm 203200nm]
+	SymbolLine[127000nm 635000nm 254000nm 508000nm 203200nm]
+	SymbolLine[254000nm 508000nm 381000nm 508000nm 203200nm]
+	SymbolLine[381000nm 508000nm 508000nm 635000nm 203200nm]
+	SymbolLine[508000nm 635000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[0 508000nm 127000nm 635000nm 203200nm]
+)
+Symbol['r' 304800nm]
+(
+	SymbolLine[127000nm 635000nm 127000nm 1016000nm 203200nm]
+	SymbolLine[127000nm 635000nm 254000nm 508000nm 203200nm]
+	SymbolLine[254000nm 508000nm 508000nm 508000nm 203200nm]
+	SymbolLine[0 508000nm 127000nm 635000nm 203200nm]
+)
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/buffer_number" "0")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::conf::editor/show_solder_side" "0")
+Attribute("PCB::conf::editor/view/flip_x" "0")
+Attribute("PCB::conf::editor/view/flip_y" "0")
+Attribute("PCB::loader" "geda/pcb - nanometer")
+
+Element["" "dip(2)" "rnd" "2*300" -5000000nm 2500000nm 6350000nm 635000nm 0 115 ""]
+(
+	Attribute("footprint" "dip(2)")
+	Attribute("refdes" "rnd")
+	Attribute("value" "2*300")
+	Pin[7620000nm 0 2540000nm 1270000nm 2692400nm 999998nm "" "2" "thermal(0X,1X)"]
+
+)
+Layer(1 "component")
+(
+	Polygon("clearpoly")
+	(
+		[0 0] [5080000nm 0] [5080000nm 5080000nm] [0 5080000nm] 
+	)
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "top-paste")
+(
+)
+Layer(10 "bottom-paste")
+(
+)
+Layer(11 "top-mask")
+(
+)
+Layer(12 "bottom-mask")
+(
+)
+Layer(13 "silk")
+(
+)
+Layer(14 "silk")
+(
+)
Index: tags/2.0.1/doc/resources/screenshot.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/resources/screenshot.jpg
===================================================================
--- tags/2.0.1/doc/resources/screenshot.jpg	(nonexistent)
+++ tags/2.0.1/doc/resources/screenshot.jpg	(revision 18980)

Property changes on: tags/2.0.1/doc/resources/screenshot.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/scripting.txt
===================================================================
--- tags/2.0.1/doc/scripting.txt	(nonexistent)
+++ tags/2.0.1/doc/scripting.txt	(revision 18980)
@@ -0,0 +1,34 @@
+1. Action scripting
+~~~~~~~~~~~~~~~~~~~
+Action scripting is the builtin, non-turing-complete way of giving pcb-rnd
+commands. On the GUI it's usually the ':' key that pops up the command line.
+Most HIDs support the --listen argument that makes pcb-rnd also read commands
+on the stdin.
+
+The batch HID always reads commands on stdin (without --listen). Automated
+pcb-rnd runs from shell is possible using a script like:
+
+echo '
+	action1()
+	action2()
+	...
+' | pcb-rnd --gui batch
+
+From within pcb-rnd the ExecuteFile(filename) action can be used to
+load and execute a pcb-rnd action script from a file.
+
+2. Embedded scripting
+~~~~~~~~~~~~~~~~~~~~~
+pcb-rnd uses fungw for embedded scripting. This allows pcb-rnd to be
+scripted in 10+ turing complete scripting languages, including awk, tcl,
+python, perl, lua, some lisp dialects, etc. Embedded scripts run within
+pcb-rnd (in the same process, same address space), having full access
+to the action infrastructure:
+ - embedded scripts can declare new actions that are accessible from
+   menu, from the command line and from other embedded scripts
+ - embedded scripts can execute actions (defined by pcb-rnd or other
+   embedded scripts)
+
+For more info see user/06_feature/scripting/
+
+
Index: tags/2.0.1/doc/security/Makefile
===================================================================
--- tags/2.0.1/doc/security/Makefile	(nonexistent)
+++ tags/2.0.1/doc/security/Makefile	(revision 18980)
@@ -0,0 +1,26 @@
+ROOT=../..
+SECDIR=$(DOCDIR)/security
+
+
+all:
+
+install_all:
+	$(SCCBOX) mkdir -p $(SECDIR)
+	$(SCCBOX) $(HOW) *.html $(SECDIR)/
+	$(SCCBOX) $(HOW) README $(SECDIR)/
+
+install:
+	$(MAKE) install_all HOW="install -f -d"
+
+linstall:
+	$(MAKE) install_all HOW="install -f -l -d"
+
+uninstall:
+	$(MAKE) install_all HOW="install -u"
+
+clean:
+
+distclean:
+
+
+include $(ROOT)/Makefile.conf
Index: tags/2.0.1/doc/security/README
===================================================================
--- tags/2.0.1/doc/security/README	(nonexistent)
+++ tags/2.0.1/doc/security/README	(revision 18980)
@@ -0,0 +1,2 @@
+This directory contains bugreports that are security sensitive. The
+reports also describe mitigation and upgrade paths and safe versions.
Index: tags/2.0.1/doc/security/bug1.html
===================================================================
--- tags/2.0.1/doc/security/bug1.html	(nonexistent)
+++ tags/2.0.1/doc/security/bug1.html	(revision 18980)
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - news </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<!--content-->
+<h1> pcb-rnd security related bug #1: execbug </h1>
+<p>
+Users opening untrusted boards or projects may unintentionally execute
+external programs.
+
+<h2> 1. Bug description </h2>
+<p>
+pcb-rnd inherited 5 settings from gEDA/PCB that let pcb-rnd (and PCB)
+execute external processes, wrapping certain file operations:
+<ul>
+	<li> conf_core.rc.save_command
+	<li> conf_core.rc.rat_command
+	<li> conf_core.rc.library_shell
+	<li> conf_core.rc.file_command
+	<li> conf_core.rc.font_command
+</ul>
+<p>
+The old Settings system has been replaced in pcb-rnd; the new conf system
+allows any configuration setting to be specified in a project file or a
+board file. This includes the above 5 items as well.
+<p>
+Thus an attacker may produce a project or a single board file in .pcb or .lht format
+that contains the above config settings, executing arbitrary shell command on the
+user's computer when pcb-rnd opens or saves the file or loads fonts or
+footprints or netlists.
+
+<h2> 2. How to prevent the attack </h2>
+
+<h3> 2.1. By using a version that is not affected </h3>
+<p>
+<ul>
+	<li> from svn /trunk, any revision newer than r11597
+	<li> any release starting from 1.2.6
+	<li> old stable release 1.2.5, patched: <a href="../releases/pcb-rnd-1.2.5b.tar.gz">1.2.5b</a>
+	<li> old stable release 1.1.4, patched: <a href="../releases/pcb-rnd-1.1.4b.tar.gz">1.1.4b</a>
+</ul>
+
+<h3> 2.2. By manually checking board and project files from untrusted source</h3>
+<p>
+Before opening the file, grep for _command and _shell in it, remove
+the offending lines.
+
+
+<h2> 3. What did the patch/fix do </h2>
+<p>
+The patch prevents these 5 settings to take effect when the source of
+the setting is not from one of these:
+<ul>
+	<li> internal (embedded in the executable, used as the ultimate fallback when no config is available)
+	<li> system installed config file (typically under /usr/)
+	<li> user config file (typically in ~/.pcb-rnd/)
+	<li> command line argument (-c)
+</ul>
+<p>
+This bans sources like the board file, the project file and environmental
+variable.
+
+</body>
+</html>
+
+
Index: tags/2.0.1/doc/support.html
===================================================================
--- tags/2.0.1/doc/support.html	(nonexistent)
+++ tags/2.0.1/doc/support.html	(revision 18980)
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - news </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<!--AUTO head begin-->
+	<link rel="icon" href="resources/logo16.png">
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+<table border=0 cellspacing=2 cellpadding=10  bgcolor="#eeeeee" width="100%">
+<tr>
+<th align=center bgcolor="#ccc0cc"> <a href="index.html"> Main </a>
+<th align=center bgcolor="#ccc0cc"> <a href="news.html"> News </a>
+<th align=center bgcolor="#ccc0cc"> <a href="doc.html">Doc</a>&nbsp;&amp;&nbsp;<a href="http://repo.hu/projects/pcb-rnd-aux/pool">pool</a>
+<th align=center bgcolor="#ccc0cc"> <a href="support.html"> Support </a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi">People</a>
+<th align=center bgcolor="#ccc0cc"> <a href="http://repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=events">Events</a>&nbsp;&amp;&nbsp;<a href="http://www.repo.hu/cgi-bin/pcb-rnd-people.cgi?cmd=timeline">timeline</a>
+<td align=right width="60%"> <font size="+2"><i>pcb-rnd</i></font> <img src="resources/logo32.png" alt="[pcb-rnd logo]">
+</table>
+<!--AUTO navbar end-->
+
+<br>
+<!--content-->
+<h1> pcb-rnd support </h1>
+
+<h2> Get support </h2>
+
+Option 1: subscribe to the mailing list: pcb-rnd (at) list.repo.hu (send
+a mail with subject: subscribe). We usually reply there within 24 hours.
+<a href="http://repo.hu/cgi-bin/web_mail_arch.cgi?mlist=pcb-rnd&cmd=flat&id=-15"> (Archives) </a>
+<p>
+Option 2: real-time chat with the developers and hard core users: <a
+href="irc.html"> IRC </a>; please pick a meaningful nickname, join, say
+hi, state your question and be patient; someone will react in at most
+3..4 hours. If nobody reacts but you see traffic, repeat your question.
+Leaving there an idler client is okay.
+
+<h2> Give support </h2>
+Option 1: if you are experienced with pcb-rnd or electronics: subscribe to
+the mailing list, <a href="irc.html">join IRC</a>, try to provide help for
+newbies.
+<p>
+Option 2: subscribe to the mailing list, offer your help; <a href="help.html">we are looking
+for manpower</a> with a lot of non-programming tasks as well!
+<p>
+Option 3: consider <a href="http://sponsor.pcb-rnd.repo.hu"> donating a small amount </a>,
+e.g. $5 or $10. Donations are transformed into developer hours put in the project.
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/tutorials/7805/7805.pcb
===================================================================
--- tags/2.0.1/doc/tutorials/7805/7805.pcb	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/7805.pcb	(revision 18980)
@@ -0,0 +1,222 @@
+# release: pcb-rnd 1.1.3
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 30480000nm 30480000nm]
+
+Grid[2540000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,254000nm,1999996nm,800100nm,508000nm:Power,508000nm,2199894nm,999998nm,508000nm:Fat,2032000nm,3500120nm,1199896nm,635000nm:Sig-tight,254000nm,1625600nm,800100nm,304800nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::loader" "geda/pcb - nanometer")
+Attribute("PCB::conf::editor/grid" "100.00 mil")
+Attribute("PCB::conf::editor/view/flip_x" "0")
+Attribute("PCB::conf::editor/view/flip_y" "0")
+Attribute("PCB::conf::editor/show_solder_side" "0")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::conf::editor/buffer_number" "0")
+
+Element["onsolder" "0805" "C3" "100nF" 25400000nm 20320000nm 800100nm -800100nm 2 100 "auto"]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Pad[899922nm -99822nm 899922nm 99822nm 1299972nm 508000nm 1452372nm "1" "1" "onsolder,square"]
+	Pad[-899922nm -99822nm -899922nm 99822nm 1299972nm 508000nm 1452372nm "2" "2" "onsolder,square"]
+	ElementLine [-99822nm -699770nm 99822nm -699770nm 203200nm]
+	ElementLine [-99822nm 699770nm 99822nm 699770nm 203200nm]
+
+	)
+
+Element["onsolder" "0805" "C2" "100nF" 20320000nm 20320000nm -800100nm 800100nm 0 100 "auto"]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Pad[-899922nm -99822nm -899922nm 99822nm 1299972nm 508000nm 1452372nm "1" "1" "onsolder,square"]
+	Pad[899922nm -99822nm 899922nm 99822nm 1299972nm 508000nm 1452372nm "2" "2" "onsolder,square"]
+	ElementLine [-99822nm 699770nm 99822nm 699770nm 203200nm]
+	ElementLine [-99822nm -699770nm 99822nm -699770nm 203200nm]
+
+	)
+
+Element["" "rcy(200)" "C1" "47uF" 12700000nm 10160000nm -1016000nm 5207000nm 0 100 ""]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "POLARIZED_CAPACITOR")
+	Attribute("manufacturer" "unknown")
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "+" "1" "square,edge2"]
+	Pin[-5080000nm 0 2032000nm 1270000nm 2184400nm 999998nm "-" "2" "edge2,thermal(4X)"]
+	ElementLine [-9144000nm 0 -8128000nm 0 254000nm]
+	ElementLine [3048000nm 0 4064000nm 0 254000nm]
+	ElementLine [3556000nm -508000nm 3556000nm 508000nm 254000nm]
+	ElementArc [-2540000nm 0 5080000nm 5080000nm 180 360 254000nm]
+
+	)
+
+Element["" "connector(2,1)" "CONN2" "unknown" 6350000nm 20320000nm -3175000nm 635000nm 1 100 ""]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "CONNECTOR_2")
+	Attribute("manufacturer" "unknown")
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "1" "1" "square"]
+	Pin[0 -2540000nm 2032000nm 1270000nm 2184400nm 999998nm "2" "2" "thermal(4X)"]
+	ElementLine [-1270000nm 1270000nm 1270000nm 1270000nm 254000nm]
+	ElementLine [-1270000nm -3810000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [1270000nm -3810000nm 1270000nm 1270000nm 254000nm]
+	ElementLine [-1270000nm -3810000nm 1270000nm -3810000nm 254000nm]
+	ElementLine [1270000nm -1270000nm 1270000nm 1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 1270000nm -1270000nm 254000nm]
+
+	)
+
+Element["" "connector(3,1)" "CONN1" "unknown" 14605000nm 23495000nm -3810000nm 1270000nm 0 100 ""]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "CONNECTOR_3")
+	Attribute("manufacturer" "unknown")
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "1" "1" "square,edge2"]
+	Pin[-2540000nm 0 2032000nm 1270000nm 2184400nm 999998nm "2" "2" "edge2,thermal(4X)"]
+	Pin[-5080000nm 0 2032000nm 1270000nm 2184400nm 999998nm "3" "3" "edge2"]
+	ElementLine [1270000nm -1270000nm 1270000nm 1270000nm 254000nm]
+	ElementLine [-6350000nm 1270000nm 1270000nm 1270000nm 254000nm]
+	ElementLine [-6350000nm -1270000nm 1270000nm -1270000nm 254000nm]
+	ElementLine [-6350000nm -1270000nm -6350000nm 1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 1270000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm -1270000nm 1270000nm 254000nm]
+
+	)
+
+Element["" "TO220" "U1" "unknown" 22860000nm 23495000nm -6985000nm -19177000nm 1 100 ""]
+(
+	Attribute("vendor_part_number" "unknown")
+	Attribute("vendor" "unknown")
+	Attribute("manufacturer_part_number" "unknown")
+	Attribute("device" "7805")
+	Attribute("manufacturer" "unknown")
+	Pin[-2540000nm 0 2286000nm 762000nm 2438400nm 1524000nm "1" "1" "square"]
+	Pin[0 0 2286000nm 762000nm 2438400nm 1524000nm "2" "2" "thermal(4X)"]
+	Pin[2540000nm 0 2286000nm 762000nm 2438400nm 1524000nm "3" "3" ""]
+	Pin[0 -17018000nm 3810000nm 762000nm 3962400nm 3302000nm "4" "4" ""]
+	ElementLine [-2540000nm 0 -2540000nm -4572000nm 762000nm]
+	ElementLine [0 0 0 -4572000nm 762000nm]
+	ElementLine [2540000nm 0 2540000nm -4572000nm 762000nm]
+	ElementLine [-5080000nm -4572000nm 5080000nm -4572000nm 508000nm]
+	ElementLine [5080000nm -4572000nm 5080000nm -14097000nm 508000nm]
+	ElementLine [5080000nm -14097000nm -5080000nm -14097000nm 508000nm]
+	ElementLine [-5080000nm -14097000nm -5080000nm -4572000nm 508000nm]
+	ElementLine [-5080000nm -14097000nm 5080000nm -14097000nm 508000nm]
+	ElementLine [5080000nm -14097000nm 5080000nm -17272000nm 508000nm]
+	ElementLine [5080000nm -17272000nm 4699000nm -17272000nm 508000nm]
+	ElementLine [4699000nm -17272000nm 4699000nm -19050000nm 508000nm]
+	ElementLine [4699000nm -19050000nm 5080000nm -19050000nm 508000nm]
+	ElementLine [5080000nm -19050000nm 5080000nm -20066000nm 508000nm]
+	ElementLine [5080000nm -20066000nm -5080000nm -20066000nm 508000nm]
+	ElementLine [-5080000nm -20066000nm -5080000nm -19050000nm 508000nm]
+	ElementLine [-5080000nm -19050000nm -4699000nm -19050000nm 508000nm]
+	ElementLine [-4699000nm -19050000nm -4699000nm -17272000nm 508000nm]
+	ElementLine [-4699000nm -17272000nm -5080000nm -17272000nm 508000nm]
+	ElementLine [-5080000nm -17272000nm -5080000nm -14097000nm 508000nm]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+	Line[6350000nm 20320000nm 4445000nm 20320000nm 2032000nm 1270000nm "clearline"]
+	Line[6350000nm 20320000nm 3810000nm 20320000nm 2032000nm 1270000nm "clearline"]
+	Line[3810000nm 20320000nm 3810000nm 3810000nm 2032000nm 1270000nm "clearline"]
+	Line[27305000nm 3810000nm 27305000nm 23495000nm 2032000nm 1270000nm "clearline"]
+	Line[27305000nm 23495000nm 25400000nm 23495000nm 2032000nm 1270000nm "clearline"]
+	Line[3810000nm 3810000nm 20320000nm 3810000nm 2032000nm 1270000nm "clearline"]
+	Line[27305000nm 3810000nm 25400000nm 3810000nm 2032000nm 1270000nm "clearline"]
+	Line[20320000nm 3810000nm 25400000nm 3810000nm 762000nm 1016000nm "clearline"]
+	Line[20320000nm 3175000nm 26035000nm 3175000nm 635000nm 1016000nm "clearline"]
+	Line[12700000nm 10160000nm 15240000nm 10160000nm 2032000nm 1270000nm "clearline"]
+	Line[15240000nm 10160000nm 17145000nm 12065000nm 2032000nm 1270000nm "clearline"]
+	Line[17145000nm 12065000nm 17145000nm 23495000nm 2032000nm 1270000nm "clearline"]
+	Line[20320000nm 23495000nm 14605000nm 23495000nm 2032000nm 1270000nm "clearline"]
+	Line[19420078nm 20320000nm 17145000nm 20320000nm 508000nm 1016000nm "clearline"]
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+	Line[21219922nm 20320000nm 24500078nm 20320000nm 508000nm 1016000nm ""]
+	Polygon("clearpoly")
+	(
+		[2540000nm 26035000nm] [28575000nm 26035000nm] [28575000nm 2540000nm] [2540000nm 2540000nm] 
+	)
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+	Line[2540000nm 2540000nm 2540000nm 26035000nm 254000nm 1016000nm "clearline"]
+	Line[2540000nm 2540000nm 28575000nm 2540000nm 254000nm 1016000nm "clearline"]
+	Line[2540000nm 26035000nm 28575000nm 26035000nm 254000nm 1016000nm "clearline"]
+	Line[28575000nm 26035000nm 28575000nm 2540000nm 254000nm 1016000nm "clearline"]
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Text[8255000nm 15875000nm 0 195 "-" "clearline"]
+	Text[8255000nm 18415000nm 0 195 "+" "clearline"]
+	Text[13970000nm 19685000nm 0 195 "+" "clearline"]
+	Text[11430000nm 19685000nm 0 195 "-" "clearline"]
+	Text[6985000nm 22860000nm 0 100 "in" "clearline"]
+	Text[2921000nm 14859000nm 0 100 "out: +5V" "clearline"]
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("C1-2")
+		Connect("C2-2")
+		Connect("C3-2")
+		Connect("CONN1-2")
+		Connect("CONN2-2")
+		Connect("U1-2")
+	)
+	Net("unnamed_net1" "(unknown)")
+	(
+		Connect("C1-1")
+		Connect("C2-1")
+		Connect("CONN1-1")
+		Connect("U1-1")
+	)
+	Net("unnamed_net2" "(unknown)")
+	(
+		Connect("C3-1")
+		Connect("CONN2-1")
+		Connect("U1-3")
+	)
+)
Index: tags/2.0.1/doc/tutorials/7805/7805.sch
===================================================================
--- tags/2.0.1/doc/tutorials/7805/7805.sch	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/7805.sch	(revision 18980)
@@ -0,0 +1,88 @@
+v 20130925 2
+C 23100 57800 1 0 0 lm7805-1.sym
+{
+T 24700 59100 5 10 0 0 0 0 1
+device=7805
+T 24500 58800 5 10 1 1 0 6 1
+refdes=U1
+T 23400 58800 5 10 1 1 0 0 1
+footprint=TO220
+}
+C 21100 57200 1 0 1 connector3-2.sym
+{
+T 20400 58900 5 10 1 1 0 0 1
+refdes=CONN1
+T 20800 58850 5 10 0 0 0 6 1
+device=CONNECTOR_3
+T 20800 59050 5 10 0 0 0 6 1
+footprint=connector(3,1)
+}
+N 21100 58400 23100 58400 4
+N 21100 58000 21700 58000 4
+N 21700 58000 21700 56700 4
+C 21600 56400 1 0 0 gnd-1.sym
+T 21200 57500 9 10 1 0 0 0 1
+key
+C 23800 56400 1 0 0 gnd-1.sym
+N 23900 56700 23900 57800 4
+C 25900 57600 1 0 0 connector2-2.sym
+{
+T 26600 58900 5 10 1 1 0 6 1
+refdes=CONN2
+T 26200 58850 5 10 0 0 0 0 1
+device=CONNECTOR_2
+T 26200 59050 5 10 0 0 0 0 1
+footprint=connector(2,1)
+}
+N 25900 58400 24700 58400 4
+N 25700 58000 25700 56700 4
+C 25600 56400 1 0 0 gnd-1.sym
+N 25900 58000 25700 58000 4
+C 22000 58000 1 270 0 capacitor-2.sym
+{
+T 22700 57800 5 10 0 0 270 0 1
+device=POLARIZED_CAPACITOR
+T 22000 57400 5 10 1 1 270 0 1
+refdes=C1
+T 22900 57800 5 10 0 0 270 0 1
+symversion=0.1
+T 22000 58000 5 10 0 0 270 0 1
+footprint=rcy(200)
+T 22000 58100 5 10 1 1 270 0 1
+value=47uF
+}
+C 22100 56400 1 0 0 gnd-1.sym
+N 22200 57100 22200 56700 4
+N 22200 58000 22200 58400 4
+C 22700 58000 1 270 0 capacitor-1.sym
+{
+T 23400 57800 5 10 0 0 270 0 1
+device=CAPACITOR
+T 23200 57800 5 10 1 1 270 0 1
+refdes=C2
+T 23600 57800 5 10 0 0 270 0 1
+symversion=0.1
+T 22700 58200 5 10 1 1 270 0 1
+value=100nF
+T 22700 58000 5 10 0 0 0 0 1
+footprint=0805
+}
+N 22900 58000 22900 58400 4
+C 22800 56400 1 0 0 gnd-1.sym
+N 22900 56700 22900 57100 4
+C 24800 58000 1 270 0 capacitor-1.sym
+{
+T 25500 57800 5 10 0 0 270 0 1
+device=CAPACITOR
+T 25300 57800 5 10 1 1 270 0 1
+refdes=C3
+T 25700 57800 5 10 0 0 270 0 1
+symversion=0.1
+T 24800 58200 5 10 1 1 270 0 1
+value=100nF
+T 24800 58000 5 10 0 0 0 0 1
+footprint=0805
+}
+N 25000 58000 25000 58400 4
+C 24900 56400 1 0 0 gnd-1.sym
+N 25000 56700 25000 57100 4
Index: tags/2.0.1/doc/tutorials/7805/Info.lht
===================================================================
--- tags/2.0.1/doc/tutorials/7805/Info.lht	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/Info.lht	(revision 18980)
@@ -0,0 +1,13 @@
+ha:pcb-rnd-tutorial {
+	level=10
+	li:demonstrates {
+		gschem
+		gsch2pcb-rnd
+		make
+	}
+	short = 7805 module with connectors
+	long {
+		A 7805 based voltage source module to demonstrate a simple
+		gschem -> gsch2pcb-rnd -> pcb-rnd forward annotation chain.
+	}
+}
Index: tags/2.0.1/doc/tutorials/7805/Makefile
===================================================================
--- tags/2.0.1/doc/tutorials/7805/Makefile	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+7805.lht: 7805.sch
+	gsch2pcb-rnd -m import 7805.sch
+
+clean:
+	rm -f 7805.cmd
Index: tags/2.0.1/doc/tutorials/7805/Makefile.inst
===================================================================
--- tags/2.0.1/doc/tutorials/7805/Makefile.inst	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/Makefile.inst	(revision 18980)
@@ -0,0 +1,23 @@
+ROOT=../../..
+TUTDIR=$(DOCDIR)/tutorial/7805
+
+
+all:
+
+install_all:
+	$(SCCBOX) mkdir -p $(TUTDIR)
+	$(SCCBOX) $(HOW) 7805.pcb $(TUTDIR)/7805.pcb
+	$(SCCBOX) $(HOW) 7805.sch $(TUTDIR)/7805.sch
+	$(SCCBOX) $(HOW) Makefile $(TUTDIR)/Makefile
+	$(SCCBOX) $(HOW) index.html $(TUTDIR)/index.html
+
+install:
+	$(MAKE) -f Makefile.inst install_all HOW="install -f"
+
+linstall:
+	$(MAKE) -f Makefile.inst install_all HOW="install -f -l --absolute "
+
+uninstall:
+	$(MAKE) -f Makefile.inst install_all HOW="install -u"
+
+include $(ROOT)/Makefile.conf
Index: tags/2.0.1/doc/tutorials/7805/index.html
===================================================================
--- tags/2.0.1/doc/tutorials/7805/index.html	(nonexistent)
+++ tags/2.0.1/doc/tutorials/7805/index.html	(revision 18980)
@@ -0,0 +1,96 @@
+		<H3> Step 1: schematics </H3>
+		<p>
+		<i>The schematics is usually the single source of all logical information:
+		footprints, refdes and values and connections (networks or nets).
+		A project is just a directory that holds at least the schematics, but
+		usually also the pcb layout file and scripts.</i>
+		<p>
+		Start the new project by creating an empty directory. Start
+		gschem with an empty design and save it in the project directory.
+		Place the following symbols and edit/add these attributes:
+		<ul>
+			<li> 7805, footprint=TO220, refdes=U1
+			<li> connector-3-2, footprint=connector(3,1), refdes=CONN1
+			<li> connector-2-2, footprint=connector(2,1), refdes=CONN2
+			<li> capacitor-2, fooptrint=rcy(200), value=47uF, refdes=C1
+			<li> capacitor-1, fooptrint=0805, value=100nF, refdes=C2
+			<li> capacitor-2, fooptrint=0805, value=100nF, refdes=C2
+			<li> gnd-1
+		</ul>
+		<p>
+		Arrange and connect the pins as shown below.
+		<p>
+		<img src="sch.png" alt="schematics">
+		<p>
+		Save the design as 7805.sch.
+		<H3> Step 2: build script </H3>
+		<p>
+		<i>We are going to use a Makefile in this example to demonstrate
+		how to automate certain steps. In a fully automated project all
+		data exchange between the various tools (schematics editor, pcb-rnd,
+		simulators, etc.) is done by scripts. Generating the documentation
+		and exporting various other output like gerbers are usually automated
+		the same way. (As an alternative, all these can be done manually, from
+		the GUI as well.)</i>
+		<p>
+		Create a new file called Makefile and edit it using your favorite text
+		editor to the following:
+		<pre>
+7805.lht: 7805.sch
+	gsch2pcb-rnd -m import 7805.sch
+
+clean:
+	rm -f 7805.cmd
+		</pre>
+		<p>
+		The first rule calls the forward annotation utility, gsch2pcb-rnd to
+		create a forward annotation command file called 7805.cmd when the
+		schematics file is newer than the layout file (7805.lht). The second
+		rule removes such a command file to make the directory clean of
+		auto-generated temporary files.
+
+		<H3> Step 3: Create the initial board </H3>
+		<p>
+		<i>The layout process usually starts when there's at least a partially
+		finished schematics is available. The most common workflow is that
+		changes and improvements in the schematics are forward annotated to
+		the layout.</i>
+		<p>
+		Start pcb-rnd. This will load the system-installed template board
+		as a new, empty design. Save it in the project directory as 7805.lht.
+		<p>
+		Start a shell (but don't close pcb-rnd); in the project directory,
+		type <tt>make</tt>. This will create 7805.cmd that contains a pcb-rnd
+		action script that can sync a board to the information extracted from
+		the schematics.
+		<p>
+		Back in pcb-rnd, type ":ExecuteFile(7805.cmd)" and press enter. The colon
+		will open the CLI entry where the ExecuteFile(filename) is an action that
+		will load the file named and execute each line as an action.
+		<p>
+		At the end of the process, the layout should have all footprints. Press
+		'o' and the logical connections will show up as a "rats nest".
+
+		<H3> Step 4: Lay out the board </H3>
+		<p>
+		Move the subcircuits around. Pressing 'o' after some moves will re-optimize
+		the rats. As rats nest gets simpler and simpler, this can help choosing
+		the best placement. All components started out on the component (top) side.
+		Hover the mouse over the 0805 capacitors and press 'b' - this will send
+		them to the solder side.
+		<p>
+		After the placement, pick the solder layer to draw on and use the line tool
+		to draw the traces. Change the style to 'Power' or 'Fat' to get wider
+		traces. Press 'o' after drawing a few connections. When only the ground
+		network is left, use the rectangle tool to draw a large polygon on the
+		solder-gnd layer. Use the thermal tool to connect pins to the ground polygon.
+		The thermal tool does not work on SMD pads, they need to be connected using
+		lines.
+		<p>
+		When everything is connected, pressing 'o' will remove the last rat line.
+		The message log window also shows how many rats are remaining when 'o'
+		is pressed. The message log can be opened using the
+		<i>Window/Message Log</i> menu.
+
+		<H3> Step 5: updates </H3>
+		<p>
Index: tags/2.0.1/doc/tutorials/Makefile
===================================================================
--- tags/2.0.1/doc/tutorials/Makefile	(nonexistent)
+++ tags/2.0.1/doc/tutorials/Makefile	(revision 18980)
@@ -0,0 +1,18 @@
+all:
+	$(MAKE) all_ CMD=all
+
+all_:
+	cd 7805 && $(MAKE) -f Makefile.inst $(CMD)
+
+install:
+	$(MAKE) all_ CMD=install
+
+linstall:
+	$(MAKE) all_ CMD=linstall
+
+uninstall:
+	$(MAKE) all_ CMD=uninstall
+
+clean:
+
+distclean:
Index: tags/2.0.1/doc/tutorials/pnp-origin/index.html
===================================================================
--- tags/2.0.1/doc/tutorials/pnp-origin/index.html	(nonexistent)
+++ tags/2.0.1/doc/tutorials/pnp-origin/index.html	(revision 18980)
@@ -0,0 +1,153 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - license </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> pick and place - origin </H1>
+
+<h2> A. simplest case: rectangular board, implicit outline, implicit P&amp;P origin </h2>
+<p>
+Assume a <a href="orig_impl.lht">board</a> of 775*725 mils needs to be
+created. The P&amp;P fab says coord 0;0 is the lower left corner. The board
+fab says they need the centerline of tool-path on the outline layer for
+milling.
+<p>
+By far the simplest way to handle this board is to rely on builtin defaults:
+<ul>
+	<li> board size (width and height) specifies the outline of a rectangular board
+	<li> if the outline layer exists but is empty, an implicit rectangular outline is drawn, matching board sizes
+	<li> implicit P&amp;P origin is the lower left corner
+</ul>
+<p>
+Setting it up:
+<ul>
+	<li> 1. start pcb-rnd with no board - this gets the default board template
+	<li> 2. change board width &amp; height (gtk: file/preferences/user PoV/sizes)
+	<li> 3. do the layout
+	<li> 4. when exporting Gerber, enable the 'all layers' option to get the implicit outline layer
+	<li> 5. export the xy
+</ul>
+<p>
+
+<table border="1" cellspacing="0">
+<tr><th>Pros<th>Cons
+<tr>
+<td><ul>
+	<li> easy to set up
+	<li> no need to draw the outline
+</ul>
+<td><ul>
+	<li> limited drawing area - unsuitable for editing small boards
+	<li> supports rectangular shapes only
+</ul>
+</table>
+
+<h2> B. rectangular board, explicit outline, explicit P&amp;P origin </h2>
+<p>
+Assume another <a href="orig_sq.lht">board</a> of 775*725 mils needs to
+be created. The P&amp;P fab says coord 0;0 is the lower left corner. The
+board fab says they need the centerline of tool-path on the outline layer
+for milling.
+<p>
+This time the virtual board (canvas, drawing area) will be larger and the
+board outline of a 775*725 will be manually drawn. Since pcb-rnd won't make
+a guess of where the lower-left corner is, an explicit origin mark
+needs to be added for the pick&amp;place process.
+Setting it up, assuming the GTK HID:
+<ul>
+	<li> 1. start pcb-rnd with no board - this gets the default board template
+	<li> 2. draw the 775*725 mils box on the outline layer anywhere in the drawing area
+	<li> 3. do the layout within this box
+	<li> 4. draw a short line on a random layer - this will be the P&amp;P mark
+	<li> 5. drag&amp;drop move the endpoint of the unselected mark line to its other endpoint - this will result in a 0 long line, which looks like a filled circle; with 's' increase the size so that it's easily visible
+	<li> 6. select the mark, drag&amp;drop move it to the lower left corner of the outline box
+	<li> 7. the mark still selected, press ctrl+e and click on the "add attribute" button in the property editor
+	<li> 8. type in "pnp-origin" in the "Attribute key" and "yes" in the "Attribute value" field; click ok and close the property editor
+	<li> 9. export the Gerber and xy files
+</ul>
+<p>
+There is a <a href="https://archive.org/details/pcb-rnd-xy-origin-sq">video tutorial</a> available on steps 4..8.
+<p>
+Note 1: the mark is not explicitly visible in the XY file. It is not explicitly
+passed to the P&amp;P fab. Instead, all subcircuit coordinates are calculated considering
+the mark's center as 0;0.
+<p>
+Note 2: still, the mark is not hidden or suppressed by pcb-rnd from any
+of the output. It must be a line, but it can be on any of the layers.
+Thus the mark potentially would show up on the board. There are multiple
+options to make the mark disappear:
+<ul>
+	<li> make the mark diameter smaller that the router mill bit diameter and place
+	     the mark on a copper layer; the board fab will have the copper dot, but it
+	     will be milled away.
+	<li> same trick should work with silk as well
+	<li> or even on the solder mask layer where this object would be a small cutout over void
+	<li> make a new (copper) layer, place the mark there and don't send this layer's Gerber export
+       (later on pcb-rnd will support documentation layers which are more dedicated for this sort of use)
+</ul>
+<p>
+<table border="1" cellspacing="0">
+<tr><th>Pros<th>Cons
+<tr>
+<td><ul>
+	<li> drawing area (canvas) is bigger than the board: easier to edit
+	<li> can handle slots, cut-outs on the outline layer
+	<li> if the pick and place fab requires a slight offset on the placement, it is easy to move the mark
+</ul>
+<td><ul>
+	<li> requires more steps to set up
+</ul>
+</table>
+
+<h2> C. round board, explicit outline, explicit P&amp;P origin </h2>
+<p>
+Assume a third <a href="orig_round.lht">board</a> shaped as a 700 mil
+diameter circle. The P&amp;P fab says coord 0;0 is the lower left corner of
+the bounding box of the circle. The board fab says they need the
+centerline of tool-path on the outline layer for milling.
+<p>
+The process is the same as in example B. The only extra consideration
+is how to find the coords of the P&amp;P origin mark; for this the P&amp;P fab
+house needs to be consulted.
+<p>
+There is a <a href="https://archive.org/details/pcb-rnd-xy-origin-round">video tutorial</a> available on using temporary
+lines to aid placing the mark for a round lower-left corner.
+
+<h2> D. different P&amp;P origin for different fabs</h2>
+<p>
+If the same board is populated by two different fabs who want different
+origins, as long as they are also using different file formats, it is possible
+to use two marks. The mechanism for finding the relevant mark is this:
+<ul>
+	<li> look for a line that has attribute pnp-origin-<i>FORMAT</i> where <i>FORMAT</i> is the name of the format, e.g. gxyrs or Macrofab
+	<li> if that's not found, look for a line that has attribute pnp-origin
+	<li> if that's not found, use the bottom-left corner of the drawing area
+</ul>
+<p>
+This means the origin can be a different mark per format and/or a fallback
+mark can be also added.
+
+<h2> E. mark shapes</h2>
+<p>
+In the above examples we used a zero-length line for the mark, which looked
+like a filled circle. The code will find the first line with the right attribute
+and use the center point of that line. For a zero-length line the center point
+is the same as the two endpoints or the center of the filled circle it produces
+on the screen.
+<p>
+It is possible to use non-zero-length lines for the mark. For example two lines
+arranged in a + or x shape, either or both lines having the pnp-origin
+attribute. If the mark is symmetrical, the crossing point happens to be the
+middle of the line, which is what the code is after.
+<p>
+Of course it's also possible to use a single, non-zer-length line as mark,
+but then it's harder to see the middle point as an user. It may still work
+in some simple cases, e.g. a 45 degree short line segment symmetrically placed
+on the corner of a 90 degree outline corner.
+
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/tutorials/pnp-origin/orig_impl.lht
===================================================================
--- tags/2.0.1/doc/tutorials/pnp-origin/orig_impl.lht	(nonexistent)
+++ tags/2.0.1/doc/tutorials/pnp-origin/orig_impl.lht	(revision 18980)
@@ -0,0 +1,411 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 775.0mil
+    y = 725.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 25.0mil
+    y = 625.0mil
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:element.777 {
+     x=225.0mil; y=200.0mil;
+     li:objects {
+      ha:text.774 {
+       string=Standard SMT resistor, capacitor etc; x=193.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.775 {
+       string=R1; x=193.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.776 {
+       string=1206; x=193.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.778 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.779 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.780 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.781 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.785 {
+     x=550.0mil; y=200.0mil;
+     li:objects {
+      ha:text.782 {
+       string=Standard SMT resistor, capacitor etc; x=518.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.783 {
+       string=R2; x=518.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.784 {
+       string=1206; x=518.5mil; y=93.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.786 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.787 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.788 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.789 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.793 {
+     x=225.0mil; y=450.0mil;
+     li:objects {
+      ha:text.790 {
+       string=Standard SMT resistor, capacitor etc; x=193.5mil; y=343.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.791 {
+       string=R3; x=193.5mil; y=343.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.792 {
+       string=1206; x=193.5mil; y=343.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.794 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.795 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.796 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.797 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.801 {
+     x=550.0mil; y=450.0mil;
+     li:objects {
+      ha:text.798 {
+       string=Standard SMT resistor, capacitor etc; x=443.5mil; y=481.5mil; scale=100; fid=0; direction=1; role=desc;
+      }
+      ha:text.799 {
+       string=R4; x=443.5mil; y=481.5mil; scale=100; fid=0; direction=1; role=name;
+      }
+      ha:text.800 {
+       string=1206; x=443.5mil; y=481.5mil; scale=100; fid=0; direction=1; role=value;
+      }
+      ha:line.802 {
+       x1=-37.4mil; y1=-599.948um; x2=-37.4mil; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.803 {
+       x1=0.94996mm; y1=-599.948um; x2=0.94996mm; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.804 {
+       name=1; number=1; x1=-299.974um; y1=1.49987mm; x2=11.81mil; y2=1.49987mm; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.805 {
+       name=2; number=2; x1=-299.974um; y1=-59.05mil; x2=11.81mil; y2=-59.05mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.750 {
+        x1=284.05mil; y1=200.0mil; x2=12.47013mm; y2=200.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.753 {
+        x1=4.21513mm; y1=200.0mil; x2=4.21513mm; y2=450.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.756 {
+        x1=284.05mil; y1=450.0mil; x2=325.0mil; y2=450.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.759 {
+        x1=325.0mil; y1=450.0mil; x2=400.0mil; y2=525.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.762 {
+        x1=400.0mil; y1=525.0mil; x2=525.0mil; y2=525.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.765 {
+        x1=550.0mil; y1=9.93013mm; x2=550.0mil; y2=375.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.768 {
+        x1=550.0mil; y1=375.0mil; x2=625.0mil; y2=300.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.771 {
+        x1=625.0mil; y1=300.0mil; x2=625.0mil; y2=200.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 725.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 775.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+     buffer_number = 0
+      grid_unit = mil
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/tutorials/pnp-origin/orig_round.lht
===================================================================
--- tags/2.0.1/doc/tutorials/pnp-origin/orig_round.lht	(nonexistent)
+++ tags/2.0.1/doc/tutorials/pnp-origin/orig_round.lht	(revision 18980)
@@ -0,0 +1,449 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 1000.0mil
+    y = 1000.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 25.0mil
+    y = 625.0mil
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:element.45 {
+     x=375.0mil; y=350.0mil;
+     li:objects {
+      ha:text.42 {
+       string=Standard SMT resistor, capacitor etc; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.43 {
+       string=R1; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.44 {
+       string=1206; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.46 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.47 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.48 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.49 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.73 {
+     x=700.0mil; y=350.0mil;
+     li:objects {
+      ha:text.70 {
+       string=Standard SMT resistor, capacitor etc; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.71 {
+       string=R2; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.72 {
+       string=1206; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.74 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.75 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.76 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.77 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.81 {
+     x=375.0mil; y=600.0mil;
+     li:objects {
+      ha:text.78 {
+       string=Standard SMT resistor, capacitor etc; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.79 {
+       string=R3; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.80 {
+       string=1206; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.82 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.83 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.84 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.85 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.89 {
+     x=700.0mil; y=600.0mil;
+     li:objects {
+      ha:text.86 {
+       string=Standard SMT resistor, capacitor etc; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=desc;
+      }
+      ha:text.87 {
+       string=R4; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=name;
+      }
+      ha:text.88 {
+       string=1206; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=value;
+      }
+      ha:line.90 {
+       x1=-37.4mil; y1=-599.948um; x2=-37.4mil; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.91 {
+       x1=0.94996mm; y1=-599.948um; x2=0.94996mm; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.92 {
+       name=1; number=1; x1=-299.974um; y1=1.49987mm; x2=11.81mil; y2=1.49987mm; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.93 {
+       name=2; number=2; x1=-299.974um; y1=-59.05mil; x2=11.81mil; y2=-59.05mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.94 {
+        x1=434.05mil; y1=350.0mil; x2=640.95mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.97 {
+        x1=8.02513mm; y1=350.0mil; x2=8.02513mm; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.100 {
+        x1=434.05mil; y1=600.0mil; x2=475.0mil; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.103 {
+        x1=475.0mil; y1=600.0mil; x2=550.0mil; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.112 {
+        x1=550.0mil; y1=675.0mil; x2=675.0mil; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.115 {
+        x1=700.0mil; y1=540.95mil; x2=700.0mil; y2=525.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.118 {
+        x1=700.0mil; y1=525.0mil; x2=775.0mil; y2=450.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.127 {
+        x1=775.0mil; y1=450.0mil; x2=775.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.209 {
+        x1=150.0mil; y1=825.0mil; x2=150.0mil; y2=825.0mil; thickness=50.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+         ha:attributes {
+          pnp-origin=yes
+         }
+       }
+      }
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:arc.195 {
+        x=500.0mil; y=475.0mil; width=350.0mil; height=350.0mil; astart=0; adelta=-90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.197 {
+        x=500.0mil; y=475.0mil; width=350.0mil; height=350.0mil; astart=90; adelta=-90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.198 {
+        x=500.0mil; y=475.0mil; width=350.0mil; height=350.0mil; astart=180; adelta=-90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.199 {
+        x=500.0mil; y=475.0mil; width=350.0mil; height=350.0mil; astart=270; adelta=-90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 1000.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 1000.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+     buffer_number = 0
+      grid_unit = mil
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/tutorials/pnp-origin/orig_sq.lht
===================================================================
--- tags/2.0.1/doc/tutorials/pnp-origin/orig_sq.lht	(nonexistent)
+++ tags/2.0.1/doc/tutorials/pnp-origin/orig_sq.lht	(revision 18980)
@@ -0,0 +1,445 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 1000.0mil
+    y = 1000.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 25.0mil
+    y = 625.0mil
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:element.45 {
+     x=375.0mil; y=350.0mil;
+     li:objects {
+      ha:text.42 {
+       string=Standard SMT resistor, capacitor etc; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.43 {
+       string=R1; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.44 {
+       string=1206; x=343.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.46 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.47 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.48 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.49 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.73 {
+     x=700.0mil; y=350.0mil;
+     li:objects {
+      ha:text.70 {
+       string=Standard SMT resistor, capacitor etc; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.71 {
+       string=R2; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.72 {
+       string=1206; x=668.5mil; y=243.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.74 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.75 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.76 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.77 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.81 {
+     x=375.0mil; y=600.0mil;
+     li:objects {
+      ha:text.78 {
+       string=Standard SMT resistor, capacitor etc; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=desc;
+      }
+      ha:text.79 {
+       string=R3; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=name;
+      }
+      ha:text.80 {
+       string=1206; x=343.5mil; y=493.5mil; scale=100; fid=0; direction=0; role=value;
+      }
+      ha:line.82 {
+       x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.83 {
+       x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.84 {
+       name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.85 {
+       name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+    ha:element.89 {
+     x=700.0mil; y=600.0mil;
+     li:objects {
+      ha:text.86 {
+       string=Standard SMT resistor, capacitor etc; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=desc;
+      }
+      ha:text.87 {
+       string=R4; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=name;
+      }
+      ha:text.88 {
+       string=1206; x=593.5mil; y=631.5mil; scale=100; fid=0; direction=1; role=value;
+      }
+      ha:line.90 {
+       x1=-37.4mil; y1=-599.948um; x2=-37.4mil; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:line.91 {
+       x1=0.94996mm; y1=-599.948um; x2=0.94996mm; y2=23.62mil; thickness=8.0mil; clearance=0.0;
+      }
+      ha:pad.92 {
+       name=1; number=1; x1=-299.974um; y1=1.49987mm; x2=11.81mil; y2=1.49987mm; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+      ha:pad.93 {
+       name=2; number=2; x1=-299.974um; y1=-59.05mil; x2=11.81mil; y2=-59.05mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+       ha:flags {
+        square=1
+       }
+      }
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.94 {
+        x1=434.05mil; y1=350.0mil; x2=640.95mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.97 {
+        x1=8.02513mm; y1=350.0mil; x2=8.02513mm; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.100 {
+        x1=434.05mil; y1=600.0mil; x2=475.0mil; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.103 {
+        x1=475.0mil; y1=600.0mil; x2=550.0mil; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.112 {
+        x1=550.0mil; y1=675.0mil; x2=675.0mil; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.115 {
+        x1=700.0mil; y1=540.95mil; x2=700.0mil; y2=525.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.118 {
+        x1=700.0mil; y1=525.0mil; x2=775.0mil; y2=450.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.127 {
+        x1=775.0mil; y1=450.0mil; x2=775.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.136 {
+        x1=150.0mil; y1=875.0mil; x2=150.0mil; y2=875.0mil; thickness=50.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+         ha:attributes {
+          pnp-origin=yes
+         }
+       }
+      }
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.50 {
+        x1=150.0mil; y1=150.0mil; x2=150.0mil; y2=875.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.53 {
+        x1=150.0mil; y1=875.0mil; x2=925.0mil; y2=875.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.56 {
+        x1=925.0mil; y1=875.0mil; x2=925.0mil; y2=150.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.59 {
+        x1=925.0mil; y1=150.0mil; x2=150.0mil; y2=150.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 1000.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 1000.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+     buffer_number = 0
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/01_intro/Makefile
===================================================================
--- tags/2.0.1/doc/user/01_intro/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/01_intro/Makefile	(revision 18980)
@@ -0,0 +1,2 @@
+flow.svg: src/flow.dot
+	dot -Tsvg src/flow.dot > flow.svg
Index: tags/2.0.1/doc/user/01_intro/flow.svg
===================================================================
--- tags/2.0.1/doc/user/01_intro/flow.svg	(nonexistent)
+++ tags/2.0.1/doc/user/01_intro/flow.svg	(revision 18980)
@@ -0,0 +1,135 @@
+<?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">
+<!-- Generated by graphviz version 2.26.3 (20100126.1600)
+ -->
+<!-- Title: flow Pages: 1 -->
+<svg width="994pt" height="508pt"
+ viewBox="0.00 0.00 994.00 508.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph1" class="graph" transform="scale(1 1) rotate(0) translate(4 504)">
+<title>flow</title>
+<polygon fill="white" stroke="white" points="-4,5 -4,-504 991,-504 991,5 -4,5"/>
+<!-- sch -->
+<g id="node2" class="node"><title>sch</title>
+<ellipse fill="none" stroke="black" cx="97" cy="-258" rx="96.8736" ry="29.6985"/>
+<text text-anchor="middle" x="97" y="-262.4" font-family="Times Roman,serif" font-size="14.00">schematics editor</text>
+<text text-anchor="middle" x="97" y="-245.4" font-family="Times Roman,serif" font-size="14.00">e.g. gschem</text>
+</g>
+<!-- pcb -->
+<g id="node4" class="node"><title>pcb</title>
+<polygon fill="none" stroke="black" points="552,-228.177 552,-287.823 509.823,-330 450.177,-330 408,-287.823 408,-228.177 450.177,-186 509.823,-186 552,-228.177"/>
+<text text-anchor="middle" x="480" y="-253.9" font-family="Times Roman,serif" font-size="14.00">pcb&#45;rnd</text>
+</g>
+<!-- sch&#45;&gt;pcb -->
+<g id="edge5" class="edge"><title>sch&#45;&gt;pcb</title>
+<path fill="none" stroke="black" d="M194.142,-258C256.991,-258 337.918,-258 397.614,-258"/>
+<polygon fill="black" stroke="black" points="397.753,-261.5 407.753,-258 397.753,-254.5 397.753,-261.5"/>
+<text text-anchor="middle" x="268" y="-262.4" font-family="Times Roman,serif" font-size="14.00">fwd annotation</text>
+</g>
+<!-- pcb&#45;&gt;sch -->
+<g id="edge7" class="edge"><title>pcb&#45;&gt;sch</title>
+<path fill="none" stroke="grey" d="M407.731,-245.74C353.771,-238.188 278.234,-231.002 212,-237 203.792,-237.743 195.294,-238.779 186.805,-239.996"/>
+<polygon fill="grey" stroke="grey" points="186.225,-236.544 176.861,-241.501 187.272,-243.465 186.225,-236.544"/>
+<text text-anchor="middle" x="268" y="-241.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">back annotation</text>
+</g>
+<!-- fab -->
+<g id="node8" class="node"><title>fab</title>
+<ellipse fill="none" stroke="black" cx="891" cy="-355" rx="57.1737" ry="18"/>
+<text text-anchor="middle" x="891" y="-350.9" font-family="Times Roman,serif" font-size="14.00">fab house</text>
+</g>
+<!-- pcb&#45;&gt;fab -->
+<g id="edge9" class="edge"><title>pcb&#45;&gt;fab</title>
+<path fill="none" stroke="black" d="M552.343,-279.542C578.585,-287.055 608.529,-295.28 636,-302 702.5,-318.268 779.537,-333.832 831.385,-343.834"/>
+<polygon fill="black" stroke="black" points="830.928,-347.311 841.408,-345.759 832.248,-340.436 830.928,-347.311"/>
+<text text-anchor="middle" x="707" y="-337.4" font-family="Times Roman,serif" font-size="14.00">e.g. gerber, bom, xy</text>
+</g>
+<!-- tt -->
+<g id="node9" class="node"><title>tt</title>
+<ellipse fill="none" stroke="black" cx="891" cy="-290" rx="94.7523" ry="29.6985"/>
+<text text-anchor="middle" x="891" y="-294.4" font-family="Times Roman,serif" font-size="14.00">etching at home:</text>
+<text text-anchor="middle" x="891" y="-277.4" font-family="Times Roman,serif" font-size="14.00">toner transfer</text>
+</g>
+<!-- pcb&#45;&gt;tt -->
+<g id="edge11" class="edge"><title>pcb&#45;&gt;tt</title>
+<path fill="none" stroke="black" d="M552.061,-263.611C617.585,-268.712 714.996,-276.297 788.596,-282.027"/>
+<polygon fill="black" stroke="black" points="788.576,-285.536 798.818,-282.823 789.119,-278.557 788.576,-285.536"/>
+<text text-anchor="middle" x="707" y="-285.4" font-family="Times Roman,serif" font-size="14.00">e.g. ps or png</text>
+</g>
+<!-- web -->
+<g id="node10" class="node"><title>web</title>
+<ellipse fill="none" stroke="black" cx="891" cy="-225" rx="57.1737" ry="18"/>
+<text text-anchor="middle" x="891" y="-220.9" font-family="Times Roman,serif" font-size="14.00">web page</text>
+</g>
+<!-- pcb&#45;&gt;web -->
+<g id="edge13" class="edge"><title>pcb&#45;&gt;web</title>
+<path fill="none" stroke="black" d="M552.061,-252.214C629.129,-246.026 750.309,-236.296 824.974,-230.301"/>
+<polygon fill="black" stroke="black" points="825.503,-233.77 835.191,-229.481 824.943,-226.793 825.503,-233.77"/>
+<text text-anchor="middle" x="707" y="-250.4" font-family="Times Roman,serif" font-size="14.00">e.g. svg</text>
+</g>
+<!-- doc -->
+<g id="node11" class="node"><title>doc</title>
+<ellipse fill="none" stroke="black" cx="891" cy="-160" rx="84.8528" ry="29.6985"/>
+<text text-anchor="middle" x="891" y="-164.4" font-family="Times Roman,serif" font-size="14.00">printed</text>
+<text text-anchor="middle" x="891" y="-147.4" font-family="Times Roman,serif" font-size="14.00">documentation</text>
+</g>
+<!-- pcb&#45;&gt;doc -->
+<g id="edge15" class="edge"><title>pcb&#45;&gt;doc</title>
+<path fill="none" stroke="black" d="M552.357,-236.515C578.6,-229.008 608.542,-220.772 636,-214 692.724,-200.011 757.09,-186.397 806.963,-176.339"/>
+<polygon fill="black" stroke="black" points="807.942,-179.712 817.057,-174.311 806.564,-172.849 807.942,-179.712"/>
+<text text-anchor="middle" x="707" y="-218.4" font-family="Times Roman,serif" font-size="14.00">e.g. ps, eps, png, jpg</text>
+</g>
+<!-- kicad -->
+<g id="node12" class="node"><title>kicad</title>
+<ellipse fill="none" stroke="grey" cx="480" cy="-29" rx="111.93" ry="29.6985"/>
+<text text-anchor="middle" x="480" y="-33.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">collaboration with</text>
+<text text-anchor="middle" x="480" y="-16.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">someone using kicad</text>
+</g>
+<!-- pcb&#45;&gt;kicad -->
+<g id="edge21" class="edge"><title>pcb&#45;&gt;kicad</title>
+<path fill="none" stroke="grey" d="M398.139,-238.135C318.036,-214.48 213.761,-169.842 256,-105 279.449,-69.003 321.139,-49.7347 362.247,-39.5341"/>
+<polygon fill="grey" stroke="grey" points="397.198,-241.506 407.777,-240.916 399.139,-234.781 397.198,-241.506"/>
+<polygon fill="grey" stroke="grey" points="363.159,-42.9156 372.112,-37.2517 361.581,-36.0958 363.159,-42.9156"/>
+<text text-anchor="middle" x="268" y="-126.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">kicad&#39;s</text>
+<text text-anchor="middle" x="268" y="-109.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">native format</text>
+</g>
+<!-- gpcb -->
+<g id="node13" class="node"><title>gpcb</title>
+<ellipse fill="none" stroke="grey" cx="480" cy="-105" rx="137.886" ry="29.6985"/>
+<text text-anchor="middle" x="480" y="-109.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">collaboration with</text>
+<text text-anchor="middle" x="480" y="-92.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">someone using gEDA/PCB</text>
+</g>
+<!-- pcb&#45;&gt;gpcb -->
+<g id="edge23" class="edge"><title>pcb&#45;&gt;gpcb</title>
+<path fill="none" stroke="grey" d="M480,-144.667C480,-154.301 480,-164.959 480,-175.77"/>
+<polygon fill="grey" stroke="grey" points="476.5,-175.98 480,-185.98 483.5,-175.98 476.5,-175.98"/>
+<polygon fill="grey" stroke="grey" points="483.5,-144.656 480,-134.656 476.5,-144.656 483.5,-144.656"/>
+<text text-anchor="middle" x="527" y="-164.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">gEDA</text>
+<text text-anchor="middle" x="527" y="-147.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">native format</text>
+</g>
+<!-- lib -->
+<g id="node5" class="node"><title>lib</title>
+<ellipse fill="none" stroke="black" cx="480" cy="-471" rx="79.196" ry="29.6985"/>
+<text text-anchor="middle" x="480" y="-475.4" font-family="Times Roman,serif" font-size="14.00">local footprint</text>
+<text text-anchor="middle" x="480" y="-458.4" font-family="Times Roman,serif" font-size="14.00">library</text>
+</g>
+<!-- lib&#45;&gt;pcb -->
+<g id="edge17" class="edge"><title>lib&#45;&gt;pcb</title>
+<path fill="none" stroke="black" d="M393.486,-461.115C354.019,-451.396 312.103,-432.226 294,-394.5 267.888,-340.083 336.962,-302.434 398.212,-280.667"/>
+<polygon fill="black" stroke="black" points="392.923,-464.576 403.451,-463.387 394.479,-457.751 392.923,-464.576"/>
+<polygon fill="black" stroke="black" points="399.644,-283.876 407.959,-277.31 397.364,-277.257 399.644,-283.876"/>
+<text text-anchor="middle" x="268" y="-381.9" font-family="Times Roman,serif" font-size="14.00">.fp</text>
+</g>
+<!-- wlib -->
+<g id="node6" class="node"><title>wlib</title>
+<ellipse fill="none" stroke="grey" cx="480" cy="-395" rx="130.815" ry="29.6985"/>
+<text text-anchor="middle" x="480" y="-399.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">remote footprint</text>
+<text text-anchor="middle" x="480" y="-382.4" font-family="Times Roman,serif" font-size="14.00" fill="grey">library (e.g. on the web)</text>
+</g>
+<!-- wlib&#45;&gt;pcb -->
+<g id="edge19" class="edge"><title>wlib&#45;&gt;pcb</title>
+<path fill="none" stroke="grey" d="M480,-340.237C480,-349.113 480,-357.668 480,-365.273"/>
+<polygon fill="grey" stroke="grey" points="483.5,-340.112 480,-330.112 476.5,-340.112 483.5,-340.112"/>
+<text text-anchor="middle" x="535" y="-343.9" font-family="Times Roman,serif" font-size="14.00" fill="grey">import footprint</text>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/user/01_intro/history.html
===================================================================
--- tags/2.0.1/doc/user/01_intro/history.html	(nonexistent)
+++ tags/2.0.1/doc/user/01_intro/history.html	(revision 18980)
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h2> pcb-rnd History </h2>
+<p>pcb-rnd is a rapid moving independent project started in 2013, but roots
+tracing back to the early 90s, to PCB.
+
+<p>
+From the pcb.html documentation:
+<pre><i>
+	<code>Pcb</code> was first written by Thomas Nau for an
+	Atari ST in 1990 and ported to <code>UNIX</code> and <code>X11</code> in
+	1994.  It was not intended as a professional layout system, but as a tool
+	which supports people who do some home-developing of hardware.
+</i></pre>
+
+<p>In Fall 2013, Tibor 'Igor2' Palinkas started an
+<a href="../../motivation.html">unofficial fork of PCB</a> to make and
+share <i>random</i> changes and improvements (hence the name "-rnd"). Over
+the following years the fork was officially announced, adopted additional
+users, and reached various milestones, including modularization of the code
+base, a better configuration system.
+<p>
+In 2015, the project switched pace: lot of hours invested and many new developers
+and contributors joined, pcb-rnd started to grow rapidly. Most of the code base
+has been extended, cleaned up or rewritten. 
+<p>
+In 2016 and 2017 pcb-rnd went on growig in number of developers, contributors
+and users. The number of long standing bugs and misfeatures fixed and missing
+features implemented grew a lot too. This affected major components
+as the plugin system, the I/O (file format support) subsystem and even the
+data model pcb-rnd operates on.
+<p>
+At the moment, pcb-rnd is not part of any EDA suite.
+<p>
+A more complete history can be found in the
+<a href="http://repo.hu/projects/pcb-history/">pcb-history</a> project.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/01_intro/index.html
===================================================================
--- tags/2.0.1/doc/user/01_intro/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/01_intro/index.html	(revision 18980)
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 1. Introduction </h2>
+<p>
+pcb-rnd is a highly modular, interactive <i>Printed Circuit Board</i> editor
+with a <a href="history.html"> very long history </a>.
+
+
+<h3> 1.1. Place in the workflow </h3>
+<p>
+The main purpose of pcb-rnd is to edit the geometry of the board. This
+includes board shape, copper shape, layer stackup, holes drilled, slots
+routed.
+<p>
+The <b>input</b> of the layout process is usually a netlist derived from
+schematics, and occasionally layouts drawn from scratch or created from
+schematic without importable netlist. Pcb-rnd can read different netlist
+formats and it can help the user to realize the given netlist in copper or to
+change the netlist and back annotate the changes. Pcb-rnd, however, does not
+display or edit schematics directly.
+<p>
+The <b>output</b> of pcb-rnd is most often a vector format (e.g. gerber
+RS274D), that is sent to a pcb fab house for manufacturing or is utilized for
+auto-fabrication. Pcb-rnd supports a variety of vector and raster output
+formats making it easy to print boards, publish them on web pages, and include
+them in documentation.
+<p>
+The typical workflows are:
+<p>
+<img src="flow.svg" alt="[workflow diagram showing pcb-rnd interacting with schematics editor, fabrication, and others]">
+<p>
+Black flows are the most commonly used; grey flows are possible, fully
+supported but less often used in practice.
+
+<h3> 1.2. What pcb-rnd is and is not </h3>
+<p>
+Pcb-rnd is a versatile tool for PCB layout design. It is geared to be
+a tool for users with the UNIX mind set:
+<ul>
+	<li> it is small, easy to compile and run, has low resource footprint
+	<li> it is modular - most features are in plugins, the user can chose which plugins to use
+	<li> it is portable - also runs on systems that are not hyped today
+	<li> it works well from both CLI (automation, e.g. called from a Makefile or even using with an interactive action command <i>shell</i>) and GUI
+	<li> it is designed to communicate with other software:
+	<ul>
+		<li> it is easy to remote control
+		<li> it speaks many file formats
+	</ul>
+	<li> it doesn't outsmart the user, it doesn't block the user from doing unusual things; it has support for checking the result and generate warnings
+</ul>
+<p>
+There are a few things that are out of scope for pcb-rnd:
+<ul>
+	<li> 3d editing: pcb-rnd is 2.5d, that means it's basically 2d and understands the 3rd dimension partially; it does load, handle and export 3d data (e.g. subcircuit part models for an openscad export) but it does not edit 3d data
+	<li> embedded &lt;whatever-non-pcb-editing&gt;: as a UNIX tool, pcb-rnd focuses on one thing, pcb edition, and relies on (and maintains close cooperation with) other tools for:
+	<ul>
+		<li> circuit schematics edition
+		<li> 3d rendering
+		<li> simulation
+	</ul>
+	<li> autorouting - there's a basic built-in autorouter, but it's recommended to use external autorouters (various file formats are supported)
+</ul>
Index: tags/2.0.1/doc/user/01_intro/src/flow.dot
===================================================================
--- tags/2.0.1/doc/user/01_intro/src/flow.dot	(nonexistent)
+++ tags/2.0.1/doc/user/01_intro/src/flow.dot	(revision 18980)
@@ -0,0 +1,45 @@
+digraph flow {
+	rankdir=LR
+
+	subgraph in {
+		rank=same
+		sch   [label="schematics editor\ne.g. gschem"]
+	}
+
+	subgraph edit {
+		rank=same
+		pcb   [label="pcb-rnd" shape=octagon width=2 height=2]
+		lib   [label="local footprint\nlibrary"]
+		wlib  [label="remote footprint\nlibrary (e.g. on the web)" color=grey fontcolor=grey]
+	}
+
+
+	subgraph out {
+		rank=same
+		fab   [label="fab house"]
+		tt    [label="etching at home:\ntoner transfer"]
+		web   [label="web page"]
+		doc   [label="printed\ndocumentation"]
+	}
+
+	subgraph edit {
+		rank=same
+		kicad [label="collaboration with\nsomeone using kicad" color=grey fontcolor=grey]
+		gpcb  [label="collaboration with\nsomeone using gEDA/PCB" color=grey fontcolor=grey]
+	}
+
+
+	sch -> pcb [label="fwd annotation"]
+	pcb -> sch [label="back annotation" color=grey fontcolor=grey]
+	pcb -> fab [label="e.g. gerber, bom, xy"]
+	pcb -> tt  [label="e.g. ps or png"]
+	pcb -> web [label="e.g. svg"]
+	pcb -> doc [label="e.g. ps, eps, png, jpg"]
+
+	lib -> pcb [label=".fp" dir=both weight=1000]
+
+	wlib -> pcb [label="import footprint" dir=back color=grey fontcolor=grey]
+
+	pcb -> kicad [label="kicad's\nnative format" dir=both color=grey fontcolor=grey]
+	pcb -> gpcb  [label="gEDA\nnative format" dir=both color=grey fontcolor=grey]
+}
Index: tags/2.0.1/doc/user/02_model/index.html
===================================================================
--- tags/2.0.1/doc/user/02_model/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/index.html	(revision 18980)
@@ -0,0 +1,588 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 2. Model of the world  </h2>
+<p>
+Pcb-rnd is designed to handle the geometric data of a PCB. This section describes
+how pcb-rnd represents reality (e.g. copper shapes) in memory.
+
+<h3> 2.1. Board </h3>
+<p>
+Each design pcb-rnd handles is a <i>board</i>. The board has global properties and hosts
+layers. Most drawing primitives (objects) are on layers. This section describes
+the most important global properties.
+<p>
+<b>Board size</b> is given as a width and a height. For rectangular boards
+this can be the real board size, but more commonly it is used to simply
+determine the on-screen drawing area and the final board dimensions are
+specified using the outline layer. If the board is not rectangular, the
+contour must be specified on the outline layer and the board size must be
+large enough that the outline fits in it.
+<p>
+<b>Netlist</b> is the list of logical connections to be realized in copper.
+A netlist is a list of named <i>nets</i>. Each net consists of a list of
+<i>terminals</i> (pins or pads) to connect. A terminal is given as
+refdes-pinname, e.g. U4-7 means "pin number 7 in subcircuit called U4".
+<p>
+<b>Fonts</b> are always embedded in the design file in order to guarantee
+that the file can be ported and will look the same on different hosts.
+<p>
+Misc editor settings, such as grid size and offset.
+
+<h3> 2.2. Layers </h3>
+<p> 
+The main use of pcb-rnd is to aide the user in the process of producing real
+pcbs composed of real <i>physical layers</i>. pcb-rnd also refers to layers to
+conceptualize this process, but pcb-rnd layers are different than the
+<i>physical layers</i>. 
+<p>
+Unlike a <i>physical layer</i>, a pcb-rnd layer has no thickness. Any pcb-rnd
+layer is always part of a <i>layer group</i>. It is a 2 dimensional logical
+canvas, similar to layers in image manipulation software like GIMP. In pcb-rnd
+there are <i>explicit</i>, <i>virtual</i> or <i>implicit</i> layers. An
+explicit layer contains drawing primitives (<a href="#objects">objects</a>)
+placed by the user. The user has full control over an explicit layer: objects
+can be added or removed or changed any time. A virtual or implicit layer has no
+such flexibility: pcb-rnd computes its content from explicit layers and there's
+no way for the user to change the result directly.
+<p>
+Pcb-rnd currently maintains some layers types as virtual layers for
+compatibility with the PCB package. In a pcb-rnd board design started from
+default configuration options, the mask, silk, and paste layers currently start
+out as virtual layers. The content for these layers is computed by pcb-rnd as
+for a virtual or explicit layer, until the user decides to use features that
+require user control over one or more of the layers in the group. At that
+point, the virtual layer is replaced with an explicit layer group. 
+<p>
+For example, in pcb-rnd when using one of the gtk GUIs, if the user right
+clicks on a solder mask ('mask') layer and choose an option to 'insert new
+layer before this one', pcb-rnd replaces the virtual mask layer with an explicit
+mask layer group. The mask layer group can contain one to many pcb-rnd layers
+each with individual settings to control implicit generation, and additive or
+subtractive behavior when adding objects to the layers. 
+
+<h3> 2.3. Layer Groups </h3>
+<p>
+One or more explicit layers form a <i>layer group</i>. All pcb-rnd layers
+of a layer group will end up on the same physical layer. The visibility of
+layers in a layer group are toggled together. Having more than one layer
+in a group may be useful to:
+<ul>
+	<li> exploit that layers have different
+	     <a href="../09_appendix/layer_colors.html">drawing color on screen:</a>
+	     e.g. there can be a signal and a gnd layers with different color in
+	     the same layer group, on the same physical layer.
+	<li> on composite-groups (mask, paste, silk), layers are combined using
+	     their properties: some layers may draw, others may clear; some layers
+	     may contain auto-generated objects. The order of layers does matter
+	     in draw-clear combinations.
+</ul>
+<p>
+Since <i>layer groups</i> donate the physical layers, a board stack-up
+is built of layer groups. Substrates are layer groups without drawable
+layers in them. The mask, paste, silk layer groups behave the same and
+can host zero or more logical layers.
+<p>
+Each layer group has a type. Types are:
+<ul>
+	<li> <b>copper</b> for signal layers
+	<li> <b>silk</b> for silkscreen layers
+	<li> <b>outline</b> for the contour of the board and slots and cutouts
+	<li> <b>mask</b> for solder masks
+	<li> <b>paste</b> for solder paste
+</ul>
+<p>
+Each layer group has a location. Locations are:
+<ul>
+	<li><b>top</b> (used to be the "component side" in the age of thru-hole components)
+	<li><b>bottom</b> (used to be the "solder side" in the age of thru-hole components)
+	<li><b>intern</b> (sandwiched between other layers)
+	<li><b>global</b> (affects all physical layers, thus has no specific location)
+</ul>
+<p>
+Not all combination of type and location are supported: e.g. for an outline
+layer group the location is always global. The table below lists whether a
+combination is supported or not.
+<p>
+<table border=1>
+	<caption><b>Layer Combination Support</b>
+	<tr><th> &nbsp; <th> top <th> bottom <th> intern <th> global <th> composite
+	<tr><th> copper <td> yes <td> yes    <td> yes    <td> no     <td> no
+	<tr><th> silk   <td> yes <td> yes    <td> no     <td> no     <td> yes
+	<tr><th> mask   <td> yes <td> yes    <td> no     <td> no     <td> yes
+	<tr><th> paste  <td> yes <td> yes    <td> no     <td> no     <td> yes
+	<tr><th> outline<td> no  <td> no     <td> no     <td> yes    <td> no
+</table>
+
+<h3 id="objects"> 2.4. Basic Drawing Objects </h3>
+<p>
+Pcb-rnd supports a small number of basic drawing objects, from which complex
+objects can be build. The following figure demonstrates all basic objects:
+<p>
+<!-- TODO: update with padstack -->
+<img src="objects_basic.png" alt="[Arc, Line, Polygon, Pin, Via]">
+<p>
+Objects have flags that control their behavior. The following flags are common
+to all objects:
+<p>
+<table>
+	<caption><b>Object Flags</b>
+	<tr><th>name        <th> description
+	<tr><td>selected    <td> selected by the user ("cyan")
+	<tr><td>found       <td> found as a galvanic connection in the last connection lookup ("green")
+	<tr><td>warn        <td> offending object e.g. in a short circuit ("orange")
+	<tr><td>lock        <td> locked by the user: can't be selected, moved or changed using the basic mouse/keyboard actions (still can be copied, selected by query() and edited by propedit())
+</table>
+
+
+<h4> 2.4.1. Line Objects </h4>
+<p>
+Lines are round ended straight line segments with a width and
+a clearance. The above image shows 3 lines connected. Lines are mainly
+used to construct traces. A line is always on a specific layer. The user
+interface allows drawing lines aligned to 90 or 45 degree axes or
+lines with random angle.
+<p>
+A line is specified by its two endpoints, width and clearance:
+<p>
+<img src="obj_line.png" alt="[Line interacting with a polygon]">
+<p>
+A <i>clearance</i> is the gap between a line and the surrounding polygon
+in the same layer group. The gap is made only if the surrounding polygon has
+the "clearpoly" flag set and the line has the "clearline" flag set. If either
+of these flags is not set, no gap is made - or in pcb-rnd terminology,
+the line is joined to the polygon.
+<p>
+<table>
+	<caption><b>Line Object Flags</b>
+	<tr><th>name        <th> description
+	<tr><td>clearline   <td> clears polygons with the "clearpoly" flag in the same layer group
+</table>
+
+<h4> 2.4.2. Arc Objects </h4>
+<p>
+Arcs are round ended circular arcs with trace width and clearance. They
+behave like lines in all respects.
+<p>
+<img src="obj_arc.png" alt="[Arc interacting with a polygon]">
+<p>
+Although the arc is described with its center, radius, start and end
+angles, the user interface may offer drawing arcs by endpoints.
+<p>
+<table>
+	<caption><b>Arc Object Flags</b>
+	<tr><th>name        <th> description
+	<tr><td>clearline   <td> clears polygons with the "clearpoly" flag in the same layer group
+</table>
+
+<h4> 2.4.3. Polygon Objects </h4>
+<p>
+Polygons are solid, filled copper areas with optional holes in them. Polygon
+contour consists of lines - when they look curvy, its really high resolution
+line approximation. There are two type of holes in a polygon: <i>explicit</i>,
+user drawn holes and <i>clearance</i> cutouts. User drawn holes are "negative"
+polygons drawn manually. To keep polygons simple, if an user drawn hole
+touches the contour of a polygon, the hole is removed and the contour is
+modified; if two holes touch, they are merged into one hole.
+<p>
+If the polygon has the "clearpoly" flag set (default), clearance cutouts are
+automatically inserted around objects on the same layer group:
+<ul>
+	<li> lines and arcs, if they have the "clearline" flag set (default)
+	<li> padstacks, if they are not connected to the polygon by thermals
+</ul>
+<p>
+Overlapping or touching polygons are not automatically merged. An object
+with the "clearline" flag set will clear all "clearpolys" it is over -
+if there are multiple such polygons overlapping under the objects (on
+the same layer group), all such polygons get the clearance cutout.
+<p>
+If a polygon has the "clearpolypoly" flag set, it clears any other polygon
+that does <b>not</b> have the "clearpolypoly" flag set but has the
+"clearpoly" set. In other words, a "clearpolypoly" polygon behaves the same
+as a line/arc that has the "clearline" flag.
+<p>
+If a polygon is cut into multiple islands, the behavior depends on the
+"fullpoly" flag of the polygon. If it is not set (default), only the largest
+island is kept, else all islands are kept. In the "fullpoly" mode islands
+will have no galvanic connection (unless the user adds vias and connect them
+on another layer), still the program will handle all islands as a single
+polygon. This is risky: the program will indicate connection between polygon
+islands that are not really connected, only because they are part of the same
+polygon!
+<p>
+<p>
+<table border=1>
+	<caption><b>Polygon Object Flags</b>
+	<tr><th>name        <th> description
+	<tr><td>clearpoly   <td> should have clearance around objects, if the objects have the appropriate flags too
+	<tr><td>fullpoly    <td> keep all islands, not only the largest
+</table>
+
+<h4> 2.4.4. Text Objects </h4>
+<p>
+A text object is string and a series of symbols (pcb-rnd's terminology for
+glyph). Symbols are built of lines and are stored in the font. Each board
+can have its own font, but there can be only one font per board. When
+the string of the text is edited, the object is rendered again so that the
+new string appears.
+<p>
+Text objects can be placed on copper and silk layers. Text can be rotated
+only in 90 degree steps. Each text object has a scale parameter that
+determines its size in percentage. A scale of 100% means symbols are
+rendered in 1:1 size.
+<p>
+The clearance around text is rendered as a round corner rectangular cutout.
+Bug: copper text can not participate in short circuits, the galvanic connection
+checker code skips texts.
+
+<h4> 2.4.5. Subcircuits </h4>
+<p id="subcircuit">
+A subc (subcircuit) is a group of objects with its own, local layer
+information. All layers of a subc are <i>bound</i> layers, that is, the user
+is free to choose on which actual board layer it is placed on.
+There is no limitation on what layers or objects a subc can contain.
+<p id="subc">
+The main uses of subc are:
+<ul>
+	<li> footprint
+	<li> copy&amp;paste anonymous repetitive section of a circuit
+</ul>
+
+<h5> 2.4.5.1 Subcircuits as footprints </h5> <a id="footprints">
+
+<p>
+A subcircuit may be an instance (copy) of a footprint. The subcircuit is 
+placed on the board or loaded into a paste buffer (the footprint lives in
+the footprint library).
+
+<p>
+In the footprint form the construct is small and flexible. It describes
+all the physical parts, like pins, pads, silk lines. In the same time a
+footprint leaves many details blank, e.g. it doesn't specify exact layers,
+it doesn't have font and the refdes is random.
+
+<p>
+When the footprint is loaded, it becomes an subcircuit. The subcircuit inherits all
+the physical properties and the blank details are filled in with the data taken
+from the current board: the layer binding is done, all parts of the subcircuit
+lands on a specific board layer; the refdes is rendered using the font in
+the current board.
+
+<p>
+The footprint -&gt; subcircuit instantiation is also a copy. Once the subcircuit
+is created from a footprint, the subcircuit is a self-containing object and
+does not have any direct reference to the footprint it was once derived from.
+Changes to the original footprint will <b>not</b> affect the subcircuits.
+
+<p>
+In other words, a footprint is an abstract recipe, part of a
+library, while an subcircuit is a land pattern already embedded in a
+specific design and describes actual copper and silk.
+
+<p>
+Currently a subcircuit or footprint can contain any object on any layer
+that a board can contain. The only notable limitation (that applies to boards too)
+is that there is no good way to represent plated slotting.
+<p>
+Commonly used subcircuit attributes:
+<p>
+<table border=1>
+	<caption><b>Element Properties</b>
+	<tr><th> subcircuit attribute <th> description
+	<tr><td> name: refdes         <td> unique identifier, e.g. "C42" - pcb-rnd code will use this when present
+	<tr><td> name: value          <td> informal value, e.g. "15 pF"
+	<tr><td> name: footprint      <td> informal footprint description, e.g. "1206"
+</table>
+<p>
+If the <i>nonetlist</i> flag is set, the subcircuit is not intended to be
+part of the netlist
+
+<p>
+When a subcircuit is a footprint, it normally has the <i>refdes</i> attribute set.
+Refdes is the name that identifies the part on the netlist. Some objects
+of a footprint will have the <i>term</i> attribute to turn those object into
+terminals (representing pins or pads). If multiple objects have the same
+<i>term</i> attribute value, they are all contributing to the same terminal.
+<p>
+When the terminal object is a single <a
+href="#padstack"><i>padstack</i></a>, it is called a <a href="#lightterm">
+<i>light terminal</i></a>. When the terminal is built using multiple objects,
+it is called a <i>heavy terminal</i>.
+<p>
+A connection on the netlist is identified as <i>refdes</i>-<i>term</i>, e.g.
+U5-3 means "the object(s) whose term attribute is 3 within the subcircuit
+whose refdes attribute is 'U5'".
+
+<h5> 2.4.5.2 Subcircuits as repetitive modules </h5>
+<p>
+If the repetitive module is specified as a refdes-named device on
+the schematics, it is really just a footprint. Else it is a non-footprint
+subcircuit.
+<p>
+Compared to subcircuits as footprint, a non-footprint subcircuit will not have
+a refdes attribute and will not have terminals. It will also have the
+nonetlist flag set.
+
+<h4> 2.4.6. Pad stacks </h4> <a id="padstack">
+<p>
+A pad stack is a generic pin/pad/via object that may contain any combination
+of:
+<ul>
+	<li> a hole (plated or unplated, thru-hole or blind/buried)
+	<li> a pad shape that can be different on each layer group type
+	<li> thermal relief info on a per layer basis
+</ul>
+<p><a id="lightterm">
+Pad stacks are flexible enough to cover the majority of the simple pin/pad/via
+cases. In a subcircuit, marked as a terminal, a pad stack is called a
+<i>light terminal</i>. This concept exist in parallel to the <i>heavy terminal</i>
+concept: a heavy terminal consists of multiple objects (e.g. polygons, lines,
+arcs, pad stacks), all tagged to the same terminal. When the pad stack model
+is not capable to describe a complicated pin or pad, the user should chose the
+heavy terminal model. A typical example is the center pad of a QFN footprint
+with vias for heat transfer and a specific pattern of paste. The strength
+of a pad stack is it's relative simplicity and that all objects on the vertical
+stack are bundled together; the strength of the heavy model is its flexibility:
+anything that can be drawn on board can be turned into a heavy terminal.
+<p>
+The optional hole of the pad stack is useful if the pad stack is to be used
+as a mounting hole, via or pin. The span of the hole is described by two
+integers: how far the hole starts and ends from the top or bottom copper
+layer group, counted in copper layer groups.
+<p>
+A simple all-way-thru hole's span is 0;0, which means it starts at the
+top copper group and ends on the bottom copper group. Or precisely,
+"starts 0 groups down from top copper group and spans until 0 groups up
+from the bottom group". That is, when hol span values are positive,
+the top of the hole is counted from the top copper group down and the
+bottom of the hole is counted from the bottom group up. If a span value
+is negative, it is counted from the other side, e.g. a 0;-3 means:
+"hole top is 0 groups down from top copper group, hole bottom is <i>3 groups
+down from the top copper group</i>". Or in other words, the topmost four copper
+layer groups are connected by the via.
+<p>
+The plating of the hole is a boolean and is independent of any
+other parameter.
+<p>
+For each layer group type, the user may specify zero or one pad shape.
+<table border=1>
+	<caption><b>Pad stack layer group types</b>
+	<tr><th>name           <th> remarks
+	<tr><td>top silk       <td> &nbsp;
+	<tr><td>top paste      <td> &nbsp;
+	<tr><td>top mask       <td> the first negative layer is used
+	<tr><td>top copper     <td> &nbsp;
+	<tr><td>intern copper  <td> the same pad will be used on all internal copper groups
+	<tr><td>bottom copper  <td> &nbsp;
+	<tr><td>bottom mask    <td> the first negative layer is used
+	<tr><td>bottom paste   <td> &nbsp;
+	<tr><td>bottom silk    <td> &nbsp;
+</table>
+<p>
+<table border=1>
+	<caption><b>Pad shapes</b>
+	<tr><th>name           <th> description
+	<tr><td>fillcircle     <td> x;y offset of the center, diameter
+	<tr><td>line           <td> round or square cap, from x1;y1 to x2;y2 with the specified thickness
+	<tr><td>simple-polygon <td> a simple polygon has a single outer contour and no holes
+</table>
+<p>
+The pad stack has an origin, a 0;0 point where it is grabbed. If the pad stack
+features a hole, the origin is the center point of the hole. Pad shapes are
+all defined in a way that they do not have to be concentric with the hole or
+the origin. This allows asymmetric pads.
+<p>
+In case of blind/buried vias, the internal copper layer pads are applied
+only on layers with hole span. However, this does <b>not</b> apply to top/bottom
+shapes, those are always explicit. This means it is possible to use a pad stack
+as a pad-pair of an board edge connector, having a copper pad on the top
+layer and one on the bottom layer, even without having a (plated) hole in between.
+The code will assume connection between the pads only if the pad stack has a
+plated hole.
+<p>
+If the <i>global clearance</i> is set, it overrides the per layer type
+clearance and the padstack will have the same global clearance on all
+layer groups on which it has copper objects.
+<p>
+<table border=1>
+	<caption><b>Typical pad stack examples</b>
+	<tr><th>name                    <th> description
+	<tr><td>rectangular smd pad     <td> no hole; square cap line or polygon on top copper, top mask and top paste
+	<tr><td>simple pin or via       <td> plated hole and the same filled circle on all copper layers; if pin, a slightly bigger circle on the mask layers
+	<tr><td>octagon pin or via      <td> plated hole and the same simple polygon (octagon shaped) on all copper layers; if pin, a slightly bigger polygon on the mask layers
+	<tr><td>'oblong' pin            <td> plated hole, a short round cap line segment on the bottom copper and mask layers, filled circle on all other copper layers and on the top mask layer
+	<tr><td>blind via               <td> plated hole and the same filled circle on internal and top copper layers - nothing on the bottom copper layer
+	<tr><td>power jack with slot    <td> n/a - can not be done with pad stack as the plated slots for the pins can not be represented as plated round holes - use heavy terminals instead
+</table>
+<p>
+Pad stack <i>prototypes</i> (templates) are stored only once per pcb_data_t (only once per
+board for vias or per each subcircuit for terminals). The actual pad stacks
+placed on the board (or in subcircuit) are called <i>pad stack references</i>.
+A pad stack reference has its own x;y coordinate (within the board or
+subcircuit), a rotation angle and a mirror flag. This means if a TQFP chip
+has 48 pads along 4 sides, in the simplest setup there will be onlt one pad
+stack prototype and 48 pad stack references using the same prototype with
+different coordinates and rotations.
+<p>
+Each padstack reference has an optional <i>global clearance</i>; if it is
+non-zero, this value is used as clearance on all layers for this instance.
+When it is zero, the prototype's per shape clearance applies, which makes it
+possible to have different clearance for internal layers, for example.
+<p>
+Each padstack reference has a per board layer list of thermal relief types.
+<p>
+A thermal relief property is added to the copper rings of a via when it is
+connected to the surrounding polygon of any individual layer. Physical designs
+may use thermal reliefs to enable easy hand soldering, or reduce occurrence of
+tombstoning in automated production.
+<p>
+The following thermal relief options are available:
+<table border=1>
+	<caption><b>Pad/Pin/Via Thermal Relief</b>
+	<tr><th>Thermal Relief <th> Appearance 
+	<tr><td>no connection<td> <img src="via_therm_noconn.png" alt="unconnected via">
+	<tr><td>solid        <td> <img src="via_therm_solid.png"  alt="solid thermal">
+	<tr><td>round x 90   <td> <img src="via_therm_round_x90.png"  alt="Thermal relief arc style">
+	<tr><td>round x 45   <td> <img src="via_therm_round_x45.png"  alt="Thermal relief arc style, 45deg">
+	<tr><td>crossbar x 90<td> <img src="via_therm_sharp_x90.png"  alt="Thermal relief crossbar style, 90deg">
+	<tr><td>crossbar x 45<td> <img src="via_therm_sharp_x45.png"  alt="Thermal relief crossbar style, 45deg">
+</table>
+
+
+<h4> 2.4.7. Rat line Objects </h4>
+<p>
+A rat line represents a logical connection that is not yet realized in copper.
+It requires a loaded netlist for generation, and relies on calculations for any
+existing copper layers that connect terminals on the pcb-rnd board.  Rat
+connections are straight line connections between the terminals of any two
+drawing primitives that aren't yet connected  
+
+<h4> 2.4.8 Netlists </h4>
+<p>
+A netlist is a list of named logical networks. Each network is a list of
+netlist terminals that should be connected. A netlist terminal is a pair
+of subcircuit-refdes and pin-number (or pad-number). Thus a typical netlist
+looks like the following:
+<ul>
+	<li> net: GND
+		<ul>
+			<li> U1-2
+			<li> U2-7
+			<li> U3-7
+			<li> C1-1
+		</ul>
+	<li> net: Vcc
+		<ul>
+			<li> U1-3
+			<li> U2-14
+			<li> U3-14
+			<li> C1-2
+		</ul>
+	<li> net: strobe
+		<ul>
+			<li> U2-2
+			<li> U3-5
+		</ul>
+</ul>
+<p>
+The netlist assumes subcircuit refdes are unique. If a subcircuit has multiple
+instances of the same terminal number, the engine picks one randomly and
+assumes there's an invisible, internal connection within the subcircuit.
+<p>
+Rat lines can be regenerated from the current netlist for missing connections.
+Connections that are realized in copper but not present on the netlist, pcb-rnd
+gives a "short circuit" warning. Both happens when the net is "optimized"
+(upon user request).
+<p>
+The netlist is typically derived from a schematics by external tools
+(such as gnetlist). The netlist can be imported (updated) any time. This
+process is called "forward annotation".
+<p>
+It is also possible to make changes to the netlist from within pcb-rnd:
+terminals can be swapped, subcircuit footprint replaced using <i>back annotation
+actions</i>. Such actions will keep a list of intended netlist and subcircuit
+changes, called the netlist patch. Pcb-rnd will keep these changes even
+if a new version of the netlist is imported. It is possible to export the
+netlist patch that can be imported in the schematics editor to change the
+schematics - this process is called "back annotation". A new forward
+annotation from the schematics editor to pcb-rnd will then cancel
+the netlist/subcircuit changes as the new netlist import netlist matches
+the intended (changed) netlist.
+
+<h3> 2.5. Non-objects </h3>
+<p>
+The following objects are commonly used in the industry, but have no
+special implementation in pcb-rnd but are created by using the above
+objects.
+
+<h4> Vias </h4>
+<p>
+A via is an electrically connected hole that connects copper rings to multiple
+layers. In pcb-rnd, a via is always implemented using a <a href="#padstack">
+padstack.</a>
+
+<h4> Holes </h4>
+<p>
+A hole is a special case of a <a href="#padstack"> padstack:</a> it has
+an unplated hole and typically does not have copper pad shapes but should
+have mask cutout shape.
+
+<h4> Test points, test pads</h4>
+<p>
+A test point or test pad is a <a href="#padstack"> padstack</a> that has
+copper shape only on one of the outer copper layer and a mask cutout shape
+over that layer.
+
+<h4> Fiducials </h4>
+<p>
+A fiducial mark is a special case of a <a href="#padstack"> padstack </a>
+very similar to the test point/pad.
+
+<h4> Targets/marks </h4>
+A mark or target (e.g. for layer alignment) is usually realized as a
+<a href="#subcircuit"> subcircuit </a> it has more complex graphics that
+doesn't fit in a padstack.
+
+<h4> Using subcircuit instead of raw padstack </h4>
+<p>
+Holes, test points/pads and fiducials are often realized within a
+<a href="#subcircuit"> subcircuit </a>, especially if they have a refdes
+and present on the schematics. However, the only way to implement a hole
+is using a padstack, so the resulting subcircuit for holes and test pins
+will always have at least one padstack.
+
+<h3> 2.6. Comparison of Physical world and pcb-rnd world terminology </h3>
+<p>
+<table border=1>
+	<caption><b>Pcb-rnd Terminology</b>
+	<tr><th> Physical board            <th> pcb-rnd                                                   <th> Description
+	<tr><td> Layer                     <td> Layer Group                                               <td> enables the user to design complex physical constructions
+	<tr><td> Copper layer              <td> Layer group with copper layers                            <td> designed with one to many pcb-rnd layers
+	<tr><td> Component/Top copper layer<td> Layer group with copper layers                            <td> any group of copper layers defined as the 'top' of a board
+	<tr><td> Solder/bottom copper layer<td> Layer group with copper layers                            <td> any group of copper layers defined as the 'bottom' of a board
+	<tr><td> Substrate                 <td> Layer group marked as substrate, hosting no logical layers<td> pcb-rnd does not yet handle properties of physical substrate information
+	<tr><td> Contour of the board      <td> Outline layer                                             <td> designed using standard pcb-rnd objects
+	<tr><td> Outline routing path      <td> Outline layer                                             <td> designed using standard pcb-rnd objects
+	<tr><td> Polygon pour              <td> Polygon                                                   <td> an object available for design in any layer group
+	<tr><td> Plane                     <td> Polygon                                                   <td> see above 
+	<tr><td> Mask (solder mask)        <td> Layer group with implicit and potential explicit content  <td> design layers available: automatic, additive, subtractive
+	<tr><td> Silk                      <td> Layer group with implicit and potential explicit content  <td> design layers available: automatic, additive, subtractive
+	<tr><td> Paste (paste stencil)     <td> Layer group with implicit and potential explicit content  <td> design layers available: automatic, additive, subtractive
+	<tr><td> N/A, or poss. net/circuit <td> Rats                                                      <td> assistive layer automatically generated with netlist and copper layer group connection data
+	<tr><td> Via                       <td> Padstack                                                  <td> a vertical construction that features a plated hole and copper pads around the hole
+	<tr><td> Pin                       <td> Padstack                                                  <td> a special via that is going to host a pin of a through-hole component soldered on the board
+	<tr><td> Pad                       <td> Padstack                                                  <td> a copper feature that is going to host a lead of an surface mount component
+	<tr><td> Hole, mounting hole       <td> Padstack                                                  <td> special case of vias, with no plating or copper pads
+	<tr><td> Fiducial mark, test pad   <td> Padstack                                                  <td> special case of pad
+	<tr><td> Element, module, part (on board)<td> Subcircuit                                          <td> a placed instance of a library footprint
+	<tr><td> Footprint, land pattern   <td> Footprint                                                 <td> reusable patterns stored in the footprint library
+</table>
+
Index: tags/2.0.1/doc/user/02_model/obj_arc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/obj_arc.png
===================================================================
--- tags/2.0.1/doc/user/02_model/obj_arc.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/obj_arc.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/obj_arc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/obj_line.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/obj_line.png
===================================================================
--- tags/2.0.1/doc/user/02_model/obj_line.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/obj_line.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/obj_line.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/objects_basic.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/objects_basic.png
===================================================================
--- tags/2.0.1/doc/user/02_model/objects_basic.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/objects_basic.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/objects_basic.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/objects_complex.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/objects_complex.png
===================================================================
--- tags/2.0.1/doc/user/02_model/objects_complex.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/objects_complex.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/objects_complex.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/src/Makefile
===================================================================
--- tags/2.0.1/doc/user/02_model/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/Makefile	(revision 18980)
@@ -0,0 +1,68 @@
+PCBRND=pcb-rnd
+CLEANFILES= ../*.png
+
+all: ../objects_basic.png ../objects_complex.png ../obj_line.png \
+     ../obj_arc.png ../via_therm_noconn.png ../via_therm_solid.png \
+     ../via_therm_round_x90.png ../via_therm_round_x45.png \
+     ../via_therm_sharp_x90.png ../via_therm_sharp_x45.png
+
+../objects_basic.png: objects_basic.lht
+	$(PCBRND) -x png --dpi 450 objects_basic.lht
+	mv objects_basic.png ../objects_basic.png
+
+../objects_complex.png: objects_complex.lht
+	$(PCBRND) -x png --dpi 450 objects_complex.lht
+	mv objects_complex.png ../objects_complex.png
+
+../obj_line.png: obj_line.lht
+	$(PCBRND) -x png --dpi 450 obj_line.lht
+	mv obj_line.png ../obj_line.png
+
+../obj_arc.png: obj_arc.lht
+	$(PCBRND) -x png --dpi 450 obj_arc.lht
+	mv obj_arc.png ../obj_arc.png
+
+../via_therm_noconn.png: via_therm_noconn.lht
+	$(PCBRND) -x png --dpi 450 via_therm_noconn.lht 
+	mv via_therm_noconn.png ../
+
+# make thermal style images
+../via_therm_solid.png: via_therm_solid.lht
+	$(PCBRND) -x png --dpi 450 via_therm_solid.lht
+	mv via_therm_solid.png ../
+
+../via_therm_round_x90.png: via_therm_round_x90.lht
+	$(PCBRND) -x png --dpi 450 via_therm_round_x90.lht
+	mv via_therm_round_x90.png ../
+
+../via_therm_round_x45.png: via_therm_round_x45.lht
+	$(PCBRND) -x png --dpi 450 via_therm_round_x45.lht 
+	mv via_therm_round_x45.png ../
+
+../via_therm_sharp_x90.png: via_therm_sharp_x90.lht
+	$(PCBRND) -x png --dpi 450 via_therm_sharp_x90.lht
+	mv via_therm_sharp_x90.png ../
+
+../via_therm_sharp_x45.png: via_therm_sharp_x45.lht
+	$(PCBRND) -x png --dpi 450 via_therm_sharp_x45.lht 
+	mv via_therm_sharp_x45.png ../
+
+#make shapes for shape table
+via_ring_shape.png: via_ring_shape.lht
+	$(PCBRND) -x png --dpi 450 via_ring_shape.lht
+	mv via_ring_shape.png ../
+
+via_square_shape.png: via_square_shape.lht
+	$(PCBRND) -x png --dpi 450 via_square_shape.lht
+	mv via_square_shape.png ../
+
+via_octagon_shape.png: via_octagon_shape.lht
+	$(PCBRND) -x png --dpi 450 via_octagon_shape.lht
+	mv via_octagon_shape.png ../
+
+via_asym_shape.png: via_asym_shape.lht
+	$(PCBRND) -x png --dpi 450 via_asym_shape.lht 
+	mv via_asym_shape.png ../
+
+clean: $(CLEANRULES) 
+	-rm $(CLEANFILES)
Index: tags/2.0.1/doc/user/02_model/src/obj_arc.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/obj_arc.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/obj_arc.lht	(revision 18980)
@@ -0,0 +1,384 @@
+ha:pcb-rnd-board-v1 {
+
+ ha:attributes {
+  {PCB::loader}=geda/pcb - nanometer
+  {PCB::grid::unit}=mil
+  {PCB::conf::editor/grid}=25.00 mil
+  {PCB::conf::editor/draw_grid}=true
+  {PCB::conf::editor/buffer_number}=0
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 1.4in
+    y = 31.75mm
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 0.0
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:objects {
+    }
+   li:layers {
+
+    ha:component {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:arc.3 {
+        x=26.67mm; y=27.305mm; width=400.0mil; height=400.0mil; astart=-90; adelta=90; thickness=75.0mil; clearance=48.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.4 {
+        li:geometry {
+          ta:contour {
+           { 725.0mil; 550.0mil }
+           { 31.75mm; 550.0mil }
+           { 31.75mm; 900.0mil }
+           { 725.0mil; 900.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     visible=1
+     group=1
+    }
+
+    ha:comp-GND {
+     visible=1
+     group=0
+    }
+
+    ha:comp-power {
+     visible=1
+     group=0
+    }
+
+    ha:sold-GND {
+     visible=1
+     group=1
+    }
+
+    ha:sold-power {
+     visible=1
+     group=1
+    }
+
+    ha:signal3 {
+     visible=1
+     group=2
+    }
+
+    ha:outline {
+     visible=1
+     group=3
+    }
+
+    ha:silk {
+     visible=1
+     group=1
+    }
+
+    ha:silk {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:line.9 {
+        x1=26.67mm; y1=26.67mm; x2=26.67mm; y2=1.1in; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.12 {
+        x1=26.035mm; y1=27.305mm; x2=27.305mm; y2=27.305mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.15 {
+        x1=29.21mm; y1=1.175in; x2=26.67mm; y2=27.305mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.18 {
+        x1=1.35in; y1=1.175in; x2=29.21mm; y2=1.175in; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.21 {
+        x1=26.67mm; y1=27.305mm; x2=675.0mil; y2=950.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.24 {
+        x1=625.0mil; y1=750.0mil; x2=800.0mil; y2=925.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.27 {
+        x1=625.0mil; y1=750.0mil; x2=350.0mil; y2=750.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.30 {
+        x1=875.0mil; y1=825.0mil; x2=650.0mil; y2=600.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.33 {
+        x1=650.0mil; y1=600.0mil; x2=325.0mil; y2=600.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.36 {
+        x1=675.0mil; y1=27.305mm; x2=0.0; y2=27.305mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.39 {
+        x1=26.67mm; y1=700.0mil; x2=26.67mm; y2=25.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.42 {
+        x1=150.0mil; y1=27.305mm; x2=150.0mil; y2=1.225in; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.45 {
+        x1=650.0mil; y1=26.67mm; x2=650.0mil; y2=1.1in; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.48 {
+        x1=26.035mm; y1=675.0mil; x2=27.305mm; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.51 {
+        x=26.67mm; y=27.305mm; width=1000.0mil; height=1000.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.58 {
+        li:geometry {
+          ta:contour {
+           { 17.594013mm; 20.769012mm }
+           { 657.3223622mil; 18.972961mm }
+           { 15.797962mm; 19.870987mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.62 {
+        li:geometry {
+          ta:contour {
+           { 18.600987mm; 21.775988mm }
+           { 19.499012mm; 23.572039mm }
+           { 20.397038mm; 22.674013mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.66 {
+        li:geometry {
+          ta:contour {
+           { 19.753013mm; 18.483012mm }
+           { 742.3223622mil; 16.686961mm }
+           { 17.956962mm; 17.584987mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.70 {
+        li:geometry {
+          ta:contour {
+           { 19.870987mm; 18.600988mm }
+           { 20.769012mm; 20.397039mm }
+           { 21.667038mm; 19.499013mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.74 {
+        li:geometry {
+          ta:contour {
+           { 690.0mil; 955.0mil }
+           { 19.109758mm; 25.491476mm }
+           { 19.533695mm; 24.29432mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.78 {
+        li:geometry {
+          ta:contour {
+           { 3.809999mm; 27.178001mm }
+           { 3.174999mm; 1.145in }
+           { 4.444999mm; 1.145in }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.82 {
+        li:geometry {
+          ta:contour {
+           { 26.796999mm; 1.904999mm }
+           { 980.0mil; 1.269999mm }
+           { 980.0mil; 2.539999mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.86 {
+        li:geometry {
+          ta:contour {
+           { 1.270001mm; 27.431999mm }
+           { 1.905001mm; 25.527mm }
+           { 0.635001mm; 25.527mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:text.52 {
+        string=center; x=1.175in; y=1.1in; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.53 {
+        string=width; x=375.0mil; y=675.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.54 {
+        string=R; x=850.0mil; y=950.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.55 {
+        string=clearance; x=350.0mil; y=525.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.56 {
+        string=delta angle; x=625.0mil; y=0.0; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.57 {
+        string=start angle; x=175.0mil; y=29.21mm; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ha:netlists {
+
+ li:input {
+ }
+}
+}
Index: tags/2.0.1/doc/user/02_model/src/obj_line.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/obj_line.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/obj_line.lht	(revision 18980)
@@ -0,0 +1,302 @@
+ha:pcb-rnd-board-v1 {
+
+ ha:attributes {
+  {PCB::loader}=geda/pcb - nanometer
+  {PCB::grid::unit}=mil
+  {PCB::conf::editor/grid}=25.00 mil
+  {PCB::conf::editor/draw_grid}=true
+  {PCB::conf::editor/buffer_number}=0
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 30.48mm
+    y = 850.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 25.0mil
+    y = 275.0mil
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:objects {
+    }
+   li:layers {
+
+    ha:component {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:line.5 {
+        x1=475.0mil; y1=675.0mil; x2=800.0mil; y2=350.0mil; thickness=110.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.8 {
+        li:geometry {
+          ta:contour {
+           { 600.0mil; 175.0mil }
+           { 1.125in; 175.0mil }
+           { 1.125in; 525.0mil }
+           { 600.0mil; 525.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     visible=1
+     group=1
+    }
+
+    ha:comp-GND {
+     visible=1
+     group=0
+    }
+
+    ha:comp-power {
+     visible=1
+     group=0
+    }
+
+    ha:sold-GND {
+     visible=1
+     group=1
+    }
+
+    ha:sold-power {
+     visible=1
+     group=1
+    }
+
+    ha:signal3 {
+     visible=1
+     group=2
+    }
+
+    ha:outline {
+     visible=1
+     group=3
+    }
+
+    ha:silk {
+     visible=1
+     group=1
+    }
+
+    ha:silk {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:line.13 {
+        x1=525.0mil; y1=425.0mil; x2=750.0mil; y2=650.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.16 {
+        x1=525.0mil; y1=425.0mil; x2=250.0mil; y2=425.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.19 {
+        x1=575.0mil; y1=225.0mil; x2=250.0mil; y2=225.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.22 {
+        x1=800.0mil; y1=450.0mil; x2=575.0mil; y2=225.0mil; thickness=10.0mil; clearance=24.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.25 {
+        x1=475.0mil; y1=650.0mil; x2=475.0mil; y2=700.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.28 {
+        x1=450.0mil; y1=675.0mil; x2=500.0mil; y2=675.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.31 {
+        x1=800.0mil; y1=325.0mil; x2=800.0mil; y2=375.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.34 {
+        x1=775.0mil; y1=350.0mil; x2=825.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.37 {
+        x1=475.0mil; y1=675.0mil; x2=375.0mil; y2=575.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.40 {
+        x1=375.0mil; y1=575.0mil; x2=25.0mil; y2=575.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.43 {
+        x1=800.0mil; y1=350.0mil; x2=550.0mil; y2=100.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.46 {
+        x1=550.0mil; y1=100.0mil; x2=200.0mil; y2=100.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.53 {
+        li:geometry {
+          ta:contour {
+           { 17.965987mm; 9.075988mm }
+           { 18.864012mm; 10.872039mm }
+           { 19.762038mm; 9.974013mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.57 {
+        li:geometry {
+          ta:contour {
+           { 16.695987mm; 14.155988mm }
+           { 17.594012mm; 15.952039mm }
+           { 18.492038mm; 15.054013mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.61 {
+        li:geometry {
+          ta:contour {
+           { 15.054013mm; 12.514012mm }
+           { 14.155988mm; 10.717961mm }
+           { 13.257962mm; 11.615987mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.65 {
+        li:geometry {
+          ta:contour {
+           { 17.848013mm; 8.958012mm }
+           { 16.949988mm; 281.9669685mil }
+           { 16.051962mm; 8.059987mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:text.49 {
+        string=width; x=275.0mil; y=350.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.50 {
+        string=clearance; x=275.0mil; y=150.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.51 {
+        string=1st endpoint; x=25.0mil; y=500.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.52 {
+        string=2nd endpoint; x=200.0mil; y=25.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ha:netlists {
+
+ li:input {
+ }
+}
+}
Index: tags/2.0.1/doc/user/02_model/src/objects_basic.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/objects_basic.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/objects_basic.lht	(revision 18980)
@@ -0,0 +1,242 @@
+ha:pcb-rnd-board-v1 {
+
+ ha:attributes {
+  {PCB::loader}=geda/pcb - nanometer
+  {PCB::grid::unit}=mil
+  {PCB::conf::editor/buffer_number}=0
+  {PCB::conf::editor/draw_grid}=true
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 2.075in
+    y = 500.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:objects {
+    ha:via.3 {
+   x=1.6in; y=125.0mil; hole=47.24mil; mask=0.0; thickness=137.8mil; clearance=50.0mil;
+   ha:flags {
+    via=1
+   }
+  }
+  ha:via.4 {
+   x=1.6in; y=350.0mil; hole=47.24mil; mask=0.0; thickness=137.8mil; clearance=50.0mil;
+   ha:flags {
+    via=1
+    square=1
+    shape=1
+   }
+  }
+  ha:via.5 {
+   x=49.53mm; y=250.0mil; hole=47.24mil; mask=0.0; thickness=137.8mil; clearance=50.0mil;
+   ha:flags {
+    via=1
+    square=1
+    shape=17
+   }
+  }
+  ha:via.6 {
+   x=45.085mm; y=125.0mil; hole=47.24mil; mask=0.0; thickness=137.8mil; clearance=50.0mil;
+   ha:flags {
+    via=1
+    square=1
+    shape=2
+   }
+  }
+  ha:via.7 {
+   x=1.8in; y=350.0mil; hole=47.24mil; mask=0.0; thickness=137.8mil; clearance=50.0mil;
+   ha:flags {
+    via=1
+    square=1
+    shape=9
+   }
+  }
+  }
+   li:layers {
+
+    ha:component {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:line.16 {
+        x1=575.0mil; y1=75.0mil; x2=825.0mil; y2=75.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.19 {
+        x1=825.0mil; y1=75.0mil; x2=925.0mil; y2=175.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.22 {
+        x1=925.0mil; y1=175.0mil; x2=925.0mil; y2=400.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.25 {
+        x=425.0mil; y=425.0mil; width=350.0mil; height=350.0mil; astart=0; adelta=-90; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.42 {
+        li:geometry {
+          ta:contour {
+           { 26.67mm; 50.0mil }
+           { 31.75mm; 50.0mil }
+           { 1.375in; 175.0mil }
+           { 1.375in; 425.0mil }
+           { 26.67mm; 425.0mil }
+          }
+          ta:hole {
+           { 29.21mm; 225.0mil }
+           { 29.21mm; 300.0mil }
+           { 31.75mm; 300.0mil }
+           { 31.75mm; 175.0mil }
+           { 1.175in; 175.0mil }
+           { 29.21mm; 200.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     visible=1
+     group=1
+    }
+
+    ha:comp-GND {
+     visible=1
+     group=0
+    }
+
+    ha:comp-power {
+     visible=1
+     group=0
+    }
+
+    ha:sold-GND {
+     visible=1
+     group=1
+    }
+
+    ha:sold-power {
+     visible=1
+     group=1
+    }
+
+    ha:signal3 {
+     visible=1
+     group=2
+    }
+
+    ha:outline {
+     visible=1
+     group=3
+    }
+
+    ha:silk {
+     visible=1
+     group=1
+    }
+
+    ha:silk {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:text.44 {
+        string=Arc; x=275.0mil; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.45 {
+        string=Line; x=700.0mil; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.46 {
+        string=Polygon; x=1.125in; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.47 {
+        string=Pin, Via; x=1.65in; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ha:netlists {
+
+ li:input {
+ }
+}
+}
Index: tags/2.0.1/doc/user/02_model/src/objects_complex.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/objects_complex.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/objects_complex.lht	(revision 18980)
@@ -0,0 +1,182 @@
+ha:pcb-rnd-board-v1 {
+
+ ha:attributes {
+  {PCB::loader}=geda/pcb - nanometer
+  {PCB::grid::unit}=mil
+  {PCB::conf::editor/buffer_number}=0
+  {PCB::conf::editor/draw_grid}=true
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 850.0mil
+    y = 500.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:objects {
+  ha:element.81 {
+   x=600.0mil; y=250.0mil;
+   li:objects {
+    ha:text.78 {
+     string=Standard SMT resistor, capacitor etc; x=568.5mil; y=143.5mil; scale=100; direction=0; role=desc;
+    }
+    ha:text.79 {
+     string=R1; x=568.5mil; y=143.5mil; scale=100; direction=0; role=name;
+    }
+    ha:text.80 {
+     string=1206; x=568.5mil; y=143.5mil; scale=100; direction=0; role=value;
+    }
+    ha:line.82 {
+     x1=-599.948um; y1=-37.4mil; x2=23.62mil; y2=-37.4mil; thickness=8.0mil; clearance=0.0;
+    }
+    ha:line.83 {
+     x1=-599.948um; y1=0.94996mm; x2=23.62mil; y2=0.94996mm; thickness=8.0mil; clearance=0.0;
+    }
+    ha:pad.84 {
+     name=1; number=1; x1=-59.05mil; y1=-299.974um; x2=-59.05mil; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+     ha:flags {
+      square=1
+     }
+    }
+    ha:pad.85 {
+     name=2; number=2; x1=1.49987mm; y1=-299.974um; x2=1.49987mm; y2=11.81mil; mask=1.452372mm; thickness=1.299972mm; clearance=20.0mil;
+     ha:flags {
+      square=1
+     }
+    }
+   }
+  }
+  }
+   li:layers {
+
+    ha:component {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:text.75 {
+        string=Hello; x=25.0mil; y=150.0mil; scale=245; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     visible=1
+     group=1
+    }
+
+    ha:comp-GND {
+     visible=1
+     group=0
+    }
+
+    ha:comp-power {
+     visible=1
+     group=0
+    }
+
+    ha:sold-GND {
+     visible=1
+     group=1
+    }
+
+    ha:sold-power {
+     visible=1
+     group=1
+    }
+
+    ha:signal3 {
+     visible=1
+     group=2
+    }
+
+    ha:outline {
+     visible=1
+     group=3
+    }
+
+    ha:silk {
+     visible=1
+     group=1
+    }
+
+    ha:silk {
+     visible=1
+     group=0
+
+      li:objects {
+       ha:text.76 {
+        string=Text; x=100.0mil; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.77 {
+        string=Element, Pad; x=425.0mil; y=425.0mil; scale=100; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+ha:netlists {
+
+ li:input {
+ }
+}
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_noconn.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_noconn.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_noconn.lht	(revision 18980)
@@ -0,0 +1,267 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::conf::editor/grid}=181.00 um
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 10.0mil
+    offs_x = 0.245mm
+    offs_y = 0.064mm
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.107 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.110 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.114 {
+        string=no conn.; x=1.994mm; y=5.877mm; scale=70; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 1
+    text_scale = 5744
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    grid_unit = mil
+    buffer_number = 0
+    grid = 10.00 mil
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_round_x45.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_round_x45.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_round_x45.lht	(revision 18980)
@@ -0,0 +1,287 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::conf::editor/grid}=181.00 um
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 0.181mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.118 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      ha:thermal { silk=diagonal-round; component=diagonal-round;      }
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.110 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.126 {
+        string=Arc Thermal; x=0.873886mm; y=5.34154mm; scale=70; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.131 {
+        string=45; x=2.896mm; y=7.24mm; scale=5744; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.137 {
+        string=45; x=3.258mm; y=6.335mm; scale=65; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 0
+    text_scale = 100
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    ha:view {
+     flip_x = 0
+     flip_y = 0
+    }
+    grid_unit = mil
+    buffer_number = 0
+    show_solder_side = 0
+    grid = 181.00 um
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_round_x90.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_round_x90.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_round_x90.lht	(revision 18980)
@@ -0,0 +1,275 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::conf::editor/grid}=181.00 um
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 0.181mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.118 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      ha:thermal { component=horver-round; silk=diagonal-round;      }
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.149 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.144 {
+        string=Arc Thermal; x=0.692886mm; y=5.70354mm; scale=75; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 1
+    text_scale = 5744
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    ha:view {
+     flip_x = 0
+     flip_y = 0
+    }
+    grid_unit = mil
+    buffer_number = 0
+    show_solder_side = 0
+    grid = 181.00 um
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x45.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x45.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x45.lht	(revision 18980)
@@ -0,0 +1,280 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::conf::editor/grid}=181.00 um
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::grid::unit}=mil
+    {PCB::conf::editor/buffer_number}=0
+    {PCB::conf::editor/show_solder_side}=0
+    {PCB::loader}=geda/pcb - nanometer
+    {PCB::conf::editor/view/flip_x}=0
+    {PCB::conf::editor/view/flip_y}=0
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 0.181mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.118 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      ha:thermal { silk=diagonal-round; component=diagonal-sharp;      }
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.130 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.131 {
+        string=Sharp, 45; x=1.054886mm; y=5.70354mm; scale=75; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 0
+    text_scale = 5744
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    ha:view {
+     flip_x = 0
+     flip_y = 0
+    }
+    grid_unit = mil
+    buffer_number = 0
+    show_solder_side = 0
+    grid = 181.00 um
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x90.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x90.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_sharp_x90.lht	(revision 18980)
@@ -0,0 +1,275 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::conf::editor/grid}=181.00 um
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 0.181mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.118 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      ha:thermal { silk=diagonal-round; component=horver-sharp;      }
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.136 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.137 {
+        string=Sharp; x=2.140886mm; y=5.70354mm; scale=75; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 0
+    text_scale = 5744
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    ha:view {
+     flip_x = 0
+     flip_y = 0
+    }
+    grid_unit = mil
+    buffer_number = 0
+    show_solder_side = 0
+    grid = 181.00 um
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/src/via_therm_solid.lht
===================================================================
--- tags/2.0.1/doc/user/02_model/src/via_therm_solid.lht	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/src/via_therm_solid.lht	(revision 18980)
@@ -0,0 +1,269 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+   {PCB::conf::editor/draw_grid}=true
+   {PCB::conf::editor/grid}=181.00 um
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 1.999996mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999998mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 300.0mil
+    y = 300.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 225.0mil
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 0.181mm
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.107 {
+     x=150mil; y=150mil; hole=47.24mil; mask=0.0; thickness=3.11912mm; clearance=50.0mil;
+     ha:flags {
+      via=1
+       ha:thermal {
+ component=solid;       }
+     }
+    }
+   }
+   li:layers {
+
+    ha:component {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:polygon.110 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 275.0mil; 25.0mil }
+           { 275.0mil; 275.0mil }
+           { 25.0mil; 275.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:solder {
+     lid=1
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-GND {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:comp-power {
+     lid=3
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-GND {
+     lid=4
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:sold-power {
+     lid=5
+     group=8
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:signal3 {
+     lid=6
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=7
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=10
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=9
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.113 {
+        string=Solid via; x=1.813mm; y=5.442mm; scale=70; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 9;    }
+   }
+   ha:2 {
+    name = top mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2; 3;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 7;    }
+   }
+   ha:8 {
+    name = bottom copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 4; 5;    }
+   }
+   ha:9 {
+    name = bottom mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 8;    }
+   }
+   ha:11 {
+    name = bottom paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    text_font_id = 0
+    text_scale = 5744
+    via_thickness = 2000.00 um
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 300.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 199999999.999200
+    max_width = 300.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    grid_unit = mil
+    buffer_number = 0
+    grid = 181.00 um
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/02_model/via_therm_noconn.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_noconn.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_noconn.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_noconn.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_noconn.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/via_therm_round_x45.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_round_x45.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_round_x45.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_round_x45.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_round_x45.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/via_therm_round_x90.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_round_x90.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_round_x90.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_round_x90.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_round_x90.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/via_therm_sharp_x45.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_sharp_x45.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_sharp_x45.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_sharp_x45.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_sharp_x45.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/via_therm_sharp_x90.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_sharp_x90.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_sharp_x90.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_sharp_x90.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_sharp_x90.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/02_model/via_therm_solid.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/02_model/via_therm_solid.png
===================================================================
--- tags/2.0.1/doc/user/02_model/via_therm_solid.png	(nonexistent)
+++ tags/2.0.1/doc/user/02_model/via_therm_solid.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/02_model/via_therm_solid.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/03_data/index.html
===================================================================
--- tags/2.0.1/doc/user/03_data/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/03_data/index.html	(revision 18980)
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 3. Where Data Is Stored </h2>
+<p>
+Pcb-rnd enables the user to design complex original boards in a standard EDA
+flow with netlists and other data inputs that aide in design. pcb-rnd also
+acts as a multiuse layout design CAD, opening board designs saved in a variety
+of legacy and contemporary software.
+<p>
+The user can import a variety of non-layout data sources commonly used in EDA
+flow. Schematics from gschem or kicad, netlists, reference images, tinyCAD,
+and more are available to the user.
+
+<h3> 3.1. Board </h3>
+<p>
+pcb-rnd can edit a single board at a time. To edit multiple boards, open
+multiple instances of pcb-rnd.
+
+<h3> 3.2. Paste Buffer</h3>
+There are multiple paste buffers available in pcb-rnd. The user can select
+one of them to be active - most buffer operations will work with the active
+buffer.
+<p>
+Buffers are board-independent: they have their own dynamic size and their
+own virtual layer stack. These enable buffers to act as a proxy between
+different boards with different properties.
+<p>
+The following operations can be done with buffers:
+<ul>
+	<li> clear: the content of the buffer is discarded
+	<li> copy from layout: copy objects from the layout to the buffer
+	<li> paste to layout: copy objects from the buffer to the layout
+	<li> load: load buffer from file (including footprints/subcircuits from the library)
+	<li> save subcircuit: save elements/subcircuits from buffer to file
+	<li> build a subcircuit in a buffer, from the objects stored in the buffer
+	<li> build a padstack in a buffer, from the objects stored in the buffer
+	<li> break up a subcircuit in a buffer
+<!--	<li> break up a padstack in a buffer -->
+	<li> rotate
+	<li> mirror
+</ul>
+
+<h3> 3.3. Footprint Libraries</h3>
+<h4> 3.3.1. Library handling </h4>
+<p>
+A footprint library is a collection of subcircuit files, optionally
+equipped with metadata. A footprint library is stored and accessed by
+footprint plugins (whose names are conventionally prefixed with fp_).
+Where the actual data is stored, how and when it is retrieved depends
+on the fp_ plugin.
+<p>
+There is a configuration node called <i>rc/library_search_paths</i> which
+is a list of footprint library search paths. How each path is interpreted
+also depends on the fp_ plugins.
+<p>
+Currently pcb-rnd offers the following fp_ plugins:
+<table border=1>
+	<tr><th>plugin <th> description <th> library_search_paths example
+	<tr><td>fp_fs
+		<td> list and load files from directories on the host file system
+		<td> ~/my_lib <br> /usr/lib/company_lib <br> $(rc.path.share)/pcblib
+	<tr><td>fp_board
+		<td> extract all footprints from an existing board file (given in
+		     any board format pcb-rnd can load) and use these footprints as
+		     a library
+		<td> board@/home/joe/ee/control/cpu.lht
+	<tr><td>fp_wget
+		<td> download a digested map of a footprint library from a web server,
+		     using wget; make all footprints and metadata available in the
+		     library but do not immediately download footprint files; keep
+		     a local (host file system) cache of footprints accessed. Currently
+		     supports <a href="http://repo.hu/projects/edakrill">edakrill</a>
+		     and <a href="http://www.gedasymbols.org">gedasymbols</a>.
+		<td> wget@edakrill <br> wget@gedasymbols
+</table>
+
+<h4> 3.3.2. footprint types </h4>
+<p>
+There are two types of footprints:
+<ul>
+	<li> static (file) footprints; and
+	<li> parametric (generated) footprints.
+</ul>
+<p>
+A static footprint is a data file that is loaded and parsed by one of
+the io_ plugins. pcb-rnd supports multiple file formats: the native lihata
+subcircuit format, kicad, eagle, gEDA footprints.
+<p>
+A parametric footprint is an external program or script that is executed
+by pcb-rnd. The external program shall write a valid footprint file to its
+standard output, which is then parsed and used the same way as in case of
+static footprints. The external program gets a list of parameters
+extracted from the footprint name by pcb-rnd.
+<p>
+The basic syntax for a parametric footprint is <i>name(arg1, arg2, ...
+argN)</i>. Any footprint name that contains a '(' is treated as parametric.
+The list of arguments is separated by commas. How arguments are interpreted,
+e.g. whether the are positional or named or both, is up to the external
+parametric footprint program.
+<p>
+The footprint programs are stored in the library tree, and are accessed
+using the fp_ plugins. There is no limitation on how the program is implemented
+other than the host operating system on which pcb-rnd runs has to be able to
+execute it.
+
+
+<h3> 3.4. file formats</h3>
+<p>
+pcb-rnd operates on an in-memory data tree of the board while it is being edited.
+The in-memory data tree can not be dumped in a file without conversion: loading
+any file means converting the given file format to the in-memory representation
+and saving from memory to any file format is just another conversion.
+
+<p>
+Lossless save/load round trips for all pcb-rnd features are guaranteed
+only when using the latest version of the native formats. The reason is
+that the native formats are always upgraded to support all features of
+the in-memory data model. It is possible (but not recommended) to use
+older versions of the native formats to retrain compatibility with older
+versions of pcb-rnd.
+
+<p>
+The <i>native</i> file formats of pcb-rnd are:
+<ul>
+	<li> lihata board for PCBs
+	<li> lihata subcircuit for footprints
+	<li> lihata based pcb-rnd-conf for configuration data
+</ul>
+
+<p>
+Non-native file formats are called <i>alien</i> formats. pcb-rnd supports
+a large variety of alien formats, but lossless save/load round trips are
+not guaranteed when alien formats are used. The code will always do its best
+to get good results, but different alien formats have different features,
+and most of them can not fully capture all features pcb-rnd offers.
+
+<p>
+Some alien formats are implemented as io_ plugins and are accessible
+as normal board (and footprint) file formats directly from the load/save
+infrastructure and footprint library. These formats are trying to capture
+all details of the board (or footprint) and are usually close to
+producing lossless save/load round trips. 
+
+<p>
+Other alien formats are supported through import_ or export_ plugins.
+These formats do not capture enough aspects of a board (or footprint) to
+be used as a full load or save, round trip of any sort is impossible.
+
+<p>
+Typical export example is render outputs: png, ps, gerber are all
+export_ plugins: they export one aspect (geometry and sometimes layering)
+of the board, but do not export other aspects such as connections,
+subcircuits or padstack structure. Lacking that information, the exported
+board can never be loaded as a board from png, ps or gerber.
+
+<p>
+Typical import example is netlist (or schematics): it deals with one aspect
+of the project, connection info, and lacks any physical information such
+as geometry or layers. It is possible to import one aspect of the design from
+a netlist (or schematics), but it is not possible to reconstruct a full board
+using only the netlist information.
+
+<p>
+<img src="../09_appendix/bridges.svg" alt="a map of pcb-rnd format support">
+
+<p>
+For a detailed list of formats, please refer to
+<a href="../09_appendix/formats.html"> the list of supported file formats</a>
+in the appendix.
+
+
Index: tags/2.0.1/doc/user/04_invoc/index.html
===================================================================
--- tags/2.0.1/doc/user/04_invoc/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/04_invoc/index.html	(revision 18980)
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 4. User Invocation (running pcb-rnd)</h2>
+<p>
+pcb-rnd is typically run by invoking it from the shell after installation 
+<p>
+<code>
+pcb-rnd [options]
+</code>
+or
+<code>
+pcb-rnd [options] path
+</code>
+<p>
+When a path is provided, it is either a board file or a subcircuit which 
+will be automatically opened for editing. When invoked with a path referring
+to a non-existing file, pcb-rnd assumes a new board is to be created and
+saved using the file name provided as path. This makes it very easy to
+make new boards from the command line.
+
+<p>
+The list of available options can be acquired by running
+<p>
+<code>
+pcb-rnd --help
+</code>
+<p>
+The most commonly used option is to export a file:
+<code>
+pcb-rnd -x format [format_options] path
+</code>
+<p>
+For example a photo-realistic png export pwr.png from the board saved
+in pwr.lht can be exported as:
+<code>
+pcb-rnd --export png --dpi 600 --photo-mode pwr.lht
+</code>
+<p>
+Listing exporter-specific options is possible running pcb-rnd --help
+<i>exporter</i>, e.g.:
+<code>
+pcb-rnd --help png
+</code>
+<p>
+Another typical application of options is to select the user interface to
+start pcb-rnd with (as pcb-rnd normally comes with multiple UIs compiled in):
+<pre>
+<code>
+pcb-rnd --gui=batch
+pcb-rnd --gui=gtk2_gdk
+pcb-rnd --gui=gtk2_gl
+pcb-rnd --gui=lesstif
+</code>
+</pre>
+<p>
+The most notable UI is the batch UI: it reads the standard input for
+action commands, executes them and quits on EOF. This allows pcb-rnd to be
+run as a UNIX filter (just like a sed, awk or perl), loading, manipulating
+and saving boards, without starting a GUI.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_coordsreadout.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_coordsreadout.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_coordsreadout.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_coordsreadout.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_coordsreadout.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_layerops.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_layerops.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_layerops.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_layerops.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_layerops.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_main.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_main.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_main.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_main.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_main.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_menus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_menus.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_menus.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_menus.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_menus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_opsreadout.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_opsreadout.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_opsreadout.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_opsreadout.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_opsreadout.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_routestyle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_routestyle.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_routestyle.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_routestyle.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_routestyle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_workops.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_workops.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_workops.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_workops.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/01_gtk/base_window_highlight_workops.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/01_gtk/index.html
===================================================================
--- tags/2.0.1/doc/user/05_ui/01_gtk/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/01_gtk/index.html	(revision 18980)
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 5.1 GTK+ </h2>
+<p>
+pcb-rnd comes with a default graphical hid using GTK+ 
+
+<h3> 5.1.1 Using GTK+ </h3>
+
+<ol>
+	<li><a href="#main_window"> Main Window</a>
+	<li><a href="#menus"> Menus</a>
+	<li><a href="#operations_toolbar">Operations Toolbar</a>
+	<li><a href="#layer_controller">Layer Controller </a>
+	<li><a href="#coordinates_readout">Coordinates Readout</a>
+	<li><a href="#route_styles ">Route Styles</a>
+	<li><a href="#ops_readout">Ops Readout</a>
+	<li><a href="#key_commands">Key Commands</a>
+	<li><a href="#gui_cli">Gui Command Line Interface</a>
+	<li><a href="#dialog-windows">Dialog Windows </a>
+	    <ul>
+		  <li><a href="#route-styles-dialog"> route styles </a>
+		  <li><a href="#log-window"> message log</a>
+		  <li><a href="#library-dialog"> library</a>
+		  <li><a href="#propedit-dialog"> propedit</a>
+		  <li><a href="#preferences-dialog"> preferences</a>
+		  </ul>
+</ol>
+<p>
+
+<h3><a name="main_window">Main Window</a></h3>
+<br>
+<img src=base_window_highlight_main.png alt="Main layout window highlighted">
+<p>
+The main window in pcb-rnd is a drawing area for your layout. 
+<h3><a name="menus">Menus</a></h3>
+<br>
+<img src=base_window_highlight_menus.png alt="Menus highlighted">
+<p>
+Menus perform standard file operations commands as well as pcb-rnd layout specific operations
+menus:
+<ul>
+<li>File - Standard file operations -pcb-rnd import/export, and access to the pcb-rnd preferences 
+<li>Edit - Undos, buffer ops, selection, edit name and route styles
+<li>View - Main view grid control and attribute visibility
+<li>Settings - Direct control of main window settings that mostly affect drawing
+<li>Select - Selection and edit selection control
+<li>Buffer - edit, select, place, transform buffer contents
+<li>Connects - connection operations and DRC
+<li>Plugins - Manage plugins
+<li>Info - Generate reports and get keybindings
+<li>Window - open a auxiliary window (dialog)
+</ul>
+<h3><a name="operations_toolbar">Operations Toolbar</a></h3>
+<br>
+<img src=base_window_highlight_workops.png alt="Operations toolbar highlighted">
+<p>
+Add to and edit your layout
+<h3><a name="layer_controller">Layer Controller</a></h3>
+<br>
+<img src=base_window_highlight_layerops.png alt="Layer controls highlighted">
+<p>
+Change layer visibility 
+<h3><a name="coordinates_readout">Coordinates Readout</a></h3>
+<br>
+<img src=base_window_highlight_coordsreadout.png alt="Coordinate readout highlighted">
+<p>
+Readouts give live info for the user: 
+Obtain absolute and relative coordinate information
+<h3><a name="route_styles">Route Styles</a></h3>
+<br>
+<img src=base_window_highlight_routestyle.png alt="Route styles area highlighted">
+<p>
+Access route style dialog and alter existing route style 
+<h3><a name="ops_readout">Ops Readout</a></h3>
+<br>
+<img src=base_window_highlight_opsreadout.png alt="Operations readout highlighted">
+<p>
+Readouts provide live info for the user
+Obtain view grid line drawing style reporter, via size, clearance value, text
+size, buffer number
+<h3><a name="key_commands">Key Commands</a></h3>
+pcb-rnd key command standard...
+Quick Keys
+<h3><a name="gui_cli">Gui Command Line Interface</a></h3>
+Enter the command line interface by typing :
+</body>
+</html>
Index: tags/2.0.1/doc/user/05_ui/02_cli/index.html
===================================================================
--- tags/2.0.1/doc/user/05_ui/02_cli/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/02_cli/index.html	(revision 18980)
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 5.2 Actions and Command Line Interface </h2>
+<p>
+pcb-rnd actions can be listed
+
+<p>
+<code>
+./pcb-rnd --show-actions
+</code>
+
+<p>
+Uses for CLI:
+<ul>
+<li>format translation (with additional plugins active)
+<li>export (with additional plugins)
+<li>agnostic version control (use with git/mercurial/svn)
+</ul>
+<p>
+</body>
+</html>
Index: tags/2.0.1/doc/user/05_ui/05_batch/index.html
===================================================================
--- tags/2.0.1/doc/user/05_ui/05_batch/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/05_batch/index.html	(revision 18980)
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 5.5 Batch User Interface</h2>
+
+<p>
+Pcb-rnd comes with a interpreter which is known as the batch UI. This batch UI
+is a default buildin and can be summond at any time when running pcb-rnd (see
+code below). Batch mode will compile and run as the default user interface when pcb-rnd is
+compiled on systems without any GUI libs installed.
+
+<p>
+The batch UI is useful for automation, test, and debugging: it is reading
+action commands on the standard input and prints results on the standard
+output. It does not run a GUI and does not require X. Typical invocation:
+<p>
+<code>
+./pcb-rnd --gui batch [path]
+</code>
+
+<p>
+Uses and examples for Batch mode (TODO):
+<ul>
+<li>automation
+<li>export footprint  (with additional plugins)
+<li>possible hook processing (ensuring consistent layout state for a dvcs)
+</ul>
+<p>
+</body>
+</html>
Index: tags/2.0.1/doc/user/05_ui/06_common/grid_menu.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/05_ui/06_common/grid_menu.png
===================================================================
--- tags/2.0.1/doc/user/05_ui/06_common/grid_menu.png	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/06_common/grid_menu.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/05_ui/06_common/grid_menu.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/05_ui/06_common/index.html
===================================================================
--- tags/2.0.1/doc/user/05_ui/06_common/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/06_common/index.html	(revision 18980)
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 6.1. keyboard bindings </h2>
+<p>
+The same default menu file is used in all GUI HIDs. It comes with multi-stroke
+key bindings, plus only a very few, alternative keys that use modifiers
+(mostly ctrl). A multi-stroke key binding requires the user to type in a
+sequence of keys, e.g. pressing 't' and 'l' (written as {t l} in this document)
+will make pcb-rnd switch to the line tool. There are two major advanatges of
+using multi-stroke instead of modifiers:
+<ul>
+	<li> It is often easier to remember them, e.g. the above {t l} can be
+	     memorized as 'tool, line', and it is similar to {t a} for 'tool, arc'
+	     and {t, p} for 'tool, polygon'. The old menu file had these as F2, F3
+	     and F6. They could be also ctrl+l, ctrl+a, ctrl+p, but then if another
+	     group of functionality required similar letters, like l for list or
+	     p for print, they would ned to use a different modifier, e.g. alt+l
+	     and alt+p. At the end there would be a random set of alt, ctrl, shift
+	     combinations that are real hard to remember - this is exactly how
+	     the old (pre-2.0.0) default menu file was.
+	<li> Since pcb-rnd is a graphical CAD, the mouse is an inportant user input
+	     device. Most users will have one hand constantly on the mouse. It is much
+	     faster to type a sequence of 2 or rarely 3 plain keys with one hand than
+	     doing the acrobatics for something like ctrl+t or even alt+shif+u.
+</ul>
+<p>
+Most multi-stroke keys, especially the commonly used ones, use two strokes.
+Some rarely used feature will require three. The system can be regarded
+as a tree: e.g. in a 3-key sequence, starting from the root
+(nothing is pressed) the first key select a chapter, the second
+key narrows it down to a subchapter and the third key (leaf) selects the actual
+action within the subchapter. The <a href="keytree.svg">current key tree</a> is
+accessible in a large svg drawing or in a script-digestable
+<a href="keytree.txt">flat list</a>.
+
+<h2> 6.2. Grid </h2>
+<p id="grid">
+The grid is an imaginary set of points over the drawing. The crosshair
+can snap to the grid, helping the user to keep coordinates of objects
+distributed evenly.
+<p>
+The only grid geometr pcb-rnd supports is a regular, rectangular grid, that
+is: grid points spaced evenly in x and y directions, aligned into horizontal
+and vertical rows. The grid also has an optional offset in x and y directions
+(which is usually set to 0;0).
+<p>
+The grid spacing (distance between grid points) is user configurable. There
+are two methods managing the grid.
+
+<h3> 6.2.1. Preset grid </h3>
+
+<p>
+The configuration system has a node called editor/grids, which is an ordered
+list of <i>preset</i> grid settings. This list should contain the grid settings
+preferred by the user, or preferred for the given design. Since this is a
+configuration item, the usual conf rules apply (e.g. local grid config
+can be saved in the project's config or even in the board file).
+<p>
+While drawing, the user can use the {g b} and {g f} hotkeys, or the shorter
+[ and ] keys to <i>step</i> the current grid, selecting the previous or next item
+from the list. The grid sizes menu will always have the currently selected
+item checked.
+<p>
+<img src="grid_menu.png">
+<p>
+If the user changes grid properties directly, the new grid setup will most
+likely not match any of the presets and the check mark is gone from the menu.
+However, pcb-rnd remember the last used preset menu and upon the next
+<i>stepping</i> it will move from the last selected preset grid.
+
+<p>
+The format for the grid configuration is a simple text that lists an
+optional grid name, the mandatory grid size, the optional offset and
+optionally instructs pcb-rnd to also switch units when the grid is activated.
+The full syntax, optional parts written in [] is:
+<pre>
+[name:]size[@offs][!unit]
+</pre>
+<p>
+(The optional name has no functionality other than being displayed, helping
+the user to remember the purpose of the grid.)
+
+<p>
+Examples:
+<p>
+<table border=1>
+	<tr><th> grid spec                           <th> description
+	<tr><td> <pre>10 mil</pre>                   <td> anonymous 10 mil grid with no offset
+	<tr><td> <pre>1.5 mm</pre>                   <td> anonymous 1.5 mm grid with no offset
+	<tr><td> <pre>20 mil@1mil;-3mil</pre>        <td> 20 mil grid with a horizontal offset of +1 mil and vertical offset of -3 mil
+	<tr><td> <pre>1.5 mm!mm</pre>                <td> 1.5 mm grid; when activated, switch untis to mm
+	<tr><td> <pre>placing dips:100 mil</pre>     <td> named grid
+	<tr><td> <pre>leds:1mm@0.5mm;-0.1mm!mm</pre> <td> all the above features, combined
+</table>
+
+<h3> 6.2.2. Custom grid </h3>
+<p>
+The current grid is stored as grid distance and x;y offset. Regardless of
+the configured presets, these properties of the current grid can be changed
+any time, using the SetValue() action or using the menu.
+
Index: tags/2.0.1/doc/user/05_ui/06_common/keytree.svg
===================================================================
--- tags/2.0.1/doc/user/05_ui/06_common/keytree.svg	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/06_common/keytree.svg	(revision 18980)
@@ -0,0 +1,2333 @@
+<?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">
+<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+ -->
+<!-- Title: keytree Pages: 1 -->
+<svg width="831pt" height="10658pt"
+ viewBox="0.00 0.00 830.75 10657.74" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 10653.7)">
+<title>keytree</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-10653.7 826.751,-10653.7 826.751,4 -4,4"/>
+<!-- a -->
+<g id="node1" class="node"><title>a</title>
+<polygon fill="none" stroke="black" points="102.5,-413.87 20.5,-413.87 20.5,-375.87 102.5,-375.87 102.5,-413.87"/>
+<text text-anchor="middle" x="61.5" y="-398.67" font-family="Times,serif" font-size="14.00">{a} </text>
+<text text-anchor="middle" x="61.5" y="-383.67" font-family="Times,serif" font-size="14.00"> auto or add</text>
+</g>
+<!-- a_b -->
+<g id="node2" class="node"><title>a_b</title>
+<polygon fill="none" stroke="black" points="353.135,-1233.87 246.135,-1233.87 246.135,-1195.87 353.135,-1195.87 353.135,-1233.87"/>
+<text text-anchor="middle" x="299.635" y="-1218.67" font-family="Times,serif" font-size="14.00">{a b} </text>
+<text text-anchor="middle" x="299.635" y="-1203.67" font-family="Times,serif" font-size="14.00"> back annotation</text>
+</g>
+<!-- a&#45;&gt;a_b -->
+<g id="edge1" class="edge"><title>a&#45;&gt;a_b</title>
+<path fill="none" stroke="black" d="M62.5467,-414.018C63.0848,-513.371 69.2604,-970.198 137,-1090.87 162.217,-1135.79 211.064,-1169.74 248.488,-1190.65"/>
+<polygon fill="black" stroke="black" points="247.279,-1193.98 257.735,-1195.69 250.627,-1187.83 247.279,-1193.98"/>
+</g>
+<!-- a_p -->
+<g id="node3" class="node"><title>a_p</title>
+<polygon fill="none" stroke="black" points="338.135,-1081.87 261.135,-1081.87 261.135,-1043.87 338.135,-1043.87 338.135,-1081.87"/>
+<text text-anchor="middle" x="299.635" y="-1066.67" font-family="Times,serif" font-size="14.00">{a p} </text>
+<text text-anchor="middle" x="299.635" y="-1051.67" font-family="Times,serif" font-size="14.00"> auto&#45;place</text>
+</g>
+<!-- a&#45;&gt;a_p -->
+<g id="edge2" class="edge"><title>a&#45;&gt;a_p</title>
+<path fill="none" stroke="black" d="M62.4382,-413.908C62.498,-505.056 66.893,-896.324 137,-990.87 164.011,-1027.3 213.617,-1045.65 250.778,-1054.67"/>
+<polygon fill="black" stroke="black" points="250.373,-1058.17 260.9,-1056.97 251.925,-1051.34 250.373,-1058.17"/>
+</g>
+<!-- a_d -->
+<g id="node4" class="node"><title>a_d</title>
+<polygon fill="none" stroke="black" points="345.635,-981.87 253.635,-981.87 253.635,-943.87 345.635,-943.87 345.635,-981.87"/>
+<text text-anchor="middle" x="299.635" y="-966.67" font-family="Times,serif" font-size="14.00">{a d} </text>
+<text text-anchor="middle" x="299.635" y="-951.67" font-family="Times,serif" font-size="14.00"> auto&#45;disperse</text>
+</g>
+<!-- a&#45;&gt;a_d -->
+<g id="edge3" class="edge"><title>a&#45;&gt;a_d</title>
+<path fill="none" stroke="black" d="M62.8551,-414.138C64.6142,-471.858 75.0615,-647.256 137,-774.87 169.374,-841.57 231.357,-903.624 268.449,-937.088"/>
+<polygon fill="black" stroke="black" points="266.172,-939.746 275.967,-943.786 270.829,-934.52 266.172,-939.746"/>
+</g>
+<!-- a_r -->
+<g id="node5" class="node"><title>a_r</title>
+<polygon fill="none" stroke="black" points="337.635,-765.87 261.635,-765.87 261.635,-727.87 337.635,-727.87 337.635,-765.87"/>
+<text text-anchor="middle" x="299.635" y="-750.67" font-family="Times,serif" font-size="14.00">{a r} </text>
+<text text-anchor="middle" x="299.635" y="-735.67" font-family="Times,serif" font-size="14.00"> auto&#45;route</text>
+</g>
+<!-- a&#45;&gt;a_r -->
+<g id="edge4" class="edge"><title>a&#45;&gt;a_r</title>
+<path fill="none" stroke="black" d="M75.3633,-414.045C114.693,-472.673 233.474,-649.737 279.824,-718.829"/>
+<polygon fill="black" stroke="black" points="277.137,-721.107 285.615,-727.462 282.95,-717.207 277.137,-721.107"/>
+</g>
+<!-- a_o -->
+<g id="node6" class="node"><title>a_o</title>
+<polygon fill="none" stroke="black" points="354.135,-477.87 245.135,-477.87 245.135,-439.87 354.135,-439.87 354.135,-477.87"/>
+<text text-anchor="middle" x="299.635" y="-462.67" font-family="Times,serif" font-size="14.00">{a o} </text>
+<text text-anchor="middle" x="299.635" y="-447.67" font-family="Times,serif" font-size="14.00"> optimize (djopt)</text>
+</g>
+<!-- a&#45;&gt;a_o -->
+<g id="edge5" class="edge"><title>a&#45;&gt;a_o</title>
+<path fill="none" stroke="black" d="M96.9151,-413.975C109.251,-420.151 123.46,-426.52 137,-430.87 168.547,-441.004 204.806,-447.711 234.977,-452.011"/>
+<polygon fill="black" stroke="black" points="234.577,-455.489 244.959,-453.379 235.527,-448.554 234.577,-455.489"/>
+</g>
+<!-- a_a -->
+<g id="node42" class="node"><title>a_a</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-394.87" rx="86.0347" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-398.67" font-family="Times,serif" font-size="14.00">{a a} </text>
+<text text-anchor="middle" x="299.635" y="-383.67" font-family="Times,serif" font-size="14.00">Start routing an arc</text>
+</g>
+<!-- a&#45;&gt;a_a -->
+<g id="edge28" class="edge"><title>a&#45;&gt;a_a</title>
+<path fill="none" stroke="black" d="M102.557,-394.87C130.102,-394.87 167.9,-394.87 202.963,-394.87"/>
+<polygon fill="black" stroke="black" points="203.254,-398.37 213.254,-394.87 203.254,-391.37 203.254,-398.37"/>
+</g>
+<!-- a_l -->
+<g id="node48" class="node"><title>a_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-322.87" rx="84.2917" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-326.67" font-family="Times,serif" font-size="14.00">{a l} </text>
+<text text-anchor="middle" x="299.635" y="-311.67" font-family="Times,serif" font-size="14.00">Start routing a line</text>
+</g>
+<!-- a&#45;&gt;a_l -->
+<g id="edge34" class="edge"><title>a&#45;&gt;a_l</title>
+<path fill="none" stroke="black" d="M97.7867,-375.755C109.956,-369.723 123.839,-363.446 137,-358.87 161.931,-350.201 189.77,-343.12 215.223,-337.602"/>
+<polygon fill="black" stroke="black" points="216.162,-340.981 225.221,-335.488 214.714,-334.133 216.162,-340.981"/>
+</g>
+<!-- a_m -->
+<g id="node49" class="node"><title>a_m</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-250.87" rx="55.3091" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-254.67" font-family="Times,serif" font-size="14.00">{a m} </text>
+<text text-anchor="middle" x="299.635" y="-239.67" font-family="Times,serif" font-size="14.00">Place mark</text>
+</g>
+<!-- a&#45;&gt;a_m -->
+<g id="edge35" class="edge"><title>a&#45;&gt;a_m</title>
+<path fill="none" stroke="black" d="M70.4181,-375.544C81.5278,-350.954 104.134,-309.021 137,-286.87 165.611,-267.587 202.919,-258.472 234.482,-254.229"/>
+<polygon fill="black" stroke="black" points="235.002,-257.692 244.509,-253.016 234.161,-250.743 235.002,-257.692"/>
+</g>
+<!-- a_v -->
+<g id="node64" class="node"><title>a_v</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-178.87" rx="46.8387" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-182.67" font-family="Times,serif" font-size="14.00">{a v} </text>
+<text text-anchor="middle" x="299.635" y="-167.67" font-family="Times,serif" font-size="14.00">Place via</text>
+</g>
+<!-- a&#45;&gt;a_v -->
+<g id="edge50" class="edge"><title>a&#45;&gt;a_v</title>
+<path fill="none" stroke="black" d="M64.6531,-375.737C69.8833,-338.684 86.7645,-257.077 137,-214.87 166.224,-190.317 208.609,-181.549 242.645,-178.796"/>
+<polygon fill="black" stroke="black" points="243.165,-182.27 252.916,-178.124 242.708,-175.285 243.165,-182.27"/>
+</g>
+<!-- a_w -->
+<g id="node65" class="node"><title>a_w</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-106.87" rx="55.3091" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-110.67" font-family="Times,serif" font-size="14.00">{a w} </text>
+<text text-anchor="middle" x="299.635" y="-95.6701" font-family="Times,serif" font-size="14.00">Place mark</text>
+</g>
+<!-- a&#45;&gt;a_w -->
+<g id="edge51" class="edge"><title>a&#45;&gt;a_w</title>
+<path fill="none" stroke="black" d="M62.0536,-375.765C62.0595,-328.699 68.982,-206.394 137,-142.87 162.896,-118.685 201.322,-109.443 234.211,-106.362"/>
+<polygon fill="black" stroke="black" points="234.517,-109.848 244.22,-105.593 233.981,-102.869 234.517,-109.848"/>
+</g>
+<!-- a_x -->
+<g id="node66" class="node"><title>a_x</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-34.8701" rx="94.0904" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-38.6701" font-family="Times,serif" font-size="14.00">{a x} </text>
+<text text-anchor="middle" x="299.635" y="-23.6701" font-family="Times,serif" font-size="14.00">Design Rule Checker</text>
+</g>
+<!-- a&#45;&gt;a_x -->
+<g id="edge52" class="edge"><title>a&#45;&gt;a_x</title>
+<path fill="none" stroke="black" d="M64.276,-375.526C70.4563,-312.481 93.0785,-114.491 137,-70.8701 152.992,-54.9874 174.348,-45.4565 196.283,-39.8764"/>
+<polygon fill="black" stroke="black" points="197.072,-43.2864 206.043,-37.6509 195.515,-36.4616 197.072,-43.2864"/>
+</g>
+<!-- a_b_f -->
+<g id="node43" class="node"><title>a_b_f</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1322.87" rx="78.4777" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1326.67" font-family="Times,serif" font-size="14.00">{a b f} </text>
+<text text-anchor="middle" x="649.51" y="-1311.67" font-family="Times,serif" font-size="14.00">Replace footprint</text>
+</g>
+<!-- a_b&#45;&gt;a_b_f -->
+<g id="edge29" class="edge"><title>a_b&#45;&gt;a_b_f</title>
+<path fill="none" stroke="black" d="M341.027,-1233.91C376.137,-1249.85 428.694,-1272.28 476.269,-1286.87 505.923,-1295.96 539.147,-1303.51 568.445,-1309.3"/>
+<polygon fill="black" stroke="black" points="568.149,-1312.81 578.633,-1311.27 569.482,-1305.93 568.149,-1312.81"/>
+</g>
+<!-- a_b_s -->
+<g id="node44" class="node"><title>a_b_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1250.87" rx="132.458" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1254.67" font-family="Times,serif" font-size="14.00">{a b s} </text>
+<text text-anchor="middle" x="649.51" y="-1239.67" font-family="Times,serif" font-size="14.00">Swap nets on two selected pins</text>
+</g>
+<!-- a_b&#45;&gt;a_b_s -->
+<g id="edge30" class="edge"><title>a_b&#45;&gt;a_b_s</title>
+<path fill="none" stroke="black" d="M353.469,-1220.34C397.94,-1224.94 463.376,-1231.71 521.332,-1237.71"/>
+<polygon fill="black" stroke="black" points="521.002,-1241.19 531.309,-1238.74 521.723,-1234.23 521.002,-1241.19"/>
+</g>
+<!-- a_b_x -->
+<g id="node45" class="node"><title>a_b_x</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1178.87" rx="135.529" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1182.67" font-family="Times,serif" font-size="14.00">{a b x} </text>
+<text text-anchor="middle" x="649.51" y="-1167.67" font-family="Times,serif" font-size="14.00">netlist patch for back annotation</text>
+</g>
+<!-- a_b&#45;&gt;a_b_x -->
+<g id="edge31" class="edge"><title>a_b&#45;&gt;a_b_x</title>
+<path fill="none" stroke="black" d="M353.469,-1209.4C397.22,-1204.87 461.265,-1198.25 518.513,-1192.32"/>
+<polygon fill="black" stroke="black" points="519.159,-1195.77 528.746,-1191.26 518.438,-1188.81 519.159,-1195.77"/>
+</g>
+<!-- a_p_s -->
+<g id="node59" class="node"><title>a_p_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1106.87" rx="131.544" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1110.67" font-family="Times,serif" font-size="14.00">{a p s} </text>
+<text text-anchor="middle" x="649.51" y="-1095.67" font-family="Times,serif" font-size="14.00">Auto&#45;place selected subcircuits</text>
+</g>
+<!-- a_p&#45;&gt;a_p_s -->
+<g id="edge45" class="edge"><title>a_p&#45;&gt;a_p_s</title>
+<path fill="none" stroke="black" d="M338.194,-1067.62C383.147,-1073.31 460.668,-1083.11 526.98,-1091.5"/>
+<polygon fill="black" stroke="black" points="526.737,-1095 537.097,-1092.78 527.616,-1088.05 526.737,-1095"/>
+</g>
+<!-- a_d_a -->
+<g id="node46" class="node"><title>a_d_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1034.87" rx="101.233" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1038.67" font-family="Times,serif" font-size="14.00">{a d a} </text>
+<text text-anchor="middle" x="649.51" y="-1023.67" font-family="Times,serif" font-size="14.00">Disperse all subcircuits</text>
+</g>
+<!-- a_d&#45;&gt;a_d_a -->
+<g id="edge32" class="edge"><title>a_d&#45;&gt;a_d_a</title>
+<path fill="none" stroke="black" d="M345.757,-972.209C399.638,-983.361 491.039,-1002.28 559.348,-1016.42"/>
+<polygon fill="black" stroke="black" points="558.75,-1019.87 569.252,-1018.47 560.169,-1013.01 558.75,-1019.87"/>
+</g>
+<!-- a_d_s -->
+<g id="node47" class="node"><title>a_d_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-962.87" rx="122.159" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-966.67" font-family="Times,serif" font-size="14.00">{a d s} </text>
+<text text-anchor="middle" x="649.51" y="-951.67" font-family="Times,serif" font-size="14.00">Disperse selected subcircuits</text>
+</g>
+<!-- a_d&#45;&gt;a_d_s -->
+<g id="edge33" class="edge"><title>a_d&#45;&gt;a_d_s</title>
+<path fill="none" stroke="black" d="M345.757,-962.87C389.119,-962.87 456.782,-962.87 517.152,-962.87"/>
+<polygon fill="black" stroke="black" points="517.162,-966.37 527.162,-962.87 517.162,-959.37 517.162,-966.37"/>
+</g>
+<!-- a_r_a -->
+<g id="node60" class="node"><title>a_r_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-890.87" rx="82.0488" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-894.67" font-family="Times,serif" font-size="14.00">{a r a} </text>
+<text text-anchor="middle" x="649.51" y="-879.67" font-family="Times,serif" font-size="14.00">Auto&#45;route all rats</text>
+</g>
+<!-- a_r&#45;&gt;a_r_a -->
+<g id="edge46" class="edge"><title>a_r&#45;&gt;a_r_a</title>
+<path fill="none" stroke="black" d="M325.338,-765.926C358.056,-790.226 418.397,-831.844 476.269,-854.87 503.692,-865.781 534.947,-873.584 563.236,-879.07"/>
+<polygon fill="black" stroke="black" points="562.635,-882.518 573.107,-880.916 563.921,-875.638 562.635,-882.518"/>
+</g>
+<!-- a_r_r -->
+<g id="node61" class="node"><title>a_r_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-818.87" rx="122.159" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-822.67" font-family="Times,serif" font-size="14.00">{a r r} </text>
+<text text-anchor="middle" x="649.51" y="-807.67" font-family="Times,serif" font-size="14.00">Rip up all auto&#45;routed tracks</text>
+</g>
+<!-- a_r&#45;&gt;a_r_r -->
+<g id="edge47" class="edge"><title>a_r&#45;&gt;a_r_r</title>
+<path fill="none" stroke="black" d="M337.863,-754.575C388.085,-764.97 479.382,-783.866 550.054,-798.493"/>
+<polygon fill="black" stroke="black" points="549.381,-801.927 559.883,-800.527 550.8,-795.073 549.381,-801.927"/>
+</g>
+<!-- a_r_s -->
+<g id="node62" class="node"><title>a_r_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-746.87" rx="103.476" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-750.67" font-family="Times,serif" font-size="14.00">{a r s} </text>
+<text text-anchor="middle" x="649.51" y="-735.67" font-family="Times,serif" font-size="14.00">Auto&#45;route selected rats</text>
+</g>
+<!-- a_r&#45;&gt;a_r_s -->
+<g id="edge48" class="edge"><title>a_r&#45;&gt;a_r_s</title>
+<path fill="none" stroke="black" d="M337.863,-746.87C384.712,-746.87 467.303,-746.87 535.554,-746.87"/>
+<polygon fill="black" stroke="black" points="535.944,-750.37 545.944,-746.87 535.944,-743.37 535.944,-750.37"/>
+</g>
+<!-- a_r_t -->
+<g id="node63" class="node"><title>a_r_t</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-674.87" rx="143.585" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-678.67" font-family="Times,serif" font-size="14.00">{a r t} </text>
+<text text-anchor="middle" x="649.51" y="-663.67" font-family="Times,serif" font-size="14.00">Rip up selected auto&#45;routed tracks</text>
+</g>
+<!-- a_r&#45;&gt;a_r_t -->
+<g id="edge49" class="edge"><title>a_r&#45;&gt;a_r_t</title>
+<path fill="none" stroke="black" d="M337.863,-739.165C386.311,-729.137 472.986,-711.198 542.493,-696.812"/>
+<polygon fill="black" stroke="black" points="543.534,-700.171 552.617,-694.717 542.115,-693.317 543.534,-700.171"/>
+</g>
+<!-- a_o_a -->
+<g id="node50" class="node"><title>a_o_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-602.87" rx="70.0071" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-606.67" font-family="Times,serif" font-size="14.00">{a o a} </text>
+<text text-anchor="middle" x="649.51" y="-591.67" font-family="Times,serif" font-size="14.00">Auto&#45;Optimize</text>
+</g>
+<!-- a_o&#45;&gt;a_o_a -->
+<g id="edge36" class="edge"><title>a_o&#45;&gt;a_o_a</title>
+<path fill="none" stroke="black" d="M325.338,-477.926C358.056,-502.226 418.397,-543.844 476.269,-566.87 506.744,-578.995 541.952,-587.282 572.563,-592.818"/>
+<polygon fill="black" stroke="black" points="572.303,-596.325 582.755,-594.591 573.503,-589.428 572.303,-596.325"/>
+</g>
+<!-- a_o_d -->
+<g id="node51" class="node"><title>a_o_d</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-530.87" rx="55.7232" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-534.67" font-family="Times,serif" font-size="14.00">{a o d} </text>
+<text text-anchor="middle" x="649.51" y="-519.67" font-family="Times,serif" font-size="14.00">Debumpify</text>
+</g>
+<!-- a_o&#45;&gt;a_o_d -->
+<g id="edge37" class="edge"><title>a_o&#45;&gt;a_o_d</title>
+<path fill="none" stroke="black" d="M354.228,-469.962C417.405,-483.038 522.129,-504.713 588.122,-518.371"/>
+<polygon fill="black" stroke="black" points="587.466,-521.81 597.968,-520.409 588.885,-514.955 587.466,-521.81"/>
+</g>
+<!-- a_o_m -->
+<g id="node52" class="node"><title>a_o_m</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-458.87" rx="45.9239" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-462.67" font-family="Times,serif" font-size="14.00">{a o m} </text>
+<text text-anchor="middle" x="649.51" y="-447.67" font-family="Times,serif" font-size="14.00">Miter</text>
+</g>
+<!-- a_o&#45;&gt;a_o_m -->
+<g id="edge38" class="edge"><title>a_o&#45;&gt;a_o_m</title>
+<path fill="none" stroke="black" d="M354.228,-458.87C419.084,-458.87 527.726,-458.87 593.301,-458.87"/>
+<polygon fill="black" stroke="black" points="593.442,-462.37 603.442,-458.87 593.442,-455.37 593.442,-462.37"/>
+</g>
+<!-- a_o_n -->
+<g id="node53" class="node"><title>a_o_n</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-386.87" rx="48.5816" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-390.67" font-family="Times,serif" font-size="14.00">{a o n} </text>
+<text text-anchor="middle" x="649.51" y="-375.67" font-family="Times,serif" font-size="14.00">Vianudge</text>
+</g>
+<!-- a_o&#45;&gt;a_o_n -->
+<g id="edge39" class="edge"><title>a_o&#45;&gt;a_o_n</title>
+<path fill="none" stroke="black" d="M354.24,-454.306C386.295,-450.428 427.432,-443.403 462.269,-430.87 469.012,-428.444 469.569,-425.412 476.269,-422.87 513.414,-408.778 557.269,-399.714 591.43,-394.205"/>
+<polygon fill="black" stroke="black" points="592.359,-397.603 601.703,-392.608 591.284,-390.686 592.359,-397.603"/>
+</g>
+<!-- a_o_o -->
+<g id="node54" class="node"><title>a_o_o</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-314.87" rx="51.7379" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-318.67" font-family="Times,serif" font-size="14.00">{a o o} </text>
+<text text-anchor="middle" x="649.51" y="-303.67" font-family="Times,serif" font-size="14.00">Ortho pull</text>
+</g>
+<!-- a_o&#45;&gt;a_o_o -->
+<g id="edge40" class="edge"><title>a_o&#45;&gt;a_o_o</title>
+<path fill="none" stroke="black" d="M354.272,-464.206C389.659,-464.604 434.455,-458.637 462.269,-430.87 487.815,-405.368 451.167,-376.809 476.269,-350.87 504.718,-321.473 550.533,-312.98 587.762,-311.565"/>
+<polygon fill="black" stroke="black" points="588.091,-315.059 598.013,-311.343 587.939,-308.061 588.091,-315.059"/>
+</g>
+<!-- a_o_p -->
+<g id="node55" class="node"><title>a_o_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-242.87" rx="43.2674" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-246.67" font-family="Times,serif" font-size="14.00">{a o p} </text>
+<text text-anchor="middle" x="649.51" y="-231.67" font-family="Times,serif" font-size="14.00">Puller</text>
+</g>
+<!-- a_o&#45;&gt;a_o_p -->
+<g id="edge41" class="edge"><title>a_o&#45;&gt;a_o_p</title>
+<path fill="none" stroke="black" d="M354.232,-464.896C390.07,-465.71 435.414,-459.955 462.269,-430.87 485.28,-405.948 453.691,-304.185 476.269,-278.87 505.854,-245.698 557.448,-238.604 596.476,-238.66"/>
+<polygon fill="black" stroke="black" points="596.555,-242.162 606.613,-238.833 596.674,-235.163 596.555,-242.162"/>
+</g>
+<!-- a_o_s -->
+<g id="node56" class="node"><title>a_o_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-170.87" rx="90.5193" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-174.67" font-family="Times,serif" font-size="14.00">{a o s} </text>
+<text text-anchor="middle" x="649.51" y="-159.67" font-family="Times,serif" font-size="14.00">Simple optimization</text>
+</g>
+<!-- a_o&#45;&gt;a_o_s -->
+<g id="edge42" class="edge"><title>a_o&#45;&gt;a_o_s</title>
+<path fill="none" stroke="black" d="M354.502,-465.141C390.464,-466.068 435.845,-460.347 462.269,-430.87 495.561,-393.733 443.624,-244.576 476.269,-206.87 494.523,-185.786 521.661,-175.161 549.026,-170.217"/>
+<polygon fill="black" stroke="black" points="549.761,-173.645 559.102,-168.644 548.681,-166.729 549.761,-173.645"/>
+</g>
+<!-- a_o_t -->
+<g id="node57" class="node"><title>a_o_t</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-98.8701" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-102.67" font-family="Times,serif" font-size="14.00">{a o t} </text>
+<text text-anchor="middle" x="649.51" y="-87.6701" font-family="Times,serif" font-size="14.00">Viatrim</text>
+</g>
+<!-- a_o&#45;&gt;a_o_t -->
+<g id="edge43" class="edge"><title>a_o&#45;&gt;a_o_t</title>
+<path fill="none" stroke="black" d="M354.254,-465.255C390.342,-466.291 435.975,-460.653 462.269,-430.87 484.061,-406.187 454.907,-159.925 476.269,-134.87 505.562,-100.513 558.439,-93.8273 597.907,-94.3135"/>
+<polygon fill="black" stroke="black" points="598.045,-97.8187 608.14,-94.601 598.242,-90.8214 598.045,-97.8187"/>
+</g>
+<!-- a_o_u -->
+<g id="node58" class="node"><title>a_o_u</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-26.8701" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-30.6701" font-family="Times,serif" font-size="14.00">{a o u} </text>
+<text text-anchor="middle" x="649.51" y="-15.6701" font-family="Times,serif" font-size="14.00">Unjaggy</text>
+</g>
+<!-- a_o&#45;&gt;a_o_u -->
+<g id="edge44" class="edge"><title>a_o&#45;&gt;a_o_u</title>
+<path fill="none" stroke="black" d="M354.339,-465.331C390.467,-466.402 436.113,-460.774 462.269,-430.87 489.208,-400.071 449.865,-94.1296 476.269,-62.8701 504.77,-29.1281 556.016,-22.0162 595.226,-22.2172"/>
+<polygon fill="black" stroke="black" points="595.352,-25.7205 605.424,-22.4325 595.5,-18.7221 595.352,-25.7205"/>
+</g>
+<!-- b -->
+<g id="node7" class="node"><title>b</title>
+<polygon fill="none" stroke="black" points="88.5,-1640.87 34.5,-1640.87 34.5,-1602.87 88.5,-1602.87 88.5,-1640.87"/>
+<text text-anchor="middle" x="61.5" y="-1625.67" font-family="Times,serif" font-size="14.00">{b} </text>
+<text text-anchor="middle" x="61.5" y="-1610.67" font-family="Times,serif" font-size="14.00"> buffer</text>
+</g>
+<!-- b_c -->
+<g id="node8" class="node"><title>b_c</title>
+<polygon fill="none" stroke="black" points="352.635,-2025.87 246.635,-2025.87 246.635,-1987.87 352.635,-1987.87 352.635,-2025.87"/>
+<text text-anchor="middle" x="299.635" y="-2010.67" font-family="Times,serif" font-size="14.00">{b c} </text>
+<text text-anchor="middle" x="299.635" y="-1995.67" font-family="Times,serif" font-size="14.00"> convert &amp; clear</text>
+</g>
+<!-- b&#45;&gt;b_c -->
+<g id="edge6" class="edge"><title>b&#45;&gt;b_c</title>
+<path fill="none" stroke="black" d="M65.2797,-1641.06C72.0032,-1682.75 92.0217,-1783.57 137,-1854.87 170.202,-1907.5 225.867,-1954.24 262.422,-1981.56"/>
+<polygon fill="black" stroke="black" points="260.697,-1984.63 270.824,-1987.75 264.849,-1979 260.697,-1984.63"/>
+</g>
+<!-- b_m -->
+<g id="node9" class="node"><title>b_m</title>
+<polygon fill="none" stroke="black" points="327.635,-1845.87 271.635,-1845.87 271.635,-1807.87 327.635,-1807.87 327.635,-1845.87"/>
+<text text-anchor="middle" x="299.635" y="-1830.67" font-family="Times,serif" font-size="14.00">{b m} </text>
+<text text-anchor="middle" x="299.635" y="-1815.67" font-family="Times,serif" font-size="14.00"> mirror</text>
+</g>
+<!-- b&#45;&gt;b_m -->
+<g id="edge7" class="edge"><title>b&#45;&gt;b_m</title>
+<path fill="none" stroke="black" d="M83.5647,-1641.08C98.414,-1654.55 118.815,-1672.93 137,-1688.87 182.281,-1728.55 235.506,-1773.71 268.151,-1801.25"/>
+<polygon fill="black" stroke="black" points="266.088,-1804.08 275.99,-1807.85 270.599,-1798.73 266.088,-1804.08"/>
+</g>
+<!-- b_r -->
+<g id="node10" class="node"><title>b_r</title>
+<polygon fill="none" stroke="black" points="326.635,-1679.87 272.635,-1679.87 272.635,-1641.87 326.635,-1641.87 326.635,-1679.87"/>
+<text text-anchor="middle" x="299.635" y="-1664.67" font-family="Times,serif" font-size="14.00">{b r} </text>
+<text text-anchor="middle" x="299.635" y="-1649.67" font-family="Times,serif" font-size="14.00"> rotate</text>
+</g>
+<!-- b&#45;&gt;b_r -->
+<g id="edge8" class="edge"><title>b&#45;&gt;b_r</title>
+<path fill="none" stroke="black" d="M88.6728,-1626.19C130.96,-1633.18 214.406,-1646.96 262.386,-1654.88"/>
+<polygon fill="black" stroke="black" points="261.908,-1658.35 272.345,-1656.53 263.049,-1651.45 261.908,-1658.35"/>
+</g>
+<!-- b_s -->
+<g id="node11" class="node"><title>b_s</title>
+<polygon fill="none" stroke="black" points="336.635,-1601.87 262.635,-1601.87 262.635,-1563.87 336.635,-1563.87 336.635,-1601.87"/>
+<text text-anchor="middle" x="299.635" y="-1586.67" font-family="Times,serif" font-size="14.00">{b s} </text>
+<text text-anchor="middle" x="299.635" y="-1571.67" font-family="Times,serif" font-size="14.00"> subcircuit</text>
+</g>
+<!-- b&#45;&gt;b_s -->
+<g id="edge9" class="edge"><title>b&#45;&gt;b_s</title>
+<path fill="none" stroke="black" d="M88.6728,-1617.55C128.134,-1611.03 203.436,-1598.59 252.314,-1590.52"/>
+<polygon fill="black" stroke="black" points="253.025,-1593.95 262.321,-1588.87 251.884,-1587.04 253.025,-1593.95"/>
+</g>
+<!-- b_b -->
+<g id="node67" class="node"><title>b_b</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-1518.87" rx="77.5641" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-1522.67" font-family="Times,serif" font-size="14.00">{b b} </text>
+<text text-anchor="middle" x="299.635" y="-1507.67" font-family="Times,serif" font-size="14.00">Layer bindings...</text>
+</g>
+<!-- b&#45;&gt;b_b -->
+<g id="edge53" class="edge"><title>b&#45;&gt;b_b</title>
+<path fill="none" stroke="black" d="M78.5902,-1602.76C92.5024,-1587.49 113.96,-1566.74 137,-1554.87 161.134,-1542.43 189.457,-1534.27 215.595,-1528.93"/>
+<polygon fill="black" stroke="black" points="216.339,-1532.35 225.493,-1527.01 215.01,-1525.48 216.339,-1532.35"/>
+</g>
+<!-- b_n -->
+<g id="node73" class="node"><title>b_n</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-1446.87" rx="52.1524" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-1450.67" font-family="Times,serif" font-size="14.00">{b n} </text>
+<text text-anchor="middle" x="299.635" y="-1435.67" font-family="Times,serif" font-size="14.00">Normalize</text>
+</g>
+<!-- b&#45;&gt;b_n -->
+<g id="edge59" class="edge"><title>b&#45;&gt;b_n</title>
+<path fill="none" stroke="black" d="M67.2006,-1602.79C75.7093,-1572.44 96.645,-1513.48 137,-1482.87 165.418,-1461.31 204.257,-1452.19 236.74,-1448.52"/>
+<polygon fill="black" stroke="black" points="237.432,-1451.97 247.042,-1447.51 236.749,-1445.01 237.432,-1451.97"/>
+</g>
+<!-- b_c_c -->
+<g id="node68" class="node"><title>b_c_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-2114.87" rx="58.8803" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-2118.67" font-family="Times,serif" font-size="14.00">{b c c} </text>
+<text text-anchor="middle" x="649.51" y="-2103.67" font-family="Times,serif" font-size="14.00">Clear buffer</text>
+</g>
+<!-- b_c&#45;&gt;b_c_c -->
+<g id="edge54" class="edge"><title>b_c&#45;&gt;b_c_c</title>
+<path fill="none" stroke="black" d="M352.741,-2002.77C387.669,-2002.88 432.54,-2008.95 462.269,-2034.87 477.736,-2048.36 461.037,-2065.12 476.269,-2078.87 504.336,-2104.21 545.53,-2113.46 580.594,-2116.26"/>
+<polygon fill="black" stroke="black" points="580.578,-2119.77 590.781,-2116.91 581.023,-2112.78 580.578,-2119.77"/>
+</g>
+<!-- b_c_p -->
+<g id="node69" class="node"><title>b_c_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-2042.87" rx="114.603" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-2046.67" font-family="Times,serif" font-size="14.00">{b c p} </text>
+<text text-anchor="middle" x="649.51" y="-2031.67" font-family="Times,serif" font-size="14.00">Convert buffer to padstack</text>
+</g>
+<!-- b_c&#45;&gt;b_c_p -->
+<g id="edge55" class="edge"><title>b_c&#45;&gt;b_c_p</title>
+<path fill="none" stroke="black" d="M352.715,-2012.26C400.475,-2017.2 472.866,-2024.69 534.078,-2031.03"/>
+<polygon fill="black" stroke="black" points="533.884,-2034.53 544.191,-2032.07 534.605,-2027.56 533.884,-2034.53"/>
+</g>
+<!-- b_c_s -->
+<g id="node70" class="node"><title>b_c_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1970.87" rx="118.588" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1974.67" font-family="Times,serif" font-size="14.00">{b c s} </text>
+<text text-anchor="middle" x="649.51" y="-1959.67" font-family="Times,serif" font-size="14.00">Convert buffer to subcircuit</text>
+</g>
+<!-- b_c&#45;&gt;b_c_s -->
+<g id="edge56" class="edge"><title>b_c&#45;&gt;b_c_s</title>
+<path fill="none" stroke="black" d="M352.715,-2001.48C399.667,-1996.62 470.424,-1989.3 530.962,-1983.03"/>
+<polygon fill="black" stroke="black" points="531.385,-1986.51 540.972,-1982 530.665,-1979.55 531.385,-1986.51"/>
+</g>
+<!-- b_m_l -->
+<g id="node71" class="node"><title>b_m_l</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1898.87" rx="106.132" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1902.67" font-family="Times,serif" font-size="14.00">{b m l} </text>
+<text text-anchor="middle" x="649.51" y="-1887.67" font-family="Times,serif" font-size="14.00">Mirror buffer (left/right)</text>
+</g>
+<!-- b_m&#45;&gt;b_m_l -->
+<g id="edge57" class="edge"><title>b_m&#45;&gt;b_m_l</title>
+<path fill="none" stroke="black" d="M327.642,-1832.46C376.15,-1842.5 480.094,-1864.01 556.59,-1879.85"/>
+<polygon fill="black" stroke="black" points="556.218,-1883.34 566.72,-1881.94 557.637,-1876.49 556.218,-1883.34"/>
+</g>
+<!-- b_m_u -->
+<g id="node72" class="node"><title>b_m_u</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1826.87" rx="106.132" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1830.67" font-family="Times,serif" font-size="14.00">{b m u} </text>
+<text text-anchor="middle" x="649.51" y="-1815.67" font-family="Times,serif" font-size="14.00">Mirror buffer (up/down)</text>
+</g>
+<!-- b_m&#45;&gt;b_m_u -->
+<g id="edge58" class="edge"><title>b_m&#45;&gt;b_m_u</title>
+<path fill="none" stroke="black" d="M327.642,-1826.87C371.324,-1826.87 459.962,-1826.87 533.027,-1826.87"/>
+<polygon fill="black" stroke="black" points="533.228,-1830.37 543.228,-1826.87 533.228,-1823.37 533.228,-1830.37"/>
+</g>
+<!-- b_r_a -->
+<g id="node74" class="node"><title>b_r_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1754.87" rx="107.46" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1758.67" font-family="Times,serif" font-size="14.00">{b r a} </text>
+<text text-anchor="middle" x="649.51" y="-1743.67" font-family="Times,serif" font-size="14.00">Arbitrarily Rotate Buffer</text>
+</g>
+<!-- b_r&#45;&gt;b_r_a -->
+<g id="edge60" class="edge"><title>b_r&#45;&gt;b_r_a</title>
+<path fill="none" stroke="black" d="M326.836,-1670.55C360.917,-1682.91 422.464,-1704.41 476.269,-1718.87 500.882,-1725.48 527.745,-1731.61 552.778,-1736.86"/>
+<polygon fill="black" stroke="black" points="552.138,-1740.31 562.64,-1738.91 553.559,-1733.45 552.138,-1740.31"/>
+</g>
+<!-- b_r_l -->
+<g id="node75" class="node"><title>b_r_l</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1682.87" rx="137.772" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1686.67" font-family="Times,serif" font-size="14.00">{b r l} </text>
+<text text-anchor="middle" x="649.51" y="-1671.67" font-family="Times,serif" font-size="14.00">Rotate buffer 90 deg CCW (left)</text>
+</g>
+<!-- b_r&#45;&gt;b_r_l -->
+<g id="edge61" class="edge"><title>b_r&#45;&gt;b_r_l</title>
+<path fill="none" stroke="black" d="M326.782,-1662.52C365.258,-1664.96 439.906,-1669.68 507.617,-1673.96"/>
+<polygon fill="black" stroke="black" points="507.783,-1677.48 517.984,-1674.62 508.225,-1670.49 507.783,-1677.48"/>
+</g>
+<!-- b_r_r -->
+<g id="node76" class="node"><title>b_r_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1610.87" rx="137.358" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1614.67" font-family="Times,serif" font-size="14.00">{b r r} </text>
+<text text-anchor="middle" x="649.51" y="-1599.67" font-family="Times,serif" font-size="14.00">Rotate buffer 90 deg CW (right)</text>
+</g>
+<!-- b_r&#45;&gt;b_r_r -->
+<g id="edge62" class="edge"><title>b_r&#45;&gt;b_r_r</title>
+<path fill="none" stroke="black" d="M326.782,-1657.11C369.189,-1651.02 455.536,-1638.61 528.107,-1628.18"/>
+<polygon fill="black" stroke="black" points="528.85,-1631.6 538.25,-1626.72 527.854,-1624.68 528.85,-1631.6"/>
+</g>
+<!-- b_s_b -->
+<g id="node77" class="node"><title>b_s_b</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1538.87" rx="141.343" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1542.67" font-family="Times,serif" font-size="14.00">{b s b} </text>
+<text text-anchor="middle" x="649.51" y="-1527.67" font-family="Times,serif" font-size="14.00">Break buffer subcircuits to pieces</text>
+</g>
+<!-- b_s&#45;&gt;b_s_b -->
+<g id="edge63" class="edge"><title>b_s&#45;&gt;b_s_b</title>
+<path fill="none" stroke="black" d="M336.879,-1578.29C380.329,-1572.79 455.512,-1563.28 521.144,-1554.98"/>
+<polygon fill="black" stroke="black" points="521.689,-1558.44 531.171,-1553.71 520.811,-1551.49 521.689,-1558.44"/>
+</g>
+<!-- b_s_p -->
+<g id="node78" class="node"><title>b_s_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1466.87" rx="137.358" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1470.67" font-family="Times,serif" font-size="14.00">{b s p} </text>
+<text text-anchor="middle" x="649.51" y="-1455.67" font-family="Times,serif" font-size="14.00">Break buffer padstacks to pieces</text>
+</g>
+<!-- b_s&#45;&gt;b_s_p -->
+<g id="edge64" class="edge"><title>b_s&#45;&gt;b_s_p</title>
+<path fill="none" stroke="black" d="M336.898,-1586.93C373.201,-1588.88 428.399,-1585.78 462.269,-1554.87 479.949,-1538.74 458.87,-1519.31 476.269,-1502.87 486.455,-1493.25 498.52,-1485.92 511.464,-1480.37"/>
+<polygon fill="black" stroke="black" points="512.988,-1483.53 521.031,-1476.63 510.443,-1477.01 512.988,-1483.53"/>
+</g>
+<!-- b_s_s -->
+<g id="node79" class="node"><title>b_s_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-1394.87" rx="125.73" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-1398.67" font-family="Times,serif" font-size="14.00">{b s s} </text>
+<text text-anchor="middle" x="649.51" y="-1383.67" font-family="Times,serif" font-size="14.00">Save buffer subcircuits to file</text>
+</g>
+<!-- b_s&#45;&gt;b_s_s -->
+<g id="edge65" class="edge"><title>b_s&#45;&gt;b_s_s</title>
+<path fill="none" stroke="black" d="M336.866,-1587.87C373.955,-1590.75 430.526,-1588.55 462.269,-1554.87 500.31,-1514.51 438.93,-1471.88 476.269,-1430.87 487.34,-1418.71 501.37,-1410.07 516.626,-1404.01"/>
+<polygon fill="black" stroke="black" points="518.03,-1407.23 526.268,-1400.57 515.673,-1400.64 518.03,-1407.23"/>
+</g>
+<!-- c -->
+<g id="node12" class="node"><title>c</title>
+<polygon fill="none" stroke="black" points="123,-2269.87 0,-2269.87 0,-2231.87 123,-2231.87 123,-2269.87"/>
+<text text-anchor="middle" x="61.5" y="-2254.67" font-family="Times,serif" font-size="14.00">{c} </text>
+<text text-anchor="middle" x="61.5" y="-2239.67" font-family="Times,serif" font-size="14.00"> connections &amp; rats</text>
+</g>
+<!-- c_c -->
+<g id="node80" class="node"><title>c_c</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2430.87" rx="82.0488" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2434.67" font-family="Times,serif" font-size="14.00">{c c} </text>
+<text text-anchor="middle" x="299.635" y="-2419.67" font-family="Times,serif" font-size="14.00">Clear/reset lookup</text>
+</g>
+<!-- c&#45;&gt;c_c -->
+<g id="edge66" class="edge"><title>c&#45;&gt;c_c</title>
+<path fill="none" stroke="black" d="M66.8604,-2270.12C74.9877,-2301.38 95.5203,-2362.93 137,-2394.87 157.41,-2410.59 183.335,-2419.71 208.413,-2424.94"/>
+<polygon fill="black" stroke="black" points="207.864,-2428.39 218.34,-2426.81 209.166,-2421.52 207.864,-2428.39"/>
+</g>
+<!-- c_d -->
+<g id="node81" class="node"><title>c_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2358.87" rx="103.889" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2362.67" font-family="Times,serif" font-size="14.00">{c d} </text>
+<text text-anchor="middle" x="299.635" y="-2347.67" font-family="Times,serif" font-size="14.00">Del/Remove Connected</text>
+</g>
+<!-- c&#45;&gt;c_d -->
+<g id="edge67" class="edge"><title>c&#45;&gt;c_d</title>
+<path fill="none" stroke="black" d="M77.2069,-2270.12C90.8887,-2286.66 112.766,-2309.83 137,-2322.87 155.057,-2332.59 175.6,-2339.69 195.841,-2344.87"/>
+<polygon fill="black" stroke="black" points="195.199,-2348.31 205.742,-2347.26 196.844,-2341.51 195.199,-2348.31"/>
+</g>
+<!-- c_e -->
+<g id="node82" class="node"><title>c_e</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2286.87" rx="67.3507" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2290.67" font-family="Times,serif" font-size="14.00">{c e} </text>
+<text text-anchor="middle" x="299.635" y="-2275.67" font-family="Times,serif" font-size="14.00">Erase rats nest</text>
+</g>
+<!-- c&#45;&gt;c_e -->
+<g id="edge68" class="edge"><title>c&#45;&gt;c_e</title>
+<path fill="none" stroke="black" d="M123.004,-2260.09C154.582,-2264.91 193.434,-2270.83 226.561,-2275.88"/>
+<polygon fill="black" stroke="black" points="226.23,-2279.37 236.643,-2277.42 227.285,-2272.45 226.23,-2279.37"/>
+</g>
+<!-- c_f -->
+<g id="node83" class="node"><title>c_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2214.87" rx="79.8063" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2218.67" font-family="Times,serif" font-size="14.00">{c f} </text>
+<text text-anchor="middle" x="299.635" y="-2203.67" font-family="Times,serif" font-size="14.00">Find Connections</text>
+</g>
+<!-- c&#45;&gt;c_f -->
+<g id="edge69" class="edge"><title>c&#45;&gt;c_f</title>
+<path fill="none" stroke="black" d="M123.004,-2241.65C151.364,-2237.32 185.59,-2232.1 216.266,-2227.43"/>
+<polygon fill="black" stroke="black" points="217.162,-2230.83 226.52,-2225.86 216.107,-2223.91 217.162,-2230.83"/>
+</g>
+<!-- c_r -->
+<g id="node84" class="node"><title>c_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2142.87" rx="82.0488" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2146.67" font-family="Times,serif" font-size="14.00">{c r} </text>
+<text text-anchor="middle" x="299.635" y="-2131.67" font-family="Times,serif" font-size="14.00">Optimize rats nest</text>
+</g>
+<!-- c&#45;&gt;c_r -->
+<g id="edge70" class="edge"><title>c&#45;&gt;c_r</title>
+<path fill="none" stroke="black" d="M77.2069,-2231.62C90.8887,-2215.08 112.766,-2191.91 137,-2178.87 159.796,-2166.6 186.553,-2158.51 211.665,-2153.17"/>
+<polygon fill="black" stroke="black" points="212.447,-2156.59 221.565,-2151.19 211.072,-2149.72 212.447,-2156.59"/>
+</g>
+<!-- c_s -->
+<g id="node85" class="node"><title>c_s</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2070.87" rx="79.8063" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2074.67" font-family="Times,serif" font-size="14.00">{c s} </text>
+<text text-anchor="middle" x="299.635" y="-2059.67" font-family="Times,serif" font-size="14.00">Select shortest rat</text>
+</g>
+<!-- c&#45;&gt;c_s -->
+<g id="edge71" class="edge"><title>c&#45;&gt;c_s</title>
+<path fill="none" stroke="black" d="M66.8604,-2231.62C74.9877,-2200.36 95.5203,-2138.81 137,-2106.87 157.913,-2090.76 184.615,-2081.58 210.265,-2076.43"/>
+<polygon fill="black" stroke="black" points="211.196,-2079.81 220.407,-2074.58 209.942,-2072.93 211.196,-2079.81"/>
+</g>
+<!-- e -->
+<g id="node13" class="node"><title>e</title>
+<polygon fill="none" stroke="black" points="88.5,-3025.87 34.5,-3025.87 34.5,-2987.87 88.5,-2987.87 88.5,-3025.87"/>
+<text text-anchor="middle" x="61.5" y="-3010.67" font-family="Times,serif" font-size="14.00">{e} </text>
+<text text-anchor="middle" x="61.5" y="-2995.67" font-family="Times,serif" font-size="14.00"> edit</text>
+</g>
+<!-- e_m -->
+<g id="node14" class="node"><title>e_m</title>
+<polygon fill="none" stroke="black" points="327.135,-3685.87 272.135,-3685.87 272.135,-3647.87 327.135,-3647.87 327.135,-3685.87"/>
+<text text-anchor="middle" x="299.635" y="-3670.67" font-family="Times,serif" font-size="14.00">{e m} </text>
+<text text-anchor="middle" x="299.635" y="-3655.67" font-family="Times,serif" font-size="14.00"> move</text>
+</g>
+<!-- e&#45;&gt;e_m -->
+<g id="edge10" class="edge"><title>e&#45;&gt;e_m</title>
+<path fill="none" stroke="black" d="M63.4081,-3025.93C68.3768,-3126.54 93.6454,-3593.1 137,-3638.87 168.551,-3672.18 224.401,-3674.65 261.473,-3671.91"/>
+<polygon fill="black" stroke="black" points="262.217,-3675.36 271.861,-3670.97 261.586,-3668.39 262.217,-3675.36"/>
+</g>
+<!-- e_s -->
+<g id="node15" class="node"><title>e_s</title>
+<polygon fill="none" stroke="black" points="358.635,-3629.87 240.635,-3629.87 240.635,-3591.87 358.635,-3591.87 358.635,-3629.87"/>
+<text text-anchor="middle" x="299.635" y="-3614.67" font-family="Times,serif" font-size="14.00">{e s} </text>
+<text text-anchor="middle" x="299.635" y="-3599.67" font-family="Times,serif" font-size="14.00"> subcircuit or style</text>
+</g>
+<!-- e&#45;&gt;e_s -->
+<g id="edge11" class="edge"><title>e&#45;&gt;e_s</title>
+<path fill="none" stroke="black" d="M63.3633,-3025.9C66.5415,-3082.97 80.5438,-3256.74 137,-3386.87 171.355,-3466.06 237.308,-3544.63 273.44,-3584.3"/>
+<polygon fill="black" stroke="black" points="270.904,-3586.72 280.25,-3591.71 276.057,-3581.98 270.904,-3586.72"/>
+</g>
+<!-- e_g -->
+<g id="node16" class="node"><title>e_g</title>
+<polygon fill="none" stroke="black" points="335.635,-3377.87 263.635,-3377.87 263.635,-3339.87 335.635,-3339.87 335.635,-3377.87"/>
+<text text-anchor="middle" x="299.635" y="-3362.67" font-family="Times,serif" font-size="14.00">{e g} </text>
+<text text-anchor="middle" x="299.635" y="-3347.67" font-family="Times,serif" font-size="14.00"> geometry</text>
+</g>
+<!-- e&#45;&gt;e_g -->
+<g id="edge12" class="edge"><title>e&#45;&gt;e_g</title>
+<path fill="none" stroke="black" d="M64.1951,-3026.3C70.1236,-3089.6 92.0524,-3288.31 137,-3330.87 167.679,-3359.92 217.083,-3364.7 253.206,-3363.59"/>
+<polygon fill="black" stroke="black" points="253.66,-3367.07 263.484,-3363.11 253.33,-3360.08 253.66,-3367.07"/>
+</g>
+<!-- e_c -->
+<g id="node86" class="node"><title>e_c</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3294.87" rx="105.218" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3298.67" font-family="Times,serif" font-size="14.00">{e c} </text>
+<text text-anchor="middle" x="299.635" y="-3283.67" font-family="Times,serif" font-size="14.00">Copy selection to buffer</text>
+</g>
+<!-- e&#45;&gt;e_c -->
+<g id="edge72" class="edge"><title>e&#45;&gt;e_c</title>
+<path fill="none" stroke="black" d="M62.0536,-3025.98C62.0595,-3073.04 68.982,-3195.35 137,-3258.87 150.956,-3271.9 168.551,-3280.6 186.957,-3286.33"/>
+<polygon fill="black" stroke="black" points="186.067,-3289.71 196.642,-3289.06 187.968,-3282.97 186.067,-3289.71"/>
+</g>
+<!-- e_d -->
+<g id="node87" class="node"><title>e_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3222.87" rx="70.0071" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3226.67" font-family="Times,serif" font-size="14.00">{e d} </text>
+<text text-anchor="middle" x="299.635" y="-3211.67" font-family="Times,serif" font-size="14.00">Remove object</text>
+</g>
+<!-- e&#45;&gt;e_d -->
+<g id="edge73" class="edge"><title>e&#45;&gt;e_d</title>
+<path fill="none" stroke="black" d="M64.6531,-3026C69.8833,-3063.06 86.7645,-3144.66 137,-3186.87 159.84,-3206.06 190.721,-3215.61 219.371,-3220.18"/>
+<polygon fill="black" stroke="black" points="219.003,-3223.66 229.395,-3221.59 219.983,-3216.73 219.003,-3223.66"/>
+</g>
+<!-- e_f -->
+<g id="node88" class="node"><title>e_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3150.87" rx="66.4361" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3154.67" font-family="Times,serif" font-size="14.00">{e f} </text>
+<text text-anchor="middle" x="299.635" y="-3139.67" font-family="Times,serif" font-size="14.00">Object flags...</text>
+</g>
+<!-- e&#45;&gt;e_f -->
+<g id="edge74" class="edge"><title>e&#45;&gt;e_f</title>
+<path fill="none" stroke="black" d="M70.4181,-3026.2C81.5278,-3050.79 104.134,-3092.72 137,-3114.87 162.378,-3131.97 194.598,-3141.08 223.582,-3145.88"/>
+<polygon fill="black" stroke="black" points="223.272,-3149.37 233.682,-3147.4 224.316,-3142.45 223.272,-3149.37"/>
+</g>
+<!-- e_i -->
+<g id="node96" class="node"><title>e_i</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3078.87" rx="55.3091" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3082.67" font-family="Times,serif" font-size="14.00">{e i} </text>
+<text text-anchor="middle" x="299.635" y="-3067.67" font-family="Times,serif" font-size="14.00">Flip Object</text>
+</g>
+<!-- e&#45;&gt;e_i -->
+<g id="edge82" class="edge"><title>e&#45;&gt;e_i</title>
+<path fill="none" stroke="black" d="M88.7613,-3021.4C102.751,-3028.67 120.447,-3037.11 137,-3042.87 169.203,-3054.07 206.258,-3062.62 236.758,-3068.57"/>
+<polygon fill="black" stroke="black" points="236.355,-3072.05 246.833,-3070.49 237.665,-3065.18 236.355,-3072.05"/>
+</g>
+<!-- e_j -->
+<g id="node97" class="node"><title>e_j</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3006.87" rx="84.7059" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3010.67" font-family="Times,serif" font-size="14.00">{e j} </text>
+<text text-anchor="middle" x="299.635" y="-2995.67" font-family="Times,serif" font-size="14.00">ChangeJoin Object</text>
+</g>
+<!-- e&#45;&gt;e_j -->
+<g id="edge83" class="edge"><title>e&#45;&gt;e_j</title>
+<path fill="none" stroke="black" d="M88.6728,-3006.87C116.628,-3006.87 162.57,-3006.87 204.362,-3006.87"/>
+<polygon fill="black" stroke="black" points="204.603,-3010.37 214.603,-3006.87 204.603,-3003.37 204.603,-3010.37"/>
+</g>
+<!-- e_l -->
+<g id="node98" class="node"><title>e_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2934.87" rx="96.3333" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2938.67" font-family="Times,serif" font-size="14.00">{e l} </text>
+<text text-anchor="middle" x="299.635" y="-2923.67" font-family="Times,serif" font-size="14.00">Move to current layer</text>
+</g>
+<!-- e&#45;&gt;e_l -->
+<g id="edge84" class="edge"><title>e&#45;&gt;e_l</title>
+<path fill="none" stroke="black" d="M88.7613,-2992.34C102.751,-2985.07 120.447,-2976.63 137,-2970.87 159.572,-2963.02 184.527,-2956.47 207.938,-2951.21"/>
+<polygon fill="black" stroke="black" points="208.848,-2954.59 217.866,-2949.03 207.348,-2947.76 208.848,-2954.59"/>
+</g>
+<!-- e_o -->
+<g id="node99" class="node"><title>e_o</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2862.87" rx="150.728" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2866.67" font-family="Times,serif" font-size="14.00">{e o} </text>
+<text text-anchor="middle" x="299.635" y="-2851.67" font-family="Times,serif" font-size="14.00">Edit name of/Change font on layout</text>
+</g>
+<!-- e&#45;&gt;e_o -->
+<g id="edge85" class="edge"><title>e&#45;&gt;e_o</title>
+<path fill="none" stroke="black" d="M70.4181,-2987.54C81.5278,-2962.95 104.134,-2921.02 137,-2898.87 146.778,-2892.28 157.572,-2886.88 168.805,-2882.45"/>
+<polygon fill="black" stroke="black" points="170.148,-2885.69 178.332,-2878.96 167.738,-2879.11 170.148,-2885.69"/>
+</g>
+<!-- e_p -->
+<g id="node100" class="node"><title>e_p</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2790.87" rx="86.0347" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2794.67" font-family="Times,serif" font-size="14.00">{e p} </text>
+<text text-anchor="middle" x="299.635" y="-2779.67" font-family="Times,serif" font-size="14.00">Object Properties...</text>
+</g>
+<!-- e&#45;&gt;e_p -->
+<g id="edge86" class="edge"><title>e&#45;&gt;e_p</title>
+<path fill="none" stroke="black" d="M64.6531,-2987.74C69.8833,-2950.68 86.7645,-2869.08 137,-2826.87 155.766,-2811.1 179.958,-2801.85 203.883,-2796.51"/>
+<polygon fill="black" stroke="black" points="204.631,-2799.93 213.741,-2794.52 203.246,-2793.07 204.631,-2799.93"/>
+</g>
+<!-- e_t -->
+<g id="node105" class="node"><title>e_t</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2718.87" rx="60.623" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2722.67" font-family="Times,serif" font-size="14.00">{e t} </text>
+<text text-anchor="middle" x="299.635" y="-2707.67" font-family="Times,serif" font-size="14.00">text or name</text>
+</g>
+<!-- e&#45;&gt;e_t -->
+<g id="edge91" class="edge"><title>e&#45;&gt;e_t</title>
+<path fill="none" stroke="black" d="M62.0536,-2987.76C62.0595,-2940.7 68.982,-2818.39 137,-2754.87 161.457,-2732.03 197.091,-2722.52 228.681,-2718.93"/>
+<polygon fill="black" stroke="black" points="229.154,-2722.4 238.776,-2717.97 228.489,-2715.44 229.154,-2722.4"/>
+</g>
+<!-- e_v -->
+<g id="node106" class="node"><title>e_v</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2646.87" rx="94.5053" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2650.67" font-family="Times,serif" font-size="14.00">{e v} </text>
+<text text-anchor="middle" x="299.635" y="-2635.67" font-family="Times,serif" font-size="14.00">Paste buffer to layout</text>
+</g>
+<!-- e&#45;&gt;e_v -->
+<g id="edge92" class="edge"><title>e&#45;&gt;e_v</title>
+<path fill="none" stroke="black" d="M64.276,-2987.53C70.4563,-2924.48 93.0785,-2726.49 137,-2682.87 152.743,-2667.23 173.685,-2657.75 195.26,-2652.14"/>
+<polygon fill="black" stroke="black" points="196.256,-2655.5 205.201,-2649.82 194.668,-2648.68 196.256,-2655.5"/>
+</g>
+<!-- e_x -->
+<g id="node107" class="node"><title>e_x</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2574.87" rx="98.0761" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2578.67" font-family="Times,serif" font-size="14.00">{e x} </text>
+<text text-anchor="middle" x="299.635" y="-2563.67" font-family="Times,serif" font-size="14.00">Cut selection to buffer</text>
+</g>
+<!-- e&#45;&gt;e_x -->
+<g id="edge93" class="edge"><title>e&#45;&gt;e_x</title>
+<path fill="none" stroke="black" d="M63.4068,-2987.4C67.1599,-2915.44 83.8622,-2665.8 137,-2610.87 151.754,-2595.62 171.436,-2586.17 191.979,-2580.44"/>
+<polygon fill="black" stroke="black" points="192.933,-2583.81 201.788,-2578 191.238,-2577.02 192.933,-2583.81"/>
+</g>
+<!-- e_y -->
+<g id="node108" class="node"><title>e_y</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-2502.87" rx="117.26" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-2506.67" font-family="Times,serif" font-size="14.00">{e y} </text>
+<text text-anchor="middle" x="299.635" y="-2491.67" font-family="Times,serif" font-size="14.00">Cycle object being dragged</text>
+</g>
+<!-- e&#45;&gt;e_y -->
+<g id="edge94" class="edge"><title>e&#45;&gt;e_y</title>
+<path fill="none" stroke="black" d="M62.7824,-2987.82C64.3557,-2908.48 74.4336,-2605.39 137,-2538.87 147.825,-2527.36 161.453,-2519.13 176.18,-2513.31"/>
+<polygon fill="black" stroke="black" points="177.748,-2516.47 185.998,-2509.82 175.403,-2509.87 177.748,-2516.47"/>
+</g>
+<!-- e_s_b -->
+<g id="node101" class="node"><title>e_s_b</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3790.87" rx="77.5641" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3794.67" font-family="Times,serif" font-size="14.00">{e s b} </text>
+<text text-anchor="middle" x="649.51" y="-3779.67" font-family="Times,serif" font-size="14.00">Layer bindings...</text>
+</g>
+<!-- e_s&#45;&gt;e_s_b -->
+<g id="edge87" class="edge"><title>e_s&#45;&gt;e_s_b</title>
+<path fill="none" stroke="black" d="M358.653,-3605.03C393.575,-3604.92 436.183,-3611.41 462.269,-3638.87 498.033,-3676.52 441.16,-3716.61 476.269,-3754.87 497.888,-3778.43 530.623,-3788.74 561.77,-3792.7"/>
+<polygon fill="black" stroke="black" points="561.495,-3796.19 571.81,-3793.77 562.238,-3789.23 561.495,-3796.19"/>
+</g>
+<!-- e_s_e -->
+<g id="node102" class="node"><title>e_s_e</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3718.87" rx="77.1494" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3722.67" font-family="Times,serif" font-size="14.00">{e s e} </text>
+<text text-anchor="middle" x="649.51" y="-3707.67" font-family="Times,serif" font-size="14.00">External editor...</text>
+</g>
+<!-- e_s&#45;&gt;e_s_e -->
+<g id="edge88" class="edge"><title>e_s&#45;&gt;e_s_e</title>
+<path fill="none" stroke="black" d="M358.888,-3606.85C392.802,-3607.64 434.258,-3614.44 462.269,-3638.87 477.736,-3652.36 461.037,-3669.12 476.269,-3682.87 499.493,-3703.84 531.704,-3713.79 561.994,-3718.19"/>
+<polygon fill="black" stroke="black" points="561.817,-3721.69 572.177,-3719.47 562.694,-3714.75 561.817,-3721.69"/>
+</g>
+<!-- e_s_r -->
+<g id="node103" class="node"><title>e_s_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3646.87" rx="40.1111" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3650.67" font-family="Times,serif" font-size="14.00">{e s r} </text>
+<text text-anchor="middle" x="649.51" y="-3635.67" font-family="Times,serif" font-size="14.00">Refdes</text>
+</g>
+<!-- e_s&#45;&gt;e_s_r -->
+<g id="edge89" class="edge"><title>e_s&#45;&gt;e_s_r</title>
+<path fill="none" stroke="black" d="M358.861,-3616.9C426.287,-3623.87 536.167,-3635.24 599.436,-3641.79"/>
+<polygon fill="black" stroke="black" points="599.247,-3645.29 609.554,-3642.84 599.968,-3638.33 599.247,-3645.29"/>
+</g>
+<!-- e_s_s -->
+<g id="node104" class="node"><title>e_s_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3574.87" rx="70.922" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3578.67" font-family="Times,serif" font-size="14.00">{e s s} </text>
+<text text-anchor="middle" x="649.51" y="-3563.67" font-family="Times,serif" font-size="14.00">Set Same Style</text>
+</g>
+<!-- e_s&#45;&gt;e_s_s -->
+<g id="edge90" class="edge"><title>e_s&#45;&gt;e_s_s</title>
+<path fill="none" stroke="black" d="M358.861,-3604.84C417.062,-3598.82 506.896,-3589.53 571.079,-3582.88"/>
+<polygon fill="black" stroke="black" points="571.565,-3586.35 581.151,-3581.84 570.844,-3579.39 571.565,-3586.35"/>
+</g>
+<!-- e_g_c -->
+<g id="node89" class="node"><title>e_g_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3502.87" rx="79.3924" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3506.67" font-family="Times,serif" font-size="14.00">{e g c} </text>
+<text text-anchor="middle" x="649.51" y="-3491.67" font-family="Times,serif" font-size="14.00">Clearance +2 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_c -->
+<g id="edge75" class="edge"><title>e_g&#45;&gt;e_g_c</title>
+<path fill="none" stroke="black" d="M325.338,-3377.93C358.056,-3402.23 418.397,-3443.84 476.269,-3466.87 504.326,-3478.03 536.396,-3485.94 565.196,-3491.45"/>
+<polygon fill="black" stroke="black" points="564.766,-3494.93 575.234,-3493.3 566.033,-3488.04 564.766,-3494.93"/>
+</g>
+<!-- e_g_c&#45;shift -->
+<g id="node90" class="node"><title>e_g_c&#45;shift</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3430.87" rx="76.2353" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3434.67" font-family="Times,serif" font-size="14.00">{e g c&#45;shift} </text>
+<text text-anchor="middle" x="649.51" y="-3419.67" font-family="Times,serif" font-size="14.00">Clearance &#45;2 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_c&#45;shift -->
+<g id="edge76" class="edge"><title>e_g&#45;&gt;e_g_c&#45;shift</title>
+<path fill="none" stroke="black" d="M335.905,-3366.17C391.254,-3377.63 499.763,-3400.08 573.214,-3415.29"/>
+<polygon fill="black" stroke="black" points="572.835,-3418.78 583.337,-3417.38 574.254,-3411.93 572.835,-3418.78"/>
+</g>
+<!-- e_g_d -->
+<g id="node91" class="node"><title>e_g_d</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3358.87" rx="88.2768" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3362.67" font-family="Times,serif" font-size="14.00">{e g d} </text>
+<text text-anchor="middle" x="649.51" y="-3347.67" font-family="Times,serif" font-size="14.00">ChangeDrill +5 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_d -->
+<g id="edge77" class="edge"><title>e_g&#45;&gt;e_g_d</title>
+<path fill="none" stroke="black" d="M335.905,-3358.87C385.79,-3358.87 478.858,-3358.87 550.522,-3358.87"/>
+<polygon fill="black" stroke="black" points="550.932,-3362.37 560.932,-3358.87 550.932,-3355.37 550.932,-3362.37"/>
+</g>
+<!-- e_g_d&#45;shift -->
+<g id="node92" class="node"><title>e_g_d&#45;shift</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3286.87" rx="85.6199" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3290.67" font-family="Times,serif" font-size="14.00">{e g d&#45;shift} </text>
+<text text-anchor="middle" x="649.51" y="-3275.67" font-family="Times,serif" font-size="14.00">ChangeDrill &#45;5 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_d&#45;shift -->
+<g id="edge78" class="edge"><title>e_g&#45;&gt;e_g_d&#45;shift</title>
+<path fill="none" stroke="black" d="M335.9,-3356.31C369.262,-3353.06 420.33,-3345.96 462.269,-3330.87 469.012,-3328.44 469.569,-3325.41 476.269,-3322.87 503.107,-3312.69 533.447,-3305.13 561.104,-3299.64"/>
+<polygon fill="black" stroke="black" points="561.999,-3303.04 571.16,-3297.71 560.68,-3296.16 561.999,-3303.04"/>
+</g>
+<!-- e_g_s -->
+<g id="node93" class="node"><title>e_g_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3214.87" rx="86.0347" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3218.67" font-family="Times,serif" font-size="14.00">{e g s} </text>
+<text text-anchor="middle" x="649.51" y="-3203.67" font-family="Times,serif" font-size="14.00">ChangeSize +5 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_s -->
+<g id="edge79" class="edge"><title>e_g&#45;&gt;e_g_s</title>
+<path fill="none" stroke="black" d="M335.785,-3363.43C372.524,-3366.06 429.315,-3363.77 462.269,-3330.87 487.815,-3305.37 451.167,-3276.81 476.269,-3250.87 496.318,-3230.15 524.993,-3219.82 553.208,-3215.03"/>
+<polygon fill="black" stroke="black" points="553.775,-3218.48 563.155,-3213.55 552.75,-3211.56 553.775,-3218.48"/>
+</g>
+<!-- e_g_s&#45;shift -->
+<g id="node94" class="node"><title>e_g_s&#45;shift</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3142.87" rx="84.2917" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3146.67" font-family="Times,serif" font-size="14.00">{e g s&#45;shift} </text>
+<text text-anchor="middle" x="649.51" y="-3131.67" font-family="Times,serif" font-size="14.00">ChangeSize &#45;5 mil</text>
+</g>
+<!-- e_g&#45;&gt;e_g_s&#45;shift -->
+<g id="edge80" class="edge"><title>e_g&#45;&gt;e_g_s&#45;shift</title>
+<path fill="none" stroke="black" d="M335.64,-3363.89C372.81,-3367.04 430.488,-3365.29 462.269,-3330.87 485.28,-3305.95 453.691,-3204.19 476.269,-3178.87 496.273,-3156.44 526.339,-3145.93 555.779,-3141.5"/>
+<polygon fill="black" stroke="black" points="556.252,-3144.97 565.724,-3140.22 555.359,-3138.02 556.252,-3144.97"/>
+</g>
+<!-- e_g_y -->
+<g id="node95" class="node"><title>e_g_y</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-3070.87" rx="117.26" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-3074.67" font-family="Times,serif" font-size="14.00">{e g y} </text>
+<text text-anchor="middle" x="649.51" y="-3059.67" font-family="Times,serif" font-size="14.00">ChangeSizes to Route style</text>
+</g>
+<!-- e_g&#45;&gt;e_g_y -->
+<g id="edge81" class="edge"><title>e_g&#45;&gt;e_g_y</title>
+<path fill="none" stroke="black" d="M335.836,-3364.07C373.175,-3367.37 430.998,-3365.75 462.269,-3330.87 495.561,-3293.73 443.624,-3144.58 476.269,-3106.87 488.585,-3092.64 504.946,-3083.18 522.691,-3077.01"/>
+<polygon fill="black" stroke="black" points="524.162,-3080.22 532.676,-3073.91 522.088,-3073.53 524.162,-3080.22"/>
+</g>
+<!-- g -->
+<g id="node17" class="node"><title>g</title>
+<polygon fill="none" stroke="black" points="88.5,-4037.87 34.5,-4037.87 34.5,-3999.87 88.5,-3999.87 88.5,-4037.87"/>
+<text text-anchor="middle" x="61.5" y="-4022.67" font-family="Times,serif" font-size="14.00">{g} </text>
+<text text-anchor="middle" x="61.5" y="-4007.67" font-family="Times,serif" font-size="14.00"> grid</text>
+</g>
+<!-- g_b -->
+<g id="node120" class="node"><title>g_b</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4306.87" rx="62.8651" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4310.67" font-family="Times,serif" font-size="14.00">{g b} </text>
+<text text-anchor="middle" x="299.635" y="-4295.67" font-family="Times,serif" font-size="14.00">Previous grid</text>
+</g>
+<!-- g&#45;&gt;g_b -->
+<g id="edge106" class="edge"><title>g&#45;&gt;g_b</title>
+<path fill="none" stroke="black" d="M62.0536,-4037.98C62.0595,-4085.04 68.982,-4207.35 137,-4270.87 160.785,-4293.08 195.141,-4302.69 226.067,-4306.5"/>
+<polygon fill="black" stroke="black" points="226.095,-4310.02 236.404,-4307.58 226.821,-4303.06 226.095,-4310.02"/>
+</g>
+<!-- g_d -->
+<g id="node121" class="node"><title>g_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4234.87" rx="41.9398" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4238.67" font-family="Times,serif" font-size="14.00">{g d} </text>
+<text text-anchor="middle" x="299.635" y="-4223.67" font-family="Times,serif" font-size="14.00">Grid *2</text>
+</g>
+<!-- g&#45;&gt;g_d -->
+<g id="edge107" class="edge"><title>g&#45;&gt;g_d</title>
+<path fill="none" stroke="black" d="M64.6531,-4038C69.8833,-4075.06 86.7645,-4156.66 137,-4198.87 167.62,-4224.6 212.69,-4232.99 247.464,-4235.3"/>
+<polygon fill="black" stroke="black" points="247.733,-4238.82 257.898,-4235.83 248.089,-4231.83 247.733,-4238.82"/>
+</g>
+<!-- g_f -->
+<g id="node122" class="node"><title>g_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4162.87" rx="48.1667" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4166.67" font-family="Times,serif" font-size="14.00">{g f} </text>
+<text text-anchor="middle" x="299.635" y="-4151.67" font-family="Times,serif" font-size="14.00">Next grid</text>
+</g>
+<!-- g&#45;&gt;g_f -->
+<g id="edge108" class="edge"><title>g&#45;&gt;g_f</title>
+<path fill="none" stroke="black" d="M70.4181,-4038.2C81.5278,-4062.79 104.134,-4104.72 137,-4126.87 167.654,-4147.53 208.293,-4156.52 241.152,-4160.35"/>
+<polygon fill="black" stroke="black" points="241.218,-4163.87 251.525,-4161.42 241.937,-4156.91 241.218,-4163.87"/>
+</g>
+<!-- g_h -->
+<g id="node123" class="node"><title>g_h</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4090.87" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4094.67" font-family="Times,serif" font-size="14.00">{g h} </text>
+<text text-anchor="middle" x="299.635" y="-4079.67" font-family="Times,serif" font-size="14.00">Grid /2</text>
+</g>
+<!-- g&#45;&gt;g_h -->
+<g id="edge109" class="edge"><title>g&#45;&gt;g_h</title>
+<path fill="none" stroke="black" d="M88.7613,-4033.4C102.751,-4040.67 120.447,-4049.11 137,-4054.87 174.244,-4067.82 217.976,-4077.23 250.554,-4083.17"/>
+<polygon fill="black" stroke="black" points="250.258,-4086.67 260.717,-4084.98 251.484,-4079.78 250.258,-4086.67"/>
+</g>
+<!-- g_i -->
+<g id="node124" class="node"><title>g_i</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4018.87" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4022.67" font-family="Times,serif" font-size="14.00">{g i} </text>
+<text text-anchor="middle" x="299.635" y="-4007.67" font-family="Times,serif" font-size="14.00">mil</text>
+</g>
+<!-- g&#45;&gt;g_i -->
+<g id="edge110" class="edge"><title>g&#45;&gt;g_i</title>
+<path fill="none" stroke="black" d="M88.6728,-4018.87C128.946,-4018.87 206.552,-4018.87 255.299,-4018.87"/>
+<polygon fill="black" stroke="black" points="255.537,-4022.37 265.537,-4018.87 255.537,-4015.37 255.537,-4022.37"/>
+</g>
+<!-- g_l -->
+<g id="node125" class="node"><title>g_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3946.87" rx="77.5641" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3950.67" font-family="Times,serif" font-size="14.00">{g l} </text>
+<text text-anchor="middle" x="299.635" y="-3935.67" font-family="Times,serif" font-size="14.00">Enable local grid</text>
+</g>
+<!-- g&#45;&gt;g_l -->
+<g id="edge111" class="edge"><title>g&#45;&gt;g_l</title>
+<path fill="none" stroke="black" d="M88.7613,-4004.34C102.751,-3997.07 120.447,-3988.63 137,-3982.87 163.366,-3973.7 192.983,-3966.31 219.593,-3960.67"/>
+<polygon fill="black" stroke="black" points="220.548,-3964.04 229.631,-3958.59 219.129,-3957.19 220.548,-3964.04"/>
+</g>
+<!-- g_m -->
+<g id="node126" class="node"><title>g_m</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3874.87" rx="39.6962" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3878.67" font-family="Times,serif" font-size="14.00">{g m} </text>
+<text text-anchor="middle" x="299.635" y="-3863.67" font-family="Times,serif" font-size="14.00">mm</text>
+</g>
+<!-- g&#45;&gt;g_m -->
+<g id="edge112" class="edge"><title>g&#45;&gt;g_m</title>
+<path fill="none" stroke="black" d="M70.4181,-3999.54C81.5278,-3974.95 104.134,-3933.02 137,-3910.87 170.38,-3888.37 215.598,-3879.72 249.719,-3876.49"/>
+<polygon fill="black" stroke="black" points="250.246,-3879.96 259.927,-3875.65 249.674,-3872.98 250.246,-3879.96"/>
+</g>
+<!-- g_r -->
+<g id="node127" class="node"><title>g_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3802.87" rx="59.2941" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3806.67" font-family="Times,serif" font-size="14.00">{g r} </text>
+<text text-anchor="middle" x="299.635" y="-3791.67" font-family="Times,serif" font-size="14.00">Realign grid</text>
+</g>
+<!-- g&#45;&gt;g_r -->
+<g id="edge113" class="edge"><title>g&#45;&gt;g_r</title>
+<path fill="none" stroke="black" d="M64.6531,-3999.74C69.8833,-3962.68 86.7645,-3881.08 137,-3838.87 162.721,-3817.26 198.638,-3807.88 230.084,-3804.06"/>
+<polygon fill="black" stroke="black" points="230.538,-3807.53 240.118,-3803.01 229.808,-3800.57 230.538,-3807.53"/>
+</g>
+<!-- g_v -->
+<g id="node128" class="node"><title>g_v</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-3730.87" rx="84.2917" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-3734.67" font-family="Times,serif" font-size="14.00">{g v} </text>
+<text text-anchor="middle" x="299.635" y="-3719.67" font-family="Times,serif" font-size="14.00">Enable visible grid</text>
+</g>
+<!-- g&#45;&gt;g_v -->
+<g id="edge114" class="edge"><title>g&#45;&gt;g_v</title>
+<path fill="none" stroke="black" d="M62.0536,-3999.76C62.0595,-3952.7 68.982,-3830.39 137,-3766.87 155.641,-3749.46 180.776,-3739.79 205.664,-3734.59"/>
+<polygon fill="black" stroke="black" points="206.357,-3738.03 215.546,-3732.75 205.074,-3731.14 206.357,-3738.03"/>
+</g>
+<!-- f -->
+<g id="node18" class="node"><title>f</title>
+<polygon fill="none" stroke="black" points="88.5,-4757.87 34.5,-4757.87 34.5,-4719.87 88.5,-4719.87 88.5,-4757.87"/>
+<text text-anchor="middle" x="61.5" y="-4742.67" font-family="Times,serif" font-size="14.00">{f} </text>
+<text text-anchor="middle" x="61.5" y="-4727.67" font-family="Times,serif" font-size="14.00"> file</text>
+</g>
+<!-- f_x -->
+<g id="node19" class="node"><title>f_x</title>
+<polygon fill="none" stroke="black" points="334.135,-5101.87 265.135,-5101.87 265.135,-5063.87 334.135,-5063.87 334.135,-5101.87"/>
+<text text-anchor="middle" x="299.635" y="-5086.67" font-family="Times,serif" font-size="14.00">{f x} </text>
+<text text-anchor="middle" x="299.635" y="-5071.67" font-family="Times,serif" font-size="14.00"> export to</text>
+</g>
+<!-- f&#45;&gt;f_x -->
+<g id="edge13" class="edge"><title>f&#45;&gt;f_x</title>
+<path fill="none" stroke="black" d="M64.5135,-4758.12C71.2701,-4818.98 95.0975,-5005.72 137,-5046.87 167.898,-5077.21 218.396,-5084.31 254.731,-5085.01"/>
+<polygon fill="black" stroke="black" points="255.032,-5088.52 265.045,-5085.05 255.057,-5081.52 255.032,-5088.52"/>
+</g>
+<!-- f_c -->
+<g id="node20" class="node"><title>f_c</title>
+<polygon fill="none" stroke="black" points="346.135,-5037.87 253.135,-5037.87 253.135,-4999.87 346.135,-4999.87 346.135,-5037.87"/>
+<text text-anchor="middle" x="299.635" y="-5022.67" font-family="Times,serif" font-size="14.00">{f c} </text>
+<text text-anchor="middle" x="299.635" y="-5007.67" font-family="Times,serif" font-size="14.00"> configuration</text>
+</g>
+<!-- f&#45;&gt;f_c -->
+<g id="edge14" class="edge"><title>f&#45;&gt;f_c</title>
+<path fill="none" stroke="black" d="M61.8688,-4758.18C61.4529,-4805.71 67.489,-4928.98 137,-4990.87 165.433,-5016.18 208.242,-5022.7 242.662,-5023.14"/>
+<polygon fill="black" stroke="black" points="243.064,-5026.64 253.05,-5023.1 243.035,-5019.64 243.064,-5026.64"/>
+</g>
+<!-- f_a -->
+<g id="node109" class="node"><title>f_a</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4954.87" rx="81.135" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4958.67" font-family="Times,serif" font-size="14.00">{f a} </text>
+<text text-anchor="middle" x="299.635" y="-4943.67" font-family="Times,serif" font-size="14.00">Save Layout As...</text>
+</g>
+<!-- f&#45;&gt;f_a -->
+<g id="edge95" class="edge"><title>f&#45;&gt;f_a</title>
+<path fill="none" stroke="black" d="M64.6531,-4758C69.8833,-4795.06 86.7645,-4876.66 137,-4918.87 157.015,-4935.69 183.204,-4945.1 208.656,-4950.24"/>
+<polygon fill="black" stroke="black" points="208.272,-4953.73 218.736,-4952.08 209.523,-4946.84 208.272,-4953.73"/>
+</g>
+<!-- f_e -->
+<g id="node111" class="node"><title>f_e</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4882.87" rx="72.25" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4886.67" font-family="Times,serif" font-size="14.00">{f e} </text>
+<text text-anchor="middle" x="299.635" y="-4871.67" font-family="Times,serif" font-size="14.00">Export layout...</text>
+</g>
+<!-- f&#45;&gt;f_e -->
+<g id="edge97" class="edge"><title>f&#45;&gt;f_e</title>
+<path fill="none" stroke="black" d="M70.4181,-4758.2C81.5278,-4782.79 104.134,-4824.72 137,-4846.87 160.78,-4862.9 190.569,-4871.9 218.073,-4876.92"/>
+<polygon fill="black" stroke="black" points="217.648,-4880.4 228.088,-4878.59 218.802,-4873.49 217.648,-4880.4"/>
+</g>
+<!-- f_l -->
+<g id="node112" class="node"><title>f_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4810.87" rx="65.5227" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4814.67" font-family="Times,serif" font-size="14.00">{f l} </text>
+<text text-anchor="middle" x="299.635" y="-4799.67" font-family="Times,serif" font-size="14.00">Load layout...</text>
+</g>
+<!-- f&#45;&gt;f_l -->
+<g id="edge98" class="edge"><title>f&#45;&gt;f_l</title>
+<path fill="none" stroke="black" d="M88.7613,-4753.4C102.751,-4760.67 120.447,-4769.11 137,-4774.87 166.27,-4785.05 199.547,-4793.04 228.268,-4798.88"/>
+<polygon fill="black" stroke="black" points="227.733,-4802.34 238.223,-4800.85 229.096,-4795.47 227.733,-4802.34"/>
+</g>
+<!-- f_n -->
+<g id="node113" class="node"><title>f_n</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4738.87" rx="79.8063" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4742.67" font-family="Times,serif" font-size="14.00">{f n} </text>
+<text text-anchor="middle" x="299.635" y="-4727.67" font-family="Times,serif" font-size="14.00">Start New Layout</text>
+</g>
+<!-- f&#45;&gt;f_n -->
+<g id="edge99" class="edge"><title>f&#45;&gt;f_n</title>
+<path fill="none" stroke="black" d="M88.6728,-4738.87C117.743,-4738.87 166.264,-4738.87 209.343,-4738.87"/>
+<polygon fill="black" stroke="black" points="209.586,-4742.37 219.586,-4738.87 209.586,-4735.37 209.586,-4742.37"/>
+</g>
+<!-- f_o -->
+<g id="node114" class="node"><title>f_o</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4666.87" rx="65.5227" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4670.67" font-family="Times,serif" font-size="14.00">{f o} </text>
+<text text-anchor="middle" x="299.635" y="-4655.67" font-family="Times,serif" font-size="14.00">Load layout...</text>
+</g>
+<!-- f&#45;&gt;f_o -->
+<g id="edge100" class="edge"><title>f&#45;&gt;f_o</title>
+<path fill="none" stroke="black" d="M88.7613,-4724.34C102.751,-4717.07 120.447,-4708.63 137,-4702.87 166.27,-4692.69 199.547,-4684.7 228.268,-4678.86"/>
+<polygon fill="black" stroke="black" points="229.096,-4682.27 238.223,-4676.89 227.733,-4675.4 229.096,-4682.27"/>
+</g>
+<!-- f_p -->
+<g id="node115" class="node"><title>f_p</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4594.87" rx="65.1077" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4598.67" font-family="Times,serif" font-size="14.00">{f p} </text>
+<text text-anchor="middle" x="299.635" y="-4583.67" font-family="Times,serif" font-size="14.00">Print layout...</text>
+</g>
+<!-- f&#45;&gt;f_p -->
+<g id="edge101" class="edge"><title>f&#45;&gt;f_p</title>
+<path fill="none" stroke="black" d="M70.4181,-4719.54C81.5278,-4694.95 104.134,-4653.02 137,-4630.87 162.697,-4613.55 195.411,-4604.43 224.676,-4599.68"/>
+<polygon fill="black" stroke="black" points="225.485,-4603.1 234.867,-4598.18 224.463,-4596.18 225.485,-4603.1"/>
+</g>
+<!-- f_q -->
+<g id="node116" class="node"><title>f_q</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4522.87" rx="65.1077" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4526.67" font-family="Times,serif" font-size="14.00">{f q} </text>
+<text text-anchor="middle" x="299.635" y="-4511.67" font-family="Times,serif" font-size="14.00">Quit Program</text>
+</g>
+<!-- f&#45;&gt;f_q -->
+<g id="edge102" class="edge"><title>f&#45;&gt;f_q</title>
+<path fill="none" stroke="black" d="M64.6531,-4719.74C69.8833,-4682.68 86.7645,-4601.08 137,-4558.87 161.127,-4538.6 194.224,-4529.09 224.188,-4524.84"/>
+<polygon fill="black" stroke="black" points="224.721,-4528.3 234.212,-4523.59 223.856,-4521.35 224.721,-4528.3"/>
+</g>
+<!-- f_r -->
+<g id="node117" class="node"><title>f_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4450.87" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4454.67" font-family="Times,serif" font-size="14.00">{f r} </text>
+<text text-anchor="middle" x="299.635" y="-4439.67" font-family="Times,serif" font-size="14.00">Revert</text>
+</g>
+<!-- f&#45;&gt;f_r -->
+<g id="edge103" class="edge"><title>f&#45;&gt;f_r</title>
+<path fill="none" stroke="black" d="M62.0536,-4719.76C62.0595,-4672.7 68.982,-4550.39 137,-4486.87 167.693,-4458.21 215.988,-4450.53 251.802,-4449.23"/>
+<polygon fill="black" stroke="black" points="252.09,-4452.72 262.015,-4449.01 251.944,-4445.72 252.09,-4452.72"/>
+</g>
+<!-- f_s -->
+<g id="node118" class="node"><title>f_s</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-4378.87" rx="60.2083" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-4382.67" font-family="Times,serif" font-size="14.00">{f s} </text>
+<text text-anchor="middle" x="299.635" y="-4367.67" font-family="Times,serif" font-size="14.00">Save Layout</text>
+</g>
+<!-- f&#45;&gt;f_s -->
+<g id="edge104" class="edge"><title>f&#45;&gt;f_s</title>
+<path fill="none" stroke="black" d="M64.276,-4719.53C70.4563,-4656.48 93.0785,-4458.49 137,-4414.87 161.02,-4391.01 197.142,-4381.49 229.15,-4378.16"/>
+<polygon fill="black" stroke="black" points="229.712,-4381.62 239.377,-4377.28 229.115,-4374.65 229.712,-4381.62"/>
+</g>
+<!-- f_x_p -->
+<g id="node119" class="node"><title>f_x_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5086.87" rx="135.529" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5090.67" font-family="Times,serif" font-size="14.00">{f x p} </text>
+<text text-anchor="middle" x="649.51" y="-5075.67" font-family="Times,serif" font-size="14.00">netlist patch for back annotation</text>
+</g>
+<!-- f_x&#45;&gt;f_x_p -->
+<g id="edge105" class="edge"><title>f_x&#45;&gt;f_x_p</title>
+<path fill="none" stroke="black" d="M334.306,-5083.26C373.556,-5083.71 441.022,-5084.48 503.4,-5085.2"/>
+<polygon fill="black" stroke="black" points="503.725,-5088.71 513.765,-5085.32 503.805,-5081.71 503.725,-5088.71"/>
+</g>
+<!-- f_c_p -->
+<g id="node110" class="node"><title>f_c_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5014.87" rx="82.0488" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5018.67" font-family="Times,serif" font-size="14.00">{f c p} </text>
+<text text-anchor="middle" x="649.51" y="-5003.67" font-family="Times,serif" font-size="14.00">Manage plugins...</text>
+</g>
+<!-- f_c&#45;&gt;f_c_p -->
+<g id="edge96" class="edge"><title>f_c&#45;&gt;f_c_p</title>
+<path fill="none" stroke="black" d="M346.471,-5018.34C399.82,-5017.73 489.246,-5016.7 556.984,-5015.92"/>
+<polygon fill="black" stroke="black" points="557.278,-5019.42 567.237,-5015.8 557.197,-5012.42 557.278,-5019.42"/>
+</g>
+<!-- i -->
+<g id="node21" class="node"><title>i</title>
+<polygon fill="none" stroke="black" points="88.5,-5309.87 34.5,-5309.87 34.5,-5271.87 88.5,-5271.87 88.5,-5309.87"/>
+<text text-anchor="middle" x="61.5" y="-5294.67" font-family="Times,serif" font-size="14.00">{i} </text>
+<text text-anchor="middle" x="61.5" y="-5279.67" font-family="Times,serif" font-size="14.00"> info</text>
+</g>
+<!-- i_c -->
+<g id="node22" class="node"><title>i_c</title>
+<polygon fill="none" stroke="black" points="346.135,-5445.87 253.135,-5445.87 253.135,-5407.87 346.135,-5407.87 346.135,-5445.87"/>
+<text text-anchor="middle" x="299.635" y="-5430.67" font-family="Times,serif" font-size="14.00">{i c} </text>
+<text text-anchor="middle" x="299.635" y="-5415.67" font-family="Times,serif" font-size="14.00"> configuration</text>
+</g>
+<!-- i&#45;&gt;i_c -->
+<g id="edge15" class="edge"><title>i&#45;&gt;i_c</title>
+<path fill="none" stroke="black" d="M70.0712,-5310.01C80.9386,-5334.81 103.424,-5377.38 137,-5398.87 168.279,-5418.88 209.626,-5425.77 242.671,-5427.72"/>
+<polygon fill="black" stroke="black" points="242.938,-5431.23 253.085,-5428.19 243.252,-5424.24 242.938,-5431.23"/>
+</g>
+<!-- i_a -->
+<g id="node129" class="node"><title>i_a</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-5362.87" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-5366.67" font-family="Times,serif" font-size="14.00">{i a} </text>
+<text text-anchor="middle" x="299.635" y="-5351.67" font-family="Times,serif" font-size="14.00">About...</text>
+</g>
+<!-- i&#45;&gt;i_a -->
+<g id="edge115" class="edge"><title>i&#45;&gt;i_a</title>
+<path fill="none" stroke="black" d="M88.7613,-5305.4C102.751,-5312.67 120.447,-5321.11 137,-5326.87 172.896,-5339.35 214.82,-5348.54 246.974,-5354.51"/>
+<polygon fill="black" stroke="black" points="246.587,-5358 257.051,-5356.34 247.835,-5351.11 246.587,-5358"/>
+</g>
+<!-- i_d -->
+<g id="node133" class="node"><title>i_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-5290.87" rx="103.889" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-5294.67" font-family="Times,serif" font-size="14.00">{i d} </text>
+<text text-anchor="middle" x="299.635" y="-5279.67" font-family="Times,serif" font-size="14.00">Generate drill summary</text>
+</g>
+<!-- i&#45;&gt;i_d -->
+<g id="edge119" class="edge"><title>i&#45;&gt;i_d</title>
+<path fill="none" stroke="black" d="M88.6728,-5290.87C112.436,-5290.87 149.196,-5290.87 185.356,-5290.87"/>
+<polygon fill="black" stroke="black" points="185.528,-5294.37 195.528,-5290.87 185.528,-5287.37 185.528,-5294.37"/>
+</g>
+<!-- i_f -->
+<g id="node134" class="node"><title>i_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-5218.87" rx="102.561" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-5222.67" font-family="Times,serif" font-size="14.00">{i f} </text>
+<text text-anchor="middle" x="299.635" y="-5207.67" font-family="Times,serif" font-size="14.00">Report found padstacks</text>
+</g>
+<!-- i&#45;&gt;i_f -->
+<g id="edge120" class="edge"><title>i&#45;&gt;i_f</title>
+<path fill="none" stroke="black" d="M88.7613,-5276.34C102.751,-5269.07 120.447,-5260.63 137,-5254.87 158.407,-5247.43 181.957,-5241.15 204.301,-5236.04"/>
+<polygon fill="black" stroke="black" points="205.134,-5239.44 214.13,-5233.84 203.608,-5232.6 205.134,-5239.44"/>
+</g>
+<!-- i_r -->
+<g id="node135" class="node"><title>i_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-5146.87" rx="97.6615" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-5150.67" font-family="Times,serif" font-size="14.00">{i r} </text>
+<text text-anchor="middle" x="299.635" y="-5135.67" font-family="Times,serif" font-size="14.00">Generate object report</text>
+</g>
+<!-- i&#45;&gt;i_r -->
+<g id="edge121" class="edge"><title>i&#45;&gt;i_r</title>
+<path fill="none" stroke="black" d="M70.4181,-5271.54C81.5278,-5246.95 104.134,-5205.02 137,-5182.87 154.699,-5170.94 175.727,-5162.9 196.664,-5157.5"/>
+<polygon fill="black" stroke="black" points="197.678,-5160.86 206.591,-5155.13 196.051,-5154.05 197.678,-5160.86"/>
+</g>
+<!-- i_c_c -->
+<g id="node130" class="node"><title>i_c_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5498.87" rx="83.3772" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5502.67" font-family="Times,serif" font-size="14.00">{i c c} </text>
+<text text-anchor="middle" x="649.51" y="-5487.67" font-family="Times,serif" font-size="14.00">Calibrate Printer...</text>
+</g>
+<!-- i_c&#45;&gt;i_c_c -->
+<g id="edge116" class="edge"><title>i_c&#45;&gt;i_c_c</title>
+<path fill="none" stroke="black" d="M346.471,-5436.36C403.007,-5448.06 500.059,-5468.15 568.879,-5482.39"/>
+<polygon fill="black" stroke="black" points="568.318,-5485.85 578.82,-5484.45 569.737,-5478.99 568.318,-5485.85"/>
+</g>
+<!-- i_c_p -->
+<g id="node131" class="node"><title>i_c_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5426.87" rx="64.1938" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5430.67" font-family="Times,serif" font-size="14.00">{i c p} </text>
+<text text-anchor="middle" x="649.51" y="-5415.67" font-family="Times,serif" font-size="14.00">Preferences...</text>
+</g>
+<!-- i_c&#45;&gt;i_c_p -->
+<g id="edge117" class="edge"><title>i_c&#45;&gt;i_c_p</title>
+<path fill="none" stroke="black" d="M346.471,-5426.87C404.558,-5426.87 505.416,-5426.87 574.479,-5426.87"/>
+<polygon fill="black" stroke="black" points="574.854,-5430.37 584.854,-5426.87 574.854,-5423.37 574.854,-5430.37"/>
+</g>
+<!-- i_c_r -->
+<g id="node132" class="node"><title>i_c_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5354.87" rx="120.831" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5358.67" font-family="Times,serif" font-size="14.00">{i c r} </text>
+<text text-anchor="middle" x="649.51" y="-5343.67" font-family="Times,serif" font-size="14.00">Re&#45;scan the footprint library</text>
+</g>
+<!-- i_c&#45;&gt;i_c_r -->
+<g id="edge118" class="edge"><title>i_c&#45;&gt;i_c_r</title>
+<path fill="none" stroke="black" d="M346.307,-5423.22C379.288,-5419.58 424.484,-5412.46 462.269,-5398.87 469.012,-5396.44 469.569,-5393.41 476.269,-5390.87 496.332,-5383.26 518.353,-5377.11 539.746,-5372.2"/>
+<polygon fill="black" stroke="black" points="540.518,-5375.62 549.522,-5370.03 539.001,-5368.78 540.518,-5375.62"/>
+</g>
+<!-- m -->
+<g id="node23" class="node"><title>m</title>
+<polygon fill="none" stroke="black" points="88.5,-6129.87 34.5,-6129.87 34.5,-6091.87 88.5,-6091.87 88.5,-6129.87"/>
+<text text-anchor="middle" x="61.5" y="-6114.67" font-family="Times,serif" font-size="14.00">{m} </text>
+<text text-anchor="middle" x="61.5" y="-6099.67" font-family="Times,serif" font-size="14.00"> mode</text>
+</g>
+<!-- m_c -->
+<g id="node24" class="node"><title>m_c</title>
+<polygon fill="none" stroke="black" points="370.135,-7245.87 229.135,-7245.87 229.135,-7207.87 370.135,-7207.87 370.135,-7245.87"/>
+<text text-anchor="middle" x="299.635" y="-7230.67" font-family="Times,serif" font-size="14.00">{m c} </text>
+<text text-anchor="middle" x="299.635" y="-7215.67" font-family="Times,serif" font-size="14.00"> cursor/crosshair mode</text>
+</g>
+<!-- m&#45;&gt;m_c -->
+<g id="edge16" class="edge"><title>m&#45;&gt;m_c</title>
+<path fill="none" stroke="black" d="M63.3982,-6130.16C68.4538,-6235.73 94.6542,-6744.16 137,-6894.87 170.674,-7014.72 246.266,-7143.78 280.806,-7199.11"/>
+<polygon fill="black" stroke="black" points="277.891,-7201.05 286.178,-7207.65 283.817,-7197.33 277.891,-7201.05"/>
+</g>
+<!-- m_d -->
+<g id="node25" class="node"><title>m_d</title>
+<polygon fill="none" stroke="black" points="372.635,-6885.87 226.635,-6885.87 226.635,-6847.87 372.635,-6847.87 372.635,-6885.87"/>
+<text text-anchor="middle" x="299.635" y="-6870.67" font-family="Times,serif" font-size="14.00">{m d} </text>
+<text text-anchor="middle" x="299.635" y="-6855.67" font-family="Times,serif" font-size="14.00"> drawing (render) mode</text>
+</g>
+<!-- m&#45;&gt;m_d -->
+<g id="edge17" class="edge"><title>m&#45;&gt;m_d</title>
+<path fill="none" stroke="black" d="M63.303,-6130.27C66.4548,-6194.7 80.7365,-6406.71 137,-6570.87 173.175,-6676.42 245.054,-6788.84 279.439,-6839.42"/>
+<polygon fill="black" stroke="black" points="276.673,-6841.58 285.212,-6847.85 282.448,-6837.62 276.673,-6841.58"/>
+</g>
+<!-- m_f -->
+<g id="node26" class="node"><title>m_f</title>
+<polygon fill="none" stroke="black" points="344.635,-6561.87 254.635,-6561.87 254.635,-6523.87 344.635,-6523.87 344.635,-6561.87"/>
+<text text-anchor="middle" x="299.635" y="-6546.67" font-family="Times,serif" font-size="14.00">{m f} </text>
+<text text-anchor="middle" x="299.635" y="-6531.67" font-family="Times,serif" font-size="14.00"> floater mode</text>
+</g>
+<!-- m&#45;&gt;m_f -->
+<g id="edge18" class="edge"><title>m&#45;&gt;m_f</title>
+<path fill="none" stroke="black" d="M72.9511,-6129.99C110.432,-6198.56 238.246,-6432.39 283.002,-6514.27"/>
+<polygon fill="black" stroke="black" points="280.169,-6516.38 288.036,-6523.48 286.311,-6513.03 280.169,-6516.38"/>
+</g>
+<!-- m_l -->
+<g id="node27" class="node"><title>m_l</title>
+<polygon fill="none" stroke="black" points="392.135,-6237.87 207.135,-6237.87 207.135,-6199.87 392.135,-6199.87 392.135,-6237.87"/>
+<text text-anchor="middle" x="299.635" y="-6222.67" font-family="Times,serif" font-size="14.00">{m l} </text>
+<text text-anchor="middle" x="299.635" y="-6207.67" font-family="Times,serif" font-size="14.00"> line drawing (routing) settings</text>
+</g>
+<!-- m&#45;&gt;m_l -->
+<g id="edge19" class="edge"><title>m&#45;&gt;m_l</title>
+<path fill="none" stroke="black" d="M88.6728,-6122.84C126.915,-6140.33 198.819,-6173.22 247.711,-6195.58"/>
+<polygon fill="black" stroke="black" points="246.313,-6198.79 256.862,-6199.76 249.224,-6192.42 246.313,-6198.79"/>
+</g>
+<!-- m_t -->
+<g id="node28" class="node"><title>m_t</title>
+<polygon fill="none" stroke="black" points="392.135,-6021.87 207.135,-6021.87 207.135,-5983.87 392.135,-5983.87 392.135,-6021.87"/>
+<text text-anchor="middle" x="299.635" y="-6006.67" font-family="Times,serif" font-size="14.00">{m t} </text>
+<text text-anchor="middle" x="299.635" y="-5991.67" font-family="Times,serif" font-size="14.00"> text drawing (routing) settings</text>
+</g>
+<!-- m&#45;&gt;m_t -->
+<g id="edge20" class="edge"><title>m&#45;&gt;m_t</title>
+<path fill="none" stroke="black" d="M88.6728,-6098.9C126.915,-6081.41 198.819,-6048.52 247.711,-6026.16"/>
+<polygon fill="black" stroke="black" points="249.224,-6029.32 256.862,-6021.98 246.313,-6022.95 249.224,-6029.32"/>
+</g>
+<!-- m_p -->
+<g id="node29" class="node"><title>m_p</title>
+<polygon fill="none" stroke="black" points="373.135,-5877.87 226.135,-5877.87 226.135,-5839.87 373.135,-5839.87 373.135,-5877.87"/>
+<text text-anchor="middle" x="299.635" y="-5862.67" font-family="Times,serif" font-size="14.00">{m p} </text>
+<text text-anchor="middle" x="299.635" y="-5847.67" font-family="Times,serif" font-size="14.00"> polygon drawing mode</text>
+</g>
+<!-- m&#45;&gt;m_p -->
+<g id="edge21" class="edge"><title>m&#45;&gt;m_p</title>
+<path fill="none" stroke="black" d="M69.8055,-6091.62C81.0941,-6063.65 104.875,-6011.15 137,-5974.87 170.736,-5936.77 219.178,-5904.1 254.225,-5883.23"/>
+<polygon fill="black" stroke="black" points="256.422,-5886 263.279,-5877.93 252.882,-5879.96 256.422,-5886"/>
+</g>
+<!-- m_r -->
+<g id="node30" class="node"><title>m_r</title>
+<polygon fill="none" stroke="black" points="359.635,-5733.87 239.635,-5733.87 239.635,-5695.87 359.635,-5695.87 359.635,-5733.87"/>
+<text text-anchor="middle" x="299.635" y="-5718.67" font-family="Times,serif" font-size="14.00">{m r} </text>
+<text text-anchor="middle" x="299.635" y="-5703.67" font-family="Times,serif" font-size="14.00"> rubber band mode</text>
+</g>
+<!-- m&#45;&gt;m_r -->
+<g id="edge22" class="edge"><title>m&#45;&gt;m_r</title>
+<path fill="none" stroke="black" d="M63.237,-6091.71C65.9474,-6043.61 78.5619,-5915.53 137,-5830.87 165.128,-5790.12 212.437,-5758.64 248.626,-5738.82"/>
+<polygon fill="black" stroke="black" points="250.403,-5741.83 257.568,-5734.03 247.1,-5735.66 250.403,-5741.83"/>
+</g>
+<!-- m_k -->
+<g id="node150" class="node"><title>m_k</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-5615.87" rx="27" ry="18"/>
+<text text-anchor="middle" x="299.635" y="-5612.17" font-family="Times,serif" font-size="14.00">m_k</text>
+</g>
+<!-- m&#45;&gt;m_k -->
+<g id="edge135" class="edge"><title>m&#45;&gt;m_k</title>
+<path fill="none" stroke="black" d="M63.5086,-6091.66C67.7466,-6017.59 86.3005,-5751.47 137,-5686.87 168.047,-5647.31 225.692,-5629.29 263.088,-5621.46"/>
+<polygon fill="black" stroke="black" points="263.917,-5624.86 273.059,-5619.51 262.573,-5617.99 263.917,-5624.86"/>
+</g>
+<!-- m_c_c -->
+<g id="node136" class="node"><title>m_c_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7370.87" rx="135.529" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7374.67" font-family="Times,serif" font-size="14.00">{m c c} </text>
+<text text-anchor="middle" x="649.51" y="-7359.67" font-family="Times,serif" font-size="14.00">Crosshair shows DRC clearance</text>
+</g>
+<!-- m_c&#45;&gt;m_c_c -->
+<g id="edge122" class="edge"><title>m_c&#45;&gt;m_c_c</title>
+<path fill="none" stroke="black" d="M370.283,-7230.26C402.426,-7235.42 438.615,-7246.93 462.269,-7271.87 482.008,-7292.68 455.86,-7314.72 476.269,-7334.87 486.513,-7344.99 498.822,-7352.6 512.089,-7358.28"/>
+<polygon fill="black" stroke="black" points="510.824,-7361.55 521.413,-7361.92 513.368,-7355.02 510.824,-7361.55"/>
+</g>
+<!-- m_c_o -->
+<g id="node137" class="node"><title>m_c_o</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7298.87" rx="83.3772" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7302.67" font-family="Times,serif" font-size="14.00">{m c o} </text>
+<text text-anchor="middle" x="649.51" y="-7287.67" font-family="Times,serif" font-size="14.00">Orthogonal moves</text>
+</g>
+<!-- m_c&#45;&gt;m_c_o -->
+<g id="edge123" class="edge"><title>m_c&#45;&gt;m_c_o</title>
+<path fill="none" stroke="black" d="M370.196,-7241.27C427.576,-7253.14 509.004,-7270 568.965,-7282.41"/>
+<polygon fill="black" stroke="black" points="568.27,-7285.84 578.772,-7284.44 569.689,-7278.98 568.27,-7285.84"/>
+</g>
+<!-- m_c_p -->
+<g id="node138" class="node"><title>m_c_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7226.87" rx="122.159" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7230.67" font-family="Times,serif" font-size="14.00">{m c p} </text>
+<text text-anchor="middle" x="649.51" y="-7215.67" font-family="Times,serif" font-size="14.00">Crosshair snaps to padstacks</text>
+</g>
+<!-- m_c&#45;&gt;m_c_p -->
+<g id="edge124" class="edge"><title>m_c&#45;&gt;m_c_p</title>
+<path fill="none" stroke="black" d="M370.196,-7226.87C412.119,-7226.87 466.879,-7226.87 516.725,-7226.87"/>
+<polygon fill="black" stroke="black" points="516.951,-7230.37 526.951,-7226.87 516.951,-7223.37 516.951,-7230.37"/>
+</g>
+<!-- m_c_s -->
+<g id="node139" class="node"><title>m_c_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7154.87" rx="173.483" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7158.67" font-family="Times,serif" font-size="14.00">{m c s} </text>
+<text text-anchor="middle" x="649.51" y="-7143.67" font-family="Times,serif" font-size="14.00">Crosshair snaps to off&#45;grid points on lines</text>
+</g>
+<!-- m_c&#45;&gt;m_c_s -->
+<g id="edge125" class="edge"><title>m_c&#45;&gt;m_c_s</title>
+<path fill="none" stroke="black" d="M370.196,-7212.47C417.235,-7202.74 480.435,-7189.66 534.72,-7178.42"/>
+<polygon fill="black" stroke="black" points="535.664,-7181.8 544.747,-7176.35 534.245,-7174.95 535.664,-7181.8"/>
+</g>
+<!-- m_d_a -->
+<g id="node140" class="node"><title>m_d_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7082.87" rx="96.7474" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7086.67" font-family="Times,serif" font-size="14.00">{m d a} </text>
+<text text-anchor="middle" x="649.51" y="-7071.67" font-family="Times,serif" font-size="14.00">Show autorouter trials</text>
+</g>
+<!-- m_d&#45;&gt;m_d_a -->
+<g id="edge126" class="edge"><title>m_d&#45;&gt;m_d_a</title>
+<path fill="none" stroke="black" d="M313.283,-6885.97C339.114,-6923.34 401.819,-7006.02 476.269,-7046.87 498.043,-7058.82 523.358,-7066.81 547.769,-7072.15"/>
+<polygon fill="black" stroke="black" points="547.296,-7075.62 557.796,-7074.21 548.705,-7068.77 547.296,-7075.62"/>
+</g>
+<!-- m_d_c -->
+<g id="node141" class="node"><title>m_d_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7010.87" rx="73.5782" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7014.67" font-family="Times,serif" font-size="14.00">{m d c} </text>
+<text text-anchor="middle" x="649.51" y="-6999.67" font-family="Times,serif" font-size="14.00">Check polygons</text>
+</g>
+<!-- m_d&#45;&gt;m_d_c -->
+<g id="edge127" class="edge"><title>m_d&#45;&gt;m_d_c</title>
+<path fill="none" stroke="black" d="M325.338,-6885.93C358.056,-6910.23 418.397,-6951.84 476.269,-6974.87 505.851,-6986.64 539.894,-6994.79 569.862,-7000.32"/>
+<polygon fill="black" stroke="black" points="569.398,-7003.8 579.857,-7002.1 570.623,-6996.9 569.398,-7003.8"/>
+</g>
+<!-- m_d_h -->
+<g id="node142" class="node"><title>m_d_h</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6938.87" rx="132.872" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6942.67" font-family="Times,serif" font-size="14.00">{m d h} </text>
+<text text-anchor="middle" x="649.51" y="-6927.67" font-family="Times,serif" font-size="14.00">Highlighting on line, arc points</text>
+</g>
+<!-- m_d&#45;&gt;m_d_h -->
+<g id="edge128" class="edge"><title>m_d&#45;&gt;m_d_h</title>
+<path fill="none" stroke="black" d="M372.715,-6881.79C422.842,-6892.16 490.395,-6906.14 546.097,-6917.67"/>
+<polygon fill="black" stroke="black" points="545.494,-6921.12 555.996,-6919.72 546.913,-6914.27 545.494,-6921.12"/>
+</g>
+<!-- m_d_p -->
+<g id="node143" class="node"><title>m_d_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6866.87" rx="71.3357" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6870.67" font-family="Times,serif" font-size="14.00">{m d p} </text>
+<text text-anchor="middle" x="649.51" y="-6855.67" font-family="Times,serif" font-size="14.00">Thin draw poly</text>
+</g>
+<!-- m_d&#45;&gt;m_d_p -->
+<g id="edge129" class="edge"><title>m_d&#45;&gt;m_d_p</title>
+<path fill="none" stroke="black" d="M372.715,-6866.87C429.624,-6866.87 508.994,-6866.87 567.984,-6866.87"/>
+<polygon fill="black" stroke="black" points="568.009,-6870.37 578.009,-6866.87 568.009,-6863.37 568.009,-6870.37"/>
+</g>
+<!-- m_d_t -->
+<g id="node144" class="node"><title>m_d_t</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6794.87" rx="51.7379" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6798.67" font-family="Times,serif" font-size="14.00">{m d t} </text>
+<text text-anchor="middle" x="649.51" y="-6783.67" font-family="Times,serif" font-size="14.00">Thin draw</text>
+</g>
+<!-- m_d&#45;&gt;m_d_t -->
+<g id="edge130" class="edge"><title>m_d&#45;&gt;m_d_t</title>
+<path fill="none" stroke="black" d="M372.715,-6851.95C437.525,-6838.54 531.467,-6819.09 591.262,-6806.72"/>
+<polygon fill="black" stroke="black" points="592.201,-6810.1 601.285,-6804.64 590.783,-6803.24 592.201,-6810.1"/>
+</g>
+<!-- m_d_w -->
+<g id="node145" class="node"><title>m_d_w</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6722.87" rx="75.8212" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6726.67" font-family="Times,serif" font-size="14.00">{m d w} </text>
+<text text-anchor="middle" x="649.51" y="-6711.67" font-family="Times,serif" font-size="14.00">Wireframe draw</text>
+</g>
+<!-- m_d&#45;&gt;m_d_w -->
+<g id="edge131" class="edge"><title>m_d&#45;&gt;m_d_w</title>
+<path fill="none" stroke="black" d="M325.338,-6847.81C358.056,-6823.51 418.397,-6781.9 476.269,-6758.87 505.341,-6747.3 538.721,-6739.23 568.308,-6733.7"/>
+<polygon fill="black" stroke="black" points="568.963,-6737.14 578.185,-6731.93 567.723,-6730.25 568.963,-6737.14"/>
+</g>
+<!-- m_f_h -->
+<g id="node146" class="node"><title>m_f_h</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6650.87" rx="61.5366" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6654.67" font-family="Times,serif" font-size="14.00">{m f h} </text>
+<text text-anchor="middle" x="649.51" y="-6639.67" font-family="Times,serif" font-size="14.00">Hide floaters</text>
+</g>
+<!-- m_f&#45;&gt;m_f_h -->
+<g id="edge132" class="edge"><title>m_f&#45;&gt;m_f_h</title>
+<path fill="none" stroke="black" d="M341.027,-6561.91C376.137,-6577.85 428.694,-6600.28 476.269,-6614.87 510.398,-6625.34 549.258,-6633.75 581.418,-6639.8"/>
+<polygon fill="black" stroke="black" points="581.14,-6643.31 591.61,-6641.68 582.411,-6636.42 581.14,-6643.31"/>
+</g>
+<!-- m_f_l -->
+<g id="node147" class="node"><title>m_f_l</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6578.87" rx="62.8651" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6582.67" font-family="Times,serif" font-size="14.00">{m f l} </text>
+<text text-anchor="middle" x="649.51" y="-6567.67" font-family="Times,serif" font-size="14.00">Lock floaters</text>
+</g>
+<!-- m_f&#45;&gt;m_f_l -->
+<g id="edge133" class="edge"><title>m_f&#45;&gt;m_f_l</title>
+<path fill="none" stroke="black" d="M344.693,-6547.43C403.506,-6553.52 508.344,-6564.36 578.159,-6571.59"/>
+<polygon fill="black" stroke="black" points="577.889,-6575.08 588.196,-6572.63 578.609,-6568.12 577.889,-6575.08"/>
+</g>
+<!-- m_f_o -->
+<g id="node148" class="node"><title>m_f_o</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6506.87" rx="62.4516" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6510.67" font-family="Times,serif" font-size="14.00">{m f o} </text>
+<text text-anchor="middle" x="649.51" y="-6495.67" font-family="Times,serif" font-size="14.00">Only floaters</text>
+</g>
+<!-- m_f&#45;&gt;m_f_o -->
+<g id="edge134" class="edge"><title>m_f&#45;&gt;m_f_o</title>
+<path fill="none" stroke="black" d="M344.693,-6538.31C403.68,-6532.21 508.966,-6521.31 578.779,-6514.09"/>
+<polygon fill="black" stroke="black" points="579.225,-6517.56 588.812,-6513.05 578.505,-6510.6 579.225,-6517.56"/>
+</g>
+<!-- m_l_+ -->
+<g id="node151" class="node"><title>m_l_+</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6434.87" rx="96.7474" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6438.67" font-family="Times,serif" font-size="14.00">{m l +} </text>
+<text text-anchor="middle" x="649.51" y="-6423.67" font-family="Times,serif" font-size="14.00">Line Tool size +5 mil</text>
+</g>
+<!-- m_l&#45;&gt;m_l_+ -->
+<g id="edge137" class="edge"><title>m_l&#45;&gt;m_l_+</title>
+<path fill="none" stroke="black" d="M313.283,-6237.97C339.114,-6275.34 401.819,-6358.02 476.269,-6398.87 498.043,-6410.82 523.358,-6418.81 547.769,-6424.15"/>
+<polygon fill="black" stroke="black" points="547.296,-6427.62 557.796,-6426.21 548.705,-6420.77 547.296,-6427.62"/>
+</g>
+<!-- m_l_&#45; -->
+<g id="node152" class="node"><title>m_l_&#45;</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6362.87" rx="94.0904" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6366.67" font-family="Times,serif" font-size="14.00">{m l &#45;} </text>
+<text text-anchor="middle" x="649.51" y="-6351.67" font-family="Times,serif" font-size="14.00">Line Tool size &#45;5 mil</text>
+</g>
+<!-- m_l&#45;&gt;m_l_&#45; -->
+<g id="edge138" class="edge"><title>m_l&#45;&gt;m_l_&#45;</title>
+<path fill="none" stroke="black" d="M325.338,-6237.93C358.056,-6262.23 418.397,-6303.84 476.269,-6326.87 500.935,-6336.68 528.702,-6343.98 554.622,-6349.34"/>
+<polygon fill="black" stroke="black" points="553.964,-6352.78 564.456,-6351.31 555.333,-6345.92 553.964,-6352.78"/>
+</g>
+<!-- m_l_a -->
+<g id="node153" class="node"><title>m_l_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6290.87" rx="84.7059" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6294.67" font-family="Times,serif" font-size="14.00">{m l a} </text>
+<text text-anchor="middle" x="649.51" y="-6279.67" font-family="Times,serif" font-size="14.00">&#39;All&#45;direction&#39; lines</text>
+</g>
+<!-- m_l&#45;&gt;m_l_a -->
+<g id="edge139" class="edge"><title>m_l&#45;&gt;m_l_a</title>
+<path fill="none" stroke="black" d="M392.49,-6237.88C447.049,-6249.17 515.587,-6263.36 568.017,-6274.21"/>
+<polygon fill="black" stroke="black" points="567.443,-6277.67 577.945,-6276.27 568.862,-6270.81 567.443,-6277.67"/>
+</g>
+<!-- m_l_c -->
+<g id="node154" class="node"><title>m_l_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6218.87" rx="130.215" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6222.67" font-family="Times,serif" font-size="14.00">{m l c} </text>
+<text text-anchor="middle" x="649.51" y="-6207.67" font-family="Times,serif" font-size="14.00">New lines, arcs clear polygons</text>
+</g>
+<!-- m_l&#45;&gt;m_l_c -->
+<g id="edge140" class="edge"><title>m_l&#45;&gt;m_l_c</title>
+<path fill="none" stroke="black" d="M392.49,-6218.87C428.061,-6218.87 469.576,-6218.87 508.693,-6218.87"/>
+<polygon fill="black" stroke="black" points="509.117,-6222.37 519.117,-6218.87 509.117,-6215.37 509.117,-6222.37"/>
+</g>
+<!-- m_l_d -->
+<g id="node155" class="node"><title>m_l_d</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6146.87" rx="123.073" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6150.67" font-family="Times,serif" font-size="14.00">{m l d} </text>
+<text text-anchor="middle" x="649.51" y="-6135.67" font-family="Times,serif" font-size="14.00">Auto enforce DRC clearance</text>
+</g>
+<!-- m_l&#45;&gt;m_l_d -->
+<g id="edge141" class="edge"><title>m_l&#45;&gt;m_l_d</title>
+<path fill="none" stroke="black" d="M392.49,-6199.86C440.795,-6189.86 500.06,-6177.59 549.4,-6167.38"/>
+<polygon fill="black" stroke="black" points="550.366,-6170.76 559.449,-6165.3 548.947,-6163.9 550.366,-6170.76"/>
+</g>
+<!-- m_l_f -->
+<g id="node156" class="node"><title>m_l_f</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6074.87" rx="107.46" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6078.67" font-family="Times,serif" font-size="14.00">{m l f} </text>
+<text text-anchor="middle" x="649.51" y="-6063.67" font-family="Times,serif" font-size="14.00">Cycle line clip/refraction</text>
+</g>
+<!-- m_l&#45;&gt;m_l_f -->
+<g id="edge142" class="edge"><title>m_l&#45;&gt;m_l_f</title>
+<path fill="none" stroke="black" d="M325.338,-6199.81C358.056,-6175.51 418.397,-6133.9 476.269,-6110.87 498.125,-6102.17 522.416,-6095.45 545.7,-6090.3"/>
+<polygon fill="black" stroke="black" points="546.556,-6093.7 555.607,-6088.19 545.097,-6086.85 546.556,-6093.7"/>
+</g>
+<!-- m_t_+ -->
+<g id="node161" class="node"><title>m_t_+</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-6002.87" rx="105.218" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-6006.67" font-family="Times,serif" font-size="14.00">{m t +} </text>
+<text text-anchor="middle" x="649.51" y="-5991.67" font-family="Times,serif" font-size="14.00">Text Tool scale +10 mil</text>
+</g>
+<!-- m_t&#45;&gt;m_t_+ -->
+<g id="edge147" class="edge"><title>m_t&#45;&gt;m_t_+</title>
+<path fill="none" stroke="black" d="M392.49,-6002.87C435.905,-6002.87 488.173,-6002.87 534.131,-6002.87"/>
+<polygon fill="black" stroke="black" points="534.14,-6006.37 544.14,-6002.87 534.14,-5999.37 534.14,-6006.37"/>
+</g>
+<!-- m_t_&#45; -->
+<g id="node162" class="node"><title>m_t_&#45;</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5930.87" rx="103.476" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5934.67" font-family="Times,serif" font-size="14.00">{m t &#45;} </text>
+<text text-anchor="middle" x="649.51" y="-5919.67" font-family="Times,serif" font-size="14.00">Text Tool scale &#45;10 mil</text>
+</g>
+<!-- m_t&#45;&gt;m_t_&#45; -->
+<g id="edge148" class="edge"><title>m_t&#45;&gt;m_t_&#45;</title>
+<path fill="none" stroke="black" d="M392.49,-5983.86C443.727,-5973.25 507.294,-5960.1 558.268,-5949.55"/>
+<polygon fill="black" stroke="black" points="559.205,-5952.93 568.288,-5947.47 557.786,-5946.07 559.205,-5952.93"/>
+</g>
+<!-- m_p_c -->
+<g id="node157" class="node"><title>m_p_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5858.87" rx="126.644" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5862.67" font-family="Times,serif" font-size="14.00">{m p c} </text>
+<text text-anchor="middle" x="649.51" y="-5847.67" font-family="Times,serif" font-size="14.00">New polygons clear polygons</text>
+</g>
+<!-- m_p&#45;&gt;m_p_c -->
+<g id="edge143" class="edge"><title>m_p&#45;&gt;m_p_c</title>
+<path fill="none" stroke="black" d="M373.137,-5858.87C413.478,-5858.87 465.008,-5858.87 512.557,-5858.87"/>
+<polygon fill="black" stroke="black" points="512.638,-5862.37 522.638,-5858.87 512.638,-5855.37 512.638,-5862.37"/>
+</g>
+<!-- m_p_f -->
+<g id="node158" class="node"><title>m_p_f</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5786.87" rx="118.174" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5790.67" font-family="Times,serif" font-size="14.00">{m p f} </text>
+<text text-anchor="middle" x="649.51" y="-5775.67" font-family="Times,serif" font-size="14.00">New polygons are full ones</text>
+</g>
+<!-- m_p&#45;&gt;m_p_f -->
+<g id="edge144" class="edge"><title>m_p&#45;&gt;m_p_f</title>
+<path fill="none" stroke="black" d="M373.137,-5843.86C424.889,-5833.15 495.056,-5818.63 551.608,-5806.93"/>
+<polygon fill="black" stroke="black" points="552.557,-5810.3 561.64,-5804.85 551.138,-5803.45 552.557,-5810.3"/>
+</g>
+<!-- m_r_m -->
+<g id="node159" class="node"><title>m_r_m</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5714.87" rx="145.828" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5718.67" font-family="Times,serif" font-size="14.00">{m r m} </text>
+<text text-anchor="middle" x="649.51" y="-5703.67" font-family="Times,serif" font-size="14.00">Rubber band keeps middle line dir</text>
+</g>
+<!-- m_r&#45;&gt;m_r_m -->
+<g id="edge145" class="edge"><title>m_r&#45;&gt;m_r_m</title>
+<path fill="none" stroke="black" d="M359.647,-5714.87C396.566,-5714.87 445.988,-5714.87 493.504,-5714.87"/>
+<polygon fill="black" stroke="black" points="493.609,-5718.37 503.609,-5714.87 493.609,-5711.37 493.609,-5718.37"/>
+</g>
+<!-- m_r_r -->
+<g id="node160" class="node"><title>m_r_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5642.87" rx="85.6199" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5646.67" font-family="Times,serif" font-size="14.00">{m r r} </text>
+<text text-anchor="middle" x="649.51" y="-5631.67" font-family="Times,serif" font-size="14.00">Rubber band mode</text>
+</g>
+<!-- m_r&#45;&gt;m_r_r -->
+<g id="edge146" class="edge"><title>m_r&#45;&gt;m_r_r</title>
+<path fill="none" stroke="black" d="M359.647,-5702.66C416.78,-5690.83 503.857,-5672.81 567.472,-5659.64"/>
+<polygon fill="black" stroke="black" points="568.389,-5663.03 577.472,-5657.57 566.97,-5656.17 568.389,-5663.03"/>
+</g>
+<!-- s -->
+<g id="node31" class="node"><title>s</title>
+<polygon fill="none" stroke="black" points="88.5,-7574.87 34.5,-7574.87 34.5,-7536.87 88.5,-7536.87 88.5,-7574.87"/>
+<text text-anchor="middle" x="61.5" y="-7559.67" font-family="Times,serif" font-size="14.00">{s} </text>
+<text text-anchor="middle" x="61.5" y="-7544.67" font-family="Times,serif" font-size="14.00"> select</text>
+</g>
+<!-- s_a -->
+<g id="node32" class="node"><title>s_a</title>
+<polygon fill="none" stroke="black" points="339.635,-7893.87 259.635,-7893.87 259.635,-7855.87 339.635,-7855.87 339.635,-7893.87"/>
+<text text-anchor="middle" x="299.635" y="-7878.67" font-family="Times,serif" font-size="14.00">{s a} </text>
+<text text-anchor="middle" x="299.635" y="-7863.67" font-family="Times,serif" font-size="14.00"> select all...</text>
+</g>
+<!-- s&#45;&gt;s_a -->
+<g id="edge23" class="edge"><title>s&#45;&gt;s_a</title>
+<path fill="none" stroke="black" d="M65.6275,-7575.03C72.6601,-7613.31 92.6955,-7700.59 137,-7758.87 167.351,-7798.79 215.269,-7830.75 251.063,-7850.93"/>
+<polygon fill="black" stroke="black" points="249.439,-7854.03 259.884,-7855.8 252.824,-7847.9 249.439,-7854.03"/>
+</g>
+<!-- s_u -->
+<g id="node33" class="node"><title>s_u</title>
+<polygon fill="none" stroke="black" points="346.135,-7749.87 253.135,-7749.87 253.135,-7711.87 346.135,-7711.87 346.135,-7749.87"/>
+<text text-anchor="middle" x="299.635" y="-7734.67" font-family="Times,serif" font-size="14.00">{s u} </text>
+<text text-anchor="middle" x="299.635" y="-7719.67" font-family="Times,serif" font-size="14.00"> unselect all...</text>
+</g>
+<!-- s&#45;&gt;s_u -->
+<g id="edge24" class="edge"><title>s&#45;&gt;s_u</title>
+<path fill="none" stroke="black" d="M70.4649,-7575.11C81.768,-7600.21 104.734,-7643.97 137,-7669.87 167.735,-7694.54 209.505,-7709.96 242.883,-7719.12"/>
+<polygon fill="black" stroke="black" points="242.39,-7722.61 252.951,-7721.77 244.169,-7715.84 242.39,-7722.61"/>
+</g>
+<!-- s_c -->
+<g id="node34" class="node"><title>s_c</title>
+<polygon fill="none" stroke="black" points="353.635,-7660.87 245.635,-7660.87 245.635,-7622.87 353.635,-7622.87 353.635,-7660.87"/>
+<text text-anchor="middle" x="299.635" y="-7645.67" font-family="Times,serif" font-size="14.00">{s c} </text>
+<text text-anchor="middle" x="299.635" y="-7630.67" font-family="Times,serif" font-size="14.00"> convert selected</text>
+</g>
+<!-- s&#45;&gt;s_c -->
+<g id="edge25" class="edge"><title>s&#45;&gt;s_c</title>
+<path fill="none" stroke="black" d="M81.6003,-7575.09C95.7004,-7588.11 116.014,-7604.59 137,-7613.87 167.77,-7627.48 204.565,-7634.49 235.27,-7638.1"/>
+<polygon fill="black" stroke="black" points="235.114,-7641.6 245.432,-7639.19 235.865,-7634.64 235.114,-7641.6"/>
+</g>
+<!-- s_b -->
+<g id="node170" class="node"><title>s_b</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-7586.87" rx="27" ry="18"/>
+<text text-anchor="middle" x="299.635" y="-7583.17" font-family="Times,serif" font-size="14.00">s_b</text>
+</g>
+<!-- s&#45;&gt;s_b -->
+<g id="edge155" class="edge"><title>s&#45;&gt;s_b</title>
+<path fill="none" stroke="black" d="M88.6728,-7559.31C131.184,-7564.89 215.29,-7575.93 263.145,-7582.21"/>
+<polygon fill="black" stroke="black" points="262.692,-7585.68 273.062,-7583.51 263.603,-7578.74 262.692,-7585.68"/>
+</g>
+<!-- s_f -->
+<g id="node174" class="node"><title>s_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-7523.87" rx="162.769" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-7527.67" font-family="Times,serif" font-size="14.00">{s f} </text>
+<text text-anchor="middle" x="299.635" y="-7512.67" font-family="Times,serif" font-size="14.00">Move selected subcircuits to other side</text>
+</g>
+<!-- s&#45;&gt;s_f -->
+<g id="edge160" class="edge"><title>s&#45;&gt;s_f</title>
+<path fill="none" stroke="black" d="M88.6728,-7552.32C107.578,-7549.76 134.709,-7546.08 163.22,-7542.22"/>
+<polygon fill="black" stroke="black" points="163.911,-7545.66 173.351,-7540.85 162.971,-7538.72 163.911,-7545.66"/>
+</g>
+<!-- s_l -->
+<g id="node175" class="node"><title>s_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-7451.87" rx="159.198" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-7455.67" font-family="Times,serif" font-size="14.00">{s l} </text>
+<text text-anchor="middle" x="299.635" y="-7440.67" font-family="Times,serif" font-size="14.00">Move selected objects to current layer</text>
+</g>
+<!-- s&#45;&gt;s_l -->
+<g id="edge161" class="edge"><title>s&#45;&gt;s_l</title>
+<path fill="none" stroke="black" d="M78.254,-7536.78C92.1226,-7521.25 113.695,-7499.99 137,-7487.87 148.07,-7482.11 160.031,-7477.28 172.265,-7473.21"/>
+<polygon fill="black" stroke="black" points="173.632,-7476.45 182.122,-7470.11 171.532,-7469.77 173.632,-7476.45"/>
+</g>
+<!-- s_r -->
+<g id="node176" class="node"><title>s_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-7379.87" rx="107.46" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-7383.67" font-family="Times,serif" font-size="14.00">{s r} </text>
+<text text-anchor="middle" x="299.635" y="-7368.67" font-family="Times,serif" font-size="14.00">Remove selected objects</text>
+</g>
+<!-- s&#45;&gt;s_r -->
+<g id="edge162" class="edge"><title>s&#45;&gt;s_r</title>
+<path fill="none" stroke="black" d="M67.1591,-7536.65C75.6096,-7506.09 96.4652,-7446.71 137,-7415.87 151.836,-7404.58 169.527,-7396.7 187.674,-7391.23"/>
+<polygon fill="black" stroke="black" points="188.789,-7394.55 197.489,-7388.5 186.917,-7387.81 188.789,-7394.55"/>
+</g>
+<!-- s_s -->
+<g id="node177" class="node"><title>s_s</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-7307.87" rx="118.174" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-7311.67" font-family="Times,serif" font-size="14.00">{s s} </text>
+<text text-anchor="middle" x="299.635" y="-7296.67" font-family="Times,serif" font-size="14.00">Advanced search and select</text>
+</g>
+<!-- s&#45;&gt;s_s -->
+<g id="edge163" class="edge"><title>s&#45;&gt;s_s</title>
+<path fill="none" stroke="black" d="M63.3008,-7536.69C66.1288,-7494.93 78.9428,-7395.41 137,-7343.87 148.929,-7333.28 163.28,-7325.59 178.442,-7320.04"/>
+<polygon fill="black" stroke="black" points="179.599,-7323.34 187.973,-7316.85 177.38,-7316.7 179.599,-7323.34"/>
+</g>
+<!-- s_a_a -->
+<g id="node167" class="node"><title>s_a_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7946.87" rx="105.218" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7950.67" font-family="Times,serif" font-size="14.00">{s a a} </text>
+<text text-anchor="middle" x="649.51" y="-7935.67" font-family="Times,serif" font-size="14.00">Select all visible objects</text>
+</g>
+<!-- s_a&#45;&gt;s_a_a -->
+<g id="edge153" class="edge"><title>s_a&#45;&gt;s_a_a</title>
+<path fill="none" stroke="black" d="M339.864,-7882.99C392.22,-7893.83 486.531,-7913.35 557.17,-7927.97"/>
+<polygon fill="black" stroke="black" points="556.472,-7931.39 566.974,-7929.99 557.891,-7924.54 556.472,-7931.39"/>
+</g>
+<!-- s_a_c -->
+<g id="node168" class="node"><title>s_a_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7874.87" rx="118.174" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7878.67" font-family="Times,serif" font-size="14.00">{s a c} </text>
+<text text-anchor="middle" x="649.51" y="-7863.67" font-family="Times,serif" font-size="14.00">Select all connected objects</text>
+</g>
+<!-- s_a&#45;&gt;s_a_c -->
+<g id="edge154" class="edge"><title>s_a&#45;&gt;s_a_c</title>
+<path fill="none" stroke="black" d="M339.864,-7874.87C383.718,-7874.87 457.008,-7874.87 521.167,-7874.87"/>
+<polygon fill="black" stroke="black" points="521.379,-7878.37 531.379,-7874.87 521.379,-7871.37 521.379,-7878.37"/>
+</g>
+<!-- s_u_a -->
+<g id="node178" class="node"><title>s_u_a</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7802.87" rx="86.9483" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7806.67" font-family="Times,serif" font-size="14.00">{s u a} </text>
+<text text-anchor="middle" x="649.51" y="-7791.67" font-family="Times,serif" font-size="14.00">Unselect all objects</text>
+</g>
+<!-- s_u&#45;&gt;s_u_a -->
+<g id="edge164" class="edge"><title>s_u&#45;&gt;s_u_a</title>
+<path fill="none" stroke="black" d="M346.471,-7740.36C402.479,-7751.95 498.252,-7771.77 566.946,-7785.99"/>
+<polygon fill="black" stroke="black" points="566.374,-7789.44 576.876,-7788.04 567.793,-7782.59 566.374,-7789.44"/>
+</g>
+<!-- s_u_c -->
+<g id="node179" class="node"><title>s_u_c</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7730.87" rx="126.644" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7734.67" font-family="Times,serif" font-size="14.00">{s u c} </text>
+<text text-anchor="middle" x="649.51" y="-7719.67" font-family="Times,serif" font-size="14.00">unselect all connected objects</text>
+</g>
+<!-- s_u&#45;&gt;s_u_c -->
+<g id="edge165" class="edge"><title>s_u&#45;&gt;s_u_c</title>
+<path fill="none" stroke="black" d="M346.471,-7730.87C388.765,-7730.87 453.734,-7730.87 512.595,-7730.87"/>
+<polygon fill="black" stroke="black" points="512.744,-7734.37 522.744,-7730.87 512.744,-7727.37 512.744,-7734.37"/>
+</g>
+<!-- s_c_p -->
+<g id="node172" class="node"><title>s_c_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7658.87" rx="125.316" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7662.67" font-family="Times,serif" font-size="14.00">{s c p} </text>
+<text text-anchor="middle" x="649.51" y="-7647.67" font-family="Times,serif" font-size="14.00">Convert selection to padstack</text>
+</g>
+<!-- s_c&#45;&gt;s_c_p -->
+<g id="edge158" class="edge"><title>s_c&#45;&gt;s_c_p</title>
+<path fill="none" stroke="black" d="M353.848,-7644.47C397.21,-7646.59 460.324,-7649.67 517.027,-7652.44"/>
+<polygon fill="black" stroke="black" points="517.006,-7655.95 527.165,-7652.94 517.348,-7648.96 517.006,-7655.95"/>
+</g>
+<!-- s_c_s -->
+<g id="node173" class="node"><title>s_c_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7586.87" rx="129.301" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7590.67" font-family="Times,serif" font-size="14.00">{s c s} </text>
+<text text-anchor="middle" x="649.51" y="-7575.67" font-family="Times,serif" font-size="14.00">Convert selection to subcircuit</text>
+</g>
+<!-- s_c&#45;&gt;s_c_s -->
+<g id="edge159" class="edge"><title>s_c&#45;&gt;s_c_s</title>
+<path fill="none" stroke="black" d="M353.848,-7633.46C402.077,-7625.83 474.741,-7614.34 535.841,-7604.68"/>
+<polygon fill="black" stroke="black" points="536.601,-7608.11 545.932,-7603.09 535.508,-7601.19 536.601,-7608.11"/>
+</g>
+<!-- r -->
+<g id="node35" class="node"><title>r</title>
+<polygon fill="none" stroke="black" points="110,-8145.87 13,-8145.87 13,-8107.87 110,-8107.87 110,-8145.87"/>
+<text text-anchor="middle" x="61.5" y="-8130.67" font-family="Times,serif" font-size="14.00">{r} </text>
+<text text-anchor="middle" x="61.5" y="-8115.67" font-family="Times,serif" font-size="14.00"> routing helper</text>
+</g>
+<!-- r_r -->
+<g id="node36" class="node"><title>r_r</title>
+<polygon fill="none" stroke="black" points="347.635,-8145.87 251.635,-8145.87 251.635,-8107.87 347.635,-8107.87 347.635,-8145.87"/>
+<text text-anchor="middle" x="299.635" y="-8130.67" font-family="Times,serif" font-size="14.00">{r r} </text>
+<text text-anchor="middle" x="299.635" y="-8115.67" font-family="Times,serif" font-size="14.00"> routing radius</text>
+</g>
+<!-- r&#45;&gt;r_r -->
+<g id="edge26" class="edge"><title>r&#45;&gt;r_r</title>
+<path fill="none" stroke="black" d="M110.001,-8126.87C147.913,-8126.87 201.156,-8126.87 241.413,-8126.87"/>
+<polygon fill="black" stroke="black" points="241.612,-8130.37 251.612,-8126.87 241.612,-8123.37 241.612,-8130.37"/>
+</g>
+<!-- r_r_+ -->
+<g id="node163" class="node"><title>r_r_+</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-8234.87" rx="81.135" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-8238.67" font-family="Times,serif" font-size="14.00">{r r +} </text>
+<text text-anchor="middle" x="649.51" y="-8223.67" font-family="Times,serif" font-size="14.00">Route radius +0.5</text>
+</g>
+<!-- r_r&#45;&gt;r_r_+ -->
+<g id="edge149" class="edge"><title>r_r&#45;&gt;r_r_+</title>
+<path fill="none" stroke="black" d="M347.892,-8122.79C383.424,-8122.35 431.145,-8127.73 462.269,-8154.87 477.736,-8168.36 461.037,-8185.12 476.269,-8198.87 498.378,-8218.83 528.632,-8228.81 557.619,-8233.51"/>
+<polygon fill="black" stroke="black" points="557.409,-8237.02 567.803,-8234.96 558.397,-8230.09 557.409,-8237.02"/>
+</g>
+<!-- r_r_&#45; -->
+<g id="node164" class="node"><title>r_r_&#45;</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-8162.87" rx="78.4777" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-8166.67" font-family="Times,serif" font-size="14.00">{r r &#45;} </text>
+<text text-anchor="middle" x="649.51" y="-8151.67" font-family="Times,serif" font-size="14.00">Route radius &#45;0.5</text>
+</g>
+<!-- r_r&#45;&gt;r_r_&#45; -->
+<g id="edge150" class="edge"><title>r_r&#45;&gt;r_r_&#45;</title>
+<path fill="none" stroke="black" d="M347.913,-8131.76C403.309,-8137.5 496.141,-8147.1 564.013,-8154.13"/>
+<polygon fill="black" stroke="black" points="563.952,-8157.64 574.259,-8155.19 564.673,-8150.68 563.952,-8157.64"/>
+</g>
+<!-- r_r_m -->
+<g id="node165" class="node"><title>r_r_m</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-8090.87" rx="78.4777" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-8094.67" font-family="Times,serif" font-size="14.00">{r r m} </text>
+<text text-anchor="middle" x="649.51" y="-8079.67" font-family="Times,serif" font-size="14.00">Route radius &#45;0.5</text>
+</g>
+<!-- r_r&#45;&gt;r_r_m -->
+<g id="edge151" class="edge"><title>r_r&#45;&gt;r_r_m</title>
+<path fill="none" stroke="black" d="M347.913,-8121.98C403.309,-8116.24 496.141,-8106.64 564.013,-8099.61"/>
+<polygon fill="black" stroke="black" points="564.673,-8103.06 574.259,-8098.55 563.952,-8096.1 564.673,-8103.06"/>
+</g>
+<!-- r_r_p -->
+<g id="node166" class="node"><title>r_r_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-8018.87" rx="81.135" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-8022.67" font-family="Times,serif" font-size="14.00">{r r p} </text>
+<text text-anchor="middle" x="649.51" y="-8007.67" font-family="Times,serif" font-size="14.00">Route radius +0.5</text>
+</g>
+<!-- r_r&#45;&gt;r_r_p -->
+<g id="edge152" class="edge"><title>r_r&#45;&gt;r_r_p</title>
+<path fill="none" stroke="black" d="M341.027,-8107.83C376.137,-8091.89 428.694,-8069.46 476.269,-8054.87 505.269,-8045.98 537.685,-8038.57 566.504,-8032.83"/>
+<polygon fill="black" stroke="black" points="567.393,-8036.22 576.536,-8030.87 566.05,-8029.35 567.393,-8036.22"/>
+</g>
+<!-- t -->
+<g id="node37" class="node"><title>t</title>
+<polygon fill="none" stroke="black" points="88.5,-8749.87 34.5,-8749.87 34.5,-8711.87 88.5,-8711.87 88.5,-8749.87"/>
+<text text-anchor="middle" x="61.5" y="-8734.67" font-family="Times,serif" font-size="14.00">{t} </text>
+<text text-anchor="middle" x="61.5" y="-8719.67" font-family="Times,serif" font-size="14.00"> tool</text>
+</g>
+<!-- t_a -->
+<g id="node180" class="node"><title>t_a</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9270.87" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9274.67" font-family="Times,serif" font-size="14.00">{t a} </text>
+<text text-anchor="middle" x="299.635" y="-9259.67" font-family="Times,serif" font-size="14.00">Arc</text>
+</g>
+<!-- t&#45;&gt;t_a -->
+<g id="edge166" class="edge"><title>t&#45;&gt;t_a</title>
+<path fill="none" stroke="black" d="M62.5444,-8749.96C63.1376,-8833.08 69.7573,-9162.57 137,-9234.87 167.028,-9267.15 219.086,-9273.68 256.003,-9273.72"/>
+<polygon fill="black" stroke="black" points="256.511,-9277.21 266.457,-9273.56 256.405,-9270.21 256.511,-9277.21"/>
+</g>
+<!-- t_b -->
+<g id="node181" class="node"><title>t_b</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9198.87" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9202.67" font-family="Times,serif" font-size="14.00">{t b} </text>
+<text text-anchor="middle" x="299.635" y="-9187.67" font-family="Times,serif" font-size="14.00">Buffer</text>
+</g>
+<!-- t&#45;&gt;t_b -->
+<g id="edge167" class="edge"><title>t&#45;&gt;t_b</title>
+<path fill="none" stroke="black" d="M63.0615,-8749.98C65.6769,-8825.53 79.1203,-9102.12 137,-9162.87 166.421,-9193.75 216.025,-9200.93 252.538,-9201.51"/>
+<polygon fill="black" stroke="black" points="252.939,-9205.01 262.937,-9201.5 252.935,-9198.01 252.939,-9205.01"/>
+</g>
+<!-- t_c -->
+<g id="node182" class="node"><title>t_c</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9126.87" rx="33.4697" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9130.67" font-family="Times,serif" font-size="14.00">{t c} </text>
+<text text-anchor="middle" x="299.635" y="-9115.67" font-family="Times,serif" font-size="14.00">Copy</text>
+</g>
+<!-- t&#45;&gt;t_c -->
+<g id="edge168" class="edge"><title>t&#45;&gt;t_c</title>
+<path fill="none" stroke="black" d="M63.7768,-8749.95C68.6636,-8817.17 88.404,-9041.54 137,-9090.87 167.849,-9122.19 219.51,-9128.94 256.116,-9129.29"/>
+<polygon fill="black" stroke="black" points="256.504,-9132.79 266.482,-9129.23 256.461,-9125.79 256.504,-9132.79"/>
+</g>
+<!-- t_d -->
+<g id="node183" class="node"><title>t_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9054.87" rx="60.623" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9058.67" font-family="Times,serif" font-size="14.00">{t d} </text>
+<text text-anchor="middle" x="299.635" y="-9043.67" font-family="Times,serif" font-size="14.00">Del/Remove</text>
+</g>
+<!-- t&#45;&gt;t_d -->
+<g id="edge169" class="edge"><title>t&#45;&gt;t_d</title>
+<path fill="none" stroke="black" d="M64.8575,-8750.1C72.3777,-8808.28 97.6376,-8980.82 137,-9018.87 161.155,-9042.22 196.936,-9051.75 228.696,-9055.22"/>
+<polygon fill="black" stroke="black" points="228.571,-9058.72 238.847,-9056.14 229.205,-9051.75 228.571,-9058.72"/>
+</g>
+<!-- t_e -->
+<g id="node184" class="node"><title>t_e</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8982.87" rx="44.5955" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8986.67" font-family="Times,serif" font-size="14.00">{t e} </text>
+<text text-anchor="middle" x="299.635" y="-8971.67" font-family="Times,serif" font-size="14.00">Thermal</text>
+</g>
+<!-- t&#45;&gt;t_e -->
+<g id="edge170" class="edge"><title>t&#45;&gt;t_e</title>
+<path fill="none" stroke="black" d="M63.159,-8750.09C65.7002,-8792.43 77.9712,-8894.16 137,-8946.87 166.151,-8972.9 209.919,-8981.44 244.561,-8983.72"/>
+<polygon fill="black" stroke="black" points="244.83,-8987.24 254.992,-8984.24 245.179,-8980.24 244.83,-8987.24"/>
+</g>
+<!-- t_h -->
+<g id="node185" class="node"><title>t_h</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8910.87" rx="65.1077" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8914.67" font-family="Times,serif" font-size="14.00">{t h} </text>
+<text text-anchor="middle" x="299.635" y="-8899.67" font-family="Times,serif" font-size="14.00">Polygon Hole</text>
+</g>
+<!-- t&#45;&gt;t_h -->
+<g id="edge171" class="edge"><title>t&#45;&gt;t_h</title>
+<path fill="none" stroke="black" d="M66.8604,-8750.12C74.9877,-8781.38 95.5203,-8842.93 137,-8874.87 161.864,-8894.02 194.912,-8903.38 224.645,-8907.82"/>
+<polygon fill="black" stroke="black" points="224.209,-8911.3 234.584,-8909.15 225.134,-8904.36 224.209,-8911.3"/>
+</g>
+<!-- t_i -->
+<g id="node186" class="node"><title>t_i</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8838.87" rx="56.6372" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8842.67" font-family="Times,serif" font-size="14.00">{t i} </text>
+<text text-anchor="middle" x="299.635" y="-8827.67" font-family="Times,serif" font-size="14.00">Insert Point</text>
+</g>
+<!-- t&#45;&gt;t_i -->
+<g id="edge172" class="edge"><title>t&#45;&gt;t_i</title>
+<path fill="none" stroke="black" d="M77.2069,-8750.12C90.8887,-8766.66 112.766,-8789.83 137,-8802.87 166.568,-8818.78 202.8,-8827.67 233.462,-8832.63"/>
+<polygon fill="black" stroke="black" points="233.218,-8836.13 243.629,-8834.16 234.263,-8829.21 233.218,-8836.13"/>
+</g>
+<!-- t_k -->
+<g id="node187" class="node"><title>t_k</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8766.87" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8770.67" font-family="Times,serif" font-size="14.00">{t k} </text>
+<text text-anchor="middle" x="299.635" y="-8755.67" font-family="Times,serif" font-size="14.00">Lock</text>
+</g>
+<!-- t&#45;&gt;t_k -->
+<g id="edge173" class="edge"><title>t&#45;&gt;t_k</title>
+<path fill="none" stroke="black" d="M88.6728,-8734.86C129.143,-8741.03 207.31,-8752.95 256.01,-8760.37"/>
+<polygon fill="black" stroke="black" points="255.518,-8763.84 265.931,-8761.88 256.573,-8756.92 255.518,-8763.84"/>
+</g>
+<!-- t_l -->
+<g id="node188" class="node"><title>t_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8694.87" rx="31.6406" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8698.67" font-family="Times,serif" font-size="14.00">{t l} </text>
+<text text-anchor="middle" x="299.635" y="-8683.67" font-family="Times,serif" font-size="14.00">Line</text>
+</g>
+<!-- t&#45;&gt;t_l -->
+<g id="edge174" class="edge"><title>t&#45;&gt;t_l</title>
+<path fill="none" stroke="black" d="M88.6728,-8726.88C129.729,-8720.62 209.584,-8708.45 258.109,-8701.05"/>
+<polygon fill="black" stroke="black" points="258.899,-8704.47 268.257,-8699.5 257.844,-8697.55 258.899,-8704.47"/>
+</g>
+<!-- t_m -->
+<g id="node189" class="node"><title>t_m</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8622.87" rx="37.4533" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8626.67" font-family="Times,serif" font-size="14.00">{t m} </text>
+<text text-anchor="middle" x="299.635" y="-8611.67" font-family="Times,serif" font-size="14.00">Move</text>
+</g>
+<!-- t&#45;&gt;t_m -->
+<g id="edge175" class="edge"><title>t&#45;&gt;t_m</title>
+<path fill="none" stroke="black" d="M77.2069,-8711.62C90.8887,-8695.08 112.766,-8671.91 137,-8658.87 172.79,-8639.61 218.345,-8630.64 251.964,-8626.47"/>
+<polygon fill="black" stroke="black" points="252.452,-8629.94 261.991,-8625.33 251.658,-8622.99 252.452,-8629.94"/>
+</g>
+<!-- t_n -->
+<g id="node190" class="node"><title>t_n</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8550.87" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8554.67" font-family="Times,serif" font-size="14.00">{t n} </text>
+<text text-anchor="middle" x="299.635" y="-8539.67" font-family="Times,serif" font-size="14.00">Arrow</text>
+</g>
+<!-- t&#45;&gt;t_n -->
+<g id="edge176" class="edge"><title>t&#45;&gt;t_n</title>
+<path fill="none" stroke="black" d="M66.8604,-8711.62C74.9877,-8680.36 95.5203,-8618.81 137,-8586.87 170.027,-8561.44 217.496,-8553.26 252.451,-8550.96"/>
+<polygon fill="black" stroke="black" points="253.062,-8554.43 262.867,-8550.42 252.7,-8547.44 253.062,-8554.43"/>
+</g>
+<!-- t_o -->
+<g id="node191" class="node"><title>t_o</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8478.87" rx="36.5405" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8482.67" font-family="Times,serif" font-size="14.00">{t o} </text>
+<text text-anchor="middle" x="299.635" y="-8467.67" font-family="Times,serif" font-size="14.00">Rotate</text>
+</g>
+<!-- t&#45;&gt;t_o -->
+<g id="edge177" class="edge"><title>t&#45;&gt;t_o</title>
+<path fill="none" stroke="black" d="M63.159,-8711.65C65.7002,-8669.31 77.9712,-8567.58 137,-8514.87 168.423,-8486.81 216.832,-8479.08 252.485,-8477.6"/>
+<polygon fill="black" stroke="black" points="252.738,-8481.09 262.642,-8477.33 252.552,-8474.09 252.738,-8481.09"/>
+</g>
+<!-- t_p -->
+<g id="node192" class="node"><title>t_p</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8406.87" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8410.67" font-family="Times,serif" font-size="14.00">{t p} </text>
+<text text-anchor="middle" x="299.635" y="-8395.67" font-family="Times,serif" font-size="14.00">Polygon</text>
+</g>
+<!-- t&#45;&gt;t_p -->
+<g id="edge178" class="edge"><title>t&#45;&gt;t_p</title>
+<path fill="none" stroke="black" d="M64.8575,-8711.64C72.3777,-8653.46 97.6376,-8480.92 137,-8442.87 165.597,-8415.23 210.49,-8406.95 245.714,-8405.18"/>
+<polygon fill="black" stroke="black" points="245.963,-8408.67 255.837,-8404.83 245.723,-8401.67 245.963,-8408.67"/>
+</g>
+<!-- t_r -->
+<g id="node193" class="node"><title>t_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8334.87" rx="50.41" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8338.67" font-family="Times,serif" font-size="14.00">{t r} </text>
+<text text-anchor="middle" x="299.635" y="-8323.67" font-family="Times,serif" font-size="14.00">Rectangle</text>
+</g>
+<!-- t&#45;&gt;t_r -->
+<g id="edge179" class="edge"><title>t&#45;&gt;t_r</title>
+<path fill="none" stroke="black" d="M63.7768,-8711.79C68.6636,-8644.57 88.404,-8420.2 137,-8370.87 163.328,-8344.14 204.816,-8335.31 239.167,-8333.07"/>
+<polygon fill="black" stroke="black" points="239.751,-8336.55 249.574,-8332.58 239.419,-8329.56 239.751,-8336.55"/>
+</g>
+<!-- t_t -->
+<g id="node194" class="node"><title>t_t</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8262.87" rx="31.6406" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8266.67" font-family="Times,serif" font-size="14.00">{t t} </text>
+<text text-anchor="middle" x="299.635" y="-8251.67" font-family="Times,serif" font-size="14.00">Text</text>
+</g>
+<!-- t&#45;&gt;t_t -->
+<g id="edge180" class="edge"><title>t&#45;&gt;t_t</title>
+<path fill="none" stroke="black" d="M63.0615,-8711.76C65.6769,-8636.21 79.1203,-8359.62 137,-8298.87 167.774,-8266.57 220.632,-8260.2 257.492,-8260.19"/>
+<polygon fill="black" stroke="black" points="257.849,-8263.7 267.904,-8260.36 257.96,-8256.7 257.849,-8263.7"/>
+</g>
+<!-- t_v -->
+<g id="node195" class="node"><title>t_v</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-8190.87" rx="33.8824" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-8194.67" font-family="Times,serif" font-size="14.00">{t v} </text>
+<text text-anchor="middle" x="299.635" y="-8179.67" font-family="Times,serif" font-size="14.00">Via</text>
+</g>
+<!-- t&#45;&gt;t_v -->
+<g id="edge181" class="edge"><title>t&#45;&gt;t_v</title>
+<path fill="none" stroke="black" d="M62.5444,-8711.78C63.1376,-8628.66 69.7573,-8299.17 137,-8226.87 166.85,-8194.78 218.469,-8188.14 255.344,-8188.02"/>
+<polygon fill="black" stroke="black" points="255.753,-8191.53 265.798,-8188.16 255.845,-8184.53 255.753,-8191.53"/>
+</g>
+<!-- u -->
+<g id="node38" class="node"><title>u</title>
+<polygon fill="none" stroke="black" points="88.5,-9433.87 34.5,-9433.87 34.5,-9395.87 88.5,-9395.87 88.5,-9433.87"/>
+<text text-anchor="middle" x="61.5" y="-9418.67" font-family="Times,serif" font-size="14.00">{u} </text>
+<text text-anchor="middle" x="61.5" y="-9403.67" font-family="Times,serif" font-size="14.00"> undo</text>
+</g>
+<!-- u_c -->
+<g id="node196" class="node"><title>u_c</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9486.87" rx="80.7205" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9490.67" font-family="Times,serif" font-size="14.00">{u c} </text>
+<text text-anchor="middle" x="299.635" y="-9475.67" font-family="Times,serif" font-size="14.00">Clear undo&#45;buffer</text>
+</g>
+<!-- u&#45;&gt;u_c -->
+<g id="edge182" class="edge"><title>u&#45;&gt;u_c</title>
+<path fill="none" stroke="black" d="M88.7613,-9429.4C102.751,-9436.67 120.447,-9445.11 137,-9450.87 162.764,-9459.83 191.632,-9467.09 217.766,-9472.69"/>
+<polygon fill="black" stroke="black" points="217.131,-9476.13 227.635,-9474.75 218.563,-9469.28 217.131,-9476.13"/>
+</g>
+<!-- u_r -->
+<g id="node197" class="node"><title>u_r</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9414.87" rx="117.26" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9418.67" font-family="Times,serif" font-size="14.00">{u r} </text>
+<text text-anchor="middle" x="299.635" y="-9403.67" font-family="Times,serif" font-size="14.00">Redo last undone operation</text>
+</g>
+<!-- u&#45;&gt;u_r -->
+<g id="edge183" class="edge"><title>u&#45;&gt;u_r</title>
+<path fill="none" stroke="black" d="M88.6728,-9414.87C109.476,-9414.87 140.242,-9414.87 171.845,-9414.87"/>
+<polygon fill="black" stroke="black" points="172.124,-9418.37 182.124,-9414.87 172.124,-9411.37 172.124,-9418.37"/>
+</g>
+<!-- u_u -->
+<g id="node198" class="node"><title>u_u</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9342.87" rx="87.8629" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9346.67" font-family="Times,serif" font-size="14.00">{u u} </text>
+<text text-anchor="middle" x="299.635" y="-9331.67" font-family="Times,serif" font-size="14.00">Undo last operation</text>
+</g>
+<!-- u&#45;&gt;u_u -->
+<g id="edge184" class="edge"><title>u&#45;&gt;u_u</title>
+<path fill="none" stroke="black" d="M88.7613,-9400.34C102.751,-9393.07 120.447,-9384.63 137,-9378.87 161.105,-9370.49 187.928,-9363.59 212.685,-9358.16"/>
+<polygon fill="black" stroke="black" points="213.742,-9361.51 222.788,-9355.99 212.277,-9354.66 213.742,-9361.51"/>
+</g>
+<!-- v -->
+<g id="node39" class="node"><title>v</title>
+<polygon fill="none" stroke="black" points="88.5,-9685.87 34.5,-9685.87 34.5,-9647.87 88.5,-9647.87 88.5,-9685.87"/>
+<text text-anchor="middle" x="61.5" y="-9670.67" font-family="Times,serif" font-size="14.00">{v} </text>
+<text text-anchor="middle" x="61.5" y="-9655.67" font-family="Times,serif" font-size="14.00"> view</text>
+</g>
+<!-- v_s -->
+<g id="node40" class="node"><title>v_s</title>
+<polygon fill="none" stroke="black" points="332.135,-9785.87 267.135,-9785.87 267.135,-9747.87 332.135,-9747.87 332.135,-9785.87"/>
+<text text-anchor="middle" x="299.635" y="-9770.67" font-family="Times,serif" font-size="14.00">{v s} </text>
+<text text-anchor="middle" x="299.635" y="-9755.67" font-family="Times,serif" font-size="14.00"> set view</text>
+</g>
+<!-- v&#45;&gt;v_s -->
+<g id="edge27" class="edge"><title>v&#45;&gt;v_s</title>
+<path fill="none" stroke="black" d="M76.7941,-9686.08C90.3593,-9702.82 112.302,-9726.33 137,-9738.87 174.624,-9757.98 222.843,-9764.35 256.788,-9766.32"/>
+<polygon fill="black" stroke="black" points="256.681,-9769.82 266.837,-9766.8 257.016,-9762.83 256.681,-9769.82"/>
+</g>
+<!-- v_c -->
+<g id="node199" class="node"><title>v_c</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9702.87" rx="63.7795" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9706.67" font-family="Times,serif" font-size="14.00">{v c} </text>
+<text text-anchor="middle" x="299.635" y="-9691.67" font-family="Times,serif" font-size="14.00">Center cursor</text>
+</g>
+<!-- v&#45;&gt;v_c -->
+<g id="edge185" class="edge"><title>v&#45;&gt;v_c</title>
+<path fill="none" stroke="black" d="M88.6728,-9670.86C122.346,-9675.99 182.117,-9685.11 229.297,-9692.3"/>
+<polygon fill="black" stroke="black" points="229.051,-9695.8 239.464,-9693.85 230.106,-9688.88 229.051,-9695.8"/>
+</g>
+<!-- v_f -->
+<g id="node200" class="node"><title>v_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9630.87" rx="66.4361" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9634.67" font-family="Times,serif" font-size="14.00">{v f} </text>
+<text text-anchor="middle" x="299.635" y="-9619.67" font-family="Times,serif" font-size="14.00">Zoom Extents</text>
+</g>
+<!-- v&#45;&gt;v_f -->
+<g id="edge186" class="edge"><title>v&#45;&gt;v_f</title>
+<path fill="none" stroke="black" d="M88.6728,-9662.88C121.786,-9657.83 180.139,-9648.94 226.936,-9641.8"/>
+<polygon fill="black" stroke="black" points="227.678,-9645.23 237.036,-9640.26 226.623,-9638.31 227.678,-9645.23"/>
+</g>
+<!-- v_n -->
+<g id="node201" class="node"><title>v_n</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9558.87" rx="142.671" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9562.67" font-family="Times,serif" font-size="14.00">{v n} </text>
+<text text-anchor="middle" x="299.635" y="-9547.67" font-family="Times,serif" font-size="14.00">Show padstack numbers in a subc</text>
+</g>
+<!-- v&#45;&gt;v_n -->
+<g id="edge187" class="edge"><title>v&#45;&gt;v_n</title>
+<path fill="none" stroke="black" d="M77.2069,-9647.62C90.8887,-9631.08 112.766,-9607.91 137,-9594.87 149.444,-9588.17 163.069,-9582.72 176.962,-9578.28"/>
+<polygon fill="black" stroke="black" points="178.051,-9581.61 186.612,-9575.37 176.027,-9574.91 178.051,-9581.61"/>
+</g>
+<!-- v_s_f -->
+<g id="node202" class="node"><title>v_s_f</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-9874.87" rx="45.011" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-9878.67" font-family="Times,serif" font-size="14.00">{v s f} </text>
+<text text-anchor="middle" x="649.51" y="-9863.67" font-family="Times,serif" font-size="14.00">footprint</text>
+</g>
+<!-- v_s&#45;&gt;v_s_f -->
+<g id="edge188" class="edge"><title>v_s&#45;&gt;v_s_f</title>
+<path fill="none" stroke="black" d="M332.339,-9763.35C368.214,-9761.21 426.316,-9763.52 462.269,-9794.87 477.736,-9808.36 461.037,-9825.12 476.269,-9838.87 507.98,-9867.5 556.447,-9875.59 593.899,-9877.04"/>
+<polygon fill="black" stroke="black" points="594.067,-9880.55 604.148,-9877.29 594.234,-9873.55 594.067,-9880.55"/>
+</g>
+<!-- v_s_r -->
+<g id="node203" class="node"><title>v_s_r</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-9802.87" rx="41.0244" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-9806.67" font-family="Times,serif" font-size="14.00">{v s r} </text>
+<text text-anchor="middle" x="649.51" y="-9791.67" font-family="Times,serif" font-size="14.00">refdes</text>
+</g>
+<!-- v_s&#45;&gt;v_s_r -->
+<g id="edge189" class="edge"><title>v_s&#45;&gt;v_s_r</title>
+<path fill="none" stroke="black" d="M332.428,-9770.16C393.098,-9776.44 525.8,-9790.17 598.478,-9797.69"/>
+<polygon fill="black" stroke="black" points="598.443,-9801.21 608.75,-9798.76 599.163,-9794.24 598.443,-9801.21"/>
+</g>
+<!-- v_s_s -->
+<g id="node204" class="node"><title>v_s_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-9730.87" rx="61.5366" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-9734.67" font-family="Times,serif" font-size="14.00">{v s s} </text>
+<text text-anchor="middle" x="649.51" y="-9719.67" font-family="Times,serif" font-size="14.00">refdes+value</text>
+</g>
+<!-- v_s&#45;&gt;v_s_s -->
+<g id="edge190" class="edge"><title>v_s&#45;&gt;v_s_s</title>
+<path fill="none" stroke="black" d="M332.428,-9763.58C388.016,-9757.83 504.074,-9745.82 579.029,-9738.06"/>
+<polygon fill="black" stroke="black" points="579.735,-9741.51 589.322,-9737 579.014,-9734.54 579.735,-9741.51"/>
+</g>
+<!-- v_s_v -->
+<g id="node205" class="node"><title>v_s_v</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-9658.87" rx="42.3529" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-9662.67" font-family="Times,serif" font-size="14.00">{v s v} </text>
+<text text-anchor="middle" x="649.51" y="-9647.67" font-family="Times,serif" font-size="14.00">value</text>
+</g>
+<!-- v_s&#45;&gt;v_s_v -->
+<g id="edge191" class="edge"><title>v_s&#45;&gt;v_s_v</title>
+<path fill="none" stroke="black" d="M332.339,-9770.39C368.214,-9772.53 426.316,-9770.22 462.269,-9738.87 477.736,-9725.38 461.037,-9708.62 476.269,-9694.87 508.809,-9665.49 558.993,-9657.74 596.814,-9656.6"/>
+<polygon fill="black" stroke="black" points="597.183,-9660.09 607.128,-9656.44 597.075,-9653.09 597.183,-9660.09"/>
+</g>
+<!-- w -->
+<g id="node41" class="node"><title>w</title>
+<polygon fill="none" stroke="black" points="93.5,-10065.9 29.5,-10065.9 29.5,-10027.9 93.5,-10027.9 93.5,-10065.9"/>
+<text text-anchor="middle" x="61.5" y="-10050.7" font-family="Times,serif" font-size="14.00">{w} </text>
+<text text-anchor="middle" x="61.5" y="-10035.7" font-family="Times,serif" font-size="14.00"> window</text>
+</g>
+<!-- w_a -->
+<g id="node206" class="node"><title>w_a</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10262.9" rx="43.6818" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10266.7" font-family="Times,serif" font-size="14.00">{w a} </text>
+<text text-anchor="middle" x="299.635" y="-10251.7" font-family="Times,serif" font-size="14.00">About...</text>
+</g>
+<!-- w&#45;&gt;w_a -->
+<g id="edge192" class="edge"><title>w&#45;&gt;w_a</title>
+<path fill="none" stroke="black" d="M64.6531,-10066C69.8833,-10103.1 86.7645,-10184.7 137,-10226.9 167.022,-10252.1 210.934,-10260.7 245.413,-10263.2"/>
+<polygon fill="black" stroke="black" points="245.602,-10266.7 255.785,-10263.7 246.001,-10259.7 245.602,-10266.7"/>
+</g>
+<!-- w_d -->
+<g id="node207" class="node"><title>w_d</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10190.9" rx="58.8803" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10194.7" font-family="Times,serif" font-size="14.00">{w d} </text>
+<text text-anchor="middle" x="299.635" y="-10179.7" font-family="Times,serif" font-size="14.00">DRC Check</text>
+</g>
+<!-- w&#45;&gt;w_d -->
+<g id="edge193" class="edge"><title>w&#45;&gt;w_d</title>
+<path fill="none" stroke="black" d="M70.4181,-10066.2C81.5278,-10090.8 104.134,-10132.7 137,-10154.9 164.523,-10173.4 200.095,-10182.6 230.858,-10187"/>
+<polygon fill="black" stroke="black" points="230.719,-10190.5 241.088,-10188.3 231.624,-10183.6 230.719,-10190.5"/>
+</g>
+<!-- w_f -->
+<g id="node208" class="node"><title>w_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10118.9" rx="61.5366" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10122.7" font-family="Times,serif" font-size="14.00">{w f} </text>
+<text text-anchor="middle" x="299.635" y="-10107.7" font-family="Times,serif" font-size="14.00">Font selector</text>
+</g>
+<!-- w&#45;&gt;w_f -->
+<g id="edge194" class="edge"><title>w&#45;&gt;w_f</title>
+<path fill="none" stroke="black" d="M93.7165,-10063.9C106.797,-10070.6 122.346,-10077.8 137,-10082.9 167.363,-10093.4 202.039,-10101.6 231.467,-10107.5"/>
+<polygon fill="black" stroke="black" points="231.156,-10111 241.641,-10109.5 232.498,-10104.2 231.156,-10111"/>
+</g>
+<!-- w_l -->
+<g id="node209" class="node"><title>w_l</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10046.9" rx="40.1111" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10050.7" font-family="Times,serif" font-size="14.00">{w l} </text>
+<text text-anchor="middle" x="299.635" y="-10035.7" font-family="Times,serif" font-size="14.00">Library</text>
+</g>
+<!-- w&#45;&gt;w_l -->
+<g id="edge195" class="edge"><title>w&#45;&gt;w_l</title>
+<path fill="none" stroke="black" d="M93.8568,-10046.9C133.513,-10046.9 202.254,-10046.9 249.053,-10046.9"/>
+<polygon fill="black" stroke="black" points="249.273,-10050.4 259.273,-10046.9 249.273,-10043.4 249.273,-10050.4"/>
+</g>
+<!-- w_m -->
+<g id="node210" class="node"><title>w_m</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9974.87" rx="63.7795" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9978.67" font-family="Times,serif" font-size="14.00">{w m} </text>
+<text text-anchor="middle" x="299.635" y="-9963.67" font-family="Times,serif" font-size="14.00">Message Log</text>
+</g>
+<!-- w&#45;&gt;w_m -->
+<g id="edge196" class="edge"><title>w&#45;&gt;w_m</title>
+<path fill="none" stroke="black" d="M93.7165,-10029.8C106.797,-10023.2 122.346,-10016 137,-10010.9 166.877,-10000.5 200.93,-9992.37 230.05,-9986.5"/>
+<polygon fill="black" stroke="black" points="230.993,-9989.88 240.129,-9984.52 229.642,-9983.02 230.993,-9989.88"/>
+</g>
+<!-- w_n -->
+<g id="node211" class="node"><title>w_n</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9902.87" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9906.67" font-family="Times,serif" font-size="14.00">{w n} </text>
+<text text-anchor="middle" x="299.635" y="-9891.67" font-family="Times,serif" font-size="14.00">Netlist</text>
+</g>
+<!-- w&#45;&gt;w_n -->
+<g id="edge197" class="edge"><title>w&#45;&gt;w_n</title>
+<path fill="none" stroke="black" d="M70.4181,-10027.5C81.5278,-10003 104.134,-9961.02 137,-9938.87 170.812,-9916.08 216.77,-9907.49 251.038,-9904.37"/>
+<polygon fill="black" stroke="black" points="251.577,-9907.84 261.272,-9903.56 251.028,-9900.86 251.577,-9907.84"/>
+</g>
+<!-- w_p -->
+<g id="node212" class="node"><title>w_p</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-9830.87" rx="38.3684" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-9834.67" font-family="Times,serif" font-size="14.00">{w p} </text>
+<text text-anchor="middle" x="299.635" y="-9819.67" font-family="Times,serif" font-size="14.00">Pinout</text>
+</g>
+<!-- w&#45;&gt;w_p -->
+<g id="edge198" class="edge"><title>w&#45;&gt;w_p</title>
+<path fill="none" stroke="black" d="M64.6531,-10027.7C69.8833,-9990.68 86.7645,-9909.08 137,-9866.87 168.754,-9840.19 216.047,-9832.15 251.283,-9830.21"/>
+<polygon fill="black" stroke="black" points="251.488,-9833.7 261.338,-9829.8 251.205,-9826.71 251.488,-9833.7"/>
+</g>
+<!-- m_k_s -->
+<g id="node149" class="node"><title>m_k_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-5570.87" rx="137.358" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-5574.67" font-family="Times,serif" font-size="14.00">{m k s} </text>
+<text text-anchor="middle" x="649.51" y="-5559.67" font-family="Times,serif" font-size="14.00">Loose subcircuits (no subc lock)</text>
+</g>
+<!-- m_k&#45;&gt;m_k_s -->
+<g id="edge136" class="edge"><title>m_k&#45;&gt;m_k_s</title>
+<path fill="none" stroke="black" d="M326.215,-5612.56C367.726,-5607.19 452.389,-5596.24 524.526,-5586.91"/>
+<polygon fill="black" stroke="black" points="525.148,-5590.36 534.616,-5585.6 524.25,-5583.41 525.148,-5590.36"/>
+</g>
+<!-- s_b_p -->
+<g id="node169" class="node"><title>s_b_p</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7514.87" rx="143.585" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7518.67" font-family="Times,serif" font-size="14.00">{s b p} </text>
+<text text-anchor="middle" x="649.51" y="-7503.67" font-family="Times,serif" font-size="14.00">Break selection padstack to pieces</text>
+</g>
+<!-- s_b&#45;&gt;s_b_p -->
+<g id="edge156" class="edge"><title>s_b&#45;&gt;s_b_p</title>
+<path fill="none" stroke="black" d="M326.677,-7585.75C359.346,-7583.62 416.618,-7577.49 462.269,-7559.87 469.17,-7557.21 469.424,-7553.67 476.269,-7550.87 492.609,-7544.18 510.349,-7538.67 528.026,-7534.16"/>
+<polygon fill="black" stroke="black" points="528.953,-7537.54 537.831,-7531.75 527.285,-7530.74 528.953,-7537.54"/>
+</g>
+<!-- s_b_s -->
+<g id="node171" class="node"><title>s_b_s</title>
+<ellipse fill="none" stroke="black" cx="649.51" cy="-7442.87" rx="152.056" ry="26.7407"/>
+<text text-anchor="middle" x="649.51" y="-7446.67" font-family="Times,serif" font-size="14.00">{s b s} </text>
+<text text-anchor="middle" x="649.51" y="-7431.67" font-family="Times,serif" font-size="14.00">Break selection subcircuits to pieces</text>
+</g>
+<!-- s_b&#45;&gt;s_b_s -->
+<g id="edge157" class="edge"><title>s_b&#45;&gt;s_b_s</title>
+<path fill="none" stroke="black" d="M326.205,-7590.79C361.882,-7594.68 426.258,-7595.68 462.269,-7559.87 488.175,-7534.11 450.89,-7505.15 476.269,-7478.87 484.068,-7470.79 493.177,-7464.3 503.06,-7459.09"/>
+<polygon fill="black" stroke="black" points="504.821,-7462.12 512.338,-7454.66 501.806,-7455.81 504.821,-7462.12"/>
+</g>
+<!-- z_e -->
+<g id="node213" class="node"><title>z_e</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10622.9" rx="66.4361" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10626.7" font-family="Times,serif" font-size="14.00">{z e} </text>
+<text text-anchor="middle" x="299.635" y="-10611.7" font-family="Times,serif" font-size="14.00">Zoom Extents</text>
+</g>
+<!-- z -->
+<g id="node214" class="node"><title>z</title>
+<ellipse fill="none" stroke="black" cx="61.5" cy="-10478.9" rx="27" ry="18"/>
+<text text-anchor="middle" x="61.5" y="-10475.2" font-family="Times,serif" font-size="14.00">z</text>
+</g>
+<!-- z&#45;&gt;z_e -->
+<g id="edge199" class="edge"><title>z&#45;&gt;z_e</title>
+<path fill="none" stroke="black" d="M69.4888,-10496.1C80.2371,-10520.4 103.189,-10564.1 137,-10586.9 162.378,-10604 194.598,-10613.1 223.582,-10617.9"/>
+<polygon fill="black" stroke="black" points="223.272,-10621.4 233.682,-10619.4 224.316,-10614.4 223.272,-10621.4"/>
+</g>
+<!-- z_f -->
+<g id="node215" class="node"><title>z_f</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10550.9" rx="70.0071" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10554.7" font-family="Times,serif" font-size="14.00">{z f} </text>
+<text text-anchor="middle" x="299.635" y="-10539.7" font-family="Times,serif" font-size="14.00">Zoom to found</text>
+</g>
+<!-- z&#45;&gt;z_f -->
+<g id="edge200" class="edge"><title>z&#45;&gt;z_f</title>
+<path fill="none" stroke="black" d="M82.8266,-10490.3C97.5046,-10498.1 118.005,-10508.3 137,-10514.9 165.175,-10524.7 197.063,-10532.4 225.026,-10538.2"/>
+<polygon fill="black" stroke="black" points="224.642,-10541.7 235.136,-10540.2 226.025,-10534.8 224.642,-10541.7"/>
+</g>
+<!-- z_s -->
+<g id="node216" class="node"><title>z_s</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10478.9" rx="82.0488" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10482.7" font-family="Times,serif" font-size="14.00">{z s} </text>
+<text text-anchor="middle" x="299.635" y="-10467.7" font-family="Times,serif" font-size="14.00">Zoom to selection</text>
+</g>
+<!-- z&#45;&gt;z_s -->
+<g id="edge201" class="edge"><title>z&#45;&gt;z_s</title>
+<path fill="none" stroke="black" d="M88.6728,-10478.9C117.298,-10478.9 164.784,-10478.9 207.362,-10478.9"/>
+<polygon fill="black" stroke="black" points="207.496,-10482.4 217.496,-10478.9 207.496,-10475.4 207.496,-10482.4"/>
+</g>
+<!-- z_x -->
+<g id="node217" class="node"><title>z_x</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10406.9" rx="72.6644" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10410.7" font-family="Times,serif" font-size="14.00">{z x} </text>
+<text text-anchor="middle" x="299.635" y="-10395.7" font-family="Times,serif" font-size="14.00">Zoom Out 20%</text>
+</g>
+<!-- z&#45;&gt;z_x -->
+<g id="edge202" class="edge"><title>z&#45;&gt;z_x</title>
+<path fill="none" stroke="black" d="M82.8266,-10467.5C97.5046,-10459.6 118.005,-10449.5 137,-10442.9 164.57,-10433.3 195.696,-10425.6 223.22,-10419.9"/>
+<polygon fill="black" stroke="black" points="224.083,-10423.3 233.185,-10417.9 222.688,-10416.4 224.083,-10423.3"/>
+</g>
+<!-- z_z -->
+<g id="node218" class="node"><title>z_z</title>
+<ellipse fill="none" stroke="black" cx="299.635" cy="-10334.9" rx="66.4361" ry="26.7407"/>
+<text text-anchor="middle" x="299.635" y="-10338.7" font-family="Times,serif" font-size="14.00">{z z} </text>
+<text text-anchor="middle" x="299.635" y="-10323.7" font-family="Times,serif" font-size="14.00">Zoom In 20%</text>
+</g>
+<!-- z&#45;&gt;z_z -->
+<g id="edge203" class="edge"><title>z&#45;&gt;z_z</title>
+<path fill="none" stroke="black" d="M69.4888,-10461.6C80.2371,-10437.4 103.189,-10393.7 137,-10370.9 162.378,-10353.8 194.598,-10344.7 223.582,-10339.9"/>
+<polygon fill="black" stroke="black" points="224.316,-10343.3 233.682,-10338.3 223.272,-10336.4 224.316,-10343.3"/>
+</g>
+</g>
+</svg>
Index: tags/2.0.1/doc/user/05_ui/06_common/keytree.txt
===================================================================
--- tags/2.0.1/doc/user/05_ui/06_common/keytree.txt	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/06_common/keytree.txt	(revision 18980)
@@ -0,0 +1,266 @@
++	pcb-menu-default.lht	Zoom(-1.2) 	Zoom In 20%
+,	pcb-menu-default.lht	CycleDrag() 	Cycle object being dragged
+-	pcb-menu-default.lht	Zoom(+1.2) 	Zoom Out 20%
+.	pcb-menu-default.lht	conf(toggle, editor\057all_direction_lines, design)	'All-direction' lines
+0	pcb-menu-default.lht	SelectLayer(10) 	Select Layer 10
+0-alt	pcb-menu-default.lht	SelectLayer(20) 	Select Layer 20
+0-alt-ctrl	pcb-menu-default.lht	ToggleView(20) 	Toggle Layer 20
+0-ctrl	pcb-menu-default.lht	ToggleView(10) 	Toggle Layer 10
+1	pcb-menu-default.lht	SelectLayer(1) 	Select Layer 1
+1-alt	pcb-menu-default.lht	SelectLayer(11) 	Select Layer 11
+1-alt-ctrl	pcb-menu-default.lht	ToggleView(11) 	Toggle Layer 11
+1-ctrl	pcb-menu-default.lht	ToggleView(1) 	Toggle Layer 1
+2	pcb-menu-default.lht	SelectLayer(2) 	Select Layer 2
+2-alt	pcb-menu-default.lht	SelectLayer(12) 	Select Layer 12
+2-alt-ctrl	pcb-menu-default.lht	ToggleView(12) 	Toggle Layer 12
+2-ctrl	pcb-menu-default.lht	ToggleView(2) 	Toggle Layer 2
+3	pcb-menu-default.lht	SelectLayer(3) 	Select Layer 3
+3-alt	pcb-menu-default.lht	SelectLayer(13) 	Select Layer 13
+3-alt-ctrl	pcb-menu-default.lht	ToggleView(13) 	Toggle Layer 13
+3-ctrl	pcb-menu-default.lht	ToggleView(3) 	Toggle Layer 3
+4	pcb-menu-default.lht	SelectLayer(4) 	Select Layer 4
+4-alt	pcb-menu-default.lht	SelectLayer(14) 	Select Layer 14
+4-alt-ctrl	pcb-menu-default.lht	ToggleView(14) 	Toggle Layer 14
+4-ctrl	pcb-menu-default.lht	ToggleView(4) 	Toggle Layer 4
+5	pcb-menu-default.lht	SelectLayer(5) 	Select Layer 5
+5-alt	pcb-menu-default.lht	SelectLayer(15) 	Select Layer 15
+5-alt-ctrl	pcb-menu-default.lht	ToggleView(15) 	Toggle Layer 15
+5-ctrl	pcb-menu-default.lht	ToggleView(5) 	Toggle Layer 5
+6	pcb-menu-default.lht	SelectLayer(6) 	Select Layer 6
+6-alt	pcb-menu-default.lht	SelectLayer(16) 	Select Layer 16
+6-alt-ctrl	pcb-menu-default.lht	ToggleView(16) 	Toggle Layer 16
+6-ctrl	pcb-menu-default.lht	ToggleView(6) 	Toggle Layer 6
+7	pcb-menu-default.lht	SelectLayer(7) 	Select Layer 7
+7-alt	pcb-menu-default.lht	SelectLayer(17) 	Select Layer 17
+7-alt-ctrl	pcb-menu-default.lht	ToggleView(17) 	Toggle Layer 17
+7-ctrl	pcb-menu-default.lht	ToggleView(7) 	Toggle Layer 7
+8	pcb-menu-default.lht	SelectLayer(8) 	Select Layer 8
+8-alt	pcb-menu-default.lht	SelectLayer(18) 	Select Layer 18
+8-alt-ctrl	pcb-menu-default.lht	ToggleView(18) 	Toggle Layer 18
+8-ctrl	pcb-menu-default.lht	ToggleView(8) 	Toggle Layer 8
+9	pcb-menu-default.lht	SelectLayer(9) 	Select Layer 9
+9-alt	pcb-menu-default.lht	SelectLayer(19) 	Select Layer 19
+9-alt-ctrl	pcb-menu-default.lht	ToggleView(19) 	Toggle Layer 19
+9-ctrl	pcb-menu-default.lht	ToggleView(9) 	Toggle Layer 9
+:	pcb-menu-default.lht	Command() 	Command Entry
+[	pcb-menu-default.lht	Grid(down) 	Previous grid
+\	pcb-menu-default.lht	fullscreen(toggle) 	Full screen
+\057	pcb-menu-default.lht	Display(CycleClip) 	Cycle line clip\057refraction
+]	pcb-menu-default.lht	Grid(up) 	Next grid
+a;a	pcb-menu-default.lht	Mode(Save);Mode(Arc);Mode(Notify)	Start routing an arc
+a;b;f;	pcb-menu-default.lht	ReplaceFootprint() 	Replace footprint
+a;b;s;	pcb-menu-default.lht	net(swap) 	Swap nets on two selected pins
+a;b;x	pcb-menu-default.lht	SavePatch() 	netlist patch for back annotation
+a;d;a;	pcb-menu-default.lht	DisperseElements(All) 	Disperse all subcircuits
+a;d;s;	pcb-menu-default.lht	DisperseElements(Selected) 	Disperse selected subcircuits
+a;l	pcb-menu-default.lht	Mode(Save);Mode(Line);Mode(Notify)	Start routing a line
+a;m	pcb-menu-default.lht	MarkCrosshair() 	Place mark
+a;o;a;	pcb-menu-default.lht	djopt(auto) 	Auto-Optimize
+a;o;d;	pcb-menu-default.lht	djopt(debumpify) 	Debumpify
+a;o;m;	pcb-menu-default.lht	djopt(miter) 	Miter
+a;o;n;	pcb-menu-default.lht	djopt(vianudge) 	Vianudge
+a;o;o;	pcb-menu-default.lht	djopt(orthopull) 	Ortho pull
+a;o;p;	pcb-menu-default.lht	Puller() 	Puller
+a;o;s;	pcb-menu-default.lht	djopt(simple) 	Simple optimization
+a;o;t;	pcb-menu-default.lht	djopt(viatrim) 	Viatrim
+a;o;u;	pcb-menu-default.lht	djopt(unjaggy) 	Unjaggy
+a;p;s;	pcb-menu-default.lht	AutoPlaceSelected() 	Auto-place selected subcircuits
+a;r;a;	pcb-menu-default.lht	AutoRoute(AllRats) 	Auto-route all rats
+a;r;r;	pcb-menu-default.lht	RipUp(All) 	Rip up all auto-routed tracks
+a;r;s;	pcb-menu-default.lht	AutoRoute(SelectedRats) 	Auto-route selected rats
+a;r;t;	pcb-menu-default.lht	RipUp(Selected) 	Rip up selected auto-routed tracks
+a;v	pcb-menu-default.lht	Mode(Save);Mode(Via);Mode(Notify);Mode(Restore)	Place via
+a;w	pcb-menu-default.lht	MarkCrosshair() 	Place mark
+a;x;	pcb-menu-default.lht	DRC() 	Design Rule Checker
+b;1;	pcb-menu-default.lht	PasteBuffer(1)	Select Buffer #1
+b;2;	pcb-menu-default.lht	PasteBuffer(2)	Select Buffer #2
+b;3;	pcb-menu-default.lht	PasteBuffer(3)	Select Buffer #3
+b;4;	pcb-menu-default.lht	PasteBuffer(4)	Select Buffer #4
+b;5;	pcb-menu-default.lht	PasteBuffer(5)	Select scratchpad
+b;b;	pcb-menu-default.lht	LayerBinding(buffer) 	Layer bindings...
+b;c;c;	pcb-menu-default.lht	PasteBuffer(Clear) 	Clear buffer
+b;c;p	pcb-menu-default.lht	PadstackConvert(buffer);Mode(PasteBuffer)	Convert buffer to padstack
+b;c;s	pcb-menu-default.lht	PasteBuffer(ConvertSubc) 	Convert buffer to subcircuit
+b;m;l	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Rotate,1);PasteBuffer(Mirror);PasteBuffer(Rotate,3)	Mirror buffer (left\057right)
+b;m;u	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Mirror)	Mirror buffer (up\057down)
+b;n	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Rotate,1);PasteBuffer(Normalize)	Normalize
+b;r;a	pcb-menu-default.lht	Mode(PasteBuffer);FreeRotateBuffer()	Arbitrarily Rotate Buffer
+b;r;l	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Rotate,1)	Rotate buffer 90 deg CCW (left)
+b;r;r	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Rotate,3)	Rotate buffer 90 deg CW (right)
+b;s;b	pcb-menu-default.lht	PasteBuffer(Restore) 	Break buffer subcircuits to pieces
+b;s;p	pcb-menu-default.lht	PadstackBreakup(buffer) 	Break buffer padstacks to pieces
+b;s;s	pcb-menu-default.lht	Save(PasteBuffer) 	Save buffer subcircuits to file
+c-ctrl;	pcb-menu-default.lht	GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);Unselect(All);Mode(PasteBuffer)	Copy selection to buffer
+c;c;	pcb-menu-default.lht	Connection(Reset);Display(Redraw)	Clear\057reset lookup
+c;d;	pcb-menu-default.lht	Atomic(Save);Connection(Reset);Atomic(Restore);Unselect(All);Atomic(Restore);Connection(Find);Atomic(Restore);Select(Connection);Atomic(Restore);RemoveSelected();Atomic(Restore);Connection(Reset);Atomic(Restore);Unselect(All);Atomic(Block)	Del\057Remove Connected
+c;e;	pcb-menu-default.lht	DeleteRats(AllRats) 	Erase rats nest
+c;f;	pcb-menu-default.lht	Connection(Reset);Connection(Find)	Find Connections
+c;r;	pcb-menu-default.lht	Atomic(Save);DeleteRats(AllRats);Atomic(Restore);AddRats(AllRats);Atomic(Block)	Optimize rats nest
+c;s;	pcb-menu-default.lht	AddRats(Close) 	Select shortest rat
+delete	pcb-menu-default.lht	Mode(Save);Mode(Remove);Mode(Notify);Mode(Restore)	Remove object
+down	pcb-menu-default.lht	Cursor(Warp,0,-1,grid) 	Step Down
+down-shift	pcb-menu-default.lht	Cursor(Pan,0,-50,view) 	Step +Down
+e;c	pcb-menu-default.lht	GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);Unselect(All);Mode(PasteBuffer)	Copy selection to buffer
+e;d	pcb-menu-default.lht	Mode(Save);Mode(Remove);Mode(Notify);Mode(Restore)	Remove object
+e;f	pcb-menu-default.lht	FlagEdit() 	Object flags...
+e;g;c	pcb-menu-default.lht	ChangeClearSize(Object,+2,mil) 	Clearance +2 mil
+e;g;c-shift	pcb-menu-default.lht	ChangeClearSize(Object,-2,mil) 	Clearance -2 mil
+e;g;d	pcb-menu-default.lht	ChangeDrillSize(Object,+5,mil) 	ChangeDrill +5 mil
+e;g;d-shift	pcb-menu-default.lht	ChangeDrillSize(Object,-5,mil) 	ChangeDrill -5 mil
+e;g;s	pcb-menu-default.lht	ChangeSize(Object,+5,mil) 	ChangeSize +5 mil
+e;g;s-shift	pcb-menu-default.lht	ChangeSize(Object,-5,mil) 	ChangeSize -5 mil
+e;g;y	pcb-menu-default.lht	ChangeSizes(Object,style,mil) 	ChangeSizes to Route style
+e;i	pcb-menu-default.lht	Flip(Object) 	Flip Object
+e;j	pcb-menu-default.lht	ChangeJoin(Object) 	ChangeJoin Object
+e;l	pcb-menu-default.lht	MoveToCurrentLayer(Object) 	Move to current layer
+e;o	pcb-menu-default.lht	FontSel(Object) 	Edit name of/Change font on layout
+e;p	pcb-menu-default.lht	PropEdit() 	Object Properties...
+e;s;b	pcb-menu-default.lht	LayerBinding() 	Layer bindings...
+e;s;e	pcb-menu-default.lht	GetXY(Click on the subcircuit to edit);extedit(object)	External editor...
+e;s;r	pcb-menu-default.lht	ChangeName(Subc) 	Refdes
+e;s;s	pcb-menu-default.lht	SetSame() 	Set Same Style
+e;t	pcb-menu-default.lht	ChangeName(Object) 	text or name
+e;v	pcb-menu-default.lht	Mode(PasteBuffer) 	Paste buffer to layout
+e;x	pcb-menu-default.lht	GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);RemoveSelected();Unselect(All);Mode(PasteBuffer)	Cut selection to buffer
+e;y;	pcb-menu-default.lht	CycleDrag() 	Cycle object being dragged
+enter	pcb-menu-default.lht	Mode(Notify);Mode(Release)	Click
+escape	pcb-menu-default.lht	Mode(Escape) 	Cancel
+f1	pcb-menu-default.lht	Mode(Via)	Via
+f10	pcb-menu-default.lht	Mode(Thermal)	Thermal
+f11	pcb-menu-default.lht	Mode(Arrow)	Arrow
+f12	pcb-menu-default.lht	Mode(Lock)	Lock
+f2	pcb-menu-default.lht	Mode(Line)	Line
+f3	pcb-menu-default.lht	Mode(Arc)	Arc
+f4	pcb-menu-default.lht	Mode(Text)	Text
+f5	pcb-menu-default.lht	Mode(Rectangle)	Rectangle
+f6	pcb-menu-default.lht	Mode(Polygon)	Polygon
+f7	pcb-menu-default.lht	Mode(PasteBuffer)	Buffer
+f7-shift	pcb-menu-default.lht	Mode(PasteBuffer);PasteBuffer(Rotate,1)	Rotate buffer 90 deg CCW (left)
+f8	pcb-menu-default.lht	Mode(Remove)	Del\057Remove
+f9	pcb-menu-default.lht	Mode(Rotate)	Rotate
+f;a	pcb-menu-default.lht	Save(LayoutAs)	Save Layout As...
+f;c;p;	pcb-menu-default.lht	ManagePlugins() 	Manage plugins...
+f;e	pcb-menu-default.lht	ExportGUI()	Export layout...
+f;l	pcb-menu-default.lht	Load(Layout)	Load layout...
+f;n	pcb-menu-default.lht	New() 	Start New Layout
+f;o	pcb-menu-default.lht	Load(Layout)	Load layout...
+f;p	pcb-menu-default.lht	Print()	Print layout...
+f;q	pcb-menu-default.lht	Quit() 	Quit Program
+f;r	pcb-menu-default.lht	Load(Revert,none)	Revert
+f;s	pcb-menu-default.lht	Save(Layout)	Save Layout
+f;x;p	pcb-menu-default.lht	SavePatch() 	netlist patch for back annotation
+g;b	pcb-menu-default.lht	Grid(down) 	Previous grid
+g;d	pcb-menu-default.lht	SetValue(Grid,*2) 	Grid *2
+g;f	pcb-menu-default.lht	Grid(up) 	Next grid
+g;h	pcb-menu-default.lht	SetValue(Grid,\0572) 	Grid \0572
+g;i	pcb-menu-default.lht	SetUnits(mil)	mil
+g;l	pcb-menu-default.lht	conf(toggle, plugins\057hid_gtk\057local_grid\057enable, design) 	Enable local grid
+g;m	pcb-menu-default.lht	SetUnits(mm)	mm
+g;r	pcb-menu-default.lht	 GetXY(Click to set the grid origin); Display(ToggleGrid) 	Realign grid
+g;v	pcb-menu-default.lht	conf(toggle, editor\057draw_grid, design) 	Enable visible grid
+i;a	pcb-menu-default.lht	About() 	About...
+i;c;c	pcb-menu-default.lht	PrintCalibrate() 	Calibrate Printer...
+i;c;p	pcb-menu-default.lht	DoWindows(Preferences)	Preferences...
+i;c;r	pcb-menu-default.lht	fp_rehash() 	Re-scan the footprint library
+i;d	pcb-menu-default.lht	Report(DrillReport) 	Generate drill summary
+i;f	pcb-menu-default.lht	Report(FoundPins) 	Report found padstacks
+i;r	pcb-menu-default.lht	ReportObject() 	Generate object report
+insert	pcb-menu-default.lht	Mode(InsertPoint)	Insert Point
+left	pcb-menu-default.lht	Cursor(Warp,-1,0,grid) 	Step Left
+left-shift	pcb-menu-default.lht	Cursor(Pan,-50,0,view) 	Step +Left
+m;c;c	pcb-menu-default.lht	conf(toggle, editor\057show_drc, design) 	Crosshair shows DRC clearance
+m;c;o	pcb-menu-default.lht	conf(toggle, editor\057orthogonal_moves, design) 	Orthogonal moves
+m;c;p	pcb-menu-default.lht	conf(toggle, editor\057snap_pin, design) 	Crosshair snaps to padstacks
+m;c;s	pcb-menu-default.lht	conf(toggle, editor\057snap_offgrid_line, design) 	Crosshair snaps to off-grid points on lines
+m;d;a	pcb-menu-default.lht	conf(toggle, editor\057live_routing, design) 	Show autorouter trials
+m;d;c	pcb-menu-default.lht	conf(toggle, editor\057check_planes, design) 	Check polygons
+m;d;h	pcb-menu-default.lht	conf(toggle, editor\057highlight_on_point, design) 	Highlighting on line, arc points
+m;d;p	pcb-menu-default.lht	conf(toggle, editor\057thin_draw_poly, design)	Thin draw poly
+m;d;t	pcb-menu-default.lht	conf(toggle, editor\057thin_draw, design) 	Thin draw
+m;d;w	pcb-menu-default.lht	conf(toggle, editor\057wireframe_draw, design) 	Wireframe draw
+m;f;h	pcb-menu-default.lht	conf(toggle, editor\057hide_names, design) 	Hide floaters
+m;f;l	pcb-menu-default.lht	conf(toggle, editor\057lock_names, design) 	Lock floaters
+m;f;o	pcb-menu-default.lht	conf(toggle, editor\057only_names, design) 	Only floaters
+m;k;s	pcb-menu-default.lht	subc(loose, toggle)	Loose subcircuits (no subc lock)
+m;l;+	pcb-menu-default.lht	SetValue(LineSize,+5,mil) 	Line Tool size +5 mil
+m;l;-	pcb-menu-default.lht	SetValue(LineSize,-5,mil) 	Line Tool size -5 mil
+m;l;a	pcb-menu-default.lht	conf(toggle, editor\057all_direction_lines, design)	'All-direction' lines
+m;l;c	pcb-menu-default.lht	conf(toggle, editor\057clear_line, design) 	New lines, arcs clear polygons
+m;l;d	pcb-menu-default.lht	conf(toggle, editor\057auto_drc, design) 	Auto enforce DRC clearance
+m;l;f	pcb-menu-default.lht	Display(CycleClip) 	Cycle line clip\057refraction
+m;p;c	pcb-menu-default.lht	conf(toggle, editor\057clear_polypoly, design) 	New polygons clear polygons
+m;p;f	pcb-menu-default.lht	conf(toggle, editor\057full_poly, design) 	New polygons are full ones
+m;r;m	pcb-menu-default.lht	conf(toggle, editor\057rubber_band_keep_midlinedir, design) 	Rubber band keeps middle line dir
+m;r;r	pcb-menu-default.lht	conf(toggle, editor\057rubber_band_mode, design) 	Rubber band mode
+m;t;+	pcb-menu-default.lht	SetValue(TextScale,+10,mil) 	Text Tool scale +10 mil
+m;t;-	pcb-menu-default.lht	SetValue(TextScale,-10,mil) 	Text Tool scale -10 mil
+n-ctrl	pcb-menu-default.lht	New() 	Start New Layout
+q-ctrl	pcb-menu-default.lht	Quit() 	Quit Program
+r;r;+	pcb-menu-default.lht	conf(delta, editor\057route_radius, +0.5, design)	Route radius +0.5
+r;r;-	pcb-menu-default.lht	conf(delta, editor\057route_radius, -0.5, design)	Route radius -0.5
+r;r;m	pcb-menu-default.lht	conf(delta, editor\057route_radius, -0.5, design)	Route radius -0.5
+r;r;p	pcb-menu-default.lht	conf(delta, editor\057route_radius, +0.5, design)	Route radius +0.5
+right	pcb-menu-default.lht	Cursor(Warp,1,0,grid) 	Step Right
+right-shift	pcb-menu-default.lht	Cursor(Pan,50,0,view) 	Step +Right
+s-ctrl	pcb-menu-default.lht	Save(Layout)	Save Layout
+s-ctrl-shift	pcb-menu-default.lht	Save(LayoutAs)	Save Layout As...
+s;a;a;	pcb-menu-default.lht	Select(All) 	Select all visible objects
+s;a;c;	pcb-menu-default.lht	Select(Connection) 	Select all connected objects
+s;b;p	pcb-menu-default.lht	PadstackBreakup(selected) 	Break selection padstack to pieces
+s;b;s	pcb-menu-default.lht	PasteBuffer(Push);PasteBuffer(5);PasteBuffer(Clear);PasteBuffer(AddSelected);RemoveSelected();PasteBuffer(Restore);PasteBuffer(ToLayout, crosshair);PasteBuffer(Clear);PasteBuffer(Pop)	Break selection subcircuits to pieces
+s;c;p;	pcb-menu-default.lht	PadstackConvert(selected);Mode(PasteBuffer)	Convert selection to padstack
+s;c;s;	pcb-menu-default.lht	Select(ConvertSubc) 	Convert selection to subcircuit
+s;f;	pcb-menu-default.lht	Flip(SelectedElements) 	Move selected subcircuits to other side
+s;l;	pcb-menu-default.lht	MoveToCurrentLayer(Selected) 	Move selected objects to current layer
+s;r;	pcb-menu-default.lht	RemoveSelected() 	Remove selected objects
+s;s;	pcb-menu-default.lht	DoWindows(search) 	Advanced search and select
+s;u;a;	pcb-menu-default.lht	Unselect(All) 	Unselect all objects
+s;u;c;	pcb-menu-default.lht	Unselect(Connection) 	unselect all connected objects
+space	pcb-menu-default.lht	Mode(Arrow)	Arrow
+t;a	pcb-menu-default.lht	Mode(Arc)	Arc
+t;b	pcb-menu-default.lht	Mode(PasteBuffer)	Buffer
+t;c	pcb-menu-default.lht	Mode(Copy)	Copy
+t;d	pcb-menu-default.lht	Mode(Remove)	Del\057Remove
+t;e	pcb-menu-default.lht	Mode(Thermal)	Thermal
+t;h	pcb-menu-default.lht	Mode(PolygonHole)	Polygon Hole
+t;i	pcb-menu-default.lht	Mode(InsertPoint)	Insert Point
+t;k	pcb-menu-default.lht	Mode(Lock)	Lock
+t;l	pcb-menu-default.lht	Mode(Line)	Line
+t;m	pcb-menu-default.lht	Mode(Move)	Move
+t;n	pcb-menu-default.lht	Mode(Arrow)	Arrow
+t;o	pcb-menu-default.lht	Mode(Rotate)	Rotate
+t;p	pcb-menu-default.lht	Mode(Polygon)	Polygon
+t;r	pcb-menu-default.lht	Mode(Rectangle)	Rectangle
+t;t	pcb-menu-default.lht	Mode(Text)	Text
+t;v	pcb-menu-default.lht	Mode(Via)	Via
+tab	pcb-menu-default.lht	SwapSides(V) 	Flip up\057down
+tab-ctrl	pcb-menu-default.lht	SwapSides(R) 	Spin 180 degrees
+tab-ctrl-shift	pcb-menu-default.lht	SwapSides() 	Swap Sides
+tab-shift	pcb-menu-default.lht	SwapSides(H) 	Flip left\057right
+u;c	pcb-menu-default.lht	Undo(ClearList) 	Clear undo-buffer
+u;r	pcb-menu-default.lht	Redo() 	Redo last undone operation
+u;u	pcb-menu-default.lht	Undo() 	Undo last operation
+up	pcb-menu-default.lht	Cursor(Warp,0,1,grid) 	Step Up
+up-shift	pcb-menu-default.lht	Cursor(Pan,0,50,view) 	Step +Up
+v;c	pcb-menu-default.lht	Center() 	Center cursor
+v;f	pcb-menu-default.lht	Zoom() 	Zoom Extents
+v;n	pcb-menu-default.lht	Display(PinOrPadName) 	Show padstack numbers in a subc
+v;s;f	pcb-menu-default.lht	Display(SubcID,"%a.footprint%")	footprint
+v;s;r	pcb-menu-default.lht	Display(SubcID)	refdes
+v;s;s	pcb-menu-default.lht	Display(SubcID,"%a.refdes%\\n%a.value%")	refdes+value
+v;s;v	pcb-menu-default.lht	Display(SubcID,"%a.value%")	value
+w;a	pcb-menu-default.lht	About() 	About...
+w;d	pcb-menu-default.lht	DoWindows(DRC) 	DRC Check
+w;f	pcb-menu-default.lht	FontSel() 	Font selector
+w;l	pcb-menu-default.lht	DoWindows(Library) 	Library
+w;m	pcb-menu-default.lht	DoWindows(Log) 	Message Log
+w;n	pcb-menu-default.lht	DoWindows(Netlist) 	Netlist
+w;p	pcb-menu-default.lht	Display(Pinout) 	Pinout
+y-ctrl	pcb-menu-default.lht	Redo() 	Redo last undone operation
+z-ctrl	pcb-menu-default.lht	Undo() 	Undo last operation
+z;e;	pcb-menu-default.lht	Zoom() 	Zoom Extents
+z;f;	pcb-menu-default.lht	ZoomTo(found) 	Zoom to found
+z;s;	pcb-menu-default.lht	ZoomTo(selected) 	Zoom to selection
+z;x;	pcb-menu-default.lht	Zoom(+1.2) 	Zoom Out 20%
+z;z;	pcb-menu-default.lht	Zoom(-1.2) 	Zoom In 20%
+|	pcb-menu-default.lht	conf(toggle, editor\057wireframe_draw, design) 	Wireframe draw
Index: tags/2.0.1/doc/user/05_ui/06_common/src/node_names.txt
===================================================================
--- tags/2.0.1/doc/user/05_ui/06_common/src/node_names.txt	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/06_common/src/node_names.txt	(revision 18980)
@@ -0,0 +1,41 @@
+/a         auto or add
+/a/b       back annotation
+/a/p       auto-place
+/a/d       auto-disperse
+/a/r       auto-route
+/a/o       optimize (djopt)
+/b         buffer
+/b/c       convert & clear
+/b/m       mirror
+/b/r       rotate
+/b/s       subcircuit
+/c         connections & rats
+/e         edit
+/e/m       move
+/e/s       subcircuit or style
+/e/g       geometry
+/g         grid
+/f         file
+/f/x       export to
+/f/c       configuration
+/i         info
+/i/c       configuration
+/m         mode
+/m/c       cursor/crosshair mode
+/m/d       drawing (render) mode
+/m/f       floater mode
+/m/l       line drawing (routing) settings
+/m/t       text drawing (routing) settings
+/m/p       polygon drawing mode
+/m/r       rubber band mode
+/s         select
+/s/a       select all...
+/s/u       unselect all...
+/s/c       convert selected
+/r         routing helper
+/r/r       routing radius
+/t         tool
+/u         undo
+/v         view
+/v/s       set view
+/w         window
Index: tags/2.0.1/doc/user/05_ui/index.html
===================================================================
--- tags/2.0.1/doc/user/05_ui/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/05_ui/index.html	(revision 18980)
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 5. User Interface (UI) </h2>
+<p>
+pcb-rnd offers various user interface plugins. The plugins connect different
+input methods to the pcb-rnd core, offering functionality to match a variety of
+user tools, experience, or desired workflows. 
+<p>
+The following sections describe all the existing pcb-rnd UI plugins. We start
+with the section on GTK+ because it is the most commonly used HID
+<p>
+<ul class="toc">
+	<li><a href="01_gtk/index.html"> 5.1 GTK </a>
+	<li><a href="02_cli/index.html"> 5.2 Actions and Command Line Interface </a>
+	<li><not_a href="03_lesstif/"> 5.3 lesstif </not_a>
+	<li><not_a href="04_remote/"> 5.4 remote </not_a>
+	<li><a href="05_batch/index.html"> 5.5 batch </a>
+	<li><a href="06_common/index.html"> 5.6 common/shared </a>
+</ul>
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/acompnet/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/acompnet/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/acompnet/index.html	(revision 18980)
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2 id=""> Acompnet plugin </h2>
+<p>
+Acompnet was originally concieved as a limited autorouter and layout assistant. It is disabled by default. 
+Issues:
+<p>
+<li>Acompnet is a work in progress, incomplete, and disabled by default in the
+pcb-rnd builds.
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/autocrop/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/autocrop/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/autocrop/index.html	(revision 18980)
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2 id=""> Autocrop plugin </h2>
+<p>
+Use the autocrop action to resize your pcb-board to extants 
+<h2 id="description"> Description </h2>
+<p>
+Autocrop finds the extents of your existing layout and resizes the board
+dimensions to contain only your parts plus a margin along the edge.
+<p>
+Syntax:
+<p>
+autocrop();
+<p>
+Use:
+<p>
+Bind autocrop to a key in the appropriate pcb-menu-*.lht for your preferred pcb-rnd gui.
+<p>
+Issues:
+<p>
+<li>Autocrop will move the objects to crop the layout, and as a consequence autocrop() plugin will take time to calcaulate for complex layouts. 
+<li>Autocrop was originally written for the old geda pcb with undo for board size
+<li>Edge clearance is fixed at 5*line spacing
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/autoplace/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/autoplace/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/autoplace/index.html	(revision 18980)
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> Autoplace plugin </h2>
+<p>
+The autoplace plugin looks at the netlist and tries to place subcircuits
+in a way to get routing easier. The algorithms follow those described in
+sections 4.1 of "Placement and Routing of Electronic Modules" edited by
+Michael Pecht Marcel Dekker, Inc. 1993.  ISBN: 0-8247-8916-4 TK7868.P7.P57
+1993.
+<p>
+The plugin declares action <i>AutoPlaceSelected</i> which operates on
+the selected subcircuits. A netlist shall be loaded and subcircuits
+availabel on the board before the action is invoked.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/autoroute/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/autoroute/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/autoroute/index.html	(revision 18980)
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> Autoroute plugin </h2>
+<p>
+Tha autoroute plugin attempts to route traces according to the netlist,
+after subcircuit placement is done by the user. There are two modes of
+operation:
+<ul>
+	<li> route all rat lines
+	<li> route only the selected rat lines
+</ul>
+<p>
+Limiting the operation to selected rat lines only gives some control
+to the user; typical use is to route critical nets first, while the board
+is sparse and leave less important nets to the end (getting them longer and
+have more vias).
+<p>
+The autorouter uses only the currently visible copper layers and places
+vias and jumps layers where necessary.
+<p>
+Before the autorouter is ran, a netlist should be imported, subcircuits
+should be loaded and placed. Other plugins, such as the
+<a href="../autoplace"> autoplace </a> or smartdisperse can help with
+the placement. After the autorouting, <a href="../djopt/">djopt</a>
+actions can be used to purify the routed tracks.
+<p>
+The plugin implements a rectangle-expansion router, based on
+"A Method for Gridless Routing of Printed Circuit Boards" by
+A. C. Finch, K. J. Mackenzie, G. J. Balsdon, and G. Symonds in the
+1985 Proceedings of the 22nd ACM/IEEE Design Automation Conference.
+This reference is available from the ACM Digital Library at
+http://www.acm.org/dl for those with institutional or personal
+access to it.
+<p>
+Note: the built-in autorouter is not very smart. There are 3rd party, external
+autorouters that can do better job on some boards, and pcb-rnd supports
+export/import to communicate with them.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/cam/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/cam/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/cam/index.html	(revision 18980)
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> CAM support </h2>
+<p>
+The purpose of the CAM support is to provide an unified interface to export a
+a board in different file formats, using different exporter plugins. The
+interface consists a CLI layer (each export plugin's "cam" option) and
+an optional GUI (the CAM plugin).
+
+<h3> CAM export support in each other plugins </h3>
+<p id="cli">
+Each CAM-plugin-compatible exporter plugin offers an option called "cam".
+The syntax and capabilities are the same for all exporter's cam option.
+<p>
+The syntax is:
+<pre>
+outfile=layergrp[,layergrp,...][;opt][;opt...]
+</pre>
+<p>
+where:
+<ul>
+	<li> outfile is the output file name (unlatered by the code)
+	<li> layergrp: one or more layer group definitions separated by comma (see below)
+	<li> optionally a list of exporter options in the same format as on direct command line (e.g. --verbose); when there's overlap on any state/definition between opts and CAM operation, the effect of the opt is ignored
+</ul>
+Syntax of the layer group definition:
+<ul>
+	<li> @layername (e.g. "@top_copper" if the group's name is <i>top_copper</i>)
+	<li> location-material (e.g. "top-copper" for any layer group that is copper and is on the top side)
+	<li> type[-type...] (more generally: a list of layer type flags)
+	<li> type:offs (e.g. "copper:+2" means the second copper layer group from the top, "copper:-3" means the third copper layer group from the bottom; offs is counted from 1, +1 meaning top outer layer, -1 meaning bottom outer layer)
+</ul>
+<p>
+(TODO: optionally prefixed with + or - for polarity and something for bloat/shrink)
+<p>
+Examples:
+<table border=1 cellspacing=0>
+	<tr> <th> directive
+	     <th> explanation
+	<tr> <td> bot.gbr=@bottom_copper,@bottom_silk
+	     <td> export layer groups called bottom_copper and bottom_silk (by group name)
+	<tr> <td> asm=top-assy
+	     <td> export the top assembly group, by type
+	<tr> <td> fabrication.ps=fab
+	     <td> export any fab layer group, by type
+	<tr> <td> gnd=copper:2
+	     <td> export the second copper layer group from the top (the first internal copper layer group under the top copper layer group, if it is a multilayer board; for 2 layer boards this will be the bottom copper layer group)
+	<tr> <td> gnd=intern-copper:1
+	     <td> similar to the above, but addresses the first internal copper layer group explicitly so it can not end up being the bottom copper layer group
+	<tr> <td> pwr=copper:-2
+	     <td> export the second copper layer group from the bottom (the first internal copper layer group above the bottom copper layer group, if it is a multilayer board; for 2 layer boards this will be the top copper layer group)
+	<tr> <td> gnd=intern-copper:-1
+	     <td> similar to the above, but addresses the last internal copper layer group explicitly so it can not end up being the top copper layer group
+</table>
+
+<h3> CAM plugin </h3>
+<p>
+The CAM plugin is a way to manage output "jobs": collections of cam export
+settings for reproducing export packages in various formats. 
+<p>
+...
+<p>
+A job is a script that contains zero or more export directives, separated
+by semicolons or newlines. An export directive is one of these:
+<pre>
+desc text
+prefix path
+plugin name [--option value] [--option value] ...
+write outfile=layergrp[,layergrp,...]
+</pre>
+<p>
+desc is a free form one-liner that describes what the job is for. Multiple
+desc directives may be present (to bypass the limitation that the text can
+not contain newlines).
+<p>
+The prefix directive sets up a file name prefix that is active until the
+next prefix directive or end of the script. Before the first prefix directive
+the prefix is an empty string. Any outfile will be prefixed with the current
+prefix. If the prefix contains at least one path separator, the directories
+it refers to are also created. (It is sort of a 'mkdir -p path; cd path'
+in the shell sense.)
+<p>
+The plugin directive selects a plugin and sets plugin specific options.
+The plugin and options are active until the next plugin directive or the
+end of the script. The first outfile directive must be preceeded by a
+plugin directive.
+<p>
+The write directive argument has the same syntax as the cam argument for each
+cam-capable exporter, <a href="#cli">see above</a>. Each write is a call
+to an exporter the same way as if pcb-rnd was called with --cam and -x
+with the exporter and options taken from the last plugin directive.
+<p>
+For example, the following config tree defines a job called <i>doc_png</i>
+that generates two 600 DPI images from the sides of the board, copper and
+silk combined, all in the doc/ dir (that is created if necessary):
+<pre>
+li:pcb-rnd-conf-v1 {
+	ha:overwrite {
+		ha:plugins {
+			ha:cam {
+				li:jobs {
+					doc_png {
+						desc export top and bottom copper and silk in 600 DPI pngs
+						prefix doc/
+						plugin png --dpi 600
+						write top.png=top-copper,top-silk
+						write bottom.png=bottom-copper,bottom-silk
+					}
+				}
+			}
+		}
+	}
+}
+</pre>
+<p>
+Once the above subtree is loaded in the config, the following action triggers
+the export:
+<pre>
+cam(call, doc_png)
+</pre>
+
+
+<h3> Tips for using with various exporters </h3>
+<p>
+When exporting to ps, consider using the --no-show-toc. It is
+possible to combine multiple layers (e.g. top silk and top copper, which
+may be useful for a single-layer board) using the --single-page option.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/ddraft/coord_seq.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/ddraft/coord_seq.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/coord_seq.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/coord_seq.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/ddraft/coord_seq.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/ddraft/coord_sys.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/ddraft/coord_sys.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/coord_sys.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/coord_sys.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/ddraft/coord_sys.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/ddraft/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/index.html	(revision 18980)
@@ -0,0 +1,194 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> ddraft - 2 dimensional drafting aid </h2>
+<p>
+The purpose of ddraft is to provide actions and GUI tools to help users
+drawing precise 2d drafts. Many of the features in ddraft are very similar
+to those found in standard 2d CAD packages.
+<p>
+Ddraft uses the following coordinate system (when looked from the top
+of the board):
+<p>
+<img src="coord_sys.png" alt="ddraft coordinate system: upper left corner is 0;0, x+ is tot he right, y+ is down, 0 deg is at 3 o'clock and increases clockwise">
+
+<h3> constraints </h3>
+<p>
+Coordinate and/or angle constraints can be applied on line drawing (when
+<i>all-direction lines</i> turned on) and move operation. Executing the
+<i>constraint()</i> action without arguments opens a dialog box with the
+settings. The same settings are accessible from the command line, using
+the <i>constraint()</i> action with arguments:
+<p>
+<table border=1>
+	<caption><b>Constraint arguments: explicitly set</b>
+	<tr><th> action syntax                            <th> description
+	<tr><td> constraint(line_angle, ang1, ang2, ...)  <td> permit drawing lines only at specific angles
+	<tr><td> constraint(line_angle_mod, ang)          <td> permit drawing lines only at angles which are integer multiplies of <i>ang</i>
+	<tr><td> constraint(line_length, len1, len2, ...) <td> draw lines with length matching any length on the list
+	<tr><td> constraint(line_length_mod, len)         <td> draw lines with length matching any integer multiply of the <i>len</i>
+	<tr><td> constraint(move_angle, ang1, ang2, ...)  <td> permit moving objects only at specific angles
+	<tr><td> constraint(move_angle_mod, ang)          <td> permit moving objects only at angles which are integer multiplies of <i>ang</i>
+	<tr><td> constraint(move_length, len1, len2, ...) <td> move objects at a distance matching any length on the list
+	<tr><td> constraint(move_length_mod, len)         <td> move objects at a distance matching an integer multiply of the <i>len</i>
+	<tr><td> constraint(reset)                        <td> reset all constraints
+</table>
+<p>
+Length can include unit (on the GUI: without space). Multiple constraints
+can be set in the same time. Constraints are reset upon explicit user
+request or pcb-rnd restart.
+<p>
+For line drawing, it is possible to get the angle constraints calculated using
+the line start point and an existing object:
+<p>
+<table border=1>
+	<caption><b>Constraint arguments: calculated</b>
+	<tr><th> action syntax   <th> description
+	<tr><td> perp()          <td> click on a line; set line_angle perpendicular to that line
+	<tr><td> paral()         <td> click on a line; set line_angle parallel to that line
+	<tr><td> tang()          <td> click on an arc; set line_angle tangential to the circle of the arc
+</table>
+
+<h3> Cutting edges </h3>
+<p>
+For already existing, intersecting objects (lines and arcs), the user may
+define cutting edges that can manipulate target objects they intersect. There
+are two actions for cutting edges: trim() and split(). The first argument of
+these actions is:
+<ul>
+	<li> object (selecting a single cutting edge)
+	<li> selected (to use any selected object as cutting edge)
+	<li> found (to use any found (green highlight) object as cutting edge)
+</ul>
+<p>
+The objects participating may be on different layers. All calculation use
+the centerline of the objects.
+<p>
+In a <b>trim</b> operation the target objects are cut at the intersection point,
+excess parts (at the click) removed. If there are multiple cutting edges,
+the shortest possible section is removed. The below examples are generated
+with <i>trim(selected)</i>, clicking on the horizontal line at the small
+triangle mark.
+<p>
+<img src="trim.png" alt="[Effect of trim on a few examples]">
+<p>
+In a <b>split</b> operation target objects are split into multiple section wherever
+they cross a cutting edge. A split means a single line object becomes multiple
+line objects or a single arc object becomes multiple arc objects.
+
+<h3> Command line drafting </h3>
+<p>
+The above features are pcb-rnd actions designed to fit in the action framework,
+to work together with the original pcb-rnd drawing tools, like the line tool.
+An alternative to that is using the new, ddraft command line interpreter, which
+offers a different syntax, optimized for drafting.
+<p>
+There are two ways to use the ddraft command line interpreter:
+<ul>
+	<li> a command wrapped in the ddraft() action, e.g. <i>ddraft(line from 1,3 to 4,2)</i>
+	<li> switching the command entry to <i>ddraft CLI mode</i>, by issuing the <i>ddraft()</i> action;
+	     to exit from the ddraft CLI mode, type /exit
+</ul>
+<p>
+When used as a CLI mode, mouse clicks on the drawing will also edit the
+command line at the cursor. The generic rule is that a click will replace
+an already entered numerical value or inserts a missing numerical value, but
+all instruction keywords are typed on the keyboard. Instructions can
+be abbreviated; the shortest form accepted is the shortest prefix that
+is unique among the instruction keywords. For example "li" means "line"
+and "rel" or even "re" works for "relative".
+<p>
+The first instruction is the drawing command, which is one of the following.
+<p>
+<table border=1>
+	<caption><b>ddraft drawing commands</b>
+	<tr><th> command <th> syntax summary <th> purpose
+	<tr><td> line
+	    <td> line [from] <i>coord</i> to <i>coord</i> <!--[to <i>coord</i> ...]-->
+	    <td> draw line segments on the current layer, using the current routing style
+</table>
+<p>
+Parts enclosed in [] are optional. A <i>coord</i> description is a sequence
+of absolute and relative coordinates:
+<p>
+<table border=1>
+	<caption><b>ddraft drawing commands</b>
+	<tr><th> keyword <th> next instruction (argument) <th> example <th> purpose
+	<tr><td> absolute
+	    <td rowspan=3> xcoord,ycoord
+	    <td> abs 1mm,15mm
+	    <td rowspan=3> an absolute coordinate; units are optional; must not contain space
+	<tr><td> *
+	    <td> *1mm,15mm
+	<tr><td> &nbsp;
+	    <td> 1mm,15mm
+
+	<tr><td> relative
+	    <td rowspan=2> xcoord,ycoord
+	    <td> rel 1mm,15mm
+	    <td rowspan=2> a relative coordinate measured from the absolute coord specified so far; units are optional; must not contain space
+	<tr><td> @
+	    <td> @1mm,15mm
+
+	<tr><td> angle
+	    <td rowspan=2> degree
+	    <td> ang 15
+	    <td rowspan=2> an absolute angle in degrees; always measured from the X axis; should be used together with <i>length</i>
+	<tr><td> &lt;
+	    <td> &lt;15
+
+	<tr><td> relative angle
+	    <td rowspan=2> degree
+	    <td> rel ang 15
+	    <td rowspan=2> a relative angle in degrees; always measured from the X axis; should be used together with <i>length</i>
+	<tr><td> @&lt;
+	    <td> @&lt;15
+
+<!--TODO: paral -->
+
+	<tr><td> length
+	    <td rowspan=2> coord
+	    <td> len 3.1mm
+	    <td rowspan=2> length or distance to move from the previous coordinate; always relative; used together with an angle
+	<tr><td> ~
+	    <td> ~3.1mm
+
+</table>
+<p>
+For example the sequence
+<i>5mm,100mil relative 1mm,1mm relative angle 30 length 2mm</i>
+means:
+<ul>
+	<li> step 1: start from absolute coords at 5mm, 100mil; after this the current coordinate is: 5.0000mm,2.5400mm
+	<li> step 2: move relative (to the right and down) 1 and 1 mm; after this the current coordinate is: 6.0000mm,3.5400mm
+	<li> step 3: the last move was a 45 degree move; relative to this 45 degrees, start moving at 30 degrees (that is, in absolute 75 degrees), and...
+	<li> step 4: ... move 2mm in that direction
+	<li> step 5: the sequence ends here, the coordinate it points to is: 6.5176mm,5.4719mm
+</ul>
+<p>
+Below the same steps are demonstrated; dark red lines demonstrate the moves,
+thin black lines show how they are calculated. The result is a single coordinate
+marked with a thin black cross at step 5. The sequence itself does not draw
+anything, the drawing merely demonstrates how the steps are executed in
+memory.
+<p>
+<img src="coord_seq.png" alt="the coord sequence annotated with auxiliary lines and step numbers">
+<p>
+Equivalent alternative forms for the same sequence:
+<pre>
+5mm,100mil rel 1mm,1mm rel ang 30 len 2mm
+5mm,100mil @1mm,1mm @&lt;30~2mm
+5,100mil @1,1 @&lt;30~2
+</pre>
+<p>
+The last one assumes unit is set to mm.
+
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/ddraft/src/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/src/Makefile	(revision 18980)
@@ -0,0 +1,19 @@
+PCBRND=pcb-rnd
+CLEANFILES= ../*.png
+
+all: ../coord_sys.png ../coord_seq.png ../trim.png
+
+../coord_sys.png: coord_sys.lht
+	$(PCBRND) -x png --dpi 450 coord_sys.lht
+	mv coord_sys.png ../coord_sys.png
+
+../coord_seq.png: coord_seq.lht
+	$(PCBRND) -x png --dpi 450 coord_seq.lht
+	mv coord_seq.png ../coord_seq.png
+
+../trim.png: trim.lht
+	$(PCBRND) -x png --dpi 450 trim.lht
+	mv trim.png ../trim.png
+
+clean: $(CLEANRULES) 
+	-rm $(CLEANFILES)
Index: tags/2.0.1/doc/user/06_feature/ddraft/src/coord_seq.lht
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/src/coord_seq.lht	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/src/coord_seq.lht	(revision 18980)
@@ -0,0 +1,472 @@
+ha:pcb-rnd-board-v5 {
+ ha:netlists {
+  li:input {
+  }
+ }
+ ha:meta {
+  ha:size {
+   thermal_scale = 0.500000
+   x = 390.0mil
+   y = 310.0mil
+  }
+  ha:grid {
+   spacing = 5.0mil
+   offs_x = 0.0
+   offs_y = 0.0
+  }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    ha:type {
+     top = 1
+     paste = 1
+    }
+    li:layers {
+     8
+    }
+    name = top_paste
+   }
+   ha:1 {
+    ha:type {
+     silk = 1
+     top = 1
+    }
+    li:layers {
+     7
+    }
+    name = top_silk
+   }
+   ha:2 {
+    ha:type {
+     top = 1
+     mask = 1
+    }
+    li:layers {
+     9
+    }
+    name = top_mask
+   }
+   ha:3 {
+    ha:type {
+     copper = 1
+     top = 1
+    }
+    li:layers {
+     0
+     2
+    }
+    name = top_copper
+   }
+   ha:4 {
+    ha:type {
+     substrate = 1
+     intern = 1
+    }
+    li:layers {
+    }
+    name = grp_4
+   }
+   ha:5 {
+    ha:type {
+     copper = 1
+     intern = 1
+    }
+    li:layers {
+     5
+    }
+    name = Intern
+   }
+   ha:6 {
+    ha:type {
+     substrate = 1
+     intern = 1
+    }
+    li:layers {
+    }
+    name = grp_6
+   }
+   ha:7 {
+    ha:type {
+     copper = 1
+     intern = 1
+    }
+    li:layers {
+     4
+    }
+    name = Intern
+   }
+   ha:8 {
+    ha:type {
+     substrate = 1
+     intern = 1
+    }
+    li:layers {
+    }
+    name = grp_8
+   }
+   ha:9 {
+    ha:type {
+     outline = 1
+    }
+    li:layers {
+    }
+    name = global_outline
+   }
+   ha:10 {
+    ha:type {
+     bottom = 1
+     copper = 1
+    }
+    li:layers {
+     1
+     3
+    }
+    name = bottom_copper
+   }
+   ha:11 {
+    ha:type {
+     bottom = 1
+     mask = 1
+    }
+    li:layers {
+     10
+    }
+    name = bottom_mask
+   }
+   ha:12 {
+    ha:type {
+     silk = 1
+     bottom = 1
+    }
+    li:layers {
+     6
+    }
+    name = bottom_silk
+   }
+   ha:13 {
+    ha:type {
+     bottom = 1
+     paste = 1
+    }
+    li:layers {
+     11
+    }
+    name = bottom_paste
+   }
+  }
+ }
+
+ li:styles {
+  ha:Signal {
+   diameter = 2.0mm
+   thickness = 0.1mil
+   hole = 31.5mil
+   clearance = 20.0mil
+  }
+  ha:Power {
+   diameter = 2.2mm
+   thickness = 20.0mil
+   hole = 1.0mm
+   clearance = 20.0mil
+  }
+  ha:Fat {
+   diameter = 137.8mil
+   thickness = 80.0mil
+   hole = 47.24mil
+   clearance = 25.0mil
+  }
+  ha:Sig-tight {
+   diameter = 64.0mil
+   thickness = 10.0mil
+   hole = 31.5mil
+   clearance = 12.0mil
+  }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+  }
+  li:objects {
+  }
+  li:layers {
+   ha:top-sig {
+    visible = 1
+    lid = 0
+    li:objects {
+     ha:line.4 {
+      clearance = 40.0mil
+      y2 = 130.0mil
+      thickness = 10.0mil
+      x1 = 30.0mil
+      x2 = 226.8503937mil
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 30.0mil
+     }
+     ha:line.7 {
+      clearance = 40.0mil
+      y2 = 4.302mm
+      thickness = 10.0mil
+      x1 = 226.8503937mil
+      x2 = 6.762mm
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 130.0mil
+     }
+     ha:line.10 {
+      clearance = 40.0mil
+      y2 = 6.2339mm
+      thickness = 10.0mil
+      x1 = 6.762mm
+      x2 = 7.2796mm
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 4.302mm
+     }
+    }
+    color = {#8b2323}
+    group = 3
+    ha:combining {
+    }
+   }
+   ha:bottom-sig {
+    visible = 1
+    lid = 1
+    li:objects {
+    }
+    color = {#3a5fcd}
+    group = 10
+    ha:combining {
+    }
+   }
+   ha:top-gnd {
+    visible = 1
+    lid = 2
+    li:objects {
+    }
+    color = {#104e8b}
+    group = 3
+    ha:combining {
+    }
+   }
+   ha:bottom-gnd {
+    visible = 1
+    lid = 3
+    li:objects {
+    }
+    color = {#cd3700}
+    group = 10
+    ha:combining {
+    }
+   }
+   ha:int-sig2 {
+    visible = 1
+    lid = 4
+    li:objects {
+    }
+    color = {#548b54}
+    group = 7
+    ha:combining {
+    }
+   }
+   ha:int-sig1 {
+    visible = 1
+    lid = 5
+    li:objects {
+    }
+    color = {#8b7355}
+    group = 5
+    ha:combining {
+    }
+   }
+   ha:bottom-silk {
+    visible = 1
+    lid = 6
+    li:objects {
+    }
+    color = {#000000}
+    group = 12
+    ha:combining {
+     auto = 1
+    }
+   }
+   ha:top-silk {
+    visible = 1
+    lid = 7
+    li:objects {
+     ha:line.13 {
+      clearance = 40.0mil
+      y2 = 30.0mil
+      thickness = 0.1mil
+      x1 = 226.8503937mil
+      x2 = 226.8503937mil
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 130.0mil
+     }
+     ha:line.17 {
+      clearance = 40.0mil
+      y2 = 130.0mil
+      thickness = 0.1mil
+      x1 = 226.8503937mil
+      x2 = 6.762mm
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 130.0mil
+     }
+     ha:line.20 {
+      clearance = 40.0mil
+      y2 = 130.0mil
+      thickness = 0.1mil
+      x1 = 6.762mm
+      x2 = 6.762mm
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 4.302mm
+     }
+     ha:line.23 {
+      clearance = 40.0mil
+      y2 = 260.0mil
+      thickness = 0.1mil
+      x1 = 6.762mm
+      x2 = 9.064mm
+      ha:flags {
+       clearline = 1
+      }
+      y1 = 4.302mm
+     }
+     ha:line.56 {
+      x1=7.2796mm; y1=6.2339mm; x2=4.834137mm; y2=6.889159mm; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:line.65 {
+      x1=6.762mm; y1=4.302mm; x2=4.316537mm; y2=4.957259mm; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:line.68 {
+      x1=180.0mil; y1=4.888807mm; x2=5.093772mm; y2=6.836086mm; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:line.104 {
+      x1=7.2796mm; y1=234.09972441mil; x2=7.2796mm; y2=255.0mil; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:line.113 {
+      x1=300.0mil; y1=6.2339mm; x2=275.0mil; y2=6.2339mm; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:arc.38 {
+      x=260.0mil; y=190.0mil; width=50.0mil; height=50.0mil; astart=118; adelta=39; thickness=0.1mil; clearance=40.0mil;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.83 {
+      string=1; x=210.0mil; y=50.0mil; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.85 {
+      string=2; x=270.0mil; y=100.0mil; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.87 {
+      string=3; x=310.0mil; y=180.0mil; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.89 {
+      string=4; x=170.0mil; y=220.0mil; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.91 {
+      string=5; x=300.0mil; y=250.0mil; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+     ha:text.117 {
+      string=0; x=10.0mil; y=0.0; scale=50; fid=0; direction=0;
+      ha:flags {
+       clearline=1
+      }
+     }
+    }
+    color = {#000000}
+    group = 1
+    ha:combining {
+     auto = 1
+    }
+   }
+   ha:top-paste {
+    visible = 0
+    lid = 8
+    li:objects {
+    }
+    color = {#cd00cd}
+    group = 0
+    ha:combining {
+     auto = 1
+    }
+   }
+   ha:top-mask {
+    visible = 0
+    lid = 9
+    li:objects {
+    }
+    color = {#ff0000}
+    group = 2
+    ha:combining {
+     sub = 1
+     auto = 1
+    }
+   }
+   ha:bottom-mask {
+    visible = 0
+    lid = 10
+    li:objects {
+    }
+    color = {#ff0000}
+    group = 11
+    ha:combining {
+     sub = 1
+     auto = 1
+    }
+   }
+   ha:bottom-paste {
+    visible = 0
+    lid = 11
+    li:objects {
+    }
+    color = {#cd00cd}
+    group = 13
+    ha:combining {
+     auto = 1
+    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/06_feature/ddraft/src/coord_sys.lht
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/src/coord_sys.lht	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/src/coord_sys.lht	(revision 18980)
@@ -0,0 +1,362 @@
+ha:pcb-rnd-board-v5 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 2.0mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1.0mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 950.0mil
+    y = 925.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+  }
+
+   li:objects {
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#8b2323}
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#3a5fcd}
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#104e8b}
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#cd3700}
+    }
+
+    ha:int-sig2 {
+     lid=4
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#548b54}
+    }
+
+    ha:int-sig1 {
+     lid=5
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#8b7355}
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#00868b}
+    }
+
+    ha:bottom-silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#000000}
+    }
+
+    ha:top-silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:line.5 {
+        x1=75.0mil; y1=175.0mil; x2=850.0mil; y2=175.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.19 {
+        x1=200.0mil; y1=50.0mil; x2=200.0mil; y2=825.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.32 {
+        x=325.0mil; y=175.0mil; width=400.0mil; height=400.0mil; astart=142; adelta=38; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.11 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 900.0mil; 175.0mil }
+           { 775.0mil; 150.0mil }
+           { 775.0mil; 200.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.22 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 200.0mil; 875.0mil }
+           { 225.0mil; 750.0mil }
+           { 175.0mil; 750.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.45 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 14.851175mm; 12.720308mm }
+           { 17.192442mm; 10.483721mm }
+           { 16.15212mm; 9.755279mm }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:text.26 {
+        string=0; x=150.0mil; y=100.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.27 {
+        string=+x; x=825.0mil; y=100.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.28 {
+        string=+y; x=125.0mil; y=775.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.49 {
+        string=+angle; x=700.0mil; y=425.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.51 {
+        string=0 deg; x=625.0mil; y=100.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+      color = {#000000}
+    }
+
+    ha:top-paste {
+     lid=9
+     group=0
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+
+    ha:top-mask {
+     lid=10
+     group=2
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-mask {
+     lid=11
+     group=11
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-paste {
+     lid=12
+     group=13
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+   }
+ }
+
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 9;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 10;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:6 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:8 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:9 {
+    name = global_outline
+    ha:type { outline=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 11;    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 12;    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/06_feature/ddraft/src/trim.lht
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/src/trim.lht	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/src/trim.lht	(revision 18980)
@@ -0,0 +1,474 @@
+ha:pcb-rnd-board-v5 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 2.0mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1.0mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 800.0mil
+    y = 27.305mm
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+  }
+
+   li:objects {
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.14 {
+        x1=75.0mil; y1=325.0mil; x2=275.0mil; y2=325.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.17 {
+        x1=150.0mil; y1=225.0mil; x2=150.0mil; y2=425.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:line.63 {
+        x1=75.0mil; y1=600.0mil; x2=275.0mil; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.66 {
+        x1=150.0mil; y1=500.0mil; x2=150.0mil; y2=700.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:line.69 {
+        x1=75.0mil; y1=900.0mil; x2=275.0mil; y2=900.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.72 {
+        x1=150.0mil; y1=800.0mil; x2=150.0mil; y2=1000.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         selected=1
+        }
+       }
+       ha:line.203 {
+        x1=475.0mil; y1=325.0mil; x2=550.0mil; y2=325.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.206 {
+        x1=550.0mil; y1=225.0mil; x2=550.0mil; y2=425.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:line.209 {
+        x1=475.0mil; y1=600.0mil; x2=15.575194mm; y2=600.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.212 {
+        x1=550.0mil; y1=500.0mil; x2=550.0mil; y2=700.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:line.215 {
+        x1=15.575194mm; y1=900.0mil; x2=675.0mil; y2=900.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.218 {
+        x1=550.0mil; y1=800.0mil; x2=550.0mil; y2=1000.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         selected=1
+        }
+       }
+       ha:line.221 {
+        x1=475.0mil; y1=900.0mil; x2=550.0mil; y2=900.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.75 {
+        x=325.0mil; y=700.0mil; width=150.0mil; height=150.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:arc.76 {
+        x=325.0mil; y=1000.0mil; width=150.0mil; height=150.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:arc.224 {
+        x=725.0mil; y=700.0mil; width=150.0mil; height=150.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:arc.225 {
+        x=725.0mil; y=1000.0mil; width=150.0mil; height=150.0mil; astart=-90; adelta=90; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+         selected=1
+        }
+       }
+       ha:polygon.89 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 260.0mil; 400.0mil }
+           { 250.0mil; 350.0mil }
+           { 240.0mil; 400.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.93 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 260.0mil; 675.0mil }
+           { 250.0mil; 625.0mil }
+           { 240.0mil; 675.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.97 { clearance=40.0mil;
+        li:geometry {
+          ta:contour {
+           { 165.0mil; 825.0mil }
+           { 175.0mil; 875.0mil }
+           { 185.0mil; 825.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+      color = {#8b2323}
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#3a5fcd}
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#104e8b}
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#cd3700}
+    }
+
+    ha:int-sig2 {
+     lid=4
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#548b54}
+    }
+
+    ha:int-sig1 {
+     lid=5
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#8b7355}
+    }
+
+    ha:bottom-silk {
+     lid=6
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+      color = {#000000}
+    }
+
+    ha:top-silk {
+     lid=7
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:line.238 {
+        x1=400.0mil; y1=25.0mil; x2=400.0mil; y2=26.67mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.253 {
+        x1=25.0mil; y1=150.0mil; x2=775.0mil; y2=150.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.259 {
+        x1=25.0mil; y1=475.0mil; x2=775.0mil; y2=475.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.262 {
+        x1=25.0mil; y1=750.0mil; x2=775.0mil; y2=750.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.265 {
+        x1=25.0mil; y1=26.67mm; x2=775.0mil; y2=26.67mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.268 {
+        x1=25.0mil; y1=25.0mil; x2=775.0mil; y2=25.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.271 {
+        x1=25.0mil; y1=25.0mil; x2=25.0mil; y2=26.67mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.274 {
+        x1=775.0mil; y1=25.0mil; x2=775.0mil; y2=26.67mm; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.20 {
+        string=Before; x=100.0mil; y=50.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.21 {
+        string=After; x=525.0mil; y=50.0mil; scale=100; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+      color = {#000000}
+    }
+
+    ha:top-paste {
+     lid=8
+     group=0
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+
+    ha:top-mask {
+     lid=9
+     group=2
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-mask {
+     lid=10
+     group=11
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#ff0000}
+    }
+
+    ha:bottom-paste {
+     lid=11
+     group=13
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+      color = {#cd00cd}
+    }
+   }
+ }
+
+
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 8;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 7;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 9;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:6 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:8 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:9 {
+    name = global_outline
+    ha:type { outline=1;    }
+    li:layers {    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 10;    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 6;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 11;    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/doc/user/06_feature/ddraft/trim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/ddraft/trim.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/ddraft/trim.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/ddraft/trim.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/ddraft/trim.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/align_mixed_parts_x.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/align_mixed_parts_x.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/align_mixed_parts_x.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/align_mixed_parts_x.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/align_mixed_parts_x.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/align_parts_y.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/align_parts_y.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/align_parts_y.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/align_parts_y.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/align_parts_y.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/distalign.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/distalign.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/distalign.txt	(revision 18980)
@@ -0,0 +1,79 @@
+From: Ben Jackson <bjj@saturn.home.ben.com>
+To: geda-user@moria.seul.org
+Date: Sat, 24 Feb 2007 22:13:51 -0800
+Subject: The amazing Align/Distribute plugin
+
+Ok, having "finished" the smartdisperse plugin, I moved on to phase 2
+of my "I'm sick of moving LEDs by hand" master plan.
+
+Introducing Align() and Distribute(), which work much like the
+similarly named functions in Visio.
+Given that PCB does not have the concept of "first selected object"
+to draw on, the reference points can be selected by arguments.
+
+Both functions always work on all selected elements[*].
+
+Some examples:
+
+:Align(X)
+
+Objects are moved left/right to align their Marks with the Mark of
+the topmost selected object. All objects remain on or move to the
+current grid.
+
+:Align(Y,Centers)
+
+Now objects are aligned up/down to their geometric centers rather
+than their marks. The reference point is the center of the leftmost
+object.
+
+:Align(Y,Tops,Average,Gridless)
+
+Feeling bold, you align the tops all selected objects to the average
+of their top edges and let them wander off the grid to exactly the
+average of their tops.
+
+:Align(X,Marks,pcb_crosshair)
+
+None of the objects are where you want them, so you move the
+crosshair to a likely spot and cause them all to move their X
+coordinates to your new X location.
+
+:Align(X,Marks,Last)
+
+As above, but instead of the crosshair you just override the default
+"First" to "Last" so the reference object is bottommost instead of
+topmost.
+
+
+Now you have them in a neat line, but they're all clumped!
+
+:Distribute(Y)
+
+Objects are spread out evenly from the first (uppermost) to last
+using their marks as the reference point.
+
+:Distribute(X,Lefts,pcb_crosshair,Last)
+
+You move your crosshair to the left edge of the target area, which
+will be the leftmost edge of the leftmost object. The objects are
+spread between your crosshair and the original location of the Last
+(rightmost) object.
+
+:Distribute(Y,Gaps)
+
+You have chosen to select many oddly sized objects, and instead of
+their centers being spread out evenly, you want the space (or "gaps")
+to be even.
+
+You get tricky and bind `Align(X,Marks,pcb_crosshair)' to a key.
+Now you can select an object and hit your key and the object will
+warp to the same X coordinate as your cursor.
+
+[*] If it has any flaws, it is that you can't operate non-element
+objects, though some melding of autocrop (which knows how to do such
+things) and distalign could produce such a capability.
+
+Ben Jackson AD7GD <ben@ben.com>
+
+http://www.ben.com/
Index: tags/2.0.1/doc/user/06_feature/distalign/distribute_parts_x.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/distribute_parts_x.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/distribute_parts_x.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/distribute_parts_x.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/distribute_parts_x.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/distribute_y_gaps.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/distribute_y_gaps.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/distribute_y_gaps.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/distribute_y_gaps.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/distribute_y_gaps.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/import_parts.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/import_parts.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/import_parts.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/import_parts.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/import_parts.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distalign/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/index.html	(revision 18980)
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1 id=""> Distalign plugin </h1>
+<div>
+Two actions for aligning and distributing subcircuits in pcb-rnd
+<h2 id="use"> Action Syntax </h2>
+<p>
+<div>
+Align(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])
+<p>
+<div>
+Distribute(Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])
+<h2 id="description"> Description </h2>
+<p>
+<div>
+align() aligns selected subcircuits along the X or Y axis, relative to user selected reference points (like specific subcircuit edges, their centers, or marks)
+<p>
+<div>
+distribute() distributes selected subcircuits evenly between the first or last subcircuit or to the pcb crosshairs 
+
+<h2 id="use"> Examples </h2>
+<p>
+<h3 id="use"> Build a linear array of tactile switch parts</h3>
+<p>
+<table noborder>
+<tr><th>Command <th>description<th>image
+
+<tr><td>import
+<td><div>Import an array of 8 TACT_6x6_4p footprints needed for a 1x8 grid.<div>Place the first part at the exact X,Y coord to start the array <div>Place the last part at the X position where the array will end
+<td><img src="import_parts.png">
+
+<tr><td>align(y)
+<td><div>The user aligns the TACT_6x6_4p footprints along a Y axis<div>The center of the first part is the default reference point
+<td> <img src="align_parts_y.png">
+
+<tr><td>distribute(x,centers,first,last)
+<td><div>Note user places last part in position<div>Parts are distributed between the first and last along the X axis
+<td><img src="distribute_parts_x.png">
+</table>
+
+<h3 id="use">Align & distribute a mix of parts</h3>
+<table noborder>
+<tr><th>Command <th>description<th>image
+
+<tr><td>import
+<td><div>A small set of nonhomogenous parts are imported
+<td><img src="import_mixed_parts_x.png">
+
+<tr><td>align(x,centers,last)
+<td><div>The parts are aligned to each other along an x axis with resepect to their centers<div>The chosen x axis is determined from the 'last' part location 
+<td><img src="align_mixed_parts_x.png">
+
+<tr><td>distribute(y,gaps)
+<td><div>The parts are evenly distibuted by the gaps between them
+<td><img src="distribute_y_gaps.png">
+
+<tr><td>copy, align(), distribute()
+<td><div>The parts in the first step are copied to create an array<div>The align and distribute commands are used for each row of the array in turn
+<td><img src="result.png">
+</table>
+
+<p>
+See also: the <a href="distalign.txt">original email</a> that describes the plugin,
+the <a href="http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=distalign">dist/align action argument gallery</a> (illustration).
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/distalign/result.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distalign/result.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distalign/result.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distalign/result.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distalign/result.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_1.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_1.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_1.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_2.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_2.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_2.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_2.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_3.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_3.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_3.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/distaligntext/distaligntext_3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/distaligntext/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/distaligntext/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/distaligntext/index.html	(revision 18980)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1 id=""> Distaligntext </h1>
+
+Two actions to align and distribute text objects in pcb-rnd
+
+<h2 id="use"> Action Syntx </h2>
+<p>
+<div>
+AlignText(X/Y, [Lefts/Rights/Tops/Bottoms/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])
+<p>
+<div>
+DistributeText(Y, [Lefts/Rights/Tops/Bottoms/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])
+
+<h3 id="examples"> Examples </h3>
+<p>
+<table noborder>
+<tr><th>Command <th>description<th>image
+
+<tr><td>import and text tools<td>Text for a TI 14 pin jtag connector is generated<td> <img src="distaligntext_1.png">
+
+<tr><td>aligntext(x,rights)<td>The text is aligned along the right side to
+justify up with the 14 pin connector part
+<div>The last part is positioned alongside pin 7 to delimit the last position<td><img src="distaligntext_2.png">
+
+<tr><td>distributetext(y,gaps,first,last)<td>The text is repositioned at even spacing between the first and last element<td> <img src="distaligntext_3.png">
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/djopt/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/Makefile	(revision 18980)
@@ -0,0 +1,50 @@
+PCB=../../src/pcb-rnd
+HTML=index.html
+CASES = \
+ debumpify.$(TARGET) \
+ miter.$(TARGET) \
+ orthopull.$(TARGET) \
+ unjaggy.$(TARGET) \
+ vianudge.$(TARGET) \
+ viatrim.$(TARGET)
+
+all:
+	$(MAKE) conv TARGET=out.png
+	$(MAKE) conv TARGET=png
+	$(MAKE) index
+
+index:
+	$(MAKE) index.html TARGET=txt
+
+index.html: Pre.html Post.html $(CASES) Makefile
+	cat Pre.html > $(HTML)
+	$(MAKE) conv TARGET=tbl
+	cat Post.html >>$(HTML)
+
+conv: $(CASES)
+
+.SUFFIXES: .pcb .out.pcb .png .out.png .tbl
+.PRECIOUS: %.pcb %.out.pcb %.png %.out.png
+
+.pcb.out.pcb:
+	echo "OptAutoOnly(); djopt($*); SaveTo(LayoutAs, $*.out.pcb.tmp);"| $(PCB) --gui batch $*.pcb
+	awk '/Symbol.. . 1800./,/^Attribute/ { next } { print $$0 }' < $*.out.pcb.tmp > $*.out.pcb
+	rm $*.out.pcb.tmp
+
+.pcb.tbl:
+	echo '<tr><th>$*<td>'>>$(HTML)
+	cat $*.txt >>$(HTML)
+	echo '  <td><a href="$*.pcb"><img src="$*.png"></a>  <td><a href="$*.out.pcb"><img src="$*.out.png"></a>'>>$(HTML)
+
+.pcb.png:
+	$(PCB) -x png --dpi 300  $*.pcb
+
+out.pcb.out.png:
+	$(PCB) -x png --dpi 300  $*.out.pcb
+
+clean:
+	rm *.out.pcb *.png index.html 2>/dev/null; true
+
+
+
+
Index: tags/2.0.1/doc/user/06_feature/djopt/Post.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/Post.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/Post.html	(revision 18980)
@@ -0,0 +1,4 @@
+<tr><th>auto<td>run all the above except miter; run them multiple times until there's no more change possible <td> &nbsp; <td> &nbsp;
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/djopt/Pre.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/Pre.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/Pre.html	(revision 18980)
@@ -0,0 +1,14 @@
+<html>
+<body>
+<H1> Action djopt() </h1>
+
+The different types of optimizations change your board in order to
+reduce the total trace length and via count. Each optimization is accessible
+using an argument, e.g. djopt(miter). The basic actions have to be run multiple
+times as each iteration will change the design making new changes possible for
+subsequent iterations with the same or other actions.
+<p>
+Click on the images to download the example .pcb design.
+
+<table border=1 cellspacing=0>
+<tr><th>argument name<th> description <th> example in <th> example out after 1st iteration
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.pcb	(revision 18980)
@@ -0,0 +1,88 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[0 5000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 117500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 30000 32500 1000 4000 "clearline"]
+	Line[92500 32500 111595 32500 1000 4000 "clearline"]
+	Line[30000 32500 30000 32500 1000 4000 "clearline"]
+	Line[30000 32500 37500 32500 1000 4000 "clearline"]
+	Line[37500 32500 37500 32500 1000 4000 "clearline"]
+	Line[37500 32500 47500 32500 1000 4000 "clearline"]
+	Line[47500 32500 57500 22500 1000 4000 "clearline"]
+	Line[57500 22500 67500 22500 1000 4000 "clearline"]
+	Line[67500 22500 77500 32500 1000 4000 "clearline"]
+	Line[77500 32500 82500 32500 1000 4000 "clearline"]
+	Line[82500 32500 85000 22500 1000 4000 "clearline"]
+	Line[90000 22500 92500 32500 1000 4000 "clearline"]
+	Line[85000 22500 90000 22500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Text[30000 5000 0 105 "90" "clearline"]
+	Text[60000 5000 0 105 "45" "clearline"]
+	Text[82500 5000 0 105 "rand" "clearline"]
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/debumpify.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/debumpify.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/debumpify.pcb	(revision 18980)
@@ -0,0 +1,89 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[0 5000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Attribute("PCB::grid::unit" "mm")
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 117500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 30000 32500 1000 4000 "clearline"]
+	Line[92500 32500 111595 32500 1000 4000 "clearline"]
+	Line[30000 32500 30000 22500 1000 4000 "clearline"]
+	Line[30000 22500 37500 22500 1000 4000 "clearline"]
+	Line[37500 22500 37500 32500 1000 4000 "clearline"]
+	Line[37500 32500 47500 32500 1000 4000 "clearline"]
+	Line[47500 32500 57500 22500 1000 4000 "clearline"]
+	Line[57500 22500 67500 22500 1000 4000 "clearline"]
+	Line[67500 22500 77500 32500 1000 4000 "clearline"]
+	Line[77500 32500 82500 32500 1000 4000 "clearline"]
+	Line[82500 32500 85000 22500 1000 4000 "clearline"]
+	Line[90000 22500 92500 32500 1000 4000 "clearline"]
+	Line[85000 22500 90000 22500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Text[30000 5000 0 105 "90" "clearline"]
+	Text[60000 5000 0 105 "45" "clearline"]
+	Text[82500 5000 0 105 "rand" "clearline"]
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/debumpify.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/debumpify.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/debumpify.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/debumpify.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/debumpify.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/debumpify.txt	(revision 18980)
@@ -0,0 +1,2 @@
+Looks for U-shaped traces (with 90 degree corners) that can be shortened
+or eliminated.
Index: tags/2.0.1/doc/user/06_feature/djopt/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/index.html	(revision 18980)
@@ -0,0 +1,45 @@
+<html>
+<body>
+<H1> Action djopt() </h1>
+
+The different types of optimizations change your board in order to
+reduce the total trace length and via count. Each optimization is accessible
+using an argument, e.g. djopt(miter). The basic actions have to be run multiple
+times as each iteration will change the design making new changes possible for
+subsequent iterations with the same or other actions.
+<p>
+Click on the images to download the example .pcb design.
+
+<table border=1 cellspacing=0>
+<tr><th>argument name<th> description <th> example in <th> example out after 1st iteration
+<tr><th>debumpify<td>
+Looks for U-shaped traces (with 90 degree corners) that can be shortened
+or eliminated.
+  <td><a href="debumpify.pcb"><img src="debumpify.png"></a>  <td><a href="debumpify.out.pcb"><img src="debumpify.out.png"></a>
+<tr><th>miter<td>
+Replaces 90 degree corners with a pair of 45 degree corners, to reduce
+RF losses and trace length.
+  <td><a href="miter.pcb"><img src="miter.png"></a>  <td><a href="miter.out.pcb"><img src="miter.out.png"></a>
+<tr><th>orthopull<td>
+Looks for chains of traces all going in one direction, with more
+traces orthogonal on one side than on the other.  Moves the chain in
+that direction, causing a net reduction in trace length, possibly
+eliminating traces and/or corners.
+  <td><a href="orthopull.pcb"><img src="orthopull.png"></a>  <td><a href="orthopull.out.pcb"><img src="orthopull.out.png"></a>
+<tr><th>unjaggy<td>
+Looks for corners which could be flipped to eliminate one or more
+corners (i.e. jaggy lines become simpler).
+  <td><a href="unjaggy.pcb"><img src="unjaggy.png"></a>  <td><a href="unjaggy.out.pcb"><img src="unjaggy.out.png"></a>
+<tr><th>vianudge<td>
+Looks for vias where all traces leave in the same direction.  Tries to
+move via in that direction to eliminate one of the traces (and thus a
+corner).
+  <td><a href="vianudge.pcb"><img src="vianudge.png"></a>  <td><a href="vianudge.out.pcb"><img src="vianudge.out.png"></a>
+<tr><th>viatrim<td>
+Looks for traces that go from via to via, where moving that trace to a
+different layer eliminates one or both vias.
+  <td><a href="viatrim.pcb"><img src="viatrim.png"></a>  <td><a href="viatrim.out.pcb"><img src="viatrim.out.png"></a>
+<tr><th>auto<td>run all the above except miter; run them multiple times until there's no more change possible <td> &nbsp; <td> &nbsp;
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/miter.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/miter.out.pcb	(revision 18980)
@@ -0,0 +1,75 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[500.0 0 0 1]
+Cursor[500 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 45000 15000 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 80000 47500 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+Layer(1 "component")
+(
+	Line[50905 15000 53405 15000 1000 4000 "clearline"]
+	Line[80000 41595 80000 41595 1000 4000 "clearline"]
+	Line[53405 15000 80000 41595 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/miter.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/miter.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/miter.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/miter.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/miter.pcb	(revision 18980)
@@ -0,0 +1,80 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[500.0 0 0 1]
+Cursor[500 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Attribute("PCB::grid::unit" "mil")
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 45000 15000 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 80000 47500 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+Layer(1 "component")
+(
+	Line[50905 15000 80000 15000 1000 4000 "clearline"]
+	Line[80000 15000 80000 41595 1000 4000 "clearline"]
+	Line[81181 41595 80000 41595 1000 4000 "clearline"]
+	Line[80000 41595 78819 41595 1000 4000 "clearline"]
+	Line[50905 16181 50905 15000 1000 4000 "clearline"]
+	Line[50905 15000 50905 13819 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/miter.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/miter.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/miter.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/miter.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/miter.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/miter.txt	(revision 18980)
@@ -0,0 +1,2 @@
+Replaces 90 degree corners with a pair of 45 degree corners, to reduce
+RF losses and trace length.
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.pcb	(revision 18980)
@@ -0,0 +1,99 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[47500 32500 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 52500 10000 4350 5650 1 100 ""]
+(
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [3740 -2362 3740 2362 800]
+	ElementLine [-3740 -2362 -3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R103" "1206" 72500 10000 4350 5650 1 100 ""]
+(
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [3740 -2362 3740 2362 800]
+	ElementLine [-3740 -2362 -3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R104" "1206" 62500 52500 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 35000 10000 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+Layer(1 "component")
+(
+	Line[52500 15905 52500 22500 1000 4000 "clearline"]
+	Line[72500 15905 72500 22500 1000 4000 "clearline"]
+	Line[62500 46595 62500 22500 1000 4000 "clearline"]
+	Line[35000 22500 52500 22500 1000 4000 "clearline"]
+	Line[35000 22500 35000 15905 1000 4000 "clearline"]
+	Line[62500 22500 72500 22500 1000 4000 "clearline"]
+	Line[52500 22500 62500 22500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+		Connect("R103-2")
+		Connect("R104-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/orthopull.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/orthopull.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/orthopull.pcb	(revision 18980)
@@ -0,0 +1,98 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[47500 32500 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Attribute("PCB::grid::unit" "mm")
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 52500 10000 4350 5650 1 100 ""]
+(
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [3740 -2362 3740 2362 800]
+	ElementLine [-3740 -2362 -3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R103" "1206" 72500 10000 4350 5650 1 100 ""]
+(
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [3740 -2362 3740 2362 800]
+	ElementLine [-3740 -2362 -3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R104" "1206" 62500 52500 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 35000 10000 -4350 -5650 3 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+Layer(1 "component")
+(
+	Line[52500 15905 52500 37500 1000 4000 "clearline"]
+	Line[72500 15905 72500 37500 1000 4000 "clearline"]
+	Line[62500 46595 62500 37500 1000 4000 "clearline"]
+	Line[35000 37500 72500 37500 1000 4000 "clearline"]
+	Line[35000 37500 35000 15905 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+		Connect("R103-2")
+		Connect("R104-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/orthopull.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/orthopull.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/orthopull.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/orthopull.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/orthopull.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/orthopull.txt	(revision 18980)
@@ -0,0 +1,4 @@
+Looks for chains of traces all going in one direction, with more
+traces orthogonal on one side than on the other.  Moves the chain in
+that direction, causing a net reduction in trace length, possibly
+eliminating traces and/or corners.
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.pcb	(revision 18980)
@@ -0,0 +1,79 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[12500 10000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 65000 12500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 37500 32500 1000 4000 "clearline"]
+	Line[37500 32500 37500 15000 1000 4000 "clearline"]
+	Line[37500 15000 37500 15000 1000 4000 "clearline"]
+	Line[37500 32500 37500 32500 1000 4000 "clearline"]
+	Line[37500 15000 45000 15000 1000 4000 "clearline"]
+	Line[45000 15000 45000 10000 1000 4000 "clearline"]
+	Line[45000 10000 59095 10000 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/unjaggy.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/unjaggy.pcb	(revision 18980)
@@ -0,0 +1,81 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[12500 10000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Attribute("PCB::grid::unit" "mm")
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 65000 12500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 30000 32500 1000 4000 "clearline"]
+	Line[30000 22500 37500 22500 1000 4000 "clearline"]
+	Line[37500 22500 37500 15000 1000 4000 "clearline"]
+	Line[30000 32500 30000 22500 1000 4000 "clearline"]
+	Line[37500 15000 45000 15000 1000 4000 "clearline"]
+	Line[45000 15000 45000 10000 1000 4000 "clearline"]
+	Line[45000 10000 56595 10000 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/unjaggy.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/unjaggy.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/unjaggy.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/unjaggy.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/unjaggy.txt	(revision 18980)
@@ -0,0 +1,2 @@
+Looks for corners which could be flipped to eliminate one or more
+corners (i.e. jaggy lines become simpler).
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.pcb	(revision 18980)
@@ -0,0 +1,79 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[17500 22500 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Via[85000 27500 8661 4000 0 3937 "" ""]
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 57500 10000 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R102" "1206" 10000 10000 5650 4350 2 100 "auto"]
+(
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[63405 10000 85000 10000 1000 4000 "clearline"]
+	Line[85000 10000 85000 27500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[15905 10000 30000 10000 2000 4000 "clearline"]
+	Line[30000 10000 30000 27500 2000 4000 "clearline"]
+	Line[30000 27500 85000 27500 2000 4000 "clearline"]
+	Line[85000 27500 85000 27500 2000 4000 "clearline"]
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/vianudge.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/vianudge.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/vianudge.pcb	(revision 18980)
@@ -0,0 +1,81 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[17500 22500 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Attribute("PCB::grid::unit" "mm")
+Via[85000 50000 8661 4000 0 3937 "" ""]
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 57500 10000 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R102" "1206" 10000 10000 5650 4350 2 100 "auto"]
+(
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[63405 10000 85000 10000 1000 4000 "clearline"]
+	Line[85000 10000 85000 50000 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[15905 10000 30000 10000 2000 4000 "clearline"]
+	Line[30000 10000 30000 27500 2000 4000 "clearline"]
+	Line[30000 27500 85000 27500 2000 4000 "clearline"]
+	Line[85000 50000 85000 27500 2000 4000 "clearline"]
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/vianudge.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/vianudge.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/vianudge.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/vianudge.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/vianudge.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/vianudge.txt	(revision 18980)
@@ -0,0 +1,3 @@
+Looks for vias where all traces leave in the same direction.  Tries to
+move via in that direction to eliminate one of the traces (and thus a
+corner).
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.pcb	(revision 18980)
@@ -0,0 +1,80 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[37500 10000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Via[60000 32500 7874 4000 0 3150 "" ""]
+Via[92500 32500 7874 4000 0 3150 "" ""]
+Via[75000 32500 7874 4000 0 3150 "" ""]
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 117500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 60000 32500 1000 4000 "clearline"]
+	Line[92500 32500 111595 32500 1000 4000 "clearline"]
+	Line[60000 32500 60000 32500 1000 4000 "clearline"]
+	Line[60000 32500 75000 32500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[75000 32500 92500 32500 1000 4000 "clearline"]
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/viatrim.out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.pcb
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/viatrim.pcb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/viatrim.pcb	(revision 18980)
@@ -0,0 +1,87 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 140000 67500]
+
+Grid[2500.0 0 0 1]
+Cursor[37500 10000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+
+Attribute("PCB::grid::unit" "mm")
+Via[60000 32500 7874 4000 0 3150 "" ""]
+Via[92500 32500 7874 4000 0 3150 "" ""]
+Via[75000 32500 7874 4000 0 3150 "" ""]
+Via[40000 32500 7874 4000 0 3150 "" ""]
+
+Element["" "Standard SMT resistor, capacitor etc" "R101" "1206" 17500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R102" "1206" 117500 32500 -5650 4350 0 100 ""]
+(
+	Pad[5905 -1181 5905 1181 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -1181 -5905 1181 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2362 3740 2362 3740 800]
+	ElementLine [-2362 -3740 2362 -3740 800]
+
+	)
+Layer(1 "component")
+(
+	Line[23405 32500 40000 32500 1000 4000 "clearline"]
+	Line[92500 32500 111595 32500 1000 4000 "clearline"]
+	Line[111595 33681 111595 32500 1000 4000 "clearline"]
+	Line[111595 32500 111595 31319 1000 4000 "clearline"]
+	Line[23405 33681 23405 32500 1000 4000 "clearline"]
+	Line[23405 32500 23405 31319 1000 4000 "clearline"]
+	Line[40000 32500 60000 32500 1000 4000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[60000 32500 75000 32500 1000 4000 "clearline"]
+	Line[75000 32500 92500 32500 1000 4000 "clearline"]
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
+NetList()
+(
+	Net("GND" "(unknown)")
+	(
+		Connect("R101-1")
+		Connect("R102-2")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/viatrim.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/viatrim.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/djopt/viatrim.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/djopt/viatrim.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/djopt/viatrim.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/djopt/viatrim.txt	(revision 18980)
@@ -0,0 +1,2 @@
+Looks for traces that go from via to via, where moving that trace to a
+different layer eliminates one or both vias.
Index: tags/2.0.1/doc/user/06_feature/gpmi/Credits
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/Credits	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/Credits	(revision 18980)
@@ -0,0 +1,11 @@
+2006...2009
+~~~~~~~~~~~
+Big thanks to DJ Delorie who added external HID support in PCB and commited
+many small patches needed to get this project working in the period
+when the whole project was a plugin to vanilla pcb.
+
+The following people helped the project with their valuable feedbacks
+in the early stage:
+ John Griessen
+ Carlos Nieves Onega
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/History
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/History	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/History	(revision 18980)
@@ -0,0 +1,32 @@
+History
+~~~~~~~
+As of October 2006, PCB has native support for external (or dynamic
+loadable) HIDs. This project is a plugin that provides scripting features.
+
+For a long time I have believed that good applications should be scriptable,
+and really good ones should not restrict scripting to one or two languages.
+For this reason I have been working on GPMI with various other developers
+for years. GPMI provides a general way to split up big applications in
+smaller, usually dynamic loadable parts, and encourages that some of these
+parts should be written in a script language. For me, the ideal model
+of an application is a small core that knows how to manipulate the
+internal representation of the task and a lot of dynamic functionality
+plugins and support plugins that do all the high-level job for the user.
+
+PCB is an old and big software, with a stable user base. Restructuring the
+whole source to "GPMIize" it is not an option. Instead, a nice compromise is
+implementing this functionality in a plugin that pcb can load for the users
+who are interested in such extras.
+
+From 2006 to spring 2009 the project was on hold, because I was nagging
+PCB developers to add support for customizable dialog boxes. In late March
+2009, PCB developers pointed out that the interface I was waiting for had been
+there for who-knows-how-long. With the help of DJ Delorie I extended the
+action handling of PCB to remember action contexts, which was another showstopper.
+After all obstacles were removed, I allocated a 24 hour coding session where I
+finished the exporter functionality, added action binding, dialog box handling,
+and layout manipulation functions.
+
+During the summer of 2015 I merged pcb-gpmi into pcb-rnd and made it
+the default scripting engine for pcb-rnd.
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/Makefile	(revision 18980)
@@ -0,0 +1,20 @@
+DPI_BIG=-Gsize=8,8 -Gdpi=166
+DPI=-Gsize=8,8 -Gdpi=100
+
+all:  gpmi_flow.png gpmi_flow_load.png gpmi_flow_reg.png gpmi_flow_menu.png gpmi_flow_exp.png
+	cd rosetta && $(MAKE)
+
+gpmi_flow.png: gpmi_flow.dot Makefile
+	dot $(DPI_BIG) -Tpng gpmi_flow.dot >$@
+
+gpmi_flow_load.png: gpmi_flow_load.dot Makefile
+	dot $(DPI) -Tpng gpmi_flow_load.dot >$@
+
+gpmi_flow_reg.png: gpmi_flow_reg.dot Makefile
+	dot $(DPI) -Tpng gpmi_flow_reg.dot >$@
+
+gpmi_flow_menu.png: gpmi_flow_menu.dot Makefile
+	dot $(DPI) -Tpng gpmi_flow_menu.dot >$@
+
+gpmi_flow_exp.png: gpmi_flow_exp.dot Makefile
+	dot $(DPI) -Tpng gpmi_flow_exp.dot >$@
Index: tags/2.0.1/doc/user/06_feature/gpmi/Porting
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/Porting	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/Porting	(revision 18980)
@@ -0,0 +1,5 @@
+Currently the project works on Linux only. GPMI is portable, so we need
+only Makefile tweakings on pcb-gpmi to be able to compile it anywhere
+where GPMI compiles. However, first I want to see some test results
+from Linux users.
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.dot
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.dot	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.dot	(revision 18980)
@@ -0,0 +1,63 @@
+digraph g {
+	rankdir=LR
+	splines="polyline"
+#	nodesep=1
+#	ranksep=1.5
+
+	subgraph cluster_0 {
+		label="pcb-rnd"
+#		core [label="pcb-rnd core|{{<f0>HID system|<f1>plugin system}}" shape=record]
+		core [label="core" shape=box]
+		hids [label="HID system" shape=box height=2]
+		plugins [label="plugin system" shape=box height=2]
+	}
+
+	subgraph cluster_1 {
+		label="GPMI"
+		gpmi_hid [label="gpmi HID"]
+		gpmi_pkg [label="gpmi package\n(host glue layer)"]
+		gpmi_mod1 [label="gpmi lua module\n(script glue layer)"]
+		gpmi_scr1 [label="lua script"]
+		gpmi_mod2 [label="gpmi mawk module\n(script glue layer)"]
+		gpmi_scr2 [label="awk script"]
+	}
+
+
+
+	gui [label="the active\nGUI HID\n(e.g. gtk)"]
+	exp1 [label="PS exporer"]
+	exp2 [label="PNG exporer"]
+
+
+	exp1 -> hids [label="register"]
+	exp2 -> hids [label="register"]
+
+	hids -> exp1 [label="drawing"]
+	hids -> exp2 [label="drawing"]
+	hids -> gui [label="drawing"]
+
+	plugins -> gpmi_hid [label="load plugin"]
+	gpmi_hid -> hids [label="register"]
+	hids -> gpmi_hid [label="drawing"]
+	core -> gpmi_hid [label="event"]
+
+	gpmi_pkg -> core [label="calls & variables"]
+	gpmi_pkg -> hids [label="calls & variables"]
+	gpmi_pkg -> gpmi_hid [label="calls & variables"]
+	gpmi_pkg -> plugins [label="calls & variables"]
+
+
+	gpmi_hid -> gpmi_mod1 [label="load script"]
+	gpmi_hid -> gpmi_mod1 [label="event"]
+	gpmi_hid -> gpmi_mod2 [label="load script"]
+	gpmi_hid -> gpmi_mod2 [label="event"]
+
+	gpmi_mod1 -> gpmi_scr1 [label="load and exec"]
+	gpmi_mod1 -> gpmi_scr1 [label="event" style=dashed]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed]
+
+	gpmi_mod2 -> gpmi_scr2 [label="load and exec"]
+	gpmi_mod2 -> gpmi_scr2 [label="event" style=dashed]
+	gpmi_scr2 -> gpmi_pkg [label="function calls" style=dashed]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.dot
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.dot	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.dot	(revision 18980)
@@ -0,0 +1,65 @@
+digraph g {
+	rankdir=LR
+	splines="polyline"
+#	nodesep=1
+#	ranksep=1.5
+
+	subgraph cluster_0 {
+		label="pcb-rnd"
+#		core [label="pcb-rnd core|{{<f0>HID system|<f1>plugin system}}" shape=record]
+		core [label="core" shape=box]
+		hids [label="HID system" shape=box height=2]
+		plugins [label="plugin system" shape=box height=2]
+	}
+
+	subgraph cluster_1 {
+		label="GPMI"
+		gpmi_hid [label="gpmi HID"]
+		gpmi_pkg [label="gpmi package\n(host glue layer)"]
+		gpmi_mod1 [label="gpmi lua module\n(script glue layer)"]
+		gpmi_scr1 [label="lua script"]
+		gpmi_mod2 [label="gpmi mawk module\n(script glue layer)"]
+		gpmi_scr2 [label="awk script"]
+		outfile [label="export\noutput file" color=green]
+	}
+
+
+
+	gui [label="the active\nGUI HID\n(e.g. gtk)"]
+	exp1 [label="PS exporer"]
+	exp2 [label="PNG exporer"]
+
+
+	exp1 -> hids [label="register"]
+	exp2 -> hids [label="register"]
+
+	hids -> exp1 [label="drawing"]
+	hids -> exp2 [label="drawing"]
+	hids -> gui [label="drawing"]
+
+	plugins -> gpmi_hid [label="load plugin"]
+	gpmi_hid -> hids [label="register"]
+	hids -> gpmi_hid [label="drawing"  color=green]
+	core -> gpmi_hid [label="event"]
+
+	gpmi_pkg -> core [label="calls & variables"]
+	gpmi_pkg -> hids [label="calls & variables" color=red]
+	gpmi_pkg -> gpmi_hid [label="calls & variables"]
+	gpmi_pkg -> plugins [label="calls & variables"]
+
+
+	gpmi_hid -> gpmi_mod1 [label="load script"]
+	gpmi_hid -> gpmi_mod1 [label="event" color=green]
+	gpmi_hid -> gpmi_mod2 [label="load script"]
+	gpmi_hid -> gpmi_mod2 [label="event"]
+
+	gpmi_mod1 -> gpmi_scr1 [label="load and exec"]
+	gpmi_mod1 -> gpmi_scr1 [label="event" style=dashed color=green]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed color=red]
+	gpmi_scr1 -> outfile [label="write" color=green]
+
+	gpmi_mod2 -> gpmi_scr2 [label="load and exec"]
+	gpmi_mod2 -> gpmi_scr2 [label="event" style=dashed]
+	gpmi_scr2 -> gpmi_pkg [label="function calls" style=dashed]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_exp.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.dot
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.dot	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.dot	(revision 18980)
@@ -0,0 +1,63 @@
+digraph g {
+	rankdir=LR
+	splines="polyline"
+#	nodesep=1
+#	ranksep=1.5
+
+	subgraph cluster_0 {
+		label="pcb-rnd"
+#		core [label="pcb-rnd core|{{<f0>HID system|<f1>plugin system}}" shape=record]
+		core [label="core" shape=box]
+		hids [label="HID system" shape=box height=2]
+		plugins [label="plugin system" shape=box height=2]
+	}
+
+	subgraph cluster_1 {
+		label="GPMI"
+		gpmi_hid [label="gpmi HID"]
+		gpmi_pkg [label="gpmi package\n(host glue layer)"]
+		gpmi_mod1 [label="gpmi lua module\n(script glue layer)"]
+		gpmi_scr1 [label="lua script"]
+		gpmi_mod2 [label="gpmi mawk module\n(script glue layer)"]
+		gpmi_scr2 [label="awk script"]
+	}
+
+
+
+	gui [label="the active\nGUI HID\n(e.g. gtk)"]
+	exp1 [label="PS exporer"]
+	exp2 [label="PNG exporer"]
+
+
+	exp1 -> hids [label="register"]
+	exp2 -> hids [label="register"]
+
+	hids -> exp1 [label="drawing"]
+	hids -> exp2 [label="drawing"]
+	hids -> gui [label="drawing"]
+
+	plugins -> gpmi_hid [label="load plugin" color=red]
+	gpmi_hid -> hids [label="register"]
+	hids -> gpmi_hid [label="drawing"]
+	core -> gpmi_hid [label="event"]
+
+	gpmi_pkg -> core [label="calls & variables"]
+	gpmi_pkg -> hids [label="calls & variables"]
+	gpmi_pkg -> gpmi_hid [label="calls & variables" color=green]
+	gpmi_pkg -> plugins [label="calls & variables"]
+
+
+	gpmi_hid -> gpmi_mod1 [label="load script" color=red]
+	gpmi_hid -> gpmi_mod1 [label="event"]
+	gpmi_hid -> gpmi_mod2 [label="load script"]
+	gpmi_hid -> gpmi_mod2 [label="event"]
+
+	gpmi_mod1 -> gpmi_scr1 [label="load and exec" color=red]
+	gpmi_mod1 -> gpmi_scr1 [label="event" style=dashed]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed color=green]
+
+	gpmi_mod2 -> gpmi_scr2 [label="load and exec"]
+	gpmi_mod2 -> gpmi_scr2 [label="event" style=dashed]
+	gpmi_scr2 -> gpmi_pkg [label="function calls" style=dashed]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_load.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.dot
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.dot	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.dot	(revision 18980)
@@ -0,0 +1,63 @@
+digraph g {
+	rankdir=LR
+	splines="polyline"
+#	nodesep=1
+#	ranksep=1.5
+
+	subgraph cluster_0 {
+		label="pcb-rnd"
+#		core [label="pcb-rnd core|{{<f0>HID system|<f1>plugin system}}" shape=record]
+		core [label="core" shape=box]
+		hids [label="HID system" shape=box height=2]
+		plugins [label="plugin system" shape=box height=2]
+	}
+
+	subgraph cluster_1 {
+		label="GPMI"
+		gpmi_hid [label="gpmi HID"]
+		gpmi_pkg [label="gpmi package\n(host glue layer)"]
+		gpmi_mod1 [label="gpmi lua module\n(script glue layer)"]
+		gpmi_scr1 [label="lua script"]
+		gpmi_mod2 [label="gpmi mawk module\n(script glue layer)"]
+		gpmi_scr2 [label="awk script"]
+	}
+
+
+
+	gui [label="the active\nGUI HID\n(e.g. gtk)"]
+	exp1 [label="PS exporer"]
+	exp2 [label="PNG exporer"]
+
+
+	exp1 -> hids [label="register"]
+	exp2 -> hids [label="register"]
+
+	hids -> exp1 [label="drawing"]
+	hids -> exp2 [label="drawing"]
+	hids -> gui [label="drawing" color=green]
+
+	plugins -> gpmi_hid [label="load plugin"]
+	gpmi_hid -> hids [label="register"]
+	hids -> gpmi_hid [label="drawing"]
+	core -> gpmi_hid [label="event" color=red]
+
+	gpmi_pkg -> core [label="calls & variables"]
+	gpmi_pkg -> hids [label="calls & variables" color=green]
+	gpmi_pkg -> gpmi_hid [label="calls & variables"]
+	gpmi_pkg -> plugins [label="calls & variables"]
+
+
+	gpmi_hid -> gpmi_mod1 [label="load script"]
+	gpmi_hid -> gpmi_mod1 [label="event" color=red]
+	gpmi_hid -> gpmi_mod2 [label="load script"]
+	gpmi_hid -> gpmi_mod2 [label="event"]
+
+	gpmi_mod1 -> gpmi_scr1 [label="load and exec"]
+	gpmi_mod1 -> gpmi_scr1 [label="event" style=dashed color=red]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed color=green]
+
+	gpmi_mod2 -> gpmi_scr2 [label="load and exec"]
+	gpmi_mod2 -> gpmi_scr2 [label="event" style=dashed]
+	gpmi_scr2 -> gpmi_pkg [label="function calls" style=dashed]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_menu.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.dot
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.dot	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.dot	(revision 18980)
@@ -0,0 +1,64 @@
+digraph g {
+	rankdir=LR
+	splines="polyline"
+#	nodesep=1
+#	ranksep=1.5
+
+	subgraph cluster_0 {
+		label="pcb-rnd"
+#		core [label="pcb-rnd core|{{<f0>HID system|<f1>plugin system}}" shape=record]
+		core [label="core" shape=box]
+		hids [label="HID system" shape=box height=2]
+		plugins [label="plugin system" shape=box height=2]
+	}
+
+	subgraph cluster_1 {
+		label="GPMI"
+		gpmi_hid [label="gpmi HID"]
+		gpmi_pkg [label="gpmi package\n(host glue layer)"]
+		gpmi_mod1 [label="gpmi lua module\n(script glue layer)"]
+		gpmi_scr1 [label="lua script"]
+		gpmi_mod2 [label="gpmi mawk module\n(script glue layer)"]
+		gpmi_scr2 [label="awk script"]
+	}
+
+
+
+	gui [label="the active\nGUI HID\n(e.g. gtk)"]
+	exp1 [label="PS exporer"]
+	exp2 [label="PNG exporer"]
+
+
+	exp1 -> hids [label="register"]
+	exp2 -> hids [label="register"]
+
+	hids -> exp1 [label="drawing"]
+	hids -> exp2 [label="drawing"]
+	hids -> gui [label="drawing"]
+
+	plugins -> gpmi_hid [label="load plugin"]
+	gpmi_hid -> hids [label="register"]
+	hids -> gpmi_hid [label="drawing"]
+	core -> gpmi_hid [label="event"]
+
+	gpmi_pkg -> core [label="calls & variables" color=green]
+	gpmi_pkg -> hids [label="calls & variables"]
+	gpmi_pkg -> gpmi_hid [label="calls & variables" color=red]
+	gpmi_pkg -> plugins [label="calls & variables"]
+
+
+	gpmi_hid -> gpmi_mod1 [label="load script"]
+	gpmi_hid -> gpmi_mod1 [label="event"]
+	gpmi_hid -> gpmi_mod2 [label="load script"]
+	gpmi_hid -> gpmi_mod2 [label="event"]
+
+	gpmi_mod1 -> gpmi_scr1 [label="load and exec"]
+	gpmi_mod1 -> gpmi_scr1 [label="event" style=dashed]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed color=red]
+	gpmi_scr1 -> gpmi_pkg [label="function calls" style=dashed color=green]
+
+	gpmi_mod2 -> gpmi_scr2 [label="load and exec"]
+	gpmi_mod2 -> gpmi_scr2 [label="event" style=dashed]
+	gpmi_scr2 -> gpmi_pkg [label="function calls" style=dashed]
+
+}
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.png
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.png	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.png	(revision 18980)

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_flow_reg.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/gpmi_temp_inst.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/gpmi_temp_inst.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/gpmi_temp_inst.txt	(revision 18980)
@@ -0,0 +1,65 @@
+GPMI system-wide installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The installation process is somewhat manual at this early stage. Please 
+follow the steps below.
+
+First, you'll need libgpmi - it's a general purpose script glue interface.
+
+A/1. svn checkout svn://repo.hu/gpmi/trunk gpmi/trunk
+A/2. look at doc/languages.txt there; if you have preferred languages, 
+please install the -dev packages of those. My favorite is mawk, but I 
+think most of the example pcb scripts would be in lua. Versions should 
+match; it may be that gpmi works with a newer minor version out of the 
+box, tho.
+A/3. run ./configure
+A/4. check if it found the language(s) you wanted; if not, or anything 
+else breaks, please send me your scconfig/config.log
+A/5. make
+A/6. make install (as root, but see below)
+
+There are options to step 6:
+
+- if you want to check what it'd do, you could run this:
+
+   install_root=/tmp/foo make install
+
+   it's like DESTDIR for autotools: it will do everything but will use
+   /tmp/foo instead of / so you see what it'd do without using root or
+   messing with /usr
+
+- you can use make linstall instead of make install; this creates symlinks 
+(pointing to the binaries in your user checkout) instead of copying the 
+files. If gpmi changes and you need to update and recompile, you won't 
+need to reinstall (until the number of files change).
+
+- there's a make uninstall, but it's more or less untested (failed once 
+and worked once for me)
+
+Second, you'll need pcb-rnd:
+
+B/1. svn checkout svn://repo.hu/pcb-rnd/trunk pcb-rnd/trunk
+B/2. ./configure
+B/3. check the output; if anything went wrong, please send me 
+scconfig/config.log
+B/4. make
+B/5. you don't need to install it for testing: cd src; ./pcb-rnd
+
+
+There are options in step 2: by default, if gpmi is found, it's compiled
+in "buildin" mode, which means script support is compiled into the pcb-rnd
+executable. An alternative is to have it as a plugin (dynamic linkable
+object). This can be done using the --plugin-gpmi argument for ./configure.
+
+
+GPMI local installation
+~~~~~~~~~~~~~~~~~~~~~~~
+GPMI can be installed without root, into a local user directory (typically
+under home). To achieve this, follow the above steps with the following
+modifications (assuming you want to install gpmi in ~/usr):
+
+A/3. ./configure --prefix=~/usr
+B/2. ./configure --gpmi-prefix=~/usr
+
+NOTE: you don't need to use install_root; gpmi will install under ~/usr as
+if it was /usr. 
Index: tags/2.0.1/doc/user/06_feature/gpmi/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/index.html	(revision 18980)
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> pcb-rnd GPMI scripting - TOC </H1>
+
+<H2> Installation, configuration </H2>
+<UL>
+	<LI> <a href="gpmi_temp_inst.txt"> Installation </a>
+</UL>
+
+
+<H2> High level docs </H2>
+<UL>
+	<LI> <a href="scripting_intro.html"> Introduction to scripting </a>
+	<LI> <a href="rosetta/index.html"> Rosetta: example scripts </a>
+</UL>
+
+<H2> Glue layer documentation </H2>
+<UL>
+	<LI> actions: create and call actions; <a href="packages/actions.html"> package docs </a> ; <a href="packages/actions_ref.html"> API ref </a>
+	<LI> dialogs: pop up dialog boxes; <a href="packages/dialogs.html"> package docs </a> ; <a href="packages/dialogs_ref.html"> API ref </a>
+	<LI> hid: register exporters and build the fields of a custom dialog box; <a href="packages/hid.html"> package docs  </a> ; <a href="packages/hid_ref.html"> API ref  </a>
+	<LI> layout: search, move, create PCB objects; <a href="packages/layout.html"> package docs </a> ; <a href="packages/layout_ref.html"> API ref</a>
+</UL>
+
+<H2> Authors, credits, misc </H2>
+<UL>
+	<LI> <a href="Credits"> Credits </a>
+	<LI> <a href="History"> History </a>
+</UL>
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/Makefile	(revision 18980)
@@ -0,0 +1,15 @@
+ROOT=../../../../..
+GPMIDIR=$(ROOT)/src_plugins/gpmi/pcb-gpmi
+ALL= actions dialogs hid layout
+
+all: XREF $(ALL:%=%_ref.html)
+
+include $(GPMIDIR)/Makefile.config
+
+%_ref.html REF.% : $(GPMIDIR)/gpmi_plugin/gpmi_pkg/%.h
+	$(ROOT)/util/genref.sh "$^" "$(ROOT)"  "../packages/$*_ref.html" $(PCB_CFLAGS) >$*_ref.html
+
+XREF: $(ALL:%=REF.%)
+	cat $^ > $@
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/XREF
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/XREF	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/XREF	(revision 18980)
@@ -0,0 +1,85 @@
+event ACTE_action ../packages/actions_ref.html#ACTE_action
+event ACTE_gui_init ../packages/actions_ref.html#ACTE_gui_init
+event ACTE_unload ../packages/actions_ref.html#ACTE_unload
+function action_register ../packages/actions_ref.html#action_register
+function action_arg ../packages/actions_ref.html#action_arg
+function action ../packages/actions_ref.html#action
+function create_menu ../packages/actions_ref.html#create_menu
+enum dialog_fileselect_e ../packages/dialogs_ref.html#dialog_fileselect_e
+function dialog_log ../packages/dialogs_ref.html#dialog_log
+function dialog_confirm ../packages/dialogs_ref.html#dialog_confirm
+function dialog_report ../packages/dialogs_ref.html#dialog_report
+function dialog_prompt ../packages/dialogs_ref.html#dialog_prompt
+function dialog_fileselect ../packages/dialogs_ref.html#dialog_fileselect
+function dialog_beep ../packages/dialogs_ref.html#dialog_beep
+function dialog_progress ../packages/dialogs_ref.html#dialog_progress
+function dialog_attribute ../packages/dialogs_ref.html#dialog_attribute
+enum hid_attr_type_e ../packages/hid_ref.html#hid_attr_type_e
+enum EndCapStyle_e ../packages/hid_ref.html#EndCapStyle_e
+event HIDE_get_export_options ../packages/hid_ref.html#HIDE_get_export_options
+event HIDE_do_export_start ../packages/hid_ref.html#HIDE_do_export_start
+event HIDE_do_export_finish ../packages/hid_ref.html#HIDE_do_export_finish
+event HIDE_set_layer ../packages/hid_ref.html#HIDE_set_layer
+event HIDE_set_color ../packages/hid_ref.html#HIDE_set_color
+event HIDE_set_line_cap ../packages/hid_ref.html#HIDE_set_line_cap
+event HIDE_set_line_width ../packages/hid_ref.html#HIDE_set_line_width
+event HIDE_set_draw_xor ../packages/hid_ref.html#HIDE_set_draw_xor
+event HIDE_set_draw_faded ../packages/hid_ref.html#HIDE_set_draw_faded
+event HIDE_draw_line ../packages/hid_ref.html#HIDE_draw_line
+event HIDE_draw_arc ../packages/hid_ref.html#HIDE_draw_arc
+event HIDE_draw_rect ../packages/hid_ref.html#HIDE_draw_rect
+event HIDE_fill_circle ../packages/hid_ref.html#HIDE_fill_circle
+event HIDE_fill_polygon ../packages/hid_ref.html#HIDE_fill_polygon
+event HIDE_fill_rect ../packages/hid_ref.html#HIDE_fill_rect
+event HIDE_use_mask ../packages/hid_ref.html#HIDE_use_mask
+event HIDE_make_gc ../packages/hid_ref.html#HIDE_make_gc
+event HIDE_destroy_gc ../packages/hid_ref.html#HIDE_destroy_gc
+event HIDE_fill_pcb_pv ../packages/hid_ref.html#HIDE_fill_pcb_pv
+event HIDE_fill_pcb_pad ../packages/hid_ref.html#HIDE_fill_pcb_pad
+function hid_create ../packages/hid_ref.html#hid_create
+function hid_add_attribute ../packages/hid_ref.html#hid_add_attribute
+function hid_get_attribute ../packages/hid_ref.html#hid_get_attribute
+function hid_register ../packages/hid_ref.html#hid_register
+function hid_gpmi_data_set ../packages/hid_ref.html#hid_gpmi_data_set
+function hid_gpmi_data_get ../packages/hid_ref.html#hid_gpmi_data_get
+function hid_string2val ../packages/hid_ref.html#hid_string2val
+enum layout_object_mask_e ../packages/layout_ref.html#layout_object_mask_e
+enum layout_object_coord_e ../packages/layout_ref.html#layout_object_coord_e
+enum layout_flag_e ../packages/layout_ref.html#layout_flag_e
+enum layer_field_e ../packages/layout_ref.html#layer_field_e
+function layout_search_box ../packages/layout_ref.html#layout_search_box
+function layout_search_selected ../packages/layout_ref.html#layout_search_selected
+function layout_search_found ../packages/layout_ref.html#layout_search_found
+function layout_search_get ../packages/layout_ref.html#layout_search_get
+function layout_search_free ../packages/layout_ref.html#layout_search_free
+function layout_obj_coord ../packages/layout_ref.html#layout_obj_coord
+function layout_obj_type ../packages/layout_ref.html#layout_obj_type
+function layout_obj_move ../packages/layout_ref.html#layout_obj_move
+function layout_arc_angles ../packages/layout_ref.html#layout_arc_angles
+function layout_create_line ../packages/layout_ref.html#layout_create_line
+function layout_create_via ../packages/layout_ref.html#layout_create_via
+function layout_create_arc ../packages/layout_ref.html#layout_create_arc
+function layout_switch_to_layer ../packages/layout_ref.html#layout_switch_to_layer
+function layout_get_current_layer ../packages/layout_ref.html#layout_get_current_layer
+function layout_resolve_layer ../packages/layout_ref.html#layout_resolve_layer
+function layout_get_max_possible_layer ../packages/layout_ref.html#layout_get_max_possible_layer
+function layout_get_max_copper_layer ../packages/layout_ref.html#layout_get_max_copper_layer
+function layout_get_max_layer ../packages/layout_ref.html#layout_get_max_layer
+function layout_layer_name ../packages/layout_ref.html#layout_layer_name
+function layout_layer_color ../packages/layout_ref.html#layout_layer_color
+function layout_layer_field ../packages/layout_ref.html#layout_layer_field
+function layout_get_page_width ../packages/layout_ref.html#layout_get_page_width
+function layout_get_page_height ../packages/layout_ref.html#layout_get_page_height
+function layout_set_page_size ../packages/layout_ref.html#layout_set_page_size
+function mil2pcb_multiplier ../packages/layout_ref.html#mil2pcb_multiplier
+function mm2pcb_multiplier ../packages/layout_ref.html#mm2pcb_multiplier
+function current_grid_unit ../packages/layout_ref.html#current_grid_unit
+function debug_draw_request ../packages/layout_ref.html#debug_draw_request
+function debug_draw_flush ../packages/layout_ref.html#debug_draw_flush
+function debug_draw_finish ../packages/layout_ref.html#debug_draw_finish
+function debug_draw_dctx ../packages/layout_ref.html#debug_draw_dctx
+function draw_set_color ../packages/layout_ref.html#draw_set_color
+function draw_set_line_width ../packages/layout_ref.html#draw_set_line_width
+function draw_set_draw_xor ../packages/layout_ref.html#draw_set_draw_xor
+function draw_set_draw_faded ../packages/layout_ref.html#draw_set_draw_faded
+function draw_line ../packages/layout_ref.html#draw_line
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/actions.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/actions.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/actions.html	(revision 18980)
@@ -0,0 +1,123 @@
+<HTML>
+<BODY>
+<H1> The actions package </H1>
+
+The action package is used to register actions and menus in PCB and
+to execute existing actions. In PCB actions
+are generated when the user selects a menu, presses a key or issues a
+command on the PCB command line.
+
+<H2> Registration of new actions </H2>
+The script may register new actions
+using arbitrary action names. If any of the registered actions is
+detected, an ACTE_action event is sent to the script. If multiple
+actions are used in a script, argument <I>name</I> of the event handler
+can be used to identify the triggering action. <small>(This may be time consuming
+in scripting languages (a series of string comparison) - those scripts
+binding to frequent actions should not bind to too many different actions.)</small>
+pcb-gpmi guarantees that the event handler of a script is triggered only
+when an action is caught that previously was registered by the same script.
+<P>
+The process of binding an action:
+<OL>
+	<LI> create an event handler for event <I>ACTE_action</I>
+	<LI> register one or more actions using function <I>action_register</I>
+	<LI> optional: when the event handler is triggered, check argument <I>name</I> (for scripts with multiple actions registered)
+	<LI> optional: use argument <I>argc</I> and function <I>action_arg</I> to fetch action arguments
+	<LI> optional: use arguments <I>x, y</I> to learn the cursor position on the layout.
+</OL>
+
+Example (written in lua):
+<PRE>
+-- load the package
+PkgLoad("pcb-gpmi/actions", 0);
+
+-- action callback
+function ev_action(id, name, argc, x, y)
+	if name == "cake" then
+		size = action_arg(1);
+		-- put cake drawing code here
+	else
+		-- must be candy
+		amount = action_arg(1);
+		-- put candy drawing code here
+	end
+end
+
+-- register and bind action
+action_register("cake",  "cake center xy?", "cake service", "cake(size)", "");
+action_register("candy", "candy cloud center xy?", "cake service", "candy(amount)", "");
+Bind("ACTE_action", "ev_action");
+</PRE>
+<p>
+When the script is unloaded all actions the script registered 
+are removed from pcb-rnd automatically.
+
+<H2> Executing actions </H2>
+An existing action can be executed using the action() call. The only one
+argument is a command line string. The syntax is the same as in pcb
+command line.
+
+Example (written in lua):
+<PRE>
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+
+function ev_action1(id, name, argc, x, y)
+	action("undo()")
+	action("undo()")
+end
+
+-- register and bind action
+action_register("untwo", "", "undo twice", "untwo()", "CONTEXT!");
+</PRE>
+<p>
+The above script registers a new action called untwo(). When untwo() is executed,
+it executes action undo() twice.
+
+
+<H2> Creating menus </H2>
+It is possible to insert menus and submenus runtime, using the call
+create_menu(). The script should do this only after the gui has been initialized.
+The most common way is to create all menus from the ACTE_gui_init event,
+which is called after the gui finished setting up.
+<p>
+The first argument of create_menu() is the menu path. The path is a list
+of visible menu names separated by slashes (e.g. "/main_menu/File/Save as..." means
+"File" menu, "Save as..." submenu). 
+<p>
+Paths are interpreted as menu paths, which are a slightly simplified version
+of lihata paths found in menu.lht. Basically there's a main directory directly
+under root that determines the type of the menu:
+<p>
+<ul>
+	<li> /main_menu/ is the menubar
+	<li> /popups/something/ is a popup menu called something; the lesstif HID does
+	     not support popups; popups are popped up by actions.
+</ul>
+<p>
+The simplification compared to lihata paths is that only menu and submenu
+names are on the path, so lihata nodes like "li:submenu" should be ignored.
+In other words, the path represents how the menus can be reached from the user
+interface, plus a "main menu type prefix" as discussed above.
+<p>
+By <b>convention</b>, scripts should
+create new menu items under the "/main_menu/Plugins/" menu.
+<p>
+The following example lua script registers a new menu item
+<pre>
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+
+function ev_gui_init(argc, argv)
+	create_menu("/main_menu/Plugins/foo", "undo()", "o", "Ctrl&lt;Key&gt;o", "tooltip for foo");
+end
+
+-- register and bind action
+Bind("ACTE_gui_init", "ev_gui_init");
+</pre>
+<p>
+When the user clicks on the menu, the action script specified in the second argument
+of create_menu() is executed. Thus the script usually registers a new action
+first then registers one or more menu items executing those actions.
+
+</BODY>
+</HTML>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/actions_ref.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/actions_ref.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/actions_ref.html	(revision 18980)
@@ -0,0 +1,82 @@
+<html>
+<body>
+<h1>PCB GPMI</h1>
+<h2>Reference manual for package actions</h2>
+<small>Automatically generated from actions.h</small>
+
+<h3> Events </h3>
+<dl>
+<p>Events do not have return value. The first argument is always <a href="event_id.html">the even id</a>. Event handlers defined in scripts get all event arguments converted to string (types below are informational).
+<a id="ACTE_action">
+<H4> ACTE_action(int event_id, const char* name, int argc, int x, int y) </H4>
+<pre>
+ Generated when an action registered by the script is executed.
+   Arguments:
+    name: name of the action (as registered using function action_register())
+    argc: number of arguments. Arguments can be accessed using function action_arg
+    x, y: optional coords, if need_xy was not empty at action_register 
+</pre>
+<a id="ACTE_gui_init">
+<H4> ACTE_gui_init(int event_id, int argc, char** argv) </H4>
+<pre>
+ Generated right after gui initialization, before the gui main loop.
+   Arguments:
+    argc: number of arguments the gui was initialized with.
+    argv[]: arguments the gui was initialized with - unaccessible for the scripts. 
+</pre>
+<a id="ACTE_unload">
+<H4> ACTE_unload(int event_id, const char* conffile) </H4>
+<pre>
+ Generated right before unloading a script to give the script a chance
+   to clean up.
+   Arguments:
+    conffile: the name of the config file that originally triggered loading the script, or empty if the script was loaded from the gui. 
+</pre>
+</dl>
+<h3> Functions </h3>
+<dl>
+<p>The following functions are registered in script context.
+<a id="action_register">
+<H4>  int action_register(const char* name, const char* need_xy, const char* description, const char* syntax)  </H4>
+<pre>
+ Register an action in PCB - when the action is executed, event
+   ACTE_action is generated with the action name.
+   Multiple actions can be registered. Any action registered by the script
+   will trigger an ACTE_event sent to the script.
+   Arguments:
+    name: name of the action
+    need_xy: the question the user is asked when he needs to choose a coordinate; if empty, no coordinate is asked
+    description: description of the action (for the help)
+    syntax: syntax of the action (for the help)
+   Returns 0 on success.
+ 
+</pre>
+<a id="action_arg">
+<H4>  const char* action_arg(int argn)  </H4>
+<pre>
+ extract the (argn)th event argument for the current action (makes sense only in an ACTE_action event handler 
+</pre>
+<a id="action">
+<H4>  int action(const char* cmdline)  </H4>
+<pre>
+ call an existing action using PCB syntax (e.g. foo(1, 2, 3))
+   Returns non-zero on error; generally returns value of the action
+   (which is also non-zero on error). 
+</pre>
+<a id="create_menu">
+<H4>  void create_menu(const char* path, const char* action, const char* mnemonic, const char* hotkey, const char* tooltip)  </H4>
+<pre>
+ Create a new menu or submenu at path. Missing parents are created
+   automatically with empty action, mnemonic, hotkey and tooltip.
+   Arguments:
+    path: the full path of the new menu
+    action: this action is executed when the user clicks on the menu
+    mnemonic: which letter to underline in the menu text (will be the fast-jump-there key once the menu is open)
+    hotkey: when this key is pressed in the main gui, the action is also triggered; the format is modifiers&lt;Key&gt;letter, where modifiers is Alt, Shift or Ctrl. This is the same syntax that is used in the .res files.
+    tooltip: short help text 
+</pre>
+</dl>
+
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs.html	(revision 18980)
@@ -0,0 +1,47 @@
+<HTML>
+<BODY>
+	<H1> dialogs package </H1>
+	The purpose of this package is to expose the dialog box handling interface
+	of the active GUI hid. Using this package scripts can pop up dialog boxes
+	to inform or ask the user. If there is no active GUI, call logs are dumped
+	on stderr. Note: message arguments usually may contain newline (\n) characters
+	to split the message.
+
+	<H2> Common conventions </H2>
+	Dialog boxes are blocking calls to the GUI HID: when the script
+	calls a dialog box, the script is suspended until the dialog box
+	is closed by the user. In other words, dialog boxes behave
+	as regular function calls from the scripts: when they return,
+	the dialog is over and the result is known.
+	<p>
+	The only exception is <i>dialog_progress()</i>, which opens or
+	updates or closes the already open progress dialog box, and 
+	returns immediately (even when the box is left open).
+
+	<H2> Simple dialogs vs. custom dialogs </H2>
+	Most of the calls will pop up a static dialog box. Static means
+	that widgets are predefined by the GUI HID. The script
+	is free to fill in data, but can not change the basic structure of
+	the dialog box. For example <i>dialog_confirm(), dialog_prompt(),
+	dialog_fileselect()</i> are static.
+	<p>
+	When the script needs a custom, dynamic dialog box, it needs to
+	create an <i>attribute dialog</i>. The script sets up a HID
+	structure using the hid package, builds up all the input fields
+	then calls <i>dialog_attribute()</i> with the hid.
+
+	<H2> Progress dialogs </H2>
+
+	The script should call dialog_progress() periodically from a process that
+	runs time consuming calculations and check the return value and break
+	the loop on cancel. The process should have an idea of how long it
+	will take. This is passed on in argument <i>total</i>. As long as
+	argument <i>so_far</i> is less than <i>total</i>, the dialog is
+	open.
+	<p>
+	After the process has finished, a call with <i>so_far=total+1</i> should be
+	made to make sure the window is closed. If the call returns non-zero,
+	the process should be cancelled.
+
+</BODY>
+</HTML>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs_ref.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs_ref.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/dialogs_ref.html	(revision 18980)
@@ -0,0 +1,105 @@
+<html>
+<body>
+<h1>PCB GPMI</h1>
+<h2>Reference manual for package dialogs</h2>
+<small>Automatically generated from dialogs.h</small>
+
+<h3> Enums </h3>
+<dl>
+<p>Enum values should be passed on as strings.
+<a id="dialog_fileselect_e">
+<H4> dialog_fileselect_e</H4>
+<pre>
+ Filter on what files a file select dialog should list 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> FS_NONE <td>  none of the below 
+<tr><td> FS_READ <td>  when the selected file will be read, not written (HID_FILESELECT_READ) 
+<tr><td> FS_NOT_EXIST <td>  the function calling hid->fileselect will deal with the case when the selected file already exists.  If not given, then the gui will prompt with an "overwrite?" prompt.  Only used when writing. (HID_FILESELECT_MAY_NOT_EXIST)  
+<tr><td> FS_TEMPLATE <td>  the call is supposed to return a file template (for gerber output for example) instead of an actual file.  Only used when writing. (HID_FILESELECT_IS_TEMPLATE) 
+</table>
+</dl>
+<h3> Functions </h3>
+<dl>
+<p>The following functions are registered in script context.
+<a id="dialog_log">
+<H4>  void dialog_log(const char* msg)  </H4>
+<pre>
+ Append a msg to the log (log window and/or stderr). 
+</pre>
+<a id="dialog_confirm">
+<H4>  int dialog_confirm(const char* msg, const char* ok, const char* cancel)  </H4>
+<pre>
+ Ask the user for confirmation (usually using a popup). Returns 0 for
+   cancel and 1 for ok.
+   Arguments:
+     msg: message to the user
+     ok: label of the OK button
+     cancel: label of the cancel button
+  Arguments "ok" and "cancel" may be empty (or NULL) in which
+  case the GUI will use the default (perhaps localized) labels for
+  those buttons. 
+</pre>
+<a id="dialog_report">
+<H4>  void dialog_report(const char* title, const char* msg)  </H4>
+<pre>
+ Pop up a report dialog.
+   Arguments:
+     title: title of the window
+     msg: message 
+</pre>
+<a id="dialog_prompt">
+<H4>  char* dialog_prompt(const char* msg, const char* default_)  </H4>
+<pre>
+ Ask the user to input a string (usually in a popup).
+   Arguments:
+     msg: message or question text
+     default_: default answer (this may be filled in on start)
+   Returns the answer. 
+</pre>
+<a id="dialog_fileselect">
+<H4>  char* dialog_fileselect(const char* title, const char* descr, char* default_file_, char* default_ext, const char* history_tag, dialog_fileselect_t flags)  </H4>
+<pre>
+ Pops up a file selection dialog.
+   Arguments:
+     title: window title
+     descr: description
+     default_file_
+     default_ext: default file name extension
+     history_tag
+     flags: one or more flags (see below)
+   Returns the selected file or NULL (empty). 
+</pre>
+<a id="dialog_beep">
+<H4>  void dialog_beep(void)  </H4>
+<pre>
+ Audible beep 
+</pre>
+<a id="dialog_progress">
+<H4>  int dialog_progress(int so_far, int total, const char* message)  </H4>
+<pre>
+ Request the GUI hid to draw a progress bar.
+   Arguments:
+     int so_far: achieved state
+     int total: maximum state
+     const char *message: informs the users what they are waiting for
+   If so_far is bigger than total, the progress bar is closed.
+   Returns nonzero if the user wishes to cancel the operation.
+
+</pre>
+<a id="dialog_attribute">
+<H4>  int dialog_attribute(hid_t* hid, const char* title, const char* descr)  </H4>
+<pre>
+ Pop up an attribute dialog; content (widgets) of the dialog box are coming
+   from hid (see the hid package).
+   Arguments:
+     hid: widgets
+     title: title of the window
+     descr: description printed in the dialog 
+</pre>
+</dl>
+
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/event_id.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/event_id.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/event_id.html	(revision 18980)
@@ -0,0 +1,20 @@
+<html>
+<body>
+<H1> event_id </H1>
+
+The first argument passed to an event handler is always the event ID.
+It is useful if there are several GPMI events with the same arguments and
+the script wants to bind them all to the same event handler. In that case
+using event_id the event handler can determine which event triggered the
+call. This design is similar to the signal handler documented in 
+signal(2).
+
+<P>
+
+The case described above (dispatcher in the event handler) is rare.
+Most users will bind one event to one function and can safely ignore this
+argument. Nevertheless it must present as the first argument
+on the event handler's argument list.
+
+</BODY>
+</HTML>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/hid.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/hid.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/hid.html	(revision 18980)
@@ -0,0 +1,76 @@
+<HTML>
+<BODY>
+<H1> hid package </H1>
+
+The hid package has two purposes:
+<UL>
+	<LI> it is glue layer for exporter dialog boxes and <i>attribute dialog boxes</i>;
+	<LI> it can register exporter HIDs in PCB
+</UL>
+
+<H2> Building a custom dialog box</H2>
+First hid_create() needs to be called. It returns a new hid_t, which is
+an opaque structure for the package that is used to describe attributes of
+an attribute dialog or an exporter hid. Attributes are added using
+hid_add_attribute(), which returns an unique ID of the attribute. The
+attribute ID can be used later for querying attribute value set by the
+user using hid_get_attribute().
+<p>
+The process of building a dialog box is closed by a call to
+<ul>
+	<li> hid_register(), which registers a new exporter hid using the
+	     attributes of the dialog box; or 
+	<li> dialog_attribute() (of the dialog package) which pops up a custom
+	     dialog box immediately.
+</ul>
+
+<H2> Registering an exporter</H2>
+	Function hid_register() registers the hid as an exporter. Should be
+	called after all attributes have been added using hid_add_attribute().
+	The export is coordinated by pcb core; when the user request an export
+	using the exporter, a series of events are delivered to the script:
+	<ol>
+		<li> envelope events to set up exporting
+		<li> many draw events to actually export the objects
+		<li> an envelope event to finish exporting
+	</ol>
+
+	<H3> Envelope: events generated before or after exporting </H3>
+		<UL>
+			<LI>HIDE_get_export_options(void *hid): Generated before get_exporter_options returns the option list to the GUI hid
+			<LI>HIDE_do_export_start(void *hid): Generated before export redraw starts
+			<LI>HIDE_do_export_finish(void *hid): Generated after export redraw finished
+		</UL>
+
+	<H3> Drawing: events generated during exporting </H3>
+		Note: there may be multiple <I>gc</I>s (graphic contexts), each having its own color, line
+		properties, xor drawing and faded state. Graphic contexts are created
+		and destroyed by the following events:
+		<UL>
+			<LI>HIDE_make_gc(void *hid, void *gc);
+			<LI>HIDE_destroy_gc(void *hid, void *gc);
+		</UL>
+
+		<I>Gc</I> properties are changed by the following events:
+		<UL>
+			<LI>HIDE_set_layer(void *hid, const char *name, int group);
+			<LI>HIDE_set_color(void *hid, void *gc, const char *name);
+			<LI>HIDE_set_line_cap(void *hid, void *gc, EndCapStyle style);
+			<LI>HIDE_set_line_width(void *hid, void *gc, int width);
+			<LI>HIDE_set_draw_xor(void *hid, void *gc, int xor);
+			<LI>HIDE_set_draw_faded(void *hid, void *gc, int faded);
+		</UL>
+
+		Finally, the actual drawing operations:
+		<UL>
+			<LI>HIDE_draw_line(void *hid, void *gc, int x1, int y1, int x2, int y2);
+			<LI>HIDE_draw_arc(void *hid, void *gc, int cx, int cy, int xradius, int yradius, int start_angle, int delta_angle);
+			<LI>HIDE_draw_rect(void *hid, void *gc, int x1, int y1, int x2, int y2);
+			<LI>HIDE_fill_circle(void *hid, void *gc, int cx, int cy, int radius);
+			<LI>HIDE_fill_polygon(void *hid, void *gc, int n_coords, int *x, int *y);
+			<LI>HIDE_fill_rect(void *hid, void *gc, int x1, int y1, int x2, int y2);
+			<LI>HIDE_use_mask(void *hid, int use_it); [TODO]
+		</UL>
+
+</BODY>
+</HTML>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/hid_ref.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/hid_ref.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/hid_ref.html	(revision 18980)
@@ -0,0 +1,205 @@
+<html>
+<body>
+<h1>PCB GPMI</h1>
+<h2>Reference manual for package hid</h2>
+<small>Automatically generated from hid.h</small>
+
+<h3> Enums </h3>
+<dl>
+<p>Enum values should be passed on as strings.
+<a id="hid_attr_type_e">
+<H4> hid_attr_type_e</H4>
+<pre>
+ Type of an HID attribute (usually a widget on an attribute dialog box) 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> HIDA_Label <td>  non-editable label displayed on the GUI 
+<tr><td> HIDA_Integer <td>  a signed integer value 
+<tr><td> HIDA_Real <td>  a floating point value 
+<tr><td> HIDA_String <td>  one line textual input 
+<tr><td> HIDA_Boolean <td>  true/false boolean value 
+<tr><td> HIDA_Enum <td>  select an item of a predefined list 
+<tr><td> HIDA_Mixed <td>  TODO 
+<tr><td> HIDA_Path <td>  path to a file or directory 
+<tr><td> HIDA_Unit <td>  select a dimension unit 
+<tr><td> HIDA_Coord <td>  enter a coordinate 
+</table>
+<a id="EndCapStyle_e">
+<H4> EndCapStyle_e</H4>
+<pre>
+ Line or arc ending style 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> Trace_Cap <td>  filled circle (trace drawing) 
+<tr><td> Square_Cap <td>  rectangular lines (square pad) 
+<tr><td> Round_Cap <td>  round pins or round-ended pads, thermals 
+<tr><td> Beveled_Cap <td>  octagon pins or bevel-cornered pads 
+</table>
+</dl>
+<h3> Events </h3>
+<dl>
+<p>Events do not have return value. The first argument is always <a href="event_id.html">the even id</a>. Event handlers defined in scripts get all event arguments converted to string (types below are informational).
+<a id="HIDE_get_export_options">
+<H4> HIDE_get_export_options(int event_id, void* hid) </H4>
+<pre>
+ Called before get_exporter_options returns the option list to the GUI hid 
+</pre>
+<a id="HIDE_do_export_start">
+<H4> HIDE_do_export_start(int event_id, void* hid) </H4>
+<pre>
+ Called before export redraw starts 
+</pre>
+<a id="HIDE_do_export_finish">
+<H4> HIDE_do_export_finish(int event_id, void* hid) </H4>
+<pre>
+ Called after export redraw finished 
+</pre>
+<a id="HIDE_set_layer">
+<H4> HIDE_set_layer(int event_id, void* hid, const char* name, int group, int empty) </H4>
+<pre>
+ PCB callback events for drawing: change layer 
+</pre>
+<a id="HIDE_set_color">
+<H4> HIDE_set_color(int event_id, void* hid, void* gc, const char* name) </H4>
+<pre>
+ PCB callback events for drawing: change drawing color 
+</pre>
+<a id="HIDE_set_line_cap">
+<H4> HIDE_set_line_cap(int event_id, void* hid, void* gc, EndCapStyle style) </H4>
+<pre>
+ PCB callback events for drawing: change drawing line cap style
+</pre>
+<a id="HIDE_set_line_width">
+<H4> HIDE_set_line_width(int event_id, void* hid, void* gc, int width) </H4>
+<pre>
+ PCB callback events for drawing: change drawing line width 
+</pre>
+<a id="HIDE_set_draw_xor">
+<H4> HIDE_set_draw_xor(int event_id, void* hid, void* gc, int xor) </H4>
+<pre>
+ PCB callback events for drawing: toggle xor drawing method 
+</pre>
+<a id="HIDE_set_draw_faded">
+<H4> HIDE_set_draw_faded(int event_id, void* hid, void* gc, int faded) </H4>
+<pre>
+ PCB callback events for drawing: toggle faded drawing method 
+</pre>
+<a id="HIDE_draw_line">
+<H4> HIDE_draw_line(int event_id, void* hid, void* gc, int x1, int y1, int x2, int y2) </H4>
+<pre>
+ PCB callback events for drawing: draw a line 
+</pre>
+<a id="HIDE_draw_arc">
+<H4> HIDE_draw_arc(int event_id, void* hid, void* gc, int cx, int cy, int xradius, int yradius, double start_angle, double delta_angle) </H4>
+<pre>
+ PCB callback events for drawing: draw an arc from center cx;cy 
+</pre>
+<a id="HIDE_draw_rect">
+<H4> HIDE_draw_rect(int event_id, void* hid, void* gc, int x1, int y1, int x2, int y2) </H4>
+<pre>
+ PCB callback events for drawing: draw a rectangle 
+</pre>
+<a id="HIDE_fill_circle">
+<H4> HIDE_fill_circle(int event_id, void* hid, void* gc, int cx, int cy, int radius) </H4>
+<pre>
+ PCB callback events for drawing: draw a filled circle 
+</pre>
+<a id="HIDE_fill_polygon">
+<H4> HIDE_fill_polygon(int event_id, void* hid, void* gc, int n_coords, int* x, int* y) </H4>
+<pre>
+ PCB callback events for drawing: draw a filled polygon 
+</pre>
+<a id="HIDE_fill_rect">
+<H4> HIDE_fill_rect(int event_id, void* hid, void* gc, int x1, int y1, int x2, int y2) </H4>
+<pre>
+ PCB callback events for drawing: draw a filled rectangle 
+</pre>
+<a id="HIDE_use_mask">
+<H4> HIDE_use_mask(int event_id, void* hid, int use_it) </H4>
+<pre>
+ PCB callback events for drawing: TODO 
+</pre>
+<a id="HIDE_make_gc">
+<H4> HIDE_make_gc(int event_id, void* hid, void* gc) </H4>
+<pre>
+ PCB callback events for drawing: create a new graphical context 
+</pre>
+<a id="HIDE_destroy_gc">
+<H4> HIDE_destroy_gc(int event_id, void* hid, void* gc) </H4>
+<pre>
+ PCB callback events for drawing: destroy a graphical context 
+</pre>
+<a id="HIDE_fill_pcb_pv">
+<H4> HIDE_fill_pcb_pv(int event_id, void* hid, void* fg_gc, void* bg_gc, void* pad, int drawHole, int mask) </H4>
+<pre>
+ PCB callback events for drawing: TODO 
+</pre>
+<a id="HIDE_fill_pcb_pad">
+<H4> HIDE_fill_pcb_pad(int event_id, void* hid, void* pad, int clear, int mask) </H4>
+<pre>
+ PCB callback events for drawing: TODO 
+</pre>
+</dl>
+<h3> Functions </h3>
+<dl>
+<p>The following functions are registered in script context.
+<a id="hid_create">
+<H4>  hid_t* hid_create(char* hid_name, char* description)  </H4>
+<pre>
+ Creates a new hid context. Name and description matters only if the hid is
+registered as an exporter later. 
+</pre>
+<a id="hid_add_attribute">
+<H4>  int hid_add_attribute(hid_t* hid, char* attr_name, char* help, hid_attr_type_t type, int min, int max, char* default_val)  </H4>
+<pre>
+ Append an attribute in a hid previously created using hid_create().
+   Arguments:
+     hid: hid_t previously created using hid_create()
+     attr_name: name of the attribute
+     help: help text for the attribute
+     type: type of the attribute (input widget type)
+     min: minimum value of the attribute, if type is integer or real)
+     max: maximum value of the attribute, if type is integer or real)
+     default_val: default value of the attribute
+  Returns an unique ID of the attribute the caller should store for
+  later reference. For example this ID is used when retrieving the
+  value of the attribute after the user finished entering data in
+  the dialog. 
+</pre>
+<a id="hid_get_attribute">
+<H4>  char* hid_get_attribute(hid_t* hid, int attr_id)  </H4>
+<pre>
+ Query an attribute from the hid after dialog_attributes() returned.
+   Arguments:
+     hid: hid_t previously created using hid_create()
+     attr_id: the unique ID of the attribute (returned by hid_add_attribute())
+   Returns the value (converted to string) set by the user. 
+</pre>
+<a id="hid_register">
+<H4>  int hid_register(hid_t* hid)  </H4>
+<pre>
+ Register the hid; call it after a hid is created and its attributes
+   are all set up 
+</pre>
+<a id="hid_gpmi_data_set">
+<H4>  void hid_gpmi_data_set(hid_t* h, void* data)  </H4>
+<pre>
+ For internal use 
+</pre>
+<a id="hid_gpmi_data_get">
+<H4>  hid_t* hid_gpmi_data_get(HID* h)  </H4>
+<pre>
+ For internal use 
+</pre>
+<a id="hid_string2val">
+<H4>  HID_Attr_Val hid_string2val(const hid_attr_type_t type, const char* str)  </H4>
+<pre>
+ For internal use 
+</pre>
+</dl>
+
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/layout.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/layout.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/layout.html	(revision 18980)
@@ -0,0 +1,58 @@
+<HTML>
+<BODY>
+<H1> layout package </H1>
+
+Layout package searches and manipulates the current layout. Dimension units
+are in nanometer unless otherwise mentioned.
+
+<H2> Page: board dimensions</H2>
+	Functions used to query or set width and height of the drawing:
+	<UL>
+		<LI>int layout_get_page_width();
+		<LI>int layout_get_page_height();
+		<LI>void layout_set_page_size(int width, int height);
+	</UL>
+
+<H2> Layer manipulation </H2>
+Most functions perform operations similar to user commands affecting
+the current layer.
+The following few calls can change the current layer. Warning: this is the
+same current layer as the user's; the script most probably wants to save
+the current layer before changing it and then restore it after the operation.
+	<UL>
+		<LI>int layout_resolve_layer(const char *name): resolve layer number by name (case sensitive); returns negative number if not found
+		<LI>int layout_get_current_layer(): returns the number of the current layer
+		<LI>void layout_switch_to_layer(int layer): switch to layer (further actions will take place there)
+	</UL>
+<p>
+
+<H2> Object searches </H2>
+	Search results are collected on lists identified by their name (search_ID).
+	If a new search is done with the same name, old search results for that
+	name are discarded.
+	Search functions return the number of objects found (size of the list) that can 
+	be then used while querying the results using layout_search_get().
+	Results should be freed using layout_search_free() when they are no
+	longer needed.
+	<p>
+	TODO: validity of a list in time
+	<p>
+Once the search list is ready, the script can iterate over it and resolve
+the object handle of each object found, using layout_search_get(). Having
+an object handle,  The layout_obj_*() functions may be used by the script
+to access fields of an object structure.
+
+<H2>Create new objects </H2>
+	The layout_create_*() calls are used to create new objects on the current
+	layer (set by layout_switch_to_layer()). 
+
+
+<H2> API reference - page, units and coordinates </H2>
+(angles are in radian)
+TODO
+
+<H2> API reference - debug draw </H2>
+TODO
+
+</BODY>
+</HTML>
Index: tags/2.0.1/doc/user/06_feature/gpmi/packages/layout_ref.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/packages/layout_ref.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/packages/layout_ref.html	(revision 18980)
@@ -0,0 +1,300 @@
+<html>
+<body>
+<h1>PCB GPMI</h1>
+<h2>Reference manual for package layout</h2>
+<small>Automatically generated from layout.h</small>
+
+<h3> Enums </h3>
+<dl>
+<p>Enum values should be passed on as strings.
+<a id="layout_object_mask_e">
+<H4> layout_object_mask_e</H4>
+<pre>
+ Object type search mask bits 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> OM_LINE <td>  lines (traces, silk lines, not font) 
+<tr><td> OM_TEXT <td>  text written using the font 
+<tr><td> OM_POLYGON <td>  polygons, including rectangles 
+<tr><td> OM_ARC <td>  arcs, circles 
+<tr><td> OM_VIA <td>  vias and holes which are not part of a footprint 
+<tr><td> OM_PIN <td>  pins/pads of a footprint 
+<tr><td> OM_ANY <td>  shorthand for "find anything" 
+</table>
+<a id="layout_object_coord_e">
+<H4> layout_object_coord_e</H4>
+<pre>
+ Which coordinate of the object is referenced 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> OC_BX1 <td>  bounding box X1 
+<tr><td> OC_BX2 <td>  bounding box X2 
+<tr><td> OC_BY1 <td>  bounding box Y1 
+<tr><td> OC_BY2 <td>  bounding box Y2 
+<tr><td> OC_P1X <td>  point 1 X 
+<tr><td> OC_P2X <td>  point 2 X 
+<tr><td> OC_P1Y <td>  point 1 Y 
+<tr><td> OC_P2Y <td>  point 2 Y 
+<tr><td> OC_OBJ <td>  the whole object 
+<tr><td> OC_P1 <td>  point 1 is P1X
+<tr><td> OC_P2 <td>  point 2 is P2X 
+</table>
+<a id="layout_flag_e">
+<H4> layout_flag_e</H4>
+<pre>
+ of layout_object_coord_t 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> FL_NONE <td> &lt;comment missing in the header&gt;
+<tr><td> FL_SHOWNUMBER <td> &lt;comment missing in the header&gt;
+<tr><td> FL_LOCALREF <td> &lt;comment missing in the header&gt;
+<tr><td> FL_CHECKPLANS <td> &lt;comment missing in the header&gt;
+<tr><td> FL_SHOWDRC <td> &lt;comment missing in the header&gt;
+<tr><td> FL_RUBBERBAND <td> &lt;comment missing in the header&gt;
+<tr><td> FL_DESCRIPTION <td> &lt;comment missing in the header&gt;
+<tr><td> FL_NAMEONPCB <td> &lt;comment missing in the header&gt;
+<tr><td> FL_AUTODRC <td> &lt;comment missing in the header&gt;
+<tr><td> FL_ALLDIRECTION <td> &lt;comment missing in the header&gt;
+<tr><td> FL_SWAPSTARTDIR <td> &lt;comment missing in the header&gt;
+<tr><td> FL_UNIQUENAME <td> &lt;comment missing in the header&gt;
+<tr><td> FL_CLEARNEW <td> &lt;comment missing in the header&gt;
+<tr><td> FL_SNAPPIN <td> &lt;comment missing in the header&gt;
+<tr><td> FL_SHOWMASK <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THINDRAW <td> &lt;comment missing in the header&gt;
+<tr><td> FL_ORTHOMOVE <td> &lt;comment missing in the header&gt;
+<tr><td> FL_LIVEROUTE <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THINDRAWPOLY <td> &lt;comment missing in the header&gt;
+<tr><td> FL_LOCKNAMES <td> &lt;comment missing in the header&gt;
+<tr><td> FL_ONLYNAMES <td> &lt;comment missing in the header&gt;
+<tr><td> FL_NEWFULLPOLY <td> &lt;comment missing in the header&gt;
+<tr><td> FL_HIDENAMES <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THERMALSTYLE1 <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THERMALSTYLE2 <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THERMALSTYLE3 <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THERMALSTYLE4 <td> &lt;comment missing in the header&gt;
+<tr><td> FL_THERMALSTYLE5 <td> &lt;comment missing in the header&gt;
+</table>
+<a id="layer_field_e">
+<H4> layer_field_e</H4>
+<pre>
+ Field name of the layer structure 
+</pre>
+<table border=1>
+<tr><th>value <th>meaning
+<tr><td> LFLD_NUM_LINES <td>  number of lines on the layer 
+<tr><td> LFLD_NUM_TEXTS <td>  number of texts on the layer 
+<tr><td> LFLD_NUM_POLYS <td>  number of polygons on the layer 
+<tr><td> LFLD_NUM_ARCS <td>  number of arcs on the layer 
+<tr><td> LFLD_VISIBLE <td>  non-zero if the layer is visible 
+<tr><td> LFLD_NODRC <td>  non-zero if the layer doesn't use DRC 
+</table>
+</dl>
+<h3> Functions </h3>
+<dl>
+<p>The following functions are registered in script context.
+<a id="layout_search_box">
+<H4>  int layout_search_box(const char* search_ID, layout_object_mask_t obj_types, int x1, int y1, int x2, int y2)  </H4>
+<pre>
+ creates a new search and adds all objects that matches obj_types mask within the given rectangle on the current layer
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+     x1, y1, x2, y2: box the search is done within (PCB coords)
+   Returns the number of object on the search list. 
+</pre>
+<a id="layout_search_selected">
+<H4>  int layout_search_selected(const char* search_ID, layout_object_mask_t obj_types)  </H4>
+<pre>
+ creates a new search and adds all selected objects
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+   Returns the number of object on the search list. 
+</pre>
+<a id="layout_search_found">
+<H4>  int layout_search_found(const char* search_ID, layout_object_mask_t obj_types)  </H4>
+<pre>
+ creates a new search and adds all found objects (the green highlight)
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+   Returns the number of object on the search list. 
+</pre>
+<a id="layout_search_get">
+<H4>  layout_object_t* layout_search_get(const char* search_ID, int n)  </H4>
+<pre>
+ Returns the nth object from a search list (or NULL pointer if n is beyond the list) 
+</pre>
+<a id="layout_search_free">
+<H4>  int layout_search_free(const char* search_ID)  </H4>
+<pre>
+ Frees all memory related to a search. Returns 0 on success.
+   Argument:
+     search_ID: unique name of the search (requires an existing search) 
+</pre>
+<a id="layout_obj_coord">
+<H4>  int layout_obj_coord(layout_object_t* obj, layout_object_coord_t coord)  </H4>
+<pre>
+ Return the requested coord of an object; except for the bounding box
+    coordinates, the meaning of coordinates are object-specific.
+    Point 1 and point 2 are usually endpoints of the object (line, arc),
+    "the whole object" coordinate is a central point. 
+</pre>
+<a id="layout_obj_type">
+<H4>  layout_object_mask_t layout_obj_type(layout_object_t* obj)  </H4>
+<pre>
+ Return the type of an object (always a single bit) 
+</pre>
+<a id="layout_obj_move">
+<H4>  int layout_obj_move(layout_object_t* obj, layout_object_coord_t coord, int dx, int dy)  </H4>
+<pre>
+ Change location of an object or parts of the object (like move endpoint of a line);
+   Arguments:
+     obj: the object
+     coord: which coordinate to drag (e.g. move only the endpoint)
+     dx, dy: relative x and y coordinates the selected coordinate is displaced by
+   Returns 0 on success 
+</pre>
+<a id="layout_arc_angles">
+<H4>  int layout_arc_angles(layout_object_t* obj, int relative, int start, int delta)  </H4>
+<pre>
+ change angles of an arc; start and delta are relative if relative is non-zero; returns 0 on success 
+</pre>
+<a id="layout_create_line">
+<H4>  int layout_create_line(int x1, int y1, int x2, int y2, int thickness, int clearance, layout_flag_t flags)  </H4>
+<pre>
+ create a line 
+</pre>
+<a id="layout_create_via">
+<H4>  int layout_create_via(int x, int y, int thickness, int clearance, int mask, int hole, const char* name, layout_flag_t flags)  </H4>
+<pre>
+ create a named via 
+</pre>
+<a id="layout_create_arc">
+<H4>  int layout_create_arc(int x, int y, int width, int height, int sa, int dir, int thickness, int clearance, layout_flag_t flags)  </H4>
+<pre>
+ create a new arc; sa is start angle, dir is delta angle 
+</pre>
+<a id="layout_switch_to_layer">
+<H4>  void layout_switch_to_layer(int layer)  </H4>
+<pre>
+ switch to layer (further layer-specific actions will take place there) 
+</pre>
+<a id="layout_get_current_layer">
+<H4>  int layout_get_current_layer()  </H4>
+<pre>
+ returns the number of the current layer 
+</pre>
+<a id="layout_resolve_layer">
+<H4>  int layout_resolve_layer(const char* name)  </H4>
+<pre>
+ resolve layer number by name (case sensitive); returns negative number if not found 
+</pre>
+<a id="layout_get_max_possible_layer">
+<H4>  int layout_get_max_possible_layer()  </H4>
+<pre>
+ return the theoretical number of layers supported by PCB 
+</pre>
+<a id="layout_get_max_layer">
+<H4>  int layout_get_max_layer()  </H4>
+<pre>
+ return the actual number of layers on the current design 
+</pre>
+<a id="layout_layer_name">
+<H4>  const char* layout_layer_name(int layer)  </H4>
+<pre>
+ return the name of a layer 
+</pre>
+<a id="layout_layer_color">
+<H4>  const char* layout_layer_color(int layer)  </H4>
+<pre>
+ return the color of a layer 
+</pre>
+<a id="layout_layer_field">
+<H4>  int layout_layer_field(int layer, layer_field_t fld)  </H4>
+<pre>
+ return an integer field of a layer 
+</pre>
+<a id="layout_get_page_width">
+<H4>  int layout_get_page_width()  </H4>
+<pre>
+ query or set width and height of the drawing 
+</pre>
+<a id="layout_get_page_height">
+<H4>  int layout_get_page_height()  </H4>
+<pre>
+&lt;comment missing in the header&gt;
+</pre>
+<a id="layout_set_page_size">
+<H4>  void layout_set_page_size(int width, int height)  </H4>
+<pre>
+&lt;comment missing in the header&gt;
+</pre>
+<a id="mil2pcb_multiplier">
+<H4>  double mil2pcb_multiplier()  </H4>
+<pre>
+ -- coordinate system -- (coord.c) 
+</pre>
+<a id="mm2pcb_multiplier">
+<H4>  double mm2pcb_multiplier()  </H4>
+<pre>
+&lt;comment missing in the header&gt;
+</pre>
+<a id="current_grid_unit">
+<H4>  const char* current_grid_unit()  </H4>
+<pre>
+&lt;comment missing in the header&gt;
+</pre>
+<a id="debug_draw_request">
+<H4>  int debug_draw_request(void)  </H4>
+<pre>
+ Initialize debug drawing; returns 1 if worked, 0 if denied 
+</pre>
+<a id="debug_draw_flush">
+<H4>  void debug_draw_flush(void)  </H4>
+<pre>
+ Flush the drawing 
+</pre>
+<a id="debug_draw_finish">
+<H4>  void debug_draw_finish(dctx_t* ctx)  </H4>
+<pre>
+ Finish (close) drawing 
+</pre>
+<a id="debug_draw_dctx">
+<H4>  dctx_t* debug_draw_dctx(void)  </H4>
+<pre>
+ Get the draw context of debug draw 
+</pre>
+<a id="draw_set_color">
+<H4>  void draw_set_color(dctx_t* ctx, const char* name)  </H4>
+<pre>
+ Debug draw style: set drawing color 
+</pre>
+<a id="draw_set_line_width">
+<H4>  void draw_set_line_width(dctx_t* ctx, int width)  </H4>
+<pre>
+ Debug draw style: set line width 
+</pre>
+<a id="draw_set_draw_xor">
+<H4>  void draw_set_draw_xor(dctx_t* ctx, int xor)  </H4>
+<pre>
+ Debug draw style: set whether drawing should happen in xor 
+</pre>
+<a id="draw_set_draw_faded">
+<H4>  void draw_set_draw_faded(dctx_t* ctx, int faded)  </H4>
+<pre>
+ Debug draw style: set whether drawing should happen in faded mode  
+</pre>
+<a id="draw_line">
+<H4>  void draw_line(dctx_t* ctx, int x1_, int y1_, int x2_, int y2_)  </H4>
+<pre>
+ Debug draw: draw a line using the current style settings 
+</pre>
+</dl>
+
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.desc	(revision 18980)
@@ -0,0 +1,2 @@
+Create a new action hello() that prints "Hello world!" in the message log.
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ID.name	(revision 18980)
@@ -0,0 +1 @@
+hello world (text, log)
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.awk	(revision 18980)
@@ -0,0 +1,14 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/actions", 0);
+	PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+}
+
+function ev_action(id, name, argc, x, y)
+{
+	dialog_log("Hello world!\n");
+}
+
+BEGIN {
+	Bind("ACTE_action", "ev_action");
+	action_register("hello", "", "log hello world", "hello()");
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.bash
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.bash	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.bash	(revision 18980)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function load_packages()
+{
+	GPMI PkgLoad "pcb-rnd-gpmi/actions" 0
+	GPMI PkgLoad "pcb-rnd-gpmi/dialogs" 0
+}
+
+function ev_action() {
+	GPMI dialog_log "Hello world!\n"
+}
+
+function main()
+{
+	load_packages
+	GPMI Bind "ACTE_action"  "ev_action"
+	GPMI action_register "hello" "" "log hello world" "hello()"
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.html	(revision 18980)
@@ -0,0 +1,25 @@
+Load packages the script depends on:
+<ul>
+	<li> <ref>actions</ref> for registering the new action;
+	<li> <ref>dialogs</ref> for printing in the message log.
+</ul>
+<p>
+Create a function <i>ev_action</i> that will be called when any of
+the actions registered by the script is executed. The script registers
+only one action, so it does not need to check which action caused
+the function to be called.
+<p>
+When the action event is called, use <ref>dialog_log</ref> to append
+a log message.
+<p>
+In the "main" section of the script, bind event <ref>ACTE_action</ref> to
+our local function <i>ev_action</i> - this gets <i>ev_action</i> to
+be called when any of the actions registered by this script is executed.
+<p>
+Finally use <ref>action_register</ref> to register the action:
+<ul>
+	<li> first argument is the name of the action
+	<li> second is the xy query string; it is empty since this action won't need coordinates to operate on
+	<li> third is the description that shows up in dumps and helps
+	<li> fourth is the syntax description (also for helps)
+</ul>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.lua	(revision 18980)
@@ -0,0 +1,9 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+function ev_action(id, name, argc, x, y)
+	dialog_log("Hello world!\n");
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.pl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.pl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.pl	(revision 18980)
@@ -0,0 +1,10 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+sub ev_action {
+	my($id, $name, $argc, $x, $y) = @_;
+	dialog_log("Hello world!\n");
+}
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.py
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.py	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.py	(revision 18980)
@@ -0,0 +1,8 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y):
+	dialog_log("Hello world!\n");
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.rb
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.rb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.rb	(revision 18980)
@@ -0,0 +1,9 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y)
+	dialog_log("Hello world!\n");
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.scm
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.scm	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.scm	(revision 18980)
@@ -0,0 +1,9 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(define ev_action (lambda (id name argc x y)
+  (dialog_log "Hello world!\n")))
+
+(Bind "ACTE_action" "ev_action")
+(action_register "hello" "" "log hello world" "hello()")
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.stt
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.stt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.stt	(revision 18980)
@@ -0,0 +1,10 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(defun ev_action (id name argc x y)
+	(dialog_log "Hello world!\n"))
+
+(Bind "ACTE_action" "ev_action")
+(action_register "hello" "" "log hello world" "hello()")
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/ex.tcl	(revision 18980)
@@ -0,0 +1,10 @@
+PkgLoad pcb-rnd-gpmi/actions 0
+PkgLoad pcb-rnd-gpmi/dialogs 0
+
+proc ev_action {id, name, argc, x, y} {
+	dialog_log "Hello world!\n"
+}
+
+Bind ACTE_action ev_action
+action_register "hello" "" "log hello world" "hello()"
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello/index.html	(revision 18980)
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta hello world (text, log) </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>hello world (text, log)</h1>
+Create a new action hello() that prints "Hello world!" in the message log.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.bash">bash</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.pl">pl</a>
+ | 
+<a href="ex.py">py</a>
+ | 
+<a href="ex.rb">rb</a>
+ | 
+<a href="ex.scm">scm</a>
+ | 
+<a href="ex.stt">stt</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>actions</i>
+ for registering the new action; 	
+<li> 
+<i>dialogs</i>
+ for printing in the message log. </ul>
+ 
+<p> Create a function 
+<i>ev_action</i>
+ that will be called when any of the actions registered by the script is executed. The script registers only one action, so it does not need to check which action caused the function to be called. 
+<p> When the action event is called, use 
+<i><a href="../../packages/dialogs_ref.html#dialog_log">dialog_log</a></i>
+ to append a log message. 
+<p> In the "main" section of the script, bind event 
+<i><a href="../../packages/actions_ref.html#ACTE_action">ACTE_action</a></i>
+ to our local function 
+<i>ev_action</i>
+ - this gets 
+<i>ev_action</i>
+ to be called when any of the actions registered by this script is executed. 
+<p> Finally use 
+<i><a href="../../packages/actions_ref.html#action_register">action_register</a></i>
+ to register the action: 
+<ul> 	
+<li> first argument is the name of the action 	
+<li> second is the xy query string; it is empty since this action won't need coordinates to operate on 	
+<li> third is the description that shows up in dumps and helps 	
+<li> fourth is the syntax description (also for helps) </ul>
+ 
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.desc	(revision 18980)
@@ -0,0 +1,3 @@
+Create a new action hello() that prints "Hello world!" in a popup window.
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ID.name	(revision 18980)
@@ -0,0 +1 @@
+hello world (popup window)
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.awk	(revision 18980)
@@ -0,0 +1,14 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/actions", 0);
+	PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+}
+
+function ev_action(id, name, argc, x, y)
+{
+	dialog_report("Greeting window", "Hello world!");
+}
+
+BEGIN {
+	Bind("ACTE_action", "ev_action");
+	action_register("hello", "", "log hello world", "hello()");
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.bash
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.bash	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.bash	(revision 18980)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function load_packages()
+{
+	GPMI PkgLoad "pcb-rnd-gpmi/actions" 0
+	GPMI PkgLoad "pcb-rnd-gpmi/dialogs" 0
+}
+
+function ev_action() {
+	GPMI dialog_report "Greeting window" "Hello world!"
+}
+
+function main()
+{
+	load_packages
+	GPMI Bind "ACTE_action"  "ev_action"
+	GPMI action_register "hello" "" "log hello world" "hello()"
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.html	(revision 18980)
@@ -0,0 +1,26 @@
+Load packages the script depends on:
+<ul>
+	<li> <ref>actions</ref> for registering the new action;
+	<li> <ref>dialogs</ref> for creating a dialog box.
+</ul>
+<p>
+Create a function <i>ev_action</i> that will be called when any of
+the actions registered by the script is executed. The script registers
+only one action, so it does not need to check which action caused
+the function to be called.
+<p>
+When the action event is called, use <ref>dialog_report</ref> to pop
+up a report dialog. First argument donates the name (title) of the window,
+the second is the text printed in the window.
+<p>
+In the "main" section of the script, bind event <ref>ACTE_action</ref> to
+our local function <i>ev_action</i> - this gets <i>ev_action</i> to
+be called when any of the actions registered by this script is executed.
+<p>
+Finally use <ref>action_register</ref> to register the action:
+<ul>
+	<li> first argument is the name of the action
+	<li> second is the xy query string; it is empty since this action won't need coordinates to operate on
+	<li> third is the description that shows up in dumps and helps
+	<li> fourth is the syntax description (also for helps)
+</ul>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.lua	(revision 18980)
@@ -0,0 +1,9 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+function ev_action(id, name, argc, x, y)
+	dialog_report("Greeting window", "Hello world!");
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.pl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.pl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.pl	(revision 18980)
@@ -0,0 +1,10 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+sub ev_action {
+	my($id, $name, $argc, $x, $y) = @_;
+	dialog_report("Greeting window", "Hello world!");
+}
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.py
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.py	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.py	(revision 18980)
@@ -0,0 +1,8 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y):
+	dialog_report("Greeting window", "Hello world!");
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.rb
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.rb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.rb	(revision 18980)
@@ -0,0 +1,9 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y)
+	dialog_report("Greeting window", "Hello world!");
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.scm
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.scm	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.scm	(revision 18980)
@@ -0,0 +1,9 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(define ev_action (lambda (id name argc x y)
+  (dialog_report "Greeting window" "Hello world!")))
+
+(Bind "ACTE_action" "ev_action")
+(action_register "hello" "" "log hello world" "hello()")
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.stt
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.stt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.stt	(revision 18980)
@@ -0,0 +1,10 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(defun ev_action (id name argc x y)
+	(dialog_report "Greeting window" "Hello world!"))
+
+(Bind "ACTE_action" "ev_action")
+(action_register "hello" "" "log hello world" "hello()")
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/ex.tcl	(revision 18980)
@@ -0,0 +1,10 @@
+PkgLoad pcb-rnd-gpmi/actions 0
+PkgLoad pcb-rnd-gpmi/dialogs 0
+
+proc ev_action {id, name, argc, x, y} {
+	dialog_report "Greeting window" "Hello world!"
+}
+
+Bind ACTE_action ev_action
+action_register "hello" "" "log hello world" "hello()"
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/10_hello_gui/index.html	(revision 18980)
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta hello world (popup window) </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>hello world (popup window)</h1>
+Create a new action hello() that prints "Hello world!" in a popup window.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.bash">bash</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.pl">pl</a>
+ | 
+<a href="ex.py">py</a>
+ | 
+<a href="ex.rb">rb</a>
+ | 
+<a href="ex.scm">scm</a>
+ | 
+<a href="ex.stt">stt</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>actions</i>
+ for registering the new action; 	
+<li> 
+<i>dialogs</i>
+ for creating a dialog box. </ul>
+ 
+<p> Create a function 
+<i>ev_action</i>
+ that will be called when any of the actions registered by the script is executed. The script registers only one action, so it does not need to check which action caused the function to be called. 
+<p> When the action event is called, use 
+<i><a href="../../packages/dialogs_ref.html#dialog_report">dialog_report</a></i>
+ to pop up a report dialog. First argument donates the name (title) of the window, the second is the text printed in the window. 
+<p> In the "main" section of the script, bind event 
+<i><a href="../../packages/actions_ref.html#ACTE_action">ACTE_action</a></i>
+ to our local function 
+<i>ev_action</i>
+ - this gets 
+<i>ev_action</i>
+ to be called when any of the actions registered by this script is executed. 
+<p> Finally use 
+<i><a href="../../packages/actions_ref.html#action_register">action_register</a></i>
+ to register the action: 
+<ul> 	
+<li> first argument is the name of the action 	
+<li> second is the xy query string; it is empty since this action won't need coordinates to operate on 	
+<li> third is the description that shows up in dumps and helps 	
+<li> fourth is the syntax description (also for helps) </ul>
+ 
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.desc	(revision 18980)
@@ -0,0 +1,3 @@
+Create a new action hello() that prints "Hello world!" in a popup window, create a menu (under "Plugins/GPMI scripting/") that executes the action.
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ID.name	(revision 18980)
@@ -0,0 +1 @@
+hello world (popup window + submenu)
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.awk	(revision 18980)
@@ -0,0 +1,20 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/actions", 0);
+	PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+}
+
+function ev_action(id, name, argc, x, y)
+{
+	dialog_report("Greeting window", "Hello world!");
+}
+
+function ev_gui_init(id, argc, argv)
+{
+	create_menu("/main_menu/Plugins/GPMI scripting/hello", "hello()", "h", "Ctrl<Key>w", "tooltip for hello");
+}
+
+BEGIN {
+	Bind("ACTE_action", "ev_action");
+	Bind("ACTE_gui_init", "ev_gui_init");
+	action_register("hello", "", "log hello world", "hello()");
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.bash
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.bash	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.bash	(revision 18980)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+function load_packages()
+{
+	GPMI PkgLoad "pcb-rnd-gpmi/actions" 0
+	GPMI PkgLoad "pcb-rnd-gpmi/dialogs" 0
+}
+
+function ev_action() {
+	GPMI dialog_report "Greeting window" "Hello world!"
+}
+
+function ev_gui_init()
+{
+	GPMI create_menu "/main_menu/Plugins/GPMI scripting/hello" "hello()" "h" "Ctrl<Key>w" "tooltip for hello"
+}
+
+function main()
+{
+	load_packages
+	GPMI Bind "ACTE_action"  "ev_action"
+	GPMI Bind "ACTE_gui_init" "ev_gui_init"
+	GPMI action_register "hello" "" "log hello world" "hello()"
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.html	(revision 18980)
@@ -0,0 +1,33 @@
+Load packages the script depends on:
+<ul>
+	<li> <ref>actions</ref> for registering the new action;
+	<li> <ref>dialogs</ref> for creating a dialog box.
+</ul>
+<p>
+Create a function <i>ev_action</i> that will be called when any of
+the actions registered by the script is executed. The script registers
+only one action, so it does not need to check which action caused
+the function to be called.
+<p>
+When the action event is called, use <ref>dialog_report</ref> to pop
+up a report dialog. First argument donates the name (title) of the window,
+the second is the text printed in the window.
+<p>
+Create a function <i>ev_gui_init</i> that will be called when the
+gui has been initialized - this is the right moment to register
+new menus in the GUI. Put the new menu item in the
+"Plugins/GPMI scripting/" menu by convention, and set hot key to ctrl+w.
+The menu should execute action hello().
+<p>
+In the "main" section of the script, bind event <ref>ACTE_action</ref> to
+our local function <i>ev_action</i> - this gets <i>ev_action</i> to
+be called when any of the actions registered by this script is executed.
+Also bind ev_gui_init so that the new menu can be safely created.
+<p>
+Finally use <ref>action_register</ref> to register the action:
+<ul>
+	<li> first argument is the name of the action
+	<li> second is the xy query string; it is empty since this action won't need coordinates to operate on
+	<li> third is the description that shows up in dumps and helps
+	<li> fourth is the syntax description (also for helps)
+</ul>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.lua	(revision 18980)
@@ -0,0 +1,14 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+function ev_action(id, name, argc, x, y)
+	dialog_report("Greeting window", "Hello world!");
+end
+
+function ev_gui_init(id, argc, argv)
+	create_menu("/main_menu/Plugins/GPMI scripting/hello", "hello()", "h", "Ctrl<Key>w", "tooltip for hello");
+end
+
+Bind("ACTE_action", "ev_action");
+Bind("ACTE_gui_init", "ev_gui_init");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.pl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.pl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.pl	(revision 18980)
@@ -0,0 +1,17 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+sub ev_action {
+	my($id, $name, $argc, $x, $y) = @_;
+	dialog_report("Greeting window", "Hello world!");
+}
+
+sub ev_gui_init
+{
+	my($id, $name, $argc, $argv) = @_;
+	create_menu("/main_menu/Plugins/GPMI scripting/hello", "hello()", "h", "Ctrl<Key>w", "tooltip for hello");
+}
+
+Bind("ACTE_action", "ev_action");
+Bind("ACTE_gui_init", "ev_gui_init");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.py
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.py	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.py	(revision 18980)
@@ -0,0 +1,12 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y):
+	dialog_report("Greeting window", "Hello world!");
+
+def ev_gui_init(id, argc, argv):
+	create_menu("/main_menu/Plugins/GPMI scripting/hello", "hello()", "h", "Ctrl<Key>w", "tooltip for hello");
+
+Bind("ACTE_action", "ev_action");
+Bind("ACTE_gui_init", "ev_gui_init");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.rb
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.rb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.rb	(revision 18980)
@@ -0,0 +1,14 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+
+def ev_action(id, name, argc, x, y)
+	dialog_report("Greeting window", "Hello world!");
+end
+
+def ev_gui_init(id, argc, argv)
+	create_menu("/main_menu/Plugins/GPMI scripting/hello", "hello()", "h", "Ctrl<Key>w", "tooltip for hello");
+end
+
+Bind("ACTE_action", "ev_action");
+Bind("ACTE_gui_init", "ev_gui_init");
+action_register("hello", "", "log hello world", "hello()");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.scm
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.scm	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.scm	(revision 18980)
@@ -0,0 +1,12 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(define ev_action (lambda (id name argc x y)
+  (dialog_report "Greeting window" "Hello world!")))
+
+(define ev_gui_init (lambda (id argc argv)
+  (create_menu "/main_menu/Plugins/GPMI scripting/hello" "hello()" "h" "Ctrl<Key>w" "tooltip for hello")))
+
+(Bind "ACTE_action" "ev_action")
+(Bind "ACTE_gui_init" "ev_gui_init")
+(action_register "hello" "" "log hello world" "hello()")
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.stt
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.stt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.stt	(revision 18980)
@@ -0,0 +1,12 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/dialogs" 0)
+
+(defun ev_action (id name argc x y)
+	(dialog_report "Greeting window" "Hello world!"))
+
+(defun ev_gui_init (id argc argv)
+	(create_menu "/main_menu/Plugins/GPMI scripting/hello" "hello()" "h" "Ctrl<Key>w" "tooltip for hello"))
+
+(Bind "ACTE_action" "ev_action")
+(Bind "ACTE_gui_init" "ev_gui_init")
+(action_register "hello" "" "log hello world" "hello()")
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/ex.tcl	(revision 18980)
@@ -0,0 +1,15 @@
+PkgLoad pcb-rnd-gpmi/actions 0
+PkgLoad pcb-rnd-gpmi/dialogs 0
+
+proc ev_action {id, name, argc, x, y} {
+	dialog_report "Greeting window" "Hello world!"
+}
+
+proc ev_gui_init {id, argc, argv} {
+	create_menu "/main_menu/Plugins/GPMI scripting/hello" "hello()" "h" "Ctrl<Key>w" "tooltip for hello"
+}
+
+Bind ACTE_action ev_action
+Bind ACTE_gui_init ev_gui_init
+action_register "hello" "" "log hello world" "hello()"
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/12_hello_menu/index.html	(revision 18980)
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta hello world (popup window + submenu) </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>hello world (popup window + submenu)</h1>
+Create a new action hello() that prints "Hello world!" in a popup window, create a menu (under "Plugins/GPMI scripting/") that executes the action.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.bash">bash</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.pl">pl</a>
+ | 
+<a href="ex.py">py</a>
+ | 
+<a href="ex.rb">rb</a>
+ | 
+<a href="ex.scm">scm</a>
+ | 
+<a href="ex.stt">stt</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>actions</i>
+ for registering the new action; 	
+<li> 
+<i>dialogs</i>
+ for creating a dialog box. </ul>
+ 
+<p> Create a function 
+<i>ev_action</i>
+ that will be called when any of the actions registered by the script is executed. The script registers only one action, so it does not need to check which action caused the function to be called. 
+<p> When the action event is called, use 
+<i><a href="../../packages/dialogs_ref.html#dialog_report">dialog_report</a></i>
+ to pop up a report dialog. First argument donates the name (title) of the window, the second is the text printed in the window. 
+<p> Create a function 
+<i>ev_gui_init</i>
+ that will be called when the gui has been initialized - this is the right moment to register new menus in the GUI. Put the new menu item in the "Plugins/GPMI scripting/" menu by convention, and set hot key to ctrl+w. The menu should execute action hello(). 
+<p> In the "main" section of the script, bind event 
+<i><a href="../../packages/actions_ref.html#ACTE_action">ACTE_action</a></i>
+ to our local function 
+<i>ev_action</i>
+ - this gets 
+<i>ev_action</i>
+ to be called when any of the actions registered by this script is executed. Also bind ev_gui_init so that the new menu can be safely created. 
+<p> Finally use 
+<i><a href="../../packages/actions_ref.html#action_register">action_register</a></i>
+ to register the action: 
+<ul> 	
+<li> first argument is the name of the action 	
+<li> second is the xy query string; it is empty since this action won't need coordinates to operate on 	
+<li> third is the description that shows up in dumps and helps 	
+<li> fourth is the syntax description (also for helps) </ul>
+ 
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.desc	(revision 18980)
@@ -0,0 +1,3 @@
+Create a new action mv(dx,dy) that moves selected objects relative by dx and dy mm.
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ID.name	(revision 18980)
@@ -0,0 +1 @@
+action: move selected objects
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.awk	(revision 18980)
@@ -0,0 +1,22 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/actions", 0);
+	PkgLoad("pcb-rnd-gpmi/layout", 0);
+}
+
+function ev_action(id, name, argc, x, y      ,dx,dy,n,num_objs,obj_ptr)
+{
+	dx = action_arg(0) * mm2pcb_multiplier()
+	dy = action_arg(1) * mm2pcb_multiplier()
+
+	num_objs = layout_search_selected("mv_search", "OM_ANY")
+	for(n = 0; n < num_objs; n++) {
+		obj_ptr = layout_search_get("mv_search", n)
+		layout_obj_move(obj_ptr, "OC_OBJ", dx, dy)
+	}
+	layout_search_free("mv_search")
+}
+
+BEGIN {
+	Bind("ACTE_action", "ev_action");
+	action_register("mv", "", "move selected objects by dx and dy mm", "mv(dx,dy)");
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.bash
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.bash	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.bash	(revision 18980)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+function load_packages()
+{
+	GPMI PkgLoad "pcb-rnd-gpmi/actions" 0
+	GPMI PkgLoad "pcb-rnd-gpmi/layout" 0
+}
+
+function ev_action() {
+	local dx dy n num_objs
+
+	GPMI action_arg 0
+	a0=`bash_int "$result"`
+
+	GPMI action_arg 1
+	a1=`bash_int "$result"`
+	
+	GPMI mm2pcb_multiplier
+	conv=`bash_int "$result"`
+
+	dx=$(($a0 * $conv))
+	dy=$(($a1 * $conv))
+
+	GPMI layout_search_selected "mv_search" "OM_ANY"
+	num_objs=`bash_int "$result"`
+
+	for n in `seq 0 $(($num_objs-1))`
+	do
+		GPMI layout_search_get "mv_search" $n
+		obj_ptr="$result"
+		GPMI layout_obj_move $obj_ptr "OC_OBJ" $dx $dy
+	done
+	GPMI layout_search_free "mv_search"
+}
+
+function main()
+{
+	load_packages
+	GPMI Bind "ACTE_action"  "ev_action"
+	GPMI action_register "mv" "" "move selected objects by dx and dy mm" "mv(dx,dy)"
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.html	(revision 18980)
@@ -0,0 +1,36 @@
+Load packages the script depends on:
+<ul>
+	<li> <ref>actions</ref> for registering the new action;
+	<li> <ref>layout</ref> for searching selected objects and moving objects.
+</ul>
+<p>
+Create a function <i>ev_action</i> that will be called when any of
+the actions registered by the script is executed. The script registers
+only one action, so it does not need to check which action caused
+the function to be called.
+<p>
+When the action event is called, first set up:
+<ul>
+	<li> fetch event argument 0 and 1 using <ref>action_arg</ref>;
+	<li> resolve the conversion rate from mm to PCB's units using <ref>mm2pcb_multiplier</ref>;
+	<li> perform a search for all selected object using <ref>layout_search_selected</ref> (return value is the number of objects found), name the resulting list "mv_search"
+</ul>
+A loop then iterates over the objects on the list:
+<ul>
+	<li> resolve the Nth element of the list using <ref>layout_search_get</ref>, referencing the list by name ("mv_search") and specifying which element to get (the Nth); the result is an object pointer;
+	<li> move the object using <ref>layout_obj_move</ref>; specify the object pointer, then which part of the object should be moved ("OC_OBJ" means the whole object) and relative offsets (dx and dy calculated earlier)
+</ul>
+Finally the search list shall be destroyed to reclaim memory, using <ref>layout_search_free</ref>.
+<p>
+
+In the "main" section of the script, bind event <ref>ACTE_action</ref> to
+our local function <i>ev_action</i> - this gets <i>ev_action</i> to
+be called when any of the actions registered by this script is executed.
+<p>
+Finally use <ref>action_register</ref> to register the action:
+<ul>
+	<li> first argument is the name of the action
+	<li> second is the xy query string; it is empty since this action won't need coordinates to operate on
+	<li> third is the description that shows up in dumps and helps
+	<li> fourth is the syntax description (also for helps)
+</ul>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.lua	(revision 18980)
@@ -0,0 +1,18 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/layout", 0);
+
+function ev_action(id, name, argc, x, y)
+	local dx = action_arg(0) * mm2pcb_multiplier()
+	local dy = action_arg(1) * mm2pcb_multiplier()
+
+	local num_objs = layout_search_selected("mv_search", "OM_ANY")
+	for n=0,num_objs+1
+	do
+		obj_ptr = layout_search_get("mv_search", n)
+		layout_obj_move(obj_ptr, "OC_OBJ", dx, dy)
+	end
+	layout_search_free("mv_search")
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("mv", "", "move selected objects by dx and dy mm", "mv(dx,dy)");
\ No newline at end of file
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.pl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.pl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.pl	(revision 18980)
@@ -0,0 +1,20 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/layout", 0);
+
+sub ev_action {
+	my($id, $name, $argc, $x, $y) = @_;
+
+	my $dx = action_arg(0) * mm2pcb_multiplier();
+	my $dy = action_arg(1) * mm2pcb_multiplier();
+
+	my $num_objs = layout_search_selected("mv_search", "OM_ANY");
+	for(my $n = 0; $n < $num_objs; $n++) {
+		$obj_ptr = layout_search_get("mv_search", $n);
+		layout_obj_move($obj_ptr, "OC_OBJ", $dx, $dy);
+	}
+	layout_search_free("mv_search");
+
+}
+
+Bind("ACTE_action", "ev_action");
+action_register("mv", "", "move selected objects by dx and dy mm", "mv(dx,dy)");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.py
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.py	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.py	(revision 18980)
@@ -0,0 +1,15 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/layout", 0);
+
+def ev_action(id, name, argc, x, y):
+	dx = int(action_arg(0)) * float(mm2pcb_multiplier())
+	dy = int(action_arg(1)) * float(mm2pcb_multiplier())
+	num_objs = int(layout_search_selected("mv_search", "OM_ANY"))
+	for n in xrange(0, num_objs):
+		obj_ptr = layout_search_get("mv_search", n)
+		layout_obj_move(obj_ptr, "OC_OBJ", dx, dy)
+	layout_search_free("mv_search")
+
+Bind("ACTE_action", "ev_action");
+action_register("hello", "", "log hello world", "hello()");
+action_register("mv", "", "move selected objects by dx and dy mm", "mv(dx,dy)");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.rb
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.rb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.rb	(revision 18980)
@@ -0,0 +1,25 @@
+PkgLoad("pcb-rnd-gpmi/actions", 0);
+PkgLoad("pcb-rnd-gpmi/layout", 0);
+
+def ev_action(id, name, argc, x, y)
+# TODO: how to convert 1e+06 in ruby?
+#	conv = mm2pcb_multiplier().to_i
+	conv = 1000000
+
+
+	dx = action_arg(0).to_i * conv.to_i;
+	dy = action_arg(1).to_i * conv.to_i;
+
+	num_objs = layout_search_selected("mv_search", "OM_ANY").to_i;
+
+	for n in 0..(num_objs-1)
+		obj_ptr = layout_search_get("mv_search", n);
+		layout_obj_move(obj_ptr, "OC_OBJ", dx, dy);
+		n += 1;
+	end
+	layout_search_free("mv_search");
+
+end
+
+Bind("ACTE_action", "ev_action");
+action_register("mv", "", "move selected objects by dx and dy mm", "mv(dx,dy)");
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.scm
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.scm	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.scm	(revision 18980)
@@ -0,0 +1,20 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/layout" 0)
+
+(define ev_action (lambda (id name argc x y)
+(let
+	(
+		(dx (* (string->number (action_arg 0)) (string->number (mm2pcb_multiplier))))
+		(dy (* (string->number (action_arg 1)) (string->number (mm2pcb_multiplier))))
+		(num_objs (string->number (layout_search_selected "mv_search" "OM_ANY")))
+		(obj_ptr 0)
+	)
+	(do ((n 0 (1+ n)))
+	    ((> n num_objs))
+		(set! obj_ptr (layout_search_get "mv_search" n))
+		(layout_obj_move obj_ptr "OC_OBJ" (inexact->exact dx) (inexact->exact dy))
+	)
+)))
+
+(Bind "ACTE_action" "ev_action")
+(action_register "mv" "" "move selected objects by dx and dy mm" "mv(dx,dy)")
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.stt
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.stt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.stt	(revision 18980)
@@ -0,0 +1,24 @@
+(PkgLoad "pcb-rnd-gpmi/actions" 0)
+(PkgLoad "pcb-rnd-gpmi/layout" 0)
+
+(defun ev_action (id name argc x y)
+(let
+	(
+		(dx (* (->num (action_arg 0)) (->num (mm2pcb_multiplier))))
+		(dy (* (->num (action_arg 1)) (->num (mm2pcb_multiplier))))
+		(num_objs (->num (layout_search_selected "mv_search" "OM_ANY")))
+		(obj_ptr 0)
+	)
+	(do ((n 0 (1+ n)))
+	    ((> n num_objs))
+		(set! obj_ptr (layout_search_get "mv_search" n))
+		(layout_obj_move obj_ptr "OC_OBJ" (->int dx) (->int dy))
+	)
+)
+)
+
+(Bind "ACTE_action" "ev_action")
+(action_register "mv" "" "move selected objects by dx and dy mm" "mv(dx,dy)")
+
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/ex.tcl	(revision 18980)
@@ -0,0 +1,17 @@
+PkgLoad pcb-rnd-gpmi/actions 0
+PkgLoad pcb-rnd-gpmi/layout 0
+
+proc ev_action {id, name, argc, x, y} {
+	set dx [expr round([action_arg 0]  * [mm2pcb_multiplier])]
+	set dy [expr round([action_arg 1]  * [mm2pcb_multiplier])]
+
+	set num_objs [layout_search_selected mv_search OM_ANY]
+	for {set n 0} {$n < $num_objs} {incr n} {
+		set obj_ptr [layout_search_get mv_search $n]
+		layout_obj_move $obj_ptr OC_OBJ $dx $dy
+	}
+	layout_search_free mv_search
+}
+
+Bind ACTE_action ev_action
+action_register "mv"  ""  "move selected objects by dx and dy mm"  "mv(dx,dy)"
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/30_move/index.html	(revision 18980)
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta action: move selected objects </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>action: move selected objects</h1>
+Create a new action mv(dx,dy) that moves selected objects relative by dx and dy mm.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.bash">bash</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.pl">pl</a>
+ | 
+<a href="ex.py">py</a>
+ | 
+<a href="ex.rb">rb</a>
+ | 
+<a href="ex.scm">scm</a>
+ | 
+<a href="ex.stt">stt</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>actions</i>
+ for registering the new action; 	
+<li> 
+<i>layout</i>
+ for searching selected objects and moving objects. </ul>
+ 
+<p> Create a function 
+<i>ev_action</i>
+ that will be called when any of the actions registered by the script is executed. The script registers only one action, so it does not need to check which action caused the function to be called. 
+<p> When the action event is called, first set up: 
+<ul> 	
+<li> fetch event argument 0 and 1 using 
+<i><a href="../../packages/actions_ref.html#action_arg">action_arg</a></i>
+; 	
+<li> resolve the conversion rate from mm to PCB's units using 
+<i><a href="../../packages/layout_ref.html#mm2pcb_multiplier">mm2pcb_multiplier</a></i>
+; 	
+<li> perform a search for all selected object using 
+<i><a href="../../packages/layout_ref.html#layout_search_selected">layout_search_selected</a></i>
+ (return value is the number of objects found), name the resulting list "mv_search" </ul>
+ A loop then iterates over the objects on the list: 
+<ul> 	
+<li> resolve the Nth element of the list using 
+<i><a href="../../packages/layout_ref.html#layout_search_get">layout_search_get</a></i>
+, referencing the list by name ("mv_search") and specifying which element to get (the Nth); the result is an object pointer; 	
+<li> move the object using 
+<i><a href="../../packages/layout_ref.html#layout_obj_move">layout_obj_move</a></i>
+; specify the object pointer, then which part of the object should be moved ("OC_OBJ" means the whole object) and relative offsets (dx and dy calculated earlier) </ul>
+ Finally the search list shall be destroyed to reclaim memory, using 
+<i><a href="../../packages/layout_ref.html#layout_search_free">layout_search_free</a></i>
+. 
+<p>  In the "main" section of the script, bind event 
+<i><a href="../../packages/actions_ref.html#ACTE_action">ACTE_action</a></i>
+ to our local function 
+<i>ev_action</i>
+ - this gets 
+<i>ev_action</i>
+ to be called when any of the actions registered by this script is executed. 
+<p> Finally use 
+<i><a href="../../packages/actions_ref.html#action_register">action_register</a></i>
+ to register the action: 
+<ul> 	
+<li> first argument is the name of the action 	
+<li> second is the xy query string; it is empty since this action won't need coordinates to operate on 	
+<li> third is the description that shows up in dumps and helps 	
+<li> fourth is the syntax description (also for helps) </ul>
+ 
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.desc	(revision 18980)
@@ -0,0 +1 @@
+Create a new exporter that prints a list of drills in x,y,dia table in CSV, TSV or text format
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ID.name	(revision 18980)
@@ -0,0 +1 @@
+drill list exporter
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.awk	(revision 18980)
@@ -0,0 +1,60 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/hid", 0)
+	PkgLoad("pcb-rnd-gpmi/layout", 0)
+	PkgLoad("pcb-rnd-gpmi/dialogs", 0)
+
+	hid = hid_create("drill", "drill list export")
+	attr_path =  hid_add_attribute(hid, "filename", "name of the output file", "HIDA_Path", 0, 0, "drill.txt")
+	attr_format = hid_add_attribute(hid, "format",  "file format", "HIDA_Enum", 0, 0, "CSV|TSV|text")
+	hid_register(hid)
+
+	fmt = 0
+	conv = mm2pcb_multiplier()
+	channel = ""
+	green_light = 0
+}
+
+function make_gc(event_id, hid, gc) {
+	if (channel == "") {
+		channel = hid_get_attribute(hid, attr_path)
+# awk: can't check whether the file can be open here
+		fmt = hid_get_attribute(hid, attr_format)
+	}
+}
+
+function destroy_gc(event_id, hid, gc) {
+	if (channel != "") {
+		close(channel)
+		channel = ""
+	}
+}
+
+function set_layer(event_id, hid, group, layer, flags, empty) {
+	if ((layer_flag_is_set(flags, "LYT_ASSY") == "1") && (layer_flag_is_set(flags, "LYT_TOP") == "1"))
+		green_light = 1
+	else
+		green_light = 0
+}
+
+function fill_circle(event_id, hid, gc, cx, cy, r      ,dia) {
+	if (green_light) {
+		cx  = cx / conv
+		cy  = cy / conv
+		dia = r  / conv * 2
+
+		if (fmt == "CSV") {
+			print cx "," cy "," dia > channel
+		} else if (fmt == "TSV") {
+			print cx "\t" cy "\t" dia > channel
+		} else if (fmt == "text") {
+			print cx "    " cy "    " dia > channel
+		}
+	}
+}
+
+BEGIN {
+	Bind("HIDE_make_gc", "make_gc")
+	Bind("HIDE_destroy_gc", "destroy_gc")
+	Bind("HIDE_set_layer_group", "set_layer_group")
+	Bind("HIDE_fill_circle", "fill_circle")
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.html	(revision 18980)
@@ -0,0 +1,60 @@
+<!-- TODO: move this to the high level doc -->
+An exporter is a hid registered. During the export
+process, pcb-rnd calls the exporter to draw objects on layers. The GPMI
+layer converts these calls to bindable events. An exporter script catches
+the drawing events relevant to the output format and draws everything from
+event handlers. 
+<p>
+An exporter is sort of a drawing backend: pcb-rnd sets up graphic contexts
+(gc for short) and draws on them. The first gc set up should open the
+output file, the last gc closed should flush/close the file.
+<p>
+<hr>
+
+<h3>Theory of operation</h3>
+Assume only <b>filled circles</b> on the 
+<b>top assembly layer</b> are holes. Emit a line for each of these
+and ignore everything else.
+
+<h3> Implementation </h3>
+Load packages the script depends on:
+<ul>
+	<li> <ref>hid</ref> for registering the new exporter;
+	<li> <ref>layout</ref> for unit conversion;
+	<li> <ref>dialogs</ref> for error reporting.
+</ul>
+<p>
+Set up an exporter hid, storing the handle of each object created in
+a global variable:
+<ul>
+	<li> create a hid using <ref>hid_create</ref>
+	<li> add two attributes (fields) to the dialog using <ref>hid_add_attribute</ref>
+	<li> register the new hid using <ref>hid_register</ref> - this makes it an exporter
+</ul>
+<p>
+Set up global state variables:
+<ul>
+	<li> fmt will be a cache for the format selected by the user
+	<li> conv is the conversion scale between mm and PCB internal coordinate unit
+	<li> channel specifies a file handle or indicates that the output file is open
+	<li> green_light indicates that the exporter is drawing the relevant layer
+</ul>
+<p>
+Define a <i>make_gc</i> callback. It is called when a new graphic
+context is created (e.g. for layers).  An exporter is sort of a drawing
+backend: pcb-rnd sets up gc's and draws on them. The first gc set up
+should open the output file, the last gc closed should flush/close the file.
+Define a <i>destroy_gc</i> callback for the latter. GCs are
+destroyed at the end of the export process. Use global variable <i>channel</i>
+to make sure the file is open/close only once (see TODO <ref>script context</ref>).
+<p>
+Define a <i>set_layer</i> callback that sets green_light to true if
+layer name is "topasssembly", false otherwise.
+<p>
+Callback <i>fill_circle</i> is the workhorse: check if we have the green
+light to emit lines, then convert coordinates and diameter to mm and
+decide what format to use for printing a line for each filled circle.
+<p>
+Finally, bind all four callbacks to exporter events.
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.lua	(revision 18980)
@@ -0,0 +1,65 @@
+PkgLoad("pcb-rnd-gpmi/hid", 0)
+PkgLoad("pcb-rnd-gpmi/layout", 0)
+PkgLoad("pcb-rnd-gpmi/dialogs", 0)
+
+hid = hid_create("drill", "drill list export")
+attr_path =  hid_add_attribute(hid, "filename", "name of the output file", "HIDA_Path", 0, 0, "drill.txt")
+attr_format = hid_add_attribute(hid, "format",  "file format", "HIDA_Enum", 0, 0, "CSV|TSV|text")
+hid_register(hid)
+
+fmt = 0
+conv = mm2pcb_multiplier()
+channel = nil
+green_light = 0
+
+function make_gc(event_id, hid, gc)
+	if channel == nil
+	then
+		channel = io.open(hid_get_attribute(hid, attr_path), "w")
+		if channel == nil
+		then
+			dialog_report("Error exporting drill", "Could not open file [hid_get_attribute $hid $attr_path] for\nwriting, exporting drill failed.")
+			return
+		end
+		fmt = hid_get_attribute(hid, attr_format)
+	end
+end
+
+function destroy_gc(event_id, hid, gc)
+	if channel ~= nil
+	then
+		channel:close()
+		channel = nil
+	end
+end
+
+function set_layer_group(event_id, hid, group, layer, flags, empty)
+	if (layer_flag_is_set(flags, "LYT_ASSY") == "1") and (layer_flag_is_set(flags, "LYT_TOP") == "1")
+	then
+		green_light = 1
+	else
+		green_light = 0
+	end
+end
+
+function fill_circle(event_id, hid, gc, cx, cy, r)
+	if green_light == 1
+	then
+		cx  = cx / conv
+		cy  = cy / conv
+		local dia = r  / conv * 2
+
+		if fmt == "CSV" then
+			channel:write(cx .. "," .. cy .. "," .. dia .. "\n")
+		elseif (fmt == "TSV") then
+			channel:write(cx .. "\t" .. cy .. "\t" .. dia .. "\n")
+		elseif (fmt == "text") then
+			channel:write(cx .. "    " .. cy .. "    " .. dia .. "\n")
+		end
+	end
+end
+
+Bind("HIDE_make_gc", "make_gc")
+Bind("HIDE_destroy_gc", "destroy_gc")
+Bind("HIDE_set_layer_group", "set_layer_group")
+Bind("HIDE_fill_circle", "fill_circle")
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/ex.tcl	(revision 18980)
@@ -0,0 +1,65 @@
+PkgLoad pcb-rnd-gpmi/hid 0
+PkgLoad pcb-rnd-gpmi/layout 0
+PkgLoad pcb-rnd-gpmi/dialogs 0
+
+set hid [hid_create "drill" "drill list export"]
+set attr_path   [hid_add_attribute $hid "filename" "name of the output file" "HIDA_Path" 0 0 "drill.txt"]
+set attr_format [hid_add_attribute $hid "format"   "file format" "HIDA_Enum" 0 0 "CSV|TSV|text"]
+hid_register $hid
+
+set fmt 0
+set conv [mm2pcb_multiplier]
+set channel -1
+set green_light 0
+
+proc make_gc {event_id hid gc} {
+	global channel attr_path attr_format fmt
+
+	if {$channel == -1} {
+		if {[catch {open [hid_get_attribute $hid $attr_path] "w"} channel]} {
+			dialog_report "Error exporting drill" "Could not open file [hid_get_attribute $hid $attr_path] for\nwriting, exporting drill failed."
+			return
+		}
+		set fmt [hid_get_attribute $hid $attr_format]
+	}
+}
+
+proc destroy_gc {event_id hid gc} {
+	global channel
+
+	if {$channel > -1} {
+		close $channel
+		set channel -1
+	}
+}
+
+proc set_layer_group {event_id hid group layer flags empty} {
+	global green_light
+
+	if { [layer_flag_is_set $flags "LYT_ASSY"] && [layer_flag_is_set $flags "LYT_TOP"] } { set green_light 1; puts "!!!!!!!!!!!!!!!"} { set green_light 0 }
+}
+
+proc fill_circle {event_id hid gc cx cy r} {
+	global channel conv fmt green_light
+
+	if {$green_light} {
+		set cx  [expr $cx / $conv]
+		set cy  [expr $cy / $conv]
+		set dia [expr $r  / $conv * 2]
+
+		if {$fmt eq "CSV"} {
+			puts $channel "$cx,$cy,$dia"
+		} elseif {$fmt eq "TSV"} {
+			puts $channel "$cx	$cy	$dia"
+		} elseif {$fmt eq "text"} {
+			puts $channel "$cx    $cy    $dia"
+		}
+	}
+}
+
+Bind HIDE_make_gc make_gc
+Bind HIDE_destroy_gc destroy_gc
+Bind HIDE_set_layer_group set_layer_group
+Bind HIDE_fill_circle fill_circle
+
+puts "NA?"
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/35_export_drill/index.html	(revision 18980)
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta drill list exporter </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>drill list exporter</h1>
+Create a new exporter that prints a list of drills in x,y,dia table in CSV, TSV or text format
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+
+<!-- TODO: move this to the high level doc --> An exporter is a hid registered. During the export process, pcb-rnd calls the exporter to draw objects on layers. The GPMI layer converts these calls to bindable events. An exporter script catches the drawing events relevant to the output format and draws everything from event handlers.  
+<p> An exporter is sort of a drawing backend: pcb-rnd sets up graphic contexts (gc for short) and draws on them. The first gc set up should open the output file, the last gc closed should flush/close the file. 
+<p> 
+<hr>  
+<h3>Theory of operation</h3>
+ Assume only 
+<b>filled circles</b>
+ on the  
+<b>top assembly layer</b>
+ are holes. Emit a line for each of these and ignore everything else.  
+<h3> Implementation </h3>
+ Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>hid</i>
+ for registering the new exporter; 	
+<li> 
+<i>layout</i>
+ for unit conversion; 	
+<li> 
+<i>dialogs</i>
+ for error reporting. </ul>
+ 
+<p> Set up an exporter hid, storing the handle of each object created in a global variable: 
+<ul> 	
+<li> create a hid using 
+<i><a href="../../packages/hid_ref.html#hid_create">hid_create</a></i>
+ 	
+<li> add two attributes (fields) to the dialog using 
+<i><a href="../../packages/hid_ref.html#hid_add_attribute">hid_add_attribute</a></i>
+ 	
+<li> register the new hid using 
+<i><a href="../../packages/hid_ref.html#hid_register">hid_register</a></i>
+ - this makes it an exporter </ul>
+ 
+<p> Set up global state variables: 
+<ul> 	
+<li> fmt will be a cache for the format selected by the user 	
+<li> conv is the conversion scale between mm and PCB internal coordinate unit 	
+<li> channel specifies a file handle or indicates that the output file is open 	
+<li> green_light indicates that the exporter is drawing the relevant layer </ul>
+ 
+<p> Define a 
+<i>make_gc</i>
+ callback. It is called when a new graphic context is created (e.g. for layers).  An exporter is sort of a drawing backend: pcb-rnd sets up gc's and draws on them. The first gc set up should open the output file, the last gc closed should flush/close the file. Define a 
+<i>destroy_gc</i>
+ callback for the latter. GCs are destroyed at the end of the export process. Use global variable 
+<i>channel</i>
+ to make sure the file is open/close only once (see TODO 
+<i>script context</i>
+). 
+<p> Define a 
+<i>set_layer</i>
+ callback that sets green_light to true if layer name is "topasssembly", false otherwise. 
+<p> Callback 
+<i>fill_circle</i>
+ is the workhorse: check if we have the green light to emit lines, then convert coordinates and diameter to mm and decide what format to use for printing a line for each filled circle. 
+<p> Finally, bind all four callbacks to exporter events.   
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.desc	(revision 18980)
@@ -0,0 +1 @@
+Create and animate an analog clock on a dedicated UI layer.
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ID.name	(revision 18980)
@@ -0,0 +1 @@
+animated clock on a UI layer
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.awk	(revision 18980)
@@ -0,0 +1,126 @@
+BEGIN {
+	PkgLoad("pcb-rnd-gpmi/actions", 0);
+	PkgLoad("pcb-rnd-gpmi/dialogs", 0);
+	PkgLoad("pcb-rnd-gpmi/layout", 0);
+	pi=3.141592654
+}
+
+# the clock coordinate system
+function clock_cos(a)
+{
+	return cos((a-15)*6/180*pi)
+}
+function clock_sin(a)
+{
+	return sin((a-15)*6/180*pi)
+}
+
+# draw the labels
+function draw_dial(ui, cx, cy, r    ,flg,w,cl,a,l,x1,y1,x2,y2)
+{
+	flg = "FL_NONE"
+	w = int(0.5 * mm)
+	cl = int(1 * mm)
+
+	for(a = 0; a < 60; a++) {
+		tw = w
+		if (a == 0)
+			l = 4*mm
+		else if (a % 5 == 0)
+			l = 2*mm
+		else {
+			l = 1*mm
+			tw = w / 2
+		}
+
+		x1 = int(cx + clock_cos(a) * r)
+		y1 = int(cy + clock_sin(a) * r)
+		x2 = int(cx + clock_cos(a) * (r-l))
+		y2 = int(cy + clock_sin(a) * (r-l))
+		layout_create_line("", ui, x1, y1, x2, y2, tw, cl, flg)
+
+
+		if ((a % 5) == 0) {
+			x2 = int(cx + clock_cos(a) * (r-6*mm)) - 0.25*mm
+			y2 = int(cy + clock_sin(a) * (r-6*mm))
+			layout_create_text("", ui, x2, y2, 0, 100, ((a == 0) ? "12" : a/5), flg)
+		}
+	}
+
+	hlen[0] = 0.95
+	hlen[1] = 0.9
+	hlen[2] = 0.6
+
+	x2 = int(cx + clock_cos(a) * (r * hlen[0]))
+	y2 = int(cy + clock_sin(a) * (r * hlen[0]))
+	hand_sec = layout_create_line("hands", ui, cx, cy, x2, y2, 0.2*mm, cl, flg)
+
+	x2 = int(cx + clock_cos(a) * (r * hlen[1]))
+	y2 = int(cy + clock_sin(a) * (r * hlen[1]))
+	hand_min = layout_create_line("hands", ui, cx, cy, x2, y2, 0.5*mm, cl, flg)
+
+	x2 = int(cx + clock_cos(a) * (r * hlen[2]))
+	y2 = int(cy + clock_sin(a) * (r * hlen[2]))
+	hand_hour = layout_create_line("hands", ui, cx, cy, x2, y2, 2*mm, cl, flg)
+
+	clock_cx = cx
+	clock_cy = cy
+	clock_r = r
+}
+
+
+function ev_action(id, name, argc, x, y)
+{
+	ui = int(uilayer_alloc("clock", "#DD33DD"))
+	mm = mm2pcb_multiplier();
+	AddTimer(0, 10, "ev_second", "");
+	draw_dial(ui, 50*mm, 50*mm, 30*mm)
+
+	clock_sec = 12
+	clock_min = 33
+	clock_hour = 9
+	set_hands()
+}
+
+function set_hand(obj, idx, at     ,ox2,oy2,x2,y2)
+{
+	ox2 = layout_obj_coord(obj, "OC_P2X")
+	oy2 = layout_obj_coord(obj, "OC_P2Y")
+
+	x2 = int(clock_cx + clock_cos(at) * (clock_r * hlen[idx]))
+	y2 = int(clock_cy + clock_sin(at) * (clock_r * hlen[idx]))
+
+	layout_obj_move(obj, "OC_P2", x2-ox2, y2-oy2);
+}
+
+function set_hands()
+{
+	set_hand(hand_hour, 2, (clock_hour + clock_min/60 + clock_sec/3600)*5)
+	set_hand(hand_min, 1, clock_min + clock_sec/60)
+	set_hand(hand_sec, 0, clock_sec)
+}
+
+
+function ev_second(timer_data)
+{
+	if (hand_sec != "") {
+		clock_sec++;
+		if (clock_sec >= 60) {
+			clock_sec = 0
+			clock_min++
+			if (clock_min >= 60) {
+				clock_min = 0
+				clock_hour++
+				if (clock_hour >= 12)
+					clock_hour = 0;
+			}
+		}
+		set_hands()
+	}
+}
+
+BEGIN {
+	layout_search_empty("hands")
+	Bind("ACTE_action", "ev_action");
+	action_register("clock", "", "animate an analog clock on a debug layer", "clock()");
+}
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/ex.html	(revision 18980)
@@ -0,0 +1,49 @@
+Animated clock on an UI layer.
+<p>
+<hr>
+
+<h3>Theory of operation</h3>
+
+
+<h3> Implementation </h3>
+Load packages the script depends on:
+<ul>
+	<li> <ref>hid</ref> for registering the new exporter;
+	<li> <ref>layout</ref> for unit conversion;
+	<li> <ref>dialogs</ref> for error reporting.
+</ul>
+<p>
+Set up an exporter hid, storing the handle of each object created in
+a global variable:
+<ul>
+	<li> create a hid using <ref>hid_create</ref>
+	<li> add two attributes (fields) to the dialog using <ref>hid_add_attribute</ref>
+	<li> register the new hid using <ref>hid_register</ref> - this makes it an exporter
+</ul>
+<p>
+Set up global state variables:
+<ul>
+	<li> fmt will be a cache for the format selected by the user
+	<li> conv is the conversion scale between mm and PCB internal coordinate unit
+	<li> channel specifies a file handle or indicates that the output file is open
+	<li> green_light indicates that the exporter is drawing the relevant layer
+</ul>
+<p>
+Define a <i>make_gc</i> callback. It is called when a new graphic
+context is created (e.g. for layers).  An exporter is sort of a drawing
+backend: pcb-rnd sets up gc's and draws on them. The first gc set up
+should open the output file, the last gc closed should flush/close the file.
+Define a <i>destroy_gc</i> callback for the latter. GCs are
+destroyed at the end of the export process. Use global variable <i>channel</i>
+to make sure the file is open/close only once (see TODO <ref>script context</ref>).
+<p>
+Define a <i>set_layer</i> callback that sets green_light to true if
+layer name is "topasssembly", false otherwise.
+<p>
+Callback <i>fill_circle</i> is the workhorse: check if we have the green
+light to emit lines, then convert coordinates and diameter to mm and
+decide what format to use for printing a line for each filled circle.
+<p>
+Finally, bind all four callbacks to exporter events.
+
+
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/90_clock/index.html	(revision 18980)
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta animated clock on a UI layer </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>animated clock on a UI layer</h1>
+Create and animate an analog clock on a dedicated UI layer.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+<h2> Explanation, step by step </h2>
+Animated clock on an UI layer. 
+<p> 
+<hr>  
+<h3>Theory of operation</h3>
+   
+<h3> Implementation </h3>
+ Load packages the script depends on: 
+<ul> 	
+<li> 
+<i>hid</i>
+ for registering the new exporter; 	
+<li> 
+<i>layout</i>
+ for unit conversion; 	
+<li> 
+<i>dialogs</i>
+ for error reporting. </ul>
+ 
+<p> Set up an exporter hid, storing the handle of each object created in a global variable: 
+<ul> 	
+<li> create a hid using 
+<i><a href="../../packages/hid_ref.html#hid_create">hid_create</a></i>
+ 	
+<li> add two attributes (fields) to the dialog using 
+<i><a href="../../packages/hid_ref.html#hid_add_attribute">hid_add_attribute</a></i>
+ 	
+<li> register the new hid using 
+<i><a href="../../packages/hid_ref.html#hid_register">hid_register</a></i>
+ - this makes it an exporter </ul>
+ 
+<p> Set up global state variables: 
+<ul> 	
+<li> fmt will be a cache for the format selected by the user 	
+<li> conv is the conversion scale between mm and PCB internal coordinate unit 	
+<li> channel specifies a file handle or indicates that the output file is open 	
+<li> green_light indicates that the exporter is drawing the relevant layer </ul>
+ 
+<p> Define a 
+<i>make_gc</i>
+ callback. It is called when a new graphic context is created (e.g. for layers).  An exporter is sort of a drawing backend: pcb-rnd sets up gc's and draws on them. The first gc set up should open the output file, the last gc closed should flush/close the file. Define a 
+<i>destroy_gc</i>
+ callback for the latter. GCs are destroyed at the end of the export process. Use global variable 
+<i>channel</i>
+ to make sure the file is open/close only once (see TODO 
+<i>script context</i>
+). 
+<p> Define a 
+<i>set_layer</i>
+ callback that sets green_light to true if layer name is "topasssembly", false otherwise. 
+<p> Callback 
+<i>fill_circle</i>
+ is the workhorse: check if we have the green light to emit lines, then convert coordinates and diameter to mm and decide what format to use for printing a line for each filled circle. 
+<p> Finally, bind all four callbacks to exporter events.   
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/Makefile	(revision 18980)
@@ -0,0 +1,4 @@
+all: FORCE
+	cd ../util && ./rosetta_genpages.sh
+
+FORCE:
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.html	(revision 18980)
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<H1> pcb-rnd scripting - Rosetta </H1>
+The <i><a href="https://en.wikipedia.org/wiki/Rosetta_Stone">Rosetta Stone</a>
+of <a href="../scripting_intro.html"> pcb-rnd scripting </a></i> is a collection of example scripts implemented in
+various scripting languages. Rosetta has multiple purposes:
+<ul>
+	<li> to provide examples of using the pcb-rnd API;
+	<li> to not scare away newcomers by showing the first examples in an unfamiliar language;
+	<li> to help the user to decide which language to use for a specific task;
+	<li> to provide examples on how to convert idioms of pcb-rnd scripts from one language to another.
+</ul>
+<p>
+Each example comes with an explanation, written in plain English about what the
+scripts do, step by step. Instead of trying to exploit powerful features
+of the language, example implementations try to be simple.
+<p>
+The list below is ordered from the least complex to the most complex examples.
+Column <i>lvl</i> is the complexity score. The less the score is, the simpler
+the example is.
+
+
+<H2> Index of examples </H2>
+
+
+<table border=1 cellspacing=0 cellpadding=15>
+<tr><th>lvl<th>example <th> languages <th> description
+<tr>
+ <td>10
+ <td><a href="10_hello/index.html">hello world (text, log)</a>
+ <td> awk bash lua perl python ruby scheme stutter tcl
+ <td>Create a new action hello() that prints &quot;Hello world!&quot; in the message log.
+<tr>
+ <td>10
+ <td><a href="10_hello_gui/index.html">hello world (popup window)</a>
+ <td> awk bash lua perl python ruby scheme stutter tcl
+ <td>Create a new action hello() that prints &quot;Hello world!&quot; in a popup window.
+<tr>
+ <td>12
+ <td><a href="12_hello_menu/index.html">hello world (popup window + submenu)</a>
+ <td> awk bash lua perl python ruby scheme stutter tcl
+ <td>Create a new action hello() that prints &quot;Hello world!&quot; in a popup window, create a menu (under &quot;Plugins/GPMI scripting/&quot;) that executes the action.
+<tr>
+ <td>30
+ <td><a href="30_move/index.html">action: move selected objects</a>
+ <td> awk bash lua perl python ruby scheme stutter tcl
+ <td>Create a new action mv(dx,dy) that moves selected objects relative by dx and dy mm.
+<tr>
+ <td>35
+ <td><a href="35_export_drill/index.html">drill list exporter</a>
+ <td> awk lua tcl
+ <td>Create a new exporter that prints a list of drills in x,y,dia table in CSV, TSV or text format
+<tr>
+ <td>90
+ <td><a href="90_clock/index.html">animated clock on a UI layer</a>
+ <td> awk
+ <td>Create and animate an analog clock on a dedicated UI layer.
+</table>
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.templ.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.templ.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/rosetta/index.templ.html	(revision 18980)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<H1> pcb-rnd scripting - Rosetta </H1>
+The <i><a href="https://en.wikipedia.org/wiki/Rosetta_Stone">Rosetta Stone</a>
+of <a href="../scripting_intro.html"> pcb-rnd scripting </a></i> is a collection of example scripts implemented in
+various scripting languages. Rosetta has multiple purposes:
+<ul>
+	<li> to provide examples of using the pcb-rnd API;
+	<li> to not scare away newcomers by showing the first examples in an unfamiliar language;
+	<li> to help the user to decide which language to use for a specific task;
+	<li> to provide examples on how to convert idioms of pcb-rnd scripts from one language to another.
+</ul>
+<p>
+Each example comes with an explanation, written in plain English about what the
+scripts do, step by step. Instead of trying to exploit powerful features
+of the language, example implementations try to be simple.
+<p>
+The list below is ordered from the least complex to the most complex examples.
+Column <i>lvl</i> is the complexity score. The less the score is, the simpler
+the example is.
+
+
+<H2> Index of examples </H2>
+
+<rosetta index>
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/gpmi/scripting_intro.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/scripting_intro.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/scripting_intro.html	(revision 18980)
@@ -0,0 +1,231 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> Scripting intro </H1>
+This document is an introduction to GPMI for pcb-rnd users. It focuses on
+scripting pcb-rnd and doesn't discuss GPMI deeper than the minimum necessary.
+GPMI is more generic than shown here.
+<p>
+The scope of the document is to describe the relations between pcb-rnd, 
+hids, GPMI, glue packages and scripts. Details on how specific glue
+packages access pcb-rnd internals (or how those internals work) are
+described in other documents.
+
+<H2> 1. pcb-rnd internals </H2>
+
+Since scripts are glued to pcb-rnd internals, scripters need to know
+the basic concepts of how pcb-rnd is structured.
+
+<H3> 1.1 pcb-rnd, HIDs, plugins and GPMI </H3>
+pcb-rnd consists of:
+<ul>
+	<li> a <b>core</b> that handles the file format, data structures, UI and exporter logics
+	<li> a <b>hid system</b> that is a layer between core and the HIDs
+	<li> a set of <b>GUI HIDs</b> which are responsible for interactive graphical display of the current design
+	<li> a set of <b>exporter HIDs</b> which are responsible for exporting offline representation of the current design
+	<li> a <b>plugin system</b> that can load HIDs from on the fly, from dynamic loadable libraries (.so or .dll)
+	<li> a <b>buildin system</b> which is the "static link" variant of the plugin system: some plugins can be selected to be statically linked into the pcb-rnd executable so they are "always loaded"
+</ul>
+<p>
+Note 1: at the moment GUI hids can not be plugins or buildins.
+<br>
+Note 2: plugins/buildins are always exporter HIDs technically, but in practice
+they do not have to offer exporting. This means such a HID plugin is loaded
+and registered as an exporter on paper, but it doesn't really create a
+new export facility, just sits there, interacting with pcb-rnd (creating
+menus, actions, etc). Most script plugins do this.
+<p>
+When the pcb-rnd executable is compiled, the core, the default GUI and exporter HIDs
+and buildins are compiled into the executable. Later on 
+<p>
+The <i>GPMI hid</i> is an <i>optional plugin</i> that, by compile-time choice
+of the user, can be:
+<ul>
+	<li> left out all-together - pcb-rnd does not have scripting
+	<li> compiled as a plugin - when the .so (or .dll) is put in the right directory, pcb-rnd loads it during startup and has scripting
+	<li> compiled as buildin - becomes part of the pcb-rnd executable so that scripting is always available
+</ul>
+
+<H3> 1.2. Actions, menus, exporters </H3>
+The core implements actions. An action is a command with custom arguments,
+e.g. Delete(Selected). These actions are the commands on the default command
+line in pcb-rnd. In batch mode the command language uses these actions as well.
+Remote controlling pcb-rnd using the --listen switch will read these actions
+on the standard input.
+<p>
+GUI menus are configured to execute actions too. This also means it is impossible
+to realize an user-accessible functionality that can be triggered from
+the GUI command line, menu or batch input without making it an action.
+<p>
+The only exception, where new functionality is not behind a new action is
+exporters. An exporter is a structured dialog box of options and a set of
+callback functions implementing a drawing API. Exporting works by the following
+steps:
+<ol>
+	<li> An exporter HID may register one or more exporters.
+	<li> When the user tries to export the design, pcb-rnd lists all
+	     registered exporters.
+	<li> The user chooses one, and the preconfigured dialog box
+	     with the selected exporter's options are popped up.
+	<li> pcb-rnd core runs the dialog and saves the results if the user
+	     clicked on the ok button.
+	<li> pcb-rnd starts the exporting process: it calls the callbacks
+	     to draw the design layer by layer, object by object.
+</ol>
+
+<H3> 1.3. How a script can interact with the user </H3>
+<ul>
+	<li> The script may register <i>actions</i> - these actions are instantly accessible from the GUI command line, on stdin with --listen and in batch mode
+	<li> The script may <i>create menus</i> and bind them to actions - when the menu is selected, the action is executed
+	<li> The script may <i>bind to events</i> that will be generated asynchronously by pcb-rnd - when such an event is received, the script executes some code
+	<li> The script may <i>register new exporter(s)</i> - the user will be able to export the design using the script
+	<li> The script may run arbitrary code <i>"on load"</i> (when the script is loaded) - however, that time the design or even the GUI may not be loaded/initialized yet - this is useful for registering actions, bind to events or set up exporters
+</ul>
+
+
+<H2> 2. GPMI intro </H2>
+
+<H3> 2.1. GPMI's place in the pcb-rnd world </H3>
+<table border=0 width="100%"><tr><td valign=top>
+GPMI is a plugin/buildin HID. Instead of doing actual work, it loads scripts
+and provides a glue layer between pcb-rnd and the scripts. The actual work
+is performed by the scripts.
+The glue layer comes in two kinds:
+<ul>
+	<li> gpmi module: dynamic lib written in C, knows how to load and interpret a script and how to deliver events to the script
+	<li> gpmi package: dynamic lib, provides C functions the script can directly call; package functions then know how to deal with PCB internals
+</ul>
+Arrows drawn with dashed line represents a slow, <i>string based communication</i>.
+<td><img src="gpmi_flow.png" alt="[gpmi HID interacting with pcb-rnd and other components]"></table>
+
+<H3> 2.2. Module, script, script context, packages </H3>
+<table border=0 width="100%"><tr><td valign=top>
+Each time a script needs to be loaded, first a module is loaded and the name
+of the script is passed to the module. During module initialization, the module
+sets up a script interpreter and script context and loads the script into the
+context.
+<p>
+If there are 3 separate lua scripts running in pcb-rnd, there are 3 separate
+lua modules loaded, each dealing with one of the scripts. The process of
+loading a script is illustrated by highlighting the relevant paths with red
+for step 1 and green for step 2.
+<p>
+Step 0: the <b>GPMI HID</b> finds a script has to be loaded. The idea comes
+from the config file (pcb-rnd-gpmi.conf) or from the GUI (manage scripts)
+or as a request from a script already loaded. 
+<p>
+Step 1: the <b>GPMI HID</b> loads the corresponding module which in turns
+loads the script. The script has a "main" part that is run on load. For
+most languages this is the global code sections; in some languages it is
+a specific function, usually called main. A few basic glue packages
+are already loaded before the script.
+<p>
+Step 2: the <b>script</b> can load glue packages. This usually happens
+from the on-load main part from the script. The actual mechanism is to
+call PkgLoad() from a glue package that was automatically loaded in
+Step 1. The green arrows represent this path: the script executes PkgLoad()
+which in turns loads other package(s) into the GPMI hid.
+<p>
+Packages are loaded only once and are globally accessible for multiple modules.
+<td><img src="gpmi_flow_load.png" alt="[same diagram as before, with package load flow highlighted]"></table>
+
+<H3> 2.3. Binding events, registering actions, creating menus </H3>
+<table border=0 width="100%"><tr><td valign=top>
+Binding an event in a script is done by calling the Bind() function
+(this is implemented in a package automatically loaded). The first
+argument is the name of the event, the second argument is the name of
+the script function that should be called when the event is triggered. Both
+arguments are strings. The event binding mechanism is shown in red in the
+map to the right.
+<p>
+The script can create new actions using the action_register() function
+(the actions package needs to be loaded first). A script may register multiple
+actions. This call is marked with green in the above map.
+If any of the actions registered by the script is called, the event "ACTE_action"
+is generated. This has two implications:
+<ul>
+	<li> a script that registers actions needs to bind the ACTE_action event to serve the action requests
+	<li> if a script registers multiple actions, in the event handler it needs to check which action triggered the event (e.g. with a switch()-like construction on the event name)
+</ul>
+<td><img src="gpmi_flow_reg.png" alt="[same diagram as before, with action registration flow highlighted]"></table>
+
+<table border=0 width="100%"><tr><td valign=top>
+Menus are created using the create_menu() call. <b>Menus can be
+created only when the GUI is already set up - this may happen only
+after some of the scripts are already loaded</b>. Thus scripts shall
+create menus from an event handler bound to the ACTE_gui_init event.
+This event is triggered right after the GUI has been set up.
+On the map to the right the red arrows represent the path of ACTE_gui_init;
+the green arrows represent the reaction of the script, creating the new
+menu.
+<p>
+<td><img src="gpmi_flow_menu.png" alt="[same diagram as before, with menu setup flow highlighted]"></table>
+
+<H3> 2.4. Exporting </H3>
+<table border=0 width="100%"><tr><td valign=top>
+Exporter scripts first have to set up an exporter hid. This typically
+happens from their on-load main part. Related calls are in the hid
+package. The following map shows this process with red arrows:
+<p>
+When the user chooses to use the exporter, among the green arrows,
+a series of events are triggered and the script can generate output
+directly to a file from event handlers bound to these exporting events.
+<td><img src="gpmi_flow_exp.png" alt="[same diagram as before, with exporter flow highlighted]"></table>
+
+<H3> 2.5. Making modifications on the design </H3>
+The purpose of a script might be to manipulate the objects in the current design.
+Such a script registers actions, and implements the handler of the actions
+using the layout package. The layout package provides calls to query,
+change and create design objects.
+
+
+<H2> 3. How it works in practice </H2>
+
+<H3> 3.1. Loading the GPMI plugin </H3>
+Check the output of ./configure, it will tell if gpmi is compiled as buildin
+or plugin (or not at all).
+If the gpmi plugin is compiled as a buildin, it is already loaded, no
+further steps are required.
+<p>
+If gpmi is a plugin, gpmi_plugin.so (or gpmi_plugin.dll) needs to be
+copied in one of the plugin directories pcb-rnd is looking into on startup:
+<table border=1>
+	<tr><th> path <th> purpose
+	<tr><td>
+	<tr><td>$prefix/lib/pcb-rnd/plugins/$arch/  <td> system plugins, multihost
+	<tr><td>$prefix/lib/pcb-rnd/plugins/        <td> system plugins
+	<tr><td>~/.pcb/plugins/$arch/               <td> user plugins, multihost
+	<tr><td>~/.pcb/plugins/                     <td> user plugins
+	<tr><td>./plugins/$arch/                    <td> project plugins, multihost
+	<tr><td>./plugins/                          <td> project plugins
+</table>
+In the above table:
+<ul>
+	<li> $prefix is the installation prefix (normally /usr)
+	<li> $arch is the host arch triplet, e.g. i386-unknown-linux; this is useful if multiple architectures share the same NFS mounted plugin dir
+	<li> ~ is the user home directory, if exists, e.g. /home/jdoe
+	<li> ./ is the current working directory pcb has been started from; may be useful for project-local scripts
+</ul>
+
+<H3> 3.2. Loading scripts </H3>
+The gpmi plugin looks for a file called "pcb-rnd-gpmi.conf" in each of the
+plugin directories. Wherever the file is found, it is loaded and parsed.
+The file is plain text, each line describes a script to be loaded. Empty
+lines and lines starting with # are comments and are ignored.
+<p>
+Script load lines contain two words separated by a space: a module name
+and a script name. Relative paths in the the script name are relative to
+the directory the config file is found in.
+<p>
+Example config:
+<pre>
+# load the carc script (written in lua) from next to the config file:
+lua carc.lua
+
+# load foo.awk, which is a mawk script, from its installation path
+mawk /usr/lib/foo/foo.awk
+</pre>
Index: tags/2.0.1/doc/user/06_feature/gpmi/util/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/util/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/util/Makefile	(revision 18980)
@@ -0,0 +1 @@
+all:
Index: tags/2.0.1/doc/user/06_feature/gpmi/util/rosetta_genpages.sh
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/util/rosetta_genpages.sh	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/util/rosetta_genpages.sh	(revision 18980)
@@ -0,0 +1,182 @@
+#!/bin/sh
+
+clean_id()
+{
+	tr "\r\n" "~" | sed '
+s/~*$//;
+s/|/\&pipe;/g;
+s/&/\&amp;/g;
+s/</\&lt;/g;
+s/>/\&gt;/g;
+s/"/\&quot;/g;
+s/'\''/\&apos;/g;
+s/~\+/<br>/g;
+'
+	echo ""
+}
+
+genpage()
+{
+	local dir scripts name desc
+	
+	dir="$1"
+	scripts="$2"
+
+	name=`cat $dir/ID.name`
+	desc=`cat $dir/ID.desc`
+	./tags < "$dir/ex.html" | awk -v "fn_ref=../packages/XREF" -v "scripts=$scripts" -v "name=$name" -v "desc=$desc" '
+	BEGIN {
+		while((getline < fn_ref) > 0) {
+			REF[$2] = $3
+		}
+		print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+		print "<html>"
+		print "<head>"
+		print "  <title> pcb-rnd rosetta", name, "</title>"
+		print "  <meta http-equiv=\"Content-Type\" content=\"text/html;charset=us-ascii\">"
+		print "</head>"
+		print "<body>"
+		print "<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->"
+		print "&lt;-- back to the <a href=\"../index.html\">index of Rosetta examples</a>"
+		print "<h1>" name "</h1>"
+		print desc
+
+		print "<H2> Example implementations </H2>"
+		v = split(scripts, S, "[\r\n]+")
+		for(n = 1; n <= v; n++) {
+			lang=S[n]
+			sub("^ex[.]", "", lang)
+			if (n != 1)
+				print " | "
+			print "<a href=\"" S[n] "\">" lang "</a>"
+		}
+
+		print "<h2> Explanation, step by step </h2>"
+	}
+	/^<ref>/ {
+		gsub("</?ref>", "", $0)
+		name=$0
+		gsub("[ \t]*", "", name)
+		if (name in REF) {
+			link_begin="<a href=\"../" REF[name]  "\">"
+			link_end = "</a>"
+		}
+		else {
+			link_begin=""
+			link_end=""
+		}
+		print "<i>" link_begin $0 link_end "</i>"
+		next
+	}
+
+	{ print $0 }
+
+	END {
+		print "</body>"
+		print "</html>"
+	}
+
+	' > "$dir/index.html"
+}
+
+gen_index()
+{
+
+	awk -v "template=$1" '
+		BEGIN {
+			FS="[|]"
+			q = "\""
+			LANGS["rb"] = "ruby"
+			LANGS["pl"] = "perl"
+			LANGS["py"] = "python"
+			LANGS["stt"] = "stutter"
+			LANGS["scm"] = "scheme"
+		}
+
+		($1 == "scripts") {
+			s = $3
+			gsub("ex[.]", "", s)
+			v = split(s, S, " ")
+			s = ""
+			for(n = 1; n <= v; n++) {
+				if (S[n] in LANGS)
+					s = s " " LANGS[S[n]]
+				else
+					s = s " " S[n]
+			}
+			DATA[$2, $1] = s
+			next
+		}
+
+		($1 == "name") {
+			if (names == "")
+				names = $2
+			else
+				names = names "|" $2
+		}
+
+
+		{
+			# DATA[script, name] = "hello world"
+			DATA[$2, $1] = $3
+		}
+
+		function generate(cmd   ,N,n,v,name,level) {
+			if (cmd == "index") {
+				print "<table border=1 cellspacing=0 cellpadding=15>"
+				print "<tr><th>lvl<th>example <th> languages <th> description"
+				v = split(names, N, "[|]")
+				for(n = 1; n <= v; n++) {
+					name = N[n]
+					level = name
+					sub("_.*", "", level)
+					if (level ~ "[^0-9]")
+						level = "n/a"
+					print "<tr>"
+					print " <td>" level
+					print " <td><a href=" q name "/index.html" q ">" DATA[name, "name"] "</a>"
+					print " <td>" DATA[name, "scripts"]
+					print " <td>" DATA[name, "desc"]
+				}
+				print "</table>"
+			}
+			else
+				print "Do not know how to generate " cmd > "/dev/stderr"
+		}
+
+		END {
+			FS=""
+			while((getline < template) > 0) {
+				if (match($0, "<rosetta[ \t][^>]*>")) {
+					print substr($0, 1, RSTART-1)
+					cmd=substr($0, RSTART+8, RLENGTH-9)
+					sub("^[ \t]*", "", cmd)
+					generate(cmd)
+					print substr($0, RSTART+RLENGTH)
+				}
+				else
+					print $0
+			}
+		}
+	'
+
+}
+
+
+for n in ../rosetta/*
+do
+	if test -d "$n"
+	then
+		bn=`basename $n`
+		scripts=`cd $n && ls ex.* | grep -v ".pyc$\|.html$" `
+		genpage "$n" "$scripts"
+		echo -n "desc|$bn|"
+		clean_id < $n/ID.desc
+		echo -n "name|$bn|"
+		clean_id < $n/ID.name
+		echo -n "scripts|$bn|"
+		echo $scripts
+	fi
+done | gen_index ../rosetta/index.templ.html > ../rosetta/index.html
+
+

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/util/rosetta_genpages.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/gpmi/util/tags
===================================================================
--- tags/2.0.1/doc/user/06_feature/gpmi/util/tags	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/gpmi/util/tags	(revision 18980)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+tr "\n" " " | sed "s@\(<[^/]\)@\n\1@g;s@\(</[^>]*>\)@\1\n@g"
+

Property changes on: tags/2.0.1/doc/user/06_feature/gpmi/util/tags
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/index.html	(revision 18980)
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+
+<h1> Feature Plugins</h1>
+These plugins have a wide variety of origins and offer a likewise wide variety
+of actions to the pcb-rnd user. 
+<ul class="toc">
+	<li><a href="ddraft/index.html">  ddraft: the 2D drafting tool </a>
+	<li><a href="djopt/index.html">   djopt: DJ's options </a>
+	<li><a href="cam/index.html">   cam: configurable export jobs </a>
+	<li><a href="scripting/index.html">   Scripting pcb-rnd </a>
+	<li><a href="gpmi/index.html">   Scripting with GPMI (deprecated) </a>
+	<li><a href="query/tutor_cli.html">    query <n/a>
+	<li><a href="vendordrill/index.html">   vendordrill </a>
+	<li><a href="autocrop/index.html">   autocrop </a>
+	<li><a href="autoplace/index.html">   autoplace </a>
+	<li><a href="distalign/index.html">   distalign </a>
+	<li><a href="distaligntext/index.html">   distaligntext </a>
+	<li><a href="stroke/index.html">   stroke (mouse gestures) </a>
+	<li><a href="polystitch/index.html">   polystitch (pstoedit poly hole workaround) </a>
+<!--	<li><a href="autoplace/index.html">  autoplace </a>-->
+</ul>
+
Index: tags/2.0.1/doc/user/06_feature/polystitch/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/polystitch/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/polystitch/index.html	(revision 18980)
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> Polystitch plugin </h2>
+<p>
+This plugin is intended as a workaround for a bug in pstoedit. Pstodeit 
+generates polygons instead of polygon holes. This plugin creates a polystitch
+action that can fix up that case. The polystitch action shall be ran while
+the crosshair is over the inner polygon of two overlapping polygons. The action
+takes the inner polygon and converts it into a hole within the outer polygon
+then removes the inner polygon.
+<p>
+The plugin assumes that there are only two polygons under the crosshair and
+the inner polygon is fully within the outer polygon.
+<p>
+The thindraw or wireframe view mode may be of help in searching such
+overlapping polygons.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/query/tutor_cli.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/query/tutor_cli.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/query/tutor_cli.html	(revision 18980)
@@ -0,0 +1,168 @@
+<html>
+<body>
+
+<H1> advanced search, command line tutorial: query language </H1>
+
+<h2> scope </h2>
+
+pcb-rnd from version 1.1.3 features a flexible advanced search that helps
+the user selecting/unselecting objects that match a given logical expression.
+The core of the feature is the pcb-rnd query language. The same language
+is used in the programmable DRC (see also: <a href="../../../developer/ddrc/proposal1.txt">
+a more formal description of the language</a>).
+<p>
+The current document is a walk through of the practical aspects of the
+language. It starts with the simplest examples while working towards more
+complex cases.
+<p>
+A limited version of the functionality is accessible through a GUI
+wizard when using the GTK HID. A  <a href="tutor_gtk.html">separate
+tutorial</a> is dealing with that feature.
+
+<h2> Actions </h2>
+The query(act, expr) action creates the list called "@", which contains all
+objects of the design. Then it iterates over this list (if needed) and
+evaluates the query expression on each object. For each evaluation "act"
+is performed; "act" is one of:
+<ul>
+	<li> select - add the matching object to the selections if expr evaluated to true
+	<li> unselect - remove the matching object from the selections if expr evaluated to true
+	<li> eval - print the result of the expression to stdout
+	<li> dump - this inhibits evaluating; it compiles the expression and dumps the parse tree (useful for debugging)
+</ul>
+<p>
+The symbol @ in the query represents the iterator, or in other words,
+the <i>current object</i> we are checking. The engine iterates over all
+copper objects, silk objects, pins, holes, layers and nets. A simple query
+that selects all objects looks like this:
+<pre>
+query(select, '@')
+</pre>
+The actual query expression was a single @ in this case. This made
+the iteration happen, got the expression evaluated one each object. The
+result of each evaluation was the given object. Since these objects
+were all existing, valid objects, they were taken as logical value TRUE,
+thus for each the add-to-selection was performed.
+<p>
+Note: it's usually a good idea to write the expression in single quotes, because
+it may contain commas, double quotes and parenthesis that pcb-rnd's action parser may
+take as action syntax.
+<p>
+The same expression can ran with eval would print the result of each
+evaluation:
+<pre>
+query(eval, '@')
+</pre>
+This is visible on the terminal pcb-rnd was started from - on X, it's a good
+idea to start a terminal and run pcb-rnd from that instead from a menu or
+icon. The rest of this tutorial will use the eval query because it's easier
+to include the result of an eval than of a selection. Most examples will
+specify the query expression only, without quotes - the reader should
+add the <i>query(eval, ' ')</i> part.
+
+<H2> iteration vs. evaluate once </h2>
+If an expression does not reference the @ object, no iteration is performed
+and the expression is ran only once:
+<pre>
+query(eval, '1')
+</pre>
+This will calculate the value of 1 and prints it to the standard output. Since
+there's no iteration, this can not result in changes in selection. However,
+it makes it easy to demonstrate some basic concepts of the query language.
+<p>
+Note: if @ is present multiple times in the expression, it's still only
+one loop over all objects. When evaluating the expression for a given object,
+all instances of @ are substituted with the same object in that iteration.
+
+
+<H2> grammar: arithmetics and logics </h2>
+For example the integer and floating point numbers and the usual
+arithmetic and logical operators work as expected:
+
+<table border=1>
+	<tr><th>expression <th> result <th> explanation
+	<tr><td>42         <td> 42     <td> the integer value 42
+	<tr><td>3.14       <td> 3.14   <td> the floating point value 3.14
+	<tr><td>10 mil     <td> 254000 <td> a number with a unit suffix is converted to pcb-rnd's internal coordinate unit (nanometers)
+	<tr><td>1+2        <td> 3      <td> sum of 1 and 2
+	<tr><td>2*4        <td> 8      <td> multiplication
+	<tr><td>47/4       <td> 11     <td> <i>integer</i> division (because both operands were integers)
+	<tr><td>47/4.0     <td> 11.75  <td> <i>floating point</i> division (because at least one of the operands was a float)
+	<tr><td>(1+2)*5    <td> 15     <td> parenthesis works as usual
+	<tr><td>1 &amp;&amp; 0<td> 0   <td> logical AND - the result is 1 if both operands were TRUE, 0 else
+	<tr><td>1 || 0     <td> 1      <td> logical OR  - the result is 1 if either operand was TRUE, 0 else
+	<tr><td>!2         <td> 0      <td> logical NOT - 2 is non-zero, so it is TRUE, negate this to get the result (FALSE, which is 0)
+	<tr><td>4 > 2      <td> 1      <td> because four is greater than two; all the usual relational operators work: == is equal, != is not-equal, &lt;, &lt=,  &gt; and &gt=.
+</table>
+
+<H2> grammar: object properties </h2>
+Object have named properties, e.g. the thickness of a line (or arc, or
+trace in general) is called <i>".thickness"</i>, so the thickness of
+the current object is:
+<pre>
+	@.thickness
+</pre>
+<p>
+Next, we can already select all traces thicker than 10 mil:
+<pre>
+	query(select, '@.thickness &gt; 10 mil')
+</pre>
+<p>
+Because logical expressions are available, it's easy to select all medium-thick
+lines:
+<pre>
+	(@.thickness &gt;= 10 mil) &amp;&amp; (@.thickness &lt;= 30 mil)
+</pre>
+<p>
+or any trace that's too thin or too thick:
+<pre>
+	(@.thickness &lt; 10 mil) || (@.thickness &gt; 30 mil)
+</pre>
+<p>
+or traces that don't match our preferred 8, 10 and 15 mil thickness values:
+<pre>
+	(@.thickness != 8 mil) &amp;&amp; (@.thickness != 10 mil) &amp;&amp; (@.thickness != 15 mil)
+</pre>
+
+<H2> grammar: invalid value </h2>
+But how comes an expression like '@.thickness &gt; 10 mil' works while
+@ iterates over non-trace objects, like layers, nets or subcircuits that
+clearly have no thickness?
+<p>
+The answer is the <i>invalid value</i>, which is neither true nor false. If
+a property does not exist in a given object, the result is the <i>invalid value</i>
+or <i>invalid</i> for short. The invalid is treated specially:
+<ul>
+	<li> in arithmetic operations it propagates: if either operand is invalid, the result is invalid, e.g.  1+invalid = invalid; this affects +, -, *, / and all the relational operators
+	<li> in binary logic operations (&amp;&amp; and ||), it is ignored: it is assumed to be true in a && and false in a || so the outcome depends on the other operand
+	<li> in logical NOT (!), TODO
+</ul>
+When @ refers to a non-trace object, @.thickness is invalid and
+'@.thickness &gt; 10 mil' is evaluated t invalid. If the result is not TRUE,
+the requested action is not performed.
+<p>
+The invalid value is generated only when the expression is valid but the
+actual object doesn't have the feature needed. If the expression is wrong,
+an error is generated and the expression stops evaluating immediately.
+
+<H2> grammar: more properties </h2>
+Some properties are a single numeric value, like thickness, or the
+<i>.name</i> of a layer (which is a string) but others are objects. For
+example the <i>.layer</i> property of a line or arc refers to the layer
+object the given line or arc is drawn on. These in turn can be combined,
+and the "name of the layer the current object is on":
+<pre>
+	@.layer.name
+</pre>
+<p>
+Referencing non-existing properties yields an error, e.g. @.thickness.layer
+is an error - in contrast with @.layer, which may evaluate to the
+<i>invalid value</i> (e.g. for vias or nets, because they don't have layers).
+The difference is that thickness can not have a layer ever (thus is an error)
+while @.layer is either applicable or not, but potentially could work, this
+when it doesn't, it's only an invalid value.
+<p>
+Further useful property combinations:
+TODO
+<p>
+There is a <a href="props.html">full list of all properties</a>.
Index: tags/2.0.1/doc/user/06_feature/scripting/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/index.html	(revision 18980)
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<H1> pcb-rnd fungw scripting - TOC </H1>
+
+<H2> Installation, configuration </H2>
+<UL>
+	<LI> <a href="install.txt"> Installation </a>
+</UL>
+
+
+<H2> High level docs </H2>
+<UL>
+	<LI> <a href="intro.html"> Introduction to scripting </a>
+	<LI> <a href="rosetta/index.html"> Rosetta: example scripts </a>
+</UL>
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/scripting/install.txt
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/install.txt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/install.txt	(revision 18980)
@@ -0,0 +1,10 @@
+Requirements:
+ 1. download and install fungw - svn://repo.hu/fungw/trunk
+ 2. at the moment fungw must be installed as root, into /usr/local/ or /usr (TODO)
+    during configuration, make sure all relevant scripting languages are found
+ 3. (re)configure and (re)compile pcb-rnd so that it uses the system-installed
+    version of fungw instead of the local, no-script version; make sure the
+    "script" plugin is compiled (as builtin or plugin)
+ 4. later on if a new scripting language is required, reconfigure,
+    recompile and reinstall fungw - no pcb-rnd recompilation is needed as
+    long as the system-installed fungw version is not upgraded
Index: tags/2.0.1/doc/user/06_feature/scripting/intro.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/intro.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/intro.html	(revision 18980)
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<H1> Scripting - User Intro </H1>
+This document is an introduction to fungw for pcb-rnd users. It focuses on
+scripting pcb-rnd and doesn't discuss fungw deeper than the minimum necessary.
+Fungw is more generic than shown here.
+
+<H2> 1.1. Stored scripts </H2>
+<p>
+Stored scripts are typically larger piece of works that register actions,
+may create menus, GUI dialog boxes. Their role is to introduce new
+functionality to pcb-rnd - functionality written and shared by users,
+using their favorite script language.
+<p>
+Loading a script using the CLI: run action
+<pre>
+	LoadScript(id, filename, language)
+</pre>
+<p>
+where id is an arbitrary text ID. The ID is used for referencing the script
+once it is loaded. The filename should be a full path (CWD is pcb-rnd's
+CWD). Language must be one of the languages configured in fungw.
+<p>
+Once the script is loaded, it is accessible by calling the actions it
+registered using the standard fgw_func_reg() mechanism.
+<p>
+Scripts can be unloaded using the action
+<pre>
+	UnloadScript(id)
+</pre>
+
+<H2> 1.2. Oneliners </H2>
+<p>
+Note: examples in this section assume pcb-rnd is configured and compiled
+with system <a href="install.txt">installed</a> fungw, and libmawk is also installed
+and the libmawk binding is compiled in fungw.
+<p>
+pcb-rnd also offers script one-liners. A one-liner is a short script
+intended to do one thing at the moment of execution. It is typically not
+saved in a file and is not recalled later. One-liners are invoked by
+the Oneliner action:
+<pre>
+	OneLiner(awk, 'message("hello")')
+</pre>
+<p>
+Alternatively the language-specific shorthand action can be used; the
+following example is equivalent to the above example:
+<pre>
+	awk('message("hello")')
+</pre>
+<p>
+A third approach, most convenient for experimenting, is switching the
+command line interpreter to the given script lagnuage temporarily. For this
+the shorthand action (e.g. "awk", "python", "perl") should be exected without
+arguments. The promp of the cli changes to reflect the language that will
+interpret all the following command lines entered. To leave the script mode,
+type "/exit".
+<p>
+For example:
+<ul>
+	<li> open the command line (pressing ':' with the default menu config)
+	<li> enter <i>awk</i> and press enter - this will switch to awk mode
+	<li> enter <i>for(y=1; y &lt; 10; y += 3) { createtext("#1", 0, "1 mm", y " mm", 0, 100, "foo:" y) } </i>
+	<li> either enter more awk one-liners or leave the awk mode by typing /exit
+</ul>
+<p>
+The one-liner mode can be used to get a better command interpreter. After
+all, any pcb-rnd action is accessible from any scripting language. For
+example the user may choose to switch to awk mode and issue normal
+pcb-rnd actions using the awk syntax. The default mode can even be
+configured through the conf system, by setting rc/cli_backend to the
+language name. However, the CPU and memory footprint of executing a full
+script interpreter for each command entered should be noted.
+<p>
+Limitations: each command line is a separate script context, there are no
+script states (e.g. variables) preserved between lines entered. Actions
+defined in one-liners are also discarded after the one-liner finished. For
+such use cases, stored script shall be written.
+
+
+<H1> Scripting - Developer Intro </H1>
+<p>
+
+<H2> 2.1. The big picture </H2>
+<p>
+The main interface between pcb-rnd internals and the outside world
+(e.g. user interface, scripts) is called actions. An action is typically
+a function with a few arguments that executes a smallish task. The
+actions implemented by pcb-rnd are all functions written in C; some of
+the actions are part of core pcb-rnd, others are implemented in plugins.
+<p>
+GUI operations, menu items, clicking on buttons all call these
+actions. The advantage of this system is that the actions are accessible
+in an user-interface-independent way: the same operations can be done
+with and without GUI, initiated by an user with a mouse or by a script.
+<p>
+Thus the two main aspects of pcb-rnd scripting are:
+<ul>
+	<li> defining new actions in script; actions that then can be called from
+	     the user interface or from other scripts
+	<li> calling pcb-rnd actions from within the script to execute the actual
+	     task
+</ul>
+
+<H2> 2.2. Defining actions </H2>
+<p>
+With fungw, every action is just a native function - the syntax varies
+from scripting language to scripting language (see
+<a href="rosetta/10_hello/"> the rosetta hello world example</a>). The
+arguments of the function are the arguments of the action. The return value
+of the function is the return value of the action.
+<p>
+For the <b>arguments</b>, new actions should try to follow the conventions that
+can be found in already existing
+<a href="../../09_appendix/action_reference.html"> core actions</a>
+for similar purpose.
+<p>
+The <b>return value</b> depends on the purpose of the action. If the
+action is used to calculate something, typically not changing any global
+state (e.g. the board), it should return the value calculated, in whatever
+scalar native data type the scripting language supports. If the action
+is not called to get a value but to perform some changes, the return
+value should be an integer: 0 means success, anything else means error.
+
+<H2> 2.3. Calling actions </H2>
+<p>
+The script may call any action available at a given time, independently
+of whether the action is defined in pcb-rnd core, in plugins or in other
+scripts. In most scripting languages the action call looks like a simple
+function call: function arguments are the action's arguments, the return
+value of the function is the return value generated by the action. The calls
+are all single threaded, blocking calls. The script may use any scalar native
+data type for action arguments without conversion, fungw will take care of
+the conversions automatically.
+
+<H2> 2.4. Action names </H2>
+<p>
+All action names are registered in lowercase version. The script shall
+register lower case function names and action (function) calls should be
+spelled lowercase too.
+
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.desc
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.desc	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.desc	(revision 18980)
@@ -0,0 +1,2 @@
+Create a new action hello() that prints "Hello world!" in the message log.
+
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.name
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.name	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ID.name	(revision 18980)
@@ -0,0 +1 @@
+hello world (text, log)
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.awk
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.awk	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.awk	(revision 18980)
@@ -0,0 +1,12 @@
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+function hello()
+{
+	message("Hello world!\n");
+	return 0
+}
+
+# Register the action - action name matches the function name
+BEGIN {
+	fgw_func_reg("hello")
+}
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.fl
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.fl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.fl	(revision 18980)
@@ -0,0 +1,15 @@
+;; An action without arguments that prints hello world in the log window
+;; Returns 0 for success.
+(define hello
+	(lambda ()
+		(message "Hello world!\n")
+		0
+	)
+)
+
+;; Register the action - action name matches the function name
+(define main
+	(lambda (args)
+		(fgw_func_reg "hello")
+	)
+)
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.html	(revision 18980)
@@ -0,0 +1,7 @@
+Create a function <i>hello</i> that will be registered as an action.
+The name of the action and the function is always the same. Action names
+shall be lowercase.
+<p>
+When the action is called, use <i>message</i> to append a log message.
+<p>
+In the "main" section of the script, register the action using fgw_func_reg().
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.js
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.js	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.js	(revision 18980)
@@ -0,0 +1,10 @@
+// An action without arguments that prints hello world in the log window
+// Returns 0 for success.
+function hello()
+{
+	message("Hello world!\n");
+	return 0
+}
+
+// Register the action - action name matches the function name
+fgw_func_reg("hello")
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.lua
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.lua	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.lua	(revision 18980)
@@ -0,0 +1,9 @@
+-- An action without arguments that prints hello world in the log window
+-- Returns 0 for success.
+function hello()
+	message("Hello world!")
+	return 0
+end
+
+-- register hello() action
+fgw_func_reg("hello")
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.pl
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.pl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.pl	(revision 18980)
@@ -0,0 +1,11 @@
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+sub hello {
+	message("Hello world!\n");
+	return 0;
+}
+
+# Register the action - action name matches the function name
+fgw_func_reg("hello");
+
+
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.py
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.py	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.py	(revision 18980)
@@ -0,0 +1,8 @@
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+def hello():
+	message("Hello world!");
+	return 0
+
+# register hello() action
+fgw_func_reg("hello")
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.rb
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.rb	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.rb	(revision 18980)
@@ -0,0 +1,9 @@
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+def hello()
+	message("Hello world!\n")
+	return 0
+end
+
+# Register the action - action name matches the function name
+fgw_func_reg("hello")
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.sh
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.sh	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.sh	(revision 18980)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+hello()
+{
+	fgw message "Hello world!"
+	return 0
+}
+
+# Register the action - action name matches the function name
+fgw_func_reg "hello"
+
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.stt
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.stt	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.stt	(revision 18980)
@@ -0,0 +1,10 @@
+;; An action without arguments that prints hello world in the log window
+;; Returns 0 for success.
+(defun hello ()
+	(message "Hello world!\n")
+	0
+)
+
+;; Register the action - action name matches the function name
+(fgw_func_reg "hello")
+
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.tcl
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.tcl	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/ex.tcl	(revision 18980)
@@ -0,0 +1,9 @@
+# An action without arguments that prints hello world in the log window
+# Returns 0 for success.
+proc hello {} {
+	message "Hello world!"
+	return 0
+}
+
+# register hello() action
+fgw_func_reg "hello"
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/10_hello/index.html	(revision 18980)
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta hello world (text, log) </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->
+&lt;-- back to the <a href="../index.html">index of Rosetta examples</a>
+<h1>hello world (text, log)</h1>
+Create a new action hello() that prints "Hello world!" in the message log.
+<H2> Example implementations </H2>
+<a href="ex.awk">awk</a>
+ | 
+<a href="ex.fl">fl</a>
+ | 
+<a href="ex.js">js</a>
+ | 
+<a href="ex.lua">lua</a>
+ | 
+<a href="ex.pl">pl</a>
+ | 
+<a href="ex.py">py</a>
+ | 
+<a href="ex.rb">rb</a>
+ | 
+<a href="ex.sh">sh</a>
+ | 
+<a href="ex.stt">stt</a>
+ | 
+<a href="ex.tcl">tcl</a>
+<h2> Explanation, step by step </h2>
+Create a function 
+<i>hello</i>
+ that will be registered as an action. The name of the action and the function is always the same. Action names shall be lowercase. 
+<p> When the action is called, use 
+<i>message</i>
+ to append a log message. 
+<p> In the "main" section of the script, register the action using fgw_func_reg(). 
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/Makefile	(revision 18980)
@@ -0,0 +1,4 @@
+all: FORCE
+	cd ../util && ./rosetta_genpages.sh
+
+FORCE:
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.html	(revision 18980)
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<H1> pcb-rnd scripting - Rosetta </H1>
+The <i><a href="https://en.wikipedia.org/wiki/Rosetta_Stone">Rosetta Stone</a>
+of <a href="../intro.html"> pcb-rnd scripting </a></i> is a collection of example scripts implemented in
+various scripting languages. Rosetta has multiple purposes:
+<ul>
+	<li> to provide examples of using the pcb-rnd API;
+	<li> to not scare away newcomers by showing the first examples in an unfamiliar language;
+	<li> to help the user to decide which language to use for a specific task;
+	<li> to provide examples on how to convert idioms of pcb-rnd scripts from one language to another.
+</ul>
+<p>
+Each example comes with an explanation, written in plain English about what the
+scripts do, step by step. Instead of trying to exploit powerful features
+of the language, example implementations try to be simple.
+<p>
+The list below is ordered from the least complex to the most complex examples.
+Column <i>lvl</i> is the complexity score. The less the score is, the simpler
+the example is.
+
+
+<H2> Index of examples </H2>
+
+
+<table border=1 cellspacing=0 cellpadding=15>
+<tr><th>lvl<th>example <th> languages <th> description
+<tr>
+ <td>10
+ <td><a href="10_hello/index.html">hello world (text, log)</a>
+ <td> awk js lua perl python ruby sh stutter tcl
+ <td>Create a new action hello() that prints &quot;Hello world!&quot; in the message log.
+</table>
+
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.templ.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.templ.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/rosetta/index.templ.html	(revision 18980)
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title> pcb-rnd rosetta </title>
+  <meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+
+<H1> pcb-rnd scripting - Rosetta </H1>
+The <i><a href="https://en.wikipedia.org/wiki/Rosetta_Stone">Rosetta Stone</a>
+of <a href="../intro.html"> pcb-rnd scripting </a></i> is a collection of example scripts implemented in
+various scripting languages. Rosetta has multiple purposes:
+<ul>
+	<li> to provide examples of using the pcb-rnd API;
+	<li> to not scare away newcomers by showing the first examples in an unfamiliar language;
+	<li> to help the user to decide which language to use for a specific task;
+	<li> to provide examples on how to convert idioms of pcb-rnd scripts from one language to another.
+</ul>
+<p>
+Each example comes with an explanation, written in plain English about what the
+scripts do, step by step. Instead of trying to exploit powerful features
+of the language, example implementations try to be simple.
+<p>
+The list below is ordered from the least complex to the most complex examples.
+Column <i>lvl</i> is the complexity score. The less the score is, the simpler
+the example is.
+
+
+<H2> Index of examples </H2>
+
+<rosetta index>
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/scripting/util/Makefile
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/util/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/util/Makefile	(revision 18980)
@@ -0,0 +1 @@
+all:
Index: tags/2.0.1/doc/user/06_feature/scripting/util/rosetta_genpages.sh
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/util/rosetta_genpages.sh	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/util/rosetta_genpages.sh	(revision 18980)
@@ -0,0 +1,182 @@
+#!/bin/sh
+
+clean_id()
+{
+	tr "\r\n" "~" | sed '
+s/~*$//;
+s/|/\&pipe;/g;
+s/&/\&amp;/g;
+s/</\&lt;/g;
+s/>/\&gt;/g;
+s/"/\&quot;/g;
+s/'\''/\&apos;/g;
+s/~\+/<br>/g;
+'
+	echo ""
+}
+
+genpage()
+{
+	local dir scripts name desc
+	
+	dir="$1"
+	scripts="$2"
+
+	name=`cat $dir/ID.name`
+	desc=`cat $dir/ID.desc`
+	./tags < "$dir/ex.html" | awk -v "fn_ref=../packages/XREF" -v "scripts=$scripts" -v "name=$name" -v "desc=$desc" '
+	BEGIN {
+		while((getline < fn_ref) > 0) {
+			REF[$2] = $3
+		}
+		print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+		print "<html>"
+		print "<head>"
+		print "  <title> pcb-rnd rosetta", name, "</title>"
+		print "  <meta http-equiv=\"Content-Type\" content=\"text/html;charset=us-ascii\">"
+		print "</head>"
+		print "<body>"
+		print "<!-- ******* DO NOT EDIT THIS FILE, it is generated by rosetta_genpages.sh ******* -->"
+		print "&lt;-- back to the <a href=\"../index.html\">index of Rosetta examples</a>"
+		print "<h1>" name "</h1>"
+		print desc
+
+		print "<H2> Example implementations </H2>"
+		v = split(scripts, S, "[\r\n]+")
+		for(n = 1; n <= v; n++) {
+			lang=S[n]
+			sub("^ex[.]", "", lang)
+			if (n != 1)
+				print " | "
+			print "<a href=\"" S[n] "\">" lang "</a>"
+		}
+
+		print "<h2> Explanation, step by step </h2>"
+	}
+	/^<ref>/ {
+		gsub("</?ref>", "", $0)
+		name=$0
+		gsub("[ \t]*", "", name)
+		if (name in REF) {
+			link_begin="<a href=\"../" REF[name]  "\">"
+			link_end = "</a>"
+		}
+		else {
+			link_begin=""
+			link_end=""
+		}
+		print "<i>" link_begin $0 link_end "</i>"
+		next
+	}
+
+	{ print $0 }
+
+	END {
+		print "</body>"
+		print "</html>"
+	}
+
+	' > "$dir/index.html"
+}
+
+gen_index()
+{
+
+	awk -v "template=$1" '
+		BEGIN {
+			FS="[|]"
+			q = "\""
+			LANGS["rb"] = "ruby"
+			LANGS["pl"] = "perl"
+			LANGS["py"] = "python"
+			LANGS["stt"] = "stutter"
+			LANGS["scm"] = "scheme"
+		}
+
+		($1 == "scripts") {
+			s = $3
+			gsub("ex[.]", "", s)
+			v = split(s, S, " ")
+			s = ""
+			for(n = 1; n <= v; n++) {
+				if (S[n] in LANGS)
+					s = s " " LANGS[S[n]]
+				else
+					s = s " " S[n]
+			}
+			DATA[$2, $1] = s
+			next
+		}
+
+		($1 == "name") {
+			if (names == "")
+				names = $2
+			else
+				names = names "|" $2
+		}
+
+
+		{
+			# DATA[script, name] = "hello world"
+			DATA[$2, $1] = $3
+		}
+
+		function generate(cmd   ,N,n,v,name,level) {
+			if (cmd == "index") {
+				print "<table border=1 cellspacing=0 cellpadding=15>"
+				print "<tr><th>lvl<th>example <th> languages <th> description"
+				v = split(names, N, "[|]")
+				for(n = 1; n <= v; n++) {
+					name = N[n]
+					level = name
+					sub("_.*", "", level)
+					if (level ~ "[^0-9]")
+						level = "n/a"
+					print "<tr>"
+					print " <td>" level
+					print " <td><a href=" q name "/index.html" q ">" DATA[name, "name"] "</a>"
+					print " <td>" DATA[name, "scripts"]
+					print " <td>" DATA[name, "desc"]
+				}
+				print "</table>"
+			}
+			else
+				print "Do not know how to generate " cmd > "/dev/stderr"
+		}
+
+		END {
+			FS=""
+			while((getline < template) > 0) {
+				if (match($0, "<rosetta[ \t][^>]*>")) {
+					print substr($0, 1, RSTART-1)
+					cmd=substr($0, RSTART+8, RLENGTH-9)
+					sub("^[ \t]*", "", cmd)
+					generate(cmd)
+					print substr($0, RSTART+RLENGTH)
+				}
+				else
+					print $0
+			}
+		}
+	'
+
+}
+
+
+for n in ../rosetta/*
+do
+	if test -d "$n"
+	then
+		bn=`basename $n`
+		scripts=`cd $n && ls ex.* | grep -v ".pyc$\|.html$" `
+		genpage "$n" "$scripts"
+		echo -n "desc|$bn|"
+		clean_id < $n/ID.desc
+		echo -n "name|$bn|"
+		clean_id < $n/ID.name
+		echo -n "scripts|$bn|"
+		echo $scripts
+	fi
+done | gen_index ../rosetta/index.templ.html > ../rosetta/index.html
+
+

Property changes on: tags/2.0.1/doc/user/06_feature/scripting/util/rosetta_genpages.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/scripting/util/tags
===================================================================
--- tags/2.0.1/doc/user/06_feature/scripting/util/tags	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/scripting/util/tags	(revision 18980)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+tr "\n" " " | sed "s@\(<[^/]\)@\n\1@g;s@\(</[^>]*>\)@\1\n@g"
+

Property changes on: tags/2.0.1/doc/user/06_feature/scripting/util/tags
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/06_feature/stroke/arrow.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/arrow.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/arrow.svg	(revision 18980)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="line.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#Arrow2Mend-0)"
+       d="m 63.63961,1041.5788 0,-107.07613"
+       id="path5652"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/index.html	(revision 18980)
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2> Stroke plugin </h2>
+
+<h3> Gestures </h3>
+<p>
+The stroke plugin uses libstroke to recognize mouse gestures. By the
+default menu config gestures are recognized while the right mouse button
+is pressed and the mouse is moved. If no movement happened between press
+and release or the gesture is not recognized, the context menu is open.
+<p>
+What gestures are recognized and what actions are executed for them are
+all configured in stroke.conf. The default configuration coming with the
+plugin defines the gestures listed in the table below. Please note: it is
+important to start the gesture at the specific point relative to the
+subsequent coordinates of the gesture; for example the rotation gestures
+always need to start at the bottom.
+<p>
+<table border=1>
+	<tr><th> gesture drawing           <th> action taken
+	<tr><td> <img src="line.svg">      <td> switch to line drawing mode
+	<tr><td> <img src="arrow.svg">     <td> switch to arrow mode
+	<tr><td> <img src="stopline.svg">  <td> stop drawing a line, polygon contour or polygon hole
+	<tr><td> <img src="via.svg">       <td> switch to via placing mode
+	<tr><td> <img src="rotcw.svg">     <td> rotate the object under the cursor 90 degrees clock-wise
+	<tr><td> <img src="rotccw.svg">    <td> rotate the object under the cursor 90 degrees counter-clock-wise
+	<tr><td> <img src="undo.svg">      <td> undo an operation
+	<tr><td> <img src="redo.svg">      <td> redo an operation
+	<tr><td> <img src="zoom_ext.svg">  <td> zoom to extent (all-board view)
+	<tr><td> <img src="zoom_in.svg">   <td> zoom in to the area between the endpoints of the gesture
+</table>
+
+<h3> Configuration </h3>
+<p>
+The stroke plugin is compiled only if (the development package of)
+libstroke is installed. Any gesture recognition takes place only if
+editor/enable_stroke is set to true (e.g. "1").
+<p>
+The gestures are configured as an ordered list of
+<i>dial-pad-sequence={pcb-rnd-actions}</i> under plugins/stroke/gestures.
+Only the first match is executed; this allows the user to override default
+gestures from user or project or design config.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/06_feature/stroke/line.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/line.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/line.svg	(revision 18980)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="via.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#Arrow2Mend-0)"
+       d="m 63.63961,932.15403 0,107.07617"
+       id="path5652"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/redo.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/redo.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/redo.svg	(revision 18980)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="undo.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
+       d="m 11.364216,929.62865 0,114.39975"
+       id="path5194"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
+       d="m 11.335391,1046.6538 6.313453,0.063 0,-108.02316 95.711956,-0.37873"
+       id="path5194-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/rotccw.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/rotccw.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/rotccw.svg	(revision 18980)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="rotcw.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend-0)"
+       d="m 60.304277,1044.0284 c 28.529238,-0.3785 59.845513,-17.8705 59.977803,-51.64403 -0.43805,-42.47232 -32.409057,-56.23183 -60.987956,-56.94735"
+       id="path6275"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/rotcw.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/rotcw.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/rotcw.svg	(revision 18980)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="stopline.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899997999999988;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend-0)"
+       d="M 70.963216,1045.7962 C 42.433978,1045.4177 11.117699,1027.9257 10.985409,994.15214 11.42346,951.67982 43.39447,937.92031 71.973369,937.20479"
+       id="path6275"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/stopline.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/stopline.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/stopline.svg	(revision 18980)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="arrow.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#Arrow2Mend-0)"
+       d="m 8.8998509,986.89379 107.0761291,0"
+       id="path5652"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/undo.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/undo.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/undo.svg	(revision 18980)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="zoom_in.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
+       d="M 12.374368,10.569767 C 11.524624,74.197054 42.557665,118.23534 67.102598,118.45689 91.904786,118.68076 110.48084,68.77907 112.00066,13.221423"
+       id="path4968"
+       inkscape:connector-curvature="0"
+       transform="translate(0,924.36218)"
+       sodipodi:nodetypes="csc" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/via.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/via.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/via.svg	(revision 18980)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="redo.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-0"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3809-2"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84937406;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 8.5862966,938.97255 64.597151,1046.5142"
+       id="path5425"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.84899998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend-0)"
+       d="M 64.880456,1046.1705 120.89131,938.62884"
+       id="path5425-6"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/zoom_ext.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/zoom_ext.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/zoom_ext.svg	(revision 18980)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="zoom_in.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
+       d="M 115.09823,1040.6863 11.17879,936.76682"
+       id="path4968"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/stroke/zoom_in.svg
===================================================================
--- tags/2.0.1/doc/user/06_feature/stroke/zoom_in.svg	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/stroke/zoom_in.svg	(revision 18980)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="base.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3809"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3791"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3785"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="44.315222"
+     inkscape:cy="69.269835"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1498"
+     inkscape:window-height="934"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.36218)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Mend)"
+       d="M 9.8489873,11.074843 113.76843,114.99429"
+       id="path4968"
+       inkscape:connector-curvature="0"
+       transform="translate(0,924.36218)" />
+  </g>
+</svg>
Index: tags/2.0.1/doc/user/06_feature/vendordrill/index.html
===================================================================
--- tags/2.0.1/doc/user/06_feature/vendordrill/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/06_feature/vendordrill/index.html	(revision 18980)
@@ -0,0 +1,101 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h2 id=""> The vendordrill plugin - Apply Vendor Drills and DRC </h2>
+<p>
+Load and Apply vendor file to the current design.
+
+<h2 id="description"> Description </h2>
+<p>
+Footprint holes are predefined within each footprint and layer
+characteristics are predefined in the layout file. Consequentially, hole
+sizes may vary among footprints or not match a vendor's available drill
+availability unless manually adjusted. Likewise, predefined layout layer
+characteristics may mismatch a vendor's specific requirements. For
+example one type of Through-Hole resistor footprint may have 40mil holes
+while another may have 43.5 mil holes.
+
+<p>
+Some PCB fabricators have a finite set of drill sizes available. In this
+case loading a vendor file will automatically adjust the layout's hole
+sizes to agree with the vendor's drill availability.
+
+<p>
+Many current PCB fabricators offer any drill size within a tolerance with
+just a minimum and maximum. In this case the layout's holes do not need
+to match specific drill sizes but it may be desirable to normalize the
+hole sizes. While the user may want all holes consistent for aesthetic
+reasons there may be a fabrication cost saving if hole sizes are
+consistent. Likewise, design rules, such as trace width and minimum
+separation, can impact fabrication cost. In this situation the drills
+listed in the vendor files would not be specific drill availability but
+rather normalization values.
+
+<p>
+The LoadVendorFrom() Action enables a file of vendor specific fabrication
+requirements to be loaded to the current design. When the vendor file is
+applied, holes will be automatically adjusted to conform to the drill
+sizes listed in the vendor file and layer characteristics will be used in
+any subsequent Design Rule Checks (DRC).  Some critical parts where you
+may not want to change the drill size can be identified to be left alone
+- "skipped".
+
+<h2 id="vendor-file-requirements"> Vendor File Requirements </h2>
+<ul>
+
+	<li> The vendor file is a text file in lihata format. It expects a
+	     <strong>drillmap</strong> section and supports two other sections -
+	     <strong>drc</strong> and <strong>skips</strong>. <strong>Skips</strong>
+	     defines subcircuits to be <em> skipped </em>, hence the name. Skips'
+	     regex patterns may only be defined for "refdes", "value" and
+	     "descr" attributes.
+
+	<li> The file name can be any existing, readable filename. The file name
+	     may be entered in two ways - explicitly or using the standard file load
+	     dialog box of the currently active HID.
+		<ul>
+			<li> LoadVendorFile(your_vendor_filename)
+			<li> LoadVendorFile()
+		</ul>
+
+	<li> Defaults if no entry provided
+		<ul>
+			<li> vendor file = <strong>vendor.lht</strong> (allowed entries:
+			     any readable filename in lihata vendor file format)
+			<li> units = <strong>mil</strong> (allowed entries: mil|mils|inch|inches|mm)
+			<li> round = <strong>up</strong> (allowed entries up|nearest)
+		</ul>
+	</ul>
+
+<h3 id="example-minimal-vendor-file">
+	Example Minimal Vendor File
+</h3>
+<pre><code>    ha:vendor_drill_map {
+  vendor = oshpark  # Optional and can be omitted
+  units = mil      # mil|mils|inch|inches|mm - mil is default
+  round = nearest  # up is default
+  li:drillmap = {
+      20
+      25
+      30
+  }
+  li:skips = {
+      refdes = {^J3$}       # Skip J3.
+      refdes = {^U[1-3]$}   # Skip U1, U2, U3
+  }
+  ha:drc = {
+      copper_space = 7
+      copper_width = 7
+      copper_overlap = 4
+      min_ring = 6
+      silk_width = 10
+      min_drill = 20
+  }
+</code></pre>
+</body>
+</html>
Index: tags/2.0.1/doc/user/07_io/export_openscad/1206.scad
===================================================================
--- tags/2.0.1/doc/user/07_io/export_openscad/1206.scad	(nonexistent)
+++ tags/2.0.1/doc/user/07_io/export_openscad/1206.scad	(revision 18980)
@@ -0,0 +1,15 @@
+module part_1206()
+{
+	translate([0,0,0.3]) {
+		// body
+		color([0.1,0.1,0.1])
+			cube([3.2-2*0.2,1.6,0.6], center=true);
+		// terminals
+		color([0.8,0.8,0.8]) {
+			translate([+1.5, 0, 0])
+				cube([0.2, 1.6, 0.6], center=true);
+			translate([-1.5, 0, 0])
+				cube([0.2, 1.6, 0.6], center=true);
+		}
+	}
+}
Index: tags/2.0.1/doc/user/07_io/export_openscad/preliminary.txt
===================================================================
--- tags/2.0.1/doc/user/07_io/export_openscad/preliminary.txt	(nonexistent)
+++ tags/2.0.1/doc/user/07_io/export_openscad/preliminary.txt	(revision 18980)
@@ -0,0 +1,48 @@
+The openscad exporter generates the 3D model of the board in form of 
+an openscad script.
+
+The main entry point of the script is pcb_board(). All coordinates are in
+mm. The in x and y directions the 0;0 point of the board is the 0;0 point on
+screen in pcb-rnd, to make it easy to wrap the board in a translate() after
+measuring the coords of a point in pcb-rnd. The vertical origin is the middle
+of the board's FR4.
+
+Supported features:
+	- arbitrary shaped outline
+	- top/bottom copper (optional)
+	- top/bottom mask (optional)
+	- top/bottom silk (optional)
+	- holes (optional)
+	- element models (optional)
+
+Element models are loaded from external files referenced from the element
+in the pcb-rnd board file. Model files are searched recursively under the
+footprint library search path.
+
+The element (footprint instance) can have the following openscad related
+attributes, all optional:
+
+ - openscad=filename                  file name of the .scad script (3d element model)
+ - openscad-transformation=script     apply the specified transformation on the model instance
+ - openscad-param=p1,p2,p3...         parameters to pass on to the model
+
+If the openscad attribute is not present, no 3d model is inserted.
+
+If openscad-transformation is specified, it is inserted before the model
+call; it typically contains a transform() and/or a rotate() to modify the
+placement of the model. The 0;0;0 point of the placement is the origin of
+the element in pcb-rnd, on the surface of the board.
+
+If openscad-param is specified, the module is called with this parameter
+list, else the model is called with empty parameter list.
+
+A model file shall contain a single module, with "module" and the arbitrary
+module name in the same line, { in the following line. One instance of
+each model is copied into the output file so that the resulting openscad
+script has no external reference and is self-contained.
+
+
+Known bugs:
+	- with pcb elements it's impossible to tell the rotation; this will
+	  be fully solved only with the subcircuit transition. Until that you
+	  will need to manually specify an openscd-transformation for each element
Index: tags/2.0.1/doc/user/07_io/export_xy/index.html
===================================================================
--- tags/2.0.1/doc/user/07_io/export_xy/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/07_io/export_xy/index.html	(revision 18980)
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 7.x export_xy </h2>
+<p>
+Export_xy is a configurable template based export plugin that prints
+text files. The output contains an optional header, then an optional block
+for each subcircuit and after each such subcircuit block an optional block
+for each terminal in that subcircuit. In pseudo-code:
+<pre>
+print header_template
+foreach <i>subc</i> in subcircuits {
+	print subc_template
+	foreach <i>term</i> in s.terminals {
+		print term_template
+	}
+}
+</pre>
+<p>
+Templates can reference to the current <i>term</i>, the current
+<i>subc</i> and global properties (such as board properties).
+
+<h3> 7.x.1. Template configuration </h3>
+<p>
+Each xy export format has an user assigned <i>ID</i> (which is the short name of the format).
+There is a list of strings in the config tree under plugins/export_xy/templates;
+each item is named as <i>ID</i>.<i>something</i> where <i>something</i> is:
+<ul>
+	<lI> <i>ID</i>.name: the long name of the format (as shown on the UI); mandatory
+	<li> <i>ID</i>.hdr: header template, printed once when the output file is opened; optional
+	<li> <i>ID</i>.subc: subcircuit template, printed once when a subcircuit is entered; optional
+	<li> <i>ID</i>.term: terminal template, printed once for each terminal within each subcircuit; optional
+</ul>
+<p>
+Templates are text strings; they are printed as is, keeping all newlines and
+whitespace. Portions in between % signs are substituted, depending on the
+context.
+
+<h2> Substitution keywords </h2>
+<p>
+<table border=1>
+	<tr><th> keyword                   <th> description
+	<tr><td> %UTC%                     <td> current date and time in UTC
+	<tr><td> %author%                  <td> board author
+	<tr><td> %title%                   <td> board title
+	<tr><td> %suffix%                  <td> coordinate unit (mm or mil)
+	<tr><td> %boardw%                  <td> boward width (unit suffixed coord)
+	<tr><td> %boardh%                  <td> boward height (unit suffixed coord)
+	<tr><td> %subc.a.KEY%              <td> paste the current subcircuit's attribute value of the attribute whose name matches KEY; print "n/a" for non-existing attributes
+	<tr><td> %subc.a.KEY|unk%          <td> same as %subc.a.KEY% but print "unknown" instead of "n/a"
+	<tr><td> %subc.a.KEY?yes%          <td> same as %subc.a.KEY% but print "yes" if attribute value represents true, "n/a" otherwise
+	<tr><td> %subc.a.KEY?yes:nope%     <td> same as %subc.a.KEY% but print "yes" if attribute value represents true, "nope" otherwise
+	<tr><td> %subc.refdes%             <td> print the refdes of the current subcircuit
+	<tr><td> %subc.refdes_%            <td> print the cleaned refdes of the current subcircuit
+	<tr><td> %subc.footprint%          <td> print the footprint name of the current subcircuit
+	<tr><td> %subc.footprint_%         <td> print the cleaned footprint name of the current subcircuit
+	<tr><td> %subc.value%              <td> print the value of the current subcircuit
+	<tr><td> %subc.value_%             <td> print the cleaned value of the current subcircuit
+	<tr><td> %subc.x%                  <td> print the X coordinate of the origin of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.y%                  <td> print the Y coordinate of the origin of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.padx%               <td> print the X coordinate calculated from padstacks of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.pady%               <td> print the Y coordinate calculated from padstacks of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.pad_width%          <td> print the total width calculated from padstacks of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.pad_height%         <td> print the total height calculated from padstacks of the subcircuit (coord with unit suffix)
+	<tr><td> %subc.pad_width_prerot%   <td> print the total width calculated from padstacks of the subcircuit, before applying rotation (coord with unit suffix)
+	<tr><td> %subc.pad_height_prerot%  <td> print the total height calculated from padstacks of the subcircuit, before applying rotation (coord with unit suffix)
+	<tr><td> %subc.rot%                <td> print the subc rotation value in degrees
+	<tr><td> %subc.siderot%            <td> print the subc rotation value in degrees, always looking from the top side, "x-ray mode" (relative to side)
+	<tr><td> %subc.270-rot%            <td> print the subc rotation value in degrees, subtracted from 270
+	<tr><td> %subc.side270-rot%        <td> print the subc rotation value in degrees, always looking from the top side, "x-ray mode", subtracted from 270 (relative to side)
+	<tr><td> %subc.side%               <td> "top" or "bottom" (determined by subc placement, the subc aux layer)
+	<tr><td> %subc.num-side%           <td> "1" for top or "2" for bottom (determined by subc placement, the subc aux layer)
+	<tr><td> %subc.count%              <td> integer value, incremented by one before processing each subcircuit
+	<tr><td> %subc.smdvsthru%          <td> "SMD" if contains padstacks but no padstack with hole; "PTH" if contains padstack with hole; "0" if neither
+	<tr><td> %subc.smdvsthrunum%       <td> "2" if contains padstacks but no padstack with hole; "1" if contains padstack with hole; "0" if neither
+	<tr><td> %subc.pincout%            <td> "pin" or "pad" count. Do not use.
+	<tr><td> %term.netname%            <td> name of the net the current terminal should be connected to according to the netlist; "NC" for no connection
+</table>
+
+<p>
+<i>Cleaned</i> means any character that is non-alphanumeric, not "." and not "-"
+and not "+" is replaced with "_".
Index: tags/2.0.1/doc/user/08_util/01_gsch2pcb-rnd.htm
===================================================================
--- tags/2.0.1/doc/user/08_util/01_gsch2pcb-rnd.htm	(nonexistent)
+++ tags/2.0.1/doc/user/08_util/01_gsch2pcb-rnd.htm	(revision 18980)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> 2. Utilities  </h2>
+<p>
+<h2> 2.1. gsch2pcb-rnd </h2>
+<p>
+Gsch2pcb-rnd is a standalone utility that can extract netlists and
+element data from a schematics produced by gschem. Thus it is a glue
+between gschem and pcb-rnd, doing <i>forward annotation</i>. It is ideal
+for automating the design process as it can be easily called from
+Makefiles, shell scripts or other programs/scripts, whereas the
+"import schematics" feautre (import_sch plugin) is more geared for the
+GUI user.
+<p>
+Multiple <i>methods</i> of operation are offered - the user can select
+one of these by name, using the -m command line argument (e.g.
+<i>gsch2pcb-rnd -m importsep foo.sch</i>):
+<table border="1">
+	<tr>
+		<td> method name
+		<td> description
+	<tr>
+		<td> import
+		<td> Runs the same gnetlist backend as the import_sch plugin. A single
+		     action command file generated with .cmd suffix. When executed
+		     (using action <i>ExcuteFile(foo.cmd)</i>), it syncs (replaces/creates)
+		     every element and sets up all nets. Pro: single-command import.
+		     Con: can't load netlist only or elements only.
+	<tr>
+		<td> importsep
+		<td> Similar to import, but produces two files: a .cmd file with element
+		     updates only (can be appled the same way as import's) and a
+		     separate .net netlist file that can be imported the same way as the
+		     .net of the pcb method. Pro: the user can update elements-only or
+		     nets-only. Con: requires two user actions to get a full impoty.
+	<tr>
+		<td> <strike>pcb</strike>
+		<td> The classic approach that tried to edit the .pcb file.
+		     <b>No longer supported</b>.
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/user/08_util/install_cgi.html
===================================================================
--- tags/2.0.1/doc/user/08_util/install_cgi.html	(nonexistent)
+++ tags/2.0.1/doc/user/08_util/install_cgi.html	(revision 18980)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+</head>
+<body>
+<h1> Installation of the footprint CGIs </h1>
+<h2> system requirements, 3rd party software </h2>
+	The following software needs to be installed on the system
+	that will host the scripts:
+	<ul>
+		<li> /bin/bash (did not test with POSIX shell)
+		<li> awk (tested with gawk, may work with other modern implementation)
+		<li> common binutils, e.g. ls, find
+		<li> <a href="http://repo.hu/projects/animator">animator</a>, the svn HEAD version; NOTE: it is possible to manually compile animator into a static executable (useful on dedicated web servers)
+		<li> a web server that can execute plain old CGI scripts
+		<li> a full checkout of pcb-rnd/trunk from svn://repo.hu/pcb-rnd/trunk
+	</ul>
+
+<h2> Installation </h2>
+Since the CGIs are just demo scripts for repo.hu and are not really installed
+anywhere else normally, there is no install script but a manual installation
+process. For both the parametric and the static footprint CGI:
+<ol>
+	<li> check out pcb-rnd/trunk in a directory readable (but not writable) by www-data (or whatever user the CGI will run with)
+	<li> copy the config file pcblib.cgi.conf from pcb-rnd/trunk/util to /etc
+	<li> edit the config file; ignore setting sdir for now
+	<li> hardlink, copy, or wrap the cgi files from under pcb-rnd/trunk/util into the web server's CGI directory
+</ol>
+<p>
+For the static footprint CGI (set up the map cache):
+<ol>
+	<li> cd to trunk/util/pcblib-map in the checkout and run make - NOTE: some awk scripts have hardwired CGI paths yet (TODO)
+	<li> copy this directory to a web-accessible directory
+	<li> set sdir to the absolute path of the web-accessible copy in /etc/pcblib.cgi.conf
+</ol>
+
+<h2> Tips and tricks </h2>
+<h3> cgi wrapping </h3>
+Making the checkout directly into the cgi-bin dir is not a good idea. Using
+a hard link on each CGI between the checkout and the cgi-bin dir is better,
+but an svn up will silently break the link leaving the old version live.
+The most stable solution is placing a wrapper script in the cgi-bin dir:
+<pre>
+#!/bin/bash
+. /full/path/to/the/checkout/util/pcblib-param.cgi
+</pre>
+</body>
+</html>
Index: tags/2.0.1/doc/user/09_appendix/action_reference.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/action_reference.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/action_reference.html	(revision 18980)
@@ -0,0 +1,1392 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> pcb-rnd user manual </title>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<link rel="stylesheet" type="text/css" href=" ../default.css">
+</head>
+<body>
+<p>
+<h2> Pcb-rnd Action Reference</h2>
+<table border=1>
+<caption><b>
+This is pcb-rnd 2.0.0 (svn r17732),  an interactive printed circuit board editor
+</b>
+<th>Action<th> Description <th> Syntax
+<tr><td> Cursor </td>
+<td>Move the cursor.</td>
+<td>Cursor(Type,DeltaUp,DeltaRight,Units)</td>
+<tr><td> ChkLayer </td>
+<td>Returns 1 if the specified layer is the active layer</td>
+<td>ChkLayer(layerid)</td>
+<tr><td> aligntext </td>
+<td>Align Text Elements</td>
+<td>AlignText(X/Y, [Lefts/Rights/Tops/Bottoms/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])</td>
+<tr><td> Attributes </td>
+<td>Let the user edit the attributes of the layout, current or given<br>layer, or selected subcircuit.</td>
+<td>Attributes(Layout|Layer|Element|Subc)<br>Attributes(Layer,layername)</td>
+<tr><td> Cursor </td>
+<td>Move the cursor.</td>
+<td>Cursor(Type,DeltaUp,DeltaRight,Units)</td>
+<tr><td> PrintCalibrate </td>
+<td>Calibrate the printer.</td>
+<td>PrintCalibrate()</td>
+<tr><td> ChangePaste </td>
+<tr><td> PolyCombine </td>
+<tr><td> ruby </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> forcecolor </td>
+<td>change selected objects' color to #RRGGBB, reset if does not start with '#'</td>
+<td>forcecolor(#RRGGBB)</td>
+<tr><td> LoadIpc356From </td>
+<td>Loads the specified IPC356-D netlist</td>
+<td>LoadIpc356From(filename, [nonet], [nopad], [nosubc])</td>
+<tr><td> ToggleView </td>
+<td>Toggle the visibility of the specified layer or layer group.</td>
+<td>ToggleView(1..MAXLAYER)<br>ToggleView(layername)<br>ToggleView(Silk|Rats|Pins|Vias|BackSide)<br>ToggleView(All, Open|Vis, Set|Clear|Toggle)</td>
+<tr><td> LoadTedaxFrom </td>
+<td>Loads the specified block from a tedax file. Type can be: netlist or footprint.</td>
+<td>LoadTedaxFrom(netlist|footprint, filename)</td>
+<tr><td> EditLayer </td>
+<td>Change a property or attribute of a layer. If the first argument starts with @, it is taken as the layer name to manipulate, else the action uses the current layer. Without arguments or if only a layer name is specified, interactive runs editing.</td>
+<td>Editlayer([@layer], [name=text|auto=[0|1]|sub=[0|1])]<br>Editlayer([@layer], attrib, key=value)</td>
+<tr><td> CreateMenu </td>
+<td>Creates a new menu, popup (only path specified) or submenu (at least path and action are specified)</td>
+<td>CreateMenu(path)<br>CreateMenu(path, action, mnemonic, accel, tooltip, cookie)</td>
+<tr><td> Message </td>
+<td>Writes a message to the log window.</td>
+<td>message(message)</td>
+<tr><td> LoadHpglFrom </td>
+<td>Loads the specified hpgl plot file to the current buffer</td>
+<td>LoadHpglFrom(filename)</td>
+<tr><td> PrintUsage </td>
+<td>Print command line arguments of pcb-rnd or a plugin loaded.</td>
+<td>PrintUsage()<br>PrintUsage(plugin)</td>
+<tr><td> LoadFpcbnlFrom </td>
+<td>Loads the specified freepcb netlist.</td>
+<td>LoadFpcbnlFrom(filename)</td>
+<tr><td> python </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> stroke </td>
+<td>Various gesture recognition related functions</td>
+<td>stroke(gesture, seq)</td>
+<tr><td> PasteBuffer </td>
+<td>Various operations on the paste buffer.</td>
+<td>PasteBuffer(AddSelected|Clear|1..PCB_MAX_BUFFER)<br>PasteBuffer(Rotate, 1..3)<br>PasteBuffer(Convert|Restore|Mirror)<br>PasteBuffer(ToLayout, X, Y, units)<br>PasteBuffer(ToLayout, crosshair)<br>PasteBuffer(Save, Filename, [format], [force])<br>PasteBuffer(Push)<br>PasteBuffer(Pop)</td>
+<tr><td> LoadhypFrom </td>
+<td>Loads the specified Hyperlynx file.</td>
+<td>LoadhypFrom(filename[, "debug"]...)</td>
+<tr><td> RenumberBlock </td>
+<td>TODO</td>
+<td>RenumberBlock(old_base,new_base)</td>
+<tr><td> ExpFeatTmp </td>
+<td>Experimental Feature Template.</td>
+<td>ExpFeatTmp(...)</td>
+<tr><td> ToggleHideName </td>
+<tr><td> conf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>conf(set, path, value, [role], [policy]) - change a config setting to an absolute value<br>conf(delta, path, value, [role], [policy]) - change a config setting by a delta value (numerics-only)<br>conf(toggle, path, [role]) - invert boolean value of a flag; if no role given, overwrite the highest prio config<br>conf(reset, role) - reset the in-memory lihata of a role<br>conf(iseq, path, value) - returns whether the value of a conf item matches value (for menu checked's)</td>
+<tr><td> ReplaceFootprint </td>
+<td>Replace the footprint of the selected components with the footprint specified.</td>
+<td>ReplaceFootprint()</td>
+<tr><td> python </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> DumpCsect </td>
+<td>Print the cross-section of the board (layer stack)</td>
+<td>DumpCsect()</td>
+<tr><td> stroke </td>
+<td>Various gesture recognition related functions</td>
+<td>stroke(gesture, seq)</td>
+<tr><td> ChangeFlag </td>
+<td>Sets or clears flags on objects.</td>
+<td>ChangeFlag(Object|Selected|SelectedObjects, flag, value)<br>ChangeFlag(SelectedLines|SelectedPins|SelectedVias, flag, value)<br>ChangeFlag(SelectedPads|SelectedTexts|SelectedNames, flag, value)<br>ChangeFlag(SelectedElements, flag, value)<br>flag = thermal | join<br>value = 0 | 1</td>
+<tr><td> Redo </td>
+<td>Redo recent "undo" operations.</td>
+<td>redo()</td>
+<tr><td> SavePatch </td>
+<td>Save netlist patch for back annotation.</td>
+<td>SavePatch(filename)</td>
+<tr><td> ChangeAngle </td>
+<td>Changes the start angle, delta angle or both angles of an arc.</td>
+<td>ChangeAngle(Object, start|delta|both, delta)<br>ChangeAngle(SelectedObjects|Selected, start|delta|both, delta)<br>ChangeAngle(SelectedArcs, start|delta|both, delta)</td>
+<tr><td> DumpLibrary </td>
+<td>Display the entire contents of the libraries.</td>
+<td>DumpLibrary()</td>
+<tr><td> GetXY </td>
+<td>Get a coordinate.</td>
+<td>GetXY()</td>
+<tr><td> FreeRotateBuffer </td>
+<td>Rotates the current paste buffer contents by the specified angle.  The<br>angle is given in degrees.  If no angle is given, the user is prompted<br>for one.</td>
+<td>FreeRotateBuffer([Angle])</td>
+<tr><td> subc </td>
+<td>Various operations on subc</td>
+<td>subc(hash, [board|selected])<br>subc(loose, on|off|toggle|check)</td>
+<tr><td> BoardFlip </td>
+<td>Mirror the board over the x axis, optionally mirroring sides as well.</td>
+<td>BoardFlip([sides])</td>
+<tr><td> dumpdata </td>
+<td>Dump an aspect of the data</td>
+<td>dumpdata()</td>
+<tr><td> propedit </td>
+<td>Run the property editor</td>
+<td>propedit()</td>
+<tr><td> LoadLtspiceFrom </td>
+<td>Loads the specified ltspice .net and .asc file - the netlist must be mentor netlist.</td>
+<td>LoadLtspiceFrom(filename)</td>
+<tr><td> SetSquare </td>
+<tr><td> Brave </td>
+<td>Changes brave settings.</td>
+<td>Brave()<br>Brave(setting, on|off)</td>
+<tr><td> MarkCrosshair </td>
+<td>Set/Reset the pcb_crosshair mark.</td>
+<td>MarkCrosshair()<br>MarkCrosshair(Center)</td>
+<tr><td> DumpActions </td>
+<td>Dump all actions available.</td>
+<td>DumpActions()</td>
+<tr><td> RouteStylesChanged </td>
+<td>Tells the GUI that the routing styles have changed.</td>
+<td>RouteStylesChanged()</td>
+<tr><td> GlobalPuller </td>
+<td>Pull all traces tight.</td>
+<td>pcb_act_GlobalPuller([Found|Selected])</td>
+<tr><td> Renumber </td>
+<td>Renumber all subcircuits.  The changes will be recorded to filename<br>for use in backannotating these changes to the schematic.</td>
+<td>Renumber()<br>Renumber(filename)</td>
+<tr><td> dlg_test </td>
+<td>test the attribute dialog</td>
+<td>dlg_test()</td>
+<tr><td> OptAutoOnly </td>
+<td>Toggles the optimize-only-autorouted flag.</td>
+<td>OptAutoOnly()</td>
+<tr><td> distribute </td>
+<td>Distribute subcircuits</td>
+<td>Distribute(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])</td>
+<tr><td> query </td>
+<td>Perform various queries on PCB data.</td>
+<td>query(dump, expr) - dry run: compile and dump an expression</td>
+<tr><td> Delete </td>
+<td>Delete stuff.</td>
+<td>Delete(Object|Selected)<br>Delete(AllRats|SelectedRats)</td>
+<tr><td> Bell </td>
+<td>Attempt to produce audible notification (e.g. beep the speaker).</td>
+<td>Bell()</td>
+<tr><td> skretriangulate </td>
+<td>Reconstruct CDT on all layer groups</td>
+<td>skretriangulate()</td>
+<tr><td> trim </td>
+<td>Use one or more objects as cutting edge and trim or split other objects. First argument is the cutting edge</td>
+<td>trim([selected|found|object], [selected|found|object])<br>split([selected|found|object], [selected|found|object])</td>
+<tr><td> Undo </td>
+<td>Undo recent changes.</td>
+<td>undo()<br>undo(ClearList)</td>
+<tr><td> PCBChanged </td>
+<td>Tells the GUI that the whole PCB has changed. The optional "revert"parameter can be used as a hint to the GUI that the same design is beingreloaded, and that it might keep some viewport settings</td>
+<td>PCBChanged([revert])</td>
+<tr><td> Debug </td>
+<td>Debug action.</td>
+<td>Debug(...)</td>
+<tr><td> h </td>
+<td>Print a help message for commands.</td>
+<td>h</td>
+<tr><td> LayerBinding </td>
+<td>Change the layer binding.</td>
+<td>LayerBinding(object)<br>LayerBinding(selected)<br>LayerBinding(buffer)</td>
+<tr><td> m </td>
+<td>Loads a layout into the current buffer.</td>
+<td>m [name]</td>
+<tr><td> circle </td>
+<td>Generate a filled circle (zero length round cap line)</td>
+<td>circle([where,] diameter)</td>
+<tr><td> l </td>
+<td>Loads layout data.</td>
+<td>l [name] [format]</td>
+<tr><td> Delete </td>
+<td>Delete stuff.</td>
+<td>Delete(Object|Selected)<br>Delete(AllRats|SelectedRats)</td>
+<tr><td> q </td>
+<td>Quits the application after confirming.</td>
+<td>q</td>
+<tr><td> SetValue </td>
+<td>Change various board-wide values and sizes.</td>
+<td>SetValue(Grid|Line|LineSize|Text|TextScale, delta)</td>
+<tr><td> s </td>
+<td>Saves layout data.</td>
+<td>s [name]<br>w [name]</td>
+<tr><td> Message </td>
+<td>Writes a message to the log window.</td>
+<td>message(message)</td>
+<tr><td> w </td>
+<td>Saves layout data.</td>
+<td>s [name]<br>w [name]</td>
+<tr><td> MoveObject </td>
+<td>Moves the object under the crosshair.</td>
+<td>pcb_move_obj(X,Y,[units])</td>
+<tr><td> SetUnits </td>
+<td>Set the default measurement units.</td>
+<td>SetUnits(mm|mil)</td>
+<tr><td> LoadLtspiceFrom </td>
+<td>Loads the specified ltspice .net and .asc file - the netlist must be mentor netlist.</td>
+<td>LoadLtspiceFrom(filename)</td>
+<tr><td> PadstackPlace </td>
+<td>Place a pad stack (either proto_id, or if not specified, the default for style)</td>
+<td>PadstackPlace([proto_id|default], [x, y])</td>
+<tr><td> SetSame </td>
+<td>Sets current layer and sizes to match indicated item.</td>
+<td>SetSame()</td>
+<tr><td> PrintActions </td>
+<td>Print all actions available.</td>
+<td>PrintActions()</td>
+<tr><td> dumplayers </td>
+<td>Print info about each layer</td>
+<td>dumplayers([all])</td>
+<tr><td> LibraryChanged </td>
+<td>Tells the GUI that the libraries have changed.</td>
+<td>LibraryChanged()</td>
+<tr><td> dumpfonts </td>
+<td>Print info about fonts</td>
+<td>dumpfonts()</td>
+<tr><td> circle </td>
+<td>Generate a filled circle (zero length round cap line)</td>
+<td>circle([where,] diameter)</td>
+<tr><td> autocrop </td>
+<td>Autocrops the board dimensions to (extants + a margin of 1 grid), keeping the move and board size grid aligned</td>
+<td>autocrop()</td>
+<tr><td> ChangePinName </td>
+<td>Sets the name of a specific pin on a specific subcircuit.</td>
+<td>ChangePinName(Refdes,PinNumber,PinName)</td>
+<tr><td> ChkGridSize </td>
+<td>Return 1 if the currently selected grid matches the expected_size. If argument is "none" return 1 if there is no grid.</td>
+<td>ChkGridSize(expected_size)<br>ChkGridSize(none)</td>
+<tr><td> LoadTinycadFrom </td>
+<td>Loads the specified tinycad .net file - the netlist must be tinycad netlist output.</td>
+<td>LoadTinycadFrom(filename)</td>
+<tr><td> Return </td>
+<td>Simulate a passing or failing action.</td>
+<td>Return(0|1)</td>
+<tr><td> Normalize </td>
+<td>Move all objects within the drawing area, align the drawing to 0;0</td>
+<td>Normalize()</td>
+<tr><td> ReportObject </td>
+<td>Report on the object under the crosshair</td>
+<td>ReportObject()</td>
+<tr><td> skretriangulate </td>
+<td>Reconstruct CDT on all layer groups</td>
+<td>skretriangulate()</td>
+<tr><td> ChangeClearSize </td>
+<td>Changes the clearance size of objects.</td>
+<td>ChangeClearSize(Object, delta|style)<br>ChangeClearSize(SelectedPins|SelectedPads|SelectedVias, delta|style)<br>ChangeClearSize(SelectedLines|SelectedArcs, delta|style)<br>ChangeClearSize(Selected|SelectedObjects, delta|style)</td>
+<tr><td> ChkView </td>
+<td>Return 1 if layerid is visible.</td>
+<td>ChkView(layerid)</td>
+<tr><td> LoadVendorFrom </td>
+<td>Loads the specified vendor lihata file.</td>
+<td>LoadVendorFrom(filename)</td>
+<tr><td> LoadMentorFrom </td>
+<td>Loads the specified Mentor Graphics Design Capture schematics flat .edf file.</td>
+<td>LoadMentorFrom(filename)</td>
+<tr><td> ChkSubcID </td>
+<td>Return 1 if currently shown subc ID matches the requested pattern</td>
+<td>ChkSubcID(pattern)</td>
+<tr><td> dumpconf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>dumpconf(native, [verbose], [prefix]) - dump the native (binary) config tree to stdout<br>dumpconf(lihata, role, [prefix]) - dump in-memory lihata representation of a config tree</td>
+<tr><td> Return </td>
+<td>Simulate a passing or failing action.</td>
+<td>Return(0|1)</td>
+<tr><td> ChangeSize </td>
+<td>Changes the size of objects.</td>
+<td>ChangeSize(Object, delta|style)<br>ChangeSize(SelectedObjects|Selected, delta|style)<br>ChangeSize(SelectedLines|SelectedPins|SelectedVias, delta|style)<br>ChangeSize(SelectedPads|SelectedTexts|SelectedNames, delta|style)<br>ChangeSize(SelectedElements, delta|style)</td>
+<tr><td> ListScripts </td>
+<td>List a fungw script</td>
+<td>ListScripts([pat])</td>
+<tr><td> ToggleVendor </td>
+<td>Toggles the state of automatic drill size mapping.</td>
+<td>ToggleVendor()</td>
+<tr><td> rehash </td>
+<td>Reload all gpmi scripts</td>
+<td>TODO</td>
+<tr><td> FlagEdit </td>
+<td>Change the layer binding.</td>
+<td>FlagEdit(object)</td>
+<tr><td> About </td>
+<td>Present the about box</td>
+<td>About()</td>
+<tr><td> MinMaskGap </td>
+<tr><td> Flip </td>
+<td>Flip a subcircuit to the opposite side of the board.</td>
+<td>Flip(Object|Selected)</td>
+<tr><td> rehash </td>
+<td>Reload all gpmi scripts</td>
+<td>TODO</td>
+<tr><td> ExecCommand </td>
+<td>Run shell command</td>
+<td>System(shell_cmd)</td>
+<tr><td> LoadTinycadFrom </td>
+<td>Loads the specified tinycad .net file - the netlist must be tinycad netlist output.</td>
+<td>LoadTinycadFrom(filename)</td>
+<tr><td> EditGroup </td>
+<td>Change a property or attribute of a layer group. If the first argument starts with @, it is taken as the group name to manipulate, else the action uses the current layer's group. Without arguments or if only a layer name is specified, interactive runs editing.</td>
+<td>Editgroup([@group], [name=text|type=+bit|type=-bit])]<br>Editlayer([@layer], attrib, key=value)</td>
+<tr><td> PrintCalibrate </td>
+<td>Calibrate the printer.</td>
+<td>PrintCalibrate()</td>
+<tr><td> ChangeRadius </td>
+<td>Changes the width or height (radius) of an arc.</td>
+<td>ChangeRadius(Object, width|x|height|y|both, delta)<br>ChangeRadius(SelectedObjects|Selected, width|x|height|y|both, delta)<br>ChangeRadius(SelectedArcs, width|x|height|y|both, delta)</td>
+<tr><td> AutoPlaceSelected </td>
+<td>Auto-place selected components.</td>
+<td>AutoPlaceSelected()</td>
+<tr><td> ChangeClearSize </td>
+<td>Changes the clearance size of objects.</td>
+<td>ChangeClearSize(Object, delta|style)<br>ChangeClearSize(SelectedPins|SelectedPads|SelectedVias, delta|style)<br>ChangeClearSize(SelectedLines|SelectedArcs, delta|style)<br>ChangeClearSize(Selected|SelectedObjects, delta|style)</td>
+<tr><td> fp_rehash </td>
+<td>Flush the library index; rescan all library search paths and rebuild the library index. Useful if there are changes in the library during a pcb-rnd session.</td>
+<td>fp_rehash()</td>
+<tr><td> EnableVendor </td>
+<td>Enables automatic drill size mapping.</td>
+<td>EnableVendor()</td>
+<tr><td> LoadIpc356From </td>
+<td>Loads the specified IPC356-D netlist</td>
+<td>LoadIpc356From(filename, [nonet], [nopad], [nosubc])</td>
+<tr><td> SetOctagon </td>
+<tr><td> Quit </td>
+<td>Quits the application after confirming.</td>
+<td>Quit()</td>
+<tr><td> DelGroup </td>
+<td>Remove a layer group; if the first argument is not specified, the current group is removed</td>
+<td>DelGroup([@group])</td>
+<tr><td> LoadDsnFrom </td>
+<td>Loads the specified routed dsn file.</td>
+<td>LoadDsnFrom(filename)</td>
+<tr><td> MinClearGap </td>
+<td>Ensures that polygons are a minimum distance from objects.</td>
+<td>MinClearGap(delta)<br>MinClearGap(Selected, delta)</td>
+<tr><td> SetSame </td>
+<td>Sets current layer and sizes to match indicated item.</td>
+<td>SetSame()</td>
+<tr><td> DisableVendor </td>
+<td>Disables automatic drill size mapping.</td>
+<td>DisableVendor()</td>
+<tr><td> LoadFpcbnlFrom </td>
+<td>Loads the specified freepcb netlist.</td>
+<td>LoadFpcbnlFrom(filename)</td>
+<tr><td> LoadFontFrom </td>
+<td>Load PCB font from a file</td>
+<td>LoadFontFrom([file, id])</td>
+<tr><td> dumpundo </td>
+<td>Print info about fonts</td>
+<td>dumpfonts()</td>
+<tr><td> LoadMucsFrom </td>
+<td>Loads the specified mucs routing file.</td>
+<td>LoadMucsFrom(filename)</td>
+<tr><td> ChangeHole </td>
+<tr><td> ChangeDrillSize </td>
+<td>Changes the drilling hole size of objects.</td>
+<td>ChangeDrillSize(Object, delta|style)<br>ChangeDrillSize(SelectedPins|SelectedVias|Selected|SelectedObjects, delta|style)</td>
+<tr><td> ChkView </td>
+<td>Return 1 if layerid is visible.</td>
+<td>ChkView(layerid)</td>
+<tr><td> FontSave </td>
+<td>Convert the current PCB back to a font.</td>
+<td>FontSave()</td>
+<tr><td> ruby </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> DeleteRats </td>
+<td>Delete rat lines.</td>
+<td>DeleteRats(AllRats|Selected|SelectedRats)</td>
+<tr><td> split </td>
+<td>Use one or more objects as cutting edge and trim or split other objects. First argument is the cutting edge</td>
+<td>trim([selected|found|object], [selected|found|object])<br>split([selected|found|object], [selected|found|object])</td>
+<tr><td> PadstackEdit </td>
+<td>interactive pad stack editor</td>
+<td>PadstackEdit(object, [tab])</td>
+<tr><td> GetXY </td>
+<td>Get a coordinate.</td>
+<td>GetXY()</td>
+<tr><td> javascript </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> LoadFrom </td>
+<td>Load layout data from a file.</td>
+<td>LoadFrom(Layout|LayoutToBuffer|SubcToBuffer|Netlist|Revert,filename[,format])</td>
+<tr><td> d1 </td>
+<td>debug action for development</td>
+<td>d1()</td>
+<tr><td> PadstackBreakup </td>
+<td>Break up a padstack into one non-padstack object per layer type (the hole is ignored)</td>
+<td>PadstackBreakup(buffer|selected|objet)</td>
+<tr><td> PadstackConvert </td>
+<td>Convert selection or current buffer to padstack</td>
+<td>PadstackConvert(buffer|selected, [originx, originy])</td>
+<tr><td> ChkGridUnits </td>
+<td>Return 1 if currently selected grid unit matches the expected (normally mm or mil)</td>
+<td>ChkGridUnits(expected)</td>
+<tr><td> Oneliner </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> SaveFontTo </td>
+<td>Save PCB font to a file</td>
+<td>SaveFontTo([file, id])</td>
+<tr><td> GetStyle </td>
+<td>Return integer index (>=0) of the currently active style or -1 if no style is selected (== custom style)</td>
+<td>GetStyle()</td>
+<tr><td> conf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>conf(set, path, value, [role], [policy]) - change a config setting to an absolute value<br>conf(delta, path, value, [role], [policy]) - change a config setting by a delta value (numerics-only)<br>conf(toggle, path, [role]) - invert boolean value of a flag; if no role given, overwrite the highest prio config<br>conf(reset, role) - reset the in-memory lihata of a role<br>conf(iseq, path, value) - returns whether the value of a conf item matches value (for menu checked's)</td>
+<tr><td> Brave </td>
+<td>Changes brave settings.</td>
+<td>Brave()<br>Brave(setting, on|off)</td>
+<tr><td> AutoRoute </td>
+<td>Auto-route some or all rat lines.</td>
+<td>AutoRoute(AllRats|SelectedRats)</td>
+<tr><td> ExportGUI </td>
+<td>Open the export dialog.</td>
+<td>ExportGUI()</td>
+<tr><td> RouteStyle </td>
+<td>Copies the indicated routing style into the current pen.</td>
+<td>RouteStyle(style_id|style_name)</td>
+<tr><td> Attributes </td>
+<td>Let the user edit the attributes of the layout, current or given<br>layer, or selected subcircuit.</td>
+<td>Attributes(Layout|Layer|Element|Subc)<br>Attributes(Layer,layername)</td>
+<tr><td> q! </td>
+<td>Quits the application without confirming.</td>
+<td>q!</td>
+<tr><td> ChangeDrillSize </td>
+<td>Changes the drilling hole size of objects.</td>
+<td>ChangeDrillSize(Object, delta|style)<br>ChangeDrillSize(SelectedPins|SelectedVias|Selected|SelectedObjects, delta|style)</td>
+<tr><td> acompnet </td>
+<td>Attempt to auto-complete the current network</td>
+<td>acompnet()</td>
+<tr><td> DumpPluginDirs </td>
+<td>Print plugins directories in a format digestable by scripts.</td>
+<td>DumpPluginDirs()</td>
+<tr><td> ReplaceFootprint </td>
+<td>Replace the footprint of the selected components with the footprint specified.</td>
+<td>ReplaceFootprint()</td>
+<tr><td> ElementSetAttr </td>
+<td>Sets or clears an element-specific attribute.</td>
+<td>ElementSetAttr(refdes,name[,value])</td>
+<tr><td> LoadFootprint </td>
+<td>Loads a single footprint by name.</td>
+<td>pcb_load_footprint(filename[,refdes,value])</td>
+<tr><td> Connection </td>
+<td>Searches connections of the object at the cursor position.</td>
+<td>Connection(Find|ResetLinesAndPolygons|ResetPinsAndVias|Reset)</td>
+<tr><td> smartdisperse </td>
+<td>TODO</td>
+<td>SmartDisperse([All|Selected])</td>
+<tr><td> subc </td>
+<td>Various operations on subc</td>
+<td>subc(hash, [board|selected])<br>subc(loose, on|off|toggle|check)</td>
+<tr><td> Rotate90 </td>
+<td>Rotates the object under the crosshair by 90 degree steps.</td>
+<td>pcb_move_obj(steps)</td>
+<tr><td> DumpCsect </td>
+<td>Print the cross-section of the board (layer stack)</td>
+<td>DumpCsect()</td>
+<tr><td> Grid </td>
+<td>Set the grid.</td>
+<td>grid(set, [name:]size[@offs][!unit])<br>grid(+|up)<br>grid(-|down)<br>grid(#N)<br>grid(idx, N)</td>
+<tr><td> le </td>
+<td>Loads an element (subcircuit, footprint) into the current buffer.</td>
+<td>le [name]</td>
+<tr><td> FreeRotateBuffer </td>
+<td>Rotates the current paste buffer contents by the specified angle.  The<br>angle is given in degrees.  If no angle is given, the user is prompted<br>for one.</td>
+<td>FreeRotateBuffer([Angle])</td>
+<tr><td> js </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> LoadHpglFrom </td>
+<td>Loads the specified hpgl plot file to the current buffer</td>
+<td>LoadHpglFrom(filename)</td>
+<tr><td> LibraryChanged </td>
+<td>Tells the GUI that the libraries have changed.</td>
+<td>LibraryChanged()</td>
+<tr><td> CreateMenu </td>
+<td>Creates a new menu, popup (only path specified) or submenu (at least path and action are specified)</td>
+<td>CreateMenu(path)<br>CreateMenu(path, action, mnemonic, accel, tooltip, cookie)</td>
+<tr><td> SavePatch </td>
+<td>Save netlist patch for back annotation.</td>
+<td>SavePatch(filename)</td>
+<tr><td> PrintVersion </td>
+<td>Print version.</td>
+<td>PrintVersion()</td>
+<tr><td> ClearSquare </td>
+<tr><td> PadstackBreakup </td>
+<td>Break up a padstack into one non-padstack object per layer type (the hole is ignored)</td>
+<td>PadstackBreakup(buffer|selected|objet)</td>
+<tr><td> SwitchHID </td>
+<td>Switch to another HID.</td>
+<td>SwitchHID(lesstif|gtk|batch)</td>
+<tr><td> PadstackConvert </td>
+<td>Convert selection or current buffer to padstack</td>
+<td>PadstackConvert(buffer|selected, [originx, originy])</td>
+<tr><td> SaveTedax </td>
+<td>Saves the specific type of data in a tEDAx file. Type can be: board-footprints</td>
+<td>SaveTedax(board-footprints, filename)</td>
+<tr><td> rn </td>
+<td>Reads netlist.</td>
+<td>rn [name]</td>
+<tr><td> py </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> ExpFeatTmp </td>
+<td>Experimental Feature Template.</td>
+<td>ExpFeatTmp(...)</td>
+<tr><td> SetSquare </td>
+<tr><td> estutter </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> SelectLayer </td>
+<td>Select which layer is the current layer.</td>
+<td>SelectLayer(1..MAXLAYER|Silk|Rats)</td>
+<tr><td> gpmi_scripts </td>
+<td>Manage gpmi scripts</td>
+<td>TODO</td>
+<tr><td> wq </td>
+<td>Saves the layout data and quits.</td>
+<td>wq</td>
+<tr><td> ChangeFlag </td>
+<td>Sets or clears flags on objects.</td>
+<td>ChangeFlag(Object|Selected|SelectedObjects, flag, value)<br>ChangeFlag(SelectedLines|SelectedPins|SelectedVias, flag, value)<br>ChangeFlag(SelectedPads|SelectedTexts|SelectedNames, flag, value)<br>ChangeFlag(SelectedElements, flag, value)<br>flag = thermal | join<br>value = 0 | 1</td>
+<tr><td> CycleDrag </td>
+<td>Cycle through which object is being dragged</td>
+<td>CycleDrag()</td>
+<tr><td> ListRotations </td>
+<tr><td> Puller </td>
+<td>Pull an arc-line junction tight.</td>
+<td>pcb_act_Puller()</td>
+<tr><td> FullScreen </td>
+<td>Hide widgets to get edit area full screen</td>
+<td>pcb_act_FullScreen(on|off|toggle)</td>
+<tr><td> AddRats </td>
+<td>Add one or more rat lines to the board.</td>
+<td>AddRats(AllRats|SelectedRats|Close)</td>
+<tr><td> trim </td>
+<td>Use one or more objects as cutting edge and trim or split other objects. First argument is the cutting edge</td>
+<td>trim([selected|found|object], [selected|found|object])<br>split([selected|found|object], [selected|found|object])</td>
+<tr><td> Undo </td>
+<td>Undo recent changes.</td>
+<td>undo()<br>undo(ClearList)</td>
+<tr><td> Teardrops </td>
+<tr><td> Atomic </td>
+<td>Save or restore the undo serial number.</td>
+<td>Atomic(Save|Restore|Close|Block)</td>
+<tr><td> PrintPaths </td>
+<td>Print full paths and search paths.</td>
+<td>PrintPaths()</td>
+<tr><td> RenumberBuffer </td>
+<td>TODO</td>
+<td>RenumberBlock(old_base,new_base)</td>
+<tr><td> Backup </td>
+<td>Backup the current layout - save using the same method that the timed backup function uses</td>
+<td>Backup()</td>
+<tr><td> ChangeJoin </td>
+<td>Changes the join (clearance through polygons) of objects.</td>
+<td>ChangeJoin(ToggleObject|SelectedLines|SelectedArcs|Selected)</td>
+<tr><td> ApplyVendor </td>
+<td>Applies the currently loaded vendor drill table to the current design.</td>
+<td>ApplyVendor()</td>
+<tr><td> Puller </td>
+<td>Pull an arc-line junction tight.</td>
+<td>pcb_act_Puller()</td>
+<tr><td> DumpPlugins </td>
+<td>Print plugins loaded in a format digestable by scripts.</td>
+<td>DumpPlugins()</td>
+<tr><td> djopt </td>
+<td>Perform various optimizations on the current board.</td>
+<td>djopt(debumpify|unjaggy|simple|vianudge|viatrim|orthopull)<br>djopt(auto) - all of the above<br>djopt(miter)</td>
+<tr><td> UnloadVendor </td>
+<td>Unloads the current vendor drill mapping table.</td>
+<td>UnloadVendor()</td>
+<tr><td> Atomic </td>
+<td>Save or restore the undo serial number.</td>
+<td>Atomic(Save|Restore|Close|Block)</td>
+<tr><td> ExecuteFile </td>
+<td>Run actions from the given file.</td>
+<td>ExecuteFile(filename)</td>
+<tr><td> RouteStylesChanged </td>
+<td>Tells the GUI that the routing styles have changed.</td>
+<td>RouteStylesChanged()</td>
+<tr><td> Backup </td>
+<td>Backup the current layout - save using the same method that the timed backup function uses</td>
+<td>Backup()</td>
+<tr><td> SaveTo </td>
+<td>Saves data to a file.</td>
+<td>SaveTo(Layout|LayoutAs,filename,[fmt])<br>SaveTo(AllConnections|AllUnusedPins|ElementConnections,filename)<br>SaveTo(PasteBuffer,filename,[fmt])</td>
+<tr><td> PrintCopyright </td>
+<td>Print copyright notice.</td>
+<td>PrintCopyright()</td>
+<tr><td> SaveTo </td>
+<td>Saves data to a file.</td>
+<td>SaveTo(Layout|LayoutAs,filename,[fmt])<br>SaveTo(AllConnections|AllUnusedPins|ElementConnections,filename)<br>SaveTo(PasteBuffer,filename,[fmt])</td>
+<tr><td> cam </td>
+<td>Export jobs for feeding cam processes</td>
+<td>cam(exec, script)<br>cam(call, jobname)</td>
+<tr><td> MorphPolygon </td>
+<td>Converts dead polygon islands into separate polygons.</td>
+<td>pcb_poly_morph(Object|Selected)</td>
+<tr><td> PCBChanged </td>
+<td>Tells the GUI that the whole PCB has changed. The optional "revert"parameter can be used as a hint to the GUI that the same design is beingreloaded, and that it might keep some viewport settings</td>
+<td>PCBChanged([revert])</td>
+<tr><td> Normalize </td>
+<td>Move all objects within the drawing area, align the drawing to 0;0</td>
+<td>Normalize()</td>
+<tr><td> EvalConf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>EvalConf(path) - evaluate a config path in different config sources to figure how it ended up in the native database</td>
+<tr><td> FontEdit </td>
+<td>Convert the current font to a PCB for editing.</td>
+<td>FontEdit()</td>
+<tr><td> DumpObjFlags </td>
+<td>Print a script processable digest of all flags, per object type</td>
+<td>DumpObjFlags()</td>
+<tr><td> LoadScript </td>
+<td>Load a fungw script</td>
+<td>LoadScript(id, filename, [language])</td>
+<tr><td> Display </td>
+<td>Several display-related actions.</td>
+<td>Display(SubcID, template)<br>Display(Grid|Redraw|Pinout|PinOrPadName)<br>Display(CycleClip|CycleCrosshair|ToggleAllDirections|ToggleStartDirection)<br>Display(ToggleGrid|ToggleRubberBandMode|ToggleUniqueNames)<br>Display(ToggleName|ToggleClearLine|ToggleFullPoly|ToggleSnapPin)<br>Display(ToggleSnapOffGridLine|ToggleHighlightOnPoint|ToggleCheckPlanes)<br>Display(ToggleThindraw|ToggleThindrawPoly|ToggleOrthoMove|ToggleLocalRef)<br>Display(ToggleLiveRoute|ToggleShowDRC|ToggleAutoDRC|LockNames|OnlyNames)</td>
+<tr><td> PrintActions </td>
+<td>Print all actions available.</td>
+<td>PrintActions()</td>
+<tr><td> ChkSubcID </td>
+<td>Return 1 if currently shown subc ID matches the requested pattern</td>
+<td>ChkSubcID(pattern)</td>
+<tr><td> DebugXY </td>
+<td>Debug action, with coordinates</td>
+<td>DebugXY(...)</td>
+<tr><td> Flip </td>
+<td>Flip a subcircuit to the opposite side of the board.</td>
+<td>Flip(Object|Selected)</td>
+<tr><td> ClearOctagon </td>
+<tr><td> awk </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> PolyOffs </td>
+<td>replicate the outer contour of the selected polygon(s) with growing or shrinking them by offset; the new polygon is drawn on the current layer</td>
+<td>PolyOffs(offset)</td>
+<tr><td> pscalib </td>
+<tr><td> SetFlag </td>
+<td>Sets flags on objects.</td>
+<td>SetFlag(Object|Selected|SelectedObjects, flag)<br>SetFlag(SelectedLines|SelectedPins|SelectedVias, flag)<br>SetFlag(SelectedPads|SelectedTexts|SelectedNames, flag)<br>SetFlag(SelectedElements, flag)<br>flag = thermal | join</td>
+<tr><td> ChangeName </td>
+<td>Sets the name (or pin number) of objects.</td>
+<td>ChangeName(Object)<br>ChangeName(Layout|Layer)</td>
+<tr><td> ClrFlag </td>
+<td>Clears flags on objects.</td>
+<td>ClrFlag(Object|Selected|SelectedObjects, flag)<br>ClrFlag(SelectedLines|SelectedPins|SelectedVias, flag)<br>ClrFlag(SelectedPads|SelectedTexts|SelectedNames, flag)<br>ClrFlag(SelectedElements, flag)<br>flag = thermal | join</td>
+<tr><td> AddRats </td>
+<td>Add one or more rat lines to the board.</td>
+<td>AddRats(AllRats|SelectedRats|Close)</td>
+<tr><td> LoadEeschemaFrom </td>
+<td>Loads the specified eeschema .net file - the netlist must be an s-expression.</td>
+<td>LoadEeschemaFrom(filename)</td>
+<tr><td> DRC </td>
+<td>Invoke the DRC check.</td>
+<td>DRC()</td>
+<tr><td> EditGroup </td>
+<td>Change a property or attribute of a layer group. If the first argument starts with @, it is taken as the group name to manipulate, else the action uses the current layer's group. Without arguments or if only a layer name is specified, interactive runs editing.</td>
+<td>Editgroup([@group], [name=text|type=+bit|type=-bit])]<br>Editlayer([@layer], attrib, key=value)</td>
+<tr><td> AutoPlaceSelected </td>
+<td>Auto-place selected components.</td>
+<td>AutoPlaceSelected()</td>
+<tr><td> Unselect </td>
+<td>Unselects the object at the pointer location or the specified objects.</td>
+<td>Unselect(All|Block|Connection)</td>
+<tr><td> split </td>
+<td>Use one or more objects as cutting edge and trim or split other objects. First argument is the cutting edge</td>
+<td>trim([selected|found|object], [selected|found|object])<br>split([selected|found|object], [selected|found|object])</td>
+<tr><td> ChangePaste </td>
+<tr><td> PolyCombine </td>
+<tr><td> ChangeSizes </td>
+<td>Changes all sizes of objects.</td>
+<td>ChangeSizes(Object, delta|style)<br>ChangeSizes(SelectedObjects|Selected, delta|style)<br>ChangeSizes(SelectedLines|SelectedPins|SelectedVias, delta|style)<br>ChangeSizes(SelectedPads|SelectedTexts|SelectedNames, delta|style)<br>ChangeSizes(SelectedElements, delta|style)</td>
+<tr><td> NetlistChanged </td>
+<td>Tells the GUI that the netlist has changed.</td>
+<td>NetlistChanged()</td>
+<tr><td> MinMaskGap </td>
+<tr><td> align </td>
+<td>Align subcircuits</td>
+<td>Align(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])</td>
+<tr><td> ChangeOctagon </td>
+<tr><td> CreateText </td>
+<td>Create a new text object</td>
+<td>CreateText(layer, fontID, X, Y, direction, scale, text)</td>
+<tr><td> SetThermal </td>
+<td>Set the thermal (on the current layer) of padstacks to the given style.<br>Style = 0 means no thermal.<br>Style = 1 has diagonal fingers with sharp edges.<br>Style = 2 has horizontal and vertical fingers with sharp edges.<br>Style = 3 is a solid connection to the plane.<br>Style = 4 has diagonal fingers with rounded edges.<br>Style = 5 has horizontal and vertical fingers with rounded edges.</td>
+<td>SetThermal(Object|SelectedPins|SelectedVias|Selected, Style)</td>
+<tr><td> extedit </td>
+<td>extedit(object|selected, [interactive|method])</td>
+<td>Invoke an external program to edit a specific part of the current board.</td>
+<tr><td> DumpPluginDirs </td>
+<td>Print plugins directories in a format digestable by scripts.</td>
+<td>DumpPluginDirs()</td>
+<tr><td> ChangeRadius </td>
+<td>Changes the width or height (radius) of an arc.</td>
+<td>ChangeRadius(Object, width|x|height|y|both, delta)<br>ChangeRadius(SelectedObjects|Selected, width|x|height|y|both, delta)<br>ChangeRadius(SelectedArcs, width|x|height|y|both, delta)</td>
+<tr><td> ElementSetAttr </td>
+<td>Sets or clears an element-specific attribute.</td>
+<td>ElementSetAttr(refdes,name[,value])</td>
+<tr><td> ManagePlugins </td>
+<td>Manage plugins dialog.</td>
+<td>ManagePlugins()</td>
+<tr><td> UnloadScript </td>
+<td>Unload a fungw script</td>
+<td>UnloadScript(id)</td>
+<tr><td> ElementList </td>
+<td>Adds the given element if it doesn't already exist.</td>
+<td>ElementList(Start|Done|Need,<refdes>,<footprint>,<value>)</td>
+<tr><td> PasteBuffer </td>
+<td>Various operations on the paste buffer.</td>
+<td>PasteBuffer(AddSelected|Clear|1..PCB_MAX_BUFFER)<br>PasteBuffer(Rotate, 1..3)<br>PasteBuffer(Convert|Restore|Mirror)<br>PasteBuffer(ToLayout, X, Y, units)<br>PasteBuffer(ToLayout, crosshair)<br>PasteBuffer(Save, Filename, [format], [force])<br>PasteBuffer(Push)<br>PasteBuffer(Pop)</td>
+<tr><td> LoadhypFrom </td>
+<td>Loads the specified Hyperlynx file.</td>
+<td>LoadhypFrom(filename[, "debug"]...)</td>
+<tr><td> dumpflags </td>
+<td>dump flags, optionally using the format string provided by the user</td>
+<td>dumpflags([fmt])</td>
+<tr><td> SetOctagon </td>
+<tr><td> ChkBuffer </td>
+<td>Return 1 if currently selected buffer's index matches idx</td>
+<td>ChkBuffer(idx)</td>
+<tr><td> Polygon </td>
+<td>Some polygon related stuff.</td>
+<td>Polygon(Close|CloseHole|PreviousPoint)</td>
+<tr><td> Display </td>
+<td>Several display-related actions.</td>
+<td>Display(SubcID, template)<br>Display(Grid|Redraw|Pinout|PinOrPadName)<br>Display(CycleClip|CycleCrosshair|ToggleAllDirections|ToggleStartDirection)<br>Display(ToggleGrid|ToggleRubberBandMode|ToggleUniqueNames)<br>Display(ToggleName|ToggleClearLine|ToggleFullPoly|ToggleSnapPin)<br>Display(ToggleSnapOffGridLine|ToggleHighlightOnPoint|ToggleCheckPlanes)<br>Display(ToggleThindraw|ToggleThindrawPoly|ToggleOrthoMove|ToggleLocalRef)<br>Display(ToggleLiveRoute|ToggleShowDRC|ToggleAutoDRC|LockNames|OnlyNames)</td>
+<tr><td> mawk </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> DebugXY </td>
+<td>Debug action, with coordinates</td>
+<td>DebugXY(...)</td>
+<tr><td> LoadFontFrom </td>
+<td>Load PCB font from a file</td>
+<td>LoadFontFrom([file, id])</td>
+<tr><td> dumpdata </td>
+<td>Dump an aspect of the data</td>
+<td>dumpdata()</td>
+<tr><td> ChangeAngle </td>
+<td>Changes the start angle, delta angle or both angles of an arc.</td>
+<td>ChangeAngle(Object, start|delta|both, delta)<br>ChangeAngle(SelectedObjects|Selected, start|delta|both, delta)<br>ChangeAngle(SelectedArcs, start|delta|both, delta)</td>
+<tr><td> DumpLibrary </td>
+<td>Display the entire contents of the libraries.</td>
+<td>DumpLibrary()</td>
+<tr><td> MarkCrosshair </td>
+<td>Set/Reset the pcb_crosshair mark.</td>
+<td>MarkCrosshair()<br>MarkCrosshair(Center)</td>
+<tr><td> MoveToCurrentLayer </td>
+<td>Moves objects to the current layer.</td>
+<td>MoveToCurrentLayer(Object|SelectedObjects)</td>
+<tr><td> regpoly </td>
+<td>Generate regular polygon. Where is x;y and radius is either r or rx;ry. Rotation is in degrees.</td>
+<td>regpoly([where,] corners, radius [,rotation])</td>
+<tr><td> propedit </td>
+<td>Run the property editor</td>
+<td>propedit()</td>
+<tr><td> pscalib </td>
+<tr><td> SetFlag </td>
+<td>Sets flags on objects.</td>
+<td>SetFlag(Object|Selected|SelectedObjects, flag)<br>SetFlag(SelectedLines|SelectedPins|SelectedVias, flag)<br>SetFlag(SelectedPads|SelectedTexts|SelectedNames, flag)<br>SetFlag(SelectedElements, flag)<br>flag = thermal | join</td>
+<tr><td> ClrFlag </td>
+<td>Clears flags on objects.</td>
+<td>ClrFlag(Object|Selected|SelectedObjects, flag)<br>ClrFlag(SelectedLines|SelectedPins|SelectedVias, flag)<br>ClrFlag(SelectedPads|SelectedTexts|SelectedNames, flag)<br>ClrFlag(SelectedElements, flag)<br>flag = thermal | join</td>
+<tr><td> ChangeHole </td>
+<tr><td> ChangeSquare </td>
+<tr><td> Import </td>
+<td>Import schematics.</td>
+<td>Import()<br>Import([gnetlist|make[,source,source,...]])<br>Import(setnewpoint[,(mark|center|X,Y)])<br>Import(setdisperse,D,units)</td>
+<tr><td> dlg_test </td>
+<td>test the attribute dialog</td>
+<td>dlg_test()</td>
+<tr><td> DumpActions </td>
+<td>Dump all actions available.</td>
+<td>DumpActions()</td>
+<tr><td> RenumberBuffer </td>
+<td>TODO</td>
+<td>RenumberBlock(old_base,new_base)</td>
+<tr><td> ChkLayer </td>
+<td>Returns 1 if the specified layer is the active layer</td>
+<td>ChkLayer(layerid)</td>
+<tr><td> AutoRoute </td>
+<td>Auto-route some or all rat lines.</td>
+<td>AutoRoute(AllRats|SelectedRats)</td>
+<tr><td> mesh </td>
+<td>generate a mesh for simulation</td>
+<td>mesh()</td>
+<tr><td> ExportGUI </td>
+<td>Open the export dialog.</td>
+<td>ExportGUI()</td>
+<tr><td> net </td>
+<td>Perform various actions on netlists.</td>
+<td>Net(find|select|rats|norats|clear[,net[,pin]])<br>Net(freeze|thaw|forcethaw)<br>Net(swap)<br>Net(add,net,pin)</td>
+<tr><td> OptAutoOnly </td>
+<td>Toggles the optimize-only-autorouted flag.</td>
+<td>OptAutoOnly()</td>
+<tr><td> New </td>
+<td>Starts a new layout.</td>
+<td>New([name])</td>
+<tr><td> Grid </td>
+<td>Set the grid.</td>
+<td>grid(set, [name:]size[@offs][!unit])<br>grid(+|up)<br>grid(-|down)<br>grid(#N)<br>grid(idx, N)</td>
+<tr><td> cam </td>
+<td>Export jobs for feeding cam processes</td>
+<td>cam(exec, script)<br>cam(call, jobname)</td>
+<tr><td> lua </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> Import </td>
+<td>Import schematics.</td>
+<td>Import()<br>Import([gnetlist|make[,source,source,...]])<br>Import(setnewpoint[,(mark|center|X,Y)])<br>Import(setdisperse,D,units)</td>
+<tr><td> MoveLayer </td>
+<td>Moves/Creates/Deletes Layers.</td>
+<td>MoveLayer(old,new)</td>
+<tr><td> integrity </td>
+<td>perform integrirty check on the current board and generate errors if needed</td>
+<td>integrity()</td>
+<tr><td> ChkGridUnits </td>
+<td>Return 1 if currently selected grid unit matches the expected (normally mm or mil)</td>
+<td>ChkGridUnits(expected)</td>
+<tr><td> propset </td>
+<td>Change the named property of all selected objects to/by value</td>
+<td>propset(name, value)</td>
+<tr><td> djopt </td>
+<td>Perform various optimizations on the current board.</td>
+<td>djopt(debumpify|unjaggy|simple|vianudge|viatrim|orthopull)<br>djopt(auto) - all of the above<br>djopt(miter)</td>
+<tr><td> PrintCopyright </td>
+<td>Print copyright notice.</td>
+<td>PrintCopyright()</td>
+<tr><td> extedit </td>
+<td>extedit(object|selected, [interactive|method])</td>
+<td>Invoke an external program to edit a specific part of the current board.</td>
+<tr><td> SetUnits </td>
+<td>Set the default measurement units.</td>
+<td>SetUnits(mm|mil)</td>
+<tr><td> SaveFontTo </td>
+<td>Save PCB font to a file</td>
+<td>SaveFontTo([file, id])</td>
+<tr><td> mill </td>
+<td>Calculate toolpath for milling away copper</td>
+<td>mill()</td>
+<tr><td> ChangePinName </td>
+<td>Sets the name of a specific pin on a specific subcircuit.</td>
+<td>ChangePinName(Refdes,PinNumber,PinName)</td>
+<tr><td> RouteStyle </td>
+<td>Copies the indicated routing style into the current pen.</td>
+<td>RouteStyle(style_id|style_name)</td>
+<tr><td> awk </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> SwitchHID </td>
+<td>Switch to another HID.</td>
+<td>SwitchHID(lesstif|gtk|batch)</td>
+<tr><td> LoadTedaxFrom </td>
+<td>Loads the specified block from a tedax file. Type can be: netlist or footprint.</td>
+<td>LoadTedaxFrom(netlist|footprint, filename)</td>
+<tr><td> SaveTedax </td>
+<td>Saves the specific type of data in a tEDAx file. Type can be: board-footprints</td>
+<td>SaveTedax(board-footprints, filename)</td>
+<tr><td> ChkRst </td>
+<td>Return 1 if route_style_id matches pen.</td>
+<td>ChkRst(route_style_id)</td>
+<tr><td> Polygon </td>
+<td>Some polygon related stuff.</td>
+<td>Polygon(Close|CloseHole|PreviousPoint)</td>
+<tr><td> autocrop </td>
+<td>Autocrops the board dimensions to (extants + a margin of 1 grid), keeping the move and board size grid aligned</td>
+<td>autocrop()</td>
+<tr><td> Connection </td>
+<td>Searches connections of the object at the cursor position.</td>
+<td>Connection(Find|ResetLinesAndPolygons|ResetPinsAndVias|Reset)</td>
+<tr><td> distributetext </td>
+<td>Distribute Text Elements</td>
+<td>DistributeText(Y, [Lefts/Rights/Tops/Bottoms/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])</td>
+<tr><td> RipUp </td>
+<td>Ripup auto-routed tracks</td>
+<td>RipUp(All|Selected|Element)</td>
+<tr><td> DRC </td>
+<td>Invoke the DRC check.</td>
+<td>DRC()</td>
+<tr><td> RenumberBlock </td>
+<td>TODO</td>
+<td>RenumberBlock(old_base,new_base)</td>
+<tr><td> CycleDrag </td>
+<td>Cycle through which object is being dragged</td>
+<td>CycleDrag()</td>
+<tr><td> PrintVersion </td>
+<td>Print version.</td>
+<td>PrintVersion()</td>
+<tr><td> Teardrops </td>
+<tr><td> ChkRst </td>
+<td>Return 1 if route_style_id matches pen.</td>
+<td>ChkRst(route_style_id)</td>
+<tr><td> regpoly </td>
+<td>Generate regular polygon. Where is x;y and radius is either r or rx;ry. Rotation is in degrees.</td>
+<td>regpoly([where,] corners, radius [,rotation])</td>
+<tr><td> tcl </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> dumpconf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>dumpconf(native, [verbose], [prefix]) - dump the native (binary) config tree to stdout<br>dumpconf(lihata, role, [prefix]) - dump in-memory lihata representation of a config tree</td>
+<tr><td> DisperseElements </td>
+<td>Disperses subcircuits.</td>
+<td>DisperseElements(All|Selected)</td>
+<tr><td> ChangeNonetlist </td>
+<td>Changes the nonetlist flag of subcircuits.</td>
+<td>ChangeNonetlist(ToggleObject)<br>ChangeNonetlist(SelectedElements)<br>ChangeNonetlist(Selected|SelectedObjects)</td>
+<tr><td> RemoveMenu </td>
+<td>Recursively removes a new menu, popup (only path specified) or submenu. </td>
+<td>RemoveMenu(path|cookie)</td>
+<tr><td> Mode </td>
+<td>Change or use the tool mode.</td>
+<td>Mode(Arc|Arrow|Copy|InsertPoint|Line|Lock|Move|None|PasteBuffer)<br>Mode(Polygon|Rectangle|Remove|Rotate|Text|Thermal|Via)<br>Mode(Notify|Release|Cancel|Stroke)<br>Mode(Save|Restore)</td>
+<tr><td> gpmi_scripts </td>
+<td>Manage gpmi scripts</td>
+<td>TODO</td>
+<tr><td> Renumber </td>
+<td>Renumber all subcircuits.  The changes will be recorded to filename<br>for use in backannotating these changes to the schematic.</td>
+<td>Renumber()<br>Renumber(filename)</td>
+<tr><td> d1 </td>
+<td>debug action for development</td>
+<td>d1()</td>
+<tr><td> FullScreen </td>
+<td>Hide widgets to get edit area full screen</td>
+<td>pcb_act_FullScreen(on|off|toggle)</td>
+<tr><td> mruby </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> shape </td>
+<td>Interactive shape generator.</td>
+<td>shape()</td>
+<tr><td> PrintPaths </td>
+<td>Print full paths and search paths.</td>
+<td>PrintPaths()</td>
+<tr><td> stt </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> ExecCommand </td>
+<td>Run shell command</td>
+<td>System(shell_cmd)</td>
+<tr><td> ChangeJoin </td>
+<td>Changes the join (clearance through polygons) of objects.</td>
+<td>ChangeJoin(ToggleObject|SelectedLines|SelectedArcs|Selected)</td>
+<tr><td> UnloadVendor </td>
+<td>Unloads the current vendor drill mapping table.</td>
+<td>UnloadVendor()</td>
+<tr><td> NetlistChanged </td>
+<td>Tells the GUI that the netlist has changed.</td>
+<td>NetlistChanged()</td>
+<tr><td> propset </td>
+<td>Change the named property of all selected objects to/by value</td>
+<td>propset(name, value)</td>
+<tr><td> q! </td>
+<td>Quits the application without confirming.</td>
+<td>q!</td>
+<tr><td> SetValue </td>
+<td>Change various board-wide values and sizes.</td>
+<td>SetValue(Grid|Line|LineSize|Text|TextScale, delta)</td>
+<tr><td> ChkMode </td>
+<td>Return 1 if the currently selected mode is the expected_mode</td>
+<td>ChkMode(expected_mode)</td>
+<tr><td> System </td>
+<td>Run shell command</td>
+<td>System(shell_cmd)</td>
+<tr><td> netlist </td>
+<td>Perform various actions on netlists.</td>
+<td>Net(find|select|rats|norats|clear[,net[,pin]])<br>Net(freeze|thaw|forcethaw)<br>Net(swap)<br>Net(add,net,pin)</td>
+<tr><td> ChangeNonetlist </td>
+<td>Changes the nonetlist flag of subcircuits.</td>
+<td>ChangeNonetlist(ToggleObject)<br>ChangeNonetlist(SelectedElements)<br>ChangeNonetlist(Selected|SelectedObjects)</td>
+<tr><td> PolyStitch </td>
+<tr><td> align </td>
+<td>Align subcircuits</td>
+<td>Align(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])</td>
+<tr><td> dumpundo </td>
+<td>Print info about fonts</td>
+<td>dumpfonts()</td>
+<tr><td> le </td>
+<td>Loads an element (subcircuit, footprint) into the current buffer.</td>
+<td>le [name]</td>
+<tr><td> roundrect </td>
+<td>Generate a rectangle with round corners</td>
+<td>roundrect([where,] width[;height] [,rx[;ry] [,rotation]])</td>
+<tr><td> js </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> ChkGridSize </td>
+<td>Return 1 if the currently selected grid matches the expected_size. If argument is "none" return 1 if there is no grid.</td>
+<td>ChkGridSize(expected_size)<br>ChkGridSize(none)</td>
+<tr><td> PadstackPlace </td>
+<td>Place a pad stack (either proto_id, or if not specified, the default for style)</td>
+<td>PadstackPlace([proto_id|default], [x, y])</td>
+<tr><td> PrintFiles </td>
+<td>Print files currently loaded.</td>
+<td>PrintFiles()</td>
+<tr><td> System </td>
+<td>Run shell command</td>
+<td>System(shell_cmd)</td>
+<tr><td> MorphPolygon </td>
+<td>Converts dead polygon islands into separate polygons.</td>
+<td>pcb_poly_morph(Object|Selected)</td>
+<tr><td> LoadEeschemaFrom </td>
+<td>Loads the specified eeschema .net file - the netlist must be an s-expression.</td>
+<td>LoadEeschemaFrom(filename)</td>
+<tr><td> PolyHatch </td>
+<td>hatch the selected polygon(s) with lines of the current style; lines are drawn on the current layer; flags are h:horizontal, v:vertical, c:contour, p:poly</td>
+<td>PolyHatch([spacing], [hvcp])<br>PolyHatch(interactive)</td>
+<tr><td> DumpObjFlags </td>
+<td>Print a script processable digest of all flags, per object type</td>
+<td>DumpObjFlags()</td>
+<tr><td> net </td>
+<td>Perform various actions on netlists.</td>
+<td>Net(find|select|rats|norats|clear[,net[,pin]])<br>Net(freeze|thaw|forcethaw)<br>Net(swap)<br>Net(add,net,pin)</td>
+<tr><td> rn </td>
+<td>Reads netlist.</td>
+<td>rn [name]</td>
+<tr><td> py </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> FontSave </td>
+<td>Convert the current PCB back to a font.</td>
+<td>FontSave()</td>
+<tr><td> New </td>
+<td>Starts a new layout.</td>
+<td>New([name])</td>
+<tr><td> LoadScript </td>
+<td>Load a fungw script</td>
+<td>LoadScript(id, filename, [language])</td>
+<tr><td> lua </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> ListScripts </td>
+<td>List a fungw script</td>
+<td>ListScripts([pat])</td>
+<tr><td> ClearOctagon </td>
+<tr><td> wq </td>
+<td>Saves the layout data and quits.</td>
+<td>wq</td>
+<tr><td> FlagEdit </td>
+<td>Change the layer binding.</td>
+<td>FlagEdit(object)</td>
+<tr><td> forcecolor </td>
+<td>change selected objects' color to #RRGGBB, reset if does not start with '#'</td>
+<td>forcecolor(#RRGGBB)</td>
+<tr><td> ToggleView </td>
+<td>Toggle the visibility of the specified layer or layer group.</td>
+<td>ToggleView(1..MAXLAYER)<br>ToggleView(layername)<br>ToggleView(Silk|Rats|Pins|Vias|BackSide)<br>ToggleView(All, Open|Vis, Set|Clear|Toggle)</td>
+<tr><td> perl </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> ChangeName </td>
+<td>Sets the name (or pin number) of objects.</td>
+<td>ChangeName(Object)<br>ChangeName(Layout|Layer)</td>
+<tr><td> Oneliner </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> GetStyle </td>
+<td>Return integer index (>=0) of the currently active style or -1 if no style is selected (== custom style)</td>
+<td>GetStyle()</td>
+<tr><td> PrintUsage </td>
+<td>Print command line arguments of pcb-rnd or a plugin loaded.</td>
+<td>PrintUsage()<br>PrintUsage(plugin)</td>
+<tr><td> aligntext </td>
+<td>Align Text Elements</td>
+<td>AlignText(X/Y, [Lefts/Rights/Tops/Bottoms/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])</td>
+<tr><td> smartdisperse </td>
+<td>TODO</td>
+<td>SmartDisperse([All|Selected])</td>
+<tr><td> acompnet </td>
+<td>Attempt to auto-complete the current network</td>
+<td>acompnet()</td>
+<tr><td> mawk </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> LoadDsnFrom </td>
+<td>Loads the specified routed dsn file.</td>
+<td>LoadDsnFrom(filename)</td>
+<tr><td> MinClearGap </td>
+<td>Ensures that polygons are a minimum distance from objects.</td>
+<td>MinClearGap(delta)<br>MinClearGap(Selected, delta)</td>
+<tr><td> dumpflags </td>
+<td>dump flags, optionally using the format string provided by the user</td>
+<td>dumpflags([fmt])</td>
+<tr><td> ChkBuffer </td>
+<td>Return 1 if currently selected buffer's index matches idx</td>
+<td>ChkBuffer(idx)</td>
+<tr><td> DelGroup </td>
+<td>Remove a layer group; if the first argument is not specified, the current group is removed</td>
+<td>DelGroup([@group])</td>
+<tr><td> ChkMode </td>
+<td>Return 1 if the currently selected mode is the expected_mode</td>
+<td>ChkMode(expected_mode)</td>
+<tr><td> Rotate90 </td>
+<td>Rotates the object under the crosshair by 90 degree steps.</td>
+<td>pcb_move_obj(steps)</td>
+<tr><td> netlist </td>
+<td>Perform various actions on netlists.</td>
+<td>Net(find|select|rats|norats|clear[,net[,pin]])<br>Net(freeze|thaw|forcethaw)<br>Net(swap)<br>Net(add,net,pin)</td>
+<tr><td> ExportScadPoly </td>
+<td>exports all selected polygons to an openscad script; only the outmost contour of each poly is exported</td>
+<td>ScadExportPoly(filename)</td>
+<tr><td> tcl </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> EditLayer </td>
+<td>Change a property or attribute of a layer. If the first argument starts with @, it is taken as the layer name to manipulate, else the action uses the current layer. Without arguments or if only a layer name is specified, interactive runs editing.</td>
+<td>Editlayer([@layer], [name=text|auto=[0|1]|sub=[0|1])]<br>Editlayer([@layer], attrib, key=value)</td>
+<tr><td> CreateText </td>
+<td>Create a new text object</td>
+<td>CreateText(layer, fontID, X, Y, direction, scale, text)</td>
+<tr><td> SetThermal </td>
+<td>Set the thermal (on the current layer) of padstacks to the given style.<br>Style = 0 means no thermal.<br>Style = 1 has diagonal fingers with sharp edges.<br>Style = 2 has horizontal and vertical fingers with sharp edges.<br>Style = 3 is a solid connection to the plane.<br>Style = 4 has diagonal fingers with rounded edges.<br>Style = 5 has horizontal and vertical fingers with rounded edges.</td>
+<td>SetThermal(Object|SelectedPins|SelectedVias|Selected, Style)</td>
+<tr><td> RemoveSelected </td>
+<td>Removes any selected objects.</td>
+<td>pcb_remove_selected()</td>
+<tr><td> UnloadScript </td>
+<td>Unload a fungw script</td>
+<td>UnloadScript(id)</td>
+<tr><td> ClearSquare </td>
+<tr><td> DisableVendor </td>
+<td>Disables automatic drill size mapping.</td>
+<td>DisableVendor()</td>
+<tr><td> mesh </td>
+<td>generate a mesh for simulation</td>
+<td>mesh()</td>
+<tr><td> distributetext </td>
+<td>Distribute Text Elements</td>
+<td>DistributeText(Y, [Lefts/Rights/Tops/Bottoms/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])</td>
+<tr><td> estutter </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> Export </td>
+<td>Export the current layout, e.g. Export(png, --dpi, 600)</td>
+<td>Export(exporter, [exporter-args])</td>
+<tr><td> stt </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> GlobalPuller </td>
+<td>Pull all traces tight.</td>
+<td>pcb_act_GlobalPuller([Found|Selected])</td>
+<tr><td> distribute </td>
+<td>Distribute subcircuits</td>
+<td>Distribute(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])</td>
+<tr><td> RipUp </td>
+<td>Ripup auto-routed tracks</td>
+<td>RipUp(All|Selected|Element)</td>
+<tr><td> BoardFlip </td>
+<td>Mirror the board over the x axis, optionally mirroring sides as well.</td>
+<td>BoardFlip([sides])</td>
+<tr><td> MoveToCurrentLayer </td>
+<td>Moves objects to the current layer.</td>
+<td>MoveToCurrentLayer(Object|SelectedObjects)</td>
+<tr><td> Export </td>
+<td>Export the current layout, e.g. Export(png, --dpi, 600)</td>
+<td>Export(exporter, [exporter-args])</td>
+<tr><td> LoadFrom </td>
+<td>Load layout data from a file.</td>
+<td>LoadFrom(Layout|LayoutToBuffer|SubcToBuffer|Netlist|Revert,filename[,format])</td>
+<tr><td> MoveLayer </td>
+<td>Moves/Creates/Deletes Layers.</td>
+<td>MoveLayer(old,new)</td>
+<tr><td> Redo </td>
+<td>Redo recent "undo" operations.</td>
+<td>redo()</td>
+<tr><td> mill </td>
+<td>Calculate toolpath for milling away copper</td>
+<td>mill()</td>
+<tr><td> ChangeSquare </td>
+<tr><td> DumpPlugins </td>
+<td>Print plugins loaded in a format digestable by scripts.</td>
+<td>DumpPlugins()</td>
+<tr><td> MoveObject </td>
+<td>Moves the object under the crosshair.</td>
+<td>pcb_move_obj(X,Y,[units])</td>
+<tr><td> integrity </td>
+<td>perform integrirty check on the current board and generate errors if needed</td>
+<td>integrity()</td>
+<tr><td> LayerBinding </td>
+<td>Change the layer binding.</td>
+<td>LayerBinding(object)<br>LayerBinding(selected)<br>LayerBinding(buffer)</td>
+<tr><td> ExecuteFile </td>
+<td>Run actions from the given file.</td>
+<td>ExecuteFile(filename)</td>
+<tr><td> Report </td>
+<td>Produce various report.</td>
+<td>Report(Object|DrillReport|FoundPins|NetLength|NetLengthTo|AllNetLengths|[,name])</td>
+<tr><td> dumplayers </td>
+<td>Print info about each layer</td>
+<td>dumplayers([all])</td>
+<tr><td> h </td>
+<td>Print a help message for commands.</td>
+<td>h</td>
+<tr><td> l </td>
+<td>Loads layout data.</td>
+<td>l [name] [format]</td>
+<tr><td> m </td>
+<td>Loads a layout into the current buffer.</td>
+<td>m [name]</td>
+<tr><td> q </td>
+<td>Quits the application after confirming.</td>
+<td>q</td>
+<tr><td> s </td>
+<td>Saves layout data.</td>
+<td>s [name]<br>w [name]</td>
+<tr><td> w </td>
+<td>Saves layout data.</td>
+<td>s [name]<br>w [name]</td>
+<tr><td> mruby </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> Report </td>
+<td>Produce various report.</td>
+<td>Report(Object|DrillReport|FoundPins|NetLength|NetLengthTo|AllNetLengths|[,name])</td>
+<tr><td> shape </td>
+<td>Interactive shape generator.</td>
+<td>shape()</td>
+<tr><td> skline </td>
+<td>Tool for drawing sketch lines</td>
+<td>skline()</td>
+<tr><td> ToggleHideName </td>
+<tr><td> EvalConf </td>
+<td>Perform various operations on the configuration tree.</td>
+<td>EvalConf(path) - evaluate a config path in different config sources to figure how it ended up in the native database</td>
+<tr><td> Bell </td>
+<td>Attempt to produce audible notification (e.g. beep the speaker).</td>
+<td>Bell()</td>
+<tr><td> FontEdit </td>
+<td>Convert the current font to a PCB for editing.</td>
+<td>FontEdit()</td>
+<tr><td> ReportObject </td>
+<td>Report on the object under the crosshair</td>
+<td>ReportObject()</td>
+<tr><td> LoadFootprint </td>
+<td>Loads a single footprint by name.</td>
+<td>pcb_load_footprint(filename[,refdes,value])</td>
+<tr><td> DisperseElements </td>
+<td>Disperses subcircuits.</td>
+<td>DisperseElements(All|Selected)</td>
+<tr><td> Mode </td>
+<td>Change or use the tool mode.</td>
+<td>Mode(Arc|Arrow|Copy|InsertPoint|Line|Lock|Move|None|PasteBuffer)<br>Mode(Polygon|Rectangle|Remove|Rotate|Text|Thermal|Via)<br>Mode(Notify|Release|Cancel|Stroke)<br>Mode(Save|Restore)</td>
+<tr><td> skline </td>
+<td>Tool for drawing sketch lines</td>
+<td>skline()</td>
+<tr><td> dumpfonts </td>
+<td>Print info about fonts</td>
+<td>dumpfonts()</td>
+<tr><td> ChangeSize </td>
+<td>Changes the size of objects.</td>
+<td>ChangeSize(Object, delta|style)<br>ChangeSize(SelectedObjects|Selected, delta|style)<br>ChangeSize(SelectedLines|SelectedPins|SelectedVias, delta|style)<br>ChangeSize(SelectedPads|SelectedTexts|SelectedNames, delta|style)<br>ChangeSize(SelectedElements, delta|style)</td>
+<tr><td> ToggleVendor </td>
+<td>Toggles the state of automatic drill size mapping.</td>
+<td>ToggleVendor()</td>
+<tr><td> SelectLayer </td>
+<td>Select which layer is the current layer.</td>
+<td>SelectLayer(1..MAXLAYER|Silk|Rats)</td>
+<tr><td> query </td>
+<td>Perform various queries on PCB data.</td>
+<td>query(dump, expr) - dry run: compile and dump an expression</td>
+<tr><td> jostle </td>
+<td>Make room by moving wires away.</td>
+<td>Jostle(diameter)</td>
+<tr><td> ApplyVendor </td>
+<td>Applies the currently loaded vendor drill table to the current design.</td>
+<td>ApplyVendor()</td>
+<tr><td> Debug </td>
+<td>Debug action.</td>
+<td>Debug(...)</td>
+<tr><td> ListRotations </td>
+<tr><td> Unselect </td>
+<td>Unselects the object at the pointer location or the specified objects.</td>
+<td>Unselect(All|Block|Connection)</td>
+<tr><td> jostle </td>
+<td>Make room by moving wires away.</td>
+<td>Jostle(diameter)</td>
+<tr><td> ChangeOctagon </td>
+<tr><td> RemoveMenu </td>
+<td>Recursively removes a new menu, popup (only path specified) or submenu. </td>
+<td>RemoveMenu(path|cookie)</td>
+<tr><td> EnableVendor </td>
+<td>Enables automatic drill size mapping.</td>
+<td>EnableVendor()</td>
+<tr><td> ToPoly </td>
+<td>convert a closed loop of lines and arcs into a polygon</td>
+<td>ToPoly()<br>ToPoly(outline)</td>
+<tr><td> ChangeSizes </td>
+<td>Changes all sizes of objects.</td>
+<td>ChangeSizes(Object, delta|style)<br>ChangeSizes(SelectedObjects|Selected, delta|style)<br>ChangeSizes(SelectedLines|SelectedPins|SelectedVias, delta|style)<br>ChangeSizes(SelectedPads|SelectedTexts|SelectedNames, delta|style)<br>ChangeSizes(SelectedElements, delta|style)</td>
+<tr><td> ManagePlugins </td>
+<td>Manage plugins dialog.</td>
+<td>ManagePlugins()</td>
+<tr><td> ToPoly </td>
+<td>convert a closed loop of lines and arcs into a polygon</td>
+<td>ToPoly()<br>ToPoly(outline)</td>
+<tr><td> roundrect </td>
+<td>Generate a rectangle with round corners</td>
+<td>roundrect([where,] width[;height] [,rx[;ry] [,rotation]])</td>
+<tr><td> LoadMucsFrom </td>
+<td>Loads the specified mucs routing file.</td>
+<td>LoadMucsFrom(filename)</td>
+<tr><td> fp_rehash </td>
+<td>Flush the library index; rescan all library search paths and rebuild the library index. Useful if there are changes in the library during a pcb-rnd session.</td>
+<td>fp_rehash()</td>
+<tr><td> ElementList </td>
+<td>Adds the given element if it doesn't already exist.</td>
+<td>ElementList(Start|Done|Need,<refdes>,<footprint>,<value>)</td>
+<tr><td> PolyHatch </td>
+<td>hatch the selected polygon(s) with lines of the current style; lines are drawn on the current layer; flags are h:horizontal, v:vertical, c:contour, p:poly</td>
+<td>PolyHatch([spacing], [hvcp])<br>PolyHatch(interactive)</td>
+<tr><td> Select </td>
+<td>Toggles or sets the selection.</td>
+<td>Select(Object|ToggleObject)<br>Select(All|Block|Connection)<br>Select(Convert)</td>
+<tr><td> ExportScadPoly </td>
+<td>exports all selected polygons to an openscad script; only the outmost contour of each poly is exported</td>
+<td>ScadExportPoly(filename)</td>
+<tr><td> RemoveSelected </td>
+<td>Removes any selected objects.</td>
+<td>pcb_remove_selected()</td>
+<tr><td> DeleteRats </td>
+<td>Delete rat lines.</td>
+<td>DeleteRats(AllRats|Selected|SelectedRats)</td>
+<tr><td> Quit </td>
+<td>Quits the application after confirming.</td>
+<td>Quit()</td>
+<tr><td> LoadVendorFrom </td>
+<td>Loads the specified vendor lihata file.</td>
+<td>LoadVendorFrom(filename)</td>
+<tr><td> perl </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> LoadMentorFrom </td>
+<td>Loads the specified Mentor Graphics Design Capture schematics flat .edf file.</td>
+<td>LoadMentorFrom(filename)</td>
+<tr><td> PolyStitch </td>
+<tr><td> Select </td>
+<td>Toggles or sets the selection.</td>
+<td>Select(Object|ToggleObject)<br>Select(All|Block|Connection)<br>Select(Convert)</td>
+<tr><td> javascript </td>
+<td>Execute a script one-liner using a specific language</td>
+<td>Oneliner(lang, script)</td>
+<tr><td> PadstackEdit </td>
+<td>interactive pad stack editor</td>
+<td>PadstackEdit(object, [tab])</td>
+<tr><td> About </td>
+<td>Present the about box</td>
+<td>About()</td>
+<tr><td> PrintFiles </td>
+<td>Print files currently loaded.</td>
+<td>PrintFiles()</td>
+<tr><td> PolyOffs </td>
+<td>replicate the outer contour of the selected polygon(s) with growing or shrinking them by offset; the new polygon is drawn on the current layer</td>
+<td>PolyOffs(offset)</td>
+</table>
+</body>
+</html>
Index: tags/2.0.1/doc/user/09_appendix/bridges.svg
===================================================================
--- tags/2.0.1/doc/user/09_appendix/bridges.svg	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/bridges.svg	(revision 18980)
@@ -0,0 +1,210 @@
+<?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">
+<!-- Generated by aagraph -->
+<svg width="1504pt" height="720pt" viewBox="-8 -18 1512 738" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+	<marker id="ahs" viewBox="0 0 60 60" refX="0" refY="30" markerUnits="strokeWidth" markerWidth="8" markerHeight="10" orient="auto">
+		<path d="M 60 0 L 0 30 L 60 60 z" />
+	</marker>
+	<marker id="ahe" viewBox="-60 0 60 60" refX="0" refY="30" markerUnits="strokeWidth" markerWidth="8" markerHeight="10" orient="auto">
+		<g transform="scale(-1 1)">
+		<path d="M 60 0 L 0 30 L 60 60 z" />
+		</g>
+	</marker>
+
+	<polygon fill="#00ffff" stroke="#000000"  points="176,165.6 1200,165.6  1200,518.4 176,518.4"/>
+	<text fill="#000000" text-anchor="middle" x="688" y="342" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">pcb-rnd</tspan></text>
+	<polygon fill="#cccccc" stroke="#cccccc"  points="144,561.6 1232,561.6  1232,698.4 144,698.4"/>
+	<text fill="#884433" text-anchor="middle" x="688" y="698.4" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">output-only</tspan></text>
+	<polygon fill="#cccccc" stroke="#cccccc"  points="176,-14.4 1200,-14.4  1200,122.4 176,122.4"/>
+	<text fill="#884433" text-anchor="middle" x="688" y="-14.4" font-family="Times,serif" font-size="14.00"><tspan dy="0.8em">input-output</tspan></text>
+	<polygon fill="#cccccc" stroke="#cccccc"  points="1280,129.6 1456,129.6  1456,518.4 1280,518.4"/>
+	<text fill="#884433" text-anchor="middle" x="1368" y="129.6" font-family="Times,serif" font-size="14.00"><tspan dy="0.8em">HID (GUI)</tspan></text>
+	<polygon fill="#cccccc" stroke="#cccccc"  points="0,129.6 96,129.6  96,554.4 0,554.4"/>
+	<text fill="#884433" text-anchor="middle" x="48" y="129.6" font-family="Times,serif" font-size="14.00"><tspan dy="0.8em">input-only</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="256,21.6 464,21.6  464,50.4 256,50.4"/>
+	<text fill="#000000" text-anchor="middle" x="360" y="36" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">kicad</tspan><tspan x="360" dy="1em">pcbnew</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1296,237.6 1424,237.6  1424,266.4 1296,266.4"/>
+	<text fill="#000000" text-anchor="middle" x="1360" y="252" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">gtk</tspan><tspan x="1360" dy="1em">gdk or gl render</tspan></text>
+	<polygon fill="none" stroke="#aaaaaa"  points="1280,597.6 1408,597.6  1408,626.4 1280,626.4"/>
+	<text fill="#aaaaaa" text-anchor="middle" x="1344" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">web client</tspan><tspan x="1344" dy="1em">(javascript)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1296,165.6 1408,165.6  1408,194.4 1296,194.4"/>
+	<text fill="#000000" text-anchor="middle" x="1352" y="180" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">batch</tspan><tspan x="1352" dy="1em">CLI/automation</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1296,309.6 1408,309.6  1408,338.4 1296,338.4"/>
+	<text fill="#000000" text-anchor="middle" x="1352" y="324" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">lesstif</tspan><tspan x="1352" dy="1em">(motif)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="624,21.6 736,21.6  736,50.4 624,50.4"/>
+	<text fill="#000000" text-anchor="middle" x="680" y="36" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">gEDA</tspan><tspan x="680" dy="1em">pcb</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1296,381.6 1392,381.6  1392,410.4 1296,410.4"/>
+	<text fill="#000000" text-anchor="middle" x="1344" y="396" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">remote</tspan><tspan x="1344" dy="1em">(network)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="496,57.6 592,57.6  592,86.4 496,86.4"/>
+	<text fill="#000000" text-anchor="middle" x="544" y="72" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">freerouting.net</tspan><tspan x="544" dy="1em">autorouter</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,417.6 80,417.6  80,446.4 16,446.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="432" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">(any)</tspan><tspan x="48" dy="1em">IPC-D-356</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,345.6 80,345.6  80,374.4 16,374.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="360" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">(any)</tspan><tspan x="48" dy="1em">EDIF</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,309.6 80,309.6  80,338.4 16,338.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="324" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">TinyCAD</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,489.6 80,489.6  80,518.4 16,518.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="504" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">HPGL</tspan><tspan x="48" dy="1em">(2D CAD)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,273.6 80,273.6  80,302.4 16,302.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="288" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">LTSpice</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,201.6 80,201.6  80,230.4 16,230.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="216" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">mucs PCB</tspan><tspan x="48" dy="1em">autorouter</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,237.6 80,237.6  80,266.4 16,266.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="252" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">lepton</tspan><tspan x="48" dy="1em">EDA</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,453.6 80,453.6  80,482.4 16,482.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="468" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">EasyEDA</tspan><tspan x="48" dy="1em">(web2.0)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,165.6 80,165.6  80,194.4 16,194.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="180" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">kicad</tspan><tspan x="48" dy="1em">eeschema</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="16,381.6 80,381.6  80,410.4 16,410.4"/>
+	<text fill="#000000" text-anchor="middle" x="48" y="396" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">(any)</tspan><tspan x="48" dy="1em">netlist</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="832,21.6 896,21.6  896,50.4 832,50.4"/>
+	<text fill="#000000" text-anchor="middle" x="864" y="36" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">Mentor</tspan><tspan x="864" dy="1em">hyperlynx</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="992,21.6 1056,21.6  1056,50.4 992,50.4"/>
+	<text fill="#000000" text-anchor="middle" x="1024" y="36" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">gEDA</tspan><tspan x="1024" dy="1em">gschem</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1072,57.6 1136,57.6  1136,86.4 1072,86.4"/>
+	<text fill="#000000" text-anchor="middle" x="1104" y="72" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">Eagle</tspan><tspan x="1104" dy="1em">(board)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="752,57.6 816,57.6  816,86.4 752,86.4"/>
+	<text fill="#000000" text-anchor="middle" x="784" y="72" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">FidoCadJ</tspan><tspan x="784" dy="1em">(board)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="912,57.6 976,57.6  976,86.4 912,86.4"/>
+	<text fill="#000000" text-anchor="middle" x="944" y="72" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">Protel</tspan><tspan x="944" dy="1em">Autotrax</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="656,597.6 720,597.6  720,626.4 656,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="688" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">gerber</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="576,633.6 640,633.6  640,662.4 576,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="608" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">svg</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="976,597.6 1040,597.6  1040,626.4 976,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="1008" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">lpr</tspan><tspan x="1008" dy="1em">(print)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="816,597.6 880,597.6  880,626.4 816,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="848" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">ipcd356</tspan><tspan x="848" dy="1em">e-tester</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="736,633.6 800,633.6  800,662.4 736,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="768" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">png</tspan><tspan x="768" dy="1em">jpg, bmp</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="176,597.6 240,597.6  240,626.4 176,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="208" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">breadboard</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="416,633.6 480,633.6  480,662.4 416,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="448" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">ps</tspan><tspan x="448" dy="1em">postscript</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1056,633.6 1120,633.6  1120,662.4 1056,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="1088" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">dxf</tspan><tspan x="1088" dy="1em">(2D CAD)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="496,597.6 560,597.6  560,626.4 496,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="528" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">XY</tspan><tspan x="528" dy="1em">templated</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="896,633.6 960,633.6  960,662.4 896,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="928" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">nelma</tspan><tspan x="928" dy="1em">(sim)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="1136,597.6 1200,597.6  1200,626.4 1136,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="1168" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">openscad</tspan><tspan x="1168" dy="1em">(3D CAD)</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="336,597.6 400,597.6  400,626.4 336,626.4"/>
+	<text fill="#000000" text-anchor="middle" x="368" y="612" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">BOM</tspan></text>
+	<polygon fill="none" stroke="#000000"  points="256,633.6 320,633.6  320,662.4 256,662.4"/>
+	<text fill="#000000" text-anchor="middle" x="288" y="648" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">stat</tspan><tspan x="288" dy="1em">statistics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="1008" y1="518.4" x2="1008" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 1008 558)">
+	<text fill="#000000" text-anchor="middle" x="1008" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">ps</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="448" y1="518.4" x2="448" y2="633.6" stroke="#000000"/>
+	<g transform="rotate(-90 448 576)">
+	<text fill="#000000" text-anchor="middle" x="448" y="576" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">postscript</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="1088" y1="518.4" x2="1088" y2="633.6" stroke="#000000"/>
+	<line  marker-end="url(#ahe)"  x1="1168" y1="518.4" x2="1168" y2="597.6" stroke="#000000"/>
+	<line  marker-end="url(#ahe)"  x1="608" y1="518.4" x2="608" y2="633.6" stroke="#000000"/>
+	<g transform="rotate(-90 608 576)">
+	<text fill="#000000" text-anchor="middle" x="608" y="576" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">svg</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="288" y1="518.4" x2="288" y2="633.6" stroke="#000000"/>
+	<g transform="rotate(-90 288 576)">
+	<text fill="#000000" text-anchor="middle" x="288" y="576" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">lihata</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="80" y1="216" x2="176" y2="216" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="216" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">netlist</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="768" y1="518.4" x2="768" y2="633.6" stroke="#000000"/>
+	<line  marker-end="url(#ahe)"  x1="80" y1="324" x2="176" y2="324" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="324" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="80" y1="252" x2="176" y2="252" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="252" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="928" y1="518.4" x2="928" y2="633.6" stroke="#000000"/>
+	<line  marker-end="url(#ahe)"  x1="80" y1="432" x2="176" y2="432" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="432" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">netlist</tspan><tspan x="128" dy="1em">pads/subcs</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="80" y1="360" x2="176" y2="360" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="360" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="80" y1="288" x2="176" y2="288" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="288" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="80" y1="468" x2="176" y2="468" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="468" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="80" y1="396" x2="176" y2="396" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="396" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">netlist</tspan></text>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="864" y1="50.4" x2="864" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 864 108)">
+	<text fill="#000000" text-anchor="middle" x="864" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="80" y1="504" x2="176" y2="504" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="504" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">lines/arcs</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="208" y1="518.4" x2="208" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 208 558)">
+	<text fill="#000000" text-anchor="middle" x="208" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">.png</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="713.6" y1="50.4" x2="713.6" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 713.6 108)">
+	<text fill="#000000" text-anchor="middle" x="713.6" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">footprint</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1024" y1="50.4" x2="1024" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 1024 108)">
+	<text fill="#000000" text-anchor="middle" x="1024" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">schematics</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="688" y1="518.4" x2="688" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 688 558)">
+	<text fill="#000000" text-anchor="middle" x="688" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">.grb, .cnc</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="443.2" y1="50.4" x2="443.2" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 443.2 108)">
+	<text fill="#000000" text-anchor="middle" x="443.2" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">footprint</tspan><tspan x="443.2" dy="1em">s-expr</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="368" y1="518.4" x2="368" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 368 558)">
+	<text fill="#000000" text-anchor="middle" x="368" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">text</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="276.8" y1="50.4" x2="276.8" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 276.8 108)">
+	<text fill="#000000" text-anchor="middle" x="276.8" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan><tspan x="276.8" dy="1em">s-expr</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="646.4" y1="50.4" x2="646.4" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 646.4 108)">
+	<text fill="#000000" text-anchor="middle" x="646.4" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="544" y1="86.4" x2="544" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 544 126)">
+	<text fill="#000000" text-anchor="middle" x="544" y="126" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="80" y1="180" x2="176" y2="180" stroke="#000000"/>
+	<text fill="#000000" text-anchor="middle" x="128" y="180" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">import</tspan><tspan x="128" dy="1em">schematics</tspan></text>
+	<line  marker-end="url(#ahe)"  x1="528" y1="518.4" x2="528" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 528 558)">
+	<text fill="#000000" text-anchor="middle" x="528" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">.xy</tspan></text>
+	</g>
+	<line  marker-start="url(#ahs)"  x1="360" y1="50.4" x2="360" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 360 108)">
+	<text fill="#000000" text-anchor="middle" x="360" y="108" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan><tspan x="360" dy="1em">legacy</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1104" y1="86.4" x2="1104" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 1104 126)">
+	<text fill="#000000" text-anchor="middle" x="1104" y="126" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1200" y1="324" x2="1296" y2="324" stroke="#000000"/>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="784" y1="86.4" x2="784" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 784 126)">
+	<text fill="#000000" text-anchor="middle" x="784" y="126" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)"  x1="848" y1="518.4" x2="848" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 848 558)">
+	<text fill="#000000" text-anchor="middle" x="848" y="558" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">IPC356D</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1200" y1="396" x2="1296" y2="396" stroke="#000000"/>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1200" y1="180" x2="1296" y2="180" stroke="#000000"/>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="944" y1="86.4" x2="944" y2="165.6" stroke="#000000"/>
+	<g transform="rotate(-90 944 126)">
+	<text fill="#000000" text-anchor="middle" x="944" y="126" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">board</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1344" y1="410.4" x2="1344" y2="597.6" stroke="#000000"/>
+	<g transform="rotate(-90 1344 504)">
+	<text fill="#000000" text-anchor="middle" x="1344" y="504" font-family="Times,serif" font-size="14.00"><tspan dy="-0.2em">TCP/IP</tspan></text>
+	</g>
+	<line  marker-end="url(#ahe)" marker-start="url(#ahs)"  x1="1200" y1="252" x2="1296" y2="252" stroke="#000000"/>
+</g>
+</svg>
Index: tags/2.0.1/doc/user/09_appendix/combined_glossary.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/combined_glossary.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/combined_glossary.html	(revision 18980)
@@ -0,0 +1,281 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - User Manual: Appendix </h1>
+
+<h2>Glossary</h2>
+
+<h3>Useful terminology for a common vernacular</h3>
+This glossary is under construction.  It currently combines terms that focus 
+pertain to any of the following facet subjects. 
+<ol>
+<li>pcb-rnd specific terminology</li>
+<li>pcb manufacturer terminology</li>
+<li>pcb CAD layout and design terminology</li>
+<li>CAD/graphics common design terminology</li>
+</ol>
+We will fill in definitions, continue to add terms, and determine an
+appropriatly faceted method to index the terms.
+<p>
+<table border=1>
+<caption><b>Combined Glossary Table</b>
+<th>term<th>description<th>facets
+<tr><td> 5/5 <td>5mil minimum traces & 5mil minimum spacing</td></tr>
+<tr><td> 6/5 <td>6mil minimum traces & 5mil minimum spacing</td></tr>
+<tr><td> AMC <td>aluminum metal core</td></tr>
+<tr><td><dt>ACY</dt></tr></td>
+<tr><td><dt>additive</dt></tr></td>
+<tr><td><dt>Adhesive</dt></tr></td>
+<tr><td><dt>Altium</dt></tr></td>
+<tr><td><dt>Annular Ring</dt></tr></td>
+<tr><td><dt>Annulus</dt></tr></td>
+<tr><td><dt>AOI automatic optical inspection</dt></tr></td>
+<tr><td><dt>Aperture</dt></tr></td>
+<tr><td><dt>Arc</dt></tr></td>
+<tr><td><dt>Array</dt></tr></td>
+<tr><td><dt>assembly</dt></tr></td>
+<tr><td><dt>AutoCAD</dt></tr></td>
+<tr><td><dt>autorouter</dt></tr></td>
+<tr><td><dt>Autotrax</dt></tr></td>
+<tr><td><dt>Autotrax</dt></tr></td>
+<tr><td><dt>AXI automated x-ray inspection</dt></tr></td>
+<tr><td><dt>Axial</dt></tr></td>
+<tr><td><dt>Bakelite</dt></tr></td>
+<tr><td><dt>BGA</dt></tr></td>
+<tr><td><dt>Blind Via </dt></tr></td>
+<tr><td><dt>bloat</dt></tr></td>
+<tr><td><dt>board house</dt></tr></td>
+<tr><td><dt>Board Thickness</dt></tr></td>
+<tr><td><dt>Breadboard</dt></tr></td>
+<tr><td><dt>buffer</dt></tr></td>
+<tr><td><dt>Buried Via </dt></tr></td>
+<tr><td><dt>bus</dt></tr></td>
+<tr><td><dt>C4 Controlled collapse chip connection</dt></tr></td>
+<tr><td><dt>CAD</dt></tr></td>
+<tr><td><dt>CAM files</dt></tr></td>
+<tr><td><dt>CAM</dt></tr></td>
+<tr><td><dt>Capture</dt></tr></td>
+<tr><td><dt>Card Edge connector</dt></tr></td>
+<tr><td><dt>Castellations</dt></tr></td>
+<tr><td><dt>CEM-1</dt></tr></td>
+<tr><td><dt>CEM-3</dt></tr></td>
+<tr><td><dt>Centroid</dt></tr></td>
+<tr><td><dt>centroid</dt></tr></td>
+<tr><td><dt>Chip Scale Package</dt></tr></td>
+<tr><td><dt>clad</dt></tr></td>
+<tr><td><dt>Clearance</dt></tr></td>
+<tr><td><dt>Coating (Spin, Roll, Film)</dt></tr></td>
+<tr><td><dt>COB</dt></tr></td>
+<tr><td><dt>Component Side	</dt></tr></td>
+<tr><td><dt>Component</dt></tr></td>
+<tr><td><dt>Computer Aided Design</dt></tr></td>
+<tr><td><dt>Computer Aided Machining</dt></tr></td>
+<tr><td><dt>Conformal Coating</dt></tr></td>
+<tr><td><dt>Conformal coating</dt></tr></td>
+<tr><td><dt>connect</dt></tr></td>
+<tr><td><dt>Copper Foil</dt></tr></td>
+<tr><td><dt>Copper weight</dt></tr></td>
+<tr><td><dt>Copper</dt></tr></td>
+<tr><td><dt>copper</dt></tr></td>
+<tr><td><dt>courtyard</dt></tr></td>
+<tr><td><dt>cte coefficient of thermal expansion (see tce)</dt></tr></td>
+<tr><td><dt>Curve, open</dt></tr></td>
+<tr><td><dt>delamination</dt></tr></td>
+<tr><td><dt>DFSM Dry film soldermask</dt></tr></td>
+<tr><td><dt>Dialectric</dt></tr></td>
+<tr><td><dt>Diameter</dt></tr></td>
+<tr><td><dt>Dielectric</dt></tr></td>
+<tr><td><dt>differential pair</dt></tr></td>
+<tr><td><dt>DIP</dt></tr></td>
+<tr><td><dt>Discrete Component</dt></tr></td>
+<tr><td><dt>double-sided</dt></tr></td>
+<tr><td><dt>DRC design rule check</dt></tr></td>
+<tr><td><dt>Drill file</dt></tr></td>
+<tr><td><dt>Eagle</dt></tr></td>
+<tr><td><dt>EDF</dt></tr></td>
+<tr><td><dt>EDI Electronic Data Interchange</dt></tr></td>
+<tr><td><dt>Endpoint</dt></tr></td>
+<tr><td><dt>ENIG Electroless Nickel Immersion Gold</dt></tr></td>
+<tr><td><dt>epoxy resin</dt></tr></td>
+<tr><td><dt>ESD Electrostatic Discharge</dt></tr></td>
+<tr><td><dt>Etching</dt></tr></td>
+<tr><td><dt>Excellon</dt></tr></td>
+<tr><td><dt>explicit layer</dt></tr></td>
+<tr><td><dt>fabrication fab</dt></tr></td>
+<tr><td><dt>Feedthrough Via</dt></tr></td>
+<tr><td><dt>fidocad</dt></tr></td>
+<tr><td><dt>Fiducial</dt></tr></td>
+<tr><td><dt>Finger</dt></tr></td>
+<tr><td><dt>Finite Element Filter</dt></tr></td>
+<tr><td><dt>Fixture</dt></tr></td>
+<tr><td><dt>flags</dt></tr></td>
+<tr><td><dt>Flex</dt></tr></td>
+<tr><td><dt>Flip chip</dt></tr></td>
+<tr><td><dt>flood fill</dt></tr></td>
+<tr><td><dt>Flux</dt></tr></td>
+<tr><td><dt>Flying probe</dt></tr></td>
+<tr><td><dt>Foil</dt></tr></td>
+<tr><td><dt>font</dt></tr></td>
+<tr><td><dt>Footprint</dt></tr></td>
+<tr><td><dt>FR-1</dt></tr></td>
+<tr><td><dt>FR-2</dt></tr></td>
+<tr><td><dt>FR-3</dt></tr></td>
+<tr><td><dt>FR-4</dt></tr></td>
+<tr><td><dt>Gcode</dt></tr></td>
+<tr><td><dt>gEDA</dt></tr></td>
+<tr><td><dt>Gerber</dt></tr></td>
+<tr><td><dt>grid snap</dt></tr></td>
+<tr><td><dt>grid-pitch</dt></tr></td>
+<tr><td><dt>grid</dt></tr></td>
+<tr><td><dt>Hard Gold pcb surface finish (slip rings, fingers, etc)</dt></tr></td>
+<tr><td><dt>HASL Hot Air surface levelling</dt></tr></td>
+<tr><td><dt>High Density Interconnect(HDI)</dt></tr></td>
+<tr><td><dt>Hole</dt></tr></td>
+<tr><td><dt>Immersion Silver</dt></tr></td>
+<tr><td><dt>Immersion Tin</dt></tr></td>
+<tr><td><dt>implicit layer</dt></tr></td>
+<tr><td><dt>Integrated Circuit</dt></tr></td>
+<tr><td><dt>IPC (circa 1957)</dt></tr></td>
+<tr><td><dt>JIT</dt></tr></td>
+<tr><td><dt>Kapton</dt></tr></td>
+<tr><td><dt>KiCAD</dt></tr></td>
+<tr><td><dt>Knife</dt></tr></td>
+<tr><td><dt>Laminate</dt></tr></td>
+<tr><td><dt>Land</dt></tr></td>
+<tr><td><dt>Laser </dt></tr></td>
+<tr><td><dt>Layer Group</dt></tr></td>
+<tr><td><dt>Layer Sequence</dt></tr></td>
+<tr><td><dt>Layers (Physical)</dt></tr></td>
+<tr><td><dt>Layers (Virtual)</dt> </tr></td>
+<tr><td><dt>Library</dt></tr></td>
+<tr><td><dt>Lihata</dt></tr></td>
+<tr><td><dt>mask</dt></tr></td>
+<tr><td><dt>Masonite</dt></tr></td>
+<tr><td><dt>Mentor</dt></tr></td>
+<tr><td><dt>Mil</dt></tr></td>
+<tr><td><dt>Milling</dt></tr></td>
+<tr><td><dt>milling</dt></tr></td>
+<tr><td><dt>Mirroring</dt></tr></td>
+<tr><td><dt>Mouse bites</dt></tr></td>
+<tr><td><dt>Multilayer</dt></tr></td>
+<tr><td><dt>neckdown</dt></tr></td>
+<tr><td><dt>negative process</dt></tr></td>
+<tr><td><dt>Negative transfer</dt></tr></td>
+<tr><td><dt>NEMA</dt></tr></td>
+<tr><td><dt>Net</dt></tr></td>
+<tr><td><dt>Netlist</dt></tr></td>
+<tr><td><dt>ODB++</dt></tr></td>
+<tr><td><dt>OrCAD</dt></tr></td>
+<tr><td><dt>OSP Organic Solderability preservative</dt></tr></td>
+<tr><td><dt>outline</dt></tr></td>
+<tr><td><dt>Package</dt></tr></td>
+<tr><td><dt>Pad</dt></tr></td>
+<tr><td><dt>padstack</dt></tr></td>
+<tr><td><dt>Panel Service</dt></tr></td>
+<tr><td><dt>panel</dt></tr></td>
+<tr><td><dt>Panelization</dt></tr></td>
+<tr><td><dt>paste stencil</dt></tr></td>
+<tr><td><dt>paste</dt></tr></td>
+<tr><td><dt>Path</dt></tr></td>
+<tr><td><dt>pcb-rnd</dt></tr></td>
+<tr><td><dt>PCB</dt></tr></td>
+<tr><td><dt>PDIP</dt></tr></td>
+<tr><td><dt>phenolic resin</dt></tr></td>
+<tr><td><dt>Photoengraving</dt></tr></td>
+<tr><td><dt>Photoresist</dt></tr></td>
+<tr><td><dt>pick and place pnp</dt></tr></td>
+<tr><td><dt>Pin</dt></tr></td>
+<tr><td><dt>pinout</dt></tr></td>
+<tr><td><dt>pitch</dt></tr></td>
+<tr><td><dt>PLCC plastic lead chip carrier</dt></tr></td>
+<tr><td><dt>plotter</dt></tr></td>
+<tr><td><dt>Polygon hole</dt></tr></td>
+<tr><td><dt>Polygon, complex</dt></tr></td>
+<tr><td><dt>Polygon, concave</dt></tr></td>
+<tr><td><dt>Polygon, convex</dt></tr></td>
+<tr><td><dt>Polygon, irregular</dt></tr></td>
+<tr><td><dt>Polygon, regular</dt></tr></td>
+<tr><td><dt>Polygon, simple</dt></tr></td>
+<tr><td><dt>Polygon</dt></tr></td>
+<tr><td><dt>polygon</dt></tr></td>
+<tr><td><dt>positive process</dt></tr></td>
+<tr><td><dt>Positive transfer</dt></tr></td>
+<tr><td><dt>Protel</dt></tr></td>
+<tr><td><dt>PTH</dt></tr></td>
+<tr><td><dt>Pyralux AP</dt></tr></td>
+<tr><td><dt>Pyralux FR</dt></tr></td>
+<tr><td><dt>Pyralux LF</dt></tr></td>
+<tr><td><dt>QFP</dt></tr></td>
+<tr><td><dt>Radial Lead</dt></tr></td>
+<tr><td><dt>Raster</dt></tr></td>
+<tr><td><dt>rat</dt></tr></td>
+<tr><td><dt>Ratsnest</dt></tr></td>
+<tr><td><dt>refdes Reference Designator, https://en.wikipedia.org/wiki/Reference_designator</dt></tr></td>
+<tr><td><dt>reflow</dt></tr></td>
+<tr><td><dt>Registration</dt></tr></td>
+<tr><td><dt>resin</dt></tr></td>
+<tr><td><dt>resist</dt></tr></td>
+<tr><td><dt>RF</dt></tr></td>
+<tr><td><dt>Rigid-Flex</dt></tr></td>
+<tr><td><dt>Route and Retain</dt></tr></td>
+<tr><td><dt>routing style</dt></tr></td>
+<tr><td><dt>Routing</dt></tr></td>
+<tr><td><dt>routing</dt></tr></td>
+<tr><td><dt>RS-274D</dt></tr></td>
+<tr><td><dt>RS-274X</dt></tr></td>
+<tr><td><dt>Rubylithe</dt></tr></td>
+<tr><td><dt>Scoring</dt></tr></td>
+<tr><td><dt>Short</dt></tr></td>
+<tr><td><dt>Silk Screen</dt></tr></td>
+<tr><td><dt>Silk</dt></tr></td>
+<tr><td><dt>silk</dt></tr></td>
+<tr><td><dt>single-sided</dt></tr></td>
+<tr><td><dt>SIP</dt></tr></td>
+<tr><td><dt>slot</dt></tr></td>
+<tr><td><dt>SMD</dt></tr></td>
+<tr><td><dt>SMOBC soldermask over bare copper</dt>  prevent unintended flow of tin/lead during reflow </tr></td>
+<tr><td><dt>SMT</dt></tr></td>
+<tr><td><dt>Snap</dt></tr></td>
+<tr><td><dt>SOIC</dt></tr></td>
+<tr><td><dt>Solder Side</dt></tr></td>
+<tr><td><dt>Solder</dt></tr></td>
+<tr><td><dt>STEP</dt></tr></td>
+<tr><td><dt>Subcircuit</dt></tr></td>
+<tr><td><dt>Substrate</dt></tr></td>
+<tr><td><dt>Subtractive</dt></tr></td>
+<tr><td><dt>Symbol</dt></tr></td>
+<tr><td><dt>Tape out</dt></tr></td>
+<tr><td><dt>TCE thermal coefficient of expansion</dt></tr></td>
+<tr><td><dt>tEDAx</dt></tr></td>
+<tr><td><dt>Tented(Via)</dt></tr></td>
+<tr><td><dt>terminal</dt></tr></td>
+<tr><td><dt>TG Glass transition temp</dt></tr></td>
+<tr><td><dt>Thermal Via Thermal relief</dt></tr></td>
+<tr><td><dt>Thou</dt></tr></td>
+<tr><td><dt>Tin Whisker</dt></tr></td>
+<tr><td><dt>Tin</dt></tr></td>
+<tr><td><dt>TinyCAD</dt></tr></td>
+<tr><td><dt>Tolerance</dt></tr></td>
+<tr><td><dt>tombstone</dt></tr></td>
+<tr><td><dt>tooling</dt></tr></td>
+<tr><td><dt>toolpath generator</dt></tr></td>
+<tr><td><dt>toolpath</dt></tr></td>
+<tr><td><dt>toporouter</dt></tr></td>
+<tr><td><dt>Trace</dt></tr></td>
+<tr><td><dt>TT toner transfer</dt></tr></td>
+<tr><td><dt>V-Cut</dt> aka v-scoring</tr></td>
+<tr><td><dt>V-score</dt></tr></td>
+<tr><td><dt>Vcc</dt></tr></td>
+<tr><td><dt>Vdd</dt></tr></td>
+<tr><td><dt>Vector</dt></tr></td>
+<tr><td><dt>Via stitching</dt></tr></td>
+<tr><td><dt>Via</dt></tr></td>
+<tr><td><dt>Wave Solder</dt></tr></td>
+<tr><td><dt>Wire bonding</dt></tr></td>
+<tr><td><dt>XY</dt></tr></td>
+</table>
Index: tags/2.0.1/doc/user/09_appendix/dialogtable.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/dialogtable.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/dialogtable.html	(revision 18980)
@@ -0,0 +1,95 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title> pcb-rnd </title>
+<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+<link rel="stylesheet" type="text/css" href=" ../default.css">
+</head>
+<body>
+<p>
+<table border=1>
+<caption><b>
+pcb-rnd gtk2-gl dialog list, pcb-rnd 1.2.3
+</b>
+<th>name</th>
+<th>		open hk*</th>
+<th>	exit hk*</th>
+<th>	action</th>
+<th>		focus</th>
+<th>	modality</th>
+<tr><td> main window </td>
+<td> 	 </td>
+<td> 		ctrl-q </td>
+<td> 		na </td>
+<td> 		na </td>
+<td> 	na </td>
+<tr><td> library </td>
+<td> 	i </td>
+<td> 		esc </td>
+<td> 		nk </td>
+<td> 		top </td>
+<td> 	modeless </td>
+<tr><td> message log </td>
+<td> 	various </td>
+<td> 	alt-c </td>
+<td> 		message </td>
+<td> 	normal </td>
+<td> 	modeless </td>
+<tr><td> DRC check </td>
+<td> 	nk </td>
+<td> 		alt-c </td>
+<td> 		drc </td>
+<td> 		normal </td>
+<td> 	modeless </td>
+<tr><td> netlist </td>
+<td> 	nk </td>
+<td> 		alt-c </td>
+<td> 		netlist </td>
+<td> 	normal </td>
+<td> 	modeless </td>
+<tr><td> command entry </td>
+<td> 	: </td>
+<td> 		esc </td>
+<td> 		nk </td>
+<td> 		locks </td>
+<td> 	modeless </td>
+<tr><td> pinout </td>
+<td> 		shift-d </td>
+<td> 	alt-c </td>
+<td> 		display(pinout) </td>
+<td> normal </td>
+<td> 	modeless </td>
+<tr><td> font selector </td>
+<td> 	ctl-sh-f </td>
+<td> 	esc </td>
+<td> 		fontsel </td>
+<td> 	top </td>
+<td> 	modeless </td>
+<tr><td> preferences </td>
+<td> 	nk </td>
+<td> 		alt-o </td>
+<td> 		nk </td>
+<td> 		normal </td>
+<td> 	modeless </td>
+<tr><td> contextmenu </td>
+<td> 	sh-rghtclk </td>
+<td> 	esc </td>
+<td> 		nk </td>
+<td> 		na </td>
+<td> 	na </td>
+<tr><td> route styles </td>
+<td> 	nk </td>
+<td> 		esc </td>
+<td> 		route_styles </td>
+<td> 	locks </td>
+<td> 	modal </td>
+<tr><td> lock dialog </td>
+<td> 	f12-sel </td>
+<td> 	esc </td>
+<td> 		lock </td>
+<td> 		top </td>
+<td> 	modeless </td>
+</table>
+</body>
+* hk (hotkeys) assume stock default config<br>
+</html>
Index: tags/2.0.1/doc/user/09_appendix/external_resources.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/external_resources.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/external_resources.html	(revision 18980)
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual appendix </h1>
+
+<h2> 9.3.1 pcb-rnd community Resources</h2>
+<ol>
+<li><a href="http://repo.hu/projects/repo.hu/">repo.hu</a> is the pcb-rnd
+maintainer's SVN based project hosting site</li>
+<li>Contributer erichVK5's <a href="http://vk5hse.blogspot.com/">blog</a>,
+(including many posts directly and indirectly relevant to pcb-rnd)</li>
+<li>Contributer erichVK5's <a href="https://github.com/erichVK5">github</a></li> repository
+</ol>
+
+<h2> 9.3.2 resources on building and contributing to pcb-rnd</h2>
+<ol>
+<li><a href="http://repo.hu/projects/pcb-rnd/contrib.html">contribution guidelines</a> for pcb-rnd</li>
+<li><a href="http://repo.hu/projects/pcb-rnd/irc.html">live chat</a> with the pcb-rnd user community </li>
+<li>StackOverflow discussion on using <a href="https://stackoverflow.com/questions/35670/how-do-i-begin-using-svn">svn</a></li>
+</ol>
+
+<h2> 9.3.3 Printed Circuit Board fabrication Resources</h2>
+<ol>
+<li>PCB Reference for pth and smt pcb footprint definitions<a href="http://scififaster.net/librrry/land_patterns_20070818.pdf"> pdf
+warning! </a></li> 
+<li><a href="https://www.google.com/search?q=AN4005&oq=AN4005">AN4005</a> example industry appnote of layout considerations (many abound) </li>
+</ol>
+
+<h2> 9.3.4 EDA Resource Links</h2>
+<ol>
+<li>gEDA</li><a
+href="http://www.geda-project.org/">http://www.geda-project.org</a>
+<li>KiCAD</li> 
+<a href="http://kicad-pcb.org/">http://kicad-pcb.org</a>
+<li>Eagle</li>
+<a href="https://www.autodesk.com/products/eagle/overview">https://www.autodesk.com/products/eagle/overview</a>
+</ol>
+</body>
+</html>
Index: tags/2.0.1/doc/user/09_appendix/formats.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/formats.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/formats.html	(revision 18980)
@@ -0,0 +1,337 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - list of file formats </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+
+<h1> pcb-rnd - User Manual: Appendix </h1>
+<p>
+<h2> File format support </h2>
+
+<table border=1>
+	<tr>
+	<th> plugin <th> native <th> state <th> reads formats <th> writes formats
+
+<tr><th>io_lihata
+<td>yes
+<td>works
+ <td>
+  lihata pcb-rnd board (any version)
+  <br>
+  lihata pcb-rnd footprint (any version)
+  <br>
+  lihata pcb-rnd font (any version)
+ <td>
+  lihata pcb-rnd board (any version)
+  <br>
+  lihata pcb-rnd footprint (any version)
+  <br>
+  lihata pcb-rnd font (any version)
+<tr><th>io_autotrax
+<td>no
+<td>works
+ <td>
+  autotrax PCB, version 4
+  <br>
+  autotrax PCB, version 5
+ <td>
+  autotrax PCB, version 4
+<tr><th>io_eagle
+<td>no
+<td>works
+ <td>
+  eagle xml board version 6, 7 and 8
+  <br>
+  eagle xml library
+  <br>
+  eagle binary board version 3, 4 and 5
+  <br>
+  eagle binary library
+  <br>
+  eagle DRU (design rules)
+ <td>
+n/a
+<tr><th>io_hyp
+<td>no
+<td>works
+ <td>
+  hyperlynx board, version 2 and above
+ <td>
+  hyperlynx board, version 2.0
+<tr><th>io_kicad
+<td>no
+<td>works
+ <td>
+  kicad board, version 3, 4 and 20170123 (s-expr)
+  <br>
+  eeschema netlist and footprint info
+ <td>
+  kicad board, version 3 (s-expr)
+  <br>
+  kicad module (s-expr, according to version 3)
+<tr><th>io_kicad_legacy
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  kicad pcbnew-board, version 1 (legacy plain text format)
+  <br>
+  kicad pcbnew-module (legacy plain text format)
+<tr><th>io_mentor_cell
+<td>no
+<td>WIP
+ <td>
+  Mentor Graphics cell footprints
+ <td>
+n/a
+<tr><th>io_pcb
+<td>no
+<td>works
+ <td>
+  gEDA/PCB .pcb board (any version up to 2017)
+  <br>
+  gEDA/PCB .fp footprints
+  <br>
+  gEDA/PCB font
+ <td>
+  gEDA/PCB .pcb board (various version up to 2017 )
+  <br>
+  gEDA/PCB .fp footprints
+<tr><th>io_tedax
+<td>no
+<td>works
+ <td>
+  tEDAx netlist (any version)
+  <br>
+  tEDAx footprint (any version)
+ <td>
+  tEDAx footprint (any version)
+<tr><th>import_dsn
+<td>no
+<td>works
+ <td>
+  import wires and vias from specctra .dsn
+ <td>
+n/a
+<tr><th>import_edif
+<td>no
+<td>works
+ <td>
+  flat netlist from EDIF
+ <td>
+n/a
+<tr><th>import_fpcb_nl
+<td>no
+<td>works
+ <td>
+  import netlist and footprint names from freepcb netlist
+ <td>
+n/a
+<tr><th>import_hpgl
+<td>no
+<td>works
+ <td>
+  import lines, arcs and polygons from HPGL plot files
+ <td>
+n/a
+<tr><th>import_ipcd356
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  import IPC-D-356 Netlist (from automated testing)
+<tr><th>import_ltspice
+<td>no
+<td>works
+ <td>
+  import netlist and footprint names from ltspice .net and .asc file pairs
+ <td>
+n/a
+<tr><th>import_mentor_sch
+<td>no
+<td>works
+ <td>
+  import netlist and footprint names from a flat .edf produced by Mentor Graphics Design Capture
+ <td>
+n/a
+<tr><th>import_mucs
+<td>no
+<td>works
+ <td>
+  import lines and vias from MUCS unixplot .pl files
+ <td>
+n/a
+<tr><th>import_netlist
+<td>no
+<td>works
+ <td>
+  import plain text gEDA netlist files
+ <td>
+n/a
+<tr><th>import_sch
+<td>no
+<td>works
+ <td>
+  import netlist and footprint info from gEDA schematics using gnetlist
+  <br>
+  import netlist and footprint produced by an external command
+ <td>
+n/a
+<tr><th>import_tinycad
+<td>no
+<td>works
+ <td>
+  import netlist and footprint info from tinycad .net netlists
+ <td>
+n/a
+<tr><th>export_bboard
+<td>no
+<td>WIP
+ <td>
+n/a
+ <td>
+  export breadboard assembly drawing in png
+<tr><th>export_bom
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export bom (Bill of Materials) in plain text
+<tr><th>export_dsn
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export specctra .dsn files with padstacks and subcircuits (usable for freerouting)
+<tr><th>export_dxf
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export to 2D .dxf (for mech CADs)
+<tr><th>export_fidocadj
+<td>no
+<td>WIP
+ <td>
+n/a
+ <td>
+  partial export in fidocad .fcd format
+<tr><th>export_gcode
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export gcode (for milling)
+<tr><th>export_gerber
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export gerber for PCB fabbing, multiple files (configurable)
+<tr><th>export_ipcd356
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export IPC-D-356 Netlist (for automated testing)
+<tr><th>export_lpr
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  use export_ps and lpr to print a board directly
+<tr><th>export_nelma
+<td>no
+<td>deprecated
+ <td>
+n/a
+ <td>
+  export a board in the nelma format for Numerical capacitance calculation
+<tr><th>export_openems
+<td>no
+<td>WIP
+ <td>
+n/a
+ <td>
+  export a matlab file suitable for OpenEMS simulation
+<tr><th>export_openscad
+<td>no
+<td>WIP
+ <td>
+n/a
+ <td>
+  export a colored 3D model as an openscad script
+<tr><th>export_png
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  render the on-screen version or emulated photo mode version in .png
+  <br>
+  render the on-screen version or emulated photo mode version in .gif
+  <br>
+  render the on-screen version or emulated photo mode version in .jpeg
+<tr><th>export_ps
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  render black&white postscript (single or multiple files)
+  <br>
+  render black&white or color embedded postscript (single file)
+<tr><th>export_stat
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  export a lihata file with anonimized statistics of the board
+<tr><th>export_svg
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  write an svg (Scalable Vector Graphics)
+<tr><th>export_test
+<td>
+<td>WIP
+ <td>
+n/a
+ <td>
+n/a
+<tr><th>export_xy
+<td>no
+<td>works
+ <td>
+n/a
+ <td>
+  geda/PCB xy
+  <br>
+  gxyrs
+  <br>
+  Macrofab's pick&place
+  <br>
+  pick&place file for the TM220/TM240 device
+  <br>
+  KiCad .pos file
+
+</table>
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/09_appendix/index.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/index.html	(revision 18980)
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - User Manual: Appendix </h1>
+<p>
+<h2> 9.0 pcb-rnd action reference</h2>
+<li><a href="action_reference.html"> pcb-rnd action reference</a> 
+<h2> 9.1 Glossary of terminology</h2>
+<li><a href="combined_glossary.html"> useful terminology for a common
+vernacular</a>
+<h2> 9.2 External resources</h2>
+<li><a href="external_resources.html">useful resources for designing with
+pcb-rnd </a>
+
+<h2> 9.4 Layer colors</h2>
+<li><a href="layer_colors.html">layer color mechanism</a>
+</body>
+</html>
+
Index: tags/2.0.1/doc/user/09_appendix/layer_colors.html
===================================================================
--- tags/2.0.1/doc/user/09_appendix/layer_colors.html	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/layer_colors.html	(revision 18980)
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual appendix </h1>
+
+<h2> 9.4 Layer colors</h2>
+<p>
+Each layer has its own layer color. Starting with lihata board v5, the
+layer color is saved to and loaded from board files. Layers retrain their
+color even when they are moved within or between layer groups.
+<p>
+In parallel to this mechanism, there is a set of <i>default</i> colors
+defined in the conf subsystem: a set of default copper layer colors and
+specific default colors for paste, mask and silk layers.
+<p>
+There are only two cases when the default colors from the config subsystem
+are used:
+<ul>
+<li>
+When a new layer is created or a layer without color specified is loaded
+from a file or when a layer is loaded from a file format that does not
+support per layer color, a default color is assigned from the config,
+depending on the layer type. 
+
+<li>
+When an object needs to be displayed out of the board, e.g. in the footprint
+preview window of the library dialog
+</ul>
+<p>
+Composite rendering: positive layers are always rendered using their own
+layer color (e.g. it is possible to define two silk layers in the top silk
+group with two different colors, and the silk drawing on screen will have
+two colors). A negative layer's color is normally invisible, thus does not
+matter, because objects of a negative layer are removing pixels, not drawing
+them.
+<p>
+When a composite layer group is rendered with the first layer being negative
+(typical for mask), the rendering code needs to apply a fill that covers
+the whole board, so the negative layer objects can cut out from that fill. The
+color of this fill is the color of the first layer.
+
+</body>
+</html>
Index: tags/2.0.1/doc/user/09_appendix/src/Makefile
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/Makefile	(revision 18980)
@@ -0,0 +1,20 @@
+# NOTE: aagraph is at svn://repo.hu/projects/aagraph/trunk
+
+CLEANFILES=../action_reference.html ../dialogtable.html ../bridges.svg ../formats.html
+
+all:  ../action_reference.html ../dialogtable.html ../formats.html ../bridges.svg
+
+../action_reference.html : ./dump_actions_to_html.sh ../../../../src/pcb-rnd
+	./dump_actions_to_html.sh > ../action_reference.html
+
+../dialogtable.html: pcb-rnd-dialogs ./process_dialogtable.sh ../../../../src/pcb-rnd
+	./process_dialogtable.sh > ../dialogtable.html
+
+../bridges.svg: bridges.txt
+	aagraph -Tsvg bridges.txt > ../bridges.svg
+
+../formats.html: gen_formats.sh ../../../../src_plugins/io_*/*.pup ../../../../src_plugins/import_*/*.pup ../../../../src_plugins/export_*/*.pup
+	./gen_formats.sh > ../formats.html
+
+clean:  
+	rm $(CLEANFILES)
Index: tags/2.0.1/doc/user/09_appendix/src/bridges.txt
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/bridges.txt	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/bridges.txt	(revision 18980)
@@ -0,0 +1,295 @@
+           *io--------------------------------------------------------------+
+           |    [kica         ]        [gpcb   ]    [hyp_]    [gsch]        |
+           |                   [ frt_ ]        [fido]    [prtl]    [eagl]   |
+           +----------------------------------------------------------------+
+*inp---+                                                                        *hid--------+
+|[eesc]|   *pcbrnd----------------------------------------------------------+   |[batch  ]  |
+|[mucs]|   |                                                                |   |           |
+|[lept]|   |                                                                |   |[gtk     ] |
+|[ltsp]|   |                                                                |   |           |
+|[tcad]|   |                                                                |   |[lesstif]  |
+|[edif]|   |                                                                |   |           |
+|[netl]|   |                                                                |   |[remote]   |
+|[ipcd]|   |                                                                |   |           |
+|[easy]|   |                                                                |   |           |
+|[hpgl]|   +----------------------------------------------------------------+   +-----------+
++------+
+         *out-----------------------------------------------------------------+
+         | [bbrd]    [bom_]    [xy__]    [gerb]    [opcd]    [lpr_]    [scad] | [web     ]
+         |      [stat]    [ps__]    [svg_]    [png_]    [nelm]    [dxf_]      |
+         +--------------------------------------------------------------------+
+%%
+
+[]
+	shape box
+
+
+[inp]
+	linecolor #cccccc
+	bgcolor #cccccc
+	textcolor #884433
+	label input-only
+	valign top
+
+[io]
+	linecolor #cccccc
+	bgcolor #cccccc
+	textcolor #884433
+	label input-output
+	valign top
+
+[out]
+	linecolor #cccccc
+	bgcolor #cccccc
+	textcolor #884433
+	label output-only
+	valign bottom
+
+[hid]
+	linecolor #cccccc
+	bgcolor #cccccc
+	textcolor #884433
+	label HID (GUI)
+	valign top
+
+
+[pcbrnd]
+	label pcb-rnd
+	bgcolor #00ffff
+
+
+[eesc]
+	label kicad\neeschema
+
+[mucs]
+	label mucs PCB\nautorouter
+
+[lept]
+	label lepton\nEDA
+
+[ltsp]
+	label LTSpice
+	
+[tcad]
+	label TinyCAD
+
+[edif]
+	label (any)\nEDIF
+
+[netl]
+	label (any)\nnetlist
+
+[ipcd]
+	label (any)\nIPC-D-356
+
+[hpgl]
+	label HPGL\n(2D CAD)
+
+[easy]
+	label EasyEDA\n(web2.0)
+
+[bbrd]
+	label breadboard
+
+
+[hyp_]
+	label Mentor\nhyperlynx
+
+[gsch]
+	label gEDA\ngschem
+
+[kica]
+	label kicad\npcbnew
+
+[gpcb]
+	label gEDA\npcb
+
+[frt_]
+	label freerouting.net\nautorouter
+
+[fido]
+	label FidoCadJ\n(board)
+
+[prtl]
+	label Protel\nAutotrax
+
+[eagl]
+	label Eagle\n(board)
+
+
+
+[bbrd]
+	label breadboard
+
+[bom_]
+	label BOM
+
+[xy__]
+	label XY\ntemplated
+
+[gerb]
+	label gerber
+
+[opcd]
+	label ipcd356\ne-tester
+
+[lpr_]
+	label lpr\n(print)
+
+[dxf_]
+	label dxf\n(2D CAD)
+
+[scad]
+	label openscad\n(3D CAD)
+
+[stat]
+	label stat\nstatistics
+
+[ps__]
+	label ps\npostscript
+
+[svg_]
+	label svg
+
+[png_]
+	label png\njpg, bmp
+
+[nelm]
+	label nelma\n(sim)
+
+
+
+
+
+[batch]
+	label batch\nCLI/automation
+
+[gtk]
+	label gtk\ngdk or gl render
+
+[lesstif]
+	label lesstif\n(motif)
+
+[remote]
+	label remote\n(network)
+
+[web]
+	label web client\n(javascript)
+	linecolor #aaaaaa
+	textcolor #aaaaaa
+
+
+-> pcbrnd bbrd.n
+	label .png
+
+-> pcbrnd bom_.n
+	label text
+
+-> pcbrnd xy__.n
+	label .xy
+
+-> pcbrnd gerb.n
+	label .grb, .cnc
+
+-> eesc.e pcbrnd
+	label import\nschematics
+
+-> pcbrnd opcd.n
+	label IPC356D
+
+-> pcbrnd lpr_.n
+	label ps
+
+-> pcbrnd dxf_.n
+
+-> pcbrnd scad.n
+
+-> pcbrnd stat.n
+	label lihata
+
+-> pcbrnd ps__.n
+	label postscript
+
+-> pcbrnd svg_.n
+	label svg
+
+-> pcbrnd png_.n
+
+-> pcbrnd nelm.n
+
+
+
+-> mucs.e pcbrnd
+	label import\nnetlist
+
+-> lept.e pcbrnd
+	label import\nschematics
+
+-> ltsp.e pcbrnd
+	label import\nschematics
+
+-> tcad.e pcbrnd
+	label import\nschematics
+
+-> edif.e pcbrnd
+	label import\nschematics
+
+-> netl.e pcbrnd
+	label import\nnetlist
+
+-> ipcd.e pcbrnd
+	label netlist\npads/subcs
+
+-> easy.e pcbrnd
+	label import\nschematics
+
+-> hpgl.e pcbrnd
+	label import\nlines/arcs
+
+
+
+
+<-> hyp_.s pcbrnd
+	label board
+
+<-> gsch.s pcbrnd
+	label schematics
+
+<-> gpcb.s-0.3 pcbrnd
+	label board
+
+<-> gpcb.s+0.3 pcbrnd
+	label footprint
+
+<-> kica.s-0.4 pcbrnd
+	label board\ns-expr
+
+<- kica.s pcbrnd
+	label board\nlegacy
+
+<-> kica.s+0.4 pcbrnd
+	label footprint\ns-expr
+
+<-> frt_.s pcbrnd
+	label board
+
+<-> fido.s pcbrnd
+	label board
+
+<-> prtl.s pcbrnd
+	label board
+
+<-> eagl.s pcbrnd
+	label board
+
+
+<-> pcbrnd batch.w
+
+<-> pcbrnd gtk.w
+
+<-> pcbrnd lesstif.w
+
+<-> pcbrnd remote.w
+
+<-> remote.s web
+	label TCP/IP
Index: tags/2.0.1/doc/user/09_appendix/src/dump_actions_to_html.sh
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/dump_actions_to_html.sh	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/dump_actions_to_html.sh	(revision 18980)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# dumps pcb-rnd actions into a simple html table for the docs 
+#
+#errata: pcb_dump_actions function in src/hid_actions.c
+#        printf("A%s\n", ca->action->name);
+#        dump_string('D', desc);
+#        dump_string('S', synt);
+
+
+(
+	cd ../../../../src
+	./pcb-rnd --version
+	svn info ^/ | awk '/Revision:/ {
+		print $0
+		got_rev=1
+		exit
+		}
+		END {
+			if (!got_rev)
+			print "Rev unknown"
+		}
+		'
+	./pcb-rnd --dump-actions
+) | awk '
+
+function flush_sd()
+{
+	if (s != "" || d != "" ) {
+		sub("^<br>", "", d)
+		sub("^<br>", "", s)
+		print "<td>" d "</td>"
+		print "<td>" s "</td>"
+	}
+	s=""
+	d=""
+}
+
+BEGIN {
+	q="\""
+# first line of input is the version
+	getline pcb_rnd_ver
+	getline pcb_rnd_rev
+	print "<!DOCTYPE HTML PUBLIC " q "-//W3C//DTD HTML 4.01 Transitional//EN" q " " q "http://www.w3.org/TR/html4/loose.dtd"  q ">"
+	print "<html>"
+	print "<head>"
+	print "<title> pcb-rnd user manual </title>"
+	print "<meta http-equiv=" q "Content-Type" q " content=" q "text/html;charset=us-ascii" q ">"
+	print "<link rel=" q "stylesheet" q " type=" q "text/css" q " href=" q " ../default.css" q ">"
+	print "</head>"
+	print "<body>"
+	print "<p>"
+	print "<h2> Pcb-rnd Action Reference</h2>"
+	print "<table border=1>"
+	print "<caption><b>"
+	print  pcb_rnd_ver ", " pcb_rnd_rev
+	print "</b>"
+	print "<th>Action<th> Description <th> Syntax"
+}
+
+/^A/ {
+	flush_sd()
+	sub("^A", "", $0)
+	printf "<tr><td> %s </td>\n", $0
+	next
+}
+
+/^D/ {
+	sub("^D", "", $0)
+	d = d "<br>" $0
+	next
+}
+
+/^S/ {
+	sub("^S", "", $0)
+	s = s "<br>" $0
+	next
+}
+
+END {
+	flush_sd()
+	print "</table>"
+	print "</body>"
+	print "</html>"
+
+}
+
+' 
+
+

Property changes on: tags/2.0.1/doc/user/09_appendix/src/dump_actions_to_html.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/09_appendix/src/gen_formats.sh
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/gen_formats.sh	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/gen_formats.sh	(revision 18980)
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+PLUGINS=../../../../src_plugins
+
+echo '
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd - list of file formats </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="../default.css">
+</head>
+<body>
+
+<h1> pcb-rnd - User Manual: Appendix </h1>
+<p>
+<h2> File format support </h2>
+
+<table border=1>
+	<tr>
+	<th> plugin <th> native <th> state <th> reads formats <th> writes formats
+'
+
+files_io=`ls $PLUGINS/io_*/*.pup | sort`
+files_e=`ls $PLUGINS/export_*/*.pup | sort`
+files_i=`ls $PLUGINS/import_*/*.pup | sort`
+
+for n in $files_io $files_i $files_e
+do
+	bn=`basename $n`
+	bn=${bn%%.pup}
+	sed '
+		/^[$]fmt[-]/ { s@^@'$bn' @; p }
+		/^[$]state/ { s@^@'$bn' @; p }
+		{ d }
+	' $n
+done | awk '
+	BEGIN {
+		plgs = 0
+	}
+	{
+		if ($1 != last) {
+			PLG[plgs] = $1
+			last = $1
+			plgs++
+		}
+		p=$1
+		f=$2
+		text=$0
+		sub("^[^ \t]+[ \t]+[^ \t]+[ \t]+", "", text)
+		DATA[p, f] = DATA[p, f] SUBSEP text
+	}
+
+	function col(mask    ,n,v,i,A) {
+		print " <td>"
+		v = split(DATA[mask], A, "[" SUBSEP "]")
+		if (v == 0) {
+			print "n/a"
+			return
+		}
+		i = 0;
+		for(n = 1; n <= v; n++) {
+			if (A[n] == "")
+				continue;
+			if (i)
+				print "  <br>"
+			print "  " A[n]
+			i++
+		}
+	}
+
+	function strip(s)
+	{
+		gsub("[" SUBSEP "]", " ", s)
+		sub("^[ \t]*", "", s)
+		sub("[ \t]*$", "", s)
+		return s
+	}
+
+	function row(plg) {
+		print "<tr><th>" plg
+		print "<td>" strip(DATA[plg, "$fmt-native"])
+		print "<td>" strip(DATA[plg, "$state"])
+		col(plg SUBSEP "$fmt-feature-r")
+		col(plg SUBSEP "$fmt-feature-w")
+	}
+
+	END {
+		for(p=0; p < plgs; p++)
+			if (DATA[PLG[p], "$fmt-native"] ~ "yes")
+				row(PLG[p])
+
+		for(p=0; p < plgs; p++)
+			if (!(DATA[PLG[p], "$fmt-native"] ~ "yes"))
+				row(PLG[p])
+	}
+'
+
+
+echo '
+</table>
+</body>
+</html>
+'

Property changes on: tags/2.0.1/doc/user/09_appendix/src/gen_formats.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/09_appendix/src/pcb-rnd-dialogs
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/pcb-rnd-dialogs	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/pcb-rnd-dialogs	(revision 18980)
@@ -0,0 +1,16 @@
+pcb-rnd gtk2-gl dialog list
+name,		open hk*,	exit hk*,	action,		focus,	modality
+main window,	,		ctrl-q,		na,		na,	na
+library,	i,		esc,		nk,		top,	modeless
+message log,	various,	alt-c,		message,	normal,	modeless
+DRC check,	nk,		alt-c,		drc,		normal,	modeless
+netlist,	nk,		alt-c,		netlist,	normal,	modeless
+command entry,	:,		esc,		nk,		locks,	modeless
+pinout,		shift-d,	alt-c,		display(pinout),normal,	modeless
+font selector,	ctl-sh-f,	esc,		fontsel,	top,	modeless
+preferences,	nk,		alt-o,		nk,		normal,	modeless
+contextmenu,	sh-rghtclk,	esc,		nk,		na,	na
+route styles,	nk,		esc,		route_styles,	locks,	modal
+lock dialog,	f12-sel,	esc,		lock,		top,	modeless
+
+* hk (hotkeys) assume stock default config
Index: tags/2.0.1/doc/user/09_appendix/src/process_dialogtable.sh
===================================================================
--- tags/2.0.1/doc/user/09_appendix/src/process_dialogtable.sh	(nonexistent)
+++ tags/2.0.1/doc/user/09_appendix/src/process_dialogtable.sh	(revision 18980)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# dumps a csv table of dialog behaviors into a simple html table
+awk '
+BEGIN {
+	pcb_rnd_rev="pcb-rnd 1.2.3"
+	FS = ","
+	q="\""
+	print "<!DOCTYPE HTML PUBLIC " q "-//W3C//DTD HTML 4.01 Transitional//EN" q " " q "http://www.w3.org/TR/html4/loose.dtd"  q ">"
+	print "<html>"
+	print "<head>"
+	print "<title> pcb-rnd </title>"
+	print "<meta http-equiv=" q "Content-Type" q " content=" q "text/html;charset=us-ascii" q ">"
+	print "<link rel=" q "stylesheet" q " type=" q "text/css" q " href=" q " ../default.css" q ">"
+	print "</head>"
+	print "<body>"
+	print "<p>"
+	print "<table border=1>"
+	print "<caption><b>"
+	getline
+	print  $0 ", " pcb_rnd_rev
+	print "</b>"
+	getline
+	i = 0
+	while (i < NF ) {
+	  i++
+	  print "<th>"  $i "</th>"
+	  }
+	
+}
+
+!NF     {
+	exit
+}
+
+// {
+	printf "<tr><td> %s </td>\n", $1
+	printf "<td> %s </td>\n", $2
+	printf "<td> %s </td>\n", $3
+	printf "<td> %s </td>\n", $4
+	printf "<td> %s </td>\n", $5
+	printf "<td> %s </td>\n", $6
+}
+
+
+END {
+	print "</table>"
+	print "</body>"
+	getline
+	print $0 "<br>"
+	print "</html>"
+}
+'  pcb-rnd-dialogs

Property changes on: tags/2.0.1/doc/user/09_appendix/src/process_dialogtable.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/Makefile
===================================================================
--- tags/2.0.1/doc/user/Makefile	(nonexistent)
+++ tags/2.0.1/doc/user/Makefile	(revision 18980)
@@ -0,0 +1,39 @@
+ROOT=../..
+BUILD=$(ROOT)/util/build_ps.sh
+USERDIR=$(DOCDIR)/user
+
+export HTML2PS_OPTS=-f default.css
+export HTML2PS_SED="s^<[hH]1>.*</[hH]1>^^g"
+
+
+INSTD = 02_model 03_data 04_invoc 05_ui 06_feature 07_io \
+        08_util 09_appendix
+
+all: user.pdf
+
+user.ps: ps.lst $(BUILD) default.css Makefile
+	$(BUILD) `cat ps.lst` > user.ps
+
+user.pdf: user.ps
+	ps2pdf user.ps
+
+ps.lst: */*.html */*.png
+	echo "title.html" > ps.lst
+	echo "index.html" >> ps.lst
+	ls */*.html | sort >> ps.lst
+
+include Makefile.inst
+
+regen: instgen
+	./instgen
+
+install:
+	$(MAKE) install_all HOW="install -f"
+
+linstall:
+	$(MAKE) install_all HOW="install -f -l --absolute "
+
+uninstall:
+	$(MAKE) install_all HOW="install -u"
+
+include $(ROOT)/Makefile.conf
Index: tags/2.0.1/doc/user/Makefile.inst
===================================================================
--- tags/2.0.1/doc/user/Makefile.inst	(nonexistent)
+++ tags/2.0.1/doc/user/Makefile.inst	(revision 18980)
@@ -0,0 +1,222 @@
+### autogenerated, DO NOT EDIT (but do commit); run make regen on *NIX ###
+install_all:
+	$(SCCBOX) mkdir -p $(USERDIR)/01_intro
+	$(SCCBOX) $(HOW) 01_intro/Makefile $(USERDIR)/01_intro/Makefile
+	$(SCCBOX) $(HOW) 01_intro/flow.svg $(USERDIR)/01_intro/flow.svg
+	$(SCCBOX) $(HOW) 01_intro/history.html $(USERDIR)/01_intro/history.html
+	$(SCCBOX) $(HOW) 01_intro/index.html $(USERDIR)/01_intro/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/02_model
+	$(SCCBOX) $(HOW) 02_model/index.html $(USERDIR)/02_model/index.html
+	$(SCCBOX) $(HOW) 02_model/obj_arc.png $(USERDIR)/02_model/obj_arc.png
+	$(SCCBOX) $(HOW) 02_model/obj_line.png $(USERDIR)/02_model/obj_line.png
+	$(SCCBOX) $(HOW) 02_model/objects_basic.png $(USERDIR)/02_model/objects_basic.png
+	$(SCCBOX) $(HOW) 02_model/objects_complex.png $(USERDIR)/02_model/objects_complex.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_noconn.png $(USERDIR)/02_model/via_therm_noconn.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_round_x45.png $(USERDIR)/02_model/via_therm_round_x45.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_round_x90.png $(USERDIR)/02_model/via_therm_round_x90.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_sharp_x45.png $(USERDIR)/02_model/via_therm_sharp_x45.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_sharp_x90.png $(USERDIR)/02_model/via_therm_sharp_x90.png
+	$(SCCBOX) $(HOW) 02_model/via_therm_solid.png $(USERDIR)/02_model/via_therm_solid.png
+	$(SCCBOX) mkdir -p $(USERDIR)/03_data
+	$(SCCBOX) $(HOW) 03_data/index.html $(USERDIR)/03_data/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/04_invoc
+	$(SCCBOX) $(HOW) 04_invoc/index.html $(USERDIR)/04_invoc/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/05_ui/01_gtk
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_coordsreadout.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_coordsreadout.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_layerops.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_layerops.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_main.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_main.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_menus.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_menus.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_opsreadout.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_opsreadout.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_routestyle.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_routestyle.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/base_window_highlight_workops.png $(USERDIR)/05_ui/01_gtk/base_window_highlight_workops.png
+	$(SCCBOX) $(HOW) 05_ui/01_gtk/index.html $(USERDIR)/05_ui/01_gtk/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/05_ui/02_cli
+	$(SCCBOX) $(HOW) 05_ui/02_cli/index.html $(USERDIR)/05_ui/02_cli/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/05_ui/05_batch
+	$(SCCBOX) $(HOW) 05_ui/05_batch/index.html $(USERDIR)/05_ui/05_batch/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/05_ui
+	$(SCCBOX) $(HOW) 05_ui/index.html $(USERDIR)/05_ui/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/acompnet
+	$(SCCBOX) $(HOW) 06_feature/acompnet/index.html $(USERDIR)/06_feature/acompnet/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/autocrop
+	$(SCCBOX) $(HOW) 06_feature/autocrop/index.html $(USERDIR)/06_feature/autocrop/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/distalign
+	$(SCCBOX) $(HOW) 06_feature/distalign/align_mixed_parts_x.png $(USERDIR)/06_feature/distalign/align_mixed_parts_x.png
+	$(SCCBOX) $(HOW) 06_feature/distalign/align_parts_y.png $(USERDIR)/06_feature/distalign/align_parts_y.png
+	$(SCCBOX) $(HOW) 06_feature/distalign/distalign.txt $(USERDIR)/06_feature/distalign/distalign.txt
+	$(SCCBOX) $(HOW) 06_feature/distalign/distribute_parts_x.png $(USERDIR)/06_feature/distalign/distribute_parts_x.png
+	$(SCCBOX) $(HOW) 06_feature/distalign/distribute_y_gaps.png $(USERDIR)/06_feature/distalign/distribute_y_gaps.png
+	$(SCCBOX) $(HOW) 06_feature/distalign/import_parts.png $(USERDIR)/06_feature/distalign/import_parts.png
+	$(SCCBOX) $(HOW) 06_feature/distalign/index.html $(USERDIR)/06_feature/distalign/index.html
+	$(SCCBOX) $(HOW) 06_feature/distalign/result.png $(USERDIR)/06_feature/distalign/result.png
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/distaligntext
+	$(SCCBOX) $(HOW) 06_feature/distaligntext/distaligntext_1.png $(USERDIR)/06_feature/distaligntext/distaligntext_1.png
+	$(SCCBOX) $(HOW) 06_feature/distaligntext/distaligntext_2.png $(USERDIR)/06_feature/distaligntext/distaligntext_2.png
+	$(SCCBOX) $(HOW) 06_feature/distaligntext/distaligntext_3.png $(USERDIR)/06_feature/distaligntext/distaligntext_3.png
+	$(SCCBOX) $(HOW) 06_feature/distaligntext/index.html $(USERDIR)/06_feature/distaligntext/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/djopt
+	$(SCCBOX) $(HOW) 06_feature/djopt/Makefile $(USERDIR)/06_feature/djopt/Makefile
+	$(SCCBOX) $(HOW) 06_feature/djopt/Post.html $(USERDIR)/06_feature/djopt/Post.html
+	$(SCCBOX) $(HOW) 06_feature/djopt/Pre.html $(USERDIR)/06_feature/djopt/Pre.html
+	$(SCCBOX) $(HOW) 06_feature/djopt/debumpify.out.pcb $(USERDIR)/06_feature/djopt/debumpify.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/debumpify.out.png $(USERDIR)/06_feature/djopt/debumpify.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/debumpify.pcb $(USERDIR)/06_feature/djopt/debumpify.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/debumpify.png $(USERDIR)/06_feature/djopt/debumpify.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/debumpify.txt $(USERDIR)/06_feature/djopt/debumpify.txt
+	$(SCCBOX) $(HOW) 06_feature/djopt/index.html $(USERDIR)/06_feature/djopt/index.html
+	$(SCCBOX) $(HOW) 06_feature/djopt/miter.out.pcb $(USERDIR)/06_feature/djopt/miter.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/miter.out.png $(USERDIR)/06_feature/djopt/miter.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/miter.pcb $(USERDIR)/06_feature/djopt/miter.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/miter.png $(USERDIR)/06_feature/djopt/miter.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/miter.txt $(USERDIR)/06_feature/djopt/miter.txt
+	$(SCCBOX) $(HOW) 06_feature/djopt/orthopull.out.pcb $(USERDIR)/06_feature/djopt/orthopull.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/orthopull.out.png $(USERDIR)/06_feature/djopt/orthopull.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/orthopull.pcb $(USERDIR)/06_feature/djopt/orthopull.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/orthopull.png $(USERDIR)/06_feature/djopt/orthopull.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/orthopull.txt $(USERDIR)/06_feature/djopt/orthopull.txt
+	$(SCCBOX) $(HOW) 06_feature/djopt/unjaggy.out.pcb $(USERDIR)/06_feature/djopt/unjaggy.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/unjaggy.out.png $(USERDIR)/06_feature/djopt/unjaggy.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/unjaggy.pcb $(USERDIR)/06_feature/djopt/unjaggy.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/unjaggy.png $(USERDIR)/06_feature/djopt/unjaggy.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/unjaggy.txt $(USERDIR)/06_feature/djopt/unjaggy.txt
+	$(SCCBOX) $(HOW) 06_feature/djopt/vianudge.out.pcb $(USERDIR)/06_feature/djopt/vianudge.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/vianudge.out.png $(USERDIR)/06_feature/djopt/vianudge.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/vianudge.pcb $(USERDIR)/06_feature/djopt/vianudge.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/vianudge.png $(USERDIR)/06_feature/djopt/vianudge.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/vianudge.txt $(USERDIR)/06_feature/djopt/vianudge.txt
+	$(SCCBOX) $(HOW) 06_feature/djopt/viatrim.out.pcb $(USERDIR)/06_feature/djopt/viatrim.out.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/viatrim.out.png $(USERDIR)/06_feature/djopt/viatrim.out.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/viatrim.pcb $(USERDIR)/06_feature/djopt/viatrim.pcb
+	$(SCCBOX) $(HOW) 06_feature/djopt/viatrim.png $(USERDIR)/06_feature/djopt/viatrim.png
+	$(SCCBOX) $(HOW) 06_feature/djopt/viatrim.txt $(USERDIR)/06_feature/djopt/viatrim.txt
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi
+	$(SCCBOX) $(HOW) 06_feature/gpmi/Credits $(USERDIR)/06_feature/gpmi/Credits
+	$(SCCBOX) $(HOW) 06_feature/gpmi/History $(USERDIR)/06_feature/gpmi/History
+	$(SCCBOX) $(HOW) 06_feature/gpmi/Makefile $(USERDIR)/06_feature/gpmi/Makefile
+	$(SCCBOX) $(HOW) 06_feature/gpmi/Porting $(USERDIR)/06_feature/gpmi/Porting
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow.dot $(USERDIR)/06_feature/gpmi/gpmi_flow.dot
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow.png $(USERDIR)/06_feature/gpmi/gpmi_flow.png
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_exp.dot $(USERDIR)/06_feature/gpmi/gpmi_flow_exp.dot
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_exp.png $(USERDIR)/06_feature/gpmi/gpmi_flow_exp.png
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_load.dot $(USERDIR)/06_feature/gpmi/gpmi_flow_load.dot
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_load.png $(USERDIR)/06_feature/gpmi/gpmi_flow_load.png
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_menu.dot $(USERDIR)/06_feature/gpmi/gpmi_flow_menu.dot
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_menu.png $(USERDIR)/06_feature/gpmi/gpmi_flow_menu.png
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_reg.dot $(USERDIR)/06_feature/gpmi/gpmi_flow_reg.dot
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_flow_reg.png $(USERDIR)/06_feature/gpmi/gpmi_flow_reg.png
+	$(SCCBOX) $(HOW) 06_feature/gpmi/gpmi_temp_inst.txt $(USERDIR)/06_feature/gpmi/gpmi_temp_inst.txt
+	$(SCCBOX) $(HOW) 06_feature/gpmi/index.html $(USERDIR)/06_feature/gpmi/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/packages
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/Makefile $(USERDIR)/06_feature/gpmi/packages/Makefile
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/XREF $(USERDIR)/06_feature/gpmi/packages/XREF
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/actions.html $(USERDIR)/06_feature/gpmi/packages/actions.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/actions_ref.html $(USERDIR)/06_feature/gpmi/packages/actions_ref.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/dialogs.html $(USERDIR)/06_feature/gpmi/packages/dialogs.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/dialogs_ref.html $(USERDIR)/06_feature/gpmi/packages/dialogs_ref.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/event_id.html $(USERDIR)/06_feature/gpmi/packages/event_id.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/hid.html $(USERDIR)/06_feature/gpmi/packages/hid.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/hid_ref.html $(USERDIR)/06_feature/gpmi/packages/hid_ref.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/layout.html $(USERDIR)/06_feature/gpmi/packages/layout.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/packages/layout_ref.html $(USERDIR)/06_feature/gpmi/packages/layout_ref.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/10_hello
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ID.name $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.bash $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.bash
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.html $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.lua $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.lua
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.pl $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.pl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.py $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.py
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.rb $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.rb
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.scm $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.scm
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.stt $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.stt
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/ex.tcl $(USERDIR)/06_feature/gpmi/rosetta/10_hello/ex.tcl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello/index.html $(USERDIR)/06_feature/gpmi/rosetta/10_hello/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ID.name $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.bash $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.bash
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.html $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.lua $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.lua
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.pl $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.pl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.py $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.py
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.rb $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.rb
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.scm $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.scm
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.stt $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.stt
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/ex.tcl $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/ex.tcl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/10_hello_gui/index.html $(USERDIR)/06_feature/gpmi/rosetta/10_hello_gui/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ID.name $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.bash $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.bash
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.html $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.lua $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.lua
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.pl $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.pl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.py $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.py
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.rb $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.rb
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.scm $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.scm
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.stt $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.stt
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/ex.tcl $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/ex.tcl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/12_hello_menu/index.html $(USERDIR)/06_feature/gpmi/rosetta/12_hello_menu/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/30_move
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/30_move/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ID.name $(USERDIR)/06_feature/gpmi/rosetta/30_move/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.bash $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.bash
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.html $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.lua $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.lua
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.pl $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.pl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.py $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.py
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.rb $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.rb
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.scm $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.scm
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.stt $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.stt
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/ex.tcl $(USERDIR)/06_feature/gpmi/rosetta/30_move/ex.tcl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/30_move/index.html $(USERDIR)/06_feature/gpmi/rosetta/30_move/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ID.name $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ex.html $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ex.lua $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ex.lua
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/ex.tcl $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/ex.tcl
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/35_export_drill/index.html $(USERDIR)/06_feature/gpmi/rosetta/35_export_drill/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta/90_clock
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/90_clock/ID.desc $(USERDIR)/06_feature/gpmi/rosetta/90_clock/ID.desc
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/90_clock/ID.name $(USERDIR)/06_feature/gpmi/rosetta/90_clock/ID.name
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/90_clock/ex.awk $(USERDIR)/06_feature/gpmi/rosetta/90_clock/ex.awk
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/90_clock/ex.html $(USERDIR)/06_feature/gpmi/rosetta/90_clock/ex.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/90_clock/index.html $(USERDIR)/06_feature/gpmi/rosetta/90_clock/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/rosetta
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/Makefile $(USERDIR)/06_feature/gpmi/rosetta/Makefile
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/index.html $(USERDIR)/06_feature/gpmi/rosetta/index.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/rosetta/index.templ.html $(USERDIR)/06_feature/gpmi/rosetta/index.templ.html
+	$(SCCBOX) $(HOW) 06_feature/gpmi/scripting_intro.html $(USERDIR)/06_feature/gpmi/scripting_intro.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/gpmi/util
+	$(SCCBOX) $(HOW) 06_feature/gpmi/util/Makefile $(USERDIR)/06_feature/gpmi/util/Makefile
+	$(SCCBOX) $(HOW) 06_feature/gpmi/util/rosetta_genpages.sh $(USERDIR)/06_feature/gpmi/util/rosetta_genpages.sh
+	$(SCCBOX) $(HOW) 06_feature/gpmi/util/tags $(USERDIR)/06_feature/gpmi/util/tags
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature
+	$(SCCBOX) $(HOW) 06_feature/index.html $(USERDIR)/06_feature/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/query
+	$(SCCBOX) $(HOW) 06_feature/query/tutor_cli.html $(USERDIR)/06_feature/query/tutor_cli.html
+	$(SCCBOX) mkdir -p $(USERDIR)/06_feature/vendordrill
+	$(SCCBOX) $(HOW) 06_feature/vendordrill/index.html $(USERDIR)/06_feature/vendordrill/index.html
+	$(SCCBOX) mkdir -p $(USERDIR)/07_io/export_openscad
+	$(SCCBOX) $(HOW) 07_io/export_openscad/1206.scad $(USERDIR)/07_io/export_openscad/1206.scad
+	$(SCCBOX) $(HOW) 07_io/export_openscad/preliminary.txt $(USERDIR)/07_io/export_openscad/preliminary.txt
+	$(SCCBOX) mkdir -p $(USERDIR)/08_util
+	$(SCCBOX) $(HOW) 08_util/01_gsch2pcb-rnd.htm $(USERDIR)/08_util/01_gsch2pcb-rnd.htm
+	$(SCCBOX) $(HOW) 08_util/install_cgi.html $(USERDIR)/08_util/install_cgi.html
+	$(SCCBOX) mkdir -p $(USERDIR)/09_appendix
+	$(SCCBOX) $(HOW) 09_appendix/action_reference.html $(USERDIR)/09_appendix/action_reference.html
+	$(SCCBOX) $(HOW) 09_appendix/bridges.svg $(USERDIR)/09_appendix/bridges.svg
+	$(SCCBOX) $(HOW) 09_appendix/combined_glossary.html $(USERDIR)/09_appendix/combined_glossary.html
+	$(SCCBOX) $(HOW) 09_appendix/dialogtable.html $(USERDIR)/09_appendix/dialogtable.html
+	$(SCCBOX) $(HOW) 09_appendix/external_resources.html $(USERDIR)/09_appendix/external_resources.html
+	$(SCCBOX) $(HOW) 09_appendix/formats.html $(USERDIR)/09_appendix/formats.html
+	$(SCCBOX) $(HOW) 09_appendix/index.html $(USERDIR)/09_appendix/index.html
+	$(SCCBOX) $(HOW) default.css $(USERDIR)/default.css
+	$(SCCBOX) $(HOW) index.html $(USERDIR)/index.html
+	$(SCCBOX) $(HOW) title.html $(USERDIR)/title.html
Index: tags/2.0.1/doc/user/default.css
===================================================================
--- tags/2.0.1/doc/user/default.css	(nonexistent)
+++ tags/2.0.1/doc/user/default.css	(revision 18980)
@@ -0,0 +1,45 @@
+H1 {
+	border-bottom-style: solid;
+	border-bottom-width: 3px;
+}
+
+H2 {
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+}
+
+P {
+	text-align: justify;
+	margin-left: 20px;
+}
+
+PRE {
+	margin-left: 20px;
+}
+
+table {
+	border-collapse: collapse;
+	border: 2px solid #555555;
+	margin-left: 20px;
+}
+
+td {
+	border: 1px solid #777777;
+	padding: 5px;
+}
+
+th {
+	border: 1px solid #777777;
+	background-color: #e0e0e0;
+	padding: 5px;
+}
+
+ul.toc {
+	list-style-type: none;
+	padding: 20px;
+}
+
+ul.toc li {
+	padding: 5px;
+	font-size: 120%;
+}
Index: tags/2.0.1/doc/user/index.html
===================================================================
--- tags/2.0.1/doc/user/index.html	(nonexistent)
+++ tags/2.0.1/doc/user/index.html	(revision 18980)
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title> pcb-rnd user manual </title>
+	<meta http-equiv="Content-Type" content="text/html;charset=us-ascii">
+	<link rel="stylesheet" type="text/css" href="default.css">
+</head>
+<body>
+<h1> pcb-rnd - user manual </h1>
+
+<h2> Table of Contents </h2>
+<p>
+<ul class="toc">
+	<li><a href="01_intro/index.html">   1. Introduction </a>
+	<li><a href="02_model/index.html">   2. Model of the world </a>
+	<li><a href="03_data/index.html">    3. Where data is stored </a>
+	<li><a href="04_invoc/index.html">      4. Program Invocation </a>
+	<li><a href="05_ui/index.html">   5. Graphical and Batch User Interfaces </a>
+	<li><a href="06_feature/index.html"> 6. Feature plugins </a>
+	<li><a href="07_io/">      7. File formats </a>
+	<li><a href="08_util/">    8. Utilities </a>
+	<li><a href="09_appendix/index.html">9. Appendix </a>
+</ul>
+
Index: tags/2.0.1/doc/user/instgen
===================================================================
--- tags/2.0.1/doc/user/instgen	(nonexistent)
+++ tags/2.0.1/doc/user/instgen	(revision 18980)
@@ -0,0 +1,26 @@
+#!/bin/sh
+export LANG=C
+find 0*_* *.html *.css -type f -print | sort | awk '
+BEGIN {
+	print "### autogenerated, DO NOT EDIT (but do commit); run make regen on *NIX ###"
+	print "install_all:"
+}
+($0 ~ "[/][.]") { next }
+($0 ~ "[/]src[/]") { next }
+/[.]bak$/ { next }
+/[.]backup$/ { next }
+/~$/ { next }
+
+($0 ~ "/") {
+	path = $0
+	sub("/[^/]*$", "", path)
+	if (!(path in PATHS)) {
+		print "	$(SCCBOX) mkdir -p $(USERDIR)/" path
+		PATHS[path]=1
+	}
+}
+
+{
+	print "	$(SCCBOX) $(HOW) " $0 " $(USERDIR)/" $0
+}
+' > Makefile.inst

Property changes on: tags/2.0.1/doc/user/instgen
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/doc/user/title.html
===================================================================
--- tags/2.0.1/doc/user/title.html	(nonexistent)
+++ tags/2.0.1/doc/user/title.html	(revision 18980)
@@ -0,0 +1,19 @@
+<html>
+<body>
+<p>
+<p>
+<p>
+<p>
+<p>
+<p>
+<p>
+<p>
+<center>
+<h1> PCB-rnd </h1>
+<p>
+<p>
+<h2> User manual </h2>
+<p>
+</center>
+</body>
+</html>
Index: tags/2.0.1/doc/windows.txt
===================================================================
--- tags/2.0.1/doc/windows.txt	(nonexistent)
+++ tags/2.0.1/doc/windows.txt	(revision 18980)
@@ -0,0 +1,38 @@
+State on windows
+~~~~~~~~~~~~~~~~
+
+Does not work yet. This file documents how far we got. The situation
+is constantly improving.
+
+1. Cross compilation from Linux to win32
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+(developers may need this, if you are an user, skip to 2.)
+
+TODO: deps with mpk
+
+Use mingw and wine:
+
+	./configure --emu="wine cmd /c" --target=i586-mingw32msvc "$@"
+
+(Replace i586- with whatever toolchain prefix you have)
+
+2. download the binary pack
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Temporary URL: http://igor2.repo.hu/tmp/pcb-rnd-pack.zip
+
+Download, unpack, run setup.bat then pcb-rnd.bat
+
+All binaries in the pack are cross-compiled from source, using mingw and
+mpk. All binaries are 32-bit. The pack is self-contained, no gtk or other
+external dependencies.
+
+Known bugs:
+	- inserting elements fail (even static ones)
+	- no shell and awk in the pack -> parametric footprints fail
+	- text (including menu text) doesn't appear on XP
+	- no exporters that depend on libgd (png, jpeg, gif, nelma)
+
+Worked on systems:
+	- Windows 8.1 pro, Hungarian, 32 bit
+	- Windows 7 pro, Hungarian, 64 bit
+	- Windows 7 pro, English, 64 bit
Index: tags/2.0.1/doc/wishlist.txt
===================================================================
--- tags/2.0.1/doc/wishlist.txt	(nonexistent)
+++ tags/2.0.1/doc/wishlist.txt	(revision 18980)
@@ -0,0 +1,14 @@
+Active user wishes:
+	W4: user doc [Miloh]
+	W7: programmable drc (star grounding) [James]
+	W9: push & shove [Erich, Evan]
+
+Being done:
+	W1: cschem [Chris]
+
+User wishes fulfilled:
+	W2: proper primitives - data model rewrite [Chris]
+	W3: more generic footprints [Chris, Evan] -> subcircuits
+	W5: 3d modeller export [Miloh, Evan] (bdale's sponsoration)
+	W6:  GUI access to object attributes: gtk editor, find/select by attrib [James]
+	W8: gl support [Erich, Evan]
Index: tags/2.0.1/font/HersheySans1.pcb_font
===================================================================
--- tags/2.0.1/font/HersheySans1.pcb_font	(nonexistent)
+++ tags/2.0.1/font/HersheySans1.pcb_font	(revision 18980)
@@ -0,0 +1,1205 @@
+##name:Hershey Sans 1 Stroke Font v1.0
+##source:https://github.com/evil-mad/EggBot/blob/master/inkscape_driver/hersheydata.py
+##ported_by:Erich S. Heinzle 2014
+##license:TODO
+#
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[1191 1000 1191 3666 800]
+	SymbolLine[1191 4619 1000 4809 800]
+	SymbolLine[1000 4809 1191 4999 800]
+	SymbolLine[1191 4999 1381 4809 800]
+	SymbolLine[1381 4809 1191 4619 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[1000	1000 1000 2334 800]
+	SymbolLine[2523	1000 2523 2334 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[2573 1000 1239 5000 800]
+	SymbolLine[3916 1000 2582 5000 800]
+	SymbolLine[1339 2325 4207 2325 800]
+	SymbolLine[1000 3675 3866 3675 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[2333	300	2333	5824 800]
+	SymbolLine[3666	1633	3286	1252 800]
+	SymbolLine[3286	1252	2714	1062 800]
+	SymbolLine[2714	1062	1952	1062 800]
+	SymbolLine[1952	1062	1381	1252 800]
+	SymbolLine[1381	1252	1000	1633 800]	
+	SymbolLine[1000	1633	1000	2015 800]
+	SymbolLine[1000	2015	1191	2395 800]
+	SymbolLine[1191	2395	1381	2586 800]
+	SymbolLine[1381	2586	1762	2776 800]
+	SymbolLine[1762	2776	2905	3157 800]
+	SymbolLine[2905	3157	3286	3347 800]
+	SymbolLine[3286	3347	3477	3538 800]
+	SymbolLine[3477	3538	3666	3919 800]
+	SymbolLine[3666	3919	3666	4490 800]
+	SymbolLine[3666	4490	3286	4872 800]
+	SymbolLine[3286	4872	2714	5062 800]
+	SymbolLine[2714	5062	1952	5062 800]
+	SymbolLine[1952	5062	1381	4872 800]
+	SymbolLine[1381	4872	1000	4490 800]
+
+)
+Symbol['%' 1200]
+(
+	SymbolLine[11285	1000	7857	4999 800]
+	SymbolLine[8809	1000	9191	1380 800]
+	SymbolLine[9191	1380	9191	1762 800]
+	SymbolLine[9191	1762	9000	2142 800]
+	SymbolLine[9000	2142	8619	2333 800]
+	SymbolLine[8619	2333	8238	2333 800]
+	SymbolLine[8238	2333	7857	1952 800]
+	SymbolLine[7857	1952	7857	1571 800]
+	SymbolLine[7857	1571	8048	1190 800]
+	SymbolLine[8048	1190	8428	1000 800]
+	SymbolLine[8428	1000	8809	1000 800]
+	SymbolLine[8809	1000	9191	1190 800]
+	SymbolLine[9191	1190	9762	1380 800]
+	SymbolLine[9762	1380	10332	1380 800]
+	SymbolLine[10332	1380	10905	1190 800]
+	SymbolLine[10905	1190	11285	1000 800]
+	SymbolLine[10523	3666	10143	3857 800]
+	SymbolLine[10143	3857	9952	4237 800]
+	SymbolLine[9952	4237	9952	4619 800]
+	SymbolLine[9952	4619	10332	4999 800]
+	SymbolLine[10332	4999	10714	4999 800]
+	SymbolLine[10714	4999	11095	4809 800]
+	SymbolLine[11095	4809	11285	4428 800]
+	SymbolLine[11285	4428	11285	4047 800]
+	SymbolLine[11285	4047	10905	3666 800]
+	SymbolLine[10905	3666	10523	3666 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[4809	2714	4809	2523 800]
+	SymbolLine[4809	2523	4618	2333 800]
+	SymbolLine[4618	2333	4428	2333 800]
+	SymbolLine[4428	2333	4237	2523 800]
+	SymbolLine[4237	2523	4046	2905 800]
+	SymbolLine[4046	2905	3666	3857 800]
+	SymbolLine[3666	3857	3285	4428 800]
+	SymbolLine[3285	4428	2905	4809 800]
+	SymbolLine[2905	4809	2523	4999 800]
+	SymbolLine[2523	4999	1762	4999 800]
+	SymbolLine[1762	4999	1380	4809 800]
+	SymbolLine[1380	4809	1189	4619 800]
+	SymbolLine[1189	4619	1000	4237 800]
+	SymbolLine[1000	4237	1000	3857 800]
+	SymbolLine[1000	3857	1189	3476 800]
+	SymbolLine[1189	3476	1380	3285 800]
+	SymbolLine[1380	3285	2714	2523 800]
+	SymbolLine[2714	2523	2905	2333 800]
+	SymbolLine[2905	2333	3094	1952 800]
+	SymbolLine[3094	1952	3094	1571 800]
+	SymbolLine[3094	1571	2905	1190 800]
+	SymbolLine[2905	1190	2523	1000 800]
+	SymbolLine[2523	1000	2142	1190 800]
+	SymbolLine[2142	1190	1952	1571 800]
+	SymbolLine[1952	1571	1952	1952 800]
+	SymbolLine[1952	1952	2142	2523 800]
+	SymbolLine[2142	2523	2523	3095 800]
+	SymbolLine[2523	3095	3475	4428 800]
+	SymbolLine[3475	4428	3857	4809 800]
+	SymbolLine[3857	4809	4237	4999 800]
+	SymbolLine[4237	4999	4618	4999 800]
+	SymbolLine[4618	4999	4809	4809 800]
+	SymbolLine[4809	4809	4809	4619 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[1191	1381	1000	1191 800]
+	SymbolLine[1000	1191	1191	1000 800]
+	SymbolLine[1191	1000	1381	1191 800]
+	SymbolLine[1381	1191	1381	1571 800]
+	SymbolLine[1381	1571	1191	1952 800]
+	SymbolLine[1191	1952	1000	2143 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[2333	0	1952	381 800]
+	SymbolLine[1952	381	1571	952 800]
+	SymbolLine[1571	952	1189	1715 800]
+	SymbolLine[1189	1715	1000	2667 800]
+	SymbolLine[1000	2667	1000	3429 800]
+	SymbolLine[1000	3429	1189	4381 800]
+	SymbolLine[1189	4381	1571	5143 800]
+	SymbolLine[1571	5143	1952	5714 800]
+	SymbolLine[1952	5714	2333	6095 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[1000	0	1380	381 800]
+	SymbolLine[1380	381	1762	952 800]
+	SymbolLine[1762	952	2143	1715 800]
+	SymbolLine[2143	1715	2332	2667 800]
+	SymbolLine[2332	2667	2332	3429 800]
+	SymbolLine[2332	3429	2143	4381 800]
+	SymbolLine[2143	4381	1762	5143 800]
+	SymbolLine[1762	5143	1380	5714 800]
+	SymbolLine[1380	5714	1000	6095 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[2667	1000	2667	5000 800]
+	SymbolLine[1000	2001	4333	4001 800]
+	SymbolLine[4333	2001	1000	4001 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[2714	1250	2714	4678 800]
+	SymbolLine[1000	2964	4428	2964 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[1381	4891	1191	5080 800]
+	SymbolLine[1191	5080	1000	4891 800]
+	SymbolLine[1000	4891	1191	4700 800]
+	SymbolLine[1191	4700	1381	4891 800]
+	SymbolLine[1381	4891	1381	5271 800]
+	SymbolLine[1381	5271	1000	5652 800]
+
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[1190	4700	1000	4891 800]
+	SymbolLine[1000	4891	1190	5080 800]
+	SymbolLine[1190	5080	1380	4891 800]
+	SymbolLine[1380	4891	1190	4700 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[3251 1000 1000 5000 800]
+)
+Symbol['0' 1200] #numbers are new
+(
+	SymbolLine[2143 1000 1572 1190 800]
+	SymbolLine[1572 1190 1190 1761 800]
+	SymbolLine[1190 1761 1000 2713 800]
+	SymbolLine[1000 2713 1000 3285 800]
+	SymbolLine[1000 3285 1190 4238 800]
+	SymbolLine[1190 4238 1572 4809 800]
+	SymbolLine[1572 4809 2143 5000 800]
+	SymbolLine[2143 5000 2524 5000 800]
+	SymbolLine[2524 5000 3095 4809 800]
+	SymbolLine[3095 4809 3476 4238 800]
+	SymbolLine[3476 4238 3667 3285 800]
+	SymbolLine[3667 3285 3667 2713 800]
+	SymbolLine[3667 2713 3476 1761 800]
+	SymbolLine[3476 1761 3095 1190 800]
+	SymbolLine[3095 1190 2524 1000 800]
+	SymbolLine[2524 1000 2143 1000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[1000 1761 1380 1571 800]
+	SymbolLine[1380 1571 1952 1000 800]
+	SymbolLine[1952 1000 1952 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[1190 1952 1190 1761 800]
+	SymbolLine[1190 1761 1381 1381 800]
+	SymbolLine[1381 1381 1570 1190 800]
+	SymbolLine[1570 1190 1952 1000 800]
+	SymbolLine[1952 1000 2713 1000 800]
+	SymbolLine[2713 1000 3095 1190 800]
+	SymbolLine[3095 1190 3285 1381 800]
+	SymbolLine[3285 1381 3475 1761 800]
+	SymbolLine[3475 1761 3475 2143 800]
+	SymbolLine[3475 2143 3285 2524 800]
+	SymbolLine[3285 2524 2904 3095 800]
+	SymbolLine[2904 3095 1000 5000 800]
+	SymbolLine[1000 5000 3666 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[1380 1000 3475 1000 800]
+	SymbolLine[3475 1000 2332 2524 800]
+	SymbolLine[2332 2524 2904 2524 800]
+	SymbolLine[2904 2524 3284 2713 800]
+	SymbolLine[3284 2713 3475 2904 800]
+	SymbolLine[3475 2904 3666 3476 800]
+	SymbolLine[3666 3476 3666 3856 800]
+	SymbolLine[3666 3856 3475 4428 800]
+	SymbolLine[3475 4428 3095 4809 800]
+	SymbolLine[3095 4809 2523 5000 800]
+	SymbolLine[2523 5000 1952 5000 800]
+	SymbolLine[1952 5000 1380 4809 800]
+	SymbolLine[1380 4809 1190 4618 800]
+	SymbolLine[1190 4618 1000 4238 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[2904 1000 1000 3666 800]
+	SymbolLine[1000 3666 3856 3666 800]
+	SymbolLine[2904 1000 2904 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[3286 1000 1381 1000 800]
+	SymbolLine[1381 1000 1190 2713 800]
+	SymbolLine[1190 2713 1381 2524 800]
+	SymbolLine[1381 2524 1952 2333 800]
+	SymbolLine[1952 2333 2524 2333 800]
+	SymbolLine[2524 2333 3095 2524 800]
+	SymbolLine[3095 2524 3476 2904 800]
+	SymbolLine[3476 2904 3667 3476 800]
+	SymbolLine[3667 3476 3667 3856 800]
+	SymbolLine[3667 3856 3476 4428 800]
+	SymbolLine[3476 4428 3095 4809 800]
+	SymbolLine[3095 4809 2524 5000 800]
+	SymbolLine[2524 5000 1952 5000 800]
+	SymbolLine[1952 5000 1381 4809 800]
+	SymbolLine[1381 4809 1190 4618 800]
+	SymbolLine[1190 4618 1000 4238 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[3285 1571 3095 1190 800]
+	SymbolLine[3095 1190 2523 1000 800]
+	SymbolLine[2523 1000 2143 1000 800]
+	SymbolLine[2143 1000 1570 1190 800]
+	SymbolLine[1570 1190 1190 1761 800]
+	SymbolLine[1190 1761 1000 2713 800]
+	SymbolLine[1000 2713 1000 3666 800]
+	SymbolLine[1000 3666 1190 4428 800]
+	SymbolLine[1190 4428 1570 4809 800]
+	SymbolLine[1570 4809 2143 5000 800]
+	SymbolLine[2143 5000 2333 5000 800]
+	SymbolLine[2333 5000 2904 4809 800]
+	SymbolLine[2904 4809 3285 4428 800]
+	SymbolLine[3285 4428 3475 3856 800]
+	SymbolLine[3475 3856 3475 3666 800]
+	SymbolLine[3475 3666 3285 3095 800]
+	SymbolLine[3285 3095 2904 2713 800]
+	SymbolLine[2904 2713 2333 2524 800]
+	SymbolLine[2333 2524 2143 2524 800]
+	SymbolLine[2143 2524 1570 2713 800]
+	SymbolLine[1570 2713 1190 3095 800]
+	SymbolLine[1190 3095 1000 3666 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[3666 1000 1761 5000 800]
+	SymbolLine[1000 1000 3666 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[1952 1000 1380 1190 800]
+	SymbolLine[1380 1190 1190 1571 800]
+	SymbolLine[1190 1571 1190 1952 800]
+	SymbolLine[1190 1952 1380 2333 800]
+	SymbolLine[1380 2333 1761 2524 800]
+	SymbolLine[1761 2524 2523 2713 800]
+	SymbolLine[2523 2713 3095 2904 800]
+	SymbolLine[3095 2904 3475 3285 800]
+	SymbolLine[3475 3285 3666 3666 800]
+	SymbolLine[3666 3666 3666 4238 800]
+	SymbolLine[3666 4238 3475 4618 800]
+	SymbolLine[3475 4618 3284 4809 800]
+	SymbolLine[3284 4809 2713 5000 800]
+	SymbolLine[2713 5000 1952 5000 800]
+	SymbolLine[1952 5000 1380 4809 800]
+	SymbolLine[1380 4809 1190 4618 800]
+	SymbolLine[1190 4618 1000 4238 800]
+	SymbolLine[1000 4238 1000 3666 800]
+	SymbolLine[1000 3666 1190 3285 800]
+	SymbolLine[1190 3285 1570 2904 800]
+	SymbolLine[1570 2904 2142 2713 800]
+	SymbolLine[2142 2713 2904 2524 800]
+	SymbolLine[2904 2524 3284 2333 800]
+	SymbolLine[3284 2333 3475 1952 800]
+	SymbolLine[3475 1952 3475 1571 800]
+	SymbolLine[3475 1571 3284 1190 800]
+	SymbolLine[3284 1190 2713 1000 800]
+	SymbolLine[2713 1000 1952 1000 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[3475 2333 3285 2904 800]
+	SymbolLine[3285 2904 2904 3285 800]
+	SymbolLine[2904 3285 2332 3476 800]
+	SymbolLine[2332 3476 2142 3476 800]
+	SymbolLine[2142 3476 1571 3285 800]
+	SymbolLine[1571 3285 1189 2904 800]
+	SymbolLine[1189 2904 1000 2333 800]
+	SymbolLine[1000 2333 1000 2143 800]
+	SymbolLine[1000 2143 1189 1571 800]
+	SymbolLine[1189 1571 1571 1190 800]
+	SymbolLine[1571 1190 2142 1000 800]
+	SymbolLine[2142 1000 2332 1000 800]
+	SymbolLine[2332 1000 2904 1190 800]
+	SymbolLine[2904 1190 3285 1571 800]
+	SymbolLine[3285 1571 3475 2333 800]
+	SymbolLine[3475 2333 3475 3285 800]
+	SymbolLine[3475 3285 3285 4238 800]
+	SymbolLine[3285 4238 2904 4809 800]
+	SymbolLine[2904 4809 2332 5000 800]
+	SymbolLine[2332 5000 1952 5000 800]
+	SymbolLine[1952 5000 1380 4809 800]
+	SymbolLine[1380 4809 1189 4428 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[1190	3400	1000	3591 800]
+	SymbolLine[1000	3591	1190	3781 800]
+	SymbolLine[1190	3781	1380	3591 800]
+	SymbolLine[1380	3591	1190	3400 800]
+	SymbolLine[1190	4734	1000	4925 800]
+	SymbolLine[1000	4925	1190	5114 800]
+	SymbolLine[1190	5114	1380	4925 800]
+	SymbolLine[1380	4925	1190	4734 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[1191	3400	1000	3591 800]
+	SymbolLine[1000	3591	1191	3781 800]
+	SymbolLine[1191	3781	1380	3591 800]
+	SymbolLine[1380	3591	1191	3400 800]
+	SymbolLine[1380	4925	1191	5114 800]
+	SymbolLine[1191	5114	1000	4925 800]
+	SymbolLine[1000	4925	1191	4734 800]
+	SymbolLine[1191	4734	1380	4925 800]
+	SymbolLine[1380	4925	1380	5305 800]
+	SymbolLine[1380	5305	1000	5686 800]
+
+)
+Symbol['<' 1200]
+(
+	SymbolLine[3540 1000 1000 3001 800]
+	SymbolLine[1000 3001 3540 5000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2400 2500 2400 800]
+	SymbolLine[0 3600 2500 3600 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[1000 1000 3540 3001 800]
+	SymbolLine[3540 3001 1000 5000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000	1952	1000	1762 800]
+	SymbolLine[1000	1762	1191	1381 800]
+	SymbolLine[1191	1381	1380	1191 800]
+	SymbolLine[1380	1191	1762	1000 800]
+	SymbolLine[1762	1000	2523	1000 800]
+	SymbolLine[2523	1000	2905	1191 800]
+	SymbolLine[2905	1191	3095	1381 800]
+	SymbolLine[3095	1381	3285	1762 800]
+	SymbolLine[3285	1762	3285	2143 800]
+	SymbolLine[3285	2143	3095	2523 800]
+	SymbolLine[3095	2523	2905	2714 800]
+	SymbolLine[2905	2714	2143	3095 800]
+	SymbolLine[2143	3095	2143	3666 800]
+	SymbolLine[2143	4618	1952	4809 800]
+	SymbolLine[1952	4809	2143	5000 800]
+	SymbolLine[2143	5000	2332	4809 800]
+	SymbolLine[2332	4809	2143	4618 800]
+
+)
+Symbol['@' 1200]
+(
+	SymbolLine[4751	3000	4500	2499 800]
+	SymbolLine[4500	2499	4001	2250 800]
+	SymbolLine[4001	2250	3250	2250 800]
+	SymbolLine[3250	2250	2751	2499 800]
+	SymbolLine[2751	2499	2500	2750 800]
+	SymbolLine[2500	2750	2250	3501 800]
+	SymbolLine[2250	3501	2250	4250 800]
+	SymbolLine[2250	4250	2500	4751 800]
+	SymbolLine[2500	4751	3001	5000 800]
+	SymbolLine[3001	5000	3751	5000 800]
+	SymbolLine[3751	5000	4251	4751 800]
+	SymbolLine[4251	4751	4500	4250 800]
+	SymbolLine[3250	2250	2751	2750 800]
+	SymbolLine[2751	2750	2500	3501 800]
+	SymbolLine[2500	3501	2500	4250 800]
+	SymbolLine[2500	4250	2751	4751 800]
+	SymbolLine[2751	4751	3001	5000 800]
+	SymbolLine[4751	2250	4500	4250 800]
+	SymbolLine[4500	4250	4500	4751 800]
+	SymbolLine[4500	4751	5001	5000 800]
+	SymbolLine[5001	5000	5502	5000 800]
+	SymbolLine[5502	5000	6001	4501 800]
+	SymbolLine[6001	4501	6251	3750 800]
+	SymbolLine[6251	3750	6251	3250 800]
+	SymbolLine[6251	3250	6001	2499 800]
+	SymbolLine[6001	2499	5751	2000 800]
+	SymbolLine[5751	2000	5251	1499 800]
+	SymbolLine[5251	1499	4751	1249 800]
+	SymbolLine[4751	1249	4001	1000 800]
+	SymbolLine[4001	1000	3250	1000 800]
+	SymbolLine[3250	1000	2500	1249 800]
+	SymbolLine[2500	1249	2000	1499 800]
+	SymbolLine[2000	1499	1501	2000 800]
+	SymbolLine[1501	2000	1250	2499 800]
+	SymbolLine[1250	2499	1000	3250 800]
+	SymbolLine[1000	3250	1000	4000 800]
+	SymbolLine[1000	4000	1250	4751 800]
+	SymbolLine[1250	4751	1501	5250 800]
+	SymbolLine[1501	5250	2000	5751 800]
+	SymbolLine[2000	5751	2500	6001 800]
+	SymbolLine[2500	6001	3250	6250 800]
+	SymbolLine[3250	6250	4001	6250 800]
+	SymbolLine[4001	6250	4751	6001 800]
+	SymbolLine[4751	6001	5251	5751 800]
+	SymbolLine[5251	5751	5502	5501 800]
+	SymbolLine[5001	2250	4751	4250 800]
+	SymbolLine[4751	4250	4751	4751 800]
+	SymbolLine[4751	4751	5001	5000 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[1524 1000 0 5000 800]
+	SymbolLine[1524 1000 3048 5000 800]
+	SymbolLine[572 3667 2477 3667 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[1000 1000 1000 5000 800]
+	SymbolLine[1000 1000 2714 1000 800]
+	SymbolLine[2714 1000 3285 1191 800]
+	SymbolLine[3285 1191 3476 1381 800]
+	SymbolLine[3476 1381 3666 1763 800]
+	SymbolLine[3666 1763 3666 2143 800]
+	SymbolLine[3666 2143 3476 2524 800]
+	SymbolLine[3476 2524 3285 2715 800]
+	SymbolLine[3285 2715 2714 2905 800]
+	SymbolLine[1000 2905 2714 2905 800]
+	SymbolLine[2714 2905 3285 3095 800]
+	SymbolLine[3285 3095 3476 3286 800]
+	SymbolLine[3476 3286 3666 3667 800]
+	SymbolLine[3666 3667 3666 4238 800]
+	SymbolLine[3666 4238 3476 4620 800]
+	SymbolLine[3476 4620 3285 4809 800]
+	SymbolLine[3285 4809 2714 5000 800]
+	SymbolLine[2714 5000 1000 5000 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[3857 1952 3666 1572 800]
+	SymbolLine[3666 1572 3285 1191 800]
+	SymbolLine[3285 1191 2905 1000 800]
+	SymbolLine[2905 1000 2142 1000 800]
+	SymbolLine[2142 1000 1762 1191 800]
+	SymbolLine[1762 1191 1380 1572 800]
+	SymbolLine[1380 1572 1190 1952 800]
+	SymbolLine[1190 1952 1000 2524 800]
+	SymbolLine[1000 2524 1000 3477 800]
+	SymbolLine[1000 3477 1190 4048 800]
+	SymbolLine[1190 4048 1380 4429 800]
+	SymbolLine[1380 4429 1762 4809 800]
+	SymbolLine[1762 4809 2142 5000 800]
+	SymbolLine[2142 5000 2905 5000 800]
+	SymbolLine[2905 5000 3285 4809 800]
+	SymbolLine[3285 4809 3666 4429 800]
+	SymbolLine[3666 4429 3857 4048 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 2334 1000 800]
+	SymbolLine[2334	1000 2905 1191 800]
+	SymbolLine[2905	1191 3286 1572 800]
+	SymbolLine[3286	1572 3476 1952 800]
+	SymbolLine[3476	1952 3666 2524 800]
+	SymbolLine[3666	2524 3666 3477 800]
+	SymbolLine[3666	3477 3476 4048 800]
+	SymbolLine[3476	4048 3286 4429 800]
+	SymbolLine[3286	4429 2905 4809 800]
+	SymbolLine[2905	4809 2334 5000 800]
+	SymbolLine[2334	5000 1000 5000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 3476 1000 800]
+	SymbolLine[1000	2905 2523 2905 800]
+	SymbolLine[1000	5000 3476 5000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[1000 1000 1000 5000 800]
+	SymbolLine[1000 1000 3475 1000 800]
+	SymbolLine[1000 2905 2523 2905 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[3857	1952 3666 1572 800]
+	SymbolLine[3666	1572 3286 1191 800]
+	SymbolLine[3286	1191 2905 1000 800]
+	SymbolLine[2905	1000 2143 1000 800]
+	SymbolLine[2143	1000 1762 1191 800]
+	SymbolLine[1762	1191 1381 1572 800]
+	SymbolLine[1381	1572 1191 1952 800]
+	SymbolLine[1191	1952 1000 2524 800]
+	SymbolLine[1000	2524 1000 3477 800]
+	SymbolLine[1000	3477 1191 4048 800]
+	SymbolLine[1191	4048 1381 4429 800]
+	SymbolLine[1381	4429 1762 4809 800]
+	SymbolLine[1762	4809 2143 5000 800]
+	SymbolLine[2143	5000 2905 5000 800]
+	SymbolLine[2905	5000 3286 4809 800]
+	SymbolLine[3286	4809 3666 4429 800]
+	SymbolLine[3666	4429 3857 4048 800]
+	SymbolLine[3857	4048 3857 3477 800]
+	SymbolLine[2905	3477 3857 3477 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[3667	5000 3667 1000 800]
+	SymbolLine[1000	2905 3667 2905 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[2905	1000 2905 4048 800]
+	SymbolLine[2905	4048 2715 4620 800]
+	SymbolLine[2715	4620 2524 4809 800]
+	SymbolLine[2524	4809 2143 5000 800]
+	SymbolLine[2143	5000 1763 5000 800]
+	SymbolLine[1763	5000 1381 4809 800]
+	SymbolLine[1381	4809 1191 4620 800]
+	SymbolLine[1191	4620 1000 4048 800]
+	SymbolLine[1000	4048 1000 3667 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[3666	1000 1000 3667 800]
+	SymbolLine[1952	2715 3666 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	5000 3285 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 2523 5000 800]
+	SymbolLine[4048	1000 2523 5000 800]
+	SymbolLine[4048	1000 4048 5000 800]
+)
+Symbol['N' 1200]
+( 
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 3666 5000 800]
+	SymbolLine[3666	1000 3666 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[2142	1000 1762 1191 800]
+	SymbolLine[1762	1191 1380 1572 800]
+	SymbolLine[1380	1572 1190 1952 800]
+	SymbolLine[1190	1952 1000 2524 800]
+	SymbolLine[1000	2524 1000 3476 800]
+	SymbolLine[1000	3476 1190 4049 800]
+	SymbolLine[1190	4048 1380 4429 800]
+	SymbolLine[1380	4429 1762 4809 800]
+	SymbolLine[1762	4809 2142 5000 800]
+	SymbolLine[2142	5000 2905 5000 800]
+	SymbolLine[2905	5000 3285 4809 800]
+	SymbolLine[3285	4809 3666 4429 800]
+	SymbolLine[3666	4429 3857 4048 800]
+	SymbolLine[3857	4048 4046 3476 800]
+	SymbolLine[4046	3476 4046 2524 800]
+	SymbolLine[4046	2524 3857 1952 800]
+	SymbolLine[3857	1952 3666 1572 800]
+	SymbolLine[3666	1572 3285 1191 800]
+	SymbolLine[3285	1191 2905 1000 800]
+	SymbolLine[2905	1000 2142 1000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 2714 1000 800]
+	SymbolLine[2714	1000 3285 1191 800]
+	SymbolLine[3285	1191 3476 1381 800]
+	SymbolLine[3476	1381 3666 1762 800]
+	SymbolLine[3666	1762 3666 2334 800]
+	SymbolLine[3666	2334 3476 2714 800]
+	SymbolLine[3476	2714 3285 2905 800]
+	SymbolLine[3285	2905 2714 3095 800]
+	SymbolLine[2714	3095 1000 3095 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[2142	1000 1762 1191 800]
+	SymbolLine[1762	1191 1380 1572 800]
+	SymbolLine[1380	1572 1190 1952 800]
+	SymbolLine[1190	1952 1000 2524 800]
+	SymbolLine[1000	2524 1000 3476 800]
+	SymbolLine[1000	3476 1190 4048 800]
+	SymbolLine[1190	4048 1380 4429 800]
+	SymbolLine[1380	4429 1762 4809 800]
+	SymbolLine[1762	4809 2142 5000 800]
+	SymbolLine[2142	5000 2905 5000 800]
+	SymbolLine[2905	5000 3285 4809 800]
+	SymbolLine[3285	4809 3666 4429 800]
+	SymbolLine[3666	4429 3857 4048 800]
+	SymbolLine[3857	4048 4047 3476 800]
+	SymbolLine[4047	3476 4047 2524 800]
+	SymbolLine[4047	2524 3857 1952 800]
+	SymbolLine[3857	1952 3666 1572 800]
+	SymbolLine[3666	1572 3285 1191 800]
+	SymbolLine[3285	1191 2905 1000 800]
+	SymbolLine[2905	1000 2142 1000 800]
+	SymbolLine[2714	4238 3857 5381 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[1000	1000 1000 5000 800]
+	SymbolLine[1000	1000 2714 1000 800]
+	SymbolLine[2714	1000 3285 1191 800]
+	SymbolLine[3285	1191 3476 1381 800]
+	SymbolLine[3476	1381 3666 1762 800]
+	SymbolLine[3666	1762 3666 2143 800]
+	SymbolLine[3666	2143 3476 2524 800]
+	SymbolLine[3476	2524 3285 2714 800]
+	SymbolLine[3285	2714 2714 2905 800]
+	SymbolLine[2714	2905 1000 2905 800]
+	SymbolLine[2333	2905 3666 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[3666	1572 3285 1191 800]
+	SymbolLine[3285	1191 2714 1000 800]
+	SymbolLine[2714	1000 1952 1000 800]
+	SymbolLine[1952	1000 1380 1191 800]
+	SymbolLine[1380	1191 1000 1572 800]
+	SymbolLine[1000	1572 1000 1952 800]
+	SymbolLine[1000	1952 1189 2334 800]
+	SymbolLine[1189	2334 1380 2524 800]
+	SymbolLine[1380	2524 1762 2714 800]
+	SymbolLine[1762	2714 2905 3095 800]
+	SymbolLine[2905	3095 3285 3286 800]
+	SymbolLine[3285	3286 3475 3476 800]
+	SymbolLine[3475	3476 3666 3857 800]
+	SymbolLine[3666	3857 3666 4429 800]
+	SymbolLine[3666	4429 3285 4809 800]
+	SymbolLine[3285	4809 2714 5000 800]
+	SymbolLine[2714	5000 1952 5000 800]
+	SymbolLine[1952	5000 1380 4809 800]
+	SymbolLine[1380	4809 1000 4429 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[2333	1000 2333 5000 800]
+	SymbolLine[1000	1000 3666 1000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[1000	1000 1000 3857 800]
+	SymbolLine[1000	3857 1191 4429 800]
+	SymbolLine[1191	4429 1571 4809 800]
+	SymbolLine[1571	4809 2143 5000 800]
+	SymbolLine[2143	5000 2523 5000 800]
+	SymbolLine[2523	5000 3095 4809 800]
+	SymbolLine[3095	4809 3476 4429 800]
+	SymbolLine[3476	4429 3666 3857 800]
+	SymbolLine[3666	3857 3666 1000 800]
+
+)
+Symbol['V' 1200]
+(
+	SymbolLine[1000	1000 2523 5000 800]
+	SymbolLine[4048	1000 2523 5000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[1000	1000 1952 5000 800]
+	SymbolLine[2905	1000 1952 5000 800]
+	SymbolLine[2905	1000 3857 5000 800]
+	SymbolLine[4809	1000 3857 5000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[1000	1000 3666 5000 800]
+	SymbolLine[3666	1000 1000 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[1000	1000 2523 2905 800]
+	SymbolLine[2523	2905 2523 5000 800]
+	SymbolLine[4048	1000 2523 2905 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[3666	1000 1000 5000 800]
+	SymbolLine[1000	1000 3666 1000 800]
+	SymbolLine[1000	5000 3666 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[1000	0 1000 6094 800]
+	SymbolLine[1191	0 1191 6094 800]
+	SymbolLine[1000	0 2334 0 800]
+	SymbolLine[1000	6094 2334 6094 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[1000	1000 3251 5000 800]
+
+)
+Symbol[']' 1200]
+(
+	SymbolLine[7666	0 7666 6094 800]
+	SymbolLine[7857	0 7857 6094 800]
+	SymbolLine[6524	0 7857 0 800]
+	SymbolLine[6524	6094 7857 6094 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[2523	1000 1000 3222 800]
+	SymbolLine[2523	1000 4046 3222 800]
+)
+Symbol['_' 1200]
+(
+SymbolLine[1000 5000 3500 5000 800]
+)
+Symbol['a' 1200] #new
+(
+	SymbolLine[3286 2333 3286 4999 800]
+	SymbolLine[3286 2903 2904 2522 800]
+	SymbolLine[2904 2522 2524 2333 800]
+	SymbolLine[2524 2333 1952 2333 800]
+	SymbolLine[1952 2333 1572 2522 800]
+	SymbolLine[1572 2522 1190 2903 800]
+	SymbolLine[1190 2903 1000 3474 800]
+	SymbolLine[1000 3474 1000 3856 800]
+	SymbolLine[1000 3856 1190 4427 800]
+	SymbolLine[1190 4427 1572 4808 800]
+	SymbolLine[1572 4808 1952 4999 800]
+	SymbolLine[1952 4999 2524 4999 800]
+	SymbolLine[2524 4999 2904 4808 800]
+	SymbolLine[2904 4808 3286 4427 800]
+)
+Symbol['b' 1200] #new
+(
+	SymbolLine[1000 1000 1000 5000 800]
+	SymbolLine[1000 2904 1381 2523 800]
+	SymbolLine[1381 2523 1761 2333 800]
+	SymbolLine[1761 2333 2333 2333 800]
+	SymbolLine[2333 2333 2713 2523 800]
+	SymbolLine[2713 2523 3095 2904 800]
+	SymbolLine[3095 2904 3286 3475 800]
+	SymbolLine[3286 3475 3286 3856 800]
+	SymbolLine[3286 3856 3095 4427 800]
+	SymbolLine[3095 4427 2713 4809 800]
+	SymbolLine[2713 4809 2333 5000 800]
+	SymbolLine[2333 5000 1761 5000 800]
+	SymbolLine[1761 5000 1381 4809 800]
+	SymbolLine[1381 4809 1000 4427 800]
+)
+
+Symbol['c' 1200] #new
+(
+	SymbolLine[3286 2903 2904 2522 800]
+	SymbolLine[2904 2522 2524 2333 800]
+	SymbolLine[2524 2333 1952 2333 800]
+	SymbolLine[1952 2333 1572 2522 800]
+	SymbolLine[1572 2522 1190 2903 800]
+	SymbolLine[1190 2903 1000 3474 800]
+	SymbolLine[1000 3474 1000 3856 800]
+	SymbolLine[1000 3856 1190 4427 800]
+	SymbolLine[1190 4427 1572 4808 800]
+	SymbolLine[1572 4808 1952 4999 800]
+	SymbolLine[1952 4999 2524 4999 800]
+	SymbolLine[2524 4999 2904 4808 800]
+	SymbolLine[2904 4808 3286 4427 800]
+)
+Symbol['d' 1200] #new
+(
+	SymbolLine[3284 1000 3284 5000 800]
+	SymbolLine[3284 2904 2904 2523 800]
+	SymbolLine[2904 2523 2523 2333 800]
+	SymbolLine[2523 2333 1952 2333 800]
+	SymbolLine[1952 2333 1570 2523 800]
+	SymbolLine[1570 2523 1189 2904 800]
+	SymbolLine[1189 2904 1000 3475 800]
+	SymbolLine[1000 3475 1000 3856 800]
+	SymbolLine[1000 3856 1189 4427 800]
+	SymbolLine[1189 4427 1570 4809 800]
+	SymbolLine[1570 4809 1952 5000 800]
+	SymbolLine[1952 5000 2523 5000 800]
+	SymbolLine[2523 5000 2904 4809 800]
+	SymbolLine[2904 4809 3284 4427 800]
+)
+Symbol['e' 1200] #NEW
+(
+	SymbolLine[1000 3474 3284 3474 800]
+	SymbolLine[3284 3474 3284 3094 800]
+	SymbolLine[3284 3094 3094 2713 800]
+	SymbolLine[3094 2713 2904 2522 800]
+	SymbolLine[2904 2522 2523 2333 800]
+	SymbolLine[2523 2333 1952 2333 800]
+	SymbolLine[1952 2333 1570 2522 800]
+	SymbolLine[1570 2522 1189 2903 800]
+	SymbolLine[1189 2903 1000 3474 800]
+	SymbolLine[1000 3474 1000 3856 800]
+	SymbolLine[1000 3856 1189 4427 800]
+	SymbolLine[1189 4427 1570 4808 800]
+	SymbolLine[1570 4808 1952 4999 800]
+	SymbolLine[1952 4999 2523 4999 800]
+	SymbolLine[2523 4999 2904 4808 800]
+	SymbolLine[2904 4808 3284 4427 800]
+)
+
+Symbol['f' 1200] #new
+(
+	SymbolLine[2523 1000 2143 1000 800]
+	SymbolLine[2143 1000 1761 1190 800]
+	SymbolLine[1761 1190 1570 1761 800]
+	SymbolLine[1570 1761 1570 5000 800]
+	SymbolLine[1000 2333 2333 2333 800]
+)
+
+Symbol['g' 1200] #NEW
+(
+	SymbolLine[3286 2333 3286 5379 800]
+	SymbolLine[3286 5379 3095 5951 800]
+	SymbolLine[3095 5951 2904 6142 800]
+	SymbolLine[2904 6142 2524 6331 800]
+	SymbolLine[2524 6331 1952 6331 800]
+	SymbolLine[1952 6331 1572 6142 800]
+	SymbolLine[3286 2903 2904 2522 800]
+	SymbolLine[2904 2522 2524 2333 800]
+	SymbolLine[2524 2333 1952 2333 800]
+	SymbolLine[1952 2333 1572 2522 800]
+	SymbolLine[1572 2522 1190 2903 800]
+	SymbolLine[1190 2903 1000 3474 800]
+	SymbolLine[1000 3474 1000 3856 800]
+	SymbolLine[1000 3856 1190 4427 800]
+	SymbolLine[1190 4427 1572 4808 800]
+	SymbolLine[1572 4808 1952 4999 800]
+	SymbolLine[1952 4999 2524 4999 800]
+	SymbolLine[2524 4999 2904 4808 800]
+	SymbolLine[2904 4808 3286 4427 800]
+)
+Symbol['h' 1200] #new
+(
+	SymbolLine[1000 1000 1000 5000 800]
+	SymbolLine[1000 3095 1570 2523 800]
+	SymbolLine[1570 2523 1952 2333 800]
+	SymbolLine[1952 2333 2523 2333 800]
+	SymbolLine[2523 2333 2904 2523 800]
+	SymbolLine[2904 2523 3095 3095 800]
+	SymbolLine[3095 3095 3095 5000 800]
+)
+
+Symbol['i' 1200] #new
+(
+	SymbolLine[1190 2324 1190 4990 800]
+	SymbolLine[1000 990 1190 1181 800]
+	SymbolLine[1190 1181 1381 990 800]
+	SymbolLine[1381 990 1190 800 800]
+	SymbolLine[1190 800 1000 990 800]
+)
+Symbol['j' 1200] #new
+(
+	SymbolLine[1952 2324 1952 5561 800]
+	SymbolLine[1952 5561 1761 6133 800]
+	SymbolLine[1761 6133 1380 6323 800]
+	SymbolLine[1380 6323 1000 6323 800]
+	SymbolLine[1761 990 1952 1181 800]
+	SymbolLine[1952 1181 2143 990 800]
+	SymbolLine[2143 990 1952 800 800]
+	SymbolLine[1952 800 1761 990 800]
+)
+Symbol['k' 1200]  #new
+(
+	SymbolLine[1000 1000 1000 5000 800]
+	SymbolLine[2904 2333 1000 4238 800]
+	SymbolLine[1761 3475 3095 5000 800]
+)
+
+Symbol['l' 1200] #new
+(
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['m' 1200] #new
+(
+	SymbolLine[1000 2333 1000 4999 800]
+	SymbolLine[1000 3094 1570 2522 800]
+	SymbolLine[1570 2522 1952 2333 800]
+	SymbolLine[1952 2333 2523 2333 800]
+	SymbolLine[2523 2333 2904 2522 800]
+	SymbolLine[2904 2522 3094 3094 800]
+	SymbolLine[3094 3094 3094 4999 800]
+	SymbolLine[3094 3094 3666 2522 800]
+	SymbolLine[3666 2522 4046 2333 800]
+	SymbolLine[4046 2333 4618 2333 800]
+	SymbolLine[4618 2333 4998 2522 800]
+	SymbolLine[4998 2522 5189 3094 800]
+	SymbolLine[5189 3094 5189 4999 800]
+)
+Symbol['n' 1200] #new
+(
+	SymbolLine[1000 2333 1000 4999 800]
+	SymbolLine[1000 3094 1572 2522 800]
+	SymbolLine[1572 2522 1952 2333 800]
+	SymbolLine[1952 2333 2524 2333 800]
+	SymbolLine[2524 2333 2904 2522 800]
+	SymbolLine[2904 2522 3095 3094 800]
+	SymbolLine[3095 3094 3095 4999 800]
+)
+Symbol['o' 1200] #new
+(
+	SymbolLine[1952 2333 1570 2522 800]
+	SymbolLine[1570 2522 1189 2903 800]
+	SymbolLine[1189 2903 1000 3474 800]
+	SymbolLine[1000 3474 1000 3856 800]
+	SymbolLine[1000 3856 1189 4427 800]
+	SymbolLine[1189 4427 1570 4808 800]
+	SymbolLine[1570 4808 1952 4999 800]
+	SymbolLine[1952 4999 2523 4999 800]
+	SymbolLine[2523 4999 2904 4808 800]
+	SymbolLine[2904 4808 3284 4427 800]
+	SymbolLine[3284 4427 3475 3856 800]
+	SymbolLine[3475 3856 3475 3474 800]
+	SymbolLine[3475 3474 3284 2903 800]
+	SymbolLine[3284 2903 2904 2522 800]
+	SymbolLine[2904 2522 2523 2333 800]
+	SymbolLine[2523 2333 1952 2333 800]
+)
+Symbol['p' 1200] #new
+(
+	SymbolLine[1000 2333 1000 6333 800]
+	SymbolLine[1000 2903 1381 2523 800]
+	SymbolLine[1381 2523 1761 2333 800]
+	SymbolLine[1761 2333 2333 2333 800]
+	SymbolLine[2333 2333 2714 2523 800]
+	SymbolLine[2714 2523 3095 2903 800]
+	SymbolLine[3095 2903 3286 3476 800]
+	SymbolLine[3286 3476 3286 3856 800]
+	SymbolLine[3286 3856 3095 4428 800]
+	SymbolLine[3095 4428 2714 4808 800]
+	SymbolLine[2714 4808 2333 4999 800]
+	SymbolLine[2333 4999 1761 4999 800]
+	SymbolLine[1761 4999 1381 4808 800]
+	SymbolLine[1381 4808 1000 4428 800]
+)
+Symbol['q' 1200] #new
+(
+	SymbolLine[3285 2333 3285 6333 800]
+	SymbolLine[3285 2903 2904 2523 800]
+	SymbolLine[2904 2523 2524 2333 800]
+	SymbolLine[2524 2333 1952 2333 800]
+	SymbolLine[1952 2333 1571 2523 800]
+	SymbolLine[1571 2523 1190 2903 800]
+	SymbolLine[1190 2903 1000 3476 800]
+	SymbolLine[1000 3476 1000 3856 800]
+	SymbolLine[1000 3856 1190 4428 800]
+	SymbolLine[1190 4428 1571 4808 800]
+	SymbolLine[1571 4808 1952 4999 800]
+	SymbolLine[1952 4999 2524 4999 800]
+	SymbolLine[2524 4999 2904 4808 800]
+	SymbolLine[2904 4808 3285 4428 800]
+)
+Symbol['r' 1200] #new
+(
+	SymbolLine[1000 2333 1000 4999 800]
+	SymbolLine[1000 3476 1190 2903 800]
+	SymbolLine[1190 2903 1572 2523 800]
+	SymbolLine[1572 2523 1952 2333 800]
+	SymbolLine[1952 2333 2524 2333 800]
+)
+Symbol['s' 1200] #new
+(
+	SymbolLine[3094 2903 2904 2523 800]
+	SymbolLine[2904 2523 2332 2333 800]
+	SymbolLine[2332 2333 1761 2333 800]
+	SymbolLine[1761 2333 1189 2523 800]
+	SymbolLine[1189 2523 1000 2903 800]
+	SymbolLine[1000 2903 1189 3285 800]
+	SymbolLine[1189 3285 1570 3476 800]
+	SymbolLine[1570 3476 2523 3666 800]
+	SymbolLine[2523 3666 2904 3856 800]
+	SymbolLine[2904 3856 3094 4237 800]
+	SymbolLine[3094 4237 3094 4428 800]
+	SymbolLine[3094 4428 2904 4808 800]
+	SymbolLine[2904 4808 2332 4999 800]
+	SymbolLine[2332 4999 1761 4999 800]
+	SymbolLine[1761 4999 1189 4808 800]
+	SymbolLine[1189 4808 1000 4428 800]
+)
+Symbol['t' 1200] #new
+(
+	SymbolLine[1572 1000 1572 4238 800]
+	SymbolLine[1572 4238 1761 4809 800]
+	SymbolLine[1761 4809 2143 5000 800]
+	SymbolLine[2143 5000 2524 5000 800]
+	SymbolLine[1000 2333 2333 2333 800]
+)
+Symbol['u' 1200] #new
+(
+	SymbolLine[1000 2333 1000 4237 800]
+	SymbolLine[1000 4237 1190 4808 800]
+	SymbolLine[1190 4808 1572 4999 800]
+	SymbolLine[1572 4999 2143 4999 800]
+	SymbolLine[2143 4999 2524 4808 800]
+	SymbolLine[2524 4808 3095 4237 800]
+	SymbolLine[3095 2333 3095 4999 800]
+)
+
+Symbol['v' 1200] #new
+(
+	SymbolLine[1000 2333 2142 4999 800]
+	SymbolLine[3284 2333 2142 4999 800]
+)
+
+Symbol['w' 1200] #new
+(
+	SymbolLine[1000 2333 1761 4999 800]
+	SymbolLine[2523 2333 1761 4999 800]
+	SymbolLine[2523 2333 3286 4999 800]
+	SymbolLine[4047 2333 3286 4999 800]
+)
+Symbol['x' 1200] #new
+(
+	SymbolLine[1000 2333 3095 4999 800]
+	SymbolLine[3095 2333 1000 4999 800]
+)
+
+
+Symbol['y' 1200] #new
+(
+	SymbolLine[1190 2333 2333 4999 800]
+	SymbolLine[3476 2333 2333 4999 800]
+	SymbolLine[2333 4999 1952 5760 800]
+	SymbolLine[1952 5760 1572 6142 800]
+	SymbolLine[1572 6142 1190 6333 800]
+	SymbolLine[1190 6333 1000 6333 800]
+)
+Symbol['z' 1200] #new
+(
+	SymbolLine[3095 2333 1000 4999 800]
+	SymbolLine[1000 2333 3095 2333 800]
+	SymbolLine[1000 4999 3095 4999 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[1952	0	1572	191 800]
+	SymbolLine[1572	191	1381	380 800]
+	SymbolLine[1381	380	1191	762 800]
+	SymbolLine[1191	762	1191	1143 800]
+	SymbolLine[1191	1143	1381	1523 800]
+	SymbolLine[1381	1523	1572	1714 800]
+	SymbolLine[1572	1714	1763	2095 800]
+	SymbolLine[1763	2095	1763	2475 800]
+	SymbolLine[1763	2475	1381	2857 800]
+	SymbolLine[1572	191	1381	571 800]
+	SymbolLine[1381	571	1381	952 800]
+	SymbolLine[1381	952	1572	1332 800]
+	SymbolLine[1572	1332	1763	1523 800]
+	SymbolLine[1763	1523	1952	1905 800]
+	SymbolLine[1952	1905	1952	2285 800]
+	SymbolLine[1952	2285	1763	2666 800]
+	SymbolLine[1763	2666	1000	3048 800]
+	SymbolLine[1000	3048	1763	3428 800]
+	SymbolLine[1763	3428	1952	3809 800]
+	SymbolLine[1952	3809	1952	4189 800]
+	SymbolLine[1952	4189	1763	4571 800]
+	SymbolLine[1763	4571	1572	4761 800]
+	SymbolLine[1572	4761	1381	5142 800]
+	SymbolLine[1381	5142	1381	5523 800]
+	SymbolLine[1381	5523	1572	5904 800]
+	SymbolLine[1381	3237	1763	3619 800]
+	SymbolLine[1763	3619	1763	4000 800]
+	SymbolLine[1763	4000	1572	4380 800]
+	SymbolLine[1572	4380	1381	4571 800]
+	SymbolLine[1381	4571	1191	4952 800]
+	SymbolLine[1191	4952	1191	5332 800]
+	SymbolLine[1191	5332	1381	5714 800]
+	SymbolLine[1381	5714	1572	5904 800]
+	SymbolLine[1572	5904	1952	6094 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[1000 250 1000 5750 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[1000	0	1381	191 800]
+	SymbolLine[1381	191	1572	380 800]
+	SymbolLine[1572	380	1762	762 800]
+	SymbolLine[1762	762	1762	1143 800]
+	SymbolLine[1762	1143	1572	1523 800]
+	SymbolLine[1572	1523	1381	1714 800]
+	SymbolLine[1381	1714	1191	2095 800]
+	SymbolLine[1191	2095	1191	2475 800]
+	SymbolLine[1191	2475	1572	2857 800]
+	SymbolLine[1381	191	1572	571 800]
+	SymbolLine[1572	571	1572	952 800]
+	SymbolLine[1572	952	1381	1332 800]
+	SymbolLine[1381	1332	1191	1523 800]
+	SymbolLine[1191	1523	1000	1905 800]
+	SymbolLine[1000	1905	1000	2285 800]
+	SymbolLine[1000	2285	1191	2666 800]
+	SymbolLine[1191	2666	1952	3048 800]
+	SymbolLine[1952	3048	1191	3428 800]
+	SymbolLine[1191	3428	1000	3809 800]
+	SymbolLine[1000	3809	1000	4189 800]
+	SymbolLine[1000	4189	1191	4571 800]
+	SymbolLine[1191	4571	1381	4761 800]
+	SymbolLine[1381	4761	1572	5142 800]
+	SymbolLine[1572	5142	1572	5523 800]
+	SymbolLine[1572	5523	1381	5904 800]
+	SymbolLine[1572	3237	1191	3619 800]
+	SymbolLine[1191	3619	1191	4000 800]
+	SymbolLine[1191	4000	1381	4380 800]
+	SymbolLine[1381	4380	1572	4571 800]
+	SymbolLine[1572	4571	1762	4952 800]
+	SymbolLine[1762	4952	1762	5332 800]
+	SymbolLine[1762	5332	1572	5714 800]
+	SymbolLine[1572	5714	1381	5904 800]
+	SymbolLine[1381	5904	1000	6094 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[1000 3643 1000 3262 800]
+	SymbolLine[1000 3262 1191 2691 800]
+	SymbolLine[1191 2691 1572 2500 800]
+	SymbolLine[1572 2500 1952 2500 800]
+	SymbolLine[1952 2500 2334 2691 800]
+	SymbolLine[2334 2691 3095 3262 800]
+	SymbolLine[3095 3262 3477 3452 800]
+	SymbolLine[3477 3452 3857 3452 800]
+	SymbolLine[3857 3452 4238 3262 800]
+	SymbolLine[4238 3262 4429 2881 800]
+	SymbolLine[1000 3262 1191 2881 800]
+	SymbolLine[1191 2881 1572 2691 800]
+	SymbolLine[1572 2691 1952 2691 800]
+	SymbolLine[1952 2691 2334 2881 800]
+	SymbolLine[2334 2881 3095 3452 800]
+	SymbolLine[3095 3452 3477 3643 800]
+	SymbolLine[3477 3643 3857 3643 800]
+	SymbolLine[3857 3643 4238 3452 800]
+	SymbolLine[4238 3452 4429 2881 800]
+	SymbolLine[4429 2881 4429 2500 800]
+)
+
Index: tags/2.0.1/font/default_arc.lht
===================================================================
--- tags/2.0.1/font/default_arc.lht	(nonexistent)
+++ tags/2.0.1/font/default_arc.lht	(revision 18980)
@@ -0,0 +1,2856 @@
+li:pcb-rnd-font-v1 {
+ ha:geda_pcb {
+  id = 0
+  ha:symbols {
+
+   ha:&20 {
+    width = 0.4mm
+    delta = 14.0mil
+    li:objects {
+    }
+    height = 1.373633mm
+   }
+   ha:] {
+    width = 0.127001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:&5c {
+    width = 0.762001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 30.0mil
+      y1 = 0.484632mm
+     }
+    }
+    height = 1.246633mm
+   }
+   ha:b {
+    width = 0.713756mm
+    delta = 4.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.104909mm
+      x2 = 0.104909mm
+      y1 = 14.08mil
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 0.356877mm
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.474479mm
+   }
+   ha:c {
+    width = 0.611633mm
+    delta = 0.203723mm
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.357631mm
+      x2 = 0.611632mm
+      y1 = 34.0mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.357631mm
+      x2 = 0.611632mm
+      y1 = 54.0mil
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 90.000000
+      x = 14.08mil
+      y = 44.0mil
+      r = 10.0mil
+     }
+    }
+    height = 1.475234mm
+   }
+   ha:d {
+    width = 0.713756mm
+    delta = 4.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.612909mm
+      x2 = 0.612909mm
+      y1 = 14.08mil
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 0.356877mm
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.474479mm
+   }
+   ha:e {
+    width = 0.715266mm
+    delta = 0.152923mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 0.611632mm
+      y1 = 1.119632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.357631mm
+      x2 = 0.611632mm
+      y1 = 1.373632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 270.000000
+      astart = 180.000000
+      x = 14.08mil
+      y = 1.119632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:f {
+    width = 0.484634mm
+    delta = 4.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 25.0mil
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = -90.000000
+      x = 15.0mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:g {
+    width = 0.713756mm
+    delta = 0.128279mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.754632mm
+      thickness = 8.0mil
+      x1 = 0.104909mm
+      x2 = 0.231909mm
+      y1 = 1.627632mm
+     }
+     ha:line.1 {
+      y2 = 1.754632mm
+      thickness = 8.0mil
+      x1 = 0.231909mm
+      x2 = 0.485909mm
+      y1 = 1.754632mm
+     }
+     ha:line.2 {
+      y2 = 1.627632mm
+      thickness = 8.0mil
+      x1 = 0.485909mm
+      x2 = 0.612909mm
+      y1 = 1.754632mm
+     }
+     ha:line.3 {
+      y2 = 1.627632mm
+      thickness = 8.0mil
+      x1 = 0.612909mm
+      x2 = 0.612909mm
+      y1 = 0.865632mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 0.356877mm
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.754633mm
+   }
+   ha:h {
+    width = 0.703348mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.095849mm
+      x2 = 0.095849mm
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.603849mm
+      x2 = 0.603849mm
+      y1 = 45.0mil
+     }
+     ha:line.2 {
+      y2 = 45.0mil
+      thickness = 8.0mil
+      x1 = 0.600341mm
+      x2 = 0.603849mm
+      y1 = 1.017392mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -132.000000
+      astart = 334.000000
+      x = 0.347817mm
+      y = 44.0mil
+      r = 0.27168mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:i {
+    width = 0.001um
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.637032mm
+      thickness = 10.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 0.992632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:j {
+    width = 0.252632mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.637032mm
+      thickness = 10.0mil
+      x1 = 0.148998mm
+      x2 = 0.148998mm
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 1.576832mm
+      thickness = 8.0mil
+      x1 = 0.148998mm
+      x2 = 0.148998mm
+      y1 = 0.992632mm
+     }
+     ha:line.2 {
+      y2 = 1.754632mm
+      thickness = 8.0mil
+      x1 = 0.103944mm
+      x2 = 0.021998mm
+      y1 = 1.673856mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 50.000000
+      astart = 130.000000
+      x = 0.021998mm
+      y = 1.576832mm
+      r = 5.0mil
+     }
+    }
+    height = 1.777753mm
+   }
+   ha:k {
+    width = 0.381001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.2 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.992632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:l {
+    width = 0.127001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 1.246632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:m {
+    width = 1.12574mm
+    delta = 0.148337mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 8.24mil
+      x2 = 8.24mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.615696mm
+      x2 = 0.615696mm
+      y1 = 0.992632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 40.24mil
+      x2 = 40.24mil
+      y1 = 0.992632mm
+     }
+     ha:line.3 {
+      y2 = 0.967232mm
+      thickness = 8.0mil
+      x1 = 8.24mil
+      x2 = 8.16mil
+      y1 = 0.992632mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = 180.000000
+      x = 4.08mil
+      y = 0.967232mm
+      r = 4.08mil
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 32.32mil
+      y = 0.992632mm
+      r = 0.201178mm
+     }
+     ha:simplearc.6 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 16.32mil
+      y = 0.992632mm
+      r = 0.201178mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:n {
+    width = 0.71934mm
+    delta = 5.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 8.24mil
+      x2 = 8.24mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.615696mm
+      x2 = 0.615696mm
+      y1 = 0.992632mm
+     }
+     ha:line.2 {
+      y2 = 0.967232mm
+      thickness = 8.0mil
+      x1 = 8.24mil
+      x2 = 8.16mil
+      y1 = 0.992632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = 180.000000
+      x = 4.08mil
+      y = 0.967232mm
+      r = 4.08mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 16.32mil
+      y = 0.992632mm
+      r = 0.201178mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:o {
+    width = 0.720439mm
+    delta = 0.132343mm
+    li:objects {
+     ha:simplearc.0 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 13.92mil
+      y = 44.0mil
+      r = 0.263238mm
+     }
+    }
+    height = 1.269747mm
+   }
+   ha:p {
+    width = 0.735847mm
+    delta = 7.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.754632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 14.92mil
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.754633mm
+   }
+   ha:q {
+    width = 0.713756mm
+    delta = 0.173737mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.754632mm
+      thickness = 8.0mil
+      x1 = 24.0mil
+      x2 = 0.612909mm
+      y1 = 34.0mil
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 0.356877mm
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.754633mm
+   }
+   ha:r {
+    width = 0.534157mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -135.000000
+      astart = 0.000000
+      x = 12.0mil
+      y = 41.0mil
+      r = 7.0mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:s {
+    width = 0.842266mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 9.08mil
+      x2 = 0.611632mm
+      y1 = 1.119632mm
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 9.08mil
+      x2 = 0.611632mm
+      y1 = 0.865632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 9.08mil
+      x2 = 0.611632mm
+      y1 = 1.373632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = -90.000000
+      x = 9.08mil
+      y = 0.992632mm
+      r = 5.0mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -52.403729
+      astart = -90.000000
+      x = 0.611632mm
+      y = 0.992632mm
+      r = 5.0mil
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = 45.578726
+      astart = 44.421274
+      x = 9.08mil
+      y = 1.246632mm
+      r = 5.0mil
+     }
+     ha:simplearc.6 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = -90.000000
+      x = 0.611632mm
+      y = 1.246632mm
+      r = 5.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:t {
+    width = 0.254001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 1.246632mm
+     }
+     ha:line.2 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.738632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:u {
+    width = 0.711202mm
+    delta = 0.180588mm
+    li:objects {
+     ha:line.0 {
+      y2 = 45.0mil
+      thickness = 8.0mil
+      x1 = 3.92mil
+      x2 = 3.92mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 45.0mil
+      thickness = 8.0mil
+      x1 = 23.92mil
+      x2 = 23.92mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 0.000000
+      x = 14.0mil
+      y = 45.0mil
+      r = 9.92mil
+     }
+    }
+    height = 1.498602mm
+   }
+   ha:v {
+    width = 0.508001mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 20.0mil
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:w {
+    width = 1.02639mm
+    delta = 7.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.170432mm
+      thickness = 8.0mil
+      x1 = 0.10414mm
+      x2 = 4.08mil
+      y1 = 0.86106mm
+     }
+     ha:line.1 {
+      y2 = 0.86106mm
+      thickness = 8.0mil
+      x1 = 0.514153mm
+      x2 = 0.514153mm
+      y1 = 1.15316mm
+     }
+     ha:line.2 {
+      y2 = 34.0mil
+      thickness = 8.0mil
+      x1 = 0.923093mm
+      x2 = 0.923093mm
+      y1 = 45.5mil
+     }
+     ha:line.3 {
+      y2 = 1.170432mm
+      thickness = 8.0mil
+      x1 = 0.514153mm
+      x2 = 0.513194mm
+      y1 = 1.15316mm
+     }
+     ha:line.4 {
+      y2 = 1.170432mm
+      thickness = 8.0mil
+      x1 = 0.923093mm
+      x2 = 0.922756mm
+      y1 = 45.5mil
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 0.000000
+      x = 0.717975mm
+      y = 1.170432mm
+      r = 0.204781mm
+     }
+     ha:simplearc.6 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 0.000000
+      x = 0.308413mm
+      y = 1.170432mm
+      r = 0.204781mm
+     }
+    }
+    height = 1.478847mm
+   }
+   ha:x {
+    width = 0.508001mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:y {
+    width = 0.711202mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 45.0mil
+      thickness = 8.0mil
+      x1 = 3.92mil
+      x2 = 3.92mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 60.0mil
+      thickness = 8.0mil
+      x1 = 23.92mil
+      x2 = 23.92mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 156.225135
+      astart = 23.774865
+      x = 14.0mil
+      y = 60.0mil
+      r = 9.92mil
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 0.000000
+      x = 14.0mil
+      y = 45.0mil
+      r = 9.92mil
+     }
+    }
+    height = 1.879602mm
+   }
+   ha:z {
+    width = 0.508001mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:~ {
+    width = 0.829902mm
+    delta = 8.08mil
+    li:objects {
+     ha:simplearc.0 {
+      thickness = 8.0mil
+      adelta = -152.513380
+      astart = 0.000000
+      x = 10.08mil
+      y = 0.992632mm
+      r = 0.169501mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = -152.513380
+      astart = 180.000000
+      x = 21.92mil
+      y = 32.92mil
+      r = 0.169501mm
+     }
+    }
+    height = 0.925323mm
+   }
+   ha:&7b {
+    width = 0.254001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 0.484632mm
+     }
+     ha:line.1 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.484632mm
+     }
+     ha:line.2 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.3 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.4 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.5 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 1.246632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:&7d {
+    width = 0.254001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.484632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.484632mm
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 0.738632mm
+     }
+     ha:line.3 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.4 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.5 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:| {
+    width = 0.001um
+    delta = 15.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:&23 {
+    width = 0.508001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.738632mm
+     }
+     ha:line.2 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 15.0mil
+      x2 = 15.0mil
+      y1 = 0.611632mm
+     }
+     ha:line.3 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 0.611632mm
+     }
+    }
+    height = 1.119633mm
+   }
+   ha:&26 {
+    width = 0.765439mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 8.0mil
+      x2 = 0.765438mm
+      y1 = 32.0mil
+     }
+     ha:line.1 {
+      y2 = 28.0mil
+      thickness = 8.0mil
+      x1 = 8.0mil
+      x2 = 6.0mil
+      y1 = 32.0mil
+     }
+     ha:line.2 {
+      y2 = 0.703086mm
+      thickness = 8.0mil
+      x1 = 0.159004mm
+      x2 = 0.477924mm
+      y1 = 0.993314mm
+     }
+     ha:line.3 {
+      y2 = 44.0mil
+      thickness = 8.0mil
+      x1 = 0.520801mm
+      x2 = 0.689238mm
+      y1 = 1.276688mm
+     }
+     ha:line.4 {
+      y2 = 28.0mil
+      thickness = 8.0mil
+      x1 = 0.134492mm
+      x2 = 6.0mil
+      y1 = 0.560832mm
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = -185.000000
+      astart = 144.000000
+      x = 0.333638mm
+      y = 45.0mil
+      r = 0.230006mm
+     }
+     ha:simplearc.6 {
+      thickness = 8.0mil
+      adelta = -225.000000
+      astart = 0.000000
+      x = 0.33567mm
+      y = 0.560832mm
+      r = 0.201178mm
+     }
+    }
+    height = 1.47664mm
+   }
+   ha:! {
+    width = 0.001um
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 1.246632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:" {
+    width = 0.254001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 0.611633mm
+   }
+   ha:$ {
+    width = 0.735821mm
+    delta = 8.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 65.0mil
+      thickness = 8.0mil
+      x1 = 0.381596mm
+      x2 = 0.381596mm
+      y1 = 10.0mil
+     }
+     ha:line.1 {
+      y2 = 0.954693mm
+      thickness = 8.0mil
+      x1 = 0.308266mm
+      x2 = 0.436371mm
+      y1 = 0.931603mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 227.000000
+      astart = 25.000000
+      x = 0.353178mm
+      y = 47.92mil
+      r = 0.275343mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 229.000000
+      astart = 205.000000
+      x = 0.382642mm
+      y = 0.666496mm
+      r = 0.275343mm
+     }
+    }
+    height = 1.651001mm
+   }
+   ha:% {
+    width = 1.274066mm
+    delta = 7.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 5.08mil
+      x2 = 1.145032mm
+      y1 = 1.373632mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = -353.000000
+      astart = 0.000000
+      x = 0.967232mm
+      y = 1.195832mm
+      r = 8.0mil
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -353.000000
+      astart = 0.000000
+      x = 12.08mil
+      y = 0.535432mm
+      r = 8.0mil
+     }
+    }
+    height = 1.502666mm
+   }
+   ha:' {
+    width = 0.254001mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.611632mm
+     }
+    }
+    height = 0.611633mm
+   }
+   ha:( {
+    width = 0.299452mm
+    delta = 0.068708mm
+    li:objects {
+     ha:line.0 {
+      y2 = 46.0mil
+      thickness = 8.0mil
+      x1 = 0.104704mm
+      x2 = 0.104704mm
+      y1 = 22.0mil
+     }
+     ha:line.1 {
+      y2 = 54.0mil
+      thickness = 8.0mil
+      x1 = 0.194119mm
+      x2 = 8.0mil
+      y1 = 1.367332mm
+     }
+     ha:line.2 {
+      y2 = 14.0mil
+      thickness = 8.0mil
+      x1 = 0.195191mm
+      x2 = 8.0mil
+      y1 = 0.363931mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 50.000000
+      astart = -50.000000
+      x = 0.359776mm
+      y = 22.0mil
+      r = 0.255072mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -50.000000
+      astart = 50.000000
+      x = 0.358704mm
+      y = 1.172464mm
+      r = 0.255072mm
+     }
+    }
+    height = 1.471494mm
+   }
+   ha:) {
+    width = 0.299453mm
+    delta = 0.123115mm
+    li:objects {
+     ha:line.0 {
+      y2 = 46.0mil
+      thickness = 8.0mil
+      x1 = 0.194747mm
+      x2 = 0.194747mm
+      y1 = 22.0mil
+     }
+     ha:line.1 {
+      y2 = 54.0mil
+      thickness = 8.0mil
+      x1 = 0.105332mm
+      x2 = 0.096251mm
+      y1 = 1.367332mm
+     }
+     ha:line.2 {
+      y2 = 14.0mil
+      thickness = 8.0mil
+      x1 = 0.10426mm
+      x2 = 0.096251mm
+      y1 = 0.363931mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -50.000000
+      astart = 230.000000
+      x = -60.325um
+      y = 22.0mil
+      r = 0.255072mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = 50.000000
+      astart = 130.000000
+      x = -59.253um
+      y = 1.172464mm
+      r = 0.255072mm
+     }
+    }
+    height = 1.471494mm
+   }
+   ha:* {
+    width = 0.508001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.119632mm
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.3 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 0.611632mm
+     }
+    }
+    height = 1.119633mm
+   }
+   ha:+ {
+    width = 0.508001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 0.611632mm
+     }
+    }
+    height = 1.119633mm
+   }
+   ha:, {
+    width = 0.254001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 1.627632mm
+     }
+    }
+    height = 1.627633mm
+   }
+   ha:- {
+    width = 0.508001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 0.865633mm
+   }
+   ha:. {
+    width = 0.127001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 54.0mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 54.0mil
+     }
+    }
+    height = 1.371601mm
+   }
+   ha:0 {
+    width = 0.715266mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 4.08mil
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.611632mm
+      x2 = 0.611632mm
+      y1 = 0.611632mm
+     }
+     ha:line.2 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 0.611632mm
+      y1 = 1.119632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 180.000000
+      x = 14.08mil
+      y = 1.119632mm
+      r = 10.0mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 14.08mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:1 {
+    width = 0.381001mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 8.0mil
+      y1 = 0.560832mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 8.0mil
+      x2 = 8.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:2 {
+    width = 0.816866mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.80676mm
+      thickness = 8.0mil
+      x1 = 3.08mil
+      x2 = 0.642585mm
+      y1 = 1.373632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 3.08mil
+      x2 = 0.713232mm
+      y1 = 1.373632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -220.000000
+      astart = 0.000000
+      x = 0.408432mm
+      y = 0.611632mm
+      r = 12.0mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:3 {
+    width = 0.744275mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.814832mm
+      thickness = 8.0mil
+      x1 = 12.4419685mil
+      x2 = 0.466389mm
+      y1 = 0.814832mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = 221.000000
+      astart = 27.000000
+      x = 0.356661mm
+      y = 42.38mil
+      r = 0.28398mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -218.000000
+      astart = 337.000000
+      x = 0.341421mm
+      y = 0.593852mm
+      r = 10.0mil
+     }
+    }
+    height = 1.464066mm
+   }
+   ha:4 {
+    width = 0.635001mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 0.992632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 20.0mil
+      x2 = 20.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:5 {
+    width = 0.762551mm
+    delta = 5.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.105039mm
+      x2 = 0.613039mm
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.105039mm
+      x2 = 0.105039mm
+      y1 = 14.08mil
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -261.000000
+      astart = 315.000000
+      x = 0.333639mm
+      y = 1.068832mm
+      r = 0.325278mm
+     }
+    }
+    height = 1.497744mm
+   }
+   ha:6 {
+    width = 0.725326mm
+    delta = 4.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 0.10414mm
+      x2 = 0.10414mm
+      y1 = 1.094232mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = 154.000000
+      astart = 207.000000
+      x = 0.362662mm
+      y = 0.611632mm
+      r = 0.25903mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 360.000000
+      astart = 99.000000
+      x = 0.362662mm
+      y = 1.094232mm
+      r = 0.25903mm
+     }
+    }
+    height = 1.456896mm
+   }
+   ha:7 {
+    width = 0.635001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 25.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:8 {
+    width = 0.718263mm
+    delta = 6.0mil
+    li:objects {
+     ha:simplearc.0 {
+      thickness = 8.0mil
+      adelta = 360.000000
+      astart = 99.000000
+      x = 14.0mil
+      y = 0.611632mm
+      r = 0.25903mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = 360.000000
+      astart = 99.000000
+      x = 14.0mil
+      y = 1.119632mm
+      r = 0.25903mm
+     }
+    }
+    height = 1.270001mm
+   }
+   ha:9 {
+    width = 0.725326mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.094232mm
+      thickness = 8.0mil
+      x1 = 24.5mil
+      x2 = 24.5mil
+      y1 = 0.611632mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = 153.000000
+      astart = 27.000000
+      x = 0.362662mm
+      y = 1.094232mm
+      r = 0.25903mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 360.000000
+      astart = 279.000000
+      x = 0.362662mm
+      y = 0.611632mm
+      r = 0.25903mm
+     }
+    }
+    height = 1.456896mm
+   }
+   ha:< {
+    width = 0.254001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.119633mm
+   }
+   ha:> {
+    width = 0.254001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.840232mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 0.586232mm
+     }
+     ha:line.1 {
+      y2 = 0.840232mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 1.094232mm
+     }
+    }
+    height = 1.094233mm
+   }
+   ha:? {
+    width = 0.664986mm
+    delta = 5.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.711422mm
+      thickness = 8.0mil
+      x1 = 0.388699mm
+      x2 = 0.504827mm
+      y1 = 0.825376mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.32543mm
+      x2 = 0.32543mm
+      y1 = 1.322832mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 46.000000
+      astart = 320.000000
+      x = 0.586492mm
+      y = 0.992632mm
+      r = 0.25903mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 227.000000
+      astart = 139.000000
+      x = 0.332492mm
+      y = 0.560832mm
+      r = 0.22886mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:@ {
+    width = 1.477266mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.484632mm
+      thickness = 8.0mil
+      x1 = 0.992632mm
+      x2 = 0.992632mm
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 1.119631mm
+      x2 = 1.310047mm
+      y1 = 0.992632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = 0.000000
+      x = 1.119632mm
+      y = 0.865632mm
+      r = 5.0mil
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -307.000000
+      astart = 153.000000
+      x = 0.738632mm
+      y = 0.738632mm
+      r = 10.0mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -314.000000
+      astart = 112.000000
+      x = 0.738632mm
+      y = 0.738632mm
+      r = 25.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:A {
+    width = 0.635001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 25.0mil
+      x2 = 25.0mil
+      y1 = 0.611632mm
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.3 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 7.0mil
+      x2 = 18.0mil
+      y1 = 14.08mil
+     }
+     ha:line.4 {
+      y2 = 0.611632mm
+      thickness = 8.0mil
+      x1 = 18.0mil
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+     ha:line.5 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 7.0mil
+      y1 = 0.611632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:B {
+    width = 0.865633mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.482598mm
+      x2 = 0.0
+      y1 = 1.373632mm
+     }
+     ha:line.3 {
+      y2 = 0.814832mm
+      thickness = 8.0mil
+      x1 = 0.482599mm
+      x2 = 5.0mil
+      y1 = 0.814832mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 90.000000
+      x = 0.482599mm
+      y = 1.094232mm
+      r = 11.0mil
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = 180.000000
+      astart = 90.000000
+      x = 20.0mil
+      y = 0.586232mm
+      r = 9.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:C {
+    width = 0.611633mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.484632mm
+      x2 = 0.611632mm
+      y1 = 1.373632mm
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.484632mm
+      x2 = 0.611632mm
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 4.08mil
+      y1 = 0.738632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = -90.000000
+      x = 0.484632mm
+      y = 0.738632mm
+      r = 15.0mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -90.000000
+      astart = 90.000000
+      x = 0.484632mm
+      y = 0.992632mm
+      r = 15.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:D {
+    width = 0.738634mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.3 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 25.0mil
+      x2 = 25.0mil
+      y1 = 0.738632mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = 90.000000
+      astart = 90.000000
+      x = 10.0mil
+      y = 0.992632mm
+      r = 15.0mil
+     }
+     ha:simplearc.5 {
+      thickness = 8.0mil
+      adelta = -90.000000
+      astart = 270.000000
+      x = 10.0mil
+      y = 0.738632mm
+      r = 15.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:E {
+    width = 0.508001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.814832mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 0.814832mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.3 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:F {
+    width = 0.508001mm
+    delta = 8.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 0.814832mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 0.814832mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:G {
+    width = 0.816866mm
+    delta = 8.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.043432mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 4.08mil
+      y1 = 0.637032mm
+     }
+     ha:line.1 {
+      y2 = 0.881916mm
+      thickness = 8.0mil
+      x1 = 0.648647mm
+      x2 = 0.399316mm
+      y1 = 0.881916mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -149.000000
+      astart = 0.000000
+      x = 16.0mil
+      y = 0.637032mm
+      r = 11.92mil
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -218.000000
+      astart = 218.000000
+      x = 16.16mil
+      y = 1.068832mm
+      r = 11.92mil
+     }
+    }
+    height = 1.475234mm
+   }
+   ha:H {
+    width = 0.635001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 25.0mil
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:I {
+    width = 0.254001mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:J {
+    width = 0.613666mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 12.08mil
+      x2 = 0.510032mm
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.510032mm
+      x2 = 0.510032mm
+      y1 = 14.08mil
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 180.000000
+      x = 12.08mil
+      y = 1.170432mm
+      r = 8.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:K {
+    width = 0.508001mm
+    delta = 11.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:L {
+    width = 0.508001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:M {
+    width = 0.762001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.399032mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 15.08mil
+     }
+     ha:line.1 {
+      y2 = 0.891032mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 15.08mil
+     }
+     ha:line.2 {
+      y2 = 15.08mil
+      thickness = 8.0mil
+      x1 = 15.0mil
+      x2 = 30.0mil
+      y1 = 0.891032mm
+     }
+     ha:line.3 {
+      y2 = 1.399032mm
+      thickness = 8.0mil
+      x1 = 30.0mil
+      x2 = 30.0mil
+      y1 = 15.08mil
+     }
+    }
+    height = 1.399033mm
+   }
+   ha:&2f {
+    width = 0.762001mm
+    delta = 15.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.484632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 30.0mil
+      y1 = 1.246632mm
+     }
+    }
+    height = 1.246633mm
+   }
+   ha:&3a {
+    width = 0.127001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.738632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.992632mm
+     }
+    }
+    height = 0.992633mm
+   }
+   ha:&3b {
+    width = 0.254001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 0.738632mm
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:&3d {
+    width = 0.508001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.738632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.738632mm
+     }
+     ha:line.1 {
+      y2 = 0.992632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 0.992632mm
+     }
+    }
+    height = 0.992633mm
+   }
+   ha:O {
+    width = 0.715266mm
+    delta = 0.230633mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 4.08mil
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.611632mm
+      x2 = 0.611632mm
+      y1 = 0.611632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 180.000000
+      x = 14.08mil
+      y = 1.119632mm
+      r = 10.0mil
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 14.08mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:P {
+    width = 0.738634mm
+    delta = 6.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 15.0mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = -90.000000
+      x = 15.0mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:N {
+    width = 0.635001mm
+    delta = 10.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 25.0mil
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:R {
+    width = 0.738634mm
+    delta = 5.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 15.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 13.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.3 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 13.0mil
+      x2 = 25.0mil
+      y1 = 0.865632mm
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = -90.000000
+      x = 15.0mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:S {
+    width = 0.735821mm
+    delta = 0.204727mm
+    li:objects {
+     ha:line.0 {
+      y2 = 0.851061mm
+      thickness = 8.0mil
+      x1 = 0.308266mm
+      x2 = 0.436371mm
+      y1 = 0.827971mm
+     }
+     ha:simplearc.1 {
+      thickness = 8.0mil
+      adelta = 227.000000
+      astart = 25.000000
+      x = 0.353178mm
+      y = 43.84mil
+      r = 0.275343mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = 229.000000
+      astart = 205.000000
+      x = 0.382642mm
+      y = 22.16mil
+      r = 0.275343mm
+     }
+    }
+    height = 1.492513mm
+   }
+   ha:Q {
+    width = 0.715266mm
+    delta = 0.230633mm
+    li:objects {
+     ha:line.0 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 4.08mil
+      x2 = 4.08mil
+      y1 = 0.611632mm
+     }
+     ha:line.1 {
+      y2 = 54.0mil
+      thickness = 8.0mil
+      x1 = 15.0mil
+      x2 = 27.0mil
+      y1 = 45.0mil
+     }
+     ha:line.2 {
+      y2 = 1.119632mm
+      thickness = 8.0mil
+      x1 = 0.611632mm
+      x2 = 0.611632mm
+      y1 = 0.611632mm
+     }
+     ha:simplearc.3 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 180.000000
+      x = 14.08mil
+      y = 1.119632mm
+      r = 10.0mil
+     }
+     ha:simplearc.4 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 0.000000
+      x = 14.08mil
+      y = 0.611632mm
+      r = 10.0mil
+     }
+    }
+    height = 1.477266mm
+   }
+   ha:U {
+    width = 0.715266mm
+    delta = 0.228093mm
+    li:objects {
+     ha:line.0 {
+      y2 = 44.0mil
+      thickness = 8.0mil
+      x1 = 0.10414mm
+      x2 = 0.10414mm
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 44.0mil
+      thickness = 8.0mil
+      x1 = 24.1mil
+      x2 = 24.1mil
+      y1 = 14.08mil
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -180.000000
+      astart = 180.000000
+      x = 14.08mil
+      y = 1.117092mm
+      r = 10.0mil
+     }
+    }
+    height = 1.474726mm
+   }
+   ha:V {
+    width = 0.508001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:T {
+    width = 0.508001mm
+    delta = 9.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:X {
+    width = 0.635001mm
+    delta = 14.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:Y {
+    width = 0.508001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 20.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 10.0mil
+      x2 = 10.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:W {
+    width = 0.762001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.2 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 15.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.3 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 15.0mil
+      x2 = 25.0mil
+      y1 = 0.865632mm
+     }
+     ha:line.4 {
+      y2 = 0.865632mm
+      thickness = 8.0mil
+      x1 = 25.0mil
+      x2 = 30.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.5 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 30.0mil
+      x2 = 30.0mil
+      y1 = 0.865632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:[ {
+    width = 0.127001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 0.0
+      y1 = 14.08mil
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:^ {
+    width = 0.254001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 5.0mil
+      y1 = 0.484632mm
+     }
+     ha:line.1 {
+      y2 = 0.484632mm
+      thickness = 8.0mil
+      x1 = 5.0mil
+      x2 = 10.0mil
+      y1 = 14.08mil
+     }
+    }
+    height = 0.484633mm
+   }
+   ha:Z {
+    width = 0.635001mm
+    delta = 13.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 14.08mil
+     }
+     ha:line.1 {
+      y2 = 14.08mil
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 1.373632mm
+     }
+     ha:line.2 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 25.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+   ha:a {
+    width = 0.73991mm
+    delta = 8.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.246632mm
+      thickness = 8.0mil
+      x1 = 0.612909mm
+      x2 = 0.612909mm
+      y1 = 0.865632mm
+     }
+     ha:line.1 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.612909mm
+      x2 = 0.739909mm
+      y1 = 1.246632mm
+     }
+     ha:simplearc.2 {
+      thickness = 8.0mil
+      adelta = -360.000000
+      astart = 20.000000
+      x = 0.356877mm
+      y = 44.0mil
+      r = 0.253245mm
+     }
+    }
+    height = 1.474479mm
+   }
+   ha:_ {
+    width = 0.508001mm
+    delta = 12.0mil
+    li:objects {
+     ha:line.0 {
+      y2 = 1.373632mm
+      thickness = 8.0mil
+      x1 = 0.0
+      x2 = 20.0mil
+      y1 = 1.373632mm
+     }
+    }
+    height = 1.373633mm
+   }
+  }
+  cell_width = 1.477266mm
+  cell_height = 1.879602mm
+ }
+}
Index: tags/2.0.1/font/osifontASCII.lht
===================================================================
--- tags/2.0.1/font/osifontASCII.lht	(nonexistent)
+++ tags/2.0.1/font/osifontASCII.lht	(revision 18980)
@@ -0,0 +1,8566 @@
+li:pcb-rnd-font-v1 {
+ ha:geda_pcb {
+  id = 0
+  ha:symbols {
+   ha:! {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 79.78mil
+       0.0mil; 79.69mil
+       0.0mil; 79.42mil
+       0.0mil; 78.96mil
+       0.0mil; 78.32mil
+       0.0mil; 77.5mil
+       0.0mil; 76.44mil
+       0.03mil; 75.43mil
+       0.21mil; 74.61mil
+       0.51mil; 73.94mil
+       0.94mil; 73.49mil
+       1.46mil; 73.18mil
+       2.16mil; 73.06mil
+       2.89mil; 73.18mil
+       3.47mil; 73.46mil
+       3.95mil; 73.94mil
+       4.29mil; 74.61mil
+       4.47mil; 75.46mil
+       4.56mil; 76.56mil
+       4.47mil; 77.56mil
+       4.29mil; 78.35mil
+       3.98mil; 78.99mil
+       3.56mil; 79.42mil
+       2.98mil; 79.69mil
+     }
+     li:simplepoly.1 {
+       4.56mil; 65.91mil
+       4.47mil; 65.91mil
+       4.29mil; 65.91mil
+       3.98mil; 65.91mil
+       3.56mil; 65.91mil
+       2.98mil; 65.91mil
+       2.28mil; 65.91mil
+       1.58mil; 65.85mil
+       1.0mil; 65.61mil
+       0.55mil; 65.21mil
+       0.24mil; 64.66mil
+       0.06mil; 63.93mil
+       0.0mil; 63.02mil
+       0.0mil; 36.59mil
+       0.06mil; 35.77mil
+       0.24mil; 35.07mil
+       0.55mil; 34.52mil
+       0.97mil; 34.12mil
+       1.55mil; 33.88mil
+       2.28mil; 33.79mil
+       2.95mil; 33.88mil
+       3.53mil; 34.12mil
+       3.98mil; 34.49mil
+       4.29mil; 35.04mil
+       4.47mil; 35.74mil
+       4.56mil; 36.62mil
+       4.56mil; 63.02mil
+       4.47mil; 63.9mil
+       4.29mil; 64.63mil
+       3.98mil; 65.18mil
+       3.56mil; 65.61mil
+       2.98mil; 65.85mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:" {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       13.87mil; 27.07mil
+       14.02mil; 26.49mil
+       14.26mil; 26.0mil
+       14.57mil; 25.64mil
+       14.9mil; 25.36mil
+       15.33mil; 25.18mil
+       15.81mil; 25.12mil
+       16.54mil; 25.18mil
+       17.15mil; 25.33mil
+       17.64mil; 25.61mil
+       17.97mil; 25.97mil
+       18.19mil; 26.43mil
+       18.28mil; 27.01mil
+       18.25mil; 27.25mil
+       18.25mil; 27.52mil
+       18.22mil; 27.8mil
+       18.16mil; 28.1mil
+       18.1mil; 28.44mil
+       18.03mil; 28.77mil
+       16.12mil; 36.68mil
+       15.91mil; 37.32mil
+       15.66mil; 37.84mil
+       15.39mil; 38.23mil
+       15.02mil; 38.54mil
+       14.63mil; 38.72mil
+       14.17mil; 38.75mil
+       13.41mil; 38.72mil
+       12.8mil; 38.54mil
+       12.32mil; 38.26mil
+       11.98mil; 37.87mil
+       11.77mil; 37.35mil
+       11.71mil; 36.71mil
+       11.71mil; 36.53mil
+       11.71mil; 36.35mil
+       11.71mil; 36.16mil
+       11.74mil; 36.01mil
+       11.77mil; 35.83mil
+       11.83mil; 35.68mil
+     }
+     li:simplepoly.1 {
+       2.31mil; 27.07mil
+       2.49mil; 26.49mil
+       2.73mil; 26.03mil
+       3.07mil; 25.64mil
+       3.43mil; 25.39mil
+       3.86mil; 25.21mil
+       4.41mil; 25.15mil
+       5.11mil; 25.21mil
+       5.72mil; 25.39mil
+       6.17mil; 25.7mil
+       6.51mil; 26.09mil
+       6.69mil; 26.61mil
+       6.78mil; 27.25mil
+       6.75mil; 27.37mil
+       6.75mil; 27.52mil
+       6.72mil; 27.68mil
+       6.69mil; 27.86mil
+       6.63mil; 28.07mil
+       6.6mil; 28.28mil
+       4.44mil; 36.8mil
+       4.22mil; 37.41mil
+       3.98mil; 37.9mil
+       3.68mil; 38.26mil
+       3.28mil; 38.54mil
+       2.86mil; 38.72mil
+       2.37mil; 38.75mil
+       1.64mil; 38.72mil
+       1.03mil; 38.54mil
+       0.57mil; 38.26mil
+       0.24mil; 37.9mil
+       0.06mil; 37.41mil
+       0.0mil; 36.77mil
+       0.0mil; 36.62mil
+       0.0mil; 36.44mil
+       0.03mil; 36.28mil
+       0.06mil; 36.1mil
+       0.09mil; 35.89mil
+       0.15mil; 35.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:\# {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       6.84mil; 36.28mil
+       6.9mil; 35.58mil
+       7.08mil; 34.98mil
+       7.39mil; 34.52mil
+       7.81mil; 34.19mil
+       8.36mil; 34.0mil
+       9.06mil; 33.91mil
+       9.73mil; 34.0mil
+       10.28mil; 34.19mil
+       10.7mil; 34.55mil
+       11.01mil; 35.01mil
+       11.19mil; 35.62mil
+       11.28mil; 36.38mil
+       11.28mil; 47.66mil
+       20.77mil; 47.66mil
+       20.77mil; 61.53mil
+       20.77mil; 52.19mil
+       11.31mil; 52.19mil
+       11.31mil; 61.53mil
+       20.77mil; 61.53mil
+       20.77mil; 47.66mil
+       20.77mil; 36.19mil
+       20.83mil; 35.49mil
+       21.02mil; 34.89mil
+       21.35mil; 34.43mil
+       21.81mil; 34.09mil
+       22.38mil; 33.91mil
+       23.14mil; 33.82mil
+       23.78mil; 33.91mil
+       24.3mil; 34.12mil
+       24.73mil; 34.46mil
+       25.03mil; 34.95mil
+       25.18mil; 35.55mil
+       25.27mil; 36.31mil
+       25.27mil; 47.69mil
+       29.87mil; 47.69mil
+       30.54mil; 47.78mil
+       31.08mil; 47.96mil
+       31.54mil; 48.27mil
+       31.84mil; 48.7mil
+       32.03mil; 49.24mil
+       32.12mil; 49.91mil
+       32.03mil; 50.61mil
+       31.84mil; 51.19mil
+       31.54mil; 51.65mil
+       31.11mil; 51.95mil
+       30.54mil; 52.13mil
+       29.84mil; 52.19mil
+       25.27mil; 52.19mil
+       25.27mil; 61.59mil
+       29.75mil; 61.59mil
+       30.45mil; 61.65mil
+       31.02mil; 61.84mil
+       31.48mil; 62.14mil
+       31.81mil; 62.57mil
+       32.0mil; 63.08mil
+       32.09mil; 63.75mil
+       32.0mil; 64.45mil
+       31.81mil; 65.0mil
+       31.51mil; 65.46mil
+       31.08mil; 65.76mil
+       30.54mil; 65.94mil
+       29.84mil; 66.0mil
+       25.21mil; 66.0mil
+       25.21mil; 77.29mil
+       25.12mil; 78.08mil
+       24.94mil; 78.69mil
+       24.6mil; 79.2mil
+       24.15mil; 79.54mil
+       23.57mil; 79.75mil
+       22.84mil; 79.81mil
+       22.2mil; 79.75mil
+       21.68mil; 79.54mil
+       21.29mil; 79.2mil
+       20.99mil; 78.72mil
+       20.8mil; 78.08mil
+       20.77mil; 77.26mil
+       20.77mil; 66.0mil
+       11.34mil; 66.0mil
+       11.34mil; 77.29mil
+       11.25mil; 78.08mil
+       11.07mil; 78.75mil
+       10.76mil; 79.23mil
+       10.34mil; 79.6mil
+       9.76mil; 79.81mil
+       9.06mil; 79.87mil
+       8.36mil; 79.81mil
+       7.81mil; 79.6mil
+       7.39mil; 79.23mil
+       7.08mil; 78.75mil
+       6.9mil; 78.08mil
+       6.84mil; 77.26mil
+       6.84mil; 66.0mil
+       2.46mil; 66.0mil
+       1.7mil; 65.94mil
+       1.09mil; 65.76mil
+       0.64mil; 65.42mil
+       0.3mil; 65.0mil
+       0.09mil; 64.42mil
+       0.03mil; 63.66mil
+       0.09mil; 63.05mil
+       0.27mil; 62.54mil
+       0.64mil; 62.14mil
+       1.09mil; 61.87mil
+       1.7mil; 61.68mil
+       2.49mil; 61.62mil
+       6.84mil; 61.62mil
+       6.84mil; 52.19mil
+       2.55mil; 52.19mil
+       1.76mil; 52.13mil
+       1.12mil; 51.95mil
+       0.64mil; 51.62mil
+       0.27mil; 51.19mil
+       0.06mil; 50.61mil
+       0.0mil; 49.85mil
+       0.06mil; 49.18mil
+       0.27mil; 48.63mil
+       0.64mil; 48.21mil
+       1.12mil; 47.9mil
+       1.76mil; 47.72mil
+       2.58mil; 47.63mil
+       6.84mil; 47.63mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:$ {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.2 {
+       0.0mil; 47.66mil
+       0.06mil; 46.5mil
+       0.24mil; 45.38mil
+       0.54mil; 44.35mil
+       0.97mil; 43.4mil
+       1.55mil; 42.52mil
+       2.28mil; 41.67mil
+       3.25mil; 40.79mil
+       4.32mil; 40.06mil
+       5.41mil; 39.48mil
+       6.6mil; 39.08mil
+       7.81mil; 38.81mil
+       9.18mil; 38.72mil
+       9.18mil; 36.47mil
+       9.24mil; 35.77mil
+       9.43mil; 35.19mil
+       9.73mil; 34.76mil
+       10.16mil; 34.43mil
+       10.7mil; 34.25mil
+       11.43mil; 34.16mil
+       12.07mil; 34.25mil
+       12.62mil; 34.46mil
+       13.05mil; 34.82mil
+       13.35mil; 35.31mil
+       13.53mil; 35.98mil
+       13.62mil; 36.77mil
+       13.62mil; 38.96mil
+       14.93mil; 39.17mil
+       16.21mil; 39.42mil
+       17.49mil; 39.72mil
+       18.7mil; 40.09mil
+       19.92mil; 40.48mil
+       21.14mil; 40.94mil
+       21.65mil; 41.21mil
+       22.11mil; 41.52mil
+       22.45mil; 41.88mil
+       22.69mil; 42.28mil
+       22.84mil; 42.7mil
+       22.9mil; 43.19mil
+       22.84mil; 43.77mil
+       9.18mil; 53.11mil
+       9.18mil; 52.86mil
+       9.18mil; 52.04mil
+       9.18mil; 50.67mil
+       9.18mil; 48.79mil
+       9.18mil; 46.32mil
+       9.18mil; 43.22mil
+       7.72mil; 43.37mil
+       6.54mil; 43.77mil
+       5.59mil; 44.41mil
+       4.92mil; 45.32mil
+       4.53mil; 46.47mil
+       4.41mil; 47.93mil
+       4.53mil; 48.91mil
+       4.92mil; 49.82mil
+       5.56mil; 50.7mil
+       6.51mil; 51.55mil
+       7.66mil; 52.35mil
+       9.18mil; 53.11mil
+       22.84mil; 43.77mil
+       22.66mil; 44.22mil
+       22.38mil; 44.62mil
+       22.02mil; 44.95mil
+       21.53mil; 45.2mil
+       20.92mil; 45.38mil
+       20.71mil; 45.41mil
+       20.47mil; 45.41mil
+       20.19mil; 45.38mil
+       19.89mil; 45.29mil
+       19.59mil; 45.2mil
+       19.22mil; 45.04mil
+       18.03mil; 44.62mil
+       16.94mil; 44.22mil
+       15.97mil; 43.95mil
+       15.08mil; 43.74mil
+       14.29mil; 43.62mil
+       13.62mil; 43.55mil
+       13.62mil; 55.72mil
+       14.32mil; 56.06mil
+       15.08mil; 56.45mil
+       15.94mil; 56.91mil
+       16.82mil; 57.42mil
+       17.76mil; 58.0mil
+       18.8mil; 58.64mil
+       20.04mil; 59.62mil
+       21.08mil; 60.68mil
+       21.87mil; 61.87mil
+       22.45mil; 63.2mil
+       22.81mil; 64.63mil
+       22.93mil; 66.25mil
+       22.84mil; 67.43mil
+       22.66mil; 68.56mil
+       22.32mil; 69.59mil
+       21.87mil; 70.6mil
+       21.26mil; 71.51mil
+       20.53mil; 72.39mil
+       19.53mil; 73.33mil
+       18.46mil; 74.06mil
+       17.37mil; 74.64mil
+       16.18mil; 75.07mil
+       14.96mil; 75.34mil
+       13.62mil; 75.4mil
+       13.62mil; 77.53mil
+       13.56mil; 78.29mil
+       13.38mil; 78.9mil
+       13.08mil; 79.39mil
+       12.65mil; 79.72mil
+       12.1mil; 79.93mil
+       11.43mil; 80.0mil
+       10.73mil; 79.93mil
+       10.19mil; 79.75mil
+       9.73mil; 79.42mil
+       9.43mil; 78.93mil
+       9.24mil; 78.35mil
+       9.18mil; 77.56mil
+       9.18mil; 75.07mil
+       7.27mil; 74.79mil
+       5.59mil; 74.46mil
+       4.1mil; 74.12mil
+       2.89mil; 73.76mil
+       1.85mil; 73.36mil
+       1.06mil; 72.91mil
+       0.73mil; 72.69mil
+       0.45mil; 72.42mil
+       0.24mil; 72.09mil
+       0.09mil; 71.75mil
+       0.03mil; 71.39mil
+       0.0mil; 70.93mil
+       0.03mil; 70.29mil
+       0.21mil; 69.74mil
+       0.51mil; 69.32mil
+       0.94mil; 69.04mil
+       1.49mil; 68.86mil
+       2.19mil; 68.77mil
+       2.37mil; 68.8mil
+       2.58mil; 68.83mil
+       2.83mil; 68.86mil
+       3.1mil; 68.92mil
+       3.37mil; 69.01mil
+       3.71mil; 69.11mil
+       4.71mil; 69.47mil
+       5.68mil; 69.77mil
+       18.46mil; 65.94mil
+       18.31mil; 65.0mil
+       17.91mil; 64.06mil
+       17.24mil; 63.2mil
+       16.33mil; 62.38mil
+       15.11mil; 61.62mil
+       13.62mil; 60.89mil
+       13.62mil; 70.96mil
+       15.08mil; 70.84mil
+       16.27mil; 70.41mil
+       17.21mil; 69.74mil
+       17.88mil; 68.77mil
+       18.31mil; 67.52mil
+       18.46mil; 65.94mil
+       5.68mil; 69.77mil
+       6.63mil; 70.05mil
+       7.51mil; 70.29mil
+       8.36mil; 70.47mil
+       9.18mil; 70.6mil
+       9.18mil; 58.25mil
+       7.6mil; 57.55mil
+       6.2mil; 56.82mil
+       4.95mil; 56.09mil
+       3.89mil; 55.36mil
+       3.01mil; 54.6mil
+       2.28mil; 53.84mil
+       1.58mil; 52.95mil
+       1.0mil; 52.01mil
+       0.54mil; 51.01mil
+       0.24mil; 49.94mil
+       0.06mil; 48.85mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:% {
+    width=41mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       39.33mil; 64.82mil
+       39.97mil; 65.67mil
+       40.51mil; 66.61mil
+       40.94mil; 67.61mil
+       41.21mil; 68.71mil
+       41.4mil; 69.9mil
+       41.49mil; 71.2mil
+       41.4mil; 72.36mil
+       41.18mil; 73.46mil
+       40.79mil; 74.49mil
+       40.27mil; 75.46mil
+       39.6mil; 76.41mil
+       38.78mil; 77.32mil
+       37.81mil; 78.14mil
+       36.83mil; 78.81mil
+       35.89mil; 67.77mil
+       35.43mil; 67.28mil
+       34.92mil; 66.88mil
+       34.34mil; 66.55mil
+       33.7mil; 66.34mil
+       33.0mil; 66.19mil
+       32.21mil; 66.12mil
+       31.54mil; 66.19mil
+       30.93mil; 66.34mil
+       30.35mil; 66.58mil
+       29.78mil; 66.92mil
+       29.26mil; 67.34mil
+       28.74mil; 67.89mil
+       28.41mil; 68.31mil
+       28.16mil; 68.77mil
+       27.95mil; 69.26mil
+       27.8mil; 69.81mil
+       27.71mil; 70.35mil
+       27.71mil; 70.96mil
+       27.74mil; 71.6mil
+       27.86mil; 72.21mil
+       28.04mil; 72.76mil
+       28.32mil; 73.27mil
+       28.68mil; 73.73mil
+       29.14mil; 74.15mil
+       29.62mil; 74.55mil
+       30.14mil; 74.88mil
+       30.66mil; 75.13mil
+       31.18mil; 75.31mil
+       31.72mil; 75.4mil
+       32.3mil; 75.43mil
+       32.85mil; 75.4mil
+       33.43mil; 75.28mil
+       34.0mil; 75.04mil
+       34.61mil; 74.73mil
+       35.22mil; 74.34mil
+       35.86mil; 73.82mil
+       36.19mil; 73.46mil
+       36.5mil; 73.06mil
+       36.74mil; 72.57mil
+       36.89mil; 72.06mil
+       36.98mil; 71.48mil
+       37.05mil; 70.81mil
+       36.98mil; 70.32mil
+       36.89mil; 69.81mil
+       36.74mil; 69.32mil
+       36.53mil; 68.8mil
+       36.22mil; 68.31mil
+       35.89mil; 67.77mil
+       36.83mil; 78.81mil
+       35.77mil; 79.33mil
+       34.67mil; 79.72mil
+       33.52mil; 79.93mil
+       32.27mil; 80.0mil
+       31.27mil; 79.96mil
+       30.32mil; 79.78mil
+       29.38mil; 79.51mil
+       28.47mil; 79.14mil
+       27.59mil; 78.66mil
+       26.7mil; 78.02mil
+       25.64mil; 77.11mil
+       24.76mil; 76.1mil
+       24.09mil; 75.01mil
+       23.6mil; 73.82mil
+       23.33mil; 72.54mil
+       23.24mil; 71.14mil
+       23.3mil; 69.68mil
+       23.57mil; 68.31mil
+       24.0mil; 67.07mil
+       24.6mil; 65.91mil
+       25.37mil; 64.85mil
+       26.37mil; 63.84mil
+       27.22mil; 63.2mil
+       28.1mil; 62.66mil
+       29.02mil; 62.23mil
+       29.99mil; 61.93mil
+       30.99mil; 61.74mil
+       32.09mil; 61.65mil
+       33.49mil; 61.74mil
+       34.79mil; 62.02mil
+       36.04mil; 62.44mil
+       37.2mil; 63.05mil
+       38.29mil; 63.84mil
+     }
+     li:simplepoly.2 {
+       37.14mil; 35.07mil
+       37.44mil; 34.76mil
+       37.78mil; 34.52mil
+       38.11mil; 34.34mil
+       38.44mil; 34.19mil
+       38.78mil; 34.09mil
+       39.18mil; 34.06mil
+       39.84mil; 34.16mil
+       40.39mil; 34.34mil
+       40.85mil; 34.67mil
+       41.15mil; 35.13mil
+       41.33mil; 35.71mil
+       41.43mil; 36.44mil
+       41.4mil; 36.68mil
+       41.3mil; 36.89mil
+       41.18mil; 37.17mil
+       41.0mil; 37.44mil
+       40.79mil; 37.74mil
+       40.51mil; 38.08mil
+       4.1mil; 79.05mil
+       3.8mil; 79.36mil
+       3.53mil; 79.6mil
+       3.19mil; 79.78mil
+       2.86mil; 79.9mil
+       2.52mil; 80.0mil
+       2.16mil; 80.0mil
+       1.49mil; 79.93mil
+       0.94mil; 79.75mil
+       0.51mil; 79.45mil
+       0.24mil; 79.02mil
+       0.06mil; 78.44mil
+       0.0mil; 77.71mil
+       0.0mil; 77.44mil
+       0.06mil; 77.17mil
+       0.18mil; 76.86mil
+       0.33mil; 76.59mil
+       0.51mil; 76.28mil
+       0.79mil; 75.98mil
+     }
+     li:simplepoly.4 {
+       16.09mil; 37.23mil
+       16.73mil; 38.08mil
+       17.27mil; 39.02mil
+       17.7mil; 40.03mil
+       17.97mil; 41.12mil
+       18.16mil; 42.31mil
+       18.25mil; 43.62mil
+       18.16mil; 44.77mil
+       17.94mil; 45.87mil
+       17.55mil; 46.93mil
+       17.03mil; 47.9mil
+       16.36mil; 48.85mil
+       15.54mil; 49.73mil
+       14.57mil; 50.55mil
+       13.59mil; 51.19mil
+       12.53mil; 51.71mil
+       11.43mil; 52.07mil
+       12.65mil; 40.18mil
+       12.19mil; 39.69mil
+       11.68mil; 39.3mil
+       11.1mil; 38.96mil
+       10.46mil; 38.75mil
+       9.76mil; 38.6mil
+       8.97mil; 38.54mil
+       8.3mil; 38.6mil
+       7.69mil; 38.75mil
+       7.11mil; 38.99mil
+       6.54mil; 39.33mil
+       6.02mil; 39.75mil
+       5.5mil; 40.3mil
+       5.17mil; 40.73mil
+       4.92mil; 41.18mil
+       4.71mil; 41.67mil
+       4.56mil; 42.22mil
+       4.47mil; 42.76mil
+       4.47mil; 43.37mil
+       4.5mil; 44.01mil
+       4.62mil; 44.62mil
+       4.8mil; 45.17mil
+       5.08mil; 45.68mil
+       5.44mil; 46.14mil
+       5.9mil; 46.57mil
+       6.38mil; 46.96mil
+       6.9mil; 47.3mil
+       7.42mil; 47.54mil
+       7.94mil; 47.72mil
+       8.48mil; 47.81mil
+       9.06mil; 47.84mil
+       9.61mil; 47.81mil
+       10.19mil; 47.69mil
+       10.76mil; 47.45mil
+       11.37mil; 47.14mil
+       11.98mil; 46.75mil
+       12.62mil; 46.23mil
+       12.95mil; 45.87mil
+       13.26mil; 45.47mil
+       13.5mil; 44.98mil
+       13.65mil; 44.47mil
+       13.75mil; 43.89mil
+       13.81mil; 43.22mil
+       13.75mil; 42.73mil
+       13.65mil; 42.22mil
+       13.5mil; 41.73mil
+       13.29mil; 41.21mil
+       12.99mil; 40.73mil
+       12.65mil; 40.18mil
+       11.43mil; 52.07mil
+       10.28mil; 52.28mil
+       9.03mil; 52.35mil
+       8.03mil; 52.31mil
+       7.08mil; 52.16mil
+       6.14mil; 51.89mil
+       5.23mil; 51.52mil
+       4.35mil; 51.04mil
+       3.46mil; 50.43mil
+       2.4mil; 49.55mil
+       1.52mil; 48.54mil
+       0.85mil; 47.45mil
+       0.36mil; 46.26mil
+       0.09mil; 44.98mil
+       0.0mil; 43.55mil
+       0.06mil; 42.09mil
+       0.33mil; 40.73mil
+       0.76mil; 39.48mil
+       1.37mil; 38.32mil
+       2.13mil; 37.26mil
+       3.13mil; 36.25mil
+       3.98mil; 35.62mil
+       4.86mil; 35.07mil
+       5.78mil; 34.64mil
+       6.75mil; 34.34mil
+       7.75mil; 34.16mil
+       8.85mil; 34.06mil
+       10.25mil; 34.16mil
+       11.56mil; 34.43mil
+       12.8mil; 34.85mil
+       13.96mil; 35.46mil
+       15.05mil; 36.25mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:&26 {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.2 {
+       11.4mil; 33.91mil
+       12.68mil; 34.0mil
+       13.93mil; 34.25mil
+       15.11mil; 34.67mil
+       16.24mil; 35.25mil
+       17.33mil; 35.98mil
+       18.4mil; 36.92mil
+       19.1mil; 37.74mil
+       19.71mil; 38.63mil
+       20.16mil; 39.57mil
+       20.5mil; 40.57mil
+       20.68mil; 41.64mil
+       20.77mil; 42.76mil
+       20.71mil; 43.8mil
+       20.62mil; 44.71mil
+       20.47mil; 45.56mil
+       20.26mil; 46.32mil
+       19.95mil; 47.02mil
+       19.62mil; 47.63mil
+       14.02mil; 55.63mil
+       21.47mil; 67.4mil
+       17.91mil; 70.14mil
+       16.51mil; 67.98mil
+       15.24mil; 66.0mil
+       14.08mil; 64.15mil
+       13.02mil; 62.5mil
+       12.07mil; 61.01mil
+       11.22mil; 59.62mil
+       5.78mil; 67.37mil
+       5.41mil; 67.92mil
+       5.14mil; 68.5mil
+       4.92mil; 69.04mil
+       4.77mil; 69.59mil
+       4.68mil; 70.14mil
+       4.65mil; 70.72mil
+       4.77mil; 72.18mil
+       5.17mil; 73.33mil
+       5.87mil; 74.25mil
+       6.81mil; 74.92mil
+       8.03mil; 75.31mil
+       9.58mil; 75.43mil
+       10.03mil; 75.4mil
+       10.52mil; 75.31mil
+       11.01mil; 75.13mil
+       11.53mil; 74.88mil
+       12.07mil; 74.58mil
+       12.65mil; 74.15mil
+       17.91mil; 70.14mil
+       21.47mil; 67.4mil
+       28.5mil; 62.2mil
+       28.74mil; 62.05mil
+       28.99mil; 61.9mil
+       29.26mil; 61.77mil
+       29.5mil; 61.71mil
+       29.75mil; 61.65mil
+       29.99mil; 61.62mil
+       30.63mil; 61.71mil
+       31.18mil; 61.9mil
+       31.6mil; 62.23mil
+       31.91mil; 62.66mil
+       32.09mil; 63.23mil
+       32.18mil; 63.96mil
+       32.12mil; 64.3mil
+       32.03mil; 64.63mil
+       31.84mil; 65.0mil
+       31.57mil; 65.33mil
+       31.24mil; 65.67mil
+       30.84mil; 66.0mil
+       23.94mil; 71.3mil
+       27.19mil; 76.38mil
+       27.28mil; 76.62mil
+       27.4mil; 76.83mil
+       27.46mil; 77.07mil
+       27.52mil; 77.32mil
+       27.56mil; 77.53mil
+       27.59mil; 77.77mil
+       27.49mil; 78.47mil
+       27.31mil; 79.02mil
+       27.01mil; 79.45mil
+       26.58mil; 79.75mil
+       26.03mil; 79.93mil
+       25.37mil; 80.0mil
+       25.0mil; 80.0mil
+       24.67mil; 79.9mil
+       24.36mil; 79.75mil
+       24.09mil; 79.54mil
+       23.81mil; 79.26mil
+       23.6mil; 78.93mil
+       20.38mil; 74.0mil
+       14.41mil; 78.35mil
+       13.65mil; 78.87mil
+       12.86mil; 79.26mil
+       12.01mil; 79.6mil
+       11.13mil; 79.81mil
+       10.19mil; 79.96mil
+       9.15mil; 80.0mil
+
+       11.4mil; 51.58mil
+       15.42mil; 45.87mil
+       15.66mil; 45.44mil
+       15.91mil; 45.01mil
+       16.06mil; 44.53mil
+       16.18mil; 44.04mil
+       16.27mil; 43.49mil
+       16.3mil; 42.92mil
+       16.24mil; 42.4mil
+       16.12mil; 41.88mil
+       15.94mil; 41.36mil
+       15.66mil; 40.85mil
+       15.3mil; 40.36mil
+       14.87mil; 39.84mil
+       14.38mil; 39.45mil
+       13.9mil; 39.08mil
+       13.35mil; 38.81mil
+       12.8mil; 38.63mil
+       12.22mil; 38.51mil
+       11.59mil; 38.44mil
+       10.92mil; 38.51mil
+       10.31mil; 38.63mil
+       9.73mil; 38.81mil
+       9.21mil; 39.08mil
+       8.7mil; 39.42mil
+       8.24mil; 39.84mil
+       7.81mil; 40.36mil
+       7.45mil; 40.85mil
+       7.18mil; 41.36mil
+       6.99mil; 41.88mil
+       6.87mil; 42.43mil
+       6.84mil; 42.98mil
+       6.84mil; 43.46mil
+       6.93mil; 43.98mil
+       7.05mil; 44.47mil
+       7.27mil; 44.95mil
+       7.48mil; 45.47mil
+       7.81mil; 45.99mil
+
+       11.4mil; 51.58mil
+
+       9.15mil; 80.0mil
+
+       7.97mil; 79.96mil
+       6.9mil; 79.78mil
+       5.9mil; 79.51mil
+       4.99mil; 79.11mil
+       4.16mil; 78.6mil
+       3.43mil; 77.96mil
+       2.37mil; 76.83mil
+       1.52mil; 75.65mil
+       0.85mil; 74.4mil
+       0.36mil; 73.12mil
+       0.09mil; 71.78mil
+       0.0mil; 70.32mil
+       0.03mil; 69.47mil
+       0.21mil; 68.62mil
+       0.48mil; 67.74mil
+       0.88mil; 66.85mil
+       1.4mil; 65.94mil
+       2.07mil; 65.0mil
+       8.67mil; 55.54mil
+       3.31mil; 47.08mil
+       3.04mil; 46.6mil
+       2.8mil; 45.99mil
+       2.64mil; 45.32mil
+       2.52mil; 44.59mil
+       2.43mil; 43.77mil
+       2.43mil; 42.82mil
+       2.52mil; 41.52mil
+       2.8mil; 40.27mil
+       3.28mil; 39.08mil
+       3.95mil; 37.96mil
+       4.8mil; 36.92mil
+       5.93mil; 35.89mil
+       6.75mil; 35.31mil
+       7.6mil; 34.82mil
+       8.48mil; 34.43mil
+       9.4mil; 34.16mil
+       10.37mil; 33.97mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:' {
+    width=6mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.19mil; 26.92mil
+       2.37mil; 26.31mil
+       2.64mil; 25.79mil
+       2.95mil; 25.39mil
+       3.34mil; 25.12mil
+       3.77mil; 24.94mil
+       4.32mil; 24.88mil
+       4.99mil; 24.94mil
+       5.56mil; 25.12mil
+       6.02mil; 25.39mil
+       6.32mil; 25.76mil
+       6.51mil; 26.25mil
+       6.6mil; 26.85mil
+       6.57mil; 27.1mil
+       6.57mil; 27.34mil
+       6.54mil; 27.59mil
+       6.51mil; 27.83mil
+       6.45mil; 28.07mil
+       6.41mil; 28.32mil
+       4.44mil; 36.31mil
+       4.19mil; 36.98mil
+       3.92mil; 37.5mil
+       3.59mil; 37.93mil
+       3.19mil; 38.23mil
+       2.73mil; 38.38mil
+       2.19mil; 38.44mil
+       1.52mil; 38.41mil
+       0.97mil; 38.23mil
+       0.54mil; 37.96mil
+       0.24mil; 37.56mil
+       0.06mil; 37.04mil
+       0.0mil; 36.38mil
+       0.0mil; 36.16mil
+       0.03mil; 35.89mil
+       0.06mil; 35.58mil
+       0.12mil; 35.25mil
+       0.18mil; 34.89mil
+       0.3mil; 34.46mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:( {
+    width=8mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.62mil; 30.78mil
+       4.84mil; 30.35mil
+       5.11mil; 29.99mil
+       5.44mil; 29.71mil
+       5.87mil; 29.5mil
+       6.33mil; 29.38mil
+       6.87mil; 29.32mil
+       7.45mil; 29.38mil
+       7.94mil; 29.56mil
+       8.33mil; 29.87mil
+       8.61mil; 30.29mil
+       8.79mil; 30.84mil
+       8.85mil; 31.51mil
+       8.82mil; 31.78mil
+       8.79mil; 32.09mil
+       8.73mil; 32.42mil
+       8.61mil; 32.79mil
+       8.52mil; 33.15mil
+       8.36mil; 33.58mil
+       7.09mil; 37.32mil
+       6.05mil; 41.06mil
+       5.23mil; 44.77mil
+       4.65mil; 48.51mil
+       4.32mil; 52.22mil
+       4.2mil; 56.03mil
+       4.29mil; 60.5mil
+       4.62mil; 64.76mil
+       5.2mil; 68.86mil
+       5.99mil; 72.79mil
+       7.03mil; 76.56mil
+       8.33mil; 80.27mil
+       8.49mil; 80.69mil
+       8.61mil; 81.12mil
+       8.73mil; 81.52mil
+       8.79mil; 81.88mil
+       8.85mil; 82.25mil
+       8.88mil; 82.58mil
+       8.79mil; 83.16mil
+       8.61mil; 83.65mil
+       8.27mil; 84.01mil
+       7.79mil; 84.28mil
+       7.21mil; 84.47mil
+       6.45mil; 84.53mil
+       6.02mil; 84.47mil
+       5.66mil; 84.31mil
+       5.32mil; 84.07mil
+       5.02mil; 83.71mil
+       4.74mil; 83.25mil
+       4.5mil; 82.7mil
+       3.13mil; 78.69mil
+       2.01mil; 74.52mil
+       1.12mil; 70.17mil
+       0.49mil; 65.64mil
+       0.12mil; 60.95mil
+       0.0mil; 55.93mil
+       0.12mil; 51.55mil
+       0.49mil; 47.27mil
+       1.12mil; 43.04mil
+       2.01mil; 38.9mil
+       3.16mil; 34.89mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:) {
+    width=8mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.26mil; 30.72mil
+       5.65mil; 34.67mil
+       6.81mil; 38.72mil
+       7.69mil; 42.82mil
+       8.33mil; 47.05mil
+       8.73mil; 51.34mil
+       8.88mil; 55.87mil
+       8.73mil; 60.74mil
+       8.36mil; 65.42mil
+       7.75mil; 69.96mil
+       6.87mil; 74.31mil
+       5.78mil; 78.5mil
+       4.38mil; 82.64mil
+       4.1mil; 83.19mil
+       3.83mil; 83.65mil
+       3.53mil; 83.98mil
+       3.19mil; 84.25mil
+       2.83mil; 84.41mil
+       2.43mil; 84.47mil
+       1.67mil; 84.41mil
+       1.06mil; 84.22mil
+       0.61mil; 83.98mil
+       0.27mil; 83.58mil
+       0.06mil; 83.13mil
+       0.0mil; 82.52mil
+       0.0mil; 82.19mil
+       0.03mil; 81.85mil
+       0.12mil; 81.49mil
+       0.21mil; 81.09mil
+       0.36mil; 80.66mil
+       0.54mil; 80.21mil
+       1.79mil; 76.62mil
+       2.83mil; 72.88mil
+       3.62mil; 68.92mil
+       4.19mil; 64.85mil
+       4.56mil; 60.56mil
+       4.68mil; 55.96mil
+       4.56mil; 52.07mil
+       4.19mil; 48.24mil
+       3.65mil; 44.5mil
+       2.83mil; 40.79mil
+       1.79mil; 37.2mil
+       0.51mil; 33.52mil
+       0.33mil; 33.12mil
+       0.21mil; 32.73mil
+       0.12mil; 32.36mil
+       0.03mil; 32.03mil
+       0.0mil; 31.75mil
+       0.0mil; 31.45mil
+       0.03mil; 30.81mil
+       0.21mil; 30.26mil
+       0.48mil; 29.84mil
+       0.88mil; 29.53mil
+       1.37mil; 29.35mil
+       2.0mil; 29.26mil
+       2.52mil; 29.32mil
+       2.98mil; 29.44mil
+       3.37mil; 29.62mil
+       3.74mil; 29.93mil
+       4.01mil; 30.26mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:* {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       16.67mil; 59.89mil
+       16.76mil; 59.89mil
+       17.06mil; 59.89mil
+       17.61mil; 59.89mil
+       18.34mil; 59.89mil
+       19.28mil; 59.89mil
+       20.5mil; 59.89mil
+       21.2mil; 59.95mil
+       21.78mil; 60.13mil
+       22.2mil; 60.41mil
+       22.54mil; 60.8mil
+       22.72mil; 61.32mil
+       22.81mil; 61.96mil
+       22.72mil; 62.63mil
+       22.54mil; 63.17mil
+       22.2mil; 63.6mil
+       21.72mil; 63.9mil
+       21.14mil; 64.09mil
+       20.38mil; 64.15mil
+       20.26mil; 64.15mil
+       19.95mil; 64.15mil
+       19.46mil; 64.15mil
+       18.76mil; 64.15mil
+       17.85mil; 64.15mil
+       16.73mil; 64.15mil
+       19.22mil; 66.67mil
+       19.43mil; 66.95mil
+       19.65mil; 67.19mil
+       19.8mil; 67.46mil
+       19.92mil; 67.71mil
+       19.98mil; 67.95mil
+       20.01mil; 68.16mil
+       19.92mil; 68.83mil
+       19.71mil; 69.35mil
+       19.34mil; 69.77mil
+       18.86mil; 70.08mil
+       18.22mil; 70.23mil
+       17.43mil; 70.29mil
+       17.15mil; 70.29mil
+       16.88mil; 70.2mil
+       16.57mil; 70.08mil
+       16.3mil; 69.9mil
+       16.0mil; 69.65mil
+       15.69mil; 69.35mil
+       11.43mil; 65.12mil
+       6.54mil; 70.02mil
+       6.32mil; 70.2mil
+       6.08mil; 70.35mil
+       5.87mil; 70.47mil
+       5.62mil; 70.54mil
+       5.38mil; 70.6mil
+       5.11mil; 70.6mil
+       4.41mil; 70.54mil
+       3.86mil; 70.35mil
+       3.4mil; 70.05mil
+       3.1mil; 69.62mil
+       2.92mil; 69.07mil
+       2.86mil; 68.38mil
+       2.86mil; 68.1mil
+       2.92mil; 67.86mil
+       2.98mil; 67.58mil
+       3.1mil; 67.34mil
+       3.25mil; 67.1mil
+       3.46mil; 66.85mil
+       6.05mil; 64.15mil
+       2.28mil; 64.15mil
+       1.58mil; 64.09mil
+       1.0mil; 63.9mil
+       0.54mil; 63.6mil
+       0.24mil; 63.17mil
+       0.06mil; 62.63mil
+       0.0mil; 61.93mil
+       0.06mil; 61.29mil
+       0.24mil; 60.77mil
+       0.57mil; 60.35mil
+       1.06mil; 60.04mil
+       1.64mil; 59.89mil
+       2.43mil; 59.8mil
+       6.08mil; 59.8mil
+       3.13mil; 56.82mil
+       2.95mil; 56.66mil
+       2.83mil; 56.45mil
+       2.73mil; 56.24mil
+       2.64mil; 56.03mil
+       2.61mil; 55.75mil
+       2.61mil; 55.48mil
+       2.67mil; 54.75mil
+       2.86mil; 54.14mil
+       3.19mil; 53.68mil
+       3.65mil; 53.35mil
+       4.22mil; 53.14mil
+       4.99mil; 53.04mil
+       5.23mil; 53.08mil
+       5.5mil; 53.14mil
+       5.72mil; 53.2mil
+       5.96mil; 53.32mil
+       6.17mil; 53.47mil
+       6.38mil; 53.65mil
+       11.43mil; 58.85mil
+       15.97mil; 54.32mil
+       16.33mil; 53.99mil
+       16.7mil; 53.68mil
+       17.09mil; 53.47mil
+       17.46mil; 53.32mil
+       17.79mil; 53.23mil
+       18.19mil; 53.17mil
+       18.76mil; 53.26mil
+       19.25mil; 53.44mil
+       19.65mil; 53.77mil
+       19.92mil; 54.23mil
+       20.1mil; 54.81mil
+       20.16mil; 55.54mil
+       20.1mil; 55.84mil
+       20.01mil; 56.15mil
+       19.86mil; 56.48mil
+       19.62mil; 56.85mil
+       19.31mil; 57.21mil
+       18.95mil; 57.61mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:+ {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       9.4mil; 52.92mil
+       9.46mil; 52.19mil
+       9.64mil; 51.58mil
+       9.94mil; 51.13mil
+       10.37mil; 50.79mil
+       10.92mil; 50.58mil
+       11.65mil; 50.49mil
+       12.29mil; 50.58mil
+       12.83mil; 50.79mil
+       13.26mil; 51.16mil
+       13.53mil; 51.65mil
+       13.72mil; 52.31mil
+       13.81mil; 53.11mil
+       13.81mil; 59.71mil
+       20.32mil; 59.71mil
+       21.08mil; 59.8mil
+       21.72mil; 59.98mil
+       22.2mil; 60.28mil
+       22.57mil; 60.71mil
+       22.78mil; 61.26mil
+       22.87mil; 61.93mil
+       22.78mil; 62.57mil
+       22.57mil; 63.11mil
+       22.2mil; 63.51mil
+       21.72mil; 63.81mil
+       21.05mil; 63.96mil
+       20.26mil; 64.03mil
+       20.07mil; 64.03mil
+       19.53mil; 64.03mil
+       18.61mil; 64.03mil
+       17.37mil; 64.03mil
+       15.75mil; 64.03mil
+       13.72mil; 64.03mil
+       13.72mil; 70.69mil
+       13.65mil; 71.48mil
+       13.47mil; 72.09mil
+       13.2mil; 72.6mil
+       12.8mil; 72.94mil
+       12.29mil; 73.15mil
+       11.68mil; 73.21mil
+       10.98mil; 73.15mil
+       10.4mil; 72.97mil
+       9.94mil; 72.6mil
+       9.64mil; 72.15mil
+       9.46mil; 71.54mil
+       9.4mil; 70.75mil
+       9.4mil; 64.03mil
+       9.18mil; 64.03mil
+       8.64mil; 64.03mil
+       7.69mil; 64.03mil
+       6.38mil; 64.03mil
+       4.68mil; 64.03mil
+       2.55mil; 64.03mil
+       1.76mil; 63.96mil
+       1.12mil; 63.78mil
+       0.64mil; 63.48mil
+       0.27mil; 63.05mil
+       0.06mil; 62.5mil
+       0.0mil; 61.77mil
+       0.06mil; 61.17mil
+       0.27mil; 60.62mil
+       0.64mil; 60.22mil
+       1.12mil; 59.92mil
+       1.79mil; 59.77mil
+       2.61mil; 59.68mil
+       9.4mil; 59.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:, {
+    width=6mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.19mil; 79.17mil
+       2.37mil; 78.57mil
+       2.65mil; 78.05mil
+       2.95mil; 77.65mil
+       3.35mil; 77.38mil
+       3.77mil; 77.2mil
+       4.32mil; 77.14mil
+       4.99mil; 77.2mil
+       5.57mil; 77.38mil
+       6.02mil; 77.65mil
+       6.33mil; 78.02mil
+       6.51mil; 78.5mil
+       6.6mil; 79.11mil
+       6.57mil; 79.36mil
+       6.57mil; 79.6mil
+       6.54mil; 79.84mil
+       6.51mil; 80.06mil
+       6.45mil; 80.3mil
+       6.42mil; 80.57mil
+       4.44mil; 88.57mil
+       4.2mil; 89.21mil
+       3.92mil; 89.73mil
+       3.59mil; 90.15mil
+       3.19mil; 90.46mil
+       2.74mil; 90.61mil
+       2.19mil; 90.7mil
+       1.52mil; 90.64mil
+       0.97mil; 90.46mil
+       0.55mil; 90.18mil
+       0.24mil; 89.79mil
+       0.06mil; 89.27mil
+       0.0mil; 88.63mil
+       0.0mil; 88.39mil
+       0.03mil; 88.12mil
+       0.06mil; 87.81mil
+       0.12mil; 87.48mil
+       0.18mil; 87.11mil
+       0.3mil; 86.72mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:- {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.34mil; 59.58mil
+       2.83mil; 59.58mil
+       4.35mil; 59.58mil
+       6.87mil; 59.58mil
+       10.4mil; 59.58mil
+       14.93mil; 59.58mil
+       20.68mil; 59.58mil
+       21.32mil; 59.68mil
+       21.87mil; 59.86mil
+       22.29mil; 60.19mil
+       22.6mil; 60.62mil
+       22.78mil; 61.2mil
+       22.87mil; 61.93mil
+       22.78mil; 62.57mil
+       22.6mil; 63.08mil
+       22.26mil; 63.48mil
+       21.84mil; 63.75mil
+       21.26mil; 63.93mil
+       20.53mil; 63.96mil
+       2.25mil; 63.96mil
+       1.55mil; 63.9mil
+       1.0mil; 63.72mil
+       0.54mil; 63.42mil
+       0.24mil; 62.99mil
+       0.06mil; 62.41mil
+       0.0mil; 61.68mil
+       0.06mil; 61.08mil
+       0.24mil; 60.53mil
+       0.57mil; 60.13mil
+       1.0mil; 59.83mil
+       1.58mil; 59.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:. {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 80.0mil
+       0.0mil; 79.93mil
+       0.0mil; 79.66mil
+       0.0mil; 79.2mil
+       0.0mil; 78.57mil
+       0.0mil; 77.77mil
+       0.0mil; 76.74mil
+       0.03mil; 75.77mil
+       0.21mil; 74.95mil
+       0.52mil; 74.34mil
+       0.91mil; 73.88mil
+       1.46mil; 73.61mil
+       2.13mil; 73.49mil
+       2.86mil; 73.61mil
+       3.5mil; 73.88mil
+       3.98mil; 74.37mil
+       4.32mil; 75.04mil
+       4.53mil; 75.89mil
+       4.62mil; 76.95mil
+       4.53mil; 77.9mil
+       4.35mil; 78.66mil
+       4.01mil; 79.23mil
+       3.59mil; 79.66mil
+       3.01mil; 79.93mil
+       2.28mil; 80.0mil
+       1.58mil; 79.93mil
+       1.0mil; 79.66mil
+       0.55mil; 79.2mil
+       0.24mil; 78.57mil
+       0.06mil; 77.77mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:/ {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 77.96mil
+       0.0mil; 77.74mil
+       0.03mil; 77.47mil
+       0.12mil; 77.17mil
+       0.21mil; 76.83mil
+       0.36mil; 76.47mil
+       0.55mil; 76.04mil
+       18.25mil; 35.98mil
+       18.52mil; 35.4mil
+       18.86mil; 34.95mil
+       19.22mil; 34.55mil
+       19.62mil; 34.31mil
+       20.01mil; 34.12mil
+       20.5mil; 34.06mil
+       21.14mil; 34.12mil
+       21.69mil; 34.31mil
+       22.11mil; 34.58mil
+       22.42mil; 34.98mil
+       22.6mil; 35.49mil
+       22.69mil; 36.13mil
+       22.66mil; 36.41mil
+       22.63mil; 36.68mil
+       22.6mil; 36.92mil
+       22.54mil; 37.2mil
+       22.48mil; 37.44mil
+       22.39mil; 37.68mil
+       4.53mil; 78.11mil
+       4.23mil; 78.69mil
+       3.92mil; 79.17mil
+       3.56mil; 79.54mil
+       3.19mil; 79.78mil
+       2.8mil; 79.96mil
+       2.37mil; 80.0mil
+       1.64mil; 79.96mil
+       1.03mil; 79.78mil
+       0.58mil; 79.51mil
+       0.24mil; 79.11mil
+       0.06mil; 78.6mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:0 {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       11.62mil; 34.06mil
+       12.92mil; 34.16mil
+       14.14mil; 34.43mil
+       15.27mil; 34.89mil
+       16.27mil; 35.49mil
+       17.15mil; 36.28mil
+       17.97mil; 37.29mil
+
+       11.46mil; 38.44mil
+       10.8mil; 38.51mil
+       10.22mil; 38.66mil
+       9.67mil; 38.9mil
+       9.21mil; 39.27mil
+       8.82mil; 39.72mil
+       8.48mil; 40.27mil
+       7.72mil; 41.88mil
+       7.02mil; 43.55mil
+       6.41mil; 45.29mil
+       5.9mil; 47.08mil
+       5.41mil; 49.0mil
+       5.02mil; 51.01mil
+       4.83mil; 51.95mil
+       4.71mil; 52.89mil
+       4.62mil; 53.87mil
+       4.53mil; 54.81mil
+       4.5mil; 55.78mil
+       4.5mil; 56.76mil
+       4.5mil; 57.49mil
+       4.5mil; 58.19mil
+       4.56mil; 58.89mil
+       4.59mil; 59.58mil
+       4.68mil; 60.28mil
+       4.77mil; 60.98mil
+       5.08mil; 63.23mil
+       5.47mil; 65.33mil
+       5.93mil; 67.31mil
+       6.48mil; 69.2mil
+       7.08mil; 70.96mil
+       7.78mil; 72.66mil
+       8.21mil; 73.55mil
+       8.73mil; 74.28mil
+       9.3mil; 74.82mil
+       9.94mil; 75.25mil
+       10.64mil; 75.49mil
+       11.43mil; 75.55mil
+       12.16mil; 75.49mil
+       12.83mil; 75.28mil
+       13.47mil; 74.92mil
+       14.05mil; 74.43mil
+       14.57mil; 73.76mil
+       15.08mil; 72.94mil
+       15.69mil; 71.6mil
+       16.3mil; 70.08mil
+       16.82mil; 68.41mil
+       17.3mil; 66.55mil
+       17.7mil; 64.57mil
+       18.1mil; 62.32mil
+       18.22mil; 61.38mil
+       18.31mil; 60.44mil
+       18.4mil; 59.52mil
+       18.46mil; 58.58mil
+       18.49mil; 57.67mil
+       18.52mil; 56.73mil
+       18.49mil; 55.84mil
+       18.46mil; 54.96mil
+       18.4mil; 54.08mil
+       18.31mil; 53.23mil
+       18.22mil; 52.38mil
+       18.1mil; 51.49mil
+       17.67mil; 49.43mil
+       17.21mil; 47.42mil
+       16.64mil; 45.5mil
+       16.03mil; 43.68mil
+       15.3mil; 41.94mil
+       14.51mil; 40.21mil
+       14.14mil; 39.69mil
+       13.75mil; 39.24mil
+       13.29mil; 38.9mil
+       12.74mil; 38.66mil
+       12.13mil; 38.51mil
+       11.46mil; 38.44mil
+       17.97mil; 37.29mil
+       19.01mil; 39.05mil
+       19.98mil; 41.03mil
+       20.8mil; 43.22mil
+       21.53mil; 45.65mil
+       22.14mil; 48.3mil
+       22.66mil; 51.25mil
+       22.75mil; 52.16mil
+       22.87mil; 53.08mil
+       22.93mil; 53.99mil
+       22.99mil; 54.87mil
+       23.02mil; 55.78mil
+       23.05mil; 56.73mil
+       23.02mil; 57.7mil
+       22.99mil; 58.67mil
+       22.93mil; 59.65mil
+       22.84mil; 60.59mil
+       22.75mil; 61.56mil
+       22.63mil; 62.54mil
+       22.14mil; 65.39mil
+       21.53mil; 68.04mil
+       20.83mil; 70.47mil
+       20.04mil; 72.69mil
+       19.13mil; 74.7mil
+       18.1mil; 76.53mil
+       17.27mil; 77.59mil
+       16.36mil; 78.47mil
+       15.36mil; 79.14mil
+       14.2mil; 79.63mil
+       12.92mil; 79.9mil
+       11.53mil; 80.0mil
+       10.16mil; 79.9mil
+       8.88mil; 79.63mil
+       7.75mil; 79.11mil
+       6.72mil; 78.44mil
+       5.78mil; 77.53mil
+       4.95mil; 76.41mil
+       4.04mil; 74.82mil
+       3.22mil; 72.97mil
+       2.43mil; 70.84mil
+       1.73mil; 68.44mil
+       1.06mil; 65.76mil
+       0.48mil; 62.69mil
+       0.33mil; 61.81mil
+       0.21mil; 60.89mil
+       0.12mil; 59.98mil
+       0.03mil; 59.07mil
+       0.0mil; 58.12mil
+       0.0mil; 57.15mil
+       0.0mil; 56.18mil
+       0.03mil; 55.2mil
+       0.12mil; 54.23mil
+       0.21mil; 53.23mil
+       0.33mil; 52.25mil
+       0.51mil; 51.22mil
+       1.06mil; 48.3mil
+       1.67mil; 45.65mil
+       2.34mil; 43.28mil
+       3.07mil; 41.18mil
+       3.83mil; 39.39mil
+       4.71mil; 37.81mil
+       5.53mil; 36.68mil
+       6.48mil; 35.74mil
+       7.57mil; 35.04mil
+       8.76mil; 34.49mil
+       10.1mil; 34.19mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:1 {
+    width=13mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       9.24mil; 35.04mil
+       9.58mil; 34.76mil
+       9.91mil; 34.52mil
+       10.28mil; 34.34mil
+       10.64mil; 34.19mil
+       11.01mil; 34.09mil
+       11.4mil; 34.06mil
+       12.07mil; 34.16mil
+       12.65mil; 34.37mil
+       13.11mil; 34.7mil
+       13.41mil; 35.19mil
+       13.59mil; 35.83mil
+       13.68mil; 36.59mil
+       13.68mil; 77.26mil
+       13.62mil; 78.05mil
+       13.44mil; 78.72mil
+       13.14mil; 79.2mil
+       12.71mil; 79.57mil
+       12.16mil; 79.78mil
+       11.49mil; 79.84mil
+       10.79mil; 79.78mil
+       10.25mil; 79.57mil
+       9.79mil; 79.2mil
+       9.49mil; 78.72mil
+       9.3mil; 78.05mil
+       9.24mil; 77.23mil
+       9.24mil; 76.25mil
+       9.24mil; 73.3mil
+       9.24mil; 68.38mil
+       9.24mil; 61.47mil
+       9.24mil; 52.62mil
+       9.24mil; 41.36mil
+       3.95mil; 46.66mil
+       3.68mil; 46.93mil
+       3.4mil; 47.11mil
+       3.13mil; 47.3mil
+       2.86mil; 47.39mil
+       2.58mil; 47.48mil
+       2.31mil; 47.48mil
+       1.58mil; 47.45mil
+       1.0mil; 47.27mil
+       0.57mil; 46.99mil
+       0.24mil; 46.6mil
+       0.06mil; 46.08mil
+       0.0mil; 45.44mil
+       0.0mil; 45.11mil
+       0.09mil; 44.8mil
+       0.21mil; 44.47mil
+       0.36mil; 44.16mil
+       0.57mil; 43.86mil
+       0.88mil; 43.52mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:2 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.37mil; 45.35mil
+       1.64mil; 45.32mil
+       1.03mil; 45.14mil
+       0.57mil; 44.83mil
+       0.24mil; 44.44mil
+       0.06mil; 43.89mil
+       0.0mil; 43.22mil
+       0.0mil; 43.01mil
+       0.03mil; 42.73mil
+       0.12mil; 42.46mil
+       0.21mil; 42.16mil
+       0.36mil; 41.82mil
+       0.54mil; 41.46mil
+       1.18mil; 40.27mil
+       1.85mil; 39.2mil
+       2.58mil; 38.26mil
+       3.31mil; 37.41mil
+       4.1mil; 36.71mil
+       4.95mil; 36.07mil
+       5.99mil; 35.46mil
+       7.02mil; 34.98mil
+       8.12mil; 34.58mil
+       9.21mil; 34.31mil
+       10.31mil; 34.12mil
+       11.49mil; 34.06mil
+       13.32mil; 34.19mil
+       15.02mil; 34.55mil
+       16.6mil; 35.16mil
+       18.03mil; 36.01mil
+       19.34mil; 37.11mil
+       20.56mil; 38.47mil
+       21.29mil; 39.57mil
+       21.87mil; 40.7mil
+       22.35mil; 41.82mil
+       22.69mil; 42.98mil
+       22.87mil; 44.16mil
+       22.96mil; 45.41mil
+       22.9mil; 46.5mil
+       22.72mil; 47.57mil
+       22.45mil; 48.66mil
+       22.05mil; 49.73mil
+       21.56mil; 50.82mil
+       20.95mil; 51.92mil
+       6.2mil; 75.74mil
+       20.62mil; 75.74mil
+       21.29mil; 75.83mil
+       21.87mil; 76.01mil
+       22.32mil; 76.31mil
+       22.63mil; 76.74mil
+       22.81mil; 77.32mil
+       22.9mil; 78.02mil
+       22.81mil; 78.63mil
+       22.6mil; 79.11mil
+       22.26mil; 79.51mil
+       21.78mil; 79.78mil
+       21.17mil; 79.96mil
+       20.41mil; 80.0mil
+       2.73mil; 80.0mil
+       1.88mil; 79.96mil
+       1.21mil; 79.78mil
+       0.7mil; 79.54mil
+       0.33mil; 79.14mil
+       0.09mil; 78.69mil
+       0.03mil; 78.05mil
+       0.03mil; 77.77mil
+       0.06mil; 77.53mil
+       0.12mil; 77.26mil
+       0.18mil; 77.01mil
+       0.27mil; 76.8mil
+       0.42mil; 76.56mil
+       16.79mil; 50.19mil
+       17.27mil; 49.33mil
+       17.7mil; 48.48mil
+       18.03mil; 47.66mil
+       18.25mil; 46.9mil
+       18.4mil; 46.14mil
+       18.46mil; 45.41mil
+       18.4mil; 44.59mil
+       18.25mil; 43.77mil
+       18.03mil; 42.98mil
+       17.7mil; 42.25mil
+       17.3mil; 41.55mil
+       16.79mil; 40.85mil
+       16.06mil; 40.15mil
+       15.27mil; 39.54mil
+       14.41mil; 39.08mil
+       13.47mil; 38.75mil
+       12.47mil; 38.57mil
+       11.34mil; 38.47mil
+       9.97mil; 38.63mil
+       8.7mil; 39.05mil
+       7.51mil; 39.72mil
+       6.41mil; 40.7mil
+       5.44mil; 41.91mil
+       4.5mil; 43.46mil
+       4.13mil; 44.04mil
+       3.8mil; 44.53mil
+       3.46mil; 44.89mil
+       3.1mil; 45.14mil
+       2.73mil; 45.32mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:3 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.95mil; 33.91mil
+       3.19mil; 33.91mil
+       3.98mil; 33.91mil
+       5.29mil; 33.91mil
+       7.11mil; 33.91mil
+       9.46mil; 33.91mil
+       12.47mil; 33.91mil
+       13.81mil; 34.03mil
+       15.11mil; 34.31mil
+       16.36mil; 34.79mil
+       17.58mil; 35.49mil
+       18.73mil; 36.38mil
+       19.89mil; 37.47mil
+       20.8mil; 38.6mil
+       21.56mil; 39.78mil
+       22.14mil; 41.03mil
+       22.57mil; 42.34mil
+       22.84mil; 43.71mil
+       22.93mil; 45.17mil
+       22.78mil; 46.96mil
+       22.38mil; 48.66mil
+       21.75mil; 50.28mil
+       20.83mil; 51.83mil
+       19.65mil; 53.26mil
+       18.19mil; 54.63mil
+       19.59mil; 55.78mil
+       20.74mil; 57.03mil
+       21.62mil; 58.37mil
+       22.26mil; 59.77mil
+       22.66mil; 61.26mil
+       22.81mil; 62.87mil
+       22.81mil; 63.08mil
+       22.81mil; 63.63mil
+       22.81mil; 64.54mil
+       22.81mil; 65.82mil
+       22.81mil; 67.49mil
+       22.81mil; 69.56mil
+       22.69mil; 70.87mil
+       22.41mil; 72.12mil
+       21.96mil; 73.33mil
+       21.32mil; 74.55mil
+       20.47mil; 75.71mil
+       19.43mil; 76.86mil
+       18.37mil; 77.77mil
+       17.24mil; 78.53mil
+       16.0mil; 79.11mil
+       14.66mil; 79.51mil
+       13.23mil; 79.78mil
+       11.65mil; 79.84mil
+       11.37mil; 79.84mil
+       10.64mil; 79.84mil
+       9.4mil; 79.84mil
+       7.66mil; 79.84mil
+       5.41mil; 79.84mil
+       2.58mil; 79.84mil
+       1.79mil; 79.78mil
+       1.12mil; 79.6mil
+       0.64mil; 79.3mil
+       0.27mil; 78.87mil
+       0.06mil; 78.32mil
+       0.0mil; 77.59mil
+       0.06mil; 76.98mil
+       0.27mil; 76.47mil
+       0.67mil; 76.07mil
+       1.18mil; 75.8mil
+       1.85mil; 75.61mil
+       2.73mil; 75.55mil
+       2.95mil; 75.55mil
+       3.62mil; 75.55mil
+       4.71mil; 75.55mil
+       6.26mil; 75.55mil
+       8.24mil; 75.55mil
+       10.76mil; 75.55mil
+       11.92mil; 75.52mil
+       13.02mil; 75.34mil
+       14.02mil; 75.04mil
+       14.96mil; 74.61mil
+       15.78mil; 74.06mil
+       16.57mil; 73.36mil
+       17.15mil; 72.66mil
+       17.64mil; 71.9mil
+       18.03mil; 71.05mil
+       18.31mil; 70.14mil
+       18.49mil; 69.14mil
+       18.55mil; 68.04mil
+       18.55mil; 64.09mil
+       18.49mil; 63.11mil
+       18.34mil; 62.17mil
+       18.1mil; 61.32mil
+       17.73mil; 60.5mil
+       17.27mil; 59.77mil
+       16.73mil; 59.07mil
+       15.97mil; 58.37mil
+       15.21mil; 57.79mil
+       14.41mil; 57.33mil
+       13.62mil; 57.0mil
+       12.83mil; 56.82mil
+       11.98mil; 56.73mil
+       7.36mil; 56.73mil
+       6.57mil; 56.66mil
+       5.96mil; 56.48mil
+       5.44mil; 56.18mil
+       5.11mil; 55.75mil
+       4.89mil; 55.17mil
+       4.83mil; 54.44mil
+       4.89mil; 53.84mil
+       5.11mil; 53.35mil
+       5.44mil; 52.95mil
+       5.93mil; 52.68mil
+       6.57mil; 52.5mil
+       7.39mil; 52.44mil
+       11.49mil; 52.44mil
+       12.41mil; 52.41mil
+       13.29mil; 52.22mil
+       14.11mil; 51.95mil
+       14.9mil; 51.55mil
+       15.66mil; 51.04mil
+       16.39mil; 50.37mil
+       17.03mil; 49.64mil
+       17.58mil; 48.88mil
+       18.0mil; 48.06mil
+       18.28mil; 47.2mil
+       18.46mil; 46.32mil
+       18.55mil; 45.38mil
+       18.49mil; 44.47mil
+       18.34mil; 43.62mil
+       18.1mil; 42.82mil
+       17.76mil; 42.09mil
+       17.33mil; 41.39mil
+       16.82mil; 40.76mil
+       16.03mil; 40.03mil
+       15.21mil; 39.45mil
+       14.41mil; 38.96mil
+       13.59mil; 38.63mil
+       12.77mil; 38.44mil
+       11.95mil; 38.35mil
+       2.95mil; 38.35mil
+       2.07mil; 38.29mil
+       1.37mil; 38.11mil
+       0.82mil; 37.81mil
+       0.42mil; 37.38mil
+       0.18mil; 36.8mil
+       0.12mil; 36.07mil
+       0.18mil; 35.43mil
+       0.42mil; 34.89mil
+       0.79mil; 34.46mil
+       1.34mil; 34.19mil
+       2.03mil; 34.0mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:4 {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       9.18mil; 35.62mil
+       9.37mil; 35.1mil
+       9.64mil; 34.7mil
+       9.97mil; 34.37mil
+       10.37mil; 34.12mil
+       10.86mil; 33.97mil
+       11.43mil; 33.91mil
+       12.04mil; 33.97mil
+       12.59mil; 34.16mil
+       12.99mil; 34.46mil
+       13.29mil; 34.85mil
+       13.44mil; 35.37mil
+       13.53mil; 36.01mil
+       13.5mil; 36.19mil
+       13.5mil; 36.38mil
+       13.47mil; 36.59mil
+       13.41mil; 36.8mil
+       13.38mil; 37.01mil
+       13.32mil; 37.23mil
+       5.02mil; 66.19mil
+       16.12mil; 66.19mil
+       16.12mil; 59.55mil
+       16.18mil; 58.79mil
+       16.36mil; 58.15mil
+       16.67mil; 57.67mil
+       17.09mil; 57.3mil
+       17.64mil; 57.09mil
+       18.34mil; 57.0mil
+       18.98mil; 57.09mil
+       19.53mil; 57.3mil
+       19.95mil; 57.7mil
+       20.22mil; 58.22mil
+       20.41mil; 58.89mil
+       20.5mil; 59.74mil
+       20.5mil; 66.22mil
+       20.62mil; 66.22mil
+       20.99mil; 66.22mil
+       21.65mil; 66.22mil
+       22.54mil; 66.22mil
+       23.69mil; 66.22mil
+       25.18mil; 66.22mil
+       25.85mil; 66.31mil
+       26.4mil; 66.49mil
+       26.83mil; 66.82mil
+       27.13mil; 67.28mil
+       27.31mil; 67.89mil
+       27.4mil; 68.62mil
+       27.31mil; 69.23mil
+       27.13mil; 69.71mil
+       26.83mil; 70.08mil
+       26.37mil; 70.35mil
+       25.79mil; 70.54mil
+       25.09mil; 70.57mil
+       20.5mil; 70.57mil
+       20.5mil; 77.44mil
+       20.41mil; 78.2mil
+       20.22mil; 78.81mil
+       19.92mil; 79.3mil
+       19.49mil; 79.63mil
+       18.95mil; 79.84mil
+       18.25mil; 79.9mil
+       17.58mil; 79.84mil
+       17.06mil; 79.66mil
+       16.64mil; 79.33mil
+       16.33mil; 78.87mil
+       16.18mil; 78.29mil
+       16.12mil; 77.53mil
+       16.12mil; 70.66mil
+       2.16mil; 70.66mil
+       1.49mil; 70.63mil
+       0.94mil; 70.44mil
+       0.51mil; 70.17mil
+       0.24mil; 69.77mil
+       0.06mil; 69.26mil
+       0.0mil; 68.62mil
+       0.0mil; 68.38mil
+       0.03mil; 68.1mil
+       0.09mil; 67.77mil
+       0.18mil; 67.37mil
+       0.27mil; 66.95mil
+       0.42mil; 66.43mil
+       0.64mil; 65.61mil
+       1.37mil; 63.05mil
+       2.58mil; 58.82mil
+       4.26mil; 52.89mil
+       6.41mil; 45.29mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:5 {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.38mil
+       0.06mil; 35.68mil
+       0.27mil; 35.1mil
+       0.64mil; 34.67mil
+       1.16mil; 34.34mil
+       1.79mil; 34.16mil
+       2.65mil; 34.06mil
+       3.13mil; 34.06mil
+       4.59mil; 34.06mil
+       7.06mil; 34.06mil
+       10.49mil; 34.06mil
+       14.9mil; 34.06mil
+       20.53mil; 34.06mil
+       21.29mil; 34.12mil
+       21.9mil; 34.31mil
+       22.42mil; 34.61mil
+       22.75mil; 35.04mil
+       22.96mil; 35.58mil
+       23.06mil; 36.25mil
+       22.96mil; 36.92mil
+       22.78mil; 37.47mil
+       22.45mil; 37.9mil
+       21.99mil; 38.2mil
+       21.38mil; 38.38mil
+       20.65mil; 38.44mil
+       4.47mil; 38.44mil
+       4.47mil; 52.53mil
+       11.22mil; 52.53mil
+       13.08mil; 52.65mil
+       14.84mil; 53.01mil
+       16.49mil; 53.62mil
+       17.98mil; 54.47mil
+       19.35mil; 55.54mil
+       20.65mil; 56.91mil
+       21.35mil; 57.91mil
+       21.96mil; 58.98mil
+       22.42mil; 60.1mil
+       22.75mil; 61.29mil
+       22.93mil; 62.57mil
+       23.03mil; 63.9mil
+       23.03mil; 68.8mil
+       22.93mil; 70.38mil
+       22.66mil; 71.84mil
+       22.2mil; 73.21mil
+       21.57mil; 74.49mil
+       20.74mil; 75.65mil
+       19.71mil; 76.74mil
+       18.52mil; 77.74mil
+       17.31mil; 78.57mil
+       16.03mil; 79.17mil
+       14.72mil; 79.63mil
+       13.38mil; 79.9mil
+       11.98mil; 80.0mil
+       2.49mil; 80.0mil
+       1.76mil; 79.96mil
+       1.19mil; 79.78mil
+       0.73mil; 79.48mil
+       0.39mil; 79.08mil
+       0.21mil; 78.53mil
+       0.15mil; 77.87mil
+       0.21mil; 77.23mil
+       0.43mil; 76.68mil
+       0.76mil; 76.25mil
+       1.25mil; 75.98mil
+       1.89mil; 75.8mil
+       2.71mil; 75.71mil
+       11.16mil; 75.71mil
+       12.38mil; 75.65mil
+       13.5mil; 75.43mil
+       14.51mil; 75.07mil
+       15.45mil; 74.58mil
+       16.27mil; 73.91mil
+       17.03mil; 73.09mil
+       17.49mil; 72.45mil
+       17.85mil; 71.75mil
+       18.16mil; 70.99mil
+       18.37mil; 70.23mil
+       18.49mil; 69.41mil
+       18.55mil; 68.5mil
+       18.55mil; 63.9mil
+       18.49mil; 63.02mil
+       18.34mil; 62.17mil
+       18.1mil; 61.38mil
+       17.76mil; 60.62mil
+       17.31mil; 59.89mil
+       16.76mil; 59.16mil
+       16.03mil; 58.49mil
+       15.18mil; 57.94mil
+       14.23mil; 57.49mil
+       13.14mil; 57.18mil
+       11.95mil; 57.0mil
+       10.62mil; 56.91mil
+       2.22mil; 56.91mil
+       1.52mil; 56.85mil
+       0.97mil; 56.63mil
+       0.55mil; 56.27mil
+       0.24mil; 55.78mil
+       0.06mil; 55.14mil
+       0.0mil; 54.32mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:6 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.68mil; 52.56mil
+       4.87mil; 52.56mil
+       5.41mil; 52.56mil
+       6.33mil; 52.56mil
+       7.63mil; 52.56mil
+       9.28mil; 52.56mil
+       11.41mil; 52.56mil
+       13.05mil; 52.68mil
+       14.6mil; 52.98mil
+       16.06mil; 53.5mil
+       17.43mil; 54.23mil
+       18.68mil; 55.17mil
+       19.92mil; 56.36mil
+       20.81mil; 57.49mil
+       21.57mil; 58.61mil
+       22.14mil; 59.77mil
+       22.54mil; 60.95mil
+       22.81mil; 62.17mil
+       22.9mil; 63.42mil
+       22.9mil; 63.6mil
+       22.9mil; 64.12mil
+       22.9mil; 64.94mil
+       22.9mil; 66.12mil
+       22.9mil; 67.65mil
+       22.9mil; 69.56mil
+       22.78mil; 70.87mil
+       22.48mil; 72.15mil
+       21.96mil; 73.42mil
+       21.23mil; 74.67mil
+       20.29mil; 75.92mil
+       19.1mil; 77.17mil
+       18.07mil; 78.05mil
+       16.88mil; 78.75mil
+       15.57mil; 79.3mil
+       14.14mil; 79.69mil
+       12.59mil; 79.93mil
+       10.86mil; 80.0mil
+       9.46mil; 79.93mil
+       8.12mil; 79.66mil
+       6.81mil; 79.2mil
+       5.6mil; 78.6mil
+       4.41mil; 77.8mil
+       3.25mil; 76.77mil
+       2.25mil; 75.71mil
+       1.43mil; 74.58mil
+       0.82mil; 73.42mil
+       0.36mil; 72.21mil
+       0.09mil; 70.93mil
+       0.0mil; 69.56mil
+       0.0mil; 53.68mil
+       0.12mil; 51.43mil
+       0.58mil; 49.18mil
+       1.31mil; 46.96mil
+       2.31mil; 44.8mil
+       3.65mil; 42.67mil
+
+       4.35mil; 69.11mil
+       4.41mil; 69.99mil
+       4.62mil; 70.84mil
+       4.96mil; 71.66mil
+       5.44mil; 72.48mil
+       6.08mil; 73.27mil
+       6.9mil; 74.06mil
+       7.51mil; 74.58mil
+       8.18mil; 74.98mil
+       8.91mil; 75.31mil
+       9.7mil; 75.52mil
+       10.55mil; 75.68mil
+       11.5mil; 75.71mil
+       12.2mil; 75.68mil
+       12.99mil; 75.49mil
+       13.78mil; 75.19mil
+       14.63mil; 74.76mil
+       15.51mil; 74.25mil
+       16.49mil; 73.55mil
+       17.09mil; 73.03mil
+       17.58mil; 72.39mil
+       17.98mil; 71.66mil
+       18.25mil; 70.87mil
+       18.43mil; 69.99mil
+       18.49mil; 68.98mil
+       18.49mil; 64.36mil
+       18.43mil; 63.39mil
+       18.25mil; 62.47mil
+       17.98mil; 61.56mil
+       17.58mil; 60.74mil
+       17.06mil; 59.92mil
+       16.42mil; 59.13mil
+       15.73mil; 58.49mil
+       15.0mil; 57.97mil
+       14.2mil; 57.55mil
+       13.35mil; 57.24mil
+       12.44mil; 57.09mil
+       11.47mil; 57.0mil
+       4.35mil; 57.0mil
+       4.35mil; 69.11mil
+       3.65mil; 42.67mil
+       5.32mil; 40.51mil
+       6.45mil; 39.33mil
+       7.7mil; 38.2mil
+       9.06mil; 37.17mil
+       10.55mil; 36.19mil
+       12.17mil; 35.34mil
+       13.96mil; 34.55mil
+       14.33mil; 34.43mil
+       14.72mil; 34.31mil
+       15.06mil; 34.22mil
+       15.39mil; 34.12mil
+       15.73mil; 34.09mil
+       16.03mil; 34.06mil
+       16.67mil; 34.16mil
+       17.22mil; 34.34mil
+       17.64mil; 34.67mil
+       17.95mil; 35.13mil
+       18.13mil; 35.71mil
+       18.22mil; 36.44mil
+       18.16mil; 36.89mil
+       18.01mil; 37.29mil
+       17.73mil; 37.65mil
+       17.37mil; 37.99mil
+       16.88mil; 38.26mil
+       16.3mil; 38.51mil
+       14.9mil; 39.05mil
+       13.66mil; 39.63mil
+       12.47mil; 40.24mil
+       11.41mil; 40.94mil
+       10.43mil; 41.67mil
+       9.55mil; 42.46mil
+       8.24mil; 43.92mil
+       7.15mil; 45.44mil
+       6.23mil; 47.05mil
+       5.54mil; 48.79mil
+       4.99mil; 50.58mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:7 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       20.22mil; 34.06mil
+       20.99mil; 34.12mil
+       21.62mil; 34.31mil
+       22.11mil; 34.61mil
+       22.48mil; 35.01mil
+       22.69mil; 35.55mil
+       22.78mil; 36.19mil
+       22.75mil; 36.5mil
+       22.69mil; 36.89mil
+       22.6mil; 37.41mil
+       22.48mil; 38.08mil
+       22.32mil; 38.84mil
+       22.14mil; 39.75mil
+       21.9mil; 40.82mil
+       21.2mil; 43.95mil
+       20.04mil; 49.18mil
+       18.43mil; 56.51mil
+       16.33mil; 65.94mil
+       13.72mil; 77.87mil
+       13.5mil; 78.53mil
+       13.26mil; 79.05mil
+       12.95mil; 79.48mil
+       12.56mil; 79.78mil
+       12.13mil; 79.93mil
+       11.62mil; 80.0mil
+       10.89mil; 79.96mil
+       10.31mil; 79.78mil
+       9.85mil; 79.51mil
+       9.52mil; 79.11mil
+       9.34mil; 78.63mil
+       9.27mil; 77.99mil
+       9.27mil; 77.87mil
+       9.27mil; 77.71mil
+       9.27mil; 77.59mil
+       9.3mil; 77.44mil
+       9.34mil; 77.29mil
+       9.37mil; 77.14mil
+       17.94mil; 38.54mil
+       4.32mil; 38.54mil
+       4.32mil; 38.63mil
+       4.32mil; 38.81mil
+       4.32mil; 39.11mil
+       4.32mil; 39.54mil
+       4.32mil; 40.12mil
+       4.32mil; 40.82mil
+       4.22mil; 41.49mil
+       4.04mil; 42.03mil
+       3.74mil; 42.46mil
+       3.31mil; 42.73mil
+       2.76mil; 42.92mil
+       2.1mil; 42.98mil
+       1.46mil; 42.92mil
+       0.91mil; 42.73mil
+       0.51mil; 42.43mil
+       0.21mil; 42.0mil
+       0.06mil; 41.46mil
+       0.0mil; 40.73mil
+       0.0mil; 40.6mil
+       0.0mil; 40.24mil
+       0.0mil; 39.6mil
+       0.0mil; 38.72mil
+       0.0mil; 37.56mil
+       0.0mil; 36.1mil
+       0.06mil; 35.49mil
+       0.24mil; 34.98mil
+       0.57mil; 34.58mil
+       1.06mil; 34.31mil
+       1.64mil; 34.12mil
+       2.43mil; 34.06mil
+       2.92mil; 34.06mil
+       4.38mil; 34.06mil
+       6.81mil; 34.06mil
+       10.25mil; 34.06mil
+       14.63mil; 34.06mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:8 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.2 {
+       4.59mil; 54.6mil
+       3.19mil; 53.35mil
+       2.04mil; 51.95mil
+       1.15mil; 50.4mil
+       0.51mil; 48.66mil
+       0.12mil; 46.81mil
+       0.0mil; 44.71mil
+       0.09mil; 43.1mil
+       0.42mil; 41.58mil
+       1.0mil; 40.18mil
+       6.63mil; 40.24mil
+       5.93mil; 41.03mil
+       5.38mil; 41.82mil
+       4.96mil; 42.61mil
+       4.65mil; 43.43mil
+       4.47mil; 44.28mil
+       4.41mil; 45.14mil
+       4.44mil; 45.96mil
+       4.56mil; 46.75mil
+       4.77mil; 47.54mil
+       5.08mil; 48.3mil
+       5.47mil; 49.06mil
+       5.96mil; 49.82mil
+       6.57mil; 50.61mil
+       7.33mil; 51.25mil
+       8.15mil; 51.74mil
+       9.09mil; 52.1mil
+       10.16mil; 52.31mil
+       11.34mil; 52.38mil
+       12.44mil; 52.35mil
+       13.47mil; 52.16mil
+       14.42mil; 51.86mil
+       15.27mil; 51.46mil
+       16.03mil; 50.92mil
+       16.73mil; 50.25mil
+       17.28mil; 49.52mil
+       17.73mil; 48.76mil
+       18.1mil; 47.96mil
+       18.37mil; 47.14mil
+       18.52mil; 46.26mil
+       18.58mil; 45.35mil
+       18.49mil; 44.47mil
+       18.31mil; 43.58mil
+       17.97mil; 42.73mil
+       17.52mil; 41.91mil
+       16.91mil; 41.15mil
+       16.18mil; 40.36mil
+       15.45mil; 39.78mil
+       14.69mil; 39.33mil
+       13.9mil; 38.93mil
+       13.05mil; 38.69mil
+       12.2mil; 38.51mil
+       11.28mil; 38.44mil
+       10.34mil; 38.51mil
+       9.46mil; 38.66mil
+       8.67mil; 38.9mil
+       7.91mil; 39.24mil
+       7.24mil; 39.69mil
+       6.63mil; 40.24mil
+       1.0mil; 40.18mil
+       1.79mil; 38.9mil
+       2.8mil; 37.68mil
+       4.1mil; 36.56mil
+       5.26mil; 35.77mil
+       6.45mil; 35.1mil
+       7.69mil; 34.58mil
+       8.94mil; 34.22mil
+       10.19mil; 34.0mil
+       11.56mil; 33.91mil
+       12.59mil; 33.97mil
+       13.62mil; 34.09mil
+       14.57mil; 34.28mil
+       15.51mil; 34.58mil
+       16.36mil; 34.92mil
+       17.21mil; 35.37mil
+       18.95mil; 36.65mil
+       20.35mil; 38.05mil
+       21.47mil; 39.63mil
+       22.26mil; 41.36mil
+       22.75mil; 43.25mil
+       22.93mil; 45.35mil
+       22.78mil; 47.3mil
+       22.42mil; 49.06mil
+       21.78mil; 50.67mil
+       20.89mil; 52.16mil
+       19.77mil; 53.5mil
+       18.34mil; 54.69mil
+       19.74mil; 55.96mil
+       20.89mil; 57.33mil
+       21.81mil; 58.79mil
+       22.45mil; 60.35mil
+       22.84mil; 61.99mil
+       22.99mil; 63.78mil
+       22.99mil; 68.98mil
+       22.87mil; 70.44mil
+       22.54mil; 71.84mil
+       22.02mil; 73.21mil
+       21.26mil; 74.52mil
+       20.29mil; 75.8mil
+       19.07mil; 77.07mil
+       18.04mil; 77.93mil
+       16.91mil; 78.63mil
+       15.72mil; 79.17mil
+       14.45mil; 79.57mil
+       13.11mil; 79.81mil
+       11.65mil; 79.87mil
+       11.4mil; 56.88mil
+       10.52mil; 56.94mil
+       9.67mil; 57.12mil
+       8.85mil; 57.36mil
+       8.09mil; 57.76mil
+       7.33mil; 58.22mil
+       6.63mil; 58.82mil
+       5.93mil; 59.55mil
+       5.38mil; 60.31mil
+       4.93mil; 61.11mil
+       4.62mil; 61.93mil
+       4.44mil; 62.78mil
+       4.38mil; 63.69mil
+       4.38mil; 69.23mil
+       4.44mil; 69.99mil
+       4.65mil; 70.75mil
+       5.02mil; 71.54mil
+       5.53mil; 72.33mil
+       6.17mil; 73.15mil
+       7.02mil; 73.97mil
+       7.57mil; 74.43mil
+       8.18mil; 74.82mil
+       8.88mil; 75.1mil
+       9.64mil; 75.31mil
+       10.49mil; 75.43mil
+       11.43mil; 75.46mil
+       12.23mil; 75.43mil
+       13.05mil; 75.25mil
+       13.87mil; 74.98mil
+       14.66mil; 74.61mil
+       15.48mil; 74.12mil
+       16.33mil; 73.49mil
+       16.97mil; 72.88mil
+       17.52mil; 72.18mil
+       17.94mil; 71.39mil
+       18.22mil; 70.5mil
+       18.4mil; 69.56mil
+       18.49mil; 68.5mil
+       18.49mil; 63.96mil
+       18.43mil; 63.11mil
+       18.25mil; 62.26mil
+       17.94mil; 61.44mil
+       17.52mil; 60.59mil
+       16.97mil; 59.77mil
+       16.3mil; 58.89mil
+       15.66mil; 58.28mil
+       14.96mil; 57.79mil
+       14.2mil; 57.39mil
+       13.35mil; 57.12mil
+       12.41mil; 56.94mil
+       11.4mil; 56.88mil
+       11.65mil; 79.87mil
+       10.04mil; 79.81mil
+       8.55mil; 79.6mil
+       7.21mil; 79.23mil
+       6.02mil; 78.75mil
+       4.93mil; 78.11mil
+       3.98mil; 77.29mil
+       2.77mil; 75.98mil
+       1.76mil; 74.67mil
+       1.0mil; 73.33mil
+       0.42mil; 71.96mil
+       0.09mil; 70.63mil
+       0.0mil; 69.17mil
+       0.0mil; 63.54mil
+       0.12mil; 61.93mil
+       0.48mil; 60.38mil
+       1.12mil; 58.85mil
+       2.01mil; 57.39mil
+       3.13mil; 56.0mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:9 {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.56mil; 77.74mil
+       4.59mil; 77.26mil
+       4.77mil; 76.83mil
+       5.08mil; 76.44mil
+       5.5mil; 76.07mil
+       6.02mil; 75.77mil
+       6.72mil; 75.49mil
+       7.7mil; 75.16mil
+       8.61mil; 74.76mil
+       9.52mil; 74.34mil
+       10.34mil; 73.85mil
+       11.16mil; 73.3mil
+       11.95mil; 72.69mil
+       13.6mil; 71.17mil
+       15.0mil; 69.5mil
+       16.15mil; 67.74mil
+       17.06mil; 65.82mil
+       17.73mil; 63.78mil
+       18.19mil; 61.56mil
+       10.8mil; 61.56mil
+       9.52mil; 61.5mil
+       8.3mil; 61.29mil
+       7.12mil; 60.89mil
+       5.99mil; 60.38mil
+       4.87mil; 59.71mil
+       3.8mil; 58.85mil
+       2.62mil; 57.73mil
+       1.67mil; 56.54mil
+       0.94mil; 55.27mil
+       0.43mil; 53.96mil
+       0.09mil; 52.59mil
+       0.0mil; 51.1mil
+       0.0mil; 50.95mil
+       0.0mil; 50.4mil
+       0.0mil; 49.52mil
+       0.0mil; 48.3mil
+       0.0mil; 46.72mil
+       0.0mil; 44.68mil
+       0.12mil; 43.04mil
+       0.52mil; 41.49mil
+       18.31mil; 45.81mil
+       18.25mil; 44.83mil
+       18.1mil; 43.89mil
+       17.82mil; 43.04mil
+       17.49mil; 42.22mil
+       17.03mil; 41.49mil
+       16.46mil; 40.76mil
+       15.73mil; 40.09mil
+       14.93mil; 39.54mil
+       14.11mil; 39.11mil
+       13.23mil; 38.81mil
+       12.32mil; 38.63mil
+       11.31mil; 38.54mil
+       10.43mil; 38.6mil
+       9.61mil; 38.75mil
+       8.79mil; 39.02mil
+       8.0mil; 39.36mil
+       7.24mil; 39.81mil
+       6.51mil; 40.39mil
+       5.84mil; 41.06mil
+       5.29mil; 41.79mil
+       4.87mil; 42.61mil
+       4.56mil; 43.46mil
+       4.38mil; 44.41mil
+       4.32mil; 45.44mil
+       4.32mil; 50.37mil
+       4.38mil; 51.37mil
+       4.59mil; 52.31mil
+       4.93mil; 53.2mil
+       5.41mil; 54.02mil
+       6.02mil; 54.78mil
+       6.81mil; 55.51mil
+       7.51mil; 56.03mil
+       8.3mil; 56.42mil
+       9.22mil; 56.76mil
+       10.22mil; 56.97mil
+       11.31mil; 57.12mil
+       12.56mil; 57.15mil
+       18.31mil; 57.15mil
+       18.31mil; 56.85mil
+       18.31mil; 55.93mil
+       18.31mil; 54.35mil
+       18.31mil; 52.19mil
+       18.31mil; 49.36mil
+       18.31mil; 45.81mil
+       0.52mil; 41.49mil
+       1.22mil; 40.0mil
+       2.16mil; 38.6mil
+       3.38mil; 37.29mil
+       4.96mil; 35.98mil
+       5.84mil; 35.4mil
+       6.84mil; 34.95mil
+       7.91mil; 34.55mil
+       9.06mil; 34.31mil
+       10.31mil; 34.12mil
+       11.68mil; 34.06mil
+       13.08mil; 34.19mil
+       14.45mil; 34.46mil
+       15.79mil; 34.95mil
+       17.09mil; 35.62mil
+       18.34mil; 36.47mil
+       19.59mil; 37.53mil
+       20.56mil; 38.63mil
+       21.35mil; 39.81mil
+       21.99mil; 41.09mil
+       22.42mil; 42.46mil
+       22.69mil; 43.92mil
+       22.81mil; 45.53mil
+       22.81mil; 45.93mil
+       22.81mil; 47.08mil
+       22.81mil; 49.0mil
+       22.81mil; 51.71mil
+       22.81mil; 55.14mil
+       22.81mil; 59.52mil
+       22.75mil; 61.01mil
+       22.63mil; 62.41mil
+       22.42mil; 63.78mil
+       22.11mil; 65.06mil
+       21.72mil; 66.31mil
+       21.23mil; 67.52mil
+       20.35mil; 69.32mil
+       19.41mil; 70.96mil
+       18.43mil; 72.42mil
+       17.43mil; 73.73mil
+       16.36mil; 74.85mil
+       15.24mil; 75.83mil
+       13.47mil; 77.11mil
+       11.86mil; 78.14mil
+       10.4mil; 78.96mil
+       9.03mil; 79.54mil
+       7.85mil; 79.87mil
+       6.75mil; 80.0mil
+       6.08mil; 79.93mil
+       5.54mil; 79.75mil
+       5.11mil; 79.45mil
+       4.81mil; 79.02mil
+       4.62mil; 78.47mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:\: {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 71.63mil
+       0.03mil; 70.63mil
+       0.21mil; 69.81mil
+       0.51mil; 69.14mil
+       0.91mil; 68.68mil
+       1.46mil; 68.41mil
+       2.13mil; 68.28mil
+       2.86mil; 68.41mil
+       3.5mil; 68.68mil
+       3.98mil; 69.14mil
+       4.32mil; 69.81mil
+       4.53mil; 70.63mil
+       4.62mil; 71.69mil
+       4.53mil; 72.69mil
+       4.35mil; 73.49mil
+       4.01mil; 74.12mil
+       3.56mil; 74.55mil
+       2.98mil; 74.82mil
+       2.25mil; 74.92mil
+       1.55mil; 74.85mil
+       1.0mil; 74.58mil
+       0.55mil; 74.12mil
+       0.24mil; 73.49mil
+       0.06mil; 72.66mil
+     }
+     li:simplepoly.1 {
+       0.0mil; 53.26mil
+       0.06mil; 52.25mil
+       0.24mil; 51.43mil
+       0.55mil; 50.76mil
+       0.97mil; 50.31mil
+       1.52mil; 50.03mil
+       2.22mil; 49.91mil
+       2.95mil; 50.03mil
+       3.59mil; 50.31mil
+       4.07mil; 50.76mil
+       4.41mil; 51.43mil
+       4.62mil; 52.25mil
+       4.71mil; 53.32mil
+       4.62mil; 54.29mil
+       4.44mil; 55.11mil
+       4.1mil; 55.72mil
+       3.65mil; 56.18mil
+       3.07mil; 56.42mil
+       2.34mil; 56.51mil
+       1.61mil; 56.45mil
+       1.03mil; 56.18mil
+       0.58mil; 55.72mil
+       0.24mil; 55.08mil
+       0.06mil; 54.29mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:; {
+    width=6mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.19mil; 72.0mil
+       2.37mil; 71.39mil
+       2.64mil; 70.87mil
+       2.95mil; 70.47mil
+       3.34mil; 70.2mil
+       3.77mil; 70.02mil
+       4.32mil; 69.96mil
+       4.99mil; 70.02mil
+       5.56mil; 70.2mil
+       6.02mil; 70.47mil
+       6.32mil; 70.84mil
+       6.51mil; 71.33mil
+       6.6mil; 71.93mil
+       6.57mil; 72.18mil
+       6.57mil; 72.42mil
+       6.54mil; 72.66mil
+       6.51mil; 72.91mil
+       6.45mil; 73.15mil
+       6.42mil; 73.39mil
+       4.44mil; 81.39mil
+       4.2mil; 82.03mil
+       3.92mil; 82.55mil
+       3.59mil; 82.98mil
+       3.19mil; 83.28mil
+       2.74mil; 83.43mil
+       2.19mil; 83.52mil
+       1.52mil; 83.46mil
+       0.97mil; 83.28mil
+       0.55mil; 83.01mil
+       0.24mil; 82.61mil
+       0.06mil; 82.09mil
+       0.0mil; 81.46mil
+       0.0mil; 81.21mil
+       0.03mil; 80.94mil
+       0.06mil; 80.63mil
+       0.12mil; 80.3mil
+       0.18mil; 79.96mil
+       0.3mil; 79.54mil
+     }
+     li:simplepoly.1 {
+       2.1mil; 54.84mil
+       2.13mil; 53.84mil
+       2.31mil; 53.01mil
+       2.61mil; 52.35mil
+       3.04mil; 51.89mil
+       3.56mil; 51.62mil
+       4.26mil; 51.49mil
+       4.99mil; 51.62mil
+       5.62mil; 51.89mil
+       6.11mil; 52.35mil
+       6.45mil; 53.01mil
+       6.66mil; 53.84mil
+       6.75mil; 54.9mil
+       6.66mil; 55.9mil
+       6.48mil; 56.69mil
+       6.14mil; 57.33mil
+       5.69mil; 57.76mil
+       5.11mil; 58.03mil
+       4.38mil; 58.12mil
+       3.68mil; 58.06mil
+       3.1mil; 57.79mil
+       2.64mil; 57.33mil
+       2.34mil; 56.69mil
+       2.16mil; 55.87mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:< {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       21.05mil; 66.55mil
+       21.59mil; 66.82mil
+       22.05mil; 67.1mil
+       22.38mil; 67.43mil
+       22.66mil; 67.77mil
+       22.81mil; 68.16mil
+       22.87mil; 68.59mil
+       22.81mil; 69.32mil
+       22.63mil; 69.9mil
+       22.35mil; 70.35mil
+       21.99mil; 70.69mil
+       21.5mil; 70.87mil
+       20.89mil; 70.93mil
+       20.65mil; 70.93mil
+       20.41mil; 70.93mil
+       20.19mil; 70.9mil
+       19.98mil; 70.87mil
+       19.77mil; 70.81mil
+       19.59mil; 70.75mil
+       2.1mil; 64.15mil
+       1.46mil; 63.87mil
+       0.91mil; 63.57mil
+       0.51mil; 63.2mil
+       0.21mil; 62.78mil
+       0.06mil; 62.35mil
+       0.0mil; 61.84mil
+       0.06mil; 61.35mil
+       0.24mil; 60.86mil
+       0.57mil; 60.44mil
+       1.0mil; 60.04mil
+       1.58mil; 59.68mil
+       2.34mil; 59.34mil
+       19.37mil; 52.95mil
+       19.59mil; 52.89mil
+       19.83mil; 52.83mil
+       20.07mil; 52.77mil
+       20.32mil; 52.74mil
+       20.56mil; 52.71mil
+       20.8mil; 52.68mil
+       21.41mil; 52.77mil
+       21.9mil; 52.95mil
+       22.29mil; 53.29mil
+       22.57mil; 53.74mil
+       22.75mil; 54.35mil
+       22.81mil; 55.08mil
+       22.75mil; 55.54mil
+       22.57mil; 55.93mil
+       22.29mil; 56.3mil
+       21.9mil; 56.63mil
+       21.38mil; 56.94mil
+       20.74mil; 57.21mil
+       8.57mil; 61.87mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:\= {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       20.47mil; 66.55mil
+       21.14mil; 66.61mil
+       21.72mil; 66.79mil
+       22.17mil; 67.1mil
+       22.48mil; 67.52mil
+       22.66mil; 68.07mil
+       22.75mil; 68.74mil
+       22.69mil; 69.44mil
+       22.51mil; 69.99mil
+       22.2mil; 70.44mil
+       21.81mil; 70.75mil
+       21.26mil; 70.93mil
+       20.62mil; 70.99mil
+       20.1mil; 70.99mil
+       18.58mil; 70.99mil
+       16.03mil; 70.99mil
+       12.5mil; 70.99mil
+       7.94mil; 70.99mil
+       2.16mil; 70.99mil
+       1.49mil; 70.93mil
+       0.94mil; 70.75mil
+       0.51mil; 70.44mil
+       0.24mil; 70.02mil
+       0.06mil; 69.47mil
+       0.0mil; 68.77mil
+       0.03mil; 68.1mil
+       0.21mil; 67.55mil
+       0.51mil; 67.13mil
+       0.94mil; 66.82mil
+       1.49mil; 66.64mil
+       2.19mil; 66.55mil
+     }
+     li:simplepoly.1 {
+       20.53mil; 52.68mil
+       21.2mil; 52.77mil
+       21.78mil; 52.95mil
+       22.23mil; 53.26mil
+       22.54mil; 53.68mil
+       22.72mil; 54.23mil
+       22.81mil; 54.9mil
+       22.75mil; 55.6mil
+       22.57mil; 56.15mil
+       22.26mil; 56.6mil
+       21.87mil; 56.91mil
+       21.32mil; 57.09mil
+       20.68mil; 57.15mil
+       2.22mil; 57.15mil
+       1.55mil; 57.09mil
+       1.0mil; 56.91mil
+       0.57mil; 56.6mil
+       0.27mil; 56.18mil
+       0.09mil; 55.63mil
+       0.03mil; 54.93mil
+       0.09mil; 54.26mil
+       0.27mil; 53.71mil
+       0.57mil; 53.26mil
+       1.0mil; 52.95mil
+       1.55mil; 52.77mil
+       2.25mil; 52.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:> {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       1.82mil; 66.58mil
+       14.29mil; 61.9mil
+       2.13mil; 57.24mil
+       1.49mil; 57.0mil
+       0.97mil; 56.69mil
+       0.57mil; 56.36mil
+       0.27mil; 56.0mil
+       0.09mil; 55.57mil
+       0.06mil; 55.11mil
+       0.09mil; 54.38mil
+       0.27mil; 53.81mil
+       0.54mil; 53.32mil
+       0.94mil; 52.98mil
+       1.43mil; 52.8mil
+       2.07mil; 52.71mil
+       2.28mil; 52.74mil
+       2.52mil; 52.74mil
+       2.76mil; 52.8mil
+       2.98mil; 52.83mil
+       3.22mil; 52.92mil
+       3.49mil; 52.98mil
+       20.53mil; 59.37mil
+       21.23mil; 59.71mil
+       21.81mil; 60.04mil
+       22.26mil; 60.44mil
+       22.6mil; 60.89mil
+       22.78mil; 61.35mil
+       22.87mil; 61.87mil
+       22.81mil; 62.35mil
+       22.63mil; 62.81mil
+       22.32mil; 63.2mil
+       21.93mil; 63.57mil
+       21.41mil; 63.9mil
+       20.77mil; 64.18mil
+       3.28mil; 70.78mil
+       3.07mil; 70.84mil
+       2.86mil; 70.9mil
+       2.64mil; 70.93mil
+       2.43mil; 70.96mil
+       2.22mil; 70.96mil
+       1.97mil; 70.96mil
+       1.37mil; 70.9mil
+       0.88mil; 70.72mil
+       0.48mil; 70.38mil
+       0.21mil; 69.96mil
+       0.03mil; 69.38mil
+       0.0mil; 68.62mil
+       0.03mil; 68.19mil
+       0.18mil; 67.83mil
+       0.42mil; 67.46mil
+       0.79mil; 67.13mil
+       1.24mil; 66.85mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:? {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       1.09mil; 36.71mil
+       2.98mil; 35.92mil
+       4.95mil; 35.25mil
+       6.99mil; 34.73mil
+       9.12mil; 34.37mil
+       11.31mil; 34.16mil
+       13.68mil; 34.06mil
+       15.02mil; 34.16mil
+       16.3mil; 34.43mil
+       17.49mil; 34.85mil
+       18.58mil; 35.46mil
+       19.62mil; 36.25mil
+       20.59mil; 37.23mil
+       21.26mil; 38.14mil
+       21.81mil; 39.08mil
+       22.26mil; 40.06mil
+       22.57mil; 41.09mil
+       22.75mil; 42.16mil
+       22.84mil; 43.31mil
+       22.75mil; 44.53mil
+       22.54mil; 45.68mil
+       22.17mil; 46.75mil
+       21.68mil; 47.75mil
+       21.02mil; 48.7mil
+       20.22mil; 49.58mil
+       14.72mil; 54.87mil
+       14.32mil; 55.3mil
+       14.02mil; 55.72mil
+       13.81mil; 56.18mil
+       13.62mil; 56.69mil
+       13.53mil; 57.24mil
+       13.5mil; 57.82mil
+       13.5mil; 63.6mil
+       13.44mil; 64.39mil
+       13.26mil; 65.0mil
+       12.95mil; 65.52mil
+       12.53mil; 65.85mil
+       11.98mil; 66.06mil
+       11.31mil; 66.12mil
+       10.64mil; 66.06mil
+       10.1mil; 65.88mil
+       9.67mil; 65.55mil
+       9.37mil; 65.09mil
+       9.18mil; 64.51mil
+       9.12mil; 63.75mil
+       9.12mil; 57.55mil
+       9.15mil; 56.51mil
+       9.34mil; 55.51mil
+       9.64mil; 54.6mil
+       10.07mil; 53.74mil
+       10.58mil; 52.98mil
+       11.28mil; 52.22mil
+       17.33mil; 46.26mil
+       17.61mil; 45.93mil
+       17.85mil; 45.56mil
+       18.03mil; 45.14mil
+       18.19mil; 44.71mil
+       18.28mil; 44.22mil
+       18.31mil; 43.68mil
+       18.16mil; 42.12mil
+       17.7mil; 40.82mil
+       16.94mil; 39.81mil
+       15.87mil; 39.11mil
+       14.51mil; 38.66mil
+       12.77mil; 38.51mil
+       11.53mil; 38.57mil
+       10.19mil; 38.72mil
+       8.73mil; 38.99mil
+       7.21mil; 39.33mil
+       5.56mil; 39.78mil
+       3.77mil; 40.36mil
+       3.43mil; 40.48mil
+       3.1mil; 40.57mil
+       2.83mil; 40.63mil
+       2.58mil; 40.7mil
+       2.34mil; 40.73mil
+       2.13mil; 40.73mil
+       2.1mil; 40.73mil
+       2.1mil; 40.73mil
+       2.1mil; 40.73mil
+       2.1mil; 40.73mil
+       2.07mil; 40.73mil
+       2.07mil; 40.73mil
+       1.43mil; 40.66mil
+       0.91mil; 40.48mil
+       0.51mil; 40.18mil
+       0.21mil; 39.75mil
+       0.03mil; 39.2mil
+       0.0mil; 38.51mil
+       0.0mil; 38.11mil
+       0.09mil; 37.74mil
+       0.24mil; 37.44mil
+       0.45mil; 37.17mil
+       0.73mil; 36.92mil
+     }
+     li:simplepoly.1 {
+       9.12mil; 76.62mil
+       9.15mil; 75.61mil
+       9.34mil; 74.79mil
+       9.61mil; 74.12mil
+       10.0mil; 73.67mil
+       10.49mil; 73.39mil
+       11.13mil; 73.27mil
+       11.83mil; 73.39mil
+       12.41mil; 73.67mil
+       12.83mil; 74.12mil
+       13.17mil; 74.76mil
+       13.35mil; 75.61mil
+       13.44mil; 76.65mil
+       13.38mil; 77.68mil
+       13.2mil; 78.5mil
+       12.89mil; 79.17mil
+       12.5mil; 79.63mil
+       11.95mil; 79.9mil
+       11.31mil; 80.0mil
+       10.64mil; 79.9mil
+       10.1mil; 79.63mil
+       9.67mil; 79.17mil
+       9.37mil; 78.53mil
+       9.18mil; 77.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:@ {
+    width=41mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       17.28mil; 86.69mil
+       15.45mil; 86.57mil
+       13.62mil; 86.23mil
+       11.86mil; 85.65mil
+       10.1mil; 84.86mil
+       8.36mil; 83.86mil
+       6.63mil; 82.58mil
+       4.59mil; 80.66mil
+       2.95mil; 78.47mil
+       1.67mil; 75.98mil
+       0.73mil; 73.21mil
+       0.18mil; 70.11mil
+       0.0mil; 66.61mil
+       0.0mil; 66.12mil
+       0.0mil; 64.6mil
+       0.0mil; 62.08mil
+       0.0mil; 58.55mil
+       0.0mil; 54.02mil
+       0.0mil; 48.24mil
+       0.18mil; 44.86mil
+       0.82mil; 41.73mil
+       1.88mil; 38.84mil
+       3.34mil; 36.22mil
+       5.26mil; 33.82mil
+       7.66mil; 31.6mil
+       9.7mil; 30.14mil
+       11.83mil; 28.95mil
+       14.02mil; 28.01mil
+       16.3mil; 27.34mil
+       18.64mil; 26.95mil
+       21.17mil; 26.79mil
+       23.42mil; 26.95mil
+       25.61mil; 27.34mil
+       27.77mil; 28.04mil
+       29.87mil; 28.98mil
+       31.94mil; 30.2mil
+       34.0mil; 31.72mil
+       36.23mil; 33.88mil
+       38.05mil; 36.28mil
+       39.48mil; 38.9mil
+       40.51mil; 41.79mil
+       41.12mil; 44.92mil
+       41.37mil; 48.39mil
+       41.37mil; 48.82mil
+       41.37mil; 50.09mil
+       41.37mil; 52.16mil
+       41.37mil; 55.11mil
+       41.37mil; 58.89mil
+       41.37mil; 63.63mil
+       41.31mil; 65.03mil
+       41.18mil; 66.28mil
+       40.94mil; 67.4mil
+       40.64mil; 68.38mil
+       40.21mil; 69.2mil
+       39.72mil; 69.9mil
+       38.78mil; 70.84mil
+       37.84mil; 71.6mil
+       36.8mil; 72.18mil
+       35.74mil; 72.6mil
+       34.61mil; 72.88mil
+       33.43mil; 72.94mil
+       32.33mil; 72.88mil
+       31.3mil; 72.63mil
+       30.29mil; 72.24mil
+       29.32mil; 71.66mil
+       28.38mil; 70.96mil
+       27.43mil; 70.02mil
+       26.43mil; 70.93mil
+       25.4mil; 71.66mil
+       24.27mil; 72.21mil
+       23.12mil; 72.63mil
+       21.87mil; 72.88mil
+       20.56mil; 72.94mil
+       19.83mil; 72.91mil
+       19.1mil; 72.82mil
+       18.34mil; 72.63mil
+       17.61mil; 72.39mil
+       16.88mil; 72.09mil
+       16.12mil; 71.66mil
+       14.75mil; 70.75mil
+       13.62mil; 69.62mil
+       12.77mil; 68.34mil
+       12.13mil; 66.88mil
+       11.77mil; 65.24mil
+       11.65mil; 63.36mil
+       11.65mil; 50.34mil
+       11.71mil; 48.94mil
+       11.92mil; 47.63mil
+       12.29mil; 46.41mil
+       12.8mil; 45.29mil
+       13.47mil; 44.28mil
+       14.32mil; 43.31mil
+       15.27mil; 42.52mil
+       16.33mil; 41.88mil
+       17.52mil; 41.36mil
+       18.83mil; 41.0mil
+       20.26mil; 40.79mil
+       21.87mil; 40.7mil
+       25.4mil; 45.17mil
+       25.27mil; 45.17mil
+       24.94mil; 45.17mil
+       24.39mil; 45.17mil
+       23.6mil; 45.17mil
+       22.6mil; 45.17mil
+       21.35mil; 45.17mil
+       19.71mil; 45.35mil
+       18.37mil; 45.81mil
+       17.31mil; 46.63mil
+       16.58mil; 47.72mil
+       16.12mil; 49.18mil
+       15.97mil; 50.98mil
+       15.97mil; 51.31mil
+       15.97mil; 52.22mil
+       15.97mil; 53.74mil
+       15.97mil; 55.87mil
+       15.97mil; 58.64mil
+       15.97mil; 62.11mil
+       16.09mil; 64.06mil
+       16.48mil; 65.64mil
+       17.15mil; 66.85mil
+       18.1mil; 67.74mil
+       19.28mil; 68.25mil
+       20.83mil; 68.44mil
+       22.2mil; 68.28mil
+       23.33mil; 67.77mil
+       24.24mil; 66.95mil
+       24.85mil; 65.76mil
+       25.24mil; 64.24mil
+       25.4mil; 62.29mil
+       25.4mil; 61.84mil
+       25.4mil; 60.44mil
+       25.4mil; 58.06mil
+       25.4mil; 54.78mil
+       25.4mil; 50.55mil
+       25.4mil; 45.17mil
+       21.87mil; 40.7mil
+       27.01mil; 40.7mil
+       27.83mil; 40.79mil
+       28.5mil; 41.0mil
+       29.05mil; 41.36mil
+       29.41mil; 41.85mil
+       29.66mil; 42.52mil
+       29.75mil; 43.31mil
+       29.75mil; 62.69mil
+       29.84mil; 64.45mil
+       30.14mil; 65.88mil
+       30.63mil; 67.01mil
+       31.33mil; 67.8mil
+       32.21mil; 68.28mil
+       33.37mil; 68.44mil
+       34.43mil; 68.34mil
+       35.31mil; 67.98mil
+       35.98mil; 67.37mil
+       36.47mil; 66.55mil
+       36.77mil; 65.49mil
+       36.89mil; 64.12mil
+       36.89mil; 47.42mil
+       36.74mil; 45.14mil
+       36.29mil; 42.95mil
+       35.56mil; 40.91mil
+       34.55mil; 38.99mil
+       33.21mil; 37.2mil
+       31.57mil; 35.46mil
+       29.99mil; 34.22mil
+       28.35mil; 33.15mil
+       26.64mil; 32.33mil
+       24.88mil; 31.75mil
+       23.05mil; 31.42mil
+       21.11mil; 31.27mil
+       19.04mil; 31.39mil
+       17.09mil; 31.72mil
+       15.21mil; 32.3mil
+       13.41mil; 33.09mil
+       11.68mil; 34.12mil
+       9.97mil; 35.4mil
+       8.27mil; 37.04mil
+       6.9mil; 38.84mil
+       5.84mil; 40.82mil
+       5.08mil; 42.92mil
+       4.62mil; 45.2mil
+       4.47mil; 47.72mil
+       4.47mil; 67.04mil
+       4.59mil; 69.32mil
+       4.99mil; 71.48mil
+       5.62mil; 73.52mil
+       6.54mil; 75.43mil
+       7.72mil; 77.23mil
+       9.21mil; 78.93mil
+       10.34mil; 79.93mil
+       11.59mil; 80.73mil
+       12.99mil; 81.36mil
+       14.51mil; 81.82mil
+       16.15mil; 82.09mil
+       18.01mil; 82.22mil
+       18.8mil; 82.28mil
+       19.43mil; 82.46mil
+       19.95mil; 82.79mil
+       20.32mil; 83.25mil
+       20.53mil; 83.86mil
+       20.62mil; 84.62mil
+       20.5mil; 85.23mil
+       20.23mil; 85.74mil
+       19.77mil; 86.14mil
+       19.13mil; 86.44mil
+       18.31mil; 86.63mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:A {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       14.11mil; 35.74mil
+       14.29mil; 35.25mil
+       14.57mil; 34.82mil
+       14.9mil; 34.49mil
+       15.27mil; 34.28mil
+       15.72mil; 34.12mil
+       16.24mil; 34.06mil
+       16.7mil; 34.12mil
+       17.12mil; 34.28mil
+       17.49mil; 34.49mil
+       17.82mil; 34.82mil
+       18.07mil; 35.22mil
+       16.12mil; 43.31mil
+       9.12mil; 64.09mil
+       23.14mil; 64.09mil
+       16.12mil; 43.31mil
+       18.07mil; 35.22mil
+       18.31mil; 35.74mil
+       31.91mil; 76.62mil
+       31.97mil; 76.89mil
+       32.03mil; 77.14mil
+       32.09mil; 77.38mil
+       32.12mil; 77.59mil
+       32.15mil; 77.77mil
+       32.18mil; 77.96mil
+       32.12mil; 78.53mil
+       31.94mil; 78.99mil
+       31.63mil; 79.39mil
+       31.21mil; 79.66mil
+       30.66mil; 79.87mil
+       29.99mil; 80.0mil
+       29.47mil; 79.96mil
+       29.02mil; 79.78mil
+       28.59mil; 79.51mil
+       28.25mil; 79.11mil
+       27.95mil; 78.63mil
+       27.71mil; 77.99mil
+       27.62mil; 77.74mil
+       27.34mil; 76.95mil
+       26.92mil; 75.61mil
+       26.34mil; 73.79mil
+       25.55mil; 71.39mil
+       24.6mil; 68.38mil
+       7.75mil; 68.38mil
+       4.44mil; 78.23mil
+       4.19mil; 78.81mil
+       3.92mil; 79.26mil
+       3.59mil; 79.63mil
+       3.22mil; 79.9mil
+       2.83mil; 80.03mil
+       2.37mil; 80.09mil
+       1.64mil; 80.0mil
+       1.03mil; 79.84mil
+       0.57mil; 79.54mil
+       0.24mil; 79.11mil
+       0.06mil; 78.57mil
+       0.0mil; 77.87mil
+       0.0mil; 77.74mil
+       0.06mil; 77.5mil
+       0.15mil; 77.17mil
+       0.27mil; 76.74mil
+       0.45mil; 76.22mil
+       0.67mil; 75.58mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:B {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       27.74mil; 66.0mil
+       27.62mil; 68.16mil
+       27.25mil; 70.11mil
+       26.67mil; 71.93mil
+       25.85mil; 73.55mil
+       24.82mil; 75.01mil
+       23.51mil; 76.34mil
+       22.11mil; 77.47mil
+       20.74mil; 78.38mil
+       19.4mil; 79.08mil
+       18.07mil; 79.6mil
+       16.79mil; 79.9mil
+       15.48mil; 80.0mil
+       4.68mil; 57.24mil
+       4.68mil; 75.77mil
+       14.17mil; 75.77mil
+       15.48mil; 75.71mil
+       16.73mil; 75.46mil
+       17.85mil; 75.07mil
+       18.92mil; 74.52mil
+       19.89mil; 73.82mil
+       20.8mil; 72.91mil
+       21.53mil; 71.96mil
+       22.17mil; 70.96mil
+       22.66mil; 69.93mil
+       22.99mil; 68.86mil
+       23.21mil; 67.77mil
+       23.3mil; 66.58mil
+       23.21mil; 65.46mil
+       23.02mil; 64.36mil
+       22.69mil; 63.27mil
+       22.26mil; 62.23mil
+       21.69mil; 61.2mil
+       20.96mil; 60.16mil
+       20.1mil; 59.28mil
+       19.19mil; 58.55mil
+       18.13mil; 58.0mil
+       16.97mil; 57.58mil
+       15.69mil; 57.33mil
+       14.26mil; 57.24mil
+       4.68mil; 57.24mil
+       15.48mil; 80.0mil
+       2.13mil; 80.0mil
+       1.46mil; 79.93mil
+       0.94mil; 79.72mil
+       0.51mil; 79.33mil
+       0.21mil; 78.81mil
+       0.06mil; 78.11mil
+       0.0mil; 77.23mil
+       0.0mil; 36.92mil
+       0.06mil; 36.07mil
+       0.3mil; 35.37mil
+       0.67mil; 34.79mil
+       1.21mil; 34.4mil
+       1.91mil; 34.16mil
+       2.83mil; 34.06mil
+       4.68mil; 38.6mil
+       4.68mil; 52.5mil
+       13.96mil; 52.5mil
+       15.05mil; 52.47mil
+       16.06mil; 52.31mil
+       17.0mil; 52.04mil
+       17.79mil; 51.68mil
+       18.52mil; 51.22mil
+       19.19mil; 50.61mil
+       19.71mil; 49.97mil
+       20.13mil; 49.27mil
+       20.47mil; 48.51mil
+       20.71mil; 47.69mil
+       20.89mil; 46.84mil
+       20.96mil; 45.87mil
+       20.89mil; 44.95mil
+       20.74mil; 44.07mil
+       20.47mil; 43.19mil
+       20.13mil; 42.4mil
+       19.68mil; 41.61mil
+       19.1mil; 40.82mil
+       18.43mil; 40.18mil
+       17.67mil; 39.63mil
+       16.85mil; 39.17mil
+       15.94mil; 38.87mil
+       14.93mil; 38.69mil
+       13.84mil; 38.6mil
+       4.68mil; 38.6mil
+       2.83mil; 34.06mil
+       12.32mil; 34.06mil
+       14.14mil; 34.16mil
+       15.78mil; 34.34mil
+       17.28mil; 34.64mil
+       18.58mil; 35.1mil
+       19.74mil; 35.68mil
+       20.74mil; 36.38mil
+       22.14mil; 37.78mil
+       23.3mil; 39.2mil
+       24.18mil; 40.7mil
+       24.82mil; 42.25mil
+       25.21mil; 43.86mil
+       25.37mil; 45.56mil
+       25.24mil; 47.36mil
+       24.88mil; 49.03mil
+       24.3mil; 50.58mil
+       23.48mil; 52.01mil
+       22.42mil; 53.32mil
+       21.11mil; 54.5mil
+       21.99mil; 55.11mil
+       22.87mil; 55.75mil
+       23.66mil; 56.51mil
+       24.42mil; 57.33mil
+       25.12mil; 58.22mil
+       25.82mil; 59.22mil
+       26.37mil; 60.28mil
+       26.86mil; 61.35mil
+       27.22mil; 62.44mil
+       27.5mil; 63.6mil
+       27.65mil; 64.76mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:C {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       11.25mil; 33.91mil
+       11.5mil; 33.91mil
+       12.26mil; 33.91mil
+       13.53mil; 33.91mil
+       15.33mil; 33.91mil
+       17.64mil; 33.91mil
+       20.56mil; 33.91mil
+       21.23mil; 34.0mil
+       21.78mil; 34.19mil
+       22.23mil; 34.49mil
+       22.54mil; 34.92mil
+       22.72mil; 35.49mil
+       22.81mil; 36.19mil
+       22.72mil; 36.92mil
+       22.54mil; 37.5mil
+       22.2mil; 37.93mil
+       21.72mil; 38.26mil
+       21.14mil; 38.44mil
+       20.38mil; 38.51mil
+       11.22mil; 38.51mil
+       10.37mil; 38.6mil
+       9.52mil; 38.78mil
+       8.7mil; 39.08mil
+       7.88mil; 39.51mil
+       7.09mil; 40.06mil
+       6.26mil; 40.73mil
+       5.69mil; 41.33mil
+       5.23mil; 42.0mil
+       4.89mil; 42.73mil
+       4.62mil; 43.49mil
+       4.47mil; 44.35mil
+       4.44mil; 45.29mil
+       4.44mil; 68.53mil
+       4.47mil; 69.47mil
+       4.62mil; 70.35mil
+       4.89mil; 71.2mil
+       5.26mil; 72.0mil
+       5.75mil; 72.73mil
+       6.36mil; 73.46mil
+       7.02mil; 74.12mil
+       7.69mil; 74.64mil
+       8.36mil; 75.07mil
+       9.06mil; 75.37mil
+       9.76mil; 75.52mil
+       10.52mil; 75.58mil
+       20.74mil; 75.58mil
+       21.38mil; 75.68mil
+       21.93mil; 75.86mil
+       22.35mil; 76.16mil
+       22.66mil; 76.59mil
+       22.84mil; 77.14mil
+       22.93mil; 77.8mil
+       22.84mil; 78.44mil
+       22.66mil; 78.99mil
+       22.35mil; 79.39mil
+       21.93mil; 79.69mil
+       21.38mil; 79.84mil
+       20.71mil; 79.9mil
+       10.34mil; 79.9mil
+       8.94mil; 79.81mil
+       7.6mil; 79.48mil
+       6.29mil; 78.93mil
+       4.99mil; 78.14mil
+       3.74mil; 77.14mil
+       2.49mil; 75.86mil
+       1.73mil; 74.92mil
+       1.09mil; 73.88mil
+       0.61mil; 72.73mil
+       0.27mil; 71.51mil
+       0.06mil; 70.23mil
+       0.0mil; 68.77mil
+       0.0mil; 44.95mil
+       0.09mil; 43.49mil
+       0.36mil; 42.06mil
+       0.88mil; 40.73mil
+       1.55mil; 39.45mil
+       2.46mil; 38.23mil
+       3.59mil; 37.01mil
+       4.68mil; 36.07mil
+       5.87mil; 35.31mil
+       7.12mil; 34.7mil
+       8.42mil; 34.28mil
+       9.76mil; 34.0mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:D {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       0.0mil; 36.56mil
+       0.06mil; 35.83mil
+       0.27mil; 35.19mil
+       0.61mil; 34.7mil
+       1.09mil; 34.37mil
+       1.73mil; 34.16mil
+       2.52mil; 34.06mil
+       16.79mil; 34.06mil
+       18.13mil; 34.16mil
+       19.47mil; 34.43mil
+       20.71mil; 34.89mil
+       21.93mil; 35.52mil
+       23.08mil; 36.35mil
+       24.24mil; 37.35mil
+       25.21mil; 38.47mil
+       23.08mil; 44.59mil
+       22.9mil; 43.74mil
+       22.63mil; 42.92mil
+       22.26mil; 42.12mil
+       21.78mil; 41.36mil
+       21.17mil; 40.6mil
+       20.47mil; 39.97mil
+       19.71mil; 39.42mil
+       18.86mil; 38.99mil
+       17.97mil; 38.72mil
+       17.0mil; 38.54mil
+       15.94mil; 38.44mil
+       4.47mil; 38.44mil
+       4.47mil; 39.48mil
+       4.47mil; 42.55mil
+       4.47mil; 47.66mil
+       4.47mil; 54.81mil
+       4.47mil; 64.0mil
+       4.47mil; 75.61mil
+       4.74mil; 75.61mil
+       5.62mil; 75.61mil
+       7.05mil; 75.61mil
+       9.09mil; 75.61mil
+       11.71mil; 75.61mil
+       15.02mil; 75.61mil
+       16.3mil; 75.58mil
+       17.49mil; 75.4mil
+       18.55mil; 75.1mil
+       19.5mil; 74.7mil
+       20.35mil; 74.19mil
+       21.11mil; 73.52mil
+       21.72mil; 72.82mil
+       22.2mil; 72.03mil
+       22.6mil; 71.2mil
+       22.87mil; 70.32mil
+       23.05mil; 69.35mil
+       23.15mil; 68.31mil
+       23.15mil; 45.47mil
+       23.08mil; 44.59mil
+       25.21mil; 38.47mil
+       26.04mil; 39.63mil
+       26.67mil; 40.85mil
+       27.13mil; 42.09mil
+       27.4mil; 43.4mil
+       27.53mil; 44.8mil
+       27.53mil; 69.35mil
+       27.43mil; 70.72mil
+       27.16mil; 72.03mil
+       26.7mil; 73.27mil
+       26.07mil; 74.49mil
+       25.24mil; 75.61mil
+       24.24mil; 76.74mil
+       23.12mil; 77.74mil
+       21.99mil; 78.53mil
+       20.83mil; 79.17mil
+       19.68mil; 79.63mil
+       18.46mil; 79.9mil
+       17.21mil; 80.0mil
+       2.04mil; 80.0mil
+       1.4mil; 79.93mil
+       0.88mil; 79.72mil
+       0.48mil; 79.33mil
+       0.21mil; 78.81mil
+       0.03mil; 78.14mil
+       0.0mil; 77.29mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:E {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.38mil; 75.46mil
+       20.59mil; 75.46mil
+       21.26mil; 75.52mil
+       21.81mil; 75.71mil
+       22.26mil; 76.01mil
+       22.57mil; 76.44mil
+       22.75mil; 76.98mil
+       22.84mil; 77.65mil
+       22.78mil; 78.32mil
+       22.6mil; 78.87mil
+       22.29mil; 79.3mil
+       21.87mil; 79.6mil
+       21.35mil; 79.78mil
+       20.68mil; 79.84mil
+       2.01mil; 79.84mil
+       1.37mil; 79.78mil
+       0.88mil; 79.6mil
+       0.48mil; 79.3mil
+       0.21mil; 78.87mil
+       0.03mil; 78.29mil
+       0.0mil; 77.56mil
+       0.0mil; 36.28mil
+       0.06mil; 35.58mil
+       0.27mil; 34.98mil
+       0.67mil; 34.52mil
+       1.18mil; 34.19mil
+       1.85mil; 34.0mil
+       2.7mil; 33.91mil
+       20.44mil; 33.91mil
+       21.17mil; 34.0mil
+       21.78mil; 34.19mil
+       22.26mil; 34.49mil
+       22.6mil; 34.92mil
+       22.81mil; 35.46mil
+       22.9mil; 36.13mil
+       22.81mil; 36.8mil
+       22.63mil; 37.35mil
+       22.26mil; 37.78mil
+       21.81mil; 38.08mil
+       21.2mil; 38.26mil
+       20.44mil; 38.32mil
+       4.38mil; 38.32mil
+       4.38mil; 52.5mil
+       16.12mil; 52.5mil
+       16.79mil; 52.56mil
+       17.34mil; 52.74mil
+       17.76mil; 53.04mil
+       18.07mil; 53.47mil
+       18.25mil; 54.02mil
+       18.34mil; 54.69mil
+       18.28mil; 55.33mil
+       18.1mil; 55.84mil
+       17.79mil; 56.24mil
+       17.37mil; 56.54mil
+       16.85mil; 56.73mil
+       16.18mil; 56.76mil
+       4.38mil; 56.76mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:F {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.5mil; 56.79mil
+       4.5mil; 77.38mil
+       4.41mil; 78.14mil
+       4.23mil; 78.78mil
+       3.92mil; 79.26mil
+       3.5mil; 79.6mil
+       2.92mil; 79.81mil
+       2.22mil; 79.87mil
+       1.52mil; 79.81mil
+       0.97mil; 79.6mil
+       0.55mil; 79.26mil
+       0.24mil; 78.78mil
+       0.06mil; 78.14mil
+       0.0mil; 77.35mil
+       0.0mil; 76.22mil
+       0.0mil; 72.82mil
+       0.0mil; 67.16mil
+       0.0mil; 59.22mil
+       0.0mil; 49.0mil
+       0.0mil; 36.04mil
+       0.06mil; 35.4mil
+       0.24mil; 34.89mil
+       0.58mil; 34.46mil
+       1.03mil; 34.16mil
+       1.61mil; 34.0mil
+       2.37mil; 33.91mil
+       2.86mil; 33.91mil
+       4.35mil; 33.91mil
+       6.84mil; 33.91mil
+       10.31mil; 33.91mil
+       14.81mil; 33.91mil
+       20.5mil; 33.91mil
+       21.23mil; 33.97mil
+       21.81mil; 34.16mil
+       22.29mil; 34.46mil
+       22.63mil; 34.89mil
+       22.81mil; 35.43mil
+       22.9mil; 36.1mil
+       22.81mil; 36.77mil
+       22.63mil; 37.32mil
+       22.29mil; 37.74mil
+       21.84mil; 38.05mil
+       21.26mil; 38.23mil
+       20.53mil; 38.29mil
+       4.53mil; 38.29mil
+       4.53mil; 52.35mil
+       20.53mil; 52.35mil
+       21.23mil; 52.44mil
+       21.84mil; 52.62mil
+       22.29mil; 52.92mil
+       22.63mil; 53.35mil
+       22.81mil; 53.9mil
+       22.9mil; 54.57mil
+       22.81mil; 55.27mil
+       22.63mil; 55.81mil
+       22.29mil; 56.24mil
+       21.84mil; 56.54mil
+       21.23mil; 56.73mil
+       20.5mil; 56.79mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:G {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       23.15mil; 75.46mil
+       23.15mil; 56.79mil
+       18.37mil; 56.79mil
+       17.7mil; 56.76mil
+       17.15mil; 56.57mil
+       16.73mil; 56.27mil
+       16.45mil; 55.84mil
+       16.27mil; 55.33mil
+       16.21mil; 54.63mil
+       16.24mil; 53.99mil
+       16.42mil; 53.44mil
+       16.7mil; 53.01mil
+       17.09mil; 52.71mil
+       17.61mil; 52.53mil
+       18.28mil; 52.44mil
+       25.55mil; 52.44mil
+       26.13mil; 52.53mil
+       26.61mil; 52.77mil
+       26.98mil; 53.17mil
+       27.25mil; 53.71mil
+       27.43mil; 54.44mil
+       27.5mil; 55.33mil
+       27.5mil; 77.2mil
+       27.4mil; 78.02mil
+       27.19mil; 78.69mil
+       26.86mil; 79.2mil
+       26.37mil; 79.57mil
+       25.73mil; 79.78mil
+       24.97mil; 79.84mil
+       10.19mil; 79.84mil
+       9.06mil; 79.78mil
+       7.97mil; 79.54mil
+       6.84mil; 79.11mil
+       5.72mil; 78.53mil
+       4.59mil; 77.8mil
+       3.43mil; 76.86mil
+       2.37mil; 75.8mil
+       1.52mil; 74.52mil
+       0.85mil; 73.03mil
+       0.36mil; 71.36mil
+       0.09mil; 69.5mil
+       0.0mil; 67.34mil
+       0.0mil; 44.68mil
+       0.09mil; 43.31mil
+       0.36mil; 41.97mil
+       0.85mil; 40.7mil
+       1.52mil; 39.48mil
+       2.37mil; 38.32mil
+       3.47mil; 37.17mil
+       4.62mil; 36.19mil
+       5.87mil; 35.4mil
+       7.18mil; 34.76mil
+       8.51mil; 34.31mil
+       9.91mil; 34.03mil
+       11.47mil; 33.91mil
+       24.91mil; 33.91mil
+       25.7mil; 33.97mil
+       26.37mil; 34.16mil
+       26.89mil; 34.46mil
+       27.28mil; 34.89mil
+       27.5mil; 35.43mil
+       27.59mil; 36.1mil
+       27.5mil; 36.77mil
+       27.28mil; 37.32mil
+       26.92mil; 37.74mil
+       26.4mil; 38.05mil
+       25.76mil; 38.23mil
+       24.94mil; 38.29mil
+       11.95mil; 38.29mil
+       10.86mil; 38.35mil
+       9.85mil; 38.54mil
+       8.91mil; 38.84mil
+       8.03mil; 39.27mil
+       7.24mil; 39.81mil
+       6.48mil; 40.48mil
+       5.81mil; 41.24mil
+       5.29mil; 42.06mil
+       4.86mil; 42.92mil
+       4.56mil; 43.83mil
+       4.41mil; 44.77mil
+       4.35mil; 45.81mil
+       4.35mil; 67.83mil
+       4.38mil; 68.92mil
+       4.56mil; 69.96mil
+       4.83mil; 70.9mil
+       5.2mil; 71.78mil
+       5.69mil; 72.57mil
+       6.32mil; 73.33mil
+       6.96mil; 74.0mil
+       7.66mil; 74.52mil
+       8.39mil; 74.95mil
+       9.12mil; 75.25mil
+       9.91mil; 75.4mil
+       10.74mil; 75.46mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:H {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       23.36mil; 56.88mil
+       4.47mil; 56.88mil
+       4.47mil; 77.65mil
+       4.38mil; 78.38mil
+       4.2mil; 78.96mil
+       3.89mil; 79.42mil
+       3.47mil; 79.75mil
+       2.92mil; 79.93mil
+       2.25mil; 80.0mil
+       1.55mil; 79.93mil
+       1.0mil; 79.75mil
+       0.58mil; 79.45mil
+       0.24mil; 78.99mil
+       0.06mil; 78.41mil
+       0.0mil; 77.68mil
+       0.0mil; 36.65mil
+       0.06mil; 35.89mil
+       0.24mil; 35.22mil
+       0.55mil; 34.73mil
+       0.97mil; 34.37mil
+       1.52mil; 34.16mil
+       2.22mil; 34.06mil
+       2.89mil; 34.16mil
+       3.43mil; 34.37mil
+       3.86mil; 34.73mil
+       4.2mil; 35.22mil
+       4.38mil; 35.86mil
+       4.47mil; 36.65mil
+       4.47mil; 52.5mil
+       23.36mil; 52.5mil
+       23.36mil; 36.47mil
+       23.39mil; 35.8mil
+       23.57mil; 35.22mil
+       23.88mil; 34.76mil
+       24.3mil; 34.46mil
+       24.82mil; 34.28mil
+       25.52mil; 34.19mil
+       26.16mil; 34.28mil
+       26.7mil; 34.46mil
+       27.13mil; 34.76mil
+       27.4mil; 35.19mil
+       27.59mil; 35.74mil
+       27.68mil; 36.44mil
+       27.68mil; 77.56mil
+       27.62mil; 78.32mil
+       27.43mil; 78.93mil
+       27.13mil; 79.39mil
+       26.7mil; 79.72mil
+       26.19mil; 79.93mil
+       25.52mil; 80.0mil
+       24.85mil; 79.93mil
+       24.3mil; 79.75mil
+       23.88mil; 79.42mil
+       23.6mil; 78.96mil
+       23.42mil; 78.38mil
+       23.36mil; 77.62mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:I {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.62mil; 80.0mil
+       4.53mil; 80.0mil
+       4.35mil; 80.0mil
+       4.04mil; 80.0mil
+       3.59mil; 80.0mil
+       3.01mil; 80.0mil
+       2.31mil; 80.0mil
+       1.58mil; 79.93mil
+       1.0mil; 79.69mil
+       0.58mil; 79.3mil
+       0.24mil; 78.75mil
+       0.06mil; 78.05mil
+       0.0mil; 77.14mil
+       0.0mil; 36.8mil
+       0.06mil; 35.98mil
+       0.24mil; 35.31mil
+       0.55mil; 34.76mil
+       1.0mil; 34.4mil
+       1.58mil; 34.16mil
+       2.31mil; 34.06mil
+       3.01mil; 34.16mil
+       3.59mil; 34.4mil
+       4.01mil; 34.76mil
+       4.35mil; 35.31mil
+       4.53mil; 36.01mil
+       4.62mil; 36.89mil
+       4.62mil; 77.07mil
+       4.53mil; 77.99mil
+       4.35mil; 78.72mil
+       4.04mil; 79.26mil
+       3.59mil; 79.69mil
+       3.01mil; 79.93mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:J {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       13.81mil; 36.44mil
+       13.84mil; 35.74mil
+       14.02mil; 35.13mil
+       14.32mil; 34.67mil
+       14.75mil; 34.34mil
+       15.3mil; 34.16mil
+       16.0mil; 34.06mil
+       16.64mil; 34.16mil
+       17.18mil; 34.34mil
+       17.61mil; 34.67mil
+       17.88mil; 35.1mil
+       18.07mil; 35.68mil
+       18.16mil; 36.41mil
+       18.16mil; 68.86mil
+       18.07mil; 70.35mil
+       17.79mil; 71.75mil
+       17.33mil; 73.09mil
+       16.7mil; 74.34mil
+       15.91mil; 75.52mil
+       14.9mil; 76.68mil
+       13.78mil; 77.68mil
+       12.56mil; 78.5mil
+       11.28mil; 79.14mil
+       9.94mil; 79.63mil
+       8.48mil; 79.9mil
+       6.93mil; 80.0mil
+       2.25mil; 80.0mil
+       1.55mil; 79.93mil
+       1.0mil; 79.75mil
+       0.54mil; 79.45mil
+       0.24mil; 79.02mil
+       0.06mil; 78.47mil
+       0.0mil; 77.74mil
+       0.06mil; 77.07mil
+       0.27mil; 76.53mil
+       0.64mil; 76.07mil
+       1.15mil; 75.77mil
+       1.79mil; 75.58mil
+       2.64mil; 75.49mil
+       7.14mil; 75.49mil
+       8.06mil; 75.46mil
+       8.91mil; 75.28mil
+       9.73mil; 75.01mil
+       10.49mil; 74.61mil
+       11.19mil; 74.09mil
+       11.89mil; 73.42mil
+       12.44mil; 72.73mil
+       12.92mil; 72.0mil
+       13.29mil; 71.23mil
+       13.56mil; 70.44mil
+       13.72mil; 69.62mil
+       13.81mil; 68.74mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:K {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.1mil; 79.9mil
+       1.46mil; 79.84mil
+       0.91mil; 79.6mil
+       0.51mil; 79.23mil
+       0.21mil; 78.69mil
+       0.06mil; 77.99mil
+       0.0mil; 77.07mil
+       0.0mil; 36.07mil
+       0.03mil; 35.46mil
+       0.21mil; 34.98mil
+       0.51mil; 34.58mil
+       0.91mil; 34.31mil
+       1.43mil; 34.12mil
+       2.1mil; 34.06mil
+       2.77mil; 34.16mil
+       3.34mil; 34.34mil
+       3.8mil; 34.64mil
+       4.1mil; 35.07mil
+       4.29mil; 35.65mil
+       4.38mil; 36.35mil
+       4.38mil; 55.75mil
+       23.24mil; 35.07mil
+       23.57mil; 34.73mil
+       23.91mil; 34.43mil
+       24.24mil; 34.22mil
+       24.58mil; 34.06mil
+       24.88mil; 33.97mil
+       25.21mil; 33.91mil
+       25.49mil; 33.94mil
+       25.79mil; 34.0mil
+       26.04mil; 34.12mil
+       26.31mil; 34.25mil
+       26.55mil; 34.46mil
+       26.8mil; 34.67mil
+       26.98mil; 34.95mil
+       27.13mil; 35.19mil
+       27.25mil; 35.43mil
+       27.34mil; 35.71mil
+       27.4mil; 35.98mil
+       27.43mil; 36.25mil
+       27.4mil; 36.56mil
+       27.31mil; 36.83mil
+       27.16mil; 37.17mil
+       26.95mil; 37.5mil
+       26.67mil; 37.87mil
+       26.34mil; 38.26mil
+       13.69mil; 52.28mil
+       26.95mil; 76.22mil
+       27.1mil; 76.56mil
+       27.25mil; 76.86mil
+       27.37mil; 77.14mil
+       27.43mil; 77.38mil
+       27.5mil; 77.56mil
+       27.53mil; 77.74mil
+       27.5mil; 78.08mil
+       27.43mil; 78.35mil
+       27.31mil; 78.63mil
+       27.16mil; 78.9mil
+       26.95mil; 79.14mil
+       26.7mil; 79.39mil
+       26.46mil; 79.6mil
+       26.22mil; 79.75mil
+       25.94mil; 79.84mil
+       25.67mil; 79.93mil
+       25.4mil; 80.0mil
+       25.12mil; 80.0mil
+       24.76mil; 79.96mil
+       24.39mil; 79.87mil
+       24.09mil; 79.66mil
+       23.78mil; 79.42mil
+       23.48mil; 79.08mil
+       23.24mil; 78.63mil
+       10.55mil; 55.72mil
+       4.44mil; 62.41mil
+       4.44mil; 76.98mil
+       4.35mil; 77.9mil
+       4.16mil; 78.63mil
+       3.83mil; 79.17mil
+       3.4mil; 79.6mil
+       2.83mil; 79.84mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:L {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.41mil; 36.41mil
+       4.41mil; 75.58mil
+       20.26mil; 75.58mil
+       21.08mil; 75.65mil
+       21.78mil; 75.83mil
+       22.29mil; 76.13mil
+       22.69mil; 76.56mil
+       22.93mil; 77.11mil
+       23.02mil; 77.77mil
+       22.93mil; 78.44mil
+       22.69mil; 78.99mil
+       22.29mil; 79.45mil
+       21.75mil; 79.75mil
+       21.05mil; 79.93mil
+       20.16mil; 80.0mil
+       2.16mil; 80.0mil
+       1.49mil; 79.93mil
+       0.94mil; 79.72mil
+       0.51mil; 79.33mil
+       0.24mil; 78.81mil
+       0.06mil; 78.14mil
+       0.0mil; 77.29mil
+       0.0mil; 36.41mil
+       0.03mil; 35.71mil
+       0.21mil; 35.13mil
+       0.51mil; 34.67mil
+       0.94mil; 34.34mil
+       1.49mil; 34.16mil
+       2.19mil; 34.06mil
+       2.83mil; 34.16mil
+       3.37mil; 34.34mil
+       3.83mil; 34.67mil
+       4.13mil; 35.1mil
+       4.32mil; 35.68mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:M {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       28.1mil; 35.22mil
+       28.35mil; 34.89mil
+       28.62mil; 34.58mil
+       28.93mil; 34.37mil
+       29.26mil; 34.22mil
+       29.62mil; 34.12mil
+       30.05mil; 34.06mil
+       30.75mil; 34.16mil
+       31.33mil; 34.34mil
+       31.75mil; 34.67mil
+       32.09mil; 35.16mil
+       32.27mil; 35.74mil
+       32.36mil; 36.5mil
+       32.36mil; 76.98mil
+       32.27mil; 77.93mil
+       32.09mil; 78.66mil
+       31.78mil; 79.23mil
+       31.36mil; 79.66mil
+       30.81mil; 79.93mil
+       30.11mil; 80.0mil
+       29.41mil; 79.93mil
+       28.86mil; 79.69mil
+       28.41mil; 79.26mil
+       28.1mil; 78.69mil
+       27.92mil; 77.96mil
+       27.86mil; 76.98mil
+       27.86mil; 44.35mil
+       18.37mil; 59.8mil
+       17.97mil; 60.41mil
+       17.58mil; 60.86mil
+       17.21mil; 61.26mil
+       16.82mil; 61.5mil
+       16.45mil; 61.68mil
+       16.06mil; 61.71mil
+       15.66mil; 61.68mil
+       15.3mil; 61.53mil
+       14.9mil; 61.26mil
+       14.54mil; 60.92mil
+       14.17mil; 60.47mil
+       13.81mil; 59.86mil
+       4.5mil; 44.41mil
+       4.5mil; 77.14mil
+       4.41mil; 78.02mil
+       4.23mil; 78.72mil
+       3.89mil; 79.3mil
+       3.47mil; 79.69mil
+       2.89mil; 79.93mil
+       2.16mil; 80.0mil
+       1.49mil; 79.93mil
+       0.94mil; 79.69mil
+       0.51mil; 79.33mil
+       0.24mil; 78.78mil
+       0.06mil; 78.08mil
+       0.0mil; 77.2mil
+       0.0mil; 36.47mil
+       0.06mil; 35.74mil
+       0.24mil; 35.16mil
+       0.55mil; 34.67mil
+       1.0mil; 34.34mil
+       1.58mil; 34.16mil
+       2.31mil; 34.06mil
+       2.67mil; 34.09mil
+       3.04mil; 34.19mil
+       3.34mil; 34.34mil
+       3.65mil; 34.55mil
+       3.92mil; 34.82mil
+       4.2mil; 35.13mil
+       15.94mil; 54.93mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:N {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       23.24mil; 69.14mil
+       23.24mil; 36.22mil
+       23.27mil; 35.52mil
+       23.45mil; 34.95mil
+       23.75mil; 34.52mil
+       24.15mil; 34.19mil
+       24.67mil; 34.0mil
+       25.34mil; 33.91mil
+       25.94mil; 34.0mil
+       26.49mil; 34.19mil
+       26.89mil; 34.49mil
+       27.19mil; 34.92mil
+       27.34mil; 35.46mil
+       27.43mil; 36.13mil
+       27.43mil; 77.29mil
+       27.37mil; 78.08mil
+       27.19mil; 78.69mil
+       26.92mil; 79.2mil
+       26.52mil; 79.54mil
+       26.04mil; 79.75mil
+       25.43mil; 79.81mil
+       24.97mil; 79.78mil
+       24.54mil; 79.66mil
+       24.15mil; 79.42mil
+       23.78mil; 79.11mil
+       23.42mil; 78.69mil
+       23.12mil; 78.17mil
+       4.38mil; 44.74mil
+       4.38mil; 77.29mil
+       4.29mil; 78.05mil
+       4.1mil; 78.66mil
+       3.8mil; 79.11mil
+       3.34mil; 79.45mil
+       2.77mil; 79.66mil
+       2.07mil; 79.72mil
+       1.43mil; 79.66mil
+       0.91mil; 79.45mil
+       0.51mil; 79.11mil
+       0.21mil; 78.63mil
+       0.03mil; 78.02mil
+       0.0mil; 77.23mil
+       0.0mil; 36.62mil
+       0.03mil; 35.8mil
+       0.21mil; 35.13mil
+       0.51mil; 34.61mil
+       0.94mil; 34.25mil
+       1.49mil; 34.0mil
+       2.19mil; 33.91mil
+       2.64mil; 33.97mil
+       3.04mil; 34.09mil
+       3.43mil; 34.28mil
+       3.8mil; 34.55mil
+       4.1mil; 34.89mil
+       4.41mil; 35.31mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:O {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       0.0mil; 46.9mil
+       0.09mil; 45.26mil
+       0.42mil; 43.68mil
+       0.97mil; 42.16mil
+       1.73mil; 40.7mil
+       2.7mil; 39.3mil
+       3.98mil; 37.9mil
+       5.35mil; 36.71mil
+       6.81mil; 35.71mil
+       8.39mil; 34.95mil
+       10.07mil; 34.37mil
+       11.83mil; 34.03mil
+       13.78mil; 33.91mil
+       15.54mil; 34.03mil
+       17.24mil; 34.37mil
+       18.86mil; 34.92mil
+       20.41mil; 35.68mil
+       21.84mil; 36.65mil
+       23.27mil; 37.87mil
+       24.51mil; 39.3mil
+       25.58mil; 40.79mil
+       26.4mil; 42.37mil
+       26.98mil; 43.98mil
+       27.31mil; 45.71mil
+       27.47mil; 47.54mil
+       27.47mil; 66.12mil
+       27.34mil; 68.07mil
+       26.98mil; 69.9mil
+       26.43mil; 71.6mil
+       25.61mil; 73.21mil
+       24.58mil; 74.7mil
+       23.3mil; 76.13mil
+       21.9mil; 77.32mil
+       20.44mil; 78.29mil
+       18.89mil; 79.02mil
+       17.21mil; 79.57mil
+       15.48mil; 79.9mil
+       13.56mil; 80.0mil
+       11.8mil; 79.9mil
+       10.1mil; 79.6mil
+       8.51mil; 79.05mil
+       6.96mil; 78.32mil
+       5.5mil; 77.35mil
+       4.1mil; 76.13mil
+       4.47mil; 67.13mil
+       4.53mil; 68.22mil
+       4.77mil; 69.26mil
+       5.2mil; 70.26mil
+       5.78mil; 71.27mil
+       6.54mil; 72.21mil
+       7.51mil; 73.15mil
+       8.39mil; 73.88mil
+       9.31mil; 74.46mil
+       10.28mil; 74.92mil
+       11.28mil; 75.25mil
+       12.32mil; 75.43mil
+       13.44mil; 75.49mil
+       14.66mil; 75.46mil
+       15.81mil; 75.28mil
+       16.88mil; 74.98mil
+       17.88mil; 74.55mil
+       18.8mil; 74.03mil
+       19.68mil; 73.33mil
+       20.68mil; 72.3mil
+       21.53mil; 71.23mil
+       22.17mil; 70.08mil
+       22.66mil; 68.86mil
+       22.93mil; 67.61mil
+       23.05mil; 66.25mil
+       23.05mil; 47.75mil
+       22.96mil; 46.35mil
+       22.69mil; 45.01mil
+       22.26mil; 43.8mil
+       21.62mil; 42.7mil
+       20.83mil; 41.67mil
+       19.86mil; 40.73mil
+       18.89mil; 40.03mil
+       17.88mil; 39.45mil
+       16.82mil; 39.02mil
+       15.72mil; 38.69mil
+       14.6mil; 38.51mil
+       13.41mil; 38.41mil
+       12.41mil; 38.51mil
+       11.4mil; 38.69mil
+       10.43mil; 39.02mil
+       9.46mil; 39.45mil
+       8.48mil; 40.03mil
+       7.51mil; 40.76mil
+       6.57mil; 41.64mil
+       5.81mil; 42.61mil
+       5.23mil; 43.71mil
+       4.8mil; 44.89mil
+       4.53mil; 46.2mil
+       4.47mil; 47.63mil
+       4.47mil; 67.13mil
+       4.1mil; 76.13mil
+       2.83mil; 74.79mil
+       1.82mil; 73.39mil
+       1.03mil; 71.9mil
+       0.45mil; 70.35mil
+       0.09mil; 68.74mil
+       0.0mil; 66.98mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:P {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       4.5mil; 77.32mil
+       4.41mil; 78.11mil
+       4.23mil; 78.72mil
+       3.92mil; 79.23mil
+       3.5mil; 79.57mil
+       2.95mil; 79.78mil
+       2.25mil; 79.84mil
+       1.55mil; 79.78mil
+       1.0mil; 79.57mil
+       0.55mil; 79.2mil
+       0.24mil; 78.72mil
+       0.06mil; 78.08mil
+       0.0mil; 77.26mil
+       0.0mil; 36.47mil
+       0.06mil; 35.74mil
+       0.27mil; 35.16mil
+       0.61mil; 34.67mil
+       1.09mil; 34.34mil
+       1.7mil; 34.16mil
+       2.49mil; 34.06mil
+       4.5mil; 38.44mil
+       4.5mil; 38.96mil
+       4.5mil; 40.51mil
+       4.5mil; 43.07mil
+       4.5mil; 46.63mil
+       4.5mil; 51.22mil
+       4.5mil; 57.03mil
+       14.6mil; 57.03mil
+       15.6mil; 56.97mil
+       16.58mil; 56.76mil
+       17.55mil; 56.36mil
+       18.49mil; 55.84mil
+       19.43mil; 55.17mil
+       20.38mil; 54.32mil
+       21.17mil; 53.41mil
+       21.84mil; 52.44mil
+       22.35mil; 51.37mil
+       22.75mil; 50.22mil
+       22.96mil; 49.03mil
+       23.05mil; 47.69mil
+       22.96mil; 46.44mil
+       22.75mil; 45.23mil
+       22.39mil; 44.1mil
+       21.87mil; 43.04mil
+       21.2mil; 42.06mil
+       20.38mil; 41.09mil
+       19.43mil; 40.3mil
+       18.4mil; 39.63mil
+       17.28mil; 39.11mil
+       16.06mil; 38.75mil
+       14.75mil; 38.54mil
+       13.32mil; 38.44mil
+       4.5mil; 38.44mil
+       2.49mil; 34.06mil
+       14.26mil; 34.06mil
+       16.09mil; 34.22mil
+       17.85mil; 34.58mil
+       19.5mil; 35.22mil
+       21.08mil; 36.07mil
+       22.57mil; 37.23mil
+       24.03mil; 38.63mil
+       25.06mil; 39.93mil
+       25.88mil; 41.24mil
+       26.55mil; 42.61mil
+       27.04mil; 44.01mil
+       27.31mil; 45.44mil
+       27.43mil; 46.96mil
+       27.34mil; 48.76mil
+       27.16mil; 50.4mil
+       26.83mil; 51.89mil
+       26.37mil; 53.29mil
+       25.79mil; 54.54mil
+       25.06mil; 55.66mil
+       23.54mil; 57.46mil
+       21.93mil; 58.92mil
+       20.26mil; 60.07mil
+       18.46mil; 60.89mil
+       16.61mil; 61.38mil
+       14.6mil; 61.53mil
+       4.5mil; 61.53mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:Q {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       26.7mil; 71.11mil
+       31.12mil; 75.61mil
+       31.45mil; 76.01mil
+       31.75mil; 76.41mil
+       32.0mil; 76.77mil
+       32.15mil; 77.11mil
+       32.24mil; 77.44mil
+       32.3mil; 77.74mil
+       32.21mil; 78.44mil
+       32.03mil; 78.99mil
+       31.72mil; 79.45mil
+       31.27mil; 79.75mil
+       30.69mil; 79.93mil
+       29.99mil; 80.0mil
+       29.66mil; 79.96mil
+       29.32mil; 79.87mil
+       28.99mil; 79.72mil
+       28.62mil; 79.48mil
+       28.26mil; 79.17mil
+       27.86mil; 78.78mil
+       24.33mil; 75.16mil
+       24.0mil; 75.61mil
+       23.57mil; 76.1mil
+       23.08mil; 76.56mil
+       22.51mil; 77.01mil
+       21.87mil; 77.5mil
+       21.14mil; 77.99mil
+       20.04mil; 78.63mil
+       18.95mil; 79.11mil
+       17.82mil; 79.51mil
+       16.64mil; 79.78mil
+       15.45mil; 79.96mil
+       14.17mil; 80.0mil
+       12.16mil; 79.9mil
+       10.28mil; 79.54mil
+       8.51mil; 78.96mil
+       6.9mil; 78.14mil
+       5.38mil; 77.07mil
+       3.98mil; 75.71mil
+       2.77mil; 74.25mil
+       1.76mil; 72.73mil
+       1.0mil; 71.14mil
+       0.42mil; 69.5mil
+       0.09mil; 67.8mil
+       0.0mil; 65.97mil
+       0.0mil; 47.69mil
+       0.06mil; 46.26mil
+       0.3mil; 44.86mil
+       0.67mil; 43.49mil
+       1.21mil; 42.12mil
+       1.91mil; 40.82mil
+       2.8mil; 39.48mil
+       4.2mil; 37.84mil
+       5.78mil; 36.5mil
+       7.51mil; 35.43mil
+       9.46mil; 34.7mil
+       11.59mil; 34.25mil
+       11.71mil; 38.69mil
+       10.77mil; 38.96mil
+       9.82mil; 39.36mil
+       8.94mil; 39.84mil
+       8.09mil; 40.45mil
+       6.99mil; 41.46mil
+       6.11mil; 42.58mil
+       5.41mil; 43.8mil
+       4.93mil; 45.14mil
+       4.62mil; 46.6mil
+       4.53mil; 48.18mil
+       4.53mil; 66.37mil
+       4.59mil; 67.55mil
+       4.83mil; 68.68mil
+       5.26mil; 69.77mil
+       5.84mil; 70.84mil
+       6.57mil; 71.87mil
+       7.51mil; 72.88mil
+       8.39mil; 73.67mil
+       9.37mil; 74.34mil
+       10.43mil; 74.82mil
+       11.56mil; 75.19mil
+       12.77mil; 75.4mil
+       14.11mil; 75.46mil
+       15.42mil; 75.37mil
+       16.7mil; 75.1mil
+       17.88mil; 74.61mil
+       19.04mil; 73.94mil
+       20.1mil; 73.09mil
+       21.17mil; 71.96mil
+       20.41mil; 71.33mil
+       19.8mil; 70.75mil
+       19.31mil; 70.17mil
+       18.98mil; 69.65mil
+       18.77mil; 69.2mil
+       18.7mil; 68.74mil
+       18.74mil; 68.01mil
+       18.92mil; 67.4mil
+       19.22mil; 66.95mil
+       19.65mil; 66.61mil
+       20.2mil; 66.4mil
+       20.89mil; 66.31mil
+       21.29mil; 66.37mil
+       21.69mil; 66.49mil
+       22.05mil; 66.7mil
+       22.42mil; 66.98mil
+       22.75mil; 67.34mil
+       23.12mil; 67.8mil
+       23.12mil; 67.25mil
+       23.12mil; 65.58mil
+       23.12mil; 62.78mil
+       23.12mil; 58.85mil
+       23.12mil; 53.81mil
+       23.12mil; 47.42mil
+       23.02mil; 46.2mil
+       22.78mil; 45.04mil
+       22.39mil; 43.95mil
+       21.84mil; 42.89mil
+       21.11mil; 41.91mil
+       20.23mil; 40.94mil
+       19.28mil; 40.21mil
+       18.31mil; 39.57mil
+       17.28mil; 39.08mil
+       16.18mil; 38.75mil
+       15.02mil; 38.54mil
+       13.78mil; 38.44mil
+       12.71mil; 38.51mil
+       11.71mil; 38.69mil
+       11.59mil; 34.25mil
+       13.99mil; 34.06mil
+       15.94mil; 34.19mil
+       17.79mil; 34.55mil
+       19.5mil; 35.13mil
+       21.08mil; 35.92mil
+       22.51mil; 36.95mil
+       23.88mil; 38.26mil
+       25.0mil; 39.69mil
+       25.94mil; 41.09mil
+       26.67mil; 42.49mil
+       27.19mil; 43.89mil
+       27.53mil; 45.26mil
+       27.65mil; 46.69mil
+       27.65mil; 65.79mil
+       27.62mil; 66.88mil
+       27.53mil; 67.89mil
+       27.4mil; 68.83mil
+       27.22mil; 69.65mil
+       26.98mil; 70.41mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:R {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       2.37mil; 34.25mil
+       14.39mil; 34.25mil
+       16.18mil; 34.4mil
+       17.94mil; 34.82mil
+       19.65mil; 35.49mil
+       21.32mil; 36.47mil
+       22.9mil; 37.68mil
+       24.51mil; 39.24mil
+       25.43mil; 40.36mil
+       26.16mil; 41.55mil
+       26.73mil; 42.76mil
+       27.16mil; 44.01mil
+       27.43mil; 45.35mil
+       27.53mil; 46.75mil
+       27.47mil; 48.09mil
+       27.34mil; 49.43mil
+       27.13mil; 50.7mil
+       26.86mil; 51.95mil
+       26.46mil; 53.2mil
+       26.0mil; 54.41mil
+       25.34mil; 55.69mil
+       24.48mil; 56.85mil
+       23.45mil; 57.91mil
+       22.2mil; 58.85mil
+       20.77mil; 59.74mil
+       19.1mil; 60.53mil
+       27.04mil; 76.13mil
+       27.16mil; 76.44mil
+       27.28mil; 76.74mil
+       27.37mil; 77.01mil
+       27.43mil; 77.26mil
+       22.57mil; 51.34mil
+       22.9mil; 50.22mil
+       23.12mil; 48.97mil
+       23.21mil; 47.54mil
+       23.12mil; 46.5mil
+       22.9mil; 45.47mil
+       22.54mil; 44.47mil
+       22.02mil; 43.49mil
+       21.35mil; 42.52mil
+       20.53mil; 41.55mil
+       19.56mil; 40.66mil
+       18.58mil; 39.93mil
+       17.58mil; 39.36mil
+       16.55mil; 38.96mil
+       15.48mil; 38.69mil
+       14.39mil; 38.6mil
+       4.47mil; 38.6mil
+       4.47mil; 57.15mil
+       4.71mil; 57.15mil
+       5.53mil; 57.15mil
+       6.9mil; 57.15mil
+       8.82mil; 57.15mil
+       11.28mil; 57.15mil
+       14.42mil; 57.15mil
+       15.45mil; 57.09mil
+       16.48mil; 56.85mil
+       17.55mil; 56.42mil
+       18.58mil; 55.84mil
+       19.65mil; 55.11mil
+       20.74mil; 54.14mil
+       21.47mil; 53.32mil
+       22.08mil; 52.41mil
+       22.57mil; 51.34mil
+       27.43mil; 77.26mil
+       27.47mil; 77.47mil
+       27.5mil; 77.68mil
+       27.4mil; 78.41mil
+       27.22mil; 78.99mil
+       26.92mil; 79.42mil
+       26.49mil; 79.75mil
+       25.94mil; 79.93mil
+       25.24mil; 80.0mil
+       24.85mil; 79.96mil
+       24.48mil; 79.81mil
+       24.12mil; 79.57mil
+       23.81mil; 79.23mil
+       23.48mil; 78.81mil
+       23.21mil; 78.26mil
+       14.69mil; 61.62mil
+       4.38mil; 61.62mil
+       4.38mil; 77.59mil
+       4.29mil; 78.35mil
+       4.1mil; 78.93mil
+       3.8mil; 79.42mil
+       3.37mil; 79.75mil
+       2.83mil; 79.93mil
+       2.16mil; 80.0mil
+       1.49mil; 79.93mil
+       0.94mil; 79.75mil
+       0.51mil; 79.42mil
+       0.24mil; 78.93mil
+       0.06mil; 78.35mil
+       0.0mil; 77.56mil
+       0.0mil; 36.59mil
+       0.06mil; 35.89mil
+       0.24mil; 35.31mil
+       0.58mil; 34.85mil
+       1.03mil; 34.52mil
+       1.61mil; 34.34mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:S {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 45.59mil
+       0.06mil; 44.07mil
+       0.33mil; 42.61mil
+       0.79mil; 41.21mil
+       1.43mil; 39.9mil
+       2.25mil; 38.69mil
+       3.28mil; 37.47mil
+       4.41mil; 36.47mil
+       5.59mil; 35.62mil
+       6.87mil; 34.95mil
+       8.21mil; 34.49mil
+       9.64mil; 34.19mil
+       11.22mil; 34.06mil
+       13.32mil; 34.12mil
+       15.36mil; 34.31mil
+       17.33mil; 34.58mil
+       19.22mil; 34.95mil
+       21.08mil; 35.43mil
+       22.93mil; 36.04mil
+       23.57mil; 36.35mil
+       24.12mil; 36.71mil
+       24.54mil; 37.11mil
+       24.85mil; 37.53mil
+       25.03mil; 38.02mil
+       25.12mil; 38.57mil
+       25.06mil; 39.2mil
+       24.88mil; 39.75mil
+       24.57mil; 40.15mil
+       24.18mil; 40.45mil
+       23.66mil; 40.6mil
+       23.02mil; 40.66mil
+       22.69mil; 40.66mil
+       22.32mil; 40.6mil
+       21.9mil; 40.51mil
+       21.41mil; 40.36mil
+       20.86mil; 40.18mil
+       20.26mil; 39.93mil
+       18.92mil; 39.48mil
+       17.58mil; 39.11mil
+       16.21mil; 38.81mil
+       14.81mil; 38.6mil
+       13.38mil; 38.47mil
+       11.89mil; 38.41mil
+       10.58mil; 38.51mil
+       9.43mil; 38.75mil
+       8.36mil; 39.14mil
+       7.39mil; 39.69mil
+       6.54mil; 40.39mil
+       5.78mil; 41.27mil
+       5.38mil; 41.88mil
+       5.05mil; 42.55mil
+       4.8mil; 43.28mil
+       4.62mil; 44.07mil
+       4.53mil; 44.92mil
+       4.5mil; 45.84mil
+       4.62mil; 47.08mil
+       5.02mil; 48.24mil
+       5.65mil; 49.33mil
+       6.57mil; 50.34mil
+       7.72mil; 51.25mil
+       9.21mil; 52.1mil
+       20.32mil; 57.73mil
+       22.51mil; 59.07mil
+       24.3mil; 60.56mil
+       25.7mil; 62.26mil
+       26.7mil; 64.15mil
+       27.31mil; 66.19mil
+       27.52mil; 68.5mil
+       27.4mil; 70.2mil
+       27.1mil; 71.78mil
+       26.58mil; 73.27mil
+       25.85mil; 74.64mil
+       24.91mil; 75.89mil
+       23.75mil; 77.04mil
+       22.57mil; 77.96mil
+       21.32mil; 78.69mil
+       20.01mil; 79.26mil
+       18.61mil; 79.66mil
+       17.15mil; 79.93mil
+       15.57mil; 80.0mil
+       13.17mil; 79.9mil
+       10.83mil; 79.54mil
+       8.51mil; 78.93mil
+       6.23mil; 78.11mil
+       3.98mil; 77.01mil
+       1.7mil; 75.65mil
+       1.15mil; 75.28mil
+       0.76mil; 74.88mil
+       0.42mil; 74.49mil
+       0.18mil; 74.06mil
+       0.03mil; 73.64mil
+       0.0mil; 73.15mil
+       0.06mil; 72.54mil
+       0.24mil; 72.0mil
+       0.54mil; 71.6mil
+       0.97mil; 71.3mil
+       1.52mil; 71.14mil
+       2.25mil; 71.05mil
+       2.52mil; 71.08mil
+       2.83mil; 71.17mil
+       3.19mil; 71.3mil
+       3.56mil; 71.51mil
+       3.98mil; 71.72mil
+       4.44mil; 72.03mil
+       6.08mil; 73.09mil
+       7.81mil; 73.94mil
+       9.67mil; 74.61mil
+       11.65mil; 75.1mil
+       13.72mil; 75.37mil
+       15.97mil; 75.46mil
+       16.6mil; 75.46mil
+       17.21mil; 75.4mil
+       17.82mil; 75.28mil
+       18.4mil; 75.13mil
+       18.95mil; 74.92mil
+       19.53mil; 74.64mil
+       20.56mil; 73.97mil
+       21.44mil; 73.15mil
+       22.11mil; 72.18mil
+       22.6mil; 71.08mil
+       22.9mil; 69.81mil
+       23.02mil; 68.34mil
+       22.87mil; 67.01mil
+       22.51mil; 65.76mil
+       21.87mil; 64.63mil
+       20.99mil; 63.6mil
+       19.86mil; 62.66mil
+       18.43mil; 61.81mil
+       6.48mil; 55.75mil
+       4.5mil; 54.57mil
+       2.89mil; 53.2mil
+       1.61mil; 51.62mil
+       0.73mil; 49.82mil
+       0.18mil; 47.84mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:T {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.01mil
+       0.06mil; 35.4mil
+       0.27mil; 34.85mil
+       0.64mil; 34.46mil
+       1.15mil; 34.16mil
+       1.82mil; 34.0mil
+       2.67mil; 33.91mil
+       25.21mil; 33.91mil
+       25.85mil; 33.97mil
+       26.4mil; 34.16mil
+       26.83mil; 34.46mil
+       27.13mil; 34.89mil
+       27.31mil; 35.43mil
+       27.4mil; 36.1mil
+       27.34mil; 36.8mil
+       27.16mil; 37.35mil
+       26.86mil; 37.78mil
+       26.46mil; 38.08mil
+       25.91mil; 38.26mil
+       25.27mil; 38.32mil
+       15.94mil; 38.32mil
+       15.94mil; 77.59mil
+       15.84mil; 78.35mil
+       15.66mil; 78.93mil
+       15.36mil; 79.42mil
+       14.93mil; 79.75mil
+       14.38mil; 79.93mil
+       13.72mil; 80.0mil
+       13.02mil; 79.93mil
+       12.47mil; 79.75mil
+       12.04mil; 79.42mil
+       11.74mil; 78.99mil
+       11.56mil; 78.41mil
+       11.49mil; 77.65mil
+       11.49mil; 38.32mil
+       2.61mil; 38.32mil
+       1.79mil; 38.26mil
+       1.15mil; 38.08mil
+       0.64mil; 37.78mil
+       0.27mil; 37.32mil
+       0.06mil; 36.74mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:U {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.28mil
+       0.03mil; 35.58mil
+       0.21mil; 34.98mil
+       0.51mil; 34.52mil
+       0.91mil; 34.19mil
+       1.46mil; 34.0mil
+       2.13mil; 33.91mil
+       2.83mil; 34.0mil
+       3.4mil; 34.19mil
+       3.83mil; 34.52mil
+       4.16mil; 34.98mil
+       4.35mil; 35.55mil
+       4.44mil; 36.28mil
+       4.44mil; 65.76mil
+       4.5mil; 67.34mil
+       4.77mil; 68.77mil
+       5.23mil; 70.08mil
+       5.87mil; 71.27mil
+       6.69mil; 72.3mil
+       7.72mil; 73.24mil
+       8.67mil; 73.94mil
+       9.64mil; 74.49mil
+       10.61mil; 74.95mil
+       11.62mil; 75.25mil
+       12.62mil; 75.43mil
+       13.69mil; 75.49mil
+       14.9mil; 75.43mil
+       16.12mil; 75.19mil
+       17.28mil; 74.76mil
+       18.4mil; 74.19mil
+       19.47mil; 73.42mil
+       20.56mil; 72.45mil
+       21.29mil; 71.6mil
+       21.93mil; 70.63mil
+       22.42mil; 69.53mil
+       22.75mil; 68.34mil
+       22.96mil; 67.07mil
+       23.05mil; 65.61mil
+       23.05mil; 36.28mil
+       23.12mil; 35.58mil
+       23.3mil; 34.98mil
+       23.6mil; 34.52mil
+       24.03mil; 34.19mil
+       24.61mil; 34.0mil
+       25.34mil; 33.91mil
+       26.0mil; 34.0mil
+       26.55mil; 34.22mil
+       26.98mil; 34.58mil
+       27.28mil; 35.1mil
+       27.47mil; 35.77mil
+       27.56mil; 36.59mil
+       27.56mil; 65.42mil
+       27.43mil; 67.52mil
+       27.1mil; 69.44mil
+       26.55mil; 71.23mil
+       25.79mil; 72.85mil
+       24.82mil; 74.34mil
+       23.57mil; 75.71mil
+       22.08mil; 76.98mil
+       20.56mil; 78.02mil
+       18.95mil; 78.81mil
+       17.24mil; 79.39mil
+       15.51mil; 79.75mil
+       13.62mil; 79.84mil
+       11.98mil; 79.78mil
+       10.4mil; 79.51mil
+       8.88mil; 79.05mil
+       7.45mil; 78.41mil
+       6.05mil; 77.59mil
+       4.68mil; 76.56mil
+       3.25mil; 75.22mil
+       2.07mil; 73.73mil
+       1.15mil; 72.12mil
+       0.51mil; 70.38mil
+       0.12mil; 68.53mil
+       0.0mil; 66.46mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:V {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       16.06mil; 70.87mil
+       27.77mil; 36.07mil
+       28.01mil; 35.46mil
+       28.29mil; 34.98mil
+       28.62mil; 34.58mil
+       29.02mil; 34.31mil
+       29.44mil; 34.12mil
+       29.96mil; 34.06mil
+       30.63mil; 34.12mil
+       31.18mil; 34.31mil
+       31.63mil; 34.61mil
+       31.94mil; 35.01mil
+       32.12mil; 35.55mil
+       32.21mil; 36.19mil
+       32.18mil; 36.41mil
+       32.18mil; 36.62mil
+       32.12mil; 36.83mil
+       32.09mil; 37.08mil
+       32.0mil; 37.32mil
+       31.94mil; 37.59mil
+       18.52mil; 77.93mil
+       18.25mil; 78.57mil
+       17.94mil; 79.08mil
+       17.58mil; 79.48mil
+       17.15mil; 79.78mil
+       16.67mil; 79.96mil
+       16.12mil; 80.0mil
+       15.63mil; 79.96mil
+       15.21mil; 79.78mil
+       14.84mil; 79.51mil
+       14.51mil; 79.11mil
+       14.2mil; 78.63mil
+       13.96mil; 77.99mil
+       0.18mil; 37.17mil
+       0.12mil; 37.01mil
+       0.06mil; 36.83mil
+       0.03mil; 36.65mil
+       0.0mil; 36.5mil
+       0.0mil; 36.35mil
+       0.0mil; 36.16mil
+       0.06mil; 35.58mil
+       0.24mil; 35.1mil
+       0.57mil; 34.7mil
+       1.03mil; 34.43mil
+       1.64mil; 34.25mil
+       2.4mil; 34.19mil
+       2.83mil; 34.25mil
+       3.22mil; 34.43mil
+       3.62mil; 34.73mil
+       3.92mil; 35.13mil
+       4.22mil; 35.68mil
+       4.5mil; 36.31mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:W {
+    width=41mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       37.02mil; 36.04mil
+       37.2mil; 35.49mil
+       37.44mil; 35.04mil
+       37.75mil; 34.67mil
+       38.14mil; 34.4mil
+       38.6mil; 34.25mil
+       39.14mil; 34.19mil
+       39.78mil; 34.25mil
+       40.33mil; 34.4mil
+       40.76mil; 34.67mil
+       41.06mil; 35.04mil
+       41.24mil; 35.49mil
+       41.33mil; 36.07mil
+       41.3mil; 36.35mil
+       41.3mil; 36.59mil
+       41.27mil; 36.86mil
+       41.24mil; 37.14mil
+       41.18mil; 37.38mil
+       41.15mil; 37.65mil
+       32.15mil; 77.77mil
+       31.94mil; 78.47mil
+       31.69mil; 79.02mil
+       31.39mil; 79.45mil
+       30.99mil; 79.75mil
+       30.54mil; 79.93mil
+       30.02mil; 80.0mil
+       29.44mil; 79.96mil
+       28.95mil; 79.78mil
+       28.53mil; 79.51mil
+       28.13mil; 79.11mil
+       27.83mil; 78.6mil
+       27.59mil; 77.96mil
+       20.62mil; 57.12mil
+       13.68mil; 78.08mil
+       13.44mil; 78.69mil
+       13.14mil; 79.14mil
+       12.8mil; 79.54mil
+       12.41mil; 79.78mil
+       11.98mil; 79.96mil
+       11.49mil; 80.0mil
+       10.92mil; 79.96mil
+       10.4mil; 79.81mil
+       9.97mil; 79.54mil
+       9.64mil; 79.2mil
+       9.4mil; 78.75mil
+       9.21mil; 78.14mil
+       0.09mil; 37.26mil
+       0.06mil; 37.11mil
+       0.03mil; 36.95mil
+       0.0mil; 36.77mil
+       0.0mil; 36.59mil
+       0.0mil; 36.38mil
+       0.0mil; 36.13mil
+       0.06mil; 35.52mil
+       0.24mil; 35.01mil
+       0.57mil; 34.61mil
+       1.0mil; 34.31mil
+       1.58mil; 34.12mil
+       2.34mil; 34.06mil
+       2.83mil; 34.12mil
+       3.28mil; 34.31mil
+       3.65mil; 34.58mil
+       3.98mil; 34.95mil
+       4.22mil; 35.43mil
+       4.41mil; 36.04mil
+       11.8mil; 69.35mil
+       18.37mil; 49.85mil
+       18.61mil; 49.24mil
+       18.92mil; 48.73mil
+       19.31mil; 48.33mil
+       19.74mil; 48.06mil
+       20.22mil; 47.87mil
+       20.8mil; 47.81mil
+       21.26mil; 47.9mil
+       21.68mil; 48.09mil
+       22.05mil; 48.39mil
+       22.41mil; 48.82mil
+       22.72mil; 49.36mil
+       22.99mil; 50.03mil
+       29.5mil; 69.47mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:X {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       13.5mil; 57.03mil
+       13.14mil; 56.51mil
+       12.07mil; 54.93mil
+       10.28mil; 52.25mil
+       7.81mil; 48.54mil
+       4.62mil; 43.74mil
+       0.57mil; 37.65mil
+       0.42mil; 37.41mil
+       0.3mil; 37.17mil
+       0.21mil; 36.92mil
+       0.12mil; 36.68mil
+       0.09mil; 36.44mil
+       0.09mil; 36.16mil
+       0.15mil; 35.55mil
+       0.33mil; 35.07mil
+       0.64mil; 34.67mil
+       1.06mil; 34.4mil
+       1.61mil; 34.22mil
+       2.34mil; 34.16mil
+       2.7mil; 34.22mil
+       3.04mil; 34.31mil
+       3.4mil; 34.49mil
+       3.71mil; 34.76mil
+       4.04mil; 35.1mil
+       4.38mil; 35.49mil
+       16.15mil; 52.95mil
+       28.1mil; 35.19mil
+       28.38mil; 34.85mil
+       28.65mil; 34.58mil
+       28.99mil; 34.37mil
+       29.32mil; 34.22mil
+       29.68mil; 34.12mil
+       30.11mil; 34.06mil
+       30.75mil; 34.12mil
+       31.3mil; 34.31mil
+       31.72mil; 34.58mil
+       32.03mil; 34.98mil
+       32.21mil; 35.49mil
+       32.3mil; 36.1mil
+       32.27mil; 36.41mil
+       32.21mil; 36.71mil
+       32.09mil; 37.01mil
+       31.94mil; 37.38mil
+       31.75mil; 37.71mil
+       31.51mil; 38.11mil
+       18.83mil; 57.03mil
+       31.72mil; 76.5mil
+       31.84mil; 76.74mil
+       31.97mil; 76.95mil
+       32.06mil; 77.17mil
+       32.15mil; 77.38mil
+       32.18mil; 77.56mil
+       32.21mil; 77.74mil
+       32.12mil; 78.44mil
+       31.94mil; 78.99mil
+       31.63mil; 79.45mil
+       31.21mil; 79.75mil
+       30.66mil; 79.93mil
+       29.99mil; 80.0mil
+       29.56mil; 79.96mil
+       29.17mil; 79.87mil
+       28.8mil; 79.69mil
+       28.47mil; 79.45mil
+       28.16mil; 79.11mil
+       27.86mil; 78.69mil
+       16.15mil; 60.98mil
+       4.29mil; 78.84mil
+       4.01mil; 79.2mil
+       3.71mil; 79.51mil
+       3.43mil; 79.72mil
+       3.13mil; 79.87mil
+       2.8mil; 79.96mil
+       2.46mil; 80.0mil
+       1.7mil; 79.96mil
+       1.09mil; 79.78mil
+       0.61mil; 79.48mil
+       0.27mil; 79.08mil
+       0.06mil; 78.53mil
+       0.0mil; 77.87mil
+       0.0mil; 77.65mil
+       0.06mil; 77.38mil
+       0.15mil; 77.11mil
+       0.27mil; 76.8mil
+       0.45mil; 76.5mil
+       0.67mil; 76.13mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:Y {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       13.96mil; 56.85mil
+       13.56mil; 56.33mil
+       12.47mil; 54.75mil
+       10.61mil; 52.1mil
+       8.03mil; 48.42mil
+       4.68mil; 43.68mil
+       0.48mil; 37.65mil
+       0.33mil; 37.44mil
+       0.21mil; 37.2mil
+       0.12mil; 36.98mil
+       0.03mil; 36.74mil
+       0.0mil; 36.5mil
+       0.0mil; 36.25mil
+       0.06mil; 35.62mil
+       0.24mil; 35.07mil
+       0.57mil; 34.64mil
+       1.03mil; 34.34mil
+       1.64mil; 34.16mil
+       2.4mil; 34.06mil
+       2.73mil; 34.12mil
+       3.07mil; 34.22mil
+       3.4mil; 34.4mil
+       3.71mil; 34.67mil
+       4.01mil; 35.01mil
+       4.35mil; 35.4mil
+       16.09mil; 52.44mil
+       27.95mil; 35.13mil
+       28.19mil; 34.82mil
+       28.5mil; 34.55mil
+       28.8mil; 34.34mil
+       29.14mil; 34.19mil
+       29.47mil; 34.12mil
+       29.87mil; 34.06mil
+       30.57mil; 34.12mil
+       31.14mil; 34.31mil
+       31.57mil; 34.58mil
+       31.91mil; 34.98mil
+       32.09mil; 35.49mil
+       32.18mil; 36.13mil
+       32.15mil; 36.41mil
+       32.09mil; 36.68mil
+       32.03mil; 36.92mil
+       31.91mil; 37.2mil
+       31.75mil; 37.5mil
+       31.6mil; 37.78mil
+       18.31mil; 56.97mil
+       18.31mil; 77.41mil
+       18.25mil; 78.2mil
+       18.07mil; 78.87mil
+       17.76mil; 79.36mil
+       17.37mil; 79.72mil
+       16.82mil; 79.93mil
+       16.18mil; 80.0mil
+       15.48mil; 79.93mil
+       14.93mil; 79.72mil
+       14.51mil; 79.36mil
+       14.2mil; 78.84mil
+       14.02mil; 78.2mil
+       13.96mil; 77.35mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:Z {
+    width=27mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       5.87mil; 75.68mil
+       25.18mil; 75.68mil
+       25.88mil; 75.77mil
+       26.49mil; 75.95mil
+       26.95mil; 76.25mil
+       27.28mil; 76.68mil
+       27.46mil; 77.26mil
+       27.56mil; 77.96mil
+       27.46mil; 78.6mil
+       27.28mil; 79.11mil
+       26.95mil; 79.51mil
+       26.49mil; 79.78mil
+       25.88mil; 79.96mil
+       25.15mil; 80.0mil
+       2.31mil; 80.0mil
+       1.58mil; 79.96mil
+       1.0mil; 79.78mil
+       0.57mil; 79.48mil
+       0.24mil; 79.05mil
+       0.06mil; 78.5mil
+       0.0mil; 77.8mil
+       0.0mil; 77.53mil
+       0.06mil; 77.23mil
+       0.15mil; 76.89mil
+       0.3mil; 76.56mil
+       0.45mil; 76.16mil
+       0.7mil; 75.74mil
+       21.56mil; 38.47mil
+       2.61mil; 38.47mil
+       1.82mil; 38.41mil
+       1.18mil; 38.23mil
+       0.7mil; 37.9mil
+       0.33mil; 37.44mil
+       0.12mil; 36.83mil
+       0.06mil; 36.07mil
+       0.12mil; 35.46mil
+       0.33mil; 34.98mil
+       0.7mil; 34.58mil
+       1.21mil; 34.31mil
+       1.85mil; 34.12mil
+       2.7mil; 34.06mil
+       24.6mil; 34.06mil
+       25.46mil; 34.12mil
+       26.16mil; 34.31mil
+       26.73mil; 34.58mil
+       27.13mil; 34.98mil
+       27.37mil; 35.46mil
+       27.46mil; 36.07mil
+       27.43mil; 36.38mil
+       27.4mil; 36.68mil
+       27.34mil; 36.98mil
+       27.22mil; 37.29mil
+       27.13mil; 37.59mil
+       26.98mil; 37.87mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:[ {
+    width=8mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 31.81mil
+       0.06mil; 31.11mil
+       0.24mil; 30.54mil
+       0.55mil; 30.08mil
+       0.97mil; 29.74mil
+       1.52mil; 29.56mil
+       2.25mil; 29.47mil
+       2.34mil; 29.47mil
+       2.7mil; 29.47mil
+       3.31mil; 29.47mil
+       4.13mil; 29.47mil
+       5.23mil; 29.47mil
+       6.6mil; 29.47mil
+       7.3mil; 29.53mil
+       7.88mil; 29.71mil
+       8.33mil; 30.02mil
+       8.67mil; 30.44mil
+       8.85mil; 30.99mil
+       8.94mil; 31.66mil
+       8.85mil; 32.36mil
+       8.67mil; 32.91mil
+       8.36mil; 33.36mil
+       7.94mil; 33.67mil
+       7.36mil; 33.85mil
+       6.66mil; 33.91mil
+       4.44mil; 33.91mil
+       4.44mil; 80.36mil
+       6.63mil; 80.36mil
+       7.33mil; 80.39mil
+       7.91mil; 80.57mil
+       8.33mil; 80.85mil
+       8.67mil; 81.24mil
+       8.85mil; 81.76mil
+       8.94mil; 82.43mil
+       8.85mil; 83.1mil
+       8.67mil; 83.65mil
+       8.3mil; 84.07mil
+       7.85mil; 84.38mil
+       7.24mil; 84.56mil
+       6.48mil; 84.65mil
+       2.13mil; 84.65mil
+       1.46mil; 84.56mil
+       0.94mil; 84.38mil
+       0.51mil; 84.07mil
+       0.21mil; 83.65mil
+       0.06mil; 83.1mil
+       0.0mil; 82.43mil
+       0.0mil; 81.03mil
+       0.0mil; 76.89mil
+       0.0mil; 69.93mil
+       0.0mil; 60.19mil
+       0.0mil; 47.69mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:\\ {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       22.69mil; 77.96mil
+       22.6mil; 78.6mil
+       22.41mil; 79.11mil
+       22.08mil; 79.51mil
+       21.62mil; 79.78mil
+       21.05mil; 79.96mil
+       20.32mil; 80.0mil
+       19.86mil; 79.96mil
+       19.46mil; 79.81mil
+       19.1mil; 79.54mil
+       18.76mil; 79.17mil
+       18.43mil; 78.72mil
+       18.16mil; 78.11mil
+       0.3mil; 37.68mil
+       0.18mil; 37.44mil
+       0.12mil; 37.2mil
+       0.06mil; 36.92mil
+       0.03mil; 36.68mil
+       0.0mil; 36.41mil
+       0.0mil; 36.13mil
+       0.03mil; 35.52mil
+       0.21mil; 35.01mil
+       0.51mil; 34.61mil
+       0.94mil; 34.31mil
+       1.49mil; 34.12mil
+       2.19mil; 34.06mil
+       2.61mil; 34.12mil
+       3.04mil; 34.28mil
+       3.43mil; 34.55mil
+       3.8mil; 34.92mil
+       4.1mil; 35.4mil
+       4.44mil; 35.98mil
+       22.14mil; 76.04mil
+       22.29mil; 76.47mil
+       22.41mil; 76.83mil
+       22.54mil; 77.17mil
+       22.6mil; 77.47mil
+       22.66mil; 77.71mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:] {
+    width=8mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       8.94mil; 31.81mil
+       8.94mil; 33.21mil
+       8.94mil; 37.38mil
+       8.94mil; 44.35mil
+       8.94mil; 54.08mil
+       8.94mil; 66.58mil
+       8.94mil; 82.43mil
+       8.88mil; 83.1mil
+       8.7mil; 83.65mil
+       8.39mil; 84.07mil
+       8.0mil; 84.38mil
+       7.45mil; 84.56mil
+       6.81mil; 84.65mil
+       2.46mil; 84.65mil
+       1.7mil; 84.56mil
+       1.09mil; 84.38mil
+       0.61mil; 84.07mil
+       0.27mil; 83.65mil
+       0.06mil; 83.1mil
+       0.0mil; 82.43mil
+       0.06mil; 81.79mil
+       0.24mil; 81.27mil
+       0.54mil; 80.88mil
+       1.0mil; 80.57mil
+       1.58mil; 80.39mil
+       2.31mil; 80.36mil
+       4.5mil; 80.36mil
+       4.5mil; 33.91mil
+       2.28mil; 33.91mil
+       1.58mil; 33.85mil
+       1.0mil; 33.67mil
+       0.54mil; 33.36mil
+       0.24mil; 32.94mil
+       0.06mil; 32.39mil
+       0.0mil; 31.66mil
+       0.06mil; 31.02mil
+       0.24mil; 30.47mil
+       0.57mil; 30.05mil
+       1.0mil; 29.74mil
+       1.58mil; 29.56mil
+       2.34mil; 29.47mil
+       6.69mil; 29.47mil
+       7.36mil; 29.56mil
+       7.91mil; 29.74mil
+       8.36mil; 30.08mil
+       8.67mil; 30.51mil
+       8.85mil; 31.08mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:^ {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       13.9mil; 35.25mil
+       13.75mil; 35.13mil
+       13.35mil; 34.73mil
+       12.71mil; 34.06mil
+       11.8mil; 33.15mil
+       10.64mil; 31.97mil
+       9.18mil; 30.44mil
+       4.38mil; 35.1mil
+       3.95mil; 35.49mil
+       3.56mil; 35.8mil
+       3.19mil; 36.04mil
+       2.86mil; 36.22mil
+       2.52mil; 36.31mil
+       2.22mil; 36.35mil
+       1.52mil; 36.31mil
+       0.97mil; 36.13mil
+       0.54mil; 35.86mil
+       0.24mil; 35.49mil
+       0.06mil; 35.01mil
+       0.0mil; 34.37mil
+       0.0mil; 34.06mil
+       0.09mil; 33.76mil
+       0.24mil; 33.43mil
+       0.42mil; 33.09mil
+       0.7mil; 32.73mil
+       1.03mil; 32.36mil
+       7.05mil; 26.16mil
+       7.39mil; 25.82mil
+       7.75mil; 25.55mil
+       8.12mil; 25.33mil
+       8.45mil; 25.18mil
+       8.82mil; 25.09mil
+       9.18mil; 25.03mil
+       9.46mil; 25.09mil
+       9.76mil; 25.18mil
+       10.1mil; 25.33mil
+       10.43mil; 25.55mil
+       10.76mil; 25.82mil
+       11.16mil; 26.16mil
+       17.09mil; 32.12mil
+       17.4mil; 32.48mil
+       17.67mil; 32.85mil
+       17.88mil; 33.21mil
+       18.03mil; 33.58mil
+       18.13mil; 33.94mil
+       18.19mil; 34.31mil
+       18.1mil; 34.95mil
+       17.91mil; 35.46mil
+       17.61mil; 35.86mil
+       17.15mil; 36.13mil
+       16.57mil; 36.31mil
+       15.87mil; 36.35mil
+       15.54mil; 36.35mil
+       15.24mil; 36.25mil
+       14.9mil; 36.1mil
+       14.57mil; 35.89mil
+       14.23mil; 35.62mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:_ {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.19mil; 80.0mil
+       2.67mil; 80.0mil
+       4.19mil; 80.0mil
+       6.75mil; 80.0mil
+       10.31mil; 80.0mil
+       14.87mil; 80.0mil
+       20.68mil; 80.0mil
+       21.32mil; 80.06mil
+       21.87mil; 80.24mil
+       22.29mil; 80.57mil
+       22.6mil; 81.0mil
+       22.78mil; 81.58mil
+       22.87mil; 82.34mil
+       22.78mil; 82.95mil
+       22.6mil; 83.46mil
+       22.29mil; 83.86mil
+       21.87mil; 84.13mil
+       21.29mil; 84.31mil
+       20.59mil; 84.38mil
+       2.25mil; 84.38mil
+       1.55mil; 84.28mil
+       1.0mil; 84.1mil
+       0.54mil; 83.8mil
+       0.24mil; 83.34mil
+       0.06mil; 82.76mil
+       0.0mil; 82.06mil
+       0.03mil; 81.42mil
+       0.21mil; 80.91mil
+       0.51mil; 80.51mil
+       0.94mil; 80.21mil
+       1.49mil; 80.03mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:` {
+    width=13mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       3.92mil; 27.46mil
+       4.13mil; 27.65mil
+       4.83mil; 28.19mil
+       6.02mil; 29.08mil
+       7.66mil; 30.29mil
+       9.76mil; 31.87mil
+       12.47mil; 33.88mil
+       12.77mil; 34.16mil
+       13.05mil; 34.46mil
+       13.26mil; 34.76mil
+       13.41mil; 35.1mil
+       13.5mil; 35.43mil
+       13.56mil; 35.8mil
+       13.5mil; 36.5mil
+       13.32mil; 37.08mil
+       13.05mil; 37.53mil
+       12.65mil; 37.84mil
+       12.13mil; 38.02mil
+       11.49mil; 38.08mil
+       11.22mil; 38.08mil
+       10.95mil; 38.02mil
+       10.67mil; 37.96mil
+       10.4mil; 37.84mil
+       10.1mil; 37.68mil
+       9.82mil; 37.47mil
+       9.58mil; 37.32mil
+       8.85mil; 36.77mil
+       7.66mil; 35.86mil
+       5.99mil; 34.61mil
+       3.86mil; 33.0mil
+       1.15mil; 30.93mil
+       0.79mil; 30.66mil
+       0.48mil; 30.35mil
+       0.27mil; 30.08mil
+       0.12mil; 29.78mil
+       0.03mil; 29.44mil
+       0.0mil; 29.11mil
+       0.06mil; 28.38mil
+       0.24mil; 27.8mil
+       0.54mil; 27.31mil
+       1.0mil; 26.98mil
+       1.58mil; 26.79mil
+       2.31mil; 26.7mil
+       2.52mil; 26.73mil
+       2.76mil; 26.79mil
+       3.01mil; 26.92mil
+       3.28mil; 27.04mil
+       3.59mil; 27.25mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:a {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       4.68mil; 52.16mil
+       3.98mil; 52.1mil
+       3.4mil; 51.92mil
+       2.95mil; 51.62mil
+       2.64mil; 51.19mil
+       2.46mil; 50.64mil
+       2.4mil; 49.91mil
+       2.46mil; 49.27mil
+       2.64mil; 48.73mil
+       2.95mil; 48.3mil
+       3.37mil; 48.0mil
+       3.95mil; 47.81mil
+       4.68mil; 47.72mil
+       14.14mil; 47.72mil
+       15.39mil; 47.81mil
+       16.57mil; 48.06mil
+       17.67mil; 48.45mil
+       18.67mil; 49.03mil
+       19.62mil; 49.73mil
+       20.53mil; 50.64mil
+       21.26mil; 51.65mil
+       21.87mil; 52.62mil
+       22.35mil; 53.62mil
+       22.69mil; 54.63mil
+       22.9mil; 55.63mil
+       22.99mil; 56.69mil
+       22.99mil; 77.14mil
+       22.96mil; 77.56mil
+       22.9mil; 77.96mil
+       22.81mil; 78.32mil
+       22.66mil; 78.66mil
+       22.51mil; 78.93mil
+       22.29mil; 79.2mil
+       22.02mil; 79.45mil
+       21.75mil; 79.63mil
+       21.44mil; 79.78mil
+       21.14mil; 79.9mil
+       20.77mil; 79.96mil
+       20.38mil; 80.0mil
+       8.82mil; 80.0mil
+       7.69mil; 79.93mil
+       6.6mil; 79.69mil
+       5.56mil; 79.33mil
+       4.59mil; 78.78mil
+       3.62mil; 78.08mil
+       2.7mil; 77.2mil
+       1.88mil; 76.25mil
+       1.21mil; 75.28mil
+       0.67mil; 74.25mil
+       0.3mil; 73.18mil
+       0.06mil; 72.09mil
+       0.0mil; 70.87mil
+       0.06mil; 69.62mil
+       0.27mil; 68.41mil
+       0.61mil; 67.28mil
+       1.09mil; 66.22mil
+       1.73mil; 65.24mil
+       2.55mil; 64.27mil
+       3.4mil; 63.48mil
+       4.38mil; 62.81mil
+       5.38mil; 62.26mil
+       6.48mil; 61.9mil
+       7.66mil; 61.65mil
+       8.94mil; 61.56mil
+       9.55mil; 65.97mil
+       8.73mil; 66.03mil
+       8.0mil; 66.15mil
+       7.33mil; 66.37mil
+       6.75mil; 66.64mil
+       6.23mil; 67.01mil
+       5.78mil; 67.46mil
+       5.38mil; 67.98mil
+       5.08mil; 68.5mil
+       4.83mil; 69.04mil
+       4.65mil; 69.62mil
+       4.53mil; 70.2mil
+       4.5mil; 70.81mil
+       4.53mil; 71.48mil
+       4.65mil; 72.09mil
+       4.83mil; 72.63mil
+       5.11mil; 73.15mil
+       5.47mil; 73.64mil
+       5.93mil; 74.09mil
+       6.38mil; 74.49mil
+       6.9mil; 74.82mil
+       7.42mil; 75.07mil
+       7.97mil; 75.25mil
+       8.51mil; 75.37mil
+       9.12mil; 75.4mil
+       18.43mil; 75.4mil
+       18.43mil; 65.97mil
+       9.55mil; 65.97mil
+       8.94mil; 61.56mil
+       18.43mil; 61.56mil
+       18.43mil; 55.96mil
+       18.37mil; 55.6mil
+       18.28mil; 55.2mil
+       18.07mil; 54.78mil
+       17.82mil; 54.38mil
+       17.49mil; 53.96mil
+       17.06mil; 53.5mil
+       16.57mil; 53.11mil
+       16.12mil; 52.8mil
+       15.6mil; 52.53mil
+       15.08mil; 52.35mil
+       14.57mil; 52.22mil
+       14.02mil; 52.16mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:b {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       2.74mil; 79.87mil
+       1.88mil; 79.84mil
+       1.21mil; 79.66mil
+       0.67mil; 79.39mil
+       0.3mil; 78.99mil
+       0.06mil; 78.47mil
+       0.0mil; 77.8mil
+       0.0mil; 36.16mil
+       0.03mil; 35.49mil
+       0.21mil; 34.95mil
+       0.51mil; 34.49mil
+       0.91mil; 34.19mil
+       1.43mil; 34.0mil
+       2.1mil; 33.91mil
+       2.77mil; 34.0mil
+       3.31mil; 34.19mil
+       3.77mil; 34.49mil
+       4.07mil; 34.92mil
+       4.26mil; 35.46mil
+       4.35mil; 36.16mil
+       4.35mil; 47.81mil
+
+       13.23mil; 75.49mil
+       14.81mil; 75.37mil
+       16.12mil; 74.95mil
+       17.12mil; 74.22mil
+       17.85mil; 73.24mil
+       18.28mil; 71.96mil
+       18.46mil; 70.32mil
+       18.46mil; 69.99mil
+       18.46mil; 68.89mil
+       18.46mil; 67.1mil
+       18.46mil; 64.6mil
+       18.46mil; 61.38mil
+       18.46mil; 57.27mil
+       18.4mil; 56.54mil
+       18.31mil; 55.84mil
+       18.1mil; 55.2mil
+       17.85mil; 54.6mil
+       17.52mil; 54.08mil
+       17.09mil; 53.56mil
+       16.61mil; 53.17mil
+       16.06mil; 52.83mil
+       15.51mil; 52.56mil
+       14.87mil; 52.35mil
+       14.2mil; 52.22mil
+       13.47mil; 52.16mil
+       4.29mil; 52.16mil
+       4.29mil; 75.49mil
+       13.23mil; 75.49mil
+
+       4.35mil; 47.81mil
+       14.39mil; 47.81mil
+       15.63mil; 47.93mil
+       16.82mil; 48.21mil
+       17.94mil; 48.7mil
+       19.04mil; 49.36mil
+       20.07mil; 50.22mil
+       21.08mil; 51.28mil
+       21.59mil; 52.01mil
+       22.02mil; 52.8mil
+       22.35mil; 53.59mil
+       22.6mil; 54.44mil
+       22.75mil; 55.33mil
+       22.81mil; 56.27mil
+       22.81mil; 71.54mil
+       22.72mil; 72.69mil
+       22.51mil; 73.79mil
+       22.14mil; 74.79mil
+       21.66mil; 75.74mil
+       20.99mil; 76.65mil
+       20.2mil; 77.47mil
+       19.28mil; 78.2mil
+       18.31mil; 78.81mil
+       17.24mil; 79.26mil
+       16.15mil; 79.6mil
+       14.93mil; 79.81mil
+       13.66mil; 79.87mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:c {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       15.91mil; 47.69mil
+       16.61mil; 47.75mil
+       17.19mil; 47.93mil
+       17.61mil; 48.24mil
+       17.95mil; 48.63mil
+       18.13mil; 49.18mil
+       18.22mil; 49.82mil
+       18.13mil; 50.52mil
+       17.95mil; 51.1mil
+       17.64mil; 51.55mil
+       17.19mil; 51.86mil
+       16.61mil; 52.04mil
+       15.91mil; 52.1mil
+       15.73mil; 52.1mil
+       15.24mil; 52.1mil
+       14.39mil; 52.1mil
+       13.23mil; 52.1mil
+       11.74mil; 52.1mil
+       9.85mil; 52.1mil
+       8.18mil; 52.25mil
+       6.84mil; 52.68mil
+       5.78mil; 53.38mil
+       5.05mil; 54.35mil
+       4.59mil; 55.63mil
+       4.44mil; 57.21mil
+       4.44mil; 57.58mil
+       4.44mil; 58.61mil
+       4.44mil; 60.38mil
+       4.44mil; 62.81mil
+       4.44mil; 65.94mil
+       4.44mil; 69.9mil
+       4.56mil; 71.6mil
+       4.99mil; 72.97mil
+       5.69mil; 74.03mil
+       6.66mil; 74.79mil
+       7.94mil; 75.25mil
+       9.55mil; 75.4mil
+       15.76mil; 75.4mil
+       16.49mil; 75.49mil
+       17.09mil; 75.68mil
+       17.58mil; 76.01mil
+       17.92mil; 76.44mil
+       18.13mil; 77.01mil
+       18.22mil; 77.74mil
+       18.13mil; 78.41mil
+       17.95mil; 78.93mil
+       17.61mil; 79.36mil
+       17.19mil; 79.66mil
+       16.61mil; 79.81mil
+       15.88mil; 79.87mil
+       15.66mil; 79.87mil
+       15.09mil; 79.87mil
+       14.11mil; 79.87mil
+       12.74mil; 79.87mil
+       10.98mil; 79.87mil
+       8.79mil; 79.87mil
+       7.6mil; 79.81mil
+       6.48mil; 79.6mil
+       5.38mil; 79.23mil
+       4.38mil; 78.72mil
+       3.41mil; 78.05mil
+       2.49mil; 77.2mil
+       1.73mil; 76.34mil
+       1.09mil; 75.4mil
+       0.61mil; 74.43mil
+       0.27mil; 73.36mil
+       0.06mil; 72.24mil
+       0.0mil; 70.99mil
+       0.0mil; 70.63mil
+       0.0mil; 69.47mil
+       0.0mil; 67.58mil
+       0.0mil; 64.91mil
+       0.0mil; 61.47mil
+       0.0mil; 57.09mil
+       0.06mil; 55.78mil
+       0.24mil; 54.54mil
+       0.58mil; 53.38mil
+       1.06mil; 52.35mil
+       1.64mil; 51.4mil
+       2.43mil; 50.49mil
+       3.38mil; 49.67mil
+       4.44mil; 48.97mil
+       5.54mil; 48.42mil
+       6.75mil; 48.03mil
+       8.03mil; 47.78mil
+       9.43mil; 47.69mil
+       9.58mil; 47.69mil
+       10.13mil; 47.69mil
+       11.01mil; 47.69mil
+       12.26mil; 47.69mil
+       13.87mil; 47.69mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:d {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       18.4mil; 36.25mil
+       18.46mil; 35.55mil
+       18.65mil; 34.98mil
+       18.95mil; 34.52mil
+       19.38mil; 34.19mil
+       19.92mil; 34.0mil
+       20.62mil; 33.91mil
+       21.29mil; 34.0mil
+       21.84mil; 34.22mil
+       22.27mil; 34.55mil
+       22.57mil; 35.04mil
+       22.75mil; 35.65mil
+       22.84mil; 36.41mil
+       22.84mil; 77.14mil
+       22.75mil; 78.02mil
+       22.51mil; 78.72mil
+       22.11mil; 79.3mil
+       21.57mil; 79.69mil
+       20.84mil; 79.93mil
+       19.95mil; 80.0mil
+       9.4mil; 80.0mil
+       8.12mil; 79.93mil
+       6.93mil; 79.75mil
+       5.81mil; 79.39mil
+       4.81mil; 78.93mil
+       3.86mil; 78.32mil
+       2.98mil; 77.53mil
+       2.07mil; 76.53mil
+       1.31mil; 75.49mil
+       0.73mil; 74.43mil
+       0.33mil; 73.33mil
+       0.06mil; 72.18mil
+       0.0mil; 70.96mil
+       0.0mil; 56.45mil
+       0.03mil; 55.51mil
+       0.21mil; 54.57mil
+       0.52mil; 53.62mil
+       0.91mil; 52.74mil
+       1.43mil; 51.86mil
+       2.1mil; 50.95mil
+       3.01mil; 49.97mil
+       4.08mil; 49.18mil
+       5.26mil; 48.54mil
+       6.54mil; 48.12mil
+       7.94mil; 47.84mil
+       9.55mil; 47.72mil
+       9.58mil; 52.13mil
+       7.97mil; 52.31mil
+       6.66mil; 52.8mil
+       5.63mil; 53.59mil
+       4.9mil; 54.72mil
+       4.47mil; 56.15mil
+       4.32mil; 57.97mil
+       4.32mil; 58.31mil
+       4.32mil; 59.31mil
+       4.32mil; 60.95mil
+       4.32mil; 63.27mil
+       4.32mil; 66.22mil
+       4.32mil; 69.96mil
+       4.47mil; 71.63mil
+       4.93mil; 73.0mil
+       5.69mil; 74.03mil
+       6.75mil; 74.79mil
+       8.15mil; 75.25mil
+       9.92mil; 75.4mil
+       10.13mil; 75.4mil
+       10.83mil; 75.4mil
+       11.98mil; 75.4mil
+       13.63mil; 75.4mil
+       15.73mil; 75.4mil
+       18.4mil; 75.4mil
+       18.4mil; 74.76mil
+       18.4mil; 72.85mil
+       18.4mil; 69.65mil
+       18.4mil; 65.18mil
+       18.4mil; 59.43mil
+       18.4mil; 52.13mil
+       18.16mil; 52.13mil
+       17.43mil; 52.13mil
+       16.21mil; 52.13mil
+       14.51mil; 52.13mil
+       12.32mil; 52.13mil
+       9.58mil; 52.13mil
+       9.55mil; 47.72mil
+       18.4mil; 47.72mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:e {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       0.0mil; 58.76mil
+       0.09mil; 57.21mil
+       0.43mil; 55.75mil
+       0.97mil; 54.35mil
+       1.73mil; 53.04mil
+       2.71mil; 51.83mil
+       3.98mil; 50.61mil
+       5.14mil; 49.73mil
+       6.36mil; 49.0mil
+       7.6mil; 48.45mil
+       8.88mil; 48.03mil
+       10.19mil; 47.78mil
+       11.62mil; 47.69mil
+       13.2mil; 47.81mil
+       14.72mil; 48.12mil
+       16.15mil; 48.63mil
+       17.52mil; 49.36mil
+       18.8mil; 50.31mil
+       20.04mil; 51.49mil
+       20.9mil; 52.56mil
+       21.6mil; 53.59mil
+       22.14mil; 54.66mil
+       22.54mil; 55.75mil
+       22.78mil; 56.85mil
+       22.87mil; 57.97mil
+       22.87mil; 63.75mil
+       22.81mil; 64.42mil
+       22.63mil; 64.97mil
+       22.36mil; 65.39mil
+       21.96mil; 65.7mil
+       21.44mil; 65.88mil
+       20.84mil; 65.94mil
+       4.5mil; 65.94mil
+       4.5mil; 69.96mil
+       4.62mil; 71.66mil
+       5.02mil; 73.06mil
+       4.56mil; 61.62mil
+       18.52mil; 61.62mil
+       18.46mil; 60.13mil
+       18.34mil; 58.79mil
+       18.13mil; 57.58mil
+       17.85mil; 56.51mil
+       17.46mil; 55.6mil
+       17.0mil; 54.81mil
+       16.3mil; 54.02mil
+       15.54mil; 53.38mil
+       14.72mil; 52.86mil
+       13.81mil; 52.5mil
+       12.81mil; 52.28mil
+       11.71mil; 52.19mil
+       10.65mil; 52.28mil
+       9.64mil; 52.5mil
+       8.7mil; 52.86mil
+       7.79mil; 53.38mil
+       6.9mil; 54.05mil
+       6.08mil; 54.87mil
+       5.6mil; 55.54mil
+       5.23mil; 56.39mil
+       4.93mil; 57.39mil
+       4.71mil; 58.61mil
+       4.59mil; 60.01mil
+       4.56mil; 61.62mil
+       5.02mil; 73.06mil
+       5.66mil; 74.15mil
+       6.57mil; 74.95mil
+       7.76mil; 75.4mil
+       9.25mil; 75.55mil
+       20.29mil; 75.55mil
+       21.08mil; 75.65mil
+       21.75mil; 75.83mil
+       22.27mil; 76.13mil
+       22.66mil; 76.56mil
+       22.87mil; 77.11mil
+       22.96mil; 77.8mil
+       22.87mil; 78.47mil
+       22.66mil; 79.02mil
+       22.3mil; 79.45mil
+       21.78mil; 79.75mil
+       21.14mil; 79.93mil
+       20.32mil; 80.0mil
+       9.12mil; 80.0mil
+       7.91mil; 79.93mil
+       6.75mil; 79.69mil
+       5.66mil; 79.3mil
+       4.62mil; 78.72mil
+       3.62mil; 77.99mil
+       2.65mil; 77.04mil
+       1.82mil; 76.1mil
+       1.16mil; 75.1mil
+       0.64mil; 74.0mil
+       0.27mil; 72.88mil
+       0.06mil; 71.69mil
+       0.0mil; 70.38mil
+       0.0mil; 70.08mil
+       0.0mil; 69.14mil
+       0.0mil; 67.52mil
+       0.0mil; 65.3mil
+       0.0mil; 62.41mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:f {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       15.88mil; 33.82mil
+       16.58mil; 33.91mil
+       17.15mil; 34.09mil
+       17.58mil; 34.4mil
+       17.91mil; 34.82mil
+       18.1mil; 35.37mil
+       18.19mil; 36.04mil
+       18.1mil; 36.74mil
+       17.88mil; 37.32mil
+       17.55mil; 37.78mil
+       17.06mil; 38.08mil
+       16.45mil; 38.26mil
+       15.69mil; 38.32mil
+       14.35mil; 38.32mil
+       13.66mil; 38.38mil
+       13.02mil; 38.47mil
+       12.41mil; 38.66mil
+       11.83mil; 38.9mil
+       11.25mil; 39.2mil
+       10.74mil; 39.57mil
+       10.19mil; 40.09mil
+       9.76mil; 40.6mil
+       9.43mil; 41.21mil
+       9.18mil; 41.85mil
+       9.03mil; 42.52mil
+       9.0mil; 43.28mil
+       9.0mil; 47.69mil
+       15.66mil; 47.69mil
+       16.42mil; 47.78mil
+       17.06mil; 47.96mil
+       17.55mil; 48.27mil
+       17.91mil; 48.7mil
+       18.13mil; 49.24mil
+       18.22mil; 49.94mil
+       18.13mil; 50.61mil
+       17.91mil; 51.13mil
+       17.55mil; 51.55mil
+       17.06mil; 51.86mil
+       16.42mil; 52.01mil
+       15.63mil; 52.07mil
+       8.97mil; 52.07mil
+       8.97mil; 77.56mil
+       8.88mil; 78.29mil
+       8.7mil; 78.87mil
+       8.36mil; 79.3mil
+       7.94mil; 79.63mil
+       7.36mil; 79.81mil
+       6.63mil; 79.87mil
+       5.99mil; 79.81mil
+       5.47mil; 79.6mil
+       5.08mil; 79.26mil
+       4.77mil; 78.78mil
+       4.59mil; 78.14mil
+       4.56mil; 77.35mil
+       4.56mil; 52.07mil
+       2.1mil; 52.07mil
+       1.46mil; 52.01mil
+       0.91mil; 51.83mil
+       0.51mil; 51.52mil
+       0.21mil; 51.1mil
+       0.06mil; 50.55mil
+       0.0mil; 49.85mil
+       0.06mil; 49.21mil
+       0.24mil; 48.66mil
+       0.55mil; 48.24mil
+       0.97mil; 47.96mil
+       1.52mil; 47.78mil
+       2.22mil; 47.69mil
+       4.56mil; 47.69mil
+       4.56mil; 43.07mil
+       4.62mil; 41.85mil
+       4.83mil; 40.73mil
+       5.17mil; 39.63mil
+       5.66mil; 38.66mil
+       6.29mil; 37.71mil
+       7.09mil; 36.83mil
+       8.12mil; 35.92mil
+       9.18mil; 35.19mil
+       10.25mil; 34.61mil
+       11.34mil; 34.19mil
+       12.47mil; 33.91mil
+       13.66mil; 33.82mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:g {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       9.22mil; 47.84mil
+       9.52mil; 47.84mil
+       10.43mil; 47.84mil
+       11.98mil; 47.84mil
+       14.17mil; 47.84mil
+       16.94mil; 47.84mil
+       20.5mil; 47.84mil
+       21.17mil; 47.93mil
+       21.75mil; 48.15mil
+       22.2mil; 48.48mil
+       22.51mil; 48.97mil
+       22.69mil; 49.58mil
+       22.78mil; 50.34mil
+       22.78mil; 51.31mil
+       22.78mil; 54.23mil
+       22.78mil; 59.04mil
+       22.78mil; 65.82mil
+       22.78mil; 74.49mil
+       22.78mil; 85.5mil
+       22.69mil; 86.6mil
+       22.48mil; 87.66mil
+       22.11mil; 88.69mil
+       21.63mil; 89.64mil
+       20.99mil; 90.55mil
+       20.2mil; 91.43mil
+       19.31mil; 92.16mil
+       18.37mil; 92.77mil
+       17.4mil; 93.23mil
+       16.36mil; 93.56mil
+       15.27mil; 93.77mil
+       14.11mil; 93.87mil
+       13.84mil; 93.87mil
+       13.05mil; 93.87mil
+       11.74mil; 93.87mil
+       9.92mil; 93.87mil
+       7.57mil; 93.87mil
+       4.59mil; 93.87mil
+       3.86mil; 93.8mil
+       3.25mil; 93.62mil
+       2.8mil; 93.32mil
+       2.46mil; 92.89mil
+       2.28mil; 92.38mil
+       2.22mil; 91.71mil
+       2.28mil; 91.01mil
+       2.49mil; 90.46mil
+       2.83mil; 90.0mil
+       3.31mil; 89.7mil
+       3.92mil; 89.52mil
+       4.71mil; 89.45mil
+       4.9mil; 89.45mil
+       5.54mil; 89.45mil
+       6.6mil; 89.45mil
+       8.06mil; 89.45mil
+       9.98mil; 89.45mil
+
+       9.58mil; 52.28mil
+       8.88mil; 52.35mil
+       8.21mil; 52.44mil
+       7.6mil; 52.62mil
+       7.0mil; 52.89mil
+       6.45mil; 53.23mil
+       5.9mil; 53.62mil
+       5.41mil; 54.11mil
+       5.02mil; 54.66mil
+       4.71mil; 55.27mil
+       4.47mil; 55.9mil
+       4.35mil; 56.6mil
+       4.32mil; 57.39mil
+       4.32mil; 70.08mil
+       4.35mil; 70.96mil
+       4.44mil; 71.75mil
+       4.62mil; 72.48mil
+       4.9mil; 73.15mil
+       5.23mil; 73.73mil
+       5.66mil; 74.25mil
+       6.08mil; 74.67mil
+       6.6mil; 75.01mil
+       7.18mil; 75.25mil
+       7.82mil; 75.46mil
+       8.55mil; 75.55mil
+       9.37mil; 75.58mil
+       18.37mil; 75.58mil
+       18.37mil; 52.28mil
+       9.58mil; 52.28mil
+
+       9.98mil; 89.45mil
+       12.38mil; 89.45mil
+       14.14mil; 89.33mil
+       15.63mil; 88.97mil
+       16.76mil; 88.36mil
+       17.58mil; 87.54mil
+       18.1mil; 86.47mil
+       18.28mil; 85.14mil
+       18.28mil; 80.0mil
+       18.01mil; 80.0mil
+       17.19mil; 80.0mil
+       15.82mil; 80.0mil
+       13.93mil; 80.0mil
+       11.5mil; 80.0mil
+       8.43mil; 80.0mil
+       7.21mil; 79.93mil
+       6.08mil; 79.72mil
+       5.05mil; 79.33mil
+       4.08mil; 78.81mil
+       3.19mil; 78.11mil
+       2.34mil; 77.23mil
+       1.61mil; 76.31mil
+       1.03mil; 75.31mil
+       0.58mil; 74.25mil
+       0.24mil; 73.15mil
+       0.06mil; 71.96mil
+       0.0mil; 70.69mil
+       0.0mil; 70.32mil
+       0.0mil; 69.17mil
+       0.0mil; 67.25mil
+       0.0mil; 64.57mil
+       0.0mil; 61.14mil
+       0.0mil; 56.76mil
+       0.06mil; 55.57mil
+       0.27mil; 54.41mil
+       0.61mil; 53.35mil
+       1.09mil; 52.35mil
+       1.73mil; 51.43mil
+       2.55mil; 50.52mil
+       3.47mil; 49.73mil
+       4.47mil; 49.06mil
+       5.57mil; 48.54mil
+       6.69mil; 48.15mil
+       7.88mil; 47.93mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:h {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.62mil
+       0.06mil; 35.8mil
+       0.24mil; 35.13mil
+       0.55mil; 34.61mil
+       0.97mil; 34.25mil
+       1.55mil; 34.0mil
+       2.28mil; 33.91mil
+       2.92mil; 34.0mil
+       3.47mil; 34.22mil
+       3.89mil; 34.58mil
+       4.16mil; 35.07mil
+       4.35mil; 35.71mil
+       4.44mil; 36.5mil
+       4.44mil; 47.75mil
+       13.87mil; 47.75mil
+       15.02mil; 47.84mil
+       16.18mil; 48.09mil
+       17.31mil; 48.45mil
+       18.37mil; 49.0mil
+       19.4mil; 49.7mil
+       20.47mil; 50.58mil
+       21.17mil; 51.4mil
+       21.78mil; 52.28mil
+       22.23mil; 53.26mil
+       22.57mil; 54.35mil
+       22.75mil; 55.54mil
+       22.84mil; 56.85mil
+       22.84mil; 77.44mil
+       22.78mil; 78.17mil
+       22.6mil; 78.78mil
+       22.32mil; 79.23mil
+       21.93mil; 79.57mil
+       21.44mil; 79.75mil
+       20.83mil; 79.81mil
+       20.1mil; 79.75mil
+       19.53mil; 79.57mil
+       19.07mil; 79.23mil
+       18.74mil; 78.75mil
+       18.55mil; 78.17mil
+       18.49mil; 77.38mil
+       18.49mil; 57.36mil
+       18.34mil; 55.78mil
+       17.88mil; 54.47mil
+       17.15mil; 53.47mil
+       16.12mil; 52.74mil
+       14.81mil; 52.31mil
+       13.14mil; 52.13mil
+       4.44mil; 52.13mil
+       4.44mil; 77.35mil
+       4.35mil; 78.11mil
+       4.16mil; 78.72mil
+       3.86mil; 79.2mil
+       3.4mil; 79.54mil
+       2.83mil; 79.75mil
+       2.13mil; 79.81mil
+       1.46mil; 79.75mil
+       0.94mil; 79.54mil
+       0.51mil; 79.17mil
+       0.21mil; 78.69mil
+       0.06mil; 78.02mil
+       0.0mil; 77.2mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:i {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.47mil; 50.19mil
+       4.47mil; 77.32mil
+       4.41mil; 78.11mil
+       4.23mil; 78.72mil
+       3.92mil; 79.23mil
+       3.5mil; 79.57mil
+       2.95mil; 79.78mil
+       2.28mil; 79.84mil
+       1.58mil; 79.78mil
+       1.0mil; 79.6mil
+       0.55mil; 79.23mil
+       0.24mil; 78.78mil
+       0.06mil; 78.17mil
+       0.0mil; 77.38mil
+       0.0mil; 50.22mil
+       0.06mil; 49.49mil
+       0.24mil; 48.85mil
+       0.55mil; 48.36mil
+       0.97mil; 48.03mil
+       1.52mil; 47.81mil
+       2.25mil; 47.72mil
+       2.92mil; 47.81mil
+       3.47mil; 48.0mil
+       3.89mil; 48.36mil
+       4.2mil; 48.82mil
+       4.38mil; 49.43mil
+     }
+     li:simplepoly.1 {
+       0.09mil; 36.04mil
+       0.12mil; 35.4mil
+       0.3mil; 34.89mil
+       0.61mil; 34.46mil
+       1.0mil; 34.16mil
+       1.52mil; 34.0mil
+       2.19mil; 33.91mil
+       2.86mil; 34.0mil
+       3.4mil; 34.19mil
+       3.86mil; 34.49mil
+       4.16mil; 34.92mil
+       4.35mil; 35.49mil
+       4.44mil; 36.19mil
+       4.44mil; 38.17mil
+       4.35mil; 38.9mil
+       4.16mil; 39.51mil
+       3.86mil; 39.97mil
+       3.4mil; 40.3mil
+       2.83mil; 40.48mil
+       2.13mil; 40.54mil
+       1.49mil; 40.48mil
+       0.97mil; 40.3mil
+       0.58mil; 40.0mil
+       0.3mil; 39.57mil
+       0.12mil; 39.02mil
+       0.09mil; 38.32mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:j {
+    width=13mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       9.15mil; 50.22mil
+       9.18mil; 49.55mil
+       9.36mil; 48.97mil
+       9.67mil; 48.51mil
+       10.09mil; 48.21mil
+       10.64mil; 48.03mil
+       11.34mil; 47.93mil
+       11.98mil; 48.03mil
+       12.52mil; 48.21mil
+       12.98mil; 48.51mil
+       13.28mil; 48.94mil
+       13.47mil; 49.49mil
+       13.56mil; 50.19mil
+       13.56mil; 85.2mil
+       13.47mil; 86.26mil
+       13.25mil; 87.3mil
+       12.92mil; 88.27mil
+       12.43mil; 89.24mil
+       11.82mil; 90.12mil
+       11.06mil; 91.04mil
+       10.12mil; 91.89mil
+       9.15mil; 92.59mil
+       8.14mil; 93.14mil
+       7.11mil; 93.53mil
+       6.05mil; 93.77mil
+       4.95mil; 93.87mil
+       2.31mil; 93.87mil
+       1.61mil; 93.77mil
+       1.04mil; 93.59mil
+       0.61mil; 93.29mil
+       0.28mil; 92.86mil
+       0.09mil; 92.31mil
+       0.0mil; 91.61mil
+       0.06mil; 90.95mil
+       0.25mil; 90.4mil
+       0.55mil; 89.97mil
+       0.98mil; 89.7mil
+       1.49mil; 89.52mil
+       2.16mil; 89.45mil
+       4.8mil; 89.45mil
+       5.29mil; 89.39mil
+       5.8mil; 89.27mil
+       6.29mil; 89.06mil
+       6.81mil; 88.76mil
+       7.29mil; 88.36mil
+       7.84mil; 87.87mil
+       8.24mil; 87.39mil
+       8.54mil; 86.93mil
+       8.81mil; 86.44mil
+       9.0mil; 85.93mil
+       9.09mil; 85.41mil
+       9.15mil; 84.86mil
+     }
+     li:simplepoly.1 {
+       9.15mil; 36.38mil
+       9.21mil; 35.65mil
+       9.39mil; 35.04mil
+       9.73mil; 34.55mil
+       10.18mil; 34.22mil
+       10.79mil; 34.0mil
+       11.55mil; 33.91mil
+       12.16mil; 34.0mil
+       12.65mil; 34.22mil
+       13.04mil; 34.58mil
+       13.32mil; 35.07mil
+       13.5mil; 35.74mil
+       13.56mil; 36.53mil
+       13.56mil; 38.41mil
+       13.5mil; 39.08mil
+       13.32mil; 39.63mil
+       13.01mil; 40.06mil
+       12.59mil; 40.36mil
+       12.04mil; 40.54mil
+       11.37mil; 40.6mil
+       10.7mil; 40.57mil
+       10.15mil; 40.39mil
+       9.7mil; 40.12mil
+       9.39mil; 39.72mil
+       9.21mil; 39.2mil
+       9.15mil; 38.57mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:k {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.53mil
+       0.03mil; 35.8mil
+       0.21mil; 35.19mil
+       0.51mil; 34.7mil
+       0.94mil; 34.37mil
+       1.46mil; 34.16mil
+       2.16mil; 34.06mil
+       2.83mil; 34.16mil
+       3.37mil; 34.34mil
+       3.8mil; 34.7mil
+       4.1mil; 35.16mil
+       4.29mil; 35.77mil
+       4.38mil; 36.53mil
+       4.38mil; 59.55mil
+       18.98mil; 48.54mil
+       19.28mil; 48.36mil
+       19.59mil; 48.21mil
+       19.92mil; 48.12mil
+       20.23mil; 48.03mil
+       20.53mil; 47.96mil
+       20.86mil; 47.93mil
+       21.5mil; 48.0mil
+       22.05mil; 48.18mil
+       22.48mil; 48.48mil
+       22.75mil; 48.88mil
+       22.93mil; 49.43mil
+       23.02mil; 50.06mil
+       22.99mil; 50.43mil
+       22.9mil; 50.73mil
+       22.75mil; 51.04mil
+       22.57mil; 51.34mil
+       22.29mil; 51.62mil
+       21.99mil; 51.89mil
+       13.17mil; 58.55mil
+       22.6mil; 76.59mil
+       22.69mil; 76.83mil
+       22.78mil; 77.04mil
+       22.84mil; 77.26mil
+       22.9mil; 77.44mil
+       22.93mil; 77.65mil
+       22.96mil; 77.84mil
+       22.87mil; 78.5mil
+       22.69mil; 79.05mil
+       22.35mil; 79.48mil
+       21.9mil; 79.75mil
+       21.32mil; 79.93mil
+       20.59mil; 80.0mil
+       20.2mil; 79.96mil
+       19.86mil; 79.87mil
+       19.56mil; 79.72mil
+       19.28mil; 79.48mil
+       19.01mil; 79.17mil
+       18.8mil; 78.78mil
+       9.61mil; 61.2mil
+       4.53mil; 65.15mil
+       4.53mil; 77.59mil
+       4.44mil; 78.32mil
+       4.26mil; 78.9mil
+       3.95mil; 79.33mil
+       3.53mil; 79.66mil
+       2.98mil; 79.84mil
+       2.28mil; 79.9mil
+       1.58mil; 79.84mil
+       1.0mil; 79.66mil
+       0.55mil; 79.36mil
+       0.24mil; 78.93mil
+       0.06mil; 78.35mil
+       0.0mil; 77.62mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:l {
+    width=9mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 36.44mil
+       0.06mil; 35.71mil
+       0.24mil; 35.13mil
+       0.58mil; 34.64mil
+       1.06mil; 34.31mil
+       1.64mil; 34.12mil
+       2.43mil; 34.03mil
+       3.04mil; 34.12mil
+       3.56mil; 34.34mil
+       3.95mil; 34.67mil
+       4.23mil; 35.16mil
+       4.41mil; 35.77mil
+       4.47mil; 36.53mil
+       4.47mil; 37.53mil
+       4.47mil; 40.45mil
+       4.47mil; 45.35mil
+       4.47mil; 52.19mil
+       4.47mil; 60.98mil
+       4.47mil; 72.12mil
+       4.5mil; 73.15mil
+       4.68mil; 74.0mil
+       4.96mil; 74.64mil
+       5.35mil; 75.13mil
+       5.87mil; 75.4mil
+       6.54mil; 75.49mil
+       7.3mil; 75.58mil
+       7.91mil; 75.77mil
+       8.42mil; 76.07mil
+       8.76mil; 76.5mil
+       8.97mil; 77.07mil
+       9.06mil; 77.77mil
+       8.97mil; 78.47mil
+       8.79mil; 79.02mil
+       8.45mil; 79.45mil
+       8.0mil; 79.75mil
+       7.42mil; 79.93mil
+       6.69mil; 80.0mil
+       5.78mil; 79.96mil
+       4.93mil; 79.78mil
+       4.1mil; 79.48mil
+       3.31mil; 79.05mil
+       2.55mil; 78.53mil
+       1.85mil; 77.84mil
+       1.28mil; 77.17mil
+       0.82mil; 76.44mil
+       0.45mil; 75.65mil
+       0.18mil; 74.79mil
+       0.03mil; 73.88mil
+       0.0mil; 72.85mil
+       0.0mil; 71.87mil
+       0.0mil; 68.86mil
+       0.0mil; 63.87mil
+       0.0mil; 56.85mil
+       0.0mil; 47.84mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:m {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 49.85mil
+       0.0mil; 49.52mil
+       0.06mil; 49.21mil
+       0.18mil; 48.88mil
+       0.33mil; 48.6mil
+       0.52mil; 48.33mil
+       0.79mil; 48.06mil
+       0.94mil; 47.93mil
+       1.19mil; 47.81mil
+       1.46mil; 47.72mil
+       1.76mil; 47.66mil
+       2.1mil; 47.63mil
+       2.52mil; 47.6mil
+       3.07mil; 47.6mil
+       4.71mil; 47.6mil
+       7.45mil; 47.6mil
+       11.28mil; 47.6mil
+       16.21mil; 47.6mil
+       22.48mil; 47.6mil
+       23.73mil; 47.69mil
+       24.94mil; 47.87mil
+       26.07mil; 48.21mil
+       27.1mil; 48.66mil
+       28.08mil; 49.24mil
+       29.02mil; 49.97mil
+       29.93mil; 50.95mil
+       30.69mil; 51.92mil
+       31.3mil; 52.98mil
+       31.73mil; 54.05mil
+       32.0mil; 55.2mil
+       32.09mil; 56.39mil
+       32.09mil; 56.97mil
+       32.09mil; 58.7mil
+       32.09mil; 61.56mil
+       32.09mil; 65.55mil
+       32.09mil; 70.69mil
+       32.09mil; 77.2mil
+       32.03mil; 78.02mil
+       31.85mil; 78.69mil
+       31.54mil; 79.2mil
+       31.15mil; 79.6mil
+       30.6mil; 79.81mil
+       29.96mil; 79.87mil
+       29.23mil; 79.81mil
+       28.65mil; 79.6mil
+       28.2mil; 79.2mil
+       27.86mil; 78.69mil
+       27.68mil; 77.99mil
+       27.62mil; 77.11mil
+       27.62mil; 76.56mil
+       27.62mil; 74.88mil
+       27.62mil; 72.12mil
+       27.62mil; 68.22mil
+       27.62mil; 63.2mil
+       27.62mil; 56.85mil
+       27.56mil; 56.18mil
+       27.47mil; 55.57mil
+       27.28mil; 54.99mil
+       27.04mil; 54.47mil
+       26.74mil; 53.99mil
+       26.34mil; 53.53mil
+       25.82mil; 53.11mil
+       25.25mil; 52.77mil
+       24.67mil; 52.47mil
+       24.03mil; 52.28mil
+       23.36mil; 52.16mil
+       22.63mil; 52.1mil
+       18.31mil; 52.1mil
+       18.31mil; 77.14mil
+       18.25mil; 77.96mil
+       18.07mil; 78.63mil
+       17.76mil; 79.14mil
+       17.34mil; 79.51mil
+       16.82mil; 79.72mil
+       16.15mil; 79.78mil
+       15.39mil; 79.72mil
+       14.78mil; 79.54mil
+       14.33mil; 79.2mil
+       13.99mil; 78.72mil
+       13.78mil; 78.14mil
+       13.72mil; 77.35mil
+       13.72mil; 52.1mil
+       4.38mil; 52.1mil
+       4.38mil; 77.5mil
+       4.32mil; 78.23mil
+       4.14mil; 78.81mil
+       3.83mil; 79.23mil
+       3.41mil; 79.57mil
+       2.86mil; 79.75mil
+       2.19mil; 79.81mil
+       1.52mil; 79.78mil
+       0.97mil; 79.6mil
+       0.55mil; 79.3mil
+       0.24mil; 78.87mil
+       0.06mil; 78.35mil
+       0.0mil; 77.65mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:n {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 49.94mil
+       0.06mil; 49.27mil
+       0.24mil; 48.7mil
+       0.55mil; 48.24mil
+       0.97mil; 47.93mil
+       1.52mil; 47.75mil
+       2.22mil; 47.66mil
+       2.52mil; 47.66mil
+       3.5mil; 47.66mil
+       5.11mil; 47.66mil
+       7.36mil; 47.66mil
+       10.25mil; 47.66mil
+       13.93mil; 47.66mil
+       15.12mil; 47.75mil
+       16.27mil; 48.0mil
+       17.4mil; 48.39mil
+       18.49mil; 48.97mil
+       19.53mil; 49.7mil
+       20.59mil; 50.61mil
+       21.26mil; 51.4mil
+       21.81mil; 52.25mil
+       22.27mil; 53.17mil
+       22.57mil; 54.2mil
+       22.75mil; 55.27mil
+       22.84mil; 56.45mil
+       22.84mil; 57.03mil
+       22.84mil; 58.7mil
+       22.84mil; 61.5mil
+       22.84mil; 65.42mil
+       22.84mil; 70.47mil
+       22.84mil; 76.86mil
+       22.78mil; 77.77mil
+       22.6mil; 78.5mil
+       22.3mil; 79.05mil
+       21.9mil; 79.48mil
+       21.35mil; 79.72mil
+       20.71mil; 79.78mil
+       19.98mil; 79.72mil
+       19.41mil; 79.48mil
+       18.98mil; 79.05mil
+       18.65mil; 78.47mil
+       18.46mil; 77.74mil
+       18.4mil; 76.8mil
+       18.4mil; 76.25mil
+       18.4mil; 74.61mil
+       18.4mil; 71.87mil
+       18.4mil; 68.04mil
+       18.4mil; 63.08mil
+       18.4mil; 56.82mil
+       18.34mil; 56.12mil
+       18.25mil; 55.48mil
+       18.1mil; 54.9mil
+       17.85mil; 54.38mil
+       17.58mil; 53.96mil
+       17.22mil; 53.53mil
+       16.73mil; 53.14mil
+       16.21mil; 52.8mil
+       15.73mil; 52.56mil
+       15.18mil; 52.35mil
+       14.63mil; 52.25mil
+       14.08mil; 52.19mil
+       13.81mil; 52.19mil
+       12.99mil; 52.19mil
+       11.65mil; 52.19mil
+       9.76mil; 52.19mil
+       7.33mil; 52.19mil
+       4.29mil; 52.19mil
+       4.29mil; 77.2mil
+       4.23mil; 77.99mil
+       4.04mil; 78.63mil
+       3.74mil; 79.11mil
+       3.35mil; 79.48mil
+       2.8mil; 79.69mil
+       2.16mil; 79.75mil
+       1.49mil; 79.69mil
+       0.94mil; 79.48mil
+       0.52mil; 79.14mil
+       0.24mil; 78.66mil
+       0.06mil; 78.02mil
+       0.0mil; 77.23mil
+       0.0mil; 76.5mil
+       0.0mil; 74.25mil
+       0.0mil; 70.5mil
+       0.0mil; 65.24mil
+       0.0mil; 58.49mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:o {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       11.04mil; 47.66mil
+       12.65mil; 47.75mil
+       14.2mil; 48.03mil
+       15.63mil; 48.45mil
+       16.97mil; 49.09mil
+       18.19mil; 49.88mil
+       19.38mil; 50.85mil
+       20.41mil; 52.01mil
+       21.23mil; 53.17mil
+       21.9mil; 54.32mil
+       22.39mil; 55.54mil
+       22.66mil; 56.76mil
+       22.78mil; 58.03mil
+       22.78mil; 68.62mil
+       22.66mil; 70.26mil
+       22.36mil; 71.81mil
+       21.87mil; 73.24mil
+       21.14mil; 74.58mil
+       20.23mil; 75.8mil
+       19.1mil; 76.95mil
+       17.98mil; 77.8mil
+       16.82mil; 78.5mil
+       15.57mil; 79.05mil
+       14.27mil; 79.45mil
+       12.87mil; 79.69mil
+       11.38mil; 79.75mil
+       9.82mil; 79.69mil
+       8.36mil; 79.45mil
+       7.03mil; 79.05mil
+       5.81mil; 78.47mil
+       4.71mil; 77.77mil
+       3.68mil; 76.83mil
+       2.55mil; 75.58mil
+       1.64mil; 74.28mil
+       0.91mil; 72.91mil
+       0.39mil; 71.51mil
+       0.09mil; 70.05mil
+       0.0mil; 68.47mil
+       0.0mil; 58.52mil
+       0.09mil; 56.94mil
+       0.46mil; 55.45mil
+       1.03mil; 54.02mil
+       1.85mil; 52.68mil
+       2.89mil; 51.43mil
+       4.23mil; 50.19mil
+       5.26mil; 49.43mil
+       6.33mil; 48.82mil
+       7.45mil; 48.3mil
+       6.78mil; 53.77mil
+       6.02mil; 54.44mil
+       5.41mil; 55.2mil
+       4.96mil; 56.06mil
+       4.62mil; 57.03mil
+       4.41mil; 58.12mil
+       4.35mil; 59.34mil
+       4.35mil; 59.62mil
+       4.35mil; 60.38mil
+       4.35mil; 61.65mil
+       4.35mil; 63.45mil
+       4.35mil; 65.76mil
+       4.35mil; 68.68mil
+       4.44mil; 69.81mil
+       4.71mil; 70.84mil
+       5.17mil; 71.78mil
+       5.81mil; 72.66mil
+       6.63mil; 73.49mil
+       7.7mil; 74.22mil
+       8.33mil; 74.61mil
+       8.97mil; 74.92mil
+       9.61mil; 75.13mil
+       10.25mil; 75.31mil
+       10.92mil; 75.4mil
+       11.59mil; 75.43mil
+       12.23mil; 75.4mil
+       12.87mil; 75.31mil
+       13.5mil; 75.13mil
+       14.17mil; 74.85mil
+       14.81mil; 74.52mil
+       15.51mil; 74.09mil
+       16.39mil; 73.39mil
+       17.16mil; 72.51mil
+       17.73mil; 71.54mil
+       18.13mil; 70.41mil
+       18.4mil; 69.17mil
+       18.49mil; 67.74mil
+       18.49mil; 59.98mil
+       18.4mil; 58.76mil
+       18.22mil; 57.64mil
+       17.92mil; 56.6mil
+       17.49mil; 55.66mil
+       16.91mil; 54.84mil
+       16.21mil; 54.05mil
+       15.45mil; 53.44mil
+       14.72mil; 52.95mil
+       13.96mil; 52.56mil
+       13.2mil; 52.28mil
+       12.41mil; 52.1mil
+       11.59mil; 52.04mil
+       10.77mil; 52.1mil
+       9.98mil; 52.25mil
+       9.16mil; 52.5mil
+       8.36mil; 52.83mil
+       7.57mil; 53.26mil
+       6.78mil; 53.77mil
+       7.45mil; 48.3mil
+       8.61mil; 47.96mil
+       9.76mil; 47.75mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:p {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       0.0mil; 50.52mil
+       0.06mil; 49.76mil
+       0.27mil; 49.09mil
+       0.64mil; 48.6mil
+       1.12mil; 48.24mil
+       1.76mil; 48.03mil
+       2.58mil; 47.93mil
+       2.89mil; 47.93mil
+       3.86mil; 47.93mil
+       5.47mil; 47.93mil
+       7.75mil; 47.93mil
+       10.64mil; 47.93mil
+       14.35mil; 47.93mil
+       15.48mil; 48.03mil
+       16.58mil; 48.27mil
+       17.64mil; 48.7mil
+       18.67mil; 49.27mil
+       19.65mil; 50.0mil
+       20.65mil; 50.95mil
+       21.38mil; 51.86mil
+       21.99mil; 52.8mil
+       22.45mil; 53.81mil
+       22.78mil; 54.87mil
+       22.99mil; 56.0mil
+       23.08mil; 57.21mil
+       23.08mil; 57.58mil
+       23.08mil; 58.64mil
+       23.08mil; 60.41mil
+       23.08mil; 62.87mil
+       23.08mil; 66.03mil
+       23.08mil; 70.05mil
+       23.02mil; 71.45mil
+       22.84mil; 72.73mil
+       22.54mil; 73.91mil
+       22.11mil; 74.98mil
+       21.59mil; 75.98mil
+       20.93mil; 76.86mil
+       19.98mil; 77.84mil
+       19.01mil; 78.6mil
+       17.94mil; 79.2mil
+       16.85mil; 79.66mil
+       15.69mil; 79.9mil
+       14.45mil; 80.0mil
+       14.23mil; 75.61mil
+       14.87mil; 75.58mil
+       15.48mil; 75.43mil
+       16.06mil; 75.16mil
+       16.61mil; 74.82mil
+       17.12mil; 74.37mil
+       17.64mil; 73.76mil
+       17.91mil; 73.36mil
+       18.13mil; 72.91mil
+       18.31mil; 72.42mil
+       18.43mil; 71.87mil
+       18.52mil; 71.33mil
+       18.55mil; 70.69mil
+       18.55mil; 57.36mil
+       18.49mil; 56.66mil
+       18.4mil; 56.03mil
+       18.22mil; 55.42mil
+       17.97mil; 54.84mil
+       17.67mil; 54.32mil
+       17.28mil; 53.81mil
+       16.79mil; 53.38mil
+       16.3mil; 53.04mil
+       15.75mil; 52.74mil
+       15.18mil; 52.56mil
+       14.57mil; 52.44mil
+       13.9mil; 52.38mil
+       4.47mil; 52.38mil
+       4.47mil; 75.61mil
+       14.23mil; 75.61mil
+       14.45mil; 80.0mil
+       4.47mil; 80.0mil
+       4.47mil; 91.1mil
+       4.38mil; 91.92mil
+       4.2mil; 92.62mil
+       3.86mil; 93.14mil
+       3.4mil; 93.53mil
+       2.83mil; 93.77mil
+       2.1mil; 93.87mil
+       1.46mil; 93.77mil
+       0.91mil; 93.53mil
+       0.51mil; 93.14mil
+       0.21mil; 92.59mil
+       0.06mil; 91.86mil
+       0.0mil; 90.98mil
+       0.0mil; 89.85mil
+       0.0mil; 86.5mil
+       0.0mil; 80.97mil
+       0.0mil; 73.21mil
+       0.0mil; 63.2mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:q {
+    width=23mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.1 {
+       23.09mil; 50.64mil
+       23.09mil; 91.1mil
+       23.03mil; 91.95mil
+       22.84mil; 92.68mil
+       22.54mil; 93.23mil
+       22.14mil; 93.65mil
+       21.63mil; 93.9mil
+       20.99mil; 93.99mil
+       20.26mil; 93.9mil
+       19.65mil; 93.68mil
+       19.19mil; 93.29mil
+       18.86mil; 92.77mil
+       18.68mil; 92.07mil
+       18.62mil; 91.22mil
+       18.62mil; 80.12mil
+       8.64mil; 80.12mil
+       8.85mil; 75.74mil
+       9.09mil; 75.74mil
+       9.92mil; 75.74mil
+       11.25mil; 75.74mil
+       13.14mil; 75.74mil
+       15.54mil; 75.74mil
+       18.62mil; 75.74mil
+       18.62mil; 52.5mil
+       9.19mil; 52.5mil
+       8.52mil; 52.56mil
+       7.91mil; 52.68mil
+       7.33mil; 52.86mil
+       6.78mil; 53.14mil
+       6.27mil; 53.5mil
+       5.81mil; 53.93mil
+       5.41mil; 54.41mil
+       5.08mil; 54.93mil
+       4.84mil; 55.51mil
+       4.65mil; 56.12mil
+       4.56mil; 56.79mil
+       4.53mil; 57.49mil
+       4.53mil; 70.81mil
+       4.53mil; 71.42mil
+       4.62mil; 72.0mil
+       4.74mil; 72.51mil
+       4.93mil; 73.0mil
+       5.14mil; 73.46mil
+       5.44mil; 73.88mil
+       5.9mil; 74.46mil
+       6.42mil; 74.92mil
+       6.97mil; 75.28mil
+       7.54mil; 75.55mil
+       8.15mil; 75.71mil
+       8.85mil; 75.74mil
+       8.64mil; 80.12mil
+       7.39mil; 80.03mil
+       6.23mil; 79.78mil
+       5.14mil; 79.36mil
+       4.08mil; 78.75mil
+       3.1mil; 77.99mil
+       2.16mil; 76.98mil
+       1.49mil; 76.13mil
+       0.94mil; 75.16mil
+       0.52mil; 74.06mil
+       0.24mil; 72.88mil
+       0.06mil; 71.6mil
+       0.0mil; 70.17mil
+       0.0mil; 57.33mil
+       0.06mil; 56.15mil
+       0.24mil; 55.02mil
+       0.58mil; 53.96mil
+       1.06mil; 52.92mil
+       1.64mil; 51.98mil
+       2.43mil; 51.07mil
+       3.38mil; 50.19mil
+       4.35mil; 49.46mil
+       5.38mil; 48.88mil
+       6.45mil; 48.48mil
+       7.54mil; 48.21mil
+       8.73mil; 48.12mil
+       20.5mil; 48.12mil
+       21.26mil; 48.21mil
+       21.93mil; 48.42mil
+       22.42mil; 48.76mil
+       22.78mil; 49.24mil
+       23.0mil; 49.88mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:r {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 50.22mil
+       0.06mil; 49.49mil
+       0.27mil; 48.85mil
+       0.64mil; 48.36mil
+       1.12mil; 48.03mil
+       1.76mil; 47.81mil
+       2.58mil; 47.72mil
+       2.92mil; 47.72mil
+       4.01mil; 47.72mil
+       5.84mil; 47.72mil
+       8.39mil; 47.72mil
+       11.65mil; 47.72mil
+       15.82mil; 47.72mil
+       16.58mil; 47.78mil
+       17.22mil; 47.96mil
+       17.7mil; 48.27mil
+       18.07mil; 48.66mil
+       18.28mil; 49.18mil
+       18.37mil; 49.82mil
+       18.37mil; 49.97mil
+       18.37mil; 50.34mil
+       18.37mil; 50.95mil
+       18.37mil; 51.8mil
+       18.37mil; 52.89mil
+       18.37mil; 54.29mil
+       18.31mil; 55.08mil
+       18.13mil; 55.69mil
+       17.85mil; 56.21mil
+       17.46mil; 56.54mil
+       16.97mil; 56.76mil
+       16.36mil; 56.82mil
+       15.6mil; 56.76mil
+       15.0mil; 56.57mil
+       14.54mil; 56.24mil
+       14.2mil; 55.78mil
+       13.99mil; 55.2mil
+       13.93mil; 54.44mil
+       13.93mil; 54.38mil
+       13.93mil; 54.2mil
+       13.93mil; 53.9mil
+       13.93mil; 53.47mil
+       13.93mil; 52.92mil
+       13.93mil; 52.19mil
+       4.5mil; 52.19mil
+       4.5mil; 77.5mil
+       4.41mil; 78.26mil
+       4.23mil; 78.84mil
+       3.89mil; 79.33mil
+       3.47mil; 79.66mil
+       2.89mil; 79.84mil
+       2.16mil; 79.9mil
+       1.49mil; 79.84mil
+       0.94mil; 79.63mil
+       0.52mil; 79.3mil
+       0.24mil; 78.81mil
+       0.06mil; 78.2mil
+       0.0mil; 77.41mil
+       0.0mil; 76.68mil
+       0.0mil; 74.43mil
+       0.0mil; 70.69mil
+       0.0mil; 65.49mil
+       0.0mil; 58.76mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:s {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       19.1mil; 50.0mil
+       19.53mil; 50.28mil
+       19.89mil; 50.58mil
+       20.16mil; 50.92mil
+       20.38mil; 51.25mil
+       20.5mil; 51.62mil
+       20.56mil; 51.98mil
+       20.5mil; 52.71mil
+       20.32mil; 53.32mil
+       20.01mil; 53.77mil
+       19.62mil; 54.11mil
+       19.1mil; 54.29mil
+       18.46mil; 54.35mil
+       18.25mil; 54.35mil
+       18.0mil; 54.32mil
+       17.73mil; 54.26mil
+       17.43mil; 54.17mil
+       17.09mil; 54.05mil
+       16.73mil; 53.9mil
+       15.21mil; 53.38mil
+       13.78mil; 52.92mil
+       12.41mil; 52.56mil
+       11.13mil; 52.31mil
+       9.91mil; 52.16mil
+       8.73mil; 52.1mil
+       7.42mil; 52.22mil
+       6.35mil; 52.53mil
+       5.5mil; 53.04mil
+       4.92mil; 53.77mil
+       4.56mil; 54.69mil
+       4.44mil; 55.84mil
+       4.5mil; 56.54mil
+       4.68mil; 57.18mil
+       4.99mil; 57.73mil
+       5.41mil; 58.25mil
+       5.99mil; 58.67mil
+       6.72mil; 59.07mil
+       17.94mil; 64.33mil
+       19.43mil; 65.18mil
+       20.68mil; 66.15mil
+       21.65mil; 67.31mil
+       22.35mil; 68.59mil
+       22.78mil; 70.05mil
+       22.93mil; 71.69mil
+       22.81mil; 73.0mil
+       22.51mil; 74.25mil
+       22.02mil; 75.4mil
+       21.32mil; 76.5mil
+       20.44mil; 77.53mil
+       19.31mil; 78.5mil
+       18.67mil; 78.93mil
+       18.0mil; 79.26mil
+       17.27mil; 79.54mil
+       16.48mil; 79.72mil
+       15.66mil; 79.84mil
+       14.75mil; 79.87mil
+       12.83mil; 79.81mil
+       10.83mil; 79.63mil
+       8.76mil; 79.33mil
+       6.6mil; 78.87mil
+       4.38mil; 78.29mil
+       1.97mil; 77.56mil
+       1.37mil; 77.35mil
+       0.88mil; 77.07mil
+       0.48mil; 76.74mil
+       0.21mil; 76.34mil
+       0.03mil; 75.92mil
+       0.0mil; 75.43mil
+       0.03mil; 74.76mil
+       0.21mil; 74.22mil
+       0.48mil; 73.76mil
+       0.88mil; 73.46mil
+       1.37mil; 73.27mil
+       2.0mil; 73.18mil
+       2.37mil; 73.21mil
+       2.8mil; 73.24mil
+       3.19mil; 73.3mil
+       3.59mil; 73.42mil
+       4.01mil; 73.52mil
+       4.44mil; 73.67mil
+       5.96mil; 74.22mil
+       7.51mil; 74.67mil
+       9.09mil; 75.01mil
+       10.7mil; 75.25mil
+       12.35mil; 75.4mil
+       14.11mil; 75.43mil
+       14.66mil; 75.43mil
+       15.21mil; 75.37mil
+       15.66mil; 75.31mil
+       16.09mil; 75.19mil
+       16.48mil; 75.04mil
+       16.85mil; 74.82mil
+       17.33mil; 74.46mil
+       17.73mil; 74.03mil
+       18.03mil; 73.55mil
+       18.25mil; 73.0mil
+       18.4mil; 72.36mil
+       18.46mil; 71.66mil
+       18.37mil; 71.02mil
+       18.13mil; 70.38mil
+       17.76mil; 69.81mil
+       17.21mil; 69.26mil
+       16.51mil; 68.74mil
+       15.63mil; 68.25mil
+       4.86mil; 63.11mil
+       3.37mil; 62.29mil
+       2.16mil; 61.26mil
+       1.21mil; 60.07mil
+       0.54mil; 58.73mil
+       0.12mil; 57.24mil
+       0.0mil; 55.48mil
+       0.03mil; 54.5mil
+       0.21mil; 53.53mil
+       0.51mil; 52.62mil
+       0.94mil; 51.77mil
+       1.46mil; 50.95mil
+       2.16mil; 50.12mil
+       2.95mil; 49.39mil
+       3.83mil; 48.79mil
+       4.77mil; 48.3mil
+       5.81mil; 47.96mil
+       6.9mil; 47.75mil
+       8.12mil; 47.66mil
+       10.22mil; 47.75mil
+       12.22mil; 47.93mil
+       14.11mil; 48.27mil
+       15.87mil; 48.7mil
+       17.52mil; 49.27mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:t {
+    width=18mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       4.56mil; 36.35mil
+       4.62mil; 35.65mil
+       4.81mil; 35.07mil
+       5.11mil; 34.64mil
+       5.54mil; 34.31mil
+       6.11mil; 34.12mil
+       6.84mil; 34.03mil
+       7.45mil; 34.12mil
+       8.0mil; 34.31mil
+       8.4mil; 34.64mil
+       8.7mil; 35.13mil
+       8.85mil; 35.71mil
+       8.94mil; 36.47mil
+       8.94mil; 36.8mil
+       8.94mil; 37.74mil
+       8.94mil; 39.33mil
+       8.94mil; 41.52mil
+       8.94mil; 44.35mil
+       8.94mil; 47.93mil
+       9.13mil; 47.93mil
+       9.7mil; 47.93mil
+       10.65mil; 47.93mil
+       11.98mil; 47.93mil
+       13.72mil; 47.93mil
+       15.91mil; 47.93mil
+       16.61mil; 48.03mil
+       17.22mil; 48.21mil
+       17.67mil; 48.54mil
+       18.01mil; 49.0mil
+       18.19mil; 49.58mil
+       18.28mil; 50.31mil
+       18.19mil; 50.92mil
+       18.01mil; 51.4mil
+       17.67mil; 51.77mil
+       17.19mil; 52.04mil
+       16.61mil; 52.22mil
+       15.85mil; 52.25mil
+       8.94mil; 52.25mil
+       8.94mil; 77.65mil
+       8.88mil; 78.38mil
+       8.7mil; 78.96mil
+       8.4mil; 79.42mil
+       7.97mil; 79.75mil
+       7.42mil; 79.93mil
+       6.75mil; 80.0mil
+       6.08mil; 79.93mil
+       5.54mil; 79.72mil
+       5.11mil; 79.39mil
+       4.81mil; 78.9mil
+       4.62mil; 78.26mil
+       4.56mil; 77.44mil
+       4.56mil; 52.25mil
+       2.25mil; 52.25mil
+       1.55mil; 52.22mil
+       1.0mil; 52.04mil
+       0.55mil; 51.74mil
+       0.24mil; 51.34mil
+       0.06mil; 50.79mil
+       0.0mil; 50.12mil
+       0.06mil; 49.49mil
+       0.24mil; 48.94mil
+       0.55mil; 48.51mil
+       0.97mil; 48.21mil
+       1.52mil; 48.03mil
+       2.22mil; 47.93mil
+       4.56mil; 47.93mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:u {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       0.0mil; 50.46mil
+       0.03mil; 49.67mil
+       0.21mil; 49.0mil
+       0.52mil; 48.48mil
+       0.94mil; 48.12mil
+       1.49mil; 47.9mil
+       2.19mil; 47.81mil
+       2.83mil; 47.9mil
+       3.38mil; 48.12mil
+       3.8mil; 48.51mil
+       4.08mil; 49.03mil
+       4.26mil; 49.7mil
+       4.35mil; 50.52mil
+       4.35mil; 51.1mil
+       4.35mil; 52.74mil
+       4.35mil; 55.54mil
+       4.35mil; 59.4mil
+       4.35mil; 64.42mil
+       4.35mil; 70.72mil
+       4.38mil; 71.42mil
+       4.47mil; 72.03mil
+       4.65mil; 72.63mil
+       4.93mil; 73.18mil
+       5.26mil; 73.67mil
+       5.69mil; 74.12mil
+       6.14mil; 74.55mil
+       6.66mil; 74.92mil
+       7.18mil; 75.19mil
+       7.76mil; 75.37mil
+       8.3mil; 75.49mil
+       8.94mil; 75.52mil
+       18.46mil; 75.52mil
+       18.46mil; 50.34mil
+       18.52mil; 49.61mil
+       18.71mil; 49.03mil
+       19.01mil; 48.54mil
+       19.44mil; 48.21mil
+       20.01mil; 48.03mil
+       20.74mil; 47.93mil
+       21.38mil; 48.03mil
+       21.9mil; 48.21mil
+       22.33mil; 48.57mil
+       22.63mil; 49.03mil
+       22.78mil; 49.64mil
+       22.87mil; 50.4mil
+       22.87mil; 77.5mil
+       22.78mil; 78.26mil
+       22.6mil; 78.9mil
+       22.3mil; 79.39mil
+       21.87mil; 79.72mil
+       21.29mil; 79.93mil
+       20.59mil; 80.0mil
+       8.64mil; 80.0mil
+       7.45mil; 79.93mil
+       6.3mil; 79.69mil
+       5.23mil; 79.3mil
+       4.2mil; 78.75mil
+       3.25mil; 78.05mil
+       2.31mil; 77.14mil
+       1.58mil; 76.28mil
+       1.0mil; 75.37mil
+       0.58mil; 74.37mil
+       0.24mil; 73.27mil
+       0.06mil; 72.12mil
+       0.0mil; 70.81mil
+       0.0mil; 70.26mil
+       0.0mil; 68.59mil
+       0.0mil; 65.79mil
+       0.0mil; 61.87mil
+       0.0mil; 56.85mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:v {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       18.52mil; 49.55mil
+       18.7mil; 49.06mil
+       18.98mil; 48.66mil
+       19.31mil; 48.36mil
+       19.74mil; 48.15mil
+       20.19mil; 48.0mil
+       20.77mil; 47.93mil
+       21.41mil; 48.0mil
+       21.96mil; 48.15mil
+       22.38mil; 48.42mil
+       22.66mil; 48.79mil
+       22.84mil; 49.24mil
+       22.93mil; 49.82mil
+       22.9mil; 50.03mil
+       22.9mil; 50.22mil
+       22.87mil; 50.43mil
+       22.81mil; 50.64mil
+       22.78mil; 50.82mil
+       22.72mil; 51.04mil
+       22.45mil; 51.8mil
+       21.72mil; 54.02mil
+       20.47mil; 57.7mil
+       18.73mil; 62.87mil
+       16.51mil; 69.53mil
+       13.72mil; 77.93mil
+       13.44mil; 78.57mil
+       13.17mil; 79.08mil
+       12.8mil; 79.48mil
+       12.44mil; 79.78mil
+       11.98mil; 79.96mil
+       11.49mil; 80.0mil
+       10.98mil; 79.96mil
+       10.52mil; 79.81mil
+       10.13mil; 79.57mil
+       9.76mil; 79.2mil
+       9.49mil; 78.75mil
+       9.24mil; 78.17mil
+       8.97mil; 77.44mil
+       8.24mil; 75.22mil
+       7.02mil; 71.54mil
+       5.29mil; 66.37mil
+       3.07mil; 59.71mil
+       0.27mil; 51.28mil
+       0.18mil; 51.04mil
+       0.12mil; 50.79mil
+       0.06mil; 50.55mil
+       0.03mil; 50.37mil
+       0.0mil; 50.16mil
+       0.0mil; 49.97mil
+       0.06mil; 49.36mil
+       0.27mil; 48.85mil
+       0.64mil; 48.45mil
+       1.15mil; 48.18mil
+       1.79mil; 48.0mil
+       2.64mil; 47.93mil
+       3.01mil; 48.0mil
+       3.37mil; 48.18mil
+       3.71mil; 48.45mil
+       3.98mil; 48.82mil
+       4.26mil; 49.3mil
+       4.5mil; 49.91mil
+       4.68mil; 50.49mil
+       5.26mil; 52.22mil
+       6.2mil; 55.05mil
+       7.54mil; 59.07mil
+       9.27mil; 64.21mil
+       11.46mil; 70.69mil
+       11.65mil; 70.11mil
+       12.22mil; 68.38mil
+       13.2mil; 65.49mil
+       14.54mil; 61.41mil
+       16.3mil; 56.18mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:w {
+    width=32mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       27.74mil; 50.0mil
+       27.95mil; 49.36mil
+       28.22mil; 48.82mil
+       28.56mil; 48.39mil
+       28.95mil; 48.09mil
+       29.38mil; 47.9mil
+       29.93mil; 47.81mil
+       30.54mil; 47.87mil
+       31.08mil; 48.06mil
+       31.48mil; 48.33mil
+       31.78mil; 48.73mil
+       31.94mil; 49.21mil
+       32.03mil; 49.82mil
+       32.0mil; 50.03mil
+       32.0mil; 50.22mil
+       31.97mil; 50.4mil
+       31.94mil; 50.58mil
+       31.91mil; 50.79mil
+       31.87mil; 50.98mil
+       31.69mil; 51.74mil
+       31.14mil; 53.96mil
+       30.23mil; 57.64mil
+       28.99mil; 62.81mil
+       27.37mil; 69.44mil
+       25.33mil; 77.84mil
+       25.12mil; 78.5mil
+       24.85mil; 79.05mil
+       24.51mil; 79.48mil
+       24.09mil; 79.75mil
+       23.63mil; 79.93mil
+       23.08mil; 80.0mil
+       22.54mil; 79.96mil
+       22.05mil; 79.78mil
+       21.59mil; 79.51mil
+       21.23mil; 79.11mil
+       20.89mil; 78.63mil
+       20.62mil; 77.99mil
+       20.47mil; 77.65mil
+       20.1mil; 76.65mil
+       19.46mil; 74.92mil
+       18.58mil; 72.54mil
+       17.43mil; 69.47mil
+       16.0mil; 65.55mil
+       11.4mil; 78.02mil
+       11.13mil; 78.63mil
+       10.83mil; 79.11mil
+       10.49mil; 79.51mil
+       10.13mil; 79.78mil
+       9.7mil; 79.96mil
+       9.21mil; 80.0mil
+       8.64mil; 79.96mil
+       8.15mil; 79.81mil
+       7.72mil; 79.54mil
+       7.39mil; 79.17mil
+       7.11mil; 78.72mil
+       6.93mil; 78.11mil
+       6.72mil; 77.41mil
+       6.17mil; 75.25mil
+       5.26mil; 71.63mil
+       3.98mil; 66.58mil
+       2.34mil; 60.1mil
+       0.27mil; 51.86mil
+       0.18mil; 51.52mil
+       0.12mil; 51.19mil
+       0.06mil; 50.89mil
+       0.03mil; 50.58mil
+       0.0mil; 50.31mil
+       0.0mil; 50.03mil
+       0.06mil; 49.43mil
+       0.24mil; 48.88mil
+       0.57mil; 48.48mil
+       1.06mil; 48.18mil
+       1.64mil; 48.03mil
+       2.43mil; 47.93mil
+       2.86mil; 48.0mil
+       3.28mil; 48.15mil
+       3.62mil; 48.36mil
+       3.89mil; 48.7mil
+       4.13mil; 49.12mil
+       4.32mil; 49.64mil
+       4.44mil; 50.22mil
+       4.86mil; 51.92mil
+       5.59mil; 54.72mil
+       6.6mil; 58.67mil
+       7.91mil; 63.72mil
+       9.55mil; 70.14mil
+       9.64mil; 69.84mil
+       10.0mil; 68.92mil
+       10.61mil; 67.34mil
+       11.46mil; 65.18mil
+       12.53mil; 62.35mil
+       13.93mil; 58.79mil
+       14.14mil; 58.31mil
+       14.41mil; 57.88mil
+       14.75mil; 57.55mil
+       15.14mil; 57.33mil
+       15.57mil; 57.18mil
+       16.06mil; 57.12mil
+       16.54mil; 57.18mil
+       17.0mil; 57.33mil
+       17.43mil; 57.61mil
+       17.79mil; 57.94mil
+       18.1mil; 58.4mil
+       18.37mil; 58.98mil
+       18.46mil; 59.28mil
+       18.8mil; 60.19mil
+       19.37mil; 61.71mil
+       20.16mil; 63.84mil
+       21.17mil; 66.58mil
+       22.48mil; 70.02mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:x {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       8.91mil; 63.96mil
+       8.67mil; 63.63mil
+       7.97mil; 62.6mil
+       6.81mil; 60.86mil
+       5.2mil; 58.46mil
+       3.1mil; 55.36mil
+       0.48mil; 51.4mil
+       0.33mil; 51.19mil
+       0.21mil; 50.95mil
+       0.12mil; 50.7mil
+       0.03mil; 50.49mil
+       0.0mil; 50.28mil
+       0.0mil; 50.03mil
+       0.06mil; 49.39mil
+       0.24mil; 48.85mil
+       0.57mil; 48.42mil
+       1.03mil; 48.12mil
+       1.61mil; 47.93mil
+       2.37mil; 47.84mil
+       2.67mil; 47.87mil
+       3.01mil; 47.96mil
+       3.31mil; 48.12mil
+       3.59mil; 48.33mil
+       3.86mil; 48.6mil
+       4.13mil; 48.94mil
+       11.46mil; 59.95mil
+       18.83mil; 48.94mil
+       19.07mil; 48.63mil
+       19.34mil; 48.39mil
+       19.62mil; 48.21mil
+       19.95mil; 48.06mil
+       20.32mil; 47.96mil
+       20.71mil; 47.93mil
+       21.32mil; 48.0mil
+       21.84mil; 48.15mil
+       22.23mil; 48.42mil
+       22.51mil; 48.79mil
+       22.69mil; 49.27mil
+       22.75mil; 49.85mil
+       22.72mil; 50.22mil
+       22.69mil; 50.55mil
+       22.63mil; 50.85mil
+       22.54mil; 51.16mil
+       22.41mil; 51.43mil
+       22.29mil; 51.68mil
+       22.05mil; 52.04mil
+       21.38mil; 53.04mil
+       20.22mil; 54.72mil
+       18.64mil; 57.09mil
+       16.6mil; 60.1mil
+       14.05mil; 63.93mil
+       14.26mil; 64.27mil
+       14.93mil; 65.27mil
+       16.03mil; 66.92mil
+       17.58mil; 69.23mil
+       19.56mil; 72.18mil
+       22.08mil; 75.92mil
+       22.29mil; 76.31mil
+       22.48mil; 76.68mil
+       22.63mil; 76.98mil
+       22.75mil; 77.29mil
+       22.81mil; 77.56mil
+       22.84mil; 77.8mil
+       22.78mil; 78.47mil
+       22.6mil; 79.02mil
+       22.29mil; 79.45mil
+       21.9mil; 79.75mil
+       21.38mil; 79.93mil
+       20.74mil; 80.0mil
+       20.32mil; 80.0mil
+       19.95mil; 79.9mil
+       19.59mil; 79.75mil
+       19.28mil; 79.54mil
+       19.01mil; 79.26mil
+       18.76mil; 78.93mil
+       18.55mil; 78.66mil
+       17.94mil; 77.74mil
+       16.97mil; 76.22mil
+       15.57mil; 74.09mil
+       13.78mil; 71.36mil
+       11.53mil; 67.86mil
+       11.31mil; 68.16mil
+       10.7mil; 69.07mil
+       9.7mil; 70.6mil
+       8.3mil; 72.69mil
+       6.51mil; 75.4mil
+       4.22mil; 78.81mil
+       3.95mil; 79.17mil
+       3.65mil; 79.48mil
+       3.34mil; 79.72mil
+       3.01mil; 79.87mil
+       2.67mil; 79.96mil
+       2.31mil; 80.0mil
+       1.58mil; 79.96mil
+       1.0mil; 79.78mil
+       0.57mil; 79.51mil
+       0.24mil; 79.11mil
+       0.06mil; 78.6mil
+       0.0mil; 77.93mil
+       0.0mil; 77.68mil
+       0.03mil; 77.38mil
+       0.12mil; 77.11mil
+       0.21mil; 76.83mil
+       0.36mil; 76.56mil
+       0.54mil; 76.25mil
+       0.76mil; 75.92mil
+       1.46mil; 74.92mil
+       2.58mil; 73.24mil
+       4.19mil; 70.87mil
+       6.26mil; 67.83mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:y {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       22.35mil; 52.16mil
+       9.09mil; 91.77mil
+       8.82mil; 92.38mil
+       8.48mil; 92.92mil
+       8.06mil; 93.32mil
+       7.57mil; 93.62mil
+       7.02mil; 93.77mil
+       6.38mil; 93.87mil
+       6.26mil; 93.87mil
+       5.93mil; 93.87mil
+       5.41mil; 93.87mil
+       4.65mil; 93.87mil
+       3.68mil; 93.87mil
+       2.46mil; 93.87mil
+       1.7mil; 93.8mil
+       1.09mil; 93.62mil
+       0.61mil; 93.32mil
+       0.27mil; 92.89mil
+       0.06mil; 92.38mil
+       0.0mil; 91.71mil
+       0.06mil; 91.01mil
+       0.27mil; 90.46mil
+       0.61mil; 90.0mil
+       1.09mil; 89.7mil
+       1.73mil; 89.52mil
+       2.55mil; 89.45mil
+       5.14mil; 89.45mil
+       5.23mil; 89.12mil
+       5.53mil; 88.21mil
+       6.05mil; 86.66mil
+       6.78mil; 84.47mil
+       7.69mil; 81.67mil
+       8.88mil; 78.14mil
+       0.39mil; 52.01mil
+       0.27mil; 51.65mil
+       0.15mil; 51.31mil
+       0.09mil; 50.98mil
+       0.03mil; 50.64mil
+       0.0mil; 50.34mil
+       0.0mil; 50.03mil
+       0.06mil; 49.43mil
+       0.24mil; 48.88mil
+       0.54mil; 48.48mil
+       0.97mil; 48.18mil
+       1.52mil; 48.03mil
+       2.22mil; 47.93mil
+       2.7mil; 48.0mil
+       3.16mil; 48.18mil
+       3.56mil; 48.48mil
+       3.89mil; 48.88mil
+       4.19mil; 49.39mil
+       4.47mil; 50.03mil
+       11.28mil; 70.99mil
+       18.49mil; 49.79mil
+       18.7mil; 49.24mil
+       18.98mil; 48.79mil
+       19.31mil; 48.42mil
+       19.68mil; 48.15mil
+       20.1mil; 48.0mil
+       20.59mil; 47.93mil
+       21.26mil; 48.0mil
+       21.81mil; 48.18mil
+       22.26mil; 48.48mil
+       22.57mil; 48.88mil
+       22.75mil; 49.39mil
+       22.84mil; 50.03mil
+       22.81mil; 50.31mil
+       22.78mil; 50.58mil
+       22.72mil; 50.92mil
+       22.6mil; 51.28mil
+       22.51mil; 51.71mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:z {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       6.41mil; 75.31mil
+       20.32mil; 75.31mil
+       21.02mil; 75.4mil
+       21.62mil; 75.61mil
+       22.08mil; 75.98mil
+       22.41mil; 76.47mil
+       22.6mil; 77.11mil
+       22.69mil; 77.9mil
+       22.6mil; 78.53mil
+       22.41mil; 79.08mil
+       22.08mil; 79.48mil
+       21.62mil; 79.78mil
+       21.05mil; 79.93mil
+       20.32mil; 80.0mil
+       2.76mil; 80.0mil
+       1.91mil; 79.93mil
+       1.21mil; 79.75mil
+       0.7mil; 79.42mil
+       0.3mil; 78.93mil
+       0.06mil; 78.35mil
+       0.0mil; 77.56mil
+       0.0mil; 77.29mil
+       0.06mil; 76.98mil
+       0.15mil; 76.71mil
+       0.27mil; 76.41mil
+       0.45mil; 76.07mil
+       0.67mil; 75.74mil
+       16.42mil; 52.13mil
+       2.28mil; 52.13mil
+       1.58mil; 52.1mil
+       1.03mil; 51.92mil
+       0.57mil; 51.62mil
+       0.27mil; 51.19mil
+       0.09mil; 50.67mil
+       0.03mil; 49.97mil
+       0.09mil; 49.27mil
+       0.27mil; 48.7mil
+       0.57mil; 48.24mil
+       1.03mil; 47.9mil
+       1.61mil; 47.72mil
+       2.34mil; 47.63mil
+       19.71mil; 47.63mil
+       20.65mil; 47.72mil
+       21.41mil; 47.9mil
+       22.02mil; 48.21mil
+       22.45mil; 48.63mil
+       22.72mil; 49.18mil
+       22.81mil; 49.88mil
+       22.78mil; 50.16mil
+       22.75mil; 50.4mil
+       22.69mil; 50.64mil
+       22.57mil; 50.89mil
+       22.48mil; 51.13mil
+       22.32mil; 51.37mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:\{ {
+    width=13mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       8.64mil; 29.05mil
+       8.7mil; 29.05mil
+       8.88mil; 29.05mil
+       9.21mil; 29.05mil
+       9.67mil; 29.05mil
+       10.28mil; 29.05mil
+       11.04mil; 29.05mil
+       11.77mil; 29.11mil
+       12.35mil; 29.29mil
+       12.83mil; 29.59mil
+       13.17mil; 29.99mil
+       13.35mil; 30.51mil
+       13.44mil; 31.14mil
+       13.38mil; 31.78mil
+       13.2mil; 32.33mil
+       12.89mil; 32.79mil
+       12.5mil; 33.12mil
+       11.95mil; 33.36mil
+       11.31mil; 33.49mil
+       10.58mil; 33.67mil
+       9.97mil; 33.94mil
+       9.52mil; 34.31mil
+       9.18mil; 34.76mil
+       9.0mil; 35.34mil
+       8.94mil; 36.04mil
+       8.94mil; 52.19mil
+       8.88mil; 52.92mil
+       8.73mil; 53.68mil
+       8.48mil; 54.41mil
+       8.15mil; 55.14mil
+       7.69mil; 55.9mil
+       7.14mil; 56.66mil
+       7.63mil; 57.21mil
+       8.06mil; 57.85mil
+       8.39mil; 58.52mil
+       8.61mil; 59.25mil
+       8.76mil; 60.07mil
+       8.82mil; 60.95mil
+       8.82mil; 61.41mil
+       8.82mil; 62.75mil
+       8.82mil; 64.94mil
+       8.82mil; 68.04mil
+       8.82mil; 72.0mil
+       8.82mil; 77.01mil
+       8.88mil; 77.8mil
+       9.06mil; 78.47mil
+       9.43mil; 79.02mil
+       9.88mil; 79.42mil
+       10.49mil; 79.72mil
+       11.28mil; 79.87mil
+       11.95mil; 80.0mil
+       12.5mil; 80.24mil
+       12.92mil; 80.57mil
+       13.23mil; 80.97mil
+       13.41mil; 81.52mil
+       13.5mil; 82.15mil
+       13.41mil; 82.76mil
+       13.2mil; 83.28mil
+       12.86mil; 83.68mil
+       12.38mil; 83.95mil
+       11.74mil; 84.13mil
+       10.98mil; 84.19mil
+       10.03mil; 84.13mil
+       9.15mil; 83.95mil
+       8.33mil; 83.65mil
+       7.57mil; 83.25mil
+       6.84mil; 82.7mil
+       6.2mil; 82.06mil
+       5.65mil; 81.36mil
+       5.23mil; 80.6mil
+       4.89mil; 79.81mil
+       4.65mil; 78.96mil
+       4.5mil; 78.02mil
+       4.47mil; 76.95mil
+       4.47mil; 76.53mil
+       4.47mil; 75.22mil
+       4.47mil; 73.06mil
+       4.47mil; 70.02mil
+       4.47mil; 66.12mil
+       4.47mil; 61.17mil
+       4.38mil; 60.56mil
+       4.19mil; 60.04mil
+       3.83mil; 59.62mil
+       3.37mil; 59.28mil
+       2.76mil; 59.04mil
+       2.0mil; 58.85mil
+       1.37mil; 58.73mil
+       0.88mil; 58.49mil
+       0.48mil; 58.19mil
+       0.21mil; 57.76mil
+       0.03mil; 57.27mil
+       0.0mil; 56.63mil
+       0.03mil; 56.0mil
+       0.21mil; 55.45mil
+       0.51mil; 55.02mil
+       0.91mil; 54.72mil
+       1.43mil; 54.54mil
+       2.1mil; 54.44mil
+       2.8mil; 54.41mil
+       3.4mil; 54.23mil
+       3.86mil; 53.93mil
+       4.19mil; 53.5mil
+       4.38mil; 52.95mil
+       4.47mil; 52.25mil
+       4.47mil; 35.31mil
+       4.5mil; 34.52mil
+       4.68mil; 33.76mil
+       4.99mil; 33.0mil
+       5.38mil; 32.3mil
+       5.93mil; 31.6mil
+       6.6mil; 30.9mil
+       7.27mil; 30.35mil
+       7.97mil; 29.9mil
+       8.7mil; 29.53mil
+       9.46mil; 29.26mil
+       10.22mil; 29.11mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:| {
+    width=4mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.13mil; 86.93mil
+       1.46mil; 86.84mil
+       0.94mil; 86.6mil
+       0.51mil; 86.17mil
+       0.21mil; 85.59mil
+       0.06mil; 84.86mil
+       0.0mil; 83.95mil
+       0.0mil; 29.68mil
+       0.06mil; 28.86mil
+       0.24mil; 28.16mil
+       0.58mil; 27.62mil
+       1.0mil; 27.22mil
+       1.58mil; 26.98mil
+       2.34mil; 26.89mil
+       3.01mil; 26.98mil
+       3.59mil; 27.22mil
+       4.04mil; 27.59mil
+       4.35mil; 28.13mil
+       4.53mil; 28.83mil
+       4.62mil; 29.71mil
+       4.62mil; 84.04mil
+       4.53mil; 84.89mil
+       4.32mil; 85.62mil
+       3.98mil; 86.17mil
+       3.5mil; 86.6mil
+       2.89mil; 86.84mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:&7D {
+    width=13mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       2.46mil; 29.05mil
+       3.25mil; 29.11mil
+       4.01mil; 29.26mil
+       4.77mil; 29.53mil
+       5.5mil; 29.87mil
+       6.2mil; 30.32mil
+       6.93mil; 30.9mil
+       7.57mil; 31.57mil
+       8.09mil; 32.27mil
+       8.51mil; 32.97mil
+       8.82mil; 33.73mil
+       8.97mil; 34.49mil
+       9.06mil; 35.31mil
+       9.06mil; 52.25mil
+       9.12mil; 52.92mil
+       9.3mil; 53.47mil
+       9.64mil; 53.9mil
+       10.1mil; 54.2mil
+       10.67mil; 54.38mil
+       11.43mil; 54.44mil
+       12.04mil; 54.5mil
+       12.56mil; 54.69mil
+       12.95mil; 54.99mil
+       13.26mil; 55.42mil
+       13.44mil; 55.96mil
+       13.5mil; 56.63mil
+       13.44mil; 57.24mil
+       13.26mil; 57.76mil
+       12.99mil; 58.19mil
+       12.59mil; 58.49mil
+       12.1mil; 58.73mil
+       11.49mil; 58.85mil
+       10.73mil; 59.04mil
+       10.1mil; 59.28mil
+       9.61mil; 59.62mil
+       9.27mil; 60.04mil
+       9.06mil; 60.56mil
+       9.0mil; 61.17mil
+       9.0mil; 76.95mil
+       8.94mil; 77.99mil
+       8.79mil; 78.93mil
+       8.57mil; 79.81mil
+       8.24mil; 80.57mil
+       7.81mil; 81.33mil
+       7.3mil; 82.06mil
+       6.66mil; 82.7mil
+       5.96mil; 83.22mil
+       5.2mil; 83.65mil
+       4.38mil; 83.95mil
+       3.49mil; 84.1mil
+       2.55mil; 84.19mil
+       1.76mil; 84.13mil
+       1.12mil; 83.95mil
+       0.64mil; 83.68mil
+       0.27mil; 83.28mil
+       0.06mil; 82.76mil
+       0.0mil; 82.15mil
+       0.06mil; 81.52mil
+       0.24mil; 81.0mil
+       0.54mil; 80.57mil
+       0.97mil; 80.24mil
+       1.52mil; 80.0mil
+       2.22mil; 79.87mil
+       2.95mil; 79.72mil
+       3.59mil; 79.45mil
+       4.07mil; 79.02mil
+       4.41mil; 78.5mil
+       4.62mil; 77.84mil
+       4.71mil; 77.01mil
+       4.71mil; 60.95mil
+       4.74mil; 60.1mil
+       4.86mil; 59.28mil
+       5.11mil; 58.55mil
+       5.41mil; 57.85mil
+       5.84mil; 57.24mil
+       6.35mil; 56.66mil
+       5.81mil; 55.93mil
+       5.35mil; 55.17mil
+       4.99mil; 54.44mil
+       4.74mil; 53.68mil
+       4.59mil; 52.95mil
+       4.56mil; 52.19mil
+       4.56mil; 36.04mil
+       4.47mil; 35.37mil
+       4.29mil; 34.76mil
+       3.95mil; 34.31mil
+       3.49mil; 33.94mil
+       2.92mil; 33.67mil
+       2.19mil; 33.49mil
+       1.52mil; 33.36mil
+       1.0mil; 33.12mil
+       0.57mil; 32.79mil
+       0.27mil; 32.36mil
+       0.12mil; 31.81mil
+       0.06mil; 31.14mil
+       0.12mil; 30.54mil
+       0.3mil; 29.99mil
+       0.64mil; 29.59mil
+       1.09mil; 29.29mil
+       1.7mil; 29.14mil
+     }
+    }
+    height = 63.33mil
+   }
+   ha:&7E {
+    width=22mil; delta=12.0mil;
+    li:objects {
+     li:simplepoly.0 {
+       18.31mil; 54.87mil
+       18.64mil; 54.54mil
+       19.04mil; 54.23mil
+       19.43mil; 53.99mil
+       19.86mil; 53.84mil
+       20.32mil; 53.74mil
+       20.83mil; 53.68mil
+       21.44mil; 53.77mil
+       21.99mil; 53.96mil
+       22.38mil; 54.26mil
+       22.69mil; 54.69mil
+       22.84mil; 55.27mil
+       22.93mil; 55.96mil
+       22.87mil; 56.24mil
+       22.78mil; 56.51mil
+       22.63mil; 56.82mil
+       22.41mil; 57.12mil
+       22.14mil; 57.46mil
+       21.81mil; 57.79mil
+       20.92mil; 58.55mil
+       20.01mil; 59.16mil
+       19.07mil; 59.65mil
+       18.07mil; 59.98mil
+       17.06mil; 60.19mil
+       15.97mil; 60.25mil
+       15.05mil; 60.22mil
+       14.17mil; 60.07mil
+       13.38mil; 59.8mil
+       12.59mil; 59.46mil
+       11.89mil; 59.01mil
+       11.19mil; 58.4mil
+       10.25mil; 57.61mil
+       9.43mil; 56.94mil
+       8.64mil; 56.42mil
+       7.94mil; 56.03mil
+       7.33mil; 55.81mil
+       6.75mil; 55.72mil
+       6.41mil; 55.78mil
+       6.05mil; 55.87mil
+       5.68mil; 56.03mil
+       5.29mil; 56.24mil
+       4.89mil; 56.51mil
+       4.44mil; 56.85mil
+       3.98mil; 57.21mil
+       3.56mil; 57.49mil
+       3.16mil; 57.7mil
+       2.8mil; 57.85mil
+       2.46mil; 57.94mil
+       2.16mil; 57.97mil
+       1.49mil; 57.91mil
+       0.94mil; 57.7mil
+       0.51mil; 57.36mil
+       0.24mil; 56.88mil
+       0.06mil; 56.27mil
+       0.0mil; 55.48mil
+       0.0mil; 55.27mil
+       0.09mil; 55.02mil
+       0.24mil; 54.78mil
+       0.42mil; 54.5mil
+       0.7mil; 54.23mil
+       1.03mil; 53.9mil
+       1.97mil; 53.14mil
+       2.92mil; 52.5mil
+       3.86mil; 52.01mil
+       4.83mil; 51.65mil
+       5.81mil; 51.43mil
+       6.81mil; 51.34mil
+       7.78mil; 51.43mil
+       8.79mil; 51.65mil
+       9.76mil; 52.01mil
+       10.73mil; 52.5mil
+       11.74mil; 53.17mil
+       12.74mil; 53.96mil
+       13.41mil; 54.57mil
+       14.02mil; 55.02mil
+       14.6mil; 55.42mil
+       15.08mil; 55.66mil
+       15.54mil; 55.84mil
+       15.97mil; 55.87mil
+       16.42mil; 55.87mil
+       16.85mil; 55.78mil
+       17.27mil; 55.63mil
+       17.64mil; 55.45mil
+       17.97mil; 55.2mil
+     }
+    }
+    height = 63.33mil
+   }
+
+  }
+  cell_width = 2.87641mm
+  cell_height = 1.879602mm
+ }
+}
Index: tags/2.0.1/pcblib/Makefile
===================================================================
--- tags/2.0.1/pcblib/Makefile	(nonexistent)
+++ tags/2.0.1/pcblib/Makefile	(revision 18980)
@@ -0,0 +1,36 @@
+# This Makefile is a plain old hand written one; all configuration settings
+# are included from ../Makefile.conf which is scconfig generated
+
+ROOT=..
+
+all:
+
+# NOTE: this rule is _not_ called from linstall
+install_:
+	$(MKDIR) "$(DATADIR)/pcblib"
+	$(MKDIR) "$(DATADIR)/pcblib/connector"
+	$(CPC) "`pwd`/connector"/* "$(DATADIR)/pcblib/connector"
+	$(MKDIR) "$(DATADIR)/pcblib/parametric"
+	$(CPC) "`pwd`/parametric"/* "$(DATADIR)/pcblib/parametric"
+	$(MKDIR) "$(DATADIR)/pcblib/smd"
+	$(CPC) "`pwd`/smd"/* "$(DATADIR)/pcblib/smd"
+	$(MKDIR) "$(DATADIR)/pcblib/tru-hole"
+	$(CPC) "`pwd`/tru-hole"/* "$(DATADIR)/pcblib/tru-hole"
+
+install:
+	$(MAKE) install_ CPC="$(CP)"
+
+# hack: pcb's chdir() based approach gets fooled on symlinks because of "cd .."
+# returns to the wrong dir - rather symlink the whole dir
+linstall:
+	$(MAKE) uninstall
+	$(MKDIR) "$(DATADIR)"
+	$(LN) "`pwd`" "$(DATADIR)/pcblib"
+
+uninstall:
+	$(RM) "$(DATADIR)/pcblib"
+
+clean:
+
+include $(ROOT)/Makefile.conf
+
Index: tags/2.0.1/pcblib/README
===================================================================
--- tags/2.0.1/pcblib/README	(nonexistent)
+++ tags/2.0.1/pcblib/README	(revision 18980)
@@ -0,0 +1,8 @@
+This directory hosts the pcb-rnd's new footprint library. To avoid
+confusuin with "newlib", which is in use in mainline, this one is called
+pcblib.
+
+Some footprints are dynamically generated by scripts; they are
+called parametric footprints and are in parametric/. Other footprints
+are plain old data file footprints (static footpritns) in all the other
+directories.
Index: tags/2.0.1/pcblib/connector/BNC_LAY.fp
===================================================================
--- tags/2.0.1/pcblib/connector/BNC_LAY.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/BNC_LAY.fp	(revision 18980)
@@ -0,0 +1,15 @@
+##from:pcb
+##geo:90
+##geo:female
+
+Element(0x00 "right angle BNC" "" "BNC_LAY" 200 0 3 100 0x00)
+(
+	ElementLine(-60 -290 490 -290 10)
+	ElementLine(490 -290 490 290 10)
+	ElementLine(490 290 -60 290 10)
+	ElementLine(-60 290 -60 -290 10)
+	Pin(0 0 60 35 "1" 0x101)
+	Pin(0 -100 60 35 "2" 0x01)
+	Pin(200 -200 100 81 "m1" 0x01)
+	Pin(200 200 100 81 "m2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB15F.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB15F.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB15F.fp	(revision 18980)
@@ -0,0 +1,72 @@
+##from:pcb
+##geo:90
+##geo:female
+
+Element(0x00 "DSUB connector, female/male" "" "DB15F" 1000 2026 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2416 10)
+	ElementLine(665 2416 635 2416 10)
+	ElementLine(635 2416 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2356 665 2356 10)
+	ElementLine(635 2236 665 2236 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 2186 20)
+	ElementLine(770 2186 665 2186 20)
+	ElementLine(665 2186 665 1110 10)
+	# Pins
+		# Pin 1
+		Pin(1056 2026 60 35 "1" 0x101)
+		ElementLine(1016 2026 770 2026 20)
+		# Plazierungsmarkierung == PIN 1
+		# Changed PY1 to PY2 13-Dec-1999 LRD
+		Mark(1056 2026)
+		# Remainder of the first row
+			Pin(1056 1918 60 35 "2" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+			Pin(1056 1810 60 35 "3" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1702 60 35 "4" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1594 60 35 "5" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1486 60 35 "6" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1378 60 35 "7" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1270 60 35 "8" 0x01)
+			ElementLine(1016 1270 770 1270 20)
+		# Second row
+			Pin(944 1972 60 35 "9" 0x01)
+			ElementLine(904 1972 770 1972 20)
+			Pin(944 1864 60 35 "10" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1756 60 35 "11" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1648 60 35 "12" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1540 60 35 "13" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1432 60 35 "14" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1324 60 35 "15" 0x01)
+			ElementLine(904 1324 770 1324 20)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 2296 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB15M.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB15M.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB15M.fp	(revision 18980)
@@ -0,0 +1,71 @@
+##from:pcb
+##geo:90
+##geo:male
+
+Element(0x00 "DSUB connector, female/male" "" "DB15M" 1000 2026 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2416 10)
+	ElementLine(665 2416 635 2416 10)
+	ElementLine(635 2416 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2356 665 2356 10)
+	ElementLine(635 2236 665 2236 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 2186 20)
+	ElementLine(770 2186 665 2186 20)
+	ElementLine(665 2186 665 1110 10)
+	# Pins
+		# First row
+			Pin(1056 1270 60 35 "1" 0x101)
+			ElementLine(1016 1270 770 1270 20)
+			Pin(1056 1378 60 35 "2" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1486 60 35 "3" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1594 60 35 "4" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1702 60 35 "5" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1810 60 35 "6" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1918 60 35 "7" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+		# Last pin in first row
+		Pin(1056 2026 60 35 "8" 0x01)
+		ElementLine(1016 2026 770 2026 20)
+		# Second row
+			Pin(944 1324 60 35 "9" 0x01)
+			ElementLine(904 1324 770 1324 20)
+			Pin(944 1432 60 35 "10" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1540 60 35 "11" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1648 60 35 "12" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1756 60 35 "13" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1864 60 35 "14" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1972 60 35 "15" 0x01)
+			ElementLine(904 1972 770 1972 20)
+		# Plazierungsmarkierung == PIN 1
+		Mark(1050 1270)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 2296 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB25F.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB25F.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB25F.fp	(revision 18980)
@@ -0,0 +1,92 @@
+##from:pcb
+##geo:90
+##geo:female
+
+Element(0x00 "DSUB connector, female/male" "" "DB25F" 1000 2566 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2956 10)
+	ElementLine(665 2956 635 2956 10)
+	ElementLine(635 2956 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2896 665 2896 10)
+	ElementLine(635 2776 665 2776 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 2726 20)
+	ElementLine(770 2726 665 2726 20)
+	ElementLine(665 2726 665 1110 10)
+	# Pins
+		# Pin 1
+		Pin(1056 2566 60 35 "1" 0x101)
+		ElementLine(1016 2566 770 2566 20)
+		# Plazierungsmarkierung == PIN 1
+		# Changed PY1 to PY2 13-Dec-1999 LRD
+		Mark(1056 2566)
+		# Remainder of the first row
+			Pin(1056 2458 60 35 "2" 0x01)
+			ElementLine(1016 2458 770 2458 20)
+			Pin(1056 2350 60 35 "3" 0x01)
+			ElementLine(1016 2350 770 2350 20)
+			Pin(1056 2242 60 35 "4" 0x01)
+			ElementLine(1016 2242 770 2242 20)
+			Pin(1056 2134 60 35 "5" 0x01)
+			ElementLine(1016 2134 770 2134 20)
+			Pin(1056 2026 60 35 "6" 0x01)
+			ElementLine(1016 2026 770 2026 20)
+			Pin(1056 1918 60 35 "7" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+			Pin(1056 1810 60 35 "8" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1702 60 35 "9" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1594 60 35 "10" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1486 60 35 "11" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1378 60 35 "12" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1270 60 35 "13" 0x01)
+			ElementLine(1016 1270 770 1270 20)
+		# Second row
+			Pin(944 2512 60 35 "14" 0x01)
+			ElementLine(904 2512 770 2512 20)
+			Pin(944 2404 60 35 "15" 0x01)
+			ElementLine(904 2404 770 2404 20)
+			Pin(944 2296 60 35 "16" 0x01)
+			ElementLine(904 2296 770 2296 20)
+			Pin(944 2188 60 35 "17" 0x01)
+			ElementLine(904 2188 770 2188 20)
+			Pin(944 2080 60 35 "18" 0x01)
+			ElementLine(904 2080 770 2080 20)
+			Pin(944 1972 60 35 "19" 0x01)
+			ElementLine(904 1972 770 1972 20)
+			Pin(944 1864 60 35 "20" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1756 60 35 "21" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1648 60 35 "22" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1540 60 35 "23" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1432 60 35 "24" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1324 60 35 "25" 0x01)
+			ElementLine(904 1324 770 1324 20)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 2836 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB25M.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB25M.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB25M.fp	(revision 18980)
@@ -0,0 +1,91 @@
+##from:pcb
+##geo:90
+##geo:male
+
+Element(0x00 "DSUB connector, female/male" "" "DB25M" 1000 2566 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2956 10)
+	ElementLine(665 2956 635 2956 10)
+	ElementLine(635 2956 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2896 665 2896 10)
+	ElementLine(635 2776 665 2776 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 2726 20)
+	ElementLine(770 2726 665 2726 20)
+	ElementLine(665 2726 665 1110 10)
+	# Pins
+		# First row
+			Pin(1056 1270 60 35 "1" 0x101)
+			ElementLine(1016 1270 770 1270 20)
+			Pin(1056 1378 60 35 "2" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1486 60 35 "3" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1594 60 35 "4" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1702 60 35 "5" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1810 60 35 "6" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1918 60 35 "7" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+			Pin(1056 2026 60 35 "8" 0x01)
+			ElementLine(1016 2026 770 2026 20)
+			Pin(1056 2134 60 35 "9" 0x01)
+			ElementLine(1016 2134 770 2134 20)
+			Pin(1056 2242 60 35 "10" 0x01)
+			ElementLine(1016 2242 770 2242 20)
+			Pin(1056 2350 60 35 "11" 0x01)
+			ElementLine(1016 2350 770 2350 20)
+			Pin(1056 2458 60 35 "12" 0x01)
+			ElementLine(1016 2458 770 2458 20)
+		# Last pin in first row
+		Pin(1056 2566 60 35 "13" 0x01)
+		ElementLine(1016 2566 770 2566 20)
+		# Second row
+			Pin(944 1324 60 35 "14" 0x01)
+			ElementLine(904 1324 770 1324 20)
+			Pin(944 1432 60 35 "15" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1540 60 35 "16" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1648 60 35 "17" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1756 60 35 "18" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1864 60 35 "19" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1972 60 35 "20" 0x01)
+			ElementLine(904 1972 770 1972 20)
+			Pin(944 2080 60 35 "21" 0x01)
+			ElementLine(904 2080 770 2080 20)
+			Pin(944 2188 60 35 "22" 0x01)
+			ElementLine(904 2188 770 2188 20)
+			Pin(944 2296 60 35 "23" 0x01)
+			ElementLine(904 2296 770 2296 20)
+			Pin(944 2404 60 35 "24" 0x01)
+			ElementLine(904 2404 770 2404 20)
+			Pin(944 2512 60 35 "25" 0x01)
+			ElementLine(904 2512 770 2512 20)
+		# Plazierungsmarkierung == PIN 1
+		Mark(1050 1270)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 2836 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB37F.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB37F.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB37F.fp	(revision 18980)
@@ -0,0 +1,116 @@
+##from:pcb
+##geo:90
+##geo:female
+
+Element(0x00 "DSUB connector, female/male" "" "DB37F" 1000 3214 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 3604 10)
+	ElementLine(665 3604 635 3604 10)
+	ElementLine(635 3604 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 3544 665 3544 10)
+	ElementLine(635 3424 665 3424 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 3374 20)
+	ElementLine(770 3374 665 3374 20)
+	ElementLine(665 3374 665 1110 10)
+	# Pins
+		# Pin 1
+		Pin(1056 3214 60 35 "1" 0x101)
+		ElementLine(1016 3214 770 3214 20)
+		# Plazierungsmarkierung == PIN 1
+		# Changed PY1 to PY2 13-Dec-1999 LRD
+		Mark(1056 3214)
+		# Remainder of the first row
+			Pin(1056 3106 60 35 "2" 0x01)
+			ElementLine(1016 3106 770 3106 20)
+			Pin(1056 2998 60 35 "3" 0x01)
+			ElementLine(1016 2998 770 2998 20)
+			Pin(1056 2890 60 35 "4" 0x01)
+			ElementLine(1016 2890 770 2890 20)
+			Pin(1056 2782 60 35 "5" 0x01)
+			ElementLine(1016 2782 770 2782 20)
+			Pin(1056 2674 60 35 "6" 0x01)
+			ElementLine(1016 2674 770 2674 20)
+			Pin(1056 2566 60 35 "7" 0x01)
+			ElementLine(1016 2566 770 2566 20)
+			Pin(1056 2458 60 35 "8" 0x01)
+			ElementLine(1016 2458 770 2458 20)
+			Pin(1056 2350 60 35 "9" 0x01)
+			ElementLine(1016 2350 770 2350 20)
+			Pin(1056 2242 60 35 "10" 0x01)
+			ElementLine(1016 2242 770 2242 20)
+			Pin(1056 2134 60 35 "11" 0x01)
+			ElementLine(1016 2134 770 2134 20)
+			Pin(1056 2026 60 35 "12" 0x01)
+			ElementLine(1016 2026 770 2026 20)
+			Pin(1056 1918 60 35 "13" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+			Pin(1056 1810 60 35 "14" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1702 60 35 "15" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1594 60 35 "16" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1486 60 35 "17" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1378 60 35 "18" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1270 60 35 "19" 0x01)
+			ElementLine(1016 1270 770 1270 20)
+		# Second row
+			Pin(944 3160 60 35 "20" 0x01)
+			ElementLine(904 3160 770 3160 20)
+			Pin(944 3052 60 35 "21" 0x01)
+			ElementLine(904 3052 770 3052 20)
+			Pin(944 2944 60 35 "22" 0x01)
+			ElementLine(904 2944 770 2944 20)
+			Pin(944 2836 60 35 "23" 0x01)
+			ElementLine(904 2836 770 2836 20)
+			Pin(944 2728 60 35 "24" 0x01)
+			ElementLine(904 2728 770 2728 20)
+			Pin(944 2620 60 35 "25" 0x01)
+			ElementLine(904 2620 770 2620 20)
+			Pin(944 2512 60 35 "26" 0x01)
+			ElementLine(904 2512 770 2512 20)
+			Pin(944 2404 60 35 "27" 0x01)
+			ElementLine(904 2404 770 2404 20)
+			Pin(944 2296 60 35 "28" 0x01)
+			ElementLine(904 2296 770 2296 20)
+			Pin(944 2188 60 35 "29" 0x01)
+			ElementLine(904 2188 770 2188 20)
+			Pin(944 2080 60 35 "30" 0x01)
+			ElementLine(904 2080 770 2080 20)
+			Pin(944 1972 60 35 "31" 0x01)
+			ElementLine(904 1972 770 1972 20)
+			Pin(944 1864 60 35 "32" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1756 60 35 "33" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1648 60 35 "34" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1540 60 35 "35" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1432 60 35 "36" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1324 60 35 "37" 0x01)
+			ElementLine(904 1324 770 1324 20)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 3484 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB37M.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB37M.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB37M.fp	(revision 18980)
@@ -0,0 +1,115 @@
+##from:pcb
+##geo:90
+##geo:male
+
+Element(0x00 "DSUB connector, female/male" "" "DB37M" 1000 3214 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 3604 10)
+	ElementLine(665 3604 635 3604 10)
+	ElementLine(635 3604 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 3544 665 3544 10)
+	ElementLine(635 3424 665 3424 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 3374 20)
+	ElementLine(770 3374 665 3374 20)
+	ElementLine(665 3374 665 1110 10)
+	# Pins
+		# First row
+			Pin(1056 1270 60 35 "1" 0x101)
+			ElementLine(1016 1270 770 1270 20)
+			Pin(1056 1378 60 35 "2" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1486 60 35 "3" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1594 60 35 "4" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1702 60 35 "5" 0x01)
+			ElementLine(1016 1702 770 1702 20)
+			Pin(1056 1810 60 35 "6" 0x01)
+			ElementLine(1016 1810 770 1810 20)
+			Pin(1056 1918 60 35 "7" 0x01)
+			ElementLine(1016 1918 770 1918 20)
+			Pin(1056 2026 60 35 "8" 0x01)
+			ElementLine(1016 2026 770 2026 20)
+			Pin(1056 2134 60 35 "9" 0x01)
+			ElementLine(1016 2134 770 2134 20)
+			Pin(1056 2242 60 35 "10" 0x01)
+			ElementLine(1016 2242 770 2242 20)
+			Pin(1056 2350 60 35 "11" 0x01)
+			ElementLine(1016 2350 770 2350 20)
+			Pin(1056 2458 60 35 "12" 0x01)
+			ElementLine(1016 2458 770 2458 20)
+			Pin(1056 2566 60 35 "13" 0x01)
+			ElementLine(1016 2566 770 2566 20)
+			Pin(1056 2674 60 35 "14" 0x01)
+			ElementLine(1016 2674 770 2674 20)
+			Pin(1056 2782 60 35 "15" 0x01)
+			ElementLine(1016 2782 770 2782 20)
+			Pin(1056 2890 60 35 "16" 0x01)
+			ElementLine(1016 2890 770 2890 20)
+			Pin(1056 2998 60 35 "17" 0x01)
+			ElementLine(1016 2998 770 2998 20)
+			Pin(1056 3106 60 35 "18" 0x01)
+			ElementLine(1016 3106 770 3106 20)
+		# Last pin in first row
+		Pin(1056 3214 60 35 "19" 0x01)
+		ElementLine(1016 3214 770 3214 20)
+		# Second row
+			Pin(944 1324 60 35 "20" 0x01)
+			ElementLine(904 1324 770 1324 20)
+			Pin(944 1432 60 35 "21" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1540 60 35 "22" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1648 60 35 "23" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1756 60 35 "24" 0x01)
+			ElementLine(904 1756 770 1756 20)
+			Pin(944 1864 60 35 "25" 0x01)
+			ElementLine(904 1864 770 1864 20)
+			Pin(944 1972 60 35 "26" 0x01)
+			ElementLine(904 1972 770 1972 20)
+			Pin(944 2080 60 35 "27" 0x01)
+			ElementLine(904 2080 770 2080 20)
+			Pin(944 2188 60 35 "28" 0x01)
+			ElementLine(904 2188 770 2188 20)
+			Pin(944 2296 60 35 "29" 0x01)
+			ElementLine(904 2296 770 2296 20)
+			Pin(944 2404 60 35 "30" 0x01)
+			ElementLine(904 2404 770 2404 20)
+			Pin(944 2512 60 35 "31" 0x01)
+			ElementLine(904 2512 770 2512 20)
+			Pin(944 2620 60 35 "32" 0x01)
+			ElementLine(904 2620 770 2620 20)
+			Pin(944 2728 60 35 "33" 0x01)
+			ElementLine(904 2728 770 2728 20)
+			Pin(944 2836 60 35 "34" 0x01)
+			ElementLine(904 2836 770 2836 20)
+			Pin(944 2944 60 35 "35" 0x01)
+			ElementLine(904 2944 770 2944 20)
+			Pin(944 3052 60 35 "36" 0x01)
+			ElementLine(904 3052 770 3052 20)
+			Pin(944 3160 60 35 "37" 0x01)
+			ElementLine(904 3160 770 3160 20)
+		# Plazierungsmarkierung == PIN 1
+		Mark(1050 1270)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 3484 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB9F.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB9F.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB9F.fp	(revision 18980)
@@ -0,0 +1,60 @@
+##from:pcb
+##geo:90
+##geo:female
+
+Element(0x00 "DSUB connector, female/male" "" "DB9F" 1000 1702 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2092 10)
+	ElementLine(665 2092 635 2092 10)
+	ElementLine(635 2092 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2032 665 2032 10)
+	ElementLine(635 1912 665 1912 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 1862 20)
+	ElementLine(770 1862 665 1862 20)
+	ElementLine(665 1862 665 1110 10)
+	# Pins
+		# Pin 1
+		Pin(1056 1702 60 35 "1" 0x101)
+		ElementLine(1016 1702 770 1702 20)
+		# Plazierungsmarkierung == PIN 1
+		# Changed PY1 to PY2 13-Dec-1999 LRD
+		Mark(1056 1702)
+		# Remainder of the first row
+			Pin(1056 1594 60 35 "2" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+			Pin(1056 1486 60 35 "3" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1378 60 35 "4" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1270 60 35 "5" 0x01)
+			ElementLine(1016 1270 770 1270 20)
+		# Second row
+			Pin(944 1648 60 35 "6" 0x01)
+			ElementLine(904 1648 770 1648 20)
+			Pin(944 1540 60 35 "7" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1432 60 35 "8" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1324 60 35 "9" 0x01)
+			ElementLine(904 1324 770 1324 20)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 1972 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/DB9M.fp
===================================================================
--- tags/2.0.1/pcblib/connector/DB9M.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/DB9M.fp	(revision 18980)
@@ -0,0 +1,59 @@
+##from:pcb
+##geo:90
+##geo:male
+
+Element(0x00 "DSUB connector, female/male" "" "DB9M" 1000 1702 1 150 0x00)
+(
+	# Gehaeuse (schmaler Kasten incl. Bohrungen)
+	ElementLine(635 880 665 880 10)
+	ElementLine(665 880 665 2092 10)
+	ElementLine(665 2092 635 2092 10)
+	ElementLine(635 2092 635 880 10)
+	ElementLine(635 940 665 940 10)
+	ElementLine(635 1060 665 1060 10)
+	ElementLine(635 2032 665 2032 10)
+	ElementLine(635 1912 665 1912 10)
+	# Gehaeuse (aeusserer Kasten)
+	# This part of the connector normally hangs off the circuit board,
+	# so it is confusing to actually mark it on the silkscreen
+	# define(`X1', `eval(BASEX-PANEL_DISTANCE-260)')
+	# define(`Y1', `eval(PY1-100)')
+	# define(`X2', `eval(BASEX-PANEL_DISTANCE)')
+	# define(`Y2', `eval(PY2+100)')
+	# ElementLine(X1 Y1 X2 Y1 20)
+	# ElementLine(X2 Y1 X2 Y2 10)
+	# ElementLine(X2 Y2 X1 Y2 20)
+	# ElementLine(X1 Y2 X1 Y1 20)
+	# Gehaeuse (innerer Kasten)
+	ElementLine(665 1110 770 1110 20)
+	ElementLine(770 1110 770 1862 20)
+	ElementLine(770 1862 665 1862 20)
+	ElementLine(665 1862 665 1110 10)
+	# Pins
+		# First row
+			Pin(1056 1270 60 35 "1" 0x101)
+			ElementLine(1016 1270 770 1270 20)
+			Pin(1056 1378 60 35 "2" 0x01)
+			ElementLine(1016 1378 770 1378 20)
+			Pin(1056 1486 60 35 "3" 0x01)
+			ElementLine(1016 1486 770 1486 20)
+			Pin(1056 1594 60 35 "4" 0x01)
+			ElementLine(1016 1594 770 1594 20)
+		# Last pin in first row
+		Pin(1056 1702 60 35 "5" 0x01)
+		ElementLine(1016 1702 770 1702 20)
+		# Second row
+			Pin(944 1324 60 35 "6" 0x01)
+			ElementLine(904 1324 770 1324 20)
+			Pin(944 1432 60 35 "7" 0x01)
+			ElementLine(904 1432 770 1432 20)
+			Pin(944 1540 60 35 "8" 0x01)
+			ElementLine(904 1540 770 1540 20)
+			Pin(944 1648 60 35 "9" 0x01)
+			ElementLine(904 1648 770 1648 20)
+		# Plazierungsmarkierung == PIN 1
+		Mark(1050 1270)
+	# Befestigungsbohrung
+	Pin(1000  1000 250 125 "C1" 0x01)
+	Pin(1000 1972 250 125 "C2" 0x01)
+)
Index: tags/2.0.1/pcblib/connector/pwrjack.fp
===================================================================
--- tags/2.0.1/pcblib/connector/pwrjack.fp	(nonexistent)
+++ tags/2.0.1/pcblib/connector/pwrjack.fp	(revision 18980)
@@ -0,0 +1,16 @@
+##from:repo.hu/projects/openhw
+##geo:90
+##geo:male
+
+Element["" "" "" "pwrjack" 124016 141732 0 0 0 100 ""]
+(
+	Pin[0 0 19685 2000 20285 11811 "" "2" ""]
+	Pin[0 -27559 19685 2000 20285 11811 "" "1" ""]
+	Pin[-17717 -13779 19685 2000 20285 11811 "" "3" ""]
+	ElementLine [-17717 -55118 -17717 0 1000]
+	ElementLine [-17717 0 17716 0 1000]
+	ElementLine [17716 0 17716 -55118 1000]
+	ElementLine [17716 -55118 -17717 -55118 1000]
+	ElementLine [-17717 -43307 17716 -43307 1000]
+
+	)
Index: tags/2.0.1/pcblib/parametric/acy
===================================================================
--- tags/2.0.1/pcblib/parametric/acy	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/acy	(revision 18980)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+#@@example acy(300)
+
+#@@purpose Generate axial lead through-hole component
+
+#@@desc Generate axial lead through-hole component with 2 pins (typical use: resistor)
+#@@params spacing,type,pol,dia
+
+#@@param:spacing spacing between the two pins
+#@@dim:spacing
+
+#@@param:type silk symbol type
+#@@enum:type:block eu-style block resistor symbol
+#@@enum:type:endcap block resistor with caps on the ends
+#@@enum:type:zigzag us-style zigzag resistor symbol
+#@@enum:type:line a single line (e.g. for jumper wires)
+#@@enum:type:standing vertically aligned, body standing on pin 1, pin 2 bent back
+#@@enum:type:coil wavy coil symbol
+#@@enum:type:core wavy coil symbol with a parallel line
+#@@enum:type:core2 wavy coil symbol with two parallel lines
+#@@optional:type
+#@@default:type block
+#@@preview_args:type 300
+
+#@@param:pol how to mark polarity
+#@@enum:pol:none no marking
+#@@enum:pol:sign + and - signs; pin 1 is +
+#@@enum:pol:bar bar next to pin 1
+#@@enum:pol:dot dot next to pin 1
+#@@optional:pol
+#@@default:pol none
+#@@preview_args:pol 300
+
+#@@param:dia body diameter - affects silk size
+#@@dim:dia 
+#@@optional:dia
+#@@default:dia spacing/6
+
+
+#@@param:wiper silk symbol wiper type
+#@@enum:wiper:none no wiper
+#@@enum:wiper:parrow perpendicular arrow, pointing inwards
+#@@enum:wiper:aarrow angled arrow, pointing outwards
+#@@enum:wiper:looparrow arrow starting at pin 2 looping back to point inwards on the body
+#@@enum:wiper:thermistor wiper of a thermistor symbol
+#@@optional:wiper
+#@@default:wiper none
+#@@preview_args:wiper 400
+
+#@@thumbsize 2
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/acy.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/acy
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/acy.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/acy.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/acy.awk	(revision 18980)
@@ -0,0 +1,153 @@
+function wave(type, repeat,    step,x,y)
+{
+	step = len/repeat
+	for(x = sx1; x < sx2; x += step) {
+		if (type == 1) {
+			element_arc(x+step/2, 0, step/2, step/2, 0, -180)
+		}
+		else if (type == 2) {
+			y = dia
+			element_line(x, 0, x+step/4, -y)
+			element_line(x+step/4, -y, x+3*step/4, y)
+			element_line(x+3*step/4, y, x+step, 0)
+			
+		}
+	}
+}
+
+BEGIN {
+	help_auto()
+	set_arg(P, "?type", "block")
+	proc_args(P, "spacing,type,pol,dia", "spacing")
+
+	spacing = parse_dim(P["spacing"])
+	dia = either(parse_dim(P["dia"]), spacing/6)
+
+# oops, dia is a radius rather
+	dia=dia/2
+
+	offs_x = +spacing/2
+
+	element_begin("", "R1", "acy" P["spacing"]    ,0,0, spacing/2-spacing/5,-mil(20))
+
+	element_pin(-spacing/2, 0, 1)
+	element_pin(+spacing/2, 0, 2)
+
+	dimension(-spacing/2, 0, +spacing/2, 0, dia*4, "spacing")
+
+# silk pins
+	if (P["type"] != "line") {
+		element_line(-spacing/2, 0, -spacing/4, 0)
+		element_line(+spacing/4, 0, +spacing/2, 0)
+	}
+
+# silk symbol
+	sx1 = -spacing/4
+	sx2 = +spacing/4
+	len = sx2-sx1
+	if (P["type"] == "block") {
+		element_rectangle(sx1, -dia, sx2, +dia)
+	}
+	else if (P["type"] == "zigzag") {
+		wave(2, 3)
+	}
+	else if (P["type"] == "coil") {
+		wave(1, 4)
+	}
+	else if (P["type"] == "endcap") {
+		cl1 = len/9
+		cl2 = len/8
+		y1 = dia*1.2
+		y2 = dia
+		rarc = dia/5
+		element_line(sx1+cl2, y2, sx2-cl2, y2)
+		element_line(sx1+cl2, y2, sx1+cl1, y1)
+		element_line(sx2-cl2, y2, sx2-cl1, y1)
+		
+		element_line(sx1+cl2, -y2, sx2-cl2, -y2)
+		element_line(sx1+cl2, -y2, sx1+cl1, -y1)
+		element_line(sx2-cl2, -y2, sx2-cl1, -y1)
+
+		element_rectangle(sx1, y1, sx1+cl1, -y1, "right,NE,SE", rarc)
+		element_rectangle(sx2-cl1, y1, sx2, -y1, "left,NW,SW", rarc)
+	}
+	else if (P["type"] ~ "^core") {
+		wave(1, 4)
+		nlines = P["type"]
+		sub("^core", "", nlines)
+		if (nlines == "")
+			nlines = 1
+
+		cdist = 3 * DEFAULT["line_thickness"]
+		y = -len/8
+		for(nlines = int(nlines); nlines > 0; nlines--) {
+			y-=cdist
+			element_line(sx1, y, sx2, y)
+		}
+	}
+	else if (P["type"] == "line") {
+		element_line(-spacing/2, 0, +spacing/2, 0)
+	}
+	else if (P["type"] == "standing") {
+		r = dia*2
+		if (r < DEFAULT["pin_ringdia"]/2*1.2)
+			r = DEFAULT["pin_ringdia"]/2*1.2
+		element_arc(-spacing/2, 0, r, r, 0, 360)
+		element_line(-spacing/2, 0, +spacing/2, 0)
+	}
+	else {
+		error("Invalid type")
+	}
+
+	dimension(sx2, -dia, sx2, dia, spacing/2, "dia")
+
+# silk wiper
+	if (P["wiper"] == "thermistor") {
+		x = len/3
+		element_line(-4*x/4, dia*2, -2*x/4, dia*2)
+		element_line(-2*x/4, dia*2, +2*x/4, -dia*2)
+	}
+	else if (P["wiper"] == "aarrow") {
+		x = len/3
+		element_arrow(-2*x/4, dia*2, +2*x/4, -dia*2-mil(30))
+	}
+	else if (P["wiper"] == "parrow") {
+		element_arrow(0, -dia*2-mil(30), 0, -dia)
+	}
+	else if (P["wiper"] == "looparrow") {
+		y = -dia*2-mil(30)
+		x = sx2+len/8
+		element_arrow(0, y, 0, -dia)
+		element_line(0, y, x, y)
+		element_line(x, y, x, 0)
+	}
+	else if ((P["wiper"] != "none") && (P["wiper"] != "")) {
+		error("Invalid wiper")
+	}
+
+# silk sign
+	if (P["pol"] == "sign") {
+		size=mil(10)
+
+		offs_y = size*2.2
+		offs_x = DEFAULT["pin_ringdia"]/2+size*1.1
+		element_line(-size, 0, +size, 0)
+
+		offs_x = spacing - (DEFAULT["pin_ringdia"]/2+size*1.1)
+		element_line(-size, 0, +size, 0)
+		element_line(0, -size, 0, +size)
+	}
+	else if (P["pol"] == "bar") {
+		offs=DEFAULT["line_thickness"]
+		element_rectangle(-spacing/4-offs, -dia, -spacing/4+offs, +dia,  DEFAULT["line_thickness"]*4)
+	}
+	else if (P["pol"] == "dot") {
+		r=2*DEFAULT["line_thickness"]/3
+		element_arc(-spacing/4-r*3, -dia/2, r, r, 0, 360)
+	}
+	else if ((P["pol"] != "") && (P["pol"] != "none")) {
+		error("Invalid pol")
+	}
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/alf
===================================================================
--- tags/2.0.1/pcblib/parametric/alf	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/alf	(revision 18980)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+#@@example alf(300, schottky)
+
+#@@purpose Generate ALF: axial lead through-hole component for diodes
+
+#@@desc Generate axial lead through-hole component with 2 pin diodes
+#@@params spacing,type,dia
+#@@thumbsize 2
+
+#@@param:spacing spacing between the two pins
+#@@dim:spacing
+
+#@@param:type symbol type
+#@@enum:type:normal
+#@@enum:type:schottky
+#@@enum:type:zener
+#@@enum:type:tunnel
+#@@enum:type:varactor
+#@@optional:type
+#@@default:type normal
+#@@preview_args:type 300
+
+#@@param:dia body diameter - affects silk symbol size
+#@@dim:dia
+#@@optional:dia
+#@@default:dia spacing/12
+
+#@@param:aspect silk symbol aspect: total width expressed as a portion of spacing
+#@@optional:aspect
+#@@default:aspect spacing/6
+
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/alf.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/alf
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/alf.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/alf.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/alf.awk	(revision 18980)
@@ -0,0 +1,65 @@
+BEGIN {
+	help_auto()
+	set_arg(P, "?aspect", 6)
+	set_arg(P, "?type", "normal")
+
+	proc_args(P, "spacing,type,dia,aspect", "spacing")
+
+	spacing = parse_dim(P["spacing"])
+	dia = either(parse_dim(P["dia"]), spacing/6)
+	aspect = P["aspect"]
+
+	offs_x = +spacing/2
+
+	element_begin("", "D1", "acy" P["spacing"]    ,0,0, 2.2*spacing/3,-mil(50))
+
+	element_pin(-spacing/2, 0, 1)
+	element_pin(+spacing/2, 0, 2)
+	dimension(-spacing/2, 0, +spacing/2, 0, dia*4, "spacing")
+
+# pins
+	element_line(-spacing/2, 0, -spacing/aspect, 0)
+	element_line(+spacing/aspect, 0, +spacing/2, 0)
+
+# triangle
+	element_line(+spacing/aspect, -dia, +spacing/aspect, +dia)
+	element_line(+spacing/aspect, -dia, -spacing/aspect, 0)
+	element_line(+spacing/aspect, +dia, -spacing/aspect, 0)
+
+	dimension(+spacing/aspect, -dia, +spacing/aspect, dia, "@" spacing*1.2 ";0", "dia")
+
+
+# front cross line with decoration
+	r = dia*0.3
+	if (P["type"] == "normal") {
+		element_line(-spacing/aspect, -dia, -spacing/aspect, +dia)
+	}
+	else if (P["type"] == "zener") {
+		element_line(-spacing/aspect, -dia, -spacing/aspect, +dia)
+		element_line(-spacing/aspect, +dia, -spacing/aspect-r, +dia)
+		element_line(-spacing/aspect, -dia, -spacing/aspect+r, -dia)
+	}
+	else if (P["type"] == "tunnel") {
+		element_line(-spacing/aspect, -dia, -spacing/aspect, +dia)
+		element_line(-spacing/aspect, +dia, -spacing/aspect+r, +dia)
+		element_line(-spacing/aspect, -dia, -spacing/aspect+r, -dia)
+	}
+	else if (P["type"] == "varactor") {
+		element_line(-spacing/aspect, -dia, -spacing/aspect, +dia)
+		element_line(-spacing/aspect-r, -dia, -spacing/aspect-r, +dia)
+	}
+	else if (P["type"] == "schottky") {
+		cx = -spacing/aspect + r
+		cy = -(dia-r)
+		element_line(-spacing/aspect, -(dia-r), -spacing/aspect, +dia-r)
+		element_arc(cx, cy, r, r, 0, -180)
+		cx = -spacing/aspect - r
+		cy = +(dia-r)
+		element_arc(cx, cy, r, r, 0, +180)
+	}
+	else if ((P["type"] != "") && (P["type"] != "none")) {
+		error("Invalid type")
+	}
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/bga
===================================================================
--- tags/2.0.1/pcblib/parametric/bga	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/bga	(revision 18980)
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), SSOP
+
+#@@example bga(map=a1:a2:a2:#:b1:!:b3:#:c1:c2:!)
+
+#@@purpose Generate ball grid array
+
+#@@desc Generate a grid of circular pads for BGA chips
+
+#@@params nx,ny,spacing,balldia,silkmark,map,width,height,automap,automap2
+
+#@@param:nx number of pins in the X direction
+#@@optional:nx
+#@@default:nx deduced from the map
+
+#@@param:ny number of pins in the Y direction
+#@@optional:ny
+#@@default:ny deduced from the map
+
+#@@param:spacing spacing between the pins
+#@@dim:spacing
+#@@default:spacing 0.5 mm
+
+#@@param:balldia diameter of a ball
+#@@dim:balldia
+#@@default:spacing 0.35 mm
+
+#@@include silkmark.help
+#@@optional:silkmark
+#@@default:silkmark square
+#@@preview_args:silkmark 3,3
+
+#@@param:map pin name map; a colon separated list of names, from left to right, rows first. If a name is empty or is a hash mark, a new row is started. If a name is a !, the given pin is missing and no pad is generated.
+#@@optional:map
+
+#@@param:width width of the box (silk rectangle x size)
+#@@dim:width
+#@@optional:width
+#@@default:width two columns wider than the array
+
+#@@param:height height of the box (silk rectangle y size)
+#@@dim:height
+#@@optional:height
+#@@default:height two columns higher than the array
+
+
+#@@param:automap assume a regular nx*ny array, automap (autonumber) the pins
+#@@optional:automap
+#@@enum:automap:none do not autonumber pins
+#@@enum:automap:alnum number y rows from A..Z (then AA..AZ) from top to bottom, number x rows from 0..nx left to right
+#@@default:none
+#@@preview_args:automap 3,3
+#@@thumbsize:automap 3
+#@@thumbnum:automap 1
+
+#@@param:automap2 change how automap behaves - multiple values separated by colon are accepted (e.g. automap2=pivot,reversex)
+#@@enum:automap2:pivot swap x and y
+#@@enum:automap2:reversex number x from right to left
+#@@enum:automap2:reversey number y from bottom up
+#@@preview_args:automap2 3,3,automap=alnum
+#@@thumbsize:automap2 3
+#@@thumbnum:automap2 1
+
+#@@param:alphabet the alphabet automap may use for rows; use A..Z if unspecified, else use the letters in this alphabet (in order). List letters without separator, e.g. ABCDEF
+#@@preview_args:automap2 3,3,automap=alnum,alphabet=QDT
+#@@thumbsize:automap2 3
+#@@thumbnum:automap2 1
+
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/bga.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/bga
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/bga.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/bga.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/bga.awk	(revision 18980)
@@ -0,0 +1,123 @@
+function pinalpha(p,    s)
+{
+	if (p >= alphabet_len)
+		s = pinalpha(int(p/alphabet_len)-1)
+	return s sprintf("%s", substr(alphabet, (p % alphabet_len)+1, 1))
+}
+
+function automap(algo, pivot, revx, revy   ,xx,yy)
+{
+	if (algo == 1) {
+		for(y = 0; y < ny; y++) {
+			if (revy)
+				yy = ny - y - 1
+			else
+				yy = y
+			for(x = 0; x < nx; x++) {
+				if (revx)
+					xx = nx - x - 1
+				else
+					xx = x
+				if (pivot)
+					MAP[x,y] = pinalpha(xx) yy+1
+				else
+					MAP[x,y] = pinalpha(yy) xx+1
+			}
+		}
+	}
+}
+
+BEGIN {
+	help_auto()
+	set_arg(P, "?spacing", "0.5mm")
+	set_arg(P, "?balldia", "0.35mm")
+	set_arg(P, "?silkmark", "arc")
+
+	proc_args(P, "nx,ny,spacing,balldia,silkmark,map,width,height,automap,automap2,alphabet", "")
+
+	step = parse_dim(P["spacing"])
+
+	half=step/2
+
+	nx = int(P["nx"])
+	ny = int(P["ny"])
+
+	alphabet = P["alphabet"]
+	if (alphabet == "")
+		alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	alphabet_len = length(alphabet)
+
+	if (P["map"] != "") {
+		v = split(P["map"], A, ":")
+		x = 0
+		y = 0
+		for(n = 1; n <= v; n++) {
+			if ((A[n] == "") || (A[n] == "#")) {
+				x = 0
+				y++
+				continue;
+			}
+			if (x > nx)
+				nx = x
+			if (y > ny)
+				ny = y
+			print x,y,A[n] > "/dev/stderr"
+			MAP[x, y] = A[n]
+			x++
+		}
+		ny++;
+	}
+	else {
+		if ((nx == "") || (ny == ""))
+			error("missing argument: need nx,ny or a map")
+		if (P["automap"] ~ "alnum")
+			automap(1, (P["automap2"] ~ "pivot"), (P["automap2"] ~ "reversex"), (P["automap2"] ~ "reversey"))
+		else if ((P["automap"] ~ "none") || (P["automap"] == "")) {
+		}
+		else
+			error("automap should be alnum or none")
+	}
+
+	balldia = parse_dim(P["balldia"])
+	bw  = parse_dim(P["width"])
+	bh  = parse_dim(P["height"])
+
+	if (bw == "")
+		bw = (nx+1)*step
+	if (bh == "")
+		bh = (ny+1)*step
+
+	xo = (nx-1)*step/2
+	yo = (ny-1)*step/2
+
+	element_begin("", "U1", nx "*" ny   ,0,0, 0, -bh)
+
+	for(x = 0; x < nx; x++) {
+		for(y = 0; y < ny; y++) {
+			xx = x * step - xo
+			yy = y * step - yo
+			name = MAP[x,y]
+			if (name == "!")
+				continue
+			if (name == "")
+				name = "NC"
+			element_pad_circle(xx, yy, balldia, name)
+		}
+	}
+
+	dimension(-xo, -yo, -xo+step, -yo, bw/2, "spacing")
+	dimension(-xo-balldia/2, +yo, -xo+balldia/2, +yo, -bw*0.75, "balldia")
+
+
+	xx = -1 * (bw/2)
+	yy = -1 * (bh/2)
+	element_rectangle(xx, yy, bw/2, bh/2)
+
+	dimension(xx, yy, bw/2, yy, bw/2, "width")
+	dimension(bw/2, yy, bw/2, bh/2, +bh/2, "height")
+
+	silkmark(P["silkmark"], xx, yy, half*1.5)
+
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/common.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/common.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/common.awk	(revision 18980)
@@ -0,0 +1,599 @@
+#@@param:pin_ringdia pin's copper ring (annulus) outer diameter (in mil by default, mm suffix can be used)
+#@@optional:pin_ringdia
+#@@dim:pin_ringdia
+
+#@@param:pin_clearance pin's copper clearance diameter (in mil by default, mm suffix can be used)
+#@@optional:pin_clearance
+#@@dim:pin_clearance
+
+#@@param:pin_mask pin's solder mask diameter (in mil by default, mm suffix can be used)
+#@@optional:pin_mask
+#@@dim:pin_mask
+
+#@@param:pin_drill copper pin's drill diameter (in mil by default, mm suffix can be used)
+#@@optional:pin_drill
+#@@dim:pin_drill
+
+#@@param:pad_thickness width of pads (in mil by default, mm suffix can be used)
+#@@optional:pad_thickness
+#@@dim:pad_thickness
+
+#@@param:pad_clearance copper clearance around the pad (in mil by default, mm suffix can be used)
+#@@optional:pad_clearance
+#@@dim:pad_clearance
+
+#@@param:pad_mask pin's solder mask (in mil by default, mm suffix can be used)
+#@@optional:pad_mask
+#@@dim:pad_mask
+
+#@@param:line_thickness silk line thickness (in mil by default, mm suffix can be used)
+#@@optional:line_thickness
+#@@dim:line_thickness
+
+BEGIN {
+	q="\""
+
+	DEFAULT["pin_ringdia"] = 8000
+	DEFAULT["pin_ringdia", "dim"] = 1
+
+	DEFAULT["pin_clearance"] = 5000
+	DEFAULT["pin_clearance", "dim"] = 1
+
+	DEFAULT["pin_mask"] = 8600
+	DEFAULT["pin_mask", "dim"] = 1
+
+	DEFAULT["pin_drill"] = 3937
+	DEFAULT["pin_drill", "dim"] = 1
+
+	DEFAULT["line_thickness"] = 1000
+	DEFAULT["line_thickness", "dim"] = 1
+
+	DEFAULT["pad_thickness"] = 2000
+	DEFAULT["pad_thickness", "dim"] = 1
+	DEFAULT["pad_clearance"] = 1000
+	DEFAULT["pad_clearance", "dim"] = 1
+	DEFAULT["pad_mask"] = 3000
+	DEFAULT["pad_mask", "dim"] = 1
+
+	DEFAULT["pin_flags"] = "__auto"
+
+	s_default=1
+	s_weak=2
+	s_explicit=3
+	
+	offs_x = 0
+	offs_y = 0
+
+	pi=3.141592654
+}
+
+# Throw an error and exit
+function error(msg)
+{
+	print "Error: " msg > "/dev/stderr"
+	exit 1
+}
+
+# return a if it is not empty, else return b
+function either(a, b)
+{
+	return a != "" ? a : b
+}
+
+# strip leading/trailing whitespaces
+function strip(s)
+{
+	sub("^[ \t\r\n]*", "", s)
+	sub("[ \t\r\n]*$", "", s)
+	return s
+}
+
+# translate coordinates
+function coord_x(x) { return int(x + offs_x) }
+function coord_y(y) { return int(y + offs_y) }
+
+# generate an element header line; any argument may be empty
+function element_begin(desc, name, value, cent_x, cent_y, text_x, text_y, text_dir, text_scale)
+{
+	if (desc == "") {
+		desc = gen "(" args ")"
+		gsub("[\r\n\t ]*[?][^,]*,[\r\n\t ]*", "", desc)
+		gsub("[\r\n\t]", " ", desc)
+	}
+	print "Element[" q q, q desc q, q name q, q value q, 
+	int(either(cent_x, 0)), int(either(cent_y, 0)),
+	int(either(text_x, 0)), int(either(text_y, 0)),
+	int(either(text_dir, 0)), int(either(text_scale, 100)), q q "]"
+	print "("
+}
+
+# generate an element footer line
+function element_end()
+{
+	print ")"
+}
+
+# generate a pin; arguments from ringdia are optional (defaults are in global vars pin_*)
+function element_pin(x, y,  number, flags,   ringdia, clearance, mask, drill, name)
+{
+	if (number == "")
+		number = ++pin_number
+
+	flags = either(flags, DEFAULT["pin_flags"])
+
+	if (flags == "__auto") {
+		if (number == 1)
+			flags = "square"
+		else
+			flags = ""
+	}
+
+	if (flags == "none")
+		flags = ""
+
+	print "	Pin[" coord_x(x), coord_y(y),
+		int(either(ringdia, DEFAULT["pin_ringdia"])), int(either(clearance, DEFAULT["pin_clearance"])), int(either(mask, DEFAULT["pin_mask"])),
+		int(either(drill, DEFAULT["pin_drill"])), q name q, q number q, q flags q "]"
+}
+
+# draw element pad
+function element_pad(x1, y1, x2, y2, thickness,   number, flags,   clearance, mask, name)
+{
+	print "	Pad[", coord_x(x1), coord_y(y1), coord_x(x2), coord_y(y2), int(either(thickness, DEFAULT["pad_thickness"])),
+		int(either(clearance, DEFAULT["pad_clearance"])), int(either(mask, DEFAULT["pad_mask"])),
+		q name q, q number q, q flags q "]"
+}
+
+# draw element pad - no thickness, but exact corner coordinates given
+function element_pad_rectangle(x1, y1, x2, y2,   number, flags,   clearance, mask, name,     th,dx,dy,cx,cy)
+{
+	if (x2 < x1) {
+		th = x2
+		x2 = x1
+		x1 = th
+	}
+	if (y2 < y1) {
+		th = y2
+		y2 = y1
+		y1 = th
+	}
+
+	dx = x2-x1
+	dy = y2-y1
+
+	if (dx >= dy) {
+		th = dy
+		cy = (y1+y2)/2
+
+		print "	Pad[", coord_x(x1)+th/2, coord_y(cy), coord_x(x2)-th/2, coord_y(cy), th,
+			int(either(clearance, DEFAULT["pad_clearance"])), int(either(mask, DEFAULT["pad_mask"])),
+			q name q, q number q, q flags q "]"
+	}
+	else {
+		th = dx
+		cx = (x1+x2)/2
+
+		print "	Pad[", coord_x(cx), coord_y(y1)+th/2, coord_x(cx), coord_y(y2)-th/2, th,
+			int(either(clearance, DEFAULT["pad_clearance"])), int(either(mask, DEFAULT["pad_mask"])),
+			q name q, q number q, q flags q "]"
+	}
+}
+
+# draw a matrix of pads; top-left corner is x1;y1, there are nx*ny pads
+# of w*h size. rows/cols of pads are drawn with ox and oy offset
+function element_pad_matrix(x1, y1, nx, ny, w, h, ox, oy,     number, flags,   clearance, mask, name,     ix,iy)
+{
+	for(iy = 0; iy < ny; iy++)
+		for(ix = 0; ix < nx; ix++)
+			element_pad_rectangle(x1+ix*ox, y1+iy*oy, x1+ix*ox+w, y1+iy*oy+h, number, flags, clearance, mask, name)
+}
+
+# draw element pad circle
+function element_pad_circle(x1, y1, radius,   number,  clearance, mask, name)
+{
+	print "	Pad[", coord_x(x1), coord_y(y1), coord_x(x1), coord_y(y1), int(either(radius, DEFAULT["pad_thickness"])),
+		int(either(clearance, DEFAULT["pad_clearance"])), int(either(mask, DEFAULT["pad_mask"])),
+		q name q, q number q, q "" q "]"
+}
+
+# draw a line on silk; thickness is optional (default: line_thickness)
+function element_line(x1, y1, x2, y2,   thickness)
+{
+	print "	ElementLine[" coord_x(x1), coord_y(y1), coord_x(x2), coord_y(y2), int(either(thickness, DEFAULT["line_thickness"])) "]"
+}
+
+function element_arrow(x1, y1, x2, y2,  asize,  thickness   ,vx,vy,nx,ny,len,xb,yb)
+{
+	element_line(x1, y1, x2,y2, thickness)
+
+	if (asize == 0)
+		asize = mil(20)
+
+	vx = x2-x1
+	vy = y2-y1
+	len = sqrt(vx*vx+vy*vy)
+	if (len != 0) {
+		vx /= len
+		vy /= len
+		nx = vy
+		ny = -vx
+		xb = x2 - vx*asize
+		yb = y2 - vy*asize
+#		element_line(x2, y2, xb + 1000, yb + 1000)
+		element_line(x2, y2, xb + nx*asize/2, yb + ny*asize/2)
+		element_line(x2, y2, xb - nx*asize/2, yb - ny*asize/2)
+		element_line(xb - nx*asize/2, yb - ny*asize/2, xb + nx*asize/2, yb + ny*asize/2)
+	}
+}
+
+# draw a rectangle of silk lines 
+# omit sides as requested in omit
+# if r is non-zero, round corners - omit applies as NW, NW, SW, SE
+# if omit includes "arc", corners are "rounded" with lines
+function element_rectangle(x1, y1, x2, y2,    omit,  r, thickness   ,tmp,r1,r2)
+{
+# order coords for round corners
+	if (x1 > x2) {
+		tmp = x1
+		x1 = x2
+		x2 = tmp
+	}
+	if (y1 > y2) {
+		tmp = y1
+		y1 = y2
+		y2 = tmp
+	}
+
+	if (!(omit ~ "left")) {
+		r1 = (omit ~ "NW") ? 0 : r
+		r2 = (omit ~ "SW") ? 0 : r
+		element_line(x1, y1+r1, x1, y2-r2, thickness)
+	}
+	if (!(omit ~ "top")) {
+		r1 = (omit ~ "NW") ? 0 : r
+		r2 = (omit ~ "NE") ? 0 : r
+		element_line(x1+r1, y1, x2-r2, y1, thickness)
+	}
+	if (!(omit ~ "bottom")) {
+		r1 = (omit ~ "SE") ? 0 : r
+		r2 = (omit ~ "SW") ? 0 : r
+		element_line(x2-r1, y2, x1+r2, y2, thickness)
+	}
+	if (!(omit ~ "right")) {
+		r1 = (omit ~ "SE") ? 0 : r
+		r2 = (omit ~ "NE") ? 0 : r
+		element_line(x2, y2-r1, x2, y1+r2, thickness)
+	}
+
+	if (r > 0) {
+		if (omit ~ "arc") {
+			if (!(omit ~ "NW"))
+				element_line(x1, y1+r, x1+r, y1)
+			if (!(omit ~ "SW"))
+				element_line(x1, y2-r, x1+r, y2)
+			if (!(omit ~ "NE"))
+				element_line(x2, y1+r, x2-r, y1)
+			if (!(omit ~ "SE"))
+				element_line(x2, y2-r, x2-r, y2)
+		}
+		else {
+			if (!(omit ~ "NW"))
+				element_arc(x1+r, y1+r, r, r, 270, 90)
+			if (!(omit ~ "SW"))
+				element_arc(x1+r, y2-r, r, r, 0, 90)
+			if (!(omit ~ "NE"))
+				element_arc(x2-r, y1+r, r, r, 180, 90)
+			if (!(omit ~ "SE"))
+				element_arc(x2-r, y2-r, r, r, 90, 90)
+		}
+	}
+}
+
+# draw a rectangle corners of silk lines, wx and wy long in x and y directions
+# omit sides as requested in omit: NW, NW, SW, SE
+# corners are always sharp
+function element_rectangle_corners(x1, y1, x2, y2, wx, wy,    omit,  thickness   ,tmp)
+{
+	if (!(omit ~ "NW")) {
+		element_line(x1, y1,     x1+wx, y1,   thickness)
+		element_line(x1, y1,     x1, y1+wy,   thickness)
+	}
+	if (!(omit ~ "NE")) {
+		element_line(x2-wx, y1,  x2, y1,    thickness)
+		element_line(x2, y1,     x2, y1+wy, thickness)
+	}
+	if (!(omit ~ "SW")) {
+		element_line(x1, y2,     x1+wx, y2, thickness)
+		element_line(x1, y2-wy,  x1, y2,    thickness)
+	}
+	if (!(omit ~ "SE")) {
+		element_line(x2-wx, y2,  x2, y2,   thickness)
+		element_line(x2, y2-wy,  x2, y2,   thickness)
+	}
+}
+
+# draw a line on silk; thickness is optional (default: line_thickness)
+function element_arc(cx, cy, rx, ry, a_start, a_delta,   thickness)
+{
+	print "	ElementArc[" coord_x(cx), coord_y(cy), int(rx), int(ry), int(a_start), int(a_delta), int(either(thickness, DEFAULT["line_thickness"])) "]"
+}
+
+
+# convert coord given in mils to footprint units
+function mil(coord)
+{
+	return coord * 100
+}
+
+# reverse mil(): converts footprint units back to mil
+function rev_mil(coord)
+{
+	return coord/100
+}
+
+
+# convert coord given in mm to footprint units
+function mm(coord)
+{
+	return coord*3937
+}
+
+# reverse mm(): converts footprint units back to mm
+function rev_mm(coord)
+{
+	return coord/3937
+}
+
+
+function set_arg_(OUT, key, value, strength)
+{
+	if (OUT[key, "strength"] > strength)
+		return
+
+	OUT[key] = value
+	OUT[key, "strength"] = strength
+}
+
+# set parameter key=value with optioal strength (s_* consts) in array OUT[]
+# set only if current strength is stronger than the original value
+# if key starts with a "?", use s_weak
+# if key is in DEFAULT[], use DEFAULT[] instead of OUT[]
+function set_arg(OUT, key, value     ,strength)
+{
+	if (strength == "")
+		strength = s_explicit
+	if (key ~ "^[?]") {
+		sub("^[?]", "", key)
+		strength = s_weak
+	}
+
+	if (key in DEFAULT) {
+		if (DEFAULT[key, "dim"]) {
+			if (value ~ "mm")
+				value = mm(value)
+			else
+				value = mil(value)
+		}
+		set_arg_(DEFAULT, key, value, strength)
+	}
+	else
+		set_arg_(OUT, key, value, strength)
+}
+
+# Process a generator argument list from arg_names. Save the result in
+# array OUT. If mandatory is specified, check whether all mandatory
+# parameters are specified
+# Both arg_names and mandatory are comma separated list of argument names
+function proc_args(OUT, arg_names,   mandatory,  N,A,M,v,n,key,val,pos)
+{
+	gsub(" ", "", arg_names)
+	gsub(" ", "", mandatory)
+	split(arg_names, N, ",")
+	v = split(args, A, ",")
+
+# fill in all named and positional arguments
+	pos = 1
+	for(n = 1; n <= v; n++) {
+		A[n] = strip(A[n])
+		if (A[n] == "")
+			continue
+		if (A[n] ~ "=") {
+#			named
+			key=A[n]
+			val=A[n]
+			sub("=.*", "", key)
+			sub("^[^=]*=", "", val)
+			set_arg(OUT, key, val, s_explicit)
+		}
+		else {
+#			positional
+			if (N[pos] == "") {
+				error("too many positional arguments at " A[n])
+			}
+			while((N[pos] in OUT) && (N[pos, "strength"] == s_explicit)) pos++
+			set_arg(OUT, N[pos], A[n], s_explicit)
+			pos++
+		}
+	}
+
+# check whether all mandatory arguments are specified
+	v = split(mandatory, M, ",")
+	for(n = 1; n <= v; n++) {
+		if (!(M[n] in OUT)) {
+			error("missing argument " M[n] " (or positional " n ")")
+			exit 1
+		}
+	}
+}
+
+# Assume h is a dimension; if it has an "mm" suffix, convert it from mm,
+# else convert it from mil.
+function parse_dim(h)
+{
+	if (h == "")
+		return ""
+	if (h ~ "mm$") {
+		sub("mm", "", h)
+		return mm(h)
+	}
+	if (h ~ "um$") {
+		sub("um", "", h)
+		return mm(h)/1000
+	}
+	if (h ~ "nm$") {
+		sub("nm", "", h)
+		return mm(h)/1000000
+	}
+	if (h ~ "cm$") {
+		sub("cm", "", h)
+		return mm(h)*10
+	}
+	if (h ~ "m$") {
+		sub("m", "", h)
+		return mm(h)*1000
+	}
+	if (h ~ "km$") {
+		sub("km", "", h)
+		return mm(h)*1000000
+	}
+
+	if (h ~ "in$") {
+		sub("in", "", h)
+		return mil(h)*1000
+	}
+	if (h ~ "dmil$") {
+		sub("dmil", "", h)
+		return mil(h)*10
+	}
+	if (h ~ "cmil$") {
+		sub("cmil", "", h)
+		return mil(h)*100
+	}
+	return mil(h)
+}
+
+# Draw a DIP outline: useful for any rectangular package with a little
+# half circle centered on the top line
+#  arcr: radius of the half circle
+#  xhalf: optional coordinate where the circle should be put
+function dip_outline(x1, y1, x2, y2, arcr   ,xhalf)
+{
+	if (xhalf == "")
+		xhalf=(x1+x2)/2
+
+	element_rectangle(x1, y1, x2, y2, "top")
+	element_line(x1, y1, xhalf-arcr, y1)
+	element_line(xhalf+arcr, y1, x2, y1)
+
+	element_arc(xhalf, y1,  arcr, arcr,  0, 180)
+}
+
+# decide whether x is true or false
+# returns 1 if true
+# returns 0 if false
+function tobool(x)
+{
+	if (x == int(x))
+		return (int(x) != 0)
+
+	x = tolower(x)
+	return (x == "true") || (x == "yes") || (x == "on")
+}
+
+# default pin1 mark on a box
+# style: mark style, ":" separated list
+# x,y: the coordinates of the origin corner (top-left)
+# half: half the stepping of the pin grid - the size of the mark
+# step: optional size of the external arrow or square (defaults to 2*half)
+function silkmark(style, x, y, half,    step,   S,n,v)
+{
+	if (step == "")
+	step = half*2
+
+	v = split(style, S, ":")
+
+	for(n = 1; n <= v; n++) {
+		if (S[n] == "angled") {
+			element_line(x+half, y,  x, y+half)
+		}
+		else if (S[n] == "square") {
+			element_line(x, y+step,  x+2*half, y+step)
+			element_line(x+step, y,  x+2*half, y+step)
+		}
+		else if ((S[n] == "external") || (S[n] == "externalx")) {
+			element_line(x, y+half,         x-step+half, y+half/2)
+			element_line(x, y+half,         x-step+half, y+half*1.5)
+			element_line(x-step+half, y+half/2,         x-step+half, y+half*1.5)
+		}
+		else if (S[n] == "externaly") {
+			element_line(x+half, y,         x-half/2+half, y-step+half)
+			element_line(x+half, y,         x+half/2+half, y-step+half)
+			element_line(x-half/2+half, y-step+half,  x+half/2+half, y-step+half)
+		}
+		else if (S[n] == "external45") {
+			element_line(x, y,       x-half, y-half/3)
+			element_line(x, y,       x-half/3, y-half)
+			element_line(x-half, y-half/3, x-half/3, y-half)
+		}
+		else if (S[n] == "arc") {
+			element_arc(x, y, step/2, step/2, 180, 270)
+		}
+		else if (S[n] == "circle") {
+			element_arc(x, y, step/2, step/2, 0, 360)
+		}
+		else if (S[n] == "dot") {
+			element_arc(x-step/2, y-step/2, step/4, step/4, 0, 360)
+		}
+		else if ((S[n] != "none") && (S[n] != "")) {
+			error("invalid silkmark parameter: " S[n])
+		}
+	}
+}
+
+# output a dimension specification between x1;y1 and x2;y2, text distance at dist
+# for a name,value pair
+# if name is empty, only value is printed
+# if value is empty, it's calculated
+# if only name should be printed, value should be "!"
+# if dist starts with a "@", it's the absolute coordinate of the center of the dim line (text base), else it's relative distance from the measured line
+function dimension(x1, y1, x2, y2, dist, name,    value,    vx,vy)
+{
+	print "#dimension", coord_x(x1), coord_y(y1), coord_x(x2), coord_y(y2), dist, name, value
+}
+
+function help_extract(SEEN, fn, dirn,     WANT,tmp)
+{
+	if (fn in SEEN)
+		return
+	SEEN[fn]++
+	print "#@@info-gen-extract " fn
+	close(fn)
+	while((getline line < fn) > 0) {
+		if (line ~ "^#@@include") {
+			sub("^#@@include[ \t]*", "", line)
+			tmp = dirn "/" line
+			WANT[tmp]++
+		}
+		else if (line ~ "^#@@")
+			print line
+	}
+	close(fn)
+	for(tmp in WANT)
+		help_extract(SEEN, tmp, dirn)
+}
+
+function help_print(   SEEN, dirn)
+{
+	print "#@@info-generator pcblib common.awk"
+	dirn = genfull
+	sub("/[^/]*$", "", dirn)
+	help_extract(SEEN, genfull, dirn)
+}
+
+function help_auto()
+{
+	if ((args ~ "^--help") || (args ~ ",[ \t]*--help")) {
+		help_print()
+		exit(0)
+	}
+}
Index: tags/2.0.1/pcblib/parametric/connector
===================================================================
--- tags/2.0.1/pcblib/parametric/connector	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/connector	(revision 18980)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+#@@example connector(2, 3, silkmark=external, spacing=100)
+
+#@@purpose Generate pin-array connectors (e.g. headers).
+
+#@@desc Generate thru-hole connectors that consits of an array of
+#@@desc evenly spaced pins, a plain frame and some optional pin marks
+#@@desc on the silk layer.
+
+#@@params nx, ny, spacing, silkmark, eshift, etrunc
+
+#@@param:nx number of pins in the X direction
+#@@param:ny number of pins in the Y direction
+#@@param:spacing spacing between the pins
+#@@dim:spacing
+#@@default:spacing 100 mil
+
+#@@include silkmark.help
+#@@optional:silkmark
+#@@default:silkmark square
+#@@preview_args:silkmark 2,3
+
+#@@param:eshift shift even rows or columns by half spacing (optional; default: don't shift)
+#@@enum:eshift:x shift columns
+#@@enum:eshift:y shift rows
+#@@enum:eshift:none do not shift anything
+#@@default:eshift none
+#@@optional:eshift
+#@@preview_args:eshift 2,3
+
+#@@param:etrunc truncate the last pin of a shifted row or column
+#@@bool:etrunc
+#@@default:etrunc false
+#@@optional:etrunc
+#@@preview_args:etrunc 2,3,eshift=x
+
+#@@param:sequence pin numbering sequence
+#@@enum:sequence:normal increase by y first, then by x
+#@@enum:sequence:pivot increase by x first, then by y
+#@@enum:sequence:zigzag "dip-style" numbering in zig-zag: number odd x rows by y ascending, even x rows by y descending
+#@@preview_args:sequence 2,4
+#@@thumbsize:sequence 3
+#@@thumbnum:sequence 1
+#@@default:sequence normal
+#@@optional:sequence
+
+
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/connector.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/connector
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/connector.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/connector.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/connector.awk	(revision 18980)
@@ -0,0 +1,88 @@
+BEGIN {
+	help_auto()
+	set_arg(P, "?spacing", 100)
+	set_arg(P, "?silkmark", "square")
+	set_arg(P, "?sequence", "normal")
+
+	proc_args(P, "nx,ny,spacing,silkmark,eshift,etrunc", "nx,ny")
+
+
+	step = parse_dim(P["spacing"])
+
+	if (pin_ringdia > step*0.9)
+		pin_ringdia = step*0.9
+
+	if (pin_drill > pin_ringdia*0.9)
+		pin_drill = pin_ringdia*0.9
+
+	half=step/2
+
+	P["nx"] = int(P["nx"])
+	P["ny"] = int(P["ny"])
+
+	eshift=tolower(P["eshift"])
+	etrunc=tobool(P["etrunc"])
+	if ((eshift != "x") && (eshift != "y") && (eshift != "") && (eshift != "none"))
+		error("eshift must be x or y or none (got: " eshift ")");
+
+	element_begin("", "CONN1", P["nx"] "*" P["ny"]    ,0,0, 0, -step)
+
+	for(x = 0; x < P["nx"]; x++) {
+		if ((eshift == "x") && ((x % 2) == 1))
+			yo = step/2
+		else
+			yo = 0
+		for(y = 0; y < P["ny"]; y++) {
+			if ((eshift == "y") && ((y % 2) == 1)) {
+				xo = step/2
+				if ((etrunc) && (x == P["nx"]-1))
+					continue
+			}
+			else {
+				xo = 0
+				if ((etrunc) && (y == P["ny"]-1) && (yo != 0))
+					continue
+			}
+			if (P["sequence"] == "normal") {
+				pinno++
+			}
+			else if (P["sequence"] == "pivot") {
+				pinno = y * P["nx"] + x + 1
+			}
+			else if (P["sequence"] == "zigzag") {
+				if (x % 2) {
+					pinno = (x+1) * P["ny"] - y
+					if ((etrunc) && (eshift == "x"))
+						pinno -= int(x/2)+1
+					else if ((etrunc) && (eshift == "y"))
+						pinno += int(x/2)
+				}
+				else {
+					pinno = x * P["ny"] + y + 1
+					if ((etrunc) && (eshift == "x"))
+						pinno -= x/2
+					else if ((etrunc) && (eshift == "y"))
+						pinno += x/2-1
+				}
+			}
+			element_pin(x * step + xo, y * step + yo, pinno)
+		}
+	}
+
+	xo = 0
+	yo = 0
+	if (!etrunc) {
+		if (eshift == "y")
+			xo = step/2
+		if (eshift == "x")
+			yo = step/2
+	}
+
+	element_rectangle(-half, -half, P["nx"] * step - half + xo, P["ny"] * step - half + yo)
+
+	silkmark(P["silkmark"], -half, -half, half)
+
+	dimension(0, step, step, step, step*2, "spacing")
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/dip
===================================================================
--- tags/2.0.1/pcblib/parametric/dip	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/dip	(revision 18980)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+#@@example dip(18)
+
+#@@purpose Generate classic DIP packages.
+
+#@@desc Generate thru-hole DIP packages with variable number of pins and
+#@@desc row spacing
+#@@params n, spacing
+
+#@@param:n number of pins
+
+#@@param:spacing spacing between the two rows of pins
+#@@dim:spacing
+#@@optional:spacing
+#@@default:spacing 100 mil
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/dip.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/dip
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/dip.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/dip.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/dip.awk	(revision 18980)
@@ -0,0 +1,28 @@
+BEGIN {
+	help_auto()
+	set_arg(P, "?spacing", 300)
+
+	proc_args(P, "n,spacing", "n")
+
+	P["n"] = int(P["n"])
+	if ((P["n"] < 2) || ((P["n"] % 2) != 0))
+		error("Number of pins have to be an even positive number")
+
+	spacing=parse_dim(P["spacing"])
+
+	element_begin("", "U1", P["n"] "*" P["spacing"]    ,0,0, 0, mil(-100))
+
+	half = mil(50)
+
+	for(n = 1; n <= P["n"]/2; n++) {
+		element_pin(0, (n-1) * mil(100), n)
+		element_pin(spacing, (n-1) * mil(100), P["n"] - n + 1)
+	}
+
+	dip_outline(-half, -half, spacing + half , (n-2) * mil(100) + half,  half)
+
+
+	dimension(0, 0, spacing, 0, mil(100), "spacing")
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/msop
===================================================================
--- tags/2.0.1/pcblib/parametric/msop	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/msop	(revision 18980)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), MSOP
+
+#@@example msop(8)
+
+#@@purpose Generate MSOP packages.
+
+#@@desc Generate MSOP packages with variable number of pins and
+#@@desc row spacing
+
+#@@include so
+#@@include common.awk
+
+
+defaults='
+?pad_spacing=0.65mm,
+?row_spacing=4.9mm,
+?int_bloat=0.6mm,
+?ext_bloat=0.4mm,
+?rarc=25,
+?silk_ext_x=18,
+?silk_ext_y=22,
+?pad_thickness=0.45mm
+'
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/so.awk -v "args=$defaults,$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/msop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/plcc
===================================================================
--- tags/2.0.1/pcblib/parametric/plcc	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/plcc	(revision 18980)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), SSOP
+
+#@@example plcc(20)
+
+#@@purpose Generate PLCC packages
+#@@desc Generate square PLCC packages - a simplified frontend to qf() - 
+#@@desc only the number of pins is really needed for a square PLCC footprint!
+#@@desc NOTE: some of the qf() parameters can be also used; PLCC32 is non-square, and can not be properly generated using this generator.
+
+#@@params pins,size,pitch,cpad_size
+
+#@@param:pins total number of pins (leads); must be divisible by 4
+
+#@@param:size a single integer N or NxN or NxNxH; outmost dimensions (width or height of the package, leads included) in mil
+#@@optional:size
+#@@default:size calculated from total number of pins and pitch
+
+#@@param:pitch lead pitch (distance between the centerline of two adjacent leads), in mil; must be 50 for now
+#@@optional:pitch
+#@@default:pitch 50mil
+
+#@@param:cpad_size width (and height) of the central pad, in mil
+#@@optional:cpad_size
+#@@default:cpad_size empty, there's no central pad
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/plcc.awk -f `dirname $0`/qf.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/plcc
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/plcc.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/plcc.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/plcc.awk	(revision 18980)
@@ -0,0 +1,58 @@
+function parri(A     ,s,i)
+{
+	for(i in A)
+		s = s " " i
+	return s
+}
+
+BEGIN {
+	help_auto()
+	PT["50"] = "26mil"
+	set_arg(P, "?pitch", "50")
+
+	proc_args(P, "pins,size,pitch,cpad_size,pad_thickness", "pins")
+
+	pitch = P["pitch"]
+	sub("[.]0*$", "", pitch)
+
+	if (!(args ~ "pad_thickness=")) {
+		if (!(pitch in PT))
+			error("Unknown pitch (" pitch "), should be one of:" parri(PT))
+		pt = PT[pitch]
+	}
+	else
+		pt = rev_mil(DEFAULT["pad_thickness"])
+
+	if (P["size"] == "")
+		P["size"] = int(P["pins"] * (pitch/4) + 140)
+
+	split(P["size"], S, "x")
+	if (S[2] == "")
+		S[2] = S[1]
+	if (S[1] != S[2])
+		error("need n*n size")
+
+	pins = int(P["pins"])
+	if (pins / 4 != int(pins / 4))
+		error("number of pins must be divisible by 4")
+
+	pins=pins/4
+
+	if ((pins % 2) != 1)
+		error("number of pins per side must be odd")
+
+	S[1] -= 60
+	S[2] -= 60
+	args = args ",nx=" pins ",ny=" pins ",x_spacing=" S[1] "mil,y_spacing=" S[2] "mil,pad_spacing=" pitch "mil,pad_thickness=" pt "mil"
+
+	args = args ",width=" S[1]-150 " mil,height=" S[2]-150 " mil"
+
+
+	if (P["cpad_size"] != "")
+		args = args ",cpad_width=" P["cpad_size"] "mil,cpad_height=" P["cpad_size"] "mil"
+
+	args = args ",int_bloat=47mil,ext_bloat=47mil"
+	args = args ",?bodysilk=plcc,?silkmark=circle,pinoffs=" int(pins/2+0.5)
+
+
+}
Index: tags/2.0.1/pcblib/parametric/qf
===================================================================
--- tags/2.0.1/pcblib/parametric/qf	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qf	(revision 18980)
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+#@@example qf(nx=4,ny=4,cpad_auto=1)
+
+#@@purpose Generate generic *qf* (e.g. tqfp, qfn) packages
+
+#@@desc Generate *qf* (e.g. tqfp, qfn) packages: smd pads around a square; this is the generic implementation, end users may want to use the specific ones, e.g. tqfp(), qfn(), etc.
+#@@params nx,ny,x_spacing,y_spacing,pad_spacing,ext_bloat,int_bloat,width,height,cpad_width,cpad_height,cpad_auto,bodysilk,pinoffs,silkmark
+
+#@@param:nx number of pins along the horizontal sides
+
+#@@param:ny number of pins along the vertical sides
+#@@optional:ny
+#@@default:ny assume ny=nx
+
+#@@param:x_spacing spacing between the two vertical rows of pins
+#@@dim:x_spacing
+#@@optional:x_spacing
+#@@default:x_spacing calculated using nx and pad_spacing
+
+#@@param:y_spacing spacing between the two vertical rows of pins
+#@@dim:y_spacing
+#@@optional:y_spacing
+#@@default:y_spacing calculated using ny and pad_spacing
+
+#@@param:pad_spacing spacing between the centerlines of two adjacent pads (aka pitch)
+#@@dim:pad_spacing
+#@@optional:pad_spacing
+
+#@@param:ext_bloat how much longer the pad should extend outwards from the end-point of the pin
+#@@dim:ext_bloat
+#@@optional:ext_bloat
+#@@default:ext_bloat 0.37 mm
+
+#@@param:int_bloat how much longer the pad should extend inwards from the end-point of the pin
+#@@dim:int_bloat
+#@@optional:int_bloat
+#@@default:int_bloat 0.37 mm
+
+#@@param:width width (horizontal, x axis size) of the box drawn on silk
+#@@dim:width
+#@@optional:width
+#@@default:width calculated from the pad row geometry
+
+#@@param:height height (vertical, y axis size) of the box drawn on silk
+#@@dim:height
+#@@optional:height
+#@@default:height calculated from the pad row geometry
+
+#@@param:cpad_width width (horizontal, x axis size) of the central pad
+#@@dim:cpad_width
+#@@optional:cpad_width
+#@@default:cpad_width empty, no central pad
+
+#@@param:cpad_height height (vertical, y axis size) of the central pad
+#@@dim:cpad_height
+#@@optional:cpad_height
+#@@default:cpad_height empty, no central pad
+
+#@@param:cpad_auto when true, calculate central pad sizes automatically from the pad row geometry
+#@@bool:cpad_auto
+#@@optional:cpad_height
+#@@default:cpad_height false, no central pad
+
+#@@param:cpm_nx central pad paste matrix, number of paste pads in x direction
+#@@optional:cpm_nx
+#@@default:cpm_nx 2
+
+#@@param:cpm_ny central pad paste matrix, number of paste pads in y direction
+#@@optional:cpm_ny
+#@@default:cpm_ny 2
+
+#@@param:cpm_width central pad paste matrix, paste pad width (dimension of each paste rectangle)
+#@@dim:cpm_width
+#@@optional:cpm_width
+#@@default:cpm_width 1mm
+
+#@@param:cpm_height central pad paste matrix, paste pad height (dimension of each paste rectangle)
+#@@dim:cpm_height
+#@@optional:cpm_height
+#@@default:cpm_height 1mm
+
+#@@param:cpad_mask center pad mask; if not specified, use the same gap as for the rows (pad_mask)
+#@@dim:cpad_mask
+#@@optional:cpad_mask
+
+#@@param:rpad_round when true, row pads are round
+#@@bool:rpad_round
+#@@optional:rpad_round
+#@@default:rpad_round false, row pads are square
+
+#@@param:bodysilk how to draw body on the silk layer
+#@@enum:bodysilk:none no drawing
+#@@enum:bodysilk:corners draw the corners, silkmark is outside of the top-left corner
+#@@enum:bodysilk:full draw a full rectanlge, silkmark of the top-left corner
+#@@enum:bodysilk:plcc angled top-left corner, horizontal line on the top
+#@@optional:bodysilk
+#@@default:bodysilk corners
+
+#@@param:pinoffs rotate pins by this amount, CW
+#@@optional:pinoffs
+#@@default:pinoffs 0
+
+#@@include silkmark.help
+#@@optional:silkmark
+#@@default:silkmark square
+#@@preview_args:silkmark 4,4
+
+#@@default:silkmark dot
+#@@include common.awk
+
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/qf.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/qf
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/qf.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/qf.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qf.awk	(revision 18980)
@@ -0,0 +1,180 @@
+function qf_globals(pre_args, post_args    ,reqs)
+{
+	DEFAULT["cpad_mask", "dim"] = 1
+
+	if (hook_spc_conv == "")
+		hook_spc_conv = 1.8
+	if (hook_cpad_mult == "")
+		hook_cpad_mult = 1
+
+	if (!qf_no_defaults) {
+		set_arg(P, "?pad_spacing", "0.5mm")
+		set_arg(P, "?ext_bloat", "0.37mm")
+		set_arg(P, "?int_bloat", "0.37mm")
+		set_arg(P, "?pad_thickness", "0.3mm")
+		set_arg(P, "?silkmark", "dot")
+		set_arg(P, "?line_thickness", "0.1mm")
+		set_arg(P, "?cpm_width", "1mm")
+		set_arg(P, "?cpm_height", "1mm")
+		set_arg(P, "?cpm_nx", "2")
+		set_arg(P, "?cpm_ny", "2")
+	}
+
+	reqs = "nx,ny"
+	
+	if (pre_args != "")
+		reqs=""
+
+	if ((post_args != "") && (!(post_args ~ "^,")))
+		post_args = "," post_args
+
+	if ((pre_args != "") && (!(pre_args ~ ",$")))
+		pre_args = pre_args ","
+
+	proc_args(P, pre_args "nx,ny,x_spacing,y_spacing,pad_spacing,ext_bloat,int_bloat,width,height,cpad_width,cpad_height,cpad_auto,cpm_nx,cpm_ny,cpm_width,cpm_height,cpad_mask,rpad_round,bodysilk,pinoffs,silkmark" post_args, reqs)
+
+	nx = int(P["nx"])
+	ny = int(P["ny"])
+
+	if (P["ny"] == "")
+		ny = nx
+
+	if ((nx < 2) || (ny < 2))
+		error("Number of pins have to be more than 2 in both directions")
+
+	x_spacing=parse_dim(P["x_spacing"])
+	y_spacing=parse_dim(P["y_spacing"])
+	pad_spacing=parse_dim(P["pad_spacing"])
+	pt = DEFAULT["pad_thickness"]
+	ext_bloat=parse_dim(P["ext_bloat"]) - pt/2
+	int_bloat=parse_dim(P["int_bloat"]) - pt/2
+	width=parse_dim(P["width"])
+	height=parse_dim(P["height"])
+	pinoffs = int(P["pinoffs"])
+
+	if (x_spacing == "")
+		x_spacing = (nx+hook_spc_conv) * pad_spacing
+	if (y_spacing == "")
+		y_spacing = (ny+hook_spc_conv) * pad_spacing
+
+	cpad_width=parse_dim(P["cpad_width"])
+	cpad_height=parse_dim(P["cpad_height"])
+
+	if (P["cpad_mask"] == "")
+		cpad_mask = (cpad_width > cpad_height ? cpad_width : cpad_height) +  either(parse_dim(P["pad_mask"]), DEFAULT["pad_mask"])
+	else
+		cpad_mask=parse_dim(P["cpad_mask"])
+
+
+	if (tobool(P["cpad_auto"]) || hook_cpad_auto) {
+		if (cpad_width == "")
+			cpad_width = (x_spacing*0.85 - int_bloat*2 - pt) * hook_cpad_mult
+		if (cpad_height == "")
+			cpad_height = (y_spacing*0.85 - int_bloat*2 - pt) * hook_cpad_mult
+	}
+
+
+	if (width == "")
+		width = x_spacing
+	if (height == "")
+		height = y_spacing
+
+	pinmax=(nx+ny)*2
+
+	if (!tobool(P["rpad_round"]))
+		rpad_round = "square"
+	else
+		rpad_round = ""
+
+
+	cpm_width = parse_dim(P["cpm_width"])
+	cpm_height = parse_dim(P["cpm_height"])
+	cpm_nx = int(P["cpm_nx"])
+	cpm_ny = int(P["cpm_ny"])
+}
+
+function pinnum(num)
+{
+	return ((num-1) + pinoffs) % (pinmax)+1
+}
+
+BEGIN {
+	help_auto()
+	qf_globals()
+
+	element_begin("", "U1", 2*nx + 2*ny   ,0,0, -width/2 - mm(1), -height/2 - mm(2))
+
+	cx = (nx+1)/2
+	cy = (ny+1)/2
+
+	for(n = 1; n <= ny; n++) {
+		y = (-cy + n) * pad_spacing
+		x1 = -x_spacing/2
+		x2 = x_spacing/2
+		element_pad(x1-ext_bloat, y, x1+int_bloat, y, pad_width, pinnum(n), rpad_round)
+		element_pad(x2-int_bloat, y, x2+ext_bloat, y, pad_width, pinnum(nx+2*ny-n+1), rpad_round)
+		if (n == 1)
+			y1 = y
+		if (n == 2)
+			dimension(x1, y1, x1, y, (ext_bloat * -3), "pad_spacing")
+	}
+
+	dimension(x1, y-pt/2, x1, y+pt/2, (ext_bloat * -3), "pad_thickness")
+
+	for(n = 1; n <= nx; n++) {
+		x = (-cx + n) * pad_spacing
+		y1 = -y_spacing/2
+		y2 = y_spacing/2
+		element_pad(x, y1-ext_bloat, x, y1+int_bloat, pad_width, pinnum(nx*2+ny*2-n+1), rpad_round)
+		element_pad(x, y2-int_bloat, x, y2+ext_bloat, pad_width, pinnum(n+ny), rpad_round)
+	}
+
+
+	if ((cpad_width != "") && (cpad_height != "")) {
+#		center pad paste matrix
+		if ((cpm_nx > 0) && (cpm_ny > 0)) {
+			ox = (cpad_width - (cpm_nx*cpm_width)) / (cpm_nx - 1)
+			oy = (cpad_height - (cpm_ny*cpm_height)) / (cpm_ny - 1)
+			element_pad_matrix(-cpad_width/2, -cpad_height/2,   cpm_nx,cpm_ny,  cpm_width,cpm_height,  ox+cpm_width,oy+cpm_height,   2*nx+2*ny+1, "square,nopaste")
+		}
+
+#		center pad
+		tmp = DEFAULT["pad_mask"]
+		DEFAULT["pad_mask"] = cpad_mask
+		element_pad_rectangle(-cpad_width/2, -cpad_height/2, +cpad_width/2, +cpad_height/2, 2*nx+2*ny+1, "square,nopaste")
+		DEFAULT["pad_mask"] = tmp
+		dimension(-cpad_width/2, -cpad_height/2, +cpad_width/2, -cpad_height/2, "@0;" (height * -0.6-ext_bloat), "cpad_width")
+		dimension(cpad_width/2, -cpad_height/2, cpad_width/2, +cpad_height/2, "@" (width * 0.8+ext_bloat) ";0", "cpad_height")
+	}
+
+	wx = (width  - nx * pad_spacing) / 3.5
+	wy = (height - ny * pad_spacing) / 3.5
+
+	bodysilk = P["bodysilk"]
+	if ((bodysilk == "corners") || (bodysilk == "")) {
+		element_rectangle_corners(-width/2, -height/2, width/2, height/2, wx, wy)
+		silkmark(P["silkmark"], -width/2 - wx/2, -height/2+wy*1.5, (wx+wy)/4)
+	}
+	else if (bodysilk == "full") {
+		element_rectangle(-width/2, -height/2, width/2, height/2)
+		silkmark(P["silkmark"], -width/2 + wx*3, -height/2+wy*3, (wx+wy)/2)
+	}
+	else if (bodysilk == "plcc") {
+		r = (width+height)/10
+		element_rectangle(-width/2, -height/2, width/2, height/2, "arc,NE,SW,SE", r)
+		element_line(-width/2, -height/2+r, width/2, -height/2+r)
+		silkmark(P["silkmark"], 0, -height*0.2, height/40)
+	}
+	else if (bodysilk != "none")
+		error("invalid bodysilk parameter")
+
+	dimension(-width/2, -height/2, +width/2, -height/2, "@0;" height*-0.8-ext_bloat,       "width")
+	dimension(+width/2, -height/2, +width/2, +height/2, "@" (width * 1+ext_bloat) ";0",  "height")
+
+	dimension(-x_spacing/2, -height/2, +x_spacing/2, -height/2, "@0;" height*-1-ext_bloat,       "x_spacing")
+	dimension(+width/2, -y_spacing/2, +width/2, +y_spacing/2, "@" (width * 1.2+ext_bloat) ";0",  "y_spacing")
+
+
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/qfn
===================================================================
--- tags/2.0.1/pcblib/parametric/qfn	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qfn	(revision 18980)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), SSOP
+
+#@@example qfn(16,3x3,0.5)
+
+#@@purpose Generate QFN packages
+#@@desc Generate QFN packages - a simplified frontend to qf() - 
+#@@desc look up 3..4 data in the datasheet and get a regular QFN footprint!
+#@@desc Should work for QFN, TQFN, etc.
+#@@desc NOTE: some of the qf() parameters can be also used.
+
+#@@params pins,size,pitch,cpad_size
+
+#@@param:pins total number of pins (leads); must be divisible by 4
+#@@param:size a single integer N or NxN or NxNxH; the pad spacing dimension (outer dimension, lead-to-lead) in mm
+#@@param:pitch lead pitch (distance between the centerline of two adjacent leads), in mm; must be one of 0.4, 0.5, 0.65
+
+#@@param:cpad_size width (and height) of the central pad, in mm
+#@@optional:cpad_size
+#@@default:cpad_size empty, there's no central pad
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/qfn.awk -f `dirname $0`/qf.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/qfn
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/qfn.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/qfn.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qfn.awk	(revision 18980)
@@ -0,0 +1,50 @@
+function parri(A     ,s,i)
+{
+	for(i in A)
+		s = s " " i
+	return s
+}
+
+BEGIN {
+	help_auto()
+	PT["0.65"] = "0.35mm"
+	PT["0.5"] = "0.3mm"
+	PT["0.4"] = "0.2mm"
+
+	proc_args(P, "pins,size,pitch,cpad_size,pad_thickness", "pins,size,pitch")
+
+	pitch = P["pitch"]
+	sub("0*$", "", pitch)
+
+	if (!(args ~ "pad_thickness=")) {
+		if (!(pitch in PT))
+			error("Unknown pitch, should be one of:" parri(PT))
+		pt = PT[pitch]
+	}
+	else
+		pt = rev_mm(DEFAULT["pad_thickness"]) "mm"
+
+	split(P["size"], S, "x")
+	if (S[2] == "")
+		S[2] = S[1]
+	if (S[1] != S[2])
+		error("need n*n size")
+
+	pins = int(P["pins"])
+	if (pins / 4 != int(pins / 4))
+		error("number of pins must be divisible by 4")
+
+	pins=pins/4
+
+
+	args = args ",nx=" pins ",ny=" pins ",x_spacing=" S[1] "mm,y_spacing=" S[2] "mm,pad_spacing=" pitch "mm,pad_thickness=" pt
+
+	if (P["cpad_size"] != "")
+		args = args ",cpad_width=" P["cpad_size"] "mm,cpad_height=" P["cpad_size"] "mm"
+
+
+	print "args=" args > "/dev/stderr"
+
+#	qf_globals("pins,size")
+
+}
Index: tags/2.0.1/pcblib/parametric/qfp
===================================================================
--- tags/2.0.1/pcblib/parametric/qfp	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qfp	(revision 18980)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), SSOP
+
+#@@example qfp(32,7x7,0.8)
+
+#@@purpose Generate QFP packages
+#@@desc Generate QFP packages - a simplified frontend to qf() - 
+#@@desc look up 3..4 data in the datasheet and get a regular QFP footprint!
+#@@desc NOTE: some of the qf() parameters can be also used.
+#@@desc Should work for QFP, TQFP, LQFP, etc.
+
+#@@params pins,size,pitch,cpad_size
+
+#@@param:pins total number of pins (leads); must be divisible by 4
+#@@param:size a single integer N or NxN or NxNxH; body dimension (width or height of the plastic body) in mm
+#@@param:pitch lead pitch (distance between the centerline of two adjacent leads), in mm; must be one of 0.4, 0.5, 0.65
+
+#@@param:cpad_size width (and height) of the central pad, in mm
+#@@optional:cpad_size
+#@@default:cpad_size empty, there's no central pad
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/qfp.awk -f `dirname $0`/qf.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/qfp
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/qfp.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/qfp.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qfp.awk	(revision 18980)
@@ -0,0 +1,52 @@
+function parri(A     ,s,i)
+{
+	for(i in A)
+		s = s " " i
+	return s
+}
+
+BEGIN {
+	help_auto()
+	PT["0.8"] = "0.55mm"
+	PT["0.65"] = "0.35mm"
+	PT["0.5"] = "0.3mm"
+	PT["0.4"] = "0.2mm"
+
+	proc_args(P, "pins,size,pitch,cpad_size,pad_thickness", "pins,size,pitch")
+
+	pitch = P["pitch"]
+	sub("0*$", "", pitch)
+
+	if (!(args ~ "pad_thickness=")) {
+		if (!(pitch in PT))
+			error("Unknown pitch, should be one of:" parri(PT))
+		pt = PT[pitch]
+	}
+	else
+		pt = rev_mm(DEFAULT["pad_thickness"]) "mm"
+
+	split(P["size"], S, "x")
+	if (S[2] == "")
+		S[2] = S[1]
+	if (S[1] != S[2])
+		error("need n*n size")
+
+	pins = int(P["pins"])
+	if (pins / 4 != int(pins / 4))
+		error("number of pins must be divisible by 4")
+
+	pins=pins/4
+
+	args = args ",width=" S[1] " mm,height=" S[2] " mm"
+
+	S[1] += 1.45
+	S[2] += 1.45
+	args = args ",nx=" pins ",ny=" pins ",x_spacing=" S[1] "mm,y_spacing=" S[2] "mm,pad_spacing=" pitch "mm,pad_thickness=" pt "mm"
+
+
+	if (P["cpad_size"] != "")
+		args = args ",cpad_width=" P["cpad_size"] "mm,cpad_height=" P["cpad_size"] "mm"
+
+	args = args ",int_bloat=0.5mm,ext_bloat=1.1mm"
+	args = args ",?bodysilk=full,?silkmark=circle"
+}
Index: tags/2.0.1/pcblib/parametric/qsop
===================================================================
--- tags/2.0.1/pcblib/parametric/qsop	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/qsop	(revision 18980)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), QSOP
+
+#@@example qsop(14)
+
+#@@purpose Generate QSOP packages.
+
+#@@desc Generate QSOP packages with variable number of pins and
+#@@desc row spacing
+
+#@@include so
+#@@include common.awk
+
+defaults='
+?pad_spacing=25mil,
+?row_spacing=213mil,
+?int_bloat=22mil,
+?ext_bloat=23mil,
+?rarc=25,
+?silk_ext_x=18,
+?silk_ext_y=22,
+?pad_thickness=16mil
+'
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/so.awk -v "args=$defaults,$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/qsop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/rcy
===================================================================
--- tags/2.0.1/pcblib/parametric/rcy	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/rcy	(revision 18980)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+#@@example rcy(300,bar+)
+
+#@@purpose Generate radial lead through-hole component
+
+#@@desc Generate radial lead through-hole component with 2 pins (typical use: electrolytic caps)
+#@@params spacing,pol,dia
+
+#@@param:spacing spacing between the two pins
+#@@dim:spacing
+
+#@@param:pol how to mark polarity:  (optional; default: sign)
+#@@enum:pol:none no marking
+#@@enum:pol:sign print + next to pin 1 and - next to pin 2
+#@@enum:pol:bar+ draw a bar inside the circle, around pin 2
+#@@enum:pol:bar- draw a bar inside the circle, around pin 1
+#@@enum:pol:bar same as bar+
+#@@enum:pol:bar+sign bar+ and sign combined
+#@@enum:pol:bar-sign bar- and sign combined
+#@@optional:pol
+#@@default:pol sign
+#@@preview_args:pol 300
+
+#@@param:dia body diameter - affects the silk circle
+#@@optional:dia
+#@@default:dia spacing*2
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/rcy.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/rcy
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/rcy.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/rcy.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/rcy.awk	(revision 18980)
@@ -0,0 +1,93 @@
+function pol_sign(   ox,oy)
+{
+	ox = offs_x
+	
+		size=mil(20)
+
+		offs_x = spacing/2 +dia/2+size*2
+		element_line(-size, 0, +size, 0)
+
+		offs_x = spacing/2 -dia/2-size*2
+		element_line(-size, 0, +size, 0)
+		element_line(0, -size, 0, +size)
+
+	offs_x = ox
+}
+
+BEGIN {
+	help_auto()
+	set_arg(P, "?pol", "sign")
+	proc_args(P, "spacing,pol,dia", "spacing")
+
+	spacing = parse_dim(P["spacing"])
+	dia = either(parse_dim(P["dia"]), spacing*2)
+
+	offs_x = +spacing/2
+
+	element_begin("", "C1", "acy" P["spacing"]    ,0,0, spacing/2-spacing/5,-mil(20))
+
+	element_pin(-spacing/2, 0, 1)
+	element_pin(+spacing/2, 0, 2)
+	dimension(-spacing/2, 0, +spacing/2, 0, dia*0.8, "spacing")
+
+
+# silk rectangle and pins
+	element_arc(0, 0, dia/2, dia/2, 0, 360)
+	dimension(-dia/2, 0, +dia/2, 0, dia*-0.8, "dia")
+
+
+	if (P["pol"] == "sign") {
+		pol_sign()
+	}
+	else if (P["pol"] ~ "^bar") {
+# determine bar side (default to -)
+		side=P["pol"]
+		sub("^bar", "", side)
+		if (side ~ "sign") {
+			pol_sign()
+			sub("sign", "", side)
+		}
+		if (side == "")
+			side = "-"
+		side = int(side "1") * -1
+
+		th = mm(1)
+		ystep = th/2
+		r = dia/2-th/2
+		xs = dia/8
+		ring = DEFAULT["pin_ringdia"]
+		for(y = 0; y < dia/2; y+=ystep) {
+			x = r*r-y*y
+			if (x < 0)
+				break
+			x = sqrt(x)
+			if (x <= xs)
+				break
+			if (y > ring/2+th/2) {
+				element_line(side*xs, y, side*x, y, th)
+				if (y != 0)
+					element_line(side*xs, -y, side*x, -y, th)
+			}
+			else {
+# keep out a rectangle around the pin
+				end1=spacing/2-ring
+				end2=spacing/2+ring
+				if (end1 > xs)
+					element_line(side*xs, y, side*end1, y, th)
+				if (end2 < x)
+					element_line(side*end2, y, side*x, y, th)
+				if (y != 0) {
+					if (end1 > xs)
+						element_line(side*xs, -y, side*end1, -y, th)
+					if (end2 < x)
+						element_line(side*end2, -y, side*x, -y, th)
+				}
+			}
+		}
+	}
+	else if ((P["pol"] != "") && (P["pol"] != "none")) {
+		error("Invalid pol")
+	}
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/screw
===================================================================
--- tags/2.0.1/pcblib/parametric/screw	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/screw	(revision 18980)
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+#@@example screw(3.2mm, 6mm, circle:hex)
+
+#@@purpose Generic screw.
+
+#@@desc Generate a "single pin" screw with optional head shapes
+#@@params hole,head,shape,ring
+
+#@@param:hole hole diameter or name of a standard screw (e.g. M3)
+#@@dim:hole
+
+
+#@@param:head head outmost diameter (or optional head name for a standard screw: pan, button, cheese, flat-washer, internal-lock-washer)
+#@@dim:head
+
+#@@param:ring copper ring outer diameter
+#@@dim:ring
+#@@optional:ring
+#@@default:ring 80% of head diameter
+
+
+#@@param:shape shape of the head drawn on silkmark; multiple values can be listed separated with colons, e.g. "shape=circle:hex"
+#@@enum:shape:circle circle
+#@@enum:shape:hex hexagon with straight line edges, size is from corner to corner
+#@@enum:shape:tx "torx": hexagon with arced edges
+#@@enum:shape:xzn "triple square"
+#@@enum:shape:ph philips slot (cross) - useful together with circle
+#@@enum:shape:slot a single straight line slot - useful together with circle
+#@@default:shape circle
+#@@preview_args:shape 3mm,6mm
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/screw.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0" -v "genfull=$0"

Property changes on: tags/2.0.1/pcblib/parametric/screw
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/screw.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/screw.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/screw.awk	(revision 18980)
@@ -0,0 +1,128 @@
+function shp(r, edges, tx      ,a,x,y,xl,yl,step,x1,y1,x2,y2,tx1,tx2,txs)
+{
+	step = 2*3.141592654/edges
+	if (tx == 1) {
+		tx1 = 0.7
+		tx2 = 0.6
+		txs = 5
+	}
+	else if (tx == 2) {
+		tx1 = 0.85
+		tx2 = 0.8
+		txs = 5
+	}
+	else if (tx == 3) {
+		tx1 = 0.2
+		tx2 = 0.2
+		txs = 3
+	}
+	for(n = 0; n <= edges; n++) {
+		a += step
+		x = cos(a)*r
+		y = sin(a)*r
+		if (xl != "") {
+			if (tx) {
+				x1 = cos(a-(txs-1)*step/txs)*r*tx1
+				y1 = sin(a-(txs-1)*step/txs)*r*tx1
+				x2 = cos(a-step/txs)*r*tx1
+				y2 = sin(a-step/txs)*r*tx1
+				x3 = cos(a-step/2)*r*tx2
+				y3 = sin(a-step/2)*r*tx2
+				element_line(xl, yl, x1, y1)
+				element_line(x, y,   x2, y2)
+				element_line(x3, y3, x1, y1)
+				element_line(x3, y3, x2, y2)
+			}
+			else
+				element_line(xl, yl, x, y)
+		}
+		xl = x
+		yl = y
+	}
+}
+
+function round_up(num, to)
+{
+	if ((num/to) == int(num/to))
+		return num
+	return int(num/to+1)*to
+}
+
+BEGIN {
+	help_auto()
+	set_arg(P, "?shape", "circle")
+	proc_args(P, "hole,head,shape,ring", "hole")
+
+	element_begin("", "S1", "screw:" P["hole"] "," P["head"]"," P["shape"]    ,0,0, 0, mil(-100))
+
+	if (P["hole"] ~ "^M") {
+		hole = P["hole"]
+		sub("^M", "", hole)
+		h = parse_dim(int(hole) "mm")
+		if ((hole ~ "tight") || (hole ~ "close.fit"))
+			hole = h * 1.05
+		else
+			hole = h * 1.1
+		hd = parse_dim(P["head"])
+		if ((hd == 0) || (hd == "")) {
+			hd = P["head"]
+			if (hd == "button")
+				head = 1.9*h 
+			else if (hd == "button")
+				head = 1.9*h 
+			else if (hd == "cheese")
+				head = round_up(1.7*h, mm(0.5))
+			else if (hd ~ "flat.washer")
+				head = round_up(2.1*h, mm(1))
+			else if ((hd == "") || (hd == "pan") || (hd ~ "int.*.lock.washer"))
+				head = 2*h
+			else
+				error("Unknown standard head: " hd)
+		}
+		else
+			head = hd
+#		print hole, head > "/dev/stderr"
+	}
+	else {
+		hole = parse_dim(P["hole"])
+		head = parse_dim(P["head"])
+	}
+
+	if (head == "")
+		error("need a standard screw name, e.g. M3, or a head diameter")
+
+	if (head < hole)
+		error("head diameter must be larger than hole diameter")
+
+	ring = parse_dim(P["ring"])
+
+	if (ring == "")
+		ring = head*0.8
+
+	element_pin(0, 0, 1, "none", ring, "", "", hole)
+
+	shape = ":" P["shape"] ":"
+
+	if (shape ~ ":circle:")
+		element_arc(0, 0, head/2, head/2, 0, 360)
+
+	if (shape ~ ":hex:")
+		shp(head/2, 6, 0)
+
+	if (shape ~ ":tx:")
+		shp(head/2, 6, 1)
+
+	if (shape ~ ":xzn:")
+		shp(head/2, 12, 2)
+
+	if (shape ~ ":ph:")
+		shp(head*0.4, 4, 3)
+
+	if (shape ~ ":slot:")
+		element_line(-head/2, 0, head/2, 0)
+
+	dimension(-head/2, 0, head/2, 0, head*0.7, "head")
+	dimension(-hole/2, 0, hole/2, 0, head*0.6, "hole")
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/silkmark.help
===================================================================
--- tags/2.0.1/pcblib/parametric/silkmark.help	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/silkmark.help	(revision 18980)
@@ -0,0 +1,11 @@
+#@@param:silkmark how to mark pin 1 on the silk layer; multiple values can be listed separated with colons, e.g. "silkmark=externalx:angled"
+#@@enum:silkmark:square a rectangle around pin 1
+#@@enum:silkmark:externalx a little triangle placed outside of the box pointing in line with the first x row
+#@@enum:silkmark:externaly a little triangle placed outside of the box pointing in line with the first y row
+#@@enum:silkmark:external45 a little triangle placed outside of the box pointing at the corner in 45 degree
+#@@enum:silkmark:external shorthand for external
+#@@enum:silkmark:angled an angled line in the corner
+#@@enum:silkmark:arc an external 270 degree arc
+#@@enum:silkmark:circle a circle, 270 degrees external
+#@@enum:silkmark:dot a small external dot
+#@@enum:silkmark:none no mark
Index: tags/2.0.1/pcblib/parametric/so
===================================================================
--- tags/2.0.1/pcblib/parametric/so	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/so	(revision 18980)
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#@@example so(14)
+
+#@@purpose Generate SO and SO-like packages.
+
+#@@desc Generate SO packages with variable number of pins and
+#@@desc row spacing
+#@@params n, row_spacing, pad_spacing
+
+#@@param:n number of pins
+
+#@@param:row_spacing spacing between the two rows of pads: distance between the end of the first and last pins
+#@@dim:row_spacing
+#@@optional:row_spacing
+#@@default:row_spacing 250 mil
+
+
+#@@param:pad_spacing spacing between the centerline of two pads
+#@@dim:pad_spacing
+#@@optional:pad_spacing
+#@@default:pad_spacing 250 mil
+
+
+#@@param:ext_bloat how much longer the pad should extend outwards from the end-point of the pin
+#@@dim:ext_bloat
+#@@optional:ext_bloat
+#@@default:ext_bloat 10 mil
+
+#@@param:int_bloat how much longer the pad should extend inwards from the end-point of the pin
+#@@dim:int_bloat
+#@@optional:int_bloat
+#@@default:int_bloat 55 mil
+
+#@@include common.awk
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/so.awk -v "args=$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/so
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/so.awk
===================================================================
--- tags/2.0.1/pcblib/parametric/so.awk	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/so.awk	(revision 18980)
@@ -0,0 +1,51 @@
+BEGIN {
+	help_auto()
+	set_arg(P, "?row_spacing", 250)
+	set_arg(P, "?pad_spacing", 50)
+	set_arg(P, "?ext_bloat", 10)
+	set_arg(P, "?int_bloat", 55)
+
+	proc_args(P, "n,row_spacing,pad_spacing,ext_bloat,int_bloat", "n")
+
+	P["n"] = int(P["n"])
+	if ((P["n"] < 2) || ((P["n"] % 2) != 0))
+		error("Number of pins have to be an even positive number")
+
+	row_spacing=parse_dim(P["row_spacing"])
+	pad_spacing=parse_dim(P["pad_spacing"])
+	ext_bloat=parse_dim(P["ext_bloat"])
+	int_bloat=parse_dim(P["int_bloat"])
+
+# translate origin to the middle (int() and -0.5 rounds it for odd number of pins)
+	offs_x = -(row_spacing/2)
+	offs_y = -int((P["n"]/4-0.5) * pad_spacing)
+
+	element_begin("", "U1", P["n"] "*" P["row_spacing"]    ,0,0, 0, mil(-100))
+
+	for(n = 1; n <= P["n"]/2; n++) {
+		y = (n-1) * pad_spacing
+		element_pad(-ext_bloat, y, int_bloat, y, pad_width, n, "square")
+		element_pad(row_spacing-int_bloat, y,  row_spacing+ext_bloat, y, pad_width,     P["n"] - n + 1, "square")
+	}
+
+	silk_dist_x = either(parse_dim(P["silk_ext_x"]), pad_spacing/2)
+	silk_dist_y = either(parse_dim(P["silk_ext_y"]), pad_spacing/2)
+	rarc = either(parse_dim(P["rarc"]), pad_spacing/2)
+
+	dip_outline(-silk_dist_x-ext_bloat, -silk_dist_y, row_spacing + silk_dist_x+ext_bloat , (n-2) * pad_spacing + silk_dist_y,  rarc)
+
+	left_dim="@" -silk_dist_x-ext_bloat-pad_spacing ";0"
+	dimension(0, 0, 0, pad_spacing, left_dim, "pad_spacing")
+	dimension(0, 0, row_spacing, 0, (pad_spacing * 1.8), "row_spacing")
+	dimension(-ext_bloat, 0, 0, 0, (pad_spacing * 1.2), "ext_bloat")
+	dimension(row_spacing-int_bloat, 0, row_spacing, 0, (pad_spacing * 1.2), "int_bloat")
+
+	th=DEFAULT["pad_thickness"]
+	y = (n-2) * pad_spacing
+	dimension(-ext_bloat-th/2, y, +int_bloat+th/2, y, (pad_spacing * -1.2), "<auto>")
+	dimension(0, y-th/2, 0, y+th/2, left_dim, "pad_thickness")
+
+#	dimension(-silk_dist_x-ext_bloat, -silk_dist_y, row_spacing + silk_dist_x+ext_bloat, -silk_dist_y, pad_spacing*2.5, "<auto>")
+
+	element_end()
+}
Index: tags/2.0.1/pcblib/parametric/ssop
===================================================================
--- tags/2.0.1/pcblib/parametric/ssop	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/ssop	(revision 18980)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), SSOP
+
+#@@example ssop(14)
+
+#@@purpose Generate SSOP packages.
+
+#@@desc Generate SSOP packages with variable number of pins and
+#@@desc row spacing
+
+#@@include so
+#@@include common.awk
+
+defaults='
+?pad_spacing=0.65mm,
+?row_spacing=7.8mm,
+?int_bloat=0.5mm,
+?ext_bloat=0.13mm,
+?rarc=25,
+?silk_ext_x=18,
+?silk_ext_y=22,
+?pad_thickness=0.45mm
+'
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/so.awk -v "args=$defaults,$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/ssop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/parametric/tssop
===================================================================
--- tags/2.0.1/pcblib/parametric/tssop	(nonexistent)
+++ tags/2.0.1/pcblib/parametric/tssop	(revision 18980)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Reference: Microchip Packaging Specification DS00000049BX (en012702.pdf), MSOP
+
+#@@example tssop(8)
+
+#@@purpose Generate TSSOP packages.
+
+#@@desc Generate TSSOP 4.4mm body packages with variable number of pins and
+#@@desc row spacing
+
+#@@include so
+#@@include common.awk
+
+
+defaults='
+?pad_spacing=0.65mm,
+?row_spacing=6.4mm,
+?int_bloat=0.6mm,
+?ext_bloat=0.4mm,
+?rarc=25,
+?silk_ext_x=18,
+?silk_ext_y=22,
+?pad_thickness=0.45mm
+'
+
+awk -f `dirname $0`/common.awk -f `dirname $0`/so.awk -v "args=$defaults,$*" -v gen=`basename $0` -v "genfull=$0"
+

Property changes on: tags/2.0.1/pcblib/parametric/tssop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/pcblib/smd/01005.fp
===================================================================
--- tags/2.0.1/pcblib/smd/01005.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/01005.fp	(revision 18980)
@@ -0,0 +1,32 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "01005" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-807 -19
+		-807 19
+		984 2000 1584 "1" "1" "square"]
+	    Pad[807 -19
+		807 19
+		984 2000 1584 "2" "2" "square"]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/0201.fp
===================================================================
--- tags/2.0.1/pcblib/smd/0201.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/0201.fp	(revision 18980)
@@ -0,0 +1,32 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "0201" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-1181 0
+		-1181 0
+		1574 2000 2174 "1" "1" "square"]
+	    Pad[1181 0
+		1181 0
+		1574 2000 2174 "2" "2" "square"]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/0402.fp
===================================================================
--- tags/2.0.1/pcblib/smd/0402.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/0402.fp	(revision 18980)
@@ -0,0 +1,32 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "0402" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-1574 -393
+		-1574 393
+		1968 2000 2568 "1" "1" "square"]
+	    Pad[1574 -393
+		1574 393
+		1968 2000 2568 "2" "2" "square"]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/0603.fp
===================================================================
--- tags/2.0.1/pcblib/smd/0603.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/0603.fp	(revision 18980)
@@ -0,0 +1,32 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "0603" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-2559 -492
+		-2559 492
+		2952 2000 3552 "1" "1" "square"]
+	    Pad[2559 -492
+		2559 492
+		2952 2000 3552 "2" "2" "square"]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/0805.fp
===================================================================
--- tags/2.0.1/pcblib/smd/0805.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/0805.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "0805" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-3543 -393
+		-3543 393
+		5118 2000 5718 "1" "1" "square"]
+	    Pad[3543 -393
+		3543 393
+		5118 2000 5718 "2" "2" "square"]
+	ElementLine[-393 -2755 393 -2755 800]
+	    ElementLine[-393 2755 393 2755 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/1008.fp
===================================================================
--- tags/2.0.1/pcblib/smd/1008.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1008.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "1008" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-5118 -2362
+		-5118 2362
+		4330 2000 4930 "1" "1" "square"]
+	    Pad[5118 -2362
+		5118 2362
+		4330 2000 4930 "2" "2" "square"]
+	ElementLine[-1377 -4527 1377 -4527 800]
+	    ElementLine[-1377 4527 1377 4527 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/1206.fp
===================================================================
--- tags/2.0.1/pcblib/smd/1206.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1206.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "1206" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-5905 -1181
+		-5905 1181
+		5118 2000 5718 "1" "1" "square"]
+	    Pad[5905 -1181
+		5905 1181
+		5118 2000 5718 "2" "2" "square"]
+	ElementLine[-2362 -3740 2362 -3740 800]
+	    ElementLine[-2362 3740 2362 3740 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/1206.scad
===================================================================
--- tags/2.0.1/pcblib/smd/1206.scad	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1206.scad	(revision 18980)
@@ -0,0 +1,15 @@
+module part_1206()
+{
+	translate([0,0,0.3]) {
+		// body
+		color([0.1,0.1,0.1])
+			cube([3.2-2*0.2,1.6,0.6], center=true);
+		// terminals
+		color([0.8,0.8,0.8]) {
+			translate([+1.5, 0, 0])
+				cube([0.2, 1.6, 0.6], center=true);
+			translate([-1.5, 0, 0])
+				cube([0.2, 1.6, 0.6], center=true);
+		}
+	}
+}
Index: tags/2.0.1/pcblib/smd/1210.fp
===================================================================
--- tags/2.0.1/pcblib/smd/1210.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1210.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "1210" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-5905 -2755
+		-5905 2755
+		5118 2000 5718 "1" "1" "square"]
+	    Pad[5905 -2755
+		5905 2755
+		5118 2000 5718 "2" "2" "square"]
+	ElementLine[-1968 -5314 1968 -5314 800]
+	    ElementLine[-1968 5314 1968 5314 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/1806.fp
===================================================================
--- tags/2.0.1/pcblib/smd/1806.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1806.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "1806" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-7874 -3543
+		-7874 3543
+		6299 2000 6899 "1" "1" "square"]
+	    Pad[7874 -3543
+		7874 3543
+		6299 2000 6899 "2" "2" "square"]
+	ElementLine[-3149 -6692 3149 -6692 800]
+	    ElementLine[-3149 6692 3149 6692 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/1825.fp
===================================================================
--- tags/2.0.1/pcblib/smd/1825.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/1825.fp	(revision 18980)
@@ -0,0 +1,34 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# grab the input values and convert to 1/100 mil
+	# how much to grow the pads by for soldermask [1/100 mil]
+	# clearance from planes [1/100 mil]
+	# silk screen width  [1/100 mil]
+	# courtyard silk screen width  [1/100 mil]
+# element_flags, description, pcb-name, value, mark_x, mark_y,
+# text_x, text_y, text_direction, text_scale, text_flags
+Element[0x00000000 "Standard SMT resistor, capacitor etc" "" "1825" 0 0 -3150 -3150 0 100 ""]
+(
+# 
+# Pad[x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags]
+	Pad[-7874 -10236
+		-7874 10236
+		6299 2000 6899 "1" "1" "square"]
+	    Pad[7874 -10236
+		7874 10236
+		6299 2000 6899 "2" "2" "square"]
+	ElementLine[-3149 -13385 3149 -13385 800]
+	    ElementLine[-3149 13385 3149 13385 800]
+#
+# This draws a 1 mil placement courtyard outline in silk.  It should probably
+# not be included since you wont want to try and fab a 1 mil silk line.  Then
+# again, it is most useful during parts placement.  It really is time for some
+# additional non-fab layers...
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+#	ElementLine[eval(-1*V1/2) eval(-1*V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(   V1/2) eval(-1*V2/2) CYW]
+#	ElementLine[eval(   V1/2) eval(   V2/2) eval(-1*V1/2) eval(   V2/2) CYW]
+)
Index: tags/2.0.1/pcblib/smd/2706.fp
===================================================================
--- tags/2.0.1/pcblib/smd/2706.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/2706.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:resistor
+##for:capacitor
+##for:led
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "Standard SMT resistor, capacitor etc" "" "2706" 0 0 179 0 3 100 0x00)
+(
+	ElementLine(-159 -54 -159 54 10)
+	    ElementLine(-159 54 159 54 10)
+	    ElementLine(159 54 159 -54 10)
+	    ElementLine(159 -54 -159 -54 10)
+	Pad(-108 -3 
+		-108 3
+		78 20 84 "1" "1" 0x00000100)
+	    Pad(108 -3 
+		108 3
+		78 20 84 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/DO214.fp
===================================================================
--- tags/2.0.1/pcblib/smd/DO214.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/DO214.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "DO214" 0 0 221 0 3 100 0x00)
+(
+	ElementLine(-211 -89 -211 89 20)
+	    ElementLine(-211 89 -141 114 10)
+	    ElementLine(-141 114 201 114 10)
+	    ElementLine(201 114 201 -114 10)
+	    ElementLine(201 -114 -141 -114 10)
+	    ElementLine(-141 -114 -211 -89 10)
+	Pad(-106 -19 
+		-106 19
+		140 20 146 "1" "1" 0x00000100)
+	    Pad(106 -19 
+		106 19
+		140 20 146 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/DO214AB.fp
===================================================================
--- tags/2.0.1/pcblib/smd/DO214AB.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/DO214AB.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "DO214AB" 0 0 227 0 3 100 0x00)
+(
+	ElementLine(-217 -92 -217 92 20)
+	    ElementLine(-217 92 -145 118 10)
+	    ElementLine(-145 118 207 118 10)
+	    ElementLine(207 118 207 -118 10)
+	    ElementLine(207 -118 -145 -118 10)
+	    ElementLine(-145 -118 -217 -92 10)
+	Pad(-109 -20 
+		-109 20
+		145 20 151 "1" "1" 0x00000100)
+	    Pad(109 -20 
+		109 20
+		145 20 151 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/MPAK.fp
===================================================================
--- tags/2.0.1/pcblib/smd/MPAK.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/MPAK.fp	(revision 18980)
@@ -0,0 +1,31 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+Element(0x00 "Pressure transducer" "" "MPAK" 235 0 3 100 0x00)
+(
+	ElementLine(0 0 0 558 10)
+	ElementLine(0 558 215 558 10)
+	ElementLine(215 558 215 0 10)
+	ElementLine(215 0 0 0 10)
+	# 1st pin on pin side
+	Pad(32 469
+	    32 525
+			   31 "1" "1" 0x100)
+	Pad(82 469
+	       82 525
+			   31 "2" "2" 0x100)
+	   Pad(132 469
+	       132 525
+			   31 "3" "3" 0x100)
+	# last pin on pin side
+	Pad(182 469
+	    182 525
+			   31 "4" "4" 0x100)
+	# extra wide pin on opposite side
+	Pad(144 60
+	    70 60
+			   87 "5" "5" 0x100)
+	Mark(32 497)
+)
Index: tags/2.0.1/pcblib/smd/SC70_3.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SC70_3.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SC70_3.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 3 pins" "" "SC70_3" 114 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 94 119 10)
+	ElementLine(94 119 94 0 10)
+	ElementLine(94 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(21 91
+	       21 97
+			   29
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(72 91
+	    72 97
+			   29
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(47 21
+	       47 27
+			   29
+			      "3" "3" 0x100)
+	# 2nd side, 1st pin
+	Mark(21 94)
+)
Index: tags/2.0.1/pcblib/smd/SC70_4.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SC70_4.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SC70_4.fp	(revision 18980)
@@ -0,0 +1,40 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 4 pins" "" "SC70_4" 114 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 94 119 10)
+	ElementLine(94 119 94 0 10)
+	ElementLine(94 0 0 0 10)
+	# 1st side, 1st pin
+	# extra width
+	   Pad(24 94
+	       27 94
+			   29
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(72 91
+	    72 97
+			   29
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	Pad(72 21
+	       72 27
+			   29
+			      "3" "3" 0x100)
+	# 2nd side, 2nd pin
+	# 2nd side, 1st pin
+	Pad(21 21
+	       21 27
+			   29
+			      "4" "4" 0x100)
+	Mark(21 94)
+)
Index: tags/2.0.1/pcblib/smd/SC90.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SC90.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SC90.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 3 pins" "" "SC90" 93 0 3 100 0x00)
+(
+	ElementLine(0 0 0 98 10)
+	ElementLine(0 98 73 98 10)
+	ElementLine(73 98 73 0 10)
+	ElementLine(73 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(17 76
+	       17 80
+			   24
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(56 76
+	    56 80
+			   24
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(36 17
+	       36 21
+			   24
+			      "3" "3" 0x100)
+	# 2nd side, 1st pin
+	Mark(17 78)
+)
Index: tags/2.0.1/pcblib/smd/SOD106A.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD106A.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD106A.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD106A" 0 0 166 0 3 100 0x00)
+(
+	ElementLine(-156 -68 -156 68 20)
+	    ElementLine(-156 68 -105 87 10)
+	    ElementLine(-105 87 146 87 10)
+	    ElementLine(146 87 146 -87 10)
+	    ElementLine(146 -87 -105 -87 10)
+	    ElementLine(-105 -87 -156 -68 10)
+	Pad(-76 -17 
+		-76 17
+		102 20 108 "1" "1" 0x00000100)
+	    Pad(76 -17 
+		76 17
+		102 20 108 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOD110.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD110.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD110.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD110" 0 0 83 0 3 100 0x00)
+(
+	ElementLine(-73 -38 -73 38 20)
+	    ElementLine(-73 38 -50 49 10)
+	    ElementLine(-50 49 63 49 10)
+	    ElementLine(63 49 63 -49 10)
+	    ElementLine(63 -49 -50 -49 10)
+	    ElementLine(-50 -49 -73 -38 10)
+	Pad(-29 -15 
+		-29 15
+		46 20 52 "1" "1" 0x00000100)
+	    Pad(29 -15 
+		29 15
+		46 20 52 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOD123.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD123.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD123.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD123" 0 0 120 0 3 100 0x00)
+(
+	ElementLine(-110 -40 -110 40 20)
+	    ElementLine(-110 40 -76 51 10)
+	    ElementLine(-76 51 100 51 10)
+	    ElementLine(100 51 100 -51 10)
+	    ElementLine(100 -51 -76 -51 10)
+	    ElementLine(-76 -51 -110 -40 10)
+	Pad(-55 -6 
+		-55 6
+		69 20 75 "1" "1" 0x00000100)
+	    Pad(55 -6 
+		55 6
+		69 20 75 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOD323.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD323.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD323.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD323" 0 0 93 0 3 100 0x00)
+(
+	ElementLine(-83 -35 -83 35 20)
+	    ElementLine(-83 35 -58 45 10)
+	    ElementLine(-58 45 73 45 10)
+	    ElementLine(73 45 73 -45 10)
+	    ElementLine(73 -45 -58 -45 10)
+	    ElementLine(-58 -45 -83 -35 10)
+	Pad(-37 -10 
+		-37 10
+		51 20 57 "1" "1" 0x00000100)
+	    Pad(37 -10 
+		37 10
+		51 20 57 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOD80.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD80.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD80.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD80" 0 0 116 0 3 100 0x00)
+(
+	ElementLine(-106 -43 -106 43 20)
+	    ElementLine(-106 43 -80 55 10)
+	    ElementLine(-80 55 96 55 10)
+	    ElementLine(96 55 96 -55 10)
+	    ElementLine(96 -55 -80 -55 10)
+	    ElementLine(-80 -55 -106 -43 10)
+	Pad(-58 -16 
+		-58 16
+		53 20 59 "1" "1" 0x00000100)
+	    Pad(58 -16 
+		58 16
+		53 20 59 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOD87.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOD87.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOD87.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:diode
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOD87" 0 0 124 0 3 100 0x00)
+(
+	ElementLine(-114 -57 -114 57 20)
+	    ElementLine(-114 57 -84 73 10)
+	    ElementLine(-84 73 104 73 10)
+	    ElementLine(104 73 104 -73 10)
+	    ElementLine(104 -73 -84 -73 10)
+	    ElementLine(-84 -73 -114 -57 10)
+	Pad(-58 -26 
+		-58 26
+		61 20 67 "1" "1" 0x00000100)
+	    Pad(58 -26 
+		58 26
+		61 20 67 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/SOT143.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT143.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT143.fp	(revision 18980)
@@ -0,0 +1,38 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 4 pins" "" "SOT143" 144 0 3 100 0x00)
+(
+	ElementLine(0 0 0 139 10)
+	ElementLine(0 139 124 139 10)
+	ElementLine(124 139 124 0 10)
+	ElementLine(124 0 0 0 10)
+	# 1st side, 1st pin
+	# extra width
+	   Pad(28 110
+	       31 110
+			   34
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(99 107
+	    99 113
+			   34
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	Pad(99 25
+	       99 31
+			   34
+			      "3" "3" 0x100)
+	# 2nd side, 2nd pin
+	# 2nd side, 1st pin
+	Pad(25 25
+	       25 31
+			   34
+			      "4" "4" 0x100)
+	Mark(25 110)
+)
Index: tags/2.0.1/pcblib/smd/SOT223.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT223.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT223.fp	(revision 18980)
@@ -0,0 +1,29 @@
+##from:pcb
+##for:transistor
+
+Element(0x00 "SMT transistor, 4 pins" "" "SOT223" 305 0 3 100 0x00)
+(
+	ElementLine(0 0 0 414 10)
+	ElementLine(0 414 285 414 10)
+	ElementLine(285 414 285 0 10)
+	ElementLine(285 0 0 0 10)
+	# 1st pin on pin side
+	Pad(52 296
+	    52 362
+			   56
+			      "1" "1" 0x100)
+	Pad(142 296
+	       142 362
+			   56
+			      "2" "2" 0x100)
+	# last pin on pin side
+	Pad(233 296
+	    233 362
+			   56
+			      "3" "3" 0x100)
+	# extra wide pin on opposite side
+	Pad(187 85
+	    97 85
+			   122 "4" "4" 0x100)
+	Mark(52 329)
+)
Index: tags/2.0.1/pcblib/smd/SOT23.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT23.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT23.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 3 pins" "" "SOT23" 148 0 3 100 0x00)
+(
+	ElementLine(0 0 0 139 10)
+	ElementLine(0 139 128 139 10)
+	ElementLine(128 139 128 0 10)
+	ElementLine(128 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(25 107
+	       25 113
+			   34
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(103 107
+	    103 113
+			   34
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(64 25
+	       64 31
+			   34
+			      "3" "3" 0x100)
+	# 2nd side, 1st pin
+	Mark(25 110)
+)
Index: tags/2.0.1/pcblib/smd/SOT23D.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT23D.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT23D.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOT23D" 148 0 3 100 0x00)
+(
+	ElementLine(0 0 0 139 10)
+	ElementLine(0 139 128 139 10)
+	ElementLine(128 139 128 0 10)
+	ElementLine(128 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(25 107
+	       25 113
+			   34
+			      "2" "2" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(103 107
+	    103 113
+			   34
+			      "3" "3" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(64 25
+	       64 31
+			   34
+			      "1" "1" 0x100)
+	# 2nd side, 1st pin
+	Mark(25 110)
+)
Index: tags/2.0.1/pcblib/smd/SOT25.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT25.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT25.fp	(revision 18980)
@@ -0,0 +1,38 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 5 pins" "" "SOT25" 138 0 3 100 0x00)
+(
+	ElementLine(0 0 0 139 10)
+	ElementLine(0 139 118 139 10)
+	ElementLine(118 139 118 0 10)
+	ElementLine(118 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(20 102
+	       20 118
+			   24 "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(98 102
+	    98 118
+			   24 "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	Pad(98 20
+	       98 36
+			   24 "3" "3" 0x100)
+	# 2nd side, 2nd pin
+	Pad(59 20
+	       59 36
+			   24 "4" "4" 0x100)
+	# 2nd side, 1st pin
+	Pad(20 20
+	       20 36
+			   24 "5" "5" 0x100)
+	Mark(20 110)
+)
Index: tags/2.0.1/pcblib/smd/SOT26.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT26.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT26.fp	(revision 18980)
@@ -0,0 +1,41 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 6 pins" "" "SOT26" 138 0 3 100 0x00)
+(
+	ElementLine(0 0 0 139 10)
+	ElementLine(0 139 118 139 10)
+	ElementLine(118 139 118 0 10)
+	ElementLine(118 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(20 102
+	       20 118
+			   24 "1" "1" 0x100)
+	# 1st side, 2nd pin
+	Pad(59 102
+	       59 118
+			   24 "2" "2" 0x100)
+	# 1st side, 3rd pin
+	Pad(98 102
+	    98 118
+			   24 "3" "3" 0x100)
+	# 2nd side, 3rd pin
+	Pad(98 20
+	       98 36
+			   24 "4" "4" 0x100)
+	# 2nd side, 2nd pin
+	Pad(59 20
+	       59 36
+			   24 "5" "5" 0x100)
+	# 2nd side, 1st pin
+	Pad(20 20
+	       20 36
+			   24 "6" "6" 0x100)
+	Mark(20 110)
+)
Index: tags/2.0.1/pcblib/smd/SOT323.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT323.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT323.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT transistor, 3 pins" "" "SOT323" 114 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 94 119 10)
+	ElementLine(94 119 94 0 10)
+	ElementLine(94 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(21 91
+	       21 97
+			   29
+			      "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(72 91
+	    72 97
+			   29
+			      "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(47 21
+	       47 27
+			   29
+			      "3" "3" 0x100)
+	# 2nd side, 1st pin
+	Mark(21 94)
+)
Index: tags/2.0.1/pcblib/smd/SOT323D.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT323D.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT323D.fp	(revision 18980)
@@ -0,0 +1,33 @@
+##from:pcb
+##for:transistor
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+Element(0x00 "SMT diode (pin 1 is cathode)" "" "SOT323D" 114 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 94 119 10)
+	ElementLine(94 119 94 0 10)
+	ElementLine(94 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(21 91
+	       21 97
+			   29
+			      "2" "2" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(72 91
+	    72 97
+			   29
+			      "3" "3" 0x100)
+	# 2nd side, 3rd pin
+	# 2nd side, 2nd pin
+	Pad(47 21
+	       47 27
+			   29
+			      "1" "1" 0x100)
+	# 2nd side, 1st pin
+	Mark(21 94)
+)
Index: tags/2.0.1/pcblib/smd/SOT325.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT325.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT325.fp	(revision 18980)
@@ -0,0 +1,40 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+# alias sc70-5
+Element(0x00 "SMT transistor, 5 pins" "" "SOT325" 100 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 80 119 10)
+	ElementLine(80 119 80 0 10)
+	ElementLine(80 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(14 84
+	       14 104
+			   15 "1" "1" 0x100)
+	# 1st side, 2nd pin
+	# 1st side, 3rd pin
+	Pad(65 84
+	    65 104
+			   15 "2" "2" 0x100)
+	# 2nd side, 3rd pin
+	Pad(65 14
+	       65 34
+			   15 "3" "3" 0x100)
+	# 2nd side, 2nd pin
+	Pad(40 14
+	       40 34
+			   15 "4" "4" 0x100)
+	# 2nd side, 1st pin
+	Pad(14 14
+	       14 34
+			   15 "5" "5" 0x100)
+	Mark(14 94)
+)
Index: tags/2.0.1/pcblib/smd/SOT326.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT326.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT326.fp	(revision 18980)
@@ -0,0 +1,42 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+	                             # 78 for SOT23
+	                             # 82 for SOT23
+	      # 41 for SOT23
+	               # 34 for SOT23, 24 for SOT25
+# alias sc70-6
+Element(0x00 "SMT transistor, 6 pins" "" "SOT326" 100 0 3 100 0x00)
+(
+	ElementLine(0 0 0 119 10)
+	ElementLine(0 119 80 119 10)
+	ElementLine(80 119 80 0 10)
+	ElementLine(80 0 0 0 10)
+	# 1st side, 1st pin
+	Pad(14 84
+	       14 104
+			   15 "1" "1" 0x100)
+	# 1st side, 2nd pin
+	Pad(40 84
+	       40 104
+			   15 "2" "2" 0x100)
+	# 1st side, 3rd pin
+	Pad(65 84
+	    65 104
+			   15 "3" "3" 0x100)
+	# 2nd side, 3rd pin
+	Pad(65 14
+	       65 34
+			   15 "4" "4" 0x100)
+	# 2nd side, 2nd pin
+	Pad(40 14
+	       40 34
+			   15 "5" "5" 0x100)
+	# 2nd side, 1st pin
+	Pad(14 14
+	       14 34
+			   15 "6" "6" 0x100)
+	Mark(14 94)
+)
Index: tags/2.0.1/pcblib/smd/SOT89.fp
===================================================================
--- tags/2.0.1/pcblib/smd/SOT89.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/SOT89.fp	(revision 18980)
@@ -0,0 +1,31 @@
+##from:pcb
+##for:transistor
+##for:stabilizer
+##for:linear
+
+Element(0x00 "SMT transistor, 4 pins" "" "SOT89" 203 0 3 100 0x00)
+(
+	ElementLine(0 0 0 207 10)
+	ElementLine(0 207 183 207 10)
+	ElementLine(183 207 183 0 10)
+	ElementLine(183 0 0 0 10)
+	# 1st pin on pin side
+	Pad(30 152
+	    30 176
+			   37
+			      "1" "1" 0x100)
+	Pad(91 152
+	       91 176
+			   37
+			      "2" "2" 0x100)
+	# last pin on pin side
+	Pad(152 152
+	    152 176
+			   37
+			      "3" "3" 0x100)
+	# extra wide pin on opposite side
+	Pad(121 42
+	    61 42
+			   61 "4" "4" 0x100)
+	Mark(30 164)
+)
Index: tags/2.0.1/pcblib/smd/TANT_A.fp
===================================================================
--- tags/2.0.1/pcblib/smd/TANT_A.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/TANT_A.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:capacitor
+##for:tantal
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_A" 0 0 106 0 3 100 0x00)
+(
+	ElementLine(-96 -43 -96 43 20)
+	    ElementLine(-96 43 -72 55 10)
+	    ElementLine(-72 55 86 55 10)
+	    ElementLine(86 55 86 -55 10)
+	    ElementLine(86 -55 -72 -55 10)
+	    ElementLine(-72 -55 -96 -43 10)
+	Pad(-50 -18 
+		-50 18
+		49 20 55 "1" "1" 0x00000100)
+	    Pad(50 -18 
+		50 18
+		49 20 55 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/TANT_B.fp
===================================================================
--- tags/2.0.1/pcblib/smd/TANT_B.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/TANT_B.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:capacitor
+##for:tantal
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_B" 0 0 132 0 3 100 0x00)
+(
+	ElementLine(-122 -77 -122 77 20)
+	    ElementLine(-122 77 -87 99 10)
+	    ElementLine(-87 99 112 99 10)
+	    ElementLine(112 99 112 -99 10)
+	    ElementLine(112 -99 -87 -99 10)
+	    ElementLine(-87 -99 -122 -77 10)
+	Pad(-55 -41 
+		-55 41
+		71 20 77 "1" "1" 0x00000100)
+	    Pad(55 -41 
+		55 41
+		71 20 77 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/TANT_C.fp
===================================================================
--- tags/2.0.1/pcblib/smd/TANT_C.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/TANT_C.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:capacitor
+##for:tantal
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_C" 0 0 188 0 3 100 0x00)
+(
+	ElementLine(-178 -87 -178 87 20)
+	    ElementLine(-178 87 -130 112 10)
+	    ElementLine(-130 112 168 112 10)
+	    ElementLine(168 112 168 -112 10)
+	    ElementLine(168 -112 -130 -112 10)
+	    ElementLine(-130 -112 -178 -87 10)
+	Pad(-94 -39 
+		-94 39
+		97 20 103 "1" "1" 0x00000100)
+	    Pad(94 -39 
+		94 39
+		97 20 103 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/TANT_D.fp
===================================================================
--- tags/2.0.1/pcblib/smd/TANT_D.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/TANT_D.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:capacitor
+##for:tantal
+
+	# how much to grow the pads by for soldermask
+	# clearance from planes
+Element(0x00 "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_D" 0 0 229 0 3 100 0x00)
+(
+	ElementLine(-219 -117 -219 117 20)
+	    ElementLine(-219 117 -158 150 10)
+	    ElementLine(-158 150 209 150 10)
+	    ElementLine(209 150 209 -150 10)
+	    ElementLine(209 -150 -158 -150 10)
+	    ElementLine(-158 -150 -219 -117 10)
+	Pad(-115 -56 
+		-115 56
+		123 20 129 "1" "1" 0x00000100)
+	    Pad(115 -56 
+		115 56
+		123 20 129 "2" "2" 0x00000100)
+)
Index: tags/2.0.1/pcblib/smd/minimelf.fp
===================================================================
--- tags/2.0.1/pcblib/smd/minimelf.fp	(nonexistent)
+++ tags/2.0.1/pcblib/smd/minimelf.fp	(revision 18980)
@@ -0,0 +1,12 @@
+##from:repo.hu/projects/openhw
+##for:diode
+
+
+Element["" "" "D101" "" 145669 141732 -3720 -2087 0 70 ""]
+(
+	Pad[7087 -984 7087 984 5118 5000 7618 "" "1" "square"]
+	Pad[-7087 -984 -7087 984 5118 5000 7618 "" "2" "square"]
+	ElementLine [-3937 -3150 3937 -3150 787]
+	ElementLine [-3937 3150 3937 3150 787]
+
+	)
Index: tags/2.0.1/pcblib/smd/sot23.scad
===================================================================
--- tags/2.0.1/pcblib/smd/sot23.scad	(nonexistent)
+++ tags/2.0.1/pcblib/smd/sot23.scad	(revision 18980)
@@ -0,0 +1,36 @@
+
+module sot23()
+{
+
+	// pin prototype
+	module pin(length, height, thick)
+	{
+		linear_extrude(height=thick)
+			scale([length, -height, 1])
+				polygon([[0.3400,0.0000],[0.3900,0.0100],[0.4300,0.0300],[0.4600,0.0600],[0.4789,0.0908],[0.6279,0.8307],[0.6500,0.8600],[0.6900,0.8900],[0.7300,0.9000],[1.0000,0.9000],[1.0000,1.0000],[0.6700,1.0012],[0.6100,0.9900],[0.5600,0.9600],[0.5300,0.9200],[0.5200,0.9000],[0.3721,0.1693],[0.3500,0.1400],[0.3100,0.1100],[0.2700,0.1000],[0.0000,0.1000],[0.0000,0.0000]]);
+	}
+
+	rotate([90,0,-90]) scale([1.13,1.13,1.13]) translate([-0.9, 0.4, -2.1 - 0.43/2]) {
+		// body
+		color([0.1,0.1,0.1])
+			linear_extrude(height=2.9)
+				polygon([[-0.55,0],[-0.45,0.53],[0.45,0.53],[0.55,0],[0.45,-0.35],[-0.45,-0.35]]);
+
+		// 3 pins
+		color([0.9, 0.9, 0.9]) {
+			translate([0.5,0,0.5-0.43/2])
+				pin(0.5, 0.4, 0.43);
+
+			translate([0.5,0,2.3-0.43/2])
+				pin(0.5, 0.4, 0.43);
+
+			translate([-0.5,0,1.45-0.43/2])
+				pin(-0.5, 0.4, 0.43);
+		}
+	}
+}
+
+
+sot23();
+
+cube([0.1,0.1,0.1]);
Index: tags/2.0.1/pcblib/tru-hole/HC49.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC49.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC49.fp	(revision 18980)
@@ -0,0 +1,13 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC49" 0 -60 0 100 0x00)
+(
+	Pin(50 50 60 28 "1" 0x101)
+	Pin(250 50 60 28 "2" 0x01)
+	ElementLine(50 0 250 0 20)
+	ElementArc(250 50 50 50 90 180 20)
+	ElementLine(250 100 50 100 20)
+	ElementArc(50 50 50 50 270 180 20)
+	Mark(50 50)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC49U.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC49U.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC49U.fp	(revision 18980)
@@ -0,0 +1,13 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC49U" 0 -60 0 100 0x00)
+(
+	Pin(121 91 60 32 "1" 0x101)
+	Pin(313 91 60 32 "2" 0x01)
+	ElementLine(91 0 344 0 20)
+	ElementArc(344 91 91 91 90 180 20)
+	ElementLine(344 183 91 183 20)
+	ElementArc(91 91 91 91 270 180 20)
+	Mark(121 91)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC49UH.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC49UH.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC49UH.fp	(revision 18980)
@@ -0,0 +1,13 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC49UH" 0 -60 0 100 0x00)
+(
+	Pin(121 615 60 32 "1" 0x101)
+	Pin(313 615 60 32 "2" 0x01)
+	ElementLine(0 0 435 0 20)
+	ElementLine(435 0 435 515 20)
+	ElementLine(435 515 0 515 20)
+	ElementLine(0 515 0 0 20)
+	Mark(121 615)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC49U_3.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC49U_3.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC49U_3.fp	(revision 18980)
@@ -0,0 +1,14 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC49U_3" 0 -60 0 100 0x00)
+(
+	Pin(121 91 60 32 "1" 0x101)
+	Pin(217 91 60 32 "2" 0x01)
+	Pin(313 91 60 32 "3" 0x01)
+	ElementLine(91 0 344 0 20)
+	ElementArc(344 91 91 91 90 180 20)
+	ElementLine(344 183 91 183 20)
+	ElementArc(91 91 91 91 270 180 20)
+	Mark(121 91)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC49U_3H.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC49U_3H.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC49U_3H.fp	(revision 18980)
@@ -0,0 +1,14 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC49U_3H" 0 -60 0 100 0x00)
+(
+	Pin(121 615 60 32 "1" 0x101)
+	Pin(217 615 60 32 "2" 0x01)
+	Pin(313 615 60 32 "3" 0x01)
+	ElementLine(0 0 435 0 20)
+	ElementLine(435 0 435 515 20)
+	ElementLine(435 515 0 515 20)
+	ElementLine(0 515 0 0 20)
+	Mark(121 615)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC51U.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC51U.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC51U.fp	(revision 18980)
@@ -0,0 +1,13 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC51U" 0 -60 0 100 0x00)
+(
+	Pin(136 176 80 40 "1" 0x101)
+	Pin(621 176 80 40 "2" 0x01)
+	ElementLine(176 0 581 0 20)
+	ElementArc(581 176 176 176 90 180 20)
+	ElementLine(581 352 176 352 20)
+	ElementArc(176 176 176 176 270 180 20)
+	Mark(136 176)
+)
Index: tags/2.0.1/pcblib/tru-hole/HC51UH.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HC51UH.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HC51UH.fp	(revision 18980)
@@ -0,0 +1,13 @@
+##from:pcb
+##for:crystal
+##for:xtal
+Element(0x00 "Crystals" "" "HC51UH" 0 -60 0 100 0x00)
+(
+	Pin(136 975 80 40 "1" 0x101)
+	Pin(621 975 80 40 "2" 0x01)
+	ElementLine(0 0 757 0 20)
+	ElementLine(757 0 757 775 20)
+	ElementLine(757 775 0 775 20)
+	ElementLine(0 775 0 0 20)
+	Mark(136 975)
+)
Index: tags/2.0.1/pcblib/tru-hole/HEPTAWATT.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/HEPTAWATT.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/HEPTAWATT.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:IC
+Element(0x00 "Power IC, as in MULTIWATT15" "" "HEPTAWATT" 469 50 3 100 0x00)
+(
+       Pin(54 310 90 60 "1" 0x101)
+       Pin(104 110 90 60 "2" 0x01)
+       Pin(154 310 90 60 "3" 0x01)
+       Pin(204 110 90 60 "4" 0x01)
+       Pin(254 310 90 60 "5" 0x01)
+       Pin(304 110 90 60 "6" 0x01)
+       Pin(354 310 90 60 "7" 0x01)
+       ElementLine(0 0 0 189 20)
+       ElementLine(0 189 409 189 20)
+       ElementLine(409 189 409 0 20)
+       ElementLine(409 0 0 0 20)
+       ElementLine(0 50 409 50 10)
+       ElementLine(129 0 129 50 10)
+       ElementLine(279 0 279 50 10)
+       Mark(54 249)
+ ) 
Index: tags/2.0.1/pcblib/tru-hole/LED3.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/LED3.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/LED3.fp	(revision 18980)
@@ -0,0 +1,19 @@
+##from:pcb
+##for:crystal
+##for:led
+##ref:http://www.lumex.com
+Element(0x00 "LED, size in mm (pin 1 is +, 2 is -)" "" "LED3" 100 70 0 100 0x00)
+(
+# typical LED is 0.5 mm or 0.020" square pin.  See for example
+# http://www.lumex.com and part number SSL-LX3054LGD.
+# 0.020" square is 0.0288" diagonal.  A number 57 drill is 
+# 0.043" which should be enough.  a 65 mil pad gives 11 mils
+# of annular ring.
+	Pin(-50 0 65 43 "1" 0x101)
+	Pin(50 0 65 43 "2" 0x01)
+   ElementArc(0 0 59 59    45  90 10)
+	ElementArc(0 0 59 59   225  90 10)
+   ElementArc(0 0 79 79    45  90 10)
+	ElementArc(0 0 79 79   225  90 10)
+	Mark(0 0)
+)
Index: tags/2.0.1/pcblib/tru-hole/LED5.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/LED5.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/LED5.fp	(revision 18980)
@@ -0,0 +1,16 @@
+##from:pcb
+##for:led
+##ref:http://www.lumex.com
+Element(0x00 "LED, size in mm (pin 1 is +, 2 is -)" "" "LED5" 100 70 0 100 0x00)
+(
+# typical LED is 0.5 mm or 0.020" square pin.  See for example
+# http://www.lumex.com and part number SSL-LX3054LGD.
+# 0.020" square is 0.0288" diagonal.  A number 57 drill is 
+# 0.043" which should be enough.  a 65 mil pad gives 11 mils
+# of annular ring.
+	Pin(-50 0 65 43 "1" 0x101)
+	Pin(50 0 65 43 "2" 0x01)
+   ElementArc(0 0 118 118     0 360 10)
+   ElementArc(0 0 138 138     0 360 10)
+	Mark(0 0)
+)
Index: tags/2.0.1/pcblib/tru-hole/MULTIWATT11.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/MULTIWATT11.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/MULTIWATT11.fp	(revision 18980)
@@ -0,0 +1,24 @@
+##from:pcb
+##for:IC
+Element(0x00 "Power IC, as in MULTIWATT15" "" "MULTIWATT11" 860 50 3 100 0x00)
+(
+       Pin(65 380 90 60 "1" 0x101)
+       Pin(132 180 90 60 "2" 0x01)
+       Pin(199 380 90 60 "3" 0x01)
+       Pin(266 180 90 60 "4" 0x01)
+       Pin(333 380 90 60 "5" 0x01)
+       Pin(400 180 90 60 "6" 0x01)
+       Pin(467 380 90 60 "7" 0x01)
+       Pin(534 180 90 60 "8" 0x01)
+       Pin(601 380 90 60 "9" 0x01)
+       Pin(668 180 90 60 "10" 0x01)
+       Pin(735 380 90 60 "11" 0x01)
+       ElementLine(0 0 0 200 20)
+       ElementLine(0 200 800 200 20)
+       ElementLine(800 200 800 0 20)
+       ElementLine(800 0 0 0 20)
+       ElementLine(0 50 800 50 10)
+       ElementLine(325 0 325 50 10)
+       ElementLine(475 0 475 50 10)
+       Mark(65 260)
+ ) 
Index: tags/2.0.1/pcblib/tru-hole/MULTIWATT15.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/MULTIWATT15.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/MULTIWATT15.fp	(revision 18980)
@@ -0,0 +1,28 @@
+##from:pcb
+##for:IC
+Element(0x00 "Power IC, as in MULTIWATT15" "" "MULTIWATT15" 860 50 3 100 0x00)
+(
+       Pin(50 380 90 60 "1" 0x101)
+       Pin(100 180 90 60 "2" 0x01)
+       Pin(150 380 90 60 "3" 0x01)
+       Pin(200 180 90 60 "4" 0x01)
+       Pin(250 380 90 60 "5" 0x01)
+       Pin(300 180 90 60 "6" 0x01)
+       Pin(350 380 90 60 "7" 0x01)
+       Pin(400 180 90 60 "8" 0x01)
+       Pin(450 380 90 60 "9" 0x01)
+       Pin(500 180 90 60 "10" 0x01)
+       Pin(550 380 90 60 "11" 0x01)
+       Pin(600 180 90 60 "12" 0x01)
+       Pin(650 380 90 60 "13" 0x01)
+       Pin(700 180 90 60 "14" 0x01)
+       Pin(750 380 90 60 "15" 0x01)
+       ElementLine(0 0 0 200 20)
+       ElementLine(0 200 800 200 20)
+       ElementLine(800 200 800 0 20)
+       ElementLine(800 0 0 0 20)
+       ElementLine(0 50 800 50 10)
+       ElementLine(325 0 325 50 10)
+       ElementLine(475 0 475 50 10)
+       Mark(50 260)
+ ) 
Index: tags/2.0.1/pcblib/tru-hole/MULTIWATT8.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/MULTIWATT8.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/MULTIWATT8.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:IC
+Element(0x00 "Power IC, as in MULTIWATT15" "" "MULTIWATT8" 860 50 3 100 0x00)
+(
+       Pin(50 115 90 60 "1" 0x101)
+       Pin(150 115 90 60 "2" 0x01)
+       Pin(250 115 90 60 "3" 0x01)
+       Pin(350 115 90 60 "4" 0x01)
+       Pin(450 115 90 60 "5" 0x01)
+       Pin(550 115 90 60 "6" 0x01)
+       Pin(650 115 90 60 "7" 0x01)
+       Pin(750 115 90 60 "8" 0x01)
+       ElementLine(0 0 0 200 20)
+       ElementLine(0 200 800 200 20)
+       ElementLine(800 200 800 0 20)
+       ElementLine(800 0 0 0 20)
+       ElementLine(0 50 800 50 10)
+       ElementLine(325 0 325 50 10)
+       ElementLine(475 0 475 50 10)
+       Mark(50 260)
+ ) 
Index: tags/2.0.1/pcblib/tru-hole/OSC14.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/OSC14.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/OSC14.fp	(revision 18980)
@@ -0,0 +1,26 @@
+##from:pcb
+##for:oscillator
+##for:xtal
+	Element(0x00 "Crystal oscillator" "" "OSC14" 270 300 3 100 0x00)
+(
+	Pin(100 100 50 28 "NC" 0x01)
+	Pin(100 700 50 28 "GND" 0x01)
+	Pin(400 700 50 28 "CLK" 0x01)
+	Pin(400 100 50 28 "VCC" 0x01)
+	ElementLine(5 5 400 5 10)
+	ElementArc(400 100 95 95 180 90 10)
+	ElementLine(495 100 495 700 10)
+	ElementArc(400 700 95 95 90 90 10)
+	ElementLine(400 795 100 795 10)
+	ElementArc(100 700 95 95 0 90 10)
+	ElementLine(5 700 5 5 10)
+	ElementLine(100 60 400 60 10)
+	ElementArc(400 100 40 40 180 90 10)
+	ElementLine(440 100 440 700 10)
+	ElementArc(400 700 40 40 90 90 10)
+	ElementLine(400 740 100 740 10)
+	ElementArc(100 700 40 40 0 90 10)
+	ElementLine(60 700 60 100 10)
+	ElementArc(100 100 40 40 270 90 10)
+	Mark(100 100)
+)
Index: tags/2.0.1/pcblib/tru-hole/PENTAWATT.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/PENTAWATT.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/PENTAWATT.fp	(revision 18980)
@@ -0,0 +1,18 @@
+##from:pcb
+##for:IC
+Element(0x00 "Power IC, as in MULTIWATT15" "" "PENTAWATT" 469 50 3 100 0x00)
+(
+       Pin(70 334 90 60 "1" 0x101)
+       Pin(137 177 90 60 "2" 0x01)
+       Pin(204 334 90 60 "3" 0x01)
+       Pin(271 177 90 60 "4" 0x01)
+       Pin(338 334 90 60 "5" 0x01)
+       ElementLine(0 0 0 189 20)
+       ElementLine(0 189 409 189 20)
+       ElementLine(409 189 409 0 20)
+       ElementLine(409 0 0 0 20)
+       ElementLine(0 50 409 50 10)
+       ElementLine(129 0 129 50 10)
+       ElementLine(279 0 279 50 10)
+       Mark(70 249)
+ ) 
Index: tags/2.0.1/pcblib/tru-hole/TACT_6x6_4p
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TACT_6x6_4p	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TACT_6x6_4p	(revision 18980)
@@ -0,0 +1,37 @@
+##from:repo.hu/projects/openhw
+##geo:180
+##for:switch
+##for:button
+
+Element["" "" "" "" 175500 115500 0 0 0 100 ""]
+(
+	Pin[13091 9000 9000 5000 9600 3937 "" "4" "edge2,intconn(2)"]
+	Pin[-12500 9000 9000 5000 9600 3937 "" "3" "edge2,intconn(2)"]
+	Pin[13091 -9000 9000 5000 9600 3937 "" "2" "edge2,intconn(1)"]
+	Pin[-12500 -9000 9000 5000 9600 3937 "" "1" "edge2,intconn(1)"]
+	ElementLine [12181 11736 12181 -11886 787]
+	ElementLine [-11441 11736 12181 11736 787]
+	ElementLine [-11441 -11886 -11441 11736 787]
+	ElementLine [-11441 -11886 12181 -11886 787]
+	ElementArc [7815 -8031 2756 2756 90 90 787]
+	ElementArc [7815 -8031 2756 2756 0 90 787]
+	ElementArc [7815 -8031 2756 2756 270 90 787]
+	ElementArc [7815 -8031 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 0 90 787]
+	ElementArc [7815 7717 2756 2756 270 90 787]
+	ElementArc [7815 7717 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 270 90 787]
+	ElementArc [-7933 7717 2756 2756 180 90 787]
+	ElementArc [-7933 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 180 90 787]
+	ElementArc [-7933 -8031 2756 2756 90 90 787]
+	ElementArc [-7933 -8031 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 270 90 787]
+	ElementArc [-59 -157 6693 6693 270 90 787]
+	ElementArc [-59 -157 6693 6693 180 90 787]
+	ElementArc [-59 -157 6693 6693 90 90 787]
+	ElementArc [-59 -157 6693 6693 0 90 787]
+
+	)
Index: tags/2.0.1/pcblib/tru-hole/TO126.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO126.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO126.fp	(revision 18980)
@@ -0,0 +1,35 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:laying
+	Element(0x00 "Transistor" "" "TO126" 80 480 1 100 0x00)
+(
+# From the JEDEC drawing, the pins are rectangular with dimensions
+# 25-35 mil X 15-25 mil
+#
+# This gives a diagonal dimension of 29.2 to 43.0 mils.
+# Pin pitch is 80 to 100 mils.
+# 
+# For a minimum clearance of 10 mils (probably not unreasonable if
+# you are doing a design with leaded parts, this gives a max pad size
+# of 80 mils.  A 52 mil drill will give 14 mil annular ring which should
+# be plenty.
+#
+# The mounting hole is 100 to 130 mils diameter
+	Pin(110 600 80 52 "1" 0x101)
+	Pin(200 600 80 52 "2" 0x01)
+	Pin(290 600 80 52 "3" 0x01) 
+	# Befestigungsbohrung
+	Pin(200 170 130 110 "4" 0x01)
+	# Anschlussdraehte
+	ElementLine(100 600 100 500 30)
+	ElementLine(200 600 200 500 30)
+	ElementLine(300 600 300 500 30)
+	# Gehaeuse
+	ElementLine( 50 500 350 500 20)
+	ElementLine(350 500 350  70 20)
+	ElementLine(350  70  50  70 20)
+	ElementLine( 50  70  50 500 20)
+	Mark(100 600)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO126S.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO126S.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO126S.fp	(revision 18980)
@@ -0,0 +1,23 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+	Element(0x00 "Transistor" "" "TO126S" 80 480 1 100 0x00)
+(
+	Pin(110 600 80 52 "1" 0x101)
+	Pin(200 700 80 52 "2" 0x01)
+	Pin(290 600 80 52 "3" 0x01)
+	# Befestigungsbohrung
+	Pin(200 170 130 110 "4" 0x01)
+	# Anschlussdraehte
+	ElementLine(100 600 100 500 30)
+	ElementLine(200 700 200 500 30)
+	ElementLine(300 600 300 500 30)
+	# Gehaeuse
+	ElementLine( 50 500 350 500 20)
+	ElementLine(350 500 350  70 20)
+	ElementLine(350  70  50  70 20)
+	ElementLine( 50  70  50 500 20)
+	Mark(100 600)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO126SW.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO126SW.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO126SW.fp	(revision 18980)
@@ -0,0 +1,21 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+	Element(0x00 "Transistor" "" "TO126SW" 270 170 0 100 0x00)
+(
+	Pin(110 100 80 52 "1" 0x101)
+	Pin(200 200 80 52 "2" 0x01)
+	Pin(290 100 80 52 "3" 0x01)
+	# Gehaeuse
+	ElementLine(200 200 200 150 30)
+	ElementLine( 50  50 350  50 20)
+	ElementLine(350  50 350 150 20)
+	ElementLine(350 150  50 150 20)
+	ElementLine( 50 150  50  50 20) 
+	# Bohrung
+	ElementLine(150 50 150 150 10)
+	ElementLine(250 50 250 150 10)
+	Mark(100 100)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO126W.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO126W.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO126W.fp	(revision 18980)
@@ -0,0 +1,16 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+	Element(0x00 "Transistor" "" "TO126W" 60 170 0 100 0x00)
+(
+	Pin(110 100 80 52 "1" 0x101)
+	Pin(200 100 80 52 "2" 0x01)
+	Pin(290 100 80 52 "3" 0x01)
+	ElementLine(50 50 350 50 20)
+	ElementLine(350 50 350 150 20)
+	ElementLine(350 150 50 150 20)
+	ElementLine(50 150 50 50 20)
+	Mark(100 100)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO18.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO18.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO18.fp	(revision 18980)
@@ -0,0 +1,36 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+	Element["" "Transistor" "" "TO18" 10300 11100 6000 7000 0 100 ""]
+(
+# The JEDEC drawing shows a pin diameter of 16-21 mils
+#
+#
+#         ___x_
+#        /     \
+# TO18:  |3   1|     <-- bottom view (supposed to be a circle)
+#        \  2  /
+#          ---
+#       
+# NOTE:  some vendors, ST for example, number the pins
+# differently.  Here we follow the JEDEC drawing.
+#
+# the pins are arranged along a 100 mil diameter
+# circle.  The can outline is 178 to 195 mils
+# for the top of the can and 209 to 230 mils
+# for the bottom edge of the can
+#
+        Pin[0 -5000 5500 3000 6100 3500 "1" "1" ""]
+        Pin[-5000 0 5500 3000 6100 3500 "2" "2" ""]
+        Pin[0 5000 5500 3000 6100 3500 "3" "3" ""]
+# x, y, width, height, start angle, delta angle, thickness
+        ElementArc [0 0 9800 9800 0 360 1000]
+# tab is 28 to 48 mils long, 36 to 46 wide
+# and comes off at an angle of 45 deg clockwise from
+# pin 1 when looking at the top of the board
+        ElementLine [6700 -7900 9400 -10600 1000]
+        ElementLine [7300 -7300 10000 -10000 1000]
+        ElementLine [7900 -6700 10600 -9400 1000]
+        ElementLine [9400 -10600 10600 -9400 1000]
+)
Index: tags/2.0.1/pcblib/tru-hole/TO218.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO218.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO218.fp	(revision 18980)
@@ -0,0 +1,17 @@
+##from:pcb
+##for:diode
+##geo:standing
+Element(0x00 "diode in TO220" "" "TO218" 675 50 3 100 0x00)
+(
+       Pin(88 120 100 60 "1" 0x101)
+       Pin(307 120 100 60 "2" 0x01)
+       Pin(526 120 100 60 "3" 0x01)
+       ElementLine(0 0 0 200 20)
+       ElementLine(0 200 615 200 20)
+       ElementLine(615 200 615 0 20)
+       ElementLine(615 0 0 0 20)
+       ElementLine(0 50 615 50 10)
+       ElementLine(232 0 232 50 10)
+       ElementLine(382 0 382 50 10)
+       Mark(88 260)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO220.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO220.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO220.fp	(revision 18980)
@@ -0,0 +1,47 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:laying
+##ref:http://www.zetex.com/3.0/pdf/TO220.pdf
+	Element(0x00 "Transistor" "" "TO220" 50 570 1 100 0x00)
+(
+# I have been unable to locate the JEDEC drawing.  However, refering
+# to  http://www.zetex.com/3.0/pdf/TO220.pdf which claims to be JEDEC
+# compliant, I see that the pins are rectangular with dimensions:
+#
+# 15-40 mils X 16-20 mils which gives a diagonal of
+# 21.9 to 44.7 mils
+#
+# The pin pitch is 90 to 110 mils.
+#
+# The mounting hole is 139 to 160 mils diameter
+	Pin(100 800 90 60 "1" 0x101)
+	Pin(200 800 90 60 "2" 0x01)
+	Pin(300 800 90 60 "3" 0x01)
+	# Befestigungsbohrung
+	Pin(200 130 150 130 "4" 0x01)
+	# Anschlussdraehte
+	ElementLine(100 800 100 620 30)
+	ElementLine(200 800 200 620 30)
+	ElementLine(300 800 300 620 30)
+	# Gehaeuse
+	ElementLine(  0 620 400 620 20)
+	ElementLine(400 620 400 245 20)
+	ElementLine(400 245   0 245 20)
+	ElementLine(  0 245   0 620 20)
+	# Kuehlfahne mit Kerben
+	ElementLine(  0 245 400 245 20)
+	ElementLine(400 245 400 120 20)
+	ElementLine(400 120 385 120 20)
+	ElementLine(385 120 385  50 20)
+	ElementLine(385  50 400  50 20)
+	ElementLine(400  50 400  10 20)
+	ElementLine(400  10   0  10 20)
+	ElementLine(  0  10   0  50 20)
+	ElementLine(  0  50  15  50 20)
+	ElementLine( 15  50  15 120 20)
+	ElementLine( 15 120   0 120 20)
+	ElementLine(  0 120   0 245 20)
+	Mark(200 800)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO220ACSTAND.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO220ACSTAND.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO220ACSTAND.fp	(revision 18980)
@@ -0,0 +1,16 @@
+##from:pcb
+##for:diode
+##geo:standing
+Element(0x00 "diode in TO220" "" "TO220ACSTAND" 460 50 3 100 0x00)
+(
+       Pin(100 100 80 40 "1" 0x101)
+       Pin(300 100 80 40 "2" 0x01)
+       ElementLine(0 0 0 180 20)
+       ElementLine(0 180 400 180 20)
+       ElementLine(400 180 400 0 20)
+       ElementLine(400 0 0 0 20)
+       ElementLine(0 50 400 50 10)
+       ElementLine(125 0 125 50 10)
+       ElementLine(275 0 275 50 10)
+       Mark(100 220)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO220S.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO220S.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO220S.fp	(revision 18980)
@@ -0,0 +1,36 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:stadning
+	Element(0x00 "Transistor" "" "TO220S" 50 570 1 100 0x00)
+(
+	Pin(100 800 90 60 "1" 0x101)
+	Pin(200 900 90 60 "2" 0x01)
+	Pin(300 800 90 60 "3" 0x01)
+	# Befestigungsbohrung  
+	Pin(200 130 150 130 "4" 0x01)
+	# Anschlussdraehte  
+	ElementLine(100 800 100 620 30)
+	ElementLine(200 900 200 620 30)
+	ElementLine(300 800 300 620 30)
+	# Gehaeuse
+	ElementLine(  0 620 400 620 20)
+	ElementLine(400 620 400 245 20)
+	ElementLine(400 245   0 245 20)
+	ElementLine(  0 245   0 620 20)
+	# Kuehlfahne mit Kerben
+	ElementLine(  0 245 400 245 20)
+	ElementLine(400 245 400 120 20)
+	ElementLine(400 120 385 120 20)
+	ElementLine(385 120 385  50 20)
+	ElementLine(385  50 400  50 20)
+	ElementLine(400  50 400  10 20)
+	ElementLine(400  10   0  10 20)
+	ElementLine(  0  10   0  50 20)
+	ElementLine(  0  50  15  50 20)
+	ElementLine( 15  50  15 120 20)
+	ElementLine( 15 120   0 120 20)
+	ElementLine(  0 120   0 245 20)
+	Mark(200 800)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO220SW.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO220SW.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO220SW.fp	(revision 18980)
@@ -0,0 +1,26 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+	Element(0x00 "Transistor" "" "TO220SW" 0 10 0 100 0x00)
+(
+	Pin(100 200 90 60 "1" 0x101)
+	Pin(200 300 90 60 "2" 0x01)
+	Pin(300 200 90 60 "3" 0x01)
+	# Gehaeuse
+	ElementLine(  0  80 400  80 20)
+	ElementLine(400  80 400 260 20)
+	ElementLine(400 260   0 260 20) 
+	ElementLine(  0 260   0  80 20) 
+	# Kuehlfahne icl. Bohrung
+	ElementLine(  0  80 400  80 20)
+	ElementLine(400  80 400 140 20)
+	ElementLine(400 140   0 140 20)
+	ElementLine(  0 140   0  80 20)
+	ElementLine(130 80 130 140 10)
+	ElementLine(270 80 270 140 10)
+	# Anschlussdraht
+	ElementLine(200 300 200 260 30)
+	Mark(100 200)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO220W.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO220W.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO220W.fp	(revision 18980)
@@ -0,0 +1,23 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing	Element(0x00 "Transistor" "" "TO220W" 0 10 0 100 0x00)
+(
+	Pin(100 200 90 60 "1" 0x101)
+	Pin(200 200 90 60 "2" 0x01)
+	Pin(300 200 90 60 "3" 0x01)
+	# Gehaeuse
+	ElementLine(  0  80 400  80 20)
+	ElementLine(400  80 400 260 20)
+	ElementLine(400 260   0 260 20) 
+	ElementLine(  0 260   0  80 20) 
+	# Kuehlfahne icl. Bohrung
+	ElementLine(  0  80 400  80 20)
+	ElementLine(400  80 400 140 20)
+	ElementLine(400 140   0 140 20)
+	ElementLine(  0 140   0  80 20)
+	ElementLine(130 80 130 140 10)
+	ElementLine(270 80 270 140 10)
+	Mark(100 200)
+)
Index: tags/2.0.1/pcblib/tru-hole/TO247.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO247.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO247.fp	(revision 18980)
@@ -0,0 +1,19 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+Element(0x00 "diode in TO220" "" "TO247" 690 50 3 100 0x00)
+(
+       Pin(96 130 100 60 "1" 0x101)
+       Pin(315 130 100 60 "2" 0x01)
+       Pin(534 130 100 60 "3" 0x01)
+       ElementLine(0 0 0 210 20)
+       ElementLine(0 210 630 210 20)
+       ElementLine(630 210 630 0 20)
+       ElementLine(630 0 0 0 20)
+       ElementLine(0 50 630 50 10)
+       ElementLine(240 0 240 50 10)
+       ElementLine(390 0 390 50 10)
+       Mark(96 270)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO247_2.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO247_2.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO247_2.fp	(revision 18980)
@@ -0,0 +1,17 @@
+##from:pcb
+##for:diode
+##geo:standing
+
+Element(0x00 "diode in TO220" "" "TO247_2" 690 50 3 100 0x00)
+(
+       Pin(96 130 100 60 "1" 0x101)
+       Pin(534 130 100 60 "2" 0x01)
+       ElementLine(0 0 0 210 20)
+       ElementLine(0 210 630 210 20)
+       ElementLine(630 210 630 0 20)
+       ElementLine(630 0 0 0 20)
+       ElementLine(0 50 630 50 10)
+       ElementLine(240 0 240 50 10)
+       ElementLine(390 0 390 50 10)
+       Mark(96 270)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO251.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO251.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO251.fp	(revision 18980)
@@ -0,0 +1,20 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+
+Element(0x00 "diode in TO220" "" "TO251" 325 50 3 100 0x00)
+(
+       Pin(42 50 70 40 "1" 0x101)
+       Pin(132 50 70 40 "2" 0x01)
+       Pin(222 50 70 40 "3" 0x01)
+       ElementLine(0 0 0 100 20)
+       ElementLine(0 100 265 100 20)
+       ElementLine(265 100 265 0 20)
+       ElementLine(265 0 0 0 20)
+       ElementLine(0 50 265 50 10)
+       ElementLine(57 0 57 50 10)
+       ElementLine(207 0 207 50 10)
+       Mark(42 140)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO264.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO264.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO264.fp	(revision 18980)
@@ -0,0 +1,18 @@
+##from:pcb
+##for:diode
+##geo:standing
+
+Element(0x00 "diode in TO220" "" "TO264" 860 50 3 100 0x00)
+(
+       Pin(181 130 100 60 "1" 0x101)
+       Pin(400 130 100 60 "2" 0x01)
+       Pin(619 130 100 60 "3" 0x01)
+       ElementLine(0 0 0 210 20)
+       ElementLine(0 210 800 210 20)
+       ElementLine(800 210 800 0 20)
+       ElementLine(800 0 0 0 20)
+       ElementLine(0 50 800 50 10)
+       ElementLine(325 0 325 50 10)
+       ElementLine(475 0 475 50 10)
+       Mark(181 270)
+ )
Index: tags/2.0.1/pcblib/tru-hole/TO39.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO39.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO39.fp	(revision 18980)
@@ -0,0 +1,37 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+
+	Element["" "Transistor" "" "TO39" 18800 18800 6000 7000 0 100 ""]
+(
+# The JEDEC drawing shows a pin diameter of 16-21 mils
+#
+#
+#         ___x_
+#        /     \
+# TO39:  |3   1|     <-- bottom view (supposed to be a circle)
+#        \  2  /
+#          ---
+#       
+# NOTE:  some vendors, ST for example, number the pins
+# differently.  Here we follow the JEDEC drawing.
+#
+# the pins are arranged along a 200 mil diameter
+# circle.  The can outline is 315 to 335 mils (320 nom)
+# for the top of the can and 350 to 370 mils (360 nom)
+# for the bottom edge of thecan
+#
+        Pin[0 -10000 5500 3000 6100 3500 "1" "1" "square"]
+        Pin[-10000 0 5500 3000 6100 3500 "2" "2" ""]
+        Pin[0 10000 5500 3000 6100 3500 "3" "3" ""]
+# tab is 29 to 40 mils long, 28 to 34 wide
+# and comes off at an angle of 45 deg clockwise from
+# pin 1 when looking at the top of the board
+        ElementLine [12700 -13900 14800 -16000 1000]
+        ElementLine [13300 -13300 15400 -15400 1000]
+        ElementLine [13900 -12700 16000 -14800 1000]
+        ElementLine [16000 -14800 14800 -16000 1000]
+# x, y, width, height, start angle, delta angle, thickness
+        ElementArc [0 0 18300 18300 0 360 1000]
+        )
Index: tags/2.0.1/pcblib/tru-hole/TO92.fp
===================================================================
--- tags/2.0.1/pcblib/tru-hole/TO92.fp	(nonexistent)
+++ tags/2.0.1/pcblib/tru-hole/TO92.fp	(revision 18980)
@@ -0,0 +1,23 @@
+##from:pcb
+##for:transistor
+##for:linear
+##for:stabilizer
+##geo:standing
+
+	Element(0x00 "Transistor" "" "TO92" 60 70 0 100 0x00)
+(
+# The JEDEC drawing shows a pin diameter of 16-21 mils
+#
+#
+#         _______
+# TO92:  | 1 2 3 |   <-- bottom view
+#         \_____/
+#       
+# The pin to pin spacing is 100 mils.
+	Pin(250 200 72 42 "1" 0x101)
+	Pin(150 200 72 42 "2" 0x01)
+	Pin(50 200 72 42 "3" 0x01)
+	ElementArc(150 200 100 100 315 270 10)
+	ElementLine( 80 130 220 130 10)
+	Mark(50 200)
+)
Index: tags/2.0.1/scconfig/Makefile
===================================================================
--- tags/2.0.1/scconfig/Makefile	(nonexistent)
+++ tags/2.0.1/scconfig/Makefile	(revision 18980)
@@ -0,0 +1,106 @@
+# --- configuration part --
+
+# - generic configuration -
+SRC=src
+BIN=src
+
+#  what cflags to use to compile scconfig
+USER_CFLAGS = -DGENCALL -Isrc
+#USER_CFLAGS = -Wall -Wextra -g -DGENCALL -Isrc
+
+#  what ldflags to use to link scconfig
+USER_LDFLAGS =
+
+#  in case hooks.c needs to link to something local
+USER_OBJS = src/util/arg_auto_set.o
+
+#  what to build - a ./configure
+all: configure cquote
+
+# This line imports scconfig core and default tests
+include src/default/Makefile.plugin
+
+#
+# - PLUGINS -
+#
+#  Comment this line if you are not interested in c99 features
+include src/c99/Makefile.plugin
+
+#  Comment this line if you do not need script libs to be detected
+include src/scripts/Makefile.plugin
+
+#  Comment this line if you do not need parser libs to be detected
+# include src/parser/Makefile.plugin
+
+#  Comment this line if you do not need to detect parser generators
+include src/parsgen/Makefile.plugin
+
+#  Comment this line if you do not need math related libs
+include src/math/Makefile.plugin
+
+#  Comment this line if you do not need socket/networking
+# include src/socket/Makefile.plugin
+
+#  Comment this line if you do not need user/password API detection
+include src/userpass/Makefile.plugin
+
+#  Comment this line if you do not need gui (X11, toolkits)
+include src/gui/Makefile.plugin
+
+#  Comment this line if you do not need software utility libs (glib)
+include src/sul/Makefile.plugin
+
+#  Uncomment this line if you need menus
+include src/menulib/Makefile.plugin
+
+#  Comment this line if you do not need generator (templating)
+#include src/generator/Makefile.plugin
+
+#  Comment this line if you do not need tmpasm (templating); conflicts with generator
+include src/tmpasm/Makefile.plugin
+
+# --- you shouldn't edit the lines below ---
+OBJS = $(USER_OBJS) hooks.o $(DEFAULT_NOMAIN_OBJS) $(SCRIPT_OBJS) $(PARSER_OBJS) $(GENERATOR_OBJS) $(TMPASM_OBJS) $(C99_OBJS) $(PARSGEN_OBJS) $(MATH_OBJS) $(SOCKET_OBJS) $(USERPASS_OBJS) $(GUI_OBJS) $(SUL_OBJS)
+CFLAGS = $(USER_CFLAGS) $(DEFAULT_CFLAGS) $(SCRIPT_CFLAGS) $(PARSER_CFLAGS) $(GENERATOR_CFLAGS) $(TMPASM_CFLAGS) $(C99_CFLAGS) $(PARSGEN_CFLAGS) $(MATH_CFLAGS) $(SOCKET_CFLAGS) $(USERPASS_CFLAGS) $(GUI_CFLAGS)  $(SUL_CFLAGS) $(MENULIB_CFLAGS) -Isrc/default
+LDFLAGS = $(USER_LDFLAGS) $(DEFAULT_LDFLAGS) $(SCRIPT_LDFLAGS) $(PARSER_LDFLAGS) $(GENERATOR_LDFLAGS) $(TMPASM_LDFLAGS) $(C99_LDFLAGS) $(PARSGEN_LDFLAGS) $(MATH_LDFLAGS) $(SOCKET_LDFLAGS) $(USERPASS_LDFLAGS) $(GUI_LDFLAGS) $(SUL_LDFLAGS) $(MENULIB_LDFLAGS)
+
+all: configure revtest sccbox
+
+revtest: revtest.o
+	$(CC) -o revtest revtest.o
+
+revtest.o: revtest.c  Rev.h
+	$(CC) -c $(CFLAGS) -o revtest.o revtest.c
+
+configure: $(OBJS)  $(DEFAULT_MAIN_OBJS)
+	$(CC) -o configure $(OBJS)  $(DEFAULT_MAIN_OBJS)
+
+menuconfig: menucfg
+	./menucfg
+
+menucfg: $(OBJS) $(MENULIB_OBJS) src/default/main_lib.o src/default/main_custom_args.o menucfg.o src/util/arg_auto_menu.o src/util/arg_auto_set.o
+	$(CC) -o menucfg $(OBJS) $(MENULIB_OBJS) menucfg.o src/default/main_lib.o src/default/main_custom_args.o src/util/arg_auto_menu.o
+
+menucfg.o: menucfg.c
+	$(CC) -c $(CFLAGS) -o menucfg.o menucfg.c
+
+hooks.o: plugin_3state.h plugins.h Rev.h ../src_3rd/puplug/scconfig_hooks.h
+
+src/util/arg_auto_set.o: src/util/arg_auto_set.c src/util/arg_auto_set.h
+	$(CC) -c $(CFLAGS) -o src/util/arg_auto_set.o src/util/arg_auto_set.c
+
+src/util/sccbox.o: src/util/sccbox.c
+	$(CC) -c $(CFLAGS) -o src/util/sccbox.o src/util/sccbox.c
+
+sccbox: src/util/sccbox.o
+	$(CC) $(LDFLAGS) -o sccbox src/util/sccbox.o
+
+cquote: src/util/cquote.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -o cquote src/util/cquote.c
+
+clean:
+	-rm $(OBJS) $(DEFAULT_MAIN_OBJS) configure revtest revtest.o cquote core src/util/sccbox.o
+
+distclean:
+	-rm ../config.h ../Makefile.conf ../src/Makefile ../util/gsch2pcb-rnd/Makefile config.cache config.log Rev.stamp sccbox ../src_3rd/puplug/Makefile ../src_3rd/puplug/config.h ../src_plugins/lib_hid_gl/opengl.h
+	-$(MAKE) clean
Index: tags/2.0.1/scconfig/README
===================================================================
--- tags/2.0.1/scconfig/README	(nonexistent)
+++ tags/2.0.1/scconfig/README	(revision 18980)
@@ -0,0 +1,3 @@
+The configuration system that runs ./configure.
+
+The engine is scconfig.
Index: tags/2.0.1/scconfig/Rev.h
===================================================================
--- tags/2.0.1/scconfig/Rev.h	(nonexistent)
+++ tags/2.0.1/scconfig/Rev.h	(revision 18980)
@@ -0,0 +1 @@
+static const int myrev = 18668;
Index: tags/2.0.1/scconfig/Rev.tab
===================================================================
--- tags/2.0.1/scconfig/Rev.tab	(nonexistent)
+++ tags/2.0.1/scconfig/Rev.tab	(revision 18980)
@@ -0,0 +1,151 @@
+18668	configure	ddraft: sphash for constraints
+18603	configure	ddraft: default buildin
+18569	configure	ddraft: new plugin
+18446	configure	fp_wget configuration
+18380	configure	siwtched over to the new about box and export dialog
+18304	configure	introducing the cam system: rename hid_helper to hid_cam + cam plugin
+18166	configure	swithc over to scconfig's cquote
+17960	configure	script plugin
+17691	configure	action code cleanup
+17436	configure	renamed hid_actions.[ch]
+17426	configure	introduce new 3rd party lib dep: fungw
+17304	configure	new plugin: expfeat for experimental features
+17216	configure	rendering optimizations: gl inlining
+17200	configure	moved clip.h out from core
+16898	configure	new stroke plugin
+16616	configure	fixes for large boards and 64 bit coords
+16591	configure	export_xy: tempalte config
+16456	configure	new plugin: import_ipcd356; rewrite export_ipcd356
+16265	configure	introducing pcb api ver
+16233	configure	retire hid_srv_ws: we are not going to use websockets for the web variant
+16155	configure	rewrite route style anchored menu to be central
+16109	configure	split off grid code from crosshair code and move gui-specific part out from core
+15944	configure	new default menu file preparation: embed the new menu, do not embed the old menus
+15910	configure	old data model removal
+15352	configure	typo in LIBDIR_INSTALLED
+15104	configure	openems mesher code
+14724	configure	subc hash and compare
+13953	configure	rtree switchover
+13726	configure	opnegl code moved to a separate plugin for reuse
+13584	configure	opengl -lGLU bugfix
+13386	configure	proper detection of includes for fileno() and usleep()
+13364	configure	new plugin: extedit
+13269	configure	remove free_atexit
+13171	configure	io_eagle: new source file for parsing dru files
+13037	configure	code simplification: PCB_INLINE
+12835	configure	new plugin: shape
+12748	configure	libminuid cflags fix
+12708	configure	new source file for the 'brave' feature
+12673	configure	new lib plugin: compat helper (because of the data model rewrite)
+12595	configure	new source files for padstacks
+12401	configure	new source files for more generic thermal support
+12108	configure	tool code splitup
+11724	configure	new default pcb
+11611	configure	enforce safe_fs
+11529	configure	gsch2pcb-rnd uses safe_fs
+11436	configure	dialogs plugin for moving dialog boxes out from core
+11396	configure	hid_lesstif linking bug
+11265	configure	deprecate dbus
+11247	configure	HPGL importer
+11189	configure	replace the openscad exporter
+11159	configure	new source files in hid_gtk2_gl for new HID API
+11156	configure	new source files in core for safe FS access
+11151	configure	new source files in dxf_export
+11051	make clean	new HID API for composite layer drawing
+10867	configure	loghid resurrect
+10799	configure	attributes dialog split in gtk
+10679	configure	infra for new core feature: subcircuit terminal
+10672	configure	switching over to libuundo
+10662	configure	split undo code, preparing for a more modular undo
+10356	configure	move genht out of liblihata
+10285	configure	control variable name fix in 3 lib plugins
+10042	configure	generalize lib_netmap and lib_padstack_hash and add lib_polyhelp
+9966	configure	hyperlynx write
+9919	configure	rubberband_orig got its own config subtree
+9840	configure	compile and link libminuid
+9600	configure	eagle bin parser
+9271	configure	core cleanup (split select.c and operation.c)
+9036	configure	diag configuration for integrity checks
+9025	configure	new source files for eagle subformats
+9019	configure	new source file in diag for integrity checks
+8990	configure	new source files for subcircuits
+8920	configure	build changes in puplug
+8912	configure	fp_board enabled by default; new plugin for mentor cell footprints
+8817	configure	fp_board: new plugin
+8774	configure	layer: all-hid common library plugin for the layer menus
+8748	configure	core: new pcb_bool source file
+8593	configure	gtk: new layer selector
+8331	configure	cquote generates C98-safe long strings
+8275	configure	puplug
+8153	configure	enable io_hyp by default
+8054	configure	setenv() detection for parametric footprint env
+7998	configure	gtk GTK3 box compatibility
+7968	configure	clean up global namespace: rename VERSION, PACKAGE and REVISION
+7967	configure	rename import_hyp to io_hyp
+7954	configure	fp_wget configuration, edakrill integration
+7720	configure	new route feature
+7594	configure	gtk splitup and gl
+7509	configure	rubber band upgrade, new go code
+7439	configure	tEDAx chnaged from import to io
+7432	configure	mentor_sch plugin upgrades
+7372	configure	gtk splitup
+7241	configure	gtk parametric footprint handling
+7217	configure	gtk splitup
+7136	configure	mentor sch import plugin
+7117	configure	gtk splitup: DRC dialog
+7105	configure	font selector gui dependencies
+7086	configure	gtk splitup
+7063	configure	gtk dialog for font selection
+7055	configure	gtk splitup
+7050	configure	multifont support: merge all draw stubs for simplicity
+7042	configure	gtk splitup
+7022	configure	multifont support: new actions
+6980	configure	gtk splitup: preferences dialog
+6924	configure	new import plugins
+6735	configure	gtk splitup
+6392	configure	draw cross section plugin (gtk and lesstif depend on it)
+6365	configure	gtk splitup
+6111	configure	layer vs. layer group code split
+6093	distclean,configure	hid API extension for the common Cursor action
+6087	configure	start splitting up hid_gtk: new plugin that hid_gtk depends on: lib_gtk_common
+6056	configure	gschp2pcb-rnd build deps bug
+6007	configure	switch over Makefiles to use sccbox
+6004	distclean,configure	scconfig compiles sccbox thast will ease portable clean and installation rules
+5982	make clean	gsch2pcb-rnd build fix
+5611	configure	new feature: UI layer
+5487	configure	layer cleanup: layer visibility in a new source file
+5472	configure	draw_fab config subtree
+5278	configure	prepare for arc UI extension: blank arc_ui.[ch] to move arc UI logics into
+5256	configure	move rubberband code into a plugin
+5199	configure	new export plugin: export_stat
+5108	configure	cleanup: remove old pointer list and use genvt
+5019	configure	unravel - remove set.[ch]
+4616	configure	unravel - the big cleanup, moving code
+4904	make clean,configure	unravel2 - regenerate action registration because regiestrator function name changed
+4882	configure	unravel2 - the big cleanup, renaming types
+4608	configure	unravel - the big cleanup, moving code and files
+4588	configure	disable bison by default
+4587	configure	draw_fab moved to a plugin
+4450	configure	io_lihata plugin config and 3rd party lib dependency fix
+4398	configure	io_kicad plugin interdeps and enable io_kicad by default
+4375	configure	custom output style support in io_lihata
+4321	configure	imported lihata persistent save lib in src_3rd as svn extern
+4160	configure	lib_* plugins (renames, s-expression)
+4063	configure	netlist.c split and cleanup
+4019	configure	case sensitive string regex for query
+4011	configure	sphash available for all plugins (needed by query first)
+4002	configure	auto-enable the query plugin
+3926	configure	advanced search in gtk, imported 10 old plugins
+3841	configure	link string->int hash table (for the query language)
+3822	configure	new global struct: obj_any_t that will allow a query to list objects
+3745	configure	gsch2pcb-rnd footprint lib initialization bug fixed
+3695	configure	bind signals to emergency save so that a copy of the in-memory PCB is saved on most crashes
+3513	configure	rename detect gcc attribute "unused" and use it for static inline local functions
+3510	configure	rename the debug plugin to diag plugin to avoid confusion with --debug in ./configure
+3509	configure	solve non-c89-compliant function pointer <-> data pointer casts
+3361	configure	cleanup: layer.c is compiled into layer.o now
+3339	configure	C89: round() is detected by scconfig
+3183	distclean,configure	C89 switchover
+3179	configure	C89 correctness: do not depend on hardwired long long, detect it
+2985	configure	Revcheck installed in Makefiles.
+2984	configure	Introduction of the config-rev system.
Index: tags/2.0.1/scconfig/gen_conf.sh
===================================================================
--- tags/2.0.1/scconfig/gen_conf.sh	(nonexistent)
+++ tags/2.0.1/scconfig/gen_conf.sh	(revision 18980)
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# TODO: rewrite this in C for better portability
+
+if test -z "$AWK"
+then
+	AWK="awk"
+fi
+
+$AWK -v "docdir=$1" '
+	BEGIN {
+		level = -1
+		q = "\""
+		cm = ","
+	}
+
+	function doc_head(fn, path)
+	{
+		if (fn in DOCS)
+			return
+		DOCS[fn]++
+		print "<html><body>" > fn
+		print "<h1>pcb-rnd conf tree</h1>" > fn
+		print "<h2>subtree: " path "</h2>" > fn
+		print "<table border=1>" > fn
+		print "<tr><th>node name <th> type <td> flags <td> description" > fn
+
+	}
+
+	function doc_foot(fn)
+	{
+		print "</table></body></html>" > fn
+	}
+
+	/[{]/ { level++ }
+
+	/struct.*/ {
+		name = $0
+		sub(".*struct[ \t]*", "", name)
+		sub("[ \t{].*", "", name)
+		if (level == 0)
+			path = ""
+		else
+			path = path "/" name
+	}
+
+	/^[ \t]*[\/][\/]/ { next }
+
+	/CFT_/ {
+		if (level < 1)
+			next
+
+		name=$0
+		sub("^.*CFT_", "CFN_", name)
+		sub(";.*", "", name)
+		type=name
+		sub("[ \t]*[^ \t]*$", "", type)
+		sub("[^ \t]*[ \t]*", "", name)
+		array = (name ~ "[[]")
+		if (array)
+			sub("[[].*$", "", name)
+		id = path
+		sub("^/", "", id)
+		gsub("/", ".", id)
+		id = id "." name
+
+		desc = $0
+		if (desc ~ "/[*]") {
+			sub("^.*/[*]", "", desc)
+			sub("[*]/.*$", "", desc)
+			sub("^[ \t]*", "", desc)
+			sub("[ \t]*$", "", desc)
+		}
+		else
+			desc = ""
+		if (desc == "")
+			desc = "<" name ">"
+
+		flags = "";
+		while(match(desc, "@[a-zA-Z_]+")) {
+			flag=substr(desc, RSTART, RLENGTH)
+			sub("[ \t]*" flag "[ \t]*", " ", desc)
+			sub("^@", "",flag)
+			flag="CFF_" toupper(flag)
+			if (flags == "")
+				flags = flag
+			else
+				flags = flags " | " flag
+		}
+		if (flags == "")
+			flags = 0;
+		sub("^[ \t]*", "", desc)
+		sub("[ \t]*$", "", desc)
+
+		path_tmp=path
+		sub("^/", "", path_tmp)
+		printf("conf_reg(%-36s %s %-16s %-25s %-25s %s, %s)\n", id cm, (array ? "array, " : "scalar,"), type cm, q path_tmp q cm, q name q cm, q desc q, flags)
+		if (docdir != "") {
+			path_tmp2 = path_tmp
+			gsub("/", "_", path_tmp2)
+			fn = docdir "/" path_tmp2 ".html"
+			doc_head(fn, path_tmp)
+			type2 = tolower(type)
+			sub("^cfn_", "", type2)
+
+			print "<tr><td>", name, "<td><a href=\"" type ".html\">", type2, "</a><td>", flags, "<td>", desc > fn
+		}
+	}
+
+	/[}]/ {
+		level--
+		sub("[/][^/]*$", "", path)
+	}
+
+
+	END {
+		if (level != -1)
+			print "Error: unbalanced braces" > "/dev/stderr"
+		for(fn in DOCS)
+			doc_foot(fn)
+	}
+'

Property changes on: tags/2.0.1/scconfig/gen_conf.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/scconfig/gen_core_lists.sh
===================================================================
--- tags/2.0.1/scconfig/gen_core_lists.sh	(nonexistent)
+++ tags/2.0.1/scconfig/gen_core_lists.sh	(revision 18980)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+if test -z "$AWK"
+then
+	AWK="awk"
+fi
+
+for f in $*
+do
+	echo "___name___ $f"
+	cat $f
+done | $AWK '
+BEGIN {
+	q = "\""
+	print "/**** DO NOT EDIT - automatically generated by gen_core_lists.sh ****/"
+	print ""
+}
+
+/^___name___/ {
+	fullname = $2
+	basename = $2
+	sub("/[^/]*$", "", basename)
+	if (fullname ~ "src_plugins/")
+		TYPE[basename]="plugdir"
+}
+
+/^type=/ {
+	type = $0
+	sub("^type=", "", type)
+	TYPE[basename] = type
+	print "/* ", type, basename " */"
+}
+
+
+/^PCB_REGISTER/ {
+	LIST[basename] = LIST[basename] $0 "\n"
+}
+
+END {
+	for(n in LIST) {
+		hn = n
+		sub("^hid/", "", hn)
+#		if (hn in HIDNAME_FIXUP)
+#			hn = HIDNAME_FIXUP[hn]
+
+		print "/* " n  " (" TYPE[n] ") */"
+		if (TYPE[n] == "gui")
+			print "if ((gui != NULL) && (strcmp(gui->name, " q hn q ") == 0)) {"
+		if (TYPE[n] == "plugdir") {
+			vname = LIST[n]
+			sub("PCB_REGISTER_ACTIONS.*[(]", "", vname)
+			sub("[)].*[\\n\\r]*", "", vname)
+			print "extern HID_Action " vname "[];"
+		}
+		print LIST[n]
+		if (TYPE[n] == "gui")
+			print "}"
+	}
+}
+
+'
+

Property changes on: tags/2.0.1/scconfig/gen_core_lists.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/scconfig/hooks.c
===================================================================
--- tags/2.0.1/scconfig/hooks.c	(nonexistent)
+++ tags/2.0.1/scconfig/hooks.c	(revision 18980)
@@ -0,0 +1,962 @@
+#include <stdio.h>
+#include <string.h>
+#include "arg.h"
+#include "log.h"
+#include "dep.h"
+#include "libs.h"
+#include "db.h"
+#include "tmpasm.h"
+#include "tmpasm_scconfig.h"
+#include "util/arg_auto_set.h"
+#include "Rev.h"
+
+#define version "2.0.1"
+
+#include "plugin_3state.h"
+
+#include "../src_3rd/puplug/scconfig_hooks.h"
+#include "../src_3rd/libfungw/scconfig_hooks.h"
+
+int want_intl = 0, want_coord_bits;
+
+const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */
+	{"disable-xrender",   "libs/gui/xrender",             arg_lib_nodes, "$do not use xrender for lesstif"},
+	{"disable-xinerama",  "libs/gui/xinerama",            arg_lib_nodes, "$do not use xinerama for lesstif"},
+	{"disable-gd",        "libs/gui/gd",                  arg_lib_nodes, "$do not use gd (many exporters need it)"},
+	{"disable-gd-gif",    "libs/gui/gd/gdImageGif",       arg_lib_nodes, "$no gif support in the png pcb_exporter"},
+	{"disable-gd-png",    "libs/gui/gd/gdImagePng",       arg_lib_nodes, "$no png support in the png pcb_exporter"},
+	{"disable-gd-jpg",    "libs/gui/gd/gdImageJpeg",      arg_lib_nodes, "$no jpeg support in the png pcb_exporter"},
+	{"enable-bison",      "/local/pcb/want_bison",        arg_true,      "$enable generating language files"},
+	{"disable-bison",     "/local/pcb/want_bison",        arg_false,     "$disable generating language files"},
+	{"enable-dmalloc",    "/local/pcb/want_dmalloc",      arg_true,      "$compile with lib dmalloc"},
+	{"disable-dmalloc",   "/local/pcb/want_dmalloc",      arg_false,     "$compile without lib dmalloc"},
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_) plugin3_args(name, desc)
+#define plugin_header(sect)
+#define plugin_dep(plg, on)
+#include "plugins.h"
+
+	{NULL, NULL, NULL, NULL}
+};
+
+static void help1(void)
+{
+	argtbl_t *a;
+
+	printf("./configure: configure pcb-rnd.\n");
+	printf("\n");
+	printf("Usage: ./configure [options]\n");
+	printf("\n");
+	printf("options are:\n");
+	printf(" --prefix=path              change installation prefix from /usr to path\n");
+	printf(" --debug                    build full debug version (-g -O0, extra asserts)\n");
+	printf(" --profile                  build prifiling version if availabel (-pg)\n");
+	printf(" --symbols                  include symbols (add -g, but no -O0 or extra asserts)\n");
+	printf(" --coord=32|64              set coordinate integer type's width in bits\n");
+	printf(" --dot_pcb_pcb=path         .pcb-rnd config path under $HOME/\n");
+	printf(" --workaround-gtk-ctrl      enable GTK control key query workaround\n");
+	printf(" --all=plugin               enable all working plugins for dynamic load\n");
+	printf(" --all=buildin              enable all working plugins for static link\n");
+	printf(" --all=disable              disable all plugins (compile core only)\n");
+	printf(" --force-all=plugin         enable even broken plugins for dynamic load\n");
+	printf(" --force-all=buildin        enable even broken plugins for static link\n");
+
+	for(a = main_argument_table; a->arg != NULL; a++) {
+		if (a->help != NULL) {
+			char tmp[64];
+			sprintf(tmp, "%s=str", a->arg);
+			printf(" --%-24s %s\n", tmp, a->help);
+		}
+	}
+
+
+}
+
+static void help2(void)
+{
+	printf("\n");
+	printf("Some of the --disable options will make ./configure to skip detection of the given feature and mark them \"not found\".");
+	printf("\n");
+}
+
+char *repeat = NULL;
+#define report_repeat(msg) \
+do { \
+	report(msg); \
+	if (repeat != NULL) { \
+		char *old = repeat; \
+		repeat = str_concat("", old, msg, NULL); \
+		free(old); \
+	} \
+	else \
+		repeat = strclone(msg); \
+} while(0)
+
+static void all_plugin_select(const char *state, int force);
+
+/* Runs when a custom command line argument is found
+ returns true if no further argument processing should be done */
+int hook_custom_arg(const char *key, const char *value)
+{
+	if (strcmp(key, "prefix") == 0) {
+		report("Setting prefix to '%s'\n", value);
+		put("/local/prefix", strclone(value));
+		return 1;
+	}
+	if (strcmp(key, "debug") == 0) {
+		put("/local/pcb/debug", strue);
+		pup_set_debug(strue);
+		return 1;
+	}
+	if (strcmp(key, "profile") == 0) {
+		put("/local/pcb/profile", strue);
+		return 1;
+	}
+	if (strcmp(key, "symbols") == 0) {
+		put("/local/pcb/symbols", strue);
+		return 1;
+	}
+	if (strcmp(key, "coord") == 0) {
+		int v = atoi(value);
+		if ((v != 32) && (v != 64)) {
+			report("ERROR: --coord needs to be 32 or 64.\n");
+			exit(1);
+		}
+		put("/local/pcb/coord_bits", value);
+		want_coord_bits = v;
+		return 1;
+	}
+	if ((strcmp(key, "all") == 0) || (strcmp(key, "force-all") == 0)) {
+		if ((strcmp(value, sbuildin) == 0) || (strcmp(value, splugin) == 0) || (strcmp(value, sdisable) == 0)) {
+			all_plugin_select(value, (key[0] == 'f'));
+			return 1;
+		}
+		report("Error: unknown --all argument: %s\n", value);
+		exit(1);
+	}
+	if (strcmp(key, "coord") == 0)
+		put("/local/pcb/dot_pcb_rnd", value);
+	if (strncmp(key, "workaround-", 11) == 0) {
+		const char *what = key+11;
+		if (strcmp(what, "gtk-ctrl") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_CTRL 1");
+		else if (strcmp(what, "gtk-shift") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_SHIFT 1");
+		else {
+			report("ERROR: unknown workaround '%s'\n", what);
+			exit(1);
+		}
+		return 1;
+	}
+	if ((strcmp(key, "with-intl") == 0) || (strcmp(key, "enable-intl") == 0)) {
+		want_intl = 1;
+		return 1;
+	}
+	else if (strcmp(key, "help") == 0) {
+		help1();
+		arg_auto_print_options(stdout, " ", "                         ", disable_libs);
+		help2();
+		exit(0);
+	}
+
+	return arg_auto_set(key, value, disable_libs);
+}
+
+/* execute plugin dependency statements, depending on "require":
+	require = 0 - attempt to mark any dep as buildin
+	require = 1 - check if dependencies are met, disable plugins that have
+	              unmet deps
+*/
+void plugin_dep1(int require, const char *plugin, const char *deps_on)
+{
+	char buff[1024];
+	const char *st_plugin, *st_deps_on;
+
+	sprintf(buff, "/local/pcb/%s/controls", plugin);
+	st_plugin = get(buff);
+	sprintf(buff, "/local/pcb/%s/controls", deps_on);
+	st_deps_on = get(buff);
+
+	if (require) {
+		if ((strcmp(st_plugin, sbuildin) == 0)) {
+			if (strcmp(st_deps_on, sbuildin) != 0) {
+				sprintf(buff, "WARNING: disabling (ex-buildin) %s because the %s is not enabled as a buildin...\n", plugin, deps_on);
+				report_repeat(buff);
+				sprintf(buff, "Disable-%s", plugin);
+				hook_custom_arg(buff, NULL);
+			}
+		}
+		else if ((strcmp(st_plugin, splugin) == 0)) {
+			if ((strcmp(st_deps_on, sbuildin) != 0) && (strcmp(st_deps_on, splugin) != 0)) {
+				sprintf(buff, "WARNING: disabling (ex-plugin) %s because the %s is not enabled as a buildin or plugin...\n", plugin, deps_on);
+				report_repeat(buff);
+				sprintf(buff, "Disable-%s", plugin);
+				hook_custom_arg(buff, NULL);
+			}
+		}
+	}
+	else {
+		if (strcmp(st_plugin, sbuildin) == 0)
+			put(buff, sbuildin);
+		else if (strcmp(st_plugin, splugin) == 0) {
+			if ((st_deps_on == NULL) || (strcmp(st_deps_on, "disable") == 0))
+				put(buff, splugin);
+		}
+	}
+}
+
+static void all_plugin_select(const char *state, int force)
+{
+	char buff[1024];
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_) \
+	if ((all_) || force) { \
+		sprintf(buff, "/local/pcb/%s/controls", name); \
+		put(buff, state); \
+	}
+#define plugin_header(sect)
+#define plugin_dep(plg, on)
+#include "plugins.h"
+}
+
+void plugin_deps(int require)
+{
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_)
+#define plugin_header(sect)
+#define plugin_dep(plg, on) plugin_dep1(require, plg, on);
+#include "plugins.h"
+}
+
+
+/* Runs before anything else */
+int hook_preinit()
+{
+	return 0;
+}
+
+/* Runs after initialization */
+int hook_postinit()
+{
+	db_mkdir("/local");
+	db_mkdir("/local/pcb");
+
+	pup_hook_postinit();
+	fungw_hook_postinit();
+
+	/* DEFAULTS */
+	put("/local/prefix", "/usr/local");
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_) plugin3_default(name, default_)
+#define plugin_header(sect)
+#define plugin_dep(plg, on)
+#include "plugins.h"
+
+	put("/local/pcb/want_bison", sfalse);
+	put("/local/pcb/debug", sfalse);
+	put("/local/pcb/profile", sfalse);
+	put("/local/pcb/symbols", sfalse);
+	put("/local/pcb/coord_bits", "32");
+	want_coord_bits = 32;
+	put("/local/pcb/dot_pcb_rnd", ".pcb-rnd");
+
+	return 0;
+}
+
+static int all_plugin_check_explicit(void)
+{
+	char pwanted[1024], pgot[1024];
+	const char *wanted, *got;
+	int tainted = 0;
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_) \
+	sprintf(pwanted, "/local/pcb/%s/explicit", name); \
+	wanted = get(pwanted); \
+	if (wanted != NULL) { \
+		sprintf(pgot, "/local/pcb/%s/controls", name); \
+		got = get(pgot); \
+		if (strcmp(got, wanted) != 0) {\
+			report("ERROR: %s was requested to be %s but I had to %s it\n", name, wanted, got); \
+			tainted = 1; \
+		} \
+	}
+#define plugin_header(sect)
+#define plugin_dep(plg, on)
+#include "plugins.h"
+	return tainted;
+}
+
+
+/* Runs after all arguments are read and parsed */
+int hook_postarg()
+{
+	plugin_deps(0);
+	return 0;
+}
+
+
+
+/* Runs when things should be detected for the host system */
+int hook_detect_host()
+{
+	pup_hook_detect_host();
+	fungw_hook_detect_host();
+
+	require("fstools/ar",  0, 1);
+	require("fstools/mkdir", 0, 1);
+	require("fstools/rm",  0, 1);
+	require("fstools/cp",  0, 1);
+	require("fstools/ln",  0, 1);
+	require("fstools/mkdir",  0, 1);
+
+/* until we rewrite the generators in C */
+	require("fstools/awk",  0, 1);
+
+	require("cc/argstd/*", 0, 0);
+
+	require("cc/func_attr/unused/*", 0, 0);
+	require("cc/inline", 0, 0);
+
+	return 0;
+}
+
+int safe_atoi(const char *s)
+{
+	if (s == NULL)
+		return 0;
+	return atoi(s);
+}
+
+/* Runs when things should be detected for the target system */
+int hook_detect_target()
+{
+	int need_gtklibs = 0, want_glib = 0, want_gtk, want_gtk2, want_gtk3, want_gd, want_stroke, need_inl = 0, want_cairo, want_xml2, has_gtk2 = 0, has_gtk3 = 0, want_gl;
+	const char *host_ansi, *host_ped, *target_ansi, *target_ped, *target_pg, *target_no_pie;
+
+	want_gtk2   = plug_is_enabled("hid_gtk2_gdk") || plug_is_enabled("hid_gtk2_gl");
+	want_gtk3   = plug_is_enabled("hid_gtk3_cairo") || plug_is_enabled("hid_gtk3_gl");
+	want_gtk    = want_gtk2 | want_gtk3;
+	want_gd     = plug_is_enabled("export_png") ||  plug_is_enabled("export_nelma") ||  plug_is_enabled("export_gcode");
+	want_stroke = plug_is_enabled("stroke");
+	want_cairo  = plug_is_enabled("export_bboard") | plug_is_enabled("hid_gtk3_cairo");
+	want_xml2   = plug_is_enabled("io_eagle");
+
+/****** TODO #21: core depends on this plugin (yes, this is a bug) ******/
+	hook_custom_arg("buildin-lib_compat_help", NULL);
+
+	require("cc/fpic",  0, 0);
+	host_ansi = get("/host/cc/argstd/ansi");
+	host_ped = get("/host/cc/argstd/pedantic");
+	target_ansi = get("/target/cc/argstd/ansi");
+	target_ped = get("/target/cc/argstd/pedantic");
+	target_pg = get("/target/cc/argstd/pg");
+	target_no_pie = get("/target/cc/argstd/no-pie");
+
+	{ /* need to set debug flags here to make sure libs are detected with the modified cflags; -ansi matters in what #defines we need for some #includes */
+		const char *tmp, *fpic, *debug;
+		fpic = get("/target/cc/fpic");
+		if (fpic == NULL) fpic = "";
+		debug = get("/arg/debug");
+		if (debug == NULL) debug = "";
+		tmp = str_concat(" ", fpic, debug, NULL);
+		put("/local/global_cflags", tmp);
+
+		/* for --debug mode, use -ansi -pedantic for all detection */
+		put("/local/cc_flags_save", get("/target/cc/cflags"));
+		if (istrue(get("/local/pcb/debug"))) {
+			append("/target/cc/cflags", " ");
+			append("/target/cc/cflags", target_ansi);
+			append("/target/cc/cflags", " ");
+			append("/target/cc/cflags", target_ped);
+		}
+		if (istrue(get("/local/pcb/profile"))) {
+			append("/target/cc/cflags", " ");
+			append("/target/cc/cflags", target_pg);
+			append("/target/cc/cflags", " ");
+			append("/target/cc/cflags", target_no_pie);
+		}
+	}
+
+	pup_hook_detect_target();
+
+	require("signal/names/*",  0, 0);
+	require("libs/env/setenv/*",  0, 0);
+	if (!istrue(get("libs/env/setenv/presents")))
+		require("libs/env/putenv/*",  0, 0);
+	require("libs/fs/mkdtemp/*",  0, 0);
+	require("libs/fs/realpath/*",  0, 0);
+	require("libs/fs/readdir/*",  0, 1);
+	require("libs/io/fileno/*",  0, 1);
+	require("libs/math/rint/*",  0, 0);
+	require("libs/math/round/*",  0, 0);
+	require("libs/userpass/getpwuid/*",  0, 0);
+	require("libs/script/fungw/*",  0, 0);
+
+	if (!istrue(get("libs/script/fungw/presents")))
+		fungw_hook_detect_target();
+
+	if (require("libs/time/usleep/*",  0, 0) && require("libs/time/Sleep/*",  0, 0)) {
+		report_repeat("\nERROR: can not find usleep() or Sleep() - no idea how to sleep ms.\n\n");
+		return 1;
+	}
+
+	if (require("libs/ldl",  0, 0) != 0) {
+		if (require("libs/LoadLibrary",  0, 0) != 0) {
+			report_repeat("\nERROR: no dynamic linking found on your system. Can not compile pcb-rnd.\n\n");
+			return 1;
+		}
+	}
+
+	if (require("libs/proc/wait",  0, 0) != 0) {
+		if (require("libs/proc/_spawnvp",  0, 0) != 0) {
+			report_repeat("\nERROR: no fork or _spawnvp. Can not compile pcb-rnd.\n\n");
+			return 1;
+		}
+	}
+
+	if (require("libs/fs/_mkdir",  0, 0) != 0) {
+		if (require("libs/fs/mkdir",  0, 0) != 0) {
+			report_repeat("\nERROR: no mkdir() or _mkdir(). Can not compile pcb-rnd.\n\n");
+			return 1;
+		}
+	}
+
+	if (require("libs/fs/getcwd/*",  0, 0) != 0)
+		if (require("libs/fs/_getcwd/*",  0, 0) != 0)
+			if (require("libs/fs/getwd/*",  0, 0) != 0) {
+				report_repeat("\nERROR: Can not find any getcwd() variant.\n\n");
+				return 1;
+			}
+
+	if (want_intl) {
+		require("libs/sul/gettext/presents", 0, 0);
+		if (!istrue(get("libs/sul/gettext/presents"))) {
+			report_repeat("\nERROR: intl support explicitly requested but gettext is not found on your system.\n\n");
+			return 1;
+		}
+		put("/local/pcb/want_nls", strue);
+	}
+	else
+		put("/local/pcb/want_nls", sfalse);
+
+	if (want_stroke) {
+		require("libs/gui/libstroke/presents", 0, 0);
+		if (!istrue(get("libs/gui/libstroke/presents"))) {
+			report_repeat("WARNING: Since there's no libstroke found, disabling the stroke plugin...\n");
+			hook_custom_arg("Disable-stroke", NULL);
+		}
+	}
+
+	if (want_cairo) {
+		require("libs/gui/cairo/presents", 0, 0);
+		if (!istrue(get("libs/gui/cairo/presents"))) {
+			report_repeat("WARNING: Since there's no cairo found, disabling the export_bboard plugin...\n");
+			hook_custom_arg("Disable-export_bboard", NULL);
+		}
+	}
+
+	if (want_gtk2) {
+		require("libs/gui/gtk2/presents", 0, 0);
+		if (istrue(get("libs/gui/gtk2/presents"))) {
+			require("libs/gui/gtk2gl/presents", 0, 0);
+			if (!istrue(get("libs/gui/gtk2gl/presents"))) {
+				report_repeat("WARNING: Since there's no gl support for gtk found, disabling the gl rendering...\n");
+				hook_custom_arg("Disable-hid_gtk2_gl", NULL);
+			}
+			need_gtklibs = 1;
+			has_gtk2 = 1;
+		}
+		else {
+			report_repeat("WARNING: Since there's no libgtk2 found, disabling hid_gtk2*...\n");
+			hook_custom_arg("Disable-hid_gtk2_gdk", NULL);
+			hook_custom_arg("Disable-hid_gtk2_gl", NULL);
+		}
+	}
+
+	if (want_gtk3) {
+		if (istrue(get("libs/gui/cairo/presents"))) {
+			require("libs/gui/gtk3/presents", 0, 0);
+			if (!istrue(get("libs/gui/gtk3/presents"))) {
+				report_repeat("WARNING: Since there's no libgtk3 found, disabling hid_gtk3*...\n");
+				hook_custom_arg("Disable-hid_gtk3_cairo", NULL);
+			}
+			else {
+				need_gtklibs = 1;
+				has_gtk3 = 1;
+			}
+		}
+		else {
+			report_repeat("WARNING: not going to try gtk3 because cairo is not found\n");
+			hook_custom_arg("Disable-hid_gtk3_cairo", NULL);
+		}
+	}
+
+	want_gl = plug_is_enabled("hid_gtk2_gl") || plug_is_enabled("hid_gtk3_gl");
+	if (want_gl) {
+		require("libs/gui/glu/presents", 0, 0);
+		if (!istrue(get("libs/gui/glu/presents"))) {
+			report_repeat("WARNING: Since there's no GLU found, disabling the hid_gtk2_gl plugin...\n");
+			goto disable_gl;
+		}
+		else
+			put("/local/pcb/has_glu", strue);
+	}
+	else {
+		disable_gl:;
+		hook_custom_arg("Disable-lib_hid_gl", NULL);
+		hook_custom_arg("Disable-hid_gtk2_gl", NULL);
+		hook_custom_arg("Disable-hid_gtk3_gl", NULL);
+	}
+
+	/* gtk2 vs. gtk3 xor logic */
+	if (has_gtk2 && has_gtk3) {
+		report_repeat("Selected both gtk2 and gtk3 HIDs; gtk2 and gtk3 are incompatible, disabling gtk2 in favor of gtk3.\n");
+		hook_custom_arg("Disable-hid_gtk2_gdk", NULL);
+		hook_custom_arg("Disable-hid_gtk2_gl", NULL);
+		has_gtk2 = 0;
+	}
+
+	/* libs/gui/gtkx is the version-independent set of flags in the XOR model */
+	if (has_gtk3) {
+		put("/target/libs/gui/gtkx/cflags", get("/target/libs/gui/gtk3/cflags"));
+		put("/target/libs/gui/gtkx/ldflags", get("/target/libs/gui/gtk3/ldflags"));
+	}
+	if (has_gtk2) {
+		put("/target/libs/gui/gtkx/cflags", get("/target/libs/gui/gtk2/cflags"));
+		put("/target/libs/gui/gtkx/ldflags", get("/target/libs/gui/gtk2/ldflags"));
+	}
+
+	if (!need_gtklibs) {
+		report("No gtk support available, disabling lib_gtk_*...\n");
+		hook_custom_arg("Disable-lib_gtk_common", NULL);
+		hook_custom_arg("Disable-lib_gtk_config", NULL);
+		hook_custom_arg("Disable-lib_gtk_hid", NULL);
+	}
+
+	if (want_xml2) {
+		require("libs/sul/libxml2/presents", 0, 0);
+		if (!istrue(get("libs/sul/libxml2/presents"))) {
+			report("libxml2 is not available, disabling io_eagle...\n");
+			report_repeat("WARNING: Since there's no libxml2 found, disabling the Eagle IO plugin...\n");
+			hook_custom_arg("Disable-io_eagle", NULL);
+		}
+		put("/local/pcb/want_libxml2", strue);
+	}
+	else
+		put("/local/pcb/want_libxml2", strue);
+
+
+	if (plug_is_enabled("hid_lesstif")) {
+		require("libs/gui/lesstif2/presents", 0, 0);
+		if (istrue(get("libs/gui/lesstif2/presents"))) {
+			require("libs/gui/xinerama/presents", 0, 0);
+			require("libs/gui/xrender/presents", 0, 0);
+		}
+		else {
+			report_repeat("WARNING: Since there's no lesstif2 found, disabling the lesstif HID and xinerama and xrender...\n");
+			hook_custom_arg("Disable-xinerama", NULL);
+			hook_custom_arg("Disable-xrender", NULL);
+			hook_custom_arg("Disable-hid_lesstif", NULL);
+		}
+	}
+	else {
+		hook_custom_arg("Disable-xinerama", NULL);
+		hook_custom_arg("Disable-xrender", NULL);
+	}
+
+
+	if (want_gtk)
+		want_glib = 1;
+
+	if (plug_is_enabled("puller"))
+		want_glib = 1;
+
+	if (want_glib) {
+		require("libs/sul/glib", 0, 0);
+		if (!istrue(get("libs/sul/glib/presents"))) {
+			if (want_gtk) {
+				report_repeat("WARNING: Since GLIB is not found, disabling the GTK HID...\n");
+				hook_custom_arg("Disable-gtk", NULL);
+			}
+			if (plug_is_enabled("puller")) {
+				report_repeat("WARNING: Since GLIB is not found, disabling the puller...\n");
+				hook_custom_arg("Disable-puller", NULL);
+			}
+		}
+	}
+	else {
+		report("No need for glib, skipping GLIB detection\n");
+		put("libs/sul/glib/presents", "false");
+		put("libs/sul/glib/cflags", "");
+		put("libs/sul/glib/ldflags", "");
+	}
+
+	if (!istrue(get("libs/sul/glib/presents"))) {
+		/* Makefile templates will still reference these variables, they should be empty */
+		put("libs/sul/glib/cflags", "");
+		put("libs/sul/glib/ldflags", "");
+	}
+
+	if (want_gd) {
+		require("libs/gui/gd/presents", 0, 0);
+		if (!istrue(get("libs/gui/gd/presents"))) {
+			report_repeat("WARNING: Since there's no libgd, disabling gd based exports (png, nelma, gcode)...\n");
+			hook_custom_arg("Disable-gd-gif", NULL);
+			hook_custom_arg("Disable-gd-png", NULL);
+			hook_custom_arg("Disable-gd-jpg", NULL);
+			hook_custom_arg("Disable-export_png", NULL);
+			hook_custom_arg("Disable-export_nelma", NULL);
+			hook_custom_arg("Disable-export_gcode", NULL);
+			want_gd = 0;
+			goto disable_gd_formats;
+		}
+		else {
+			require("libs/gui/gd/gdImagePng/presents", 0, 0);
+			require("libs/gui/gd/gdImageGif/presents", 0, 0);
+			require("libs/gui/gd/gdImageJpeg/presents", 0, 0);
+			if (!istrue(get("libs/gui/gd/gdImagePng/presents"))) {
+				report_repeat("WARNING: libgd is installed, but its png code fails, some exporters will be compiled with reduced functionality; exporters affected: export_nelma, export_gcode\n");
+			}
+		}
+	}
+	else {
+		put("libs/gui/gd/presents", sfalse);
+		disable_gd_formats:;
+		put("libs/gui/gd/gdImagePng/presents", sfalse);
+		put("libs/gui/gd/gdImageGif/presents", sfalse);
+		put("libs/gui/gd/gdImageJpeg/presents", sfalse);
+	}
+
+	/* generic utils for Makefiles */
+	require("sys/ext_exe", 0, 1);
+	require("sys/sysid", 0, 1);
+
+	/* options for config.h */
+	require("sys/path_sep", 0, 1);
+	require("sys/types/size/*", 0, 1);
+	require("cc/rdynamic", 0, 0);
+	require("libs/snprintf", 0, 0);
+	require("libs/vsnprintf", 0, 0);
+	require("libs/fs/getcwd", 0, 0);
+	require("libs/fs/stat/macros/*", 0, 0);
+
+	if (istrue(get("/local/pcb/want_dmalloc"))) {
+		require("libs/sul/dmalloc/*", 0, 1);
+	}
+	else {
+		put("libs/sul/dmalloc/presents", sfalse);
+		put("libs/sul/dmalloc/cflags", "");
+		put("libs/sul/dmalloc/ldflags", "");
+	}
+
+	/* yacc/lex - are we able to regenerate languages? */
+	if (istrue(get("/local/pcb/want_bison"))) {
+		require("parsgen/flex/*", 0, 0);
+		require("parsgen/bison/*", 0, 0);
+		if (!istrue(get("parsgen/flex/presents")) || !istrue(get("parsgen/bison/presents")))
+			put("/local/pcb/want_parsgen", sfalse);
+		else
+			put("/local/pcb/want_parsgen", strue);
+	}
+	else {
+		report("Bison/flex are disabled, among with parser generation.\n");
+		put("/local/pcb/want_parsgen", sfalse);
+	}
+
+
+	if (get("cc/rdynamic") == NULL)
+		put("cc/rdynamic", "");
+
+	/* plugin dependencies */
+	plugin_deps(1);
+
+	if (plug_is_enabled("gpmi")) {
+		require("libs/script/gpmi/presents", 0, 0);
+		if (!istrue(get("libs/script/gpmi/presents"))) {
+			report_repeat("WARNING: disabling the gpmi scripting because libgpmi is not found or not configured...\n");
+			hook_custom_arg("Disable-gpmi", NULL);
+		}
+	}
+
+	/* figure coordinate bits */
+	{
+		int int_bits       = safe_atoi(get("sys/types/size/signed_int")) * 8;
+		int long_bits      = safe_atoi(get("sys/types/size/signed_long_int")) * 8;
+		int long_long_bits = safe_atoi(get("sys/types/size/signed_long_long_int")) * 8;
+		int int64_bits     = safe_atoi(get("sys/types/size/uint64_t")) * 8;
+		const char *chosen, *postfix;
+		char tmp[64];
+		int need_stdint = 0;
+
+		if (want_coord_bits == int_bits)             { postfix="U";   chosen = "int";           }
+		else if (want_coord_bits == long_bits)       { postfix="UL";  chosen = "long int";      }
+		else if (want_coord_bits == int64_bits)      { postfix="ULL"; chosen = "int64_t";       need_stdint = 1; }
+		else if (want_coord_bits == long_long_bits)  { postfix="ULL"; chosen = "long long int"; }
+		else {
+			report("ERROR: can't find a suitable integer type for coord to be %d bits wide\n", want_coord_bits);
+			exit(1);
+		}
+
+		sprintf(tmp, "((1%s<<%d)-1)", postfix, want_coord_bits - 1);
+		put("/local/pcb/coord_type", chosen);
+		put("/local/pcb/coord_max", tmp);
+
+		chosen = NULL;
+		if (istrue(get("/local/pcb/debug"))) { /* debug: c89 */
+			if (int64_bits >= 64) {
+				/* to suppress warnings on systems that support c99 but are forced to compile in c89 mode */
+				chosen = "int64_t";
+				need_stdint = 1;
+			}
+		}
+
+		if (chosen == NULL) { /* non-debug, thus non-c89 */
+			if (long_long_bits >= 64) chosen = "long long int";
+			else if (long_bits >= 64) chosen = "long int";
+			else chosen = "double";
+		}
+		put("/local/pcb/long64", chosen);
+		if (need_stdint)
+			put("/local/pcb/include_stdint", "#include <stdint.h>");
+	}
+
+	/* set cflags for C89 */
+	put("/local/pcb/c89flags", "");
+	if (istrue(get("/local/pcb/debug"))) {
+
+		if ((target_ansi != NULL) && (*target_ansi != '\0')) {
+			append("/local/pcb/c89flags", " ");
+			append("/local/pcb/c89flags", target_ansi);
+			need_inl = 1;
+		}
+		if ((target_ped != NULL) && (*target_ped != '\0')) {
+			append("/local/pcb/c89flags", " ");
+			append("/local/pcb/c89flags", target_ped);
+			need_inl = 1;
+		}
+	}
+
+	if (istrue(get("/local/pcb/profile"))) {
+		append("/local/pcb/cflags_profile", " ");
+		append("/local/pcb/cflags_profile", target_pg);
+		append("/local/pcb/cflags_profile", " ");
+		append("/local/pcb/cflags_profile", target_no_pie);
+	}
+
+	if (!istrue(get("cc/inline")))
+		need_inl = 1;
+
+	if (need_inl) {
+		/* disable inline for C89 */
+		append("/local/pcb/c89flags", " ");
+		append("/local/pcb/c89flags", "-Dinline= ");
+	}
+
+	/* restore the original CFLAGS, without the effects of --debug, so Makefiles can decide when to use what cflag (c99 needs different ones) */
+	put("/target/cc/cflags", get("/local/cc_flags_save"));
+
+	return 0;
+}
+
+#ifdef GENCALL
+/* If enabled, generator implements ###call *### and generator_callback is
+   the callback function that will be executed upon ###call### */
+void generator_callback(char *cmd, char *args)
+{
+	printf("* generator_callback: '%s' '%s'\n", cmd, args);
+}
+#endif
+
+static int gpmi_config(void)
+{
+	char *tmp;
+	const char *gcfg = get("libs/script/gpmi/gpmi-config");
+	int generr = 0;
+
+	printf("Generating pcb-gpmi/Makefile.conf (%d)\n", generr |= tmpasm("../src_plugins/gpmi/pcb-gpmi", "Makefile.config.in", "Makefile.config"));
+
+
+	printf("Configuring gpmi packages...\n");
+	tmp = str_concat("", "cd ../src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg && ", gcfg, " --pkggrp && ./configure", NULL);
+	generr |= system(tmp);
+	free(tmp);
+
+	printf("Configuring gpmi plugin \"app\"\n");
+	tmp = str_concat("", "cd ../src_plugins/gpmi//pcb-gpmi/gpmi_plugin && ", gcfg, " --app", NULL);
+	generr |= system(tmp);
+	free(tmp);
+
+	printf("Finished configuring gpmi packages\n");
+
+	return generr;
+}
+static void plugin_stat(const char *header, const char *path, const char *name)
+{
+	const char *val = get(path);
+
+	if (*header == '#') /* don't print hidden plugins */
+		return;
+
+	printf(" %-32s", header);
+
+	if (val == NULL)
+		printf("??? (NULL)   ");
+	else if (strcmp(val, sbuildin) == 0)
+		printf("yes, buildin ");
+	else if (strcmp(val, splugin) == 0)
+		printf("yes, PLUGIN  ");
+	else
+		printf("no           ");
+
+	printf("   [%s]\n", name);
+}
+
+static void print_sum_setting_or(const char *node, const char *desc, int or)
+{
+	const char *res, *state;
+	state = get(node);
+	if (or)
+		res = "enabled (implicit)";
+	else if (istrue(state))
+		res = "enabled";
+	else if (isfalse(state))
+		res = "disabled";
+	else
+		res = "UNKNOWN - disabled?";
+	printf("%-55s %s\n", desc, res);
+}
+
+static void print_sum_setting(const char *node, const char *desc)
+{
+	print_sum_setting_or(node, desc, 0);
+}
+
+static void print_sum_cfg_val(const char *node, const char *desc)
+{
+	const char *state = get(node);
+	printf("%-55s %s\n", desc, state);
+}
+
+/* Runs after detection hooks, should generate the output (Makefiles, etc.) */
+int hook_generate()
+{
+	char *next, *rev = "non-svn", *curr, *tmp;
+	int generr = 0;
+	int res = 0;
+	char apiver[32];
+	long r = 0;
+	int v1, v2, v3;
+
+	tmp = svn_info(0, "../src", "Revision:");
+	if (tmp != NULL) {
+		r = strtol(tmp, NULL, 10);
+		rev = str_concat("", "svn r", tmp, NULL);
+		free(tmp);
+	}
+	strcpy(apiver, version);
+	curr = apiver; next = strchr(curr, '.'); *next = '\n';
+	v1 = atoi(curr);
+	curr = next+1; next = strchr(curr, '.'); *next = '\n';
+	v2 = atoi(curr);
+	v3 = atoi(next+1);
+	sprintf(apiver, "%01d%01d%02d%05ld", v1, v2, v3, r);
+
+	logprintf(0, "scconfig generate version info: version='%s' rev='%s'\n", version, rev);
+	put("/local/revision", rev);
+	put("/local/version",  version);
+	put("/local/apiver", apiver);
+	put("/local/pup/sccbox", "../../scconfig/sccbox");
+
+	printf("\n");
+
+	printf("Generating Makefile.conf (%d)\n", generr |= tmpasm("..", "Makefile.conf.in", "Makefile.conf"));
+
+	printf("Generating pcb/Makefile (%d)\n", generr |= tmpasm("../src", "Makefile.in", "Makefile"));
+
+	printf("Generating util/gsch2pcb-rnd/Makefile (%d)\n", generr |= tmpasm("../util", "gsch2pcb-rnd/Makefile.in", "gsch2pcb-rnd/Makefile"));
+
+	printf("Generating config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h"));
+
+	printf("Generating compat_inc.h (%d)\n", generr |= tmpasm("../src", "compat_inc.h.in", "compat_inc.h"));
+
+	printf("Generating opengl.h (%d)\n", generr |= tmpasm("../src_plugins/lib_hid_gl", "opengl.h.in", "opengl.h"));
+	if (plug_is_enabled("gpmi"))
+		gpmi_config();
+
+	generr |= pup_hook_generate("../src_3rd/puplug");
+
+	if (!istrue(get("libs/script/fungw/presents")))
+		generr |= fungw_hook_generate("../src_3rd/libfungw");
+
+
+	if (!generr) {
+	printf("\n\n");
+	printf("=====================\n");
+	printf("Configuration summary\n");
+	printf("=====================\n");
+
+	print_sum_setting("/local/pcb/want_parsgen",   "Regenerating languages with bison & flex");
+	print_sum_setting("/local/pcb/want_nls",       "Internationalization with gettext");
+	print_sum_setting("/local/pcb/debug",          "Compilation for debugging");
+	print_sum_setting_or("/local/pcb/symbols",        "Include debug symbols", istrue(get("/local/pcb/debug")));
+	print_sum_setting("libs/sul/dmalloc/presents", "Compile with dmalloc");
+	print_sum_cfg_val("/local/pcb/coord_bits",     "Coordinate type bits");
+	print_sum_cfg_val("/local/pcb/dot_pcb_rnd",    ".pcb_rnd config dir under $HOME");
+
+#undef plugin_def
+#undef plugin_header
+#undef plugin_dep
+#define plugin_def(name, desc, default_, all_) plugin3_stat(name, desc)
+#define plugin_header(sect) printf(sect);
+#define plugin_dep(plg, on)
+#include "plugins.h"
+
+	if (repeat != NULL) {
+		printf("\n%s\n", repeat);
+	}
+
+	if (all_plugin_check_explicit()) {
+		printf("\nNevertheless the configuration is complete, if you accept these differences\nyou can go on compiling.\n\n");
+		res = 1;
+	}
+	else
+		printf("\nConfiguration complete, ready to compile.\n\n");
+
+	{
+		FILE *f;
+		f = fopen("Rev.stamp", "w");
+		fprintf(f, "%d", myrev);
+		fclose(f);
+	}
+
+	}
+	else {
+		fprintf(stderr, "Error generating some of the files\n");
+		res = 1;
+	}
+
+	return res;
+}
+
+/* Runs before everything is uninitialized */
+void hook_preuninit()
+{
+}
+
+/* Runs at the very end, when everything is already uninitialized */
+void hook_postuninit()
+{
+}
+
Index: tags/2.0.1/scconfig/menucfg.c
===================================================================
--- tags/2.0.1/scconfig/menucfg.c	(nonexistent)
+++ tags/2.0.1/scconfig/menucfg.c	(revision 18980)
@@ -0,0 +1,71 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include "default/hooks.h"
+#include "default/libs.h"
+#include "default/main_custom_args.h"
+#include "default/main_lib.h"
+#include "menulib/scmenu.h"
+#include "util/arg_auto_set.h"
+#include "util/arg_auto_menu.h"
+
+
+void re_fail(char *s, char c)
+{
+	fprintf(stderr, "Regex error: %s [opcode %o]\n", s, c);
+	abort();
+}
+
+int cb_configure(scm_ctx_t *ctx, scm_menu_t *menu, scm_win_t *w, int selection)
+{
+	printf("configure!!\n");
+	sleep(1);
+	return -1;
+}
+
+
+
+scm_menu_entry_t me_hid_gtk[8]        = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+scm_menu_entry_t me_hid_lesstif[8]    = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+scm_menu_entry_t me_export[8]         = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+scm_menu_entry_t me_gpmi[8]           = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+scm_menu_entry_t me_autorouter[8]     = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+scm_menu_entry_t me_all_settings[32]  = {{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}};
+
+scm_menu_entry_t me_settings[] = {
+	{SCM_SUBMENU,        NULL, "HID: gtk",           "gtk settings -->",           NULL, me_hid_gtk, SCM_AUTO_RUN},
+	{SCM_SUBMENU,        NULL, "HID: lesstif",       "lesstif settings -->",       NULL, me_hid_lesstif, SCM_AUTO_RUN},
+	{SCM_SUBMENU,        NULL, "HID: exporters",     "export format settings -->", NULL, me_export, SCM_AUTO_RUN},
+	{SCM_SUBMENU,        NULL, "scripting",          "gpmi settings -->",          NULL, me_gpmi, SCM_AUTO_RUN},
+	{SCM_SUBMENU,        NULL, "auto routers",       "autorouter settings -->",    NULL, me_autorouter, SCM_AUTO_RUN},
+	{SCM_EMPTY,          NULL, NULL, NULL, NULL, 0},
+	{SCM_SUBMENU,        NULL, "all",                "all settings at once -->",   NULL, me_all_settings, SCM_AUTO_RUN},
+	{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}
+};
+
+scm_menu_entry_t me_main[] = {
+	{SCM_SUBMENU,        NULL, "Edit settings",      "Edit user configurable settings -->",       NULL, me_settings, SCM_AUTO_RUN},
+	{SCM_SUBMENU,        NULL, "Manual detection",   "Run detection of individual libs -->",      NULL, NULL, SCM_AUTO_RUN},
+	{SCM_SUBMENU_CB,     NULL, "Configure pcb-rnd",  "Run the configuration process -->",         NULL, cb_configure, SCM_AUTO_RUN},
+	{SCM_EMPTY,          NULL, NULL, NULL, NULL, 0},
+	{SCM_KEY_VALUE,      NULL, "Exit & save",        "Exit with saving the settings",             NULL, NULL, SCM_AUTO_RUN},
+	{SCM_KEY_VALUE,      NULL, "Exit",               "Exit without saving the settings",          NULL, NULL, SCM_AUTO_RUN},
+	{SCM_TERMINATOR,     NULL, NULL, NULL, NULL, NULL, 0}
+};
+
+extern const arg_auto_set_t disable_libs[] ;
+
+int main()
+{
+	scm_ctx_t ctx;
+
+	main_init();
+
+	append_settings_auto_set(me_export, 32, disable_libs, "-gd", NULL, "^disable-",   SCM_SUBMENU, 0);
+
+	scm_init(&ctx);
+	scm_menu_autowin(&ctx,  "main menu", me_main);
+
+	main_uninit();
+
+	return 0;
+}
Index: tags/2.0.1/scconfig/plugin_3state.h
===================================================================
--- tags/2.0.1/scconfig/plugin_3state.h	(nonexistent)
+++ tags/2.0.1/scconfig/plugin_3state.h	(revision 18980)
@@ -0,0 +1,63 @@
+/* 3-state plugin system; possible states of each plugin, stored in
+   /local/pcb/PLUGIN_NAME/controls:
+    "disable" = do not compile it at all
+    "buildin" = enable, static link into the executable
+    "plugin"  = enable, make it a dynamic link library (runtime load plugin)
+*/
+
+#define sdisable "disable"
+#define sbuildin "buildin"
+#define splugin  "plugin"
+
+
+/* Macros to check the state */
+
+#define plug_eq(name, val) \
+	((get("/local/pcb/" name "/controls") != NULL) && (strcmp(get("/local/pcb/" name "/controls"), val) == 0))
+
+#define plug_is_enabled(name)  (plug_eq(name, splugin) || plug_eq(name, sbuildin))
+#define plug_is_disabled(name) (plug_eq(name, sdisabled))
+#define plug_is_buildin(name)  (plug_eq(name, sbuildin))
+#define plug_is_plugin(name)   (plug_eq(name, splugin))
+
+/* auto-set tables to change control to the desired value */
+const arg_auto_set_node_t arg_disable[] = {
+	{"controls",    sdisable},
+	{"explicit",    sdisable},
+	{NULL, NULL}
+};
+
+const arg_auto_set_node_t arg_Disable[] = {
+	{"controls",    sdisable},
+	{NULL, NULL}
+};
+
+const arg_auto_set_node_t arg_buildin[] = {
+	{"controls",    sbuildin},
+	{"explicit",    sbuildin},
+	{NULL, NULL}
+};
+
+const arg_auto_set_node_t arg_plugin[] = {
+	{"controls",    splugin},
+	{"explicit",    splugin},
+	{NULL, NULL}
+};
+
+
+/* plugin_def implementation to create CLI args */
+#define plugin3_args(name, desc) \
+	{"disable-" name, "/local/pcb/" name,  arg_disable,   "$do not compile " desc}, \
+	{"Disable-" name, "/local/pcb/" name,  arg_Disable,   NULL }, \
+	{"buildin-" name, "/local/pcb/" name,  arg_buildin,   "$static link " desc " into the executable"}, \
+	{"plugin-"  name, "/local/pcb/" name,  arg_plugin,    "$" desc " is a dynamic loadable plugin"},
+
+
+/* plugin_def implementation to set default state */
+#define plugin3_default(name, default_) \
+	db_mkdir("/local/pcb/" name); \
+	put("/local/pcb/" name "/controls", default_);
+
+/* plugin_def implementation to print a report with the final state */
+#define plugin3_stat(name, desc) \
+	plugin_stat(desc, "/local/pcb/" name "/controls", name);
Index: tags/2.0.1/scconfig/plugins.h
===================================================================
--- tags/2.0.1/scconfig/plugins.h	(nonexistent)
+++ tags/2.0.1/scconfig/plugins.h	(revision 18980)
@@ -0,0 +1,173 @@
+/******************************************************************************
+ Auto-generated by trunk/src_plugins/map_plugins.sh - do NOT edit,
+ run make map_plugins in trunk/src/ - to change any of the data below,
+ edit trunk/src_plugins/PLUGIN/PLUGIN.pup
+******************************************************************************/
+
+plugin_header("\nLibrary plugins:\n")
+plugin_def("lib_compat_help",  "#compatibility helper functions", sbuildin, 1)
+plugin_def("lib_gensexpr",     "#s-expression library",           sdisable, 0)
+plugin_def("lib_gtk_common",   "all-hid_gtk common code",         sdisable, 0)
+plugin_def("lib_gtk_config",   "hid_gtk preferences dialog",      sdisable, 0)
+plugin_def("lib_gtk_hid",      "hid_gtk generic part",            sdisable, 0)
+plugin_def("lib_hid_common",   "all-hid common code",             sdisable, 0)
+plugin_def("lib_hid_gl",       "openGL rendering",                sdisable, 0)
+plugin_def("lib_legacy_func",  "legacy functions",                sbuildin, 1)
+plugin_def("lib_netmap",       "map nets and objects",            sdisable, 0)
+plugin_def("lib_polyhelp",     "polygon helpers",                 sbuildin, 1)
+
+plugin_header("\nFeature plugins:\n")
+plugin_def("acompnet",         "net auto-completion",             sdisable, 1)
+plugin_def("autocrop",         "crop board to fit objects",       sbuildin, 1)
+plugin_def("autoplace",        "auto place components",           sbuildin, 1)
+plugin_def("autoroute",        "the original autorouter",         sbuildin, 1)
+plugin_def("boardflip",        "flip board objects",              sbuildin, 1)
+plugin_def("diag",             "diagnostic acts. for devs",       sdisable, 1)
+plugin_def("dialogs",          "HID-independent GUI dialogs",     sdisable, 1)
+plugin_def("distaligntext",    "distribute and align text",       sbuildin, 1)
+plugin_def("distalign",        "distribute and align objs",       sbuildin, 1)
+plugin_def("djopt",            "djopt board optimization",        sbuildin, 1)
+plugin_def("draw_csect",       "draw cross-section (layers)",     sdisable, 1)
+plugin_def("draw_fab",         "fab layer in some exports",       sbuildin, 1)
+plugin_def("draw_fontsel",     "font selection GUI",              sdisable, 1)
+plugin_def("expfeat",          "experimental features",           sdisable, 1)
+plugin_def("extedit",          "edit with external program",      sbuildin, 1)
+plugin_def("fontmode",         "font editor",                     sbuildin, 1)
+plugin_def("gpmi",             "GPMI scripting",                  sbuildin, 1)
+plugin_def("jostle",           "push lines out of the way",       sbuildin, 1)
+plugin_def("loghid",           "diagnostics: log HID calls",      sdisable, 1)
+plugin_def("millpath",         "calculate toolpath for milling",  sdisable, 1)
+plugin_def("mincut",           "minimal cut shorts",              sbuildin, 1)
+plugin_def("oldactions",       "old/obsolete actions",            sdisable, 1)
+plugin_def("polycombine",      "combine selected polygons",       sbuildin, 1)
+plugin_def("polystitch",       "stitch polygon at cursor",        sbuildin, 1)
+plugin_def("propedit",         "object property editor",          sbuildin, 1)
+plugin_def("puller",           "puller",                          sbuildin, 1)
+plugin_def("query",            "query language",                  sbuildin, 1)
+plugin_def("renumber",         "renumber action",                 sbuildin, 1)
+plugin_def("report",           "report actions",                  sbuildin, 1)
+plugin_def("rubberband_orig",  "the original rubberband",         sbuildin, 1)
+plugin_def("script",           "fungw turing complete scripting", sdisable, 1)
+plugin_def("shand_cmd",        "command shorthands",              sbuildin, 1)
+plugin_def("shape",            "generate regular shapes",         sbuildin, 1)
+plugin_def("sketch_route",     "assisted semi-auto-routing",      sdisable, 1)
+plugin_def("smartdisperse",    "netlist based dispenser",         sbuildin, 1)
+plugin_def("stroke",           "mouse gestures",                  sbuildin, 1)
+plugin_def("teardrops",        "draw teardrops on pins",          sbuildin, 1)
+plugin_def("vendordrill",      "vendor drill mapping",            sbuildin, 1)
+
+plugin_header("\nFootprint backends:\n")
+plugin_def("fp_board",         "footprint library from boards",   sbuildin, 1)
+plugin_def("fp_fs",            "filesystem footprints",           sbuildin, 1)
+plugin_def("fp_wget",          "web footprints",                  sbuildin, 1)
+
+plugin_header("\nImport plugins:\n")
+plugin_def("import_dsn",       "specctra .dsn importer",          sbuildin, 1)
+plugin_def("import_edif",      "import edif",                     sbuildin, 1)
+plugin_def("import_fpcb_nl",   "import freepcb netlist",          sbuildin, 1)
+plugin_def("import_hpgl",      "import HP-GL plot files",         sbuildin, 1)
+plugin_def("import_ipcd356",   "import IPC-D-356 Netlist",        sbuildin, 1)
+plugin_def("import_ltspice",   "import ltspice .net+.asc",        sbuildin, 1)
+plugin_def("import_mentor_sch","import mentor graphics sch",      sbuildin, 1)
+plugin_def("import_mucs",      "import mucs routing",             sbuildin, 1)
+plugin_def("import_netlist",   "import netlist",                  sbuildin, 1)
+plugin_def("import_sch",       "import sch",                      sbuildin, 1)
+plugin_def("import_tinycad",   "import tinycad .net",             sbuildin, 1)
+plugin_def("io_tedax",         "tEDAx (Trivial EDA eXchange)",    sbuildin, 1)
+
+plugin_header("\nExport plugins:\n")
+plugin_def("cam",              "cam/job based export",            sdisable, 1)
+plugin_def("ddraft",           "2D drafting helper",              sbuildin, 1)
+plugin_def("export_bboard",    "breadboard pcb_exporter",         sdisable, 0)
+plugin_def("export_bom",       "bom pcb_exporter",                sbuildin, 1)
+plugin_def("export_dsn",       "specctra .dsn pcb_exporter",      sbuildin, 1)
+plugin_def("export_dxf",       "DXF pcb_exporter",                sbuildin, 1)
+plugin_def("export_fidocadj",  "FidoCadJ .fcd pcb_exporter",      sbuildin, 1)
+plugin_def("export_gcode",     "gcode pcb_exporter",              sbuildin, 1)
+plugin_def("export_gerber",    "Gerber pcb_exporter",             sbuildin, 1)
+plugin_def("export_ipcd356",   "IPC-D-356 Netlist pcb_exporter",  sbuildin, 1)
+plugin_def("export_lpr",       "lpr pcb_exporter (printer)",      sbuildin, 1)
+plugin_def("export_nelma",     "nelma pcb_exporter",              sdisable, 1)
+plugin_def("export_openems",   "openems exporter",                sdisable, 1)
+plugin_def("export_openscad",  "openscad pcb_exporter",           sbuildin, 1)
+plugin_def("export_png",       "png/gif/jpg pcb_exporter",        sbuildin, 1)
+plugin_def("export_ps",        "postscript pcb_exporter",         sbuildin, 1)
+plugin_def("export_stat",      "export board statistics",         sbuildin, 1)
+plugin_def("export_svg",       "SVG pcb_exporter",                sbuildin, 1)
+plugin_def("export_test",      "dummy test pcb_exporter",         sdisable, 1)
+plugin_def("export_xy",        "xy (centroid) pcb_exporter",      sbuildin, 1)
+
+plugin_header("\nIO plugins (file formats):\n")
+plugin_def("io_autotrax",      "autotrax (freeware PCB CAD)",     sbuildin, 1)
+plugin_def("io_eagle",         "Eagle's xml and binary formats",  sbuildin, 1)
+plugin_def("io_hyp",           "hyperlynx .hyp loader",           sbuildin, 1)
+plugin_def("io_kicad_legacy",  "Kicad's legacy format",           sbuildin, 1)
+plugin_def("io_kicad",         "Kicad's s-expr format",           sbuildin, 1)
+plugin_def("io_lihata",        "lihata board format",             sbuildin, 1)
+plugin_def("io_mentor_cell",   "Mentor Graphics cell footprints", sdisable, 1)
+plugin_def("io_pcb",           "the original pcb format",         sbuildin, 1)
+
+plugin_header("\nHID plugins:\n")
+plugin_def("hid_batch",        "batch process (no-gui HID)",      sbuildin, 1)
+plugin_def("hid_gtk2_gdk",     "GTK2 GUI, software render",       sbuildin, 1)
+plugin_def("hid_gtk2_gl",      "GTK2 GUI, opengl render",         sbuildin, 1)
+plugin_def("hid_gtk3_cairo",   "GTK3 GUI, cairo render",          sdisable, 0)
+plugin_def("hid_gtk3_gl",      "GTK3 GUI, gl render",             sdisable, 0)
+plugin_def("hid_lesstif",      "the lesstif gui",                 sbuildin, 1)
+plugin_def("hid_remote",       "remote HID server",               sdisable, 0)
+
+
+plugin_dep("autoroute", "lib_compat_help")
+plugin_dep("draw_fab", "report")
+plugin_dep("export_fidocadj", "lib_compat_help")
+plugin_dep("export_ipcd356", "lib_compat_help")
+plugin_dep("export_lpr", "export_ps")
+plugin_dep("export_openems", "lib_polyhelp")
+plugin_dep("export_openscad", "lib_polyhelp")
+plugin_dep("export_xy", "export_bom")
+plugin_dep("extedit", "io_lihata")
+plugin_dep("fp_wget", "fp_fs")
+plugin_dep("gpmi", "lib_compat_help")
+plugin_dep("hid_gtk2_gdk", "draw_csect")
+plugin_dep("hid_gtk2_gdk", "draw_fontsel")
+plugin_dep("hid_gtk2_gdk", "lib_gtk_common")
+plugin_dep("hid_gtk2_gdk", "lib_gtk_config")
+plugin_dep("hid_gtk2_gdk", "lib_gtk_hid")
+plugin_dep("hid_gtk2_gl", "draw_csect")
+plugin_dep("hid_gtk2_gl", "draw_fontsel")
+plugin_dep("hid_gtk2_gl", "lib_gtk_common")
+plugin_dep("hid_gtk2_gl", "lib_gtk_config")
+plugin_dep("hid_gtk2_gl", "lib_gtk_hid")
+plugin_dep("hid_gtk2_gl", "lib_hid_gl")
+plugin_dep("hid_gtk3_cairo", "draw_csect")
+plugin_dep("hid_gtk3_cairo", "draw_fontsel")
+plugin_dep("hid_gtk3_cairo", "lib_gtk_common")
+plugin_dep("hid_gtk3_cairo", "lib_gtk_config")
+plugin_dep("hid_gtk3_cairo", "lib_gtk_hid")
+plugin_dep("hid_gtk3_gl", "draw_csect")
+plugin_dep("hid_gtk3_gl", "draw_fontsel")
+plugin_dep("hid_gtk3_gl", "lib_gtk_common")
+plugin_dep("hid_gtk3_gl", "lib_gtk_config")
+plugin_dep("hid_gtk3_gl", "lib_gtk_hid")
+plugin_dep("hid_gtk3_gl", "lib_hid_gl")
+plugin_dep("hid_lesstif", "dialogs")
+plugin_dep("hid_lesstif", "draw_csect")
+plugin_dep("hid_lesstif", "draw_fontsel")
+plugin_dep("hid_lesstif", "lib_hid_common")
+plugin_dep("import_dsn", "lib_compat_help")
+plugin_dep("import_ipcd356", "lib_compat_help")
+plugin_dep("import_mentor_sch", "lib_gensexpr")
+plugin_dep("import_mucs", "lib_compat_help")
+plugin_dep("io_autotrax", "boardflip")
+plugin_dep("io_autotrax", "lib_polyhelp")
+plugin_dep("io_eagle", "boardflip")
+plugin_dep("io_hyp", "lib_netmap")
+plugin_dep("io_kicad", "lib_gensexpr")
+plugin_dep("io_kicad_legacy", "io_kicad")
+plugin_dep("io_lihata", "lib_compat_help")
+plugin_dep("io_pcb", "lib_compat_help")
+plugin_dep("io_tedax", "lib_compat_help")
+plugin_dep("lib_gtk_common", "lib_gtk_config")
+plugin_dep("lib_gtk_hid", "dialogs")
+plugin_dep("lib_gtk_hid", "lib_hid_common")
+plugin_dep("millpath", "lib_polyhelp")
Index: tags/2.0.1/scconfig/revtest.c
===================================================================
--- tags/2.0.1/scconfig/revtest.c	(nonexistent)
+++ tags/2.0.1/scconfig/revtest.c	(revision 18980)
@@ -0,0 +1,85 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "Rev.h"
+
+const char *act_names[] = {
+	"distclean",
+	"configure",
+	"make clean",
+	NULL
+};
+
+const char *act_desc[] = {
+	"run 'make distclean' in trunk/",
+	"rerun ./configure",
+	"run 'make clean' in trunk/",
+	NULL
+};
+
+int act_needed[16];
+
+int main(int argc, char *argv[])
+{
+	char line[8192];
+	int res = 0, stamp = 0, banner = 0;
+	FILE *f = NULL;
+
+	if (argc > 1) {
+		f = fopen(argv[1], "r");
+	}
+	if (f != NULL) {
+		fscanf(f, "%d", &stamp);
+		fclose(f);
+	}
+
+	while(fgets(line, sizeof(line), stdin) != NULL) {
+		char *end;
+		int rev;
+
+		if (*line == '#')
+			continue;
+		rev = strtol(line, &end, 10);
+		if (*end != '\t')
+			continue;
+
+		if (rev > stamp) {
+			char *act, *txt;
+			const char **a;
+			int idx;
+			res = 1;
+			act = end;
+			while(*act == '\t')
+				act++;
+			txt = strchr(act, '\t');
+			if (txt != NULL) {
+				*txt = '\0';
+				txt++;
+				while(*txt == '\t')
+					txt++;
+			}
+			if (!banner) {
+				fprintf(stderr, "\nYour source tree is stale (last configured after config-milestone r%d).\nRecent new features:\n", stamp);
+				banner = 1;
+			}
+			fprintf(stderr, "\nr%d: %s\n", rev, txt);
+			for(idx = 0, a = act_names; *a != NULL; idx++, a++)
+				if (strstr(act, *a) != NULL)
+					act_needed[idx]++;
+		}
+	}
+
+	if (res) {
+		const char **a;
+		int idx;
+
+		fprintf(stderr, "(Stamp: %d myrev: %d)\n", stamp, myrev);
+		fprintf(stderr, "\nBefore running make, please do the following actions in this order:\n");
+		for(idx = 0, a = act_names; *a != NULL; idx++, a++)
+			if (act_needed[idx])
+				fprintf(stderr, "  %s\n", act_desc[idx]);
+		fprintf(stderr, "\n");
+	}
+
+	return res;
+}
Index: tags/2.0.1/scconfig/template/cdep.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/cdep.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/cdep.tmpasm	(revision 18980)
@@ -0,0 +1,60 @@
+# Generate Makefile code that can generate Makefile.dep
+# Arguments:
+#  /local/dep/CFLAGS   CFLAGS used for compiling
+#  /local/dep/SRCS     list of c soures
+#  /local/pcb/DEPDEPS  targets make dep should generate first
+
+sortuniq /local/pcb/DEPDEPS_SORTED /local/pcb/DEPDEPS
+
+print [@
+
+### generate dependencies (requires gcc) ###
+FORCE:
+
+include Makefile.dep
+
+DEPDEPS=@/local/pcb/DEPDEPS_SORTED@
+
+dep: FORCE $(DEPDEPS)
+	make -f Makefile.depgen PLUGDIR=$(PLUGDIR) SRC_3RD_DIR=$(SRC_3RD_DIR)
+@]
+
+append /local/dep/CFLAGS {-D_PCB_DEP_}
+gsub /local/dep/CFLAGS {-I} {-isystem }
+gsub /local/dep/CFLAGS {-isystem [.][.]} {-I ..}
+gsub /local/dep/CFLAGS {-isystem [.]} {-I .}
+sortuniq /local/dep/SRCS_SORTED /local/dep/SRCS
+
+redir {Makefile.depgen}
+
+print [@
+# Generated by configure - DO NOT EDIT
+
+# Calculate dependencies, assuming all generated files present and
+# SRC_3RD_DIR and PLUGDIR are set
+
+all:
+	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep
+	echo "" >> Makefile.dep
+@]
+
+foreach /local/c in /local/dep/SRCS_SORTED
+	put /local/o /local/c
+	sub {/local/o} {.c$} {.o}
+	sub {/local/c} {.o$} {.c}
+	switch /local/c
+		case {/src_plugins/} end
+		case {$(PLUGDIR)}
+			print [@	gcc -MT @/local/o@ -MM @/local/c@ @/local/dep/CFLAGS@ @/local/pcb/DEPCFLAGS@ >> Makefile.dep
+@]; end
+		case {$(SRC_3RD_DIR)}
+			print [@	gcc -MT @/local/o@ -MM @/local/c@ @/local/dep/CFLAGS@ >> Makefile.dep
+@]; end
+		case {../src_3rd/}
+			print [@	gcc -MT @/local/o@ -MM @/local/c@ @/local/dep/CFLAGS@ >> Makefile.dep
+@]; end
+
+		default print [@	gcc -MM @/local/c@ @/local/dep/CFLAGS@ >> Makefile.dep
+@]; end
+	end
+end
Index: tags/2.0.1/scconfig/template/comp_var.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/comp_var.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/comp_var.tmpasm	(revision 18980)
@@ -0,0 +1,31 @@
+# Generate Makefile code to compile .c -> .o
+# Arguments:
+#  /local/comp/OBJS     list of .o files (assuming each have at least a .c)
+#  /local/comp/OBJS_C99 list of .o files (assuming each have at least a .c) for non-c89 compilation
+
+put /local/comp/output {}
+append /local/comp/CFLAGS {}
+
+foreach /local/o in /local/comp/OBJS
+put /local/c /local/o
+sub /local/c {.o$} {.c}
+append /local/comp/output [@
+@/local/o@: @/local/c@
+	$(CC) -c $(C89FLAGS) @/local/comp/CFLAGS@ -o @/local/o@ $<
+@]
+end
+
+append /local/comp/OBJS_C99 {}
+foreach /local/o in /local/comp/OBJS_C99
+put /local/c /local/o
+sub /local/c {.o$} {.c}
+append /local/comp/output [@
+@/local/o@: @/local/c@
+	$(CC) -c $(CFLAGS) @/local/comp/CFLAGS@ -o @/local/o@ $<
+@]
+end
+
+put /local/comp/OBJS {}
+put /local/comp/OBJS_C99 {}
+put /local/comp/CFLAGS {}
+
Index: tags/2.0.1/scconfig/template/compile.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/compile.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/compile.tmpasm	(revision 18980)
@@ -0,0 +1,60 @@
+# Generate Makefile code to compile .c -> .o
+# Arguments:
+#  /local/comp/OBJS     list of .o files (assuming each have at least a .c)
+#  /local/comp/OBJS_C99 list of .o files (assuming each have at least a .c), for non-c89 compilation
+
+print {
+### explicit rules for .c -> .o ###
+}
+
+append /local/comp/CFLAGS {}
+
+foreach /local/o in /local/comp/OBJS
+put /local/c /local/o
+sub /local/c {.o$} {.c}
+switch /local/c
+	case {.*_y[.]c}
+		put /local/extinc [@ -I@/local/c@@]
+		sub /local/extinc {/[^/]*$} {}
+		end
+	case {.*_l[.]c}
+		put /local/extinc [@ -I@/local/c@@]
+		sub /local/extinc {/[^/]*$} {}
+		end
+	default
+		put /local/extinc {}
+		end
+end
+print [@
+@/local/o@: @/local/c@
+	$(CC) -c $(C89FLAGS) @/local/comp/CFLAGS@@/local/extinc@ -o @/local/o@ $<
+@]
+end
+
+append /local/comp/OBJS_C99 {}
+foreach /local/o in /local/comp/OBJS_C99
+put /local/c /local/o
+sub /local/c {.o$} {.c}
+switch /local/c
+	case {.*_y[.]c}
+		put /local/extinc [@ -I@/local/c@@]
+		sub /local/extinc {/[^/]*$} {}
+		end
+	case {.*_l[.]c}
+		put /local/extinc [@ -I@/local/c@@]
+		sub /local/extinc {/[^/]*$} {}
+		end
+	default
+		put /local/extinc {}
+		end
+end
+print [@
+@/local/o@: @/local/c@
+	$(CC) -c $(CFLAGS) @/local/comp/CFLAGS@@/local/extinc@ -o @/local/o@ $<
+@]
+end
+
+put /local/comp/OBJS {}
+put /local/comp/OBJS_C99 {}
+put /local/comp/CFLAGS {}
+
Index: tags/2.0.1/scconfig/template/debug.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/debug.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/debug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+# append debug or production flags to CFLAGS, depending on the global debug flag
+
+if /local/pcb/debug then
+	append /local/pcb/CFLAGS [@ -g -O0 @?cc/argstd/Wall@ @]
+else
+	if /local/pcb/symbols then
+		append /local/pcb/CFLAGS [@ -g @]
+	end
+	append /local/pcb/CFLAGS { -O3 -DNDEBUG }
+end
Index: tags/2.0.1/scconfig/template/plugin_conf.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/plugin_conf.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/plugin_conf.tmpasm	(revision 18980)
@@ -0,0 +1,18 @@
+# explicit conf_fields.h generation rules
+
+switch /local/pcb/mod/CONF
+	case {^$} end
+	default
+		put /local/pcb/mod/CONFOUT /local/pcb/mod/CONF
+		sub {/local/pcb/mod/CONFOUT} {.h$} {_fields.h}
+		append /local/pcb/CLEANFILES /local/pcb/mod/CONFOUT
+		append /local/pcb/DEPDEPS /local/pcb/mod/CONFOUT
+		append /local/pcb/RULES [@
+# conf generation for @/local/pcb/mod@ '@/local/pcb/mod/CONF@'
+@/local/pcb/mod/CONFOUT@: @/local/pcb/mod/CONF@
+	AWK=@/host/fstools/awk@ ../scconfig/gen_conf.sh < @/local/pcb/mod/CONF@ > @/local/pcb/mod/CONFOUT@
+@]
+		end
+end
+
+put /local/pcb/mod/CONF {}
Index: tags/2.0.1/scconfig/template/plugin_sphash.tmpasm
===================================================================
--- tags/2.0.1/scconfig/template/plugin_sphash.tmpasm	(nonexistent)
+++ tags/2.0.1/scconfig/template/plugin_sphash.tmpasm	(revision 18980)
@@ -0,0 +1,39 @@
+# explicit rules: .sphash -> .c
+# Space separated list of .sphash input files
+# Optional: aux data fileds:   $(PLUGDIR)/query/consts.sphash::long:int:val;
+switch ?/local/pcb/mod/SPHASH
+	case {^$} end
+	default
+		foreach /local/nn in /local/pcb/mod/SPHASH
+			put /local/n  /local/nn
+			sub {/local/n} {::.*$} {}
+			put /local/bn /local/n
+			sub {/local/bn} {.[^.]*$} {}
+			put /local/pr /local/bn
+			sub {/local/pr} {^.*/} {}
+			switch /local/nn
+				case {::}
+					put /local/aux /local/nn
+					sub {/local/aux} {^.*::} {}
+					gsub {/local/aux} {:} { }
+					sub {/local/aux} {^} {--aux "}
+					append {/local/aux} {"}
+					end
+				default
+					put /local/aux {}
+					end
+			end
+			append /local/pcb/RULES [@
+# sphash for @/local/pcb/mod@
+@/local/bn@_sphash.c @/local/bn@_sphash.h: $(SPHASH) @/local/n@
+	$(SPHASH) @/local/aux@ --prefix @/local/pcb/mod@_@/local/pr@ --out @/local/bn@_sphash < @/local/n@
+@]
+			append /local/pcb/CLEANFILES [@@/local/bn@_sphash.c@]
+			append /local/pcb/CLEANFILES [@@/local/bn@_sphash.h@]
+			append /local/pcb/DEPDEPS [@@/local/bn@_sphash.c@]
+			append /local/pcb/DEPDEPS [@@/local/bn@_sphash.h@]
+		end
+	end
+end
+
+put /local/pcb/mod/SPHASH {}
Index: tags/2.0.1/scconfig
===================================================================
--- tags/2.0.1/scconfig	(nonexistent)
+++ tags/2.0.1/scconfig	(revision 18980)

Property changes on: tags/2.0.1/scconfig
___________________________________________________________________
Added: svn:externals
## -0,0 +1 ##
+svn://repo.hu/scconfig/trunk/src src
Index: tags/2.0.1/src/Makefile.dep
===================================================================
--- tags/2.0.1/src/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src/Makefile.dep	(revision 18980)
@@ -0,0 +1,7775 @@
+### Generated file, do not edit, run make dep ###
+
+../src_plugins/autocrop/autocrop.o: ../src_plugins/autocrop/autocrop.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ actions.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h dolists.h
+../src_plugins/autoplace/action.o: ../src_plugins/autoplace/action.c \
+ ../config.h ../src_plugins/autoplace/autoplace.h global_typedefs.h \
+ pcb_bool.h unit.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h \
+ global_typedefs.h attrib.h layer.h globalconst.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h compat_nls.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h event.h dolists.h
+../src_plugins/autoplace/autoplace.o: \
+ ../src_plugins/autoplace/autoplace.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h ../src_plugins/autoplace/autoplace.h global_typedefs.h box.h \
+ compat_misc.h compat_nls.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ route.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h error.h layer.h intersect.h rtree.h macro.h move.h \
+ rats.h netlist.h route_style.h remove.h rotate.h compat_misc.h obj_rat.h \
+ obj_term.h obj_pstk_inlines.h data.h thermal.h data_it.h
+../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \
+ ../config.h ../src_plugins/autoroute/autoroute.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h event.h \
+ funchash_core.h funchash.h funchash_core_list.h dolists.h
+../src_plugins/autoroute/autoroute.o: \
+ ../src_plugins/autoroute/autoroute.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h macro.h \
+ ../src_plugins/autoroute/autoroute.h board.h vtroutestyle.h library.h \
+ rats_patch.h board.h box.h draw.h error.h find.h heap.h rtree.h \
+ ../src_plugins/autoroute/mtspace.h ../src_plugins/autoroute/vector.h \
+ polygon.h rats.h netlist.h route_style.h remove.h obj_pinvia_therm.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h pcb-printf.h layer.h \
+ compat_nls.h obj_line_draw.h obj_pstk_draw.h obj_pstk_inlines.h data.h \
+ thermal.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \
+ ../config.h box.h math_helper.h global_typedefs.h pcb_bool.h unit.h \
+ move.h obj_common.h flag.h globalconst.h attrib.h data_parent.h \
+ misc_util.h heap.h rtree.h ../src_3rd/genrtree/genrtree_api.h \
+ rtree2_compat.h ../src_plugins/autoroute/mtspace.h \
+ ../src_plugins/autoroute/vector.h
+../src_plugins/autoroute/vector.o: ../src_plugins/autoroute/vector.c \
+ ../config.h math_helper.h ../src_plugins/autoroute/vector.h macro.h
+../src_plugins/boardflip/boardflip.o: \
+ ../src_plugins/boardflip/boardflip.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h rats.h netlist.h route_style.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h \
+ obj_pstk.h ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h \
+ polygon.h vtpadstack_t.h hid.h rtree.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ compat_misc.h ../src_plugins/boardflip/boardflip.h unit.h \
+ funchash_core.h funchash.h funchash_core_list.h dolists.h
+../src_plugins/cam/cam.o: ../src_plugins/cam/cam.c ../config.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h hid_cam.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h hid_attrib.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h layer_grp.h hid_attrib.h \
+ hid_init.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ ../src_plugins/cam/cam_conf.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h compat_misc.h compat_fs.h ../src_plugins/cam/conf_internal.c \
+ dolists.h ../src_plugins/cam/cam_conf_fields.h
+../src_plugins/ddraft/centgeo.o: ../src_plugins/ddraft/centgeo.c \
+ ../config.h ../src_plugins/ddraft/centgeo.h obj_line.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h data_parent.h obj_arc.h \
+ math_helper.h compat_misc.h search.h rats.h netlist.h library.h \
+ route_style.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h layer_grp.h
+../src_plugins/ddraft/ddraft.o: ../src_plugins/ddraft/ddraft.c \
+ ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genvector/vtp0.h \
+ hid_attrib.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h hid_init.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h event.h actions.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h funchash_core.h \
+ funchash.h funchash_core_list.h search.h rats.h netlist.h library.h \
+ route_style.h vtroutestyle.h ../src_plugins/ddraft/centgeo.h obj_line.h \
+ misc_util.h board.h rats_patch.h board.h data_it.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h \
+ ../src_plugins/ddraft/fields_sphash.h draw_wireframe.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h conf_hid.h \
+ vtc0.h ../src_plugins/ddraft/trim.c undo_old.h \
+ ../src_plugins/ddraft/constraint.c crosshair.h tool.h \
+ ../src_plugins/ddraft/constraint_gui.c hid_dad.h compat_misc.h \
+ hid_attrib.h ../src_plugins/ddraft/cli.c hid_inlines.h compat_misc.h \
+ ../src_plugins/ddraft/cli_line.c dolists.h
+../src_plugins/ddraft/fields_sphash.o: \
+ ../src_plugins/ddraft/fields_sphash.c
+../src_plugins/diag/diag.o: ../src_plugins/diag/diag.c ../config.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h data_it.h data.h flag_str.h layer.h \
+ ../src_plugins/diag/diag_conf.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf.h actions.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h error.h event.h \
+ ../src_plugins/diag/integrity.h hid.h hid_attrib.h hid_dad.h \
+ compat_misc.h hid_attrib.h search.h rats.h netlist.h route_style.h \
+ macro.h funchash_core.h funchash.h funchash_core_list.h dolists.h \
+ ../src_plugins/diag/diag_conf_fields.h
+../src_plugins/diag/diag_conf.o: ../src_plugins/diag/diag_conf.c \
+ ../config.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h
+../src_plugins/diag/integrity.o: ../src_plugins/diag/integrity.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h
+../src_plugins/dialogs/dialogs.o: ../src_plugins/dialogs/dialogs.c \
+ ../config.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_attrib.h hid.h \
+ actions.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h hid_dad.h \
+ compat_misc.h hid_attrib.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h funchash_core.h \
+ funchash.h funchash_core_list.h ../src_plugins/dialogs/dlg_test.c \
+ ../src_plugins/dialogs/dlg_layer_binding.c board.h vtroutestyle.h \
+ library.h rats_patch.h board.h data.h crosshair.h vtonpoint.h route.h \
+ buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h ../src_3rd/liblihata/lihata.h \
+ list_conf.h compat_misc.h obj_subc.h search.h rats.h netlist.h \
+ route_style.h ../src_plugins/dialogs/dlg_flag_edit.c flag.h flag_str.h \
+ change.h ../src_plugins/dialogs/dlg_padstack.c obj_pstk.h obj_pstk_op.h \
+ operation.h obj_pstk_inlines.h data.h thermal.h operation.h \
+ ../src_plugins/dialogs/dlg_about.c build_run.h pcb-printf.h \
+ ../src_plugins/dialogs/dlg_export.c hid_init.h dolists.h
+../src_plugins/distalign/distalign.o: \
+ ../src_plugins/distalign/distalign.c board.h ../config.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h rats.h netlist.h route_style.h error.h move.h draw.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h macro.h actions.h \
+ compat_misc.h dolists.h
+../src_plugins/distaligntext/distaligntext.o: \
+ ../src_plugins/distaligntext/distaligntext.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h rats.h netlist.h route_style.h error.h move.h draw.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h box.h \
+ macro.h compat_misc.h dolists.h
+../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.c ../config.h \
+ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h remove.h move.h \
+ draw.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h flag_str.h find.h \
+ layer.h pcb-printf.h compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h hid_flags.h actions.h \
+ ../src_plugins/djopt/djopt_conf.h conf.h obj_line.h event.h macro.h \
+ obj_pstk_inlines.h data.h thermal.h dolists.h \
+ ../src_plugins/djopt/djopt_conf_fields.h
+../src_plugins/draw_csect/draw_csect.o: \
+ ../src_plugins/draw_csect/draw_csect.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h stub_draw.h compat_misc.h actions.h event.h \
+ layer_vis.h obj_text_draw.h obj_line_draw.h dolists.h
+../src_plugins/draw_fab/draw_fab.o: ../src_plugins/draw_fab/draw_fab.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h build_run.h ../src_3rd/genht/htsp.h compat_misc.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h ../src_plugins/draw_fab/../report/drill.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h stub_draw.h \
+ ../src_plugins/draw_fab/draw_fab_conf.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf.h conf_core.h macro.h \
+ obj_pstk_inlines.h data.h thermal.h hid_inlines.h obj_text_draw.h \
+ ../src_plugins/draw_fab/draw_fab_conf_fields.h
+../src_plugins/draw_fontsel/draw_fontsel.o: \
+ ../src_plugins/draw_fontsel/draw_fontsel.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h build_run.h ../src_3rd/genht/htsp.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h font.h actions.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h stub_draw.h \
+ pcb-printf.h compat_misc.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h obj_text.h obj_text_draw.h \
+ obj_line_draw.h
+../src_plugins/expfeat/expfeat.o: ../src_plugins/expfeat/expfeat.c \
+ ../config.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h data.h globalconst.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h change.h board.h \
+ vtroutestyle.h library.h rats_patch.h error.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h dolists.h
+../src_plugins/export_bboard/bboard.o: \
+ ../src_plugins/export_bboard/bboard.c ../config.h math_helper.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h buffer.h layer.h layer_grp.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h compat_misc.h \
+ compat_fs.h misc_util.h rtree.h hid.h hid_attrib.h hid_nogui.h \
+ hid_draw_helpers.h hid_init.h hid_cam.h hid_attrib.h
+../src_plugins/export_bom/bom.o: ../src_plugins/export_bom/bom.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h build_run.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h safe_fs.h hid.h hid_nogui.h \
+ hid_attrib.h hid_cam.h hid_attrib.h hid_init.h macro.h
+../src_plugins/export_dsn/dsn.o: ../src_plugins/export_dsn/dsn.c \
+ ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h layer_grp.h \
+ library.h rats_patch.h board.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ route.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h rats.h netlist.h route_style.h buffer.h change.h \
+ draw.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h pcb-printf.h \
+ polygon.h compat_misc.h layer.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h hid.h hid_draw_helpers.h \
+ hid_nogui.h actions.h hid_init.h hid_attrib.h hid_cam.h hid_attrib.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h obj_line.h \
+ obj_pstk_inlines.h data.h thermal.h dolists.h
+../src_plugins/export_dxf/dxf.o: ../src_plugins/export_dxf/dxf.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h layer.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h pcb-printf.h \
+ compat_misc.h ../src_plugins/export_dxf/lht_template.h safe_fs.h hid.h \
+ hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h hid_color.h \
+ hid_cam.h hid_attrib.h hid_flags.h ../src_plugins/export_dxf/dxf_draw.c \
+ dolists.h
+../src_plugins/export_dxf/dxf_templ_lht.o: \
+ ../src_plugins/export_dxf/dxf_templ_lht.c
+../src_plugins/export_dxf/lht_template.o: \
+ ../src_plugins/export_dxf/lht_template.c ../config.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/tree.h \
+ ../src_plugins/export_dxf/lht_template.h
+../src_plugins/export_fidocadj/fidocadj.o: \
+ ../src_plugins/export_fidocadj/fidocadj.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h ../src_3rd/genht/htsi.h \
+ math_helper.h board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h pcb-printf.h \
+ compat_misc.h plug_io.h safe_fs.h hid.h hid_nogui.h hid_draw_helpers.h \
+ hid_init.h hid_attrib.h hid_color.h hid_cam.h hid_attrib.h hid_flags.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h dolists.h
+../src_plugins/export_gcode/curve.o: ../src_plugins/export_gcode/curve.c \
+ ../config.h ../src_plugins/export_gcode/potracelib.h \
+ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/curve.h \
+ ../src_plugins/export_gcode/auxiliary.h
+../src_plugins/export_gcode/decompose.o: \
+ ../src_plugins/export_gcode/decompose.c ../config.h \
+ ../src_plugins/export_gcode/potracelib.h \
+ ../src_plugins/export_gcode/curve.h \
+ ../src_plugins/export_gcode/auxiliary.h \
+ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/bitmap.h \
+ ../src_plugins/export_gcode/decompose.h
+../src_plugins/export_gcode/gcode.o: ../src_plugins/export_gcode/gcode.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h error.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h rats.h netlist.h \
+ route_style.h hid_cam.h hid_attrib.h layer.h compat_misc.h safe_fs.h \
+ hid.h hid_nogui.h hid_draw_helpers.h ../src_plugins/export_gcode/gcode.h \
+ ../src_plugins/export_gcode/bitmap.h \
+ ../src_plugins/export_gcode/potracelib.h \
+ ../src_plugins/export_gcode/curve.h \
+ ../src_plugins/export_gcode/auxiliary.h \
+ ../src_plugins/export_gcode/trace.h \
+ ../src_plugins/export_gcode/decompose.h pcb-printf.h hid_init.h \
+ hid_attrib.h hid_flags.h hid_color.h dolists.h
+../src_plugins/export_gcode/trace.o: ../src_plugins/export_gcode/trace.c \
+ ../config.h ../src_plugins/export_gcode/potracelib.h \
+ ../src_plugins/export_gcode/curve.h \
+ ../src_plugins/export_gcode/auxiliary.h \
+ ../src_plugins/export_gcode/lists.h ../src_plugins/export_gcode/trace.h \
+ compat_cc.h
+../src_plugins/export_gerber/gerber.o: \
+ ../src_plugins/export_gerber/gerber.c ../config.h math_helper.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h build_run.h ../src_3rd/genht/htsp.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h draw.h layer.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_cam.h \
+ hid_attrib.h compat_misc.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h macro.h hid.h hid_nogui.h \
+ hid_draw_helpers.h hid_init.h hid_attrib.h hid_flags.h hid_inlines.h \
+ conf_core.h
+../src_plugins/export_ipcd356/ipcd356.o: \
+ ../src_plugins/export_ipcd356/ipcd356.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf_core.h compat_misc.h \
+ netlist.h route_style.h math_helper.h layer.h obj_arc.h obj_line.h \
+ obj_poly.h obj_subc.h obj_pstk.h obj_pstk_inlines.h data.h thermal.h \
+ hid.h hid_nogui.h hid_cam.h hid_attrib.h hid_attrib.h hid_init.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/export_lpr/lpr.o: ../src_plugins/export_lpr/lpr.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h hid.h \
+ ../src_plugins/export_lpr/../export_ps/ps.h hid_nogui.h hid_init.h \
+ hid_attrib.h actions.h
+../src_plugins/export_nelma/nelma.o: ../src_plugins/export_nelma/nelma.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h error.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ route.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h rats.h netlist.h route_style.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_cam.h \
+ hid_attrib.h safe_fs.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ list_conf.h hid.h hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h \
+ hid_flags.h hid_color.h dolists.h
+../src_plugins/export_openems/export_openems.o: \
+ ../src_plugins/export_openems/export_openems.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \
+ compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h safe_fs.h obj_subc_parent.h obj_pstk_inlines.h \
+ thermal.h hid.h actions.h hid_nogui.h hid_cam.h hid_attrib.h hid_flags.h \
+ hid_attrib.h hid_init.h hid_draw_helpers.h \
+ ../src_plugins/lib_polyhelp/topoly.h obj_common.h \
+ ../src_plugins/export_openems/mesh.h layer.h vtc0.h vtr0.h dolists.h
+../src_plugins/export_openems/mesh.o: \
+ ../src_plugins/export_openems/mesh.c ../config.h \
+ ../src_plugins/export_openems/mesh.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h vtc0.h vtr0.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/htpp.h layer_ui.h ../src_3rd/genvector/vtp0.h actions.h \
+ hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h layer.h layer_grp.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h hid_dad.h \
+ compat_misc.h hid_attrib.h pcb-printf.h event.h
+../src_plugins/export_openscad/export_openscad.o: \
+ ../src_plugins/export_openscad/export_openscad.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h ../src_3rd/genvector/vti0.h \
+ compat_misc.h board.h vtroutestyle.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h layer.h \
+ math_helper.h misc_util.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h safe_fs.h obj_pstk_inlines.h data.h thermal.h \
+ hid.h hid_nogui.h hid_draw_helpers.h hid_init.h actions.h hid_attrib.h \
+ hid_color.h hid_cam.h hid_attrib.h hid_flags.h \
+ ../src_plugins/export_openscad/scad_draw.c \
+ ../src_plugins/export_openscad/../lib_polyhelp/topoly.h obj_common.h \
+ plug_io.h ../src_plugins/export_openscad/scad_models.c dolists.h
+../src_plugins/export_png/png.o: ../src_plugins/export_png/png.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h layer.h \
+ misc_util.h compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h safe_fs.h hid.h hid_nogui.h hid_draw_helpers.h \
+ ../src_plugins/export_png/png.h hid_init.h hid_attrib.h hid_color.h \
+ hid_cam.h hid_attrib.h hid_flags.h dolists.h
+../src_plugins/export_ps/eps.o: ../src_plugins/export_ps/eps.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h layer.h \
+ pcb-printf.h safe_fs.h hid.h hid_nogui.h hid_draw_helpers.h \
+ ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h hid_cam.h \
+ hid_attrib.h hid_flags.h hid_color.h
+../src_plugins/export_ps/ps.o: ../src_plugins/export_ps/ps.c ../config.h \
+ math_helper.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h error.h draw.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_cam.h \
+ hid_attrib.h safe_fs.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ list_conf.h hid.h hid_nogui.h hid_draw_helpers.h \
+ ../src_plugins/export_ps/ps.h hid_init.h hid_attrib.h hid_flags.h \
+ actions.h conf_core.h compat_misc.h compat_nls.h stub_draw.h dolists.h
+../src_plugins/export_stat/stat.o: ../src_plugins/export_stat/stat.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/hash.h math_helper.h board.h vtroutestyle.h attrib.h \
+ layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
+ obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h pcb-printf.h \
+ compat_misc.h plug_io.h safe_fs.h obj_pstk_inlines.h thermal.h hid.h \
+ hid_nogui.h hid_draw_helpers.h hid_init.h hid_attrib.h hid_color.h \
+ hid_cam.h hid_attrib.h hid_flags.h dolists.h
+../src_plugins/export_svg/svg.o: ../src_plugins/export_svg/svg.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h layer.h \
+ misc_util.h compat_misc.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h safe_fs.h hid.h hid_nogui.h hid_draw_helpers.h \
+ hid_init.h hid_attrib.h hid_color.h hid_cam.h hid_attrib.h hid_flags.h \
+ dolists.h
+../src_plugins/export_test/export_test.o: \
+ ../src_plugins/export_test/export_test.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h build_run.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h hid.h hid_nogui.h hid_attrib.h hid_cam.h \
+ hid_attrib.h hid_init.h
+../src_plugins/export_xy/xy.o: ../src_plugins/export_xy/xy.c ../config.h \
+ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h ../src_3rd/genvector/vts0.h \
+ math_helper.h build_run.h board.h vtroutestyle.h attrib.h layer.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \
+ error.h pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h obj_pstk_inlines.h thermal.h \
+ layer.h netlist.h route_style.h safe_fs.h macro.h \
+ ../src_plugins/export_xy/xy_conf.h conf.h hid.h hid_nogui.h hid_attrib.h \
+ hid_cam.h hid_attrib.h hid_init.h \
+ ../src_plugins/lib_compat_help/elem_rot.h \
+ ../src_plugins/export_xy/conf_internal.c \
+ ../src_plugins/export_xy/xy_conf_fields.h
+../src_plugins/extedit/extedit.o: ../src_plugins/extedit/extedit.c \
+ ../config.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_attrib.h hid.h \
+ actions.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h hid_dad.h \
+ compat_misc.h hid_attrib.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h compat_fs.h compat_misc.h \
+ conf_core.h conf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h buffer.h paths.h \
+ remove.h safe_fs.h search.h rats.h netlist.h route_style.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h \
+ ../src_plugins/io_lihata/io_lihata.h conf.h \
+ ../src_plugins/io_lihata/lht_conf.h ../src_plugins/io_lihata/write.h \
+ ../src_plugins/io_lihata/read.h plug_io.h \
+ ../src_plugins/extedit/extedit_dad.c dolists.h
+../src_plugins/fontmode/fontmode.o: ../src_plugins/fontmode/fontmode.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h flag.h \
+ layer.h move.h remove.h rtree.h flag_str.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ compat_misc.h event.h polygon.h obj_poly_draw.h dolists.h
+../src_plugins/fp_board/fp_board.o: ../src_plugins/fp_board/fp_board.c \
+ ../config.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h plug_footprint.h vtlibrary.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/htpp.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h obj_subc.h obj_subc_list.h obj_subc_op.h \
+ operation.h compat_misc.h pcb-printf.h operation.h plug_io.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h safe_fs.h
+../src_plugins/fp_fs/fp_fs.o: ../src_plugins/fp_fs/fp_fs.c ../config.h \
+ data.h globalconst.h global_typedefs.h pcb_bool.h unit.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h paths.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h plug_footprint.h vtlibrary.h compat_fs.h \
+ compat_misc.h error.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ list_conf.h conf.h conf_core.h compat_nls.h macro.h safe_fs.h \
+ compat_inc.h
+../src_plugins/fp_wget/edakrill.o: ../src_plugins/fp_wget/edakrill.c \
+ ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h error.h \
+ ../src_plugins/fp_wget/wget_common.h ../src_plugins/fp_wget/edakrill.h \
+ plug_footprint.h vtlibrary.h ../src_plugins/fp_wget/fp_wget_conf.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h safe_fs.h globalconst.h
+../src_plugins/fp_wget/fp_wget.o: ../src_plugins/fp_wget/fp_wget.c \
+ ../config.h ../src_plugins/fp_wget/gedasymbols.h plug_footprint.h \
+ vtlibrary.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/fp_wget/fp_wget_conf.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/fp_wget/edakrill.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_plugins/fp_wget/conf_internal.c \
+ ../src_plugins/fp_wget/fp_wget_conf_fields.h
+../src_plugins/fp_wget/gedasymbols.o: \
+ ../src_plugins/fp_wget/gedasymbols.c ../config.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h error.h \
+ ../src_plugins/fp_wget/wget_common.h \
+ ../src_plugins/fp_wget/gedasymbols.h plug_footprint.h vtlibrary.h \
+ ../src_plugins/fp_wget/fp_wget_conf.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_3rd/genlist/gentdlist_undef.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h compat_misc.h \
+ safe_fs.h globalconst.h
+../src_plugins/fp_wget/wget_common.o: \
+ ../src_plugins/fp_wget/wget_common.c ../config.h \
+ ../src_plugins/fp_wget/wget_common.h compat_misc.h safe_fs.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h
+../src_plugins/hid_batch/batch.o: ../src_plugins/hid_batch/batch.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ data.h crosshair.h vtonpoint.h hid.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h event.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ hid_draw_helpers.h hid_nogui.h actions.h hid_init.h hid_attrib.h \
+ dolists.h
+../src_plugins/hid_gtk2_gdk/gtkhid-gdk.o: \
+ ../src_plugins/hid_gtk2_gdk/gtkhid-gdk.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h data.h crosshair.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h layer.h grid.h \
+ board.h vtroutestyle.h library.h rats_patch.h hid_draw_helpers.h \
+ hid_attrib.h hid_color.h ../src_plugins/lib_gtk_hid/gui.h hid.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h event.h \
+ ../src_plugins/lib_gtk_hid/render.h ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/coord_conv.h compat_misc.h \
+ ../src_plugins/lib_gtk_hid/preview_helper.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h \
+ ../src_plugins/lib_hid_common/clip.h global_typedefs.h
+../src_plugins/hid_gtk2_gdk/gtkhid-main.o: \
+ ../src_plugins/hid_gtk2_gdk/gtkhid-main.c ../config.h error.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_init.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/glue_common.h \
+ ../src_plugins/lib_gtk_hid/glue_hid.h \
+ ../src_plugins/lib_gtk_hid/glue_conf.h \
+ ../src_plugins/lib_gtk_hid/glue_event.h \
+ ../src_plugins/lib_gtk_hid/glue_win32.h \
+ ../src_plugins/lib_gtk_hid/common.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/hid_gtk2_gl/gtkhid-gl.o: \
+ ../src_plugins/hid_gtk2_gl/gtkhid-gl.c ../config.h crosshair.h \
+ vtonpoint.h global_typedefs.h pcb_bool.h unit.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h attrib.h \
+ layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h route.h data.h crosshair.h \
+ buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h hid_draw_helpers.h hid_attrib.h hid_color.h \
+ ../src_plugins/lib_hid_common/clip.h global_typedefs.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h event.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/compat.h ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/gui.h ../src_plugins/lib_gtk_hid/coord_conv.h \
+ compat_misc.h conf_core.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/preview_helper.h \
+ ../src_plugins/lib_hid_gl/opengl.h ../src_plugins/lib_hid_gl/draw_gl.h \
+ ../src_plugins/lib_hid_gl/opengl.h ../src_plugins/lib_hid_gl/hidgl.h \
+ ../src_plugins/lib_hid_gl/stencil_gl.h
+../src_plugins/hid_gtk2_gl/gtkhid-main.o: \
+ ../src_plugins/hid_gtk2_gl/gtkhid-main.c ../config.h error.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_init.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_hid_gl/draw_gl.h ../src_plugins/lib_hid_gl/opengl.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/glue_common.h \
+ ../src_plugins/lib_gtk_hid/glue_hid.h \
+ ../src_plugins/lib_gtk_hid/glue_conf.h \
+ ../src_plugins/lib_gtk_hid/glue_event.h \
+ ../src_plugins/lib_gtk_hid/glue_win32.h \
+ ../src_plugins/lib_gtk_hid/common.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/hid_gtk3_cairo/gtkhid-cairo.o: \
+ ../src_plugins/hid_gtk3_cairo/gtkhid-cairo.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h data.h crosshair.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h layer.h grid.h \
+ board.h vtroutestyle.h library.h rats_patch.h hid_draw_helpers.h \
+ hid_attrib.h hid_color.h ../src_plugins/lib_gtk_hid/gui.h hid.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h event.h \
+ ../src_plugins/lib_gtk_hid/render.h ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/coord_conv.h compat_misc.h \
+ ../src_plugins/lib_gtk_hid/preview_helper.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h \
+ ../src_plugins/lib_hid_common/clip.h global_typedefs.h
+../src_plugins/hid_gtk3_cairo/gtkhid-main.o: \
+ ../src_plugins/hid_gtk3_cairo/gtkhid-main.c ../config.h error.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_init.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/glue_common.h \
+ ../src_plugins/lib_gtk_hid/glue_hid.h \
+ ../src_plugins/lib_gtk_hid/glue_conf.h \
+ ../src_plugins/lib_gtk_hid/glue_event.h \
+ ../src_plugins/lib_gtk_hid/glue_win32.h \
+ ../src_plugins/lib_gtk_hid/common.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/hid_gtk3_gl/gtkhid-main.o: \
+ ../src_plugins/hid_gtk3_gl/gtkhid-main.c ../config.h error.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_init.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h conf_hid.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_hid/glue_common.h \
+ ../src_plugins/lib_gtk_hid/glue_hid.h \
+ ../src_plugins/lib_gtk_hid/glue_conf.h \
+ ../src_plugins/lib_gtk_hid/glue_event.h \
+ ../src_plugins/lib_gtk_hid/glue_win32.h \
+ ../src_plugins/lib_gtk_hid/common.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/hid_lesstif/dialogs.o: \
+ ../src_plugins/hid_lesstif/dialogs.c \
+ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h compat_misc.h data.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h build_run.h \
+ crosshair.h layer.h pcb-printf.h hid.h \
+ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h hid_cfg.h \
+ compat_nls.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ hid_attrib.h actions.h hid_init.h ../src_plugins/hid_lesstif/stdarg.h \
+ misc_util.h search.h rats.h netlist.h route_style.h change.h
+../src_plugins/hid_lesstif/library.o: \
+ ../src_plugins/hid_lesstif/library.c \
+ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h compat_misc.h data.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h actions.h \
+ buffer.h plug_footprint.h vtlibrary.h hid.h \
+ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h hid_cfg.h \
+ compat_nls.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ ../src_plugins/hid_lesstif/stdarg.h event.h tool.h
+../src_plugins/hid_lesstif/main.o: ../src_plugins/hid_lesstif/main.c \
+ ../src_plugins/hid_lesstif/xincludes.h ../config.h math_helper.h \
+ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h crosshair.h \
+ conf_hid.h layer.h pcb-printf.h event.h error.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h macro.h safe_fs.h \
+ hid.h hid_nogui.h hid_draw_helpers.h hid_cfg.h \
+ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h hid_cfg.h \
+ compat_nls.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ hid_attrib.h hid_init.h hid_color.h hid_extents.h hid_flags.h actions.h \
+ ../src_plugins/hid_lesstif/stdarg.h grid.h misc_util.h compat_misc.h \
+ layer_vis.h tool.h ../src_plugins/lib_hid_common/clip.h \
+ global_typedefs.h ../src_plugins/lib_hid_common/util.h \
+ ../src_plugins/hid_lesstif/dlg_preview.c stub_draw.h dolists.h
+../src_plugins/hid_lesstif/menu.o: ../src_plugins/hid_lesstif/menu.c \
+ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ pcb-printf.h layer.h hid.h hid_cfg.h hid_cfg_action.h hid_cfg.h \
+ hid_cfg_input.h conf_hid.h ../src_plugins/hid_lesstif/lesstif.h \
+ compat_nls.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ paths.h actions.h hid_flags.h ../src_plugins/hid_lesstif/stdarg.h \
+ event.h compat_misc.h layer_vis.h
+../src_plugins/hid_lesstif/netlist.o: \
+ ../src_plugins/hid_lesstif/netlist.c ../config.h \
+ ../src_plugins/hid_lesstif/xincludes.h compat_misc.h data.h \
+ globalconst.h global_typedefs.h pcb_bool.h unit.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h find.h rats.h netlist.h library.h route_style.h \
+ vtroutestyle.h select.h operation.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h remove.h crosshair.h draw.h event.h hid.h actions.h \
+ ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h hid_cfg.h \
+ compat_nls.h board.h rats_patch.h board.h \
+ ../src_plugins/hid_lesstif/stdarg.h
+../src_plugins/hid_lesstif/stdarg.o: ../src_plugins/hid_lesstif/stdarg.c \
+ ../src_plugins/hid_lesstif/stdarg.h \
+ ../src_plugins/hid_lesstif/xincludes.h
+../src_plugins/hid_lesstif/styles.o: ../src_plugins/hid_lesstif/styles.c \
+ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h compat_misc.h data.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h pcb-printf.h \
+ actions.h hid.h ../src_plugins/hid_lesstif/lesstif.h hid_cfg_input.h \
+ hid_cfg.h compat_nls.h board.h vtroutestyle.h library.h rats_patch.h \
+ board.h hid_flags.h ../src_plugins/hid_lesstif/stdarg.h misc_util.h \
+ event.h
+../src_plugins/hid_remote/base64.o: ../src_plugins/hid_remote/base64.c \
+ ../src_plugins/hid_remote/base64.h
+../src_plugins/hid_remote/proto.o: ../src_plugins/hid_remote/proto.c \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h ../config.h \
+ ../src_plugins/hid_remote/proto_lowcommon.h \
+ ../src_plugins/hid_remote/proto_lowsend.h \
+ ../src_plugins/hid_remote/base64.h \
+ ../src_plugins/hid_remote/proto_lowparse.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h attrib.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h layer.h
+../src_plugins/hid_remote/remote.o: ../src_plugins/hid_remote/remote.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ data.h crosshair.h vtonpoint.h hid.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h event.h \
+ ../src_plugins/hid_remote/proto.h hid_draw_helpers.h hid_nogui.h \
+ actions.h hid_init.h dolists.h
+../src_plugins/import_dsn/dsn.o: ../src_plugins/import_dsn/dsn.c \
+ ../config.h ../src_3rd/gensexpr/gsxl.h \
+ ../src_3rd/gensexpr/gensexpr_impl.h ../src_3rd/gensexpr/gsx_parse.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h polygon.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h actions.h hid.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h dolists.h
+../src_plugins/import_edif/edif.o: ../src_plugins/import_edif/edif.c \
+ math_helper.h board.h ../config.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h library.h error.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h compat_misc.h compat_nls.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h
+../src_plugins/import_edif/import_edif.o: \
+ ../src_plugins/import_edif/import_edif.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h plug_import.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h netlist.h route_style.h \
+ rats_patch.h plug_io.h
+../src_plugins/import_fpcb_nl/fpcb_nl.o: \
+ ../src_plugins/import_fpcb_nl/fpcb_nl.c ../config.h \
+ ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h
+../src_plugins/import_hpgl/hpgl.o: ../src_plugins/import_hpgl/hpgl.c \
+ ../config.h ../src_3rd/libuhpgl/libuhpgl.h ../src_3rd/libuhpgl/parse.h \
+ ../src_3rd/libuhpgl/libuhpgl.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h buffer.h error.h \
+ pcb-printf.h compat_misc.h safe_fs.h actions.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h
+../src_plugins/import_ipcd356/ipcd356.o: \
+ ../src_plugins/import_ipcd356/ipcd356.c ../config.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf_core.h hid.h \
+ compat_misc.h actions.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h rtree.h \
+ ../src_plugins/lib_compat_help/pstk_help.h obj_pstk.h dolists.h
+../src_plugins/import_ltspice/ltspice.o: \
+ ../src_plugins/import_ltspice/ltspice.c ../config.h \
+ ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h
+../src_plugins/import_mentor_sch/mentor_sch.o: \
+ ../src_plugins/import_mentor_sch/mentor_sch.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h \
+ ../src_3rd/gensexpr/gsxl.h ../src_3rd/gensexpr/gensexpr_impl.h \
+ ../src_3rd/gensexpr/gsx_parse.h actions.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h \
+ ../src_plugins/import_mentor_sch/mentor_sch_conf.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf.h paths.h safe_fs.h \
+ ../src_plugins/import_mentor_sch/netlist_helper.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h dolists.h \
+ ../src_plugins/import_mentor_sch/mentor_sch_conf_fields.h
+../src_plugins/import_mentor_sch/netlist_helper.o: \
+ ../src_plugins/import_mentor_sch/netlist_helper.c ../config.h \
+ ../src_3rd/genht/hash.h \
+ ../src_plugins/import_mentor_sch/netlist_helper.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h compat_misc.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h error.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ safe_fs.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h
+../src_plugins/import_mucs/mucs.o: ../src_plugins/import_mucs/mucs.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h layer.h conf_core.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h dolists.h
+../src_plugins/import_netlist/import_netlist.o: \
+ ../src_plugins/import_netlist/import_netlist.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ plug_import.h conf_core.h error.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h rats_patch.h \
+ compat_misc.h compat_nls.h paths.h safe_fs.h macro.h
+../src_plugins/import_sch/import_sch.o: \
+ ../src_plugins/import_sch/import_sch.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h change.h error.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h paths.h compat_fs.h \
+ pcb-printf.h remove.h rats.h netlist.h route_style.h actions.h \
+ ../src_plugins/import_sch/import_sch_conf.h conf.h misc_util.h \
+ compat_nls.h compat_misc.h obj_rat.h dolists.h \
+ ../src_plugins/import_sch/import_sch_conf_fields.h
+../src_plugins/import_tinycad/tinycad.o: \
+ ../src_plugins/import_tinycad/tinycad.c ../config.h \
+ ../src_3rd/qparse/qparse.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h dolists.h
+../src_plugins/io_autotrax/io_autotrax.o: \
+ ../src_plugins/io_autotrax/io_autotrax.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h library.h \
+ global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h globalconst.h \
+ attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_autotrax/write.h data.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_autotrax/read.h actions.h board.h vtroutestyle.h \
+ rats_patch.h board.h netlist.h route_style.h conf_core.h buffer.h hid.h \
+ compat_misc.h
+../src_plugins/io_autotrax/read.o: ../src_plugins/io_autotrax/read.c \
+ ../config.h ../src_3rd/qparse/qparse.h compat_misc.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_autotrax/read.h layer.h netlist.h route_style.h \
+ polygon.h misc_util.h conf_core.h move.h macro.h safe_fs.h rotate.h \
+ compat_misc.h ../src_plugins/boardflip/boardflip.h unit.h actions.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/pstk_help.h \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h
+../src_plugins/io_autotrax/write.o: ../src_plugins/io_autotrax/write.c \
+ ../config.h compat_misc.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_autotrax/write.h layer.h polygon_offs.h \
+ ../src_plugins/io_autotrax/../lib_polyhelp/polyhelp.h obj_poly.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+../src_plugins/io_eagle/eagle_bin.o: ../src_plugins/io_eagle/eagle_bin.c \
+ ../config.h ../src_plugins/io_eagle/eagle_bin.h \
+ ../src_plugins/io_eagle/egb_tree.h ../src_3rd/genht/htss.h \
+ ../src_3rd/genht/ht.h error.h math_helper.h misc_util.h unit.h \
+ pcb_bool.h
+../src_plugins/io_eagle/egb_tree.o: ../src_plugins/io_eagle/egb_tree.c \
+ ../config.h ../src_3rd/genht/hash.h ../src_plugins/io_eagle/egb_tree.h \
+ ../src_3rd/genht/htss.h ../src_3rd/genht/ht.h compat_misc.h
+../src_plugins/io_eagle/io_eagle.o: ../src_plugins/io_eagle/io_eagle.c \
+ ../config.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h plug_io.h library.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h ../src_plugins/io_eagle/read.h \
+ board.h vtroutestyle.h rats_patch.h board.h conf.h \
+ ../src_plugins/io_eagle/read_dru.h actions.h hid.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h dolists.h
+../src_plugins/io_eagle/read.o: ../src_plugins/io_eagle/read.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h ../src_plugins/io_eagle/read.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ plug_io.h conf_core.h error.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h rtree.h actions.h \
+ hid.h error.h drc.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ compat_misc.h ../src_plugins/io_eagle/trparse.h \
+ ../src_plugins/io_eagle/trparse_xml.h \
+ ../src_plugins/io_eagle/trparse_bin.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h ../src_plugins/boardflip/boardflip.h \
+ data.h crosshair.h vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ht_subc.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
+ obj_pstk_shape.h polygon.h vtpadstack_t.h unit.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/subc_help.h layer.h \
+ ../src_plugins/lib_compat_help/pstk_help.h
+../src_plugins/io_eagle/read_dru.o: ../src_plugins/io_eagle/read_dru.c \
+ ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/io_eagle/read_dru.h plug_io.h library.h global_typedefs.h \
+ pcb_bool.h unit.h obj_common.h flag.h globalconst.h attrib.h \
+ data_parent.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h conf_core.h safe_fs.h board.h \
+ vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h rats_patch.h board.h layer_grp.h error.h
+../src_plugins/io_eagle/trparse_bin.o: \
+ ../src_plugins/io_eagle/trparse_bin.c ../config.h error.h safe_fs.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_eagle/egb_tree.h \
+ ../src_3rd/genht/htss.h ../src_plugins/io_eagle/eagle_bin.h \
+ ../src_plugins/io_eagle/trparse.h ../src_plugins/io_eagle/trparse_bin.h
+../src_plugins/io_eagle/trparse_xml.o: \
+ ../src_plugins/io_eagle/trparse_xml.c ../config.h error.h safe_fs.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_eagle/trparse.h \
+ ../src_plugins/io_eagle/trparse_xml.h
+../src_plugins/io_hyp/hyp_l.o: ../src_plugins/io_hyp/hyp_l.c \
+ ../src_plugins/io_hyp/hyp_y.h ../src_plugins/io_hyp/parser.h pcb_bool.h \
+ board.h ../config.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h
+../src_plugins/io_hyp/hyp_y.o: ../src_plugins/io_hyp/hyp_y.c \
+ ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h ../src_plugins/io_hyp/hyp_l.h
+../src_plugins/io_hyp/io_hyp.o: ../src_plugins/io_hyp/io_hyp.c \
+ ../config.h compat_nls.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_draw_helpers.h \
+ hid_nogui.h actions.h hid.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h hid_init.h hid_attrib.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h event.h plug_io.h \
+ library.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h ../src_plugins/io_hyp/parser.h \
+ pcb_bool.h board.h vtroutestyle.h rats_patch.h board.h \
+ ../src_plugins/io_hyp/write.h dolists.h
+../src_plugins/io_hyp/parser.o: ../src_plugins/io_hyp/parser.c \
+ ../src_plugins/io_hyp/parser.h pcb_bool.h board.h ../config.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h ../src_plugins/io_hyp/hyp_l.h ../src_plugins/io_hyp/hyp_y.h \
+ error.h pcb-printf.h flag_str.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h layer.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h \
+ obj_pstk.h ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h \
+ polygon.h vtpadstack_t.h search.h rats.h netlist.h route_style.h \
+ rotate.h compat_misc.h actions.h plug_io.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_misc.h safe_fs.h \
+ ../src_plugins/lib_compat_help/pstk_help.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h
+../src_plugins/io_hyp/write.o: ../src_plugins/io_hyp/write.c ../config.h \
+ ../src_plugins/io_hyp/write.h pcb_bool.h plug_io.h library.h \
+ global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h globalconst.h \
+ attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h board.h vtroutestyle.h layer.h \
+ obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h compat_misc.h \
+ polygon.h obj_subc_parent.h data.h obj_pstk_inlines.h thermal.h \
+ ../src_plugins/lib_netmap/netmap.h library.h ../src_3rd/genht/htpi.h
+../src_plugins/io_kicad/io_kicad.o: ../src_plugins/io_kicad/io_kicad.c \
+ ../config.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h plug_io.h library.h global_typedefs.h \
+ pcb_bool.h unit.h obj_common.h flag.h globalconst.h attrib.h \
+ data_parent.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_kicad/write.h data.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_kicad/read.h ../src_plugins/io_kicad/read_net.h unit.h \
+ actions.h dolists.h
+../src_plugins/io_kicad/read.o: ../src_plugins/io_kicad/read.c \
+ ../src_3rd/gensexpr/gsxl.h ../src_3rd/gensexpr/gensexpr_impl.h \
+ ../src_3rd/gensexpr/gsx_parse.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/ht.h compat_misc.h ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h plug_io.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h error.h \
+ data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_kicad/read.h layer.h netlist.h route_style.h polygon.h \
+ plug_footprint.h vtlibrary.h misc_util.h conf_core.h move.h macro.h \
+ rotate.h compat_misc.h safe_fs.h attrib.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/pstk_help.h \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h
+../src_plugins/io_kicad/read_net.o: ../src_plugins/io_kicad/read_net.c \
+ ../config.h ../src_3rd/gensexpr/gsxl.h \
+ ../src_3rd/gensexpr/gensexpr_impl.h ../src_3rd/gensexpr/gsx_parse.h \
+ ../src_plugins/io_kicad/read_net.h unit.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h
+../src_plugins/io_kicad/uniq_name.o: ../src_plugins/io_kicad/uniq_name.c \
+ ../src_3rd/genht/hash.h ../config.h ../src_plugins/io_kicad/uniq_name.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h compat_misc.h
+../src_plugins/io_kicad/write.o: ../src_plugins/io_kicad/write.c \
+ ../config.h compat_misc.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.h \
+ ../src_plugins/io_kicad/uniq_name.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_kicad/write.h layer.h netlist.h route_style.h \
+ obj_pstk_inlines.h data.h thermal.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+../src_plugins/io_kicad_legacy/io_kicad_legacy.o: \
+ ../src_plugins/io_kicad_legacy/io_kicad_legacy.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h library.h \
+ global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h globalconst.h \
+ attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_kicad_legacy/write.h \
+ data.h layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h
+../src_plugins/io_kicad_legacy/write.o: \
+ ../src_plugins/io_kicad_legacy/write.c ../config.h compat_misc.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/io_kicad_legacy/write.h layer.h netlist.h route_style.h \
+ macro.h obj_pstk_inlines.h data.h thermal.h \
+ ../src_plugins/io_kicad_legacy/../io_kicad/uniq_name.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+../src_plugins/io_lihata/common.o: ../src_plugins/io_lihata/common.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h macro.h ../src_plugins/io_lihata/common.h thermal.h
+../src_plugins/io_lihata/io_lihata.o: \
+ ../src_plugins/io_lihata/io_lihata.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h library.h \
+ global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h globalconst.h \
+ attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_lihata/read.h \
+ ../src_plugins/io_lihata/write.h ../src_plugins/io_lihata/io_lihata.h \
+ conf.h ../src_plugins/io_lihata/lht_conf.h \
+ ../src_plugins/io_lihata/lht_conf_fields.h
+../src_plugins/io_lihata/read.o: ../src_plugins/io_lihata/read.c \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/libminuid/libminuid.h ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h plug_io.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h flag_str.h compat_misc.h \
+ macro.h error.h misc_util.h layer.h ../src_plugins/io_lihata/common.h \
+ polygon.h conf_core.h obj_subc.h pcb_minuid.h thermal.h \
+ ../src_plugins/io_lihata/io_lihata.h conf.h \
+ ../src_plugins/io_lihata/lht_conf.h safe_fs.h plug_footprint.h \
+ vtlibrary.h vtpadstack.h obj_pstk_inlines.h data.h thermal.h \
+ ../src_plugins/lib_compat_help/subc_help.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/elem_rot.h
+../src_plugins/io_lihata/write.o: ../src_plugins/io_lihata/write.c \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/libminuid/libminuid.h ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h route.h \
+ buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h flag_str.h \
+ compat_misc.h rats_patch.h actions.h misc_util.h macro.h layer.h \
+ ../src_plugins/io_lihata/common.h ../src_plugins/io_lihata/write_style.h \
+ ../src_3rd/liblhtpers/lhtpers.h ../src_plugins/io_lihata/io_lihata.h \
+ conf.h ../src_plugins/io_lihata/lht_conf.h paths.h obj_subc_list.h \
+ pcb_minuid.h safe_fs.h thermal.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+../src_plugins/io_lihata/write_style.o: \
+ ../src_plugins/io_lihata/write_style.c ../config.h \
+ ../src_plugins/io_lihata/write_style.h ../src_3rd/liblhtpers/lhtpers.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h
+../src_plugins/io_mentor_cell/io_mentor_cell.o: \
+ ../src_plugins/io_mentor_cell/io_mentor_cell.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_io.h library.h \
+ global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h globalconst.h \
+ attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_mentor_cell/read.h \
+ actions.h hid.h error.h drc.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ dolists.h
+../src_plugins/io_mentor_cell/read.o: \
+ ../src_plugins/io_mentor_cell/read.c ../config.h \
+ ../src_3rd/qparse/qparse.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h layer_grp.h \
+ library.h rats_patch.h board.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ plug_io.h error.h safe_fs.h
+../src_plugins/io_pcb/attribs.o: ../src_plugins/io_pcb/attribs.c \
+ ../config.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h board.h vtroutestyle.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h compat_misc.h
+../src_plugins/io_pcb/file.o: ../src_plugins/io_pcb/file.c ../config.h \
+ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h buffer.h obj_common.h flag.h \
+ attrib.h data_parent.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h change.h board.h vtroutestyle.h layer.h \
+ obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h data.h crosshair.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ ../src_plugins/io_pcb/file.h board.h plug_io.h hid.h layer.h move.h \
+ ../src_plugins/io_pcb/parse_common.h pcb-printf.h polygon.h rats.h \
+ netlist.h route_style.h remove.h flag_str.h compat_fs.h compat_misc.h \
+ paths.h rats_patch.h actions.h hid_flags.h \
+ ../src_plugins/io_pcb/attribs.h route_style.h obj_poly.h thermal.h \
+ event.h macro.h ../src_plugins/lib_compat_help/layer_compat.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h \
+ ../src_plugins/lib_compat_help/elem_rot.h
+../src_plugins/io_pcb/io_pcb.o: ../src_plugins/io_pcb/io_pcb.c \
+ ../config.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h ../src_plugins/io_pcb/parse_common.h plug_io.h \
+ library.h global_typedefs.h pcb_bool.h unit.h obj_common.h flag.h \
+ globalconst.h attrib.h data_parent.h conf.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/io_pcb/file.h board.h \
+ vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h rats_patch.h board.h
+../src_plugins/io_pcb/parse_l.o: ../src_plugins/io_pcb/parse_l.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h flag_str.h flag.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h attrib.h layer.h \
+ obj_arc_list.h obj_common.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h route.h data.h crosshair.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ ../src_plugins/io_pcb/file.h board.h vtroutestyle.h library.h \
+ rats_patch.h board.h plug_io.h ../src_plugins/io_pcb/parse_common.h \
+ ../src_plugins/io_pcb/parse_y.h plug_footprint.h vtlibrary.h \
+ ../src_plugins/io_pcb/attribs.h compat_misc.h compat_nls.h compat_cc.h \
+ obj_common.h paths.h safe_fs.h macro.h
+../src_plugins/io_pcb/parse_y.o: ../src_plugins/io_pcb/parse_y.c \
+ ../config.h flag.h globalconst.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h layer.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h \
+ ../src_plugins/io_pcb/file.h plug_io.h ../src_plugins/io_pcb/parse_l.h \
+ polygon.h remove.h rtree.h flag_str.h obj_pinvia_therm.h rats_patch.h \
+ route_style.h compat_misc.h ../src_plugins/lib_compat_help/pstk_compat.h \
+ obj_pstk.h ../src_plugins/io_pcb/parse_y.h
+../src_plugins/io_tedax/footprint.o: ../src_plugins/io_tedax/footprint.c \
+ ../config.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/hash.h \
+ ../src_plugins/io_tedax/footprint.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/io_tedax/parse.h unit.h attrib.h error.h \
+ board.h vtroutestyle.h library.h rats_patch.h board.h pcb-printf.h \
+ compat_misc.h safe_fs.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h obj_line.h obj_arc.h \
+ obj_pstk.h obj_pstk_inlines.h data.h thermal.h \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h layer.h \
+ ../src_plugins/lib_compat_help/pstk_help.h
+../src_plugins/io_tedax/io_tedax.o: ../src_plugins/io_tedax/io_tedax.c \
+ ../config.h ../src_plugins/io_tedax/footprint.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ ../src_plugins/io_tedax/netlist.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h buffer.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid.h actions.h \
+ compat_misc.h plug_io.h dolists.h
+../src_plugins/io_tedax/netlist.o: ../src_plugins/io_tedax/netlist.c \
+ ../config.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/hash.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h error.h pcb-printf.h compat_misc.h actions.h safe_fs.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ ../src_plugins/io_tedax/parse.h
+../src_plugins/io_tedax/parse.o: ../src_plugins/io_tedax/parse.c \
+ ../config.h ../src_plugins/io_tedax/parse.h error.h compat_misc.h
+../src_plugins/jostle/jostle.o: ../src_plugins/jostle/jostle.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h rats.h netlist.h route_style.h polygon.h remove.h error.h \
+ pcb-printf.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h actions.h layer.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h misc_util.h \
+ obj_line.h event.h dolists.h
+../src_plugins/lib_compat_help/lib_compat_help.o: \
+ ../src_plugins/lib_compat_help/lib_compat_help.c plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_plugins/lib_compat_help/layer_compat.c ../config.h \
+ ../src_plugins/lib_compat_help/layer_compat.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h layer.h obj_pstk_shape.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h \
+ board.h vtroutestyle.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h \
+ obj_pstk.h vtpadstack.h ../src_plugins/lib_compat_help/pstk_compat.c \
+ obj_pstk_inlines.h data.h thermal.h compat_misc.h plug_io.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ ../src_plugins/lib_compat_help/pstk_help.c \
+ ../src_plugins/lib_compat_help/pstk_help.h search.h rats.h netlist.h \
+ route_style.h remove.h find.h ../src_plugins/lib_compat_help/subc_help.c \
+ ../src_plugins/lib_compat_help/subc_help.h obj_subc.h \
+ ../src_plugins/lib_compat_help/elem_rot.c \
+ ../src_plugins/lib_compat_help/elem_rot.h conf_core.h data_it.h macro.h
+../src_plugins/lib_gensexpr/lib_gensexpr.o: \
+ ../src_plugins/lib_gensexpr/lib_gensexpr.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/lib_gtk_common/act_fileio.o: \
+ ../src_plugins/lib_gtk_common/act_fileio.c ../config.h \
+ ../src_plugins/lib_gtk_common/act_fileio.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ unit.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h unit.h global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h plug_footprint.h vtlibrary.h compat_misc.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h \
+ ../src_plugins/lib_gtk_common/dlg_file_chooser.h compat_nls.h plug_io.h \
+ ../src_plugins/lib_gtk_common/util_str.h
+../src_plugins/lib_gtk_common/act_print.o: \
+ ../src_plugins/lib_gtk_common/act_print.c ../config.h \
+ ../src_plugins/lib_gtk_common/act_print.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h hid.h hid_init.h \
+ hid_attrib.h data.h crosshair.h vtonpoint.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h compat_nls.h ../src_plugins/lib_gtk_common/dlg_print.h
+../src_plugins/lib_gtk_common/bu_box.o: \
+ ../src_plugins/lib_gtk_common/bu_box.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/bu_check_button.o: \
+ ../src_plugins/lib_gtk_common/bu_check_button.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h
+../src_plugins/lib_gtk_common/bu_cursor_pos.o: \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h actions.h hid.h error.h \
+ drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ crosshair.h vtonpoint.h route.h misc_util.h compat_nls.h math_helper.h
+../src_plugins/lib_gtk_common/bu_dwg_tooltip.o: \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h library.h search.h rats.h \
+ netlist.h library.h route_style.h vtroutestyle.h layer.h layer_grp.h \
+ find.h board.h rats_patch.h board.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h ../src_3rd/genht/htsp.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h obj_subc_parent.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ obj_pstk_list.h obj_pstk.h ../src_3rd/genvector/vtp0.h vtpadstack.h \
+ obj_pstk_shape.h polygon.h vtpadstack_t.h
+../src_plugins/lib_gtk_common/bu_entry.o: \
+ ../src_plugins/lib_gtk_common/bu_entry.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_entry.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/bu_icons.o: \
+ ../src_plugins/lib_gtk_common/bu_icons.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_icons.h \
+ ../src_plugins/lib_gtk_common/bu_icons.data
+../src_plugins/lib_gtk_common/bu_info_bar.o: \
+ ../src_plugins/lib_gtk_common/bu_info_bar.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h compat_nls.h
+../src_plugins/lib_gtk_common/bu_menu.o: \
+ ../src_plugins/lib_gtk_common/bu_menu.c ../config.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h pcb-printf.h misc_util.h \
+ error.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf.h hid_flags.h hid_cfg.h \
+ hid.h error.h drc.h hid_cfg_action.h hid_cfg.h event.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h \
+ ../src_plugins/lib_gtk_common/compat.h hid_cfg_input.h \
+ ../src_3rd/genht/htpp.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/wt_accel_label.h
+../src_plugins/lib_gtk_common/bu_mode_btn.o: \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.data crosshair.h vtonpoint.h \
+ hid.h route.h conf_core.h tool.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_common/bu_notebook.o: \
+ ../src_plugins/lib_gtk_common/bu_notebook.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_notebook.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/bu_spin_button.o: \
+ ../src_plugins/lib_gtk_common/bu_spin_button.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_spin_button.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/bu_status_line.o: \
+ ../src_plugins/lib_gtk_common/bu_status_line.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h hid_cfg_input.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htip.h ../src_3rd/genht/htpp.h \
+ hid_cfg.h global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ box.h math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h compat_misc.h \
+ compat_nls.h board.h vtroutestyle.h library.h rats_patch.h board.h
+../src_plugins/lib_gtk_common/bu_text_view.o: \
+ ../src_plugins/lib_gtk_common/bu_text_view.c ../config.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h
+../src_plugins/lib_gtk_common/dlg_attribute.o: \
+ ../src_plugins/lib_gtk_common/dlg_attribute.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/dlg_attribute.h hid.h error.h drc.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
+ compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h \
+ ../src_plugins/lib_gtk_common/bu_spin_button.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h
+../src_plugins/lib_gtk_common/dlg_attributes.o: \
+ ../src_plugins/lib_gtk_common/dlg_attributes.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/dlg_attributes.h hid.h error.h drc.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
+ compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h
+../src_plugins/lib_gtk_common/dlg_command.o: \
+ ../src_plugins/lib_gtk_common/dlg_command.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h crosshair.h vtonpoint.h \
+ hid.h route.h actions.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_common/dlg_confirm.o: \
+ ../src_plugins/lib_gtk_common/dlg_confirm.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_confirm.h compat_nls.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_message.h
+../src_plugins/lib_gtk_common/dlg_drc.o: \
+ ../src_plugins/lib_gtk_common/dlg_drc.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h search.h \
+ rats.h netlist.h route_style.h draw.h layer.h pcb-printf.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h actions.h compat_nls.h \
+ obj_pstk_draw.h obj_rat_draw.h obj_line_draw.h obj_arc_draw.h \
+ obj_poly_draw.h layer_vis.h ../src_plugins/lib_gtk_common/wt_preview.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_common/dlg_file_chooser.o: \
+ ../src_plugins/lib_gtk_common/dlg_file_chooser.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ compat_misc.h ../src_plugins/lib_gtk_common/dlg_file_chooser.h \
+ compat_nls.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/dlg_fontsel.o: \
+ ../src_plugins/lib_gtk_common/dlg_fontsel.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_fontsel.h global_typedefs.h pcb_bool.h \
+ unit.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h global_typedefs.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/bu_box.h layer.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ stub_draw.h
+../src_plugins/lib_gtk_common/dlg_input.o: \
+ ../src_plugins/lib_gtk_common/dlg_input.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_input.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/dlg_library.o: \
+ ../src_plugins/lib_gtk_common/dlg_library.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_library.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h data.h crosshair.h \
+ vtonpoint.h hid.h route.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plug_footprint.h \
+ vtlibrary.h compat_nls.h compat_misc.h actions.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/win_place.h tool.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_common/dlg_library_param.h
+../src_plugins/lib_gtk_common/dlg_library_param.o: \
+ ../src_plugins/lib_gtk_common/dlg_library_param.c ../config.h \
+ hid_attrib.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h compat_misc.h \
+ safe_fs.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/dlg_library_param.h plug_footprint.h \
+ vtlibrary.h ../src_plugins/lib_gtk_common/dlg_library.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_attribute.h
+../src_plugins/lib_gtk_common/dlg_log.o: \
+ ../src_plugins/lib_gtk_common/dlg_log.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_log.h pcb_bool.h error.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h conf_hid.h error.h \
+ pcb-printf.h actions.h hid.h drc.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h compat_nls.h ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h conf.h
+../src_plugins/lib_gtk_common/dlg_message.o: \
+ ../src_plugins/lib_gtk_common/dlg_message.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_message.h compat_nls.h
+../src_plugins/lib_gtk_common/dlg_netlist.o: \
+ ../src_plugins/lib_gtk_common/dlg_netlist.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_netlist.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ pcb_bool.h unit.h event.h unit.h ../src_plugins/lib_gtk_common/glue.h \
+ hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h route.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h error.h \
+ macro.h find.h rats.h netlist.h route_style.h remove.h search.h rats.h \
+ select.h operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ actions.h compat_nls.h ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_common/dlg_pinout.o: \
+ ../src_plugins/lib_gtk_common/dlg_pinout.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_pinout.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h copy.h data.h \
+ crosshair.h vtonpoint.h hid.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h move.h \
+ rotate.h compat_misc.h macro.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/win_place.h
+../src_plugins/lib_gtk_common/dlg_print.o: \
+ ../src_plugins/lib_gtk_common/dlg_print.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/dlg_print.h hid.h error.h drc.h attrib.h \
+ layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h pcb-printf.h hid_attrib.h hid.h hid_init.h misc_util.h \
+ compat_misc.h compat_nls.h ../src_plugins/lib_gtk_common/dlg_attribute.h
+../src_plugins/lib_gtk_common/dlg_progress.o: \
+ ../src_plugins/lib_gtk_common/dlg_progress.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_progress.h pcb_bool.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/dlg_propedit.o: \
+ ../src_plugins/lib_gtk_common/dlg_propedit.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h compat_misc.h compat_nls.h \
+ polygon.h rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h \
+ board.h vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h conf_core.h \
+ buffer.h draw.h ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h
+../src_plugins/lib_gtk_common/dlg_report.o: \
+ ../src_plugins/lib_gtk_common/dlg_report.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_report.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/bu_box.h
+../src_plugins/lib_gtk_common/dlg_route_style.o: \
+ ../src_plugins/lib_gtk_common/dlg_route_style.c ../config.h \
+ compat_misc.h compat_nls.h polygon.h flag.h globalconst.h rtree.h \
+ global_typedefs.h pcb_bool.h unit.h ../src_3rd/genrtree/genrtree_api.h \
+ rtree2_compat.h math_helper.h polyarea.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h \
+ obj_common.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h error.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h error.h drc.h conf.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h
+../src_plugins/lib_gtk_common/dlg_search.o: \
+ ../src_plugins/lib_gtk_common/dlg_search.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_search.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h compat_misc.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h compat_nls.h misc_util.h pcb-printf.h \
+ conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_search_tab.h
+../src_plugins/lib_gtk_common/dlg_topwin.o: \
+ ../src_plugins/lib_gtk_common/dlg_topwin.c ../config.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h global_typedefs.h pcb_bool.h unit.h hid.h error.h \
+ drc.h attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h conf.h ../src_plugins/lib_gtk_common/compat.h \
+ hid_cfg_input.h ../src_3rd/genht/htpp.h hid_cfg.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ conf_core.h board.h library.h rats_patch.h board.h crosshair.h \
+ vtonpoint.h route.h pcb-printf.h actions.h ../src_3rd/libfungw/fungw.h \
+ compat_nls.h compat_misc.h ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/bu_icons.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/dlg_fontsel.h global_typedefs.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/util_listener.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h tool.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h event.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_common/win_place.h
+../src_plugins/lib_gtk_common/in_keyboard.o: \
+ ../src_plugins/lib_gtk_common/in_keyboard.c ../config.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h hid_cfg_input.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htip.h ../src_3rd/genht/htpp.h \
+ hid_cfg.h global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ box.h math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h event.h compat_misc.h
+../src_plugins/lib_gtk_common/in_mouse.o: \
+ ../src_plugins/lib_gtk_common/in_mouse.c ../config.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htip.h ../src_3rd/genht/htpp.h \
+ hid_cfg.h global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ box.h math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h board.h vtroutestyle.h \
+ library.h rats_patch.h board.h crosshair.h vtonpoint.h route.h \
+ conf_core.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h tool.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/bu_icons.h
+../src_plugins/lib_gtk_common/lib_gtk_common.o: \
+ ../src_plugins/lib_gtk_common/lib_gtk_common.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/lib_gtk_common/ui_crosshair.o: \
+ ../src_plugins/lib_gtk_common/ui_crosshair.c ../config.h \
+ ../src_plugins/lib_gtk_common/ui_crosshair.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ hid_cfg_input.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htip.h hid_cfg.h \
+ global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_common/ui_zoompan.o: \
+ ../src_plugins/lib_gtk_common/ui_zoompan.c ../config.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ unit.h pcb_bool.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ hid_cfg_input.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htip.h hid_cfg.h \
+ global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h actions.h error.h \
+ conf_core.h board.h vtroutestyle.h library.h rats_patch.h board.h \
+ compat_misc.h draw.h data.h crosshair.h vtonpoint.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h layer_vis.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_hid_common/util.h
+../src_plugins/lib_gtk_common/util_block_hook.o: \
+ ../src_plugins/lib_gtk_common/util_block_hook.c ../config.h \
+ ../src_plugins/lib_gtk_common/util_block_hook.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h
+../src_plugins/lib_gtk_common/util_ext_chg.o: \
+ ../src_plugins/lib_gtk_common/util_ext_chg.c ../config.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h pcb_bool.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h
+../src_plugins/lib_gtk_common/util_listener.o: \
+ ../src_plugins/lib_gtk_common/util_listener.c ../config.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h actions.h hid.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h compat_misc.h
+../src_plugins/lib_gtk_common/util_str.o: \
+ ../src_plugins/lib_gtk_common/util_str.c ../config.h \
+ ../src_plugins/lib_gtk_common/util_str.h
+../src_plugins/lib_gtk_common/util_timer.o: \
+ ../src_plugins/lib_gtk_common/util_timer.c ../config.h \
+ ../src_plugins/lib_gtk_common/util_timer.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h conf_core.h
+../src_plugins/lib_gtk_common/util_watch.o: \
+ ../src_plugins/lib_gtk_common/util_watch.c ../config.h \
+ ../src_plugins/lib_gtk_common/util_watch.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
+ ../src_3rd/genht/htpp.h hid_cfg.h hid.h conf_core.h
+../src_plugins/lib_gtk_common/win_place.o: \
+ ../src_plugins/lib_gtk_common/win_place.c ../config.h \
+ ../src_plugins/lib_gtk_common/win_place.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h
+../src_plugins/lib_gtk_common/wt_accel_label.o: \
+ ../src_plugins/lib_gtk_common/wt_accel_label.c ../config.h \
+ ../src_plugins/lib_gtk_common/wt_accel_label.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/wt_coord_entry.o: \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.c ../config.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h compat_nls.h
+../src_plugins/lib_gtk_common/wt_layersel.o: \
+ ../src_plugins/lib_gtk_common/wt_layersel.c ../config.h layer.h \
+ globalconst.h global_typedefs.h pcb_bool.h unit.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h layer.h layer_ui.h \
+ ../src_3rd/genvector/vtp0.h layer_vis.h board.h vtroutestyle.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h event.h \
+ conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ list_conf.h actions.h math_helper.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h
+../src_plugins/lib_gtk_common/wt_preview.o: \
+ ../src_plugins/lib_gtk_common/wt_preview.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/htpp.h hid_cfg.h hid.h error.h \
+ drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ box.h math_helper.h move.h misc_util.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h layer.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h pcb_bool.h copy.h board.h vtroutestyle.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h route.h buffer.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h move.h \
+ rotate.h compat_misc.h macro.h
+../src_plugins/lib_gtk_common/wt_route_style.o: \
+ ../src_plugins/lib_gtk_common/wt_route_style.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h attrib.h ../src_plugins/lib_gtk_common/glue.h hid.h \
+ error.h drc.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h conf.h ../src_plugins/lib_gtk_common/compat.h pcb-printf.h \
+ board.h library.h rats_patch.h board.h compat_nls.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h
+../src_plugins/lib_gtk_config/gtk_conf_list.o: \
+ ../src_plugins/lib_gtk_config/gtk_conf_list.c ../config.h \
+ ../src_plugins/lib_gtk_config/gtk_conf_list.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h compat_misc.h \
+ ../src_plugins/lib_gtk_config/../lib_gtk_common/compat.h
+../src_plugins/lib_gtk_config/gui-config.o: \
+ ../src_plugins/lib_gtk_config/gui-config.c ../config.h conf_core.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h error.h drc.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h event.h conf_hid.h ../src_plugins/lib_gtk_common/glue.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h ../src_3rd/genht/hash.h \
+ board.h vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
+ obj_pstk_shape.h polygon.h vtpadstack_t.h layer.h change.h plug_io.h \
+ error.h draw.h pcb-printf.h hid_attrib.h misc_util.h paths.h \
+ plug_footprint.h vtlibrary.h stub_draw.h compat_misc.h compat_nls.h \
+ fptr_cast.h safe_fs.h tool.h ../src_3rd/liblihata/tree.h \
+ ../src_plugins/lib_gtk_config/gtk_conf_list.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/wt_preview.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/bu_box.h \
+ ../src_plugins/lib_gtk_common/bu_entry.h \
+ ../src_plugins/lib_gtk_common/wt_coord_entry.h \
+ ../src_plugins/lib_gtk_common/bu_notebook.h \
+ ../src_plugins/lib_gtk_common/bu_text_view.h \
+ ../src_plugins/lib_gtk_common/bu_check_button.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_common/bu_spin_button.h
+../src_plugins/lib_gtk_config/lib_gtk_config.o: \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.c ../config.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h event.h conf_hid.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf_fields.h
+../src_plugins/lib_gtk_hid/actions.o: \
+ ../src_plugins/lib_gtk_hid/actions.c ../config.h \
+ ../src_plugins/lib_gtk_hid/gui.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/actions.h data.h crosshair.h vtonpoint.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h search.h rats.h \
+ netlist.h route_style.h change.h hid_attrib.h ../src/actions.h \
+ ../src/hid.h compat_nls.h compat_misc.h \
+ ../src_plugins/lib_gtk_common/act_print.h \
+ ../src_plugins/lib_gtk_common/act_fileio.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h \
+ ../src_plugins/lib_gtk_common/dlg_route_style.h \
+ ../src_plugins/lib_gtk_common/dlg_library.h \
+ ../src_plugins/lib_gtk_common/dlg_log.h error.h \
+ ../src_plugins/lib_gtk_common/dlg_netlist.h \
+ ../src_plugins/lib_gtk_common/dlg_search.h \
+ ../src_plugins/lib_gtk_common/dlg_fontsel.h global_typedefs.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h dolists.h
+../src_plugins/lib_gtk_hid/common.o: ../src_plugins/lib_gtk_hid/common.c \
+ ../config.h crosshair.h vtonpoint.h global_typedefs.h pcb_bool.h unit.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h attrib.h \
+ layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h route.h \
+ ../src_plugins/lib_gtk_hid/gui.h hid.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/common.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_hid/glue_common.o: \
+ ../src_plugins/lib_gtk_hid/glue_common.c ../config.h \
+ ../src_plugins/lib_gtk_hid/glue_common.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h tool.h \
+ ../src_3rd/genvector/vtp0.h ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h conf.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/common.h \
+ ../src_plugins/lib_gtk_common/bu_status_line.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h
+../src_plugins/lib_gtk_hid/glue_conf.o: \
+ ../src_plugins/lib_gtk_hid/glue_conf.c ../config.h \
+ ../src_plugins/lib_gtk_hid/glue_conf.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_plugins/lib_gtk_hid/glue_event.h \
+ conf_core.h globalconst.h ../src_plugins/lib_gtk_hid/gui.h hid.h error.h \
+ drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_plugins/lib_gtk_common/ui_zoompan.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h \
+ ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/lib_gtk_hid/glue_event.o: \
+ ../src_plugins/lib_gtk_hid/glue_event.c \
+ ../src_plugins/lib_gtk_hid/common.h event.h ../config.h unit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h global_typedefs.h pcb_bool.h hid.h error.h drc.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h ../src_plugins/lib_gtk_common/glue.h hid.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h conf.h ../src_plugins/lib_gtk_common/compat.h \
+ hid_cfg_input.h ../src_3rd/genht/htpp.h hid_cfg.h conf_hid.h \
+ ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ unit.h ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h ../src_plugins/lib_gtk_hid/render.h conf_core.h tool.h \
+ ../src_plugins/lib_gtk_common/dlg_netlist.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h
+../src_plugins/lib_gtk_hid/glue_hid.o: \
+ ../src_plugins/lib_gtk_hid/glue_hid.c ../config.h \
+ ../src_plugins/lib_gtk_hid/glue_hid.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_hid/gui.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h \
+ ../src_plugins/lib_gtk_hid/actions.h ../src_plugins/lib_gtk_hid/common.h \
+ hid_nogui.h hid_attrib.h hid_draw_helpers.h \
+ ../src_plugins/lib_gtk_hid/coord_conv.h compat_misc.h conf_core.h \
+ ../src_plugins/lib_gtk_common/in_keyboard.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h \
+ ../src_plugins/lib_gtk_common/bu_dwg_tooltip.h \
+ ../src_plugins/lib_gtk_common/ui_crosshair.h \
+ ../src_plugins/lib_gtk_common/dlg_confirm.h \
+ ../src_plugins/lib_gtk_common/dlg_input.h \
+ ../src_plugins/lib_gtk_common/dlg_log.h error.h \
+ ../src_plugins/lib_gtk_common/dlg_file_chooser.h compat_nls.h plug_io.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
+ ../src_plugins/lib_gtk_common/dlg_pinout.h \
+ ../src_plugins/lib_gtk_common/dlg_report.h \
+ ../src_plugins/lib_gtk_common/dlg_progress.h \
+ ../src_plugins/lib_gtk_common/dlg_attribute.h \
+ ../src_plugins/lib_gtk_common/dlg_attributes.h \
+ ../src_plugins/lib_gtk_common/util_listener.h \
+ ../src_plugins/lib_gtk_common/util_timer.h \
+ ../src_plugins/lib_gtk_common/util_watch.h \
+ ../src_plugins/lib_gtk_common/util_block_hook.h \
+ ../src_plugins/lib_gtk_common/win_place.h \
+ ../src_plugins/lib_gtk_config/hid_gtk_conf.h \
+ ../src_plugins/lib_gtk_config/lib_gtk_config.h
+../src_plugins/lib_gtk_hid/glue_win32.o: \
+ ../src_plugins/lib_gtk_hid/glue_win32.c \
+ ../src_plugins/lib_gtk_hid/glue_win32.h
+../src_plugins/lib_gtk_hid/lib_gtk_hid.o: \
+ ../src_plugins/lib_gtk_hid/lib_gtk_hid.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/lib_gtk_hid/render.o: ../src_plugins/lib_gtk_hid/render.c \
+ ../config.h ../src_plugins/lib_gtk_hid/gui.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/ui_zoompan.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h pcb_bool.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h hid_cfg_input.h hid_cfg.h hid.h \
+ ../src_plugins/lib_gtk_common/glue.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ conf.h ../src_plugins/lib_gtk_common/compat.h \
+ ../src_plugins/lib_gtk_common/dlg_propedit.h \
+ ../src_plugins/lib_gtk_common/dlg_topwin.h hid_cfg.h \
+ ../src_plugins/lib_gtk_common/util_ext_chg.h \
+ ../src_plugins/lib_gtk_common/bu_info_bar.h \
+ ../src_plugins/lib_gtk_common/bu_menu.h \
+ ../src_plugins/lib_gtk_common/wt_route_style.h route_style.h \
+ vtroutestyle.h conf_hid.h ../src_plugins/lib_gtk_common/bu_mode_btn.h \
+ ../src_plugins/lib_gtk_common/bu_cursor_pos.h \
+ ../src_plugins/lib_gtk_common/dlg_command.h \
+ ../src_plugins/lib_gtk_common/wt_layersel.h layer.h layer_grp.h \
+ ../src_plugins/lib_gtk_common/dlg_drc.h \
+ ../src_plugins/lib_gtk_common/in_mouse.h \
+ ../src_plugins/lib_gtk_common/glue.h board.h library.h rats_patch.h \
+ board.h event.h ../src_plugins/lib_gtk_hid/render.h
+../src_plugins/lib_hid_common/grid_menu.o: \
+ ../src_plugins/lib_hid_common/grid_menu.c ../config.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h conf_core.h globalconst.h grid.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h event.h hid_cfg.h hid.h \
+ error.h drc.h hid.h ../src_plugins/lib_hid_common/grid_menu.h
+../src_plugins/lib_hid_common/layer_menu.o: \
+ ../src_plugins/lib_hid_common/layer_menu.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h event.h layer.h layer_ui.h \
+ layer_grp.h pcb-printf.h hid_cfg.h hid.h \
+ ../src_plugins/lib_hid_common/layer_menu.h
+../src_plugins/lib_hid_common/lib_hid_common.o: \
+ ../src_plugins/lib_hid_common/lib_hid_common.c plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h conf_hid.h conf.h \
+ ../config.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h error.h \
+ ../src_plugins/lib_hid_common/grid_menu.h conf.h event.h \
+ ../src_plugins/lib_hid_common/layer_menu.h \
+ ../src_plugins/lib_hid_common/routest_menu.h \
+ ../src_plugins/lib_hid_common/util.c \
+ ../src_plugins/lib_hid_common/util.h data.h globalconst.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \
+ flag.h
+../src_plugins/lib_hid_common/routest_menu.o: \
+ ../src_plugins/lib_hid_common/routest_menu.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf.h conf_core.h route_style.h \
+ event.h hid_cfg.h hid.h error.h drc.h hid.h \
+ ../src_plugins/lib_hid_common/routest_menu.h
+../src_plugins/lib_hid_gl/hidgl.o: ../src_plugins/lib_hid_gl/hidgl.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h data.h crosshair.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h grid.h hid.h \
+ ../src_plugins/lib_hid_gl/hidgl.h ../src_plugins/lib_hid_gl/draw_gl.c \
+ ../src_plugins/lib_hid_gl/stencil_gl.h \
+ ../src_plugins/lib_hid_gl/opengl.h
+../src_plugins/lib_hid_gl/lib_hid_gl.o: \
+ ../src_plugins/lib_hid_gl/lib_hid_gl.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/lib_hid_gl/stencil_gl.o: \
+ ../src_plugins/lib_hid_gl/stencil_gl.c \
+ ../src_plugins/lib_hid_gl/stencil_gl.h \
+ ../src_plugins/lib_hid_gl/opengl.h
+../src_plugins/lib_legacy_func/lib_legacy_func.o: \
+ ../src_plugins/lib_legacy_func/lib_legacy_func.c \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../config.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h change.h board.h vtroutestyle.h library.h rats_patch.h \
+ error.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h
+../src_plugins/lib_netmap/netmap.o: ../src_plugins/lib_netmap/netmap.c \
+ ../config.h ../src_3rd/genht/htpp.h ../src_3rd/genht/ht.h \
+ ../src_plugins/lib_netmap/netmap.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h library.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h find.h netlist.h route_style.h pcb-printf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h
+../src_plugins/lib_polyhelp/polyhelp.o: \
+ ../src_plugins/lib_polyhelp/polyhelp.c ../config.h \
+ ../src_plugins/lib_polyhelp/polyhelp.h obj_poly.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h data_parent.h polyarea.h polygon.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h math_helper.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h obj_line.h box.h move.h \
+ misc_util.h polygon_offs.h ../src_plugins/lib_polyhelp/topoly.h board.h \
+ vtroutestyle.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h layer_grp.h \
+ library.h rats_patch.h board.h obj_common.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/htpp.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_misc.h hid_attrib.h \
+ actions.h dolists.h
+../src_plugins/lib_polyhelp/topoly.o: \
+ ../src_plugins/lib_polyhelp/topoly.c ../config.h \
+ ../src_3rd/genvector/vtp0.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genvector/vti0.h \
+ ../src_plugins/lib_polyhelp/topoly.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h obj_common.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/htpp.h error.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h obj_arc.h obj_line.h \
+ obj_poly.h obj_poly_draw.h polygon.h rtree.h search.h rats.h netlist.h \
+ route_style.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h actions.h hid.h
+../src_plugins/loghid/hid-logger.o: ../src_plugins/loghid/hid-logger.c \
+ ../config.h ../src_plugins/loghid/hid-logger.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h pcb-printf.h
+../src_plugins/loghid/loghid.o: ../src_plugins/loghid/loghid.c \
+ ../config.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h data.h globalconst.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h change.h board.h \
+ vtroutestyle.h library.h rats_patch.h error.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_plugins/loghid/hid-logger.h hid.h hid_init.h hid_attrib.h \
+ hid_nogui.h dolists.h
+../src_plugins/millpath/millpath.o: ../src_plugins/millpath/millpath.c \
+ ../config.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ ../src_plugins/millpath/toolpath.h layer.h layer_grp.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h dolists.h
+../src_plugins/millpath/toolpath.o: ../src_plugins/millpath/toolpath.c \
+ ../config.h ../src_plugins/millpath/toolpath.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h layer.h polygon.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h board.h \
+ vtroutestyle.h layer_grp.h library.h rats_patch.h board.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h \
+ obj_pstk.h ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h \
+ polygon.h vtpadstack_t.h flag.h layer_ui.h obj_line.h obj_line_op.h \
+ operation.h obj_arc.h obj_poly.h obj_poly_op.h \
+ ../src_plugins/lib_polyhelp/polyhelp.h
+../src_plugins/mincut/pcb-mincut/graph.o: \
+ ../src_plugins/mincut/pcb-mincut/graph.c \
+ ../src_plugins/mincut/pcb-mincut/graph.h \
+ ../src_plugins/mincut/pcb-mincut/../../../config.h safe_fs.h conf.h \
+ ../config.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h
+../src_plugins/mincut/pcb-mincut/solve.o: \
+ ../src_plugins/mincut/pcb-mincut/solve.c \
+ ../src_plugins/mincut/pcb-mincut/solve.h \
+ ../src_plugins/mincut/pcb-mincut/graph.h \
+ ../src_plugins/mincut/pcb-mincut/../../../config.h compat_misc.h \
+ ../config.h
+../src_plugins/mincut/rats_mincut.o: ../src_plugins/mincut/rats_mincut.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h error.h plug_io.h library.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h find.h polygon.h search.h \
+ rats.h netlist.h route_style.h vtroutestyle.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h compat_misc.h \
+ obj_common.h obj_subc_parent.h data.h rats.h \
+ ../src_plugins/mincut/pcb-mincut/graph.h \
+ ../src_plugins/mincut/pcb-mincut/../../../config.h \
+ ../src_plugins/mincut/pcb-mincut/solve.h \
+ ../src_plugins/mincut/pcb-mincut/graph.h conf.h \
+ ../src_plugins/mincut/rats_mincut_conf.h stub_mincut.h \
+ ../src_plugins/mincut/rats_mincut_conf_fields.h
+../src_plugins/oldactions/oldactions.o: \
+ ../src_plugins/oldactions/oldactions.c ../config.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h data.h globalconst.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h event.h change.h \
+ board.h vtroutestyle.h library.h rats_patch.h error.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ plug_footprint.h vtlibrary.h obj_subc.h macro.h compat_misc.h netlist.h \
+ route_style.h dolists.h
+../src_plugins/polycombine/polycombine.o: \
+ ../src_plugins/polycombine/polycombine.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h macro.h remove.h hid.h error.h rtree.h polygon.h \
+ polyarea.h flag_str.h find.h draw.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h obj_poly.h \
+ dolists.h
+../src_plugins/polystitch/polystitch.o: \
+ ../src_plugins/polystitch/polystitch.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h macro.h remove.h hid.h error.h rtree.h draw.h polygon.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h obj_poly.h \
+ obj_poly_draw.h dolists.h
+../src_plugins/propedit/propedit.o: ../src_plugins/propedit/propedit.c \
+ board.h ../config.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h ../src_plugins/propedit/props.h \
+ global_typedefs.h ../src_plugins/propedit/propsel.h actions.h \
+ pcb-printf.h error.h dolists.h
+../src_plugins/propedit/props.o: ../src_plugins/propedit/props.c \
+ ../config.h ../src_plugins/propedit/props.h global_typedefs.h pcb_bool.h \
+ unit.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/ht.h ../src_plugins/propedit/propsel.h compat_misc.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h global_typedefs.h attrib.h layer.h globalconst.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h layer_grp.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genht/ht.c ../src_3rd/genht/ht_inlines.h
+../src_plugins/propedit/propsel.o: ../src_plugins/propedit/propsel.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/propedit/props.h global_typedefs.h \
+ ../src_plugins/propedit/propsel.h change.h board.h vtroutestyle.h \
+ library.h rats_patch.h misc_util.h flag_str.h compat_misc.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h rotate.h compat_misc.h \
+ obj_pstk_inlines.h data.h thermal.h
+../src_plugins/puller/puller.o: ../src_plugins/puller/puller.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h move.h \
+ pcb-printf.h remove.h rtree.h flag_str.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h layer.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h misc_util.h \
+ compat_misc.h obj_pstk_inlines.h data.h thermal.h funchash_core.h \
+ funchash.h funchash_core_list.h search.h rats.h netlist.h route_style.h \
+ find.h dolists.h
+../src_plugins/query/basic_fnc.o: ../src_plugins/query/basic_fnc.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/query/query_access.h \
+ ../src_plugins/query/query.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
+ obj_common.h layer.h flag_str.h ../src_plugins/query/query_exec.h
+../src_plugins/query/fields_sphash.o: \
+ ../src_plugins/query/fields_sphash.c
+../src_plugins/query/query.o: ../src_plugins/query/query.c ../config.h \
+ ../src_3rd/genht/hash.h ../src_3rd/genht/htsi.h ../src_3rd/genht/ht.h \
+ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h data.h globalconst.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
+ obj_pstk_shape.h polygon.h vtpadstack_t.h change.h board.h \
+ vtroutestyle.h library.h rats_patch.h error.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_init.h actions.h \
+ compat_misc.h ../src_plugins/query/query.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
+ obj_common.h layer.h flag_str.h fptr_cast.h
+../src_plugins/query/query_access.o: ../src_plugins/query/query_access.c \
+ ../config.h math_helper.h compat_misc.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/query/query_access.h \
+ ../src_plugins/query/query.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
+ obj_common.h layer.h flag_str.h ../src_plugins/query/query_exec.h \
+ obj_pstk_inlines.h data.h thermal.h obj_subc_parent.h
+../src_plugins/query/query_act.o: ../src_plugins/query/query_act.c \
+ ../config.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ ../src_plugins/query/query.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genht/htsi.h ../src_3rd/genregex/regex_se.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \
+ ../src_plugins/query/fields_sphash.h obj_common.h layer.h flag_str.h \
+ ../src_plugins/query/query_y.h ../src_plugins/query/query_exec.h draw.h \
+ select.h operation.h board.h vtroutestyle.h library.h rats_patch.h \
+ board.h macro.h dolists.h
+../src_plugins/query/query_exec.o: ../src_plugins/query/query_exec.c \
+ ../config.h data.h globalconst.h global_typedefs.h pcb_bool.h unit.h \
+ layer.h attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/query/query.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
+ obj_common.h layer.h flag_str.h ../src_plugins/query/query_exec.h \
+ ../src_plugins/query/query_access.h pcb-printf.h
+../src_plugins/query/query_l.o: ../src_plugins/query/query_l.c unit.h \
+ ../config.h ../src_plugins/query/query.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genregex/regex_se.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \
+ ../src_plugins/query/fields_sphash.h obj_common.h flag.h globalconst.h \
+ attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h layer.h \
+ obj_arc_list.h obj_common.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h flag_str.h \
+ ../src_plugins/query/query_y.h compat_misc.h
+../src_plugins/query/query_y.o: ../src_plugins/query/query_y.c unit.h \
+ ../config.h ../src_plugins/query/query.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genregex/regex_se.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \
+ ../src_plugins/query/fields_sphash.h obj_common.h flag.h globalconst.h \
+ attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h layer.h \
+ obj_arc_list.h obj_common.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h flag_str.h \
+ ../src_plugins/query/query_l.h compat_misc.h
+../src_plugins/renumber/renumber.o: ../src_plugins/renumber/renumber.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h change.h error.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ compat_misc.h compat_nls.h netlist.h route_style.h safe_fs.h macro.h \
+ pcb-printf.h dolists.h
+../src_plugins/renumber/renumberblock.o: \
+ ../src_plugins/renumber/renumberblock.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h data.h crosshair.h vtonpoint.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h error.h change.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h
+../src_plugins/report/drill.o: ../src_plugins/report/drill.c ../config.h \
+ data.h globalconst.h global_typedefs.h pcb_bool.h unit.h layer.h \
+ attrib.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h ../src_plugins/report/drill.h macro.h obj_pstk_inlines.h \
+ board.h vtroutestyle.h library.h rats_patch.h data.h thermal.h
+../src_plugins/report/report.o: ../src_plugins/report/report.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/report/report.h math_helper.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h board.h vtroutestyle.h library.h \
+ rats_patch.h board.h data.h crosshair.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h data.h \
+ ../src_plugins/report/drill.h error.h search.h rats.h netlist.h \
+ route_style.h rats.h rtree.h flag_str.h macro.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h find.h draw.h pcb-printf.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h misc_util.h \
+ ../src_plugins/report/report_conf.h conf.h compat_misc.h compat_nls.h \
+ layer.h obj_term.h obj_pstk.h obj_pstk_inlines.h thermal.h \
+ obj_subc_parent.h ../src_3rd/genregex/regex_sei.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h dolists.h \
+ ../src_plugins/report/report_conf_fields.h
+../src_plugins/rubberband_orig/fgeometry.o: \
+ ../src_plugins/rubberband_orig/fgeometry.c \
+ ../src_plugins/rubberband_orig/fgeometry.h obj_common.h flag.h \
+ globalconst.h ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h \
+ data_parent.h
+../src_plugins/rubberband_orig/rubberband.o: \
+ ../src_plugins/rubberband_orig/rubberband.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h data_it.h data.h data_list.h error.h event.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h operation.h rotate.h \
+ compat_misc.h draw.h draw_wireframe.h crosshair.h obj_rat_draw.h \
+ obj_line_op.h operation.h obj_line_draw.h obj_pstk_inlines.h thermal.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h layer_grp.h \
+ ../src_plugins/rubberband_orig/fgeometry.h obj_common.h search.h rats.h \
+ netlist.h route_style.h polygon.h \
+ ../src_plugins/rubberband_orig/rubberband_conf.h conf.h \
+ ../src_plugins/rubberband_orig/rubberband_conf_fields.h
+../src_plugins/script/script.o: ../src_plugins/script/script.c \
+ ../config.h ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/hash.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h unit.h global_typedefs.h \
+ pcb_bool.h attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h plugins.h \
+ ../src_3rd/puplug/error.h error.h compat_misc.h compat_fs.h safe_fs.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h pcb-printf.h globalconst.h \
+ ../src_plugins/script/script_act.c dolists.h
+../src_plugins/shand_cmd/command.o: ../src_plugins/shand_cmd/command.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h build_run.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ ../src_plugins/shand_cmd/command.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h error.h plug_io.h \
+ rats.h netlist.h route_style.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h actions.h compat_misc.h misc_util.h tool.h \
+ dolists.h
+../src_plugins/shape/shape.o: ../src_plugins/shape/shape.c ../config.h \
+ ../src_plugins/shape/shape.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h layer.h pcb_bool.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h actions.h buffer.h compat_misc.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h error.h \
+ event.h math_helper.h obj_poly.h obj_poly_draw.h rotate.h compat_misc.h \
+ tool.h ../src_plugins/shape/shape_dialog.c hid_dad.h hid_attrib.h \
+ dolists.h
+../src_plugins/sketch_route/cdt/cdt.o: \
+ ../src_plugins/sketch_route/cdt/cdt.c \
+ ../src_plugins/sketch_route/cdt/cdt.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/edge.h \
+ ../src_plugins/sketch_route/cdt/triangle.h
+../src_plugins/sketch_route/cdt/edge.o: \
+ ../src_plugins/sketch_route/cdt/edge.c \
+ ../src_plugins/sketch_route/cdt/edge.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/list/list.c \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/sketch_route/cdt/point.o: \
+ ../src_plugins/sketch_route/cdt/point.c \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/list/list.c \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/sketch_route/cdt/triangle.o: \
+ ../src_plugins/sketch_route/cdt/triangle.c \
+ ../src_plugins/sketch_route/cdt/triangle.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/list/list.c \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/sketch_route/ewire.o: ../src_plugins/sketch_route/ewire.c \
+ ../src_plugins/sketch_route/ewire.h ../config.h \
+ ../src_plugins/sketch_route/sktypedefs.h \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/sketch_route/ewire_point.o: \
+ ../src_plugins/sketch_route/ewire_point.c \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_plugins/sketch_route/sktypedefs.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/sketch_route/pointdata.o: \
+ ../src_plugins/sketch_route/pointdata.c \
+ ../src_plugins/sketch_route/pointdata.h \
+ ../src_plugins/sketch_route/sktypedefs.h \
+ ../src_plugins/sketch_route/spoke.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_plugins/sketch_route/ewire.h \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h ../src_3rd/genvector/vtp0.h \
+ ../src_plugins/sketch_route/wire.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h
+../src_plugins/sketch_route/sketch_route.o: \
+ ../src_plugins/sketch_route/sketch_route.c ../config.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h board.h \
+ vtroutestyle.h library.h rats_patch.h board.h compat_nls.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h event.h \
+ list_common.h obj_line_list.h obj_pstk.h obj_pstk_inlines.h data.h \
+ thermal.h obj_subc_parent.h pcb-printf.h search.h rats.h netlist.h \
+ route_style.h tool.h layer_ui.h ../src_plugins/sketch_route/sktypedefs.h \
+ ../src_plugins/sketch_route/wire.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_plugins/sketch_route/ewire.h \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_plugins/sketch_route/pointdata.h \
+ ../src_plugins/sketch_route/spoke.h obj_common.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_plugins/sketch_route/cdt/cdt.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/edge.h \
+ ../src_plugins/sketch_route/cdt/triangle.h dolists.h
+../src_plugins/sketch_route/spoke.o: ../src_plugins/sketch_route/spoke.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_plugins/sketch_route/spoke.h \
+ ../src_plugins/sketch_route/sktypedefs.h obj_common.h flag.h attrib.h \
+ data_parent.h ../src_plugins/sketch_route/ewire.h \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_plugins/sketch_route/pointdata.h \
+ ../src_plugins/sketch_route/wire.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h
+../src_plugins/sketch_route/wire.o: ../src_plugins/sketch_route/wire.c \
+ ../src_plugins/sketch_route/pointdata.h \
+ ../src_plugins/sketch_route/sktypedefs.h \
+ ../src_plugins/sketch_route/spoke.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_plugins/sketch_route/ewire.h \
+ ../src_plugins/sketch_route/ewire_point.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_plugins/sketch_route/cdt/point.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h ../src_3rd/genvector/vtp0.h \
+ ../src_plugins/sketch_route/wire.h \
+ ../src_plugins/sketch_route/cdt/typedefs.h \
+ ../src_plugins/sketch_route/cdt/list/list.h \
+ ../src_plugins/sketch_route/cdt/list/list.c \
+ ../src_3rd/genvector/genvector_impl.c
+../src_plugins/smartdisperse/smartdisperse.o: \
+ ../src_plugins/smartdisperse/smartdisperse.c ../src_3rd/genht/htpi.h \
+ ../src_3rd/genht/ht.h ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h rats.h netlist.h route_style.h error.h move.h draw.h \
+ plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ compat_nls.h obj_subc.h obj_subc_parent.h data.h funchash_core.h \
+ funchash.h funchash_core_list.h dolists.h
+../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \
+ ../config.h board.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
+ attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h actions.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h unit.h plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h stub_stroke.h compat_misc.h tool.h \
+ ../src_plugins/stroke/conf_internal.c \
+ ../src_plugins/stroke/stroke_conf.h conf.h dolists.h \
+ ../src_plugins/stroke/stroke_conf_fields.h
+../src_plugins/teardrops/teardrops.o: \
+ ../src_plugins/teardrops/teardrops.c ../config.h math_helper.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ board.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid.h rtree.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h plugins.h ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ obj_pstk_inlines.h data.h thermal.h dolists.h
+../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \
+ ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_3rd/genregex/regex_sei.h ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h change.h board.h vtroutestyle.h attrib.h \
+ layer.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h board.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h error.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h hid_flags.h actions.h \
+ hid_cfg.h ../src_plugins/vendordrill/vendor_conf.h conf.h compat_misc.h \
+ compat_nls.h obj_pstk_inlines.h data.h thermal.h event.h macro.h \
+ ../src_3rd/liblihata/tree.h dolists.h \
+ ../src_plugins/vendordrill/vendor_conf_fields.h
+../src_3rd/gensexpr/gsx_parse.o: ../src_3rd/gensexpr/gsx_parse.c \
+ ../src_3rd/gensexpr/gsx_parse.h
+../src_3rd/gensexpr/gsxl.o: ../src_3rd/gensexpr/gsxl.c \
+ ../src_3rd/gensexpr/gsxl.h ../src_3rd/gensexpr/gensexpr_impl.h \
+ ../src_3rd/gensexpr/gsx_parse.h ../src_3rd/gensexpr/gensexpr_impl.c
+../src_3rd/libuhpgl/parse.o: ../src_3rd/libuhpgl/parse.c \
+ ../src_3rd/libuhpgl/uhpgl_math.h ../src_3rd/libuhpgl/libuhpgl.h \
+ ../src_3rd/libuhpgl/parse.h ../src_3rd/libuhpgl/arc_iterate.h
+../src_3rd/genht/hash.o: ../src_3rd/genht/hash.c
+../src_3rd/genht/htip.o: ../src_3rd/genht/htip.c ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genht/htpi.o: ../src_3rd/genht/htpi.c ../src_3rd/genht/htpi.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genht/htpp.o: ../src_3rd/genht/htpp.c ../src_3rd/genht/htpp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genht/htsi.o: ../src_3rd/genht/htsi.c ../src_3rd/genht/htsi.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genht/htsp.o: ../src_3rd/genht/htsp.c ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genht/htss.o: ../src_3rd/genht/htss.c ../src_3rd/genht/htss.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+../src_3rd/genregex/regex.o: ../src_3rd/genregex/regex.c \
+ ../src_3rd/genregex/regex.h
+../src_3rd/genregex/regex_se.o: ../src_3rd/genregex/regex_se.c \
+ ../src_3rd/genregex/regex_templ.c ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h
+../src_3rd/genregex/regex_sei.o: ../src_3rd/genregex/regex_sei.c \
+ ../src_3rd/genregex/regex_templ.c ../src_3rd/genregex/regex_templ.h \
+ ../src_3rd/genregex/regex.h
+../src_3rd/genvector/gds_char.o: ../src_3rd/genvector/gds_char.c \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_3rd/genvector/vti0.o: ../src_3rd/genvector/vti0.c \
+ ../src_3rd/genvector/vti0.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_3rd/genvector/vtp0.o: ../src_3rd/genvector/vtp0.c \
+ ../src_3rd/genvector/vtp0.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_3rd/genvector/vts0.o: ../src_3rd/genvector/vts0.c \
+ ../src_3rd/genvector/vts0.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+../src_3rd/libfungw/fungw.o: ../src_3rd/libfungw/fungw.c \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h ../src_3rd/genht/hash.h
+../src_3rd/libfungw/fungw_call.o: ../src_3rd/libfungw/fungw_call.c \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h
+../src_3rd/libfungw/fungw_conv.o: ../src_3rd/libfungw/fungw_conv.c \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h \
+ ../src_3rd/libfungw/fungw_conv.h
+../src_3rd/libfungw/fungw_debug.o: ../src_3rd/libfungw/fungw_debug.c \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h
+../src_3rd/libfungw/fungw_ptr.o: ../src_3rd/libfungw/fungw_ptr.c \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h
+../src_3rd/liblhtpers/lhtpers.o: ../src_3rd/liblhtpers/lhtpers.c \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ ../src_3rd/liblhtpers/lhtpers.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/liblhtpers/output.c ../src_3rd/liblhtpers/pers_list.c \
+ ../src_3rd/liblhtpers/pers_hash.c ../src_3rd/liblhtpers/pers_text.c \
+ ../src_3rd/liblhtpers/pers_table.c
+../src_3rd/liblihata/dom.o: ../src_3rd/liblihata/dom.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/hash_str.h
+../src_3rd/liblihata/dom_hash.o: ../src_3rd/liblihata/dom_hash.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/hash_str.h
+../src_3rd/liblihata/dom_list.o: ../src_3rd/liblihata/dom_list.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h
+../src_3rd/liblihata/dom_table.o: ../src_3rd/liblihata/dom_table.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h
+../src_3rd/liblihata/hash_str.o: ../src_3rd/liblihata/hash_str.c
+../src_3rd/liblihata/lihata.o: ../src_3rd/liblihata/lihata.c \
+ ../src_3rd/liblihata/lihata.h
+../src_3rd/liblihata/parser.o: ../src_3rd/liblihata/parser.c \
+ ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/lihata.h
+../src_3rd/liblihata/tree.o: ../src_3rd/liblihata/tree.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/tree.h \
+ ../src_3rd/liblihata/dom_internal.h
+../src_3rd/liblihata/tree_hash.o: ../src_3rd/liblihata/tree_hash.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h
+../src_3rd/liblihata/tree_list.o: ../src_3rd/liblihata/tree_list.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h
+../src_3rd/liblihata/tree_path.o: ../src_3rd/liblihata/tree_path.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/tree.h
+../src_3rd/liblihata/tree_symlink.o: ../src_3rd/liblihata/tree_symlink.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/tree.h
+../src_3rd/liblihata/tree_table.o: ../src_3rd/liblihata/tree_table.c \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/liblihata/dom_internal.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h
+../src_3rd/libuundo/uundo.o: ../src_3rd/libuundo/uundo.c \
+ ../src_3rd/libuundo/uundo.h
+../src_3rd/libuundo/uundo_debug.o: ../src_3rd/libuundo/uundo_debug.c \
+ ../src_3rd/libuundo/uundo.h ../src_3rd/libuundo/uundo_debug.h
+../src_3rd/qparse/qparse.o: ../src_3rd/qparse/qparse.c \
+ ../src_3rd/qparse/qparse.h
+actions.o: actions.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h \
+ ../src_3rd/libfungw/fungw_conv.h board.h vtroutestyle.h attrib.h layer.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h event.h actions.h \
+ compat_misc.h compat_nls.h funchash.h
+attrib.o: attrib.c ../config.h compat_misc.h attrib.h
+board.o: board.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h plug_io.h compat_misc.h \
+ actions.h paths.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h draw.h \
+ event.h safe_fs.h tool.h defpcb_internal.c obj_pstk_inlines.h thermal.h
+box.o: box.c ../config.h rotate.h global_typedefs.h pcb_bool.h unit.h \
+ compat_misc.h box.h math_helper.h move.h obj_common.h flag.h \
+ globalconst.h attrib.h data_parent.h misc_util.h
+brave.o: brave.c ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h brave.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf_hid.h compat_misc.h \
+ hid_dad.h hid_attrib.h
+buffer.o: buffer.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h buffer.h obj_common.h flag.h \
+ attrib.h data_parent.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h board.h vtroutestyle.h layer.h obj_arc_list.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h copy.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plug_io.h \
+ rotate.h compat_misc.h remove.h select.h operation.h draw.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
+ funchash_core_list.h compat_nls.h obj_arc_op.h obj_line_op.h \
+ obj_text_op.h obj_subc_op.h obj_poly_op.h obj_pstk_op.h obj_rat_op.h \
+ event.h safe_fs.h actions.h
+build_run.o: build_run.c ../config.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h build_run.h hid_init.h hid.h error.h \
+ drc.h plug_io.h compat_misc.h
+buildin.o: buildin.c ../src_3rd/puplug/libs.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h
+change.o: change.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h change.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h select.h \
+ operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h actions.h \
+ compat_nls.h macro.h obj_pstk_op.h obj_subc_parent.h obj_term.h \
+ obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h
+change_act.o: change_act.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h funchash_core.h \
+ funchash.h funchash_core_list.h board.h vtroutestyle.h library.h \
+ rats_patch.h actions.h change.h draw.h search.h rats.h netlist.h \
+ route_style.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h event.h \
+ compat_misc.h compat_nls.h obj_rat_draw.h data_it.h macro.h grid.h
+compat_fs.o: compat_fs.c ../config.h compat_inc.h compat_fs.h \
+ compat_misc.h compat_nls.h globalconst.h safe_fs.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h error.h
+compat_lrealpath.o: compat_lrealpath.c compat_inc.h ../config.h \
+ compat_lrealpath.h compat_misc.h
+compat_misc.o: compat_misc.c compat_inc.h ../config.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h compat_misc.h
+conf.o: conf.c ../src_3rd/genht/hash.h ../src_3rd/liblihata/tree.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../config.h conf.h global_typedefs.h pcb_bool.h \
+ unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h conf_core.h globalconst.h conf_hid.h \
+ error.h hid_cfg.h hid.h drc.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h paths.h compat_fs.h compat_misc.h safe_fs.h build_run.h \
+ conf_regfile.c ../src_3rd/genht/htsi.h \
+ ../src_3rd/genvector/genvector_impl.c
+conf_act.o: conf_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ actions.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h funchash_core.h funchash.h funchash_core_list.h \
+ route_style.h tool.h macro.h
+conf_core.o: conf_core.c ../config.h conf.h global_typedefs.h pcb_bool.h \
+ unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h conf_core.h globalconst.h \
+ conf_core_fields.h
+conf_hid.o: conf_hid.c ../config.h conf_hid.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h error.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genht/htpp.h conf_core.h globalconst.h
+conf_internal.o: conf_internal.c
+copy.o: copy.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h select.h \
+ operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_arc_op.h \
+ obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h obj_pstk_op.h
+crosshair.o: crosshair.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h route.h data.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h \
+ draw_wireframe.h search.h rats.h netlist.h route_style.h actions.h \
+ hid_inlines.h compat_misc.h compat_nls.h find.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h event.h macro.h grid.h \
+ stub_stroke.h obj_line_draw.h obj_arc_draw.h obj_text_draw.h \
+ obj_pstk_draw.h obj_arc_ui.h obj_subc_parent.h tool.h
+data.o: data.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h data_list.h data_it.h list_common.h layer_it.h \
+ operation.h obj_pstk_draw.h obj_text_draw.h obj_poly_draw.h \
+ obj_arc_draw.h obj_line_draw.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h
+draw.o: draw.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h rotate.h \
+ compat_misc.h stub_draw.h layer_ui.h hid_inlines.h obj_pstk_draw.h \
+ obj_line_draw.h obj_arc_draw.h obj_rat_draw.h obj_poly_draw.h \
+ obj_text_draw.h obj_subc_parent.h draw_composite.c draw_ly_spec.c
+error.o: error.c ../config.h data.h globalconst.h global_typedefs.h \
+ pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plug_io.h library.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_misc.h conf_core.h
+event.o: event.c ../config.h event.h unit.h error.h fptr_cast.h
+file_act.o: file_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ build_run.h ../src_3rd/genht/htsp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h funchash_core.h funchash.h \
+ funchash_core_list.h data.h crosshair.h vtonpoint.h hid.h error.h drc.h \
+ route.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plug_io.h \
+ plug_import.h remove.h draw.h find.h search.h rats.h netlist.h \
+ route_style.h actions.h compat_misc.h compat_nls.h hid_init.h \
+ layer_vis.h safe_fs.h tool.h
+find.o: find.c ../config.h math_helper.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h move.h misc_util.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h find.h \
+ search.h rats.h netlist.h library.h route_style.h vtroutestyle.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h plug_io.h actions.h compat_misc.h \
+ event.h layer_vis.h obj_text_draw.h obj_subc_parent.h find_geo.c macro.h \
+ obj_arc_ui.h obj_pstk_inlines.h board.h rats_patch.h thermal.h \
+ find_lookup.c compat_nls.h find_intconn.c find_drc.c data_it.h \
+ obj_arc_draw.h obj_rat_draw.h obj_line_draw.h obj_poly_draw.h \
+ obj_pstk_draw.h find_misc.c change.h find_clear.c find_debug.c \
+ find_print.c find_any_isect.c
+find_act.o: find_act.c ../config.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h board.h \
+ vtroutestyle.h library.h rats_patch.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ data.h crosshair.h vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h \
+ obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find.h \
+ compat_nls.h
+flag.o: flag.c ../config.h flag.h globalconst.h operation.h \
+ global_typedefs.h pcb_bool.h unit.h
+flag_str.o: flag_str.c ../config.h flag_str.h flag.h globalconst.h \
+ compat_misc.h obj_common.h attrib.h global_typedefs.h pcb_bool.h unit.h \
+ data_parent.h macro.h
+font.o: font.c ../config.h ../src_3rd/genht/hash.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h global_typedefs.h \
+ pcb_bool.h unit.h obj_poly.h ../src_3rd/genlist/gendlist.h obj_common.h \
+ flag.h globalconst.h attrib.h data_parent.h polyarea.h obj_poly_list.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_arc.h obj_arc_list.h box.h \
+ math_helper.h move.h misc_util.h board.h vtroutestyle.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_line_list.h \
+ obj_line.h obj_text_list.h obj_text.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genvector/vtp0.h list_conf.h error.h \
+ plug_io.h paths.h compat_nls.h compat_misc.h event.h build_run.h \
+ font_internal.c
+font_act.o: font_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ actions.h hid.h ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h \
+ list_conf.h plug_io.h event.h
+fptr_cast.o: fptr_cast.c ../config.h fptr_cast.h
+funchash.o: funchash.c ../src_3rd/genht/htpi.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/hash.h funchash_core.h funchash.h funchash_core_list.h \
+ ../config.h macro.h compat_misc.h
+grid.o: grid.c ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h grid.h pcb_bool.h board.h \
+ global_typedefs.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h layer_grp.h \
+ library.h rats_patch.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h conf_core.h conf_hid.h error.h \
+ compat_misc.h
+gui_act.o: gui_act.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ build_run.h ../src_3rd/genht/htsp.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h tool.h grid.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
+ funchash_core_list.h change.h draw.h search.h rats.h netlist.h \
+ route_style.h find.h stub_stroke.h actions.h hid_init.h compat_nls.h \
+ compat_misc.h event.h layer_ui.h layer_vis.h hid_attrib.h operation.h \
+ obj_subc_op.h
+heap.o: heap.c ../config.h heap.h
+hid_attrib.o: hid_attrib.c ../config.h hid_attrib.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h pcb-printf.h
+hid_cam.o: hid_cam.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid_cam.h hid_attrib.h compat_misc.h layer_vis.h \
+ plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h
+hid_cfg.o: hid_cfg.c ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../config.h hid.h error.h \
+ drc.h unit.h global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_cfg.h paths.h \
+ safe_fs.h conf.h pcb-printf.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ compat_misc.h build_run.h conf_core.h
+hid_cfg_action.o: hid_cfg_action.c ../config.h hid_cfg_action.h hid_cfg.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h global_typedefs.h pcb_bool.h unit.h hid.h error.h \
+ drc.h attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h actions.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h
+hid_cfg_input.o: hid_cfg_input.c ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/tree.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../config.h hid_cfg_input.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/htpp.h hid_cfg.h \
+ global_typedefs.h pcb_bool.h unit.h hid.h error.h drc.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h hid_cfg_action.h compat_misc.h event.h crosshair.h \
+ vtonpoint.h route.h
+hid_color.o: hid_color.c ../config.h hid_color.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/genht/hash.h compat_misc.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/ht.c ../src_3rd/genht/ht_inlines.h
+hid_draw_helpers.o: hid_draw_helpers.c ../config.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h hid_inlines.h
+hid_extents.o: hid_extents.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h hid_draw_helpers.h hid_extents.h
+hid_flags.o: hid_flags.c ../config.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h board.h vtroutestyle.h library.h rats_patch.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h hid_flags.h \
+ actions.h
+hid_init.o: hid_init.c ../config.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h hid_nogui.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h actions.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h hid_attrib.h \
+ hid_init.h conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h compat_inc.h
+hid_nogui.o: hid_nogui.c ../config.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h unit.h \
+ global_typedefs.h pcb_bool.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h compat_misc.h \
+ compat_nls.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.h
+ht_subc.o: ht_subc.c ../config.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/libminuid/libminuid.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h obj_common.h flag.h \
+ globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h ../src_3rd/genht/ht.c \
+ ../src_3rd/genht/ht_inlines.h
+insert.o: insert.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h select.h \
+ operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_line_op.h \
+ obj_arc_op.h obj_rat_op.h obj_poly_op.h
+intersect.o: intersect.c ../config.h intersect.h global_typedefs.h \
+ pcb_bool.h unit.h box.h math_helper.h move.h obj_common.h flag.h \
+ globalconst.h attrib.h data_parent.h misc_util.h
+layer.o: layer.c ../config.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_misc.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h event.h layer_ui.h layer_vis.h \
+ obj_pstk_inlines.h thermal.h list_common.h
+layer_grp.o: layer_grp.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h compat_misc.h event.h
+layer_ui.o: layer_ui.c ../config.h layer.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h attrib.h obj_arc_list.h obj_common.h \
+ flag.h data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h event.h compat_misc.h \
+ ../src_3rd/genvector/vtp0.h layer_ui.h
+layer_vis.o: layer_vis.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h layer_ui.h layer_vis.h event.h \
+ compat_misc.h conf_hid.h
+library.o: library.c ../config.h library.h global_typedefs.h pcb_bool.h \
+ unit.h obj_common.h flag.h globalconst.h attrib.h data_parent.h macro.h \
+ compat_misc.h
+list_conf.o: list_conf.c conf.h ../config.h global_typedefs.h pcb_bool.h \
+ unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.c
+main.o: main.c ../config.h ../src_3rd/libminuid/libminuid.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ brave.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h plug_io.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_lrealpath.h buildin.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h build_run.h flag_str.h plugins.h \
+ ../src_3rd/puplug/error.h plug_footprint.h vtlibrary.h plug_import.h \
+ event.h funchash.h conf_core.h layer_vis.h layer_ui.h pcb_minuid.h \
+ tool.h actions.h hid_init.h compat_misc.h compat_nls.h dolists.h \
+ generated_lists.h
+main_act.o: main_act.c ../config.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h library.h global_typedefs.h pcb_bool.h unit.h obj_common.h \
+ flag.h globalconst.h attrib.h data_parent.h compat_nls.h change.h \
+ board.h vtroutestyle.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h rats_patch.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h compat_misc.h actions.h hid_init.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h build_run.h safe_fs.h \
+ flag_str.h
+misc_util.o: misc_util.c ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h misc_util.h unit.h pcb_bool.h
+move.o: move.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h select.h \
+ operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h event.h \
+ actions.h compat_misc.h obj_arc_op.h obj_line_op.h obj_text_op.h \
+ obj_subc_op.h obj_poly_op.h obj_pstk_op.h obj_rat_op.h
+netlist.o: netlist.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ error.h plug_io.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h find.h rats.h netlist.h \
+ route_style.h actions.h hid.h drc.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h compat_misc.h event.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h
+netlist_act.o: netlist_act.c ../config.h ../src_3rd/genregex/regex_sei.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h \
+ funchash_core.h funchash.h funchash_core_list.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h board.h vtroutestyle.h library.h rats_patch.h plug_io.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ compat_nls.h compat_misc.h netlist.h route_style.h data_it.h
+obj_arc.o: obj_arc.c ../config.h compat_nls.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h rotate.h \
+ compat_misc.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h draw_wireframe.h hid_inlines.h \
+ obj_arc_op.h operation.h obj_subc_parent.h obj_hash.h draw.h \
+ obj_arc_draw.h
+obj_arc_list.o: obj_arc_list.c obj_arc_list.h obj_common.h flag.h \
+ globalconst.h ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
+obj_arc_ui.o: obj_arc_ui.c ../config.h obj_arc_ui.h crosshair.h \
+ vtonpoint.h global_typedefs.h pcb_bool.h unit.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h error.h drc.h attrib.h \
+ layer.h globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h route.h
+obj_common.o: obj_common.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h flag_str.h flag.h error.h \
+ obj_common.h attrib.h data_parent.h obj_arc_ui.h crosshair.h vtonpoint.h \
+ hid.h drc.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h route.h obj_pstk.h obj_pstk_shape.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h
+obj_line.o: obj_line.c ../config.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h library.h global_typedefs.h pcb_bool.h unit.h obj_common.h \
+ flag.h globalconst.h attrib.h data_parent.h board.h vtroutestyle.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h obj_arc_list.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h rats_patch.h data.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h search.h rats.h netlist.h route_style.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ compat_nls.h compat_misc.h rotate.h hid_inlines.h obj_line_op.h \
+ operation.h obj_subc_parent.h obj_hash.h draw.h draw_wireframe.h \
+ obj_line_draw.h obj_rat_draw.h obj_pstk_draw.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+obj_line_drcenf.o: obj_line_drcenf.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find.h macro.h
+obj_line_list.o: obj_line_list.c obj_line_list.h obj_line.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
+obj_pinvia_therm.o: obj_pinvia_therm.c ../config.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ polygon.h rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h \
+ obj_pinvia_therm.h
+obj_poly.o: obj_poly.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h compat_nls.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h polygon_offs.h rotate.h compat_misc.h search.h rats.h \
+ netlist.h route_style.h hid_inlines.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h obj_poly_op.h operation.h \
+ obj_poly_draw.h obj_subc_parent.h obj_hash.h draw.h
+obj_poly_list.o: obj_poly_list.c obj_poly_list.h obj_poly.h ../config.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h data_parent.h polyarea.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
+obj_pstk.o: obj_pstk.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_list.h \
+ draw.h draw_wireframe.h obj_pstk_draw.h obj_pstk_inlines.h thermal.h \
+ obj_pstk_op.h operation.h obj_subc_parent.h obj_hash.h compat_misc.h \
+ search.h rats.h netlist.h route_style.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h event.h hid_inlines.h \
+ obj_pstk_op.c rotate.h
+obj_pstk_act.o: obj_pstk_act.c ../config.h obj_pstk.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h obj_common.h flag.h globalconst.h \
+ attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h layer.h \
+ obj_arc_list.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h obj_pstk_shape.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h \
+ obj_pstk_inlines.h board.h vtroutestyle.h layer_grp.h library.h \
+ rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ route.h buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h ht_subc.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genht/hash.h obj_pstk_list.h vtpadstack.h thermal.h \
+ funchash_core.h funchash.h funchash_core_list.h conf_core.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h actions.h \
+ search.h rats.h netlist.h route_style.h data_list.h
+obj_pstk_list.o: obj_pstk_list.c obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
+obj_pstk_proto.o: obj_pstk_proto.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/htpp.h compat_misc.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_list.h \
+ obj_pstk_inlines.h thermal.h rotate.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h obj_hash.h
+obj_rat.o: obj_rat.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h hid_inlines.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h obj_line_draw.h obj_rat_op.h \
+ operation.h draw.h obj_rat_draw.h rats.h netlist.h route_style.h
+obj_rat_list.o: obj_rat_list.c obj_rat_list.h obj_rat.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.c
+obj_subc.o: obj_subc.c ../config.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h buffer.h obj_common.h flag.h \
+ globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/htpp.h board.h vtroutestyle.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h error.h \
+ drc.h route.h data.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h obj_subc_op.h \
+ operation.h obj_subc_parent.h obj_poly_op.h obj_pstk_inlines.h thermal.h \
+ obj_pstk_draw.h obj_line_op.h obj_term.h obj_text_draw.h draw.h \
+ draw_wireframe.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h macro.h \
+ compat_misc.h pcb_minuid.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h
+obj_subc_hash.o: obj_subc_hash.c ../config.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h
+obj_subc_list.o: obj_subc_list.c ../config.h obj_subc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/libminuid/libminuid.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h obj_common.h flag.h \
+ globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h obj_subc_list.h \
+ ht_subc.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ ../src_3rd/genlist/gentdlist_impl.c
+obj_term.o: obj_term.c ../config.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h change.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h layer.h \
+ globalconst.h obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h box.h \
+ math_helper.h move.h misc_util.h ../src_3rd/genvector/gds_char.h \
+ layer_grp.h library.h rats_patch.h compat_misc.h obj_term.h \
+ obj_subc_parent.h data.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h pcb-printf.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h macro.h
+obj_text.o: obj_text.c ../config.h rotate.h global_typedefs.h pcb_bool.h \
+ unit.h compat_misc.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h compat_nls.h hid_inlines.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h event.h obj_text_op.h operation.h \
+ obj_poly_draw.h obj_arc_draw.h obj_subc_parent.h obj_hash.h draw.h \
+ obj_line_draw.h obj_text_draw.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h
+obj_text_list.o: obj_text_list.c obj_poly_list.h obj_poly.h ../config.h \
+ ../src_3rd/genlist/gendlist.h obj_common.h flag.h globalconst.h attrib.h \
+ global_typedefs.h pcb_bool.h unit.h data_parent.h polyarea.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_arc_list.h obj_arc.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genlist/gentdlist_impl.c
+object_act.o: object_act.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h data.h layer.h attrib.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h board.h \
+ vtroutestyle.h library.h rats_patch.h tool.h change.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h event.h funchash_core.h \
+ funchash.h funchash_core_list.h search.h rats.h netlist.h route_style.h \
+ draw.h copy.h remove.h compat_misc.h compat_nls.h layer_vis.h \
+ operation.h macro.h rotate.h actions.h
+operation.o: operation.c ../config.h operation.h global_typedefs.h \
+ pcb_bool.h unit.h board.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h rats.h netlist.h route_style.h
+paths.o: paths.c ../config.h paths.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h error.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h
+pcb-printf.o: pcb-printf.c ../config.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h compat_nls.h
+pcb_bool.o: pcb_bool.c ../config.h pcb_bool.h compat_misc.h
+pcb_menu_default.o: pcb_menu_default.c
+pcb_minuid.o: pcb_minuid.c ../src_3rd/libminuid/libminuid.h compat_misc.h \
+ ../config.h pcb_minuid.h
+plug_footprint.o: plug_footprint.c ../config.h plug_footprint.h \
+ vtlibrary.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
+ conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h error.h compat_misc.h \
+ event.h
+plug_footprint_act.o: plug_footprint_act.c ../config.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h plug_footprint.h \
+ vtlibrary.h
+plug_import.o: plug_import.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h plug_import.h error.h \
+ safe_fs.h
+plug_io.o: plug_io.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h change.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h library.h rats_patch.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h plug_io.h \
+ remove.h paths.h actions.h hid_flags.h plugins.h \
+ ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h event.h compat_misc.h \
+ route_style.h compat_fs.h compat_nls.h compat_lrealpath.h layer_vis.h \
+ safe_fs.h plug_footprint.h vtlibrary.h build_run.h macro.h compat_inc.h
+plugins.o: plugins.c plugins.h ../src_3rd/puplug/puplug.h \
+ ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
+ ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
+ ../src_3rd/puplug/error.h ../config.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h compat_misc.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h
+polygon.o: polygon.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h remove.h \
+ search.h rats.h netlist.h route_style.h thermal.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h compat_nls.h obj_poly_draw.h \
+ polygon_selfi.h polygon_offs.c
+polygon1.o: polygon1.c ../config.h rtree.h global_typedefs.h pcb_bool.h \
+ unit.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h math_helper.h \
+ heap.h compat_cc.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h polyarea.h obj_common.h flag.h \
+ globalconst.h attrib.h data_parent.h macro.h box.h move.h misc_util.h \
+ polygon_selfi.c polygon_selfi.h ../src_3rd/genvector/vtp0.h
+polygon_act.o: polygon_act.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
+ funchash_core_list.h draw.h search.h rats.h netlist.h route_style.h \
+ compat_nls.h tool.h actions.h
+rats.o: rats.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h find.h \
+ rats.h netlist.h route_style.h search.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h stub_mincut.h compat_misc.h \
+ compat_nls.h macro.h obj_rat_draw.h obj_term.h obj_subc_parent.h \
+ obj_pstk_inlines.h thermal.h
+rats_act.o: rats_act.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h find.h remove.h funchash_core.h \
+ funchash.h funchash_core_list.h compat_nls.h actions.h rats.h netlist.h \
+ route_style.h draw.h obj_rat_draw.h
+rats_patch.o: rats_patch.c rats_patch.h board.h ../config.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/hash.h actions.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h error.h drc.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h data.h crosshair.h vtonpoint.h route.h buffer.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h copy.h compat_misc.h compat_nls.h safe_fs.h conf.h \
+ pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h
+remove.o: remove.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h draw.h hid.h error.h drc.h remove.h \
+ select.h operation.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ obj_arc_op.h obj_line_op.h obj_poly_op.h obj_text_op.h obj_rat_op.h \
+ obj_subc_op.h obj_pstk_op.h
+remove_act.o: remove_act.c ../config.h data.h globalconst.h \
+ global_typedefs.h pcb_bool.h unit.h layer.h attrib.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ layer_grp.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h actions.h tool.h remove.h board.h vtroutestyle.h \
+ library.h rats_patch.h funchash_core.h funchash.h funchash_core_list.h
+rotate.o: rotate.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h rotate.h compat_misc.h search.h rats.h netlist.h \
+ route_style.h select.h operation.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h event.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_nls.h obj_arc_op.h \
+ obj_line_op.h obj_poly_op.h obj_text_op.h obj_subc_op.h obj_pstk_op.h \
+ obj_line_draw.h obj_rat_draw.h
+route.o: route.c ../config.h compat_misc.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h board.h \
+ vtroutestyle.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h obj_line_draw.h obj_arc_draw.h \
+ obj_line_op.h operation.h draw_wireframe.h
+route_style.o: route_style.c ../config.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h unit.h route_style.h \
+ vtroutestyle.h attrib.h global_typedefs.h pcb_bool.h error.h conf.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
+ ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h misc_util.h board.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h layer_grp.h library.h \
+ rats_patch.h funchash_core.h funchash.h funchash_core_list.h conf_core.h \
+ compat_nls.h
+rtree.o: rtree.c ../config.h unit.h rtree.h global_typedefs.h pcb_bool.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h \
+ ../src_3rd/genrtree/genrtree_impl.h \
+ ../src_3rd/genrtree/genrtree_search.h \
+ ../src_3rd/genrtree/genrtree_delete.h \
+ ../src_3rd/genrtree/genrtree_debug.h
+safe_fs.o: safe_fs.c compat_inc.h ../config.h safe_fs.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h compat_fs.h compat_misc.h error.h \
+ globalconst.h paths.h
+search.o: search.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h find.h search.h \
+ rats.h netlist.h route_style.h obj_subc_parent.h obj_pstk_inlines.h \
+ thermal.h
+select.o: select.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h data_it.h draw.h \
+ search.h rats.h netlist.h route_style.h select.h operation.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h find.h compat_misc.h compat_nls.h \
+ obj_arc_draw.h obj_line_draw.h obj_poly_draw.h obj_text_draw.h \
+ obj_rat_draw.h obj_pstk_draw.h ../src_3rd/genregex/regex_sei.h \
+ ../src_3rd/genregex/regex_templ.h ../src_3rd/genregex/regex.h
+select_act.o: select_act.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h data.h crosshair.h vtonpoint.h hid.h \
+ error.h drc.h route.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h funchash_core.h funchash.h \
+ funchash_core_list.h tool.h select.h operation.h draw.h remove.h copy.h \
+ grid.h hid_attrib.h compat_misc.h compat_nls.h actions.h
+stub_draw.o: stub_draw.c ../config.h stub_draw.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h error.h drc.h unit.h global_typedefs.h pcb_bool.h \
+ attrib.h layer.h globalconst.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer_grp.h obj_text_draw.h
+stub_mincut.o: stub_mincut.c ../config.h stub_mincut.h global_typedefs.h \
+ pcb_bool.h unit.h obj_common.h flag.h globalconst.h attrib.h \
+ data_parent.h
+stub_stroke.o: stub_stroke.c error.h ../config.h pcb_bool.h
+thermal.o: thermal.c ../config.h thermal.h obj_common.h flag.h \
+ globalconst.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h math_helper.h move.h \
+ misc_util.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h compat_misc.h data.h crosshair.h \
+ vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h layer_grp.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h obj_pstk_inlines.h board.h vtroutestyle.h library.h \
+ rats_patch.h obj_pinvia_therm.h
+tool.o: tool.c ../config.h tool.h ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h global_typedefs.h pcb_bool.h \
+ unit.h board.h vtroutestyle.h attrib.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ conf_core.h conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h list_conf.h \
+ crosshair.h vtonpoint.h hid.h error.h drc.h route.h compat_nls.h data.h \
+ buffer.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
+ obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h event.h \
+ find.h grid.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h actions.h \
+ tool_arc.h tool_arrow.h tool_buffer.h tool_copy.h tool_insert.h \
+ tool_line.h tool_lock.h tool_move.h tool_poly.h tool_polyhole.h \
+ tool_rectangle.h tool_remove.h tool_rotate.h tool_text.h tool_thermal.h \
+ tool_via.h
+tool_arc.o: tool_arc.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h route.h data.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h \
+ draw_wireframe.h search.h rats.h netlist.h route_style.h tool.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h macro.h obj_arc_draw.h
+tool_arrow.o: tool_arrow.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h crosshair.h vtonpoint.h hid.h error.h drc.h \
+ route.h data.h obj_rat_list.h obj_rat.h obj_subc_list.h obj_subc.h \
+ ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h actions.h \
+ remove.h search.h rats.h netlist.h route_style.h select.h operation.h \
+ tool.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h
+tool_buffer.o: tool_buffer.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h compat_misc.h data.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h route.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h actions.h \
+ search.h rats.h netlist.h route_style.h tool.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h
+tool_copy.o: tool_copy.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ copy.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h search.h rats.h netlist.h \
+ route_style.h tool.h ../src_3rd/genvector/vtp0.h
+tool_insert.o: tool_insert.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ compat_nls.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h insert.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h search.h rats.h \
+ netlist.h route_style.h tool.h ../src_3rd/genvector/vtp0.h
+tool_line.o: tool_line.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h route.h data.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h \
+ draw_wireframe.h find.h rats.h netlist.h route_style.h search.h tool.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_line_draw.h \
+ obj_pstk_draw.h obj_rat_draw.h \
+ ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+tool_lock.o: tool_lock.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ change.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h actions.h search.h rats.h netlist.h route_style.h \
+ tool.h tool_lock.h
+tool_move.o: tool_move.c ../config.h board.h global_typedefs.h pcb_bool.h \
+ unit.h vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ compat_nls.h copy.h crosshair.h vtonpoint.h hid.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h error.h drc.h \
+ route.h search.h rats.h netlist.h route_style.h tool.h \
+ ../src_3rd/genvector/vtp0.h
+tool_poly.o: tool_poly.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h crosshair.h vtonpoint.h \
+ hid.h error.h drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h \
+ data_parent.h obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h \
+ obj_line.h obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h \
+ obj_text.h font.h ../src_3rd/genht/htip.h box.h math_helper.h move.h \
+ misc_util.h layer_grp.h route.h actions.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h tool.h
+tool_polyhole.o: tool_polyhole.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h compat_nls.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h attrib.h layer.h obj_arc_list.h \
+ obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h obj_poly_list.h \
+ obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h route.h actions.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h search.h rats.h \
+ netlist.h library.h route_style.h vtroutestyle.h tool.h
+tool_rectangle.o: tool_rectangle.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h crosshair.h vtonpoint.h hid.h error.h \
+ drc.h route.h data.h buffer.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h tool.h \
+ undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_poly_draw.h
+tool_remove.o: tool_remove.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ compat_nls.h event.h actions.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h ../src_3rd/libfungw/fungw.h \
+ ../src_3rd/genht/htpp.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ remove.h search.h rats.h netlist.h route_style.h tool.h \
+ ../src_3rd/genvector/vtp0.h
+tool_rotate.o: tool_rotate.c ../config.h conf_core.h conf.h \
+ global_typedefs.h pcb_bool.h unit.h pcb-printf.h \
+ ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h actions.h hid.h error.h \
+ drc.h attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h rotate.h \
+ compat_misc.h tool.h
+tool_text.o: tool_text.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h compat_nls.h data.h crosshair.h \
+ vtonpoint.h hid.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h actions.h \
+ tool.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h obj_text_draw.h
+tool_thermal.o: tool_thermal.c ../config.h board.h global_typedefs.h \
+ pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ change.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h actions.h search.h rats.h netlist.h route_style.h \
+ thermal.h tool.h
+tool_via.o: tool_via.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h change.h compat_nls.h hid_inlines.h \
+ hid.h error.h drc.h data.h crosshair.h vtonpoint.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h draw.h tool.h \
+ tool_thermal.h undo.h ../src_3rd/libuundo/uundo.h undo_old.h \
+ obj_pstk_draw.h ../src_plugins/lib_compat_help/pstk_compat.h obj_pstk.h
+undo.o: undo.c ../config.h ../src_3rd/libuundo/uundo_debug.h \
+ ../src_3rd/libuundo/uundo.h board.h global_typedefs.h pcb_bool.h unit.h \
+ vtroutestyle.h attrib.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ change.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h insert.h remove.h rotate.h compat_misc.h search.h \
+ rats.h netlist.h route_style.h undo.h ../src_3rd/libuundo/uundo.h \
+ undo_old.h flag_str.h conf_core.h conf.h pcb-printf.h \
+ ../src_3rd/liblihata/lihata.h list_conf.h compat_nls.h obj_poly_draw.h
+undo_act.o: undo_act.c ../config.h conf_core.h conf.h global_typedefs.h \
+ pcb_bool.h unit.h pcb-printf.h ../src_3rd/genvector/gds_char.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
+ ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
+ ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h globalconst.h board.h vtroutestyle.h \
+ attrib.h layer.h obj_arc_list.h obj_common.h flag.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h box.h math_helper.h move.h misc_util.h \
+ layer_grp.h library.h rats_patch.h actions.h hid.h error.h drc.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h data.h crosshair.h \
+ vtonpoint.h route.h buffer.h obj_rat_list.h obj_rat.h obj_subc_list.h \
+ obj_subc.h ../src_3rd/libminuid/libminuid.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ vtpadstack.h obj_pstk_shape.h polygon.h vtpadstack_t.h compat_misc.h \
+ funchash_core.h funchash.h funchash_core_list.h undo.h \
+ ../src_3rd/libuundo/uundo.h undo_old.h undo_act.h search.h rats.h \
+ netlist.h route_style.h obj_line_draw.h tool.h
+undo_old.o: undo_old.c ../config.h ../src_3rd/libuundo/uundo.h board.h \
+ global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h layer.h globalconst.h \
+ obj_arc_list.h obj_common.h flag.h data_parent.h obj_arc.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h layer_grp.h library.h rats_patch.h \
+ change.h data.h crosshair.h vtonpoint.h hid.h ../src_3rd/liblihata/dom.h \
+ ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
+ ../src_3rd/genht/htsp.h error.h drc.h route.h buffer.h \
+ ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h obj_rat_list.h \
+ obj_rat.h obj_subc_list.h obj_subc.h ../src_3rd/libminuid/libminuid.h \
+ rtree.h ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h ht_subc.h \
+ ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h \
+ ../src_3rd/genvector/vtp0.h vtpadstack.h obj_pstk_shape.h polygon.h \
+ vtpadstack_t.h draw.h insert.h remove.h rotate.h compat_misc.h search.h \
+ rats.h netlist.h route_style.h undo.h undo_old.h flag_str.h conf_core.h \
+ conf.h pcb-printf.h ../src_3rd/liblihata/lihata.h list_conf.h \
+ compat_nls.h obj_poly_draw.h obj_subc_parent.h undo_old_str.h
+unit.o: unit.c ../config.h compat_misc.h compat_nls.h unit.h
+vtc0.o: vtc0.c vtc0.h ../config.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+vtlibrary.o: vtlibrary.c vtlibrary.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+vtonpoint.o: vtonpoint.c vtonpoint.h global_typedefs.h ../config.h \
+ pcb_bool.h unit.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+vtpadstack.o: vtpadstack.c obj_pstk.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genvector/vtp0.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h obj_common.h flag.h globalconst.h \
+ ../config.h attrib.h global_typedefs.h pcb_bool.h unit.h data_parent.h \
+ layer.h obj_arc_list.h obj_arc.h ../src_3rd/genlist/gentdlist_impl.h \
+ ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.h \
+ obj_line_list.h obj_line.h obj_poly_list.h obj_poly.h polyarea.h \
+ obj_text_list.h obj_text.h font.h ../src_3rd/genht/htip.h \
+ ../src_3rd/genht/ht.h box.h math_helper.h move.h misc_util.h \
+ ../src_3rd/genvector/gds_char.h obj_pstk_shape.h polygon.h rtree.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h vtpadstack_t.h \
+ vtpadstack.h ../src_3rd/genvector/genvector_impl.c
+vtpadstack_t.o: vtpadstack_t.c ../src_3rd/genvector/vtp0.h \
+ ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h ../src_3rd/genvector/gds_char.h \
+ vtpadstack_t.h obj_pstk_shape.h unit.h ../config.h polygon.h flag.h \
+ globalconst.h rtree.h global_typedefs.h pcb_bool.h \
+ ../src_3rd/genrtree/genrtree_api.h rtree2_compat.h math_helper.h \
+ polyarea.h layer.h attrib.h obj_arc_list.h obj_common.h data_parent.h \
+ obj_arc.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
+ ../src_3rd/genlist/gentdlist_undef.h obj_line_list.h obj_line.h \
+ obj_poly_list.h obj_poly.h obj_text_list.h obj_text.h font.h \
+ ../src_3rd/genht/htip.h ../src_3rd/genht/ht.h box.h move.h misc_util.h \
+ ../src_3rd/genvector/genvector_impl.c
+vtr0.o: vtr0.c vtr0.h ../config.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
+vtroutestyle.o: vtroutestyle.c vtroutestyle.h unit.h ../config.h attrib.h \
+ global_typedefs.h pcb_bool.h ../src_3rd/genvector/genvector_impl.h \
+ ../src_3rd/genvector/genvector_undef.h \
+ ../src_3rd/genvector/genvector_impl.c
Index: tags/2.0.1/src/Makefile.in
===================================================================
--- tags/2.0.1/src/Makefile.in	(nonexistent)
+++ tags/2.0.1/src/Makefile.in	(revision 18980)
@@ -0,0 +1,484 @@
+# TODO default compiler flags
+put /local/pcb/CFLAGS cc/cflags
+append /local/pcb/CFLAGS cc/fpic
+append /local/pcb/CFLAGS ?/local/pcb/cflags_profile
+append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src_3rd/liblihata -Iicons -DHAVE_CONFIG_H}
+append /local/pcb/LDFLAGS cc/ldflags
+append /local/pcb/LDFLAGS cc/rdynamic
+append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile
+put /local/pcb/DEPCFLAGS {}
+put /local/pcb/OBJS {}
+put /tmpasm/OFS { }
+
+if ?libs/script/fungw/presents
+then
+	append /local/pcb/CFLAGS libs/script/fungw/cflags
+	append /local/pcb/LDFLAGS libs/script/fungw/ldflags
+else
+# no system installed fungw means we need to use local genht
+	append /local/pcb/OBJS [@
+	../src_3rd/genht/hash.o
+	../src_3rd/genht/htsp.o
+	../src_3rd/genht/htss.o
+	../src_3rd/genht/htsi.o
+	../src_3rd/genht/htpi.o
+	../src_3rd/genht/htip.o
+	../src_3rd/genht/htpp.o
+	@]
+# local compilation of fungw objects
+	append /local/pcb/OBJS [@
+	../src_3rd/libfungw/fungw.o
+	../src_3rd/libfungw/fungw_conv.o
+	../src_3rd/libfungw/fungw_ptr.o
+	../src_3rd/libfungw/fungw_debug.o
+	../src_3rd/libfungw/fungw_call.o
+	@]
+end
+
+# These files are to be generated before make dep is run
+put /local/pcb/DEPDEPS { conf_core_fields.h conf_internal.c generated_lists.h defpcb_internal.c buildin.c pcb_menu_default.c }
+
+include {../scconfig/template/debug.tmpasm}
+
+# main: objects
+# These have constructs that are not c89 strictly speaking but are
+# effectively c89; typical example is casting a function pointer to a
+# data pointer for dlsym().
+put /local/pcb/OBJS_C99 [@
+	fptr_cast.o
+@]
+
+append /local/pcb/OBJS [@
+	actions.o
+	attrib.o
+	board.o
+	box.o
+	brave.o
+	buffer.o
+	build_run.o
+	change.o
+	change_act.o
+	conf.o
+	conf_act.o
+	conf_core.o
+	conf_hid.o
+	conf_internal.o
+	compat_fs.o
+	compat_lrealpath.o
+	compat_misc.o
+	copy.o
+	crosshair.o
+	data.o
+	draw.o
+	error.o
+	event.o
+	font.o
+	font_act.o
+	file_act.o
+	find.o
+	find_act.o
+	flag.o
+	flag_str.o
+	funchash.o
+	grid.o
+	gui_act.o
+	heap.o
+
+	hid_attrib.o
+	hid_cfg.o
+	hid_cfg_action.o
+	hid_cfg_input.o
+	hid_cam.o
+	hid_color.o
+	hid_draw_helpers.o
+	hid_extents.o
+	hid_flags.o
+	hid_init.o
+	hid_nogui.o
+	ht_subc.o
+	insert.o
+	intersect.o
+	layer.o
+	layer_grp.o
+	layer_ui.o
+	layer_vis.o
+	library.o
+	list_conf.o
+	main.o
+	main_act.o
+	misc_util.o
+	move.o
+	netlist.o
+	netlist_act.o
+	object_act.o
+	obj_common.o
+	obj_arc.o
+	obj_arc_list.o
+	obj_arc_ui.o
+	obj_line.o
+	obj_line_drcenf.o
+	obj_line_list.o
+	obj_pstk.o
+	obj_pstk_act.o
+	obj_pstk_list.o
+	obj_pstk_proto.o
+	obj_pinvia_therm.o
+	obj_poly.o
+	obj_poly_list.o
+	obj_rat.o
+	obj_rat_list.o
+	obj_subc.o
+	obj_subc_hash.o
+	obj_subc_list.o
+	obj_term.o
+	obj_text.o
+	obj_text_list.o
+	operation.o
+	paths.o
+	pcb_bool.o
+	pcb_menu_default.o
+	pcb_minuid.o
+	pcb-printf.o
+	plugins.o
+	plug_import.o
+	plug_io.o
+	plug_footprint.o
+	plug_footprint_act.o
+	polygon.o
+	polygon1.o
+	polygon_act.o
+	rats.o
+	rats_act.o
+	rats_patch.o
+	remove.o
+	remove_act.o
+	rotate.o
+	route.o
+	route_style.o
+	rtree.o
+	safe_fs.o
+	search.o
+	select.o
+	select_act.o
+	stub_draw.o
+	stub_mincut.o
+	stub_stroke.o
+	thermal.o
+	tool.o
+	tool_arc.o
+	tool_arrow.o
+	tool_buffer.o
+	tool_copy.o
+	tool_insert.o
+	tool_line.o
+	tool_lock.o
+	tool_move.o
+	tool_poly.o
+	tool_polyhole.o
+	tool_rectangle.o
+	tool_remove.o
+	tool_rotate.o
+	tool_text.o
+	tool_thermal.o
+	tool_via.o
+	undo.o
+	undo_act.o
+	undo_old.o
+	unit.o
+	vtlibrary.o
+	vtc0.o
+	vtonpoint.o
+	vtpadstack.o
+	vtpadstack_t.o
+	vtr0.o
+	vtroutestyle.o
+	buildin.o
+	../src_3rd/liblihata/parser.o
+	../src_3rd/liblihata/dom.o
+	../src_3rd/liblihata/dom_list.o
+	../src_3rd/liblihata/dom_hash.o
+	../src_3rd/liblihata/dom_table.o
+	../src_3rd/liblihata/lihata.o
+	../src_3rd/liblihata/hash_str.o
+	../src_3rd/liblihata/tree.o
+	../src_3rd/liblihata/tree_list.o
+	../src_3rd/liblihata/tree_hash.o
+	../src_3rd/liblihata/tree_table.o
+	../src_3rd/liblihata/tree_symlink.o
+	../src_3rd/liblihata/tree_path.o
+	../src_3rd/liblhtpers/lhtpers.o
+	../src_3rd/genvector/gds_char.o
+	../src_3rd/genvector/vtp0.o
+	../src_3rd/genvector/vts0.o
+	../src_3rd/genvector/vti0.o
+	../src_3rd/genregex/regex_sei.o
+	../src_3rd/genregex/regex_se.o
+	../src_3rd/genregex/regex.o
+	../src_3rd/qparse/qparse.o
+	../src_3rd/libuundo/uundo.o
+	../src_3rd/libuundo/uundo_debug.o
+@]
+
+put /local/pcb/LIBS_3RD [@
+	../src_3rd/puplug/libpuplug.a
+	../src_3rd/libminuid/libminuid.a
+@]
+
+put /local/pcb/LIBS /local/pcb/LIBS_3RD
+
+# We do not compile these in the executable but we need rules for these for utils
+# e.g. ../src_3rd/genht/htsp.o
+put /local/pcb/OBJS_UTIL [@
+@]
+
+# main: action registrations
+put /local/pcb/ACTION_REG_SRC  {
+	buffer.c brave.c change_act.c conf_act.c file_act.c find_act.c
+	gui_act.c main_act.c netlist_act.c font_act.c object_act.c
+	obj_pstk_act.c plugins.c polygon_act.c plug_footprint_act.c rats_act.c
+	rats_patch.c remove_act.c select_act.c undo_act.c
+}
+
+#---- modules ----#
+# extra rules for modules
+put /local/pcb/RULES {}
+put /local/pcb/CLEANFILES {}
+put /local/pcb/CLEANRULES {}
+put /local/pcb/EXEDEPS {}
+put /local/pcb/all {}
+put /local/pcb/buildin_init {}
+put /local/pcb/rules/install_ {}
+put /local/pcb/rules/install {}
+put /local/pcb/rules/linstall {}
+put /local/pcb/rules/uninstall {}
+put /local/pcb/mod/OBJS {}
+put /local/pcb/mod/OBJS_C99 {}
+put /local/pcb/mod/CONF {}
+put /local/pcb/mod/LDFLAGS {}
+put /local/pcb/mod/CFLAGS {}
+put /local/pcb/mod/YACC {}
+put /local/pcb/mod/LEX {}
+
+put /local/pcb/tmpasm/buildin         {../src_plugins/Buildin.tmpasm}
+put /local/pcb/tmpasm/plugin          {../src_plugins/Plugin.tmpasm}
+put /local/pcb/tmpasm/disable         {../src_plugins/Disable.tmpasm}
+put /local/pcb/tmpasm/common_enabled  {../src_plugins/Common_enabled.tmpasm}
+put /local/pcb/tmpasm/plugin_sphash   {../scconfig/template/plugin_sphash.tmpasm}
+put /local/pcb/tmpasm/plugin_conf     {../scconfig/template/plugin_conf.tmpasm}
+
+include {../src_plugins/plugins_ALL.tmpasm}
+
+append /local/pcb/CFLAGS  /target/libs/sul/glib/cflags
+append /local/pcb/CFLAGS  /target/libs/sul/dmalloc/cflags
+append /local/pcb/LIBS    /target/libs/sul/glib/ldflags
+append /local/pcb/LIBS    /target/libs/sul/dmalloc/ldflags
+
+# Lesstif requires that -lXm is before -lXt or else there is a runtime BadWindow error
+order /local/pcb/LDFLAGS {-lXm} {before} {-lXt}
+
+# ---- logic ----
+
+
+# Clean up variables
+uniq /local/pcb/OBJS
+uniq /local/pcb/OBJS_C99
+uniq /local/pcb/OBJS_UTIL
+uniq /local/pcb/CFLAGS
+uniq /local/pcb/LDFLAGS
+uniq /local/pcb/LIBS
+uniq /local/pcb/LIBS_PRE
+uniq /local/pcb/LIBS_3RD
+uniq /local/pcb/ACTION_REG_SRC
+uniq /local/pcb/EXEDEPS
+uniq /local/pcb/CLEANFILES
+uniq /local/pcb/DISTCLEANFILES
+uniq /local/pcb/CLEANRULES
+uniq /local/pcb/all
+put /local/pcb/SRCS /local/pcb/OBJS 
+append /local/pcb/SRCS ?/local/pcb/OBJS_C99
+gsub /local/pcb/SRCS {.o } {.c }
+
+# Makefile, static
+print [@
+# *** DO NOT EDIT THIS FILE ***
+# This file has been generated from Makefile.in by configure
+# *** DO NOT EDIT THIS FILE ***
+
+ROOT=..
+
+# plugin source
+PLUGDIR=$(ROOT)/src_plugins
+
+# plugin source install - so that pcb-rnd runs from source properly
+PLUGIDIR=plugins
+
+# src_3rd dir for the lib_ wrapper plugins
+SRC_3RD_DIR=$(ROOT)/src_3rd
+
+@?/local/pcb/TOPVARS@
+OBJS=@/local/pcb/OBJS@
+OBJS_C99=@/local/pcb/OBJS_C99@
+OBJS_UTIL=@/local/pcb/OBJS_UTIL@
+SRCS=@/local/pcb/SRCS@
+CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@
+C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
+LDFLAGS=@/local/pcb/LDFLAGS@
+LIBS_PRE=@/local/pcb/LIBS_PRE@
+LIBS=@/local/pcb/LIBS@ -lm @?/target/libs/ldl@
+LIBS_3RD=@/local/pcb/LIBS_3RD@
+EXEDEPS=@/local/pcb/EXEDEPS@
+CLEANFILES=@/local/pcb/CLEANFILES@
+CLEANRULES=@/local/pcb/CLEANRULES@
+CC=@cc/cc@
+CQUOTE=$(ROOT)/scconfig/cquote
+SPHASH_PATH=$(ROOT)/src_3rd/sphash
+SPHASH=$(SPHASH_PATH)/sphash
+PUPLUG=$(ROOT)/src_3rd/puplug/util/puplug
+LIBMINUID_CFLAGS=@cc/cflags@
+LIBMINUID_LDFLAGS=@cc/ldflags@
+GENLIST_CFLAGS=@cc/cflags@
+GENLIST_LDFLAGS=@cc/ldflags@
+
+all:
+	$(MAKE) revcheck
+	$(MAKE) all_exe
+
+include $(ROOT)/Makefile.conf
+
+revcheck:
+	cd $(ROOT)/scconfig && ./revtest Rev.stamp < Rev.tab
+
+all_exe: pcb-rnd$(EXE) @/local/pcb/all@
+
+pcb-rnd$(EXE): $(OBJS) $(OBJS_C99) $(EXEDEPS) $(LIBS_3RD)
+	$(CC) $(OBJS) $(OBJS_C99) -o pcb-rnd$(EXE) $(LIBS_PRE) $(LDFLAGS) $(LIBS)
+
+
+$(SPHASH_PATH)/sphash: $(SPHASH_PATH)/sphash.c
+	$(CC) -o pcb-rnd$(EXE) $(SPHASH_PATH)/sphash.c -o $(SPHASH_PATH)/sphash
+
+# needed by gsch2pcb-rnd
+../src_3rd/genlist/genadlist.o ../src_3rd/genlist/genlistalloc.o:
+	cd ../src_3rd/genlist && $(MAKE) GENLIST_CFLAGS="$(GENLIST_CFLAGS)" GENLIST_LDFLAGS="$(GENLIST_LDFLAGS)"
+
+buildin.c: $(PLUGDIR)/.builtin.pups $(PUPLUG)
+	cd $(PLUGDIR) && $(PUPLUG) buildin.c "-" < $(PLUGDIR)/.builtin.pups > $(ROOT)/src/buildin.c
+
+buildin.h: $(PLUGDIR)/.builtin.pups $(PUPLUG)
+	$(PUPLUG) buildin.h > buildin.h
+
+$(PUPLUG):
+	cd ../src_3rd/puplug && make
+
+../src_3rd/libminuid/libminuid.a: ../src_3rd/libminuid/libminuid.c ../src_3rd/libminuid/libminuid.h
+	cd  ../src_3rd/libminuid && $(MAKE) libminuid.a LIBMINUID_CFLAGS="$(LIBMINUID_CFLAGS)" LIBMINUID_LDFLAGS="$(LIBMINUID_LDFLAGS)"
+
+@]
+
+print [@
+##### module rules begin #####
+
+@/local/pcb/RULES@
+
+##### module rules end #####
+
+### default menu embed
+pcb_menu_default.c: pcb-menu-default.lht $(CQUOTE)
+	$(CQUOTE) -n pcb_menu_default <pcb-menu-default.lht > pcb_menu_default.c
+
+pcblib_DATA= \
+	default_font \
+	default2.lht \
+	default4.lht \
+	pcb-menu-default.lht \
+	pcb-menu-lesstif.lht \
+	pcb-menu-gtk.lht \
+	pcb-menu-mkey.lht
+
+
+EXTRA_DIST= \
+	default_font \
+	default2.lht \
+	default4.lht \
+	pcbtest.sh.in
+
+all-local: pcbtest.sh
+
+generated_lists.h: @/local/pcb/ACTION_REG_SRC@ Makefile
+	AWK=@/host/fstools/awk@ $(ROOT)/scconfig/gen_core_lists.sh @/local/pcb/ACTION_REG_SRC@ > generated_lists.h
+
+conf_core_fields.h: conf_core.h
+	AWK=@/host/fstools/awk@ $(ROOT)/scconfig/gen_conf.sh $(ROOT)/doc/conf/tree < conf_core.h > conf_core_fields.h
+
+conf_internal.c: pcb-conf.lht $(CQUOTE)
+	$(CQUOTE) -n conf_internal < pcb-conf.lht > conf_internal.c
+
+defpcb_internal.c: default4.lht
+	$(CQUOTE) -n default_pcb_internal < default4.lht > defpcb_internal.c
+
+# do not make this automatic, most users won't need to regenerate font_internal.c
+gen_font:
+	$(ROOT)/util/devhelpers/font2c.sh < default_font > font_internal.c
+
+util_deps: $(OBJS) $(OBJS_UTIL) ../src_3rd/genlist/genadlist.o ../src_3rd/genlist/genlistalloc.o
+
+FORCE:
+
+
+DISTCLEANFILES = Makefile.depgen core_lists.h buildin.c compat_inc.h conf_core_fields.h conf_internal.c generated_lists.h defpcb_internal.c ../src_plugins/.builtin.pups @/local/pcb/DISTCLEANFILES@
+
+clean: $(CLEANRULES)
+	$(SCCBOX) rm -f -q  pcb-rnd $(OBJS) $(OBJS_C99) $(CLEANFILES)
+
+distclean: FORCE
+	$(SCCBOX) rm -f -q  $(DISTCLEANFILES)
+
+install_all:
+	$(SCCBOX) mkdir -p "$(BINDIR)" "$(DATADIR)" "$(LIBDIR)" "$(LIBDIR)/plugins"
+	$(SCCBOX) $(HOW) "pcb-rnd" "$(BINDIR)/pcb-rnd"
+	$(SCCBOX) $(HOW) "default2.lht" "$(DATADIR)/default2.lht"
+	$(SCCBOX) $(HOW) "default4.lht" "$(DATADIR)/default4.lht"
+	$(SCCBOX) $(HOW) "pcb-conf.lht" "$(DATADIR)/pcb-conf.lht"
+	$(SCCBOX) $(HOW) "pcb-menu-default.lht" "$(DATADIR)/pcb-menu-default.lht"
+	$(SCCBOX) $(HOW) "pcb-menu-lesstif.lht" "$(DATADIR)/pcb-menu-lesstif.lht"
+	$(SCCBOX) $(HOW) "pcb-menu-gtk.lht" "$(DATADIR)/pcb-menu-gtk.lht"
+	$(SCCBOX) $(HOW) "default_font" "$(DATADIR)/default_font"@/local/pcb/rules/install_@
+
+install:
+	$(MAKE) install_all HOW="install -f"
+
+linstall:
+	$(MAKE) install_all HOW="linstall -f"
+
+uninstall:
+	$(MAKE) install_all HOW="uninstall"
+
+map_plugins:
+	cd ../src_plugins && ./map_plugins.sh
+
+@]
+
+# generate explicit rules for .c -> .o
+put /local/comp/OBJS /local/pcb/OBJS
+put /local/comp/OBJS_C99 ?/local/pcb/OBJS_C99
+include {../scconfig/template/compile.tmpasm}
+
+print [@
+# for extern utils:@]
+
+put /local/comp/OBJS /local/pcb/OBJS_UTIL
+include {../scconfig/template/compile.tmpasm}
+
+# generate deps
+put /local/dep/CFLAGS /local/pcb/CFLAGS
+put /local/dep/SRCS /local/pcb/SRCS
+
+gsub /local/pcb/DEPSRCS {.o } {.c }
+append /local/dep/SRCS /local/pcb/DEPSRCS
+include {../scconfig/template/cdep.tmpasm}
+
+redir {../src_plugins/.builtin.pups}
+print [@# Autogenerated by ./configure - do NOT edit - contains the list of buildins
+@?/local/pcb/buildin_pups@
+@]
+
Index: tags/2.0.1/src/actions.c
===================================================================
--- tags/2.0.1/src/actions.c	(nonexistent)
+++ tags/2.0.1/src/actions.c	(revision 18980)
@@ -0,0 +1,983 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <ctype.h>
+
+#include <genht/htsp.h>
+#include <libfungw/fungw_conv.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "event.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "funchash.h"
+#include "layer.h"
+
+#define PCB_ACTION_NAME_MAX 128
+
+const pcb_action_t *pcb_current_action = NULL;
+
+fgw_ctx_t pcb_fgw;
+fgw_obj_t *pcb_fgw_obj;
+
+typedef struct {
+	const char *cookie;
+	const pcb_action_t *action;
+} hid_cookie_action_t;
+
+static const char *check_action_name(const char *s)
+{
+	while (*s)
+		if (isspace((int) *s++) || *s == '(')
+			return (s - 1);
+	return NULL;
+}
+
+static char *make_action_name(char *out, const char *inp, int inp_len)
+{
+	char *s;
+
+	if (inp_len >= PCB_ACTION_NAME_MAX) {
+		*out = '\0';
+		return out;
+	}
+
+	memcpy(out, inp, inp_len+1);
+	for(s = out; *s != '\0'; s++)
+		*s = tolower(*s);
+	return out;
+}
+
+static char *aname(char *out, const char *inp)
+{
+	return make_action_name(out, inp, strlen(inp));
+}
+
+void pcb_register_actions(const pcb_action_t *a, int n, const char *cookie)
+{
+	int i;
+	hid_cookie_action_t *ca;
+	fgw_func_t *f;
+
+	for (i = 0; i < n; i++) {
+		char fn[PCB_ACTION_NAME_MAX];
+		int len;
+
+		if (check_action_name(a[i].name)) {
+			pcb_message(PCB_MSG_ERROR, _("ERROR! Invalid action name, " "action \"%s\" not registered.\n"), a[i].name);
+			continue;
+		}
+		len = strlen(a[i].name);
+		if (len >= sizeof(fn)) {
+			pcb_message(PCB_MSG_ERROR, "Invalid action name: \"%s\" (too long).\n", a[i].name);
+			continue;
+		}
+
+		ca = malloc(sizeof(hid_cookie_action_t));
+		ca->cookie = cookie;
+		ca->action = a+i;
+
+		make_action_name(fn, a[i].name, len);
+		f = fgw_func_reg(pcb_fgw_obj, fn, a[i].trigger_cb);
+		if (f == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Failed to register action \"%s\" (already registered?)\n", a[i].name);
+			free(ca);
+			continue;
+		}
+		f->reg_data = ca;
+	}
+}
+
+void pcb_register_action(const pcb_action_t *a, const char *cookie)
+{
+	pcb_register_actions(a, 1, cookie);
+}
+
+static void pcb_remove_action(fgw_func_t *f)
+{
+	hid_cookie_action_t *ca = f->reg_data;
+	fgw_func_unreg(pcb_fgw_obj, f->name);
+	free(ca);
+}
+
+void pcb_remove_actions(const pcb_action_t *a, int n)
+{
+	int i;
+	char fn[PCB_ACTION_NAME_MAX];
+
+	for (i = 0; i < n; i++) {
+		fgw_func_t *f = fgw_func_lookup(&pcb_fgw, aname(fn, a[i].name));
+		if (f == NULL) {
+			pcb_message(PCB_MSG_WARNING, "Failed to remove action \"%s\" (is it registered?)\n", a[i].name);
+			continue;
+		}
+		pcb_remove_action(f);
+	}
+}
+
+void pcb_remove_actions_by_cookie(const char *cookie)
+{
+	htsp_entry_t *e;
+
+	/* Slow linear search - probably OK, this will run only on uninit */
+	for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) {
+		fgw_func_t *f = e->value;
+		hid_cookie_action_t *ca = f->reg_data;
+		if ((ca != NULL) && (ca->cookie == cookie))
+			pcb_remove_action(f);
+	}
+}
+
+const pcb_action_t *pcb_find_action(const char *name, fgw_func_t **f_out)
+{
+	fgw_func_t *f;
+	hid_cookie_action_t *ca;
+	char fn[PCB_ACTION_NAME_MAX];
+
+	if (name == NULL)
+		return NULL;
+
+	f = fgw_func_lookup(&pcb_fgw, aname(fn, name));
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "unknown action `%s'\n", name);
+		return NULL;
+	}
+	ca = f->reg_data;
+	if (f_out != NULL)
+		*f_out = f;
+	return ca->action;
+}
+
+void pcb_print_actions()
+{
+	htsp_entry_t *e;
+
+	fprintf(stderr, "Registered Actions:\n");
+	for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) {
+		fgw_func_t *f = e->value;
+		hid_cookie_action_t *ca = f->reg_data;
+		if (ca->action->description)
+			fprintf(stderr, "  %s - %s\n", ca->action->name, ca->action->description);
+		else
+			fprintf(stderr, "  %s\n", ca->action->name);
+		if (ca->action->syntax) {
+			const char *bb, *eb;
+			bb = eb = ca->action->syntax;
+			while (1) {
+				for (eb = bb; *eb && *eb != '\n'; eb++);
+				fwrite("    ", 4, 1, stderr);
+				fwrite(bb, eb - bb, 1, stderr);
+				fputc('\n', stderr);
+				if (*eb == 0)
+					break;
+				bb = eb + 1;
+			}
+		}
+	}
+}
+
+static void dump_string(char prefix, const char *str)
+{
+	int eol = 1;
+	while (*str) {
+		if (eol) {
+			putchar(prefix);
+			eol = 0;
+		}
+		putchar(*str);
+		if (*str == '\n')
+			eol = 1;
+		str++;
+	}
+	if (!eol)
+		putchar('\n');
+}
+
+void pcb_dump_actions(void)
+{
+	htsp_entry_t *e;
+
+	fprintf(stderr, "Registered Actions:\n");
+	for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) {
+		fgw_func_t *f = e->value;
+		hid_cookie_action_t *ca = f->reg_data;
+		const char *desc = ca->action->description;
+		const char *synt = ca->action->syntax;
+
+		desc = desc ? desc : "";
+		synt = synt ? synt : "";
+
+		printf("A%s\n", ca->action->name);
+		dump_string('D', desc);
+		dump_string('S', synt);
+	}
+}
+
+int pcb_action(const char *name)
+{
+	return pcb_actionv(name, 0, 0);
+}
+
+int pcb_actionl(const char *name, ...)
+{
+	const char *argv[20];
+	int argc = 0;
+	va_list ap;
+	char *arg;
+
+	va_start(ap, name);
+	while ((arg = va_arg(ap, char *)) != 0)
+		argv[argc++] = arg;
+	va_end(ap);
+	return pcb_actionv(name, argc, argv);
+}
+
+fgw_error_t pcb_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	fgw_error_t ret;
+	int i;
+	const pcb_action_t *old_action;
+	hid_cookie_action_t *ca = f->reg_data;
+
+	if (conf_core.rc.verbose) {
+		printf("Action: \033[34m%s(", f->name);
+		for (i = 0; i < argc; i++)
+			printf("%s%s", i ? "," : "", (argv[i].type & FGW_STR) == FGW_STR ? argv[i].val.str : "<non-str>");
+		printf(")\033[0m\n");
+	}
+
+	if (ca != NULL) {
+		/* pcb-rnd action with a lot of metadata */
+		old_action = pcb_current_action;
+		pcb_current_action = ca->action;
+		ret = pcb_current_action->trigger_cb(res, argc, argv);
+		pcb_current_action = old_action;
+	}
+	else {
+		/* direct call, no metadata */
+		ret = f->func(res, argc, argv);
+	}
+
+	fgw_argv_free(&pcb_fgw, argc, argv);
+
+	return ret;
+}
+
+int pcb_actionv(const char *name, int argc, const char **argsv)
+{
+	fgw_func_t *f;
+	fgw_arg_t res, argv[PCB_ACTION_MAX_ARGS+1];
+	int n;
+	char fn[PCB_ACTION_NAME_MAX];
+
+	if (name == NULL)
+		return 1;
+
+	if (argc >= PCB_ACTION_MAX_ARGS) {
+		pcb_message(PCB_MSG_ERROR, "can not call action %s with this many arguments (%d >= %d)\n", name, argc, PCB_ACTION_MAX_ARGS);
+		return 1;
+	}
+
+	f = fgw_func_lookup(&pcb_fgw, aname(fn, name));
+	if (f == NULL) {
+		int i;
+		pcb_message(PCB_MSG_ERROR, "no action %s(", name);
+		for (i = 0; i < argc; i++)
+			pcb_message(PCB_MSG_ERROR, "%s%s", i ? ", " : "", argsv[i]);
+		pcb_message(PCB_MSG_ERROR, ")\n");
+		return 1;
+	}
+	argv[0].type = FGW_FUNC;
+	argv[0].val.func = f;
+	for(n = 0; n < argc; n++) {
+		argv[n+1].type = FGW_STR;
+		argv[n+1].val.str = (char *)argsv[n];
+	}
+	res.type = FGW_INVALID;
+	if (pcb_actionv_(f, &res, argc+1, argv) != 0)
+		return -1;
+	fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+	return res.val.nat_int;
+}
+
+void pcb_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "pcb_hid_get_coords: can not get coordinates (no gui) for '%s'\n", msg);
+		*x = 0;
+		*y = 0;
+	}
+	else
+		pcb_gui->get_coords(msg, x, y, force);
+}
+
+static int hid_parse_actionstring(const char *rstr, char require_parens)
+{
+	const char **list = NULL;
+	int max = 0;
+	int num;
+	char *str = NULL;
+	const char *sp;
+	char *cp, *aname, *cp2;
+	int maybe_empty = 0;
+	char in_quotes = 0;
+	char parens = 0;
+	int retcode = 0;
+
+	/*fprintf(stderr, "invoke: `%s'\n", rstr); */
+
+	sp = rstr;
+	str = (char *) malloc(strlen(rstr) + 1);
+
+another:
+	num = 0;
+	cp = str;
+
+	/* eat leading spaces and tabs */
+	while (*sp && isspace((int) *sp))
+		sp++;
+
+	if ((*sp == '\0') || (*sp == '#')) {
+		retcode = 0;
+		goto cleanup;
+	}
+
+	aname = cp;
+
+	/* copy the action name, assumes name does not have a space or '('
+	 * in its name */
+	while (*sp && !isspace((int) *sp) && *sp != '(')
+		*cp++ = *sp++;
+	*cp++ = 0;
+
+	/* skip whitespace */
+	while (*sp && isspace((int) *sp))
+		sp++;
+
+	/*
+	 * we only have an action name, so invoke the action
+	 * with no parameters or event.
+	 */
+	if (*sp == '\0') {
+		retcode = pcb_actionv(aname, 0, 0);
+		goto cleanup;
+	}
+
+	/* are we using parenthesis? */
+	if (*sp == '(') {
+		parens = 1;
+		sp++;
+	}
+	else if (require_parens) {
+		pcb_message(PCB_MSG_ERROR, _("Syntax error: %s\n"), rstr);
+		pcb_message(PCB_MSG_ERROR, _("    expected: Action(arg1, arg2)"));
+		retcode = 1;
+		goto cleanup;
+	}
+
+	/* get the parameters to pass to the action */
+	while (1) {
+		/*
+		 * maybe_empty == 0 means that the last char examined was not a
+		 * ","
+		 */
+		if (!maybe_empty && ((parens && *sp == ')') || (!parens && !*sp))) {
+			retcode = pcb_actionv(aname, num, list);
+			if (retcode)
+				goto cleanup;
+
+			/* strip any white space or ';' following the action */
+			if (parens)
+				sp++;
+			while (*sp && (isspace((int) *sp) || *sp == ';'))
+				sp++;
+			goto another;
+		}
+		else if (*sp == 0 && !maybe_empty)
+			break;
+		else {
+			maybe_empty = 0;
+			in_quotes = 0;
+			/*
+			 * if we have more parameters than memory in our array of
+			 * pointers, then either allocate some or grow the array
+			 */
+			if (num >= max) {
+				max += 10;
+				if (list)
+					list = (const char **) realloc(list, max * sizeof(char *));
+				else
+					list = (const char **) malloc(max * sizeof(char *));
+			}
+			/* Strip leading whitespace.  */
+			while (*sp && isspace((int) *sp))
+				sp++;
+			list[num++] = cp;
+
+			/* search for the end of the argument, we want to keep going
+			 * if we are in quotes or the char is not a delimiter
+			 */
+			while (*sp && (in_quotes || ((*sp != ',')
+																	 && (!parens || *sp != ')')
+																	 && (parens || !isspace((int) *sp))))) {
+				/*
+				 * single quotes give literal value inside, including '\'.
+				 * you can't have a single inside single quotes.
+				 * doubles quotes gives literal value inside, but allows escape.
+				 */
+				if ((*sp == '"' || *sp == '\'') && (!in_quotes || *sp == in_quotes)) {
+					in_quotes = in_quotes ? 0 : *sp;
+					sp++;
+					continue;
+				}
+				/* unless within single quotes, \<char> will just be <char> */
+				else if (*sp == '\\' && in_quotes != '\'')
+					sp++;
+				*cp++ = *sp++;
+			}
+			cp2 = cp - 1;
+			*cp++ = 0;
+			if (*sp == ',' || (!parens && isspace((int) *sp))) {
+				maybe_empty = 1;
+				sp++;
+			}
+			/* Strip trailing whitespace.  */
+			for (; isspace((int) *cp2) && cp2 >= list[num - 1]; cp2--)
+				*cp2 = 0;
+		}
+	}
+
+cleanup:
+
+	if (list != NULL)
+		free(list);
+
+	if (str != NULL)
+		free(str);
+
+	return retcode;
+}
+
+const char *pcb_cli_prompt(const char *suffix)
+{
+	const char *base;
+	static char prompt[128];
+	int blen, slen, len;
+
+	if ((conf_core.rc.cli_prompt != NULL) && (*conf_core.rc.cli_prompt != '\0'))
+		base = conf_core.rc.cli_prompt;
+	else if ((conf_core.rc.cli_backend == NULL) || (*conf_core.rc.cli_backend == '\0'))
+		base = "action";
+	else
+		base = conf_core.rc.cli_backend;
+
+	if ((suffix == NULL) || (*suffix == '\0'))
+		return base;
+
+	blen = strlen(base);
+	slen = strlen(suffix);
+
+	len = blen;
+	if (len >= sizeof(prompt)-1-slen)
+		len = sizeof(prompt)-1-slen;
+
+	memcpy(prompt, base, len);
+	memcpy(prompt+len, suffix, slen);
+	prompt[len+slen] = '\0';
+	return prompt;
+}
+
+static vtp0_t cli_stack;
+
+static void cli_push(const char *val)
+{
+	if (val == NULL)
+		val = "";
+	vtp0_append(&cli_stack, pcb_strdup(val));
+}
+
+static char *cli_pop(void)
+{
+	if (cli_stack.used == 0)
+		return NULL;
+	return cli_stack.array[--cli_stack.used];
+}
+
+int pcb_cli_enter(const char *backend, const char *prompt)
+{
+	cli_push(conf_core.rc.cli_backend);
+	cli_push(conf_core.rc.cli_prompt);
+
+	if (conf_set(CFR_CLI, "rc/cli_backend", 0, backend, POL_OVERWRITE) != 0)
+		return -1;
+	return conf_set(CFR_CLI, "rc/cli_prompt", 0, prompt, POL_OVERWRITE);
+}
+
+int pcb_cli_leave(void)
+{
+	if (vtp0_len(&cli_stack) >= 2) {
+		char *prompt = NULL, *backend = NULL;
+		prompt = cli_pop();
+		backend = cli_pop();
+		conf_set(CFR_CLI, "rc/cli_backend", 0, backend, POL_OVERWRITE);
+		conf_set(CFR_CLI, "rc/cli_prompt", 0, prompt, POL_OVERWRITE);
+		free(prompt);
+		free(backend);
+		return 0;
+	}
+
+	conf_set(CFR_CLI, "rc/cli_backend", 0, "", POL_OVERWRITE);
+	conf_set(CFR_CLI, "rc/cli_prompt", 0, "", POL_OVERWRITE);
+	return -1;
+}
+
+static int pcb_cli_common(fgw_arg_t *args)
+{
+	const pcb_action_t *a;
+	fgw_func_t *f;
+
+	/* no backend: let the original action work */
+	if ((conf_core.rc.cli_backend == NULL) || (*conf_core.rc.cli_backend == '\0'))
+		return -1;
+
+	/* backend: let the backend action handle it */
+	a = pcb_find_action(conf_core.rc.cli_backend, &f);
+	if (!a)
+		return -1;
+
+	args[0].type = FGW_FUNC;
+	args[0].val.func = f;
+	return 0;
+}
+
+int pcb_cli_tab(void)
+{
+	fgw_arg_t res, args[2];
+
+	if (pcb_cli_common(args) != 0)
+		return -1;
+
+	args[1].type = FGW_STR;
+	args[1].val.str = "/tab";
+
+	if (pcb_actionv_(args[0].val.func, &res, 2, args) != 0)
+			return -1;
+	fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+	return res.val.nat_int;
+}
+
+int pcb_cli_edit(void)
+{
+	fgw_arg_t res, args[2];
+
+	if (pcb_cli_common(args) != 0)
+		return -1;
+
+	args[1].type = FGW_STR;
+	args[1].val.str = "/edit";
+
+	if (pcb_actionv_(args[0].val.func, &res, 2, args) != 0)
+			return -1;
+	fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+	return res.val.nat_int;
+}
+
+int pcb_cli_mouse(pcb_bool notify)
+{
+	fgw_arg_t res, args[3];
+
+	if (pcb_cli_common(args) != 0)
+		return -1;
+
+	args[1].type = FGW_STR;
+	args[1].val.str = "/click";
+	args[2].type = FGW_INT;
+	args[2].val.nat_int = notify;
+
+	if (pcb_actionv_(args[0].val.func, &res, 3, args) != 0)
+			return -1;
+	fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+	return res.val.nat_int;
+}
+
+
+void pcb_cli_uninit(void)
+{
+	while(vtp0_len(&cli_stack) > 0)
+		free(cli_pop());
+}
+
+int pcb_parse_command(const char *str_, pcb_bool force_action_mode)
+{
+	fgw_arg_t res, args[2];
+	fgw_func_t *f;
+	const pcb_action_t *a;
+	const char *end;
+
+	/* no backend or forced action mode: classic pcb-rnd action parse */
+	if (force_action_mode || (conf_core.rc.cli_backend == NULL) || (*conf_core.rc.cli_backend == '\0')) {
+		pcb_event(PCB_EVENT_CLI_ENTER, "s", str_);
+		return hid_parse_actionstring(str_, pcb_false);
+	}
+
+	/* backend: let the backend action handle it */
+	a = pcb_find_action(conf_core.rc.cli_backend, &f);
+	if (!a) {
+		pcb_message(PCB_MSG_ERROR, "cli: no action %s; leaving mode\n", conf_core.rc.cli_backend);
+		pcb_cli_leave();
+		return -1;
+	}
+
+	end = strpbrk(str_, "\n\r");
+
+	args[0].type = FGW_FUNC;
+	args[0].val.func = f;
+	if (end == NULL) {
+		/* optimization: string doesn't contain newline - pass it as is to save an strdup */
+		args[1].type = FGW_STR;
+		args[1].val.str = pcb_strdup(str_);
+	}
+	else {
+		/* string contains a newline; need to cut there, which needs a dup; let fungw free it as dynamic string, cleaning up args after the fungw call */
+		args[1].type = FGW_STR | FGW_DYN;
+		args[1].val.str = pcb_strdup(str_);
+		args[1].val.str[end - str_] = '\0';
+	}
+
+	if (pcb_actionv_(f, &res, 2, args) != 0)
+			return -1;
+	fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+	return res.val.nat_int;
+}
+
+int pcb_parse_actions(const char *str_)
+{
+	return hid_parse_actionstring(str_, pcb_true);
+}
+
+/*** custom fungw types ***/
+#define conv_str2kw(dst, src) dst = pcb_funchash_get(src, NULL)
+
+static int keyword_arg_conv(fgw_ctx_t *ctx, fgw_arg_t *arg, fgw_type_t target)
+{
+	if (target == FGW_KEYWORD) { /* convert to keyword */
+		long tmp;
+		switch(FGW_BASE_TYPE(arg->type)) {
+			ARG_CONV_CASE_LONG(tmp, conv_err)
+			ARG_CONV_CASE_LLONG(tmp, conv_err)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_err)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_err)
+			ARG_CONV_CASE_STR(tmp, conv_str2kw)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+		}
+		arg->type = FGW_KEYWORD;
+		fgw_keyword(arg) = tmp;
+		return 0;
+	}
+	if (arg->type == FGW_KEYWORD) { /* convert from keyword */
+		long tmp = fgw_keyword(arg);
+		switch(target) {
+			ARG_CONV_CASE_LONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LLONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+			case FGW_STR:
+				arg->val.str = (char *)pcb_funchash_reverse(tmp);
+				arg->type = FGW_STR;
+				return 0;
+		}
+		arg->type = target;
+		return 0;
+	}
+	fprintf(stderr, "Neither side of the conversion is keyword\n");
+	abort();
+}
+
+char *fgw_str2coord_unit = NULL;
+#define conv_str2coord(dst, src) \
+do { \
+	pcb_bool succ; \
+	dst = pcb_get_value_ex(src, NULL, NULL, NULL, fgw_str2coord_unit, &succ); \
+	if (!succ) \
+		return -1; \
+} while(0)
+
+static int coord_arg_conv(fgw_ctx_t *ctx, fgw_arg_t *arg, fgw_type_t target)
+{
+	if (target == FGW_COORD) { /* convert to coord */
+		pcb_coord_t tmp;
+		switch(FGW_BASE_TYPE(arg->type)) {
+			ARG_CONV_CASE_LONG(tmp, conv_assign)
+			ARG_CONV_CASE_LLONG(tmp, conv_assign)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_assign)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_assign)
+			ARG_CONV_CASE_STR(tmp, conv_str2coord)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+		}
+		arg->type = FGW_COORD;
+		fgw_coord(arg) = tmp;
+		return 0;
+	}
+	if (arg->type == FGW_COORD) { /* convert from coord */
+		pcb_coord_t tmp = fgw_coord(arg);
+		switch(target) {
+			ARG_CONV_CASE_LONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LLONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+			case FGW_STR:
+				arg->val.str = (char *)pcb_strdup_printf("%.08$mH", tmp);
+				arg->type = FGW_STR | FGW_DYN;
+				return 0;
+		}
+		arg->type = target;
+		return 0;
+	}
+	fprintf(stderr, "Neither side of the conversion is coord\n");
+	abort();
+}
+
+#define conv_str2coords(dst, src) \
+do { \
+	pcb_bool succ, abso; \
+	dst.c[0] = pcb_get_value_ex(src, NULL, &abso, NULL, fgw_str2coord_unit, &succ); \
+	if (!succ) \
+		return -1; \
+	dst.len = 1; \
+	dst.absolute[0] = abso; \
+} while(0)
+
+
+
+#define conv_loadcoords(dst, src) \
+do { \
+	dst.len = 1; \
+	dst.absolute[0] = 1; \
+	dst.c[0] = src; \
+} while(0)
+
+static int coords_arg_conv(fgw_ctx_t *ctx, fgw_arg_t *arg, fgw_type_t target)
+{
+	if (target == FGW_COORDS) { /* convert to coord */
+		fgw_coords_t tmp;
+		switch(FGW_BASE_TYPE(arg->type)) {
+			ARG_CONV_CASE_LONG(tmp, conv_loadcoords)
+			ARG_CONV_CASE_LLONG(tmp, conv_loadcoords)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_loadcoords)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_loadcoords)
+			ARG_CONV_CASE_STR(tmp, conv_str2coords)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+		}
+		arg->type = FGW_COORDS | FGW_DYN;
+		fgw_coords(arg) = malloc(sizeof(tmp));
+		memcpy(fgw_coords(arg), &tmp, sizeof(tmp));
+		return 0;
+	}
+	if (arg->type == FGW_COORDS) { /* convert from coord */
+		fgw_coords_t *tmp = fgw_coords(arg);
+		switch(target) {
+			ARG_CONV_CASE_LONG(tmp, conv_err)
+			ARG_CONV_CASE_LLONG(tmp, conv_err)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_err)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_err)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+			case FGW_STR:
+				arg->val.str = (char *)pcb_strdup_printf("%.08$mH", tmp);
+				arg->type = FGW_STR | FGW_DYN;
+				return 0;
+		}
+		arg->type = target;
+		return 0;
+	}
+	fprintf(stderr, "Neither side of the conversion is coords\n");
+	abort();
+}
+
+static int coords_arg_free(fgw_ctx_t *ctx, fgw_arg_t *arg)
+{
+	assert(arg->type == (FGW_COORDS | FGW_DYN));
+	free(arg->val.ptr_void);
+	return 0;
+}
+
+
+#define conv_str2layerid(dst, src) \
+do { \
+	pcb_layer_id_t lid = pcb_layer_str2id(PCB->Data, src); \
+	if (lid < 0) \
+		return -1; \
+	dst = lid; \
+} while(0)
+
+static int layerid_arg_conv(fgw_ctx_t *ctx, fgw_arg_t *arg, fgw_type_t target)
+{
+	if (target == FGW_LAYERID) { /* convert to layer id */
+		pcb_layer_id_t tmp;
+		switch(FGW_BASE_TYPE(arg->type)) {
+			ARG_CONV_CASE_LONG(tmp, conv_assign)
+			ARG_CONV_CASE_LLONG(tmp, conv_assign)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_assign)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_assign)
+			ARG_CONV_CASE_STR(tmp, conv_str2layerid)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+		}
+		arg->type = FGW_LAYERID;
+		fgw_layerid(arg) = tmp;
+		return 0;
+	}
+	if (arg->type == FGW_LAYERID) { /* convert from layer id */
+		pcb_layer_id_t tmp = fgw_layerid(arg);
+		switch(target) {
+			ARG_CONV_CASE_LONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LLONG(tmp, conv_rev_assign)
+			ARG_CONV_CASE_DOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_LDOUBLE(tmp, conv_rev_assign)
+			ARG_CONV_CASE_PTR(tmp, conv_err)
+			ARG_CONV_CASE_CLASS(tmp, conv_err)
+			ARG_CONV_CASE_INVALID(tmp, conv_err)
+			case FGW_STR:
+				arg->val.str = (char *)pcb_strdup_printf("#%ld", (long)tmp);
+				arg->type = FGW_STR | FGW_DYN;
+				return 0;
+		}
+		arg->type = target;
+		return 0;
+	}
+	fprintf(stderr, "Neither side of the conversion is layer id\n");
+	abort();
+}
+
+static int layer_arg_conv(fgw_ctx_t *ctx, fgw_arg_t *arg, fgw_type_t target)
+{
+	if (target == FGW_LAYER) { /* convert to layer */
+		pcb_layer_id_t lid;
+		if (layerid_arg_conv(ctx, arg, FGW_LAYERID) != 0)
+			return -1;
+		lid = fgw_layerid(arg);
+		arg->val.ptr_void = pcb_get_layer(PCB->Data, lid);
+		if (arg->val.ptr_void == NULL) {
+			arg->type = FGW_INVALID;
+			return -1;
+		}
+		arg->type = FGW_LAYER;
+		return 0;
+	}
+	if (arg->type == FGW_LAYER) { /* convert from layer */
+		pcb_layer_id_t lid;
+		pcb_layer_t *ly = arg->val.ptr_void;
+		pcb_data_t *data;
+		if (ly == NULL)
+			return -1;
+		data = ly->parent.data;
+		lid = ly - data->Layer;
+		if ((lid >= 0) && (lid < data->LayerN)) {
+			arg->type = FGW_LAYERID;
+			arg->val.nat_long = lid;
+			if (layerid_arg_conv(ctx, arg, target) != 0)
+				return -1;
+			return 0;
+		}
+		return -1;
+	}
+	fprintf(stderr, "Neither side of the conversion is layer\n");
+	abort();
+}
+
+static void pcb_action_err(fgw_obj_t *obj, const char *msg)
+{
+	pcb_message(PCB_MSG_ERROR, "fungw(%s): %s", obj->name, msg);
+}
+
+void pcb_actions_init(void)
+{
+	fgw_init(&pcb_fgw, "pcb-rnd");
+	pcb_fgw.async_error = pcb_action_err;
+	pcb_fgw_obj = fgw_obj_reg(&pcb_fgw, "core");
+	if (fgw_reg_custom_type(&pcb_fgw, FGW_KEYWORD, "keyword", keyword_arg_conv, NULL) != FGW_KEYWORD) {
+		fprintf(stderr, "pcb_actions_init: failed to register FGW_KEYWORD\n");
+		abort();
+	}
+	if (fgw_reg_custom_type(&pcb_fgw, FGW_COORD, "coord", coord_arg_conv, NULL) != FGW_COORD) {
+		fprintf(stderr, "pcb_actions_init: failed to register FGW_COORD\n");
+		abort();
+	}
+	if (fgw_reg_custom_type(&pcb_fgw, FGW_COORDS, "coords", coords_arg_conv, coords_arg_free) != FGW_COORDS) {
+		fprintf(stderr, "pcb_actions_init: failed to register FGW_COORDS\n");
+		abort();
+	}
+	if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYERID, "layerid", layerid_arg_conv, NULL) != FGW_LAYERID) {
+		fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYERID\n");
+		abort();
+	}
+	if (fgw_reg_custom_type(&pcb_fgw, FGW_LAYER, "layer", layer_arg_conv, NULL) != FGW_LAYER) {
+		fprintf(stderr, "pcb_actions_init: failed to register FGW_LAYER\n");
+		abort();
+	}
+}
+
+void pcb_actions_uninit(void)
+{
+	htsp_entry_t *e;
+
+	for (e = htsp_first(&pcb_fgw.func_tbl); e; e = htsp_next(&pcb_fgw.func_tbl, e)) {
+		fgw_func_t *f = e->value;
+		hid_cookie_action_t *ca = f->reg_data;
+		if (ca->cookie != NULL)
+			fprintf(stderr, "ERROR: hid_actions_uninit: action '%s' with cookie '%s' left registered, check your plugins!\n", e->key, ca->cookie);
+		pcb_remove_action(f);
+	}
+
+	fgw_obj_unreg(&pcb_fgw, pcb_fgw_obj);
+	fgw_uninit(&pcb_fgw);
+	fgw_atexit();
+}
+
Index: tags/2.0.1/src/actions.h
===================================================================
--- tags/2.0.1/src/actions.h	(nonexistent)
+++ tags/2.0.1/src/actions.h	(revision 18980)
@@ -0,0 +1,181 @@
+#ifndef PCB_ACTIONS_H
+#define PCB_ACTIONS_H
+
+#include "hid.h"
+#include <libfungw/fungw.h>
+
+struct pcb_action_s {
+	const char *name; /* action command name */
+	fgw_error_t (*trigger_cb)(fgw_arg_t *ores, int argc, fgw_arg_t *argv); /* Action implementation; if this returns non-zero, no further actions will be invoked for this key/mouse event. */
+	const char *description;/* Short description (help text) */
+	const char *syntax; /* Full allowed syntax; use \n to separate lines.  */
+};
+
+extern fgw_ctx_t pcb_fgw;
+
+typedef struct fgw_coords_s {
+	int len;
+	pcb_coord_t c[4];
+	char absolute[4];
+} fgw_coords_t;
+
+typedef enum {
+	FGW_KEYWORD_ = FGW_CUSTOM,
+	FGW_COORD_,
+	FGW_COORDS_,
+	FGW_LAYERID_,
+	FGW_LAYER_
+} pcb_fgw_types_e;
+#define fgw_keyword(arg) ((arg)->val.nat_int)
+#define fgw_coord(arg) (*(pcb_coord_t *)(&((arg)->val.custom.c)))
+#define fgw_coords(arg) ((arg)->val.ptr_void)
+#define fgw_layerid(arg) ((arg)->val.nat_long)
+#define fgw_layer(arg) ((arg)->val.ptr_void)
+#define FGW_KEYWORD ((fgw_type_t)FGW_KEYWORD_)
+#define FGW_COORD   ((fgw_type_t)FGW_COORD_)
+#define FGW_COORDS  ((fgw_type_t)FGW_COORDS_)
+#define FGW_LAYERID  ((fgw_type_t)FGW_LAYERID_)
+#define FGW_LAYER  ((fgw_type_t)FGW_LAYER_)
+
+void pcb_register_action(const pcb_action_t *a, const char *cookie);
+void pcb_register_actions(const pcb_action_t *a, int, const char *cookie);
+#define PCB_REGISTER_ACTIONS(a, cookie) PCB_HIDCONCAT(void register_,a) ()\
+	{ pcb_register_actions(a, sizeof(a)/sizeof(a[0]), cookie); }
+
+/* Inits and uninits the whole action framework */
+void pcb_actions_init(void);
+void pcb_actions_uninit(void);
+
+/* These are called from main_act.c */
+void pcb_print_actions(void);
+void pcb_dump_actions(void);
+
+const pcb_action_t *pcb_find_action(const char *name, fgw_func_t **f_out);
+
+void pcb_remove_actions(const pcb_action_t *a, int n);
+void pcb_remove_actions_by_cookie(const char *cookie);
+
+int pcb_action(const char *action_);
+int pcb_actionl(const char *action_, ...); /* NULL terminated */
+int pcb_actionv(const char *action_, int argc_, const char **argv_);
+fgw_error_t pcb_actionv_(const fgw_func_t *f, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+/* Parse the given command string into action calls, and call
+   hid_actionv for each action found.  Accepts both "action(arg1,
+   arg2)" and command-style "action arg1 arg2", allowing only one
+   action in the later case. If force_action_mode is true, str
+   is interpreted as pcb-rnd action despite of the cli mode.
+   Returns nonzero if the action handler(s) return nonzero. */
+int pcb_parse_command(const char *str_, pcb_bool force_action_mode);
+
+/* Parse the given string into action calls, and call
+   hid_actionv for each action found.  Accepts only
+   "action(arg1, arg2)" */
+int pcb_parse_actions(const char *str_);
+
+/* Return a static buffer with the current prompt plus an optional
+   suffix glued to it. Valid until the next call. */
+const char *pcb_cli_prompt(const char *suffix);
+
+/* Change the cli backend/prompt, entering a new cli mode; the old
+   mode is pushed on a stack */
+int pcb_cli_enter(const char *backend, const char *prompt);
+
+/* Leave the current cli mode, returning to the previous mode
+   (popped from a stack) */
+int pcb_cli_leave(void);
+
+/* Request for tab completion */
+int pcb_cli_tab(void);
+
+/* Called on each key press so indication can be updated */
+int pcb_cli_edit(void);
+
+/* Mouse event while the command line is open; returns zero if
+   normal event processing shall be inhibited; notify is true if
+   called in notify mode, false if called in release mode */
+int pcb_cli_mouse(pcb_bool notify);
+
+/* Discard the cli mode stack */
+void pcb_cli_uninit(void);
+
+/* If the mouse cursor is in the drawin area, set x;y silently and return;
+   else show msg and let the user click in the drawing area. If force is
+   non-zero and msg is non-NULL, discard the cache and force querying a
+   new coord. This mode must NOT be used unless action arguments explictly
+   requested it. */
+void pcb_hid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force);
+
+#define PCB_ACTION_MAX_ARGS 16
+
+/* Return 0 on success after an action call */
+PCB_INLINE int pcb_act_result(fgw_arg_t *res, fgw_error_t ret)
+{
+	if (ret != 0)
+		return -1;
+
+	if (fgw_arg_conv(&pcb_fgw, res, FGW_INT) != 0)
+		return -1;
+
+	return res->val.nat_int;
+}
+
+/* Call an action function directly, bypassing fungw; evaluates to an int
+   that is 0 on success */
+#define PCB_ACT_CALL_C(func, res, argc, argv) \
+	pcb_act_result(res, func(res, argc, argv))
+
+/* Require argument idx to exist and convert it to type; on success, also execute stmt */
+#define PCB_ACT_CONVARG(idx, type, aname, stmt) \
+do { \
+	if (argc <= idx) { \
+		PCB_ACT_FAIL(aname); \
+		return FGW_ERR_ARGC; \
+	} \
+	if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \
+		PCB_ACT_FAIL(aname); \
+		return FGW_ERR_ARG_CONV; \
+	} \
+	{ stmt; } \
+} while(0)
+
+/* If argument idx exists, convert it to type; on success, also execute stmt */
+#define PCB_ACT_MAY_CONVARG(idx, type, aname, stmt) \
+do { \
+	if (argc > idx) { \
+		if (fgw_arg_conv(&pcb_fgw, &argv[idx], type) != 0) { \
+			PCB_ACT_FAIL(aname); \
+			return FGW_ERR_ARG_CONV; \
+		} \
+		{ stmt; } \
+	} \
+} while(0)
+
+/* Set integer res value */
+#define PCB_ACT_IRES(v) \
+do { \
+	res->type = FGW_INT; \
+	res->val.nat_int = v; \
+} while(0)
+
+/* Set double res value */
+#define PCB_ACT_DRES(v) \
+do { \
+	res->type = FGW_DOUBLE; \
+	res->val.nat_double = v; \
+} while(0)
+
+#define PCB_ACT_FAIL(x) { pcb_message(PCB_MSG_ERROR, "Syntax error.  Usage:\n%s\n", (pcb_acts_ ## x)); return FGW_ERR_ARG_CONV; }
+
+/*** The default unit to use when a coord value doesn't have its own unit ***/
+extern char *fgw_str2coord_unit; /* saved is char * too */
+#define fgw_str2coord_unit_set(saved, newval) \
+do { \
+	saved = fgw_str2coord_unit; \
+	fgw_str2coord_unit = newval; \
+} while(0)
+
+#define fgw_str2coord_unit_restore(saved) \
+	fgw_str2coord_unit = saved
+
+#endif
Index: tags/2.0.1/src/attrib.c
===================================================================
--- tags/2.0.1/src/attrib.c	(nonexistent)
+++ tags/2.0.1/src/attrib.c	(revision 18980)
@@ -0,0 +1,178 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* attribute lists */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "config.h"
+#include "compat_misc.h"
+#include "attrib.h"
+
+#define NOTIFY(list, name, value) \
+do { \
+	if (list->post_change != NULL) \
+		list->post_change(list, name, value); \
+} while(0)
+
+char *pcb_attribute_get(pcb_attribute_list_t * list, const char *name)
+{
+	int i;
+	for (i = 0; i < list->Number; i++)
+		if (strcmp(name, list->List[i].name) == 0)
+			return list->List[i].value;
+	return NULL;
+}
+
+int pcb_attribute_put(pcb_attribute_list_t * list, const char *name, const char *value)
+{
+	int i;
+
+	if ((name == NULL) || (*name == '\0'))
+		return -1;
+
+	/* Replace an existing attribute if there is a name match. */
+	for (i = 0; i < list->Number; i++) {
+		if (strcmp(name, list->List[i].name) == 0) {
+			free(list->List[i].value);
+			list->List[i].value = pcb_strdup_null(value);
+			NOTIFY(list, list->List[i].name, list->List[i].value);
+			return 1;
+		}
+	}
+
+	/* At this point, we're going to need to add a new attribute to the
+	   list.  See if there's room.  */
+	if (list->Number >= list->Max) {
+		list->Max += 10;
+		list->List = (pcb_attribute_t *) realloc(list->List, list->Max * sizeof(pcb_attribute_t));
+	}
+
+	/* Now add the new attribute.  */
+	i = list->Number;
+	list->List[i].name = pcb_strdup_null(name);
+	list->List[i].value = pcb_strdup_null(value);
+	list->List[i].cpb_written = 1;
+	NOTIFY(list, list->List[i].name, list->List[i].value);
+	list->Number++;
+	return 0;
+}
+
+int pcb_attribute_remove_idx(pcb_attribute_list_t * list, int idx)
+{
+	int j;
+	char *old_name = list->List[idx].name, *old_value = list->List[idx].value;
+
+	for (j = idx; j < list->Number-1; j++)
+		list->List[j] = list->List[j + 1];
+	list->Number--;
+
+	NOTIFY(list, old_name, NULL);
+	free(old_name);
+	free(old_value);
+	return 0;
+}
+
+int pcb_attribute_remove(pcb_attribute_list_t * list, const char *name)
+{
+	int i, found = 0;
+	for (i = 0; i < list->Number; i++)
+		if (strcmp(name, list->List[i].name) == 0) {
+			found++;
+			pcb_attribute_remove_idx(list, i);
+		}
+	return found;
+}
+
+void pcb_attribute_free(pcb_attribute_list_t *list)
+{
+	int i;
+
+	for (i = 0; i < list->Number; i++) {
+		free(list->List[i].name);
+		free(list->List[i].value);
+	}
+	free(list->List);
+	list->List = NULL;
+	list->Max = 0;
+}
+
+void pcb_attribute_copy_all(pcb_attribute_list_t *dest, const pcb_attribute_list_t *src)
+{
+	int i;
+
+	for (i = 0; i < src->Number; i++)
+		pcb_attribute_put(dest, src->List[i].name, src->List[i].value);
+}
+
+
+void pcb_attribute_copyback_begin(pcb_attribute_list_t *dst)
+{
+	int i;
+
+	for (i = 0; i < dst->Number; i++)
+		dst->List[i].cpb_written = 0;
+}
+
+void pcb_attribute_copyback(pcb_attribute_list_t *dst, const char *name, const char *value)
+{
+	int i;
+	for (i = 0; i < dst->Number; i++) {
+		if (strcmp(name, dst->List[i].name) == 0) {
+			dst->List[i].cpb_written = 1;
+			if (strcmp(value, dst->List[i].value) != 0) {
+				free(dst->List[i].value);
+				dst->List[i].value = pcb_strdup(value);
+				NOTIFY(dst, dst->List[i].name, dst->List[i].value);
+			}
+			return;
+		}
+	}
+	pcb_attribute_put(dst, name, value);
+}
+
+void pcb_attribute_copyback_end(pcb_attribute_list_t *dst)
+{
+	int i;
+	for (i = 0; i < dst->Number; i++)
+		if (!dst->List[i].cpb_written)
+			pcb_attribute_remove_idx(dst, i);
+}
+
+
+void pcb_attrib_compat_set_intconn(pcb_attribute_list_t *dst, int intconn)
+{
+	char buff[32];
+
+	if (intconn <= 0)
+		return;
+
+	sprintf(buff, "%d", intconn & 0xFF);
+	pcb_attribute_put(dst, "intconn", buff);
+}
+
Index: tags/2.0.1/src/attrib.h
===================================================================
--- tags/2.0.1/src/attrib.h	(nonexistent)
+++ tags/2.0.1/src/attrib.h	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* attribute lists */
+
+#ifndef PCB_ATTRIB_H
+#define PCB_ATTRIB_H
+
+typedef struct pcb_attribute_list_s pcb_attribute_list_t;
+
+typedef struct pcb_attribute_s {
+	char *name;
+	char *value;
+	unsigned cpb_written:1; /* copyback: written */
+} pcb_attribute_t;
+
+struct pcb_attribute_list_s {
+	int Number, Max;
+	pcb_attribute_t *List;
+	void (*post_change)(pcb_attribute_list_t *list, const char *name, const char *value); /* called after put or remove, but not after free(); value is NULL if removed */
+};
+
+/* Returns NULL if the name isn't found, else the value for that named
+   attribute.  */
+char *pcb_attribute_get(pcb_attribute_list_t * list, const char *name);
+
+/* Adds an attribute to the list.  If the attribute already exists, the value
+   is replaced. Returns non-zero if an existing attribute was replaced.  */
+int pcb_attribute_put(pcb_attribute_list_t * list, const char *name, const char *value);
+/* Simplistic version: Takes a pointer to an object, looks up attributes in it.  */
+#define pcb_attrib_get(OBJ,name) pcb_attribute_get(&(OBJ->Attributes), name)
+/* Simplistic version: Takes a pointer to an object, sets attributes in it.  */
+#define pcb_attrib_put(OBJ,name,value) pcb_attribute_put(&(OBJ->Attributes), name, value)
+/* Remove an attribute by name; returns number of items removed  */
+int pcb_attribute_remove(pcb_attribute_list_t * list, const char *name);
+/* Simplistic version of Remove.  */
+#define pcb_attrib_remove(OBJ, name) pcb_attribute_remove(&(OBJ->Attributes), name)
+
+/* remove item by index - WARNING: no checks are made, idx has to be valid! */
+int pcb_attribute_remove_idx(pcb_attribute_list_t * list, int idx);
+
+/* Frees memory used by an attribute list */
+void pcb_attribute_free(pcb_attribute_list_t *list);
+
+/* Copy each attribute from src to dest */
+void pcb_attribute_copy_all(pcb_attribute_list_t *dest, const pcb_attribute_list_t *src);
+
+/* Copy back a mirrored attribute list, minimizing the changes */
+void pcb_attribute_copyback_begin(pcb_attribute_list_t *dst);
+void pcb_attribute_copyback(pcb_attribute_list_t *dst, const char *name, const char *value);
+void pcb_attribute_copyback_end(pcb_attribute_list_t *dst);
+
+/* Set the intconn attribute - hack for compatibility parsing */
+void pcb_attrib_compat_set_intconn(pcb_attribute_list_t *dst, int intconn);
+
+#endif
Index: tags/2.0.1/src/board.c
===================================================================
--- tags/2.0.1/src/board.c	(nonexistent)
+++ tags/2.0.1/src/board.c	(revision 18980)
@@ -0,0 +1,363 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "plug_io.h"
+#include "compat_misc.h"
+#include "actions.h"
+#include "paths.h"
+#include "rtree.h"
+#include "undo.h"
+#include "draw.h"
+#include "event.h"
+#include "safe_fs.h"
+#include "tool.h"
+#include "layer.h"
+
+
+pcb_board_t *PCB;
+
+void pcb_board_free(pcb_board_t * pcb)
+{
+	int i;
+
+	if (pcb == NULL)
+		return;
+
+	free(pcb->Name);
+	free(pcb->Filename);
+	free(pcb->PrintFilename);
+	pcb_ratspatch_destroy(pcb);
+	pcb_data_free(pcb->Data);
+	free(pcb->Data);
+
+	/* release font symbols */
+	pcb_fontkit_free(&pcb->fontkit);
+	for (i = 0; i < PCB_NUM_NETLISTS; i++)
+		pcb_lib_free(&(pcb->NetlistLib[i]));
+	vtroutestyle_uninit(&pcb->RouteStyle);
+	pcb_attribute_free(&pcb->Attributes);
+
+	pcb_layergroup_free_stack(&pcb->LayerGroups);
+
+	/* clear struct */
+	memset(pcb, 0, sizeof(pcb_board_t));
+}
+
+/* creates a new PCB */
+pcb_board_t *pcb_board_new_(pcb_bool SetDefaultNames)
+{
+	pcb_board_t *ptr;
+
+	/* allocate memory, switch all layers on and copy resources */
+	ptr = calloc(1, sizeof(pcb_board_t));
+	ptr->Data = pcb_buffer_new(ptr);
+
+	conf_set(CFR_INTERNAL, "design/poly_isle_area", -1, "200000000", POL_OVERWRITE);
+
+	ptr->RatDraw = pcb_false;
+
+	/* NOTE: we used to set all the pcb flags on ptr here, but we don't need to do that anymore due to the new conf system */
+	ptr->Grid = conf_core.editor.grid;
+
+	ptr->Zoom = conf_core.editor.zoom;
+	ptr->MaxHeight = ptr->MaxWidth = PCB_MM_TO_COORD(20); /* should be overriden by the default design */
+	ptr->ID = pcb_create_ID_get();
+	ptr->ThermScale = 0.5;
+
+	pcb_font_create_default(ptr);
+
+	return ptr;
+}
+
+#include "defpcb_internal.c"
+
+pcb_board_t *pcb_board_new(int inhibit_events)
+{
+	pcb_board_t *old, *nw = NULL;
+	int dpcb;
+	unsigned int inh = inhibit_events ? PCB_INHIBIT_BOARD_CHANGED : 0;
+
+	old = PCB;
+	PCB = NULL;
+
+	dpcb = -1;
+	pcb_io_err_inhibit_inc();
+	conf_list_foreach_path_first(dpcb, &conf_core.rc.default_pcb_file, pcb_load_pcb(__path__, NULL, pcb_false, 1 | 0x10 | inh));
+	pcb_io_err_inhibit_dec();
+
+	if (dpcb != 0) { /* no default PCB in file, use embedded version */
+		FILE *f;
+		char *efn;
+		const char *tmp_fn = ".pcb-rnd.default.pcb";
+
+		/* We can parse from file only, make a temp file */
+		f = pcb_fopen_fn(tmp_fn, "wb", &efn);
+		if (f != NULL) {
+			fwrite(default_pcb_internal, strlen(default_pcb_internal), 1, f);
+			fclose(f);
+			dpcb = pcb_load_pcb(efn, NULL, pcb_false, 1 | 0x10);
+			if (dpcb == 0)
+				pcb_message(PCB_MSG_WARNING, "Couldn't find default.pcb - using the embedded fallback\n");
+			else
+				pcb_message(PCB_MSG_ERROR, "Couldn't find default.pcb and failed to load the embedded fallback\n");
+			pcb_remove(efn);
+			free(efn);
+		}
+	}
+
+	if (dpcb == 0) {
+		nw = PCB;
+		if (nw->Filename != NULL) {
+			/* make sure the new PCB doesn't inherit the name and loader of the default pcb */
+			free(nw->Filename);
+			nw->Filename = NULL;
+			nw->Data->loader = NULL;
+		}
+	}
+
+	pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+
+	PCB = old;
+	return nw;
+}
+
+int pcb_board_new_postproc(pcb_board_t *pcb, int use_defaults)
+{
+	int n;
+
+	/* copy default settings */
+	pcb_layer_colors_from_conf(pcb, 0);
+
+	for(n = 0; n < PCB_MAX_BUFFER; n++) {
+		if (pcb_buffers[n].Data != NULL) {
+			pcb_data_unbind_layers(pcb_buffers[n].Data);
+			pcb_data_binding_update(pcb, pcb_buffers[n].Data);
+		}
+	}
+
+	return 0;
+}
+
+void pcb_layer_colors_from_conf(pcb_board_t *ptr, int force)
+{
+	int i;
+
+	/* copy default settings */
+	for (i = 0; i < PCB_MAX_LAYER; i++)
+		if (force || (ptr->Data->Layer[i].meta.real.color == NULL) || (ptr->Data->Layer[i].meta.real.color[0] == '\0')) {
+			free(ptr->Data->Layer[i].meta.real.color);
+			ptr->Data->Layer[i].meta.real.color = pcb_strdup(pcb_layer_default_color(i, pcb_layer_flags(ptr, i)));
+		}
+}
+
+typedef struct {
+	int nplated;
+	int nunplated;
+} HoleCountStruct;
+
+#warning padstack TODO: move this to obj_pstk.c after pinvia removal
+#include "obj_pstk_inlines.h"
+static pcb_r_dir_t hole_counting_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	HoleCountStruct *hcs = (HoleCountStruct *)cl;
+
+	if ((proto != NULL) && (proto->hdia > 0)) {
+		if (proto->hplated)
+			hcs->nplated++;
+		else
+			hcs->nunplated++;
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+void pcb_board_count_holes(pcb_board_t *pcb, int *plated, int *unplated, const pcb_box_t *within_area)
+{
+	HoleCountStruct hcs = { 0, 0 };
+
+	pcb_r_search(pcb->Data->padstack_tree, within_area, NULL, hole_counting_callback, &hcs, NULL);
+
+	if (plated != NULL)
+		*plated = hcs.nplated;
+	if (unplated != NULL)
+		*unplated = hcs.nunplated;
+}
+
+const char *pcb_board_get_filename(void)
+{
+	return PCB->Filename;
+}
+
+const char *pcb_board_get_name(void)
+{
+	return PCB->Name;
+}
+
+pcb_bool pcb_board_change_name(char *Name)
+{
+	free(PCB->Name);
+	PCB->Name = Name;
+	pcb_board_changed(0);
+	return pcb_true;
+}
+
+void pcb_board_resize(pcb_coord_t Width, pcb_coord_t Height)
+{
+	PCB->MaxWidth = Width;
+	PCB->MaxHeight = Height;
+
+	/* crosshair range is different if pastebuffer-mode
+	 * is enabled
+	 */
+	if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER)
+		pcb_crosshair_set_range(PCB_PASTEBUFFER->X - PCB_PASTEBUFFER->BoundingBox.X1,
+											PCB_PASTEBUFFER->Y - PCB_PASTEBUFFER->BoundingBox.Y1,
+											MAX(0,
+													Width - (PCB_PASTEBUFFER->BoundingBox.X2 -
+																	 PCB_PASTEBUFFER->X)), MAX(0, Height - (PCB_PASTEBUFFER->BoundingBox.Y2 - PCB_PASTEBUFFER->Y)));
+	else
+		pcb_crosshair_set_range(0, 0, Width, Height);
+
+	pcb_board_changed(0);
+}
+
+void pcb_board_remove(pcb_board_t *Ptr)
+{
+	pcb_undo_clear_list(pcb_true);
+	pcb_board_free(Ptr);
+	free(Ptr);
+}
+
+/* sets cursor grid with respect to grid offset values */
+void pcb_board_set_grid(pcb_coord_t Grid, pcb_bool align, pcb_coord_t ox, pcb_coord_t oy)
+{
+	if (Grid >= 1 && Grid <= PCB_MAX_GRID) {
+		if (align) {
+			PCB->GridOffsetX = ox % Grid;
+			PCB->GridOffsetY = oy % Grid;
+		}
+		PCB->Grid = Grid;
+		conf_set_design("editor/grid", "%$mS", Grid);
+		if (conf_core.editor.draw_grid)
+			pcb_redraw();
+	}
+}
+
+void pcb_board_set_unit(pcb_board_t *pcb, const pcb_unit_t *new_unit)
+{
+	if (new_unit != NULL && new_unit->allow != PCB_UNIT_NO_PRINT) {
+		conf_set(CFR_DESIGN, "editor/grid_unit", -1, new_unit->suffix, POL_OVERWRITE);
+		pcb_attrib_put(pcb, "PCB::grid::unit", new_unit->suffix);
+	}
+}
+
+/* sets a new line thickness */
+void pcb_board_set_line_width(pcb_coord_t Size)
+{
+	if (Size >= PCB_MIN_LINESIZE && Size <= PCB_MAX_LINESIZE) {
+		conf_set_design("design/line_thickness", "%$mS", Size);
+		if (conf_core.editor.auto_drc)
+			pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y);
+	}
+}
+
+/* sets a new via thickness */
+void pcb_board_set_via_size(pcb_coord_t Size, pcb_bool Force)
+{
+	if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIASIZE && Size >= conf_core.design.via_drilling_hole + PCB_MIN_PINORVIACOPPER)) {
+		conf_set_design("design/via_thickness", "%$mS", Size);
+	}
+}
+
+/* sets a new via drilling hole */
+void pcb_board_set_via_drilling_hole(pcb_coord_t Size, pcb_bool Force)
+{
+	if (Force || (Size <= PCB_MAX_PINORVIASIZE && Size >= PCB_MIN_PINORVIAHOLE && Size <= conf_core.design.via_thickness - PCB_MIN_PINORVIACOPPER)) {
+		conf_set_design("design/via_drilling_hole", "%$mS", Size);
+	}
+}
+
+/* sets a clearance width */
+void pcb_board_set_clearance(pcb_coord_t Width)
+{
+	if (Width <= PCB_MAX_LINESIZE) {
+		conf_set_design("design/clearance", "%$mS", Width);
+	}
+}
+
+/* sets a text scaling */
+void pcb_board_set_text_scale(int Scale)
+{
+	if (Scale <= PCB_MAX_TEXTSCALE && Scale >= PCB_MIN_TEXTSCALE) {
+		conf_set_design("design/text_scale", "%d", Scale);
+	}
+}
+
+/* sets or resets changed flag and redraws status */
+void pcb_board_set_changed_flag(pcb_bool New)
+{
+	pcb_bool old = PCB->Changed;
+
+	PCB->Changed = New;
+
+	if (old != New)
+		pcb_event(PCB_EVENT_BOARD_META_CHANGED, NULL);
+}
+
+
+void pcb_board_changed(int reverted)
+{
+	pcb_event(PCB_EVENT_BOARD_CHANGED, "i", reverted);
+}
+
+int pcb_board_normalize(pcb_board_t *pcb)
+{
+	pcb_box_t b;
+	int chg = 0;
+	
+	if (pcb_data_bbox(&b, pcb->Data, pcb_false) == NULL)
+		return -1;
+
+	if ((b.X2 - b.X1) > pcb->MaxWidth) {
+		pcb->MaxWidth = b.X2 - b.X1;
+		chg++;
+	}
+
+	if ((b.Y2 - b.Y1) > pcb->MaxHeight) {
+		pcb->MaxHeight = b.Y2 - b.Y1;
+		chg++;
+	}
+
+	chg += pcb_data_normalize_(pcb->Data, &b);
+
+	return chg;
+}
Index: tags/2.0.1/src/board.h
===================================================================
--- tags/2.0.1/src/board.h	(nonexistent)
+++ tags/2.0.1/src/board.h	(revision 18980)
@@ -0,0 +1,183 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* definition of types */
+#ifndef PCB_BOARD_H
+#define PCB_BOARD_H
+
+#include "config.h"
+
+enum {
+	PCB_NETLIST_INPUT  = 0,  /* index of the original netlist as imported */
+	PCB_NETLIST_EDITED = 1,  /* index of the netlist produced by applying netlist patches on [PCB_NETLIST_INPUT] */
+	PCB_NUM_NETLISTS         /* so that we know how many netlists we are dealing with */
+};
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <math.h>
+#include <ctype.h>
+
+#include "global_typedefs.h"
+#include "vtroutestyle.h"
+#include "layer.h"
+#include "layer_grp.h"
+#include "library.h"
+#include "attrib.h"
+#include "rats_patch.h"
+#include "font.h"
+
+	/* The pcb_board_t struct holds information about board layout most of which is
+	   |  saved with the layout.  A new PCB layout struct is first initialized
+	   |  with values from the user configurable Settings struct and then reset
+	   |  to the saved layout values when a layout is loaded.
+	   |  This struct is also used for the remove list and for buffer handling
+	 */
+struct pcb_board_s {
+	long ID;
+	char *Name;                                     /* name of board */
+	char *Filename;                                 /* name of file (from load) */
+	char *PrintFilename;                            /* from print dialog */
+	char *Netlistname;                              /* name of netlist file */
+
+	pcb_bool Changed;                               /* layout has been changed */
+
+	pcb_bool pstk_on, RatOn, InvisibleObjectsOn,
+	         SubcOn, SubcPartsOn,
+	         padstack_mark_on, hole_on;             /* visibility flags */
+	pcb_bool RatDraw;                               /* we're drawing rats */
+
+	pcb_bool loose_subc;                            /* when set, subc parts are not locked into the subc */
+	pcb_coord_t Zoom, CursorX, CursorY;             /* cursor position as saved with layout */
+	pcb_coord_t Grid, GridOffsetX, GridOffsetY;     /* as saved with layout */
+	pcb_coord_t MaxWidth, MaxHeight;                /* board dimensions (drawing area extents) */
+
+	double ThermScale;                              /* scale factor used with thermals */
+
+	pcb_fontkit_t fontkit;
+	pcb_layer_stack_t LayerGroups;
+	vtroutestyle_t RouteStyle;
+	pcb_lib_t NetlistLib[PCB_NUM_NETLISTS];
+	pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast;
+	pcb_attribute_list_t Attributes;
+
+	pcb_data_t *Data;                               /* entire database */
+	pcb_bool is_footprint;                          /* If set, the user has loaded a footprint, not a pcb. */
+
+	const pcb_attribute_list_t *pen_attr;
+
+/* netlist states */
+	int netlist_frozen;                             /* counter */
+	unsigned netlist_needs_update:1;
+};
+
+extern pcb_board_t *PCB; /* the board being edited */
+
+/* free memory used by a board */
+void pcb_board_free(pcb_board_t *pcb);
+
+/* creates a new PCB - low level */
+pcb_board_t *pcb_board_new_(pcb_bool SetDefaultNames);
+
+/* creates a new PCB - high level (uses a template board); does not generate
+   new board event if inhibit_events is set */
+pcb_board_t *pcb_board_new(int inhibit_events);
+
+/* Called after PCB->Data->LayerN is set.  Returns non-zero on error */
+int pcb_board_new_postproc(pcb_board_t *pcb, int use_defaults);
+
+/* Set the color field of each layer that does not yet have an explicit
+   color, from the config, using default colors per layer type. If
+   force is non-zero, overwrite even existing colors. */
+void pcb_layer_colors_from_conf(pcb_board_t *pcb, int force);
+
+/* counts the number of plated and unplated holes in the design within
+   a given area of the board. To count for the whole board, pass NULL
+   within_area. */
+void pcb_board_count_holes(pcb_board_t *pcb, int *plated, int *unplated, const pcb_box_t * within_area);
+
+#define	PCB_SWAP_X(x)		(PCB_SWAP_SIGN_X(x))
+#define	PCB_SWAP_Y(y)		(PCB->MaxHeight +PCB_SWAP_SIGN_Y(y))
+
+#define	PCB_CSWAP_X(x, w, cond)		((cond) ? (PCB_SWAP_SIGN_X(x)) : (x))
+#define	PCB_CSWAP_Y(y, h, cond)		((cond) ? (h+PCB_SWAP_SIGN_Y(y)) : (y))
+
+/* Conditionally allow subc parts to be reached directly in search masks */
+#define PCB_LOOSE_SUBC (PCB->loose_subc ? PCB_OBJ_SUBC_PART : 0)
+
+
+/* changes the name of a layout; Name is allocated by the caller (no strdup() is made) */
+pcb_bool pcb_board_change_name(char *Name);
+
+/* changes the maximum size of a layout, notifies the GUI
+ * and adjusts the cursor confinement box */
+void pcb_board_resize(pcb_coord_t Width, pcb_coord_t Height);
+
+
+/* free the board and remove its undo list */
+void pcb_board_remove(pcb_board_t *Ptr);
+
+/* sets cursor grid with respect to grid offset values or default unit*/
+void pcb_board_set_grid(pcb_coord_t Grid, pcb_bool align, pcb_coord_t ox, pcb_coord_t oy);
+void pcb_board_set_unit(pcb_board_t *pcb, const pcb_unit_t *new_unit);
+
+
+/* sets a new line thickness */
+void pcb_board_set_line_width(pcb_coord_t Size);
+
+/* sets a new via thickness */
+void pcb_board_set_via_size(pcb_coord_t Size, pcb_bool Force);
+
+/* sets a new via drilling hole */
+void pcb_board_set_via_drilling_hole(pcb_coord_t Size, pcb_bool Force);
+
+/* sets a clearance width */
+void pcb_board_set_clearance(pcb_coord_t Width);
+
+/* sets a text scaling */
+void pcb_board_set_text_scale(int Scale);
+
+/* make sure the data of the board fits the PCB (move it out from negative,
+   make the board large enough); returns -1 on error, the number of changes on success */
+int pcb_board_normalize(pcb_board_t *pcb);
+
+/* sets or resets changed flag and redraws status */
+void pcb_board_set_changed_flag(pcb_bool New);
+
+/* Shorthand for emitting a board changed event (PCB_EVENT_BOARD_CHANGED) */
+void pcb_board_changed(int reverted);
+
+
+/* pcb_board_t field accessors - do not use; required for path.[ch] to not depend on board.h */
+const char *pcb_board_get_filename(void);
+const char *pcb_board_get_name(void);
+
+#endif
Index: tags/2.0.1/src/box.c
===================================================================
--- tags/2.0.1/src/box.c	(nonexistent)
+++ tags/2.0.1/src/box.c	(revision 18980)
@@ -0,0 +1,52 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include "rotate.h"
+#include "box.h"
+
+void pcb_set_point_bounding_box(pcb_point_t *Pnt)
+{
+	Pnt->X2 = Pnt->X + 1;
+	Pnt->Y2 = Pnt->Y + 1;
+}
+
+void pcb_box_rotate90(pcb_box_t *Box, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	pcb_coord_t x1 = Box->X1, y1 = Box->Y1, x2 = Box->X2, y2 = Box->Y2;
+
+	PCB_COORD_ROTATE90(x1, y1, X, Y, Number);
+	PCB_COORD_ROTATE90(x2, y2, X, Y, Number);
+	Box->X1 = MIN(x1, x2);
+	Box->Y1 = MIN(y1, y2);
+	Box->X2 = MAX(x1, x2);
+	Box->Y2 = MAX(y1, y2);
+}
Index: tags/2.0.1/src/box.h
===================================================================
--- tags/2.0.1/src/box.h	(nonexistent)
+++ tags/2.0.1/src/box.h	(revision 18980)
@@ -0,0 +1,259 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, box.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+
+/* random box-related utilities. */
+
+#ifndef PCB_BOX_H
+#define PCB_BOX_H
+
+#include <assert.h>
+#include "math_helper.h"
+#include "global_typedefs.h"
+#include "config.h"
+#include "move.h"
+#include "obj_common.h"
+
+struct pcb_box_list_s {
+	pcb_cardinal_t BoxN,								/* the number of boxes contained */
+	  BoxMax;											/* max boxes from malloc */
+	pcb_box_t *Box;
+};
+
+#include "misc_util.h"
+
+typedef enum {
+	PCB_NORTH = 0, PCB_EAST = 1, PCB_SOUTH = 2, PCB_WEST = 3,
+	PCB_NE = 4, PCB_SE = 5, PCB_SW = 6, PCB_NW = 7,
+	PCB_ANY_DIR = 8
+} pcb_direction_t;
+
+/* rotates box 90-degrees cw */
+/* that's a strange rotation! */
+#define PCB_BOX_ROTATE_CW(box) { pcb_coord_t t;\
+    t = (box).X1; (box).X1 = -(box).Y2; (box).Y2 = (box).X2;\
+    (box).X2 = -(box).Y1; (box).Y1 = t;\
+}
+#define PCB_BOX_ROTATE_TO_NORTH(box, dir) do { pcb_coord_t t;\
+  switch(dir) {\
+  case PCB_EAST: \
+   t = (box).X1; (box).X1 = (box).Y1; (box).Y1 = -(box).X2;\
+   (box).X2 = (box).Y2; (box).Y2 = -t; break;\
+  case PCB_SOUTH: \
+   t = (box).X1; (box).X1 = -(box).X2; (box).X2 = -t;\
+   t = (box).Y1; (box).Y1 = -(box).Y2; (box).Y2 = -t; break;\
+  case PCB_WEST: \
+   t = (box).X1; (box).X1 = -(box).Y2; (box).Y2 = (box).X2;\
+   (box).X2 = -(box).Y1; (box).Y1 = t; break;\
+  case PCB_NORTH: break;\
+  default: assert(0);\
+  }\
+  } while (0)
+#define PCB_BOX_ROTATE_FROM_NORTH(box, dir) do { pcb_coord_t t;\
+  switch(dir) {\
+  case PCB_WEST: \
+   t = (box).X1; (box).X1 = (box).Y1; (box).Y1 = -(box).X2;\
+   (box).X2 = (box).Y2; (box).Y2 = -t; break;\
+  case PCB_SOUTH: \
+   t = (box).X1; (box).X1 = -(box).X2; (box).X2 = -t;\
+   t = (box).Y1; (box).Y1 = -(box).Y2; (box).Y2 = -t; break;\
+  case PCB_EAST: \
+   t = (box).X1; (box).X1 = -(box).Y2; (box).Y2 = (box).X2;\
+   (box).X2 = -(box).Y1; (box).Y1 = t; break;\
+  case PCB_NORTH: break;\
+  default: assert(0);\
+  }\
+  } while (0)
+
+/* to avoid overflow, we calculate centers this way */
+#define PCB_BOX_CENTER_X(b) ((b).X1 + ((b).X2 - (b).X1)/2)
+#define PCB_BOX_CENTER_Y(b) ((b).Y1 + ((b).Y2 - (b).Y1)/2)
+
+#define	PCB_BOX_MOVE_LOWLEVEL(b,dx,dy)		\
+	{									\
+		PCB_MOVE((b)->X1,(b)->Y1,(dx),(dy))	\
+		PCB_MOVE((b)->X2,(b)->Y2,(dx),(dy))	\
+	}
+
+
+typedef struct pcb_cheap_point_s {
+	pcb_coord_t X, Y;
+} pcb_cheap_point_t;
+
+
+/* note that boxes are closed on top and left and open on bottom and right. */
+/* this means that top-left corner is in box, *but bottom-right corner is
+ * not*.  */
+PCB_INLINE pcb_bool pcb_point_in_box(const pcb_box_t * box, pcb_coord_t X, pcb_coord_t Y) 
+{
+	return (X >= box->X1) && (Y >= box->Y1) && (X < box->X2) && (Y < box->Y2);
+}
+
+PCB_INLINE pcb_bool pcb_point_in_closed_box(const pcb_box_t * box, pcb_coord_t X, pcb_coord_t Y)
+{
+	return (X >= box->X1) && (Y >= box->Y1) && (X <= box->X2) && (Y <= box->Y2);
+}
+
+PCB_INLINE pcb_bool pcb_box_is_good(const pcb_box_t * b)
+{
+	return (b->X1 < b->X2) && (b->Y1 < b->Y2);
+}
+
+PCB_INLINE pcb_bool pcb_box_intersect(const pcb_box_t * a, const pcb_box_t * b)
+{
+	return (a->X1 < b->X2) && (b->X1 < a->X2) && (a->Y1 < b->Y2) && (b->Y1 < a->Y2);
+}
+
+PCB_INLINE pcb_cheap_point_t pcb_closest_pcb_point_in_box(const pcb_cheap_point_t * from, const pcb_box_t * box)
+{
+	pcb_cheap_point_t r;
+	assert(box->X1 < box->X2 && box->Y1 < box->Y2);
+	r.X = (from->X < box->X1) ? box->X1 : (from->X > box->X2 - 1) ? box->X2 - 1 : from->X;
+	r.Y = (from->Y < box->Y1) ? box->Y1 : (from->Y > box->Y2 - 1) ? box->Y2 - 1 : from->Y;
+	assert(pcb_point_in_box(box, r.X, r.Y));
+	return r;
+}
+
+PCB_INLINE pcb_bool pcb_box_in_box(const pcb_box_t * outer, const pcb_box_t * inner)
+{
+	return (outer->X1 <= inner->X1) && (inner->X2 <= outer->X2) && (outer->Y1 <= inner->Y1) && (inner->Y2 <= outer->Y2);
+}
+
+PCB_INLINE pcb_box_t pcb_clip_box(const pcb_box_t * box, const pcb_box_t * clipbox)
+{
+	pcb_box_t r;
+	assert(pcb_box_intersect(box, clipbox));
+	r.X1 = MAX(box->X1, clipbox->X1);
+	r.X2 = MIN(box->X2, clipbox->X2);
+	r.Y1 = MAX(box->Y1, clipbox->Y1);
+	r.Y2 = MIN(box->Y2, clipbox->Y2);
+	assert(pcb_box_in_box(clipbox, &r));
+	return r;
+}
+
+PCB_INLINE pcb_box_t pcb_shrink_box(const pcb_box_t * box, pcb_coord_t amount)
+{
+	pcb_box_t r = *box;
+	r.X1 += amount;
+	r.Y1 += amount;
+	r.X2 -= amount;
+	r.Y2 -= amount;
+	return r;
+}
+
+PCB_INLINE pcb_box_t pcb_bloat_box(const pcb_box_t * box, pcb_coord_t amount)
+{
+	return pcb_shrink_box(box, -amount);
+}
+
+/* construct a minimum box that touches the input box at the center */
+PCB_INLINE pcb_box_t pcb_box_center(const pcb_box_t * box)
+{
+	pcb_box_t r;
+	r.X1 = box->X1 + (box->X2 - box->X1) / 2;
+	r.X2 = r.X1 + 1;
+	r.Y1 = box->Y1 + (box->Y2 - box->Y1) / 2;
+	r.Y2 = r.Y1 + 1;
+	return r;
+}
+
+/* construct a minimum box that touches the input box at the corner */
+PCB_INLINE pcb_box_t pcb_box_corner(const pcb_box_t * box)
+{
+	pcb_box_t r;
+	r.X1 = box->X1;
+	r.X2 = r.X1 + 1;
+	r.Y1 = box->Y1;
+	r.Y2 = r.Y1 + 1;
+	return r;
+}
+
+/* construct a box that holds a single point */
+PCB_INLINE pcb_box_t pcb_point_box(pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_box_t r;
+	r.X1 = X;
+	r.X2 = X + 1;
+	r.Y1 = Y;
+	r.Y2 = Y + 1;
+	return r;
+}
+
+/* close a bounding box by pushing its upper right corner */
+PCB_INLINE void pcb_close_box(pcb_box_t * r)
+{
+	r->X2++;
+	r->Y2++;
+}
+
+/* return the square of the minimum distance from a point to some point
+ * inside a box.  The box is half-closed!  That is, the top-left corner
+ * is considered in the box, but the bottom-right corner is not. */
+PCB_INLINE double pcb_dist2_to_box(const pcb_cheap_point_t * p, const pcb_box_t * b)
+{
+	pcb_cheap_point_t r = pcb_closest_pcb_point_in_box(p, b);
+	return pcb_distance(r.X, r.Y, p->X, p->Y);
+}
+
+
+/* Modify dst to include src */
+PCB_INLINE void pcb_box_bump_box(pcb_box_t *dst, const pcb_box_t *src)
+{
+	if (src->X1 < dst->X1) dst->X1 = src->X1;
+	if (src->Y1 < dst->Y1) dst->Y1 = src->Y1;
+	if (src->X2 > dst->X2) dst->X2 = src->X2;
+	if (src->Y2 > dst->Y2) dst->Y2 = src->Y2;
+}
+
+/* Modify dst to include src */
+PCB_INLINE void pcb_box_bump_point(pcb_box_t *dst, pcb_coord_t x, pcb_coord_t y)
+{
+	if (x < dst->X1) dst->X1 = x;
+	if (y < dst->Y1) dst->Y1 = y;
+	if (x > dst->X2) dst->X2 = x;
+	if (y > dst->Y2) dst->Y2 = y;
+}
+
+/* sets the bounding box of a point */
+void pcb_set_point_bounding_box(pcb_point_t *Pnt);
+
+/* rotates a box in 90 degree steps */
+void pcb_box_rotate90(pcb_box_t *Box, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+
+#endif /* __BOX_H_INCLUDED__ */
Index: tags/2.0.1/src/brave.c
===================================================================
--- tags/2.0.1/src/brave.c	(nonexistent)
+++ tags/2.0.1/src/brave.c	(revision 18980)
@@ -0,0 +1,289 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, diag, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <genvector/gds_char.h>
+
+#include "brave.h"
+#include "actions.h"
+#include "conf_core.h"
+#include "conf_hid.h"
+#include "compat_misc.h"
+#include "error.h"
+#include "hid_dad.h"
+
+pcb_brave_t pcb_brave = 0;
+static const char brave_cookie[] = "brave";
+static conf_hid_id_t brave_conf_id;
+
+typedef struct {
+	pcb_brave_t bit;
+	const char *name, *shrt, *lng;
+	int widget;
+} desc_t;
+
+static desc_t desc[] = {
+	{0, NULL, NULL, NULL}
+};
+
+static desc_t *find_by_name(const char *name)
+{
+	desc_t *d;
+	for(d = desc; d->name != NULL; d++)
+		if (pcb_strcasecmp(name, d->name) == 0)
+			return d;
+	return NULL;
+}
+
+/* convert the brave bits into a config string, save in CLI */
+static void set_conf(pcb_brave_t br)
+{
+	gds_t tmp;
+	desc_t *d;
+
+	gds_init(&tmp);
+
+	for(d = desc; d->name != NULL; d++) {
+		if (br & d->bit) {
+			gds_append_str(&tmp, d->name);
+			gds_append(&tmp, ',');
+		}
+	}
+
+	/* truncate last comma */
+	gds_truncate(&tmp, gds_len(&tmp)-1);
+
+	conf_set(CFR_CLI, "rc/brave", 0, tmp.array, POL_OVERWRITE);
+
+	gds_uninit(&tmp);
+}
+
+/* Upon a change in the config, parse the new config string and set the brave bits */
+static void brave_conf_chg(conf_native_t *cfg, int arr_idx)
+{
+	char *curr, *next, old;
+	desc_t *d;
+
+	pcb_brave = 0;
+	if ((conf_core.rc.brave == NULL) || (*conf_core.rc.brave == '\0'))
+		return;
+	for(curr = (char *)conf_core.rc.brave; *curr != '\0'; curr = next) {
+		next = strpbrk(curr, ", ");
+		if (next == NULL)
+			next = curr + strlen(curr);
+		old = *next;
+		*next = '\0';
+		d = find_by_name(curr);
+
+		if (d != NULL)
+			pcb_brave |= d->bit;
+		*next = old;
+		next++;
+		while((*next == ',') || (*next == ' ')) next++;
+	}
+}
+
+/* Set one bit; if changed, update the config */
+static void brave_set(pcb_brave_t bit, int on)
+{
+	int state = pcb_brave & bit;
+	pcb_brave_t nb;
+
+	if (state == on)
+		return;
+
+	if (on)
+		nb = pcb_brave | bit;
+	else
+		nb = pcb_brave & ~bit;
+
+	set_conf(nb);
+}
+
+/*** interactive mode (DAD dialog) ***/
+
+/* Convert the current brave bits into dialog box widget states, update the dialog */
+static void brave2dlg(void *hid_ctx)
+{
+	desc_t *d;
+	int len;
+
+	for(d = desc, len=0; d->name != NULL; d++,len++) {
+		if (pcb_brave & d->bit)
+			PCB_DAD_SET_VALUE(hid_ctx, d->widget, int_value, 1);
+		else
+			PCB_DAD_SET_VALUE(hid_ctx, d->widget, int_value, 0);
+	}
+}
+
+/* Convert the current state of dialog box widget into brave bits, update the conf */
+static void dlg2brave(pcb_hid_attribute_t *attrs)
+{
+	desc_t *d;
+	for(d = desc; d->name != NULL; d++)
+		brave_set(d->bit, attrs[d->widget].default_val.int_value);
+}
+
+/* If a checkbox changes, do the conversion forth and back to ensure sync */
+static void brave_dialog_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	dlg2brave(caller_data);
+	brave2dlg(hid_ctx);
+}
+
+/* Tick in all - button callback */
+static void brave_dialog_allon(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	desc_t *d;
+	for(d = desc; d->name != NULL; d++)
+		brave_set(d->bit, 1);
+	brave2dlg(hid_ctx);
+}
+
+/* Tick off all - button callback  */
+static void brave_dialog_alloff(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	desc_t *d;
+	for(d = desc; d->name != NULL; d++)
+		brave_set(d->bit, 0);
+	brave2dlg(hid_ctx);
+}
+
+/* Copy the config from CLI to USER and flush the file */
+static void brave_dialog_save(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	conf_set(CFR_USER, "rc/brave", 0, conf_core.rc.brave, POL_OVERWRITE);
+	if (conf_isdirty(CFR_USER))
+		conf_save_file(NULL, NULL, CFR_USER, NULL);
+}
+
+static int brave_interact(void)
+{
+	desc_t *d;
+	int len;
+
+	PCB_DAD_DECL(dlg);
+
+	PCB_DAD_BEGIN_VBOX(dlg);
+	PCB_DAD_LABEL(dlg, "Experimental features for the brave");
+
+	PCB_DAD_BEGIN_TABLE(dlg, 3);
+		for(d = desc, len=0; d->name != NULL; d++,len++) {
+			PCB_DAD_LABEL(dlg, d->name);
+				PCB_DAD_HELP(dlg, d->lng);
+			PCB_DAD_BOOL(dlg, "");
+				d->widget = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_CHANGE_CB(dlg, brave_dialog_chg);
+				PCB_DAD_HELP(dlg, d->lng);
+			PCB_DAD_LABEL(dlg, d->shrt);
+				PCB_DAD_HELP(dlg, d->lng);
+		}
+		if (len != 0) {
+			PCB_DAD_BUTTON(dlg, "all ON");
+				PCB_DAD_HELP(dlg, "Tick in all boxes\nenabling all experimental features\n(Super Brave Mode)");
+				PCB_DAD_CHANGE_CB(dlg, brave_dialog_allon);
+			PCB_DAD_BUTTON(dlg, "all OFF");
+				PCB_DAD_HELP(dlg, "Tick off all boxes\ndisabling all experimental features\n(Safe Mode)");
+				PCB_DAD_CHANGE_CB(dlg, brave_dialog_alloff);
+			PCB_DAD_BUTTON(dlg, "save in user cfg");
+				PCB_DAD_HELP(dlg, "Save current brave state in the \nuser configuration file");
+				PCB_DAD_CHANGE_CB(dlg, brave_dialog_save);
+		}
+	PCB_DAD_END(dlg);
+
+	if (len == 0)
+		PCB_DAD_LABEL(dlg, "(There are no brave features at the moment)");
+	PCB_DAD_END(dlg);
+
+
+	PCB_DAD_NEW(dlg, "dlg_padstack_edit", "Edit padstack", dlg, pcb_true, NULL);
+	brave2dlg(dlg_hid_ctx);
+	PCB_DAD_RUN(dlg);
+
+	PCB_DAD_FREE(dlg);
+	return 0;
+}
+
+/*** action ***/
+
+static const char pcb_acts_Brave[] =
+	"Brave()\n"
+	"Brave(setting, on|off)\n";
+static const char pcb_acth_Brave[] = "Changes brave settings.";
+static fgw_error_t pcb_act_Brave(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	desc_t *d;
+	const char *name, *op;
+	if (argc <= 1) {
+		PCB_ACT_IRES(brave_interact());
+		return 0;
+	}
+
+	/* look up */
+	PCB_ACT_CONVARG(1, FGW_STR, Brave, name = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, Brave, op = argv[2].val.str);
+	d = find_by_name(name);
+	if (d == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Unknown brave setting: %s\n", name);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	brave_set(d->bit, (pcb_strcasecmp(op, "on") == 0));
+
+	pcb_message(PCB_MSG_INFO, "Brave setting: %s in %s\n", name, (pcb_brave & d->bit) ? "on" : "off");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t brave_action_list[] = {
+	{"Brave", pcb_act_Brave, pcb_acth_Brave, pcb_acts_Brave}
+};
+
+PCB_REGISTER_ACTIONS(brave_action_list, NULL)
+
+
+void pcb_brave_init(void)
+{
+	conf_native_t *n = conf_get_field("rc/brave");
+	brave_conf_id = conf_hid_reg(brave_cookie, NULL);
+
+	if (n != NULL) {
+		static conf_hid_callbacks_t cbs;
+		memset(&cbs, 0, sizeof(conf_hid_callbacks_t));
+		cbs.val_change_post = brave_conf_chg;
+		conf_hid_set_cb(n, brave_conf_id, &cbs);
+	}
+}
+
+void pcb_brave_uninit(void)
+{
+	conf_hid_unreg(brave_cookie);
+}
Index: tags/2.0.1/src/brave.h
===================================================================
--- tags/2.0.1/src/brave.h	(nonexistent)
+++ tags/2.0.1/src/brave.h	(revision 18980)
@@ -0,0 +1,12 @@
+#ifndef PCB_BRAVE_H
+#define PCB_BRAVE_H
+typedef enum {
+	PCB_BRAVE_OFF = 0,
+	PCB_BRACE_max
+} pcb_brave_t;
+
+extern pcb_brave_t pcb_brave; /* cache generated from the config */
+
+void pcb_brave_init(void);
+void pcb_brave_uninit(void);
+#endif
Index: tags/2.0.1/src/buffer.c
===================================================================
--- tags/2.0.1/src/buffer.c	(nonexistent)
+++ tags/2.0.1/src/buffer.c	(revision 18980)
@@ -0,0 +1,975 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* functions used by paste- and move/copy buffer
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "buffer.h"
+#include "board.h"
+#include "copy.h"
+#include "data.h"
+#include "plug_io.h"
+#include "polygon.h"
+#include "rotate.h"
+#include "remove.h"
+#include "select.h"
+#include "draw.h"
+#include "undo.h"
+#include "funchash_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_text_op.h"
+#include "obj_subc_op.h"
+#include "obj_poly_op.h"
+#include "obj_pstk_op.h"
+#include "obj_rat_op.h"
+#include "obj_pstk.h"
+#include "layer_grp.h"
+#include "event.h"
+#include "safe_fs.h"
+#include "actions.h"
+
+static pcb_opfunc_t AddBufferFunctions = {
+	pcb_lineop_add_to_buffer,
+	pcb_textop_add_to_buffer,
+	pcb_polyop_add_to_buffer,
+	NULL,
+	NULL,
+	pcb_arcop_add_to_buffer,
+	pcb_ratop_add_to_buffer,
+	NULL,
+	pcb_subcop_add_to_buffer,
+	pcb_pstkop_add_to_buffer,
+};
+
+static pcb_opfunc_t MoveBufferFunctions = {
+	pcb_lineop_move_buffer,
+	pcb_textop_move_buffer,
+	pcb_polyop_move_buffer,
+	NULL,
+	NULL,
+	pcb_arcop_move_buffer,
+	pcb_ratop_move_buffer,
+	NULL,
+	pcb_subcop_move_buffer,
+	pcb_pstkop_move_buffer,
+};
+
+int pcb_set_buffer_bbox(pcb_buffer_t *Buffer)
+{
+	pcb_box_t tmp, *box;
+	int res = 0;
+	
+	box = pcb_data_bbox(&tmp, Buffer->Data, pcb_false);
+	if (box)
+		Buffer->BoundingBox = *box;
+	else
+		res = -1;
+
+	box = pcb_data_bbox_naked(&tmp, Buffer->Data, pcb_false);
+	if (box)
+		Buffer->bbox_naked = *box;
+	else
+		res = -1;
+
+	return res;
+}
+
+static void pcb_buffer_clear_(pcb_board_t *pcb, pcb_buffer_t *Buffer, pcb_bool bind)
+{
+	if (Buffer && Buffer->Data) {
+		void *old_parent = Buffer->Data->parent.any;
+		pcb_parenttype_t old_pt = Buffer->Data->parent_type;
+
+		pcb_data_free(Buffer->Data);
+
+		Buffer->Data->parent.any = old_parent;
+		Buffer->Data->parent_type = old_pt;
+		if ((pcb != NULL) && (bind))
+			pcb_data_bind_board_layers(pcb, Buffer->Data, 0);
+	}
+	Buffer->from_outside = 0;
+}
+
+void pcb_buffer_clear(pcb_board_t *pcb, pcb_buffer_t *Buffer)
+{
+	pcb_buffer_clear_(pcb, Buffer, pcb_true);
+}
+
+/* add (or move) selected */
+static void pcb_buffer_toss_selected(pcb_opfunc_t *fnc, pcb_board_t *pcb, pcb_buffer_t *Buffer, pcb_coord_t X, pcb_coord_t Y, pcb_bool LeaveSelected)
+{
+	pcb_opctx_t ctx;
+
+	ctx.buffer.pcb = pcb;
+
+	/* switch crosshair off because adding objects to the pastebuffer
+	 * may change the 'valid' area for the cursor
+	 */
+	if (!LeaveSelected)
+		ctx.buffer.extraflg = PCB_FLAG_SELECTED;
+	else
+		ctx.buffer.extraflg =  0;
+
+	pcb_notify_crosshair_change(pcb_false);
+	ctx.buffer.src = pcb->Data;
+	ctx.buffer.dst = Buffer->Data;
+	pcb_selected_operation(pcb, pcb->Data, fnc, &ctx, pcb_false, PCB_OBJ_ANY & (~PCB_OBJ_SUBC_PART), pcb_true);
+
+	/* set origin to passed or current position */
+	if (X || Y) {
+		Buffer->X = X;
+		Buffer->Y = Y;
+	}
+	else {
+		Buffer->X = pcb_crosshair.X;
+		Buffer->Y = pcb_crosshair.Y;
+	}
+	Buffer->from_outside = 0;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_buffer_add_selected(pcb_board_t *pcb, pcb_buffer_t *Buffer, pcb_coord_t X, pcb_coord_t Y, pcb_bool LeaveSelected)
+{
+	pcb_buffer_toss_selected(&AddBufferFunctions, pcb, Buffer, X, Y, LeaveSelected);
+}
+
+/*---------------------------------------------------------------------------*/
+
+static const char pcb_acts_LoadFootprint[] = "pcb_load_footprint(filename[,refdes,value])";
+
+static const char pcb_acth_LoadFootprint[] = "Loads a single footprint by name.";
+
+/* %start-doc actions LoadFootprint
+
+Loads a single footprint by name, rather than by reference or through
+the library.  If a refdes and value are specified, those are inserted
+into the footprint as well.  The footprint remains in the paste buffer.
+
+%end-doc */
+
+fgw_error_t pcb_act_LoadFootprint(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *name, *refdes = NULL, *value = NULL;
+	pcb_subc_t *s;
+	pcb_cardinal_t len;
+
+	
+	PCB_ACT_CONVARG(1, FGW_STR, LoadFootprint, name = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadFootprint, refdes = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFootprint, value = argv[3].val.str);
+
+	if (!pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, NULL)) {
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	len = pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc);
+
+	if (len == 0) {
+		pcb_message(PCB_MSG_ERROR, "Footprint %s contains no subcircuits", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	if (len > 1) {
+		pcb_message(PCB_MSG_ERROR, "Footprint %s contains multiple subcircuits", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	s = pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc);
+	pcb_attribute_put(&s->Attributes, "refdes", refdes);
+	pcb_attribute_put(&s->Attributes, "footprint", name);
+	pcb_attribute_put(&s->Attributes, "value", value);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_bool pcb_buffer_load_layout(pcb_board_t *pcb, pcb_buffer_t *Buffer, const char *Filename, const char *fmt)
+{
+	pcb_board_t *newPCB = pcb_board_new_(pcb_false);
+
+	/* new data isn't added to the undo list */
+	if (!pcb_parse_pcb(newPCB, Filename, fmt, CFR_invalid, 0)) {
+		/* clear data area and replace pointer */
+		pcb_buffer_clear(pcb, Buffer);
+		free(Buffer->Data);
+		Buffer->Data = newPCB->Data;
+		newPCB->Data = NULL;
+		Buffer->X = newPCB->CursorX;
+		Buffer->Y = newPCB->CursorY;
+		PCB_CLEAR_PARENT(Buffer->Data);
+		pcb_data_make_layers_bound(newPCB, Buffer->Data);
+		pcb_data_binding_update(pcb, Buffer->Data);
+		pcb_board_remove(newPCB);
+		Buffer->from_outside = 1;
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); /* undo the events generated on load */
+		return pcb_true;
+	}
+
+	/* release unused memory */
+	pcb_board_remove(newPCB);
+	if (Buffer->Data != NULL)
+		PCB_CLEAR_PARENT(Buffer->Data);
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); /* undo the events generated on load */
+	Buffer->from_outside = 0;
+	return pcb_false;
+}
+
+void pcb_buffer_rotate90(pcb_buffer_t *Buffer, pcb_uint8_t Number)
+{
+	pcb_undo_freeze_serial();
+	pcb_undo_freeze_add();
+
+	PCB_PADSTACK_LOOP(Buffer->Data);
+	{
+		pcb_pstk_rotate90(padstack, Buffer->X, Buffer->Y, Number);
+	}
+	PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(Buffer->Data);
+	{
+		pcb_obj_rotate90(PCB_OBJ_SUBC, subc, subc, subc, Buffer->X, Buffer->Y, Number);
+	}
+	PCB_END_LOOP;
+
+	/* all layer related objects */
+	PCB_LINE_ALL_LOOP(Buffer->Data);
+	{
+		if (layer->line_tree != NULL)
+			pcb_r_delete_entry(layer->line_tree, (pcb_box_t *) line);
+		pcb_line_rotate90(line, Buffer->X, Buffer->Y, Number);
+		if (layer->line_tree != NULL)
+			pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) line);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(Buffer->Data);
+	{
+		if (layer->arc_tree != NULL)
+			pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *) arc);
+		pcb_arc_rotate90(arc, Buffer->X, Buffer->Y, Number);
+		if (layer->arc_tree != NULL)
+			pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *) arc);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(Buffer->Data);
+	{
+		if (layer->text_tree != NULL)
+			pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text);
+		pcb_text_rotate90(text, Buffer->X, Buffer->Y, Number);
+		if (layer->text_tree != NULL)
+			pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(Buffer->Data);
+	{
+		if (layer->polygon_tree != NULL)
+			pcb_r_delete_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+		pcb_poly_rotate90(polygon, Buffer->X, Buffer->Y, Number);
+		if (layer->polygon_tree != NULL)
+			pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+	}
+	PCB_ENDALL_LOOP;
+
+	/* finally the origin and the bounding box */
+	PCB_COORD_ROTATE90(Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number);
+	pcb_box_rotate90(&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number);
+
+	pcb_undo_unfreeze_add();
+	pcb_undo_unfreeze_serial();
+}
+
+void pcb_buffer_rotate(pcb_buffer_t *Buffer, pcb_angle_t angle)
+{
+	double cosa, sina;
+
+	pcb_undo_freeze_serial();
+	pcb_undo_freeze_add();
+
+	cosa = cos(angle * M_PI / 180.0);
+	sina = sin(angle * M_PI / 180.0);
+
+	PCB_PADSTACK_LOOP(Buffer->Data);
+	{
+		pcb_pstk_rotate(padstack, Buffer->X, Buffer->Y, cosa, sina, angle);
+	}
+	PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(Buffer->Data);
+	{
+		pcb_subc_rotate(subc, Buffer->X, Buffer->Y, cosa, sina, angle);
+	}
+	PCB_END_LOOP;
+
+	/* all layer related objects */
+	PCB_LINE_ALL_LOOP(Buffer->Data);
+	{
+		pcb_line_rotate(layer, line, Buffer->X, Buffer->Y, cosa, sina);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(Buffer->Data);
+	{
+		pcb_arc_rotate(layer, arc, Buffer->X, Buffer->Y, cosa, sina, angle);
+	}
+	PCB_ENDALL_LOOP;
+	/* FIXME: rotate text */
+	PCB_POLY_ALL_LOOP(Buffer->Data);
+	{
+		pcb_poly_rotate(layer, polygon, Buffer->X, Buffer->Y, cosa, sina);
+	}
+	PCB_ENDALL_LOOP;
+
+	pcb_set_buffer_bbox(Buffer);
+	pcb_undo_unfreeze_add();
+	pcb_undo_unfreeze_serial();
+}
+
+pcb_data_t *pcb_buffer_new(pcb_board_t *pcb)
+{
+	return pcb_data_new(pcb);
+}
+
+
+/* -------------------------------------------------------------------------- */
+
+static const char pcb_acts_FreeRotateBuffer[] = "FreeRotateBuffer([Angle])";
+
+static const char pcb_acth_FreeRotateBuffer[] =
+	"Rotates the current paste buffer contents by the specified angle.  The\n"
+	"angle is given in degrees.  If no angle is given, the user is prompted\n" "for one.\n";
+
+/* %start-doc actions FreeRotateBuffer
+
+Rotates the contents of the pastebuffer by an arbitrary angle.  If no
+angle is given, the user is prompted for one.
+
+%end-doc */
+
+fgw_error_t pcb_act_FreeRotateBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *angle_s = NULL;
+	double ang;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, FreeRotateBuffer, angle_s = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	if (angle_s == NULL)
+		angle_s = pcb_gui->prompt_for("Enter Rotation (degrees, CCW):", "0");
+
+	if ((angle_s == NULL) || (*angle_s == '\0')) {
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	PCB_ACT_IRES(0);
+	ang = strtod(angle_s, 0);
+	if (ang == 0)
+		return 0;
+
+	if ((ang < -360000) || (ang > +360000)) {
+		pcb_message(PCB_MSG_ERROR, "Angle too large\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_buffer_rotate(PCB_PASTEBUFFER, ang);
+	pcb_notify_crosshair_change(pcb_true);
+	return 0;
+}
+
+void pcb_init_buffers(pcb_board_t *pcb)
+{
+	int i;
+
+	for (i = 0; i < PCB_MAX_BUFFER; i++)
+		pcb_buffers[i].Data = pcb_buffer_new(NULL);
+}
+
+void pcb_uninit_buffers(pcb_board_t *pcb)
+{
+	int i;
+
+	for (i = 0; i < PCB_MAX_BUFFER; i++) {
+		pcb_buffer_clear_(pcb, pcb_buffers+i, pcb_false);
+		free(pcb_buffers[i].Data);
+	}
+}
+
+void pcb_buffer_mirror(pcb_board_t *pcb, pcb_buffer_t *Buffer)
+{
+	int i, num_layers;
+
+	num_layers = PCB_PASTEBUFFER->Data->LayerN;
+	if (num_layers == 0) /* some buffers don't have layers, just simple objects */
+		num_layers = pcb->Data->LayerN;
+
+	for (i = 0; i < num_layers; i++) {
+		pcb_layer_t *layer = Buffer->Data->Layer + i;
+		if (textlist_length(&layer->Text)) {
+			pcb_message(PCB_MSG_ERROR, _("You can't mirror a buffer that has text!\n"));
+			return;
+		}
+	}
+	/* set buffer offset to 'mark' position */
+	Buffer->X = PCB_SWAP_X(Buffer->X);
+	Buffer->Y = PCB_SWAP_Y(Buffer->Y);
+	pcb_data_mirror(Buffer->Data, 0, PCB_TXM_COORD, pcb_false);
+	pcb_set_buffer_bbox(Buffer);
+}
+
+void pcb_buffer_flip_side(pcb_board_t *pcb, pcb_buffer_t *Buffer)
+{
+	int j, k;
+	pcb_layer_id_t SLayer = -1, CLayer = -1;
+	pcb_layergrp_id_t sgroup, cgroup;
+	pcb_layer_t swap;
+
+#if 0
+/* this results in saving flipped (bottom-side) footprints whenlooking at the board from the bottom */
+	PCB_SUBC_LOOP(Buffer->Data);
+	{
+		pcb_subc_change_side(&subc, /*2 * pcb_crosshair.Y - PCB->MaxHeight*/0);
+	}
+	PCB_END_LOOP;
+#endif
+
+	/* set buffer offset to 'mark' position */
+	Buffer->X = PCB_SWAP_X(Buffer->X);
+	Buffer->Y = PCB_SWAP_Y(Buffer->Y);
+
+	PCB_PADSTACK_LOOP(Buffer->Data);
+	{
+		pcb_pstk_mirror(padstack, PCB_PSTK_DONT_MIRROR_COORDS, 1, 0);
+	}
+	PCB_END_LOOP;
+	PCB_LINE_ALL_LOOP(Buffer->Data);
+	{
+		pcb_line_flip_side(layer, line);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(Buffer->Data);
+	{
+		pcb_arc_flip_side(layer, arc);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(Buffer->Data);
+	{
+		pcb_poly_flip_side(layer, polygon);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(Buffer->Data);
+	{
+		pcb_text_flip_side(layer, text, 0);
+	}
+	PCB_ENDALL_LOOP;
+
+	/* swap silkscreen layers */
+	pcb_layer_list(pcb, PCB_LYT_BOTTOM | PCB_LYT_SILK, &SLayer, 1);
+	pcb_layer_list(pcb, PCB_LYT_TOP | PCB_LYT_SILK, &CLayer, 1);
+	assert(SLayer != -1);
+	assert(CLayer != -1);
+	swap = Buffer->Data->Layer[SLayer];
+	Buffer->Data->Layer[SLayer] = Buffer->Data->Layer[CLayer];
+	Buffer->Data->Layer[CLayer] = swap;
+
+	/* swap layer groups when balanced */
+	sgroup = pcb_layer_get_group(pcb, SLayer);
+	cgroup = pcb_layer_get_group(pcb, CLayer);
+#warning layer TODO: revise this code for the generic physical layer support; move this code to layer*.c
+	if (pcb->LayerGroups.grp[cgroup].len == pcb->LayerGroups.grp[sgroup].len) {
+		for (j = k = 0; j < pcb->LayerGroups.grp[sgroup].len; j++) {
+			pcb_layer_id_t cnumber = pcb->LayerGroups.grp[cgroup].lid[k];
+			pcb_layer_id_t snumber = pcb->LayerGroups.grp[sgroup].lid[j];
+
+			if ((pcb_layer_flags(pcb, snumber)) & PCB_LYT_SILK)
+				continue;
+			swap = Buffer->Data->Layer[snumber];
+
+			while ((pcb_layer_flags(pcb, cnumber)) & PCB_LYT_SILK) {
+				k++;
+				cnumber = pcb->LayerGroups.grp[cgroup].lid[k];
+			}
+			Buffer->Data->Layer[snumber] = Buffer->Data->Layer[cnumber];
+			Buffer->Data->Layer[cnumber] = swap;
+			k++;
+		}
+	}
+	pcb_set_buffer_bbox(Buffer);
+}
+
+void pcb_buffers_flip_side(pcb_board_t *pcb)
+{
+	int i;
+
+	for (i = 0; i < PCB_MAX_BUFFER; i++)
+		pcb_buffer_flip_side(pcb, &pcb_buffers[i]);
+	pcb_crosshair_range_to_buffer();
+}
+
+void *pcb_move_obj_to_buffer(pcb_board_t *pcb, pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	/* setup local identifiers used by move operations */
+	ctx.buffer.pcb = pcb;
+	ctx.buffer.dst = Destination;
+	ctx.buffer.src = Src;
+	return (pcb_object_operation(&MoveBufferFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3));
+}
+
+void *pcb_copy_obj_to_buffer(pcb_board_t *pcb, pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.buffer.pcb = pcb;
+	ctx.buffer.dst = Destination;
+	ctx.buffer.src = Src;
+	return (pcb_object_operation(&AddBufferFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3));
+}
+
+pcb_bool pcb_buffer_copy_to_layout(pcb_board_t *pcb, pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_cardinal_t i;
+	pcb_bool changed = pcb_false;
+	pcb_opctx_t ctx;
+	int num_layers;
+
+#ifdef DEBUG
+	printf("Entering CopyPastebufferToLayout.....\n");
+#endif
+
+	pcb_data_clip_inhibit_inc(pcb->Data);
+
+	/* set movement vector */
+	ctx.copy.pcb = pcb;
+	ctx.copy.DeltaX = X - PCB_PASTEBUFFER->X;
+	ctx.copy.DeltaY = Y - PCB_PASTEBUFFER->Y;
+	ctx.copy.from_outside = PCB_PASTEBUFFER->from_outside;
+
+	/* paste all layers */
+	num_layers = PCB_PASTEBUFFER->Data->LayerN;
+	if (num_layers != 0) /* some buffers don't have layers, just global objects */
+	for (i = 0; i < num_layers; i++) {
+		pcb_layer_t *sourcelayer = &PCB_PASTEBUFFER->Data->Layer[i];
+		pcb_layer_t *destlayer = pcb_layer_resolve_binding(pcb, sourcelayer);
+
+		if (destlayer == NULL) {
+			if ((!(sourcelayer->meta.bound.type & PCB_LYT_VIRTUAL)) && (!pcb_layer_is_pure_empty(sourcelayer))) {
+				const char *src_name = sourcelayer->name;
+				if ((src_name == NULL) || (*src_name == '\0'))
+					src_name = "<anonymous>";
+				pcb_message(PCB_MSG_WARNING, "Couldn't resolve buffer layer #%d (%s) on the current board\n", i, src_name);
+			}
+			continue;
+		}
+
+		destlayer = pcb_loose_subc_layer(PCB, destlayer);
+
+		if (destlayer->meta.real.vis) {
+			PCB_LINE_LOOP(sourcelayer);
+			{
+				if (pcb_lineop_copy(&ctx, destlayer, line))
+					changed = 1;
+			}
+			PCB_END_LOOP;
+			PCB_ARC_LOOP(sourcelayer);
+			{
+				if (pcb_arcop_copy(&ctx, destlayer, arc))
+					changed = 1;
+			}
+			PCB_END_LOOP;
+			PCB_TEXT_LOOP(sourcelayer);
+			{
+				if (pcb_textop_copy(&ctx, destlayer, text))
+					changed = 1;
+			}
+			PCB_END_LOOP;
+			PCB_POLY_LOOP(sourcelayer);
+			{
+				if (pcb_polyop_copy(&ctx, destlayer, polygon))
+					changed = 1;
+			}
+			PCB_END_LOOP;
+		}
+	}
+
+	/* paste subcircuits */
+	PCB_SUBC_LOOP(PCB_PASTEBUFFER->Data);
+	{
+		if (pcb->is_footprint) {
+			pcb_message(PCB_MSG_WARNING, "Can not paste subcircuit in the footprint edit mode\n");
+			break;
+		}
+		pcb_subcop_copy(&ctx, subc);
+		changed = pcb_true;
+	}
+	PCB_END_LOOP;
+
+	/* finally: padstacks */
+	if (pcb->pstk_on) {
+		pcb_board_t dummy;
+		changed |= (padstacklist_length(&(PCB_PASTEBUFFER->Data->padstack)) != 0);
+
+		/* set up a dummy board to work around that pcb_pstkop_copy() requires a
+		   pcb_board_t instead of a pcb_data_t */
+#warning subc TODO: fix this after the element removal
+		if (pcb->is_footprint) {
+			pcb_subc_t *sc = pcb_subclist_first(&pcb->Data->subc);
+			if (sc != NULL) {
+				ctx.copy.pcb = &dummy;
+				memset(&dummy, 0, sizeof(dummy));
+				dummy.Data = sc->data;
+			}
+		}
+
+		PCB_PADSTACK_LOOP(PCB_PASTEBUFFER->Data);
+		{
+			pcb_pstkop_copy(&ctx, padstack);
+		}
+		PCB_END_LOOP;
+	}
+
+	if (changed) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+
+#ifdef DEBUG
+	printf("  .... Leaving CopyPastebufferToLayout.\n");
+#endif
+
+	pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+
+	return changed;
+}
+
+void pcb_buffer_set_number(int Number)
+{
+	if (Number >= 0 && Number < PCB_MAX_BUFFER) {
+		conf_set_design("editor/buffer_number", "%d", Number);
+
+		/* do an update on the crosshair range */
+		pcb_crosshair_range_to_buffer();
+	}
+}
+
+/* loads footprint data from file/library into buffer (as subcircuit)
+ * returns pcb_false on error
+ * if successful, update some other stuff and reposition the pastebuffer */
+pcb_bool pcb_buffer_load_footprint(pcb_buffer_t *Buffer, const char *Name, const char *fmt)
+{
+	pcb_buffer_clear(PCB, Buffer);
+	if (!pcb_parse_footprint(Buffer->Data, Name, fmt)) {
+		if (conf_core.editor.show_solder_side)
+			pcb_buffer_flip_side(PCB, Buffer);
+		pcb_set_buffer_bbox(Buffer);
+
+		Buffer->X = 0;
+		Buffer->Y = 0;
+		Buffer->from_outside = 1;
+
+		if (pcb_subclist_length(&Buffer->Data->subc)) {
+			pcb_subc_t *subc = pcb_subclist_first(&Buffer->Data->subc);
+			pcb_subc_get_origin(subc, &Buffer->X, &Buffer->Y);
+		}
+		return pcb_true;
+	}
+
+	/* release memory which might have been acquired */
+	pcb_buffer_clear(PCB, Buffer);
+	return pcb_false;
+}
+
+
+/* ---------------------------------------------------------------------- */
+
+static const char pcb_acts_PasteBuffer[] =
+	"PasteBuffer(AddSelected|Clear|1..PCB_MAX_BUFFER)\n"
+	"PasteBuffer(Rotate, 1..3)\n"
+	"PasteBuffer(Convert|Restore|Mirror)\n"
+	"PasteBuffer(ToLayout, X, Y, units)\n"
+	"PasteBuffer(ToLayout, crosshair)\n"
+	"PasteBuffer(Save, Filename, [format], [force])\n"
+	"PasteBuffer(Push)\n"
+	"PasteBuffer(Pop)\n"
+	;
+
+static const char pcb_acth_PasteBuffer[] = "Various operations on the paste buffer.";
+
+/* %start-doc actions PasteBuffer
+
+There are a number of paste buffers; the actual limit is a
+compile-time constant @code{PCB_MAX_BUFFER} in @file{globalconst.h}.  It
+is currently @code{5}.  One of these is the ``current'' paste buffer,
+often referred to as ``the'' paste buffer.
+
+@table @code
+
+@item AddSelected
+Copies the selected objects to the current paste buffer.
+
+@item Clear
+Remove all objects from the current paste buffer.
+
+@item Convert
+Convert the current paste buffer to an subcircuit.
+
+@item Restore
+Convert any subcircuit in the paste buffer back to plain objects.
+
+@item Mirror
+Flip all objects in the paste buffer vertically (up/down flip).  To mirror
+horizontally, combine this with rotations.
+
+@item Rotate
+Rotates the current buffer.  The number to pass is 1..3, where 1 means
+90 degrees counter clockwise, 2 means 180 degrees, and 3 means 90
+degrees clockwise (270 CCW).
+
+@item Normalize
+Set the buffer origin to the center of the paste buffer bounding box.
+This is useful especially if an import plugin loaded objects in the buffer
+with a large offset.
+
+@item Save
+Saves any elements in the current buffer to the indicated file. If
+format is specified, try to use that file format, else use the default.
+If force is specified, overwrite target, don't ask.
+
+@item ToLayout
+Pastes objects in the current buffer to the indicated X, Y
+coordinates in the layout.  The @code{X} and @code{Y} are treated like
+@code{delta} is for many other objects.  For each, if it's prefixed by
+@code{+} or @code{-}, then that amount is relative to the last
+location.  Otherwise, it's absolute.  Units can be
+@code{mil} or @code{mm}; if unspecified, units are PCB's internal
+units, currently 1/100 mil. If "crosshair" is used instead of coordinates,
+the paste happens at the current crosshair coords.
+
+
+@item 1..PCB_MAX_BUFFER
+Selects the given buffer to be the current paste buffer.
+
+@end table
+
+%end-doc */
+static fgw_error_t pcb_act_PasteBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op, force;
+	const char *sbufnum = "", *fmt = NULL, *forces = NULL, *name, *tmp;
+	static char *default_file = NULL;
+	pcb_bool free_name = pcb_false;
+	static int stack[32];
+	static int sp = 0;
+	int number;
+
+	PCB_ACT_CONVARG(1, FGW_STR, PasteBuffer, tmp = argv[1].val.str);
+	number = atoi(tmp);
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, PasteBuffer, op = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, PasteBuffer, sbufnum = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, PasteBuffer, fmt = argv[3].val.str);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, PasteBuffer, forces = argv[4].val.str);
+
+	force = (forces != NULL) && ((*forces == '1') || (*forces == 'y') || (*forces == 'Y'));
+
+	pcb_notify_crosshair_change(pcb_false);
+	switch (op) {
+			/* clear contents of paste buffer */
+		case F_Clear:
+			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+			break;
+
+		case F_Push:
+			if (sp < sizeof(stack) / sizeof(stack[0]))
+				stack[sp++] = conf_core.editor.buffer_number;
+			else
+				pcb_message(PCB_MSG_ERROR, "Paste buffer stack overflow on push.\n");
+			break;
+
+		case F_Pop:
+			if (sp > 0)
+				pcb_buffer_set_number(stack[--sp]);
+			else
+				pcb_message(PCB_MSG_ERROR, "Paste buffer stack underflow on pop.\n");
+			break;
+
+			/* copies objects to paste buffer */
+		case F_AddSelected:
+			pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, 0, 0, pcb_false);
+			if (pcb_data_is_empty(PCB_PASTEBUFFER->Data)) {
+				pcb_message(PCB_MSG_WARNING, "Nothing buffer-movable is selected, nothing copied to the paste buffer\n");
+				goto error;
+			}
+			break;
+
+			/* moves objects to paste buffer: kept for compatibility with old menu files */
+		case F_MoveSelected:
+			pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, 0, 0, pcb_false);
+			if (pcb_data_is_empty(PCB_PASTEBUFFER->Data)) {
+				pcb_message(PCB_MSG_WARNING, "Nothing buffer-movable is selected, nothing moved to the paste buffer\n");
+				goto error;
+			}
+			pcb_actionl("RemoveSelected", NULL);
+			break;
+
+			/* converts buffer contents into a subcircuit */
+		case F_Convert:
+		case F_ConvertSubc:
+			pcb_subc_convert_from_buffer(PCB_PASTEBUFFER);
+			break;
+
+			/* break up subcircuit for editing */
+		case F_Restore:
+			if (!pcb_subc_smash_buffer(PCB_PASTEBUFFER))
+				pcb_message(PCB_MSG_ERROR, _("Error!  Buffer doesn't contain a single subcircuit\n"));
+			break;
+
+			/* Mirror buffer */
+		case F_Mirror:
+			pcb_buffer_mirror(PCB, PCB_PASTEBUFFER);
+			break;
+
+		case F_Rotate:
+			if (sbufnum) {
+				pcb_buffer_rotate90(PCB_PASTEBUFFER, (pcb_uint8_t) atoi(sbufnum));
+				pcb_crosshair_range_to_buffer();
+			}
+			break;
+
+		case F_Save:
+			free_name = pcb_false;
+			if (argc <= 1) {
+				name = pcb_gui->fileselect(_("Save Paste Buffer As ..."),
+															 _("Choose a file to save the contents of the\n"
+																 "paste buffer to.\n"), default_file, ".fp", "footprint", 0);
+
+				if (default_file) {
+					free(default_file);
+					default_file = NULL;
+				}
+				if (name && *name) {
+					default_file = pcb_strdup(name);
+				}
+				free_name = pcb_true;
+			}
+
+			else
+				name = sbufnum;
+
+			{
+				FILE *exist;
+
+				if ((!force) && ((exist = pcb_fopen(name, "r")))) {
+					fclose(exist);
+					if (pcb_gui->confirm_dialog(_("File exists!  Ok to overwrite?"), 0))
+						pcb_save_buffer_elements(name, fmt);
+				}
+				else
+					pcb_save_buffer_elements(name, fmt);
+
+				if (free_name && name)
+					free((char*)name);
+			}
+			break;
+
+		case F_ToLayout:
+			{
+				static pcb_coord_t oldx = 0, oldy = 0;
+				pcb_coord_t x, y;
+				pcb_bool absolute;
+				if (argc == 2) {
+					x = y = 0;
+				}
+				else if (strcmp(sbufnum, "crosshair") == 0) {
+					x = pcb_crosshair.X;
+					y = pcb_crosshair.Y;
+				}
+				else if (argc == 4 || argc == 5) {
+					x = pcb_get_value(sbufnum, forces, &absolute, NULL);
+					if (!absolute)
+						x += oldx;
+					y = pcb_get_value(fmt, forces, &absolute, NULL);
+					if (!absolute)
+						y += oldy;
+				}
+
+				else {
+					pcb_notify_crosshair_change(pcb_true);
+					PCB_ACT_FAIL(PasteBuffer);
+				}
+
+				oldx = x;
+				oldy = y;
+				if (pcb_buffer_copy_to_layout(PCB, x, y))
+					pcb_board_set_changed_flag(pcb_true);
+			}
+			break;
+
+		case F_Normalize:
+			pcb_set_buffer_bbox(PCB_PASTEBUFFER);
+			PCB_PASTEBUFFER->X = pcb_round(((double)PCB_PASTEBUFFER->BoundingBox.X1 + (double)PCB_PASTEBUFFER->BoundingBox.X2) / 2.0);
+			PCB_PASTEBUFFER->Y = pcb_round(((double)PCB_PASTEBUFFER->BoundingBox.Y1 + (double)PCB_PASTEBUFFER->BoundingBox.Y2) / 2.0);
+			pcb_crosshair_range_to_buffer();
+			break;
+
+			/* set number */
+		default:
+			{
+				
+
+				/* correct number */
+				if (number)
+					pcb_buffer_set_number(number - 1);
+			}
+	}
+
+	pcb_notify_crosshair_change(pcb_true);
+	PCB_ACT_IRES(0);
+	return 0;
+
+	error:;
+	pcb_notify_crosshair_change(pcb_true);
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+pcb_action_t buffer_action_list[] = {
+	{"FreeRotateBuffer", pcb_act_FreeRotateBuffer, pcb_acth_FreeRotateBuffer, pcb_acts_FreeRotateBuffer},
+	{"LoadFootprint", pcb_act_LoadFootprint, pcb_acth_LoadFootprint, pcb_acts_LoadFootprint},
+	{"PasteBuffer", pcb_act_PasteBuffer, pcb_acth_PasteBuffer, pcb_acts_PasteBuffer}
+};
+
+PCB_REGISTER_ACTIONS(buffer_action_list, NULL)
Index: tags/2.0.1/src/buffer.h
===================================================================
--- tags/2.0.1/src/buffer.h	(nonexistent)
+++ tags/2.0.1/src/buffer.h	(revision 18980)
@@ -0,0 +1,104 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Board independent paste buffers */
+
+#ifndef PCB_BUFFER_H
+#define PCB_BUFFER_H
+
+#include "obj_common.h"
+#include <libfungw/fungw.h>
+
+struct pcb_buffer_s {								/* information about the paste buffer */
+	pcb_coord_t X, Y;										/* offset */
+	pcb_box_t BoundingBox;
+	pcb_box_t bbox_naked;
+	pcb_data_t *Data;							/* data; not all members of pcb_board_t */
+	int from_outside; /* data is coming from outside of the current board (lib, loaded board) */
+	/* are used */
+};
+
+/* Recalculates the bounding box of the buffer; returns 0 on success */
+int pcb_set_buffer_bbox(pcb_buffer_t *);
+
+/* clears the contents of the paste buffer: free's data, but preserves parent */
+void pcb_buffer_clear(pcb_board_t *pcb, pcb_buffer_t *Buffer);
+
+/* adds (copies) all selected and visible objects to the paste buffer */
+void pcb_buffer_add_selected(pcb_board_t *pcb, pcb_buffer_t *, pcb_coord_t, pcb_coord_t, pcb_bool);
+
+/* load a board into buffer parse the file with enabled 'PCB mode' */
+pcb_bool pcb_buffer_load_layout(pcb_board_t *pcb, pcb_buffer_t *Buffer, const char *Filename, const char *fmt);
+
+/* rotates the contents of the pastebuffer by Number * 90 degrees or free angle*/
+void pcb_buffer_rotate90(pcb_buffer_t *Buffer, pcb_uint8_t Number);
+void pcb_buffer_rotate(pcb_buffer_t *Buffer, pcb_angle_t angle);
+
+/* flip elements/subcircuits/tracks from one side to the other; also swap
+   the layer stackup of padstacks */
+void pcb_buffers_flip_side(pcb_board_t *pcb);
+
+/* graphically mirror the buffer on the current side */
+void pcb_buffer_mirror(pcb_board_t *pcb, pcb_buffer_t *Buffer);
+
+/* Init/uninit all buffers (stored in board-independent global variables) */
+void pcb_init_buffers(pcb_board_t *pcb);
+void pcb_uninit_buffers(pcb_board_t *pcb);
+
+/* Creates a new empty paste buffer */
+pcb_data_t *pcb_buffer_new(pcb_board_t *pcb);
+
+/* Moves the passed object to the passed buffer's data and removes it from its
+   original data; returns the new object pointer on success or NULL on fail */
+void *pcb_move_obj_to_buffer(pcb_board_t *pcb, pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+/* Adds/copies the passed object to the passed buffer's data;
+   returns the new object pointer on success or NULL on fail */
+void *pcb_copy_obj_to_buffer(pcb_board_t *pcb, pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+
+/* This action is called from ActionElementAddIf() */
+fgw_error_t pcb_act_LoadFootprint(fgw_arg_t *res, int oargc, fgw_arg_t *oargv);
+
+/* pastes the contents of the buffer to the layout. Only visible objects
+   are handled by the routine. */
+pcb_bool pcb_buffer_copy_to_layout(pcb_board_t *pcb, pcb_coord_t X, pcb_coord_t Y);
+
+/* change the side of all objects in the buffer */
+void pcb_buffer_flip_side(pcb_board_t *pcb, pcb_buffer_t *Buffer);
+
+/* Load a footprint by name into a buffer; fmt is optional (may be NULL). */
+pcb_bool pcb_buffer_load_footprint(pcb_buffer_t *Buffer, const char *Name, const char *fmt);
+
+/* sets currently active buffer */
+void pcb_buffer_set_number(int Number);
+
+/* Address of the currently active paste buffer */
+#define PCB_PASTEBUFFER (&pcb_buffers[conf_core.editor.buffer_number])
+
+#endif
Index: tags/2.0.1/src/build_run.c
===================================================================
--- tags/2.0.1/src/build_run.c	(nonexistent)
+++ tags/2.0.1/src/build_run.c	(revision 18980)
@@ -0,0 +1,384 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017,2018 Alain Vigne
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <signal.h>
+#include <genht/hash.h>
+#include <genvector/gds_char.h>
+#include "conf_core.h"
+#include "board.h"
+#include "build_run.h"
+#include "hid_init.h"
+#include "plug_io.h"
+#include "compat_misc.h"
+
+extern void pcb_main_uninit(void);
+
+void pcb_quit_app(void)
+{
+	/* save data if necessary.  It not needed, then don't trigger EmergencySave
+	 * via our atexit() registering of pcb_emergency_save().  We presumably wanted to
+	 * exit here and thus it is not an emergency. */
+	if (PCB->Changed && conf_core.editor.save_in_tmp)
+		pcb_emergency_save();
+	else
+		pcb_disable_emergency_save();
+
+	if (pcb_gui->do_exit == NULL) {
+		pcb_main_uninit();
+		exit(0);
+	}
+	else
+		pcb_gui->do_exit(pcb_gui);
+}
+
+char *pcb_get_info_program(void)
+{
+	static gds_t info;
+	static int first_time = 1;
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+		gds_append_str(&info, "This is pcb-rnd " PCB_VERSION " (" PCB_REVISION ")" "\n an interactive ");
+		gds_append_str(&info, "printed circuit board editor\n");
+	}
+	return info.array;
+}
+
+char *pcb_get_info_copyright(void)
+{
+	static gds_t info;
+	static int first_time = 1;
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+
+		gds_append_str(&info, "Recent pcb-rnd copyright:\n");
+		gds_append_str(&info, "Copyright (C) Tibor Palinkas 2013..2018 (pcb-rnd)\n");
+		gds_append_str(&info, "For a more complete list of pcb-rnd authors and\ncontributors, see http://repo.hu/cgi-bin/pcb-rnd-people.cgi\n\n");
+
+		gds_append_str(&info, "Historical copyright:\n");
+		gds_append_str(&info, "pcb-rnd was originally forked from gEDA/PCB:\n");
+		gds_append_str(&info, "Copyright (C) Thomas Nau 1994..1997\n");
+		gds_append_str(&info, "Copyright (C) harry eaton 1998..2007\n");
+		gds_append_str(&info, "Copyright (C) C. Scott Ananian 2001\n");
+		gds_append_str(&info, "Copyright (C) DJ Delorie 2003..2008\n");
+		gds_append_str(&info, "Copyright (C) Dan McMahill 2003..2008\n\n");
+	}
+	return info.array;
+}
+
+char *pcb_get_info_websites(const char **url_out)
+{
+	static gds_t info;
+	static int first_time = 1;
+	static const char *URL = "http://pcb-rnd.repo.hu\n";
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+
+		gds_append_str(&info, "For more information see:\n");
+		gds_append_str(&info, URL);
+	}
+
+	if (url_out != NULL)
+		*url_out = URL;
+
+	return info.array;
+}
+
+char *pcb_get_info_comments(void)
+{
+	static gds_t info;
+	static int first_time = 1;
+	char *tmp;
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+
+		tmp = pcb_get_info_program();
+		gds_append_str(&info, tmp);
+		tmp = pcb_get_info_websites(NULL);
+		gds_append_str(&info, tmp);
+	}
+	return info.array;
+}
+
+
+char *pcb_get_info_compile_options(void)
+{
+	pcb_hid_t **hids;
+	int i;
+	static gds_t info;
+	static int first_time = 1;
+
+#define TAB "    "
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+
+		gds_append_str(&info, "----- Run Time Options -----\n");
+		gds_append_str(&info, "GUI: ");
+		if (pcb_gui != NULL) {
+			gds_append_str(&info, pcb_gui->name);
+			gds_append_str(&info, "\n");
+		}
+		else
+			gds_append_str(&info, "none\n");
+
+		gds_append_str(&info, "\n----- Compile Time Options -----\n");
+		hids = pcb_hid_enumerate();
+		gds_append_str(&info, "GUI:\n");
+		for (i = 0; hids[i]; i++) {
+			if (hids[i]->gui) {
+				gds_append_str(&info, TAB);
+				gds_append_str(&info, hids[i]->name);
+				gds_append_str(&info, " : ");
+				gds_append_str(&info, hids[i]->description);
+				gds_append_str(&info, "\n");
+			}
+		}
+
+		gds_append_str(&info, "Exporters:\n");
+		for (i = 0; hids[i]; i++) {
+			if (hids[i]->exporter) {
+				gds_append_str(&info, TAB);
+				gds_append_str(&info, hids[i]->name);
+				gds_append_str(&info, " : ");
+				gds_append_str(&info, hids[i]->description);
+				gds_append_str(&info, "\n");
+			}
+		}
+
+		gds_append_str(&info, "Printers:\n");
+		for (i = 0; hids[i]; i++) {
+			if (hids[i]->printer) {
+				gds_append_str(&info, TAB);
+				gds_append_str(&info, hids[i]->name);
+				gds_append_str(&info, " : ");
+				gds_append_str(&info, hids[i]->description);
+				gds_append_str(&info, "\n");
+			}
+		}
+	}
+#undef TAB
+	return info.array;
+}
+
+char *pcb_get_info_license(void)
+{
+	static gds_t info;
+	static int first_time = 1;
+
+	if (first_time) {
+		first_time = 0;
+		gds_init(&info);
+
+		gds_append_str(&info, "pcb-rnd is licensed under the terms of the GNU\n");
+		gds_append_str(&info, "General Public License version 2\n");
+		gds_append_str(&info, "See the COPYING file for more information\n\n");
+	}
+	return info.array;
+}
+
+const char *pcb_author(void)
+{
+	if (conf_core.design.fab_author && conf_core.design.fab_author[0])
+		return conf_core.design.fab_author;
+	else
+		return pcb_get_user_name();
+}
+
+/* Catches signals which abort the program. */
+void pcb_catch_signal(int Signal)
+{
+	const char *s;
+
+	switch (Signal) {
+#ifdef SIGHUP
+	case SIGHUP:
+		s = "SIGHUP";
+		break;
+#endif
+	case SIGINT:
+		s = "SIGINT";
+		break;
+#ifdef SIGQUIT
+	case SIGQUIT:
+		s = "SIGQUIT";
+		break;
+#endif
+	case SIGABRT:
+		s = "SIGABRT";
+		break;
+	case SIGTERM:
+		s = "SIGTERM";
+		break;
+	case SIGSEGV:
+		s = "SIGSEGV";
+		break;
+	default:
+		s = "unknown";
+		break;
+	}
+	pcb_message(PCB_MSG_ERROR, "aborted by %s signal\n", s);
+	exit(1);
+}
+
+
+/*** files loaded ***/
+
+htsp_t pcb_file_loaded;
+
+
+pcb_file_loaded_t *pcb_file_loaded_category(const char *name, int alloc)
+{
+	pcb_file_loaded_t *cat = htsp_get(&pcb_file_loaded, name);
+
+	if ((cat == NULL) && (alloc)) {
+		cat = calloc(sizeof(pcb_file_loaded_t), 1);
+		cat->type = PCB_FLT_CATEGORY;
+		cat->name = pcb_strdup(name);
+		htsp_init(&cat->data.category.children, strhash, strkeyeq);
+		htsp_set(&pcb_file_loaded, cat->name, cat);
+	}
+	return cat;
+}
+
+int pcb_file_loaded_file_free(pcb_file_loaded_t *file)
+{
+	free(file->data.file.path);
+	free(file->data.file.desc);
+	free(file->name);
+	free(file);
+	return 0;
+}
+
+int pcb_file_loaded_clear(pcb_file_loaded_t *cat)
+{
+	htsp_entry_t *e;
+
+	assert(cat->type == PCB_FLT_CATEGORY);
+
+	for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) {
+		pcb_file_loaded_file_free(e->value);
+		htsp_delentry(&cat->data.category.children, e);
+	}
+	return 0;
+}
+
+int pcb_file_loaded_clear_at(const char *catname)
+{
+	pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 0);
+	if (cat != NULL)
+		return pcb_file_loaded_clear(cat);
+	return 0;
+}
+
+int pcb_file_loaded_set(pcb_file_loaded_t *cat, const char *name, const char *path, const char *desc)
+{
+	pcb_file_loaded_t *file;
+
+	assert(cat->type == PCB_FLT_CATEGORY);
+	file = htsp_get(&cat->data.category.children, name);
+	if (file != NULL) {
+		free(file->data.file.path);
+		free(file->data.file.desc);
+	}
+	else {
+		file = malloc(sizeof(pcb_file_loaded_t));
+		file->type = PCB_FLT_FILE;
+		file->name = pcb_strdup(name);
+		htsp_set(&cat->data.category.children, file->name, file);
+	}
+	if (path != NULL)
+		file->data.file.path = pcb_strdup(path);
+	else
+		file->data.file.path = NULL;
+
+	if (desc != NULL)
+		file->data.file.desc = pcb_strdup(desc);
+	else
+		file->data.file.desc = NULL;
+	return 0;
+}
+
+int pcb_file_loaded_set_at(const char *catnam, const char *name, const char *path, const char *desc)
+{
+	pcb_file_loaded_t *cat = pcb_file_loaded_category(catnam, 1);
+	return pcb_file_loaded_set(cat, name, path, desc);
+}
+
+int pcb_file_loaded_del(pcb_file_loaded_t *cat, const char *name)
+{
+	pcb_file_loaded_t *file;
+	assert(cat->type == PCB_FLT_CATEGORY);
+	file = htsp_pop(&cat->data.category.children, name);
+	if (file != NULL) {
+		if (file->type != PCB_FLT_FILE)
+			return -1;
+		pcb_file_loaded_file_free(file);
+	}
+	return 0;
+}
+
+int pcb_file_loaded_del_at(const char *catname, const char *name)
+{
+	pcb_file_loaded_t *cat = pcb_file_loaded_category(catname, 1);
+	return pcb_file_loaded_del(cat, name);
+}
+
+void pcb_file_loaded_init(void)
+{
+	htsp_init(&pcb_file_loaded, strhash, strkeyeq);
+}
+
+void pcb_file_loaded_uninit(void)
+{
+	htsp_entry_t *e;
+
+	for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) {
+		pcb_file_loaded_t *cat = e->value;
+		pcb_file_loaded_clear(cat);
+		free(cat->name);
+		htsp_uninit(&cat->data.category.children);
+		free(cat);
+		htsp_delentry(&pcb_file_loaded, e);
+	}
+
+	htsp_uninit(&pcb_file_loaded);
+}
+
+
Index: tags/2.0.1/src/build_run.h
===================================================================
--- tags/2.0.1/src/build_run.h	(nonexistent)
+++ tags/2.0.1/src/build_run.h	(revision 18980)
@@ -0,0 +1,106 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include <genht/htsp.h>
+
+void pcb_quit_app(void);
+
+/* Returns a string that has a bunch of information about this program. */
+char *pcb_get_info_program(void);
+
+/* Returns a string that has a bunch of information about the copyrights. */
+char *pcb_get_info_copyright(void);
+
+/* Returns a string about how the program is licensed. */
+char *pcb_get_info_license(void);
+
+/* Returns a string that has a bunch of information about the websites. */
+char *pcb_get_info_websites(const char **url_out);
+
+/* Returns a string as the concatenation of pcb_get_info_program() and pcb_get_info_websites() */
+char *pcb_get_info_comments(void);
+
+/* Returns a string that has a bunch of information about the options selected at compile time. */
+char *pcb_get_info_compile_options(void);
+
+/* Author's name: either from the config system (typically from the design) or
+   as a last resort from the OS */
+const char *pcb_author(void);
+
+void pcb_catch_signal(int Signal);
+
+
+
+/*** info on where files are loaded from ***/
+
+/* Hash-in-hash tree with the top tree being categories. */
+
+typedef enum pcb_file_loaded_type_e {
+	PCB_FLT_CATEGORY,
+	PCB_FLT_FILE
+} pcb_file_loaded_type_t;
+
+typedef struct pcb_file_loaded_s pcb_file_loaded_t;
+
+struct pcb_file_loaded_s {
+	char *name; /* same as the hash key; strdup'd */
+	pcb_file_loaded_type_t type;
+	union {
+		struct {
+			htsp_t children;
+		} category;
+		struct {
+			char *path;
+			char *desc;
+		} file;
+	} data;
+};
+
+extern htsp_t pcb_file_loaded;
+
+/* Return the category called name; if doesn't exist and alloc is 1,
+   allocate it it (else return NULL) */
+pcb_file_loaded_t *pcb_file_loaded_category(const char *name, int alloc);
+
+/* clear the subtree of a category, keeping the category; return 0 on success */
+int pcb_file_loaded_clear(pcb_file_loaded_t *cat);
+int pcb_file_loaded_clear_at(const char *catname);
+
+/* clear the subtree of a category, keeping the category; return 0 on success */
+int pcb_file_loaded_set(pcb_file_loaded_t *cat, const char *name, const char *path, const char *desc);
+int pcb_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc);
+
+/* remove an entry */
+int pcb_file_loaded_del(pcb_file_loaded_t *cat, const char *name);
+int pcb_file_loaded_del_at(const char *catname, const char *name);
+
+
+/* called once, from main */
+void pcb_file_loaded_init(void);
+void pcb_file_loaded_uninit(void);
+
Index: tags/2.0.1/src/buildin.h
===================================================================
--- tags/2.0.1/src/buildin.h	(nonexistent)
+++ tags/2.0.1/src/buildin.h	(revision 18980)
@@ -0,0 +1,4 @@
+/* This file is generated by the puplug utility. Please DO NOT edit this file. */
+
+#include <puplug/libs.h>
+extern const pup_buildin_t pup_buildins[];
Index: tags/2.0.1/src/change.c
===================================================================
--- tags/2.0.1/src/change.c	(nonexistent)
+++ tags/2.0.1/src/change.c	(revision 18980)
@@ -0,0 +1,768 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* functions used to change object properties
+ *
+ */
+
+#include "config.h"
+
+#include "conf_core.h"
+
+#include "change.h"
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "select.h"
+#include "undo.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "macro.h"
+#include "obj_pstk_op.h"
+#include "obj_subc_parent.h"
+#include "obj_term.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_poly_op.h"
+#include "obj_text_op.h"
+#include "obj_subc_op.h"
+
+int defer_updates = 0;
+int defer_needs_update = 0;
+
+pcb_opfunc_t ChangeSizeFunctions = {
+	pcb_lineop_change_size,
+	pcb_textop_change_size,
+	pcb_polyop_change_clear,
+	NULL,
+	NULL,
+	pcb_arcop_change_size,
+	NULL,
+	NULL,
+	pcb_subcop_change_size,
+	pcb_pstkop_change_size
+};
+
+pcb_opfunc_t Change1stSizeFunctions = {
+	pcb_lineop_change_size,
+	pcb_textop_change_size,
+	pcb_polyop_change_clear,
+	NULL,
+	NULL,
+	pcb_arcop_change_size,
+	NULL,
+	NULL,
+	pcb_subcop_change_1st_size,
+	NULL  /* padstack */
+};
+
+pcb_opfunc_t Change2ndSizeFunctions = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	pcb_subcop_change_2nd_size,
+	pcb_pstkop_change_2nd_size
+};
+
+static pcb_opfunc_t ChangeThermalFunctions = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	pcb_pstkop_change_thermal
+};
+
+pcb_opfunc_t ChangeClearSizeFunctions = {
+	pcb_lineop_change_clear_size,
+	NULL,
+	pcb_polyop_change_clear_size,				/* just to tell the user not to :-) */
+	NULL,
+	NULL,
+	pcb_arcop_change_clear_size,
+	NULL,
+	NULL,
+	pcb_subcop_change_clear_size,
+	pcb_pstkop_change_clear_size
+};
+
+static pcb_opfunc_t ChangeNameFunctions = {
+	NULL,
+	pcb_textop_change_name,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	pcb_subcop_change_name,
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t ChangeNonetlistFunctions = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	pcb_subcop_change_nonetlist,
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t ChangeJoinFunctions = {
+	pcb_lineop_change_join,
+	pcb_textop_change_join,
+	pcb_polyop_change_join,
+	NULL,
+	NULL,
+	pcb_arcop_change_join,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t SetJoinFunctions = {
+	pcb_lineop_set_join,
+	pcb_textop_set_join,
+	NULL,
+	NULL,
+	NULL,
+	pcb_arcop_set_join,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t ClrJoinFunctions = {
+	pcb_lineop_clear_join,
+	pcb_textop_clear_join,
+	NULL,
+	NULL,
+	NULL,
+	pcb_arcop_clear_join,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t ChangeRadiusFunctions = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	pcb_arcop_change_radius,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+static pcb_opfunc_t ChangeAngleFunctions = {
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	pcb_arcop_change_angle,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+pcb_opfunc_t ChgFlagFunctions = {
+	pcb_lineop_change_flag,
+	pcb_textop_change_flag,
+	pcb_polyop_change_flag,
+	NULL,
+	NULL,
+	pcb_arcop_change_flag,
+	NULL,
+	NULL,
+	pcb_subcop_change_flag,
+	pcb_pstkop_change_flag
+};
+
+static pcb_opfunc_t InvalLabelFunctions = {
+	pcb_lineop_invalidate_label,
+	pcb_textop_invalidate_label,
+	pcb_polyop_invalidate_label,
+	NULL,
+	NULL,
+	pcb_arcop_invalidate_label,
+	NULL,
+	NULL,
+	/*pcb_subcop_invalidate_flag*/ NULL,
+	NULL  /* padstack */
+};
+
+
+/* ----------------------------------------------------------------------
+ * changes the thermals on all selected and visible padstacks.
+ * Returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_thermals(int types, int therm_style, unsigned long lid)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgtherm.pcb = PCB;
+	ctx.chgtherm.style = therm_style;
+	ctx.chgtherm.lid = lid;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeThermalFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the size of all selected and visible object types
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_size(int types, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeSizeFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the clearance size of all selected and visible objects
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_clear_size(int types, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeClearSizeFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* --------------------------------------------------------------------------
+ * changes the 2nd size (drilling hole) of all selected and visible objects
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_2nd_size(int types, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &Change2ndSizeFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the clearance flag (join) of all selected and visible lines
+ * and/or arcs. Returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_join(int types)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeJoinFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the clearance flag (join) of all selected and visible lines
+ * and/or arcs. Returns pcb_true if anything has changed
+ */
+pcb_bool pcb_set_selected_join(int types)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &SetJoinFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the clearance flag (join) of all selected and visible lines
+ * and/or arcs. Returns pcb_true if anything has changed
+ */
+pcb_bool pcb_clr_selected_join(int types)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ClrJoinFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the nonetlist-flag of all selected and visible subcircuits
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_nonetlist(int types)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeNonetlistFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the angle of all selected and visible object types
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_angle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgangle.pcb = PCB;
+	ctx.chgangle.is_primary = is_start;
+	ctx.chgangle.is_absolute = fixIt;
+	ctx.chgangle.value = Difference;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeAngleFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ----------------------------------------------------------------------
+ * changes the radius of all selected and visible object types
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_chg_selected_radius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change = pcb_false;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = is_start;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = pcb_selected_operation(PCB, PCB->Data, &ChangeRadiusFunctions, &ctx, pcb_false, types, pcb_false);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+#warning subc TODO: check if it is true:
+/* ---------------------------------------------------------------------------
+ * changes the size of the passed object; subc size is silk size (TODO: check if it is true)
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = (pcb_object_operation(&ChangeSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+#warning subc TODO: check if it is true:
+/* ---------------------------------------------------------------------------
+ * changes the size of the passed object; element size is pin ring sizes
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_1st_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = (pcb_object_operation(&Change1stSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the radius of the passed object (e.g. arc width/height)
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_radius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool fixIt)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = is_x;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = r;
+
+	change = (pcb_object_operation(&ChangeRadiusFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the angles of the passed object (e.g. arc start/ctx->chgsize.value)
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_angle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool fixIt)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgangle.pcb = PCB;
+	ctx.chgangle.is_primary = is_start;
+	ctx.chgangle.is_absolute = fixIt;
+	ctx.chgangle.value = a;
+
+	change = (pcb_object_operation(&ChangeAngleFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * changes the clearance size of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_clear_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = (pcb_object_operation(&ChangeClearSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the thermal of the passed object
+ * Returns pcb_true if anything is changed
+ *
+ */
+pcb_bool pcb_chg_obj_thermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type, unsigned long lid)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgtherm.pcb = PCB;
+	ctx.chgtherm.style = therm_type;
+	ctx.chgtherm.lid = lid;
+
+	change = (pcb_object_operation(&ChangeThermalFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the 2nd size of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_2nd_size(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t Difference, pcb_bool fixIt, pcb_bool incundo)
+{
+	pcb_bool change;
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+	ctx.chgsize.is_primary = 1;
+	ctx.chgsize.is_absolute = fixIt;
+	ctx.chgsize.value = Difference;
+
+	change = (pcb_object_operation(&Change2ndSizeFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL);
+	if (change) {
+		pcb_draw();
+		if (incundo)
+			pcb_undo_inc_serial();
+	}
+	return change;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the name of the passed object
+ * returns the old name
+ *
+ * The allocated memory isn't freed because the old string is used
+ * by the undo module.
+ */
+void *pcb_chg_obj_name(int Type, void *Ptr1, void *Ptr2, void *Ptr3, char *Name)
+{
+	void *result;
+	pcb_opctx_t ctx;
+
+	ctx.chgname.pcb = PCB;
+	ctx.chgname.new_name = Name;
+
+	result = pcb_object_operation(&ChangeNameFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	pcb_draw();
+	return result;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the clearance-flag of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	if (pcb_object_operation(&ChangeJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * sets the clearance-flag of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_set_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	if (pcb_object_operation(&SetJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * clears the clearance-flag of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_clr_obj_join(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	if (pcb_object_operation(&ClrJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * changes the square-flag of the passed object
+ * Returns pcb_true if anything is changed
+ */
+pcb_bool pcb_chg_obj_nonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.chgsize.pcb = PCB;
+
+	if (pcb_object_operation(&ChangeNonetlistFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+void *pcb_chg_obj_name_query(pcb_any_obj_t *obj)
+{
+	char *name = NULL;
+	pcb_subc_t *parent_subc;
+
+	parent_subc = pcb_obj_parent_subc(obj);
+
+	switch(obj->type) {
+		case PCB_OBJ_TEXT:
+			if ((parent_subc != NULL) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, obj) && !PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, obj))
+				goto term_name; /* special case: dyntext floaters are rarely temrinals */
+			if ((parent_subc != NULL) && PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, obj) && (strstr(((pcb_text_t *)obj)->TextString, "%a.parent.refdes%"))) {
+				if (pcb_gui->confirm_dialog("Text object seems to be a refdes text", "edit the text (template)", "edit subcircuit refdes")) {
+					obj = (pcb_any_obj_t *)parent_subc;
+					goto subc_name;
+				}
+			}
+			name = pcb_gui->prompt_for("Enter text:", PCB_EMPTY(((pcb_text_t *)obj)->TextString));
+			break;
+
+		case PCB_OBJ_SUBC:
+			subc_name:;
+			name = pcb_gui->prompt_for("Subcircuit refdes:", PCB_EMPTY(((pcb_subc_t *)obj)->refdes));
+			break;
+
+		default:
+			term_name:;
+			if (parent_subc != NULL) {
+				name = pcb_gui->prompt_for("Enter terminal ID:", PCB_EMPTY(obj->term));
+				if (name != NULL) {
+					pcb_term_undoable_rename(PCB, obj, name);
+					pcb_draw();
+				}
+				return obj;
+			}
+			break;
+	}
+
+	if (name) {
+		/* ChangeObjectName takes ownership of the passed memory; do not free old name, it's kept for undo */
+		char *old;
+		old = (char *)pcb_chg_obj_name(obj->type, obj->parent.any, obj, obj, name);
+
+		if (old != (char *)-1) {
+			pcb_undo_add_obj_to_change_name(obj->type, obj->parent.any, obj, obj, old);
+			pcb_undo_inc_serial();
+		}
+		pcb_draw();
+		return obj;
+	}
+	return NULL;
+}
+
+void pcb_flag_change(pcb_board_t *pcb, pcb_change_flag_t how, pcb_flag_values_t flag, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+
+	ctx.chgflag.pcb = pcb;
+	ctx.chgflag.how = how;
+	ctx.chgflag.flag = flag;
+
+	pcb_object_operation(&ChgFlagFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+}
+
+void *pcb_obj_invalidate_label(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+	ctx.noarg.pcb = PCB;
+	return pcb_object_operation(&InvalLabelFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+}
Index: tags/2.0.1/src/change.h
===================================================================
--- tags/2.0.1/src/change.h	(nonexistent)
+++ tags/2.0.1/src/change.h	(revision 18980)
@@ -0,0 +1,106 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Generic, object-type independent change calls */
+
+#ifndef	PCB_CHANGE_H
+#define	PCB_CHANGE_H
+
+#include "config.h"
+#include "board.h"
+#include "flag.h"
+#include "pcb_bool.h"
+#include "unit.h"
+
+extern int defer_updates, defer_needs_update;
+
+#define	PCB_CHANGENAME_TYPES        \
+	(PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | \
+	PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC)
+
+#define	PCB_CHANGESIZE_TYPES        \
+	(PCB_OBJ_PSTK | PCB_OBJ_POLY | PCB_OBJ_LINE | PCB_OBJ_ARC | \
+	PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
+
+#define	PCB_CHANGE2NDSIZE_TYPES     \
+	(PCB_OBJ_PSTK | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
+
+/* We include polygons here only to inform the user not to do it that way.  */
+#define PCB_CHANGECLEARSIZE_TYPES \
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | \
+	PCB_OBJ_SUBC_PART)
+
+#define	PCB_CHANGENONETLIST_TYPES     \
+	(PCB_OBJ_SUBC)
+
+#define	PCB_CHANGESQUARE_TYPES     \
+	(PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
+
+#define	PCB_CHANGEOCTAGON_TYPES     \
+	(PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
+
+#define PCB_CHANGEJOIN_TYPES	\
+	(PCB_OBJ_ARC | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY)
+
+#define PCB_CHANGETHERMAL_TYPES	\
+	(PCB_OBJ_SUBC_PART)
+
+pcb_bool pcb_chg_selected_size(int, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_selected_clear_size(int, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_selected_2nd_size(int, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_selected_join(int);
+pcb_bool pcb_set_selected_join(int);
+pcb_bool pcb_clr_selected_join(int);
+pcb_bool pcb_chg_selected_nonetlist(int);
+pcb_bool pcb_chg_selected_thermals(int types, int therm_style, unsigned long lid);
+pcb_bool pcb_chg_obj_size(int, void *, void *, void *, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_obj_1st_size(int, void *, void *, void *, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_obj_thermal(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int therm_type, unsigned long lid);
+pcb_bool pcb_chg_obj_clear_size(int, void *, void *, void *, pcb_coord_t, pcb_bool);
+pcb_bool pcb_chg_obj_2nd_size(int, void *, void *, void *, pcb_coord_t, pcb_bool, pcb_bool);
+pcb_bool pcb_chg_obj_join(int, void *, void *, void *);
+pcb_bool pcb_set_obj_join(int, void *, void *, void *);
+pcb_bool pcb_clr_obj_join(int, void *, void *, void *);
+pcb_bool pcb_chg_obj_nonetlist(int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+void *pcb_chg_obj_name(int, void *, void *, void *, char *);
+
+/* queries the user for a new object name and changes it */
+void *pcb_chg_obj_name_query(pcb_any_obj_t *obj);
+
+pcb_bool pcb_chg_obj_radius(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_x, pcb_coord_t r, pcb_bool absolute);
+pcb_bool pcb_chg_obj_angle(int Type, void *Ptr1, void *Ptr2, void *Ptr3, int is_start, pcb_angle_t a, pcb_bool absolute);
+pcb_bool pcb_chg_selected_angle(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt);
+pcb_bool pcb_chg_selected_radius(int types, int is_start, pcb_angle_t Difference, pcb_bool fixIt);
+
+/* Change flag flg of an object in a way dictated by 'how' */
+void pcb_flag_change(pcb_board_t *pcb, pcb_change_flag_t how, pcb_flag_values_t flg, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+/* Invalidate the term label of an object */
+void *pcb_obj_invalidate_label(int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+#endif
Index: tags/2.0.1/src/change_act.c
===================================================================
--- tags/2.0.1/src/change_act.c	(nonexistent)
+++ tags/2.0.1/src/change_act.c	(revision 18980)
@@ -0,0 +1,1135 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* action routines for output window
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "data.h"
+#include "funchash_core.h"
+
+#include "board.h"
+#include "actions.h"
+#include "change.h"
+#include "draw.h"
+#include "search.h"
+#include "undo.h"
+#include "event.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "obj_rat_draw.h"
+#include "data_it.h"
+#include "macro.h"
+#include "grid.h"
+
+static void ChangeFlag(const char *, const char *, int, const char *);
+static fgw_error_t pcb_act_ChangeSize(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+static fgw_error_t pcb_act_Change2ndSize(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeClearSize[] =
+	"ChangeClearSize(Object, delta|style)\n"
+	"ChangeClearSize(SelectedPins|SelectedPads|SelectedVias, delta|style)\n"
+	"ChangeClearSize(SelectedLines|SelectedArcs, delta|style)\n"
+	"ChangeClearSize(Selected|SelectedObjects, delta|style)";
+static const char pcb_acth_ChangeClearSize[] = "Changes the clearance size of objects.";
+
+/* %start-doc actions ChangeClearSize
+
+If the solder mask is currently showing, this action changes the
+solder mask clearance.  If the mask is not showing, this action
+changes the polygon clearance.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeClearSize(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *delta = NULL;
+	const char *units = NULL;
+	pcb_bool absolute;
+	pcb_coord_t value;
+	int type = PCB_OBJ_VOID;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_coord_t x, y;
+	int got_coords = 0;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChangeClearSize, function = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, ChangeClearSize, delta = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeClearSize, units = argv[3].val.str);
+
+	if (function && delta) {
+		int funcid = pcb_funchash_get(function, NULL);
+
+		if (funcid == F_Object) {
+			pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+			got_coords = 1;
+			type = pcb_search_screen(x, y, PCB_CHANGECLEARSIZE_TYPES, &ptr1, &ptr2, &ptr3);
+		}
+
+		if (strcmp(delta, "style") == 0) {
+			if (!got_coords) {
+				pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+				got_coords = 1;
+			}
+
+			if ((type == PCB_OBJ_VOID) || (type == PCB_OBJ_POLY))	/* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */
+				type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3);
+			if (pcb_get_style_size(funcid, &value, type, 2) != 0) {
+				PCB_ACT_IRES(-1);
+				return 0;
+			}
+			absolute = 1;
+			value *= 2;
+		}
+		else
+			value = 2 * pcb_get_value(delta, units, &absolute, NULL);
+		switch (pcb_funchash_get(function, NULL)) {
+		case F_Object:
+			{
+				if (type != PCB_OBJ_VOID)
+					if (pcb_chg_obj_clear_size(type, ptr1, ptr2, ptr3, value, absolute))
+						pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+		case F_SelectedVias:
+		case F_SelectedPads:
+		case F_SelectedPins:
+			if (pcb_chg_selected_clear_size(PCB_OBJ_PSTK, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_SelectedLines:
+			if (pcb_chg_selected_clear_size(PCB_OBJ_LINE, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_SelectedArcs:
+			if (pcb_chg_selected_clear_size(PCB_OBJ_ARC, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_clear_size(PCB_CHANGECLEARSIZE_TYPES, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		}
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeFlag[] =
+	"ChangeFlag(Object|Selected|SelectedObjects, flag, value)\n"
+	"ChangeFlag(SelectedLines|SelectedPins|SelectedVias, flag, value)\n"
+	"ChangeFlag(SelectedPads|SelectedTexts|SelectedNames, flag, value)\n"
+	"ChangeFlag(SelectedElements, flag, value)\n" "flag = thermal | join\n" "value = 0 | 1";
+
+static const char pcb_acth_ChangeFlag[] = "Sets or clears flags on objects.";
+
+/* %start-doc actions ChangeFlag
+
+Toggles the given flag on the indicated object(s).  The flag may be
+one of the flags listed above (thermal, join).  The
+value may be the number 0 or 1.  If the value is 0, the flag is
+cleared.  If the value is 1, the flag is set.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeFlag(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *flag;
+	int value;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChangeFlag, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, ChangeFlag, flag = argv[2].val.str);
+	PCB_ACT_CONVARG(2, FGW_INT, ChangeFlag, value = argv[3].val.nat_int);
+
+	if (value != 0 && value != 1)
+		PCB_ACT_FAIL(ChangeFlag);
+
+	ChangeFlag(function, flag, value, "ChangeFlag");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static void ChangeFlag(const char *what, const char *flag_name, int value,
+											 const char *cmd_name)
+{
+	pcb_bool(*set_object) (int, void *, void *, void *);
+	pcb_bool(*set_selected) (int);
+
+	if (PCB_NSTRCMP(flag_name, "join") == 0) {
+		/* Note: these are backwards, because the flag is "clear" but
+		   the command is "join".  */
+		set_object = value ? pcb_clr_obj_join : pcb_set_obj_join;
+		set_selected = value ? pcb_clr_selected_join : pcb_set_selected_join;
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, _("%s():  Flag \"%s\" is not valid\n"), cmd_name, flag_name);
+		return;
+	}
+
+	switch (pcb_funchash_get(what, NULL)) {
+	case F_Object:
+		{
+			int type;
+			void *ptr1, *ptr2, *ptr3;
+			pcb_coord_t x, y;
+
+			pcb_hid_get_coords("Click on object to change", &x, &y, 0);
+
+			if ((type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID)
+				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
+					pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+			if (set_object(type, ptr1, ptr2, ptr3))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		}
+
+	case F_SelectedVias:
+	case F_SelectedPins:
+	case F_SelectedPads:
+		if (set_selected(PCB_OBJ_PSTK))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+
+	case F_SelectedLines:
+		if (set_selected(PCB_OBJ_LINE))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+
+	case F_SelectedTexts:
+		if (set_selected(PCB_OBJ_TEXT))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+
+	case F_SelectedNames:
+	case F_SelectedElements:
+		pcb_message(PCB_MSG_ERROR, "Feature not supported\n");
+		break;
+
+	case F_Selected:
+	case F_SelectedObjects:
+		if (set_selected(PCB_CHANGESIZE_TYPES))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+	}
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeSizes[] =
+	"ChangeSizes(Object, delta|style)\n"
+	"ChangeSizes(SelectedObjects|Selected, delta|style)\n"
+	"ChangeSizes(SelectedLines|SelectedPins|SelectedVias, delta|style)\n"
+	"ChangeSizes(SelectedPads|SelectedTexts|SelectedNames, delta|style)\n" "ChangeSizes(SelectedElements, delta|style)";
+
+static const char pcb_acth_ChangeSizes[] = "Changes all sizes of objects.";
+
+/* %start-doc actions ChangeSize
+
+Call pcb_act_ChangeSize, ActionChangeDrillSize and pcb_act_ChangeClearSize
+with the same arguments. If any of them did not fail, return success.
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeSizes(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	fgw_error_t a, b, c;
+	pcb_undo_save_serial();
+	a = pcb_act_ChangeSize(res, argc, argv);
+	pcb_undo_restore_serial();
+	b = pcb_act_Change2ndSize(res, argc, argv);
+	pcb_undo_restore_serial();
+	c = pcb_act_ChangeClearSize(res, argc, argv);
+	pcb_undo_restore_serial();
+	pcb_undo_inc_serial();
+	PCB_ACT_IRES(!(!a || !b || !c));
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeSize[] =
+	"ChangeSize(Object, delta|style)\n"
+	"ChangeSize(SelectedObjects|Selected, delta|style)\n"
+	"ChangeSize(SelectedLines|SelectedPins|SelectedVias, delta|style)\n"
+	"ChangeSize(SelectedPads|SelectedTexts|SelectedNames, delta|style)\n" "ChangeSize(SelectedElements, delta|style)";
+
+static const char pcb_acth_ChangeSize[] = "Changes the size of objects.";
+
+/* %start-doc actions ChangeSize
+
+For lines and arcs, this changes the width.  For padstacks, this
+changes the shape size (but does not touch the hole diameter). For
+texts, this changes the scaling factor.  For subcircuits, this
+changes the width of the silk layer lines and arcs for this element.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeSize(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *delta;
+	const char *units = NULL;
+	pcb_bool absolute;								/* indicates if absolute size is given */
+	pcb_coord_t value;
+	int type = PCB_OBJ_VOID, tostyle = 0;
+	void *ptr1, *ptr2, *ptr3;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChangeSize, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, ChangeSize, delta = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, ChangeSize, units = argv[3].val.str);
+
+
+	if (function && delta) {
+		int funcid = pcb_funchash_get(function, NULL);
+
+		if (funcid == F_Object) {
+			pcb_coord_t x, y;
+			pcb_hid_get_coords("Click on object to change size of", &x, &y, 0);
+			type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3);
+		}
+
+		if (strcmp(delta, "style") == 0) {
+			if (pcb_get_style_size(funcid, &value, type, 0) != 0)
+				return 1;
+			absolute = 1;
+			tostyle = 1;
+		}
+		else
+			value = pcb_get_value(delta, units, &absolute, NULL);
+		switch (funcid) {
+		case F_Object:
+			{
+				if (type != PCB_OBJ_VOID)
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
+						pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+				if (tostyle) {
+					if (pcb_chg_obj_1st_size(type, ptr1, ptr2, ptr3, value, absolute))
+						pcb_board_set_changed_flag(pcb_true);
+				}
+				else {
+					if (pcb_chg_obj_size(type, ptr1, ptr2, ptr3, value, absolute))
+						pcb_board_set_changed_flag(pcb_true);
+				}
+				break;
+			}
+		case F_SelectedVias:
+		case F_SelectedPins:
+		case F_SelectedPads:
+			if (pcb_chg_selected_size(PCB_OBJ_PSTK, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_SelectedArcs:
+			if (pcb_chg_selected_size(PCB_OBJ_ARC, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_SelectedLines:
+			if (pcb_chg_selected_size(PCB_OBJ_LINE, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_SelectedTexts:
+			if (pcb_chg_selected_size(PCB_OBJ_TEXT, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_SelectedNames:
+		case F_SelectedElements:
+			pcb_message(PCB_MSG_ERROR, "Feature not supported.\n");
+			break;
+
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_size(PCB_CHANGESIZE_TYPES, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Change2ndSize[] =
+	"ChangeDrillSize(Object, delta|style)\n" "ChangeDrillSize(SelectedPins|SelectedVias|Selected|SelectedObjects, delta|style)";
+
+static const char pcb_acth_Change2ndSize[] = "Changes the drilling hole size of objects.";
+
+/* %start-doc actions ChangeDrillSize
+
+%end-doc */
+
+static fgw_error_t pcb_act_Change2ndSize(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *delta;
+	const char *units = NULL;
+	int type = PCB_OBJ_VOID;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_bool absolute;
+	pcb_coord_t value;
+
+	PCB_ACT_CONVARG(1, FGW_STR, Change2ndSize, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, Change2ndSize, delta = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, Change2ndSize, units = argv[3].val.str);
+
+	if (function && delta) {
+		int funcid = pcb_funchash_get(function, NULL);
+
+		if (funcid == F_Object) {
+			pcb_coord_t x, y;
+			pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+			type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3);
+		}
+
+		if (strcmp(delta, "style") == 0) {
+			if (pcb_get_style_size(funcid, &value, type, 1) != 0)
+				return 1;
+			absolute = 1;
+		}
+		else
+			value = pcb_get_value(delta, units, &absolute, NULL);
+
+		switch (pcb_funchash_get(function, NULL)) {
+		case F_Object:
+			{
+
+				if (type != PCB_OBJ_VOID)
+					if (pcb_chg_obj_2nd_size(type, ptr1, ptr2, ptr3, value, absolute, pcb_true))
+						pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+
+		case F_SelectedPadstacks:
+		case F_SelectedVias:
+		case F_SelectedPins:
+			if (pcb_chg_selected_2nd_size(PCB_OBJ_PSTK, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_2nd_size(PCB_OBJ_CLASS_PIN, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		}
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ---------------------------------------------------------------------------  */
+
+static const char pcb_acts_ChangePinName[] = "ChangePinName(Refdes,PinNumber,PinName)";
+
+static const char pcb_acth_ChangePinName[] = "Sets the name of a specific pin on a specific subcircuit.";
+
+/* %start-doc actions ChangePinName
+
+This can be especially useful for annotating pin names from a
+schematic to the layout without requiring knowledge of the pcb file
+format.
+
+@example
+ChangePinName(U3, 7, VCC)
+@end example
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangePinName(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_cardinal_t changed = 0;
+	const char *refdes, *pinnum, *pinname;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChangePinName, refdes = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, ChangePinName, pinnum = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, ChangePinName, pinname = argv[3].val.str);
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if ((subc->refdes != NULL) && (PCB_NSTRCMP(refdes, subc->refdes) == 0)) {
+			pcb_any_obj_t *o;
+			pcb_data_it_t it;
+
+			for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+				if ((o->term != NULL) && (PCB_NSTRCMP(pinnum, o->term) == 0)) {
+#warning TODO: make this undoable
+					pcb_attribute_put(&o->Attributes, "name", pinname);
+					pcb_board_set_changed_flag(pcb_true);
+					changed++;
+				}
+			}
+		}
+	}
+	PCB_END_LOOP;
+
+	/*
+	 * done with our action so increment the undo # if we actually
+	 * changed anything
+	 */
+	if (changed) {
+		if (defer_updates)
+			defer_needs_update = 1;
+		else {
+			/* pcb_undo_inc_serial(); */
+			pcb_gui->invalidate_all();
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeName[] = "ChangeName(Object)\n" "ChangeName(Layout|Layer)";
+
+static const char pcb_acth_ChangeName[] = "Sets the name (or pin number) of objects.";
+
+/* %start-doc actions ChangeName
+
+@table @code
+
+@item Object
+Changes the name of the element under the cursor.
+
+@item Layout
+Changes the name of the layout.  This is printed on the fab drawings.
+
+@item Layer
+Changes the name of the currently active layer.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeName(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	char *name;
+	int pinnum;
+	pcb_objtype_t type;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeName, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		/* change the refdes of a subcircuit */
+		case F_Subc:
+		{
+			pcb_coord_t x, y;
+			pcb_hid_get_coords("Select a subcircuit", &x, &y, 0);
+			type = PCB_OBJ_SUBC;
+			goto do_chg_name;
+		}
+			/* change the name of an object */
+		case F_Object:
+			{
+				pcb_coord_t x, y;
+				void *ptr1, *ptr2, *ptr3;
+				pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+				type = PCB_CHANGENAME_TYPES;
+				do_chg_name:;
+				if ((type = pcb_search_screen(x, y, type, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+					pcb_undo_save_serial();
+					pinnum = 0;
+					if (pcb_chg_obj_name_query(ptr2)) {
+						pcb_redraw();
+						pcb_board_set_changed_flag(pcb_true);
+						pcb_event(PCB_EVENT_RUBBER_RENAME, "ipppi", type, ptr1, ptr2, ptr3, pinnum);
+					}
+				}
+				break;
+			}
+
+			/* change the layout's name */
+		case F_Layout:
+			name = pcb_gui->prompt_for(_("Enter the layout name:"), PCB_EMPTY(PCB->Name));
+			/* NB: ChangeLayoutName takes ownership of the passed memory */
+			if (name && pcb_board_change_name(name))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+			/* change the name of the active layer */
+		case F_Layer:
+			name = pcb_gui->prompt_for(_("Enter the layer name:"), PCB_EMPTY(CURRENT->name));
+			/* NB: pcb_layer_rename_ takes ownership of the passed memory */
+			if (name && (pcb_layer_rename_(CURRENT, name) == 0))
+				pcb_board_set_changed_flag(pcb_true);
+			else
+				free(name);
+			break;
+
+		default:
+			return FGW_ERR_ARG_CONV;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeJoin[] = "ChangeJoin(ToggleObject|SelectedLines|SelectedArcs|Selected)";
+
+static const char pcb_acth_ChangeJoin[] = "Changes the join (clearance through polygons) of objects.";
+
+/* %start-doc actions ChangeJoin
+
+The join flag determines whether a line or arc, drawn to intersect a
+polygon, electrically connects to the polygon or not.  When joined,
+the line/arc is simply drawn over the polygon, making an electrical
+connection.  When not joined, a gap is drawn between the line and the
+polygon, insulating them from each other.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeJoin(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_ToggleObject:
+		case F_Object:
+			{
+				pcb_coord_t x, y;
+				int type;
+				void *ptr1, *ptr2, *ptr3;
+
+				pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+				if ((type = pcb_search_screen(x, y, PCB_CHANGEJOIN_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID)
+					if (pcb_chg_obj_join(type, ptr1, ptr2, ptr3))
+						pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+
+		case F_SelectedLines:
+			if (pcb_chg_selected_join(PCB_OBJ_LINE))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_SelectedArcs:
+			if (pcb_chg_selected_join(PCB_OBJ_ARC))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_join(PCB_CHANGEJOIN_TYPES))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		default:
+			return FGW_ERR_ARG_CONV;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeNonetlist[] =
+	"ChangeNonetlist(ToggleObject)\n" "ChangeNonetlist(SelectedElements)\n" "ChangeNonetlist(Selected|SelectedObjects)";
+
+static const char pcb_acth_ChangeNonetlist[] = "Changes the nonetlist flag of subcircuits.";
+
+/* %start-doc actions ChangeNonetlist
+
+Note that @code{Pins} means both pins and pads.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChangeNonetlist(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeJoin, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_ToggleObject:
+		case F_Object:
+		case F_Element:
+			{
+				pcb_coord_t x, y;
+				int type;
+				void *ptr1, *ptr2, *ptr3;
+				pcb_hid_get_coords(_("Select an Element"), &x, &y, 0);
+
+				ptr3 = NULL;
+				type = pcb_search_screen(x, y, PCB_CHANGENONETLIST_TYPES, &ptr1, &ptr2, &ptr3);
+				if (pcb_chg_obj_nonetlist(type, ptr1, ptr2, ptr3))
+					pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+		case F_SelectedElements:
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_nonetlist(PCB_OBJ_SUBC))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		default:
+			return FGW_ERR_ARG_CONV;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_SetThermal[] = "SetThermal(Object|SelectedPins|SelectedVias|Selected, Style)";
+static const char pcb_acth_SetThermal[] =
+	"Set the thermal (on the current layer) of padstacks to the given style.\n"
+	"Style = 0 means no thermal.\n"
+	"Style = 1 has diagonal fingers with sharp edges.\n"
+	"Style = 2 has horizontal and vertical fingers with sharp edges.\n"
+	"Style = 3 is a solid connection to the plane.\n"
+	"Style = 4 has diagonal fingers with rounded edges.\n"
+	"Style = 5 has horizontal and vertical fingers with rounded edges.\n";
+
+/* %start-doc actions SetThermal
+
+This changes how/whether padstacks connect to any rectangle or polygon
+on the current layer. The first argument can specify one object, or all
+selected padstacks.
+The second argument specifies the style of connection.
+There are 5 possibilities:
+0 - no connection,
+1 - 45 degree fingers with sharp edges,
+2 - horizontal & vertical fingers with sharp edges,
+3 - solid connection,
+4 - 45 degree fingers with rounded corners,
+5 - horizontal & vertical fingers with rounded corners.
+
+Padstacks may have thermals whether or not there is a polygon available
+to connect with. However, they will have no effect without the polygon.
+%end-doc */
+
+static fgw_error_t pcb_act_SetThermal(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *style;
+	void *ptr1, *ptr2, *ptr3;
+	int type, kind;
+	int err = 0;
+	pcb_coord_t gx, gy;
+
+	PCB_ACT_CONVARG(1, FGW_STR, SetThermal, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, SetThermal, style = argv[2].val.str);
+
+	if (function && *function && style && *style) {
+		pcb_bool absolute;
+
+		kind = pcb_get_value_ex(style, NULL, &absolute, NULL, NULL, NULL);
+		if (absolute && (kind <= 5))
+			switch (pcb_funchash_get(function, NULL)) {
+			case F_Object:
+				pcb_hid_get_coords("Click on object for SetThermal", &gx, &gy, 0);
+				if ((type = pcb_search_screen(gx, gy, PCB_CHANGETHERMAL_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+					pcb_chg_obj_thermal(type, ptr1, ptr2, ptr3, kind, INDEXOFCURRENT);
+					pcb_undo_inc_serial();
+					pcb_draw();
+				}
+				break;
+			case F_SelectedPins:
+			case F_SelectedVias:
+				pcb_chg_selected_thermals(PCB_OBJ_PSTK, kind, INDEXOFCURRENT);
+				break;
+			case F_Selected:
+			case F_SelectedElements:
+				pcb_chg_selected_thermals(PCB_CHANGETHERMAL_TYPES, kind, INDEXOFCURRENT);
+				break;
+			default:
+				err = 1;
+				break;
+			}
+		else
+			err = 1;
+		if (!err) {
+			PCB_ACT_IRES(0);
+			return 0;
+		}
+	}
+
+	PCB_ACT_FAIL(SetThermal);
+}
+
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_SetFlag[] =
+	"SetFlag(Object|Selected|SelectedObjects, flag)\n"
+	"SetFlag(SelectedLines|SelectedPins|SelectedVias, flag)\n"
+	"SetFlag(SelectedPads|SelectedTexts|SelectedNames, flag)\n"
+	"SetFlag(SelectedElements, flag)\n" "flag = thermal | join";
+
+static const char pcb_acth_SetFlag[] = "Sets flags on objects.";
+
+/* %start-doc actions SetFlag
+
+Turns the given flag on, regardless of its previous setting.  See
+@code{ChangeFlag}.
+
+@example
+SetFlag(SelectedPins,thermal)
+@end example
+
+%end-doc */
+
+static fgw_error_t pcb_act_SetFlag(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *flag;
+
+	PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str);
+
+	ChangeFlag(function, flag, 1, "SetFlag");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ClrFlag[] =
+	"ClrFlag(Object|Selected|SelectedObjects, flag)\n"
+	"ClrFlag(SelectedLines|SelectedPins|SelectedVias, flag)\n"
+	"ClrFlag(SelectedPads|SelectedTexts|SelectedNames, flag)\n"
+	"ClrFlag(SelectedElements, flag)\n" "flag = thermal | join";
+
+static const char pcb_acth_ClrFlag[] = "Clears flags on objects.";
+
+/* %start-doc actions ClrFlag
+
+Turns the given flag off, regardless of its previous setting.  See
+@code{ChangeFlag}.
+
+@example
+ClrFlag(SelectedLines,join)
+@end example
+
+%end-doc */
+
+static fgw_error_t pcb_act_ClrFlag(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *flag;
+
+	PCB_ACT_CONVARG(1, FGW_STR, SetFlag, function = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, SetFlag, flag = argv[2].val.str);
+
+	ChangeFlag(function, flag, 0, "ClrFlag");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_SetValue[] = "SetValue(Grid|Line|LineSize|Text|TextScale, delta)";
+
+static const char pcb_acth_SetValue[] = "Change various board-wide values and sizes.";
+
+/* %start-doc actions SetValue
+
+@table @code
+
+@item Grid
+Sets the grid spacing.
+
+@item Line
+@item LineSize
+Changes the thickness of new lines.
+
+@item Text
+@item TextScale
+Changes the size of new text.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_SetValue(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int fnc_id;
+	const char *val;
+	const char *units = NULL;
+	pcb_bool absolute;								/* flag for 'absolute' value */
+	double value;
+	int err = 0;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, SetValue, fnc_id = fgw_keyword(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_STR, SetValue, val = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, SetValue, units = argv[3].val.str);
+
+	/* special case: can't convert with pcb_get_value() */
+	if ((fnc_id == F_Grid) && ((val[0] == '*') || (val[0] == '/'))) {
+		double d;
+		char *end;
+
+		d = strtod(val+1, &end);
+		if ((*end != '\0') || (d <= 0)) {
+			pcb_message(PCB_MSG_ERROR, "SetValue: Invalid multiplier/divider for grid set: needs to be a positive number\n");
+			return 1;
+		}
+		pcb_grid_inval();
+		if (val[0] == '*')
+			pcb_board_set_grid(pcb_round(PCB->Grid * d), pcb_false, 0, 0);
+		else
+			pcb_board_set_grid(pcb_round(PCB->Grid / d), pcb_false, 0, 0);
+	}
+
+	value = pcb_get_value(val, units, &absolute, NULL);
+
+	switch(fnc_id) {
+		case F_Grid:
+			pcb_grid_inval();
+			if (absolute)
+				pcb_board_set_grid(value, pcb_false, 0, 0);
+			else {
+				/* On the way down, short against the minimum
+				 * PCB drawing unit */
+				if ((value + PCB->Grid) < 1)
+					pcb_board_set_grid(1, pcb_false, 0, 0);
+				else if (PCB->Grid == 1)
+					pcb_board_set_grid(value, pcb_false, 0, 0);
+				else
+					pcb_board_set_grid(value + PCB->Grid, pcb_false, 0, 0);
+			}
+			break;
+
+		case F_LineSize:
+		case F_Line:
+			pcb_board_set_line_width(absolute ? value : value + conf_core.design.line_thickness);
+			pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+			break;
+
+		case F_Text:
+		case F_TextScale:
+			value = pcb_round(value / (double)PCB_FONT_CAPHEIGHT * 100.0);
+			pcb_board_set_text_scale(absolute ? value : (value + conf_core.design.text_scale));
+			break;
+		default:
+			err = 1;
+			break;
+	}
+	if (!err) {
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	PCB_ACT_FAIL(SetValue);
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeAngle[] =
+	"ChangeAngle(Object, start|delta|both, delta)\n"
+	"ChangeAngle(SelectedObjects|Selected, start|delta|both, delta)\n"
+	"ChangeAngle(SelectedArcs, start|delta|both, delta)\n";
+static const char pcb_acth_ChangeAngle[] = "Changes the start angle, delta angle or both angles of an arc.";
+static fgw_error_t pcb_act_ChangeAngle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *prim;
+	const char *delta;
+	pcb_bool absolute;								/* indicates if absolute size is given */
+	double value;
+	int funcid, type = PCB_OBJ_VOID, which;
+	void *ptr1, *ptr2, *ptr3;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeAngle, funcid = fgw_keyword(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_STR, ChangeAngle, prim = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, ChangeAngle, delta = argv[3].val.str);
+
+
+	if (pcb_strcasecmp(prim, "start") == 0) which = 0;
+	else if (pcb_strcasecmp(prim, "delta") == 0) which = 1;
+	else if (pcb_strcasecmp(prim, "both") == 0) which = 2;
+	else {
+		pcb_message(PCB_MSG_ERROR, "Second argument of ChangeAngle must be start, delta or both\n");
+		return -1;
+	}
+
+	if (funcid == F_Object) {
+		pcb_coord_t x, y;
+		pcb_hid_get_coords("Click on object to change angle of", &x, &y, 0);
+		type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3);
+	}
+
+	{ /* convert angle from string */
+		char *end;
+		while(isspace(*delta)) delta++;
+		value = strtod(delta, &end);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "Invalid numeric (in angle)\n");
+			return -1;
+		}
+		absolute = ((*delta != '-') && (*delta != '+'));
+	}
+	
+	switch(funcid) {
+		case F_Object:
+			{
+				if (type != PCB_OBJ_VOID) {
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
+						pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+					else {
+						if (pcb_chg_obj_angle(type, ptr1, ptr2, ptr3, which, value, absolute))
+							pcb_board_set_changed_flag(pcb_true);
+					}
+				}
+				break;
+			}
+
+		case F_SelectedArcs:
+			if (pcb_chg_selected_angle(PCB_OBJ_ARC, which, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_angle(PCB_CHANGESIZE_TYPES, which, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_ChangeRadius[] =
+	"ChangeRadius(Object, width|x|height|y|both, delta)\n"
+	"ChangeRadius(SelectedObjects|Selected, width|x|height|y|both, delta)\n"
+	"ChangeRadius(SelectedArcs, width|x|height|y|both, delta)\n";
+static const char pcb_acth_ChangeRadius[] = "Changes the width or height (radius) of an arc.";
+static fgw_error_t pcb_act_ChangeRadius(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *prim;
+	const char *delta;
+	const char *units;
+	pcb_bool absolute;								/* indicates if absolute size is given */
+	double value;
+	int funcid, type = PCB_OBJ_VOID, which;
+	void *ptr1, *ptr2, *ptr3;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ChangeRadius, funcid = fgw_keyword(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_STR, ChangeRadius, prim = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, ChangeRadius, delta = argv[3].val.str);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, ChangeRadius, units = argv[4].val.str);
+
+	if ((pcb_strcasecmp(prim, "width") == 0) || (pcb_strcasecmp(prim, "x") == 0)) which = 0;
+	else if ((pcb_strcasecmp(prim, "height") == 0) || (pcb_strcasecmp(prim, "y") == 0)) which = 1;
+	else if (pcb_strcasecmp(prim, "both") == 0) which = 2;
+	else {
+		pcb_message(PCB_MSG_ERROR, "Second argument of ChangeRadius must be width, x, height, y or both\n");
+		return -1;
+	}
+
+	if (funcid == F_Object) {
+		pcb_coord_t x, y;
+		pcb_hid_get_coords("Click on object to change radius of", &x, &y, 0);
+		type = pcb_search_screen(x, y, PCB_CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3);
+	}
+
+	value = pcb_get_value(delta, units, &absolute, NULL);
+
+	switch(funcid) {
+		case F_Object:
+			{
+				if (type != PCB_OBJ_VOID) {
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
+						pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+					else {
+						if (pcb_chg_obj_radius(type, ptr1, ptr2, ptr3, which, value, absolute))
+							pcb_board_set_changed_flag(pcb_true);
+					}
+				}
+				break;
+			}
+
+		case F_SelectedArcs:
+			if (pcb_chg_selected_radius(PCB_OBJ_ARC, which, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		case F_Selected:
+		case F_SelectedObjects:
+			if (pcb_chg_selected_radius(PCB_CHANGESIZE_TYPES, which, value, absolute))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+/* --------------------------------------------------------------------------- */
+
+pcb_action_t change_action_list[] = {
+	{"ChangeAngle", pcb_act_ChangeAngle, pcb_acth_ChangeAngle, pcb_acts_ChangeAngle},
+	{"ChangeClearSize", pcb_act_ChangeClearSize, pcb_acth_ChangeClearSize, pcb_acts_ChangeClearSize},
+	{"ChangeDrillSize", pcb_act_Change2ndSize, pcb_acth_Change2ndSize, pcb_acts_Change2ndSize},
+	{"ChangeJoin", pcb_act_ChangeJoin, pcb_acth_ChangeJoin, pcb_acts_ChangeJoin},
+	{"ChangeName", pcb_act_ChangeName, pcb_acth_ChangeName, pcb_acts_ChangeName},
+	{"ChangePinName", pcb_act_ChangePinName, pcb_acth_ChangePinName, pcb_acts_ChangePinName},
+	{"ChangeRadius", pcb_act_ChangeRadius, pcb_acth_ChangeRadius, pcb_acts_ChangeRadius},
+	{"ChangeSize", pcb_act_ChangeSize, pcb_acth_ChangeSize, pcb_acts_ChangeSize},
+	{"ChangeSizes", pcb_act_ChangeSizes, pcb_acth_ChangeSizes, pcb_acts_ChangeSizes},
+	{"ChangeNonetlist", pcb_act_ChangeNonetlist, pcb_acth_ChangeNonetlist, pcb_acts_ChangeNonetlist},
+	{"ChangeFlag", pcb_act_ChangeFlag, pcb_acth_ChangeFlag, pcb_acts_ChangeFlag},
+	{"SetThermal", pcb_act_SetThermal, pcb_acth_SetThermal, pcb_acts_SetThermal},
+	{"SetValue", pcb_act_SetValue, pcb_acth_SetValue, pcb_acts_SetValue},
+	{"SetFlag", pcb_act_SetFlag, pcb_acth_SetFlag, pcb_acts_SetFlag},
+	{"ClrFlag", pcb_act_ClrFlag, pcb_acth_ClrFlag, pcb_acts_ClrFlag}
+};
+
+PCB_REGISTER_ACTIONS(change_action_list, NULL)
Index: tags/2.0.1/src/compat_cc.h
===================================================================
--- tags/2.0.1/src/compat_cc.h	(nonexistent)
+++ tags/2.0.1/src/compat_cc.h	(revision 18980)
@@ -0,0 +1,73 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_COMPAT_CC_H
+#define PCB_COMPAT_CC_H
+
+/* ---------------------------------------------------------------------------
+ * Macros to annotate branch-prediction information.
+ * Taken from GLib 2.16.3 (LGPL 2).G_ / g_ prefixes have
+ * been removed to avoid namespace clashes.
+ */
+
+/* The LIKELY and UNLIKELY macros let the programmer give hints to
+ * the compiler about the expected result of an expression. Some compilers
+ * can use this information for optimizations.
+ *
+ * The PCB_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
+ * putting assignments inside the test.
+ */
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+#	define PCB_BOOLEAN_EXPR(expr)                   \
+ __extension__ ({                             \
+   int _boolean_var_;                         \
+   if (expr)                                  \
+      _boolean_var_ = 1;                      \
+   else                                       \
+      _boolean_var_ = 0;                      \
+   _boolean_var_;                             \
+})
+#	define PCB_LIKELY(expr) (__builtin_expect (PCB_BOOLEAN_EXPR(expr), 1))
+#	define PCB_UNLIKELY(expr) (__builtin_expect (PCB_BOOLEAN_EXPR(expr), 0))
+#else
+#	define PCB_LIKELY(expr) (expr)
+#	define PCB_UNLIKELY(expr) (expr)
+#endif
+
+#ifndef GCC_VERSION
+#	define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
+#endif /* GCC_VERSION */
+
+#if GCC_VERSION > 2007
+#	define PCB_ATTRIBUTE_UNUSED __attribute__((unused))
+#else
+#	define PCB_ATTRIBUTE_UNUSED
+#endif
+
+#endif
Index: tags/2.0.1/src/compat_fs.c
===================================================================
--- tags/2.0.1/src/compat_fs.c	(nonexistent)
+++ tags/2.0.1/src/compat_fs.c	(revision 18980)
@@ -0,0 +1,321 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* misc functions used by several modules */
+
+#include "config.h"
+
+#include "compat_inc.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <math.h>
+#include <string.h>
+#include <memory.h>
+#include <ctype.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <assert.h>
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "globalconst.h"
+#include "safe_fs.h"
+
+#include <genvector/gds_char.h>
+
+#include "error.h"
+
+char *pcb_get_wd(char *path)
+{
+#if defined(HAVE_GETCWD)
+	return getcwd(path, PCB_PATH_MAX);
+#elif defined(HAVE__GETCWD)
+	return _getcwd(path, PCB_PATH_MAX);
+#else
+	/* seems that some BSD releases lack of a prototype for getwd() */
+	return getwd(path);
+#endif
+}
+
+#if defined(USE_MKDIR)
+#	define MKDIR mkdir
+#elif defined(USE__MKDIR)
+#	define MKDIR _mkdir
+#else
+#	error no mkdir() available
+#endif
+int pcb_mkdir(const char *path, int mode)
+{
+#if MKDIR_NUM_ARGS == 1
+	return MKDIR(path);
+#elif MKDIR_NUM_ARGS == 2
+	return MKDIR(path, mode);
+#else
+#	error invalid number of arguments for mkdir
+#endif
+}
+#undef MKDIR
+
+int pcb_file_readable(const char *path)
+{
+	FILE *f;
+	f = pcb_fopen(path, "r");
+	if (f != NULL) {
+		fclose(f);
+		return 1;
+	}
+	return 0;
+}
+
+int pcb_spawnvp(const char **argv)
+{
+#if defined(USE_SPAWNVP)
+	int result = _spawnvp(_P_WAIT, argv[0], (const char *const *) argv);
+	if (result == -1)
+		return 1;
+	else
+		return 0;
+#elif defined(USE_FORK_WAIT)
+	int pid;
+	pid = fork();
+	if (pid < 0) {
+		/* error */
+		pcb_message(PCB_MSG_ERROR, _("Cannot fork!"));
+		return 1;
+	}
+	else if (pid == 0) {
+		/* Child */
+		execvp(argv[0], (char* const*) argv);
+		exit(1);
+	}
+	else {
+		int rv;
+		/* Parent */
+		wait(&rv);
+	}
+	return 0;
+#else
+#	error Do not know how to run a background process.
+#endif
+}
+
+
+/* Hopefully the operating system
+ * provides a mkdtemp() function to securely create a temporary
+ * directory with mode 0700.  If so then that directory is created and
+ * the returned string is made up of the directory plus the name
+ * variable.  For example:
+ *
+ * pcb_tempfile_name_new("myfile") might return
+ * "/var/tmp/pcb.123456/myfile".
+ *
+ * If mkdtemp() is not available then 'name' is ignored and the
+ * insecure tmpnam() function is used.
+ *
+ * Files/names created with pcb_tempfile_name_new() should be unlinked
+ * with tempfile_unlink to make sure the temporary directory is also
+ * removed when mkdtemp() is used.
+ */
+char *pcb_tempfile_name_new(const char *name)
+{
+	char *tmpfile = NULL;
+#ifdef HAVE_MKDTEMP
+#ifdef inline
+	/* Suppress compiler warnings; -Dinline means we are compiling in
+	   --debug with -ansi -pedantic; we do know that mkdtemp exists on the system,
+	   since HAVE_MKDTEMP is set. */
+	char *mkdtemp(char *template);
+#endif
+	const char *tmpdir;
+	char *mytmpdir;
+	size_t len;
+#endif
+
+	assert(name != NULL);
+
+#ifdef HAVE_MKDTEMP
+#define TEMPLATE "pcb.XXXXXXXX"
+
+
+	tmpdir = getenv("TMPDIR");
+
+	/* FIXME -- what about win32? */
+	if (tmpdir == NULL) {
+		tmpdir = "/tmp";
+	}
+
+	mytmpdir = (char *) malloc(sizeof(char) * (strlen(tmpdir) + 1 + strlen(TEMPLATE) + 1));
+	if (mytmpdir == NULL) {
+		fprintf(stderr, "pcb_tempfile_name_new(): malloc failed()\n");
+		exit(1);
+	}
+
+	*mytmpdir = '\0';
+	(void) strcat(mytmpdir, tmpdir);
+	(void) strcat(mytmpdir, PCB_DIR_SEPARATOR_S);
+	(void) strcat(mytmpdir, TEMPLATE);
+	if (mkdtemp(mytmpdir) == NULL) {
+		fprintf(stderr, "pcb_spawnvp():  mkdtemp (\"%s\") failed\n", mytmpdir);
+		free(mytmpdir);
+		return NULL;
+	}
+
+
+	len = strlen(mytmpdir) +			/* the temp directory name */
+		1 +													/* the directory sep. */
+		strlen(name) +							/* the file name */
+		1														/* the \0 termination */
+		;
+
+	tmpfile = (char *) malloc(sizeof(char) * len);
+
+	*tmpfile = '\0';
+	(void) strcat(tmpfile, mytmpdir);
+	(void) strcat(tmpfile, PCB_DIR_SEPARATOR_S);
+	(void) strcat(tmpfile, name);
+
+	free(mytmpdir);
+#undef TEMPLATE
+#else
+	/*
+	 * tmpnam() uses a static buffer so pcb_strdup() the result right away
+	 * in case someone decides to create multiple temp names.
+	 */
+	tmpfile = pcb_strdup(tmpnam(NULL));
+#ifdef __WIN32__
+	{
+		/* Guile doesn't like \ separators */
+		char *c;
+		for (c = tmpfile; *c; c++)
+			if (*c == '\\')
+				*c = '/';
+	}
+#endif
+#endif
+
+	return tmpfile;
+}
+
+/* If we have mkdtemp() then our temp file lives in a temporary directory and
+ * we need to remove that directory too. */
+int pcb_tempfile_unlink(char *name)
+{
+#ifdef DEBUG
+	/* SDB says:  Want to keep old temp files for examination when debugging */
+	return 0;
+#endif
+
+#ifdef HAVE_MKDTEMP
+	int e, rc2 = 0;
+	char *dname;
+
+	unlink(name);
+	/* it is possible that the file was never created so it is OK if the
+	   unlink fails */
+
+	/* now figure out the directory name to remove */
+	e = strlen(name) - 1;
+	while (e > 0 && name[e] != PCB_DIR_SEPARATOR_C) {
+		e--;
+	}
+
+	dname = pcb_strdup(name);
+	dname[e] = '\0';
+
+	/*
+	 * at this point, e *should* point to the end of the directory part
+	 * but lets make sure.
+	 */
+	if (e > 0) {
+		rc2 = rmdir(dname);
+		if (rc2 != 0) {
+			perror(dname);
+		}
+
+	}
+	else {
+		fprintf(stderr, _("pcb_tempfile_unlink():  Unable to determine temp directory name from the temp file\n"));
+		fprintf(stderr, "pcb_tempfile_unlink():  \"%s\"\n", name);
+		rc2 = -1;
+	}
+
+	/* name was allocated with malloc */
+	free(dname);
+	free(name);
+
+	/*
+	 * FIXME - should also return -1 if the temp file exists and was not
+	 * removed.
+	 */
+	if (rc2 != 0) {
+		return -1;
+	}
+
+#else
+	int rc = unlink(name);
+
+	if (rc != 0) {
+		fprintf(stderr, _("Failed to unlink \"%s\"\n"), name);
+		free(name);
+		return rc;
+	}
+	free(name);
+
+#endif
+
+	return 0;
+}
+
+int pcb_is_dir(const char *path)
+{
+	struct stat st;
+	if (stat(path, &st) != 0)
+		return 0;
+	return S_ISDIR(st.st_mode);
+}
+
+int pcb_is_path_abs(const char *fn)
+{
+#ifdef __WIN32__
+	/* full path with drive, e.g. c:\foo */
+	if (isalpha(fn[0]) && (fn[1] == ':') && ((fn[2] == '\\') || (fn[2] == '/')))
+		return 1;
+
+	/* full path without drive and remote paths, e.g. \\workgroup\foo */
+	if ((fn[0] == '\\') || (fn[0] == '/')))
+		return 1;
+
+	return 0;
+#else
+	return (*fn == '/');
+#endif
+}
Index: tags/2.0.1/src/compat_fs.h
===================================================================
--- tags/2.0.1/src/compat_fs.h	(nonexistent)
+++ tags/2.0.1/src/compat_fs.h	(revision 18980)
@@ -0,0 +1,25 @@
+/* Returns pointer to current working directory.  If 'path' is not NULL, then
+   the current working directory is copied to the array pointed to by 'path' */
+char *pcb_get_wd(char *path);
+
+int pcb_mkdir(const char *path, int mode);
+
+/* alternative to system() for proper argument passing */
+int pcb_spawnvp(const char **argv);
+
+/* Return 1 if path is a file that can be opened for read */
+int pcb_file_readable(const char *path);
+
+/* Creates a new temporary file name. Warning: race condition: doesn't create
+the file! */
+char *pcb_tempfile_name_new(const char *name);
+
+/* remove temporary file and _also_ free the memory for name
+ * (this fact is a little confusing) */
+int pcb_tempfile_unlink(char *name);
+
+/* Return non-zero if path is a directory */
+int pcb_is_dir(const char *path);
+
+/* Return non-zero if fn is an absolute path */
+int pcb_is_path_abs(const char *fn);
Index: tags/2.0.1/src/compat_inc.h.in
===================================================================
--- tags/2.0.1/src/compat_inc.h.in	(nonexistent)
+++ tags/2.0.1/src/compat_inc.h.in	(revision 18980)
@@ -0,0 +1,58 @@
+put /local/pcb/compat_inc [@
+
+@?/host/libs/fs/realpath/includes@
+@?libs/ldl/includes@
+@?libs/LoadLibrary/includes@
+@?libs/fs/getcwd/includes@
+@?libs/fs/_getcwd/includes@
+@?libs/fs/getwd/includes@
+@?/target/libs/proc/wait/includes@
+@?/target/libs/proc/fork/includes@
+@?/target/libs/proc/_spawnvp/includes@
+@?/target/libs/fs/mkdir/includes@
+@?/target/libs/fs/_mkdir/includes@
+@?/target/libs/fs/mkdtemp/includes@
+@?/target/libs/userpass/getpwuid/includes@
+@?/target/libs/math/round/includes@
+@?/target/libs/env/setenv/includes@
+@?/target/libs/fs/readdir/includes@
+@?/target/libs/io/fileno/includes@
+@?/target/libs/time/Sleep/includes@
+@?/target/libs/time/usleep/includes@
+@]
+
+put /tmpasm/IFS {\n}
+put /local/OFS_save /tmpasm/OFS
+put /tmpasm/OFS {\n}
+gsub /local/pcb/compat_inc {\\\\n *} {\n}
+uniq /local/pcb/compat_inc /local/pcb/compat_inc {#define} {#include}
+
+# do not redefine _XOPEN_SOURCE, which is hardwired in this template
+gsub /local/pcb/compat_inc {#define *_XOPEN_SOURCE} {}
+
+put /tmpasm/OFS /local/OFS_save
+
+
+print [@
+/*** DO NOT EDIT - automatically generated by scconfig ***/
+
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#endif
+
+#define _XOPEN_SOURCE 500
+
+/* system-dependent includes, as detected in ./configure */
+
+@/local/pcb/compat_inc@
+
+/* These are required for stat() but are C89. Keeping them here, just in case. */
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+/* Name of fileno() differs on windows */
+#define PCB_HOST_FILENO(f) @/target/libs/io/fileno/call@(f)
+@]
+
+
Index: tags/2.0.1/src/compat_lrealpath.c
===================================================================
--- tags/2.0.1/src/compat_lrealpath.c	(nonexistent)
+++ tags/2.0.1/src/compat_lrealpath.c	(revision 18980)
@@ -0,0 +1,157 @@
+/* Libiberty realpath.  Like realpath, but more consistent behavior.
+   Based on gdb_realpath from GDB.
+
+   Copyright 2003 Free Software Foundation, Inc.
+
+   This file is part of the libiberty library.
+
+   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 2 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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/*
+
+@deftypefn Replacement {const char*} pcb_lrealpath(const char *@var{name})
+
+Given a pointer to a string containing a pathname, returns a canonical
+version of the filename.  Symlinks will be resolved, and ``.'' and ``..''
+components will be simplified.  The returned value will be allocated using
+@code{malloc}, or @code{NULL} will be returned on a memory allocation error.
+
+@end deftypefn
+
+*/
+
+#include "compat_inc.h"
+#include "config.h"
+#include "compat_lrealpath.h"
+#include <limits.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <string.h>
+#include "compat_misc.h"
+
+/* On GNU libc systems the declaration is only visible with _GNU_SOURCE.  */
+#if defined(HAVE_CANONICALIZE_FILE_NAME) \
+    && defined(NEED_DECLARATION_CANONICALIZE_FILE_NAME)
+extern char *canonicalize_file_name(const char *);
+#endif
+
+#if defined(HAVE_REALPATH)
+#if defined (PATH_MAX)
+#define REALPATH_LIMIT PATH_MAX
+#else
+#if defined (PCB_PATH_MAX)
+#define REALPATH_LIMIT PCB_PATH_MAX
+#endif
+#endif
+#else
+	/* cygwin has realpath, so it won't get here.  */
+#if defined (_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>						/* for GetFullPathName */
+#endif
+#endif
+
+char *pcb_lrealpath(const char *filename)
+{
+	/* Method 1: The system has a compile time upper bound on a filename
+	   path.  Use that and realpath() to canonicalize the name.  This is
+	   the most common case.  Note that, if there isn't a compile time
+	   upper bound, you want to avoid realpath() at all costs.  */
+#if defined(REALPATH_LIMIT)
+	{
+		char buf[REALPATH_LIMIT];
+		const char *rp = realpath(filename, buf);
+		if (rp == NULL)
+			rp = filename;
+		return pcb_strdup(rp);
+	}
+	/* REALPATH_LIMIT */
+
+	/* Method 2: The host system (i.e., GNU) has the function
+	   canonicalize_file_name() which malloc's a chunk of memory and
+	   returns that, use that.  */
+#elif defined(HAVE_CANONICALIZE_FILE_NAME)
+	{
+		char *rp = canonicalize_file_name(filename);
+		if (rp == NULL)
+			return pcb_strdup(filename);
+		else
+			return rp;
+	}
+	/* HAVE_CANONICALIZE_FILE_NAME */
+
+	/* Method 3: Now we're getting desperate!  The system doesn't have a
+	   compile time buffer size and no alternative function.  Query the
+	   OS, using pathconf(), for the buffer limit.  Care is needed
+	   though, some systems do not limit PATH_MAX (return -1 for
+	   pathconf()) making it impossible to pass a correctly sized buffer
+	   to realpath() (it could always overflow).  On those systems, we
+	   skip this.  */
+#elif defined (HAVE_REALPATH) && defined (HAVE_UNISTD_H)
+	{
+#ifdef inline
+	/* Suppress compiler warnings; -Dinline means we are compiling in
+	   --debug with -ansi -pedantic; we do know that realpath exists on the system,
+	   because of the the ifdefs. */
+	char *realpath(const char *path, char *resolved_path);
+#endif
+
+		/* Find out the max path size.  */
+		long path_max = pathconf("/", _PC_PATH_MAX);
+		if (path_max > 0) {
+			/* PATH_MAX is bounded.  */
+			char *buf, *rp, *ret;
+			buf = (char *) malloc(path_max);
+			if (buf == NULL)
+				return NULL;
+			rp = realpath(filename, buf);
+			ret = pcb_strdup(rp ? rp : filename);
+			free(buf);
+			return ret;
+		}
+		return NULL;
+	}
+	/* HAVE_REALPATH && HAVE_UNISTD_H */
+
+	/* The MS Windows method.  If we don't have realpath, we assume we
+	   don't have symlinks and just canonicalize to a Windows absolute
+	   path.  GetFullPath converts ../ and ./ in relative paths to
+	   absolute paths, filling in current drive if one is not given
+	   or using the current directory of a specified drive (eg, "E:foo").
+	   It also converts all forward slashes to back slashes.  */
+#elif defined (_WIN32)
+	{
+		char buf[MAX_PATH];
+		char *basename;
+		DWORD len = GetFullPathName(filename, MAX_PATH, buf, &basename);
+		if (len == 0 || len > MAX_PATH - 1)
+			return pcb_strdup(filename);
+		else {
+			/* The file system is case-preserving but case-insensitive,
+			   Canonicalize to lowercase, using the codepage associated
+			   with the process locale.  */
+			CharLowerBuff(buf, len);
+			return pcb_strdup(buf);
+		}
+	}
+#else
+
+	/* This system is a lost cause, just duplicate the filename.  */
+	return pcb_strdup(filename);
+#endif
+}
Index: tags/2.0.1/src/compat_lrealpath.h
===================================================================
--- tags/2.0.1/src/compat_lrealpath.h	(nonexistent)
+++ tags/2.0.1/src/compat_lrealpath.h	(revision 18980)
@@ -0,0 +1,7 @@
+#ifndef PCB_LREALPATH_H
+#define PCB_LREALPATH_H
+
+/* A well-defined realpath () that is always compiled in.  */
+char *pcb_lrealpath(const char *);
+
+#endif /* PCB_LREALPATH_H */
Index: tags/2.0.1/src/compat_misc.c
===================================================================
--- tags/2.0.1/src/compat_misc.c	(nonexistent)
+++ tags/2.0.1/src/compat_misc.c	(revision 18980)
@@ -0,0 +1,219 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2004, 2006 Dan McMahill
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "compat_inc.h"
+#include "config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <math.h>
+#include <genvector/gds_char.h>
+#include "compat_misc.h"
+
+/* On some old systems random() works better than rand(). Unfortunately
+random() is less portable than rand(), which is C89. By default, just
+use rand(). Later on: scconfig should detect and enable random() if
+we find a system where it really breaks. */
+#ifdef HAVE_RANDOM
+long pcb_rand(void)
+{
+	return (long) random();
+}
+#else
+long pcb_rand(void)
+{
+	return (long) rand();
+}
+#endif
+
+const char *pcb_get_user_name(void)
+{
+#ifdef HAVE_GETPWUID
+	static struct passwd *pwentry;
+
+	int len;
+	char *comma, *gecos, *fab_author;
+
+	/* ID the user. */
+	pwentry = getpwuid(getuid());
+	gecos = pwentry->pw_gecos;
+	comma = strchr(gecos, ',');
+	if (comma)
+		len = comma - gecos;
+	else
+		len = strlen(gecos);
+	fab_author = (char *) malloc(len + 1);
+	if (!fab_author) {
+		perror("pcb: out of memory.\n");
+		exit(-1);
+	}
+	memcpy(fab_author, gecos, len);
+	fab_author[len] = 0;
+	return fab_author;
+#else
+	return "Unknown";
+#endif
+}
+
+int pcb_getpid(void)
+{
+	return getpid();
+}
+
+char *pcb_strndup(const char *s, int len)
+{
+	int a, l = strlen(s);
+	char *o;
+
+	a = (len < l) ? len : l;
+	o = malloc(a+1);
+	memcpy(o, s, a);
+	o[a] = '\0';
+	return o;
+}
+
+char *pcb_strdup(const char *s)
+{
+	int l = strlen(s);
+	char *o;
+	o = malloc(l+1);
+	memcpy(o, s, l+1);
+	return o;
+}
+
+#ifdef HAVE_ROUND
+#undef round
+extern double round(double x);
+double pcb_round(double x)
+{
+	return round(x);
+}
+#else
+
+/* Implementation idea borrowed from an old gcc (GPL'd) */
+double pcb_round(double x)
+{
+	double t;
+
+/* We should check for inf here, but inf is not in C89; if we'd have isinf(),
+   we'd have round() as well and we wouldn't be here at all. */
+
+	if (x >= 0.0) {
+		t = ceil(x);
+		if (t - x > 0.5)
+			t -= 1.0;
+		return t;
+	}
+
+	t = ceil(-x);
+	if ((t + x) > 0.5)
+		t -= 1.0;
+	return -t;
+}
+#endif
+
+int pcb_strcasecmp(const char *s1, const char *s2)
+{
+	while(tolower(*s1) == tolower(*s2)) {
+		if (*s1 == '\0')
+			return 0;
+		s1++;
+		s2++;
+	}
+	return tolower(*s1) - tolower(*s2);
+}
+
+int pcb_strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	if (n == 0)
+		return 0;
+
+	while(tolower(*s1) == tolower(*s2)) {
+		n--;
+		if (n == 0)
+			return 0;
+		if (*s1 == '\0')
+			return 0;
+		s1++;
+		s2++;
+	}
+	return tolower(*s1) - tolower(*s2);
+}
+
+#ifdef PCB_HAVE_SETENV
+	extern int setenv();
+#endif
+
+int pcb_setenv(const char *name, const char *val, int overwrite)
+{
+#ifdef PCB_HAVE_SETENV
+	return setenv(name, val, overwrite);
+#else
+#	ifdef PCB_HAVE_PUTENV
+	int res;
+	gds_t tmp;
+	gds_init(&tmp);
+	gds_append_str(&tmp, name);
+	gds_append(&tmp, '=');
+	gds_append_str(&tmp, val);
+	res = putenv(tmp.array);
+	gds_uninit(&tmp);
+	return res;
+#	else
+	return -1;
+#	endif
+#endif
+}
+
+size_t pcb_print_utc(char *out, size_t out_len, time_t when)
+{
+	static const char *fmt = "%Y-%m-%d %H:%M:%S UTC";
+	if (when <= 0)
+		when = time(NULL);
+
+	return strftime(out, out_len, fmt, gmtime(&when));
+}
+
+void pcb_ms_sleep(long ms)
+{
+#ifdef PCB_HAVE_USLEEP
+	usleep(ms*1000);
+#else
+#	ifdef PCB_HAVE_WSLEEP
+		Sleep(ms);
+#	else
+#		error pcb_ms_sleep(): no milisecond sleep on this host.
+#	endif
+#endif
+}
+
+int pcb_fileno(FILE *f)
+{
+	return PCB_HOST_FILENO(f);
+}
Index: tags/2.0.1/src/compat_misc.h
===================================================================
--- tags/2.0.1/src/compat_misc.h	(nonexistent)
+++ tags/2.0.1/src/compat_misc.h	(revision 18980)
@@ -0,0 +1,66 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2004 Dan McMahill
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_COMPAT_MISC_H
+#define PCB_COMPAT_MISC_H
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+
+long pcb_rand(void);
+
+/* Gets the user's real name when available; normally shouldn't be used,
+   consider using pcb_author() that allows config override */
+const char *pcb_get_user_name(void);
+
+int pcb_getpid(void);
+
+char *pcb_strndup(const char *s, int len);
+char *pcb_strdup(const char *s);
+
+#define pcb_strdup_null(x) (((x) != NULL) ? pcb_strdup (x) : NULL)
+
+double pcb_round(double x);
+
+int pcb_strcasecmp(const char *s1, const char *s2);
+int pcb_strncasecmp(const char *s1, const char *s2, size_t n);
+
+int pcb_setenv(const char *name, const char *val, int overwrite);
+
+/* Print a date in UTC; if when is 0, print current date */
+size_t pcb_print_utc(char *out, size_t out_len, time_t when);
+
+/* Sleep for the specified number if miliseconds */
+void pcb_ms_sleep(long ms);
+
+int pcb_fileno(FILE *f);
+
+#endif /* PCB_COMPAT_MISC_H */
Index: tags/2.0.1/src/compat_nls.h
===================================================================
--- tags/2.0.1/src/compat_nls.h	(nonexistent)
+++ tags/2.0.1/src/compat_nls.h	(revision 18980)
@@ -0,0 +1,58 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_COMPAT_NLS
+#define PCB_COMPAT_NLS
+
+/* Internationalization support. */
+#ifdef ENABLE_NLS
+#	include <libintl.h>
+#	define _(S) gettext(S)
+#	if defined(gettext_noop)
+#		define N_(S) gettext_noop(S)
+#	else
+#		define N_(S) S
+#	endif
+#	ifdef LOCALEDIR
+#		define pcb_setlocale setlocale
+#	else
+#		define pcb_setlocale(a, b)
+#	endif
+#else
+#	define _(S) S
+#	define N_(S) S
+#	define textdomain(S) (S)
+#	define gettext(S) (S)
+#	define dgettext(D, S) (S)
+#	define dcgettext(D, S, T) (S)
+#	define bindtextdomain(D, Dir) (D)
+#	define pcb_setlocale(a, b)
+#endif /* ENABLE_NLS */
+
+#endif
Index: tags/2.0.1/src/conf.c
===================================================================
--- tags/2.0.1/src/conf.c	(nonexistent)
+++ tags/2.0.1/src/conf.c	(revision 18980)
@@ -0,0 +1,2121 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <genht/hash.h>
+#include <liblihata/tree.h>
+#include <stdarg.h>
+#include "config.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "conf_hid.h"
+#include "hid_cfg.h"
+#include "misc_util.h"
+#include "error.h"
+#include "paths.h"
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "build_run.h"
+
+#define CONF_USER_DIR "~/" DOT_PCB_RND
+
+/* conf list node's name */
+const char *conf_list_name = "pcb-rnd-conf-v1";
+static const char *conf_user_fn = CONF_USER_DIR "/pcb-conf.lht";
+static const char *flcat = "conf";
+
+
+/* The main conf: monolithic config files affecting all parts of the conf tree;
+   By default every operation is done on these trees. */
+lht_doc_t *conf_main_root[CFR_max_alloc];
+int conf_main_root_lock[CFR_max_alloc];
+int conf_lht_dirty[CFR_max_alloc];
+
+/* Plugin config: only plugin configuration is accepted; never edited, only
+   merged in. Merge takes two steps: first all files per role are merged into
+   a single conf_plug_root[R] (lihata level merge), then conf_plug_root[R]
+   is merged in using the normal conf merge mechanism. Plug roots are
+   merged before main roots so main root overwrite are stronger. */
+lht_doc_t *conf_plug_root[CFR_max_alloc];
+
+
+htsp_t *conf_fields = NULL;
+const int conf_default_prio[] = {
+/*	CFR_INTERNAL */   100,
+/*	CFR_SYSTEM */     200,
+/*	CFR_DEFAULTPCB */ 300,
+/*	CFR_USER */       400,
+/*	CFR_ENV */        500,
+/*	CFR_PROJECT */    600,
+/*	CFR_DESIGN */     700,
+/*	CFR_CLI */        800,
+0, 0, 0, 0, 0, 0, 0, 0, 0 /* make sure the array is addressable until CFR_max_alloc */
+};
+
+extern const char *conf_internal;
+
+
+static lht_node_t *conf_lht_get_confroot(lht_node_t *cwd)
+{
+	if (cwd == NULL)
+		return NULL;
+
+	/* if it's a list with a matching name, we found it */
+	if ((cwd->type == LHT_LIST) && (strcmp(cwd->name, conf_list_name) == 0))
+		return cwd;
+
+	/* else it may be the parent-hash of the list */
+	if (cwd->type != LHT_HASH)
+		return NULL;
+
+	return lht_dom_hash_get(cwd, conf_list_name);
+}
+
+int conf_insert_tree_as(conf_role_t role, lht_node_t *root)
+{
+	lht_doc_t *d;
+
+	if ((root->type != LHT_LIST) || (strcmp(root->name, "pcb-rnd-conf-v1") != 0))
+		return -1;
+
+	if (conf_main_root[role] != NULL) {
+		lht_dom_uninit(conf_main_root[role]);
+		conf_main_root[role] = NULL;
+	}
+
+	d = lht_dom_init();
+	d->root = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
+	d->root->doc = d;
+	lht_tree_merge(d->root, root);
+	conf_main_root[role] = d;
+	return 0;
+}
+
+static lht_doc_t *conf_load_plug_file(const char *fn, int fn_is_text)
+{
+	lht_doc_t *d;
+	const char *ifn;
+
+	if (fn_is_text) {
+		d = pcb_hid_cfg_load_str(fn);
+		ifn = "<string>";
+	}
+	else {
+		d = pcb_hid_cfg_load_lht(fn);
+		ifn = fn;
+	}
+
+	if (d == NULL) {
+		pcb_message(PCB_MSG_ERROR, "error: failed to load lht plugin config: %s (can't open the file or syntax error)\n", ifn);
+		return NULL;
+	}
+
+	if (d->root == NULL) {
+		pcb_message(PCB_MSG_ERROR, "error: failed to load lht plugin config: %s (no root)\n", ifn);
+		lht_dom_uninit(d);
+		return NULL;
+	}
+
+	if ((d->root->type != LHT_LIST) || (strcmp(d->root->name, "pcb-rnd-conf-v1") != 0)) {
+		pcb_message(PCB_MSG_ERROR, "error: failed to load lht plugin config: %s (not a pcb-rnd-conf-v1)\n", ifn);
+		lht_dom_uninit(d);
+		return NULL;
+	}
+
+	return d;
+}
+
+int conf_load_as(conf_role_t role, const char *fn, int fn_is_text)
+{
+	lht_doc_t *d;
+	const char *ifn, *role_name = conf_role_name(role);
+
+	if (conf_main_root_lock[role])
+		return -1;
+	if (conf_main_root[role] != NULL) {
+		lht_dom_uninit(conf_main_root[role]);
+		conf_main_root[role] = NULL;
+		if (role_name != NULL)
+			pcb_file_loaded_del_at(flcat, role_name);
+	}
+	if (fn_is_text) {
+		d = pcb_hid_cfg_load_str(fn);
+		ifn = "<string>";
+	}
+	else {
+		d = pcb_hid_cfg_load_lht(fn);
+		ifn = fn;
+	}
+
+	if (d == NULL) {
+		FILE *f;
+		char *efn;
+
+		f = pcb_fopen_fn(fn, "r", &efn);
+		if (f != NULL) { /* warn only if the file is there - missing file is normal */
+			pcb_message(PCB_MSG_ERROR, "error: failed to load lht config: %s (%s)\n", fn, efn);
+			fclose(f);
+		}
+		free(efn);
+		return -1;
+	}
+
+	if (d->root == NULL) {
+		lht_node_t *prjroot, *confroot;
+		prjroot = lht_dom_node_alloc(LHT_HASH, "geda-project-v1");
+		confroot = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
+		lht_dom_hash_put(prjroot, confroot);
+		prjroot->doc = d;
+		confroot->doc = d;
+		d->root = prjroot;
+		conf_main_root[role] = d;
+		if (role_name != NULL)
+			pcb_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
+		return 0;
+	}
+
+	if ((d->root->type == LHT_LIST) && (strcmp(d->root->name, "pcb-rnd-conf-v1") == 0)) {
+		conf_main_root[role] = d;
+		if (role_name != NULL)
+			pcb_file_loaded_set_at(flcat, role_name, ifn, "conf");
+		return 0;
+	}
+
+	if ((d->root->type == LHT_HASH) && (strcmp(d->root->name, "geda-project-v1") == 0)) {
+		lht_node_t *confroot;
+		confroot = lht_tree_path_(d, d->root, "pcb-rnd-conf-v1", 1, 0, NULL);
+
+		if (role_name != NULL)
+			pcb_file_loaded_set_at(flcat, role_name, ifn, "project/conf");
+
+		if ((confroot != NULL)  && (confroot->type == LHT_LIST) && (strcmp(confroot->name, "li:pcb-rnd-conf-v1") == 0)) {
+			conf_main_root[role] = d;
+			return 0;
+		}
+
+		/* project file with no config root */
+		confroot = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
+		lht_dom_hash_put(d->root, confroot);
+		conf_main_root[role] = d;
+		return 0;
+	}
+
+	pcb_hid_cfg_error(d->root, "Root node must be either li:pcb-rnd-conf-v1 or ha:geda-project-v1\n");
+
+	if (d != NULL)
+		lht_dom_uninit(d);
+	return -1;
+}
+
+#include "conf_regfile.c"
+
+static int conf_merge_plug(lht_doc_t *d, conf_role_t role, const char *path)
+{
+	lht_err_t err;
+
+	if (conf_plug_root[role] == NULL) {
+		conf_plug_root[role] = lht_dom_init();
+		conf_plug_root[role]->root = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
+		conf_plug_root[role]->root->doc = conf_plug_root[role];
+	}
+	err = lht_tree_merge(conf_plug_root[role]->root, d->root);
+	lht_dom_uninit(d);
+	if (err != 0) {
+		pcb_message(PCB_MSG_ERROR, "Failed to lihata-merge plugin config %s: %s\n", path, lht_err_str(err));
+		return 0;
+	}
+	return 1;
+}
+
+/* Load plugin config files */
+static int conf_load_plug_files(conf_role_t role, const char *dir)
+{
+	char path[PCB_PATH_MAX], *fn;
+	int dlen, cnt = 0;
+	htsi_entry_t *e;
+
+	if (conf_plug_root[role] != NULL) {
+		lht_dom_uninit(conf_plug_root[role]);
+		conf_plug_root[role] = NULL;
+	}
+
+	if (!conf_files_inited) return 0;
+
+	dlen = strlen(dir);
+	memcpy(path, dir, dlen);
+	path[dlen] = '/';
+	fn = path+dlen+1;
+
+	for (e = htsi_first(&conf_files); e; e = htsi_next(&conf_files, e)) {
+		strcpy(fn, e->key);
+		if (pcb_file_readable(path)) {
+			lht_doc_t *d = conf_load_plug_file(path, 0);
+			if (d != NULL) {
+				int res = conf_merge_plug(d, role, path);
+				if (res) {
+					char id[256];
+					pcb_snprintf(id, sizeof(id), "%s:%s", conf_role_name(role), fn);
+					pcb_file_loaded_set_at("conf/plugin", id, path, NULL);
+				}
+				cnt += res;
+			}
+		}
+	}
+
+	return cnt;
+}
+
+static int conf_load_plug_interns(conf_role_t role)
+{
+	int cnt = 0;
+	htsi_entry_t *e;
+
+	if (conf_plug_root[role] != NULL) {
+		lht_dom_uninit(conf_plug_root[role]);
+		conf_plug_root[role] = NULL;
+	}
+
+	if (!conf_files_inited) return 0;
+	for (e = htsi_first(&conf_interns); e; e = htsi_next(&conf_interns, e)) {
+		lht_doc_t *d = conf_load_plug_file(e->key, 1);
+		if (d != NULL) {
+			int res = conf_merge_plug(d, role, NULL);
+			cnt += res;
+		}
+	}
+
+	return cnt;
+}
+
+conf_policy_t conf_policy_parse(const char *s)
+{
+	if (pcb_strcasecmp(s, "overwrite") == 0)  return  POL_OVERWRITE;
+	if (pcb_strcasecmp(s, "prepend") == 0)    return  POL_PREPEND;
+	if (pcb_strcasecmp(s, "append") == 0)     return  POL_APPEND;
+	if (pcb_strcasecmp(s, "disable") == 0)    return  POL_DISABLE;
+	return POL_invalid;
+}
+
+const char *conf_policy_name(conf_policy_t p)
+{
+	switch(p) {
+		case POL_OVERWRITE: return "overwrite";
+		case POL_PREPEND:   return "prepend";
+		case POL_APPEND:    return "append";
+		case POL_DISABLE:   return "disable";
+		case POL_invalid:   return "(invalid)";
+	}
+	return "(unknown)";
+}
+
+conf_role_t conf_role_parse(const char *s)
+{
+	if (pcb_strcasecmp(s, "internal") == 0)   return CFR_INTERNAL;
+	if (pcb_strcasecmp(s, "system") == 0)     return CFR_SYSTEM;
+	if (pcb_strcasecmp(s, "defaultpcb") == 0) return CFR_DEFAULTPCB;
+	if (pcb_strcasecmp(s, "user") == 0)       return CFR_USER;
+	if (pcb_strcasecmp(s, "env") == 0)        return CFR_ENV;
+	if (pcb_strcasecmp(s, "project") == 0)    return CFR_PROJECT;
+	if (pcb_strcasecmp(s, "design") == 0)     return CFR_DESIGN;
+	if (pcb_strcasecmp(s, "cli") == 0)        return CFR_CLI;
+	return CFR_invalid;
+}
+
+const char *conf_role_name(conf_role_t r)
+{
+	switch(r) {
+		case CFR_INTERNAL:    return "internal";
+		case CFR_SYSTEM:      return "system";
+		case CFR_DEFAULTPCB:  return "defaultpcb";
+		case CFR_USER:        return "user";
+		case CFR_ENV:         return "env";
+		case CFR_PROJECT:     return "project";
+		case CFR_DESIGN:      return "design";
+		case CFR_CLI:         return "cli";
+		case CFR_file:        return "(file)";
+		case CFR_binary:      return "(binary)";
+
+		case CFR_max_alloc:
+		case CFR_max_real:
+		case CFR_invalid:     return "(invalid role)";
+	}
+	return "(unknown role)";
+}
+
+
+void conf_extract_poliprio(lht_node_t *root, conf_policy_t *gpolicy, long *gprio)
+{
+	long len = strlen(root->name), p = -1;
+	char tmp[128];
+	char *sprio, *end;
+	conf_policy_t pol;
+
+	if (len >= sizeof(tmp)) {
+		pcb_hid_cfg_error(root, "Invalid policy-prio '%s', subtree is ignored\n", root->name);
+		return;
+	}
+
+	memcpy(tmp, root->name, len+1);
+
+	/* split and convert prio */
+	sprio = strchr(tmp, '-');
+	if (sprio != NULL) {
+		*sprio = '\0';
+		sprio++;
+		p = strtol(sprio, &end, 10);
+		if ((*end != '\0') || (p < 0)) {
+			pcb_hid_cfg_error(root, "Invalid prio in '%s', subtree is ignored\n", root->name);
+			return;
+		}
+	}
+
+	/* convert policy */
+	pol = conf_policy_parse(tmp);
+	if (pol == POL_invalid) {
+		pcb_hid_cfg_error(root, "Invalid policy in '%s', subtree is ignored\n", root->name);
+		return;
+	}
+
+	/* by now the syntax is checked; save the output */
+	*gpolicy = pol;
+	if (p >= 0)
+		*gprio = p;
+}
+
+
+int conf_get_policy_prio(lht_node_t *node, conf_policy_t *gpolicy, long *gprio)
+{
+	for(;;node = node->parent) {
+		if (node->parent == node->doc->root) {
+			conf_extract_poliprio(node, gpolicy, gprio);
+			return 0;
+		}
+		if (node->parent == NULL)
+			return -1;
+	}
+}
+
+const char *conf_get_user_conf_name()
+{
+	return conf_user_fn;
+}
+
+const char *conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **try)
+{
+	static char res[PCB_PATH_MAX+1];
+	static const char *project_name = "project.lht";
+	FILE *f;
+	char *efn;
+
+	if (project_fn != NULL) {
+		strncpy(res, project_fn, sizeof(res)-1);
+		res[sizeof(res)-1] = '\0';
+		goto check;
+	}
+
+	if (pcb_fn != NULL) {
+		char *end;
+		/* replace pcb name with project_name and test */
+		strncpy(res, pcb_fn, sizeof(res)-1);
+		res[sizeof(res)-1] = '\0';
+		end = strrchr(res, PCB_DIR_SEPARATOR_C);
+		if (end != NULL) {
+			if (end+1+sizeof(project_name) >= res + sizeof(res))
+				return NULL;
+			strcpy(end+1, project_name);
+			goto check;
+		}
+		/* no path in pcb, try cwd */
+		strcpy(res, project_name);
+		goto check;
+	}
+
+	/* no pcb - no project */
+	*try = "<no pcb file, no path to try>";
+	return NULL;
+
+	check:;
+	*try = res;
+	f = pcb_fopen_fn(res, "r", &efn);
+	if (f != NULL) {
+		fclose(f);
+		strncpy(res, efn, sizeof(res)-1);
+		res[sizeof(res)-1] = '\0';
+		free(efn);
+		return res;
+	}
+
+	return NULL;
+}
+
+int conf_parse_text(confitem_t *dst, int idx, conf_native_type_t type, const char *text, lht_node_t *err_node)
+{
+	const char *strue[]  = {"true",  "yes",  "on",   "1", NULL};
+	const char *sfalse[] = {"false", "no",   "off",  "0", NULL};
+	const char **s;
+	char *end;
+	long l;
+	int base = 10;
+	double d;
+	const pcb_unit_t *u;
+
+	switch(type) {
+		case CFN_STRING:
+			dst->string[idx] = text;
+			break;
+		case CFN_BOOLEAN:
+			while(isspace(*text)) text++;
+			for(s = strue; *s != NULL; s++)
+				if (pcb_strncasecmp(*s, text, strlen(*s)) == 0) {
+					dst->boolean[idx] = 1;
+					return 0;
+				}
+			for(s = sfalse; *s != NULL; s++)
+				if (pcb_strncasecmp(*s, text, strlen(*s)) == 0) {
+					dst->boolean[idx] = 0;
+					return 0;
+				}
+			pcb_hid_cfg_error(err_node, "Invalid boolean value: %s\n", text);
+			return -1;
+		case CFN_INTEGER:
+			if ((text[0] == '0') && (text[1] == 'x')) {
+				text += 2;
+				base = 16;
+			}
+			l = strtol(text, &end, base);
+			while(isspace(*end))
+				end++;
+			if (*end == '\0') {
+				dst->integer[idx] = l;
+				return 0;
+			}
+			pcb_hid_cfg_error(err_node, "Invalid integer value: %s\n", text);
+			return -1;
+		case CFN_REAL:
+			d = strtod(text, &end);
+			if (*end == '\0') {
+				dst->real[idx] = d;
+				return 0;
+			}
+			pcb_hid_cfg_error(err_node, "Invalid numeric value: %s\n", text);
+			return -1;
+		case CFN_COORD:
+			{
+				pcb_bool succ;
+				dst->coord[idx] = pcb_get_value(text, NULL, NULL, &succ);
+				if (!succ)
+					pcb_hid_cfg_error(err_node, "Invalid numeric value (coordinate): %s\n", text);
+			}
+			break;
+		case CFN_UNIT:
+			u = get_unit_struct(text);
+			if (u == NULL)
+				pcb_hid_cfg_error(err_node, "Invalid unit: %s\n", text);
+			else
+				dst->unit[idx] = u;
+			break;
+		case CFN_COLOR:
+			dst->color[idx] = text; /* let the HID check validity to support flexibility of the format */
+			break;
+		default:
+			/* unknown field type registered in the fields hash: internal error */
+			return -1;
+	}
+	return 0;
+}
+
+int conf_merge_patch_text(conf_native_t *dest, lht_node_t *src, int prio, conf_policy_t pol)
+{
+	if ((pol == POL_DISABLE) || (dest->prop[0].prio > prio))
+		return 0;
+
+	if (dest->random_flags.read_only) {
+		pcb_hid_cfg_error(src, "WARNING: not going to overwrite read-only value %s from a config file\n", dest->hash_path);
+		return 0;
+	}
+
+	if (conf_parse_text(&dest->val, 0, dest->type, src->data.text.value, src) == 0) {
+		dest->prop[0].prio = prio;
+		dest->prop[0].src  = src;
+		dest->used         = 1;
+		dest->conf_rev     = conf_rev;
+	}
+	return 0;
+}
+
+static void conf_insert_arr(conf_native_t *dest, int offs)
+{
+#define CASE_PCB_MOVE(typ, fld) \
+	case typ: memmove(dest->val.fld+offs, dest->val.fld, dest->used * sizeof(dest->val.fld[0])); return
+
+	memmove(dest->prop+offs, dest->prop, dest->used * sizeof(dest->prop[0]));
+	if (dest->used > 0) {
+		switch(dest->type) {
+			CASE_PCB_MOVE(CFN_STRING, string);
+			CASE_PCB_MOVE(CFN_BOOLEAN, boolean);
+			CASE_PCB_MOVE(CFN_INTEGER, integer);
+			CASE_PCB_MOVE(CFN_REAL, real);
+			CASE_PCB_MOVE(CFN_COORD, coord);
+			CASE_PCB_MOVE(CFN_UNIT, unit);
+			CASE_PCB_MOVE(CFN_COLOR, color);
+			CASE_PCB_MOVE(CFN_LIST, list);
+		}
+	}
+#undef CASE_MOVE
+	abort(); /* unhandled type */
+}
+
+int conf_merge_patch_array(conf_native_t *dest, lht_node_t *src_lst, int prio, conf_policy_t pol)
+{
+	lht_node_t *s;
+	int res, idx, didx, maxpr;
+
+	if ((pol == POL_DISABLE) || (pol == POL_invalid))
+		return 0;
+
+	if (pol == POL_PREPEND) {
+		for(s = src_lst->data.list.first, maxpr = 0; s != NULL; s = s->next, maxpr++) ;
+
+		if (dest->used+maxpr >= dest->array_size)
+			maxpr = dest->array_size - dest->used - 1;
+
+		conf_insert_arr(dest, maxpr);
+		dest->used += maxpr;
+	}
+/*printf("arr merge prio: %d\n", prio);*/
+	for(s = src_lst->data.list.first, idx = 0; s != NULL; s = s->next, idx++) {
+		if (s->type == LHT_TEXT) {
+			switch(pol) {
+				case POL_PREPEND:
+					if (idx < maxpr)
+						didx = idx;
+					else
+						didx = dest->array_size+1; /* indicate array full */
+					break;
+				case POL_APPEND:
+					didx = dest->used++;
+					break;
+				case POL_OVERWRITE:
+					didx = idx;
+				break;
+				case POL_DISABLE: case POL_invalid: return 0; /* compiler warning */
+			}
+/*printf("   didx: %d / %d '%s'\n", didx, dest->array_size, s->data.text.value);*/
+			if (didx >= dest->array_size) {
+				pcb_hid_cfg_error(s, "Array is already full [%d] of [%d] ignored value: '%s' policy=%d\n", dest->used, dest->array_size, s->data.text.value, pol);
+				res = -1;
+				break;
+			}
+
+			if ((s->data.text.value != NULL) && (conf_parse_text(&dest->val, didx, dest->type, s->data.text.value, s) == 0)) {
+				dest->prop[didx].prio = prio;
+				dest->prop[didx].src  = s;
+				if (didx >= dest->used)
+					dest->used = didx+1;
+			}
+		}
+		else {
+			pcb_hid_cfg_error(s, "List item (in an array) must be text\n");
+			res = -1;
+		}
+	}
+
+	return res;
+}
+
+int conf_merge_patch_list(conf_native_t *dest, lht_node_t *src_lst, int prio, conf_policy_t pol)
+{
+	lht_node_t *s, *prev;
+	int res = 0;
+	conf_listitem_t *i;
+
+	switch(pol) {
+		case POL_DISABLE:
+		case POL_invalid:
+			return 0;
+
+		case POL_PREPEND:
+			for(s = src_lst->data.list.last; s != NULL; s = prev) {
+				/* because lihata lists are single linked, need to look up the previous node manually; O(N^2) */
+				if (s != src_lst->data.list.first)
+					for(prev = src_lst->data.list.first; prev->next != s; prev = prev->next);
+				else
+					prev = NULL;
+				if (s->type == LHT_TEXT) {
+					i = calloc(sizeof(conf_listitem_t), 1);
+					i->name = s->name;
+					i->val.string = &i->payload;
+					i->prop.prio = prio;
+					i->prop.src  = s;
+					if (conf_parse_text(&i->val, 0, CFN_STRING, s->data.text.value, s) != 0) {
+						free(i);
+						continue;
+					}
+					conflist_insert(dest->val.list, i);
+					dest->used |= 1;
+				}
+				else {
+					pcb_hid_cfg_error(s, "List item (on a list, prepend) must be text\n");
+					res = -1;
+				}
+			}
+			break;
+		case POL_OVERWRITE:
+			/* overwrite the whole list: make it empty then append new elements */
+			while((i = conflist_first(dest->val.list)) != NULL) {
+				conflist_remove(i);
+				free(i);
+			}
+			/* fall through */
+		case POL_APPEND:
+			for(s = src_lst->data.list.first; s != NULL; s = s->next) {
+				if (s->type == LHT_TEXT) {
+					i = calloc(sizeof(conf_listitem_t), 1);
+					i->name = s->name;
+					i->val.string = &i->payload;
+					i->prop.prio = prio;
+					i->prop.src  = s;
+					if (conf_parse_text(&i->val, 0, CFN_STRING, s->data.text.value, s) != 0) {
+						free(i);
+						continue;
+					}
+					conflist_append(dest->val.list, i);
+					dest->used |= 1;
+				}
+				else {
+					pcb_hid_cfg_error(s, "List item (on a list) must be text\n");
+					res = -1;
+				}
+			}
+			break;
+	}
+	return res;
+}
+
+int conf_merge_patch_recurse(lht_node_t *sect, int default_prio, conf_policy_t default_policy, const char *path_prefix);
+
+typedef struct conf_ignore_s {
+	const char *name;
+	int len;
+	int warned;
+} conf_ignore_t;
+
+static conf_ignore_t conf_ignores[] = {
+	/* it is normal to have configuration for plugins and utils not loaded - ignore these */
+	{"plugins/", 8, 1},
+	{"utils/", 6, 1},
+
+	/* old config paths - warn once and move on */
+	{"editor/show_mask", 16, 0},
+	{"editor/show_paste", 17, 0},
+	{"editor/increments", 17, 0},
+	{"design/max_width", 16, 0},
+	{"design/max_height", 17, 0},
+	{"design/groups", 13, 1},
+	{"design/default_layer_name", 25, 1},
+
+	{NULL, 0, 0}
+};
+
+static void conf_warn_unknown_paths(const char *path, lht_node_t *n)
+{
+	conf_ignore_t *i;
+
+	for(i = conf_ignores; i->name != NULL; i++) {
+		if (strncmp(path, i->name, i->len) == 0) {
+			if (i->warned)
+				return; /* do not warn again */
+			i->warned = 1;
+			break;
+		}
+	}
+	pcb_hid_cfg_error(n, "conf error: lht->bin conversion: can't find path '%s'\n(it may be an obsolete setting, check your lht)\n", path);
+}
+
+int conf_merge_patch_item(const char *path, lht_node_t *n, int default_prio, conf_policy_t default_policy)
+{
+	conf_native_t *target = conf_get_field(path);
+	int res = 0;
+	switch(n->type) {
+		case LHT_TEXT:
+			if (target == NULL)
+				conf_warn_unknown_paths(path, n);
+			else
+				conf_merge_patch_text(target, n, default_prio, default_policy);
+			break;
+		case LHT_HASH:
+			if (target == NULL) /* no leaf: another level of structs */
+				res |= conf_merge_patch_recurse(n, default_prio, default_policy, path);
+			else /* leaf: pretend it's text so it gets parsed */
+				conf_merge_patch_text(target, n, default_prio, default_policy);
+			break;
+		case LHT_LIST:
+			if (target == NULL)
+				conf_warn_unknown_paths(path, n);
+			else if (target->type == CFN_LIST)
+				res |= conf_merge_patch_list(target, n, default_prio, default_policy);
+			else if (target->array_size > 1)
+				res |= conf_merge_patch_array(target, n, default_prio, default_policy);
+			else
+				pcb_hid_cfg_error(n, "Attempt to initialize a scalar with a list - this node should be a text node\n");
+			break;
+		case LHT_SYMLINK:
+#warning TODO
+			break;
+		case LHT_INVALID_TYPE:
+		case LHT_TABLE:
+			/* intentionally unhandled types */
+			break;
+	}
+	return res;
+}
+
+
+/* merge main subtree of a patch */
+int conf_merge_patch_recurse(lht_node_t *sect, int default_prio, conf_policy_t default_policy, const char *path_prefix)
+{
+	lht_dom_iterator_t it;
+	lht_node_t *n;
+	char path[256], *pathe;
+	char *namee;
+	int nl, ppl = strlen(path_prefix), res = 0;
+
+	if (ppl >= sizeof(path)) {
+		pcb_message(PCB_MSG_ERROR, "Can not merge conf patch: name too long: '%s'\n", path_prefix);
+		return -1;
+	}
+
+	memcpy(path, path_prefix, ppl);
+	path[ppl] = '/';
+	pathe = path + ppl + 1;
+
+	for(n = lht_dom_first(&it, sect); n != NULL; n = lht_dom_next(&it)) {
+		nl = strlen(n->name);
+		if (nl >= (sizeof(path) - (pathe - path))) {
+			pcb_message(PCB_MSG_ERROR, "Can not merge conf patch: name too long: '%s'\n", n->name);
+			return -1;
+		}
+		memcpy(pathe, n->name, nl);
+		namee = pathe+nl;
+		*namee = '\0';
+		res |= conf_merge_patch_item(path, n, default_prio, default_policy);
+	}
+	return res;
+}
+
+int conf_merge_patch(lht_node_t *root, long gprio)
+{
+	conf_policy_t gpolicy;
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	if (root->type != LHT_HASH) {
+		pcb_hid_cfg_error(root, "patch root should be a hash\n");
+		return -1;
+	}
+
+	conf_extract_poliprio(root, &gpolicy, &gprio);
+
+	/* iterate over all hashes and insert them recursively */
+	for(n = lht_dom_first(&it, root); n != NULL; n = lht_dom_next(&it))
+		if (n->type == LHT_HASH)
+			conf_merge_patch_recurse(n, gprio, gpolicy, n->name);
+
+	return 0;
+}
+
+typedef struct {
+	long prio;
+	conf_policy_t policy;
+	lht_node_t *subtree;
+} merge_subtree_t;
+
+#define GVT(x) vmst_ ## x
+#define GVT_ELEM_TYPE merge_subtree_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 64
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+#include <genvector/genvector_impl.h>
+#include <genvector/genvector_impl.c>
+#include <genvector/genvector_undef.h>
+
+vmst_t merge_subtree; /* automatically initialized to all-zero */
+
+static void add_subtree(int role, lht_node_t *subtree_parent_root, lht_node_t *subtree_root)
+{
+	merge_subtree_t *m;
+
+	m = vmst_alloc_append(&merge_subtree, 1);
+	m->prio = conf_default_prio[role];
+	m->policy = POL_invalid;
+
+	conf_extract_poliprio(subtree_parent_root, &m->policy, &m->prio);
+	m->subtree = subtree_root;
+}
+
+static int mst_prio_cmp(const void *a, const void *b)
+{
+	const merge_subtree_t *s1 = a, *s2 = b;
+	if (s1->prio > s2->prio)
+		return 1;
+	return -1;
+}
+
+static void conf_merge_all_top(int role, const char *path, lht_node_t *cr)
+{
+	lht_node_t *r, *r2;
+	for(r = cr->data.list.first; r != NULL; r = r->next) {
+		if (path != NULL) {
+			r2 = lht_tree_path_(r->doc, r, path, 1, 0, NULL);
+			if (r2 != NULL)
+				add_subtree(role, r, r2);
+		}
+		else
+			add_subtree(role, r, r);
+	}
+}
+
+int conf_merge_all(const char *path)
+{
+	int n, ret = 0;
+	vmst_truncate(&merge_subtree, 0);
+
+	for(n = 0; n < CFR_max_real; n++) {
+		lht_node_t *cr;
+		if (conf_main_root[n] != NULL) {
+			cr = conf_lht_get_confroot(conf_main_root[n]->root);
+			if (cr != NULL)
+				conf_merge_all_top(n, path, cr);
+		}
+		if (conf_plug_root[n] != NULL) {
+			cr = conf_lht_get_confroot(conf_plug_root[n]->root);
+			if (cr != NULL)
+				conf_merge_all_top(n, path, cr);
+		}
+	}
+
+	qsort(merge_subtree.array, vmst_len(&merge_subtree), sizeof(merge_subtree_t), mst_prio_cmp);
+	for(n = 0; n < vmst_len(&merge_subtree); n++) {
+		if (path != NULL)
+			ret |= conf_merge_patch_item(path, merge_subtree.array[n].subtree, merge_subtree.array[n].prio, merge_subtree.array[n].policy);
+		else
+			ret |= conf_merge_patch(merge_subtree.array[n].subtree, merge_subtree.array[n].prio);
+	}
+	return ret;
+}
+
+static void conf_field_clear(conf_native_t *f)
+{
+	if (strncmp(f->hash_path, "temp", 4) == 0)
+		return;
+	if (f->used > 0) {
+#define clr(field) memset(f->val.field, 0, sizeof(*(f->val.field)) * f->used)
+		switch(f->type) {
+			case CFN_STRING:      clr(string); break;
+			case CFN_BOOLEAN:     clr(boolean); break;
+			case CFN_INTEGER:     clr(integer); break;
+			case CFN_REAL:        clr(real); break;
+			case CFN_COORD:       clr(coord); break;
+			case CFN_UNIT:        clr(unit); break;
+			case CFN_COLOR:       clr(color); break;
+			case CFN_LIST:
+				while(conflist_first(f->val.list)) { /* need to free all items of a list before clearing the main struct */
+					conf_listitem_t *i = conflist_first(f->val.list);
+					conflist_remove(i);
+					free(i);
+				}
+				clr(list);
+				break;
+		}
+		memset(f->prop, 0, sizeof(confprop_t) * f->used);
+#undef clr
+	}
+
+	f->used     = 0;
+	f->conf_rev = conf_rev;
+}
+
+int conf_rev = 0;
+void conf_update(const char *path, int arr_idx)
+{
+	conf_native_t *n;
+
+	/* clear memory-bin data first */
+	if (path == NULL) {
+		htsp_entry_t *e;
+		conf_fields_foreach(e) {
+			conf_hid_global_cb((conf_native_t *)e->value, -1, val_change_pre);
+			conf_hid_local_cb((conf_native_t *)e->value, -1, val_change_pre);
+			conf_field_clear(e->value);
+		}
+	}
+	else {
+		n = conf_get_field(path);
+		if (n == NULL) {
+			char *path_, *field;
+			path_ = pcb_strdup(path);
+
+			/* It might be an array element - truncate */
+			field = strrchr(path_, '[');
+			if (field != NULL) {
+				arr_idx = atoi(field+1);
+				*field = '\0';
+				n = conf_get_field(path_);
+			}
+
+			/* if a valid node is found, update it */
+			if (n != NULL)
+				conf_update(path_, arr_idx);
+
+			free(path_);
+			return;
+		}
+		conf_field_clear(n);
+		conf_hid_global_cb(n, arr_idx, val_change_pre);
+		conf_hid_local_cb(n, arr_idx, val_change_pre);
+	}
+
+	/* merge all memory-lht data to memory-bin */
+	conf_merge_all(path);
+	conf_core_postproc();
+
+	if (path == NULL) {
+		htsp_entry_t *e;
+		conf_fields_foreach(e) {
+			conf_hid_local_cb((conf_native_t *)e->value, -1, val_change_post);
+			conf_hid_global_cb((conf_native_t *)e->value, -1, val_change_post);
+		}
+	}
+	else {
+		conf_hid_local_cb(n, arr_idx, val_change_post);
+		conf_hid_global_cb(n, arr_idx, val_change_post);
+	}
+	conf_rev++;
+}
+
+#define POL_ANY 63
+
+static lht_node_t *conf_lht_get_first_(lht_node_t *cwd, conf_policy_t pol, int create)
+{
+	lht_node_t *ov; /* normally the "overwrite" node */
+
+	/* assume root is a li and add to the first hash */
+	cwd = conf_lht_get_confroot(cwd);
+	if (cwd == NULL)
+		return NULL;
+
+
+	ov = cwd->data.list.first;
+	if (pol != POL_ANY) {
+		for(; ov != NULL; ov = ov->next)
+			if (conf_policy_parse(ov->name) == pol)
+				break;
+	}
+	else
+		pol = POL_OVERWRITE; /* this is what is created by default */
+
+	if (ov == NULL) {
+		lht_node_t *new_ov;
+		if (!create)
+			return NULL;
+		new_ov = lht_dom_node_alloc(LHT_HASH, conf_policy_name(pol));
+		lht_dom_list_append(cwd, new_ov);
+		ov = new_ov;
+	}
+	else if (ov->type != LHT_HASH)
+		return NULL;
+
+	return ov;
+}
+
+lht_node_t *conf_lht_get_first(conf_role_t target, int create)
+{
+	assert(target != CFR_invalid);
+	assert(target >= 0);
+	assert(target < CFR_max_alloc);
+	if (conf_main_root[target] == NULL)
+		return NULL;
+	return conf_lht_get_first_(conf_main_root[target]->root, POL_ANY, create);
+}
+
+lht_node_t *conf_lht_get_first_pol(conf_role_t target, conf_policy_t pol, int create)
+{
+	assert(target != CFR_invalid);
+	assert(target >= 0);
+	assert(target < CFR_max_alloc);
+	if (conf_main_root[target] == NULL)
+		return NULL;
+	return conf_lht_get_first_(conf_main_root[target]->root, pol, create);
+}
+
+static lht_node_t *conf_lht_get_at_(conf_role_t target, const char *conf_path, const char *lht_path, int create)
+{
+	lht_node_t *n, *r = NULL;
+	n = conf_lht_get_first(target, create);
+	if (n == NULL)
+		return NULL;
+	r = lht_tree_path_(n->doc, n, lht_path, 1, 0, NULL);
+	if ((r == NULL) && (create)) {
+		conf_set_dry(target, conf_path, -1, "", POL_OVERWRITE, 0);
+		r = lht_tree_path_(n->doc, n, lht_path, 1, 0, NULL);
+	}
+	return r;
+}
+
+lht_node_t *conf_lht_get_at(conf_role_t target, const char *path, int create)
+{
+	lht_node_t *r;
+	char *pc, *end;
+	if (conf_main_root[target] == NULL) {
+		if (!create)
+			return NULL;
+		conf_reset(target, "<conf_lht_get_at>");
+	}
+	end = strchr(path, '[');
+	if (end == NULL) {
+		r = conf_lht_get_at_(target, path, path, create);
+	}
+	else {
+		/* lihata syntax differs from conf syntax in array indexing */
+		pc = pcb_strdup(path);
+		pc[end-path] = '/';
+		end = strchr(pc+(end-path), ']');
+		if (end != NULL)
+			*end = '\0';
+		r = conf_lht_get_at_(target, path, pc, create);
+		free(pc);
+	}
+	return r;
+}
+
+
+void conf_load_all(const char *project_fn, const char *pcb_fn)
+{
+	const char *pc, *try;
+
+	/* the ultimate fallback: all essential values are built in the executable
+	   on a low priority */
+	conf_load_as(CFR_INTERNAL, conf_internal, 1);
+
+	/* load config files */
+	conf_load_as(CFR_SYSTEM, PCBSHAREDIR "/pcb-conf.lht", 0);
+	conf_load_as(CFR_USER, conf_user_fn, 0);
+	pc = conf_get_project_conf_name(project_fn, pcb_fn, &try);
+	if (pc != NULL)
+		conf_load_as(CFR_PROJECT, pc, 0);
+	conf_merge_all(NULL);
+
+	/* create the user config (in-memory-lht) if it does not exist on disk;
+	   this is needed so if the user makes config changes from the GUI things
+	   get saved. */
+	if (conf_main_root[CFR_USER] == NULL)
+		conf_reset(CFR_USER, conf_user_fn);
+}
+
+void conf_load_extra(const char *project_fn, const char *pcb_fn)
+{
+	int cnt;
+	cnt = conf_load_plug_files(CFR_SYSTEM, PCBSHAREDIR);
+	cnt += conf_load_plug_files(CFR_USER, CONF_USER_DIR);
+	cnt += conf_load_plug_interns(CFR_INTERNAL);
+	if (cnt > 0)
+		conf_merge_all(NULL);
+}
+
+
+void conf_load_project(const char *project_fn, const char *pcb_fn)
+{
+	const char *pc, *try;
+
+	assert((project_fn != NULL) || (pcb_fn != NULL));
+
+	pc = conf_get_project_conf_name(project_fn, pcb_fn, &try);
+	if (pc != NULL)
+		if (conf_load_as(CFR_PROJECT, pc, 0) != 0)
+			pc = NULL;
+	if (pc == NULL)
+		conf_reset(CFR_PROJECT, "<conf_load_project>");
+	conf_update(NULL, -1);
+}
+
+void conf_reg_field_(void *value, int array_size, conf_native_type_t type, const char *path, const char *desc, conf_flag_t flags)
+{
+	conf_native_t *node;
+
+	if (conf_fields == NULL) {
+		conf_fields = htsp_alloc(strhash, strkeyeq);
+		assert(conf_fields != NULL);
+	}
+	assert(array_size >= 1);
+
+	assert(htsp_get(conf_fields, path) == NULL);
+
+	node = calloc(sizeof(conf_native_t), 1);
+	node->array_size  = array_size;
+	node->type        = type;
+	node->val.any     = value;
+	node->prop        = calloc(sizeof(confprop_t), array_size);
+	node->description = desc;
+	node->hash_path   = path;
+	node->flags       = flags;
+	vtp0_init(&(node->hid_data));
+	vtp0_init(&(node->hid_callbacks));
+
+	htsp_set(conf_fields, (char *)path, node);
+}
+
+void conf_free_native(conf_native_t *node)
+{
+	if (node->type == CFN_LIST) {
+		while(conflist_first(node->val.list) != NULL) {
+			conf_listitem_t *first = conflist_first(node->val.list);
+			conflist_remove(first);
+			free(first);
+		}
+	}
+
+	vtp0_uninit(&(node->hid_data));
+	vtp0_uninit(&(node->hid_callbacks));
+	free(node->prop);
+	free(node);
+}
+
+void conf_unreg_fields(const char *prefix)
+{
+	int len = strlen(prefix);
+	htsp_entry_t *e;
+
+	assert(prefix[len-1] == '/');
+
+	conf_fields_foreach(e) {
+		if (strncmp(e->key, prefix, len) == 0) {
+			conf_free_native(e->value);
+			htsp_delentry(conf_fields, e);
+		}
+	}
+}
+
+conf_native_t *conf_get_field(const char *path)
+{
+	return htsp_get(conf_fields, path);
+}
+
+int conf_set_dry(conf_role_t target, const char *path_, int arr_idx, const char *new_val, conf_policy_t pol, int mkdirp)
+{
+	char *path, *basename, *next, *last, *sidx;
+	conf_native_t *nat;
+	lht_node_t *cwd, *nn;
+	lht_node_type_t ty;
+	int idx = -1;
+
+	/* Remove in overwrite only */
+	if ((new_val == NULL) && (pol != POL_OVERWRITE))
+		return -1;
+
+	if (mkdirp)
+		conf_lht_get_first_pol(target, pol, 1);
+
+	path = pcb_strdup(path_);
+	sidx = strrchr(path, '[');
+	if (sidx != NULL) {
+		char *end;
+		*sidx = '\0';
+		sidx++;
+		idx = strtol(sidx, &end, 10);
+		if ((*end != ']') || (strchr(sidx, '/') != NULL)) {
+			free(path);
+			return -1;
+		}
+		if ((arr_idx >= 0) && (arr_idx != idx)) {
+			free(path);
+			return -1;
+		}
+	}
+	else if (arr_idx >= 0)
+		idx = arr_idx;
+
+	nat = conf_get_field(path);
+	if (nat == NULL) {
+		free(path);
+		return -1;
+	}
+
+
+	if (conf_main_root[target] == NULL) {
+		free(path);
+		return -1;
+	}
+	if (pol == POL_DISABLE) {
+		free(path);
+		return 0;
+	}
+	if ((pol != POL_OVERWRITE) && (idx >= 0)) {
+		free(path);
+		return -1;
+	}
+
+	cwd = conf_lht_get_first_pol(target, pol, 0);
+	if (cwd == NULL) {
+		free(path);
+		return -1;
+	}
+
+	if (idx >= nat->array_size) {
+		pcb_message(PCB_MSG_ERROR, "Error: can't conf_set() %s[%d]: %d is beyond the end of the array (%d)\n", path, idx, idx, nat->array_size);
+		free(path);
+		return -1;
+	}
+
+	basename = strrchr(path, '/');
+	if (basename == NULL) {
+		free(path);
+		return -1;
+	}
+	*basename = '\0';
+	basename++;
+
+	/* create parents if they do not exist */
+	last = next = path;
+	do {
+		next = strchr(last, '/');
+		if (next != NULL)
+			*next = '\0';
+
+		nn = lht_tree_path_(conf_main_root[target], cwd, last, 1, 0, NULL);
+		if (nn == NULL) {
+			if (new_val == NULL) {
+				free(path);
+				return 0;
+			}
+			if (conf_main_root_lock[target]) {
+				pcb_message(PCB_MSG_WARNING, "WARNING: can't set config item %s because target in-memory lihata does not have the node and is tree-locked\n", path_);
+				free(path);
+				return -1;
+			}
+			/* create a new hash node */
+			nn = lht_dom_node_alloc(LHT_HASH, last);
+			if (lht_dom_hash_put(cwd, nn) != LHTE_SUCCESS) {
+				lht_dom_node_free(nn);
+				free(path);
+				return -1;
+			}
+		}
+		cwd = nn;
+		if (next != NULL)
+			last = next+1;
+	} while(next != NULL);
+
+	/* add the last part of the path, which is either a list or a text node */
+	if ((nat->array_size > 1) || (nat->type == CFN_LIST))
+		ty = LHT_LIST;
+	else
+		ty = LHT_TEXT;
+
+	nn = lht_tree_path_(conf_main_root[target], cwd, basename, 1, 0, NULL);
+	if (nn == NULL) {
+		if (conf_main_root_lock[target]) {
+			free(path);
+			return -1;
+		}
+		nn = lht_dom_node_alloc(ty, basename);
+		if (cwd->type != LHT_HASH) {
+			pcb_message(PCB_MSG_ERROR, "Expected HASH conf subtree '%s' (in path '%s'); cleaning up broken conf, check your config sources!\n", cwd->name, path);
+			lht_tree_del(cwd);
+			free(path);
+			return -1;
+		}
+		if (lht_dom_hash_put(cwd, nn) != LHTE_SUCCESS) {
+			lht_dom_node_free(nn);
+			free(path);
+			return -1;
+		}
+	}
+	cwd = nn;
+
+	/* set value */
+	if (ty == LHT_LIST) {
+		lht_err_t err = 0;
+
+		if (new_val != NULL)
+			nn = lht_dom_node_alloc(LHT_TEXT, "");
+
+		if (pol == POL_OVERWRITE) {
+			if (idx == -1) {
+				/* empty the list so that we insert to an empty list which is overwriting the list */
+				while(cwd->data.list.first != NULL)
+					lht_tree_del(cwd->data.list.first);
+				if (new_val != NULL)
+					lht_dom_list_append(cwd, nn);
+			}
+			else {
+				lht_node_t *old = lht_tree_list_nth(cwd, idx);
+				if (old != NULL) {
+					/* the list is large enough already: overwrite the element at idx */
+					if (new_val == NULL) {
+						err = lht_tree_del(old);
+						free(path);
+						return 0;
+					}
+					else
+						err = lht_tree_list_replace_child(cwd, old, nn);
+				}
+				else if (new_val == NULL) {
+					free(path);
+					return 0;
+				}
+				else {
+					int n;
+					lht_node_t *i;
+					/* count members */
+					for (n = 0, i = cwd->data.list.first; i != NULL; i = i->next) n++;
+					/* append just enough elements to get one less than needed */
+					err = 0;
+					for(n = idx - n; n > 0; n--) {
+						lht_node_t *dummy = lht_dom_node_alloc(LHT_TEXT, "");
+						err |= lht_dom_list_append(cwd, dummy);
+					}
+					/* append the new node */
+					err |= lht_dom_list_append(cwd, nn);
+				}
+			}
+		}
+		else if ((pol == POL_PREPEND) || (pol == POL_OVERWRITE))
+			err = lht_dom_list_insert(cwd, nn);
+		else if (pol == POL_APPEND)
+			err = lht_dom_list_append(cwd, nn);
+		if (err != LHTE_SUCCESS) {
+			lht_dom_node_free(nn);
+			free(path);
+			return -1;
+		}
+		cwd = nn;
+	}
+	else {
+		if (idx > 0) {
+			free(path);
+			return -1; /* only lists/array path should have index larger than 0 */
+		}
+		cwd = nn;
+	}
+
+	/* by now cwd is the text node we need to load with the new value; it is
+	   either a text config value under a hash or a list item already allocated */
+	if (cwd->type != LHT_TEXT) {
+		free(path);
+		return -1;
+	}
+
+	if (new_val != NULL) {
+		if (cwd->data.text.value != NULL)
+			free(cwd->data.text.value);
+
+		cwd->data.text.value = pcb_strdup(new_val);
+		cwd->file_name = conf_main_root[target]->active_file;
+	}
+	else
+		lht_tree_del(cwd);
+
+	conf_lht_dirty[target]++;
+
+	free(path);
+	return 0;
+}
+
+int conf_set(conf_role_t target, const char *path, int arr_idx, const char *new_val, conf_policy_t pol)
+{
+	int res;
+	res = conf_set_dry(target, path, arr_idx, new_val, pol, 1);
+	if (res < 0)
+		return res;
+	conf_update(path, arr_idx);
+	return 0;
+}
+
+int conf_del(conf_role_t target, const char *path, int arr_idx)
+{
+	int res;
+	res = conf_set_dry(target, path, arr_idx, NULL, POL_OVERWRITE, 0);
+	if (res < 0)
+		return res;
+	conf_update(path, arr_idx);
+	return 0;
+}
+
+
+int conf_set_native(conf_native_t *field, int arr_idx, const char *new_val)
+{
+	lht_node_t *node;
+
+	if (arr_idx >= field->used)
+		return -1;
+
+	node = field->prop[arr_idx].src;
+
+	if (node->data.text.value != NULL)
+		free(node->data.text.value);
+
+	node->data.text.value = pcb_strdup(new_val);
+	return 0;
+}
+
+
+int conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why)
+{
+	char *arg = NULL, *op, *s;
+	const char *sc;
+	conf_policy_t pol = POL_OVERWRITE;
+	int ret;
+
+	if (prefix != NULL) {
+		for(sc = arg_; (*sc != '=') && (*sc != '\0'); sc++)
+			if (*sc == '/')
+				arg = pcb_strdup(arg_); /* full path, don't use prefix */
+
+		if (arg == NULL) { /* insert prefix */
+			int pl = strlen(prefix), al = strlen(arg_);
+			while((pl > 0) && (prefix[pl-1] == '/')) pl--;
+			arg = malloc(pl+al+2);
+			memcpy(arg, prefix, pl);
+			arg[pl] = '/';
+			strcpy(arg+pl+1, arg_);
+		}
+	}
+	else
+		arg = pcb_strdup(arg_);
+
+	/* replace any - with _ in the path part; cli accepts dash but the backing C
+	   struct field names don't */
+	for(s = arg, op = NULL; (*s != '\0') && (op == NULL); s++) {
+		if (*s == '=')
+			op = s;
+		else if (*s == '-')
+			*s = '_';
+	}
+
+	/* extract val, if we need to */
+	if (val == NULL) {
+		*why = "";
+		if (op == arg) {
+			free(arg);
+			*why = "value not specified; syntax is path=val";
+			return -1;
+		}
+		if (op == NULL) {
+			conf_native_t *n = conf_get_field(arg);
+			if ((n == NULL) || (n->type != CFN_BOOLEAN)) {
+				free(arg);
+				*why = "value not specified for non-boolean variable; syntax is path=val";
+				return -1;
+			}
+			val = "1"; /* auto-value for boolean */
+		}
+		else {
+			*op = '\0';
+			val = op+1;
+			op--;
+			switch(*op) {
+				case '+': pol = POL_APPEND; *op = '\0'; break;
+				case '^': pol = POL_PREPEND; *op = '\0'; break;
+			}
+		}
+	}
+
+	/* now that we have a clean path (arg) and a value, try to set the config */
+	conf_lht_get_first_pol(CFR_CLI, pol, 1); /* make sure the root for the given policy is created */
+	ret = conf_set(CFR_CLI, arg, -1, val, pol);
+	if (ret != 0)
+		*why = "invalid config path";
+
+	free(arg);
+	return ret;
+}
+
+int conf_parse_arguments(const char *prefix, int *argc, char ***argv)
+{
+	int n, dst;
+
+	for(n = 0, dst = 0; n < *argc; n++,dst++) {
+		char *a = (*argv)[n];
+		const char *why;
+		int try_again = -1;
+
+		if (a[0] == '-') a++;
+		if (a[0] == '-') a++;
+
+		try_again = conf_set_from_cli(prefix, a, NULL, &why);
+		if (try_again && (n < (*argc) - 1)) {
+			try_again = conf_set_from_cli(prefix, a, (*argv)[n+1], &why);
+			if (!try_again)
+				n++;
+		}
+		if (try_again)
+			(*argv)[dst] = (*argv)[n];
+		else
+			dst--;
+	}
+	*argc = dst;
+	return 0;
+}
+
+void conf_usage(const char *prefix, void (*print)(const char *name, const char *help))
+{
+	htsp_entry_t *e;
+	int pl = (prefix == NULL ? 0 : strlen(prefix));
+
+	conf_fields_foreach(e) {
+		if ((prefix == NULL) || (strncmp(prefix, e->key, pl) == 0)) {
+			conf_native_t *n = e->value;
+			if (n->flags & CFF_USAGE) {
+				int kl = strlen(n->hash_path);
+				char *s, *name = malloc(kl+32);
+				const char *sc;
+				for(sc = n->hash_path + pl; *sc == '/'; sc++) ;
+				name[0] = '-';
+				name[1] = '-';
+				strcpy(name+2, sc);
+				for(s = name; *s != '\0'; s++)
+					if (*s == '_')
+						*s = '-';
+				switch(n->type) {
+					case CFN_BOOLEAN: /* implicit true */ break;
+					case CFN_STRING:  strcpy(s, " str"); break;
+					case CFN_INTEGER: strcpy(s, " int"); break;
+					case CFN_REAL:    strcpy(s, " num"); break;
+					case CFN_COORD:   strcpy(s, " coord"); break;
+					case CFN_UNIT:    strcpy(s, " unit"); break;
+					case CFN_COLOR:   strcpy(s, " color"); break;
+					case CFN_LIST:    strcpy(s, " <list>"); break;
+				}
+				print(name, n->description);
+				free(name);
+			}
+		}
+	}
+}
+
+int conf_replace_subtree(conf_role_t dst_role, const char *dst_path, conf_role_t src_role, const char *src_path)
+{
+	lht_node_t *dst = conf_lht_get_at(dst_role, dst_path, 1);
+	lht_node_t *src, *new_src = NULL;
+
+	if (src_role == CFR_binary) {
+		char *name;
+		lht_node_t *ch = NULL;
+		int isarr, i;
+		conf_native_t *n = conf_get_field(src_path);
+
+		if (n == NULL)
+			return -1;
+		name = strrchr(n->hash_path, '/');
+		if (name == NULL)
+			return -1;
+
+		isarr = n->array_size > 1;
+		if (isarr)
+			src = lht_dom_node_alloc(LHT_LIST, name+1);
+
+		for(i = 0; i < n->array_size; i++) {
+			gds_t s;
+
+			gds_init(&s);
+			if (n->type == CFN_LIST) {
+				conf_listitem_t *it;
+				ch = lht_dom_node_alloc(LHT_LIST, name+1);
+				for(it = conflist_first(n->val.list); it != NULL; it = conflist_next(it)) {
+					lht_node_t *txt;
+					txt = lht_dom_node_alloc(LHT_TEXT, "");
+					txt->data.text.value = pcb_strdup(it->payload);
+					lht_dom_list_append(ch, txt);
+				}
+			}
+			else {
+				conf_print_native_field((conf_pfn)pcb_append_printf, &s, 0, &n->val, n->type, n->prop+i, i);
+				ch = lht_dom_node_alloc(LHT_TEXT, isarr ? "" : name+1);
+				ch->data.text.value = s.array;
+				if (isarr)
+					lht_dom_list_append(src, ch);
+				s.array = NULL;
+				gds_uninit(&s);
+			}
+		}
+
+		if (!isarr)
+			src = ch;
+	}
+	else
+		src = conf_lht_get_at(src_role, src_path, 0);
+
+	if ((src == NULL) && (dst != NULL)) {
+		lht_tree_del(dst);
+		return 0;
+	}
+
+	if (dst == NULL)
+		goto err;
+
+	new_src = lht_dom_duptree(src);
+	if (new_src == NULL)
+		goto err;
+
+	if (lht_tree_replace(dst, new_src) != LHTE_SUCCESS)
+		goto err;
+
+	conf_lht_dirty[dst_role]++;
+
+	lht_tree_del(dst);
+	if (src_role == CFR_binary)
+		lht_dom_node_free(src);
+	return 0;
+
+	err:;
+	if (src_role == CFR_binary)
+		lht_dom_node_free(src);
+	if (new_src != NULL)
+		lht_dom_node_free(new_src);
+	return -1;
+}
+
+
+int conf_save_file(const char *project_fn, const char *pcb_fn, conf_role_t role, const char *fn)
+{
+	int fail = 1;
+	lht_node_t *r = conf_lht_get_first(role, 0);
+	const char *try;
+	char *efn;
+
+	/* do not save if there's no change */
+	if (conf_lht_dirty[role] == 0)
+		return 0;
+
+	if (fn == NULL) {
+		switch(role) {
+			case CFR_USER:
+				fn = conf_user_fn;
+				break;
+			case CFR_PROJECT:
+				fn = conf_get_project_conf_name(project_fn, pcb_fn, &try);
+				if (fn == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Error: can not save config to project file: %s does not exist - please create an empty file there first\n", try);
+					return -1;
+				}
+				break;
+			default: return -1;
+		}
+	}
+
+	if (r != NULL) {
+		FILE *f;
+
+		f = pcb_fopen_fn(fn, "w", &efn);
+		if ((f == NULL) && (role == CFR_USER)) {
+			/* create the directory and try again */
+			char *path = NULL, *end;
+			
+			if (efn != NULL)
+				path = pcb_strdup(efn);
+			else
+				path = pcb_build_fn(fn);
+
+			if (path == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Error: failed to calculate the project file name (board file name or allocation error)\n");
+				fclose(f);
+				return -1;
+			}
+
+			end = strrchr(path, '/');
+			if (end != NULL) {
+				*end = '\0';
+				if (pcb_mkdir(path, 0755) == 0) {
+					pcb_message(PCB_MSG_INFO, "Created directory %s for saving %s\n", path, fn);
+					*end = '/';
+					f = pcb_fopen(path, "w");
+				}
+				else
+					pcb_message(PCB_MSG_ERROR, "Error: failed to create directory %s for saving %s\n", path, efn);
+			}
+			free(path);
+		}
+
+		if (f != NULL) {
+#warning CONF TODO: a project file needs to be loaded, merged, then written (to preserve non-config nodes)
+			lht_dom_export(r->doc->root, f, "");
+			fail = 0;
+			conf_lht_dirty[role] = 0;
+			fclose(f);
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "Error: can't save config to %s - can't open the file for write\n", fn);
+	}
+
+	free(efn);
+	return fail;
+}
+
+int conf_export_to_file(const char *fn, conf_role_t role, const char *conf_path)
+{
+	lht_node_t *at = conf_lht_get_at(role, conf_path, 0);
+	lht_err_t r;
+	FILE *f;
+
+	if (at == NULL)
+		return -1;
+
+	f = pcb_fopen(fn, "w");
+	if (f == NULL)
+		return -1;
+
+	r = lht_dom_export(at, f, "");
+	fclose(f);
+	return r;
+}
+
+
+conf_listitem_t *conf_list_first_str(conflist_t *list, const char **item_str, int *idx)
+{
+	conf_listitem_t *item_li;
+	item_li = conflist_first(list);
+	if (item_li == NULL)
+		return NULL;
+	if (item_li->type == CFN_STRING) {
+		*item_str = item_li->val.string[0];
+		return item_li;
+	}
+	return conf_list_next_str(item_li, item_str, idx);
+}
+
+conf_listitem_t *conf_list_next_str(conf_listitem_t *item_li, const char **item_str, int *idx)
+{
+	while((item_li = conflist_next(item_li)) != NULL) {
+		(*idx)++;
+		if (item_li->type != CFN_STRING)
+			continue;
+		/* found next string */
+		*item_str = item_li->val.string[0];
+		return item_li;
+	}
+	/* found end of the list */
+	(*idx)++;
+	*item_str = NULL;
+	return item_li;
+}
+
+const char *conf_concat_strlist(const conflist_t *lst, gds_t *buff, int *inited, char sep)
+{
+	int n;
+	conf_listitem_t *ci;
+
+	if ((inited == NULL) || (!*inited)) {
+		gds_init(buff);
+		if (inited != NULL)
+			*inited = 1;
+	}
+	else
+		gds_truncate(buff, 0);
+
+	for (n = 0, ci = conflist_first((conflist_t *)lst); ci != NULL; ci = conflist_next(ci), n++) {
+		const char *p = ci->val.string[0];
+		if (ci->type != CFN_STRING)
+			continue;
+		if (n > 0)
+			gds_append(buff, sep);
+		gds_append_str(buff, p);
+	}
+	return buff->array;
+}
+
+void conf_lock(conf_role_t target)
+{
+	conf_main_root_lock[target] = 1;
+}
+
+void conf_unlock(conf_role_t target)
+{
+	conf_main_root_lock[target] = 0;
+}
+
+int conf_islocked(conf_role_t target)
+{
+	return conf_main_root_lock[target];
+}
+
+int conf_isdirty(conf_role_t target)
+{
+	return conf_lht_dirty[target];
+}
+
+void conf_makedirty(conf_role_t target)
+{
+	conf_lht_dirty[target]++;
+}
+conf_role_t conf_lookup_role(const lht_node_t *nd)
+{
+	conf_role_t r;
+	for(r = 0; r < CFR_max_real; r++)
+		if (conf_main_root[r] == nd->doc)
+			return r;
+
+	return CFR_invalid;
+}
+
+void conf_reset(conf_role_t target, const char *source_fn)
+{
+	lht_node_t *n;
+
+	if (conf_main_root[target] != NULL)
+		lht_dom_uninit(conf_main_root[target]);
+
+	conf_main_root[target] = lht_dom_init();
+	lht_dom_loc_newfile(conf_main_root[target], source_fn);
+	conf_main_root[target]->root = lht_dom_node_alloc(LHT_LIST, conf_list_name);
+	conf_main_root[target]->root->doc = conf_main_root[target];
+	n = lht_dom_node_alloc(LHT_HASH, "overwrite");
+	lht_dom_list_insert(conf_main_root[target]->root, n);
+}
+
+/*****************/
+static int needs_braces(const char *s)
+{
+	for(; *s != '\0'; s++)
+		if (!isalnum(*s) && (*s != '_') && (*s != '-') && (*s != '+') && (*s != '/')
+										 && (*s != ':') && (*s != '.') && (*s != ',') && (*s != '$')
+										 && (*s != '(') && (*s != ')') && (*s != '~') && (*s != '#'))
+			return 1;
+	return 0;
+}
+
+#define print_str_or_null(pfn, ctx, verbose, chk, out) \
+	do { \
+			if (chk == NULL) { \
+				if (verbose) \
+					ret += pfn(ctx, "<NULL>");\
+			} \
+			else {\
+				if (needs_braces(out)) \
+					ret += pfn(ctx, "{%s}", out); \
+				else \
+					ret += pfn(ctx, "%s", out); \
+			} \
+	} while(0)
+
+int conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, confitem_t *val, conf_native_type_t type, confprop_t *prop, int idx)
+{
+	int ret = 0;
+	switch(type) {
+		case CFN_STRING:  print_str_or_null(pfn, ctx, verbose, val->string[idx], val->string[idx]); break;
+		case CFN_BOOLEAN: ret += pfn(ctx, "%d", val->boolean[idx]); break;
+		case CFN_INTEGER: ret += pfn(ctx, "%ld", val->integer[idx]); break;
+		case CFN_REAL:    ret += pfn(ctx, "%f", val->real[idx]); break;
+		case CFN_COORD:   ret += pfn(ctx, "%$mS", val->coord[idx]); break;
+		case CFN_UNIT:    print_str_or_null(pfn, ctx, verbose, val->unit[idx], val->unit[idx]->suffix); break;
+		case CFN_COLOR:   print_str_or_null(pfn, ctx, verbose, val->color[idx], val->color[idx]); break;
+		case CFN_LIST:
+			{
+				conf_listitem_t *n;
+				if (conflist_length(val->list) > 0) {
+					ret += pfn(ctx, "{");
+					for(n = conflist_first(val->list); n != NULL; n = conflist_next(n)) {
+						conf_print_native_field(pfn, ctx, verbose, &n->val, n->type, &n->prop, 0);
+						ret += pfn(ctx, ";");
+					}
+					ret += pfn(ctx, "}");
+				}
+				else {
+					if (verbose)
+						ret += pfn(ctx, "<empty list>");
+					else
+						ret += pfn(ctx, "{}");
+				}
+			}
+			break;
+	}
+	if (verbose) {
+		ret += pfn(ctx, " <<prio=%d", prop[idx].prio);
+		if (prop[idx].src != NULL) {
+			ret += pfn(ctx, " from=%s:%d", prop[idx].src->file_name, prop[idx].src->line);
+		}
+		ret += pfn(ctx, ">>");
+	}
+	return ret;
+}
+
+int conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, conf_native_t *node)
+{
+	int ret = 0;
+	if ((node->used <= 0) && (!verbose))
+		return 0;
+	if (node->array_size > 1) {
+		int n;
+		if (!verbose)
+			ret += pfn(ctx, "{");
+		for(n = 0; n < node->used; n++) {
+			if (verbose)
+				ret += pfn(ctx, "%s I %s[%d] = ", prefix, node->hash_path, n);
+			ret += conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, n);
+			if (verbose)
+				ret += pfn(ctx, " conf_rev=%d\n", node->conf_rev);
+			else
+				ret += pfn(ctx, ";");
+		}
+		if (verbose) {
+			if (node->used == 0)
+				ret += pfn(ctx, "%s I %s[] = <empty>\n", prefix, node->hash_path);
+		}
+		else
+			ret += pfn(ctx, "}");
+	}
+	else {
+		if (verbose)
+			ret += pfn(ctx, "%s I %s = ", prefix, node->hash_path);
+		ret += conf_print_native_field(pfn, ctx, verbose, &node->val, node->type, node->prop, 0);
+		if (verbose)
+			ret += pfn(ctx, " conf_rev=%d\n", node->conf_rev);
+	}
+	return ret;
+}
+
+
+/****************/
+
+void conf_init(void)
+{
+	conf_reset(CFR_ENV, "<environment-variables>");
+	conf_reset(CFR_CLI, "<commandline>");
+	conf_reset(CFR_DESIGN, "<null-design>");
+
+	conf_reset(CFR_file, "<conf_init>");
+	conf_reset(CFR_binary, "<conf_init>");
+}
+
+void conf_uninit(void)
+{
+	int n;
+	htsp_entry_t *e;
+
+	conf_fields_foreach(e) {
+		if (strncmp(e->key, "plugins/", 8) == 0)
+			fprintf(stderr, "pcb-rnd conf ERROR: conf node '%s' is not unregistered\n", e->key);
+	}
+
+	conf_pcb_hid_uninit();
+
+	for(n = 0; n < CFR_max_alloc; n++) {
+		if (conf_main_root[n] != NULL)
+			lht_dom_uninit(conf_main_root[n]);
+		if (conf_plug_root[n] != NULL)
+			lht_dom_uninit(conf_plug_root[n]);
+	}
+
+	conf_fields_foreach(e) {
+		conf_free_native(e->value);
+		htsp_delentry(conf_fields, e);
+	}
+	htsp_free(conf_fields);
+
+	vmst_uninit(&merge_subtree);
+	pcb_conf_files_uninit();
+}
+
+void conf_setf(conf_role_t role, const char *path, int idx, const char *fmt, ...)
+{
+	char *tmp;
+	va_list ap;
+
+	va_start(ap, fmt);
+	tmp = pcb_strdup_vprintf(fmt, ap);
+	va_end(ap);
+
+	conf_set(role, path, idx, tmp, POL_OVERWRITE);
+
+	free(tmp);
+}
+
+int pcb_conf_cmd_is_safe_(const char *path_, const char *value, const char **val_out, int msg)
+{
+	const char *reason;
+	conf_native_t *nd;
+	char *path, *s;
+
+	if (val_out != NULL)
+		*val_out = NULL;
+
+	if (value == NULL)
+		goto accept;
+
+	path = pcb_strdup(path_);
+	for(s = path; *s != '\0'; s++)
+		if (*s == '.')
+			*s = '/';
+	nd = conf_get_field(path);
+	free(path);
+
+	if (nd == NULL) {
+		if (msg)
+			pcb_message(PCB_MSG_ERROR, "pcb_conf_cmd_is_safe(): invalid node path '%s' (looks like an internal error)\n", path_);
+		return 0;
+	}
+
+	if (nd->array_size > 1) {
+		if (msg)
+			pcb_message(PCB_MSG_ERROR, "pcb_conf_cmd_is_safe(): invalid node path '%s' (it is an array)\n", path_);
+		return 0;
+	}
+
+	switch(conf_lookup_role(nd->prop[0].src)) {
+		/* these are considered safe, because: */
+		case CFR_INTERNAL: /* the attacker would have access to the source code and compilation, could place system() anyway */
+		case CFR_SYSTEM:   /* system admin - lets trust them */
+		case CFR_USER:     /* user config is written by the user, attackers have no better chance to overwrite that than overwriting the the shell's rc */
+		case CFR_CLI:      /* command line arguments: the user specified those; who has access to that potentially has access to the shell anyway */
+			goto accept;
+
+		/* these are considered unsafe, because: */
+		case CFR_DEFAULTPCB: /* the default pcb path may be manipulated; the user has the chance to specify the command path setting from safe config files */
+			reason = "default pcb"; break;
+		case CFR_ENV: /* env vars may be inherited from who-knows-where */
+			reason = "env var"; break;
+		case CFR_PROJECT: /* malicous file prepared by the attacker */
+			reason = "project file"; break;
+		case CFR_DESIGN: /* malicous file prepared by the attacker */
+			reason = "board file"; break;
+		default:
+			reason = "unknown source";
+	}
+
+	if (msg)
+		pcb_message(PCB_MSG_ERROR, "pcb_conf_cmd_is_safe(): refusing to use the value of '%s' because it is from unsafe source %s\n", path_, reason);
+	return 0;
+
+	accept:;
+	if (val_out != NULL)
+		*val_out = value;
+	return 1;
+}
Index: tags/2.0.1/src/conf.h
===================================================================
--- tags/2.0.1/src/conf.h	(nonexistent)
+++ tags/2.0.1/src/conf.h	(revision 18980)
@@ -0,0 +1,393 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_CONF_H
+#define PCB_CONF_H
+#include "config.h"
+#include "global_typedefs.h"
+#include "pcb-printf.h"
+#include <liblihata/lihata.h>
+#include <liblihata/dom.h>
+#include <genvector/vtp0.h>
+#include "unit.h"
+
+typedef union confitem_u confitem_t ;
+typedef struct conf_listitem_s conf_listitem_t;
+
+#include "list_conf.h"
+
+extern int conf_rev; /* increased by one each time there's a change in any of the config binaries */
+
+typedef enum {
+	POL_PREPEND,
+	POL_APPEND,
+	POL_OVERWRITE,
+	POL_DISABLE,
+	POL_invalid
+} conf_policy_t;
+
+typedef enum { /* bitfield */
+	CFF_USAGE = 1    /* settings should be printed in usage help */
+} conf_flag_t;
+
+
+typedef const char *  CFT_STRING;
+typedef int           CFT_BOOLEAN;
+typedef long          CFT_INTEGER;
+typedef double        CFT_REAL;
+typedef pcb_coord_t   CFT_COORD;
+typedef pcb_unit_t *  CFT_UNIT;
+typedef char *        CFT_COLOR;
+typedef conflist_t    CFT_LIST;
+
+typedef enum {
+	CFN_STRING,
+	CFN_BOOLEAN,
+	CFN_INTEGER,     /* signed long */
+	CFN_REAL,        /* double */
+	CFN_COORD,
+	CFN_UNIT,
+	CFN_COLOR,
+	CFN_LIST
+} conf_native_type_t;
+
+union confitem_u {
+	const char **string;
+	int *boolean;
+	long *integer;
+	double *real;
+	pcb_coord_t *coord;
+	const pcb_unit_t **unit;
+	const char **color;
+	conflist_t *list;
+	void *any;
+};
+
+typedef struct {
+	int prio;
+	lht_node_t *src;
+} confprop_t;
+
+typedef struct {
+	/* static fields defined by the macros */
+	const char *description;
+	const char *hash_path;     /* points to the hash key once its added in the hash (else: NULL) */
+	int array_size;
+	conf_native_type_t type;
+	conf_flag_t flags;
+	struct {
+		unsigned io_pcb_no_attrib:1;
+		unsigned read_only:1;         /* set by conf_core, has no lihata, should not be overwritten */
+	} random_flags;  /* hack... persistent flags attached by various plugins */
+
+	/* dynamic fields loaded from lihata */
+	confitem_t val;   /* value is always an array (len 1 for the common case)  */
+	confprop_t *prop; /* an array of properties allocated as big as val's array */
+	int used;         /* number of items actually used in the arrays */
+	int conf_rev;     /* last changed rev */
+
+	/* dynamic fields for HIDs storing their data */
+	vtp0_t hid_data;
+	vtp0_t hid_callbacks; /* vector of (const conf_hid_callbacks_t *) */
+} conf_native_t;
+
+
+struct conf_listitem_s {
+	conf_native_type_t type;
+	confitem_t val;   /* value is always an array (len 1 for the common case)  */
+	confprop_t prop; /* an array of properties allocated as big as val's array */
+	const char *name;
+	const char *payload;
+	gdl_elem_t link;
+};
+
+
+typedef enum {
+	CFR_INTERNAL,
+	CFR_SYSTEM,
+	CFR_DEFAULTPCB, /* default.pcb */
+	CFR_USER,
+	CFR_ENV,        /* env vars */
+	CFR_PROJECT,    /* project specific, from a local file */
+	CFR_DESIGN,     /* from the design file */
+	CFR_CLI,        /* from the command line */
+	CFR_max_real,   /* all the above are real files and should be merged */
+	/* these ones are not real roles and are used in internal communication in the GUI HIDs */
+	CFR_file,       /* custom file */
+	CFR_binary,     /* the in-memory binary representation */
+	CFR_max_alloc,  /* all the above should have a root */
+
+	CFR_invalid
+} conf_role_t;
+
+extern const int conf_default_prio[];
+
+void conf_init(void);
+void conf_uninit(void);
+
+/* Load all config files from disk into memory-lht and run conf_update to
+   get the binary representation updated */
+void conf_load_all(const char *project_fn, const char *pcb_fn);
+
+/* Load a file or a string as a role */
+int conf_load_as(conf_role_t role, const char *fn, int fn_is_text);
+
+/* copy root to be the new config of role; root must be a li:pcb-rnd-conf-v1
+   return 0 on success and removes/invalidates root */
+int conf_insert_tree_as(conf_role_t role, lht_node_t *root);
+
+/* Load a project file into CFR_PROJECT. Both project_fn and pcb_fn can't be NULL.
+   Leaves an initialized but empty CFR_PROJECT root if no project file was
+   found. Runs conf_update(NULL); */
+void conf_load_project(const char *project_fn, const char *pcb_fn);
+
+void conf_load_extra(const char *project_fn, const char *pcb_fn);
+
+/* Update the binary representation from the memory-lht representation */
+void conf_update(const char *path, int arr_idx);
+
+conf_native_t *conf_get_field(const char *path);
+void conf_reg_field_(void *value, int array_size, conf_native_type_t type, const char *path, const char *desc, conf_flag_t flags);
+
+void conf_unreg_fields(const char *prefix);
+
+/* Set the value of path[arr_idx] in memory-lht role target to new_val using
+   policy pol. Only lists should be indexed. Indexing can be a [n] suffix on
+   path or a non-negative arr_idx. Updates the in-memory binary as well. If
+   new_val is NULL, the selected subtree is removed from the lihata document. */
+int conf_set(conf_role_t target, const char *path, int arr_idx, const char *new_val, conf_policy_t pol);
+
+/* Remove the subtree of path[arr_idx] in memory-lht role target. Same
+   considerations as in conf_set. */
+int conf_del(conf_role_t target, const char *path, int arr_idx);
+
+/* Same as conf_set, but without updating the binary - useful for multiple
+   conf_set_dry calls and a single all-tree conf_udpate(NULL) for transactions.
+   If mkdirp is non-zero, automatically create the policy subtree if it doesn't exist. */
+int conf_set_dry(conf_role_t target, const char *path_, int arr_idx, const char *new_val, conf_policy_t pol, int mkdirp);
+
+/* Same as conf_set, but doesn't look up where to set things: change the value of
+   the lihata node backing the native field */
+int conf_set_native(conf_native_t *field, int arr_idx, const char *new_val);
+
+/* Process a command line argument arg_ (if val == NULL) or a pair of command line
+   arguments arg_ and val. In the first case assume arg_ has both a config path
+   and a value (may be implicit true for a boolean). In the second case val
+   is always the value. If prefix is not NULL, the path is prefixed with it.
+   On error always set *why to a const string reason.
+   Returns 0 on success. */
+int conf_set_from_cli(const char *prefix, const char *arg_, const char *val, const char **why);
+
+/* Attempt to consume argv[] using conf_set_from_cli */
+int conf_parse_arguments(const char *prefix, int *argc, char ***argv);
+
+#define conf_reg_field_array(globvar, field, type_name, path, desc, flags) \
+	conf_reg_field_((void *)&globvar.field, (sizeof(globvar.field) / sizeof(globvar.field[0])), type_name, path, desc, flags)
+
+#define conf_reg_field_scalar(globvar, field, type_name, path, desc, flags) \
+	conf_reg_field_((void *)&globvar.field, 1, type_name, path, desc, flags)
+
+/* register a config field, array or scalar, selecting the right macro */
+#define conf_reg_field(globvar,   field,isarray,type_name,cpath,cname, desc, flags) \
+	conf_reg_field_ ## isarray(globvar, field,type_name,cpath "/" cname, desc, flags)
+
+/* convert a policy text to policy value - return POL_invalid on error */
+conf_policy_t conf_policy_parse(const char *s);
+
+/* Return the name of the policy - always a static string, even for invalid roles */
+const char *conf_policy_name(conf_policy_t p);
+
+/* convert a role text to role value - return CFR_invalid on error */
+conf_role_t conf_role_parse(const char *s);
+
+/* Return the name of the role - always a static string, even for invalid roles */
+const char *conf_role_name(conf_role_t r);
+
+/* Lock/unlock the structure of a role. In a locked role value of existing
+   fields may be modified but the structure of the tree is static (can't
+   create or remove nodes). This is useful when an io_ file format supports
+   only a subset of settings: it can build the CFR_DESIGN tree, lock it so
+   settings that it wouldn't know how to save won't appear. NOTE: io_pcb
+   supports all settings via attributes so does not lock. */
+void conf_lock(conf_role_t target);
+void conf_unlock(conf_role_t target);
+
+
+/* replace dst_role:dst_path with a copy of src_role:src_path */
+int conf_replace_subtree(conf_role_t dst_role, const char *dst_path, conf_role_t src_role, const char *src_path);
+
+/* Throw out a subtree (remove all nodes from the lihata representation).
+   Useful for io_ plugins, on CFR_DESIGN, before loading a new file. */
+void conf_reset(conf_role_t target, const char *source_fn);
+
+/* Save an in-memory lihata representation to the disk */
+int conf_save_file(const char *project_fn, const char *pcb_fn, conf_role_t role, const char *fn);
+
+/* Returns whether a given lihata tree is locked */
+int conf_islocked(conf_role_t target);
+
+/* Returns whether a given lihata tree has changed since load or last save */
+int conf_isdirty(conf_role_t target);
+void conf_makedirty(conf_role_t target);
+
+/* all configuration fields ever seen */
+extern htsp_t *conf_fields;
+
+/***** print fields from binary to lihata/text *****/
+
+typedef int (*conf_pfn)(void *ctx, const char *fmt, ...);
+
+/* Prints the value of a node in a form that is suitable for lihata. Prints
+   a single element of an array, but prints lists as lists. Returns
+   the sum of conf_pfn call return values - this is usually the number of
+   bytes printed. */
+int conf_print_native_field(conf_pfn pfn, void *ctx, int verbose, confitem_t *val, conf_native_type_t type, confprop_t *prop, int idx);
+
+/* Prints the value of a node in a form that is suitable for lihata. Prints
+   full arrays. Returns the sum of conf_pfn call return values - this is
+   usually the number of bytes printed. */
+int conf_print_native(conf_pfn pfn, void *ctx, const char * prefix, int verbose, conf_native_t *node);
+
+
+/****** utility ******/
+
+void conf_setf(conf_role_t role, const char *path, int idx, const char *fmt, ...);
+
+#define conf_list_foreach_path_first(res, conf_list, call) \
+do { \
+	conf_listitem_t *__n__; \
+	const conflist_t *__lst1__ = (conf_list); \
+	conflist_t *__lst__ = (conflist_t *)(__lst1__); \
+	if (__lst__ != NULL) { \
+		for(__n__ = conflist_first(__lst__); __n__ != NULL; __n__ = conflist_next(__n__)) { \
+			char *__path__; \
+			const char **__in__ = __n__->val.string; \
+			if (__in__ == NULL) \
+				continue; \
+			pcb_path_resolve(*__in__, &__path__, 0); \
+			res = call; \
+			free(__path__); \
+			if (res == 0) \
+				break; \
+		} \
+	} \
+} while(0)
+
+/*	printf("conf_list_foreach_path_first: %s using %s\n", # call, # conf_list); \*/
+
+/* htsp_entry_t *e; */
+#define conf_fields_foreach(e) \
+	for (e = htsp_first(conf_fields); e; e = htsp_next(conf_fields, e))
+
+/* helpers to make the code shorter */
+#define conf_set_design(path, fmt, new_val) \
+	conf_setf(CFR_DESIGN, path, -1, fmt, new_val)
+
+#define conf_set_editor(field, val) \
+	conf_set(CFR_DESIGN, "editor/" #field, -1, val ? "1" : "0", POL_OVERWRITE)
+
+#define conf_set_editor_(sfield, val) \
+	conf_set(CFR_DESIGN, sfield, -1, val ? "1" : "0", POL_OVERWRITE)
+
+#define conf_toggle_editor(field) \
+	conf_set_editor(field, !conf_core.editor.field)
+
+#define conf_toggle_editor_(sfield, field) \
+	conf_set_editor_("editor/" sfield, !conf_core.editor.field)
+
+/* For temporary modification/restoration of variables (hack) */
+#define conf_force_set_bool(var, val) *((CFT_BOOLEAN *)(&var)) = val
+#define conf_force_set_str(var, val) *((CFT_STRING *)(&var)) = val
+
+/* get the first config subtree node (it's a hash and its children
+   are "design", "rc", ...); if create is 1, and the subtree doesn't
+   exist, create an "overwrite". */
+lht_node_t *conf_lht_get_first(conf_role_t target, int create);
+
+/* loop helper */
+conf_listitem_t *conf_list_first_str(conflist_t *list, const char **item_str, int *idx);
+conf_listitem_t *conf_list_next_str(conf_listitem_t *item_li, const char **item_str, int *idx);
+
+/*conf_listitem_t *item;*/
+#define conf_loop_list(list, item, idx) \
+	for (idx = 0, item = conflist_first((conflist_t *)list); item != NULL; item = conflist_next(item), idx++)
+
+/*conf_listitem_t *item; const char *item_str; */
+#define conf_loop_list_str(list, item_li, item_str, idx) \
+	for (idx = 0, item_li = conf_list_first_str((conflist_t *)list, &item_str, &idx); \
+		item_li != NULL;\
+		item_li = conf_list_next_str(item_li, &item_str, &idx))
+
+const char *conf_concat_strlist(const conflist_t *lst, gds_t *buff, int *inited, char sep);
+
+/* Print usage help for all nodes that have the CFF_USAGE flag and whose
+   path starts with prefix (if prefix != NULL) */
+void conf_usage(const char *prefix, void (*print)(const char *name, const char *help));
+
+/* Determine under which role a node is */
+conf_role_t conf_lookup_role(const lht_node_t *nd);
+
+/* Return the lihata node of a path in target, optionally creating it with the right type */
+lht_node_t *conf_lht_get_at(conf_role_t target, const char *path, int create);
+
+/* Write an existing conf subtree to a file */
+int conf_export_to_file(const char *fn, conf_role_t role, const char *conf_path);
+
+/* Determine the policy and priority of a config lihata node;
+   returns 0 on success but may not fill in both values, caller is
+   responsible for initializing them before the call. */
+int conf_get_policy_prio(lht_node_t *node, conf_policy_t *gpolicy, long *gprio);
+
+/* Parse text and convert the value into native form and store in one of dst
+   fields depending on type */
+int conf_parse_text(confitem_t *dst, int idx, conf_native_type_t type, const char *text, lht_node_t *err_node);
+
+/* Returns the user configuration file name */
+const char *conf_get_user_conf_name();
+
+/* Determine the file name of the project file - project_fn and pcb_fn can be NULL */
+const char *conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **out_project_fn);
+
+/* Return 1 if the config node named in path is considered safe enough
+   to specify a command to execute - e.g. an attacker shouldn't be able to
+   inject commands in design files sent */
+int pcb_conf_cmd_is_safe_(const char *path, const char *value, const char **val_out, int msg);
+#define pcb_conf_cmd_is_safe(path, val_out, msg) pcb_conf_cmd_is_safe_(#path, conf_core.path, val_out, msg)
+
+/* Get the first subtree that matches pol within target; allocate new
+   subtree if needed */
+lht_node_t *conf_lht_get_first_pol(conf_role_t target, conf_policy_t pol, int create);
+
+/* (un)register a custom config file name (not path, just file name);
+   if intern is not NULL, it is the internal (executable-embedded)
+   version; it's not strdup'd, the caller needs to keep the string available
+   until conf_unreg_file(). path is strdup'd */
+void conf_reg_file(const char *path, const char *intern);
+void conf_unreg_file(const char *path, const char *intern);
+
+void pcb_conf_files_uninit(void);
+
+#endif
Index: tags/2.0.1/src/conf_act.c
===================================================================
--- tags/2.0.1/src/conf_act.c	(nonexistent)
+++ tags/2.0.1/src/conf_act.c	(revision 18980)
@@ -0,0 +1,326 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "board.h"
+#include "actions.h"
+#include "conf_core.h"
+#include "funchash_core.h"
+#include "route_style.h"
+#include "error.h"
+#include "tool.h"
+#include "macro.h"
+
+static const char pcb_acts_Conf[] =
+	"conf(set, path, value, [role], [policy]) - change a config setting to an absolute value\n"
+	"conf(delta, path, value, [role], [policy]) - change a config setting by a delta value (numerics-only)\n"
+	"conf(toggle, path, [role]) - invert boolean value of a flag; if no role given, overwrite the highest prio config\n"
+	"conf(reset, role) - reset the in-memory lihata of a role\n"
+	"conf(iseq, path, value) - returns whether the value of a conf item matches value (for menu checked's)\n"
+	;
+static const char pcb_acth_Conf[] = "Perform various operations on the configuration tree.";
+
+extern lht_doc_t *conf_root[];
+static inline int conf_iseq_pf(void *ctx, const char *fmt, ...)
+{
+	int res;
+	va_list ap;
+	va_start(ap, fmt);
+	res = pcb_append_vprintf((gds_t *)ctx, fmt, ap);
+	va_end(ap);
+	return res;
+}
+
+static fgw_error_t pcb_act_Conf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	const char *a1, *a2, *a3, *a4;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Conf, op = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Conf, a1 = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, Conf, a2 = argv[3].val.str);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, Conf, a3 = argv[4].val.str);
+	PCB_ACT_MAY_CONVARG(5, FGW_STR, Conf, a4 = argv[5].val.str);
+
+	if ((op == F_Set) || (op == F_Delta)) {
+		const char *path, *val;
+		char valbuff[128];
+		conf_policy_t pol = POL_OVERWRITE;
+		conf_role_t role = CFR_invalid;
+		int rs;
+
+		if (argc < 4) {
+			pcb_message(PCB_MSG_ERROR, "conf(set) needs at least two arguments");
+			return FGW_ERR_ARGC;
+		}
+		if (argc > 4) {
+			role = conf_role_parse(a3);
+			if (role == CFR_invalid) {
+				pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", a3);
+				return FGW_ERR_ARG_CONV;
+			}
+		}
+		if (argc > 5) {
+			pol = conf_policy_parse(a4);
+			if (pol == POL_invalid) {
+				pcb_message(PCB_MSG_ERROR, "Invalid policy: '%s'", a4);
+				return FGW_ERR_ARG_CONV;
+			}
+		}
+		path = a1;
+		val = a2;
+
+		if (op == F_Delta) {
+			double d;
+			char *end;
+			conf_native_t *n = conf_get_field(a1);
+
+			if (n == 0) {
+				pcb_message(PCB_MSG_ERROR, "Can't delta-set '%s': no such path\n", argv[1]);
+				return FGW_ERR_ARG_CONV;
+			}
+
+			switch(n->type) {
+				case CFN_REAL:
+					d = strtod(val, &end);
+					if (*end != '\0') {
+						pcb_message(PCB_MSG_ERROR, "Can't delta-set '%s': invalid delta value\n", a1);
+						return FGW_ERR_ARG_CONV;
+					}
+					d += *n->val.real;
+					sprintf(valbuff, "%f", d);
+					val = valbuff;
+					break;
+				case CFN_COORD:
+				case CFN_INTEGER:
+				default:
+					pcb_message(PCB_MSG_ERROR, "Can't delta-set '%s': not a numeric item\n", a1);
+					return FGW_ERR_ARG_CONV;
+			}
+		}
+
+		if (role == CFR_invalid) {
+			conf_native_t *n = conf_get_field(a1);
+			if (n == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Invalid conf field '%s': no such path\n", a1);
+				return FGW_ERR_ARG_CONV;
+			}
+			rs = conf_set_native(n, 0, val);
+			conf_update(a1, 0);
+		}
+		else
+			rs = conf_set(role, path, -1, val, pol);
+
+		if (rs != 0) {
+			pcb_message(PCB_MSG_ERROR, "conf(set) failed.\n");
+			return FGW_ERR_UNKNOWN;
+		}
+	}
+
+	else if (op == F_Iseq) {
+		const char *path, *val;
+		int rs;
+		gds_t nval;
+		conf_native_t *n;
+
+		if (argc != 4) {
+			pcb_message(PCB_MSG_ERROR, "conf(iseq) needs two arguments");
+			return FGW_ERR_ARGC;
+		}
+		path = a1;
+		val = a2;
+
+		n = conf_get_field(a1);
+		if (n == NULL) {
+			if (conf_core.rc.verbose)
+				pcb_message(PCB_MSG_ERROR, "Invalid conf field '%s' in iseq: no such path\n", path);
+			return FGW_ERR_ARG_CONV;
+		}
+
+		gds_init(&nval);
+		conf_print_native_field(conf_iseq_pf, &nval, 0, &n->val, n->type, NULL, 0);
+		rs = !strcmp(nval.array, val);
+/*		printf("iseq: %s %s==%s %d\n", path, nval.array, val, rs);*/
+		gds_uninit(&nval);
+
+		PCB_ACT_IRES(rs);
+		return 0;
+	}
+
+	else if (op == F_Toggle) {
+		conf_native_t *n = conf_get_field(a1);
+		const char *new_value;
+		conf_role_t role = CFR_invalid;
+		int res;
+
+		if (n == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Invalid conf field '%s': no such path\n", a1);
+			return FGW_ERR_UNKNOWN;
+		}
+		if (n->type != CFN_BOOLEAN) {
+			pcb_message(PCB_MSG_ERROR, "Can not toggle '%s': not a boolean\n", a1);
+			return FGW_ERR_UNKNOWN;
+		}
+		if (n->used != 1) {
+			pcb_message(PCB_MSG_ERROR, "Can not toggle '%s': array size should be 1, not %d\n", a1, n->used);
+			return FGW_ERR_UNKNOWN;
+		}
+		if (argc > 3) {
+			role = conf_role_parse(a2);
+			if (role == CFR_invalid) {
+				pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", a2);
+				return FGW_ERR_ARG_CONV;
+			}
+		}
+		if (n->val.boolean[0])
+			new_value = "false";
+		else
+			new_value = "true";
+		if (role == CFR_invalid)
+			res = conf_set_native(n, 0, new_value);
+		else
+			res = conf_set(role, a1, -1, new_value, POL_OVERWRITE);
+
+		if (res != 0) {
+			pcb_message(PCB_MSG_ERROR, "Can not toggle '%s': failed to set new value\n", a1);
+			return FGW_ERR_UNKNOWN;
+		}
+		conf_update(a1, -1);
+	}
+
+	else if (op == F_Reset) {
+		conf_role_t role;
+		role = conf_role_parse(a1);
+		if (role == CFR_invalid) {
+			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", a1);
+			return FGW_ERR_ARG_CONV;
+		}
+		conf_reset(role, "<action>");
+		conf_update(a1, -1);
+	}
+
+	else {
+		pcb_message(PCB_MSG_ERROR, "Invalid conf command\n");
+		return FGW_ERR_ARG_CONV;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/*------------ get/chk (check flag actions for menus) ------------------*/
+static const char pcb_acts_GetStyle[] = "GetStyle()" ;
+static const char pcb_acth_GetStyle[] = "Return integer index (>=0) of the currently active style or -1 if no style is selected (== custom style)";
+static fgw_error_t pcb_act_GetStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL));
+	return 0;
+}
+
+static const char pcb_acts_ChkMode[] = "ChkMode(expected_mode)" ;
+static const char pcb_acth_ChkMode[] = "Return 1 if the currently selected mode is the expected_mode";
+static fgw_error_t pcb_act_ChkMode(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *dst;
+	pcb_toolid_t id;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChkMode, dst = argv[1].val.str);
+
+	id = pcb_tool_lookup(dst);
+	if (id >= 0) {
+		PCB_ACT_IRES(conf_core.editor.mode == id);
+		return 0;
+	}
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+
+static const char pcb_acts_ChkGridSize[] =
+	"ChkGridSize(expected_size)\n"
+	"ChkGridSize(none)\n"
+	;
+static const char pcb_acth_ChkGridSize[] = "Return 1 if the currently selected grid matches the expected_size. If argument is \"none\" return 1 if there is no grid.";
+static fgw_error_t pcb_act_ChkGridSize(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *dst;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ChkGridSize, dst = argv[1].val.str);
+
+	if (strcmp(dst, "none") == 0) {
+		PCB_ACT_IRES(PCB->Grid <= 300);
+		return 0;
+	}
+
+	PCB_ACT_IRES(PCB->Grid == pcb_get_value_ex(dst, NULL, NULL, NULL, NULL, NULL));
+	return 0;
+}
+
+static const char pcb_acts_ChkSubcID[] = "ChkSubcID(pattern)\n";
+static const char pcb_acth_ChkSubcID[] = "Return 1 if currently shown subc ID matches the requested pattern";
+static fgw_error_t pcb_act_ChkSubcID(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *have = conf_core.editor.subc_id, *expected = "";
+
+	if (have == NULL) have = "";
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, ChkSubcID, expected = argv[1].val.str);
+
+	PCB_ACT_IRES(strcmp(expected, have) == 0);
+	return 0;
+}
+
+static const char pcb_acts_ChkGridUnits[] = "ChkGridUnits(expected)";
+static const char pcb_acth_ChkGridUnits[] = "Return 1 if currently selected grid unit matches the expected (normally mm or mil)";
+static fgw_error_t pcb_act_ChkGridUnits(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *expected;
+	PCB_ACT_CONVARG(1, FGW_STR, ChkGridUnits, expected = argv[1].val.str);
+	PCB_ACT_IRES(strcmp(conf_core.editor.grid_unit->suffix, expected) == 0);
+	return 0;
+}
+
+static const char pcb_acts_ChkBuffer[] = "ChkBuffer(idx)";
+static const char pcb_acth_ChkBuffer[] = "Return 1 if currently selected buffer's index matches idx";
+static fgw_error_t pcb_act_ChkBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int expected;
+	PCB_ACT_CONVARG(1, FGW_INT, ChkBuffer, expected = argv[1].val.nat_int);
+	PCB_ACT_IRES((conf_core.editor.buffer_number + 1) == expected);
+	return 0;
+}
+
+pcb_action_t conf_action_list[] = {
+	{"conf", pcb_act_Conf, pcb_acth_Conf, pcb_acts_Conf},
+	{"GetStyle", pcb_act_GetStyle, pcb_acth_GetStyle, pcb_acts_GetStyle},
+	{"ChkMode", pcb_act_ChkMode, pcb_acth_ChkMode, pcb_acts_ChkMode},
+	{"ChkGridSize", pcb_act_ChkGridSize, pcb_acth_ChkGridSize, pcb_acts_ChkGridSize},
+	{"ChkSubcID", pcb_act_ChkSubcID, pcb_acth_ChkSubcID, pcb_acts_ChkSubcID},
+	{"ChkGridUnits", pcb_act_ChkGridUnits, pcb_acth_ChkGridUnits, pcb_acts_ChkGridUnits},
+	{"ChkBuffer", pcb_act_ChkBuffer, pcb_acth_ChkBuffer, pcb_acts_ChkBuffer}
+};
+
+PCB_REGISTER_ACTIONS(conf_action_list, NULL)
Index: tags/2.0.1/src/conf_core.c
===================================================================
--- tags/2.0.1/src/conf_core.c	(nonexistent)
+++ tags/2.0.1/src/conf_core.c	(revision 18980)
@@ -0,0 +1,57 @@
+#include "config.h"
+#include "conf.h"
+#include "conf_core.h"
+conf_core_t conf_core;
+
+void conf_core_init()
+{
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_core, field,isarray,type_name,cpath,cname,desc,flags);
+#include "conf_core_fields.h"
+}
+
+#define conf_clamp_to(type, var, min, max, safe_val) \
+do { \
+	if ((var < min) || (var > max)) \
+		*((type *)(&var)) = safe_val; \
+}	while(0)
+
+#define conf_clamp(type, var, min, max) \
+do { \
+	if (var < min) \
+		*((type *)(&var)) = min; \
+	else if (var > max) \
+		*((type *)(&var)) = max; \
+}	while(0)
+
+static char *get_homedir(void)
+{
+	char *homedir = getenv("HOME");
+	if (homedir == NULL)
+		homedir = getenv("USERPROFILE");
+	return homedir;
+}
+
+void pcb_conf_ro(const char *path)
+{
+	conf_native_t *n = conf_get_field(path);
+	if (n != NULL) {
+		n->used = 1;
+		n->random_flags.read_only = 1;
+	}
+}
+
+void conf_core_postproc()
+{
+	conf_clamp_to(CFT_COORD, conf_core.design.line_thickness, PCB_MIN_LINESIZE, PCB_MAX_LINESIZE, PCB_MIL_TO_COORD(10));
+	conf_clamp_to(CFT_COORD, conf_core.design.via_thickness, PCB_MIN_PINORVIASIZE, PCB_MAX_PINORVIASIZE, PCB_MIL_TO_COORD(40));
+	conf_clamp_to(CFT_COORD, conf_core.design.via_drilling_hole, 0, PCB_MAX_COORD, PCB_DEFAULT_DRILLINGHOLE * conf_core.design.via_thickness / 100);
+	conf_force_set_bool(conf_core.rc.have_regex, 1);
+	pcb_conf_ro("rc/have_regex");
+
+	conf_force_set_str(conf_core.rc.path.prefix, PCB_PREFIX);   pcb_conf_ro("rc/path/prefix");
+	conf_force_set_str(conf_core.rc.path.lib, PCBLIBDIR);       pcb_conf_ro("rc/path/lib");
+	conf_force_set_str(conf_core.rc.path.bin, BINDIR);          pcb_conf_ro("rc/path/bin");
+	conf_force_set_str(conf_core.rc.path.share, PCBSHAREDIR);   pcb_conf_ro("rc/path/share");
+	conf_force_set_str(conf_core.rc.path.home, get_homedir());  pcb_conf_ro("rc/path/home");
+}
Index: tags/2.0.1/src/conf_core.h
===================================================================
--- tags/2.0.1/src/conf_core.h	(nonexistent)
+++ tags/2.0.1/src/conf_core.h	(revision 18980)
@@ -0,0 +1,233 @@
+#ifndef PCB_CONF_CORE_H
+#define PCB_CONF_CORE_H
+
+#include "conf.h"
+#include "globalconst.h"
+
+/* NOTE: this struct has a strict format because a code generator needs to
+   read it. Please always keep the format (preferably even whitespace style).
+   Use only the CFT_* prefixed types declared in conf.h.
+   */
+
+typedef struct {
+
+	struct temp {
+		CFT_BOOLEAN rat_warn;              /* rats nest has set warnings */
+	} temp;
+
+	const struct editor {
+		CFT_UNIT grid_unit;                /* select whether you draw in mm or mil */
+		CFT_COORD grid;                    /* grid in pcb-units */
+		CFT_LIST grids;                    /* grid in grid-string format */
+		CFT_INTEGER grids_idx;             /* the index of the currently active grid from grids */
+		CFT_REAL zoom;                     /* default zoom */
+		CFT_INTEGER mode;                  /* currently active mode */
+		CFT_INTEGER buffer_number;         /* number of the current buffer */
+		CFT_BOOLEAN clear_line;            /* new lines/arc clear polygons. */
+		CFT_BOOLEAN clear_polypoly;        /* new polygons clear polygons. */
+		CFT_BOOLEAN full_poly;             /* new polygons are full polygons. */
+		CFT_BOOLEAN unique_names;          /* OBSOLETE: force unique names */
+		CFT_BOOLEAN snap_pin;              /* snap to pins and pads */
+		CFT_BOOLEAN snap_offgrid_line;     /* Snap to certain off-grid points along a line. */
+		CFT_BOOLEAN marker_snaps;          /* marker snaps to grid or snap points, as any other click */
+		CFT_BOOLEAN highlight_on_point;    /* Highlight if crosshair is on endpoints. */
+		CFT_BOOLEAN show_solder_side;      /* mirror output */
+		CFT_BOOLEAN save_last_command;     /* the command entry editline always starts with the last command entered by user in the current session */
+		CFT_INTEGER line_refraction;       /* value for line lookahead setting */
+		CFT_BOOLEAN save_in_tmp;           /* emergency save unsaved PCB data (despite the user clicks don't save) when: user starts a new PCB; user quits pcb-rnd. Does not affect the on-crash emergency save. */
+		CFT_BOOLEAN draw_grid;             /* draw grid points */
+		CFT_BOOLEAN all_direction_lines;   /* enable lines to all directions */
+		CFT_BOOLEAN rubber_band_mode;      /* move, rotate use rubberband connections */
+		CFT_BOOLEAN rubber_band_keep_midlinedir; /* keep line direction when a middle line is moved */
+		CFT_BOOLEAN swap_start_direction;  /* change starting direction after each click */
+		CFT_BOOLEAN show_drc;              /* show drc region on crosshair */
+		CFT_BOOLEAN auto_drc;              /* when set, PCB doesn't let you place copper that violates DRC. */
+		CFT_BOOLEAN show_number;           /* OBSOLETE: pinout shows number */
+		CFT_BOOLEAN orthogonal_moves;      /* move items orthogonally. */
+		CFT_BOOLEAN reset_after_element;   /* reset connections after each element while saving all connections */
+		CFT_BOOLEAN auto_place;            /* flag which says we should force placement of the windows on startup */
+		CFT_BOOLEAN lock_names;            /* lock down text so they can not be moved or selected */
+		CFT_BOOLEAN only_names;            /* lock down everything else but text so only text objects can be moved or selected */
+		CFT_BOOLEAN thin_draw;             /* if set, objects on the screen are drawn as outlines (lines are drawn as center-lines).  This lets you see line endpoints hidden under pins, for example. */
+		CFT_BOOLEAN thin_draw_poly;        /* if set, polygons on the screen are drawn as outlines. */
+		CFT_BOOLEAN wireframe_draw;        /* if set, lines and arcs on the screen are drawn as outlines. */
+		CFT_BOOLEAN local_ref;             /* use local reference for moves, by setting the mark at the beginning of each move. */
+		CFT_BOOLEAN check_planes;          /* when set, only polygons and their clearances are drawn, to see if polygons have isolated regions. */
+		CFT_BOOLEAN hide_names;            /* when set, subc floater text objects (typical use case: refdes text) are not drawn. */
+		CFT_BOOLEAN description;           /* obsolete - DO NOT USE - kept for compatibility */
+		CFT_BOOLEAN name_on_pcb;           /* obsolete - DO NOT USE - kept for compatibility */
+		CFT_STRING  subc_id;               /* subcircuit ID template for diplaying the subcircuit label on the subcircuit layer; default to displaying the refes, if empty; syntax if the same as for DYNTEXT */
+		CFT_BOOLEAN fullscreen;            /* hide widgets to make more room for the drawing */
+		CFT_BOOLEAN move_linepoint_uses_route;	/* Moving a line point calculates a new line route. This allows 45/90 line modes when editing lines. */
+		CFT_BOOLEAN auto_via;              /* when drawing traces and switching layers or when moving an object from one layer to another, try to keep connections by automatically inserting vias. */
+		CFT_REAL route_radius;             /* temporary: route draw helper's arc radius at corners (factor of the trace thickness) */
+
+		CFT_INTEGER click_time;            /* default time for click expiration, in ms */
+
+		struct view {
+			CFT_BOOLEAN flip_x;              /* view: flip the board along the X (horizontal) axis */
+			CFT_BOOLEAN flip_y;              /* view: flip the board along the Y (vertical) axis */
+		} view;
+
+		struct selection {
+			CFT_BOOLEAN disable_negative;    /* selection box behaviour: disable the negative-direction selection - any selection box will select only what's fully within the box */
+			CFT_BOOLEAN symmetric_negative;  /* selection box behaviour: when set, the selection direction is considered negative only if the box has negative size in the X direction */
+		} selection;
+
+		/* these two would need to be moved in the router plugin.... There are two
+		   reasons to keep them here:
+		   - the original pcb and pcb-rnd file formats already have named/numbered flags for these, so io_pcb needs these
+		   - more than one router plugin may share these */
+		CFT_BOOLEAN enable_stroke;         /* Enable libstroke gestures on middle mouse button when non-zero */
+		CFT_BOOLEAN live_routing;          /* autorouter shows tracks in progress */
+
+		/* Keep it here instead of the router plugin: more than one router plugin may share these */
+		CFT_BOOLEAN beep_when_finished;    /* flag if a signal should be produced when searching of  connections is done */
+
+		CFT_INTEGER undo_warning_size;     /* warn the user when undo list exceeds this amount of kilobytes in memory */
+	} editor;
+
+	const struct rc {
+		CFT_INTEGER verbose;
+		CFT_INTEGER quiet;                 /* print only errors on stderr */
+		CFT_INTEGER backup_interval;       /* time between two backups in seconds; 0 means disabled (no backups) */
+		CFT_BOOLEAN hid_fallback;          /* if there is no explicitly specified HID (--gui) and the preferred GUI fails, automatically fall back on other HIDs, eventually running in batch mode */
+		CFT_STRING brave;                  /* brave mode flags: when non-empty, enable various experimental (unstable) features - useful for testers */
+		CFT_STRING font_command;           /* file name template; if not empty, run this command and read its output for loading the font; %f is the file name  */
+		CFT_STRING file_command;           /* file name template; if not empty, run this command and read its output for loading a pcb file; %f is the file name, %p is the conf setting rc.file_path */
+		CFT_STRING file_path;
+		CFT_STRING library_shell;
+		CFT_LIST library_search_paths;
+		CFT_STRING menu_file;              /* where to load the default menu file from. If empty/unset, fall back to the legacy 'per hid ow menu file' setup. If contains slash, take it as a full path, if no slash, do a normal menu search for pcb-menu-NAME.lht */
+
+		CFT_STRING emergency_name;         /* file name template for emergency save anonymous .pcb files (when pcb-rnd crashes); optional field: %ld --> pid; must be shorter than 240 characters. Don't do emergency save if this item is empty. */
+		CFT_STRING emergency_format;       /* if set, use this format for the backups; if unset, use the default format */
+		CFT_STRING backup_name;            /* file name template for periodic backup anonymous .pcb files; optional fields: %P --> pid */
+		CFT_STRING backup_format;          /* if set, use this format for the backups; if unset or set to 'original', use the original format */
+
+		CFT_STRING save_command;           /* command to pipe the pcb, footprint or buffer file into, when saving (makes lihata persist impossible) */
+		CFT_BOOLEAN keep_save_backups;     /* a copy is made before a save operation overwrites an existing file; if this setting is true, keep the copy even after a successful save */
+		CFT_LIST default_font_file;        /* name of default font file (list of names to search) */
+		CFT_LIST default_pcb_file;
+
+		CFT_STRING script_filename;        /* PCB Actions script to execute on startup */
+		CFT_STRING action_string;          /* PCB Actions string to execute on startup */
+		CFT_STRING rat_path;
+		CFT_STRING rat_command;            /* file name template; if not empty, run this command and read its output for loading a rats; %f is the file name, %p is the rc.rat_path conf setting */
+
+		CFT_LIST preferred_gui;            /* if set, try GUI HIDs in this order when no GUI is explicitly selected */
+
+		CFT_STRING save_final_fallback_fmt;/* when a new file is created (by running pcb-rnd with the file name) there won't be a known format; pcb-rnd will guess from the file name (extension) but eventhat may fail. This format is the final fallback that'll be used if no other guessing mechanism worked. The user can override this by save as. */
+		CFT_STRING save_fp_fmt;            /* when saving a buffer element/subcircuit, prefer this format by default */
+
+		CFT_STRING cli_prompt;             /* plain text prompt to prefix the command entry */
+		CFT_STRING cli_backend;            /* command parser action */
+
+		/***** automatically set (in postproc) *****/
+		CFT_BOOLEAN have_regex;            /* whether we have regex compiled in */
+		struct path {
+			CFT_STRING prefix;               /* e.g. /usr/local */
+			CFT_STRING lib;                  /* e.g. /usr/lib/pcb-rnd */
+			CFT_STRING bin;                  /* e.g. /usr/bin */
+			CFT_STRING share;                /* e.g. /usr/share/pcb-rnd */
+			CFT_STRING home;                 /* user's home dir, determined run-time */
+			
+			CFT_STRING exec_prefix;          /* exec prefix path (extracted from argv[0]) */
+
+			CFT_STRING design;               /* directory path of the current design, or <invalid> if the current design doesn't have a file name yet */
+		} path;
+	} rc;
+
+	const struct design { /* defaults of a new layout */
+		CFT_COORD via_thickness;
+		CFT_COORD via_drilling_hole;
+		CFT_COORD line_thickness;
+		CFT_COORD clearance;
+
+		CFT_COORD alignment_distance;/* default drc size */
+		CFT_COORD bloat; /* default drc size */
+		CFT_COORD shrink;
+		CFT_COORD min_wid;
+		CFT_COORD min_slk;
+		CFT_COORD min_drill;
+		CFT_COORD min_ring;
+		CFT_INTEGER text_scale;            /* text scaling in % */
+		CFT_INTEGER text_font_id;
+		CFT_REAL poly_isle_area;           /* polygon min area */
+		CFT_STRING fab_author;             /* Full name of author for FAB drawings */
+		CFT_STRING initial_layer_stack;    /* deprecated. */
+
+		CFT_COORD paste_adjust;            /* Adjust paste thickness */
+	} design;
+
+/* @path appearance/color */
+	const struct appearance {
+		CFT_COORD rat_thickness;
+		CFT_COORD mark_size;               /* relative marker size */
+		CFT_REAL layer_alpha;              /* alpha value for layer drawing */
+		CFT_REAL drill_alpha;              /* alpha value for drill drawing */
+		CFT_BOOLEAN text_host_bbox;        /* when moving a text object, the outline thin-draw should also include the bounding box */
+		CFT_REAL term_label_size;          /* size of terminal labels, in pcb font scale (100 is for the normal size) */
+		CFT_BOOLEAN subc_layer_per_side;   /* hide top or bottom placed subcircuit annotations if the view is showing the other side */
+		struct loglevels {
+			CFT_STRING   debug_tag;          /* log style tag of debug messages */
+			CFT_BOOLEAN  debug_popup;        /* whether a debug line should pop up the log window */
+			CFT_STRING   info_tag;           /* log style tag of info messages */
+			CFT_BOOLEAN  info_popup;         /* whether an info line should pop up the log window */
+			CFT_STRING   warning_tag;        /* log style tag of warnings */
+			CFT_BOOLEAN  warning_popup;      /* whether a warning should pop up the log window */
+			CFT_STRING   error_tag;          /* log style tag of errors */
+			CFT_BOOLEAN  error_popup;        /* whether an error should pop up the log window */
+		} loglevels;
+		struct color {
+			CFT_COLOR background;            /* background and cursor color ... */
+			CFT_COLOR crosshair;             /* different object colors */
+			CFT_COLOR cross;                 /* crosshair, drc outline color */
+			CFT_COLOR selected;              /* generic object selection color */
+			CFT_COLOR via;                   /* non-terminal padstack shape on current layer */
+			CFT_COLOR pin;                   /* terminal padstack shape on current layer */
+			CFT_COLOR pin_name;              /* on-screen terminal number/name labels */
+			CFT_COLOR subc;                  /* on-screen subcircuit marks */
+			CFT_COLOR subc_nonetlist;        /* on-screen subcircuit marks for subcircuits with the nonetlist flag */
+			CFT_COLOR padstackmark;          /* on-screen center mark cross for padstacks */
+			CFT_COLOR rat;                   /* on-screen rat lines */
+			CFT_COLOR invisible_objects;     /* other-side objects and padstack shapes on non-current layer */
+			CFT_COLOR connected;             /* 'connected' highlight (galvanic connections found) */
+			CFT_COLOR warn;                  /* warning highlight (e.g. object found to cause a short) */
+			CFT_COLOR off_limit;             /* on-screen background beyond the configured drawing area */
+			CFT_COLOR grid;                  /* on-screen grid */
+			CFT_COLOR layer[PCB_MAX_LAYER];  /* default layer colors; when a new layer is created, a color from this list is assigned initially */
+			CFT_COLOR mask;                  /* default mask layer color (when a new mask layer is created) */
+			CFT_COLOR paste;                 /* default paste layer color (when a new paste layer is created) */
+			CFT_COLOR element;               /* default silk layer color (when a new silk layer is created) */
+		} color;
+		struct pinout {
+			CFT_INTEGER name_length;
+			CFT_REAL zoom;
+			CFT_COORD offset_x;           /* X offset of origin */
+			CFT_COORD offset_y;           /* Y offset of origin */
+			CFT_COORD text_offset_x;      /* X offset of text from pin center */
+			CFT_COORD text_offset_y;      /* Y offset of text from pin center */
+		} pinout;
+		struct padstack {
+			CFT_INTEGER cross_thick;      /* cross thickness in pixels - 0 means disable crosses */
+			CFT_COORD cross_size;         /* cross size in word coords - size of one arm of the cross (minus the hole radius) */
+		} padstack;
+		struct subc {
+			CFT_INTEGER dash_freq;        /* how dense the dashed outline should be; -1 means do not display the dashed outline; 0 means solid outline; 1..32 means dashed outline */
+		} subc;
+		struct messages {
+			CFT_INTEGER char_per_line;   /* width of an output line in characters (used by separator drawing in find.c) */		
+		} messages;
+		struct misc {
+			CFT_INTEGER volume;          /* the speakers volume -100..100 */
+		} misc;
+	} appearance;
+
+} conf_core_t;
+
+extern conf_core_t conf_core;
+void conf_core_init();
+void conf_core_postproc();
+void pcb_conf_ro(const char *path);
+#endif
Index: tags/2.0.1/src/conf_hid.c
===================================================================
--- tags/2.0.1/src/conf_hid.c	(nonexistent)
+++ tags/2.0.1/src/conf_hid.c	(revision 18980)
@@ -0,0 +1,140 @@
+#include "config.h"
+#include "conf_hid.h"
+#include <genht/hash.h>
+#include <genht/htpp.h>
+#include "error.h"
+#include "conf_core.h"
+
+typedef struct {
+	const conf_hid_callbacks_t *cb;
+	conf_hid_id_t id;
+} conf_hid_t;
+
+void *conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data)
+{
+	void **old = vtp0_get(&cfg->hid_data, id, 0);
+	vtp0_set(&cfg->hid_data, id, data);
+	return old == NULL ? NULL : *old;
+}
+
+void *conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id)
+{
+	void **old = vtp0_get(&cfg->hid_data, id, 0);
+	return old == NULL ? NULL : *old;
+}
+
+const conf_hid_callbacks_t *conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs)
+{
+	void **old;
+	assert(id >= 0);
+	old = vtp0_get(&cfg->hid_callbacks, id, 0);
+	vtp0_set(&cfg->hid_callbacks, id, (void *)cbs);
+	return (const conf_hid_callbacks_t *)(old == NULL ? NULL : *old);
+}
+
+
+static int conf_hid_id_next = 0;
+static htpp_t *conf_hid_ids = NULL;
+
+static void conf_pcb_hid_init(void)
+{
+	if (conf_hid_ids == NULL)
+		conf_hid_ids = htpp_alloc(ptrhash, ptrkeyeq);
+}
+
+void conf_pcb_hid_uninit(void)
+{
+	if (conf_hid_ids != NULL) {
+		htpp_free(conf_hid_ids);
+		conf_hid_ids = NULL;
+	}
+}
+
+conf_hid_id_t conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb)
+{
+	conf_hid_t *h;
+
+	if (cookie == NULL)
+		return -1;
+
+	conf_pcb_hid_init();
+	if (htpp_getentry(conf_hid_ids, (void *)cookie) != NULL)
+		return -1; /* already registered */
+
+	h = malloc(sizeof(conf_hid_t));
+	h->cb = cb;
+	h->id = conf_hid_id_next++;
+	htpp_set(conf_hid_ids, (void *)cookie, h);
+	return h->id;
+}
+
+void conf_hid_unreg(const char *cookie)
+{
+	htsp_entry_t *e;
+	conf_hid_t *h = htpp_pop(conf_hid_ids, (void *)cookie);
+
+	if (h == NULL)
+		return;
+
+	/* remove local callbacks */
+	conf_fields_foreach(e) {
+		int len;
+		conf_native_t *cfg = e->value;
+		len = vtp0_len(&cfg->hid_callbacks);
+
+		conf_hid_local_cb(cfg, -1, unreg_item);
+
+		/* truncate the list if there are empty items at the end */
+		if (len > h->id) {
+			int last;
+			cfg->hid_callbacks.array[h->id] = NULL;
+			for(last = len-1; last >= 0; last--)
+				if (cfg->hid_callbacks.array[last] != NULL)
+					break;
+			if (last < len)
+				vtp0_truncate(&cfg->hid_callbacks, last+1);
+		}
+	}
+
+	if ((h->cb != NULL) && (h->cb->unreg_item != NULL)) {
+		conf_fields_foreach(e) {
+			conf_native_t *cfg = e->value;
+			h->cb->unreg_item(cfg, -1);
+		}
+	}
+
+	free(h);
+}
+
+typedef void (*cb_t)(conf_native_t *cfg, int arr_idx);
+void conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs)
+{
+	htpp_entry_t *e;
+	if (conf_hid_ids == NULL)
+		return;
+	for (e = htpp_first(conf_hid_ids); e; e = htpp_next(conf_hid_ids, e)) {
+		conf_hid_t *h = e->value;
+		const conf_hid_callbacks_t *cbs = h->cb;
+		if (cbs != NULL) {
+			char *s = (char *)&cbs->val_change_pre;
+			cb_t *cb = (cb_t *)(s + offs);
+			if ((*cb) != NULL)
+				(*cb)(item, arr_idx);
+		}
+	}
+}
+
+
+void conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup)
+{
+	*tag = NULL;
+	*popup = 0;
+	switch(level) {
+		case PCB_MSG_DEBUG:   *tag = conf_core.appearance.loglevels.debug_tag; *popup = conf_core.appearance.loglevels.debug_popup; break;
+		case PCB_MSG_INFO:    *tag = conf_core.appearance.loglevels.info_tag; *popup = conf_core.appearance.loglevels.info_popup; break;
+		case PCB_MSG_WARNING: *tag = conf_core.appearance.loglevels.warning_tag; *popup = conf_core.appearance.loglevels.warning_popup; break;
+		case PCB_MSG_ERROR:   *tag = conf_core.appearance.loglevels.error_tag; *popup = conf_core.appearance.loglevels.error_popup; break;
+			break;
+	}
+}
+
Index: tags/2.0.1/src/conf_hid.h
===================================================================
--- tags/2.0.1/src/conf_hid.h	(nonexistent)
+++ tags/2.0.1/src/conf_hid.h	(revision 18980)
@@ -0,0 +1,74 @@
+#ifndef PCB_CONF_HID_H
+#define PCB_CONF_HID_H
+
+#include "conf.h"
+#include "error.h"
+
+typedef struct conf_hid_callbacks_s {
+	/* Called before/after a value of a config item is updated - this doesn't necessarily mean the value actually changes */
+	void (*val_change_pre)(conf_native_t *cfg, int arr_idx);
+	void (*val_change_post)(conf_native_t *cfg, int arr_idx);
+
+	/* Called when a new config item is added to the database; global-only */
+	void (*new_item_post)(conf_native_t *cfg, int arr_idx);
+
+	/* Called during conf_hid_unreg to get hid-data cleaned up */
+	void (*unreg_item)(conf_native_t *cfg, int arr_idx);
+} conf_hid_callbacks_t;
+
+typedef int conf_hid_id_t;
+
+/* Set local hid data in a native item; returns the previous value set or NULL */
+void *conf_hid_set_data(conf_native_t *cfg, conf_hid_id_t id, void *data);
+
+/* Returns local hid data in a native item */
+void *conf_hid_get_data(conf_native_t *cfg, conf_hid_id_t id);
+
+/* Set local callbacks in a native item; returns the previous callbacks set or NULL */
+const conf_hid_callbacks_t *conf_hid_set_cb(conf_native_t *cfg, conf_hid_id_t id, const conf_hid_callbacks_t *cbs);
+
+
+/* register a hid with a cookie; this is necessary only if:
+     - the HID wants to store per-config-item hid_data with the above calls
+     - the HID wants to get notified about changes in the config tree using callback functions
+   NOTE: cookie is taken by pointer, the string value does not matter. One pointer
+         can be registered only once.
+   cb holds the global notification callbacks - called when anything changed; it can be NULL.
+   Returns a new HID id that can be used to access hid data, or -1 on error.
+*/
+conf_hid_id_t conf_hid_reg(const char *cookie, const conf_hid_callbacks_t *cb);
+
+/* Unregister a hid; if unreg_item cb is specified, call it on each config item */
+void conf_hid_unreg(const char *cookie);
+
+void conf_pcb_hid_uninit(void);
+
+
+/* Call the local callback of a native item */
+#define conf_hid_local_cb(native, arr_idx, cb) \
+do { \
+	unsigned int __n__; \
+	for(__n__ = 0; __n__ < vtp0_len(&((native)->hid_callbacks)); __n__++) { \
+		const conf_hid_callbacks_t *cbs = (native)->hid_callbacks.array[__n__]; \
+		if ((cbs != NULL) && (cbs->cb != NULL)) \
+			cbs->cb(native, arr_idx); \
+	} \
+} while(0)
+
+/* Call the global callback of a native item */
+#define conf_hid_global_cb(native, arr_idx, cb) \
+do { \
+	conf_hid_callbacks_t __cbs__; \
+	int __offs__ = ((char *)&(__cbs__.cb)) - ((char *)&(__cbs__)); \
+	conf_hid_global_cb_(native, arr_idx, __offs__); \
+} while(0)
+
+/****** Utility/helper functions  ******/
+/* Looking at the log level, return a log format tag and whether the window
+   should pop up. */
+void conf_loglevel_props(enum pcb_message_level level, const char **tag, int *popup);
+
+/****** Internal  ******/
+void conf_hid_global_cb_(conf_native_t *item, int arr_idx, int offs);
+
+#endif
Index: tags/2.0.1/src/conf_regfile.c
===================================================================
--- tags/2.0.1/src/conf_regfile.c	(nonexistent)
+++ tags/2.0.1/src/conf_regfile.c	(revision 18980)
@@ -0,0 +1,93 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Register custom (plugin) config file names, reference counted. These files
+   are loaded from system and user config paths */
+
+#include <genht/htsi.h>
+
+static htsi_t conf_files;
+static htsi_t conf_interns;
+static int conf_files_inited = 0;
+
+static void conf_files_init(void)
+{
+	htsi_init(&conf_files, strhash, strkeyeq);
+	htsi_init(&conf_interns, strhash, strkeyeq);
+	conf_files_inited = 1;
+}
+
+void pcb_conf_files_uninit(void)
+{
+	htsi_entry_t *e;
+	for (e = htsi_first(&conf_files); e; e = htsi_next(&conf_files, e))
+		free(e->key);
+	htsi_uninit(&conf_files);
+	htsi_uninit(&conf_interns);
+	conf_files_inited = 0;
+}
+
+void conf_reg_file(const char *path, const char *intern)
+{
+	htsi_entry_t *e;
+	if (!conf_files_inited) conf_files_init();
+	e = htsi_getentry(&conf_files, path);
+	if (e == NULL)
+		htsi_set(&conf_files, pcb_strdup(path), 1);
+	else
+		e->value++;
+	e = htsi_getentry(&conf_interns, intern);
+	if (e == NULL)
+		htsi_set(&conf_interns, (char *)intern, 1);
+	else
+		e->value++;
+}
+
+static void conf_unreg_any(htsi_t *ht, const char *key, int free_key)
+{
+	htsi_entry_t *e;
+
+	e = htsi_getentry(ht, key);
+	assert(e != NULL);
+	if (e == NULL) return;
+
+	e->value--;
+	if (e->value == 0) {
+		htsi_delentry(ht, e);
+		if (free_key)
+			free(e->key);
+	}
+}
+
+void conf_unreg_file(const char *path, const char *intern)
+{
+	assert(conf_files_inited);
+	if (!conf_files_inited) return;
+
+	conf_unreg_any(&conf_files, path, 1);
+	conf_unreg_any(&conf_interns, intern, 0);
+}
+
Index: tags/2.0.1/src/copy.c
===================================================================
--- tags/2.0.1/src/copy.c	(nonexistent)
+++ tags/2.0.1/src/copy.c	(revision 18980)
@@ -0,0 +1,76 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* functions used to copy objects
+ * it's necessary to copy data by calling create... since the base pointer
+ * may change cause of dynamic memory allocation
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "select.h"
+#include "undo.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_poly_op.h"
+#include "obj_text_op.h"
+#include "obj_subc_op.h"
+#include "obj_pstk_op.h"
+
+static pcb_opfunc_t CopyFunctions = {
+	pcb_lineop_copy,
+	pcb_textop_copy,
+	pcb_polyop_copy,
+	NULL,
+	NULL,
+	pcb_arcop_copy,
+	NULL,
+	NULL,
+	pcb_subcop_copy,
+	pcb_pstkop_copy
+};
+
+void *pcb_copy_obj(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY)
+{
+	void *ptr;
+	pcb_opctx_t ctx;
+
+	ctx.copy.pcb = PCB;
+	ctx.copy.DeltaX = DX;
+	ctx.copy.DeltaY = DY;
+	ctx.copy.from_outside = 0;
+
+	/* the subroutines add the objects to the undo-list */
+	ptr = pcb_object_operation(&CopyFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	pcb_undo_inc_serial();
+	return ptr;
+}
Index: tags/2.0.1/src/copy.h
===================================================================
--- tags/2.0.1/src/copy.h	(nonexistent)
+++ tags/2.0.1/src/copy.h	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_COPY_H
+#define	PCB_COPY_H
+
+#include "config.h"
+
+#define	PCB_COPY_TYPES              \
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | \
+	PCB_OBJ_SUBC | PCB_OBJ_POLY | PCB_OBJ_ARC)
+
+/* Undoably copies (duplicates) an object; the new objects is moved by DX,DY
+   (operation wrapper) */
+void *pcb_copy_obj(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY);
+
+#endif
Index: tags/2.0.1/src/crosshair.c
===================================================================
--- tags/2.0.1/src/crosshair.c	(nonexistent)
+++ tags/2.0.1/src/crosshair.c	(revision 18980)
@@ -0,0 +1,1149 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "data.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "search.h"
+#include "polygon.h"
+#include "actions.h"
+#include "hid_inlines.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "vtonpoint.h"
+#include "find.h"
+#include "undo.h"
+#include "event.h"
+#include "macro.h"
+#include "grid.h"
+#include "stub_stroke.h"
+
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_text_draw.h"
+#include "obj_pstk_draw.h"
+#include "obj_arc_ui.h"
+#include "obj_subc_parent.h"
+
+#include "tool.h"
+
+typedef struct {
+	int x, y;
+} point;
+
+pcb_crosshair_t pcb_crosshair;  /* information about cursor settings */
+pcb_mark_t pcb_marked;          /* a cross-hair mark */
+
+static void thindraw_moved_ps(pcb_pstk_t *ps, pcb_coord_t x, pcb_coord_t y)
+{
+	/* Make a copy of the pin structure, moved to the correct position */
+	pcb_pstk_t moved_ps = *ps;
+	moved_ps.x += x;
+	moved_ps.y += y;
+
+	pcb_pstk_thindraw(pcb_crosshair.GC, &moved_ps);
+}
+
+/* ---------------------------------------------------------------------------
+ * creates a tmp polygon with coordinates converted to screen system
+ */
+void pcb_xordraw_poly(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last)
+{
+	pcb_cardinal_t i;
+	for (i = 0; i < polygon->PointN; i++) {
+		pcb_cardinal_t next = pcb_poly_contour_next_point(polygon, i);
+
+		if (next == 0) { /* last line: sometimes the implicit closing line */
+			if (i == 1) /* corner case: don't draw two lines on top of each other - with XOR it looks bad */
+				continue;
+
+			if (dash_last) {
+				pcb_draw_dashed_line(pcb_crosshair.GC,
+									 polygon->Points[i].X + dx,
+									 polygon->Points[i].Y + dy, polygon->Points[next].X + dx, polygon->Points[next].Y + dy, 5, pcb_false);
+				break; /* skip normal line draw below */
+			}
+		}
+
+		/* normal contour line */
+		pcb_gui->draw_line(pcb_crosshair.GC,
+								 polygon->Points[i].X + dx,
+								 polygon->Points[i].Y + dy, polygon->Points[next].X + dx, polygon->Points[next].Y + dy);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * creates a tmp polygon with coordinates converted to screen system, designed
+ * for subc paste xor-draw
+ */
+void pcb_xordraw_poly_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr)
+{
+	pcb_cardinal_t i;
+	for (i = 0; i < polygon->PointN; i++) {
+		pcb_cardinal_t next = pcb_poly_contour_next_point(polygon, i);
+
+		if (next == 0) { /* last line: sometimes the implicit closing line */
+			if (i == 1) /* corner case: don't draw two lines on top of each other - with XOR it looks bad */
+				continue;
+		}
+
+		/* normal contour line */
+		pcb_gui->draw_line(pcb_crosshair.GC,
+			PCB_CSWAP_X(polygon->Points[i].X, w, mirr) + dx,
+			PCB_CSWAP_Y(polygon->Points[i].Y, h, mirr) + dy,
+			PCB_CSWAP_X(polygon->Points[next].X, w, mirr) + dx,
+			PCB_CSWAP_Y(polygon->Points[next].Y, h, mirr) + dy);
+	}
+}
+
+/*-----------------------------------------------------------
+ * Draws the outline of an attached arc
+ */
+void pcb_xordraw_attached_arc(pcb_coord_t thick)
+{
+	pcb_arc_t arc;
+	pcb_coord_t wx, wy;
+	pcb_angle_t sa, dir;
+
+	wx = pcb_crosshair.X - pcb_crosshair.AttachedBox.Point1.X;
+	wy = pcb_crosshair.Y - pcb_crosshair.AttachedBox.Point1.Y;
+	if (wx == 0 && wy == 0)
+		return;
+	arc.X = pcb_crosshair.AttachedBox.Point1.X;
+	arc.Y = pcb_crosshair.AttachedBox.Point1.Y;
+	if (PCB_XOR(pcb_crosshair.AttachedBox.otherway, coord_abs(wy) > coord_abs(wx))) {
+		arc.X = pcb_crosshair.AttachedBox.Point1.X + coord_abs(wy) * PCB_SGNZ(wx);
+		sa = (wx >= 0) ? 0 : 180;
+		dir = (PCB_SGNZ(wx) == PCB_SGNZ(wy)) ? 90 : -90;
+	}
+	else {
+		arc.Y = pcb_crosshair.AttachedBox.Point1.Y + coord_abs(wx) * PCB_SGNZ(wy);
+		sa = (wy >= 0) ? -90 : 90;
+		dir = (PCB_SGNZ(wx) == PCB_SGNZ(wy)) ? -90 : 90;
+		wy = wx;
+	}
+	wy = coord_abs(wy);
+	arc.StartAngle = sa;
+	arc.Delta = dir;
+	arc.Width = arc.Height = wy;
+	arc.Thickness = thick;
+
+	pcb_draw_wireframe_arc(pcb_crosshair.GC,&arc);
+}
+
+/* ---------------------------------------------------------------------------
+ * draws all visible and attached objects of the pastebuffer
+ */
+void pcb_xordraw_buffer(pcb_buffer_t *Buffer)
+{
+	pcb_cardinal_t i;
+	pcb_coord_t x, y;
+
+	/* set offset */
+	x = pcb_crosshair.AttachedObject.tx - Buffer->X;
+	y = pcb_crosshair.AttachedObject.ty - Buffer->Y;
+
+	/* draw all visible layers */
+	for (i = 0; i < pcb_max_layer; i++)
+		if (PCB->Data->Layer[i].meta.real.vis) {
+			pcb_layer_t *layer = &Buffer->Data->Layer[i];
+
+			PCB_LINE_LOOP(layer);
+			{
+				pcb_draw_wireframe_line(	pcb_crosshair.GC,
+																	x + line->Point1.X, y + line->Point1.Y, 
+																	x + line->Point2.X, y + line->Point2.Y,
+																	line->Thickness,0 );
+			}
+			PCB_END_LOOP;
+			PCB_ARC_LOOP(layer);
+			{
+				pcb_arc_t translated_arc = *arc;
+				translated_arc.X += x;
+				translated_arc.Y += y;
+				pcb_draw_wireframe_arc(pcb_crosshair.GC, &translated_arc);
+			}
+			PCB_END_LOOP;
+			PCB_TEXT_LOOP(layer);
+			{
+				pcb_text_draw_xor(text, x, y);
+			}
+			PCB_END_LOOP;
+			/* the tmp polygon has n+1 points because the first
+			 * and the last one are set to the same coordinates
+			 */
+			PCB_POLY_LOOP(layer);
+			{
+				pcb_xordraw_poly(polygon, x, y, 0);
+			}
+			PCB_END_LOOP;
+		}
+
+	/* draw subcircuit */
+	PCB_SUBC_LOOP(Buffer->Data);
+	{
+		pcb_xordraw_subc(subc, x, y, Buffer->from_outside);
+	}
+	PCB_END_LOOP;
+
+	/* and the padstacks */
+	if (PCB->pstk_on)
+		PCB_PADSTACK_LOOP(Buffer->Data);
+	{
+		thindraw_moved_ps(padstack, x, y);
+	}
+	PCB_END_LOOP;
+}
+
+/* ---------------------------------------------------------------------------
+ * draws the rubberband to insert points into polygons/lines/...
+ */
+void pcb_xordraw_insert_pt_obj(void)
+{
+	pcb_line_t *line = (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2;
+	pcb_point_t *point = (pcb_point_t *) pcb_crosshair.AttachedObject.Ptr3;
+
+	if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
+		pcb_gui->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point1.X, line->Point1.Y);
+		pcb_gui->draw_line(pcb_crosshair.GC, point->X, point->Y, line->Point2.X, line->Point2.Y);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * draws the attached object while in PCB_MODE_MOVE or PCB_MODE_COPY
+ */
+void pcb_xordraw_movecopy(void)
+{
+	pcb_coord_t dx = pcb_crosshair.AttachedObject.tx - pcb_crosshair.AttachedObject.X;
+	pcb_coord_t dy = pcb_crosshair.AttachedObject.ty - pcb_crosshair.AttachedObject.Y;
+	int event_sent = 0;
+	
+	switch (pcb_crosshair.AttachedObject.Type) {
+
+	case PCB_OBJ_PSTK:
+		{
+			pcb_pstk_t *ps = (pcb_pstk_t *) pcb_crosshair.AttachedObject.Ptr1;
+			thindraw_moved_ps(ps, dx, dy);
+			break;
+		}
+
+	case PCB_OBJ_LINE:
+		{
+			/* We move a local copy of the line -the real line hasn't moved, 
+			 * only the preview.
+			 */			
+			int constrained = 0;
+			pcb_line_t line;
+			
+			pcb_coord_t dx1 = dx, dx2 = dx;
+			pcb_coord_t dy1 = dy, dy2 = dy;
+			
+			memcpy(&line, (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2, sizeof(line));
+
+			if(conf_core.editor.rubber_band_keep_midlinedir)
+				pcb_event(PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, "pppppp", &line, &constrained, &dx1, &dy1, &dx2, &dy2);
+			pcb_event(PCB_EVENT_RUBBER_MOVE_DRAW, "icccc", constrained, dx1, dy1, dx2, dy2);
+
+			event_sent = 1;
+
+			line.Point1.X += dx1;
+			line.Point1.Y += dy1;
+			line.Point2.X += dx2;
+			line.Point2.Y += dy2;
+
+			pcb_draw_wireframe_line(pcb_crosshair.GC,
+															line.Point1.X, line.Point1.Y,
+															line.Point2.X, line.Point2.Y, 
+															line.Thickness, 0);
+			
+			/* Draw the DRC outline if it is enabled */
+			if (conf_core.editor.show_drc) {
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y,
+																line.Point2.X, line.Point2.Y,
+																line.Thickness + 2 * (conf_core.design.bloat + 1), 0);
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+			}
+			break;
+		}
+
+	case PCB_OBJ_ARC:
+		{
+			/* Make a temporary arc and move it by dx,dy */
+			pcb_arc_t arc = *((pcb_arc_t *) pcb_crosshair.AttachedObject.Ptr2);
+			pcb_event(PCB_EVENT_RUBBER_MOVE_DRAW, "icccc", 0, dx, dy, dx, dy);
+			event_sent = 1;
+			
+			arc.X += dx;
+			arc.Y += dy;
+
+			pcb_draw_wireframe_arc(pcb_crosshair.GC,&arc);
+
+			/* Draw the DRC outline if it is enabled */
+			if (conf_core.editor.show_drc) {
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+				arc.Thickness += 2 * (conf_core.design.bloat + 1);
+				pcb_draw_wireframe_arc(pcb_crosshair.GC,&arc);
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+			}
+			break;
+		}
+
+	case PCB_OBJ_POLY:
+		{
+			pcb_poly_t *polygon = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2;
+
+			/* the tmp polygon has n+1 points because the first
+			 * and the last one are set to the same coordinates
+			 */
+			pcb_xordraw_poly(polygon, dx, dy, 0);
+			break;
+		}
+
+	case PCB_OBJ_TEXT:
+		{
+			pcb_text_t *text = (pcb_text_t *)pcb_crosshair.AttachedObject.Ptr2;
+			pcb_text_draw_xor(text, dx, dy);
+			break;
+		}
+
+	case PCB_OBJ_LINE_POINT:
+		{
+			pcb_line_t *line;
+			pcb_point_t *point,*point1,point2;
+
+			line = (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2;
+			point = (pcb_point_t *) pcb_crosshair.AttachedObject.Ptr3;
+			point1 = (point == &line->Point1 ? &line->Point2 : &line->Point1);
+			point2 = *point;
+			point2.X += dx;
+			point2.Y += dy;
+
+			if(conf_core.editor.move_linepoint_uses_route == 0) {/* config setting for selecting new 45/90 method */ 
+				pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y, line->Thickness, 0);
+
+				/* Draw the DRC outline if it is enabled */
+				if (conf_core.editor.show_drc) {
+					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+					pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, 
+																	point2.Y,line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
+					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+				}
+			}
+			else {
+				pcb_route_t	route;
+				pcb_route_init(&route);
+				pcb_route_calculate(	PCB,
+															&route,
+															point1,
+															&point2,
+															pcb_layer_id(PCB->Data,(pcb_layer_t *)pcb_crosshair.AttachedObject.Ptr1),
+															line->Thickness,
+															line->Clearance,
+															line->Flags,
+															pcb_gui->shift_is_pressed(),
+															pcb_gui->control_is_pressed() );
+				pcb_route_draw(&route,pcb_crosshair.GC);
+				if (conf_core.editor.show_drc) 
+					pcb_route_draw_drc(&route,pcb_crosshair.GC);
+				pcb_route_destroy(&route);		
+			}
+
+			break;
+		}
+
+	case PCB_OBJ_ARC_POINT:
+		{
+			pcb_arc_t arc = *((pcb_arc_t *)pcb_crosshair.AttachedObject.Ptr2);
+			pcb_coord_t ox1,ox2,oy1,oy2;
+			pcb_coord_t nx1,nx2,ny1,ny2;
+
+			/* Get the initial position of the arc point */
+			pcb_arc_get_end(&arc,0, &ox1, &oy1);
+			pcb_arc_get_end(&arc,1, &ox2, &oy2);
+
+			/* Update the attached arc point */
+			pcb_arc_ui_move_or_copy(&pcb_crosshair);
+
+			/* Update our local arc copy from the attached object */
+			if(pcb_crosshair.AttachedObject.radius != 0) {
+				arc.Width   = pcb_crosshair.AttachedObject.radius;
+				arc.Height  = pcb_crosshair.AttachedObject.radius;
+			}
+			else {
+				arc.StartAngle  = pcb_crosshair.AttachedObject.start_angle;
+				arc.Delta       = pcb_crosshair.AttachedObject.delta_angle;
+			}
+
+			pcb_draw_wireframe_arc(pcb_crosshair.GC,&arc);
+
+			/* Draw the DRC outline if it is enabled */
+			if (conf_core.editor.show_drc) {
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+				arc.Thickness += 2 * (conf_core.design.bloat + 1);
+				pcb_draw_wireframe_arc(pcb_crosshair.GC,&arc);
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+			}
+
+			/* Get the new arc point positions, calculate the movement deltas and send them 
+			 * in a rubber_move_draw event */
+			pcb_arc_get_end(&arc,0, &nx1, &ny1);
+			pcb_arc_get_end(&arc,1, &nx2, &ny2);
+
+			pcb_event(PCB_EVENT_RUBBER_MOVE_DRAW, "icccc", 0, nx1-ox1,ny1-oy1,nx2-ox2,ny2-oy2);
+			event_sent = 1;
+			break;
+		}
+
+	case PCB_OBJ_POLY_POINT:
+		{
+			pcb_poly_t *polygon;
+			pcb_point_t *point;
+			pcb_cardinal_t point_idx, prev, next;
+
+			polygon = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2;
+			point = (pcb_point_t *) pcb_crosshair.AttachedObject.Ptr3;
+			point_idx = pcb_poly_point_idx(polygon, point);
+
+			/* get previous and following point */
+			prev = pcb_poly_contour_prev_point(polygon, point_idx);
+			next = pcb_poly_contour_next_point(polygon, point_idx);
+
+			/* draw the two segments */
+			pcb_gui->draw_line(pcb_crosshair.GC, polygon->Points[prev].X, polygon->Points[prev].Y, point->X + dx, point->Y + dy);
+			pcb_gui->draw_line(pcb_crosshair.GC, point->X + dx, point->Y + dy, polygon->Points[next].X, polygon->Points[next].Y);
+			break;
+		}
+
+	case PCB_OBJ_SUBC:
+		pcb_xordraw_subc((pcb_subc_t *) pcb_crosshair.AttachedObject.Ptr2, dx, dy, 0);
+		break;
+	}
+
+	/* floaters have a link back to their parent subc */
+	if (pcb_crosshair.AttachedObject.Ptr2 != NULL
+			&& PCB_FLAG_TEST(PCB_FLAG_FLOATER, (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2)) {
+		pcb_any_obj_t *obj = pcb_crosshair.AttachedObject.Ptr2;
+		if (obj->parent_type == PCB_PARENT_LAYER) {
+			pcb_data_t *data = obj->parent.layer->parent.data;
+			if ((data != NULL) && (data->parent_type == PCB_PARENT_SUBC)) {
+				pcb_subc_t *sc = data->parent.subc;
+				pcb_coord_t ox, oy;
+				if (pcb_subc_get_origin(sc, &ox, &oy) == 0)
+					pcb_gui->draw_line(pcb_crosshair.GC, ox, oy, pcb_crosshair.X, pcb_crosshair.Y);
+			}
+		}
+	}
+
+	if(!event_sent)
+		pcb_event(PCB_EVENT_RUBBER_MOVE_DRAW, "icc", 0, dx, dy );
+}
+
+/* ---------------------------------------------------------------------------
+ * draws additional stuff that follows the crosshair
+ */
+void pcb_draw_attached(pcb_bool inhibit_drawing_mode)
+{
+	if (!inhibit_drawing_mode) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, NULL);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE_XOR, 1, NULL);
+	}
+
+	pcb_tool_draw_attached();
+
+	/* an attached box does not depend on a special mode */
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND || pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) {
+		pcb_coord_t x1, y1, x2, y2;
+
+		x1 = pcb_crosshair.AttachedBox.Point1.X;
+		y1 = pcb_crosshair.AttachedBox.Point1.Y;
+		x2 = pcb_crosshair.AttachedBox.Point2.X;
+		y2 = pcb_crosshair.AttachedBox.Point2.Y;
+		pcb_gui->draw_rect(pcb_crosshair.GC, x1, y1, x2, y2);
+	}
+
+	if (!inhibit_drawing_mode)
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, NULL);
+}
+
+
+/* --------------------------------------------------------------------------
+ * draw the marker position
+ */
+void pcb_draw_mark(pcb_bool inhibit_drawing_mode)
+{
+	pcb_coord_t ms = conf_core.appearance.mark_size;
+
+	/* Mark is not drawn when it is not set */
+	if (!pcb_marked.status)
+		return;
+
+	if (!inhibit_drawing_mode) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, NULL);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, NULL);
+	}
+
+	pcb_gui->draw_line(pcb_crosshair.GC, pcb_marked.X - ms, pcb_marked.Y - ms, pcb_marked.X + ms, pcb_marked.Y + ms);
+	pcb_gui->draw_line(pcb_crosshair.GC, pcb_marked.X + ms, pcb_marked.Y - ms, pcb_marked.X - ms, pcb_marked.Y + ms);
+
+	if (!inhibit_drawing_mode)
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, NULL);
+}
+
+/* ---------------------------------------------------------------------------
+ * notify the GUI that data relating to the crosshair is being changed.
+ *
+ * The argument passed is pcb_false to notify "changes are about to happen",
+ * and pcb_true to notify "changes have finished".
+ *
+ * Each call with a 'pcb_false' parameter must be matched with a following one
+ * with a 'pcb_true' parameter. Unmatched 'pcb_true' calls are currently not permitted,
+ * but might be allowed in the future.
+ *
+ * GUIs should not complain if they receive extra calls with 'pcb_true' as parameter.
+ * They should initiate a redraw of the crosshair attached objects - which may
+ * (if necessary) mean repainting the whole screen if the GUI hasn't tracked the
+ * location of existing attached drawing.
+ */
+void pcb_notify_crosshair_change(pcb_bool changes_complete)
+{
+	if (pcb_gui->notify_crosshair_change)
+		pcb_gui->notify_crosshair_change(changes_complete);
+}
+
+
+/* ---------------------------------------------------------------------------
+ * notify the GUI that data relating to the mark is being changed.
+ *
+ * The argument passed is pcb_false to notify "changes are about to happen",
+ * and pcb_true to notify "changes have finished".
+ *
+ * Each call with a 'pcb_false' parameter must be matched with a following one
+ * with a 'pcb_true' parameter. Unmatched 'pcb_true' calls are currently not permitted,
+ * but might be allowed in the future.
+ *
+ * GUIs should not complain if they receive extra calls with 'pcb_true' as parameter.
+ * They should initiate a redraw of the mark - which may (if necessary) mean
+ * repainting the whole screen if the GUI hasn't tracked the mark's location.
+ */
+void pcb_notify_mark_change(pcb_bool changes_complete)
+{
+	if (pcb_gui->notify_mark_change)
+		pcb_gui->notify_mark_change(changes_complete);
+}
+
+
+/*
+ * Below is the implementation of the "highlight on endpoint" functionality.
+ * This highlights lines and arcs when the crosshair is on of their (two)
+ * endpoints.
+ */
+struct onpoint_search_info {
+	pcb_crosshair_t *crosshair;
+	pcb_coord_t X;
+	pcb_coord_t Y;
+};
+
+static pcb_r_dir_t onpoint_line_callback(const pcb_box_t * box, void *cl)
+{
+	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
+	pcb_crosshair_t *crosshair = info->crosshair;
+	pcb_line_t *line = (pcb_line_t *) box;
+
+#ifdef DEBUG_ONPOINT
+	printf("X=%ld Y=%ld    X1=%ld Y1=%ld X2=%ld Y2=%ld\n", info->X, info->Y,
+				 line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+#endif
+	if ((line->Point1.X == info->X && line->Point1.Y == info->Y) || (line->Point2.X == info->X && line->Point2.Y == info->Y)) {
+		pcb_onpoint_t op;
+		op.type = PCB_OBJ_LINE;
+		op.obj.line = line;
+		vtop_append(&crosshair->onpoint_objs, op);
+		PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) line);
+		pcb_line_invalidate_draw(NULL, line);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	else {
+		return PCB_R_DIR_NOT_FOUND;
+	}
+}
+
+#define close_enough(v1, v2) (coord_abs((v1)-(v2)) < 10)
+
+static pcb_r_dir_t onpoint_arc_callback(const pcb_box_t * box, void *cl)
+{
+	struct onpoint_search_info *info = (struct onpoint_search_info *) cl;
+	pcb_crosshair_t *crosshair = info->crosshair;
+	pcb_arc_t *arc = (pcb_arc_t *) box;
+	pcb_coord_t p1x, p1y, p2x, p2y;
+
+	p1x = arc->X - arc->Width * cos(PCB_TO_RADIANS(arc->StartAngle));
+	p1y = arc->Y + arc->Height * sin(PCB_TO_RADIANS(arc->StartAngle));
+	p2x = arc->X - arc->Width * cos(PCB_TO_RADIANS(arc->StartAngle + arc->Delta));
+	p2y = arc->Y + arc->Height * sin(PCB_TO_RADIANS(arc->StartAngle + arc->Delta));
+
+	/* printf("p1=%ld;%ld p2=%ld;%ld info=%ld;%ld\n", p1x, p1y, p2x, p2y, info->X, info->Y); */
+
+	if ((close_enough(p1x, info->X) && close_enough(p1y, info->Y)) || (close_enough(p2x, info->X) && close_enough(p2y, info->Y))) {
+		pcb_onpoint_t op;
+		op.type = PCB_OBJ_ARC;
+		op.obj.arc = arc;
+		vtop_append(&crosshair->onpoint_objs, op);
+		PCB_FLAG_SET(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) arc);
+		pcb_arc_invalidate_draw(NULL, arc);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	else {
+		return PCB_R_DIR_NOT_FOUND;
+	}
+}
+
+void DrawLineOrArc(int type, void *obj)
+{
+	switch (type) {
+	case PCB_OBJ_LINE_POINT:
+		/* Attention: We can use a NULL pointer here for the layer,
+		 * because it is not used in the pcb_line_invalidate_draw() function anyways.
+		 * ATM pcb_line_invalidate_draw() only calls AddPart() internally, which invalidates
+		 * the area specified by the line's bounding box.
+		 */
+		pcb_line_invalidate_draw(NULL, (pcb_line_t *) obj);
+		break;
+	case PCB_OBJ_ARC_POINT:
+		/* See comment above */
+		pcb_arc_invalidate_draw(NULL, (pcb_arc_t *) obj);
+		break;
+	}
+}
+
+
+#define op_swap(crosshair) \
+do { \
+	vtop_t __tmp__ = crosshair->onpoint_objs; \
+	crosshair->onpoint_objs = crosshair->old_onpoint_objs; \
+	crosshair->old_onpoint_objs = __tmp__; \
+} while(0)
+
+static void *onpoint_find(vtop_t *vect, void *obj_ptr)
+{
+	int i;
+
+	for (i = 0; i < vect->used; i++) {
+		pcb_onpoint_t *op = &(vect->array[i]);
+		if (op->obj.any == obj_ptr)
+			return op;
+	}
+	return NULL;
+}
+
+/*
+ * Searches for lines or arcs which have points that are exactly
+ * at the given coordinates and adds them to the crosshair's
+ * object list along with their respective type.
+ */
+static void onpoint_work(pcb_crosshair_t * crosshair, pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_box_t SearchBox = pcb_point_box(X, Y);
+	struct onpoint_search_info info;
+	int i;
+	pcb_bool redraw = pcb_false;
+
+	op_swap(crosshair);
+
+	/* Do not truncate to 0 because that may free the array */
+	vtop_truncate(&crosshair->onpoint_objs, 1);
+	crosshair->onpoint_objs.used = 0;
+
+
+	info.crosshair = crosshair;
+	info.X = X;
+	info.Y = Y;
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		pcb_layer_t *layer = &PCB->Data->Layer[i];
+		/* Only find points of arcs and lines on currently visible layers. */
+		if (!layer->meta.real.vis)
+			continue;
+		pcb_r_search(layer->line_tree, &SearchBox, NULL, onpoint_line_callback, &info, NULL);
+		pcb_r_search(layer->arc_tree, &SearchBox, NULL, onpoint_arc_callback, &info, NULL);
+	}
+
+	/* Undraw the old objects */
+	for (i = 0; i < crosshair->old_onpoint_objs.used; i++) {
+		pcb_onpoint_t *op = &crosshair->old_onpoint_objs.array[i];
+
+		/* only remove and redraw those which aren't in the new list */
+		if (onpoint_find(&crosshair->onpoint_objs, op->obj.any) != NULL)
+			continue;
+
+		PCB_FLAG_CLEAR(PCB_FLAG_ONPOINT, (pcb_any_obj_t *) op->obj.any);
+		DrawLineOrArc(op->type, op->obj.any);
+		redraw = pcb_true;
+	}
+
+	/* draw the new objects */
+	for (i = 0; i < crosshair->onpoint_objs.used; i++) {
+		pcb_onpoint_t *op = &crosshair->onpoint_objs.array[i];
+
+		/* only draw those which aren't in the old list */
+		if (onpoint_find(&crosshair->old_onpoint_objs, op->obj.any) != NULL)
+			continue;
+		DrawLineOrArc(op->type, op->obj.any);
+		redraw = pcb_true;
+	}
+
+	if (redraw) {
+		pcb_redraw();
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * Returns the square of the given number
+ */
+static double square(double x)
+{
+	return x * x;
+}
+
+static double crosshair_sq_dist(pcb_crosshair_t * crosshair, pcb_coord_t x, pcb_coord_t y)
+{
+	return square(x - crosshair->X) + square(y - crosshair->Y);
+}
+
+struct snap_data {
+	pcb_crosshair_t *crosshair;
+	double nearest_sq_dist;
+	pcb_bool nearest_is_grid;
+	pcb_coord_t x, y;
+};
+
+/* Snap to a given location if it is the closest thing we found so far.
+ * If "prefer_to_grid" is set, the passed location will take preference
+ * over a closer grid points we already snapped to UNLESS the user is
+ * pressing the SHIFT key. If the SHIFT key is pressed, the closest object
+ * (including grid points), is always preferred.
+ */
+static void check_snap_object(struct snap_data *snap_data, pcb_coord_t x, pcb_coord_t y, pcb_bool prefer_to_grid, pcb_any_obj_t *snapo)
+{
+	double sq_dist;
+
+	/* avoid snapping to an object if it is in the same subc */
+	if ((snapo != NULL) && (conf_core.editor.mode == PCB_MODE_MOVE) && (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC)) {
+		pcb_any_obj_t *parent = (pcb_any_obj_t *)pcb_obj_parent_subc(snapo);
+		int n;
+		pcb_cardinal_t parent_id = snapo->ID;
+		if (parent != NULL)
+			parent_id = parent->ID;
+		for(n = 0; n < pcb_crosshair.drags_len; n++) {
+			if ((snapo->ID == pcb_crosshair.drags[n]) || (parent_id == pcb_crosshair.drags[n]))
+				return;
+		}
+	}
+
+	sq_dist = crosshair_sq_dist(snap_data->crosshair, x, y);
+	if (sq_dist < snap_data->nearest_sq_dist || (prefer_to_grid && snap_data->nearest_is_grid && !pcb_gui->shift_is_pressed())) {
+		snap_data->x = x;
+		snap_data->y = y;
+		snap_data->nearest_sq_dist = sq_dist;
+		snap_data->nearest_is_grid = pcb_false;
+	}
+}
+
+static void check_snap_offgrid_line(struct snap_data *snap_data, pcb_coord_t nearest_grid_x, pcb_coord_t nearest_grid_y)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int ans;
+	pcb_line_t *line;
+	pcb_coord_t try_x, try_y;
+	double dx, dy;
+	double dist;
+
+	if (!conf_core.editor.snap_pin)
+		return;
+
+	/* Code to snap at some sensible point along a line */
+	/* Pick the nearest grid-point in the x or y direction
+	 * to align with, then adjust until we hit the line
+	 */
+	ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE, &ptr1, &ptr2, &ptr3);
+
+	if (ans == PCB_OBJ_VOID)
+		return;
+
+	line = (pcb_line_t *) ptr2;
+
+	if (!pcb_tool_should_snap_offgrid_line(ptr1, line))
+		return;
+
+	dx = line->Point2.X - line->Point1.X;
+	dy = line->Point2.Y - line->Point1.Y;
+
+	/* Try snapping along the X axis */
+	if (dy != 0.) {
+		/* Move in the X direction until we hit the line */
+		try_x = (nearest_grid_y - line->Point1.Y) / dy * dx + line->Point1.X;
+		try_y = nearest_grid_y;
+		check_snap_object(snap_data, try_x, try_y, pcb_true, (pcb_any_obj_t *)line);
+	}
+
+	/* Try snapping along the Y axis */
+	if (dx != 0.) {
+		try_x = nearest_grid_x;
+		try_y = (nearest_grid_x - line->Point1.X) / dx * dy + line->Point1.Y;
+		check_snap_object(snap_data, try_x, try_y, pcb_true, (pcb_any_obj_t *)line);
+	}
+
+	if (dx != dy) {								/* If line not parallel with dX = dY direction.. */
+		/* Try snapping diagonally towards the line in the dX = dY direction */
+
+		if (dy == 0)
+			dist = line->Point1.Y - nearest_grid_y;
+		else
+			dist = ((line->Point1.X - nearest_grid_x) - (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 - dx / dy);
+
+		try_x = nearest_grid_x + dist;
+		try_y = nearest_grid_y + dist;
+
+		check_snap_object(snap_data, try_x, try_y, pcb_true, (pcb_any_obj_t *)line);
+	}
+
+	if (dx != -dy) {							/* If line not parallel with dX = -dY direction.. */
+		/* Try snapping diagonally towards the line in the dX = -dY direction */
+
+		if (dy == 0)
+			dist = nearest_grid_y - line->Point1.Y;
+		else
+			dist = ((line->Point1.X - nearest_grid_x) - (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 + dx / dy);
+
+		try_x = nearest_grid_x + dist;
+		try_y = nearest_grid_y - dist;
+
+		check_snap_object(snap_data, try_x, try_y, pcb_true, (pcb_any_obj_t *)line);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * recalculates the passed coordinates to fit the current grid setting
+ */
+void pcb_crosshair_grid_fit(pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_coord_t nearest_grid_x, nearest_grid_y;
+	void *ptr1, *ptr2, *ptr3;
+	struct snap_data snap_data;
+	int ans;
+
+	pcb_crosshair.X = PCB_CLAMP(X, pcb_crosshair.MinX, pcb_crosshair.MaxX);
+	pcb_crosshair.Y = PCB_CLAMP(Y, pcb_crosshair.MinY, pcb_crosshair.MaxY);
+
+	if (PCB->RatDraw) {
+		nearest_grid_x = -PCB_MIL_TO_COORD(6);
+		nearest_grid_y = -PCB_MIL_TO_COORD(6);
+	}
+	else {
+		nearest_grid_x = pcb_grid_fit(pcb_crosshair.X, PCB->Grid, PCB->GridOffsetX);
+		nearest_grid_y = pcb_grid_fit(pcb_crosshair.Y, PCB->Grid, PCB->GridOffsetY);
+
+		if (pcb_marked.status && conf_core.editor.orthogonal_moves) {
+			pcb_coord_t dx = pcb_crosshair.X - pcb_marked.X;
+			pcb_coord_t dy = pcb_crosshair.Y - pcb_marked.Y;
+			if (PCB_ABS(dx) > PCB_ABS(dy))
+				nearest_grid_y = pcb_marked.Y;
+			else
+				nearest_grid_x = pcb_marked.X;
+		}
+
+	}
+
+	snap_data.crosshair = &pcb_crosshair;
+	snap_data.nearest_sq_dist = crosshair_sq_dist(&pcb_crosshair, nearest_grid_x, nearest_grid_y);
+	snap_data.nearest_is_grid = pcb_true;
+	snap_data.x = nearest_grid_x;
+	snap_data.y = nearest_grid_y;
+
+	ans = PCB_OBJ_VOID;
+	if (!PCB->RatDraw)
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3);
+
+	if (ans & PCB_OBJ_SUBC) {
+		pcb_subc_t *sc = (pcb_subc_t *) ptr1;
+		pcb_coord_t ox, oy;
+		if (pcb_subc_get_origin(sc, &ox, &oy) == 0)
+			check_snap_object(&snap_data, ox, oy, pcb_false, (pcb_any_obj_t *)sc);
+	}
+
+	/*** padstack center ***/
+	ans = PCB_OBJ_VOID;
+	if (conf_core.editor.snap_pin)
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3);
+
+	/* Avoid snapping padstack to any other padstack */
+	if (conf_core.editor.mode == PCB_MODE_MOVE && pcb_crosshair.AttachedObject.Type == PCB_OBJ_PSTK && (ans & PCB_OBJ_PSTK))
+		ans = PCB_OBJ_VOID;
+
+	if (ans != PCB_OBJ_VOID) {
+		pcb_pstk_t *ps = (pcb_pstk_t *) ptr2;
+		check_snap_object(&snap_data, ps->x, ps->y, pcb_true, (pcb_any_obj_t *)ps);
+		pcb_crosshair.snapped_pstk = ps;
+	}
+
+	/*** arc ***/
+	ans = PCB_OBJ_VOID;
+	if (conf_core.editor.snap_pin)
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE_POINT | PCB_OBJ_ARC_POINT | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3);
+
+	if (ans == PCB_OBJ_ARC_POINT) {
+		/* Arc point needs special handling as it's not a real point but has to be calculated */
+		pcb_coord_t ex, ey;
+		pcb_arc_get_end((pcb_arc_t *)ptr2, (ptr3 != pcb_arc_start_ptr), &ex, &ey);
+		check_snap_object(&snap_data, ex, ey, pcb_true, (pcb_any_obj_t *)ptr2);
+	}
+	else if (ans != PCB_OBJ_VOID) {
+		pcb_point_t *pnt = (pcb_point_t *) ptr3;
+		check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true, (pcb_any_obj_t *)ptr2);
+	}
+
+	/*** polygon terminal: center ***/
+	ans = PCB_OBJ_VOID;
+	if (conf_core.editor.snap_pin)
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_POLY | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3);
+
+	if (ans == PCB_OBJ_POLY) {
+		pcb_poly_t *p = ptr2;
+		if (p->term != NULL) {
+			pcb_coord_t cx, cy;
+			cx = (p->BoundingBox.X1 + p->BoundingBox.X2)/2;
+			cy = (p->BoundingBox.Y1 + p->BoundingBox.Y2)/2;
+			if (pcb_poly_is_point_in_p(cx, cy, 1, p))
+				check_snap_object(&snap_data, cx, cy, pcb_true, (pcb_any_obj_t *)p);
+		}
+	}
+
+	/*
+	 * Snap to offgrid points on lines.
+	 */
+	if (conf_core.editor.snap_offgrid_line)
+		check_snap_offgrid_line(&snap_data, nearest_grid_x, nearest_grid_y);
+
+	ans = PCB_OBJ_VOID;
+	if (conf_core.editor.snap_pin)
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_POLY_POINT, &ptr1, &ptr2, &ptr3);
+
+	if (ans != PCB_OBJ_VOID) {
+		pcb_point_t *pnt = (pcb_point_t *) ptr3;
+		check_snap_object(&snap_data, pnt->X, pnt->Y, pcb_true, NULL);
+	}
+
+	if (snap_data.x >= 0 && snap_data.y >= 0) {
+		pcb_crosshair.X = snap_data.x;
+		pcb_crosshair.Y = snap_data.y;
+	}
+
+	if (conf_core.editor.highlight_on_point)
+		onpoint_work(&pcb_crosshair, pcb_crosshair.X, pcb_crosshair.Y);
+
+	if (conf_core.editor.mode == PCB_MODE_ARROW) {
+		ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE_POINT, &ptr1, &ptr2, &ptr3);
+		if (ans == PCB_OBJ_VOID) {
+			if ((pcb_gui != NULL) && (pcb_gui->point_cursor != NULL))
+				pcb_gui->point_cursor(pcb_false);
+		}
+		else if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_line_t *) ptr2)) {
+			if ((pcb_gui != NULL) && (pcb_gui->point_cursor != NULL))
+				pcb_gui->point_cursor(pcb_true);
+		}
+	}
+
+	if (conf_core.editor.mode == PCB_MODE_LINE && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && conf_core.editor.auto_drc)
+		pcb_line_enforce_drc();
+
+	pcb_gui->set_crosshair(pcb_crosshair.X, pcb_crosshair.Y, HID_SC_DO_NOTHING);
+}
+
+/* ---------------------------------------------------------------------------
+ * move crosshair relative (has to be switched off)
+ */
+void pcb_crosshair_move_relative(pcb_coord_t DeltaX, pcb_coord_t DeltaY)
+{
+	pcb_crosshair_grid_fit(pcb_crosshair.X + DeltaX, pcb_crosshair.Y + DeltaY);
+}
+
+/* ---------------------------------------------------------------------------
+ * move crosshair absolute
+ * return pcb_true if the crosshair was moved from its existing position
+ */
+pcb_bool pcb_crosshair_move_absolute(pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_coord_t x, y, z;
+	pcb_crosshair.ptr_x = X;
+	pcb_crosshair.ptr_y = Y;
+	x = pcb_crosshair.X;
+	y = pcb_crosshair.Y;
+	pcb_crosshair_grid_fit(X, Y);
+	if (pcb_crosshair.X != x || pcb_crosshair.Y != y) {
+		/* back up to old position to notify the GUI
+		 * (which might want to erase the old crosshair) */
+		z = pcb_crosshair.X;
+		pcb_crosshair.X = x;
+		x = z;
+		z = pcb_crosshair.Y;
+		pcb_crosshair.Y = y;
+		pcb_notify_crosshair_change(pcb_false);	/* Our caller notifies when it has done */
+		/* now move forward again */
+		pcb_crosshair.X = x;
+		pcb_crosshair.Y = z;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * sets the valid range for the crosshair cursor
+ */
+void pcb_crosshair_set_range(pcb_coord_t MinX, pcb_coord_t MinY, pcb_coord_t MaxX, pcb_coord_t MaxY)
+{
+	pcb_crosshair.MinX = MAX(0, MinX);
+	pcb_crosshair.MinY = MAX(0, MinY);
+	pcb_crosshair.MaxX = MIN(PCB->MaxWidth, MaxX);
+	pcb_crosshair.MaxY = MIN(PCB->MaxHeight, MaxY);
+
+	/* force update of position */
+	pcb_crosshair_move_relative(0, 0);
+}
+
+/* ---------------------------------------------------------------------------
+ * centers the displayed PCB around the specified point (X,Y)
+ */
+void pcb_center_display(pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_coord_t save_grid = PCB->Grid;
+	PCB->Grid = 1;
+	if (pcb_crosshair_move_absolute(X, Y))
+		pcb_notify_crosshair_change(pcb_true);
+	pcb_gui->set_crosshair(pcb_crosshair.X, pcb_crosshair.Y, HID_SC_WARP_POINTER);
+	PCB->Grid = save_grid;
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes crosshair stuff
+ * clears the struct, allocates to graphical contexts
+ */
+void pcb_crosshair_init(void)
+{
+	pcb_crosshair.GC = pcb_hid_make_gc();
+
+	pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+	pcb_hid_set_draw_xor(pcb_crosshair.GC, 1);
+	pcb_hid_set_line_cap(pcb_crosshair.GC, pcb_cap_round);
+	pcb_hid_set_line_width(pcb_crosshair.GC, 1);
+
+	/* set initial shape */
+	pcb_crosshair.shape = pcb_ch_shape_basic;
+
+	/* set default limits */
+	pcb_crosshair.MinX = pcb_crosshair.MinY = 0;
+	pcb_crosshair.MaxX = PCB->MaxWidth;
+	pcb_crosshair.MaxY = PCB->MaxHeight;
+
+	/* Initialize the onpoint data. */
+	memset(&pcb_crosshair.onpoint_objs, 0, sizeof(vtop_t));
+	memset(&pcb_crosshair.old_onpoint_objs, 0, sizeof(vtop_t));
+
+	/* clear the mark */
+	pcb_marked.status = pcb_false;
+
+	/* Initialise Line Route */
+	pcb_route_init(&pcb_crosshair.Route);
+
+}
+
+/* ---------------------------------------------------------------------------
+ * exits crosshair routines, release GCs
+ */
+void pcb_crosshair_uninit(void)
+{
+	pcb_poly_free_fields(&pcb_crosshair.AttachedPolygon);
+	pcb_route_destroy(&pcb_crosshair.Route);
+	pcb_hid_destroy_gc(pcb_crosshair.GC);
+}
+
+/* sets the crosshair range to the current buffer extents */
+void pcb_crosshair_range_to_buffer(void)
+{
+	if (conf_core.editor.mode == PCB_MODE_PASTE_BUFFER) {
+		if (pcb_set_buffer_bbox(PCB_PASTEBUFFER) == 0) {
+			pcb_crosshair_set_range(PCB_PASTEBUFFER->X - PCB_PASTEBUFFER->bbox_naked.X1,
+											PCB_PASTEBUFFER->Y - PCB_PASTEBUFFER->bbox_naked.Y1,
+											PCB->MaxWidth -
+											(PCB_PASTEBUFFER->bbox_naked.X2 - PCB_PASTEBUFFER->X),
+											PCB->MaxHeight - (PCB_PASTEBUFFER->bbox_naked.Y2 - PCB_PASTEBUFFER->Y));
+		}
+		else /* failed to calculate the bounding box of the buffer, it's probably a single-object move, allow the whole page */
+			pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight);
+	}
+}
+
+void pcb_crosshair_set_local_ref(pcb_coord_t X, pcb_coord_t Y, pcb_bool Showing)
+{
+	static pcb_mark_t old;
+	static int count = 0;
+
+	if (Showing) {
+		pcb_notify_mark_change(pcb_false);
+		if (count == 0)
+			old = pcb_marked;
+		pcb_marked.X = X;
+		pcb_marked.Y = Y;
+		pcb_marked.status = pcb_true;
+		count++;
+		pcb_notify_mark_change(pcb_true);
+	}
+	else if (count > 0) {
+		pcb_notify_mark_change(pcb_false);
+		count = 0;
+		pcb_marked = old;
+		pcb_notify_mark_change(pcb_true);
+	}
+}
+
+void pcb_event_move_crosshair(pcb_coord_t ev_x, pcb_coord_t ev_y)
+{
+	if (pcb_mid_stroke)
+		pcb_stub_stroke_record(ev_x, ev_y);
+	if (pcb_crosshair_move_absolute(ev_x, ev_y)) {
+		/* update object position and cursor location */
+		pcb_tool_adjust_attached_objects();
+		pcb_event(PCB_EVENT_DRAW_CROSSHAIR_CHATT, NULL);
+		pcb_notify_crosshair_change(pcb_true);
+	}
+}
Index: tags/2.0.1/src/crosshair.h
===================================================================
--- tags/2.0.1/src/crosshair.h	(nonexistent)
+++ tags/2.0.1/src/crosshair.h	(revision 18980)
@@ -0,0 +1,136 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_CROSSHAIR_H
+#define	PCB_CROSSHAIR_H
+
+#include "config.h"
+#include "vtonpoint.h"
+#include "hid.h"
+#include "obj_line.h"
+#include "obj_poly.h"
+#include "route.h"
+
+typedef struct {              /* currently marked block */
+	pcb_point_t Point1, Point2; /* start- and end-position */
+	long int State;
+	pcb_bool otherway;
+} pcb_attached_box_t;
+
+typedef struct {              /* currently attached object */
+	pcb_coord_t X, Y;           /* saved position when PCB_MODE_MOVE */
+	pcb_coord_t tx, ty;         /* target position when PCB_MODE_MOVE */
+	pcb_box_t BoundingBox;
+	long int Type;              /* object type */
+	long int State;
+	void *Ptr1, *Ptr2, *Ptr3;   /* three pointers to data, see search.c */
+	pcb_angle_t start_angle, delta_angle;
+	pcb_coord_t radius;
+} pcb_attached_object_t;
+
+typedef struct {
+	pcb_bool status;
+	pcb_coord_t X, Y;
+} pcb_mark_t;
+
+enum pcb_crosshair_shape_e {
+	pcb_ch_shape_basic = 0,     /*  4-ray */
+	pcb_ch_shape_union_jack,    /*  8-ray */
+	pcb_ch_shape_dozen,         /* 12-ray */
+	pcb_ch_shape_NUM
+};
+
+typedef struct {                         /* holds crosshair, cursor and crosshair-attachment information */
+	pcb_hid_gc_t GC;                       /* GC for cursor drawing */
+	pcb_hid_gc_t AttachGC;                 /* and for displaying buffer contents */
+	pcb_coord_t ptr_x, ptr_y;              /* last seen raw mouse pointer x;y coords */
+	pcb_coord_t X, Y;                      /* (snapped) crosshair position */
+	pcb_coord_t MinX, MinY, MaxX, MaxY;    /* lowest and highest coordinates */
+	pcb_attached_line_t AttachedLine;      /* data of new lines... */
+	pcb_attached_box_t AttachedBox;
+	pcb_poly_t AttachedPolygon;
+	int AttachedPolygon_pts;               /* number of valid points ever seen for this poly */
+	pcb_attached_object_t AttachedObject;  /* data of attached objects */
+	pcb_route_t Route;                     /* Calculated line route in LINE or MOVE(LINE) mode */ 
+	enum pcb_crosshair_shape_e shape;      /* shape of crosshair */
+	vtop_t onpoint_objs;
+	vtop_t old_onpoint_objs;
+	pcb_pstk_t *snapped_pstk;
+
+	/* list of object IDs that could have been dragged so that they can be cycled */
+	long int *drags;
+	int drags_len, drags_current;
+	pcb_coord_t dragx, dragy;              /* the point where drag started */
+
+	unsigned click_cmd_entry_active:1;     /* true if the command entry was active during a mosue click while actions are executed */
+} pcb_crosshair_t;
+
+
+/* ---------------------------------------------------------------------------
+ * all possible states of an attached object
+ */
+#define PCB_CH_STATE_FIRST  0  /* initial state */
+#define PCB_CH_STATE_SECOND 1
+#define PCB_CH_STATE_THIRD  2
+
+extern pcb_crosshair_t pcb_crosshair;
+extern pcb_mark_t pcb_marked;
+
+void pcb_notify_crosshair_change(pcb_bool changes_complete);
+void pcb_notify_mark_change(pcb_bool changes_complete);
+void pcb_draw_attached(pcb_bool inhibit_drawing_mode);
+void pcb_draw_mark(pcb_bool inhibit_drawing_mode);
+void pcb_crosshair_move_relative(pcb_coord_t, pcb_coord_t);
+pcb_bool pcb_crosshair_move_absolute(pcb_coord_t, pcb_coord_t);
+void pcb_crosshair_set_range(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t);
+void pcb_crosshair_init(void);
+void pcb_crosshair_uninit(void);
+void pcb_crosshair_grid_fit(pcb_coord_t, pcb_coord_t);
+void pcb_center_display(pcb_coord_t X, pcb_coord_t Y);
+
+/* sets the crosshair range to the current buffer extents */
+void pcb_crosshair_range_to_buffer(void);
+void pcb_crosshair_set_local_ref(pcb_coord_t X, pcb_coord_t Y, pcb_bool Showing);
+
+
+/* Event handler to set the cursor according to the X pointer position
+   called from inside main.c */
+void pcb_event_move_crosshair(pcb_coord_t ev_x, pcb_coord_t ev_y);
+
+/*** utility for plugins ***/
+void pcb_xordraw_attached_line(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t);
+void pcb_xordraw_poly(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last);
+void pcb_xordraw_poly_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr);
+void pcb_xordraw_attached_arc(pcb_coord_t thick);
+void pcb_xordraw_buffer(pcb_buffer_t *Buffer);
+void pcb_xordraw_movecopy(void);
+void pcb_xordraw_insert_pt_obj(void);
+
+
+
+#endif
Index: tags/2.0.1/src/data.c
===================================================================
--- tags/2.0.1/src/data.c	(nonexistent)
+++ tags/2.0.1/src/data.c	(revision 18980)
@@ -0,0 +1,781 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* just defines common identifiers
+ */
+#include "config.h"
+
+#include <time.h>
+
+#include "board.h"
+#include "data.h"
+#include "data_list.h"
+#include "data_it.h"
+#include "rtree.h"
+#include "list_common.h"
+#include "layer_it.h"
+#include "operation.h"
+#include "flag.h"
+#include "obj_arc.h"
+#include "obj_line.h"
+#include "obj_poly.h"
+#include "obj_text.h"
+#include "obj_pstk.h"
+#include "obj_subc.h"
+
+int pcb_layer_stack[PCB_MAX_LAYER];			/* determines the layer draw order */
+
+pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER]; /* my buffers */
+pcb_bool pcb_bumped;                /* if the undo serial number has changed */
+
+int pcb_added_lines;
+
+static void pcb_loop_layer(pcb_board_t *pcb, pcb_layer_t *layer, void *ctx, pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb)
+{
+	if (lacb != NULL)
+		if (lacb(ctx, pcb, layer, 1))
+			return;
+
+	if (lcb != NULL) {
+		PCB_LINE_LOOP(layer);
+		{
+			lcb(ctx, pcb, layer, line);
+		}
+		PCB_END_LOOP;
+	}
+
+	if (acb != NULL) {
+		PCB_ARC_LOOP(layer);
+		{
+			acb(ctx, pcb, layer, arc);
+		}
+		PCB_END_LOOP;
+	}
+
+	if (tcb != NULL) {
+		PCB_TEXT_LOOP(layer);
+		{
+			tcb(ctx, pcb, layer, text);
+		}
+		PCB_END_LOOP;
+	}
+
+	if (pocb != NULL) {
+		PCB_POLY_LOOP(layer);
+		{
+			pocb(ctx, pcb, layer, polygon);
+		}
+		PCB_END_LOOP;
+	}
+	if (lacb != NULL)
+		lacb(ctx, pcb, layer, 0);
+}
+
+/* callback based loops */
+void pcb_loop_layers(pcb_board_t *pcb, void *ctx, pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb)
+{
+	if ((lacb != NULL) || (lcb != NULL) || (acb != NULL) || (tcb != NULL) || (pocb != NULL)) {
+		if (pcb->is_footprint) {
+			int n;
+			pcb_data_t *data = PCB_REAL_DATA(pcb);
+			for(n = 0; n < data->LayerN; n++)
+				pcb_loop_layer(pcb, &data->Layer[n], ctx, lacb, lcb, acb, tcb, pocb);
+		}
+		else {
+			pcb_layer_it_t it;
+			pcb_layer_id_t lid;
+			for(lid = pcb_layer_first_all(&pcb->LayerGroups, &it); lid != -1; lid = pcb_layer_next(&it)) {
+				pcb_layer_t *layer = pcb->Data->Layer + lid;
+				pcb_loop_layer(pcb, layer, ctx, lacb, lcb, acb, tcb, pocb);
+			}
+		}
+	}
+}
+
+void pcb_loop_subc(pcb_board_t *pcb, void *ctx, pcb_subc_cb_t scb)
+{
+	if (scb != NULL) {
+		PCB_SUBC_LOOP(PCB_REAL_DATA(pcb));
+		{
+			scb(ctx, pcb, subc, 1);
+		}
+		PCB_END_LOOP;
+	}
+}
+
+void pcb_loop_pstk(pcb_board_t *pcb, void *ctx, pcb_pstk_cb_t pscb)
+{
+	if (pscb != NULL) {
+		PCB_PADSTACK_LOOP(PCB_REAL_DATA(pcb));
+		{
+			pscb(ctx, pcb, padstack);
+		}
+		PCB_END_LOOP;
+	}
+}
+
+void pcb_loop_all(pcb_board_t *pcb, void *ctx,
+	pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb,
+	pcb_subc_cb_t scb,
+	pcb_pstk_cb_t pscb
+	)
+{
+	pcb_loop_layers(pcb, ctx, lacb, lcb, acb, tcb, pocb);
+	pcb_loop_subc(pcb, ctx, scb);
+	pcb_loop_pstk(pcb, ctx, pscb);
+}
+
+void pcb_data_free(pcb_data_t * data)
+{
+	pcb_layer_t *layer;
+	int i, subc;
+
+	if (data == NULL)
+		return;
+
+	subc = (data->parent_type == PCB_PARENT_SUBC);
+
+	PCB_SUBC_LOOP(data);
+	{
+		pcb_subc_free(subc);
+	}
+	PCB_END_LOOP;
+
+	list_map0(&data->Rat, pcb_rat_t, pcb_rat_free);
+
+	for (layer = data->Layer, i = 0; i < data->LayerN; layer++, i++)
+		pcb_layer_free(layer);
+
+	if (!subc) {
+		if (data->subc_tree)
+			pcb_r_destroy_tree(&data->subc_tree);
+		if (data->padstack_tree)
+			pcb_r_destroy_tree(&data->padstack_tree);
+		if (data->rat_tree)
+			pcb_r_destroy_tree(&data->rat_tree);
+	}
+
+	for (layer = data->Layer, i = 0; i < PCB_MAX_LAYER; layer++, i++)
+		free((char *)layer->name);
+
+	/* clear struct */
+	memset(data, 0, sizeof(pcb_data_t));
+}
+
+pcb_bool pcb_data_is_empty(pcb_data_t *Data)
+{
+	pcb_cardinal_t i;
+
+	if (padstacklist_length(&Data->padstack) != 0) return pcb_false;
+	if (pcb_subclist_length(&Data->subc) != 0) return pcb_false;
+	for (i = 0; i < Data->LayerN; i++)
+		if (!pcb_layer_is_pure_empty(&(Data->Layer[i])))
+			return pcb_false;
+
+	return pcb_true;
+}
+
+pcb_box_t *pcb_data_bbox(pcb_box_t *out, pcb_data_t *Data, pcb_bool ignore_floaters)
+{
+	/* preset identifiers with highest and lowest possible values */
+	out->X1 = out->Y1 = PCB_MAX_COORD;
+	out->X2 = out->Y2 = -PCB_MAX_COORD;
+
+	/* now scan for the lowest/highest X and Y coordinate */
+	PCB_PADSTACK_LOOP(Data);
+	{
+		pcb_pstk_bbox(padstack);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, padstack))
+			pcb_box_bump_box(out, &padstack->BoundingBox);
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(Data);
+	{
+		pcb_subc_bbox(subc);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, subc))
+			pcb_box_bump_box(out, &subc->BoundingBox);
+	}
+	PCB_END_LOOP;
+	PCB_LINE_ALL_LOOP(Data);
+	{
+		pcb_line_bbox(line);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, line))
+			pcb_box_bump_box(out, &line->BoundingBox);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(Data);
+	{
+		pcb_arc_bbox(arc);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, arc))
+			pcb_box_bump_box(out, &arc->BoundingBox);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(Data);
+	{
+		pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, text))
+			pcb_box_bump_box(out, &text->BoundingBox);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(Data);
+	{
+		pcb_poly_bbox(polygon);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, polygon))
+			pcb_box_bump_box(out, &polygon->BoundingBox);
+	}
+	PCB_ENDALL_LOOP;
+	return (pcb_data_is_empty(Data) ? NULL : out);
+}
+
+pcb_box_t *pcb_data_bbox_naked(pcb_box_t *out, pcb_data_t *Data, pcb_bool ignore_floaters)
+{
+	/* preset identifiers with highest and lowest possible values */
+	out->X1 = out->Y1 = PCB_MAX_COORD;
+	out->X2 = out->Y2 = -PCB_MAX_COORD;
+
+	/* now scan for the lowest/highest X and Y coordinate */
+	PCB_PADSTACK_LOOP(Data);
+	{
+		pcb_pstk_bbox(padstack);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, padstack))
+			pcb_box_bump_box(out, &padstack->bbox_naked);
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(Data);
+	{
+		pcb_subc_bbox(subc);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, subc))
+			pcb_box_bump_box(out, &subc->bbox_naked);
+	}
+	PCB_END_LOOP;
+	PCB_LINE_ALL_LOOP(Data);
+	{
+		pcb_line_bbox(line);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, line))
+			pcb_box_bump_box(out, &line->bbox_naked);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(Data);
+	{
+		pcb_arc_bbox(arc);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, arc))
+			pcb_box_bump_box(out, &arc->bbox_naked);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(Data);
+	{
+		pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, text))
+			pcb_box_bump_box(out, &text->bbox_naked);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(Data);
+	{
+		pcb_poly_bbox(polygon);
+		if (!ignore_floaters || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, polygon))
+			pcb_box_bump_box(out, &polygon->bbox_naked);
+	}
+	PCB_ENDALL_LOOP;
+	return (pcb_data_is_empty(Data) ? NULL : out);
+}
+
+void pcb_data_set_layer_parents(pcb_data_t *data)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		data->Layer[n].parent.data = data;
+		data->Layer[n].parent_type = PCB_PARENT_DATA;
+	}
+}
+
+void pcb_data_bind_board_layers(pcb_board_t *pcb, pcb_data_t *data, int share_rtrees)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < pcb->Data->LayerN; n++) {
+		pcb_layer_real2bound(&data->Layer[n], &pcb->Data->Layer[n], share_rtrees);
+		data->Layer[n].parent.data = data;
+		data->Layer[n].parent_type = PCB_PARENT_DATA;
+	}
+	data->LayerN = pcb->Data->LayerN;
+}
+
+void pcb_data_make_layers_bound(pcb_board_t *pcb4layer_groups, pcb_data_t *data)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < data->LayerN; n++) {
+		pcb_layer_type_t lyt = pcb_layergrp_flags(pcb4layer_groups, data->Layer[n].meta.real.grp);
+		pcb_layer_real2bound_offs(&data->Layer[n], pcb4layer_groups, &data->Layer[n]);
+		data->Layer[n].parent.data = data;
+		data->Layer[n].parent_type = PCB_PARENT_DATA;
+		data->Layer[n].type = PCB_OBJ_LAYER;
+		data->Layer[n].meta.bound.type = lyt;
+	}
+}
+
+void pcb_data_unbind_layers(pcb_data_t *data)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < data->LayerN; n++)
+		data->Layer[n].meta.bound.real = NULL;
+}
+
+void pcb_data_binding_update(pcb_board_t *pcb, pcb_data_t *data)
+{
+	int i;
+	for(i = 0; i < data->LayerN; i++) {
+		pcb_layer_t *sourcelayer = &data->Layer[i];
+		pcb_layer_t *destlayer = pcb_layer_resolve_binding(pcb, sourcelayer);
+		sourcelayer->meta.bound.real = destlayer;
+	}
+}
+
+pcb_data_t *pcb_data_new(pcb_board_t *parent)
+{
+	pcb_data_t *data;
+	data = (pcb_data_t *) calloc(1, sizeof(pcb_data_t));
+	if (parent != NULL)
+		PCB_SET_PARENT(data, board, parent);
+	pcb_data_set_layer_parents(data);
+	return data;
+}
+
+pcb_board_t *pcb_data_get_top(pcb_data_t *data)
+{
+	while((data != NULL) && (data->parent_type == PCB_PARENT_SUBC))
+		data = data->parent.subc->parent.data;
+
+	if (data == NULL)
+		return NULL;
+
+	if (data->parent_type == PCB_PARENT_BOARD)
+		return data->parent.board;
+
+	return NULL;
+}
+
+void pcb_data_mirror(pcb_data_t *data, pcb_coord_t y_offs, pcb_data_mirror_text_t mtxt, pcb_bool pstk_smirror)
+{
+	PCB_PADSTACK_LOOP(data);
+	{
+		pcb_pstk_mirror(padstack, y_offs, pstk_smirror, 0);
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(data);
+	{
+		pcb_subc_mirror(data, subc, y_offs, pstk_smirror);
+	}
+	PCB_END_LOOP;
+	PCB_LINE_ALL_LOOP(data);
+	{
+		pcb_line_mirror(layer, line, y_offs);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(data);
+	{
+		pcb_arc_mirror(layer, arc, y_offs);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(data);
+	{
+		pcb_poly_mirror(layer, polygon, y_offs);
+	}
+	PCB_ENDALL_LOOP;
+
+	switch(mtxt) {
+		case PCB_TXM_NONE:
+			break;
+		case PCB_TXM_SIDE:
+			PCB_TEXT_ALL_LOOP(data);
+			{
+				pcb_text_flip_side(layer, text, y_offs);
+			}
+			PCB_ENDALL_LOOP;
+			break;
+		case PCB_TXM_COORD:
+			PCB_TEXT_ALL_LOOP(data);
+			{
+				pcb_text_mirror_coords(layer, text, y_offs);
+			}
+			PCB_ENDALL_LOOP;
+			break;
+	}
+}
+
+int pcb_data_normalize_(pcb_data_t *data, pcb_box_t *data_bbox)
+{
+	pcb_box_t tmp;
+	pcb_coord_t dx = 0, dy = 0;
+
+	if (data_bbox == NULL) {
+		data_bbox = &tmp;
+		if (pcb_data_bbox(data_bbox, data, pcb_false) == NULL)
+			return -1;
+	}
+
+	if (data_bbox->X1 < 0)
+		dx = -data_bbox->X1;
+	if (data_bbox->Y1 < 0)
+		dy = -data_bbox->Y1;
+
+	if ((dx > 0) || (dy > 0)) {
+		pcb_data_move(data, dx, dy);
+		return 1;
+	}
+
+	return 0;
+}
+
+int pcb_data_normalize(pcb_data_t *data)
+{
+	return pcb_data_normalize_(data, NULL);
+}
+
+void pcb_data_set_parent_globals(pcb_data_t *data, pcb_data_t *new_parent)
+{
+	pcb_pstk_t *ps;
+	pcb_subc_t *sc;
+	gdl_iterator_t it;
+
+	padstacklist_foreach(&data->padstack, &it, ps) {
+		ps->parent_type = PCB_PARENT_DATA;
+		ps->parent.data = new_parent;
+	}
+	subclist_foreach(&data->subc, &it, sc) {
+		sc->parent_type = PCB_PARENT_DATA;
+		sc->parent.data = new_parent;
+	}
+}
+
+
+extern pcb_opfunc_t MoveFunctions;
+void pcb_data_move(pcb_data_t *data, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_opctx_t ctx;
+
+	ctx.move.pcb = pcb_data_get_top(data);
+	ctx.move.dx = dx;
+	ctx.move.dy = dy;
+
+	PCB_PADSTACK_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_PSTK, padstack, padstack, padstack);
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_SUBC, subc, subc, subc);
+	}
+	PCB_END_LOOP;
+	PCB_LINE_ALL_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_LINE, layer, line, line);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_ARC, layer, arc, arc);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_TEXT, layer, text, text);
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(data);
+	{
+		pcb_object_operation(&MoveFunctions, &ctx, PCB_OBJ_POLY, layer, polygon, polygon);
+	}
+	PCB_ENDALL_LOOP;
+}
+
+void pcb_data_list_by_flag(pcb_data_t *data, vtp0_t *dst, pcb_objtype_t type, unsigned long mask)
+{
+	if (type & PCB_OBJ_PSTK) PCB_PADSTACK_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, padstack))) vtp0_append(dst, padstack);
+	} PCB_END_LOOP;
+	if (type & PCB_OBJ_SUBC) PCB_SUBC_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, subc))) vtp0_append(dst, subc);
+	} PCB_END_LOOP;
+	if (type & PCB_OBJ_LINE) PCB_LINE_ALL_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, line))) vtp0_append(dst, line);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_ARC) PCB_ARC_ALL_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, arc))) vtp0_append(dst, arc);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_TEXT) PCB_TEXT_ALL_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, text))) vtp0_append(dst, text);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_POLY) PCB_POLY_ALL_LOOP(data); {
+		if ((mask == 0) || (PCB_FLAG_TEST(mask, polygon))) vtp0_append(dst, polygon);
+	} PCB_ENDALL_LOOP;
+}
+
+void pcb_data_list_terms(pcb_data_t *data, vtp0_t *dst, pcb_objtype_t type)
+{
+#warning subc TODO: subc in subc
+/*	if (type & PCB_OBJ_SUBC) PCB_SUBC_LOOP(data); {
+		if (subc->term != NULL) vtp0_append(dst, subc);
+	} PCB_END_LOOP;*/
+	if (type & PCB_OBJ_LINE) PCB_LINE_ALL_LOOP(data); {
+		if ((line->term != NULL)) vtp0_append(dst, line);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_ARC) PCB_ARC_ALL_LOOP(data); {
+		if (arc->term != NULL) vtp0_append(dst, arc);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_TEXT) PCB_TEXT_ALL_LOOP(data); {
+		if (text->term != NULL) vtp0_append(dst, text);
+	} PCB_ENDALL_LOOP;
+	if (type & PCB_OBJ_POLY) PCB_POLY_ALL_LOOP(data); {
+		if (polygon->term != NULL) vtp0_append(dst, polygon);
+	} PCB_ENDALL_LOOP;
+}
+
+void pcb_data_clip_polys(pcb_data_t *data)
+{
+	PCB_POLY_ALL_LOOP(data);
+	{
+		pcb_poly_init_clip(data, layer, polygon);
+	}
+	PCB_ENDALL_LOOP;
+}
+
+#define rsearch(tree) \
+	do { \
+		pcb_r_dir_t tmp = pcb_r_search(tree, starting_region, region_in_search, rectangle_in_region, closure, num_found); \
+		if (tmp == PCB_R_DIR_CANCEL) return tmp; \
+		res |= tmp; \
+	} while(0);
+
+pcb_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const pcb_box_t *starting_region,
+						 pcb_r_dir_t (*region_in_search) (const pcb_box_t *region, void *cl),
+						 pcb_r_dir_t (*rectangle_in_region) (const pcb_box_t *box, void *cl),
+						 void *closure, int *num_found, pcb_bool vis_only)
+{
+	pcb_layer_id_t lid;
+	pcb_r_dir_t res = 0;
+
+	if (!vis_only || PCB->RatOn)
+		if (types & PCB_OBJ_RAT)  rsearch(data->rat_tree);
+
+	if (types & PCB_OBJ_PSTK) rsearch(data->padstack_tree);
+
+	if (!vis_only || PCB->SubcOn)
+		if (types & PCB_OBJ_SUBC) rsearch(data->subc_tree);
+
+	for(lid = 0; lid < data->LayerN; lid++) {
+		pcb_layer_t *ly = data->Layer + lid;
+
+		if (vis_only && (!ly->meta.real.vis))
+			continue;
+
+		if (types & PCB_OBJ_LINE) rsearch(ly->line_tree);
+		if (types & PCB_OBJ_TEXT) rsearch(ly->text_tree);
+		if (types & PCB_OBJ_POLY) rsearch(ly->polygon_tree);
+		if (types & PCB_OBJ_ARC)  rsearch(ly->arc_tree);
+	}
+
+	return res;
+}
+
+/*** poly clip inhibit mechanism ***/
+void pcb_data_clip_inhibit_inc(pcb_data_t *data)
+{
+	int old = data->clip_inhibit;
+	data->clip_inhibit++;
+
+	if (old > data->clip_inhibit) {
+		pcb_message(PCB_MSG_ERROR, "Internal error: overflow on poly clip inhibit\n");
+		abort();
+	}
+}
+
+void pcb_data_clip_inhibit_dec(pcb_data_t *data, pcb_bool enable_progbar)
+{
+	if (data->clip_inhibit == 0) {
+		pcb_message(PCB_MSG_ERROR, "Internal error: overflow on poly clip inhibit\n");
+		assert(!"clip_inhibit underflow");
+		return;
+	}
+	data->clip_inhibit--;
+
+	if (data->clip_inhibit == 0)
+		pcb_data_clip_dirty(data, enable_progbar);
+}
+
+typedef struct {
+	pcb_data_t *data;
+	time_t nextt;
+	int inited, force_all;
+	pcb_cardinal_t at, total;
+} data_clip_all_t;
+
+static void data_clip_all_cb(void *ctx_)
+{
+	data_clip_all_t *ctx = ctx_;
+
+	ctx->at++;
+	if ((ctx->at % 8) == 0) {
+		time_t now = time(NULL);
+		if (now >= ctx->nextt) {
+			ctx->nextt = now+1;
+			if (!ctx->inited) {
+				ctx->total = 0;
+				PCB_POLY_ALL_LOOP(ctx->data); {
+					if (ctx->force_all || polygon->clip_dirty)
+						ctx->total += pcb_poly_num_clears(ctx->data, layer, polygon);
+				} PCB_ENDALL_LOOP;
+				ctx->inited = 1;
+			}
+			if (pcb_gui->progress(ctx->at, ctx->total, "Clipping polygons...") != 0) {
+				if (pcb_gui->confirm_dialog("The only way to cancel poly clipping is to quit pcb-rnd.\nAre you sure you want to quit?", "yes, quit", "no, continue", NULL) != 0) {
+					/* Have to recreate the dialog next time, that's the only way to get it out from the cancel state */
+					pcb_gui->progress(0, 0, NULL);
+				}
+				else
+					exit(1);
+			}
+		}
+	}
+}
+
+void pcb_data_clip_all_poly(pcb_data_t *data, pcb_bool enable_progbar, pcb_bool force_all)
+{
+	data_clip_all_t ctx;
+
+	if (data->clip_inhibit != 0)
+		return;
+
+	PCB_SUBC_LOOP(data); {
+		pcb_data_clip_dirty(subc->data, enable_progbar);
+	} PCB_END_LOOP;
+
+	ctx.data = data;
+	ctx.force_all = force_all;
+	ctx.nextt = time(NULL) + 2;
+	ctx.total = ctx.at = 0;
+	ctx.inited = 0;
+
+	/* have to go in two passes, to make sure that clearing polygons are done
+	   before the polygons that are potentially being cleared - this way we
+	   guarantee that by the time the poly-vs-poly clearance needs to be
+	   calculated, the clearing poly has a contour */
+	PCB_POLY_ALL_LOOP(data); {
+		if ((force_all || polygon->clip_dirty) && (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, polygon)))
+			pcb_poly_init_clip_prog(data, layer, polygon, (enable_progbar ? data_clip_all_cb : NULL), &ctx);
+	} PCB_ENDALL_LOOP;
+
+	PCB_POLY_ALL_LOOP(data); {
+		if ((force_all || polygon->clip_dirty) && (!PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, polygon)))
+			pcb_poly_init_clip_prog(data, layer, polygon, (enable_progbar ? data_clip_all_cb : NULL), &ctx);
+	} PCB_ENDALL_LOOP;
+
+	if (enable_progbar)
+		pcb_gui->progress(0, 0, NULL);
+}
+
+void pcb_data_clip_dirty(pcb_data_t *data, pcb_bool enable_progbar)
+{
+	pcb_data_clip_all_poly(data, enable_progbar, pcb_false);
+}
+
+void pcb_data_clip_all(pcb_data_t *data, pcb_bool enable_progbar)
+{
+	pcb_data_clip_all_poly(data, enable_progbar, pcb_true);
+}
+
+
+void pcb_data_flag_change(pcb_data_t *data, pcb_objtype_t mask, int how, unsigned long flags)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	for(o = pcb_data_first(&it, data, mask); o != NULL; o = pcb_data_next(&it)) {
+		PCB_FLAG_CHANGE(how, flags, o);
+		if (o->type == PCB_OBJ_SUBC)
+			pcb_data_flag_change(((pcb_subc_t *)o)->data, mask, how, flags);
+	}
+}
+
+#warning TODO: rewrite to be more generic
+#include "obj_pstk_draw.h"
+#include "obj_text_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_line_draw.h"
+#include "conf_core.h"
+void pcb_clear_warnings()
+{
+	pcb_rtree_it_t it;
+	pcb_box_t *n;
+	int li;
+	pcb_layer_t *l;
+
+	conf_core.temp.rat_warn = pcb_false;
+
+	for(n = pcb_r_first(PCB->Data->padstack_tree, &it); n != NULL; n = pcb_r_next(&it)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_WARN, (pcb_any_obj_t *)n)) {
+			PCB_FLAG_CLEAR(PCB_FLAG_WARN, (pcb_any_obj_t *)n);
+			pcb_pstk_invalidate_draw((pcb_pstk_t *)n);
+		}
+	}
+	pcb_r_end(&it);
+
+	for(li = 0, l = PCB->Data->Layer; li < PCB->Data->LayerN; li++,l++) {
+		for(n = pcb_r_first(l->line_tree, &it); n != NULL; n = pcb_r_next(&it)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, (pcb_any_obj_t *)n)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_WARN, (pcb_any_obj_t *)n);
+				pcb_line_invalidate_draw(l, (pcb_line_t *)n);
+			}
+		}
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->arc_tree, &it); n != NULL; n = pcb_r_next(&it)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, (pcb_any_obj_t *)n)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_WARN, (pcb_any_obj_t *)n);
+				pcb_arc_invalidate_draw(l, (pcb_arc_t *)n);
+			}
+		}
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->polygon_tree, &it); n != NULL; n = pcb_r_next(&it)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, (pcb_any_obj_t *)n)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_WARN, (pcb_any_obj_t *)n);
+				pcb_poly_invalidate_draw(l, (pcb_poly_t *)n);
+			}
+		}
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->text_tree, &it); n != NULL; n = pcb_r_next(&it)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, (pcb_any_obj_t *)n)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_WARN, (pcb_any_obj_t *)n);
+				pcb_text_invalidate_draw(l, (pcb_text_t *)n);
+			}
+		}
+		pcb_r_end(&it);
+	}
+}
Index: tags/2.0.1/src/data.h
===================================================================
--- tags/2.0.1/src/data.h	(nonexistent)
+++ tags/2.0.1/src/data.h	(revision 18980)
@@ -0,0 +1,207 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* common identifiers */
+
+#ifndef	PCB_DATA_H
+#define	PCB_DATA_H
+
+#include "globalconst.h"
+#include "global_typedefs.h"
+#include "layer.h"
+#include "crosshair.h"
+#include "buffer.h"
+#include "data_parent.h"
+#include "obj_rat_list.h"
+#include "obj_subc_list.h"
+#include "obj_pstk_list.h"
+#include "vtpadstack.h"
+
+
+/* Generic container object that can hold subcircuits with layer-global
+   objects (e.g. vias and rats) and layer-locals (lines, arcs) */
+struct pcb_data_s {
+	int LayerN;                        /* number of layers in this board */
+
+	pcb_vtpadstack_proto_t ps_protos;
+
+	padstacklist_t padstack;
+	pcb_subclist_t subc;
+/**/
+	pcb_rtree_t *padstack_tree, *subc_tree, *rat_tree;
+	pcb_layer_t Layer[PCB_MAX_LAYER]; /* layer TODO: make this dynamic */
+	pcb_plug_io_t *loader;
+	ratlist_t Rat;
+
+/**/
+	pcb_parenttype_t parent_type;
+	pcb_parent_t parent;
+
+/* poly clip inhibit */
+	int clip_inhibit; /* counter: >0 means we are in inhibit mode */
+};
+
+#define pcb_max_group(pcb) ((pcb)->LayerGroups.len)
+
+/* DO NOT USE this macro, it is not PCB-safe */
+#define pcb_max_layer (PCB->Data->LayerN)
+
+
+
+extern pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER];
+extern int pcb_added_lines;
+extern int pcb_layer_stack[PCB_MAX_LAYER];
+
+extern pcb_bool pcb_bumped;
+
+/****** callback based loops *****/
+
+/* The functions returning int are called once when processing of a new layer
+   or element starts, with enter=1. If they return non-zero, the current layer
+   or element is skipped. If it is not skipped, the function is called once
+   at the end of processing the given layer or element, with enter=0 (and
+   return value ignored).
+
+   Any of the callbacks for any loop function can be NULL.
+   */
+
+/* layer object callbacks */
+typedef int (*pcb_layer_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter);
+typedef void (*pcb_line_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line);
+typedef void (*pcb_arc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc);
+typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text);
+typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly);
+
+/* subc callbacks */
+typedef int (*pcb_subc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter);
+
+/* via and padstack callbacks */
+typedef void (*pcb_pstk_cb_t)(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps);
+
+/* Loop over all layer objects on each layer. Layer is the outer loop. */
+void pcb_loop_layers(pcb_board_t *pcb, void *ctx, pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb);
+
+/* Loop over all subcircuits. */
+void pcb_loop_subc(pcb_board_t *pcb, void *ctx, pcb_subc_cb_t scb);
+
+/* Loop over all design objects. (So all the above three in one call.) */
+void pcb_loop_all(pcb_board_t *pcb, void *ctx,
+	pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb,
+	pcb_subc_cb_t scb,
+	pcb_pstk_cb_t pscb
+);
+
+pcb_data_t *pcb_data_new(pcb_board_t *parent);
+void pcb_data_free(pcb_data_t *);
+pcb_bool pcb_data_is_empty(pcb_data_t *);
+
+/* gets minimum and maximum coordinates
+ * returns NULL if layout is empty */
+pcb_box_t *pcb_data_bbox(pcb_box_t *out, pcb_data_t *Data, pcb_bool ignore_floaters);
+pcb_box_t *pcb_data_bbox_naked(pcb_box_t *out, pcb_data_t *Data, pcb_bool ignore_floaters);
+
+/* Make sure all layers of data has their .parent field pointing to the data */
+void pcb_data_set_layer_parents(pcb_data_t *data);
+
+/* Set up all data layers as bound layers to pcb's Data */
+void pcb_data_bind_board_layers(pcb_board_t *pcb, pcb_data_t *data, int share_rtrees);
+
+/* redo all layers of data to be bound layers (layer recipes) using the stackup
+   from pcb4layer_groups. The new bound layers are not bound to any real layer. */
+void pcb_data_make_layers_bound(pcb_board_t *pcb4layer_groups, pcb_data_t *data);
+
+/* Recalculate the layer bindings updating meta.bound.real to new board layers */
+void pcb_data_binding_update(pcb_board_t *pcb, pcb_data_t *data);
+
+/* Break the binding in data bound layers (set htem all to NULL) */
+void pcb_data_unbind_layers(pcb_data_t *data);
+
+/* Make sure there are no negative coords in data, knowing the bbox of the data */
+int pcb_data_normalize_(pcb_data_t *data, pcb_box_t *data_bbox);
+
+/* Make sure there are no negative coords in data (calculates the bbox of the data) */
+int pcb_data_normalize(pcb_data_t *data);
+
+/* Returns the top level pcb related to a data, or NULL if the data is floating
+   (e.g. is a global buffer) */
+pcb_board_t *pcb_data_get_top(pcb_data_t *data);
+
+/* Force-set the parent.data field of each global object in data (but not
+   the layers!) */
+void pcb_data_set_parent_globals(pcb_data_t *data, pcb_data_t *new_parent);
+
+typedef enum pcb_data_mirror_text_e {
+	PCB_TXM_NONE = 0, /* do not mirror text */
+	PCB_TXM_SIDE = 1, /* mirror text, changing side */
+	PCB_TXM_COORD    /* mirror text base coords only */
+} pcb_data_mirror_text_t;
+void pcb_data_mirror(pcb_data_t *data, pcb_coord_t y_offs, pcb_data_mirror_text_t mtxt, pcb_bool pstk_smirror);
+
+void pcb_data_move(pcb_data_t *data, pcb_coord_t dx, pcb_coord_t dy);
+
+/* run pcb_poly_init_clip() on all polygons in data */
+void pcb_data_clip_polys(pcb_data_t *data);
+
+
+/* rsearch on all trees matching types of data */
+pcb_r_dir_t pcb_data_r_search(pcb_data_t *data, pcb_objtype_t types, const pcb_box_t *starting_region,
+						 pcb_r_dir_t (*region_in_search) (const pcb_box_t *region, void *cl),
+						 pcb_r_dir_t (*rectangle_in_region) (const pcb_box_t *box, void *cl),
+						 void *closure, int *num_found, pcb_bool vis_only);
+
+/* Either pcb->data or the subcircuit's data if PCB is a subc (footprint edit mode) */
+#define PCB_REAL_DATA(pcb) \
+	((pcb)->is_footprint ? (pcb_subclist_first(&(pcb)->Data->subc)->data) : ((pcb)->Data))
+
+
+/*** Polygon clipping inhibit ***/
+
+/* increase the inhibit counter (stop clipping polygons) */
+void pcb_data_clip_inhibit_inc(pcb_data_t *data);
+
+/* decrease the inhibit counter - if it's zero, reclip all dirty polygons;
+   enable_progbar controls whether a progress bar is drawn for reclips
+   that take longer than a few seconds. */
+void pcb_data_clip_inhibit_dec(pcb_data_t *data, pcb_bool enable_progbar);
+
+/* attempt to reclip all dirty polygons; normally called by
+   pcb_data_clip_inhibit_dec(). */
+void pcb_data_clip_dirty(pcb_data_t *data, pcb_bool enable_progbar);
+
+/* Force reclip all polygons; useful after a move-everything kind
+   of operation (e.g. autocrop()) */
+void pcb_data_clip_all(pcb_data_t *data, pcb_bool enable_progbar);
+
+
+/* Recursively change flags of data; how is one of pcb_change_flag_t */
+void pcb_data_flag_change(pcb_data_t *data, pcb_objtype_t mask, int how, unsigned long flags);
+
+/* Clear warning color from pins/pads */
+void pcb_clear_warnings(void);
+
+#endif
Index: tags/2.0.1/src/data_it.h
===================================================================
--- tags/2.0.1/src/data_it.h	(nonexistent)
+++ tags/2.0.1/src/data_it.h	(revision 18980)
@@ -0,0 +1,144 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Flat, non-recursive iterator on pcb_data_t children objects */
+
+#ifndef PCB_DATA_IT_H
+#define PCB_DATA_IT_H
+
+#include "obj_common.h"
+#include "data.h"
+
+typedef struct pcb_data_it_s {
+	/* config */
+	pcb_data_t *data;
+	pcb_objtype_t mask; /* caller wants to see these types */
+
+	/* current state */
+	pcb_objtype_t remaining;
+	pcb_objtype_t type;
+	pcb_cardinal_t ln;
+	pcb_any_obj_t *last;
+} pcb_data_it_t;
+
+#define PCB_DATA_IT_TYPES \
+	(PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_ARC | PCB_OBJ_PSTK | \
+	PCB_OBJ_SUBC | PCB_OBJ_RAT)
+
+/* Start an iteration on data, looking for any object type listed in mask;
+   returns NULL if nothing is found. The iteration is non-recursive to subcircuits */
+PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask);
+
+/* Return the next object or NULL on end of iteration */
+PCB_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it);
+
+/**** implementation (inlines) ****/
+
+/* Skip to the next type; returns 0 on success, non-0 at the end of types */
+PCB_INLINE int pcb_data_it_next_type(pcb_data_it_t *it)
+{
+	if (it->remaining == 0)
+		return 1;
+
+	if (it->type == 0)
+		it->type = 1;
+	else
+		it->type <<= 1;
+
+	/* find and remove the next bit */
+	while((it->remaining & it->type) == 0) it->type <<= 1;
+	it->remaining &= ~it->type;
+
+	return 0;
+}
+
+/* Take the next layer object, skip layer if there's no more */
+#define PCB_DATA_IT_LOBJ(it, otype, ltype, list) \
+	do { \
+		if (it->last == NULL) \
+			it->last = (pcb_any_obj_t *)ltype ## _first(&(it->data->Layer[it->ln].list)); \
+		else \
+			it->last = (pcb_any_obj_t *)ltype ## _next((otype *)it->last); \
+		if (it->last == NULL) \
+			goto next_layer; \
+	} while(0)
+
+/* Take the next global object, skip type if there's no more */
+#define PCB_DATA_IT_GOBJ(it, otype, ltype, list) \
+	do { \
+		if (it->last == NULL) \
+			it->last = (pcb_any_obj_t *)ltype ## _first(&(it->data->list)); \
+		else \
+			it->last = (pcb_any_obj_t *)ltype ## _next((otype *)it->last); \
+		if (it->last == NULL) \
+			goto next_type; \
+	} while(0)
+
+
+PCB_INLINE pcb_any_obj_t *pcb_data_next(pcb_data_it_t *it)
+{
+	retry:;
+
+	switch(it->type) {
+		case PCB_OBJ_LINE: PCB_DATA_IT_LOBJ(it, pcb_line_t, linelist, Line); break;
+		case PCB_OBJ_TEXT: PCB_DATA_IT_LOBJ(it, pcb_text_t, textlist, Text); break;
+		case PCB_OBJ_POLY: PCB_DATA_IT_LOBJ(it, pcb_poly_t, polylist, Polygon); break;
+		case PCB_OBJ_ARC:  PCB_DATA_IT_LOBJ(it, pcb_arc_t,  arclist,  Arc); break;
+		case PCB_OBJ_PSTK: PCB_DATA_IT_GOBJ(it, pcb_pstk_t, padstacklist, padstack); break;
+		case PCB_OBJ_SUBC: PCB_DATA_IT_GOBJ(it, pcb_subc_t, pcb_subclist, subc); break;
+		case PCB_OBJ_RAT:  PCB_DATA_IT_GOBJ(it, pcb_rat_t,  ratlist, Rat); break;
+		default:
+			assert(!"iterating on invalid type");
+			return NULL;
+	}
+	return it->last;
+
+	/* skip to the next layer and retry unless ran out of types */
+	next_layer:;
+	it->ln++;
+	if (it->ln >= it->data->LayerN) { /* checked all layers for this type, skip to next type */
+		it->ln = 0;
+		next_type:;
+		if (pcb_data_it_next_type(it))
+			return NULL;
+	}
+
+	goto retry; /* ... on the new layer */
+}
+
+PCB_INLINE pcb_any_obj_t *pcb_data_first(pcb_data_it_t *it, pcb_data_t *data, pcb_objtype_t mask)
+{
+	it->data = data;
+	it->mask = it->remaining = mask & PCB_DATA_IT_TYPES;
+	it->type = 0;
+	it->ln = 0;
+	it->last = NULL;
+	if (pcb_data_it_next_type(it))
+		return NULL;
+	return pcb_data_next(it);
+}
+
+#endif
Index: tags/2.0.1/src/data_list.h
===================================================================
--- tags/2.0.1/src/data_list.h	(nonexistent)
+++ tags/2.0.1/src/data_list.h	(revision 18980)
@@ -0,0 +1,41 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_DATA_LIST_H
+#define PCB_DATA_LIST_H
+
+#include <genvector/vtp0.h>
+#include "data.h"
+
+/* append objects of type, with flags matching mask to dst; pointer are
+   valid only until the first change to data; if flags is 0, everything matches. */
+void pcb_data_list_by_flag(pcb_data_t *data, vtp0_t *dst, pcb_objtype_t type, unsigned long mask);
+
+/* append objects of type that are terminals; pointer are
+   valid only until the first change to data */
+void pcb_data_list_terms(pcb_data_t *data, vtp0_t *dst, pcb_objtype_t type);
+
+#endif
Index: tags/2.0.1/src/data_parent.h
===================================================================
--- tags/2.0.1/src/data_parent.h	(nonexistent)
+++ tags/2.0.1/src/data_parent.h	(revision 18980)
@@ -0,0 +1,70 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016..2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_DATA_PARENT_H
+#define PCB_DATA_PARENT_H
+
+#include "global_typedefs.h"
+
+/* which elem of the parent union is active */
+typedef enum pcb_parenttype_e {
+	PCB_PARENT_INVALID = 0,  /* invalid or unknown */
+	PCB_PARENT_LAYER,        /* object is on a layer */
+	PCB_PARENT_SUBC,         /* object is part of a subcircuit */
+	PCB_PARENT_DATA,         /* global objects like via */
+	PCB_PARENT_BOARD,        /* directly under a board (typical for pcb_data_t of a board) */
+	PCB_PARENT_UI            /* parent of UI layers */
+} pcb_parenttype_t;
+
+/* class is e.g. PCB_OBJ_CLASS_OBJ */
+#define PCB_OBJ_IS_CLASS(type, class)  (((type) & PCB_OBJ_CLASS_MASK) == (class))
+
+union pcb_parent_s {
+	void           *any;
+	pcb_layer_t    *layer;
+	pcb_data_t     *data;
+	pcb_subc_t     *subc;
+	pcb_board_t    *board;
+};
+
+#define PCB_PARENT_TYPENAME_layer    PCB_PARENT_LAYER
+#define PCB_PARENT_TYPENAME_data     PCB_PARENT_DATA
+#define PCB_PARENT_TYPENAME_subc     PCB_PARENT_SUBC
+#define PCB_PARENT_TYPENAME_board    PCB_PARENT_BOARD
+
+#define PCB_SET_PARENT(obj, ptype, parent_ptr) \
+	do { \
+		(obj)->parent_type = PCB_PARENT_TYPENAME_ ## ptype; \
+		(obj)->parent.ptype = parent_ptr; \
+	} while(0)
+
+#define PCB_CLEAR_PARENT(obj) \
+	do { \
+		(obj)->parent_type = PCB_PARENT_INVALID; \
+		(obj)->parent.any = NULL; \
+	} while(0)
+
+#endif
Index: tags/2.0.1/src/default2.lht
===================================================================
--- tags/2.0.1/src/default2.lht	(nonexistent)
+++ tags/2.0.1/src/default2.lht	(revision 18980)
@@ -0,0 +1,116 @@
+# pcb-rnd official 2-layer default board
+
+ha:pcb-rnd-board-v4 {
+ li:styles {
+   ha:Signal {
+    diameter = 2mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 127.0mm; y = 127.0mm
+    isle_area_nm2 = 200000000.0
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+   li:layers {
+     ha:top-sig      { lid=0; group=3; }
+     ha:bottom-sig   { lid=1; group=6; }
+     ha:top-gnd      { lid=2; group=3; }
+     ha:bottom-gnd   { lid=3; group=6; }
+     ha:top-vcc      { lid=4; group=3; }
+     ha:bottom-vcc   { lid=5; group=6; }
+     ha:outline      { lid=6; group=5; }
+     ha:bottom-silk  { lid=7; group=8; ha:combining { auto=1; } }
+     ha:top-silk     { lid=8; group=1; ha:combining { auto=1; } }
+     ha:top-paste    { lid=9; group=0; ha:combining { auto=1; } }
+     ha:top-mask     { lid=10; group=2; ha:combining { sub=1; auto=1; } }
+     ha:bottom-mask  { lid=11; group=7; ha:combining { sub=1; auto=1; } }
+     ha:bottom-paste { lid=12; group=9; ha:combining { auto=1; } }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1; }
+    li:layers { 9; }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1; }
+    li:layers { 8; }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1; }
+    li:layers { 10; }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1; }
+    li:layers { 0; 2; 4; }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1; }
+    li:layers { }
+    name = grp_4
+   }
+   ha:5 {
+    name = global_outline
+    ha:type { outline=1; }
+    li:layers { 6; }
+   }
+   ha:6 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1; }
+    li:layers { 1; 3; 5; }
+   }
+   ha:7 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1; }
+    li:layers { 11; }
+   }
+   ha:8 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1; }
+    li:layers { 7; }
+   }
+   ha:9 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1; }
+    li:layers { 12; }
+   }
+  }
+ }
+}
Index: tags/2.0.1/src/default4.lht
===================================================================
--- tags/2.0.1/src/default4.lht	(nonexistent)
+++ tags/2.0.1/src/default4.lht	(revision 18980)
@@ -0,0 +1,136 @@
+# pcb-rnd official 4-layer default board
+
+ha:pcb-rnd-board-v4 {
+ li:styles {
+   ha:Signal {
+    diameter = 2mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 127.0mm; y = 127.0mm
+    isle_area_nm2 = 200000000.0
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+   li:layers {
+     ha:top-sig      { lid=0; group=3; }
+     ha:bottom-sig   { lid=1; group=10; }
+     ha:top-gnd      { lid=2; group=3; }
+     ha:bottom-gnd   { lid=3; group=10; }
+     ha:int-sig2     { lid=4; group=7; }
+     ha:int-sig1     { lid=5; group=5; }
+     ha:outline      { lid=6; group=9; }
+     ha:bottom-silk  { lid=7; group=12; ha:combining { auto=1; } }
+     ha:top-silk     { lid=8; group=1; ha:combining { auto=1; } }
+     ha:top-paste    { lid=9; group=0; ha:combining { auto=1; } }
+     ha:top-mask     { lid=10; group=2; ha:combining { sub=1; auto=1; } }
+     ha:bottom-mask  { lid=11; group=11; ha:combining { sub=1; auto=1; } }
+     ha:bottom-paste { lid=12; group=13; ha:combining { auto=1; } }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1; }
+    li:layers { 9; }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1; }
+    li:layers { 8; }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1; }
+    li:layers { 10; }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1; }
+    li:layers { 0; 2; }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1; }
+    li:layers { }
+    name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1; }
+    li:layers { 5; }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1; }
+    li:layers { }
+    name = grp_6
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1; }
+    li:layers { 4; }
+   }
+   ha:8 {
+    ha:type { substrate=1; intern=1; }
+    li:layers { }
+    name = grp_8
+   }
+   ha:9 {
+    name = global_outline
+    ha:type { outline=1; }
+    li:layers { 6; }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1; }
+    li:layers { 1; 3; }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1; }
+    li:layers { 11; }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1; }
+    li:layers { 7; }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1; }
+    li:layers { 12; }
+   }
+  }
+ }
+}
Index: tags/2.0.1/src/default_font
===================================================================
--- tags/2.0.1/src/default_font	(nonexistent)
+++ tags/2.0.1/src/default_font	(revision 18980)
@@ -0,0 +1,773 @@
+Symbol(' ' 18)
+(
+)
+Symbol('!' 12)
+(
+	SymbolLine(0 35 0 40 8)
+	SymbolLine(0 0 0 25 8)
+)
+Symbol('"' 12)
+(
+	SymbolLine(0 0 0 10 8)
+	SymbolLine(10 0 10 10 8)
+)
+Symbol('#' 12)
+(
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(0 15 20 15 8)
+	SymbolLine(15 10 15 30 8)
+	SymbolLine(5 10 5 30 8)
+)
+Symbol('$' 12)
+(
+	SymbolLine(15 5 20 10 8)
+	SymbolLine(5 5 15 5 8)
+	SymbolLine(0 10 5 5 8)
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 5 20 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 20 30 8)
+	SymbolLine(15 35 20 30 8)
+	SymbolLine(5 35 15 35 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(10 0 10 40 8)
+)
+Symbol('%' 12)
+(
+	SymbolLine(0 5 0 10 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 10 0 8)
+	SymbolLine(10 0 15 5 8)
+	SymbolLine(15 5 15 10 8)
+	SymbolLine(10 15 15 10 8)
+	SymbolLine(5 15 10 15 8)
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(0 40 40 0 8)
+	SymbolLine(35 40 40 35 8)
+	SymbolLine(40 30 40 35 8)
+	SymbolLine(35 25 40 30 8)
+	SymbolLine(30 25 35 25 8)
+	SymbolLine(25 30 30 25 8)
+	SymbolLine(25 30 25 35 8)
+	SymbolLine(25 35 30 40 8)
+	SymbolLine(30 40 35 40 8)
+)
+Symbol('&' 12)
+(
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 5 0 15 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 25 15 10 8)
+	SymbolLine(5 40 10 40 8)
+	SymbolLine(10 40 20 30 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(5 0 10 0 8)
+	SymbolLine(10 0 15 5 8)
+	SymbolLine(15 5 15 10 8)
+	SymbolLine(0 25 0 35 8)
+)
+Symbol(''' 12)
+(
+	SymbolLine(0 10 10 0 8)
+)
+Symbol('(' 12)
+(
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 35 8)
+)
+Symbol(')' 12)
+(
+	SymbolLine(0 0 5 5 8)
+	SymbolLine(5 5 5 35 8)
+	SymbolLine(0 40 5 35 8)
+)
+Symbol('*' 12)
+(
+	SymbolLine(0 10 20 30 8)
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 20 20 20 8)
+	SymbolLine(10 10 10 30 8)
+)
+Symbol('+' 12)
+(
+	SymbolLine(0 20 20 20 8)
+	SymbolLine(10 10 10 30 8)
+)
+Symbol(',' 12)
+(
+	SymbolLine(0 50 10 40 8)
+)
+Symbol('-' 12)
+(
+	SymbolLine(0 20 20 20 8)
+)
+Symbol('.' 12)
+(
+	SymbolLine(0 40 5 40 8)
+)
+Symbol('/' 12)
+(
+	SymbolLine(0 35 30 5 8)
+)
+Symbol('0' 12)
+(
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 5 0 35 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(20 5 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 30 20 10 8)
+)
+Symbol('1' 12)
+(
+	SymbolLine( 0  8  8  0 8)
+	SymbolLine( 8  0  8 40 8)
+	SymbolLine( 0 40 15 40 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(25 5 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 25 40 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 35  5 40 8)
+
+	SymbolLine( 5 18 15 18 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(20 23 20 35 8)
+	SymbolLine(20 23 15 18 8)
+	SymbolLine(20 13 15 18 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 25 20 0 8)
+	SymbolLine(0 25 25 25 8)
+	SymbolLine(20 0 20 40 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(0 0 0 20 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(20 20 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15  0 20  5 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(15 18 20 23 8)
+	SymbolLine( 0 18 15 18 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 23 20 35 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine( 5 40 25  0 8)
+	SymbolLine( 0  0 25  0 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 27  0 35 8)
+	SymbolLine( 0 27  7 20 8)
+	SymbolLine( 7 20 13 20 8)
+	SymbolLine(13 20 20 27 8)
+	SymbolLine(20 27 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 13  7 20 8)
+	SymbolLine( 0  5  0 13 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(13 20 20 13 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(5 40 20 20 8)
+	SymbolLine(20 5 20 20 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 15 8)
+	SymbolLine(0 15 5 20 8)
+	SymbolLine(5 20 20 20 8)
+)
+Symbol(':' 12)
+(
+	SymbolLine(0 15 5 15 8)
+	SymbolLine(0 25 5 25 8)
+)
+Symbol(';' 12)
+(
+	SymbolLine(0 40 10 30 8)
+	SymbolLine(10 15 10 20 8)
+)
+Symbol('<' 12)
+(
+	SymbolLine(0 20 10 10 8)
+	SymbolLine(0 20 10 30 8)
+)
+Symbol('=' 12)
+(
+	SymbolLine(0 15 20 15 8)
+	SymbolLine(0 25 20 25 8)
+)
+Symbol('>' 12)
+(
+	SymbolLine(0 10 10 20 8)
+	SymbolLine(0 30 10 20 8)
+)
+Symbol('?' 12)
+(
+	SymbolLine(10 20 10 25 8)
+	SymbolLine(10 35 10 40 8)
+	SymbolLine(0 5 0 10 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(20 5 20 10 8)
+	SymbolLine(10 20 20 10 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine( 0 10  0 40 8)
+	SymbolLine( 0 10  7  0 8)
+	SymbolLine( 7  0 18  0 8)
+	SymbolLine(18  0 25 10 8)
+	SymbolLine(25 10 25 40 8)
+	SymbolLine( 0 20 25 20 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine( 0 40 20 40 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(25 23 25 35 8)
+	SymbolLine(20 18 25 23 8)
+	SymbolLine( 5 18 20 18 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 13 8)
+	SymbolLine(20 18 25 13 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(7 40 20 40 8)
+	SymbolLine(0 33  7 40 8)
+	SymbolLine(0  7  0 33 8)
+	SymbolLine(0  7  7  0 8)
+	SymbolLine(7  0 20  0 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(18  0 25  7 8)
+	SymbolLine(25  7 25 33 8)
+	SymbolLine(18 40 25 33 8)
+	SymbolLine( 0 40 18 40 8)
+	SymbolLine( 0  0 18  0 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 18 15 18 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
+	SymbolLine(0 18 15 18 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(25 25 25 35 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(10 20 20 20 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(25 0 25 40 8)
+	SymbolLine(0 20 25 20 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 0 10 0 8)
+	SymbolLine(5 0 5 40 8)
+	SymbolLine(0 40 10 40 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine( 7  0 15  0 8)
+	SymbolLine(15  0 15 35 8)
+	SymbolLine(10 40 15 35 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 35  0 30 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 20 20 0 8)
+	SymbolLine(0 20 20 40 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 40 20 40 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 0 15 20 8)
+	SymbolLine(15 20 30 0 8)
+	SymbolLine(30 0 30 40 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 0 25 40 8)
+	SymbolLine(25 0 25 40 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 5 0 35 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(20 5 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 0 5 40 8)
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(25 5 25 15 8)
+	SymbolLine(20 20 25 15 8)
+	SymbolLine(5 20 20 20 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 30 8)
+	SymbolLine(10 40 20 30 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(10 25 20 40 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 15 8)
+	SymbolLine(20 20 25 15 8)
+	SymbolLine( 5 20 20 20 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(13 20 25 40 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 15 8)
+	SymbolLine(0 15 5 20 8)
+	SymbolLine(5 20 20 20 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(25 25 25 35 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(10 0 10 40 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 0 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 0 20 35 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine( 0  0 10 40 8)
+	SymbolLine(10 40 20  0 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine( 0  0  0 20 8)
+	SymbolLine( 0 20  5 40 8)
+	SymbolLine( 5 40 15 20 8)
+	SymbolLine(15 20 25 40 8)
+	SymbolLine(25 40 30 20 8)
+	SymbolLine(30 20 30  0 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0  0 25 40 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine( 0  0 10 20 8)
+	SymbolLine(10 20 20  0 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine( 0  0 25  0 8)
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0 40 25 40 8)
+)
+Symbol('[' 12)
+(
+	SymbolLine(0 0 5 0 8)
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 40 5 40 8)
+)
+Symbol('\' 12)
+(
+	SymbolLine(0 5 30 35 8)
+)
+Symbol(']' 12)
+(
+	SymbolLine(0 0 5 0 8)
+	SymbolLine(5 0 5 40 8)
+	SymbolLine(0 40 5 40 8)
+)
+Symbol('^' 12)
+(
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 10 5 8)
+)
+Symbol('_' 12)
+(
+	SymbolLine(0 40 20 40 8)
+)
+Symbol('a' 12)
+(
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(20 20 20 35 8)
+	SymbolLine(20 35 25 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+)
+Symbol('b' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 25 20 35 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(0 25 5 20 8)
+)
+Symbol('c' 12)
+(
+	SymbolLine(5 20 20 20 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 20 40 8)
+)
+Symbol('d' 12)
+(
+	SymbolLine(20 0 20 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+)
+Symbol('e' 12)
+(
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(20 30 20 25 8)
+)
+Symbol('f' 10)
+(
+	SymbolLine(5 5 5 40 8)
+	SymbolLine(5 5 10 0 8)
+	SymbolLine(10 0 15 0 8)
+	SymbolLine(0 20 10 20 8)
+)
+Symbol('g' 12)
+(
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(0 50 5 55 8)
+	SymbolLine(5 55 15 55 8)
+	SymbolLine(15 55 20 50 8)
+	SymbolLine(20 20 20 50 8)
+)
+Symbol('h' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 20 40 8)
+)
+Symbol('i' 10)
+(
+	SymbolLine(0 10 0 11 10)
+	SymbolLine(0 25 0 40 8)
+)
+Symbol('j' 10)
+(
+	SymbolLine(5 10 5 11 10)
+	SymbolLine(5 25 5 50 8)
+	SymbolLine(0 55 5 50 8)
+)
+Symbol('k' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 25 15 40 8)
+	SymbolLine(0 25 10 15 8)
+)
+Symbol('l' 10)
+(
+	SymbolLine(0 0 0 35 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('m' 12)
+(
+	SymbolLine(5 25 5 40 8)
+	SymbolLine(5 25 10 20 8)
+	SymbolLine(10 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 20 40 8)
+	SymbolLine(20 25 25 20 8)
+	SymbolLine(25 20 30 20 8)
+	SymbolLine(30 20 35 25 8)
+	SymbolLine(35 25 35 40 8)
+	SymbolLine(0 20 5 25 8)
+)
+Symbol('n' 12)
+(
+	SymbolLine(5 25 5 40 8)
+	SymbolLine(5 25 10 20 8)
+	SymbolLine(10 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 20 40 8)
+	SymbolLine(0 20 5 25 8)
+)
+Symbol('o' 12)
+(
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('p' 12)
+(
+	SymbolLine(5 25 5 55 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(5 25 10 20 8)
+	SymbolLine(10 20 20 20 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(25 25 25 35 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(10 40 20 40 8)
+	SymbolLine(5 35 10 40 8)
+)
+Symbol('q' 12)
+(
+	SymbolLine(20 25 20 55 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(5 20 15 20 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(0 25 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+)
+Symbol('r' 12)
+(
+	SymbolLine(5 25 5 40 8)
+	SymbolLine(5 25 10 20 8)
+	SymbolLine(10 20 20 20 8)
+	SymbolLine(0 20 5 25 8)
+)
+Symbol('s' 12)
+(
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 20 20 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('t' 10)
+(
+	SymbolLine(5 0 5 35 8)
+	SymbolLine(5 35 10 40 8)
+	SymbolLine(0 15 10 15 8)
+)
+Symbol('u' 12)
+(
+	SymbolLine(0 20 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 20 20 35 8)
+)
+Symbol('v' 12)
+(
+	SymbolLine( 0 20 10 40 8)
+	SymbolLine(20 20 10 40 8)
+)
+Symbol('w' 12)
+(
+	SymbolLine(0 20 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 10 40 8)
+	SymbolLine(10 40 15 35 8)
+	SymbolLine(15 20 15 35 8)
+	SymbolLine(15 35 20 40 8)
+	SymbolLine(20 40 25 40 8)
+	SymbolLine(25 40 30 35 8)
+	SymbolLine(30 20 30 35 8)
+)
+Symbol('x' 12)
+(
+	SymbolLine(0 20 20 40 8)
+	SymbolLine(0 40 20 20 8)
+)
+Symbol('y' 12)
+(
+	SymbolLine(0 20 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(20 20 20 50 8)
+	SymbolLine(15 55 20 50 8)
+	SymbolLine(5 55 15 55 8)
+	SymbolLine(0 50 5 55 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+)
+Symbol('z' 12)
+(
+	SymbolLine(0 20 20 20 8)
+	SymbolLine(0 40 20 20 8)
+	SymbolLine(0 40 20 40 8)
+)
+Symbol('{' 12)
+(
+	SymbolLine(5 5 10 0 8)
+	SymbolLine(5 5 5 15 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(5 25 5 35 8)
+	SymbolLine(5 35 10 40 8)
+)
+Symbol('|' 12)
+(
+	SymbolLine(0 0 0 40 8)
+)
+Symbol('}' 12)
+(
+	SymbolLine(0 0 5 5 8)
+	SymbolLine(5 5 5 15 8)
+	SymbolLine(5 15 10 20 8)
+	SymbolLine(5 25 10 20 8)
+	SymbolLine(5 25 5 35 8)
+	SymbolLine(0 40 5 35 8)
+)
+Symbol('~' 12)
+(
+	SymbolLine(0 25 5 20 8)
+	SymbolLine(5 20 10 20 8)
+	SymbolLine(10 20 15 25 8)
+	SymbolLine(15 25 20 25 8)
+	SymbolLine(20 25 25 20 8)
+)
+Symbol('@' 12)
+( 
+	SymbolLine(0 0 0 30 8)
+	SymbolLine(0 30 10 40 8)
+	SymbolLine(10 40 40 40 8)
+	SymbolLine(50 25 50 0 8)
+	SymbolLine(50 0 40 -10 8)
+	SymbolLine(40 -10 10 -10 8)
+	SymbolLine(10 -10 0 0 8)
+	SymbolLine(15 10 15 20 8)
+	SymbolLine(15 20 20 25 8)
+	SymbolLine(20 25 30 25 8)
+	SymbolLine(30 25 35 20 8)
+	SymbolLine(35 20 40 25 8)
+	SymbolLine(35 20 35 5 8)
+	SymbolLine(35 10 30 5 8)
+	SymbolLine(20 5 30 5 8)
+	SymbolLine(20 5 15 10 8)
+	SymbolLine(40 25 50 25 8)
+)
Index: tags/2.0.1/src/dolists.h
===================================================================
--- tags/2.0.1/src/dolists.h	(nonexistent)
+++ tags/2.0.1/src/dolists.h	(revision 18980)
@@ -0,0 +1,6 @@
+#undef PCB_REGISTER_ACTIONS
+#undef PCB_REGISTER_ATTRIBUTES
+
+#define PCB_REGISTER_ACTIONS(a, cookie) {extern void PCB_HIDCONCAT(register_,a)();PCB_HIDCONCAT(register_,a)();}
+#define PCB_REGISTER_ATTRIBUTES(a, cookie) {extern void PCB_HIDCONCAT(register_,a)();PCB_HIDCONCAT(register_,a)();}
+
Index: tags/2.0.1/src/draw.c
===================================================================
--- tags/2.0.1/src/draw.c	(nonexistent)
+++ tags/2.0.1/src/draw.c	(revision 18980)
@@ -0,0 +1,1049 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2003, 2004 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "conf_core.h"
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "rotate.h"
+#include "rtree.h"
+#include "stub_draw.h"
+#include "layer_ui.h"
+#include "hid_inlines.h"
+
+#include "obj_pstk_draw.h"
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_text_draw.h"
+#include "obj_subc_parent.h"
+
+#undef NDEBUG
+#include <assert.h>
+
+#define	SMALL_SMALL_TEXT_SIZE	0
+#define	SMALL_TEXT_SIZE			1
+#define	NORMAL_TEXT_SIZE		2
+#define	LARGE_TEXT_SIZE			3
+#define	N_TEXT_SIZES			4
+
+pcb_output_t pcb_draw_out; /* global context used for drawing */
+
+pcb_box_t pcb_draw_invalidated = { COORD_MAX, COORD_MAX, -COORD_MAX, -COORD_MAX };
+
+int pcb_draw_doing_pinout = 0;
+pcb_bool pcb_draw_doing_assy = pcb_false;
+static vtp0_t delayed_labels, delayed_objs;
+pcb_bool delayed_labels_enabled = pcb_false;
+pcb_bool delayed_terms_enabled = pcb_false;
+
+static void DrawEverything(const pcb_box_t *);
+static void DrawLayerGroup(int, const pcb_box_t *, int);
+static void pcb_draw_obj_label(pcb_layergrp_id_t gid, pcb_any_obj_t *obj);
+static void pcb_draw_pstk_marks(const pcb_box_t *drawn_area);
+static void pcb_draw_pstk_labels(const pcb_box_t *drawn_area);
+static void pcb_draw_pstk_holes(pcb_layergrp_id_t group, const pcb_box_t *drawn_area, pcb_pstk_draw_hole_t holetype);
+
+/* In draw_ly_spec.c: */
+static void pcb_draw_paste(int side, const pcb_box_t *drawn_area);
+static void pcb_draw_mask(int side, const pcb_box_t *screen);
+static void pcb_draw_silk(unsigned long lyt_side, const pcb_box_t *drawn_area);
+static void pcb_draw_rats(const pcb_box_t *);
+static void pcb_draw_assembly(unsigned int lyt_side, const pcb_box_t *drawn_area);
+
+
+void pcb_draw_delay_label_add(pcb_any_obj_t *obj)
+{
+	if (delayed_labels_enabled)
+		vtp0_append(&delayed_labels, obj);
+}
+
+void pcb_draw_delay_obj_add(pcb_any_obj_t *obj)
+{
+	vtp0_append(&delayed_objs, obj);
+}
+
+
+#warning cleanup TODO: this should be cached
+void pcb_lighten_color(const char *orig, char buf[8], double factor)
+{
+	unsigned int r, g, b;
+
+	if (orig[0] == '#') {
+		sscanf(&orig[1], "%2x%2x%2x", &r, &g, &b);
+		r = MIN(255, r * factor);
+		g = MIN(255, g * factor);
+		b = MIN(255, b * factor);
+	}
+	else {
+		r = 0xff;
+		g = 0xff;
+		b = 0xff;
+	}
+	pcb_snprintf(buf, sizeof("#XXXXXX"), "#%02x%02x%02x", r, g, b);
+}
+
+void pcb_draw_dashed_line(pcb_hid_gc_t GC, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, unsigned int segs, pcb_bool_t cheap)
+{
+/* TODO: we need a real geo lib... using double here is plain wrong */
+	double dx = x2-x1, dy = y2-y1;
+	double len_mnt = PCB_ABS(dx) + PCB_ABS(dy);
+	int n;
+	pcb_coord_t minlen = pcb_gui->coord_per_pix * 8;
+
+	if (len_mnt < minlen*2) {
+		/* line too short, just draw it */
+		pcb_gui->draw_line(GC, x1, y1, x2, y2);
+		return;
+	}
+
+	segs = (segs << 1) + 1; /* must be odd */
+
+	if (cheap) {
+		if ((segs > 3) && (len_mnt < minlen * segs))
+			segs = 3;
+		else if ((segs > 5) && (len_mnt < minlen * 2 * segs))
+			segs = 5;
+	}
+
+	/* first seg is drawn from x1, y1 with no rounding error due to n-1 == 0 */
+	for(n = 1; n < segs; n+=2)
+		pcb_gui->draw_line(GC,
+			x1 + (dx * (double)(n-1) / (double)segs), y1 + (dy * (double)(n-1) / (double)segs),
+			x1 + (dx * (double)n / (double)segs), y1 + (dy * (double)n / (double)segs));
+
+
+	/* make sure the last segment is drawn properly to x2 and y2, don't leave
+	   room for rounding errors */
+	pcb_gui->draw_line(GC,
+		x2 - (dx / (double)segs), y2 - (dy / (double)segs),
+		x2, y2);
+}
+
+
+/*
+ * initiate the actual redrawing of the updated area
+ */
+pcb_cardinal_t pcb_draw_inhibit = 0;
+void pcb_draw(void)
+{
+	if (pcb_draw_inhibit)
+		return;
+	if (pcb_draw_invalidated.X1 <= pcb_draw_invalidated.X2 && pcb_draw_invalidated.Y1 <= pcb_draw_invalidated.Y2)
+		pcb_gui->invalidate_lr(pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2);
+
+	/* shrink the update block */
+	pcb_draw_invalidated.X1 = pcb_draw_invalidated.Y1 = COORD_MAX;
+	pcb_draw_invalidated.X2 = pcb_draw_invalidated.Y2 = -COORD_MAX;
+}
+
+/* ----------------------------------------------------------------------
+ * redraws all the data by the event handlers
+ */
+void pcb_redraw(void)
+{
+	pcb_gui->invalidate_all();
+}
+
+static void DrawEverything_holes(pcb_layergrp_id_t gid, const pcb_box_t *drawn_area)
+{
+	int plated, unplated;
+	pcb_board_count_holes(PCB, &plated, &unplated, drawn_area);
+
+	if (plated && pcb_layer_gui_set_vlayer(PCB, PCB_VLY_PLATED_DRILL, 0)) {
+		pcb_draw_pstk_holes(gid, drawn_area, PCB_PHOLE_PLATED);
+		pcb_gui->end_layer();
+	}
+
+	if (unplated && pcb_layer_gui_set_vlayer(PCB, PCB_VLY_UNPLATED_DRILL, 0)) {
+		pcb_draw_pstk_holes(gid, drawn_area, PCB_PHOLE_UNPLATED);
+		pcb_gui->end_layer();
+	}
+}
+
+static void draw_virtual_layers(const pcb_box_t *drawn_area)
+{
+	pcb_hid_expose_ctx_t hid_exp;
+
+	hid_exp.view = *drawn_area;
+	hid_exp.force = 0;
+
+	if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_TOP_ASSY, 0)) {
+		pcb_draw_assembly(PCB_LYT_TOP, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_BOTTOM_ASSY, 0)) {
+		pcb_draw_assembly(PCB_LYT_BOTTOM, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_FAB, 0)) {
+		pcb_stub_draw_fab(pcb_draw_out.fgGC, &hid_exp);
+		pcb_gui->end_layer();
+	}
+
+	if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_CSECT, 0)) {
+		pcb_stub_draw_csect(pcb_draw_out.fgGC, &hid_exp);
+		pcb_gui->end_layer();
+	}
+}
+
+static void draw_ui_layers(const pcb_box_t *drawn_area)
+{
+	int i;
+	pcb_layer_t *first, *ly;
+
+	/* find the first ui layer in use */
+	first = NULL;
+	for(i = 0; i < vtp0_len(&pcb_uilayers); i++) {
+		if (pcb_uilayers.array[i] != NULL) {
+			first = pcb_uilayers.array[i];
+			break;
+		}
+	}
+
+	/* if there's any UI layer, try to draw them */
+	if ((first != NULL) && pcb_layer_gui_set_g_ui(first, 0)) {
+		int have_canvas = 0;
+		for(i = 0; i < vtp0_len(&pcb_uilayers); i++) {
+			ly = pcb_uilayers.array[i];
+			if ((ly != NULL) && (ly->meta.real.vis)) {
+				if (!have_canvas) {
+					pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+					pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+					have_canvas = 1;
+				}
+				pcb_draw_layer(ly, drawn_area);
+			}
+		}
+		if (have_canvas)
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+		pcb_gui->end_layer();
+	}
+}
+
+/* Draw subc and padstack marks in xor mode */
+static void draw_xor_marks(const pcb_box_t *drawn_area)
+{
+	int per_side = conf_core.appearance.subc_layer_per_side;
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE_XOR, pcb_draw_out.direct, drawn_area);
+
+	pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 1);
+
+	if (PCB->SubcOn)
+		pcb_r_search(PCB->Data->subc_tree, drawn_area, NULL, draw_subc_mark_callback, &per_side, NULL);
+
+	if ((PCB->padstack_mark_on) && (conf_core.appearance.padstack.cross_thick > 0)) {
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
+		pcb_draw_pstk_marks(drawn_area);
+	}
+
+	pcb_hid_set_draw_xor(pcb_draw_out.fgGC, 0);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+}
+
+static void draw_rats(const pcb_box_t *drawn_area)
+{
+	if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_RATS, 0)) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+		pcb_draw_rats(drawn_area);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+		pcb_gui->end_layer();
+	}
+}
+
+static void draw_pins_and_pads(const pcb_box_t *drawn_area, pcb_layergrp_id_t component, pcb_layergrp_id_t solder)
+{
+	int per_side = conf_core.appearance.subc_layer_per_side;
+
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+
+	/* Draw pins' and pads' names */
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+	pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+	if (PCB->SubcOn)
+		pcb_r_search(PCB->Data->subc_tree, drawn_area, NULL, draw_subc_label_callback, &per_side, NULL);
+	if (PCB->padstack_mark_on) {
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, -conf_core.appearance.padstack.cross_thick);
+		pcb_draw_pstk_labels(drawn_area);
+	}
+	pcb_draw_pstk_names(conf_core.editor.show_solder_side ? solder : component, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+}
+
+
+static void DrawEverything(const pcb_box_t *drawn_area)
+{
+	char *old_silk_color;
+	int i, ngroups, slk_len;
+	pcb_layergrp_id_t component, solder, slk[16], gid, side_copper_grp;
+	/* This is the list of layer groups we will draw.  */
+	char do_group[PCB_MAX_LAYERGRP];
+	/* This is the reverse of the order in which we draw them.  */
+	pcb_layergrp_id_t drawn_groups[PCB_MAX_LAYERGRP];
+	pcb_bool paste_empty;
+
+	old_silk_color = PCB->Data->BACKSILKLAYER.meta.real.color;
+	PCB->Data->BACKSILKLAYER.meta.real.color = conf_core.appearance.color.invisible_objects;
+
+	pcb_gui->render_burst(PCB_HID_BURST_START, drawn_area);
+
+	memset(do_group, 0, sizeof(do_group));
+	for (ngroups = 0, i = 0; i < pcb_max_layer; i++) {
+		pcb_layer_t *l = LAYER_ON_STACK(i);
+		pcb_layergrp_id_t group = pcb_layer_get_group(PCB, pcb_layer_stack[i]);
+		unsigned int gflg = pcb_layergrp_flags(PCB, group);
+
+		if ((gflg & PCB_LYT_SILK) || (gflg & PCB_LYT_MASK) || (gflg & PCB_LYT_PASTE)) /* do not draw silk, mask and paste here, they'll be drawn separately */
+			continue;
+
+		if (l->meta.real.vis && !do_group[group]) {
+			do_group[group] = 1;
+			drawn_groups[ngroups++] = group;
+		}
+	}
+
+	solder = component = -1;
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder, 1);
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &component, 1);
+	side_copper_grp = conf_core.editor.show_solder_side ? solder : component;
+
+
+	/*
+	 * first draw all 'invisible' stuff
+	 */
+	if (!conf_core.editor.check_planes && pcb_layer_gui_set_vlayer(PCB, PCB_VLY_INVISIBLE, 0)) {
+		pcb_draw_silk(PCB_LYT_INVISIBLE_SIDE(), drawn_area);
+
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+
+		pcb_gui->end_layer();
+	}
+
+	/* draw all layers in layerstack order */
+	for (i = ngroups - 1; i >= 0; i--) {
+		pcb_layergrp_id_t group = drawn_groups[i];
+
+		if (pcb_layer_gui_set_glayer(PCB, group, 0)) {
+			int is_current = 0;
+			pcb_layergrp_id_t cgrp = CURRENT->meta.real.grp;
+
+			if ((cgrp == solder) || (cgrp == component)) {
+				/* current group is top or bottom: visibility depends on side we are looking at */
+				if (group == side_copper_grp)
+					is_current = 1;
+			}
+			else {
+				/* internal layer displayed on top: current group is solid, others are "invisible" */
+				if (group == cgrp)
+					is_current = 1;
+			}
+
+			DrawLayerGroup(group, drawn_area, is_current);
+			pcb_gui->end_layer();
+		}
+	}
+
+	if (conf_core.editor.check_planes && pcb_gui->gui)
+		goto finish;
+
+	/* Draw padstacks below silk */
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+	if (pcb_gui->gui)
+		pcb_draw_ppv(conf_core.editor.show_solder_side ? solder : component, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+
+	/* Draw the solder mask if turned on */
+	gid = pcb_layergrp_get_top_mask();
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0))) {
+		pcb_draw_mask(PCB_COMPONENT_SIDE, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	gid = pcb_layergrp_get_bottom_mask();
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0))) {
+		pcb_draw_mask(PCB_SOLDER_SIDE, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	/* Draw silks */
+	slk_len = pcb_layergrp_list(PCB, PCB_LYT_SILK, slk, sizeof(slk) / sizeof(slk[0]));
+	for(i = 0; i < slk_len; i++) {
+		if (pcb_layer_gui_set_glayer(PCB, slk[i], 0)) {
+			unsigned int loc = pcb_layergrp_flags(PCB, slk[i]);
+			pcb_draw_silk(loc & PCB_LYT_ANYWHERE, drawn_area);
+			pcb_gui->end_layer();
+		}
+	}
+
+	{ /* holes_after: draw holes after copper, silk and mask, to make sure it punches through everything. */
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area); 
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+		DrawEverything_holes(side_copper_grp, drawn_area);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+	}
+
+	gid = pcb_layergrp_get_top_paste();
+	if (gid >= 0)
+		paste_empty = pcb_layergrp_is_empty(PCB, gid);
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty))) {
+		pcb_draw_paste(PCB_COMPONENT_SIDE, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	gid = pcb_layergrp_get_bottom_paste();
+	if (gid >= 0)
+		paste_empty = pcb_layergrp_is_empty(PCB, gid);
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty))) {
+		pcb_draw_paste(PCB_SOLDER_SIDE, drawn_area);
+		pcb_gui->end_layer();
+	}
+
+	draw_virtual_layers(drawn_area);
+	if (pcb_gui->gui) {
+		draw_rats(drawn_area);
+		draw_pins_and_pads(drawn_area, component, solder);
+	}
+	draw_ui_layers(drawn_area);
+
+	if (pcb_gui->gui)
+		draw_xor_marks(drawn_area);
+
+	finish:;
+	pcb_gui->render_burst(PCB_HID_BURST_END, drawn_area);
+	PCB->Data->BACKSILKLAYER.meta.real.color = old_silk_color;
+}
+
+static void pcb_draw_pstks(pcb_layergrp_id_t group, const pcb_box_t *drawn_area, int is_current, pcb_layer_combining_t comb)
+{
+	pcb_layergrp_t *g = PCB->LayerGroups.grp + group;
+	pcb_pstk_draw_t ctx;
+	ctx.pcb = PCB;
+	ctx.gid = group;
+	ctx.is_current = is_current;
+	ctx.comb = comb;
+	if (g->len > 0)
+		ctx.layer1 = pcb_get_layer(PCB->Data, g->lid[0]);
+	else
+		ctx.layer1 = NULL;
+	pcb_r_search(PCB->Data->padstack_tree, drawn_area, NULL, pcb_pstk_draw_callback, &ctx, NULL);
+}
+
+static void pcb_draw_pstk_marks(const pcb_box_t *drawn_area)
+{
+	pcb_pstk_draw_t ctx;
+	ctx.pcb = PCB;
+	pcb_r_search(PCB->Data->padstack_tree, drawn_area, NULL, pcb_pstk_draw_mark_callback, &ctx, NULL);
+}
+
+static void pcb_draw_pstk_labels(const pcb_box_t *drawn_area)
+{
+	pcb_pstk_draw_t ctx;
+	ctx.pcb = PCB;
+	pcb_r_search(PCB->Data->padstack_tree, drawn_area, NULL, pcb_pstk_draw_label_callback, &ctx, NULL);
+}
+
+static void pcb_draw_pstk_holes(pcb_layergrp_id_t group, const pcb_box_t *drawn_area, pcb_pstk_draw_hole_t holetype)
+{
+	pcb_pstk_draw_t ctx;
+
+	if (!PCB->hole_on)
+		return;
+
+	ctx.pcb = PCB;
+	ctx.gid = group;
+	ctx.holetype = holetype;
+	pcb_r_search(PCB->Data->padstack_tree, drawn_area, NULL, pcb_pstk_draw_hole_callback, &ctx, NULL);
+}
+
+/* ---------------------------------------------------------------------------
+ * Draws padstacks - Always draws for non-gui HIDs,
+ * otherwise drawing depends on PCB->pstk_on
+ */
+void pcb_draw_ppv(pcb_layergrp_id_t group, const pcb_box_t * drawn_area)
+{
+	/* draw padstack holes - copper is drawn with each group */
+	if (PCB->pstk_on || !pcb_gui->gui) {
+		pcb_draw_pstk_holes(group, drawn_area, PCB_PHOLE_PLATED | PCB_PHOLE_UNPLATED | PCB_PHOLE_BB);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * Draws padstacks' names - Always draws for non-gui HIDs,
+ * otherwise drawing depends on PCB->pstk_on
+ */
+void pcb_draw_pstk_names(pcb_layergrp_id_t group, const pcb_box_t *drawn_area)
+{
+	if (PCB->pstk_on || !pcb_gui->gui) {
+		size_t n;
+		for(n = 0; n < delayed_labels.used; n++)
+			pcb_draw_obj_label(group, delayed_labels.array[n]);
+	}
+	delayed_labels.used = 0;
+}
+
+static void pcb_draw_delayed_objs(pcb_draw_info_t *info)
+{
+	size_t n;
+
+	for(n = 0; n < delayed_objs.used; n++) {
+		pcb_any_obj_t *o = delayed_objs.array[n];
+		pcb_box_t *b = (pcb_box_t *)o;
+		switch(o->type) {
+			case PCB_OBJ_ARC:  pcb_arc_draw_term_callback(b, info->layer); break;
+			case PCB_OBJ_LINE: pcb_line_draw_term_callback(b, info->layer); break;
+			case PCB_OBJ_TEXT: pcb_text_draw_term_callback(b, info->layer); break;
+			case PCB_OBJ_POLY: pcb_poly_draw_term_callback(b, info); break;
+			default:
+				assert(!"Don't know how to draw delayed object");
+		}
+	}
+	vtp0_truncate(&delayed_objs, 0);
+}
+
+#include "draw_composite.c"
+#include "draw_ly_spec.c"
+
+void pcb_draw_layer(pcb_layer_t *Layer, const pcb_box_t * screen)
+{
+	pcb_draw_info_t info;
+	pcb_box_t scr2;
+	unsigned int lflg = 0;
+	int may_have_delayed = 0;
+
+	if ((screen->X2 <= screen->X1) || (screen->Y2 <= screen->Y1)) {
+		scr2 = *screen;
+		screen = &scr2;
+		if (scr2.X2 <= scr2.X1)
+			scr2.X2 = scr2.X1+1;
+		if (scr2.Y2 <= scr2.Y1)
+			scr2.Y2 = scr2.Y1+1;
+	}
+
+	info.drawn_area = screen;
+	info.layer = Layer;
+
+	lflg = pcb_layer_flags_(Layer);
+	if (PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))
+		pcb_draw_out.active_padGC = pcb_draw_out.padGC;
+	else
+		pcb_draw_out.active_padGC = pcb_draw_out.backpadGC;
+
+		/* print the non-clearing polys */
+	if (lflg & PCB_LYT_COPPER) {
+		delayed_terms_enabled = pcb_true;
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, 1);
+		pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_square);
+		pcb_r_search(Layer->polygon_tree, screen, NULL, pcb_poly_draw_term_callback, &info, NULL);
+		delayed_terms_enabled = pcb_false;
+		may_have_delayed = 1;
+	}
+	else {
+		pcb_r_search(Layer->polygon_tree, screen, NULL, pcb_poly_draw_callback, &info, NULL);
+	}
+
+	if (conf_core.editor.check_planes)
+		goto out;
+
+	/* draw all visible layer objects (with terminal gfx on copper) */
+	if (lflg & PCB_LYT_COPPER) {
+		delayed_terms_enabled = pcb_true;
+		pcb_r_search(Layer->line_tree, screen, NULL, pcb_line_draw_term_callback, Layer, NULL);
+		pcb_r_search(Layer->arc_tree, screen, NULL, pcb_arc_draw_term_callback, Layer, NULL);
+		pcb_r_search(Layer->text_tree, screen, NULL, pcb_text_draw_term_callback, Layer, NULL);
+		delayed_terms_enabled = pcb_false;
+		may_have_delayed = 1;
+	}
+	else {
+		pcb_r_search(Layer->line_tree, screen, NULL, pcb_line_draw_callback, Layer, NULL);
+		pcb_r_search(Layer->arc_tree, screen, NULL, pcb_arc_draw_callback, Layer, NULL);
+		pcb_r_search(Layer->text_tree, screen, NULL, pcb_text_draw_callback, Layer, NULL);
+	}
+
+	/* The implicit outline rectangle (or automatic outline rectanlge).
+	   We should check for pcb_gui->gui here, but it's kinda cool seeing the
+	   auto-outline magically disappear when you first add something to
+	   the outline layer.  */
+	if ((lflg & PCB_LYT_OUTLINE) && pcb_layer_is_empty_(PCB, Layer)) {
+		pcb_gui->set_color(pcb_draw_out.fgGC, Layer->meta.real.color);
+		pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid);
+		pcb_gui->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->MaxWidth, PCB->MaxHeight);
+	}
+
+	if (may_have_delayed)
+		pcb_draw_delayed_objs(&info);
+
+	out:;
+		pcb_draw_out.active_padGC = NULL;
+}
+
+/* This version is about 1% slower and used rarely, thus it's all dupped
+   from pcb_draw_layer() to keep the original speed there */
+void pcb_draw_layer_under(pcb_layer_t *Layer, const pcb_box_t *screen, pcb_data_t *data)
+{
+	pcb_draw_info_t info;
+	pcb_box_t scr2;
+	unsigned int lflg = 0;
+	pcb_rtree_it_t it;
+	pcb_any_obj_t *o;
+
+	if ((screen->X2 <= screen->X1) || (screen->Y2 <= screen->Y1)) {
+		scr2 = *screen;
+		screen = &scr2;
+		if (scr2.X2 <= scr2.X1)
+			scr2.X2 = scr2.X1+1;
+		if (scr2.Y2 <= scr2.Y1)
+			scr2.Y2 = scr2.Y1+1;
+	}
+
+	info.drawn_area = screen;
+	info.layer = Layer;
+
+	lflg = pcb_layer_flags_(Layer);
+	if (PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))
+		pcb_draw_out.active_padGC = pcb_draw_out.padGC;
+	else
+		pcb_draw_out.active_padGC = pcb_draw_out.backpadGC;
+
+		/* print the non-clearing polys */
+	if (Layer->polygon_tree != NULL) {
+		if (lflg & PCB_LYT_COPPER) {
+			for(o = pcb_rtree_first(&it, Layer->polygon_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_poly_draw_term_callback((pcb_box_t *)o, &info);
+		}
+		else {
+			for(o = pcb_rtree_first(&it, Layer->polygon_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_poly_draw_callback((pcb_box_t *)o, &info);
+		}
+	}
+
+	if (conf_core.editor.check_planes)
+		goto out;
+
+	/* draw all visible layer objects (with terminal gfx on copper) */
+	if (lflg & PCB_LYT_COPPER) {
+		if (Layer->line_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->line_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_line_draw_term_callback((pcb_box_t *)o, Layer);
+		if (Layer->arc_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->arc_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_arc_draw_term_callback((pcb_box_t *)o, Layer);
+		if (Layer->text_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->text_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_text_draw_term_callback((pcb_box_t *)o, Layer);
+	}
+	else {
+		if (Layer->line_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->line_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_line_draw_callback((pcb_box_t *)o, Layer);
+		if (Layer->arc_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->arc_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_arc_draw_callback((pcb_box_t *)o, Layer);
+		if (Layer->text_tree != NULL)
+			for(o = pcb_rtree_first(&it, Layer->text_tree, (pcb_rtree_box_t *)screen); o != NULL; o = pcb_rtree_next(&it))
+				if (pcb_obj_is_under(o, data))
+					pcb_text_draw_callback((pcb_box_t *)o, Layer);
+	}
+
+	out:;
+		pcb_draw_out.active_padGC = NULL;
+}
+
+/* ---------------------------------------------------------------------------
+ * draws one layer group.  If the exporter is not a GUI,
+ * also draws the padstacks in this layer group.
+ */
+static void DrawLayerGroup(int group, const pcb_box_t *drawn_area, int is_current)
+{
+	int i, rv = 1;
+	pcb_layer_id_t layernum;
+	pcb_layer_t *Layer;
+	pcb_cardinal_t n_entries = PCB->LayerGroups.grp[group].len;
+	pcb_layer_id_t *layers = PCB->LayerGroups.grp[group].lid;
+	unsigned int gflg = pcb_layergrp_flags(PCB, group);
+
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+
+	if (gflg & PCB_LYT_OUTLINE)
+		rv = 0;
+
+	for (i = n_entries - 1; i >= 0; i--) {
+		layernum = layers[i];
+		Layer = PCB->Data->Layer + layernum;
+		if (!(gflg & PCB_LYT_SILK) && Layer->meta.real.vis)
+			pcb_draw_layer(Layer, drawn_area);
+	}
+	if (n_entries > 1)
+		rv = 1;
+
+	if ((gflg & PCB_LYT_COPPER) && (PCB->pstk_on))
+		pcb_draw_pstks(group, drawn_area, (CURRENT->meta.real.grp == group), 0);
+
+	/* this draws the holes - must be the last, so holes are drawn over everything else */
+	if (rv && !pcb_gui->gui)
+		pcb_draw_ppv(group, drawn_area);
+
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+}
+
+void pcb_erase_obj(int type, void *lptr, void *ptr)
+{
+	if (pcb_hidden_floater((pcb_any_obj_t *)ptr))
+		return;
+
+	switch (type) {
+	case PCB_OBJ_PSTK:
+		pcb_pstk_invalidate_erase((pcb_pstk_t *) ptr);
+		break;
+
+	case PCB_OBJ_TEXT:
+		pcb_text_invalidate_erase((pcb_layer_t *) lptr, (pcb_text_t *) ptr);
+		break;
+	case PCB_OBJ_POLY:
+		pcb_poly_invalidate_erase((pcb_poly_t *) ptr);
+		break;
+	case PCB_OBJ_SUBC:
+		EraseSubc((pcb_subc_t *)ptr);
+		break;
+	case PCB_OBJ_LINE:
+	case PCB_OBJ_RAT:
+		pcb_line_invalidate_erase((pcb_line_t *) ptr);
+		break;
+	case PCB_OBJ_ARC:
+		pcb_arc_invalidate_erase((pcb_arc_t *) ptr);
+		break;
+	default:
+		pcb_message(PCB_MSG_ERROR, "hace: Internal ERROR, trying to erase an unknown type\n");
+	}
+}
+
+
+void pcb_draw_obj(pcb_any_obj_t *obj)
+{
+	if (pcb_hidden_floater(obj))
+		return;
+
+	switch (obj->type) {
+	case PCB_OBJ_PSTK:
+		if (PCB->pstk_on)
+			pcb_pstk_invalidate_draw((pcb_pstk_t *)obj);
+		break;
+	case PCB_OBJ_LINE:
+		if (obj->parent.layer->meta.real.vis)
+			pcb_line_invalidate_draw(obj->parent.layer, (pcb_line_t *)obj);
+		break;
+	case PCB_OBJ_ARC:
+		if (obj->parent.layer->meta.real.vis)
+			pcb_arc_invalidate_draw(obj->parent.layer, (pcb_arc_t *)obj);
+		break;
+	case PCB_OBJ_TEXT:
+		if (obj->parent.layer->meta.real.vis)
+			pcb_text_invalidate_draw(obj->parent.layer, (pcb_text_t *)obj);
+		break;
+	case PCB_OBJ_POLY:
+		if (obj->parent.layer->meta.real.vis)
+			pcb_poly_invalidate_draw(obj->parent.layer, (pcb_poly_t *)obj);
+		break;
+	case PCB_OBJ_RAT:
+		if (PCB->RatOn)
+			pcb_rat_invalidate_draw((pcb_rat_t *)obj);
+		break;
+	case PCB_OBJ_SUBC:
+	case PCB_OBJ_NET:
+	case PCB_OBJ_LAYER:
+	case PCB_OBJ_LAYERGRP:
+	case PCB_OBJ_VOID:
+		break;
+	}
+}
+
+static void pcb_draw_obj_label(pcb_layergrp_id_t gid, pcb_any_obj_t *obj)
+{
+	if (pcb_hidden_floater(obj))
+		return;
+
+	/* do not show layer-object labels of the other side on non-pinout views */
+	if ((!pcb_draw_doing_pinout) && (obj->parent_type == PCB_PARENT_LAYER)) {
+		pcb_layer_t *ly = pcb_layer_get_real(obj->parent.layer);
+		if ((ly != NULL) && (ly->meta.real.grp != gid))
+			return;
+	}
+
+	switch(obj->type) {
+		case PCB_OBJ_LINE:    pcb_line_draw_label((pcb_line_t *)obj); return;
+		case PCB_OBJ_ARC:     pcb_arc_draw_label((pcb_arc_t *)obj); return;
+		case PCB_OBJ_POLY:    pcb_poly_draw_label((pcb_poly_t *)obj); return;
+		case PCB_OBJ_TEXT:    pcb_text_draw_label((pcb_text_t *)obj); return;
+		case PCB_OBJ_PSTK:    pcb_pstk_draw_label((pcb_pstk_t *)obj); return;
+		default: break;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * HID drawing callback.
+ */
+
+static pcb_hid_t *expose_begin(pcb_hid_t *hid)
+{
+	pcb_hid_t *old_gui = pcb_gui;
+
+	delayed_labels_enabled = pcb_true;
+	vtp0_truncate(&delayed_labels, 0);
+	vtp0_truncate(&delayed_objs, 0);
+
+	pcb_gui = hid;
+	pcb_draw_out.fgGC = pcb_hid_make_gc();
+	pcb_draw_out.padGC = pcb_hid_make_gc();
+	pcb_draw_out.backpadGC = pcb_hid_make_gc();
+	pcb_draw_out.padselGC = pcb_hid_make_gc();
+	pcb_draw_out.drillGC = pcb_hid_make_gc();
+	pcb_draw_out.pmGC = pcb_hid_make_gc();
+
+	if (hid->force_compositing)
+		pcb_draw_out.direct = 0;
+	else
+		pcb_draw_out.direct = 1;
+
+	hid->set_color(pcb_draw_out.pmGC, "#00FFFF");
+	hid->set_color(pcb_draw_out.drillGC, "drill");
+	hid->set_color(pcb_draw_out.padGC, conf_core.appearance.color.pin);
+	hid->set_color(pcb_draw_out.backpadGC, conf_core.appearance.color.invisible_objects);
+	hid->set_color(pcb_draw_out.padselGC, conf_core.appearance.color.selected);
+	pcb_hid_set_line_width(pcb_draw_out.backpadGC, -1);
+	pcb_hid_set_line_cap(pcb_draw_out.backpadGC, pcb_cap_square);
+	pcb_hid_set_line_width(pcb_draw_out.padselGC, -1);
+	pcb_hid_set_line_cap(pcb_draw_out.padselGC, pcb_cap_square);
+	pcb_hid_set_line_width(pcb_draw_out.padGC, -1);
+	pcb_hid_set_line_cap(pcb_draw_out.padGC, pcb_cap_square);
+
+	return old_gui;
+}
+
+static void expose_end(pcb_hid_t *old_gui)
+{
+	pcb_hid_destroy_gc(pcb_draw_out.fgGC);
+	pcb_hid_destroy_gc(pcb_draw_out.padGC);
+	pcb_hid_destroy_gc(pcb_draw_out.backpadGC);
+	pcb_hid_destroy_gc(pcb_draw_out.padselGC);
+	pcb_hid_destroy_gc(pcb_draw_out.drillGC);
+	pcb_hid_destroy_gc(pcb_draw_out.pmGC);
+	pcb_gui = old_gui;
+
+	pcb_draw_out.fgGC = NULL;
+
+	delayed_labels_enabled = pcb_false;
+	vtp0_truncate(&delayed_labels, 0);
+	vtp0_truncate(&delayed_objs, 0);
+}
+
+void pcb_hid_expose_all(pcb_hid_t * hid, const pcb_hid_expose_ctx_t *ctx)
+{
+	if (!pcb_draw_inhibit) {
+		pcb_hid_t *old_gui = expose_begin(hid);
+		DrawEverything(&ctx->view);
+		expose_end(old_gui);
+	}
+}
+
+void pcb_hid_expose_pinout(pcb_hid_t * hid, const pcb_hid_expose_ctx_t *ctx)
+{
+	pcb_hid_t *old_gui = expose_begin(hid);
+	int fx, fy, fs;
+
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, &ctx->view);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, &ctx->view);
+
+	fx = conf_core.editor.view.flip_x;
+	fy = conf_core.editor.view.flip_y;
+	fs = conf_core.editor.show_solder_side;
+
+	conf_force_set_bool(conf_core.editor.view.flip_x, 0);
+	conf_force_set_bool(conf_core.editor.view.flip_y, 0);
+	conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+	if (ctx->content.obj != NULL) {
+		pcb_draw_doing_pinout = pcb_true;
+		switch(ctx->content.obj->type) {
+			case PCB_OBJ_SUBC:    pcb_subc_draw_preview((pcb_subc_t *)ctx->content.obj, &ctx->view); break;
+			default:              pcb_message(PCB_MSG_ERROR, "pcb_hid_expose_pinout: unknown object type %x\n", ctx->content.obj->type);
+		}
+		pcb_draw_doing_pinout = pcb_false;
+	}
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, &ctx->view);
+
+	conf_force_set_bool(conf_core.editor.view.flip_x, fx);
+	conf_force_set_bool(conf_core.editor.view.flip_y, fy);
+	conf_force_set_bool(conf_core.editor.show_solder_side, fs);
+
+	expose_end(old_gui);
+}
+
+void pcb_hid_expose_layer(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *e)
+{
+	pcb_hid_t *old_gui = expose_begin(hid);
+	unsigned long lflg = pcb_layer_flags(PCB, e->content.layer_id);
+	int fx, fy;
+
+	if (lflg & PCB_LYT_LOGICAL) {
+		fx = conf_core.editor.view.flip_x;
+		fy = conf_core.editor.view.flip_y;
+		conf_force_set_bool(conf_core.editor.view.flip_x, 0);
+		conf_force_set_bool(conf_core.editor.view.flip_y, 0);
+	}
+
+	if (lflg & PCB_LYT_CSECT) {
+		if ((pcb_layer_gui_set_vlayer(PCB, PCB_VLY_CSECT, 0)) || (e->force)) {
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, &e->view);
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, &e->view);
+			pcb_stub_draw_csect(pcb_draw_out.fgGC, e);
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, &e->view);
+			pcb_gui->end_layer();
+		}
+	}
+	else if (lflg & PCB_LYT_DIALOG) {
+		if ((pcb_layer_gui_set_vlayer(PCB, PCB_VLY_DIALOG, 0)) || (e->force)) {
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, &e->view);
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, &e->view);
+			e->dialog_draw(pcb_draw_out.fgGC, e);
+			pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, &e->view);
+			pcb_gui->end_layer();
+		}
+	}
+	else if ((e->content.layer_id >= 0) && (e->content.layer_id < pcb_max_layer)) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, &e->view);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, &e->view);
+		pcb_draw_layer(&(PCB->Data->Layer[e->content.layer_id]), &e->view);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, &e->view);
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Internal error: don't know how to draw layer %ld for preview; please report this bug.\n", e->content.layer_id);
+
+	expose_end(old_gui);
+
+	if (lflg & PCB_LYT_LOGICAL) {
+		conf_force_set_bool(conf_core.editor.view.flip_x, fx);
+		conf_force_set_bool(conf_core.editor.view.flip_y, fy);
+	}
+}
+
+static const char *lab_with_intconn(int intconn, const char *lab, char *buff, int bufflen)
+{
+	if (intconn <= 0)
+		return lab;
+	pcb_snprintf(buff, bufflen, "%s[%d]", lab, intconn);
+	return buff;
+}
+
+/* vert flip magic: make sure the offset is in-line with the flip and our sick y coords for vertical */
+#define PCB_TERM_LABEL_SETUP \
+	const unsigned char *label; \
+	char buff[128]; \
+	pcb_bool flip_x = conf_core.editor.view.flip_x; \
+	pcb_bool flip_y = conf_core.editor.view.flip_y; \
+	pcb_font_t *font = pcb_font(PCB, 0, 0); \
+	pcb_coord_t w, h, dx, dy; \
+	label = (const unsigned char *)lab_with_intconn(intconn, lab, buff, sizeof(buff)); \
+	if (vert) { \
+		h = pcb_text_width(font, scale, label); \
+		w = pcb_text_height(font, scale, label); \
+	} \
+	else { \
+		w = pcb_text_width(font, scale, label); \
+		h = pcb_text_height(font, scale, label); \
+	} \
+	dx = w / 2; \
+	dy = h / 2; \
+	if (flip_x) \
+		dx = -dx; \
+	if (flip_y) \
+		dy = -dy; \
+	if (vert) \
+		dy = -dy; \
+	if (centered) { \
+		x -= dx; \
+		y -= dy; \
+	}
+
+
+void pcb_term_label_draw(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
+{
+	int mirror, direction;
+	PCB_TERM_LABEL_SETUP;
+
+	mirror = (flip_x ^ flip_y);
+	direction = (vert ? 1 : 0) + (flip_x ? 2 : 0);
+
+	pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.pin_name);
+
+	if (pcb_gui->gui)
+		pcb_draw_doing_pinout++;
+	pcb_text_draw_string(font, label, x, y, scale, direction, mirror, 1, 0, 0, 0, PCB_TXT_TINY_HIDE);
+	if (pcb_gui->gui)
+		pcb_draw_doing_pinout--;
+}
+
+void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
+{
+	pcb_coord_t ox = x, oy = y, margin = 0;
+	pcb_box_t b;
+	PCB_TERM_LABEL_SETUP;
+
+	dx = PCB_ABS(dx);
+	dy = PCB_ABS(dy);
+	b.X1 = ox - dx - margin;
+	b.X2 = ox + dx + margin;
+	b.Y1 = oy - dy - margin;
+	b.Y2 = oy + dy + margin;
+
+	pcb_draw_invalidate(&b);
+}
+
Index: tags/2.0.1/src/draw.h
===================================================================
--- tags/2.0.1/src/draw.h	(nonexistent)
+++ tags/2.0.1/src/draw.h	(revision 18980)
@@ -0,0 +1,143 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_DRAW_H
+#define	PCB_DRAW_H
+
+#include "config.h"
+#include "hid.h"
+
+typedef struct {								/* holds information about output window */
+	pcb_hid_gc_t drillGC,										/* drill and foreground; */
+	  fgGC,												/* changed from some routines */
+	  active_padGC, backpadGC, padGC, padselGC,						/* pads are drawn with this gc */
+	  pmGC;												/* depth 1 pixmap GC to store clip */
+	unsigned direct:1; /* starts as 1 and becomes 0 before the first compositing layer group is reset */
+} pcb_output_t;
+
+extern pcb_output_t pcb_draw_out;
+
+/* Temporarily inhibid drawing if this is non-zero. A function that calls a
+   lot of other functions that would call pcb_draw() a lot in turn may increase
+   this value before the calls, then decrease it at the end and call pcb_draw().
+   This makes sure the whole block is redrawn only once at the end. */
+extern pcb_cardinal_t pcb_draw_inhibit;
+
+#define pcb_draw_inhibit_inc() pcb_draw_inhibit++
+#define pcb_draw_inhibit_dec() \
+do { \
+	if (pcb_draw_inhibit > 0) \
+		pcb_draw_inhibit--; \
+} while(0) \
+
+/* When true, do not draw terminals but put them on the obj delay list
+   using pcb_draw_delay_obj_add() - used to delay heavy terminal drawing
+   to get proper overlaps */
+extern pcb_bool delayed_terms_enabled;
+void pcb_draw_delay_obj_add(pcb_any_obj_t *obj);
+
+/* the minimum box that needs to be redrawn */
+extern pcb_box_t pcb_draw_invalidated;
+
+/* Adds the update rect to the invalidated region. This schedules the object
+   for redraw (by pcb_draw()). obj is anything that can be casted to pcb_box_t */
+#define pcb_draw_invalidate(obj) \
+do { \
+	pcb_box_t *box = (pcb_box_t *)obj; \
+	pcb_draw_invalidated.X1 = MIN(pcb_draw_invalidated.X1, box->X1); \
+	pcb_draw_invalidated.X2 = MAX(pcb_draw_invalidated.X2, box->X2); \
+	pcb_draw_invalidated.Y1 = MIN(pcb_draw_invalidated.Y1, box->Y1); \
+	pcb_draw_invalidated.Y2 = MAX(pcb_draw_invalidated.Y2, box->Y2); \
+} while(0)
+
+extern int pcb_draw_doing_pinout;
+extern pcb_bool pcb_draw_doing_assy;
+
+void pcb_lighten_color(const char *orig, char buf[8], double factor);
+
+/* Draw a series of short line segments emulating a dashed line. segs is
+   the number of on/off segment pairs. It is guaranteed that the line starts
+   and ends with an "on" line segment. If cheap is true, allow drawing less
+   segments if the line is short */
+void pcb_draw_dashed_line(pcb_hid_gc_t GC, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, unsigned int segs, pcb_bool_t cheap);
+
+
+void pcb_draw(void);
+void pcb_redraw(void);
+void pcb_draw_obj(pcb_any_obj_t *obj);
+void pcb_draw_layer(pcb_layer_t *, const pcb_box_t *);
+
+/* Same as pcb_draw_layer(), but never draws an implicit outline and ignores
+   objects that are not in the subtree of data - useful for drawing a subtree,
+   e.g. a subc only */
+void pcb_draw_layer_under(pcb_layer_t *Layer, const pcb_box_t *screen, pcb_data_t *data);
+
+void pcb_erase_obj(int, void *, void *);
+void pcb_draw_ppv(pcb_layergrp_id_t group, const pcb_box_t * drawn_area);
+void pcb_draw_pstk_names(pcb_layergrp_id_t group, const pcb_box_t *drawn_area);
+
+/*#define PCB_BBOX_DEBUG*/
+
+#ifdef PCB_BBOX_DEBUG
+#define PCB_DRAW_BBOX(obj) \
+	do { \
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0); \
+		pcb_gui->draw_rect(pcb_draw_out.fgGC, obj->BoundingBox.X1, obj->BoundingBox.Y1, obj->BoundingBox.X2, obj->BoundingBox.Y2); \
+	} while(0)
+#else
+#define PCB_DRAW_BBOX(obj)
+#endif
+
+/* Some low level draw callback depend on this in their void *cl */
+typedef struct pcb_draw_info_s {
+	const pcb_box_t *drawn_area;
+	pcb_layer_t *layer;
+} pcb_draw_info_t;
+
+/* Returns whether lay_id is part of a group that is composite-drawn */
+int pcb_draw_layer_is_comp(pcb_layer_id_t lay_id);
+
+/* Returns whether a group is composite-drawn */
+int pcb_draw_layergrp_is_comp(pcb_layergrp_t *g);
+
+/* Draw (render) or invalidate a terminal label */
+void pcb_term_label_draw(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
+void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn);
+
+
+/* Schedule an object to be called again at the end for drawing its labels 
+   on top of everything. */
+void pcb_draw_delay_label_add(pcb_any_obj_t *obj);
+
+/* Return non-zero if extra terminal graphics should be drawn */
+#define pcb_draw_term_need_gfx(obj) \
+	(((obj)->term != NULL) && !PCB_FLAG_TEST(PCB_FLAG_FOUND, (obj)) && !PCB_FLAG_TEST(PCB_FLAG_WARN, (obj)) && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (obj)))
+
+#define PCB_DRAW_TERM_GFX_WIDTH (-3)
+
+#endif
Index: tags/2.0.1/src/draw_composite.c
===================================================================
--- tags/2.0.1/src/draw_composite.c	(nonexistent)
+++ tags/2.0.1/src/draw_composite.c	(revision 18980)
@@ -0,0 +1,178 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2003, 2004 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Local functions to draw a layer group as a composite of logical layers
+   using positive and negative draw operations. Included from draw.c. */
+
+typedef struct comp_ctx_s {
+	pcb_board_t *pcb;
+	const pcb_box_t *screen;
+	pcb_layergrp_t *grp;
+	pcb_layergrp_id_t gid;
+	const char *color;
+
+	unsigned thin:1;
+	unsigned invert:1;
+} comp_ctx_t;
+
+static void comp_fill_board(comp_ctx_t *ctx)
+{
+	pcb_gui->set_color(pcb_draw_out.fgGC, ctx->color);
+	if (ctx->screen == NULL)
+		pcb_gui->fill_rect(pcb_draw_out.fgGC, 0, 0, ctx->pcb->MaxWidth, ctx->pcb->MaxHeight);
+	else
+		pcb_gui->fill_rect(pcb_draw_out.fgGC, ctx->screen->X1, ctx->screen->Y1, ctx->screen->X2, ctx->screen->Y2);
+}
+
+static void comp_start_sub_(comp_ctx_t *ctx)
+{
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_NEGATIVE, pcb_draw_out.direct, ctx->screen);
+}
+
+static void comp_start_add_(comp_ctx_t *ctx)
+{
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->screen);
+}
+
+static void comp_start_sub(comp_ctx_t *ctx)
+{
+	if (ctx->thin) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->screen);
+		pcb_gui->set_color(pcb_draw_out.pmGC, ctx->color);
+		return;
+	}
+
+	if (ctx->invert)
+		comp_start_add_(ctx);
+	else
+		comp_start_sub_(ctx);
+}
+
+static void comp_start_add(comp_ctx_t *ctx)
+{
+	if (ctx->thin) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->screen);
+		return;
+	}
+
+	if (ctx->invert)
+		comp_start_sub_(ctx);
+	else
+		comp_start_add_(ctx);
+}
+
+static void comp_finish(comp_ctx_t *ctx)
+{
+	if (ctx->thin) {
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->screen);
+		return;
+	}
+
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, ctx->screen);
+}
+
+static void comp_init(comp_ctx_t *ctx, int negative)
+{
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, ctx->screen);
+
+	if (ctx->thin)
+		return;
+
+	if (ctx->invert)
+		negative = !negative;
+
+	if ((!ctx->thin) && (negative)) {
+		/* drawing the big poly for the negative */
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, ctx->screen);
+		comp_fill_board(ctx);
+	}
+}
+
+/* Real composite draw: if any layer is negative, we have to use the HID API's
+   composite layer draw mechanism */
+static void comp_draw_layer_real(comp_ctx_t *ctx, void (*draw_auto)(comp_ctx_t *ctx, void *data), void *auto_data)
+{ /* generic multi-layer rendering */
+	int n, adding = -1;
+	pcb_layer_t *l = pcb_get_layer(PCB->Data, ctx->grp->lid[0]);
+	comp_init(ctx, (l->comb & PCB_LYC_SUB));
+
+	for(n = 0; n < ctx->grp->len; n++) {
+		int want_add;
+		l = pcb_get_layer(PCB->Data, ctx->grp->lid[n]);
+
+		want_add = ctx->thin || !(l->comb & PCB_LYC_SUB);
+		if (want_add != adding) {
+			if (want_add)
+				comp_start_add(ctx);
+			else
+				comp_start_sub(ctx);
+			adding = want_add;
+		}
+
+		{
+			pcb_hid_gc_t old_fg = pcb_draw_out.fgGC;
+			pcb_draw_out.fgGC = pcb_draw_out.pmGC;
+			if (l->comb & PCB_LYC_AUTO)
+				draw_auto(ctx, auto_data);
+			pcb_draw_layer(l, ctx->screen);
+			pcb_draw_out.fgGC = old_fg;
+		}
+	}
+	if (!adding)
+		comp_start_add(ctx);
+}
+
+int pcb_draw_layergrp_is_comp(pcb_layergrp_t *g)
+{
+	int n;
+
+	/* as long as we are doing only positive compositing, we can go without compositing */
+	for(n = 0; n < g->len; n++)
+		if (PCB->Data->Layer[g->lid[n]].comb & (PCB_LYC_SUB))
+			return 1;
+
+	return 0;
+}
+
+int pcb_draw_layer_is_comp(pcb_layer_id_t id)
+{
+	pcb_layergrp_t *g = pcb_get_layergrp(PCB, PCB->Data->Layer[id].meta.real.grp);
+	if (g == NULL) return 0;
+	return pcb_draw_layergrp_is_comp(g);
+}
+
+/* Draw a layer group with fake or real compositing */
+static void comp_draw_layer(comp_ctx_t *ctx, void (*draw_auto)(comp_ctx_t *ctx, void *data), void *auto_data)
+{
+	int is_comp = pcb_draw_layergrp_is_comp(ctx->grp);
+
+	if (is_comp)
+		pcb_draw_out.direct = 0;
+
+	comp_draw_layer_real(ctx, draw_auto, auto_data);
+}
Index: tags/2.0.1/src/draw_ly_spec.c
===================================================================
--- tags/2.0.1/src/draw_ly_spec.c	(nonexistent)
+++ tags/2.0.1/src/draw_ly_spec.c	(revision 18980)
@@ -0,0 +1,196 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2003, 2004 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Local functions for special layer draw logics. This code is not generic;
+   instead it collects all the hardwired heuristics for the special layers.
+   Included from draw.c. */
+
+/******** paste ********/
+
+static void pcb_draw_paste_auto_(comp_ctx_t *ctx, void *side)
+{
+	if (PCB->pstk_on)
+		pcb_draw_pstks(ctx->gid, ctx->screen, 0, PCB_LYC_AUTO);
+}
+
+static void pcb_draw_paste(int side, const pcb_box_t *drawn_area)
+{
+	unsigned long side_lyt = side ? PCB_LYT_TOP : PCB_LYT_BOTTOM;
+	pcb_layergrp_id_t gid = -1;
+	comp_ctx_t cctx;
+	pcb_layer_t *ly = NULL;
+
+	pcb_layergrp_list(PCB, PCB_LYT_PASTE | side_lyt, &gid, 1);
+
+	cctx.grp = pcb_get_layergrp(PCB, gid);
+
+	if (cctx.grp->len > 0)
+		ly = pcb_get_layer(PCB->Data, cctx.grp->lid[0]);
+
+	cctx.pcb = PCB;
+	cctx.screen = drawn_area;
+	cctx.gid = gid;
+	cctx.color = ly != NULL ? ly->meta.real.color : conf_core.appearance.color.paste;
+	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
+	cctx.invert = 0;
+
+	if ((cctx.grp == NULL) || (cctx.grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-add */
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, cctx.screen);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, cctx.screen);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, cctx.screen);
+	}
+	else {
+		comp_draw_layer(&cctx, pcb_draw_paste_auto_, &side);
+		comp_finish(&cctx);
+	}
+}
+
+/******** mask ********/
+static void pcb_draw_mask_auto(comp_ctx_t *ctx, void *side)
+{
+	if (PCB->pstk_on)
+		pcb_draw_pstks(ctx->gid, ctx->screen, 0, PCB_LYC_SUB | PCB_LYC_AUTO);
+}
+
+static void pcb_draw_mask(int side, const pcb_box_t *screen)
+{
+	unsigned long side_lyt = side ? PCB_LYT_TOP : PCB_LYT_BOTTOM;
+	pcb_layergrp_id_t gid = -1;
+	comp_ctx_t cctx;
+	pcb_layer_t *ly = NULL;
+
+	pcb_layergrp_list(PCB, PCB_LYT_MASK | side_lyt, &gid, 1);
+
+	cctx.grp = pcb_get_layergrp(PCB, gid);
+
+	if (cctx.grp->len > 0)
+		ly = pcb_get_layer(PCB->Data, cctx.grp->lid[0]);
+
+	cctx.pcb = PCB;
+	cctx.screen = screen;
+
+	cctx.gid = gid;
+	cctx.color = ly != NULL ? ly->meta.real.color : conf_core.appearance.color.mask;
+	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
+	cctx.invert = pcb_gui->mask_invert;
+
+	if (!cctx.invert)
+		pcb_draw_out.direct = 0;
+
+	if ((cctx.grp == NULL) || (cctx.grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-sub */
+		comp_init(&cctx, 1);
+		comp_start_sub(&cctx);
+		pcb_draw_mask_auto(&cctx, &side);
+		comp_start_add(&cctx);
+	}
+	else
+		comp_draw_layer(&cctx, pcb_draw_mask_auto, &side);
+	comp_finish(&cctx);
+}
+
+/******** silk ********/
+
+static void pcb_draw_silk_auto(comp_ctx_t *ctx, void *lyt_side)
+{
+	if (PCB->pstk_on)
+		pcb_draw_pstks(ctx->gid, ctx->screen, 0, PCB_LYC_AUTO);
+}
+
+static int pcb_is_silk_old_style(comp_ctx_t *cctx, pcb_layer_id_t lid)
+{
+	if (cctx->grp == NULL)
+		return 1; /* no group means no silk -> fall back to implicit */
+
+	if ((cctx->grp->len == 1) && ((PCB->Data->Layer[lid].comb & (PCB_LYC_AUTO | PCB_LYC_SUB)) == PCB_LYC_AUTO))
+		return 1; /* A single auto-positive layer -> original code: draw auto+manual */
+
+	return 0;
+}
+
+static void pcb_draw_silk(unsigned long lyt_side, const pcb_box_t *drawn_area)
+{
+	pcb_layer_id_t lid;
+	pcb_layergrp_id_t gid = -1;
+	comp_ctx_t cctx;
+
+	if (pcb_layer_list(PCB, PCB_LYT_SILK | lyt_side, &lid, 1) == 0)
+		return;
+
+	pcb_layergrp_list(PCB, PCB_LYT_SILK | lyt_side, &gid, 1);
+	if (!PCB->LayerGroups.grp[gid].vis)
+		return;
+
+	cctx.pcb = PCB;
+	cctx.screen = drawn_area;
+	cctx.grp = pcb_get_layergrp(PCB, gid);
+	cctx.gid = gid;
+	cctx.color = PCB->Data->Layer[lid].meta.real.color;
+	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
+	cctx.invert = 0;
+
+	if (pcb_is_silk_old_style(&cctx, lid)) {
+		/* fallback: implicit layer -> original code: draw auto+manual */
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, cctx.screen);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, cctx.screen);
+		pcb_draw_layer(LAYER_PTR(lid), cctx.screen);
+		pcb_draw_silk_auto(&cctx, &lyt_side);
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, cctx.screen);
+	}
+	else {
+		comp_draw_layer(&cctx, pcb_draw_silk_auto, &lyt_side);
+		comp_finish(&cctx);
+	}
+}
+
+
+/******** misc ********/
+
+static void pcb_draw_rats(const pcb_box_t *drawn_area)
+{
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+	pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, NULL, NULL);
+	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+}
+
+static void pcb_draw_assembly(unsigned int lyt_side, const pcb_box_t *drawn_area)
+{
+	pcb_layergrp_id_t side_group;
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_COPPER | lyt_side, &side_group, 1) != 1)
+		return;
+
+	pcb_draw_doing_assy = pcb_true;
+	pcb_hid_set_draw_faded(pcb_draw_out.fgGC, 1);
+	DrawLayerGroup(side_group, drawn_area, 0);
+	pcb_hid_set_draw_faded(pcb_draw_out.fgGC, 0);
+
+	/* draw package */
+	pcb_draw_silk(lyt_side, drawn_area);
+	pcb_draw_doing_assy = pcb_false;
+}
Index: tags/2.0.1/src/draw_wireframe.h
===================================================================
--- tags/2.0.1/src/draw_wireframe.h	(nonexistent)
+++ tags/2.0.1/src/draw_wireframe.h	(revision 18980)
@@ -0,0 +1,104 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#ifndef PCB_DRAW_WIREFRAME_H
+#define PCB_DRAW_WIREFRAME_H
+
+#include "config.h"
+#include "hid.h"
+
+/*-----------------------------------------------------------
+ * Draws the outline of an arc
+ */
+PCB_INLINE void pcb_draw_wireframe_arc(pcb_hid_gc_t gc, pcb_arc_t *arc)
+{
+	pcb_coord_t wid = arc->Thickness / 2;
+	pcb_coord_t x1, y1, x2, y2;
+
+	pcb_arc_get_end(arc, 0, &x1, &y1);
+	pcb_arc_get_end(arc, 1, &x2, &y2);
+
+	pcb_gui->draw_arc(gc, arc->X, arc->Y, arc->Width + wid, arc->Height + wid, arc->StartAngle, arc->Delta);
+	if (wid > pcb_pixel_slop) {
+		pcb_gui->draw_arc(gc, arc->X, arc->Y, arc->Width - wid, arc->Height - wid, arc->StartAngle, arc->Delta);
+		pcb_gui->draw_arc(gc, x1, y1, wid, wid, arc->StartAngle, -180 * SGN(arc->Delta));
+		pcb_gui->draw_arc(gc, x2, y2, wid, wid, arc->StartAngle + arc->Delta, 180 * SGN(arc->Delta));
+	}
+}
+
+/*-----------------------------------------------------------
+ * Draws the outline of a line
+ */
+PCB_INLINE void pcb_draw_wireframe_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thick, int square)
+{
+	if((x1 != x2) || (y1 != y2)) {
+		double dx = x2 - x1;
+		double dy = y2 - y1;
+		double h = 0.5 * thick / sqrt(PCB_SQUARE(dx) + PCB_SQUARE(dy));
+		pcb_coord_t ox = dy * h + 0.5 * SGN(dy);
+		pcb_coord_t oy = -(dx * h + 0.5 * SGN(dx));
+		if (square) {
+			/* make the line longer by cap */
+			x1 -= dx * h;
+			x2 += dx * h;
+			y1 -= dy * h;
+			y2 += dy * h;
+		}
+		if ((coord_abs(ox) >= pcb_pixel_slop) || (coord_abs(oy) >= pcb_pixel_slop)) {
+			pcb_gui->draw_line(gc, x1 + ox, y1 + oy, x2 + ox, y2 + oy);
+			pcb_gui->draw_line(gc, x1 - ox, y1 - oy, x2 - ox, y2 - oy);
+
+			/* draw caps */
+			if (!square) {
+				pcb_angle_t angle = atan2(dx, dy) * 57.295779;
+				pcb_gui->draw_arc(gc, x1, y1, thick / 2, thick / 2, angle - 180, 180);
+				pcb_gui->draw_arc(gc, x2, y2, thick / 2, thick / 2, angle, 180);
+			}
+			else {
+				pcb_gui->draw_line(gc, x1 + ox, y1 + oy, x1 - ox, y1 - oy);
+				pcb_gui->draw_line(gc, x2 + ox, y2 + oy, x2 - ox, y2 - oy);
+			}
+		}
+		else
+			pcb_gui->draw_line(gc, x1, y1, x2, y2);
+	}
+	else {
+		if (square) {
+			/* square cap 0 long line does not have an angle -> always draw it axis aligned */
+			pcb_coord_t cx1 = x1 - thick/2, cx2 = x1 + thick/2, cy1 = y1 - thick/2, cy2 = y1 + thick/2;
+			pcb_gui->draw_line(gc, cx1, cy1, cx2, cy1);
+			pcb_gui->draw_line(gc, cx2, cy1, cx2, cy2);
+			pcb_gui->draw_line(gc, cx2, cy2, cx1, cy2);
+			pcb_gui->draw_line(gc, cx1, cy2, cx1, cy1);
+		}
+		else
+			pcb_gui->draw_arc(gc, x1, y1, thick/2, thick/2, 0, 360); 
+	}
+}
+
+#endif /* ! defined PCB_DRAW_WIREFRAME_H */
+
Index: tags/2.0.1/src/drc.h
===================================================================
--- tags/2.0.1/src/drc.h	(nonexistent)
+++ tags/2.0.1/src/drc.h	(revision 18980)
@@ -0,0 +1,49 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#ifndef PCB_DRC_H
+#define PCB_DRC_H
+
+#include "unit.h"
+
+struct drc_violation_s {
+	char *title;
+	char *explanation;
+	pcb_coord_t x, y;
+	pcb_angle_t angle;
+	int have_measured;
+	pcb_coord_t measured_value;
+	pcb_coord_t required_value;
+	int object_count;
+	long int *object_id_list;
+	int *object_type_list;
+};
+
+typedef struct drc_violation_s pcb_drc_violation_t;
+
+#endif
Index: tags/2.0.1/src/error.c
===================================================================
--- tags/2.0.1/src/error.c	(nonexistent)
+++ tags/2.0.1/src/error.c	(revision 18980)
@@ -0,0 +1,93 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* error and debug functions */
+
+#include "config.h"
+
+#include <errno.h>
+#include <stdarg.h>
+
+#include "data.h"
+#include "error.h"
+#include "plug_io.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+
+void pcb_message(enum pcb_message_level level, const char *Format, ...)
+{
+	va_list args;
+	pcb_message_level_t min_level = PCB_MSG_INFO;
+
+	if (pcb_gui != NULL) {
+		va_start(args, Format);
+		pcb_gui->logv(level, Format, args);
+		va_end(args);
+	}
+
+	if (conf_core.rc.quiet)
+		min_level = PCB_MSG_ERROR;
+
+	if ((level >= min_level) || (conf_core.rc.verbose)) {
+		va_start(args, Format);
+		pcb_vfprintf(stderr, Format, args);
+		va_end(args);
+	}
+}
+
+void pcb_trace(const char *Format, ...)
+{
+#ifndef NDEBUG
+	va_list args;
+	va_start(args, Format);
+	pcb_vfprintf(stderr, Format, args);
+	va_end(args);
+#endif
+}
+
+
+void pcb_open_error_message(const char *filename)
+{
+	pcb_message(PCB_MSG_ERROR, "Can't open file\n" "   '%s'\nfopen() returned: '%s'\n", filename, strerror(errno));
+}
+
+void pcb_popen_error_message(const char *filename)
+{
+	pcb_message(PCB_MSG_ERROR, "Can't execute command\n" "   '%s'\npopen() returned: '%s'\n", filename, strerror(errno));
+}
+
+void pcb_opendir_error_message(const char *dirname)
+{
+	pcb_message(PCB_MSG_ERROR, "Can't scan directory\n" "   '%s'\nopendir() returned: '%s'\n", dirname, strerror(errno));
+}
+
+void pcb_chdir_error_message(const char *dirname)
+{
+	pcb_message(PCB_MSG_ERROR, "Can't change working directory to\n" "   '%s'\nchdir() returned: '%s'\n", dirname, strerror(errno));
+}
Index: tags/2.0.1/src/error.h
===================================================================
--- tags/2.0.1/src/error.h	(nonexistent)
+++ tags/2.0.1/src/error.h	(revision 18980)
@@ -0,0 +1,54 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Messages, error reporting and debug functions */
+
+#ifndef	PCB_ERROR_H
+#define	PCB_ERROR_H
+
+typedef enum pcb_message_level {
+	PCB_MSG_DEBUG = 0,   /* Debug message. Should probably not be shown in regular operation. */
+	PCB_MSG_INFO,        /* Info message. FYI for the user, no action needed. */
+	PCB_MSG_WARNING,     /* Something the user should probably take note */
+	PCB_MSG_ERROR        /* Couldn't finish an action, needs user attention. */
+} pcb_message_level_t;
+
+/* printf-like logger to the log dialog and stderr */
+void pcb_message(enum pcb_message_level level, const char *Format, ...);
+
+/* shorthands for indicating common errors using pcb_message() */
+void pcb_open_error_message(const char *filename);
+void pcb_popen_error_message(const char *filename);
+void pcb_opendir_error_message(const char *dirname);
+void pcb_chdir_error_message(const char *dirname);
+
+/* pcb_printf()-like call to print temporary trace messages to stderr;
+   disabled in non-debug compilation */
+void pcb_trace(const char *Format, ...);
+
+#endif
Index: tags/2.0.1/src/event.c
===================================================================
--- tags/2.0.1/src/event.c	(nonexistent)
+++ tags/2.0.1/src/event.c	(revision 18980)
@@ -0,0 +1,191 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include "config.h"
+#include "event.h"
+#include "error.h"
+#include "fptr_cast.h"
+
+typedef struct event_s event_t;
+
+struct event_s {
+	pcb_event_handler_t *handler;
+	void *user_data;
+	const char *cookie;
+	event_t *next;
+};
+
+event_t *events[PCB_EVENT_last];
+
+#define event_valid(ev) (((ev) >= 0) && ((ev) < PCB_EVENT_last))
+
+void pcb_event_bind(pcb_event_id_t ev, pcb_event_handler_t * handler, void *user_data, const char *cookie)
+{
+	event_t *e;
+
+	if (!(event_valid(ev)))
+		return;
+
+	e = malloc(sizeof(event_t));
+	e->handler = handler;
+	e->cookie = cookie;
+	e->user_data = user_data;
+
+	/* insert the new event in front of the list */
+	e->next = events[ev];
+	events[ev] = e;
+}
+
+static void event_destroy(event_t * ev)
+{
+	free(ev);
+}
+
+void pcb_event_unbind(pcb_event_id_t ev, pcb_event_handler_t * handler)
+{
+	event_t *prev = NULL, *e, *next;
+	if (!(event_valid(ev)))
+		return;
+	for (e = events[ev]; e != NULL; e = next) {
+		next = e->next;
+		if (e->handler == handler) {
+			event_destroy(e);
+			if (prev == NULL)
+				events[ev] = next;
+			else
+				prev->next = next;
+		}
+		else
+			prev = e;
+	}
+}
+
+void pcb_event_unbind_cookie(pcb_event_id_t ev, const char *cookie)
+{
+	event_t *prev = NULL, *e, *next;
+	if (!(event_valid(ev)))
+		return;
+	for (e = events[ev]; e != NULL; e = next) {
+		next = e->next;
+		if (e->cookie == cookie) {
+			event_destroy(e);
+			if (prev == NULL)
+				events[ev] = next;
+			else
+				prev->next = next;
+		}
+		else
+		 prev = e;
+	}
+}
+
+
+void pcb_event_unbind_allcookie(const char *cookie)
+{
+	pcb_event_id_t n;
+	for (n = 0; n < PCB_EVENT_last; n++)
+		pcb_event_unbind_cookie(n, cookie);
+}
+
+void pcb_event(pcb_event_id_t ev, const char *fmt, ...)
+{
+	va_list ap;
+	pcb_event_arg_t argv[EVENT_MAX_ARG], *a;
+	event_t *e;
+	int argc;
+
+	a = argv;
+	a->type = PCB_EVARG_INT;
+	a->d.i = ev;
+	argc = 1;
+
+	if (fmt != NULL) {
+		va_start(ap, fmt);
+		for (a++; *fmt != '\0'; fmt++, a++, argc++) {
+			if (argc >= EVENT_MAX_ARG) {
+				pcb_message(PCB_MSG_ERROR, "pcb_event(): too many arguments\n");
+				break;
+			}
+			switch (*fmt) {
+			case 'i':
+				a->type = PCB_EVARG_INT;
+				a->d.i = va_arg(ap, int);
+				break;
+			case 'd':
+				a->type = PCB_EVARG_DOUBLE;
+				a->d.d = va_arg(ap, double);
+				break;
+			case 's':
+				a->type = PCB_EVARG_STR;
+				a->d.s = va_arg(ap, const char *);
+				break;
+			case 'p':
+				a->type = PCB_EVARG_PTR;
+				a->d.p = va_arg(ap, void *);
+				break;
+			case 'c':
+				a->type = PCB_EVARG_COORD;
+				a->d.c = va_arg(ap, pcb_coord_t);
+				break;
+			case 'a':
+				a->type = PCB_EVARG_ANGLE;
+				a->d.a = va_arg(ap, pcb_angle_t);
+				break;
+			default:
+				a->type = PCB_EVARG_INT;
+				a->d.i = 0;
+				pcb_message(PCB_MSG_ERROR, "pcb_event(): invalid argument type '%c'\n", *fmt);
+				break;
+			}
+		}
+		va_end(ap);
+	}
+
+	for (e = events[ev]; e != NULL; e = e->next)
+		e->handler(e->user_data, argc, argv);
+}
+
+void pcb_events_init(void)
+{
+
+}
+
+void pcb_events_uninit(void)
+{
+	int ev;
+	for(ev = 0; ev < PCB_EVENT_last; ev++) {
+		event_t *e, *next;
+		for(e = events[ev]; e != NULL; e = next) {
+			next = e->next;
+			fprintf(stderr, "WARNING: events_uninit: event %d still has %p registered for cookie %p (%s)\n", ev, pcb_cast_f2d(e->handler), (void *)e->cookie, e->cookie);
+			free(e);
+		}
+	}
+}
+
Index: tags/2.0.1/src/event.h
===================================================================
--- tags/2.0.1/src/event.h	(nonexistent)
+++ tags/2.0.1/src/event.h	(revision 18980)
@@ -0,0 +1,127 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_EVENT_H
+#define PCB_EVENT_H
+#include "config.h"
+#include "unit.h"
+
+typedef enum {
+	PCB_EVENT_GUI_INIT,               /* finished initializing the GUI called right before the main loop of the GUI; args: (void) */
+	PCB_EVENT_CLI_ENTER,              /* the user pressed enter on a CLI command - called before parsing the line for actions; args: (str commandline) */
+	PCB_EVENT_SAVE_PRE,               /* called before saving the design */
+	PCB_EVENT_SAVE_POST,              /* called after saving the design */
+	PCB_EVENT_LOAD_PRE,               /* called before loading a new design */
+	PCB_EVENT_LOAD_POST,              /* called after loading a new design, whether it was successful or not */
+
+	PCB_EVENT_BOARD_CHANGED,          /* called after the board being edited got _replaced_ (used to be the PCBChanged action) */
+	PCB_EVENT_BOARD_META_CHANGED,     /* called if the metadata of the board has changed */
+	PCB_EVENT_ROUTE_STYLES_CHANGED,   /* called after any route style change (used to be the RouteStylesChanged action) */
+	PCB_EVENT_NETLIST_CHANGED,        /* called after any netlist change (used to be the NetlistChanged action) */
+	PCB_EVENT_LAYERS_CHANGED,         /* called after layers or layer groups change (used to be the LayersChanged action) */
+	PCB_EVENT_LAYERVIS_CHANGED,       /* called after the visibility of layers has changed */
+	PCB_EVENT_LIBRARY_CHANGED,        /* called after a change in the footprint lib (used to be the LibraryChanged action) */
+	PCB_EVENT_FONT_CHANGED,           /* called when a font has changed; argument is the font ID */
+
+	PCB_EVENT_NEW_PSTK,               /* called when a new padstack is created */
+
+	PCB_EVENT_BUSY,                   /* called before CPU-intensive task begins */
+
+	PCB_EVENT_RUBBER_RESET,           /* rubber band: reset attached */
+	PCB_EVENT_RUBBER_REMOVE_SUBC,     /* rubber band: removed a subc with rubber bands attached */
+	PCB_EVENT_RUBBER_MOVE,            /* rubber band: object moved */
+	PCB_EVENT_RUBBER_MOVE_DRAW,       /* rubber band: draw crosshair-attached rubber band objects after a move or copy */
+	PCB_EVENT_RUBBER_ROTATE90,        /* rubber band: crosshair object rotated by 90 degrees */
+	PCB_EVENT_RUBBER_ROTATE,          /* rubber band: crosshair object rotated by arbitrary angle */
+	PCB_EVENT_RUBBER_RENAME,          /* rubber band: element pin/pad got renamed */
+	PCB_EVENT_RUBBER_LOOKUP_LINES,    /* rubber band: attach rubber banded line objects to crosshair */
+	PCB_EVENT_RUBBER_LOOKUP_RATS,     /* rubber band: attach rubber banded rat lines objects to crosshair */
+	PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, /* rubber band: adapt main line to keep rubberband lines direction */
+
+	PCB_EVENT_GUI_SYNC,               /* sync full GUI state (e.g. after a menu clicked) */
+	PCB_EVENT_GUI_SYNC_STATUS,        /* sync partial GUI state (status line update - do not update menus and do not redraw) */
+	PCB_EVENT_USER_INPUT_POST,        /* generated any time any user input reaches core, after processing it */
+
+	PCB_EVENT_DRAW_CROSSHAIR_CHATT,   /* called from crosshair code upon attached object recalculation; event handlers can use this hook to enforce various geometric restrictions */
+
+	PCB_EVENT_last                    /* not a real event */
+} pcb_event_id_t;
+
+/* Maximum number of arguments for an event handler, auto-set argv[0] included */
+#define EVENT_MAX_ARG 16
+
+/* Argument types in event's argv[] */
+typedef enum {
+	PCB_EVARG_INT,											/* format char: i */
+	PCB_EVARG_DOUBLE,										/* format char: d */
+	PCB_EVARG_STR,											/* format char: s */
+	PCB_EVARG_PTR,											/* format char: p */
+	PCB_EVARG_COORD,										/* format char: c */
+	PCB_EVARG_ANGLE											/* format char: a */
+} pcb_event_argtype_t;
+
+
+/* An argument is its type and value */
+typedef struct {
+	pcb_event_argtype_t type;
+	union {
+		int i;
+		double d;
+		const char *s;
+		void *p;
+		pcb_coord_t c;
+		pcb_angle_t a;
+	} d;
+} pcb_event_arg_t;
+
+/* Initialize the event system */
+void pcb_events_init(void);
+
+/* Uninitialize the event system and remove all events */
+void pcb_events_uninit(void);
+
+
+/* Event callback prototype; user_data is the same as in pcb_event_bind().
+   argv[0] is always an PCB_EVARG_INT with the event id that triggered the event. */
+typedef void (pcb_event_handler_t) (void *user_data, int argc, pcb_event_arg_t argv[]);
+
+/* Bind: add a handler to the call-list of an event; the cookie is also remembered
+   so that mass-unbind is easier later. user_data is passed to the handler. */
+void pcb_event_bind(pcb_event_id_t ev, pcb_event_handler_t * handler, void *user_data, const char *cookie);
+
+/* Unbind: remove a handler from an event */
+void pcb_event_unbind(pcb_event_id_t ev, pcb_event_handler_t * handler);
+
+/* Unbind by cookie: remove all handlers from an event matching the cookie */
+void pcb_event_unbind_cookie(pcb_event_id_t ev, const char *cookie);
+
+/* Unbind all by cookie: remove all handlers from all events matching the cookie */
+void pcb_event_unbind_allcookie(const char *cookie);
+
+/* Event trigger: call all handlers for an event. Fmt is a list of
+   format characters (e.g. i for PCB_EVARG_INT). */
+void pcb_event(pcb_event_id_t ev, const char *fmt, ...);
+#endif
Index: tags/2.0.1/src/file_act.c
===================================================================
--- tags/2.0.1/src/file_act.c	(nonexistent)
+++ tags/2.0.1/src/file_act.c	(revision 18980)
@@ -0,0 +1,413 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "board.h"
+#include "build_run.h"
+#include "conf_core.h"
+#include "funchash_core.h"
+#include "data.h"
+#include "buffer.h"
+
+#include "plug_io.h"
+#include "plug_import.h"
+#include "remove.h"
+#include "draw.h"
+#include "find.h"
+#include "search.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "hid_init.h"
+#include "layer_vis.h"
+#include "safe_fs.h"
+#include "tool.h"
+
+static const char pcb_acts_LoadFrom[] = "LoadFrom(Layout|LayoutToBuffer|SubcToBuffer|Netlist|Revert,filename[,format])";
+static const char pcb_acth_LoadFrom[] = "Load layout data from a file.";
+
+/* %start-doc actions LoadFrom
+
+This action assumes you know what the filename is.  The various GUIs
+should have a similar @code{Load} action where the filename is
+optional, and will provide their own file selection mechanism to let
+you choose the file name.
+
+@table @code
+
+@item Layout
+Loads an entire PCB layout, replacing the current one.
+
+@item LayoutToBuffer
+Loads an entire PCB layout to the paste buffer.
+
+@item ElementToBuffer
+Loads the given footprint file into the paste buffer. Footprint files
+contain only a single subcircuit definition in one of the various
+supported file formats.
+
+@item Netlist
+Loads a new netlist, replacing any current netlist.
+
+@item Revert
+Re-loads the current layout from its disk file, reverting any changes
+you may have made.
+
+@end table
+
+%end-doc */
+
+fgw_error_t pcb_act_LoadFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *name, *format = NULL;
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, LoadFrom, op = fgw_keyword(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_STR, LoadFrom, name = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadFrom, format = argv[3].val.str);
+
+	switch(op) {
+		case F_ElementToBuffer:
+		case F_Element:
+		case F_SubcToBuffer:
+		case F_Subcircuit:
+		case F_Footprint:
+			pcb_notify_crosshair_change(pcb_false);
+			if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name, format))
+				pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_LayoutToBuffer:
+			pcb_notify_crosshair_change(pcb_false);
+			if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, name, format))
+				pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_Layout:
+			if (!PCB->Changed || pcb_gui->confirm_dialog("OK to override layout data?", 0))
+				pcb_load_pcb(name, format, pcb_true, 0);
+			break;
+
+		case F_Netlist:
+			if (PCB->Netlistname)
+				free(PCB->Netlistname);
+			PCB->Netlistname = pcb_strdup_strip_wspace(name);
+			{
+				int i;
+				for (i = 0; i < PCB_NUM_NETLISTS; i++)
+					pcb_lib_free(&(PCB->NetlistLib[i]));
+			}
+			if (!pcb_import_netlist(PCB->Netlistname))
+				pcb_netlist_changed(1);
+			break;
+
+		case F_Revert:
+			if (PCB->Filename && (!PCB->Changed || pcb_gui->confirm_dialog("OK to override changes?", 0)))
+				pcb_revert_pcb();
+			break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_New[] = "New([name])";
+static const char pcb_acth_New[] = "Starts a new layout.";
+
+/* %start-doc actions New
+
+If a name is not given, one is prompted for.
+
+%end-doc */
+
+static fgw_error_t pcb_act_New(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *argument_name = NULL;
+	char *name = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, New, argument_name = argv[1].val.str);
+
+	if (!PCB->Changed || pcb_gui->confirm_dialog("OK to clear layout data?", 0)) {
+		if (argument_name)
+			name = pcb_strdup(argument_name);
+		else
+			name = pcb_gui->prompt_for("Enter the layout name:", "");
+
+		if (!name)
+			return 1;
+
+		pcb_notify_crosshair_change(pcb_false);
+		/* do emergency saving
+		 * clear the old struct and allocate memory for the new one
+		 */
+		if (PCB->Changed && conf_core.editor.save_in_tmp)
+			pcb_save_in_tmp();
+		pcb_board_remove(PCB);
+		PCB = pcb_board_new(1);
+		pcb_board_new_postproc(PCB, 1);
+		pcb_set_design_dir(NULL);
+
+		/* setup the new name and reset some values to default */
+		free(PCB->Name);
+		PCB->Name = name;
+
+		pcb_layervis_reset_stack();
+		pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight);
+		pcb_center_display(PCB->MaxWidth / 2, PCB->MaxHeight / 2);
+		pcb_redraw();
+		pcb_board_changed(0);
+		pcb_notify_crosshair_change(pcb_true);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+static const char pcb_acts_normalize[] = "Normalize()";
+static const char pcb_acth_normalize[] = "Move all objects within the drawing area, align the drawing to 0;0";
+static fgw_error_t pcb_act_normalize(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(pcb_board_normalize(PCB));
+	return 0;
+}
+
+
+static const char pcb_acts_SaveTo[] =
+	"SaveTo(Layout|LayoutAs,filename,[fmt])\n"
+	"SaveTo(AllConnections|AllUnusedPins|ElementConnections,filename)\n" "SaveTo(PasteBuffer,filename,[fmt])";
+static const char pcb_acth_SaveTo[] = "Saves data to a file.";
+
+/* %start-doc actions SaveTo
+
+@table @code
+
+@item Layout
+Saves the current layout.
+
+@item LayoutAs
+Saves the current layout, and remembers the filename used.
+
+@item AllConnections
+Save all connections to a file.
+
+@item AllUnusedPins
+List all unused pins to a file.
+
+@item ElementConnections
+Save connections to the subcircuit at the cursor to a file.
+
+@item PasteBuffer
+Save the content of the active Buffer to a file. This is the graphical way to create a footprint.
+
+@end table
+
+%end-doc */
+
+fgw_error_t pcb_act_SaveTo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	const char *name = NULL;
+	const char *fmt = NULL;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, SaveTo, op = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, SaveTo, name = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, SaveTo, fmt = argv[3].val.str);
+	PCB_ACT_IRES(0);
+
+	if ((op != F_Layout) && (name == NULL))
+		PCB_ACT_FAIL(SaveTo);
+
+	switch(op) {
+		case F_Layout:
+			if (argc != 2) {
+				pcb_message(PCB_MSG_ERROR, "SaveTo(Layout) doesn't take file name or format - did you mean SaveTo(LayoutAs)?\n");
+				return FGW_ERR_ARGC;
+			}
+			if (pcb_save_pcb(PCB->Filename, NULL) == 0)
+				pcb_board_set_changed_flag(pcb_false);
+			if (pcb_gui->notify_filename_changed != NULL)
+				pcb_gui->notify_filename_changed();
+			return 0;
+
+		case F_LayoutAs:
+			if (pcb_save_pcb(name, fmt) == 0) {
+				pcb_board_set_changed_flag(pcb_false);
+				free(PCB->Filename);
+				PCB->Filename = pcb_strdup(name);
+				if (pcb_gui->notify_filename_changed != NULL)
+					pcb_gui->notify_filename_changed();
+			}
+			return 0;
+
+		case F_AllConnections:
+			{
+				FILE *fp;
+				pcb_bool result;
+				if ((fp = pcb_check_and_open_file(name, pcb_true, pcb_false, &result, NULL)) != NULL) {
+					pcb_lookup_conns_to_all_elements(fp);
+					fclose(fp);
+					pcb_board_set_changed_flag(pcb_true);
+				}
+				return 0;
+			}
+
+		case F_AllUnusedPins:
+			{
+				FILE *fp;
+				pcb_bool result;
+				if ((fp = pcb_check_and_open_file(name, pcb_true, pcb_false, &result, NULL)) != NULL) {
+					pcb_lookup_unused_pins(fp);
+					fclose(fp);
+					pcb_board_set_changed_flag(pcb_true);
+				}
+				return 0;
+			}
+
+		case F_ElementConnections:
+		case F_SubcConnections:
+			{
+				void *ptrtmp;
+				FILE *fp;
+				pcb_bool result;
+				pcb_coord_t x, y;
+
+				pcb_hid_get_coords("Click on an element", &x, &y, 0);
+				if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) {
+					pcb_subc_t *subc = (pcb_subc_t *) ptrtmp;
+					if ((fp = pcb_check_and_open_file(name, pcb_true, pcb_false, &result, NULL)) != NULL) {
+						pcb_lookup_subc_conns(subc, fp);
+						fclose(fp);
+						pcb_board_set_changed_flag(pcb_true);
+					}
+				}
+				return 0;
+			}
+
+		case F_PasteBuffer:
+			PCB_ACT_IRES(pcb_save_buffer_elements(name, fmt));
+			return 0;
+	}
+
+	PCB_ACT_FAIL(SaveTo);
+}
+
+static const char pcb_acts_Quit[] = "Quit()";
+static const char pcb_acth_Quit[] = "Quits the application after confirming.";
+
+/* %start-doc actions Quit
+
+If you have unsaved changes, you will be prompted to confirm (or
+save) before quitting.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *force = NULL;
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Quit, force = argv[1].val.str);
+
+	if ((force != NULL) && (pcb_strcasecmp(force, "force") == 0))
+		exit(0);
+	if (!PCB->Changed || pcb_gui->close_confirm_dialog() == HID_CLOSE_CONFIRM_OK)
+		pcb_quit_app();
+
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+
+static const char pcb_acts_Export[] = "Export(exporter, [exporter-args])";
+static const char pcb_acth_Export[] = "Export the current layout, e.g. Export(png, --dpi, 600)";
+static fgw_error_t pcb_act_Export(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *args[128];
+	char **a;
+	int n;
+
+	if (argc < 1) {
+		pcb_message(PCB_MSG_ERROR, "Export() needs at least one argument, the name of the export plugin\n");
+		return 1;
+	}
+
+	if (argc > sizeof(args)/sizeof(args[0])) {
+		pcb_message(PCB_MSG_ERROR, "Export(): too many arguments\n");
+		return 1;
+	}
+
+	for(n = 1; n < argc; n++)
+		PCB_ACT_CONVARG(n, FGW_STR, Export, args[n-1] = argv[n].val.str);
+
+	pcb_exporter = pcb_hid_find_exporter(args[0]);
+	if (pcb_exporter == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Export plugin %s not found. Was it enabled in ./configure?\n", argv[0]);
+		return 1;
+	}
+
+	/* remove the name of the exporter */
+	argc-=2;
+
+	/* call the exporter */
+	a = args;
+	a++;
+	pcb_exporter->parse_arguments(&argc, &a);
+	pcb_exporter->do_export(NULL);
+
+	pcb_exporter = NULL;
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_Backup[] = "Backup()";
+static const char pcb_acth_Backup[] = "Backup the current layout - save using the same method that the timed backup function uses";
+static fgw_error_t pcb_act_Backup(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_backup();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t file_action_list[] = {
+	{"Backup", pcb_act_Backup, pcb_acth_Backup, pcb_acts_Backup},
+	{"Export", pcb_act_Export, pcb_acth_Export, pcb_acts_Export},
+	{"LoadFrom", pcb_act_LoadFrom, pcb_acth_LoadFrom, pcb_acts_LoadFrom},
+	{"New", pcb_act_New, pcb_acth_New, pcb_acts_New},
+	{"Normalize", pcb_act_normalize, pcb_acth_normalize, pcb_acts_normalize},
+	{"SaveTo", pcb_act_SaveTo, pcb_acth_SaveTo, pcb_acts_SaveTo},
+	{"Quit", pcb_act_Quit, pcb_acth_Quit, pcb_acts_Quit}
+};
+
+PCB_REGISTER_ACTIONS(file_action_list, NULL)
Index: tags/2.0.1/src/find.c
===================================================================
--- tags/2.0.1/src/find.c	(nonexistent)
+++ tags/2.0.1/src/find.c	(revision 18980)
@@ -0,0 +1,174 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/*
+ * short description:
+ * - lists for padstacks, lines, arcs, pads and for polygons are created.
+ *   Every object that has to be checked is added to its list.
+ *   Coarse searching is accomplished with the data rtrees.
+ * - there's no 'speed-up' mechanism for polygons because they are not used
+ *   as often as other objects
+ * - the maximum distance between line and pin ... would depend on the angle
+ *   between them. To speed up computation the limit is set to one half
+ *   of the thickness of the objects (cause of square pins).
+ *
+ * PS:  means padstack
+ * LO:  all non PS objects (layer objects like lines, arcs, polygons, texts)
+ *
+ * 1. first, the LO or PS at the given coordinates is looked up
+ * 2. all LO connections to that PS are looked up next
+ * 3. lookup of all LOs connected to LOs from (2).
+ *    This step is repeated until no more new connections are found.
+ * 4. lookup all PSs connected to the LOs from (2) and (3)
+ * 5. start again with (1) for all new PSs from (4)
+ *
+ */
+
+/* routines to find connections between objects */
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#include <assert.h>
+
+#include "math_helper.h"
+#include "conf_core.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "find.h"
+#include "rtree.h"
+#include "polygon.h"
+#include "search.h"
+#include "undo.h"
+#include "rats.h"
+#include "plug_io.h"
+#include "actions.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "layer.h"
+#include "event.h"
+#include "layer_vis.h"
+
+#include "obj_text_draw.h"
+#include "obj_pstk.h"
+#include "obj_subc.h"
+#include "obj_subc_parent.h"
+
+#undef DEBUG
+
+#define	SEPARATE(FP)							\
+	{											\
+		int	i;									\
+		fputc('#', (FP));						\
+		for (i = conf_core.appearance.messages.char_per_line; i; i--)	\
+			fputc('=', (FP));					\
+		fputc('\n', (FP));						\
+	}
+
+#define	LINELIST_ENTRY(L,I)	\
+	(((pcb_line_t **)LineList[(L)].Data)[(I)])
+
+#define	ARCLIST_ENTRY(L,I)	\
+	(((pcb_arc_t **)ArcList[(L)].Data)[(I)])
+
+#define RATLIST_ENTRY(I)	\
+	(((pcb_rat_t **)RatList.Data)[(I)])
+
+#define	POLYGONLIST_ENTRY(L,I)	\
+	(((pcb_poly_t **)PolygonList[(L)].Data)[(I)])
+
+#define	PADSTACKLIST_ENTRY(I)	\
+	(((pcb_pstk_t **)PadstackList.Data)[(I)])
+
+/* ---------------------------------------------------------------------------
+ * the two 'dummy' structs for PVs and Pads are necessary for creating
+ * connection lists which include the subcircuit's name
+ */
+typedef struct {
+	void **Data;									/* pointer to index data */
+	pcb_cardinal_t Location,						/* currently used position */
+	  DrawLocation, Number,				/* number of objects in list */
+	  Size;
+} ListType, *ListTypePtr;
+
+static pcb_coord_t Bloat = 0;
+static int TheFlag = PCB_FLAG_FOUND;
+static int OldFlag = PCB_FLAG_FOUND;
+static void *thing_ptr1, *thing_ptr2, *thing_ptr3;
+static int thing_type;
+pcb_find_callback_t pcb_find_callback = NULL;
+#define make_callback(current_type, current_ptr, from_type, from_ptr, type) \
+	do { \
+		if (pcb_find_callback != NULL) \
+			pcb_find_callback(current_type, current_ptr, from_type, from_ptr, type); \
+	} while(0)
+
+static pcb_bool User = pcb_false;				/* user action causing this */
+static pcb_bool drc = pcb_false;				/* whether to stop if finding something not found */
+static pcb_bool IsBad = pcb_false;
+static pcb_cardinal_t drcerr_count;		/* count of drc errors */
+static pcb_cardinal_t TotalPs;
+static ListType LineList[PCB_MAX_LAYER+2],	/* list of objects to */
+  PolygonList[PCB_MAX_LAYER+2], ArcList[PCB_MAX_LAYER+2],
+  RatList, PadstackList;
+
+static pcb_bool LookupLOConnectionsToPSList(pcb_bool);
+static pcb_bool LookupLOConnectionsToLOList(pcb_bool);
+static pcb_bool LookupLOConnectionsToLine(pcb_line_t *, pcb_cardinal_t, pcb_bool);
+static pcb_bool LookupLOConnectionsToPolygon(pcb_poly_t *, pcb_cardinal_t);
+static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *, pcb_cardinal_t);
+static pcb_bool LookupLOConnectionsToRatEnd(pcb_point_t *, pcb_cardinal_t);
+static pcb_bool IsRatPointOnLineSpec(pcb_point_t *, pcb_line_t *);
+static pcb_bool IsRatPointOnPoly(pcb_point_t *Point, pcb_poly_t *polygon);
+static pcb_bool IsRatPointOnArcSpec(pcb_point_t *Point, pcb_arc_t *arc);
+static pcb_bool ArcArcIntersect(pcb_arc_t *, pcb_arc_t *);
+static pcb_bool pcb_print_subc_conns(pcb_subc_t *, FILE *, pcb_bool);
+static pcb_bool ListsEmpty(pcb_bool);
+static pcb_bool DoIt(pcb_bool, pcb_bool);
+static void PrintElementNameList(pcb_subc_t *, FILE *);
+static void pcb_print_conn_subc_name(pcb_subc_t *, FILE *);
+static void pcb_print_conn_list_entry(char *, pcb_subc_t *, pcb_bool, FILE *);
+static void DumpList(void);
+static pcb_bool ListStart(pcb_any_obj_t *obj);
+static pcb_bool SetThing(int, void *, void *, void *);
+
+
+#include "find_geo.c"
+#include "find_lookup.c"
+#include "find_drc.c"
+#include "find_misc.c"
+#include "find_clear.c"
+
+#include "find_debug.c"
+#include "find_print.c"
+
+#include "find_any_isect.c"
Index: tags/2.0.1/src/find.h
===================================================================
--- tags/2.0.1/src/find.h	(nonexistent)
+++ tags/2.0.1/src/find.h	(revision 18980)
@@ -0,0 +1,95 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Find galvanic/geometrical connections */
+
+#ifndef	PCB_FIND_H
+#define	PCB_FIND_H
+
+#include <stdio.h>							/* needed to define 'FILE *' */
+#include "config.h"
+#include "obj_common.h"
+
+typedef enum {
+	PCB_FCT_COPPER   = 1, /* copper connection */
+	PCB_FCT_INTERNAL = 2, /* element-internal connection */
+	PCB_FCT_RAT      = 4, /* connected by a rat line */
+	PCB_FCT_ELEMENT  = 8, /* pin/pad is part of an element whose pins/pads are being listed */
+	PCB_FCT_START    = 16 /* starting object of a query */
+} pcb_found_conn_type_t;
+
+typedef void (*pcb_find_callback_t)(int current_type, void *current_ptr, int from_type, void *from_ptr,
+																pcb_found_conn_type_t conn_type);
+
+
+/* if not NULL, this function is called whenever something is found
+   (in LookupConnections for example). The caller should save the original
+   value and set that back around the call, if the callback needs to be changed.
+   */
+extern pcb_find_callback_t pcb_find_callback;
+
+#define PCB_LOOKUP_FIRST	\
+	(PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART)
+#define PCB_LOOKUP_MORE	\
+	(PCB_OBJ_LINE | PCB_OBJ_RAT | PCB_OBJ_POLY | PCB_OBJ_ARC | PCB_OBJ_SUBC_PART)
+#define PCB_SILK_TYPE	\
+	(PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY)
+
+pcb_bool pcb_intersect_line_line(pcb_line_t *, pcb_line_t *);
+pcb_bool pcb_intersect_line_arc(pcb_line_t *, pcb_arc_t *);
+pcb_bool pcb_is_poly_in_poly(pcb_poly_t *, pcb_poly_t *);
+void pcb_lookup_conns_to_all_elements(FILE *);
+void pcb_lookup_conn(pcb_coord_t, pcb_coord_t, pcb_bool, pcb_coord_t, int);
+void pcb_lookup_conn_by_pin(int type, void *ptr1);
+void pcb_lookup_unused_pins(FILE *);
+pcb_bool pcb_reset_found_lines_polys(pcb_bool);
+pcb_bool pcb_reset_found_pins_vias_pads(pcb_bool);
+pcb_bool pcb_reset_conns(pcb_bool);
+void pcb_conn_lookup_init(void);
+void pcb_layout_lookup_init(void);
+void pcb_conn_lookup_uninit(void);
+void pcb_layout_lookup_uninit(void);
+void pcb_rat_find_hook(pcb_any_obj_t *obj, pcb_bool undo, pcb_bool AndRats);
+void pcb_save_find_flag(int);
+void pcb_restore_find_flag(void);
+int pcb_drc_all(void);
+pcb_bool pcb_is_line_in_poly(pcb_line_t *, pcb_poly_t *);
+pcb_bool pcb_is_arc_in_poly(pcb_arc_t *, pcb_poly_t *);
+pcb_bool pcb_intersect_obj_obj(pcb_any_obj_t *a, pcb_any_obj_t *b);
+pcb_bool_t pcb_pstk_intersect_line(pcb_pstk_t *ps, pcb_line_t *line);
+
+
+pcb_cardinal_t pcb_lookup_conn_by_obj(void *ctx, pcb_any_obj_t *obj, pcb_bool AndDraw, pcb_cardinal_t (*cb)(void *ctx, pcb_any_obj_t *obj));
+
+/* find_clear.c */
+pcb_bool pcb_clear_flag_on_pins_vias_pads(pcb_bool AndDraw, int flag);
+pcb_bool pcb_clear_flag_on_lines_polys(pcb_bool AndDraw, int flag);
+
+void pcb_lookup_subc_conns(pcb_subc_t *subc, FILE * FP);
+
+#endif
Index: tags/2.0.1/src/find_act.c
===================================================================
--- tags/2.0.1/src/find_act.c	(nonexistent)
+++ tags/2.0.1/src/find_act.c	(revision 18980)
@@ -0,0 +1,84 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "actions.h"
+#include "board.h"
+#include "conf_core.h"
+#include "data.h"
+#include "error.h"
+#include "find.h"
+#include "compat_nls.h"
+
+/* -------------------------------------------------------------------------- */
+
+static const char drc_syntax[] = "DRC()";
+
+static const char drc_help[] = "Invoke the DRC check.";
+
+/* %start-doc actions DRC
+
+Note that the design rule check uses the current board rule settings,
+not the current style settings.
+
+%end-doc */
+
+static fgw_error_t pcb_act_DRCheck(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int count;
+
+	if (pcb_gui->drc_gui == NULL || pcb_gui->drc_gui->log_drc_overview) {
+		pcb_message(PCB_MSG_INFO, _("%m+Rules are minspace %$mS, minoverlap %$mS "
+							"minwidth %$mS, minsilk %$mS\n"
+							"min drill %$mS, min annular ring %$mS\n"),
+						conf_core.editor.grid_unit->allow, conf_core.design.bloat, conf_core.design.shrink, conf_core.design.min_wid, conf_core.design.min_slk, conf_core.design.min_drill, conf_core.design.min_ring);
+	}
+	count = pcb_drc_all();
+	if (pcb_gui->drc_gui == NULL || pcb_gui->drc_gui->log_drc_overview) {
+		if (count == 0)
+			pcb_message(PCB_MSG_INFO, _("No DRC problems found.\n"));
+		else if (count > 0)
+			pcb_message(PCB_MSG_INFO, _("Found %d design rule errors.\n"), count);
+		else
+			pcb_message(PCB_MSG_INFO, _("Aborted DRC after %d design rule errors.\n"), -count);
+	}
+
+	PCB_ACT_IRES(count);
+	return 0;
+}
+
+pcb_action_t find_action_list[] = {
+	{"DRC", pcb_act_DRCheck, drc_help, drc_syntax}
+};
+
+PCB_REGISTER_ACTIONS(find_action_list, NULL)
Index: tags/2.0.1/src/find_any_isect.c
===================================================================
--- tags/2.0.1/src/find_any_isect.c	(nonexistent)
+++ tags/2.0.1/src/find_any_isect.c	(revision 18980)
@@ -0,0 +1,110 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This module, diag, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+#warning TODO: implement text intersections
+pcb_bool pcb_intersect_text_line(pcb_text_t *a, pcb_line_t *b) { return pcb_false; }
+pcb_bool pcb_intersect_text_text(pcb_text_t *a, pcb_text_t *b) { return pcb_false; }
+pcb_bool pcb_intersect_text_poly(pcb_text_t *a, pcb_poly_t *b) { return pcb_false; }
+pcb_bool pcb_intersect_text_arc(pcb_text_t *a, pcb_arc_t *b) { return pcb_false; }
+pcb_bool pcb_intersect_text_pstk(pcb_text_t *a, pcb_pstk_t *b) { return pcb_false; }
+
+pcb_bool pcb_intersect_obj_obj(pcb_any_obj_t *a, pcb_any_obj_t *b)
+{
+	/* produce the clopped version for polygons to compare */
+	if ((a->type == PCB_OBJ_POLY) && (((pcb_poly_t *)a)->Clipped == NULL))
+		pcb_poly_init_clip(a->parent.layer->parent.data, a->parent.layer, (pcb_poly_t *)a);
+	if ((b->type == PCB_OBJ_POLY) && (((pcb_poly_t *)b)->Clipped == NULL))
+		pcb_poly_init_clip(b->parent.layer->parent.data, b->parent.layer, (pcb_poly_t *)b);
+
+	switch(a->type) {
+		case PCB_OBJ_VOID: return pcb_false;
+		case PCB_OBJ_LINE:
+			switch(b->type) {
+				case PCB_OBJ_VOID: return pcb_false;
+				case PCB_OBJ_LINE: return pcb_intersect_line_line((pcb_line_t *)a, (pcb_line_t *)b);
+				case PCB_OBJ_TEXT: return pcb_intersect_text_line((pcb_text_t *)b, (pcb_line_t *)a);
+				case PCB_OBJ_POLY: return pcb_is_line_in_poly((pcb_line_t *)a, (pcb_poly_t *)b);
+				case PCB_OBJ_ARC:  return pcb_intersect_line_arc((pcb_line_t *)a, (pcb_arc_t *)b);
+				case PCB_OBJ_PSTK: return pcb_pstk_intersect_line((pcb_pstk_t *)b, (pcb_line_t *)a);
+				default:;
+			}
+			break;
+		case PCB_OBJ_TEXT:
+			switch(b->type) {
+				case PCB_OBJ_VOID: return pcb_false;
+				case PCB_OBJ_LINE: return pcb_intersect_text_line((pcb_text_t *)a, (pcb_line_t *)b);
+				case PCB_OBJ_TEXT: return pcb_intersect_text_text((pcb_text_t *)a, (pcb_text_t *)b);
+				case PCB_OBJ_POLY: return pcb_intersect_text_poly((pcb_text_t *)a, (pcb_poly_t *)b);
+				case PCB_OBJ_ARC:  return pcb_intersect_text_arc((pcb_text_t *)a, (pcb_arc_t *)b);
+				case PCB_OBJ_PSTK: return pcb_intersect_text_pstk((pcb_text_t *)a, (pcb_pstk_t *)b);
+				default:;
+			}
+			break;
+
+		case PCB_OBJ_POLY:
+			switch(b->type) {
+				case PCB_OBJ_VOID: return pcb_false;
+				case PCB_OBJ_LINE: return pcb_is_line_in_poly((pcb_line_t *)b, (pcb_poly_t *)a);
+				case PCB_OBJ_TEXT: return pcb_intersect_text_poly((pcb_text_t *)b, (pcb_poly_t *)a);
+				case PCB_OBJ_POLY: return pcb_is_poly_in_poly((pcb_poly_t *)a, (pcb_poly_t *)b);
+				case PCB_OBJ_ARC:  return pcb_is_arc_in_poly((pcb_arc_t *)b, (pcb_poly_t *)a);
+				case PCB_OBJ_PSTK: return pcb_pstk_intersect_poly((pcb_pstk_t *)b, (pcb_poly_t *)a);
+				default:;
+			}
+			break;
+		case PCB_OBJ_ARC:
+			switch(b->type) {
+				case PCB_OBJ_VOID: return pcb_false;
+				case PCB_OBJ_LINE: return pcb_intersect_line_arc((pcb_line_t *)b, (pcb_arc_t *)a);
+				case PCB_OBJ_TEXT: return pcb_intersect_text_arc((pcb_text_t *)b, (pcb_arc_t *)a);
+				case PCB_OBJ_POLY: return pcb_is_arc_in_poly((pcb_arc_t *)a, (pcb_poly_t *)b);
+				case PCB_OBJ_ARC:  return ArcArcIntersect((pcb_arc_t *)a, (pcb_arc_t *)b);
+				case PCB_OBJ_PSTK: return pcb_pstk_intersect_arc((pcb_pstk_t *)b, (pcb_arc_t *)a);
+				default:;
+			}
+			break;
+		case PCB_OBJ_PSTK:
+			switch(b->type) {
+				case PCB_OBJ_VOID: return pcb_false;
+				case PCB_OBJ_LINE: return pcb_pstk_intersect_line((pcb_pstk_t *)a, (pcb_line_t *)b);
+				case PCB_OBJ_TEXT: return pcb_intersect_text_pstk((pcb_text_t *)b, (pcb_pstk_t *)a);
+				case PCB_OBJ_POLY: return pcb_pstk_intersect_poly((pcb_pstk_t *)a, (pcb_poly_t *)b);
+				case PCB_OBJ_ARC:  return pcb_pstk_intersect_arc((pcb_pstk_t *)a, (pcb_arc_t *)b);
+				case PCB_OBJ_PSTK: return pcb_pstk_intersect_pstk((pcb_pstk_t *)a, (pcb_pstk_t *)b);
+				default:;
+			}
+			break;
+		default:;
+	}
+	assert(!"Don't know how to check intersection of these objet types");
+	return pcb_false;
+}
+
+
Index: tags/2.0.1/src/find_clear.c
===================================================================
--- tags/2.0.1/src/find_clear.c	(nonexistent)
+++ tags/2.0.1/src/find_clear.c	(revision 18980)
@@ -0,0 +1,190 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Resets all used flags of pins and vias. */
+#warning TODO: this file could be removed if ipcd356 used the operation API
+pcb_bool pcb_clear_flag_on_pins_vias_pads(pcb_bool AndDraw, int flag)
+{
+	pcb_bool change = pcb_false;
+
+	PCB_PADSTACK_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, padstack)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(padstack);
+			PCB_FLAG_CLEAR(flag, padstack);
+			if (AndDraw)
+				pcb_pstk_invalidate_draw(padstack);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		PCB_PADSTACK_LOOP(subc->data);
+		{
+			if (padstack->term == NULL)
+				continue;
+			if (PCB_FLAG_TEST(flag, padstack)) {
+				if (AndDraw)
+					pcb_undo_add_obj_to_flag(padstack);
+				PCB_FLAG_CLEAR(flag, padstack);
+				if (AndDraw)
+					pcb_pstk_invalidate_draw(padstack);
+				change = pcb_true;
+			}
+		}
+		PCB_END_LOOP;
+
+		PCB_LINE_ALL_LOOP(subc->data);
+		{
+			if (line->term == NULL)
+				continue;
+			if (PCB_FLAG_TEST(flag, line)) {
+				if (AndDraw)
+					pcb_undo_add_obj_to_flag(line);
+				PCB_FLAG_CLEAR(flag, line);
+				if (AndDraw)
+					pcb_line_invalidate_draw(layer, line);
+				change = pcb_true;
+			}
+		}
+		PCB_ENDALL_LOOP;
+
+		PCB_ARC_ALL_LOOP(subc->data);
+		{
+			if (arc->term == NULL)
+				continue;
+			if (PCB_FLAG_TEST(flag, arc)) {
+				if (AndDraw)
+					pcb_undo_add_obj_to_flag(arc);
+				PCB_FLAG_CLEAR(flag, arc);
+				if (AndDraw)
+					pcb_arc_invalidate_draw(layer, arc);
+				change = pcb_true;
+			}
+		}
+		PCB_ENDALL_LOOP;
+
+		PCB_POLY_ALL_LOOP(subc->data);
+		{
+			if (polygon->term == NULL)
+				continue;
+			if (PCB_FLAG_TEST(flag, polygon)) {
+				if (AndDraw)
+					pcb_undo_add_obj_to_flag(polygon);
+				PCB_FLAG_CLEAR(flag, polygon);
+				if (AndDraw)
+					pcb_poly_invalidate_draw(layer, polygon);
+				change = pcb_true;
+			}
+		}
+		PCB_ENDALL_LOOP;
+
+		PCB_TEXT_ALL_LOOP(subc->data);
+		{
+			if (text->term == NULL)
+				continue;
+			if (PCB_FLAG_TEST(flag, text)) {
+				if (AndDraw)
+					pcb_undo_add_obj_to_flag(text);
+				PCB_FLAG_CLEAR(flag, text);
+				if (AndDraw)
+					pcb_text_invalidate_draw(layer, text);
+				change = pcb_true;
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+	PCB_END_LOOP;
+
+	if (change)
+		pcb_board_set_changed_flag(pcb_true);
+	return change;
+}
+
+/* Resets all used flags of LOs. */
+pcb_bool pcb_clear_flag_on_lines_polys(pcb_bool AndDraw, int flag)
+{
+	pcb_bool change = pcb_false;
+
+	PCB_RAT_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, line)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(flag, line);
+			if (AndDraw)
+				pcb_rat_invalidate_draw(line);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+	PCB_LINE_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, line)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(flag, line);
+			if (AndDraw)
+				pcb_line_invalidate_draw(layer, line);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, arc)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(arc);
+			PCB_FLAG_CLEAR(flag, arc);
+			if (AndDraw)
+				pcb_arc_invalidate_draw(layer, arc);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, polygon)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(polygon);
+			PCB_FLAG_CLEAR(flag, polygon);
+			if (AndDraw)
+				pcb_poly_invalidate_draw(layer, polygon);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	if (change)
+		pcb_board_set_changed_flag(pcb_true);
+	return change;
+}
Index: tags/2.0.1/src/find_deadcode.c
===================================================================
--- tags/2.0.1/src/find_deadcode.c	(nonexistent)
+++ tags/2.0.1/src/find_deadcode.c	(revision 18980)
@@ -0,0 +1,147 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Dead code - no calls to these functions from anywhere in the code */
+#error do not compile this
+
+
+static int LOT_Linecallback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line))
+		longjmp(i->env, 1);
+	return 0;
+}
+
+static int LOT_Arccallback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!arc->Thickness)
+		return 0;
+	if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc))
+		longjmp(i->env, 1);
+	return 0;
+}
+
+static int LOT_Padcallback(const pcb_box_t * b, void *cl)
+{
+	pcb_pad_t *pad = (pcb_pad_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE)
+			&& pcb_intersect_line_pad(&i->line, pad))
+		longjmp(i->env, 1);
+	return 0;
+}
+
+static pcb_bool PVTouchesLine(pcb_line_t *line)
+{
+	struct lo_info info;
+
+	info.line = *line;
+	EXPAND_BOUNDS(&info.line);
+	if (setjmp(info.env) == 0)
+		pcb_r_search(PCB->Data->via_tree, (pcb_box_t *) & info.line, NULL, pv_touch_callback, &info, NULL);
+	else
+		return pcb_true;
+	if (setjmp(info.env) == 0)
+		pcb_r_search(PCB->Data->pin_tree, (pcb_box_t *) & info.line, NULL, pv_touch_callback, &info, NULL);
+	else
+		return pcb_true;
+
+	return pcb_false;
+}
+
+static pcb_bool LOTouchesLine(pcb_line_t *Line, pcb_cardinal_t LayerGroup)
+{
+	pcb_cardinal_t entry;
+	struct lo_info info;
+
+
+	/* the maximum possible distance */
+
+	info.line = *Line;
+	EXPAND_BOUNDS(&info.line);
+
+	/* loop over all layers of the group */
+	for (entry = 0; entry < PCB->LayerGroups.Number[LayerGroup]; entry++) {
+		pcb_cardinal_t layer = PCB->LayerGroups.Entries[LayerGroup][entry];
+
+		/* handle normal layers */
+		if (layer < pcb_max_copper_layer) {
+			gdl_iterator_t it;
+			pcb_poly_t *polygon;
+
+			/* find the first line that touches coordinates */
+
+			if (setjmp(info.env) == 0)
+				pcb_r_search(LAYER_PTR(layer)->line_tree, (pcb_box_t *) & info.line, NULL, LOT_Linecallback, &info, NULL);
+			else
+				return pcb_true;
+			if (setjmp(info.env) == 0)
+				pcb_r_search(LAYER_PTR(layer)->arc_tree, (pcb_box_t *) & info.line, NULL, LOT_Arccallback, &info, NULL);
+			else
+				return pcb_true;
+
+			/* now check all polygons */
+			polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) {
+				if (!PCB_FLAG_TEST(TheFlag, polygon)
+						&& pcb_is_line_in_poly(Line, polygon))
+					return pcb_true;
+			}
+		}
+		else {
+			/* handle special 'pad' layers */
+			info.layer = layer - pcb_max_copper_layer;
+			if (setjmp(info.env) == 0)
+				pcb_r_search(PCB->Data->pad_tree, &info.line.BoundingBox, NULL, LOT_Padcallback, &info, NULL);
+			else
+				return pcb_true;
+		}
+	}
+	return pcb_false;
+}
+
+/* returns pcb_true if nothing un-found touches the passed line
+ * returns pcb_false if it would touch something not yet found
+ * doesn't include rat-lines in the search
+ */
+
+pcb_bool lineClear(pcb_line_t *line, pcb_cardinal_t group)
+{
+	if (LOTouchesLine(line, group))
+		return pcb_false;
+	if (PVTouchesLine(line))
+		return pcb_false;
+	return pcb_true;
+}
Index: tags/2.0.1/src/find_debug.c
===================================================================
--- tags/2.0.1/src/find_debug.c	(nonexistent)
+++ tags/2.0.1/src/find_debug.c	(revision 18980)
@@ -0,0 +1,70 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* find-related debug functions */
+
+/* writes the several names of a subcircuit to a file */
+static void PrintElementNameList(pcb_subc_t *subc, FILE * FP)
+{
+	fputc('(', FP);
+	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&subc->Attributes, "footprint")));
+	fputc(' ', FP);
+	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(subc->refdes));
+	fputc(' ', FP);
+	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&subc->Attributes, "value")));
+	fputc(')', FP);
+	fputc('\n', FP);
+}
+static void pcb_print_conn_subc_name(pcb_subc_t *subc, FILE * FP)
+{
+	fputs("Element", FP);
+	PrintElementNameList(subc, FP);
+	fputs("{\n", FP);
+}
+
+/* ---------------------------------------------------------------------------
+ * prints one {pin,pad,via}/element entry of connection lists
+ */
+static void pcb_print_conn_list_entry(char *ObjName, pcb_subc_t *subc, pcb_bool FirstOne, FILE * FP)
+{
+	if (FirstOne) {
+		fputc('\t', FP);
+		pcb_print_quoted_string(FP, ObjName);
+		fprintf(FP, "\n\t{\n");
+	}
+	else {
+		fprintf(FP, "\t\t");
+		pcb_print_quoted_string(FP, ObjName);
+		fputc(' ', FP);
+		if (subc)
+			PrintElementNameList(subc, FP);
+		else
+			fputs("(__VIA__)\n", FP);
+	}
+}
Index: tags/2.0.1/src/find_drc.c
===================================================================
--- tags/2.0.1/src/find_drc.c	(nonexistent)
+++ tags/2.0.1/src/find_drc.c	(revision 18980)
@@ -0,0 +1,645 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "drc.h"
+#include "compat_nls.h"
+#include "data_it.h"
+
+#include "obj_arc_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_line_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_pstk_draw.h"
+
+/* DRC related functions */
+
+static void GotoError(void);
+static pcb_bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3);
+
+static pcb_drc_violation_t
+	* pcb_drc_violation_new(const char *title,
+													const char *explanation,
+													pcb_coord_t x, pcb_coord_t y,
+													pcb_angle_t angle,
+													pcb_bool have_measured,
+													pcb_coord_t measured_value,
+													pcb_coord_t required_value, int object_count, long int *object_id_list, int *object_type_list)
+{
+	pcb_drc_violation_t *violation = (pcb_drc_violation_t *) malloc(sizeof(pcb_drc_violation_t));
+
+	violation->title = pcb_strdup(title);
+	violation->explanation = pcb_strdup(explanation);
+	violation->x = x;
+	violation->y = y;
+	violation->angle = angle;
+	violation->have_measured = have_measured;
+	violation->measured_value = measured_value;
+	violation->required_value = required_value;
+	violation->object_count = object_count;
+	violation->object_id_list = object_id_list;
+	violation->object_type_list = object_type_list;
+
+	return violation;
+}
+
+static void pcb_drc_violation_free(pcb_drc_violation_t * violation)
+{
+	free(violation->title);
+	free(violation->explanation);
+	free(violation);
+}
+
+static gds_t drc_dialog_message;
+static void reset_drc_dialog_message(void)
+{
+	gds_truncate(&drc_dialog_message, 0);
+	if (pcb_gui->drc_gui != NULL)
+		pcb_gui->drc_gui->reset_drc_dialog_message();
+}
+
+static void append_drc_dialog_message(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	pcb_append_vprintf(&drc_dialog_message, fmt, ap);
+	va_end(ap);
+}
+
+static void GotoError(void);
+
+/*----------------------------------------------------------------------------
+ * Build a list of the of offending items by ID. (Currently just "thing")
+ */
+static void BuildObjectList(int *object_count, long int **object_id_list, int **object_type_list)
+{
+	*object_count = 0;
+	*object_id_list = NULL;
+	*object_type_list = NULL;
+
+	switch (thing_type) {
+	case PCB_OBJ_LINE:
+	case PCB_OBJ_ARC:
+	case PCB_OBJ_POLY:
+	case PCB_OBJ_PSTK:
+	case PCB_OBJ_RAT:
+		*object_count = 1;
+		*object_id_list = (long int *) malloc(sizeof(long int));
+		*object_type_list = (int *) malloc(sizeof(int));
+		**object_id_list = ((pcb_any_obj_t *) thing_ptr3)->ID;
+		**object_type_list = thing_type;
+		return;
+
+	default:
+		fprintf(stderr, _("Internal error in BuildObjectList: unknown object type %i\n"), thing_type);
+	}
+}
+
+
+
+/*----------------------------------------------------------------------------
+ * Locate the coordinates of offending item (thing)
+ */
+static void LocateError(pcb_coord_t * x, pcb_coord_t * y)
+{
+	switch (thing_type) {
+	case PCB_OBJ_LINE:
+		{
+			pcb_line_t *line = (pcb_line_t *) thing_ptr3;
+			*x = (line->Point1.X + line->Point2.X) / 2;
+			*y = (line->Point1.Y + line->Point2.Y) / 2;
+			break;
+		}
+	case PCB_OBJ_ARC:
+		{
+			pcb_arc_t *arc = (pcb_arc_t *) thing_ptr3;
+			*x = arc->X;
+			*y = arc->Y;
+			break;
+		}
+	case PCB_OBJ_POLY:
+		{
+			pcb_poly_t *polygon = (pcb_poly_t *) thing_ptr3;
+			*x = (polygon->Clipped->contours->xmin + polygon->Clipped->contours->xmax) / 2;
+			*y = (polygon->Clipped->contours->ymin + polygon->Clipped->contours->ymax) / 2;
+			break;
+		}
+	case PCB_OBJ_PSTK:
+		{
+			pcb_pstk_t *ps = (pcb_pstk_t *) thing_ptr3;
+			*x = ps->x;
+			*y = ps->y;
+			break;
+		}
+	default:
+		return;
+	}
+}
+
+
+static void append_drc_violation(pcb_drc_violation_t * violation)
+{
+	if (pcb_gui->drc_gui != NULL) {
+		pcb_gui->drc_gui->append_drc_violation(violation);
+	}
+	else {
+		/* Fallback to formatting the violation message as text */
+		append_drc_dialog_message("%s\n", violation->title);
+		append_drc_dialog_message(_("%m+near %$mD\n"), conf_core.editor.grid_unit->allow, violation->x, violation->y);
+		GotoError();
+	}
+
+	if (pcb_gui->drc_gui == NULL || pcb_gui->drc_gui->log_drc_violations) {
+		pcb_message(PCB_MSG_WARNING, _("WARNING!  Design Rule error - %s\n"), violation->title);
+		pcb_message(PCB_MSG_WARNING, _("%m+near location %$mD\n"), conf_core.editor.grid_unit->allow, violation->x, violation->y);
+	}
+}
+
+
+/*
+ * message when asked about continuing DRC checks after next
+ * violation is found.
+ */
+#define DRC_CONTINUE _("Press Next to continue DRC checking")
+#define DRC_NEXT _("Next")
+#define DRC_CANCEL _("Cancel")
+
+static int throw_drc_dialog(void)
+{
+	int r;
+
+	if (pcb_gui->drc_gui != NULL) {
+		r = pcb_gui->drc_gui->throw_drc_dialog();
+	}
+	else {
+		/* Fallback to formatting the violation message as text */
+		append_drc_dialog_message(DRC_CONTINUE);
+		r = pcb_gui->confirm_dialog(drc_dialog_message.array, DRC_CANCEL, DRC_NEXT);
+		reset_drc_dialog_message();
+	}
+	return r;
+}
+
+/* DRC clearance callback */
+static pcb_r_dir_t drc_callback(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *polygon, int type, void *ptr1, void *ptr2)
+{
+	const char *message;
+	pcb_coord_t x, y;
+	int object_count;
+	long int *object_id_list;
+	int *object_type_list;
+	pcb_drc_violation_t *violation;
+
+	pcb_line_t *line = (pcb_line_t *) ptr2;
+	pcb_arc_t *arc = (pcb_arc_t *) ptr2;
+	pcb_pstk_t *ps = (pcb_pstk_t *) ptr2;
+
+	thing_type = type;
+	thing_ptr1 = ptr1;
+	thing_ptr2 = ptr2;
+	thing_ptr3 = ptr2;
+	switch (type) {
+	case PCB_OBJ_LINE:
+		if (line->Clearance < 2 * conf_core.design.bloat) {
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_SET(TheFlag, line);
+			message = _("Line with insufficient clearance inside polygon\n");
+			goto doIsBad;
+		}
+		break;
+	case PCB_OBJ_ARC:
+		if (arc->Clearance < 2 * conf_core.design.bloat) {
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_SET(TheFlag, arc);
+			message = _("Arc with insufficient clearance inside polygon\n");
+			goto doIsBad;
+		}
+		break;
+	case PCB_OBJ_PSTK:
+		if (pcb_pstk_drc_check_clearance(ps, polygon, 2 * conf_core.design.bloat) != 0) {
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_SET(TheFlag, ps);
+			message = _("Padstack with insufficient clearance inside polygon\n");
+			goto doIsBad;
+		}
+		break;
+	default:
+		pcb_message(PCB_MSG_ERROR, "hace: Bad Plow object in callback\n");
+	}
+	return PCB_R_DIR_NOT_FOUND;
+
+doIsBad:
+	pcb_undo_add_obj_to_flag(polygon);
+	PCB_FLAG_SET(PCB_FLAG_FOUND, polygon);
+	pcb_poly_invalidate_draw(layer, polygon);
+	pcb_draw_obj((pcb_any_obj_t *)ptr2);
+	drcerr_count++;
+	LocateError(&x, &y);
+	BuildObjectList(&object_count, &object_id_list, &object_type_list);
+	violation = pcb_drc_violation_new(message, _("Circuits that are too close may bridge during imaging, etching,\n" "plating, or soldering processes resulting in a direct short."), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																		pcb_false,	/* MEASUREMENT OF ERROR UNKNOWN */
+																		0,	/* MAGNITUDE OF ERROR UNKNOWN */
+																		conf_core.design.bloat, object_count, object_id_list, object_type_list);
+	append_drc_violation(violation);
+	pcb_drc_violation_free(violation);
+	free(object_id_list);
+	free(object_type_list);
+	if (!throw_drc_dialog()) {
+		IsBad = pcb_true;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	pcb_undo_inc_serial();
+	pcb_undo(pcb_true);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
+
+/*-----------------------------------------------------------------------------
+ * Check for DRC violations
+ * see if the connectivity changes when everything is bloated, or shrunk
+ */
+int pcb_drc_all(void)
+{
+	pcb_coord_t x, y;
+	int object_count;
+	long int *object_id_list;
+	int *object_type_list;
+	pcb_drc_violation_t *violation;
+	int nopastecnt = 0;
+
+	reset_drc_dialog_message();
+
+	IsBad = pcb_false;
+	drcerr_count = 0;
+	pcb_layervis_save_stack();
+	pcb_layervis_reset_stack();
+	pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	pcb_conn_lookup_init();
+
+	TheFlag = PCB_FLAG_FOUND | PCB_FLAG_DRC | PCB_FLAG_SELECTED;
+
+	if (pcb_reset_conns(pcb_true)) {
+		pcb_undo_inc_serial();
+		pcb_draw();
+	}
+
+	User = pcb_false;
+
+	/* search net (bloat) from subcircuit terminals */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			if (o->term == NULL) /* only terminals can be starting point of DRC net checks */
+				continue;
+			if (o->parent_type == PCB_PARENT_LAYER) { /* for layer objects, care about the ones on copper layers only */
+				pcb_layer_type_t lyt = pcb_layer_flags_(o->parent.layer);
+				if (!(lyt & PCB_LYT_COPPER))
+					continue;
+			}
+			DRCFind(pcb_obj_type2oldtype(o->type), (void *)subc, (void *)o, (void *)o);
+		}
+	}
+	PCB_END_LOOP;
+
+	if (!IsBad)
+	PCB_PADSTACK_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_DRC, padstack)
+				&& DRCFind(PCB_OBJ_PSTK, (void *) padstack, (void *) padstack, (void *) padstack)) {
+			IsBad = pcb_true;
+			break;
+		}
+	}
+	PCB_END_LOOP;
+
+	TheFlag = (IsBad) ? PCB_FLAG_DRC : (PCB_FLAG_FOUND | PCB_FLAG_DRC | PCB_FLAG_SELECTED);
+	pcb_reset_conns(pcb_false);
+	TheFlag = PCB_FLAG_SELECTED;
+	/* check minimum widths and polygon clearances */
+	if (!IsBad) {
+		PCB_LINE_COPPER_LOOP(PCB->Data);
+		{
+			/* check line clearances in polygons */
+			pcb_poly_plows(PCB->Data, PCB_OBJ_LINE, layer, line, drc_callback);
+			if (IsBad)
+				break;
+			if (line->Thickness < conf_core.design.min_wid) {
+				pcb_undo_add_obj_to_flag(line);
+				PCB_FLAG_SET(TheFlag, line);
+				pcb_line_invalidate_draw(layer, line);
+				drcerr_count++;
+				SetThing(PCB_OBJ_LINE, layer, line, line);
+				LocateError(&x, &y);
+				BuildObjectList(&object_count, &object_id_list, &object_type_list);
+				violation = pcb_drc_violation_new(_("Line width is too thin"), _("Process specifications dictate a minimum feature-width\n" "that can reliably be reproduced"), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																					pcb_true,	/* MEASUREMENT OF ERROR KNOWN */
+																					line->Thickness, conf_core.design.min_wid, object_count, object_id_list, object_type_list);
+				append_drc_violation(violation);
+				pcb_drc_violation_free(violation);
+				free(object_id_list);
+				free(object_type_list);
+				if (!throw_drc_dialog()) {
+					IsBad = pcb_true;
+					break;
+				}
+				pcb_undo_inc_serial();
+				pcb_undo(pcb_false);
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+	if (!IsBad) {
+		PCB_ARC_COPPER_LOOP(PCB->Data);
+		{
+			pcb_poly_plows(PCB->Data, PCB_OBJ_ARC, layer, arc, drc_callback);
+			if (IsBad)
+				break;
+			if (arc->Thickness < conf_core.design.min_wid) {
+				pcb_undo_add_obj_to_flag(arc);
+				PCB_FLAG_SET(TheFlag, arc);
+				pcb_arc_invalidate_draw(layer, arc);
+				drcerr_count++;
+				SetThing(PCB_OBJ_ARC, layer, arc, arc);
+				LocateError(&x, &y);
+				BuildObjectList(&object_count, &object_id_list, &object_type_list);
+				violation = pcb_drc_violation_new(_("Arc width is too thin"), _("Process specifications dictate a minimum feature-width\n" "that can reliably be reproduced"), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																					pcb_true,	/* MEASUREMENT OF ERROR KNOWN */
+																					arc->Thickness, conf_core.design.min_wid, object_count, object_id_list, object_type_list);
+				append_drc_violation(violation);
+				pcb_drc_violation_free(violation);
+				free(object_id_list);
+				free(object_type_list);
+				if (!throw_drc_dialog()) {
+					IsBad = pcb_true;
+					break;
+				}
+				pcb_undo_inc_serial();
+				pcb_undo(pcb_false);
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if (!IsBad) {
+		PCB_PADSTACK_LOOP(PCB->Data);
+		{
+			pcb_coord_t ring = 0, hole = 0;
+			pcb_poly_plows(PCB->Data, PCB_OBJ_PSTK, padstack, padstack, drc_callback);
+			if (IsBad)
+				break;
+			pcb_pstk_drc_check_and_warn(padstack, &ring, &hole);
+			if ((ring > 0) || (hole > 0)) {
+				pcb_undo_add_obj_to_flag(padstack);
+				PCB_FLAG_SET(TheFlag, padstack);
+				pcb_pstk_invalidate_draw(padstack);
+				if (ring) {
+					drcerr_count++;
+					SetThing(PCB_OBJ_PSTK, padstack, padstack, padstack);
+					LocateError(&x, &y);
+					BuildObjectList(&object_count, &object_id_list, &object_type_list);
+					violation = pcb_drc_violation_new(_("padstack annular ring too small"), _("Annular rings that are too small may erode during etching,\n" "resulting in a broken connection"), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																						pcb_true,	/* MEASUREMENT OF ERROR KNOWN */
+																						ring,
+																						conf_core.design.min_ring, object_count, object_id_list, object_type_list);
+					append_drc_violation(violation);
+					pcb_drc_violation_free(violation);
+				}
+				if (hole > 0) {
+					drcerr_count++;
+					SetThing(PCB_OBJ_PSTK, padstack, padstack, padstack);
+					LocateError(&x, &y);
+					BuildObjectList(&object_count, &object_id_list, &object_type_list);
+					violation = pcb_drc_violation_new(_("Padstack drill size is too small"), _("Process rules dictate the minimum drill size which can be used"), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																						pcb_true,	/* MEASUREMENT OF ERROR KNOWN */
+																						hole, conf_core.design.min_drill, object_count, object_id_list, object_type_list);
+					append_drc_violation(violation);
+					pcb_drc_violation_free(violation);
+				}
+				free(object_id_list);
+				free(object_type_list);
+				if (!throw_drc_dialog()) {
+					IsBad = pcb_true;
+					break;
+				}
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+	pcb_conn_lookup_uninit();
+	TheFlag = PCB_FLAG_FOUND;
+	Bloat = 0;
+
+	/* check silkscreen minimum widths outside of subcircuits */
+	/* XXX - need to check text and polygons too! */
+	TheFlag = PCB_FLAG_SELECTED;
+	if (!IsBad) {
+		PCB_LINE_SILK_LOOP(PCB->Data);
+		{
+			if (line->Thickness < conf_core.design.min_slk) {
+				PCB_FLAG_SET(TheFlag, line);
+				pcb_line_invalidate_draw(layer, line);
+				drcerr_count++;
+				SetThing(PCB_OBJ_LINE, layer, line, line);
+				LocateError(&x, &y);
+				BuildObjectList(&object_count, &object_id_list, &object_type_list);
+				violation = pcb_drc_violation_new(_("Silk line is too thin"), _("Process specifications dictate a minimum silkscreen feature-width\n" "that can reliably be reproduced"), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																					pcb_true,	/* MEASUREMENT OF ERROR KNOWN */
+																					line->Thickness, conf_core.design.min_slk, object_count, object_id_list, object_type_list);
+				append_drc_violation(violation);
+				pcb_drc_violation_free(violation);
+				free(object_id_list);
+				free(object_type_list);
+				if (!throw_drc_dialog()) {
+					IsBad = pcb_true;
+					break;
+				}
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if (IsBad) {
+		pcb_undo_inc_serial();
+	}
+
+	pcb_layervis_restore_stack();
+	pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	pcb_gui->invalidate_all();
+
+	if (nopastecnt > 0) {
+		pcb_message(PCB_MSG_WARNING, _("Warning:  %d pad%s the nopaste flag set.\n"), nopastecnt, nopastecnt > 1 ? "s have" : " has");
+	}
+	return IsBad ? -drcerr_count : drcerr_count;
+}
+
+
+
+/*-----------------------------------------------------------------------------
+ * Check for DRC violations on a single net starting from the pad or pin
+ * sees if the connectivity changes when everything is bloated, or shrunk
+ */
+static pcb_bool DRCFind(int What, void *ptr1, void *ptr2, void *ptr3)
+{
+	pcb_coord_t x, y;
+	int object_count;
+	long int *object_id_list;
+	int *object_type_list;
+	pcb_drc_violation_t *violation;
+
+	if (conf_core.design.shrink != 0) {
+		Bloat = -conf_core.design.shrink;
+		TheFlag = PCB_FLAG_DRC | PCB_FLAG_SELECTED;
+		ListStart(ptr2);
+		DoIt(pcb_true, pcb_false);
+		/* ok now the shrunk net has the PCB_FLAG_SELECTED set */
+		DumpList();
+		TheFlag = PCB_FLAG_FOUND;
+		ListStart(ptr2);
+		Bloat = 0;
+		drc = pcb_true;									/* abort the search if we find anything not already found */
+		if (DoIt(pcb_true, pcb_false)) {
+			DumpList();
+			/* make the flag changes undoable */
+			TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED;
+			pcb_reset_conns(pcb_false);
+			User = pcb_true;
+			drc = pcb_false;
+			Bloat = -conf_core.design.shrink;
+			TheFlag = PCB_FLAG_SELECTED;
+			ListStart(ptr2);
+			DoIt(pcb_true, pcb_true);
+			DumpList();
+			ListStart(ptr2);
+			TheFlag = PCB_FLAG_FOUND;
+			Bloat = 0;
+			drc = pcb_true;
+			DoIt(pcb_true, pcb_true);
+			DumpList();
+			User = pcb_false;
+			drc = pcb_false;
+			drcerr_count++;
+			LocateError(&x, &y);
+			BuildObjectList(&object_count, &object_id_list, &object_type_list);
+			violation = pcb_drc_violation_new(_("Potential for broken trace"), _("Insufficient overlap between objects can lead to broken tracks\n" "due to registration errors with old wheel style photo-plotters."), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																				pcb_false,	/* MEASUREMENT OF ERROR UNKNOWN */
+																				0,	/* MAGNITUDE OF ERROR UNKNOWN */
+																				conf_core.design.shrink, object_count, object_id_list, object_type_list);
+			append_drc_violation(violation);
+			pcb_drc_violation_free(violation);
+			free(object_id_list);
+			free(object_type_list);
+
+			if (!throw_drc_dialog())
+				return pcb_true;
+			pcb_undo_inc_serial();
+			pcb_undo(pcb_true);
+		}
+		DumpList();
+	}
+	/* now check the bloated condition */
+	drc = pcb_false;
+	pcb_reset_conns(pcb_false);
+	TheFlag = PCB_FLAG_FOUND;
+	ListStart(ptr2);
+	Bloat = conf_core.design.bloat;
+	drc = pcb_true;
+	while (DoIt(pcb_true, pcb_false)) {
+		DumpList();
+		/* make the flag changes undoable */
+		TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED;
+		pcb_reset_conns(pcb_false);
+		User = pcb_true;
+		drc = pcb_false;
+		Bloat = 0;
+		TheFlag = PCB_FLAG_SELECTED;
+		ListStart(ptr2);
+		DoIt(pcb_true, pcb_true);
+		DumpList();
+		TheFlag = PCB_FLAG_FOUND;
+		ListStart(ptr2);
+		Bloat = conf_core.design.bloat;
+		drc = pcb_true;
+		DoIt(pcb_true, pcb_true);
+		DumpList();
+		drcerr_count++;
+		LocateError(&x, &y);
+		BuildObjectList(&object_count, &object_id_list, &object_type_list);
+		violation = pcb_drc_violation_new(_("Copper areas too close"), _("Circuits that are too close may bridge during imaging, etching,\n" "plating, or soldering processes resulting in a direct short."), x, y, 0,	/* ANGLE OF ERROR UNKNOWN */
+																			pcb_false,	/* MEASUREMENT OF ERROR UNKNOWN */
+																			0,	/* MAGNITUDE OF ERROR UNKNOWN */
+																			conf_core.design.bloat, object_count, object_id_list, object_type_list);
+		append_drc_violation(violation);
+		pcb_drc_violation_free(violation);
+		free(object_id_list);
+		free(object_type_list);
+		User = pcb_false;
+		drc = pcb_false;
+		if (!throw_drc_dialog())
+			return pcb_true;
+		pcb_undo_inc_serial();
+		pcb_undo(pcb_true);
+		/* highlight the rest of the encroaching net so it's not reported again */
+		TheFlag |= PCB_FLAG_SELECTED;
+		Bloat = 0;
+		ListStart(thing_ptr2);
+		DoIt(pcb_true, pcb_true);
+		DumpList();
+		drc = pcb_true;
+		Bloat = conf_core.design.bloat;
+		ListStart(ptr2);
+	}
+	drc = pcb_false;
+	DumpList();
+	TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED | PCB_FLAG_DRC;
+	pcb_reset_conns(pcb_false);
+	return pcb_false;
+}
+
+/*----------------------------------------------------------------------------
+ * center the display to show the offending item (thing)
+ */
+static void GotoError(void)
+{
+	pcb_coord_t X, Y;
+
+	LocateError(&X, &Y);
+
+	switch (thing_type) {
+	case PCB_OBJ_LINE:
+	case PCB_OBJ_ARC:
+	case PCB_OBJ_POLY:
+		pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true);
+	}
+	pcb_center_display(X, Y);
+}
Index: tags/2.0.1/src/find_geo.c
===================================================================
--- tags/2.0.1/src/find_geo.c	(nonexistent)
+++ tags/2.0.1/src/find_geo.c	(revision 18980)
@@ -0,0 +1,991 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Generic geometric functions used by find.c lookup */
+
+/*
+ * Intersection of line <--> circle:
+ * - calculate the signed distance from the line to the center,
+ *   return false if abs(distance) > R
+ * - get the distance from the line <--> distancevector intersection to
+ *   (X1,Y1) in range [0,1], return pcb_true if 0 <= distance <= 1
+ * - depending on (r > 1.0 or r < 0.0) check the distance of X2,Y2 or X1,Y1
+ *   to X,Y
+ *
+ * Intersection of line <--> line:
+ * - see the description of 'pcb_intersect_line_line()'
+ */
+
+#include "macro.h"
+#include "obj_arc_ui.h"
+#include "obj_pstk_inlines.h"
+
+#define EXPAND_BOUNDS(p) if (Bloat > 0) {\
+       (p)->BoundingBox.X1 -= Bloat; \
+       (p)->BoundingBox.X2 += Bloat; \
+       (p)->BoundingBox.Y1 -= Bloat; \
+       (p)->BoundingBox.Y2 += Bloat;}
+
+/* reduce arc start angle and delta to 0..360 */
+static void normalize_angles(pcb_angle_t * sa, pcb_angle_t * d)
+{
+	if (*d < 0) {
+		*sa += *d;
+		*d = -*d;
+	}
+	if (*d > 360)									/* full circle */
+		*d = 360;
+	*sa = pcb_normalize_angle(*sa);
+}
+
+static int radius_crosses_arc(double x, double y, pcb_arc_t *arc)
+{
+	double alpha = atan2(y - arc->Y, -x + arc->X) * PCB_RAD_TO_DEG;
+	pcb_angle_t sa = arc->StartAngle, d = arc->Delta;
+
+	normalize_angles(&sa, &d);
+	if (alpha < 0)
+		alpha += 360;
+	if (sa <= alpha)
+		return (sa + d) >= alpha;
+	return (sa + d - 360) >= alpha;
+}
+
+static void get_arc_ends(pcb_coord_t * box, pcb_arc_t *arc)
+{
+	box[0] = arc->X - arc->Width * cos(PCB_M180 * arc->StartAngle);
+	box[1] = arc->Y + arc->Height * sin(PCB_M180 * arc->StartAngle);
+	box[2] = arc->X - arc->Width * cos(PCB_M180 * (arc->StartAngle + arc->Delta));
+	box[3] = arc->Y + arc->Height * sin(PCB_M180 * (arc->StartAngle + arc->Delta));
+}
+
+/* ---------------------------------------------------------------------------
+ * check if two arcs intersect
+ * first we check for circle intersections,
+ * then find the actual points of intersection
+ * and test them to see if they are on arcs
+ *
+ * consider a, the distance from the center of arc 1
+ * to the point perpendicular to the intersecting points.
+ *
+ *  a = (r1^2 - r2^2 + l^2)/(2l)
+ *
+ * the perpendicular distance to the point of intersection
+ * is then
+ *
+ * d = sqrt(r1^2 - a^2)
+ *
+ * the points of intersection would then be
+ *
+ * x = X1 + a/l dx +- d/l dy
+ * y = Y1 + a/l dy -+ d/l dx
+ *
+ * where dx = X2 - X1 and dy = Y2 - Y1
+ *
+ *
+ */
+static pcb_bool ArcArcIntersect(pcb_arc_t *Arc1, pcb_arc_t *Arc2)
+{
+	double x, y, dx, dy, r1, r2, a, d, l, t, t1, t2, dl;
+	pcb_coord_t pdx, pdy;
+	pcb_coord_t box[8];
+
+	t = 0.5 * Arc1->Thickness + Bloat;
+	t2 = 0.5 * Arc2->Thickness;
+	t1 = t2 + Bloat;
+
+	/* too thin arc */
+	if (t < 0 || t1 < 0)
+		return pcb_false;
+
+	/* try the end points first */
+	get_arc_ends(&box[0], Arc1);
+	get_arc_ends(&box[4], Arc2);
+	if (pcb_is_point_on_arc(box[0], box[1], t, Arc2)
+			|| pcb_is_point_on_arc(box[2], box[3], t, Arc2)
+			|| pcb_is_point_on_arc(box[4], box[5], t, Arc1)
+			|| pcb_is_point_on_arc(box[6], box[7], t, Arc1))
+		return pcb_true;
+
+	pdx = Arc2->X - Arc1->X;
+	pdy = Arc2->Y - Arc1->Y;
+	dl = pcb_distance(Arc1->X, Arc1->Y, Arc2->X, Arc2->Y);
+	/* concentric arcs, simpler intersection conditions */
+	if (dl < 0.5) {
+		if ((Arc1->Width - t >= Arc2->Width - t2 && Arc1->Width - t <= Arc2->Width + t2)
+				|| (Arc1->Width + t >= Arc2->Width - t2 && Arc1->Width + t <= Arc2->Width + t2)) {
+			pcb_angle_t sa1 = Arc1->StartAngle, d1 = Arc1->Delta;
+			pcb_angle_t sa2 = Arc2->StartAngle, d2 = Arc2->Delta;
+			/* NB the endpoints have already been checked,
+			   so we just compare the angles */
+
+			normalize_angles(&sa1, &d1);
+			normalize_angles(&sa2, &d2);
+			/* sa1 == sa2 was caught when checking endpoints */
+			if (sa1 > sa2)
+				if (sa1 < sa2 + d2 || sa1 + d1 - 360 > sa2)
+					return pcb_true;
+			if (sa2 > sa1)
+				if (sa2 < sa1 + d1 || sa2 + d2 - 360 > sa1)
+					return pcb_true;
+		}
+		return pcb_false;
+	}
+	r1 = Arc1->Width;
+	r2 = Arc2->Width;
+	/* arcs centerlines are too far or too near */
+	if (dl > r1 + r2 || dl + r1 < r2 || dl + r2 < r1) {
+		/* check the nearest to the other arc's center point */
+		dx = pdx * r1 / dl;
+		dy = pdy * r1 / dl;
+		if (dl + r1 < r2) {					/* Arc1 inside Arc2 */
+			dx = -dx;
+			dy = -dy;
+		}
+
+		if (radius_crosses_arc(Arc1->X + dx, Arc1->Y + dy, Arc1)
+				&& pcb_is_point_on_arc(Arc1->X + dx, Arc1->Y + dy, t, Arc2))
+			return pcb_true;
+
+		dx = -pdx * r2 / dl;
+		dy = -pdy * r2 / dl;
+		if (dl + r2 < r1) {					/* Arc2 inside Arc1 */
+			dx = -dx;
+			dy = -dy;
+		}
+
+		if (radius_crosses_arc(Arc2->X + dx, Arc2->Y + dy, Arc2)
+				&& pcb_is_point_on_arc(Arc2->X + dx, Arc2->Y + dy, t1, Arc1))
+			return pcb_true;
+		return pcb_false;
+	}
+
+	l = dl * dl;
+	r1 *= r1;
+	r2 *= r2;
+	a = 0.5 * (r1 - r2 + l) / l;
+	r1 = r1 / l;
+	d = r1 - a * a;
+	/* the circles are too far apart to touch or probably just touch:
+	   check the nearest point */
+	if (d < 0)
+		d = 0;
+	else
+		d = sqrt(d);
+	x = Arc1->X + a * pdx;
+	y = Arc1->Y + a * pdy;
+	dx = d * pdx;
+	dy = d * pdy;
+	if (radius_crosses_arc(x + dy, y - dx, Arc1)
+			&& pcb_is_point_on_arc(x + dy, y - dx, t, Arc2))
+		return pcb_true;
+	if (radius_crosses_arc(x + dy, y - dx, Arc2)
+			&& pcb_is_point_on_arc(x + dy, y - dx, t1, Arc1))
+		return pcb_true;
+
+	if (radius_crosses_arc(x - dy, y + dx, Arc1)
+			&& pcb_is_point_on_arc(x - dy, y + dx, t, Arc2))
+		return pcb_true;
+	if (radius_crosses_arc(x - dy, y + dx, Arc2)
+			&& pcb_is_point_on_arc(x - dy, y + dx, t1, Arc1))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * Tests if point is same as line end point or center point
+ */
+static pcb_bool IsRatPointOnLineSpec(pcb_point_t *Point, pcb_line_t *Line)
+{
+	pcb_coord_t cx, cy;
+
+	/* either end */
+	if ((Point->X == Line->Point1.X && Point->Y == Line->Point1.Y)
+			|| (Point->X == Line->Point2.X && Point->Y == Line->Point2.Y))
+		return pcb_true;
+
+	/* middle point */
+	pcb_obj_center((pcb_any_obj_t *)Line, &cx, &cy);
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * Tests if point is same as arc end point or center point
+ */
+static pcb_bool IsRatPointOnArcSpec(pcb_point_t *Point, pcb_arc_t *arc)
+{
+	pcb_coord_t cx, cy;
+
+	/* either end */
+	pcb_arc_get_end(arc, 0, &cx, &cy);
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	pcb_arc_get_end(arc, 1, &cx, &cy);
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	/* middle point */
+	pcb_arc_middle(arc, &cx, &cy);
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * Tests if rat line point is connected to a polygon
+ */
+static pcb_bool IsRatPointOnPoly(pcb_point_t *Point, pcb_poly_t *polygon)
+{
+	pcb_coord_t cx, cy;
+
+	/* canonical point */
+	cx = polygon->Clipped->contours->head.point[0];
+	cy = polygon->Clipped->contours->head.point[1];
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	/* middle point */
+	pcb_obj_center((pcb_any_obj_t *)polygon, &cx, &cy);
+	if ((Point->X == cx) && (Point->Y == cy))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+static void form_slanted_rectangle(pcb_point_t p[4], pcb_line_t *l)
+/* writes vertices of a squared line */
+{
+	double dwx = 0, dwy = 0;
+	if (l->Point1.Y == l->Point2.Y)
+		dwx = l->Thickness / 2.0;
+	else if (l->Point1.X == l->Point2.X)
+		dwy = l->Thickness / 2.0;
+	else {
+		pcb_coord_t dX = l->Point2.X - l->Point1.X;
+		pcb_coord_t dY = l->Point2.Y - l->Point1.Y;
+		double r = pcb_distance(l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y);
+		dwx = l->Thickness / 2.0 / r * dX;
+		dwy = l->Thickness / 2.0 / r * dY;
+	}
+	p[0].X = l->Point1.X - dwx + dwy;
+	p[0].Y = l->Point1.Y - dwy - dwx;
+	p[1].X = l->Point1.X - dwx - dwy;
+	p[1].Y = l->Point1.Y - dwy + dwx;
+	p[2].X = l->Point2.X + dwx - dwy;
+	p[2].Y = l->Point2.Y + dwy + dwx;
+	p[3].X = l->Point2.X + dwx + dwy;
+	p[3].Y = l->Point2.Y + dwy - dwx;
+}
+
+/* ---------------------------------------------------------------------------
+ * checks if two lines intersect
+ * from news FAQ:
+ *
+ *  Let A,B,C,D be 2-space position vectors.  Then the directed line
+ *  segments AB & CD are given by:
+ *
+ *      AB=A+r(B-A), r in [0,1]
+ *      CD=C+s(D-C), s in [0,1]
+ *
+ *  If AB & CD intersect, then
+ *
+ *      A+r(B-A)=C+s(D-C), or
+ *
+ *      XA+r(XB-XA)=XC+s(XD-XC)
+ *      YA+r(YB-YA)=YC+s(YD-YC)  for some r,s in [0,1]
+ *
+ *  Solving the above for r and s yields
+ *
+ *          (YA-YC)(XD-XC)-(XA-XC)(YD-YC)
+ *      r = -----------------------------  (eqn 1)
+ *          (XB-XA)(YD-YC)-(YB-YA)(XD-XC)
+ *
+ *          (YA-YC)(XB-XA)-(XA-XC)(YB-YA)
+ *      s = -----------------------------  (eqn 2)
+ *          (XB-XA)(YD-YC)-(YB-YA)(XD-XC)
+ *
+ *  Let I be the position vector of the intersection point, then
+ *
+ *      I=A+r(B-A) or
+ *
+ *      XI=XA+r(XB-XA)
+ *      YI=YA+r(YB-YA)
+ *
+ *  By examining the values of r & s, you can also determine some
+ *  other limiting conditions:
+ *
+ *      If 0<=r<=1 & 0<=s<=1, intersection exists
+ *          r<0 or r>1 or s<0 or s>1 line segments do not intersect
+ *
+ *      If the denominator in eqn 1 is zero, AB & CD are parallel
+ *      If the numerator in eqn 1 is also zero, AB & CD are coincident
+ *
+ *  If the intersection point of the 2 lines are needed (lines in this
+ *  context mean infinite lines) regardless whether the two line
+ *  segments intersect, then
+ *
+ *      If r>1, I is located on extension of AB
+ *      If r<0, I is located on extension of BA
+ *      If s>1, I is located on extension of CD
+ *      If s<0, I is located on extension of DC
+ *
+ *  Also note that the denominators of eqn 1 & 2 are identical.
+ *
+ */
+pcb_bool pcb_intersect_line_line(pcb_line_t *Line1, pcb_line_t *Line2)
+{
+	double s, r;
+	double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy;
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line1)) {	/* pretty reckless recursion */
+		pcb_point_t p[4];
+		form_slanted_rectangle(p, Line1);
+		return pcb_is_line_in_quadrangle(p, Line2);
+	}
+	/* here come only round Line1 because pcb_is_line_in_quadrangle()
+	   calls pcb_intersect_line_line() with first argument rounded */
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line2)) {
+		pcb_point_t p[4];
+		form_slanted_rectangle(p, Line2);
+		return pcb_is_line_in_quadrangle(p, Line1);
+	}
+	/* now all lines are round */
+
+	/* Check endpoints: this provides a quick exit, catches
+	 *  cases where the "real" lines don't intersect but the
+	 *  thick lines touch, and ensures that the dx/dy business
+	 *  below does not cause a divide-by-zero. */
+	if (pcb_is_point_in_line(Line2->Point1.X, Line2->Point1.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (pcb_any_line_t *) Line1)
+			|| pcb_is_point_in_line(Line2->Point2.X, Line2->Point2.Y, MAX(Line2->Thickness / 2 + Bloat, 0), (pcb_any_line_t *) Line1)
+			|| pcb_is_point_in_line(Line1->Point1.X, Line1->Point1.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (pcb_any_line_t *) Line2)
+			|| pcb_is_point_in_line(Line1->Point2.X, Line1->Point2.Y, MAX(Line1->Thickness / 2 + Bloat, 0), (pcb_any_line_t *) Line2))
+		return pcb_true;
+
+	/* setup some constants */
+	line1_dx = Line1->Point2.X - Line1->Point1.X;
+	line1_dy = Line1->Point2.Y - Line1->Point1.Y;
+	line2_dx = Line2->Point2.X - Line2->Point1.X;
+	line2_dy = Line2->Point2.Y - Line2->Point1.Y;
+	point1_dx = Line1->Point1.X - Line2->Point1.X;
+	point1_dy = Line1->Point1.Y - Line2->Point1.Y;
+
+	/* If either line is a point, we have failed already, since the
+	 *   endpoint check above will have caught an "intersection". */
+	if ((line1_dx == 0 && line1_dy == 0)
+			|| (line2_dx == 0 && line2_dy == 0))
+		return pcb_false;
+
+	/* set s to cross product of Line1 and the line
+	 *   Line1.Point1--Line2.Point1 (as vectors) */
+	s = point1_dy * line1_dx - point1_dx * line1_dy;
+
+	/* set r to cross product of both lines (as vectors) */
+	r = line1_dx * line2_dy - line1_dy * line2_dx;
+
+	/* No cross product means parallel lines, or maybe Line2 is
+	 *  zero-length. In either case, since we did a bounding-box
+	 *  check before getting here, the above pcb_is_point_in_line() checks
+	 *  will have caught any intersections. */
+	if (r == 0.0)
+		return pcb_false;
+
+	s /= r;
+	r = (point1_dy * line2_dx - point1_dx * line2_dy) / r;
+
+	/* intersection is at least on AB */
+	if (r >= 0.0 && r <= 1.0)
+		return (s >= 0.0 && s <= 1.0);
+
+	/* intersection is at least on CD */
+	/* [removed this case since it always returns pcb_false --asp] */
+	return pcb_false;
+}
+
+/*---------------------------------------------------
+ *
+ * Check for line intersection with an arc
+ *
+ * Mostly this is like the circle/line intersection
+ * found in pcb_is_point_on_line(search.c) see the detailed
+ * discussion for the basics there.
+ *
+ * Since this is only an arc, not a full circle we need
+ * to find the actual points of intersection with the
+ * circle, and see if they are on the arc.
+ *
+ * To do this, we translate along the line from the point Q
+ * plus or minus a distance delta = sqrt(Radius^2 - d^2)
+ * but it's handy to normalize with respect to l, the line
+ * length so a single projection is done (e.g. we don't first
+ * find the point Q
+ *
+ * The projection is now of the form
+ *
+ *      Px = X1 + (r +- r2)(X2 - X1)
+ *      Py = Y1 + (r +- r2)(Y2 - Y1)
+ *
+ * Where r2 sqrt(Radius^2 l^2 - d^2)/l^2
+ * note that this is the variable d, not the symbol d described in IsPointOnLine
+ * (variable d = symbol d * l)
+ *
+ * The end points are hell so they are checked individually
+ */
+pcb_bool pcb_intersect_line_arc(pcb_line_t *Line, pcb_arc_t *Arc)
+{
+	double dx, dy, dx1, dy1, l, d, r, r2, Radius;
+	pcb_coord_t ex, ey;
+
+	dx = Line->Point2.X - Line->Point1.X;
+	dy = Line->Point2.Y - Line->Point1.Y;
+	dx1 = Line->Point1.X - Arc->X;
+	dy1 = Line->Point1.Y - Arc->Y;
+	l = dx * dx + dy * dy;
+	d = dx * dy1 - dy * dx1;
+	d *= d;
+
+	/* use the larger diameter circle first */
+	Radius = Arc->Width + MAX(0.5 * (Arc->Thickness + Line->Thickness) + Bloat, 0.0);
+	Radius *= Radius;
+	r2 = Radius * l - d;
+	/* projection doesn't even intersect circle when r2 < 0 */
+	if (r2 < 0)
+		return pcb_false;
+	/* check the ends of the line in case the projected point */
+	/* of intersection is beyond the line end */
+	if (pcb_is_point_on_arc(Line->Point1.X, Line->Point1.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc))
+		return pcb_true;
+	if (pcb_is_point_on_arc(Line->Point2.X, Line->Point2.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc))
+		return pcb_true;
+	if (l == 0.0)
+		return pcb_false;
+	r2 = sqrt(r2);
+	Radius = -(dx * dx1 + dy * dy1);
+	r = (Radius + r2) / l;
+	if (r >= 0 && r <= 1
+			&& pcb_is_point_on_arc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0) + 1, Arc))
+		return pcb_true;
+	r = (Radius - r2) / l;
+	if (r >= 0 && r <= 1
+			&& pcb_is_point_on_arc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0) + 1, Arc))
+		return pcb_true;
+
+	/* check arc end points */
+	pcb_arc_get_end(Arc, 0, &ex, &ey);
+	if (pcb_is_point_in_line(ex, ey, Arc->Thickness * 0.5 + Bloat, (pcb_any_line_t *) Line))
+		return pcb_true;
+
+	pcb_arc_get_end(Arc, 1, &ex, &ey);
+	if (pcb_is_point_in_line(ex, ey, Arc->Thickness * 0.5 + Bloat, (pcb_any_line_t *) Line))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * checks if an arc has a connection to a polygon
+ *
+ * - first check if the arc can intersect with the polygon by
+ *   evaluating the bounding boxes
+ * - check the two end points of the arc. If none of them matches
+ * - check all segments of the polygon against the arc.
+ */
+pcb_bool pcb_is_arc_in_poly(pcb_arc_t *Arc, pcb_poly_t *Polygon)
+{
+	pcb_box_t *Box = (pcb_box_t *) Arc;
+
+	/* arcs with clearance never touch polys */
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, Polygon) && PCB_OBJ_HAS_CLEARANCE(Arc))
+		return pcb_false;
+	if (!Polygon->Clipped)
+		return pcb_false;
+	if (Box->X1 <= Polygon->Clipped->contours->xmax + Bloat
+			&& Box->X2 >= Polygon->Clipped->contours->xmin - Bloat
+			&& Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) {
+		pcb_polyarea_t *ap;
+
+		if (!(ap = pcb_poly_from_arc(Arc, Arc->Thickness + Bloat)))
+			return pcb_false;							/* error */
+		return pcb_poly_isects_poly(ap, Polygon, pcb_true);
+	}
+	return pcb_false;
+}
+
+pcb_bool pcb_is_arc_in_polyarea(pcb_arc_t *Arc, pcb_polyarea_t *pa)
+{
+	pcb_box_t *Box = (pcb_box_t *) Arc;
+	pcb_bool res = pcb_false;
+
+	/* arcs with clearance never touch polys */
+	if ((Box->X1 <= pa->contours->xmax + Bloat) && (Box->X2 >= pa->contours->xmin - Bloat)
+			&& (Box->Y1 <= pa->contours->ymax + Bloat) && (Box->Y2 >= pa->contours->ymin - Bloat)) {
+		pcb_polyarea_t *arcp;
+
+		if (!(arcp = pcb_poly_from_arc(Arc, Arc->Thickness + Bloat)))
+			return pcb_false; /* error */
+		res = pcb_polyarea_touching(arcp, pa);
+		pcb_polyarea_free(&arcp);
+	}
+	return res;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * checks if a line has a connection to a polygon
+ *
+ * - first check if the line can intersect with the polygon by
+ *   evaluating the bounding boxes
+ * - check the two end points of the line. If none of them matches
+ * - check all segments of the polygon against the line.
+ */
+pcb_bool pcb_is_line_in_poly(pcb_line_t *Line, pcb_poly_t *Polygon)
+{
+	pcb_box_t *Box = (pcb_box_t *) Line;
+	pcb_polyarea_t *lp;
+
+	/* lines with clearance never touch polygons */
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, Polygon) && PCB_OBJ_HAS_CLEARANCE(Line))
+		return pcb_false;
+	if (!Polygon->Clipped)
+		return pcb_false;
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Line) && (Line->Point1.X == Line->Point2.X || Line->Point1.Y == Line->Point2.Y)) {
+		pcb_coord_t wid = (Line->Thickness + Bloat + 1) / 2;
+		pcb_coord_t x1, x2, y1, y2;
+
+		x1 = MIN(Line->Point1.X, Line->Point2.X) - wid;
+		y1 = MIN(Line->Point1.Y, Line->Point2.Y) - wid;
+		x2 = MAX(Line->Point1.X, Line->Point2.X) + wid;
+		y2 = MAX(Line->Point1.Y, Line->Point2.Y) + wid;
+		return pcb_poly_is_rect_in_p(x1, y1, x2, y2, Polygon);
+	}
+	if (Box->X1 <= Polygon->Clipped->contours->xmax + Bloat
+			&& Box->X2 >= Polygon->Clipped->contours->xmin - Bloat
+			&& Box->Y1 <= Polygon->Clipped->contours->ymax + Bloat && Box->Y2 >= Polygon->Clipped->contours->ymin - Bloat) {
+		if (!(lp = pcb_poly_from_line(Line, Line->Thickness + Bloat)))
+			return pcb_false;							/* error */
+		return pcb_poly_isects_poly(lp, Polygon, pcb_true);
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * checks if a polygon has a connection to a second one
+ *
+ * First check all points out of P1 against P2 and vice versa.
+ * If both fail check all lines of P1 against the ones of P2
+ */
+pcb_bool pcb_is_poly_in_poly(pcb_poly_t *P1, pcb_poly_t *P2)
+{
+	int pcp_cnt = 0;
+	pcb_coord_t pcp_gap;
+
+	if (!P1->Clipped || !P2->Clipped)
+		return pcb_false;
+	assert(P1->Clipped->contours);
+	assert(P2->Clipped->contours);
+
+
+	/* first check if both bounding boxes intersect. If not, return quickly */
+	if (P1->Clipped->contours->xmin - Bloat > P2->Clipped->contours->xmax ||
+			P1->Clipped->contours->xmax + Bloat < P2->Clipped->contours->xmin ||
+			P1->Clipped->contours->ymin - Bloat > P2->Clipped->contours->ymax ||
+			P1->Clipped->contours->ymax + Bloat < P2->Clipped->contours->ymin)
+		return pcb_false;
+
+	/* cheat: poly-clear-poly means we did generate the clearance; this
+	   shall happen only if there's exactly one poly that is clearing the other */
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, P1)) {
+		pcp_cnt++;
+		pcp_gap = P1->Clearance / 2.0;
+	}
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, P2)) {
+		pcp_cnt++;
+		pcp_gap = P2->Clearance / 2.0;
+	}
+	if (pcp_cnt == 1) {
+		if (pcp_gap >= Bloat)
+			return pcb_false;
+		return pcb_true;
+	}
+
+	/* first check un-bloated case */
+	if (pcb_poly_isects_poly(P1->Clipped, P2, pcb_false))
+		return pcb_true;
+
+	/* now the difficult case of bloated */
+	if (Bloat > 0) {
+		pcb_pline_t *c;
+		for (c = P1->Clipped->contours; c; c = c->next) {
+			pcb_line_t line;
+			pcb_vnode_t *v = &c->head;
+			if (c->xmin - Bloat <= P2->Clipped->contours->xmax &&
+					c->xmax + Bloat >= P2->Clipped->contours->xmin &&
+					c->ymin - Bloat <= P2->Clipped->contours->ymax && c->ymax + Bloat >= P2->Clipped->contours->ymin) {
+
+				line.Point1.X = v->point[0];
+				line.Point1.Y = v->point[1];
+				line.Thickness = 2 * Bloat;
+				line.Clearance = 0;
+				line.Flags = pcb_no_flags();
+				for (v = v->next; v != &c->head; v = v->next) {
+					line.Point2.X = v->point[0];
+					line.Point2.Y = v->point[1];
+					pcb_line_bbox(&line);
+					if (pcb_is_line_in_poly(&line, P2))
+						return pcb_true;
+					line.Point1.X = line.Point2.X;
+					line.Point1.Y = line.Point2.Y;
+				}
+			}
+		}
+	}
+
+	return pcb_false;
+}
+
+pcb_bool BoxBoxIntersection(pcb_box_t *b1, pcb_box_t *b2)
+{
+	if (b2->X2 < b1->X1 || b2->X1 > b1->X2)
+		return pcb_false;
+	if (b2->Y2 < b1->Y1 || b2->Y1 > b1->Y2)
+		return pcb_false;
+	return pcb_true;
+}
+
+/* returns whether a round-cap pcb line touches a polygon; assumes bounding
+   boxes do touch */
+PCB_INLINE pcb_bool_t pcb_intersect_line_polyline(pcb_pline_t *pl, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thick)
+{
+	pcb_coord_t ox, oy, vx, vy;
+	double dx, dy, h, l;
+
+	thick += Bloat*2;
+	if (thick < 0) thick = 0;
+
+	/* single-point line - check only one circle*/
+	if ((x1 == x2) && (y1 == y2))
+		return pcb_pline_overlaps_circ(pl, x1, y1, thick/2);
+
+	/* long line - check ends */
+	if (pcb_pline_overlaps_circ(pl, x1, y1, thick/2)) return pcb_true;
+	if (pcb_pline_overlaps_circ(pl, x2, y2, thick/2)) return pcb_true;
+
+	dx = x2 - x1;
+	dy = y2 - y1;
+	l = sqrt(PCB_SQUARE(dx) + PCB_SQUARE(dy));
+	h = 0.5 * thick / l;
+	ox = dy * h + 0.5 * SGN(dy);
+	oy = -(dx * h + 0.5 * SGN(dx));
+	vx = (double)dx / -l * ((double)Bloat/2.0);
+	vy = (double)dy / -l * ((double)Bloat/2.0);
+
+	/* long line - consider edge intersection */
+	if (pcb_pline_isect_line(pl, x1 + ox + vx, y1 + oy + vy, x2 + ox - vx, y2 + oy - vy, NULL, NULL)) return pcb_true;
+	if (pcb_pline_isect_line(pl, x1 - ox + vx, y1 - oy + vy, x2 - ox - vx, y2 - oy - vy, NULL, NULL)) return pcb_true;
+
+	/* A corner case is when the polyline is fully within the line. By now we
+	   are sure there's no contour intersection, so if any of the polyline points
+	   is in, the whole polyline is in. */
+	{
+		pcb_vector_t q[4];
+
+		q[0][0] = x1 + ox; q[0][1] = y1 + oy;
+		q[1][0] = x2 + ox; q[1][1] = y2 + oy;
+		q[2][0] = x1 - ox; q[2][1] = y1 - oy;
+		q[3][0] = x2 - ox; q[3][1] = y2 - oy;
+
+		return pcb_is_point_in_convex_quad(pl->head.point, q);
+	}
+}
+
+#define shape_line_to_pcb_line(ps, shape_line, pcb_line) \
+	do { \
+		pcb_line.Point1.X = shape_line.x1 + ps->x; \
+		pcb_line.Point1.Y = shape_line.y1 + ps->y; \
+		pcb_line.Point2.X = shape_line.x2 + ps->x; \
+		pcb_line.Point2.Y = shape_line.y2 + ps->y; \
+		pcb_line.Clearance = 0; \
+		pcb_line.Thickness = shape_line.thickness; \
+		pcb_line.Flags = shape_line.square ? pcb_flag_make(PCB_FLAG_SQUARE) : pcb_no_flags(); \
+	} while(0)
+
+pcb_bool_t pcb_pstk_intersect_line(pcb_pstk_t *ps, pcb_line_t *line)
+{
+	pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, line->parent.layer);
+	if (shape == NULL) return pcb_false;
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+			if (shape->data.poly.pa == NULL)
+				pcb_pstk_shape_update_pa(&shape->data.poly);
+			return pcb_intersect_line_polyline(shape->data.poly.pa->contours, line->Point1.X - ps->x, line->Point1.Y - ps->y, line->Point2.X - ps->x, line->Point2.Y - ps->y, line->Thickness);
+		case PCB_PSSH_LINE:
+		{
+			pcb_line_t tmp;
+			shape_line_to_pcb_line(ps, shape->data.line, tmp);
+			return pcb_intersect_line_line(line, &tmp);
+		}
+		case PCB_PSSH_CIRC:
+		{
+			pcb_any_line_t tmp;
+			tmp.Point1.X = line->Point1.X;
+			tmp.Point1.Y = line->Point1.Y;
+			tmp.Point2.X = line->Point2.X;
+			tmp.Point2.Y = line->Point2.Y;
+			tmp.Thickness = line->Thickness;
+			tmp.Flags = pcb_no_flags();
+			return pcb_is_point_in_line(shape->data.circ.x + ps->x, shape->data.circ.y + ps->y, shape->data.circ.dia/2, &tmp);
+		}
+	}
+	return pcb_false;
+}
+
+
+PCB_INLINE pcb_bool_t pcb_pstk_intersect_arc(pcb_pstk_t *ps, pcb_arc_t *arc)
+{
+	pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, arc->parent.layer);
+	if (shape == NULL) return pcb_false;
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+			{
+				pcb_arc_t tmp;
+
+				/* transform the arc back to 0;0 of the padstack */
+				tmp = *arc;
+				tmp.X -= ps->x;
+				tmp.Y -= ps->y;
+				tmp.BoundingBox.X1 -= ps->x;
+				tmp.BoundingBox.Y1 -= ps->y;
+				tmp.BoundingBox.X2 -= ps->x;
+				tmp.BoundingBox.Y2 -= ps->y;
+
+				if (shape->data.poly.pa == NULL)
+					pcb_pstk_shape_update_pa(&shape->data.poly);
+
+				return pcb_is_arc_in_polyarea(&tmp, shape->data.poly.pa);
+			}
+
+		case PCB_PSSH_LINE:
+		{
+			pcb_line_t tmp;
+			shape_line_to_pcb_line(ps, shape->data.line, tmp);
+			return pcb_intersect_line_arc(&tmp, arc);
+		}
+		case PCB_PSSH_CIRC:
+			return pcb_is_point_on_arc(shape->data.circ.x + ps->x, shape->data.circ.y + ps->y, shape->data.circ.dia/2, arc);
+			break;
+	}
+	return pcb_false;
+}
+
+PCB_INLINE pcb_polyarea_t *pcb_pstk_shp_poly2area(pcb_pstk_t *ps, pcb_pstk_shape_t *shape)
+{
+	int n;
+	pcb_pline_t *pl;
+	pcb_vector_t v;
+	pcb_polyarea_t *shp = pcb_polyarea_create();
+
+	v[0] = shape->data.poly.x[0] + ps->x; v[1] = shape->data.poly.y[0] + ps->y;
+	pl = pcb_poly_contour_new(v);
+	for(n = 1; n < shape->data.poly.len; n++) {
+		v[0] = shape->data.poly.x[n] + ps->x; v[1] = shape->data.poly.y[n] + ps->y;
+		pcb_poly_vertex_include(pl->head.prev, pcb_poly_node_create(v));
+	}
+	pcb_poly_contour_pre(pl, 1);
+	pcb_polyarea_contour_include(shp, pl);
+
+	if (!pcb_poly_valid(shp)) {
+/*		pcb_polyarea_free(&shp); shp = pcb_polyarea_create();*/
+		pcb_poly_contour_inv(pl);
+		pcb_polyarea_contour_include(shp, pl);
+	}
+
+	return shp;
+}
+
+PCB_INLINE pcb_bool_t pcb_pstk_intersect_poly(pcb_pstk_t *ps, pcb_poly_t *poly)
+{
+	pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, poly->parent.layer);
+	if (shape == NULL) return pcb_false;
+
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+		{
+			/* convert the shape poly to a new poly so that it can be intersected */
+			pcb_bool res;
+			pcb_polyarea_t *shp = pcb_pstk_shp_poly2area(ps, shape);
+			res = pcb_polyarea_touching(shp, poly->Clipped);
+			pcb_polyarea_free(&shp);
+			return res;
+		}
+		case PCB_PSSH_LINE:
+		{
+			pcb_line_t tmp;
+			shape_line_to_pcb_line(ps, shape->data.line, tmp);
+			pcb_line_bbox(&tmp);
+			return pcb_is_line_in_poly(&tmp, poly);
+		}
+		case PCB_PSSH_CIRC:
+		{
+			pcb_line_t tmp;
+			tmp.Point1.X = tmp.Point2.X = shape->data.circ.x + ps->x;
+			tmp.Point1.Y = tmp.Point2.Y = shape->data.circ.y + ps->y;
+			tmp.Clearance = 0;
+			tmp.Thickness = shape->data.circ.dia;
+			tmp.Flags = pcb_no_flags();
+			pcb_line_bbox(&tmp);
+			return pcb_is_line_in_poly(&tmp, poly);
+		}
+	}
+	return pcb_false;
+}
+
+PCB_INLINE pcb_bool_t pstk_shape_int_circ_poly(pcb_pstk_t *p, pcb_pstk_shape_t *sp, pcb_pstk_t *c, pcb_pstk_shape_t *sc)
+{
+	pcb_coord_t px = sc->data.circ.x + c->x - p->x;
+	pcb_coord_t py = sc->data.circ.y + c->y - p->y;
+	return pcb_intersect_line_polyline(sp->data.poly.pa->contours,  px, py, px, py, sc->data.circ.dia);
+}
+
+PCB_INLINE pcb_bool_t pstk_shape_int_circ_line(pcb_pstk_t *l, pcb_pstk_shape_t *sl, pcb_pstk_t *c, pcb_pstk_shape_t *sc)
+{
+	pcb_any_line_t tmp;
+	tmp.Point1.X = sl->data.line.x1 + l->x;
+	tmp.Point1.Y = sl->data.line.y1 + l->y;
+	tmp.Point2.X = sl->data.line.x2 + l->x;
+	tmp.Point2.Y = sl->data.line.y2 + l->y;
+	tmp.Thickness = sl->data.line.thickness;
+	tmp.Flags = pcb_no_flags();
+	return pcb_is_point_in_line(sc->data.circ.x + c->x, sc->data.circ.y + c->y, sc->data.circ.dia/2, &tmp);
+}
+
+PCB_INLINE pcb_bool_t pcb_pstk_shape_intersect(pcb_pstk_t *ps1, pcb_pstk_shape_t *shape1, pcb_pstk_t *ps2, pcb_pstk_shape_t *shape2)
+{
+	if ((shape1->shape == PCB_PSSH_POLY) && (shape1->data.poly.pa == NULL))
+		pcb_pstk_shape_update_pa(&shape1->data.poly);
+	if ((shape2->shape == PCB_PSSH_POLY) && (shape2->data.poly.pa == NULL))
+		pcb_pstk_shape_update_pa(&shape2->data.poly);
+
+	switch(shape1->shape) {
+		case PCB_PSSH_POLY:
+			switch(shape2->shape) {
+				case PCB_PSSH_POLY:
+				{
+					pcb_bool res;
+					pcb_polyarea_t *shp1 = pcb_pstk_shp_poly2area(ps1, shape1);
+					pcb_polyarea_t *shp2 = pcb_pstk_shp_poly2area(ps2, shape2);
+					res = pcb_polyarea_touching(shp1, shp2);
+					pcb_polyarea_free(&shp1);
+					pcb_polyarea_free(&shp2);
+					return res;
+				}
+				case PCB_PSSH_LINE:
+					return pcb_intersect_line_polyline(shape1->data.poly.pa->contours, shape2->data.line.x1 + ps2->x - ps1->x, shape2->data.line.y1 + ps2->y - ps1->y, shape2->data.line.x2 + ps2->x - ps1->x, shape2->data.line.y2 + ps2->y - ps1->y, shape2->data.line.thickness);
+				case PCB_PSSH_CIRC:
+					return pstk_shape_int_circ_poly(ps1, shape1, ps2, shape2);
+			}
+			break;
+
+		case PCB_PSSH_LINE:
+			switch(shape2->shape) {
+				case PCB_PSSH_POLY:
+					return pcb_intersect_line_polyline(shape2->data.poly.pa->contours, shape1->data.line.x1 + ps1->x - ps2->x, shape1->data.line.y1 + ps1->y - ps2->y, shape1->data.line.x2 + ps1->x - ps2->x, shape1->data.line.y2 + ps1->y - ps2->y, shape1->data.line.thickness);
+				case PCB_PSSH_LINE:
+				{
+					pcb_line_t tmp1, tmp2;
+					shape_line_to_pcb_line(ps1, shape1->data.line, tmp1);
+					shape_line_to_pcb_line(ps2, shape2->data.line, tmp2);
+					return pcb_intersect_line_line(&tmp1, &tmp2);
+				}
+				case PCB_PSSH_CIRC:
+					return pstk_shape_int_circ_line(ps1, shape1, ps2, shape2);
+			}
+			break;
+
+		case PCB_PSSH_CIRC:
+			switch(shape2->shape) {
+				case PCB_PSSH_POLY:
+					return pstk_shape_int_circ_poly(ps2, shape2, ps1, shape1);
+				case PCB_PSSH_LINE:
+					return pstk_shape_int_circ_line(ps2, shape2, ps1, shape1);
+				case PCB_PSSH_CIRC:
+					{
+						double cdist2 = pcb_distance2(ps1->x + shape1->data.circ.x, ps1->y + shape1->data.circ.y, ps2->x + shape2->data.circ.x, ps2->y + shape2->data.circ.y);
+						double dia = ((double)shape1->data.circ.dia + (double)shape2->data.circ.dia)/2.0;
+						return cdist2 <= dia*dia;
+					}
+			}
+			break;
+	}
+	return pcb_false;
+}
+
+PCB_INLINE pcb_bool_t pcb_pstk_intersect_pstk(pcb_pstk_t *ps1, pcb_pstk_t *ps2)
+{
+	pcb_layer_t *ly;
+	int n;
+
+	for(n = 0, ly = PCB->Data->Layer; n < PCB->Data->LayerN; n++,ly++) {
+		pcb_pstk_shape_t *shape1;
+		pcb_pstk_shape_t *shape2;
+		pcb_layer_type_t lyt = pcb_layer_flags_(ly);
+
+		if (!(lyt & PCB_LYT_COPPER)) /* consider only copper for connections */
+			continue;
+
+		shape1 = pcb_pstk_shape_at(PCB, ps1, ly);
+		if (shape1 == NULL) continue;
+		shape2 = pcb_pstk_shape_at(PCB, ps2, ly);
+		if (shape2 == NULL) continue;
+
+		if (pcb_pstk_shape_intersect(ps1, shape1, ps2, shape2)) return pcb_true;
+	}
+	return pcb_false;
+}
+
+
+PCB_INLINE pcb_bool_t pcb_pstk_intersect_rat(pcb_pstk_t *ps, pcb_rat_t *rat)
+{
+	pcb_board_t *pcb = PCB;
+
+	if ((rat->Point1.X == ps->x) && (rat->Point1.Y == ps->y)) {
+		pcb_layer_t *layer = pcb_get_layer(pcb->Data, pcb->LayerGroups.grp[rat->group1].lid[0]);
+		if ((layer != NULL) && (pcb_pstk_shape_at(pcb, ps, layer) != NULL))
+			return pcb_true;
+	}
+
+	if ((rat->Point2.X == ps->x) && (rat->Point2.Y == ps->y)) {
+		pcb_layer_t *layer = pcb_get_layer(pcb->Data, pcb->LayerGroups.grp[rat->group2].lid[0]);
+		if ((layer != NULL) && (pcb_pstk_shape_at(pcb, ps, layer) != NULL))
+			return pcb_true;
+	}
+
+	return pcb_false;
+}
Index: tags/2.0.1/src/find_intconn.c
===================================================================
--- tags/2.0.1/src/find_intconn.c	(nonexistent)
+++ tags/2.0.1/src/find_intconn.c	(revision 18980)
@@ -0,0 +1,105 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+static void LOC_int_conn_subc(pcb_subc_t *s, int ic, int from_type, void *from_ptr)
+{
+	if (s == NULL)
+		return;
+
+	PCB_PADSTACK_LOOP(s->data);
+	{
+		if ((padstack != from_ptr) && (padstack->term != NULL) && (padstack->intconn == ic) && (!PCB_FLAG_TEST(TheFlag, padstack))) {
+			PCB_FLAG_SET(PCB_FLAG_DRC_INTCONN, padstack);
+			ADD_PADSTACK_TO_LIST(padstack, from_type, from_ptr, PCB_FCT_INTERNAL);
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_LINE_COPPER_LOOP(s->data);
+	{
+		if ((line != from_ptr) && (line->term != NULL) && (line->intconn == ic) && (!PCB_FLAG_TEST(TheFlag, line))) {
+			PCB_FLAG_SET(PCB_FLAG_DRC_INTCONN, line);
+			ADD_LINE_TO_LIST(l, line, from_type, from_ptr, PCB_FCT_INTERNAL);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_ARC_COPPER_LOOP(s->data);
+	{
+		if ((arc != from_ptr) && (arc->term != NULL) && (arc->intconn == ic) && (!PCB_FLAG_TEST(TheFlag, arc))) {
+			PCB_FLAG_SET(PCB_FLAG_DRC_INTCONN, arc);
+			ADD_ARC_TO_LIST(l, arc, from_type, from_ptr, PCB_FCT_INTERNAL);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_POLY_COPPER_LOOP(s->data);
+	{
+		if ((polygon != from_ptr) && (polygon->term != NULL) && (polygon->intconn == ic) && (!PCB_FLAG_TEST(TheFlag, polygon))) {
+			PCB_FLAG_SET(PCB_FLAG_DRC_INTCONN, polygon);
+			ADD_POLYGON_TO_LIST(l, polygon, from_type, from_ptr, PCB_FCT_INTERNAL);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+#warning subc TODO
+#if 0
+no find through text yet
+	PCB_TEXT_COPPER_LOOP(s->data);
+	{
+		if ((text != from_ptr) && (text->term != NULL) && (text->intconn == ic) && (!PCB_FLAG_TEST(TheFlag, text))) {
+			PCB_FLAG_SET(PCB_FLAG_DRC_INTCONN, text);
+			ADD_TEXT_TO_LIST(l, text, from_type, from_ptr, PCB_FCT_INTERNAL);
+		}
+	}
+	PCB_ENDALL_LOOP;
+#endif
+}
+
+/* return whether a and b are in the same internal-no-connection group */
+static pcb_bool int_noconn(pcb_any_obj_t *a, pcb_any_obj_t *b)
+{
+	pcb_subc_t *pa, *pb;
+
+	/* cheap test: they need to have valid and matching intnoconn */
+	if ((a->intnoconn == 0) || (a->intnoconn != b->intnoconn))
+		return pcb_false;
+
+	/* expensive tests: they need to be in the same subc */
+	pa = pcb_obj_parent_subc(a);
+	if (pa == NULL)
+		return pcb_false;
+
+	pb = pcb_obj_parent_subc(b);
+
+	return (pa == pb);
+}
+
+#define INOCN(a,b) int_noconn((pcb_any_obj_t *)a, (pcb_any_obj_t *)b)
Index: tags/2.0.1/src/find_lookup.c
===================================================================
--- tags/2.0.1/src/find_lookup.c	(nonexistent)
+++ tags/2.0.1/src/find_lookup.c	(revision 18980)
@@ -0,0 +1,975 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "compat_nls.h"
+#include "board.h"
+#include "obj_subc_parent.h"
+
+static inline pcb_r_dir_t r_search_pt(pcb_rtree_t * rtree, const pcb_point_t * pt,
+															int radius,
+															pcb_r_dir_t (*region_in_search) (const pcb_box_t * region, void *cl),
+															pcb_r_dir_t (*rectangle_in_region) (const pcb_box_t * box, void *cl), void *closure,
+															int *num_found)
+{
+	pcb_box_t box;
+
+	box.X1 = pt->X - radius;
+	box.X2 = pt->X + radius;
+	box.Y1 = pt->Y - radius;
+	box.Y2 = pt->Y + radius;
+
+	return pcb_r_search(rtree, &box, region_in_search, rectangle_in_region, closure, num_found);
+}
+
+
+/* Connection lookup functions */
+
+static pcb_bool ADD_PS_TO_LIST(pcb_pstk_t *ps, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (User)
+		pcb_undo_add_obj_to_flag(ps);
+	PCB_FLAG_SET(TheFlag, ps);
+	make_callback(PCB_OBJ_PSTK, ps, from_type, from_ptr, type);
+	PADSTACKLIST_ENTRY(PadstackList.Number) = ps;
+	PadstackList.Number++;
+#ifdef DEBUG
+	if (PadstackList.Number > PadstackList.Size)
+		printf("ADD_PS_TO_LIST overflow! num=%d size=%d\n", PadstackList.Number, PadstackList.Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps))
+		return (SetThing(PCB_OBJ_PSTK, pcb_obj_parent_subc((pcb_any_obj_t *)ps), ps, ps));
+	return pcb_false;
+}
+
+static pcb_bool ADD_PADSTACK_TO_LIST(pcb_pstk_t *ps, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (User)
+		pcb_undo_add_obj_to_flag(ps);
+	PCB_FLAG_SET(TheFlag, ps);
+	make_callback(PCB_OBJ_PSTK, ps, from_type, from_ptr, type);
+	PADSTACKLIST_ENTRY(PadstackList.Number) = ps;
+	PadstackList.Number++;
+#ifdef DEBUG
+	if (PadstackList.Number > PadstackList.Size)
+		printf("ADD_PADSTACK_TO_LIST overflow! num=%d size=%d\n", PVList.Number, PVList.Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) && (ps->parent.data->parent_type == PCB_PARENT_SUBC))
+		return (SetThing(PCB_OBJ_PSTK, ps->parent.data->parent.subc, ps, ps));
+	return pcb_false;
+}
+
+static pcb_bool ADD_LINE_TO_LIST(pcb_layer_id_t L, pcb_line_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (LineList[L].Data == NULL)
+		return pcb_false;
+	if (User)
+		pcb_undo_add_obj_to_flag(Ptr);
+	PCB_FLAG_SET(TheFlag, (Ptr));
+	make_callback(PCB_OBJ_LINE, Ptr, from_type, from_ptr, type);
+	LINELIST_ENTRY((L), LineList[(L)].Number) = (Ptr);
+	LineList[(L)].Number++;
+#ifdef DEBUG
+	if (LineList[(L)].Number > LineList[(L)].Size)
+		printf("ADD_LINE_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, LineList[(L)].Number, LineList[(L)].Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr)))
+		return (SetThing(PCB_OBJ_LINE, LAYER_PTR(L), (Ptr), (Ptr)));
+	return pcb_false;
+}
+
+static pcb_bool ADD_ARC_TO_LIST(pcb_cardinal_t L, pcb_arc_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (ArcList[L].Data == NULL)
+		return pcb_false;
+
+	if (User)
+		pcb_undo_add_obj_to_flag(Ptr);
+	PCB_FLAG_SET(TheFlag, (Ptr));
+	make_callback(PCB_OBJ_ARC, Ptr, from_type, from_ptr, type);
+	ARCLIST_ENTRY((L), ArcList[(L)].Number) = (Ptr);
+	ArcList[(L)].Number++;
+#ifdef DEBUG
+	if (ArcList[(L)].Number > ArcList[(L)].Size)
+		printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, ArcList[(L)].Number, ArcList[(L)].Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr)))
+		return (SetThing(PCB_OBJ_ARC, LAYER_PTR(L), (Ptr), (Ptr)));
+	return pcb_false;
+}
+
+static pcb_bool ADD_RAT_TO_LIST(pcb_rat_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (User)
+		pcb_undo_add_obj_to_flag(Ptr);
+	PCB_FLAG_SET(TheFlag, (Ptr));
+	make_callback(PCB_OBJ_RAT, Ptr, from_type, from_ptr, type);
+	RATLIST_ENTRY(RatList.Number) = (Ptr);
+	RatList.Number++;
+#ifdef DEBUG
+	if (RatList.Number > RatList.Size)
+		printf("ADD_RAT_TO_LIST overflow! num=%d size=%d\n", RatList.Number, RatList.Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr)))
+		return (SetThing(PCB_OBJ_RAT, (Ptr), (Ptr), (Ptr)));
+	return pcb_false;
+}
+
+static pcb_bool ADD_POLYGON_TO_LIST(pcb_cardinal_t L, pcb_poly_t *Ptr, int from_type, void *from_ptr, pcb_found_conn_type_t type)
+{
+	if (PolygonList[L].Data == NULL)
+		return pcb_false;
+
+	if (User)
+		pcb_undo_add_obj_to_flag(Ptr);
+	PCB_FLAG_SET(TheFlag, (Ptr));
+	make_callback(PCB_OBJ_POLY, Ptr, from_type, from_ptr, type);
+	POLYGONLIST_ENTRY((L), PolygonList[(L)].Number) = (Ptr);
+	PolygonList[(L)].Number++;
+#ifdef DEBUG
+	if (PolygonList[(L)].Number > PolygonList[(L)].Size)
+		printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, PolygonList[(L)].Number, PolygonList[(L)].Size);
+#endif
+	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr)))
+		return (SetThing(PCB_OBJ_POLY, LAYER_PTR(L), (Ptr), (Ptr)));
+	return pcb_false;
+}
+
+pcb_bool SetThing(int type, void *ptr1, void *ptr2, void *ptr3)
+{
+	thing_ptr1 = ptr1;
+	thing_ptr2 = ptr2;
+	thing_ptr3 = ptr3;
+	thing_type = type;
+	return pcb_true;
+}
+
+#include "find_intconn.c"
+
+void pcb_layout_lookup_uninit(void)
+{
+	pcb_cardinal_t i;
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		free(LineList[i].Data);
+		LineList[i].Data = NULL;
+		free(ArcList[i].Data);
+		ArcList[i].Data = NULL;
+		free(PolygonList[i].Data);
+		PolygonList[i].Data = NULL;
+	}
+	free(RatList.Data);
+	free(PadstackList.Data);
+	RatList.Data = NULL;
+	PadstackList.Data = NULL;
+}
+
+/* allocates memory for component related stacks ...
+ * initializes index and sorts it by X1 and X2 */
+void pcb_layout_lookup_init(void)
+{
+	pcb_layer_id_t i;
+
+	/* initialize line arc and polygon data */
+	for(i = 0; i < pcb_max_layer; i++) {
+		pcb_layer_t *layer = LAYER_PTR(i);
+
+		if (pcb_layer_flags(PCB, i) & PCB_LYT_COPPER) {
+
+		if ((layer->line_tree != NULL) && (layer->line_tree->size > 0)) {
+			LineList[i].Size = layer->line_tree->size;
+			LineList[i].Data = (void **) calloc(LineList[i].Size, sizeof(pcb_line_t *));
+		}
+		if ((layer->arc_tree != NULL) && (layer->arc_tree->size > 0)) {
+			ArcList[i].Size = layer->arc_tree->size;
+			ArcList[i].Data = (void **) calloc(ArcList[i].Size, sizeof(pcb_arc_t *));
+		}
+		if ((layer->polygon_tree != NULL) && (layer->polygon_tree->size > 0)) {
+			PolygonList[i].Size = layer->polygon_tree->size;
+			PolygonList[i].Data = (void **) calloc(PolygonList[i].Size, sizeof(pcb_poly_t *));
+		}
+
+		}
+
+		/* clear some struct members */
+		LineList[i].Location = 0;
+		LineList[i].DrawLocation = 0;
+		LineList[i].Number = 0;
+		ArcList[i].Location = 0;
+		ArcList[i].DrawLocation = 0;
+		ArcList[i].Number = 0;
+		PolygonList[i].Location = 0;
+		PolygonList[i].DrawLocation = 0;
+		PolygonList[i].Number = 0;
+	}
+
+	if (PCB->Data->padstack_tree)
+		TotalPs = PCB->Data->padstack_tree->size;
+	else
+		TotalPs = 0;
+	/* allocate memory for 'new padstack to check' list and clear struct */
+	PadstackList.Data = (void **) calloc(TotalPs, sizeof(pcb_pstk_t *));
+	PadstackList.Size = TotalPs;
+	PadstackList.Location = 0;
+	PadstackList.DrawLocation = 0;
+	PadstackList.Number = 0;
+	/* Initialize ratline data */
+	RatList.Size = ratlist_length(&PCB->Data->Rat);
+	RatList.Data = (void **) calloc(RatList.Size, sizeof(pcb_rat_t *));
+	RatList.Location = 0;
+	RatList.DrawLocation = 0;
+	RatList.Number = 0;
+}
+
+struct lo_info {
+	pcb_layer_id_t layer;
+	pcb_line_t line;
+	pcb_arc_t arc;
+	pcb_poly_t polygon;
+	pcb_rat_t rat;
+	jmp_buf env;
+};
+
+struct ps_info {
+	pcb_layer_id_t layer;
+	pcb_pstk_t ps;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t LOCtoPSline_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct ps_info *i = (struct ps_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_pstk_intersect_line(&i->ps, line) && !INOCN(&i->ps, line)) {
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoPSarc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct ps_info *i = (struct ps_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_pstk_intersect_arc(&i->ps, arc) && !INOCN(&i->ps, arc)) {
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoPSrat_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *) b;
+	struct ps_info *i = (struct ps_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, rat) && pcb_pstk_intersect_rat(&i->ps, rat) && ADD_RAT_TO_LIST(rat, PCB_OBJ_PSTK, &i->ps, PCB_FCT_RAT))
+		longjmp(i->env, 1);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoPSpoly_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_poly_t *polygon = (pcb_poly_t *) b;
+	struct ps_info *i = (struct ps_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_pstk_intersect_poly(&i->ps, polygon) && !INOCN(&i->ps, polygon)) {
+		if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t PStoPS_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_t *ps2 = (pcb_pstk_t *)b;
+	struct ps_info *i = (struct ps_info *)cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, ps2) && pcb_pstk_intersect_pstk(&i->ps, ps2) && !INOCN(&i->ps, ps2)) {
+		if (ADD_PADSTACK_TO_LIST(ps2, PCB_OBJ_PSTK, &i->ps, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* checks if a padstack is connected to LOs, if it is, the LO is added to
+ * the appropriate list and the 'used' flag is set */
+static pcb_bool LookupLOConnectionsToPSList(pcb_bool AndRats)
+{
+	pcb_cardinal_t layer;
+	struct ps_info info;
+	pcb_pstk_t *orig_ps;
+
+	/* loop over all PVs currently on list */
+	while (PadstackList.Location < PadstackList.Number) {
+		/* get pointer to data */
+		orig_ps = (PADSTACKLIST_ENTRY(PadstackList.Location));
+		info.ps = *orig_ps;
+		EXPAND_BOUNDS(&info.ps);
+
+		/* subc intconn jumps */
+		if ((orig_ps->term != NULL) && (orig_ps->intconn > 0))
+			LOC_int_conn_subc(pcb_gobj_parent_subc(orig_ps->parent_type, &orig_ps->parent), orig_ps->intconn, PCB_OBJ_PSTK, orig_ps);
+
+		/* now all lines, arcs and polygons of the several layers */
+		for(layer = 0; layer < pcb_max_layer; layer++) {
+			if (!(pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+				continue;
+			if (LAYER_PTR(layer)->meta.real.no_drc)
+				continue;
+			info.layer = layer;
+			/* add touching lines */
+			if (setjmp(info.env) == 0)
+				pcb_r_search(LAYER_PTR(layer)->line_tree, (pcb_box_t *) & info.ps, NULL, LOCtoPSline_callback, &info, NULL);
+			else
+				return pcb_true;
+			/* add touching arcs */
+			if (setjmp(info.env) == 0)
+				pcb_r_search(LAYER_PTR(layer)->arc_tree, (pcb_box_t *) & info.ps, NULL, LOCtoPSarc_callback, &info, NULL);
+			else
+				return pcb_true;
+			/* check all polygons */
+			if (setjmp(info.env) == 0)
+				pcb_r_search(LAYER_PTR(layer)->polygon_tree, (pcb_box_t *) & info.ps, NULL, LOCtoPSpoly_callback, &info, NULL);
+			else
+				return pcb_true;
+		}
+
+		/* Check for connections to other padstacks */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.ps, NULL, PStoPS_callback, &info, NULL);
+		else
+			return pcb_true;
+
+		/* Check for rat-lines that may intersect the PV */
+		if (AndRats) {
+			if (setjmp(info.env) == 0)
+				pcb_r_search(PCB->Data->rat_tree, (pcb_box_t *) & info.ps, NULL, LOCtoPSrat_callback, &info, NULL);
+			else
+				return pcb_true;
+		}
+		PadstackList.Location++;
+	}
+	return pcb_false;
+}
+
+/* find all connections between LO at the current list position and new LOs */
+static pcb_bool LookupLOConnectionsToLOList(pcb_bool AndRats)
+{
+	pcb_bool done;
+	pcb_layer_id_t layer;
+	pcb_layergrp_id_t group;
+	pcb_cardinal_t i, ratposition, lineposition[PCB_MAX_LAYER], polyposition[PCB_MAX_LAYER], arcposition[PCB_MAX_LAYER];
+
+	/* copy the current LO list positions; the original data is changed
+	 * by 'LookupPVPSConnectionsToLOList()' which has to check the same
+	 * list entries plus the new ones
+	 */
+	for (i = 0; i < pcb_max_layer; i++) {
+		lineposition[i] = LineList[i].Location;
+		polyposition[i] = PolygonList[i].Location;
+		arcposition[i] = ArcList[i].Location;
+	}
+	ratposition = RatList.Location;
+
+	/* loop over all new LOs in the list; recurse until no
+	 * more new connections in the layergroup were found
+	 */
+	do {
+		pcb_cardinal_t *position;
+
+		if (AndRats) {
+			position = &ratposition;
+			for (; *position < RatList.Number; (*position)++) {
+				group = RATLIST_ENTRY(*position)->group1;
+				if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point1), group))
+					return pcb_true;
+				group = RATLIST_ENTRY(*position)->group2;
+				if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point2), group))
+					return pcb_true;
+			}
+		}
+		/* loop over all layergroups */
+		for (group = 0; group < PCB->LayerGroups.len; group++) {
+			pcb_cardinal_t entry;
+
+			for (entry = 0; entry < PCB->LayerGroups.grp[group].len; entry++) {
+				layer = PCB->LayerGroups.grp[group].lid[entry];
+
+				/* be aware that the layer number equal pcb_max_layer
+				 * and pcb_max_layer+1 have a special meaning for pads
+				 */
+				/* try all new lines */
+				position = &lineposition[layer];
+				for (; *position < LineList[layer].Number; (*position)++)
+					if (LookupLOConnectionsToLine(LINELIST_ENTRY(layer, *position), group, pcb_true))
+						return pcb_true;
+
+				/* try all new arcs */
+				position = &arcposition[layer];
+				for (; *position < ArcList[layer].Number; (*position)++)
+					if (LookupLOConnectionsToArc(ARCLIST_ENTRY(layer, *position), group))
+						return pcb_true;
+
+				/* try all new polygons */
+				position = &polyposition[layer];
+				for (; *position < PolygonList[layer].Number; (*position)++)
+					if (LookupLOConnectionsToPolygon(POLYGONLIST_ENTRY(layer, *position), group))
+						return pcb_true;
+			}
+		}
+
+		/* check if all lists are done; Later for-loops
+		 * may have changed the prior lists
+		 */
+		done = !AndRats || ratposition >= RatList.Number;
+		for (layer = 0; layer < pcb_max_layer; layer++) {
+			done = done &&
+				lineposition[layer] >= LineList[layer].Number
+				&& arcposition[layer] >= ArcList[layer].Number && polyposition[layer] >= PolygonList[layer].Number;
+		}
+	} while (!done);
+	return pcb_false;
+}
+
+static pcb_r_dir_t ps_line_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_line(ps, &i->line) && !INOCN(ps, &i->line)) {
+		if (ADD_PS_TO_LIST(ps, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t ps_arc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_arc(ps, &i->arc) && !INOCN(ps, &i->arc)) {
+		if (ADD_PS_TO_LIST(ps, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t ps_poly_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_poly(ps, &i->polygon) && !INOCN(ps, &i->polygon)) {
+		if (ADD_PS_TO_LIST(ps, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t ps_rat_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	/* rats can't cause DRC so there is no early exit */
+	if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_rat(ps, &i->rat))
+		ADD_PS_TO_LIST(ps, PCB_OBJ_RAT, &i->rat, PCB_FCT_RAT);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* searches for new PVs and padstacks that are connected to NEW LOs on the list
+ * This routine updates the position counter of the lists too. */
+static pcb_bool LookupPSConnectionsToLOList(pcb_bool AndRats)
+{
+	pcb_layer_id_t layer;
+	struct lo_info info;
+
+	/* loop over all layers */
+	for(layer = 0; layer < pcb_max_layer; layer++) {
+		if (!(pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+			continue;
+		if (LAYER_PTR(layer)->meta.real.no_drc)
+			continue;
+		/* do nothing if there are no PV's */
+		if (TotalPs == 0) {
+			LineList[layer].Location = LineList[layer].Number;
+			ArcList[layer].Location = ArcList[layer].Number;
+			PolygonList[layer].Location = PolygonList[layer].Number;
+			continue;
+		}
+
+		/* check all lines */
+		while (LineList[layer].Location < LineList[layer].Number) {
+			pcb_line_t *orig_line = (LINELIST_ENTRY(layer, LineList[layer].Location));
+			info.line = *orig_line;
+			EXPAND_BOUNDS(&info.line);
+
+			/* subc intconn jumps */
+			if ((orig_line->term != NULL) && (orig_line->intconn > 0))
+				LOC_int_conn_subc(pcb_lobj_parent_subc(orig_line->parent_type, &orig_line->parent), orig_line->intconn, PCB_OBJ_LINE, orig_line);
+
+			if (setjmp(info.env) == 0)
+				pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.line, NULL, ps_line_callback, &info, NULL);
+			else
+				return pcb_true;
+			LineList[layer].Location++;
+		}
+
+		/* check all arcs */
+		while (ArcList[layer].Location < ArcList[layer].Number) {
+			pcb_arc_t *orig_arc = (ARCLIST_ENTRY(layer, ArcList[layer].Location));
+			info.arc = *orig_arc;
+			EXPAND_BOUNDS(&info.arc);
+
+			/* subc intconn jumps */
+			if ((orig_arc->term != NULL) && (orig_arc->intconn > 0))
+				LOC_int_conn_subc(pcb_lobj_parent_subc(orig_arc->parent_type, &orig_arc->parent), orig_arc->intconn, PCB_OBJ_LINE, orig_arc);
+
+			if (setjmp(info.env) == 0)
+				pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.arc, NULL, ps_arc_callback, &info, NULL);
+			else
+				return pcb_true;
+			ArcList[layer].Location++;
+		}
+
+		/* now all polygons */
+		info.layer = layer;
+		while (PolygonList[layer].Location < PolygonList[layer].Number) {
+			pcb_poly_t *orig_poly = (POLYGONLIST_ENTRY(layer, PolygonList[layer].Location));
+			info.polygon = *orig_poly;
+			EXPAND_BOUNDS(&info.polygon);
+
+			/* subc intconn jumps */
+			if ((orig_poly->term != NULL) && (orig_poly->intconn > 0))
+				LOC_int_conn_subc(pcb_lobj_parent_subc(orig_poly->parent_type, &orig_poly->parent), orig_poly->intconn, PCB_OBJ_LINE, orig_poly);
+
+			if (setjmp(info.env) == 0)
+				pcb_r_search(PCB->Data->padstack_tree, (pcb_box_t *) & info.polygon, NULL, ps_poly_callback, &info, NULL);
+			else
+				return pcb_true;
+			PolygonList[layer].Location++;
+		}
+	}
+
+	/* do nothing if there are no PS's */
+	if (TotalPs == 0)
+		RatList.Location = RatList.Number;
+
+	/* check all rat-lines */
+	if (AndRats) {
+		while (RatList.Location < RatList.Number) {
+			info.rat = *(RATLIST_ENTRY(RatList.Location));
+			r_search_pt(PCB->Data->padstack_tree, &info.rat.Point1, 1, NULL, ps_rat_callback, &info, NULL);
+			r_search_pt(PCB->Data->padstack_tree, &info.rat.Point2, 1, NULL, ps_rat_callback, &info, NULL);
+
+			RatList.Location++;
+		}
+	}
+	return pcb_false;
+}
+
+static pcb_r_dir_t LOCtoArcLine_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_arc(line, &i->arc) && !INOCN(line, &i->arc)) {
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoArcArc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!arc->Thickness)
+		return 0;
+	if (!PCB_FLAG_TEST(TheFlag, arc) && ArcArcIntersect(&i->arc, arc) && !INOCN(&i->arc, arc)) {
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_ARC, &i->arc, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoArcRat_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *)b;
+	struct lo_info *i = (struct lo_info *)cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, rat)) {
+		if ((rat->group1 == i->layer)
+				&& IsRatPointOnArcSpec(&rat->Point1, &i->arc)) {
+			if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT))
+				longjmp(i->env, 1);
+		}
+		else if ((rat->group2 == i->layer)
+						 && IsRatPointOnArcSpec(&rat->Point2, &i->arc)) {
+			if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT))
+				longjmp(i->env, 1);
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* searches all LOs that are connected to the given arc on the given
+ * layergroup. All found connections are added to the list
+ *
+ * the notation that is used is:
+ * Xij means Xj at arc i */
+static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *Arc, pcb_cardinal_t LayerGroup)
+{
+	pcb_cardinal_t entry;
+	struct lo_info info;
+
+	info.arc = *Arc;
+	EXPAND_BOUNDS(&info.arc);
+
+
+	/* loop over all layers of the group */
+	for (entry = 0; entry < PCB->LayerGroups.grp[LayerGroup].len; entry++) {
+		pcb_layer_id_t layer;
+
+		layer = PCB->LayerGroups.grp[LayerGroup].lid[entry];
+
+		info.layer = LayerGroup;
+
+		/* add the new rat lines */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(PCB->Data->rat_tree, &info.arc.BoundingBox, NULL, LOCtoArcRat_callback, &info, NULL);
+		else
+			return pcb_true;
+
+		info.layer = layer;
+
+		/* add arcs */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->line_tree, &info.arc.BoundingBox, NULL, LOCtoArcLine_callback, &info, NULL);
+		else
+			return pcb_true;
+
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->arc_tree, &info.arc.BoundingBox, NULL, LOCtoArcArc_callback, &info, NULL);
+		else
+			return pcb_true;
+
+		/* now check all polygons */
+		{
+			pcb_rtree_it_t it;
+			pcb_box_t *b;
+			for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) {
+				pcb_poly_t *polygon = (pcb_poly_t *)b;
+				if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_arc_in_poly(Arc, polygon)
+						&& ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_ARC, Arc, PCB_FCT_COPPER))
+					return pcb_true;
+			}
+			pcb_r_end(&it);
+		}
+	}
+
+	return pcb_false;
+}
+
+static pcb_r_dir_t LOCtoLineLine_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_intersect_line_line(&i->line, line) && !INOCN(&i->line, line)) {
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoLineArc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!arc->Thickness)
+		return 0;
+	if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_intersect_line_arc(&i->line, arc) && !INOCN(&i->line, arc)) {
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_LINE, &i->line, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoLineRat_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, rat)) {
+		if ((rat->group1 == i->layer)
+				&& IsRatPointOnLineSpec(&rat->Point1, &i->line)) {
+			if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT))
+				longjmp(i->env, 1);
+		}
+		else if ((rat->group2 == i->layer)
+						 && IsRatPointOnLineSpec(&rat->Point2, &i->line)) {
+			if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT))
+				longjmp(i->env, 1);
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* searches all LOs that are connected to the given line on the given
+ * layergroup. All found connections are added to the list
+ *
+ * the notation that is used is:
+ * Xij means Xj at line i */
+static pcb_bool LookupLOConnectionsToLine(pcb_line_t *Line, pcb_cardinal_t LayerGroup, pcb_bool PolysTo)
+{
+	pcb_cardinal_t entry;
+	struct lo_info info;
+
+	info.line = *Line;
+	info.layer = LayerGroup;
+	EXPAND_BOUNDS(&info.line)
+		/* add the new rat lines */
+	if (setjmp(info.env) == 0)
+		pcb_r_search(PCB->Data->rat_tree, &info.line.BoundingBox, NULL, LOCtoLineRat_callback, &info, NULL);
+	else
+		return pcb_true;
+
+	/* loop over all layers of the group */
+	for (entry = 0; entry < PCB->LayerGroups.grp[LayerGroup].len; entry++) {
+		pcb_layer_id_t layer;
+
+		layer = PCB->LayerGroups.grp[LayerGroup].lid[entry];
+
+		info.layer = layer;
+		/* add lines */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->line_tree, (pcb_box_t *) & info.line, NULL, LOCtoLineLine_callback, &info, NULL);
+		else
+			return pcb_true;
+		/* add arcs */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->arc_tree, (pcb_box_t *) & info.line, NULL, LOCtoLineArc_callback, &info, NULL);
+		else
+			return pcb_true;
+		/* now check all polygons */
+		if (PolysTo) {
+			pcb_rtree_it_t it;
+			pcb_box_t *b;
+			for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) {
+				pcb_poly_t *polygon = (pcb_poly_t *)b;
+				if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_line_in_poly(Line, polygon)
+						&& ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_LINE, Line, PCB_FCT_COPPER))
+					return pcb_true;
+			}
+			pcb_r_end(&it);
+		}
+	}
+
+	return pcb_false;
+}
+
+
+struct rat_info {
+	pcb_cardinal_t layer;
+	pcb_point_t *Point;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t LOCtoRatLine_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct rat_info *i = (struct rat_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && IsRatPointOnLineSpec(i->Point, line)) {
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoRatArc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct rat_info *i = (struct rat_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, arc) && IsRatPointOnArcSpec(i->Point, arc)) {
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoRatPoly_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_poly_t *polygon = (pcb_poly_t *) b;
+	struct rat_info *i = (struct rat_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && IsRatPointOnPoly(i->Point, polygon)) {
+		if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* searches all LOs that are connected to the given rat-line on the given
+ * layergroup. All found connections are added to the list
+ *
+ * the notation that is used is:
+ * Xij means Xj at line i */
+static pcb_bool LookupLOConnectionsToRatEnd(pcb_point_t *Point, pcb_cardinal_t LayerGroup)
+{
+	pcb_cardinal_t entry;
+	struct rat_info info;
+
+	info.Point = Point;
+	/* loop over all layers of this group */
+	for (entry = 0; entry < PCB->LayerGroups.grp[LayerGroup].len; entry++) {
+		pcb_layer_id_t layer;
+
+		layer = PCB->LayerGroups.grp[LayerGroup].lid[entry];
+		info.layer = layer;
+		if (setjmp(info.env) == 0)
+			r_search_pt(LAYER_PTR(layer)->arc_tree, Point, 1, NULL, LOCtoRatArc_callback, &info, NULL);
+		else
+			return pcb_true;
+		if (setjmp(info.env) == 0)
+			r_search_pt(LAYER_PTR(layer)->line_tree, Point, 1, NULL, LOCtoRatLine_callback, &info, NULL);
+		else
+			return pcb_true;
+		if (setjmp(info.env) == 0)
+			r_search_pt(LAYER_PTR(layer)->polygon_tree, Point, 1, NULL, LOCtoRatPoly_callback, &info, NULL);
+	}
+
+	return pcb_false;
+}
+
+static pcb_r_dir_t LOCtoPolyLine_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_is_line_in_poly(line, &i->polygon) && !INOCN(line, &i->polygon)) {
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t LOCtoPolyArc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!arc->Thickness)
+		return 0;
+	if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon) && !INOCN(arc, &i->polygon)) {
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_POLY, &i->polygon, PCB_FCT_COPPER))
+			longjmp(i->env, 1);
+	}
+	return 0;
+}
+
+static pcb_r_dir_t LOCtoPolyRat_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *) b;
+	struct lo_info *i = (struct lo_info *) cl;
+
+	if (!PCB_FLAG_TEST(TheFlag, rat)) {
+		if (((rat->group1 == i->layer) && IsRatPointOnPoly(&rat->Point1, &i->polygon))
+			|| ((rat->group2 == i->layer) && IsRatPointOnPoly(&rat->Point2, &i->polygon))) {
+			if (ADD_RAT_TO_LIST(rat, PCB_OBJ_POLY, &i->polygon, PCB_FCT_RAT))
+				longjmp(i->env, 1);
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+/* looks up LOs that are connected to the given polygon
+ * on the given layergroup. All found connections are added to the list */
+static pcb_bool LookupLOConnectionsToPolygon(pcb_poly_t *Polygon, pcb_cardinal_t LayerGroup)
+{
+	pcb_cardinal_t entry;
+	struct lo_info info;
+
+	if (!Polygon->Clipped)
+		return pcb_false;
+	info.polygon = *Polygon;
+	EXPAND_BOUNDS(&info.polygon);
+	info.layer = LayerGroup;
+	/* check rats */
+	if (setjmp(info.env) == 0)
+		pcb_r_search(PCB->Data->rat_tree, (pcb_box_t *) & info.polygon, NULL, LOCtoPolyRat_callback, &info, NULL);
+	else
+		return pcb_true;
+/* loop over all layers of the group */
+	for (entry = 0; entry < PCB->LayerGroups.grp[LayerGroup].len; entry++) {
+		pcb_layer_id_t layer;
+
+		layer = PCB->LayerGroups.grp[LayerGroup].lid[entry];
+
+		/* handle normal layers */
+		/* check all polygons */
+		{
+			pcb_rtree_it_t it;
+			pcb_box_t *b;
+			for(b = pcb_r_first(PCB->Data->Layer[layer].polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) {
+				pcb_poly_t *polygon = (pcb_poly_t *)b;
+				if (!PCB_FLAG_TEST(TheFlag, polygon)
+						&& pcb_is_poly_in_poly(polygon, Polygon)
+						&& ADD_POLYGON_TO_LIST(layer, polygon, PCB_OBJ_POLY, Polygon, PCB_FCT_COPPER))
+					return pcb_true;
+			}
+			pcb_r_end(&it);
+		}
+
+		info.layer = layer;
+		/* check all lines */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->line_tree, (pcb_box_t *) & info.polygon, NULL, LOCtoPolyLine_callback, &info, NULL);
+		else
+			return pcb_true;
+		/* check all arcs */
+		if (setjmp(info.env) == 0)
+			pcb_r_search(LAYER_PTR(layer)->arc_tree, (pcb_box_t *) & info.polygon, NULL, LOCtoPolyArc_callback, &info, NULL);
+		else
+			return pcb_true;
+	}
+
+	return pcb_false;
+}
Index: tags/2.0.1/src/find_misc.c
===================================================================
--- tags/2.0.1/src/find_misc.c	(nonexistent)
+++ tags/2.0.1/src/find_misc.c	(revision 18980)
@@ -0,0 +1,500 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "change.h"
+
+static void DrawNewConnections(void);
+
+/* checks if all lists of new objects are handled */
+static pcb_bool ListsEmpty(pcb_bool AndRats)
+{
+	pcb_bool empty;
+	int i;
+
+	empty = (PadstackList.Location >= PadstackList.Number);
+	if (AndRats)
+		empty = empty && (RatList.Location >= RatList.Number);
+	for (i = 0; i < pcb_max_layer && empty; i++)
+		empty = empty && LineList[i].Location >= LineList[i].Number
+			&& ArcList[i].Location >= ArcList[i].Number && PolygonList[i].Location >= PolygonList[i].Number;
+	return empty;
+}
+
+static void reassign_no_drc_flags(void)
+{
+	int layer;
+#warning layer TODO: decide whether it is from attribute or not
+	for (layer = 0; layer < pcb_max_layer; layer++) {
+		pcb_layer_t *l = LAYER_PTR(layer);
+		l->meta.real.no_drc = pcb_attribute_get(&l->Attributes, "PCB::skip-drc") != NULL;
+	}
+}
+
+
+/* loops till no more connections are found */
+static pcb_bool DoIt(pcb_bool AndRats, pcb_bool AndDraw)
+{
+	pcb_bool newone = pcb_false;
+	reassign_no_drc_flags();
+	do {
+		/* lookup connections; these are the steps (2) to (4)
+		 * from the description */
+		newone =
+			LookupLOConnectionsToPSList(AndRats)
+			|| LookupLOConnectionsToLOList(AndRats)
+			|| LookupPSConnectionsToLOList(AndRats);
+
+		if (AndDraw)
+			DrawNewConnections();
+	}
+	while (!newone && !ListsEmpty(AndRats));
+	if (AndDraw)
+		pcb_draw();
+	return newone;
+}
+
+/* draws all new connections which have been found since the routine was called the last time */
+static void DrawNewConnections(void)
+{
+	int i;
+	pcb_cardinal_t position;
+
+	/* decrement 'i' to keep layerstack order */
+	for (i = pcb_max_layer; i != -1; i--) {
+		pcb_cardinal_t layer = pcb_layer_stack[i];
+
+		if (PCB->Data->Layer[layer].meta.real.vis) {
+			/* draw all new lines */
+			position = LineList[layer].DrawLocation;
+			for (; position < LineList[layer].Number; position++)
+				pcb_line_invalidate_draw(LAYER_PTR(layer), LINELIST_ENTRY(layer, position));
+			LineList[layer].DrawLocation = LineList[layer].Number;
+
+			/* draw all new arcs */
+			position = ArcList[layer].DrawLocation;
+			for (; position < ArcList[layer].Number; position++)
+				pcb_arc_invalidate_draw(LAYER_PTR(layer), ARCLIST_ENTRY(layer, position));
+			ArcList[layer].DrawLocation = ArcList[layer].Number;
+
+			/* draw all new polygons */
+			position = PolygonList[layer].DrawLocation;
+			for (; position < PolygonList[layer].Number; position++)
+				pcb_poly_invalidate_draw(LAYER_PTR(layer), POLYGONLIST_ENTRY(layer, position));
+			PolygonList[layer].DrawLocation = PolygonList[layer].Number;
+		}
+	}
+
+	/* draw all new Padstacks; 'PadstackList' holds a list of pointers to the
+	 * sorted array pointers to padstack data
+	 */
+	while (PadstackList.DrawLocation < PadstackList.Number) {
+		pcb_pstk_t *ps = PADSTACKLIST_ENTRY(PadstackList.DrawLocation);
+
+		if (PCB_FLAG_TEST(PCB_FLAG_TERMNAME, ps)) {
+			if (PCB->pstk_on)
+				pcb_pstk_invalidate_draw(ps);
+		}
+		else if (PCB->pstk_on)
+			pcb_pstk_invalidate_draw(ps);
+		PadstackList.DrawLocation++;
+	}
+
+	/* draw the new rat-lines */
+	if (PCB->RatOn) {
+		position = RatList.DrawLocation;
+		for (; position < RatList.Number; position++)
+			pcb_rat_invalidate_draw(RATLIST_ENTRY(position));
+		RatList.DrawLocation = RatList.Number;
+	}
+}
+
+/*---------------------------------------------------------------------------
+ * add the starting object to the list of found objects
+ */
+static pcb_bool ListStart(pcb_any_obj_t *obj)
+{
+	DumpList();
+	switch (obj->type) {
+
+	case PCB_OBJ_PSTK:
+		{
+			if (ADD_PADSTACK_TO_LIST((pcb_pstk_t *)obj, 0, NULL, PCB_FCT_START))
+				return pcb_true;
+			break;
+		}
+
+	case PCB_OBJ_RAT:
+		{
+			if (ADD_RAT_TO_LIST((pcb_rat_t *)obj, 0, NULL, PCB_FCT_START))
+				return pcb_true;
+			break;
+		}
+
+	case PCB_OBJ_LINE:
+		{
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data, obj->parent.layer);
+			if (ADD_LINE_TO_LIST(layer, (pcb_line_t *)obj, 0, NULL, PCB_FCT_START))
+				return pcb_true;
+			break;
+		}
+
+	case PCB_OBJ_ARC:
+		{
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data, obj->parent.layer);
+			if (ADD_ARC_TO_LIST(layer, (pcb_arc_t *)obj, 0, NULL, PCB_FCT_START))
+				return pcb_true;
+			break;
+		}
+
+	case PCB_OBJ_POLY:
+		{
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data, obj->parent.layer);
+			if (ADD_POLYGON_TO_LIST(layer, (pcb_poly_t *)obj, 0, NULL, PCB_FCT_START))
+				return pcb_true;
+			break;
+		}
+
+	default:
+		assert(!"unhandled object type: can't start a find list from this\n");
+	}
+	return pcb_false;
+}
+
+
+/* looks up all connections from the object at the given coordinates
+ * the TheFlag (normally 'PCB_FLAG_FOUND') is set for all objects found
+ * the objects are re-drawn if AndDraw is pcb_true
+ * also the action is marked as undoable if AndDraw is pcb_true */
+void pcb_lookup_conn(pcb_coord_t X, pcb_coord_t Y, pcb_bool AndDraw, pcb_coord_t Range, int which_flag)
+{
+	void *ptr1, *ptr2, *ptr3;
+	char *name;
+	int type;
+
+	/* check if there are any pins or pads at that position */
+
+	reassign_no_drc_flags();
+
+	type = pcb_search_obj_by_location(PCB_LOOKUP_FIRST, &ptr1, &ptr2, &ptr3, X, Y, Range);
+	if (type == PCB_OBJ_VOID) {
+		type = pcb_search_obj_by_location(PCB_LOOKUP_MORE, &ptr1, &ptr2, &ptr3, X, Y, Range);
+		if (type == PCB_OBJ_VOID)
+			return;
+		if (type & PCB_SILK_TYPE) {
+			/* don't mess with non-conducting objects! */
+			if (!(pcb_layer_flags_((pcb_layer_t *)ptr1) & PCB_LYT_COPPER) || ((pcb_layer_t *) ptr1)->meta.real.no_drc)
+				return;
+		}
+	}
+	else {
+		name = pcb_connection_name(ptr2);
+		if (name != NULL)
+			pcb_actionl("NetlistShow", name, NULL);
+	}
+
+	TheFlag = which_flag;
+	User = AndDraw;
+	pcb_conn_lookup_init();
+
+	/* now add the object to the appropriate list and start scanning
+	 * This is step (1) from the description
+	 */
+	ListStart(ptr2);
+	DoIt(pcb_true, AndDraw);
+	if (User)
+		pcb_undo_inc_serial();
+	User = pcb_false;
+
+	/* we are done */
+	if (AndDraw)
+		pcb_draw();
+	if (AndDraw && conf_core.editor.beep_when_finished)
+		pcb_gui->beep();
+	pcb_conn_lookup_uninit();
+}
+
+void pcb_lookup_conn_by_pin(int type, void *ptr1)
+{
+	User = 0;
+	pcb_conn_lookup_init();
+	ListStart(ptr1);
+
+	DoIt(pcb_true, pcb_false);
+
+	pcb_conn_lookup_uninit();
+}
+
+#warning cleanup TODO: keep only PCB_OBJ_* and remove this function
+unsigned long pcb_obj_type2oldtype(pcb_objtype_t type)
+{
+	switch(type) {
+		case PCB_OBJ_LINE:    return PCB_OBJ_LINE;
+		case PCB_OBJ_TEXT:    return PCB_OBJ_TEXT;
+		case PCB_OBJ_POLY:    return PCB_OBJ_POLY;
+		case PCB_OBJ_ARC:     return PCB_OBJ_ARC;
+		case PCB_OBJ_RAT:     return PCB_OBJ_RAT;
+		case PCB_OBJ_PSTK:    return PCB_OBJ_PSTK;
+		case PCB_OBJ_SUBC:    return PCB_OBJ_SUBC;
+
+		default: return 0;
+	}
+	return 0;
+}
+
+pcb_cardinal_t pcb_lookup_conn_by_obj(void *ctx, pcb_any_obj_t *obj, pcb_bool AndDraw, pcb_cardinal_t (*cb)(void *ctx, pcb_any_obj_t *obj))
+{
+	pcb_cardinal_t i, n, cnt = 0;
+	unsigned long type = pcb_obj_type2oldtype(obj->type);
+
+	if (type == 0)
+		return 0;
+
+	pcb_conn_lookup_init();
+	ListStart(obj);
+	DoIt(pcb_true, AndDraw);
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		for(n = 0; n < LineList[i].Number; n++)
+			cnt += cb(ctx, (pcb_any_obj_t *)LineList[i].Data[n]);
+		for(n = 0; n < ArcList[i].Number; n++)
+			cnt += cb(ctx, (pcb_any_obj_t *)ArcList[i].Data[n]);
+		for(n = 0; n < PolygonList[i].Number; n++)
+			cnt += cb(ctx, (pcb_any_obj_t *)PolygonList[i].Data[n]);
+	}
+
+	for(n = 0; n < PadstackList.Number; n++)
+		cnt += cb(ctx, (pcb_any_obj_t *)PadstackList.Data[n]);
+	for(n = 0; n < RatList.Number; n++)
+		cnt += cb(ctx, (pcb_any_obj_t *)RatList.Data[n]);
+
+	pcb_conn_lookup_uninit();
+	return cnt;
+}
+
+
+/* find connections for rats nesting assumes pcb_conn_lookup_init() has already been done */
+void pcb_rat_find_hook(pcb_any_obj_t *obj, pcb_bool undo, pcb_bool AndRats)
+{
+	User = undo;
+	DumpList();
+	ListStart(obj);
+	DoIt(AndRats, pcb_false);
+	User = pcb_false;
+}
+
+static pcb_bool pcb_reset_found_subc(pcb_subc_t *subc, pcb_bool AndDraw);
+
+/* resets all used flags of pins and vias */
+static pcb_bool pcb_reset_found_pins_vias_pads_(pcb_data_t *data, pcb_bool AndDraw)
+{
+	pcb_bool change = pcb_false;
+
+	PCB_PADSTACK_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(TheFlag, padstack)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(padstack);
+			PCB_FLAG_CLEAR(TheFlag, padstack);
+			if (AndDraw)
+				pcb_pstk_invalidate_draw(padstack);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(data);
+	{
+		if (pcb_reset_found_subc(subc, AndDraw))
+			change = pcb_true;
+	}
+	PCB_END_LOOP;
+
+	return change;
+}
+
+pcb_bool pcb_reset_found_pins_vias_pads(pcb_bool AndDraw)
+{
+	pcb_bool change = pcb_reset_found_pins_vias_pads_(PCB->Data, AndDraw);
+
+	if (change)
+		pcb_board_set_changed_flag(pcb_true);
+
+	return change;
+}
+
+/* resets all used flags of LOs */
+static pcb_bool pcb_reset_found_lines_polys_(pcb_data_t *data, pcb_bool AndDraw)
+{
+	pcb_bool change = pcb_false;
+
+	PCB_RAT_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(TheFlag, line)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(TheFlag, line);
+			if (AndDraw)
+				pcb_rat_invalidate_draw(line);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+	PCB_LINE_COPPER_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(TheFlag, line)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(TheFlag, line);
+			if (AndDraw)
+				pcb_line_invalidate_draw(layer, line);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_COPPER_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(TheFlag, arc)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(arc);
+			PCB_FLAG_CLEAR(TheFlag, arc);
+			if (AndDraw)
+				pcb_arc_invalidate_draw(layer, arc);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_COPPER_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(TheFlag, polygon)) {
+			if (AndDraw)
+				pcb_undo_add_obj_to_flag(polygon);
+			PCB_FLAG_CLEAR(TheFlag, polygon);
+			if (AndDraw)
+				pcb_poly_invalidate_draw(layer, polygon);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+
+	PCB_SUBC_LOOP(data);
+	{
+		if (pcb_reset_found_subc(subc, AndDraw))
+			change = pcb_true;
+	}
+	PCB_END_LOOP;
+
+	return change;
+}
+
+static pcb_bool pcb_reset_found_subc(pcb_subc_t *subc, pcb_bool AndDraw)
+{
+	pcb_bool res = pcb_false;
+
+	if (pcb_reset_found_lines_polys_(subc->data, AndDraw))
+		res = pcb_true;
+
+	if (pcb_reset_found_pins_vias_pads_(subc->data, AndDraw))
+		res = pcb_true;
+
+	return res;
+}
+
+pcb_bool pcb_reset_found_lines_polys(pcb_bool AndDraw)
+{
+	pcb_bool change = pcb_reset_found_lines_polys_(PCB->Data, AndDraw);
+	if (change)
+		pcb_board_set_changed_flag(pcb_true);
+	return change;
+
+}
+
+
+/* resets all found connections */
+pcb_bool pcb_reset_conns(pcb_bool AndDraw)
+{
+	pcb_bool change = pcb_false;
+
+	change = pcb_reset_found_pins_vias_pads(AndDraw) || change;
+	change = pcb_reset_found_lines_polys(AndDraw) || change;
+
+	return change;
+}
+
+/*----------------------------------------------------------------------------
+ * Dumps the list contents
+ */
+static void DumpList(void)
+{
+	pcb_cardinal_t i;
+
+	PadstackList.Number = 0;
+	PadstackList.Location = 0;
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		LineList[i].Location = 0;
+		LineList[i].DrawLocation = 0;
+		LineList[i].Number = 0;
+		ArcList[i].Location = 0;
+		ArcList[i].DrawLocation = 0;
+		ArcList[i].Number = 0;
+		PolygonList[i].Location = 0;
+		PolygonList[i].DrawLocation = 0;
+		PolygonList[i].Number = 0;
+	}
+	RatList.Number = 0;
+	RatList.Location = 0;
+	RatList.DrawLocation = 0;
+}
+
+/*----------------------------------------------------------------------------
+ * set up a temporary flag to use
+ */
+void pcb_save_find_flag(int NewFlag)
+{
+	OldFlag = TheFlag;
+	TheFlag = NewFlag;
+}
+
+/*----------------------------------------------------------------------------
+ * restore flag
+ */
+void pcb_restore_find_flag(void)
+{
+	TheFlag = OldFlag;
+}
+
+void pcb_conn_lookup_init(void)
+{
+	pcb_layout_lookup_init();
+}
+
+void pcb_conn_lookup_uninit(void)
+{
+	pcb_layout_lookup_uninit();
+}
Index: tags/2.0.1/src/find_print.c
===================================================================
--- tags/2.0.1/src/find_print.c	(nonexistent)
+++ tags/2.0.1/src/find_print.c	(revision 18980)
@@ -0,0 +1,267 @@
+/*
+ *
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "data_it.h"
+
+/* Connection export/output functions */
+
+static void PrepareNextLoop(void);
+
+/* Count terminals that are found, up to maxt */
+static void count_terms(vtp0_t *out, pcb_data_t *data, pcb_cardinal_t maxt, pcb_cardinal_t *cnt)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	for(o = pcb_data_first(&it, data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		if ((o->term != NULL) && PCB_FLAG_TEST(PCB_FLAG_FOUND, o)) {
+			(*cnt)++;
+			if (out != NULL)
+				vtp0_append(out, o);
+		}
+		if (o->type == PCB_OBJ_SUBC)
+			count_terms(out, ((pcb_subc_t *)o)->data, maxt, cnt);
+		if (*cnt >= maxt)
+			return;
+	}
+	return;
+}
+
+/* prints all unused pins of an element to file FP */
+static pcb_bool print_select_unused_subc_terms(pcb_subc_t *subc, FILE * FP)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+	pcb_bool first = pcb_true;
+
+	for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		pcb_cardinal_t number = 0;
+		if (o->term == NULL) /* consider named terminals only */
+			continue;
+
+		/* reset found objects for the next pin */
+		PrepareNextLoop();
+
+		ListStart(o);
+		DoIt(pcb_true, pcb_true);
+
+		count_terms(NULL, PCB->Data, 2, &number);
+		if (number <= 1) {
+			/* output of element name if not already done */
+			if (first) {
+				pcb_print_conn_subc_name(subc, FP);
+				first = pcb_false;
+			}
+
+			/* write name to list */
+			fputc('\t', FP);
+			pcb_print_quoted_string(FP, (char *)PCB_EMPTY(o->term));
+			fputc('\n', FP);
+			PCB_FLAG_SET(PCB_FLAG_SELECTED, o);
+			pcb_draw_obj(o);
+		}
+	}
+
+	/* print separator if element has unused pins or pads */
+	if (!first) {
+		fputs("}\n\n", FP);
+		SEPARATE(FP);
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * resets some flags for looking up the next pin/pad
+ */
+static void PrepareNextLoop(void)
+{
+	pcb_cardinal_t layer;
+
+	/* reset found LOs for the next pin */
+	for (layer = 0; layer < pcb_max_layer; layer++) {
+		LineList[layer].Location = LineList[layer].Number = 0;
+		ArcList[layer].Location = ArcList[layer].Number = 0;
+		PolygonList[layer].Location = PolygonList[layer].Number = 0;
+	}
+
+	/* reset Padstacks */
+	PadstackList.Number = PadstackList.Location = 0;
+	pcb_reset_conns(pcb_false);
+}
+
+/* ---------------------------------------------------------------------------
+ * prints all found connections of a pin to file FP
+ * the connections are stacked in 'PVList'
+ */
+static void print_term_conns(FILE *FP, pcb_subc_t *subc)
+{
+	vtp0_t lst;
+	pcb_cardinal_t cnt = 0, n;
+
+	vtp0_init(&lst);
+	count_terms(&lst, PCB->Data, (1<<15), &cnt);
+
+	if (cnt == 0)
+		return;
+
+	/* find a starting pin, within this subc */
+	for(n = 0; n < vtp0_len(&lst); n++) {
+		pcb_any_obj_t *o = lst.array[n];
+		if (pcb_obj_parent_subc(o) == subc) {
+			fputc('\t', FP);
+			pcb_print_quoted_string(FP, o->term);
+			fprintf(FP, "\n\t{\n");
+			lst.array[n] = NULL;
+			break;
+		}
+	}
+
+	for(n = 0; n < vtp0_len(&lst); n++) {
+		pcb_any_obj_t *o = lst.array[n];
+		if (o != NULL)
+			pcb_print_conn_list_entry((char *)PCB_EMPTY(o->term), pcb_obj_parent_subc(o), pcb_false, FP);
+	}
+
+	vtp0_uninit(&lst);
+}
+
+
+/* ---------------------------------------------------------------------------
+ * finds all connections to the pins of the passed element.
+ * The result is written to file FP
+ * Returns pcb_true if operation was aborted
+ */
+static pcb_bool pcb_print_subc_conns(pcb_subc_t *subc, FILE * FP, pcb_bool AndDraw)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	pcb_print_conn_subc_name(subc, FP);
+
+	for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		if (o->term == NULL) /* consider named terminals only */
+			continue;
+
+		if (PCB_FLAG_TEST(TheFlag, o)) {
+			fputc('\t', FP);
+			pcb_print_quoted_string(FP, (char *)PCB_EMPTY(o->term));
+			fputs("\n\t{\n\t\t__CHECKED_BEFORE__\n\t}\n", FP);
+			continue;
+		}
+
+		/* reset found objects for the next pin */
+		PrepareNextLoop();
+
+		ListStart(o);
+		DoIt(pcb_true, pcb_true);
+
+		/* printout all found connections */
+		print_term_conns(FP, subc);
+		fputs("\t}\n", FP);
+	}
+	fputs("}\n\n", FP);
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * find all unused pins of all element
+ */
+void pcb_lookup_unused_pins(FILE * FP)
+{
+	/* reset all currently marked connections */
+	User = pcb_true;
+	pcb_reset_conns(pcb_true);
+	pcb_conn_lookup_init();
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		/* break if abort dialog returned pcb_true;
+		 * passing NULL as filedescriptor discards the normal output */
+		if (print_select_unused_subc_terms(subc, FP))
+			break;
+	}
+	PCB_END_LOOP;
+
+	if (conf_core.editor.beep_when_finished)
+		pcb_gui->beep();
+	pcb_conn_lookup_uninit();
+	pcb_undo_inc_serial();
+	User = pcb_false;
+	pcb_draw();
+}
+
+/* ---------------------------------------------------------------------------
+ * find all connections to pins within one element
+ */
+void pcb_lookup_subc_conns(pcb_subc_t *subc, FILE * FP)
+{
+	/* reset all currently marked connections */
+	User = pcb_true;
+	TheFlag = PCB_FLAG_FOUND;
+	pcb_reset_conns(pcb_true);
+	pcb_conn_lookup_init();
+	pcb_print_subc_conns(subc, FP, pcb_true);
+	pcb_board_set_changed_flag(pcb_true);
+	if (conf_core.editor.beep_when_finished)
+		pcb_gui->beep();
+	pcb_conn_lookup_uninit();
+	pcb_undo_inc_serial();
+	User = pcb_false;
+	pcb_draw();
+}
+
+
+/* ---------------------------------------------------------------------------
+ * find all connections to pins of all element
+ */
+void pcb_lookup_conns_to_all_elements(FILE * FP)
+{
+	/* reset all currently marked connections */
+	User = pcb_false;
+	TheFlag = PCB_FLAG_FOUND;
+	pcb_reset_conns(pcb_false);
+	pcb_conn_lookup_init();
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		/* break if abort dialog returned pcb_true */
+		if (pcb_print_subc_conns(subc, FP, pcb_false))
+			break;
+		SEPARATE(FP);
+		if (conf_core.editor.reset_after_element && gdl_it_idx(&__it__) != 1)
+			pcb_reset_conns(pcb_false);
+	}
+	PCB_END_LOOP;
+
+	if (conf_core.editor.beep_when_finished)
+		pcb_gui->beep();
+	pcb_reset_conns(pcb_false);
+	pcb_conn_lookup_uninit();
+	pcb_redraw();
+}
Index: tags/2.0.1/src/flag.c
===================================================================
--- tags/2.0.1/src/flag.c	(nonexistent)
+++ tags/2.0.1/src/flag.c	(revision 18980)
@@ -0,0 +1,87 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "flag.h"
+#include "operation.h"
+
+/* This just fills in a pcb_flag_t with current flags.  */
+pcb_flag_t pcb_flag_make(unsigned int flags)
+{
+	pcb_flag_t rv;
+	memset(&rv, 0, sizeof(rv));
+	rv.f = flags;
+	return rv;
+}
+
+pcb_flag_t pcb_flag_add(pcb_flag_t flag, unsigned int flags)
+{
+	flag.f |= flags;
+	return flag;
+}
+
+pcb_flag_t pcb_flag_mask(pcb_flag_t flag, unsigned int flags)
+{
+	flag.f &= ~flags;
+	return flag;
+}
+
+int pcb_mem_any_set(unsigned char *ptr, int bytes)
+{
+	while (bytes--)
+		if (*ptr++)
+			return 1;
+	return 0;
+}
+
+void pcb_flag_erase(pcb_flag_t * f)
+{
+	pcb_unknown_flag_t *u, *next;
+	for (u = f->unknowns; u != NULL; u = next) {
+		free(u->str);
+		next = u->next;
+		free(u);
+	}
+	f->unknowns = NULL;
+}
+
+int pcb_flag_eq(pcb_flag_t *f1, pcb_flag_t *f2)
+{
+	if (f1->f != f2->f)
+		return 0;
+
+	if (f1->q != f2->q)
+		return 0;
+
+	/* WARNING: ignore unknowns for now: the only place where we use this function,
+	undo.c, won't care */
+
+	return (memcmp(f1->t, &f2->t, sizeof(f1->t)) == 0);
+}
Index: tags/2.0.1/src/flag.h
===================================================================
--- tags/2.0.1/src/flag.h	(nonexistent)
+++ tags/2.0.1/src/flag.h	(revision 18980)
@@ -0,0 +1,205 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_FLAG_H
+#define PCB_FLAG_H
+
+#include "globalconst.h"
+
+/* Nobody should know about the internals of this except the macros in
+   macros.h that access it.  This structure must be simple-assignable
+   for now.  */
+typedef struct pcb_unknown_flag_s pcb_unknown_flag_t;
+struct pcb_unknown_flag_s {
+	char *str;
+	pcb_unknown_flag_t *next;
+};
+
+typedef struct {
+	unsigned long f;							/* generic flags */
+	unsigned char t[(PCB_MAX_LAYER + 1) / 2];	/* thermals */
+	unsigned char q;							/* square geometry flag */
+	pcb_unknown_flag_t *unknowns;
+} pcb_flag_t;
+
+extern pcb_flag_t no_flags;
+
+/* ---------------------------------------------------------------------------
+ * object flags
+ */
+
+/* %start-doc pcbfile ~objectflags
+@node Object Flags
+@section Object Flags
+
+Note that object flags can be given numerically (like @code{0x0147})
+or symbolically (like @code{"found,showname,square"}.  Some numeric
+values are reused for different object types.  The table below lists
+the numeric value followed by the symbolic name.
+
+Explanation of each bit can be found in flag_str.c
+
+%end-doc */
+typedef enum {
+	PCB_FLAG_NO           = 0x00000,
+	PCB_FLAG_PIN          = 0x00001,
+	PCB_FLAG_VIA          = 0x00002,
+	PCB_FLAG_FOUND        = 0x00004,
+	PCB_FLAG_HOLE         = 0x00008,
+	PCB_FLAG_NOPASTE      = 0x00008,
+	PCB_FLAG_RAT          = 0x00010,
+	PCB_FLAG_PININPOLY    = 0x00010,
+	PCB_FLAG_CLEARPOLY    = 0x00010,
+	PCB_FLAG_HIDENAME     = 0x00010,
+	PCB_FLAG_DISPLAYNAME  = 0x00020,
+	PCB_FLAG_CLEARLINE    = 0x00020,
+	PCB_FLAG_FULLPOLY     = 0x00020,
+	PCB_FLAG_SELECTED     = 0x00040,
+	PCB_FLAG_ONSOLDER     = 0x00080,
+	PCB_FLAG_AUTO         = 0x00080,
+	PCB_FLAG_SQUARE       = 0x00100,
+	PCB_FLAG_RUBBEREND    = 0x00200,
+	PCB_FLAG_WARN         = 0x00200,
+	PCB_FLAG_USETHERMAL   = 0x00400,
+	PCB_FLAG_ONSILK       = 0x00400, /* Obsolete, old files used this to indicate lines drawn on silk. (Used by io_pcb for compatibility.) */
+	PCB_FLAG_OCTAGON      = 0x00800,
+	PCB_FLAG_DRC          = 0x01000,
+	PCB_FLAG_LOCK         = 0x02000,
+	PCB_FLAG_EDGE2        = 0x04000,
+	PCB_FLAG_VISIT        = 0x08000, /* marker to avoid re-visiting an object */
+	PCB_FLAG_NONETLIST    = 0x10000,
+	PCB_FLAG_MINCUT       = 0x20000, /* used by the mincut short find code */
+	PCB_FLAG_ONPOINT      = 0x40000, /* crosshair is on line point or arc point */
+	PCB_FLAG_TERMNAME     = 0x80000, 
+	PCB_FLAG_DRC_INTCONN  = 0x100000,/* Set for objects are put on the DRC mark because of an intconn */
+	PCB_FLAG_CLEARPOLYPOLY= 0x200000,
+	PCB_FLAG_DYNTEXT      = 0x400000,
+	PCB_FLAG_FLOATER      = 0x800000
+/*	PCB_FLAG_NOCOPY     = (PCB_FLAG_FOUND | CONNECTEDFLAG | PCB_FLAG_ONPOINT)*/
+} pcb_flag_values_t;
+
+/* ---------------------------------------------------------------------------
+ * PCB flags - kept only for file format compatibility reasons; these bits
+   should be a mirror of booleans from the conf.
+ */
+
+/*
++@item 0x800000
++snap to certain off-grid points.
++@item 0x1000000
++highlight lines and arcs when the crosshair is on one of their endpoints.
+*/
+
+#define PCB_FLAGS               0x01ffffff	/* all used flags */
+
+#define PCB_SHOWNUMBERFLAG          0x00000001
+#define PCB_LOCALREFFLAG            0x00000002
+#define PCB_CHECKPLANESFLAG         0x00000004
+#define PCB_SHOWPCB_FLAG_DRC        0x00000008
+#define PCB_RUBBERBANDFLAG          0x00000010
+#define PCB_DESCRIPTIONFLAG         0x00000020
+#define PCB_NAMEONPCBFLAG           0x00000040
+#define PCB_AUTOPCB_FLAG_DRC        0x00000080
+#define PCB_ALLDIRECTIONFLAG        0x00000100
+#define PCB_SWAPSTARTDIRFLAG        0x00000200
+#define PCB_UNIQUENAMEFLAG          0x00000400
+#define PCB_CLEARNEWFLAG            0x00000800
+#define PCB_SNAPPCB_FLAG_PIN        0x00001000
+#define PCB_SHOWMASKFLAG            0x00002000
+#define PCB_THINDRAWFLAG            0x00004000
+#define PCB_ORTHOMOVEFLAG           0x00008000
+#define PCB_LIVEROUTEFLAG           0x00010000
+#define PCB_THINDRAWPOLYFLAG        0x00020000
+#define PCB_LOCKNAMESFLAG           0x00040000
+#define PCB_ONLYNAMESFLAG           0x00080000
+#define PCB_NEWPCB_FLAG_FULLPOLY    0x00100000
+#define PCB_HIDENAMESFLAG           0x00200000
+#define PCB_ENABLEPCB_FLAG_MINCUT   0x00400000
+
+
+
+/* Convert flags to flags, set everything else to 0 */
+pcb_flag_t pcb_flag_make(unsigned int src);
+
+/* set bits of src in dst */
+pcb_flag_t pcb_flag_add(pcb_flag_t dst, unsigned int src);
+
+/* clear (unset) bits of src in dst */
+pcb_flag_t pcb_flag_mask(pcb_flag_t dst, unsigned int src);
+
+/* destroy flags: clear all bits and free fields */
+void pcb_flag_erase(pcb_flag_t *f);
+
+#define		pcb_no_flags() pcb_flag_make(0)
+
+/* ---------------------------------------------------------------------------
+ * some routines for flag setting, clearing, changing and testing
+ */
+#define PCB_FLAG_SET(F,P)       ((P)->Flags.f |= (F))
+#define PCB_FLAG_CLEAR(F,P)     ((P)->Flags.f &= (~(F)))
+#define PCB_FLAG_TEST(F,P)      ((P)->Flags.f & (F) ? 1 : 0)
+#define PCB_FLAG_TOGGLE(F,P)    ((P)->Flags.f ^= (F))
+#define PCB_FLAG_ASSIGN(F,V,P)  ((P)->Flags.f = ((P)->Flags.f & (~(F))) | ((V) ? (F) : 0))
+#define PCB_FLAGS_TEST(F,P)     (((P)->Flags.f & (F)) == (F) ? 1 : 0)
+
+typedef enum {
+	PCB_CHGFLG_CLEAR,
+	PCB_CHGFLG_SET,
+	PCB_CHGFLG_TOGGLE
+} pcb_change_flag_t;
+
+#define PCB_FLAG_CHANGE(how, F, P) \
+do { \
+	switch(how) { \
+		case PCB_CHGFLG_CLEAR:  PCB_FLAG_CLEAR(F, P); break; \
+		case PCB_CHGFLG_SET:    PCB_FLAG_SET(F, P); break; \
+		case PCB_CHGFLG_TOGGLE: PCB_FLAG_TOGGLE(F, P); break; \
+	} \
+} while(0)
+
+int pcb_flag_eq(pcb_flag_t *f1, pcb_flag_t *f2);
+#define PCB_FLAG_EQ(F1,F2)	pcb_flag_eq(&(F1), &(F2))
+
+#define PCB_FLAG_THERM(L)		(0xf << (4 *((L) % 2)))
+
+#define PCB_FLAG_THERM_TEST(L,P)		((P)->Flags.t[(L)/2] & PCB_FLAG_THERM(L) ? 1 : 0)
+#define PCB_FLAG_THERM_GET(L,P)		(((P)->Flags.t[(L)/2] >> (4 * ((L) % 2))) & 0xf)
+#define PCB_FLAG_THERM_CLEAR(L,P)	(P)->Flags.t[(L)/2] &= ~PCB_FLAG_THERM(L)
+#define PCB_FLAG_THERM_ASSIGN(L,V,P)	(P)->Flags.t[(L)/2] = ((P)->Flags.t[(L)/2] & ~PCB_FLAG_THERM(L)) | ((V)  << (4 * ((L) % 2)))
+#define PCB_FLAG_THERM_ASSIGN_(L,V,F)	(F).t[(L)/2] = (((F).t[(L)/2] & ~PCB_FLAG_THERM(L)) | ((V)  << (4 * ((L) % 2))))
+
+
+#define PCB_FLAG_SQUARE_GET(P)		((P)->Flags.q)
+#define PCB_FLAG_SQUARE_CLEAR(P)		(P)->Flags.q = 0
+#define PCB_FLAG_SQUARE_ASSIGN(V,P)	(P)->Flags.q = V
+
+/* Returns 1 if any of the bytes in arr is non-zero */
+int pcb_mem_any_set(unsigned char *arr, int arr_len);
+#define PCB_FLAG_THERM_TEST_ANY(P)	pcb_mem_any_set((P)->Flags.t, sizeof((P)->Flags.t))
+
+#endif
Index: tags/2.0.1/src/flag_str.c
===================================================================
--- tags/2.0.1/src/flag_str.c	(nonexistent)
+++ tags/2.0.1/src/flag_str.c	(revision 18980)
@@ -0,0 +1,631 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2005 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "flag_str.h"
+#include "compat_misc.h"
+#include "obj_common.h"
+#include "macro.h"
+
+/* Because all the macros expect it, that's why.  */
+typedef struct {
+	pcb_flag_t Flags;
+} FlagHolder;
+
+/* Be careful to list more specific flags first, followed by general
+ * flags, when two flags use the same bit.  For example, "onsolder" is
+ * for elements only, while "auto" is for everything else.  They use
+ * the same bit, but onsolder is listed first so that elements will
+ * use it and not auto.
+ *
+ * Thermals are handled separately, as they're layer-selective.
+ */
+
+#define N(x) x, sizeof(x)-1
+#define FN(x) x, #x
+pcb_flag_bits_t pcb_object_flagbits[] = {
+	{FN(PCB_FLAG_PIN),           N("pin"),           PCB_OBJ_ANY, "If set, this object is a pin.  This flag is for internal use only.", 0, 1},
+	{FN(PCB_FLAG_VIA),           N("via"),           PCB_OBJ_ANY, "If set, this object is a via.  This flag is for internal use only.", 0, 1},
+	{FN(PCB_FLAG_FOUND),         N("found"),         PCB_OBJ_ANY, "If set, this object has been found by FindConnection()", 0, 0},
+	{FN(PCB_FLAG_HOLE),          N("hole"),          PCB_OBJ_CLASS_PIN, "For pins and vias, this flag means that the pin or via is a hole without a copper annulus.", 0, 0},
+	{FN(PCB_FLAG_RAT),           N("rat"),           PCB_OBJ_RAT, "If set for a line, indicates that this line is a rat line instead of a copper trace.", 0, 0},
+	{FN(PCB_FLAG_PININPOLY),     N("pininpoly"),     0, "For pins and pads, this flag is used internally to indicate that the pin or pad overlaps a polygon on some layer.", 0, 0},
+	{FN(PCB_FLAG_CLEARPOLY),     N("clearpoly"),     PCB_OBJ_POLY, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection).  When clear, polygons will solidly connect to pins and vias. ", 0, 0},
+	{FN(PCB_FLAG_HIDENAME),      N("hidename"),      0, "For elements, when set the name of the element is hidden.", PCB_OBJ_SUBC, 0},
+	{FN(PCB_FLAG_DISPLAYNAME),   N("showname"),      0, "OBSOLETE: For elements, when set the names of pins are shown.", 0, 0},
+	{FN(PCB_FLAG_CLEARLINE),     N("clearline"),     PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_TEXT | PCB_OBJ_PSTK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them.", 0, 0 },
+	{FN(PCB_FLAG_SELECTED),      N("selected"),      PCB_OBJ_ANY, "Set when the object is selected.", 0, 0},
+	{FN(PCB_FLAG_ONSOLDER),      N("onsolder"),      PCB_OBJ_TEXT, "For text, indicates that it is on the solder side.", PCB_OBJ_SUBC, 0},
+	{FN(PCB_FLAG_AUTO),          N("auto"),          PCB_OBJ_ANY, "For lines and vias, indicates that these were created by the autorouter.", 0, 0},
+	{FN(PCB_FLAG_SQUARE),        N("square"),        0, "For pins and pads, indicates a square (vs round) pin/pad.", PCB_OBJ_PSTK, 0},
+	{FN(PCB_FLAG_RUBBEREND),     N("rubberend"),     PCB_OBJ_LINE | PCB_OBJ_ARC, "For lines, used internally for rubber band moves: indicates one end already rubber banding.", 0, 0},
+	{FN(PCB_FLAG_WARN),          N("warn"),          PCB_OBJ_CLASS_PIN, "For pins, vias, and pads, set to indicate a warning.", 0, 0},
+	{FN(PCB_FLAG_USETHERMAL),    N("usetherm"),      PCB_OBJ_CLASS_PIN | PCB_OBJ_LINE | PCB_OBJ_ARC, "Obsolete, indicates that pins/vias should be drawn with thermal fingers.", 0, 1},
+	{FN(PCB_FLAG_OCTAGON),       N("octagon"),       0, "Draw pins and vias as octagons.", 0, 0},
+	{FN(PCB_FLAG_DRC),           N("drc"),           PCB_OBJ_ANY, "Set for objects that fail DRC: flag like FOUND flag for DRC checking.", 0},
+	{FN(PCB_FLAG_LOCK),          N("lock"),          PCB_OBJ_ANY, "Set for locked objects.", 0, 0},
+	{FN(PCB_FLAG_EDGE2),         N("edge2"),         PCB_OBJ_ANY, "For pads, indicates that the second point is closer to the edge.  For pins, indicates that the pin is closer to a horizontal edge and thus pinout text should be vertical. (Padr.Point2 is closer to outside edge also pinout text for pins is vertical)", 0, 1},
+	{FN(PCB_FLAG_FULLPOLY),      N("fullpoly"),      PCB_OBJ_POLY, "For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one).", 0, 0},
+	{FN(PCB_FLAG_NOPASTE),       N("nopaste"),       0, "Pad should not receive solderpaste.  This is to support fiducials", 0, 0},
+	{FN(PCB_FLAG_NONETLIST),     N("nonetlist"),     PCB_OBJ_SUBC, "subcircuit is not on the netlist and should not interfere with the netlist ", 0, 0},
+	{FN(PCB_FLAG_TERMNAME),      N("termname"),      PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT | PCB_OBJ_PSTK | PCB_OBJ_SUBC, "when set the names of pins are shown.", 0, 0},
+	{FN(PCB_FLAG_CLEARPOLYPOLY), N("clearpolypoly"), PCB_OBJ_POLY, "For polygons, apply clearance to nearby polygons", 0, 0},
+	{FN(PCB_FLAG_DYNTEXT),       N("dyntext"),       PCB_OBJ_TEXT, "For text: dynamic string (substitute %patterns%)", 0, 0},
+	{FN(PCB_FLAG_FLOATER),       N("floater"),       PCB_OBJ_ANY, "subc part can be moved after subc placing", 0, 0}
+};
+#undef N
+#undef FN
+
+const int pcb_object_flagbits_len = PCB_ENTRIES(pcb_object_flagbits);
+
+
+/*
+ * This helper function maintains a small list of buffers which are
+ * used by pcb_strflg_f2s().  Each buffer is allocated from the heap,
+ * but the caller must not free them (they get realloced when they're
+ * reused, but never completely freed).
+ */
+
+static struct {
+	char *ptr;
+	int len;
+} buffers[10];
+static int bufptr = 0;
+static char *alloc_buf(int len)
+{
+#define B buffers[bufptr]
+	len++;
+	bufptr = (bufptr + 1) % 10;
+	if (B.len < len) {
+		if (B.ptr)
+			B.ptr = (char *) realloc(B.ptr, len);
+		else
+			B.ptr = (char *) malloc(len);
+		B.len = len;
+	}
+	return B.ptr;
+#undef B
+}
+
+void pcb_strflg_uninit_buf(void)
+{
+	int n;
+	for(n = 0; n < 10; n++) {
+		if (buffers[n].ptr != NULL) {
+			free(buffers[n].ptr);
+			buffers[n].ptr = NULL;
+		}
+	}
+}
+
+/*
+ * This set of routines manages a list of layer-specific flags.
+ * Callers should call grow_layer_list(0) to reset the list, and
+ * set_layer_list(layer,1) to set bits in the layer list.  The results
+ * are stored in layers[], which has num_layers valid entries.
+ */
+
+static char *layers = 0;
+static int max_layers = 0, num_layers = 0;
+
+static void grow_layer_list(int num)
+{
+	if (layers == 0) {
+		layers = (char *) calloc(num > 0 ? num : 1, 1);
+		max_layers = num;
+	}
+	else if (num > max_layers) {
+		max_layers = num;
+		layers = (char *) realloc(layers, max_layers);
+	}
+	if (num > num_layers)
+		memset(layers + num_layers, 0, num - num_layers - 1);
+	num_layers = num;
+	return;
+}
+
+void pcb_strflg_uninit_layerlist(void)
+{
+	if (layers != NULL) {
+		free(layers);
+		layers = NULL;
+		num_layers = max_layers = 0;
+	}
+}
+
+static inline void set_layer_list(int layer, int v)
+{
+	if (layer >= num_layers)
+		grow_layer_list(layer + 1);
+	layers[layer] = v;
+}
+
+/*
+ * These next two convert between layer lists and strings.
+ * parse_layer_list() is passed a pointer to a string, and parses a
+ * list of integer which reflect layers to be flagged.  It returns a
+ * pointer to the first character following the list.  The syntax of
+ * the list is a paren-surrounded, comma-separated list of integers
+ * and/or pairs of integers separated by a dash (like "(1,2,3-7)").
+ * Spaces and other punctuation are not allowed.  The results are
+ * stored in layers[] defined above.
+ *
+ * print_layer_list() does the opposite - it uses the flags set in
+ * layers[] to build a string that represents them, using the syntax
+ * above.
+ *
+ */
+
+/* Returns a pointer to the first character past the list. */
+static const char *parse_layer_list(const char *bp, int (*error) (const char *))
+{
+	const char *orig_bp = bp;
+	int l = 0, range = -1;
+	int value = 1;
+
+	grow_layer_list(0);
+	while (*bp) {
+		if (*bp == '+')
+			value = 2;
+		else if (*bp == 'S')
+			value = 3;
+		else if (*bp == 'X')
+			value = 4;
+		else if (*bp == 't')
+			value = 5;
+		else if (*bp == ')' || *bp == ',' || *bp == '-') {
+			if (range == -1)
+				range = l;
+			while (range <= l)
+				set_layer_list(range++, value);
+			if (*bp == '-')
+				range = l;
+			else
+				range = -1;
+			value = 1;
+			l = 0;
+		}
+
+		else if (isdigit((int) *bp))
+			l = l * 10 + (*bp - '0');
+
+		else if (error) {
+			const char *fmt = "Syntax error parsing layer list \"%.*s\" at %c";
+			char *msg = alloc_buf(strlen(fmt) + strlen(orig_bp));
+			sprintf(msg, fmt, bp - orig_bp + 5, orig_bp, *bp);
+			error(msg);
+			error = NULL;
+		}
+
+		if (*bp == ')')
+			return bp + 1;
+
+		bp++;
+	}
+	return bp;
+}
+
+/* Number of character the value "i" requires when printed. */
+static int printed_int_length(int i, int j)
+{
+	int rv;
+
+	if (i < 10)
+		return 1 + (j ? 1 : 0);
+	if (i < 100)
+		return 2 + (j ? 1 : 0);
+
+	for (rv = 1; i >= 10; rv++)
+		i /= 10;
+	return rv + (j ? 1 : 0);
+}
+
+/* Returns a pointer to an internal buffer which is overwritten with
+   each new call.  */
+static char *print_layer_list()
+{
+	static char *buf = 0;
+	static int buflen = 0;
+	int len, i, j;
+	char *bp;
+
+	len = 2;
+	for (i = 0; i < num_layers; i++)
+		if (layers[i])
+			len += 1 + printed_int_length(i, layers[i]);
+	if (buflen < len) {
+		if (buf)
+			buf = (char *) realloc(buf, len);
+		else
+			buf = (char *) malloc(len);
+		buflen = len;
+	}
+
+	bp = buf;
+	*bp++ = '(';
+
+	for (i = 0; i < num_layers; i++)
+		if (layers[i]) {
+			/* 0 0 1 1 1 0 0 */
+			/*     i     j   */
+			for (j = i + 1; j < num_layers && layers[j] == 1; j++);
+			if (j > i + 2) {
+				sprintf(bp, "%d-%d,", i, j - 1);
+				i = j - 1;
+			}
+			else
+				switch (layers[i]) {
+				case 1:
+					sprintf(bp, "%d,", i);
+					break;
+				case 2:
+					sprintf(bp, "%d+,", i);
+					break;
+				case 3:
+					sprintf(bp, "%dS,", i);
+					break;
+				case 4:
+					sprintf(bp, "%dX,", i);
+					break;
+				case 5:
+				default:
+					sprintf(bp, "%dt,", i);
+					break;
+				}
+			bp += strlen(bp);
+		}
+	bp[-1] = ')';
+	*bp = 0;
+	return buf;
+}
+
+/*
+ * Ok, now the two entry points to this file.  The first, string_to_flags,
+ * is passed a string (usually from parse_y.y) and returns a "set of flags".
+ * In theory, this can be anything, but for now it's just an integer.  Later
+ * it might be a structure, for example.
+ *
+ * Currently, there is no error handling :-P
+ */
+
+static int error_ignore(const char *msg)
+{																/* do nothing */
+	return 0;
+}
+
+static pcb_flag_t empty_flags;
+
+pcb_flag_t pcb_strflg_common_s2f(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits, unsigned char *intconn, int compat)
+{
+	const char *fp, *ep;
+	int flen;
+	FlagHolder rv;
+	int i;
+
+	if (intconn != NULL)
+		*intconn = 0;
+	rv.Flags = empty_flags;
+
+	if (error == 0)
+		error = error_ignore;
+
+	if (flagstring == NULL)
+		return empty_flags;
+
+	fp = ep = flagstring;
+
+	if (*fp == '"')
+		ep = ++fp;
+
+	while (*ep && *ep != '"') {
+		int found = 0;
+
+		while (*fp == ',')
+			fp++;
+
+		for (ep = fp; *ep && *ep != ',' && *ep != '"' && *ep != '('; ep++);
+		flen = ep - fp;
+		if (*ep == '(')
+			ep = parse_layer_list(ep + 1, error);
+
+		if (flen == 7 && memcmp(fp, "thermal", 7) == 0) {
+			for (i = 0; i < PCB_MAX_LAYER && i < num_layers; i++)
+				if (layers[i])
+					PCB_FLAG_THERM_ASSIGN(i, layers[i], &rv);
+		}
+		else if (flen == 5 && memcmp(fp, "shape", 5) == 0) {
+			rv.Flags.q = atoi(fp + 6);
+		}
+		else if (intconn != NULL && flen == 7 && memcmp(fp, "intconn", 7) == 0) {
+			*intconn = atoi(fp + 8);
+		}
+		else {
+			for (i = 0; i < n_flagbits; i++)
+				if (flagbits[i].nlen == flen && memcmp(flagbits[i].name, fp, flen) == 0) {
+					found = 1;
+					PCB_FLAG_SET(flagbits[i].mask, &rv);
+					break;
+				}
+			if (!found) {
+				const char *fmt = "Unknown flag: \"%.*s\" ignored";
+				pcb_unknown_flag_t *u;
+				char *msg;
+				const char *s;
+
+				/* include () */
+				s = fp + flen;
+				if (*s == '(') {
+					while (*s != ')') {
+						flen++;
+						s++;
+					}
+				}
+				if (*s == ')')
+					flen++;
+
+				msg = alloc_buf(strlen(fmt) + flen);
+				sprintf(msg, fmt, flen, fp);
+				error(msg);
+
+				u = malloc(sizeof(pcb_unknown_flag_t));
+				u->str = pcb_strndup(fp, flen);
+				u->next = NULL;
+				/* need to append, to keep order of flags */
+				if (rv.Flags.unknowns != NULL) {
+					pcb_unknown_flag_t *n;
+					for (n = rv.Flags.unknowns; n->next != NULL; n = n->next);
+					n->next = u;
+				}
+				else
+					rv.Flags.unknowns = u;
+			}
+		}
+		fp = ep + 1;
+	}
+	return rv.Flags;
+}
+
+pcb_flag_t pcb_strflg_s2f(const char *flagstring, int (*error) (const char *msg), unsigned char *intconn, int compat)
+{
+	return pcb_strflg_common_s2f(flagstring, error, pcb_object_flagbits, PCB_ENTRIES(pcb_object_flagbits), intconn, compat);
+}
+
+
+/*
+ * Given a set of flags for a given type of object, return a string
+ * which reflects those flags.  The only requirement is that this
+ * string be parseable by string_to_flags.
+ *
+ * Note that this function knows a little about what kinds of flags
+ * will be automatically set by parsing, so it won't (for example in
+ * the old data model) include the "via" flag for PCB_OBJ_VIAs because
+ * it knows those get forcibly set when vias are parsed. */
+char *pcb_strflg_common_f2s(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits, unsigned char *intconn, int compat)
+{
+	int len;
+	int i;
+	FlagHolder fh, savef;
+	char *buf, *bp;
+	pcb_unknown_flag_t *u;
+
+	fh.Flags = flags;
+
+#ifndef FLAG_TEST
+	switch (object_type) {
+	case PCB_OBJ_RAT:
+		PCB_FLAG_CLEAR(PCB_FLAG_RAT, &fh);
+		break;
+	}
+#endif
+
+	savef = fh;
+
+	len = 3;											/* for "()\0" */
+
+	for (i = 0; i < n_flagbits; i++) {
+		long my_obj_typs = flagbits[i].object_types | (compat ? flagbits[i].compat_types : 0);
+		if ((my_obj_typs & object_type) && (PCB_FLAG_TEST(flagbits[i].mask, &fh))) {
+			len += flagbits[i].nlen + 1;
+			PCB_FLAG_CLEAR(flagbits[i].mask, &fh);
+		}
+	}
+
+	if (PCB_FLAG_THERM_TEST_ANY(&fh)) {
+		len += sizeof("thermal()");
+		for (i = 0; i < PCB_MAX_LAYER; i++)
+			if (PCB_FLAG_THERM_TEST(i, &fh))
+				len += printed_int_length(i, PCB_FLAG_THERM_GET(i, &fh)) + 1;
+	}
+
+	if (flags.q > 0) {
+		len += sizeof("shape(.)");
+		if (flags.q > 9)
+			len += 2;
+	}
+
+	if ((intconn != NULL) && (*intconn > 0)) {
+		len += sizeof("intconn(.)");
+		if (*intconn > 9)
+			len++;
+		if (*intconn > 99)
+			len++;
+	}
+
+	for (u = flags.unknowns; u != NULL; u = u->next)
+		len += strlen(u->str) + 1;
+
+	bp = buf = alloc_buf(len + 2);
+
+	*bp++ = '"';
+
+	fh = savef;
+	for (i = 0; i < n_flagbits; i++) {
+		long my_obj_typs = flagbits[i].object_types | (compat ? flagbits[i].compat_types : 0);
+		if ((my_obj_typs & object_type) && (PCB_FLAG_TEST(flagbits[i].mask, &fh))) {
+			if (bp != buf + 1)
+				*bp++ = ',';
+			strcpy(bp, flagbits[i].name);
+			bp += flagbits[i].nlen;
+			PCB_FLAG_CLEAR(flagbits[i].mask, &fh);
+		}
+	}
+
+	if (PCB_FLAG_THERM_TEST_ANY(&fh)) {
+		if (bp != buf + 1)
+			*bp++ = ',';
+		strcpy(bp, "thermal");
+		bp += strlen("thermal");
+		grow_layer_list(0);
+		for (i = 0; i < PCB_MAX_LAYER; i++)
+			if (PCB_FLAG_THERM_TEST(i, &fh))
+				set_layer_list(i, PCB_FLAG_THERM_GET(i, &fh));
+		strcpy(bp, print_layer_list());
+		bp += strlen(bp);
+	}
+
+	if (flags.q > 0) {
+		if (bp != buf + 1)
+			*bp++ = ',';
+		bp += sprintf(bp, "shape(%d)", flags.q);
+	}
+
+	if ((intconn != NULL) && (*intconn > 0)) {
+		if (bp != buf + 1)
+			*bp++ = ',';
+		bp += sprintf(bp, "intconn(%d)", *intconn);
+	}
+
+	for (u = flags.unknowns; u != NULL; u = u->next) {
+		int len;
+		len = strlen(u->str);
+		if (bp != buf + 1)
+			*bp++ = ',';
+		memcpy(bp, u->str, len);
+		bp += len;
+	}
+
+	*bp++ = '"';
+	*bp = 0;
+	return buf;
+}
+
+char *pcb_strflg_f2s(pcb_flag_t flags, int object_type, unsigned char *intconn, int compat)
+{
+	return pcb_strflg_common_f2s(flags, object_type, pcb_object_flagbits, PCB_ENTRIES(pcb_object_flagbits), intconn, compat);
+}
+
+const pcb_flag_bits_t *pcb_strflg_1bit(unsigned long bit, int object_type)
+{
+	int i, n_flagbits = PCB_ENTRIES(pcb_object_flagbits);;
+	for (i = 0; i < n_flagbits; i++) {
+		unsigned long my_obj_typs = pcb_object_flagbits[i].object_types;
+		if ((my_obj_typs & object_type) && (!pcb_object_flagbits[i].omit_list) && (pcb_object_flagbits[i].mask & bit))
+			return &pcb_object_flagbits[i];
+	}
+	return NULL;
+}
+
+const pcb_flag_bits_t *pcb_strflg_name(const char *name, int object_type)
+{
+	int i, n_flagbits = PCB_ENTRIES(pcb_object_flagbits);;
+	for (i = 0; i < n_flagbits; i++) {
+		unsigned long my_obj_typs = pcb_object_flagbits[i].object_types;
+		if ((my_obj_typs & object_type) && (!pcb_object_flagbits[i].omit_list) && (strcmp(pcb_object_flagbits[i].name, name) == 0))
+			return &pcb_object_flagbits[i];
+	}
+	return NULL;
+}
+
+void pcb_strflg_map(unsigned long fbits, int object_type, void *ctx, void (*cb)(void *ctx, unsigned long flg, const pcb_flag_bits_t *fb))
+{
+	int n, i, n_flagbits = PCB_ENTRIES(pcb_object_flagbits);
+	for(n = 0; n < 32; n++) {
+		unsigned long bit = 1 << n;
+		if (!(fbits & bit))
+			continue;
+
+		for (i = 0; i < n_flagbits; i++) {
+			unsigned long my_obj_typs = pcb_object_flagbits[i].object_types /*| pcb_object_flagbits[i].compat_types*/;
+			if ((my_obj_typs & object_type) && (!pcb_object_flagbits[i].omit_list) && (pcb_object_flagbits[i].mask & bit)) {
+				cb(ctx, bit, &pcb_object_flagbits[i]);
+			}
+		}
+	}
+}
+
+
+#define N(x) x, sizeof(x)-1
+#define FN(x) x, #x
+static pcb_flag_bits_t pcb_flagbits[] = {
+	{FN(PCB_SHOWNUMBERFLAG),        N("shownumber"),   1, "Pinout displays pin numbers instead of pin names." },
+	{FN(PCB_LOCALREFFLAG),          N("localref"),     1, "Use local reference for moves, by setting the mark at the beginning of each move." },
+	{FN(PCB_CHECKPLANESFLAG),       N("checkplanes"),  1, "When set, only polygons and their clearances are drawn, to see if polygons have isolated regions." },
+	{FN(PCB_SHOWPCB_FLAG_DRC),      N("showdrc"),      1, "Display DRC region on crosshair." },
+	{FN(PCB_RUBBERBANDFLAG),        N("rubberband"),   1, "Do all move, mirror, rotate with rubberband connections." },
+	{FN(PCB_DESCRIPTIONFLAG),       N("description"),  1, "Display descriptions of elements, instead of refdes." },
+	{FN(PCB_NAMEONPCBFLAG),         N("nameonpcb"),    1, "Display names of elements, instead of refdes." },
+	{FN(PCB_AUTOPCB_FLAG_DRC),      N("autodrc"),      1, "Auto-DRC flag.  When set, PCB doesn't let you place copper that violates DRC." },
+	{FN(PCB_ALLDIRECTIONFLAG),      N("alldirection"), 1, "Enable 'all-direction' lines." },
+	{FN(PCB_SWAPSTARTDIRFLAG),      N("swapstartdir"), 1, "Switch starting angle after each click." },
+	{FN(PCB_UNIQUENAMEFLAG),        N("uniquename"),   1, "Force unique names on board." },
+	{FN(PCB_CLEARNEWFLAG),          N("clearnew"),     1, "New lines/arc clear polygons." },
+	{FN(PCB_SNAPPCB_FLAG_PIN),      N("snappin"),      1, "pcb_crosshair snaps to pins and pads." },
+	{FN(PCB_SHOWMASKFLAG),          N("showmask"),     1, "Show the solder mask layer." },
+	{FN(PCB_THINDRAWFLAG),          N("thindraw"),     1, "Draw with thin lines." },
+	{FN(PCB_ORTHOMOVEFLAG),         N("orthomove"),    1, "Move items orthogonally." },
+	{FN(PCB_LIVEROUTEFLAG),         N("liveroute"),    1, "Draw autoroute paths real-time." },
+	{FN(PCB_NEWPCB_FLAG_FULLPOLY),  N("newfullpoly"),  1, "New polygons are full ones." },
+	{FN(PCB_THINDRAWPOLYFLAG),      N("thindrawpoly"), 1, "Thin draw polygon contours instead of filling polygons." },
+	{FN(PCB_LOCKNAMESFLAG),         N("locknames"),    1, "Names are locked, the mouse cannot select them." },
+	{FN(PCB_ONLYNAMESFLAG),         N("onlynames"),    1, "Everything but names are locked, the mouse cannot select anything else." },
+	{FN(PCB_HIDENAMESFLAG),         N("hidenames"),    1, "When set, element names are not drawn." },
+	{FN(PCB_ENABLEPCB_FLAG_MINCUT), N("enablemincut"), 1, "Use the mincut algorithm for finding shorts." },
+};
+#undef N
+#undef FN
+
+char *pcb_strflg_board_f2s(pcb_flag_t flags)
+{
+	return pcb_strflg_common_f2s(flags, PCB_OBJ_ANY, pcb_flagbits, PCB_ENTRIES(pcb_flagbits), NULL, 0);
+}
+
+pcb_flag_t pcb_strflg_board_s2f(const char *flagstring, int (*error) (const char *msg))
+{
+	return pcb_strflg_common_s2f(flagstring, error, pcb_flagbits, PCB_ENTRIES(pcb_flagbits), NULL, 0);
+}
Index: tags/2.0.1/src/flag_str.h
===================================================================
--- tags/2.0.1/src/flag_str.h	(nonexistent)
+++ tags/2.0.1/src/flag_str.h	(revision 18980)
@@ -0,0 +1,102 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2005 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#ifndef PCB_STRFLAGS_H
+#define PCB_STRFLAGS_H
+
+#include "flag.h"
+
+typedef struct {
+
+	/* This is the bit that we're setting.  */
+	pcb_flag_values_t mask;
+	const char *mask_name;
+
+	/* The name used in the output file.  */
+	const char *name;
+	int nlen;
+
+	/* The entry won't be output unless the object type is one of these.  */
+	int object_types;
+
+	char *help;
+
+	/* in compatibility mode also accept these object types to have the flag */
+	int compat_types;
+
+	/* when non-zero, omit from all-flag listings */
+	int omit_list;
+} pcb_flag_bits_t;
+
+/* All flags natively known by the core */
+extern pcb_flag_bits_t pcb_object_flagbits[];
+extern const int pcb_object_flagbits_len;
+
+/* The purpose of this interface is to make the file format able to
+   handle more than 32 flags, and to hide the internal details of
+   flags from the file format. In compat mode, compat_types are
+   also considered (so an old PCB PAD (padstack now) can have
+   a square flag). */
+
+/* When passed a string, parse it and return an appropriate set of
+   flags.  Errors cause error() to be called with a suitable message;
+   if error is NULL, errors are ignored.  */
+pcb_flag_t pcb_strflg_s2f(const char *flagstring, int (*error) (const char *msg), unsigned char *intconn, int compat);
+
+/* Given a set of flags for a given object type, return a string which
+   can be output to a file.  The returned pointer must not be
+   freed.  */
+char *pcb_strflg_f2s(pcb_flag_t flags, int object_type, unsigned char *intconn, int compat);
+
+
+/* Call cb for each flag bit for a given object type */
+void pcb_strflg_map(unsigned long fbits, int object_type, void *ctx, void (*cb)(void *ctx, unsigned long flg, const pcb_flag_bits_t *fb));
+
+/* Return flag bit info for a single bit for an object type, or NULL is not available - slow linear search */
+const pcb_flag_bits_t *pcb_strflg_1bit(unsigned long bit, int object_type);
+
+/* Return flag bit info by flag name for an object type, or NULL is not available - slow linear search */
+const pcb_flag_bits_t *pcb_strflg_name(const char *name, int object_type);
+
+/* same as above, for pcb level flags */
+char *pcb_strflg_board_f2s(pcb_flag_t flags);
+pcb_flag_t pcb_strflg_board_s2f(const char *flagstring, int (*error) (const char *msg));
+
+void pcb_strflg_uninit_buf(void);
+void pcb_strflg_uninit_layerlist(void);
+
+/* low level */
+pcb_flag_t pcb_strflg_common_s2f(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits, unsigned char *intconn, int compat);
+char *pcb_strflg_common_f2s(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits, unsigned char *intconn, int compat);
+
+#endif
Index: tags/2.0.1/src/font.c
===================================================================
--- tags/2.0.1/src/font.c	(nonexistent)
+++ tags/2.0.1/src/font.c	(revision 18980)
@@ -0,0 +1,474 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* font support. Note: glyphs are called symbols here */
+
+#include "config.h"
+
+#include <string.h>
+#include <genht/hash.h>
+
+#include "font.h"
+#include "board.h"
+#include "conf_core.h"
+#include "error.h"
+#include "plug_io.h"
+#include "paths.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "event.h"
+#include "build_run.h"
+
+#define STEP_SYMBOLLINE 10
+
+typedef struct embf_line_s {
+	int x1, y1, x2, y2, th;
+} embf_line_t;
+
+typedef struct embf_font_s {
+	int delta;
+	embf_line_t *lines;
+	int num_lines;
+} embf_font_t;
+
+#include "font_internal.c"
+
+static void pcb_font_load_internal(pcb_font_t *font)
+{
+	int n, l;
+	memset(font, 0, sizeof(pcb_font_t));
+	font->MaxWidth  = embf_maxx - embf_minx;
+	font->MaxHeight = embf_maxy - embf_miny;
+	for(n = 0; n < sizeof(embf_font) / sizeof(embf_font[0]); n++) {
+		if (embf_font[n].delta != 0) {
+			pcb_symbol_t *s = font->Symbol + n;
+			embf_line_t *lines = embf_font[n].lines;
+
+			for(l = 0; l < embf_font[n].num_lines; l++) {
+				pcb_coord_t x1 = PCB_MIL_TO_COORD(lines[l].x1);
+				pcb_coord_t y1 = PCB_MIL_TO_COORD(lines[l].y1);
+				pcb_coord_t x2 = PCB_MIL_TO_COORD(lines[l].x2);
+				pcb_coord_t y2 = PCB_MIL_TO_COORD(lines[l].y2);
+				pcb_coord_t th = PCB_MIL_TO_COORD(lines[l].th);
+				pcb_font_new_line_in_sym(s, x1, y1, x2, y2, th);
+			}
+
+			s->Valid = 1;
+			s->Delta = PCB_MIL_TO_COORD(embf_font[n].delta);
+		}
+	}
+	pcb_font_set_info(font);
+}
+
+static int pcb_parse_font_default(pcb_font_t *ptr, const char *filename)
+{
+	int res = pcb_parse_font(ptr, filename);
+	if (res == 0)
+		pcb_file_loaded_set_at("font", "default", filename, "original default font");
+	return res;
+}
+
+/* parses a file with font information and installs it into the provided PCB
+ * checks directories given as colon separated list by resource fontPath
+ * if the fonts filename doesn't contain a directory component */
+void pcb_font_create_default(pcb_board_t *pcb)
+{
+	int res = -1;
+	pcb_io_err_inhibit_inc();
+	conf_list_foreach_path_first(res, &conf_core.rc.default_font_file, pcb_parse_font_default(&pcb->fontkit.dflt, __path__));
+	pcb_io_err_inhibit_dec();
+
+	if (res != 0) {
+		const char *s;
+		gds_t buff;
+		s = conf_concat_strlist(&conf_core.rc.default_font_file, &buff, NULL, ':');
+		pcb_message(PCB_MSG_WARNING, _("Can't find font-symbol-file. Searched: '%s'; falling back to the embedded default font\n"), s);
+		pcb_font_load_internal(&pcb->fontkit.dflt);
+		pcb_file_loaded_set_at("font", "default", "<internal>", "original default font");
+		gds_uninit(&buff);
+	}
+}
+
+/* transforms symbol coordinates so that the left edge of each symbol
+ * is at the zero position. The y coordinates are moved so that min(y) = 0 */
+void pcb_font_set_info(pcb_font_t *Ptr)
+{
+	pcb_cardinal_t i, j;
+	pcb_symbol_t *symbol;
+	pcb_line_t *line;
+	pcb_arc_t *arc;
+	pcb_poly_t *poly;
+	pcb_coord_t totalminy = PCB_MAX_COORD;
+
+	/* calculate cell with and height (is at least PCB_DEFAULT_CELLSIZE)
+	 * maximum cell width and height
+	 * minimum x and y position of all lines
+	 */
+	Ptr->MaxWidth = PCB_DEFAULT_CELLSIZE;
+	Ptr->MaxHeight = PCB_DEFAULT_CELLSIZE;
+	for (i = 0, symbol = Ptr->Symbol; i <= PCB_MAX_FONTPOSITION; i++, symbol++) {
+		pcb_coord_t minx, miny, maxx, maxy;
+
+		/* next one if the index isn't used or symbol is empty (SPACE) */
+		if (!symbol->Valid || !symbol->LineN)
+			continue;
+
+		minx = miny = PCB_MAX_COORD;
+		maxx = maxy = 0;
+		for (line = symbol->Line, j = symbol->LineN; j; j--, line++) {
+			minx = MIN(minx, line->Point1.X);
+			miny = MIN(miny, line->Point1.Y);
+			minx = MIN(minx, line->Point2.X);
+			miny = MIN(miny, line->Point2.Y);
+			maxx = MAX(maxx, line->Point1.X);
+			maxy = MAX(maxy, line->Point1.Y);
+			maxx = MAX(maxx, line->Point2.X);
+			maxy = MAX(maxy, line->Point2.Y);
+		}
+
+		for(arc = arclist_first(&symbol->arcs); arc != NULL; arc = arclist_next(arc)) {
+			pcb_arc_bbox(arc);
+			minx = MIN(minx, arc->BoundingBox.X1);
+			miny = MIN(miny, arc->BoundingBox.Y1);
+			maxx = MAX(maxx, arc->BoundingBox.X2);
+			maxy = MAX(maxy, arc->BoundingBox.Y2);
+		}
+
+		for(poly = polylist_first(&symbol->polys); poly != NULL; poly = polylist_next(poly)) {
+			pcb_poly_bbox(poly);
+			minx = MIN(minx, poly->BoundingBox.X1);
+			miny = MIN(miny, poly->BoundingBox.Y1);
+			maxx = MAX(maxx, poly->BoundingBox.X2);
+			maxy = MAX(maxy, poly->BoundingBox.Y2);
+		}
+
+
+		/* move symbol to left edge */
+		for (line = symbol->Line, j = symbol->LineN; j; j--, line++)
+			pcb_line_move(line, -minx, 0);
+
+		for(arc = arclist_first(&symbol->arcs); arc != NULL; arc = arclist_next(arc))
+			pcb_arc_move(arc, -minx, 0);
+
+		for(poly = polylist_first(&symbol->polys); poly != NULL; poly = polylist_next(poly))
+			pcb_poly_move(poly, -minx, 0);
+
+		/* set symbol bounding box with a minimum cell size of (1,1) */
+		symbol->Width = maxx - minx + 1;
+		symbol->Height = maxy + 1;
+
+		/* check total min/max  */
+		Ptr->MaxWidth = MAX(Ptr->MaxWidth, symbol->Width);
+		Ptr->MaxHeight = MAX(Ptr->MaxHeight, symbol->Height);
+		totalminy = MIN(totalminy, miny);
+	}
+
+	/* move coordinate system to the upper edge (lowest y on screen) */
+	for (i = 0, symbol = Ptr->Symbol; i <= PCB_MAX_FONTPOSITION; i++, symbol++) {
+		if (symbol->Valid) {
+			symbol->Height -= totalminy;
+			for (line = symbol->Line, j = symbol->LineN; j; j--, line++)
+				pcb_line_move(line, 0, -totalminy);
+
+			for(arc = arclist_first(&symbol->arcs); arc != NULL; arc = arclist_next(arc))
+				pcb_arc_move(arc, 0, -totalminy);
+
+			for(poly = polylist_first(&symbol->polys); poly != NULL; poly = polylist_next(poly))
+				pcb_poly_move(poly, 0, -totalminy);
+		}
+	}
+
+	/* setup the box for the default symbol */
+	Ptr->DefaultSymbol.X1 = Ptr->DefaultSymbol.Y1 = 0;
+	Ptr->DefaultSymbol.X2 = Ptr->DefaultSymbol.X1 + Ptr->MaxWidth;
+	Ptr->DefaultSymbol.Y2 = Ptr->DefaultSymbol.Y1 + Ptr->MaxHeight;
+}
+
+/* creates a new line in a symbol */
+pcb_line_t *pcb_font_new_line_in_sym(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness)
+{
+	pcb_line_t *line = Symbol->Line;
+
+	/* realloc new memory if necessary and clear it */
+	if (Symbol->LineN >= Symbol->LineMax) {
+		Symbol->LineMax += STEP_SYMBOLLINE;
+		line = (pcb_line_t *) realloc(line, Symbol->LineMax * sizeof(pcb_line_t));
+		Symbol->Line = line;
+		memset(line + Symbol->LineN, 0, STEP_SYMBOLLINE * sizeof(pcb_line_t));
+	}
+
+	/* copy values */
+	line = line + Symbol->LineN++;
+	line->Point1.X = X1;
+	line->Point1.Y = Y1;
+	line->Point2.X = X2;
+	line->Point2.Y = Y2;
+	line->Thickness = Thickness;
+	return line;
+}
+
+pcb_poly_t *pcb_font_new_poly_in_sym(pcb_symbol_t *Symbol, int num_points)
+{
+	pcb_poly_t *p = calloc(sizeof(pcb_poly_t), 1);
+	if (num_points > 0) {
+		p->PointN = p->PointMax = num_points;
+		p->Points = malloc(sizeof(pcb_point_t) * num_points);
+	}
+	polylist_insert(&Symbol->polys, p);
+	return p;
+}
+
+pcb_arc_t *pcb_font_new_arc_in_sym(pcb_symbol_t *Symbol, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r, pcb_angle_t start, pcb_angle_t delta, pcb_coord_t thickness)
+{
+	pcb_arc_t *a = calloc(sizeof(pcb_arc_t), 1);
+	a->X = cx;
+	a->Y = cy;
+	a->Height = a->Width = r;
+	a->StartAngle = start;
+	a->Delta = delta;
+	a->Thickness = thickness;
+	arclist_insert(&Symbol->arcs, a);
+	return a;
+}
+
+
+static pcb_font_t *pcb_font_(pcb_board_t *pcb, pcb_font_id_t id, int fallback, int unlink)
+{
+	if (id <= 0) {
+		do_default:;
+		if (unlink) {
+			pcb_font_t *f = malloc(sizeof(pcb_font_t));
+			memcpy(f, &pcb->fontkit.dflt, sizeof(pcb_font_t));
+			memset(&pcb->fontkit.dflt, 0, sizeof(pcb_font_t));
+			return f;
+		}
+		else
+			return &pcb->fontkit.dflt;
+	}
+
+	if (pcb->fontkit.hash_inited) {
+		pcb_font_t *f = htip_get(&pcb->fontkit.fonts, id);
+		if (f != NULL) {
+			if (unlink)
+				htip_popentry(&pcb->fontkit.fonts, id);
+			return f;
+		}
+	}
+
+	if (fallback)
+		goto do_default;
+
+	return NULL;
+}
+
+pcb_font_t *pcb_font(pcb_board_t *pcb, pcb_font_id_t id, int fallback)
+{
+	return pcb_font_(pcb, id, fallback, 0);
+}
+
+pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, pcb_font_id_t id)
+{
+	return pcb_font_(pcb, id, 0, 1);
+}
+
+
+static void hash_setup(pcb_fontkit_t *fk)
+{
+	if (fk->hash_inited)
+		return;
+
+	htip_init(&fk->fonts, longhash, longkeyeq);
+	fk->hash_inited = 1;
+}
+
+pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, pcb_font_id_t id, const char *name)
+{
+	pcb_font_t *f;
+
+	if (id == 0)
+		return NULL;
+
+	if (id < 0)
+		id = fk->last_id + 1;
+
+	hash_setup(fk);
+
+	/* do not attempt to overwrite/reuse existing font of the same ID, rather report error */
+	f = htip_get(&fk->fonts, id);
+	if (f != NULL)
+		return NULL;
+
+	f = calloc(sizeof(pcb_font_t), 1);
+	htip_set(&fk->fonts, id, f);
+	if (name != NULL)
+		f->name = pcb_strdup(name);
+	f->id = id;
+
+	if (f->id > fk->last_id)
+		fk->last_id = f->id;
+
+	return f;
+}
+
+void pcb_font_free(pcb_font_t *f)
+{
+	int i;
+	for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) {
+		pcb_poly_t *p;
+		pcb_arc_t *a;
+
+		free(f->Symbol[i].Line);
+
+		for(p = polylist_first(&f->Symbol[i].polys); p != NULL; p = polylist_first(&f->Symbol[i].polys)) {
+			polylist_remove(p);
+			pcb_poly_free_fields(p);
+			free(p);
+		}
+
+		for(a = arclist_first(&f->Symbol[i].arcs); a != NULL; a = arclist_first(&f->Symbol[i].arcs)) {
+			pcb_arc_free(a);
+		}
+		
+		memset (&f->Symbol[i], 0, sizeof(f->Symbol[0]));
+	}
+	free(f->name);
+	f->name = NULL;
+	f->id = -1;
+}
+
+void pcb_fontkit_free(pcb_fontkit_t *fk)
+{
+	pcb_font_free(&fk->dflt);
+	if (fk->hash_inited) {
+		htip_entry_t *e;
+		for (e = htip_first(&fk->fonts); e; e = htip_next(&fk->fonts, e))
+			pcb_font_free(e->value);
+		htip_uninit(&fk->fonts);
+		fk->hash_inited = 0;
+	}
+	fk->last_id = 0;
+}
+
+void pcb_fontkit_reset(pcb_fontkit_t *fk)
+{
+	if (fk->hash_inited) {
+		htip_entry_t *e;
+		for (e = htip_first(&fk->fonts); e; e = htip_first(&fk->fonts)) {
+			pcb_font_free(e->value);
+			htip_delentry(&fk->fonts, e);
+		}
+	}
+	fk->last_id = 0;
+}
+
+static void update_last_id(pcb_fontkit_t *fk)
+{
+	pcb_font_id_t id;
+	for (id = fk->last_id; id > 0; id--) {
+		if (htip_has(&fk->fonts, id))
+			break;
+	}
+	fk->last_id = id;
+}
+
+int pcb_del_font(pcb_fontkit_t *fk, pcb_font_id_t id)
+{
+	htip_entry_t *e;
+
+	if ((id == 0) || (!fk->hash_inited) || (htip_get(&fk->fonts, id) == NULL))
+		return -1;
+
+	e = htip_popentry(&fk->fonts, id);
+	pcb_font_free(e->value);
+	pcb_event(PCB_EVENT_FONT_CHANGED, "i", id);
+	if (id == fk->last_id)
+		update_last_id(fk);
+	return 0;
+}
+
+static void copy_font(pcb_font_t *dst, pcb_font_t *src)
+{
+	int i;
+	
+	memcpy(dst, src, sizeof(pcb_font_t));
+	for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) {
+		pcb_poly_t *p_src;
+		pcb_arc_t *a_src;
+		
+		if (src->Symbol[i].Line) {
+			dst->Symbol[i].Line = malloc(sizeof(pcb_line_t) * src->Symbol[i].LineMax);
+			memcpy(dst->Symbol[i].Line, src->Symbol[i].Line, sizeof(pcb_line_t) * src->Symbol[i].LineN);
+		}
+
+		memset(&dst->Symbol[i].polys, 0, sizeof(polylist_t));
+		for(p_src = polylist_first(&src->Symbol[i].polys); p_src != NULL; p_src = polylist_next(p_src)) {
+			pcb_poly_t *p_dst = pcb_font_new_poly_in_sym(&dst->Symbol[i], p_src->PointN);
+			memcpy(p_dst->Points, p_src->Points, p_src->PointN * sizeof(pcb_point_t));
+		}
+
+		memset(&dst->Symbol[i].arcs, 0, sizeof(arclist_t));
+		for(a_src = arclist_first(&src->Symbol[i].arcs); a_src != NULL; a_src = arclist_next(a_src)) {
+			pcb_font_new_arc_in_sym(&dst->Symbol[i], a_src->X, a_src->Y, a_src->Width,
+															a_src->StartAngle, a_src->Delta, a_src->Thickness);
+		}
+	}
+	if (src->name != NULL)
+		dst->name = pcb_strdup(src->name);
+}
+
+int pcb_move_font(pcb_fontkit_t *fk, pcb_font_id_t src, pcb_font_id_t dst)
+{
+	htip_entry_t *e;
+	pcb_font_t *src_font;
+	
+	if ((!fk->hash_inited) || (htip_get(&fk->fonts, src) == NULL))
+		return -1;
+	
+	pcb_del_font(fk, dst);
+	
+	e = htip_popentry(&fk->fonts, src);
+	src_font = e->value;
+	if (dst == 0) {
+		pcb_font_free (&fk->dflt);
+		copy_font (&fk->dflt, src_font);
+		pcb_font_free (src_font);
+		fk->dflt.id = 0;
+	} else {
+		htip_set(&fk->fonts, dst, src_font);
+		src_font->id = dst;
+	}
+	if (src == fk->last_id)
+		update_last_id (fk);
+	fk->last_id = MAX(fk->last_id, dst);
+	pcb_event(PCB_EVENT_FONT_CHANGED, "i", src);
+	pcb_event(PCB_EVENT_FONT_CHANGED, "i", dst);
+
+	return 0;
+}
+
Index: tags/2.0.1/src/font.h
===================================================================
--- tags/2.0.1/src/font.h	(nonexistent)
+++ tags/2.0.1/src/font.h	(revision 18980)
@@ -0,0 +1,98 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_FONT_H
+#define PCB_FONT_H
+
+#include <genht/htip.h>
+#include "global_typedefs.h"
+#include "obj_poly.h"
+#include "obj_poly_list.h"
+#include "obj_arc.h"
+#include "obj_arc_list.h"
+#include "box.h"
+
+/* ---------------------------------------------------------------------------
+ * symbol and font related stuff
+ */
+typedef struct symbol_s {     /* a single symbol */
+	pcb_line_t *Line;
+	pcb_bool Valid;
+	pcb_cardinal_t LineN;       /* number of lines */
+	pcb_cardinal_t LineMax;     /* lines allocated */
+	pcb_coord_t Width, Height, Delta; /* size of cell, distance to next symbol */
+	polylist_t polys;           /* simple (non-clipped) polygons */
+	arclist_t arcs;
+} pcb_symbol_t;
+
+typedef long int pcb_font_id_t;      /* a font is referenced by a pcb_board_t:pcb_font_id_t pair */
+
+struct pcb_font_s {          /* complete set of symbols */
+	pcb_coord_t MaxHeight, MaxWidth; /* maximum cell width and height */
+	pcb_box_t DefaultSymbol;     /* the default symbol is a filled box */
+	pcb_symbol_t Symbol[PCB_MAX_FONTPOSITION + 1];
+	char *name;
+	pcb_font_id_t id;
+};
+
+struct pcb_fontkit_s {          /* a set of unrelated fonts */
+	pcb_font_t dflt;              /* default, fallback font, also the sysfont */
+	htip_t fonts;
+	pcb_bool valid, hash_inited;
+	pcb_font_id_t last_id;        /* highest font id ever seen in this kit */
+};
+
+/* Look up font. If not found: return NULL (fallback=0), or return the
+   default font (fallback=1) */
+pcb_font_t *pcb_font(pcb_board_t *pcb, pcb_font_id_t id, int fallback);
+
+void pcb_font_create_default(pcb_board_t *pcb);
+void pcb_font_set_info(pcb_font_t *Ptr);
+
+pcb_line_t *pcb_font_new_line_in_sym(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness);
+pcb_arc_t *pcb_font_new_arc_in_sym(pcb_symbol_t *Symbol, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r, pcb_angle_t start, pcb_angle_t delta, pcb_coord_t thickness);
+pcb_poly_t *pcb_font_new_poly_in_sym(pcb_symbol_t *Symbol, int num_points);
+
+void pcb_font_free(pcb_font_t *f);
+
+/*** font kit handling ***/
+void pcb_fontkit_free(pcb_fontkit_t *fk);
+pcb_font_t *pcb_new_font(pcb_fontkit_t *fk, pcb_font_id_t id, const char *name);
+int pcb_del_font(pcb_fontkit_t *fk, pcb_font_id_t id);
+int pcb_move_font(pcb_fontkit_t *fk, pcb_font_id_t src, pcb_font_id_t dst);
+
+/* Reset the fontkit so that only the default font is kept and all extra fonts are purged */
+void pcb_fontkit_reset(pcb_fontkit_t *fk);
+
+/* Unlink the font from pcb, but do not free anything but return the font */
+pcb_font_t *pcb_font_unlink(pcb_board_t *pcb, pcb_font_id_t id);
+
+
+#endif
+
Index: tags/2.0.1/src/font_act.c
===================================================================
--- tags/2.0.1/src/font_act.c	(nonexistent)
+++ tags/2.0.1/src/font_act.c	(revision 18980)
@@ -0,0 +1,166 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+#include <stdlib.h>
+#include "board.h"
+#include "actions.h"
+#include "error.h"
+#include "font.h"
+#include "conf_core.h"
+#include "plug_io.h"
+#include "event.h"
+
+
+static const char pcb_acts_load_font_from[] = "LoadFontFrom([file, id])";
+static const char pcb_acth_load_font_from[] = "Load PCB font from a file";
+
+fgw_error_t pcb_act_load_font_from(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL, *sid = NULL;
+	static char *default_file = NULL;
+	pcb_font_id_t fid, dst_fid = -1;
+	pcb_font_t *fnt;
+	int r;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[1].val.str);
+
+	if (sid != NULL) {
+		char *end;
+		fid = strtol(sid, &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "LoadFontFrom(): when second argument is present, it must be an integer\n");
+			return 1;
+		}
+		if (pcb_font(PCB, fid, 0) != NULL) {	/* font already exists */
+			dst_fid = fid;
+			fid = -1;	/* allocate a new id, which will be later moved to dst_fid */
+		}
+	}
+	else
+		fid = -1; /* auto-allocate a new ID */
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load PCB font file...",
+																"Picks a PCB font file to load.\n",
+																default_file, ".font", "pcbfont", HID_FILESELECT_READ);
+		if (fname == NULL)
+			PCB_ACT_FAIL(load_font_from);
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	fnt = pcb_new_font(&PCB->fontkit, fid, NULL);
+	if (fnt == NULL) {
+		pcb_message(PCB_MSG_ERROR, "LoadFontFrom(): unable to allocate font\n");
+		return 1;
+	}
+	
+	r = pcb_parse_font(fnt, fname);
+	pcb_event(PCB_EVENT_FONT_CHANGED, "i", fnt->id);
+	if (r != 0) {
+		pcb_message(PCB_MSG_ERROR, "LoadFontFrom(): failed to load font from %s\n", fname);
+		pcb_del_font(&PCB->fontkit, fnt->id);
+		return 1;
+	}
+	
+	if (dst_fid != -1) {
+		pcb_move_font(&PCB->fontkit, fnt->id, dst_fid);
+	}
+	
+	fid = dst_fid == 0 ? 0 : fnt->id;
+	pcb_message(PCB_MSG_INFO, "LoadFontFrom(): new font (ID %d) successfully loaded from file %s\n", fid, fname);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_save_font_to[] = "SaveFontTo([file, id])";
+static const char pcb_acth_save_font_to[] = "Save PCB font to a file";
+
+fgw_error_t pcb_act_save_font_to(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL, *sid = NULL;
+	static char *default_file = NULL;
+	pcb_font_id_t fid;
+	pcb_font_t *fnt;
+	int r;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, load_font_from, fname = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, load_font_from, sid = argv[1].val.str);
+
+	if (sid != NULL) {
+		char *end;
+		fid = strtol(sid, &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "SaveFontTo(): when second argument is present, it must be an integer\n");
+			return 1;
+		}
+		if (pcb_font(PCB, fid, 0) == NULL) {
+			pcb_message(PCB_MSG_ERROR, "SaveFontTo(): can not fetch font ID %d\n", fid);
+			return 1;
+		}
+	}
+	else
+		fid = conf_core.design.text_font_id;
+
+	fnt = pcb_font(PCB, fid, 0);
+	if (fnt == NULL) {
+		pcb_message(PCB_MSG_ERROR, "SaveFontTo(): failed to fetch font %d\n", fid);
+		return 1;
+	}
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Save PCB font file...",
+																"Picks a PCB font file to save.\n",
+																default_file, ".font", "pcbfont", HID_FILESELECT_MAY_NOT_EXIST);
+		if (fname == NULL)
+			PCB_ACT_FAIL(save_font_to);
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	r = pcb_write_font(fnt, fname, "lihata");
+	if (r != 0) {
+		pcb_message(PCB_MSG_ERROR, "SaveFontTo(): failed to save font to %s\n", fname);
+		return 1;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t font_action_list[] = {
+	{"LoadFontFrom", pcb_act_load_font_from, pcb_acth_load_font_from, pcb_acts_load_font_from},
+	{"SaveFontTo", pcb_act_save_font_to, pcb_acth_save_font_to, pcb_acts_save_font_to}
+};
+
+PCB_REGISTER_ACTIONS(font_action_list, NULL)
Index: tags/2.0.1/src/font_internal.c
===================================================================
--- tags/2.0.1/src/font_internal.c	(nonexistent)
+++ tags/2.0.1/src/font_internal.c	(revision 18980)
@@ -0,0 +1,818 @@
+/* This file is autogenerated by font2c.sh - DO NOT EDIT */
+
+/* Internal copy of the default font; used when no font file is found */
+
+static embf_line_t embf_line_32[] = {
+	{0,0,0,0}
+};
+static embf_line_t embf_line_33[] = { /* ! */
+	{0, 35,		0, 40,		8},
+	{0, 0,		0, 25,		8}
+};
+static embf_line_t embf_line_34[] = { /* " */
+	{0, 0,		0, 10,		8},
+	{10, 0,		10, 10,		8}
+};
+static embf_line_t embf_line_35[] = { /* # */
+	{0, 25,		20, 25,		8},
+	{0, 15,		20, 15,		8},
+	{15, 10,		15, 30,		8},
+	{5, 10,		5, 30,		8}
+};
+static embf_line_t embf_line_36[] = { /* $ */
+	{15, 5,		20, 10,		8},
+	{5, 5,		15, 5,		8},
+	{0, 10,		5, 5,		8},
+	{0, 10,		0, 15,		8},
+	{0, 15,		5, 20,		8},
+	{5, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		20, 30,		8},
+	{15, 35,		20, 30,		8},
+	{5, 35,		15, 35,		8},
+	{0, 30,		5, 35,		8},
+	{10, 0,		10, 40,		8}
+};
+static embf_line_t embf_line_37[] = { /* % */
+	{0, 5,		0, 10,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		10, 0,		8},
+	{10, 0,		15, 5,		8},
+	{15, 5,		15, 10,		8},
+	{10, 15,		15, 10,		8},
+	{5, 15,		10, 15,		8},
+	{0, 10,		5, 15,		8},
+	{0, 40,		40, 0,		8},
+	{35, 40,		40, 35,		8},
+	{40, 30,		40, 35,		8},
+	{35, 25,		40, 30,		8},
+	{30, 25,		35, 25,		8},
+	{25, 30,		30, 25,		8},
+	{25, 30,		25, 35,		8},
+	{25, 35,		30, 40,		8},
+	{30, 40,		35, 40,		8}
+};
+static embf_line_t embf_line_38[] = { /* & */
+	{0, 35,		5, 40,		8},
+	{0, 5,		0, 15,		8},
+	{0, 5,		5, 0,		8},
+	{0, 25,		15, 10,		8},
+	{5, 40,		10, 40,		8},
+	{10, 40,		20, 30,		8},
+	{0, 15,		25, 40,		8},
+	{5, 0,		10, 0,		8},
+	{10, 0,		15, 5,		8},
+	{15, 5,		15, 10,		8},
+	{0, 25,		0, 35,		8}
+};
+static embf_line_t embf_line_39[] = { /* ' */
+	{0, 10,		10, 0,		8}
+};
+static embf_line_t embf_line_40[] = {
+	{0, 35,		5, 40,		8},
+	{0, 5,		5, 0,		8},
+	{0, 5,		0, 35,		8}
+};
+static embf_line_t embf_line_41[] = {
+	{0, 0,		5, 5,		8},
+	{5, 5,		5, 35,		8},
+	{0, 40,		5, 35,		8}
+};
+static embf_line_t embf_line_42[] = { /* * */
+	{0, 10,		20, 30,		8},
+	{0, 30,		20, 10,		8},
+	{0, 20,		20, 20,		8},
+	{10, 10,		10, 30,		8}
+};
+static embf_line_t embf_line_43[] = { /* + */
+	{0, 20,		20, 20,		8},
+	{10, 10,		10, 30,		8}
+};
+static embf_line_t embf_line_44[] = { /* , */
+	{0, 50,		10, 40,		8}
+};
+static embf_line_t embf_line_45[] = { /* - */
+	{0, 20,		20, 20,		8}
+};
+static embf_line_t embf_line_46[] = { /* . */
+	{0, 40,		5, 40,		8}
+};
+static embf_line_t embf_line_47[] = { /* / */
+	{0, 35,		30, 5,		8}
+};
+static embf_line_t embf_line_48[] = { /* 0 */
+	{0, 35,		5, 40,		8},
+	{0, 5,		0, 35,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{20, 5,		20, 35,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 30,		20, 10,		8}
+};
+static embf_line_t embf_line_49[] = { /* 1 */
+	{0, 8,		8, 0,		8},
+	{8, 0,		8, 40,		8},
+	{0, 40,		15, 40,		8}
+};
+static embf_line_t embf_line_50[] = { /* 2 */
+	{0, 5,		5, 0,		8},
+	{5, 0,		20, 0,		8},
+	{20, 0,		25, 5,		8},
+	{25, 5,		25, 15,		8},
+	{0, 40,		25, 15,		8},
+	{0, 40,		25, 40,		8}
+};
+static embf_line_t embf_line_51[] = { /* 3 */
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 35,		5, 40,		8},
+	{5, 18,		15, 18,		8},
+	{20, 5,		20, 13,		8},
+	{20, 23,		20, 35,		8},
+	{20, 23,		15, 18,		8},
+	{20, 13,		15, 18,		8}
+};
+static embf_line_t embf_line_52[] = { /* 4 */
+	{0, 25,		20, 0,		8},
+	{0, 25,		25, 25,		8},
+	{20, 0,		20, 40,		8}
+};
+static embf_line_t embf_line_53[] = { /* 5 */
+	{0, 0,		20, 0,		8},
+	{0, 0,		0, 20,		8},
+	{0, 20,		5, 15,		8},
+	{5, 15,		15, 15,		8},
+	{15, 15,		20, 20,		8},
+	{20, 20,		20, 35,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_54[] = { /* 6 */
+	{15, 0,		20, 5,		8},
+	{5, 0,		15, 0,		8},
+	{0, 5,		5, 0,		8},
+	{0, 5,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{15, 18,		20, 23,		8},
+	{0, 18,		15, 18,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8},
+	{20, 23,		20, 35,		8}
+};
+static embf_line_t embf_line_55[] = { /* 7 */
+	{5, 40,		25, 0,		8},
+	{0, 0,		25, 0,		8}
+};
+static embf_line_t embf_line_56[] = { /* 8 */
+	{0, 35,		5, 40,		8},
+	{0, 27,		0, 35,		8},
+	{0, 27,		7, 20,		8},
+	{7, 20,		13, 20,		8},
+	{13, 20,		20, 27,		8},
+	{20, 27,		20, 35,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 13,		7, 20,		8},
+	{0, 5,		0, 13,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{20, 5,		20, 13,		8},
+	{13, 20,		20, 13,		8}
+};
+static embf_line_t embf_line_57[] = { /* 9 */
+	{5, 40,		20, 20,		8},
+	{20, 5,		20, 20,		8},
+	{15, 0,		20, 5,		8},
+	{5, 0,		15, 0,		8},
+	{0, 5,		5, 0,		8},
+	{0, 5,		0, 15,		8},
+	{0, 15,		5, 20,		8},
+	{5, 20,		20, 20,		8}
+};
+static embf_line_t embf_line_58[] = { /* : */
+	{0, 15,		5, 15,		8},
+	{0, 25,		5, 25,		8}
+};
+static embf_line_t embf_line_59[] = { /* ; */
+	{0, 40,		10, 30,		8},
+	{10, 15,		10, 20,		8}
+};
+static embf_line_t embf_line_60[] = { /* < */
+	{0, 20,		10, 10,		8},
+	{0, 20,		10, 30,		8}
+};
+static embf_line_t embf_line_61[] = { /* = */
+	{0, 15,		20, 15,		8},
+	{0, 25,		20, 25,		8}
+};
+static embf_line_t embf_line_62[] = { /* > */
+	{0, 10,		10, 20,		8},
+	{0, 30,		10, 20,		8}
+};
+static embf_line_t embf_line_63[] = { /* ? */
+	{10, 20,		10, 25,		8},
+	{10, 35,		10, 40,		8},
+	{0, 5,		0, 10,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{20, 5,		20, 10,		8},
+	{10, 20,		20, 10,		8}
+};
+static embf_line_t embf_line_64[] = { /* @ */
+	{0, 0,		0, 30,		8},
+	{0, 30,		10, 40,		8},
+	{10, 40,		40, 40,		8},
+	{50, 25,		50, 0,		8},
+	{50, 0,		40, -10,		8},
+	{40, -10,		10, -10,		8},
+	{10, -10,		0, 0,		8},
+	{15, 10,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		30, 25,		8},
+	{30, 25,		35, 20,		8},
+	{35, 20,		40, 25,		8},
+	{35, 20,		35, 5,		8},
+	{35, 10,		30, 5,		8},
+	{20, 5,		30, 5,		8},
+	{20, 5,		15, 10,		8},
+	{40, 25,		50, 25,		8}
+};
+static embf_line_t embf_line_65[] = { /* A */
+	{0, 10,		0, 40,		8},
+	{0, 10,		7, 0,		8},
+	{7, 0,		18, 0,		8},
+	{18, 0,		25, 10,		8},
+	{25, 10,		25, 40,		8},
+	{0, 20,		25, 20,		8}
+};
+static embf_line_t embf_line_66[] = { /* B */
+	{0, 40,		20, 40,		8},
+	{20, 40,		25, 35,		8},
+	{25, 23,		25, 35,		8},
+	{20, 18,		25, 23,		8},
+	{5, 18,		20, 18,		8},
+	{5, 0,		5, 40,		8},
+	{0, 0,		20, 0,		8},
+	{20, 0,		25, 5,		8},
+	{25, 5,		25, 13,		8},
+	{20, 18,		25, 13,		8}
+};
+static embf_line_t embf_line_67[] = { /* C */
+	{7, 40,		20, 40,		8},
+	{0, 33,		7, 40,		8},
+	{0, 7,		0, 33,		8},
+	{0, 7,		7, 0,		8},
+	{7, 0,		20, 0,		8}
+};
+static embf_line_t embf_line_68[] = { /* D */
+	{5, 0,		5, 40,		8},
+	{18, 0,		25, 7,		8},
+	{25, 7,		25, 33,		8},
+	{18, 40,		25, 33,		8},
+	{0, 40,		18, 40,		8},
+	{0, 0,		18, 0,		8}
+};
+static embf_line_t embf_line_69[] = { /* E */
+	{0, 18,		15, 18,		8},
+	{0, 40,		20, 40,		8},
+	{0, 0,		0, 40,		8},
+	{0, 0,		20, 0,		8}
+};
+static embf_line_t embf_line_70[] = { /* F */
+	{0, 0,		0, 40,		8},
+	{0, 0,		20, 0,		8},
+	{0, 18,		15, 18,		8}
+};
+static embf_line_t embf_line_71[] = { /* G */
+	{20, 0,		25, 5,		8},
+	{5, 0,		20, 0,		8},
+	{0, 5,		5, 0,		8},
+	{0, 5,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		20, 40,		8},
+	{20, 40,		25, 35,		8},
+	{25, 25,		25, 35,		8},
+	{20, 20,		25, 25,		8},
+	{10, 20,		20, 20,		8}
+};
+static embf_line_t embf_line_72[] = { /* H */
+	{0, 0,		0, 40,		8},
+	{25, 0,		25, 40,		8},
+	{0, 20,		25, 20,		8}
+};
+static embf_line_t embf_line_73[] = { /* I */
+	{0, 0,		10, 0,		8},
+	{5, 0,		5, 40,		8},
+	{0, 40,		10, 40,		8}
+};
+static embf_line_t embf_line_74[] = { /* J */
+	{7, 0,		15, 0,		8},
+	{15, 0,		15, 35,		8},
+	{10, 40,		15, 35,		8},
+	{5, 40,		10, 40,		8},
+	{0, 35,		5, 40,		8},
+	{0, 35,		0, 30,		8}
+};
+static embf_line_t embf_line_75[] = { /* K */
+	{0, 0,		0, 40,		8},
+	{0, 20,		20, 0,		8},
+	{0, 20,		20, 40,		8}
+};
+static embf_line_t embf_line_76[] = { /* L */
+	{0, 0,		0, 40,		8},
+	{0, 40,		20, 40,		8}
+};
+static embf_line_t embf_line_77[] = { /* M */
+	{0, 0,		0, 40,		8},
+	{0, 0,		15, 20,		8},
+	{15, 20,		30, 0,		8},
+	{30, 0,		30, 40,		8}
+};
+static embf_line_t embf_line_78[] = { /* N */
+	{0, 0,		0, 40,		8},
+	{0, 0,		25, 40,		8},
+	{25, 0,		25, 40,		8}
+};
+static embf_line_t embf_line_79[] = { /* O */
+	{0, 5,		0, 35,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{20, 5,		20, 35,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_80[] = { /* P */
+	{5, 0,		5, 40,		8},
+	{0, 0,		20, 0,		8},
+	{20, 0,		25, 5,		8},
+	{25, 5,		25, 15,		8},
+	{20, 20,		25, 15,		8},
+	{5, 20,		20, 20,		8}
+};
+static embf_line_t embf_line_81[] = { /* Q */
+	{0, 5,		0, 35,		8},
+	{0, 5,		5, 0,		8},
+	{5, 0,		15, 0,		8},
+	{15, 0,		20, 5,		8},
+	{20, 5,		20, 30,		8},
+	{10, 40,		20, 30,		8},
+	{5, 40,		10, 40,		8},
+	{0, 35,		5, 40,		8},
+	{10, 25,		20, 40,		8}
+};
+static embf_line_t embf_line_82[] = { /* R */
+	{0, 0,		20, 0,		8},
+	{20, 0,		25, 5,		8},
+	{25, 5,		25, 15,		8},
+	{20, 20,		25, 15,		8},
+	{5, 20,		20, 20,		8},
+	{5, 0,		5, 40,		8},
+	{13, 20,		25, 40,		8}
+};
+static embf_line_t embf_line_83[] = { /* S */
+	{20, 0,		25, 5,		8},
+	{5, 0,		20, 0,		8},
+	{0, 5,		5, 0,		8},
+	{0, 5,		0, 15,		8},
+	{0, 15,		5, 20,		8},
+	{5, 20,		20, 20,		8},
+	{20, 20,		25, 25,		8},
+	{25, 25,		25, 35,		8},
+	{20, 40,		25, 35,		8},
+	{5, 40,		20, 40,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_84[] = { /* T */
+	{0, 0,		20, 0,		8},
+	{10, 0,		10, 40,		8}
+};
+static embf_line_t embf_line_85[] = { /* U */
+	{0, 0,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8},
+	{20, 0,		20, 35,		8}
+};
+static embf_line_t embf_line_86[] = { /* V */
+	{0, 0,		10, 40,		8},
+	{10, 40,		20, 0,		8}
+};
+static embf_line_t embf_line_87[] = { /* W */
+	{0, 0,		0, 20,		8},
+	{0, 20,		5, 40,		8},
+	{5, 40,		15, 20,		8},
+	{15, 20,		25, 40,		8},
+	{25, 40,		30, 20,		8},
+	{30, 20,		30, 0,		8}
+};
+static embf_line_t embf_line_88[] = { /* X */
+	{0, 40,		25, 0,		8},
+	{0, 0,		25, 40,		8}
+};
+static embf_line_t embf_line_89[] = { /* Y */
+	{0, 0,		10, 20,		8},
+	{10, 20,		20, 0,		8},
+	{10, 20,		10, 40,		8}
+};
+static embf_line_t embf_line_90[] = { /* Z */
+	{0, 0,		25, 0,		8},
+	{0, 40,		25, 0,		8},
+	{0, 40,		25, 40,		8}
+};
+static embf_line_t embf_line_91[] = { /* [ */
+	{0, 0,		5, 0,		8},
+	{0, 0,		0, 40,		8},
+	{0, 40,		5, 40,		8}
+};
+static embf_line_t embf_line_92[] = { /* \ */
+	{0, 5,		30, 35,		8}
+};
+static embf_line_t embf_line_93[] = { /* ] */
+	{0, 0,		5, 0,		8},
+	{5, 0,		5, 40,		8},
+	{0, 40,		5, 40,		8}
+};
+static embf_line_t embf_line_94[] = { /* ^ */
+	{0, 5,		5, 0,		8},
+	{5, 0,		10, 5,		8}
+};
+static embf_line_t embf_line_95[] = { /* _ */
+	{0, 40,		20, 40,		8}
+};
+static embf_line_t embf_line_97[] = { /* a */
+	{15, 20,		20, 25,		8},
+	{5, 20,		15, 20,		8},
+	{0, 25,		5, 20,		8},
+	{0, 25,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{20, 20,		20, 35,		8},
+	{20, 35,		25, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8}
+};
+static embf_line_t embf_line_98[] = { /* b */
+	{0, 0,		0, 40,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8},
+	{20, 25,		20, 35,		8},
+	{15, 20,		20, 25,		8},
+	{5, 20,		15, 20,		8},
+	{0, 25,		5, 20,		8}
+};
+static embf_line_t embf_line_99[] = { /* c */
+	{5, 20,		20, 20,		8},
+	{0, 25,		5, 20,		8},
+	{0, 25,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		20, 40,		8}
+};
+static embf_line_t embf_line_100[] = { /* d */
+	{20, 0,		20, 40,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 35,		5, 40,		8},
+	{0, 25,		0, 35,		8},
+	{0, 25,		5, 20,		8},
+	{5, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8}
+};
+static embf_line_t embf_line_101[] = { /* e */
+	{5, 40,		20, 40,		8},
+	{0, 35,		5, 40,		8},
+	{0, 25,		0, 35,		8},
+	{0, 25,		5, 20,		8},
+	{5, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{0, 30,		20, 30,		8},
+	{20, 30,		20, 25,		8}
+};
+static embf_line_t embf_line_102[] = { /* f */
+	{5, 5,		5, 40,		8},
+	{5, 5,		10, 0,		8},
+	{10, 0,		15, 0,		8},
+	{0, 20,		10, 20,		8}
+};
+static embf_line_t embf_line_103[] = { /* g */
+	{15, 20,		20, 25,		8},
+	{5, 20,		15, 20,		8},
+	{0, 25,		5, 20,		8},
+	{0, 25,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8},
+	{0, 50,		5, 55,		8},
+	{5, 55,		15, 55,		8},
+	{15, 55,		20, 50,		8},
+	{20, 20,		20, 50,		8}
+};
+static embf_line_t embf_line_104[] = { /* h */
+	{0, 0,		0, 40,		8},
+	{0, 25,		5, 20,		8},
+	{5, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		20, 40,		8}
+};
+static embf_line_t embf_line_105[] = { /* i */
+	{0, 10,		0, 11,		10},
+	{0, 25,		0, 40,		8}
+};
+static embf_line_t embf_line_106[] = { /* j */
+	{5, 10,		5, 11,		10},
+	{5, 25,		5, 50,		8},
+	{0, 55,		5, 50,		8}
+};
+static embf_line_t embf_line_107[] = { /* k */
+	{0, 0,		0, 40,		8},
+	{0, 25,		15, 40,		8},
+	{0, 25,		10, 15,		8}
+};
+static embf_line_t embf_line_108[] = { /* l */
+	{0, 0,		0, 35,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_109[] = { /* m */
+	{5, 25,		5, 40,		8},
+	{5, 25,		10, 20,		8},
+	{10, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		20, 40,		8},
+	{20, 25,		25, 20,		8},
+	{25, 20,		30, 20,		8},
+	{30, 20,		35, 25,		8},
+	{35, 25,		35, 40,		8},
+	{0, 20,		5, 25,		8}
+};
+static embf_line_t embf_line_110[] = { /* n */
+	{5, 25,		5, 40,		8},
+	{5, 25,		10, 20,		8},
+	{10, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		20, 40,		8},
+	{0, 20,		5, 25,		8}
+};
+static embf_line_t embf_line_111[] = { /* o */
+	{0, 25,		0, 35,		8},
+	{0, 25,		5, 20,		8},
+	{5, 20,		15, 20,		8},
+	{15, 20,		20, 25,		8},
+	{20, 25,		20, 35,		8},
+	{15, 40,		20, 35,		8},
+	{5, 40,		15, 40,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_112[] = { /* p */
+	{5, 25,		5, 55,		8},
+	{0, 20,		5, 25,		8},
+	{5, 25,		10, 20,		8},
+	{10, 20,		20, 20,		8},
+	{20, 20,		25, 25,		8},
+	{25, 25,		25, 35,		8},
+	{20, 40,		25, 35,		8},
+	{10, 40,		20, 40,		8},
+	{5, 35,		10, 40,		8}
+};
+static embf_line_t embf_line_113[] = { /* q */
+	{20, 25,		20, 55,		8},
+	{15, 20,		20, 25,		8},
+	{5, 20,		15, 20,		8},
+	{0, 25,		5, 20,		8},
+	{0, 25,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8}
+};
+static embf_line_t embf_line_114[] = { /* r */
+	{5, 25,		5, 40,		8},
+	{5, 25,		10, 20,		8},
+	{10, 20,		20, 20,		8},
+	{0, 20,		5, 25,		8}
+};
+static embf_line_t embf_line_115[] = { /* s */
+	{5, 40,		20, 40,		8},
+	{20, 40,		25, 35,		8},
+	{20, 30,		25, 35,		8},
+	{5, 30,		20, 30,		8},
+	{0, 25,		5, 30,		8},
+	{0, 25,		5, 20,		8},
+	{5, 20,		20, 20,		8},
+	{20, 20,		25, 25,		8},
+	{0, 35,		5, 40,		8}
+};
+static embf_line_t embf_line_116[] = { /* t */
+	{5, 0,		5, 35,		8},
+	{5, 35,		10, 40,		8},
+	{0, 15,		10, 15,		8}
+};
+static embf_line_t embf_line_117[] = { /* u */
+	{0, 20,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8},
+	{20, 20,		20, 35,		8}
+};
+static embf_line_t embf_line_118[] = { /* v */
+	{0, 20,		10, 40,		8},
+	{20, 20,		10, 40,		8}
+};
+static embf_line_t embf_line_119[] = { /* w */
+	{0, 20,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{5, 40,		10, 40,		8},
+	{10, 40,		15, 35,		8},
+	{15, 20,		15, 35,		8},
+	{15, 35,		20, 40,		8},
+	{20, 40,		25, 40,		8},
+	{25, 40,		30, 35,		8},
+	{30, 20,		30, 35,		8}
+};
+static embf_line_t embf_line_120[] = { /* x */
+	{0, 20,		20, 40,		8},
+	{0, 40,		20, 20,		8}
+};
+static embf_line_t embf_line_121[] = { /* y */
+	{0, 20,		0, 35,		8},
+	{0, 35,		5, 40,		8},
+	{20, 20,		20, 50,		8},
+	{15, 55,		20, 50,		8},
+	{5, 55,		15, 55,		8},
+	{0, 50,		5, 55,		8},
+	{5, 40,		15, 40,		8},
+	{15, 40,		20, 35,		8}
+};
+static embf_line_t embf_line_122[] = { /* z */
+	{0, 20,		20, 20,		8},
+	{0, 40,		20, 20,		8},
+	{0, 40,		20, 40,		8}
+};
+static embf_line_t embf_line_123[] = {
+	{5, 5,		10, 0,		8},
+	{5, 5,		5, 15,		8},
+	{0, 20,		5, 15,		8},
+	{0, 20,		5, 25,		8},
+	{5, 25,		5, 35,		8},
+	{5, 35,		10, 40,		8}
+};
+static embf_line_t embf_line_124[] = { /* | */
+	{0, 0,		0, 40,		8}
+};
+static embf_line_t embf_line_125[] = {
+	{0, 0,		5, 5,		8},
+	{5, 5,		5, 15,		8},
+	{5, 15,		10, 20,		8},
+	{5, 25,		10, 20,		8},
+	{5, 25,		5, 35,		8},
+	{0, 40,		5, 35,		8}
+};
+static embf_line_t embf_line_126[] = { /* ~ */
+	{0, 25,		5, 20,		8},
+	{5, 20,		10, 20,		8},
+	{10, 20,		15, 25,		8},
+	{15, 25,		20, 25,		8},
+	{20, 25,		25, 20,		8}
+};
+/***************************************************************/
+static int embf_minx =  0;
+static int embf_miny =  -10;
+static int embf_maxx =  50;
+static int embf_maxy =  55;
+static embf_font_t embf_font[] = {
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{0, NULL, 0},
+	{18, embf_line_32, 0},
+	{12, embf_line_33, 2},
+	{12, embf_line_34, 2},
+	{12, embf_line_35, 4},
+	{12, embf_line_36, 12},
+	{12, embf_line_37, 17},
+	{12, embf_line_38, 11},
+	{12, embf_line_39, 1},
+	{12, embf_line_40, 3},
+	{12, embf_line_41, 3},
+	{12, embf_line_42, 4},
+	{12, embf_line_43, 2},
+	{12, embf_line_44, 1},
+	{12, embf_line_45, 1},
+	{12, embf_line_46, 1},
+	{12, embf_line_47, 1},
+	{12, embf_line_48, 9},
+	{12, embf_line_49, 3},
+	{12, embf_line_50, 6},
+	{12, embf_line_51, 11},
+	{12, embf_line_52, 3},
+	{12, embf_line_53, 9},
+	{12, embf_line_54, 10},
+	{12, embf_line_55, 2},
+	{12, embf_line_56, 15},
+	{12, embf_line_57, 8},
+	{12, embf_line_58, 2},
+	{12, embf_line_59, 2},
+	{12, embf_line_60, 2},
+	{12, embf_line_61, 2},
+	{12, embf_line_62, 2},
+	{12, embf_line_63, 8},
+	{12, embf_line_64, 17},
+	{12, embf_line_65, 6},
+	{12, embf_line_66, 10},
+	{12, embf_line_67, 5},
+	{12, embf_line_68, 6},
+	{12, embf_line_69, 4},
+	{12, embf_line_70, 3},
+	{12, embf_line_71, 10},
+	{12, embf_line_72, 3},
+	{12, embf_line_73, 3},
+	{12, embf_line_74, 6},
+	{12, embf_line_75, 3},
+	{12, embf_line_76, 2},
+	{12, embf_line_77, 4},
+	{12, embf_line_78, 3},
+	{12, embf_line_79, 8},
+	{12, embf_line_80, 6},
+	{12, embf_line_81, 9},
+	{12, embf_line_82, 7},
+	{12, embf_line_83, 11},
+	{12, embf_line_84, 2},
+	{12, embf_line_85, 5},
+	{12, embf_line_86, 2},
+	{12, embf_line_87, 6},
+	{12, embf_line_88, 2},
+	{12, embf_line_89, 3},
+	{12, embf_line_90, 3},
+	{12, embf_line_91, 3},
+	{12, embf_line_92, 1},
+	{12, embf_line_93, 3},
+	{12, embf_line_94, 2},
+	{12, embf_line_95, 1},
+	{0, NULL, 0},
+	{12, embf_line_97, 9},
+	{12, embf_line_98, 8},
+	{12, embf_line_99, 5},
+	{12, embf_line_100, 8},
+	{12, embf_line_101, 8},
+	{10, embf_line_102, 4},
+	{12, embf_line_103, 11},
+	{12, embf_line_104, 5},
+	{10, embf_line_105, 2},
+	{10, embf_line_106, 3},
+	{12, embf_line_107, 3},
+	{10, embf_line_108, 2},
+	{12, embf_line_109, 10},
+	{12, embf_line_110, 6},
+	{12, embf_line_111, 8},
+	{12, embf_line_112, 9},
+	{12, embf_line_113, 8},
+	{12, embf_line_114, 4},
+	{12, embf_line_115, 9},
+	{10, embf_line_116, 3},
+	{12, embf_line_117, 5},
+	{12, embf_line_118, 2},
+	{12, embf_line_119, 9},
+	{12, embf_line_120, 2},
+	{12, embf_line_121, 8},
+	{12, embf_line_122, 3},
+	{12, embf_line_123, 6},
+	{12, embf_line_124, 1},
+	{12, embf_line_125, 6},
+	{12, embf_line_126, 5},
+	{0, NULL, 0}
+};
Index: tags/2.0.1/src/fptr_cast.c
===================================================================
--- tags/2.0.1/src/fptr_cast.c	(nonexistent)
+++ tags/2.0.1/src/fptr_cast.c	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <assert.h>
+#include "config.h"
+#include "fptr_cast.h"
+
+void *pcb_cast_f2d(pcb_fptr_t f)
+{
+	assert(sizeof(void *) == sizeof(pcb_fptr_t));
+	return (void *)f;
+}
+
+pcb_fptr_t pcb_cast_d2f(void *d)
+{
+	assert(sizeof(void *) == sizeof(pcb_fptr_t));
+	return (pcb_fptr_t)d;
+}
+
Index: tags/2.0.1/src/fptr_cast.h
===================================================================
--- tags/2.0.1/src/fptr_cast.h	(nonexistent)
+++ tags/2.0.1/src/fptr_cast.h	(revision 18980)
@@ -0,0 +1,38 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Function pointer <-> data pointer casts with assert on size match. C89
+   does not permit these casts but they practically work on any platform
+   pcb-rnd has the chance to run on. Hide the ugliness behind this API. */
+
+#ifndef PCB_FPTRCAST_H
+#define PCB_FPTRCAST_H
+typedef void (*pcb_fptr_t)();
+
+void *pcb_cast_f2d(pcb_fptr_t f);
+pcb_fptr_t pcb_cast_d2f(void *d);
+
+#endif
Index: tags/2.0.1/src/funchash.c
===================================================================
--- tags/2.0.1/src/funchash.c	(nonexistent)
+++ tags/2.0.1/src/funchash.c	(revision 18980)
@@ -0,0 +1,155 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <genht/htpi.h>
+#include <genht/hash.h>
+#include "funchash_core.h"
+#include "config.h"
+#include "macro.h"
+#include "compat_misc.h"
+
+#define action_entry(x) { #x, F_ ## x},
+static pcb_funchash_table_t Functions[] = {
+#include "funchash_core_list.h"
+	{"F_END", F_END}
+};
+
+typedef struct {
+	const char *cookie;
+	const char *key;
+	char key_buff[1];
+} fh_key_t;
+
+static htpi_t *funchash;
+
+static int keyeq(const void *a_, const void *b_)
+{
+	const fh_key_t *a = a_, *b = b_;
+	if (a->cookie != b->cookie)
+		return 1;
+	return !pcb_strcasecmp(a->key, b->key);
+}
+
+static unsigned fh_hash(const void *key)
+{
+	const fh_key_t *k = key;
+	return strhash_case((char *)k->key) ^ ptrhash((void *)k->cookie);
+}
+
+void pcb_funchash_init(void)
+{
+	funchash = htpi_alloc(fh_hash, keyeq);
+	pcb_funchash_set_table(Functions, PCB_ENTRIES(Functions), NULL);
+}
+
+void pcb_funchash_uninit(void)
+{
+	htpi_entry_t *e;
+
+	for (e = htpi_first(funchash); e; e = htpi_next(funchash, e)) {
+		fh_key_t *k = e->key;
+		if (k->cookie != NULL)
+			fprintf(stderr, "WARNING: function not removed: %s::%s\n", k->cookie, k->key);
+		htpi_pop(funchash, e->key);
+		free(e->key);
+	}
+	htpi_free(funchash);
+	funchash = NULL;
+}
+
+void pcb_funchash_remove_cookie(const char *cookie)
+{
+	htpi_entry_t *e;
+
+	/* Slow linear search - probably OK, this will run only on uninit */
+	for (e = htpi_first(funchash); e; e = htpi_next(funchash, e)) {
+		fh_key_t *k = e->key;
+		if (k->cookie == cookie) {
+			htpi_pop(funchash, e->key);
+			free(e->key);
+		}
+	}
+}
+
+int pcb_funchash_get(const char *key, const char *cookie)
+{
+	fh_key_t new_key;
+	htpi_entry_t *e;
+
+	if (key == NULL)
+		return -1;
+
+	new_key.cookie = cookie;
+	new_key.key = key;
+
+	e = htpi_getentry(funchash, &new_key);
+	if (e == NULL)
+		return -1;
+	return e->value;
+}
+
+int pcb_funchash_set(const char *key, int val, const char *cookie)
+{
+	fh_key_t *new_key;
+	int kl;
+
+	if (pcb_funchash_get(key, cookie) >= 0)
+		return -1;
+
+	kl = strlen(key);
+	new_key = malloc(sizeof(fh_key_t) + kl);
+	new_key->cookie = cookie;
+	new_key->key = new_key->key_buff;
+	strcpy(new_key->key_buff, key);
+	htpi_set(funchash, new_key, val);
+	return 0;
+}
+
+int pcb_funchash_set_table(pcb_funchash_table_t *table, int numelem, const char *cookie)
+{
+	int i, rv = 0;
+
+	for (i = 0; i < numelem; i++)
+		rv |= pcb_funchash_set(table[i].key, table[i].val, cookie);
+
+	return rv;
+}
+
+const char *pcb_funchash_reverse(int id)
+{
+	htpi_entry_t *e;
+
+	for (e = htpi_first(funchash); e; e = htpi_next(funchash, e)) {
+		if (e->value == id) {
+			fh_key_t *k = e->key;
+			return k->key;
+		}
+	}
+	return NULL;
+}
Index: tags/2.0.1/src/funchash.h
===================================================================
--- tags/2.0.1/src/funchash.h	(nonexistent)
+++ tags/2.0.1/src/funchash.h	(revision 18980)
@@ -0,0 +1,60 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_FUNCHASH_H
+#define PCB_FUNCHASH_H
+
+/* Table entry format for pcb_funchash_set_table() */
+typedef struct {
+	const char *key;
+	int val;
+} pcb_funchash_table_t;
+
+/* Cookie is the namespace so that different modules can use the same
+   function names with different integer IDs without interference. Core
+   should use cookie==NULL. */
+
+/* Resolve a key string into an integer ID */
+int pcb_funchash_get(const char *key, const char *cookie);
+
+/* Store key string - integer ID pair */
+int pcb_funchash_set(const char *key, int val, const char *cookie);
+
+/* Store multiple key strings - integer ID pairs using a table */
+int pcb_funchash_set_table(pcb_funchash_table_t *table, int numelem, const char *cookie);
+
+/* Remove all keys inserted for a cookie */
+void pcb_funchash_remove_cookie(const char *cookie);
+
+/* Slow linear search to look up the key text for an ID (for debugging) */
+const char *pcb_funchash_reverse(int id);
+
+
+/* Init-uninit the hash */
+void pcb_funchash_init(void);
+void pcb_funchash_uninit(void);
+
+#endif
Index: tags/2.0.1/src/funchash_core.h
===================================================================
--- tags/2.0.1/src/funchash_core.h	(nonexistent)
+++ tags/2.0.1/src/funchash_core.h	(revision 18980)
@@ -0,0 +1,10 @@
+/* central, auto-generated enum of core function IDs */
+
+#include "funchash.h"
+
+#define action_entry(x) F_ ## x,
+typedef enum {
+#include "funchash_core_list.h"
+F_END
+} pcb_function_id_t;
+#undef action_entry
Index: tags/2.0.1/src/funchash_core_list.h
===================================================================
--- tags/2.0.1/src/funchash_core_list.h	(nonexistent)
+++ tags/2.0.1/src/funchash_core_list.h	(revision 18980)
@@ -0,0 +1,158 @@
+/*
+	Central list of function IDs
+	The core and core plugins use these from a single, central hash
+	This list is used to cpp-generate the F_* constants in enum pcb_function_id_t
+*/
+action_entry(Add)
+action_entry(AddSelected)
+action_entry(All)
+action_entry(AllConnections)
+action_entry(AllRats)
+action_entry(AllUnusedPins)
+action_entry(Arc)
+action_entry(Arrow)
+action_entry(Block)
+action_entry(Buffer)
+action_entry(Cancel)
+action_entry(Center)
+action_entry(Check)
+action_entry(Clear)
+action_entry(ClearAndRedraw)
+action_entry(ClearList)
+action_entry(Close)
+action_entry(CloseHole)
+action_entry(Connection)
+action_entry(Convert)
+action_entry(ConvertSubc)
+action_entry(Copy)
+action_entry(CycleClip)
+action_entry(CycleCrosshair)
+action_entry(DeleteRats)
+action_entry(Delta)
+action_entry(Done)
+action_entry(Drag)
+action_entry(DrillReport)
+action_entry(Element)
+action_entry(ElementConnections)
+action_entry(ElementToBuffer)
+action_entry(Escape)
+action_entry(Eq)
+action_entry(Find)
+action_entry(FlipElement)
+action_entry(Found)
+action_entry(FoundPins)
+action_entry(Footprint)
+action_entry(ForceThaw)
+action_entry(Freeze)
+action_entry(Grid)
+action_entry(Hash)
+action_entry(InsertPoint)
+action_entry(Iseq)
+action_entry(Layer)
+action_entry(Layout)
+action_entry(LayoutAs)
+action_entry(LayoutToBuffer)
+action_entry(Lihata)
+action_entry(Line)
+action_entry(LineSize)
+action_entry(Lock)
+action_entry(Loose)
+action_entry(Mirror)
+action_entry(Move)
+action_entry(MoveSelected)
+action_entry(Native)
+action_entry(Netlist)
+action_entry(Need)
+action_entry(None)
+action_entry(Normalize)
+action_entry(Notify)
+action_entry(NoRats)
+action_entry(Object)
+action_entry(Off)
+action_entry(On)
+action_entry(Pan)
+action_entry(PasteBuffer)
+action_entry(PinOrPadName)
+action_entry(Pinout)
+action_entry(Polygon)
+action_entry(PolygonHole)
+action_entry(Pop)
+action_entry(PreviousPoint)
+action_entry(Push)
+action_entry(Rats)
+action_entry(RatsNest)
+action_entry(Rectangle)
+action_entry(Redraw)
+action_entry(Release)
+action_entry(Revert)
+action_entry(Remove)
+action_entry(RemoveSelected)
+action_entry(Report)
+action_entry(Reset)
+action_entry(ResetLinesAndPolygons)
+action_entry(ResetPinsViasAndPads)
+action_entry(Restore)
+action_entry(Rotate)
+action_entry(Save)
+action_entry(Select)
+action_entry(Selected)
+action_entry(SelectedArcs)
+action_entry(SelectedElements)
+action_entry(SelectedLines)
+action_entry(SelectedNames)
+action_entry(SelectedObjects)
+action_entry(SelectedPads)
+action_entry(SelectedPins)
+action_entry(SelectedPadstacks)
+action_entry(SelectedTexts)
+action_entry(SelectedVias)
+action_entry(SelectedRats)
+action_entry(Set)
+action_entry(Sides)
+action_entry(Sort)
+action_entry(Start)
+action_entry(Stroke)
+action_entry(Style)
+action_entry(Subc)
+action_entry(Subcircuit)
+action_entry(SubcConnections)
+action_entry(SubcToBuffer)
+action_entry(SubcID)
+action_entry(Swap)
+action_entry(Text)
+action_entry(TextScale)
+action_entry(Thaw)
+action_entry(Thermal)
+action_entry(ToLayout)
+action_entry(Toggle)
+action_entry(ToggleAllDirections)
+action_entry(ToggleAutoDRC)
+action_entry(ToggleClearLine)
+action_entry(ToggleFullPoly)
+action_entry(ToggleGrid)
+action_entry(ToggleHideNames)
+action_entry(ToggleMinCut)
+action_entry(ToggleMask)
+action_entry(TogglePaste)
+action_entry(ToggleName)
+action_entry(ToggleObject)
+action_entry(ToggleShowDRC)
+action_entry(ToggleLiveRoute)
+action_entry(ToggleRubberBandMode)
+action_entry(ToggleStartDirection)
+action_entry(ToggleSnapPin)
+action_entry(ToggleSnapOffGridLine)
+action_entry(ToggleHighlightOnPoint)
+action_entry(ToggleThindraw)
+action_entry(ToggleLockNames)
+action_entry(ToggleOnlyNames)
+action_entry(ToggleThindrawPoly)
+action_entry(ToggleOrthoMove)
+action_entry(ToggleLocalRef)
+action_entry(ToggleCheckPlanes)
+action_entry(ToggleUniqueNames)
+action_entry(ToggleStroke)
+action_entry(Via)
+action_entry(Warp)
+action_entry(Zoom)
+
Index: tags/2.0.1/src/global_typedefs.h
===================================================================
--- tags/2.0.1/src/global_typedefs.h	(nonexistent)
+++ tags/2.0.1/src/global_typedefs.h	(revision 18980)
@@ -0,0 +1,74 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef GLOBAL_TYPEDEFS_H
+#define GLOBAL_TYPEDEFS_H
+#include "config.h"
+
+typedef struct pcb_board_s pcb_board_t;
+typedef struct pcb_data_s pcb_data_t;
+typedef struct pcb_layer_stack_s pcb_layer_stack_t;
+typedef struct pcb_layer_s pcb_layer_t;
+typedef struct pcb_buffer_s pcb_buffer_t;
+typedef struct pcb_net_s pcb_net_t;
+typedef struct pcb_connection_s pcb_connection_t;
+typedef struct pcb_box_s pcb_box_t;
+typedef struct pcb_box_list_s pcb_box_list_t;
+typedef struct pcb_font_s pcb_font_t;
+typedef struct pcb_fontkit_s pcb_fontkit_t;
+typedef struct pcb_line_s pcb_line_t;
+typedef struct pcb_arc_s pcb_arc_t;
+typedef struct pcb_point_s pcb_point_t;
+typedef struct pcb_rat_line_s pcb_rat_t;
+
+typedef struct pcb_poly_s pcb_poly_t;
+typedef struct pcb_pstk_s pcb_pstk_t;
+typedef struct pcb_rtree_s pcb_rtree_t;
+typedef struct pcb_rtree_it_s pcb_rtree_it_t;
+typedef struct pcb_ratspatch_line_s pcb_ratspatch_line_t;
+typedef struct pcb_subc_s pcb_subc_t;
+typedef struct pcb_text_s pcb_text_t;
+
+typedef struct pcb_any_obj_s pcb_any_obj_t;
+typedef struct pcb_any_line_s pcb_any_line_t;
+
+typedef union pcb_parent_s pcb_parent_t;
+
+typedef struct pcb_plug_io_s pcb_plug_io_t;
+
+typedef struct pcb_hid_cfg_s pcb_hid_cfg_t;
+
+typedef unsigned int pcb_cardinal_t;
+typedef unsigned char pcb_uint8_t;   /* Don't use in new code. */
+
+typedef struct pcb_action_s pcb_action_t;
+
+#include "pcb_bool.h"
+
+#include "unit.h"
+
+#endif
Index: tags/2.0.1/src/globalconst.h
===================================================================
--- tags/2.0.1/src/globalconst.h	(nonexistent)
+++ tags/2.0.1/src/globalconst.h	(revision 18980)
@@ -0,0 +1,110 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* global constants
+ * most of these values are also required by files outside the source tree
+ * (manuals...)
+ */
+
+#ifndef	__GLOBALCONST_INCLUDED__
+#define	__GLOBALCONST_INCLUDED__
+
+#include "config.h"
+
+
+/* frame between the groundplane and the copper or mask - noone seems
+   to remember what these two are for; changing them may have unforeseen
+   side effects. */
+#define PCB_GROUNDPLANEFRAME        PCB_MIL_TO_COORD(15)
+#define PCB_MASKFRAME               PCB_MIL_TO_COORD(3)
+
+/* ---------------------------------------------------------------------------
+ * some limit specifications
+ */
+#define PCB_LARGE_VALUE      (COORD_MAX / 2 - 1) /* maximum extent of board and elements */
+
+#define PCB_MAX_LAYER        38    /* max number of layer, check source code for more changes, a *lot* more changes */
+/* new array size that allows substrate layers */
+#define PCB_MAX_LAYERGRP     ((PCB_MAX_LAYER+8)*2)    /* max number of layer groups, a.k.a. physical layers: a few extra outer layers per side, pluse one substrate per real layer */
+#define PCB_MIN_LINESIZE     PCB_MIL_TO_COORD(0.01)	/* thickness of lines */
+#define PCB_MAX_LINESIZE     ((pcb_coord_t)PCB_LARGE_VALUE)
+#define PCB_MIN_ARCSIZE      PCB_MIL_TO_COORD(0.01)
+#define PCB_MAX_ARCSIZE      ((pcb_coord_t)PCB_LARGE_VALUE)
+#define PCB_MIN_TEXTSCALE    10 /* scaling of text objects in percent */
+#define PCB_MAX_TEXTSCALE    10000
+#define PCB_MIN_PINORVIASIZE PCB_MIL_TO_COORD(20)	/* size of a pin or via */
+#define PCB_MIN_PINORVIAHOLE PCB_MIL_TO_COORD(4)	/* size of a pins or vias drilling hole */
+#define PCB_MAX_PINORVIASIZE ((pcb_coord_t)PCB_LARGE_VALUE)
+#define PCB_MIN_PINORVIACOPPER PCB_MIL_TO_COORD(4)	/* min difference outer-inner diameter */
+#define PCB_MIN_PADSIZE      PCB_MIL_TO_COORD(1)	/* min size of a pad */
+#define PCB_MAX_PADSIZE      ((pcb_coord_t)PCB_LARGE_VALUE)   /* max size of a pad */
+#define PCB_MIN_DRC_VALUE    PCB_MIL_TO_COORD(0.1)
+#define PCB_MAX_DRC_VALUE    PCB_MIL_TO_COORD(500)
+#define PCB_MIN_DRC_SILK     PCB_MIL_TO_COORD(1)
+#define PCB_MAX_DRC_SILK     PCB_MIL_TO_COORD(30)
+#define PCB_MIN_DRC_DRILL    PCB_MIL_TO_COORD(1)
+#define PCB_MAX_DRC_DRILL    PCB_MIL_TO_COORD(50)
+#define PCB_MIN_DRC_RING     0
+#define PCB_MAX_DRC_RING     PCB_MIL_TO_COORD(100)
+#define PCB_MIN_GRID         1
+#define PCB_MAX_GRID         PCB_MIL_TO_COORD(1000)
+#define PCB_MAX_FONTPOSITION 255 /* upper limit of characters in my font */
+
+#define PCB_MAX_COORD        ((pcb_coord_t)PCB_LARGE_VALUE) /* coordinate limits */
+#define PCB_MIN_SIZE         PCB_MIL_TO_COORD(10) /* lowest width and height of the board */
+#define PCB_MAX_BUFFER       5 /* number of pastebuffers additional changes in menu.c are also required to select more buffers */
+
+#define PCB_DEFAULT_DRILLINGHOLE 40 /* default inner/outer ratio for pins/vias in percent */
+
+#define PCB_MAX_SIZE ((pcb_coord_t)PCB_LARGE_VALUE)
+
+#ifndef PCB_PATH_MAX   /* maximum path length */
+#ifdef PATH_MAX
+#define PCB_PATH_MAX PATH_MAX
+#else
+#define PCB_PATH_MAX 2048
+#endif
+#endif
+
+#define PCB_MAX_LINE_POINT_DISTANCE     0   /* maximum distance when searching line points; same for arc point */
+#define PCB_MAX_POLYGON_POINT_DISTANCE  0   /* maximum distance when searching polygon points */
+#define PCB_MAX_ELEMENTNAMES            3   /* number of supported names of an element */
+#define PCB_MAX_NETLIST_LINE_LENGTH     255 /* maximum line length for netlist files */
+#define PCB_MAX_MODESTACK_DEPTH         16  /* maximum depth of mode stack */
+#define PCB_MIN_GRID_DISTANCE           4   /* minimum distance between point to enable grid drawing */
+#define PCB_EMARK_SIZE                  PCB_MIL_TO_COORD(10) 	/* size of diamond element mark */
+
+
+/**** Font ***/
+/* These are used in debug draw font rendering (e.g. pin names) and reverse
+   scale calculations (e.g. when report is trying to figure how the font
+   is scaled. Changing these values is not really supported. */
+#define  PCB_FONT_CAPHEIGHT    PCB_MIL_TO_COORD (45)   /* (Approximate) capheight size of the default PCB font */
+#define  PCB_DEFAULT_CELLSIZE  50                  /* default cell size for symbols */
+
+#endif
Index: tags/2.0.1/src/grid.c
===================================================================
--- tags/2.0.1/src/grid.c	(nonexistent)
+++ tags/2.0.1/src/grid.c	(revision 18980)
@@ -0,0 +1,223 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <genvector/gds_char.h>
+
+#include "unit.h"
+#include "grid.h"
+#include "board.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "conf_hid.h"
+#include "compat_misc.h"
+#include "misc_util.h"
+#include "pcb_bool.h"
+#include "pcb-printf.h"
+
+pcb_coord_t pcb_grid_fit(pcb_coord_t x, pcb_coord_t grid_spacing, pcb_coord_t grid_offset)
+{
+	x -= grid_offset;
+	x = grid_spacing * pcb_round((double) x / grid_spacing);
+	x += grid_offset;
+	return x;
+}
+
+pcb_bool_t pcb_grid_parse(pcb_grid_t *dst, const char *src)
+{
+	const char *nsep;
+	char *sep3, *sep2, *sep, *tmp, *size, *ox = NULL, *oy = NULL, *unit = NULL;
+	pcb_bool succ;
+
+	nsep = strchr(src, ':');
+	if (nsep != NULL)
+		src = nsep+1;
+	else
+		dst->name = NULL;
+
+	/* remember where size starts */
+	while(isspace(*src)) src++;
+	sep = size = tmp = pcb_strdup(src);
+
+	/* find optional offs */
+	sep2 = strchr(sep, '@');
+	if (sep2 != NULL) {
+		sep = sep2;
+		*sep = '\0';
+		sep++;
+		ox = sep;
+		sep3 = strchr(sep, ',');
+		if (sep3 != NULL) {
+			*sep3 = '\0';
+			sep3++;
+			oy = sep;
+		}
+	}
+
+	/* find optional unit switch */
+	sep2 = strchr(sep, '!');
+	if (sep2 != NULL) {
+		sep = sep2;
+		*sep = '\0';
+		sep++;
+		unit = sep;
+	}
+
+	/* convert */
+	dst->size = pcb_get_value(size, NULL, NULL, &succ);
+	if ((!succ) || (dst->size < 0))
+		goto error;
+
+	if (ox != NULL) {
+		dst->ox = pcb_get_value(ox, NULL, NULL, &succ);
+		if (!succ)
+			goto error;
+	}
+	else
+		dst->ox = 0;
+
+	if (oy != NULL) {
+		dst->oy = pcb_get_value(oy, NULL, NULL, &succ);
+		if (!succ)
+			goto error;
+	}
+	else
+		dst->oy = 0;
+
+	if (unit != NULL) {
+		dst->unit = get_unit_struct(unit);
+		if (dst->unit == NULL)
+			goto error;
+	}
+	else
+		dst->unit = NULL;
+
+	/* success */
+	free(tmp);
+
+	if (nsep != NULL)
+		dst->name = pcb_strndup(src, nsep-src-1);
+	else
+		dst->name = NULL;
+	return pcb_true;
+
+	error:;
+	free(tmp);
+	return pcb_false;
+}
+
+pcb_bool_t pcb_grid_append_print(gds_t *dst, const pcb_grid_t *src)
+{
+	if (src->size <= 0)
+		return pcb_false;
+	if (src->name != NULL) {
+		gds_append_str(dst, src->name);
+		gds_append(dst, ':');
+	}
+	pcb_append_printf(dst, "%$.08mH", src->size);
+	if ((src->ox != 0) || (src->oy != 0))
+		pcb_append_printf(dst, "@%$.08mH,%$.08mH", src->ox, src->oy);
+	if (src->unit != NULL) {
+		gds_append(dst, '!');
+		gds_append_str(dst, src->unit->suffix);
+	}
+	return pcb_true;
+}
+
+char *pcb_grid_print(const pcb_grid_t *src)
+{
+	gds_t tmp;
+	gds_init(&tmp);
+	if (!pcb_grid_append_print(&tmp, src)) {
+		gds_uninit(&tmp);
+		return NULL;
+	}
+	return tmp.array; /* do not uninit tmp */
+}
+
+void pcb_grid_set(pcb_board_t *pcb, const pcb_grid_t *src)
+{
+	pcb_board_set_grid(src->size, pcb_true, src->ox, src->oy);
+	if (src->unit != NULL)
+		pcb_board_set_unit(pcb, src->unit);
+}
+
+void pcb_grid_free(pcb_grid_t *dst)
+{
+	free(dst->name);
+	dst->name = NULL;
+}
+
+pcb_bool_t pcb_grid_list_jump(int dst)
+{
+	const conf_listitem_t *li;
+	pcb_grid_t g;
+	int max = conflist_length((conflist_t *)&conf_core.editor.grids);
+
+	if (dst < 0)
+		dst = 0;
+	if (dst >= max)
+		dst = max - 1;
+	if (dst < 0)
+		return pcb_false;
+
+	conf_setf(CFR_DESIGN, "editor/grids_idx", -1, "%d", dst);
+
+	li = conflist_nth((conflist_t *)&conf_core.editor.grids, dst);
+	/* clamp */
+	if (li == NULL)
+		return pcb_false;
+
+	if (!pcb_grid_parse(&g, li->payload))
+		return pcb_false;
+	pcb_grid_set(PCB, &g);
+	pcb_grid_free(&g);
+
+	return pcb_true;
+}
+
+pcb_bool_t pcb_grid_list_step(int stp)
+{
+	int dst = conf_core.editor.grids_idx;
+	if (dst < 0)
+		dst = -dst-1;
+	return pcb_grid_list_jump(dst + stp);
+}
+
+void pcb_grid_inval(void)
+{
+	if (conf_core.editor.grids_idx > 0)
+		conf_setf(CFR_DESIGN, "editor/grids_idx", -1, "%d", -1 - conf_core.editor.grids_idx);
+}
+
Index: tags/2.0.1/src/grid.h
===================================================================
--- tags/2.0.1/src/grid.h	(nonexistent)
+++ tags/2.0.1/src/grid.h	(revision 18980)
@@ -0,0 +1,78 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_GRID_H
+#define PCB_GRID_H
+
+#include <genvector/gds_char.h>
+#include "pcb_bool.h"
+#include "board.h"
+#include "unit.h"
+
+/* String packed syntax (bracket means optional):
+
+     [name:]size[@offs][!unit]
+
+  "!" means to switch the UI to the unit specified. */
+typedef struct {
+	char *name;
+	pcb_coord_t size;
+	pcb_coord_t ox, oy;
+	const pcb_unit_t *unit; /* force switching to unit if not NULL */
+} pcb_grid_t;
+
+/* Returns the nearest grid-point to the given coord x */
+pcb_coord_t pcb_grid_fit(pcb_coord_t x, pcb_coord_t grid_spacing, pcb_coord_t grid_offset);
+
+/* Parse packed string format src into dst; allocat dst->name on success */
+pcb_bool_t pcb_grid_parse(pcb_grid_t *dst, const char *src);
+
+/* Free all allocated fields of a grid struct */
+void pcb_grid_free(pcb_grid_t *dst);
+
+/* Convert src into packed string format */
+pcb_bool_t pcb_grid_append_print(gds_t *dst, const pcb_grid_t *src);
+char *pcb_grid_print(const pcb_grid_t *src);
+
+/* Apply grid settings from src to the pcb */
+void pcb_grid_set(pcb_board_t *pcb, const pcb_grid_t *src);
+
+/* Jump to grid index dst (clamped); absolute set */
+pcb_bool_t pcb_grid_list_jump(int dst);
+
+/* Step stp steps (can be 0) on the grids list and set the resulting grid; relative set */
+pcb_bool_t pcb_grid_list_step(int stp);
+
+/* invalidate the grid index; call this when changing the grid settings */
+void pcb_grid_inval(void);
+
+/* Reinstall grid menus */
+void pcb_grid_install_menu(void);
+
+#endif
Index: tags/2.0.1/src/gui_act.c
===================================================================
--- tags/2.0.1/src/gui_act.c	(nonexistent)
+++ tags/2.0.1/src/gui_act.c	(revision 18980)
@@ -0,0 +1,2002 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "board.h"
+#include "build_run.h"
+#include "conf_core.h"
+#include "data.h"
+#include "tool.h"
+#include "grid.h"
+#include "error.h"
+#include "undo.h"
+#include "funchash_core.h"
+#include "change.h"
+
+#include "draw.h"
+#include "search.h"
+#include "find.h"
+#include "stub_stroke.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "event.h"
+#include "layer.h"
+#include "layer_ui.h"
+#include "layer_grp.h"
+#include "layer_vis.h"
+#include "attrib.h"
+#include "hid_attrib.h"
+#include "operation.h"
+#include "obj_subc_op.h"
+#include "tool.h"
+
+#define CLONE_TYPES PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY
+
+/* --------------------------------------------------------------------------- */
+/* Toggle actions are kept for compatibility; new code should use the conf system instead */
+static const char pcb_acts_Display[] =
+	"Display(SubcID, template)\n"
+	"Display(Grid|Redraw|Pinout|PinOrPadName)\n"
+	"Display(CycleClip|CycleCrosshair|ToggleAllDirections|ToggleStartDirection)\n"
+	"Display(ToggleGrid|ToggleRubberBandMode|ToggleUniqueNames)\n"
+	"Display(ToggleName|ToggleClearLine|ToggleFullPoly|ToggleSnapPin)\n"
+	"Display(ToggleSnapOffGridLine|ToggleHighlightOnPoint|ToggleCheckPlanes)\n"
+	"Display(ToggleThindraw|ToggleThindrawPoly|ToggleOrthoMove|ToggleLocalRef)\n"
+	"Display(ToggleLiveRoute|ToggleShowDRC|ToggleAutoDRC|LockNames|OnlyNames)";
+
+static const char pcb_acth_Display[] = "Several display-related actions.";
+
+/* %start-doc actions Display
+
+@table @code
+
+@item SubcID
+@item Description
+@item Value
+Specify the subcircuit ID template to be printed on the subcircuit layer
+
+@item Redraw
+Redraw the whole board.
+
+@item ToggleAllDirections
+When clear, lines can be drawn at any angle.  When set, lines are
+restricted to multiples of 45 degrees and requested lines may be
+broken up according to the clip setting.
+
+@item CycleClip
+Changes the way lines are restricted to 45 degree increments.  The
+various settings are: straight only, orthogonal then angled, and angled
+then orthogonal.  If AllDirections is set, this action disables it.
+
+@item CycleCrosshair
+Changes crosshair drawing.  pcb_crosshair may accept form of 4-ray,
+8-ray and 12-ray cross.
+
+@item ToggleRubberBandMode
+If set, moving an object moves all the lines attached to it too.
+
+@item ToggleStartDirection
+If set, each time you set a point in a line, the Clip toggles between
+orth-angle and angle-ortho.
+
+@item ToggleUniqueNames
+If set, you will not be permitted to change the name of an element to
+match that of another element.
+
+@item ToggleSnapPin
+If set, pin centers and pad end points are treated as additional grid
+points that the cursor can snap to.
+
+@item ToggleSnapOffGridLine
+If set, snap at some sensible point along a line.
+
+@item ToggleHighlightOnPoint
+If set, highlights lines and arcs when the crosshair is on one of their
+two (end) points.
+
+@item ToggleLocalRef
+If set, the mark is automatically set to the beginning of any move, so
+you can see the relative distance you've moved.
+
+@item ToggleThindraw
+If set, objects on the screen are drawn as outlines (lines are drawn
+as center-lines).  This lets you see line endpoints hidden under pins,
+for example.
+
+@item ToggleThindrawPoly
+If set, polygons on the screen are drawn as outlines.
+
+@item ToggleShowDRC
+If set, pending objects (i.e. lines you're in the process of drawing)
+will be drawn with an outline showing how far away from other copper
+you need to be.
+
+@item ToggleLiveRoute
+If set, the progress of the autorouter will be visible on the screen.
+
+@item ToggleAutoDRC
+If set, you will not be permitted to make connections which violate
+the current DRC and netlist settings.
+
+@item ToggleCheckPlanes
+If set, lines and arcs aren't drawn, which usually leaves just the
+polygons.  If you also disable all but the layer you're interested in,
+this allows you to check for isolated regions.
+
+@item ToggleOrthoMove
+If set, the crosshair is only allowed to move orthogonally from its
+previous position.  I.e. you can move a subcircuit or line up, down,
+left, or right, but not up+left or down+right.
+
+@item ToggleName
+Selects whether the pinouts show the pin names or the pin numbers.
+
+@item ToggleLockNames
+If set, text will ignore left mouse clicks and actions that work on
+objects under the mouse. You can still select text with a lasso (left
+mouse drag) and perform actions on the selection.
+
+@item ToggleOnlyNames
+If set, only text will be sensitive for mouse clicks and actions that
+work on objects under the mouse. You can still select other objects
+with a lasso (left mouse drag) and perform actions on the selection.
+
+@item ToggleClearLine
+When set, the clear-line flag causes new lines and arcs to have their
+``clear polygons'' flag set, so they won't be electrically connected
+to any polygons they overlap.
+
+@item ToggleFullPoly
+When set, the full-poly flag causes new polygons to have their
+``full polygon'' flag set, so all parts of them will be displayed
+instead of only the biggest one.
+
+@item ToggleGrid
+Resets the origin of the current grid to be wherever the crosshair is.
+If you provide two numbers after this, the origin is set to that
+coordinate.
+
+@item Grid
+Toggles whether the grid is displayed or not.
+
+@item Pinout
+Causes the pinout of the subcircuit indicated by the cursor to be
+displayed, usually in a separate window.
+
+@item PinOrPadName
+Toggles whether the names of terminals will be
+displayed.  If the cursor is over an subcircuit, all of its terminals
+are affected.
+
+@end table
+
+%end-doc */
+
+static enum pcb_crosshair_shape_e CrosshairShapeIncrement(enum pcb_crosshair_shape_e shape)
+{
+	switch (shape) {
+	case pcb_ch_shape_basic:
+		shape = pcb_ch_shape_union_jack;
+		break;
+	case pcb_ch_shape_union_jack:
+		shape = pcb_ch_shape_dozen;
+		break;
+	case pcb_ch_shape_dozen:
+		shape = pcb_ch_shape_NUM;
+		break;
+	case pcb_ch_shape_NUM:
+		shape = pcb_ch_shape_basic;
+		break;
+	}
+	return shape;
+}
+
+extern pcb_opfunc_t ChgFlagFunctions;
+static fgw_error_t pcb_act_Display(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *str_dir = NULL;
+	int id;
+	int err = 0;
+
+	PCB_ACT_IRES(0);
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Display, str_dir = argv[2].val.str);
+
+	if (id == F_SubcID) { /* change the displayed name of subcircuits */
+		if (argc > 1)
+			conf_set(CFR_DESIGN, "editor/subc_id", -1, str_dir, POL_OVERWRITE);
+		else
+			conf_set(CFR_DESIGN, "editor/subc_id", -1, "", POL_OVERWRITE);
+
+		pcb_gui->invalidate_all(); /* doesn't change too often, isn't worth anything more complicated */
+		pcb_draw();
+		return 0;
+	}
+
+	if (!str_dir || !*str_dir) {
+		switch (id) {
+
+			/* redraw layout */
+		case F_ClearAndRedraw:
+		case F_Redraw:
+			pcb_redraw();
+			break;
+
+			/* toggle line-adjust flag */
+		case F_ToggleAllDirections:
+			conf_toggle_editor(all_direction_lines);
+			pcb_tool_adjust_attached_objects();
+			break;
+
+		case F_CycleClip:
+			pcb_notify_crosshair_change(pcb_false);
+			if (conf_core.editor.all_direction_lines) {
+				conf_toggle_editor(all_direction_lines);
+				conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",0);
+			}
+			else {
+				conf_setf(CFR_DESIGN,"editor/line_refraction",-1,"%d",(conf_core.editor.line_refraction +1) % 3);
+			}
+			pcb_tool_adjust_attached_objects();
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_CycleCrosshair:
+			pcb_notify_crosshair_change(pcb_false);
+			pcb_crosshair.shape = CrosshairShapeIncrement(pcb_crosshair.shape);
+			if (pcb_ch_shape_NUM == pcb_crosshair.shape)
+				pcb_crosshair.shape = pcb_ch_shape_basic;
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleRubberBandMode:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(rubber_band_mode);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleStartDirection:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(swap_start_direction);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleUniqueNames:
+			pcb_message(PCB_MSG_ERROR, "Unique names/refdes is not supported any more - please use the renumber plugin\n");
+			break;
+
+		case F_ToggleSnapPin:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(snap_pin);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleSnapOffGridLine:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(snap_offgrid_line);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleHighlightOnPoint:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(highlight_on_point);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleLocalRef:
+			conf_toggle_editor(local_ref);
+			break;
+
+		case F_ToggleThindraw:
+			conf_toggle_editor(thin_draw);
+			pcb_redraw();
+			break;
+
+		case F_ToggleThindrawPoly:
+			conf_toggle_editor(thin_draw_poly);
+			pcb_redraw();
+			break;
+
+		case F_ToggleLockNames:
+			conf_toggle_editor(lock_names);
+			conf_set_editor(only_names, 0);
+			break;
+
+		case F_ToggleOnlyNames:
+			conf_toggle_editor(only_names);
+			conf_set_editor(lock_names, 0);
+			break;
+
+		case F_ToggleHideNames:
+			conf_toggle_editor(hide_names);
+			pcb_redraw();
+			break;
+
+		case F_ToggleStroke:
+			conf_toggle_editor(enable_stroke);
+			break;
+
+		case F_ToggleShowDRC:
+			conf_toggle_editor(show_drc);
+			break;
+
+		case F_ToggleLiveRoute:
+			conf_toggle_editor(live_routing);
+			break;
+
+		case F_ToggleAutoDRC:
+			pcb_notify_crosshair_change(pcb_false);
+			conf_toggle_editor(auto_drc);
+			if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) {
+				if (pcb_reset_conns(pcb_true)) {
+					pcb_undo_inc_serial();
+					pcb_draw();
+				}
+				if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
+					pcb_lookup_conn(pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND);
+			}
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+
+		case F_ToggleCheckPlanes:
+			conf_toggle_editor(check_planes);
+			pcb_redraw();
+			break;
+
+		case F_ToggleOrthoMove:
+			conf_toggle_editor(orthogonal_moves);
+			break;
+
+		case F_ToggleName:
+			conf_toggle_editor(show_number);
+			pcb_redraw();
+			break;
+
+		case F_ToggleClearLine:
+			conf_toggle_editor(clear_line);
+			break;
+
+		case F_ToggleFullPoly:
+			conf_toggle_editor(full_poly);
+			break;
+
+			/* shift grid alignment */
+		case F_ToggleGrid:
+			{
+				pcb_coord_t oldGrid = PCB->Grid;
+
+				PCB->Grid = 1;
+				if (pcb_crosshair_move_absolute(pcb_crosshair.X, pcb_crosshair.Y))
+					pcb_notify_crosshair_change(pcb_true);	/* first notify was in MoveCrosshairAbs */
+				pcb_board_set_grid(oldGrid, pcb_true, pcb_crosshair.X, pcb_crosshair.Y);
+				pcb_grid_inval();
+			}
+			break;
+
+			/* toggle displaying of the grid */
+		case F_Grid:
+			conf_toggle_editor(draw_grid);
+			pcb_redraw();
+			break;
+
+			/* display the pinout of a subcircuit */
+		case F_Pinout:
+			{
+				pcb_subc_t *subc;
+				void *ptrtmp;
+				pcb_coord_t x, y;
+
+				pcb_hid_get_coords(_("Click on a subcircuit"), &x, &y, 0);
+				if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) {
+					subc = (pcb_subc_t *) ptrtmp;
+					pcb_gui->show_item(subc);
+				}
+				break;
+			}
+
+			/* toggle displaying of terminal names */
+		case F_PinOrPadName:
+			{
+				int type;
+				void *ptr1, *ptr2, *ptr3;
+				pcb_coord_t x, y;
+				pcb_hid_get_coords(_("Click on a subcircuit"), &x, &y, 0);
+
+				/* toggle terminal ID print for subcircuit parts */
+				type = pcb_search_screen(x, y, PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART | PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3);
+				if (type) {
+					pcb_any_obj_t *obj = ptr2;
+					pcb_opctx_t opctx;
+					
+					switch(type) {
+						case PCB_OBJ_SUBC:
+							opctx.chgflag.pcb = PCB;
+							opctx.chgflag.how = PCB_CHGFLG_TOGGLE;
+							opctx.chgflag.flag = PCB_FLAG_TERMNAME;
+							pcb_subc_op(PCB->Data, (pcb_subc_t *)obj, &ChgFlagFunctions, &opctx, 0);
+							pcb_undo_inc_serial();
+							return 0;
+							break;
+						case PCB_OBJ_LINE:
+						case PCB_OBJ_ARC:
+						case PCB_OBJ_POLY:
+						case PCB_OBJ_TEXT:
+						case PCB_OBJ_PSTK:
+							pcb_obj_invalidate_label(type, ptr1, ptr2, ptr3);
+							break;
+						default:
+							return 0; /* nothing else can have a displayed name */
+					}
+
+					pcb_undo_add_obj_to_flag(ptr2);
+					PCB_FLAG_TOGGLE(PCB_FLAG_TERMNAME, obj);
+					pcb_board_set_changed_flag(pcb_true);
+					pcb_undo_inc_serial();
+					pcb_draw();
+				}
+				break;
+			}
+		default:
+			err = 1;
+		}
+	}
+	else if (str_dir) {
+		switch(id) {
+		case F_ToggleGrid:
+			if (argc > 3) {
+				if (fgw_arg_conv(&pcb_fgw, &argv[3], FGW_KEYWORD) != 0) {
+					PCB_ACT_FAIL(Display);
+					return FGW_ERR_ARG_CONV;
+				}
+				PCB->GridOffsetX = pcb_get_value(argv[2].val.str, NULL, NULL, NULL);
+				PCB->GridOffsetY = pcb_get_value(argv[3].val.str, NULL, NULL, NULL);
+				if (conf_core.editor.draw_grid)
+					pcb_redraw();
+			}
+			break;
+
+		default:
+			err = 1;
+			break;
+		}
+	}
+
+	if (!err)
+		return 0;
+
+	PCB_ACT_FAIL(Display);
+}
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Mode[] =
+	"Mode(Arc|Arrow|Copy|InsertPoint|Line|Lock|Move|None|PasteBuffer)\n"
+	"Mode(Polygon|Rectangle|Remove|Rotate|Text|Thermal|Via)\n" "Mode(Notify|Release|Cancel|Stroke)\n" "Mode(Save|Restore)";
+
+static const char pcb_acth_Mode[] = "Change or use the tool mode.";
+
+/* %start-doc actions Mode
+
+@table @code
+
+@item Arc
+@itemx Arrow
+@itemx Copy
+@itemx InsertPoint
+@itemx Line
+@itemx Lock
+@itemx Move
+@itemx None
+@itemx PasteBuffer
+@itemx Polygon
+@itemx Rectangle
+@itemx Remove
+@itemx Rotate
+@itemx Text
+@itemx Thermal
+@itemx Via
+Select the indicated tool.
+
+@item Notify
+Called when you press the mouse button, or move the mouse.
+
+@item Release
+Called when you release the mouse button.
+
+@item Cancel
+Cancels any pending tool activity, allowing you to restart elsewhere.
+For example, this allows you to start a new line rather than attach a
+line to the previous line.
+
+@item Escape
+Similar to Cancel but calling this action a second time will return
+to the Arrow tool.
+
+@item Stroke
+If your @code{pcb} was built with libstroke, this invokes the stroke
+input method.  If not, this will restart a drawing mode if you were
+drawing, else it will select objects.
+
+@item Save
+Remembers the current tool.
+
+@item Restore
+Restores the tool to the last saved tool.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Mode(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(0);
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Display, ;);
+
+	/* it is okay to use crosshair directly here, the mode command is called from a click when it needs coords */
+	pcb_tool_note.X = pcb_crosshair.X;
+	pcb_tool_note.Y = pcb_crosshair.Y;
+	pcb_notify_crosshair_change(pcb_false);
+	switch(fgw_keyword(&argv[1])) {
+	case F_Arc:
+		pcb_tool_select_by_id(PCB_MODE_ARC);
+		break;
+	case F_Arrow:
+		pcb_tool_select_by_id(PCB_MODE_ARROW);
+		break;
+	case F_Copy:
+		pcb_tool_select_by_id(PCB_MODE_COPY);
+		break;
+	case F_InsertPoint:
+		pcb_tool_select_by_id(PCB_MODE_INSERT_POINT);
+		break;
+	case F_Line:
+		pcb_tool_select_by_id(PCB_MODE_LINE);
+		break;
+	case F_Lock:
+		pcb_tool_select_by_id(PCB_MODE_LOCK);
+		break;
+	case F_Move:
+		pcb_tool_select_by_id(PCB_MODE_MOVE);
+		break;
+	case F_None:
+		pcb_tool_select_by_id(PCB_MODE_NO);
+		break;
+	case F_Cancel:
+		{
+			int saved_mode = conf_core.editor.mode;
+			pcb_tool_select_by_id(PCB_MODE_NO);
+			pcb_tool_select_by_id(saved_mode);
+		}
+		break;
+	case F_Escape:
+		{
+			switch (conf_core.editor.mode) {
+			case PCB_MODE_VIA:
+			case PCB_MODE_PASTE_BUFFER:
+			case PCB_MODE_TEXT:
+			case PCB_MODE_ROTATE:
+			case PCB_MODE_REMOVE:
+			case PCB_MODE_MOVE:
+			case PCB_MODE_COPY:
+			case PCB_MODE_INSERT_POINT:
+			case PCB_MODE_RUBBERBAND_MOVE:
+			case PCB_MODE_THERMAL:
+			case PCB_MODE_LOCK:
+				pcb_tool_select_by_id(PCB_MODE_NO);
+				pcb_tool_select_by_id(PCB_MODE_ARROW);
+				pcb_tool_note.Hit = pcb_tool_note.Click = 0; /* if the mouse button is still pressed, don't start selecting a box */
+				break;
+
+			case PCB_MODE_LINE:
+				if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) {
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
+				}
+				else {
+					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_LINE);
+				}
+				break;
+
+			case PCB_MODE_RECTANGLE:
+				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
+				else {
+					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_RECTANGLE);
+				}
+				break;
+
+			case PCB_MODE_POLYGON:
+				if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
+				else {
+					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_POLYGON);
+				}
+				break;
+
+			case PCB_MODE_POLYGON_HOLE:
+				if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
+				else {
+					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_POLYGON_HOLE);
+				}
+				break;
+
+			case PCB_MODE_ARC:
+				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
+					pcb_tool_select_by_id(PCB_MODE_ARROW);
+				else {
+					pcb_tool_select_by_id(PCB_MODE_NO);
+					pcb_tool_select_by_id(PCB_MODE_ARC);
+				}
+				break;
+
+			case PCB_MODE_ARROW:
+				break;
+
+			default:
+				break;
+			}
+		}
+		break;
+
+	case F_Notify:
+		pcb_notify_mode();
+		break;
+	case F_PasteBuffer:
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+		break;
+	case F_Polygon:
+		pcb_tool_select_by_id(PCB_MODE_POLYGON);
+		break;
+	case F_PolygonHole:
+		pcb_tool_select_by_id(PCB_MODE_POLYGON_HOLE);
+		break;
+	case F_Release:
+		if ((pcb_mid_stroke) && (conf_core.editor.enable_stroke) && (pcb_stub_stroke_finish() == 0)) {
+			/* Ugly hack: returning 1 here will break execution of the
+			   action script, so actions after this one could do things
+			   that would be executed only after non-recognized gestures */
+			pcb_release_mode();
+			return 1;
+		}
+		pcb_release_mode();
+		break;
+	case F_Remove:
+		pcb_tool_select_by_id(PCB_MODE_REMOVE);
+		break;
+	case F_Rectangle:
+		pcb_tool_select_by_id(PCB_MODE_RECTANGLE);
+		break;
+	case F_Rotate:
+		pcb_tool_select_by_id(PCB_MODE_ROTATE);
+		break;
+	case F_Stroke:
+		if (conf_core.editor.enable_stroke) {
+			pcb_stub_stroke_start();
+			break;
+		}
+		/* Handle middle mouse button restarts of drawing mode.
+		   If not in a drawing mode, middle mouse button will select objects. */
+		if (conf_core.editor.mode == PCB_MODE_LINE && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
+			pcb_tool_select_by_id(PCB_MODE_LINE);
+		else if (conf_core.editor.mode == PCB_MODE_ARC && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
+			pcb_tool_select_by_id(PCB_MODE_ARC);
+		else if (conf_core.editor.mode == PCB_MODE_RECTANGLE && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
+			pcb_tool_select_by_id(PCB_MODE_RECTANGLE);
+		else if (conf_core.editor.mode == PCB_MODE_POLYGON && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
+			pcb_tool_select_by_id(PCB_MODE_POLYGON);
+		else {
+			pcb_tool_save();
+			pcb_tool_is_saved = pcb_true;
+			pcb_tool_select_by_id(PCB_MODE_ARROW);
+			pcb_notify_mode();
+		}
+		break;
+	case F_Text:
+		pcb_tool_select_by_id(PCB_MODE_TEXT);
+		break;
+	case F_Thermal:
+		pcb_tool_select_by_id(PCB_MODE_THERMAL);
+		break;
+	case F_Via:
+		pcb_tool_select_by_id(PCB_MODE_VIA);
+		break;
+
+	case F_Restore: /* restore the last saved tool */
+		pcb_tool_restore();
+		break;
+
+	case F_Save: /* save currently selected tool */
+		pcb_tool_save();
+		break;
+	}
+	pcb_notify_crosshair_change(pcb_true);
+	return 0;
+}
+
+/* ---------------------------------------------------------------- */
+static const char pcb_acts_CycleDrag[] = "CycleDrag()\n";
+static const char pcb_acth_CycleDrag[] = "Cycle through which object is being dragged";
+
+#define close_enough(a, b) ((((a)-(b)) > 0) ? ((a)-(b) < (PCB_SLOP * pcb_pixel_slop)) : ((a)-(b) > -(PCB_SLOP * pcb_pixel_slop)))
+static fgw_error_t pcb_act_CycleDrag(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int over = 0;
+
+	PCB_ACT_IRES(0);
+	if (pcb_crosshair.drags == NULL)
+		return 0;
+
+	do {
+		pcb_crosshair.drags_current++;
+		if (pcb_crosshair.drags_current >= pcb_crosshair.drags_len) {
+			pcb_crosshair.drags_current = 0;
+			over++;
+		}
+
+		if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_LINE) != PCB_OBJ_VOID) {
+			/* line has two endpoints, check which one is close to the original x;y */
+			pcb_line_t *l = ptr2;
+			if (close_enough(pcb_tool_note.X, l->Point1.X) && close_enough(pcb_tool_note.Y, l->Point1.Y)) {
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_LINE_POINT;
+				pcb_crosshair.AttachedObject.Ptr1 = ptr1;
+				pcb_crosshair.AttachedObject.Ptr2 = ptr2;
+				pcb_crosshair.AttachedObject.Ptr3 = &l->Point1;
+				goto switched;
+			}
+			if (close_enough(pcb_tool_note.X, l->Point2.X) && close_enough(pcb_tool_note.Y, l->Point2.Y)) {
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_LINE_POINT;
+				pcb_crosshair.AttachedObject.Ptr1 = ptr1;
+				pcb_crosshair.AttachedObject.Ptr2 = ptr2;
+				pcb_crosshair.AttachedObject.Ptr3 = &l->Point2;
+				goto switched;
+			}
+		}
+		else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_ARC_POINT) != PCB_OBJ_VOID) {
+			pcb_coord_t ex, ey;
+			pcb_arc_get_end((pcb_arc_t *)ptr2, 0, &ex, &ey);
+			if (close_enough(pcb_tool_note.X, ex) && close_enough(pcb_tool_note.Y, ey)) {
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC_POINT;
+				pcb_crosshair.AttachedObject.Ptr1 = ptr1;
+				pcb_crosshair.AttachedObject.Ptr2 = ptr2;
+				pcb_crosshair.AttachedObject.Ptr3 = pcb_arc_start_ptr;
+				goto switched;
+			}
+			pcb_arc_get_end((pcb_arc_t *)ptr2, 1, &ex, &ey);
+			if (close_enough(pcb_tool_note.X, ex) && close_enough(pcb_tool_note.Y, ey)) {
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC_POINT;
+				pcb_crosshair.AttachedObject.Ptr1 = ptr1;
+				pcb_crosshair.AttachedObject.Ptr2 = ptr2;
+				pcb_crosshair.AttachedObject.Ptr3 = pcb_arc_end_ptr;
+				goto switched;
+			}
+		}
+		else if (pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, pcb_crosshair.drags[pcb_crosshair.drags_current], PCB_OBJ_ARC) != PCB_OBJ_VOID) {
+			pcb_crosshair.AttachedObject.Type = PCB_OBJ_ARC;
+			pcb_crosshair.AttachedObject.Ptr1 = ptr1;
+			pcb_crosshair.AttachedObject.Ptr2 = ptr2;
+			pcb_crosshair.AttachedObject.Ptr3 = ptr3;
+			goto switched;
+		}
+
+	} while (over <= 1);
+
+	PCB_ACT_IRES(-1);
+	return 0;
+	switched:;
+	pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
+	pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3);
+	return 0;
+}
+
+#undef close_enough
+
+/* -------------------------------------------------------------------------- */
+
+static const char pcb_acts_Message[] = "message(message)";
+
+static const char pcb_acth_Message[] = "Writes a message to the log window.";
+
+/* %start-doc actions Message
+
+This action displays a message to the log window.  This action is primarily
+provided for use by other programs which may interface with PCB.  If
+multiple arguments are given, each one is sent to the log window
+followed by a newline.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Message(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int i;
+
+	if (argc < 2)
+		PCB_ACT_FAIL(Message);
+
+	PCB_ACT_IRES(0);
+	for (i = 1; i < argc; i++) {
+		PCB_ACT_MAY_CONVARG(i, FGW_STR, Message, ;);
+		pcb_message(PCB_MSG_INFO, argv[i].val.str);
+		pcb_message(PCB_MSG_INFO, "\n");
+	}
+
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_MarkCrosshair[] = "MarkCrosshair()\n" "MarkCrosshair(Center)";
+
+static const char pcb_acth_MarkCrosshair[] = "Set/Reset the pcb_crosshair mark.";
+
+/* %start-doc actions MarkCrosshair
+
+The ``mark'' is a small X-shaped target on the display which is
+treated like a second origin (the normal origin is the upper let
+corner of the board).  The GUI will display a second set of
+coordinates for this mark, which tells you how far you are from it.
+
+If no argument is given, the mark is toggled - disabled if it was
+enabled, or enabled at the current cursor position of disabled.  If
+the @code{Center} argument is given, the mark is moved to the current
+cursor location.
+
+%end-doc */
+
+static fgw_error_t pcb_act_MarkCrosshair(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int id = -2;
+
+	PCB_ACT_IRES(0);
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, Display, id = fgw_keyword(&argv[1]));
+
+	if (id == -1) { /* invalid */
+		PCB_ACT_FAIL(MarkCrosshair);
+		return FGW_ERR_ARGV_TYPE;
+	}
+	else if (id == -2) { /* empty */
+		if (pcb_marked.status) {
+			pcb_notify_mark_change(pcb_false);
+			pcb_marked.status = pcb_false;
+			pcb_notify_mark_change(pcb_true);
+		}
+		else {
+			pcb_notify_mark_change(pcb_false);
+			pcb_marked.status = pcb_true;
+			if (conf_core.editor.marker_snaps) {
+				pcb_marked.X = pcb_crosshair.X;
+				pcb_marked.Y = pcb_crosshair.Y;
+			}
+			else
+				pcb_hid_get_coords(_("Click on new mark"), &pcb_marked.X, &pcb_marked.Y, 0);
+			pcb_notify_mark_change(pcb_true);
+		}
+	}
+	else if (id == F_Center) {
+		pcb_notify_mark_change(pcb_false);
+		pcb_marked.status = pcb_true;
+		if (conf_core.editor.marker_snaps) {
+			pcb_marked.X = pcb_crosshair.X;
+			pcb_marked.Y = pcb_crosshair.Y;
+		}
+		else
+			pcb_hid_get_coords(_("Click on new mark"), &pcb_marked.X, &pcb_marked.Y, 0);
+		pcb_notify_mark_change(pcb_true);
+	}
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_RouteStyle[] = "RouteStyle(style_id|style_name)";
+static const char pcb_acth_RouteStyle[] = "Copies the indicated routing style into the current pen.";
+/* %start-doc actions RouteStyle
+
+%end-doc */
+static fgw_error_t pcb_act_RouteStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *end;
+	const char *str = NULL;
+	pcb_route_style_t *rts;
+	int number;
+
+	PCB_ACT_IRES(0);
+	PCB_ACT_CONVARG(1, FGW_STR, RouteStyle, str = argv[1].val.str);
+
+	number = strtol(str, &end, 10);
+
+	if (*end != '\0') { /* if not an integer, find by name */
+		int n;
+		number = -1;
+		for(n = 0; n < vtroutestyle_len(&PCB->RouteStyle); n++) {
+			rts = &PCB->RouteStyle.array[n];
+			if (pcb_strcasecmp(rts->name, str) == 0) {
+				number = n + 1;
+				break;
+			}
+		}
+	}
+
+	if (number > 0 && number <= vtroutestyle_len(&PCB->RouteStyle)) {
+		rts = &PCB->RouteStyle.array[number - 1];
+		pcb_board_set_line_width(rts->Thick);
+		pcb_board_set_via_size(rts->Diameter, pcb_true);
+		pcb_board_set_via_drilling_hole(rts->Hole, pcb_true);
+		pcb_board_set_clearance(rts->Clearance);
+	}
+	else {
+		PCB_ACT_IRES(-1);
+		pcb_message(PCB_MSG_ERROR, "Error: invalid route style name or index\n");
+	}
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_CreateMenu[] = "CreateMenu(path)\nCreateMenu(path, action, mnemonic, accel, tooltip, cookie)";
+static const char pcb_acth_CreateMenu[] = "Creates a new menu, popup (only path specified) or submenu (at least path and action are specified)";
+
+/* %start-doc actions RouteStyle
+
+%end-doc */
+
+static fgw_error_t pcb_act_CreateMenu(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (pcb_gui == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error: can't create menu, there's no GUI hid loaded\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, CreateMenu, ;);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, CreateMenu, ;);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, CreateMenu, ;);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, CreateMenu, ;);
+	PCB_ACT_MAY_CONVARG(5, FGW_STR, CreateMenu, ;);
+	PCB_ACT_MAY_CONVARG(6, FGW_STR, CreateMenu, ;);
+
+	if (argc > 1) {
+		pcb_menu_prop_t props;
+		memset(&props, 0, sizeof(props));
+		props.action = (argc > 2) ? argv[2].val.str : NULL;
+		props.mnemonic = (argc > 3) ? argv[3].val.str : NULL;
+		props.accel = (argc > 4) ? argv[4].val.str : NULL;
+		props.tip = (argc > 5) ? argv[5].val.str : NULL;
+		props.cookie = (argc > 6) ? argv[6].val.str : NULL;
+		pcb_gui->create_menu(argv[1].val.str, &props);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	PCB_ACT_FAIL(CreateMenu);
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_RemoveMenu[] = "RemoveMenu(path|cookie)";
+static const char pcb_acth_RemoveMenu[] = "Recursively removes a new menu, popup (only path specified) or submenu. ";
+
+/* %start-doc actions RemoveMenu
+
+%end-doc */
+
+static fgw_error_t pcb_act_RemoveMenu(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (pcb_gui == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't remove menu, there's no GUI hid loaded\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	if (pcb_gui->remove_menu == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't remove menu, the GUI doesn't support it\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, RemoveMenu, ;);
+	if (pcb_gui->remove_menu(argv[1].val.str) != 0) {
+		pcb_message(PCB_MSG_ERROR, "failed to remove some of the menu items\n");
+		PCB_ACT_IRES(-1);
+	}
+	else
+		PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_SetSame[] = "SetSame()";
+
+static const char pcb_acth_SetSame[] = "Sets current layer and sizes to match indicated item.";
+
+/* %start-doc actions SetSame
+
+When invoked over any line, arc, polygon, or via, this changes the
+current layer to be the layer that item is on, and changes the current
+sizes (thickness, clearance, drill, etc) according to that item.
+
+%end-doc */
+static void set_same_(pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name)
+{
+	int known;
+	known = pcb_route_style_lookup(&PCB->RouteStyle, Thick, Diameter, Hole, Clearance, Name);
+	if (known < 0) {
+		/* unknown style, set properties */
+		if (Thick != -1)     { pcb_custom_route_style.Thick     = Thick;     conf_set_design("design/line_thickness", "%$mS", Thick); }
+		if (Clearance != -1) { pcb_custom_route_style.Clearance = Clearance; conf_set_design("design/clearance", "%$mS", Clearance); }
+		if (Diameter != -1)  { pcb_custom_route_style.Diameter  = Diameter;  conf_set_design("design/via_thickness", "%$mS", Diameter); }
+		if (Hole != -1)      { pcb_custom_route_style.Hole      = Hole;      conf_set_design("design/via_drilling_hole", "%$mS", Hole); }
+		PCB->pen_attr = NULL;
+	}
+	else
+		pcb_use_route_style_idx(&PCB->RouteStyle, known);
+}
+
+static fgw_error_t pcb_act_SetSame(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	pcb_layer_t *layer = CURRENT;
+
+	pcb_hid_get_coords("Select item to use properties from", &x, &y, 0);
+
+	type = pcb_search_screen(x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3);
+/* set layer current and size from line or arc */
+	switch (type) {
+	case PCB_OBJ_LINE:
+		pcb_notify_crosshair_change(pcb_false);
+		set_same_(((pcb_line_t *) ptr2)->Thickness, -1, -1, ((pcb_line_t *) ptr2)->Clearance / 2, NULL);
+		layer = (pcb_layer_t *) ptr1;
+		if (conf_core.editor.mode != PCB_MODE_LINE)
+			pcb_tool_select_by_id(PCB_MODE_LINE);
+		pcb_notify_crosshair_change(pcb_true);
+		pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+		break;
+
+	case PCB_OBJ_ARC:
+		pcb_notify_crosshair_change(pcb_false);
+		set_same_(((pcb_arc_t *) ptr2)->Thickness, -1, -1, ((pcb_arc_t *) ptr2)->Clearance / 2, NULL);
+		layer = (pcb_layer_t *) ptr1;
+		if (conf_core.editor.mode != PCB_MODE_ARC)
+			pcb_tool_select_by_id(PCB_MODE_ARC);
+		pcb_notify_crosshair_change(pcb_true);
+		pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+		break;
+
+	case PCB_OBJ_POLY:
+		layer = (pcb_layer_t *) ptr1;
+		break;
+
+	default:
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	if (layer != CURRENT) {
+		pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, layer), pcb_true, pcb_true);
+		pcb_redraw();
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_SwitchHID[] = "SwitchHID(lesstif|gtk|batch)";
+
+static const char pcb_acth_SwitchHID[] = "Switch to another HID.";
+
+/* %start-doc actions SwitchHID
+
+Switch to another HID.
+
+%end-doc */
+
+static fgw_error_t pcb_act_SwitchHID(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_hid_t *ng;
+	int chg;
+
+	PCB_ACT_CONVARG(1, FGW_STR, SwitchHID, ;);
+	ng = pcb_hid_find_gui(argv[1].val.str);
+	if (ng == NULL) {
+		pcb_message(PCB_MSG_ERROR, "No such HID.");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	pcb_next_gui = ng;
+	chg = PCB->Changed;
+	pcb_quit_app();
+	PCB->Changed = chg;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+/* --------------------------------------------------------------------------- */
+
+/* This action is provided for CLI convenience */
+static const char pcb_acts_FullScreen[] = "pcb_act_FullScreen(on|off|toggle)\n";
+static const char pcb_acth_FullScreen[] = "Hide widgets to get edit area full screen";
+
+static fgw_error_t pcb_act_FullScreen(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int id = -2;
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, FullScreen, id = fgw_keyword(&argv[1]));
+
+	PCB_ACT_IRES(0);
+	switch(id) {
+		case -2:
+		case F_Toggle:
+			conf_setf(CFR_DESIGN, "editor/fullscreen", -1, "%d", !conf_core.editor.fullscreen, POL_OVERWRITE);
+			break;
+		case F_On:
+			conf_set(CFR_DESIGN, "editor/fullscreen", -1, "1", POL_OVERWRITE);
+			break;
+		case F_Off:
+			conf_set(CFR_DESIGN, "editor/fullscreen", -1, "0", POL_OVERWRITE);
+			break;
+		default:
+			PCB_ACT_FAIL(FullScreen);
+	}
+	return 0;
+}
+
+static const char pcb_acts_Cursor[] = "Cursor(Type,DeltaUp,DeltaRight,Units)";
+static const char pcb_acth_Cursor[] = "Move the cursor.";
+/* %start-doc actions Cursor
+
+This action moves the mouse cursor.  Unlike other actions which take
+coordinates, this action's coordinates are always relative to the
+user's view of the board.  Thus, a positive @var{DeltaUp} may move the
+cursor towards the board origin if the board is inverted.
+
+Type is one of @samp{Pan} or @samp{Warp}.  @samp{Pan} causes the
+viewport to move such that the crosshair is under the mouse cursor.
+@samp{Warp} causes the mouse cursor to move to be above the crosshair.
+
+@var{Units} can be one of the following:
+
+@table @samp
+
+@item mil
+@itemx mm
+The cursor is moved by that amount, in board units.
+
+@item grid
+The cursor is moved by that many grid points.
+
+@item view
+The values are percentages of the viewport's view.  Thus, a pan of
+@samp{100} would scroll the viewport by exactly the width of the
+current view.
+
+@item board
+The values are percentages of the board size.  Thus, a move of
+@samp{50,50} moves you halfway across the board.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Cursor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_unit_list_t extra_units_x = {
+		{"grid", 0, 0},
+		{"view", 0, PCB_UNIT_PERCENT},
+		{"board", 0, PCB_UNIT_PERCENT},
+		{"", 0, 0}
+	};
+	pcb_unit_list_t extra_units_y = {
+		{"grid", 0, 0},
+		{"view", 0, PCB_UNIT_PERCENT},
+		{"board", 0, PCB_UNIT_PERCENT},
+		{"", 0, 0}
+	};
+	int op, pan_warp = HID_SC_DO_NOTHING;
+	double dx, dy;
+	pcb_coord_t view_width, view_height;
+	const char *a1, *a2, *a3;
+
+	extra_units_x[0].scale = PCB->Grid;
+	extra_units_x[2].scale = PCB->MaxWidth;
+
+	extra_units_y[0].scale = PCB->Grid;
+	extra_units_y[2].scale = PCB->MaxHeight;
+
+	pcb_gui->get_view_size(&view_width, &view_height);
+
+	extra_units_x[1].scale = view_width;
+	extra_units_y[1].scale = view_height;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Cursor, op = fgw_keyword(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_STR, Cursor, a1 = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, Cursor, a2 = argv[3].val.str);
+	PCB_ACT_CONVARG(4, FGW_STR, Cursor, a3 = argv[4].val.str);
+
+	if (op == F_Pan)
+		pan_warp = HID_SC_PAN_VIEWPORT;
+	else if (op == F_Warp)
+		pan_warp = HID_SC_WARP_POINTER;
+	else
+		PCB_ACT_FAIL(Cursor);
+
+	dx = pcb_get_value_ex(a1, a3, NULL, extra_units_x, "", NULL);
+	if (conf_core.editor.view.flip_x)
+		dx = -dx;
+	dy = pcb_get_value_ex(a2, a3, NULL, extra_units_y, "", NULL);
+	if (!conf_core.editor.view.flip_y)
+		dy = -dy;
+	
+	/* Allow leaving snapped pin/pad/padstack */
+	if (pcb_crosshair.snapped_pstk) {
+		pcb_pstk_t *ps = pcb_crosshair.snapped_pstk;
+		pcb_coord_t radius = ((ps->BoundingBox.X2 - ps->BoundingBox.X1) + (ps->BoundingBox.Y2 - ps->BoundingBox.Y1))/2;
+		if (dx < 0)
+			dx -= radius;
+		else if (dx > 0)
+			dx += radius;
+		if (dy < 0)
+			dy -= radius;
+		else if (dy > 0)
+			dy += radius;
+	}
+
+	pcb_event_move_crosshair(pcb_crosshair.X + dx, pcb_crosshair.Y + dy);
+	pcb_gui->set_crosshair(pcb_crosshair.X, pcb_crosshair.Y, pan_warp);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+#define istrue(s) ((*(s) == '1') || (*(s) == 'y') || (*(s) == 'Y') || (*(s) == 't') || (*(s) == 'T'))
+
+static const char pcb_acts_EditLayer[] = "Editlayer([@layer], [name=text|auto=[0|1]|sub=[0|1])]\nEditlayer([@layer], attrib, key=value)";
+static const char pcb_acth_EditLayer[] = "Change a property or attribute of a layer. If the first argument starts with @, it is taken as the layer name to manipulate, else the action uses the current layer. Without arguments or if only a layer name is specified, interactive runs editing.";
+static fgw_error_t pcb_act_EditLayer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int ret = 0, n, interactive = 1, explicit = 0;
+	pcb_layer_t *ly = CURRENT;
+
+	for(n = 1; n < argc; n++) {
+		const char *arg;
+		PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str);
+		if (!explicit && (*arg == '@')) {
+			pcb_layer_id_t lid = pcb_layer_by_name(PCB->Data, arg+1);
+			if (lid < 0) {
+				pcb_message(PCB_MSG_ERROR, "Can't find layer named %s\n", arg+1);
+				return 1;
+			}
+			ly = pcb_get_layer(PCB->Data, lid);
+			explicit = 1;
+		}
+		else if (strncmp(arg, "name=", 5) == 0) {
+			interactive = 0;
+			ret |= pcb_layer_rename_(ly, pcb_strdup(arg+5));
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else if (strncmp(arg, "auto=", 5) == 0) {
+			interactive = 0;
+			if (istrue(arg+5))
+				ly->comb |= PCB_LYC_AUTO;
+			else
+				ly->comb &= ~PCB_LYC_AUTO;
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else if (strncmp(arg, "sub=", 4) == 0) {
+			interactive = 0;
+			if (istrue(arg+4))
+				ly->comb |= PCB_LYC_SUB;
+			else
+				ly->comb &= ~PCB_LYC_SUB;
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else if (strncmp(arg, "attrib", 6) == 0) {
+			char *key, *val;
+			interactive = 0;
+			n++;
+			if (n >= argc) {
+				pcb_message(PCB_MSG_ERROR, "Need an attribute name=value\n", arg+1);
+				return 1;
+			}
+			key = pcb_strdup(arg);
+			val = strchr(key, '=');
+			if (val != NULL) {
+				*val = '\0';
+				val++;
+				if (*val == '\0')
+					val = NULL;
+			}
+			if (val == NULL)
+				ret |= pcb_attribute_remove(&ly->Attributes, key);
+			else
+				ret |= pcb_attribute_put(&ly->Attributes, key, val);
+			free(key);
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Invalid EditLayer() command: %s\n", arg);
+			PCB_ACT_FAIL(EditLayer);
+		}
+	}
+
+	if (interactive) {
+		int ar;
+		pcb_hid_attr_val_t rv[16];
+		pcb_hid_attribute_t attr[] = {
+			{"name", "logical layer name",          PCB_HATT_STRING, 0, 0, {0}, NULL, NULL, 0, NULL, NULL},
+			{"sub: drawn using subtraction", NULL,  PCB_HATT_BOOL, 0, 0, {0}, NULL, NULL, 0, NULL, NULL},
+			{"auto: auto-generated layer", NULL,    PCB_HATT_BOOL, 0, 0, {0}, NULL, NULL, 0, NULL, NULL}
+		};
+
+		attr[0].default_val.str_value = pcb_strdup(ly->name);
+		attr[1].default_val.int_value = ly->comb & PCB_LYC_SUB;
+		attr[2].default_val.int_value = ly->comb & PCB_LYC_AUTO;
+
+		ar = pcb_attribute_dialog(attr,sizeof(attr)/sizeof(attr[0]), rv, "Edit layer properties", "Edit the properties of a logical layer", NULL);
+
+		if (ar == 0) {
+			pcb_layer_combining_t comb = 0;
+			if (strcmp(ly->name, attr[0].default_val.str_value) != 0) {
+				ret |= pcb_layer_rename_(ly, (char *)attr[0].default_val.str_value);
+				attr[0].default_val.str_value = NULL;
+				pcb_board_set_changed_flag(pcb_true);
+			}
+			if (attr[1].default_val.int_value) comb |= PCB_LYC_SUB;
+			if (attr[2].default_val.int_value) comb |= PCB_LYC_AUTO;
+			if (ly->comb != comb) {
+				ly->comb = comb;
+				pcb_board_set_changed_flag(pcb_true);
+			}
+		}
+		free((char *)attr[0].default_val.str_value);
+		ret |= ar;
+	}
+
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	PCB_ACT_IRES(0);
+	return ret;
+}
+
+pcb_layergrp_id_t pcb_actd_EditGroup_gid = -1;
+static const char pcb_acts_EditGroup[] = "Editgroup([@group], [name=text|type=+bit|type=-bit])]\nEditlayer([@layer], attrib, key=value)";
+static const char pcb_acth_EditGroup[] = "Change a property or attribute of a layer group. If the first argument starts with @, it is taken as the group name to manipulate, else the action uses the current layer's group. Without arguments or if only a layer name is specified, interactive runs editing.";
+static fgw_error_t pcb_act_EditGroup(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int ret = 0, n, interactive = 1, explicit = 0;
+	pcb_layergrp_t *g = NULL;
+
+#warning layer TODO: rewrite this with DAD in two versions (bound and unbound)
+	if (CURRENT->is_bound) {
+		pcb_message(PCB_MSG_ERROR, "Can't edit bound layers yet\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (CURRENT != NULL)
+		g = pcb_get_layergrp(PCB, CURRENT->meta.real.grp);
+
+	for(n = 1; n < argc; n++) {
+		const char *arg;
+		PCB_ACT_CONVARG(n, FGW_STR, EditLayer, arg = argv[n].val.str);
+		if (!explicit && (*arg == '@')) {
+			pcb_layergrp_id_t gid;
+			if (arg[1] == '\0')
+				gid = pcb_actd_EditGroup_gid;
+			else
+				gid = pcb_layergrp_by_name(PCB, arg+1);
+			if (gid < 0) {
+				pcb_message(PCB_MSG_ERROR, "Can't find layer group named %s\n", arg+1);
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+			g = pcb_get_layergrp(PCB, gid);
+			explicit = 1;
+		}
+		else if (strncmp(arg, "name=", 5) == 0) {
+			interactive = 0;
+			ret |= pcb_layergrp_rename_(g, pcb_strdup(arg+5));
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else if (strncmp(arg, "type=", 5) == 0) {
+			const char *sbit = arg+5;
+			pcb_layer_type_t bit = pcb_layer_type_str2bit(sbit+1);
+			if (bit == 0) {
+				if (strcmp(sbit+1, "anything") == 0) bit = PCB_LYT_ANYTHING;
+				else if (strcmp(sbit+1, "anywhere") == 0) bit = PCB_LYT_ANYWHERE;
+			}
+			if (bit == 0) {
+				pcb_message(PCB_MSG_ERROR, "Unknown type bit %s\n", sbit+1);
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+			switch(*sbit) {
+				case '+': g->ltype |= bit; break;
+				case '-': g->ltype &= ~bit; break;
+			}
+			interactive = 0;
+			pcb_board_set_changed_flag(pcb_true);
+		}
+		else if (strncmp(arg, "attrib", 6) == 0) {
+			char *key, *val;
+			interactive = 0;
+			n++;
+			if (n >= argc) {
+				pcb_message(PCB_MSG_ERROR, "Need an attribute name=value\n", arg+1);
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+			key = pcb_strdup(arg);
+			val = strchr(key, '=');
+			if (val != NULL) {
+				*val = '\0';
+				val++;
+				if (*val == '\0')
+					val = NULL;
+			}
+			if (val == NULL)
+				ret |= pcb_attribute_remove(&g->Attributes, key);
+			else
+				ret |= pcb_attribute_put(&g->Attributes, key, val);
+			free(key);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Invalid EditGroup() command: %s\n", arg);
+			PCB_ACT_FAIL(EditLayer);
+		}
+	}
+
+	if (interactive) {
+		int ar;
+		pcb_hid_attr_val_t rv[16];
+		pcb_hid_attribute_t attr[] = {
+			{"name", "logical layer name",          PCB_HATT_STRING, 0, 0, {0}, NULL, NULL, 0, NULL, NULL},
+		};
+
+		attr[0].default_val.str_value = pcb_strdup(g->name);
+
+		ar = pcb_attribute_dialog(attr,sizeof(attr)/sizeof(attr[0]), rv, "Edit layer properties", "Edit the properties of a logical layer", NULL);
+
+		if (ar == 0) {
+			if (strcmp(g->name, attr[0].default_val.str_value) != 0) {
+				ret |= pcb_layergrp_rename_(g, (char *)attr[0].default_val.str_value);
+				attr[0].default_val.str_value = NULL;
+				pcb_board_set_changed_flag(pcb_true);
+			}
+		}
+
+		free((char *)attr[0].default_val.str_value);
+
+		ret |= ar;
+	}
+
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	PCB_ACT_IRES(0);
+	return ret;
+}
+
+static const char pcb_acts_DelGroup[] = "DelGroup([@group])";
+static const char pcb_acth_DelGroup[] = "Remove a layer group; if the first argument is not specified, the current group is removed";
+static fgw_error_t pcb_act_DelGroup(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *name = NULL;
+	pcb_layergrp_t *g = NULL;
+	pcb_layergrp_id_t gid;
+
+	if (CURRENT != NULL)
+		g = pcb_get_layergrp(PCB, CURRENT->meta.real.grp);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, EditLayer, name = argv[1].val.str);
+	if (*name == '@') {
+		gid = pcb_actd_EditGroup_gid;
+		if (name[1] != '\0')
+			gid = pcb_layergrp_by_name(PCB, name+1);
+		if (gid < 0) {
+			pcb_message(PCB_MSG_ERROR, "Can't find layer group named %s\n", name+1);
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+	else {
+		if (g == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Can't find layer group\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+		gid = pcb_layergrp_id(PCB, g);
+	}
+
+	PCB_ACT_IRES(pcb_layergrp_del(PCB, gid, 1));
+	return 0;
+}
+
+const char pcb_acts_selectlayer[] = "SelectLayer(1..MAXLAYER|Silk|Rats)";
+const char pcb_acth_selectlayer[] = "Select which layer is the current layer.";
+
+/* %start-doc actions SelectLayer
+
+The specified layer becomes the currently active layer.  It is made
+visible if it is not already visible
+
+%end-doc */
+
+static fgw_error_t pcb_act_SelectLayer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layer_id_t lid;
+	const pcb_menu_layers_t *ml;
+	char *name;
+
+	PCB_ACT_IRES(0);
+	PCB_ACT_CONVARG(1, FGW_STR, selectlayer, name = argv[1].val.str);
+
+	if (pcb_strcasecmp(name, "silk") == 0) {
+		PCB->RatDraw = 0;
+		if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0) {
+			pcb_layervis_change_group_vis(lid, 1, 1);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n");
+			PCB_ACT_IRES(-1);
+		}
+		return 0;
+	}
+
+	ml = pcb_menu_layer_find(name);
+	if (ml != NULL) {
+		pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs);
+		pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs);
+		if (ml->sel_offs == 0) {
+			pcb_message(PCB_MSG_ERROR, "Virtual layer '%s' (%s) can not be selected\n", ml->name, ml->abbrev);
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+		*s = *v = 1;
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+		return 0;
+	}
+
+	PCB->RatDraw = 0;
+	pcb_layervis_change_group_vis(atoi(name)-1, 1, 1);
+	pcb_gui->invalidate_all();
+	pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	return 0;
+}
+
+const char pcb_acts_chklayer[] = "ChkLayer(layerid)";
+const char pcb_acth_chklayer[] = "Returns 1 if the specified layer is the active layer";
+/* %start-doc actions ChkLayer
+
+Returns 1 if the specified layer is the active layer.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ChkLayer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layer_id_t lid;
+	pcb_layer_t *ly;
+	char *end;
+	const char *name;
+	const pcb_menu_layers_t *ml;
+
+	PCB_ACT_CONVARG(1, FGW_STR, chklayer, name = argv[1].val.str);
+
+	lid = strtol(name, &end, 10);
+	if (*end != '\0') {
+		ml = pcb_menu_layer_find(name);
+		if (ml != NULL) {
+			if (ml->sel_offs != 0) {
+				pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs);
+				PCB_ACT_IRES(*s);
+			}
+			else
+				PCB_ACT_IRES(-1);
+			return 0;
+		}
+		pcb_message(PCB_MSG_ERROR, "pcb_act_ChkLayer: '%s' is not a valid layer ID - check your menu file!\n", argv[0]);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	/* if any virtual is selected, do not accept CURRENT as selected */
+	for(ml = pcb_menu_layers; ml->name != NULL; ml++) {
+		pcb_bool *s = (pcb_bool *)((char *)PCB + ml->sel_offs);
+		if ((ml->sel_offs != 0) && (*s)) {
+			PCB_ACT_IRES(0);
+			return 0;
+		}
+	}
+
+	lid--;
+	ly = pcb_get_layer(PCB->Data, lid);
+	if (ly == NULL)
+		PCB_ACT_IRES(-1);
+	else
+		PCB_ACT_IRES(ly == CURRENT);
+	return 0;
+}
+
+
+const char pcb_acts_toggleview[] = "ToggleView(1..MAXLAYER)\n" "ToggleView(layername)\n" "ToggleView(Silk|Rats|Pins|Vias|BackSide)\n" "ToggleView(All, Open|Vis, Set|Clear|Toggle)";
+const char pcb_acth_toggleview[] = "Toggle the visibility of the specified layer or layer group.";
+
+/* %start-doc actions ToggleView
+
+If you pass an integer, that layer is specified by index (the first
+layer is @code{1}, etc).  If you pass a layer name, that layer is
+specified by name.  When a layer is specified, the visibility of the
+layer group containing that layer is toggled.
+
+If you pass a special layer name, the visibility of those components
+(silk, rats, etc) is toggled.  Note that if you have a layer named
+the same as a special layer, the layer is chosen over the special layer.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ToggleView(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layer_id_t lid;
+	const char *name;
+
+	PCB_ACT_CONVARG(1, FGW_STR, toggleview, name = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	if (pcb_strcasecmp(name, "all") == 0) {
+		pcb_bool_op_t open = PCB_BOOL_PRESERVE, vis = PCB_BOOL_PRESERVE, user = PCB_BOOL_PRESERVE;
+		const char *cmd, *suser;
+		PCB_ACT_CONVARG(2, FGW_STR, toggleview, cmd = argv[2].val.str);
+		PCB_ACT_CONVARG(3, FGW_STR, toggleview, suser = argv[3].val.str);
+
+		user = pcb_str2boolop(suser);
+		if (user == PCB_BOOL_INVALID)
+			PCB_ACT_FAIL(toggleview);
+		if (pcb_strcasecmp(cmd, "open") == 0)
+			open = user;
+		else if (pcb_strcasecmp(cmd, "vis") == 0)
+			vis = user;
+		else
+			PCB_ACT_FAIL(toggleview);
+		pcb_layer_vis_change_all(PCB, open, vis);
+		pcb_gui->invalidate_all();
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+		return 0;
+	}
+	else if (pcb_strcasecmp(name, "silk") == 0) {
+		if (pcb_layer_list(PCB, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_SILK, &lid, 1) > 0)
+			pcb_layervis_change_group_vis(lid, -1, 0);
+		else
+			pcb_message(PCB_MSG_ERROR, "Can't find this-side silk layer\n");
+	}
+	else if ((pcb_strcasecmp(name, "padstacks") == 0) || (pcb_strcasecmp(name, "vias") == 0) || (pcb_strcasecmp(name, "pins") == 0) || (pcb_strcasecmp(name, "pads") == 0)) {
+		PCB->pstk_on = !PCB->pstk_on;
+		pcb_gui->invalidate_all();
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	}
+	else if (pcb_strcasecmp(name, "BackSide") == 0) {
+		PCB->InvisibleObjectsOn = !PCB->InvisibleObjectsOn;
+		pcb_gui->invalidate_all();
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	}
+	else if (strncmp(name, "ui:", 3) == 0) {
+		pcb_layer_t *ly = pcb_uilayer_get(atoi(name+3));
+		if (ly == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Invalid ui layer id: '%s'\n", name);
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+		ly->meta.real.vis = !ly->meta.real.vis;
+		pcb_gui->invalidate_all();
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	}
+	else {
+		char *end;
+		int id = strtol(name, &end, 10) - 1;
+		if (*end == '\0') { /* integer layer */
+			pcb_layervis_change_group_vis(id, -1, 0);
+			pcb_gui->invalidate_all();
+			pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+			return 0;
+		}
+		else { /* virtual menu layer */
+			const pcb_menu_layers_t *ml = pcb_menu_layer_find(name);
+			if (ml != NULL) {
+				pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs);
+				*v = !(*v);
+				pcb_gui->invalidate_all();
+				pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+				return 0;
+			}
+			pcb_message(PCB_MSG_ERROR, "Invalid layer id: '%s'\n", name);
+		}
+	}
+
+	PCB_ACT_IRES(1);
+	return 0;
+}
+
+const char pcb_acts_chkview[] = "ChkView(layerid)\n";
+const char pcb_acth_chkview[] = "Return 1 if layerid is visible.";
+
+/* %start-doc actions ChkView
+Return 1 if layerid is visible. Intended for meu item 'checked' fields.
+%end-doc */
+
+static fgw_error_t pcb_act_ChkView(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layer_id_t lid;
+	pcb_layer_t *ly;
+	char *end;
+	const char *name;
+
+	PCB_ACT_CONVARG(1, FGW_STR, chkview, name = argv[1].val.str);
+
+	if (strncmp(name, "ui:", 3) == 0) {
+		pcb_layer_t *ly = pcb_uilayer_get(atoi(name+3));
+		if (ly == NULL) {
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+		PCB_ACT_IRES(ly->meta.real.vis);
+		return 0;
+	}
+
+	lid = strtol(name, &end, 10);
+
+	if (*end != '\0') {
+		const pcb_menu_layers_t *ml = pcb_menu_layer_find(name);
+
+		if (ml != NULL) {
+			pcb_bool *v = (pcb_bool *)((char *)PCB + ml->vis_offs);
+			return *v;
+		}
+
+		pcb_message(PCB_MSG_ERROR, "pcb_act_ChkView: '%s' is not a valid layer ID - check your menu file!\n", name);
+		return FGW_ERR_ARGV_TYPE;
+	}
+
+	lid--;
+	ly = pcb_get_layer(PCB->Data, lid);
+	if (ly == NULL) {
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	PCB_ACT_IRES(ly->meta.real.vis);
+	return 0;
+}
+
+
+static const char pcb_acts_setunits[] = "SetUnits(mm|mil)";
+static const char pcb_acth_setunits[] = "Set the default measurement units.";
+
+/* %start-doc actions SetUnits
+
+@table @code
+
+@item mil
+Sets the display units to mils (1/1000 inch).
+
+@item mm
+Sets the display units to millimeters.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_SetUnits(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const pcb_unit_t *new_unit;
+	const char *name;
+
+	PCB_ACT_CONVARG(1, FGW_STR, setunits, name = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	new_unit = get_unit_struct(name);
+	pcb_board_set_unit(PCB, new_unit);
+
+	return 0;
+}
+
+static const char pcb_acts_grid[] =
+	"grid(set, [name:]size[@offs][!unit])\n"
+	"grid(+|up)\n" "grid(-|down)\n" "grid(#N)\n" "grid(idx, N)\n";
+static const char pcb_acth_grid[] = "Set the grid.";
+static fgw_error_t pcb_act_grid(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op, *a;
+
+	PCB_ACT_CONVARG(1, FGW_STR, grid, op = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	if (strcmp(op, "set") == 0) {
+		pcb_grid_t dst;
+		PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str);
+		if (!pcb_grid_parse(&dst, a))
+			PCB_ACT_FAIL(grid);
+		pcb_grid_set(PCB, &dst);
+		pcb_grid_free(&dst);
+	}
+	else if ((strcmp(op, "up") == 0) || (strcmp(op, "+") == 0))
+		pcb_grid_list_step(+1);
+	else if ((strcmp(op, "down") == 0) || (strcmp(op, "-") == 0))
+		pcb_grid_list_step(-1);
+	else if (strcmp(op, "idx") == 0) {
+		PCB_ACT_CONVARG(2, FGW_STR, grid, a = argv[2].val.str);
+		pcb_grid_list_jump(atoi(a));
+	}
+	else if (op[0] == '#') {
+		pcb_grid_list_jump(atoi(op+1));
+	}
+	else
+		PCB_ACT_FAIL(grid);
+
+	return 0;
+}
+
+const char pcb_acts_chkrst[] = "ChkRst(route_style_id)\n";
+const char pcb_acth_chkrst[] = "Return 1 if route_style_id matches pen.";
+
+/* %start-doc actions ChkRst
+Return 1 if route_style_id matches pen.
+%end-doc */
+
+static fgw_error_t pcb_act_ChkRst(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int rid;
+	pcb_route_style_t *rst;
+
+	PCB_ACT_CONVARG(1, FGW_INT, chkrst, rid = argv[1].val.nat_int);
+
+	rst = vtroutestyle_get(&PCB->RouteStyle, rid, 0);
+	if (rst == NULL)
+		PCB_ACT_IRES(-1);
+	else
+		PCB_ACT_IRES(pcb_route_style_match(rst, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL));
+	return 0;
+}
+
+static const char pcb_acts_GetXY[] = "GetXY()";
+static const char pcb_acth_GetXY[] = "Get a coordinate.";
+/* %start-doc actions GetXY
+
+Prompts the user for a coordinate, if one is not already selected.
+
+%end-doc */
+static fgw_error_t pcb_act_GetXY(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	const char *msg = "Click to enter a coordinate.";
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, GetXY, msg = argv[1].val.str);
+	PCB_ACT_IRES(0);
+	pcb_hid_get_coords(msg, &x, &y, 0);
+	return 0;
+}
+
+static pcb_hid_attribute_t printer_calibrate_attrs[] = {
+	{N_("Enter Values here:"), "",
+	 PCB_HATT_LABEL, 0, 0, {0, 0, 0}, 0, 0},
+	{N_("x-calibration"), N_("X scale for calibrating your printer"),
+	 PCB_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0},
+	{N_("y-calibration"), N_("Y scale for calibrating your printer"),
+	 PCB_HATT_REAL, 0.5, 25, {0, 0, 1.00}, 0, 0}
+};
+
+static pcb_hid_attr_val_t printer_calibrate_values[3];
+
+const char pcb_acts_PrintCalibrate[] = "PrintCalibrate()";
+const char pcb_acth_PrintCalibrate[] = N_("Calibrate the printer.");
+
+/* %start-doc actions PrintCalibrate
+
+This will print a calibration page, which you would measure and type
+the measurements in, so that future printouts will be more precise.
+
+%end-doc */
+
+fgw_error_t pcb_act_PrintCalibrate(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_hid_t *printer = pcb_hid_find_printer();
+	printer->calibrate(0.0, 0.0);
+
+	if (pcb_attribute_dialog(printer_calibrate_attrs, 3, printer_calibrate_values, "Printer Calibration Values", "Enter calibration values for your printer", NULL))
+		return 1;
+	printer->calibrate(printer_calibrate_values[1].real_value, printer_calibrate_values[2].real_value);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_PromptFor[] = "PromptFor([message[,default]])";
+static const char pcb_acth_PromptFor[] = "Prompt for a response.";
+
+/* %start-doc actions PromptFor
+
+This is mostly for testing the lesstif HID interface.  The parameters
+are passed to the @code{prompt_for()} HID function, causing the user
+to be prompted for a response.  The respose is simply printed to the
+user's stdout.
+
+%end-doc */
+
+static fgw_error_t pcb_act_PromptFor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0 = NULL, *a1 = NULL;
+
+	if (pcb_gui == NULL)
+		return FGW_ERR_UNKNOWN;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, PromptFor, a0 = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, PromptFor, a1 = argv[2].val.str);
+
+	res->type = FGW_STR;
+	res->val.str = pcb_gui->prompt_for(a0, a1);
+	return 0;
+}
+
+
+pcb_action_t gui_action_list[] = {
+	{"Display", pcb_act_Display, pcb_acth_Display, pcb_acts_Display},
+	{"CycleDrag", pcb_act_CycleDrag, pcb_acth_CycleDrag, pcb_acts_CycleDrag},
+	{"FullScreen", pcb_act_FullScreen, pcb_acth_FullScreen, pcb_acts_FullScreen},
+	{"MarkCrosshair", pcb_act_MarkCrosshair, pcb_acth_MarkCrosshair, pcb_acts_MarkCrosshair},
+	{"Message", pcb_act_Message, pcb_acth_Message, pcb_acts_Message},
+	{"Mode", pcb_act_Mode, pcb_acth_Mode, pcb_acts_Mode},
+	{"SetSame", pcb_act_SetSame, pcb_acth_SetSame, pcb_acts_SetSame},
+	{"RouteStyle", pcb_act_RouteStyle, pcb_acth_RouteStyle, pcb_acts_RouteStyle},
+	{"CreateMenu", pcb_act_CreateMenu, pcb_acth_CreateMenu, pcb_acts_CreateMenu},
+	{"RemoveMenu", pcb_act_RemoveMenu, pcb_acth_RemoveMenu, pcb_acts_RemoveMenu},
+	{"SelectLayer", pcb_act_SelectLayer, pcb_acth_selectlayer, pcb_acts_selectlayer},
+	{"ChkLayer", pcb_act_ChkLayer, pcb_acth_chklayer, pcb_acts_chklayer},
+	{"SwitchHID", pcb_act_SwitchHID, pcb_acth_SwitchHID, pcb_acts_SwitchHID},
+	{"ToggleView", pcb_act_ToggleView, pcb_acth_toggleview, pcb_acts_toggleview},
+	{"ChkView", pcb_act_ChkView, pcb_acth_chkview, pcb_acts_chkview},
+	{"Cursor", pcb_act_Cursor, pcb_acth_Cursor, pcb_acts_Cursor},
+	{"EditLayer", pcb_act_EditLayer, pcb_acth_EditLayer, pcb_acts_EditLayer},
+	{"EditGroup", pcb_act_EditGroup, pcb_acth_EditGroup, pcb_acts_EditGroup},
+	{"DelGroup",  pcb_act_DelGroup, pcb_acth_DelGroup, pcb_acts_DelGroup},
+	{"Grid", pcb_act_grid, pcb_acth_grid, pcb_acts_grid},
+	{"SetUnits", pcb_act_SetUnits, pcb_acth_setunits, pcb_acts_setunits},
+	{"ChkRst", pcb_act_ChkRst, pcb_acth_chkrst, pcb_acts_chkrst},
+	{"GetXY", pcb_act_GetXY, pcb_acth_GetXY, pcb_acts_GetXY},
+	{"PrintCalibrate", pcb_act_PrintCalibrate, pcb_acth_PrintCalibrate, pcb_acts_PrintCalibrate},
+	{"PromptFor", pcb_act_PromptFor, pcb_acth_PromptFor, pcb_acts_PromptFor}
+};
+
+PCB_REGISTER_ACTIONS(gui_action_list, NULL)
Index: tags/2.0.1/src/heap.c
===================================================================
--- tags/2.0.1/src/heap.c	(nonexistent)
+++ tags/2.0.1/src/heap.c	(revision 18980)
@@ -0,0 +1,233 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, heap.c, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+
+/* operations on heaps. */
+
+#include <stdlib.h>
+#include <assert.h>
+#include "config.h"
+#include "heap.h"
+
+/* define this for more thorough self-checking of data structures */
+#undef SLOW_ASSERTIONS
+
+struct heap_element {
+	pcb_cost_t cost;
+	void *data;
+};
+struct pcb_heap_s {
+	struct heap_element *element;
+	int size, max;
+};
+
+static pcb_cost_t MIN_COST = 0;
+
+/* ---------------------------------------------------------------------------
+ * functions.
+ */
+/* helper functions for assertions */
+#ifndef NDEBUG
+#ifdef SLOW_ASSERTIONS
+static int __heap_is_good_slow(pcb_heap_t * heap)
+{
+	int i;
+	/* heap condition: key in each node should be smaller than in its children */
+	/* alternatively (and this is what we check): key in each node should be
+	 * larger than (or equal to) key of its parent. */
+	/* note that array element[0] is not used (except as a sentinel) */
+	for (i = 2; i < heap->size; i++)
+		if (heap->element[i].cost < heap->element[i / 2].cost)
+			return 0;
+	return 1;
+}
+#endif /* SLOW_ASSERTIONS */
+static int __heap_is_good(pcb_heap_t * heap)
+{
+	return heap && (heap->max == 0 || heap->element) &&
+		(heap->max >= 0) && (heap->size >= 0) && (heap->max == 0 || heap->size < heap->max) &&
+#ifdef SLOW_ASSERTIONS
+		__heap_is_good_slow(heap) &&
+#endif
+		1;
+}
+#endif /* ! NDEBUG */
+
+/* create an empty heap */
+pcb_heap_t *pcb_heap_create()
+{
+	pcb_heap_t *heap;
+	/* initialize MIN_COST if necessary */
+	if (MIN_COST == 0)
+		MIN_COST = -1e23;
+	assert(MIN_COST < 0);
+	/* okay, create empty heap */
+	heap = (pcb_heap_t *) calloc(1, sizeof(*heap));
+	assert(heap);
+	assert(__heap_is_good(heap));
+	return heap;
+}
+
+/* destroy a heap */
+void pcb_heap_destroy(pcb_heap_t ** heap)
+{
+	assert(heap && *heap);
+	assert(__heap_is_good(*heap));
+	if ((*heap)->element)
+		free((*heap)->element);
+	free(*heap);
+	*heap = NULL;
+}
+
+/* free all elements in the heap */
+void pcb_heap_free(pcb_heap_t * heap, void (*freefunc) (void *))
+{
+	assert(heap);
+	assert(__heap_is_good(heap));
+	for (; heap->size; heap->size--) {
+		if (heap->element[heap->size].data)
+			freefunc(heap->element[heap->size].data);
+	}
+}
+
+/* -- mutation -- */
+static void __upheap(pcb_heap_t * heap, int k)
+{
+	struct heap_element v;
+
+	assert(heap && heap->size < heap->max);
+	assert(k <= heap->size);
+
+	v = heap->element[k];
+	heap->element[0].cost = MIN_COST;
+	for (v = heap->element[k]; heap->element[k / 2].cost > v.cost; k = k / 2)
+		heap->element[k] = heap->element[k / 2];
+	heap->element[k] = v;
+}
+
+void pcb_heap_insert(pcb_heap_t * heap, pcb_cost_t cost, void *data)
+{
+	assert(heap && __heap_is_good(heap));
+	assert(cost >= MIN_COST);
+
+	/* determine whether we need to grow the heap */
+	if (heap->size + 1 >= heap->max) {
+		heap->max *= 2;
+		if (heap->max == 0)
+			heap->max = 256;					/* default initial heap size */
+		heap->element = (struct heap_element *) realloc(heap->element, heap->max * sizeof(*heap->element));
+	}
+	heap->size++;
+	assert(heap->size < heap->max);
+	heap->element[heap->size].cost = cost;
+	heap->element[heap->size].data = data;
+	__upheap(heap, heap->size);		/* fix heap condition violation */
+	assert(__heap_is_good(heap));
+	return;
+}
+
+/* this procedure moves down the heap, exchanging the node at position
+ * k with the smaller of its two children as necessary and stopping when
+ * the node at k is smaller than both children or the bottom is reached.
+ */
+static void __downheap(pcb_heap_t * heap, int k)
+{
+	struct heap_element v;
+
+	assert(heap && heap->size < heap->max);
+	assert(k <= heap->size);
+
+	v = heap->element[k];
+	while (k <= heap->size / 2) {
+		int j = k + k;
+		if (j < heap->size && heap->element[j].cost > heap->element[j + 1].cost)
+			j++;
+		if (v.cost < heap->element[j].cost)
+			break;
+		heap->element[k] = heap->element[j];
+		k = j;
+	}
+	heap->element[k] = v;
+}
+
+void *pcb_heap_remove_smallest(pcb_heap_t * heap)
+{
+	struct heap_element v;
+	assert(heap && __heap_is_good(heap));
+	assert(heap->size > 0);
+	assert(heap->max > 1);
+
+	v = heap->element[1];
+	heap->element[1] = heap->element[heap->size--];
+	if (heap->size > 0)
+		__downheap(heap, 1);
+
+	assert(__heap_is_good(heap));
+	return v.data;
+}
+
+void *pcb_heap_replace(pcb_heap_t * heap, pcb_cost_t cost, void *data)
+{
+	assert(heap && __heap_is_good(heap));
+
+	if (pcb_heap_is_empty(heap))
+		return data;
+
+	assert(heap->size > 0);
+	assert(heap->max > 1);
+
+	heap->element[0].cost = cost;
+	heap->element[0].data = data;
+	__downheap(heap, 0);					/* ooh, tricky! */
+
+	assert(__heap_is_good(heap));
+	return heap->element[0].data;
+}
+
+/* -- interrogation -- */
+int pcb_heap_is_empty(pcb_heap_t * heap)
+{
+	assert(__heap_is_good(heap));
+	return heap->size == 0;
+}
+
+/* -- size -- */
+int pcb_heap_size(pcb_heap_t * heap)
+{
+	assert(__heap_is_good(heap));
+	return heap->size;
+}
Index: tags/2.0.1/src/heap.h
===================================================================
--- tags/2.0.1/src/heap.h	(nonexistent)
+++ tags/2.0.1/src/heap.h	(revision 18980)
@@ -0,0 +1,68 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, heap.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* Heap used by the polygon code and autoroute */
+
+#ifndef PCB_HEAP_H
+#define PCB_HEAP_H
+
+#include "config.h"
+
+/* type of heap costs */
+typedef double pcb_cost_t;
+/* what a heap looks like */
+typedef struct pcb_heap_s pcb_heap_t;
+
+/* create an empty heap */
+pcb_heap_t *pcb_heap_create();
+/* destroy a heap */
+void pcb_heap_destroy(pcb_heap_t ** heap);
+/* free all elements in a heap */
+void pcb_heap_free(pcb_heap_t * heap, void (*funcfree) (void *));
+
+/* -- mutation -- */
+void pcb_heap_insert(pcb_heap_t * heap, pcb_cost_t cost, void *data);
+void *pcb_heap_remove_smallest(pcb_heap_t * heap);
+/* replace the smallest item with a new item and return the smallest item.
+ * (if the new item is the smallest, than return it, instead.) */
+void *pcb_heap_replace(pcb_heap_t * heap, pcb_cost_t cost, void *data);
+
+/* -- interrogation -- */
+int pcb_heap_is_empty(pcb_heap_t * heap);
+int pcb_heap_size(pcb_heap_t * heap);
+
+#endif /* PCB_HEAP_H */
Index: tags/2.0.1/src/hid.h
===================================================================
--- tags/2.0.1/src/hid.h	(nonexistent)
+++ tags/2.0.1/src/hid.h	(revision 18980)
@@ -0,0 +1,611 @@
+#ifndef PCB_HID_H
+#define PCB_HID_H
+
+#include <stdarg.h>
+#include <liblihata/dom.h>
+
+#include "config.h"
+#include "error.h"
+#include "drc.h"
+#include "global_typedefs.h"
+#include "attrib.h"
+#include "layer.h"
+#include "layer_grp.h"
+
+/* attribute dialog properties */
+typedef enum pcb_hat_property_e {
+	PCB_HATP_GLOBAL_CALLBACK,
+	PCB_HATP_max
+} pcb_hat_property_t;
+
+
+typedef enum {
+	PCB_HID_MOUSE_PRESS,
+	PCB_HID_MOUSE_RELEASE,
+	PCB_HID_MOUSE_MOTION,
+	PCB_HID_MOUSE_POPUP  /* "right click", open context-specific popup */
+} pcb_hid_mouse_ev_t;
+
+
+typedef struct pcb_hid_attr_val_s  pcb_hid_attr_val_t;
+typedef struct pcb_hid_attribute_s pcb_hid_attribute_t;
+
+/* Human Interface Device */
+
+/*
+
+The way the HID layer works is that you instantiate a HID device
+structure, and invoke functions through its members.  Code in the
+common part of PCB may *not* rely on *anything* other than what's
+defined in this file.  Code in the HID layers *may* rely on data and
+functions in the common code (like, board size and such) but it's
+considered bad form to do so when not needed.
+
+Coordinates are ALWAYS in pcb's default resolution (1/100 mil at the
+moment).  Positive X is right, positive Y is down.  Angles are
+degrees, with 0 being right (positive X) and 90 being up (negative Y).
+All zoom, scaling, panning, and conversions are hidden inside the HID
+layers.
+
+The main structure is at the end of this file.
+
+Data structures passed to the HIDs will be copied if the HID needs to
+save them.  Data structures returned from the HIDs must not be freed,
+and may be changed by the HID in response to new information.
+
+*/
+
+/* Line end cap styles.  The cap *always* extends beyond the
+   coordinates given, by half the width of the line. */
+typedef enum {
+	pcb_cap_invalid = -1,
+	pcb_cap_square,        /* square pins or pads when drawn using a line */
+	pcb_cap_round          /* for normal traces, round pins */
+} pcb_cap_style_t;
+
+/* The HID may need something more than an "int" for colors, timers,
+   etc.  So it passes/returns one of these, which is castable to a
+   variety of things.  */
+typedef union {
+	long lval;
+	void *ptr;
+} pcb_hidval_t;
+
+typedef struct {
+	pcb_coord_t width;     /* as set by set_line_width */
+	pcb_cap_style_t cap;   /* as set by set_line_cap */
+	int xor;               /* as set by set_draw_xor */
+	int faded;             /* as set by set_draw_faded */
+} pcb_core_gc_t;
+
+/* This graphics context is an opaque pointer defined by the HID.  GCs
+   are HID-specific; attempts to use one HID's GC for a different HID
+   will result in a fatal error.  The first field must be:
+   pcb_core_gc_t core_gc; */
+typedef struct hid_gc_s *pcb_hid_gc_t;
+
+
+#define PCB_HIDCONCAT(a,b) a##b
+
+/* File Watch flags */
+/* Based upon those in dbus/dbus-connection.h */
+typedef enum {
+	PCB_WATCH_READABLE = 1 << 0,
+														 /**< As in POLLIN */
+	PCB_WATCH_WRITABLE = 1 << 1,
+														 /**< As in POLLOUT */
+	PCB_WATCH_ERROR = 1 << 2,	 /**< As in POLLERR */
+	PCB_WATCH_HANGUP = 1 << 3	 /**< As in POLLHUP */
+} pcb_watch_flags_t;
+
+/* DRC GUI Hooks */
+typedef struct {
+	int log_drc_overview;
+	int log_drc_violations;
+	void (*reset_drc_dialog_message) (void);
+	void (*append_drc_violation) (pcb_drc_violation_t *violation);
+	int (*throw_drc_dialog) (void);
+} pcb_hid_drc_gui_t;
+
+typedef enum pcb_composite_op_s {
+	PCB_HID_COMP_RESET,         /* reset (allocate and clear) the sketch canvas */
+	PCB_HID_COMP_POSITIVE,      /* draw subsequent objects in positive, with color, no XOR allowed */
+	PCB_HID_COMP_POSITIVE_XOR,  /* draw subsequent objects in positive, with color, XOR allowed */
+	PCB_HID_COMP_NEGATIVE,      /* draw subsequent objects in negative, ignore color */
+	PCB_HID_COMP_FLUSH          /* combine the sketch canvas onto the output buffer and discard the sketch canvas */
+} pcb_composite_op_t;
+
+typedef enum pcb_burst_op_s {
+	PCB_HID_BURST_START,
+	PCB_HID_BURST_END
+} pcb_burst_op_t;
+
+typedef enum pcb_hid_attr_ev_e {
+	PCB_HID_ATTR_EV_CANCEL = 0,
+	PCB_HID_ATTR_EV_OK = 1,
+	PCB_HID_ATTR_EV_WINCLOSE
+} pcb_hid_attr_ev_t;
+
+/* Optional fields of a menu item; all non-NULL fields are strdup'd in the HID. */
+typedef struct pcb_menu_prop_s {
+	const char *action;
+	const char *mnemonic;
+	const char *accel;
+	const char *tip;        /* tooltip */
+	const char *checked;
+	const char *update_on;
+	const char *foreground;
+	const char *background;
+	const char *cookie;     /* used for cookie based removal */
+} pcb_menu_prop_t;
+
+typedef struct pcb_hid_s pcb_hid_t;
+
+/* This is the main HID structure.  */
+struct pcb_hid_s {
+	/* The size of this structure.  We use this as a compatibility
+	   check; a HID built with a different hid.h than we're expecting
+	   should have a different size here.  */
+	int struct_size;
+
+	/* The name of this HID.  This should be suitable for
+	   command line options, multi-selection menus, file names,
+	   etc. */
+	const char *name;
+
+	/* Likewise, but allowed to be longer and more descriptive.  */
+	const char *description;
+
+	/* The hid may use this field to store its context. */
+	void *user_context;
+
+	/* If set, this is the GUI HID.  Exactly one of these three flags
+	   must be set; setting "gui" lets the expose callback optimize and
+	   coordinate itself.  */
+	unsigned gui:1;
+
+	/* If set, this is the printer-class HID.  The common part of PCB
+	   may use this to do command-line printing, without having
+	   instantiated any GUI HIDs.  Only one printer HID is normally
+	   defined at a time.  */
+	unsigned printer:1;
+
+	/* If set, this HID provides an export option, and should be used as
+	   part of the File->Export menu option.  Examples are PNG, Gerber,
+	   and EPS exporters.  */
+	unsigned exporter:1;
+
+	/* If set, draw the mask layer inverted. Normally the mask is a filled
+	   rectangle over the board with cutouts at pins/pads. The HIDs
+	   use render in normal mode, gerber renders in inverse mode. */
+	unsigned mask_invert:1;
+
+	/* lesstif allows positive AND negative drawing in HID_MASK_CLEAR.
+	   gtk only allows negative drawing.
+	   using the mask is to get rat transparency */
+	unsigned can_mask_clear_rats:1;
+
+	/* Always draw layers in compositing mode - no base layer */
+	unsigned force_compositing:1;
+
+	/* Returns a set of resources describing options the export or print
+	   HID supports.  In GUI mode, the print/export dialogs use this to
+	   set up the selectable options.  In command line mode, these are
+	   used to interpret command line options.  If n_ret_ is non-NULL,
+	   the number of attributes is stored there.  */
+	pcb_hid_attribute_t *(*get_export_options)(int *n_ret);
+
+	/* Exports (or print) the current PCB.  The options given represent
+	   the choices made from the options returned from
+	   get_export_options.  Call with options_ == NULL to start the
+	   primary GUI (create a main window, print, export, etc)  */
+	void (*do_export)(pcb_hid_attr_val_t *options);
+
+	/* uninit a GUI hid */
+	void (*uninit)(pcb_hid_t *hid);
+
+	/* uninit a GUI hid */
+	void (*do_exit)(pcb_hid_t *hid);
+
+	/* Parses the command line.  Call this early for whatever HID will be
+	   the primary HID, as it will set all the registered attributes.
+	   The HID should remove all arguments, leaving any possible file
+	   names behind. Returns 0 on success, positive for recoverable errors
+	   (no change in argc or argv) and negative for unrecoverable errors.  */
+	int (*parse_arguments)(int *argc, char ***argv);
+
+	/* This may be called to ask the GUI to force a redraw of a given area */
+	void (*invalidate_lr)(pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom);
+	void (*invalidate_all)(void);
+	void (*notify_crosshair_change)(pcb_bool changes_complete);
+	void (*notify_mark_change)(pcb_bool changes_complete);
+
+	/* During redraw or print/export cycles, this is called once per layer group
+	   (physical layer); layer is the first layer in the group.
+	   TODO: The group may be -1 until the layer rewrite is finished.
+	   If it returns false (zero), the HID does not want that layer, and none of
+	   the drawing functions should be called.  If it returns pcb_true (nonzero),
+	   the items in that layer [group] should be drawn using the various drawing
+	   functions.  In addition to the copper layer groups, you may select virtual
+	   layers. The is_empty argument is a hint - if set, the layer is empty, if
+	   zero it may be non-empty. */
+	int (*set_layer_group)(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
+
+	/* Tell the GUI the layer last selected has been finished with. */
+	void (*end_layer)(void);
+
+	/* Drawing Functions.  Coordinates and distances are ALWAYS in PCB's
+	   default coordinates (1/100 mil at the time this comment was
+	   written).  Angles are always in degrees, with 0 being "right"
+	   (positive X) and 90 being "up" (positive Y).  */
+
+	/* Make an empty graphics context.  */
+	pcb_hid_gc_t (*make_gc)(void);
+	void (*destroy_gc)(pcb_hid_gc_t gc);
+
+	/* Composite layer drawing: manipulate the sketch canvas and set
+	   positive or negative drawing mode. The canvas covers the screen box. */
+	void (*set_drawing_mode)(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen);
+
+	/* Announce start/end of a render burst for a specific screen screen box;
+	   A GUI hid should set the coord_per_pix value here for proper optimization. */
+	void (*render_burst)(pcb_burst_op_t op, const pcb_box_t *screen);
+
+	/* Sets a color.  Names can be like "red" or "#rrggbb" or special
+	   names like "drill". Always use the "drill" color to draw holes.
+	   You may assume this is cheap enough to call inside the redraw
+	   callback, but not cheap enough to call for each item drawn. */
+	void (*set_color)(pcb_hid_gc_t gc, const char *name);
+
+	/* Sets the line style.  While calling this is cheap, calling it with
+	   different values each time may be expensive, so grouping items by
+	   line style is helpful.  */
+	void (*set_line_cap)(pcb_hid_gc_t gc, pcb_cap_style_t style);
+	void (*set_line_width)(pcb_hid_gc_t gc, pcb_coord_t width);
+	void (*set_draw_xor)(pcb_hid_gc_t gc, int xor);
+	/* Blends 20% or so color with 80% background.  Only used for
+	   assembly drawings so far. */
+	void (*set_draw_faded)(pcb_hid_gc_t gc, int faded);
+
+	/* The usual drawing functions.  "draw" means to use segments of the
+	   given width, whereas "fill" means to fill to a zero-width
+	   outline.  */
+	void (*draw_line)(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+	void (*draw_arc)(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle);
+	void (*draw_rect)(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+	void (*fill_circle)(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+	void (*fill_polygon)(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y);
+	void (*fill_polygon_offs)(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+	void (*fill_pcb_polygon)(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box);
+	void (*thindraw_pcb_polygon)(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box);
+	void (*fill_rect)(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+
+
+	/* This is for the printer.  If you call this for the GUI, xval_ and
+	   yval_ are ignored, and a dialog pops up to lead you through the
+	   calibration procedure.  For the printer, if xval_ and yval_ are
+	   zero, a calibration page is printed with instructions for
+	   calibrating your printer.  After calibrating, nonzero xval_ and
+	   yval_ are passed according to the instructions.  Metric is nonzero
+	   if the user prefers metric units, else inches are used. */
+	void (*calibrate)(double xval, double yval);
+
+
+	/* GUI layout functions.  Not used or defined for print/export
+	   HIDs.  */
+
+	/* Temporary */
+	int (*shift_is_pressed)(void);
+	int (*control_is_pressed)(void);
+	int (*mod1_is_pressed)(void);
+
+	void (*get_coords)(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force);
+
+	/* Fill in width and height with the sizes of the current view in
+	   pcb coordinates. used by action "Cursor" to determine max cursor pos.
+	   Width and height are never NULL. */
+	void (*get_view_size)(pcb_coord_t *width, pcb_coord_t *height);
+
+	/* Sets the crosshair, which may differ from the pointer depending
+	   on grid and pad snap.  Note that the HID is responsible for
+	   hiding, showing, redrawing, etc.  The core just tells it what
+	   coordinates it's actually using.  Note that this routine may
+	   need to know what "pcb units" are so it can display them in mm
+	   or mils accordingly.  If cursor_action_ is set, the cursor or
+	   screen may be adjusted so that the cursor and the crosshair are
+	   at the same point on the screen.  */
+	void (*set_crosshair)(pcb_coord_t x, pcb_coord_t y, int cursor_action);
+#define HID_SC_DO_NOTHING	0
+#define HID_SC_WARP_POINTER	1
+#define HID_SC_PAN_VIEWPORT	2
+
+	/* Causes func to be called at some point in the future.  Timers are
+	   only good for *one* call; if you want it to repeat, add another
+	   timer during the callback for the first.  user_data_ can be
+	   anything, it's just passed to func.  Times are not guaranteed to
+	   be accurate.  */
+	pcb_hidval_t (*add_timer) (void (*func)(pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data);
+	/* Use this to stop a timer that hasn't triggered yet.  */
+	void (*stop_timer) (pcb_hidval_t timer);
+
+	/* Causes func_ to be called when some condition occurs on the file
+	   descriptor passed. Conditions include data for reading, writing,
+	   hangup, and errors. user_data_ can be anything, it's just passed
+	   to func. If the watch function returns pcb_true, the watch is kept, else
+	   it is removed. */
+	pcb_hidval_t (*watch_file)(int fd, unsigned int condition, pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data), pcb_hidval_t user_data);
+
+	/* Use this to stop a file watch; must not be called from within a GUI callback! */
+	void (*unwatch_file) (pcb_hidval_t watch);
+
+	/* Causes func_ to be called in the mainloop prior to blocking */
+	pcb_hidval_t (*add_block_hook)(void (*func)(pcb_hidval_t data), pcb_hidval_t data);
+	/* Use this to stop a mainloop block hook. */
+	void (*stop_block_hook) (pcb_hidval_t block_hook);
+
+	/* Various dialogs */
+
+	/* Logs a message to the log window.  */
+	void (*log)(const char *fmt, ...);
+	void (*logv)(enum pcb_message_level, const char *fmt, va_list args);
+
+	/* A generic yes/no dialog.  Returns zero if the cancel button is
+	   pressed, one for the OK button.  If you specify alternate labels
+	   for ..., they are used instead of the default OK/Cancel ones, and
+	   the return value is the index of the label chosen.  You MUST pass
+	   NULL as the last parameter to this.  */
+	int (*confirm_dialog)(const char *msg, ...);
+
+	/* A close confirmation dialog for unsaved pages, for example, with
+	   options "Close without saving", "Cancel" and "Save". Returns zero
+	   if the close is cancelled, or one if it should proceed. The HID
+	   is responsible for any "Save" action the user may wish before
+	   confirming the close.
+	 */
+	int (*close_confirm_dialog)();
+#define HID_CLOSE_CONFIRM_CANCEL 0
+#define HID_CLOSE_CONFIRM_OK     1
+
+	/* Just prints text.  */
+	void (*report_dialog)(const char *title, const char *msg);
+
+	/* Prompts the user to enter a string, returns the string.  If
+	   default_string isn't NULL, the form is pre-filled with this
+	   value.  "msg" is like "Enter value:".  Returns NULL on cancel. */
+	char *(*prompt_for)(const char *msg, const char *default_string);
+
+	/* Prompts the user for a filename or directory name.  For GUI
+	   HID's this would mean a file select dialog box.  The 'flags'
+	   argument is the bitwise OR of the following values.  */
+#define HID_FILESELECT_READ  0x01
+
+	/* The function calling hid->fileselect will deal with the case
+	   where the selected file already exists.  If not given, then the
+	   GUI will prompt with an "overwrite?" prompt.  Only used when
+	   writing.
+	 */
+#define HID_FILESELECT_MAY_NOT_EXIST 0x02
+
+	/* The call is supposed to return a file template (for gerber
+	   output for example) instead of an actual file.  Only used when
+	   writing.
+	 */
+#define HID_FILESELECT_IS_TEMPLATE 0x04
+
+	/* title_ may be used as a dialog box title.  Ignored if NULL.
+	 *
+	 * descr_ is a longer help string.  Ignored if NULL.
+	 *
+	 * default_file_ is the default file name.  Ignored if NULL.
+	 *
+	 * default_ext_ is the default file extension, like ".pdf".
+	 * Ignored if NULL.
+	 *
+	 * history_tag_ may be used by the GUI to keep track of file
+	 * history.  Examples would be "board", "vendor", "renumber",
+	 * etc.  If NULL, no specific history is kept.
+	 *
+	 * flags_ are the bitwise OR of the HID_FILESELECT defines above
+	 */
+
+	char *(*fileselect)(const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags);
+
+	/* A generic dialog to ask for a set of attributes.  If n_attrs_ is
+	   zero, attrs_(.name) must be NULL terminated.  Returns non-zero if
+	   an error occurred (usually, this means the user cancelled the
+	   dialog or something). title_ is the title of the dialog box
+	   descr_ (if not NULL) can be a longer description of what the
+	   attributes are used for.  The HID may choose to ignore it or it
+	   may use it for a tooltip or text in a dialog box, or a help
+	   string.
+	 */
+	int (*attribute_dialog)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+
+	/* The same API in 3 stages: */
+	void *(*attr_dlg_new)(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev)); /* returns hid_ctx */
+	int (*attr_dlg_run)(void *hid_ctx);
+	void (*attr_dlg_free)(void *hid_ctx); /* results_ is avalibale after this call */
+
+	/* Set a property of an attribute dialog (typical call is between
+	   attr_dlg_new() and attr_dlg_run()) */
+	void (*attr_dlg_property)(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
+
+
+	/* Disable or enable a widget of an active attribute dialog */
+	int (*attr_dlg_widget_state)(void *hid_ctx, int idx, pcb_bool enabled);
+
+	/* hide or show a widget of an active attribute dialog */
+	int (*attr_dlg_widget_hide)(void *hid_ctx, int idx, pcb_bool hide);
+
+	/* Change the current value of a widget; same as if the user chaged it,
+	   except the value-changed callback is inhibited */
+	int (*attr_dlg_set_value)(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val);
+
+
+	/* This causes a second window to display, which only shows the
+	   selected item_. The expose callback is called twice; once to size
+	   the extents of the item, and once to draw it.  To pass magic
+	   values, pass the address of a variable created for this
+	   purpose.  */
+	void (*show_item)(void *item);
+
+	/* Something to alert the user.  */
+	void (*beep)(void);
+
+	/* Used by optimizers and autorouter to show progress to the user.
+	   Pass all zeros to flush display and remove any dialogs.
+	   Returns nonzero if the user wishes to cancel the operation.  */
+	int (*progress)(int so_far, int total, const char *message);
+
+	pcb_hid_drc_gui_t *drc_gui;
+
+	void (*edit_attributes)(const char *owner, pcb_attribute_list_t *attrlist);
+
+	/* Notification to the GUI around saving the PCB file.
+	 *
+	 * Called with a false parameter before the save, called again
+	 * with pcb_true after the save.
+	 *
+	 * Allows GUIs which watch for file-changes on disk to ignore
+	 * our deliberate changes.
+	 */
+	void (*notify_save_pcb)(const char *filename, pcb_bool done);
+
+	/* Notification to the GUI that the PCB file has been renamed. */
+	void (*notify_filename_changed)(void);
+
+	/* Creates a new menu and/or submenus
+	 * menu_path is a / separated path to the new menu (parents are silently created).
+	 * The last non-NULL item is the new menu item.
+	 * action, mnemonic, accel and tip affect the new menu item.
+	 * Cookie is strdup()'d into the lihata tree and can be used later to search
+	 * and remove menu items that are no longer needed.
+	 * If action is NULL, the menu may get submenus.
+	 */
+	void (*create_menu)(const char *menu_path, const pcb_menu_prop_t *props);
+
+	/* Removes a menu recursively */
+	int (*remove_menu)(const char *menu_path);
+	int (*remove_menu_node)(lht_node_t *nd);
+
+	/* Update the state of all checkboxed menus whose luhata
+	   node cookie matches cookie (or all checkboxed menus globally if cookie
+	   is NULL) */
+	void (*update_menu_checkbox)(const char *cookie);
+
+	/* Pointer to the hid's configuration - useful for plugins and core wanting to install menus at anchors */
+	pcb_hid_cfg_t *hid_cfg;
+
+
+	/* Optional: print usage string (if accepts command line arguments)
+	   Subtopic:
+	     NULL    print generic help
+	     string  print summary for the topic in string
+	   Return 0 on success.
+	*/
+	int (*usage)(const char *subtopic);
+
+
+	/* Optional: change cursor to indicate if an object is grabbed (or not) */
+	void (*point_cursor)(pcb_bool grabbed);
+
+	/*** PROPEDIT (optional) ****/
+	/* Optional: start a propedit session: a series of propedit calls will follow
+	   Return 0 on success; non-zero aborts the session.
+	*/
+	int (*propedit_start)(void *pe, int num_props, const char *(*query)(void *pe, const char *cmd, const char *key, const char *val, int idx));
+
+	/* Optional: end a propedit session: all data has been sent, no more; this call
+	   should present and run the user dialog and should return, only when the
+	   propedit section can be closed. */
+	void (*propedit_end)(void *pe);
+
+	/* Optional: registers a new property
+	   Returns a prop context passed with each value
+	*/
+	void *(*propedit_add_prop)(void *pe, const char *propname, int is_mutable, int num_vals);
+
+	/* Optional: registers a new value for a property */
+	void (*propedit_add_value)(void *pe, const char *propname, void *propctx, const char *value, int repeat_cnt);
+
+	/* Optional: registers statistical info for a property */
+	void (*propedit_add_stat)(void *pe, const char *propname, void *propctx, const char *most_common, const char *min, const char *max, const char *avg);
+
+	/* Optional: when non-zero, the core renderer may decide to draw cheaper
+	   (simplified) approximation of some objects that would end up being too
+	   small. For a GUI, this should depend on the zoom level */
+	pcb_coord_t coord_per_pix;
+
+	/* If ovr is not NULL:
+	    - overwrite the command etry with ovr
+	    - if cursor is not NULL, set the cursor after the overwrite
+	   If ovr is NULL:
+	    - if cursor is not NULL, load the value with the cursor (or -1 if not supported)
+	   Return the current command entry content in a read-only string */
+	const char *(*command_entry)(const char *ovr, int *cursor);
+};
+
+/* One of these functions (in the common code) will be called whenever the GUI
+   needs to redraw the screen, print the board, or export a layer.
+
+   Each time func is called, it should do the following:
+
+   * allocate any colors needed, via get_color.
+
+   * cycle through the layers, calling set_layer for each layer to be
+     drawn, and only drawing objects (all or specified) of desired
+     layers.
+
+   Do *not* assume that the hid that is passed is the GUI hid.  This
+   callback is also used for printing and exporting. */
+
+typedef struct pcb_hid_expose_ctx_s pcb_hid_expose_ctx_t;
+
+typedef void (*pcb_hid_dialog_draw_t)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e);
+
+struct pcb_hid_expose_ctx_s {
+	pcb_box_t view;
+	unsigned force:1; /* draw even if layer set fails */
+	union {
+		pcb_layer_id_t layer_id;
+		pcb_any_obj_t *obj;
+	} content;
+
+	/* for PCB_LYT_DIALOG */
+	pcb_hid_dialog_draw_t dialog_draw;
+};
+
+typedef void (*pcb_hid_expose_t)(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ctx);
+
+/* Normal expose: draw all layers with all flags (no .content is used) */
+void pcb_hid_expose_all(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *region);
+
+/* Pinout preview expose: draws a subc; content.elem is used */
+void pcb_hid_expose_pinout(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *element);
+
+
+/* Layer preview expose: draws a single layer; content.layer_id is used */
+void pcb_hid_expose_layer(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *ly);
+
+
+/* This is initially set to a "no-gui" GUI, and later reset by
+   main. hid_expose_callback also temporarily set it for drawing. */
+extern pcb_hid_t *pcb_gui;
+
+/* When not NULL, auto-start the next GUI after the current one quits */
+extern pcb_hid_t *pcb_next_gui;
+
+/* This is either NULL or points to the current HID that is being called to
+   do the exporting. The GUI HIDs set and unset this var.*/
+extern pcb_hid_t *pcb_exporter;
+
+/* This is either NULL or points to the current pcb_action_t that is being
+   called. The action launcher sets and unsets this variable. */
+extern const pcb_action_t *pcb_current_action;
+
+/* The GUI may set this to be approximately the PCB size of a pixel,
+   to allow for near-misses in selection and changes in drawing items
+   smaller than a screen pixel.  */
+extern int pcb_pixel_slop;
+
+#endif
Index: tags/2.0.1/src/hid_attrib.c
===================================================================
--- tags/2.0.1/src/hid_attrib.c	(nonexistent)
+++ tags/2.0.1/src/hid_attrib.c	(revision 18980)
@@ -0,0 +1,300 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "hid_attrib.h"
+#include "misc_util.h"
+#include "pcb-printf.h"
+
+pcb_hid_attr_node_t *hid_attr_nodes = 0;
+
+void pcb_hid_register_attributes(pcb_hid_attribute_t * a, int n, const char *cookie, int copy)
+{
+	pcb_hid_attr_node_t *ha;
+
+	/* printf("%d attributes registered\n", n); */
+	ha = malloc(sizeof(pcb_hid_attr_node_t));
+	ha->next = hid_attr_nodes;
+	hid_attr_nodes = ha;
+	ha->attributes = a;
+	ha->n = n;
+	ha->cookie = cookie;
+}
+
+void pcb_hid_attributes_uninit(void)
+{
+	pcb_hid_attr_node_t *ha, *next;
+	for (ha = hid_attr_nodes; ha; ha = next) {
+		next = ha->next;
+		if (ha->cookie != NULL)
+			fprintf(stderr, "WARNING: attribute %s by %s is not uninited, check your plugins' uninit!\n", ha->attributes->name, ha->cookie);
+		free(ha);
+	}
+	hid_attr_nodes = NULL;
+}
+
+void pcb_hid_remove_attributes_by_cookie(const char *cookie)
+{
+	pcb_hid_attr_node_t *ha, *next, *prev = NULL;
+	for (ha = hid_attr_nodes; ha; ha = next) {
+		next = ha->next;
+		if (ha->cookie == cookie) {
+			if (prev == NULL)
+				hid_attr_nodes = next;
+			else
+				prev->next = next;
+			free(ha);
+		}
+		else
+			prev = ha;
+	}
+}
+
+int pcb_hid_parse_command_line(int *argc, char ***argv)
+{
+	pcb_hid_attr_node_t *ha;
+	int i, e, ok;
+	char *filename = NULL;
+
+	for (ha = hid_attr_nodes; ha; ha = ha->next)
+		for (i = 0; i < ha->n; i++) {
+			pcb_hid_attribute_t *a = ha->attributes + i;
+			switch (a->type) {
+			case PCB_HATT_LABEL:
+				break;
+			case PCB_HATT_INTEGER:
+				if (a->value)
+					*(int *) a->value = a->default_val.int_value;
+				break;
+			case PCB_HATT_COORD:
+				if (a->value)
+					*(pcb_coord_t *) a->value = a->default_val.coord_value;
+				break;
+			case PCB_HATT_BOOL:
+				if (a->value)
+					*(char *) a->value = a->default_val.int_value;
+				break;
+			case PCB_HATT_REAL:
+				if (a->value)
+					*(double *) a->value = a->default_val.real_value;
+				break;
+			case PCB_HATT_STRING:
+				if (a->value)
+					*(const char **) a->value = a->default_val.str_value;
+				break;
+			case PCB_HATT_ENUM:
+				if (a->value)
+					*(int *) a->value = a->default_val.int_value;
+				break;
+			case PCB_HATT_UNIT:
+				if (a->value)
+					*(int *) a->value = a->default_val.int_value;
+				break;
+			default:
+				pcb_message(PCB_MSG_ERROR, "Invalid attribute type %d for attribute %s\n", a->type, a->name);
+				abort();
+			}
+		}
+
+	while(*argc > 0)
+	if (*argc && (*argv)[0][0] == '-' && (*argv)[0][1] == '-') {
+		int bool_val;
+		int arg_ofs;
+
+		bool_val = 1;
+		arg_ofs = 2;
+	try_no_arg:
+		for (ha = hid_attr_nodes; ha; ha = ha->next)
+			for (i = 0; i < ha->n; i++)
+				if (strcmp((*argv)[0] + arg_ofs, ha->attributes[i].name) == 0) {
+					pcb_hid_attribute_t *a = ha->attributes + i;
+					char *ep;
+					const pcb_unit_t *unit;
+					switch (ha->attributes[i].type) {
+					case PCB_HATT_LABEL:
+						break;
+					case PCB_HATT_INTEGER:
+						if (a->value)
+							*(int *) a->value = strtol((*argv)[1], 0, 0);
+						else
+							a->default_val.int_value = strtol((*argv)[1], 0, 0);
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_COORD:
+						if (a->value)
+							*(pcb_coord_t *) a->value = pcb_get_value((*argv)[1], NULL, NULL, NULL);
+						else
+							a->default_val.coord_value = pcb_get_value((*argv)[1], NULL, NULL, NULL);
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_REAL:
+						if (a->value)
+							*(double *) a->value = strtod((*argv)[1], 0);
+						else
+							a->default_val.real_value = strtod((*argv)[1], 0);
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_STRING:
+						if (a->value)
+							*(char **) a->value = (*argv)[1];
+						else
+							a->default_val.str_value = (*argv)[1];
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_BOOL:
+						if (a->value)
+							*(char *) a->value = bool_val;
+						else
+							a->default_val.int_value = bool_val;
+						break;
+					case PCB_HATT_ENUM:
+						ep = (*argv)[1];
+						ok = 0;
+						for (e = 0; a->enumerations[e]; e++)
+							if (strcmp(a->enumerations[e], ep) == 0) {
+								ok = 1;
+								a->default_val.int_value = e;
+								a->default_val.str_value = ep;
+								break;
+							}
+						if (!ok) {
+							fprintf(stderr, "ERROR:  \"%s\" is an unknown value for the --%s option\n", (*argv)[1], a->name);
+							exit(1);
+						}
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_PATH:
+						abort();
+						a->default_val.str_value = (*argv)[1];
+						(*argc)--;
+						(*argv)++;
+						break;
+					case PCB_HATT_UNIT:
+						unit = get_unit_struct((*argv)[1]);
+						if (unit == NULL) {
+							fprintf(stderr, "ERROR:  unit \"%s\" is unknown to pcb (option --%s)\n", (*argv)[1], a->name);
+							exit(1);
+						}
+						a->default_val.int_value = unit->index;
+						a->default_val.str_value = unit->suffix;
+						(*argc)--;
+						(*argv)++;
+						break;
+					default:
+						break;
+					}
+					(*argc)--;
+					(*argv)++;
+					ha = 0;
+					goto got_match;
+				}
+		if (bool_val == 1 && strncmp((*argv)[0], "--no-", 5) == 0) {
+			bool_val = 0;
+			arg_ofs = 5;
+			goto try_no_arg;
+		}
+		fprintf(stderr, "unrecognized option: %s\n", (*argv)[0]);
+		return -1;
+	got_match:;
+	}
+	else {
+		/* Any argument without the "--" is considered a filename. Take only
+		   one filename for now */
+		if (filename == NULL) {
+			filename = (*argv)[0];
+			(*argc)--;
+			(*argv)++;
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Multiple filenames not supported. First filename was: %s; offending second filename: %s\n", filename, (*argv)[0]);
+			return -1;
+		}
+	}
+
+	/* restore filename to the first argument */
+	if (filename != NULL) {
+		(*argv)[0] = filename;
+		(*argc) = 1;
+	}
+	return 0;
+}
+
+void pcb_hid_usage_option(const char *name, const char *help)
+{
+	fprintf(stderr, "%-20s %s\n", name, help);
+}
+
+void pcb_hid_usage(pcb_hid_attribute_t * a, int numa)
+{
+	for (; numa > 0; numa--,a++) {
+		const char *help;
+		if (a->help_text == NULL) help = "";
+		else if (a->help_text == ATTR_UNDOCUMENTED) help = "<undocumented>";
+		else help = a->help_text;
+		pcb_hid_usage_option(a->name, help);
+	}
+}
+
+int pcb_hid_attrdlg_num_children(pcb_hid_attribute_t *attrs, int start_from, int n_attrs)
+{
+	int n, level = 1, cnt = 0;
+
+	for(n = start_from; n < n_attrs; n++) {
+		if ((level == 1) && (attrs[n].type != PCB_HATT_END))
+			cnt++;
+		switch(attrs[n].type) {
+			case PCB_HATT_END:
+				level--;
+				if (level == 0)
+					return cnt;
+				break;
+			case PCB_HATT_BEGIN_TABLE:
+			case PCB_HATT_BEGIN_HBOX:
+			case PCB_HATT_BEGIN_VBOX:
+				level++;
+				break;
+			default:
+				break;
+		}
+	}
+	return cnt;
+}
+
+int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data)
+{
+	if ((pcb_gui == NULL) || (pcb_gui->attribute_dialog == NULL))
+		return -1;
+	return pcb_gui->attribute_dialog(attrs, n_attrs, results, title, descr, caller_data);
+}
\ No newline at end of file
Index: tags/2.0.1/src/hid_attrib.h
===================================================================
--- tags/2.0.1/src/hid_attrib.h	(nonexistent)
+++ tags/2.0.1/src/hid_attrib.h	(revision 18980)
@@ -0,0 +1,120 @@
+#ifndef PCB_HID_ATTRIB_H
+#define PCB_HID_ATTRIB_H
+
+#include "hid.h"
+
+typedef struct pcb_hid_attr_trnd_s pcb_hid_attr_trnd_t;
+
+/* tree node */
+struct pcb_hid_attr_trnd_s {
+	const char *text;               /* displayed on the UI */
+	long uid;                       /* tree-uniq; for referencing/addressing; valid values are >= 0, -1 is the terminator */
+	void *user_data;                /* arbitrary, used by the caller */
+	int expand;                     /* node expanded (open) */
+	pcb_hid_attr_trnd_t *next;      /* next sibling; each level is a singly linked list terminated by NULL */
+	pcb_hid_attr_trnd_t *parent;
+	pcb_hid_attr_trnd_t *children;  /* fisrt children on the next level, or NULL */
+};
+
+/* Used for HID attributes (exporting and printing, mostly).
+   HA_boolean uses int_value, HA_enum sets int_value to the index and
+   str_value to the enumeration string.  PCB_HATT_LABEL just shows the
+   default str_value. */
+struct pcb_hid_attr_val_s {
+	int int_value;
+	const char *str_value;
+	double real_value;
+	pcb_coord_t coord_value;
+	void (*func)();
+	pcb_hid_attr_trnd_t *tree; /* the current val_s is the root; this points to the first child node on the top level */
+};
+
+typedef enum pcb_hatt_compflags_e {
+	PCB_HATF_FRAME       = 1,  /* box/table has a visible frame around it */
+	PCB_HATF_LABEL       = 2,  /* direct children print label */
+	PCB_HATF_SCROLL      = 4,  /* box/table is scrollable */
+	PCB_HATF_HIDE_TABLAB = 8,  /* hide tab labes of a TABBED - the tab mechanism works, but tab names are not displayed and are not clickable */
+	PCB_HATF_LEFT_TAB    = 16  /* display tab labels of TABBED on the left instead of on top (default) */
+} pcb_hatt_compflags_t;
+
+typedef enum pcb_hids_e {
+	/* atomic entry types */
+	PCB_HATT_LABEL,
+	PCB_HATT_INTEGER,
+	PCB_HATT_REAL,
+	PCB_HATT_STRING,              /* WARNING: string, must be malloc()'d, can't be a (const char *) */
+	PCB_HATT_BOOL,
+	PCB_HATT_ENUM,
+	PCB_HATT_PATH,                /* WARNING: string, must be malloc()'d, can't be a (const char *) */
+	PCB_HATT_UNIT,
+	PCB_HATT_COORD,
+	PCB_HATT_BUTTON,              /* push button; default value is the label */
+	PCB_HATT_TREE,                /* tree/list view */
+
+	/* groups (e.g. boxes) */
+	PCB_HATT_BEGIN_HBOX,          /* NOTE: PCB_HATT_IS_COMPOSITE() depends on it */
+	PCB_HATT_BEGIN_VBOX,
+	PCB_HATT_BEGIN_TABLE,         /* min_val is the number of columns */
+	PCB_HATT_BEGIN_TABBED,        /* tabbed view (e.g. notebook); ->enumerations stores the tab names and a NULL; default_val's integer value is the index of the current tab */
+	PCB_HATT_END          /* close one level of PCB_HATT_* */
+} pcb_hids_t;
+
+#define PCB_HATT_IS_COMPOSITE(type) \
+	(((type) >= PCB_HATT_BEGIN_HBOX) && ((type) < PCB_HATT_END))
+
+#define PCB_HAT_IS_STR(type) \
+	((type == PCB_HATT_STRING) || (type == PCB_HATT_PATH))
+
+/* alternative field names in struct pcb_hid_attribute_s */
+#define pcb_hatt_flags       max_val
+#define pcb_hatt_table_cols  min_val
+
+struct pcb_hid_attribute_s {
+	const char *name;
+	/* If the help_text is this, usage() won't show this option */
+#define ATTR_UNDOCUMENTED ((char *)(1))
+	const char *help_text;
+	pcb_hids_t type;
+	int min_val, max_val;				/* for integer and real */
+	pcb_hid_attr_val_t default_val;		/* Also actual value for global attributes.  */
+	const char **enumerations;
+	/* If set, this is used for global attributes (i.e. those set
+	   statically with REGISTER_ATTRIBUTES below) instead of changing
+	   the default_val.  */
+	void *value;
+
+	/* dynamic API */
+	int changed; /* 0 for initial values, 1 on user change */
+	void (*change_cb)(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr); /* called upon value change by the user */
+	void *user_data; /* ignored; the caller is free to use it */
+};
+
+extern void pcb_hid_register_attributes(pcb_hid_attribute_t *, int, const char *cookie, int copy);
+#define PCB_REGISTER_ATTRIBUTES(a, cookie) PCB_HIDCONCAT(void register_,a) ()\
+{ pcb_hid_register_attributes(a, sizeof(a)/sizeof(a[0]), cookie, 0); }
+
+/* Remove all attributes registered with the given cookie */
+void pcb_hid_remove_attributes_by_cookie(const char *cookie);
+
+/* remove all attributes and free the list */
+void pcb_hid_attributes_uninit(void);
+
+typedef struct pcb_hid_attr_node_s {
+	struct pcb_hid_attr_node_s *next;
+	pcb_hid_attribute_t *attributes;
+	int n;
+	const char *cookie;
+} pcb_hid_attr_node_t;
+
+extern pcb_hid_attr_node_t *hid_attr_nodes;
+
+void pcb_hid_usage(pcb_hid_attribute_t * a, int numa);
+void pcb_hid_usage_option(const char *name, const char *help);
+
+/* Count the number of direct children, start_from the first children */
+int pcb_hid_attrdlg_num_children(pcb_hid_attribute_t *attrs, int start_from, int n_attrs);
+
+/* Invoke a simple modal attribute dialog if GUI is available */
+int pcb_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+
+#endif
Index: tags/2.0.1/src/hid_cam.c
===================================================================
--- tags/2.0.1/src/hid_cam.c	(nonexistent)
+++ tags/2.0.1/src/hid_cam.c	(revision 18980)
@@ -0,0 +1,342 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "hid_cam.h"
+#include "hid_attrib.h"
+#include "compat_misc.h"
+#include "layer_vis.h"
+#include "plug_io.h"
+
+char *pcb_layer_to_file_name(char *dest, pcb_layer_id_t lid, unsigned int flags, pcb_file_name_style_t style)
+{
+	const pcb_virt_layer_t *v;
+	pcb_layergrp_id_t group;
+	int nlayers;
+	const char *single_name, *res = NULL;
+
+	if (flags == 0)
+		flags = pcb_layer_flags(PCB, lid);
+
+	if (flags & PCB_LYT_OUTLINE) {
+		strcpy(dest, "outline");
+		return dest;
+	}
+
+	v = pcb_vlayer_get_first(flags);
+	if (v != NULL) {
+		strcpy(dest, v->name);
+		return dest;
+	}
+
+	
+	group = pcb_layer_get_group(PCB, lid);
+	nlayers = PCB->LayerGroups.grp[group].len;
+	single_name = pcb_layer_name(PCB->Data, lid);
+
+	if (flags & PCB_LYT_TOP) {
+		if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 2))
+			res = single_name;
+		if (flags & PCB_LYT_SILK)
+			res = "topsilk";
+		else if (flags & PCB_LYT_MASK)
+			res = "topmask";
+		else if (flags & PCB_LYT_PASTE)
+			res = "toppaste";
+		else
+			res = "top";
+	}
+	else if (flags & PCB_LYT_BOTTOM) {
+		if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 2))
+			res = single_name;
+		if (flags & PCB_LYT_SILK)
+			res = "bottomsilk";
+		else if (flags & PCB_LYT_MASK)
+			res = "bottommask";
+		else if (flags & PCB_LYT_PASTE)
+			res = "bottompaste";
+		else
+		res = "bottom";
+	}
+	else {
+		static char buf[PCB_DERIVE_FN_SUFF_LEN];
+		if (style == PCB_FNS_first || (style == PCB_FNS_single && nlayers == 1))
+			res = single_name;
+		sprintf(buf, "group%ld", group);
+		res = buf;
+	}
+
+	assert(res != NULL);
+	strcpy(dest, res);
+	return dest;
+}
+
+
+void pcb_derive_default_filename(const char *pcbfile, pcb_hid_attribute_t * filename_attrib, const char *suffix, char **memory)
+{
+	char *buf;
+	char *pf;
+
+	if (pcbfile == NULL)
+		pf = pcb_strdup("unknown.pcb");
+	else
+		pf = pcb_strdup(pcbfile);
+
+	if (!pf || (memory && filename_attrib->default_val.str_value != *memory))
+		return;
+
+	buf = (char *) malloc(strlen(pf) + strlen(suffix) + 1);
+	if (memory)
+		*memory = buf;
+	if (buf) {
+		size_t bl;
+		pcb_plug_io_t *i;
+		strcpy(buf, pf);
+		bl = strlen(buf);
+		for(i = pcb_plug_io_chain; i != NULL; i = i->next) {
+			if (i->default_extension != NULL) {
+				int slen = strlen(i->default_extension);
+				if (bl > slen && strcmp(buf + bl - slen, i->default_extension) == 0) {
+					buf[bl - slen] = 0;
+					break;
+				}
+			}
+		}
+		strcat(buf, suffix);
+		if (filename_attrib->default_val.str_value)
+			free((void *) filename_attrib->default_val.str_value);
+		filename_attrib->default_val.str_value = buf;
+	}
+
+	free(pf);
+}
+
+/* remove leading and trailing whitespace */
+static char *strip(char *s)
+{
+	char *end;
+	while(isspace(*s)) s++;
+	end = s + strlen(s) - 1;
+	while((end >= s) && (isspace(*end))) {
+		*end = '\0';
+		end--;
+	}
+	return s;
+}
+
+static void layervis_save_and_reset(pcb_cam_t *cam)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < cam->pcb->Data->LayerN; n++) {
+		cam->orig_vis[n] = cam->pcb->Data->Layer[n].meta.real.vis;
+		cam->pcb->Data->Layer[n].meta.real.vis = 0;
+	}
+}
+
+static void layervis_restore(pcb_cam_t *cam)
+{
+	pcb_layer_id_t n;
+	for(n = 0; n < cam->pcb->Data->LayerN; n++)
+		cam->pcb->Data->Layer[n].meta.real.vis = cam->orig_vis[n];
+}
+
+static int parse_layer_type(char *type, pcb_layer_type_t *lyt, int *offs, int *has_offs)
+{
+	char *soffs, *end, *nxt, *cur;
+	pcb_layer_type_t l;
+
+	*lyt = 0;
+	*offs = *has_offs = 0;
+
+	soffs = strchr(type, ':');
+	if (soffs != NULL) {
+		*soffs = '\0';
+		*offs = strtol(soffs+1, &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "CAM rule: invalid offset '%s'\n", soffs);
+			return 1;
+		}
+		*has_offs = 1;
+	}
+
+	for(cur = type; cur != NULL; cur = nxt) {
+		nxt = strchr(cur, '-');
+		if (nxt != NULL) {
+			*nxt = '\0';
+			nxt++;
+		}
+		l = pcb_layer_type_str2bit(cur);
+		if (l == 0) {
+			pcb_message(PCB_MSG_ERROR, "CAM rule: invalid layer type '%s'\n", cur);
+			return 1;
+		}
+		(*lyt) |= l;
+	}
+	return 0;
+}
+
+int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_hid_attribute_t *attr_tbl, int numa, pcb_hid_attr_val_t *options)
+{
+	char *curr, *next;
+
+	if ((src == NULL) || (*src == '\0'))
+		return 0;
+
+	memset(dst, 0, sizeof(pcb_cam_t));
+	dst->pcb = pcb;
+	dst->inst = pcb_strdup(src);
+	layervis_save_and_reset(dst);
+
+
+	/* Syntax: fn=layergrp,layergrp,layergrp;--opt=val;--opt=val */
+	/* parse: get file name name */
+	next = strchr(dst->inst, '=');
+	if (next == NULL) {
+		pcb_message(PCB_MSG_ERROR, "CAM rule missing '='\n");
+		goto err;
+	}
+	*next = '\0';
+	next++;
+	dst->fn = strip(dst->inst);
+pcb_trace("CAM FN='%s'\n", dst->fn);
+
+	while(isspace(*next))
+		next++;
+
+	/* parse layers */
+	for(curr = next; curr != NULL; curr = next) {
+
+		next = strchr(curr, ',');
+		if (next != NULL) {
+			*next = '\0';
+			next++;
+		}
+		curr = strip(curr);
+		if (*curr == '@') {
+			/* named layer */
+			pcb_layergrp_id_t gid;
+			curr++;
+			gid = pcb_layergrp_by_name(pcb, curr);
+			if (gid < 0) {
+				pcb_message(PCB_MSG_ERROR, "CAM rule: no such layer group '%s'\n", curr);
+				goto err;
+			}
+			if (pcb->LayerGroups.grp[gid].len <= 0)
+				continue;
+			pcb_layervis_change_group_vis(pcb->LayerGroups.grp[gid].lid[0], 1, 0);
+			dst->grp_vis[gid] = 1;
+		}
+		else {
+			/* by layer type */
+			int offs, has_offs;
+			pcb_layer_type_t lyt;
+			const pcb_virt_layer_t *vl;
+
+			if (parse_layer_type(curr, &lyt, &offs, &has_offs) != 0)
+				goto err;
+
+			vl = pcb_vlayer_get_first(lyt);
+			if (vl == NULL) {
+				pcb_layergrp_id_t gids[PCB_MAX_LAYERGRP];
+				int n, len = pcb_layergrp_list(dst->pcb, lyt, gids, sizeof(gids)/sizeof(gids[0]));
+				if (has_offs) {
+					if (offs < 0)
+						offs = len - offs;
+					else
+						offs--;
+					if ((offs >= 0) && (offs < len)) {
+						pcb_layergrp_id_t gid = gids[offs];
+						pcb_layervis_change_group_vis(pcb->LayerGroups.grp[gid].lid[0], 1, 0);
+						dst->grp_vis[gid] = 1;
+					}
+				}
+				else {
+					for(n = 0; n < len; n++) {
+						pcb_layergrp_id_t gid = gids[n];
+						pcb_layervis_change_group_vis(pcb->LayerGroups.grp[gid].lid[0], 1, 0);
+						dst->grp_vis[gid] = 1;
+					}
+				}
+				
+			}
+			else {
+				int vid = vl->new_id - PCB_LYT_VIRTUAL - 1;
+				dst->vgrp_vis[vid] = 1;
+			}
+		}
+	}
+
+	dst->active = 1;
+	return 0;
+	err:;
+	layervis_restore(dst);
+	free(dst->inst);
+	dst->inst = NULL;
+	return -1;
+}
+
+int pcb_cam_end(pcb_cam_t *dst)
+{
+	free(dst->inst);
+	dst->inst = NULL;
+	if (!dst->active)
+		return -1;
+	layervis_restore(dst);
+	dst->active = 0;
+	return dst->exported_grps;
+}
+
+
+int pcb_cam_set_layer_group_(pcb_cam_t *cam, pcb_layergrp_id_t group, unsigned int flags)
+{
+	const pcb_virt_layer_t *vl;
+
+	if (!cam->active)
+		return 0;
+
+	vl = pcb_vlayer_get_first(flags);
+	if (vl == NULL) {
+		if (group == -1)
+			return 1;
+
+		if (!cam->grp_vis[group])
+			return 1;
+	}
+	else {
+		int vid = vl->new_id - PCB_LYT_VIRTUAL - 1;
+		if (!cam->vgrp_vis[vid])
+			return 1;
+	}
+
+	cam->exported_grps++;
+	return 0;
+}
+
Index: tags/2.0.1/src/hid_cam.h
===================================================================
--- tags/2.0.1/src/hid_cam.h	(nonexistent)
+++ tags/2.0.1/src/hid_cam.h	(revision 18980)
@@ -0,0 +1,64 @@
+#ifndef PCB_HID_HELPER_H
+#define PCB_HID_HELPER_H
+
+#include "layer.h"
+#include "hid_attrib.h"
+
+/*** CAM API ***/
+typedef struct pcb_cam_s {
+	/* public */
+	const char *fn;
+	pcb_bool active;
+	int grp_vis[PCB_MAX_LAYERGRP]; /* whether a real layer group should be rendered */
+	int vgrp_vis[PCB_VLY_end];     /* whether a virtual layer group should be rendered */
+
+	/* private/internal/cache */
+	char *inst;
+	pcb_board_t *pcb;
+	int orig_vis[PCB_MAX_LAYER]; /* backup of the original layer visibility */
+	int exported_grps;
+} pcb_cam_t;
+
+int pcb_cam_begin(pcb_board_t *pcb, pcb_cam_t *dst, const char *src, const pcb_hid_attribute_t *attr_tbl, int numa, pcb_hid_attr_val_t *options);
+
+/* Finish cam export, free all memory, mark cam export inactive and report
+   the number of layer groups exported */
+int pcb_cam_end(pcb_cam_t *dst);
+
+
+/* Shall be the first rule in a cam capable exporter's set_layer_group()
+   callback: decides not to draw a layer group in cam mode if the
+   group is not scheduled for export */
+#define pcb_cam_set_layer_group(cam, group, flags) \
+do { \
+	if (pcb_cam_set_layer_group_(cam, group, flags)) \
+		return 0; \
+} while(0)
+
+/* the logics behind pcb_cam_set_layer_group(); returns non-zero if the macro
+   should return (and skip the current group) */
+int pcb_cam_set_layer_group_(pcb_cam_t *cam, pcb_layergrp_id_t group, unsigned int flags);
+
+/*** Obsolete file suffix API - new plugins should not use this ***/
+/* maximum size of a derived suffix */
+#define PCB_DERIVE_FN_SUFF_LEN 20
+
+typedef enum pcb_file_name_style_e {
+	/* Files for copper layers are named top, groupN, bottom.  */
+	PCB_FNS_fixed,
+	/* Groups with multiple layers are named as above, else the single
+	   layer name is used.  */
+	PCB_FNS_single,
+	/* The name of the first layer in each group is used.  */
+	PCB_FNS_first
+} pcb_file_name_style_t;
+
+/* Returns a filename base that can be used to output the layer.  */
+char *pcb_layer_to_file_name(char *dest, pcb_layer_id_t lid, unsigned int flags, pcb_file_name_style_t style);
+
+/* Returns a filename base that can be used to output the layer; if flags is 0,
+   look it up. Copies result in dest (which should be at least PCB_DERIVE_FN_SUFF_LEN bytes wide).
+   Returns dest. */
+void pcb_derive_default_filename(const char *pcbfile, pcb_hid_attribute_t * filename_attrib, const char *suffix, char **memory);
+
+#endif
Index: tags/2.0.1/src/hid_cfg.c
===================================================================
--- tags/2.0.1/src/hid_cfg.c	(nonexistent)
+++ tags/2.0.1/src/hid_cfg.c	(revision 18980)
@@ -0,0 +1,651 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <liblihata/lihata.h>
+#include <liblihata/tree.h>
+
+#include "config.h"
+#include "hid.h"
+#include "hid_cfg.h"
+#include "error.h"
+#include "paths.h"
+#include "safe_fs.h"
+#include "compat_misc.h"
+#include "build_run.h"
+#include "conf_core.h"
+
+char hid_cfg_error_shared[1024];
+
+typedef struct {
+	pcb_hid_cfg_t *hr;
+	pcb_create_menu_widget_t cb;
+	void *cb_ctx;
+	lht_node_t *parent;
+	const pcb_menu_prop_t *props;
+	int target_level;
+	int err;
+	lht_node_t *after;
+} create_menu_ctx_t;
+
+static lht_node_t *create_menu_cb(void *ctx, lht_node_t *node, const char *path, int rel_level)
+{
+	create_menu_ctx_t *cmc = ctx;
+	lht_node_t *psub, *after;
+
+/*	printf(" CB: '%s' %p at %d->%d\n", path, node, rel_level, cmc->target_level);*/
+	if (node == NULL) { /* level does not exist, create it */
+		const char *name;
+		name = strrchr(path, '/');
+		if (name != NULL)
+			name++;
+		else
+			name = path;
+
+		if (rel_level <= 1) {
+			/* creating a main menu */
+			char *end, *name = pcb_strdup(path);
+			for(end = name; *end == '/'; end++) ;
+			end = strchr(end, '/');
+			*end = '\0';
+			psub = cmc->parent = pcb_hid_cfg_get_menu(cmc->hr, name);
+			free(name);
+		}
+		else
+			psub = pcb_hid_cfg_menu_field(cmc->parent, PCB_MF_SUBMENU, NULL);
+
+		if (rel_level == cmc->target_level) {
+			node = pcb_hid_cfg_create_hash_node(psub, cmc->after, name, "dyn", "1", "cookie", cmc->props->cookie, "m", cmc->props->mnemonic, "a", cmc->props->accel, "tip", cmc->props->tip, "action", cmc->props->action, "checked", cmc->props->checked, "update_on", cmc->props->update_on, "foreground", cmc->props->foreground, "background", cmc->props->background, NULL);
+			if (node != NULL)
+				cmc->err = 0;
+		}
+		else
+			node = pcb_hid_cfg_create_hash_node(psub, cmc->after, name, "dyn", "1", "cookie", cmc->props->cookie,  NULL);
+
+		if (node == NULL)
+			return NULL;
+
+		if ((rel_level != cmc->target_level) || (cmc->props->action == NULL))
+			lht_dom_hash_put(node, lht_dom_node_alloc(LHT_LIST, "submenu"));
+
+		if (node->parent == NULL) {
+			lht_dom_list_append(psub, node);
+		}
+		else {
+			assert(node->parent == psub);
+		}
+
+		if ((cmc->after != NULL) && (cmc->after->parent->parent == cmc->parent))
+			after = cmc->after;
+		else
+			after = NULL;
+
+		if (cmc->cb(cmc->cb_ctx, path, name, (rel_level == 1), cmc->parent, after, node) != 0) {
+			cmc->err = -1;
+			return NULL;
+		}
+	}
+	else {
+		/* existing level */
+		if ((node->type == LHT_TEXT) && (node->data.text.value[0] == '@')) {
+			cmc->after = node;
+			goto skip_parent;
+		}
+	}
+	cmc->parent = node;
+
+	skip_parent:;
+	return node;
+}
+
+int pcb_hid_cfg_create_menu(pcb_hid_cfg_t *hr, const char *path, const pcb_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx)
+{
+	const char *name;
+	create_menu_ctx_t cmc;
+
+	cmc.hr = hr;
+	cmc.cb = cb;
+	cmc.cb_ctx = cb_ctx;
+	cmc.parent = NULL;
+	cmc.props = props;
+	cmc.err = -1;
+	cmc.after = NULL;
+
+	/* Allow creating new nodes only under certain main paths that correspond to menus */
+	name = path;
+	while(*name == '/') name++;
+
+	if ((strncmp(name, "main_menu/", 10) == 0) || (strncmp(name, "popups/", 7) == 0)) {
+		/* calculate target level */
+		for(cmc.target_level = 0; *name != '\0'; name++) {
+			if (*name == '/') {
+				cmc.target_level++;
+				while(*name == '/') name++;
+				name--;
+			}
+		}
+
+		/* descend and visit each level, create missing levels */
+		pcb_hid_cfg_get_menu_at(hr, NULL, path, create_menu_cb, &cmc);
+	}
+
+	return cmc.err;
+}
+
+static int hid_cfg_remove_item(pcb_hid_cfg_t *hr, lht_node_t *item, int (*gui_remove)(void *ctx, lht_node_t *nd), void *ctx)
+{
+	if (gui_remove(ctx, item) != 0)
+		return -1;
+	lht_tree_del(item);
+	return 0;
+}
+
+int pcb_hid_cfg_remove_menu_node(pcb_hid_cfg_t *hr, lht_node_t *root, int (*gui_remove)(void *ctx, lht_node_t *nd), void *ctx)
+{
+	if (root == NULL)
+		return -1;
+
+	if (root->type == LHT_HASH) {
+		lht_node_t *psub, *n, *next;
+		psub = pcb_hid_cfg_menu_field(root, PCB_MF_SUBMENU, NULL);
+		if (psub != NULL) { /* remove a whole submenu with all children */
+			int res = 0;
+			for(n = psub->data.list.first; n != NULL; n = next) {
+				next = n->next;
+				if (pcb_hid_cfg_remove_menu_node(hr, n, gui_remove, ctx) != 0)
+					res = -1;
+			}
+			if (res == 0)
+				res = hid_cfg_remove_item(hr, root, gui_remove, ctx);
+			return res;
+		}
+	}
+
+	if ((root->type != LHT_TEXT) && (root->type != LHT_HASH)) /* allow text for the sep */
+		return -1;
+
+	/* remove a simple menu item */
+	return hid_cfg_remove_item(hr, root, gui_remove, ctx);
+}
+
+int pcb_hid_cfg_remove_menu(pcb_hid_cfg_t *hr, const char *path, int (*gui_remove)(void *ctx, lht_node_t *nd), void *ctx)
+{
+	return pcb_hid_cfg_remove_menu_node(hr, pcb_hid_cfg_get_menu_at(hr, NULL, path, NULL, NULL), gui_remove, ctx);
+}
+
+static int hid_cfg_load_error(lht_doc_t *doc, const char *filename, lht_err_t err)
+{
+	const char *fn;
+	int line, col;
+	lht_dom_loc_active(doc, &fn, &line, &col);
+	pcb_message(PCB_MSG_ERROR, "Resource error: %s (%s:%d.%d)*\n", lht_err_str(err), filename, line+1, col+1);
+	return 1;
+}
+
+lht_doc_t *pcb_hid_cfg_load_lht(const char *filename)
+{
+	FILE *f;
+	lht_doc_t *doc;
+	int error = 0;
+
+	f = pcb_fopen(filename, "r");
+	if (f == NULL)
+		return NULL;
+
+	doc = lht_dom_init();
+	lht_dom_loc_newfile(doc, filename);
+
+	while(!(feof(f))) {
+		lht_err_t err;
+		int c = fgetc(f);
+		err = lht_dom_parser_char(doc, c);
+		if (err != LHTE_SUCCESS) {
+			if (err != LHTE_STOP) {
+				error = hid_cfg_load_error(doc, filename, err);
+				break;
+			}
+			break; /* error or stop, do not read anymore (would get LHTE_STOP without any processing all the time) */
+		}
+	}
+
+	if (error) {
+		lht_dom_uninit(doc);
+		doc = NULL;
+	}
+	fclose(f);
+
+	return doc;
+}
+
+lht_doc_t *pcb_hid_cfg_load_str(const char *text)
+{
+	lht_doc_t *doc;
+	int error = 0;
+
+	doc = lht_dom_init();
+	lht_dom_loc_newfile(doc, "embedded");
+
+	while(*text != '\0') {
+		lht_err_t err;
+		int c = *text++;
+		err = lht_dom_parser_char(doc, c);
+		if (err != LHTE_SUCCESS) {
+			if (err != LHTE_STOP) {
+				error = hid_cfg_load_error(doc, "internal", err);
+				break;
+			}
+			break; /* error or stop, do not read anymore (would get LHTE_STOP without any processing all the time) */
+		}
+	}
+
+	if (error) {
+		lht_dom_uninit(doc);
+		doc = NULL;
+	}
+
+	return doc;
+}
+
+const char *pcb_hid_cfg_text_value(lht_doc_t *doc, const char *path)
+{
+	lht_node_t *n = lht_tree_path(doc, "/", path, 1, NULL);
+	if (n == NULL)
+		return NULL;
+	if (n->type != LHT_TEXT) {
+		pcb_hid_cfg_error(n, "Error: node %s should be a text node\n", path);
+		return NULL;
+	}
+	return n->data.text.value;
+}
+
+pcb_hid_cfg_t *pcb_hid_cfg_load(const char *fn, int exact_fn, const char *embedded_fallback)
+{
+	lht_doc_t *doc;
+	pcb_hid_cfg_t *hr;
+
+	/* override HID defaults with the configured path */
+	if ((conf_core.rc.menu_file != NULL) && (*conf_core.rc.menu_file != '\0')) {
+		fn = conf_core.rc.menu_file;
+		exact_fn = (strchr(conf_core.rc.menu_file, '/') != NULL);
+	}
+
+	if (!exact_fn) {
+		/* try different paths to find the menu file inventing its exact name */
+		static const char *hid_cfg_paths_in[] = { "./", "~/.pcb-rnd/", PCBSHAREDIR "/", NULL };
+		char **paths = NULL, **p;
+		int fn_len = strlen(fn);
+
+		doc = NULL;
+		pcb_paths_resolve_all(hid_cfg_paths_in, paths, fn_len+32);
+		for(p = paths; *p != NULL; p++) {
+			if (doc == NULL) {
+				char *end = *p + strlen(*p);
+				sprintf(end, "pcb-menu-%s.lht", fn);
+				doc = pcb_hid_cfg_load_lht(*p);
+				if (doc != NULL)
+					pcb_file_loaded_set_at("menu", "HID main", *p, "main menu system");
+			}
+			free(*p);
+		}
+		free(paths);
+	}
+	else
+		doc = pcb_hid_cfg_load_lht(fn);
+
+	if (doc == NULL) {
+		doc = pcb_hid_cfg_load_str(embedded_fallback);
+		pcb_file_loaded_set_at("menu", "HID main", "<internal>", "main menu system");
+	}
+	if (doc == NULL)
+		return NULL;
+
+	hr = calloc(sizeof(pcb_hid_cfg_t), 1); /* make sure the cache is cleared */
+	hr->doc = doc;
+
+	return hr;
+}
+
+/************* "parsing" **************/
+
+lht_node_t *pcb_hid_cfg_get_menu_at(pcb_hid_cfg_t *hr, lht_node_t *at, const char *menu_path, lht_node_t *(*cb)(void *ctx, lht_node_t *node, const char *path, int rel_level), void *ctx)
+{
+	lht_err_t err;
+	lht_node_t *curr;
+	int level = 0, len = strlen(menu_path), iafter = 0;
+	char *next_seg, *path;
+
+ path = malloc(len+4); /* need a few bytes after the end for the ':' */
+ strcpy(path, menu_path);
+
+	next_seg = path;
+	curr = (at == NULL) ? hr->doc->root : at;
+
+	/* Have to descend manually because of the submenu nodes */
+	for(;;) {
+		char *next, *end;
+		lht_dom_iterator_t it;
+
+		while(*next_seg == '/') next_seg++;
+
+		if (curr != hr->doc->root) {
+			if (level > 1) {
+				curr = lht_tree_path_(hr->doc, curr, "submenu", 1, 0, &err);
+				if (curr == NULL)
+					break;
+			}
+		}
+		next = end = strchr(next_seg, '/');
+		if (end == NULL)
+			end = next_seg + strlen(next_seg);
+		
+		*end = '\0';
+
+		/* find next_seg in the current level */
+		for(curr = lht_dom_first(&it, curr); curr != NULL; curr = lht_dom_next(&it)) {
+			if (*next_seg == '@') {
+				/* looking for an anon text node with the value matching the anchor name */
+				if ((curr->type == LHT_TEXT) && (strcmp(curr->data.text.value, next_seg) == 0)) {
+					iafter = 1;
+					break;
+				}
+			}
+			else {
+				/* looking for a hash node */
+				if (strcmp(curr->name, next_seg) == 0)
+					break;
+			}
+		}
+
+		if (cb != NULL)
+			curr = cb(ctx, curr, path, level);
+
+		if (next != NULL) /* restore previous / so that path is a full path */
+			*next = '/';
+		next_seg = next;
+		if ((curr == NULL) || (next_seg == NULL))
+			break;
+		next_seg++;
+		level++;
+		if (iafter) {
+			/* special case: insert after an @anchor and exit */
+			if (cb != NULL)
+				curr = cb(ctx, NULL, path, level);
+			break;
+		}
+	}
+
+	free(path);
+	return curr;
+}
+
+lht_node_t *pcb_hid_cfg_get_menu(pcb_hid_cfg_t *hr, const char *menu_path)
+{
+	return pcb_hid_cfg_get_menu_at(hr, NULL, menu_path, NULL, NULL);
+}
+
+lht_node_t *pcb_hid_cfg_menu_field(const lht_node_t *submenu, pcb_hid_cfg_menufield_t field, const char **field_name)
+{
+	lht_err_t err;
+	const char *fieldstr = NULL;
+
+	switch(field) {
+		case PCB_MF_ACCELERATOR:  fieldstr = "a"; break;
+		case PCB_MF_MNEMONIC:     fieldstr = "m"; break;
+		case PCB_MF_SUBMENU:      fieldstr = "submenu"; break;
+		case PCB_MF_CHECKED:      fieldstr = "checked"; break;
+		case PCB_MF_UPDATE_ON:    fieldstr = "update_on"; break;
+		case PCB_MF_SENSITIVE:    fieldstr = "sensitive"; break;
+		case PCB_MF_TIP:          fieldstr = "tip"; break;
+		case PCB_MF_ACTIVE:       fieldstr = "active"; break;
+		case PCB_MF_ACTION:       fieldstr = "action"; break;
+		case PCB_MF_FOREGROUND:   fieldstr = "foreground"; break;
+		case PCB_MF_BACKGROUND:   fieldstr = "background"; break;
+		case PCB_MF_FONT:         fieldstr = "font"; break;
+	}
+	if (field_name != NULL)
+		*field_name = fieldstr;
+
+	if (fieldstr == NULL)
+		return NULL;
+
+	return lht_tree_path_(submenu->doc, submenu, fieldstr, 1, 0, &err);
+}
+
+const char *pcb_hid_cfg_menu_field_str(const lht_node_t *submenu, pcb_hid_cfg_menufield_t field)
+{
+	const char *fldname;
+	lht_node_t *n = pcb_hid_cfg_menu_field(submenu, field, &fldname);
+
+	if (n == NULL)
+		return NULL;
+	if (n->type != LHT_TEXT) {
+		pcb_hid_cfg_error(submenu, "Error: field %s should be a text node\n", fldname);
+		return NULL;
+	}
+	return n->data.text.value;
+}
+
+int pcb_hid_cfg_has_submenus(const lht_node_t *submenu)
+{
+	const char *fldname;
+	lht_node_t *n = pcb_hid_cfg_menu_field(submenu, PCB_MF_SUBMENU, &fldname);
+	if (n == NULL)
+		return 0;
+	if (n->type != LHT_LIST) {
+		pcb_hid_cfg_error(submenu, "Error: field %s should be a list (of submenus)\n", fldname);
+		return 0;
+	}
+	return 1;
+}
+
+
+void pcb_hid_cfg_extend_hash_nodev(lht_node_t *node, va_list ap)
+{
+	for(;;) {
+		char *cname, *cval;
+		lht_node_t *t;
+
+		cname = va_arg(ap, char *);
+		if (cname == NULL)
+			break;
+		cval = va_arg(ap, char *);
+
+		if (cval != NULL) {
+			t = lht_dom_node_alloc(LHT_TEXT, cname);
+			t->data.text.value = pcb_strdup(cval);
+			lht_dom_hash_put(node, t);
+		}
+	}
+}
+
+void pcb_hid_cfg_extend_hash_node(lht_node_t *node, ...)
+{
+	va_list ap;
+	va_start(ap, node);
+	pcb_hid_cfg_extend_hash_nodev(node, ap);
+	va_end(ap);
+}
+
+lht_node_t *pcb_hid_cfg_create_hash_node(lht_node_t *parent, lht_node_t *ins_after, const char *name, ...)
+{
+	lht_node_t *n;
+	va_list ap;
+
+	if ((parent != NULL) && (parent->type != LHT_LIST))
+		return NULL;
+
+	/* ignore ins_after if we are already deeper in the tree */
+	if ((ins_after != NULL) && (ins_after->parent != parent))
+		ins_after = NULL;
+
+	n = lht_dom_node_alloc(LHT_HASH, name);
+	if (ins_after != NULL) {
+		/* insert as next sibling below a @anchor */
+		lht_dom_list_insert_after(ins_after, n);
+	}
+	else if (parent != NULL) {
+		/* insert as last item under a parent node */
+		lht_dom_list_append(parent, n);
+	}
+
+	va_start(ap, name);
+	pcb_hid_cfg_extend_hash_nodev(n, ap);
+	va_end(ap);
+
+	return n;
+}
+
+lht_node_t *pcb_hid_cfg_menu_field_path(const lht_node_t *parent, const char *path)
+{
+	return lht_tree_path_(parent->doc, parent, path, 1, 0, NULL);
+}
+
+int pcb_hid_cfg_dfs(lht_node_t *parent, int (*cb)(void *ctx, lht_node_t *n), void *ctx)
+{
+	lht_dom_iterator_t it;
+	lht_node_t *n;
+
+	for(n = lht_dom_first(&it, parent); n != NULL; n = lht_dom_next(&it)) {
+		int ret;
+		ret = cb(ctx, n);
+		if (ret != 0)
+			return ret;
+		if (n->type != LHT_TEXT) {
+			ret = pcb_hid_cfg_dfs(n, cb, ctx);
+			if (ret != 0)
+				return ret;
+		}
+	}
+	return 0;
+}
+
+void pcb_hid_cfg_error(const lht_node_t *node, const char *fmt, ...)
+{
+	char *end;
+	va_list ap;
+	int len, maxlen = sizeof(hid_cfg_error_shared);
+
+	len = pcb_snprintf(hid_cfg_error_shared, maxlen, "Error in lihata node %s:%d.%d:", node->file_name, node->line, node->col);
+	end = hid_cfg_error_shared + len;
+	maxlen -= len;
+	va_start(ap, fmt);
+	end += pcb_vsnprintf(end, maxlen, fmt, ap);
+	va_end(ap);
+	pcb_message(PCB_MSG_ERROR, hid_cfg_error_shared);
+}
+
+static void map_anchor_menus(vtp0_t *dst, lht_node_t *node, const char *name)
+{
+	lht_dom_iterator_t it;
+
+	switch(node->type) {
+		case LHT_HASH:
+		case LHT_LIST:
+			for(node = lht_dom_first(&it, node); node != NULL; node = lht_dom_next(&it))
+				map_anchor_menus(dst, node, name);
+			break;
+		case LHT_TEXT:
+			if ((node->parent != NULL) && (node->parent->type == LHT_LIST) && (strcmp(node->data.text.value, name) == 0))
+				vtp0_append(dst, node);
+			break;
+		default:
+			break;
+	}
+}
+
+void pcb_hid_cfg_map_anchor_menus(const char *name, void (*cb)(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *n, char *path), void *ctx)
+{
+	vtp0_t anchors;
+
+	if ((pcb_gui == NULL) || (pcb_gui->hid_cfg == NULL) || (pcb_gui->hid_cfg->doc == NULL) || (pcb_gui->hid_cfg->doc->root == NULL))
+		return;
+
+	/* extract anchors; don't do the callbacks from there because the tree
+	   is going to be changed from the callbacks. It is however guaranteed
+	   that anchors are not removed. */
+	vtp0_init(&anchors);
+	map_anchor_menus(&anchors, pcb_gui->hid_cfg->doc->root, name);
+
+	/* iterate over all anchors extracted and call the callback */
+	{
+		char *path = NULL;
+		int used = 0, alloced = 0, l0 = strlen(name) + 128;
+		size_t an;
+
+		for(an = 0; an < vtp0_len(&anchors); an++) {
+			lht_node_t *n, *node = anchors.array[an];
+
+			for(n = node->parent; n != NULL; n = n->parent) {
+				int len;
+				if (strcmp(n->name, "submenu") == 0)
+					continue;
+				len = strlen(n->name);
+				if (used+len+2+l0 >= alloced) {
+					alloced = used+len+2+l0 + 128;
+					path = realloc(path, alloced);
+				}
+				memmove(path+len+1, path, used);
+				memcpy(path, n->name, len);
+				path[len] = '/';
+				used += len+1;
+			}
+			memcpy(path+used, name, l0+1);
+/*			pcb_trace("path='%s' used=%d\n", path, used);*/
+			cb(ctx, pcb_gui->hid_cfg, node, path);
+			used = 0;
+		}
+		free(path);
+	}
+
+	vtp0_uninit(&anchors);
+}
+
+int pcb_hid_cfg_del_anchor_menus(lht_node_t *node, const char *cookie)
+{
+	lht_node_t *nxt;
+
+	if ((node->type != LHT_TEXT) || (node->data.text.value == NULL) || (node->data.text.value[0] != '@'))
+		return -1;
+
+	for(node = node->next; node != NULL; node = nxt) {
+		lht_node_t *ncookie;
+
+		if (node->type != LHT_HASH)
+			break;
+		ncookie = lht_dom_hash_get(node, "cookie");
+
+/*		pcb_trace("  '%s' cookie='%s'\n", node->name, ncookie == NULL ? "NULL":ncookie->data.text.value );*/
+		if ((ncookie == NULL) || (ncookie->type != LHT_TEXT) || (strcmp(ncookie->data.text.value, cookie) != 0))
+			break;
+
+		nxt = node->next;
+		pcb_gui->remove_menu_node(node);
+	}
+	return 0;
+}
Index: tags/2.0.1/src/hid_cfg.h
===================================================================
--- tags/2.0.1/src/hid_cfg.h	(nonexistent)
+++ tags/2.0.1/src/hid_cfg.h	(revision 18980)
@@ -0,0 +1,129 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Helpers for loading and handling lihata HID config files */
+
+#ifndef PCB_HID_CFG_H
+#define PCB_HID_CFG_H
+
+#include <liblihata/dom.h>
+#include <stdarg.h>
+#include "global_typedefs.h"
+#include "hid.h"
+
+struct pcb_hid_cfg_s {
+	lht_doc_t *doc;
+};
+
+/* Create a set of resources representing a single menu item
+   If action is NULL, it's a drop-down item that has submenus.
+   The callback is called after the new lihata node is created.
+   NOTE: unlike other cookies, this cookie is strdup()'d. 
+   */
+typedef int (*pcb_create_menu_widget_t)(void *ctx, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item);
+int pcb_hid_cfg_create_menu(pcb_hid_cfg_t *hr, const char *path, const pcb_menu_prop_t *props, pcb_create_menu_widget_t cb, void *cb_ctx);
+
+/* Remove a path recursively; call gui_remove() on leaf paths until the subtree
+   is consumed (should return 0 on success) */
+int pcb_hid_cfg_remove_menu(pcb_hid_cfg_t *hr, const char *path, int (*gui_remove)(void *ctx, lht_node_t *nd), void *ctx);
+int pcb_hid_cfg_remove_menu_node(pcb_hid_cfg_t *hr, lht_node_t *root, int (*gui_remove)(void *ctx, lht_node_t *nd), void *ctx);
+
+/* Search and load the menu res for hidname; if not found, and embedded_fallback
+   is not NULL, parse that string instead. Returns NULL on error */
+pcb_hid_cfg_t *pcb_hid_cfg_load(const char *fn, int exact_fn, const char *embedded_fallback);
+
+/* Generic, low level lihata loader */
+lht_doc_t *pcb_hid_cfg_load_lht(const char *filename);
+lht_doc_t *pcb_hid_cfg_load_str(const char *text);
+
+/* Generic, low level lihata text value fetch */
+const char *pcb_hid_cfg_text_value(lht_doc_t *doc, const char *path);
+
+lht_node_t *pcb_hid_cfg_get_menu(pcb_hid_cfg_t *hr, const char *menu_path);
+lht_node_t *pcb_hid_cfg_get_menu_at(pcb_hid_cfg_t *hr, lht_node_t *at, const char *menu_path, lht_node_t *(*cb)(void *ctx, lht_node_t *node, const char *path, int rel_level), void *ctx);
+
+/* search all instances of an @anchor menu in the currently active GUI and
+   call cb on the lihata node; path has 128 extra bytes available at the end */
+void pcb_hid_cfg_map_anchor_menus(const char *name, void (*cb)(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *n, char *path), void *ctx);
+
+/* remove all adjacent anchor menus with matching cookie below anode, the
+   anchor node */
+int pcb_hid_cfg_del_anchor_menus(lht_node_t *anode, const char *cookie);
+
+
+/* Fields are retrieved using this enum so that HIDs don't need to hardwire
+   lihata node names */
+typedef enum {
+	PCB_MF_ACCELERATOR,
+	PCB_MF_MNEMONIC,
+	PCB_MF_SUBMENU,
+	PCB_MF_CHECKED,
+	PCB_MF_UPDATE_ON,
+	PCB_MF_SENSITIVE,
+	PCB_MF_TIP,
+	PCB_MF_ACTIVE,
+	PCB_MF_ACTION,
+	PCB_MF_FOREGROUND,
+	PCB_MF_BACKGROUND,
+	PCB_MF_FONT
+} pcb_hid_cfg_menufield_t;
+
+/* Return a field of a submenu and optionally fill in field_name with the
+   field name expected in the lihata document (useful for error messages) */
+lht_node_t *pcb_hid_cfg_menu_field(const lht_node_t *submenu, pcb_hid_cfg_menufield_t field, const char **field_name);
+
+/* Return a lihata node using a relative lihata path from parent - this is
+   just a wrapper around lht_tree_path_ */
+lht_node_t *pcb_hid_cfg_menu_field_path(const lht_node_t *parent, const char *path);
+
+/* Return a text field of a submenu; return NULL and generate a pcb_message(PCB_MSG_ERROR, ) if
+   the given field is not text */
+const char *pcb_hid_cfg_menu_field_str(const lht_node_t *submenu, pcb_hid_cfg_menufield_t field);
+
+/* Return non-zero if submenu has further submenus; generate pcb_message(PCB_MSG_ERROR, ) if
+   there is a submenu field with the wrong lihata type */
+int pcb_hid_cfg_has_submenus(const lht_node_t *submenu);
+
+/* Create a new hash node under parent (optional) and create a flat subtree of
+   text nodes from name,value varargs (NULL terminated). This is a shorthand
+   for creating a menu item in a subtree list. If ins_after is not NULL and
+   is under the same parent, the new menu is inserted after ins_after. */
+lht_node_t *pcb_hid_cfg_create_hash_node(lht_node_t *parent, lht_node_t *ins_after, const char *name, ...);
+
+/* Create a flat subtree of text nodes from name,value varargs (NULL
+   terminated). This is a shorthand for creating a menu item in a
+   subtree list. */
+void pcb_hid_cfg_extend_hash_node(lht_node_t *node, ...);
+void pcb_hid_cfg_extend_hash_nodev(lht_node_t *node, va_list ap);
+
+/* Search a subtree in depth-first-search manner. Call cb on each node as
+   descending. If cb returns non-zero, stop the search and return that value.
+   Do all this recursively. */
+int pcb_hid_cfg_dfs(lht_node_t *parent, int (*cb)(void *ctx, lht_node_t *n), void *ctx);
+
+/* Report an error about a node */
+void pcb_hid_cfg_error(const lht_node_t *node, const char *fmt, ...);
+#endif
Index: tags/2.0.1/src/hid_cfg_action.c
===================================================================
--- tags/2.0.1/src/hid_cfg_action.c	(nonexistent)
+++ tags/2.0.1/src/hid_cfg_action.c	(revision 18980)
@@ -0,0 +1,51 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "hid_cfg_action.h"
+#include "actions.h"
+
+int pcb_hid_cfg_action(const lht_node_t *node)
+{
+	if (node == NULL)
+		return -1;
+	switch(node->type) {
+		case LHT_TEXT:
+			return pcb_parse_actions(node->data.text.value);
+		case LHT_LIST:
+			for(node = node->data.list.first; node != NULL; node = node->next) {
+				if (node->type == LHT_TEXT) {
+					if (pcb_parse_actions(node->data.text.value) != 0)
+						return -1;
+				}
+				else
+					return -1;
+			}
+			return 0;
+		default: ; /* suppress compiler warning: can't handle any other type */
+	}
+	return -1;
+}
Index: tags/2.0.1/src/hid_cfg_action.h
===================================================================
--- tags/2.0.1/src/hid_cfg_action.h	(nonexistent)
+++ tags/2.0.1/src/hid_cfg_action.h	(revision 18980)
@@ -0,0 +1,31 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+#include "hid_cfg.h"
+/* Run an action node. The node is either a list of text nodes or a text node;
+   returns non-zero on error, the first action that fails in a chain breaks the chain */
+int pcb_hid_cfg_action(const lht_node_t *node);
Index: tags/2.0.1/src/hid_cfg_input.c
===================================================================
--- tags/2.0.1/src/hid_cfg_input.c	(nonexistent)
+++ tags/2.0.1/src/hid_cfg_input.c	(revision 18980)
@@ -0,0 +1,632 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <liblihata/lihata.h>
+#include <liblihata/tree.h>
+#include <genht/hash.h>
+#include <genvector/gds_char.h>
+
+#include "config.h"
+#include "hid_cfg_input.h"
+#include "hid_cfg_action.h"
+#include "error.h"
+#include "compat_misc.h"
+#include "event.h"
+#include "crosshair.h"
+
+/* split value into a list of '-' separated words; examine each word
+   and set the bitmask of modifiers */
+static pcb_hid_cfg_mod_t parse_mods(const char *value, const char **last, unsigned int vlen)
+{
+	pcb_hid_cfg_mod_t m = 0;
+	int press = 0;
+	const char *next;
+
+	while(isspace(*value)) value++;
+
+	if (*value != '<') {
+	for(;;) {
+		if ((vlen >= 5) && (pcb_strncasecmp(value, "shift", 5) == 0))        m |= PCB_M_Shift;
+		else if ((vlen >= 4) && (pcb_strncasecmp(value, "ctrl", 4) == 0))    m |= PCB_M_Ctrl;
+		else if ((vlen >= 3) && (pcb_strncasecmp(value, "alt", 3) == 0))     m |= PCB_M_Alt;
+		else if ((vlen >= 7) && (pcb_strncasecmp(value, "release", 7) == 0)) m |= PCB_M_Release;
+		else if ((vlen >= 5) && (pcb_strncasecmp(value, "press", 5) == 0))   press = 1;
+		else
+			pcb_message(PCB_MSG_ERROR, "Unknown modifier: %s\n", value);
+		/* skip to next word */
+		next = strpbrk(value, "<- \t");
+		if (next == NULL)
+			break;
+		if (*next == '<')
+			break;
+		vlen -= (next - value);
+		value = next+1;
+	}
+	}
+
+	if (last != NULL)
+		*last = value;
+
+	if (press && (m & PCB_M_Release))
+		pcb_message(PCB_MSG_ERROR, "Bogus modifier: both press and release\n");
+
+	return m;
+}
+
+static pcb_hid_cfg_mod_t button_name2mask(const char *name)
+{
+	/* All mouse-related resources must be named.  The name is the
+	   mouse button number.  */
+	if (!name)
+		return 0;
+	else if (pcb_strcasecmp(name, "left") == 0)   return PCB_MB_LEFT;
+	else if (pcb_strcasecmp(name, "middle") == 0) return PCB_MB_MIDDLE;
+	else if (pcb_strcasecmp(name, "right") == 0)  return PCB_MB_RIGHT;
+
+	else if (pcb_strcasecmp(name, "scroll-up") == 0)     return PCB_MB_SCROLL_UP;
+	else if (pcb_strcasecmp(name, "scroll-down") == 0)   return PCB_MB_SCROLL_DOWN;
+	else if (pcb_strcasecmp(name, "scroll-left") == 0)   return PCB_MB_SCROLL_UP;
+	else if (pcb_strcasecmp(name, "scroll-right") == 0)  return PCB_MB_SCROLL_DOWN;
+	else {
+		pcb_message(PCB_MSG_ERROR, "Error: unknown mouse button: %s\n", name);
+		return 0;
+	}
+}
+
+static unsigned int keyhash_int(htip_key_t a)      { return murmurhash32(a & 0xFFFF); }
+
+static unsigned int keyb_hash(const void *key_)
+{
+	const hid_cfg_keyhash_t *key = key_;
+	unsigned int i = 0;
+	i += key->key_raw; i <<= 8;
+	i += ((unsigned int)key->key_tr) << 4;
+	i += key->mods;
+	return murmurhash32(i);
+}
+
+static int keyb_eq(const void *keya_, const void *keyb_)
+{
+	const hid_cfg_keyhash_t *keya = keya_, *keyb = keyb_;
+	return (keya->key_raw == keyb->key_raw) && (keya->key_tr == keyb->key_tr) && (keya->mods == keyb->mods);
+}
+
+/************************** MOUSE ***************************/
+
+int hid_cfg_mouse_init(pcb_hid_cfg_t *hr, pcb_hid_cfg_mouse_t *mouse)
+{
+	lht_node_t *btn, *m;
+
+	mouse->mouse = pcb_hid_cfg_get_menu(hr, "/mouse");
+
+	if (mouse->mouse == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Warning: no /mouse section in the resource file - mouse is disabled\n");
+		return -1;
+	}
+
+	if (mouse->mouse->type != LHT_LIST) {
+		pcb_hid_cfg_error(mouse->mouse, "Warning: should be a list - mouse is disabled\n");
+		return -1;
+	}
+
+	if (mouse->mouse_mask == NULL)
+		mouse->mouse_mask = htip_alloc(keyhash_int, htip_keyeq);
+	else
+		htip_clear(mouse->mouse_mask);
+
+	for(btn = mouse->mouse->data.list.first; btn != NULL; btn = btn->next) {
+		pcb_hid_cfg_mod_t btn_mask = button_name2mask(btn->name);
+		if (btn_mask == 0) {
+			pcb_hid_cfg_error(btn, "unknown mouse button");
+			continue;
+		}
+		if (btn->type != LHT_LIST) {
+			pcb_hid_cfg_error(btn, "needs to be a list");
+			continue;
+		}
+		for(m = btn->data.list.first; m != NULL; m = m->next) {
+			pcb_hid_cfg_mod_t mod_mask = parse_mods(m->name, NULL, -1);
+			htip_set(mouse->mouse_mask, btn_mask|mod_mask, m);
+		}
+	}
+	return 0;
+}
+
+static lht_node_t *find_best_action(pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask)
+{
+	lht_node_t *n;
+
+	if (mouse->mouse_mask == NULL)
+		return NULL;
+
+	/* look for exact mod match */
+	n = htip_get(mouse->mouse_mask, button_and_mask);
+	if (n != NULL)
+		return n;
+
+	if (button_and_mask & PCB_M_Release) {
+		/* look for plain release for the given button */
+		n = htip_get(mouse->mouse_mask, (button_and_mask & PCB_M_ANY) | PCB_M_Release);
+		if (n != NULL)
+			return n;
+	}
+
+	return NULL;
+}
+
+void hid_cfg_mouse_action(pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask, pcb_bool cmd_entry_active)
+{
+	pcb_crosshair.click_cmd_entry_active = cmd_entry_active;
+	pcb_hid_cfg_action(find_best_action(mouse, button_and_mask));
+	pcb_event(PCB_EVENT_USER_INPUT_POST, NULL);
+	pcb_crosshair.click_cmd_entry_active = 0;
+}
+
+
+/************************** KEYBOARD ***************************/
+int pcb_hid_cfg_keys_init(pcb_hid_cfg_keys_t *km)
+{
+	htpp_init(&km->keys, keyb_hash, keyb_eq);
+	return 0;
+}
+
+int pcb_hid_cfg_keys_uninit(pcb_hid_cfg_keys_t *km)
+{
+#warning TODO: recursive free of nodes
+	htpp_uninit(&km->keys);
+	return 0;
+}
+
+pcb_hid_cfg_keyseq_t *pcb_hid_cfg_keys_add_under(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t *parent, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg)
+{
+	pcb_hid_cfg_keyseq_t *ns;
+	hid_cfg_keyhash_t addr;
+	htpp_t *phash = (parent == NULL) ? &km->keys : &parent->seq_next;
+
+	/* do not grow the tree under actions */
+	if ((parent != NULL) && (parent->action_node != NULL)) {
+		if (*errmsg != NULL)
+			*errmsg = "unreachable multikey combo: prefix of the multikey stroke already has an action";
+		return NULL;
+	}
+
+	addr.mods = mods;
+	addr.key_raw = key_raw;
+	addr.key_tr = key_tr;
+
+	/* already in the tree */
+	ns = htpp_get(phash, &addr);
+	if (ns != NULL) {
+		if (terminal) {
+			if (*errmsg != NULL)
+				*errmsg = "duplicate: already registered";
+			return NULL; /* full-path-match is collision */
+		}
+		return ns;
+	}
+
+	/* new node on this level */
+	ns = calloc(sizeof(pcb_hid_cfg_keyseq_t), 1);
+	if (!terminal)
+		htpp_init(&ns->seq_next, keyb_hash, keyb_eq);
+
+	ns->addr.mods = mods;
+	ns->addr.key_raw = key_raw;
+	ns->addr.key_tr = key_tr;
+
+	htpp_set(phash, &ns->addr, ns);
+	return ns;
+}
+
+const pcb_hid_cfg_keytrans_t hid_cfg_key_default_trans[] = {
+	{ "semicolon", ';'  },
+	{ NULL,        0    },
+};
+
+static unsigned short int translate_key(pcb_hid_cfg_keys_t *km, const char *desc, int len)
+{
+	char tmp[256];
+
+	if ((km->auto_chr) && (len == 1))
+			return *desc;
+
+	if (len > sizeof(tmp)-1) {
+		pcb_message(PCB_MSG_ERROR, "key sym name too long\n");
+		return 0;
+	}
+	strncpy(tmp, desc, len);
+	tmp[len] = '\0';
+
+	if (km->auto_tr != NULL) {
+		const pcb_hid_cfg_keytrans_t *t;
+		for(t = km->auto_tr; t->name != NULL; t++) {
+			if (pcb_strcasecmp(tmp, t->name) == 0) {
+				tmp[0] = t->sym;
+				tmp[1] = '\0';
+				len = 1;
+				break;
+			}
+		}
+	}
+
+	return km->translate_key(tmp, len);
+}
+
+static int parse_keydesc(pcb_hid_cfg_keys_t *km, const char *keydesc, pcb_hid_cfg_mod_t *mods, unsigned short int *key_raws, unsigned short int *key_trs, int arr_len)
+{
+	const char *curr, *next, *last, *k, *desc1;
+	int slen, len;
+
+	slen = 0;
+	curr = keydesc;
+	do {
+		if (slen >= arr_len)
+			return -1;
+		while(isspace(*curr)) curr++;
+		if (*curr == '\0')
+			break;
+		next = strchr(curr, ';');
+		if (next != NULL) {
+			len = next - curr;
+			while(*next == ';') next++;
+		}
+		else
+			len = strlen(curr);
+
+		mods[slen] = parse_mods(curr, &last, len);
+
+		k = strchr(last, '<');
+		if (k == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Missing <key> in the key description: '%s'\n", keydesc);
+			return -1;
+		}
+		len -= k-last;
+		desc1 = k;
+		k++; len--;
+		if (pcb_strncasecmp(k, "key>", 4) == 0) {
+			k+=4; len-=4;
+			key_raws[slen] = translate_key(km, k, len);
+			key_trs[slen] = 0;
+		}
+		else if (pcb_strncasecmp(k, "char>", 5) == 0) {
+			k+=5; len-=5;
+			key_raws[slen] = 0;
+			if (!isalnum(*k))
+				key_trs[slen] = *k;
+			else
+				key_trs[slen] = 0;
+			k++; len--;
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Missing <key> or <char> in the key description starting at %s\n", k-1);
+			return -1;
+		}
+
+		if ((key_raws[slen] == 0) && (key_trs[slen] == 0)) {
+			char *s;
+			s = malloc(len+1);
+			memcpy(s, desc1, k-desc1);
+			s[len] = '\0';
+			pcb_message(PCB_MSG_ERROR, "Unrecognised key symbol in key description: %s\n", s);
+			free(s);
+			return -1;
+		}
+
+		slen++;
+		curr = next;
+	} while(curr != NULL);
+	return slen;
+}
+
+int pcb_hid_cfg_keys_add_by_strdesc_(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len)
+{
+	pcb_hid_cfg_mod_t mods[HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_raws[HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_trs[HIDCFG_MAX_KEYSEQ_LEN];
+	pcb_hid_cfg_keyseq_t *lasts;
+	int slen, n;
+	const char *errmsg;
+
+	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, HIDCFG_MAX_KEYSEQ_LEN);
+	if (slen <= 0)
+		return slen;
+
+	if ((out_seq != NULL) && (slen >= out_seq_len))
+		return -1;
+
+/*	printf("KEY insert\n");*/
+
+	lasts = NULL;
+	for(n = 0; n < slen; n++) {
+		pcb_hid_cfg_keyseq_t *s;
+		int terminal = (n == slen-1);
+
+/*		printf(" mods=%x sym=%x\n", mods[n], key_chars[n]);*/
+
+		s = pcb_hid_cfg_keys_add_under(km, lasts, mods[n], key_raws[n], key_trs[n], terminal, &errmsg);
+		if (s == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Failed to add hotkey binding: %s: %s\n", keydesc, errmsg);
+#warning TODO: free stuff?
+			return -1;
+		}
+		if (terminal)
+			s->action_node = action_node;
+
+		if (out_seq != NULL)
+			out_seq[n] = s;
+		lasts = s;
+	}
+
+	return slen;
+}
+
+int pcb_hid_cfg_keys_add_by_strdesc(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node)
+{
+	return pcb_hid_cfg_keys_add_by_strdesc_(km, keydesc, action_node, NULL, 0);
+}
+
+int pcb_hid_cfg_keys_add_by_desc_(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len)
+{
+	switch(keydescn->type) {
+		case LHT_TEXT: return pcb_hid_cfg_keys_add_by_strdesc_(km, keydescn->data.text.value, action_node, out_seq, out_seq_len);
+		case LHT_LIST:
+		{
+			int ret = -1, cnt;
+			lht_node_t *n;
+			for(n = keydescn->data.list.first, cnt = 0; n != NULL; n = n->next, cnt++) {
+				if (n->type != LHT_TEXT)
+					break;
+				if (cnt == 0)
+					ret = pcb_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, out_seq, out_seq_len);
+				else
+					pcb_hid_cfg_keys_add_by_strdesc_(km, n->data.text.value, action_node, NULL, 0);
+			}
+			return ret;
+		}
+		default:;
+	}
+	return -1;
+}
+
+int pcb_hid_cfg_keys_add_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, const lht_node_t *action_node)
+{
+	return pcb_hid_cfg_keys_add_by_desc_(km, keydescn, action_node, NULL, 0);
+}
+
+static void gen_accel(gds_t *s, pcb_hid_cfg_keys_t *km, const char *keydesc, int *cnt, const char *sep)
+{
+	pcb_hid_cfg_mod_t mods[HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_raws[HIDCFG_MAX_KEYSEQ_LEN];
+	unsigned short int key_trs[HIDCFG_MAX_KEYSEQ_LEN];
+	int slen, n;
+
+	slen = parse_keydesc(km, keydesc, mods, key_raws, key_trs, HIDCFG_MAX_KEYSEQ_LEN);
+	if (slen <= 0)
+		return;
+
+	if (*cnt > 0)
+		gds_append_str(s, sep);
+
+	for(n = 0; n < slen; n++) {
+		char buff[64];
+
+		if (n > 0)
+			gds_append(s, ' ');
+
+		
+		if (key_raws[n]) {
+			if (km->key_name(key_raws[n], buff, sizeof(buff)) != 0)
+				strcpy(buff, "<unknown>");
+		}
+		else if (key_trs[n] != 0) {
+			buff[0] = key_trs[n];
+			buff[1] ='\0';
+		}
+		else
+			strcpy(buff, "<empty?>");
+
+		if (mods[n] & PCB_M_Alt)   gds_append_str(s, "Alt-");
+		if (mods[n] & PCB_M_Ctrl)  gds_append_str(s, "Ctrl-");
+		if (mods[n] & PCB_M_Shift) gds_append_str(s, "Shift-");
+		gds_append_str(s, buff);
+	}
+}
+
+char *pcb_hid_cfg_keys_gen_accel(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep)
+{
+	gds_t s;
+	int cnt = 0;
+
+	memset(&s, 0, sizeof(s));
+
+	switch(keydescn->type) {
+		case LHT_TEXT:
+			if (mask & 1)
+				gen_accel(&s, km, keydescn->data.text.value, &cnt, sep);
+			break;
+		case LHT_LIST:
+		{
+			int cnt;
+			lht_node_t *n;
+			for(n = keydescn->data.list.first, cnt = 0; n != NULL; n = n->next, cnt++, mask >>= 1) {
+				if (n->type != LHT_TEXT)
+					break;
+				if (!(mask & 1))
+					continue;
+				gen_accel(&s, km, n->data.text.value, &cnt, sep);
+			}
+		}
+		default:;
+	}
+	return s.array;
+}
+
+
+int pcb_hid_cfg_keys_input_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, pcb_hid_cfg_keyseq_t **seq, int *seq_len)
+{
+	pcb_hid_cfg_keyseq_t *ns;
+	hid_cfg_keyhash_t addr;
+	htpp_t *phash = (*seq_len == 0) ? &km->keys : &((seq[(*seq_len)-1])->seq_next);
+
+	if (key_raw == 0) {
+		static int warned = 0;
+		if (!warned) {
+			pcb_message(PCB_MSG_ERROR, "Keyboard translation error: probably the US layout is not enabled. Some hotkeys may not work properly\n");
+			warned = 1;
+		}
+		/* happens if only the translated version is available. Try to reverse
+		   engineer it as good as we can. */
+		if (isalpha(key_tr)) {
+			if (isupper(key_tr)) {
+				key_raw = tolower(key_tr);
+				mods |= PCB_M_Shift;
+			}
+			else
+				key_raw = key_tr;
+		}
+		else if (isdigit(key_tr))
+			key_raw = key_tr;
+		/* the rest: punctuations should be handled by key_tr; special keys: well... */
+	}
+
+	/* first check for base key + mods */
+	addr.mods = mods;
+	addr.key_raw = key_raw;
+	addr.key_tr = 0;
+	
+	ns = htpp_get(phash, &addr);
+
+	/* if not found, try with translated key + limited mods */
+	if (ns == NULL) {
+		addr.mods = mods & PCB_M_Ctrl;
+		addr.key_raw = 0;
+		addr.key_tr = key_tr;
+		ns = htpp_get(phash, &addr);
+	}
+
+	/* already in the tree */
+	if (ns == NULL) {
+		(*seq_len) = 0;
+		return -1;
+	}
+
+	seq[*seq_len] = ns;
+	(*seq_len)++;
+
+	/* found a terminal node with an action */
+	if (ns->action_node != NULL) {
+		km->seq_len_action = *seq_len;
+		(*seq_len) = 0;
+		return km->seq_len_action;
+	}
+
+	return 0;
+}
+
+int pcb_hid_cfg_keys_input(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr)
+{
+	return pcb_hid_cfg_keys_input_(km, mods, key_raw, key_tr, km->seq, &km->seq_len);
+}
+
+int pcb_hid_cfg_keys_action_(pcb_hid_cfg_keyseq_t **seq, int seq_len)
+{
+	int res;
+
+	if (seq_len < 1)
+		return -1;
+
+	res = pcb_hid_cfg_action(seq[seq_len-1]->action_node);
+	pcb_event(PCB_EVENT_USER_INPUT_POST, NULL);
+	return res;
+}
+
+int pcb_hid_cfg_keys_action(pcb_hid_cfg_keys_t *km)
+{
+	int ret = pcb_hid_cfg_keys_action_(km->seq, km->seq_len_action);
+	km->seq_len_action = 0;
+	return ret;
+}
+
+int pcb_hid_cfg_keys_seq_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len)
+{
+	int n, sum = 0;
+	char *end = dst;
+
+	dst_len -= 25; /* make room for a full key with modifiers, the \0 and the potential ellipsis */
+
+	for(n = 0; n < seq_len; n++) {
+		int k = seq[n]->addr.key_raw, mods = seq[n]->addr.mods, ll = 0, l;
+
+		if (n != 0) {
+			*end = ' ';
+			end++;
+			ll = 1;
+		}
+
+		if (mods & PCB_M_Alt)   { strncpy(end, "Alt-", dst_len); end += 4; ll += 4; }
+		if (mods & PCB_M_Ctrl)  { strncpy(end, "Ctrl-", dst_len); end += 5; ll += 5; }
+		if (mods & PCB_M_Shift) { strncpy(end, "Shift-", dst_len); end += 6; ll += 6; }
+
+		if (k == 0)
+			k = seq[n]->addr.key_tr;
+
+		if (km->key_name(k, end, dst_len) == 0) {
+			l = strlen(end);
+		}
+		else {
+			strncpy(end, "<unknown>", dst_len);
+			l = 9;
+		}
+
+		ll += l;
+
+		sum += ll;
+		dst_len -= ll;
+		end += l;
+
+		if (dst_len <= 1) {
+			strcpy(dst, " ...");
+			sum += 4;
+			dst_len -= 4;
+			end += 4;
+			break;
+		}
+	}
+	*end = '\0';
+	return sum;
+}
+
+int pcb_hid_cfg_keys_seq(pcb_hid_cfg_keys_t *km, char *dst, int dst_len)
+{
+	if (km->seq_len_action > 0)
+		return pcb_hid_cfg_keys_seq_(km, km->seq, km->seq_len_action, dst, dst_len);
+	else
+		return pcb_hid_cfg_keys_seq_(km, km->seq, km->seq_len, dst, dst_len);
+}
Index: tags/2.0.1/src/hid_cfg_input.h
===================================================================
--- tags/2.0.1/src/hid_cfg_input.h	(nonexistent)
+++ tags/2.0.1/src/hid_cfg_input.h	(revision 18980)
@@ -0,0 +1,161 @@
+#ifndef PCB_HID_CFG_INPUT_H
+#define PCB_HID_CFG_INPUT_H
+
+#include <liblihata/dom.h>
+#include <genht/htip.h>
+#include <genht/htpp.h>
+#include "hid_cfg.h"
+
+#define PCB_M_Mod0(n)  (1u<<(n))
+typedef enum {
+	PCB_M_Shift   = PCB_M_Mod0(0),
+	PCB_M_Ctrl    = PCB_M_Mod0(1),
+	PCB_M_Alt     = PCB_M_Mod0(2),
+	PCB_M_Mod1    = PCB_M_Alt,
+	/* PCB_M_Mod(3) is PCB_M_Mod0(4) */
+	/* PCB_M_Mod(4) is PCB_M_Mod0(5) */
+	PCB_M_Release = PCB_M_Mod0(6), /* there might be a random number of modkeys, but hopefully not this many */
+
+	PCB_MB_LEFT   = PCB_M_Mod0(7),
+	PCB_MB_MIDDLE = PCB_M_Mod0(8),
+	PCB_MB_RIGHT  = PCB_M_Mod0(9),
+
+/* scroll wheel */
+	PCB_MB_SCROLL_UP     = PCB_M_Mod0(10),
+	PCB_MB_SCROLL_DOWN   = PCB_M_Mod0(11),
+	PCB_MB_SCROLL_LEFT   = PCB_M_Mod0(12),
+	PCB_MB_SCROLL_RIGHT  = PCB_M_Mod0(13)
+} pcb_hid_cfg_mod_t;
+#undef PCB_M_Mod0
+
+#define PCB_MB_ANY (PCB_MB_LEFT | PCB_MB_MIDDLE | PCB_MB_RIGHT | PCB_MB_SCROLL_UP | PCB_MB_SCROLL_DOWN | PCB_MB_SCROLL_LEFT | PCB_MB_SCROLL_RIGHT)
+#define PCB_M_ANY  (PCB_M_Release-1)
+
+/************************** MOUSE ***************************/
+
+typedef struct {
+	lht_node_t *mouse;
+	htip_t *mouse_mask;
+} pcb_hid_cfg_mouse_t;
+
+int hid_cfg_mouse_init(pcb_hid_cfg_t *hr, pcb_hid_cfg_mouse_t *mouse);
+void hid_cfg_mouse_action(pcb_hid_cfg_mouse_t *mouse, pcb_hid_cfg_mod_t button_and_mask, pcb_bool cmd_entry_active);
+
+
+/************************** KEYBOARD ***************************/
+#define HIDCFG_MAX_KEYSEQ_LEN 32
+typedef struct hid_cfg_keyhash_s {
+	unsigned short int mods;          /* of pcb_hid_cfg_mod_t */
+	unsigned short int key_raw;
+	unsigned short int key_tr;
+} hid_cfg_keyhash_t;
+
+
+typedef struct pcb_hid_cfg_keyseq_s  pcb_hid_cfg_keyseq_t;
+struct pcb_hid_cfg_keyseq_s {
+	hid_cfg_keyhash_t addr;
+
+	unsigned long int keysym;  /* optional 32 bit long storage the GUI hid should cast to whatever the GUI backend supports */
+
+	const lht_node_t *action_node; /* terminal node: end of sequence, run actions */
+
+	htpp_t seq_next; /* ... or if node is NULL, a hash for each key that may follow the current one */
+	pcb_hid_cfg_keyseq_t *parent;
+};
+
+/* Translate symbolic name to single-char keysym before processing; useful
+   for shortcuts like "Return -> '\r'" which are otherwise hard to describe
+   in text format */
+typedef struct pcb_hid_cfg_keytrans_s {
+		const char *name;
+		char sym;
+} pcb_hid_cfg_keytrans_t;
+
+extern const pcb_hid_cfg_keytrans_t hid_cfg_key_default_trans[];
+
+/* A complete tree of keyboard shortcuts/hotkeys */
+typedef struct pcb_hid_cfg_keys_s {
+	htpp_t keys;
+
+	/* translate key sym description (the portion after <Key>) to key_char;
+	   desc is a \0 terminated string, len is only a hint. Should return 0
+	   on error. */
+	unsigned short int (*translate_key)(const char *desc, int len);
+
+	/* convert a key_char to human readable name, copy the string to out/out_len.
+	   Return 0 on success. */
+	int (*key_name)(unsigned short int key_char, char *out, int out_len);
+
+
+	int auto_chr;                       /* if non-zero: don't call translate_key() for 1-char symbols, handle the default way */
+	const pcb_hid_cfg_keytrans_t *auto_tr;  /* apply this table before calling translate_key() */
+
+	/* current sequence state */
+	pcb_hid_cfg_keyseq_t *seq[HIDCFG_MAX_KEYSEQ_LEN];
+	int seq_len;
+	int seq_len_action; /* when an action node is hit, save sequence length for executing the action while seq_len is reset */
+} pcb_hid_cfg_keys_t;
+
+
+/* Initialize a new keyboard context
+   Returns 0 on success.
+*/
+int pcb_hid_cfg_keys_init(pcb_hid_cfg_keys_t *km);
+
+/* Free km's fields recursively */
+int pcb_hid_cfg_keys_uninit(pcb_hid_cfg_keys_t *km);
+
+/* Add the next key of a key sequence; key sequences form a tree. A key starting
+   a new key sequence should have parent set NULL, subsequent calls should have
+   parent set to the previously returned keyseq value. Terminal is non-zero if
+   this is the last key of the sequence.
+   Raw vs. translated keys are desribed at pcb_hid_cfg_keys_input().
+   Returns NULL on error and loads errmsg if not NULL */
+pcb_hid_cfg_keyseq_t *pcb_hid_cfg_keys_add_under(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t *parent, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, int terminal, const char **errmsg);
+
+/* Add a new key using a description (read from a lihata file usually)
+   If out_seq is not NULL, load the array with pointers pointing to each
+   key in the sequence, up to out_seq_len.
+   When key desc is a lihata node, it may be a list (multiple keys for the
+   same action). In this case return value and seq are set using the first key.
+   Returns -1 on failure or the length of the sequence.
+*/
+int pcb_hid_cfg_keys_add_by_desc(pcb_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node);
+int pcb_hid_cfg_keys_add_by_desc_(pcb_hid_cfg_keys_t *km, const lht_node_t *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len);
+int pcb_hid_cfg_keys_add_by_strdesc(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node);
+int pcb_hid_cfg_keys_add_by_strdesc_(pcb_hid_cfg_keys_t *km, const char *keydesc, const lht_node_t *action_node, pcb_hid_cfg_keyseq_t **out_seq, int out_seq_len);
+
+
+/* Allocate a new string and generate a human readable accel-text; mask determines
+   which keys on the list are generated (when multiple key sequences are
+   specified for the same action; from LSB to MSB, at most 32 keys)
+   Caller needs to free the string; returns NULL on error.
+   */
+char *pcb_hid_cfg_keys_gen_accel(pcb_hid_cfg_keys_t *km, const lht_node_t *keydescn, unsigned long mask, const char *sep);
+
+/* Process next input key stroke.
+   Seq and seq_len must not be NULL as they are the internal state of multi-key
+   processing. Load seq array with pointers pointing to each key in the
+   sequence, up to seq_len.
+   Key_raw is the raw key code for base keys, without any translation, key_tr
+   is the translated character; e.g. shift+1 is always reported as key_raw=1
+   and on US keyboard reported as key_tr=!
+   Returns:
+    -1 if the key stroke or sequence is invalid
+     0 if more characters needed to complete the sequence
+     + a positive integer means the lookup succeeded and the return value
+       is the length of the resulting sequence.
+*/
+int pcb_hid_cfg_keys_input(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr);
+int pcb_hid_cfg_keys_input_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_mod_t mods, unsigned short int key_raw, unsigned short int key_tr, pcb_hid_cfg_keyseq_t **seq, int *seq_len);
+
+/* Run the action for a key sequence looked up by pcb_hid_cfg_keys_input().
+   Returns: the result of the action or -1 on error */
+int pcb_hid_cfg_keys_action(pcb_hid_cfg_keys_t *km);
+int pcb_hid_cfg_keys_action_(pcb_hid_cfg_keyseq_t **seq, int seq_len);
+
+/* Print a squence into dst in human readable form; returns strlen(dst) */
+int pcb_hid_cfg_keys_seq(pcb_hid_cfg_keys_t *km, char *dst, int dst_len);
+int pcb_hid_cfg_keys_seq_(pcb_hid_cfg_keys_t *km, pcb_hid_cfg_keyseq_t **seq, int seq_len, char *dst, int dst_len);
+
+#endif
Index: tags/2.0.1/src/hid_color.c
===================================================================
--- tags/2.0.1/src/hid_color.c	(nonexistent)
+++ tags/2.0.1/src/hid_color.c	(revision 18980)
@@ -0,0 +1,88 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include <string.h>
+#include "config.h"
+#include "hid_color.h"
+#include <genht/hash.h>
+#include "compat_misc.h"
+
+static pcb_hidval_t invalid_color = { 0 };
+
+#define HT_HAS_CONST_KEY
+typedef char *htsh_key_t;
+typedef const char *htsh_const_key_t;
+typedef pcb_hidval_t htsh_value_t;
+#define HT_INVALID_VALUE invalid_color
+#define HT(x) htsh_ ## x
+#include <genht/ht.h>
+#include <genht/ht.c>
+#undef HT
+
+
+int pcb_hid_cache_color(int set, const char *name, pcb_hidval_t * val, void **vcache)
+{
+	htsh_t *cache;
+	htsh_entry_t *e;
+
+	cache = (htsh_t *) * vcache;
+	if (cache == 0) {
+		cache = htsh_alloc(strhash, strkeyeq);
+		*vcache = cache;
+	}
+
+	if (!set) { /* read */
+		e = htsh_getentry(cache, (char *)name);
+		if (e == NULL) /* not found */
+			return 0;
+		memcpy(val, &e->value, sizeof(pcb_hidval_t));
+	}
+	else
+		htsh_set(cache, pcb_strdup(name), *val); /* write */
+
+	return 1;
+}
+
+void pcb_hid_cache_color_destroy(void **vcache, void (*user_free)(void **vcache, const char *name, pcb_hidval_t *val))
+{
+	htsh_t *cache = (htsh_t *) * vcache;
+	htsh_entry_t *e;
+
+	if (cache == 0)
+		return;
+
+	for (e = htsh_first(cache); e; e = htsh_next(cache, e)) {
+		user_free(vcache, e->key, &e->value);
+		free(e->key); /* name allocated with pcb_strdup() */
+	}
+	htsh_free(cache);
+	*vcache = NULL;
+}
+
Index: tags/2.0.1/src/hid_color.h
===================================================================
--- tags/2.0.1/src/hid_color.h	(nonexistent)
+++ tags/2.0.1/src/hid_color.h	(revision 18980)
@@ -0,0 +1,18 @@
+#ifndef PCB_HID_COLOR_H
+#define PCB_HID_COLOR_H
+
+#include "hid.h"
+
+/* HID internal interfaces.  These may ONLY be called from the HID
+   modules, not from the common PCB code.  */
+
+/* Used to cache color lookups.  If set is zero, it looks up the name
+   and if found sets val and returns nonzero.  If not found, it
+   returns zero.  If set is nonzero, name/val is added to the
+   cache.  */
+int pcb_hid_cache_color(int set, const char *name, pcb_hidval_t * val, void **cache);
+
+/* Call user_free() on each cache entry and then destroy the cache */
+void pcb_hid_cache_color_destroy(void **vcache, void (*user_free)(void **vcache, const char *name, pcb_hidval_t *val));
+
+#endif
Index: tags/2.0.1/src/hid_dad.h
===================================================================
--- tags/2.0.1/src/hid_dad.h	(nonexistent)
+++ tags/2.0.1/src/hid_dad.h	(revision 18980)
@@ -0,0 +1,257 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_HID_DAD_H
+#define PCB_HID_DAD_H
+
+#include <stddef.h>
+#include <assert.h>
+#include "compat_misc.h"
+#include "hid_attrib.h"
+#include "pcb-printf.h"
+
+/*** Helpers for building dynamic attribute dialogs (DAD) ***/
+#define PCB_DAD_DECL(table) \
+	pcb_hid_attribute_t *table = NULL; \
+	pcb_hid_attr_val_t *table ## _result = NULL; \
+	int table ## _len = 0; \
+	int table ## _alloced = 0; \
+	void *table ## _hid_ctx = NULL; \
+
+#define PCB_DAD_DECL_NOINIT(table) \
+	pcb_hid_attribute_t *table; \
+	pcb_hid_attr_val_t *table ## _result; \
+	int table ## _len; \
+	int table ## _alloced; \
+	void *table ## _hid_ctx; \
+
+/* Free all resources allocated by DAD macros for table */
+#define PCB_DAD_FREE(table) \
+do { \
+	int __n__; \
+	if (table ## _hid_ctx != NULL) \
+		pcb_gui->attr_dlg_free(table ## _hid_ctx); \
+	for(__n__ = 0; __n__ < table ## _len; __n__++) { \
+		PCB_DAD_FREE_FIELD(table, __n__); \
+	} \
+	free(table); \
+	free(table ## _result); \
+} while(0)
+
+#define PCB_DAD_NEW(table, title, descr, caller_data, modal, ev_cb) \
+do { \
+	if (table ## _result == NULL) \
+		PCB_DAD_ALLOC_RESULT(table); \
+	table ## _hid_ctx = pcb_gui->attr_dlg_new(table, table ## _len, table ## _result, title, descr, caller_data, modal, ev_cb); \
+} while(0)
+
+#define PCB_DAD_RUN(table) pcb_gui->attr_dlg_run(table ## _hid_ctx)
+
+#define PCB_DAD_AUTORUN(table, title, descr, caller_data) \
+do { \
+	if (table ## _result == NULL) \
+		PCB_DAD_ALLOC_RESULT(table); \
+	pcb_attribute_dialog(table, table ## _len, table ## _result, title, descr, caller_data); \
+} while(0)
+
+/* Return the index of the item currenty being edited */
+#define PCB_DAD_CURRENT(table) (table ## _len - 1)
+
+/* Begin a new box or table */
+#define PCB_DAD_BEGIN(table, item_type) \
+	PCB_DAD_ALLOC(table, item_type);
+
+#define PCB_DAD_BEGIN_TABLE(table, cols) \
+do { \
+	PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_TABLE); \
+	PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_table_cols, cols); \
+} while(0)
+
+#define PCB_DAD_BEGIN_TABBED(table, tabs) \
+do { \
+	PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_TABBED); \
+	PCB_DAD_SET_ATTR_FIELD(table, enumerations, tabs); \
+} while(0)
+
+#define PCB_DAD_BEGIN_HBOX(table)      PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_HBOX)
+#define PCB_DAD_BEGIN_VBOX(table)      PCB_DAD_BEGIN(table, PCB_HATT_BEGIN_VBOX)
+#define PCB_DAD_END(table)             PCB_DAD_BEGIN(table, PCB_HATT_END)
+#define PCB_DAD_COMPFLAG(table, val)   PCB_DAD_SET_ATTR_FIELD(table, pcb_hatt_flags, val)
+
+#define PCB_DAD_LABEL(table, text) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_LABEL); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup(text)); \
+} while(0)
+
+/* Add label usign printf formatting syntax: PCB_DAD_LABELF(tbl, ("a=%d", 12)); */
+#define PCB_DAD_LABELF(table, printf_args) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_LABEL); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup_printf printf_args); \
+} while(0)
+
+#define PCB_DAD_ENUM(table, choices) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_ENUM); \
+	PCB_DAD_SET_ATTR_FIELD(table, enumerations, choices); \
+} while(0)
+
+#define PCB_DAD_BOOL(table, label) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_BOOL); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, pcb_strdup(label)); \
+} while(0)
+
+#define PCB_DAD_INTEGER(table, label) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_INTEGER); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, label); \
+} while(0)
+
+#define PCB_DAD_REAL(table, label) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_REAL); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, label); \
+} while(0)
+
+#define PCB_DAD_COORD(table, label) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_COORD); \
+	PCB_DAD_SET_ATTR_FIELD(table, name, label); \
+} while(0)
+
+#define PCB_DAD_STRING(table) \
+	PCB_DAD_ALLOC(table, PCB_HATT_STRING); \
+
+#define PCB_DAD_BUTTON(table, text) \
+do { \
+	PCB_DAD_ALLOC(table, PCB_HATT_BUTTON); \
+	table[table ## _len - 1].default_val.str_value = text; \
+} while(0)
+
+#define PCB_DAD_DUP_ATTR(table, attr) \
+do { \
+	PCB_DAD_ALLOC(table, 0); \
+	memcpy(&table[table ## _len-1], (attr), sizeof(pcb_hid_attribute_t)); \
+} while(0)
+
+
+/* Set properties of the current item */
+#define PCB_DAD_MINVAL(table, val)       PCB_DAD_SET_ATTR_FIELD(table, min_val, val)
+#define PCB_DAD_MAXVAL(table, val)       PCB_DAD_SET_ATTR_FIELD(table, max_val, val)
+#define PCB_DAD_DEFAULT(table, val)      PCB_DAD_SET_ATTR_FIELD_VAL(table, default_val, val)
+#define PCB_DAD_MINMAX(table, min, max)  (PCB_DAD_SET_ATTR_FIELD(table, min_val, min),PCB_DAD_SET_ATTR_FIELD(table, max_val, max))
+#define PCB_DAD_CHANGE_CB(table, cb)     PCB_DAD_SET_ATTR_FIELD(table, change_cb, cb)
+#define PCB_DAD_HELP(table, val)         PCB_DAD_SET_ATTR_FIELD(table, help_text, val)
+
+/* safe way to call gui->attr_dlg_set_value() - resets the unused fields */
+#define PCB_DAD_SET_VALUE(hid_ctx, wid, field, val) \
+	do { \
+		pcb_hid_attr_val_t __val__; \
+		memset(&__val__, 0, sizeof(__val__)); \
+		__val__.field = val; \
+		pcb_gui->attr_dlg_set_value(hid_ctx, wid, &__val__); \
+	} while(0)
+
+/*** DAD internals (do not use directly) ***/
+#define PCB_DAD_ALLOC(table, item_type) \
+	do { \
+		if (table ## _len >= table ## _alloced) { \
+			table ## _alloced += 16; \
+			table = realloc(table, sizeof(table[0]) * table ## _alloced); \
+		} \
+		memset(&table[table ## _len], 0, sizeof(table[0])); \
+		table[table ## _len].type = item_type; \
+		table ## _len++; \
+	} while(0)
+
+#define PCB_DAD_SET_ATTR_FIELD(table, field, value) \
+	table[table ## _len - 1].field = (value)
+
+#define PCB_DAD_SET_ATTR_FIELD_VAL(table, field, val) \
+do { \
+	switch(table[table ## _len - 1].type) { \
+		case PCB_HATT_LABEL: \
+			assert(0); \
+			break; \
+		case PCB_HATT_INTEGER: \
+		case PCB_HATT_BOOL: \
+		case PCB_HATT_ENUM: \
+		case PCB_HATT_COORD: \
+		case PCB_HATT_UNIT: \
+		case PCB_HATT_BEGIN_TABBED: \
+			table[table ## _len - 1].field.int_value = (int)val; \
+			break; \
+		case PCB_HATT_REAL: \
+			table[table ## _len - 1].field.real_value = (double)val; \
+			break; \
+		case PCB_HATT_STRING: \
+		case PCB_HATT_PATH: \
+		case PCB_HATT_BUTTON: \
+			table[table ## _len - 1].field.str_value = (char *)val; \
+			break; \
+		case PCB_HATT_BEGIN_HBOX: \
+		case PCB_HATT_BEGIN_VBOX: \
+		case PCB_HATT_BEGIN_TABLE: \
+		case PCB_HATT_END: \
+			assert(0); \
+	} \
+} while(0)
+
+#define PCB_DAD_FREE_FIELD(table, field) \
+do { \
+	switch(table[table ## _len - 1].type) { \
+		case PCB_HATT_LABEL: \
+			free((char *)table[table ## _len - 1].name); \
+			break; \
+		case PCB_HATT_INTEGER: \
+		case PCB_HATT_BOOL: \
+		case PCB_HATT_ENUM: \
+		case PCB_HATT_COORD: \
+		case PCB_HATT_UNIT: \
+		case PCB_HATT_REAL: \
+		case PCB_HATT_STRING: \
+		case PCB_HATT_PATH: \
+		case PCB_HATT_BUTTON: \
+		case PCB_HATT_TREE: \
+			break; \
+		case PCB_HATT_BEGIN_HBOX: \
+		case PCB_HATT_BEGIN_VBOX: \
+		case PCB_HATT_BEGIN_TABLE: \
+		case PCB_HATT_BEGIN_TABBED: \
+		case PCB_HATT_END: \
+			break; \
+	} \
+} while(0)
+
+#define PCB_DAD_ALLOC_RESULT(table) \
+do { \
+	free(table ## _result); \
+	table ## _result = calloc(PCB_DAD_CURRENT(table)+1, sizeof(pcb_hid_attr_val_t)); \
+} while(0)
+
+#endif
Index: tags/2.0.1/src/hid_draw_helpers.c
===================================================================
--- tags/2.0.1/src/hid_draw_helpers.c	(nonexistent)
+++ tags/2.0.1/src/hid_draw_helpers.c	(revision 18980)
@@ -0,0 +1,225 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "hid.h"
+#include "polygon.h"
+#include "obj_poly.h"
+#include "hid_inlines.h"
+
+static void fill_contour(pcb_hid_gc_t gc, pcb_pline_t * pl)
+{
+	pcb_coord_t *x, *y, n, i = 0;
+	pcb_vnode_t *v;
+
+	n = pl->Count;
+	x = (pcb_coord_t *) malloc(n * sizeof(*x));
+	y = (pcb_coord_t *) malloc(n * sizeof(*y));
+
+	for (v = &pl->head; i < n; v = v->next) {
+		x[i] = v->point[0];
+		y[i++] = v->point[1];
+	}
+
+	pcb_gui->fill_polygon(gc, n, x, y);
+
+	free(x);
+	free(y);
+}
+
+static void thindraw_contour(pcb_hid_gc_t gc, pcb_pline_t * pl)
+{
+	pcb_vnode_t *v;
+	pcb_coord_t last_x, last_y, this_x, this_y, mindist;
+
+
+	pcb_hid_set_line_width(gc, 0);
+	pcb_hid_set_line_cap(gc, pcb_cap_round);
+
+	/* If the contour is round, use an arc drawing routine. */
+	if (pl->is_round) {
+		pcb_gui->draw_arc(gc, pl->cx, pl->cy, pl->radius, pl->radius, 0, 360);
+		return;
+	}
+
+	/* Need at least two points in the contour */
+	if (pl->head.next == NULL)
+		return;
+
+	last_x = pl->head.point[0];
+	last_y = pl->head.point[1];
+	v = pl->head.next;
+	mindist = pcb_gui->coord_per_pix * 2;
+
+	do {
+		this_x = v->point[0];
+		this_y = v->point[1];
+
+		if ((PCB_ABS(this_x - last_x) < mindist) && (PCB_ABS(this_y - last_y) < mindist))
+			continue;
+
+		pcb_gui->draw_line(gc, last_x, last_y, this_x, this_y);
+		/* pcb_gui->fill_circle (gc, this_x, this_y, 30); */
+
+		last_x = this_x;
+		last_y = this_y;
+	}
+	while ((v = v->next) != pl->head.next);
+}
+
+static void fill_contour_cb(pcb_pline_t * pl, void *user_data)
+{
+	pcb_hid_gc_t gc = (pcb_hid_gc_t) user_data;
+	pcb_pline_t *local_pl = pl;
+
+	fill_contour(gc, pl);
+	pcb_poly_contours_free(&local_pl);
+}
+
+static void fill_clipped_contour(pcb_hid_gc_t gc, pcb_pline_t * pl, const pcb_box_t * clip_box)
+{
+	pcb_pline_t *pl_copy;
+	pcb_polyarea_t *clip_poly;
+	pcb_polyarea_t *piece_poly;
+	pcb_polyarea_t *clipped_pieces;
+	pcb_polyarea_t *draw_piece;
+	int x;
+
+	/* Optimization: the polygon has no holes; if it is smaller the clip_box,
+	   it is safe to draw directly */
+	if ((clip_box->X1 <= pl->xmin) && (clip_box->X2 >= pl->xmax) && (clip_box->Y1 <= pl->ymin) && (clip_box->Y2 >= pl->ymax)) {
+		fill_contour(gc, pl);
+		return;
+	}
+
+	clip_poly = pcb_poly_from_rect(clip_box->X1, clip_box->X2, clip_box->Y1, clip_box->Y2);
+	pcb_poly_contour_copy(&pl_copy, pl);
+	piece_poly = pcb_polyarea_create();
+	pcb_polyarea_contour_include(piece_poly, pl_copy);
+	x = pcb_polyarea_boolean_free(piece_poly, clip_poly, &clipped_pieces, PCB_PBO_ISECT);
+	if (x != pcb_err_ok || clipped_pieces == NULL)
+		return;
+
+	draw_piece = clipped_pieces;
+	do {
+		/* NB: The polygon won't have any holes in it */
+		fill_contour(gc, draw_piece->contours);
+	}
+	while ((draw_piece = draw_piece->f) != clipped_pieces);
+	pcb_polyarea_free(&clipped_pieces);
+}
+
+/* If at least 50% of the bounding box of the polygon is on the screen,
+ * lets compute the complete no-holes polygon.
+ */
+#define BOUNDS_INSIDE_CLIP_THRESHOLD 0.5
+static int should_compute_no_holes(pcb_poly_t * poly, const pcb_box_t * clip_box)
+{
+	pcb_coord_t x1, x2, y1, y2;
+	double poly_bounding_area;
+	double clipped_poly_area;
+
+	/* If there is no passed clip box, compute the whole thing */
+	if (clip_box == NULL)
+		return 1;
+
+	x1 = MAX(poly->BoundingBox.X1, clip_box->X1);
+	x2 = MIN(poly->BoundingBox.X2, clip_box->X2);
+	y1 = MAX(poly->BoundingBox.Y1, clip_box->Y1);
+	y2 = MIN(poly->BoundingBox.Y2, clip_box->Y2);
+
+	/* Check if the polygon is outside the clip box */
+	if ((x2 <= x1) || (y2 <= y1))
+		return 0;
+
+	poly_bounding_area = (double) (poly->BoundingBox.X2 - poly->BoundingBox.X1) *
+		(double) (poly->BoundingBox.Y2 - poly->BoundingBox.Y1);
+
+	clipped_poly_area = (double) (x2 - x1) * (double) (y2 - y1);
+
+	if (clipped_poly_area / poly_bounding_area >= BOUNDS_INSIDE_CLIP_THRESHOLD)
+		return 1;
+
+	return 0;
+}
+
+#undef BOUNDS_INSIDE_CLIP_THRESHOLD
+
+void pcb_dhlp_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box)
+{
+	if (!poly->NoHolesValid) {
+		/* If enough of the polygon is on-screen, compute the entire
+		 * NoHoles version and cache it for later rendering, otherwise
+		 * just compute what we need to render now.
+		 */
+		if (should_compute_no_holes(poly, clip_box))
+			pcb_poly_compute_no_holes(poly);
+		else
+			pcb_poly_no_holes_dicer(poly, clip_box, fill_contour_cb, gc);
+	}
+	if (poly->NoHolesValid && poly->NoHoles) {
+		pcb_pline_t *pl;
+
+		for (pl = poly->NoHoles; pl != NULL; pl = pl->next) {
+			if (clip_box == NULL)
+				fill_contour(gc, pl);
+			else
+				fill_clipped_contour(gc, pl, clip_box);
+		}
+	}
+
+	/* Draw other parts of the polygon if fullpoly flag is set */
+	/* NB: No "NoHoles" cache for these */
+	if (PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, poly)) {
+		pcb_poly_t p = *poly;
+
+		for (p.Clipped = poly->Clipped->f; p.Clipped != poly->Clipped; p.Clipped = p.Clipped->f)
+			pcb_poly_no_holes_dicer(&p, clip_box, fill_contour_cb, gc);
+	}
+}
+
+static int thindraw_hole_cb(pcb_pline_t * pl, void *user_data)
+{
+	pcb_hid_gc_t gc = (pcb_hid_gc_t) user_data;
+	thindraw_contour(gc, pl);
+	return 0;
+}
+
+void pcb_dhlp_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box)
+{
+	thindraw_contour(gc, poly->Clipped->contours);
+	pcb_poly_holes(poly, clip_box, thindraw_hole_cb, gc);
+}
+
+void pcb_dhlp_draw_helpers_init(pcb_hid_t * hid)
+{
+	hid->fill_pcb_polygon      = pcb_dhlp_fill_pcb_polygon;
+	hid->thindraw_pcb_polygon  = pcb_dhlp_thindraw_pcb_polygon;
+}
Index: tags/2.0.1/src/hid_draw_helpers.h
===================================================================
--- tags/2.0.1/src/hid_draw_helpers.h	(nonexistent)
+++ tags/2.0.1/src/hid_draw_helpers.h	(revision 18980)
@@ -0,0 +1,6 @@
+#ifndef PCB_HID_DRAW_HELPERS_H
+#define PCB_HID_DRAW_HELPERS_H
+void pcb_dhlp_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box);
+void pcb_dhlp_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box);
+void pcb_dhlp_draw_helpers_init(pcb_hid_t * hid);
+#endif
Index: tags/2.0.1/src/hid_extents.c
===================================================================
--- tags/2.0.1/src/hid_extents.c	(nonexistent)
+++ tags/2.0.1/src/hid_extents.c	(revision 18980)
@@ -0,0 +1,195 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "hid_draw_helpers.h"
+#include "hid_extents.h"
+
+static pcb_box_t box;
+
+typedef struct hid_gc_s {
+	int width;
+} hid_gc_s;
+
+static int extents_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_COPPER:
+		case PCB_LYT_OUTLINE:
+		case PCB_LYT_SILK:
+		case PCB_LYT_PDRILL:
+		case PCB_LYT_UDRILL:
+			return 1;
+		default:
+			return 0;
+	}
+	return 0;
+}
+
+static pcb_hid_gc_t extents_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(hid_gc_s));
+	memset(rv, 0, sizeof(hid_gc_s));
+	return rv;
+}
+
+static void extents_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void extents_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+}
+
+static void extents_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+}
+
+static void extents_set_color(pcb_hid_gc_t gc, const char *name)
+{
+}
+
+static void extents_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+}
+
+static void extents_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void extents_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+}
+
+#define PEX(x,w) if (box.X1 > (x)-(w)) box.X1 = (x)-(w); \
+	if (box.X2 < (x)+(w)) box.X2 = (x)+(w)
+#define PEY(y,w) if (box.Y1 > (y)-(w)) box.Y1 = (y)-(w); \
+	if (box.Y2 < (y)+(w)) box.Y2 = (y)+(w)
+
+static void extents_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	PEX(x1, gc->width);
+	PEY(y1, gc->width);
+	PEX(x2, gc->width);
+	PEY(y2, gc->width);
+}
+
+static void extents_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t end_angle)
+{
+	/* Naive but good enough.  */
+	PEX(cx, width + gc->width);
+	PEY(cy, height + gc->width);
+}
+
+static void extents_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	PEX(x1, gc->width);
+	PEY(y1, gc->width);
+	PEX(x2, gc->width);
+	PEY(y2, gc->width);
+}
+
+static void extents_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	PEX(cx, radius);
+	PEY(cy, radius);
+}
+
+static void extents_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	int i;
+	for (i = 0; i < n_coords; i++) {
+		PEX(x[i], 0);
+		PEY(y[i], 0);
+	}
+}
+
+static void extents_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	PEX(x1, 0);
+	PEY(y1, 0);
+	PEX(x2, 0);
+	PEY(y2, 0);
+}
+
+static pcb_hid_t extents_hid;
+
+void hid_extents_init(void)
+{
+	static pcb_bool initialised = pcb_false;
+
+	if (initialised)
+		return;
+
+	memset(&extents_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_dhlp_draw_helpers_init(&extents_hid);
+
+	extents_hid.struct_size = sizeof(pcb_hid_t);
+	extents_hid.name = "extents-extents";
+	extents_hid.description = "used to calculate extents";
+
+	extents_hid.set_layer_group = extents_set_layer_group;
+	extents_hid.make_gc = extents_make_gc;
+	extents_hid.destroy_gc = extents_destroy_gc;
+	extents_hid.set_drawing_mode = extents_set_drawing_mode;
+	extents_hid.render_burst = extents_render_burst;
+	extents_hid.set_color = extents_set_color;
+	extents_hid.set_line_cap = extents_set_line_cap;
+	extents_hid.set_line_width = extents_set_line_width;
+	extents_hid.set_draw_xor = extents_set_draw_xor;
+	extents_hid.draw_line = extents_draw_line;
+	extents_hid.draw_arc = extents_draw_arc;
+	extents_hid.draw_rect = extents_draw_rect;
+	extents_hid.fill_circle = extents_fill_circle;
+	extents_hid.fill_polygon = extents_fill_polygon;
+	extents_hid.fill_rect = extents_fill_rect;
+
+	initialised = pcb_true;
+}
+
+pcb_box_t *pcb_hid_get_extents_pinout(void *item)
+{
+	/* As this isn't a real "HID", we need to ensure we are initialised. */
+	hid_extents_init();
+
+	box.X1 = COORD_MAX;
+	box.Y1 = COORD_MAX;
+	box.X2 = -COORD_MAX;
+	box.Y2 = -COORD_MAX;
+
+	pcb_hid_expose_pinout(&extents_hid, item);
+
+	return &box;
+}
Index: tags/2.0.1/src/hid_extents.h
===================================================================
--- tags/2.0.1/src/hid_extents.h	(nonexistent)
+++ tags/2.0.1/src/hid_extents.h	(revision 18980)
@@ -0,0 +1,12 @@
+#ifndef PCB_HID_EXTENTS_H
+#define PCB_HID_EXTENTS_H
+
+/* HID internal interfaces.  These may ONLY be called from the HID
+   modules, not from the common PCB code.  */
+
+/* Convenience function that calls the expose callback for the item,
+   and returns the extents of what was drawn.  */
+pcb_box_t *pcb_hid_get_extents_pinout(void *item);
+
+
+#endif
Index: tags/2.0.1/src/hid_flags.c
===================================================================
--- tags/2.0.1/src/hid_flags.c	(nonexistent)
+++ tags/2.0.1/src/hid_flags.c	(revision 18980)
@@ -0,0 +1,135 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "data.h"
+#include "board.h"
+#include "conf.h"
+
+#include "hid_flags.h"
+#include "genht/hash.h"
+#include "genht/htsp.h"
+#include "error.h"
+#include "actions.h"
+
+int pcb_hid_get_flag(const char *name)
+{
+	const char *cp;
+
+	if (name == NULL)
+		return -1;
+
+	cp = strchr(name, '(');
+	if (cp == NULL) {
+		conf_native_t *n = conf_get_field(name);
+		if (n == NULL)
+			return -1;
+		if ((n->type != CFN_BOOLEAN) || (n->used != 1))
+			return -1;
+		return n->val.boolean[0];
+	}
+	else {
+		const char *end, *s;
+		fgw_arg_t res, argv[2];
+		if (cp != NULL) {
+			const pcb_action_t *a;
+			fgw_func_t *f;
+			char buff[256];
+			int len, multiarg;
+			len = cp - name;
+			if (len > sizeof(buff)-1) {
+				pcb_message(PCB_MSG_ERROR, "hid_get_flag: action name too long: %s()\n", name);
+				return -1;
+			}
+			memcpy(buff, name, len);
+			buff[len] = '\0';
+			a = pcb_find_action(buff, &f);
+			if (!a) {
+				pcb_message(PCB_MSG_ERROR, "hid_get_flag: no action %s\n", name);
+				return -1;
+			}
+			cp++;
+			len = strlen(cp);
+			end = NULL;
+			multiarg = 0;
+			for(s = cp; *s != '\0'; s++) {
+				if (*s == ')') {
+					end = s;
+					break;
+				}
+				if (*s == ',')
+					multiarg = 1;
+			}
+			if (!multiarg) {
+				/* faster but limited way for a single arg */
+				if ((len > sizeof(buff)-1) || (end == NULL)) {
+					pcb_message(PCB_MSG_ERROR, "hid_get_flag: action arg too long or unterminated: %s\n", name);
+					return -1;
+				}
+				len = end - cp;
+				memcpy(buff, cp, len);
+				buff[len] = '\0';
+				argv[0].type = FGW_FUNC;
+				argv[0].val.func = f;
+				argv[1].type = FGW_STR;
+				argv[1].val.str = buff;
+				res.type = FGW_INVALID;
+				if (pcb_actionv_(f, &res, (len > 0) ? 2 : 1, argv) != 0)
+					return -1;
+				fgw_arg_conv(&pcb_fgw, &res, FGW_INT);
+				return res.val.nat_int;
+			}
+			else {
+				/* slower but more generic way */
+				return pcb_parse_command(name, pcb_true);
+			}
+		}
+		else {
+			fprintf(stderr, "ERROR: pcb_hid_get_flag(%s) - not a path or an action\n", name);
+		}
+	}
+	return -1;
+}
+
+void pcb_hid_save_and_show_layer_ons(int *save_array)
+{
+	int i;
+	for (i = 0; i < pcb_max_layer; i++) {
+		save_array[i] = PCB->Data->Layer[i].meta.real.vis;
+		PCB->Data->Layer[i].meta.real.vis = 1;
+	}
+}
+
+void pcb_hid_restore_layer_ons(int *save_array)
+{
+	int i;
+	for (i = 0; i < pcb_max_layer; i++)
+		PCB->Data->Layer[i].meta.real.vis = save_array[i];
+}
Index: tags/2.0.1/src/hid_flags.h
===================================================================
--- tags/2.0.1/src/hid_flags.h	(nonexistent)
+++ tags/2.0.1/src/hid_flags.h	(revision 18980)
@@ -0,0 +1,18 @@
+#ifndef PCB_HID_FLAGS_H
+#define  PCB_HID_FLAGS_H
+
+/* Use this to temporarily enable all layers, so that they can be
+   exported even if they're not currently visible.  save_array must be
+   PCB_MAX_LAYER+2 big. */
+void pcb_hid_save_and_show_layer_ons(int *save_array);
+/* Use this to restore them.  */
+void pcb_hid_restore_layer_ons(int *save_array);
+
+
+/* Looks up an integer (usually boolean) value by conf path or by running
+   an action (if name has a parenthesis). When an action is run, it has 0
+   or 1 argument only and the return value of the action is returned.
+   On error, returns -1. */
+int pcb_hid_get_flag(const char *name);
+
+#endif
Index: tags/2.0.1/src/hid_init.c
===================================================================
--- tags/2.0.1/src/hid_init.c	(nonexistent)
+++ tags/2.0.1/src/hid_init.c	(revision 18980)
@@ -0,0 +1,238 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+
+/* for dlopen() and friends; will also solve all system-dependent includes
+   and provides a dl-compat layer on windows. Also solves the opendir related
+   includes. */
+#include "plugins.h"
+#include "actions.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "misc_util.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_inc.h"
+
+pcb_hid_t **pcb_hid_list = 0;
+int pcb_hid_num_hids = 0;
+
+pcb_hid_t *pcb_gui = NULL;
+pcb_hid_t *pcb_next_gui = NULL;
+pcb_hid_t *pcb_exporter = NULL;
+
+int pcb_pixel_slop = 1;
+
+pcb_plugin_dir_t *pcb_plugin_dir_first = NULL, *pcb_plugin_dir_last = NULL;
+
+void pcb_hid_init()
+{
+	char *tmp;
+
+	/* Setup a "nogui" default HID */
+	pcb_gui = pcb_hid_nogui_get_hid();
+
+#warning TODO: make this configurable - use pcb_conf_cmd_is_safe() to avoid plugin injection
+	tmp = pcb_concat(conf_core.rc.path.exec_prefix, PCB_DIR_SEPARATOR_S, "lib", PCB_DIR_SEPARATOR_S, "pcb-rnd", PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL);
+	pcb_plugin_add_dir(tmp);
+	free(tmp);
+
+	tmp = pcb_concat(conf_core.rc.path.exec_prefix, PCB_DIR_SEPARATOR_S, "lib", PCB_DIR_SEPARATOR_S, "pcb-rnd", PCB_DIR_SEPARATOR_S, "plugins", NULL);
+	pcb_plugin_add_dir(tmp);
+	free(tmp);
+
+	/* hardwired libdir, just in case exec-prefix goes wrong (e.g. linstall) */
+	tmp = pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL);
+	pcb_plugin_add_dir(tmp);
+	free(tmp);
+	tmp = pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S, "plugins", NULL);
+	pcb_plugin_add_dir(tmp);
+	free(tmp);
+
+	/* conf_core.rc.path.home is set by the conf_core immediately on startup */
+	if (conf_core.rc.path.home != NULL) {
+		tmp = pcb_concat(conf_core.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL);
+		pcb_plugin_add_dir(tmp);
+		free(tmp);
+
+		tmp = pcb_concat(conf_core.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, "plugins", NULL);
+		pcb_plugin_add_dir(tmp);
+		free(tmp);
+	}
+
+	tmp = pcb_concat("plugins", PCB_DIR_SEPARATOR_S, HOST, NULL);
+	pcb_plugin_add_dir(tmp);
+	free(tmp);
+
+	pcb_plugin_add_dir("plugins");
+}
+
+void pcb_hid_uninit(void)
+{
+	pcb_plugin_dir_t *pd, *next;
+
+	if (pcb_hid_num_hids > 0) {
+		int i;
+		for (i = pcb_hid_num_hids-1; i >= 0; i--) {
+			if (pcb_hid_list[i]->uninit != NULL)
+				pcb_hid_list[i]->uninit(pcb_hid_list[i]);
+		}
+	}
+	free(pcb_hid_list);
+
+	pup_uninit(&pcb_pup);
+
+	pcb_hid_attributes_uninit();
+
+	for(pd = pcb_plugin_dir_first; pd != NULL; pd = next) {
+		next = pd->next;
+		free(pd->path);
+		free(pd);
+	}
+	pcb_plugin_dir_first = pcb_plugin_dir_last = NULL;
+}
+
+void pcb_hid_register_hid(pcb_hid_t * hid)
+{
+	int i;
+	int sz = (pcb_hid_num_hids + 2) * sizeof(pcb_hid_t *);
+
+	if (hid->struct_size != sizeof(pcb_hid_t)) {
+		fprintf(stderr, "Warning: hid \"%s\" has an incompatible ABI.\n", hid->name);
+		return;
+	}
+
+	for (i = 0; i < pcb_hid_num_hids; i++)
+		if (hid == pcb_hid_list[i])
+			return;
+
+	pcb_hid_num_hids++;
+	if (pcb_hid_list)
+		pcb_hid_list = (pcb_hid_t **) realloc(pcb_hid_list, sz);
+	else
+		pcb_hid_list = (pcb_hid_t **) malloc(sz);
+
+	pcb_hid_list[pcb_hid_num_hids - 1] = hid;
+	pcb_hid_list[pcb_hid_num_hids] = 0;
+}
+
+void pcb_hid_remove_hid(pcb_hid_t * hid)
+{
+	int i;
+
+	for (i = 0; i < pcb_hid_num_hids; i++) {
+		if (hid == pcb_hid_list[i]) {
+			pcb_hid_list[i] = pcb_hid_list[pcb_hid_num_hids - 1];
+			pcb_hid_list[pcb_hid_num_hids - 1] = 0;
+			pcb_hid_num_hids--;
+			return;
+		}
+	}
+}
+
+
+pcb_hid_t *pcb_hid_find_gui(const char *preference)
+{
+	int i;
+
+	/* ugly hack for historical reasons: some old configs and veteran users are used to the --gui gtk option */
+	if ((preference != NULL) && (strcmp(preference, "gtk") == 0)) {
+		pcb_hid_t *g;
+
+		g = pcb_hid_find_gui("gtk2_gl");
+		if (g != NULL)
+			return g;
+
+		g = pcb_hid_find_gui("gtk2_gdk");
+		if (g != NULL)
+			return g;
+
+		return NULL;
+	}
+
+	/* normal search */
+	if (preference != NULL) {
+		for (i = 0; i < pcb_hid_num_hids; i++)
+			if (!pcb_hid_list[i]->printer && !pcb_hid_list[i]->exporter && !strcmp(pcb_hid_list[i]->name, preference))
+				return pcb_hid_list[i];
+		return NULL;
+	}
+
+	for (i = 0; i < pcb_hid_num_hids; i++)
+		if (!pcb_hid_list[i]->printer && !pcb_hid_list[i]->exporter)
+			return pcb_hid_list[i];
+
+	fprintf(stderr, "Error: No GUI available.\n");
+	exit(1);
+}
+
+pcb_hid_t *pcb_hid_find_printer()
+{
+	int i;
+
+	for (i = 0; i < pcb_hid_num_hids; i++)
+		if (pcb_hid_list[i]->printer)
+			return pcb_hid_list[i];
+
+	return 0;
+}
+
+pcb_hid_t *pcb_hid_find_exporter(const char *which)
+{
+	int i;
+
+	if (which == NULL) {
+		fprintf(stderr, "Invalid exporter: need an exporter name, one of:");
+		goto list;
+	}
+
+	for (i = 0; i < pcb_hid_num_hids; i++)
+		if (pcb_hid_list[i]->exporter && strcmp(which, pcb_hid_list[i]->name) == 0)
+			return pcb_hid_list[i];
+
+	fprintf(stderr, "Invalid exporter %s, available ones:", which);
+
+	list:;
+	for (i = 0; i < pcb_hid_num_hids; i++)
+		if (pcb_hid_list[i]->exporter)
+			fprintf(stderr, " %s", pcb_hid_list[i]->name);
+	fprintf(stderr, "\n");
+
+	return 0;
+}
+
+pcb_hid_t **pcb_hid_enumerate()
+{
+	return pcb_hid_list;
+}
Index: tags/2.0.1/src/hid_init.h
===================================================================
--- tags/2.0.1/src/hid_init.h	(nonexistent)
+++ tags/2.0.1/src/hid_init.h	(revision 18980)
@@ -0,0 +1,59 @@
+#ifndef PCB_HID_INIT_H
+#define PCB_HID_INIT_H
+
+#include "hid.h"
+
+/* NULL terminated list of all static HID structures.  Built by
+   hid_register_hid, used by hid_find_*() and pcb_hid_enumerate().  The
+   order in this list is the same as the order of hid_register_hid
+   calls.  */
+extern pcb_hid_t **pcb_hid_list;
+
+/* Count of entries in the above.  */
+extern int pcb_hid_num_hids;
+
+/* Call this as soon as possible from main().  No other HID calls are
+   valid until this is called.  */
+void pcb_hid_init(void);
+
+/* Call this at exit */
+void pcb_hid_uninit(void);
+
+/* When PCB runs in interactive mode, this is called to instantiate
+   one GUI HID which happens to be the GUI.  This HID is the one that
+   interacts with the mouse and keyboard.  */
+pcb_hid_t *pcb_hid_find_gui(const char *preference);
+
+/* Finds the one printer HID and instantiates it.  */
+pcb_hid_t *pcb_hid_find_printer(void);
+
+/* Finds the indicated exporter HID and instantiates it.  */
+pcb_hid_t *pcb_hid_find_exporter(const char *);
+
+/* This returns a NULL-terminated array of available HIDs.  The only
+   real reason to use this is to locate all the export-style HIDs. */
+pcb_hid_t **pcb_hid_enumerate(void);
+
+/* HID internal interfaces.  These may ONLY be called from the HID
+   modules, not from the common PCB code.  */
+
+/* A HID may use this if it does not need command line arguments in
+   any special format; for example, the Lesstif HID needs to use the
+   Xt parser, but the Postscript HID can use this function.  */
+int pcb_hid_parse_command_line(int *argc, char ***argv);
+
+/* Called by the init funcs, used to set up pcb_hid_list.  */
+extern void pcb_hid_register_hid(pcb_hid_t * hid);
+void pcb_hid_remove_hid(pcb_hid_t * hid);
+
+typedef struct pcb_plugin_dir_s pcb_plugin_dir_t;
+struct pcb_plugin_dir_s {
+	char *path;
+	int num_plugins;
+	pcb_plugin_dir_t *next;
+};
+
+extern pcb_plugin_dir_t *pcb_plugin_dir_first, *pcb_plugin_dir_last;
+
+
+#endif
Index: tags/2.0.1/src/hid_inlines.h
===================================================================
--- tags/2.0.1/src/hid_inlines.h	(nonexistent)
+++ tags/2.0.1/src/hid_inlines.h	(revision 18980)
@@ -0,0 +1,97 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_HID_INLINES
+#define PCB_HID_INLINES
+
+#include "hid.h"
+
+PCB_INLINE pcb_hid_gc_t pcb_hid_make_gc(void)
+{
+	pcb_hid_gc_t res;
+	pcb_core_gc_t *hc;
+	res = pcb_gui->make_gc();
+	hc = (pcb_core_gc_t *)res; /* assumes first field is pcb_core_gc_t */
+	hc->width = PCB_MAX_COORD;
+	hc->cap = pcb_cap_invalid;
+	hc->xor = 0;
+	hc->faded = 0;
+	return res;
+}
+
+PCB_INLINE void pcb_hid_destroy_gc(pcb_hid_gc_t gc)
+{
+	pcb_gui->destroy_gc(gc);
+}
+
+PCB_INLINE void pcb_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	pcb_core_gc_t *hc = (pcb_core_gc_t *)gc;
+	if (hc->cap != style) {
+		hc->cap = style;
+		pcb_gui->set_line_cap(gc, style);
+	}
+}
+
+PCB_INLINE void pcb_hid_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	pcb_core_gc_t *hc = (pcb_core_gc_t *)gc;
+	if (hc->width != width) {
+		hc->width = width;
+		pcb_gui->set_line_width(gc, width);
+	}
+}
+
+PCB_INLINE void pcb_hid_set_draw_xor(pcb_hid_gc_t gc, int xor)
+{
+	pcb_core_gc_t *hc = (pcb_core_gc_t *)gc;
+	if (hc->xor != xor) {
+		hc->xor = xor;
+		pcb_gui->set_draw_xor(gc, xor);
+	}
+}
+
+PCB_INLINE void pcb_hid_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	pcb_core_gc_t *hc = (pcb_core_gc_t *)gc;
+	if (hc->faded != faded) {
+		hc->faded = faded;
+		pcb_gui->set_draw_faded(gc, faded);
+	}
+}
+
+PCB_INLINE const char *pcb_hid_command_entry(const char *ovr, int *cursor)
+{
+	if ((pcb_gui == NULL) || (pcb_gui->command_entry == NULL)) {
+		if (cursor != NULL)
+			*cursor = -1;
+		return NULL;
+	}
+	return pcb_gui->command_entry(ovr, cursor);
+}
+
+
+#endif
Index: tags/2.0.1/src/hid_nogui.c
===================================================================
--- tags/2.0.1/src/hid_nogui.c	(nonexistent)
+++ tags/2.0.1/src/hid_nogui.c	(revision 18980)
@@ -0,0 +1,512 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *  Copyright (C) 2016..2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "hid.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "conf_core.h"
+
+/* This is the "gui" that is installed at startup, and is used when
+   there is no other real GUI to use.  For the most part, it just
+   stops the application from (1) crashing randomly, and (2) doing
+   gui-specific things when it shouldn't.  */
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called GUI function %s without having a GUI available.\n", func); abort()
+
+typedef struct hid_gc_s {
+	int nothing_interesting_here;
+} hid_gc_s;
+
+static pcb_hid_attribute_t *nogui_get_export_options(int *n_ret)
+{
+	if (n_ret != NULL)
+		*n_ret = 0;
+	return NULL;
+}
+
+static void nogui_do_export(pcb_hid_attr_val_t * options)
+{
+	CRASH("do_export");
+}
+
+static int nogui_parse_arguments(int *argc, char ***argv)
+{
+	CRASH("parse_arguments");
+}
+
+static void nogui_invalidate_lr(pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+{
+	CRASH("invalidate_lr");
+}
+
+static void nogui_invalidate_all(void)
+{
+	CRASH("invalidate_all");
+}
+
+static int nogui_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	CRASH("set_layer_group");
+	return 0;
+}
+
+static void nogui_end_layer(void)
+{
+}
+
+static pcb_hid_gc_t nogui_make_gc(void)
+{
+	return 0;
+}
+
+static void nogui_destroy_gc(pcb_hid_gc_t gc)
+{
+}
+
+static void nogui_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	CRASH("set_drawing_mode");
+}
+
+static void nogui_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	/* the HID may decide to ingore this hook */
+}
+
+static void nogui_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	CRASH("set_color");
+}
+
+static void nogui_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	CRASH("set_line_cap");
+}
+
+static void nogui_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	CRASH("set_line_width");
+}
+
+static void nogui_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	CRASH("set_draw_xor");
+}
+
+static void nogui_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+}
+
+static void nogui_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	CRASH("draw_line");
+}
+
+static void nogui_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t end_angle)
+{
+	CRASH("draw_arc");
+}
+
+static void nogui_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	CRASH("draw_rect");
+}
+
+static void nogui_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	CRASH("fill_circle");
+}
+
+static void nogui_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	CRASH("fill_polygon");
+}
+
+static void nogui_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box)
+{
+	CRASH("fill_pcb_polygon");
+}
+
+static void nogui_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	CRASH("fill_rect");
+}
+
+static void nogui_calibrate(double xval, double yval)
+{
+	CRASH("calibrate");
+}
+
+static int nogui_shift_is_pressed(void)
+{
+	/* This is called from pcb_crosshair_grid_fit() when the board is loaded.  */
+	return 0;
+}
+
+static int nogui_control_is_pressed(void)
+{
+	CRASH("control_is_pressed");
+	return 0;
+}
+
+static int nogui_mod1_is_pressed(void)
+{
+	CRASH("mod1_is_pressed");
+	return 0;
+}
+
+static void nogui_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+	CRASH("get_coords");
+}
+
+static void nogui_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static pcb_hidval_t nogui_add_timer(void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	pcb_hidval_t rv;
+	CRASH("add_timer");
+	rv.lval = 0;
+	return rv;
+}
+
+static void nogui_stop_timer(pcb_hidval_t timer)
+{
+	CRASH("stop_timer");
+}
+
+static pcb_hidval_t nogui_watch_file(int fd, unsigned int condition, pcb_bool (*func) (pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data), pcb_hidval_t user_data)
+{
+	pcb_hidval_t rv;
+	CRASH("watch_file");
+	rv.lval = 0;
+	return rv;
+}
+
+static void nogui_unwatch_file(pcb_hidval_t watch)
+{
+	CRASH("unwatch_file");
+}
+
+static pcb_hidval_t nogui_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t data)
+{
+	pcb_hidval_t rv;
+	CRASH("add_block_hook");
+	rv.ptr = NULL;
+	return rv;
+}
+
+static void nogui_stop_block_hook(pcb_hidval_t block_hook)
+{
+	CRASH("stop_block_hook");
+}
+
+static void nogui_log(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	pcb_vfprintf(stdout, fmt, ap);
+	va_end(ap);
+}
+
+static void nogui_logv(enum pcb_message_level level, const char *fmt, va_list ap)
+{
+	if ((conf_core.rc.quiet) && (level < PCB_MSG_ERROR))
+		return;
+	if ((!conf_core.rc.verbose) && (level < PCB_MSG_INFO))
+		return;
+
+	switch (level) {
+	case PCB_MSG_DEBUG:
+		printf("D:");
+		break;
+	case PCB_MSG_INFO:
+		printf("I:");
+		break;
+	case PCB_MSG_WARNING:
+		printf("W:");
+		break;
+	case PCB_MSG_ERROR:
+		printf("E:");
+		break;
+	}
+	pcb_vfprintf(stdout, fmt, ap);
+}
+
+/* Return a line of user input text, stripped of any newline characters.
+ * Returns NULL if the user simply presses enter, or otherwise gives no input.
+ */
+#define MAX_LINE_LENGTH 1024
+static char *read_stdin_line(void)
+{
+	static char buf[MAX_LINE_LENGTH];
+	char *s;
+	int i;
+
+	s = fgets(buf, MAX_LINE_LENGTH, stdin);
+	if (s == NULL) {
+		printf("\n");
+		return NULL;
+	}
+
+	/* Strip any trailing newline characters */
+	for (i = strlen(s) - 1; i >= 0; i--)
+		if (s[i] == '\r' || s[i] == '\n')
+			s[i] = '\0';
+
+	if (s[0] == '\0')
+		return NULL;
+
+	return pcb_strdup(s);
+}
+
+#undef MAX_LINE_LENGTH
+
+static int nogui_confirm_dialog(const char *msg, ...)
+{
+	char *answer;
+	int ret = 0;
+	pcb_bool valid_answer = pcb_false;
+	va_list args;
+
+	if (conf_core.rc.quiet)
+		return 1;
+
+	do {
+		va_start(args, msg);
+		pcb_vfprintf(stdout, msg, args);
+		va_end(args);
+
+		printf(" ? 0=cancel 1 = ok : ");
+
+		answer = read_stdin_line();
+
+		if ((answer == NULL) || (answer[0] == '1' && answer[1] == '\0')) {
+			ret = 1;
+			valid_answer = pcb_true;
+		}
+		else if (answer[0] == '0' && answer[1] == '\0') {
+			ret = 0;
+			valid_answer = pcb_true;
+		}
+
+		free(answer);
+	}
+	while (!valid_answer);
+	return ret;
+}
+
+static int nogui_close_confirm_dialog()
+{
+	return nogui_confirm_dialog(_("OK to lose data ?"), NULL);
+}
+
+static void nogui_report_dialog(const char *title, const char *msg)
+{
+	printf("--- %s ---\n%s\n", title, msg);
+}
+
+static char *nogui_prompt_for(const char *msg, const char *default_string)
+{
+	char *answer;
+
+	if (conf_core.rc.quiet)
+		return pcb_strdup("");
+
+	if (default_string)
+		printf("%s [%s] : ", msg, default_string);
+	else
+		printf("%s : ", msg);
+
+	answer = read_stdin_line();
+	if (answer == NULL)
+		return pcb_strdup((default_string != NULL) ? default_string : "");
+	else
+		return pcb_strdup(answer);
+}
+
+/* FIXME - this could use some enhancement to actually use the other
+   args */
+static char *nogui_fileselect(const char *title, const char *descr,
+															const char *default_file, const char *default_ext, const char *history_tag, int flags)
+{
+	char *answer;
+
+	if (conf_core.rc.quiet)
+		return pcb_strdup("");
+
+	if (default_file)
+		printf("%s [%s] : ", title, default_file);
+	else
+		printf("%s : ", title);
+
+	answer = read_stdin_line();
+	if (answer == NULL)
+		return (default_file != NULL) ? pcb_strdup(default_file) : NULL;
+	else
+		return pcb_strdup(answer);
+}
+
+static void *nogui_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+{
+	CRASH("attr_dlg_new");
+}
+
+static int nogui_attr_dlg_run(void *hid_ctx)
+{
+	CRASH("attr_dlg_run");
+}
+
+static void nogui_attr_dlg_free(void *hid_ctx)
+{
+	CRASH("attr_dlg_free");
+}
+
+static void nogui_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val)
+{
+	CRASH("attr_dlg_dlg_property");
+}
+
+
+static int nogui_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+{
+	CRASH("attribute_dialog");
+}
+
+static void nogui_show_item(void *item)
+{
+	CRASH("show_item");
+}
+
+static void nogui_beep(void)
+{
+	putchar(7);
+	fflush(stdout);
+}
+
+static int nogui_progress(int so_far, int total, const char *message)
+{
+	static int on = 0;
+	if (conf_core.rc.quiet)
+		return 0;
+	if (message == NULL) {
+		if ((on) && (conf_core.rc.verbose >= PCB_MSG_INFO))
+			fprintf(stderr, "progress: finished\n");
+		on = 0;
+	}
+	else {
+		if (conf_core.rc.verbose >= PCB_MSG_INFO)
+			fprintf(stderr, "progress: %d/%d %s\n", so_far, total, message);
+		on = 1;
+	}
+	return 0;
+}
+
+static void nogui_create_menu(const char *menu_path, const pcb_menu_prop_t *props)
+{
+}
+
+void pcb_hid_nogui_init(pcb_hid_t * hid)
+{
+	hid->get_export_options = nogui_get_export_options;
+	hid->do_export = nogui_do_export;
+	hid->parse_arguments = nogui_parse_arguments;
+	hid->invalidate_lr = nogui_invalidate_lr;
+	hid->invalidate_all = nogui_invalidate_all;
+	hid->set_layer_group = nogui_set_layer_group;
+	hid->end_layer = nogui_end_layer;
+	hid->make_gc = nogui_make_gc;
+	hid->destroy_gc = nogui_destroy_gc;
+	hid->set_drawing_mode = nogui_set_drawing_mode;
+	hid->render_burst = nogui_render_burst;
+	hid->set_color = nogui_set_color;
+	hid->set_line_cap = nogui_set_line_cap;
+	hid->set_line_width = nogui_set_line_width;
+	hid->set_draw_xor = nogui_set_draw_xor;
+	hid->set_draw_faded = nogui_set_draw_faded;
+	hid->draw_line = nogui_draw_line;
+	hid->draw_arc = nogui_draw_arc;
+	hid->draw_rect = nogui_draw_rect;
+	hid->fill_circle = nogui_fill_circle;
+	hid->fill_polygon = nogui_fill_polygon;
+	hid->fill_pcb_polygon = nogui_fill_pcb_polygon;
+	hid->fill_rect = nogui_fill_rect;
+	hid->calibrate = nogui_calibrate;
+	hid->shift_is_pressed = nogui_shift_is_pressed;
+	hid->control_is_pressed = nogui_control_is_pressed;
+	hid->mod1_is_pressed = nogui_mod1_is_pressed;
+	hid->get_coords = nogui_get_coords;
+	hid->set_crosshair = nogui_set_crosshair;
+	hid->add_timer = nogui_add_timer;
+	hid->stop_timer = nogui_stop_timer;
+	hid->watch_file = nogui_watch_file;
+	hid->unwatch_file = nogui_unwatch_file;
+	hid->add_block_hook = nogui_add_block_hook;
+	hid->stop_block_hook = nogui_stop_block_hook;
+	hid->log = nogui_log;
+	hid->logv = nogui_logv;
+	hid->confirm_dialog = nogui_confirm_dialog;
+	hid->close_confirm_dialog = nogui_close_confirm_dialog;
+	hid->report_dialog = nogui_report_dialog;
+	hid->prompt_for = nogui_prompt_for;
+	hid->fileselect = nogui_fileselect;
+	hid->attr_dlg_new = nogui_attr_dlg_new;
+	hid->attr_dlg_run = nogui_attr_dlg_run;
+	hid->attr_dlg_free = nogui_attr_dlg_free;
+	hid->attr_dlg_property = nogui_attr_dlg_property;
+	hid->attribute_dialog = nogui_attribute_dialog;
+	hid->show_item = nogui_show_item;
+	hid->beep = nogui_beep;
+	hid->progress = nogui_progress;
+	hid->create_menu = nogui_create_menu;
+}
+
+static pcb_hid_t nogui_hid;
+
+pcb_hid_t *pcb_hid_nogui_get_hid(void)
+{
+	memset(&nogui_hid, 0, sizeof(pcb_hid_t));
+
+	nogui_hid.struct_size = sizeof(pcb_hid_t);
+	nogui_hid.name = "nogui";
+	nogui_hid.description = "Default GUI when no other GUI is present.  " "Does nothing.";
+
+	pcb_hid_nogui_init(&nogui_hid);
+
+	return &nogui_hid;
+}
Index: tags/2.0.1/src/hid_nogui.h
===================================================================
--- tags/2.0.1/src/hid_nogui.h	(nonexistent)
+++ tags/2.0.1/src/hid_nogui.h	(revision 18980)
@@ -0,0 +1,7 @@
+#ifndef PCB_HID_COMMON_HIDNOGUI_H
+#define PCB_HID_COMMON_HIDNOGUI_H
+
+void pcb_hid_nogui_init(pcb_hid_t * hid);
+pcb_hid_t *pcb_hid_nogui_get_hid(void);
+
+#endif
Index: tags/2.0.1/src/ht_subc.c
===================================================================
--- tags/2.0.1/src/ht_subc.c	(nonexistent)
+++ tags/2.0.1/src/ht_subc.c	(revision 18980)
@@ -0,0 +1,9 @@
+#include <string.h>
+#include "config.h"
+#include "obj_subc_list.h"
+
+#define HT(x) htscp_ ## x
+#include <genht/ht.c>
+#undef HT
+
+
Index: tags/2.0.1/src/ht_subc.h
===================================================================
--- tags/2.0.1/src/ht_subc.h	(nonexistent)
+++ tags/2.0.1/src/ht_subc.h	(revision 18980)
@@ -0,0 +1,13 @@
+#ifndef PCB_HT_SUBC_H
+#define PCB_HT_SUBC_H
+
+/* Hash: subcircuit -> pointer */
+
+/* hash instance */
+typedef const pcb_subc_t *htscp_key_t;
+typedef int htscp_value_t;
+#define HT(x) htscp_ ## x
+#include <genht/ht.h>
+#undef HT
+
+#endif
Index: tags/2.0.1/src/icons/Makefile.am
===================================================================
--- tags/2.0.1/src/icons/Makefile.am	(nonexistent)
+++ tags/2.0.1/src/icons/Makefile.am	(revision 18980)
@@ -0,0 +1,4 @@
+## $Id$
+
+EXTRA_DIST= hand.dat hcurs.dat lcurs.dat lock.dat
+
Index: tags/2.0.1/src/icons/hand.dat
===================================================================
--- tags/2.0.1/src/icons/hand.dat	(nonexistent)
+++ tags/2.0.1/src/icons/hand.dat	(revision 18980)
@@ -0,0 +1,9 @@
+#define hand_width 21
+#define hand_height 21
+static unsigned char hand_bits[] = {
+   0x00, 0x02, 0x00, 0x20, 0x25, 0x00, 0x50, 0x55, 0x02, 0x50, 0x55, 0x05,
+   0x50, 0x55, 0x05, 0xd3, 0xd4, 0x06, 0x95, 0x48, 0x02, 0x19, 0x40, 0x01,
+   0x12, 0x00, 0x01, 0x04, 0x80, 0x00, 0x08, 0x80, 0x00, 0x10, 0x80, 0x00,
+   0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x38, 0x26, 0x02, 0x48, 0x69, 0x02,
+   0x48, 0xe9, 0x02, 0x38, 0xaf, 0x02, 0x08, 0xa9, 0x03, 0x08, 0x29, 0x03,
+   0x08, 0x29, 0x02};
Index: tags/2.0.1/src/icons/hcurs.dat
===================================================================
--- tags/2.0.1/src/icons/hcurs.dat	(nonexistent)
+++ tags/2.0.1/src/icons/hcurs.dat	(revision 18980)
@@ -0,0 +1,8 @@
+#define hcurs_width 16
+#define hcurs_height 16
+#define hcurs_x_hot 7
+#define hcurs_y_hot 9
+static unsigned char hcurs_bits[] = {
+   0x80, 0x00, 0xc8, 0x09, 0xdc, 0x1d, 0xdc, 0x1d, 0xdc, 0x1d, 0xfc, 0xcf,
+   0x38, 0xee, 0x1f, 0x78, 0x0f, 0x78, 0x07, 0x30, 0x07, 0x30, 0x0e, 0x38,
+   0x1e, 0x3c, 0x3c, 0x1e, 0xf8, 0x0f, 0xf0, 0x0f};
Index: tags/2.0.1/src/icons/lcurs.dat
===================================================================
--- tags/2.0.1/src/icons/lcurs.dat	(nonexistent)
+++ tags/2.0.1/src/icons/lcurs.dat	(revision 18980)
@@ -0,0 +1,6 @@
+#define lcurs_width 16
+#define lcurs_height 16
+static unsigned char lcurs_bits[] = {
+   0xf0, 0x0f, 0xf0, 0x0f, 0xf8, 0x1f, 0x38, 0x1c, 0x1c, 0x3c, 0x1c, 0x38,
+   0x1c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
+   0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f};
Index: tags/2.0.1/src/icons/lock.dat
===================================================================
--- tags/2.0.1/src/icons/lock.dat	(nonexistent)
+++ tags/2.0.1/src/icons/lock.dat	(revision 18980)
@@ -0,0 +1,9 @@
+#define lock_width 21
+#define lock_height 21
+static unsigned char lock_bits[] = {
+   0x00, 0x1f, 0x00, 0x80, 0x31, 0x00, 0x80, 0x20, 0x00, 0xc0, 0x60, 0x00,
+   0x40, 0x40, 0x00, 0x40, 0x40, 0x00, 0xf0, 0xff, 0x01, 0x10, 0x00, 0x01,
+   0xf0, 0xff, 0x01, 0x10, 0x00, 0x01, 0xf0, 0xff, 0x01, 0x10, 0x00, 0x01,
+   0xf0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x84, 0xb1, 0x04, 0x44, 0x8a, 0x04,
+   0x44, 0x8a, 0x02, 0x44, 0x8a, 0x01, 0x44, 0x8a, 0x02, 0x44, 0x8a, 0x04,
+   0x9c, 0xb1, 0x04};
Index: tags/2.0.1/src/insert.c
===================================================================
--- tags/2.0.1/src/insert.c	(nonexistent)
+++ tags/2.0.1/src/insert.c	(revision 18980)
@@ -0,0 +1,146 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* functions used to insert points into objects
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "select.h"
+#include "undo.h"
+
+#include "obj_line_op.h"
+#include "obj_arc_op.h"
+#include "obj_rat_op.h"
+#include "obj_poly_op.h"
+
+static pcb_opfunc_t InsertFunctions = {
+	pcb_lineop_insert_point,
+	NULL,
+	pcb_polyop_insert_point,
+	NULL,
+	NULL,
+	pcb_arc_insert_point,
+	pcb_ratop_insert_point,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+void *pcb_insert_point_in_object(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t * Ptr3, pcb_coord_t DX, pcb_coord_t DY, pcb_bool Force, pcb_bool insert_last)
+{
+	void *ptr;
+	pcb_opctx_t ctx;
+
+	ctx.insert.pcb = PCB;
+	ctx.insert.x = DX;
+	ctx.insert.y = DY;
+	ctx.insert.idx = *Ptr3;
+	ctx.insert.last = insert_last;
+	ctx.insert.forcible = Force;
+
+	/* the operation insert the points to the undo-list */
+	ptr = pcb_object_operation(&InsertFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	if (ptr != NULL)
+		pcb_undo_inc_serial();
+	return ptr;
+}
+
+pcb_point_t *pcb_adjust_insert_point(void)
+{
+	static pcb_point_t InsertedPoint;
+	double m;
+	pcb_coord_t x, y, m1, m2;
+	pcb_line_t *line = (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2;
+
+	if (pcb_crosshair.AttachedObject.State == PCB_CH_STATE_FIRST)
+		return NULL;
+	pcb_crosshair.AttachedObject.Ptr3 = &InsertedPoint;
+	if (pcb_gui->shift_is_pressed()) {
+		pcb_attached_line_t myline;
+		/* only force 45 degree for nearest point */
+		if (pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, line->Point1.X, line->Point1.Y) <
+				pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, line->Point2.X, line->Point2.Y))
+			myline.Point1 = myline.Point2 = line->Point1;
+		else
+			myline.Point1 = myline.Point2 = line->Point2;
+		pcb_line_45(&myline);
+		InsertedPoint.X = myline.Point2.X;
+		InsertedPoint.Y = myline.Point2.Y;
+		return &InsertedPoint;
+	}
+	if (PCB->RatDraw || conf_core.editor.all_direction_lines) {
+		InsertedPoint.X = pcb_crosshair.X;
+		InsertedPoint.Y = pcb_crosshair.Y;
+		return &InsertedPoint;
+	}
+	if (pcb_crosshair.X == line->Point1.X)
+		m1 = 2;											/* 2 signals infinite slope */
+	else {
+		m = (double) (pcb_crosshair.Y - line->Point1.Y) / (pcb_crosshair.X - line->Point1.X);
+		m1 = 0;
+		if (m > PCB_TAN_30_DEGREE)
+			m1 = (m > PCB_TAN_60_DEGREE) ? 2 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			m1 = (m < -PCB_TAN_60_DEGREE) ? 2 : -1;
+	}
+	if (pcb_crosshair.X == line->Point2.X)
+		m2 = 2;											/* 2 signals infinite slope */
+	else {
+		m = (double) (pcb_crosshair.Y - line->Point2.Y) / (pcb_crosshair.X - line->Point2.X);
+		m2 = 0;
+		if (m > PCB_TAN_30_DEGREE)
+			m2 = (m > PCB_TAN_60_DEGREE) ? 2 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			m2 = (m < -PCB_TAN_60_DEGREE) ? 2 : -1;
+	}
+	if (m1 == m2) {
+		InsertedPoint.X = line->Point1.X;
+		InsertedPoint.Y = line->Point1.Y;
+		return &InsertedPoint;
+	}
+	if (m1 == 2) {
+		x = line->Point1.X;
+		y = line->Point2.Y + m2 * (line->Point1.X - line->Point2.X);
+	}
+	else if (m2 == 2) {
+		x = line->Point2.X;
+		y = line->Point1.Y + m1 * (line->Point2.X - line->Point1.X);
+	}
+	else {
+		x = (line->Point2.Y - line->Point1.Y + m1 * line->Point1.X - m2 * line->Point2.X) / (m1 - m2);
+		y = (m1 * line->Point2.Y - m1 * m2 * line->Point2.X - m2 * line->Point1.Y + m1 * m2 * line->Point1.X) / (m1 - m2);
+	}
+	InsertedPoint.X = x;
+	InsertedPoint.Y = y;
+	return &InsertedPoint;
+}
Index: tags/2.0.1/src/insert.h
===================================================================
--- tags/2.0.1/src/insert.h	(nonexistent)
+++ tags/2.0.1/src/insert.h	(revision 18980)
@@ -0,0 +1,43 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Inserting points into objects */
+
+#ifndef	PCB_INSERT_H
+#define	PCB_INSERT_H
+
+#include "config.h"
+
+#define	PCB_INSERT_TYPES	(PCB_OBJ_POLY | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_RAT)
+
+void *pcb_insert_point_in_object(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t * Ptr3, pcb_coord_t DX, pcb_coord_t DY, pcb_bool Force, pcb_bool insert_last);
+
+/* adjusts the insert point to make 45 degree lines as necessary */
+pcb_point_t *pcb_adjust_insert_point(void);
+
+#endif
Index: tags/2.0.1/src/intersect.c
===================================================================
--- tags/2.0.1/src/intersect.c	(nonexistent)
+++ tags/2.0.1/src/intersect.c	(revision 18980)
@@ -0,0 +1,270 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, intersect.c, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* rectangle intersection/union routines. */
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include "intersect.h"
+#include "box.h"
+
+static int compareleft(const void *ptr1, const void *ptr2);
+static int compareright(const void *ptr1, const void *ptr2);
+static int comparepos(const void *ptr1, const void *ptr2);
+static int nextpwrof2(int i);
+
+typedef struct {
+	pcb_coord_t left, right;
+	int covered;
+	pcb_coord_t area;
+} SegmentTreeNode;
+
+typedef struct {
+	SegmentTreeNode *nodes;
+	int size;
+} SegmentTree;
+
+typedef struct {
+	pcb_coord_t *p;
+	int size;
+} LocationList;
+
+/* ---------------------------------------------------------------------------
+ * Create a sorted list of unique y coords from a BoxList.
+ */
+static LocationList createSortedYList(pcb_box_list_t *boxlist)
+{
+	LocationList yCoords;
+	pcb_coord_t last;
+	int i, n;
+	/* create sorted list of Y coordinates */
+	yCoords.size = 2 * boxlist->BoxN;
+	yCoords.p = (pcb_coord_t *) calloc(yCoords.size, sizeof(*yCoords.p));
+	for (i = 0; i < boxlist->BoxN; i++) {
+		yCoords.p[2 * i] = boxlist->Box[i].Y1;
+		yCoords.p[2 * i + 1] = boxlist->Box[i].Y2;
+	}
+	qsort(yCoords.p, yCoords.size, sizeof(*yCoords.p), comparepos);
+	/* count uniq y coords */
+	last = 0;
+	for (n = 0, i = 0; i < yCoords.size; i++)
+		if (i == 0 || yCoords.p[i] != last)
+			yCoords.p[n++] = last = yCoords.p[i];
+	yCoords.size = n;
+	return yCoords;
+}
+
+/* ---------------------------------------------------------------------------
+ * Create an empty segment tree from the given sorted list of uniq y coords.
+ */
+static SegmentTree createSegmentTree(pcb_coord_t * yCoords, int N)
+{
+	SegmentTree st;
+	int i;
+	/* size is twice the nearest larger power of 2 */
+	st.size = 2 * nextpwrof2(N);
+	st.nodes = (SegmentTreeNode *) calloc(st.size, sizeof(*st.nodes));
+	/* initialize the rightmost leaf node */
+	st.nodes[st.size - 1].left = (N > 0) ? yCoords[--N] : 10;
+	st.nodes[st.size - 1].right = st.nodes[st.size - 1].left + 1;
+	/* initialize the rest of the leaf nodes */
+	for (i = st.size - 2; i >= st.size / 2; i--) {
+		st.nodes[i].right = st.nodes[i + 1].left;
+		st.nodes[i].left = (N > 0) ? yCoords[--N] : st.nodes[i].right - 1;
+	}
+	/* initialize the internal nodes */
+	for (; i > 0; i--) {					/* node 0 is not used */
+		st.nodes[i].right = st.nodes[2 * i + 1].right;
+		st.nodes[i].left = st.nodes[2 * i].left;
+	}
+	/* done! */
+	return st;
+}
+
+void insertSegment(SegmentTree * st, int n, pcb_coord_t Y1, pcb_coord_t Y2)
+{
+	pcb_coord_t discriminant;
+	if (st->nodes[n].left >= Y1 && st->nodes[n].right <= Y2) {
+		st->nodes[n].covered++;
+	}
+	else {
+		assert(n < st->size / 2);
+		discriminant = st->nodes[n * 2 + 1 /*right */ ].left;
+		if (Y1 < discriminant)
+			insertSegment(st, n * 2, Y1, Y2);
+		if (discriminant < Y2)
+			insertSegment(st, n * 2 + 1, Y1, Y2);
+	}
+	/* fixup area */
+	st->nodes[n].area = (st->nodes[n].covered > 0) ?
+		(st->nodes[n].right - st->nodes[n].left) : (n >= st->size / 2) ? 0 : st->nodes[n * 2].area + st->nodes[n * 2 + 1].area;
+}
+
+void deleteSegment(SegmentTree * st, int n, pcb_coord_t Y1, pcb_coord_t Y2)
+{
+	pcb_coord_t discriminant;
+	if (st->nodes[n].left >= Y1 && st->nodes[n].right <= Y2) {
+		assert(st->nodes[n].covered);
+		--st->nodes[n].covered;
+	}
+	else {
+		assert(n < st->size / 2);
+		discriminant = st->nodes[n * 2 + 1 /*right */ ].left;
+		if (Y1 < discriminant)
+			deleteSegment(st, n * 2, Y1, Y2);
+		if (discriminant < Y2)
+			deleteSegment(st, n * 2 + 1, Y1, Y2);
+	}
+	/* fixup area */
+	st->nodes[n].area = (st->nodes[n].covered > 0) ?
+		(st->nodes[n].right - st->nodes[n].left) : (n >= st->size / 2) ? 0 : st->nodes[n * 2].area + st->nodes[n * 2 + 1].area;
+}
+
+/* ---------------------------------------------------------------------------
+ * Compute the area of the intersection of the given rectangles; that is,
+ * the area covered by more than one rectangle (counted twice if the area is
+ * covered by three rectangles, three times if covered by four rectangles,
+ * etc.).
+ * Runs in O(N ln N) time.
+ */
+double pcb_intersect_box_box(pcb_box_list_t *boxlist)
+{
+	pcb_cardinal_t i;
+	double area = 0.0;
+	/* first get the aggregate area. */
+	for (i = 0; i < boxlist->BoxN; i++)
+		area += (double) (boxlist->Box[i].X2 - boxlist->Box[i].X1) * (double) (boxlist->Box[i].Y2 - boxlist->Box[i].Y1);
+	/* intersection area is aggregate - union. */
+	return area * 0.0001 - pcb_union_box_box(boxlist);
+}
+
+/* ---------------------------------------------------------------------------
+ * Compute the area of the union of the given rectangles.
+ * O(N ln N) time.
+ */
+double pcb_union_box_box(pcb_box_list_t *boxlist)
+{
+	pcb_box_t **rectLeft, **rectRight;
+	pcb_cardinal_t i, j;
+	LocationList yCoords;
+	SegmentTree segtree;
+	pcb_coord_t lastX;
+	double area = 0.0;
+
+	if (boxlist->BoxN == 0)
+		return 0.0;
+	/* create sorted list of Y coordinates */
+	yCoords = createSortedYList(boxlist);
+	/* now create empty segment tree */
+	segtree = createSegmentTree(yCoords.p, yCoords.size);
+	free(yCoords.p);
+	/* create sorted list of left and right X coordinates of rectangles */
+	rectLeft = (pcb_box_t **) calloc(boxlist->BoxN, sizeof(*rectLeft));
+	rectRight = (pcb_box_t **) calloc(boxlist->BoxN, sizeof(*rectRight));
+	for (i = 0; i < boxlist->BoxN; i++) {
+		assert(boxlist->Box[i].X1 <= boxlist->Box[i].X2);
+		assert(boxlist->Box[i].Y1 <= boxlist->Box[i].Y2);
+		rectLeft[i] = rectRight[i] = &boxlist->Box[i];
+	}
+	qsort(rectLeft, boxlist->BoxN, sizeof(*rectLeft), compareleft);
+	qsort(rectRight, boxlist->BoxN, sizeof(*rectRight), compareright);
+	/* sweep through x segments from left to right */
+	i = j = 0;
+	lastX = rectLeft[0]->X1;
+	while (j < boxlist->BoxN) {
+		assert(i <= boxlist->BoxN);
+		/* i will step through rectLeft, j will through rectRight */
+		if (i == boxlist->BoxN || rectRight[j]->X2 < rectLeft[i]->X1) {
+			/* right edge of rectangle */
+			pcb_box_t *b = rectRight[j++];
+			/* check lastX */
+			if (b->X2 != lastX) {
+				assert(lastX < b->X2);
+				area += (double) (b->X2 - lastX) * segtree.nodes[1].area;
+				lastX = b->X2;
+			}
+			/* remove a segment from the segment tree. */
+			deleteSegment(&segtree, 1, b->Y1, b->Y2);
+		}
+		else {
+			/* left edge of rectangle */
+			pcb_box_t *b = rectLeft[i++];
+			/* check lastX */
+			if (b->X1 != lastX) {
+				assert(lastX < b->X1);
+				area += (double) (b->X1 - lastX) * segtree.nodes[1].area;
+				lastX = b->X1;
+			}
+			/* add a segment from the segment tree. */
+			insertSegment(&segtree, 1, b->Y1, b->Y2);
+		}
+	}
+	free(rectLeft);
+	free(rectRight);
+	free(segtree.nodes);
+	return area * 0.0001;
+}
+
+static int compareleft(const void *ptr1, const void *ptr2)
+{
+	pcb_box_t **b1 = (pcb_box_t **) ptr1, **b2 = (pcb_box_t **) ptr2;
+	return (*b1)->X1 - (*b2)->X1;
+}
+
+static int compareright(const void *ptr1, const void *ptr2)
+{
+	pcb_box_t **b1 = (pcb_box_t **) ptr1, **b2 = (pcb_box_t **) ptr2;
+	return (*b1)->X2 - (*b2)->X2;
+}
+
+static int comparepos(const void *ptr1, const void *ptr2)
+{
+	return *((pcb_coord_t *) ptr1) - *((pcb_coord_t *) ptr2);
+}
+
+static int nextpwrof2(int n)
+{
+	int r = 1;
+	while (n != 0) {
+		n /= 2;
+		r *= 2;
+	}
+	return r;
+}
Index: tags/2.0.1/src/intersect.h
===================================================================
--- tags/2.0.1/src/intersect.h	(nonexistent)
+++ tags/2.0.1/src/intersect.h	(revision 18980)
@@ -0,0 +1,49 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, intersect.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+
+/* Box (rectangle) intersection/union routines. */
+
+#ifndef PCB_INTERSECT_H
+#define PCB_INTERSECT_H
+
+#include "global_typedefs.h"
+
+double pcb_intersect_box_box(pcb_box_list_t *boxlist);	/* will sort boxlist */
+double pcb_union_box_box(pcb_box_list_t *boxlist);
+
+#endif
Index: tags/2.0.1/src/layer.c
===================================================================
--- tags/2.0.1/src/layer.c	(nonexistent)
+++ tags/2.0.1/src/layer.c	(revision 18980)
@@ -0,0 +1,1034 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "layer.h"
+#include "compat_misc.h"
+#include "undo.h"
+#include "event.h"
+#include "layer_ui.h"
+#include "layer_vis.h"
+#include "rtree.h"
+#include "obj_pstk_inlines.h"
+#include "list_common.h"
+
+pcb_virt_layer_t pcb_virt_layers[] = {
+	{"invisible",      PCB_LYT_VIRTUAL + 1, PCB_LYT_VIRTUAL | PCB_LYT_INVIS },
+	{"rats",           PCB_LYT_VIRTUAL + 2, PCB_LYT_VIRTUAL | PCB_LYT_RAT },
+	{"topassembly",    PCB_LYT_VIRTUAL + 3, PCB_LYT_VIRTUAL | PCB_LYT_ASSY | PCB_LYT_TOP},
+	{"bottomassembly", PCB_LYT_VIRTUAL + 4, PCB_LYT_VIRTUAL | PCB_LYT_ASSY | PCB_LYT_BOTTOM },
+	{"fab",            PCB_LYT_VIRTUAL + 5, PCB_LYT_VIRTUAL | PCB_LYT_FAB  | PCB_LYT_LOGICAL },
+	{"plated-drill",   PCB_LYT_VIRTUAL + 6, PCB_LYT_VIRTUAL | PCB_LYT_PDRILL },
+	{"unplated-drill", PCB_LYT_VIRTUAL + 7, PCB_LYT_VIRTUAL | PCB_LYT_UDRILL },
+	{"csect",          PCB_LYT_VIRTUAL + 8, PCB_LYT_VIRTUAL | PCB_LYT_CSECT | PCB_LYT_LOGICAL },
+	{"dialog",         PCB_LYT_VIRTUAL + 9, PCB_LYT_VIRTUAL | PCB_LYT_DIALOG | PCB_LYT_LOGICAL | PCB_LYT_NOEXPORT },
+	{ NULL, 0 },
+};
+
+const pcb_menu_layers_t pcb_menu_layers[] = {
+	{ "Subcircuits", "subc",     &conf_core.appearance.color.subc,              NULL,       offsetof(pcb_board_t, SubcOn),             0 },
+	{ "Subc. parts", "subcpart", &conf_core.appearance.color.subc,              NULL,       offsetof(pcb_board_t, SubcPartsOn),        0 },
+	{ "Padstacks",   "padstacks",&conf_core.appearance.color.pin,               NULL,       offsetof(pcb_board_t, pstk_on),            0 },
+	{ "Holes",       "holes",    &conf_core.appearance.color.pin,               NULL,       offsetof(pcb_board_t, hole_on),            0 },
+	{ "Pstk. marks", "pstkmark", &conf_core.appearance.color.padstackmark,      NULL,       offsetof(pcb_board_t, padstack_mark_on),   0 },
+	{ "Far side",    "farside",  &conf_core.appearance.color.invisible_objects, NULL,       offsetof(pcb_board_t, InvisibleObjectsOn), 0 },
+	{ "Rats",        "rats",     &conf_core.appearance.color.rat,               "rats",     offsetof(pcb_board_t, RatOn),              offsetof(pcb_board_t, RatDraw) },
+	{ NULL,          NULL,       NULL,                                          NULL,       0}
+};
+
+
+typedef struct {
+	pcb_layer_type_t type;
+	int class;
+	const char *name;
+} pcb_layer_type_name_t;
+
+/* update docs: lihata format tree */
+static const pcb_layer_type_name_t pcb_layer_type_names[] = {
+	{ PCB_LYT_TOP,     1, "top" },
+	{ PCB_LYT_BOTTOM,  1, "bottom" },
+	{ PCB_LYT_INTERN,  1, "intern" },
+	{ PCB_LYT_LOGICAL, 1, "logical" },
+	{ PCB_LYT_COPPER,  2, "copper" },
+	{ PCB_LYT_SILK,    2, "silk" },
+	{ PCB_LYT_MASK,    2, "mask" },
+	{ PCB_LYT_PASTE,   2, "paste" },
+	{ PCB_LYT_OUTLINE, 2, "outline" },
+	{ PCB_LYT_RAT,     2, "rat" },
+	{ PCB_LYT_INVIS,   2, "invis" },
+	{ PCB_LYT_ASSY,    2, "assy" },
+	{ PCB_LYT_FAB,     2, "fab" },
+	{ PCB_LYT_PDRILL,  2, "plateddrill" },
+	{ PCB_LYT_UDRILL,  2, "unplateddrill" },
+	{ PCB_LYT_CSECT,   2, "cross-section" },
+	{ PCB_LYT_SUBSTRATE,2,"substrate" },
+	{ PCB_LYT_MISC,    2, "misc" },
+	{ PCB_LYT_UI,      2, "userinterface" },
+	{ PCB_LYT_VIRTUAL, 3, "virtual" },
+	{ 0, 0, NULL }
+};
+
+static const char *pcb_layer_type_class_names[] = {
+	"INVALID", "location", "purpose", "property"
+};
+
+static const pcb_layer_type_name_t pcb_layer_comb_names[] = {
+	{ PCB_LYC_SUB,  0, "sub"},
+	{ PCB_LYC_AUTO, 0, "auto"},
+	{ 0, 0, NULL }
+};
+
+
+#define PCB_LAYER_VIRT_MIN (PCB_LYT_VIRTUAL + PCB_VLY_first + 1)
+#define PCB_LAYER_VIRT_MAX (PCB_LYT_VIRTUAL + PCB_VLY_end)
+
+#define layer_if_too_many(pcb, fail_cmd) \
+do { \
+	if (pcb->Data->LayerN >= PCB_MAX_LAYER) { \
+		pcb_message(PCB_MSG_ERROR, "Too many layers - can't have more than %d\n", PCB_MAX_LAYER); \
+		fail_cmd; \
+	} \
+} while(0)
+
+void pcb_layer_free(pcb_layer_t *layer)
+{
+	if (!layer->is_bound)
+		pcb_attribute_free(&layer->Attributes);
+	PCB_TEXT_LOOP(layer);
+	{
+		free(text->TextString);
+	}
+	PCB_END_LOOP;
+
+	list_map0(&layer->Line, pcb_line_t, pcb_line_free);
+	list_map0(&layer->Arc,  pcb_arc_t,  pcb_arc_free);
+	list_map0(&layer->Text, pcb_text_t, pcb_text_free);
+	PCB_POLY_LOOP(layer);
+	{
+		pcb_poly_free_fields(polygon);
+	}
+	PCB_END_LOOP;
+	list_map0(&layer->Polygon, pcb_poly_t, pcb_poly_free);
+	if (!layer->is_bound) {
+		if (layer->line_tree)
+			pcb_r_destroy_tree(&layer->line_tree);
+		if (layer->arc_tree)
+			pcb_r_destroy_tree(&layer->arc_tree);
+		if (layer->text_tree)
+			pcb_r_destroy_tree(&layer->text_tree);
+		if (layer->polygon_tree)
+			pcb_r_destroy_tree(&layer->polygon_tree);
+		free(layer->meta.real.color);
+	}
+	free((char *)layer->name);
+	memset(layer, 0, sizeof(pcb_layer_t));
+}
+
+pcb_bool pcb_layer_is_pure_empty(pcb_layer_t *layer)
+{
+	/* if any local list is non-empty, the layer is non-empty */
+	if (layer->Line.lst.length > 0) return pcb_false;
+	if (layer->Arc.lst.length > 0) return pcb_false;
+	if (layer->Polygon.lst.length > 0) return pcb_false;
+	if (layer->Text.lst.length > 0) return pcb_false;
+
+	/* if the layer is locally empty, it might be a board layer that has
+	   objects from subcircuits so also check the rtrees */
+	return
+		PCB_RTREE_EMPTY(layer->line_tree) && 
+		PCB_RTREE_EMPTY(layer->arc_tree) && 
+		PCB_RTREE_EMPTY(layer->polygon_tree) && 
+		PCB_RTREE_EMPTY(layer->text_tree);
+}
+
+static pcb_bool pcb_layer_is_empty_glob(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_t *layer)
+{
+	/* if any padstack has a shape on this layer, it is not empty */
+	PCB_PADSTACK_LOOP(data);
+	{
+		if (pcb_pstk_shape_at(pcb, padstack, layer) != NULL)
+			return 0;
+	}
+	PCB_END_LOOP;
+
+	/* need to recurse to subc */
+	PCB_SUBC_LOOP(data);
+	{
+		pcb_layer_id_t n;
+		pcb_layer_t *sl;
+
+		for(sl = subc->data->Layer, n = 0; n < subc->data->LayerN; sl++,n++) {
+			if (sl->meta.bound.real == layer) {
+				if (!pcb_layer_is_empty_(pcb, sl))
+					return 0;
+				/* can't break here: multiple bound layers may point to the same real layer! */
+			}
+		}
+
+		if (!pcb_layer_is_empty_glob(pcb, subc->data, layer))
+			return 0;
+	}
+	PCB_END_LOOP;
+
+	return 1;
+}
+
+pcb_bool pcb_layer_is_empty_(pcb_board_t *pcb, pcb_layer_t *layer)
+{
+	pcb_layer_type_t flags = pcb_layer_flags_(layer);
+	if (flags == 0)
+		return 1;
+
+	/* fast check: direct object */
+	if (!pcb_layer_is_pure_empty(layer))
+		return 0;
+
+	if (!pcb_layer_is_empty_glob(pcb, pcb->Data, layer))
+		return 0;
+
+	/* found nothing: layer is empty */
+	return 1;
+}
+
+pcb_bool pcb_layer_is_empty(pcb_board_t *pcb, pcb_layer_id_t num)
+{
+	if ((num >= 0) && (num < pcb->Data->LayerN))
+		return pcb_layer_is_empty_(pcb, pcb->Data->Layer + num);
+	return pcb_false;
+}
+
+pcb_layer_id_t pcb_layer_id(pcb_data_t *Data, pcb_layer_t *Layer)
+{
+	if (Layer->parent_type == PCB_PARENT_UI)
+		return pcb_uilayer_get_id(Layer);
+
+	if (Layer->parent.data != Data) {
+		/* the only case this makes sense is when we are resolving a bound layer */
+		if ((Layer->is_bound) && (Layer->meta.bound.real != NULL))
+			return pcb_layer_id(Data, Layer->meta.bound.real);
+		/* failed binding, ignore the layer */
+		return -1;
+	}
+	if ((Layer >= Data->Layer) && (Layer < (Data->Layer + PCB_MAX_LAYER)))
+		return Layer - Data->Layer;
+
+	return -1;
+}
+
+unsigned int pcb_layer_flags(pcb_board_t *pcb, pcb_layer_id_t layer_idx)
+{
+	pcb_layer_t *l;
+
+	if (layer_idx & PCB_LYT_UI)
+		return PCB_LYT_UI | PCB_LYT_VIRTUAL;
+
+	if ((layer_idx >= PCB_LAYER_VIRT_MIN) && (layer_idx <= PCB_LAYER_VIRT_MAX))
+		return pcb_virt_layers[layer_idx - PCB_LAYER_VIRT_MIN].type;
+
+	if ((layer_idx < 0) || (layer_idx >= pcb->Data->LayerN))
+		return 0;
+
+	l = &pcb->Data->Layer[layer_idx];
+	return pcb_layergrp_flags(pcb, l->meta.real.grp);
+}
+
+unsigned int pcb_layer_flags_(pcb_layer_t *layer)
+{
+
+	/* real layer: have to do a layer stack based lookup; but at least we have a real layer ID  */
+	if (!layer->is_bound) {
+		pcb_data_t *data = layer->parent.data;
+		pcb_layer_id_t lid;
+
+		if (data == NULL)
+			return 0;
+
+		lid = pcb_layer_id(data, layer);;
+		if (lid < 0)
+			return 0;
+
+		assert(data->parent_type == PCB_PARENT_BOARD);
+		return pcb_layer_flags(data->parent.board, lid);
+	}
+
+	/* bound layer: if it is already bound to a real layer, use that, whatever it is (manual binding may override our local type match pattern) */
+	if (layer->meta.bound.real != NULL) {
+		layer = pcb_layer_get_real(layer);
+		if (layer == NULL)
+			return 0;
+		return pcb_layer_flags_(layer); /* tail recursion */
+	}
+
+	/* bound layer without a real layer binding: use the type match */
+	return layer->meta.bound.type;
+}
+
+#define APPEND(n) \
+	do { \
+		if (res != NULL) { \
+			if (used < res_len) { \
+				res[used] = n; \
+				used++; \
+			} \
+		} \
+		else \
+			used++; \
+	} while(0)
+
+#define APPEND_VIRT(v) \
+do { \
+	APPEND(v->new_id); \
+} while(0)
+
+const pcb_virt_layer_t *pcb_vlayer_get_first(pcb_layer_type_t mask)
+{
+	const pcb_virt_layer_t *v;
+	mask &= (~PCB_LYT_VIRTUAL);
+	for(v = pcb_virt_layers; v->name != NULL; v++)
+		if (((v->type & (~PCB_LYT_VIRTUAL)) & mask) == mask)
+			return v;
+	return NULL;
+}
+
+
+int pcb_layer_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layer_id_t *res, int res_len)
+{
+	int n, used = 0;
+	pcb_virt_layer_t *v;
+
+	for(v = pcb_virt_layers; v->name != NULL; v++)
+		if ((v->type & mask) == mask)
+			APPEND_VIRT(v);
+
+	for (n = 0; n < PCB_MAX_LAYER; n++)
+		if ((pcb_layer_flags(pcb, n) & mask) == mask)
+			APPEND(n);
+
+	if (mask == PCB_LYT_UI)
+		for (n = 0; n < vtp0_len(&pcb_uilayers); n++)
+			if (pcb_uilayers.array[n] != NULL)
+				APPEND(n | PCB_LYT_UI | PCB_LYT_VIRTUAL);
+
+	return used;
+}
+
+int pcb_layer_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layer_id_t *res, int res_len)
+{
+	int n, used = 0;
+	pcb_virt_layer_t *v;
+
+	for(v = pcb_virt_layers; v->name != NULL; v++)
+		if ((v->type & mask))
+			APPEND_VIRT(v);
+
+	for (n = 0; n < PCB_MAX_LAYER; n++)
+		if ((pcb_layer_flags(pcb, n) & mask))
+			APPEND(n);
+
+	if (mask & PCB_LYT_UI)
+		for (n = 0; n < vtp0_len(&pcb_uilayers); n++)
+			if (pcb_uilayers.array[n] != NULL)
+				APPEND(n | PCB_LYT_UI | PCB_LYT_VIRTUAL);
+
+	return used;
+}
+
+pcb_layer_id_t pcb_layer_by_name(pcb_data_t *data, const char *name)
+{
+	pcb_layer_id_t n;
+	for (n = 0; n < data->LayerN; n++)
+		if (strcmp(data->Layer[n].name, name) == 0)
+			return n;
+	return -1;
+}
+
+void pcb_layers_reset(pcb_board_t *pcb)
+{
+	pcb_layer_id_t n;
+
+	/* reset everything to empty, even if that's invalid (no top/bottom copper)
+	   for the rest of the code: the (embedded) default design will overwrite this. */
+	/* reset layers */
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		if (pcb->Data->Layer[n].name != NULL)
+			free((char *)pcb->Data->Layer[n].name);
+		pcb->Data->Layer[n].name = pcb_strdup("<pcb_layers_reset>");
+		pcb->Data->Layer[n].meta.real.grp = -1;
+	}
+
+	/* reset layer groups */
+	for(n = 0; n < PCB_MAX_LAYERGRP; n++) {
+		pcb->LayerGroups.grp[n].len = 0;
+		pcb->LayerGroups.grp[n].ltype = 0;
+		pcb->LayerGroups.grp[n].valid = 0;
+	}
+	pcb->LayerGroups.len = 0;
+	pcb->Data->LayerN = 0;
+}
+
+/* empty and detach a layer - must be initialized or another layer moved over it later */
+static void layer_clear(pcb_layer_t *dst)
+{
+	memset(dst, 0, sizeof(pcb_layer_t));
+	dst->meta.real.grp = -1;
+}
+
+pcb_layer_id_t pcb_layer_create(pcb_board_t *pcb, pcb_layergrp_id_t grp, const char *lname)
+{
+	pcb_layer_id_t id;
+
+	layer_if_too_many(pcb, return -1);
+
+	id = pcb->Data->LayerN++;
+
+	if (lname != NULL) {
+		if (pcb->Data->Layer[id].name != NULL)
+			free((char *)pcb->Data->Layer[id].name);
+	}
+
+	layer_clear(&pcb->Data->Layer[id]);
+	pcb->Data->Layer[id].name = pcb_strdup(lname);
+
+	/* add layer to group */
+	if (grp >= 0) {
+		pcb->LayerGroups.grp[grp].lid[pcb->LayerGroups.grp[grp].len] = id;
+		pcb->LayerGroups.grp[grp].len++;
+		pcb->Data->Layer[id].meta.real.vis = pcb->Data->Layer[pcb->LayerGroups.grp[grp].lid[0]].meta.real.vis;
+	}
+	pcb->Data->Layer[id].meta.real.grp = grp;
+	pcb->Data->Layer[id].meta.real.color = pcb_strdup(pcb_layer_default_color(id, (grp < 0) ? 0 : pcb->LayerGroups.grp[grp].ltype));
+
+	pcb->Data->Layer[id].parent_type = PCB_PARENT_DATA;
+	pcb->Data->Layer[id].parent.data = pcb->Data;
+	pcb->Data->Layer[id].type = PCB_OBJ_LAYER;
+
+	if (pcb == PCB)
+		pcb_board_set_changed_flag(1);
+
+	return id;
+}
+
+int pcb_layer_rename_(pcb_layer_t *Layer, char *Name)
+{
+	free((char*)Layer->name);
+	Layer->name = Name;
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	return 0;
+}
+
+int pcb_layer_rename(pcb_data_t *data, pcb_layer_id_t layer, const char *lname)
+{
+	return pcb_layer_rename_(&data->Layer[layer], pcb_strdup(lname));
+}
+
+int pcb_layer_recolor_(pcb_layer_t *Layer, char *color)
+{
+	if (Layer->is_bound)
+		return -1;
+	free(Layer->meta.real.color);
+	Layer->meta.real.color = color;
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	return 0;
+}
+
+int pcb_layer_recolor(pcb_data_t *data, pcb_layer_id_t layer, const char *color)
+{
+	return pcb_layer_rename_(&data->Layer[layer], pcb_strdup(color));
+}
+
+#undef APPEND
+
+static int is_last_top_copper_layer(pcb_board_t *pcb, int layer)
+{
+	pcb_layergrp_id_t cgroup = pcb_layer_get_group(pcb, pcb->LayerGroups.len + PCB_COMPONENT_SIDE);
+	pcb_layergrp_id_t lgroup = pcb_layer_get_group(pcb, layer);
+	if (cgroup == lgroup && pcb->LayerGroups.grp[lgroup].len == 1)
+		return 1;
+	return 0;
+}
+
+static int is_last_bottom_copper_layer(pcb_board_t *pcb, int layer)
+{
+	int sgroup = pcb_layer_get_group(pcb, pcb->LayerGroups.len + PCB_SOLDER_SIDE);
+	int lgroup = pcb_layer_get_group(pcb, layer);
+	if (sgroup == lgroup && pcb->LayerGroups.grp[lgroup].len == 1)
+		return 1;
+	return 0;
+}
+
+/* Safe move of a layer within a layer array, updaging all fields (list->parents) */
+void pcb_layer_move_(pcb_layer_t *dst, pcb_layer_t *src)
+{
+	pcb_line_t *li;
+	pcb_text_t *te;
+	pcb_poly_t *po;
+	pcb_arc_t *ar;
+
+	memcpy(dst, src, sizeof(pcb_layer_t));
+
+	/* reparent all the lists: each list item has a ->parent pointer that needs to point to the new place */
+	for(li = linelist_first(&dst->Line); li != NULL; li = linelist_next(li))
+		li->link.parent = &dst->Line.lst;
+	for(te = textlist_first(&dst->Text); te != NULL; te = textlist_next(te))
+		te->link.parent = &dst->Text.lst;
+	for(po = polylist_first(&dst->Polygon); po != NULL; po = polylist_next(po))
+		po->link.parent = &dst->Polygon.lst;
+	for(ar = arclist_first(&dst->Arc); ar != NULL; ar = arclist_next(ar))
+		ar->link.parent = &dst->Arc.lst;
+}
+
+const char *pcb_layer_default_color(int idx, pcb_layer_type_t lyt)
+{
+	const int clrs = sizeof(conf_core.appearance.color.layer) / sizeof(conf_core.appearance.color.layer[0]);
+
+	if (lyt & PCB_LYT_MASK)
+		return conf_core.appearance.color.mask;
+	if (lyt & PCB_LYT_PASTE)
+		return conf_core.appearance.color.paste;
+	if (lyt & PCB_LYT_SILK)
+		return conf_core.appearance.color.element;
+
+	return conf_core.appearance.color.layer[idx % clrs];
+}
+
+/* Initialize a new layer with safe initial values */
+static void layer_init(pcb_board_t *pcb, pcb_layer_t *lp, pcb_layer_id_t idx, pcb_layergrp_id_t gid, pcb_data_t *parent)
+{
+	memset(lp, 0, sizeof(pcb_layer_t));
+	lp->meta.real.grp = gid;
+	lp->meta.real.vis = 1;
+	lp->name = pcb_strdup("New Layer");
+	lp->meta.real.color = pcb_strdup(pcb_layer_default_color(idx, (gid >= 0) ? pcb->LayerGroups.grp[gid].ltype : 0));
+	if ((gid >= 0) && (pcb->LayerGroups.grp[gid].len == 0)) { /*When adding the first layer in a group, set up comb flags automatically */
+		switch((pcb->LayerGroups.grp[gid].ltype) & PCB_LYT_ANYTHING) {
+			case PCB_LYT_MASK:  lp->comb = PCB_LYC_AUTO | PCB_LYC_SUB; break;
+			case PCB_LYT_SILK:  lp->comb = PCB_LYC_AUTO;
+			case PCB_LYT_PASTE: lp->comb = PCB_LYC_AUTO;
+			default: break;
+		}
+	}
+	lp->parent.data = parent;
+	lp->parent_type = PCB_PARENT_DATA;
+	lp->type = PCB_OBJ_LAYER;
+}
+
+int pcb_layer_move(pcb_board_t *pcb, pcb_layer_id_t old_index, pcb_layer_id_t new_index, pcb_layergrp_id_t new_in_grp)
+{
+	pcb_layer_id_t l, at = -1;
+
+	/* sanity checks */
+	if (old_index < -1 || old_index >= pcb->Data->LayerN) {
+		pcb_message(PCB_MSG_ERROR, "Invalid old layer %d for move: must be -1..%d\n", old_index, pcb->Data->LayerN - 1);
+		return 1;
+	}
+
+	if (new_index < -1 || new_index > pcb->Data->LayerN || new_index >= PCB_MAX_LAYER) {
+		pcb_message(PCB_MSG_ERROR, "Invalid new layer %d for move: must be -1..%d\n", new_index, pcb->Data->LayerN);
+		return 1;
+	}
+
+	if (new_index == -1 && is_last_top_copper_layer(pcb, old_index)) {
+		pcb_gui->confirm_dialog("You can't delete the last top-side layer\n", "Ok", NULL);
+		return 1;
+	}
+
+	if (new_index == -1 && is_last_bottom_copper_layer(pcb, old_index)) {
+		pcb_gui->confirm_dialog("You can't delete the last bottom-side layer\n", "Ok", NULL);
+		return 1;
+	}
+
+
+	if (old_index == -1) { /* append new layer at the end of the logical layer list, put it in the current group */
+		pcb_layergrp_t *g;
+		pcb_layer_t *lp;
+		pcb_layer_id_t new_lid = pcb->Data->LayerN++;
+		int grp_idx;
+
+		lp = &pcb->Data->Layer[new_lid];
+		if (new_in_grp >= 0)
+			layer_init(pcb, lp, new_lid, new_in_grp, pcb->Data);
+		else
+			layer_init(pcb, lp, new_lid, pcb->Data->Layer[new_index].meta.real.grp, pcb->Data);
+
+		g = pcb_get_layergrp(pcb, lp->meta.real.grp);
+
+		if (new_in_grp >= 0) {
+			if (new_index == 0)
+				grp_idx = 0;
+			else
+				grp_idx = g->len;
+		}
+		else
+			grp_idx = pcb_layergrp_index_in_grp(g, new_index);
+
+		/* shift group members up and insert the new group */
+		if ((g->len > grp_idx) && (grp_idx >= 0))
+			memmove(g->lid+grp_idx+1, g->lid+grp_idx, (g->len - grp_idx) * sizeof(pcb_layer_id_t));
+		if (grp_idx < 0)
+			grp_idx = 0;
+		g->lid[grp_idx] = new_lid;
+		g->len++;
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+		pcb_layervis_change_group_vis(new_lid, 1, 1);
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+		at = new_lid;
+	}
+	else if (new_index == -1) { /* Delete the layer at old_index */
+		pcb_layergrp_id_t gid;
+		pcb_layergrp_t *g;
+		int grp_idx, remaining;
+
+#warning layer TODO remove objects, free fields layer_free(&pcb->Data->Layer[old_index]);
+
+		/* remove the current lid from its group */
+		g = pcb_get_layergrp(pcb, pcb->Data->Layer[old_index].meta.real.grp);
+		grp_idx = pcb_layergrp_index_in_grp(g, old_index);
+		if (grp_idx < 0) {
+			pcb_message(PCB_MSG_ERROR, "Internal error; layer not in group\n");
+			return -1;
+		}
+
+		remaining = (g->len - grp_idx - 1);
+		if (remaining > 0)
+			memmove(g->lid+grp_idx, g->lid+grp_idx+1, remaining * sizeof(pcb_layer_id_t));
+		g->len--;
+
+		/* update lids in all groups (shifting down idx) */
+		for(gid = 0; gid < pcb_max_group(pcb); gid++) {
+			int n;
+			g = &pcb->LayerGroups.grp[gid];
+			for(n = 0; n < g->len; n++)
+				if (g->lid[n] > old_index)
+					g->lid[n]--;
+		}
+
+		/* update visibility */
+		for(l = old_index; l < pcb->Data->LayerN-1; l++) {
+			pcb_layer_move_(&pcb->Data->Layer[l], &pcb->Data->Layer[l+1]);
+			layer_clear(&pcb->Data->Layer[l+1]);
+		}
+
+		for (l = 0; l < pcb->Data->LayerN; l++)
+			if (pcb_layer_stack[l] == old_index)
+				memmove(pcb_layer_stack + l, pcb_layer_stack + l + 1, (pcb->Data->LayerN - l - 1) * sizeof(pcb_layer_stack[0]));
+
+		/* remove layer from the logical layer array */
+		pcb_max_layer--;
+		for (l = 0; l < pcb->Data->LayerN; l++)
+			if (pcb_layer_stack[l] > old_index)
+				pcb_layer_stack[l]--;
+
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Logical layer move is not supported any more. This function should have not been called. Please report this error.\n");
+		/* Removed r8686:
+		   The new layer design presents the layers by groups to preserve physical
+		   order. In this system the index of the logical layer on the logical
+		   layer list is insignificant, thus we shouldn't try to change it. */
+	}
+
+	if (at >= 0) {
+		pcb_undo_add_layer_move(old_index, new_index, at);
+		pcb_undo_inc_serial();
+	}
+	else
+		pcb_message(PCB_MSG_WARNING, "this operation is not undoable.\n");
+
+	return 0;
+}
+
+const char *pcb_layer_name(pcb_data_t *data, pcb_layer_id_t id)
+{
+	if (id < 0)
+		return NULL;
+	if (id < data->LayerN)
+		return data->Layer[id].name;
+	if ((id >= PCB_LAYER_VIRT_MIN) && (id <= PCB_LAYER_VIRT_MAX))
+		return pcb_virt_layers[id-PCB_LAYER_VIRT_MIN].name;
+	return NULL;
+}
+
+pcb_layer_t *pcb_get_layer(pcb_data_t *data, pcb_layer_id_t id)
+{
+	if ((id >= 0) && (id < data->LayerN))
+		return &data->Layer[id];
+	if (id & PCB_LYT_UI)
+		return pcb_uilayer_get(id);
+	return NULL;
+}
+
+pcb_layer_id_t pcb_layer_str2id(pcb_data_t *data, const char *str)
+{
+	char *end;
+	pcb_layer_id_t id;
+	if (*str == '#') {
+		id = strtol(str+1, &end, 10);
+		if ((*end == '\0') && (id >= 0) && (id < data->LayerN))
+			return id;
+	}
+	return -1;
+}
+
+
+void pcb_layer_link_trees(pcb_layer_t *dst, pcb_layer_t *src)
+{
+	/* we can't link non-existing trees - make sure src does have the trees initialized */
+	if (src->line_tree == NULL) src->line_tree = pcb_r_create_tree();
+	if (src->arc_tree == NULL) src->arc_tree = pcb_r_create_tree();
+	if (src->text_tree == NULL) src->text_tree = pcb_r_create_tree();
+	if (src->polygon_tree == NULL) src->polygon_tree = pcb_r_create_tree();
+
+	dst->line_tree = src->line_tree;
+	dst->arc_tree = src->arc_tree;
+	dst->text_tree = src->text_tree;
+	dst->polygon_tree = src->polygon_tree;
+}
+
+
+void pcb_layer_real2bound_offs(pcb_layer_t *dst, pcb_board_t *src_pcb, pcb_layer_t *src)
+{
+	dst->meta.bound.real = NULL;
+	dst->is_bound = 1;
+	if ((dst->meta.bound.type & PCB_LYT_INTERN) && (dst->meta.bound.type & PCB_LYT_COPPER)) {
+		int from_top, from_bottom, res;
+		pcb_layergrp_t *tcop = pcb_get_grp(&src_pcb->LayerGroups, PCB_LYT_TOP, PCB_LYT_COPPER);
+		pcb_layergrp_t *bcop = pcb_get_grp(&src_pcb->LayerGroups, PCB_LYT_BOTTOM, PCB_LYT_COPPER);
+		pcb_layergrp_id_t tcop_id = pcb_layergrp_id(src_pcb, tcop);
+		pcb_layergrp_id_t bcop_id = pcb_layergrp_id(src_pcb, bcop);
+
+		res = pcb_layergrp_dist(src_pcb, src->meta.real.grp, tcop_id, PCB_LYT_COPPER, &from_top);
+		res |= pcb_layergrp_dist(src_pcb, src->meta.real.grp, bcop_id, PCB_LYT_COPPER, &from_bottom);
+		if (res == 0) {
+			if (from_top <= from_bottom)
+				dst->meta.bound.stack_offs = from_top;
+			else
+				dst->meta.bound.stack_offs = -from_bottom;
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "Internal error: can't figure the inter copper\nlayer offset for %s\n", src->name);
+	}
+	else
+		dst->meta.bound.stack_offs = 0;
+}
+
+void pcb_layer_real2bound(pcb_layer_t *dst, pcb_layer_t *src, int share_rtrees)
+{
+	pcb_board_t *pcb;
+
+	assert(!src->is_bound);
+
+	pcb = pcb_layer_get_top(src);
+	dst->comb = src->comb;
+
+	dst->meta.bound.type = pcb_layergrp_flags(pcb, src->meta.real.grp);
+	if (src->name != NULL)
+		dst->name = pcb_strdup(src->name);
+	else
+		dst->name = NULL;
+
+	pcb_layer_real2bound_offs(dst, pcb, src);
+
+	if (!src->is_bound) {
+		dst->meta.bound.real = src;
+		if (share_rtrees)
+			pcb_layer_link_trees(dst, src);
+	}
+}
+
+pcb_layer_t *pcb_layer_resolve_binding(pcb_board_t *pcb, pcb_layer_t *src)
+{
+	int l, score, best_score = 0;
+	pcb_layergrp_id_t gid;
+	pcb_layer_t *best = NULL;
+
+	assert(src->is_bound);
+
+	/* look up the layer group; for internal copper this means counting the offset */
+	if ((src->meta.bound.type & PCB_LYT_INTERN) && (src->meta.bound.type & PCB_LYT_COPPER) && (src->meta.bound.stack_offs != 0)) {
+		if (src->meta.bound.stack_offs < 0)
+			gid = pcb_layergrp_get_bottom_copper();
+		else
+			gid = pcb_layergrp_get_top_copper();
+		gid = pcb_layergrp_step(pcb, gid, src->meta.bound.stack_offs, PCB_LYT_COPPER | PCB_LYT_INTERN);
+	}
+	else {
+		pcb_layer_type_t lyt = src->meta.bound.type;
+		if ((lyt & PCB_LYT_OUTLINE) && (lyt & PCB_LYT_ANYWHERE)) {
+			lyt = PCB_LYT_OUTLINE;
+			pcb_message(PCB_MSG_WARNING, "Ignoring invalid layer flag combination for %s: outline layer must be global\n", src->name);
+		}
+		if (pcb_layergrp_list(pcb, lyt, &gid, 1) != 1)
+			return NULL;
+	}
+
+	/* target group identified; pick the closest match layer within that group */
+	{
+		pcb_layergrp_t *grp = pcb->LayerGroups.grp+gid;
+		for(l = 0; l < grp->len; l++) {
+			pcb_layer_t *ly = pcb_get_layer(pcb->Data, grp->lid[l]);
+			if ((ly->comb & PCB_LYC_SUB) == (src->comb & PCB_LYC_SUB)) {
+				score = 1;
+				if (ly->comb == src->comb)
+					score++;
+
+				if (ly->name == src->name) /* mainly for NULL = NULL */
+					score += 4;
+				
+				if ((ly->name != NULL) && (src->name != NULL)) {
+					if (strcmp(ly->name, src->name) == 0)
+						score += 4;
+					else if (pcb_strcasecmp(ly->name, src->name) == 0)
+						score += 2;
+				}
+
+				if (score > best_score) {
+					best = ly;
+					best_score = score;
+				}
+			}
+		}
+	}
+
+	return best;
+}
+
+pcb_layer_t *pcb_layer_new_bound(pcb_data_t *data, pcb_layer_type_t type, const char *name)
+{
+	pcb_layer_t *lay = &data->Layer[data->LayerN++];
+
+	memset(lay, 0, sizeof(pcb_layer_t));
+	lay->is_bound = 1;
+	lay->name = pcb_strdup(name);
+	lay->meta.bound.type = type;
+	lay->parent.data = data;
+	lay->parent_type = PCB_PARENT_DATA;
+	lay->type = PCB_OBJ_LAYER;
+	return lay;
+}
+
+unsigned int pcb_layer_hash_bound(pcb_layer_t *ly, pcb_bool smirror)
+{
+	unsigned int hash;
+	pcb_layer_type_t lyt;
+	int offs;
+
+	assert(ly->is_bound);
+
+	lyt = ly->meta.bound.type;
+	offs = ly->meta.bound.stack_offs;
+
+	if (smirror) {
+		lyt = pcb_layer_mirror_type(lyt);
+		offs = -offs;
+	}
+
+	hash  = (unsigned long)arclist_length(&ly->Arc);
+	hash ^= (unsigned long)linelist_length(&ly->Line);
+	hash ^= (unsigned long)textlist_length(&ly->Text);
+	hash ^= (unsigned long)polylist_length(&ly->Polygon);
+	hash ^= (unsigned long)ly->comb ^ (unsigned long)lyt;
+
+	if (ly->meta.bound.type & PCB_LYT_INTERN)
+		hash ^= (unsigned int)offs;
+
+	return hash;
+}
+
+pcb_layer_type_t pcb_layer_mirror_type(pcb_layer_type_t lyt)
+{
+	if (lyt & PCB_LYT_TOP)
+		return (lyt & ~PCB_LYT_TOP) | PCB_LYT_BOTTOM;
+	else if (lyt & PCB_LYT_BOTTOM)
+		return (lyt & ~PCB_LYT_BOTTOM) | PCB_LYT_TOP;
+	return lyt;
+}
+
+int pcb_layer_type_map(pcb_layer_type_t type, void *ctx, void (*cb)(void *ctx, pcb_layer_type_t bit, const char *name, int class, const char *class_name))
+{
+	const pcb_layer_type_name_t *n;
+	int found = 0;
+	for(n = pcb_layer_type_names; n->name != NULL; n++) {
+		if (type & n->type) {
+			cb(ctx, n->type, n->name, n->class, pcb_layer_type_class_names[n->class]);
+			found++;
+		}
+	}
+	return found;
+}
+
+int pcb_layer_comb_map(pcb_layer_combining_t type, void *ctx, void (*cb)(void *ctx, pcb_layer_combining_t bit, const char *name))
+{
+	const pcb_layer_type_name_t *n;
+	int found = 0;
+	for(n = pcb_layer_comb_names; n->name != NULL; n++) {
+		if (type & n->type) {
+			cb(ctx, n->type, n->name);
+			found++;
+		}
+	}
+	return found;
+}
+
+
+pcb_layer_type_t pcb_layer_type_str2bit(const char *name)
+{
+	const pcb_layer_type_name_t *n;
+	for(n = pcb_layer_type_names; n->name != NULL; n++)
+		if (strcmp(n->name, name) == 0)
+			return n->type;
+	return 0;
+}
+
+const char *pcb_layer_type_bit2str(pcb_layer_type_t type)
+{
+	const pcb_layer_type_name_t *n;
+	for(n = pcb_layer_type_names; n->name != NULL; n++)
+		if (type & n->type)
+			return n->name;
+	return 0;
+}
+
+pcb_layer_combining_t pcb_layer_comb_str2bit(const char *name)
+{
+	const pcb_layer_type_name_t *n;
+	for(n = pcb_layer_comb_names; n->name != NULL; n++)
+		if (strcmp(n->name, name) == 0)
+			return n->type;
+	return 0;
+}
+
+void pcb_layer_auto_fixup(pcb_board_t *pcb)
+{
+	pcb_layer_id_t n;
+
+	/* old silk layers are always auto */
+	for(n = 0; n < pcb->Data->LayerN; n++)
+		if (pcb_layer_flags(pcb, n) & PCB_LYT_SILK)
+			pcb->Data->Layer[n].comb |= PCB_LYC_AUTO;
+}
+
+int pcb_layer_gui_set_vlayer(pcb_board_t *pcb, pcb_virtual_layer_t vid, int is_empty)
+{
+	pcb_virt_layer_t *v = &pcb_virt_layers[vid];
+	assert((vid >= 0) && (vid < PCB_VLY_end));
+
+	/* if there's no GUI, that means no draw should be done */
+	if (pcb_gui == NULL)
+		return 0;
+
+#warning layer TODO: need to pass the flags of the group, not the flags of the layer once we have a group for each layer
+	if (pcb_gui->set_layer_group != NULL) {
+		pcb_layergrp_id_t grp;
+		pcb_layer_id_t lid = v->new_id;
+		grp = pcb_layer_get_group(pcb, lid);
+		return pcb_gui->set_layer_group(grp, lid, v->type, is_empty);
+	}
+
+	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
+	return 1;
+}
+
+int pcb_layer_gui_set_g_ui(pcb_layer_t *first, int is_empty)
+{
+	/* if there's no GUI, that means no draw should be done */
+	if (pcb_gui == NULL)
+		return 0;
+
+	if (pcb_gui->set_layer_group != NULL)
+		return pcb_gui->set_layer_group(-1, pcb_layer_id(first->parent.data, first), PCB_LYT_VIRTUAL | PCB_LYT_UI, is_empty);
+
+	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
+	return 1;
+}
+
+void pcb_layer_edit_attrib(pcb_layer_t *layer)
+{
+	char *buf = pcb_strdup_printf("Layer %s Attributes", layer->name);
+	pcb_gui->edit_attributes(buf, &(layer->Attributes));
+	free(buf);
+}
+
+const pcb_menu_layers_t *pcb_menu_layer_find(const char *name_or_abbrev)
+{
+	const pcb_menu_layers_t *ml;
+
+	for(ml = pcb_menu_layers; ml->name != NULL; ml++)
+		if (pcb_strcasecmp(name_or_abbrev, ml->abbrev) == 0)
+			return ml;
+
+	for(ml = pcb_menu_layers; ml->name != NULL; ml++)
+		if (pcb_strcasecmp(name_or_abbrev, ml->name) == 0)
+			return ml;
+
+	return NULL;
+}
+
+
+static pcb_layer_id_t pcb_layer_get_cached(pcb_board_t *pcb, pcb_layer_id_t *cache, unsigned int loc, unsigned int typ)
+{
+	pcb_layergrp_t *g;
+
+	if (*cache < pcb->Data->LayerN) { /* check if the cache is still pointing to the right layer */
+		pcb_layergrp_id_t gid = pcb->Data->Layer[*cache].meta.real.grp;
+		if ((gid >= 0) && (gid < pcb->LayerGroups.len)) {
+			g = &(pcb->LayerGroups.grp[gid]);
+			if ((g->ltype & loc) && (g->ltype & typ) && (g->lid[0] == *cache))
+				return *cache;
+		}
+	}
+
+	/* nope: need to resolve it again */
+	g = pcb_get_grp(&pcb->LayerGroups, loc, typ);
+	if ((g == NULL) || (g->len == 0)) {
+		*cache = -1;
+		return -1;
+	}
+	*cache = g->lid[0];
+	return *cache;
+}
+
+pcb_layer_id_t pcb_layer_get_bottom_silk()
+{
+	static pcb_layer_id_t cache = -1;
+	pcb_layer_id_t id = pcb_layer_get_cached(PCB, &cache, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+	assert(id >= 0);
+	return id;
+}
+
+pcb_layer_id_t pcb_layer_get_top_silk()
+{
+	static pcb_layer_id_t cache = -1;
+	pcb_layer_id_t id = pcb_layer_get_cached(PCB, &cache, PCB_LYT_TOP, PCB_LYT_SILK);
+	assert(id >= 0);
+	return id;
+}
Index: tags/2.0.1/src/layer.h
===================================================================
--- tags/2.0.1/src/layer.h	(nonexistent)
+++ tags/2.0.1/src/layer.h	(revision 18980)
@@ -0,0 +1,349 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_LAYER_H
+#define PCB_LAYER_H
+
+
+typedef long int pcb_layer_id_t;
+typedef long int pcb_layergrp_id_t;
+
+/* Layer type bitfield */
+typedef enum {
+	/* Stack-up (vertical position): */
+	PCB_LYT_TOP      = 0x00000001, /* layer is on the top side of the board */
+	PCB_LYT_BOTTOM   = 0x00000002, /* layer is on the bottom side of the board */
+	PCB_LYT_INTERN   = 0x00000004, /* layer is internal */
+	PCB_LYT_LOGICAL  = 0x00000008, /* does not depend on the layer stackup (typically aux drawing layer) */
+	PCB_LYT_ANYWHERE = 0x000000FF, /* MASK: layer is anywhere on the stack */
+
+	/* What the layer consists of */
+	PCB_LYT_COPPER   = 0x00000100, /* copper objects */
+	PCB_LYT_SILK     = 0x00000200, /* silk objects */
+	PCB_LYT_MASK     = 0x00000400, /* solder mask */
+	PCB_LYT_PASTE    = 0x00000800, /* paste */
+	PCB_LYT_OUTLINE  = 0x00001000, /* outline (contour of the board) */
+	PCB_LYT_RAT      = 0x00002000, /* (virtual) rats nest (one, not in the stackup) */
+	PCB_LYT_INVIS    = 0x00004000, /* (virtual) layer is invisible (one, not in the stackup) */
+	PCB_LYT_ASSY     = 0x00008000, /* (virtual) assembly drawing (top and bottom) */
+	PCB_LYT_FAB      = 0x00010000, /* (virtual) fab drawing (one, not in the stackup) */
+	PCB_LYT_PDRILL   = 0x00020000, /* (virtual) plated drills (affects all physical layers) */
+	PCB_LYT_UDRILL   = 0x00040000, /* (virtual) unplated drills (affects all physical layers) */
+	PCB_LYT_UI       = 0x00080000, /* (virtual) user interface drawings (feature plugins use this for displaying states or debug info) */
+	PCB_LYT_CSECT    = 0x00100000, /* (virtual) cross-section drawing (displaying layer groups) */
+	PCB_LYT_SUBSTRATE= 0x00200000, /* substrate / insulator */
+	PCB_LYT_MISC     = 0x00400000, /* misc physical layers (e.g. adhesive) */
+	PCB_LYT_DIALOG   = 0x00800000, /* (virtual) dialog box drawings (e.g. font selector) - not to be interpreted in the board space */
+	PCB_LYT_ANYTHING = 0x00FFFF00, /* MASK: layers consist anything */
+
+	/* misc properties */
+	PCB_LYT_VIRTUAL  = 0x01000000, /* the layer is not in the layer array (generated layer) */
+	PCB_LYT_NOEXPORT = 0x02000000, /* should not show up in any of the exports */
+	PCB_LYT_ANYPROP  = 0x7F000000  /* MASK: misc layer properties */
+} pcb_layer_type_t;
+
+
+typedef enum {
+	PCB_VLY_INVISIBLE,
+	PCB_VLY_RATS,
+	PCB_VLY_TOP_ASSY,
+	PCB_VLY_BOTTOM_ASSY,
+	PCB_VLY_FAB,
+	PCB_VLY_PLATED_DRILL,
+	PCB_VLY_UNPLATED_DRILL,
+	PCB_VLY_CSECT,
+	PCB_VLY_DIALOG,
+
+	/* for determining the range, do not use */
+	PCB_VLY_end,
+	PCB_VLY_first = PCB_VLY_INVISIBLE
+} pcb_virtual_layer_t;
+
+typedef enum { /* bitfield */
+	PCB_LYC_SUB = 1,        /* bit 0 is 0 for add or 1 for sub */
+	PCB_LYC_AUTO = 2        /* bit 1 is 0 for manual drawn layer or 1 for side-effect objects from padstacks; this is how the user controls on which composite mask/paste layer padstack side effects should appear */
+} pcb_layer_combining_t;
+
+
+#include "globalconst.h"
+#include "global_typedefs.h"
+#include "attrib.h"
+#include "obj_arc_list.h"
+#include "obj_line_list.h"
+#include "obj_poly_list.h"
+#include "obj_text_list.h"
+
+struct pcb_layer_s {              /* holds information about one layer */
+	PCB_ANY_OBJ_FIELDS;
+
+	linelist_t Line;
+	textlist_t Text;
+	polylist_t Polygon;
+	arclist_t Arc;
+
+	const char *name;              /* layer name */
+
+	pcb_layer_combining_t comb;    /* how to combine this layer with other layers in the group */
+
+	/* for bound layers these point to the board layer's*/
+	pcb_rtree_t *line_tree, *text_tree, *polygon_tree, *arc_tree;
+
+	union {
+		struct { /* A real board layer */
+			pcb_layergrp_id_t grp;         /* the group this layer is in (cross-reference) */
+			pcb_bool vis;                  /* visible flag */
+			char *color;                   /* strdup'd */
+			int no_drc;                    /* whether to ignore the layer when checking the design rules */
+			const char *cookie;            /* for UI layers: registration cookie; NULL for unused UI layers */
+		} real;
+		struct { /* A subcircuit layer binding; list data are local but everything else is coming from board layers */
+			pcb_layer_t *real;             /* NULL if unbound */
+
+			/* matching rules */
+			pcb_layer_type_t type;
+			/* for comb, use the ->comb from the common part */
+			int stack_offs;                /* offset in the stack for PCB_LYT_INNER: positive is counted from primary side, negative from the opposite side */
+
+			unsigned user_specified:1;     /* 1 if the user forced the binding */
+			pcb_layer_id_t user_lid;
+		} bound;
+	} meta;
+
+	unsigned is_bound:1;
+	unsigned propedit:1; /* temporary: let propedit know this layer is being edited */
+};
+
+/* returns the layer number for the passed copper or silk layer pointer */
+pcb_layer_id_t pcb_layer_id(pcb_data_t *Data, pcb_layer_t *Layer);
+
+
+/* the offsets of the two additional special layers (e.g. silk) for 'component'
+   and 'solder'. The offset of PCB_MAX_LAYER is not added here. Also can be
+   used to address side of the board without referencing to groups or layers. */
+typedef enum {
+	PCB_SOLDER_SIDE    = 0,
+	PCB_COMPONENT_SIDE = 1
+} pcb_side_t;
+
+/* Cached lookup of the first silk layer in the bottom or top group */
+pcb_layer_id_t pcb_layer_get_bottom_silk();
+pcb_layer_id_t pcb_layer_get_top_silk();
+
+/* Return the board the layer is under */
+#define pcb_layer_get_top(layer) pcb_data_get_top((layer)->parent.data)
+
+typedef struct {
+	const char *name, *abbrev;
+	char * const *force_color;
+	const char *select_name;
+	int vis_offs, sel_offs;
+} pcb_menu_layers_t;
+
+extern const pcb_menu_layers_t pcb_menu_layers[];
+
+const pcb_menu_layers_t *pcb_menu_layer_find(const char *name_or_abbrev);
+
+/************ OLD API - new code should not use these **************/
+
+#define	LAYER_ON_STACK(n)	(&PCB->Data->Layer[pcb_layer_stack[(n)]])
+#define LAYER_PTR(n)            (&PCB->Data->Layer[(n)])
+#define	CURRENT	(LAYER_ON_STACK(0))
+#define	INDEXOFCURRENT	(pcb_layer_stack[0])
+#define SILKLAYER		Layer[ \
+				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk())]
+#define BACKSILKLAYER		Layer[ \
+				(conf_core.editor.show_solder_side ? pcb_layer_get_top_silk() : pcb_layer_get_bottom_silk())]
+
+#define LAYER_LOOP(data, ml) do { \
+        pcb_cardinal_t n; \
+	for (n = 0; n < ml; n++) \
+	{ \
+	   pcb_layer_t *layer = (&data->Layer[(n)]);
+
+/************ NEW API - new code should use these **************/
+
+/* Free all metadata and objects of a layer; does not free(layer) */
+void pcb_layer_free(pcb_layer_t *layer);
+
+/* Return the layer pointer (or NULL on invalid or virtual layers) for an id */
+pcb_layer_t *pcb_get_layer(pcb_data_t *data, pcb_layer_id_t id);
+
+/* Return the name of a layer (real or virtual) or NULL on error
+   NOTE: layer names may not be unique; returns the first case sensitive hit;
+   slow linear search */
+pcb_layer_id_t pcb_layer_by_name(pcb_data_t *data, const char *name);
+
+/* Returns pcb_true if the given layer is empty (there are no objects on the layer) */
+pcb_bool pcb_layer_is_empty_(pcb_board_t *pcb, pcb_layer_t *ly);
+pcb_bool pcb_layer_is_empty(pcb_board_t *pcb, pcb_layer_id_t ly);
+
+/* Returns pcb_true if the given layer is empty - non-recursive variant (doesn't deal with side effects) */
+pcb_bool pcb_layer_is_pure_empty(pcb_layer_t *layer);
+
+
+/* call the gui to set a virtual layer or the UI layer group */
+int pcb_layer_gui_set_vlayer(pcb_board_t *pcb, pcb_virtual_layer_t vid, int is_empty);
+int pcb_layer_gui_set_g_ui(pcb_layer_t *first, int is_empty);
+
+
+/* returns a bitfield of pcb_layer_type_t; returns 0 if layer_idx or layer is invalid. */
+unsigned int pcb_layer_flags(pcb_board_t *pcb, pcb_layer_id_t layer_idx);
+unsigned int pcb_layer_flags_(pcb_layer_t *layer);
+
+/* map bits of a layer type (call cb for each bit set); return number of bits
+   found. */
+int pcb_layer_type_map(pcb_layer_type_t type, void *ctx, void (*cb)(void *ctx, pcb_layer_type_t bit, const char *name, int class, const char *class_name));
+int pcb_layer_comb_map(pcb_layer_combining_t type, void *ctx, void (*cb)(void *ctx, pcb_layer_combining_t bit, const char *name));
+
+/* return 0 or the flag value correspoding to name (linear search) */
+pcb_layer_type_t pcb_layer_type_str2bit(const char *name);
+pcb_layer_combining_t pcb_layer_comb_str2bit(const char *name);
+
+/* return the name of a type bit; type should have only one bit set */
+const char *pcb_layer_type_bit2str(pcb_layer_type_t type);
+
+/* Various fixes for old/plain/flat layer stack imports vs. composite layers */
+void pcb_layer_auto_fixup(pcb_board_t *pcb);
+
+/* List layer IDs that matches mask - write the first res_len items in res,
+   if res is not NULL. Returns:
+    - the total number of layers matching the query, if res is NULL
+    - the number of layers copied into res if res is not NULL
+   The plain version require exact match (look for a specific layer),
+   the  _any version allows partial match so work with PCB_LYT_ANY*.
+*/
+int pcb_layer_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layer_id_t *res, int res_len);
+int pcb_layer_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layer_id_t *res, int res_len);
+
+/**** layer creation (for load/import code) ****/
+
+/* Reset layers to the bare minimum (double sided board) */
+void pcb_layers_reset(pcb_board_t *pcb);
+
+/* Create a new layer and put it in an existing group (if grp is not -1). */
+pcb_layer_id_t pcb_layer_create(pcb_board_t *pcb, pcb_layergrp_id_t grp, const char *lname);
+
+/* Return the name of a layer (resolving the true name of virtual layers too) */
+const char *pcb_layer_name(pcb_data_t *data, pcb_layer_id_t id);
+
+/* Return the default color for a new layer from the config */
+const char *pcb_layer_default_color(int idx, pcb_layer_type_t lyt);
+
+/* Rename/recolor an existing layer by idx */
+int pcb_layer_rename(pcb_data_t *data, pcb_layer_id_t layer, const char *lname);
+int pcb_layer_recolor(pcb_data_t *data, pcb_layer_id_t layer, const char *lcolor);
+
+/* changes the name/color of a layer; string has to be allocated by the caller (pcb_strdup) */
+int pcb_layer_rename_(pcb_layer_t *Layer, char *Name);
+int pcb_layer_recolor_(pcb_layer_t *Layer, char *color);
+
+
+/* index is 0..PCB_MAX_LAYER-1.  If old_index is -1, a new layer is
+   inserted at that index.  If new_index is -1, the specified layer is
+   deleted.  Returns non-zero on error, zero if OK.  */
+int pcb_layer_move(pcb_board_t *pcb, pcb_layer_id_t old_index, pcb_layer_id_t new_index, pcb_layergrp_id_t new_in_grp);
+
+
+/* set up dst to be a bound layer with the right offset in the stack; src_pcb
+   is used for the layer stack of src. Assumes other fields of dst, e.g. name,
+   are all set up. */
+void pcb_layer_real2bound_offs(pcb_layer_t *dst, pcb_board_t *src_pcb, pcb_layer_t *src);
+
+/* Set up dst so that it's a non-real layer bound to src */
+void pcb_layer_real2bound(pcb_layer_t *dst, pcb_layer_t *src, int share_rtrees);
+
+/* Assume src is a bound layer; find the closest match in pcb's layer stack */
+pcb_layer_t *pcb_layer_resolve_binding(pcb_board_t *pcb, pcb_layer_t *src);
+
+/* Allocate a new bound layer within data, set it up, but do not do the binding */
+pcb_layer_t *pcb_layer_new_bound(pcb_data_t *data, pcb_layer_type_t type, const char *name);
+
+/* Calculate a hash of a bound layer (ingoring its name) */
+unsigned int pcb_layer_hash_bound(pcb_layer_t *ly, pcb_bool smirror);
+
+/* Calculate mirrored version of some (bound) layer properties */
+pcb_layer_type_t pcb_layer_mirror_type(pcb_layer_type_t lyt);
+
+
+/* Modify tree pointers in dst to point to src's; allocates trees for src if they are not yet allocated */
+void pcb_layer_link_trees(pcb_layer_t *dst, pcb_layer_t *src);
+
+/* Open the attribute editor for a layer */
+void pcb_layer_edit_attrib(pcb_layer_t *layer);
+
+/* Convert a textual layer reference into a layer ID. The text is either
+   #id or a layer name. */
+pcb_layer_id_t pcb_layer_str2id(pcb_data_t *data, const char *str);
+
+/* How deep subcs can be nested */
+#define PCB_MAX_BOUND_LAYER_RECURSION 128
+
+/* Return the real layer, resolving layer bindings. Returns NULL on
+   error (e.g. binding loop) */
+PCB_INLINE pcb_layer_t *pcb_layer_get_real(pcb_layer_t *layer)
+{
+	int rec = 0;
+
+	while(layer->is_bound) {
+		layer = layer->meta.bound.real;
+		rec++;
+		if ((rec > PCB_MAX_BOUND_LAYER_RECURSION) || (layer == NULL))
+			return NULL;
+	}
+	return layer;
+}
+
+/* list of virtual layers: these are generated by the draw code but do not
+   have a real layer in the array */
+typedef struct pcb_virt_layer_s {
+	char *name;
+	pcb_layer_id_t new_id;
+	pcb_layer_type_t type;
+} pcb_virt_layer_t;
+
+extern pcb_virt_layer_t pcb_virt_layers[];
+
+/* Return the first virtual layer that fully matches mask */
+const pcb_virt_layer_t *pcb_vlayer_get_first(pcb_layer_type_t mask);
+
+/* Returns whether the given unsigned int layer flags corresponds to a layer
+   that's on the visible side of the board at the moment. */
+#define PCB_LAYERFLG_ON_VISIBLE_SIDE(uint_flags) \
+	(!!(conf_core.editor.show_solder_side ? ((uint_flags) & PCB_LYT_BOTTOM) : ((uint_flags) & PCB_LYT_TOP)))
+
+#define PCB_LYT_VISIBLE_SIDE() \
+	((conf_core.editor.show_solder_side ? PCB_LYT_BOTTOM : PCB_LYT_TOP))
+
+#define PCB_LYT_INVISIBLE_SIDE() \
+	((conf_core.editor.show_solder_side ? PCB_LYT_TOP : PCB_LYT_BOTTOM))
+
+/*** For internal use ***/
+void pcb_layer_move_(pcb_layer_t *dst, pcb_layer_t *src);
+
+#endif
Index: tags/2.0.1/src/layer_grp.c
===================================================================
--- tags/2.0.1/src/layer_grp.c	(nonexistent)
+++ tags/2.0.1/src/layer_grp.c	(revision 18980)
@@ -0,0 +1,1053 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "layer_grp.h"
+#include "compat_misc.h"
+#include "event.h"
+
+/* notify the rest of the code after layer group changes so that the GUI
+   and other parts sync up */
+static int inhibit_notify = 0;
+#define NOTIFY(pcb) \
+do { \
+	pcb->LayerGroups.cache.copper_valid = 0; \
+	if (!inhibit_notify) { \
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); \
+		if ((pcb_gui != NULL) && (pcb_exporter == NULL)) \
+			pcb_gui->invalidate_all(); \
+		pcb_board_set_changed_flag(pcb_true); \
+	} \
+} while(0)
+
+void pcb_layergrp_inhibit_inc(void)
+{
+	inhibit_notify++;
+}
+
+void pcb_layergrp_inhibit_dec(void)
+{
+	inhibit_notify--;
+}
+
+pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layergrp_t *grp)
+{
+	if ((grp >= &pcb->LayerGroups.grp[0]) && (grp < &pcb->LayerGroups.grp[pcb->LayerGroups.len]))
+		return grp - &pcb->LayerGroups.grp[0];
+	return -1;
+}
+
+pcb_layergrp_id_t pcb_layer_get_group_(pcb_layer_t *Layer)
+{
+	if (!Layer->is_bound)
+		return Layer->meta.real.grp;
+
+	if (Layer->meta.bound.real == NULL) /* bound layer without a binding */
+		return -1;
+
+	return Layer->meta.bound.real->meta.real.grp;
+}
+
+pcb_layergrp_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid)
+{
+	if ((gid < 0) || (gid >= pcb->LayerGroups.len))
+		return NULL;
+	return pcb->LayerGroups.grp + gid;
+}
+
+
+pcb_layergrp_id_t pcb_layer_get_group(pcb_board_t *pcb, pcb_layer_id_t lid)
+{
+	if ((lid < 0) || (lid >= pcb->Data->LayerN))
+		return -1;
+
+	return pcb_layer_get_group_(&pcb->Data->Layer[lid]);
+}
+
+int pcb_layergrp_del_layer(pcb_board_t *pcb, pcb_layergrp_id_t gid, pcb_layer_id_t lid)
+{
+	int n;
+	pcb_layergrp_t *grp;
+	pcb_layer_t *layer;
+
+	if ((lid < 0) || (lid >= pcb->Data->LayerN))
+		return -1;
+
+	layer = pcb->Data->Layer + lid;
+	if (gid < 0)
+		gid = layer->meta.real.grp;
+	if (gid >= pcb->LayerGroups.len)
+		return -1;
+
+	grp = &pcb->LayerGroups.grp[gid];
+
+	if (layer->meta.real.grp != gid)
+		return -1;
+
+	for(n = 0; n < grp->len; n++) {
+		if (grp->lid[n] == lid) {
+			int remain = grp->len - n - 1;
+			if (remain > 0)
+				memmove(&grp->lid[n], &grp->lid[n+1], remain * sizeof(pcb_layer_id_t));
+			grp->len--;
+			layer->meta.real.grp = -1;
+			NOTIFY(pcb);
+			return 0;
+		}
+	}
+
+
+	/* also: broken layer group list */
+	return -1;
+}
+
+pcb_layergrp_id_t pcb_layer_move_to_group(pcb_board_t *pcb, pcb_layer_id_t lid, pcb_layergrp_id_t gid)
+{
+	if (pcb_layergrp_del_layer(pcb, -1, lid) != 0)
+		return -1;
+	pcb_layer_add_in_group(pcb, lid, gid);
+	NOTIFY(pcb);
+	return gid;
+}
+
+unsigned int pcb_layergrp_flags(pcb_board_t *pcb, pcb_layergrp_id_t gid)
+{
+
+	if ((gid < 0) || (gid >= pcb->LayerGroups.len))
+		return 0;
+
+	return pcb->LayerGroups.grp[gid].ltype;
+}
+
+const char *pcb_layergrp_name(pcb_board_t *pcb, pcb_layergrp_id_t gid)
+{
+
+	if ((gid < 0) || (gid >= pcb->LayerGroups.len))
+		return 0;
+
+	return pcb->LayerGroups.grp[gid].name;
+}
+
+pcb_bool pcb_layergrp_is_empty(pcb_board_t *pcb, pcb_layergrp_id_t num)
+{
+	int i;
+	pcb_layergrp_t *g = &pcb->LayerGroups.grp[num];
+
+	/* some layers are never empty */
+	if (g->ltype & PCB_LYT_MASK)
+		return pcb_false;
+
+	if (!pcb_pstk_is_group_empty(pcb, num))
+		return pcb_false;
+
+	for (i = 0; i < g->len; i++)
+		if (!pcb_layer_is_empty(pcb, g->lid[i]))
+			return pcb_false;
+	return pcb_true;
+}
+
+static void pcb_layergrp_free_fields(pcb_layergrp_t *g)
+{
+	free(g->name);
+}
+
+
+int pcb_layergrp_free(pcb_board_t *pcb, pcb_layergrp_id_t id)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+	if ((id >= 0) && (id < stack->len)) {
+		int n;
+		pcb_layergrp_t *g = stack->grp + id;
+		for(n = 0; n < g->len; n++) {
+			pcb_layer_t *layer = pcb->Data->Layer + g->lid[n];
+			layer->meta.real.grp = -1;
+		}
+		pcb_layergrp_free_fields(g);
+		memset(g, 0, sizeof(pcb_layergrp_t));
+		return 0;
+	}
+	return -1;
+}
+
+int pcb_layergrp_move_onto(pcb_board_t *pcb, pcb_layergrp_id_t dst, pcb_layergrp_id_t src)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+	pcb_layergrp_t *d, *s;
+	int n;
+
+	if ((src < 0) || (src >= stack->len))
+		return -1;
+	if ((dst < stack->len) && (pcb_layergrp_free(pcb, dst) != 0))
+		return -1;
+	d = stack->grp + dst;
+	s = stack->grp + src;
+	memcpy(d, s, sizeof(pcb_layergrp_t));
+
+	/* update layer's group refs to the new grp */
+	for(n = 0; n < d->len; n++) {
+		pcb_layer_t *layer = pcb->Data->Layer + d->lid[n];
+		layer->meta.real.grp = dst;
+	}
+
+	memset(s, 0, sizeof(pcb_layergrp_t));
+	NOTIFY(pcb);
+	return 0;
+}
+
+static int flush_item(const char *s, const char *start, pcb_layer_id_t *lids, int *lids_len, pcb_layer_type_t *loc)
+{
+	char *end;
+	pcb_layer_id_t lid;
+	switch (*start) {
+		case 'c': case 'C': case 't': case 'T': *loc = PCB_LYT_TOP; break;
+		case 's': case 'S': case 'b': case 'B': *loc = PCB_LYT_BOTTOM; break;
+		default:
+			lid = strtol(start, &end, 10)-1;
+			if (end != s)
+				return -1;
+			if ((*lids_len) >= PCB_MAX_LAYER)
+				return -1;
+			lids[*lids_len] = lid;
+			(*lids_len)++;
+	}
+	return 0;
+}
+
+pcb_layergrp_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ)
+{
+	int n;
+	for(n = 0; n < stack->len; n++)
+		if ((stack->grp[n].ltype & loc) && (stack->grp[n].ltype & typ))
+			return &(stack->grp[n]);
+	return NULL;
+}
+
+pcb_layergrp_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+	int n;
+	if ((where <= 0) || (where >= stack->len))
+		return NULL;
+
+	for(n = stack->len-1; n > where; n--)
+		pcb_layergrp_move_onto(pcb, n+1, n);
+
+	stack->len++;
+	NOTIFY(pcb);
+	return stack->grp+where+1;
+}
+
+static void pcb_get_grp_new_intern_insert(pcb_board_t *pcb, int room, int bl, int omit_substrate)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+
+	stack->len += room;
+
+	stack->grp[bl].name = pcb_strdup("Intern");
+	stack->grp[bl].ltype = PCB_LYT_INTERN | PCB_LYT_COPPER;
+	stack->grp[bl].valid = 1;
+	stack->grp[bl].parent_type = PCB_PARENT_BOARD;
+	stack->grp[bl].parent.board = pcb;
+	stack->grp[bl].type = PCB_OBJ_LAYERGRP;
+	bl++;
+	if (!omit_substrate) {
+		stack->grp[bl].ltype = PCB_LYT_INTERN | PCB_LYT_SUBSTRATE;
+		stack->grp[bl].valid = 1;
+		stack->grp[bl].parent_type = PCB_PARENT_BOARD;
+		stack->grp[bl].parent.board = pcb;
+		stack->grp[bl].type = PCB_OBJ_LAYERGRP;
+	}
+}
+
+static pcb_layergrp_t *pcb_get_grp_new_intern_(pcb_board_t *pcb, int omit_substrate, int force_end)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+	int bl, n;
+	int room = omit_substrate ? 1 : 2;
+
+	if ((stack->len + room) >= PCB_MAX_LAYERGRP)
+		return NULL;
+
+	/* seek the bottom copper layer */
+	if (!force_end)
+	for(bl = stack->len; bl >= 0; bl--) {
+		if ((stack->grp[bl].ltype & PCB_LYT_BOTTOM) && (stack->grp[bl].ltype & PCB_LYT_COPPER)) {
+
+			/* insert a new internal layer: move existing layers to make room */
+			for(n = stack->len-1; n >= bl; n--)
+				pcb_layergrp_move_onto(pcb, n+room, n);
+			
+			pcb_get_grp_new_intern_insert(pcb, room, bl, omit_substrate);
+			return &stack->grp[bl];
+		}
+	}
+
+	/* bottom copper did not exist - insert at the end */
+	bl = stack->len;
+	pcb_get_grp_new_intern_insert(pcb, room, bl, omit_substrate);
+	return &stack->grp[bl];
+}
+
+pcb_layergrp_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id)
+{
+	pcb_layer_stack_t *stack = &pcb->LayerGroups;
+	pcb_layergrp_t *g;
+
+	if (intern_id > 0) { /* look for existing intern layer first */
+		int n;
+		for(n = 0; n < stack->len; n++)
+			if (stack->grp[n].intern_id == intern_id)
+				return &stack->grp[n];
+	}
+
+	inhibit_notify++;
+	g = pcb_get_grp_new_intern_(pcb, 0, 0);
+	inhibit_notify--;
+	if (g != NULL) {
+		g->intern_id = intern_id;
+		NOTIFY(pcb);
+	}
+	return g;
+}
+
+pcb_layergrp_t *pcb_get_grp_new_misc(pcb_board_t *pcb)
+{
+	pcb_layergrp_t *g;
+	inhibit_notify++;
+	g = pcb_get_grp_new_intern_(pcb, 1, 0);
+	inhibit_notify--;
+	NOTIFY(pcb);
+	return g;
+}
+
+/* Move an inclusive block of groups [from..to] by delta on the stack, assuming
+   target is already cleared and the new hole will be cleared by the caller */
+static void move_grps(pcb_board_t *pcb, pcb_layer_stack_t *stk, pcb_layergrp_id_t from, pcb_layergrp_id_t to, int delta)
+{
+	int g, remaining, n;
+
+	for(g = from; g <= to; g++) {
+		for(n = 0; n < stk->grp[g].len; n++) {
+			pcb_layer_id_t lid =stk->grp[g].lid[n];
+			if ((lid >= 0) && (lid < pcb->Data->LayerN)) {
+				pcb_layer_t *l = &pcb->Data->Layer[lid];
+				if (l->meta.real.grp > 0)
+					l->meta.real.grp += delta;
+			}
+		}
+	}
+
+	remaining = to - from+1;
+	if (remaining > 0)
+		memmove(&stk->grp[from + delta], &stk->grp[from], sizeof(pcb_layergrp_t) * remaining);
+}
+
+int pcb_layergrp_index_in_grp(pcb_layergrp_t *grp, pcb_layer_id_t lid)
+{
+	int idx;
+	for(idx = 0; idx < grp->len; idx++)
+		if (grp->lid[idx] == lid)
+			return idx;
+	return -1;
+}
+
+int pcb_layergrp_step_layer(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layer_id_t lid, int delta)
+{
+	int idx, idx2;
+	pcb_layer_id_t tmp;
+
+	for(idx = 0; idx < grp->len; idx++) {
+		if (grp->lid[idx] == lid) {
+			if (delta > 0) {
+				if (idx == grp->len - 1) /* already the last */
+					return 0;
+				idx2 = idx+1;
+				goto swap;
+			}
+			else if (delta < 0) {
+				if (idx == 0) /* already the last */
+					return 0;
+				idx2 = idx-1;
+				goto swap;
+			}
+			else
+				return -1;
+		}
+	}
+	return -1;
+
+	swap:;
+	tmp = grp->lid[idx];
+	grp->lid[idx] =grp->lid[idx2];
+	grp->lid[idx2] = tmp;
+	NOTIFY(pcb);
+	return 0;
+}
+
+int pcb_layergrp_del(pcb_board_t *pcb, pcb_layergrp_id_t gid, int del_layers)
+{
+	int n;
+	pcb_layer_stack_t *stk = &pcb->LayerGroups;
+
+	if ((gid < 0) || (gid >= stk->len))
+		return -1;
+
+	for(n = 0; n < stk->grp[gid].len; n++) {
+		pcb_layer_t *l = pcb_get_layer(pcb->Data, stk->grp[gid].lid[n]);
+		if (l != NULL) {
+			if (del_layers) {
+				pcb_layer_move(pcb, stk->grp[gid].lid[n], -1, -1);
+				n = -1; /* restart counting because the layer remove code may have changed the order */
+			}
+			else {
+				/* detach only */
+				l->meta.real.grp = -1;
+			}
+		}
+	}
+
+	pcb_layergrp_free(pcb, gid);
+	move_grps(pcb, stk, gid+1, stk->len-1, -1);
+	stk->len--;
+	NOTIFY(pcb);
+	return 0;
+}
+
+int pcb_layergrp_move(pcb_board_t *pcb, pcb_layergrp_id_t from, pcb_layergrp_id_t to_before)
+{
+	pcb_layer_stack_t *stk = &pcb->LayerGroups;
+	pcb_layergrp_t tmp;
+	int n;
+
+	if ((from < 0) || (from >= stk->len))
+		return -1;
+
+	if ((to_before < 0) || (to_before >= stk->len))
+		return -1;
+
+	if ((to_before == from + 1) || (to_before == from))
+		return 0;
+
+	memcpy(&tmp, &stk->grp[from], sizeof(pcb_layergrp_t));
+	memset(&stk->grp[from], 0, sizeof(pcb_layergrp_t));
+	if (to_before < from + 1) {
+		move_grps(pcb, stk, to_before, from-1, +1);
+		memcpy(&stk->grp[to_before], &tmp, sizeof(pcb_layergrp_t));
+	}
+	else {
+		move_grps(pcb, stk, from+1, to_before-1, -1);
+		memcpy(&stk->grp[to_before-1], &tmp, sizeof(pcb_layergrp_t));
+	}
+
+	/* fix up the group id for the layers of the group moved */
+	for(n = 0; n < stk->grp[to_before].len; n++) {
+		pcb_layer_t *l = pcb_get_layer(pcb->Data, stk->grp[to_before].lid[n]);
+		if ((l != NULL) && (l->meta.real.grp > 0))
+			l->meta.real.grp = to_before;
+	}
+
+	NOTIFY(pcb);
+	return 0;
+}
+
+
+	/* ugly hack: remove the extra substrate we added after the outline layer */
+void pcb_layergrp_fix_old_outline(pcb_board_t *pcb)
+{
+	pcb_layer_stack_t *LayerGroup = &pcb->LayerGroups;
+	pcb_layergrp_t *g = pcb_get_grp(LayerGroup, PCB_LYT_ANYWHERE, PCB_LYT_OUTLINE);
+	if ((g != NULL) && (g[1].ltype & PCB_LYT_SUBSTRATE)) {
+		pcb_layergrp_id_t gid = g - LayerGroup->grp + 1;
+		pcb_layergrp_del(pcb, gid, 0);
+	}
+}
+
+void pcb_layergrp_fix_turn_to_outline(pcb_layergrp_t *g)
+{
+	g->ltype |= PCB_LYT_OUTLINE;
+	g->ltype &= ~PCB_LYT_COPPER;
+	free(g->name);
+	g->name = pcb_strdup("global_outline");
+}
+
+
+#define LAYER_IS_OUTLINE(idx) ((pcb->Data->Layer[idx].name != NULL) && ((strcmp(pcb->Data->Layer[idx].name, "route") == 0 || strcmp(pcb->Data->Layer[(idx)].name, "outline") == 0)))
+int pcb_layer_parse_group_string(pcb_board_t *pcb, const char *grp_str, int LayerN, int oldfmt)
+{
+	const char *s, *start;
+	pcb_layer_id_t lids[PCB_MAX_LAYER];
+	int lids_len = 0;
+	pcb_layer_type_t loc = PCB_LYT_INTERN;
+	pcb_layergrp_t *g;
+	int n;
+	pcb_layer_stack_t *LayerGroup = &pcb->LayerGroups;
+
+	inhibit_notify++;
+
+	/* clear struct */
+	pcb_layer_group_setup_default(pcb);
+
+	for(start = s = grp_str; ; s++) {
+		switch(*s) {
+			case ',':
+				if (flush_item(s, start, lids, &lids_len, &loc) != 0)
+					goto error;
+				start = s+1;
+				break;
+			case '\0':
+			case ':':
+				if (flush_item(s, start, lids, &lids_len, &loc) != 0)
+					goto error;
+				/* finalize group */
+				if (loc & PCB_LYT_INTERN)
+					g = pcb_get_grp_new_intern(pcb, -1);
+				else
+					g = pcb_get_grp(LayerGroup, loc, PCB_LYT_COPPER);
+
+				for(n = 0; n < lids_len; n++) {
+					if (lids[n] < 0)
+						continue;
+					if (LAYER_IS_OUTLINE(lids[n])) {
+						if (g->ltype & PCB_LYT_INTERN)
+							pcb_layergrp_fix_turn_to_outline(g);
+						else
+							pcb_message(PCB_MSG_ERROR, "outline layer can not be on the solder or component side - converting it into a copper layer\n");
+					}
+					pcb_layer_add_in_group_(pcb, g, g - LayerGroup->grp, lids[n]);
+				}
+
+				lids_len = 0;
+
+				/* prepare for next iteration */
+				loc = PCB_LYT_INTERN;
+				start = s+1;
+				break;
+		}
+		if (*s == '\0')
+			break;
+	}
+
+	pcb_layergrp_fix_old_outline(pcb);
+
+	/* set the two silks */
+	g = pcb_get_grp(LayerGroup, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+	pcb_layer_add_in_group_(pcb, g, g - LayerGroup->grp, LayerN-2);
+
+	g = pcb_get_grp(LayerGroup, PCB_LYT_TOP, PCB_LYT_SILK);
+	pcb_layer_add_in_group_(pcb, g, g - LayerGroup->grp, LayerN-1);
+
+	inhibit_notify--;
+	return 0;
+
+	/* reset structure on error */
+error:
+	inhibit_notify--;
+	memset(LayerGroup, 0, sizeof(pcb_layer_stack_t));
+	return 1;
+}
+
+int pcb_layer_gui_set_glayer(pcb_board_t *pcb, pcb_layergrp_id_t grp, int is_empty)
+{
+	/* if there's no GUI, that means no draw should be done */
+	if (pcb_gui == NULL)
+		return 0;
+
+	if (pcb_gui->set_layer_group != NULL)
+		return pcb_gui->set_layer_group(grp, pcb->LayerGroups.grp[grp].lid[0], pcb_layergrp_flags(pcb, grp), is_empty);
+
+	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
+	return 1;
+}
+
+#define APPEND(n) \
+	do { \
+		if (res != NULL) { \
+			if (used < res_len) { \
+				res[used] = n; \
+				used++; \
+			} \
+		} \
+		else \
+			used++; \
+	} while(0)
+
+int pcb_layergrp_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len)
+{
+	int group, used = 0;
+	for (group = 0; group < pcb->LayerGroups.len; group++) {
+		if ((pcb_layergrp_flags(pcb, group) & mask) == mask)
+				APPEND(group);
+	}
+	return used;
+}
+
+int pcb_layergrp_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len)
+{
+	int group, used = 0;
+	for (group = 0; group < pcb->LayerGroups.len; group++) {
+		if ((pcb_layergrp_flags(pcb, group) & mask))
+				APPEND(group);
+	}
+	return used;
+}
+
+int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id)
+{
+	if ((layer_id < 0) || (layer_id >= pcb->Data->LayerN))
+		return -1;
+
+	grp->lid[grp->len] = layer_id;
+	grp->len++;
+	pcb->Data->Layer[layer_id].meta.real.grp = group_id;
+
+	return 0;
+}
+
+int pcb_layer_add_in_group(pcb_board_t *pcb, pcb_layer_id_t layer_id, pcb_layergrp_id_t group_id)
+{
+	if ((group_id < 0) || (group_id >= pcb->LayerGroups.len))
+		return -1;
+
+	return pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[group_id], group_id, layer_id);
+}
+
+#define NEWG(g, flags, gname, pcb) \
+do { \
+	g = &(newg->grp[newg->len]); \
+	g->parent_type = PCB_PARENT_BOARD; \
+	g->parent.board = pcb; \
+	g->type = PCB_OBJ_LAYERGRP; \
+	g->valid = 1; \
+	if (gname != NULL) \
+		g->name = pcb_strdup(gname); \
+	else \
+		g->name = NULL; \
+	g->ltype = flags; \
+	newg->len++; \
+} while(0)
+
+void pcb_layer_group_setup_default(pcb_board_t *pcb)
+{
+	pcb_layer_stack_t *newg = &pcb->LayerGroups;
+	pcb_layergrp_t *g;
+
+	memset(newg, 0, sizeof(pcb_layer_stack_t));
+
+	NEWG(g, PCB_LYT_TOP | PCB_LYT_PASTE, "top_paste", pcb);
+	NEWG(g, PCB_LYT_TOP | PCB_LYT_SILK, "top_silk", pcb);
+	NEWG(g, PCB_LYT_TOP | PCB_LYT_MASK, "top_mask", pcb);
+	NEWG(g, PCB_LYT_TOP | PCB_LYT_COPPER, "top_copper", pcb);
+	NEWG(g, PCB_LYT_INTERN | PCB_LYT_SUBSTRATE, NULL, pcb);
+
+	NEWG(g, PCB_LYT_BOTTOM | PCB_LYT_COPPER, "bottom_copper", pcb);
+	NEWG(g, PCB_LYT_BOTTOM | PCB_LYT_MASK, "bottom_mask", pcb);
+	NEWG(g, PCB_LYT_BOTTOM | PCB_LYT_SILK, "bottom_silk", pcb);
+	NEWG(g, PCB_LYT_BOTTOM | PCB_LYT_PASTE, "bottom_paste", pcb);
+
+/*	NEWG(g, PCB_LYT_INTERN | PCB_LYT_OUTLINE, "outline");*/
+}
+
+void pcb_layer_group_setup_silks(pcb_board_t *pcb)
+{
+	pcb_layergrp_id_t gid;
+	for(gid = 0; gid < pcb->LayerGroups.len; gid++)
+		if ((pcb->LayerGroups.grp[gid].ltype & PCB_LYT_SILK) && (pcb->LayerGroups.grp[gid].len == 0))
+			pcb_layer_create(pcb, gid, "silk");
+}
+
+int pcb_layergrp_rename_(pcb_layergrp_t *grp, char *name)
+{
+	free(grp->name);
+	grp->name = name;
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	return 0;
+}
+
+int pcb_layergrp_rename(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *name)
+{
+	pcb_layergrp_t *grp = pcb_get_layergrp(pcb, gid);
+	if (grp == NULL) return -1;
+	return pcb_layergrp_rename_(grp, pcb_strdup(name));
+}
+
+pcb_layergrp_id_t pcb_layergrp_by_name(pcb_board_t *pcb, const char *name)
+{
+	pcb_layergrp_id_t n;
+	for (n = 0; n < pcb->LayerGroups.len; n++)
+		if ((pcb->LayerGroups.grp[n].name != NULL) && (strcmp(pcb->LayerGroups.grp[n].name, name) == 0))
+			return n;
+	return -1;
+}
+
+int pcb_layergrp_dist(pcb_board_t *pcb, pcb_layergrp_id_t gid1, pcb_layergrp_id_t gid2, pcb_layer_type_t mask, int *diff)
+{
+	int gid, d, cnt;
+
+	if ((gid1 < 0) || (gid2 < 0))
+		return -1;
+	if (gid1 == gid2) {
+		*diff = 0;
+		return 0;
+	}
+
+	d = (gid1 < gid2) ? +1 : -1;
+	cnt = 0;
+	for(gid = gid1; gid != gid2; gid += d) {
+		if ((gid < 0) || (gid >= pcb->LayerGroups.len))
+			return -1;
+		if ((pcb->LayerGroups.grp[gid].ltype & mask) == mask)
+			cnt++;
+	}
+	*diff = cnt;
+	return 0;
+}
+
+pcb_layergrp_id_t pcb_layergrp_step(pcb_board_t *pcb, pcb_layergrp_id_t gid, int steps, pcb_layer_type_t mask)
+{
+	int d;
+
+	if (gid < 0)
+		return -1;
+
+	if (steps == 0)
+		return gid;
+
+	if (steps < 0) {
+		d = -1;
+		steps = -steps;
+	}
+	else
+		d = 1;
+
+	for(gid += d;; gid += d) {
+		if ((gid < 0) || (gid >= pcb->LayerGroups.len))
+			return -1;
+		if ((pcb->LayerGroups.grp[gid].ltype & mask) == mask) {
+			steps--;
+			if (steps == 0)
+				return gid;
+		}
+	}
+	return -1;
+}
+
+void pcb_layergrp_create_missing_substrate(pcb_board_t *pcb)
+{
+	pcb_layergrp_id_t g;
+	for(g = 0; g < pcb->LayerGroups.len-2; g++) {
+		pcb_layergrp_t *g0 = &pcb->LayerGroups.grp[g], *g1 = &pcb->LayerGroups.grp[g+1];
+		if ((g < pcb->LayerGroups.len-3) && (g1->ltype & PCB_LYT_OUTLINE)) g1++;
+		if ((g0->ltype & PCB_LYT_COPPER) && (g1->ltype & PCB_LYT_COPPER)) {
+			pcb_layergrp_t *ng = pcb_layergrp_insert_after(pcb, g);
+			ng->ltype = PCB_LYT_INTERN | PCB_LYT_SUBSTRATE;
+			ng->name = pcb_strdup("implicit_subst");
+			ng->valid = 1;
+			ng->parent_type = PCB_PARENT_BOARD;
+			ng->parent.board = pcb;
+			ng->type = PCB_OBJ_LAYERGRP;
+		}
+	}
+}
+
+int pcb_layer_create_all_for_recipe(pcb_board_t *pcb, pcb_layer_t *layer, int num_layer)
+{
+	int n, existing_intern = 0, want_intern = 0;
+	static char *anon = "anon";
+
+	for(n = 0; n < pcb->LayerGroups.len; n++)
+		if ((pcb->LayerGroups.grp[n].ltype & PCB_LYT_COPPER) && (pcb->LayerGroups.grp[n].ltype & PCB_LYT_INTERN))
+			existing_intern++;
+
+	for(n = 0; n < num_layer; n++) {
+		pcb_layer_t *ly = layer + n;
+		pcb_layer_t *dst = pcb_layer_resolve_binding(pcb, ly);
+		pcb_layergrp_t *grp;
+
+		if ((ly->meta.bound.type & PCB_LYT_COPPER) && (ly->meta.bound.type & PCB_LYT_INTERN)) {
+			want_intern++;
+			continue;
+		}
+
+		if (dst != NULL)
+			continue;
+
+		if (ly->meta.bound.type & PCB_LYT_VIRTUAL) {
+			/* no chance to have this yet */
+			continue;
+		}
+
+		if (ly->meta.bound.type & PCB_LYT_OUTLINE) {
+			pcb_layergrp_t *grp = pcb_get_grp_new_misc(pcb);
+			grp->ltype = PCB_LYT_OUTLINE | PCB_LYT_INTERN;
+			grp->name = pcb_strdup("outline");
+			pcb_layer_create(pcb, pcb_layergrp_id(pcb, grp), ly->name);
+			continue;
+		}
+
+
+		if (ly->meta.bound.type & PCB_LYT_COPPER) { /* top or bottom copper */
+			grp = pcb_get_grp(&pcb->LayerGroups, ly->meta.bound.type & PCB_LYT_ANYWHERE, PCB_LYT_COPPER);
+			if (grp != NULL) {
+				pcb_layer_create(pcb, pcb_layergrp_id(pcb, grp), ly->name);
+				continue;
+			}
+		}
+
+		grp = pcb_get_grp(&pcb->LayerGroups, ly->meta.bound.type & PCB_LYT_ANYWHERE, ly->meta.bound.type & PCB_LYT_ANYTHING);
+		if (grp != NULL) {
+			pcb_layer_id_t lid = pcb_layer_create(pcb, pcb_layergrp_id(pcb, grp), ly->name);
+			pcb_layer_t *nly = pcb_get_layer(pcb->Data, lid);
+			nly->comb = ly->comb;
+			continue;
+		}
+
+		pcb_message(PCB_MSG_ERROR, "Failed to create layer from recipe %s\n", ly->name);
+	}
+
+	if (want_intern > existing_intern) {
+		int int_ofs = 0;
+/*pcb_trace("want: %d have: %d\n", want_intern, existing_intern);*/
+		/* create enough dummy internal layers, mark them by name anon */
+		while(want_intern > existing_intern) {
+			pcb_layergrp_t *grp = pcb_get_grp_new_intern(pcb, -1);
+			grp->name = anon;
+			existing_intern++;
+		}
+		/* rename new interns from the recipe layer names */
+		for(n = 0; n < pcb->LayerGroups.len; n++) {
+			if (pcb->LayerGroups.grp[n].name == anon) {
+				int m;
+				int_ofs++;
+				for(m = 0; m < num_layer; m++) {
+					pcb_layer_t *ly = layer + m;
+					if ((ly->meta.bound.type & PCB_LYT_COPPER) && (ly->meta.bound.type & PCB_LYT_INTERN)) {
+						int offs = ly->meta.bound.stack_offs;
+/*pcb_trace("offs: %d (%d) == %d\n", offs, existing_intern + offs + 1, int_ofs);*/
+						if (offs < 0)
+							offs = existing_intern + offs + 1;
+						if ((offs == int_ofs) && (ly->name != NULL)) {
+							pcb->LayerGroups.grp[n].name = pcb_strdup("internal");
+							pcb_layer_create(pcb, n, ly->name);
+							goto found;
+						}
+					}
+				}
+				pcb->LayerGroups.grp[n].name = pcb_strdup("anon-recipe");
+				found:;
+			}
+		}
+	}
+	return 0;
+}
+
+void pcb_layergroup_free_stack(pcb_layer_stack_t *st)
+{
+	int n;
+
+	for(n = 0; n < st->len; n++)
+		pcb_layergrp_free_fields(st->grp + n);
+
+	free(st->cache.copper);
+	st->cache.copper = NULL;
+	st->cache.copper_len = st->cache.copper_alloced = 0;
+}
+
+void pcb_layergrp_upgrade_to_pstk(pcb_board_t *pcb)
+{
+	typedef struct lmap_s {
+		const char *name;
+		pcb_layer_type_t lyt;
+		pcb_layer_combining_t comb;
+		int force_end;
+	} lmap_t;
+	const lmap_t *m, lmap[] = {
+		{"top paste",           PCB_LYT_TOP | PCB_LYT_PASTE,     PCB_LYC_AUTO, 0},
+		{"top mask",            PCB_LYT_TOP | PCB_LYT_MASK,      PCB_LYC_SUB | PCB_LYC_AUTO, 0},
+		{"top silk",            PCB_LYT_TOP | PCB_LYT_SILK,      PCB_LYC_AUTO, 0},
+		{"top copper",          PCB_LYT_TOP | PCB_LYT_COPPER,    0, 0},
+		{"any internal copper", PCB_LYT_INTERN | PCB_LYT_COPPER, 0, 0},
+		{"bottom copper",       PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0, 0},
+		{"bottom silk",         PCB_LYT_BOTTOM | PCB_LYT_SILK,   PCB_LYC_AUTO, 1},
+		{"bottom mask",         PCB_LYT_BOTTOM | PCB_LYT_MASK,   PCB_LYC_SUB | PCB_LYC_AUTO, 1},
+		{"bottom paste",        PCB_LYT_BOTTOM | PCB_LYT_PASTE,  PCB_LYC_AUTO, 1},
+		{NULL, 0}
+	};
+	pcb_layergrp_t *grp;
+	pcb_layergrp_id_t gid;
+
+	inhibit_notify++;
+	for(m = lmap; m->name != NULL; m++) {
+		if (pcb_layergrp_list(pcb, m->lyt, &gid, 1) == 1) {
+			grp = &pcb->LayerGroups.grp[gid];
+			free(grp->name);
+		}
+		else {
+			grp = pcb_get_grp_new_intern_(pcb, 1, m->force_end);
+			gid = grp - pcb->LayerGroups.grp;
+			grp->ltype = m->lyt;
+		}
+
+		grp->name = pcb_strdup(m->name);
+		if (grp->len == 0) {
+			pcb_layer_id_t lid = pcb_layer_create(pcb, gid, m->name);
+			if (lid >= 0) {
+				pcb->Data->Layer[lid].comb = m->comb;
+			}
+		}
+	}
+	inhibit_notify--;
+	NOTIFY(pcb);
+}
+
+
+static pcb_layergrp_id_t pcb_layergrp_get_cached(pcb_board_t *pcb, pcb_layer_id_t *cache, unsigned int loc, unsigned int typ)
+{
+	pcb_layergrp_t *g;
+
+	/* check if the last known value is still accurate */
+	if ((*cache >= 0) && (*cache < pcb->LayerGroups.len)) {
+		g = &(pcb->LayerGroups.grp[*cache]);
+		if ((g->ltype & loc) && (g->ltype & typ))
+			return *cache;
+	}
+
+	/* nope: need to resolve it again */
+	g = pcb_get_grp(&pcb->LayerGroups, loc, typ);
+	if (g == NULL)
+		*cache = -1;
+	else
+		*cache = (g - pcb->LayerGroups.grp);
+	return *cache;
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_bottom_mask()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_BOTTOM, PCB_LYT_MASK);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_top_mask()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_TOP, PCB_LYT_MASK);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_bottom_paste()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_BOTTOM, PCB_LYT_PASTE);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_top_paste()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_TOP, PCB_LYT_PASTE);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_bottom_silk()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_top_silk()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_TOP, PCB_LYT_SILK);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_bottom_copper()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_BOTTOM, PCB_LYT_COPPER);
+}
+
+pcb_layergrp_id_t pcb_layergrp_get_top_copper()
+{
+	static pcb_layer_id_t cache = -1;
+	return pcb_layergrp_get_cached(PCB, &cache, PCB_LYT_TOP, PCB_LYT_COPPER);
+}
+
+/* Note: these function is in this file mainly to access the static inlines */
+int pcb_silk_on(pcb_board_t *pcb)
+{
+	static pcb_layer_id_t ts = -1, bs = -1;
+	pcb_layergrp_get_cached(pcb, &ts, PCB_LYT_TOP, PCB_LYT_SILK);
+	if ((ts >= 0) && (pcb->LayerGroups.grp[ts].vis))
+		return 1;
+	pcb_layergrp_get_cached(pcb, &bs, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+	if ((bs >= 0) && (pcb->LayerGroups.grp[bs].vis))
+		return 1;
+	return 0;
+}
+
+int pcb_mask_on(pcb_board_t *pcb)
+{
+	static pcb_layer_id_t tm = -1, bm = -1;
+	pcb_layergrp_get_cached(pcb, &tm, PCB_LYT_TOP, PCB_LYT_MASK);
+	if ((tm >= 0) && (pcb->LayerGroups.grp[tm].vis))
+		return 1;
+	pcb_layergrp_get_cached(pcb, &bm, PCB_LYT_BOTTOM, PCB_LYT_MASK);
+	if ((bm >= 0) && (pcb->LayerGroups.grp[bm].vis))
+		return 1;
+	return 0;
+}
+
+
+int pcb_paste_on(pcb_board_t *pcb)
+{
+	static pcb_layer_id_t tp = -1, bp = -1;
+	pcb_layergrp_get_cached(pcb, &tp, PCB_LYT_TOP, PCB_LYT_PASTE);
+	if ((tp >= 0) && (pcb->LayerGroups.grp[tp].vis))
+		return 1;
+	pcb_layergrp_get_cached(pcb, &bp, PCB_LYT_BOTTOM, PCB_LYT_PASTE);
+	if ((bp >= 0) && (pcb->LayerGroups.grp[bp].vis))
+		return 1;
+	return 0;
+}
+
+
+void pcb_layergrp_copper_cache_update(pcb_layer_stack_t *st)
+{
+	pcb_layergrp_id_t n;
+	if (st->len > st->cache.copper_alloced) {
+		st->cache.copper_alloced = st->len + 64;
+		st->cache.copper = realloc(st->cache.copper, sizeof(st->cache.copper[0]) * st->cache.copper_alloced);
+	}
+
+	st->cache.copper_len = 0;
+	for(n = 0; n < st->len; n++)
+		if (st->grp[n].ltype & PCB_LYT_COPPER)
+			st->cache.copper[st->cache.copper_len++] = n;
+
+	st->cache.copper_valid = 1;
+}
+
Index: tags/2.0.1/src/layer_grp.h
===================================================================
--- tags/2.0.1/src/layer_grp.h	(nonexistent)
+++ tags/2.0.1/src/layer_grp.h	(revision 18980)
@@ -0,0 +1,227 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_LAYER_GRP_H
+#define PCB_LAYER_GRP_H
+
+typedef struct pcb_layergrp_s pcb_layergrp_t;
+
+#include "layer.h"
+
+/* ----------------------------------------------------------------------
+ * layer group. A layer group identifies layers which are always switched
+ * on/off together.
+ */
+
+struct pcb_layergrp_s {
+	PCB_ANY_OBJ_FIELDS;
+	pcb_cardinal_t len;                    /* number of layer IDs in use */
+	pcb_layer_id_t lid[PCB_MAX_LAYER];     /* lid=layer ID */
+	char *name;                            /* name of the physical layer (independent of the name of the layer groups) */
+	pcb_layer_type_t ltype;
+
+	unsigned valid:1;                      /* 1 if it's a new-style, valid layer group; 0 after loading old files with no layer stackup info */
+	unsigned vis:1;                        /* 1 if layer group is visible on the GUI */
+	unsigned open:1;                       /* 1 if the group is open (expanded) on the GUI */
+	unsigned propedit:1;                   /* temporary: let propedit know this layer is being edited */
+
+	/* internal: temporary states */
+	int intern_id;                         /* for the old layer import mechanism */
+};
+
+
+/* layer stack: an ordered list of layer groups (physical layers). */
+struct pcb_layer_stack_s {
+	pcb_cardinal_t len;
+	pcb_layergrp_t grp[PCB_MAX_LAYERGRP];
+	struct { /* cache copper groups from top to bottom for fast padstack ("bbvia") lookup */
+		int copper_len, copper_alloced;
+		pcb_layergrp_id_t *copper;
+		unsigned copper_valid:1; /* whether the cache is valid */
+	} cache;
+};
+
+/* Free all fields of a layer stack */
+void pcb_layergroup_free_stack(pcb_layer_stack_t *st);
+
+/* Return the layer group for an id, or NULL on error (range check) */
+pcb_layergrp_t *pcb_get_layergrp(pcb_board_t *pcb, pcb_layergrp_id_t gid);
+
+/* Return the gid if grp is in the stackup of pcb (else return -1) */
+pcb_layergrp_id_t pcb_layergrp_id(pcb_board_t *pcb, pcb_layergrp_t *grp);
+
+/* Free a layer group (don't free the layers but detach them) */
+int pcb_layergrp_free(pcb_board_t *pcb, pcb_layergrp_id_t id);
+
+/* lookup the group to which a layer belongs to returns -1 if no group is found */
+pcb_layergrp_id_t pcb_layer_get_group(pcb_board_t *pcb, pcb_layer_id_t Layer);
+pcb_layergrp_id_t pcb_layer_get_group_(pcb_layer_t *Layer);
+
+/* Returns group actually moved to (i.e. either group or previous) */
+pcb_layergrp_id_t pcb_layer_move_to_group(pcb_board_t *pcb, pcb_layer_id_t layer, pcb_layergrp_id_t group);
+
+/* Returns pcb_true if all layers in a group are empty */
+pcb_bool pcb_layergrp_is_empty(pcb_board_t *pcb, pcb_layergrp_id_t lgrp);
+
+/* call the gui to set a layer group */
+int pcb_layer_gui_set_glayer(pcb_board_t *pcb, pcb_layergrp_id_t grp, int is_empty);
+
+/* returns a bitfield of pcb_layer_type_t; returns 0 if layer_idx is invalid. */
+unsigned int pcb_layergrp_flags(pcb_board_t *pcb, pcb_layergrp_id_t group_idx);
+const char *pcb_layergrp_name(pcb_board_t *pcb, pcb_layergrp_id_t gid);
+
+/* Same as pcb_layer_list but lists layer groups. A group is matching
+   if any layer in that group matches mask. */
+int pcb_layergrp_list(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len);
+int pcb_layergrp_list_any(pcb_board_t *pcb, pcb_layer_type_t mask, pcb_layergrp_id_t *res, int res_len);
+
+/* Put a layer in a group (the layer should not be in any other group);
+   returns 0 on success */
+int pcb_layer_add_in_group(pcb_board_t *pcb, pcb_layer_id_t layer_id, pcb_layergrp_id_t group_id);
+int pcb_layer_add_in_group_(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layergrp_id_t group_id, pcb_layer_id_t layer_id);
+
+/* Remove a layer group; if del_layers is zero, layers are kept but detached
+   (.grp = -1), else layers are deleted too */
+int pcb_layergrp_del(pcb_board_t *pcb, pcb_layergrp_id_t gid, int del_layers);
+
+/* Move gfrom to to_before and shift the stack as necessary. Return -1 on range error */
+int pcb_layergrp_move(pcb_board_t *pcb, pcb_layergrp_id_t gfrom, pcb_layergrp_id_t to_before);
+
+/* Move src onto dst, not shifting the stack, free()'ing and overwriting dst, leaving a gap (0'd slot) at src */
+int pcb_layergrp_move_onto(pcb_board_t *pcb, pcb_layergrp_id_t dst, pcb_layergrp_id_t src);
+
+
+/* Insert a new layer group in the layer stack after the specified group */
+pcb_layergrp_t *pcb_layergrp_insert_after(pcb_board_t *pcb, pcb_layergrp_id_t where);
+
+/* Move lid 1 step towards the front (delta=-1) or end (delta=+1) of the
+   layer list of the group. Return 0 on success (even when already reached
+   the end of the list) or -1 on error */
+int pcb_layergrp_step_layer(pcb_board_t *pcb, pcb_layergrp_t *grp, pcb_layer_id_t lid, int delta);
+
+/* Return the array index of lid within the grp's lid list or -1 if not on the list */
+int pcb_layergrp_index_in_grp(pcb_layergrp_t *grp, pcb_layer_id_t lid);
+
+/* Calculate the distance between gid1 and gid2 in the stack, in number of
+   layer groups matching mask. The result is placed in *diff. Returns 0 on success.
+   Typical use case: gid1 is an internal copper layer, gid2 is the top copper layer,
+   mask is PCB_LYT_COPPER -> *diff is the copper index of the internal layer from top */
+int pcb_layergrp_dist(pcb_board_t *pcb, pcb_layergrp_id_t gid1, pcb_layergrp_id_t gid2, pcb_layer_type_t mask, int *diff);
+
+/* walk the given amount steps on the stack among layer groups matching mask.
+   A negative step goes upward.
+   Typical use: "return the 2nd copper layer below this one" */
+pcb_layergrp_id_t pcb_layergrp_step(pcb_board_t *pcb, pcb_layergrp_id_t gid, int steps, pcb_layer_type_t mask);
+
+
+/* Enable/disable inhibition of layer changed events during layer group updates */
+void pcb_layergrp_inhibit_inc(void);
+void pcb_layergrp_inhibit_dec(void);
+
+/* Rename an existing layer by idx */
+int pcb_layergrp_rename(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *lname);
+
+/* changes the name of a layer; memory has to be already allocated */
+int pcb_layergrp_rename_(pcb_layergrp_t *grp, char *name);
+
+/* Slow linear search for a layer group by name */
+pcb_layergrp_id_t pcb_layergrp_by_name(pcb_board_t *pcb, const char *name);
+
+/* Create a layer for each unbindable layers from the layer array */
+int pcb_layer_create_all_for_recipe(pcb_board_t *pcb, pcb_layer_t *layer, int num_layer);
+
+/* Upgrade the current layer stack to incldue all layers for
+   fully representaing standard padstacks. This includes reusing or
+   creating layer groups and layers, altering layer group names (but
+   not removing layers or groups) */
+void pcb_layergrp_upgrade_to_pstk(pcb_board_t *pcb);
+
+/* Compatibility helper: insert a substrate group in between any two adjacent
+   copper groups. */
+void pcb_layergrp_create_missing_substrate(pcb_board_t *pcb);
+
+
+/********* OBSOLETE functions, do not use in new code *********/
+/* parses the group definition string which is a colon separated list of
+   comma separated layer numbers (1,2,b:4,6,8,t); oldfmt is 0 or 1
+   depending on PCB() or PCB[] in the file header.
+
+   OBSOLETE, do not use in new code: only the conf system and io_pcb
+   may need this. */
+int pcb_layer_parse_group_string(pcb_board_t *pcb, const char *s, int LayerN, int oldfmt);
+
+#define PCB_COPPER_GROUP_LOOP(data, group) do { 	\
+	pcb_cardinal_t entry; \
+	pcb_board_t *cgl__pcb = pcb_data_get_top(data); \
+	if (cgl__pcb == NULL) \
+		cgl__pcb = PCB; \
+        for (entry = 0; entry < ((pcb_board_t *)(cgl__pcb))->LayerGroups.grp[(group)].len; entry++) \
+        { \
+		pcb_layer_t *layer;		\
+		pcb_layer_id_t number; 		\
+		number = ((pcb_board_t *)(cgl__pcb))->LayerGroups.grp[(group)].lid[entry]; \
+		if (!(pcb_layer_flags(PCB, number) & PCB_LYT_COPPER)) \
+		  continue;			\
+		layer = &data->Layer[number];
+
+/* for parsing old files with old layer descriptions, with no layer groups */
+void pcb_layer_group_setup_default(pcb_board_t *pcb); /* default layer groups, no layers */
+void pcb_layer_group_setup_silks(pcb_board_t *pcb); /* make sure we have two silk layers, add them if needed */
+pcb_layergrp_t *pcb_get_grp(pcb_layer_stack_t *stack, pcb_layer_type_t loc, pcb_layer_type_t typ);
+pcb_layergrp_t *pcb_get_grp_new_intern(pcb_board_t *pcb, int intern_id);
+pcb_layergrp_t *pcb_get_grp_new_misc(pcb_board_t *pcb);
+
+/* ugly hack: remove the extra substrate we added after the outline layer */
+void pcb_layergrp_fix_old_outline(pcb_board_t *pcb);
+
+/* ugly hack: turn an old intern layer group into an outline group after realizing it is really an outline (reading the old layers) */
+void pcb_layergrp_fix_turn_to_outline(pcb_layergrp_t *g);
+
+
+
+/* Cached layer group lookups foir a few common cases */
+pcb_layergrp_id_t pcb_layergrp_get_bottom_mask();
+pcb_layergrp_id_t pcb_layergrp_get_top_mask();
+pcb_layergrp_id_t pcb_layergrp_get_bottom_paste();
+pcb_layergrp_id_t pcb_layergrp_get_top_paste();
+pcb_layergrp_id_t pcb_layergrp_get_bottom_silk();
+pcb_layergrp_id_t pcb_layergrp_get_top_silk();
+pcb_layergrp_id_t pcb_layergrp_get_bottom_copper();
+pcb_layergrp_id_t pcb_layergrp_get_top_copper();
+
+
+/* return whether any silk or mask or paste layer group is visible */
+int pcb_silk_on(pcb_board_t *pcb);
+int pcb_mask_on(pcb_board_t *pcb);
+int pcb_paste_on(pcb_board_t *pcb);
+
+/* recalculate the copper cache */
+void pcb_layergrp_copper_cache_update(pcb_layer_stack_t *st);
+
+#endif
Index: tags/2.0.1/src/layer_it.h
===================================================================
--- tags/2.0.1/src/layer_it.h	(nonexistent)
+++ tags/2.0.1/src/layer_it.h	(revision 18980)
@@ -0,0 +1,121 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Layer and layer group iterators (static inline functions) */
+
+#ifndef PCB_LAYER_IT_H
+#define PCB_LAYER_IT_H
+
+#include "layer_grp.h"
+
+typedef struct pcb_layer_it_s pcb_layer_it_t;
+
+/* Start an iteration matching exact flags or any of the flags; returns -1 if over */
+PCB_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask);
+PCB_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask);
+
+/* next iteration; returns -1 if over */
+PCB_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it);
+
+
+/*************** inline implementation *************************/
+struct pcb_layer_it_s {
+	pcb_layer_stack_t *stack;
+	pcb_layergrp_id_t gid;
+	pcb_cardinal_t lidx;
+	unsigned int mask;
+	unsigned int exact:1;
+	unsigned int global:1;
+};
+
+PCB_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it)
+{
+	if (it->global) {
+		/* over all layers, random order, without any checks - go the cheap way, bypassing groups */
+		if (it->lidx < pcb_max_layer)
+			return it->lidx++;
+		return -1;
+	}
+	else for(;;) {
+		pcb_layergrp_t *g = &(it->stack->grp[it->gid]);
+		pcb_layer_id_t lid;
+		unsigned int hit;
+		if (it->lidx >= g->len) { /* layer list over in this group */
+			it->gid++;
+			if (it->gid >= PCB_MAX_LAYERGRP) /* last group */
+				return -1;
+			it->lidx = 0;
+			continue; /* skip to next group */
+		}
+		/* TODO: check group flags against mask here for more efficiency */
+		lid = g->lid[it->lidx];
+		it->lidx++;
+		hit = pcb_layer_flags(PCB, lid) & it->mask;
+		if (it->exact) {
+			if (hit == it->mask)
+				return lid;
+		}
+		else {
+			if (hit)
+				return lid;
+		}
+		/* skip to next group */
+	}
+}
+
+PCB_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask)
+{
+	it->stack = stack;
+	it->mask = exact_mask;
+	it->gid = 0;
+	it->lidx = 0;
+	it->exact = 1;
+	it->global = 0;
+	return pcb_layer_next(it);
+}
+
+PCB_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask)
+{
+	it->stack = stack;
+	it->mask = any_mask;
+	it->gid = 0;
+	it->lidx = 0;
+	it->exact = 0;
+	it->global = 0;
+	return pcb_layer_next(it);
+}
+
+PCB_INLINE pcb_layer_id_t pcb_layer_first_all(pcb_layer_stack_t *stack, pcb_layer_it_t *it)
+{
+	it->stack = stack;
+	it->lidx = 0;
+	it->global = 1;
+	return pcb_layer_next(it);
+}
+
+
+#endif
Index: tags/2.0.1/src/layer_ui.c
===================================================================
--- tags/2.0.1/src/layer_ui.c	(nonexistent)
+++ tags/2.0.1/src/layer_ui.c	(revision 18980)
@@ -0,0 +1,125 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, layer_ui.c, was written and is Copyright (C) 2016 by
+ *  Tibor 'Igor2' Palinkas.
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Virtual layers for UI and debug */
+#include "config.h"
+#include "layer.h"
+#include "event.h"
+#include "compat_misc.h"
+#include "genvector/vtp0.h"
+#include "layer_ui.h"
+
+vtp0_t pcb_uilayers;
+
+
+pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const char *color)
+{
+	int n;
+	pcb_layer_t *l;
+	void **p;
+
+	if (cookie == NULL)
+		return NULL;
+
+	for(n = 0; n < vtp0_len(&pcb_uilayers); n++) {
+		l = pcb_uilayers.array[n];
+		if (l == NULL) {
+			l = calloc(sizeof(pcb_layer_t), 1);
+			pcb_uilayers.array[n] = l;
+			goto found;
+		}
+	}
+
+	l = calloc(sizeof(pcb_layer_t), 1);
+	p = vtp0_alloc_append(&pcb_uilayers, 1);
+	*p = l;
+found:;
+	l->meta.real.cookie = cookie;
+	l->meta.real.color = pcb_strdup(color);
+	l->name = pcb_strdup(name);
+	l->meta.real.vis = 1;
+	l->parent_type = PCB_PARENT_UI;
+	l->parent.any = NULL;
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	return l;
+}
+
+static void pcb_uilayer_free_(pcb_layer_t *l, long idx)
+{
+	pcb_layer_free(l);
+	free(l);
+	pcb_uilayers.array[idx] = NULL;
+}
+
+void pcb_uilayer_free(pcb_layer_t *ly)
+{
+	int n;
+	for(n = 0; n < vtp0_len(&pcb_uilayers); n++) {
+		pcb_layer_t *l = pcb_uilayers.array[n];
+		if (l == ly) {
+			pcb_uilayer_free_(l, n);
+			break;
+		}
+	}
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+}
+
+void pcb_uilayer_free_all_cookie(const char *cookie)
+{
+	int n;
+	for(n = 0; n < vtp0_len(&pcb_uilayers); n++) {
+		pcb_layer_t *l = pcb_uilayers.array[n];
+		if ((l != NULL) && (l->meta.real.cookie == cookie))
+			pcb_uilayer_free_(l, n);
+	}
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+}
+
+void pcb_uilayer_uninit(void)
+{
+	vtp0_uninit(&pcb_uilayers);
+}
+
+pcb_layer_t *pcb_uilayer_get(long ui_ly_id)
+{
+	void **p = vtp0_get(&pcb_uilayers, (ui_ly_id & (PCB_LYT_UI-1)), 0);
+	if (p == NULL)
+		return NULL;
+	return (pcb_layer_t *)(*p);
+}
+
+long pcb_uilayer_get_id(pcb_layer_t *ly)
+{
+	int n;
+	for(n = 0; n < vtp0_len(&pcb_uilayers); n++)
+		if (pcb_uilayers.array[n] == ly)
+			return (long)n | PCB_LYT_UI;
+	return -1;
+}
Index: tags/2.0.1/src/layer_ui.h
===================================================================
--- tags/2.0.1/src/layer_ui.h	(nonexistent)
+++ tags/2.0.1/src/layer_ui.h	(revision 18980)
@@ -0,0 +1,50 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, layer_ui.c, was written and is Copyright (C) 2016 by
+ *  Tibor 'Igor2' Palinkas.
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_LAYER_UI_H
+#define PCB_LAYER_UI_H
+
+/* Virtual layers for UI and debug */
+#include "global_typedefs.h"
+
+#include "genvector/vtp0.h"
+
+/* list of all UI layers - each item is a persistent pointer to a layer struct */
+extern vtp0_t pcb_uilayers;
+
+pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const char *color);
+void pcb_uilayer_free(pcb_layer_t *l);
+void pcb_uilayer_free_all_cookie(const char *cookie);
+void pcb_uilayer_uninit(void);
+
+pcb_layer_t *pcb_uilayer_get(long ui_ly_id);
+long pcb_uilayer_get_id(pcb_layer_t *ly);
+
+#endif
Index: tags/2.0.1/src/layer_vis.c
===================================================================
--- tags/2.0.1/src/layer_vis.c	(nonexistent)
+++ tags/2.0.1/src/layer_vis.c	(revision 18980)
@@ -0,0 +1,340 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Layer visibility logics (affects the GUI and some exporters) */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "layer.h"
+#include "layer_ui.h"
+#include "layer_vis.h"
+#include "event.h"
+#include "compat_misc.h"
+#include "conf_hid.h"
+
+/*
+ * Used by pcb_layervis_save_stack() and
+ * pcb_layervis_restore_stack()
+ */
+static struct {
+	pcb_bool ElementOn, InvisibleObjectsOn, pstk_on, RatOn;
+	int pcb_layer_stack[PCB_MAX_LAYER];
+	pcb_bool LayerOn[PCB_MAX_LAYER];
+	int cnt;
+} SavedStack;
+
+
+/* ---------------------------------------------------------------------------
+ * move layer (number is passed in) to top of layerstack
+ */
+static void PushOnTopOfLayerStack(int NewTop)
+{
+	int i;
+
+	/* ignore silk layers */
+	if (NewTop < pcb_max_layer) {
+		/* first find position of passed one */
+		for (i = 0; i < pcb_max_layer; i++)
+			if (pcb_layer_stack[i] == NewTop)
+				break;
+
+		/* bring this element to the top of the stack */
+		for (; i; i--)
+			pcb_layer_stack[i] = pcb_layer_stack[i - 1];
+		pcb_layer_stack[0] = NewTop;
+	}
+}
+
+
+/* ----------------------------------------------------------------------
+ * changes the visibility of all layers in a group
+ * returns the number of changed layers
+ */
+int pcb_layervis_change_group_vis(pcb_layer_id_t Layer, int On, pcb_bool ChangeStackOrder)
+{
+	pcb_layergrp_id_t group;
+	int i, changed = 1;		/* at least the current layer changes */
+
+
+	if (Layer & PCB_LYT_UI) {
+		pcb_layer_t *ly = pcb_uilayer_get(Layer);
+		if (ly == NULL)
+			return 0;
+		if (On < 0)
+			On = !ly->meta.real.vis;
+		ly->meta.real.vis = On;
+		changed = 1;
+		goto done;
+	}
+
+	if (On < 0)
+		On = !PCB->Data->Layer[Layer].meta.real.vis;
+
+	if (conf_core.rc.verbose)
+		printf("pcb_layervis_change_group_vis(Layer=%ld, On=%d, ChangeStackOrder=%d)\n", Layer, On, ChangeStackOrder);
+
+	/* decrement 'i' to keep stack in order of layergroup */
+	if ((group = pcb_layer_get_group(PCB, Layer)) >= 0) {
+		for (i = PCB->LayerGroups.grp[group].len; i;) {
+			pcb_layer_id_t layer = PCB->LayerGroups.grp[group].lid[--i];
+
+			/* don't count the passed member of the group */
+			if (layer != Layer && layer < pcb_max_layer) {
+				PCB->Data->Layer[layer].meta.real.vis = On;
+
+				/* push layer on top of stack if switched on */
+				if (On && ChangeStackOrder)
+					PushOnTopOfLayerStack(layer);
+				changed++;
+			}
+		}
+		PCB->LayerGroups.grp[group].vis = On;
+	}
+
+	/* change at least the passed layer */
+	PCB->Data->Layer[Layer].meta.real.vis = On;
+	if (On && ChangeStackOrder)
+		PushOnTopOfLayerStack(Layer);
+
+	done:;
+	/* update control panel and exit */
+	pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	return changed;
+}
+
+/* ---------------------------------------------------------------------------
+ * resets the layerstack setting
+ */
+void pcb_layervis_reset_stack(void)
+{
+	pcb_layer_id_t comp;
+	pcb_cardinal_t i;
+
+	assert(PCB->Data->LayerN <= PCB_MAX_LAYER);
+	for (i = 0; i < pcb_max_layer; i++) {
+		if (!(pcb_layer_flags(PCB, i) & PCB_LYT_SILK))
+			pcb_layer_stack[i] = i;
+		PCB->Data->Layer[i].meta.real.vis = pcb_true;
+	}
+	PCB->InvisibleObjectsOn = pcb_true;
+	PCB->pstk_on = pcb_true;
+	PCB->SubcOn = pcb_true;
+	PCB->SubcPartsOn = pcb_true;
+	PCB->RatOn = pcb_true;
+	PCB->padstack_mark_on = pcb_true;
+	PCB->hole_on = pcb_true;
+
+	/* Bring the top copper group to the front and make it active.  */
+	if (pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp, 1) > 0)
+		pcb_layervis_change_group_vis(comp, 1, 1);
+}
+
+/* ---------------------------------------------------------------------------
+ * saves the layerstack setting
+ */
+void pcb_layervis_save_stack(void)
+{
+	pcb_cardinal_t i;
+	static pcb_bool run = pcb_false;
+
+	if (run == pcb_false) {
+		SavedStack.cnt = 0;
+		run = pcb_true;
+	}
+
+	if (SavedStack.cnt != 0)
+		pcb_message(PCB_MSG_ERROR, "pcb_layervis_save_stack()  layerstack was already saved and not yet restored.  cnt = %d\n", SavedStack.cnt);
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		if (!(pcb_layer_flags(PCB, i) & PCB_LYT_SILK))
+			SavedStack.pcb_layer_stack[i] = pcb_layer_stack[i];
+		SavedStack.LayerOn[i] = PCB->Data->Layer[i].meta.real.vis;
+	}
+	SavedStack.ElementOn = pcb_silk_on(PCB);
+	SavedStack.InvisibleObjectsOn = PCB->InvisibleObjectsOn;
+	SavedStack.pstk_on = PCB->pstk_on;
+	SavedStack.RatOn = PCB->RatOn;
+	SavedStack.cnt++;
+}
+
+/* ---------------------------------------------------------------------------
+ * restores the layerstack setting
+ */
+void pcb_layervis_restore_stack(void)
+{
+	pcb_cardinal_t i;
+
+	if (SavedStack.cnt == 0) {
+		pcb_message(PCB_MSG_ERROR, "pcb_layervis_restore_stack()  layerstack has not" " been saved.  cnt = %d\n", SavedStack.cnt);
+		return;
+	}
+	else if (SavedStack.cnt != 1) {
+		pcb_message(PCB_MSG_ERROR, "pcb_layervis_restore_stack()  layerstack save count is" " wrong.  cnt = %d\n", SavedStack.cnt);
+	}
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		if (!(pcb_layer_flags(PCB, i) & PCB_LYT_SILK))
+			pcb_layer_stack[i] = SavedStack.pcb_layer_stack[i];
+		PCB->Data->Layer[i].meta.real.vis = SavedStack.LayerOn[i];
+	}
+	PCB->InvisibleObjectsOn = SavedStack.InvisibleObjectsOn;
+	PCB->pstk_on = SavedStack.pstk_on;
+	PCB->RatOn = SavedStack.RatOn;
+
+	SavedStack.cnt--;
+}
+
+static conf_hid_id_t layer_vis_conf_id;
+
+void layer_vis_chg_mask(conf_native_t *cfg, int arr_idx)
+{
+	pcb_layer_id_t n;
+	int chg = 0;
+	static int in = 0; /* don't run when called from the PCB_EVENT_LAYERS_CHANGED triggered from this function */
+
+	if ((PCB == NULL) || (in))
+		return;
+
+	in = 1;
+	for(n = 0; n < pcb_max_layer; n++) {
+		if (pcb_layer_flags(PCB, n) & PCB_LYT_MASK) {
+			if (PCB->Data->Layer[n].meta.real.vis != *cfg->val.boolean) {
+				chg = 1;
+				PCB->Data->Layer[n].meta.real.vis = *cfg->val.boolean;
+			}
+		}
+	}
+	if (chg)
+		pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+	in = 0;
+}
+
+void pcb_layer_vis_change_all(pcb_board_t *pcb, pcb_bool_op_t open, pcb_bool_op_t vis)
+{
+	pcb_layergrp_id_t gid;
+	int n;
+
+	for(gid = 0; gid < pcb_max_group(pcb); gid++) {
+		pcb_layergrp_t *g = &pcb->LayerGroups.grp[gid];
+
+		pcb_bool_op(g->open, open);
+
+		if (vis == PCB_BOOL_PRESERVE) {
+			/* the group is visible exactly if if any layer is visible */
+			g->vis = 0;
+			for(n = 0; n < g->len; n++) {
+				pcb_layer_t *l = pcb_get_layer(pcb->Data, g->lid[n]);
+				if ((l != NULL) && (l->meta.real.vis)) {
+					g->vis = 1;
+					break;
+				}
+			}
+		}
+		else {
+			pcb_bool_op(g->vis, vis);
+			for(n = 0; n < g->len; n++) {
+				pcb_layer_t *l = pcb_get_layer(pcb->Data, g->lid[n]);
+				pcb_bool_op(l->meta.real.vis, vis);
+			}
+		}
+	}
+	/* do NOT generate an event: some callers want to handle that */
+}
+
+static void layer_vis_grp_defaults(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	pcb_layergrp_id_t gid;
+
+	pcb_layer_vis_change_all(PCB, PCB_BOOL_SET, PCB_BOOL_PRESERVE);
+
+	/* do not show paste and mask by default - they are distractive */
+	for(gid = 0; gid < pcb_max_group(PCB); gid++) {
+		pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid];
+		if ((g->ltype & PCB_LYT_MASK) || (g->ltype & PCB_LYT_PASTE)) {
+			int n;
+			g->vis = pcb_false;
+			for(n = 0; n < g->len; n++) {
+				pcb_layer_t *l = pcb_get_layer(PCB->Data, g->lid[n]);
+				if (l == NULL)
+					pcb_message(PCB_MSG_ERROR, "broken layer groups; layer group references to non-existing layer\n");
+				else
+					l->meta.real.vis = 0;
+			}
+		}
+	}
+
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); /* Can't send LAYERVIS_CHANGED here: it's a race condition, the layer selector could still have the old widgets */
+}
+
+pcb_layer_id_t pcb_layer_vis_last_lyt(pcb_layer_type_t target)
+{
+	int n;
+	/* find the last used match on stack first */
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		pcb_layer_id_t lid = pcb_layer_stack[n];
+		pcb_layer_type_t lyt = pcb_layer_flags(PCB, lid);
+		if ((lyt & target) == target)
+			return lid;
+	}
+
+	/* if no match, find any matching layer */
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		pcb_layer_type_t lyt = pcb_layer_flags(PCB, n);
+		if ((lyt & target) == target)
+			return n;
+	}
+
+	return -1;
+}
+
+static const char *layer_vis_cookie = "core_layer_vis";
+
+void pcb_layer_vis_init(void)
+{
+	conf_native_t *n_mask = conf_get_field("editor/show_mask");
+	static conf_hid_callbacks_t cbs_mask;
+
+	layer_vis_conf_id = conf_hid_reg(layer_vis_cookie, NULL);
+
+	if (n_mask != NULL) {
+		memset(&cbs_mask, 0, sizeof(conf_hid_callbacks_t));
+		cbs_mask.val_change_post = layer_vis_chg_mask;
+		conf_hid_set_cb(n_mask, layer_vis_conf_id, &cbs_mask);
+	}
+
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, layer_vis_grp_defaults, NULL, layer_vis_cookie);
+}
+
+void pcb_layer_vis_uninit(void)
+{
+	pcb_event_unbind_allcookie(layer_vis_cookie);
+	conf_hid_unreg(layer_vis_cookie);
+}
Index: tags/2.0.1/src/layer_vis.h
===================================================================
--- tags/2.0.1/src/layer_vis.h	(nonexistent)
+++ tags/2.0.1/src/layer_vis.h	(revision 18980)
@@ -0,0 +1,60 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Layer visibility logics (affects the GUI and some exporters) */
+
+#ifndef PCB_LAYER_VIS_H
+#define PCB_LAYER_VIS_H
+
+#include "layer.h"
+
+/* changes the visibility of all layers in a group; returns the number of
+   changed layers; on should be 0 or 1 for setting the state or -1 for toggling it */
+int pcb_layervis_change_group_vis(pcb_layer_id_t Layer, int On, pcb_bool ChangeStackOrder);
+
+/* resets the layer visibility stack setting */
+void pcb_layervis_reset_stack(void);
+
+/* saves the layerstack setting */
+void pcb_layervis_save_stack(void);
+
+/* restores the layerstack setting */
+void pcb_layervis_restore_stack(void);
+
+/* Return the last used layer (or if none, any layer) that matches target type */
+pcb_layer_id_t pcb_layer_vis_last_lyt(pcb_layer_type_t target);
+
+/* (un)init config watches and events to keep layers in sync */
+void pcb_layer_vis_init(void);
+void pcb_layer_vis_uninit(void);
+
+/* Open/close, on/off all layers and groups; does NOT generate an event */
+void pcb_layer_vis_change_all(pcb_board_t *pcb, pcb_bool_op_t open, pcb_bool_op_t vis);
+
+#endif
Index: tags/2.0.1/src/library.c
===================================================================
--- tags/2.0.1/src/library.c	(nonexistent)
+++ tags/2.0.1/src/library.c	(revision 18980)
@@ -0,0 +1,148 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#warning cleanup TODO: replace this with genvect
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "config.h"
+#include "library.h"
+#include "macro.h"
+#include "compat_misc.h"
+#include "obj_common.h"
+
+#define	STEP_LIBRARYMENU	10
+#define	STEP_LIBRARYENTRY	20
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a library menu, allocates memory if necessary
+ */
+pcb_lib_menu_t *pcb_lib_menu_new(pcb_lib_t *lib, int *idx)
+{
+	pcb_lib_menu_t *menu = lib->Menu;
+
+	/* realloc new memory if necessary and clear it */
+	if (lib->MenuN >= lib->MenuMax) {
+		lib->MenuMax += STEP_LIBRARYMENU;
+		menu = (pcb_lib_menu_t *) realloc(menu, lib->MenuMax * sizeof(pcb_lib_menu_t));
+		lib->Menu = menu;
+		memset(menu + lib->MenuN, 0, STEP_LIBRARYMENU * sizeof(pcb_lib_menu_t));
+	}
+	if (idx != NULL)
+		*idx = lib->MenuN;
+	return (menu + lib->MenuN++);
+}
+
+void pcb_lib_menu_free(pcb_lib_t *lib, int menuidx)
+{
+	pcb_lib_menu_t *menu = lib->Menu;
+
+	if (menu[menuidx].Name != NULL)
+		free(menu[menuidx].Name);
+	if (menu[menuidx].directory != NULL)
+		free(menu[menuidx].directory);
+
+	lib->MenuN--;
+	memmove(menu + menuidx, menu + menuidx + 1, sizeof(pcb_lib_menu_t) * (lib->MenuN - menuidx));
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a library entry, allocates memory if necessary
+ */
+pcb_lib_entry_t *pcb_lib_entry_new(pcb_lib_menu_t *Menu)
+{
+	pcb_lib_entry_t *entry = Menu->Entry;
+
+	/* realloc new memory if necessary and clear it */
+	if (Menu->EntryN >= Menu->EntryMax) {
+		Menu->EntryMax += STEP_LIBRARYENTRY;
+		entry = (pcb_lib_entry_t *) realloc(entry, Menu->EntryMax * sizeof(pcb_lib_entry_t));
+		Menu->Entry = entry;
+		memset(entry + Menu->EntryN, 0, STEP_LIBRARYENTRY * sizeof(pcb_lib_entry_t));
+	}
+	return (entry + Menu->EntryN++);
+}
+
+
+/* ---------------------------------------------------------------------------
+ * releases the memory that's allocated by the library
+ */
+void pcb_lib_free(pcb_lib_t *lib)
+{
+	PCB_MENU_LOOP(lib);
+	{
+		PCB_ENTRY_LOOP(menu);
+		{
+			if (!entry->ListEntry_dontfree)
+				free((char*)entry->ListEntry);
+		}
+		PCB_END_LOOP;
+		free(menu->Entry);
+		free(menu->Name);
+		free(menu->directory);
+	}
+	PCB_END_LOOP;
+	free(lib->Menu);
+
+	/* clear struct */
+	memset(lib, 0, sizeof(pcb_lib_t));
+}
+
+/* ---------------------------------------------------------------------------
+ * Add a new net to the netlist menu
+ */
+pcb_lib_menu_t *pcb_lib_net_new(pcb_lib_t *lib, char *name, const char *style)
+{
+	pcb_lib_menu_t *menu;
+	char temp[64];
+
+	sprintf(temp, "  %s", name);
+	menu = pcb_lib_menu_new(lib, NULL);
+	menu->Name = pcb_strdup(temp);
+	menu->flag = 1;								/* net is enabled by default */
+	if (style == NULL || PCB_NSTRCMP("(unknown)", style) == 0)
+		menu->Style = NULL;
+	else
+		menu->Style = pcb_strdup(style);
+	menu->type = PCB_OBJ_NET;
+	return menu;
+}
+
+/* ---------------------------------------------------------------------------
+ * Add a connection to the net
+ */
+pcb_lib_entry_t *pcb_lib_conn_new(pcb_lib_menu_t *net, char *conn)
+{
+	pcb_lib_entry_t *entry = pcb_lib_entry_new(net);
+
+	entry->ListEntry = pcb_strdup_null(conn);
+	entry->ListEntry_dontfree = 0;
+
+	return entry;
+}
Index: tags/2.0.1/src/library.h
===================================================================
--- tags/2.0.1/src/library.h	(nonexistent)
+++ tags/2.0.1/src/library.h	(revision 18980)
@@ -0,0 +1,106 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_LIBRARY_H
+#define PCB_LIBRARY_H
+
+#include "global_typedefs.h"
+#include "obj_common.h"
+
+typedef struct pcb_lib_entry_s  pcb_lib_entry_t;
+typedef struct pcb_lib_menu_s   pcb_lib_menu_t;
+
+/* ---------------------------------------------------------------------------
+ * structure used by library routines
+ */
+struct pcb_lib_entry_s {
+	const char *ListEntry;				/* the string for the selection box */
+	int ListEntry_dontfree;       /* do not free(ListEntry) if non-zero */
+	/* This used to contain some char *AllocatedMemory, possibly with
+	 * the intention of the following fields pointing into it.
+	 * It was never used that way, so removing for now.
+	 * TODO: re-introduce and actually use it for the following fields?
+	 */
+	const char *Package;	 				/* package */
+	const char *Value;						/* the value field */
+	const char *Description;			/* some descriptive text */
+#if 0
+	pcb_fp_type_t Type;
+	void **Tags;									/* an array of void * tag IDs; last tag ID is NULL */
+#endif
+};
+
+/* If the internal flag is set, the only field that is valid is Name,
+   and the struct is allocated with malloc instead of
+   CreateLibraryEntry.  These "internal" entries are used for
+   electrical paths that aren't yet assigned to a real net.  */
+
+struct pcb_lib_menu_s {
+	PCB_ANY_OBJ_FIELDS;
+	char *Name,										/* name of the menu entry */
+	 *directory,									/* Directory name library elements are from */
+	 *Style;											/* routing style */
+	pcb_cardinal_t EntryN,							/* number of objects */
+	  EntryMax;										/* number of reserved memory locations */
+	pcb_lib_entry_t *Entry;		/* the entries */
+	char flag;										/* used by the netlist window to enable/disable nets */
+	char internal;								/* if set, this is an internal-only entry, not
+																   part of the global netlist. */
+};
+
+typedef struct {
+	pcb_cardinal_t MenuN;								/* number of objects */
+	pcb_cardinal_t MenuMax;							/* number of reserved memory locations */
+	pcb_lib_menu_t *Menu;			/* the entries */
+} pcb_lib_t;
+
+pcb_lib_menu_t *pcb_lib_menu_new(pcb_lib_t *, int *idx);
+pcb_lib_entry_t *pcb_lib_entry_new(pcb_lib_menu_t *);
+void pcb_lib_free(pcb_lib_t *);
+void pcb_lib_menu_free(pcb_lib_t *lib, int menuidx);
+
+pcb_lib_menu_t *pcb_lib_net_new(pcb_lib_t *lib, char *name, const char *style);
+pcb_lib_entry_t *pcb_lib_conn_new(pcb_lib_menu_t *net, char *conn);
+
+
+#define PCB_MENU_LOOP(top)	do {	\
+	pcb_cardinal_t	l;			\
+	pcb_lib_menu_t *menu;		\
+	for (l = (top)->MenuN-1; l != -1; l--)	\
+	{					\
+		menu = &(top)->Menu[l]
+
+#define PCB_ENTRY_LOOP(top) do	{	\
+	pcb_cardinal_t	n;			\
+	pcb_lib_entry_t *entry;		\
+	for (n = (top)->EntryN-1; n != -1; n--)	\
+	{					\
+		entry = &(top)->Entry[n]
+
+#endif
Index: tags/2.0.1/src/list_common.h
===================================================================
--- tags/2.0.1/src/list_common.h	(nonexistent)
+++ tags/2.0.1/src/list_common.h	(revision 18980)
@@ -0,0 +1,39 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef LIST_COMMON_H
+#define LIST_COMMON_H
+
+/* iterate over all items of list and call func(item) */
+#define list_map0(list, itemtype, func) \
+		do { \
+			itemtype *__item__; \
+			gdl_iterator_t it; \
+			linelist_foreach((list), &it, __item__) \
+				func(__item__); \
+		} while(0)
+
+#endif
Index: tags/2.0.1/src/list_conf.c
===================================================================
--- tags/2.0.1/src/list_conf.c	(nonexistent)
+++ tags/2.0.1/src/list_conf.c	(revision 18980)
@@ -0,0 +1,30 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define FROM_CONF_C
+#include "conf.h"
+#include "list_conf.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/list_conf.h
===================================================================
--- tags/2.0.1/src/list_conf.h	(nonexistent)
+++ tags/2.0.1/src/list_conf.h	(revision 18980)
@@ -0,0 +1,53 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef LIST_CONF_H
+#define LIST_CONF_H
+
+#include "conf.h"
+
+#include <genlist/gentdlist_undef.h>
+
+#ifdef FROM_CONF_C
+#define TDL_DONT_UNDEF
+#endif
+
+#define TDL(x)      conflist_ ## x
+#define TDL_LIST_T  conflist_t
+#define TDL_LIST_U  conflist_u
+#define TDL_ITEM_T  conf_listitem_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define conflist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/macro.h
===================================================================
--- tags/2.0.1/src/macro.h	(nonexistent)
+++ tags/2.0.1/src/macro.h	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* some commonly used macros not related to a special C-file
+ * the file is included by global.h after const.h */
+
+#ifndef	PCB_MACRO_H
+#define	PCB_MACRO_H
+
+#define PCB_ENTRIES(x)         (sizeof((x))/sizeof((x)[0]))
+#define PCB_UNKNOWN(a)         ((a) && *(a) ? (a) : "(unknown)")
+#define PCB_NSTRCMP(a, b)      ((a) ? ((b) ? strcmp((a),(b)) : 1) : -1)
+#define PCB_EMPTY(a)           ((a) ? (a) : "")
+#define PCB_EMPTY_STRING_P(a)  ((a) ? (a)[0]==0 : 1)
+#define PCB_XOR(a,b)           (((a) && !(b)) || (!(a) && (b)))
+
+#endif
Index: tags/2.0.1/src/main.c
===================================================================
--- tags/2.0.1/src/main.c	(nonexistent)
+++ tags/2.0.1/src/main.c	(revision 18980)
@@ -0,0 +1,679 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* main program, initializes some stuff and handles user input
+ */
+#include "config.h"
+#include <stdlib.h>
+
+static const char *EXPERIMENTAL = NULL;
+
+#include <string.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <time.h>								/* Seed for srand() */
+#include <locale.h>
+#include <libminuid/libminuid.h>
+
+#include "board.h"
+#include "brave.h"
+#include "data.h"
+#include "error.h"
+#include "plug_io.h"
+#include "buffer.h"
+#include "crosshair.h"
+#include "compat_lrealpath.h"
+#include "polygon.h"
+#include "buildin.h"
+#include "build_run.h"
+#include "flag_str.h"
+#include "plugins.h"
+#include "plug_footprint.h"
+#include "plug_import.h"
+#include "event.h"
+#include "funchash.h"
+#include "conf.h"
+#include "conf_core.h"
+#include <genvector/vtp0.h>
+#include "layer_vis.h"
+#include "layer_ui.h"
+#include "obj_text.h"
+#include "pcb_minuid.h"
+#include "tool.h"
+
+#include "actions.h"
+#include "hid_init.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+/* ----------------------------------------------------------------------
+ * initialize signal and error handlers
+ */
+static void InitHandler(void)
+{
+#ifdef PCB_HAVE_SIGHUP
+	signal(SIGHUP, pcb_catch_signal);
+#endif
+#ifdef PCB_HAVE_SIGQUIT
+	signal(SIGQUIT, pcb_catch_signal);
+#endif
+#ifdef PCB_HAVE_SIGTERM
+	signal(SIGTERM, pcb_catch_signal);
+#endif
+#ifdef PCB_HAVE_SIGINT
+	signal(SIGINT, pcb_catch_signal);
+#endif
+
+#ifdef NDEBUG
+/* so that we get a core dump on segfault in debug mode */
+#	ifdef PCB_HAVE_SIGABRT
+		signal(SIGABRT, pcb_catch_signal);
+#	endif
+#	ifdef PCB_HAVE_SIGSEGV
+		signal(SIGSEGV, pcb_catch_signal);
+#	endif
+#endif
+
+	/* calling external program by popen() may cause a PIPE signal,
+	 * so we ignore it
+	 */
+#ifdef SIGPIPE
+	signal(SIGPIPE, SIG_IGN);
+#endif
+}
+
+/* ----------------------------------------------------------------------
+ * Figure out the canonical name of the executed program
+ * and fix up the defaults for various paths
+ */
+
+static void InitPaths(char *argv0)
+{
+	size_t l;
+	int haspath;
+	char *t1, *t2;
+	int found_bindir = 0, se = 0;
+	char *exec_prefix = NULL;
+	char *bindir = NULL;
+
+
+	/* see if argv0 has enough of a path to let lrealpath give the
+	 * real path.  This should be the case if you invoke pcb with
+	 * something like /usr/local/bin/pcb or ./pcb or ./foo/pcb
+	 * but if you just use pcb and it exists in your path, you'll
+	 * just get back pcb again.
+	 */
+
+#ifndef NO_BINDIR_HEURISTICS
+	{
+		int i;
+		haspath = 0;
+		for (i = 0; i < strlen(argv0); i++) {
+			if (argv0[i] == PCB_DIR_SEPARATOR_C)
+				haspath = 1;
+		}
+	}
+#endif
+
+#ifdef DEBUG
+	printf("InitPaths (%s): haspath = %d\n", argv0, haspath);
+#endif
+
+	if (haspath) {
+#ifndef NO_BINDIR_HEURISTICS
+		bindir = pcb_lrealpath(argv0);
+#endif
+		found_bindir = 1;
+	}
+	else {
+		char *path, *p, *tmps;
+		struct stat sb;
+		int r;
+
+		tmps = getenv("PATH");
+
+		if (tmps != NULL) {
+			path = pcb_strdup(tmps);
+
+			/* search through the font path for a font file */
+			for (p = strtok(path, PCB_PATH_DELIMETER); p && *p; p = strtok(NULL, PCB_PATH_DELIMETER)) {
+#ifdef DEBUG
+				printf("Looking for %s in %s\n", argv0, p);
+#endif
+				if ((tmps = (char *) malloc((strlen(argv0) + strlen(p) + 2) * sizeof(char))) == NULL) {
+					fprintf(stderr, "InitPaths():  malloc failed\n");
+					exit(1);
+				}
+				sprintf(tmps, "%s%s%s", p, PCB_DIR_SEPARATOR_S, argv0);
+				r = stat(tmps, &sb);
+				if (r == 0) {
+#ifdef DEBUG
+					printf("Found it:  \"%s\"\n", tmps);
+#endif
+					bindir = pcb_lrealpath(tmps);
+					found_bindir = 1;
+					free(tmps);
+					break;
+				}
+				free(tmps);
+			}
+			free(path);
+		}
+	}
+
+	if (found_bindir) {
+		/* strip off the executable name leaving only the path */
+		t2 = NULL;
+		t1 = strchr(bindir, PCB_DIR_SEPARATOR_C);
+		while (t1 != NULL && *t1 != '\0') {
+			t2 = t1;
+			t1 = strchr(t2 + 1, PCB_DIR_SEPARATOR_C);
+		}
+		if (t2 != NULL)
+			*t2 = '\0';
+	}
+	else {
+		/* we have failed to find out anything from argv[0] so fall back to the original
+		 * install prefix
+		 */
+		bindir = pcb_strdup(BINDIR);
+	}
+
+	/* now find the path to exec_prefix */
+	l = strlen(bindir) + 1 + strlen(BINDIR_TO_EXECPREFIX) + 1;
+	if ((exec_prefix = (char *) malloc(l * sizeof(char))) == NULL) {
+		fprintf(stderr, "InitPaths():  malloc failed\n");
+		exit(1);
+	}
+	sprintf(exec_prefix, "%s%s%s", bindir, PCB_DIR_SEPARATOR_S, BINDIR_TO_EXECPREFIX);
+	conf_set(CFR_INTERNAL, "rc/path/exec_prefix", -1, exec_prefix, POL_OVERWRITE);
+
+	/* export the most important paths and data for child processes (e.g. parametric footprints) */
+	se |= pcb_setenv("PCB_RND_VERSION",     PCB_VERSION,           1);
+	se |= pcb_setenv("PCB_RND_REVISION",    PCB_REVISION,          1);
+	se |= pcb_setenv("PCB_RND_PCBLIB",      PCBSHAREDIR "/pcblib", 1);
+	se |= pcb_setenv("PCB_RND_SHARE",       PCBSHAREDIR,           1);
+	se |= pcb_setenv("PCB_RND_LIB",         PCBLIBDIR,             1);
+	se |= pcb_setenv("PCB_RND_EXEC_PREFIX", exec_prefix,           1);
+
+	if (se != 0)
+		fprintf(stderr, "WARNING: setenv() failed - external commands such as parametric footprints may not have a proper environment\n");
+
+	free(exec_prefix);
+	free(bindir);
+}
+
+/* ----------------------------------------------------------------------
+ * main program
+ */
+
+static const char *hid_name = NULL;
+void pcb_set_hid_name(const char *new_hid_name)
+{
+	hid_name = new_hid_name;
+}
+
+
+#include "dolists.h"
+
+static char **hid_argv_orig;
+
+void pcb_main_uninit(void)
+{
+	pcb_brave_uninit();
+
+	if (conf_isdirty(CFR_USER))
+		conf_save_file(NULL, NULL, CFR_USER, NULL);
+
+	pcb_uninit_buffers(PCB);
+
+	/* Free up memory allocated to the PCB. Why bother when we're about to exit ?
+	 * Because it removes some false positives from heap bug detectors such as
+	 * valgrind. */
+	pcb_board_free(PCB);
+	free(PCB);
+	PCB = NULL;
+
+	pcb_hid_uninit();
+	pcb_text_uninit();
+	pcb_layer_vis_uninit();
+	pcb_events_uninit();
+
+	pcb_strflg_uninit_buf();
+	pcb_strflg_uninit_layerlist();
+
+	pcb_fp_uninit();
+	pcb_fp_host_uninit();
+	pcb_funchash_uninit();
+	free(hid_argv_orig);
+	conf_uninit();
+	pcb_io_uninit();
+	pcb_plugin_uninit();
+	pcb_tool_uninit();
+	pcb_file_loaded_uninit();
+	pcb_import_uninit();
+	pcb_actions_uninit();
+	pcb_uilayer_uninit();
+	pcb_cli_uninit();
+}
+
+static int arg_match(const char *in, const char *shrt, const char *lng)
+{
+	return ((shrt != NULL) && (strcmp(in, shrt) == 0)) || ((lng != NULL) && (strcmp(in, lng) == 0));
+}
+
+/* action table number of columns for a single action */
+const int PCB_ACTION_ARGS_WIDTH = 5;
+const char *pcb_action_args[] = {
+/*short, -long, action, help, hint-on-error */
+	NULL, "-show-actions",    "PrintActions()",     "Print all available actions (human readable) and exit",   NULL,
+	NULL, "-dump-actions",    "DumpActions()",      "Print all available actions (script readable) and exit",  NULL,
+	NULL, "-dump-plugins",    "DumpPlugins()",      "Print all available plugins (script readable) and exit",  NULL,
+	NULL, "-dump-plugindirs", "DumpPluginDirs()",   "Print directories plugins might be loaded from and exit", NULL,
+	NULL, "-dump-oflags",     "DumpObjFlags()",     "Print object flags and exit",                             NULL,
+	NULL, "-show-paths",      "PrintPaths()",       "Print all configured paths and exit",                     NULL,
+	NULL, "-dump-config",     "dumpconf(native,1)", "Print the config tree and exit",                          "Config dump not available - make sure you have configured pcb-rnd with --buildin-diag",
+	"V",  "-version",         "PrintVersion()",     "Print version info and exit",                             NULL,
+	NULL, "-copyright",       "PrintCopyright()",   "Print copyright and exit",                                NULL,
+	NULL, NULL, NULL, NULL, NULL /* terminator */
+};
+
+void print_pup_err(pup_err_stack_t *entry, char *string)
+{
+	pcb_message(PCB_MSG_ERROR, "puplug: %s\n", string);
+}
+
+/* parse arguments using the gui; if fails and fallback is enabled, try the next gui */
+int gui_parse_arguments(int autopick_gui, int *hid_argc, char **hid_argv[])
+{
+	conf_listitem_t *apg = NULL;
+
+	if ((autopick_gui >= 0) && (conf_core.rc.hid_fallback)) { /* start from the GUI we are initializing first */
+		int n;
+		const char *g;
+
+		conf_loop_list_str(&conf_core.rc.preferred_gui, apg, g, n) {
+			if (n == autopick_gui)
+				break;
+		}
+	}
+
+	for(;;) {
+		int res;
+		if (pcb_gui->get_export_options != NULL)
+			pcb_gui->get_export_options(NULL);
+		res = pcb_gui->parse_arguments(hid_argc, hid_argv);
+		if (res == 0)
+			break; /* HID accepted, don't try anything else */
+		if (res < 0) {
+			fprintf(stderr, "Failed to initialize HID %s (unrecoverable, have to give up)\n", pcb_gui->name);
+			return -1;
+		}
+		fprintf(stderr, "Failed to initialize HID %s (recoverable)\n", pcb_gui->name);
+		if (apg == NULL) {
+			if (conf_core.rc.hid_fallback) {
+				ran_out_of_hids:;
+				fprintf(stderr, "Tried all available HIDs, all failed, giving up.\n");
+			}
+			else
+				fprintf(stderr, "Not trying any other hid as fallback because rc/hid_fallback is disabled.\n");
+			return -1;
+		}
+
+		/* falling back to the next HID */
+		do {
+			int n;
+			const char *g;
+
+			apg = conf_list_next_str(apg, &g, &n);
+			if (apg == NULL)
+				goto ran_out_of_hids;
+			pcb_gui = pcb_hid_find_gui(g);
+		} while(pcb_gui == NULL);
+	}
+	return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	enum {
+		DO_SOMETHING,
+		DO_PRINT,
+		DO_EXPORT,
+		DO_GUI
+	} do_what = DO_SOMETHING;
+	int n, hid_argc = 0;
+	char *cmd, *arg, **hid_argv, **sp;
+	const char **cs;
+	const char *main_action = NULL, *main_action_hint = NULL;
+	char *command_line_pcb = NULL;
+	vtp0_t plugin_cli_conf;
+	int autopick_gui = -1;
+
+#ifdef LOCALEDIR
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+	textdomain(GETTEXT_PACKAGE);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	setlocale(LC_ALL, "");
+#else
+	setlocale(LC_ALL, "C");
+#endif
+
+	hid_argv_orig = hid_argv = calloc(sizeof(char *), argc);
+	/* init application:
+	 * - make program name available for error handlers
+	 * - initialize infrastructure (e.g. the conf system)
+	 * - evaluate options
+	 * - create an empty PCB with default symbols
+	 * - register 'call on exit()' function
+	 */
+
+
+	/* Minimal conf setup before we do anything else */
+	pcb_file_loaded_init();
+	pcb_minuid_init();
+	conf_init();
+	conf_core_init();
+	conf_core_postproc(); /* to get all the paths initialized */
+	pcb_layer_vis_init();
+	pcb_brave_init();
+
+	vtp0_init(&plugin_cli_conf);
+
+	/* process arguments */
+	for(n = 1; n < argc; n++) {
+		cmd = argv[n];
+		arg = argv[n+1];
+		if (*cmd == '-') {
+			cmd++;
+			if ((strcmp(cmd, "?") == 0) || (strcmp(cmd, "h") == 0) || (strcmp(cmd, "-help") == 0)) {
+				if (arg != NULL) {
+					/* memory leak, but who cares for --help? */
+					main_action = pcb_strdup_printf("PrintUsage(%s)", arg);
+					n++;
+				}
+				else
+					main_action = "PrintUsage()";
+				goto next_arg;
+			}
+			if ((strcmp(cmd, "g") == 0) || (strcmp(cmd, "-gui") == 0) || (strcmp(cmd, "-hid") == 0)) {
+				do_what = DO_GUI;
+				hid_name = arg;
+				n++;
+				goto next_arg;
+			}
+			if ((strcmp(cmd, "x") == 0) || (strcmp(cmd, "-export") == 0)) {
+				do_what = DO_EXPORT;
+				hid_name = arg;
+				n++;
+				goto next_arg;
+			}
+			if ((strcmp(cmd, "p") == 0) || (strcmp(cmd, "-print") == 0)) {
+				do_what = DO_PRINT;
+				goto next_arg;
+			}
+
+			for(cs = pcb_action_args; cs[2] != NULL; cs += PCB_ACTION_ARGS_WIDTH) {
+				if (arg_match(cmd, cs[0], cs[1])) {
+					if (main_action == NULL) {
+						main_action = cs[2];
+						main_action_hint = cs[4];
+					}
+					else
+						fprintf(stderr, "Warning: can't execute multiple command line actions, ignoring %s\n", argv[n]);
+					goto next_arg;
+				}
+			}
+			if (arg_match(cmd, "c", "-conf")) {
+				const char *why;
+				n++; /* eat up arg */
+				if (strncmp(arg, "plugins/", 8)  == 0) {
+					/* plugins are not yet loaded or initialized so their configs are
+					   unavailable. Store these settings until plugins are up. This
+					   should not happen to non-plugin config items as those might
+					   affect how plugins are searched/loaded. */
+					void **a = vtp0_alloc_append(&plugin_cli_conf, 1);
+					*a = arg;
+				}
+				else {
+					if (conf_set_from_cli(NULL, arg, NULL, &why) != 0) {
+						fprintf(stderr, "Error: failed to set config %s: %s\n", arg, why);
+						exit(1);
+					}
+				}
+				goto next_arg;
+			}
+		}
+
+		/* didn't handle argument, save it for the HID */
+		hid_argv[hid_argc++] = argv[n];
+
+		next_arg:;
+	}
+	conf_load_all(NULL, NULL);
+
+	setbuf(stdout, 0);
+	InitPaths(argv[0]);
+
+	pcb_fp_init();
+
+
+	srand(time(NULL));						/* Set seed for rand() */
+
+	pcb_funchash_init();
+	pcb_units_init();
+	pcb_polygon_init();
+
+	/* Register a function to be called when the program terminates.
+	 * This makes sure that data is saved even if LEX/YACC routines
+	 * abort the program.
+	 * If the OS doesn't have at least one of them,
+	 * the critical sections will be handled by parse_l.l
+	 */
+	atexit(pcb_emergency_save);
+
+	pcb_events_init();
+	pcb_text_init();
+	pcb_tool_init();
+
+	pcb_actions_init();
+	pup_init(&pcb_pup);
+	pcb_pup.error_stack_enable = 1;
+	pup_buildin_load(&pcb_pup, pup_buildins);
+	pup_autoload_dir(&pcb_pup, NULL, NULL);
+	conf_load_extra(NULL, NULL);
+
+	if (pcb_pup.err_stack != NULL) {
+		pcb_message(PCB_MSG_ERROR, "Some of the static linked buildins could not be loaded:\n");
+		pup_err_stack_process_str(&pcb_pup, print_pup_err);
+	}
+
+	pcb_hid_init();
+	for(sp = pcb_pup_paths; *sp != NULL; sp++) {
+		pcb_message(PCB_MSG_DEBUG, "Loading plugins from '%s'\n", *sp);
+		pup_autoload_dir(&pcb_pup, *sp, (const char **)pcb_pup_paths);
+	}
+	if (pcb_pup.err_stack != NULL) {
+		pcb_message(PCB_MSG_ERROR, "Some of the dynamic linked plugins could not be loaded:\n");
+		pup_err_stack_process_str(&pcb_pup, print_pup_err);
+	}
+
+	{ /* Now that plugins are already initialized, apply plugin config items */
+		int n;
+		for(n = 0; n < vtp0_len(&plugin_cli_conf); n++) {
+			const char *why, *arg = plugin_cli_conf.array[n];
+			if (conf_set_from_cli(NULL, arg, NULL, &why) != 0) {
+				fprintf(stderr, "Error: failed to set config %s: %s\n", arg, why);
+				exit(1);
+			}
+		}
+		vtp0_uninit(&plugin_cli_conf);
+	}
+
+	/* Export pcb from command line if requested.  */
+	switch(do_what) {
+		case DO_PRINT:   pcb_exporter = pcb_gui = pcb_hid_find_printer(); break;
+		case DO_EXPORT:  pcb_exporter = pcb_gui = pcb_hid_find_exporter(hid_name); break;
+		case DO_GUI:
+			pcb_gui = pcb_hid_find_gui(hid_name);
+			if (pcb_gui == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Can't find the gui (%s) requested.\n", hid_name);
+				exit(1);
+			}
+			break;
+		default: {
+			const char *g;
+			conf_listitem_t *i;
+
+			pcb_gui = NULL;
+			conf_loop_list_str(&conf_core.rc.preferred_gui, i, g, autopick_gui) {
+				pcb_gui = pcb_hid_find_gui(g);
+				if (pcb_gui != NULL)
+					break;
+			}
+
+			/* try anything */
+			if (pcb_gui == NULL) {
+				pcb_message(PCB_MSG_WARNING, "Warning: can't find any of the preferred GUIs, falling back to anything available...\nYou may want to check if the plugin is loaded, try --dump-plugins and --dump-plugindirs\n");
+				pcb_gui = pcb_hid_find_gui(NULL);
+			}
+		}
+	}
+
+	/* Exit with error if GUI failed to start. */
+	if (!pcb_gui)
+		exit(1);
+
+/* Initialize actions only when the gui is already known so only the right
+   one is registered (there can be only one GUI). */
+#include "generated_lists.h"
+
+	/* plugins may have installed their new fields, reinterpret the config
+	   (memory lht -> memory bin) to get the new fields */
+	conf_update(NULL, -1);
+
+	if (main_action != NULL) {
+		int res = pcb_parse_command(main_action, pcb_true);
+		if ((res != 0) && (main_action_hint != NULL))
+			fprintf(stderr, "\nHint: %s\n", main_action_hint);
+		exit(res);
+	}
+
+	if (gui_parse_arguments(autopick_gui, &hid_argc, &hid_argv) != 0)
+		exit(1);
+
+	/* Create a new PCB object in memory */
+	PCB = pcb_board_new(0);
+
+	if (PCB == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't create an empty layout, exiting\n");
+		exit(1);
+	}
+
+	/* Add silk layers to newly created PCB */
+	pcb_board_new_postproc(PCB, 1);
+	if (hid_argc > 0)
+		command_line_pcb = hid_argv[0];
+
+	pcb_layervis_reset_stack();
+
+	if (pcb_gui->gui)
+		pcb_crosshair_init();
+	InitHandler();
+	pcb_init_buffers(PCB);
+
+	pcb_tool_select_by_id(PCB_MODE_ARROW);
+
+	if (command_line_pcb) {
+		/* keep filename even if initial load command failed;
+		 * file might not exist
+		 */
+		if (pcb_load_pcb(command_line_pcb, NULL, pcb_true, 0))
+			PCB->Filename = pcb_strdup(command_line_pcb);
+	}
+
+	if (conf_core.design.initial_layer_stack && conf_core.design.initial_layer_stack[0])
+		pcb_message(PCB_MSG_ERROR, "Config setting desgin/initial_layer_stack is set but is deprecated and ignored. Please edit your config files to remove it.\n");
+
+	/* read the library file and display it if it's not empty
+	 */
+	if (!pcb_fp_read_lib_all() && pcb_library.data.dir.children.used)
+		pcb_event(PCB_EVENT_LIBRARY_CHANGED, NULL);
+
+	if (conf_core.rc.script_filename) {
+		pcb_message(PCB_MSG_INFO, _("Executing startup script file %s\n"), conf_core.rc.script_filename);
+		pcb_actionl("ExecuteFile", conf_core.rc.script_filename, NULL);
+	}
+	if (conf_core.rc.action_string) {
+		pcb_message(PCB_MSG_INFO, _("Executing startup action %s\n"), conf_core.rc.action_string);
+		pcb_parse_actions(conf_core.rc.action_string);
+	}
+
+	if (pcb_gui->printer || pcb_gui->exporter) {
+		/* Workaround to fix batch output for non-C locales */
+		setlocale(LC_NUMERIC, "C");
+		if (pcb_data_is_empty(PCB->Data)) {
+			pcb_message(PCB_MSG_ERROR, "Can't export empty board - the board needs to contain at least one object.\n");
+			exit(1);
+		}
+		else
+			pcb_gui->do_export(0);
+		pcb_main_uninit();
+		exit(0);
+	}
+
+	pcb_enable_autosave();
+
+	/* main loop */
+	do {
+		if (EXPERIMENTAL != NULL) {
+			pcb_message(PCB_MSG_ERROR, "******************************** IMPORTANT ********************************\n");
+			pcb_message(PCB_MSG_ERROR, "This revision of pcb-rnd is experimental, unstable, do NOT attempt to use\n");
+			pcb_message(PCB_MSG_ERROR, "it for production. The reason for this state is:\n");
+			pcb_message(PCB_MSG_ERROR, "%s\n", EXPERIMENTAL);
+			pcb_message(PCB_MSG_ERROR, "******************************** IMPORTANT ********************************\n");
+		}
+		pcb_gui->do_export(0);
+		pcb_gui = pcb_next_gui;
+		pcb_next_gui = NULL;
+		if (pcb_gui != NULL) {
+			/* init the next GUI */
+			pcb_gui->parse_arguments(&hid_argc, &hid_argv);
+			if (pcb_gui->gui)
+				pcb_crosshair_init();
+			pcb_tool_select_by_id(PCB_MODE_ARROW);
+			pcb_event(PCB_EVENT_LIBRARY_CHANGED, NULL);
+		}
+	} while(pcb_gui != NULL);
+
+	pcb_main_uninit();
+
+	return 0;
+}
Index: tags/2.0.1/src/main_act.c
===================================================================
--- tags/2.0.1/src/main_act.c	(nonexistent)
+++ tags/2.0.1/src/main_act.c	(revision 18980)
@@ -0,0 +1,431 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#define Progname "pcb-rnd"
+
+#include "config.h"
+
+#include <stdio.h>
+#include "config.h"
+
+#include "undo.h"
+#include "compat_nls.h"
+#include "change.h"
+#include "board.h"
+#include "data.h"
+#include "crosshair.h"
+#include "compat_misc.h"
+#include "layer.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "conf_core.h"
+#include "plugins.h"
+#include "build_run.h"
+#include "safe_fs.h"
+#include "flag_str.h"
+#include "obj_common.h"
+
+static const char pcb_acts_PrintActions[] = "PrintActions()";
+static const char pcb_acth_PrintActions[] = "Print all actions available.";
+fgw_error_t pcb_act_PrintActions(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_print_actions();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_DumpActions[] = "DumpActions()";
+static const char pcb_acth_DumpActions[] = "Dump all actions available.";
+fgw_error_t pcb_act_DumpActions(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_dump_actions();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* print usage lines */
+static inline void u(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	fputc('\n', stderr);
+	va_end(ap);
+}
+
+static const char pcb_acts_PrintUsage[] =
+	"PrintUsage()\n"
+	"PrintUsage(plugin)";
+
+static const char pcb_acth_PrintUsage[] = "Print command line arguments of pcb-rnd or a plugin loaded.";
+
+static int help0(void)
+{
+	pcb_hid_t **hl = pcb_hid_enumerate();
+	int i;
+
+	u("pcb-rnd Printed Circuit Board editing program, http://repo.hu/projects/pcb-rnd");
+	u("For more information, please read the topic help pages:");
+	u("  %s --help topic", Progname);
+	u("Topics are:");
+	u("  invocation           how to run pcb-rnd");
+	u("  main                 main/misc flags (affecting none or all plugins)");
+	for (i = 0; hl[i]; i++)
+		if (hl[i]->usage != NULL)
+			u("  %-20s %s", hl[i]->name, hl[i]->description);
+	return 0;
+}
+
+extern const char *pcb_action_args[];
+extern const int PCB_ACTION_ARGS_WIDTH;
+static int help_main(void) {
+	const char **cs;
+	for(cs = pcb_action_args; cs[2] != NULL; cs += PCB_ACTION_ARGS_WIDTH) {
+		fprintf(stderr, "%s [", Progname);
+		if (cs[0] != NULL)
+			fprintf(stderr, "-%s", cs[0]);
+		if ((cs[0] != NULL) && (cs[1] != NULL))
+			fprintf(stderr, "|");
+		if (cs[1] != NULL)
+			fprintf(stderr, "-%s", cs[1]);
+		fprintf(stderr, "]    %s\n", cs[3]);
+	}
+	return 0;
+}
+
+static int help_invoc(void)
+{
+	pcb_hid_t **hl = pcb_hid_enumerate();
+	int i;
+	int n_printer = 0, n_gui = 0, n_exporter = 0;
+
+	u("pcb-rnd invocation:");
+	u("");
+	u("%s [main options]                                    See --help main", Progname);
+	u("");
+	u("%s [generics] [--gui GUI] [gui options] <pcb file>   interactive GUI", Progname);
+
+	u("Available GUI hid%s:", n_gui == 1 ? "" : "s");
+	for (i = 0; hl[i]; i++)
+		if (hl[i]->gui)
+			fprintf(stderr, "\t%-8s %s\n", hl[i]->name, hl[i]->description);
+
+	u("\n%s [generics] -p [printing options] <pcb file>\tto print", Progname);
+	u("Available printing hid%s:", n_printer == 1 ? "" : "s");
+	for (i = 0; hl[i]; i++)
+		if (hl[i]->printer)
+			fprintf(stderr, "\t%-8s %s\n", hl[i]->name, hl[i]->description);
+
+	u("\n%s [generics] -x hid [export options] <pcb file>\tto export", Progname);
+	u("Available export hid%s:", n_exporter == 1 ? "" : "s");
+	for (i = 0; hl[i]; i++)
+		if (hl[i]->exporter)
+			fprintf(stderr, "\t%-8s %s\n", hl[i]->name, hl[i]->description);
+
+
+	u("\nGenerics:");
+	u("-c conf/path=value        set the value of a configuration item (in CFR_CLI)");
+
+	return 0;
+}
+
+fgw_error_t pcb_act_PrintUsage(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *topic = NULL, *subt = NULL;
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, PrintUsage, topic = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	u("");
+	if (topic != NULL) {
+		pcb_hid_t **hl = pcb_hid_enumerate();
+		int i;
+
+		if (strcmp(topic, "invocation") == 0)  return help_invoc();
+		if (strcmp(topic, "main") == 0)        return help_main();
+
+		for (i = 0; hl[i]; i++) {
+			if ((hl[i]->usage != NULL) && (strcmp(topic, hl[i]->name) == 0)) {
+				PCB_ACT_MAY_CONVARG(2, FGW_STR, PrintUsage, subt = argv[2].val.str);
+				PCB_ACT_IRES(hl[i]->usage(subt));
+				return 0;
+			}
+		}
+		fprintf(stderr, "No help available for %s\n", topic);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	else
+		help0();
+	return 0;
+}
+
+
+static const char pcb_acts_PrintVersion[] = "PrintVersion()";
+static const char pcb_acth_PrintVersion[] = "Print version.";
+fgw_error_t pcb_act_PrintVersion(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	printf("%s\n", pcb_get_info_program());
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_PrintCopyright[] = "PrintCopyright()";
+static const char pcb_acth_PrintCopyright[] = "Print copyright notice.";
+fgw_error_t pcb_act_PrintCopyright(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	printf("%s\n", pcb_get_info_copyright());
+	printf("%s\n", pcb_get_info_license());
+
+	printf("    This program is free software; you can redistribute it and/or modify\n"
+				 "    it under the terms of the GNU General Public License as published by\n"
+				 "    the Free Software Foundation; either version 2 of the License, or\n"
+				 "    (at your option) any later version.\n\n");
+	printf("    This program is distributed in the hope that it will be useful,\n"
+				 "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+				 "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+				 "    GNU General Public License for more details.\n\n");
+	printf("    You should have received a copy of the GNU General Public License\n"
+				 "    along with this program; if not, write to the Free Software\n"
+				 "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n\n");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_PrintPaths[] = "PrintPaths()";
+static const char pcb_acth_PrintPaths[] = "Print full paths and search paths.";
+static void print_list(const conflist_t *cl)
+{
+	int n;
+	conf_listitem_t *ci;
+	const char *p;
+
+	printf(" ");
+	conf_loop_list_str(cl, ci, p, n) {
+		printf("%c%s", (n == 0) ? '"' : ':', p);
+	}
+	printf("\"\n");
+}
+fgw_error_t pcb_act_PrintPaths(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	htsp_entry_t *e;
+	conf_fields_foreach(e) {
+		conf_native_t *n = e->value;
+		if ((strncmp(n->hash_path, "rc/path/", 8) == 0) && (n->type == CFN_STRING) && (n->used == 1))
+			printf("%-32s = %s\n", n->hash_path, n->val.string[0]);
+	}
+	printf("rc/default_font_file             ="); print_list(&conf_core.rc.default_font_file);
+	printf("rc/library_search_paths          ="); print_list(&conf_core.rc.library_search_paths);
+	printf("rc/library_shell                 = \"%s\"\n", conf_core.rc.library_shell);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_PrintFiles[] = "PrintFiles()";
+static const char pcb_acth_PrintFiles[] = "Print files currently loaded.";
+static void print_cat(pcb_file_loaded_t *cat)
+{
+	htsp_entry_t *e;
+	printf("%s\n", cat->name);
+	for (e = htsp_first(&cat->data.category.children); e; e = htsp_next(&cat->data.category.children, e)) {
+		pcb_file_loaded_t *file = e->value;
+		printf(" %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc);
+	}
+}
+fgw_error_t pcb_act_PrintFiles(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	htsp_entry_t *e;
+	printf("# Data files loaded\n");
+	for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e))
+		print_cat(e->value);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_DumpPlugins[] = "DumpPlugins()";
+static const char pcb_acth_DumpPlugins[] = "Print plugins loaded in a format digestable by scripts.";
+fgw_error_t pcb_act_DumpPlugins(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pup_plugin_t *p;
+	const pup_buildin_t **bu;
+	int n;
+
+	printf("#state\tname\tbuildin\tautoload\trefco\tloaded_from\n");
+
+	for(p = pcb_pup.plugins; p != NULL; p = p->next)
+		printf("loaded\t%s\t%d\t%d\t%d\t%s\n",
+			p->name,
+			!!(p->flags & PUP_FLG_STATIC), !!(p->flags & PUP_FLG_AUTOLOAD), p->references,
+			(p->path == NULL ? "<builtin>" : p->path));
+
+	for(n = 0, bu = pcb_pup.bu; n < pcb_pup.bu_used; n++, bu++)
+		if (pup_lookup(&pcb_pup, (*bu)->name) == NULL)
+			printf("unloaded buildin\t%s\t1\t0\t0\t<builtin>\n", (*bu)->name);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_DumpPluginDirs[] = "DumpPluginDirs()";
+static const char pcb_acth_DumpPluginDirs[] = "Print plugins directories in a format digestable by scripts.";
+fgw_error_t pcb_act_DumpPluginDirs(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char **p;
+	for(p = pcb_pup_paths; *p != NULL; p++)
+		printf("%s\n", *p);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_DumpObjFlags[] = "DumpObjFlags()";
+static const char pcb_acth_DumpObjFlags[] = "Print a script processable digest of all flags, per object type";
+static void dumpoflg(void *ctx, unsigned long flg, const pcb_flag_bits_t *fb)
+{
+	printf("	%lx	%s	%s\n", flg, fb->name, fb->help);
+}
+fgw_error_t pcb_act_DumpObjFlags(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	unsigned long ot, max = PCB_OBJ_CLASS_REAL + 1;
+
+	for(ot = 1; ot < max; ot <<= 1) {
+		const char *name = pcb_obj_type_name(ot);
+
+		if (*name == '<')
+			continue;
+		printf("%s\n", name);
+		pcb_strflg_map(0x7fffffff, ot, NULL, dumpoflg);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_System[] = "System(shell_cmd)";
+static const char pcb_acth_System[] = "Run shell command";
+fgw_error_t pcb_act_System(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char tmp[128];
+	const char *cmd;
+
+	PCB_ACT_CONVARG(1, FGW_STR, System, cmd = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	pcb_setenv("PCB_RND_BOARD_FILE_NAME", PCB->Filename == NULL ? "" : PCB->Filename, 1);
+	pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.X);
+	pcb_setenv("PCB_RND_CROSSHAIR_X_MM", tmp, 1);
+	pcb_snprintf(tmp, sizeof(tmp), "%mm", pcb_crosshair.Y);
+	pcb_setenv("PCB_RND_CROSSHAIR_Y_MM", tmp, 1);
+	pcb_setenv("PCB_RND_CURRENT_LAYER_NAME", CURRENT->name, 1);
+	PCB_ACT_IRES(pcb_system(cmd));
+	return 0;
+}
+
+static const char pcb_acts_ExecuteFile[] = "ExecuteFile(filename)";
+static const char pcb_acth_ExecuteFile[] = "Run actions from the given file.";
+/* %start-doc actions ExecuteFile
+
+Lines starting with @code{#} are ignored.
+
+%end-doc */
+fgw_error_t pcb_act_ExecuteFile(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	FILE *fp;
+	const char *fname;
+	char line[256];
+	int n = 0;
+	char *sp;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ExecuteFile, fname = argv[1].val.str);
+
+	if ((fp = pcb_fopen(fname, "r")) == NULL) {
+		fprintf(stderr, _("Could not open actions file \"%s\".\n"), fname);
+		return 1;
+	}
+
+	defer_updates = 1;
+	defer_needs_update = 0;
+	while (fgets(line, sizeof(line), fp) != NULL) {
+		n++;
+		sp = line;
+
+		/* eat the trailing newline */
+		while (*sp && *sp != '\r' && *sp != '\n')
+			sp++;
+		*sp = '\0';
+
+		/* eat leading spaces and tabs */
+		sp = line;
+		while (*sp && (*sp == ' ' || *sp == '\t'))
+			sp++;
+
+		/*
+		 * if we have anything left and its not a comment line
+		 * then execute it
+		 */
+
+		if (*sp && *sp != '#') {
+			/*pcb_message("%s : line %-3d : \"%s\"\n", fname, n, sp); */
+			pcb_parse_actions(sp);
+		}
+	}
+
+	defer_updates = 0;
+	if (defer_needs_update) {
+		pcb_undo_inc_serial();
+		pcb_gui->invalidate_all();
+	}
+	fclose(fp);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t main_action_list[] = {
+	{"PrintActions", pcb_act_PrintActions, pcb_acth_PrintActions, pcb_acts_PrintActions},
+	{"DumpActions", pcb_act_DumpActions, pcb_acth_DumpActions, pcb_acts_DumpActions},
+	{"PrintUsage", pcb_act_PrintUsage, pcb_acth_PrintUsage, pcb_acts_PrintUsage},
+	{"PrintVersion", pcb_act_PrintVersion, pcb_acth_PrintVersion, pcb_acts_PrintVersion},
+	{"PrintCopyright", pcb_act_PrintCopyright, pcb_acth_PrintCopyright, pcb_acts_PrintCopyright},
+	{"PrintPaths", pcb_act_PrintPaths, pcb_acth_PrintPaths, pcb_acts_PrintPaths},
+	{"PrintFiles", pcb_act_PrintFiles, pcb_acth_PrintFiles, pcb_acts_PrintFiles},
+	{"DumpPlugins", pcb_act_DumpPlugins, pcb_acth_DumpPlugins, pcb_acts_DumpPlugins},
+	{"DumpPluginDirs", pcb_act_DumpPluginDirs, pcb_acth_DumpPluginDirs, pcb_acts_DumpPluginDirs},
+	{"DumpObjFlags", pcb_act_DumpObjFlags, pcb_acth_DumpObjFlags, pcb_acts_DumpObjFlags},
+	{"System", pcb_act_System, pcb_acth_System, pcb_acts_System},
+	{"ExecCommand", pcb_act_System, pcb_acth_System, pcb_acts_System},
+	{"ExecuteFile", pcb_act_ExecuteFile, pcb_acth_ExecuteFile, pcb_acts_ExecuteFile}
+};
+
+PCB_REGISTER_ACTIONS(main_action_list, NULL)
Index: tags/2.0.1/src/math_helper.h
===================================================================
--- tags/2.0.1/src/math_helper.h	(nonexistent)
+++ tags/2.0.1/src/math_helper.h	(revision 18980)
@@ -0,0 +1,70 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include <math.h>
+
+/* ---------------------------------------------------------------------------
+ * some math constants
+ */
+#ifndef	M_PI
+#define	M_PI			3.14159265358979323846
+#endif
+#ifndef M_SQRT1_2
+#define M_SQRT1_2 		0.707106781	/* 1/sqrt(2) */
+#endif
+#define	PCB_M180			(M_PI/180.0)
+#define PCB_RAD_TO_DEG		(180.0/M_PI)
+#define	PCB_TAN_22_5_DEGREE_2	0.207106781	/* 0.5*tan(22.5) */
+#define PCB_COS_22_5_DEGREE		0.923879533	/* cos(22.5) */
+#define	PCB_TAN_30_DEGREE		0.577350269	/* tan(30) */
+#define	PCB_TAN_60_DEGREE		1.732050808	/* tan(60) */
+#define PCB_LN_2_OVER_2		0.346573590
+#define PCB_TO_RADIANS(degrees)	(PCB_M180 * (degrees))
+#define PCB_SQRT2	1.41421356237309504880	/* sqrt(2) */
+
+#define PCB_CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
+#define PCB_ABS(a)	   (((a) < 0) ? -(a) : (a))
+#define PCB_SQUARE(x)          ((float) (x) * (float) (x))
+
+/* ---------------------------------------------------------------------------
+ * misc macros, some might already be defined by <limits.h>
+ */
+#ifndef	MIN
+#define	MIN(a,b)		((a) < (b) ? (a) : (b))
+#define	MAX(a,b)		((a) > (b) ? (a) : (b))
+#endif
+#ifndef SGN
+#define SGN(a)			((a) >0 ? 1 : ((a) == 0 ? 0 : -1))
+#endif
+#define PCB_SGNZ(a)                 ((a) >=0 ? 1 : -1)
+#define PCB_MAKE_MIN(a,b)            if ((b) < (a)) (a) = (b)
+#define PCB_MAKE_MAX(a,b)            if ((b) > (a)) (a) = (b)
+
+
+#define	PCB_SWAP_SIGN_X(x)		(x)
+#define	PCB_SWAP_SIGN_Y(y)		(-(y))
Index: tags/2.0.1/src/misc_util.c
===================================================================
--- tags/2.0.1/src/misc_util.c	(nonexistent)
+++ tags/2.0.1/src/misc_util.c	(revision 18980)
@@ -0,0 +1,232 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* misc functions used by several modules
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <genvector/gds_char.h>
+#include <math.h>
+#include <ctype.h>
+#include "misc_util.h"
+#include "unit.h"
+
+/* pcb_distance() should be used so that there is only one
+ *  place to deal with overflow/precision errors
+ */
+double pcb_distance(double x1, double y1, double x2, double y2)
+{
+	double delta_x = (x2 - x1);
+	double delta_y = (y2 - y1);
+	return sqrt(delta_x * delta_x + delta_y * delta_y);
+}
+
+/* pcb_distance2() should be used so that there is only one
+ *  place to deal with overflow/precision errors
+ */
+double pcb_distance2(double x1, double y1, double x2, double y2)
+{
+	double delta_x = (x2 - x1);
+	double delta_y = (y2 - y1);
+	return delta_x * delta_x + delta_y * delta_y;
+}
+
+double pcb_get_value(const char *val, const char *units, pcb_bool * absolute, pcb_bool *success)
+{
+	return pcb_get_value_ex(val, units, absolute, NULL, "cmil", success);
+}
+
+pcb_bool pcb_get_value_unit(const char *val, pcb_bool *absolute, int unit_strict, double *val_out, const pcb_unit_t **unit_out)
+{
+	int ul = strspn(val, "0123456789.");
+	if ((ul > 0) && (val[ul] != '\0')) {
+		const char *unit = val+ul;
+		const pcb_unit_t *u;
+
+		while(isspace(*unit)) unit++;
+		if (*unit == '\0')
+			goto err;
+		else if ((unit[0] == 'm') && (unit[1] == '\0')) {
+			/* corner case: mil and mm starts with m, and we rarely want to specify anything in meter, so ignore it */
+			goto err;
+		}
+
+		u = get_unit_struct_(unit, unit_strict);
+		if (u != NULL) {
+			pcb_bool succ;
+			double crd;
+
+			crd = pcb_get_value(val, unit, NULL, &succ);
+			if (succ) {
+				*val_out = crd;
+				*unit_out = u;
+				return pcb_true;
+			}
+		}
+	}
+
+	err:;
+		*val_out = 0;
+		*unit_out = NULL;
+		return pcb_false;
+}
+
+
+double pcb_get_value_ex(const char *val, const char *units, pcb_bool * absolute, pcb_unit_list_t extra_units, const char *default_unit, pcb_bool *success)
+{
+	double value;
+	int n = -1;
+	pcb_bool scaled = 0;
+	pcb_bool dummy;
+
+	/* Allow NULL to be passed for absolute */
+	if (absolute == NULL)
+		absolute = &dummy;
+
+	/* if the first character is a sign we have to add the
+	 * value to the current one
+	 */
+	if (*val == '=') {
+		*absolute = pcb_true;
+		sscanf(val + 1, "%lf%n", &value, &n);
+		n++;
+	}
+	else {
+		if (isdigit((int) *val))
+			*absolute = pcb_true;
+		else
+			*absolute = pcb_false;
+		sscanf(val, "%lf%n", &value, &n);
+	}
+	if (n <= 0)
+		goto fail;
+
+	if (!units && n > 0)
+		units = val + n;
+
+	while (units && isspace(*units))
+		units++;
+
+	if (units && *units) {
+		int i, unit_ok = 0;
+		const pcb_unit_t *unit = get_unit_struct(units);
+		if (unit != NULL) {
+			value = pcb_unit_to_coord(unit, value);
+			scaled = 1;
+			unit_ok = 1;
+		}
+		if (extra_units) {
+			for (i = 0; *extra_units[i].suffix; ++i) {
+				if (strncmp(units, extra_units[i].suffix, strlen(extra_units[i].suffix)) == 0) {
+					value *= extra_units[i].scale;
+					if (extra_units[i].flags & PCB_UNIT_PERCENT)
+						value /= 100.0;
+					scaled = 1;
+					unit_ok = 1;
+				}
+			}
+		}
+		if ((!unit_ok) && (success != NULL)) /* there was something after the number but it doesn't look like a valid unit */
+			goto fail;
+	}
+
+	/* Apply default unit */
+	if (!scaled && default_unit && *default_unit) {
+		int i;
+		const pcb_unit_t *unit = get_unit_struct(default_unit);
+		if (extra_units)
+			for (i = 0; *extra_units[i].suffix; ++i)
+				if (strcmp(extra_units[i].suffix, default_unit) == 0) {
+					value *= extra_units[i].scale;
+					if (extra_units[i].flags & PCB_UNIT_PERCENT)
+						value /= 100.0;
+					scaled = 1;
+				}
+		if (!scaled && unit != NULL)
+			value = pcb_unit_to_coord(unit, value);
+	}
+
+	if (success != NULL)
+		*success = 1;
+	return value;
+
+	fail:;
+	if (success != NULL)
+		*success = 0;
+	return 0;
+}
+
+char *pcb_concat(const char *first, ...)
+{
+	gds_t buf;
+	va_list a;
+	const char *s;
+
+	gds_init(&buf);
+	va_start(a, first);
+	for(s = first; s != NULL; s = va_arg(a, const char *))
+		gds_append_str(&buf, s);
+	va_end(a);
+	return buf.array;
+}
+
+/* ---------------------------------------------------------------------------
+ * strips leading and trailing blanks from the passed string and
+ * returns a pointer to the new 'duped' one or NULL if the old one
+ * holds only white space characters
+ */
+char *pcb_strdup_strip_wspace(const char *S)
+{
+	const char *p1, *p2;
+	char *copy;
+	size_t length;
+
+	if (!S || !*S)
+		return NULL;
+
+	/* strip leading blanks */
+	for (p1 = S; *p1 && isspace((int) *p1); p1++);
+
+	/* strip trailing blanks and get string length */
+	length = strlen(p1);
+	for (p2 = p1 + length - 1; length && isspace((int) *p2); p2--, length--);
+
+	/* string is not empty -> allocate memory */
+	if (length) {
+		copy = (char *) realloc(NULL, length + 1);
+		strncpy(copy, p1, length);
+		copy[length] = '\0';
+		return copy;
+	}
+	else
+		return NULL;
+}
Index: tags/2.0.1/src/misc_util.h
===================================================================
--- tags/2.0.1/src/misc_util.h	(nonexistent)
+++ tags/2.0.1/src/misc_util.h	(revision 18980)
@@ -0,0 +1,64 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* misc - independent of PCB data types */
+
+#ifndef	PCB_MISC_UTIL_H
+#define	PCB_MISC_UTIL_H
+
+#include "unit.h"
+#include "pcb_bool.h"
+
+double pcb_distance(double x1, double y1, double x2, double y2);
+double pcb_distance2(double x1, double y1, double x2, double y2);	/* distance square */
+
+enum pcb_unit_flags_e { PCB_UNIT_PERCENT = 1 };
+
+typedef struct {
+	const char *suffix;
+	double scale;
+	enum pcb_unit_flags_e flags;
+} pcb_unit_list_t[];
+
+/* Convert string to coords; if units is not NULL, it's the caller supplied unit
+   string; absolute is set to false if non-NULL and val starts with + or -.
+   success indicates whether the conversion was successful. */
+double pcb_get_value(const char *val, const char *units, pcb_bool *absolute, pcb_bool *success);
+double pcb_get_value_ex(const char *val, const char *units, pcb_bool * absolute, pcb_unit_list_t extra_units, const char *default_unit, pcb_bool *success);
+
+/* Convert a string of value+unit to coords and unit struct. Absolute is the same
+   as above; if unit_strict is non-zero, require full unit name. Returns whether
+   the conversion is succesful. */
+pcb_bool pcb_get_value_unit(const char *val, pcb_bool *absolute, int unit_strict, double *val_out, const pcb_unit_t **unit_out);
+
+char *pcb_concat(const char *first, ...); /* end with NULL */
+int pcb_mem_any_set(unsigned char *ptr, int bytes);
+
+char *pcb_strdup_strip_wspace(const char *S);
+
+#endif
Index: tags/2.0.1/src/move.c
===================================================================
--- tags/2.0.1/src/move.c	(nonexistent)
+++ tags/2.0.1/src/move.c	(revision 18980)
@@ -0,0 +1,252 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdlib.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "move.h"
+#include "select.h"
+#include "undo.h"
+#include "event.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_text_op.h"
+#include "obj_subc_op.h"
+#include "obj_poly_op.h"
+#include "obj_pstk_op.h"
+#include "obj_rat_op.h"
+
+pcb_opfunc_t MoveFunctions = {
+	pcb_lineop_move,
+	pcb_textop_move,
+	pcb_polyop_move,
+	pcb_lineop_move_point,
+	pcb_polyop_move_point,
+	pcb_arcop_move,
+	NULL,
+	NULL,
+	pcb_subcop_move,
+	pcb_pstkop_move
+};
+
+pcb_opfunc_t MoveFunctions_noclip = {
+	pcb_lineop_move_noclip,
+	pcb_textop_move_noclip,
+	pcb_polyop_move_noclip,
+	NULL,
+	NULL,
+	pcb_arcop_move_noclip,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	pcb_pstkop_move_noclip
+};
+
+pcb_opfunc_t ClipFunctions = {
+	pcb_lineop_clip,
+	pcb_textop_clip,
+	pcb_polyop_clip,
+	NULL,
+	NULL,
+	pcb_arcop_clip,
+	NULL,
+	NULL,
+	NULL, /* subc */
+	pcb_pstkop_clip
+};
+
+static pcb_opfunc_t MoveToLayerFunctions = {
+	pcb_lineop_move_to_layer,
+	pcb_textop_move_to_layer,
+	pcb_polyop_move_to_layer,
+	NULL,
+	NULL,
+	pcb_arcop_move_to_layer,
+	pcb_ratop_move_to_layer,
+	NULL,
+	NULL, /* subc */
+	NULL  /* padstack */
+};
+
+void *pcb_move_obj(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY)
+{
+	void *result;
+	pcb_opctx_t ctx;
+
+	ctx.move.pcb = PCB;
+	ctx.move.dx = DX;
+	ctx.move.dy = DY;
+	pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, DX, DY);
+	result = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	return result;
+}
+
+void *pcb_move_obj_and_rubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY)
+{
+	pcb_opctx_t ctx;
+	void *ptr2;
+
+	if ((DX == 0) && (DY == 0) && (conf_core.editor.move_linepoint_uses_route == 0))
+		return NULL;
+
+	ctx.move.pcb = PCB;
+	ctx.move.dx = DX;
+	ctx.move.dy = DY;
+
+	pcb_draw_inhibit_inc();
+
+	switch(Type) {
+		case PCB_OBJ_ARC_POINT:
+			{
+				/* Get the initial arc point positions */
+				pcb_arc_t * p_arc = ((pcb_arc_t *)pcb_crosshair.AttachedObject.Ptr2);
+				pcb_coord_t ox1,ox2,oy1,oy2;
+				pcb_coord_t nx1,nx2,ny1,ny2;
+
+				pcb_arc_get_end(p_arc,0, &ox1, &oy1);
+				pcb_arc_get_end(p_arc,1, &ox2, &oy2);
+
+				/* moving the endpoint of an arc is not really a move, but a change of arc properties */
+				if (pcb_crosshair.AttachedObject.radius == 0)
+					pcb_arc_set_angles((pcb_layer_t *)Ptr1, (pcb_arc_t *)Ptr2,
+								 pcb_crosshair.AttachedObject.start_angle,
+								 pcb_crosshair.AttachedObject.delta_angle);
+				else
+					pcb_arc_set_radii((pcb_layer_t *)Ptr1, (pcb_arc_t *)Ptr2,
+								pcb_crosshair.AttachedObject.radius,
+								pcb_crosshair.AttachedObject.radius);
+				pcb_crosshair.AttachedObject.radius = 0;
+
+				/* Get the new arc point positions so that we can calculate the position deltas */
+				pcb_arc_get_end(p_arc,0, &nx1, &ny1);
+				pcb_arc_get_end(p_arc,1, &nx2, &ny2);
+				pcb_event(PCB_EVENT_RUBBER_MOVE, "icccc", 0, nx1-ox1, ny1-oy1, nx2-ox2, ny2-oy2);
+			}
+			break;
+
+		case PCB_OBJ_ARC:
+			pcb_event(PCB_EVENT_RUBBER_MOVE, "icccc", 0, DX, DY, DX, DY);
+			pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, DX, DY);
+			ptr2 = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+			break;
+
+		case PCB_OBJ_LINE_POINT :
+			pcb_event(PCB_EVENT_RUBBER_MOVE, "icc", 0, DX, DY);
+			ptr2 = pcb_lineop_move_point_with_route(&ctx, Ptr1, Ptr2, Ptr3);
+			break;
+
+		case PCB_OBJ_LINE:
+			{
+				pcb_coord_t dx1 = DX;
+				pcb_coord_t dy1 = DY;
+				pcb_coord_t dx2 = DX;
+				pcb_coord_t dy2 = DY;
+				pcb_line_t *line = (pcb_line_t*) Ptr2;
+				int constrained = 0;
+
+				if(conf_core.editor.rubber_band_keep_midlinedir)
+					pcb_event(PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, "pppppp", line, &constrained, &dx1, &dy1, &dx2, &dy2);
+				pcb_event(PCB_EVENT_RUBBER_MOVE, "icccc", constrained, dx1, dy1, dx2, dy2);
+
+				ctx.move.dx = dx1;
+				ctx.move.dy = dy1;
+
+				/* If the line ends have moved indpendently then move the individual points */
+				if((dx1 != dx2) || (dy1 != dy2)) {
+					/* Move point1 form line */
+					pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT,
+							 Ptr1, line, &line->Point1,
+							 dx1, dy1);
+					pcb_lineop_move_point(&ctx, Ptr1, line, &line->Point1);
+
+					/* Move point2 form line */
+					pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT,
+								 Ptr1, line, &line->Point2,
+								 dx2, dy2);
+					ctx.move.dx = dx2;
+					ctx.move.dy = dy2;
+					ptr2 = pcb_lineop_move_point(&ctx, Ptr1, line, &line->Point2);
+				}
+				/* Otherwise make a normal move */
+				else {
+					pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, dx1, dy1);
+					ptr2 = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+				}
+			}
+			break;
+
+		default:
+			pcb_event(PCB_EVENT_RUBBER_MOVE, "icc", 0, DX, DY);
+			pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, DX, DY);
+			ptr2 = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+			break;
+	}
+
+	pcb_undo_inc_serial();
+
+	pcb_draw_inhibit_dec();
+	pcb_draw();
+
+	return ptr2;
+}
+
+void *pcb_move_obj_to_layer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_layer_t *Target, pcb_bool enmasse)
+{
+	void *result;
+	pcb_opctx_t ctx;
+
+	ctx.move.pcb = PCB;
+	ctx.move.dst_layer = Target;
+	ctx.move.more_to_come = enmasse;
+
+	result = pcb_object_operation(&MoveToLayerFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	pcb_undo_inc_serial();
+	return result;
+}
+
+pcb_bool pcb_move_selected_objs_to_layer(pcb_layer_t *Target)
+{
+	pcb_bool changed;
+	pcb_opctx_t ctx;
+
+	ctx.move.pcb = PCB;
+	ctx.move.dst_layer = Target;
+	ctx.move.more_to_come = pcb_true;
+
+	changed = pcb_selected_operation(PCB, PCB->Data, &MoveToLayerFunctions, &ctx, pcb_true, PCB_OBJ_ANY, pcb_false);
+	/* passing pcb_true to above operation causes Undoserial to auto-increment */
+	return changed;
+}
Index: tags/2.0.1/src/move.h
===================================================================
--- tags/2.0.1/src/move.h	(nonexistent)
+++ tags/2.0.1/src/move.h	(revision 18980)
@@ -0,0 +1,59 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_MOVE_H
+#define	PCB_MOVE_H
+
+#include "config.h"
+
+/*** Transformation macros and constants ***/
+#define	PCB_MOVE(xs,ys,deltax,deltay)							\
+	{														\
+		((xs) += (deltax));									\
+		((ys) += (deltay));									\
+	}
+
+#define	PCB_MOVE_TYPES	\
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_SUBC | \
+	PCB_OBJ_POLY | PCB_OBJ_POLY_POINT | PCB_OBJ_LINE_POINT | PCB_OBJ_ARC | PCB_OBJ_ARC_POINT)
+#define	PCB_MOVETOLAYER_TYPES	\
+	(PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_RAT | PCB_OBJ_ARC)
+
+
+/* undoably moves an object by relative DX and DY. Doesn't bump
+   the undo serial. Operation wrapper. The rubberband version also moves
+   or modifies connected objects. */
+void *pcb_move_obj(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY);
+void *pcb_move_obj_and_rubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY);
+
+/* undoably moves objects to a different layer. Doesn't bump
+   the undo serial. Operation wrapper. */
+void *pcb_move_obj_to_layer(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_layer_t *Target, pcb_bool enmasse);
+pcb_bool pcb_move_selected_objs_to_layer(pcb_layer_t *Target);
+
+#endif
Index: tags/2.0.1/src/netlist.c
===================================================================
--- tags/2.0.1/src/netlist.c	(nonexistent)
+++ tags/2.0.1/src/netlist.c	(revision 18980)
@@ -0,0 +1,325 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* generic netlist operations
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "error.h"
+#include "plug_io.h"
+#include "find.h"
+#include "rats.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "netlist.h"
+#include "event.h"
+#include "data.h"
+
+#define STEP_POINT 100
+
+/*
+  int    PCB->NetlistLib[n].MenuN
+  char * PCB->NetlistLib[n].Menu[i].Name
+     [0] == '*' (ok for rats) or ' ' (skip for rats)
+     [1] == unused
+     [2..] actual name
+  char * PCB->NetlistLib[n].Menu[i].Style
+  int    PCB->NetlistLib[n].Menu[i].EntryN
+  char * PCB->NetlistLib[n].Menu[i].Entry[j].ListEntry
+*/
+
+void pcb_netlist_changed(int force_unfreeze)
+{
+	if (force_unfreeze)
+		PCB->netlist_frozen = 0;
+	if (PCB->netlist_frozen)
+		PCB->netlist_needs_update = 1;
+	else {
+		PCB->netlist_needs_update = 0;
+		pcb_event(PCB_EVENT_NETLIST_CHANGED, NULL);
+	}
+}
+
+pcb_lib_menu_t *pcb_netnode_to_netname(const char *nodename)
+{
+	int i, j;
+	/*printf("nodename [%s]\n", nodename); */
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		for (j = 0; j < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].EntryN; j++) {
+			if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Entry[j].ListEntry, nodename) == 0) {
+				/*printf(" in [%s]\n", PCB->NetlistLib.Menu[i].Name); */
+				return &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i]);
+			}
+		}
+	}
+	return 0;
+}
+
+pcb_lib_menu_t *pcb_netname_to_netname(const char *netname)
+{
+	int i;
+
+	if ((netname[0] == '*' || netname[0] == ' ') && netname[1] == ' ') {
+		/* Looks like we were passed an internal netname, skip the prefix */
+		netname += 2;
+	}
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name + 2, netname) == 0) {
+			return &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i]);
+		}
+	}
+	return 0;
+}
+
+int pcb_pin_name_to_xy(pcb_lib_entry_t * pin, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_connection_t conn;
+	if (!pcb_rat_seek_pad(pin, &conn, pcb_false))
+		return 1;
+	pcb_obj_center(conn.obj, x, y);
+	return 0;
+}
+
+void pcb_netlist_find(pcb_lib_menu_t * net, pcb_lib_entry_t * pin)
+{
+	pcb_coord_t x, y;
+	if (pcb_pin_name_to_xy(net->Entry, &x, &y))
+		return;
+	pcb_lookup_conn(x, y, 1, 1, PCB_FLAG_FOUND);
+}
+
+void pcb_netlist_select(pcb_lib_menu_t * net, pcb_lib_entry_t * pin)
+{
+	pcb_coord_t x, y;
+	if (pcb_pin_name_to_xy(net->Entry, &x, &y))
+		return;
+	pcb_lookup_conn(x, y, 1, 1, PCB_FLAG_SELECTED);
+}
+
+void pcb_netlist_rats(pcb_lib_menu_t * net, pcb_lib_entry_t * pin)
+{
+	net->Name[0] = ' ';
+	net->flag = 1;
+	pcb_netlist_changed(0);
+}
+
+void pcb_netlist_norats(pcb_lib_menu_t * net, pcb_lib_entry_t * pin)
+{
+	net->Name[0] = '*';
+	net->flag = 0;
+	pcb_netlist_changed(0);
+}
+
+/* The primary purpose of this action is to remove the netlist
+   completely so that a new one can be loaded, usually via a gsch2pcb
+   style script.  */
+void pcb_netlist_clear(pcb_lib_menu_t * net, pcb_lib_entry_t * pin)
+{
+	pcb_lib_t *netlist = (pcb_lib_t *) & PCB->NetlistLib;
+	int ni, pi;
+
+	if (net == 0) {
+		/* Clear the entire netlist. */
+		for (ni = 0; ni < PCB_NUM_NETLISTS; ni++)
+			pcb_lib_free(&(PCB->NetlistLib[ni]));
+	}
+	else if (pin == 0) {
+		/* Remove a net from the netlist. */
+		ni = net - netlist->Menu;
+		if (ni >= 0 && ni < netlist->MenuN) {
+			/* if there is exactly one item, MenuN is 1 and ni is 0 */
+			if (netlist->MenuN - ni > 1)
+				memmove(net, net + 1, (netlist->MenuN - ni - 1) * sizeof(*net));
+			netlist->MenuN--;
+		}
+	}
+	else {
+		/* Remove a pin from the given net.  Note that this may leave an
+		   empty net, which is different than removing the net
+		   (above).  */
+		pi = pin - net->Entry;
+		if (pi >= 0 && pi < net->EntryN) {
+			/* if there is exactly one item, MenuN is 1 and ni is 0 */
+			if (net->EntryN - pi > 1)
+				memmove(pin, pin + 1, (net->EntryN - pi - 1) * sizeof(*pin));
+			net->EntryN--;
+		}
+	}
+	pcb_netlist_changed(0);
+}
+
+void pcb_netlist_style(pcb_lib_menu_t * net, const char *style)
+{
+	free(net->Style);
+	net->Style = pcb_strdup_null((char *) style);
+}
+
+pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pin)
+{
+	int n;
+
+	for (n = 0; n < pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++) {
+		pcb_lib_menu_t *menu = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
+		int p;
+		for (p = 0; p < menu->EntryN; p++) {
+			pcb_lib_entry_t *entry = &menu->Entry[p];
+			if (strcmp(entry->ListEntry, pin) == 0)
+				return menu;
+		}
+	}
+	return NULL;
+}
+
+pcb_lib_menu_t *pcb_netlist_find_net4term(pcb_board_t *pcb, const pcb_any_obj_t *term)
+{
+	pcb_data_t *data;
+	pcb_subc_t *sc;
+	char pinname[256];
+	int len;
+
+	if (term->term == NULL)
+		return NULL;
+
+	if (term->parent_type == PCB_PARENT_LAYER)
+		data = term->parent.layer->parent.data;
+	else if (term->parent_type == PCB_PARENT_DATA)
+		data = term->parent.data;
+	else
+		return NULL;
+
+	if (data->parent_type != PCB_PARENT_SUBC)
+		return NULL;
+
+	sc = data->parent.subc;
+	if (sc->refdes == NULL)
+		return NULL;
+
+	len = pcb_snprintf(pinname, sizeof(pinname), "%s-%s", sc->refdes, term->term);
+	if (len >= sizeof(pinname))
+		return NULL;
+
+	return pcb_netlist_find_net4pinname(pcb, pinname);
+}
+
+
+pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, pcb_lib_menu_t *net)
+{
+	pcb_lib_menu_t *first = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[0];
+	pcb_lib_menu_t *last  = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN-1];
+	
+	if ((net < first) || (net > last))
+		return PCB_NETLIST_INVALID_INDEX;
+
+	return net - first;
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a subnet, allocates memory if necessary
+ */
+pcb_net_t *pcb_net_new(pcb_board_t *pcb, pcb_netlist_t *Netlist)
+{
+	pcb_net_t *net = Netlist->Net;
+
+	/* realloc new memory if necessary and clear it */
+	if (Netlist->NetN >= Netlist->NetMax) {
+		Netlist->NetMax += STEP_POINT;
+		net = (pcb_net_t *) realloc(net, Netlist->NetMax * sizeof(pcb_net_t));
+		Netlist->Net = net;
+		memset(net + Netlist->NetN, 0, STEP_POINT * sizeof(pcb_net_t));
+	}
+
+	net->type = PCB_OBJ_NET;
+	net->parent_type = PCB_PARENT_BOARD;
+	net->parent.board = pcb;
+	return (net + Netlist->NetN++);
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a net list, allocates memory if necessary
+ */
+pcb_netlist_t *pcb_netlist_new(pcb_netlist_list_t *Netlistlist)
+{
+	pcb_netlist_t *netlist = Netlistlist->NetList;
+
+	/* realloc new memory if necessary and clear it */
+	if (Netlistlist->NetListN >= Netlistlist->NetListMax) {
+		Netlistlist->NetListMax += STEP_POINT;
+		netlist = (pcb_netlist_t *) realloc(netlist, Netlistlist->NetListMax * sizeof(pcb_netlist_t));
+		Netlistlist->NetList = netlist;
+		memset(netlist + Netlistlist->NetListN, 0, STEP_POINT * sizeof(pcb_netlist_t));
+	}
+	return (netlist + Netlistlist->NetListN++);
+}
+
+/* ---------------------------------------------------------------------------
+ * frees memory used by a net
+ */
+void pcb_netlist_free(pcb_netlist_t *Netlist)
+{
+	if (Netlist) {
+		PCB_NET_LOOP(Netlist);
+		{
+			pcb_net_free(net);
+		}
+		PCB_END_LOOP;
+		free(Netlist->Net);
+		memset(Netlist, 0, sizeof(pcb_netlist_t));
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * frees memory used by a net list
+ */
+void pcb_netlist_list_free(pcb_netlist_list_t *Netlistlist)
+{
+	if (Netlistlist) {
+		PCB_NETLIST_LOOP(Netlistlist);
+		{
+			pcb_netlist_free(netlist);
+		}
+		PCB_END_LOOP;
+		free(Netlistlist->NetList);
+		memset(Netlistlist, 0, sizeof(pcb_netlist_list_t));
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * frees memory used by a subnet
+ */
+void pcb_net_free(pcb_net_t *Net)
+{
+	if (Net) {
+		free(Net->Connection);
+		memset(Net, 0, sizeof(pcb_net_t));
+	}
+}
Index: tags/2.0.1/src/netlist.h
===================================================================
--- tags/2.0.1/src/netlist.h	(nonexistent)
+++ tags/2.0.1/src/netlist.h	(revision 18980)
@@ -0,0 +1,114 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_NETLIST_H
+#define PCB_NETLIST_H
+
+/* generic netlist operations */
+#include "config.h"
+#include "library.h"
+#include "route_style.h"
+#include "obj_common.h"
+
+struct pcb_net_s {								/* holds a net of connections */
+	PCB_ANY_OBJ_FIELDS;
+	pcb_cardinal_t ConnectionN,					/* the number of connections contained */
+	  ConnectionMax;							/* max connections from malloc */
+	pcb_connection_t *Connection;
+	pcb_route_style_t *Style;
+};
+
+typedef struct {								/* holds a list of nets */
+	pcb_cardinal_t NetN,								/* the number of subnets contained */
+	  NetMax;											/* max subnets from malloc */
+	pcb_net_t *Net;
+} pcb_netlist_t;
+
+typedef struct {								/* holds a list of net lists */
+	pcb_cardinal_t NetListN,						/* the number of net lists contained */
+	  NetListMax;									/* max net lists from malloc */
+	pcb_netlist_t *NetList;
+} pcb_netlist_list_t;
+
+
+void pcb_netlist_changed(int force_unfreeze);
+pcb_lib_menu_t *pcb_netnode_to_netname(const char *nodename);
+pcb_lib_menu_t *pcb_netname_to_netname(const char *netname);
+
+int pcb_pin_name_to_xy(pcb_lib_entry_t *pin, pcb_coord_t *x, pcb_coord_t *y);
+void pcb_netlist_find(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
+void pcb_netlist_select(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
+void pcb_netlist_rats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
+void pcb_netlist_norats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
+void pcb_netlist_clear(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
+void pcb_netlist_style(pcb_lib_menu_t *net, const char *style);
+
+/* Return the net entry for a pin name (slow search). The pin name is
+   like "U101-5", so element's refdes, dash, pin number */
+pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pinname);
+
+/* Same as pcb_netlist_find_net4pinname but with generic terminal pointer */
+pcb_lib_menu_t *pcb_netlist_find_net4term(pcb_board_t *pcb, const pcb_any_obj_t *term);
+
+
+/* Evaluate to const char * name of the network; lmt is (pcb_lib_menu_t *) */
+#define pcb_netlist_name(lmt) ((const char *)((lmt)->Name+2))
+
+/* Evaluate to 0 or 1 depending on whether the net is marked with *; lmt is (pcb_lib_menu_t *) */
+#define pcb_netlist_is_bad(lmt) (((lmt)->Name[0]) == '*')
+
+
+/* Return the index of the net or PCB_NETLIST_INVALID_INDEX if the net is not
+   on the netlist. NOTE: indices returned are valid only until the first
+   netlist change! */
+pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, pcb_lib_menu_t *net);
+
+#define PCB_NETLIST_INVALID_INDEX ((pcb_cardinal_t)(-1))
+
+pcb_net_t *pcb_net_new(pcb_board_t *pcb, pcb_netlist_t *);
+pcb_netlist_t *pcb_netlist_new(pcb_netlist_list_t *);
+void pcb_netlist_list_free(pcb_netlist_list_t *);
+void pcb_netlist_free(pcb_netlist_t *);
+void pcb_net_free(pcb_net_t *);
+
+#define PCB_NETLIST_LOOP(top) do   {                            \
+        pcb_cardinal_t        n;                                \
+        pcb_netlist_t *  netlist;                               \
+        for (n = (top)->NetListN-1; n != -1; n--)               \
+        {                                                       \
+                netlist = &(top)->NetList[n]
+
+#define PCB_NET_LOOP(top) do   {                                \
+        pcb_cardinal_t        n;                                \
+        pcb_net_t *  net;                                       \
+        for (n = (top)->NetN-1; n != -1; n--)                   \
+        {                                                       \
+                net = &(top)->Net[n]
+
+
+#endif
Index: tags/2.0.1/src/netlist_act.c
===================================================================
--- tags/2.0.1/src/netlist_act.c	(nonexistent)
+++ tags/2.0.1/src/netlist_act.c	(revision 18980)
@@ -0,0 +1,366 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* generic netlist operations
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <genregex/regex_sei.h>
+
+#include "funchash_core.h"
+#include "data.h"
+#include "board.h"
+#include "error.h"
+#include "plug_io.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "netlist.h"
+#include "data_it.h"
+
+static int pcb_netlist_swap()
+{
+	char *pins[3] = { NULL, NULL, NULL };
+	int next = 0, n;
+	int ret = -1;
+	pcb_lib_menu_t *nets[2];
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, o) && (o->term != NULL)) {
+				int le, lp;
+
+				if (next > 2) {
+					pcb_message(PCB_MSG_ERROR, "Exactly two terminals should be selected for swap (more than 2 selected at the moment)\n");
+					goto quit;
+				}
+
+				le = strlen(subc->refdes);
+				lp = strlen(o->term);
+				pins[next] = malloc(le + lp + 2);
+				sprintf(pins[next], "%s-%s", subc->refdes, o->term);
+				next++;
+			}
+		}
+	}
+	PCB_END_LOOP;
+
+	if (next < 2) {
+		pcb_message(PCB_MSG_ERROR, "Exactly two terminals should be selected for swap (less than 2 selected at the moment)\n");
+		goto quit;
+	}
+
+
+	nets[0] = pcb_netlist_find_net4pinname(PCB, pins[0]);
+	nets[1] = pcb_netlist_find_net4pinname(PCB, pins[1]);
+	if ((nets[0] == NULL) || (nets[1] == NULL)) {
+		pcb_message(PCB_MSG_ERROR, "That terminal is not on a net.\n");
+		goto quit;
+	}
+	if (nets[0] == nets[1]) {
+		pcb_message(PCB_MSG_ERROR, "Those two terminals are on the same net, can't swap them.\n");
+		goto quit;
+	}
+
+
+	pcb_ratspatch_append_optimize(PCB, RATP_DEL_CONN, pins[0], nets[0]->Name + 2, NULL);
+	pcb_ratspatch_append_optimize(PCB, RATP_DEL_CONN, pins[1], nets[1]->Name + 2, NULL);
+	pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pins[0], nets[1]->Name + 2, NULL);
+	pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pins[1], nets[0]->Name + 2, NULL);
+
+	/* TODO: not very efficient to regenerate the whole list... */
+	pcb_ratspatch_make_edited(PCB);
+	ret = 0;
+
+quit:;
+	for (n = 0; n < 3; n++)
+		if (pins[n] != NULL)
+			free(pins[n]);
+	return ret;
+}
+
+
+/* The primary purpose of this action is to rebuild a netlist from a
+   script, in conjunction with the clear action above.  */
+static int pcb_netlist_add(int patch, const char *netname, const char *pinname)
+{
+	int ni, pi;
+	pcb_lib_t *netlist = patch ? &PCB->NetlistLib[PCB_NETLIST_EDITED] : &PCB->NetlistLib[PCB_NETLIST_INPUT];
+	pcb_lib_menu_t *net = NULL;
+	pcb_lib_entry_t *pin = NULL;
+
+	if ((netname == NULL) || (pinname == NULL))
+		return -1;
+
+	if ((*netname == '\0') || (*pinname == '\0'))
+		return -1;
+
+	for (ni = 0; ni < netlist->MenuN; ni++) {
+		if (strcmp(netlist->Menu[ni].Name + 2, netname) == 0) {
+			net = &(netlist->Menu[ni]);
+			break;
+		}
+	}
+
+
+	if (net == NULL) {
+		if (!patch) {
+			net = pcb_lib_menu_new(netlist, NULL);
+			net->Name = pcb_strdup_printf("  %s", netname);
+			net->flag = 1;
+			PCB->netlist_needs_update=1;
+		}
+		else
+			net = pcb_lib_net_new(netlist, (char *) netname, NULL);
+	}
+
+	for (pi = 0; pi < net->EntryN; pi++) {
+		if (strcmp(net->Entry[pi].ListEntry, pinname) == 0) {
+			pin = &(net->Entry[pi]);
+			break;
+		}
+	}
+
+
+	if (pin == NULL) {
+		if (!patch) {
+			pcb_lib_entry_t *entry = pcb_lib_entry_new(net);
+			entry->ListEntry = pcb_strdup_printf("%s", pinname);
+			entry->ListEntry_dontfree = 0;
+			PCB->netlist_needs_update=1;
+		}
+		else {
+			pin = pcb_lib_conn_new(net, (char *) pinname);
+			pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pin->ListEntry, net->Name + 2, NULL);
+		}
+	}
+
+	pcb_netlist_changed(0);
+	return 0;
+}
+
+static const char pcb_acts_Netlist[] =
+	"Net(find|select|rats|norats|clear[,net[,pin]])\n" "Net(freeze|thaw|forcethaw)\n" "Net(swap)\n" "Net(add,net,pin)";
+
+static const char pcb_acth_Netlist[] = "Perform various actions on netlists.";
+
+/* %start-doc actions Netlist
+
+Each of these actions apply to a specified set of nets.  @var{net} and
+@var{pin} are patterns which match one or more nets or pins; these
+patterns may be full names or regular expressions.  If an exact match
+is found, it is the only match; if no exact match is found,
+@emph{then} the pattern is tried as a regular expression.
+
+If neither @var{net} nor @var{pin} are specified, all nets apply.  If
+@var{net} is specified but not @var{pin}, all nets matching @var{net}
+apply.  If both are specified, nets which match @var{net} and contain
+a pin matching @var{pin} apply.
+
+@table @code
+
+@item find
+Nets which apply are marked @emph{found} and are drawn in the
+@code{connected-color} color.
+
+@item select
+Nets which apply are selected.
+
+@item rats
+Nets which apply are marked as available for the rats nest.
+
+@item norats
+Nets which apply are marked as not available for the rats nest.
+
+@item clear
+Clears the netlist.
+
+@item add
+Add the given pin to the given netlist, creating either if needed.
+
+@item swap
+Swap the connections one end of two selected rats and pins.
+
+@item sort
+Called after a list of add's, this sorts the netlist.
+
+@item freeze
+@itemx thaw
+@itemx forcethaw
+Temporarily prevents changes to the netlist from being reflected in
+the GUI.  For example, if you need to make multiple changes, you
+freeze the netlist, make the changes, then thaw it.  Note that
+freeze/thaw requests may nest, with the netlist being fully thawed
+only when all pending freezes are thawed.  You can bypass the nesting
+by using forcethaw, which resets the freeze count and immediately
+updates the GUI.
+
+@end table
+
+%end-doc */
+
+typedef void (*NFunc) (pcb_lib_menu_t *, pcb_lib_entry_t *);
+
+static fgw_error_t pcb_act_Netlist(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	NFunc func;
+	const char *a1 = NULL, *a2 = NULL;
+	int op, i, j;
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *pin;
+	int net_found = 0;
+	int pin_found = 0;
+	int use_re = 0;
+	re_sei_t *regex;
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Netlist, op = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Netlist, a1 = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, Netlist, a2 = argv[3].val.str);
+	PCB_ACT_IRES(0);
+
+	if (!PCB)
+		return 1;
+
+	switch(op) {
+		case F_Find: func = pcb_netlist_find; break;
+		case F_Select: func = pcb_netlist_select; break;
+		case F_Rats: func = pcb_netlist_rats; break;
+		case F_NoRats: func = pcb_netlist_norats; break;
+		case F_Style: func = (NFunc) pcb_netlist_style; break;
+		case F_Swap: return pcb_netlist_swap(); break;
+		case F_Clear:
+			func = pcb_netlist_clear;
+			if (argc == 2) {
+				pcb_netlist_clear(NULL, NULL);
+				return 0;
+			}
+			break;
+		case F_Add:
+			/* Add is different, because the net/pin won't already exist.  */
+			return pcb_netlist_add(0, a1, a2);
+		case F_Sort:
+			pcb_sort_netlist();
+			pcb_ratspatch_make_edited(PCB);
+			return 0;
+		case F_Freeze:
+			PCB->netlist_frozen++;
+			return 0;
+		case F_Thaw:
+			if (PCB->netlist_frozen > 0) {
+				PCB->netlist_frozen--;
+				if (PCB->netlist_needs_update)
+					pcb_netlist_changed(0);
+			}
+			return 0;
+		case F_ForceThaw:
+			PCB->netlist_frozen = 0;
+			if (PCB->netlist_needs_update)
+				pcb_netlist_changed(0);
+			return 0;
+		default:
+			PCB_ACT_FAIL(Netlist);
+	}
+
+	if (argc > 2) {
+		use_re = 1;
+		for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN; i++) {
+			net = PCB->NetlistLib[PCB_NETLIST_INPUT].Menu + i;
+			if (pcb_strcasecmp(a1, net->Name + 2) == 0)
+				use_re = 0;
+		}
+		if (use_re) {
+			regex = re_sei_comp(a1);
+			if (re_sei_errno(regex) != 0) {
+				pcb_message(PCB_MSG_ERROR, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex)));
+				re_sei_free(regex);
+				return 1;
+			}
+		}
+	}
+
+/* This code is for changing the netlist style */
+	for (i = PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN - 1; i >= 0; i--) {
+		net = PCB->NetlistLib[PCB_NETLIST_INPUT].Menu + i;
+
+		if (argc > 1) {
+			if (use_re) {
+				if (re_sei_exec(regex, net->Name + 2) == 0)
+					continue;
+			}
+			else {
+				if (pcb_strcasecmp(net->Name + 2, a1))
+					continue;
+			}
+		}
+		net_found = 1;
+
+		pin = 0;
+		if (func == (NFunc) pcb_netlist_style) {
+			pcb_netlist_style(net, a2);
+		}
+		else if (argc > 3) {
+			int l = strlen(a2);
+			for (j = net->EntryN - 1; j >= 0; j--)
+				if (pcb_strcasecmp(net->Entry[j].ListEntry, a2) == 0
+						|| (pcb_strncasecmp(net->Entry[j].ListEntry, a2, l) == 0 && net->Entry[j].ListEntry[l] == '-')) {
+					pin = net->Entry + j;
+					pin_found = 1;
+					func(net, pin);
+				}
+		}
+		else
+			func(net, 0);
+	}
+
+	if (argc > 3 && !pin_found) {
+		pcb_gui->log("Net %s has no pin %s\n", a1, a2);
+		return 1;
+	}
+	else if (!net_found) {
+		pcb_gui->log("No net named %s\n", a1);
+	}
+
+	if (use_re)
+		re_sei_free(regex);
+
+	return 0;
+}
+
+pcb_action_t netlist_action_list[] = {
+	{"net", pcb_act_Netlist, pcb_acth_Netlist, pcb_acts_Netlist},
+	{"netlist", pcb_act_Netlist, pcb_acth_Netlist, pcb_acts_Netlist}
+};
+
+PCB_REGISTER_ACTIONS(netlist_action_list, NULL)
Index: tags/2.0.1/src/obj_arc.c
===================================================================
--- tags/2.0.1/src/obj_arc.c	(nonexistent)
+++ tags/2.0.1/src/obj_arc.c	(revision 18980)
@@ -0,0 +1,992 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: (elliptical) arc */
+
+
+#include "config.h"
+#include "compat_nls.h"
+#include "board.h"
+#include "data.h"
+#include "polygon.h"
+#include "undo.h"
+#include "rotate.h"
+#include "move.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "draw_wireframe.h"
+#include "hid_inlines.h"
+
+#include "obj_arc.h"
+#include "obj_arc_op.h"
+
+#include "obj_subc_parent.h"
+#include "obj_hash.h"
+
+/* TODO: could be removed if draw.c could be split up */
+#include "draw.h"
+#include "obj_arc_draw.h"
+
+
+static int pcb_arc_end_addr = 1;
+int *pcb_arc_start_ptr = NULL, *pcb_arc_end_ptr = &pcb_arc_end_addr;
+
+pcb_arc_t *pcb_arc_alloc(pcb_layer_t * layer)
+{
+	pcb_arc_t *new_obj;
+
+	new_obj = calloc(sizeof(pcb_arc_t), 1);
+	new_obj->type = PCB_OBJ_ARC;
+	new_obj->Attributes.post_change = pcb_obj_attrib_post_change;
+	PCB_SET_PARENT(new_obj, layer, layer);
+	arclist_append(&layer->Arc, new_obj);
+
+	return new_obj;
+}
+
+/* computes the bounding box of an arc */
+static pcb_box_t pcb_arc_bbox_(const pcb_arc_t *Arc, int mini)
+{
+	double ca1, ca2, sa1, sa2;
+	double minx, maxx, miny, maxy, delta;
+	pcb_angle_t ang1, ang2;
+	pcb_coord_t width;
+	pcb_box_t res;
+
+	/* first put angles into standard form:
+	 *  ang1 < ang2, both angles between 0 and 720 */
+	delta = PCB_CLAMP(Arc->Delta, -360, 360);
+
+	if (delta > 0) {
+		ang1 = pcb_normalize_angle(Arc->StartAngle);
+		ang2 = pcb_normalize_angle(Arc->StartAngle + delta);
+	}
+	else {
+		ang1 = pcb_normalize_angle(Arc->StartAngle + delta);
+		ang2 = pcb_normalize_angle(Arc->StartAngle);
+	}
+	if (ang1 > ang2)
+		ang2 += 360;
+	/* Make sure full circles aren't treated as zero-length arcs */
+	if (delta == 360 || delta == -360)
+		ang2 = ang1 + 360;
+
+	/* calculate sines, cosines */
+	sa1 = sin(PCB_M180 * ang1);
+	ca1 = cos(PCB_M180 * ang1);
+	sa2 = sin(PCB_M180 * ang2);
+	ca2 = cos(PCB_M180 * ang2);
+
+	minx = MIN(ca1, ca2);
+	maxx = MAX(ca1, ca2);
+	miny = MIN(sa1, sa2);
+	maxy = MAX(sa1, sa2);
+
+	/* Check for extreme angles */
+	if ((ang1 <= 0 && ang2 >= 0) || (ang1 <= 360 && ang2 >= 360))
+		maxx = 1;
+	if ((ang1 <= 90 && ang2 >= 90) || (ang1 <= 450 && ang2 >= 450))
+		maxy = 1;
+	if ((ang1 <= 180 && ang2 >= 180) || (ang1 <= 540 && ang2 >= 540))
+		minx = -1;
+	if ((ang1 <= 270 && ang2 >= 270) || (ang1 <= 630 && ang2 >= 630))
+		miny = -1;
+
+	/* Finally, calculate bounds, converting sane geometry into pcb geometry */
+	res.X1 = Arc->X - Arc->Width * maxx;
+	res.X2 = Arc->X - Arc->Width * minx;
+	res.Y1 = Arc->Y + Arc->Height * miny;
+	res.Y2 = Arc->Y + Arc->Height * maxy;
+
+	if (!mini) {
+		width = (Arc->Thickness + Arc->Clearance) / 2;
+		/* Adjust for our discrete polygon approximation */
+		width = (double) width *MAX(PCB_POLY_CIRC_RADIUS_ADJ, (1.0 + PCB_POLY_ARC_MAX_DEVIATION)) + 0.5;
+	}
+	else
+		width = Arc->Thickness / 2;
+
+	res.X1 -= width;
+	res.X2 += width;
+	res.Y1 -= width;
+	res.Y2 += width;
+	pcb_close_box(&res);
+	return res;
+}
+
+
+void pcb_arc_bbox(pcb_arc_t *Arc)
+{
+	Arc->BoundingBox = pcb_arc_bbox_(Arc, 0);
+	Arc->bbox_naked  = pcb_arc_bbox_(Arc, 1);
+}
+
+
+void pcb_arc_get_end(pcb_arc_t *Arc, int which, pcb_coord_t *x, pcb_coord_t *y)
+{
+	if (which == 0) {
+		*x = pcb_round((double)Arc->X - (double)Arc->Width * cos(Arc->StartAngle * PCB_M180));
+		*y = pcb_round((double)Arc->Y + (double)Arc->Height * sin(Arc->StartAngle * PCB_M180));
+	}
+	else {
+		*x = pcb_round((double)Arc->X - (double)Arc->Width * cos((Arc->StartAngle + Arc->Delta) * PCB_M180));
+		*y = pcb_round((double)Arc->Y + (double)Arc->Height * sin((Arc->StartAngle + Arc->Delta) * PCB_M180));
+	}
+}
+
+void pcb_arc_set_angles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da)
+{
+	if (new_da >= 360) {
+		new_da = 360;
+		new_sa = 0;
+	}
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
+	pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a);
+	pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, a, a, a);
+	a->StartAngle = new_sa;
+	a->Delta = new_da;
+	pcb_arc_bbox(a);
+	pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
+}
+
+
+void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height)
+{
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
+	pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a);
+	pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, a, a, a);
+	a->Width = new_width;
+	a->Height = new_height;
+	pcb_arc_bbox(a);
+	pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, a);
+}
+
+
+/* creates a new arc on a layer */
+pcb_arc_t *pcb_arc_new(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t width, pcb_coord_t height, pcb_angle_t sa, pcb_angle_t dir, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags, pcb_bool prevent_dups)
+{
+	pcb_arc_t *Arc;
+
+	if ((prevent_dups) && (Layer->arc_tree != NULL)) {
+		pcb_rtree_it_t it;
+		pcb_any_obj_t *o;
+		pcb_box_t b;
+
+		b.X1 = X1 - width;
+		b.Y1 = Y1 - height;
+		b.X2 = X1 + width;
+		b.Y2 = Y1 + height;
+
+		for(o = pcb_rtree_first(&it, Layer->arc_tree, (pcb_rtree_box_t *)&b); o != NULL; o = pcb_rtree_next(&it)) {
+			pcb_arc_t *arc = (pcb_arc_t *)o;
+#warning TODO: this does not catch all cases; there are more ways two arcs can be the same because of the angles
+			if (arc->X == X1 && arc->Y == Y1 && arc->Width == width && pcb_normalize_angle(arc->StartAngle) == pcb_normalize_angle(sa) && arc->Delta == dir)
+				return NULL; /* prevent stacked arcs */
+		}
+	}
+
+	Arc = pcb_arc_alloc(Layer);
+	if (!Arc)
+		return Arc;
+
+	Arc->ID = pcb_create_ID_get();
+	Arc->Flags = Flags;
+	Arc->Thickness = Thickness;
+	Arc->Clearance = Clearance;
+	Arc->X = X1;
+	Arc->Y = Y1;
+	Arc->Width = width;
+	Arc->Height = height;
+	Arc->StartAngle = sa;
+	Arc->Delta = dir;
+	pcb_add_arc_on_layer(Layer, Arc);
+	return Arc;
+}
+
+static pcb_arc_t *pcb_arc_copy_meta(pcb_arc_t *dst, pcb_arc_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	return dst;
+}
+
+
+pcb_arc_t *pcb_arc_dup(pcb_layer_t *dst, pcb_arc_t *src)
+{
+	pcb_arc_t *a = pcb_arc_new(dst, src->X, src->Y, src->Width, src->Height, src->StartAngle, src->Delta, src->Thickness, src->Clearance, src->Flags, pcb_false);
+	pcb_arc_copy_meta(a, src);
+	return a;
+}
+
+pcb_arc_t *pcb_arc_dup_at(pcb_layer_t *dst, pcb_arc_t *src, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_arc_t *a = pcb_arc_new(dst, src->X+dx, src->Y+dy, src->Width, src->Height, src->StartAngle, src->Delta, src->Thickness, src->Clearance, src->Flags, pcb_false);
+	pcb_arc_copy_meta(a, src);
+	return a;
+}
+
+
+void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_arc_bbox(Arc);
+	if (!Layer->arc_tree)
+		Layer->arc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+	Arc->type = PCB_OBJ_ARC;
+	PCB_SET_PARENT(Arc, layer, Layer);
+}
+
+
+
+void pcb_arc_free(pcb_arc_t * data)
+{
+	arclist_remove(data);
+	free(data);
+}
+
+
+int pcb_arc_eq(const pcb_host_trans_t *tr1, const pcb_arc_t *a1, const pcb_host_trans_t *tr2, const pcb_arc_t *a2)
+{
+	double sgn1 = tr1->on_bottom ? -1 : +1;
+	double sgn2 = tr2->on_bottom ? -1 : +1;
+
+	if (pcb_field_neq(a1, a2, Thickness) || pcb_field_neq(a1, a2, Clearance)) return 0;
+	if (pcb_field_neq(a1, a2, Width) || pcb_field_neq(a1, a2, Height)) return 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, a1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, a2)) {
+		if (pcb_neq_tr_coords(tr1, a1->X, a1->Y, tr2, a2->X, a2->Y)) return 0;
+		if (pcb_normalize_angle(pcb_round(a1->StartAngle + tr1->rot)) != pcb_normalize_angle(pcb_round(a2->StartAngle + tr2->rot))) return 0;
+		if (pcb_round(a1->Delta * sgn1) != pcb_round(a2->Delta * sgn2)) return 0;
+	}
+
+	return 1;
+}
+
+unsigned int pcb_arc_hash(const pcb_host_trans_t *tr, const pcb_arc_t *a)
+{
+	unsigned int crd = 0;
+	double sgn = tr->on_bottom ? -1 : +1;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, a)) {
+		pcb_coord_t x, y;
+		pcb_hash_tr_coords(tr, &x, &y, a->X, a->Y);
+		crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^
+			pcb_hash_coord(pcb_normalize_angle(pcb_round(a->StartAngle + tr->rot))) ^ pcb_hash_coord(pcb_round(a->Delta * sgn));
+	}
+
+	return
+		pcb_hash_coord(a->Thickness) ^ pcb_hash_coord(a->Clearance) ^
+		pcb_hash_coord(a->Width) ^ pcb_hash_coord(a->Height) ^ crd;
+}
+
+pcb_coord_t pcb_arc_length(const pcb_arc_t *arc)
+{
+	double da = arc->Delta;
+	double r = ((double)arc->Width + (double)arc->Height) / 2.0; /* TODO: lame approximation */
+	if (da < 0)
+		da = -da;
+	while(da > 360.0)
+		da = 360.0;
+	return pcb_round(2.0*r*M_PI*da/360.0);
+}
+
+double pcb_arc_area(const pcb_arc_t *arc)
+{
+	return
+		(pcb_arc_length(arc) * (double)arc->Thickness /* body */
+		+ (double)arc->Thickness * (double)arc->Thickness * (double)M_PI); /* cap circles */
+}
+
+pcb_box_t pcb_arc_mini_bbox(const pcb_arc_t *arc)
+{
+	return pcb_arc_bbox_(arc, 1);
+}
+
+void pcb_arc_pre(pcb_arc_t *arc)
+{
+	pcb_layer_t *ly = pcb_layer_get_real(arc->parent.layer);
+	if (ly == NULL)
+		return;
+	if (ly->arc_tree != NULL)
+		pcb_r_delete_entry(ly->arc_tree, (pcb_box_t *)arc);
+	pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc);
+}
+
+void pcb_arc_post(pcb_arc_t *arc)
+{
+	pcb_layer_t *ly = pcb_layer_get_real(arc->parent.layer);
+	if (ly == NULL)
+		return;
+	if (ly->arc_tree != NULL)
+		pcb_r_insert_entry(ly->arc_tree, (pcb_box_t *)arc);
+	pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_ARC, ly, arc);
+}
+
+
+/***** operations *****/
+
+/* copies an arc to buffer */
+void *pcb_arcop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)];
+	pcb_arc_t *a = pcb_arc_new(layer, Arc->X, Arc->Y,
+		Arc->Width, Arc->Height, Arc->StartAngle, Arc->Delta,
+		Arc->Thickness, Arc->Clearance, pcb_flag_mask(Arc->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg), pcb_false);
+
+	pcb_arc_copy_meta(a, Arc);
+	return a;
+}
+
+/* moves an arc between board and buffer */
+void *pcb_arcop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *dstly, pcb_arc_t *arc)
+{
+	pcb_layer_t *srcly = arc->parent.layer;
+
+	assert(arc->parent_type == PCB_PARENT_LAYER);
+	if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */
+		dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)];
+
+	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_ARC, srcly, arc);
+	pcb_r_delete_entry(srcly->arc_tree, (pcb_box_t *) arc);
+
+	arclist_remove(arc);
+	arclist_append(&dstly->Arc, arc);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, arc);
+
+	if (!dstly->arc_tree)
+		dstly->arc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dstly->arc_tree, (pcb_box_t *) arc);
+	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_ARC, dstly, arc);
+
+	PCB_SET_PARENT(arc, layer, dstly);
+
+	return arc;
+}
+
+/* changes the size of an arc */
+void *pcb_arcop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Arc->Thickness + ctx->chgsize.value;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
+		return NULL;
+	if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Arc->Thickness) {
+		pcb_undo_add_obj_to_size(PCB_OBJ_ARC, Layer, Arc, Arc);
+		pcb_arc_invalidate_erase(Arc);
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		Arc->Thickness = value;
+		pcb_arc_bbox(Arc);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_arc_invalidate_draw(Layer, Arc);
+		return Arc;
+	}
+	return NULL;
+}
+
+/* changes the clearance size of an arc */
+void *pcb_arcop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Arc->Clearance + ctx->chgsize.value;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
+		return NULL;
+	if (value < 0)
+		value = 0;
+	value = MIN(PCB_MAX_LINESIZE, value);
+	if (!ctx->chgsize.is_absolute && ctx->chgsize.value < 0 && value < conf_core.design.bloat * 2)
+		value = 0;
+	if (ctx->chgsize.value > 0 && value < conf_core.design.bloat * 2)
+		value = conf_core.design.bloat * 2 + 2;
+	if (value != Arc->Clearance) {
+		pcb_undo_add_obj_to_clear_size(PCB_OBJ_ARC, Layer, Arc, Arc);
+		pcb_arc_invalidate_erase(Arc);
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		Arc->Clearance = value;
+		pcb_arc_bbox(Arc);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_arc_invalidate_draw(Layer, Arc);
+		return Arc;
+	}
+	return NULL;
+}
+
+/* changes the radius of an arc (is_primary 0=width or 1=height or 2=both) */
+void *pcb_arcop_change_radius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_coord_t value, *dst;
+	void *a0, *a1;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
+		return NULL;
+
+	switch(ctx->chgsize.is_primary) {
+		case 0: dst = &Arc->Width; break;
+		case 1: dst = &Arc->Height; break;
+		case 2:
+			ctx->chgsize.is_primary = 0; a0 = pcb_arcop_change_radius(ctx, Layer, Arc);
+			ctx->chgsize.is_primary = 1; a1 = pcb_arcop_change_radius(ctx, Layer, Arc);
+			if ((a0 != NULL) || (a1 != NULL))
+				return Arc;
+			return NULL;
+	}
+
+	value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : (*dst) + ctx->chgsize.value;
+	value = MIN(PCB_MAX_ARCSIZE, MAX(value, PCB_MIN_ARCSIZE));
+	if (value != *dst) {
+		pcb_undo_add_obj_to_change_radii(PCB_OBJ_ARC, Layer, Arc, Arc);
+		pcb_arc_invalidate_erase(Arc);
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		*dst = value;
+		pcb_arc_bbox(Arc);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_arc_invalidate_draw(Layer, Arc);
+		return Arc;
+	}
+	return NULL;
+}
+
+/* changes the angle of an arc (is_primary 0=start or 1=end) */
+void *pcb_arcop_change_angle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_angle_t value, *dst;
+	void *a0, *a1;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
+		return NULL;
+
+	switch(ctx->chgangle.is_primary) {
+		case 0: dst = &Arc->StartAngle; break;
+		case 1: dst = &Arc->Delta; break;
+		case 2:
+			ctx->chgangle.is_primary = 0; a0 = pcb_arcop_change_angle(ctx, Layer, Arc);
+			ctx->chgangle.is_primary = 1; a1 = pcb_arcop_change_angle(ctx, Layer, Arc);
+			if ((a0 != NULL) || (a1 != NULL))
+				return Arc;
+			return NULL;
+	}
+
+	value = (ctx->chgangle.is_absolute) ? ctx->chgangle.value : (*dst) + ctx->chgangle.value;
+	if ((value > 360.0) || (value < -360.0))
+		value = fmod(value, 360.0);
+
+	if (value != *dst) {
+		pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, Layer, Arc, Arc);
+		pcb_arc_invalidate_erase(Arc);
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		*dst = value;
+		pcb_arc_bbox(Arc);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_arc_invalidate_draw(Layer, Arc);
+		return Arc;
+	}
+	return NULL;
+}
+
+/* changes the clearance flag of an arc */
+void *pcb_arcop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
+		return NULL;
+	pcb_arc_invalidate_erase(Arc);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) {
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_ARC, Layer, Arc, Arc, pcb_false);
+	}
+	pcb_undo_add_obj_to_flag(Arc);
+	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Arc);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) {
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_ARC, Layer, Arc, Arc, pcb_true);
+	}
+	pcb_arc_invalidate_draw(Layer, Arc);
+	return Arc;
+}
+
+/* sets the clearance flag of an arc */
+void *pcb_arcop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
+		return NULL;
+	return pcb_arcop_change_join(ctx, Layer, Arc);
+}
+
+/* clears the clearance flag of an arc */
+void *pcb_arcop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
+		return NULL;
+	return pcb_arcop_change_join(ctx, Layer, Arc);
+}
+
+/* copies an arc */
+void *pcb_arcop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_arc_t *arc;
+
+	arc = pcb_arc_new(Layer, Arc->X + ctx->copy.DeltaX,
+														Arc->Y + ctx->copy.DeltaY, Arc->Width, Arc->Height, Arc->StartAngle,
+														Arc->Delta, Arc->Thickness, Arc->Clearance, pcb_flag_mask(Arc->Flags, PCB_FLAG_FOUND), pcb_true);
+	if (!arc)
+		return arc;
+	pcb_arc_copy_meta(arc, Arc);
+	pcb_arc_invalidate_draw(Layer, arc);
+	pcb_undo_add_obj_to_create(PCB_OBJ_ARC, Layer, arc, arc);
+	return arc;
+}
+
+/* moves an arc */
+void *pcb_arcop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	if (Layer->meta.real.vis) {
+		pcb_arc_invalidate_erase(Arc);
+		pcb_arc_move(Arc, ctx->move.dx, ctx->move.dy);
+		pcb_arc_invalidate_draw(Layer, Arc);
+	}
+	else {
+		pcb_arc_move(Arc, ctx->move.dx, ctx->move.dy);
+	}
+	return Arc;
+}
+
+void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	pcb_arcop_move_noclip(ctx, Layer, Arc);
+	pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	return Arc;
+}
+
+void *pcb_arcop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	if (ctx->clip.restore) {
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	}
+	if (ctx->clip.clear) {
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	}
+	return Arc;
+}
+
+/* moves an arc between layers; lowlevel routines */
+void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination)
+{
+	pcb_r_delete_entry(Source->arc_tree, (pcb_box_t *) arc);
+
+	arclist_remove(arc);
+	arclist_append(&Destination->Arc, arc);
+
+	if (!Destination->arc_tree)
+		Destination->arc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Destination->arc_tree, (pcb_box_t *) arc);
+
+	PCB_SET_PARENT(arc, layer, Destination);
+
+	return arc;
+}
+
+
+/* moves an arc between layers */
+void *pcb_arcop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc)
+{
+	pcb_arc_t *newone;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) {
+		pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+		return NULL;
+	}
+	if (ctx->move.dst_layer == Layer && Layer->meta.real.vis)
+		pcb_arc_invalidate_draw(Layer, Arc);
+	if (ctx->move.dst_layer == Layer)
+		return Arc;
+	pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_ARC, Layer, Arc, Arc);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	if (Layer->meta.real.vis)
+		pcb_arc_invalidate_erase(Arc);
+	newone = (pcb_arc_t *) pcb_arcop_move_to_layer_low(ctx, Layer, Arc, ctx->move.dst_layer);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, ctx->move.dst_layer, Arc);
+	if (ctx->move.dst_layer->meta.real.vis)
+		pcb_arc_invalidate_draw(ctx->move.dst_layer, newone);
+	return newone;
+}
+
+/* destroys an arc from a layer */
+void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+
+	PCB_CLEAR_PARENT(Arc);
+	pcb_arc_free(Arc);
+
+	return NULL;
+}
+
+/* removes an arc from a layer */
+void *pcb_arcop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	/* erase from screen */
+	if (Layer->meta.real.vis)
+		pcb_arc_invalidate_erase(Arc);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_ARC, Layer, Arc, Arc);
+	return NULL;
+}
+
+void *pcb_arcop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id)
+{
+	return pcb_arcop_remove(ctx, l, a);
+}
+
+void *pcb_arc_destroy(pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	res = pcb_arcop_remove(&ctx, Layer, Arc);
+	pcb_draw();
+	return res;
+}
+
+/* rotates an arc */
+void pcb_arc_rotate90(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	pcb_coord_t save;
+
+	/* add Number*90 degrees (i.e., Number quarter-turns) */
+	Arc->StartAngle = pcb_normalize_angle(Arc->StartAngle + Number * 90);
+	PCB_COORD_ROTATE90(Arc->X, Arc->Y, X, Y, Number);
+
+	/* now change width and height */
+	if (Number == 1 || Number == 3) {
+		save = Arc->Width;
+		Arc->Width = Arc->Height;
+		Arc->Height = save;
+	}
+
+	/* can't optimize with box rotation due to closed boxes */
+	pcb_arc_bbox(Arc);
+}
+
+void pcb_arc_rotate(pcb_layer_t *layer, pcb_arc_t *arc, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle)
+{
+	if (layer->arc_tree != NULL)
+		pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *) arc);
+	pcb_rotate(&arc->X, &arc->Y, X, Y, cosa, sina);
+	arc->StartAngle = pcb_normalize_angle(arc->StartAngle + angle);
+	if (layer->arc_tree != NULL)
+		pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *) arc);
+}
+
+void pcb_arc_mirror(pcb_layer_t *layer, pcb_arc_t *arc, pcb_coord_t y_offs)
+{
+	if (layer->arc_tree != NULL)
+		pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *) arc);
+	arc->X = PCB_SWAP_X(arc->X);
+	arc->Y = PCB_SWAP_Y(arc->Y) + y_offs;
+	arc->StartAngle = PCB_SWAP_ANGLE(arc->StartAngle);
+	arc->Delta = PCB_SWAP_DELTA(arc->Delta);
+	pcb_arc_bbox(arc);
+	if (layer->arc_tree != NULL)
+		pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *) arc);
+}
+
+void pcb_arc_flip_side(pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *) arc);
+	arc->X = PCB_SWAP_X(arc->X);
+	arc->Y = PCB_SWAP_Y(arc->Y);
+	arc->StartAngle = PCB_SWAP_ANGLE(arc->StartAngle);
+	arc->Delta = PCB_SWAP_DELTA(arc->Delta);
+	pcb_arc_bbox(arc);
+	pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *) arc);
+}
+
+/* rotates an arc */
+void *pcb_arcop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_arc_invalidate_erase(Arc);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	if (Layer->arc_tree != NULL)
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+	pcb_arc_rotate90(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+	if (Layer->arc_tree != NULL)
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	pcb_arc_invalidate_draw(Layer, Arc);
+	return Arc;
+}
+
+void *pcb_arcop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_arc_invalidate_erase(Arc);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	pcb_arc_rotate(Layer, Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina, ctx->rotate.angle);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_ARC, Layer, Arc);
+	pcb_arc_invalidate_draw(Layer, Arc);
+	return Arc;
+}
+
+void *pcb_arc_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *arc)
+{
+	pcb_angle_t end_ang = arc->StartAngle + arc->Delta;
+	pcb_coord_t x = pcb_crosshair.X, y = pcb_crosshair.Y;
+	pcb_angle_t angle = atan2(-(y - arc->Y), (x - arc->X)) * 180.0 / M_PI + 180.0;
+	pcb_arc_t *new_arc;
+
+	if (end_ang > 360.0)
+		end_ang -= 360.0;
+	if (end_ang < -360.0)
+		end_ang += 360.0;
+
+	if ((arc->Delta < 0) || (arc->Delta > 180))
+		new_arc = pcb_arc_new(Layer, arc->X, arc->Y, arc->Width, arc->Height, angle, end_ang - angle + 360.0, arc->Thickness, arc->Clearance, arc->Flags, pcb_true);
+	else
+		new_arc = pcb_arc_new(Layer, arc->X, arc->Y, arc->Width, arc->Height, angle, end_ang - angle, arc->Thickness, arc->Clearance, arc->Flags, pcb_true);
+
+	if (new_arc != NULL) {
+		pcb_arc_copy_meta(new_arc, arc);
+		PCB_FLAG_CHANGE(PCB_CHGFLG_SET, PCB_FLAG_FOUND, new_arc);
+		if (arc->Delta < 0)
+			pcb_arc_set_angles(Layer, arc, arc->StartAngle, angle - arc->StartAngle - 360.0);
+		else
+			pcb_arc_set_angles(Layer, arc, arc->StartAngle, angle - arc->StartAngle);
+	}
+	return new_arc;
+}
+
+void *pcb_arcop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	static pcb_flag_values_t pcb_arc_flags = 0;
+	if (pcb_arc_flags == 0)
+		pcb_arc_flags = pcb_obj_valid_flags(PCB_OBJ_ARC);
+
+	if ((ctx->chgflag.flag & pcb_arc_flags) != ctx->chgflag.flag)
+		return NULL;
+	if ((ctx->chgflag.flag & PCB_FLAG_TERMNAME) && (Arc->term == NULL))
+		return NULL;
+	pcb_undo_add_obj_to_flag(Arc);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_ARC, Arc->parent.layer, Arc);
+
+	PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Arc);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_ARC, Arc->parent.layer, Arc);
+
+	return Arc;
+}
+
+void *pcb_arcop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	pcb_arc_name_invalidate_draw(arc);
+	return arc;
+}
+
+
+/*** draw ***/
+
+static void arc_label_pos(const pcb_arc_t *arc, pcb_coord_t *x0, pcb_coord_t *y0, pcb_bool_t *vert)
+{
+	double da, ea, la;
+
+	da = PCB_CLAMP(arc->Delta, -360, 360);
+	ea = arc->StartAngle + da;
+	while(ea < -360) ea += 360;
+	while(ea > +360) ea -= 360;
+
+	la = (arc->StartAngle+ea)/2.0;
+
+	*x0 = pcb_round((double)arc->X - (double)arc->Width * cos(la * PCB_M180));
+	*y0 = pcb_round((double)arc->Y + (double)arc->Height * sin(la * PCB_M180));
+	*vert = (((la < 45) && (la > -45)) || ((la > 135) && (la < 225)));
+}
+
+void pcb_arc_middle(const pcb_arc_t *arc, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_bool_t waste;
+	arc_label_pos(arc, x, y, &waste);
+}
+
+void pcb_arc_name_invalidate_draw(pcb_arc_t *arc)
+{
+	if (arc->term != NULL) {
+		pcb_text_t text;
+		pcb_coord_t x0, y0;
+		pcb_bool_t vert;
+
+		arc_label_pos(arc, &x0, &y0, &vert);
+		pcb_term_label_invalidate(x0, y0, 100.0, vert, pcb_true, arc->term, arc->intconn);
+	}
+}
+
+void pcb_arc_draw_label(pcb_arc_t *arc)
+{
+	if (arc->term != NULL) {
+		pcb_coord_t x0, y0;
+		pcb_bool_t vert;
+
+		arc_label_pos(arc, &x0, &y0, &vert);
+		pcb_term_label_draw(x0, y0, conf_core.appearance.term_label_size, vert, pcb_true, arc->term, arc->intconn);
+	}
+}
+
+void pcb_arc_draw_(pcb_arc_t * arc, int allow_term_gfx)
+{
+	if (!arc->Thickness)
+		return;
+
+	if (delayed_terms_enabled && (arc->term != NULL)) {
+		pcb_draw_delay_obj_add((pcb_any_obj_t *)arc);
+		return;
+	}
+
+	PCB_DRAW_BBOX(arc);
+
+	if (!conf_core.editor.thin_draw && !conf_core.editor.wireframe_draw)
+	{
+		if ((allow_term_gfx) && pcb_draw_term_need_gfx(arc)) {
+			pcb_hid_set_line_cap(pcb_draw_out.active_padGC, pcb_cap_round);
+			pcb_hid_set_line_width(pcb_draw_out.active_padGC, arc->Thickness);
+			pcb_gui->draw_arc(pcb_draw_out.active_padGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
+		}
+		else
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, arc->Thickness);
+		pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+		pcb_gui->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+	}
+	else
+	{
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+		pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+
+		if(conf_core.editor.thin_draw)
+			pcb_gui->draw_arc(pcb_draw_out.fgGC, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+
+		if(conf_core.editor.wireframe_draw)
+			pcb_draw_wireframe_arc(pcb_draw_out.fgGC,arc);
+	}
+	if (arc->term != NULL) {
+		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, arc))
+			pcb_draw_delay_label_add((pcb_any_obj_t *)arc);
+	}
+}
+
+static void pcb_arc_draw(pcb_layer_t * layer, pcb_arc_t * arc, int allow_term_gfx)
+{
+	const char *color;
+	char buf[sizeof("#XXXXXX")];
+
+	if (PCB_FLAG_TEST(PCB_FLAG_WARN, arc))
+		color = conf_core.appearance.color.warn;
+	else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, arc)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc)) {
+			if (layer->is_bound)
+				PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
+			else
+				color = conf_core.appearance.color.selected;
+		}
+		else
+			color = conf_core.appearance.color.connected;
+	}
+	else if (PCB_HAS_COLOROVERRIDE(arc)) {
+		color = (arc->override_color);
+	}
+	else if (layer->is_bound)
+		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
+	else
+		color = layer->meta.real.color;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, arc)) {
+		assert(color != NULL);
+		pcb_lighten_color(color, buf, 1.75);
+		color = buf;
+	}
+	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_arc_draw_(arc, allow_term_gfx);
+}
+
+pcb_r_dir_t pcb_arc_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *)b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(arc->parent_type, &arc->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_arc_draw((pcb_layer_t *)cl, arc, 0);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_arc_draw_term_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *)b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(arc->parent_type, &arc->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_arc_draw((pcb_layer_t *)cl, arc, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* erases an arc on a layer */
+void pcb_arc_invalidate_erase(pcb_arc_t *Arc)
+{
+	if (!Arc->Thickness)
+		return;
+	pcb_draw_invalidate(Arc);
+	pcb_flag_erase(&Arc->Flags);
+}
+
+void pcb_arc_invalidate_draw(pcb_layer_t *Layer, pcb_arc_t *Arc)
+{
+	pcb_draw_invalidate(Arc);
+}
Index: tags/2.0.1/src/obj_arc.h
===================================================================
--- tags/2.0.1/src/obj_arc.h	(nonexistent)
+++ tags/2.0.1/src/obj_arc.h	(revision 18980)
@@ -0,0 +1,138 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: (elliptical) arc */
+
+#ifndef PCB_OBJ_ARC_H
+#define PCB_OBJ_ARC_H
+
+#include <genlist/gendlist.h>
+#include "obj_common.h"
+
+struct pcb_arc_s {       /* holds information about arcs */
+	PCB_ANY_PRIMITIVE_FIELDS;
+	pcb_coord_t Thickness, Clearance;
+	pcb_coord_t Width, Height,					/* length of axis */
+	  X, Y;												/* center coordinates */
+	pcb_angle_t StartAngle, Delta;			/* the two limiting angles in degrees */
+	gdl_elem_t link;              /* an arc is in a list: either on a layer or in an element or in a font */
+};
+
+/*** Memory ***/
+pcb_arc_t *pcb_arc_alloc(pcb_layer_t *);
+void pcb_arc_free(pcb_arc_t *data);
+
+pcb_arc_t *pcb_arc_new(pcb_layer_t *Layer, pcb_coord_t center_x, pcb_coord_t center_y, pcb_coord_t width_r, pcb_coord_t height_r, pcb_angle_t start_angle, pcb_angle_t delta_angle, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags, pcb_bool prevent_dups);
+pcb_arc_t *pcb_arc_dup(pcb_layer_t *dst, pcb_arc_t *src);
+pcb_arc_t *pcb_arc_dup_at(pcb_layer_t *dst, pcb_arc_t *src, pcb_coord_t dx, pcb_coord_t dy);
+void *pcb_arc_destroy(pcb_layer_t *Layer, pcb_arc_t *Arc);
+
+/* Add objects without creating them or making any "sanity modifications" to them */
+void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc);
+
+
+/*** Utility ***/
+void pcb_arc_bbox(pcb_arc_t *Arc);
+void pcb_arc_rotate90(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+void pcb_arc_rotate(pcb_layer_t *layer, pcb_arc_t *arc, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle);
+void pcb_arc_mirror(pcb_layer_t *layer, pcb_arc_t *arc, pcb_coord_t y_offs);
+void pcb_arc_flip_side(pcb_layer_t *layer, pcb_arc_t *arc);
+pcb_box_t pcb_arc_mini_bbox(const pcb_arc_t *arc);
+
+
+/*** hash and eq ***/
+int pcb_arc_eq(const pcb_host_trans_t *tr1, const pcb_arc_t *a1, const pcb_host_trans_t *tr2, const pcb_arc_t *a2);
+unsigned int pcb_arc_hash(const pcb_host_trans_t *tr, const pcb_arc_t *a);
+
+
+/* Return the x;y coordinate of the endpoint of an arc; if which is 0, return
+   the endpoint that corresponds to StartAngle, else return the end angle's. */
+void pcb_arc_get_end(pcb_arc_t *Arc, int which, pcb_coord_t *x, pcb_coord_t *y);
+void pcb_arc_middle(const pcb_arc_t *arc, pcb_coord_t *x, pcb_coord_t *y);
+
+void pcb_arc_set_angles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da);
+void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height);
+
+pcb_coord_t pcb_arc_length(const pcb_arc_t *arc);
+double pcb_arc_area(const pcb_arc_t *arc);
+
+/* ptr3 values for start and end point */
+extern int *pcb_arc_start_ptr, *pcb_arc_end_ptr;
+
+/* un-administrate a arc; call before changing geometry */
+void pcb_arc_pre(pcb_arc_t *arc);
+
+/* re-administrate a arc; call after changing geometry */
+void pcb_arc_post(pcb_arc_t *arc);
+
+#define	pcb_arc_move(a,dx,dy)                                     \
+	do {                                                            \
+		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                     \
+		pcb_arc_t *__a__ = (a);                                       \
+		PCB_MOVE((__a__)->X,(__a__)->Y,__dx__,__dy__)                 \
+		PCB_BOX_MOVE_LOWLEVEL(&((__a__)->BoundingBox),__dx__,__dy__); \
+		PCB_BOX_MOVE_LOWLEVEL(&((__a__)->bbox_naked),__dx__,__dy__); \
+	} while(0)
+
+#define PCB_ARC_LOOP(element) do {                                      \
+  pcb_arc_t *arc;                                                   \
+  gdl_iterator_t __it__;                                            \
+  linelist_foreach(&(element)->Arc, &__it__, arc) {
+
+#define PCB_ARC_ALL_LOOP(top) do {		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l =0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)		\
+	{ \
+		PCB_ARC_LOOP(layer)
+
+#define PCB_ARC_COPPER_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l =0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)		\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_COPPER)) continue; \
+		PCB_ARC_LOOP(layer)
+
+#define PCB_ARC_SILK_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_SILK)) continue; \
+		PCB_ARC_LOOP(layer)
+
+#define PCB_ARC_VISIBLE_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (layer->meta.real.vis) \
+			PCB_ARC_LOOP(layer)
+
+#endif
Index: tags/2.0.1/src/obj_arc_draw.h
===================================================================
--- tags/2.0.1/src/obj_arc_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_arc_draw.h	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard draw of arcs ***/
+
+/* Include rtree.h for this */
+#ifdef PCB_RTREE_H
+pcb_r_dir_t pcb_arc_draw_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_arc_draw_term_callback(const pcb_box_t * b, void *cl);
+#endif
+
+void pcb_arc_draw_(pcb_arc_t * arc, int allow_term_gfx);
+void pcb_arc_invalidate_erase(pcb_arc_t *Arc);
+void pcb_arc_invalidate_draw(pcb_layer_t *Layer, pcb_arc_t *Arc);
+void pcb_arc_name_invalidate_draw(pcb_arc_t *arc);
+void pcb_arc_draw_label(pcb_arc_t *arc);
+
Index: tags/2.0.1/src/obj_arc_list.c
===================================================================
--- tags/2.0.1/src/obj_arc_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_arc_list.c	(revision 18980)
@@ -0,0 +1,29 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TDL_DONT_UNDEF
+#include "obj_arc_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_arc_list.h
===================================================================
--- tags/2.0.1/src/obj_arc_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_arc_list.h	(revision 18980)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_ARC_LIST_H
+#define PCB_OBJ_ARC_LIST_H
+
+#include "obj_common.h"
+#include "obj_arc.h"
+
+/* List of Arcs */
+#define TDL(x)      arclist_ ## x
+#define TDL_LIST_T  arclist_t
+#define TDL_ITEM_T  pcb_arc_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define arclist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/obj_arc_op.h
===================================================================
--- tags/2.0.1/src/obj_arc_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_arc_op.h	(revision 18980)
@@ -0,0 +1,59 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard operations on arc ***/
+
+#include "operation.h"
+
+void *pcb_arcop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc);
+void *pcb_arcop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_change_radius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_change_angle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination);
+void *pcb_arcop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc);
+void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id);
+void *pcb_arcop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc);
+void *pcb_arcop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc);
+
+
+void *pcb_arc_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *arc);
+
+
Index: tags/2.0.1/src/obj_arc_ui.c
===================================================================
--- tags/2.0.1/src/obj_arc_ui.c	(nonexistent)
+++ tags/2.0.1/src/obj_arc_ui.c	(revision 18980)
@@ -0,0 +1,140 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Arc UI logics */
+
+#include "config.h"
+#include <math.h>
+#include "obj_arc_ui.h"
+#include "obj_arc.h"
+#include "box.h"
+
+
+#include <stdio.h>
+
+static void draw_mark(pcb_hid_gc_t gc, const pcb_arc_t *arc)
+{
+	const pcb_coord_t mark = PCB_MM_TO_COORD(0.2);
+	pcb_gui->draw_line(gc, arc->X-mark, arc->Y, arc->X+mark, arc->Y);
+	pcb_gui->draw_line(gc, arc->X, arc->Y-mark, arc->X, arc->Y+mark);
+}
+
+static void pcb_arc_ui_move_or_copy_angle(pcb_crosshair_t *ch)
+{
+	int *end_pt = ch->AttachedObject.Ptr3;
+	pcb_arc_t *arc = (pcb_arc_t *) pcb_crosshair.AttachedObject.Ptr2;
+	pcb_angle_t start = arc->StartAngle, delta = arc->Delta;
+
+	if (end_pt == pcb_arc_start_ptr) {
+		double end2, new_delta, new_start = atan2(-(ch->Y - arc->Y), (ch->X - arc->X)) * 180.0 / M_PI + 180.0;
+
+		end2 = start + delta;
+		new_delta = end2 - new_start;
+		if (new_delta > 360.0)
+			new_delta -= 360.0;
+		if (new_delta < -360.0)
+			new_delta += 360.0;
+
+/*		fprintf(stderr, "start: %f new_start: %f delta=%f new delta=%f\n", start, new_start, delta, new_delta);*/
+
+		if (delta > 0) {
+			if (new_delta < 0)
+				new_delta += 360.0;
+		}
+		else {
+			if (new_delta > 0)
+				new_delta -= 360.0;
+		}
+
+		start = new_start;
+		delta = new_delta;
+	}
+	else {
+		double new_delta, new_end = atan2(-(ch->Y - arc->Y), (ch->X - arc->X)) * 180.0 / M_PI + 180.0;
+		if (delta < 0)
+			new_end -= 360.0;
+/*		fprintf(stderr, "delta: %f abs-end: %f new-abs: %f new-delta: %f\n", delta, start+delta, new_end, new_end-start);*/
+		new_delta = new_end-start;
+		if (delta > 0) {
+			if (new_delta < 0)
+				new_delta += 360.0;
+		}
+		else {
+			if (new_delta > 0)
+				new_delta -= 360.0;
+		}
+		delta = new_delta;
+	}
+
+	/* remember the result of the calculation so the actual move code can reuse them */
+	ch->AttachedObject.start_angle = start;
+	ch->AttachedObject.delta_angle = delta;
+	ch->AttachedObject.radius = 0;
+
+	pcb_gui->draw_arc(ch->GC, arc->X, arc->Y, arc->Width, arc->Height, start, delta);
+	draw_mark(ch->GC, arc);
+}
+
+void pcb_arc_ui_move_or_copy_endp(pcb_crosshair_t *ch)
+{
+	int *end_pt = ch->AttachedObject.Ptr3;
+	pcb_arc_t arc2, *arc = (pcb_arc_t *) pcb_crosshair.AttachedObject.Ptr2;
+	pcb_coord_t ex, ey;
+	double dx, dy, d;
+
+	pcb_arc_get_end(arc, (end_pt != NULL), &ex, &ey);
+
+	dx = (arc->X - ch->X);
+	dy = (arc->Y - ch->Y);
+	d = sqrt(dx*dx+dy*dy);
+
+	ch->AttachedObject.radius = d;
+
+	pcb_gui->draw_arc(ch->GC, arc->X, arc->Y, ch->AttachedObject.radius, ch->AttachedObject.radius, arc->StartAngle, arc->Delta);
+
+	draw_mark(ch->GC, &arc2);
+}
+
+
+void pcb_arc_ui_move_or_copy(pcb_crosshair_t *ch)
+{
+	if (pcb_gui->shift_is_pressed() || (ch->AttachedObject.radius != 0))
+		pcb_arc_ui_move_or_copy_endp(ch);
+	else
+		pcb_arc_ui_move_or_copy_angle(ch);
+}
+
+
+int pcb_obj_ui_arc_point_bbox(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res)
+{
+	pcb_arc_t *arc = Ptr2;
+	int *end_pt = Ptr3;
+	pcb_coord_t ex, ey;
+	pcb_arc_get_end(arc, (end_pt != pcb_arc_start_ptr), &ex, &ey);
+	*res = pcb_point_box(ex, ey);
+	return 0;
+}
+
Index: tags/2.0.1/src/obj_arc_ui.h
===================================================================
--- tags/2.0.1/src/obj_arc_ui.h	(nonexistent)
+++ tags/2.0.1/src/obj_arc_ui.h	(revision 18980)
@@ -0,0 +1,33 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+/* Arc UI logics */
+
+#include "crosshair.h"
+
+void pcb_arc_ui_move_or_copy(pcb_crosshair_t *ch);
+int pcb_obj_ui_arc_point_bbox(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res);
+void pcb_arc_middle(const pcb_arc_t *arc, pcb_coord_t *x, pcb_coord_t *y);
+
Index: tags/2.0.1/src/obj_common.c
===================================================================
--- tags/2.0.1/src/obj_common.c	(nonexistent)
+++ tags/2.0.1/src/obj_common.c	(revision 18980)
@@ -0,0 +1,228 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#include <stddef.h>
+#include <ctype.h>
+#include "conf_core.h"
+#include "flag_str.h"
+#include "global_typedefs.h"
+#include "error.h"
+#include "obj_common.h"
+#include "obj_arc_ui.h"
+#include "obj_pstk.h"
+
+const char *pcb_obj_type_name(pcb_objtype_t type)
+{
+	switch(type) {
+		case PCB_OBJ_VOID:        return "void";
+		case PCB_OBJ_LINE:        return "line";
+		case PCB_OBJ_TEXT:        return "text";
+		case PCB_OBJ_POLY:        return "polygon";
+		case PCB_OBJ_ARC:         return "arc";
+		case PCB_OBJ_RAT:         return "ratline";
+		case PCB_OBJ_PSTK:        return "padstack";
+		case PCB_OBJ_SUBC:        return "subcircuit";
+		case PCB_OBJ_NET:         return "net";
+		case PCB_OBJ_LAYER:       return "layer";
+		case PCB_OBJ_LAYERGRP:    return "layer_group";
+	}
+	switch((pcb_vobjtype_t)type) {
+		case PCB_OBJ_LINE_POINT:  return "line_point";
+		case PCB_OBJ_POLY_POINT:  return "poly_point";
+		case PCB_OBJ_ARC_POINT:   return "arc_point";
+		case PCB_OBJ_SUBC_PART:   return "subc_part";
+		case PCB_OBJ_LOCKED:      return "locked";
+		case PCB_OBJ_FLOATER:     return "floater";
+	}
+	return "<unknown/composite>";
+}
+
+/* returns a pointer to an objects bounding box;
+ * data is valid until the routine is called again
+ */
+int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res)
+{
+	switch (Type) {
+	case PCB_OBJ_LINE:
+	case PCB_OBJ_ARC:
+	case PCB_OBJ_TEXT:
+	case PCB_OBJ_POLY:
+	case PCB_OBJ_PSTK:
+		*res = ((pcb_any_obj_t *)Ptr2)->bbox_naked;
+		return 0;
+	case PCB_OBJ_SUBC:
+		*res = ((pcb_any_obj_t *)Ptr1)->bbox_naked;
+		return 0;
+	case PCB_OBJ_POLY_POINT:
+	case PCB_OBJ_LINE_POINT:
+		*res = *(pcb_box_t *)Ptr3;
+		return 0;
+	case PCB_OBJ_ARC_POINT:
+		return pcb_obj_ui_arc_point_bbox(Type, Ptr1, Ptr2, Ptr3, res);
+	default:
+		pcb_message(PCB_MSG_ERROR, "Request for bounding box of unsupported type %d\n", Type);
+		*res = *(pcb_box_t *)Ptr2;
+		return -1;
+	}
+}
+
+
+
+/* current object ID; incremented after each creation of an object */
+long int ID = 1;
+
+pcb_bool pcb_create_being_lenient = pcb_false;
+
+void pcb_create_be_lenient(pcb_bool v)
+{
+	pcb_create_being_lenient = v;
+}
+
+void pcb_create_ID_bump(int min_id)
+{
+	if (ID < min_id)
+		ID = min_id;
+}
+
+void pcb_create_ID_reset(void)
+{
+	ID = 1;
+}
+
+long int pcb_create_ID_get(void)
+{
+	return ID++;
+}
+
+void pcb_obj_add_attribs(void *obj, const pcb_attribute_list_t *src)
+{
+	pcb_any_obj_t *o = obj;
+	if (src == NULL)
+		return;
+	pcb_attribute_copy_all(&o->Attributes, src);
+}
+
+void pcb_obj_center(const pcb_any_obj_t *obj, pcb_coord_t *x, pcb_coord_t *y)
+{
+	switch (obj->type) {
+		case PCB_OBJ_PSTK:
+			*x = ((const pcb_pstk_t *)(obj))->x;
+			*y = ((const pcb_pstk_t *)(obj))->y;
+			break;
+		case PCB_OBJ_ARC:
+			pcb_arc_middle((const pcb_arc_t *)obj, x, y);
+			break;
+		default:
+			*x = (obj->BoundingBox.X1 + obj->BoundingBox.X2) / 2;
+			*y = (obj->BoundingBox.Y1 + obj->BoundingBox.Y2) / 2;
+	}
+}
+
+void pcb_obj_attrib_post_change(pcb_attribute_list_t *list, const char *name, const char *value)
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)(((char *)list) - offsetof(pcb_any_obj_t, Attributes));
+	if (strcmp(name, "term") == 0) {
+		const char *inv;
+		obj->term = value;
+		inv = pcb_obj_id_invalid(obj->term);
+		if (inv != NULL)
+			pcb_message(PCB_MSG_ERROR, "Invalid character '%c' in terminal name (term attribute) '%s'\n", *inv, obj->term);
+	}
+	else if (strcmp(name, "intconn") == 0) {
+		long cid = 0;
+		if (value != NULL) {
+			char *end;
+			cid = strtol(value, &end, 10);
+			if (*end != '\0')
+				cid = 0;
+		}
+		obj->intconn = cid;
+	}
+	else if (strcmp(name, "intnoconn") == 0) {
+		long cid = 0;
+		if (value != NULL) {
+			char *end;
+			cid = strtol(value, &end, 10);
+			if (*end != '\0')
+				cid = 0;
+		}
+		obj->intnoconn = cid;
+	}
+}
+
+const char *pcb_obj_id_invalid(const char *id)
+{
+	const char *s;
+	if (id != NULL)
+		for(s = id; *s != '\0'; s++) {
+			if (isalnum(*s))
+				continue;
+			switch(*s) {
+				case '_': case '.': case '$': case ':': continue;
+			}
+			return s;
+		}
+	return NULL;
+}
+
+pcb_flag_values_t pcb_obj_valid_flags(unsigned long int objtype)
+{
+	pcb_flag_values_t res = 0;
+	int n;
+
+	for(n = 0; n < pcb_object_flagbits_len; n++)
+		if (pcb_object_flagbits[n].object_types & objtype)
+			res |= pcb_object_flagbits[n].mask;
+
+	return res;
+}
+
+pcb_coord_t pcb_obj_clearance_at(pcb_board_t *pcb, const pcb_any_obj_t *o, pcb_layer_t *at)
+{
+	switch(o->type) {
+		case PCB_OBJ_POLY:
+			if (!(PCB_POLY_HAS_CLEARANCE((pcb_poly_t *)o)))
+				return 0;
+			return ((pcb_poly_t *)o)->Clearance;
+		case PCB_OBJ_LINE:
+			if (!(PCB_NONPOLY_HAS_CLEARANCE((pcb_line_t *)o)))
+				return 0;
+			return ((pcb_line_t *)o)->Clearance;
+		case PCB_OBJ_TEXT:
+			return 0;
+		case PCB_OBJ_ARC:
+			if (!(PCB_NONPOLY_HAS_CLEARANCE((pcb_arc_t *)o)))
+				return 0;
+			return ((pcb_arc_t *)o)->Clearance;
+		case PCB_OBJ_PSTK:
+			return obj_pstk_get_clearance(pcb, (pcb_pstk_t *)o, at);
+		default:
+			return 0;
+	}
+}
Index: tags/2.0.1/src/obj_common.h
===================================================================
--- tags/2.0.1/src/obj_common.h	(nonexistent)
+++ tags/2.0.1/src/obj_common.h	(revision 18980)
@@ -0,0 +1,279 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_OBJ_COMMON_H
+#define PCB_OBJ_COMMON_H
+
+#include <math.h>
+#include <string.h>
+#include "flag.h"
+#include "attrib.h"
+#include "global_typedefs.h"
+#include "data_parent.h"
+
+/* Real objects that have actual struct; can be used as a bitfield */
+typedef enum pcb_objtype_e {
+	PCB_OBJ_VOID       = 0x0000000,
+
+	PCB_OBJ_ARC        = 0x0000001,
+	PCB_OBJ_LINE       = 0x0000002,
+	PCB_OBJ_POLY       = 0x0000004,
+	PCB_OBJ_TEXT       = 0x0000008,
+	PCB_OBJ_SUBC       = 0x0000010,
+	PCB_OBJ_PSTK       = 0x0000020,
+	PCB_OBJ_RAT        = 0x0000040,
+
+
+	/* more abstract objects */
+	PCB_OBJ_NET        = 0x0001000,
+	PCB_OBJ_LAYER      = 0x0002000,
+	PCB_OBJ_LAYERGRP   = 0x0004000
+} pcb_objtype_t;
+
+/* Virtual objects for configuring searches; can be used as a bitfield with the above */
+typedef enum pcb_vobjtype_e {
+	PCB_OBJ_ARC_POINT  = 0x0100000,
+	PCB_OBJ_LINE_POINT = 0x0200000,
+	PCB_OBJ_POLY_POINT = 0x0400000,
+	PCB_OBJ_SUBC_PART  = 0x0800000,
+	PCB_OBJ_LOCKED     = 0x1000000,
+	PCB_OBJ_FLOATER    = 0x2000000
+} pcb_vobjtype_t;
+
+
+/* combinations, groups, masks of pcb_objtype_t */
+typedef enum pcb_objmask_e {
+	/* lists */
+	PCB_OBJ_CLASS_PIN  = (PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART),
+	PCB_OBJ_CLASS_TERM = (PCB_OBJ_CLASS_PIN | PCB_OBJ_SUBC_PART | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_TEXT),
+
+	/* masks */
+	PCB_OBJ_CLASS_REAL = 0x0000FFF, /* global and on-layer objects (but not abstract things like layers) */
+	PCB_OBJ_CLASS_HOST = 0x00FF000, /* host types: layers, boards, nets */
+	PCB_OBJ_CLASS_MASK = 0xFF00000, /* for virtual searches */
+	PCB_OBJ_CLASS_OBJ  = 0x0000000, /* anything with common object fields (pcb_any_obj_t) */
+	PCB_OBJ_ANY        = 0xFFFFFFF
+} pcb_objmask_t;
+
+
+/* point and box type - they are so common everything depends on them */
+struct pcb_point_s {    /* a line/polygon point */
+	pcb_coord_t X, Y, X2, Y2;   /* so Point type can be cast as pcb_box_t */
+	long int ID;
+};
+
+struct pcb_box_s {  /* a bounding box */
+	pcb_coord_t X1, Y1;     /* upper left */
+	pcb_coord_t X2, Y2;     /* and lower right corner */
+};
+
+/* Return the user readable name of an object type in a string; never NULL */
+const char *pcb_obj_type_name(pcb_objtype_t type);
+
+/* returns a flag mask of all valid flags for an (old) object type */
+pcb_flag_values_t pcb_obj_valid_flags(unsigned long int objtype);
+
+
+int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_box_t *res);
+
+/* Host transformations: typically the transformations an object of a subc
+   inherits from the subc */
+typedef struct pcb_host_trans_s {
+	pcb_coord_t ox, oy;
+	int on_bottom;
+	double rot;
+	double cosa, sina; /* rot angle cache */
+} pcb_host_trans_t;
+
+/* memset object to 0, but keep the link field */
+#define reset_obj_mem(type, obj) \
+do { \
+	gdl_elem_t __lnk__ = obj->link; \
+	memset(obj, 0, sizeof(type)); \
+	obj->link = __lnk__; \
+} while(0) \
+
+
+/* pcb_true during file loads, for example to allow overlapping vias.
+   pcb_false otherwise, to stop the user from doing normally dangerous
+   things.  */
+void pcb_create_be_lenient(pcb_bool);
+extern pcb_bool pcb_create_being_lenient;
+
+void pcb_create_ID_bump(int min_id);
+void pcb_create_ID_reset(void);
+long int pcb_create_ID_get(void);
+
+void pcb_obj_add_attribs(void *obj, const pcb_attribute_list_t *src);
+
+/* ---------------------------------------------------------------------------
+ * Do not change the following definitions even if they're not very
+ * nice.  It allows us to have functions act on these "base types" and
+ * not need to know what kind of actual object they're working on.
+ */
+
+/* Any object that ends up in common use as pcb_any_obj_t, MUST be defined
+   using this as the first fieldsusing the following macros.  */
+#define PCB_ANY_OBJ_FIELDS \
+	pcb_box_t            BoundingBox; \
+	long int             ID; \
+	pcb_flag_t           Flags; \
+	pcb_objtype_t        type; \
+	pcb_parenttype_t     parent_type; \
+	pcb_parent_t         parent; \
+	pcb_box_t            bbox_naked; \
+	pcb_attribute_list_t Attributes \
+
+#define PCB_ANY_PRIMITIVE_FIELDS \
+	PCB_ANY_OBJ_FIELDS; \
+	const char           *term; \
+	void                 *ratconn; \
+	unsigned char        thermal; \
+	unsigned char        intconn, intnoconn; \
+	char                 override_color[sizeof("#XXXXXX")]
+
+/* Lines, pads, and rats all use this so they can be cross-cast.  */
+#define PCB_ANYLINEFIELDS \
+	PCB_ANY_PRIMITIVE_FIELDS; \
+	pcb_coord_t Thickness, Clearance; \
+	pcb_point_t Point1, Point2
+
+/* All on-pcb objects (elements, lines, pads, vias, rats, etc) are
+   based on this. */
+struct pcb_any_obj_s {
+	PCB_ANY_PRIMITIVE_FIELDS;
+};
+
+/* Lines, rats, pads, etc.  */
+struct pcb_any_line_s {
+	PCB_ANYLINEFIELDS;
+};
+
+/* Return the geometric center of an object, as shown (center of bbox usually,
+   but not for an arc) */
+void pcb_obj_center(const pcb_any_obj_t *obj, pcb_coord_t *x, pcb_coord_t *y);
+
+/* Return the clearance value of object on the specified layer (in
+   case of padstack - in case of other objects layer is ignored) */
+pcb_coord_t pcb_obj_clearance_at(pcb_board_t *pcb, const pcb_any_obj_t *o, pcb_layer_t *at);
+
+
+/* Update cached attributes (->term) */
+void pcb_obj_attrib_post_change(pcb_attribute_list_t *list, const char *name, const char *value);
+
+/* Returns the first invalid character of an ID (terminal, refdes) or NULL */
+const char *pcb_obj_id_invalid(const char *id);
+
+#define pcb_hidden_floater(obj) (conf_core.editor.hide_names && PCB_FLAG_TEST(PCB_FLAG_FLOATER, (obj)))
+
+/* Returns whether a subc part object is editable (not under the subc lock) */
+#define pcb_subc_part_editable(pcb, obj) \
+	(((pcb)->loose_subc) || ((obj)->term != NULL) || PCB_FLAG_TEST(PCB_FLAG_FLOATER, (obj)))
+
+/* set const char *dst to a color, depending on the bound layer type:
+   top silk and copper get the color of the first crresponding layer
+   from current PCB, the rest get the far-side color;
+   set the selected color if sel is true */
+#define PCB_OBJ_COLOR_ON_BOUND_LAYER(dst, layer, sel) \
+do { \
+	if (layer->meta.bound.type & PCB_LYT_TOP) { \
+		pcb_layer_id_t lid = -1; \
+		pcb_layergrp_t *g; \
+		pcb_layergrp_id_t grp = -1; \
+		if (layer->meta.bound.type & PCB_LYT_SILK) { \
+			if (sel) {\
+				dst = conf_core.appearance.color.selected; \
+			} \
+			else {\
+				if (layer != NULL) { \
+					pcb_layer_t *ly = pcb_layer_get_real(layer); \
+					if (ly != NULL) \
+						dst = ly->meta.real.color; \
+					else \
+						dst = conf_core.appearance.color.element; \
+				} \
+				else \
+					dst = conf_core.appearance.color.element; \
+			} \
+			break; \
+		} \
+		else if (layer->meta.bound.type & PCB_LYT_COPPER) \
+			grp = pcb_layergrp_get_top_copper(); \
+		g = pcb_get_layergrp(PCB, grp); \
+		if ((g != NULL) && (g->len > 0)) \
+			lid = g->lid[0]; \
+		if ((lid >= 0) && (lid <= PCB_MAX_LAYER)) { \
+			if (sel) \
+				dst = conf_core.appearance.color.selected; \
+			else {\
+				if (layer != NULL) { \
+					pcb_layer_t *ly = pcb_layer_get_real(layer); \
+					if (ly != NULL) \
+						dst = ly->meta.real.color; \
+					else \
+						dst = conf_core.appearance.color.layer[lid]; \
+				} \
+				else \
+					dst = conf_core.appearance.color.layer[lid]; \
+			} \
+			break; \
+		} \
+	} \
+	if (sel) \
+		dst = conf_core.appearance.color.selected; \
+	else \
+		dst = conf_core.appearance.color.invisible_objects; \
+} while(0)
+
+/* check if an object has clearance to polygon */
+#define PCB_POLY_HAS_CLEARANCE(ply) \
+	(PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, (ply)) && ((ply)->Clearance != 0))
+
+#define PCB_NONPOLY_HAS_CLEARANCE(obj) \
+	(PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (obj)) && ((obj)->Clearance != 0))
+
+#define PCB_OBJ_HAS_CLEARANCE(obj) \
+	( \
+		((obj)->type == PCB_OBJ_POLY) ? \
+		PCB_POLY_HAS_CLEARANCE(obj) : PCB_NONPOLY_HAS_CLEARANCE(obj) \
+	)
+
+#define PCB_HAS_COLOROVERRIDE(obj)		\
+	( \
+		(obj->override_color[0] == '#')	\
+	)
+
+/* a pointer is created from index addressing because the base pointer
+ * may change when new memory is allocated;
+ *
+ * all data is relative to an objects name 'top' which can be either
+ * PCB or PasteBuffer */
+#define PCB_END_LOOP  }} while (0)
+#define PCB_ENDALL_LOOP }} while (0); }} while(0)
+
+#endif
Index: tags/2.0.1/src/obj_hash.h
===================================================================
--- tags/2.0.1/src/obj_hash.h	(nonexistent)
+++ tags/2.0.1/src/obj_hash.h	(revision 18980)
@@ -0,0 +1,97 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <genht/hash.h>
+#include <genlist/gendlist.h>
+#include "compat_misc.h"
+
+/* compare two strings and return 0 if they are equal. NULL == NULL means equal. */
+PCB_INLINE int pcb_neqs(const char *s1, const char *s2)
+{
+	if ((s1 == NULL) && (s2 == NULL)) return 0;
+	if ((s1 == NULL) || (s2 == NULL)) return 1;
+	return strcmp(s1, s2) != 0;
+}
+
+PCB_INLINE unsigned pcb_hash_coord(pcb_coord_t c)
+{
+	return murmurhash(&(c), sizeof(pcb_coord_t));
+}
+
+/* cheat: round with a tolerance of a few nanometers to overcome the usual
+   +-1 nanometer rounding error */
+PCB_INLINE pcb_coord_t pcb_round_tol(double v, int tol)
+{
+	return pcb_round(v/(double)tol)*tol;
+}
+
+PCB_INLINE void pcb_hash_tr_coords(const pcb_host_trans_t *tr, pcb_coord_t *dstx, pcb_coord_t *dsty, pcb_coord_t srcx, pcb_coord_t srcy)
+{
+	pcb_coord_t px, py;
+
+	px = srcx - tr->ox;
+	py = srcy - tr->oy;
+
+	if ((tr->rot == 0.0) && (!tr->on_bottom)) {
+		*dstx = px;
+		*dsty = py;
+	}
+	else {
+		double x, y;
+		x = (double)px * tr->cosa + (double)py * tr->sina;
+		y = (double)py * tr->cosa - (double)px * tr->sina;
+		if (tr->on_bottom) y = -(y);
+
+		*dstx = pcb_round_tol(x, 4);
+		*dsty = pcb_round_tol(y, 4);
+	}
+}
+
+
+PCB_INLINE unsigned pcb_hash_angle(const pcb_host_trans_t *tr, pcb_angle_t ang)
+{
+	long l;
+	ang -= tr->rot;
+	ang *= 10000;
+	l = floor(ang);
+	return murmurhash(&l, sizeof(l));
+}
+
+#define pcb_hash_str(s) ((s) == NULL ? 0 : strhash(s))
+
+/* compare two fields and return 0 if they are equal */
+#define pcb_field_neq(s1, s2, f) ((s1)->f != (s2)->f)
+
+/* retruns if two sets of tr;x;y mismatches */
+PCB_INLINE pcb_bool pcb_neq_tr_coords(const pcb_host_trans_t *tr1, pcb_coord_t x1, pcb_coord_t y1, const pcb_host_trans_t *tr2, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_hash_tr_coords(tr1, &x1, &y1, x1, y1);
+	pcb_hash_tr_coords(tr2, &x2, &y2, x2, y2);
+	if (x1 != x2) return pcb_true;
+	if (y1 != y2) return pcb_true;
+	return pcb_false;
+}
+
Index: tags/2.0.1/src/obj_line.c
===================================================================
--- tags/2.0.1/src/obj_line.c	(nonexistent)
+++ tags/2.0.1/src/obj_line.c	(revision 18980)
@@ -0,0 +1,1133 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: line segment */
+
+#include "config.h"
+#include <setjmp.h>
+
+#include "undo.h"
+#include "board.h"
+#include "data.h"
+#include "search.h"
+#include "polygon.h"
+#include "conf_core.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "rotate.h"
+#include "hid_inlines.h"
+
+#include "obj_line.h"
+#include "obj_line_op.h"
+
+#include "obj_subc_parent.h"
+#include "obj_hash.h"
+
+/* TODO: maybe remove this and move lines from draw here? */
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "obj_line_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_pstk_draw.h"
+
+#warning padstack TODO: remove this when via is removed and the padstack is created from style directly
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+
+/**** allocation ****/
+
+/* get next slot for a line, allocates memory if necessary */
+pcb_line_t *pcb_line_alloc(pcb_layer_t * layer)
+{
+	pcb_line_t *new_obj;
+
+	new_obj = calloc(sizeof(pcb_line_t), 1);
+	new_obj->type = PCB_OBJ_LINE;
+	new_obj->Attributes.post_change = pcb_obj_attrib_post_change;
+	PCB_SET_PARENT(new_obj, layer, layer);
+
+	linelist_append(&layer->Line, new_obj);
+
+	return new_obj;
+}
+
+void pcb_line_free(pcb_line_t * data)
+{
+	linelist_remove(data);
+	free(data);
+}
+
+
+/**** utility ****/
+struct line_info {
+	pcb_coord_t X1, X2, Y1, Y2;
+	pcb_coord_t Thickness, Clearance;
+	pcb_flag_t Flags;
+	pcb_line_t test, *ans;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t line_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct line_info *i = (struct line_info *) cl;
+
+	/* do not merge to subc parts or terminals */
+	if ((pcb_obj_parent_subc((pcb_any_obj_t *)line) != NULL) || (line->term != NULL))
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (line->Point1.X == i->X1 && line->Point2.X == i->X2 && line->Point1.Y == i->Y1 && line->Point2.Y == i->Y2) {
+		i->ans = (pcb_line_t *) (-1);
+		longjmp(i->env, 1);
+	}
+	/* check the other point order */
+	if (line->Point1.X == i->X1 && line->Point2.X == i->X2 && line->Point1.Y == i->Y1 && line->Point2.Y == i->Y2) {
+		i->ans = (pcb_line_t *) (-1);
+		longjmp(i->env, 1);
+	}
+	if (line->Point2.X == i->X1 && line->Point1.X == i->X2 && line->Point2.Y == i->Y1 && line->Point1.Y == i->Y2) {
+		i->ans = (pcb_line_t *) - 1;
+		longjmp(i->env, 1);
+	}
+	/* remove unnecessary line points */
+	if (line->Thickness == i->Thickness
+			/* don't merge lines if the clear flags or clearance differ  */
+			&& PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, line) == PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, i)
+			&& line->Clearance == i->Clearance) {
+		if (line->Point1.X == i->X1 && line->Point1.Y == i->Y1) {
+			i->test.Point1.X = line->Point2.X;
+			i->test.Point1.Y = line->Point2.Y;
+			i->test.Point2.X = i->X2;
+			i->test.Point2.Y = i->Y2;
+			if (pcb_is_point_on_line(i->X1, i->Y1, 1, &i->test)) {
+				i->ans = line;
+				longjmp(i->env, 1);
+			}
+		}
+		else if (line->Point2.X == i->X1 && line->Point2.Y == i->Y1) {
+			i->test.Point1.X = line->Point1.X;
+			i->test.Point1.Y = line->Point1.Y;
+			i->test.Point2.X = i->X2;
+			i->test.Point2.Y = i->Y2;
+			if (pcb_is_point_on_line(i->X1, i->Y1, 1, &i->test)) {
+				i->ans = line;
+				longjmp(i->env, 1);
+			}
+		}
+		else if (line->Point1.X == i->X2 && line->Point1.Y == i->Y2) {
+			i->test.Point1.X = line->Point2.X;
+			i->test.Point1.Y = line->Point2.Y;
+			i->test.Point2.X = i->X1;
+			i->test.Point2.Y = i->Y1;
+			if (pcb_is_point_on_line(i->X2, i->Y2, 1, &i->test)) {
+				i->ans = line;
+				longjmp(i->env, 1);
+			}
+		}
+		else if (line->Point2.X == i->X2 && line->Point2.Y == i->Y2) {
+			i->test.Point1.X = line->Point1.X;
+			i->test.Point1.Y = line->Point1.Y;
+			i->test.Point2.X = i->X1;
+			i->test.Point2.Y = i->Y1;
+			if (pcb_is_point_on_line(i->X2, i->Y2, 1, &i->test)) {
+				i->ans = line;
+				longjmp(i->env, 1);
+			}
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+/* creates a new line on a layer and checks for overlap and extension */
+pcb_line_t *pcb_line_new_merge(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	struct line_info info;
+	pcb_box_t search;
+
+	search.X1 = MIN(X1, X2);
+	search.X2 = MAX(X1, X2);
+	search.Y1 = MIN(Y1, Y2);
+	search.Y2 = MAX(Y1, Y2);
+	if (search.Y2 == search.Y1)
+		search.Y2++;
+	if (search.X2 == search.X1)
+		search.X2++;
+	info.X1 = X1;
+	info.X2 = X2;
+	info.Y1 = Y1;
+	info.Y2 = Y2;
+	info.Thickness = Thickness;
+	info.Clearance = Clearance;
+	info.Flags = Flags;
+	info.test.Thickness = 0;
+	info.test.Flags = pcb_no_flags();
+	info.ans = NULL;
+	/* prevent stacking of duplicate lines
+	 * and remove needless intermediate points
+	 * verify that the layer is on the board first!
+	 */
+	if (setjmp(info.env) == 0) {
+		pcb_r_search(Layer->line_tree, &search, NULL, line_callback, &info, NULL);
+		return pcb_line_new(Layer, X1, Y1, X2, Y2, Thickness, Clearance, Flags);
+	}
+
+	if ((void *) info.ans == (void *) (-1))
+		return NULL;								/* stacked line */
+	/* remove unnecessary points */
+	if (info.ans) {
+		/* must do this BEFORE getting new line memory */
+		pcb_undo_move_obj_to_remove(PCB_OBJ_LINE, Layer, info.ans, info.ans);
+		X1 = info.test.Point1.X;
+		X2 = info.test.Point2.X;
+		Y1 = info.test.Point1.Y;
+		Y2 = info.test.Point2.Y;
+	}
+	return pcb_line_new(Layer, X1, Y1, X2, Y2, Thickness, Clearance, Flags);
+}
+
+pcb_line_t *pcb_line_new(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	pcb_line_t *Line;
+
+	Line = pcb_line_alloc(Layer);
+	if (!Line)
+		return Line;
+	Line->ID = pcb_create_ID_get();
+	Line->Flags = Flags;
+	PCB_FLAG_CLEAR(PCB_FLAG_RAT, Line);
+	Line->Thickness = Thickness;
+	Line->Clearance = Clearance;
+	Line->Point1.X = X1;
+	Line->Point1.Y = Y1;
+	Line->Point1.ID = pcb_create_ID_get();
+	Line->Point2.X = X2;
+	Line->Point2.Y = Y2;
+	Line->Point2.ID = pcb_create_ID_get();
+	pcb_add_line_on_layer(Layer, Line);
+	return Line;
+}
+
+static pcb_line_t *pcb_line_copy_meta(pcb_line_t *dst, pcb_line_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	return dst;
+}
+
+pcb_line_t *pcb_line_dup(pcb_layer_t *dst, pcb_line_t *src)
+{
+	pcb_line_t *l = pcb_line_new(dst, src->Point1.X, src->Point1.Y, src->Point2.X, src->Point2.Y, src->Thickness, src->Clearance, src->Flags);
+	return pcb_line_copy_meta(l, src);
+}
+
+pcb_line_t *pcb_line_dup_at(pcb_layer_t *dst, pcb_line_t *src, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_line_t *l = pcb_line_new(dst, src->Point1.X + dx, src->Point1.Y + dy, src->Point2.X + dx, src->Point2.Y + dy, src->Thickness, src->Clearance, src->Flags);
+	return pcb_line_copy_meta(l, src);
+}
+
+void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_bbox(Line);
+	if (!Layer->line_tree)
+		Layer->line_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+}
+
+static void pcb_line_bbox_(const pcb_line_t *Line, pcb_box_t *dst, int mini)
+{
+	pcb_coord_t width = mini ? (Line->Thickness + 1) / 2 : (Line->Thickness + Line->Clearance + 1) / 2;
+
+	/* Adjust for our discrete polygon approximation */
+	width = (double) width *PCB_POLY_CIRC_RADIUS_ADJ + 0.5;
+
+	dst->X1 = MIN(Line->Point1.X, Line->Point2.X) - width;
+	dst->X2 = MAX(Line->Point1.X, Line->Point2.X) + width;
+	dst->Y1 = MIN(Line->Point1.Y, Line->Point2.Y) - width;
+	dst->Y2 = MAX(Line->Point1.Y, Line->Point2.Y) + width;
+	pcb_close_box(dst);
+}
+
+/* sets the bounding box of a line */
+void pcb_line_bbox(pcb_line_t *Line)
+{
+	pcb_line_bbox_(Line, &Line->BoundingBox, 0);
+	pcb_line_bbox_(Line, &Line->bbox_naked, 1);
+	pcb_set_point_bounding_box(&Line->Point1);
+	pcb_set_point_bounding_box(&Line->Point2);
+}
+
+int pcb_line_eq(const pcb_host_trans_t *tr1, const pcb_line_t *l1, const pcb_host_trans_t *tr2, const pcb_line_t *l2)
+{
+	if (pcb_field_neq(l1, l2, Thickness) || pcb_field_neq(l1, l2, Clearance)) return 0;
+	if (pcb_neqs(l1->term, l2->term)) return 0;
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, l1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, l2)) {
+		if (pcb_neq_tr_coords(tr1, l1->Point1.X, l1->Point1.Y, tr2, l2->Point1.X, l2->Point1.Y)) goto swap;
+		if (pcb_neq_tr_coords(tr1, l1->Point2.X, l1->Point2.Y, tr2, l2->Point2.X, l2->Point2.Y)) return 0;
+	}
+	return 1;
+
+	swap:; /* check the line with swapped endpoints */
+	if (pcb_neq_tr_coords(tr1, l1->Point2.X, l1->Point2.Y, tr2, l2->Point1.X, l2->Point1.Y)) return 0;
+	if (pcb_neq_tr_coords(tr1, l1->Point1.X, l1->Point1.Y, tr2, l2->Point2.X, l2->Point2.Y)) return 0;
+	return 1;
+}
+
+
+unsigned int pcb_line_hash(const pcb_host_trans_t *tr, const pcb_line_t *l)
+{
+	unsigned int crd = 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, l)) {
+		pcb_coord_t x1, y1, x2, y2;
+		pcb_hash_tr_coords(tr, &x1, &y1, l->Point1.X, l->Point1.Y);
+		pcb_hash_tr_coords(tr, &x2, &y2, l->Point2.X, l->Point2.Y);
+		crd = pcb_hash_coord(x1) ^ pcb_hash_coord(y1) ^ pcb_hash_coord(x2) ^ pcb_hash_coord(y2);
+	}
+
+	return pcb_hash_coord(l->Thickness) ^ pcb_hash_coord(l->Clearance) ^
+		pcb_hash_str(l->term) ^ crd;
+}
+
+
+pcb_coord_t pcb_line_length(const pcb_line_t *line)
+{
+	pcb_coord_t dx = line->Point1.X - line->Point2.X;
+	pcb_coord_t dy = line->Point1.Y - line->Point2.Y;
+#warning TODO: use the distance func instead
+	return pcb_round(sqrt((double)dx*(double)dx + (double)dy*(double)dy));
+}
+
+double pcb_line_area(const pcb_line_t *line)
+{
+	return
+		pcb_line_length(line) * (double)line->Thickness /* body */
+		+ (double)line->Thickness * (double)line->Thickness * M_PI; /* cap circles */
+}
+
+void pcb_sqline_to_rect(const pcb_line_t *line, pcb_coord_t *x, pcb_coord_t *y)
+{
+	double l, vx, vy, nx, ny, width, x1, y1, x2, y2, dx, dy;
+
+	x1 = line->Point1.X;
+	y1 = line->Point1.Y;
+	x2 = line->Point2.X;
+	y2 = line->Point2.Y;
+
+	width = (double)((line->Thickness + 1) / 2);
+	dx = x2-x1;
+	dy = y2-y1;
+
+	if ((dx == 0) && (dy == 0))
+		dx = 1;
+
+	l = sqrt((double)dx*(double)dx + (double)dy*(double)dy);
+
+	vx = dx / l;
+	vy = dy / l;
+	nx = -vy;
+	ny = vx;
+
+	x[0] = (pcb_coord_t)pcb_round(x1 - vx * width + nx * width);
+	y[0] = (pcb_coord_t)pcb_round(y1 - vy * width + ny * width);
+	x[1] = (pcb_coord_t)pcb_round(x1 - vx * width - nx * width);
+	y[1] = (pcb_coord_t)pcb_round(y1 - vy * width - ny * width);
+	x[2] = (pcb_coord_t)pcb_round(x2 + vx * width - nx * width);
+	y[2] = (pcb_coord_t)pcb_round(y2 + vy * width - ny * width);
+	x[3] = (pcb_coord_t)pcb_round(x2 + vx * width + nx * width);
+	y[3] = (pcb_coord_t)pcb_round(y2 + vy * width + ny * width);
+}
+
+void pcb_line_pre(pcb_line_t *line)
+{
+	pcb_layer_t *ly = pcb_layer_get_real(line->parent.layer);
+	if (ly == NULL)
+		return;
+	if (ly->line_tree != NULL)
+		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)line);
+	pcb_poly_restore_to_poly(ly->parent.data, PCB_OBJ_LINE, ly, line);
+}
+
+void pcb_line_post(pcb_line_t *line)
+{
+	pcb_layer_t *ly = pcb_layer_get_real(line->parent.layer);
+	if (ly == NULL)
+		return;
+	if (ly->line_tree != NULL)
+		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)line);
+	pcb_poly_clear_from_poly(ly->parent.data, PCB_OBJ_LINE, ly, line);
+}
+
+/*** ops ***/
+/* copies a line to buffer */
+void *pcb_lineop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_t *line;
+	pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)];
+	line = pcb_line_new(layer, Line->Point1.X, Line->Point1.Y,
+															Line->Point2.X, Line->Point2.Y,
+															Line->Thickness, Line->Clearance, pcb_flag_mask(Line->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg));
+	return pcb_line_copy_meta(line, Line);
+}
+
+/* moves a line between board and buffer */
+void *pcb_lineop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *dstly, pcb_line_t *line)
+{
+	pcb_layer_t *srcly = line->parent.layer;
+
+	assert(line->parent_type == PCB_PARENT_LAYER);
+	if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */
+		dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)];
+
+	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_LINE, srcly, line);
+	pcb_r_delete_entry(srcly->line_tree, (pcb_box_t *)line);
+
+	linelist_remove(line);
+	linelist_append(&(dstly->Line), line);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, line);
+
+	if (!dstly->line_tree)
+		dstly->line_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dstly->line_tree, (pcb_box_t *)line);
+	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_LINE, dstly, line);
+
+	PCB_SET_PARENT(line, layer, dstly);
+
+	return line;
+}
+
+/* changes the size of a line */
+void *pcb_lineop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Line->Thickness + ctx->chgsize.value;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line))
+		return NULL;
+	if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Line->Thickness) {
+		pcb_undo_add_obj_to_size(PCB_OBJ_LINE, Layer, Line, Line);
+		pcb_line_invalidate_erase(Line);
+		pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+		pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		Line->Thickness = value;
+		pcb_line_bbox(Line);
+		pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+		pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		pcb_line_invalidate_draw(Layer, Line);
+		return Line;
+	}
+	return NULL;
+}
+
+/*changes the clearance size of a line */
+void *pcb_lineop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Line->Clearance + ctx->chgsize.value;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
+		return NULL;
+	if (value < 0)
+		value = 0;
+	value = MIN(PCB_MAX_LINESIZE, value);
+	if (!ctx->chgsize.is_absolute && ctx->chgsize.value < 0 && value < conf_core.design.bloat * 2)
+		value = 0;
+	if (ctx->chgsize.value > 0 && value < conf_core.design.bloat * 2)
+		value = conf_core.design.bloat * 2 + 2;
+	if (value != Line->Clearance) {
+		pcb_undo_add_obj_to_clear_size(PCB_OBJ_LINE, Layer, Line, Line);
+		pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		pcb_line_invalidate_erase(Line);
+		pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+		Line->Clearance = value;
+		pcb_line_bbox(Line);
+		pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+		pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		pcb_line_invalidate_draw(Layer, Line);
+		return Line;
+	}
+	return NULL;
+}
+
+/* changes the clearance flag of a line */
+void *pcb_lineop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line))
+		return NULL;
+	pcb_line_invalidate_erase(Line);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_LINE, Layer, Line, Line, pcb_false);
+		pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	}
+	pcb_undo_add_obj_to_flag(Line);
+	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Line);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_LINE, Layer, Line, Line, pcb_true);
+		pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	}
+	pcb_line_invalidate_draw(Layer, Line);
+	return Line;
+}
+
+/* sets the clearance flag of a line */
+void *pcb_lineop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
+		return NULL;
+	return pcb_lineop_change_join(ctx, Layer, Line);
+}
+
+/* clears the clearance flag of a line */
+void *pcb_lineop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
+		return NULL;
+	return pcb_lineop_change_join(ctx, Layer, Line);
+}
+
+/* copies a line */
+void *pcb_lineop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_t *line;
+
+	line = pcb_line_new_merge(Layer, Line->Point1.X + ctx->copy.DeltaX,
+																Line->Point1.Y + ctx->copy.DeltaY,
+																Line->Point2.X + ctx->copy.DeltaX,
+																Line->Point2.Y + ctx->copy.DeltaY, Line->Thickness, Line->Clearance, pcb_flag_mask(Line->Flags, PCB_FLAG_FOUND));
+	if (!line)
+		return line;
+	pcb_line_copy_meta(line, Line);
+	pcb_line_invalidate_draw(Layer, line);
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, Layer, line, line);
+	return line;
+}
+
+/* moves a line */
+void *pcb_lineop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (Layer->meta.real.vis)
+		pcb_line_invalidate_erase(Line);
+	pcb_line_move(Line, ctx->move.dx, ctx->move.dy);
+	if (Layer->meta.real.vis)
+		pcb_line_invalidate_draw(Layer, Line);
+	return Line;
+}
+
+void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (Layer->line_tree != NULL)
+		pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+	if (ctx->move.pcb != NULL)
+		pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	pcb_lineop_move_noclip(ctx, Layer, Line);
+	if (Layer->line_tree != NULL)
+		pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+	if (ctx->move.pcb != NULL)
+		pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	return Line;
+}
+
+void *pcb_lineop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	if (ctx->clip.restore) {
+		pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+		if (ctx->clip.pcb != NULL)
+			pcb_poly_restore_to_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	}
+	if (ctx->clip.clear) {
+		pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+		if (ctx->clip.pcb != NULL)
+			pcb_poly_clear_from_poly(ctx->clip.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+	}
+	return Line;
+}
+
+/* moves one end of a line */
+void *pcb_lineop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point)
+{
+	if (Layer) {
+		if (Layer->meta.real.vis)
+			pcb_line_invalidate_erase(Line);
+		pcb_poly_restore_to_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		pcb_r_delete_entry(Layer->line_tree, &Line->BoundingBox);
+		PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+		pcb_line_bbox(Line);
+		pcb_r_insert_entry(Layer->line_tree, &Line->BoundingBox);
+		pcb_poly_clear_from_poly(ctx->move.pcb->Data, PCB_OBJ_LINE, Layer, Line);
+		if (Layer->meta.real.vis)
+			pcb_line_invalidate_draw(Layer, Line);
+		return Line;
+	}
+	else {												/* must be a rat */
+
+		if (ctx->move.pcb->RatOn)
+			pcb_rat_invalidate_erase((pcb_rat_t *) Line);
+		pcb_r_delete_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox);
+		PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+		pcb_line_bbox(Line);
+		pcb_r_insert_entry(ctx->move.pcb->Data->rat_tree, &Line->BoundingBox);
+		if (ctx->move.pcb->RatOn)
+			pcb_rat_invalidate_draw((pcb_rat_t *) Line);
+		return Line;
+	}
+}
+
+/* moves one end of a line */
+void *pcb_lineop_move_point_with_route(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point)
+{
+	if ((conf_core.editor.move_linepoint_uses_route == 0) || !Layer) {
+		pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Layer, Line, Point, ctx->move.dx, ctx->move.dy);
+		return pcb_lineop_move_point(ctx, Layer, Line, Point);
+	}
+	else {
+		/* Move with Route Code */
+		pcb_route_t route;
+		pcb_point_t point1 = (&Line->Point1 == Point ? Line->Point2 : Line->Point1);
+		pcb_point_t point2 = *Point;
+
+		point2.X += ctx->move.dx;
+		point2.Y += ctx->move.dy;
+	
+		/* Calculate the new line route and add apply it */
+		pcb_route_init(&route);
+		pcb_route_calculate(PCB,
+												&route,
+												&point1,
+												&point2,
+												pcb_layer_id(ctx->move.pcb->Data,Layer),
+												Line->Thickness,
+												Line->Clearance,
+												Line->Flags,
+												pcb_gui->shift_is_pressed(),
+												pcb_gui->control_is_pressed() );
+		pcb_route_apply_to_line(&route,Layer,Line);
+		pcb_route_destroy(&route);
+	}
+	return NULL;
+}
+
+/* moves a line between layers; lowlevel routines */
+void *pcb_lineop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_line_t * line, pcb_layer_t * Destination)
+{
+	pcb_r_delete_entry(Source->line_tree, (pcb_box_t *) line);
+
+	linelist_remove(line);
+	linelist_append(&(Destination->Line), line);
+
+	if (!Destination->line_tree)
+		Destination->line_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Destination->line_tree, (pcb_box_t *) line);
+
+	PCB_SET_PARENT(line, layer, Destination);
+
+	return line;
+}
+
+/* ---------------------------------------------------------------------------
+ * moves a line between layers
+ */
+struct via_info {
+	pcb_coord_t X, Y;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t moveline_callback(const pcb_box_t * b, void *cl)
+{
+	struct via_info *i = (struct via_info *) cl;
+	pcb_pstk_t *ps;
+
+#warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too
+	if ((ps = pcb_pstk_new_compat_via(PCB->Data, i->X, i->Y, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps);
+		pcb_pstk_invalidate_draw(ps);
+	}
+	longjmp(i->env, 1);
+}
+
+void *pcb_lineop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_line_t * Line)
+{
+	struct via_info info;
+	pcb_box_t sb;
+	pcb_line_t *newone;
+	void *ptr1, *ptr2, *ptr3;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line)) {
+		pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+		return NULL;
+	}
+	if (ctx->move.dst_layer == Layer && Layer->meta.real.vis)
+		pcb_line_invalidate_draw(Layer, Line);
+	if (ctx->move.dst_layer == Layer)
+		return Line;
+
+	pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_LINE, Layer, Line, Line);
+	if (Layer->meta.real.vis)
+		pcb_line_invalidate_erase(Line);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line);
+	newone = (pcb_line_t *) pcb_lineop_move_to_layer_low(ctx, Layer, Line, ctx->move.dst_layer);
+	Line = NULL;
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ctx->move.dst_layer, newone);
+	if (ctx->move.dst_layer->meta.real.vis)
+		pcb_line_invalidate_draw(ctx->move.dst_layer, newone);
+	if (!conf_core.editor.auto_via || !PCB->pstk_on || ctx->move.more_to_come ||
+			pcb_layer_get_group_(Layer) ==
+			pcb_layer_get_group_(ctx->move.dst_layer) || !(pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, Layer)) & PCB_LYT_COPPER) || !(pcb_layer_flags_(ctx->move.dst_layer) & PCB_LYT_COPPER))
+		return newone;
+	/* consider via at Point1 */
+	sb.X1 = newone->Point1.X - newone->Thickness / 2;
+	sb.X2 = newone->Point1.X + newone->Thickness / 2;
+	sb.Y1 = newone->Point1.Y - newone->Thickness / 2;
+	sb.Y2 = newone->Point1.Y + newone->Thickness / 2;
+	if ((pcb_search_obj_by_location(PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3,
+															newone->Point1.X, newone->Point1.Y, conf_core.design.via_thickness / 2) == PCB_OBJ_VOID)) {
+		info.X = newone->Point1.X;
+		info.Y = newone->Point1.Y;
+		if (setjmp(info.env) == 0)
+			pcb_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL);
+	}
+	/* consider via at Point2 */
+	sb.X1 = newone->Point2.X - newone->Thickness / 2;
+	sb.X2 = newone->Point2.X + newone->Thickness / 2;
+	sb.Y1 = newone->Point2.Y - newone->Thickness / 2;
+	sb.Y2 = newone->Point2.Y + newone->Thickness / 2;
+	if ((pcb_search_obj_by_location(PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3,
+															newone->Point2.X, newone->Point2.Y, conf_core.design.via_thickness / 2) == PCB_OBJ_VOID)) {
+		info.X = newone->Point2.X;
+		info.Y = newone->Point2.Y;
+		if (setjmp(info.env) == 0)
+			pcb_r_search(Layer->line_tree, &sb, NULL, moveline_callback, &info, NULL);
+	}
+	return newone;
+}
+
+/* destroys a line from a layer */
+void *pcb_lineop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+
+	pcb_line_free(Line);
+	return NULL;
+}
+
+/* remove point... */
+struct rlp_info {
+	jmp_buf env;
+	pcb_line_t *line;
+	pcb_point_t *point;
+};
+static pcb_r_dir_t remove_point(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct rlp_info *info = (struct rlp_info *) cl;
+	if (line == info->line)
+		return PCB_R_DIR_NOT_FOUND;
+	if ((line->Point1.X == info->point->X)
+			&& (line->Point1.Y == info->point->Y)) {
+		info->line = line;
+		info->point = &line->Point1;
+		longjmp(info->env, 1);
+	}
+	else if ((line->Point2.X == info->point->X)
+					 && (line->Point2.Y == info->point->Y)) {
+		info->line = line;
+		info->point = &line->Point2;
+		longjmp(info->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* removes a line point, or a line if the selected point is the end */
+void *pcb_lineop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point)
+{
+	pcb_point_t other;
+	struct rlp_info info;
+	if (&Line->Point1 == Point)
+		other = Line->Point2;
+	else
+		other = Line->Point1;
+	info.line = Line;
+	info.point = Point;
+	if (setjmp(info.env) == 0) {
+		pcb_r_search(Layer->line_tree, (const pcb_box_t *) Point, NULL, remove_point, &info, NULL);
+		return pcb_lineop_remove(ctx, Layer, Line);
+	}
+	pcb_move_obj(PCB_OBJ_LINE_POINT, Layer, info.line, info.point, other.X - Point->X, other.Y - Point->Y);
+	return (pcb_lineop_remove(ctx, Layer, Line));
+}
+
+/* removes a line from a layer */
+void *pcb_lineop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	/* erase from screen */
+	if (Layer->meta.real.vis)
+		pcb_line_invalidate_erase(Line);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_LINE, Layer, Line, Line);
+	return NULL;
+}
+
+void *pcb_line_destroy(pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	res = pcb_lineop_remove(&ctx, Layer, Line);
+	pcb_draw();
+	return res;
+}
+
+/* rotates a line in 90 degree steps */
+void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	PCB_COORD_ROTATE90(Line->Point1.X, Line->Point1.Y, X, Y, Number);
+	PCB_COORD_ROTATE90(Line->Point2.X, Line->Point2.Y, X, Y, Number);
+	/* keep horizontal, vertical Point2 > Point1 */
+	if (Line->Point1.X == Line->Point2.X) {
+		if (Line->Point1.Y > Line->Point2.Y) {
+			pcb_coord_t t;
+			t = Line->Point1.Y;
+			Line->Point1.Y = Line->Point2.Y;
+			Line->Point2.Y = t;
+		}
+	}
+	else if (Line->Point1.Y == Line->Point2.Y) {
+		if (Line->Point1.X > Line->Point2.X) {
+			pcb_coord_t t;
+			t = Line->Point1.X;
+			Line->Point1.X = Line->Point2.X;
+			Line->Point2.X = t;
+		}
+	}
+	/* instead of rotating the bounding box, the call updates both end points too */
+	pcb_line_bbox(Line);
+}
+
+void pcb_line_rotate(pcb_layer_t *layer, pcb_line_t *line, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina)
+{
+	if (layer->line_tree != NULL)
+		pcb_r_delete_entry(layer->line_tree, (pcb_box_t *) line);
+	pcb_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina);
+	pcb_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina);
+	pcb_line_bbox(line);
+	if (layer->line_tree != NULL)
+		pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) line);
+}
+
+void pcb_line_mirror(pcb_layer_t *layer, pcb_line_t *line, pcb_coord_t y_offs)
+{
+	if (layer->line_tree != NULL)
+		pcb_r_delete_entry(layer->line_tree, (pcb_box_t *) line);
+	line->Point1.X = PCB_SWAP_X(line->Point1.X);
+	line->Point1.Y = PCB_SWAP_Y(line->Point1.Y) + y_offs;
+	line->Point2.X = PCB_SWAP_X(line->Point2.X);
+	line->Point2.Y = PCB_SWAP_Y(line->Point2.Y) + y_offs;
+	pcb_line_bbox(line);
+	if (layer->line_tree != NULL)
+		pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) line);
+}
+
+void pcb_line_flip_side(pcb_layer_t *layer, pcb_line_t *line)
+{
+	pcb_r_delete_entry(layer->line_tree, (pcb_box_t *) line);
+	line->Point1.X = PCB_SWAP_X(line->Point1.X);
+	line->Point1.Y = PCB_SWAP_Y(line->Point1.Y);
+	line->Point2.X = PCB_SWAP_X(line->Point2.X);
+	line->Point2.Y = PCB_SWAP_Y(line->Point2.Y);
+	pcb_line_bbox(line);
+	pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) line);
+}
+
+static void rotate_line1(pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_invalidate_erase(Line);
+	if (Layer) {
+		if (!Layer->is_bound)
+			pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line);
+		if (Layer->line_tree != NULL)
+			pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+	}
+	else
+		pcb_r_delete_entry(PCB->Data->rat_tree, (pcb_box_t *) Line);
+}
+
+static void rotate_line2(pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_bbox(Line);
+	if (Layer) {
+		if (Layer->line_tree != NULL)
+			pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+		if (!Layer->is_bound)
+			pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line);
+		pcb_line_invalidate_draw(Layer, Line);
+	}
+	else {
+		pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) Line);
+		pcb_rat_invalidate_draw((pcb_rat_t *) Line);
+	}
+}
+
+/* rotates a line's point */
+void *pcb_lineop_rotate90_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point)
+{
+	rotate_line1(Layer, Line);
+
+	pcb_point_rotate90(Point, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+
+	rotate_line2(Layer, Line);
+	return Line;
+}
+
+/* rotates a line */
+void *pcb_lineop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	rotate_line1(Layer, Line);
+	pcb_point_rotate90(&Line->Point1, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+	pcb_point_rotate90(&Line->Point2, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+	rotate_line2(Layer, Line);
+	return Line;
+}
+
+void *pcb_lineop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_rotate(Layer, Line, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+	return Line;
+}
+
+/* inserts a point into a line */
+void *pcb_lineop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_line_t *line;
+	pcb_coord_t X, Y;
+
+	if (((Line->Point1.X == ctx->insert.x) && (Line->Point1.Y == ctx->insert.y)) ||
+			((Line->Point2.X == ctx->insert.x) && (Line->Point2.Y == ctx->insert.y)))
+		return NULL;
+	X = Line->Point2.X;
+	Y = Line->Point2.Y;
+	pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, Layer, Line, &Line->Point2, ctx->insert.x - X, ctx->insert.y - Y);
+	pcb_line_invalidate_erase(Line);
+	pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line);
+	Line->Point2.X = ctx->insert.x;
+	Line->Point2.Y = ctx->insert.y;
+	pcb_line_bbox(Line);
+	pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, Line);
+	pcb_line_invalidate_draw(Layer, Line);
+	/* we must create after playing with Line since creation may
+	 * invalidate the line pointer
+	 */
+	if ((line = pcb_line_new_merge(Layer, ctx->insert.x, ctx->insert.y, X, Y, Line->Thickness, Line->Clearance, Line->Flags))) {
+		pcb_line_copy_meta(line, Line);
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, Layer, line, line);
+		pcb_line_invalidate_draw(Layer, line);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, Layer, line);
+		/* creation call adds it to the rtree */
+	}
+	return line;
+}
+
+void *pcb_lineop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	static pcb_flag_values_t pcb_line_flags = 0;
+	if (pcb_line_flags == 0)
+		pcb_line_flags = pcb_obj_valid_flags(PCB_OBJ_LINE);
+
+	if ((ctx->chgflag.flag & pcb_line_flags) != ctx->chgflag.flag)
+		return NULL;
+	if ((ctx->chgflag.flag & PCB_FLAG_TERMNAME) && (Line->term == NULL))
+		return NULL;
+	pcb_undo_add_obj_to_flag(Line);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_LINE, Line->parent.layer, Line);
+
+	PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Line);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_LINE, Line->parent.layer, Line);
+
+	return Line;
+}
+
+void *pcb_lineop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_line_t *line)
+{
+	pcb_line_name_invalidate_draw(line);
+	return line;
+}
+
+
+/*** draw ***/
+
+static pcb_bool is_line_term_vert(const pcb_line_t *line)
+{
+	pcb_coord_t dx, dy;
+
+	dx = line->Point1.X - line->Point2.X;
+	if (dx < 0)
+		dx = -dx;
+
+	dy = line->Point1.Y - line->Point2.Y;
+	if (dy < 0)
+		dy = -dy;
+
+	return dx < dy;
+}
+
+void pcb_line_name_invalidate_draw(pcb_line_t *line)
+{
+	if (line->term != NULL) {
+		pcb_term_label_invalidate((line->Point1.X + line->Point2.X)/2, (line->Point1.Y + line->Point2.Y)/2,
+			100.0, is_line_term_vert(line), pcb_true, line->term, line->intconn);
+	}
+}
+
+void pcb_line_draw_label(pcb_line_t *line)
+{
+	if (line->term != NULL)
+		pcb_term_label_draw((line->Point1.X + line->Point2.X)/2, (line->Point1.Y + line->Point2.Y)/2,
+			conf_core.appearance.term_label_size, is_line_term_vert(line), pcb_true, line->term, line->intconn);
+}
+
+
+void pcb_line_draw_(pcb_line_t *line, int allow_term_gfx)
+{
+	if (delayed_terms_enabled && (line->term != NULL)) {
+		pcb_draw_delay_obj_add((pcb_any_obj_t *)line);
+		return;
+	}
+
+	PCB_DRAW_BBOX(line);
+	pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+	if (!conf_core.editor.thin_draw && !conf_core.editor.wireframe_draw) {
+		if ((allow_term_gfx) && pcb_draw_term_need_gfx(line)) {
+			pcb_hid_set_line_cap(pcb_draw_out.active_padGC, pcb_cap_round);
+			pcb_hid_set_line_width(pcb_draw_out.active_padGC, line->Thickness);
+			pcb_gui->draw_line(pcb_draw_out.active_padGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, PCB_DRAW_TERM_GFX_WIDTH);
+		}
+		else
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, line->Thickness);
+		pcb_gui->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+	}
+	else {
+		if(conf_core.editor.thin_draw) {
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			pcb_gui->draw_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+		}
+
+		if(conf_core.editor.wireframe_draw) { 
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			pcb_draw_wireframe_line(pcb_draw_out.fgGC, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0);
+		}
+	}
+
+	if (line->term != NULL) {
+		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, line))
+			pcb_draw_delay_label_add((pcb_any_obj_t *)line);
+	}
+}
+
+static void pcb_line_draw(pcb_layer_t *layer, pcb_line_t *line, int allow_term_gfx)
+{
+	const char *color;
+	char buf[sizeof("#XXXXXX")];
+
+	if (PCB_FLAG_TEST(PCB_FLAG_WARN, line))
+		color = conf_core.appearance.color.warn;
+	else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, line)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) {
+			if (layer->is_bound)
+				PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
+			else
+				color = conf_core.appearance.color.selected;
+		}
+		else
+			color = conf_core.appearance.color.connected;
+	}
+	else if (PCB_HAS_COLOROVERRIDE(line)) {
+		color = (line->override_color);
+	}
+	else if (layer->is_bound)
+		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
+	else
+		color = layer->meta.real.color;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, line)) {
+		assert(color != NULL);
+		pcb_lighten_color(color, buf, 1.75);
+		color = buf;
+	}
+
+	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	pcb_line_draw_(line, allow_term_gfx);
+}
+
+pcb_r_dir_t pcb_line_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *)b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(line->parent_type, &line->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_line_draw((pcb_layer_t *)cl, line, 0);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_line_draw_term_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *)b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(line->parent_type, &line->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_line_draw((pcb_layer_t *)cl, line, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* erases a line on a layer */
+void pcb_line_invalidate_erase(pcb_line_t *Line)
+{
+	pcb_draw_invalidate(Line);
+	pcb_flag_erase(&Line->Flags);
+}
+
+void pcb_line_invalidate_draw(pcb_layer_t *Layer, pcb_line_t *Line)
+{
+	pcb_draw_invalidate(Line);
+}
+
Index: tags/2.0.1/src/obj_line.h
===================================================================
--- tags/2.0.1/src/obj_line.h	(nonexistent)
+++ tags/2.0.1/src/obj_line.h	(revision 18980)
@@ -0,0 +1,140 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: line segment */
+
+#ifndef PCB_OBJ_LINE_H
+#define PCB_OBJ_LINE_H
+
+#include <genlist/gendlist.h>
+#include "obj_common.h"
+
+struct pcb_line_s {            /* holds information about one line */
+	PCB_ANYLINEFIELDS;
+	gdl_elem_t link;             /* a line is in a list: either on a layer */
+};
+
+/* crosshair: */
+typedef struct {								/* current marked line */
+	pcb_point_t Point1,							/* start- and end-position */
+	  Point2;
+	long int State;
+	pcb_bool draw;
+} pcb_attached_line_t;
+
+
+pcb_line_t *pcb_line_alloc(pcb_layer_t * layer);
+void pcb_line_free(pcb_line_t * data);
+
+pcb_line_t *pcb_line_new_merge(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_line_t *pcb_line_new(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_line_t *pcb_line_dup(pcb_layer_t *Layer, pcb_line_t *src);
+pcb_line_t *pcb_line_dup_at(pcb_layer_t *dst, pcb_line_t *src, pcb_coord_t dx, pcb_coord_t dy);
+void *pcb_line_destroy(pcb_layer_t *dst, pcb_line_t *src);
+
+
+/* Add objects without creating them or making any "sanity modifications" to them */
+void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line);
+
+void pcb_line_bbox(pcb_line_t *Line);
+void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+void pcb_line_rotate(pcb_layer_t *layer, pcb_line_t *line, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina);
+void pcb_line_mirror(pcb_layer_t *layer, pcb_line_t *line, pcb_coord_t y_offs);
+void pcb_line_flip_side(pcb_layer_t *layer, pcb_line_t *line);
+
+pcb_coord_t pcb_line_length(const pcb_line_t *line);
+double pcb_line_area(const pcb_line_t *line);
+
+/* Convert a square cap line (e.g. a gEDA/pcb pad) to 4 corner points of a rectangle */
+void pcb_sqline_to_rect(const pcb_line_t *line, pcb_coord_t *x, pcb_coord_t *y);
+
+/* hash and eq */
+int pcb_line_eq(const pcb_host_trans_t *tr1, const pcb_line_t *l1, const pcb_host_trans_t *tr2, const pcb_line_t *l2);
+unsigned int pcb_line_hash(const pcb_host_trans_t *tr, const pcb_line_t *l);
+
+/* un-administrate a line; call before changing geometry */
+void pcb_line_pre(pcb_line_t *line);
+
+/* re-administrate a line; call after changing geometry */
+void pcb_line_post(pcb_line_t *line);
+
+/*** DRC enforcement (obj_line_drcenf.c) ***/
+void pcb_line_adjust_attached(void);
+void pcb_line_adjust_attached_2lines(pcb_bool);
+void pcb_line_45(pcb_attached_line_t *);
+void pcb_line_enforce_drc(void);
+
+/* Rather than mode the line bounding box, we set it so the point bounding
+ * boxes are updated too.
+ */
+#define pcb_line_move(l,dx,dy) \
+	do { \
+		pcb_coord_t __dx__ = (dx), __dy__ = (dy); \
+		pcb_line_t *__l__ = (l); \
+		PCB_MOVE((__l__)->Point1.X,(__l__)->Point1.Y,(__dx__),(__dy__)) \
+		PCB_MOVE((__l__)->Point2.X,(__l__)->Point2.Y,(__dx__),(__dy__)) \
+		pcb_line_bbox(__l__); \
+	} while(0)
+
+#define PCB_LINE_LOOP(layer) do {                                       \
+  pcb_line_t *line;                                                   \
+  gdl_iterator_t __it__;                                            \
+  linelist_foreach(&(layer)->Line, &__it__, line) {
+
+#define PCB_LINE_ALL_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		PCB_LINE_LOOP(layer)
+
+#define PCB_LINE_COPPER_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_COPPER)) continue; \
+		PCB_LINE_LOOP(layer)
+
+#define PCB_LINE_SILK_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_SILK)) continue; \
+		PCB_LINE_LOOP(layer)
+
+#define PCB_LINE_VISIBLE_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (layer->meta.real.vis) \
+			PCB_LINE_LOOP(layer)
+
+#endif
Index: tags/2.0.1/src/obj_line_draw.h
===================================================================
--- tags/2.0.1/src/obj_line_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_line_draw.h	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard draw of lines ***/
+
+/* Include rtree.h for this */
+#ifdef PCB_RTREE_H
+pcb_r_dir_t pcb_line_draw_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_line_draw_term_callback(const pcb_box_t * b, void *cl);
+#endif
+
+void pcb_line_draw_(pcb_line_t *line, int allow_term_gfx);
+void pcb_line_invalidate_erase(pcb_line_t *Line);
+void pcb_line_invalidate_draw(pcb_layer_t *Layer, pcb_line_t *Line);
+void pcb_line_draw_label(pcb_line_t *line);
+void pcb_line_name_invalidate_draw(pcb_line_t *line);
+
Index: tags/2.0.1/src/obj_line_drcenf.c
===================================================================
--- tags/2.0.1/src/obj_line_drcenf.c	(nonexistent)
+++ tags/2.0.1/src/obj_line_drcenf.c	(revision 18980)
@@ -0,0 +1,529 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+#include "math_helper.h"
+
+#include <setjmp.h>
+#include <stdlib.h>
+
+#include "board.h"
+#include "data.h"
+#include "find.h"
+#include "rtree.h"
+#include "macro.h"
+
+static double drc_lines(pcb_point_t *end, pcb_bool way);
+
+/* ---------------------------------------------------------------------------
+ * Adjust the attached line to 45 degrees if necessary
+ */
+void pcb_line_adjust_attached(void)
+{
+	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
+	int flags = conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0;
+
+	if (conf_core.editor.auto_drc && (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER))
+		flags |= PCB_FLAG_FOUND;
+
+	/* I need at least one point */
+	if (line->State == PCB_CH_STATE_FIRST)
+		return;
+
+	line->Point2.X = pcb_crosshair.X;
+	line->Point2.Y = pcb_crosshair.Y;
+
+	pcb_route_calculate(PCB,
+											&pcb_crosshair.Route,
+											&line->Point1,
+											&line->Point2,
+											pcb_layer_id(PCB->Data, CURRENT),
+											conf_core.design.line_thickness,
+											conf_core.design.clearance * 2,
+											pcb_flag_make(flags),
+											pcb_gui->shift_is_pressed(),
+											pcb_gui->control_is_pressed() );
+
+}
+
+/* ---------------------------------------------------------------------------
+ * makes the attached line fit into a 45 degree direction
+ *
+ * directions:
+ *
+ *           0
+ *          7 1
+ *         6   2
+ *          5 3
+ *           4
+ */
+void pcb_line_45(pcb_attached_line_t *Line)
+{
+	pcb_coord_t dx, dy, min;
+	unsigned direction = 0;
+	double m;
+
+	/* first calculate direction of line */
+	dx = pcb_crosshair.X - Line->Point1.X;
+	dy = pcb_crosshair.Y - Line->Point1.Y;
+
+	if (!dx) {
+		if (!dy)
+			/* zero length line, don't draw anything */
+			return;
+		else
+			direction = dy > 0 ? 0 : 4;
+	}
+	else {
+		m = (double) dy / dx;
+		direction = 2;
+		if (m > PCB_TAN_30_DEGREE)
+			direction = m > PCB_TAN_60_DEGREE ? 0 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			direction = m < -PCB_TAN_60_DEGREE ? 0 : 3;
+	}
+	if (dx < 0)
+		direction += 4;
+
+	dx = coord_abs(dx);
+	dy = coord_abs(dy);
+	min = MIN(dx, dy);
+
+	/* now set up the second pair of coordinates */
+	switch (direction) {
+	case 0:
+	case 4:
+		Line->Point2.X = Line->Point1.X;
+		Line->Point2.Y = pcb_crosshair.Y;
+		break;
+
+	case 2:
+	case 6:
+		Line->Point2.X = pcb_crosshair.X;
+		Line->Point2.Y = Line->Point1.Y;
+		break;
+
+	case 1:
+		Line->Point2.X = Line->Point1.X + min;
+		Line->Point2.Y = Line->Point1.Y + min;
+		break;
+
+	case 3:
+		Line->Point2.X = Line->Point1.X + min;
+		Line->Point2.Y = Line->Point1.Y - min;
+		break;
+
+	case 5:
+		Line->Point2.X = Line->Point1.X - min;
+		Line->Point2.Y = Line->Point1.Y - min;
+		break;
+
+	case 7:
+		Line->Point2.X = Line->Point1.X - min;
+		Line->Point2.Y = Line->Point1.Y + min;
+		break;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ *  adjusts the insert lines to make them 45 degrees as necessary
+ */
+void pcb_line_adjust_attached_2lines(pcb_bool way)
+{
+	pcb_coord_t dx, dy;
+	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
+
+	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
+		return;
+	/* don't draw outline when ctrl key is pressed */
+	if (pcb_gui->control_is_pressed()) {
+		line->draw = pcb_false;
+		return;
+	}
+	else
+		line->draw = pcb_true;
+	if (conf_core.editor.all_direction_lines) {
+		line->Point2.X = pcb_crosshair.X;
+		line->Point2.Y = pcb_crosshair.Y;
+		return;
+	}
+	/* swap the modes if shift is held down */
+	if (pcb_gui->shift_is_pressed())
+		way = !way;
+	dx = pcb_crosshair.X - line->Point1.X;
+	dy = pcb_crosshair.Y - line->Point1.Y;
+	if (!way) {
+		if (coord_abs(dx) > coord_abs(dy)) {
+			line->Point2.X = pcb_crosshair.X - SGN(dx) * coord_abs(dy);
+			line->Point2.Y = line->Point1.Y;
+		}
+		else {
+			line->Point2.X = line->Point1.X;
+			line->Point2.Y = pcb_crosshair.Y - SGN(dy) * coord_abs(dx);
+		}
+	}
+	else {
+		if (coord_abs(dx) > coord_abs(dy)) {
+			line->Point2.X = line->Point1.X + SGN(dx) * coord_abs(dy);
+			line->Point2.Y = pcb_crosshair.Y;
+		}
+		else {
+			line->Point2.X = pcb_crosshair.X;
+			line->Point2.Y = line->Point1.Y + SGN(dy) * coord_abs(dx);
+		}
+	}
+}
+
+struct drc_info {
+	pcb_line_t *line;
+	pcb_bool solder;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t drcPstk_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	struct drc_info *i = (struct drc_info *)cl;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, ps) && pcb_pstk_intersect_line(ps, i->line))
+		longjmp(i->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t drcLine_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct drc_info *i = (struct drc_info *) cl;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && pcb_intersect_line_line(line, i->line))
+		longjmp(i->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t drcArc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct drc_info *i = (struct drc_info *) cl;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && pcb_intersect_line_arc(i->line, arc))
+		longjmp(i->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* drc_lines() checks for intersectors against two lines and
+ * adjusts the end point until there is no intersection or
+ * it winds up back at the start. If way is pcb_false it checks
+ * an ortho start line with one 45 refraction to reach the endpoint,
+ * otherwise it checks a 45 start, with a ortho refraction to reach endpoint
+ *
+ * It returns the straight-line length of the best answer, and
+ * changes the position of the input end point to the best answer.
+ */
+static double drc_lines(pcb_point_t *end, pcb_bool way)
+{
+	double f, s, f2, s2, len, best;
+	pcb_coord_t dx, dy, temp, last, length;
+	pcb_coord_t temp2, last2, length2;
+	pcb_line_t line1, line2;
+	pcb_layergrp_id_t group, comp;
+	struct drc_info info;
+	pcb_bool two_lines, x_is_long, blocker;
+	pcb_point_t ans;
+
+	f = 1.0;
+	s = 0.5;
+	last = -1;
+	line1.type = line2.type = PCB_OBJ_LINE;
+	line1.Flags = line2.Flags = pcb_no_flags();
+	line1.parent_type = line2.parent_type = PCB_PARENT_LAYER;
+	line1.parent.layer = line2.parent.layer = CURRENT;
+	line1.Thickness = conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1);
+	line2.Thickness = line1.Thickness;
+	line1.Clearance = line2.Clearance = 0;
+	line1.Point1.X = pcb_crosshair.AttachedLine.Point1.X;
+	line1.Point1.Y = pcb_crosshair.AttachedLine.Point1.Y;
+	dy = end->Y - line1.Point1.Y;
+	dx = end->X - line1.Point1.X;
+	if (coord_abs(dx) > coord_abs(dy)) {
+		x_is_long = pcb_true;
+		length = coord_abs(dx);
+	}
+	else {
+		x_is_long = pcb_false;
+		length = coord_abs(dy);
+	}
+	group = pcb_layer_get_group(PCB, INDEXOFCURRENT);
+	comp = PCB->LayerGroups.len + 10;				/* this out-of-range group might save a call */
+	if (pcb_layergrp_flags(PCB, group) & PCB_LYT_BOTTOM)
+		info.solder = pcb_true;
+	else {
+		info.solder = pcb_false;
+		pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &comp, 1);
+	}
+	temp = length;
+	/* assume the worst */
+	best = 0.0;
+	ans.X = line1.Point1.X;
+	ans.Y = line1.Point1.Y;
+	while (length != last) {
+		last = length;
+		if (x_is_long) {
+			dx = SGN(dx) * length;
+			dy = end->Y - line1.Point1.Y;
+			length2 = coord_abs(dy);
+		}
+		else {
+			dy = SGN(dy) * length;
+			dx = end->X - line1.Point1.X;
+			length2 = coord_abs(dx);
+		}
+		temp2 = length2;
+		f2 = 1.0;
+		s2 = 0.5;
+		last2 = -1;
+		blocker = pcb_true;
+		while (length2 != last2) {
+			if (x_is_long)
+				dy = SGN(dy) * length2;
+			else
+				dx = SGN(dx) * length2;
+			two_lines = pcb_true;
+			if (coord_abs(dx) > coord_abs(dy) && x_is_long) {
+				line1.Point2.X = line1.Point1.X + (way ? SGN(dx) * coord_abs(dy) : dx - SGN(dx) * coord_abs(dy));
+				line1.Point2.Y = line1.Point1.Y + (way ? dy : 0);
+			}
+			else if (coord_abs(dy) >= coord_abs(dx) && !x_is_long) {
+				line1.Point2.X = line1.Point1.X + (way ? dx : 0);
+				line1.Point2.Y = line1.Point1.Y + (way ? SGN(dy) * coord_abs(dx) : dy - SGN(dy) * coord_abs(dx));
+			}
+			else if (x_is_long) {
+				/* we've changed which axis is long, so only do one line */
+				line1.Point2.X = line1.Point1.X + dx;
+				line1.Point2.Y = line1.Point1.Y + (way ? SGN(dy) * coord_abs(dx) : 0);
+				two_lines = pcb_false;
+			}
+			else {
+				/* we've changed which axis is long, so only do one line */
+				line1.Point2.Y = line1.Point1.Y + dy;
+				line1.Point2.X = line1.Point1.X + (way ? SGN(dx) * coord_abs(dy) : 0);
+				two_lines = pcb_false;
+			}
+			line2.Point1.X = line1.Point2.X;
+			line2.Point1.Y = line1.Point2.Y;
+			if (!two_lines) {
+				line2.Point2.Y = line1.Point2.Y;
+				line2.Point2.X = line1.Point2.X;
+			}
+			else {
+				line2.Point2.X = line1.Point1.X + dx;
+				line2.Point2.Y = line1.Point1.Y + dy;
+			}
+			pcb_line_bbox(&line1);
+			pcb_line_bbox(&line2);
+			last2 = length2;
+			if (setjmp(info.env) == 0) {
+				info.line = &line1;
+				pcb_r_search(PCB->Data->padstack_tree, &line1.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+				if (two_lines) {
+					info.line = &line2;
+					pcb_r_search(PCB->Data->padstack_tree, &line2.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+				}
+				PCB_COPPER_GROUP_LOOP(PCB->Data, group);
+				{
+					info.line = &line1;
+					pcb_r_search(layer->line_tree, &line1.BoundingBox, NULL, drcLine_callback, &info, NULL);
+					pcb_r_search(layer->arc_tree, &line1.BoundingBox, NULL, drcArc_callback, &info, NULL);
+					if (two_lines) {
+						info.line = &line2;
+						pcb_r_search(layer->line_tree, &line2.BoundingBox, NULL, drcLine_callback, &info, NULL);
+						pcb_r_search(layer->arc_tree, &line2.BoundingBox, NULL, drcArc_callback, &info, NULL);
+					}
+				}
+				PCB_END_LOOP;
+				/* no intersector! */
+				blocker = pcb_false;
+				f2 += s2;
+				len = (line2.Point2.X - line1.Point1.X);
+				len *= len;
+				len += (double) (line2.Point2.Y - line1.Point1.Y) * (line2.Point2.Y - line1.Point1.Y);
+				if (len > best) {
+					best = len;
+					ans.X = line2.Point2.X;
+					ans.Y = line2.Point2.Y;
+				}
+#if 0
+				if (f2 > 1.0)
+					f2 = 0.5;
+#endif
+			}
+			else {
+				/* bumped into something, back off */
+				f2 -= s2;
+			}
+			s2 *= 0.5;
+			length2 = MIN(f2 * temp2, temp2);
+		}
+		if (!blocker && ((x_is_long && line2.Point2.X - line1.Point1.X == dx)
+										 || (!x_is_long && line2.Point2.Y - line1.Point1.Y == dy)))
+			f += s;
+		else
+			f -= s;
+		s *= 0.5;
+		length = MIN(f * temp, temp);
+	}
+
+	end->X = ans.X;
+	end->Y = ans.Y;
+	return best;
+}
+
+static void drc_line(pcb_point_t *end)
+{
+	struct drc_info info;
+	pcb_layergrp_id_t group, comp;
+	pcb_line_t line;
+	pcb_attached_line_t aline;
+	static pcb_point_t last_good; /* internal state of last good endpoint - we can do this cheat, because... */
+
+	/* ... we hardwire the assumption on how a line is drawn: it starts out as a 0 long segment, which is valid: */
+	if ((pcb_crosshair.AttachedLine.Point1.X == pcb_crosshair.X) && (pcb_crosshair.AttachedLine.Point1.Y == pcb_crosshair.Y)) {
+		line.Point1 = line.Point2 = pcb_crosshair.AttachedLine.Point1;
+		goto auto_good;
+	}
+
+	memset(&line, 0, sizeof(line));
+
+	/* check where the line wants to end */
+	aline.Point1.X = pcb_crosshair.AttachedLine.Point1.X;
+	aline.Point1.Y = pcb_crosshair.AttachedLine.Point1.Y;
+	pcb_line_45(&aline);
+	line.parent_type = PCB_PARENT_LAYER;
+	line.parent.layer = CURRENT;
+	line.type = PCB_OBJ_LINE;
+	line.Point1 = aline.Point1;
+	line.Point2 = aline.Point2;
+
+	/* prepare for the intersection search */
+	group = pcb_layer_get_group(PCB, INDEXOFCURRENT);
+	comp = PCB->LayerGroups.len + 10;  /* this out-of-range group might save a call */
+	if (pcb_layergrp_flags(PCB, group) & PCB_LYT_BOTTOM)
+		info.solder = pcb_true;
+	else {
+		info.solder = pcb_false;
+		pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &comp, 1);
+	}
+
+	/* search for intersection */
+	pcb_line_bbox(&line);
+	if (setjmp(info.env) == 0) {
+		info.line = &line;
+		pcb_r_search(PCB->Data->padstack_tree, &line.BoundingBox, NULL, drcPstk_callback, &info, NULL);
+		PCB_COPPER_GROUP_LOOP(PCB->Data, group);
+		{
+			info.line = &line;
+			pcb_r_search(layer->line_tree, &line.BoundingBox, NULL, drcLine_callback, &info, NULL);
+			pcb_r_search(layer->arc_tree, &line.BoundingBox, NULL, drcArc_callback, &info, NULL);
+		}
+		PCB_END_LOOP;
+		/* no intersector! */
+		auto_good:;
+		last_good.X = end->X = line.Point2.X;
+		last_good.Y = end->Y = line.Point2.Y;
+		return;
+	}
+
+	/* bumped into ans */
+	end->X = last_good.X;
+	end->Y = last_good.Y;
+}
+
+void pcb_line_enforce_drc(void)
+{
+	pcb_point_t r45, rs;
+	pcb_bool shift;
+	double r1, r2;
+
+	/* Silence a bogus compiler warning by storing this in a variable */
+	pcb_layer_id_t layer_idx = INDEXOFCURRENT;
+
+	if (pcb_gui->mod1_is_pressed() || pcb_gui->control_is_pressed() || PCB->RatDraw)
+		return;
+
+	if (!(pcb_layer_flags(PCB, layer_idx) & PCB_LYT_COPPER))
+		return;
+
+	rs.X = r45.X = pcb_crosshair.X;
+	rs.Y = r45.Y = pcb_crosshair.Y;
+
+	if (conf_core.editor.line_refraction != 0) {
+		/* first try starting straight */
+		r1 = drc_lines(&rs, pcb_false);
+		/* then try starting at 45 */
+		r2 = drc_lines(&r45, pcb_true);
+	}
+	else {
+		drc_line(&rs);
+		r45 = rs;
+#define sqr(a) ((a) * (a))
+		r1 = r2 = sqrt(sqr(rs.X - pcb_crosshair.AttachedLine.Point1.X) + sqr(rs.Y - pcb_crosshair.AttachedLine.Point1.Y));
+#undef sqr
+	}
+	/* shift<Key> forces the line lookahead path to refract the alternate way */
+	shift = pcb_gui->shift_is_pressed();
+
+	if (PCB_XOR(r1 > r2, shift)) {
+		if (conf_core.editor.line_refraction != 0) {
+			if (shift) {
+				if (conf_core.editor.line_refraction !=2)
+					conf_setf(CFR_DESIGN, "editor/line_refraction", -1, "%d", 2);
+			}
+			else{
+				if (conf_core.editor.line_refraction != 1)
+				conf_setf(CFR_DESIGN, "editor/line_refraction", -1, "%d", 1);
+			}
+		}
+		pcb_crosshair.X = rs.X;
+		pcb_crosshair.Y = rs.Y;
+	}
+	else {
+		if (conf_core.editor.line_refraction !=0) {
+			if (shift) {
+				if (conf_core.editor.line_refraction != 1)
+					conf_setf(CFR_DESIGN, "editor/line_refraction", -1, "%d", 1);
+			}
+			else {
+				if (conf_core.editor.line_refraction != 2)
+					conf_setf(CFR_DESIGN, "editor/line_refraction", -1, "%d", 2);
+			}
+		}
+		pcb_crosshair.X = r45.X;
+		pcb_crosshair.Y = r45.Y;
+	}
+}
Index: tags/2.0.1/src/obj_line_list.c
===================================================================
--- tags/2.0.1/src/obj_line_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_line_list.c	(revision 18980)
@@ -0,0 +1,29 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TDL_DONT_UNDEF
+#include "obj_line_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_line_list.h
===================================================================
--- tags/2.0.1/src/obj_line_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_line_list.h	(revision 18980)
@@ -0,0 +1,47 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_LINE_LIST_H
+#define PCB_OBJ_LINE_LIST_H
+
+#include "obj_line.h"
+
+/* List of Lines */
+#define TDL(x)      linelist_ ## x
+#define TDL_LIST_T  linelist_t
+#define TDL_ITEM_T  pcb_line_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define linelist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/obj_line_op.h
===================================================================
--- tags/2.0.1/src/obj_line_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_line_op.h	(revision 18980)
@@ -0,0 +1,59 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard operations on line segments ***/
+
+#include "operation.h"
+
+void *pcb_lineop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_line_t * line);
+void *pcb_lineop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point);
+void *pcb_lineop_move_point_with_route(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point);
+void *pcb_lineop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_line_t * line, pcb_layer_t * Destination);
+void *pcb_lineop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_line_t * Line);
+void *pcb_lineop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point);
+void *pcb_lineop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_rotate90_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *Point);
+void *pcb_lineop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line);
+void *pcb_lineop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_line_t *line);
+
+
+
Index: tags/2.0.1/src/obj_pinvia_therm.c
===================================================================
--- tags/2.0.1/src/obj_pinvia_therm.c	(nonexistent)
+++ tags/2.0.1/src/obj_pinvia_therm.c	(revision 18980)
@@ -0,0 +1,156 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *
+ *  this file, thermal.c was written by and is
+ *  (C) Copyright 2006, harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* negative thermal finger polygons */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <math.h>
+
+#include "board.h"
+#include "polygon.h"
+#include "obj_pinvia_therm.h"
+
+static pcb_polyarea_t *pcb_pa_diag_line(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t l, pcb_coord_t w, pcb_bool rt)
+{
+	pcb_pline_t *c;
+	pcb_vector_t v;
+	pcb_coord_t x1, x2, y1, y2;
+
+	if (rt) {
+		x1 = (l - w) * M_SQRT1_2;
+		x2 = (l + w) * M_SQRT1_2;
+		y1 = x1;
+		y2 = x2;
+	}
+	else {
+		x2 = -(l - w) * M_SQRT1_2;
+		x1 = -(l + w) * M_SQRT1_2;
+		y1 = -x1;
+		y2 = -x2;
+	}
+
+	v[0] = X + x1;
+	v[1] = Y + y2;
+	if ((c = pcb_poly_contour_new(v)) == NULL)
+		return NULL;
+	v[0] = X - x2;
+	v[1] = Y - y1;
+	pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+	v[0] = X - x1;
+	v[1] = Y - y2;
+	pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+	v[0] = X + x2;
+	v[1] = Y + y1;
+	pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+	return pcb_poly_from_contour(c);
+}
+
+/* ThermPoly returns a pcb_polyarea_t having all of the clearance that when
+ * subtracted from the plane create the desired thermal fingers.
+ * Usually this is 4 disjoint regions.
+ *
+ */
+pcb_polyarea_t *ThermPoly_(pcb_board_t *pcb, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t thickness, pcb_coord_t clearance, pcb_cardinal_t style)
+{
+	pcb_arc_t a;
+	pcb_polyarea_t *pa, *arc;
+
+	/* must be circular */
+	switch (style) {
+	case 1:
+	case 2:
+		{
+			pcb_polyarea_t *m;
+			pcb_coord_t t = (thickness + clearance) / 2;
+			pcb_coord_t w = 0.5 * pcb->ThermScale * clearance;
+			pa = pcb_poly_from_circle(cx, cy, t);
+			arc = pcb_poly_from_circle(cx, cy, thickness / 2);
+			/* create a thin ring */
+			pcb_polyarea_boolean_free(pa, arc, &m, PCB_PBO_SUB);
+			/* fix me needs error checking */
+			if (style == 2) {
+				/* t is the theoretically required length, but we use twice that
+				 * to avoid discretisation errors in our circle approximation.
+				 */
+				pa = pcb_poly_from_rect(cx - t * 2, cx + t * 2, cy - w, cy + w);
+				pcb_polyarea_boolean_free(m, pa, &arc, PCB_PBO_SUB);
+				pa = pcb_poly_from_rect(cx - w, cx + w, cy - t * 2, cy + t * 2);
+			}
+			else {
+				/* t is the theoretically required length, but we use twice that
+				 * to avoid discretisation errors in our circle approximation.
+				 */
+				pa = pcb_pa_diag_line(cx, cy, t * 2, w, pcb_true);
+				pcb_polyarea_boolean_free(m, pa, &arc, PCB_PBO_SUB);
+				pa = pcb_pa_diag_line(cx, cy, t * 2, w, pcb_false);
+			}
+			pcb_polyarea_boolean_free(arc, pa, &m, PCB_PBO_SUB);
+			return m;
+		}
+
+	default:
+		a.X = cx;
+		a.Y = cy;
+		a.Height = a.Width = thickness / 2 + clearance / 4;
+		a.Thickness = 1;
+		a.Clearance = clearance / 2;
+		a.Flags = pcb_no_flags();
+		a.Delta = 90 - (a.Clearance * (1. + 2. * pcb->ThermScale) * 180) / (M_PI * a.Width);
+		a.StartAngle = 90 - a.Delta / 2 + (style == 4 ? 0 : 45);
+		pa = pcb_poly_from_arc(&a, a.Clearance);
+		if (!pa)
+			return NULL;
+		a.StartAngle += 90;
+		arc = pcb_poly_from_arc(&a, a.Clearance);
+		if (!arc)
+			return NULL;
+		pa->f = arc;
+		arc->b = pa;
+		a.StartAngle += 90;
+		arc = pcb_poly_from_arc(&a, a.Clearance);
+		if (!arc)
+			return NULL;
+		pa->f->f = arc;
+		arc->b = pa->f;
+		a.StartAngle += 90;
+		arc = pcb_poly_from_arc(&a, a.Clearance);
+		if (!arc)
+			return NULL;
+		pa->b = arc;
+		pa->f->f->f = arc;
+		arc->b = pa->f->f;
+		arc->f = pa;
+		pa->b = arc;
+		return pa;
+	}
+}
Index: tags/2.0.1/src/obj_pinvia_therm.h
===================================================================
--- tags/2.0.1/src/obj_pinvia_therm.h	(nonexistent)
+++ tags/2.0.1/src/obj_pinvia_therm.h	(revision 18980)
@@ -0,0 +1,39 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Thermal on padstacks are modified forms of the clearance cutout so that
+   the padstack has galvanic connection to the sorrunding polygon. */
+#ifndef	PCB_PINVIA_THERMAL_H
+#define	PCB_PINVIA_THERMAL_H
+
+#include <stdlib.h>
+#include "config.h"
+
+pcb_polyarea_t *ThermPoly_(pcb_board_t *p, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t thickness, pcb_coord_t clearance, pcb_cardinal_t style);
+
+#endif
Index: tags/2.0.1/src/obj_poly.c
===================================================================
--- tags/2.0.1/src/obj_poly.c	(nonexistent)
+++ tags/2.0.1/src/obj_poly.c	(revision 18980)
@@ -0,0 +1,1142 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: polygons */
+
+
+#include "config.h"
+
+#include "board.h"
+#include "data.h"
+#include "compat_nls.h"
+#include "undo.h"
+#include "polygon.h"
+#include "polygon_offs.h"
+#include "rotate.h"
+#include "search.h"
+#include "hid_inlines.h"
+
+#include "conf_core.h"
+
+#include "obj_poly.h"
+#include "obj_poly_op.h"
+#include "obj_poly_list.h"
+#include "obj_poly_draw.h"
+
+#include "obj_subc_parent.h"
+#include "obj_hash.h"
+
+/* TODO: get rid of these: */
+#include "draw.h"
+
+#define	STEP_POLYGONPOINT	10
+#define	STEP_POLYGONHOLEINDEX	10
+
+/*** allocation ***/
+
+/* get next slot for a polygon object, allocates memory if necessary */
+pcb_poly_t *pcb_poly_alloc(pcb_layer_t * layer)
+{
+	pcb_poly_t *new_obj;
+
+	new_obj = calloc(sizeof(pcb_poly_t), 1);
+	new_obj->type = PCB_OBJ_POLY;
+	new_obj->Attributes.post_change = pcb_obj_attrib_post_change;
+	PCB_SET_PARENT(new_obj, layer, layer);
+
+	polylist_append(&layer->Polygon, new_obj);
+
+	return new_obj;
+}
+
+void pcb_poly_free(pcb_poly_t * data)
+{
+	polylist_remove(data);
+	free(data);
+}
+
+/* gets the next slot for a point in a polygon struct, allocates memory if necessary */
+pcb_point_t *pcb_poly_point_alloc(pcb_poly_t *Polygon)
+{
+	pcb_point_t *points = Polygon->Points;
+
+	/* realloc new memory if necessary and clear it */
+	if (Polygon->PointN >= Polygon->PointMax) {
+		Polygon->PointMax += STEP_POLYGONPOINT;
+		points = (pcb_point_t *) realloc(points, Polygon->PointMax * sizeof(pcb_point_t));
+		Polygon->Points = points;
+		memset(points + Polygon->PointN, 0, STEP_POLYGONPOINT * sizeof(pcb_point_t));
+	}
+	return (points + Polygon->PointN++);
+}
+
+/* gets the next slot for a point in a polygon struct, allocates memory if necessary */
+pcb_cardinal_t *pcb_poly_holeidx_new(pcb_poly_t *Polygon)
+{
+	pcb_cardinal_t *holeindex = Polygon->HoleIndex;
+
+	/* realloc new memory if necessary and clear it */
+	if (Polygon->HoleIndexN >= Polygon->HoleIndexMax) {
+		Polygon->HoleIndexMax += STEP_POLYGONHOLEINDEX;
+		holeindex = (pcb_cardinal_t *) realloc(holeindex, Polygon->HoleIndexMax * sizeof(int));
+		Polygon->HoleIndex = holeindex;
+		memset(holeindex + Polygon->HoleIndexN, 0, STEP_POLYGONHOLEINDEX * sizeof(int));
+	}
+	return (holeindex + Polygon->HoleIndexN++);
+}
+
+/* frees memory used by a polygon */
+void pcb_poly_free_fields(pcb_poly_t * polygon)
+{
+	if (polygon == NULL)
+		return;
+
+	free(polygon->Points);
+	free(polygon->HoleIndex);
+
+	if (polygon->Clipped)
+		pcb_polyarea_free(&polygon->Clipped);
+	pcb_poly_contours_free(&polygon->NoHoles);
+
+	reset_obj_mem(pcb_poly_t, polygon);
+}
+
+/*** utility ***/
+
+/* rotates a polygon in 90 degree steps */
+void pcb_poly_rotate90(pcb_poly_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	PCB_POLY_POINT_LOOP(Polygon);
+	{
+		PCB_COORD_ROTATE90(point->X, point->Y, X, Y, Number);
+	}
+	PCB_END_LOOP;
+
+	/* simply rotating the bounding box here won't work, because the box is 'closed' (increased by 1) */
+	pcb_poly_bbox(Polygon);
+}
+
+void pcb_poly_rotate(pcb_layer_t *layer, pcb_poly_t *polygon, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina)
+{
+	if (layer->polygon_tree != NULL)
+		pcb_r_delete_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+	PCB_POLY_POINT_LOOP(polygon);
+	{
+		pcb_rotate(&point->X, &point->Y, X, Y, cosa, sina);
+	}
+	PCB_END_LOOP;
+	pcb_poly_bbox(polygon);
+	if (layer->polygon_tree != NULL)
+		pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+}
+
+void pcb_poly_mirror(pcb_layer_t *layer, pcb_poly_t *polygon, pcb_coord_t y_offs)
+{
+	if (layer->polygon_tree != NULL)
+		pcb_r_delete_entry(layer->polygon_tree, (pcb_box_t *)polygon);
+	PCB_POLY_POINT_LOOP(polygon);
+	{
+		point->X = PCB_SWAP_X(point->X);
+		point->Y = PCB_SWAP_Y(point->Y) + y_offs;
+	}
+	PCB_END_LOOP;
+	pcb_poly_bbox(polygon);
+	if (layer->polygon_tree != NULL)
+		pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *)polygon);
+}
+
+void pcb_poly_flip_side(pcb_layer_t *layer, pcb_poly_t *polygon)
+{
+	pcb_r_delete_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+	PCB_POLY_POINT_LOOP(polygon);
+	{
+		point->X = PCB_SWAP_X(point->X);
+		point->Y = PCB_SWAP_Y(point->Y);
+	}
+	PCB_END_LOOP;
+	pcb_poly_bbox(polygon);
+	pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+	/* hmmm, how to handle clip */
+}
+
+
+/* sets the bounding box of a polygons */
+void pcb_poly_bbox(pcb_poly_t *Polygon)
+{
+	Polygon->bbox_naked.X1 = Polygon->bbox_naked.Y1 = PCB_MAX_COORD;
+	Polygon->bbox_naked.X2 = Polygon->bbox_naked.Y2 = -PCB_MAX_COORD;
+
+	PCB_POLY_POINT_LOOP(Polygon);
+	{
+		PCB_MAKE_MIN(Polygon->bbox_naked.X1, point->X);
+		PCB_MAKE_MIN(Polygon->bbox_naked.Y1, point->Y);
+		PCB_MAKE_MAX(Polygon->bbox_naked.X2, point->X);
+		PCB_MAKE_MAX(Polygon->bbox_naked.Y2, point->Y);
+	}
+	PCB_END_LOOP;
+
+	/* clearance is generally considered to be part of the bbox for all objects */
+	{
+		pcb_coord_t clr = PCB_POLY_HAS_CLEARANCE(Polygon) ? Polygon->Clearance/2 : 0;
+		Polygon->BoundingBox.X1 = Polygon->bbox_naked.X1 - clr;
+		Polygon->BoundingBox.Y1 = Polygon->bbox_naked.Y1 - clr;
+		Polygon->BoundingBox.X2 = Polygon->bbox_naked.X2 + clr;
+		Polygon->BoundingBox.Y2 = Polygon->bbox_naked.Y2 + clr;
+	}
+
+	/* boxes don't include the lower right corner */
+	pcb_close_box(&Polygon->bbox_naked);
+	pcb_close_box(&Polygon->BoundingBox);
+}
+
+int pcb_poly_eq(const pcb_host_trans_t *tr1, const pcb_poly_t *p1, const pcb_host_trans_t *tr2, const pcb_poly_t *p2)
+{
+	if (p1->PointN != p2->PointN) return 0;
+	if (pcb_field_neq(p1, p2, Clearance)) return 0;
+	if (pcb_neqs(p1->term, p2->term)) return 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, p1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, p2)) {
+		pcb_cardinal_t n;
+		for(n = 0; n < p1->PointN; n++) {
+			pcb_coord_t x1, y1, x2, y2;
+			pcb_hash_tr_coords(tr1, &x1, &y1, p1->Points[n].X, p1->Points[n].Y);
+			pcb_hash_tr_coords(tr2, &x2, &y2, p2->Points[n].X, p2->Points[n].Y);
+			if ((x1 != x2) || (y1 != y2)) return 0;
+		}
+	}
+	return 1;
+}
+
+unsigned int pcb_poly_hash(const pcb_host_trans_t *tr, const pcb_poly_t *p)
+{
+	unsigned int crd = 0;
+	pcb_cardinal_t n;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, p))
+		for(n = 0; n < p->PointN; n++) {
+			pcb_coord_t x, y;
+
+			pcb_hash_tr_coords(tr, &x, &y, p->Points[n].X, p->Points[n].Y);
+			crd ^= pcb_hash_coord(x) ^ pcb_hash_coord(y);
+		}
+
+	return pcb_hash_coord(p->Clearance) ^ pcb_hash_str(p->term) ^ crd;
+}
+
+
+/* creates a new polygon from the old formats rectangle data */
+pcb_poly_t *pcb_poly_new_from_rectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	pcb_poly_t *polygon = pcb_poly_new(Layer, Clearance, Flags);
+	if (!polygon)
+		return polygon;
+
+	pcb_poly_point_new(polygon, X1, Y1);
+	pcb_poly_point_new(polygon, X2, Y1);
+	pcb_poly_point_new(polygon, X2, Y2);
+	pcb_poly_point_new(polygon, X1, Y2);
+
+	pcb_add_poly_on_layer(Layer, polygon);
+	return polygon;
+}
+
+pcb_poly_t *pcb_poly_new_from_poly(pcb_layer_t *Layer, pcb_poly_t *src, pcb_coord_t offs, pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	pcb_coord_t x, y;
+	pcb_poly_it_t it;
+	pcb_pline_t *pl;
+	int go;
+	pcb_poly_t *polygon = pcb_poly_new(Layer, Clearance, Flags);
+
+	if (!polygon)
+		return polygon;
+
+	it.pa = src->Clipped;
+	pcb_poly_island_first(src, &it);
+	pl = pcb_poly_contour(&it);
+	it.cntr = pcb_pline_dup_offset(pl, offs);
+	for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y))
+		pcb_poly_point_new(polygon, x, y);
+
+	pcb_poly_contours_free(&it.cntr);
+
+	pcb_add_poly_on_layer(Layer, polygon);
+	return polygon;
+}
+
+
+
+void pcb_add_poly_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon)
+{
+	pcb_poly_bbox(polygon);
+	if (!Layer->polygon_tree)
+		Layer->polygon_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon);
+	PCB_SET_PARENT(polygon, layer, Layer);
+	pcb_poly_clear_from_poly(Layer->parent.data, PCB_OBJ_POLY, Layer, polygon);
+}
+
+/* creates a new polygon on a layer */
+pcb_poly_t *pcb_poly_new(pcb_layer_t *Layer, pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	pcb_poly_t *polygon = pcb_poly_alloc(Layer);
+
+	/* copy values */
+	polygon->Flags = Flags;
+	polygon->ID = pcb_create_ID_get();
+	polygon->Clearance = Clearance;
+	polygon->Clipped = NULL;
+	polygon->NoHoles = NULL;
+	polygon->NoHolesValid = 0;
+	return polygon;
+}
+
+static pcb_poly_t *pcb_poly_copy_meta(pcb_poly_t *dst, pcb_poly_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	return dst;
+}
+
+pcb_poly_t *pcb_poly_dup(pcb_layer_t *dst, pcb_poly_t *src)
+{
+	pcb_board_t *pcb;
+	pcb_poly_t *p = pcb_poly_new(dst, src->Clearance, src->Flags);
+	pcb_poly_copy(p, src, 0, 0);
+	pcb_add_poly_on_layer(dst, p);
+	pcb_poly_copy_meta(p, src);
+
+	pcb = pcb_data_get_top(dst->parent.data);
+	if (pcb != NULL)
+		pcb_poly_init_clip(pcb->Data, dst, p);
+	return p;
+}
+
+pcb_poly_t *pcb_poly_dup_at(pcb_layer_t *dst, pcb_poly_t *src, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_board_t *pcb;
+	pcb_poly_t *p = pcb_poly_new(dst, src->Clearance, src->Flags);
+	pcb_poly_copy(p, src, dx, dy);
+	pcb_add_poly_on_layer(dst, p);
+	pcb_poly_copy_meta(p, src);
+
+	pcb = pcb_data_get_top(dst->parent.data);
+	if (pcb != NULL)
+		pcb_poly_init_clip(pcb->Data, dst, p);
+	return p;
+}
+
+/* creates a new point in a polygon */
+pcb_point_t *pcb_poly_point_new(pcb_poly_t *Polygon, pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_point_t *point = pcb_poly_point_alloc(Polygon);
+
+	/* copy values */
+	point->X = X;
+	point->Y = Y;
+	point->ID = pcb_create_ID_get();
+	return point;
+}
+
+/* creates a new hole in a polygon */
+pcb_poly_t *pcb_poly_hole_new(pcb_poly_t * Polygon)
+{
+	pcb_cardinal_t *holeindex = pcb_poly_holeidx_new(Polygon);
+	*holeindex = Polygon->PointN;
+	return Polygon;
+}
+
+/* copies data from one polygon to another; 'Dest' has to exist */
+pcb_poly_t *pcb_poly_copy(pcb_poly_t *Dest, pcb_poly_t *Src, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_cardinal_t hole = 0;
+	pcb_cardinal_t n;
+
+	for (n = 0; n < Src->PointN; n++) {
+		if (hole < Src->HoleIndexN && n == Src->HoleIndex[hole]) {
+			pcb_poly_hole_new(Dest);
+			hole++;
+		}
+		pcb_poly_point_new(Dest, Src->Points[n].X+dx, Src->Points[n].Y+dy);
+	}
+	pcb_poly_bbox(Dest);
+	Dest->Flags = Src->Flags;
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, Dest);
+	return Dest;
+}
+
+static double poly_area(pcb_point_t *points, pcb_cardinal_t n_points)
+{
+	double area = 0;
+	int n;
+
+	for(n = 1; n < n_points; n++)
+		area += (double)(points[n-1].X - points[n].X) * (double)(points[n-1].Y + points[n].Y);
+	area +=(double)(points[n_points-1].X - points[0].X) * (double)(points[n_points-1].Y + points[0].Y);
+
+	if (area > 0)
+		area /= 2.0;
+	else
+		area /= -2.0;
+
+	return area;
+}
+
+double pcb_poly_area(const pcb_poly_t *poly)
+{
+	double area;
+
+	if (poly->HoleIndexN > 0) {
+		int h;
+		area = poly_area(poly->Points, poly->HoleIndex[0]);
+		for(h = 0; h < poly->HoleIndexN - 1; h++)
+			area -= poly_area(poly->Points + poly->HoleIndex[h], poly->HoleIndex[h+1] - poly->HoleIndex[h]);
+		area -= poly_area(poly->Points + poly->HoleIndex[h], poly->PointN - poly->HoleIndex[h]);
+	}
+	else
+		area = poly_area(poly->Points, poly->PointN);
+
+	return area;
+}
+
+
+
+/*** ops ***/
+
+/* copies a polygon to buffer */
+void *pcb_polyop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)];
+	pcb_poly_t *polygon;
+
+	polygon = pcb_poly_new(layer, Polygon->Clearance, Polygon->Flags);
+	pcb_poly_copy(polygon, Polygon, 0, 0);
+	pcb_poly_copy_meta(polygon, Polygon);
+
+	/* Update the polygon r-tree. Unlike similarly named functions for
+	 * other objects, CreateNewPolygon does not do this as it creates a
+	 * skeleton polygon object, which won't have correct bounds.
+	 */
+	if (!layer->polygon_tree)
+		layer->polygon_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND | ctx->buffer.extraflg, polygon);
+	return polygon;
+}
+
+
+/* moves a polygon between board and buffer. Doesn't allocate memory for the points */
+void *pcb_polyop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *dstly, pcb_poly_t *polygon)
+{
+	pcb_layer_t *srcly = polygon->parent.layer;
+
+	assert(polygon->parent_type == PCB_PARENT_LAYER);
+	if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */
+		dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)];
+
+	pcb_poly_pprestore(polygon);
+
+	pcb_r_delete_entry(srcly->polygon_tree, (pcb_box_t *)polygon);
+
+	polylist_remove(polygon);
+	polylist_append(&dstly->Polygon, polygon);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, polygon);
+
+	if (!dstly->polygon_tree)
+		dstly->polygon_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dstly->polygon_tree, (pcb_box_t *)polygon);
+
+	PCB_SET_PARENT(polygon, layer, dstly);
+
+	pcb_poly_ppclear(polygon);
+	return polygon;
+}
+
+/* Handle attempts to change the clearance of a polygon. */
+void *pcb_polyop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) {
+		pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : poly->Clearance + ctx->chgsize.value;
+
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, poly))
+			return NULL;
+
+		value = MIN(PCB_MAX_LINESIZE, value);
+		if (!ctx->chgsize.is_absolute && ctx->chgsize.value < 0 && value < conf_core.design.bloat * 2)
+			value = 0;
+		if (ctx->chgsize.value > 0 && value < conf_core.design.bloat * 2)
+			value = conf_core.design.bloat * 2 + 2;
+		if (value != poly->Clearance) {
+			pcb_undo_add_obj_to_clear_size(PCB_OBJ_POLY, Layer, poly, poly);
+			pcb_poly_restore_to_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly);
+			pcb_poly_invalidate_erase(poly);
+			pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *)poly);
+			poly->Clearance = value;
+			pcb_poly_bbox(poly);
+			pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *)poly);
+			pcb_poly_clear_from_poly(ctx->chgsize.pcb->Data, PCB_OBJ_POLY, Layer, poly);
+			pcb_poly_invalidate_draw(Layer, poly);
+			return poly;
+		}
+
+		return poly;
+	}
+
+	/* poly does not clear other polys */
+	pcb_message(PCB_MSG_WARNING,
+		_("To change the clearance of objects in a polygon, change \nthe objects, not the polygon.\n"
+		"Alternatively, set the clearpolypoly flag on the polygon to \nallow it to clear other polygons.\n"
+		"Hint: To set a minimum clearance for a group of objects, \nselect them all then :MinClearGap(Selected,=10,mil)\n"),
+		"Ok", NULL);
+
+	return NULL;
+}
+
+/* changes the CLEARPOLY flag of a polygon */
+void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon))
+		return NULL;
+	pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, Polygon, Polygon, pcb_true);
+	pcb_undo_add_obj_to_flag(Polygon);
+	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	pcb_poly_invalidate_draw(Layer, Polygon);
+	return Polygon;
+}
+
+/* inserts a point into a polygon */
+void *pcb_polyop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_point_t save;
+	pcb_cardinal_t n;
+	pcb_line_t line;
+
+	pcb_poly_pprestore(Polygon);
+
+	if (!ctx->insert.forcible) {
+		/*
+		 * first make sure adding the point is sensible
+		 */
+		line.Thickness = 0;
+		line.Point1 = Polygon->Points[pcb_poly_contour_prev_point(Polygon, ctx->insert.idx)];
+		line.Point2 = Polygon->Points[ctx->insert.idx];
+		if (pcb_is_point_on_line((float) ctx->insert.x, (float) ctx->insert.y, 0.0, &line))
+			return NULL;
+	}
+	/*
+	 * second, shift the points up to make room for the new point
+	 */
+	pcb_poly_invalidate_erase(Polygon);
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	save = *pcb_poly_point_new(Polygon, ctx->insert.x, ctx->insert.y);
+	for (n = Polygon->PointN - 1; n > ctx->insert.idx; n--)
+		Polygon->Points[n] = Polygon->Points[n - 1];
+
+	/* Shift up indices of any holes */
+	for (n = 0; n < Polygon->HoleIndexN; n++)
+		if (Polygon->HoleIndex[n] > ctx->insert.idx || (ctx->insert.last && Polygon->HoleIndex[n] == ctx->insert.idx))
+			Polygon->HoleIndex[n]++;
+
+	Polygon->Points[ctx->insert.idx] = save;
+	pcb_board_set_changed_flag(pcb_true);
+	pcb_undo_add_obj_to_insert_point(PCB_OBJ_POLY_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]);
+
+	pcb_poly_bbox(Polygon);
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	if (ctx->insert.forcible || !pcb_poly_remove_excess_points(Layer, Polygon))
+		pcb_poly_invalidate_draw(Layer, Polygon);
+
+	pcb_poly_ppclear(Polygon);
+
+	return (&Polygon->Points[ctx->insert.idx]);
+}
+
+/* changes the clearance flag of a polygon */
+void *pcb_polyop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, poly))
+		return NULL;
+	pcb_poly_invalidate_erase(poly);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, poly, poly, pcb_false);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_POLY, Layer, poly);
+	}
+	pcb_undo_add_obj_to_flag(poly);
+	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLYPOLY, poly);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_POLY, Layer, poly, poly, pcb_true);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_POLY, Layer, poly);
+	}
+	pcb_poly_invalidate_draw(Layer, poly);
+	return poly;
+}
+
+/* low level routine to move a polygon */
+void pcb_poly_move(pcb_poly_t *Polygon, pcb_coord_t DX, pcb_coord_t DY)
+{
+	PCB_POLY_POINT_LOOP(Polygon);
+	{
+		PCB_MOVE(point->X, point->Y, DX, DY);
+	}
+	PCB_END_LOOP;
+	PCB_BOX_MOVE_LOWLEVEL(&Polygon->BoundingBox, DX, DY);
+	PCB_BOX_MOVE_LOWLEVEL(&Polygon->bbox_naked, DX, DY);
+}
+
+/* moves a polygon */
+void *pcb_polyop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	if (Layer->meta.real.vis) {
+		pcb_poly_invalidate_erase(Polygon);
+	}
+	pcb_poly_move(Polygon, ctx->move.dx, ctx->move.dy);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+	return Polygon;
+}
+
+void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_pprestore(Polygon);
+	pcb_polyop_move_noclip(ctx, Layer, Polygon);
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_ppclear(Polygon);
+	return Polygon;
+}
+
+void *pcb_polyop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	if (ctx->clip.restore) {
+		pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+		pcb_poly_pprestore(Polygon);
+	}
+	if (ctx->clip.clear) {
+		pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+		pcb_poly_ppclear(Polygon);
+	}
+	return Polygon;
+}
+/* moves a polygon-point */
+void *pcb_polyop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point)
+{
+	pcb_poly_pprestore(Polygon);
+	if (Layer->meta.real.vis) {
+		pcb_poly_invalidate_erase(Polygon);
+	}
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
+	pcb_poly_bbox(Polygon);
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_remove_excess_points(Layer, Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+	pcb_poly_ppclear(Polygon);
+	return Point;
+}
+
+/* moves a polygon between layers; lowlevel routines */
+void *pcb_polyop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_poly_t * polygon, pcb_layer_t * Destination)
+{
+	pcb_r_delete_entry(Source->polygon_tree, (pcb_box_t *) polygon);
+
+	pcb_poly_pprestore(polygon);
+	polylist_remove(polygon);
+	polylist_append(&Destination->Polygon, polygon);
+
+	if (!Destination->polygon_tree)
+		Destination->polygon_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Destination->polygon_tree, (pcb_box_t *) polygon);
+
+	PCB_SET_PARENT(polygon, layer, Destination);
+	pcb_poly_ppclear(polygon);
+	return polygon;
+}
+
+/* moves a polygon between layers */
+void *pcb_polyop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_poly_t * Polygon)
+{
+	pcb_poly_t *newone;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) {
+		pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+		return NULL;
+	}
+	if (Layer == ctx->move.dst_layer)
+		return Polygon;
+	pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_POLY, Layer, Polygon, Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+
+	newone = (struct pcb_poly_s *) pcb_polyop_move_to_layer_low(ctx, Layer, Polygon, ctx->move.dst_layer);
+	pcb_poly_init_clip(PCB->Data, ctx->move.dst_layer, newone);
+	if (ctx->move.dst_layer->meta.real.vis)
+		pcb_poly_invalidate_draw(ctx->move.dst_layer, newone);
+	return newone;
+}
+
+
+/* destroys a polygon from a layer */
+void *pcb_polyop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_free_fields(Polygon);
+
+	pcb_poly_free(Polygon);
+
+	return NULL;
+}
+
+/* removes a polygon-point from a polygon and destroys the data */
+void *pcb_polyop_destroy_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point)
+{
+	pcb_cardinal_t point_idx;
+	pcb_cardinal_t i;
+	pcb_cardinal_t contour;
+	pcb_cardinal_t contour_start, contour_end, contour_points;
+
+	pcb_poly_pprestore(Polygon);
+	point_idx = pcb_poly_point_idx(Polygon, Point);
+	contour = pcb_poly_contour_point(Polygon, point_idx);
+	contour_start = (contour == 0) ? 0 : Polygon->HoleIndex[contour - 1];
+	contour_end = (contour == Polygon->HoleIndexN) ? Polygon->PointN : Polygon->HoleIndex[contour];
+	contour_points = contour_end - contour_start;
+
+	if (contour_points <= 3)
+		return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour);
+
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+
+	/* remove point from list, keep point order */
+	for (i = point_idx; i < Polygon->PointN - 1; i++)
+		Polygon->Points[i] = Polygon->Points[i + 1];
+	Polygon->PointN--;
+
+	/* Shift down indices of any holes */
+	for (i = 0; i < Polygon->HoleIndexN; i++)
+		if (Polygon->HoleIndex[i] > point_idx)
+			Polygon->HoleIndex[i]--;
+
+	pcb_poly_bbox(Polygon);
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	pcb_poly_ppclear(Polygon);
+	return Polygon;
+}
+
+/* removes a polygon from a layer */
+void *pcb_polyop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	/* erase from screen */
+	pcb_poly_pprestore(Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_POLY, Layer, Polygon, Polygon);
+	return NULL;
+}
+
+void *pcb_poly_remove(pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	res = pcb_polyop_remove(&ctx, Layer, Polygon);
+	pcb_draw();
+	return res;
+}
+
+/* Removes a contour from a polygon.
+   If removing the outer contour, it removes the whole polygon. */
+void *pcb_polyop_remove_counter(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_cardinal_t contour)
+{
+	pcb_cardinal_t contour_start, contour_end, contour_points;
+	pcb_cardinal_t i;
+
+	if (contour == 0)
+		return pcb_poly_remove(Layer, Polygon);
+
+	pcb_poly_pprestore(Polygon);
+
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+
+	/* Copy the polygon to the undo list */
+	pcb_undo_add_obj_to_remove_contour(PCB_OBJ_POLY, Layer, Polygon);
+
+	contour_start = (contour == 0) ? 0 : Polygon->HoleIndex[contour - 1];
+	contour_end = (contour == Polygon->HoleIndexN) ? Polygon->PointN : Polygon->HoleIndex[contour];
+	contour_points = contour_end - contour_start;
+
+	/* remove points from list, keep point order */
+	for (i = contour_start; i < Polygon->PointN - contour_points; i++)
+		Polygon->Points[i] = Polygon->Points[i + contour_points];
+	Polygon->PointN -= contour_points;
+
+	/* remove hole from list and shift down remaining indices */
+	for (i = contour; i < Polygon->HoleIndexN; i++)
+		Polygon->HoleIndex[i - 1] = Polygon->HoleIndex[i] - contour_points;
+	Polygon->HoleIndexN--;
+
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+
+	pcb_poly_ppclear(Polygon);
+
+	/* redraw polygon if necessary */
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+	return NULL;
+}
+
+/* removes a polygon-point from a polygon */
+void *pcb_polyop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point)
+{
+	pcb_cardinal_t point_idx;
+	pcb_cardinal_t i;
+	pcb_cardinal_t contour;
+	pcb_cardinal_t contour_start, contour_end, contour_points;
+
+	pcb_poly_pprestore(Polygon);
+
+	point_idx = pcb_poly_point_idx(Polygon, Point);
+	contour = pcb_poly_contour_point(Polygon, point_idx);
+	contour_start = (contour == 0) ? 0 : Polygon->HoleIndex[contour - 1];
+	contour_end = (contour == Polygon->HoleIndexN) ? Polygon->PointN : Polygon->HoleIndex[contour];
+	contour_points = contour_end - contour_start;
+
+	if (contour_points <= 3)
+		return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour);
+
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+
+	/* insert the polygon-point into the undo list */
+	pcb_undo_add_obj_to_remove_point(PCB_OBJ_POLY_POINT, Layer, Polygon, point_idx);
+	pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+
+	/* remove point from list, keep point order */
+	for (i = point_idx; i < Polygon->PointN - 1; i++)
+		Polygon->Points[i] = Polygon->Points[i + 1];
+	Polygon->PointN--;
+
+	/* Shift down indices of any holes */
+	for (i = 0; i < Polygon->HoleIndexN; i++)
+		if (Polygon->HoleIndex[i] > point_idx)
+			Polygon->HoleIndex[i]--;
+
+	pcb_poly_bbox(Polygon);
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_remove_excess_points(Layer, Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+
+	/* redraw polygon if necessary */
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+
+	pcb_poly_ppclear(Polygon);
+	return NULL;
+}
+
+/* copies a polygon */
+void *pcb_polyop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_poly_t *polygon;
+
+	polygon = pcb_poly_new(Layer, Polygon->Clearance, pcb_no_flags());
+	pcb_poly_copy(polygon, Polygon, ctx->copy.DeltaX, ctx->copy.DeltaY);
+	pcb_poly_copy_meta(polygon, Polygon);
+	if (!Layer->polygon_tree)
+		Layer->polygon_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, polygon);
+	pcb_poly_invalidate_draw(Layer, polygon);
+	pcb_undo_add_obj_to_create(PCB_OBJ_POLY, Layer, polygon, polygon);
+	pcb_poly_ppclear(polygon);
+	return polygon;
+}
+
+void *pcb_polyop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_poly_pprestore(Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+	if (Layer->polygon_tree != NULL)
+		pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_rotate90(Polygon, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+	if (Layer->polygon_tree != NULL)
+		pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+	pcb_poly_ppclear(Polygon);
+	return Polygon;
+}
+
+void *pcb_polyop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_poly_pprestore(Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_erase(Polygon);
+	pcb_poly_rotate(Layer, Polygon, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+	pcb_poly_init_clip(PCB->Data, Layer, Polygon);
+	if (Layer->meta.real.vis)
+		pcb_poly_invalidate_draw(Layer, Polygon);
+	pcb_poly_ppclear(Polygon);
+	return Polygon;
+}
+
+void *pcb_polyop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	static pcb_flag_values_t pcb_poly_flags = 0;
+	if (pcb_poly_flags == 0)
+		pcb_poly_flags = pcb_obj_valid_flags(PCB_OBJ_POLY);
+
+	if ((ctx->chgflag.flag & pcb_poly_flags) != ctx->chgflag.flag)
+		return NULL;
+	if ((ctx->chgflag.flag & PCB_FLAG_TERMNAME) && (Polygon->term == NULL))
+		return NULL;
+	pcb_undo_add_obj_to_flag(Polygon);
+
+
+	if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY))
+		pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_POLY, Polygon->parent.layer, Polygon);
+
+	PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Polygon);
+
+	if (ctx->chgflag.flag & PCB_FLAG_FULLPOLY)
+		pcb_poly_init_clip(ctx->chgflag.pcb->Data, Polygon->parent.layer, Polygon);
+
+	if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY))
+		pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_POLY, Polygon->parent.layer, Polygon);
+
+	return Polygon;
+}
+
+
+/*** iteration helpers ***/
+void pcb_poly_map_contours(pcb_poly_t *p, void *ctx, pcb_poly_map_cb_t *cb)
+{
+	pcb_polyarea_t *pa;
+	pcb_pline_t *pl;
+
+	pa = p->Clipped;
+	do {
+		int cidx;
+		for(cidx = 0, pl = pa->contours; pl != NULL; cidx++, pl = pl->next) {
+			pcb_vnode_t *v;
+			cb(p, ctx, (cidx == 0 ? PCB_POLYEV_ISLAND_START : PCB_POLYEV_HOLE_START), 0, 0);
+			v = pl->head.next;
+			do {
+				cb(p, ctx, (cidx == 0 ? PCB_POLYEV_ISLAND_POINT : PCB_POLYEV_HOLE_POINT), v->point[0], v->point[1]);
+			} while ((v = v->next) != pl->head.next);
+
+			cb(p, ctx, (cidx == 0 ? PCB_POLYEV_ISLAND_END : PCB_POLYEV_HOLE_END), 0, 0);
+		}
+		pa = pa->f;
+	} while(pa != p->Clipped);
+}
+
+void *pcb_polyop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	pcb_poly_name_invalidate_draw(poly);
+	return poly;
+}
+
+/*** draw ***/
+
+static pcb_bool is_poly_term_vert(const pcb_poly_t *poly)
+{
+	pcb_coord_t dx, dy;
+
+	dx = poly->BoundingBox.X2 - poly->BoundingBox.X1;
+	if (dx < 0)
+		dx = -dx;
+
+	dy = poly->BoundingBox.Y2 - poly->BoundingBox.Y1;
+	if (dy < 0)
+		dy = -dy;
+
+	return dx < dy;
+}
+
+
+void pcb_poly_name_invalidate_draw(pcb_poly_t *poly)
+{
+	if (poly->term != NULL) {
+		pcb_term_label_invalidate((poly->BoundingBox.X1 + poly->BoundingBox.X2)/2, (poly->BoundingBox.Y1 + poly->BoundingBox.Y2)/2,
+			100.0, is_poly_term_vert(poly), pcb_true, poly->term, poly->intconn);
+	}
+}
+
+void pcb_poly_draw_label(pcb_poly_t *poly)
+{
+	if (poly->term != NULL)
+		pcb_term_label_draw((poly->BoundingBox.X1 + poly->BoundingBox.X2)/2, (poly->BoundingBox.Y1 + poly->BoundingBox.Y2)/2,
+			conf_core.appearance.term_label_size, is_poly_term_vert(poly), pcb_true, poly->term, poly->intconn);
+}
+
+void pcb_poly_draw_(pcb_poly_t *polygon, const pcb_box_t *drawn_area, int allow_term_gfx)
+{
+	if (delayed_terms_enabled && (polygon->term != NULL)) {
+		pcb_draw_delay_obj_add((pcb_any_obj_t *)polygon);
+		return;
+	}
+
+	if ((pcb_gui->thindraw_pcb_polygon != NULL) && (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw))
+	{
+		pcb_gui->thindraw_pcb_polygon(pcb_draw_out.fgGC, polygon, drawn_area);
+	}
+	else {
+		if ((allow_term_gfx) && pcb_draw_term_need_gfx(polygon)) {
+			pcb_vnode_t *n, *head;
+			int i;
+
+			pcb_gui->fill_pcb_polygon(pcb_draw_out.active_padGC, polygon, drawn_area);
+			head = &polygon->Clipped->contours->head;
+
+			pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_square);
+			for(n = head, i = 0; (n != head) || (i == 0); n = n->next, i++) {
+				pcb_coord_t x, y, r;
+				x = (n->prev->point[0] + n->point[0] + n->next->point[0]) / 3;
+				y = (n->prev->point[1] + n->point[1] + n->next->point[1]) / 3;
+
+#warning subc TODO: check if x;y is within the poly, but use a cheaper method than the official
+				r = PCB_DRAW_TERM_GFX_WIDTH;
+				pcb_hid_set_line_width(pcb_draw_out.fgGC, r);
+				pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_square);
+				pcb_gui->draw_line(pcb_draw_out.fgGC, x, y, x, y);
+			}
+		}
+		else
+			pcb_gui->fill_pcb_polygon(pcb_draw_out.fgGC, polygon, drawn_area);
+	}
+
+	/* If checking planes, thin-draw any pieces which have been clipped away */
+	if (pcb_gui->thindraw_pcb_polygon != NULL && conf_core.editor.check_planes && !PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, polygon)) {
+		pcb_poly_t poly = *polygon;
+
+		for (poly.Clipped = polygon->Clipped->f; poly.Clipped != polygon->Clipped; poly.Clipped = poly.Clipped->f)
+			pcb_gui->thindraw_pcb_polygon(pcb_draw_out.fgGC, &poly, drawn_area);
+	}
+
+	if (polygon->term != NULL) {
+		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, polygon))
+			pcb_draw_delay_label_add((pcb_any_obj_t *)polygon);
+	}
+}
+
+static void pcb_poly_draw(pcb_layer_t *layer, pcb_poly_t *polygon, const pcb_box_t *drawn_area, int allow_term_gfx)
+{
+	static const char *color;
+	char buf[sizeof("#XXXXXX")];
+
+	if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon))
+		color = conf_core.appearance.color.warn;
+	else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) {
+		if (layer->is_bound)
+			PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
+		else
+			color = conf_core.appearance.color.selected;
+	}
+	else if (PCB_FLAG_TEST(PCB_FLAG_FOUND, polygon))
+		color = conf_core.appearance.color.connected;
+	else if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, polygon)) {
+		assert(color != NULL);
+		pcb_lighten_color(color, buf, 1.75);
+		color = buf;
+	}
+	else if (PCB_HAS_COLOROVERRIDE(polygon)) {
+		color = (polygon->override_color);
+	}
+	else if (layer->is_bound)
+		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
+	else
+		color = layer->meta.real.color;
+	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+
+	pcb_poly_draw_(polygon, drawn_area, allow_term_gfx);
+}
+
+pcb_r_dir_t pcb_poly_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_draw_info_t *i = cl;
+	pcb_poly_t *polygon = (pcb_poly_t *) b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!polygon->Clipped)
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(polygon->parent_type, &polygon->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_poly_draw(i->layer, polygon, i->drawn_area, 0);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_poly_draw_term_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_draw_info_t *i = cl;
+	pcb_poly_t *polygon = (pcb_poly_t *) b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!polygon->Clipped)
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(polygon->parent_type, &polygon->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_poly_draw(i->layer, polygon, i->drawn_area, 1);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* erases a polygon on a layer */
+void pcb_poly_invalidate_erase(pcb_poly_t *Polygon)
+{
+	pcb_draw_invalidate(Polygon);
+	pcb_flag_erase(&Polygon->Flags);
+}
+
+void pcb_poly_invalidate_draw(pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_draw_invalidate(Polygon);
+}
Index: tags/2.0.1/src/obj_poly.h
===================================================================
--- tags/2.0.1/src/obj_poly.h	(nonexistent)
+++ tags/2.0.1/src/obj_poly.h	(revision 18980)
@@ -0,0 +1,290 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: polygons */
+
+#ifndef PCB_OBJ_POLY_H
+#define PCB_OBJ_POLY_H
+
+#include "config.h"
+#include <genlist/gendlist.h>
+#include "obj_common.h"
+#include "polyarea.h"
+
+struct pcb_poly_s  {           /* holds information about a polygon */
+	PCB_ANY_PRIMITIVE_FIELDS;
+	pcb_coord_t Clearance;
+	pcb_cardinal_t PointN;       /* number of points in polygon */
+	pcb_cardinal_t PointMax;     /* max number from malloc() */
+	pcb_polyarea_t *Clipped;           /* the clipped region of this polygon */
+	pcb_pline_t *NoHoles;              /* the polygon broken into hole-less regions */
+	int NoHolesValid;            /* Is the NoHoles polygon up to date? */
+	pcb_point_t *Points;         /* data */
+	pcb_cardinal_t *HoleIndex;   /* Index of hole data within the Points array */
+	pcb_cardinal_t HoleIndexN;   /* number of holes in polygon */
+	pcb_cardinal_t HoleIndexMax; /* max number from malloc() */
+	unsigned clip_dirty:1;       /* 1 if polygon should be reclipped after clipping inhibit is over */
+	gdl_elem_t link;             /* a poly is in a list of a layer */
+};
+
+
+
+pcb_poly_t *pcb_poly_alloc(pcb_layer_t * layer);
+void pcb_poly_free(pcb_poly_t * data);
+pcb_point_t *pcb_poly_point_alloc(pcb_poly_t *Polygon);
+pcb_cardinal_t *pcb_poly_holeidx_new(pcb_poly_t *Polygon);
+void pcb_poly_free_fields(pcb_poly_t * polygon);
+
+void pcb_poly_bbox(pcb_poly_t *Polygon);
+pcb_poly_t *pcb_poly_new_from_rectangle(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_poly_t *pcb_poly_new_from_poly(pcb_layer_t *Layer, pcb_poly_t *src, pcb_coord_t offs, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_poly_t *pcb_poly_new(pcb_layer_t *Layer, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_poly_t *pcb_poly_dup(pcb_layer_t *dst, pcb_poly_t *src);
+pcb_poly_t *pcb_poly_dup_at(pcb_layer_t *dst, pcb_poly_t *src, pcb_coord_t dx, pcb_coord_t dy);
+pcb_point_t *pcb_poly_point_new(pcb_poly_t *Polygon, pcb_coord_t X, pcb_coord_t Y);
+pcb_poly_t *pcb_poly_hole_new(pcb_poly_t * Polygon);
+void *pcb_poly_remove(pcb_layer_t *Layer, pcb_poly_t *Polygon);
+
+void pcb_poly_rotate90(pcb_poly_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+void pcb_poly_rotate(pcb_layer_t *layer, pcb_poly_t *poly, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina);
+void pcb_poly_mirror(pcb_layer_t *layer, pcb_poly_t *polygon, pcb_coord_t y_offs);
+void pcb_poly_flip_side(pcb_layer_t *layer, pcb_poly_t *polygon);
+
+void pcb_poly_move(pcb_poly_t *Polygon, pcb_coord_t DX, pcb_coord_t DY);
+pcb_poly_t *pcb_poly_copy(pcb_poly_t *Dest, pcb_poly_t *Src, pcb_coord_t dx, pcb_coord_t dy);
+
+/* hash and eq */
+int pcb_poly_eq(const pcb_host_trans_t *tr1, const pcb_poly_t *p1, const pcb_host_trans_t *tr2, const pcb_poly_t *p2);
+unsigned int pcb_poly_hash(const pcb_host_trans_t *tr, const pcb_poly_t *p);
+
+/* Add objects without creating them or making any "sanity modifications" to them */
+void pcb_add_poly_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon);
+
+double pcb_poly_area(const pcb_poly_t *poly);
+
+/*** helpers for iterating over countours */
+
+/*** Polygon helpers on the clopped polygon ***/
+typedef enum {
+	PCB_POLYEV_ISLAND_START,
+	PCB_POLYEV_ISLAND_POINT,
+	PCB_POLYEV_ISLAND_END,
+	PCB_POLYEV_HOLE_START,
+	PCB_POLYEV_HOLE_POINT,
+	PCB_POLYEV_HOLE_END
+} pcb_poly_event_t;
+
+/* return non-zero to quit mapping immediatley */
+typedef int pcb_poly_map_cb_t(pcb_poly_t *p, void *ctx, pcb_poly_event_t ev, pcb_coord_t x, pcb_coord_t y);
+
+/* call cb for each point of each island and cutout */
+void pcb_poly_map_contours(pcb_poly_t *p, void *ctx, pcb_poly_map_cb_t *cb);
+
+typedef struct pcb_poly_it_s {
+	const pcb_poly_t *p;
+	pcb_polyarea_t *pa;
+	pcb_pline_t *cntr;
+	pcb_vnode_t *v;
+} pcb_poly_it_t;
+
+/* Set the iterator to the first island of the polygon; returns NULL if no contour available */
+PCB_INLINE pcb_polyarea_t *pcb_poly_island_first(const pcb_poly_t *p, pcb_poly_it_t *it)
+{
+	it->p = p;
+	it->pa = p->Clipped;
+	it->cntr = NULL;
+	it->v = NULL;
+	return it->pa;
+}
+
+/* Set the iterator to the next island of the polygon; returns NULL if no more */
+PCB_INLINE pcb_polyarea_t *pcb_poly_island_next(pcb_poly_it_t *it)
+{
+	if (it->pa->f == it->p->Clipped)
+		return NULL;
+	it->pa = it->pa->f;
+	it->cntr = NULL;
+	it->v = NULL;
+	return it->pa;
+}
+
+/* Set the iterator to trace the outer contour of the current island */
+PCB_INLINE pcb_pline_t *pcb_poly_contour(pcb_poly_it_t *it)
+{
+	it->v = NULL;
+	return it->cntr = it->pa->contours;
+}
+
+/* Set the iterator to trace the first hole of the current island; returns NULL if there are no holes */
+PCB_INLINE pcb_pline_t *pcb_poly_hole_first(pcb_poly_it_t *it)
+{
+	it->v = NULL;
+	return it->cntr = it->pa->contours->next;
+}
+
+/* Set the iterator to trace the next hole of the current island; returns NULL if there are were more holes */
+PCB_INLINE pcb_pline_t *pcb_poly_hole_next(pcb_poly_it_t *it)
+{
+	it->v = NULL;
+	return it->cntr = it->cntr->next;
+}
+
+/* Set the iterator to the first point of the last selected contour or hole;
+   read the coords into x,y; returns 1 on success, 0 if there are no points */
+PCB_INLINE int pcb_poly_vect_first(pcb_poly_it_t *it, pcb_coord_t *x, pcb_coord_t *y)
+{
+	it->v = it->cntr->head.next;
+	if (it->v == NULL)
+		return 0;
+	*x = it->v->point[0];
+	*y = it->v->point[1];
+	return 1;
+}
+
+
+/* Set the iterator to the next point of the last selected contour or hole;
+   read the coords into x,y; returns 1 on success, 0 if there are were more points */
+PCB_INLINE int pcb_poly_vect_next(pcb_poly_it_t *it, pcb_coord_t *x, pcb_coord_t *y)
+{
+	it->v = it->v->next;
+	if (it->v == it->cntr->head.next)
+		return 0;
+	*x = it->v->point[0];
+	*y = it->v->point[1];
+	return 1;
+}
+
+/* read the previous contour/hole coords into x,y, without bumping the iterator */
+PCB_INLINE void pcb_poly_vect_peek_prev(pcb_poly_it_t *it, pcb_coord_t *x, pcb_coord_t *y)
+{
+	*x = it->v->prev->point[0];
+	*y = it->v->prev->point[1];
+}
+
+/* read the next contour/hole coords into x,y, without bumping the iterator */
+PCB_INLINE void pcb_poly_vect_peek_next(pcb_poly_it_t *it, pcb_coord_t *x, pcb_coord_t *y)
+{
+	*x = it->v->next->point[0];
+	*y = it->v->next->point[1];
+}
+
+/* Set the iterator to a polyarea*/
+PCB_INLINE pcb_polyarea_t *pcb_poly_iterate_polyarea(pcb_polyarea_t *pa, pcb_poly_it_t *it)
+{
+	it->p = NULL;
+	it->pa = pa;
+	it->cntr = NULL;
+	it->v = NULL;
+	return it->pa;
+}
+
+/* construct the full poly clearance cutout for the pa in the iterator and add
+   it to dst - implemented in polygon.c */
+void pcb_poly_pa_clearance_construct(pcb_polyarea_t **dst, pcb_poly_it_t *it, pcb_coord_t clearance);
+
+
+#define pcb_poly_ppclear_at(poly, layer) \
+do { \
+	if (layer->is_bound) layer = layer->meta.bound.real; \
+	if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \
+		pcb_poly_clear_from_poly(layer->parent.data, PCB_OBJ_POLY, layer, poly); \
+} while(0)
+
+/* Let the poly clear sorrunding polys in its layer */
+#define pcb_poly_ppclear(poly) \
+do { \
+	if (poly->parent.layer != NULL) { \
+		pcb_layer_t *layer = pcb_layer_get_real(poly->parent.layer); \
+		if ((layer != NULL) && (layer->parent.data->parent_type == PCB_PARENT_BOARD)) { \
+			pcb_poly_ppclear_at(poly, layer); \
+		} \
+	} \
+} while(0)
+
+/* Let the poly restore sorrunding polys in its layer */
+#define pcb_poly_pprestore(poly) \
+do { \
+	if (poly->parent.layer != NULL) { \
+		pcb_layer_t *layer = pcb_layer_get_real(poly->parent.layer); \
+		if ((layer != NULL) && (layer->parent.data->parent_type == PCB_PARENT_BOARD)) { \
+			if (layer->is_bound) layer = layer->meta.bound.real; \
+			if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \
+				pcb_poly_restore_to_poly(layer->parent.data, PCB_OBJ_POLY, layer, poly); \
+		} \
+	} \
+} while(0)
+
+
+
+/*** loops ***/
+
+#define PCB_POLY_LOOP(layer) do {                                    \
+  pcb_poly_t *polygon;                                             \
+  gdl_iterator_t __it__;                                            \
+  linelist_foreach(&(layer)->Polygon, &__it__, polygon) {
+
+#define	PCB_POLY_POINT_LOOP(polygon) do	{	\
+	pcb_cardinal_t			n;		\
+	pcb_point_t *point;				\
+	for (n = (polygon)->PointN-1; n != -1; n--)	\
+	{						\
+		point = &(polygon)->Points[n]
+
+#define	PCB_POLY_ALL_LOOP(top)	do {		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN) ; l++, layer++)	\
+	{ \
+		PCB_POLY_LOOP(layer)
+
+#define	PCB_POLY_COPPER_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_COPPER)) continue; \
+		PCB_POLY_LOOP(layer)
+
+#define	PCB_POLY_SILK_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (!(pcb_layer_flags(PCB, l) & PCB_LYT_SILK)) continue; \
+		PCB_POLY_LOOP(layer)
+
+#define	PCB_POLY_VISIBLE_LOOP(top) do	{	\
+	pcb_cardinal_t		l;			\
+	pcb_layer_t *layer = (top)->Layer;		\
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++)	\
+	{ \
+		if (layer->meta.real.vis) \
+			PCB_POLY_LOOP(layer)
+
+
+#endif
Index: tags/2.0.1/src/obj_poly_draw.h
===================================================================
--- tags/2.0.1/src/obj_poly_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_poly_draw.h	(revision 18980)
@@ -0,0 +1,41 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard draw of polygons ***/
+
+/* Include rtree.h for these */
+#ifdef PCB_RTREE_H
+pcb_r_dir_t pcb_poly_draw_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_poly_draw_term_callback(const pcb_box_t * b, void *cl);
+#endif
+
+void pcb_poly_invalidate_erase(pcb_poly_t *Polygon);
+void pcb_poly_invalidate_draw(pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void pcb_poly_name_invalidate_draw(pcb_poly_t *poly);
+void pcb_poly_draw_label(pcb_poly_t *poly);
+
Index: tags/2.0.1/src/obj_poly_list.c
===================================================================
--- tags/2.0.1/src/obj_poly_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_poly_list.c	(revision 18980)
@@ -0,0 +1,29 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TDL_DONT_UNDEF
+#include "obj_poly_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_poly_list.h
===================================================================
--- tags/2.0.1/src/obj_poly_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_poly_list.h	(revision 18980)
@@ -0,0 +1,47 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef LIST_POLY_H
+#define LIST_POLY_H
+
+#include "obj_poly.h"
+
+/* List of Lines */
+#define TDL(x)      polylist_ ## x
+#define TDL_LIST_T  polylist_t
+#define TDL_ITEM_T  pcb_poly_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define polylist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/obj_poly_op.h
===================================================================
--- tags/2.0.1/src/obj_poly_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_poly_op.h	(revision 18980)
@@ -0,0 +1,56 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard operations on polygons ***/
+
+#include "operation.h"
+
+void *pcb_polyop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_poly_t * polygon);
+void *pcb_polyop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly);
+void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point);
+void *pcb_polyop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_poly_t * polygon, pcb_layer_t * Destination);
+void *pcb_polyop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_poly_t * Polygon);
+void *pcb_polyop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_destroy_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point);
+void *pcb_polyop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_remove_counter(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_cardinal_t contour);
+void *pcb_polyop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon, pcb_point_t *Point);
+void *pcb_polyop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon);
+void *pcb_polyop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_poly_t *poly);
+void *pcb_polyop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly);
+
+
Index: tags/2.0.1/src/obj_pstk.c
===================================================================
--- tags/2.0.1/src/obj_pstk.c	(nonexistent)
+++ tags/2.0.1/src/obj_pstk.c	(revision 18980)
@@ -0,0 +1,1123 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <assert.h>
+
+#include "board.h"
+#include "conf_core.h"
+#include "data.h"
+#include "data_list.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "flag.h"
+#include "obj_pstk.h"
+#include "obj_pstk_draw.h"
+#include "obj_pstk_list.h"
+#include "obj_pstk_inlines.h"
+#include "obj_pstk_op.h"
+#include "obj_subc_parent.h"
+#include "obj_hash.h"
+#include "operation.h"
+#include "search.h"
+#include "undo.h"
+#include "vtpadstack.h"
+#include "event.h"
+#include "hid_inlines.h"
+
+#define SQR(o) ((o)*(o))
+
+static const char core_pstk_cookie[] = "padstack";
+
+pcb_pstk_t *pcb_pstk_alloc(pcb_data_t *data)
+{
+	pcb_pstk_t *ps;
+
+	ps = calloc(sizeof(pcb_pstk_t), 1);
+	ps->protoi = -1;
+	ps->type = PCB_OBJ_PSTK;
+	ps->Attributes.post_change = pcb_obj_attrib_post_change;
+	PCB_SET_PARENT(ps, data, data);
+
+	padstacklist_append(&data->padstack, ps);
+
+	return ps;
+}
+
+void pcb_pstk_free(pcb_pstk_t *ps)
+{
+	padstacklist_remove(ps);
+	free(ps->thermals.shape);
+	free(ps);
+}
+
+pcb_pstk_t *pcb_pstk_new_tr(pcb_data_t *data, pcb_cardinal_t proto, pcb_coord_t x, pcb_coord_t y, pcb_coord_t clearance, pcb_flag_t Flags, double rot, int xmirror, int smirror)
+{
+	pcb_pstk_t *ps;
+
+	if (proto >= pcb_vtpadstack_proto_len(&data->ps_protos))
+		return NULL;
+
+	ps = pcb_pstk_alloc(data);
+
+	/* copy values */
+	ps->proto = proto;
+	ps->x = x;
+	ps->y = y;
+	ps->Clearance = clearance;
+	ps->Flags = Flags;
+	ps->ID = pcb_create_ID_get();
+	ps->rot = rot;
+	ps->xmirror = xmirror;
+	ps->smirror = smirror;
+	pcb_pstk_add(data, ps);
+	pcb_event(PCB_EVENT_NEW_PSTK, "p", ps);
+	pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps);
+	return ps;
+}
+
+pcb_pstk_t *pcb_pstk_new(pcb_data_t *data, pcb_cardinal_t proto, pcb_coord_t x, pcb_coord_t y, pcb_coord_t clearance, pcb_flag_t Flags)
+{
+	return pcb_pstk_new_tr(data, proto, x, y, clearance, Flags, 0, 0, 0);
+}
+
+
+void pcb_pstk_add(pcb_data_t *data, pcb_pstk_t *ps)
+{
+	pcb_pstk_bbox(ps);
+	if (!data->padstack_tree)
+		data->padstack_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps);
+	PCB_SET_PARENT(ps, data, data);
+}
+
+static void pcb_pstk_bbox_(pcb_box_t *dst, pcb_pstk_t *ps, pcb_bool copper_only)
+{
+	int n, sn;
+	pcb_line_t line;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(ps);
+	assert(proto != NULL);
+
+	dst->X1 = dst->X2 = ps->x;
+	dst->Y1 = dst->Y2 = ps->y;
+
+	if (ts != NULL)
+	for(sn = 0; sn < ts->len; sn++) {
+		pcb_pstk_shape_t *shape = ts->shape + sn;
+		switch(shape->shape) {
+			case PCB_PSSH_POLY:
+				for(n = 0; n < shape->data.poly.len; n++)
+					pcb_box_bump_point(dst, shape->data.poly.x[n] + ps->x, shape->data.poly.y[n] + ps->y);
+				break;
+			case PCB_PSSH_LINE:
+				line.Point1.X = shape->data.line.x1 + ps->x;
+				line.Point1.Y = shape->data.line.y1 + ps->y;
+				line.Point2.X = shape->data.line.x2 + ps->x;
+				line.Point2.Y = shape->data.line.y2 + ps->y;
+				line.Thickness = shape->data.line.thickness;
+				line.Clearance = 0;
+				line.Flags = pcb_flag_make(shape->data.line.square ? PCB_FLAG_SQUARE : 0);
+				pcb_line_bbox(&line);
+				pcb_box_bump_box(dst, &line.BoundingBox);
+				break;
+			case PCB_PSSH_CIRC:
+				pcb_box_bump_point(dst, ps->x - shape->data.circ.dia/2, ps->y - shape->data.circ.dia/2);
+				pcb_box_bump_point(dst, ps->x + shape->data.circ.dia/2, ps->y + shape->data.circ.dia/2);
+				break;
+		}
+	}
+
+	if (!copper_only && PCB_NONPOLY_HAS_CLEARANCE(ps)) {
+		dst->X1 -= ps->Clearance;
+		dst->Y1 -= ps->Clearance;
+		dst->X2 += ps->Clearance;
+		dst->Y2 += ps->Clearance;
+	}
+
+	if (proto->hdia != 0) {
+		/* corner case: no copper around the hole all 360 deg - let the hole stick out */
+		pcb_box_bump_point(dst, ps->x - proto->hdia/2, ps->y - proto->hdia/2);
+		pcb_box_bump_point(dst, ps->x + proto->hdia/2, ps->y + proto->hdia/2);
+	}
+
+	pcb_close_box(dst);
+}
+
+void pcb_pstk_bbox(pcb_pstk_t *ps)
+{
+	pcb_pstk_bbox_(&ps->BoundingBox, ps, pcb_false);
+	pcb_pstk_bbox_(&ps->bbox_naked, ps, pcb_true);
+}
+
+void pcb_pstk_copper_bbox(pcb_box_t *dst, pcb_pstk_t *ps)
+{
+	pcb_pstk_bbox_(dst, ps, pcb_true);
+}
+
+/* hash */
+int pcb_pstk_eq(const pcb_host_trans_t *tr1, const pcb_pstk_t *p1, const pcb_host_trans_t *tr2, const pcb_pstk_t *p2)
+{
+#warning padstack TODO: should compare shape by shape: a 180 deg rotated or mirrored rectangle is still just the same rectangle!
+	if (pcb_field_neq(p1, p2, smirror) || pcb_field_neq(p1, p2, xmirror)) return 0;
+	if (pcb_field_neq(p1, p2, rot)) return 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, p1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, p2)) {
+		pcb_coord_t x1, y1, x2, y2;
+		
+		pcb_hash_tr_coords(tr1, &x1, &y1, p1->x, p1->y);
+		pcb_hash_tr_coords(tr2, &x2, &y2, p2->x, p2->y);
+		if ((x1 != x2) || (y1 != y2)) return 0;
+	}
+
+	if (pcb_neqs(p1->term, p2->term)) return 0;
+	return 1;
+}
+
+unsigned int pcb_pstk_hash(const pcb_host_trans_t *tr, const pcb_pstk_t *p)
+{
+	unsigned int crd = 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, p)) {
+		pcb_coord_t x, y;
+		
+		pcb_hash_tr_coords(tr, &x, &y, p->x, p->y);
+		crd = pcb_hash_coord(x) ^ pcb_hash_coord(y);
+	}
+
+	return pcb_hash_angle(tr, p->rot) ^ pcb_hash_coord(p->Clearance) ^
+		pcb_hash_str(p->term) ^ crd ^
+		murmurhash(&p->smirror, sizeof(p->smirror)) ^
+		murmurhash(&p->xmirror, sizeof(p->xmirror));
+}
+
+/*** utils ***/
+
+pcb_pstk_t *pcb_pstk_copy_meta(pcb_pstk_t *dst, pcb_pstk_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	dst->thermals.used = src->thermals.used;
+	if (dst->thermals.used > 0) {
+		dst->thermals.shape = malloc(dst->thermals.used * sizeof(dst->thermals.shape[0]));
+		memcpy(dst->thermals.shape, src->thermals.shape, src->thermals.used * sizeof(src->thermals.shape[0]));
+	}
+	else
+		dst->thermals.shape = 0;
+	memcpy(&dst->Flags, &src->Flags, sizeof(dst->Flags));
+	return dst;
+}
+
+pcb_pstk_t *pcb_pstk_copy_orient(pcb_pstk_t *dst, pcb_pstk_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	dst->rot = src->rot;
+	dst->xmirror = src->xmirror;
+	dst->smirror = src->smirror;
+	dst->protoi = -1; /* invalidate the transformed index to get it recalculated */
+	return dst;
+}
+
+void pcb_pstk_move_(pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy)
+{
+	ps->x += dx;
+	ps->y += dy;
+	ps->BoundingBox.X1 += dx;
+	ps->BoundingBox.Y1 += dy;
+	ps->BoundingBox.X2 += dx;
+	ps->BoundingBox.Y2 += dy;
+	ps->bbox_naked.X1 += dx;
+	ps->bbox_naked.Y1 += dy;
+	ps->bbox_naked.X2 += dx;
+	ps->bbox_naked.Y2 += dy;
+}
+
+void pcb_pstk_move(pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy, pcb_bool more_to_come)
+{
+	pcb_opctx_t ctx;
+	ctx.move.pcb = NULL;
+	ctx.move.dx = dx;
+	ctx.move.dy = dy;
+	ctx.move.more_to_come = more_to_come;
+	pcb_pstkop_move(&ctx, ps);
+}
+
+pcb_pstk_t *pcb_pstk_by_id(pcb_data_t *base, long int ID)
+{
+	/* We can not have an rtree based search here: we are often called
+	   in the middle of an operation, after the pstk got already removed
+	   from the rtree. It happens in e.g. undoable padstack operations
+	   where the padstack tries to look up its parent subc by ID, while
+	   the subc is being sent to the other side.
+	
+	   The solution will be the ID hash. */
+	PCB_PADSTACK_LOOP(base);
+	{
+		if (padstack->ID == ID)
+			return padstack;
+	}
+	PCB_END_LOOP;
+
+	return NULL;
+}
+
+/*** draw ***/
+
+static void set_ps_color(pcb_pstk_t *ps, int is_current, pcb_layer_type_t lyt, pcb_layer_t *ly1)
+{
+	const char *color, *layer_color = NULL;
+	char buf[sizeof("#XXXXXX")];
+
+	if ((lyt & PCB_LYT_PASTE) || (lyt & PCB_LYT_MASK) || (lyt & PCB_LYT_SILK)) {
+		if (ly1 == NULL)
+			layer_color = pcb_layer_default_color(0, lyt);
+		else
+			layer_color = ly1->meta.real.color;
+	}
+
+	if (ps->term == NULL) {
+		/* normal via, not a terminal */
+		if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, ps))
+				color = conf_core.appearance.color.warn;
+			else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps))
+				color = conf_core.appearance.color.selected;
+			else
+				color = conf_core.appearance.color.connected;
+
+			if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, ps)) {
+				assert(color != NULL);
+				pcb_lighten_color(color, buf, 1.75);
+				color = buf;
+			}
+		}
+		else {
+			if (layer_color != NULL)
+				color = layer_color;
+			else if (is_current)
+				color = conf_core.appearance.color.via;
+			else
+				color = conf_core.appearance.color.invisible_objects;
+		}
+	}
+	else {
+		/* terminal */
+		if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
+			if (PCB_FLAG_TEST(PCB_FLAG_WARN, ps))
+				color = conf_core.appearance.color.warn;
+			else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps))
+				color = conf_core.appearance.color.selected;
+			else
+				color = conf_core.appearance.color.connected;
+
+			if (PCB_FLAG_TEST(PCB_FLAG_ONPOINT, ps)) {
+				assert(color != NULL);
+				pcb_lighten_color(color, buf, 1.75);
+				color = buf;
+			}
+		}
+		else
+			if (layer_color != NULL)
+				color = layer_color;
+			else if (is_current)
+				color = conf_core.appearance.color.pin;
+			else
+				color = conf_core.appearance.color.invisible_objects;
+
+	}
+
+	pcb_gui->set_color(pcb_draw_out.fgGC, color);
+}
+
+static void set_ps_annot_color(pcb_hid_gc_t gc, pcb_pstk_t *ps)
+{
+	pcb_gui->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ?
+		conf_core.appearance.color.selected : conf_core.appearance.color.padstackmark);
+}
+
+static void pcb_pstk_draw_shape_solid(pcb_hid_gc_t gc, pcb_pstk_t *ps, pcb_pstk_shape_t *shape)
+{
+
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+			pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+			pcb_gui->fill_polygon_offs(pcb_draw_out.fgGC, shape->data.poly.len, shape->data.poly.x, shape->data.poly.y, ps->x, ps->y);
+			break;
+		case PCB_PSSH_LINE:
+			pcb_hid_set_line_cap(pcb_draw_out.fgGC, shape->data.line.square ? pcb_cap_square : pcb_cap_round);
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, shape->data.line.thickness);
+			pcb_gui->draw_line(pcb_draw_out.fgGC, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2);
+			break;
+		case PCB_PSSH_CIRC:
+			pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_round);
+			pcb_gui->fill_circle(pcb_draw_out.fgGC, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2);
+			break;
+	}
+}
+
+static void pcb_pstk_draw_shape_thin(pcb_hid_gc_t gc, pcb_pstk_t *ps, pcb_pstk_shape_t *shape)
+{
+	int n;
+	pcb_hid_set_line_cap(gc, pcb_cap_round);
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+			for(n = 1; n < shape->data.poly.len; n++)
+				pcb_gui->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[n], ps->y + shape->data.poly.y[n]);
+			pcb_gui->draw_line(gc, ps->x + shape->data.poly.x[n-1], ps->y + shape->data.poly.y[n-1], ps->x + shape->data.poly.x[0], ps->y + shape->data.poly.y[0]);
+			break;
+		case PCB_PSSH_LINE:
+			pcb_draw_wireframe_line(gc, ps->x + shape->data.line.x1, ps->y + shape->data.line.y1, ps->x + shape->data.line.x2, ps->y + shape->data.line.y2, shape->data.line.thickness, shape->data.line.square);
+			break;
+		case PCB_PSSH_CIRC:
+			pcb_gui->draw_arc(gc, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2, shape->data.circ.dia/2, 0, 360);
+			break;
+	}
+}
+
+pcb_r_dir_t pcb_pstk_draw_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_draw_t *ctx = cl;
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	pcb_pstk_shape_t *shape;
+	pcb_layergrp_t *grp = NULL;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_gobj_parent_subc(ps->parent_type, &ps->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (ctx->gid < 0) {
+		if (ctx->shape_mask != 0)
+			shape = pcb_pstk_shape(ps, ctx->shape_mask, ctx->comb);
+		else
+			return PCB_R_DIR_NOT_FOUND;
+	}
+	else
+		shape = pcb_pstk_shape_gid(ctx->pcb, ps, ctx->gid, ctx->comb, &grp);
+
+	if (shape != NULL) {
+		if (grp == NULL)
+			set_ps_color(ps, ctx->is_current, ctx->shape_mask, ctx->layer1);
+		else
+			set_ps_color(ps, ctx->is_current, grp->ltype, ctx->layer1);
+		if (conf_core.editor.thin_draw || conf_core.editor.wireframe_draw) {
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+			pcb_pstk_draw_shape_thin(pcb_draw_out.fgGC, ps, shape);
+		}
+		else
+			pcb_pstk_draw_shape_solid(pcb_draw_out.fgGC, ps, shape);
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_pstk_draw_mark_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	pcb_pstk_proto_t *proto;
+	pcb_coord_t mark, mark2;
+
+	/* mark is a cross in the middle, right on the hole;
+	   cross size should extend beyond the hole */
+	mark = conf_core.appearance.padstack.cross_size;
+	proto = pcb_pstk_get_proto(ps);
+	if (proto != NULL)
+		mark += proto->hdia/2;
+
+	mark2 = mark*2;
+	if (mark2 < pcb_gui->coord_per_pix)
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	/* draw the cross using xor */
+	set_ps_annot_color(pcb_draw_out.fgGC, ps);
+	if (mark2 > pcb_gui->coord_per_pix*3) {
+		pcb_gui->draw_line(pcb_draw_out.fgGC, ps->x-mark, ps->y, ps->x+mark, ps->y);
+		pcb_gui->draw_line(pcb_draw_out.fgGC, ps->x, ps->y-mark, ps->x, ps->y+mark);
+	}
+	else
+		pcb_gui->draw_line(pcb_draw_out.fgGC, ps->x-pcb_gui->coord_per_pix, ps->y, ps->x+pcb_gui->coord_per_pix, ps->y);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_pstk_draw_label_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+
+	/* draw the label if enabled, after everything else is drawn */
+	if (ps->term != NULL) {
+		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, ps))
+			pcb_pstk_draw_label(ps);
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_pstk_draw_hole_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_draw_t *ctx = cl;
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	pcb_pstk_proto_t *proto;
+
+	/* hide subc parts if requested */
+	if (!PCB->SubcPartsOn && pcb_gobj_parent_subc(ps->parent_type, &ps->parent))
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* no hole in this layer group */
+	if (ctx->gid >= 0) {
+		if (!pcb_pstk_bb_drills(ctx->pcb, ps, ctx->gid, &proto))
+			return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	else
+		proto = pcb_pstk_get_proto(ps);
+
+	/* No hole at all */
+	if (proto->hdia <= 0)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* hole is plated, but the caller doesn't want plated holes */
+	if (proto->hplated && (!(ctx->holetype & PCB_PHOLE_PLATED)))
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* hole is unplated, but the caller doesn't want unplated holes */
+	if (!proto->hplated && (!(ctx->holetype & PCB_PHOLE_UNPLATED)))
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* BBvia, but the caller doesn't want BBvias */
+	if (((proto->htop != 0) || (proto->hbottom != 0)) && (!(ctx->holetype & PCB_PHOLE_BB)))
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* actual hole */
+	pcb_hid_set_line_width(pcb_draw_out.drillGC, 0);
+	pcb_hid_set_line_cap(pcb_draw_out.drillGC, pcb_cap_round);
+	pcb_gui->fill_circle(pcb_draw_out.drillGC, ps->x, ps->y, proto->hdia / 2);
+
+	/* indicate unplated holes with an arc; unplated holes are more rare
+	   than plated holes, thus unplated holes are indicated */
+	if (!proto->hplated) {
+		pcb_coord_t r = proto->hdia / 2;
+		r -= r/8; /* +12.5% */
+		pcb_gui->set_color(pcb_draw_out.fgGC, PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) ? conf_core.appearance.color.selected : conf_core.appearance.color.subc);
+		pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+		pcb_gui->draw_arc(pcb_draw_out.fgGC, ps->x, ps->y, r, r, 20, 290);
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+void pcb_pstk_thindraw(pcb_hid_gc_t gc, pcb_pstk_t *ps)
+{
+	pcb_pstk_shape_t *shape = NULL;
+	pcb_board_t *pcb;
+	pcb_layergrp_id_t gid = CURRENT->meta.real.grp;
+
+	pcb = pcb_data_get_top(ps->parent.data);
+	if (pcb != NULL) {
+		shape = pcb_pstk_shape_gid(pcb, ps, gid, 0, NULL);
+		if (shape == NULL)
+			shape = pcb_pstk_shape_gid(pcb, ps, gid, PCB_LYC_SUB, NULL);
+	}
+	else { /* no pcb means buffer - take the first shape, whichever layer it is for */
+		pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(ps);
+		if ((ts != NULL)  && (ts->len > 0))
+			shape = ts->shape;
+	}
+
+	if (shape != NULL)
+		pcb_pstk_draw_shape_thin(gc, ps, shape);
+}
+
+void pcb_pstk_draw_label(pcb_pstk_t *ps)
+{
+	pcb_bool vert;
+	pcb_coord_t dx, dy;
+
+	if (ps->term == NULL)
+		return;
+
+	dx = ps->BoundingBox.X2 - ps->BoundingBox.X1;
+	dy = ps->BoundingBox.Y2 - ps->BoundingBox.Y1;
+	if ((dx == 0) && (dy == 0)) {
+		pcb_pstk_bbox(ps);
+		dx = ps->BoundingBox.X2 - ps->BoundingBox.X1;
+		dy = ps->BoundingBox.Y2 - ps->BoundingBox.Y1;
+	}
+
+	vert = dx < dy;
+#ifdef PCB_PSTK_LABEL_OFFCENTER
+	pcb_coord_t offs = 0;
+	pcb_pstk_proto_t *proto;
+	proto = pcb_pstk_get_proto(ps);
+	if ((proto != NULL) && (proto->hdia > 0))
+		offs = proto->hdia/2;
+	pcb_term_label_draw(ps->x + offs, ps->y, conf_core.appearance.term_label_size, vert, pcb_false, ps->term, ps->intconn);
+#endif
+	pcb_term_label_draw(ps->x, ps->y, conf_core.appearance.term_label_size, vert, pcb_true, ps->term, ps->intconn);
+}
+
+
+void pcb_pstk_invalidate_erase(pcb_pstk_t *ps)
+{
+	pcb_draw_invalidate(ps);
+}
+
+void pcb_pstk_invalidate_draw(pcb_pstk_t *ps)
+{
+	pcb_draw_invalidate(ps);
+}
+
+
+static int pcb_pstk_near_box_(pcb_pstk_t *ps, pcb_box_t *box, pcb_pstk_shape_t *shape)
+{
+	pcb_any_line_t pad;
+	pcb_vector_t v;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	int isneg = PCB_IS_BOX_NEGATIVE(box), is_in, n;
+
+	/* cheap check: hole */
+	if (proto->hdia > 0) {
+		/* in negative case, touching the hole means hit */
+		if (isneg)
+			if (PCB_CIRCLE_TOUCHES_BOX(ps->x, ps->y, proto->hdia/2, box))
+				return 1;
+		
+		/* in positive case, not including the hole means bad */
+		if (!isneg)
+			if (!PCB_POINT_IN_BOX(ps->x-proto->hdia/2,ps->y-proto->hdia/2, box) ||
+				!PCB_POINT_IN_BOX(ps->x+proto->hdia/2,ps->y+proto->hdia/2, box))
+					return 0;
+	}
+
+	switch(shape->shape) {
+		case PCB_PSSH_CIRC:
+		if (isneg)
+			return PCB_CIRCLE_TOUCHES_BOX(ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2, box);
+		return
+			PCB_POINT_IN_BOX(ps->x+shape->data.circ.x-proto->hdia/2,ps->y+shape->data.circ.y-shape->data.circ.dia/2, box) &&
+			PCB_POINT_IN_BOX(ps->x+shape->data.circ.x+proto->hdia/2,ps->y+shape->data.circ.y+shape->data.circ.dia/2, box);
+		case PCB_PSSH_LINE:
+			pad.Point1.X = shape->data.line.x1 + ps->x;
+			pad.Point1.Y = shape->data.line.y1 + ps->y;
+			pad.Point2.X = shape->data.line.x2 + ps->x;
+			pad.Point2.Y = shape->data.line.y2 + ps->y;
+			pad.Thickness = shape->data.line.thickness;
+			pad.Clearance = 0;
+			pad.Flags = pcb_flag_make(shape->data.line.square ? PCB_FLAG_SQUARE : 0);
+			return isneg ? PCB_PAD_TOUCHES_BOX(&pad, box) : PCB_PAD_IN_BOX(&pad, box);
+		case PCB_PSSH_POLY:
+			if (shape->data.poly.pa == NULL)
+				pcb_pstk_shape_update_pa(&shape->data.poly);
+
+			if (isneg) {
+				/* shortcut: if any point is in our box in negative, we are done */
+				for(n = 0; n < shape->data.poly.len; n++) {
+					int pib = PCB_POINT_IN_BOX(ps->x + shape->data.poly.x[n], ps->y + shape->data.poly.y[n], box);
+					if (pib)
+						return 1;
+				}
+			}
+
+			/* fully within */
+			is_in = 1;
+			for(n = 0; n < shape->data.poly.len; n++) {
+				int pib = PCB_POINT_IN_BOX(ps->x + shape->data.poly.x[n], ps->y + shape->data.poly.y[n], box);
+				if (!pib) {
+					is_in = 0;
+					break;
+				}
+			}
+
+			if (!isneg) /* normal box - accept only if we are in */
+				return is_in;
+
+			/* negative box, not fully within, no poly point in the box, check whether
+			   the box is fully within the poly - if any of it's corners is in */
+			v[0] = box->X1 - ps->x;
+			v[1] = box->Y1 - ps->y;
+			if (pcb_polyarea_contour_inside(shape->data.poly.pa, v))
+				return 1;
+
+
+			/* negative box, not fully within, no poly point in the box, check whether
+			   box lines intersect poly lines
+			   We expect shapes to be simple so linear search is faster than
+			   being clever */
+			for(n = 1; n < shape->data.poly.len; n++) {
+				if (PCB_XYLINE_ISECTS_BOX(ps->x+shape->data.poly.x[n-1],ps->y+shape->data.poly.y[n-1],ps->x+shape->data.poly.x[n],ps->y+shape->data.poly.y[n],  box))
+					return 1;
+			}
+
+			n = shape->data.poly.len-1;
+			if (PCB_XYLINE_ISECTS_BOX(ps->x+shape->data.poly.x[n-1],ps->y+shape->data.poly.y[n-1],ps->x+shape->data.poly.x[0],ps->y+shape->data.poly.y[0],  box))
+				return 1;
+	}
+
+	return 0;
+}
+
+#define	HOLE_IN_BOX(ps, dia, b) \
+	( \
+	PCB_POINT_IN_BOX((ps)->x - dia/2, (ps)->y - dia/2, (b)) && \
+	PCB_POINT_IN_BOX((ps)->x + dia/2, (ps)->y + dia/2, (b)) \
+	)
+
+#define	HOLE_TOUCHES_BOX(ps, dia, b) \
+	PCB_CIRCLE_TOUCHES_BOX((ps)->x, (ps)->y, dia/2, (b))
+
+int pcb_pstk_near_box(pcb_pstk_t *ps, pcb_box_t *box, pcb_layer_t *layer)
+{
+	pcb_pstk_shape_t *shp;
+	pcb_pstk_tshape_t *tshp = pcb_pstk_get_tshape(ps);
+
+	/* special case: no-shape padstack is used for hole */
+	if ((tshp == NULL) || (tshp->len == 0)) {
+		pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+		if (proto->hdia <= 0)
+			return 0;
+		return (PCB_IS_BOX_NEGATIVE(box) ? HOLE_TOUCHES_BOX(ps, proto->hdia, box) : HOLE_IN_BOX(ps, proto->hdia, box));
+	}
+
+	/* no layer means: "is any shape near?" */
+	if (layer == NULL) {
+		int n;
+
+		if (tshp == NULL)
+			return 0;
+
+		for(n = 0; n < tshp->len; n++)
+			if (pcb_pstk_near_box_(ps, box, &tshp->shape[n]) != 0)
+				return 1;
+		return 0;
+	}
+
+	/* else check only on the specific layer */
+	shp = pcb_pstk_shape(ps, pcb_layer_flags_(layer), layer->comb);
+	if (shp == NULL)
+		return 0;
+	return pcb_pstk_near_box_(ps, box, shp);
+}
+
+static int pcb_is_point_in_pstk_(pcb_pstk_t *ps, pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, pcb_pstk_shape_t *shape)
+{
+	pcb_any_line_t pad;
+	pcb_vector_t v;
+
+	switch(shape->shape) {
+		case PCB_PSSH_CIRC:
+			return PCB_POINT_IN_CIRCLE(x, y, ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2 + radius);
+		case PCB_PSSH_LINE:
+			pad.Point1.X = shape->data.line.x1 + ps->x;
+			pad.Point1.Y = shape->data.line.y1 + ps->y;
+			pad.Point2.X = shape->data.line.x2 + ps->x;
+			pad.Point2.Y = shape->data.line.y2 + ps->y;
+			pad.Thickness = shape->data.line.thickness;
+			pad.Clearance = 0;
+			pad.Flags = pcb_flag_make(shape->data.line.square ? PCB_FLAG_SQUARE : 0);
+			return pcb_is_point_in_line(x, y, radius, &pad);
+		case PCB_PSSH_POLY:
+			if (shape->data.poly.pa == NULL)
+				pcb_pstk_shape_update_pa(&shape->data.poly);
+			v[0] = x - ps->x;
+			v[1] = y - ps->y;
+			return pcb_polyarea_contour_inside(shape->data.poly.pa, v);
+	}
+
+	return 0;
+}
+
+int pcb_is_point_in_pstk(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, pcb_pstk_t *ps, pcb_layer_t *layer)
+{
+	pcb_pstk_shape_t *shp;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	/* cheap check: hole clicked (also necessary for a mounting hole too) */
+	if (proto->hdia > 0) {
+		double dist2 = SQR((double)x - (double)ps->x) + SQR((double)y - (double)ps->y);
+		if (dist2 <= SQR((double)radius + (double)proto->hdia/2.0))
+			return 1;
+	}
+
+	/* no layer means: "is point in any shape?" */
+	if (layer == NULL) {
+		int n;
+		pcb_pstk_tshape_t *tshp = pcb_pstk_get_tshape(ps);
+
+		if (tshp == NULL)
+			return 0;
+
+		for(n = 0; n < tshp->len; n++)
+			if (pcb_is_point_in_pstk_(ps, x, y, radius, &tshp->shape[n]) != 0)
+				return 1;
+		return 0;
+	}
+
+	/* else check only on the specific layer */
+	shp = pcb_pstk_shape(ps, pcb_layer_flags_(layer), layer->comb);
+	if (shp == NULL)
+		return 0;
+	return pcb_is_point_in_pstk_(ps, x, y, radius, shp);
+}
+
+int pcb_pstk_drc_check_clearance(pcb_pstk_t *ps, pcb_poly_t *polygon, pcb_coord_t min_clr)
+{
+	int n;
+	pcb_pstk_tshape_t *ts;
+
+	/* global clearance */
+	if (ps->Clearance > 0)
+		return ps->Clearance < 2 * conf_core.design.bloat;
+
+	/* else check each shape; it's safest to run this check on the canonical
+	   transformed shape, that's always available */
+	ts = pcb_pstk_get_tshape_(ps->parent.data, ps->proto, 0);
+	for(n = 0; n < ts->len; n++)
+		if ((ts->shape[n].clearance > 0) && (ts->shape[n].clearance < 2 * conf_core.design.bloat))
+			return 1;
+
+	return 0;
+}
+
+/* Check the minimum distance between a hole's edge and a shape's edge and
+   indicate error if it's smaller than min */
+static pcb_bool pcb_pstk_shape_hole_break(pcb_pstk_shape_t *shp, pcb_coord_t hdia, pcb_coord_t min, pcb_coord_t *out)
+{
+	double dist, neck, mindist2, dist2;
+	pcb_line_t line;
+	int n;
+
+	switch(shp->shape) {
+		case PCB_PSSH_CIRC:
+			dist = sqrt(shp->data.circ.x*shp->data.circ.x + shp->data.circ.y*shp->data.circ.y);
+			neck = (double)(shp->data.circ.dia - hdia) / 2.0 - dist;
+			break;
+		case PCB_PSSH_LINE:
+			line.Point1.X = shp->data.line.x1;
+			line.Point1.Y = shp->data.line.y1;
+			line.Point2.X = shp->data.line.x2;
+			line.Point2.Y = shp->data.line.y2;
+			line.Thickness = shp->data.line.thickness;
+			dist = sqrt(pcb_point_line_dist2(0, 0, &line));
+			neck = (double)(shp->data.line.thickness - hdia) / 2.0 - dist;
+			break;
+		case PCB_PSSH_POLY:
+			/* square of the minimal distance required for a neck */
+			mindist2 = hdia/2 + min;
+			mindist2 *= mindist2;
+
+			/* cheapest test: if any corner is closer to the hole than min, we are doomed */
+			for(n = 0; n < shp->data.poly.len; n++) {
+				dist2 = shp->data.poly.x[n] * shp->data.poly.x[n] + shp->data.poly.y[n] * shp->data.poly.y[n];
+				if (dist2 < mindist2)
+					return 1;
+			}
+			
+			/* more expensive: check each edge */
+			line.Point1.X = shp->data.poly.x[shp->data.poly.len - 1];
+			line.Point1.Y = shp->data.poly.y[shp->data.poly.len - 1];
+			line.Thickness = 1;
+
+			for(n = 0; n < shp->data.poly.len; n++) {
+				line.Point2.X = shp->data.poly.x[n];
+				line.Point2.Y = shp->data.poly.y[n];
+
+				dist2 = sqrt(pcb_point_line_dist2(0, 0, &line));
+				if (dist2 < mindist2)
+					return 1;
+
+				/* shift coords for the next iteration */
+				line.Point1.X = line.Point2.X;
+				line.Point1.Y = line.Point2.Y;
+			}
+			return 0; /* survived all tests: we are fine! */
+	}
+
+	return neck < min;
+}
+
+void pcb_pstk_drc_check_and_warn(pcb_pstk_t *ps, pcb_coord_t *err_minring, pcb_coord_t *err_minhole)
+{
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	if (proto->hdia >= 0) {
+		int n;
+		pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape_(ps->parent.data, ps->proto, 0);
+
+		for(n = 0; n < ts->len; n++) {
+			if (pcb_pstk_shape_hole_break(&ts->shape[n], proto->hdia, 2 * conf_core.design.min_ring, err_minring)) {
+				break;
+			}
+		}
+	}
+
+	if ((proto->hdia > 0) && (proto->hdia < conf_core.design.min_drill))
+		*err_minhole = proto->hdia;
+}
+
+void pcb_pstk_mirror(pcb_pstk_t *ps, pcb_coord_t y_offs, int swap_side, int disable_xmirror)
+{
+	int xmirror = !ps->xmirror, smirror = (swap_side ? (!ps->smirror) : ps->smirror);
+
+
+	/* change the mirror flag - this will automatically cause mirroring in
+	   every aspect */
+	if (disable_xmirror)
+		pcb_pstk_change_instance(ps, NULL, NULL, NULL, NULL, &smirror);
+	else
+		pcb_pstk_change_instance(ps, NULL, NULL, NULL, &xmirror, &smirror);
+
+	/* if mirror center is not 0, also move, to emulate that the mirror took
+	   place around that point */
+	if (((y_offs != 0) || (ps->y != 0)) && (y_offs != PCB_PSTK_DONT_MIRROR_COORDS)) {
+		pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		pcb_pstk_invalidate_erase(ps);
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+
+		ps->y = PCB_SWAP_Y(ps->y) + y_offs;
+		pcb_pstk_bbox(ps);
+
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+		pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		pcb_pstk_invalidate_draw(ps);
+	}
+}
+
+unsigned char *pcb_pstk_get_thermal(pcb_pstk_t *ps, unsigned long lid, pcb_bool_t alloc)
+{
+	if (ps->thermals.used <= lid) {
+		unsigned long oldu = ps->thermals.used;
+		if (!alloc)
+			return NULL;
+		ps->thermals.used = lid+1;
+		ps->thermals.shape = realloc(ps->thermals.shape, ps->thermals.used);
+		memset(ps->thermals.shape + oldu, 0, ps->thermals.used - oldu);
+	}
+	return ps->thermals.shape + lid;
+}
+
+void pcb_pstk_set_thermal(pcb_pstk_t *ps, unsigned long lid, unsigned char shape)
+{
+	unsigned char *th = pcb_pstk_get_thermal(ps, lid, 1);
+	if (th != NULL)
+		*th = shape;
+}
+
+/*** Undoable instance parameter change ***/
+
+typedef struct {
+	long int parent_ID; /* -1 for pcb, positive for a subc */
+	long int ID;        /* ID of the padstack */
+
+	pcb_cardinal_t proto;
+	pcb_coord_t clearance;
+	double rot;
+	int xmirror, smirror;
+} padstack_change_instance_t;
+
+#define swap(a,b,type) \
+	do { \
+		type tmp = a; \
+		a = b; \
+		b = tmp; \
+	} while(0)
+
+pcb_data_t *pcb_pstk_data_hack = NULL;
+
+static int undo_change_instance_swap(void *udata)
+{
+	padstack_change_instance_t *u = udata;
+	pcb_data_t *data;
+	pcb_pstk_t *ps;
+
+	/* data is either parent subc's data or board's data */
+	if (u->parent_ID != -1) {
+		pcb_subc_t *subc;
+		int n;
+
+		/* Look up the parent subc by ID; on the board, in the hack-data and in all buffers */
+		subc = pcb_subc_by_id(PCB->Data, u->parent_ID);
+		if ((subc == NULL) && (pcb_pstk_data_hack != NULL))
+			subc = pcb_subc_by_id(pcb_pstk_data_hack, u->parent_ID);
+		for(n = 0; (subc == NULL) && (n < PCB_MAX_BUFFER); n++)
+			subc = pcb_subc_by_id(pcb_buffers[n].Data, u->parent_ID);
+		if (subc == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Can't undo padstack change: parent subc #%ld is not found\n", u->parent_ID);
+			return -1;
+		}
+		data = subc->data;
+	}
+	else
+		data = PCB->Data;
+
+	ps = pcb_pstk_by_id(data, u->ID);
+	if (ps == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't undo padstack change: padstack ID #%ld is not available\n", u->ID);
+		return -1;
+	}
+
+	pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+	pcb_pstk_invalidate_erase(ps);
+	if (ps->parent.data->padstack_tree != NULL)
+		pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+
+	swap(ps->proto,      u->proto,     pcb_cardinal_t);
+	swap(ps->Clearance,  u->clearance, pcb_coord_t);
+	swap(ps->rot,        u->rot,       double);
+	swap(ps->xmirror,    u->xmirror,   int);
+	swap(ps->smirror,    u->smirror,   int);
+
+	/* force re-render the prototype */
+	ps->protoi = -1;
+	pcb_pstk_get_tshape(ps);
+
+	pcb_pstk_bbox(ps);
+	if (ps->parent.data->padstack_tree != NULL)
+		pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+	pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+	pcb_pstk_invalidate_draw(ps);
+
+	return 0;
+}
+
+static void undo_change_instance_print(void *udata, char *dst, size_t dst_len)
+{
+	padstack_change_instance_t *u = udata;
+	pcb_snprintf(dst, dst_len, "padstack change: clearance=%$mm rot=%.2f xmirror=%d smirror=%d\n", u->clearance, u->rot, u->xmirror, u->smirror);
+}
+
+static const uundo_oper_t undo_pstk_change_instance = {
+	core_pstk_cookie,
+	NULL, /* free */
+	undo_change_instance_swap,
+	undo_change_instance_swap,
+	undo_change_instance_print
+};
+
+int pcb_pstk_change_instance(pcb_pstk_t *ps, pcb_cardinal_t *proto, const pcb_coord_t *clearance, double *rot, int *xmirror, int *smirror)
+{
+	padstack_change_instance_t *u;
+	long int parent_ID;
+	pcb_opctx_t ctx;
+
+	switch(ps->parent.data->parent_type) {
+		case PCB_PARENT_INVALID:
+			/* happens if parent is a buffer: do not undo operations done on the buffer */
+			ps->proto = proto ? *proto : ps->proto;
+			ps->Clearance = clearance ? *clearance : ps->Clearance;
+			ps->rot = rot ? *rot : ps->rot;
+			ps->xmirror = xmirror ? *xmirror : ps->xmirror;
+			ps->smirror = smirror ? *smirror : ps->smirror;
+
+			/* re-render the prototype so the new shape is generated and cached */
+			ps->protoi = -1;
+			pcb_pstk_get_tshape(ps);
+			return 0;
+		case PCB_PARENT_BOARD: parent_ID = -1; break;
+		case PCB_PARENT_SUBC: parent_ID = ps->parent.data->parent.subc->ID; break;
+		default: return -1;
+	}
+
+	ctx.clip.clear = 0;
+	ctx.clip.restore = 1;
+	pcb_pstkop_clip(&ctx, ps);
+
+	u = pcb_undo_alloc(PCB, &undo_pstk_change_instance, sizeof(padstack_change_instance_t));
+	u->parent_ID = parent_ID;
+	u->ID = ps->ID;
+	u->proto = proto ? *proto : ps->proto;
+	u->clearance = clearance ? *clearance : ps->Clearance;
+	u->rot = rot ? *rot : ps->rot;
+	u->xmirror = xmirror ? *xmirror : ps->xmirror;
+	u->smirror = smirror ? *smirror : ps->smirror;
+
+	pcb_pstk_bbox(ps);
+	ctx.clip.clear = 1;
+	ctx.clip.restore = 0;
+	pcb_pstkop_clip(&ctx, ps);
+
+
+	undo_change_instance_swap(u);
+
+	pcb_undo_inc_serial();
+	return 0;
+}
+
+pcb_bool pcb_pstk_is_group_empty(pcb_board_t *pcb, pcb_layergrp_id_t gid)
+{
+	pcb_layergrp_t *g = &pcb->LayerGroups.grp[gid];
+
+	PCB_PADSTACK_LOOP(pcb->Data); {
+		pcb_cardinal_t n;
+		for(n = 0; n < g->len; n++)
+			if (pcb_pstk_shape_at(pcb, padstack, &pcb->Data->Layer[g->lid[n]]))
+				return pcb_false;
+	}
+	PCB_END_LOOP;
+	return pcb_true;
+}
+
+
+#include "obj_pstk_op.c"
+
+void pcb_pstk_rotate90(pcb_pstk_t *pstk, pcb_coord_t cx, pcb_coord_t cy, int steps)
+{
+	pcb_opctx_t ctx;
+
+	ctx.rotate.center_x = cx;
+	ctx.rotate.center_y = cy;
+	ctx.rotate.number = steps;
+	pcb_pstkop_rotate90(&ctx, pstk);
+}
+
+void pcb_pstk_rotate(pcb_pstk_t *pstk, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina, double angle)
+{
+	pcb_opctx_t ctx;
+
+	ctx.rotate.center_x = cx;
+	ctx.rotate.center_y = cy;
+	ctx.rotate.angle = angle;
+	ctx.rotate.cosa = cosa;
+	ctx.rotate.sina = sina;
+	pcb_pstkop_rotate(&ctx, pstk);
+}
+
+pcb_coord_t obj_pstk_get_clearance(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer)
+{
+	pcb_pstk_shape_t *shp;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps))
+		return 0;
+
+	if (ps->Clearance > 0) /* global clarance overrides */
+		return ps->Clearance;
+
+	shp = pcb_pstk_shape_at(pcb, ps, layer);
+	return shp->clearance;
+}
Index: tags/2.0.1/src/obj_pstk.h
===================================================================
--- tags/2.0.1/src/obj_pstk.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk.h	(revision 18980)
@@ -0,0 +1,232 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_PSTK_STRUCT_DECLARED
+#define PCB_OBJ_PSTK_STRUCT_DECLARED
+
+#include <genlist/gendlist.h>
+#include <genvector/vtp0.h>
+#include "obj_common.h"
+
+/* The actual padstack is just a reference to a padstack proto within the same data */
+struct pcb_pstk_s {
+#define thermal thermal_dont_use
+	PCB_ANY_PRIMITIVE_FIELDS;
+#undef thermal
+	pcb_cardinal_t proto;          /* reference to a pcb_pstk_proto_t within pcb_data_t */
+	int protoi;                    /* index of the transformed proto; -1 means invalid; local cache, not saved */
+	pcb_coord_t x, y;
+	pcb_coord_t Clearance;
+	double rot;                    /* rotation angle */
+	char xmirror, smirror;
+	struct {
+		unsigned long used;
+		unsigned char *shape;        /* indexed by layer ID */
+	} thermals;
+	gdl_elem_t link;               /* a padstack is in a list in pcb_data_t as a global object */
+};
+#endif
+
+#ifndef PCB_PADSTACK_STRUCT_ONLY
+#ifndef PCB_OBJ_PSTK_H
+#define PCB_OBJ_PSTK_H
+
+#define PCB_PADSTACK_MAX_SHAPES 31
+
+#define PCB_PADSTACK_INVALID ((pcb_cardinal_t)(-1))
+
+#include "layer.h"
+#include "obj_common.h"
+#include "obj_pstk_shape.h"
+#include "vtpadstack_t.h"
+
+typedef struct pcb_pstk_proto_s {
+	unsigned in_use:1;             /* 1 if the slot is in use */
+
+	unsigned hplated:1;            /* if > 0, whether the hole is plated */
+	char *name;                    /* optional user assigned name (or NULL) */
+	pcb_coord_t hdia;              /* if > 0, diameter of the hole (else there's no hole) */
+	int htop, hbottom;             /* if hdia > 0, determine the hole's span, counted in copper layer groups from the top or bottom copper layer group */
+
+	pcb_vtpadstack_tshape_t tr;    /* [0] is the canonical prototype with rot=0, xmirror=0 and smirror=0; the rest is an unordered list of transformed entries */
+
+	/* local cache - not saved */
+	unsigned long hash;            /* optimization: linear search compare speeded up: go into detailed match only if hash matches */
+	pcb_data_t *parent;
+} pcb_pstk_proto_t;
+
+
+
+pcb_pstk_t *pcb_pstk_alloc(pcb_data_t *data);
+void pcb_pstk_free(pcb_pstk_t *ps);
+pcb_pstk_t *pcb_pstk_new(pcb_data_t *data, pcb_cardinal_t proto, pcb_coord_t x, pcb_coord_t y, pcb_coord_t clearance, pcb_flag_t Flags);
+pcb_pstk_t *pcb_pstk_new_tr(pcb_data_t *data, pcb_cardinal_t proto, pcb_coord_t x, pcb_coord_t y, pcb_coord_t clearance, pcb_flag_t Flags, double rot, int xmirror, int smirror);
+void pcb_pstk_add(pcb_data_t *data, pcb_pstk_t *ps);
+void pcb_pstk_bbox(pcb_pstk_t *ps);
+void pcb_pstk_copper_bbox(pcb_box_t *dst, pcb_pstk_t *ps);
+
+/* hash and eq */
+int pcb_pstk_eq(const pcb_host_trans_t *tr1, const pcb_pstk_t *p1, const pcb_host_trans_t *tr2, const pcb_pstk_t *p2);
+unsigned int pcb_pstk_hash(const pcb_host_trans_t *tr, const pcb_pstk_t *p);
+
+
+void pcb_pstk_set_thermal(pcb_pstk_t *ps, unsigned long lid, unsigned char shape);
+unsigned char *pcb_pstk_get_thermal(pcb_pstk_t *ps, unsigned long lid, pcb_bool_t alloc);
+
+pcb_pstk_t *pcb_pstk_by_id(pcb_data_t *base, long int ID);
+
+/* Undoably change the instance parameters of a padstack ref */
+int pcb_pstk_change_instance(pcb_pstk_t *ps, pcb_cardinal_t *proto, const pcb_coord_t *clearance, double *rot, int *xmirror, int *smirror);
+
+/* Return whether a group is empty (free of padstack shapes) */
+pcb_bool pcb_pstk_is_group_empty(pcb_board_t *pcb, pcb_layergrp_id_t gid);
+
+/* Copy all metadata (attributes, thermals, etc.) */
+pcb_pstk_t *pcb_pstk_copy_meta(pcb_pstk_t *dst, pcb_pstk_t *src);
+
+/* Copy orientation information (rotatioin and mirror) of an instance */
+pcb_pstk_t *pcb_pstk_copy_orient(pcb_pstk_t *dst, pcb_pstk_t *src);
+
+/* Clearance of the padstack on a given layer */
+pcb_coord_t obj_pstk_get_clearance(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer);
+
+/*** proto ***/
+
+/* Convert selection or current buffer to padstack; returns PCB_PADSTACK_INVALID
+   on error; looks for existing matching protos to avoid adding redundant
+   entries */
+pcb_cardinal_t pcb_pstk_conv_selection(pcb_board_t *pcb, int quiet, pcb_coord_t ox, pcb_coord_t oy);
+pcb_cardinal_t pcb_pstk_conv_buffer(int quiet);
+
+/* Low level converter: take an array of (pcb_any_obj_t *) objs and convert
+   them into shapes of the dst proto. Does not remove input objects. */
+int pcb_pstk_proto_conv(pcb_data_t *data, pcb_pstk_proto_t *dst, int quiet, vtp0_t *objs, pcb_coord_t ox, pcb_coord_t oy);
+
+/* Break up src into discrete non-pstk objects placed in dst, one object
+   per layer type. The hole is ignored. If remove_src is true, also remove
+   src padstack. */
+int pcb_pstk_proto_breakup(pcb_data_t *dst, pcb_pstk_t *src, pcb_bool remove_src);
+
+/* free fields of a proto (not freeing the proto itself, not removing it from lists */
+void pcb_pstk_proto_free_fields(pcb_pstk_proto_t *dst);
+
+/* allocate/free the point array of a poly shape (single allocation for x and y) */
+void pcb_pstk_shape_alloc_poly(pcb_pstk_poly_t *poly, int len);
+void pcb_pstk_shape_free_poly(pcb_pstk_poly_t *poly);
+
+/* geometry for select.c and search.c; if layer is NULL, consider all shapes */
+int pcb_pstk_near_box(pcb_pstk_t *ps, pcb_box_t *box, pcb_layer_t *layer);
+int pcb_is_point_in_pstk(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, pcb_pstk_t *ps, pcb_layer_t *layer);
+
+/* Check if padstack has the proper clearance against polygon; returns 0 if everything's fine */
+int pcb_pstk_drc_check_clearance(pcb_pstk_t *ps, pcb_poly_t *polygon, pcb_coord_t min_clr);
+
+/* Check all possible local drc errors regarding to pad stacks - errors that
+   depend only on the padstack, not on other objects. load err_minring and
+   err_minhole with the relevant data for the report when ring or hole rules
+   are violated */
+void pcb_pstk_drc_check_and_warn(pcb_pstk_t *ps, pcb_coord_t *err_minring, pcb_coord_t *err_minhole);
+
+/* Generate poly->pa (which should be NULL at the time of call) */
+void pcb_pstk_shape_update_pa(pcb_pstk_poly_t *poly);
+
+/* Insert proto into the cache of data; if it's already in, return the existing
+   ID, else dup it and insert it. */
+pcb_cardinal_t pcb_pstk_proto_insert_dup(pcb_data_t *data, const pcb_pstk_proto_t *proto, int quiet);
+
+/* Change the non-NULL hole properties of a padstack proto; undoable.
+   Returns 0 on success. */
+int pcb_pstk_proto_change_hole(pcb_pstk_proto_t *proto, const int *hplated, const pcb_coord_t *hdia, const int *htop, const int *hbottom);
+
+/* Change the name of a padstack proto; not yet undoable.
+   Returns 0 on success. */
+int pcb_pstk_proto_change_name(pcb_pstk_proto_t *proto, const char *new_name);
+
+/* Find or create a new transformed version of an existing proto */
+pcb_pstk_tshape_t *pcb_pstk_make_tshape(pcb_data_t *data, pcb_pstk_proto_t *proto, double rot, int xmirror, int smirror, int *out_protoi);
+
+/* Deep copy a prototype or shape */
+void pcb_pstk_proto_copy(pcb_pstk_proto_t *dst, const pcb_pstk_proto_t *src);
+void pcb_pstk_shape_copy(pcb_pstk_shape_t *dst, pcb_pstk_shape_t *src);
+
+/* free all fields of a shape */
+void pcb_pstk_shape_free(pcb_pstk_shape_t *s);
+
+/* grow (or shrink) a prototype to or by val - change the proto in place */
+void pcb_pstk_proto_grow(pcb_pstk_proto_t *proto, pcb_bool is_absolute, pcb_coord_t val);
+void pcb_pstk_shape_grow(pcb_pstk_shape_t *shp, pcb_bool is_absolute, pcb_coord_t val);
+void pcb_pstk_shape_clr_grow(pcb_pstk_shape_t *shp, pcb_bool is_absolute, pcb_coord_t val);
+
+/* Derive (copy and bloat) the shape at dst_idx from src_idx; set the mask and comb
+   for the new shape. If dst_idx is -1, allocate the new shape */
+void pcb_pstk_shape_derive(pcb_pstk_proto_t *proto, int dst_idx, int src_idx, pcb_coord_t bloat, pcb_layer_type_t mask, pcb_layer_combining_t comb);
+
+/* Look up the shape index corresponding to a lty/comb; returns -1 if not found/empty */
+int pcb_pstk_get_shape_idx(pcb_pstk_tshape_t *ts, pcb_layer_type_t lyt, pcb_layer_combining_t comb);
+
+/* Remove a shape from the proto (either by layer or by idx) */
+void pcb_pstk_proto_del_shape(pcb_pstk_proto_t *proto, pcb_layer_type_t lyt, pcb_layer_combining_t comb);
+void pcb_pstk_proto_del_shape_idx(pcb_pstk_proto_t *proto, int idx);
+
+#define PCB_PSTK_DONT_MIRROR_COORDS PCB_MAX_COORD
+/* Mirror a padstack (useful for sending to the other side - set swap_side to 1 in that case)
+   Disabling xmirror is useful if side needs to be swapped but coordinates
+   are already mirrored so they represent the other-side geometry (e.g. when
+   importing from old pcb formats). If y_offs is PCB_PSTK_DONT_MIRROR_COORDS,
+   do not change the y coord */
+void pcb_pstk_mirror(pcb_pstk_t *ps, pcb_coord_t y_offs, int swap_side, int disable_xmirror);
+
+/* Rotate in place (op wrapper) */
+void pcb_pstk_rotate90(pcb_pstk_t *pstk, pcb_coord_t cx, pcb_coord_t cy, int steps);
+void pcb_pstk_rotate(pcb_pstk_t *pstk, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina, double angle);
+
+/* High level move (op wrapper; no undo) */
+void pcb_pstk_move(pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy, pcb_bool more_to_come);
+
+/* Low level move - updates only the coordinates and the bbox */
+void pcb_pstk_move_(pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy);
+
+/* Temporary hack until we have a refcounted objects and ID->pcb_any_obj_t hash */
+extern pcb_data_t *pcb_pstk_data_hack;
+
+/* Insert a proto in data and return the proto-id. If the proto is already
+   in data, the fields of the caller's version are free'd, else they are
+   copied into data. In any case, the caller should not free proto. */
+pcb_cardinal_t pcb_pstk_proto_insert_or_free(pcb_data_t *data, pcb_pstk_proto_t *proto, int quiet);
+
+
+/*** hash ***/
+unsigned int pcb_pstk_proto_hash(const pcb_pstk_proto_t *p);
+int pcb_pstk_proto_eq(const pcb_pstk_proto_t *p1, const pcb_pstk_proto_t *p2);
+
+/*** loops ***/
+#define PCB_PADSTACK_LOOP(top) do {                                \
+  pcb_pstk_t *padstack;                                        \
+  gdl_iterator_t __it__;                                           \
+  padstacklist_foreach(&(top)->padstack, &__it__, padstack) {
+
+#endif
+#endif
Index: tags/2.0.1/src/obj_pstk_act.c
===================================================================
--- tags/2.0.1/src/obj_pstk_act.c	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_act.c	(revision 18980)
@@ -0,0 +1,221 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+
+#include "funchash_core.h"
+#include "board.h"
+#include "conf_core.h"
+#include "data.h"
+#include "actions.h"
+#include "search.h"
+#include "data_list.h"
+
+static const char pcb_acts_padstackconvert[] = "PadstackConvert(buffer|selected, [originx, originy])";
+static const char pcb_acth_padstackconvert[] = "Convert selection or current buffer to padstack";
+fgw_error_t pcb_act_padstackconvert(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	pcb_coord_t x, y;
+	pcb_cardinal_t pid;
+	pcb_pstk_proto_t tmp, *p;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_Selected:
+		if (argc > 3) {
+			PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2]));
+			PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3]));
+		}
+		else {
+			pcb_hid_get_coords("Click at padstack origin", &x, &y, 0);
+			/* rather use the snapped corsshair coords */
+			x = pcb_crosshair.X;
+			y = pcb_crosshair.Y;
+		}
+		pid = pcb_pstk_conv_selection(PCB, 0, x, y);
+
+		if (pid != PCB_PADSTACK_INVALID) {
+			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+			p = pcb_vtpadstack_proto_alloc_append(&PCB_PASTEBUFFER->Data->ps_protos, 1);
+			pcb_pstk_proto_copy(p, &PCB->Data->ps_protos.array[pid]);
+			p->parent = PCB_PASTEBUFFER->Data;
+			pid = pcb_pstk_get_proto_id(p); /* should be 0 because of the clear, but just in case... */
+		}
+		break;
+		case F_Buffer:
+		pid = pcb_pstk_conv_buffer(0);
+
+		if (pid != PCB_PADSTACK_INVALID) {
+			/* have to save and restore the prototype around the buffer clear */
+			tmp = PCB_PASTEBUFFER->Data->ps_protos.array[pid];
+			memset(&PCB_PASTEBUFFER->Data->ps_protos.array[pid], 0, sizeof(PCB_PASTEBUFFER->Data->ps_protos.array[0]));
+			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+			p = pcb_vtpadstack_proto_alloc_append(&PCB_PASTEBUFFER->Data->ps_protos, 1);
+			*p = tmp;
+			p->parent = PCB_PASTEBUFFER->Data;
+			pid = pcb_pstk_get_proto_id(p); /* should be 0 because of the clear, but just in case... */
+		}
+		break;
+		default:
+			PCB_ACT_FAIL(padstackconvert);
+	}
+
+	if (pid != PCB_PADSTACK_INVALID) {
+		pcb_message(PCB_MSG_INFO, "Pad stack registered with ID %d\n", pid);
+		pcb_pstk_new(PCB_PASTEBUFFER->Data, pid, 0, 0, conf_core.design.clearance, pcb_flag_make(PCB_FLAG_CLEARLINE));
+		pcb_set_buffer_bbox(PCB_PASTEBUFFER);
+		PCB_PASTEBUFFER->X = PCB_PASTEBUFFER->Y = 0;
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "(failed to convert to padstack)\n", pid);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_padstackbreakup[] = "PadstackBreakup(buffer|selected|objet)";
+static const char pcb_acth_padstackbreakup[] = "Break up a padstack into one non-padstack object per layer type (the hole is ignored)";
+fgw_error_t pcb_act_padstackbreakup(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, padstackconvert, op = fgw_keyword(&argv[1]));
+	PCB_ACT_IRES(-1);
+
+	switch(op) {
+		case F_Object:
+			{
+				void *ptr1, *ptr2, *ptr3;
+				pcb_pstk_t *ps;
+				pcb_objtype_t type;
+				pcb_coord_t x, y;
+				
+				pcb_hid_get_coords("Select a padstack to break up", &x, &y, 0);
+				if ((type = pcb_search_screen(x, y, PCB_OBJ_PSTK, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_PSTK) {
+					pcb_message(PCB_MSG_ERROR, "Need a padstack under the cursor\n");
+					break;
+				}
+				ps = (pcb_pstk_t *)ptr2;
+				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *)ps)) {
+					pcb_message(PCB_MSG_ERROR, "Sorry, that padstack is locked\n");
+					break;
+				}
+				PCB_ACT_IRES(pcb_pstk_proto_breakup(PCB->Data, ps, 1));
+			}
+			break;
+		case F_Selected:
+			{
+				pcb_cardinal_t n;
+				int ret = 0;
+				vtp0_t objs;
+				pcb_any_obj_t **o;
+
+				vtp0_init(&objs);
+				pcb_data_list_by_flag(PCB->Data, &objs, PCB_OBJ_PSTK, PCB_FLAG_SELECTED);
+				for(n = 0, o = (pcb_any_obj_t **)objs.array; n < vtp0_len(&objs); n++,o++)
+					ret |= pcb_pstk_proto_breakup(PCB->Data, (pcb_pstk_t *)*o, 1);
+				PCB_ACT_IRES(ret);
+				vtp0_uninit(&objs);
+			}
+			break;
+		case F_Buffer:
+			{
+				int ret = 0;
+				PCB_PADSTACK_LOOP(PCB_PASTEBUFFER->Data) {
+					ret |= pcb_pstk_proto_breakup(PCB_PASTEBUFFER->Data, padstack, 1);
+				} PCB_END_LOOP;
+				PCB_ACT_IRES(ret);
+			}
+			break;
+		default:
+			PCB_ACT_FAIL(padstackbreakup);
+	}
+	return 0;
+}
+
+static const char pcb_acts_padstackplace[] = "PadstackPlace([proto_id|default], [x, y])";
+static const char pcb_acth_padstackplace[] = "Place a pad stack (either proto_id, or if not specified, the default for style)";
+fgw_error_t pcb_act_padstackplace(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *pids = NULL;
+	pcb_cardinal_t pid;
+	pcb_pstk_t *ps;
+	pcb_coord_t x, y;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, padstackplace, pids = argv[1].val.str);
+
+	if (argc > 3) {
+		PCB_ACT_CONVARG(2, FGW_COORD, padstackconvert, x = fgw_coord(&argv[2]));
+		PCB_ACT_CONVARG(3, FGW_COORD, padstackconvert, y = fgw_coord(&argv[3]));
+	}
+	else {
+		pcb_hid_get_coords("Click at padstack origin", &x, &y, 0);
+		/* rather use the snapped corsshair coords */
+		x = pcb_crosshair.X;
+		y = pcb_crosshair.Y;
+	}
+
+	if ((pids == NULL) || (strcmp(pids, "default") == 0)) {
+#warning padstack TODO: style default proto
+		pid = 0;
+	}
+	else {
+		char *end;
+		pid = strtol(pids, &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "Error in proto ID format: need an integer\n");
+			return -1;
+		}
+	}
+
+	if ((pid >= PCB->Data->ps_protos.used) || (PCB->Data->ps_protos.array[pid].in_use == 0)) {
+		pcb_message(PCB_MSG_ERROR, "Invalid padstack proto %ld\n", (long)pid);
+		return -1;
+	}
+
+	ps = pcb_pstk_new(PCB->Data, pid, x, y, conf_core.design.clearance, pcb_no_flags());
+	if (ps == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to place padstack\n");
+		return -1;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+pcb_action_t padstack_action_list[] = {
+	{"PadstackConvert", pcb_act_padstackconvert, pcb_acth_padstackconvert, pcb_acts_padstackconvert},
+	{"PadstackBreakup", pcb_act_padstackbreakup, pcb_acth_padstackbreakup, pcb_acts_padstackbreakup},
+	{"PadstackPlace", pcb_act_padstackplace, pcb_acth_padstackplace, pcb_acts_padstackplace}
+};
+
+PCB_REGISTER_ACTIONS(padstack_action_list, NULL)
Index: tags/2.0.1/src/obj_pstk_draw.h
===================================================================
--- tags/2.0.1/src/obj_pstk_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_draw.h	(revision 18980)
@@ -0,0 +1,70 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "obj_pstk.h"
+
+#ifndef PCB_OBJ_PSTK_DRAW_H
+#define PCB_OBJ_PSTK_DRAW_H
+
+/* Include rtree.h for these */
+#ifdef PCB_RTREE_H
+
+#include "board.h"
+#include "layer_grp.h"
+
+typedef enum {
+	PCB_PHOLE_PLATED = 1,
+	PCB_PHOLE_UNPLATED = 2,
+	PCB_PHOLE_BB = 4
+} pcb_pstk_draw_hole_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_layergrp_id_t gid;
+	int is_current;
+	pcb_pstk_draw_hole_t holetype;
+	pcb_layer_combining_t comb;
+	pcb_layer_t *layer1; /* first (real) layer in the target group */
+
+	pcb_layer_type_t shape_mask; /* when gid is invalid, use this for the shapes */
+} pcb_pstk_draw_t;
+
+pcb_r_dir_t pcb_pstk_draw_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t pcb_pstk_draw_hole_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t pcb_pstk_clear_callback(const pcb_box_t *b, void *cl);
+#endif
+
+void pcb_pstk_draw(pcb_pstk_t *ps, pcb_bool draw_hole);
+pcb_r_dir_t pcb_pstk_draw_mark_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t pcb_pstk_draw_label_callback(const pcb_box_t *b, void *cl);
+void pcb_pstk_draw_label(pcb_pstk_t *ps);
+void pcb_pstk_invalidate_erase(pcb_pstk_t *ps);
+void pcb_pstk_invalidate_draw(pcb_pstk_t *ps);
+
+void pcb_pstk_thindraw(pcb_hid_gc_t gc, pcb_pstk_t *ps);
+
+
+#endif
Index: tags/2.0.1/src/obj_pstk_inlines.h
===================================================================
--- tags/2.0.1/src/obj_pstk_inlines.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_inlines.h	(revision 18980)
@@ -0,0 +1,269 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_PSTK_INLINES_H
+#define PCB_OBJ_PSTK_INLINES_H
+
+#include "board.h"
+#include "data.h"
+#include "obj_pstk.h"
+#include "vtpadstack.h"
+#include "layer.h"
+#include "thermal.h"
+
+typedef enum {
+	PCB_BB_NONE, /* no drill */
+	PCB_BB_THRU, /* all way thru */
+	PCB_BB_BB,
+	PCB_BB_INVALID
+} pcb_bb_type_t;
+
+/* Returns the ID of a proto within its parent's cache */
+PCB_INLINE pcb_cardinal_t pcb_pstk_get_proto_id(const pcb_pstk_proto_t *proto)
+{
+	pcb_data_t *data = proto->parent;
+	if ((proto >= data->ps_protos.array) && (proto < data->ps_protos.array + data->ps_protos.used))
+		return proto - data->ps_protos.array;
+	assert(!"padstack proto is not in its own parent!");
+	return PCB_PADSTACK_INVALID;
+}
+
+/* return the padstack prototype for a padstack reference - returns NULL if not found */
+PCB_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto_(const pcb_data_t *data, pcb_cardinal_t proto)
+{
+	if (proto >= data->ps_protos.used)
+		return NULL;
+	if (data->ps_protos.array[proto].in_use == 0)
+		return NULL;
+	return data->ps_protos.array + proto;
+}
+
+/* return the padstack prototype for a padstack reference - returns NULL if not found */
+PCB_INLINE pcb_pstk_proto_t *pcb_pstk_get_proto(const pcb_pstk_t *ps)
+{
+	return pcb_pstk_get_proto_(ps->parent.data, ps->proto);
+}
+
+/* return the padstack transformed shape. Returns NULL if the proto or the
+   tshape is not. */
+PCB_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape_(const pcb_data_t *data, pcb_cardinal_t proto, int protoi)
+{
+	pcb_pstk_proto_t *pr = pcb_pstk_get_proto_(data, proto);
+	if (protoi < 0)
+		return NULL;
+	if (pr == NULL)
+		return NULL;
+	if (protoi >= pr->tr.used)
+		return NULL;
+	return &pr->tr.array[protoi];
+}
+
+/* return the padstack prototype for a padstack reference - returns NULL if not found */
+PCB_INLINE pcb_pstk_tshape_t *pcb_pstk_get_tshape(pcb_pstk_t *ps)
+{
+	if (ps->protoi < 0) { /* need to update this */
+		pcb_pstk_proto_t *pr = pcb_pstk_get_proto_(ps->parent.data, ps->proto);
+		if (pr == NULL)
+			return NULL;
+		return pcb_pstk_make_tshape(ps->parent.data, pr, ps->rot, ps->xmirror, ps->smirror, &ps->protoi);
+	}
+	return pcb_pstk_get_tshape_(ps->parent.data, ps->proto, ps->protoi);
+}
+
+/* return the type of drill and optionally fill in group IDs of drill ends ;
+   if proto_out is not NULL, also load it with the proto */
+PCB_INLINE pcb_bb_type_t pcb_pstk_bbspan(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t *top, pcb_layergrp_id_t *bottom, pcb_pstk_proto_t **proto_out)
+{
+	pcb_bb_type_t res;
+	int topi, boti;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	if (proto_out != NULL)
+		*proto_out = proto;
+
+	if (proto == NULL)
+		return PCB_BB_INVALID;
+
+	/* most common case should be quick */
+	if (proto->hdia == 0) {
+		if (top != NULL) *top = -1;
+		if (bottom != NULL) *bottom = -1;
+		return PCB_BB_NONE;
+	}
+
+	if ((proto->htop == 0) && (proto->hbottom == 0)) {
+		if ((top == NULL) && (bottom == NULL))
+			return PCB_BB_THRU;
+		res = PCB_BB_THRU;
+	}
+	else
+		res = PCB_BB_BB;
+
+	/* slower case: need to look up start and end */
+	if (!pcb->LayerGroups.cache.copper_valid)
+		pcb_layergrp_copper_cache_update(&pcb->LayerGroups);
+
+	if (proto->htop >= 0) {
+		/* positive: count from top copper down, bump at bottom */
+		if (proto->htop < pcb->LayerGroups.cache.copper_len)
+			topi = proto->htop;
+		else
+			topi = pcb->LayerGroups.cache.copper_len - 1;
+	}
+	else {
+		/* negative: count from bottom copper up, bump at top */
+		topi = pcb->LayerGroups.cache.copper_len - 1 - proto->htop;
+		if (topi < 0)
+			topi = 0;
+	}
+
+	if (proto->hbottom >= 0) {
+		/* positive: count from bottom copper up, bump at top */
+		if (proto->hbottom < pcb->LayerGroups.cache.copper_len-1)
+			boti = pcb->LayerGroups.cache.copper_len-1-proto->hbottom;
+		else
+			boti = 0;
+	}
+	else {
+		/* positive: count from top copper down, bump at bottom */
+		boti = -proto->hbottom;
+		if (boti > pcb->LayerGroups.cache.copper_len - 1)
+			boti = pcb->LayerGroups.cache.copper_len - 1;
+	}
+
+	if (boti <= topi) {
+		if (top != NULL) *top = -1;
+		if (bottom != NULL) *bottom = -1;
+		return PCB_BB_INVALID;
+	}
+
+	if (top != NULL) *top = pcb->LayerGroups.cache.copper[topi];
+	if (bottom != NULL) *bottom = pcb->LayerGroups.cache.copper[boti];
+
+	return res;
+}
+
+/* return whether a given padstack drills a given group
+  (does not consider plating, only drill!) */
+PCB_INLINE pcb_bool_t pcb_pstk_bb_drills(pcb_board_t *pcb, const pcb_pstk_t *ps, pcb_layergrp_id_t grp, pcb_pstk_proto_t **proto_out)
+{
+	pcb_layergrp_id_t top, bot;
+	pcb_bb_type_t res = pcb_pstk_bbspan(pcb, ps, &top, &bot, proto_out);
+	switch(res) {
+		case PCB_BB_THRU: return pcb_true;
+		case PCB_BB_NONE: case PCB_BB_INVALID: return 0;
+		case PCB_BB_BB: return (grp <= bot) && (grp >= top);
+	}
+	return pcb_false;
+}
+
+/* returns the shape the padstack has on the given layer group;
+   WARNING: does not respect the NOSHAPE thermal, should NOT be
+   called directly; use pcb_pstk_shape_*() instead. */
+PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape(pcb_pstk_t *ps, pcb_layer_type_t lyt, pcb_layer_combining_t comb)
+{
+	int n;
+	pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(ps);
+	if (ts == NULL)
+		return NULL;
+
+	lyt &= (PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE);
+	for(n = 0; n < ts->len; n++)
+		if ((lyt == ts->shape[n].layer_mask) && (comb == ts->shape[n].comb))
+			return ts->shape+n;
+
+	return 0;
+}
+
+PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_at(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_t *layer)
+{
+	unsigned int lyt = pcb_layer_flags_(layer);
+	pcb_layer_combining_t comb = layer->comb;
+
+	if (lyt & PCB_LYT_COPPER) {
+		pcb_layer_id_t lid;
+		if (lyt & PCB_LYT_INTERN) {
+			/* apply internal only if that layer has drill */
+			if (!pcb_pstk_bb_drills(pcb, ps, pcb_layer_get_group_(layer), NULL))
+				return NULL;
+		}
+
+		/* special case: if thermal says 'no shape' on this layer, omit the shape */
+		layer = pcb_layer_get_real(layer);
+		if ((layer != NULL) && (layer->parent.data != NULL)) {
+			lid = pcb_layer_id(layer->parent.data, layer);
+			if (lid < ps->thermals.used) {
+				if ((ps->thermals.shape[lid] & PCB_THERMAL_ON) && ((ps->thermals.shape[lid] & 3) == PCB_THERMAL_NOSHAPE))
+					return NULL;
+			}
+		}
+	}
+
+	/* combining is always 0 for copper */
+	if (lyt & PCB_LYT_COPPER)
+		comb = 0;
+	else
+		comb = layer->comb;
+
+	return pcb_pstk_shape(ps, lyt, comb);
+}
+
+PCB_INLINE pcb_pstk_shape_t *pcb_pstk_shape_gid(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layergrp_id_t gid, pcb_layer_combining_t comb, pcb_layergrp_t **grp_out)
+{
+	pcb_layergrp_t *grp = pcb_get_layergrp(pcb, gid);
+
+	if (grp_out != NULL)
+		*grp_out = grp;
+
+	if ((grp == NULL) || (grp->len < 1))
+		return NULL;
+
+	if (grp->ltype & PCB_LYT_COPPER) {
+		int n, nosh;
+
+		/* blind/buried: intern layer has no shape if no hole */
+		if (grp->ltype & PCB_LYT_INTERN) {
+			/* apply internal only if that layer has drill */
+			if (!pcb_pstk_bb_drills(pcb, ps, gid, NULL))
+				return NULL;
+		}
+
+			/* if all layers of the group says no-shape, don't have a shape */
+		for(n = 0, nosh = 0; n < grp->len; n++) {
+			pcb_layer_id_t lid = grp->lid[n];
+			if ((lid < ps->thermals.used) && (ps->thermals.shape[lid] & PCB_THERMAL_ON) && ((ps->thermals.shape[lid] & 3) == PCB_THERMAL_NOSHAPE))
+				nosh++;
+		}
+		if (nosh == grp->len)
+			return NULL;
+	}
+
+	/* normal procedure: go by group flags */
+	return pcb_pstk_shape(ps, grp->ltype, comb);
+}
+
+
+#endif
Index: tags/2.0.1/src/obj_pstk_list.c
===================================================================
--- tags/2.0.1/src/obj_pstk_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_list.c	(revision 18980)
@@ -0,0 +1,29 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TDL_DONT_UNDEF
+#include "obj_pstk_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_pstk_list.h
===================================================================
--- tags/2.0.1/src/obj_pstk_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_list.h	(revision 18980)
@@ -0,0 +1,51 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_PSTK_LIST_H
+#define PCB_OBJ_PSTK_LIST_H
+
+#define PCB_PADSTACK_STRUCT_ONLY
+#include "obj_pstk.h"
+
+
+/* List of padstatcks */
+#define TDL(x)      padstacklist_ ## x
+#define TDL_LIST_T  padstacklist_t
+#define TDL_ITEM_T  pcb_pstk_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define padstacklist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#undef PCB_PADSTACK_STRUCT_ONLY
+
+#endif
Index: tags/2.0.1/src/obj_pstk_op.c
===================================================================
--- tags/2.0.1/src/obj_pstk_op.c	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_op.c	(revision 18980)
@@ -0,0 +1,341 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "polygon.h"
+#include "rotate.h"
+
+void *pcb_pstkop_add_to_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_t *p;
+	pcb_cardinal_t npid;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	if (proto == NULL)
+		return NULL;
+
+	npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1);
+	p = pcb_pstk_new_tr(ctx->buffer.dst, npid, ps->x, ps->y, ps->Clearance, pcb_flag_mask(ps->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg), ps->rot, ps->xmirror, ps->smirror);
+	return pcb_pstk_copy_meta(p, ps);
+}
+
+/* Move between board and buffer */
+void *pcb_pstkop_move_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_cardinal_t npid;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	if (proto == NULL)
+		return NULL;
+
+	npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1);
+
+	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_PSTK, NULL, ps);
+	pcb_r_delete_entry(ctx->buffer.src->padstack_tree, (pcb_box_t *)ps);
+
+	padstacklist_remove(ps);
+	ps->proto = npid;
+	ps->protoi = -1; /* only the canonical trshape got copied, not the transofrmed ones */
+	padstacklist_append(&ctx->buffer.dst->padstack, ps);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, ps);
+
+	if (!ctx->buffer.dst->padstack_tree)
+		ctx->buffer.dst->padstack_tree = pcb_r_create_tree();
+
+	pcb_r_insert_entry(ctx->buffer.dst->padstack_tree, (pcb_box_t *)ps);
+	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_PSTK, NULL, ps);
+
+	PCB_SET_PARENT(ps, data, ctx->buffer.dst);
+	return ps;
+}
+
+void *pcb_pstkop_copy(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_t *nps;
+	pcb_data_t *data = ctx->copy.pcb->Data;
+	pcb_cardinal_t npid;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	if (proto == NULL)
+		return NULL;
+	npid = pcb_pstk_proto_insert_dup(data, proto, 1);
+
+	nps = pcb_pstk_new_tr(data, npid, ps->x + ctx->copy.DeltaX, ps->y + ctx->copy.DeltaY, ps->Clearance, pcb_flag_mask(ps->Flags, PCB_FLAG_FOUND), ps->rot, ps->xmirror, ps->smirror);
+	if (nps == NULL)
+		return NULL;
+
+	pcb_pstk_copy_meta(nps, ps);
+	pcb_pstk_invalidate_draw(nps);
+	pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, data, nps, nps);
+	return nps;
+}
+
+void *pcb_pstkop_move_noclip(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_invalidate_erase(ps);
+	pcb_pstk_move_(ps, ctx->move.dx, ctx->move.dy);
+	pcb_pstk_invalidate_draw(ps);
+	return ps;
+}
+
+void *pcb_pstkop_move(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_data_t *data = ps->parent.data;
+	assert(ps->parent_type = PCB_PARENT_DATA);
+
+	pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps);
+	pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps);
+	pcb_pstkop_move_noclip(ctx, ps);
+	pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps);
+	pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps);
+	pcb_subc_part_changed(ps);
+	return ps;
+}
+
+void *pcb_pstkop_clip(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_data_t *data = ps->parent.data;
+	assert(ps->parent_type = PCB_PARENT_DATA);
+
+	if (ctx->clip.restore) {
+		if (data->padstack_tree != NULL)
+			pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps);
+		pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps);
+	}
+	if (ctx->clip.clear) {
+		if (data->padstack_tree != NULL)
+			pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps);
+		pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps);
+	}
+
+	return ps;
+}
+
+void *pcb_pstkop_remove(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_invalidate_erase(ps);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_PSTK, ps, ps, ps);
+	pcb_subc_part_changed(ps);
+	return NULL;
+}
+
+void *pcb_pstkop_destroy(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_r_delete_entry(ctx->remove.destroy_target->padstack_tree, (pcb_box_t *)ps);
+	pcb_pstk_free(ps);
+	return NULL;
+}
+
+void *pcb_pstkop_change_thermal(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_board_t *pcb;
+	pcb_layer_t *layer;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+
+	pcb = ctx->chgtherm.pcb;
+	layer = pcb_get_layer(pcb->Data, ctx->chgtherm.lid);
+
+	pcb_undo_add_obj_to_clear_poly(PCB_OBJ_PSTK, ps, ps, ps, pcb_false);
+	pcb_poly_restore_to_poly(pcb->Data, PCB_OBJ_PSTK, layer, ps);
+
+#warning TODO: undo
+	pcb_pstk_set_thermal(ps, ctx->chgtherm.lid, ctx->chgtherm.style);
+
+	pcb_undo_add_obj_to_clear_poly(PCB_OBJ_PSTK, ps, ps, ps, pcb_true);
+	pcb_poly_clear_from_poly(pcb->Data, PCB_OBJ_PSTK, layer, ps);
+	pcb_pstk_invalidate_draw(ps);
+	return ps;
+}
+
+void *pcb_pstkop_change_flag(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	static pcb_flag_values_t pcb_pstk_flags = 0;
+
+	if (pcb_pstk_flags == 0)
+		pcb_pstk_flags = pcb_obj_valid_flags(PCB_OBJ_PSTK);
+
+	if ((ctx->chgflag.flag & pcb_pstk_flags) != ctx->chgflag.flag)
+		return NULL;
+	if ((ctx->chgflag.flag & PCB_FLAG_TERMNAME) && (ps->term == NULL))
+		return NULL;
+	pcb_undo_add_obj_to_flag(ps);
+	PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, ps);
+	return ps;
+}
+
+
+void *pcb_pstkop_rotate(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	double rot = ps->rot;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+
+	if (ps->xmirror)
+		rot -= (double)ctx->rotate.angle;
+	else
+		rot += (double)ctx->rotate.angle;
+
+	if ((rot > 360.0) || (rot < -360.0))
+		rot = fmod(rot, 360.0);
+
+	if ((rot == 360.0) || (rot == -360.0))
+		rot = 0;
+
+	if (pcb_pstk_change_instance(ps, NULL, NULL, &rot, NULL, NULL) == 0) {
+		pcb_coord_t nx = ps->x, ny = ps->y;
+
+
+		pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		pcb_pstk_invalidate_erase(ps);
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_delete_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+
+		pcb_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+		if ((nx != ps->x) || (ny != ps->y))
+			pcb_pstk_move_(ps, nx - ps->x, ny - ps->y);
+
+		pcb_pstk_bbox(ps);
+		if (ps->parent.data->padstack_tree != NULL)
+			pcb_r_insert_entry(ps->parent.data->padstack_tree, (pcb_box_t *)ps);
+		pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		pcb_pstk_invalidate_draw(ps);
+
+		pcb_subc_part_changed(ps);
+		return ps;
+	}
+	return NULL;
+}
+
+void *pcb_pstkop_rotate90(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	ctx->rotate.angle = (double)ctx->rotate.number * 90.0;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+
+	switch(ctx->rotate.number) {
+		case 0:
+			ctx->rotate.sina = 0;
+			ctx->rotate.cosa = 1;
+			break;
+		case 1:
+			ctx->rotate.sina = 1;
+			ctx->rotate.cosa = 0;
+			break;
+		case 2:
+			ctx->rotate.sina = 0;
+			ctx->rotate.cosa = -1;
+			break;
+		case 3:
+			ctx->rotate.sina = -1;
+			ctx->rotate.cosa = 0;
+			break;
+	}
+	return pcb_pstkop_rotate(ctx, ps);
+}
+
+void *pcb_pstkop_change_size(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_proto_t proto;
+	pcb_cardinal_t nproto;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+
+	/* create the new prototype and insert it */
+	pcb_pstk_proto_copy(&proto, pcb_pstk_get_proto(ps));
+	pcb_pstk_proto_grow(&proto, ctx->chgsize.is_absolute, ctx->chgsize.value);
+	nproto = pcb_pstk_proto_insert_dup(ps->parent.data, &proto, 1);
+	pcb_pstk_proto_free_fields(&proto);
+
+	if (nproto == PCB_PADSTACK_INVALID)
+		return NULL;
+
+	if (pcb_pstk_change_instance(ps, &nproto, NULL, NULL, NULL, NULL) == 0) {
+		pcb_subc_part_changed(ps);
+		return ps;
+	}
+
+	return NULL;
+}
+
+void *pcb_pstkop_change_clear_size(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value / 2 : ps->Clearance + ctx->chgsize.value / 2;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+	if (value < 0)
+		value = 0;
+	value = MIN(PCB_MAX_LINESIZE, value);
+	if (!ctx->chgsize.is_absolute && (ctx->chgsize.value < 0) && (value < conf_core.design.bloat))
+		value = 0;
+	if ((ctx->chgsize.value > 0) && (value < conf_core.design.bloat))
+		value = conf_core.design.bloat + 1;
+	if (ps->Clearance == value)
+		return NULL;
+
+	if (pcb_pstk_change_instance(ps, NULL, &value, NULL, NULL, NULL) == 0) {
+		pcb_subc_part_changed(ps);
+		return ps;
+	}
+
+	return NULL;
+}
+
+
+void *pcb_pstkop_change_2nd_size(pcb_opctx_t *ctx, pcb_pstk_t *ps)
+{
+	pcb_pstk_proto_t proto;
+	pcb_cardinal_t nproto;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, ps))
+		return NULL;
+
+	/* create the new prototype and insert it */
+	pcb_pstk_proto_copy(&proto, pcb_pstk_get_proto(ps));
+	if (!ctx->chgsize.is_absolute) {
+		proto.hdia += ctx->chgsize.value;
+		if (proto.hdia < conf_core.design.min_drill)
+			proto.hdia = conf_core.design.min_drill;
+	}
+	else
+		proto.hdia = ctx->chgsize.value;
+	nproto = pcb_pstk_proto_insert_dup(ps->parent.data, &proto, 1);
+	pcb_pstk_proto_free_fields(&proto);
+
+	if (nproto == PCB_PADSTACK_INVALID)
+		return NULL;
+
+	if (pcb_pstk_change_instance(ps, &nproto, NULL, NULL, NULL, NULL) == 0) {
+		pcb_subc_part_changed(ps);
+		return ps;
+	}
+
+	return NULL;
+}
+
Index: tags/2.0.1/src/obj_pstk_op.h
===================================================================
--- tags/2.0.1/src/obj_pstk_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_op.h	(revision 18980)
@@ -0,0 +1,54 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*** Standard operations on padstacks ***/
+
+#include "operation.h"
+
+void *pcb_pstkop_add_to_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_move_buffer(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+void *pcb_pstkop_copy(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_move(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_move_noclip(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_clip(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_remove(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_destroy(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+void *pcb_pstkop_change_thermal(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+void *pcb_pstkop_change_flag(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+void *pcb_pstkop_rotate90(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_rotate(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+void *pcb_pstkop_change_size(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+void *pcb_pstkop_change_clear_size(pcb_opctx_t *ctx, pcb_pstk_t *ps); /* changes the global clearance */
+void *pcb_pstkop_change_2nd_size(pcb_opctx_t *ctx, pcb_pstk_t *ps);
+
+/*** TODO: unimplemented ones ***/
+
+void *pcb_pstkop_change_clear_size(pcb_opctx_t *ctx, pcb_pstk_t *ps);
Index: tags/2.0.1/src/obj_pstk_proto.c
===================================================================
--- tags/2.0.1/src/obj_pstk_proto.c	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_proto.c	(revision 18980)
@@ -0,0 +1,1052 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <assert.h>
+
+#include "board.h"
+#include "buffer.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+#include "data.h"
+#include "data_list.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "rotate.h"
+#include "undo.h"
+#include "vtpadstack_t.h"
+#include "obj_hash.h"
+
+static const char core_proto_cookie[] = "padstack prototypes";
+
+
+void pcb_pstk_proto_free_fields(pcb_pstk_proto_t *dst)
+{
+#warning TODO: do a full field free here
+}
+
+void pcb_pstk_shape_alloc_poly(pcb_pstk_poly_t *poly, int len)
+{
+	poly->x = malloc(sizeof(poly->x[0]) * len * 2);
+	poly->y = poly->x + len;
+	poly->len = len;
+	poly->pa = NULL;
+}
+
+void pcb_pstk_shape_free_poly(pcb_pstk_poly_t *poly)
+{
+	if (poly->pa != NULL)
+		pcb_polyarea_free(&poly->pa);
+	free(poly->x);
+	poly->len = 0;
+}
+
+void pcb_pstk_shape_copy_poly(pcb_pstk_poly_t *dst, const pcb_pstk_poly_t *src)
+{
+	memcpy(dst->x, src->x, sizeof(src->x[0]) * src->len * 2);
+	pcb_pstk_shape_update_pa(dst);
+}
+
+int pcb_pstk_get_shape_idx(pcb_pstk_tshape_t *ts, pcb_layer_type_t lyt, pcb_layer_combining_t comb)
+{
+	int n;
+	for(n = 0; n < ts->len; n++)
+		if ((lyt == ts->shape[n].layer_mask) && (comb == ts->shape[n].comb))
+			return n;
+	return -1;
+}
+
+static void append_circle(pcb_pstk_tshape_t *ts, pcb_layer_type_t lyt, pcb_layer_combining_t comb, pcb_coord_t dia)
+{
+	int idx = ts->len;
+
+	ts->len++;
+	ts->shape = realloc(ts->shape, ts->len * sizeof(pcb_pstk_shape_t));
+
+	ts->shape[idx].shape = PCB_PSSH_CIRC;
+	ts->shape[idx].data.circ.x = ts->shape[idx].data.circ.y = 0;
+	ts->shape[idx].data.circ.dia = dia;
+	ts->shape[idx].layer_mask = lyt;
+	ts->shape[idx].comb = comb;
+}
+
+static void append_tshape(pcb_pstk_tshape_t *ts, pcb_pstk_tshape_t *src, int srci)
+{
+	int idx = ts->len;
+
+	ts->len++;
+	ts->shape = realloc(ts->shape, ts->len * sizeof(pcb_pstk_shape_t));
+	memcpy(&ts->shape[idx], &src->shape[srci], sizeof(ts->shape[idx]));
+	switch(src->shape[srci].shape) {
+		case PCB_PSSH_LINE:
+		case PCB_PSSH_CIRC:
+			break; /* do nothing, all fields are copied already by the memcpy */
+		case PCB_PSSH_POLY:
+			pcb_pstk_shape_alloc_poly(&ts->shape[idx].data.poly, src->shape[srci].data.poly.len);
+			pcb_pstk_shape_copy_poly(&ts->shape[idx].data.poly, &src->shape[srci].data.poly);
+			break;
+	}
+}
+
+int pcb_pstk_proto_conv(pcb_data_t *data, pcb_pstk_proto_t *dst, int quiet, vtp0_t *objs, pcb_coord_t ox, pcb_coord_t oy)
+{
+	int ret = -1, n, m, i, extra_obj = 0;
+	pcb_any_obj_t **o;
+	pcb_pstk_tshape_t *ts, *ts_src;
+	pcb_pstk_t *pstk = NULL;
+	pcb_pstk_proto_t *prt;
+
+	dst->in_use = 1;
+	dst->name = NULL;
+	pcb_vtpadstack_tshape_init(&dst->tr);
+	dst->hdia = 0;
+	dst->htop = dst->hbottom = 0;
+
+	/* allocate shapes on the canonical tshape (tr[0]) */
+	ts = pcb_vtpadstack_tshape_alloc_append(&dst->tr, 1);
+	ts->rot = 0.0;
+	ts->xmirror = 0;
+	ts->smirror = 0;
+	ts->len = 0;
+	for(n = 0, o = (pcb_any_obj_t **)objs->array; n < vtp0_len(objs); n++,o++) {
+		switch((*o)->type) {
+			case PCB_OBJ_LINE:
+			case PCB_OBJ_POLY:
+				ts->len++;
+				break;
+			case PCB_OBJ_PSTK:
+				if (pstk != NULL) {
+					if (!quiet)
+						pcb_message(PCB_MSG_ERROR, "Padstack conversion: multiple vias/padstacks\n");
+					goto quit;
+				}
+				pstk = *(pcb_pstk_t **)o;
+				prt = pcb_pstk_get_proto(pstk);
+				if (prt == NULL) {
+					if (!quiet)
+						pcb_message(PCB_MSG_ERROR, "Padstack conversion: invalid input padstacks proto\n");
+					goto quit;
+				}
+				dst->hdia = prt->hdia;
+				dst->hplated = prt->hplated;
+				if ((ox != pstk->x) || (oy != pstk->y)) {
+					pcb_message(PCB_MSG_INFO, "Padstack conversion: adjusting origin to padstack hole\n");
+					ox = pstk->x;
+					oy = pstk->y;
+				}
+				extra_obj++;
+				break;
+			default:;
+				if (!quiet)
+					pcb_message(PCB_MSG_ERROR, "Padstack conversion: invalid object type (%x) selected; must be via, padstack, line or polygon\n", (*o)->type);
+				goto quit;
+		}
+	}
+
+	if ((vtp0_len(objs) - extra_obj) > data->LayerN) {
+		if (!quiet)
+			pcb_message(PCB_MSG_ERROR, "Padstack conversion: too many objects selected\n");
+		goto quit;
+	}
+
+	if ((ts->len == 0) && (pstk == NULL)) {
+		if (!quiet)
+			pcb_message(PCB_MSG_ERROR, "Padstack conversion: there are no shapes and there is no via/padstack participating in the conversion; can not create empty padstack\n");
+		goto quit;
+	}
+
+	ts->shape = malloc(ts->len * sizeof(pcb_pstk_shape_t));
+
+	/* convert local (line/poly) objects */
+	for(i = 0, n = -1, o = (pcb_any_obj_t **)objs->array; i < vtp0_len(objs); o++,i++) {
+		pcb_layer_t *ly;
+		switch((*o)->type) {
+			case PCB_OBJ_LINE:
+				{
+					pcb_line_t *line = (*(pcb_line_t **)o);
+
+					n++;
+					if ((line->Point1.X != line->Point2.X) || (line->Point1.Y != line->Point2.Y)) {
+						ts->shape[n].shape = PCB_PSSH_LINE;
+						ts->shape[n].data.line.x1 = line->Point1.X - ox;
+						ts->shape[n].data.line.y1 = line->Point1.Y - oy;
+						ts->shape[n].data.line.x2 = line->Point2.X - ox;
+						ts->shape[n].data.line.y2 = line->Point2.Y - oy;
+						ts->shape[n].data.line.thickness = line->Thickness;
+						ts->shape[n].data.line.square = 0;
+					}
+					else { /* a zero-long line is really a circle - padstacks have a specific shape for that */
+						ts->shape[n].shape = PCB_PSSH_CIRC;
+						ts->shape[n].data.circ.x = line->Point1.X - ox;
+						ts->shape[n].data.circ.y = line->Point1.Y - oy;
+						ts->shape[n].data.circ.dia = line->Thickness;
+					}
+					ts->shape[n].clearance = line->Clearance;
+				}
+				break;
+			case PCB_OBJ_POLY:
+				{
+					pcb_cardinal_t p, len, maxlen = (1L << ((sizeof(int)*8)-1));
+					pcb_poly_t *poly = *(pcb_poly_t **)o;
+
+					len = poly->PointN;
+					n++;
+					if (poly->HoleIndexN != 0) {
+						if (!quiet)
+							pcb_message(PCB_MSG_ERROR, "Padstack conversion: can not convert polygon with holes\n");
+						goto quit;
+					}
+					if (len >= maxlen) {
+						if (!quiet)
+							pcb_message(PCB_MSG_ERROR, "Padstack conversion: polygon has too many points (%ld >= %ld)\n", (long)len, (long)maxlen);
+						goto quit;
+					}
+					pcb_pstk_shape_alloc_poly(&ts->shape[n].data.poly, len);
+					for(p = 0; p < len; p++) {
+						ts->shape[n].data.poly.x[p] = poly->Points[p].X - ox;
+						ts->shape[n].data.poly.y[p] = poly->Points[p].Y - oy;
+					}
+					pcb_pstk_shape_update_pa(&ts->shape[n].data.poly);
+					ts->shape[n].shape = PCB_PSSH_POLY;
+					ts->shape[n].clearance = (*(pcb_poly_t **)o)->Clearance;
+				}
+				break;
+			default: continue;
+		}
+		assert((*o)->parent_type == PCB_PARENT_LAYER);
+		ly = (*o)->parent.layer;
+		ts->shape[n].layer_mask = pcb_layer_flags_(ly);
+		ts->shape[n].comb = ly->comb;
+		if (ts->shape[n].layer_mask & (PCB_LYT_PASTE | PCB_LYT_MASK))
+			ts->shape[n].comb |= PCB_LYC_AUTO;
+
+		for(m = 0; m < n; m++) {
+			if ((ts->shape[n].layer_mask == ts->shape[m].layer_mask) && (ts->shape[n].comb == ts->shape[m].comb)) {
+				if (!quiet)
+					pcb_message(PCB_MSG_ERROR, "Padstack conversion: multiple objects on the same layer\n");
+				goto quit;
+			}
+		}
+		if ((ts->shape[n].layer_mask & PCB_LYT_COPPER) && (ts->shape[n].layer_mask & PCB_LYT_INTERN) && (pstk == NULL)) {
+			if (!quiet)
+				pcb_message(PCB_MSG_ERROR, "Padstack conversion: can not have internal copper shape if there is no hole\n");
+			goto quit;
+		}
+	}
+
+	/* if there was a padstack, use the padstack's shape on layers that are not specified */
+	if (pstk != NULL) {
+		int srci;
+		ts_src = pcb_pstk_get_tshape(pstk);
+		if (ts_src != NULL) {
+#			define MAYBE_COPY(mask, comb) \
+				if ((pcb_pstk_get_shape_idx(ts, mask, comb) == -1) && ((srci = pcb_pstk_get_shape_idx(ts_src, mask, comb)) != -1)) \
+					append_tshape(ts, ts_src, srci);
+			MAYBE_COPY(PCB_LYT_COPPER | PCB_LYT_TOP, 0);
+			MAYBE_COPY(PCB_LYT_COPPER | PCB_LYT_INTERN, 0);
+			MAYBE_COPY(PCB_LYT_COPPER | PCB_LYT_BOTTOM, 0);
+			MAYBE_COPY(PCB_LYT_MASK | PCB_LYT_BOTTOM, PCB_LYC_SUB | PCB_LYC_AUTO);
+			MAYBE_COPY(PCB_LYT_MASK | PCB_LYT_TOP, PCB_LYC_SUB | PCB_LYC_AUTO);
+			MAYBE_COPY(PCB_LYT_PASTE | PCB_LYT_BOTTOM, PCB_LYC_AUTO);
+			MAYBE_COPY(PCB_LYT_PASTE | PCB_LYT_TOP, PCB_LYC_AUTO);
+#			undef MAYBE_COPY
+		}
+	}
+
+	/* all went fine */
+	dst->hash = pcb_pstk_proto_hash(dst);
+	ret = 0;
+
+	quit:;
+	if (ret != 0)
+		pcb_pstk_proto_free_fields(dst);
+	return ret;
+}
+
+int pcb_pstk_proto_breakup(pcb_data_t *dst, pcb_pstk_t *src, pcb_bool remove_src)
+{
+	pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(src);
+	int n, i;
+	pcb_layer_type_t lyt, filt = (PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE);
+	pcb_any_obj_t *no;
+
+	if (ts == NULL)
+		return -1;
+
+	for(n = 0; n < ts->len; n++) {
+		pcb_pstk_shape_t *shp = &ts->shape[n];
+		pcb_layer_id_t lid;
+		pcb_layer_t *ly, *ly1 = NULL, *ly2 = NULL, *ly3 = NULL;
+		pcb_coord_t clr;
+		pcb_poly_t *p;
+
+		for(lid = 0; lid < dst->LayerN; lid++) {
+			ly = &dst->Layer[lid];
+			lyt = pcb_layer_flags_(ly);
+			if ((lyt & shp->layer_mask) == shp->layer_mask) {
+				if (shp->comb == ly->comb) {
+					ly1 = ly;
+					break;
+				}
+				else
+					ly2 = ly;
+			}
+			else if ((lyt & shp->layer_mask & filt) == (shp->layer_mask & filt))
+				ly3 = ly;
+		}
+
+		ly = ly1;
+		if (ly == NULL) ly = ly2;
+		if (ly == NULL) ly = ly3;
+		if (ly == NULL) {
+			const char *locs, *mats;
+			locs = pcb_layer_type_bit2str(lyt & PCB_LYT_ANYWHERE);
+			mats = pcb_layer_type_bit2str(lyt & PCB_LYT_ANYTHING);
+			if (locs == NULL) locs = "<unknown loc>";
+			if (mats == NULL) mats = "<unknown material>";
+			pcb_message(PCB_MSG_WARNING, "Can not create shape on %s %s\n", locs, mats);
+			continue;
+		}
+
+		clr = src->Clearance == 0 ? shp->clearance : src->Clearance;
+		switch(shp->shape) {
+			case PCB_PSSH_CIRC:
+				no = (pcb_any_obj_t *)pcb_line_new(ly,
+					src->x + shp->data.circ.x, src->y + shp->data.circ.y,
+					src->x + shp->data.circ.x, src->y + shp->data.circ.y,
+					shp->data.circ.dia, clr, pcb_flag_make(PCB_FLAG_CLEARLINE));
+					break;
+			case PCB_PSSH_LINE:
+				no = (pcb_any_obj_t *)pcb_line_new(ly,
+					src->x + shp->data.line.x1, src->y + shp->data.line.y1,
+					src->x + shp->data.line.x2, src->y + shp->data.line.y2,
+					shp->data.circ.dia, clr, pcb_flag_make(PCB_FLAG_CLEARLINE));
+					break;
+			case PCB_PSSH_POLY:
+				p = pcb_poly_new(ly, clr, pcb_flag_make(PCB_FLAG_CLEARPOLYPOLY));
+				for(i = 0; i < shp->data.poly.len; i++)
+					pcb_poly_point_new(p, src->x + shp->data.poly.x[i], src->y + shp->data.poly.y[i]);
+				pcb_add_poly_on_layer(ly, p);
+				no = (pcb_any_obj_t *)p;
+				break;
+			default:
+				assert(!"invalid shape");
+				continue;
+		}
+		if (src->term != NULL)
+			pcb_attribute_put(&no->Attributes, "term", src->term);
+	}
+
+	if (remove_src) {
+		if (src->parent.data->padstack_tree != NULL)
+			pcb_r_delete_entry(src->parent.data->padstack_tree, (pcb_box_t *)src);
+		pcb_pstk_free(src);
+	}
+
+	return -1;
+}
+
+int pcb_pstk_proto_conv_selection(pcb_board_t *pcb, pcb_pstk_proto_t *dst, int quiet, pcb_coord_t ox, pcb_coord_t oy)
+{
+	int ret;
+	vtp0_t objs;
+
+	vtp0_init(&objs);
+	pcb_data_list_by_flag(pcb->Data, &objs, PCB_OBJ_CLASS_REAL, PCB_FLAG_SELECTED);
+	ret = pcb_pstk_proto_conv(pcb->Data, dst, quiet, &objs, ox, oy);
+	vtp0_uninit(&objs);
+
+	return ret;
+}
+
+
+int pcb_pstk_proto_conv_buffer(pcb_pstk_proto_t *dst, int quiet)
+{
+	int ret;
+	vtp0_t objs;
+	pcb_coord_t ox, oy;
+	pcb_box_t bb;
+
+	pcb_data_bbox(&bb, PCB_PASTEBUFFER->Data, 0);
+
+	ox = (bb.X1 + bb.X2) / 2;
+	oy = (bb.Y1 + bb.Y2) / 2;
+
+	vtp0_init(&objs);
+	pcb_data_list_by_flag(PCB_PASTEBUFFER->Data, &objs, PCB_OBJ_CLASS_REAL, 0);
+	ret = pcb_pstk_proto_conv(PCB_PASTEBUFFER->Data, dst, quiet, &objs, ox, oy);
+	vtp0_uninit(&objs);
+
+	return ret;
+}
+
+void pcb_pstk_shape_copy(pcb_pstk_shape_t *dst, pcb_pstk_shape_t *src)
+{
+	memcpy(dst, src, sizeof(pcb_pstk_shape_t));
+	switch(src->shape) {
+		case PCB_PSSH_LINE:
+		case PCB_PSSH_CIRC:
+			break; /* do nothing, all fields are copied already by the memcpy */
+		case PCB_PSSH_POLY:
+			pcb_pstk_shape_alloc_poly(&dst->data.poly, src->data.poly.len);
+			pcb_pstk_shape_copy_poly(&dst->data.poly, &src->data.poly);
+			break;
+	}
+}
+
+void pcb_pstk_shape_free(pcb_pstk_shape_t *s)
+{
+	switch(s->shape) {
+		case PCB_PSSH_LINE:
+		case PCB_PSSH_CIRC:
+			break; /* no allocation */
+		case PCB_PSSH_POLY:
+			pcb_pstk_shape_free_poly(&s->data.poly);
+			break;
+	}
+}
+
+void pcb_pstk_tshape_copy(pcb_pstk_tshape_t *ts_dst, pcb_pstk_tshape_t *ts_src)
+{
+	int n;
+
+	ts_dst->rot = ts_src->rot;
+	ts_dst->xmirror = ts_src->xmirror;
+	ts_dst->smirror = ts_src->smirror;
+	ts_dst->shape = malloc(sizeof(pcb_pstk_shape_t) * ts_src->len);
+	ts_dst->len = ts_src->len;
+	memcpy(ts_dst->shape, ts_src->shape, sizeof(pcb_pstk_shape_t) * ts_src->len);
+	for(n = 0; n < ts_src->len; n++) {
+		switch(ts_src->shape[n].shape) {
+			case PCB_PSSH_LINE:
+			case PCB_PSSH_CIRC:
+				break; /* do nothing, all fields are copied already by the memcpy */
+			case PCB_PSSH_POLY:
+				pcb_pstk_shape_alloc_poly(&ts_dst->shape[n].data.poly, ts_src->shape[n].data.poly.len);
+				pcb_pstk_shape_copy_poly(&ts_dst->shape[n].data.poly, &ts_src->shape[n].data.poly);
+				break;
+		}
+	}
+}
+
+void pcb_pstk_shape_rot(pcb_pstk_shape_t *sh, double sina, double cosa, double angle)
+{
+	int i;
+
+	switch(sh->shape) {
+		case PCB_PSSH_LINE:
+			pcb_rotate(&sh->data.line.x1, &sh->data.line.y1, 0, 0, cosa, sina);
+			pcb_rotate(&sh->data.line.x2, &sh->data.line.y2, 0, 0, cosa, sina);
+			break;
+		case PCB_PSSH_CIRC:
+			pcb_rotate(&sh->data.circ.x, &sh->data.circ.y, 0, 0, cosa, sina);
+			break;
+		case PCB_PSSH_POLY:
+			if (sh->data.poly.pa != NULL)
+				pcb_polyarea_free(&sh->data.poly.pa);
+			for(i = 0; i < sh->data.poly.len; i++)
+				pcb_rotate(&sh->data.poly.x[i], &sh->data.poly.y[i], 0, 0, cosa, sina);
+			pcb_pstk_shape_update_pa(&sh->data.poly);
+			break;
+	}
+}
+
+
+void pcb_pstk_tshape_rot(pcb_pstk_tshape_t *ts, double angle)
+{
+	int n;
+	double cosa = cos(angle / PCB_RAD_TO_DEG), sina = sin(angle / PCB_RAD_TO_DEG);
+
+	for(n = 0; n < ts->len; n++)
+		pcb_pstk_shape_rot(&ts->shape[n], sina, cosa, angle);
+}
+
+void pcb_pstk_tshape_xmirror(pcb_pstk_tshape_t *ts)
+{
+	int n, i;
+
+	for(n = 0; n < ts->len; n++) {
+		pcb_pstk_shape_t *sh = &ts->shape[n];
+		switch(sh->shape) {
+			case PCB_PSSH_LINE:
+				sh->data.line.y1 = -sh->data.line.y1;
+				sh->data.line.y2 = -sh->data.line.y2;
+				break;
+			case PCB_PSSH_CIRC:
+				sh->data.circ.y = -sh->data.circ.y;
+				break;
+			case PCB_PSSH_POLY:
+				if (sh->data.poly.pa != NULL)
+					pcb_polyarea_free(&sh->data.poly.pa);
+				for(i = 0; i < sh->data.poly.len; i++)
+					sh->data.poly.y[i] = -sh->data.poly.y[i];
+				pcb_pstk_shape_update_pa(&sh->data.poly);
+				break;
+		}
+	}
+}
+
+void pcb_pstk_tshape_smirror(pcb_pstk_tshape_t *ts)
+{
+	int n;
+
+	for(n = 0; n < ts->len; n++) {
+		pcb_pstk_shape_t *sh = &ts->shape[n];
+		if (sh->layer_mask & PCB_LYT_TOP) {
+			sh->layer_mask &= ~PCB_LYT_TOP;
+			sh->layer_mask |= PCB_LYT_BOTTOM;
+		}
+		else if (sh->layer_mask & PCB_LYT_BOTTOM) {
+			sh->layer_mask &= ~PCB_LYT_BOTTOM;
+			sh->layer_mask |= PCB_LYT_TOP;
+		}
+	}
+}
+
+void pcb_pstk_proto_copy(pcb_pstk_proto_t *dst, const pcb_pstk_proto_t *src)
+{
+	pcb_pstk_tshape_t *ts_dst, *ts_src;
+
+	memcpy(dst, src, sizeof(pcb_pstk_proto_t));
+	pcb_vtpadstack_tshape_init(&dst->tr);
+
+	if (src->tr.used > 0) {
+		ts_src = &src->tr.array[0];
+
+		/* allocate shapes on the canonical tshape (tr[0]) */
+		ts_dst = pcb_vtpadstack_tshape_alloc_append(&dst->tr, 1);
+		pcb_pstk_tshape_copy(ts_dst, ts_src);
+
+		/* make sure it's the canonical form */
+		ts_dst->rot = 0.0;
+		ts_dst->xmirror = 0;
+		ts_dst->smirror = 0;
+	}
+
+	dst->in_use = 1;
+}
+
+
+/* Matches proto against all protos in data's cache; returns
+   PCB_PADSTACK_INVALID (and loads first_free_out) if not found */
+static pcb_cardinal_t pcb_pstk_proto_insert_try(pcb_data_t *data, const pcb_pstk_proto_t *proto, pcb_cardinal_t *first_free_out)
+{
+	pcb_cardinal_t n, first_free = PCB_PADSTACK_INVALID;
+
+	/* look for the first existing padstack that matches */
+	for(n = 0; n < pcb_vtpadstack_proto_len(&data->ps_protos); n++) {
+		if (!(data->ps_protos.array[n].in_use)) {
+			if (first_free == PCB_PADSTACK_INVALID)
+				first_free = n;
+		}
+		else if (data->ps_protos.array[n].hash == proto->hash) {
+			if (pcb_pstk_proto_eq(&data->ps_protos.array[n], proto))
+				return n;
+		}
+	}
+	*first_free_out = first_free;
+	return PCB_PADSTACK_INVALID;
+}
+
+pcb_cardinal_t pcb_pstk_proto_insert_or_free(pcb_data_t *data, pcb_pstk_proto_t *proto, int quiet)
+{
+	pcb_cardinal_t n, first_free;
+
+	n = pcb_pstk_proto_insert_try(data, proto, &first_free);
+	if (n != PCB_PADSTACK_INVALID) {
+		pcb_pstk_proto_free_fields(proto);
+		return n; /* already in cache */
+	}
+
+	/* no match, have to register a new one */
+	if (first_free == PCB_PADSTACK_INVALID) {
+		pcb_pstk_proto_t *np;
+		n = pcb_vtpadstack_proto_len(&data->ps_protos);
+		pcb_vtpadstack_proto_append(&data->ps_protos, *proto);
+		np = pcb_vtpadstack_proto_get(&data->ps_protos, n, 0);
+		np->parent = data;
+	}
+	else {
+		memcpy(data->ps_protos.array+first_free, proto, sizeof(pcb_pstk_proto_t));
+		data->ps_protos.array[first_free].in_use = 1;
+		data->ps_protos.array[first_free].parent = data;
+	}
+	memset(proto, 0, sizeof(pcb_pstk_proto_t)); /* make sure a subsequent free() won't do any harm */
+	return n;
+}
+
+pcb_cardinal_t pcb_pstk_proto_insert_dup(pcb_data_t *data, const pcb_pstk_proto_t *proto, int quiet)
+{
+	pcb_cardinal_t n, first_free;
+
+	n = pcb_pstk_proto_insert_try(data, proto, &first_free);
+	if (n != PCB_PADSTACK_INVALID)
+		return n; /* already in cache */
+
+	/* no match, have to register a new one, which is a dup of the original */
+	if (first_free == PCB_PADSTACK_INVALID) {
+		pcb_pstk_proto_t *nproto;
+		n = pcb_vtpadstack_proto_len(&data->ps_protos);
+		nproto = pcb_vtpadstack_proto_alloc_append(&data->ps_protos, 1);
+		pcb_pstk_proto_copy(nproto, proto);
+		nproto->parent = data;
+	}
+	else {
+		pcb_pstk_proto_copy(data->ps_protos.array+first_free, proto);
+		data->ps_protos.array[first_free].in_use = 1;
+		data->ps_protos.array[first_free].parent = data;
+	}
+	return n;
+}
+
+pcb_cardinal_t pcb_pstk_conv_selection(pcb_board_t *pcb, int quiet, pcb_coord_t ox, pcb_coord_t oy)
+{
+	pcb_pstk_proto_t proto;
+
+	if (pcb_pstk_proto_conv_selection(pcb, &proto, quiet, ox, oy) != 0)
+		return -1;
+
+	return pcb_pstk_proto_insert_or_free(pcb->Data, &proto, quiet);
+}
+
+pcb_cardinal_t pcb_pstk_conv_buffer(int quiet)
+{
+	pcb_pstk_proto_t proto;
+
+	if (pcb_pstk_proto_conv_buffer(&proto, quiet) != 0)
+		return -1;
+
+	return pcb_pstk_proto_insert_or_free(PCB_PASTEBUFFER->Data, &proto, quiet);
+}
+
+
+void pcb_pstk_shape_update_pa(pcb_pstk_poly_t *poly)
+{
+	int n;
+	pcb_vector_t v;
+	pcb_pline_t *pl;
+
+	v[0] = poly->x[0]; v[1] = poly->y[0];
+	pl = pcb_poly_contour_new(v);
+	for(n = 1; n < poly->len; n++) {
+		v[0] = poly->x[n]; v[1] = poly->y[n];
+		pcb_poly_vertex_include(pl->head.prev, pcb_poly_node_create(v));
+	}
+	pcb_poly_contour_pre(pl, 1);
+
+	poly->pa = pcb_polyarea_create();
+	pcb_polyarea_contour_include(poly->pa, pl);
+
+	if (!pcb_poly_valid(poly->pa)) {
+		poly->pa->contours = NULL; /* keep pl safe from pcb_polyarea_free() */
+		pcb_polyarea_free(&poly->pa);
+		
+		poly->pa = pcb_polyarea_create();
+		pcb_poly_contour_inv(pl);
+		pcb_polyarea_contour_include(poly->pa, pl);
+	}
+
+}
+
+/*** Undoable hole change ***/
+
+typedef struct {
+	long int parent_ID; /* -1 for pcb, positive for a subc */
+	pcb_cardinal_t proto;
+
+	int hplated;
+	pcb_coord_t hdia;
+	int htop, hbottom;
+} padstack_proto_change_hole_t;
+
+#define swap(a,b,type) \
+	do { \
+		type tmp = a; \
+		a = b; \
+		b = tmp; \
+	} while(0)
+
+static int undo_change_hole_swap(void *udata)
+{
+	padstack_proto_change_hole_t *u = udata;
+	pcb_data_t *data;
+	pcb_pstk_proto_t *proto;
+
+	if (u->parent_ID != -1) {
+		pcb_subc_t *subc = pcb_subc_by_id(PCB->Data, u->parent_ID);
+		if (subc == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Can't undo padstack prototype hole change: parent subc #%ld is not found\n", u->parent_ID);
+			return -1;
+		}
+		data = subc->data;
+	}
+	else
+		data = PCB->Data;
+
+	proto = pcb_pstk_get_proto_(data, u->proto);
+	if (proto == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't undo padstack prototype hole change: proto ID #%ld is not available\n", u->parent_ID);
+		return -1;
+	}
+
+	swap(proto->hplated, u->hplated, int);
+	swap(proto->hdia,    u->hdia,    pcb_coord_t);
+	swap(proto->htop,    u->htop,    int);
+	swap(proto->hbottom, u->hbottom, int);
+	return 0;
+}
+
+static void undo_change_hole_print(void *udata, char *dst, size_t dst_len)
+{
+	padstack_proto_change_hole_t *u = udata;
+	pcb_snprintf(dst, dst_len, "padstack proto hole change: plated=%d dia=%$mm top=%d bottom=%d\n", u->hplated, u->hdia, u->htop, u->hbottom);
+}
+
+static const uundo_oper_t undo_pstk_proto_change_hole = {
+	core_proto_cookie,
+	NULL, /* free */
+	undo_change_hole_swap,
+	undo_change_hole_swap,
+	undo_change_hole_print
+};
+
+int pcb_pstk_proto_change_hole(pcb_pstk_proto_t *proto, const int *hplated, const pcb_coord_t *hdia, const int *htop, const int *hbottom)
+{
+	padstack_proto_change_hole_t *u;
+	long int parent_ID;
+
+	switch(proto->parent->parent_type) {
+		case PCB_PARENT_BOARD: parent_ID = -1; break;
+		case PCB_PARENT_SUBC: parent_ID = proto->parent->parent.subc->ID; break;
+		default: return -1;
+	}
+
+	u = pcb_undo_alloc(PCB, &undo_pstk_proto_change_hole, sizeof(padstack_proto_change_hole_t));
+	u->parent_ID = parent_ID;
+	u->proto = pcb_pstk_get_proto_id(proto);
+	u->hplated = hplated ? *hplated : proto->hplated;
+	u->hdia = hdia ? *hdia : proto->hdia;
+	u->htop = htop ? *htop : proto->htop;
+	u->hbottom = hbottom ? *hbottom : proto->hbottom;
+	undo_change_hole_swap(u);
+
+	pcb_undo_inc_serial();
+	return 0;
+}
+
+int pcb_pstk_proto_change_name(pcb_pstk_proto_t *proto, const char *new_name)
+{
+#warning undo TODO: make this undoable (check how pcb_pstk_proto_change_hole() does it)
+	free(proto->name);
+	if ((new_name == NULL) || (*new_name == '\0'))
+		proto->name = NULL;
+	else
+		proto->name = pcb_strdup(new_name);
+	return 0;
+}
+
+#define TSHAPE_ANGLE_TOL 0.01
+#define tshape_angle_eq(a1, a2) (((a1 - a2) >= -TSHAPE_ANGLE_TOL) && ((a1 - a2) <= TSHAPE_ANGLE_TOL))
+
+pcb_pstk_tshape_t *pcb_pstk_make_tshape(pcb_data_t *data, pcb_pstk_proto_t *proto, double rot, int xmirror, int smirror, int *out_protoi)
+{
+	size_t n;
+	pcb_pstk_tshape_t *ts;
+
+	xmirror = !!xmirror;
+	smirror = !!smirror;
+
+	/* cheap case: canonical */
+	if (tshape_angle_eq(rot, 0.0) && (xmirror == 0) && (smirror == 0)) {
+		if (out_protoi != NULL) *out_protoi = 0;
+		return &proto->tr.array[0];
+	}
+
+	/* search for an existing version in the cache - we expect only a few
+	   transformations per padstack, the result is cached -> linear search. */
+	for(n = 0; n < proto->tr.used; n++) {
+		if (tshape_angle_eq(proto->tr.array[n].rot, rot) && (proto->tr.array[n].xmirror == xmirror) && (proto->tr.array[n].smirror == smirror)) {
+			if (out_protoi != NULL) *out_protoi = n;
+			return &proto->tr.array[n];
+		}
+	}
+
+	/* allocate and render the transformed version for the cache */
+	if (out_protoi != NULL) *out_protoi = proto->tr.used;
+	ts = pcb_vtpadstack_tshape_alloc_append(&proto->tr, 1);
+
+	/* first make a vanilla copy */
+	pcb_pstk_tshape_copy(ts, &proto->tr.array[0]);
+
+	if (!tshape_angle_eq(rot, 0.0))
+		pcb_pstk_tshape_rot(ts, rot);
+
+	if (xmirror)
+		pcb_pstk_tshape_xmirror(ts);
+
+	if (smirror)
+		pcb_pstk_tshape_smirror(ts);
+
+	ts->rot = rot;
+	ts->xmirror = xmirror;
+	ts->smirror = smirror;
+	return ts;
+}
+
+static void pcb_pstk_poly_center(const pcb_pstk_poly_t *poly, pcb_coord_t *cx, pcb_coord_t *cy)
+{
+	double x = 0.0, y = 0.0;
+	int n;
+
+	for(n = 0; n < poly->len; n++) {
+		x += (double)poly->x[n];
+		y += (double)poly->y[n];
+	}
+	x /= (double)poly->len;
+	y /= (double)poly->len;
+	*cx = pcb_round(x);
+	*cy = pcb_round(y);
+}
+
+void pcb_pstk_shape_grow(pcb_pstk_shape_t *shp, pcb_bool is_absolute, pcb_coord_t val)
+{
+	pcb_coord_t cx, cy;
+	int n;
+
+#warning padstack TODO: undo
+
+	switch(shp->shape) {
+		case PCB_PSSH_LINE:
+			if (is_absolute)
+				shp->data.line.thickness = val;
+			else
+				shp->data.line.thickness += val;
+			if (shp->data.line.thickness < 1)
+				shp->data.line.thickness = 1;
+			break;
+		case PCB_PSSH_CIRC:
+			if (is_absolute)
+				shp->data.circ.dia = val;
+			else
+				shp->data.circ.dia += val;
+			if (shp->data.circ.dia < 1)
+				shp->data.circ.dia = 1;
+			break;
+		case PCB_PSSH_POLY:
+			pcb_pstk_poly_center(&shp->data.poly, &cx, &cy);
+			pcb_polyarea_free(&shp->data.poly.pa);
+			if (is_absolute) {
+#warning TODO
+			}
+			else {
+				/* relative: move each point radially */
+				for(n = 0; n < shp->data.poly.len; n++) {
+					double dx = shp->data.poly.x[n] - cx, dy = shp->data.poly.y[n] - cy;
+					double dist = sqrt(dx*dx + dy*dy);
+					double vx = dx / dist, vy = dy / dist;
+					dist += val;
+					if (dist <= PCB_MM_TO_COORD(0.01))
+						dist = PCB_MM_TO_COORD(0.01);
+					shp->data.poly.x[n] = cx + vx * dist;
+					shp->data.poly.y[n] = cy + vy * dist;
+				}
+			}
+			pcb_pstk_shape_update_pa(&shp->data.poly);
+			break;
+	}
+}
+
+void pcb_pstk_shape_clr_grow(pcb_pstk_shape_t *shp, pcb_bool is_absolute, pcb_coord_t val)
+{
+#warning padstack TODO: undo
+	if (is_absolute)
+		shp->clearance = val;
+	else
+		shp->clearance += val;
+}
+
+void pcb_pstk_proto_grow(pcb_pstk_proto_t *proto, pcb_bool is_absolute, pcb_coord_t val)
+{
+	int n, i;
+
+	/* do the same growth on all shapes of all transformed variants */
+	for(n = 0; n < proto->tr.used; n++)
+		for(i = 0; i < proto->tr.array[n].len; i++)
+			pcb_pstk_shape_grow(&proto->tr.array[n].shape[i], is_absolute, val);
+}
+
+void pcb_pstk_shape_derive(pcb_pstk_proto_t *proto, int dst_idx, int src_idx, pcb_coord_t bloat, pcb_layer_type_t mask, pcb_layer_combining_t comb)
+{
+	int n;
+
+	/* do the same copy on all shapes of all transformed variants */
+	for(n = 0; n < proto->tr.used; n++) {
+		int d = dst_idx;
+		if (d < 0) {
+			d = proto->tr.array[n].len;
+			proto->tr.array[n].len++;
+			proto->tr.array[n].shape = realloc(proto->tr.array[n].shape, proto->tr.array[n].len * sizeof(proto->tr.array[n].shape[0]));
+			
+		}
+		else
+			pcb_pstk_shape_free(&proto->tr.array[n].shape[d]);
+		pcb_pstk_shape_copy(&proto->tr.array[n].shape[d], &proto->tr.array[n].shape[src_idx]);
+		proto->tr.array[n].shape[d].layer_mask = mask;
+		proto->tr.array[n].shape[d].comb = comb;
+		if (bloat != 0)
+			pcb_pstk_shape_grow(&proto->tr.array[n].shape[d], pcb_false, bloat);
+	}
+}
+
+
+static void pcb_pstk_tshape_del_idx(pcb_pstk_tshape_t *shp, int idx)
+{
+	int n;
+	for(n = idx; n < shp->len-1; n++)
+		shp->shape[n] = shp->shape[n+1];
+	shp->len--;
+}
+
+void pcb_pstk_proto_del_shape_idx(pcb_pstk_proto_t *proto, int idx)
+{
+	int n;
+
+	if ((proto->tr.used == 0) || (idx < 0) || (idx >= proto->tr.array[0].len))
+		return;
+
+	/* delete the shape from all transformed variants */
+	for(n = 0; n < proto->tr.used; n++)
+		pcb_pstk_tshape_del_idx(&proto->tr.array[n], idx);
+}
+
+void pcb_pstk_proto_del_shape(pcb_pstk_proto_t *proto, pcb_layer_type_t lyt, pcb_layer_combining_t comb)
+{
+	int idx;
+
+	if (proto->tr.used == 0)
+		return;
+
+	/* search the 0th transformed, all other tshapes are the same */
+	idx = pcb_pstk_get_shape_idx(&proto->tr.array[0], lyt, comb);
+	pcb_pstk_proto_del_shape_idx(proto, idx);
+}
+
+
+/*** hash ***/
+static unsigned int pcb_pstk_shape_hash(const pcb_pstk_shape_t *sh)
+{
+	unsigned int n, ret = murmurhash32(sh->layer_mask) ^ murmurhash32(sh->comb) ^ pcb_hash_coord(sh->clearance);
+
+	switch(sh->shape) {
+		case PCB_PSSH_POLY:
+			for(n = 0; n < sh->data.poly.len; n++)
+				ret ^= pcb_hash_coord(sh->data.poly.x[n]) ^ pcb_hash_coord(sh->data.poly.y[n]);
+			break;
+		case PCB_PSSH_LINE:
+			ret ^= pcb_hash_coord(sh->data.line.x1) ^ pcb_hash_coord(sh->data.line.x2) ^ pcb_hash_coord(sh->data.line.y1) ^ pcb_hash_coord(sh->data.line.y2);
+			ret ^= pcb_hash_coord(sh->data.line.thickness);
+			ret ^= sh->data.line.square;
+			break;
+		case PCB_PSSH_CIRC:
+			ret ^= pcb_hash_coord(sh->data.circ.x) ^ pcb_hash_coord(sh->data.circ.y);
+			ret ^= pcb_hash_coord(sh->data.circ.dia);
+			break;
+	}
+
+	return ret;
+}
+
+unsigned int pcb_pstk_proto_hash(const pcb_pstk_proto_t *p)
+{
+	pcb_pstk_tshape_t *ts = &p->tr.array[0];
+	unsigned int n, ret = pcb_hash_coord(p->hdia) ^ pcb_hash_coord(p->htop) ^ pcb_hash_coord(p->hbottom) ^ pcb_hash_coord(p->hplated) ^ pcb_hash_coord(ts->len);
+	for(n = 0; n < ts->len; n++)
+		ret ^= pcb_pstk_shape_hash(ts->shape + n);
+	return ret;
+}
+
+static int pcb_pstk_shape_eq(const pcb_pstk_shape_t *sh1, const pcb_pstk_shape_t *sh2)
+{
+	int n;
+
+	if (sh1->layer_mask != sh2->layer_mask) return 0;
+	if (sh1->comb != sh2->comb) return 0;
+	if (sh1->clearance != sh2->clearance) return 0;
+	if (sh1->shape != sh2->shape) return 0;
+
+	switch(sh1->shape) {
+		case PCB_PSSH_POLY:
+			if (sh1->data.poly.len != sh2->data.poly.len) return 0;
+			for(n = 0; n < sh1->data.poly.len; n++) {
+				if (sh1->data.poly.x[n] != sh2->data.poly.x[n]) return 0;
+				if (sh1->data.poly.y[n] != sh2->data.poly.y[n]) return 0;
+			}
+			break;
+		case PCB_PSSH_LINE:
+			if (sh1->data.line.x1 != sh2->data.line.x1) return 0;
+			if (sh1->data.line.x2 != sh2->data.line.x2) return 0;
+			if (sh1->data.line.y1 != sh2->data.line.y1) return 0;
+			if (sh1->data.line.y2 != sh2->data.line.y2) return 0;
+			if (sh1->data.line.thickness != sh2->data.line.thickness) return 0;
+			if (sh1->data.line.square != sh2->data.line.square) return 0;
+			break;
+		case PCB_PSSH_CIRC:
+			if (sh1->data.circ.x != sh2->data.circ.x) return 0;
+			if (sh1->data.circ.y != sh2->data.circ.y) return 0;
+			if (sh1->data.circ.dia != sh2->data.circ.dia) return 0;
+			break;
+	}
+
+	return 1;
+}
+
+int pcb_pstk_proto_eq(const pcb_pstk_proto_t *p1, const pcb_pstk_proto_t *p2)
+{
+	pcb_pstk_tshape_t *ts1 = &p1->tr.array[0], *ts2 = &p2->tr.array[0];
+	int n1, n2;
+
+	if (p1->hdia != p2->hdia) return 0;
+	if (p1->htop != p2->htop) return 0;
+	if (p1->hbottom != p2->hbottom) return 0;
+	if (p1->hplated != p2->hplated) return 0;
+	if ((ts1 == NULL) && (ts2 != NULL)) return 0;
+	if ((ts2 == NULL) && (ts1 != NULL)) return 0;
+
+	if (ts1 != NULL) {
+		if (ts1->len != ts2->len) return 0;
+		for(n1 = 0; n1 < ts1->len; n1++) {
+			for(n2 = 0; n2 < ts2->len; n2++)
+				if (pcb_pstk_shape_eq(ts1->shape + n1, ts2->shape + n2))
+					goto found;
+			return 0;
+			found:;
+		}
+	}
+
+	return 1;
+}
+
Index: tags/2.0.1/src/obj_pstk_shape.h
===================================================================
--- tags/2.0.1/src/obj_pstk_shape.h	(nonexistent)
+++ tags/2.0.1/src/obj_pstk_shape.h	(revision 18980)
@@ -0,0 +1,79 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_PSTK_SHAPE_H
+#define PCB_OBJ_PSTK_SHAPE_H
+
+#include "unit.h"
+#include "polygon.h"
+#include "layer.h"
+
+typedef struct pcb_pstk_poly_s {
+	unsigned int len;             /* number of points in polygon */
+	pcb_coord_t *x;               /* ordered list of points, X coord */
+	pcb_coord_t *y;               /* ordered list of points, Y coord */
+	pcb_polyarea_t *pa;           /* cache for the poly code */
+} pcb_pstk_poly_t;
+
+typedef struct pcb_pstk_line_s {
+	pcb_coord_t x1, y1, x2, y2, thickness;
+	unsigned square:1;
+} pcb_pstk_line_t;
+
+typedef struct pcb_pstk_circ_s {
+	pcb_coord_t dia;             /* diameter of the filled circle */
+	pcb_coord_t x, y;            /* assymetric pads */
+} pcb_pstk_circ_t;
+
+typedef struct pcb_pstk_shape_s {
+	pcb_layer_type_t layer_mask;
+	pcb_layer_combining_t comb;
+	union {
+		pcb_pstk_poly_t poly;
+		pcb_pstk_line_t line;
+		pcb_pstk_circ_t circ;
+	} data;
+	enum {
+		PCB_PSSH_POLY,
+		PCB_PSSH_LINE,
+		PCB_PSSH_CIRC                /* filled circle */
+	} shape;
+	pcb_coord_t clearance;         /* per layer clearance: internal layer clearance is sometimes different for production or insulation reasons (IPC2221A) */
+} pcb_pstk_shape_t;
+
+/* transformed prototype */
+typedef struct pcb_pstk_tshape_s {
+	double rot;
+	unsigned xmirror:1;
+	unsigned smirror:1;
+
+	unsigned char len;             /* number of shapes (PCB_PADSTACK_MAX_SHAPES) */
+	pcb_pstk_shape_t *shape;   /* list of layer-shape pairs */
+} pcb_pstk_tshape_t;
+
+void pcb_pstk_shape_rot(pcb_pstk_shape_t *sh, double sina, double cosa, double angle);
+
+#endif
Index: tags/2.0.1/src/obj_rat.c
===================================================================
--- tags/2.0.1/src/obj_rat.c	(nonexistent)
+++ tags/2.0.1/src/obj_rat.c	(revision 18980)
@@ -0,0 +1,283 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "hid_inlines.h"
+#include "undo.h"
+#include "rtree.h"
+
+#include "obj_line_draw.h"
+
+#include "obj_rat.h"
+#include "obj_rat_list.h"
+#include "obj_rat_op.h"
+
+
+
+/* TODO: consider moving the code from draw.c here and remove this: */
+#include "draw.h"
+#include "obj_rat_draw.h"
+
+/* TODO: merge rats.[ch] too */
+#include "rats.h"
+
+/*** allocation ***/
+/* get next slot for a Rat, allocates memory if necessary */
+pcb_rat_t *pcb_rat_alloc(pcb_data_t *data)
+{
+	pcb_rat_t *new_obj;
+
+	new_obj = calloc(sizeof(pcb_rat_t), 1);
+	new_obj->type = PCB_OBJ_RAT;
+	PCB_SET_PARENT(new_obj, data, data);
+
+	ratlist_append(&data->Rat, new_obj);
+
+	return new_obj;
+}
+
+void pcb_rat_free(pcb_rat_t *data)
+{
+	ratlist_remove(data);
+	free(data);
+}
+
+/*** utility ***/
+/* creates a new rat-line */
+pcb_rat_t *pcb_rat_new(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags)
+{
+	pcb_rat_t *Line = pcb_rat_alloc(Data);
+
+	if (!Line)
+		return Line;
+
+	Line->ID = pcb_create_ID_get();
+	Line->Flags = Flags;
+	PCB_FLAG_SET(PCB_FLAG_RAT, Line);
+	Line->Thickness = Thickness;
+	Line->Point1.X = X1;
+	Line->Point1.Y = Y1;
+	Line->Point1.ID = pcb_create_ID_get();
+	Line->Point2.X = X2;
+	Line->Point2.Y = Y2;
+	Line->Point2.ID = pcb_create_ID_get();
+	Line->group1 = group1;
+	Line->group2 = group2;
+	pcb_line_bbox((pcb_line_t *) Line);
+	if (!Data->rat_tree)
+		Data->rat_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Data->rat_tree, &Line->BoundingBox);
+	return Line;
+}
+
+/* DeleteRats - deletes rat lines only
+ * can delete all rat lines, or only selected one */
+pcb_bool pcb_rats_destroy(pcb_bool selected)
+{
+	pcb_opctx_t ctx;
+	pcb_bool changed = pcb_false;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	PCB_RAT_LOOP(PCB->Data);
+	{
+		if ((!selected) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) {
+			changed = pcb_true;
+			pcb_ratop_remove(&ctx, line);
+		}
+	}
+	PCB_END_LOOP;
+	if (changed)
+		pcb_undo_inc_serial();
+	return changed;
+}
+
+
+/*** ops ***/
+/* copies a rat-line to paste buffer */
+void *pcb_ratop_add_to_buffer(pcb_opctx_t *ctx, pcb_rat_t *Rat)
+{
+	return (pcb_rat_new(ctx->buffer.dst, Rat->Point1.X, Rat->Point1.Y,
+		Rat->Point2.X, Rat->Point2.Y, Rat->group1, Rat->group2, Rat->Thickness,
+		pcb_flag_mask(Rat->Flags, PCB_FLAG_FOUND | ctx->buffer.extraflg)));
+}
+
+/* moves a rat-line between board and buffer */
+void *pcb_ratop_move_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat)
+{
+	pcb_r_delete_entry(ctx->buffer.src->rat_tree, (pcb_box_t *) rat);
+
+	ratlist_remove(rat);
+	ratlist_append(&ctx->buffer.dst->Rat, rat);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, rat);
+
+	if (!ctx->buffer.dst->rat_tree)
+		ctx->buffer.dst->rat_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(ctx->buffer.dst->rat_tree, (pcb_box_t *) rat);
+
+	PCB_SET_PARENT(rat, data, ctx->buffer.dst);
+
+	return rat;
+}
+
+/* inserts a point into a rat-line */
+void *pcb_ratop_insert_point(pcb_opctx_t *ctx, pcb_rat_t *Rat)
+{
+	pcb_line_t *newone;
+
+	newone = pcb_line_new_merge(CURRENT, Rat->Point1.X, Rat->Point1.Y,
+																	ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags);
+	if (!newone)
+		return newone;
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, newone, newone);
+	pcb_rat_invalidate_erase(Rat);
+	pcb_line_invalidate_draw(CURRENT, newone);
+	newone = pcb_line_new_merge(CURRENT, Rat->Point2.X, Rat->Point2.Y,
+																	ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags);
+	if (newone) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, newone, newone);
+		pcb_line_invalidate_draw(CURRENT, newone);
+	}
+	pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat);
+	return newone;
+}
+
+/* move a rat to a layer: convert it into a layer line */
+void *pcb_ratop_move_to_layer(pcb_opctx_t *ctx, pcb_rat_t * Rat)
+{
+	pcb_line_t *newone;
+	newone = pcb_line_new(ctx->move.dst_layer, Rat->Point1.X, Rat->Point1.Y,
+																Rat->Point2.X, Rat->Point2.Y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags);
+	if (conf_core.editor.clear_line)
+		conf_set_editor(clear_line, 1);
+	if (!newone)
+		return NULL;
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, ctx->move.dst_layer, newone, newone);
+	if (PCB->RatOn)
+		pcb_rat_invalidate_erase(Rat);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat);
+	pcb_line_invalidate_draw(ctx->move.dst_layer, newone);
+	return newone;
+}
+
+/* destroys a rat */
+void *pcb_ratop_destroy(pcb_opctx_t *ctx, pcb_rat_t *Rat)
+{
+	if (ctx->remove.destroy_target->rat_tree)
+		pcb_r_delete_entry(ctx->remove.destroy_target->rat_tree, &Rat->BoundingBox);
+
+	pcb_rat_free(Rat);
+	return NULL;
+}
+
+/* removes a rat */
+void *pcb_ratop_remove(pcb_opctx_t *ctx, pcb_rat_t *Rat)
+{
+	/* erase from screen and memory */
+	if (PCB->RatOn)
+		pcb_rat_invalidate_erase(Rat);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, Rat, Rat, Rat);
+	return NULL;
+}
+
+/*** draw ***/
+pcb_r_dir_t pcb_rat_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *) b;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, rat))
+			pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.selected);
+		else
+			pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.connected);
+	}
+	else if (PCB_HAS_COLOROVERRIDE(rat)) {
+		pcb_gui->set_color(pcb_draw_out.fgGC, rat->override_color);
+	}
+	else
+		pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.rat);
+
+	if (conf_core.appearance.rat_thickness < 20)
+		rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness;
+	/* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */
+	if (PCB_FLAG_TEST(PCB_FLAG_VIA, rat)) {
+		int w = rat->Thickness;
+
+		if (conf_core.editor.thin_draw || conf_core.editor.wireframe_draw)
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
+		else
+			pcb_hid_set_line_width(pcb_draw_out.fgGC, w);
+		pcb_gui->draw_arc(pcb_draw_out.fgGC, rat->Point1.X, rat->Point1.Y, w * 2, w * 2, 0, 360);
+	}
+	else
+		pcb_line_draw_((pcb_line_t *) rat, 0);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+void pcb_rat_invalidate_erase(pcb_rat_t *Rat)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) {
+		pcb_coord_t w = Rat->Thickness;
+
+		pcb_box_t b;
+
+		b.X1 = Rat->Point1.X - w * 2 - w / 2;
+		b.X2 = Rat->Point1.X + w * 2 + w / 2;
+		b.Y1 = Rat->Point1.Y - w * 2 - w / 2;
+		b.Y2 = Rat->Point1.Y + w * 2 + w / 2;
+		pcb_draw_invalidate(&b);
+	}
+	else
+		pcb_line_invalidate_erase((pcb_line_t *) Rat);
+	pcb_flag_erase(&Rat->Flags);
+}
+
+void pcb_rat_invalidate_draw(pcb_rat_t *Rat)
+{
+	if (conf_core.appearance.rat_thickness < 20)
+		Rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness;
+	/* rats.c set PCB_FLAG_VIA if this rat goes to a containing poly: draw a donut */
+	if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) {
+		pcb_coord_t w = Rat->Thickness;
+
+		pcb_box_t b;
+
+		b.X1 = Rat->Point1.X - w * 2 - w / 2;
+		b.X2 = Rat->Point1.X + w * 2 + w / 2;
+		b.Y1 = Rat->Point1.Y - w * 2 - w / 2;
+		b.Y2 = Rat->Point1.Y + w * 2 + w / 2;
+		pcb_draw_invalidate(&b);
+	}
+	else
+		pcb_line_invalidate_draw(NULL, (pcb_line_t *) Rat);
+}
Index: tags/2.0.1/src/obj_rat.h
===================================================================
--- tags/2.0.1/src/obj_rat.h	(nonexistent)
+++ tags/2.0.1/src/obj_rat.h	(revision 18980)
@@ -0,0 +1,50 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: rats */
+
+#ifndef PCB_OBJ_RAT_H
+#define PCB_OBJ_RAT_H
+
+#include <genlist/gendlist.h>
+#include "obj_common.h"
+
+struct pcb_rat_line_s {          /* a rat-line */
+	PCB_ANYLINEFIELDS;
+	pcb_cardinal_t group1, group2; /* the layer group each point is on */
+	gdl_elem_t link;               /* an arc is in a list on a design */
+};
+
+
+pcb_rat_t *pcb_rat_alloc(pcb_data_t *data);
+void pcb_rat_free(pcb_rat_t *data);
+
+pcb_rat_t *pcb_rat_new(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags);
+pcb_bool pcb_rats_destroy(pcb_bool selected);
+
+#endif
Index: tags/2.0.1/src/obj_rat_draw.h
===================================================================
--- tags/2.0.1/src/obj_rat_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_rat_draw.h	(revision 18980)
@@ -0,0 +1,37 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard draw on rats ***/
+
+/* Include rtree.h for these */
+#ifdef PCB_RTREE_H
+pcb_r_dir_t pcb_rat_draw_callback(const pcb_box_t * b, void *cl);
+#endif
+
+void pcb_rat_invalidate_erase(pcb_rat_t *Rat);
+void pcb_rat_invalidate_draw(pcb_rat_t *Rat);
Index: tags/2.0.1/src/obj_rat_list.c
===================================================================
--- tags/2.0.1/src/obj_rat_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_rat_list.c	(revision 18980)
@@ -0,0 +1,29 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TDL_DONT_UNDEF
+#include "obj_rat_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_rat_list.h
===================================================================
--- tags/2.0.1/src/obj_rat_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_rat_list.h	(revision 18980)
@@ -0,0 +1,47 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_RAT_LIST_H
+#define PCB_OBJ_RAT_LIST_H
+
+#include "obj_rat.h"
+
+/* List of Rats */
+#define TDL(x)      ratlist_ ## x
+#define TDL_LIST_T  ratlist_t
+#define TDL_ITEM_T  pcb_rat_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define ratlist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/obj_rat_op.h
===================================================================
--- tags/2.0.1/src/obj_rat_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_rat_op.h	(revision 18980)
@@ -0,0 +1,38 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard operations on rat lines ***/
+
+#include "operation.h"
+
+void *pcb_ratop_add_to_buffer(pcb_opctx_t *ctx, pcb_rat_t *Rat);
+void *pcb_ratop_move_buffer(pcb_opctx_t *ctx, pcb_rat_t * rat);
+void *pcb_ratop_insert_point(pcb_opctx_t *ctx, pcb_rat_t *Rat);
+void *pcb_ratop_move_to_layer(pcb_opctx_t *ctx, pcb_rat_t * Rat);
+void *pcb_ratop_destroy(pcb_opctx_t *ctx, pcb_rat_t *Rat);
+void *pcb_ratop_remove(pcb_opctx_t *ctx, pcb_rat_t *Rat);
Index: tags/2.0.1/src/obj_subc.c
===================================================================
--- tags/2.0.1/src/obj_subc.c	(nonexistent)
+++ tags/2.0.1/src/obj_subc.c	(revision 18980)
@@ -0,0 +1,1816 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <genvector/vtp0.h>
+
+#include "buffer.h"
+#include "board.h"
+#include "crosshair.h"
+#include "data.h"
+#include "error.h"
+#include "obj_subc.h"
+#include "obj_subc_op.h"
+#include "obj_subc_parent.h"
+#include "obj_poly_op.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "obj_pstk_draw.h"
+#include "obj_line_op.h"
+#include "obj_term.h"
+#include "obj_text_draw.h"
+#include "rtree.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "flag.h"
+#include "polygon.h"
+#include "operation.h"
+#include "undo.h"
+#include "macro.h"
+#include "compat_misc.h"
+#include "math_helper.h"
+#include "pcb_minuid.h"
+#include "conf_core.h"
+
+#define SUBC_AUX_NAME "subc-aux"
+
+/* Modify dst to include src, if src is not a floater */
+static void pcb_box_bump_box_noflt(pcb_box_t *dst, pcb_box_t *src)
+{
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, ((pcb_any_obj_t *)(src))))
+		pcb_box_bump_box(dst, src);
+}
+
+/* update cached values: e.g. looking up refdes in attributes each time the
+   netlist code needs it would be too expensive. Instead, we maintain a
+   read-only ->refdes field and update it any time attributes change. */
+static void pcb_subc_attrib_post_change(pcb_attribute_list_t *list, const char *name, const char *value)
+{
+	pcb_subc_t *sc = (pcb_subc_t *)(((char *)list) - offsetof(pcb_subc_t, Attributes));
+	if (strcmp(name, "refdes") == 0) {
+		const char *inv;
+		sc->refdes = value;
+		inv = pcb_obj_id_invalid(sc->refdes);
+		if (inv != NULL)
+			pcb_message(PCB_MSG_ERROR, "Invalid character '%c' in subc refdes '%s'\n", *inv, sc->refdes);
+	}
+	pcb_text_dyn_bbox_update(sc->data);
+}
+
+pcb_subc_t *pcb_subc_alloc(void)
+{
+	pcb_subc_t *sc;
+	sc = calloc(sizeof(pcb_subc_t), 1);
+	sc->Attributes.post_change = pcb_subc_attrib_post_change;
+	sc->data = pcb_data_new(NULL);
+	sc->type = PCB_OBJ_SUBC;
+	PCB_SET_PARENT(sc->data, subc, sc);
+	minuid_gen(&pcb_minuid, sc->uid);
+	pcb_term_init(&sc->terminals);
+	return sc;
+}
+
+pcb_subc_t *pcb_subc_new(void)
+{
+	pcb_subc_t *sc = pcb_subc_alloc();
+	sc->ID = pcb_create_ID_get();
+	return sc;
+}
+
+void pcb_subc_free(pcb_subc_t *sc)
+{
+	pcb_term_uninit(&sc->terminals);
+	pcb_subclist_remove(sc);
+	pcb_data_free(sc->data);
+	free(sc->data);
+	free(sc);
+}
+
+
+void pcb_add_subc_to_data(pcb_data_t *dt, pcb_subc_t *sc)
+{
+	PCB_SET_PARENT(sc->data, subc, sc);
+	PCB_SET_PARENT(sc, data, dt);
+	pcb_subclist_append(&dt->subc, sc);
+}
+
+/* Create (and append) a new bound layer to a subc */
+static pcb_layer_t *pcb_subc_layer_create_buff(pcb_subc_t *sc, pcb_layer_t *src)
+{
+	pcb_layer_t *dst = &sc->data->Layer[sc->data->LayerN++];
+
+	memcpy(&dst->meta, &src->meta, sizeof(src->meta));
+	dst->is_bound = 1;
+	dst->comb = src->comb;
+	dst->parent.data = sc->data;
+	dst->parent_type = PCB_PARENT_DATA;
+	dst->type = PCB_OBJ_LAYER;
+	dst->name = pcb_strdup(src->name);
+	return dst;
+}
+
+static pcb_line_t *add_aux_line(pcb_layer_t *aux, const char *key, const char *val, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_line_t *l = pcb_line_new(aux, x1, y1, x2, y2, PCB_MM_TO_COORD(0.1), 0, pcb_no_flags());
+	pcb_attribute_put(&l->Attributes, key, val);
+	return l;
+}
+
+static pcb_line_t *find_aux_line(pcb_layer_t *aux, const char *key)
+{
+	pcb_line_t *line;
+	gdl_iterator_t it;
+	linelist_foreach(&aux->Line, &it, line) {
+		const char *val = pcb_attribute_get(&line->Attributes, "subc-role");
+		if ((val != NULL) && (strcmp(val, key) == 0))
+			return line;
+	}
+	return NULL;
+}
+
+/* Find and save the aux layer in the cache, of it exists */
+static void pcb_subc_cache_find_aux(pcb_subc_t *sc, int alloc)
+{
+	int n;
+	for(n = 0; n < sc->data->LayerN; n++) {
+		if (strcmp(sc->data->Layer[n].name, SUBC_AUX_NAME) == 0) {
+			sc->aux_layer = sc->data->Layer + n;
+			return;
+		}
+	}
+
+	if (sc->aux_layer == NULL)
+		sc->aux_layer = pcb_layer_new_bound(sc->data, PCB_LYT_VIRTUAL | PCB_LYT_NOEXPORT | PCB_LYT_MISC | PCB_LYT_TOP, SUBC_AUX_NAME);
+}
+
+/* Looking up aux objects for determining orientation/origin of a subc
+   is somewhat expensive. Instead of doing that every time, we just save
+   the pointer of those objects/layers. They don't change once the
+   subc is loaded into memory */
+static int pcb_subc_cache_update(pcb_subc_t *sc)
+{
+	if (sc->aux_layer == NULL)
+		pcb_subc_cache_find_aux(sc, 0);
+
+	if (sc->aux_cache[0] != NULL)
+		return 0;
+
+	if (sc->aux_layer == NULL) {
+		pcb_message(PCB_MSG_WARNING, "Can't find subc aux layer\n");
+		return -1;
+	}
+
+	sc->aux_cache[PCB_SUBCH_ORIGIN] = find_aux_line(sc->aux_layer, "origin");
+	sc->aux_cache[PCB_SUBCH_X] = find_aux_line(sc->aux_layer, "x");
+	sc->aux_cache[PCB_SUBCH_Y] = find_aux_line(sc->aux_layer, "y");
+
+	return 0;
+}
+
+pcb_bool pcb_subc_find_aux_point(pcb_subc_t *sc, const char *role, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_line_t *l;
+
+	if (sc->aux_layer == NULL)
+		pcb_subc_cache_update(sc);
+	if (sc->aux_layer == NULL)
+		return pcb_false;
+
+	l = find_aux_line(sc->aux_layer, role);
+	if (l == NULL)
+		return pcb_false;
+
+	*x = l->Point1.X;
+	*y = l->Point1.Y;
+
+	return pcb_true;
+}
+
+int pcb_subc_get_origin(pcb_subc_t *sc, pcb_coord_t *x, pcb_coord_t *y)
+{
+	if ((pcb_subc_cache_update(sc) != 0) || (sc->aux_cache[PCB_SUBCH_ORIGIN] == NULL))
+		return -1;
+
+	*x = sc->aux_cache[PCB_SUBCH_ORIGIN]->Point1.X;
+	*y = sc->aux_cache[PCB_SUBCH_ORIGIN]->Point1.Y;
+	return 0;
+}
+
+int pcb_subc_get_rotation(pcb_subc_t *sc, double *rot)
+{
+	if ((pcb_subc_cache_update(sc) != 0) || (sc->aux_cache[PCB_SUBCH_X] == NULL))
+		return -1;
+
+	*rot = -1 * PCB_RAD_TO_DEG * atan2(sc->aux_cache[PCB_SUBCH_X]->Point2.Y - sc->aux_cache[PCB_SUBCH_X]->Point1.Y, sc->aux_cache[PCB_SUBCH_X]->Point2.X - sc->aux_cache[PCB_SUBCH_X]->Point1.X);
+	return 0;
+}
+
+/* The subc is originally drawn on the top side, and the aux layer gets
+   the PCB_LYT_TOP flag. If the subc is ever sent to the other side, the
+   aux layer changed side too. This is to be detected here. */
+int pcb_subc_get_side(pcb_subc_t *sc, int *on_bottom)
+{
+	if ((pcb_subc_cache_update(sc) != 0) || (sc->aux_layer == NULL))
+		return -1;
+	if (!sc->aux_layer->is_bound)
+		return -1;
+
+	if (sc->aux_layer->meta.bound.type & PCB_LYT_TOP)
+		*on_bottom = 0;
+	else if (sc->aux_layer->meta.bound.type & PCB_LYT_BOTTOM)
+		*on_bottom = 1;
+	else
+		return -1;
+
+	return 0;
+}
+
+int pcb_subc_get_host_trans(pcb_subc_t *sc, pcb_host_trans_t *tr)
+{
+	int res = 0;
+	double rr;
+
+	if (pcb_subc_get_origin(sc, &tr->ox, &tr->oy) != 0) {
+		tr->ox = tr->oy = 0;
+		res = -1;
+	}
+
+	if (pcb_subc_get_rotation(sc, &tr->rot) != 0) {
+		tr->rot = 0;
+		res = -1;
+	}
+	
+	if (pcb_subc_get_side(sc, &tr->on_bottom) != 0) {
+		tr->on_bottom = 0;
+		res = -1;
+	}
+
+	rr = tr->rot / PCB_RAD_TO_DEG;
+	tr->cosa = cos(rr);
+	tr->sina = sin(rr);
+
+	return res;
+}
+
+static void pcb_subc_cache_invalidate(pcb_subc_t *sc)
+{
+	sc->aux_cache[0] = NULL;
+}
+
+/* Convert a square line into a polygon and add it to dst */
+static pcb_poly_t *sqline2term(pcb_layer_t *dst, pcb_line_t *line)
+{
+	pcb_poly_t *poly;
+	pcb_coord_t x[4], y[4];
+	int n;
+
+	pcb_sqline_to_rect(line, x, y);
+
+	poly = pcb_poly_new(dst, line->Clearance, pcb_no_flags());
+	for(n = 0; n < 4; n++)
+		pcb_poly_point_new(poly, x[n], y[n]);
+	PCB_FLAG_SET(PCB_FLAG_CLEARPOLYPOLY, poly);
+	pcb_attribute_copy_all(&poly->Attributes, &line->Attributes);
+
+	pcb_poly_init_clip(dst->parent.data, dst, poly);
+	pcb_add_poly_on_layer(dst, poly);
+
+	return poly;
+}
+
+pcb_layer_t *pcb_loose_subc_layer(pcb_board_t *pcb, pcb_layer_t *layer)
+{
+	pcb_subc_t *sc;
+	int n;
+
+	if (!pcb->is_footprint)
+		return layer;
+
+	sc = pcb_subclist_first(&pcb->Data->subc);
+	if (sc == NULL)
+		return layer;
+
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *l = &sc->data->Layer[n];
+		if (!l->is_bound)
+			continue;
+		if (l->meta.bound.real == layer)
+			return l;
+	}
+	return layer;
+}
+
+extern unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
+
+static pcb_coord_t read_mask(pcb_any_obj_t *obj)
+{
+	const char *smask = pcb_attribute_get(&obj->Attributes, "elem_smash_pad_mask");
+	pcb_coord_t mask = 0;
+
+	if (smask != NULL) {
+		pcb_bool success;
+		mask = pcb_get_value_ex(smask, NULL, NULL, NULL, "mm", &success);
+		if (!success)
+			mask = 0;
+	}
+	return mask;
+}
+
+static void get_aux_layer(pcb_subc_t *sc, int alloc)
+{
+	if (sc->aux_layer == NULL)
+		pcb_subc_cache_find_aux(sc, 1);
+	pcb_subc_cache_update(sc);
+}
+
+void pcb_subc_create_aux(pcb_subc_t *sc, pcb_coord_t ox, pcb_coord_t oy, double rot, pcb_bool bottom)
+{
+	double unit = PCB_MM_TO_COORD(1);
+	double cs, sn;
+
+	get_aux_layer(sc, 1);
+
+	if (rot == 0.0) {
+		cs = 1;
+		sn = 0;
+	}
+	else {
+		cs = cos(rot/PCB_RAD_TO_DEG);
+		sn = sin(rot/PCB_RAD_TO_DEG);
+	}
+
+	if (bottom) {
+		assert(sc->aux_layer->is_bound);
+		sc->aux_layer->meta.bound.type &= ~PCB_LYT_TOP;
+		sc->aux_layer->meta.bound.type |= PCB_LYT_BOTTOM;
+		cs = -cs;
+	}
+
+	add_aux_line(sc->aux_layer, "subc-role", "origin", ox, oy, ox, oy);
+	add_aux_line(sc->aux_layer, "subc-role", "x", ox, oy, pcb_round((double)ox + cs*unit), pcb_round(oy + sn*unit));
+	add_aux_line(sc->aux_layer, "subc-role", "y", ox, oy, pcb_round((double)ox + sn*unit), pcb_round(oy + cs*unit));
+}
+
+void pcb_subc_create_aux_point(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, const char *role)
+{
+	get_aux_layer(sc, 1);
+	add_aux_line(sc->aux_layer, "subc-role", role, x, y, x, y);
+}
+
+int pcb_subc_convert_from_buffer(pcb_buffer_t *buffer)
+{
+	pcb_subc_t *sc;
+	int n, top_pads = 0, bottom_pads = 0, has_refdes_text = 0;
+	pcb_layer_t *dst_top_mask = NULL, *dst_bottom_mask = NULL, *dst_top_paste = NULL, *dst_bottom_paste = NULL, *dst_top_silk = NULL;
+	vtp0_t mask_pads, paste_pads;
+
+	vtp0_init(&mask_pads);
+	vtp0_init(&paste_pads);
+
+	sc = pcb_subc_alloc();
+	sc->ID = pcb_create_ID_get();
+	pcb_add_subc_to_data(buffer->Data, sc);
+
+	/* create layer matches and copy objects */
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		pcb_layer_t *dst, *src;
+		pcb_line_t *line;
+		pcb_text_t *text;
+		pcb_poly_t *poly;
+		pcb_arc_t *arc;
+		pcb_layer_type_t ltype;
+
+		if (pcb_layer_is_pure_empty(&buffer->Data->Layer[n]))
+			continue;
+
+		src = &buffer->Data->Layer[n];
+		dst = pcb_subc_layer_create_buff(sc, src);
+		ltype = dst->meta.bound.type;
+
+		if ((dst->comb & PCB_LYC_SUB) == 0) {
+			if ((ltype & PCB_LYT_PASTE) && (ltype & PCB_LYT_TOP))
+				dst_top_paste = dst;
+			else if ((ltype & PCB_LYT_PASTE) && (ltype & PCB_LYT_BOTTOM))
+				dst_bottom_paste = dst;
+			else if ((ltype & PCB_LYT_SILK) && (ltype & PCB_LYT_TOP))
+				dst_top_silk = dst;
+		}
+
+		if (dst->comb & PCB_LYC_SUB) {
+			if ((ltype & PCB_LYT_MASK) && (ltype & PCB_LYT_TOP))
+				dst_top_mask = dst;
+			else if ((ltype & PCB_LYT_MASK) && (ltype & PCB_LYT_BOTTOM))
+				dst_bottom_mask = dst;
+		}
+
+		while((line = linelist_first(&src->Line)) != NULL) {
+			pcb_coord_t mask = 0;
+			char *np, *sq, *termpad;
+			const char *term;
+
+			termpad = pcb_attribute_get(&line->Attributes, "elem_smash_pad");
+			if (termpad != NULL) {
+				if (ltype & PCB_LYT_TOP)
+					top_pads++;
+				else if (ltype & PCB_LYT_BOTTOM)
+					bottom_pads++;
+				mask = read_mask((pcb_any_obj_t *)line);
+			}
+			term = pcb_attribute_get(&line->Attributes, "term");
+			np = pcb_attribute_get(&line->Attributes, "elem_smash_nopaste");
+			sq = pcb_attribute_get(&line->Attributes, "elem_smash_shape_square");
+			if ((sq != NULL) && (*sq == '1')) { /* convert to polygon */
+				poly = sqline2term(dst, line);
+				if (termpad != NULL) {
+					if ((np == NULL) || (*np != '1')) {
+						poly = sqline2term(dst, line);
+						vtp0_append(&paste_pads, poly);
+					}
+					if (mask > 0) {
+						line->Thickness = mask;
+						poly = sqline2term(dst, line);
+						if (term != NULL)
+							pcb_attribute_put(&poly->Attributes, "term", term);
+						vtp0_append(&mask_pads, poly);
+					}
+				}
+
+				pcb_line_free(line);
+			}
+			else {
+				/* copy the line */
+				linelist_remove(line);
+				linelist_append(&dst->Line, line);
+				PCB_SET_PARENT(line, layer, dst);
+				PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, line);
+
+				if (termpad != NULL) {
+					pcb_line_t *nl = pcb_line_dup(dst, line);
+					if ((np == NULL) || (*np != '1'))
+						vtp0_append(&paste_pads, nl);
+					if (mask > 0) {
+						nl = pcb_line_dup(dst, line);
+						nl->Thickness = mask;
+						if (term != NULL)
+							pcb_attribute_put(&nl->Attributes, "term", term);
+						vtp0_append(&mask_pads, nl);
+					}
+				}
+			}
+		}
+
+		while((arc = arclist_first(&src->Arc)) != NULL) {
+			arclist_remove(arc);
+			arclist_append(&dst->Arc, arc);
+			PCB_SET_PARENT(arc, layer, dst);
+			PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, arc);
+		}
+
+		while((text = textlist_first(&src->Text)) != NULL) {
+			textlist_remove(text);
+			textlist_append(&dst->Text, text);
+			PCB_SET_PARENT(text, layer, dst);
+			PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, text);
+			if (!has_refdes_text && (text->TextString != NULL) && (strstr(text->TextString, "%a.parent.refdes%") != NULL))
+				has_refdes_text = 1;
+		}
+
+		while((poly = polylist_first(&src->Polygon)) != NULL) {
+			polylist_remove(poly);
+			polylist_append(&dst->Polygon, poly);
+			PCB_SET_PARENT(poly, layer, dst);
+			PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, poly);
+		}
+	}
+
+	/* create paste and mask side effects - needed when importing from footprint */
+	{
+		if (top_pads > 0) {
+			if (dst_top_paste == NULL)
+				dst_top_paste = pcb_layer_new_bound(sc->data, PCB_LYT_TOP | PCB_LYT_PASTE, "top paste");
+			if (dst_top_mask == NULL) {
+				dst_top_mask = pcb_layer_new_bound(sc->data, PCB_LYT_TOP | PCB_LYT_MASK, "top mask");
+				dst_top_mask->comb = PCB_LYC_SUB;
+			}
+		}
+		if (bottom_pads > 0) {
+			if (dst_bottom_paste == NULL)
+				dst_bottom_paste = pcb_layer_new_bound(sc->data, PCB_LYT_BOTTOM | PCB_LYT_PASTE, "bottom paste");
+			if (dst_bottom_mask == NULL) {
+				dst_bottom_mask = pcb_layer_new_bound(sc->data, PCB_LYT_BOTTOM | PCB_LYT_MASK, "bottom mask");
+				dst_bottom_mask->comb = PCB_LYC_SUB;
+			}
+		}
+	}
+
+	{ /* convert globals */
+		pcb_pstk_t *ps;
+
+		while((ps = padstacklist_first(&buffer->Data->padstack)) != NULL) {
+			const pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+			padstacklist_remove(ps);
+			padstacklist_append(&sc->data->padstack, ps);
+			PCB_SET_PARENT(ps, data, sc->data);
+			PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, ps);
+			ps->proto = pcb_pstk_proto_insert_dup(sc->data, proto, 1);
+			ps->protoi = -1;
+		}
+	}
+
+	vtp0_uninit(&mask_pads);
+	vtp0_uninit(&paste_pads);
+
+	pcb_subc_create_aux(sc, buffer->X, buffer->Y, 0.0, pcb_false);
+
+	/* Add refdes */
+	pcb_attribute_put(&sc->Attributes, "refdes", "U0");
+	if (!has_refdes_text) {
+		if (dst_top_silk == NULL)
+			dst_top_silk = pcb_layer_new_bound(sc->data, PCB_LYT_TOP | PCB_LYT_SILK, "top-silk");
+		if (dst_top_silk != NULL)
+			pcb_text_new(dst_top_silk, pcb_font(PCB, 0, 0), buffer->X, buffer->Y, 0, 100, "%a.parent.refdes%", pcb_flag_make(PCB_FLAG_DYNTEXT | PCB_FLAG_FLOATER));
+		else
+			pcb_message(PCB_MSG_ERROR, "Error: can't create top silk layer in subc for placing the refdes\n");
+	}
+
+
+	return 0;
+}
+
+static void pcb_subc_draw_origin(pcb_hid_gc_t GC, pcb_subc_t *sc, pcb_coord_t DX, pcb_coord_t DY)
+{
+	pcb_line_t *origin;
+	pcb_subc_cache_update(sc);
+
+	origin = sc->aux_cache[PCB_SUBCH_ORIGIN];
+
+	if (origin == NULL)
+		return;
+
+	DX += (origin->Point1.X + origin->Point2.X) / 2;
+	DY += (origin->Point1.Y + origin->Point2.Y) / 2;
+
+	pcb_gui->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE);
+	pcb_gui->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY - PCB_EMARK_SIZE);
+	pcb_gui->draw_line(GC, DX - PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE);
+	pcb_gui->draw_line(GC, DX + PCB_EMARK_SIZE, DY, DX, DY + PCB_EMARK_SIZE);
+}
+
+void pcb_xordraw_subc(pcb_subc_t *sc, pcb_coord_t DX, pcb_coord_t DY, int use_curr_side)
+{
+	int n, mirr;
+	pcb_coord_t w = 0, h = 0;
+
+	mirr = use_curr_side && conf_core.editor.show_solder_side;
+
+	/* mirror center */
+	if (mirr) {
+		pcb_subc_get_origin(sc, &w, &h);
+		w *= 2;
+		h *= 2;
+	}
+
+	/* draw per layer objects */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *ly = sc->data->Layer + n;
+		pcb_line_t *line;
+		pcb_text_t *text;
+		pcb_poly_t *poly;
+		pcb_arc_t *arc;
+		gdl_iterator_t it;
+
+		linelist_foreach(&ly->Line, &it, line)
+			pcb_draw_wireframe_line(pcb_crosshair.GC, 
+															DX + PCB_CSWAP_X(line->Point1.X, w, mirr), 
+															DY + PCB_CSWAP_Y(line->Point1.Y, h, mirr), 
+															DX + PCB_CSWAP_X(line->Point2.X, w, mirr), 
+															DY + PCB_CSWAP_Y(line->Point2.Y, h, mirr),
+															line->Thickness,
+															0 );
+
+		arclist_foreach(&ly->Arc, &it, arc) {
+			if(arc->Width != arc->Height) {
+#warning TODO: The wireframe arc drawing code cannot draw ellipses yet so draw the elliptical arc with a thin line 
+				double sa = mirr ? PCB_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle;
+				double da = mirr ? PCB_SWAP_DELTA(arc->Delta) : arc->Delta;
+				pcb_gui->draw_arc(pcb_crosshair.GC, DX + PCB_CSWAP_X(arc->X, w, mirr), DY + PCB_CSWAP_Y(arc->Y, h, mirr), arc->Width, arc->Height, sa, da);
+			}
+			else {
+				pcb_arc_t temp_arc;
+				temp_arc.StartAngle = mirr ? PCB_SWAP_ANGLE(arc->StartAngle) : arc->StartAngle; 
+				temp_arc.Delta = mirr ? PCB_SWAP_DELTA(arc->Delta) : arc->Delta;
+				temp_arc.X = DX + PCB_CSWAP_X(arc->X, w, mirr);
+				temp_arc.Y = DY + PCB_CSWAP_Y(arc->Y, h, mirr);
+				temp_arc.Width = arc->Width;
+				temp_arc.Height = arc->Height;
+				temp_arc.Thickness = arc->Thickness;
+				pcb_draw_wireframe_arc(pcb_crosshair.GC, &temp_arc);
+			}
+		}
+
+		polylist_foreach(&ly->Polygon, &it, poly)
+			pcb_xordraw_poly_subc(poly, DX, DY, w, h, mirr);
+
+		textlist_foreach(&ly->Text, &it, text) {
+			if (mirr) {
+				pcb_text_t t;
+				t = *text;
+				t.X = PCB_CSWAP_X(text->X, w, mirr);
+				t.Y = PCB_CSWAP_Y(text->Y, h, mirr);
+				PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, &t);
+				pcb_text_draw_xor(&t, DX, DY);
+			}
+			else
+				pcb_text_draw_xor(text, DX, DY);
+		}
+	}
+
+	/* draw global objects */
+	{
+		pcb_pstk_t *ps;
+		gdl_iterator_t it;
+
+		padstacklist_foreach(&sc->data->padstack, &it, ps) {
+			pcb_coord_t ox, oy;
+			int oxm, pri;
+			ox = ps->x;
+			oy = ps->y;
+			oxm = ps->xmirror;
+			pri = ps->protoi;
+			ps->x = PCB_CSWAP_X(ps->x, w, mirr);
+			ps->y = PCB_CSWAP_Y(ps->y, h, mirr);
+			ps->x += DX;
+			ps->y += DY;
+			if (mirr) {
+				ps->xmirror = !ps->xmirror;
+				ps->protoi = -1;
+			}
+			pcb_pstk_thindraw(pcb_crosshair.GC, ps);
+			ps->x = ox;
+			ps->y = oy;
+			ps->xmirror = oxm;
+			ps->protoi = pri;
+		}
+	}
+
+	pcb_subc_draw_origin(pcb_crosshair.GC, sc, DX, DY);
+}
+
+#define MAYBE_KEEP_ID(dst, src) \
+do { \
+	if ((keep_ids) && (dst != NULL)) \
+		dst->ID = src->ID; \
+} while(0)
+
+static pcb_subc_t *pcb_subc_copy_meta(pcb_subc_t *dst, pcb_subc_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	return dst;
+}
+
+
+pcb_subc_t *pcb_subc_dup_at(pcb_board_t *pcb, pcb_data_t *dst, pcb_subc_t *src, pcb_coord_t dx, pcb_coord_t dy, pcb_bool keep_ids)
+{
+	pcb_board_t *src_pcb;
+	int n;
+	pcb_subc_t *sc = pcb_subc_alloc();
+
+	if (keep_ids)
+		sc->ID = src->ID;
+	else
+		sc->ID = pcb_create_ID_get();
+
+	minuid_cpy(sc->uid, src->uid);
+	PCB_SET_PARENT(sc->data, subc, sc);
+	PCB_SET_PARENT(sc, data, dst);
+	pcb_subclist_append(&dst->subc, sc);
+
+	src_pcb = pcb_data_get_top(src->data);
+
+	pcb_subc_copy_meta(sc, src);
+
+	sc->BoundingBox.X1 = sc->BoundingBox.Y1 = PCB_MAX_COORD;
+	sc->BoundingBox.X2 = sc->BoundingBox.Y2 = -PCB_MAX_COORD;
+	sc->bbox_naked.X1 = sc->bbox_naked.Y1 = PCB_MAX_COORD;
+	sc->bbox_naked.X2 = sc->bbox_naked.Y2 = -PCB_MAX_COORD;
+
+	/* make a copy of layer data */
+	for(n = 0; n < src->data->LayerN; n++) {
+		pcb_layer_t *sl = src->data->Layer + n;
+		pcb_layer_t *dl = sc->data->Layer + n;
+		pcb_line_t *line, *nline;
+		pcb_text_t *text, *ntext;
+		pcb_arc_t *arc, *narc;
+		gdl_iterator_t it;
+
+		/* bind layer/resolve layers */
+		dl->is_bound = 1;
+		if ((pcb != NULL) && (pcb == src_pcb)) {
+			/* copy within the same board */
+			memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound));
+			dl->name = pcb_strdup(sl->name);
+			dl->comb = sl->comb;
+			if (dl->meta.bound.real != NULL)
+				pcb_layer_link_trees(dl, dl->meta.bound.real);
+		}
+		else if (pcb != NULL) {
+			/* copying from buffer to board */
+			memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound));
+			dl->name = pcb_strdup(sl->name);
+			dl->meta.bound.real = pcb_layer_resolve_binding(pcb, sl);
+			dl->comb = sl->comb;
+
+			if (dl->meta.bound.real == NULL) {
+				if (!(dl->meta.bound.type & PCB_LYT_VIRTUAL)) {
+					const char *name = dl->name;
+					if (name == NULL) name = "<anonymous>";
+					pcb_message(PCB_MSG_WARNING, "Couldn't bind a layer %s of subcircuit while placing it\n", name);
+				}
+			}
+			else
+				pcb_layer_link_trees(dl, dl->meta.bound.real);
+		}
+		else {
+			/* copying from board to buffer */
+			memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound));
+
+			dl->meta.bound.real = NULL;
+			dl->name = pcb_strdup(sl->name);
+			dl->comb = sl->comb;
+		}
+
+
+		linelist_foreach(&sl->Line, &it, line) {
+			nline = pcb_line_dup_at(dl, line, dx, dy);
+			MAYBE_KEEP_ID(nline, line);
+			if (nline != NULL) {
+				PCB_SET_PARENT(nline, layer, dl);
+				if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, nline)) {
+					pcb_box_bump_box_noflt(&sc->BoundingBox, &nline->BoundingBox);
+					pcb_box_bump_box_noflt(&sc->bbox_naked, &nline->bbox_naked);
+				}
+			}
+		}
+
+		arclist_foreach(&sl->Arc, &it, arc) {
+			narc = pcb_arc_dup_at(dl, arc, dx, dy);
+			MAYBE_KEEP_ID(narc, arc);
+			if (narc != NULL) {
+				PCB_SET_PARENT(narc, layer, dl);
+				if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, narc)) {
+					pcb_box_bump_box_noflt(&sc->BoundingBox, &narc->BoundingBox);
+					pcb_box_bump_box_noflt(&sc->bbox_naked, &narc->bbox_naked);
+				}
+			}
+		}
+
+		textlist_foreach(&sl->Text, &it, text) {
+			ntext = pcb_text_dup_at(dl, text, dx, dy);
+			MAYBE_KEEP_ID(ntext, text);
+			if (ntext != NULL) {
+				PCB_SET_PARENT(ntext, layer, dl);
+				if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, ntext)) {
+					pcb_box_bump_box_noflt(&sc->BoundingBox, &ntext->BoundingBox);
+					pcb_box_bump_box_noflt(&sc->bbox_naked, &ntext->bbox_naked);
+				}
+			}
+		}
+
+	}
+	sc->data->LayerN = src->data->LayerN;
+
+	/* bind the via rtree so that vias added in this subc show up on the board */
+	if (pcb != NULL) {
+		if (pcb->Data->padstack_tree == NULL)
+			pcb->Data->padstack_tree = pcb_r_create_tree();
+		sc->data->padstack_tree = pcb->Data->padstack_tree;
+	}
+
+	{ /* make a copy of global data */
+		pcb_pstk_t *ps, *nps;
+		gdl_iterator_t it;
+
+		padstacklist_foreach(&src->data->padstack, &it, ps) {
+			pcb_cardinal_t pid = pcb_pstk_proto_insert_dup(sc->data, pcb_pstk_get_proto(ps), 1);
+			nps = pcb_pstk_new_tr(sc->data, pid, ps->x+dx, ps->y+dy, ps->Clearance, ps->Flags, ps->rot, ps->xmirror, ps->smirror);
+			pcb_pstk_copy_meta(nps, ps);
+			MAYBE_KEEP_ID(nps, ps);
+			if (nps != NULL) {
+				if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, nps)) {
+					pcb_box_bump_box_noflt(&sc->BoundingBox, &nps->BoundingBox);
+					pcb_box_bump_box_noflt(&sc->bbox_naked, &nps->bbox_naked);
+				}
+			}
+		}
+	}
+
+	/* make a copy of polygons at the end so clipping caused by other objects are calculated only once */
+	for(n = 0; n < src->data->LayerN; n++) {
+		pcb_layer_t *sl = src->data->Layer + n;
+		pcb_layer_t *dl = sc->data->Layer + n;
+		pcb_poly_t *poly, *npoly;
+		gdl_iterator_t it;
+
+		polylist_foreach(&sl->Polygon, &it, poly) {
+			npoly = pcb_poly_dup_at(dl, poly, dx, dy);
+			MAYBE_KEEP_ID(npoly, poly);
+			if (npoly != NULL) {
+				PCB_SET_PARENT(npoly, layer, dl);
+				if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, npoly)) {
+					pcb_box_bump_box_noflt(&sc->BoundingBox, &npoly->BoundingBox);
+					pcb_box_bump_box_noflt(&sc->bbox_naked, &npoly->bbox_naked);
+				}
+				pcb_poly_ppclear(npoly);
+			}
+		}
+	}
+
+	memcpy(&sc->Flags, &src->Flags, sizeof(sc->Flags));
+
+	pcb_close_box(&sc->BoundingBox);
+	pcb_close_box(&sc->bbox_naked);
+
+	if (pcb != NULL) {
+		if (!dst->subc_tree)
+			dst->subc_tree = pcb_r_create_tree();
+		pcb_r_insert_entry(dst->subc_tree, (pcb_box_t *)sc);
+	}
+
+	return sc;
+}
+
+pcb_subc_t *pcb_subc_dup(pcb_board_t *pcb, pcb_data_t *dst, pcb_subc_t *src)
+{
+	return pcb_subc_dup_at(pcb, dst, src, 0, 0, pcb_false);
+}
+
+void pcb_subc_bbox(pcb_subc_t *sc)
+{
+	pcb_data_bbox(&sc->BoundingBox, sc->data, pcb_true);
+	pcb_data_bbox_naked(&sc->bbox_naked, sc->data, pcb_true);
+}
+
+
+/* erases a subc on a layer */
+void EraseSubc(pcb_subc_t *sc)
+{
+	pcb_draw_invalidate(sc);
+/*	pcb_flag_erase(&sc->Flags); ??? */
+}
+
+void DrawSubc(pcb_subc_t *sc)
+{
+	pcb_draw_invalidate(sc);
+}
+
+
+/* Execute an operation on all children on an sc and update the bbox of the sc */
+void *pcb_subc_op(pcb_data_t *Data, pcb_subc_t *sc, pcb_opfunc_t *opfunc, pcb_opctx_t *ctx, pcb_subc_op_undo_t batch_undo)
+{
+	int n;
+
+	switch(batch_undo) {
+		case PCB_SUBCOP_UNDO_SUBC:
+			pcb_undo_freeze_serial();
+			pcb_undo_freeze_add();
+			break;
+		case PCB_SUBCOP_UNDO_BATCH:
+			pcb_undo_inc_serial();
+			pcb_undo_save_serial();
+			pcb_undo_freeze_serial();
+			break;
+	}
+
+	EraseSubc(sc);
+	if (pcb_data_get_top(Data) != NULL) {
+		if (Data->subc_tree != NULL)
+			pcb_r_delete_entry(Data->subc_tree, (pcb_box_t *)sc);
+		else
+			Data->subc_tree = pcb_r_create_tree();
+	}
+
+	/* for calculating the new bounding box on the fly */
+	sc->BoundingBox.X1 = sc->BoundingBox.Y1 = PCB_MAX_COORD;
+	sc->BoundingBox.X2 = sc->BoundingBox.Y2 = -PCB_MAX_COORD;
+	sc->bbox_naked.X1 = sc->bbox_naked.Y1 = PCB_MAX_COORD;
+	sc->bbox_naked.X2 = sc->bbox_naked.Y2 = -PCB_MAX_COORD;
+
+	/* execute on layer locals */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *sl = sc->data->Layer + n;
+		pcb_line_t *line;
+		pcb_text_t *text;
+		pcb_poly_t *poly;
+		pcb_arc_t *arc;
+		gdl_iterator_t it;
+
+
+		linelist_foreach(&sl->Line, &it, line) {
+			pcb_object_operation(opfunc, ctx, PCB_OBJ_LINE, sl, line, line);
+			if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, line)) {
+				pcb_box_bump_box_noflt(&sc->BoundingBox, &line->BoundingBox);
+				pcb_box_bump_box_noflt(&sc->bbox_naked, &line->bbox_naked);
+			}
+		}
+
+		arclist_foreach(&sl->Arc, &it, arc) {
+			pcb_object_operation(opfunc, ctx, PCB_OBJ_ARC, sl, arc, arc);
+			if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, arc)) {
+				pcb_box_bump_box_noflt(&sc->BoundingBox, &arc->BoundingBox);
+				pcb_box_bump_box_noflt(&sc->bbox_naked, &arc->bbox_naked);
+			}
+		}
+
+		textlist_foreach(&sl->Text, &it, text) {
+			pcb_object_operation(opfunc, ctx, PCB_OBJ_TEXT, sl, text, text);
+			if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, text)) {
+				pcb_box_bump_box_noflt(&sc->BoundingBox, &text->BoundingBox);
+				pcb_box_bump_box_noflt(&sc->bbox_naked, &text->bbox_naked);
+			}
+		}
+
+		polylist_foreach(&sl->Polygon, &it, poly) {
+			pcb_object_operation(opfunc, ctx, PCB_OBJ_POLY, sl, poly, poly);
+			if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, poly)) {
+				pcb_box_bump_box_noflt(&sc->BoundingBox, &poly->BoundingBox);
+				pcb_box_bump_box_noflt(&sc->bbox_naked, &poly->bbox_naked);
+			}
+		}
+
+	}
+
+
+	/* execute on globals */
+	{
+		pcb_pstk_t *ps;
+		gdl_iterator_t it;
+
+		padstacklist_foreach(&sc->data->padstack, &it, ps) {
+			pcb_object_operation(opfunc, ctx, PCB_OBJ_PSTK, ps, ps, ps);
+			if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, ps)) {
+				pcb_box_bump_box_noflt(&sc->BoundingBox, &ps->BoundingBox);
+				pcb_box_bump_box_noflt(&sc->bbox_naked, &ps->bbox_naked);
+			}
+		}
+	}
+
+	pcb_close_box(&sc->BoundingBox);
+	pcb_close_box(&sc->bbox_naked);
+	if (pcb_data_get_top(Data) != NULL)
+		pcb_r_insert_entry(Data->subc_tree, (pcb_box_t *)sc);
+	DrawSubc(sc);
+
+	switch(batch_undo) {
+		case PCB_SUBCOP_UNDO_SUBC: pcb_undo_unfreeze_add(); pcb_undo_unfreeze_serial(); break;
+		case PCB_SUBCOP_UNDO_BATCH: pcb_undo_unfreeze_serial(); break;
+	}
+
+	return sc;
+}
+
+
+/* copies a subcircuit onto the PCB (a.k.a "paste"). Then does a draw. */
+void *pcb_subcop_copy(pcb_opctx_t *ctx, pcb_subc_t *src)
+{
+	pcb_subc_t *sc;
+
+	sc = pcb_subc_dup_at(PCB, PCB->Data, src, ctx->copy.DeltaX, ctx->copy.DeltaY, pcb_false);
+
+	pcb_undo_add_obj_to_create(PCB_OBJ_SUBC, sc, sc, sc);
+
+	if (ctx->copy.from_outside && conf_core.editor.show_solder_side) {
+		uundo_serial_t last;
+
+		/* move-to-the-other-side is not undoable: it's part of the placement */
+		pcb_undo_inc_serial();
+		last = pcb_undo_serial();
+#warning subc TODO: should not depend on crosshair, because of automatic/scripted placement; test case 1: load subc footprint in buffer, swap side to bottom, place; test case 2: bug_files/cmd_element, execute the cmd while being on the bottom side, without crosshair set subcircuits catapult to negative y
+		pcb_subc_change_side(&sc, 2 * pcb_crosshair.Y - PCB->MaxHeight);
+		pcb_undo_truncate_from(last);
+		
+	}
+
+	pcb_text_dyn_bbox_update(sc->data);
+
+	return sc;
+}
+
+extern pcb_opfunc_t ClipFunctions, MoveFunctions, MoveFunctions_noclip, Rotate90Functions, RotateFunctions, ChgFlagFunctions, ChangeSizeFunctions, ChangeClearSizeFunctions, Change1stSizeFunctions, Change2ndSizeFunctions;
+
+/* drag&drop move when not selected */
+void *pcb_subcop_move(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_board_t *pcb = pcb_data_get_top(sc->data);
+	pcb_data_t *data = (pcb != NULL ? pcb->Data : NULL);
+	pcb_opctx_t clip;
+
+	/* restore all pins/pads at once, at the old location */
+	clip.clip.restore = 1; clip.clip.clear = 0;
+	clip.clip.pcb = ctx->move.pcb;
+	pcb_subc_op(data, sc, &ClipFunctions, &clip, PCB_SUBCOP_UNDO_NORMAL);
+
+	/* do the move without messing with the clipping */
+	pcb_subc_op(data, sc, &MoveFunctions_noclip, ctx, PCB_SUBCOP_UNDO_NORMAL);
+
+	/* clear all pins/pads at once, at the new location */
+	clip.clip.restore = 0; clip.clip.clear = 1;
+	pcb_subc_op(data, sc, &ClipFunctions, &clip, PCB_SUBCOP_UNDO_NORMAL);
+	return sc;
+}
+
+void *pcb_subcop_rotate90(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_board_t *pcb = pcb_data_get_top(sc->data);
+	return pcb_subc_op((pcb != NULL ? pcb->Data : NULL), sc, &Rotate90Functions, ctx, PCB_SUBCOP_UNDO_SUBC);
+}
+
+void *pcb_subcop_rotate(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_data_t *data;
+
+	ctx->rotate.pcb = pcb_data_get_top(sc->data);
+	data = (ctx->rotate.pcb != NULL ? ctx->rotate.pcb->Data : NULL);
+
+	return pcb_subc_op(data, sc, &RotateFunctions, ctx, PCB_SUBCOP_UNDO_SUBC);
+}
+
+void pcb_subc_rotate90(pcb_subc_t *subc, pcb_coord_t cx, pcb_coord_t cy, int steps)
+{
+	pcb_opctx_t ctx;
+
+	ctx.rotate.center_x = cx;
+	ctx.rotate.center_y = cy;
+	ctx.rotate.number = steps;
+	pcb_subcop_rotate90(&ctx, subc);
+}
+
+void pcb_subc_rotate(pcb_subc_t *subc, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina, double angle)
+{
+	pcb_opctx_t ctx;
+
+	ctx.rotate.center_x = cx;
+	ctx.rotate.center_y = cy;
+	ctx.rotate.angle = angle;
+	ctx.rotate.cosa = cosa;
+	ctx.rotate.sina = sina;
+	pcb_subcop_rotate(&ctx, subc);
+}
+
+void pcb_subc_move(pcb_subc_t *sc, pcb_coord_t dx, pcb_coord_t dy, pcb_bool more_to_come)
+{
+	pcb_opctx_t ctx;
+	ctx.move.pcb = NULL;
+	ctx.move.dx = dx;
+	ctx.move.dy = dy;
+	ctx.move.more_to_come = more_to_come;
+	pcb_subcop_move(&ctx, sc);
+}
+
+pcb_bool pcb_selected_subc_change_side(void)
+{
+	pcb_bool change = pcb_false;
+
+	if (PCB->pstk_on && pcb_silk_on(PCB)) {
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) {
+				change |= pcb_subc_change_side(&subc, 2 * pcb_crosshair.Y - PCB->MaxHeight);
+			}
+		}
+		PCB_END_LOOP;
+	}
+	return change;
+}
+
+
+static int subc_relocate_layer_objs(pcb_layer_t *dl, pcb_data_t *src_data, pcb_layer_t *sl, int src_has_real_layer, int dst_is_pcb)
+{
+	pcb_line_t *line;
+	pcb_text_t *text;
+	pcb_poly_t *poly;
+	pcb_arc_t *arc;
+	gdl_iterator_t it;
+	int chg = 0;
+	pcb_data_t *dst_data = dl == NULL ? NULL : dl->parent.data;
+
+	linelist_foreach(&sl->Line, &it, line) {
+		if (src_has_real_layer) {
+			pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, line);
+			pcb_r_delete_entry(sl->line_tree, (pcb_box_t *)line);
+			chg++;
+		}
+		PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, line);
+		if ((dl != NULL) && (dl->line_tree != NULL)) {
+			pcb_r_insert_entry(dl->line_tree, (pcb_box_t *)line);
+			chg++;
+		}
+		if (dst_is_pcb && (dl != NULL))
+			pcb_poly_clear_from_poly(dst_data, PCB_OBJ_LINE, dl, line);
+	}
+
+	arclist_foreach(&sl->Arc, &it, arc) {
+		if (src_has_real_layer) {
+			pcb_poly_restore_to_poly(src_data, PCB_OBJ_ARC, sl, arc);
+			pcb_r_delete_entry(sl->arc_tree, (pcb_box_t *)arc);
+			chg++;
+		}
+		PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, arc);
+		if ((dl != NULL) && (dl->arc_tree != NULL)) {
+			pcb_r_insert_entry(dl->arc_tree, (pcb_box_t *)arc);
+			chg++;
+		}
+		if (dst_is_pcb && (dl != NULL))
+			pcb_poly_clear_from_poly(dst_data, PCB_OBJ_ARC, dl, arc);
+	}
+
+	textlist_foreach(&sl->Text, &it, text) {
+		if (src_has_real_layer) {
+			pcb_poly_restore_to_poly(src_data, PCB_OBJ_LINE, sl, text);
+			pcb_r_delete_entry(sl->text_tree, (pcb_box_t *)text);
+			chg++;
+		}
+		PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, text);
+		if ((dl != NULL) && (dl->text_tree != NULL)) {
+			pcb_r_insert_entry(dl->text_tree, (pcb_box_t *)text);
+			chg++;
+		}
+		if (dst_is_pcb && (dl != NULL))
+			pcb_poly_clear_from_poly(dst_data, PCB_OBJ_TEXT, dl, text);
+	}
+
+	polylist_foreach(&sl->Polygon, &it, poly) {
+		pcb_poly_pprestore(poly);
+		if (src_has_real_layer) {
+			pcb_r_delete_entry(sl->polygon_tree, (pcb_box_t *)poly);
+			chg++;
+		}
+		PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, poly);
+		if ((dl != NULL) && (dl->polygon_tree != NULL)) {
+			pcb_r_insert_entry(dl->polygon_tree, (pcb_box_t *)poly);
+			chg++;
+		}
+		if (dst_is_pcb && (dl != NULL))
+			pcb_poly_ppclear_at(poly, dl);
+	}
+
+	if (!dst_is_pcb) {
+		/* keep only the layer binding match, unbound other aspects */
+		sl->meta.bound.real = NULL;
+		sl->arc_tree = sl->line_tree = sl->text_tree = sl->polygon_tree = NULL;
+		chg++;
+	}
+	else {
+		sl->meta.bound.real = dl;
+		chg++;
+	}
+	return chg;
+}
+
+static int subc_relocate_globals(pcb_data_t *dst, pcb_data_t *new_parent, pcb_subc_t *sc, int dst_is_pcb)
+{
+	pcb_pstk_t *ps;
+	gdl_iterator_t it;
+	int chg = 0;
+
+	padstacklist_foreach(&sc->data->padstack, &it, ps) {
+		const pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+		assert(proto != NULL); /* the prototype must be accessible at the source else we can't add it in the dest */
+		pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		if (sc->data->padstack_tree != NULL)
+			pcb_r_delete_entry(sc->data->padstack_tree, (pcb_box_t *)ps);
+		PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, ps);
+		if ((dst != NULL) && (dst->padstack_tree != NULL))
+			pcb_r_insert_entry(dst->padstack_tree, (pcb_box_t *)ps);
+		if (dst != NULL)
+			ps->proto = pcb_pstk_proto_insert_dup(ps->parent.data, proto, 1);
+		ps->protoi = -1;
+		ps->parent.data = new_parent;
+		if (dst_is_pcb)
+			pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
+		chg++;
+	}
+
+	/* bind globals */
+	if ((dst != NULL) && (dst_is_pcb)) {
+		if (dst->padstack_tree == NULL)
+			dst->padstack_tree = pcb_r_create_tree();
+		sc->data->padstack_tree = dst->padstack_tree;
+		chg++;
+	}
+	else
+		sc->data->padstack_tree = NULL;
+	return chg;
+}
+
+/* change the parent of all global objects to new_parent */
+static void subc_set_parent_globals(pcb_subc_t *sc, pcb_data_t *new_parent)
+{
+	pcb_data_set_parent_globals(sc->data, new_parent);
+}
+
+void *pcb_subcop_move_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	int n;
+	pcb_board_t *dst_top = pcb_data_get_top(ctx->buffer.dst);
+	int dst_is_pcb = ((dst_top != NULL) && (dst_top->Data == ctx->buffer.dst));
+
+	EraseSubc(sc);
+
+	/* move the subc */
+	if ((ctx->buffer.pcb != NULL) && (ctx->buffer.pcb->Data->subc_tree != NULL))
+		pcb_r_delete_entry(ctx->buffer.pcb->Data->subc_tree, (pcb_box_t *)sc);
+
+	pcb_subclist_remove(sc);
+	pcb_subclist_append(&ctx->buffer.dst->subc, sc);
+
+	if (dst_is_pcb) {
+		if (ctx->buffer.dst->subc_tree == NULL)
+			ctx->buffer.dst->subc_tree = pcb_r_create_tree();
+		pcb_r_insert_entry(ctx->buffer.dst->subc_tree, (pcb_box_t *)sc);
+	}
+
+	if (dst_is_pcb)
+		PCB_SET_PARENT(sc, data, ctx->buffer.dst);  /* have to set sc parent before relocate globals so that poly clearings will work */
+
+	/* move layer local */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *sl = sc->data->Layer + n;
+		pcb_layer_t *dl;
+		int src_has_real_layer = (sl->meta.bound.real != NULL);
+
+		if (dst_is_pcb) {
+			dl = pcb_layer_resolve_binding(dst_top, sl);
+			if (dl != NULL) {
+				pcb_layer_link_trees(sl, dl);
+			}
+			else {
+				/* need to create the trees so that move and other ops work */
+				if (sl->line_tree == NULL) sl->line_tree = pcb_r_create_tree();
+				if (sl->arc_tree == NULL) sl->arc_tree = pcb_r_create_tree();
+				if (sl->text_tree == NULL) sl->text_tree = pcb_r_create_tree();
+				if (sl->polygon_tree == NULL) sl->polygon_tree = pcb_r_create_tree();
+				if (!(sl->meta.bound.type & PCB_LYT_VIRTUAL))
+					pcb_message(PCB_MSG_ERROR, "Couldn't bind subc layer %s on buffer move\n", sl->name == NULL ? "<anonymous>" : sl->name);
+			}
+		}
+		else
+			dl = ctx->buffer.dst->Layer + n;
+
+		subc_relocate_layer_objs(dl, ctx->buffer.src, sl, src_has_real_layer, dst_is_pcb);
+	}
+
+	subc_relocate_globals(ctx->buffer.dst, sc->data, sc, dst_is_pcb);
+
+	PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND | PCB_FLAG_SELECTED, sc);
+	PCB_SET_PARENT(sc, data, ctx->buffer.dst);
+	return sc;
+}
+
+void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_subc_t *nsc;
+	nsc = pcb_subc_dup_at(NULL, ctx->buffer.dst, sc, 0, 0, pcb_false);
+
+	if (ctx->buffer.extraflg & PCB_FLAG_SELECTED) {
+		pcb_undo_freeze_serial();
+		pcb_undo_freeze_add();
+		pcb_subc_select(NULL, nsc, PCB_CHGFLG_CLEAR, 0);
+		pcb_undo_unfreeze_add();
+		pcb_undo_unfreeze_serial();
+	}
+
+	return nsc;
+}
+
+/* break buffer subc into pieces */
+pcb_bool pcb_subc_smash_buffer(pcb_buffer_t *buff)
+{
+	pcb_subc_t *subc;
+	int n;
+
+	if (pcb_subclist_length(&buff->Data->subc) != 1)
+		return pcb_false;
+
+	subc = pcb_subclist_first(&buff->Data->subc);
+	pcb_subclist_remove(subc);
+
+	/* relocate to NULL to get trees detached */
+	for(n = 0; n < subc->data->LayerN; n++) {
+		pcb_layer_t *sl = subc->data->Layer + n;
+		int src_has_real_layer = (sl->meta.bound.real != NULL);
+		subc_relocate_layer_objs(NULL, subc->data, sl, src_has_real_layer, 0);
+	}
+	subc_relocate_globals(NULL, NULL, subc, 0);
+
+
+	pcb_data_free(buff->Data);
+	buff->Data = subc->data;
+	buff->Data->parent_type = PCB_PARENT_INVALID;
+	buff->Data->parent.data = NULL;
+
+	subc_set_parent_globals(subc, buff->Data);
+
+	return pcb_true;
+}
+
+int pcb_subc_rebind(pcb_board_t *pcb, pcb_subc_t *sc)
+{
+	int n, chgly = 0;
+	pcb_board_t *dst_top = pcb_data_get_top(sc->data);
+	int dst_is_pcb = ((dst_top != NULL) && (dst_top->Data == pcb->Data));
+
+	if (!dst_is_pcb)
+		return -1;
+
+	EraseSubc(sc);
+
+/* relocate bindings */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *sl = sc->data->Layer + n;
+		pcb_layer_t *dl = pcb_layer_resolve_binding(dst_top, sl);
+		int src_has_real_layer = (sl->meta.bound.real != NULL);
+
+		if (dl != NULL) {
+			if (sl->meta.bound.real == dl)
+				continue;
+
+			/* make sure all trees exist on the dest layer - if these are the first objects there we may need to create them */
+			if (dl->line_tree == NULL) dl->line_tree = pcb_r_create_tree();
+			if (dl->arc_tree == NULL) dl->arc_tree = pcb_r_create_tree();
+			if (dl->text_tree == NULL) dl->text_tree = pcb_r_create_tree();
+			if (dl->polygon_tree == NULL) dl->polygon_tree = pcb_r_create_tree();
+		}
+
+		if (subc_relocate_layer_objs(dl, pcb->Data, sl, src_has_real_layer, 1) > 0)
+			chgly++;
+
+		if (dl != NULL)
+			pcb_layer_link_trees(sl, dl);
+	}
+
+	return chgly;
+}
+
+void pcb_subc_bind_globals(pcb_board_t *pcb, pcb_subc_t *subc)
+{
+	if (pcb->Data->padstack_tree == NULL)
+		pcb->Data->padstack_tree = pcb_r_create_tree();
+	subc->data->padstack_tree = pcb->Data->padstack_tree;
+#warning subc TODO: subc-in-subc: bind subc rtree
+}
+
+void *pcb_subcop_change_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_subc_op(ctx->chgsize.pcb->Data, sc, &ChangeSizeFunctions, ctx, PCB_SUBCOP_UNDO_BATCH);
+	return sc;
+}
+
+void *pcb_subcop_change_clear_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_subc_op(ctx->chgsize.pcb->Data, sc, &ChangeClearSizeFunctions, ctx, PCB_SUBCOP_UNDO_BATCH);
+	return sc;
+}
+
+void *pcb_subcop_change_1st_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_subc_op(ctx->chgsize.pcb->Data, sc, &Change1stSizeFunctions, ctx, PCB_SUBCOP_UNDO_BATCH);
+	return sc;
+}
+
+void *pcb_subcop_change_2nd_size(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	pcb_subc_op(ctx->chgsize.pcb->Data, sc, &Change2ndSizeFunctions, ctx, PCB_SUBCOP_UNDO_BATCH);
+	return sc;
+}
+
+void *pcb_subcop_change_nonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+#warning subc TODO: add undo
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, sc))
+		return NULL;
+	PCB_FLAG_TOGGLE(PCB_FLAG_NONETLIST, sc);
+	return sc;
+}
+
+void *pcb_subcop_change_name(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	void *old;
+	if (sc->refdes != NULL)
+		old = pcb_strdup(sc->refdes); /* strdup because the pcb_attribute_put() is going to free the original */
+	else
+		old = NULL;
+	pcb_attribute_put(&sc->Attributes, "refdes", ctx->chgname.new_name);
+	return old;
+}
+
+void *pcb_subcop_destroy(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	if (ctx->remove.pcb->Data->subc_tree != NULL)
+		pcb_r_delete_entry(ctx->remove.pcb->Data->subc_tree, (pcb_box_t *)sc);
+
+	pcb_subclist_remove(sc);
+	EraseSubc(sc);
+	pcb_subc_free(sc);
+	return NULL;
+}
+
+void *pcb_subcop_remove(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	EraseSubc(sc);
+	pcb_undo_move_obj_to_remove(PCB_OBJ_SUBC, sc, sc, sc);
+	return NULL;
+}
+
+void *pcb_subc_remove(pcb_subc_t *sc)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+/*	PCB_CLEAR_PARENT(subc);*/
+
+	res = pcb_subcop_remove(&ctx, sc);
+	pcb_draw();
+	return res;
+}
+
+void *pcb_subcop_change_flag(pcb_opctx_t *ctx, pcb_subc_t *sc)
+{
+	static pcb_flag_values_t pcb_subc_flags = 0;
+	if (pcb_subc_flags == 0)
+		pcb_subc_flags = pcb_obj_valid_flags(PCB_OBJ_SUBC);
+
+	if (ctx->chgflag.flag == PCB_FLAG_FLOATER) {
+#warning subc TODO: subc-in-subc: can a whole subc be a floater? - add undo!
+		PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, sc);
+		return sc;
+	}
+
+	pcb_subc_op(ctx->chgflag.pcb->Data, sc, &ChgFlagFunctions, ctx, PCB_SUBCOP_UNDO_NORMAL);
+	if ((ctx->chgflag.flag & pcb_subc_flags) == ctx->chgflag.flag)
+		PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, sc);
+	return sc;
+}
+
+
+void pcb_subc_select(pcb_board_t *pcb, pcb_subc_t *sc, pcb_change_flag_t how, int redraw)
+{
+	pcb_opctx_t ctx;
+
+	pcb_undo_add_obj_to_flag(sc);
+
+	ctx.chgflag.pcb = pcb;
+	ctx.chgflag.how = how;
+	ctx.chgflag.flag = PCB_FLAG_SELECTED;
+
+	pcb_subc_op((pcb == NULL ? NULL : pcb->Data), sc, &ChgFlagFunctions, &ctx, PCB_SUBCOP_UNDO_NORMAL);
+	PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, sc);
+	if (redraw)
+		DrawSubc(sc);
+}
+
+/* mirrors the coordinates of a subcircuit; an additional offset is passed */
+void pcb_subc_mirror(pcb_data_t *data, pcb_subc_t *subc, pcb_coord_t y_offs, pcb_bool smirror)
+{
+	if ((data != NULL) && (data->subc_tree != NULL))
+		pcb_r_delete_entry(data->subc_tree, (pcb_box_t *)subc);
+
+	pcb_data_mirror(subc->data, y_offs, smirror ? PCB_TXM_SIDE : PCB_TXM_COORD, smirror);
+	pcb_subc_bbox(subc);
+
+	if ((data != NULL) && (data->subc_tree != NULL))
+		pcb_r_insert_entry(data->subc_tree, (pcb_box_t *)subc);
+}
+
+pcb_bool pcb_subc_change_side(pcb_subc_t **subc, pcb_coord_t yoff)
+{
+	pcb_opctx_t ctx;
+	pcb_subc_t *newsc, *newsc2;
+	int n;
+	pcb_board_t *pcb;
+	pcb_data_t *data, *oldhack;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, *subc))
+		return pcb_false;
+
+	assert((*subc)->parent_type = PCB_PARENT_DATA);
+	data = (*subc)->parent.data;
+	pcb = pcb_data_get_top(data);
+
+	/* move subc into a local "buffer" */
+	memset(&ctx, 0, sizeof(ctx));
+	ctx.buffer.pcb = pcb_data_get_top((*subc)->data);
+	ctx.buffer.dst = pcb_data_new(NULL);
+	ctx.buffer.src = data;
+
+	oldhack = pcb_pstk_data_hack;
+	pcb_pstk_data_hack = ctx.buffer.dst;
+	newsc = pcb_subcop_move_buffer(&ctx, *subc);
+
+
+	/* mirror object geometry and stackup */
+	pcb_subc_mirror(NULL, newsc, yoff, pcb_true);
+	for(n = 0; n < newsc->data->LayerN; n++) {
+		pcb_layer_t *ly = newsc->data->Layer + n;
+		ly->meta.bound.type = pcb_layer_mirror_type(ly->meta.bound.type);
+		ly->meta.bound.stack_offs = -ly->meta.bound.stack_offs;
+	}
+
+	/* place the new subc */
+	newsc2 = pcb_subc_dup_at(pcb, data, newsc, 0, 0, pcb_true);
+	newsc2->ID = newsc->ID;
+	PCB_SET_PARENT(newsc2, data, data);
+	pcb_undo_add_subc_to_otherside(PCB_OBJ_SUBC, newsc2, newsc2, newsc2, yoff);
+
+	*subc = newsc2;
+	pcb_subc_free(newsc);
+	pcb_data_free(ctx.buffer.dst);
+	pcb_pstk_data_hack = oldhack;
+	return pcb_true;
+}
+
+
+	/* in per-side mode, do not show subc mark if it is on the other side */
+#define draw_subc_per_layer() \
+do { \
+	int per_side = 0; \
+	if (cl != NULL) \
+		per_side = *(int *)cl; \
+	if (per_side) { \
+		int on_bottom; \
+		if (pcb_subc_get_side(subc, &on_bottom) == 0) { \
+			if ((!!on_bottom) != (!!conf_core.editor.show_solder_side)) \
+				return PCB_R_DIR_FOUND_CONTINUE; \
+		} \
+	} \
+} while(0)
+
+
+#include "conf_core.h"
+#include "draw.h"
+pcb_r_dir_t draw_subc_mark_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_subc_t *subc = (pcb_subc_t *) b;
+	pcb_box_t *bb = &subc->BoundingBox;
+	int selected = PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc);
+	int freq = conf_core.appearance.subc.dash_freq;
+	const char *nnclr;
+
+	draw_subc_per_layer();
+
+	if (freq > 32)
+		freq = 32;
+
+	nnclr = (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc)) ? conf_core.appearance.color.subc_nonetlist : conf_core.appearance.color.subc;
+	pcb_gui->set_color(pcb_draw_out.fgGC, selected ? conf_core.appearance.color.selected : nnclr);
+	pcb_subc_draw_origin(pcb_draw_out.fgGC, subc, 0, 0);
+
+	if (freq >= 0) {
+		pcb_draw_dashed_line(pcb_draw_out.fgGC, bb->X1, bb->Y1, bb->X2, bb->Y1, freq, pcb_true);
+		pcb_draw_dashed_line(pcb_draw_out.fgGC, bb->X1, bb->Y1, bb->X1, bb->Y2, freq, pcb_true);
+		pcb_draw_dashed_line(pcb_draw_out.fgGC, bb->X2, bb->Y2, bb->X2, bb->Y1, freq, pcb_true);
+		pcb_draw_dashed_line(pcb_draw_out.fgGC, bb->X2, bb->Y2, bb->X1, bb->Y2, freq, pcb_true);
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t draw_subc_label_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_subc_t *subc = (pcb_subc_t *) b;
+	pcb_box_t *bb = &subc->BoundingBox;
+
+	draw_subc_per_layer();
+
+	if (subc->refdes != NULL) {
+		pcb_coord_t x0, y0, dx, dy;
+		pcb_font_t *font = &PCB->fontkit.dflt;
+
+		dx = font->MaxWidth/2;
+		dy = font->MaxHeight/2;
+
+		if (conf_core.editor.view.flip_x) {
+			x0 = bb->X2;
+			dx = -dx;
+		}
+		else
+			x0 = bb->X1;
+
+		if (conf_core.editor.view.flip_y) {
+			y0 = bb->Y2;
+			dy = -dy;
+		}
+		else
+			y0 = bb->Y1;
+
+		if ((conf_core.editor.subc_id != NULL) && (*conf_core.editor.subc_id != '\0')) {
+			static gds_t s;
+			s.used = 0;
+			if (pcb_append_dyntext(&s, (pcb_any_obj_t *)subc, conf_core.editor.subc_id) == 0) {
+				char *curr, *next;
+				pcb_coord_t x = x0, y = y0;
+
+				for(curr = s.array; curr != NULL; curr = next) {
+					int ctrl = 0;
+					next = strchr(curr, '\\');
+					if (next != NULL) {
+						*next = '\0';
+						next++;
+						ctrl = 1;
+					}
+					pcb_term_label_draw(x, y, conf_core.appearance.term_label_size/2, 0, 0, curr, subc->intconn);
+					if (ctrl) {
+						switch(*next) {
+							case 'n': y += dy; x = x0; break;
+						}
+						next++;
+					}
+				}
+			}
+			else
+				pcb_term_label_draw(x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, "<err>", subc->intconn);
+		}
+		else
+			pcb_term_label_draw(x0, y0, conf_core.appearance.term_label_size/2.0, 0, 0, subc->refdes, subc->intconn);
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+void pcb_subc_draw_preview(const pcb_subc_t *sc, const pcb_box_t *drawn_area)
+{
+	int n;
+	pcb_pstk_draw_t ctx;
+	pcb_rtree_it_t it;
+	pcb_any_obj_t *o;
+
+	/* draw copper only first - order doesn't matter */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *layer = &sc->data->Layer[n];
+		if (layer->meta.bound.type & PCB_LYT_COPPER)
+			pcb_draw_layer_under(layer, drawn_area, sc->data);
+	}
+
+	/* draw padstacks */
+	ctx.pcb = NULL;
+	ctx.gid = -1;
+	ctx.is_current = 1;
+	ctx.comb = 0;
+	ctx.shape_mask = PCB_LYT_COPPER | PCB_LYT_TOP;
+	ctx.holetype = PCB_PHOLE_UNPLATED | PCB_PHOLE_PLATED;
+
+	for(o = pcb_rtree_first(&it, sc->data->padstack_tree, (pcb_rtree_box_t *)drawn_area); o != NULL; o = pcb_rtree_next(&it)) {
+		if (pcb_obj_is_under(o, sc->data)) {
+			pcb_pstk_draw_callback((pcb_box_t *)o, &ctx);
+			if (PCB->hole_on)
+				pcb_pstk_draw_hole_callback((pcb_box_t *)o, &ctx);
+		}
+	}
+
+	/* draw silk and outline, above padstacks */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		pcb_layer_t *layer = &sc->data->Layer[n];
+		if (layer->meta.bound.type & (PCB_LYT_SILK | PCB_LYT_OUTLINE))
+			pcb_draw_layer_under(layer, drawn_area, sc->data);
+	}
+
+	/* padstack mark goes on top */
+	for(o = pcb_rtree_first(&it, sc->data->padstack_tree, (pcb_rtree_box_t *)drawn_area); o != NULL; o = pcb_rtree_next(&it))
+		if (pcb_obj_is_under(o, sc->data))
+			pcb_pstk_draw_mark_callback((pcb_box_t *)o, &ctx);
+}
+
+
+pcb_subc_t *pcb_subc_by_refdes(pcb_data_t *base, const char *name)
+{
+#warning subc TODO: hierarchy
+	PCB_SUBC_LOOP(base);
+	{
+		if ((subc->refdes != NULL) && (PCB_NSTRCMP(subc->refdes, name) == 0))
+			return subc;
+	}
+	PCB_END_LOOP;
+	return NULL;
+}
+
+pcb_subc_t *pcb_subc_by_id(pcb_data_t *base, long int ID)
+{
+	/* We can not have an rtree based search here: we are often called
+	   in the middle of an operation, after the subc got already removed
+	   from the rtree. It happens in e.g. undoable padstack operations
+	   where the padstack tries to look up its parent subc by ID, while
+	   the subc is being rotated.
+	
+	   The solution will be the ID hash. */
+#warning subc TODO: hierarchy
+	PCB_SUBC_LOOP(base);
+	{
+		if (subc->ID == ID)
+			return subc;
+	}
+	PCB_END_LOOP;
+	return NULL;
+}
+
+pcb_bool pcb_subc_is_empty(pcb_subc_t *subc)
+{
+	return pcb_data_is_empty(subc->data);
+}
+
+pcb_layer_t *pcb_subc_get_layer(pcb_subc_t *sc, pcb_layer_type_t lyt, pcb_layer_combining_t comb, pcb_bool_t alloc, const char *name, pcb_bool req_name_match)
+{
+	int n;
+
+	/* look for an existing layer with matching lyt and comb first */
+	for(n = 0; n < sc->data->LayerN; n++) {
+		if (sc->data->Layer[n].meta.bound.type != lyt)
+			continue;
+		if ((comb != -1) && (sc->data->Layer[n].comb != comb))
+			continue;
+		if (req_name_match && (strcmp(sc->data->Layer[n].name, name) != 0))
+			continue;
+		return &sc->data->Layer[n];
+	}
+
+	if (!alloc)
+		return NULL;
+
+	if (sc->data->LayerN == PCB_MAX_LAYER)
+		return NULL;
+
+	n = sc->data->LayerN++;
+	if (name == NULL)
+		name = "";
+
+	if (comb == -1) {
+		/* "any" means default, for the given layer type */
+		if (lyt & PCB_LYT_MASK)
+			comb = PCB_LYC_SUB;
+		else
+			comb = 0; /* positive, manual */
+	}
+
+	memset(&sc->data->Layer[n], 0, sizeof(sc->data->Layer[n]));
+	sc->data->Layer[n].name = pcb_strdup(name);
+	sc->data->Layer[n].comb = comb;
+	sc->data->Layer[n].is_bound = 1;
+	sc->data->Layer[n].meta.bound.type = lyt;
+	sc->data->Layer[n].parent.data = sc->data;
+	sc->data->Layer[n].parent_type = PCB_PARENT_DATA;
+	sc->data->Layer[n].type = PCB_OBJ_LAYER;
+	return &sc->data->Layer[n];
+}
+
+void pcb_subc_part_changed_(pcb_any_obj_t *obj)
+{
+	pcb_subc_t *sc = pcb_obj_parent_subc(obj);
+	if (sc == NULL)
+		return;
+
+	/* can't do this incrementally: if a boundary object is smaller than before
+	   it has to make the subc bbox smaller too */
+	pcb_subc_bbox(sc);
+}
+
+
+const char *pcb_subc_name(pcb_subc_t *subc, const char *local_name)
+{
+	const char *val;
+
+	if (local_name != NULL) {
+		val = pcb_attribute_get(&subc->Attributes, local_name);
+		if (val != NULL)
+			return val;
+	}
+	val = pcb_attribute_get(&subc->Attributes, "visible_footprint");
+	if (val != NULL)
+		return val;
+	val = pcb_attribute_get(&subc->Attributes, "footprint");
+	return val;
+}
Index: tags/2.0.1/src/obj_subc.h
===================================================================
--- tags/2.0.1/src/obj_subc.h	(nonexistent)
+++ tags/2.0.1/src/obj_subc.h	(revision 18980)
@@ -0,0 +1,162 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_SUBC_H
+#define PCB_OBJ_SUBC_H
+
+#include <genlist/gendlist.h>
+#include <libminuid/libminuid.h>
+#include <genht/htsp.h>
+#include "obj_common.h"
+#include "layer.h"
+#include "global_typedefs.h"
+
+
+typedef enum pcb_subc_cached_s {
+	PCB_SUBCH_ORIGIN,
+	PCB_SUBCH_X,
+	PCB_SUBCH_Y,
+	PCB_SUBCH_max
+} pcb_subc_cached_t;
+
+struct pcb_subc_s {
+	PCB_ANY_PRIMITIVE_FIELDS;
+	minuid_bin_t uid;
+	pcb_data_t *data;
+	htsp_t terminals;
+	pcb_line_t *aux_cache[PCB_SUBCH_max];
+	pcb_layer_t *aux_layer;
+	const char *refdes; /* cached from attributes for fast lookup */
+	gdl_elem_t link;
+};
+
+pcb_subc_t *pcb_subc_alloc(void);
+pcb_subc_t *pcb_subc_new(void);
+void pcb_subc_free(pcb_subc_t *sc);
+
+void pcb_add_subc_to_data(pcb_data_t *dt, pcb_subc_t *sc);
+
+void pcb_subc_select(pcb_board_t *pcb, pcb_subc_t *sc, pcb_change_flag_t how, int redraw);
+
+void pcb_subc_bbox(pcb_subc_t *sc);
+
+/* convert buffer contents into a subcircuit, in-place; returns 0 on success */
+int pcb_subc_convert_from_buffer(pcb_buffer_t *buffer);
+pcb_bool pcb_subc_smash_buffer(pcb_buffer_t *buff);
+
+void pcb_subc_mirror(pcb_data_t *data, pcb_subc_t *subc, pcb_coord_t y_offs, pcb_bool smirror);
+
+/* changes the side of the board a subc is on; returns pcb_true if done */
+pcb_bool pcb_subc_change_side(pcb_subc_t **subc, pcb_coord_t yoff);
+
+void pcb_subc_rotate(pcb_subc_t *subc, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina, double angle);
+void pcb_subc_rotate90(pcb_subc_t *subc, pcb_coord_t cx, pcb_coord_t cy, int steps);
+
+/* High level move (op wrapper; no undo) */
+void pcb_subc_move(pcb_subc_t *sc, pcb_coord_t dx, pcb_coord_t dy, pcb_bool more_to_come);
+
+/* changes the side of all selected and visible subcs; returns pcb_true if anything has changed */
+pcb_bool pcb_selected_subc_change_side(void);
+
+/* Draw a subcircuit for a preview (silk, copper and outline only) */
+void pcb_subc_draw_preview(const pcb_subc_t *sc, const pcb_box_t *drawn_area);
+
+void pcb_xordraw_subc(pcb_subc_t *sc, pcb_coord_t DX, pcb_coord_t DY, int use_curr_side);
+
+/* Redo the layer binding after the layer binding recipe changed in sc */
+int pcb_subc_rebind(pcb_board_t *pcb, pcb_subc_t *sc);
+
+/* Do the initial global bindings of subc to pcb (rtree links) */
+void pcb_subc_bind_globals(pcb_board_t *pcb, pcb_subc_t *subc);
+
+/* Look up a layer by lyt and comb (and name, if req_name_match is true);
+   if not found and alloc is true, allocate a new layer with the given name.
+   Return NULL on error. */
+pcb_layer_t *pcb_subc_get_layer(pcb_subc_t *sc, pcb_layer_type_t lyt, pcb_layer_combining_t comb, pcb_bool_t alloc, const char *name, pcb_bool req_name_match);
+
+#include "rtree.h"
+pcb_r_dir_t draw_subc_mark_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t draw_subc_label_callback(const pcb_box_t *b, void *cl);
+void DrawSubc(pcb_subc_t *sc);
+void EraseSubc(pcb_subc_t *sc);
+
+/* calculate geometrical properties using the aux layer; return 0 on success */
+int pcb_subc_get_origin(pcb_subc_t *sc, pcb_coord_t *x, pcb_coord_t *y);
+int pcb_subc_get_rotation(pcb_subc_t *sc, double *rot);
+int pcb_subc_get_side(pcb_subc_t *sc, int *on_bottom);
+int pcb_subc_get_host_trans(pcb_subc_t *sc, pcb_host_trans_t *tr);
+
+/* Search for the named subc; name is relative path in hierarchy. Returns
+   NULL if not found */
+pcb_subc_t *pcb_subc_by_refdes(pcb_data_t *base, const char *name);
+
+/* Search subc, "recursively", by ID */
+pcb_subc_t *pcb_subc_by_id(pcb_data_t *base, long int ID);
+
+/* undoable remove */
+void *pcb_subc_remove(pcb_subc_t *sc);
+
+/* In board mode return brd_layer; in footprint edit mode, return the subcircuit
+   layer that matches brd_layer or brd_layer if not found. */
+pcb_layer_t *pcb_loose_subc_layer(pcb_board_t *pcb, pcb_layer_t *brd_layer);
+
+/* Returns whether there's no object in the subc */
+pcb_bool pcb_subc_is_empty(pcb_subc_t *subc);
+
+/* Return the footprint name; if local_name is not NULL, that attribute
+   is queried first; if that doesn't exist, "visible_footprint" and then
+   "footprint" is returned (or NULL if nothing is found) */
+const char *pcb_subc_name(pcb_subc_t *subc, const char *local_name);
+
+
+/* Update the subcircuit (e.g. bbox) after a part of the subcircuit has changed */
+void pcb_subc_part_changed_(pcb_any_obj_t *obj);
+#define pcb_subc_part_changed(obj) pcb_subc_part_changed_((pcb_any_obj_t *)obj)
+
+/*** subc creation helpers ***/
+
+/* Create the aux layer for a subc, set origin to ox;oy and rotation to rot */
+void pcb_subc_create_aux(pcb_subc_t *sc, pcb_coord_t ox, pcb_coord_t oy, double rot, pcb_bool bottom);
+
+/* Create a new point on the aux layer using a given role string in attribute */
+void pcb_subc_create_aux_point(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, const char *role);
+
+/* Look up an aux point and return pcb_true if found; when found, load x and y
+   with the coords of the point. */
+pcb_bool pcb_subc_find_aux_point(pcb_subc_t *sc, const char *role, pcb_coord_t *x, pcb_coord_t *y);
+
+
+pcb_subc_t *pcb_subc_dup_at(pcb_board_t *pcb, pcb_data_t *dst, pcb_subc_t *src, pcb_coord_t dx, pcb_coord_t dy, pcb_bool keep_ids);
+
+/*** loops ***/
+
+#define PCB_SUBC_LOOP(top) do {                                     \
+	pcb_subc_t *subc;                                                 \
+	gdl_iterator_t __it__;                                            \
+	subclist_foreach(&(top)->subc, &__it__, subc) {
+
+
+#endif
Index: tags/2.0.1/src/obj_subc_hash.c
===================================================================
--- tags/2.0.1/src/obj_subc_hash.c	(nonexistent)
+++ tags/2.0.1/src/obj_subc_hash.c	(revision 18980)
@@ -0,0 +1,166 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "data.h"
+#include "layer.h"
+#include "obj_subc.h"
+#include "obj_arc.h"
+#include "obj_line.h"
+#include "obj_text.h"
+#include "obj_poly.h"
+#include "obj_pstk.h"
+
+int pcb_subc_hash_ignore_uid = 0;
+
+int pcb_subc_eq(const pcb_subc_t *sc1, const pcb_subc_t *sc2)
+{
+	pcb_host_trans_t tr1, tr2;
+	int lid;
+	gdl_iterator_t it;
+
+	/* optimization: cheap tests first */
+	if (!pcb_subc_hash_ignore_uid && memcmp(&sc1->uid, &sc2->uid, sizeof(sc1->uid)) != 0) return 0;
+	if (sc1->data->LayerN != sc2->data->LayerN) return 0;
+	if (padstacklist_length(&sc1->data->padstack) != padstacklist_length(&sc2->data->padstack)) return 0;
+	if (pcb_subclist_length(&sc1->data->subc) != pcb_subclist_length(&sc2->data->subc)) return 0;
+
+	for(lid = 0; lid < sc1->data->LayerN; lid++) {
+		pcb_layer_t *ly1 = &sc1->data->Layer[lid];
+		pcb_layer_t *ly2 = &sc2->data->Layer[lid];
+#warning TODO:
+/*		if (!pcb_layer_eq_bound(ly1, tr1.on_bottom, ly2, tr2.on_bottom)) return 0;*/
+		if (arclist_length(&ly1->Arc) != arclist_length(&ly2->Arc)) return 0;
+	}
+
+	pcb_subc_get_host_trans(sc1, &tr1);
+	pcb_subc_get_host_trans(sc2, &tr2);
+
+	for(lid = 0; lid < sc1->data->LayerN; lid++) {
+		pcb_line_t *l1, *l2;
+		pcb_arc_t *a1, *a2;
+		pcb_text_t *t1, *t2;
+		pcb_poly_t *p1, *p2;
+		pcb_layer_t *ly1 = &sc1->data->Layer[lid];
+		pcb_layer_t *ly2 = &sc2->data->Layer[lid];
+
+
+		/* assume order of children objects are the same */
+		a2 = arclist_first(&ly2->Arc);
+		arclist_foreach(&ly1->Arc, &it, a1) {
+			if (!pcb_arc_eq(&tr1, a1, &tr2, a2)) return 0;
+			a2 = arclist_next(a2);
+		}
+
+		l2 = linelist_first(&ly2->Line);
+		linelist_foreach(&ly1->Line, &it, l1) {
+			if (!pcb_line_eq(&tr1, l1, &tr2, l2)) return 0;
+			l2 = linelist_next(l2);
+		}
+
+		t2 = textlist_first(&ly2->Text);
+		textlist_foreach(&ly1->Text, &it, t1) {
+			if (!pcb_text_eq(&tr1, t1, &tr2, t2)) return 0;
+			t2 = textlist_next(t2);
+		}
+
+		p2 = polylist_first(&ly2->Polygon);
+		polylist_foreach(&ly1->Polygon, &it, p1) {
+			if (!pcb_poly_eq(&tr1, p1, &tr2, p2)) return 0;
+			p2 = polylist_next(p2);
+		}
+	}
+
+	/* compare global objects */
+	{
+		pcb_pstk_t *p1, *p2;
+
+		p2 = padstacklist_first(&sc2->data->padstack);
+		padstacklist_foreach(&sc1->data->padstack, &it, p1) {
+			if (!pcb_pstk_eq(&tr1, p1, &tr2, p2)) return 0;
+			p2 = padstacklist_next(p2);
+		}
+#warning subc TODO: subc-in-subc eq check
+	}
+
+	return 1;
+}
+
+unsigned int pcb_subc_hash(const pcb_subc_t *sc)
+{
+	unsigned int hash;
+	int lid;
+	pcb_host_trans_t tr;
+	gdl_iterator_t it;
+
+	pcb_subc_get_host_trans(sc, &tr);
+
+	hash = sc->data->LayerN;
+
+	if (!pcb_subc_hash_ignore_uid)
+		hash ^= murmurhash(&sc->uid, sizeof(sc->uid));
+
+	/* hash layers and layer objects */
+
+	for(lid = 0; lid < sc->data->LayerN; lid++) {
+		pcb_layer_t *ly = &sc->data->Layer[lid];
+
+		pcb_line_t *l;
+		pcb_arc_t *a;
+		pcb_text_t *t;
+		pcb_poly_t *p;
+
+		hash ^= pcb_layer_hash_bound(ly, tr.on_bottom);
+
+		arclist_foreach(&ly->Arc, &it, a)
+			hash ^= pcb_arc_hash(&tr, a);
+
+		linelist_foreach(&ly->Line, &it, l)
+			hash ^= pcb_line_hash(&tr, l);
+
+		textlist_foreach(&ly->Text, &it, t)
+			hash ^= pcb_text_hash(&tr, t);
+
+		polylist_foreach(&ly->Polygon, &it, p)
+			hash ^= pcb_poly_hash(&tr, p);
+	}
+
+	/* hash global objects */
+	{
+		pcb_pstk_t *ps;
+#warning subc TODO: subc in subc: trans in trans
+#if 0
+		pcb_subc_t *s;
+		subclist_foreach(&sc->data->subc, &it, s)
+			hash ^= pcb_subc_hash_(&tr, p);
+#endif
+		padstacklist_foreach(&sc->data->padstack, &it, ps)
+			hash ^= pcb_pstk_hash(&tr, ps);
+	}
+	return hash;
+}
+
Index: tags/2.0.1/src/obj_subc_list.c
===================================================================
--- tags/2.0.1/src/obj_subc_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_subc_list.c	(revision 18980)
@@ -0,0 +1,36 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+
+#include "config.h"
+
+/* include other lists before TDL_DONT_UNDEF makes them pollute the namespace */
+#include "obj_subc.h"
+
+#define TDL_DONT_UNDEF
+#include "obj_subc_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_subc_list.h
===================================================================
--- tags/2.0.1/src/obj_subc_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_subc_list.h	(revision 18980)
@@ -0,0 +1,91 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_SUBC_LIST_H
+#define PCB_OBJ_SUBC_LIST_H
+
+#include "obj_subc.h"
+
+/* List of Elements */
+#define TDL(x)      pcb_subclist_ ## x
+#define TDL_LIST_T  pcb_subclist_t
+#define TDL_ITEM_T  pcb_subc_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define subclist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+#include "ht_subc.h"
+#include <genht/hash.h>
+
+/* When turned on, temporarily ignore the uid in hash()/eq() - useful for
+   imported subcircuits that may have random UIDs */
+extern int pcb_subc_hash_ignore_uid;
+
+
+/* Calculate a hash value using the content of the subc. The hash value
+   represents the actual content of an subc */
+unsigned int pcb_subc_hash(const pcb_subc_t *e);
+
+/* Compare two subcs and return 1 if they are qeual
+   (their uids match and they contain the same objects). */
+int pcb_subc_eq(const pcb_subc_t *sc1, const pcb_subc_t *sc2);
+
+/* Create a new local variable to be used for deduplication */
+#define pcb_subclist_dedup_initializer(state) htscp_t *state = NULL;
+
+/* Do a "continue" if an subc matching loop_elem has been seen already;
+   Typically this is invoked as the first statement of an subclist_foreach()
+   loop. */
+#define pcb_subclist_dedup_skip(state, loop_elem) \
+switch(1) { \
+	case 1: { \
+		if (state == NULL) \
+			state = htscp_alloc(pcb_subc_hash, pcb_subc_eq); \
+		if (htscp_has(state, loop_elem)) \
+			continue; \
+		htscp_set(state, loop_elem, 1); \
+	} \
+}
+
+/* use this after the loop to free all memory used by state */
+#define pcb_subclist_dedup_free(state) \
+	do { \
+		if (state != NULL) { \
+			htscp_free(state); \
+			state = NULL; \
+		} \
+	} while(0)
+
+
+#ifndef LIST_SUBCENT_NOINSTANT
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+#endif
+
+#endif
Index: tags/2.0.1/src/obj_subc_op.h
===================================================================
--- tags/2.0.1/src/obj_subc_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_subc_op.h	(revision 18980)
@@ -0,0 +1,57 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_SUBC_OP_H
+#define PCB_OBJ_SUBC_OP_H
+
+#include "operation.h"
+
+void *pcb_subcop_copy(pcb_opctx_t *ctx, pcb_subc_t *src);
+void *pcb_subcop_move(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_rotate90(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_rotate(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_move_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_add_to_buffer(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_clear_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_1st_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_2nd_size(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_nonetlist(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_change_name(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_destroy(pcb_opctx_t *ctx, pcb_subc_t *sc);
+void *pcb_subcop_remove(pcb_opctx_t *ctx, pcb_subc_t *sc);
+
+void *pcb_subcop_change_flag(pcb_opctx_t *ctx, pcb_subc_t *sc);
+
+typedef enum pcb_subc_op_undo_e {
+	PCB_SUBCOP_UNDO_NORMAL,  /* each part operation is undone separately */
+	PCB_SUBCOP_UNDO_SUBC,    /* the undo for the parent subcircuit will handle each part's undo */
+	PCB_SUBCOP_UNDO_BATCH    /* each part operation has its own undo, but with the same serial */
+} pcb_subc_op_undo_t;
+
+void *pcb_subc_op(pcb_data_t *Data, pcb_subc_t *sc, pcb_opfunc_t *opfunc, pcb_opctx_t *ctx, pcb_subc_op_undo_t batch_undo);
+
+#endif
Index: tags/2.0.1/src/obj_subc_parent.h
===================================================================
--- tags/2.0.1/src/obj_subc_parent.h	(nonexistent)
+++ tags/2.0.1/src/obj_subc_parent.h	(revision 18980)
@@ -0,0 +1,104 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_SUBC_PARENT_H
+#define PCB_OBJ_SUBC_PARENT_H
+
+#include "data.h"
+#include "data_parent.h"
+#include "layer.h"
+
+/* Returns the subc a global (on-data) object is part of (or NULL if not part of any subc) */
+PCB_INLINE pcb_subc_t *pcb_gobj_parent_subc(pcb_parenttype_t pt, pcb_parent_t *p)
+{
+	if (pt != PCB_PARENT_DATA)
+		return NULL;
+
+	if (p->data == NULL)
+		return NULL;
+	
+	if (p->data->parent_type == PCB_PARENT_SUBC)
+		return p->data->parent.subc;
+	return NULL;
+}
+
+/* Returns the subc a layer object is part of (or NULL if not part of any subc) */
+PCB_INLINE pcb_subc_t *pcb_lobj_parent_subc(pcb_parenttype_t pt, pcb_parent_t *p)
+{
+	if (pt != PCB_PARENT_LAYER)
+		return NULL;
+
+	if (p->layer == NULL)
+		return NULL;
+	
+	if (p->layer->parent.data == NULL)
+		return NULL;
+
+	if (p->layer->parent.data->parent_type == PCB_PARENT_SUBC)
+		return p->layer->parent.data->parent.subc;
+	return NULL;
+}
+
+/* Returns the subc an object is part of (or NULL if not part of any subc) */
+PCB_INLINE pcb_subc_t *pcb_obj_parent_subc(pcb_any_obj_t *obj)
+{
+	switch(obj->type) {
+		case PCB_OBJ_PSTK:
+		case PCB_OBJ_SUBC:
+			return pcb_gobj_parent_subc(obj->parent_type, &obj->parent);
+
+		case PCB_OBJ_LINE:
+		case PCB_OBJ_POLY:
+		case PCB_OBJ_TEXT:
+		case PCB_OBJ_ARC:
+			return pcb_lobj_parent_subc(obj->parent_type, &obj->parent);
+
+		default:
+			/* anything else: virtual */
+			return 0;
+	}
+	return 0;
+}
+
+PCB_INLINE pcb_bool_t pcb_obj_is_under(pcb_any_obj_t *obj, pcb_data_t *data)
+{
+	for(;;) {
+		switch(obj->parent_type) {
+			case PCB_PARENT_INVALID: return pcb_false;
+			case PCB_PARENT_BOARD:   return pcb_false;
+			case PCB_PARENT_UI:      return pcb_false; /* shouldn't happen */
+			case PCB_PARENT_LAYER:   if (obj->parent.layer->parent.data == data) return pcb_true; break;
+			case PCB_PARENT_SUBC:    if (obj->parent.subc->data == data) return pcb_true; break;
+			case PCB_PARENT_DATA:    if (obj->parent.data == data) return pcb_true; break;
+		}
+		obj = (pcb_any_obj_t *)pcb_obj_parent_subc(obj);
+		if (obj == NULL)
+			return pcb_false;
+	}
+}
+
+
+#endif
Index: tags/2.0.1/src/obj_term.c
===================================================================
--- tags/2.0.1/src/obj_term.c	(nonexistent)
+++ tags/2.0.1/src/obj_term.c	(revision 18980)
@@ -0,0 +1,355 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <genht/htsp.h>
+#include <genvector/vtp0.h>
+
+#include "change.h"
+#include "compat_misc.h"
+#include "obj_common.h"
+#include "obj_term.h"
+#include "obj_subc_parent.h"
+#include "pcb-printf.h"
+#include "undo.h"
+#include "macro.h"
+#include "polygon.h"
+
+static const char core_term_cookie[] = "core-term";
+
+static int term_name_invalid(const char *tname)
+{
+	if ((tname == NULL) || (*tname == '\0'))
+		return 1;
+	for(;*tname != '\0'; tname++)
+		if ((!isalnum(*tname)) && (*tname != '_') && (*tname != '-'))
+			return 1;
+	return 0;
+}
+
+pcb_term_err_t pcb_term_name_is_valid(const char *tname)
+{
+	if (term_name_invalid(tname))
+		return PCB_TERM_ERR_INVALID_NAME;
+
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+pcb_term_err_t pcb_term_add(htsp_t *terminals, const char *tname, pcb_any_obj_t *obj)
+{
+	htsp_entry_t *e;
+	vtp0_t *v;
+
+	if (obj->term != NULL)
+		return PCB_TERM_ERR_ALREADY_TERMINAL;
+
+	if (term_name_invalid(tname))
+		return PCB_TERM_ERR_INVALID_NAME;
+
+	e = htsp_getentry(terminals, tname);
+	if (e == NULL) {
+		/* allocate new terminal */
+		tname = pcb_strdup(tname);
+		v = malloc(sizeof(vtp0_t));
+		vtp0_init(v);
+		htsp_set(terminals, (char *)tname, v);
+	}
+	else {
+		/* need to use the ones from the hash to avoid extra allocation/leak */
+		v = e->value;
+		tname = e->key;
+	}
+
+	obj->term = tname;
+	vtp0_append(v, obj);
+
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+pcb_term_err_t pcb_term_del(htsp_t *terminals, pcb_any_obj_t *obj)
+{
+	vtp0_t *v;
+	size_t n;
+
+	if (obj->term == NULL)
+		return PCB_TERM_ERR_NOT_IN_TERMINAL;
+
+	v = htsp_get(terminals, obj->term);
+	if (v == NULL)
+		return PCB_TERM_ERR_TERM_NOT_FOUND;
+
+	for(n = 0; n < v->used; n++) {
+		if (v->array[n] == obj) {
+			vtp0_remove(v, n, 1);
+			if (v->used == 0)
+				pcb_term_remove(terminals, obj->term);
+			obj->term = NULL;
+			return PCB_TERM_ERR_SUCCESS;
+		}
+	}
+
+	return PCB_TERM_ERR_NOT_IN_TERMINAL;
+}
+
+static pcb_term_err_t pcb_term_remove_entry(htsp_t *terminals, htsp_entry_t *e)
+{
+	vtp0_t *v = e->value;
+	char *name = e->key;
+	size_t n;
+
+	/* unlink all objects from this terminal */
+	for(n = 0; n < v->used; n++) {
+		pcb_any_obj_t *obj = v->array[n];
+		obj->term = NULL;
+	}
+
+	htsp_delentry(terminals, e);
+	free(name);
+	vtp0_uninit(v);
+	free(v);
+
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+pcb_term_err_t pcb_term_remove(htsp_t *terminals, const char *tname)
+{
+	htsp_entry_t *e;
+
+	e = htsp_getentry(terminals, tname);
+	if (e == NULL)
+		return PCB_TERM_ERR_TERM_NOT_FOUND;
+
+	return pcb_term_remove_entry(terminals, e);
+}
+
+pcb_term_err_t pcb_term_init(htsp_t *terminals)
+{
+	htsp_init(terminals, strhash, strkeyeq);
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+pcb_term_err_t pcb_term_uninit(htsp_t *terminals)
+{
+	htsp_entry_t *e;
+
+	for (e = htsp_first(terminals); e; e = htsp_next(terminals, e))
+		pcb_term_remove_entry(terminals, e);
+	htsp_uninit(terminals);
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+/*** undoable term rename ***/
+
+typedef struct {
+	pcb_any_obj_t *obj;
+	pcb_flag_t Flags;
+	char str[1]; /* must be the last item, spans longer than 1 */
+} term_rename_t;
+
+#warning TODO: get rid of the two parallel type systems
+extern unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
+
+static int undo_term_rename_swap(void *udata)
+{
+	char *old_term = NULL;
+	pcb_subc_t *subc;
+	term_rename_t *r = udata;
+	int res = 0;
+	pcb_flag_t ftmp;
+
+	subc = pcb_obj_parent_subc(r->obj);
+	if (subc == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Undo error: terminal rename: object %ld not part of a terminal\n", r->obj->ID);
+		return -1;
+	}
+
+	/* remove from previous terminal */
+	if (r->obj->term != NULL) {
+		old_term = pcb_strdup(r->obj->term);
+		res |= pcb_term_del(&subc->terminals, r->obj);
+		pcb_obj_invalidate_label(pcb_obj_type2oldtype(r->obj->type), r->obj->parent.any, r->obj, r->obj);
+		r->obj->term = NULL;
+	}
+
+	/* add to new terminal */
+	if (*r->str != '\0') {
+		res |= pcb_term_add(&subc->terminals, r->str, r->obj);
+		pcb_obj_invalidate_label(pcb_obj_type2oldtype(r->obj->type), r->obj->parent.any, r->obj, r->obj);
+	}
+
+	/* swap name: redo & undo are symmetric; we made sure to have enough room for either old or new name */
+	if (old_term == NULL)
+		*r->str = '\0';
+	else
+		strcpy(r->str, old_term);
+
+	free(old_term);
+
+	/* swap flags: redo & undo are symmetric */
+	ftmp = r->obj->Flags;
+	r->obj->Flags = r->Flags;
+	r->Flags = ftmp;
+
+	/* Update the attributes */
+	if (r->obj->term != NULL)
+		pcb_attribute_put(&r->obj->Attributes, "term", r->obj->term);
+	else
+		pcb_attribute_remove(&r->obj->Attributes, "term");
+
+	if (r->obj->type == PCB_OBJ_POLY)
+		pcb_poly_init_clip(r->obj->parent.layer->parent.data, r->obj->parent.layer, (pcb_poly_t *)r->obj);
+
+	return res;
+}
+
+static void undo_term_rename_print(void *udata, char *dst, size_t dst_len)
+{
+	term_rename_t *r = udata;
+	pcb_snprintf(dst, dst_len, "term_rename: %s #%ld to '%s'\n",
+		pcb_obj_type_name(r->obj->type), r->obj->ID, r->str);
+}
+
+static const uundo_oper_t undo_term_rename = {
+	core_term_cookie,
+	NULL, /* free */
+	undo_term_rename_swap,
+	undo_term_rename_swap,
+	undo_term_rename_print
+};
+
+pcb_term_err_t pcb_term_undoable_rename(pcb_board_t *pcb, pcb_any_obj_t *obj, const char *new_name)
+{
+	int nname_len = 0, oname_len = 0, len;
+	term_rename_t *r;
+	pcb_subc_t *subc;
+
+	if ((new_name == NULL) && (obj->term == NULL))
+		return PCB_TERM_ERR_NO_CHANGE;
+
+	if (((new_name != NULL) && (obj->term != NULL)) && (strcmp(new_name, obj->term) == 0))
+		return PCB_TERM_ERR_NO_CHANGE;
+
+	subc = pcb_obj_parent_subc(obj);
+	if (subc == NULL)
+		return PCB_TERM_ERR_NOT_IN_SUBC;
+
+	if (new_name != NULL)
+		nname_len = strlen(new_name);
+
+	if (obj->term != NULL)
+		oname_len = strlen(obj->term);
+
+	len = nname_len > oname_len ? nname_len : oname_len; /* +1 for the terminator is implied by sizeof(->str) */
+
+	r = pcb_undo_alloc(pcb, &undo_term_rename, sizeof(term_rename_t) + len);
+	r->obj = obj;
+	memcpy(r->str, new_name, nname_len+1);
+	r->Flags = obj->Flags;
+	PCB_FLAG_CLEAR(PCB_FLAG_CLEARPOLY, r);
+	undo_term_rename_swap(r);
+
+	if (obj->type == PCB_OBJ_POLY)
+		pcb_poly_init_clip(obj->parent.layer->parent.data, obj->parent.layer, (pcb_poly_t *)obj);
+
+	pcb_undo_inc_serial();
+	return PCB_TERM_ERR_SUCCESS;
+}
+
+#define CHECK_TERM_LY(ob) \
+	do { \
+		if (PCB_NSTRCMP(term_name, ob->term) == 0 && (!same || !PCB_FLAG_TEST(PCB_FLAG_DRC, ob))) { \
+			if (parent_out != NULL) *parent_out = subc; \
+			if (gid_out != NULL) *gid_out = pcb_layer_get_group_(layer); \
+			return (pcb_any_obj_t *)ob; \
+		} \
+	} while(0)
+
+#define CHECK_TERM_GL(ob) \
+	do { \
+		if (PCB_NSTRCMP(term_name, ob->term) == 0 && (!same || !PCB_FLAG_TEST(PCB_FLAG_DRC, ob))) { \
+			if (parent_out != NULL) *parent_out = subc; \
+			if (gid_out != NULL) { \
+				*gid_out = -1; \
+				pcb_layergrp_list(pcb, lyt, gid_out, 1); \
+			} \
+			return (pcb_any_obj_t *)ob; \
+		} \
+	} while(0)
+
+pcb_any_obj_t *pcb_term_find_name(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_bool same, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out)
+{
+	pcb_subc_t *subc;
+	pcb_layer_t *layer;
+	int l;
+
+	if (lyt == 0)
+		return pcb_false;
+
+	if ((subc = pcb_subc_by_refdes(data, subc_name)) == NULL)
+		return NULL;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc))
+		return NULL;
+
+	/* search for global objects: padstack */
+	if (lyt & (PCB_LYT_COPPER | PCB_LYT_MASK | PCB_LYT_OUTLINE)) {
+		PCB_PADSTACK_LOOP(subc->data) {
+			CHECK_TERM_GL(padstack);
+		} PCB_END_LOOP;
+	}
+
+	/* search for layer objects */
+	layer = subc->data->Layer;
+	for (l = 0; l < subc->data->LayerN; l++, layer++) {
+		if ((pcb_layer_flags_(layer) & lyt) == 0)
+			continue;
+		PCB_LINE_LOOP(layer) {
+			CHECK_TERM_LY(line);
+		} PCB_END_LOOP;
+
+		PCB_ARC_LOOP(layer) {
+			CHECK_TERM_LY(arc);
+		} PCB_END_LOOP;
+
+		PCB_POLY_LOOP(layer) {
+			CHECK_TERM_LY(polygon);
+		} PCB_END_LOOP;
+
+
+		PCB_TEXT_LOOP(layer) {
+			CHECK_TERM_LY(text);
+		} PCB_END_LOOP;
+	}
+
+	return NULL;
+}
+
+#undef CHECK_TERM_LY
+#undef CHECK_TERM_GL
+
Index: tags/2.0.1/src/obj_term.h
===================================================================
--- tags/2.0.1/src/obj_term.h	(nonexistent)
+++ tags/2.0.1/src/obj_term.h	(revision 18980)
@@ -0,0 +1,90 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Terminals: within a subcircuit, a terminal is a point of netlist connection.
+   Subcircuit objects can be tagged to belong to a terminal, by terminal ID
+   (similar tothe old pin number concept).
+
+   A terminals is a str->ptr hash, keyed by terminal name. Each item is
+   a vtp0_t vector cotaining one or more pcb_any_obj_t * pointers to the
+   objects making up that terminal.
+*/
+
+#ifndef PCB_OBJ_TERM_H
+#define PCB_OBJ_TERM_H
+
+#include <genht/htsp.h>
+#include <genvector/vtp0.h>
+#include "obj_common.h"
+
+typedef enum pcb_term_err_e {
+	PCB_TERM_ERR_SUCCESS = 0,
+	PCB_TERM_ERR_ALREADY_TERMINAL, /* object is already in a terminal, can not be added in another */
+	PCB_TERM_ERR_NOT_IN_TERMINAL,  /* object is not part of any terminal */
+	PCB_TERM_ERR_TERM_NOT_FOUND,
+	PCB_TERM_ERR_NOT_IN_SUBC,
+	PCB_TERM_ERR_NO_CHANGE,
+	PCB_TERM_ERR_INVALID_NAME
+} pcb_term_err_t;
+
+/* any type that can be a temrinal */
+#define PCB_TERM_OBJ_TYPES \
+	(PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_ARC | PCB_OBJ_PSTK | PCB_OBJ_SUBC)
+
+/* Initialize a clean hash of terminals for a subcircuit */
+pcb_term_err_t pcb_term_init(htsp_t *terminals);
+
+/* Remove all objects from all terminals and destroy the hash */
+pcb_term_err_t pcb_term_uninit(htsp_t *terminals);
+
+/* Determines if tname is a valid terminal name */
+pcb_term_err_t pcb_term_name_is_valid(const char *tname);
+
+/* Add obj to a list of terminals named tname. Sets the term field of obj if
+   it is unset (else fails). */
+pcb_term_err_t pcb_term_add(htsp_t *terminals, const char *tname, pcb_any_obj_t *obj);
+
+/* Remove obj from terminal tname. Sets obj's term to NULL. Removes
+   terminal if it becomes empty. */
+pcb_term_err_t pcb_term_del(htsp_t *terminals, pcb_any_obj_t *obj);
+
+/* Remove a terminal from, calling pcb_term_del() on all objects in it. */
+pcb_term_err_t pcb_term_remove(htsp_t *terminals, const char *tname);
+
+/* Returns a vector of (pcb_any_obj_t *) containing all objects for the named
+   termina. Returns NULL if tname doesn't exist in terminals. */
+#define pcb_term_get(terminals, tname) \
+	(vtp0_t *)htsp_get(terminals, (char *)tname)
+
+/* Rename an object's ->term field in an undoable way */
+pcb_term_err_t pcb_term_undoable_rename(pcb_board_t *pcb, pcb_any_obj_t *obj, const char *new_name);
+
+/* Look up subc_name/term_name on layers matching lyt. Returns the object
+   or NULL if not found. If the *out parameters are non-NULL, load them.
+   Ignores subcircuits marked as nonetlist even if explicitly named. */
+pcb_any_obj_t *pcb_term_find_name(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_type_t lyt, const char *subc_name, const char *term_name, pcb_bool same, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out);
+
+#endif
Index: tags/2.0.1/src/obj_text.c
===================================================================
--- tags/2.0.1/src/obj_text.c	(nonexistent)
+++ tags/2.0.1/src/obj_text.c	(revision 18980)
@@ -0,0 +1,1211 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: text */
+
+#include "config.h"
+
+#include "rotate.h"
+#include "board.h"
+#include "data.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "hid_inlines.h"
+#include "undo.h"
+#include "polygon.h"
+#include "event.h"
+#include "layer.h"
+
+#include "obj_text.h"
+#include "obj_text_op.h"
+#include "obj_text_list.h"
+#include "obj_poly_draw.h"
+#include "obj_arc_draw.h"
+
+#include "obj_subc_parent.h"
+#include "obj_hash.h"
+
+/* TODO: remove this if draw.c is moved here: */
+#include "draw.h"
+#include "obj_line_draw.h"
+#include "obj_text_draw.h"
+#include "conf_core.h"
+
+/*** allocation ***/
+/* get next slot for a text object, allocates memory if necessary */
+pcb_text_t *pcb_text_alloc(pcb_layer_t * layer)
+{
+	pcb_text_t *new_obj;
+
+	new_obj = calloc(sizeof(pcb_text_t), 1);
+	new_obj->type = PCB_OBJ_TEXT;
+	new_obj->Attributes.post_change = pcb_obj_attrib_post_change;
+	PCB_SET_PARENT(new_obj, layer, layer);
+
+	textlist_append(&layer->Text, new_obj);
+
+	return new_obj;
+}
+
+void pcb_text_free(pcb_text_t * data)
+{
+	textlist_remove(data);
+	free(data);
+}
+
+/*** utility ***/
+
+/* creates a new text on a layer */
+pcb_text_t *pcb_text_new(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, const char *TextString, pcb_flag_t Flags)
+{
+	pcb_text_t *text;
+
+	if (TextString == NULL)
+		return NULL;
+
+	text = pcb_text_alloc(Layer);
+	if (text == NULL)
+		return NULL;
+
+	/* copy values, width and height are set by drawing routine
+	 * because at this point we don't know which symbols are available
+	 */
+	text->X = X;
+	text->Y = Y;
+	text->Direction = Direction;
+	text->Flags = Flags;
+	text->Scale = Scale;
+	text->TextString = pcb_strdup(TextString);
+	text->fid = PCBFont->id;
+	text->ID = pcb_create_ID_get();
+
+	pcb_add_text_on_layer(Layer, text, PCBFont);
+
+	return text;
+}
+
+static pcb_text_t *pcb_text_copy_meta(pcb_text_t *dst, pcb_text_t *src)
+{
+	if (dst == NULL)
+		return NULL;
+	pcb_attribute_copy_all(&dst->Attributes, &src->Attributes);
+	return dst;
+}
+
+pcb_text_t *pcb_text_dup(pcb_layer_t *dst, pcb_text_t *src)
+{
+	pcb_text_t *t = pcb_text_new(dst, pcb_font(PCB, src->fid, 1), src->X, src->Y, src->Direction, src->Scale, src->TextString, src->Flags);
+	pcb_text_copy_meta(t, src);
+	return t;
+}
+
+pcb_text_t *pcb_text_dup_at(pcb_layer_t *dst, pcb_text_t *src, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_text_t *t = pcb_text_new(dst, pcb_font(PCB, src->fid, 1), src->X+dx, src->Y+dy, src->Direction, src->Scale, src->TextString, src->Flags);
+	pcb_text_copy_meta(t, src);
+	return t;
+}
+
+void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont)
+{
+	/* calculate size of the bounding box */
+	pcb_text_bbox(PCBFont, text);
+	if (!Layer->text_tree)
+		Layer->text_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) text);
+}
+
+static int pcb_text_render_str_cb(void *ctx, gds_t *s, const char **input)
+{
+	pcb_text_t *text = ctx;
+	char *end, key[128], *path, *attrs;
+	size_t len;
+
+	end = strchr(*input, '%');
+	len = end - *input;
+	if (len > sizeof(key)-1)
+		return -1;
+
+	strncpy(key, *input, len);
+	key[len] = '\0';
+	*input += len+1;
+
+	if ((key[0] == 'a') && (key[1] == '.')) {
+		pcb_attribute_list_t *attr = &text->Attributes;
+		path = key+2;
+		if ((path[0] == 'p') && (memcmp(path, "parent.", 7) == 0)) {
+			pcb_data_t *par = text->parent.layer->parent.data;
+			if (par->parent_type == PCB_PARENT_SUBC)
+				attr = &par->parent.subc->Attributes;
+			else if (par->parent_type == PCB_PARENT_BOARD)
+				attr = &par->parent.board->Attributes;
+			else
+				attr = NULL;
+			path+=7;
+		}
+		if (attr != NULL) {
+			attrs = pcb_attribute_get(attr, path);
+			if (attrs != NULL)
+				gds_append_str(s, attrs);
+		}
+	}
+	return 0;
+}
+
+/* Render the string of a text, doing substitution if needed - don't allocate if there's no subst */
+static unsigned char *pcb_text_render_str(pcb_text_t *text)
+{
+	unsigned char *res;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text))
+		return (unsigned char *)text->TextString;
+
+	res = (unsigned char *)pcb_strdup_subst(text->TextString, pcb_text_render_str_cb, text, PCB_SUBST_PERCENT | PCB_SUBST_CONF);
+	if (res == NULL) {
+		res = (unsigned char *)pcb_strdup("<!>");
+	}
+	else if (*res == '\0') {
+		free(res);
+		res = (unsigned char *)pcb_strdup("<?>");
+	}
+
+	return res;
+}
+
+int pcb_append_dyntext(gds_t *dst, pcb_any_obj_t *obj, const char *fmt)
+{
+	return pcb_subst_append(dst, fmt, pcb_text_render_str_cb, obj, PCB_SUBST_PERCENT | PCB_SUBST_CONF, 0);
+}
+
+/* Free rendered if it was allocated */
+static void pcb_text_free_str(pcb_text_t *text, unsigned char *rendered)
+{
+	if ((unsigned char *)text->TextString != rendered)
+		free(rendered);
+}
+
+
+/* creates the bounding box of a text object */
+void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text)
+{
+	pcb_symbol_t *symbol;
+	unsigned char *s, *rendered = pcb_text_render_str(Text);
+	int i;
+	int space;
+	pcb_coord_t minx, miny, maxx, maxy, tx;
+	pcb_coord_t min_final_radius;
+	pcb_coord_t min_unscaled_radius;
+	pcb_bool first_time = pcb_true;
+	pcb_poly_t *poly;
+
+	s = rendered;
+
+	if (FontPtr == NULL)
+		FontPtr = pcb_font(PCB, Text->fid, 1);
+
+	symbol = FontPtr->Symbol;
+
+	minx = miny = maxx = maxy = tx = 0;
+
+	/* Calculate the bounding box based on the larger of the thicknesses
+	 * the text might clamped at on silk or copper layers.
+	 */
+	min_final_radius = MAX(conf_core.design.min_wid, conf_core.design.min_slk) / 2;
+
+	/* Pre-adjust the line radius for the fact we are initially computing the
+	 * bounds of the un-scaled text, and the thickness clamping applies to
+	 * scaled text.
+	 */
+	min_unscaled_radius = PCB_UNPCB_SCALE_TEXT(min_final_radius, Text->Scale);
+
+	/* calculate size of the bounding box */
+	for (; s && *s; s++) {
+		if (*s <= PCB_MAX_FONTPOSITION && symbol[*s].Valid) {
+			pcb_line_t *line = symbol[*s].Line;
+			pcb_arc_t *arc;
+			for (i = 0; i < symbol[*s].LineN; line++, i++) {
+				/* Clamp the width of text lines at the minimum thickness.
+				 * NB: Divide 4 in thickness calculation is comprised of a factor
+				 *     of 1/2 to get a radius from the center-line, and a factor
+				 *     of 1/2 because some stupid reason we render our glyphs
+				 *     at half their defined stroke-width.
+				 */
+				pcb_coord_t unscaled_radius = MAX(min_unscaled_radius, line->Thickness / 4);
+
+				if (first_time) {
+					minx = maxx = line->Point1.X;
+					miny = maxy = line->Point1.Y;
+					first_time = pcb_false;
+				}
+
+				minx = MIN(minx, line->Point1.X - unscaled_radius + tx);
+				miny = MIN(miny, line->Point1.Y - unscaled_radius);
+				minx = MIN(minx, line->Point2.X - unscaled_radius + tx);
+				miny = MIN(miny, line->Point2.Y - unscaled_radius);
+				maxx = MAX(maxx, line->Point1.X + unscaled_radius + tx);
+				maxy = MAX(maxy, line->Point1.Y + unscaled_radius);
+				maxx = MAX(maxx, line->Point2.X + unscaled_radius + tx);
+				maxy = MAX(maxy, line->Point2.Y + unscaled_radius);
+			}
+
+			for(arc = arclist_first(&symbol[*s].arcs); arc != NULL; arc = arclist_next(arc)) {
+				pcb_arc_bbox(arc);
+				maxx = MAX(maxx, arc->bbox_naked.X2);
+				maxy = MAX(maxy, arc->bbox_naked.Y2);
+			}
+
+			for(poly = polylist_first(&symbol[*s].polys); poly != NULL; poly = polylist_next(poly)) {
+				int n;
+				pcb_point_t *pnt;
+				for(n = 0, pnt = poly->Points; n < poly->PointN; n++,pnt++) {
+					maxx = MAX(maxx, pnt->X + tx);
+					maxy = MAX(maxy, pnt->Y);
+				}
+			}
+
+			space = symbol[*s].Delta;
+		}
+		else {
+			pcb_box_t *ds = &FontPtr->DefaultSymbol;
+			pcb_coord_t w = ds->X2 - ds->X1;
+
+			minx = MIN(minx, ds->X1 + tx);
+			miny = MIN(miny, ds->Y1);
+			minx = MIN(minx, ds->X2 + tx);
+			miny = MIN(miny, ds->Y2);
+			maxx = MAX(maxx, ds->X1 + tx);
+			maxy = MAX(maxy, ds->Y1);
+			maxx = MAX(maxx, ds->X2 + tx);
+			maxy = MAX(maxy, ds->Y2);
+
+			space = w / 5;
+		}
+		tx += symbol[*s].Width + space;
+	}
+
+	/* scale values */
+	minx = PCB_SCALE_TEXT(minx, Text->Scale);
+	miny = PCB_SCALE_TEXT(miny, Text->Scale);
+	maxx = PCB_SCALE_TEXT(maxx, Text->Scale);
+	maxy = PCB_SCALE_TEXT(maxy, Text->Scale);
+
+	/* set upper-left and lower-right corner;
+	 * swap coordinates if necessary (origin is already in 'swapped')
+	 * and rotate box
+	 */
+
+	if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text)) {
+		Text->bbox_naked.X1 = Text->X + minx;
+		Text->bbox_naked.Y1 = Text->Y - miny;
+		Text->bbox_naked.X2 = Text->X + maxx;
+		Text->bbox_naked.Y2 = Text->Y - maxy;
+		pcb_box_rotate90(&Text->bbox_naked, Text->X, Text->Y, (4 - Text->Direction) & 0x03);
+	}
+	else {
+		Text->bbox_naked.X1 = Text->X + minx;
+		Text->bbox_naked.Y1 = Text->Y + miny;
+		Text->bbox_naked.X2 = Text->X + maxx;
+		Text->bbox_naked.Y2 = Text->Y + maxy;
+		pcb_box_rotate90(&Text->bbox_naked, Text->X, Text->Y, Text->Direction);
+	}
+
+	/* the bounding box covers the extent of influence
+	 * so it must include the clearance values too
+	 */
+	Text->BoundingBox.X1 = Text->bbox_naked.X1 - conf_core.design.bloat;
+	Text->BoundingBox.Y1 = Text->bbox_naked.Y1 - conf_core.design.bloat;
+	Text->BoundingBox.X2 = Text->bbox_naked.X2 + conf_core.design.bloat;
+	Text->BoundingBox.Y2 = Text->bbox_naked.Y2 + conf_core.design.bloat;
+	pcb_close_box(&Text->bbox_naked);
+	pcb_close_box(&Text->BoundingBox);
+	pcb_text_free_str(Text, rendered);
+}
+
+int pcb_text_eq(const pcb_host_trans_t *tr1, const pcb_text_t *t1, const pcb_host_trans_t *tr2, const pcb_text_t *t2)
+{
+	if (pcb_neqs(t1->TextString, t2->TextString)) return 0;
+	if (pcb_neqs(t1->term, t2->term)) return 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, t1) && !PCB_FLAG_TEST(PCB_FLAG_FLOATER, t2)) {
+		if (pcb_field_neq(t1, t2, Scale)) return 0;
+		if (pcb_neq_tr_coords(tr1, t1->X, t1->Y, tr2, t2->X, t2->Y)) return 0;
+	}
+
+	return 1;
+}
+
+unsigned int pcb_text_hash(const pcb_host_trans_t *tr, const pcb_text_t *t)
+{
+	unsigned int crd = 0;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_FLOATER, t)) {
+		pcb_coord_t x, y;
+
+		pcb_hash_tr_coords(tr, &x, &y, t->X, t->Y);
+		crd = pcb_hash_coord(x) ^ pcb_hash_coord(y) ^ pcb_hash_coord(t->Scale);
+	}
+
+	return pcb_hash_str(t->TextString) ^ pcb_hash_str(t->term) ^ crd;
+}
+
+
+/*** ops ***/
+/* copies a text to buffer */
+void *pcb_textop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)];
+	pcb_text_t *t = pcb_text_new(layer, pcb_font(PCB, Text->fid, 1), Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, ctx->buffer.extraflg));
+
+	pcb_text_copy_meta(t, Text);
+	return t;
+}
+
+/* moves a text without allocating memory for the name between board and buffer */
+void *pcb_textop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t *dstly, pcb_text_t *text)
+{
+	pcb_layer_t *srcly = text->parent.layer;
+
+	assert(text->parent_type == PCB_PARENT_LAYER);
+	if ((dstly == NULL) || (dstly == srcly)) /* auto layer in dst */
+		dstly = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, srcly)];
+
+	pcb_r_delete_entry(srcly->text_tree, (pcb_box_t *) text);
+	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_TEXT, srcly, text);
+
+	textlist_remove(text);
+	textlist_append(&dstly->Text, text);
+
+	if (!dstly->text_tree)
+		dstly->text_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dstly->text_tree, (pcb_box_t *) text);
+	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_TEXT, dstly, text);
+
+	PCB_SET_PARENT(text, layer, dstly);
+
+	return text;
+}
+
+/* changes the scaling factor of a text object */
+void *pcb_textop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	int value = ctx->chgsize.is_absolute ? PCB_COORD_TO_MIL(ctx->chgsize.value)
+		: Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.value);
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
+		return NULL;
+	if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) {
+		pcb_undo_add_obj_to_size(PCB_OBJ_TEXT, Layer, Text, Text);
+		pcb_text_invalidate_erase(Layer, Text);
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+		Text->Scale = value;
+		pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text);
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+		pcb_text_invalidate_draw(Layer, Text);
+		return Text;
+	}
+	return NULL;
+}
+
+/* sets data of a text object and calculates bounding box; memory must have
+   already been allocated the one for the new string is allocated */
+void *pcb_textop_change_name(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	char *old = Text->TextString;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
+		return NULL;
+	pcb_text_invalidate_erase(Layer, Text);
+	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	Text->TextString = ctx->chgname.new_name;
+
+	/* calculate size of the bounding box */
+	pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text);
+	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
+	return old;
+}
+
+/* changes the clearance flag of a text */
+void *pcb_textop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
+		return NULL;
+	pcb_text_invalidate_erase(Layer, Text);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_TEXT, Layer, Text, Text, pcb_false);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	}
+	pcb_undo_add_obj_to_flag(Text);
+	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARLINE, Text);
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) {
+		pcb_undo_add_obj_to_clear_poly(PCB_OBJ_TEXT, Layer, Text, Text, pcb_true);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	}
+	pcb_text_invalidate_draw(Layer, Text);
+	return Text;
+}
+
+/* sets the clearance flag of a text */
+void *pcb_textop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text))
+		return NULL;
+	return pcb_textop_change_join(ctx, Layer, Text);
+}
+
+/* clears the clearance flag of a text */
+void *pcb_textop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text))
+		return NULL;
+	return pcb_textop_change_join(ctx, Layer, Text);
+}
+
+/* copies a text */
+void *pcb_textop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_text_t *text;
+
+	text = pcb_text_new(Layer, pcb_font(PCB, Text->fid, 1), Text->X + ctx->copy.DeltaX,
+											 Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, PCB_FLAG_FOUND));
+	pcb_text_copy_meta(text, Text);
+	pcb_text_invalidate_draw(Layer, text);
+	pcb_undo_add_obj_to_create(PCB_OBJ_TEXT, Layer, text, text);
+	return text;
+}
+
+/* moves a text object */
+void *pcb_textop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	if (Layer->meta.real.vis) {
+		pcb_text_invalidate_erase(Layer, Text);
+		pcb_text_move(Text, ctx->move.dx, ctx->move.dy);
+		pcb_text_invalidate_draw(Layer, Text);
+	}
+	else
+		pcb_text_move(Text, ctx->move.dx, ctx->move.dy);
+	return Text;
+}
+
+void *pcb_textop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	pcb_textop_move_noclip(ctx, Layer, Text);
+	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	return Text;
+}
+
+void *pcb_textop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	if (ctx->clip.restore) {
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+		pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	}
+	if (ctx->clip.clear) {
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+		pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	}
+	return Text;
+}
+
+
+/* moves a text object between layers; lowlevel routines */
+void *pcb_textop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination)
+{
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Source, text);
+	pcb_r_delete_entry(Source->text_tree, (pcb_box_t *) text);
+
+	textlist_remove(text);
+	textlist_append(&Destination->Text, text);
+
+	if (pcb_layer_flags_(Destination) & PCB_LYT_BOTTOM)
+		PCB_FLAG_SET(PCB_FLAG_ONSOLDER, text); /* get the text mirrored on display */
+	else
+		PCB_FLAG_CLEAR(PCB_FLAG_ONSOLDER, text);
+
+	/* re-calculate the bounding box (it could be mirrored now) */
+	pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+	if (!Destination->text_tree)
+		Destination->text_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Destination->text_tree, (pcb_box_t *) text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Destination, text);
+
+	PCB_SET_PARENT(text, layer, Destination);
+
+	return text;
+}
+
+/* moves a text object between layers */
+void *pcb_textop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, text)) {
+		pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+		return NULL;
+	}
+	if (ctx->move.dst_layer != layer) {
+		pcb_undo_add_obj_to_move_to_layer(PCB_OBJ_TEXT, layer, text, text);
+		if (layer->meta.real.vis)
+			pcb_text_invalidate_erase(layer, text);
+		text = pcb_textop_move_to_layer_low(ctx, layer, text, ctx->move.dst_layer);
+		if (ctx->move.dst_layer->meta.real.vis)
+			pcb_text_invalidate_draw(ctx->move.dst_layer, text);
+	}
+	return text;
+}
+
+/* destroys a text from a layer */
+void *pcb_textop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	free(Text->TextString);
+	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+
+	pcb_text_free(Text);
+
+	return NULL;
+}
+
+/* removes a text from a layer */
+void *pcb_textop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	/* erase from screen */
+	if (Layer->meta.real.vis) {
+		pcb_text_invalidate_erase(Layer, Text);
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text);
+	}
+	pcb_undo_move_obj_to_remove(PCB_OBJ_TEXT, Layer, Text, Text);
+	return NULL;
+}
+
+void *pcb_text_destroy(pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	res = pcb_textop_remove(&ctx, Layer, Text);
+	pcb_draw();
+	return res;
+}
+
+/* rotates a text in 90 degree steps; only the bounding box is rotated,
+   text rotation itself is done by the drawing routines */
+void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	pcb_uint8_t number;
+
+	number = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text) ? (4 - Number) & 3 : Number;
+	PCB_COORD_ROTATE90(Text->X, Text->Y, X, Y, Number);
+
+	/* set new direction, 0..3,
+	 * 0-> to the right, 1-> straight up,
+	 * 2-> to the left, 3-> straight down
+	 */
+	Text->Direction = ((Text->Direction + number) & 0x03);
+
+	/* can't optimize with box rotation because of closed boxes */
+	pcb_text_bbox(pcb_font(PCB, Text->fid, 1), Text);
+}
+
+/* rotates a text object and redraws it */
+void *pcb_textop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_text_invalidate_erase(Layer, Text);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	if (Layer->text_tree != NULL)
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
+	if (Layer->text_tree != NULL)
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
+	return Text;
+}
+
+void *pcb_textop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	int steps;
+	pcb_text_invalidate_erase(Layer, Text);
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	if (Layer->text_tree != NULL)
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+
+	steps = (int)ctx->rotate.angle / 90;
+	if (steps > 0)
+		Text->Direction = ((Text->Direction + steps) & 0x03);
+
+	pcb_rotate(&Text->X, &Text->Y, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
+	pcb_text_bbox(NULL, Text);
+
+	if (Layer->text_tree != NULL)
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, Layer, Text);
+	pcb_text_invalidate_draw(Layer, Text);
+	return Text;
+}
+
+void pcb_text_flip_side(pcb_layer_t *layer, pcb_text_t *text, pcb_coord_t y_offs)
+{
+	if (layer->text_tree != NULL)
+		pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text);
+	text->X = PCB_SWAP_X(text->X);
+	text->Y = PCB_SWAP_Y(text->Y) + y_offs;
+	PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
+	pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+	if (layer->text_tree != NULL)
+		pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text);
+}
+
+void pcb_text_mirror_coords(pcb_layer_t *layer, pcb_text_t *text, pcb_coord_t y_offs)
+{
+	if (layer->text_tree != NULL)
+		pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text);
+	text->X = PCB_SWAP_X(text->X);
+	text->Y = PCB_SWAP_Y(text->Y) + y_offs;
+	pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+	if (layer->text_tree != NULL)
+		pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text);
+}
+
+void pcb_text_set_font(pcb_layer_t *layer, pcb_text_t *text, pcb_font_id_t fid)
+{
+	pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_TEXT, layer, text);
+	pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text);
+	text->fid = fid;
+	pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+	pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text);
+	pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_TEXT, layer, text);
+}
+
+void pcb_text_update(pcb_layer_t *layer, pcb_text_t *text)
+{
+	pcb_data_t *data = layer->parent.data;
+	pcb_board_t *pcb = pcb_data_get_top(data);
+
+	if (pcb == NULL)
+		return;
+
+	pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, layer, text);
+	pcb_r_delete_entry(layer->text_tree, (pcb_box_t *) text);
+	pcb_text_bbox(pcb_font(pcb, text->fid, 1), text);
+	pcb_r_insert_entry(layer->text_tree, (pcb_box_t *) text);
+	pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, layer, text);
+}
+
+void *pcb_textop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	static pcb_flag_values_t pcb_text_flags = 0;
+	if (pcb_text_flags == 0)
+		pcb_text_flags = pcb_obj_valid_flags(PCB_OBJ_TEXT);
+
+	if ((ctx->chgflag.flag & pcb_text_flags) != ctx->chgflag.flag)
+		return NULL;
+	if ((ctx->chgflag.flag & PCB_FLAG_TERMNAME) && (Text->term == NULL))
+		return NULL;
+	pcb_undo_add_obj_to_flag(Text);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_OBJ_TEXT, Text->parent.layer, Text);
+
+	PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Text);
+
+	if (ctx->chgflag.flag & PCB_FLAG_CLEARLINE)
+		pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_OBJ_TEXT, Text->parent.layer, Text);
+
+	return Text;
+}
+
+void *pcb_textop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_text_t *text)
+{
+	pcb_text_name_invalidate_draw(text);
+	return text;
+}
+
+void pcb_text_dyn_bbox_update(pcb_data_t *data)
+{
+	PCB_TEXT_ALL_LOOP(data); {
+		if (PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text))
+			pcb_text_update(layer, text);
+	} PCB_ENDALL_LOOP;
+}
+
+/*** draw ***/
+
+#define MAX_SIMPLE_POLY_POINTS 256
+static void draw_text_poly(pcb_poly_t *poly, pcb_coord_t tx0, pcb_coord_t ty0, pcb_coord_t x0, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, int scale, int direction, int mirror)
+{
+	pcb_coord_t x[MAX_SIMPLE_POLY_POINTS], y[MAX_SIMPLE_POLY_POINTS];
+	int max, n;
+	pcb_point_t *p;
+
+
+	max = poly->PointN;
+	if (max > MAX_SIMPLE_POLY_POINTS) {
+		max = MAX_SIMPLE_POLY_POINTS;
+	}
+
+	/* transform each coordinate */
+	for(n = 0, p = poly->Points; n < max; n++,p++) {
+		x[n] = PCB_SCALE_TEXT(p->X + x0, scale);
+		y[n] = PCB_SCALE_TEXT(p->Y, scale);
+		PCB_COORD_ROTATE90(x[n], y[n], 0, 0, direction);
+
+		if (mirror) {
+			x[n] = PCB_SWAP_SIGN_X(x[n]);
+			y[n] = PCB_SWAP_SIGN_Y(y[n]);
+		}
+
+		x[n] += tx0;
+		y[n] += ty0;
+
+		if (xordraw && (n > 0))
+			pcb_gui->draw_line(pcb_crosshair.GC, xordx + x[n-1], xordy + y[n-1], xordx + x[n], xordy + y[n]);
+		
+	}
+
+	if (!xordraw)
+		pcb_gui->fill_polygon(pcb_draw_out.fgGC, poly->PointN, x, y);
+}
+
+/* Very rough estimation on the full width of the text */
+pcb_coord_t pcb_text_width(pcb_font_t *font, int scale, const unsigned char *string)
+{
+	pcb_coord_t w = 0;
+	const pcb_box_t *defaultsymbol;
+	if (string == NULL)
+		return 0;
+	defaultsymbol = &font->DefaultSymbol;
+	while(*string) {
+		/* draw lines if symbol is valid and data is present */
+		if (*string <= PCB_MAX_FONTPOSITION && font->Symbol[*string].Valid)
+			w += (font->Symbol[*string].Width + font->Symbol[*string].Delta);
+		else
+			w += (defaultsymbol->X2 - defaultsymbol->X1) * 6 / 5;
+		string++;
+	}
+	return PCB_SCALE_TEXT(w, scale);
+}
+
+pcb_coord_t pcb_text_height(pcb_font_t *font, int scale, const unsigned char *string)
+{
+	pcb_coord_t h;
+	if (string == NULL)
+		return 0;
+	h = font->MaxHeight;
+	while(*string != '\0') {
+		if (*string == '\n')
+			h += font->MaxHeight;
+		string++;
+	}
+	return PCB_SCALE_TEXT(h, scale);
+}
+
+
+PCB_INLINE void cheap_text_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t xordx, pcb_coord_t xordy, int direction, int mirror)
+{
+	PCB_COORD_ROTATE90(x1, y1, 0, 0, direction);
+	PCB_COORD_ROTATE90(x2, y2, 0, 0, direction);
+
+	if (mirror) {
+		x1 = PCB_SWAP_SIGN_X(x1);
+		y1 = PCB_SWAP_SIGN_Y(y1);
+		x2 = PCB_SWAP_SIGN_X(x2);
+		y2 = PCB_SWAP_SIGN_Y(y2);
+	}
+
+	x1 += xordx;
+	y1 += xordy;
+	x2 += xordx;
+	y2 += xordy;
+	pcb_gui->draw_line(gc, x1, y1, x2, y2);
+}
+
+
+PCB_INLINE int draw_text_cheap(pcb_font_t *font, pcb_coord_t x0, pcb_coord_t y0, int scale, int direction, int mirror, const unsigned char *string, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, pcb_text_tiny_t tiny)
+{
+	pcb_coord_t w, h = PCB_SCALE_TEXT(font->MaxHeight, scale);
+	if (tiny == PCB_TXT_TINY_HIDE) {
+		if (h <= pcb_gui->coord_per_pix*6) /* <= 6 pixel high: unreadable */
+			return 1;
+	}
+	else if (tiny == PCB_TXT_TINY_CHEAP) {
+		if (h <= pcb_gui->coord_per_pix*2) { /* <= 1 pixel high: draw a single line in the middle */
+			w = pcb_text_width(font, scale, string);
+			if (xordraw) {
+				cheap_text_line(pcb_crosshair.GC, 0, h/2, w, h/2, xordx + x0, xordy + y0, direction, mirror);
+			}
+			else {
+				pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
+				pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_square);
+				cheap_text_line(pcb_draw_out.fgGC, 0, h/2, w, h/2, x0, y0, direction, mirror);
+			}
+			return 1;
+		}
+		else if (h <= pcb_gui->coord_per_pix*4) { /* <= 4 pixel high: draw a mirrored Z-shape */
+			w = pcb_text_width(font, scale, string);
+			if (xordraw) {
+				h /= 4;
+				cheap_text_line(pcb_crosshair.GC, 0, h,   w, h,   xordx + x0, xordy + y0, direction, mirror);
+				cheap_text_line(pcb_crosshair.GC, 0, h,   w, h*3, xordx + x0, xordy + y0, direction, mirror);
+				cheap_text_line(pcb_crosshair.GC, 0, h*3, w, h*3, xordx + x0, xordy + y0, direction, mirror);
+			}
+			else {
+				h /= 4;
+				pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
+				pcb_hid_set_line_cap(pcb_draw_out.fgGC, pcb_cap_square);
+				cheap_text_line(pcb_draw_out.fgGC, 0, h,   w, h,   x0, y0, direction, mirror);
+				cheap_text_line(pcb_draw_out.fgGC, 0, h,   w, h*3, x0, y0, direction, mirror);
+				cheap_text_line(pcb_draw_out.fgGC, 0, h*3, w, h*3, x0, y0, direction, mirror);
+			}
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static void pcb_text_draw_string_(pcb_font_t *font, const unsigned char *string, pcb_coord_t x0, pcb_coord_t y0, int scale, int direction, int mirror, pcb_coord_t min_line_width, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, pcb_text_tiny_t tiny)
+{
+	pcb_coord_t x = 0;
+	pcb_cardinal_t n;
+
+	/* cheap draw */
+	if (tiny != PCB_TXT_TINY_ACCURATE) {
+		if (draw_text_cheap(font, x0, y0, scale, direction, mirror, string, xordraw, xordx, xordy, tiny))
+			return;
+	}
+
+	/* normal draw */
+	while (string && *string) {
+		/* draw lines if symbol is valid and data is present */
+		if (*string <= PCB_MAX_FONTPOSITION && font->Symbol[*string].Valid) {
+			pcb_line_t *line = font->Symbol[*string].Line;
+			pcb_line_t newline;
+			pcb_poly_t *p;
+			pcb_arc_t *a, newarc;
+
+			for (n = font->Symbol[*string].LineN; n; n--, line++) {
+				/* create one line, scale, move, rotate and swap it */
+				newline = *line;
+				newline.Point1.X = PCB_SCALE_TEXT(newline.Point1.X + x, scale);
+				newline.Point1.Y = PCB_SCALE_TEXT(newline.Point1.Y, scale);
+				newline.Point2.X = PCB_SCALE_TEXT(newline.Point2.X + x, scale);
+				newline.Point2.Y = PCB_SCALE_TEXT(newline.Point2.Y, scale);
+				newline.Thickness = PCB_SCALE_TEXT(newline.Thickness, scale / 2);
+				if (newline.Thickness < min_line_width)
+					newline.Thickness = min_line_width;
+
+				pcb_line_rotate90(&newline, 0, 0, direction);
+
+				/* the labels of SMD objects on the bottom
+				 * side haven't been swapped yet, only their offset
+				 */
+				if (mirror) {
+					newline.Point1.X = PCB_SWAP_SIGN_X(newline.Point1.X);
+					newline.Point1.Y = PCB_SWAP_SIGN_Y(newline.Point1.Y);
+					newline.Point2.X = PCB_SWAP_SIGN_X(newline.Point2.X);
+					newline.Point2.Y = PCB_SWAP_SIGN_Y(newline.Point2.Y);
+				}
+				/* add offset and draw line */
+				newline.Point1.X += x0;
+				newline.Point1.Y += y0;
+				newline.Point2.X += x0;
+				newline.Point2.Y += y0;
+				if (xordraw)
+					pcb_gui->draw_line(pcb_crosshair.GC, xordx + newline.Point1.X, xordy + newline.Point1.Y, xordx + newline.Point2.X, xordy + newline.Point2.Y);
+				else
+					pcb_line_draw_(&newline, 0);
+			}
+
+			/* draw the arcs */
+			for(a = arclist_first(&font->Symbol[*string].arcs); a != NULL; a = arclist_next(a)) {
+				newarc = *a;
+
+				newarc.X = PCB_SCALE_TEXT(newarc.X + x, scale);
+				newarc.Y = PCB_SCALE_TEXT(newarc.Y, scale);
+				newarc.Height = newarc.Width = PCB_SCALE_TEXT(newarc.Height, scale);
+				newarc.Thickness = PCB_SCALE_TEXT(newarc.Thickness, scale / 2);
+				if (newarc.Thickness < min_line_width)
+					newarc.Thickness = min_line_width;
+				pcb_arc_rotate90(&newarc, 0, 0, direction);
+
+				if (mirror) {
+					newarc.X = PCB_SWAP_SIGN_X(newarc.X);
+					newarc.Y = PCB_SWAP_SIGN_Y(newarc.Y);
+					newarc.StartAngle = PCB_SWAP_ANGLE(newarc.StartAngle);
+					newarc.Delta = PCB_SWAP_DELTA(newarc.Delta);
+				}
+				newarc.X += x0;
+				newarc.Y += y0;
+				if (xordraw)
+					pcb_gui->draw_arc(pcb_crosshair.GC, xordx + newarc.X, xordy + newarc.Y, newarc.Width, newarc.Height, newarc.StartAngle, newarc.Delta);
+				else
+					pcb_arc_draw_(&newarc, 0);
+			}
+
+			/* draw the polygons */
+			for(p = polylist_first(&font->Symbol[*string].polys); p != NULL; p = polylist_next(p))
+				draw_text_poly(p, x0, y0, x, xordraw, xordx, xordy, scale, direction, mirror);
+
+			/* move on to next cursor position */
+			x += (font->Symbol[*string].Width + font->Symbol[*string].Delta);
+		}
+		else {
+			/* the default symbol is a filled box */
+			pcb_box_t defaultsymbol = font->DefaultSymbol;
+			pcb_coord_t size = (defaultsymbol.X2 - defaultsymbol.X1) * 6 / 5;
+
+			defaultsymbol.X1 = PCB_SCALE_TEXT(defaultsymbol.X1 + x, scale);
+			defaultsymbol.Y1 = PCB_SCALE_TEXT(defaultsymbol.Y1, scale);
+			defaultsymbol.X2 = PCB_SCALE_TEXT(defaultsymbol.X2 + x, scale);
+			defaultsymbol.Y2 = PCB_SCALE_TEXT(defaultsymbol.Y2, scale);
+
+			pcb_box_rotate90(&defaultsymbol, 0, 0, direction);
+
+			/* add offset and draw box */
+			defaultsymbol.X1 += x0;
+			defaultsymbol.Y1 += y0;
+			defaultsymbol.X2 += x0;
+			defaultsymbol.Y2 += y0;
+			if (xordraw)
+				pcb_gui->draw_rect(pcb_crosshair.GC, xordx+defaultsymbol.X1, xordy+defaultsymbol.Y1, xordx+defaultsymbol.X2, xordy+defaultsymbol.Y2);
+			else
+				pcb_gui->fill_rect(pcb_draw_out.fgGC, defaultsymbol.X1, defaultsymbol.Y1, defaultsymbol.X2, defaultsymbol.Y2);
+
+			/* move on to next cursor position */
+			x += size;
+		}
+		string++;
+	}
+}
+
+void pcb_text_draw_string(pcb_font_t *font, const unsigned char *string, pcb_coord_t x0, pcb_coord_t y0, int scale, int direction, int mirror, pcb_coord_t min_line_width, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, pcb_text_tiny_t tiny)
+{
+	pcb_text_draw_string_(font, string, x0, y0, scale, direction, mirror, min_line_width, xordraw, xordx, xordy, tiny);
+}
+
+/* lowlevel drawing routine for text objects */
+static void DrawTextLowLevel_(pcb_text_t *Text, pcb_coord_t min_line_width, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, pcb_text_tiny_t tiny)
+{
+	unsigned char *rendered = pcb_text_render_str(Text);
+	pcb_text_draw_string_(pcb_font(PCB, Text->fid, 1), rendered, Text->X, Text->Y, Text->Scale, Text->Direction, PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, Text), min_line_width, xordraw, xordx, xordy, tiny);
+	pcb_text_free_str(Text, rendered);
+}
+
+static pcb_bool is_text_term_vert(const pcb_text_t *text)
+{
+	pcb_coord_t dx, dy;
+
+	dx = text->BoundingBox.X2 - text->BoundingBox.X1;
+	if (dx < 0)
+		dx = -dx;
+
+	dy = text->BoundingBox.Y2 - text->BoundingBox.Y1;
+	if (dy < 0)
+		dy = -dy;
+
+	return dx < dy;
+}
+
+
+void pcb_text_name_invalidate_draw(pcb_text_t *text)
+{
+	if (text->term != NULL)
+		pcb_term_label_invalidate((text->BoundingBox.X1 + text->BoundingBox.X2)/2, (text->BoundingBox.Y1 + text->BoundingBox.Y2)/2,
+			100.0, is_text_term_vert(text), pcb_true, text->term, text->intconn);
+}
+
+void pcb_text_draw_label(pcb_text_t *text)
+{
+	if (text->term != NULL)
+		pcb_term_label_draw((text->BoundingBox.X1 + text->BoundingBox.X2)/2, (text->BoundingBox.Y1 + text->BoundingBox.Y2)/2,
+			conf_core.appearance.term_label_size, is_text_term_vert(text), pcb_true, text->term, text->intconn);
+}
+
+
+void pcb_text_draw_(pcb_text_t *text, pcb_coord_t min_line_width, int allow_term_gfx, pcb_text_tiny_t tiny)
+{
+	if (delayed_terms_enabled && (text->term != NULL)) {
+		pcb_draw_delay_obj_add((pcb_any_obj_t *)text);
+		return;
+	}
+
+	DrawTextLowLevel_(text, min_line_width, 0, 0, 0, tiny);
+
+	if (text->term != NULL) {
+		if ((allow_term_gfx) && ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, text)))
+			pcb_draw_delay_label_add((pcb_any_obj_t *)text);
+	}
+}
+
+static void pcb_text_draw(pcb_layer_t *layer, pcb_text_t *text, int allow_term_gfx)
+{
+	int min_silk_line;
+	unsigned int flg = 0;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) {
+		if (layer->is_bound) {
+			const char *color;
+			PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 1);
+			pcb_gui->set_color(pcb_draw_out.fgGC, color);
+		}
+		else
+			pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.selected);
+	}
+	else if (PCB_HAS_COLOROVERRIDE(text)) {
+		pcb_gui->set_color(pcb_draw_out.fgGC, text->override_color);
+	}
+	else if (layer->is_bound) {
+		const char *color;
+		PCB_OBJ_COLOR_ON_BOUND_LAYER(color, layer, 0);
+		pcb_gui->set_color(pcb_draw_out.fgGC, color);
+	}
+	else
+		pcb_gui->set_color(pcb_draw_out.fgGC, layer->meta.real.color);
+
+	if ((!layer->is_bound) && (layer->meta.real.grp >= 0))
+		flg = pcb_layergrp_flags(PCB, layer->meta.real.grp);
+
+	if (flg & PCB_LYT_SILK)
+		min_silk_line = conf_core.design.min_slk;
+	else
+		min_silk_line = conf_core.design.min_wid;
+
+	pcb_text_draw_(text, min_silk_line, allow_term_gfx, PCB_TXT_TINY_CHEAP);
+}
+
+pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_layer_t *layer = cl;
+	pcb_text_t *text = (pcb_text_t *) b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	pcb_text_draw(layer, text, 0);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+pcb_r_dir_t pcb_text_draw_term_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_layer_t *layer = cl;
+	pcb_text_t *text = (pcb_text_t *) b;
+
+	if (pcb_hidden_floater((pcb_any_obj_t*)b))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent))
+		return PCB_R_DIR_FOUND_CONTINUE;
+
+	pcb_text_draw(layer, text, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* erases a text on a layer */
+void pcb_text_invalidate_erase(pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_draw_invalidate(Text);
+}
+
+void pcb_text_invalidate_draw(pcb_layer_t *Layer, pcb_text_t *Text)
+{
+	pcb_draw_invalidate(Text);
+}
+
+void pcb_text_draw_xor(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y)
+{
+	DrawTextLowLevel_(text, 0, 1, x, y, PCB_TXT_TINY_CHEAP);
+	if (conf_core.appearance.text_host_bbox) {
+		pcb_gui->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X1, y + text->BoundingBox.Y2);
+		pcb_gui->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X1, y + text->BoundingBox.Y1, x + text->BoundingBox.X2, y + text->BoundingBox.Y1);
+		pcb_gui->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X1, y + text->BoundingBox.Y2);
+		pcb_gui->draw_line(pcb_crosshair.GC, x + text->BoundingBox.X2, y + text->BoundingBox.Y2, x + text->BoundingBox.X2, y + text->BoundingBox.Y1);
+	}
+}
+
+/*** init ***/
+static const char *text_cookie = "obj_text";
+
+/* Recursively update the text objects of data and subcircuits; returns non-zero
+   if a redraw is needed */
+static int pcb_text_font_chg_data(pcb_data_t *data, pcb_font_id_t fid)
+{
+	int need_redraw = 0;
+
+	LAYER_LOOP(data, data->LayerN); {
+		PCB_TEXT_LOOP(layer); {
+			if (text->fid == fid) {
+				pcb_text_update(layer, text);
+				need_redraw = 1;
+			}
+		} PCB_END_LOOP;
+	} PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(data); {
+		int chg = pcb_text_font_chg_data(subc->data, fid);
+		if (chg) {
+			need_redraw = 1;
+			pcb_r_delete_entry(data->subc_tree, (pcb_box_t *)subc);
+			pcb_subc_bbox(subc);
+			pcb_r_insert_entry(data->subc_tree, (pcb_box_t *)subc);
+		}
+	} PCB_END_LOOP;
+
+	return need_redraw;
+}
+
+static void pcb_text_font_chg(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+
+	if ((argc < 2) || (argv[1].type != PCB_EVARG_INT))
+		return;
+
+	if (pcb_text_font_chg_data(PCB->Data, argv[1].d.i))
+		pcb_gui->invalidate_all(); /* can't just redraw the text, as the old text may have been bigger, before the change! */
+
+	pcb_trace("font change %d\n", argv[1].d.i);
+}
+
+void pcb_text_init(void)
+{
+	pcb_event_bind(PCB_EVENT_FONT_CHANGED, pcb_text_font_chg, NULL, text_cookie);
+}
+
+void pcb_text_uninit(void)
+{
+	pcb_event_unbind_allcookie(text_cookie);
+}
Index: tags/2.0.1/src/obj_text.h
===================================================================
--- tags/2.0.1/src/obj_text.h	(nonexistent)
+++ tags/2.0.1/src/obj_text.h	(revision 18980)
@@ -0,0 +1,117 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Drawing primitive: text */
+
+#ifndef PCB_OBJ_TEXT_H
+#define PCB_OBJ_TEXT_H
+
+#include "obj_common.h"
+#include "font.h"
+#include <genvector/gds_char.h>
+
+struct pcb_text_s {
+	PCB_ANY_PRIMITIVE_FIELDS;
+	int Scale;                    /* text scaling in percent */
+	pcb_coord_t X, Y;                   /* origin */
+	pcb_uint8_t Direction;
+	pcb_font_id_t fid;
+	char *TextString;             /* string */
+	gdl_elem_t link;              /* a text is in a list of a layer */
+};
+
+/* These need to be carefully written to avoid overflows, and return
+   a Coord type.  */
+#define PCB_SCALE_TEXT(COORD,TEXTSCALE) ((pcb_coord_t)pcb_round((COORD) * ((double)(TEXTSCALE) / 100.0)))
+#define PCB_UNPCB_SCALE_TEXT(COORD,TEXTSCALE) ((pcb_coord_t)pcb_round((COORD) * (100.0 / (double)(TEXTSCALE))))
+
+pcb_text_t *pcb_text_alloc(pcb_layer_t * layer);
+void pcb_text_free(pcb_text_t * data);
+pcb_text_t *pcb_text_new(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, const char *TextString, pcb_flag_t Flags);
+pcb_text_t *pcb_text_dup(pcb_layer_t *dst, pcb_text_t *src);
+pcb_text_t *pcb_text_dup_at(pcb_layer_t *dst, pcb_text_t *src, pcb_coord_t dx, pcb_coord_t dy);
+void *pcb_text_destroy(pcb_layer_t *Layer, pcb_text_t *Text);
+
+
+/* Add objects without creating them or making any "sanity modifications" to them */
+void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont);
+
+void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text);
+void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+void pcb_text_flip_side(pcb_layer_t *layer, pcb_text_t *text, pcb_coord_t y_offs);
+void pcb_text_mirror_coords(pcb_layer_t *layer, pcb_text_t *text, pcb_coord_t y_offs); /* mirror the coords but do not mirror the text itself (no on-solder) */
+void pcb_text_set_font(pcb_layer_t *layer, pcb_text_t *text, pcb_font_id_t fid);
+void pcb_text_update(pcb_layer_t *layer, pcb_text_t *text);
+
+/* Recalculate the bounding box of all dynamic text objects that are
+   directly under data - useful e.g. on parent attr change */
+void pcb_text_dyn_bbox_update(pcb_data_t *data);
+
+/* hash and eq */
+int pcb_text_eq(const pcb_host_trans_t *tr1, const pcb_text_t *t1, const pcb_host_trans_t *tr2, const pcb_text_t *t2);
+unsigned int pcb_text_hash(const pcb_host_trans_t *tr, const pcb_text_t *t);
+
+/* Append dyntext fmt rendered from the perspective of obj */
+int pcb_append_dyntext(gds_t *dst, pcb_any_obj_t *obj, const char *fmt);
+
+void pcb_text_init(void);
+void pcb_text_uninit(void);
+
+#define pcb_text_move(t,dx,dy)                                       \
+	do {                                                               \
+		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                        \
+		pcb_text_t *__t__ = (t);                                         \
+		PCB_BOX_MOVE_LOWLEVEL(&((__t__)->BoundingBox), __dx__, __dy__);  \
+		PCB_BOX_MOVE_LOWLEVEL(&((__t__)->bbox_naked), __dx__, __dy__);  \
+		PCB_MOVE((__t__)->X, (__t__)->Y, __dx__, __dy__);                \
+	} while(0)
+
+/* Determines if text is actually visible */
+#define pcb_text_is_visible(b, l, t)      ((l)->meta.real.vis)
+
+#define PCB_TEXT_LOOP(layer) do {                                       \
+  pcb_text_t *text;                                                   \
+  gdl_iterator_t __it__;                                            \
+  textlist_foreach(&(layer)->Text, &__it__, text) {
+
+#define	PCB_TEXT_ALL_LOOP(top) do {                        \
+	pcb_cardinal_t l;                                   \
+	pcb_layer_t *layer = (top)->Layer;                  \
+	for (l = 0; l < ((top)->LayerN > 0 ? (top)->LayerN : PCB->Data->LayerN); l++, layer++) \
+	{                                                   \
+		PCB_TEXT_LOOP(layer)
+
+#define PCB_TEXT_VISIBLE_LOOP(board) do {                       \
+	pcb_cardinal_t l;                                        \
+	pcb_layer_t *layer = (board)->Data->Layer;               \
+	for (l = 0; l < ((board)->Data->LayerN > 0 ? (board)->Data->LayerN : PCB->Data->LayerN); l++, layer++)      \
+	{                                                        \
+		PCB_TEXT_LOOP(layer);                                      \
+		if (pcb_text_is_visible((board), layer, text))
+
+#endif
Index: tags/2.0.1/src/obj_text_draw.h
===================================================================
--- tags/2.0.1/src/obj_text_draw.h	(nonexistent)
+++ tags/2.0.1/src/obj_text_draw.h	(revision 18980)
@@ -0,0 +1,57 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard draw of text ***/
+
+
+/* Include rtree.h for these */
+#ifdef PCB_RTREE_H
+pcb_r_dir_t pcb_text_draw_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_text_draw_term_callback(const pcb_box_t * b, void *cl);
+#endif
+
+typedef enum pcb_text_tiny_e { /* How to draw text that is too tiny to be readable */
+	PCB_TXT_TINY_HIDE,         /* do not draw it at all */
+	PCB_TXT_TINY_CHEAP,        /* draw a cheaper, simplified approximation that shows there's something there */
+	PCB_TXT_TINY_ACCURATE      /* always draw text accurately, even if it will end up unreadable */
+} pcb_text_tiny_t;
+
+void pcb_text_draw_(pcb_text_t *Text, pcb_coord_t min_line_width, int allow_term_gfx, pcb_text_tiny_t tiny);
+void pcb_text_invalidate_erase(pcb_layer_t *Layer, pcb_text_t *Text);
+void pcb_text_invalidate_draw(pcb_layer_t *Layer, pcb_text_t *Text);
+void pcb_text_draw_xor(pcb_text_t *text, pcb_coord_t x, pcb_coord_t y);
+void pcb_text_name_invalidate_draw(pcb_text_t *txt);
+void pcb_text_draw_label(pcb_text_t *text);
+
+/* lowlevel drawing routine for text strings */
+void pcb_text_draw_string(pcb_font_t *font, const unsigned char *string, pcb_coord_t x0, pcb_coord_t y0, int scale, int direction, int mirror, pcb_coord_t min_line_width, int xordraw, pcb_coord_t xordx, pcb_coord_t xordy, pcb_text_tiny_t tiny);
+
+/* lowlevel text bounding box calculation */
+pcb_coord_t pcb_text_width(pcb_font_t *font, int scale, const unsigned char *string);
+pcb_coord_t pcb_text_height(pcb_font_t *font, int scale, const unsigned char *string);
+
Index: tags/2.0.1/src/obj_text_list.c
===================================================================
--- tags/2.0.1/src/obj_text_list.c	(nonexistent)
+++ tags/2.0.1/src/obj_text_list.c	(revision 18980)
@@ -0,0 +1,34 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Include these before TDL_DONT_UNDEF to avoid TDL redefs */
+#include "obj_poly_list.h"
+#include "obj_arc_list.h"
+
+#define TDL_DONT_UNDEF
+#include "obj_text_list.h"
+#include <genlist/gentdlist_impl.c>
Index: tags/2.0.1/src/obj_text_list.h
===================================================================
--- tags/2.0.1/src/obj_text_list.h	(nonexistent)
+++ tags/2.0.1/src/obj_text_list.h	(revision 18980)
@@ -0,0 +1,47 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_OBJ_TEXT_LIST_H
+#define PCB_OBJ_TEXT_LIST_H
+
+#include "obj_text.h"
+
+/* List of Text */
+#define TDL(x)      textlist_ ## x
+#define TDL_LIST_T  textlist_t
+#define TDL_ITEM_T  pcb_text_t
+#define TDL_FIELD   link
+#define TDL_SIZE_T  size_t
+#define TDL_FUNC
+
+#define textlist_foreach(list, iterator, loop_elem) \
+	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
+
+
+#include <genlist/gentdlist_impl.h>
+#include <genlist/gentdlist_undef.h>
+
+#endif
Index: tags/2.0.1/src/obj_text_op.h
===================================================================
--- tags/2.0.1/src/obj_text_op.h	(nonexistent)
+++ tags/2.0.1/src/obj_text_op.h	(revision 18980)
@@ -0,0 +1,52 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*** Standard operations on text ***/
+
+#include "operation.h"
+
+void *pcb_textop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_move_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text);
+void *pcb_textop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_change_name(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_move_noclip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_clip(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_text_t * text, pcb_layer_t * Destination);
+void *pcb_textop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text);
+void *pcb_textop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text);
+void *pcb_textop_invalidate_label(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_text_t *text);
+
Index: tags/2.0.1/src/object_act.c
===================================================================
--- tags/2.0.1/src/object_act.c	(nonexistent)
+++ tags/2.0.1/src/object_act.c	(revision 18980)
@@ -0,0 +1,1195 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "data.h"
+#include "board.h"
+#include "tool.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "event.h"
+#include "funchash_core.h"
+
+#include "search.h"
+#include "draw.h"
+#include "copy.h"
+#include "remove.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "layer_vis.h"
+#include "operation.h"
+#include "obj_pstk.h"
+#include "macro.h"
+#include "rotate.h"
+#include "actions.h"
+
+static const char pcb_acts_Attributes[] = "Attributes(Layout|Layer|Element|Subc)\n" "Attributes(Layer,layername)";
+static const char pcb_acth_Attributes[] =
+	"Let the user edit the attributes of the layout, current or given\n"
+	"layer, or selected subcircuit.";
+
+/* %start-doc actions Attributes
+
+This just pops up a dialog letting the user edit the attributes of the
+pcb, a subcircuit, or a layer.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Attributes(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int id;
+	const char *layername;
+	char *buf;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Attributes, id = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Attributes, layername = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	if (!pcb_gui->edit_attributes) {
+		pcb_message(PCB_MSG_ERROR, "This GUI doesn't support Attribute Editing\n");
+		return FGW_ERR_UNKNOWN;
+	}
+
+	switch(id) {
+	case F_Layout:
+		{
+			pcb_gui->edit_attributes("Layout Attributes", &(PCB->Attributes));
+			return 0;
+		}
+
+	case F_Layer:
+		{
+			pcb_layer_t *layer = CURRENT;
+			if (layername) {
+				int i;
+				layer = NULL;
+				for (i = 0; i < pcb_max_layer; i++)
+					if (strcmp(PCB->Data->Layer[i].name, layername) == 0) {
+						layer = &(PCB->Data->Layer[i]);
+						break;
+					}
+				if (layer == NULL) {
+					pcb_message(PCB_MSG_ERROR, "No layer named %s\n", layername);
+					return 1;
+				}
+			}
+			pcb_layer_edit_attrib(layer);
+			return 0;
+		}
+
+	case F_Element:
+	case F_Subc:
+		{
+			int n_found = 0;
+			pcb_subc_t *s = NULL;
+			PCB_SUBC_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) {
+					s = subc;
+					n_found++;
+				}
+			}
+			PCB_END_LOOP;
+			if (n_found > 1) {
+				pcb_message(PCB_MSG_ERROR, "Too many subcircuits selected\n");
+				return 1;
+			}
+			if (n_found == 0) {
+				pcb_coord_t x, y;
+				void *ptrtmp;
+				pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0);
+				if ((pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID)
+					s = (pcb_subc_t *)ptrtmp;
+				else {
+					pcb_message(PCB_MSG_ERROR, "No subcircuit found there\n");
+					PCB_ACT_IRES(-1);
+					return 0;
+				}
+			}
+
+			if (s->refdes != NULL)
+				buf = pcb_strdup_printf("Subcircuit %s Attributes", s->refdes);
+			else
+				buf = pcb_strdup("Unnamed Subcircuit's Attributes");
+
+			pcb_gui->edit_attributes(buf, &(s->Attributes));
+			free(buf);
+			break;
+		}
+
+	default:
+		PCB_ACT_FAIL(Attributes);
+	}
+
+	return 0;
+}
+
+static const char pcb_acts_DisperseElements[] = "DisperseElements(All|Selected)";
+static const char pcb_acth_DisperseElements[] = "Disperses subcircuits.";
+
+/* %start-doc actions DisperseElements
+
+Normally this is used when starting a board, by selecting all subcircuits
+and then dispersing them.  This scatters the subcircuits around the board
+so that you can pick individual ones, rather than have all the
+subcircuits at the same 0,0 coordinate and thus impossible to choose
+from.
+
+%end-doc */
+
+#define GAP PCB_MIL_TO_COORD(100)
+
+static void disperse_obj(pcb_board_t *pcb, pcb_any_obj_t *obj, pcb_coord_t ox, pcb_coord_t oy, pcb_coord_t *dx, pcb_coord_t *dy, pcb_coord_t *minx, pcb_coord_t *miny, pcb_coord_t *maxy)
+{
+	pcb_coord_t newx2, newy2;
+
+	/* If we want to disperse selected objects, maybe we need smarter
+	   code here to avoid putting components on top of others which
+	   are not selected.  For now, I'm assuming that this is typically
+	   going to be used either with a brand new design or a scratch
+	   design holding some new components */
+
+	/* figure out how much to move the object */
+	*dx = *minx - obj->BoundingBox.X1;
+
+	/* snap to the grid */
+	*dx -= (ox + *dx) % pcb->Grid;
+
+	/* and add one grid size so we make sure we always space by GAP or more */
+	*dx += pcb->Grid;
+
+	/* Figure out if this row has room.  If not, start a new row */
+	if (GAP + obj->BoundingBox.X2 + *dx > pcb->MaxWidth) {
+		*miny = *maxy + GAP;
+		*minx = GAP;
+	}
+
+	/* figure out how much to move the object */
+	*dx = *minx - obj->BoundingBox.X1;
+	*dy = *miny - obj->BoundingBox.Y1;
+
+	/* snap to the grid */
+	*dx -= (ox + *dx) % pcb->Grid;
+	*dx += pcb->Grid;
+	*dy -= (oy + *dy) % pcb->Grid;
+	*dy += pcb->Grid;
+
+	/* new X2 and Y2 coords with snapping considered */
+	newx2 = obj->BoundingBox.X2 + *dx;
+	newy2 = obj->BoundingBox.Y2 + *dy;
+
+	/* keep track of how tall this row is */
+	*minx = newx2 + GAP;
+	if (*maxy < newy2) {
+		*maxy = newy2;
+		if (*maxy > PCB->MaxHeight - GAP) {
+			*maxy = GAP;
+			pcb_message(PCB_MSG_WARNING, "The board is too small for hosting all subcircuits,\ndiesperse restarted from the top.\nExpect overlapping subcircuits\n");
+		}
+	}
+}
+
+static fgw_error_t pcb_act_DisperseElements(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t minx = GAP, miny = GAP, maxy = GAP, dx, dy;
+	int all = 0, id;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, DisperseElements, id = fgw_keyword(&argv[1]));
+	PCB_ACT_IRES(0);
+
+	switch(id) {
+		case F_All:      all = 1; break;
+		case F_Selected: all = 0; break;
+		default:         PCB_ACT_FAIL(DisperseElements);
+	}
+
+	pcb_draw_inhibit_inc();
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, subc) && (all || PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc))) {
+			pcb_coord_t ox, oy;
+			if (pcb_subc_get_origin(subc, &ox, &oy) != 0) {
+				ox = (subc->BoundingBox.X1 + subc->BoundingBox.X2)/2;
+				oy = (subc->BoundingBox.Y1 + subc->BoundingBox.Y2)/2;
+			}
+			disperse_obj(PCB, (pcb_any_obj_t *)subc, ox, oy, &dx, &dy, &minx, &miny, &maxy);
+			pcb_move_obj(PCB_OBJ_SUBC, subc, subc, subc, dx, dy);
+		}
+	}
+	PCB_END_LOOP;
+	pcb_draw_inhibit_dec();
+
+	/* done with our action so increment the undo # */
+	pcb_undo_inc_serial();
+
+	pcb_redraw();
+	pcb_board_set_changed_flag(pcb_true);
+
+	return 0;
+}
+
+#undef GAP
+
+static const char pcb_acts_Flip[] = "Flip(Object|Selected)";
+static const char pcb_acth_Flip[] = "Flip a subcircuit to the opposite side of the board.";
+
+/* %start-doc actions Flip
+
+Note that the location of the subcircuit will be symmetric about the
+cursor location; i.e. if the part you are pointing at will still be at
+the same spot once the subcircuit is on the other side.  When flipping
+multiple subcircuits, this retains their positions relative to each
+other, not their absolute positions on the board.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Flip(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	int id;
+	void *ptrtmp;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Flip, id = fgw_keyword(&argv[1]));
+	PCB_ACT_IRES(0);
+
+	pcb_hid_get_coords("Click on Object or Flip Point", &x, &y, 0);
+
+	switch(id) {
+		case F_Object:
+			if ((pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_SUBC, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_OBJ_VOID) {
+				pcb_subc_t *subc = (pcb_subc_t *)ptrtmp;
+				pcb_undo_save_serial();
+				pcb_subc_change_side(&subc, 2 * pcb_crosshair.Y - PCB->MaxHeight);
+				pcb_undo_inc_serial();
+				pcb_draw();
+			}
+			break;
+		case F_Selected:
+		case F_SelectedElements:
+			pcb_undo_save_serial();
+			pcb_selected_subc_change_side();
+			pcb_undo_inc_serial();
+			pcb_draw();
+			break;
+		default:
+			PCB_ACT_FAIL(Flip);
+	}
+	return 0;
+}
+
+static const char pcb_acts_MoveObject[] = "pcb_move_obj(X,Y,[units])";
+static const char pcb_acth_MoveObject[] = "Moves the object under the crosshair.";
+
+/* %start-doc actions MoveObject
+
+The @code{X} and @code{Y} are treated like @code{delta} is for many
+other objects.  For each, if it's prefixed by @code{+} or @code{-},
+then that amount is relative.  Otherwise, it's absolute.  Units can be
+@code{mil} or @code{mm} and is used when X and Y have no unit specified.
+If no unit unspecified in coords or units, nanometer is assumed.
+
+%end-doc */
+
+static fgw_error_t pcb_act_MoveObject(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *units = NULL, *saved;
+	fgw_coords_t *nx, *ny;
+	pcb_coord_t x, y;
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, MoveObject, units = argv[3].val.str);
+	fgw_str2coord_unit_set(saved, units);
+	PCB_ACT_CONVARG(1, FGW_COORDS, MoveObject, nx = fgw_coords(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_COORDS, MoveObject, ny = fgw_coords(&argv[2]));
+	fgw_str2coord_unit_restore(saved);
+
+
+	pcb_hid_get_coords("Select an Object", &x, &y, 0);
+
+	type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_MOVE_TYPES, &ptr1, &ptr2, &ptr3);
+	if (type == PCB_OBJ_VOID) {
+		pcb_message(PCB_MSG_ERROR, "Nothing found under crosshair\n");
+		return 1;
+	}
+
+	if (nx->absolute[0])
+		nx->c[0] -= pcb_crosshair.X;
+	if (ny->absolute[0])
+		ny->c[0] -= pcb_crosshair.Y;
+
+	pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
+	if (conf_core.editor.rubber_band_mode)
+		pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3);
+	if (type == PCB_OBJ_SUBC)
+		pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3);
+	pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx->c[0], ny->c[0]);
+	pcb_board_set_changed_flag(pcb_true);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_MoveToCurrentLayer[] = "MoveToCurrentLayer(Object|SelectedObjects)";
+static const char pcb_acth_MoveToCurrentLayer[] = "Moves objects to the current layer.";
+
+/* %start-doc actions MoveToCurrentLayer
+
+Note that moving an subcircuit from a component layer to a solder layer,
+or from solder to component, won't automatically flip it.  Use the
+@code{Flip()} action to do that.
+
+%end-doc */
+
+static fgw_error_t pcb_act_MoveToCurrentLayer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int id;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, MoveToCurrentLayer, id = fgw_keyword(&argv[1]));
+	PCB_ACT_IRES(0);
+
+	switch(id) {
+		case F_Object:
+			{
+				pcb_coord_t x, y;
+				int type;
+				void *ptr1, *ptr2, *ptr3;
+
+				pcb_hid_get_coords("Select an Object", &x, &y, 0);
+				if ((type = pcb_search_screen(x, y, PCB_MOVETOLAYER_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+					pcb_layer_t *target = CURRENT;
+					pcb_any_obj_t *o = ptr2;
+
+					/* if object is part of a subc (must be a floater!), target layer
+					   shall be within the subc too else we would move out the object from
+					   under the subc to under the board as an unwanted side effect */
+					if ((o->parent_type == PCB_PARENT_LAYER) && (o->parent.layer->parent.data->parent_type == PCB_PARENT_SUBC)) {
+						pcb_subc_t *subc= o->parent.layer->parent.data->parent.subc;
+						pcb_layer_type_t lyt = pcb_layer_flags_(CURRENT);
+						int old_len = subc->data->LayerN;
+						target = pcb_subc_get_layer(subc, lyt, CURRENT->comb, 1, CURRENT->name, 0);
+						if (target == NULL) {
+							pcb_message(PCB_MSG_ERROR, "Failed to find or allocate the matching subc layer\n");
+							break;
+						}
+						if (old_len != subc->data->LayerN)
+							pcb_subc_rebind(PCB, subc); /* had to alloc a new layer */
+					}
+					if (pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, target, pcb_false))
+						pcb_board_set_changed_flag(pcb_true);
+				}
+				break;
+			}
+
+		case F_SelectedObjects:
+		case F_Selected:
+			if (pcb_move_selected_objs_to_layer(CURRENT))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+	}
+	return 0;
+}
+
+static const char pcb_acts_ElementList[] = "ElementList(Start|Done|Need,<refdes>,<footprint>,<value>)";
+static const char pcb_acth_ElementList[] = "Adds the given element if it doesn't already exist.";
+
+/* %start-doc actions elementlist
+
+@table @code
+
+@item Start
+Indicates the start of an subcircuit list; call this before any Need
+actions.
+
+@item Need
+Searches the board for an subcircuit with a matching refdes.
+
+If found, the value and footprint are updated.
+
+If not found, a new subcircuit is created with the given footprint and value.
+
+@item Done
+Compares the list of subcircuits needed since the most recent
+@code{start} with the list of subcircuits actually on the board.  Any
+subcircuits that weren't listed are selected, so that the user may delete
+them.
+
+@end table
+
+%end-doc */
+
+static int number_of_footprints_not_found;
+
+static int parse_layout_attribute_units(const char *name, int def)
+{
+	const char *as = pcb_attrib_get(PCB, name);
+	if (!as)
+		return def;
+	return pcb_get_value(as, NULL, NULL, NULL);
+}
+
+static int subc_differs(pcb_subc_t *sc, const char *expect_name)
+{
+	const char *got_name = pcb_attribute_get(&sc->Attributes, "footprint");
+	if ((expect_name != NULL) && (*expect_name == '\0'))
+		expect_name = NULL;
+	if ((got_name != NULL) && (*got_name == '\0'))
+		got_name = NULL;
+	if ((got_name == NULL) && (expect_name == NULL))
+		return 0;
+	if ((got_name == NULL) || (expect_name == NULL))
+		return 1;
+	return strcmp(got_name, expect_name);
+}
+
+static fgw_error_t pcb_act_ElementList(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	pcb_subc_t *sc;
+	const char *refdes, *value, *footprint;
+	fgw_arg_t rs, args[4];
+	int fx, fy, fs;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, ElementList, op = fgw_keyword(&argv[1]));
+
+#ifdef DEBUG
+	printf("Entered pcb_act_ElementList, executing function %s\n", function);
+#endif
+
+	if (op == F_Start) {
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			PCB_FLAG_CLEAR(PCB_FLAG_FOUND, subc);
+		}
+		PCB_END_LOOP;
+		number_of_footprints_not_found = 0;
+		return 0;
+	}
+
+	if (op == F_Done) {
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, subc)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_FOUND, subc);
+			}
+			else if (!PCB_EMPTY_STRING_P(subc->refdes)) {
+				/* Unnamed elements should remain untouched */
+				PCB_FLAG_SET(PCB_FLAG_SELECTED, subc);
+			}
+		}
+		PCB_END_LOOP;
+		if (number_of_footprints_not_found > 0)
+			pcb_gui->confirm_dialog("Not all requested footprints were found.\n" "See the message log for details", "Ok", NULL);
+		return 0;
+	}
+
+	if (op != F_Need)
+		PCB_ACT_FAIL(ElementList);
+
+	PCB_ACT_CONVARG(2, FGW_STR, ElementList, refdes = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, ElementList, footprint = argv[3].val.str);
+	PCB_ACT_CONVARG(4, FGW_STR, ElementList, value = argv[4].val.str);
+
+	args[0].type = FGW_FUNC;
+	args[0].val.func = NULL;
+	args[1] = argv[3];
+	args[2] = argv[2];
+	args[3] = argv[4];
+	argc = 4;
+
+	/* turn of flip to avoid mirror/rotat confusion */
+	fx = conf_core.editor.view.flip_x;
+	fy = conf_core.editor.view.flip_y;
+	fs = conf_core.editor.show_solder_side;
+	conf_force_set_bool(conf_core.editor.view.flip_x, 0);
+	conf_force_set_bool(conf_core.editor.view.flip_y, 0);
+	conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+#ifdef DEBUG
+	printf("  ... footprint = %s\n", footprint);
+	printf("  ... refdes = %s\n", refdes);
+	printf("  ... value = %s\n", value);
+#endif
+
+	sc = pcb_subc_by_refdes(PCB->Data, refdes);
+
+	if (sc == NULL) {
+		pcb_coord_t nx, ny, d;
+
+#ifdef DEBUG
+		printf("  ... Footprint not on board, need to add it.\n");
+#endif
+		/* Not on board, need to add it. */
+		if (PCB_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) {
+			number_of_footprints_not_found++;
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		nx = PCB->MaxWidth / 2;
+		ny = PCB->MaxHeight / 2;
+		d = MIN(PCB->MaxWidth, PCB->MaxHeight) / 10;
+
+		nx = parse_layout_attribute_units("import::newX", nx);
+		ny = parse_layout_attribute_units("import::newY", ny);
+		d = parse_layout_attribute_units("import::disperse", d);
+
+		if (d > 0) {
+			nx += pcb_rand() % (d * 2) - d;
+			ny += pcb_rand() % (d * 2) - d;
+		}
+
+		if (nx < 0)
+			nx = 0;
+		if (nx >= PCB->MaxWidth)
+			nx = PCB->MaxWidth - 1;
+		if (ny < 0)
+			ny = 0;
+		if (ny >= PCB->MaxHeight)
+			ny = PCB->MaxHeight - 1;
+
+		/* Place components onto center of board. */
+		pcb_crosshair.Y = ny; /* flipping side depends on the crosshair unfortunately */
+		if (pcb_buffer_copy_to_layout(PCB, nx, ny))
+			pcb_board_set_changed_flag(pcb_true);
+	}
+	else if (sc && subc_differs(sc, footprint)) {
+#ifdef DEBUG
+		printf("  ... Footprint on board, but different from footprint loaded.\n");
+#endif
+		int orig_on_top, paste_ok = 0;
+		pcb_coord_t orig_cx, orig_cy;
+		double orig_rot;
+
+		/* Different footprint, we need to swap them out.  */
+		if (PCB_ACT_CALL_C(pcb_act_LoadFootprint, &rs, argc, args) != 0) {
+			number_of_footprints_not_found++;
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		{
+			orig_rot = 0.0;
+			orig_cx = 0;
+			orig_cy = 0;
+			orig_on_top = 0;
+			pcb_subc_get_rotation(sc, &orig_rot);
+			pcb_subc_get_origin(sc, &orig_cx, &orig_cy);
+			pcb_subc_get_side(sc, &orig_on_top);
+			orig_on_top = !orig_on_top;
+		}
+
+		{
+			/* replace with subc */
+			pcb_subc_t *psc;
+			psc = pcb_subclist_first(&(PCB_PASTEBUFFER->Data->subc));
+			if (psc != NULL) {
+				pcb_coord_t pcx = 0, pcy = 0;
+				pcb_subc_get_origin(psc, &pcx, &pcy);
+				if (!orig_on_top)
+					pcb_subc_change_side(&psc, pcy * 2 - PCB->MaxHeight);
+				if (orig_rot != 0) {
+					double cosa, sina;
+					cosa = cos(orig_rot / PCB_RAD_TO_DEG);
+					sina = sin(orig_rot / PCB_RAD_TO_DEG);
+					pcb_subc_rotate(psc, pcx, pcy, cosa, sina, orig_rot);
+				}
+
+/* Not needed anymore: pcb_buffer_copy_to_layout solves this
+				pcb_opctx_t op;
+				op.move.pcb = PCB;
+				op.move.dx = orig_cx;
+				op.move.dy = orig_cy;
+				op.move.dst_layer = NULL;
+				op.move.more_to_come = pcb_true;
+				pcb_subcop_move(&op, psc);
+*/
+				paste_ok = 1;
+			}
+		}
+
+		if (paste_ok) {
+			if (sc != NULL)
+				pcb_subc_remove(sc);
+			if (pcb_buffer_copy_to_layout(PCB, orig_cx, orig_cy))
+				pcb_board_set_changed_flag(pcb_true);
+		}
+	}
+
+	/* Now reload footprint */
+	sc = pcb_subc_by_refdes(PCB->Data, refdes);
+	if (sc != NULL) {
+/*		pcb_attribute_put(&sc->Attributes, "refdes", refdes);*/
+		pcb_attribute_put(&sc->Attributes, "value", value);
+		PCB_FLAG_SET(PCB_FLAG_FOUND, sc);
+	}
+
+#ifdef DEBUG
+	printf(" ... Leaving pcb_act_ElementList.\n");
+#endif
+
+	conf_force_set_bool(conf_core.editor.view.flip_x, fx);
+	conf_force_set_bool(conf_core.editor.view.flip_y, fy);
+	conf_force_set_bool(conf_core.editor.show_solder_side, fs);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_ElementSetAttr[] = "ElementSetAttr(refdes,name[,value])";
+static const char pcb_acth_ElementSetAttr[] = "Sets or clears an element-specific attribute.";
+
+/* %start-doc actions elementsetattr
+
+If a value is specified, the named attribute is added (if not already
+present) or changed (if it is) to the given value.  If the value is
+not specified, the given attribute is removed if present.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ElementSetAttr(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_subc_t *sc;
+	const char *refdes, *name, *value;
+
+	PCB_ACT_CONVARG(1, FGW_STR, ElementList, refdes = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, ElementList, name = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, ElementList, value = argv[3].val.str);
+
+	sc = pcb_subc_by_refdes(PCB->Data, refdes);
+	if (sc == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't find subcircuit with refdes '%s'\n", refdes);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (value != NULL)
+		pcb_attribute_put(&sc->Attributes, name, value);
+	else
+		pcb_attribute_remove(&sc->Attributes, name);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_RipUp[] = "RipUp(All|Selected|Element)";
+static const char pcb_acth_RipUp[] = "Ripup auto-routed tracks";
+
+/* %start-doc actions RipUp
+
+@table @code
+
+@item All
+Removes all lines and vias which were created by the autorouter.
+
+@item Selected
+Removes all selected lines and vias which were created by the
+autorouter.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_RipUp(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	pcb_bool changed = pcb_false;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, RipUp, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_All:
+			PCB_LINE_ALL_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
+					pcb_remove_object(PCB_OBJ_LINE, layer, line, line);
+					changed = pcb_true;
+				}
+			}
+			PCB_ENDALL_LOOP;
+			PCB_ARC_ALL_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)) {
+					pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc);
+					changed = pcb_true;
+				}
+			}
+			PCB_ENDALL_LOOP;
+
+			PCB_PADSTACK_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) {
+					pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack);
+					changed = pcb_true;
+				}
+			}
+			PCB_END_LOOP;
+
+			if (changed) {
+				pcb_undo_inc_serial();
+				pcb_board_set_changed_flag(pcb_true);
+			}
+			break;
+		case F_Selected:
+			PCB_LINE_VISIBLE_LOOP(PCB->Data);
+			{
+				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line)
+						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
+					pcb_remove_object(PCB_OBJ_LINE, layer, line, line);
+					changed = pcb_true;
+				}
+			}
+			PCB_ENDALL_LOOP;
+			if (PCB->pstk_on)
+			PCB_PADSTACK_LOOP(PCB->Data);
+			{
+				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, padstack)
+						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)) {
+					pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack);
+					changed = pcb_true;
+				}
+			}
+			PCB_END_LOOP;
+			if (changed) {
+				pcb_undo_inc_serial();
+				pcb_board_set_changed_flag(pcb_true);
+			}
+			break;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_MinClearGap[] = "MinClearGap(delta)\n" "MinClearGap(Selected, delta)";
+static const char pcb_acth_MinClearGap[] = "Ensures that polygons are a minimum distance from objects.";
+/* %start-doc actions MinClearGap
+
+Checks all specified objects, and increases the polygon clearance if
+needed to ensure a minimum distance between their edges and the
+polygon edges.
+
+%end-doc */
+static void minclr(pcb_data_t *data, pcb_coord_t value, int flags)
+{
+	PCB_SUBC_LOOP(data);
+	{
+		if (!PCB_FLAGS_TEST(flags, subc))
+			continue;
+		minclr(subc->data, value, 0);
+	}
+	PCB_END_LOOP;
+
+	PCB_PADSTACK_LOOP(data);
+	{
+		if (!PCB_FLAGS_TEST(flags, padstack))
+			continue;
+		if (padstack->Clearance < value) {
+			pcb_chg_obj_clear_size(PCB_OBJ_PSTK, padstack, 0, 0, value, 1);
+			pcb_undo_restore_serial();
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_LINE_ALL_LOOP(data);
+	{
+		if (!PCB_FLAGS_TEST(flags, line))
+			continue;
+		if ((line->Clearance != 0) && (line->Clearance < value)) {
+			pcb_chg_obj_clear_size(PCB_OBJ_LINE, layer, line, 0, value, 1);
+			pcb_undo_restore_serial();
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_ALL_LOOP(data);
+	{
+		if (!PCB_FLAGS_TEST(flags, arc))
+			continue;
+		if ((arc->Clearance != 0) && (arc->Clearance < value)) {
+			pcb_chg_obj_clear_size(PCB_OBJ_ARC, layer, arc, 0, value, 1);
+			pcb_undo_restore_serial();
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(data);
+	{
+		if (!PCB_FLAGS_TEST(flags, polygon))
+			continue;
+		if ((polygon->Clearance != 0) && (polygon->Clearance < value)) {
+			pcb_chg_obj_clear_size(PCB_OBJ_POLY, layer, polygon, 0, value, 1);
+			pcb_undo_restore_serial();
+		}
+	}
+	PCB_ENDALL_LOOP;
+}
+
+static fgw_error_t pcb_act_MinClearGap(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function;
+	const char *delta = NULL;
+	const char *units = NULL;
+	pcb_bool absolute;
+	pcb_coord_t value;
+	int flags;
+
+	PCB_ACT_CONVARG(1, FGW_STR, MinClearGap, function = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, MinClearGap, delta = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, MinClearGap, delta = argv[3].val.str);
+
+	if (pcb_strcasecmp(function, "Selected") == 0)
+		flags = PCB_FLAG_SELECTED;
+	else {
+		units = delta;
+		delta = function;
+		flags = 0;
+	}
+	value = 2 * pcb_get_value(delta, units, &absolute, NULL);
+
+	pcb_undo_save_serial();
+	minclr(PCB->Data, value, flags);
+	pcb_undo_restore_serial();
+	pcb_undo_inc_serial();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_MoveLayer[] = "MoveLayer(old,new)";
+static const char pcb_acth_MoveLayer[] = "Moves/Creates/Deletes Layers.";
+
+/* %start-doc actions MoveLayer
+
+Moves a layer, creates a new layer, or deletes a layer.
+
+@table @code
+
+@item old
+The is the layer number to act upon.  Allowed values are:
+@table @code
+
+@item c
+Currently selected layer.
+
+@item -1
+Create a new layer.
+
+@item number
+An existing layer number.
+
+@end table
+
+@item new
+Specifies where to move the layer to.  Allowed values are:
+@table @code
+@item -1
+Deletes the layer.
+
+@item up
+Moves the layer up.
+
+@item down
+Moves the layer down.
+
+@item step+
+Moves the layer towards the end of its group's list.
+
+@item step-
+Moves the layer towards the beginning of its group's list.
+
+@item c
+Creates a new layer.
+
+@end table
+
+@end table
+
+%end-doc */
+extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
+fgw_error_t pcb_act_MoveLayer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1;
+	int old_index, new_index;
+
+	PCB_ACT_CONVARG(1, FGW_STR, MoveLayer, a0 = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, MoveLayer, a1 = argv[2].val.str);
+
+	if (strcmp(a0, "c") == 0)
+		old_index = INDEXOFCURRENT;
+	else
+		old_index = atoi(a0);
+
+	if (strcmp(a1, "c") == 0) {
+		new_index = INDEXOFCURRENT;
+		if (new_index < 0)
+			new_index = 0;
+	}
+	else if (strcmp(a1, "gi") == 0) {
+		PCB_ACT_IRES(pcb_layer_move(PCB, -1, 0, pcb_actd_EditGroup_gid));
+		return 0;
+	}
+	else if (strcmp(a1, "ga") == 0) {
+		PCB_ACT_IRES(pcb_layer_move(PCB, -1, 1, pcb_actd_EditGroup_gid));
+		return 0;
+	}
+	else if (strcmp(a1, "up") == 0) {
+		new_index = INDEXOFCURRENT - 1;
+		if (new_index < 0) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+	else if (strcmp(a1, "down") == 0) {
+		new_index = INDEXOFCURRENT + 1;
+		if (new_index >= pcb_max_layer) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+	else if (strncmp(a1, "step", 4) == 0) {
+		pcb_layer_t *l = CURRENT;
+		pcb_layergrp_t *g = pcb_get_layergrp(PCB, l->meta.real.grp);
+		if (g == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Invalid layer group\n");
+			return 1;
+		}
+		switch(a1[4]) {
+			case '+': return pcb_layergrp_step_layer(PCB, g, pcb_layer_id(PCB->Data, l), +1); break;
+			case '-': return pcb_layergrp_step_layer(PCB, g, pcb_layer_id(PCB->Data, l), -1); break;
+		}
+		pcb_message(PCB_MSG_ERROR, "Invalid step direction\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	else
+		new_index = atoi(a1);
+
+	if (new_index < 0) {
+		if (pcb_layer_flags(PCB, old_index) & PCB_LYT_SILK) {
+			pcb_layer_t *l = pcb_get_layer(PCB->Data, old_index);
+			pcb_layergrp_t *g = pcb_get_layergrp(PCB, l->meta.real.grp);
+			if (g->len == 1) {
+				pcb_message(PCB_MSG_ERROR, "Removing this layer would result in an empty top or bottom silk group, which is not possible at the moment.\n");
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+		}
+	}
+
+	PCB_ACT_IRES(pcb_layer_move(PCB, old_index, new_index, -1));
+	return 0;
+}
+
+static const char pcb_acts_CreateText[] = "CreateText(layer, fontID, X, Y, direction, scale, text)\n";
+static const char pcb_acth_CreateText[] = "Create a new text object";
+static fgw_error_t pcb_act_CreateText(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *txt;
+	pcb_coord_t x, y;
+	pcb_layer_t *ly;
+	int fid, dir, scale;
+	pcb_text_t *t;
+
+	PCB_ACT_CONVARG(1, FGW_LAYER, CreateText, ly = fgw_layer(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_INT, CreateText, fid = argv[2].val.nat_int);
+	PCB_ACT_CONVARG(3, FGW_COORD, CreateText, x = fgw_coord(&argv[3]));
+	PCB_ACT_CONVARG(4, FGW_COORD, CreateText, y = fgw_coord(&argv[4]));
+	PCB_ACT_CONVARG(5, FGW_INT, CreateText, dir = argv[5].val.nat_int);
+	PCB_ACT_CONVARG(6, FGW_INT, CreateText, scale = argv[6].val.nat_int);
+	PCB_ACT_CONVARG(7, FGW_STR, CreateText, txt = argv[7].val.str);
+
+	if (scale < 1) {
+		pcb_message(PCB_MSG_ERROR, "Invalid scale (must be larger than zero)\n");
+		return 1;
+	}
+
+	if ((dir < 0) || (dir > 3)) {
+		pcb_message(PCB_MSG_ERROR, "Invalid direction (must be 0, 1, 2 or 3)\n");
+		return 1;
+	}
+
+	t = pcb_text_new(ly, pcb_font(PCB, fid, 1), x, y, dir, scale, txt, pcb_no_flags());
+	res->type = FGW_LONG;
+	res->val.nat_long = (t == NULL ? -1 : t->ID);
+	return 0;
+}
+
+static const char pcb_acts_subc[] =
+	"subc(hash, [board|selected])\n"
+	"subc(loose, on|off|toggle|check)\n"
+	;
+static const char pcb_acth_subc[] = "Various operations on subc";
+static fgw_error_t pcb_act_subc(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op1, op2 = -2;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, subc, op1 = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, subc, op2 = fgw_keyword(&argv[2]));
+	PCB_ACT_IRES(0);
+
+	switch(op1) {
+		case F_Loose:
+			switch(op2) {
+				case -2:
+				case F_Toggle: PCB->loose_subc = !PCB->loose_subc; break;
+				case F_On:     PCB->loose_subc = 1; break;
+				case F_Off:    PCB->loose_subc = 0; break;
+				case F_Check:  PCB_ACT_IRES(PCB->loose_subc); return 0;
+				default:       PCB_ACT_FAIL(subc); return 1;
+			}
+			/* have to manually trigger the update as it is not a conf item */
+			if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
+				pcb_gui->update_menu_checkbox(NULL);
+			return 0;
+		case F_Hash:
+			{
+				int selected_only = 0;
+				gdl_iterator_t it;
+				pcb_subc_t *sc;
+
+				switch(op2) {
+					case -2: break;
+					case F_Selected: selected_only = 1; break;
+					default:         PCB_ACT_FAIL(subc); return 1;
+				}
+
+				polylist_foreach(&PCB->Data->subc, &it, sc) {
+					if (selected_only && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, sc))
+						continue;
+					pcb_message(PCB_MSG_INFO, "subc #%ld (%s): %u\n", sc->ID, (sc->refdes == NULL ? "<no refdes>" : sc->refdes), pcb_subc_hash(sc));
+				}
+			}
+			break;
+		case F_Eq:
+			{
+				int selected_only = 0;
+				gdl_iterator_t it;
+				pcb_subc_t *sc;
+				vtp0_t *vt;
+				htip_t hash2scs; /* hash to subcircuit vector */
+				htip_entry_t *e;
+				gds_t str;
+
+				gds_init(&str);
+				htip_init(&hash2scs, longhash, longkeyeq);
+				switch(op2) {
+					case -2: break;
+					case F_Selected: selected_only = 1; break;
+					default:         PCB_ACT_FAIL(subc); return 1;
+				}
+				polylist_foreach(&PCB->Data->subc, &it, sc) {
+					unsigned int hash;
+					if (selected_only && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, sc))
+						continue;
+					hash = pcb_subc_hash(sc);
+					vt = htip_get(&hash2scs, hash);
+					if (vt == 0) {
+						vt = calloc(sizeof(vtp0_t), 1);
+						htip_set(&hash2scs, hash, vt);
+					}
+					vtp0_append(vt, sc);
+				}
+
+				/* print the result */
+				for (e = htip_first(&hash2scs); e; e = htip_next(&hash2scs, e)) {
+					int n;
+
+					vt = e->value;
+					str.used = 0;
+					pcb_append_printf(&str, "subc eq %u:", e->key);
+					for(n = 0; n < vt->used; n++) {
+						sc = (pcb_subc_t *)vt->array[n];
+						pcb_append_printf(&str, " #%ld(%s):%d", sc->ID, (sc->refdes == NULL ? "<no refdes>" : sc->refdes), pcb_subc_eq(sc, (pcb_subc_t*)vt->array[0]));
+					}
+					pcb_message(PCB_MSG_INFO, "%s\n", str.array);
+					vtp0_uninit(vt);
+					free(vt);
+				}
+				gds_uninit(&str);
+				htip_uninit(&hash2scs);
+			}
+			break;
+	}
+
+	return 0;
+}
+
+static const char pcb_acts_Rotate90[] = "pcb_move_obj(steps)";
+static const char pcb_acth_Rotate90[] = "Rotates the object under the crosshair by 90 degree steps.";
+
+/* %start-doc actions Rotate90
+
+Rotates the object under the mouse pointer by 90 degree @code{steps}.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Rotate90(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int steps;
+	pcb_coord_t x, y;
+
+	PCB_ACT_CONVARG(1, FGW_INT, Rotate90, steps = argv[1].val.nat_int);
+	PCB_ACT_IRES(0);
+
+	pcb_hid_get_coords("Select an Object", &x, &y, 0);
+
+	if (conf_core.editor.show_solder_side)
+		steps = -steps;
+
+	steps = steps % 4;
+	if (steps < 0)
+		steps = 4+steps;
+
+	pcb_screen_obj_rotate90(x, y, steps);
+
+	return 0;
+}
+
+pcb_action_t object_action_list[] = {
+	{"Attributes", pcb_act_Attributes, pcb_acth_Attributes, pcb_acts_Attributes},
+	{"DisperseElements", pcb_act_DisperseElements, pcb_acth_DisperseElements, pcb_acts_DisperseElements},
+	{"Flip", pcb_act_Flip, pcb_acth_Flip, pcb_acts_Flip},
+	{"MoveObject", pcb_act_MoveObject, pcb_acth_MoveObject, pcb_acts_MoveObject},
+	{"MoveToCurrentLayer", pcb_act_MoveToCurrentLayer, pcb_acth_MoveToCurrentLayer, pcb_acts_MoveToCurrentLayer},
+	{"ElementList", pcb_act_ElementList, pcb_acth_ElementList, pcb_acts_ElementList},
+	{"ElementSetAttr", pcb_act_ElementSetAttr, pcb_acth_ElementSetAttr, pcb_acts_ElementSetAttr},
+	{"RipUp", pcb_act_RipUp, pcb_acth_RipUp, pcb_acts_RipUp},
+	{"MinClearGap", pcb_act_MinClearGap, pcb_acth_MinClearGap, pcb_acts_MinClearGap},
+	{"MoveLayer", pcb_act_MoveLayer, pcb_acth_MoveLayer, pcb_acts_MoveLayer},
+	{"subc", pcb_act_subc, pcb_acth_subc, pcb_acts_subc},
+	{"CreateText", pcb_act_CreateText, pcb_acth_CreateText, pcb_acts_CreateText},
+	{"Rotate90", pcb_act_Rotate90, pcb_acth_Rotate90, pcb_acts_Rotate90}
+};
+
+PCB_REGISTER_ACTIONS(object_action_list, NULL)
Index: tags/2.0.1/src/operation.c
===================================================================
--- tags/2.0.1/src/operation.c	(nonexistent)
+++ tags/2.0.1/src/operation.c	(revision 18980)
@@ -0,0 +1,228 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "operation.h"
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "undo.h"
+#include "rats.h"
+
+/* ----------------------------------------------------------------------
+ * performs several operations on the passed object
+ */
+void *pcb_object_operation(pcb_opfunc_t *F, pcb_opctx_t *ctx, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	switch (Type) {
+	case PCB_OBJ_LINE:
+		if (F->Line)
+			return (F->Line(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2));
+		break;
+
+	case PCB_OBJ_ARC:
+		if (F->Arc)
+			return (F->Arc(ctx, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2));
+		break;
+
+	case PCB_OBJ_LINE_POINT:
+		if (F->LinePoint)
+			return (F->LinePoint(ctx, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3));
+		break;
+
+	case PCB_OBJ_ARC_POINT:
+		if (F->ArcPoint)
+			return (F->ArcPoint(ctx, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3));
+		break;
+
+	case PCB_OBJ_TEXT:
+		if (F->Text)
+			return (F->Text(ctx, (pcb_layer_t *) Ptr1, (pcb_text_t *) Ptr2));
+		break;
+
+	case PCB_OBJ_POLY:
+		if (F->Polygon)
+			return (F->Polygon(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2));
+		break;
+
+	case PCB_OBJ_POLY_POINT:
+		if (F->Point)
+			return (F->Point(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2, (pcb_point_t *) Ptr3));
+		break;
+
+	case PCB_OBJ_SUBC:
+		if (F->subc)
+			return (F->subc(ctx, (pcb_subc_t *) Ptr2));
+		break;
+
+	case PCB_OBJ_PSTK:
+		if (F->padstack)
+			return (F->padstack(ctx, (pcb_pstk_t *)Ptr2));
+		break;
+
+	case PCB_OBJ_RAT:
+		if (F->Rat)
+			return (F->Rat(ctx, (pcb_rat_t *) Ptr2));
+		break;
+	}
+	return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * performs several operations on selected objects which are also visible
+ * The lowlevel procedures are passed together with additional information
+ * resets the selected flag if requested
+ * returns pcb_true if anything has changed
+ */
+pcb_bool pcb_selected_operation(pcb_board_t *pcb, pcb_data_t *data, pcb_opfunc_t *F, pcb_opctx_t *ctx, pcb_bool Reset, int type, pcb_bool on_locked_too)
+{
+	pcb_bool changed = pcb_false;
+
+	/* check lines */
+	if (type & PCB_OBJ_LINE && F->Line) {
+		PCB_LINE_VISIBLE_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, line))
+				continue;
+			if (!on_locked_too && PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(line);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, line);
+			}
+			F->Line(ctx, layer, line);
+			changed = pcb_true;
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	/* check arcs */
+	if (type & PCB_OBJ_ARC && F->Arc) {
+		PCB_ARC_VISIBLE_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(arc);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, arc);
+			}
+			F->Arc(ctx, layer, arc);
+			changed = pcb_true;
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	/* check text */
+	if (type & PCB_OBJ_TEXT && F->Text) {
+		PCB_TEXT_ALL_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) || !pcb_text_is_visible(PCB, layer, text))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(text);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, text);
+			}
+			F->Text(ctx, layer, text);
+			changed = pcb_true;
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	/* check polygons */
+	if (type & PCB_OBJ_POLY && F->Polygon) {
+		PCB_POLY_VISIBLE_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(polygon);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, polygon);
+			}
+			F->Polygon(ctx, layer, polygon);
+			changed = pcb_true;
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if ((type & (PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)) && F->subc) {
+		PCB_SUBC_LOOP(data);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) {
+				if (Reset) {
+					pcb_undo_add_obj_to_flag(subc);
+					PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, subc);
+				}
+				F->subc(ctx, subc);
+				changed = pcb_true;
+			}
+			else if ((pcb->loose_subc) || (type & PCB_OBJ_SUBC_PART)) {
+				if (pcb_selected_operation(pcb, subc->data, F, ctx, Reset, type, on_locked_too))
+					changed = pcb_true;
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+	/* process padstacks */
+	if (type & PCB_OBJ_PSTK && pcb->pstk_on && F->padstack) {
+		PCB_PADSTACK_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(padstack);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, padstack);
+			}
+			F->padstack(ctx, padstack);
+			changed = pcb_true;
+		}
+		PCB_END_LOOP;
+	}
+
+	/* and rat-lines */
+	if (type & PCB_OBJ_RAT && pcb->RatOn && F->Rat) {
+		PCB_RAT_LOOP(data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, line))
+				continue;
+			if (Reset) {
+				pcb_undo_add_obj_to_flag(line);
+				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, line);
+			}
+			F->Rat(ctx, line);
+			changed = pcb_true;
+		}
+		PCB_END_LOOP;
+	}
+
+	if (Reset && changed)
+		pcb_undo_inc_serial();
+
+	return changed;
+}
Index: tags/2.0.1/src/operation.h
===================================================================
--- tags/2.0.1/src/operation.h	(nonexistent)
+++ tags/2.0.1/src/operation.h	(revision 18980)
@@ -0,0 +1,153 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  15 Oct 2008 Ineiev: add different crosshair shapes
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_OPERATION_H
+#define PCB_OPERATION_H
+
+#include "global_typedefs.h"
+
+/* Each object operation gets an operation-context with some operation-specific
+   configuration, and the board to operate on. Optionally this is the place to
+   hold temporary states of a multi-call operation too. */
+
+typedef struct {
+	pcb_board_t *pcb;
+	int extraflg;
+	pcb_data_t *dst, *src;
+} pcb_opctx_buffer_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	int is_primary;  /* whether the primary parameter should be changed */
+	pcb_bool is_absolute;
+	pcb_coord_t value;     /* delta or absolute (depending on is_absoulute) */
+} pcb_opctx_chgsize_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	int is_primary;                 /* whether the primary parameter should be changed */
+	pcb_bool is_absolute;
+	pcb_angle_t value;     /* same as above, but for angles */
+} pcb_opctx_chgangle_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	char *new_name;
+} pcb_opctx_chgname_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	int style;             /* the new bits */
+	unsigned long lid;     /* the layer to operate on */
+} pcb_opctx_chgtherm_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_coord_t DeltaX, DeltaY; /* movement vector */
+	int from_outside;
+} pcb_opctx_copy_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_coord_t x, y;
+	pcb_cardinal_t idx; /* poly point idx */
+	pcb_bool last;
+	pcb_bool forcible;
+} pcb_opctx_insert_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_coord_t dx, dy;         /* used by local routines as offset */
+	pcb_layer_t *dst_layer;
+	pcb_bool more_to_come;
+} pcb_opctx_move_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_data_t *destroy_target;
+} pcb_opctx_remove_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_coord_t center_x, center_y; /* center of rotation */
+	unsigned number;                /* number of rotations, for 90 deg rotation */
+	double cosa, sina, angle;       /* for arbitrary angle rotation */
+} pcb_opctx_rotate_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	unsigned long how; /* pcb_change_flag_t */
+	unsigned long flag; /* pcb_flag_values_t */
+} pcb_opctx_chgflag_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+} pcb_opctx_noarg_t;
+
+typedef struct {
+	pcb_board_t *pcb;
+	int restore;
+	int clear;
+} pcb_opctx_clip_t;
+
+typedef union {
+	pcb_opctx_buffer_t buffer;
+	pcb_opctx_chgname_t chgname;
+	pcb_opctx_chgsize_t chgsize;
+	pcb_opctx_chgangle_t chgangle;
+	pcb_opctx_chgtherm_t chgtherm;
+	pcb_opctx_copy_t copy;
+	pcb_opctx_insert_t insert;
+	pcb_opctx_move_t move;
+	pcb_opctx_remove_t remove;
+	pcb_opctx_rotate_t rotate;
+	pcb_opctx_chgflag_t chgflag;
+	pcb_opctx_noarg_t noarg;
+	pcb_opctx_clip_t clip;
+} pcb_opctx_t;
+
+/* pointer to low-level operation (copy, move and rotate) functions */
+typedef struct {
+	void *(*Line)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *);
+	void *(*Text)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_text_t *);
+	void *(*Polygon)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_poly_t *);
+/*5*/
+	void *(*LinePoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_line_t *, pcb_point_t *);
+	void *(*Point)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_poly_t *, pcb_point_t *);
+	void *(*Arc)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_arc_t *);
+	void *(*Rat)(pcb_opctx_t *ctx, pcb_rat_t *);
+	void *(*ArcPoint)(pcb_opctx_t *ctx, pcb_layer_t *, pcb_arc_t *, int *end_id);
+	void *(*subc)(pcb_opctx_t *ctx, pcb_subc_t *);
+	void *(*padstack)(pcb_opctx_t *ctx, pcb_pstk_t *);
+} pcb_opfunc_t;
+
+void *pcb_object_operation(pcb_opfunc_t *F, pcb_opctx_t *ctx, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+pcb_bool pcb_selected_operation(pcb_board_t *pcb, pcb_data_t *data, pcb_opfunc_t *F, pcb_opctx_t *ctx, pcb_bool Reset, int type, pcb_bool on_locked_too);
+
+#endif
Index: tags/2.0.1/src/paths.c
===================================================================
--- tags/2.0.1/src/paths.c	(nonexistent)
+++ tags/2.0.1/src/paths.c	(revision 18980)
@@ -0,0 +1,296 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Resolve paths, build paths using template */
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "paths.h"
+#include "error.h"
+#include "conf_core.h"
+
+/* don't include board.h or compat_misc.h because of gsch2pcb-rnd */
+const char *pcb_board_get_filename(void);
+const char *pcb_board_get_name(void);
+int pcb_getpid(void);
+
+
+int pcb_build_fn_cb(void *ctx, gds_t *s, const char **input)
+{
+	char buff[20];
+	const char *name;
+
+	switch(**input) {
+		case 'P':
+			sprintf(buff, "%.8i", pcb_getpid());
+			gds_append_str(s, buff);
+			(*input)++;
+			return 0;
+		case 'F':
+			name = pcb_board_get_filename();
+			gds_append_str(s, (name != NULL) ? name : "no_file_name");
+			(*input)++;
+			return 0;
+		case 'B':
+			name = pcb_board_get_filename();
+			if (name != NULL) {
+				const char *bn = strrchr(name, '/');
+				if (bn != NULL)
+					bn++;
+				else
+					bn = name;
+				gds_append_str(s, bn);
+			}
+			else
+				gds_append_str(s, "no_file_name");
+			(*input)++;
+			return 0;
+		case 'D':
+			name = pcb_board_get_filename();
+			if (name != NULL) {
+				char *bn = strrchr(name, '/');
+				if (bn != NULL)
+					gds_append_len(s, name, bn-name+1);
+				else
+					gds_append_str(s, "./");
+			}
+			else
+				gds_append_str(s, "./");
+			(*input)++;
+			return 0;
+		case 'N':
+			name = pcb_board_get_name();
+			gds_append_str(s, (name != NULL) ? name : "no_name");
+			(*input)++;
+			return 0;
+		case 'T':
+			sprintf(buff, "%lu", (unsigned long int)time(NULL));
+			gds_append_str(s, buff);
+			(*input)++;
+			return 0;
+	}
+	return -1;
+}
+
+int pcb_build_argfn_cb(void *ctx_, gds_t *s, const char **input)
+{
+	if ((**input >= 'a') && (**input <= 'z')) {
+		int idx = **input - 'a';
+		pcb_build_argfn_t *ctx = ctx_;
+		if (ctx->params[idx] == NULL)
+			return -1;
+		gds_append_str(s, ctx->params[idx]);
+		(*input)++;
+		return 0;
+	}
+	return pcb_build_fn_cb(NULL, s, input);
+}
+
+char *pcb_build_fn(const char *template)
+{
+	return pcb_strdup_subst(template, pcb_build_fn_cb, NULL, PCB_SUBST_ALL);
+}
+
+char *pcb_build_argfn(const char *template, pcb_build_argfn_t *arg)
+{
+	return pcb_strdup_subst(template, pcb_build_argfn_cb, arg, PCB_SUBST_ALL);
+}
+
+int pcb_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room)
+{
+	const char *curr, *next;
+
+	if (template == NULL)
+		return -1;
+
+	gds_init(s);
+
+	if (*template == '?')
+		template++;
+
+	if ((*template == '~') && (flags & PCB_SUBST_HOME)) {
+		if (conf_core.rc.path.home == NULL) {
+			pcb_message(PCB_MSG_ERROR, "pcb_strdup_subst(): can't resolve home dir required for path %s\n", template);
+			goto error;
+		}
+		gds_append_str(s, conf_core.rc.path.home);
+		template++;
+	}
+
+	for(curr = template;;) {
+		next = strpbrk(curr, "%$\\");
+		if (next == NULL) {
+			gds_append_str(s, curr);
+			gds_enlarge(s, gds_len(s) + extra_room);
+			return 0;
+		}
+		if (next > curr)
+			gds_append_len(s, curr, next-curr);
+
+		switch(*next) {
+			case '\\':
+				if (flags & PCB_SUBST_BACKSLASH) {
+					char c;
+					next++;
+					switch(*next) {
+						case 'n': c = '\n'; break;
+						case 'r': c = '\r'; break;
+						case 't': c = '\t'; break;
+						case '\\': c = '\\'; break;
+						default: c = *next;
+					}
+					gds_append(s, c);
+					curr = next;
+				}
+				else {
+					gds_append(s, *next);
+					curr = next+1;
+				}
+				break;
+			case '%':
+				if (flags & PCB_SUBST_PERCENT) {
+					next++;
+					switch(*next) {
+						case '%':
+							gds_append(s, '%');
+							curr = next+1;
+							break;
+						default:
+							if (cb(ctx, s, &next) != 0) {
+								/* keep the directive intact */
+								gds_append(s, '%');
+							}
+							curr = next;
+					}
+				}
+				else {
+					gds_append(s, '%');
+					curr = next+1;
+				}
+				break;
+			case '$':
+				if (flags & PCB_SUBST_CONF) {
+					const char *start, *end;
+					next++;
+					switch(*next) {
+						case '(':
+							next++;
+							start = next;
+							end = strchr(next, ')');
+							if (end != NULL) {
+								conf_native_t *cn;
+								char path[256], *q;
+								size_t len = end - start;
+								if (len > sizeof(path) - 1) {
+									pcb_message(PCB_MSG_ERROR, "pcb_strdup_subst(): can't resolve $() conf var, name too long: %s\n", start);
+									goto error;
+								}
+								memcpy(path, start, len);
+								path[len] = '\0';
+								for(q = path; *q != '\0'; q++)
+									if (*q == '.')
+										*q = '/';
+								cn = conf_get_field(path);
+								if (cn == NULL) {
+									pcb_message(PCB_MSG_ERROR, "pcb_strdup_subst(): can't resolve $(%s) conf var: not found in the conf tree\n", path);
+									goto error;
+								}
+								if (cn->type != CFN_STRING) {
+									pcb_message(PCB_MSG_ERROR, "pcb_strdup_subst(): can't resolve $(%s) conf var: value type is not string\n", path);
+									goto error;
+								}
+								if (cn->val.string[0] != NULL)
+									gds_append_str(s, cn->val.string[0]);
+								curr = end+1;
+							}
+							else {
+								pcb_message(PCB_MSG_ERROR, "pcb_strdup_subst(): unterminated $(%s)\n", start);
+								goto error;
+							}
+							break;
+						case '$':
+							gds_append(s, '$');
+							curr = next+1;
+							break;
+						default:
+							gds_append(s, '$');
+							curr = next;
+							break;
+					}
+				}
+				else {
+					gds_append(s, '$');
+					curr = next+1;
+				}
+				break;
+		}
+	}
+	abort(); /* can't get here */
+
+	error:;
+	return -1;
+}
+
+static char *pcb_strdup_subst_(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room)
+{
+	gds_t s;
+
+	if (template == NULL)
+		return NULL;
+
+	memset(&s, 0, sizeof(s)); /* shouldn't do gds_init() here, pcb_subst_append() will do that */
+
+	if (pcb_subst_append(&s, template, cb, ctx, flags, extra_room) == 0)
+		return s.array;
+
+	gds_uninit(&s);
+	return NULL;
+}
+
+char *pcb_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags)
+{
+	return pcb_strdup_subst_(template, cb, ctx, flags, 0);
+}
+
+void pcb_paths_resolve(const char **in, char **out, int numpaths, unsigned int extra_room)
+{
+	for (; numpaths > 0; numpaths--, in++, out++)
+		*out = pcb_strdup_subst_(*in, pcb_build_fn_cb, NULL, PCB_SUBST_ALL, extra_room);
+}
+
+void pcb_path_resolve(const char *in, char **out, unsigned int extra_room)
+{
+	pcb_paths_resolve(&in, out, 1, extra_room);
+}
+
+char *pcb_path_resolve_inplace(char *in, unsigned int extra_room)
+{
+	char *out;
+	pcb_path_resolve(in, &out, extra_room);
+	free(in);
+	return out;
+}
Index: tags/2.0.1/src/paths.h
===================================================================
--- tags/2.0.1/src/paths.h	(nonexistent)
+++ tags/2.0.1/src/paths.h	(revision 18980)
@@ -0,0 +1,77 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Resolve paths, build paths using template */
+
+#include "genvector/gds_char.h"
+
+/* Allocate *out and copy the path from in to out, replacing ~ with conf_core.rc.path.home
+   If extra_room is non-zero, allocate this many bytes extra for each slot;
+   this leaves some room to append a file name. */
+void pcb_path_resolve(const char *in, char **out, unsigned int extra_room);
+
+/* Same as resolve_path, but it returns the pointer to the new path and calls
+   free() on in */
+char *pcb_path_resolve_inplace(char *in, unsigned int extra_room);
+
+
+/* Resolve all paths from a in[] into out[](should be large enough) */
+void pcb_paths_resolve(const char **in, char **out, int numpaths, unsigned int extra_room);
+
+/* Resolve all paths from a char *in[] into a freshly allocated char **out */
+#define pcb_paths_resolve_all(in, out, extra_room) \
+do { \
+	int __numpath__ = sizeof(in) / sizeof(char *); \
+	if (__numpath__ > 0) { \
+		out = malloc(sizeof(char *) * __numpath__); \
+		pcb_paths_resolve(in, out, __numpath__, extra_room); \
+	} \
+} while(0)
+
+
+/* generic file name template substitution callbacks for pcb_strdup_subst:
+    %P    pid
+    %F    load-time file name of the current pcb
+    %B    basename (load-time file name of the current pcb without path)
+    %D    dirname (load-time file path of the current pcb, without file name, with trailing slash, might be ./)
+    %N    name of the current pcb
+    %T    wall time (Epoch)
+*/
+int pcb_build_fn_cb(void *ctx, gds_t *s, const char **input);
+
+char *pcb_build_fn(const char *template);
+
+
+/* Same as above, but also replaces lower case formatting to the members of
+   the array if they are not NULL; use with pcb_build_argfn() */
+typedef struct {
+	const char *params['z' - 'a' + 1]; /* [0] for 'a' */
+} pcb_build_argfn_t;
+
+char *pcb_build_argfn(const char *template, pcb_build_argfn_t *arg);
+
+int pcb_build_argfn_cb(void *ctx, gds_t *s, const char **input);
+
Index: tags/2.0.1/src/pcb-conf.lht
===================================================================
--- tags/2.0.1/src/pcb-conf.lht	(nonexistent)
+++ tags/2.0.1/src/pcb-conf.lht	(revision 18980)
@@ -0,0 +1,267 @@
+li:pcb-rnd-conf-v1 {
+	ha:overwrite {
+		ha:editor {
+			grid_unit = mil
+			grid = 25 mil
+			li:grids = {
+				{0.1 mil}; {1 mil}; {5 mil}; {10 mil}; {25 mil}; {50 mil}; {100 mil};
+				{0.01 mm}; {0.05 mm}; {0.1 mm}; {0.25 mm}; {0.5 mm}; {1 mm};
+			}
+			grids_idx = 4
+			zoom = 1
+			mode = 1
+			buffer_number = 0
+			clear_line = 1
+			clear_polypoly = 0
+			full_poly = 0
+			unique_names = 0
+			marker_snaps = 1
+			snap_pin = 1
+			snap_offgrid_line = 1
+			highlight_on_point = 0
+			show_solder_side = 0
+			save_last_command = 0
+			save_in_tmp = 0
+			draw_grid = 1
+			all_direction_lines = 0
+			line_refraction = 1
+			rubber_band_mode = 0
+			rubber_band_keep_midlinedir = 0
+			swap_start_direction = 0
+			show_drc = 0
+			auto_drc = 0
+			show_number = 0
+			orthogonal_moves = 0
+			reset_after_element = 1
+			auto_place = 0
+			lock_names = 0
+			only_names = 0
+			thin_draw = 0
+			thin_draw_poly = 0
+			wireframe_draw = 0
+			local_ref = 0
+			check_planes = 0
+			hide_names = 0
+			description = 0
+			name_on_pcb = 1
+			enable_stroke = 1
+			live_routing = 0
+			beep_when_finished = 0
+			click_time = 200
+			auto_via = 1
+			ha:view {
+				flip_x = 0
+				flip_y = 0
+			}
+			ha:selection {
+				disable_negative = 0
+				symmetric_negative = 0
+			}
+			undo_warning_size = 1024
+			fullscreen = 0
+			move_linepoint_uses_route = 1
+		} # editor
+
+		ha:rc {
+			verbose = 0
+			quiet = 0
+			backup_interval = 60
+			hid_fallback = 1
+			brave = {}
+			menu_file = {default}
+#			font_command = {}
+#			file_command = {}
+#			file_path = {}
+			library_shell = {}
+
+			emergency_name = {PCB.%ld.save}
+			emergency_format = {lihata}
+			backup_name = {PCB.%P.backup}
+			backup_format = {lihata}
+
+			li:library_search_paths = {
+				?../pcblib
+				?~/pcblib/
+				$(rc.path.share)/pcblib
+			}
+
+			keep_save_backups = false
+			save_command = {}
+
+			li:default_font_file = {
+				{./default_font}
+				{$(rc.path.share)/default_font}
+			}
+			li:default_pcb_file = {
+				{./default4.lht}
+				{$(rc.path.share)/default4.lht}
+			}
+
+#			script_filename = {}
+#			action_string = {}
+#			rat_path = {}
+#			rat_command = {}
+			li:preferred_gui = { gtk2_gl; gtk2_gdk; lesstif; batch }
+			save_final_fallback_fmt = lihata
+			save_fp_fmt = lihata
+		} # rc
+
+		ha:design {
+# old DRC (design rule checked) section
+			bloat = 12.00 mil
+			shrink = 9.00 mil
+			min_drill = 15.00 mil
+			min_ring = 10.00 mil
+			min_slk = 7.00 mil
+			min_wid = 10.00 mil
+			line_thickness = 10.00 mil
+			clearance = 20.00 mil
+			poly_isle_area = 200000000.2
+
+			via_thickness = 2000.00 um
+			via_drilling_hole = 31.50 mil
+
+#			alignment_distance = 0
+			text_scale = 100
+			text_font_id = 0
+#			poly_isle_area = 0
+#			background_image = {}
+#			fab_author = {}
+			paste_adjust = 0
+		} # design
+
+		ha:appearance {
+			rat_thickness = 0.25 mm
+			mark_size = 50 mil
+			layer_alpha = 0.7
+			drill_alpha = 0.85
+			text_host_bbox = true
+			term_label_size = 50
+			subc_layer_per_side = 1
+
+			ha:loglevels {
+				debug_tag      = {}
+				debug_popup    = false
+				info_tag       = {}
+				info_popup     = false
+				warning_tag    = {<B>}
+				warning_popup  = true
+				error_tag      = {<R>}
+				error_popup    = true
+			}
+			ha:color {
+				background = {#e5e5e5}
+				crosshair = {#ff0000}
+				cross = {#cdcd00}
+				selected = {#00ffff}
+				via = {#7f7f7f}
+				pin = {#4d4d4d}
+				pin_name = {#ff0000}
+				element = {#000000}
+				subc = {#CC0000}
+				subc_nonetlist = {#CC9900}
+				padstackmark = {#CC0000}
+				rat = {#b8860b}
+				invisible_objects = {#cccccc}
+				connected = {#00ff00}
+				off_limit = {#cccccc}
+				grid = {#ff0000}
+				li:layer = {
+					{#8b2323}; {#3a5fcd}; {#104e8b}; {#cd3700}; {#548b54};
+					{#8b7355}; {#00868b}; {#228b22}; {#8b2323}; {#3a5fcd};
+					{#104e8b}; {#cd3700}; {#548b54}; {#8b7355}; {#00868b};
+					{#228b22};
+					{#8b2323}; {#3a5fcd}; {#104e8b}; {#cd3700}; {#548b54};
+					{#8b7355}; {#00868b}; {#228b22}; {#8b2323}; {#3a5fcd};
+					{#104e8b}; {#cd3700}; {#548b54}; {#8b7355}; {#00868b};
+					{#228b22};
+					{#8b2323}; {#3a5fcd}; {#104e8b}; {#cd3700}; {#548b54};
+					{#8b7355};
+				}
+				warn = {#ff8000}
+				mask = {#ff0000}
+				paste = {#cd00cd}
+			}
+			ha:pinout {
+#				name_length = 0
+#				zoom = 0
+				offset_x = 25400
+				offset_y = 25400
+				text_offset_x = 0.1 mm
+				text_offset_y = 0.1 mm
+			}
+			ha:padstack {
+				cross_thick = 1
+				cross_size = 0.1 mm
+			}
+			ha:subc {
+				dash_freq = 5
+			}
+			ha:messages {
+#				char_per_line = 0
+			}
+#			ha:misc {
+#				volume = 0
+#			} misc;
+		} # appearance;
+
+		ha:plugins {
+			ha:io_lihata {
+				aux_pcb_pattern = {%D.%B.lht.pcb}
+			}
+			ha:mincut {
+				enable = 1
+			}
+			ha:djopt {
+				auto_only = 1
+			}
+			ha:vendor {
+				enable = 0
+			}
+			ha:diag {
+				auto_integrity = 0
+			}
+			ha:import_sch {
+				gnetlist_program = gnetlist
+				make_program = make
+				verbose = false
+			}
+			ha:import_mentor_sch {
+				li:map_search_paths = {
+					{./mentor_parts.map}
+					{$(rc.path.share)/mentor_parts.map}
+				}
+			}
+			ha:hid_gtk {
+				compact_horizontal = 1
+				compact_vertical = 1
+				use_command_window = 0
+				history_size = 16
+				ha:local_grid {
+					enable = 0
+					radius = 16
+				}
+				ha:global_grid {
+					sparse = 0
+					min_dist_px = 4
+				}
+			}
+			ha:report {
+				columns = 8
+			}
+			ha:fp_wget {
+				auto_update_gedasymbols = 0
+				auto_update_edakrill = 0
+			}
+		} # plugins
+
+		ha:utils {
+			ha:gsch2pcb-rnd {
+				remove_unfound_elements = 1
+				quiet_mode = 0
+				verbose = 0
+			}
+		} # utils
+	} # main
+} # root
+
Index: tags/2.0.1/src/pcb-menu-default.lht
===================================================================
--- tags/2.0.1/src/pcb-menu-default.lht	(nonexistent)
+++ tags/2.0.1/src/pcb-menu-default.lht	(revision 18980)
@@ -0,0 +1,736 @@
+ha:{
+	li:mouse {
+		li:left {
+			li:press            = { Mode(Notify) }
+			li:press-shift      = { Mode(Notify) }
+			li:press-ctrl       = { Mode(Save); Mode(None); Mode(Restore); Mode(Notify) }
+			li:release          = { Mode(Release) }
+			li:release-shift    = { Mode(Release) }
+			li:release-ctrl     = { Mode(Release) }
+		}
+		li:middle {
+			li:press              = { Pan(1) }
+			li:release            = { Pan(0) }
+		}
+		li:right {
+			li:press         = { Mode(Stroke) }
+			li:release       = { Mode(Release); Popup(popup-obj, obj-type) }
+			li:shift-release = { Popup(popup-obj-misc) }
+			li:press-ctrl    = { Display(CycleCrosshair) }
+		}
+		li:scroll-up {
+			li:press        = { Zoom(0.8) }
+			li:press-shift  = { Scroll(up) }
+			li:press-ctrl   = { Scroll(left) }
+		}
+		li:scroll-down {
+			li:press       = { Zoom(1.25) }
+			li:press-shift = { Scroll(down) }
+			li:press-ctrl  = { Scroll(right) }
+		}
+	}
+	
+	li:main_menu {
+		### File Menu
+		ha:File {
+			m=F
+			li:submenu {
+				ha:Start New Layout                  = { li:a={{<key>f;<key>n}; {Ctrl<Key>n};}; action=New() }
+				ha:Revert                            = { a={<key>f;<key>r};          action=Load(Revert,none); tip=Revert to the layout stored on disk }
+				-
+				ha:Load layout...                    = { li:a={{<key>f;<key>o};{<key>f;<key>l};}  action=Load(Layout); tip=Load a layout from a file }
+				-
+				ha:Save Layout                       = { m=S; li:a={{<key>f;<key>s}; {Ctrl<Key>s};};        action=Save(Layout); tip=Saves current layout }
+				ha:Save Layout As...                 = { m=A; li:a={{<key>f;<key>a}; {Shift Ctrl<Key>s};};  action=Save(LayoutAs); tip=Saves current layout into a new file }
+				-
+				ha:Import {
+					m=I
+					li:submenu {
+						ha:Import gschem schematics          = {                             action=Import() }
+						ha:Import tEDAx schematics           = {                             action=LoadTedaxFrom(netlist) }
+						ha:Import KiCad/eeschema schematics  = {                             action=LoadEeschemaFrom() }
+						ha:Import mentor graphics schematics = {                             action=LoadMentorFrom() }
+						ha:Load subcircuit data to paste-buffer = {                          li:action={PasteBuffer(Clear); Load(ElementTobuffer)} }
+						ha:Load layout data to paste-buffer  = {                             li:action={PasteBuffer(Clear); Load(LayoutTobuffer)} }
+						ha:Load netlist file                 = {                             action=Load(Netlist) }
+						ha:Load IPC-D-356 netlist            = {                             action=LoadIpc356From() }
+						ha:Load vendor resource file         = {                             action=LoadVendorFrom() }
+						ha:Load routed dsn or ses file       = {                             action=LoadDsnFrom() }
+						ha:Load MUCS pl file                 = {                             action=LoadMucsFrom() }
+						ha:Load TinyCAD .net file            = {                             action=LoadTinyCADFrom() }
+						ha:Load LTSpice .net and .asc files  = {                             action=LoadLTSpiceFrom() }
+						ha:Load HP-GL plot to paste-buffer   = {                             action=LoadHPGLFrom() }
+						ha:Load Hyperlynx .hyp file          = {                             action=LoadHypFrom() }
+						ha:Load FreePCB netlist (EasyEDA)    = {                             action=LoadFpcbnlFrom() }
+					}
+				}
+				-
+				ha:Save connection data of {
+					li:submenu {
+						ha:a single element                  = {                  li:action={ Save(ElementConnections) } }
+						ha:all elements                      = {                  action=Save(AllConnections) }
+						ha:unused pins                       = {                  action=Save(AllUnusedPins) }
+						ha:netlist patch for back annotation = {li:a={{<key>f;<key>x;<key>p}; {<key>a;<key>b;<key>x};}; action=SavePatch() }
+					}
+				}
+				ha:Print layout...      = { a={<key>f;<key>p}; action=Print()}
+				ha:Export layout...     = { a={<key>f;<key>e}; action=ExportGUI()}
+				ha:Reports {
+					li:submenu {
+						ha:Generate object report  = { a={<key>i;<key>r}; action=ReportObject() }
+						ha:Generate drill summary  = { a={<key>i;<key>d}; action=Report(DrillReport) }
+						ha:Report found padstacks  = { a={<key>i;<key>f}; action=Report(FoundPins) }
+					}
+				}
+				-
+				ha:Preferences...       = { a={<key>i;<key>c;<key>p}; action=DoWindows(Preferences)}
+				ha:Maintenance {
+					li:submenu {
+						ha:Calibrate Printer...           = { a={<key>i;<key>c;<key>c}; action=PrintCalibrate() }
+						ha:Re-scan the footprint library  = { a={<key>i;<key>c;<key>r}; action=fp_rehash() }
+						-
+						ha:Edit current font              = { action=FontEdit() }
+						ha:Edit on-disk font              = { action={ LoadFontFrom("", 126); conf(set, design/text_font_id, 126, design); FontEdit() } }
+						ha:Save font from font editor     = { action=FontSave() }
+					}
+				}
+				-
+				ha:Quit Program         = { li:a={{<key>f;<key>q}; {Ctrl<Key>q};}; action=Quit() }
+			}
+		} # File
+
+		ha:Edit {
+			m=E
+			li:submenu {
+				ha:Undo last operation          = { li:a={{<key>u; <Key>u}; {Ctrl<Key>z};};   action=Undo() }
+				ha:Redo last undone operation   = { li:a={{<key>u; <Key>r}; {Ctrl<Key>y};};   action=Redo() }
+				ha:Clear undo-buffer            = { a={<key>u; <Key>c}; action=Undo(ClearList) }
+				-
+				ha:Cut selection to buffer      = { li:a={{<key>e; <Key>x}; a=Ctrl<Key>x;};   li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Unselect(All); Mode(PasteBuffer) } }
+				ha:Copy selection to buffer     = { li:a={{<key>e; <key>c}; {Ctrl<Key>c;};};  li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Paste buffer to layout       = { li:a={{<key>e; <Key>v}; a=Ctrl<Key>v;};   action=Mode(PasteBuffer) }
+				-
+				ha:Remove object                = { li:a={{<key>e;<key>d};{<Key>Delete};}; li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Change object {
+					li:submenu {
+						ha:Set Same Style           = { a={<key>e; <key>s; <key>s}; action=SetSame() }
+						ha:Flip Object              = { a={<key>e; <key>i}; action=Flip(Object) }
+						ha:Move to current layer    = { a={<key>e; <key>l}; action=MoveToCurrentLayer(Object) }
+						ha:ChangeJoin Object        = { a={<key>e; <key>j}; action=ChangeJoin(Object) }
+
+						ha:Geometry {
+							li:submenu {
+								ha:Clearance +2 mil             = { a={<key>e; <key>g; <key>c}; action=ChangeClearSize(Object,+2,mil) }
+								ha:Clearance -2 mil             = { a={<key>e; <key>g; Shift<key>c}; action=ChangeClearSize(Object,-2,mil) }
+								ha:ChangeSizes to Route style   = { a={<key>e; <key>g; <key>y}; action=ChangeSizes(Object,style,mil) }
+								ha:ChangeSize +5 mil            = { a={<key>e; <key>g; <key>s}; action=ChangeSize(Object,+5,mil) }
+								ha:ChangeSize -5 mil            = { a={<key>e; <key>g; Shift<key>s}; action=ChangeSize(Object,-5,mil) }
+								ha:ChangeDrill +5 mil           = { a={<key>e; <key>g; <key>d}; action=ChangeDrillSize(Object,+5,mil) }
+								ha:ChangeDrill -5 mil           = { a={<key>e; <key>g; Shift<key>d}; action=ChangeDrillSize(Object,-5,mil) }
+							}
+						}
+					}
+				} # Change object
+				ha:Add/place object {
+					li:submenu {
+						ha:Place mark                       = { li:a={{<key>a;<key>m}; {<key>a;<key>w}; }; action=MarkCrosshair() }
+						ha:Place via                        = { a={<key>a;<key>v}; li:action={Mode(Save); Mode(Via); Mode(Notify); Mode(Restore);} }
+						ha:Start routing a line             = { a={<key>a;<key>l}; li:action={Mode(Save); Mode(Line); Mode(Notify); } }
+						ha:Start routing an arc             = { a={<key>a;<key>a}; li:action={Mode(Save); Mode(Arc); Mode(Notify); } }
+					}
+				}
+				-
+				ha:Edit name of {
+					ha:Change font on layout        = { li:a={{<key>e;<key>o};}   action=FontSel(Object) }
+					li:submenu {
+						ha:text or name               = { li:a={{<key>e;<key>t};};  action=ChangeName(Object) }
+						ha:layout                     = {                           action=ChangeName(Layout) }
+						ha:active layer               = {                           action=ChangeName(Layer) }
+					}
+				}
+				ha:Edit properties of {
+					li:submenu {
+						ha:Layout                     = { action=Propedit(board) }
+						ha:Current Layer              = { action={Propedit(layer:current)} }
+						ha:Current Layer Group        = { action={Propedit(layer_group:current)} }
+					}
+				}
+				ha:Route Styles {
+					li:submenu {
+						@routestyles
+						-
+						ha:Edit...                    = { action=AdjustStyle(0) }
+					}
+				}
+				-
+				ha:Subcircuit {
+					li:submenu {
+						ha:Layer bindings...          = { a={<key>e; <key>s; <key>b}; action=LayerBinding() }
+						ha:External editor...         = { a={<key>e; <key>s; <key>e}; li:action={ GetXY(Click on the subcircuit to edit); extedit(object) } }
+						ha:Refdes                     = { a={<key>e; <key>s; <key>r}; action=ChangeName(Subc) }
+					}
+				}
+				ha:Object flags...                = { a={<key>e; <key>f}; action=FlagEdit() }
+				ha:Object Properties...           = { a={<key>e; <key>p}; action=PropEdit() }
+			}
+		} # Edit
+
+		ha:View {
+			m=V
+			li:submenu {
+			ha:Grid {
+				m=G
+				li:submenu {
+					ha:Enable visible grid        = { a={<key>g; <key>v}; checked=editor/draw_grid; action=conf(toggle, editor/draw_grid, design) }
+					ha:Enable local grid          = { a={<key>g; <key>l}; checked=plugins/hid_gtk/local_grid/enable; action=conf(toggle, plugins/hid_gtk/local_grid/enable, design) }
+					ha:Grid units {
+						li:submenu {
+							ha:mil                    = { a={<key>g; <key>i}; checked=ChkGridUnits(mil); action=SetUnits(mil); update_on={editor/grid_unit} }
+							ha:mm                     = { a={<key>g; <key>m}; checked=ChkGridUnits(mm); action=SetUnits(mm); update_on={editor/grid_unit} }
+						}
+					}
+					ha:Grid size = {
+						li:submenu {
+							ha:No Grid                = { checked=ChkGridSize(none); action=SetValue(Grid,1); update_on={editor/grid} }
+							-
+							@grid
+							-
+							ha:Previous grid          = { li:a={{<key>g; <key>b};{<char>[};}; action=Grid(down) }
+							ha:Next grid              = { li:a={{<key>g; <key>f};{<char>]};}; action=Grid(up) }
+							-
+							ha:Grid *2                = { a={<key>g; <key>d}; action=SetValue(Grid,*2) }
+							ha:Grid /2                = { a={<key>g; <key>h}; action=SetValue(Grid,/2) }
+							ha:Grid -5mil             = { action=SetValue(Grid,-5,mil) }
+							ha:Grid +5mil             = { action=SetValue(Grid,+5,mil) }
+							ha:Grid -0.05mm           = { action=SetValue(Grid,-0.05,mm) }
+							ha:Grid +0.05mm           = { action=SetValue(Grid,+0.05,mm) }
+						}
+					}
+					ha:Grid properties = {
+						li:submenu {
+							ha:Enable local grid      = { checked=plugins/hid_gtk/local_grid/enable; action=conf(toggle, plugins/hid_gtk/local_grid/enable, design) }
+							-
+							ha:local grid radius 4    = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 4)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 4, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) } update_on={} }
+							ha:local grid radius 8    = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 8)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 8, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) } update_on={} }
+							ha:local grid radius 16   = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 16)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 16, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) } update_on={} }
+							ha:local grid radius 32   = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 32)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 32, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) } update_on={} }
+							-
+							ha:sparse global grid     = { checked=plugins/hid_gtk/global_grid/sparse; action=conf(toggle, plugins/hid_gtk/global_grid/sparse, design) }
+							ha:global grid density 4  = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 4)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 4, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) } update_on={} }
+							ha:global grid density 8  = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 8)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 8, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) } update_on={} }
+							ha:global grid density 16 = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 16)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 16, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) } update_on={} }
+						}
+					}
+					ha:Realign grid               = { a={<key>g; <key>r}; action={ GetXY(Click to set the grid origin); Display(ToggleGrid) } }
+					}
+				}
+				-
+				ha:Displayed subcircuit ID {
+					li:submenu {
+						ha:refdes                 = { a={<key>v; <key>s; <key>r}; checked=ChkSubcID(); action=Display(SubcID); update_on={editor/name_on_pcb} }
+						ha:footprint              = { a={<key>v; <key>s; <key>f}; checked=ChkSubcID(%a.footprint%); action=Display(SubcID,"%a.footprint%"); update_on={editor/subc_id} }
+						ha:value                  = { a={<key>v; <key>s; <key>v}; checked=ChkSubcID(%a.value%); action=Display(SubcID,"%a.value%"); update_on={editor/subc_id} }
+						ha:refdes+value           = { a={<key>v; <key>s; <key>s}; checked=ChkSubcID(%a.refdes%\\n%a.value%); action=Display(SubcID,"%a.refdes%\\\\n%a.value%"); update_on={editor/subc_id} }
+					}
+				}
+				ha:Zoom and side {
+					li:submenu {
+						ha:Zoom In 20%            = { m=Z; li:a={{<Key>z;<Key>z;}; {<char>+};} action=Zoom(-1.2) }
+						ha:Zoom Out 20%           = { m=O; li:a={{<Key>z;<Key>x;}; {<char>-};} action=Zoom(+1.2) }
+						ha:Zoom In 2X             = { action=Zoom(-2) }
+						ha:Zoom Out 2X            = { action=Zoom(+2) }
+						ha:Zoom to 0.1mil/px      = { action={Zoom(=0.1mil)} }
+						ha:Zoom to 0.01mm/px      = { action={Zoom(=0.01mm)} }
+						ha:Zoom to 1mil/px        = { action={Zoom(=1mil)} }
+						ha:Zoom to 0.05mm/px      = { action={Zoom(=0.05mm)} }
+						ha:Zoom to 2.5mil/px      = { action={Zoom(=2.5mil)} }
+						ha:Zoom to 0.1mm/px       = { action={Zoom(=0.1mm)} }
+						ha:Zoom to 10mil/px       = { action={Zoom(=10mil)} }
+						ha:Zoom In 20% and center = { m=Z; li:action={Zoom(-1.2); Center()} }
+						ha:Zoom Out 20% and center= { m=O; li:action={Zoom(+1.2); Center()} }
+						-
+						ha:Zoom Extents           = {      li:a={{<Key>z;<Key>e;}; {<key>v;<key>f};}; m=M; action=Zoom() }
+						ha:Zoom to selection      = {      a={<Key>z;<Key>s;}; action=ZoomTo(selected) }
+						ha:Zoom to found          = {      a={<Key>z;<Key>f;}; action=ZoomTo(found) }
+						-
+						ha:Flip up/down           = { checked=editor/view/flip_y; a=<Key>Tab; action=SwapSides(V) }
+						ha:Flip left/right        = { checked=editor/view/flip_x; a=Shift<Key>Tab; action=SwapSides(H) }
+						ha:Spin 180 degrees       = { a=Ctrl<Key>Tab; action=SwapSides(R) }
+						ha:Swap Sides             = { a=Ctrl Shift<Key>Tab; action=SwapSides() }
+						-
+						ha:Center cursor          = { a={<key>v; <key>c} action=Center() }
+					}
+				}
+				ha:Layers {
+					m=G
+					li:submenu {
+						ha:Shown Layers {
+							li:submenu {
+								@layerview
+								-
+								ha:Edit Layer Groups      = { action=EditLayerGroups() }
+							}
+						}
+						ha:Current Layer {
+							li:submenu {
+								anon2=@layerpick
+								-
+								ha:Delete current layer   = { action=MoveLayer(c,-1) }
+								ha:Add new layer          = { action=MoveLayer(-1,c) }
+								ha:Move current layer up  = { action=MoveLayer(c,step-) }
+								ha:Move current layer down= { action=MoveLayer(c,step+) }
+							}
+						}
+					}
+				}
+				ha:Show padstack numbers in a subc = { a={<key>v; <key>n} action=Display(PinOrPadName) }
+				ha:Full screen                     = { checked=editor/fullscreen; a=<char>\\;  action=fullscreen(toggle) }
+			}
+		} # View
+
+		ha:Mode = {
+			m=M
+			li:submenu {
+				ha:Routing {
+					m=R
+					li:submenu {
+						ha:'All-direction' lines            = { li:a={{<key>m; <key>l; <key>a}; {<char>.};}; checked=editor/all_direction_lines; action=conf(toggle, editor/all_direction_lines, design); update_on={editor/all_direction_lines} }
+						ha:Cycle line clip/refraction       = { li:a={{<key>m; <key>l; <key>f}; {<char>/};}; action=Display(CycleClip) }
+						ha:Auto swap line start angle       = { checked=editor/swap_start_direction; action=conf(toggle, editor/swap_start_direction, design) }
+						ha:Auto enforce DRC clearance       = { a={<key>m; <key>l; <key>d}; checked=editor/auto_drc; action=conf(toggle, editor/auto_drc, design) }
+						-
+						ha:Rubber band mode                 = { a={<key>m; <key>r; <key>r}; checked=editor/rubber_band_mode; action=conf(toggle, editor/rubber_band_mode, design) }
+						ha:Rubber band keeps middle line dir= { a={<key>m; <key>r; <key>m}; checked=editor/rubber_band_keep_midlinedir; action=conf(toggle, editor/rubber_band_keep_midlinedir, design) }
+						-
+						ha:Route radius +0.5                = { li:a={{<key>r; <key>r; <char>+}; {<key>r; <key>r; <key>p};}; action=conf(delta, editor/route_radius, +0.5, design); }
+						ha:Route radius -0.5                = { li:a={{<key>r; <key>r; <char>-}; {<key>r; <key>r; <key>m};}; action=conf(delta, editor/route_radius, -0.5, design); }
+						-
+						ha:New lines, arcs clear polygons   = { a={<key>m; <key>l; <key>c}; checked=editor/clear_line; action=conf(toggle, editor/clear_line, design) }
+						ha:New polygons are full ones       = { a={<key>m; <key>p; <key>f}; checked=editor/full_poly; action=conf(toggle, editor/full_poly, design) }
+						ha:New polygons clear polygons      = { a={<key>m; <key>p; <key>c}; checked=editor/clear_polypoly; action=conf(toggle, editor/clear_polypoly, design) }
+					}
+				}
+				ha:Cursor/snap {
+					m=C
+					li:submenu {
+						ha:Orthogonal moves                 = { a={<key>m; <key>c; <key>o}; checked=editor/orthogonal_moves; action=conf(toggle, editor/orthogonal_moves, design) }
+						ha:Crosshair snaps to padstacks     = { a={<key>m; <key>c; <key>p}; checked=editor/snap_pin; action=conf(toggle, editor/snap_pin, design) }
+						ha:Crosshair snaps to off-grid points on lines = { a={<key>m; <key>c; <key>s};checked=editor/snap_offgrid_line; action=conf(toggle, editor/snap_offgrid_line, design) }
+						ha:Crosshair shows DRC clearance    = { a={<key>m; <key>c; <key>c}; checked=editor/show_drc; action=conf(toggle, editor/show_drc, design) }
+					}
+				}
+				ha:Drawing {
+					m=D
+					li:submenu {
+						ha:Show autorouter trials           = { a={<key>m; <key>d; <key>a}; checked=editor/live_routing; action=conf(toggle, editor/live_routing, design) }
+						ha:Highlighting on line, arc points = { a={<key>m; <key>d; <key>h}; checked=editor/highlight_on_point; action=conf(toggle, editor/highlight_on_point, design) }
+						ha:Wireframe draw                   = { li:a={{<key>m; <key>d; <key>w}; {<char>|};}; checked=editor/wireframe_draw; action=conf(toggle, editor/wireframe_draw, design) }
+						ha:Thin draw                        = { a={<key>m; <key>d; <key>t}; checked=editor/thin_draw;  action=conf(toggle, editor/thin_draw, design) }
+						ha:Thin draw poly                   = { a={<key>m; <key>d; <key>p}; checked=editor/thin_draw_poly; action=conf(toggle, editor/thin_draw_poly, design); update_on={editor/thin_draw_poly} }
+						ha:Check polygons                   = { a={<key>m; <key>d; <key>c}; checked=editor/check_planes; action=conf(toggle, editor/check_planes, design) }
+						-
+						ha:Lock floaters                    = { a={<key>m; <key>f; <key>l}; checked=editor/lock_names; action=conf(toggle, editor/lock_names, design) }
+						ha:Only floaters                    = { a={<key>m; <key>f; <key>o}; checked=editor/only_names; action=conf(toggle, editor/only_names, design) }
+						ha:Hide floaters                    = { a={<key>m; <key>f; <key>h}; checked=editor/hide_names; action=conf(toggle, editor/hide_names, design) }
+						-
+						ha:Line Tool size +5 mil            = { a={<key>m; <key>l; <char>+}; action=SetValue(LineSize,+5,mil) }
+						ha:Line Tool size -5 mil            = { a={<key>m; <key>l; <char>-}; action=SetValue(LineSize,-5,mil) }
+						ha:Text Tool scale +10 mil          = { a={<key>m; <key>t; <char>+}; action=SetValue(TextScale,+10,mil) }
+						ha:Text Tool scale -10 mil          = { a={<key>m; <key>t; <char>-}; action=SetValue(TextScale,-10,mil) }
+					}
+				}
+				ha:Mincut on shorts                 = { checked=plugins/mincut/enable; action=conf(toggle, plugins/mincut/enable, design) }
+				ha:Auto-zero delta measurements     = { checked=editor/local_ref; action=conf(toggle, editor/local_ref, design) }
+				ha:Brave mode                       = { action=brave() }
+				ha:Vendor drill mapping             = { checked=plugins/vendor/enable; action=conf(toggle, plugins/vendor/enable, design) }
+				ha:Loose subcircuits (no subc lock) = { a={<key>m; <key>k; <key>s}; checked=subc(loose, check); action=subc(loose, toggle); update_on={} }
+				ha:Tool {
+					li:submenu {
+						ha:Via            = { checked=ChkMode(via);         li:a={{<key>t;<key>v};{<Key>F1};}; action=Mode(Via); update_on={editor/mode} }
+						ha:Line           = { checked=ChkMode(line);        li:a={{<key>t;<key>l};{<Key>F2};}; action=Mode(Line); update_on={editor/mode} }
+						ha:Arc            = { checked=ChkMode(arc);         li:a={{<key>t;<key>a};{<Key>F3};}; action=Mode(Arc); update_on={editor/mode} }
+						ha:Text           = { checked=ChkMode(text);        li:a={{<key>t;<key>t};{<Key>F4};}; action=Mode(Text); update_on={editor/mode} }
+						ha:Rectangle      = { checked=ChkMode(rectangle);   li:a={{<key>t;<key>r};{<Key>F5};}; action=Mode(Rectangle); update_on={editor/mode} }
+						ha:Polygon        = { checked=ChkMode(poly);        li:a={{<key>t;<key>p};{<Key>F6};}; action=Mode(Polygon); update_on={editor/mode} }
+						ha:Polygon Hole   = { checked=ChkMode(polyhole);    a={<key>t;<key>h}; action=Mode(PolygonHole); update_on={editor/mode} }
+						ha:Buffer         = { checked=ChkMode(buffer);      li:a={{<key>t;<key>b};{<Key>F7};}; action=Mode(PasteBuffer); update_on={editor/mode} }
+						ha:Del/Remove     = { checked=ChkMode(remove);      li:a={{<key>t;<key>d};{<Key>F8};}; action=Mode(Remove); update_on={editor/mode} }
+						ha:Rotate         = { checked=ChkMode(rotate);      li:a={{<key>t;<key>o};{<Key>F9};}; action=Mode(Rotate); update_on={editor/mode} }
+						ha:Thermal        = { checked=ChkMode(thermal);     li:a={{<key>t;<key>e};{<Key>F10};}; action=Mode(Thermal); update_on={editor/mode} }
+						ha:Arrow          = { checked=ChkMode(arrow);       li:a={{<key>t;<key>n};{<Key>F11};{<Key>space};}; action=Mode(Arrow); update_on={editor/mode} }
+						ha:Insert Point   = { checked=ChkMode(insert);      li:a={{<key>t;<key>i};{<Key>Insert};}; action=Mode(InsertPoint); update_on={editor/mode} }
+						ha:Move           = { checked=ChkMode(move);        a={<key>t;<key>m}; action=Mode(Move); update_on={editor/mode} }
+						ha:Copy           = { checked=ChkMode(copy);        a={<key>t;<key>c}; action=Mode(Copy); update_on={editor/mode} }
+						ha:Lock           = { checked=ChkMode(lock);        li:a={{<key>t;<key>k};{<Key>F12};}; action=Mode(Lock); update_on={editor/mode} }
+						ha:Cancel         = {                               a={<Key>Escape}; action=Mode(Escape) }
+					}
+				} # Tool
+			}
+		} #Mode
+
+		ha:Select {
+			m=l
+			li:submenu {
+				ha:Select all visible objects      = { a={<key>s; <key>a; <key>a;}; action=Select(All) }
+				ha:Select all connected objects    = { a={<key>s; <key>a; <key>c;}; action=Select(Connection) }
+				ha:Unselect all objects            = { a={<key>s; <key>u; <key>a;}; action=Unselect(All) }
+				ha:unselect all connected objects  = { a={<key>s; <key>u; <key>c;}; action=Unselect(Connection) }
+				-
+#TODO: this is gtk-specific
+				ha:Advanced search and select      = { a={<key>s; <key>s;} action=DoWindows(search) }
+				-
+				ha:Move selected subcircuits to other side= { a={<key>s; <key>f;} action=Flip(SelectedElements) }
+				ha:Move selected objects to current layer = { a={<key>s; <key>l;} action=MoveToCurrentLayer(Selected) }
+				ha:Remove selected objects                = { a={<key>s; <key>r;} action=RemoveSelected() }
+				ha:Convert selection to subcircuit        = { a={<key>s; <key>c; <key>s;} action=Select(ConvertSubc) }
+				ha:Convert selection to padstack          = { a={<key>s; <key>c; <key>p;} li:action={PadstackConvert(selected); Mode(PasteBuffer);} }
+				ha:Break selection subcircuits to pieces  = { a={<key>s; <key>b; <key>s}; li:action={PasteBuffer(Push); PasteBuffer(5); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); PasteBuffer(Restore); PasteBuffer(ToLayout, crosshair); PasteBuffer(Clear); PasteBuffer(Pop);} }
+				ha:Break selection padstack to pieces     = { a={<key>s; <key>b; <key>p}; action=PadstackBreakup(selected) }
+				ha:Change selected objects {
+					li:submenu {
+						ha:Lines -10 mil     = { li:action={ChangeSize(SelectedLines,-10,mil); ChangeSize(SelectedArcs,-10,mil)} }
+						ha:Lines +10 mil     = { li:action={ChangeSize(SelectedLines,+10,mil); ChangeSize(SelectedArcs,+10,mil)} }
+						ha:Texts -10 mil     = { action=ChangeSize(SelectedTexts,-10,mil) }
+						ha:Texts +10 mil     = { action=ChangeSize(SelectedTexts,+10,mil) }
+						-
+						ha:Clearance +2 mil  = { action=ChangeClearSize(SelectedObjects,+2,mil) }
+						ha:Clearance -2 mil  = { action=ChangeClearSize(SelectedObjects,-2,mil) }
+						-
+						ha:Hole -10 mil      = { action=ChangeDrillSize(SelectedPadstacks,-10,mil) }
+						ha:Hole +10 mil      = { action=ChangeDrillSize(SelectedPadstacks,+10,mil) }
+						-
+						ha:Toggle join       = { action=ChangeJoin(SelectedObjects) }
+					}
+				}
+			}
+		} # Select
+
+		ha:Buffer {
+			m=B
+			li:submenu {
+				ha:Rotate buffer 90 deg CCW (left)  = { li:a={{<key>b;<key>r;<key>l}; {Shift<Key>F7};}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1)} }
+				ha:Rotate buffer 90 deg CW (right)  = { a={<key>b;<key>r;<key>r}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,3)} }
+				ha:Arbitrarily Rotate Buffer  = { a={<key>b;<key>r;<key>a}; li:action={Mode(PasteBuffer); FreeRotateBuffer()} }
+				ha:Mirror buffer (up/down)    = { a={<key>b;<key>m;<key>u}; li:action={Mode(PasteBuffer); PasteBuffer(Mirror)} }
+				ha:Mirror buffer (left/right) = { a={<key>b;<key>m;<key>l}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Mirror); PasteBuffer(Rotate,3)} }
+				ha:Normalize                  = { a={<key>b;<key>n}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Normalize);} }
+				-
+				ha:Clear buffer                    = { a={<key>b;<key>c;<key>c;}; action=PasteBuffer(Clear) }
+				ha:Convert buffer to subcircuit    = { a={<key>b;<key>c;<key>s}; action=PasteBuffer(ConvertSubc) }
+				ha:Convert buffer to padstack      = { a={<key>b;<key>c;<key>p}; li:action={PadstackConvert(buffer); Mode(PasteBuffer);} }
+				ha:Break buffer subcircuits to pieces = { a={<key>b;<key>s;<key>b};  action=PasteBuffer(Restore) }
+				ha:Break buffer padstacks to pieces = { a={<key>b;<key>s;<key>p};  action=PadstackBreakup(buffer) }
+				ha:Save buffer subcircuits to file = { a={<key>b;<key>s;<key>s}; action=Save(PasteBuffer) }
+				ha:Layer bindings...               = { a={<key>b;<key>b;}; action=LayerBinding(buffer) }
+
+				ha:Buffer selection {
+					li:submenu {
+						ha:Select Buffer \#1 = { checked=ChkBuffer(1); m=1; a={<key>b;<Key>1;} action=PasteBuffer(1); update_on={editor/buffer_number} }
+						ha:Select Buffer \#2 = { checked=ChkBuffer(2); m=2; a={<key>b;<Key>2;} action=PasteBuffer(2); update_on={editor/buffer_number} }
+						ha:Select Buffer \#3 = { checked=ChkBuffer(3); m=3; a={<key>b;<Key>3;} action=PasteBuffer(3); update_on={editor/buffer_number} }
+						ha:Select Buffer \#4 = { checked=ChkBuffer(4); m=4; a={<key>b;<Key>4;} action=PasteBuffer(4); update_on={editor/buffer_number} }
+						ha:Select scratchpad = { checked=ChkBuffer(5); m=5; a={<key>b;<Key>5;} action=PasteBuffer(5); update_on={editor/buffer_number} }
+					}
+				}
+			}
+		} # Buffer
+
+		ha:Connects = {
+			m=C
+			li:submenu {
+				ha:Rats nest {
+					li:submenu {
+						ha:Optimize rats nest                    = { a={<key>c;<key>r;}; li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(AllRats); Atomic(Block)} }
+						ha:Erase rats nest                       = { a={<key>c;<key>e;}; action=DeleteRats(AllRats) }
+						-
+						ha:Select shortest rat                   = { a={<key>c;<key>s;}; action=AddRats(Close) }
+						ha:AddRats to selected pins              = { li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(SelectedRats); Atomic(Block)} }
+						ha:AddRats Selected                      = { action=AddRats(SelectedRats) }
+						ha:Add All Rats                          = { action=AddRats(AllRats) }
+					}
+				}
+				-
+				ha:Find Connections                          = { a={<key>c;<key>f;}; li:action={Connection(Reset); Connection(Find)} }
+				ha:Clear/reset lookup                        = { a={<key>c;<key>c;}; li:action={Connection(Reset); Display(Redraw)} }
+				-
+				ha:Del/Remove Connected                      = { a={<key>c;<key>d;}; li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} }
+				-
+				ha:Subcircuit Placement {
+					li:submenu {
+						ha:Auto-place selected subcircuits       = { a={<key>a;<key>p;<key>s;}; action=AutoPlaceSelected() }
+						ha:Disperse all subcircuits              = { a={<key>a;<key>d;<key>a;}; action=DisperseElements(All) }
+						ha:Disperse selected subcircuits         = { a={<key>a;<key>d;<key>s;}; action=DisperseElements(Selected) }
+					}
+				}
+				ha:Automatic Routing {
+					li:submenu {
+						ha:Auto-route selected rats              = { a={<key>a;<key>r;<key>s;}; action=AutoRoute(SelectedRats) }
+						ha:Auto-route all rats                   = { a={<key>a;<key>r;<key>a;}; action=AutoRoute(AllRats) }
+						ha:Rip up selected auto-routed tracks    = { a={<key>a;<key>r;<key>t;}; action=RipUp(Selected) }
+						ha:Rip up all auto-routed tracks         = { a={<key>a;<key>r;<key>r;}; action=RipUp(All) }
+					}
+				}
+				ha:Optimize routed tracks {
+					li:submenu {
+						ha:Auto-Optimize        = { a={<key>a;<key>o;<key>a;}; action=djopt(auto) }
+						ha:Debumpify            = { a={<key>a;<key>o;<key>d;}; action=djopt(debumpify) }
+						ha:Unjaggy              = { a={<key>a;<key>o;<key>u;}; action=djopt(unjaggy) }
+						ha:Vianudge             = { a={<key>a;<key>o;<key>n;}; action=djopt(vianudge) }
+						ha:Viatrim              = { a={<key>a;<key>o;<key>t;}; action=djopt(viatrim) }
+						ha:Ortho pull           = { a={<key>a;<key>o;<key>o;}; action=djopt(orthopull) }
+						ha:Simple optimization  = { a={<key>a;<key>o;<key>s;}; action=djopt(simple) }
+						ha:Miter                = { a={<key>a;<key>o;<key>m;}; action=djopt(miter) }
+						ha:Puller               = { a={<key>a;<key>o;<key>p;}; action=Puller() }
+						ha:Global Puller {
+							li:submenu {
+								ha:Selected  = { action=GlobalPuller(selected) }
+								ha:Found     = { action=GlobalPuller(found) }
+								ha:All       = { action=GlobalPuller() }
+							}
+						}
+						-
+						ha:Only autorouted nets = { checked=plugins/djopt/auto_only; action=conf(toggle, plugins/djopt/auto_only, design) }
+					}
+				}
+				-
+				ha:Design Rule Checker = { a={<key>a;<key>x;}; action=DRC() }
+				-
+				ha:Apply vendor drill mapping = { action=ApplyVendor() }
+				-
+				ha:Design changes (back annotation) {
+					li:submenu {
+						ha:Swap nets on two selected pins  = { a={<key>a;<key>b;<key>s;}; action=net(swap) }
+						ha:Replace footprint               = { a={<key>a;<key>b;<key>f;}; action=ReplaceFootprint() }
+					}
+				}
+			}
+		} # Connects
+	
+		ha:Plugins {
+			m=P
+			li:submenu {
+				ha:Manage plugins... = { a={<Key>f;<Key>c;<Key>p;}; action=ManagePlugins() }
+			}
+		} # Plugins
+
+		ha:Window {
+			m=W
+			li:submenu {
+				ha:Library        = { a={<Key>w;<Key>l}; action=DoWindows(Library) }
+				ha:Message Log    = { a={<Key>w;<Key>m}; action=DoWindows(Log) }
+				ha:DRC Check      = { a={<Key>w;<Key>d}; action=DoWindows(DRC) }
+				ha:Netlist        = { a={<Key>w;<Key>n}; action=DoWindows(Netlist) }
+				ha:Command Entry  = { li:a={a={<Key>w;<Key>c}; {<char>:};}  action=Command() }
+				ha:Pinout         = { a={<Key>w;<Key>p}; action=Display(Pinout) }
+				ha:Font selector  = { a={<Key>w;<Key>f};  action=FontSel() }
+				-
+				ha:Key Bindings {
+					li:submenu {
+						ha:Cycle object being dragged   = { li:a={{<char>,};{<key>e;<key>y;};}; action=CycleDrag() }
+
+
+						ha:Step Cursor {
+							li:submenu {
+								ha:Step Up                      = { a=<Key>Up; action=Cursor(Warp,0,1,grid) }
+								ha:Step Down                    = { a=<Key>Down; action=Cursor(Warp,0,-1,grid) }
+								ha:Step Left                    = { a=<Key>Left; action=Cursor(Warp,-1,0,grid) }
+								ha:Step Right                   = { a=<Key>Right; action=Cursor(Warp,1,0,grid) }
+								ha:Step +Up                     = { a=Shift<Key>Up; action=Cursor(Pan,0,50,view) }
+								ha:Step +Down                   = { a=Shift<Key>Down; action=Cursor(Pan,0,-50,view) }
+								ha:Step +Left                   = { a=Shift<Key>Left; action=Cursor(Pan,-50,0,view) }
+								ha:Step +Right                  = { a=Shift<Key>Right; action=Cursor(Pan,50,0,view) }
+								ha:Click                        = { a=<Key>Enter; li:action={Mode(Notify); Mode(Release)} }
+							}
+						}
+						ha:layer keys {
+							li:submenu {
+								ha:Select Layer 1           = { a=<Key>1; action=SelectLayer(1) }
+								ha:Select Layer 2           = { a=<Key>2; action=SelectLayer(2) }
+								ha:Select Layer 3           = { a=<Key>3; action=SelectLayer(3) }
+								ha:Select Layer 4           = { a=<Key>4; action=SelectLayer(4) }
+								ha:Select Layer 5           = { a=<Key>5; action=SelectLayer(5) }
+								ha:Select Layer 6           = { a=<Key>6; action=SelectLayer(6) }
+								ha:Select Layer 7           = { a=<Key>7; action=SelectLayer(7) }
+								ha:Select Layer 8           = { a=<Key>8; action=SelectLayer(8) }
+								ha:Select Layer 9           = { a=<Key>9; action=SelectLayer(9) }
+								ha:Select Layer 10          = { a=<Key>0; action=SelectLayer(10) }
+								ha:Select Layer 11          = { a=Alt<Key>1; action=SelectLayer(11) }
+								ha:Select Layer 12          = { a=Alt<Key>2; action=SelectLayer(12) }
+								ha:Select Layer 13          = { a=Alt<Key>3; action=SelectLayer(13) }
+								ha:Select Layer 14          = { a=Alt<Key>4; action=SelectLayer(14) }
+								ha:Select Layer 15          = { a=Alt<Key>5; action=SelectLayer(15) }
+								ha:Select Layer 16          = { a=Alt<Key>6; action=SelectLayer(16) }
+								ha:Select Layer 17          = { a=Alt<Key>7; action=SelectLayer(17) }
+								ha:Select Layer 18          = { a=Alt<Key>8; action=SelectLayer(18) }
+								ha:Select Layer 19          = { a=Alt<Key>9; action=SelectLayer(19) }
+								ha:Select Layer 20          = { a=Alt<Key>0; action=SelectLayer(20) }
+								-
+								ha:Toggle Layer 1           = { a=Ctrl<Key>1; action=ToggleView(1) }
+								ha:Toggle Layer 2           = { a=Ctrl<Key>2; action=ToggleView(2) }
+								ha:Toggle Layer 3           = { a=Ctrl<Key>3; action=ToggleView(3) }
+								ha:Toggle Layer 4           = { a=Ctrl<Key>4; action=ToggleView(4) }
+								ha:Toggle Layer 5           = { a=Ctrl<Key>5; action=ToggleView(5) }
+								ha:Toggle Layer 6           = { a=Ctrl<Key>6; action=ToggleView(6) }
+								ha:Toggle Layer 7           = { a=Ctrl<Key>7; action=ToggleView(7) }
+								ha:Toggle Layer 8           = { a=Ctrl<Key>8; action=ToggleView(8) }
+								ha:Toggle Layer 9           = { a=Ctrl<Key>9; action=ToggleView(9) }
+								ha:Toggle Layer 10          = { a=Ctrl<Key>0; action=ToggleView(10) }
+								ha:Toggle Layer 11          = { a=Ctrl-Alt<Key>1; action=ToggleView(11) }
+								ha:Toggle Layer 12          = { a=Ctrl-Alt<Key>2; action=ToggleView(12) }
+								ha:Toggle Layer 13          = { a=Ctrl-Alt<Key>3; action=ToggleView(13) }
+								ha:Toggle Layer 14          = { a=Ctrl-Alt<Key>4; action=ToggleView(14) }
+								ha:Toggle Layer 15          = { a=Ctrl-Alt<Key>5; action=ToggleView(15) }
+								ha:Toggle Layer 16          = { a=Ctrl-Alt<Key>6; action=ToggleView(16) }
+								ha:Toggle Layer 17          = { a=Ctrl-Alt<Key>7; action=ToggleView(17) }
+								ha:Toggle Layer 18          = { a=Ctrl-Alt<Key>8; action=ToggleView(18) }
+								ha:Toggle Layer 19          = { a=Ctrl-Alt<Key>9; action=ToggleView(19) }
+								ha:Toggle Layer 20          = { a=Ctrl-Alt<Key>0; action=ToggleView(20) }
+							}
+						} # layer keys
+					}
+				}
+				ha:About...       = { li:a={{<Key>w;<Key>a}; {<key>i;<key>a};}; action=About() }
+			}
+		} # Window
+	} # main menu
+
+	li:popups {
+# context sensitive right click: popup per object type under the cursor
+
+		ha:popup-obj-line {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:Edit flags...          { action=FlagEdit() }
+				ha:Set Same Style         { action=SetSame() }
+				-
+				ha:Remove line            { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Move to current layer  { action=MoveToCurrentLayer(object) }
+			}
+		}
+
+		ha:popup-obj-arc {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:Edit flags...          { action=FlagEdit() }
+				ha:Set Same Style         { action=SetSame() }
+				-
+				ha:Remove arc             { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Move to current layer  { action=MoveToCurrentLayer(object) }
+			}
+		}
+
+		ha:popup-obj-polygon {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:Edit flags...          { action=FlagEdit() }
+				-
+				ha:Remove polygon         { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Move to current layer  { action=MoveToCurrentLayer(object) }
+			}
+		}
+
+		ha:popup-obj-text {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:Edit flags...          { action=FlagEdit() }
+				ha:Edit text              { action=ChangeName(Object) }
+				ha:Set Same Style         { action=SetSame() }
+				-
+				ha:Remove text            { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Move to current layer  { action=MoveToCurrentLayer(object) }
+			}
+		}
+
+		ha:popup-obj-padstack {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:Edit geometry/prototype {action=padstackedit }
+				ha:Edit flags...          { action=FlagEdit() }
+				ha:Set Same Style         { action=SetSame() }
+				-
+				ha:Remove padstack        { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Break up padstack      { action=PadstackBreakup(object) }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+			}
+		}
+
+		ha:popup-obj-subcircuit {
+			li:submenu {
+				ha:Edit properties        { li:action={Unselect(All); Select(object); propedit(); } }
+				ha:External editor...     { action=extedit(object) }
+				ha:Edit flags...          { action=FlagEdit() }
+#TODO: replace from lib
+				-
+				ha:Remove subcircuit      { li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+				ha:Copy to buffer         { li:action={Unselect(All); Select(object); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Move to other side     { action=Flip(object) }
+			}
+		}
+
+		ha:popup-obj-misc {
+			li:submenu {
+				ha:Operations on selections {
+					li:submenu {
+						ha:Unselect all objects               = { action=Unselect(All) }
+						ha:Remove selected objects            = { action=RemoveSelected() }
+						ha:Copy selection to buffer           = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Mode(PasteBuffer)} }
+						ha:Cut selection to buffer            = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer)} }
+						ha:Convert selection to subcircuit    = { action=Select(ConvertSubc) }
+						ha:Auto place selected subcircuits    = { action=AutoPlaceSelected() }
+						ha:Autoroute selected subcircuits     = { action=AutoRoute(SelectedRats) }
+						ha:Rip up selected auto-routed tracks = { action=RipUp(Selected) }
+						ha:Rotate selected                    = { action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer) FreeRotateBuffer(); Mode(PasteBuffer); PasteBuffer(Tolayout, crosshair); } }
+					}
+				}
+				ha:Operations on this location {
+					li:submenu {
+						ha:Generate object report = { li:action={GetXY(Click on the object); Report(Object)} }
+					}
+				}
+				-
+				ha:Undo last operation          = { action=Undo() }
+				ha:Redo last undone operation   = { action=Redo() }
+			}
+		} # popup-obj-misc
+
+		ha:layer {
+			li:submenu {
+				ha:Layer comb. flags...             = { action=EditLayer() }
+				ha:Layer properties...              = { action={Propedit(layer:current)} }
+				ha:Grouping... (layer preferences)  = { action=DoWindows(Preferences, 1, "User PoV/Layers") }
+				-
+				ha:Move up (within group)           = { action=MoveLayer(c, step-) }
+				ha:Move down (within group)         = { action=MoveLayer(c, step+) }
+				-
+				ha:Remove layer                     = { action=MoveLayer(c, -1) }
+				ha:Insert new, before this layer    = { action={ MoveLayer(-1, c); EditLayer() } }
+				ha:Insert new, after this layer     = { action={ MoveLayer(-1, c); MoveLayer(c, step+); EditLayer() } }
+				-
+				ha:all layers on                    = { action=ToggleView(all, vis, set) }
+				ha:all layers off                   = { action=ToggleView(all, vis, clear) }
+			}
+		} # layer
+
+		ha:group {
+			li:submenu {
+				ha:Group name and flags...          = { action=EditGroup(@) }
+				ha:Group properties...              = { action={Propedit(layer_group:current)} }
+				ha:Grouping... (layer preferences)  = { action=DoWindows(Preferences, 1, "User PoV/Layers") }
+				-
+				ha:Remove group                     = { action={ DelGroup(@) } }
+				ha:Insert new layer                 = { action={ MoveLayer(-1, gi); EditLayer() } }
+				ha:Append new layer                 = { action={ MoveLayer(-1, ga); EditLayer() } }
+				-
+				ha:expand groups                    = { action=ToggleView(all, open, set) }
+				ha:collapse groups                  = { action=ToggleView(all, open, clear) }
+				ha:all layers on                    = { action=ToggleView(all, vis, set) }
+				ha:all layers off                   = { action=ToggleView(all, vis, clear) }
+			}
+		} # group
+
+	} # popups
+} # root
Index: tags/2.0.1/src/pcb-menu-gtk.lht
===================================================================
--- tags/2.0.1/src/pcb-menu-gtk.lht	(nonexistent)
+++ tags/2.0.1/src/pcb-menu-gtk.lht	(revision 18980)
@@ -0,0 +1,648 @@
+# Old, OBSOLETE, somewhat unmaintained menu file for users who got used
+# to the old gtk menus and have not yet switched to the new, unified default
+# menu file, pcb-menu-default.lht
+ha:{
+	li:mouse {
+		li:left {
+			li:press            = { Mode(Notify) }
+			li:press-shift      = { Mode(Notify) }
+			li:press-ctrl       = { Mode(Save); Mode(None); Mode(Restore); Mode(Notify) }
+			li:press-shift-ctrl = { Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore) }
+			li:release          = { Mode(Release) }
+			li:release-shift    = { Mode(Release) }
+			li:release-ctrl     = { Mode(Release) }
+			li:release-shift-ctrl = { Mode(Release) }
+		}
+		li:right {
+			li:press         = { Pan(1) }
+			li:release       = { Pan(0) }
+			li:press-shift   = { Popup(popup1) }
+			li:press-ctrl    = { Display(CycleCrosshair) }
+		}
+		li:middle {
+			li:press               = { Mode(Stroke) }
+			li:release             = { Mode(Release) }
+			li:press-ctrl          = { Mode(Save); Mode(Copy); Mode(Notify) }
+			li:release-ctrl        = { Mode(Notify); Mode(Restore); }
+			li:press-shift-ctrl    = { conf(toggle, editor/rubber_band_mode, design); Mode(Save); Mode(Move); Mode(Notify) }
+			li:release-shift-ctrl  = { Mode(Notify); Mode(Restore); conf(toggle, editor/rubber_band_mode, design) }
+		}
+		li:scroll-up {
+			li:press        = { Zoom(0.8) }
+			li:press-shift  = { Scroll(up) }
+			li:press-ctrl   = { Scroll(left) }
+		}
+		li:scroll-down {
+			li:press       = { Zoom(1.25) }
+			li:press-shift = { Scroll(down) }
+			li:press-ctrl  = { Scroll(right) }
+		}
+# If you want zoom to center, do this instead.
+		#ha:scroll-up = { li:{} = {Zoom(0.8); Center()} }
+		#ha:scroll-down = { li:{} = {Zoom(1.25); Center()} }
+	}
+	
+	li:main_menu {
+		### File Menu
+		ha:File {
+			m=F
+			li:submenu {
+				ha:Start New Layout                  = { a=Ctrl<Key>n; action=New() }
+				ha:Revert                            = {                             action=Load(Revert,none); tip=Revert to the layout stored on disk }
+				-
+				ha:Load layout                       = {                             action=Load(Layout); tip=Load a layout from a file }
+				-
+				ha:Save Layout                       = { m=S; a={Ctrl<Key>s};        action=Save(Layout); tip=Saves current layout }
+				ha:Save Layout As...                 = { m=A; a={Shift Ctrl<Key>s};  action=Save(LayoutAs); tip=Saves current layout into a new file }
+				-
+				ha:Import {
+					m=I
+					li:submenu {
+						ha:Import gschem schematics          = {                             action=Import() }
+						ha:Import tEDAx schematics           = {                             action=LoadTedaxFrom(netlist) }
+						ha:Import KiCad/eeschema schematics  = {                             action=LoadEeschemaFrom() }
+						ha:Import mentor graphics schematics = {                             action=LoadMentorFrom() }
+						ha:Load subcircuit data to paste-buffer = {                          li:action={PasteBuffer(Clear); Load(ElementTobuffer)} }
+						ha:Load layout data to paste-buffer  = {                             li:action={PasteBuffer(Clear); Load(LayoutTobuffer)} }
+						ha:Load netlist file                 = {                             action=Load(Netlist) }
+						ha:Load vendor resource file         = {                             action=LoadVendorFrom() }
+						ha:Load routed dsn or ses file       = {                             action=LoadDsnFrom() }
+						ha:Load MUCS pl file                 = {                             action=LoadMucsFrom() }
+						ha:Load TinyCAD .net file            = {                             action=LoadTinyCADFrom() }
+						ha:Load LTSpice .net and .asc files  = {                             action=LoadLTSpiceFrom() }
+						ha:Load HP-GL plot to paste-buffer   = {                             action=LoadHPGLFrom() }
+						ha:Load Hyperlynx .hyp file          = {                             action=LoadHypFrom() }
+					}
+				}
+				-
+				ha:Save connection data of {
+					li:submenu {
+						ha:a single element                  = {                  action=Save(ElementConnections)}
+						ha:all elements                      = {                  action=Save(AllConnections) }
+						ha:unused pins                       = {                  action=Save(AllUnusedPins) }
+						ha:netlist patch for back annotation = {a=Alt Ctrl<Key>b; action=SavePatch() }
+					}
+				}
+				ha:Print layout...      = {               action=Print()}
+				ha:Export layout...     = {               action=ExportGUI()}
+				-
+				ha:Preferences...       = {               action=DoWindows(Preferences)}
+				ha:Maintenance {
+					li:submenu {
+						ha:Calibrate Printer...           = { action=PrintCalibrate() }
+						ha:Re-scan the footprint library  = { action=fp_rehash() }
+						-
+						ha:Edit current font              = { action=FontEdit() }
+						ha:Edit on-disk font              = { action={ LoadFontFrom("", 126); conf(set, design/text_font_id, 126, design); FontEdit() } }
+						ha:Save font from font editor     = { action=FontSave() }
+					}
+				}
+				-
+				ha:Quit Program         = { a=Ctrl<Key>q; action=Quit() }
+			}
+		}
+
+		ha:Edit {
+			m=E
+			li:submenu {
+				ha:Undo last operation          = { a=<Key>u;           action=Undo() }
+				ha:Redo last undone operation   = { a=Shift<Key>r;      action=Redo() }
+				ha:Clear undo-buffer            = { a=Shift Ctrl<Key>u; action=Undo(ClearList) }
+				-
+				ha:Cut selection to buffer      = { a=Ctrl<Key>x;       li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer) } }
+				ha:Copy selection to buffer     = { a=Ctrl<Key>c;       li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } }
+				ha:Paste buffer to layout       = { a=Ctrl<Key>v;       action=Mode(PasteBuffer) }
+				-
+				ha:Unselect all                 = { a=Shift Alt<Key>a;  action=Unselect(All) }
+				ha:Select all visible           = { a=Alt<Key>a;        action=Select(All) }
+				-
+				ha:Change font on layout        = { a=Alt Ctrl<Key>f;   action=FontSel(Object) }
+				ha:Edit name of {
+					li:submenu {
+						ha:text on layout             = { a=<Key>n;           action=ChangeName(Object) }
+						ha:pin on layout              = { a=Shift Ctrl<Key>n; action=ChangeName(Object, Number) }
+						ha:layout                     = {                     action=ChangeName(Layout) }
+						ha:active layer               = {                     action=ChangeName(Layer) }
+					}
+				}
+				ha:Edit attributes of {
+					li:submenu {
+						ha:Layout                     = { action=Attributes(Layout) }
+						ha:CurrentLayer               = { action=Attributes(Layer) }
+						ha:Subcircuit                 = { action=Attributes(Subc) }
+					}
+				}
+				ha:Route Styles {
+					li:submenu {
+						@routestyles
+						-
+						ha:Edit...                    = { action=AdjustStyle(0) }
+					}
+				}
+				ha:Subcircuit {
+					li:submenu {
+						ha:Layer bindings...          = { action=LayerBinding() }
+						ha:External editor...         = { li:action={ GetXY(Click on the subcircuit to edit); extedit(object) } }
+					}
+				}
+				ha:Object flags...                = { action=FlagEdit() }
+			}
+		} # Edit
+
+		ha:View {
+			m=V
+			li:submenu {
+				ha:Enable visible grid        = { checked=editor/draw_grid; action=conf(toggle, editor/draw_grid, design) }
+				ha:Enable local grid          = { checked=plugins/hid_gtk/local_grid/enable; action=conf(toggle, plugins/hid_gtk/local_grid/enable, design) }
+				ha:Grid units {
+					li:submenu {
+						ha:mil                    = { checked=ChkGridUnits(mil); action=SetUnits(mil); update_on={editor/grid_unit} }
+						ha:mm                     = { checked=ChkGridUnits(mm); action=SetUnits(mm); update_on={editor/grid_unit} }
+					}
+				}
+				ha:Grid size = {
+					li:submenu {
+						ha:No Grid                = { checked=ChkGridSize(none); action=SetValue(Grid,1); update_on={editor/grid} }
+						-
+						ha:0.1 mil                = { checked=ChkGridSize(0.1mil); li:action={SetUnits(mil); SetValue(Grid,0.1mil)}; update_on={editor/grid}}
+						ha:1 mil                  = { checked=ChkGridSize(1mil); li:action={SetUnits(mil); SetValue(Grid,1mil)}; update_on={editor/grid} }
+						ha:5 mil                  = { checked=ChkGridSize(5mil); li:action={SetUnits(mil); SetValue(Grid,5mil)}; update_on={editor/grid} }
+						ha:10 mil                 = { checked=ChkGridSize(10mil); li:action={SetUnits(mil); SetValue(Grid,10mil)}; update_on={editor/grid} }
+						ha:25 mil                 = { checked=ChkGridSize(25mil); li:action={SetUnits(mil); SetValue(Grid,25mil)}; update_on={editor/grid} }
+						ha:50 mil                 = { checked=ChkGridSize(50mil); li:action={SetUnits(mil); SetValue(Grid,50mil)}; update_on={editor/grid} }
+						ha:100 mil                = { checked=ChkGridSize(100mil); li:action={SetUnits(mil); SetValue(Grid,100mil)}; update_on={editor/grid} }
+						-
+						ha:0.01 mm                = { checked=ChkGridSize(0.01mm); li:action={SetUnits(mm); SetValue(Grid,0.01mm)}; update_on={editor/grid} }
+						ha:0.05 mm                = { checked=ChkGridSize(0.05mm); li:action={SetUnits(mm); SetValue(Grid,0.05mm)}; update_on={editor/grid} }
+						ha:0.1 mm                 = { checked=ChkGridSize(0.10mm); li:action={SetUnits(mm); SetValue(Grid,0.1mm)}; update_on={editor/grid} }
+						ha:0.25 mm                = { checked=ChkGridSize(0.25mm); li:action={SetUnits(mm); SetValue(Grid,0.25mm)}; update_on={editor/grid} }
+						ha:0.5 mm                 = { checked=ChkGridSize(0.50mm); li:action={SetUnits(mm); SetValue(Grid,0.5mm)}; update_on={editor/grid} }
+						ha:1 mm                   = { checked=ChkGridSize(1mm); li:action={SetUnits(mm); SetValue(Grid,1mm)}; update_on={editor/grid} }
+						-
+						ha:Grid -5mil             = { a=Shift<Key>g; action=SetValue(Grid,-5,mil) }
+						ha:Grid +5mil             = { a=<Key>g;  action=SetValue(Grid,+5,mil) }
+						ha:Grid -0.05mm           = { a=Shift Ctrl<Key>g; action=SetValue(Grid,-0.05,mm) }
+						ha:Grid +0.05mm           = { a=Ctrl<Key>g; action=SetValue(Grid,+0.05,mm) }
+					}
+				}
+				ha:Grid properties = {
+					li:submenu {
+						ha:Enable local grid          = { checked=plugins/hid_gtk/local_grid/enable; action=conf(toggle, plugins/hid_gtk/local_grid/enable, design) }
+						-
+						ha:local grid radius 4   =  { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 4)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 4, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) }; update_on={} }
+						ha:local grid radius 8    = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 8)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 8, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) }; update_on={} }
+						ha:local grid radius 16   = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 16)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 16, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) }; update_on={} }
+						ha:local grid radius 32   = { checked={conf(iseq, plugins/hid_gtk/local_grid/radius, 32)}; li:action={conf(set, plugins/hid_gtk/local_grid/radius, 32, design); conf(set, plugins/hid_gtk/local_grid/enable, 1, design) }; update_on={} }
+						-
+						ha:sparse global grid     = { checked=plugins/hid_gtk/global_grid/sparse; action=conf(toggle, plugins/hid_gtk/global_grid/sparse, design); update_on={} }
+						ha:global grid density 4  = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 4)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 4, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) }; update_on={} }
+						ha:global grid density 8  = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 8)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 8, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) }; update_on={} }
+						ha:global grid density 16 = { checked={conf(iseq, plugins/hid_gtk/global_grid/min_dist_px, 16)}; li:action={conf(set, plugins/hid_gtk/global_grid/min_dist_px, 16, design); conf(set, plugins/hid_gtk/local_grid/enable, 0, design) }; update_on={} }
+					}
+				}
+				ha:Realign grid               = { action={ GetXY(Click to set the grid origin); Display(ToggleGrid) } }
+				-
+				ha:Displayed subcircuit ID {
+					li:submenu {
+						ha:refdes                 = { checked=ChkSubcID(); action=Display(SubcID); update_on={editor/name_on_pcb} }
+						ha:footprint              = { checked=ChkSubcID(%a.footprint%); action=Display(SubcID,"%a.footprint%"); update_on={editor/subc_id} }
+						ha:value                  = { checked=ChkSubcID(%a.value%); action=Display(SubcID,"%a.value%"); update_on={editor/subc_id} }
+						ha:refdes+value           = { checked=ChkSubcID(%a.refdes%\\n%a.value%); action=Display(SubcID,"%a.refdes%\\\\n%a.value%"); update_on={editor/subc_id} }
+					}
+				}
+				ha:Pins/Via show Name/Number  = { a=<Key>d; action=Display(PinOrPadName) }
+				ha:Zoom In 20%                = { m=Z; a=<Key>z; action=Zoom(-1.2) }
+				ha:Zoom Out 20%               = { m=O; a=Shift<Key>z; action=Zoom(+1.2) }
+				ha:More zooms and view changes {
+					li:submenu {
+						ha:Zoom Max               = { m=M; a=<Key>v; action=Zoom() }
+						ha:Zoom In 2X             = { action=Zoom(-2) }
+						ha:Zoom Out 2X            = { action=Zoom(+2) }
+						ha:Zoom to 0.1mil/px      = { action={Zoom(=0.1mil)} }
+						ha:Zoom to 0.01mm/px      = { action={Zoom(=0.01mm)} }
+						ha:Zoom to 1mil/px        = { action={Zoom(=1mil)} }
+						ha:Zoom to 0.05mm/px      = { action={Zoom(=0.05mm)} }
+						ha:Zoom to 2.5mil/px      = { action={Zoom(=2.5mil)} }
+						ha:Zoom to 0.1mm/px       = { action={Zoom(=0.1mm)} }
+						ha:Zoom to 10mil/px       = { action={Zoom(=10mil)} }
+						ha:Zoom In 20% and center = { m=Z; li:action={Zoom(-1.2); Center()} }
+						ha:Zoom Out 20% and center= { m=O; li:action={Zoom(+1.2); Center()} }
+						ha:Flip up/down           = { checked=editor/view/flip_y; a=<Key>Tab; action=SwapSides(V) }
+						ha:Flip left/right        = { checked=editor/view/flip_x; a=Shift<Key>Tab; action=SwapSides(H) }
+						ha:Spin 180 degrees       = { a=Ctrl<Key>Tab; action=SwapSides(R) }
+						ha:Swap Sides             = { a=Ctrl Shift<Key>Tab; action=SwapSides() }
+						ha:Center cursor          = { a=<Key>c; action=Center() }
+					}
+				}
+				-
+				ha:Shown Layers {
+					li:submenu {
+						@layerview
+						-
+						ha:Edit Layer Groups      = { action=DoWindows(Preferences, 1, "User PoV/Layers") }
+					}
+				}
+				ha:Current Layer {
+					li:submenu {
+						anon2=@layerpick
+						-
+						ha:Delete current layer   = { action=MoveLayer(c,-1) }
+						ha:Add new layer          = { action=MoveLayer(-1,c) }
+						ha:Move current layer up  = { action=MoveLayer(c,step-) }
+						ha:Move current layer down= { action=MoveLayer(c,step+) }
+					}
+				}
+				ha:Full screen                = { checked=editor/fullscreen; a=<char>\\;  action=fullscreen(toggle) }
+			}
+		} # View
+
+		ha:Settings = {
+			m=S
+			li:submenu {
+				ha:'All-direction' lines            = { checked=editor/all_direction_lines; a=<char>.; action=conf(toggle, editor/all_direction_lines, design) }
+				ha:Auto swap line start angle       = { checked=editor/swap_start_direction; action=conf(toggle, editor/swap_start_direction, design) }
+				ha:Orthogonal moves                 = { checked=editor/orthogonal_moves; action=conf(toggle, editor/orthogonal_moves, design) }
+				ha:Crosshair snaps to pins and pads = { checked=editor/snap_pin; action=conf(toggle, editor/snap_pin, design) }
+				ha:Crosshair snaps to off-grid points on lines = { checked=editor/snap_offgrid_line; action=conf(toggle, editor/snap_offgrid_line, design) }
+				ha:Crosshair shows DRC clearance    = { checked=editor/show_drc; action=conf(toggle, editor/show_drc, design) }
+				ha:Auto enforce DRC clearance       = { checked=editor/auto_drc; action=conf(toggle, editor/auto_drc, design) }
+				ha:Lock floaters                    = { checked=editor/lock_names; action=conf(toggle, editor/lock_names, design) }
+				ha:Only floaters                    = { checked=editor/only_names; action=conf(toggle, editor/only_names, design) }
+				ha:Hide floaters                    = { checked=editor/hide_names; action=conf(toggle, editor/hide_names, design) }
+				ha:Mincut on shorts                 = { checked=plugins/mincut/enable; action=conf(toggle, plugins/mincut/enable, design) }
+				ha:Libstroke gestures on middle button = { checked=editor/enable_stroke; action=conf(toggle, editor/enable_stroke, design) }
+				-
+				ha:Rubber band mode                 = { checked=editor/rubber_band_mode; action=conf(toggle, editor/rubber_band_mode, design) }
+				ha:Rubber band keeps middle line dir= { checked=editor/rubber_band_keep_midlinedir; action=conf(toggle, editor/rubber_band_keep_midlinedir, design) }
+				ha:Auto-zero delta measurements     = { checked=editor/local_ref; action=conf(toggle, editor/local_ref, design) }
+				ha:New lines, arcs clear polygons   = { checked=editor/clear_line; action=conf(toggle, editor/clear_line, design) }
+				ha:New polygons clear polygons      = { checked=editor/clear_polypoly; action=conf(toggle, editor/clear_polypoly, design) }
+				ha:New polygons are full ones       = { checked=editor/full_poly; action=conf(toggle, editor/full_poly, design) }
+				ha:Show autorouter trials           = { checked=editor/live_routing; action=conf(toggle, editor/live_routing, design) }
+				ha:Highlighting on line, arc points = { checked=editor/highlight_on_point; action=conf(toggle, editor/highlight_on_point, design) }
+				ha:Wireframe draw                   = { checked=editor/wireframe_draw; a=Ctrl<Key>w;  action=conf(toggle, editor/wireframe_draw, design) }
+				ha:Thin draw                        = { checked=editor/thin_draw; a=<char>|;  action=conf(toggle, editor/thin_draw, design) }
+				ha:Thin draw poly                   = { checked=editor/thin_draw_poly; a=Ctrl Shift<Key>p; action=conf(toggle, editor/thin_draw_poly, design) }
+				ha:Check polygons                   = { checked=editor/check_planes; action=conf(toggle, editor/check_planes, design) }
+				ha:Brave mode                       = { action=brave() }
+				-
+				ha:Vendor drill mapping             = { checked=plugins/vendor/enable; action=conf(toggle, plugins/vendor/enable, design) }
+				ha:Import New Elements at = {
+					m=I
+					li:submenu {
+						ha:Center          = { m=C; action=Import(setnewpoint,center) }
+						ha:Mark            = { m=M; action=Import(setnewpoint,mark) }
+						ha:Crosshair       = { m=h; action=Import(setnewpoint) }
+						-
+						ha:Set Dispersion  = { m=D; action=Import(setdisperse) }
+					}
+				}
+			}
+		} #Settings
+
+		ha:Select {
+			m=l
+			li:submenu {
+				ha:Select all visible objects      = { action=Select(All) }
+				ha:Select all connected objects    = { action=Select(Connection) }
+				-
+				ha:Unselect all objects            = { action=Unselect(All) }
+				ha:unselect all connected objects  = { action=Unselect(Connection) }
+				-
+#TODO: this is gtk-specific
+				ha:Advanced search and select= { action=DoWindows(search) }
+				-
+				ha:Auto-place selected subcircuits       = { a=Ctrl<Key>p; action=AutoPlaceSelected() }
+				ha:Disperse all subcircuits              = { action=DisperseElements(All) }
+				ha:Disperse selected subcircuits         = { action=DisperseElements(Selected) }
+				-
+				ha:Move selected subcircuits to other side= { a=Shift<Key>b; action=Flip(SelectedElements) }
+				ha:Move selected to current layer        = { a=Shift<Key>m; action=MoveToCurrentLayer(Selected) }
+				ha:Remove selected objects               = { a=Shift<Key>Delete; action=RemoveSelected() }
+				ha:Convert selection to subcircuit       = { action=Select(ConvertSubc) }
+				ha:Convert selection to padstack         = { li:action={PadstackConvert(selected); Mode(PasteBuffer);} }
+				-
+				ha:Optimize selected rats                = { li:action={DeleteRats(SelectedRats); AddRats(SelectedRats) } }
+				ha:Auto-route selected rats              = { a=Alt<Key>r; action=AutoRoute(SelectedRats) }
+				ha:Rip up selected auto-routed tracks    = { action=RipUp(Selected) }
+				-
+				ha:Edit properties of selected...        = { a=Ctrl<Key>e; action=PropEdit(Selected) }
+				ha:Change size of selected objects {
+					li:submenu {
+						ha:Lines -10 mil = { li:action={ChangeSize(SelectedLines,-10,mil); ChangeSize(SelectedArcs,-10,mil)} }
+						ha:Lines +10 mil = { li:action={ChangeSize(SelectedLines,+10,mil); ChangeSize(SelectedArcs,+10,mil)} }
+						ha:Pads -10 mil  = { action=ChangeSize(SelectedPads,-10,mil) }
+						ha:Pads +10 mil  = { action=ChangeSize(SelectedPads,+10,mil) }
+						ha:Pins -10 mil  = { action=ChangeSize(SelectedPins,-10,mil) }
+						ha:Pins +10 mil  = { action=ChangeSize(SelectedPins,+10,mil) }
+						ha:Texts -10 mil = { action=ChangeSize(SelectedTexts,-10,mil) }
+						ha:Texts +10 mil = { action=ChangeSize(SelectedTexts,+10,mil) }
+						ha:Vias -10 mil  = { action=ChangeSize(SelectedVias,-10,mil) }
+						ha:Vias +10 mil  = { action=ChangeSize(SelectedVias,+10,mil) }
+					}
+				}
+				-
+				ha:Change drilling hole of selected padstacks {
+					li:submenu {
+						ha:Vias -10 mil = { action=ChangeDrillSize(SelectedPadstacks,-10,mil) }
+						ha:Vias +10 mil = { action=ChangeDrillSize(SelectedPadstacks,+10,mil) }
+					}
+				}
+				-
+				ha:Cycle object being dragged = { a=<Key>x; action=CycleDrag() }
+			}
+		} # Select
+
+		ha:Buffer {
+			m=B
+			li:submenu {
+				ha:Cut selection to buffer = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer)} }
+				ha:Paste buffer to layout  = { action=Mode(PasteBuffer) }
+				-
+				ha:Rotate buffer 90 deg CCW   = { a=Shift<Key>F7; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1)} }
+				ha:Rotate buffer 90 deg CW    = { li:action={Mode(PasteBuffer); PasteBuffer(Rotate,3)} }
+				ha:Arbitrarily Rotate Buffer  = { li:action={Mode(PasteBuffer); FreeRotateBuffer()} }
+				ha:Mirror buffer (up/down)    = { li:action={Mode(PasteBuffer); PasteBuffer(Mirror)} }
+				ha:Mirror buffer (left/right) = { li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Mirror); PasteBuffer(Rotate,3)} }
+				-
+				ha:Clear buffer                    = { action=PasteBuffer(Clear) }
+				ha:Convert buffer to subcircuit    = { action=PasteBuffer(ConvertSubc) }
+				ha:Convert buffer to padstack      = { li:action={PadstackConvert(buffer); Mode(PasteBuffer);} }
+				ha:Break buffer subcircuits to pieces = { action=PasteBuffer(Restore) }
+				ha:Save buffer subcircuits to file = { action=Save(PasteBuffer) }
+				ha:Layer bindings...               = { action=LayerBinding(buffer) }
+				-
+				ha:Select Buffer \#1 = { checked=ChkBuffer(1); m=1; a=Shift<Key>1; action=PasteBuffer(1); update_on={editor/buffer_number} }
+				ha:Select Buffer \#2 = { checked=ChkBuffer(2); m=2; a=Shift<Key>2; action=PasteBuffer(2); update_on={editor/buffer_number} }
+				ha:Select Buffer \#3 = { checked=ChkBuffer(3); m=3; a=Shift<Key>3; action=PasteBuffer(3); update_on={editor/buffer_number} }
+				ha:Select Buffer \#4 = { checked=ChkBuffer(4); m=4; a=Shift<Key>4; action=PasteBuffer(4); update_on={editor/buffer_number} }
+				ha:Select Buffer \#5 = { checked=ChkBuffer(5); m=5; a=Shift<Key>5; action=PasteBuffer(5); update_on={editor/buffer_number} }
+			}
+		} # Buffer
+
+		ha:Connects = {
+			m=C
+			li:submenu {
+				ha:Lookup connection to object   = { a=Ctrl<Key>f; li:action={GetXY(Click on the object); Connection(Find)} }
+				ha:Reset scanned pads/pins/vias  = { li:action={Connection(ResetPinsViasAndPads); Display(Redraw)} }
+				ha:Reset scanned lines/polygons  = { li:action={Connection(ResetLinesAndPolygons); Display(Redraw)} }
+				ha:Reset all connections         = { a=Shift<Key>f; li:action={Connection(Reset); Display(Redraw)} }
+				-
+				ha:Optimize rats nest            = { a=<Key>o; li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(AllRats); Atomic(Block)} }
+				ha:Erase rats nest               = { a=<Key>e; action=DeleteRats(AllRats) }
+				ha:Erase selected rats           = { a=Shift<Key>e; action=DeleteRats(SelectedRats) }
+				-
+				ha:Auto-route selected rats      = { action=AutoRoute(Selected) }
+				ha:Auto-route all rats           = { action=AutoRoute(AllRats) }
+				ha:Rip up all auto-routed tracks = { action=RipUp(All) }
+				-
+				ha:Optimize routed tracks {
+					li:submenu {
+						ha:Auto-Optimize        = { a={Ctrl<char>=}; action=djopt(auto) }
+						ha:Debumpify            = { action=djopt(debumpify) }
+						ha:Unjaggy              = { action=djopt(unjaggy) }
+						ha:Vianudge             = { action=djopt(vianudge) }
+						ha:Viatrim              = { action=djopt(viatrim) }
+						ha:Ortho pull           = { action=djopt(orthopull) }
+						ha:Simple optimization  = { a={<char>=}; action=djopt(simple) }
+						ha:Miter                = { action=djopt(miter) }
+						ha:Puller               = { a=<Key>y; action=Puller() }
+						ha:Global Puller {
+							li:submenu {
+								ha:Selected  = { action=GlobalPuller(selected) }
+								ha:Found     = { action=GlobalPuller(found) }
+								ha:All       = { action=GlobalPuller() }
+							}
+						}
+						-
+						ha:Only autorouted nets = { checked=plugins/djopt/auto_only; action=conf(toggle, plugins/djopt/auto_only, design) }
+					}
+				}
+				-
+				ha:Design Rule Checker = { action=DRC() }
+				-
+				ha:Apply vendor drill mapping = { action=ApplyVendor() }
+				-
+				ha:Design changes (back annotation) {
+					li:submenu {
+						ha:Swap nets on two selected pins  = { a=Shift<Key>x; action=net(swap) }
+						ha:Replace footprint               = { a=Alt Shift<Key>f; action=ReplaceFootprint() }
+					}
+				}
+			}
+		} # Connects
+	
+		ha:Plugins {
+			m=P
+			li:submenu {
+				ha:Manage plugins... = { a=Alt<Key>p; action=ManagePlugins() }
+			}
+		} # Plugins
+
+		ha:Info = {
+			m=I
+			li:submenu {
+				ha:Generate object report  = { a=Ctrl<Key>r; action=ReportObject() }
+				ha:Generate drill summary  = { action=Report(DrillReport) }
+				ha:Report found pins\/pads = { action=Report(FoundPins) }
+				ha:Key Bindings {
+					li:submenu {
+						ha:Remove                       = { a=<Key>Delete; li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} }
+						ha:Remove Selected              = { a=<Key>BackSpace; action=RemoveSelected() }
+						ha:Remove Connected             = { a=Shift<Key>BackSpace; li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} }
+						ha:Remove Connected             = { li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} }
+						ha:Set Same                     = { a=<Key>a; action=SetSame() }
+						ha:Flip Object                  = { a=<Key>b; action=Flip(Object) }
+						ha:Find Connections             = { a=<Key>f; li:action={Connection(Reset); Connection(Find)} }
+						ha:ChangeJoin Object            = { a=<Key>j; action=ChangeJoin(Object) }
+						ha:ChangeJoin SelectedObject    = { a=Shift<Key>j; action=ChangeJoin(SelectedObjects) }
+						ha:Clear Object +2 mil          = { a=<Key>k; action=ChangeClearSize(Object,+2,mil) }
+						ha:Clear Object -2 mil          = { a=Shift<Key>k; action=ChangeClearSize(Object,-2,mil) }
+						ha:Clear Selected +2 mil        = { a=Ctrl<Key>k; action=ChangeClearSize(SelectedObjects,+2,mil) }
+						ha:Clear Selected -2 mil        = { a=Shift Ctrl<Key>k; action=ChangeClearSize(SelectedObjects,-2,mil) }
+						ha:Line Tool size +5 mil        = { a=<Key>l; action=SetValue(LineSize,+5,mil) }
+						ha:Line Tool size -5 mil        = { a=Shift<Key>l; action=SetValue(LineSize,-5,mil) }
+						ha:Move Object to current layer = { a=<Key>m; action=MoveToCurrentLayer(Object) }
+						ha:MarkCrosshair                = { a=Ctrl<Key>m; action=MarkCrosshair() }
+						ha:Select shortest rat          = { a=Shift<Key>n; action=AddRats(Close) }
+						ha:AddRats to selected pins     = { a=Shift<Key>o; li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(SelectedRats); Atomic(Block)} }
+						ha:Polygon PreviousPoint        = { a=<Key>p; action=Polygon(PreviousPoint) }
+						ha:Polygon Close                = { a=Shift<Key>p; action=Polygon(Close) }
+						ha:ChangeSizes to Route style   = { a=Shift<Key>y; action=ChangeSizes(Object,style,mil) }
+						ha:ChangeSize +5 mil            = { a=<Key>s; action=ChangeSize(Object,+5,mil) }
+						ha:ChangeSize -5 mil            = { a=Shift<Key>s; action=ChangeSize(Object,-5,mil) }
+						ha:ChangeDrill +5 mil           = { a=Alt<Key>s; action=ChangeDrillSize(Object,+5,mil) }
+						ha:ChangeDrill -5 mil           = { a=Alt Shift<Key>s; action=ChangeDrillSize(Object,-5,mil) }
+						ha:Text Tool scale +10 mil      = { a=<Key>t; action=SetValue(TextScale,+10,mil) }
+						ha:Text Tool scale -10 mil      = { a=Shift<Key>t; action=SetValue(TextScale,-10,mil) }
+						ha:Route radius +0.5            = { a=Alt<Key>c; action=conf(delta, editor/route_radius, +0.5, design); }
+						ha:Route radius -0.5            = { a=Alt Shift<Key>c; action=conf(delta, editor/route_radius, -0.5, design); }
+						ha:AddRats Selected             = { a=Shift<Key>w; action=AddRats(SelectedRats) }
+						ha:Add All Rats                 = { a=<Key>w; action=AddRats(AllRats) }
+						ha:Cycle Clip                   = { a=<char>/; action=Display(CycleClip) }
+						ha:Arrow Mode                   = { a=<Key>space; checked=ChkMode(arrow); action=Mode(Arrow); update_on={editor/mode} }
+						ha:Temp Arrow ON                = { a=<char>[; li:action={Mode(Save); Mode(Arrow); Mode(Notify)} }
+						ha:Temp Arrow OFF               = { a=<char>]; li:action={Mode(Release); Mode(Restore)} }
+						-
+						ha:Step Up                      = { a=<Key>Up; action=Cursor(Warp,0,1,grid) }
+						ha:Step Down                    = { a=<Key>Down; action=Cursor(Warp,0,-1,grid) }
+						ha:Step Left                    = { a=<Key>Left; action=Cursor(Warp,-1,0,grid) }
+						ha:Step Right                   = { a=<Key>Right; action=Cursor(Warp,1,0,grid) }
+						ha:Step +Up                     = { a=Shift<Key>Up; action=Cursor(Pan,0,50,view) }
+						ha:Step +Down                   = { a=Shift<Key>Down; action=Cursor(Pan,0,-50,view) }
+						ha:Step +Left                   = { a=Shift<Key>Left; action=Cursor(Pan,-50,0,view) }
+						ha:Step +Right                  = { a=Shift<Key>Right; action=Cursor(Pan,50,0,view) }
+						ha:Click                        = { a=<Key>Enter; li:action={Mode(Notify); Mode(Release)} }
+						-
+						ha:layer keys {
+							li:submenu {
+								ha:Select Layer 1           = { a=<Key>1; action=SelectLayer(1) }
+								ha:Select Layer 2           = { a=<Key>2; action=SelectLayer(2) }
+								ha:Select Layer 3           = { a=<Key>3; action=SelectLayer(3) }
+								ha:Select Layer 4           = { a=<Key>4; action=SelectLayer(4) }
+								ha:Select Layer 5           = { a=<Key>5; action=SelectLayer(5) }
+								ha:Select Layer 6           = { a=<Key>6; action=SelectLayer(6) }
+								ha:Select Layer 7           = { a=<Key>7; action=SelectLayer(7) }
+								ha:Select Layer 8           = { a=<Key>8; action=SelectLayer(8) }
+								ha:Select Layer 9           = { a=<Key>9; action=SelectLayer(9) }
+								ha:Select Layer 10          = { a=<Key>0; action=SelectLayer(10) }
+								ha:Select Layer 11          = { a=Alt<Key>1; action=SelectLayer(11) }
+								ha:Select Layer 12          = { a=Alt<Key>2; action=SelectLayer(12) }
+								ha:Select Layer 13          = { a=Alt<Key>3; action=SelectLayer(13) }
+								ha:Select Layer 14          = { a=Alt<Key>4; action=SelectLayer(14) }
+								ha:Select Layer 15          = { a=Alt<Key>5; action=SelectLayer(15) }
+								ha:Select Layer 16          = { a=Alt<Key>6; action=SelectLayer(16) }
+								ha:Select Layer 17          = { a=Alt<Key>7; action=SelectLayer(17) }
+								ha:Select Layer 18          = { a=Alt<Key>8; action=SelectLayer(18) }
+								ha:Select Layer 19          = { a=Alt<Key>9; action=SelectLayer(19) }
+								ha:Select Layer 20          = { a=Alt<Key>0; action=SelectLayer(20) }
+								-
+								ha:Toggle Layer 1           = { a=Ctrl<Key>1; action=ToggleView(1) }
+								ha:Toggle Layer 2           = { a=Ctrl<Key>2; action=ToggleView(2) }
+								ha:Toggle Layer 3           = { a=Ctrl<Key>3; action=ToggleView(3) }
+								ha:Toggle Layer 4           = { a=Ctrl<Key>4; action=ToggleView(4) }
+								ha:Toggle Layer 5           = { a=Ctrl<Key>5; action=ToggleView(5) }
+								ha:Toggle Layer 6           = { a=Ctrl<Key>6; action=ToggleView(6) }
+								ha:Toggle Layer 7           = { a=Ctrl<Key>7; action=ToggleView(7) }
+								ha:Toggle Layer 8           = { a=Ctrl<Key>8; action=ToggleView(8) }
+								ha:Toggle Layer 9           = { a=Ctrl<Key>9; action=ToggleView(9) }
+								ha:Toggle Layer 10          = { a=Ctrl<Key>0; action=ToggleView(10) }
+								ha:Toggle Layer 11          = { a=Ctrl-Alt<Key>1; action=ToggleView(11) }
+								ha:Toggle Layer 12          = { a=Ctrl-Alt<Key>2; action=ToggleView(12) }
+								ha:Toggle Layer 13          = { a=Ctrl-Alt<Key>3; action=ToggleView(13) }
+								ha:Toggle Layer 14          = { a=Ctrl-Alt<Key>4; action=ToggleView(14) }
+								ha:Toggle Layer 15          = { a=Ctrl-Alt<Key>5; action=ToggleView(15) }
+								ha:Toggle Layer 16          = { a=Ctrl-Alt<Key>6; action=ToggleView(16) }
+								ha:Toggle Layer 17          = { a=Ctrl-Alt<Key>7; action=ToggleView(17) }
+								ha:Toggle Layer 18          = { a=Ctrl-Alt<Key>8; action=ToggleView(18) }
+								ha:Toggle Layer 19          = { a=Ctrl-Alt<Key>9; action=ToggleView(19) }
+								ha:Toggle Layer 20          = { a=Ctrl-Alt<Key>0; action=ToggleView(20) }
+							}
+						} # layer keys
+					}
+				}
+			}
+		} # Info
+
+		ha:Window {
+			m=W
+			li:submenu {
+				ha:Library        = { a=<Key>i; action=DoWindows(Library) }
+				ha:Message Log    = { action=DoWindows(Log) }
+				ha:DRC Check      = { action=DoWindows(DRC) }
+				ha:Netlist        = { action=DoWindows(Netlist) }
+				ha:Command Entry  = { a={<char>:}; action=Command() }
+				ha:Pinout         = { a=Shift<Key>d; action=Display(Pinout) }
+				ha:Font selector  = { a=Ctrl Shift<Key>f; action=FontSel() }
+				-
+				ha:About...       = { action=About() }
+			}
+		} # Window
+	} # main menu
+
+	li:popups {
+
+		ha:popup1 {
+			li:submenu {
+				ha:Operations on selections {
+					li:submenu {
+						ha:Unselect all objects               = { action=Unselect(All) }
+						ha:Remove selected objects            = { action=RemoveSelected() }
+						ha:Copy selection to buffer           = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Mode(PasteBuffer)} }
+						ha:Cut selection to buffer            = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer)} }
+						ha:Convert selection to subcircuit    = { action=Select(ConvertSubc) }
+						ha:Auto place selected subcircuits    = { action=AutoPlaceSelected() }
+						ha:Autoroute selected subcircuits     = { action=AutoRoute(SelectedRats) }
+						ha:Rip up selected auto-routed tracks = { action=RipUp(Selected) }
+						ha:Rotate selected                    = { action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer) FreeRotateBuffer(); Mode(PasteBuffer); PasteBuffer(Tolayout, crosshair); } }
+					}
+				}
+				ha:Operations on this location {
+					li:submenu {
+						ha:Generate object report = { li:action={GetXY(Click on the object); Report(Object)} }
+					}
+				}
+				-
+				ha:Undo last operation          = { action=Undo() }
+				ha:Redo last undone operation   = { action=Redo() }
+				-
+				ha:Tools {
+					li:submenu {
+						ha:None           = { checked=ChkMode(none); action=Mode(None); update_on={editor/mode} }
+						ha:Via            = { checked=ChkMode(via); a=<Key>F1; action=Mode(Via); update_on={editor/mode} }
+						ha:Line           = { checked=ChkMode(line); a=<Key>F2; action=Mode(Line); update_on={editor/mode} }
+						ha:Arc            = { checked=ChkMode(arc); a=<Key>F3; action=Mode(Arc); update_on={editor/mode} }
+						ha:Text           = { checked=ChkMode(text); a=<Key>F4; action=Mode(Text); update_on={editor/mode} }
+						ha:Rectangle      = { checked=ChkMode(rectangle); a=<Key>F5; action=Mode(Rectangle); update_on={editor/mode} }
+						ha:Polygon        = { checked=ChkMode(polygon); a=<Key>F6; action=Mode(Polygon); update_on={editor/mode} }
+						ha:Polygon Hole   = { checked=ChkMode(polygonhole); action=Mode(PolygonHole); update_on={editor/mode} }
+						ha:Buffer         = { checked=ChkMode(pastebuffer); a=<Key>F7; action=Mode(PasteBuffer); update_on={editor/mode} }
+						ha:Remove         = { checked=ChkMode(remove); a=<Key>F8; action=Mode(Remove); update_on={editor/mode} }
+						ha:Rotate         = { checked=ChkMode(rotate); a=<Key>F9; action=Mode(Rotate); update_on={editor/mode} }
+						ha:Thermal        = { checked=ChkMode(thermal); a=<Key>F10; action=Mode(Thermal); update_on={editor/mode} }
+						ha:Arrow          = { checked=ChkMode(arrow); a=<Key>F11; action=Mode(Arrow); update_on={editor/mode} }
+						ha:Insert Point   = { checked=ChkMode(insertpoint); a=<Key>Insert; action=Mode(InsertPoint); update_on={editor/mode} }
+						ha:Move           = { checked=ChkMode(move); action=Mode(Move); update_on={editor/mode} }
+						ha:Copy           = { checked=ChkMode(copy); action=Mode(Copy); update_on={editor/mode} }
+						ha:Lock           = { checked=ChkMode(lock); a=<Key>F12; action=Mode(Lock); update_on={editor/mode} }
+						ha:Cancel         = { a=<Key>Escape; action=Mode(Escape) }
+					}
+				}
+			}
+		} # popup1
+
+		ha:layer {
+			li:submenu {
+				ha:Layer properties...              = { action=EditLayer() }
+				ha:Layer attributes...              = { action=Attributes(Layer) }
+				ha:Grouping... (layer preferences)  = { action=DoWindows(Preferences, 1, "User PoV/Layers") }
+				-
+				ha:Move up (within group)           = { action=MoveLayer(c, step-) }
+				ha:Move down (within group)         = { action=MoveLayer(c, step+) }
+				-
+				ha:Remove                           = { action=MoveLayer(c, -1) }
+				ha:Insert new, before this layer    = { action={ MoveLayer(-1, c); EditLayer() } }
+				ha:Insert new, after this layer     = { action={ MoveLayer(-1, c); MoveLayer(c, step+); EditLayer() } }
+				-
+				ha:all layers on                    = { action=ToggleView(all, vis, set) }
+				ha:all layers off                   = { action=ToggleView(all, vis, clear) }
+			}
+		} # layer
+
+		ha:group {
+			li:submenu {
+				ha:Group properties...              = { action=EditGroup(@) }
+				ha:Grouping... (layer preferences)  = { action=DoWindows(Preferences, 1, "User PoV/Layers") }
+				-
+				ha:Insert new layer                 = { action={ MoveLayer(-1, gi); EditLayer() } }
+				ha:Append new layer                 = { action={ MoveLayer(-1, ga); EditLayer() } }
+				-
+				ha:expand groups                    = { action=ToggleView(all, open, set) }
+				ha:collapse groups                  = { action=ToggleView(all, open, clear) }
+				ha:all layers on                    = { action=ToggleView(all, vis, set) }
+				ha:all layers off                   = { action=ToggleView(all, vis, clear) }
+			}
+		} # group
+
+	} # popups
+} # root
Index: tags/2.0.1/src/pcb-menu-lesstif.lht
===================================================================
--- tags/2.0.1/src/pcb-menu-lesstif.lht	(nonexistent)
+++ tags/2.0.1/src/pcb-menu-lesstif.lht	(revision 18980)
@@ -0,0 +1,517 @@
+# Old, OBSOLETE, somewhat unmaintained menu file for users who got used
+# to the old lesstif menus and have not yet switched to the new, unified default
+# menu file, pcb-menu-default.lht
+
+ha:{
+	li:mouse {
+		li:left {
+			li:press         = { Mode(Notify) }
+			li:press-shift   = { Mode(Notify) }
+			li:release       = { Mode(Release) }
+			li:release-shift = { Mode(Release) }
+		}
+		li:right {
+			li:press         = { Mode(Save); Mode(Rotate); Mode(Notify); Mode(Release); Mode(Restore); }
+			li:press-ctrl    = { Display(CycleCrosshair) }
+		}
+		li:middle {
+			li:press         = { Pan(1) }
+			li:release       = { Pan(0) }
+			li:press-ctrl    = { Pan(thumb,1) }
+			li:release-ctrl  = { Pan(thumb,0) }
+		}
+		li:scroll-up {
+			li:press         = { Zoom(0.8) }
+		}
+		li:scroll-down {
+			li:press         = { Zoom(1.25) }
+		}
+		#If you want zoom to center, do this instead.
+		#in scroll-up:
+		#li:press = {Zoom(0.8); Center()}
+		#in scroll-down:
+		#li:perss = {Zoom(1.25); Center()}
+	}
+
+	li:main_menu {
+		ha:File = {
+			li:submenu {
+				ha:About... = { action=About() }
+				ha:Save layout = { m=S; a=Ctrl<Key>s; action=Save(Layout) }
+				ha:Save layout as... = { m=A; a=Shift Ctrl<Key>s; action=Save(LayoutAs) }
+				ha:Revert = { action=Load(Revert,none) }
+				ha:Load layout = { action=Load(Layout) }
+				ha:Import = {
+					li:submenu {
+						ha:Import gschem schematics          = { action=Import() }
+						ha:Import tEDAx schematics           = { action=LoadTedaxFrom(netlist) }
+						ha:Import KiCad/eeschema schematics  = { action=LoadEeschemaFrom() }
+						ha:Import mentor graphics schematics = { action=LoadMentorFrom() }
+						ha:Load subcircuit data to paste-buffer = { li:action={PasteBuffer(Clear); Load(ElementTobuffer)} }
+						ha:Load layout data to paste-buffer  = { li:action={PasteBuffer(Clear); Load(LayoutTobuffer)} }
+						ha:Load netlist file                 = { action=Load(Netlist) }
+						ha:Load vendor resource file         = { action=LoadVendor() }
+						ha:Load routed dsn or ses file       = { action=LoadDsnFrom() }
+						ha:Load MUCS pl file                 = { action=LoadMucsFrom() }
+						ha:Load TinyCAD .net file            = { action=LoadTinyCADFrom() }
+						ha:Load LTSpice .net and .asc files  = { action=LoadLTSpiceFrom() }
+						ha:Load HP-GL plot to paste-buffer   = { action=LoadHPGLFrom() }
+						ha:Load Hyperlynx .hyp file          = { action=LoadHypFrom() }
+					}
+				}
+				ha:Print layout... = { action=Print() }
+				ha:Export layout... = { action=ExportGUI() }
+				ha:Maintenance {
+					li:submenu {
+						ha:Calibrate Printer...           = { action=PrintCalibrate() }
+						ha:Re-scan the footprint library  = { action=fp_rehash() }
+						-
+						ha:Edit current font              = { action=FontEdit() }
+						ha:Edit on-disk font              = { action={ LoadFontFrom("", 126); conf(set, design/text_font_id, 126, design); FontEdit() } }
+						ha:Save font from font editor     = { action=FontSave() }
+					}
+				}
+				-
+				ha:Save connection data of... = { foreground=grey50; sensitive=false }
+				ha: a single element = { action=Save(ElementConnections) }
+				ha: all elements = { action=Save(AllConnections) }
+				ha: unused pins = { action=Save(AllUnusedPins) }
+				-
+				ha:Start new layout = { a=Ctrl<Key>n; action=New() }
+				-
+				ha:Quit Program = { m=Q; a=Ctrl<Key>q; action=Quit() }
+			}
+		} # File
+
+		ha:View {
+			li:submenu {
+				ha:Flip up/down = { checked=editor/view/flip_y; a=<Key>Tab; action=SwapSides(V) }
+				ha:Flip left/right = { checked=editor/view/flip_x; a=Shift<Key>Tab; action=SwapSides(H) }
+				ha:Spin 180° = { a=Ctrl<Key>Tab; action=SwapSides(R) }
+				ha:Swap Sides = { a=Ctrl Shift<Key>Tab; action=SwapSides() }
+				ha:Center cursor = { a=<Key>c; action=Center() }
+				ha:Show soldermask = { checked=editor/show_mask; action=Display(ToggleMask) }
+				-
+				ha:Displayed subcircuit ID... = { foreground=grey50; sensitive=false }
+				ha:refdes                 = { checked=ChkSubcID(); action=Display(SubcID) }
+				ha:footprint              = { checked=ChkSubcID(%a.footprint%); action=Display(SubcID,"%a.footprint%") }
+				ha:value                  = { checked=ChkSubcID(%a.value%); action=Display(SubcID,"%a.value%") }
+				ha:refdes+value           = { checked=ChkSubcID(%a.refdes%\\n%a.value%); action=Display(SubcID,"%a.refdes%\\\\n%a.value%") }
+				ha:Lock floaters = { checked=editor/lock_names; action=conf(toggle, editor/lock_names, design) }
+				ha:Only floaters = { checked=editor/only_names; action=conf(toggle, editor/only_names, design) }
+				ha:Hide floaters = { checked=editor/hide_names; action=conf(toggle, editor/hide_names, design) }
+				ha:Mincut on shorts = { checked=plugins/mincut/enable; action=conf(toggle, plugins/mincut/enable, design) }
+				-
+				ha:Open pinout menu = { action=Display(Pinout) }
+				ha:Zoom {
+					li:submenu {
+						ha:Zoom In 2X = { action=Zoom(-2) }
+						ha:Zoom In 20% = { m=Z; a=<Key>z; action=Zoom(-1.2) }
+						ha:Zoom Out 20% = { m=O; a=Shift<Key>z; action=Zoom(+1.2); }
+						ha:Zoom Out 2X = { action=Zoom(+2) }
+						ha:Zoom Max = { m=M; a=<Key>v; action=Zoom() }
+						ha:Zoom Toggle = { a=<Key>`; action=Zoom(Toggle) }
+						-
+						ha:Zoom to 0.1mil\/px = { action={Zoom(=0.1mil)} }
+						ha:Zoom to 0.01mm\/px = { action={Zoom(=0.01mil)} }
+						ha:Zoom to 1mil\/px = { action={Zoom(=1mil)} }
+						ha:Zoom to 0.05mm\/px = { action={Zoom(=0.05mm)} }
+						ha:Zoom to 2.5mil\/px = { action={Zoom(=2.5mil)} }
+						ha:Zoom to 0.1mm\/px = { action={Zoom(=0.1mm)} }
+						ha:Zoom to 10mil\/px = { action={Zoom(=10mil)} }
+					}
+				}
+				ha:Grid {
+					li:submenu {
+						ha:mil = { checked=ChkGridUnits(mil); action=SetUnits(mil) }
+						ha:mm = { checked=ChkGridUnits(mm); action=SetUnits(mm) }
+						ha:Display grid = { checked=editor/draw_grid; action=conf(toggle, editor/draw_grid, design) }
+						ha:Realign grid = { action={ GetXY(Click to set the grid origin); Display(ToggleGrid) } }
+						ha:No Grid = { checked=ChkGridSize(none); action=SetValue(Grid,1) }
+						-
+						ha:0.1 mil = { checked=ChkGridSize(0.1mil); li:action={SetUnits(mil); SetValue(Grid,0.1mil)} }
+						ha:1 mil = { checked=ChkGridSize(1mil); li:action={SetUnits(mil); SetValue(Grid,1mil)} }
+						ha:5 mil = { checked=ChkGridSize(5mil); li:action={SetUnits(mil); SetValue(Grid,5mil)} }
+						ha:10 mil = { checked=ChkGridSize(10mil); li:action={SetUnits(mil); SetValue(Grid,10mil)} }
+						ha:25 mil = { checked=ChkGridSize(25mil); li:action={SetUnits(mil); SetValue(Grid,25mil)} }
+						ha:50 mil = { checked=ChkGridSize(50mil); li:action={SetUnits(mil); SetValue(Grid,50mil)} }
+						ha:100 mil = { checked=ChkGridSize(100mil); li:action={SetUnits(mil); SetValue(Grid,100mil)} }
+						-
+						ha:0.01 mm = { checked=ChkGridSize(0.01mm); li:action={SetUnits(mm); SetValue(Grid,0.01mm)} }
+						ha:0.05 mm = { checked=ChkGridSize(0.05mm); li:action={SetUnits(mm); SetValue(Grid,0.05mm)} }
+						ha:0.1 mm = { checked=ChkGridSize(0.10mm); li:action={SetUnits(mm); SetValue(Grid,0.1mm)} }
+						ha:0.25 mm = { checked=ChkGridSize(0.25mm); li:action={SetUnits(mm); SetValue(Grid,0.25mm)} }
+						ha:0.5 mm = { checked=ChkGridSize(0.50mm); li:action={SetUnits(mm); SetValue(Grid,0.5mm)} }
+						ha:1 mm = { checked=ChkGridSize(1mm); li:action={SetUnits(mm); SetValue(Grid,1mm)} }
+						-
+						ha:Grid -5mil = { a=Shift<Key>g; action=SetValue(Grid,-5,mil) }
+						ha:Grid +5mil = { a=<Key>g; action=SetValue(Grid,+5,mil) }
+						ha:Grid -0.05mm = { a=Shift Ctrl<Key>g; action=SetValue(Grid,-0.05,mm) }
+						ha:Grid +0.05mm = { a=Ctrl<Key>g; action=SetValue(Grid,+0.05,mm) }
+					}
+				}
+				-
+				ha:Shown Layers {
+					li:submenu {
+						@layerview
+						-
+						ha:Edit Layer Groups = { action=EditLayerGroups() }
+					}
+				}
+				ha:Current Layer {
+					li:submenu {
+						@layerpick
+						-
+						ha:Delete current layer = { action=MoveLayer(c,-1) }
+						ha:Add new layer = { action=MoveLayer(-1,c) }
+						ha:Move current layer up = { action=MoveLayer(c,step-) }
+						ha:Move current layer down = { action=MoveLayer(c,step+) }
+					}
+				}
+			}
+		} # View
+
+		ha:Edit {
+			li:submenu {
+				ha:Undo last operation = { a=<Key>u; action=Undo() }
+				ha:Redo last undone operation = { a=Shift<Key>r; action=Redo() }
+				ha:Clear undo-buffer = { a=Shift Ctrl<Key>u; action=Undo(ClearList); }
+				-
+				ha:Cut selection to buffer = { a=Ctrl<Key>x; li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer) }}
+				ha:Copy selection to buffer = { a=Ctrl<Key>c; li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Mode(PasteBuffer)} }
+				ha:Paste buffer to layout = { a=Ctrl<Key>v; action=Mode(PasteBuffer) }
+				-
+				ha:Unselect all = { a=Shift Alt<Key>a; action=Unselect(All) }
+				ha:Select all visible = { a=Alt<Key>a; action=Select(All) }
+				-
+				ha:Edit Names... = { foreground=grey50; sensitive=false }
+				ha: Change text on layout = { a=<Key>n; action=ChangeName(Object) }
+				ha: Change number on layout = { a=Shift Ctrl<Key>n; action=ChangeName(Object, Number) }
+				ha: Edit name of layout = { action=ChangeName(Layout) }
+				ha: Edit name of active layer = { action=ChangeName(Layer) }
+				ha: Change font on layout = { a=Alt Ctrl<Key>f;   action=FontSel(Object) }
+				ha:Edit Attributes... = { foreground=grey50; sensitive=false }
+				ha: Layout = { action=Attributes(Layout) }
+				ha: CurrentLayer = { action=Attributes(Layer) }
+				ha: Element = { action=Attributes(Element) }
+				ha: Subcircuit = { action=Attributes(Subc) }
+				-
+				ha:Board Sizes = { action=AdjustSizes() }
+				ha:Route Styles {
+					li:submenu {
+						@routestyles
+						-
+						ha:Edit... = { action=AdjustStyle(0) }
+					}
+				}
+				ha:Subcircuit {
+					li:submenu {
+						ha:Layer bindings...          = { action=LayerBinding() }
+						ha:External editor...         = { li:action={ GetXY(Click on the subcircuit to edit); extedit(object) } }
+					}
+				}
+				ha:Object flags...                = { action=FlagEdit() }
+			}
+		} # Edit
+
+		ha:Tools {
+			li:submenu {
+				ha:None = { checked=ChkMode(none); action=Mode(None) }
+				ha:Via = { checked=ChkMode(via); a=<Key>F1; action=Mode(Via) }
+				ha:Line = { checked=ChkMode(line); a=<Key>F2; action=Mode(Line) }
+				ha:Arc = { checked=ChkMode(arc); a=<Key>F3; action=Mode(Arc) }
+				ha:Text = { checked=ChkMode(text); a=<Key>F4; action=Mode(Text) }
+				ha:Rectangle = { checked=ChkMode(rectangle); a=<Key>F5; action=Mode(Rectangle) }
+				ha:Polygon = { checked=ChkMode(polygon); a=<Key>F6; action=Mode(Polygon) }
+				ha:Polygon Hole = { checked=ChkMode(polygonhole); action=Mode(PolygonHole); }
+				ha:Buffer = { checked=ChkMode(pastebuffer); a=<Key>F7; action=Mode(PasteBuffer) }
+				ha:Remove = { checked=ChkMode(remove); a=<Key>F8; action=Mode(Remove) }
+				ha:Rotate = { checked=ChkMode(rotate); a=<Key>F9; action=Mode(Rotate) }
+				ha:Thermal = { checked=ChkMode(thermal); a=<Key>F10; action=Mode(Thermal) }
+				ha:Arrow = { checked=ChkMode(arrow); a=<Key>F11; action=Mode(Arrow) }
+				ha:Insert Point = { checked=ChkMode(insertpoint); a=<Key>Insert; action=Mode(InsertPoint) }
+				ha:Move = { checked=ChkMode(move); action=Mode(Move) }
+				ha:Copy = { checked=ChkMode(copy); action=Mode(Copy) }
+				ha:Lock = { checked=ChkMode(lock); a=<Key>F12; action=Mode(Lock) }
+				ha:Cancel = { a=<Key>Escape; action=Mode(Cancel) }
+				-
+				ha:Command = { a={<Key>:}; action=Command() }
+			}
+		} # Tools
+
+		ha:Settings {
+			li:submenu {
+				ha:Layer groups = { foreground=grey50; sensitive=false }
+				ha:Edit layer groupings = { action=EditLayerGroups() }
+				-
+				ha:'All-direction' lines = { checked=editor/all_direction_lines; a=<Key>.; action=conf(toggle, editor/all_direction_lines, design) }
+				ha:Auto swap line start angle = { checked=editor/swap_start_direction; action=conf(toggle, editor/swap_start_direction, design) }
+				ha:Orthogonal moves = { checked=editor/orthogonal_moves; action=conf(toggle, editor/orthogonal_moves, design) }
+				ha:Crosshair snaps to pins and pads = { checked=editor/snap_pin; action=conf(toggle, editor/snap_pin, design) }
+				ha:Crosshair snaps to off-grid points on lines = { checked=editor/snap_offgrid_line; action=conf(toggle, editor/snap_offgrid_line, design) }
+				ha:Crosshair shows DRC clearance = { checked=editor/show_drc; action=conf(toggle, editor/show_drc, design) }
+				ha:Auto enforce DRC clearance = { checked=editor/auto_drc; action=conf(toggle, editor/auto_drc, design) }
+				-
+				ha:Rubber band mode = { checked=editor/rubber_band_mode; action=conf(toggle, editor/rubber_band_mode, design) }
+				ha:Rubber band keeps middle line dir= { checked=editor/rubber_band_keep_midlinedir; action=conf(toggle, editor/rubber_band_keep_midlinedir, design) }
+				ha:Auto-zero delta measurements = { checked=editor/local_ref; action=conf(toggle, editor/local_ref, design) }
+				ha:New lines, arcs clear polygons = { checked=editor/clear_line; action=conf(toggle, editor/clear_line, design) }
+				ha:New polygons are full ones = { checked=editor/full_poly; action=conf(toggle, editor/full_poly, design) }
+				ha:Show autorouter trials = { checked=editor/live_routing; action=conf(toggle, editor/live_routing, design) }
+				ha:Highlighting on line, arc points = { checked=editor/highlight_on_point; action=conf(toggle, editor/highlight_on_point, design) }
+				ha:Wireframe draw = { checked=editor/wireframe_draw; a=Ctrl<Key>w;  action=conf(toggle, editor/wireframe_draw, design) }
+				ha:Thin draw = { checked=editor/thin_draw; a=<Key>|; action=conf(toggle, editor/thin_draw, design) }
+				ha:Thin draw poly = { checked=editor/thin_drawpoly; a=Ctrl Shift<Key>p; action=conf(toggle, editor/thin_draw_poly, design) }
+				ha:Check polygons = { checked=editor/check_planes; action=conf(toggle, editor/check_planes, design) }
+				ha:Brave mode = { action=brave() }
+				-
+				ha:Pinout shows number = { checked=editor/show_number; action=conf(toggle, editor/show_number, design) }
+				ha:Pins/Via show Name/Number = { a=<Key>d; action=Display(PinOrPadName) }
+				ha:Enable vendor drill mapping = { checked=plugins/vendor/enable; action=conf(toggle, plugins/vendor/enable, design) }
+				ha:Import Settings {
+					li:submenu {
+						ha:New subcircuits added at... = { foreground=grey50; sensitive=false }
+						ha: Center = { action=Import(setnewpoint,center) }
+						ha: Mark = { action=Import(setnewpoint,mark) }
+						ha: Crosshair = { action=Import(setnewpoint) }
+						-
+						ha:Set Dispersion = { action=Import(setdisperse) }
+					}
+				}
+			}
+		} # Settings
+
+		ha:Select {
+			li:submenu {
+				ha:Select all visible objects = { action=Select(All) }
+				ha:Select all connected objects = { action=Select(Connection) }
+				-
+				ha:Unselect all objects = { action=Unselect(All) }
+				ha:unselect all connected objects = { action=Unselect(Connection) }
+				-
+				ha:Auto-place selected subcircuits = { a=Ctrl<Key>p; action=AutoPlaceSelected() }
+				ha:Disperse all subcircuits = { action=DisperseElements(All) }
+				ha:Move selected subcircuits to other side = { a=Shift<Key>b; action=Flip(SelectedElements) }
+				ha:Move selected to current layer = { a=Shift<Key>m; action=MoveToCurrentLayer(Selected) }
+				ha:Delete selected objects = { a=<Key>Delete; action=Delete(Selected) }
+				ha:Convert selection to subcircuit = { action=Select(ConvertSubc) }
+				ha:Convert selection to padstack         = { li:action={PadstackConvert(selected); Mode(PasteBuffer);} }
+				-
+				ha:Optimize selected rats = { li:action={DeleteRats(SelectedRats); AddRats(SelectedRats)} }
+				ha:Auto-route selected rats = { a=Alt<Key>r; action=AutoRoute(SelectedRats) }
+				ha:Rip up selected auto-routed tracks = { action=RipUp(Selected) }
+				-
+				ha:Change size of selected objects = { foreground=grey50; sensitive=false }
+				ha:ChangeSizes to Route style = { a=Shift<Key>y; action=ChangeSizes(Object,style,mil); }
+				ha:Lines -10 mil = { li:action={ChangeSize(SelectedLines,-10,mil); ChangeSize(SelectedArcs,-10,mil)} }
+				ha:Lines +10 mil = { li:action={ChangeSize(SelectedLines,+10,mil); ChangeSize(SelectedArcs,+10,mil)} }
+				ha:Pads -10 mil = { action=ChangeSize(SelectedPads,-10,mil) }
+				ha:Pads +10 mil = { action=ChangeSize(SelectedPads,+10,mil) }
+				ha:Pins -10 mil = { action=ChangeSize(SelectedPins,-10,mil) }
+				ha:Pins +10 mil = { action=ChangeSize(SelectedPins,+10,mil) }
+				ha:Texts -10 mil = { action=ChangeSize(SelectedTexts,-10,mil) }
+				ha:Texts +10 mil = { action=ChangeSize(SelectedTexts,+10,mil) }
+				ha:Vias -10 mil = { action=ChangeSize(SelectedVias,-10,mil) }
+				ha:Vias +10 mil = { action=ChangeSize(SelectedVias,+10,mil) }
+				-
+				ha:Change drilling hole of selected padstacks = { foreground=grey50; sensitive=false }
+				ha:Vias -10 mil = { action=ChangeDrillSize(SelectedPadstacks,-10,mil) }
+				ha:Vias +10 mil = { action=ChangeDrillSize(SelectedPadstacks,+10,mil) }
+				ha:Pins -10 mil = { action=ChangeDrillSize(SelectedPins,-10,mil) }
+				ha:Pins +10 mil = { action=ChangeDrillSize(SelectedPins,+10,mil) }
+				-
+				ha:Route radius +0.5 = { a=Alt<Key>c; action=conf(delta, editor/route_radius, +0.5, design); }
+				ha:Route radius -0.5 = { a=Alt Shift<Key>c; action=conf(delta, editor/route_radius, -0.5, design); }
+			}
+		} # Select
+
+
+		ha:Buffer {
+			li:submenu {
+				ha:Copy selection to buffer = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Mode(PasteBuffer)} }
+				ha:Cut selection to buffer = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer)} }
+				ha:Paste buffer to layout = { action=Mode(PasteBuffer) }
+				-
+				ha:Rotate buffer 90 deg CCW = { a=Shift<Key>F7; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1)} }
+				ha:Rotate buffer 90 deg CW = { li:action={Mode(PasteBuffer); PasteBuffer(Rotate,3)} }
+				ha:Arbitrarily Rotate Buffer = { li:action={Mode(PasteBuffer); FreeRotateBuffer()} }
+				ha:Mirror buffer (up/down) = { li:action={Mode(PasteBuffer); PasteBuffer(Mirror)} }
+				ha:Mirror buffer (left/right) = { li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1); PasteBuffer(Mirror); PasteBuffer(Rotate,3)} }
+				-
+				ha:Clear buffer = { action=PasteBuffer(Clear) }
+				ha:Convert buffer to subcircuit    = { action=PasteBuffer(ConvertSubc) }
+				ha:Convert buffer to padstack      = { li:action={PadstackConvert(buffer); Mode(PasteBuffer);} }
+				ha:Break buffer subcircuits to pieces = { action=PasteBuffer(Restore) }
+				ha:Save buffer subcircuits to file = { action=Save(PasteBuffer) }
+				ha:Layer bindings...               = { action=LayerBinding(buffer) }
+				-
+				ha:Select current buffer = { foreground=grey50; sensitive=false }
+				ha:\#1 = { checked=ChkBuffer(1); a=Shift<Key>1; action=PasteBuffer(1) }
+				ha:\#2 = { checked=ChkBuffer(2); a=Shift<Key>2; action=PasteBuffer(2) }
+				ha:\#3 = { checked=ChkBuffer(3); a=Shift<Key>3; action=PasteBuffer(3) }
+				ha:\#4 = { checked=ChkBuffer(4); a=Shift<Key>4; action=PasteBuffer(4) }
+				ha:\#5 = { checked=ChkBuffer(5); a=Shift<Key>5; action=PasteBuffer(5) }
+			}
+		} # Buffer
+
+
+		ha:Connects {
+			li:submenu {
+				ha:Lookup connection to object = { a=Ctrl<Key>f; li:action={GetXY(Click on the object); Connection(Find)} }
+				ha:Reset scanned pads/pins/vias = { li:action={Connection(ResetPinsViasAndPads); Display(Redraw)} }
+				ha:Reset scanned lines/polygons = { li:action={Connection(ResetLinesAndPolygons); Display(Redraw)} }
+				ha:Reset all connections = { a=Shift<Key>f; li:action={Connection(Reset); Display(Redraw)} }
+				-
+				ha:Optimize rats-nest = { a=<Key>o; li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(AllRats); Atomic(Block)} }
+				ha:Erase rats-nest = { a=<Key>e; action=DeleteRats(AllRats) }
+				ha:Erase selected rats = { a=Shift<Key>e; action=DeleteRats(SelectedRats) }
+				-
+				ha:Auto-route selected rats = { action=AutoRoute(Selected) }
+				ha:Auto-route all rats = { action=AutoRoute(AllRats) }
+				ha:Rip up all auto-routed tracks = { action=RipUp(All) }
+				-
+				ha:Auto-Optimize = { a={Ctrl<Key>=}; action=djopt(auto) }
+				ha:Debumpify = { action=djopt(debumpify) }
+				ha:Unjaggy = { action=djopt(unjaggy) }
+				ha:Vianudge = { action=djopt(vianudge) }
+				ha:Viatrim = { action=djopt(viatrim) }
+				ha:Orthopull = { action=djopt(orthopull) }
+				ha:SimpleOpts = { a={<Key>=}; action=djopt(simple) }
+				ha:Miter = { action=djopt(miter) }
+				ha:Puller = { a=<Key>y; action=Puller() }
+				ha:Global Puller = {
+					li:submenu {
+						ha:Selected = { action=GlobalPuller(selected) }
+						ha:Found = { action=GlobalPuller(found) }
+						ha:All = { action=GlobalPuller() }
+					}
+				}
+				ha:Only autorouted nets = { checked=plugins/djopt/auto_only; action=conf(toggle, plugins/djopt/auto_only, design) }
+				-
+				ha:Design Rule Checker = { action=DRC() }
+				-
+				ha:Apply vendor drill mapping = { action=ApplyVendor() }
+			}
+		} # Connects
+
+		ha:Plugins = {
+			li:submenu {
+				ha:Manage plugins... = { a=Alt<Key>p; action=ManagePlugins() }
+			}
+		} # Plugins
+
+
+		ha:Info {
+			li:submenu {
+				ha:Generate object report = { a=Ctrl<Key>r; action=ReportObject() }
+				ha:Generate drill summary = { action=Report(DrillReport) }
+				ha:Report found pins/pads = { action=Report(FoundPins) }
+				ha:Report net length = { a=<Key>r; action=Report(NetLength) }
+				ha:Key Bindings {
+					li:submenu {
+						ha:Remove = { a=<Key>BackSpace; action=Delete(Selected) }
+						ha:Remove Connected = { a=Shift<Key>BackSpace; li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} }
+						ha:Remove Connected = { a=Shift<Key>Delete; li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} }
+						ha:Set Same = { a=<Key>a; action=SetSame() }
+						ha:Flip Object = { a=<Key>b; action=Flip(Object) }
+						ha:Find Connections = { a=<Key>f; li:action={Connection(Reset); Connection(Find)} }
+						ha:ChangeJoin Object = { a=<Key>j; action=ChangeJoin(Object) }
+						ha:ChangeJoin SelectedObject = { a=Shift<Key>j; action=ChangeJoin(SelectedObjects) }
+						ha:Clear Object +2 mil = { a=<Key>k; action=ChangeClearSize(Object,+2,mil) }
+						ha:Clear Object -2 mil = { a=Shift<Key>k; action=ChangeClearSize(Object,-2,mil) }
+						ha:Clear Selected +2 mil = { a=Ctrl<Key>k; action=ChangeClearSize(SelectedObjects,+2,mil) }
+						ha:Clear Selected -2 mil = { a=Shift Ctrl<Key>k; action=ChangeClearSize(SelectedObjects,-2,mil) }
+						ha:Line Tool size +5 mil = { a=<Key>l; action=SetValue(LineSize,+5,mil) }
+						ha:Line Tool size -5 mil = { a=Shift<Key>l; action=SetValue(LineSize,-5,mil) }
+						ha:Move Object to current layer = { a=<Key>m; action=MoveToCurrentLayer(Object) }
+						ha:MarkCrosshair = { a=Ctrl<Key>m; action=MarkCrosshair() }
+						ha:Select shortest rat = { a=Shift<Key>n; action=AddRats(Close) }
+						ha:AddRats to selected pins = { a=Shift<Key>o; li:action={Atomic(Save); DeleteRats(AllRats); Atomic(Restore); AddRats(SelectedRats); Atomic(Block)} }
+						ha:Polygon PreviousPoint = { a=<Key>p; action=Polygon(PreviousPoint) }
+						ha:Polygon Close = { a=Shift<Key>p; action=Polygon(Close) }
+						ha:ChangeSize +5 mil = { a=<Key>s; action=ChangeSize(Object,+5,mil) }
+						ha:ChangeSize -5 mil = { a=Shift<Key>s; action=ChangeSize(Object,-5,mil) }
+						ha:ChangeDrill +5 mil = { a=Alt<Key>s; action=ChangeDrillSize(Object,+5,mil) }
+						ha:ChangeDrill -5 mil = { a=Alt Shift<Key>s; action=ChangeDrillSize(Object,-5,mil) }
+						ha:Text Tool scale +10 mil = { a=<Key>t; action=SetValue(TextScale,+10,mil) }
+						ha:Text Tool scale -10 mil = { a=Shift<Key>t; action=SetValue(TextScale,-10,mil) }
+						ha:AddRats Selected = { a=Shift<Key>w; action=AddRats(SelectedRats) }
+						ha:Add All Rats = { a=<Key>w; action=AddRats(AllRats) }
+						ha:Undo = { a=Alt<Key>z; action=Undo() }
+						ha:Cycle Clip = { a=<Key>/; action=Display(CycleClip) }
+						ha:Arrow = { a=<Key>space; checked=ChkMode(arrow); action=Mode(Arrow) }
+						ha:Temp Arrow ON = { a=<Key>[; li:action={Mode(Save); Mode(Arrow); Mode(Notify)} }
+						ha:Temp Arrow OFF = { a=<Key>]; li:action={Mode(Release); Mode(Restore)} }
+						ha:Step Up = { a=<Key>Up; action=Cursor(Warp,0,1,grid) }
+						ha:Step Down = { a=<Key>Down; action=Cursor(Warp,0,-1,grid) }
+						ha:Step Left = { a=<Key>Left; action=Cursor(Warp,-1,0,grid) }
+						ha:Step Right = { a=<Key>Right; action=Cursor(Warp,1,0,grid) }
+						ha:Step +Up = { a=Shift<Key>Up; action=Cursor(Pan,0,50,view) }
+						ha:Step +Down = { a=Shift<Key>Down; action=Cursor(Pan,0,-50,view) }
+						ha:Step +Left = { a=Shift<Key>Left; action=Cursor(Pan,-50,0,view) }
+						ha:Step +Right = { a=Shift<Key>Right; action=Cursor(Pan,50,0,view) }
+						ha:"Click" = { a=<Key>Enter; li:action={Mode(Notify); Mode(Release)} }
+						-
+						ha:layer keys {
+							li:submenu {
+								ha:Select Layer 1           = { a=<Key>1; action=SelectLayer(1) }
+								ha:Select Layer 2           = { a=<Key>2; action=SelectLayer(2) }
+								ha:Select Layer 3           = { a=<Key>3; action=SelectLayer(3) }
+								ha:Select Layer 4           = { a=<Key>4; action=SelectLayer(4) }
+								ha:Select Layer 5           = { a=<Key>5; action=SelectLayer(5) }
+								ha:Select Layer 6           = { a=<Key>6; action=SelectLayer(6) }
+								ha:Select Layer 7           = { a=<Key>7; action=SelectLayer(7) }
+								ha:Select Layer 8           = { a=<Key>8; action=SelectLayer(8) }
+								ha:Select Layer 9           = { a=<Key>9; action=SelectLayer(9) }
+								ha:Select Layer 10          = { a=<Key>0; action=SelectLayer(10) }
+								ha:Select Layer 11          = { a=Alt<Key>1; action=SelectLayer(11) }
+								ha:Select Layer 12          = { a=Alt<Key>2; action=SelectLayer(12) }
+								ha:Select Layer 13          = { a=Alt<Key>3; action=SelectLayer(13) }
+								ha:Select Layer 14          = { a=Alt<Key>4; action=SelectLayer(14) }
+								ha:Select Layer 15          = { a=Alt<Key>5; action=SelectLayer(15) }
+								ha:Select Layer 16          = { a=Alt<Key>6; action=SelectLayer(16) }
+								ha:Select Layer 17          = { a=Alt<Key>7; action=SelectLayer(17) }
+								ha:Select Layer 18          = { a=Alt<Key>8; action=SelectLayer(18) }
+								ha:Select Layer 19          = { a=Alt<Key>9; action=SelectLayer(19) }
+								ha:Select Layer 20          = { a=Alt<Key>0; action=SelectLayer(20) }
+								-
+								ha:Toggle Layer 1           = { a=Ctrl<Key>1; action=ToggleView(1) }
+								ha:Toggle Layer 2           = { a=Ctrl<Key>2; action=ToggleView(2) }
+								ha:Toggle Layer 3           = { a=Ctrl<Key>3; action=ToggleView(3) }
+								ha:Toggle Layer 4           = { a=Ctrl<Key>4; action=ToggleView(4) }
+								ha:Toggle Layer 5           = { a=Ctrl<Key>5; action=ToggleView(5) }
+								ha:Toggle Layer 6           = { a=Ctrl<Key>6; action=ToggleView(6) }
+								ha:Toggle Layer 7           = { a=Ctrl<Key>7; action=ToggleView(7) }
+								ha:Toggle Layer 8           = { a=Ctrl<Key>8; action=ToggleView(8) }
+								ha:Toggle Layer 9           = { a=Ctrl<Key>9; action=ToggleView(9) }
+								ha:Toggle Layer 10          = { a=Ctrl<Key>0; action=ToggleView(10) }
+								ha:Toggle Layer 11          = { a=Ctrl-Alt<Key>1; action=ToggleView(11) }
+								ha:Toggle Layer 12          = { a=Ctrl-Alt<Key>2; action=ToggleView(12) }
+								ha:Toggle Layer 13          = { a=Ctrl-Alt<Key>3; action=ToggleView(13) }
+								ha:Toggle Layer 14          = { a=Ctrl-Alt<Key>4; action=ToggleView(14) }
+								ha:Toggle Layer 15          = { a=Ctrl-Alt<Key>5; action=ToggleView(15) }
+								ha:Toggle Layer 16          = { a=Ctrl-Alt<Key>6; action=ToggleView(16) }
+								ha:Toggle Layer 17          = { a=Ctrl-Alt<Key>7; action=ToggleView(17) }
+								ha:Toggle Layer 18          = { a=Ctrl-Alt<Key>8; action=ToggleView(18) }
+								ha:Toggle Layer 19          = { a=Ctrl-Alt<Key>9; action=ToggleView(19) }
+								ha:Toggle Layer 20          = { a=Ctrl-Alt<Key>0; action=ToggleView(20) }
+							}
+						} # layer keys
+					}
+				} # Key Bindings
+			}
+		} # Info
+
+		ha:Window {
+			li:submenu {
+				ha:Board Layout = { action=DoWindows(Layout) }
+				ha:Library = { action=DoWindows(Library) }
+				ha:Message Log = { action=DoWindows(Log) }
+				ha:Netlist = { action=DoWindows(Netlist) }
+				ha:Pinout = { a=Shift<Key>d; action=Display(Pinout) }
+				ha:Font selector  = { a=Ctrl Shift<Key>f; action=FontSel() }
+			}
+		} # Window
+
+	} # main_menu
+} #root
Index: tags/2.0.1/src/pcb-printf.c
===================================================================
--- tags/2.0.1/src/pcb-printf.c	(nonexistent)
+++ tags/2.0.1/src/pcb-printf.c	(revision 18980)
@@ -0,0 +1,859 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2011 Andrew Poelstra
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Andrew Poelstra, 16966 60A Ave, V3S 8X5 Surrey, BC, Canada
+ *  asp11@sfu.ca
+ *
+ */
+
+/* Implementation of printf wrapper to output pcb coords and angles
+ * For details of all supported specifiers, see the comment at the
+ * top of pcb-printf.h */
+
+#include <locale.h>
+#include <ctype.h>
+#include <math.h>
+#include "config.h"
+#include "pcb-printf.h"
+#include "compat_nls.h"
+
+const char *pcb_printf_slot[PCB_PRINTF_SLOT_max] =
+{
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 8 user formats */
+	"%mr",      /* original unitless cmil file format coord */
+	"%.07$$mS"  /* safe file format coord */
+};
+
+static int min_sig_figs(double d)
+{
+	char buf[50];
+	int rv;
+
+	if (d == 0)
+		return 0;
+
+	/* Normalize to x.xxxx... form */
+	if (d < 0)
+		d *= -1;
+	while (d >= 10)
+		d /= 10;
+	while (d < 1)
+		d *= 10;
+
+	rv = sprintf(buf, "%g", d);
+	return rv;
+}
+
+/* Truncate trailing 0's from str */
+static int do_trunc0(char *str)
+{
+	char *end = str + strlen(str) - 1;
+	while((end > str) && (*end == '0') && (end[-1] != '.')) {
+		*end = '\0';
+		end--;
+	}
+	return end-str+1;
+}
+
+
+/* Create sprintf specifier, using default_prec no precision is given */
+static inline void make_printf_spec(char *printf_spec_new, const char *printf_spec, int precision, int *trunc0)
+{
+	int i = 0;
+
+	while (printf_spec[i] == '%' || isdigit(printf_spec[i]) ||
+				 printf_spec[i] == '-' || printf_spec[i] == '+' || printf_spec[i] == '#' || printf_spec[i] == '0')
+		++i;
+
+	if (printf_spec[i] == '.') {
+		if ((printf_spec[i+1] == '0') && (isdigit(printf_spec[i+2])))
+			*trunc0 = 1;
+		sprintf(printf_spec_new, ", %sf", printf_spec);
+	}
+	else
+		sprintf(printf_spec_new, ", %s.%df", printf_spec, precision);
+}
+
+/* sprintf a value */
+#define sprintf_lc_safe(is_file_mode, out, fmt, val) \
+do { \
+	if (is_file_mode) { \
+		pcb_setlocale(LC_ALL, "C"); \
+		sprintf(out, fmt, val); \
+		pcb_setlocale(LC_ALL, ""); \
+	} \
+	else \
+		sprintf(out, fmt, val); \
+	if (trunc0) \
+		do_trunc0(filemode_buff); \
+} while(0)
+
+/* append a suffix, with or without space */
+static int inline append_suffix(gds_t *dest, enum pcb_suffix_e suffix_type, const char *suffix)
+{
+	switch (suffix_type) {
+	case PCB_UNIT_NO_SUFFIX:
+		break;
+	case PCB_UNIT_SUFFIX:
+		if (gds_append(dest, ' ') != 0) return -1;
+		/* deliberate fall-thru */
+	case PCB_UNIT_FILE_MODE:
+		if (gds_append_str(dest, suffix) != 0) return -1;
+		break;
+	}
+	return 0;
+}
+
+
+/* Internal coord-to-string converter for pcb-printf
+ * Converts a (group of) measurement(s) to a comma-delimited
+ * string, with appropriate units. If more than one coord is
+ * given, the list is enclosed in parens to make the scope of
+ * the unit suffix clear.
+ *
+ * dest         Append the output to this dynamic string
+ * coord        Array of coords to convert
+ * n_coords     Number of coords in array
+ * printf_spec  printf sub-specifier to use with %f
+ * e_allow      Bitmap of units the function may use
+ * suffix_type  Whether to add a suffix
+ *
+ * return 0 on success, -1 on error
+ */
+static int CoordsToString(gds_t *dest, pcb_coord_t coord[], int n_coords, const gds_t *printf_spec_, enum pcb_allow_e allow,
+														 enum pcb_suffix_e suffix_type)
+{
+	char filemode_buff[128]; /* G_ASCII_DTOSTR_BUF_SIZE */
+	char printf_spec_new_local[256];
+	double *value, value_local[32];
+	enum pcb_family_e family;
+	const char *suffix;
+	int i, n, retval = -1, trunc0 = 0;
+	const char *printf_spec = printf_spec_->array;
+	char *printf_spec_new;
+
+	if (n_coords > (sizeof(value_local) / sizeof(value_local[0]))) {
+		value = malloc(n_coords * sizeof *value);
+		if (value == NULL)
+			return -1;
+	}
+	else
+		value = value_local;
+
+	if (allow == 0)
+		allow = PCB_UNIT_ALLOW_ALL_SANE;
+
+	i = printf_spec_->used + 64;
+	if (i > sizeof(printf_spec_new_local))
+		printf_spec_new = malloc(i);
+	else
+		printf_spec_new = printf_spec_new_local;
+
+	/* Check our freedom in choosing units */
+	if ((allow & PCB_UNIT_ALLOW_IMPERIAL) == 0)
+		family = PCB_UNIT_METRIC;
+	else if ((allow & PCB_UNIT_ALLOW_METRIC) == 0)
+		family = PCB_UNIT_IMPERIAL;
+	else {
+		int met_votes = 0, imp_votes = 0;
+
+		for (i = 0; i < n_coords; ++i)
+			if (min_sig_figs(PCB_COORD_TO_MIL(coord[i])) < min_sig_figs(PCB_COORD_TO_MM(coord[i])))
+				++imp_votes;
+			else
+				++met_votes;
+
+		if (imp_votes > met_votes)
+			family = PCB_UNIT_IMPERIAL;
+		else
+			family = PCB_UNIT_METRIC;
+	}
+
+	/* Set base unit */
+	for (i = 0; i < n_coords; ++i) {
+		switch (family) {
+		case PCB_UNIT_METRIC:
+			value[i] = PCB_COORD_TO_MM(coord[i]);
+			break;
+		case PCB_UNIT_IMPERIAL:
+			value[i] = PCB_COORD_TO_MIL(coord[i]);
+			break;
+		}
+	}
+
+	/* Determine scale factor -- find smallest unit that brings
+	 * the whole group above unity */
+	for (n = 0; n < pcb_get_n_units(); ++n) {
+		if ((pcb_units[n].allow & allow) != 0 && (pcb_units[n].family == family)) {
+			int n_above_one = 0;
+
+			for (i = 0; i < n_coords; ++i)
+				if (abs(value[i] * pcb_units[n].scale_factor) > 1)
+					++n_above_one;
+			if (n_above_one == n_coords)
+				break;
+		}
+	}
+	/* If nothing worked, wind back to the smallest allowable unit */
+	if (n == pcb_get_n_units()) {
+		do {
+			--n;
+		} while ((pcb_units[n].allow & allow) == 0 || pcb_units[n].family != family);
+	}
+
+	/* Apply scale factor */
+	suffix = pcb_units[n].suffix;
+	for (i = 0; i < n_coords; ++i)
+		value[i] = value[i] * pcb_units[n].scale_factor;
+
+	make_printf_spec(printf_spec_new, printf_spec, pcb_units[n].default_prec, &trunc0);
+
+	/* Actually sprintf the values in place
+	 *  (+ 2 skips the ", " for first value) */
+	if (n_coords > 1)
+		if (gds_append(dest,  '(') != 0)
+			goto err;
+
+	sprintf_lc_safe((suffix_type == PCB_UNIT_FILE_MODE), filemode_buff, printf_spec_new + 2, value[0]);
+	if (gds_append_str(dest, filemode_buff) != 0)
+		goto err;
+
+	for (i = 1; i < n_coords; ++i) {
+		sprintf_lc_safe((suffix_type == PCB_UNIT_FILE_MODE), filemode_buff, printf_spec_new, value[i]);
+		if (gds_append_str(dest, filemode_buff) != 0)
+			goto err;
+	}
+	if (n_coords > 1)
+		if (gds_append(dest, ')') != 0) goto err;
+
+
+	/* Append suffix */
+	if (value[0] != 0 || n_coords > 1)
+		if (append_suffix(dest, suffix_type, suffix) != 0)
+			goto err;
+
+	retval = 0;
+err:;
+	if (printf_spec_new != printf_spec_new_local)
+		free(printf_spec_new);
+
+	if (value != value_local)
+		free(value);
+	return retval;
+}
+
+typedef struct {
+	int           score_factor;
+
+	enum pcb_allow_e  base;
+	double        down_limit;
+	enum pcb_allow_e  down;
+	double        up_limit;
+	enum pcb_allow_e  up;
+
+	/* persistent, calculated once */
+	const pcb_unit_t    *base_unit, *down_unit, *up_unit;
+} human_coord_t;
+
+/* Conversion preference table */
+static human_coord_t human_coord[] = {
+	{2, PCB_UNIT_ALLOW_MM,  0.001, PCB_UNIT_ALLOW_UM, 1000.0, PCB_UNIT_ALLOW_M     ,NULL,NULL,NULL},
+	{1, PCB_UNIT_ALLOW_MIL, 0,     0,        1000.0, PCB_UNIT_ALLOW_IN    ,NULL,NULL,NULL}
+};
+#define NUM_HUMAN_COORD (sizeof(human_coord) / sizeof(human_coord[0]))
+
+static inline int try_human_coord(pcb_coord_t coord, const pcb_unit_t *unit, double down_limit, double up_limit, int score_factor, double *value, unsigned int *best, const char **suffix)
+{
+	double v, frac, save;
+	long int digs, zeros;
+	unsigned int score;
+
+	/* convert the value to the proposed unit */
+	if (unit->family == PCB_UNIT_METRIC)
+		v = PCB_COORD_TO_MM(coord);
+	else
+		v = PCB_COORD_TO_MIL(coord);
+	save = v = v * unit->scale_factor;
+	if (v < 0) v = -v;
+
+	/* Check if neighbour units are better */
+	if ((down_limit > 0) && (v < down_limit))
+		return -1;
+	if ((up_limit > 0) && (v > up_limit))
+		return +1;
+
+	/* count trailing zeros after the decimal point up to 8 digits */
+	frac = v - floor(v);
+	digs = frac * 100000000.0;
+	if (digs != 0)
+		for(zeros = 0; (digs % 10) == 0; zeros++, digs /= 10);
+	else
+		zeros = 8;
+
+	/* score is higher for more zeroes */
+	score = score_factor + 8 * zeros;
+
+/*	printf("try: %s '%.8f' -> %.8f %d score=%d\n", unit->suffix, v, frac, zeros, score);*/
+
+	/* update the best score */
+	if (score > *best) {
+		*value = save;
+		*best = score;
+		*suffix = unit->suffix;
+	}
+
+	return 0;
+}
+
+/* Same as CoordsToString but take only one coord and print it in human readable format */
+static int CoordsToHumanString(gds_t *dest, pcb_coord_t coord, const gds_t *printf_spec_, enum pcb_suffix_e suffix_type)
+{
+	char filemode_buff[128]; /* G_ASCII_DTOSTR_BUF_SIZE */
+	char printf_spec_new_local[256];
+	char *printf_spec_new;
+	int i, retval = -1, trunc0;
+	const char *printf_spec = printf_spec_->array;
+	const char *suffix;
+	double value;
+	unsigned int best_score = 0;
+
+	i = printf_spec_->used + 64;
+	if (i > sizeof(printf_spec_new_local))
+		printf_spec_new = malloc(i);
+	else
+		printf_spec_new = printf_spec_new_local;
+
+	/* cache unit lookup */
+	if (human_coord[0].base_unit == NULL) {
+		for(i = 0; i < NUM_HUMAN_COORD; i++) {
+			human_coord[i].base_unit = get_unit_struct_by_allow(human_coord[i].base);
+			human_coord[i].down_unit = get_unit_struct_by_allow(human_coord[i].down);
+			human_coord[i].up_unit = get_unit_struct_by_allow(human_coord[i].up);
+		}
+	}
+
+	for(i = 0; i < NUM_HUMAN_COORD; i++) {
+		int res;
+		/* try the base units first */
+		res = try_human_coord(coord, human_coord[i].base_unit, human_coord[i].down_limit, human_coord[i].up_limit, human_coord[i].score_factor,&value, &best_score, &suffix);
+		if (res < 0)
+			try_human_coord(coord, human_coord[i].down_unit, 0, 0, human_coord[i].score_factor, &value, &best_score, &suffix);
+		else if (res > 0)
+			try_human_coord(coord, human_coord[i].up_unit, 0, 0, human_coord[i].score_factor,&value, &best_score, &suffix);
+	}
+
+	make_printf_spec(printf_spec_new, printf_spec, 8, &trunc0);
+	sprintf_lc_safe((suffix_type == PCB_UNIT_FILE_MODE), filemode_buff, printf_spec_new + 2, value);
+	if (gds_append_str(dest, filemode_buff) != 0)
+		goto err;
+
+	if (value != 0) {
+		if (suffix_type == PCB_UNIT_NO_SUFFIX)
+			suffix_type = PCB_UNIT_SUFFIX;
+		if (append_suffix(dest, suffix_type, suffix) != 0)
+			goto err;
+	}
+
+	err:;
+	if (printf_spec_new != printf_spec_new_local)
+		free(printf_spec_new);
+	return retval;
+}
+
+int QstringToString(gds_t *dest, const char *qstr, char q, char esc, const char *needq)
+{
+	const char *s;
+
+	if ((qstr == NULL) || (*qstr == '\0')) {
+		gds_append(dest, q);
+		gds_append(dest, q);
+		return 0;
+	}
+
+	/* check if quoting is needed */
+	if (strpbrk(qstr, needq) == NULL) {
+		gds_append_str(dest, qstr);
+		return 0;
+	}
+
+	/* wrap in quotes and protect escape and quote chars */
+	gds_append(dest, q);
+	for(s = qstr; *s != '\0'; s++) {
+		if ((*s == esc) || (*s == q))
+			gds_append(dest, esc);
+		gds_append(dest, *s);
+	}
+	gds_append(dest, q);
+	return 0;
+}
+
+/* Main low level pcb-printf function
+ * This is a printf wrapper that accepts new format specifiers to
+ * output pcb coords as various units. See the comment at the top
+ * of pcb-printf.h for full details.
+ *
+ * [in] string Append anything new at the end of this dynamic string (must be initialized before the call)
+ * [in] fmt    Format specifier
+ * [in] args   Arguments to specifier
+ *
+ * return 0 on success */
+int pcb_append_vprintf(gds_t *string, const char *fmt, va_list args)
+{
+	gds_t spec;
+	const char *qstr, *needsq;
+	char tmp[128]; /* large enough for rendering a long long int */
+	int tmplen, retval = -1, slot_recursion = 0, mq_has_spec;
+	char *dot, *free_fmt = NULL;
+	enum pcb_allow_e mask = PCB_UNIT_ALLOW_ALL_SANE;
+
+	gds_init(&spec);
+
+	new_fmt:;
+	while (*fmt) {
+		enum pcb_suffix_e suffix = PCB_UNIT_NO_SUFFIX;
+
+		if (*fmt == '%') {
+			const char *ext_unit = "";
+			pcb_coord_t value[10];
+			int count, i;
+
+			gds_truncate(&spec, 0);
+			mq_has_spec = 0;
+
+			/* Get printf sub-specifiers */
+			if (gds_append(&spec, *fmt++) != 0) goto err;
+			while (isdigit(*fmt) || *fmt == '.' || *fmt == ' ' || *fmt == '*'
+						 || *fmt == '#' || *fmt == 'l' || *fmt == 'L' || *fmt == 'h'
+						 || *fmt == '+' || *fmt == '-' || *fmt == '[' || *fmt == '{') {
+				if (*fmt == '*') {
+					char itmp[32];
+					int ilen;
+					ilen = sprintf(itmp, "%d", va_arg(args, int));
+					if (gds_append_len(&spec, itmp, ilen) != 0) goto err;
+					fmt++;
+				}
+				else
+					if (gds_append(&spec, *fmt++) != 0) goto err;
+			}
+
+			/* check if specifier is %[] */
+			if ((gds_len(&spec) > 2) && (spec.array[1] == '[')) {
+				int slot = atoi(spec.array+2);
+				gds_t new_spec;
+				if ((slot < 0) || (slot > PCB_PRINTF_SLOT_max)) {
+					fprintf(stderr, "Internal error: invalid printf slot addressed: '%s'\n", spec.array);
+					abort();
+				}
+				slot_recursion++;
+				if (slot_recursion > 16) {
+					fprintf(stderr, "Internal error: printf slot recursion too deep on addressed: '%s'\n", spec.array);
+					abort();
+				}
+				if (pcb_printf_slot[slot] == NULL) {
+					fprintf(stderr, "Internal error: printf empty slot reference: '%s'\n", spec.array);
+					abort();
+				}
+				gds_init(&new_spec);
+				gds_append_str(&new_spec, pcb_printf_slot[slot]);
+				if (*fmt == ']')
+					fmt++;
+				gds_append_str(&new_spec, fmt);
+				if (free_fmt != NULL)
+					free(free_fmt);
+				fmt = free_fmt = new_spec.array;
+				memset(&new_spec, 0, sizeof(new_spec));
+				gds_truncate(&spec, 0);
+				goto new_fmt;
+			}
+			if ((spec.array[0] == '%') && (spec.array[1] == '{')) {
+				/* {} specifier for %mq */
+				const char *end;
+				gds_truncate(&spec, 0);
+				for(end = fmt; *end != '\0'; end++) {
+					if ((end[0] != '\\') && (end[1] == '}')) {
+						end++;
+						break;
+					}
+				}
+				if (*end == '\0')
+					goto err;
+				gds_append_len(&spec, fmt, end-fmt);
+				fmt = end+1;
+				mq_has_spec = 1;
+			}
+			else
+				slot_recursion = 0;
+
+			/* Get our sub-specifiers */
+			if (*fmt == '#') {
+				mask = PCB_UNIT_ALLOW_CMIL;			/* This must be pcb's base unit */
+				fmt++;
+			}
+			if (*fmt == '$') {
+				suffix = PCB_UNIT_SUFFIX;
+				fmt++;
+				if (*fmt == '$') {
+					fmt++;
+					suffix = PCB_UNIT_FILE_MODE;
+				}
+			}
+			/* Tack full specifier onto specifier */
+			if (*fmt != 'm')
+				if (gds_append(&spec, *fmt) != 0) goto err;
+			switch (*fmt) {
+				/* Printf specs */
+			case 'o':
+			case 'i':
+			case 'd':
+			case 'u':
+			case 'x':
+			case 'X':
+				if (spec.array[1] == 'l')
+					tmplen = sprintf(tmp, spec.array, va_arg(args, long));
+				else
+					tmplen = sprintf(tmp, spec.array, va_arg(args, int));
+				if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+				break;
+			case 'e':
+			case 'E':
+			case 'f':
+			case 'g':
+			case 'G':
+				if (strchr(spec.array, '*')) {
+					int prec = va_arg(args, int);
+					tmplen = sprintf(tmp, spec.array, va_arg(args, double), prec);
+				}
+				else
+					tmplen = sprintf(tmp, spec.array, va_arg(args, double));
+				if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+				break;
+			case 'c':
+				if (spec.array[1] == 'l' && sizeof(int) <= sizeof(wchar_t))
+					tmplen = sprintf(tmp, spec.array, va_arg(args, wchar_t));
+				else
+					tmplen = sprintf(tmp, spec.array, va_arg(args, int));
+				if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+				break;
+			case 's':
+				if (spec.array[0] == 'l') {
+					/* TODO: convert wchar to char and append it */
+					fprintf(stderr, "Internal error: appending %%ls is not supported\n");
+					abort();
+				}
+				else {
+					const char *s = va_arg(args, const char *);
+					if (s == NULL) s = "(null)";
+					if (gds_append_str(string, s) != 0) goto err;
+				}
+				break;
+			case 'n':
+				/* Depending on gcc settings, this will probably break with
+				 *  some silly "can't put %n in writable data space" message */
+				tmplen = sprintf(tmp, spec.array, va_arg(args, int *));
+				if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+				break;
+			case 'p':
+				tmplen = sprintf(tmp, spec.array, va_arg(args, void *));
+				if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+				break;
+			case '%':
+				if (gds_append(string, '%') != 0) goto err;
+				break;
+				/* Our specs */
+			case 'm':
+				++fmt;
+				if (*fmt == '*')
+					ext_unit = va_arg(args, const char *);
+				if (*fmt != '+' && *fmt != 'a' && *fmt != 'A' && *fmt != 'f' && *fmt != 'q')
+					value[0] = va_arg(args, pcb_coord_t);
+				count = 1;
+				switch (*fmt) {
+				case 'q':
+					qstr = va_arg(args, const char *);
+					if (mq_has_spec)
+						needsq = spec.array;
+					else
+						needsq = " \"\\";
+					if (QstringToString(string, qstr, '"', '\\', needsq) != 0) goto err;
+					break;
+				case 'I':
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_NM, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					break;
+				case 's':
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
+					break;
+				case 'S':
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_NATURAL, suffix) != 0) goto err;
+					break;
+				case 'H':
+					if (CoordsToHumanString(string, value[0], &spec, suffix) != 0) goto err;
+					break;
+				case 'M':
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_METRIC, suffix) != 0) goto err;
+					break;
+				case 'L':
+					if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_IMPERIAL, suffix) != 0) goto err;
+					break;
+				case 'k':
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_DMIL, suffix) != 0) goto err;
+					break;
+				case 'r':
+					if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_READABLE, PCB_UNIT_NO_SUFFIX) != 0) goto err;
+					break;
+					/* All these fallthroughs are deliberate */
+				case '9':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '8':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '7':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '6':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '5':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '4':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '3':
+					value[count++] = va_arg(args, pcb_coord_t);
+				case '2':
+				case 'D':
+					value[count++] = va_arg(args, pcb_coord_t);
+					if (CoordsToString(string, value, count, &spec, mask & PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+					break;
+				case 'd':
+					value[1] = va_arg(args, pcb_coord_t);
+					if (CoordsToString(string, value, 2, &spec, PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_MIL, suffix) != 0) goto err;
+					break;
+				case '*':
+					{
+						int found = 0;
+						for (i = 0; i < pcb_get_n_units(); ++i) {
+							if (strcmp(ext_unit, pcb_units[i].suffix) == 0) {
+								if (CoordsToString(string, value, 1, &spec, pcb_units[i].allow, suffix) != 0) goto err;
+								found = 1;
+								break;
+							}
+						}
+						if (!found)
+							if (CoordsToString(string, value, 1, &spec, mask & PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+					}
+					break;
+				case 'a':
+					if (gds_append_len(&spec, ".0f", 3) != 0) goto err;
+					if (suffix == PCB_UNIT_SUFFIX)
+						if (gds_append_len(&spec, " deg", 4) != 0) goto err;
+					tmplen = sprintf(tmp, spec.array, (double) va_arg(args, pcb_angle_t));
+					if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+					break;
+				case 'A':
+					if (gds_append_len(&spec, ".0f", 3) != 0) goto err;
+					/* if (suffix == PCB_UNIT_SUFFIX)
+						if (gds_append_len(&spec, " deg", 4) != 0) goto err;*/
+					tmplen = sprintf(tmp, spec.array, 10*((double) va_arg(args, pcb_angle_t))); /* kicad legacy needs decidegrees */
+					if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+					break;
+				case 'f':
+					gds_append_len(&spec, "f", 1);
+					tmplen = sprintf(tmp, spec.array, va_arg(args, double));
+					dot = strchr(spec.array, '.');
+					if ((dot != NULL) && (dot[1] == '0'))
+						tmplen = do_trunc0(tmp);
+					if (gds_append_len(string, tmp, tmplen) != 0) goto err;
+					break;
+				case '+':
+					mask = va_arg(args, enum pcb_allow_e);
+					break;
+				default:
+					{
+						int found = 0;
+						for (i = 0; i < pcb_get_n_units(); ++i) {
+							if (*fmt == pcb_units[i].printf_code) {
+								if (CoordsToString(string, value, 1, &spec, pcb_units[i].allow, suffix) != 0) goto err;
+								found = 1;
+								break;
+							}
+						}
+						if (!found)
+							if (CoordsToString(string, value, 1, &spec, PCB_UNIT_ALLOW_ALL_SANE, suffix) != 0) goto err;
+					}
+					break;
+				}
+				break;
+			}
+		}
+		else
+			if (gds_append(string, *fmt) != 0) goto err;
+		++fmt;
+	}
+
+	retval = 0;
+err:;
+	gds_uninit(&spec);
+	if (free_fmt != NULL)
+		free(free_fmt);
+
+	return retval;
+}
+
+int pcb_sprintf(char *string, const char *fmt, ...)
+{
+	gds_t str;
+	va_list args;
+
+	memset(&str, 0, sizeof(str)); /* can't use gds_init, it'd allocate str.array */
+	va_start(args, fmt);
+
+	/* pretend the string is already allocated to something huge; this doesn't
+	   make the code less safe but saves a copy */
+	str.array = string;
+	str.alloced = 1<<31;
+	str.no_realloc = 1;
+
+	pcb_append_vprintf(&str, fmt, args);
+
+	va_end(args);
+	return str.used;
+}
+
+int pcb_snprintf(char *string, size_t len, const char *fmt, ...)
+{
+	gds_t str;
+	va_list args;
+
+	memset(&str, 0, sizeof(str)); /* can't use gds_init, it'd allocate str.array */
+	va_start(args, fmt);
+
+	str.array = string;
+	str.alloced = len;
+	str.no_realloc = 1;
+
+	pcb_append_vprintf(&str, fmt, args);
+
+	va_end(args);
+	return str.used;
+}
+
+int pcb_vsnprintf(char *string, size_t len, const char *fmt, va_list args)
+{
+	gds_t str;
+
+	memset(&str, 0, sizeof(str)); /* can't use gds_init, it'd allocate str.array */
+
+	str.array = string;
+	str.alloced = len;
+	str.no_realloc = 1;
+
+	pcb_append_vprintf(&str, fmt, args);
+
+	return str.used;
+}
+
+int pcb_fprintf(FILE * fh, const char *fmt, ...)
+{
+	int rv;
+	va_list args;
+
+	va_start(args, fmt);
+	rv = pcb_vfprintf(fh, fmt, args);
+	va_end(args);
+
+	return rv;
+}
+
+int pcb_vfprintf(FILE * fh, const char *fmt, va_list args)
+{
+	int rv;
+	gds_t str;
+	gds_init(&str);
+
+	if (fh == NULL)
+		rv = -1;
+	else {
+		pcb_append_vprintf(&str, fmt, args);
+		rv = fprintf(fh, "%s", str.array);
+	}
+
+	gds_uninit(&str);
+	return rv;
+}
+
+int pcb_printf(const char *fmt, ...)
+{
+	int rv;
+	gds_t str;
+	va_list args;
+
+	gds_init(&str);
+	va_start(args, fmt);
+
+	pcb_append_vprintf(&str, fmt, args);
+	rv = printf("%s", str.array);
+
+	va_end(args);
+	gds_uninit(&str);
+	return rv;
+}
+
+char *pcb_strdup_printf(const char *fmt, ...)
+{
+	gds_t str;
+	va_list args;
+
+	gds_init(&str);
+
+	va_start(args, fmt);
+	pcb_append_vprintf(&str, fmt, args);
+	va_end(args);
+
+	return str.array; /* no other allocation has been made */
+}
+
+char *pcb_strdup_vprintf(const char *fmt, va_list args)
+{
+	gds_t str;
+	gds_init(&str);
+
+	pcb_append_vprintf(&str, fmt, args);
+
+	return str.array; /* no other allocation has been made */
+}
+
+
+/* Wrapper for pcb_append_vprintf that appends to a string using vararg API */
+int pcb_append_printf(gds_t *str, const char *fmt, ...)
+{
+	int retval;
+
+	va_list args;
+	va_start(args, fmt);
+	retval = pcb_append_vprintf(str, fmt, args);
+	va_end(args);
+
+	return retval;
+}
Index: tags/2.0.1/src/pcb-printf.h
===================================================================
--- tags/2.0.1/src/pcb-printf.h	(nonexistent)
+++ tags/2.0.1/src/pcb-printf.h	(revision 18980)
@@ -0,0 +1,164 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2011 Andrew Poelstra
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Andrew Poelstra, 16966 60A Ave, V3S 8X5 Surrey, BC, Canada
+ *  asp11@sfu.ca
+ *
+ */
+
+/* This file defines a wrapper around sprintf, that
+ *  defines new specifiers that take pcb_coord_t objects
+ *  as input.
+ *
+ * There is a fair bit of nasty (repetitious) code in
+ *  here, but I feel the gain in clarity for output
+ *  code elsewhere in the project will make it worth
+ *  it.
+ *
+ * The new coord/angle specifiers are:
+ *   %mI    output a raw internal coordinate without any suffix
+ *   %mm    output a measure in mm
+ *   %mM    output a measure in scaled (mm/um) metric
+ *   %ml    output a measure in mil
+ *   %mk    output a measure in decimil (kicad legacy format)
+ *   %mL    output a measure in scaled (mil/in) imperial
+ *   %ms    output a measure in most natural mm/mil units
+ *   %mS    output a measure in most natural scaled units
+ *   %mH    output a measure in most human readable scaled units
+ *   %md    output a pair of measures in most natural mm/mil units
+ *   %mD    output a pair of measures in most natural scaled units
+ *   %m3    output 3 measures in most natural scaled units
+ *     ...
+ *   %m9    output 9 measures in most natural scaled units
+ *   %m*    output a measure with unit given as an additional
+ *          const char* parameter
+ *   %m+    accepts an e_allow parameter that masks all subsequent
+ *          "natural" (S/D/3/.../9) specifiers to only use certain
+ *          units
+ *   %mr    output a measure in a unit readable by parse_l.l
+ *          (outputs in centimil without units - compatibility with mainline)
+ *   %ma    output an angle in degrees (expects degrees)
+ *   %mA    output an angle in decidegrees (degrees x 10) for kicad legacy
+ *   %mf    output an a double (same as %f, expect it understands the .0n modifier)
+ *
+ * These accept the usual printf modifiers for %f, as well as
+ *     $    output a unit suffix after the measure (with space between measure and unit)
+ *     $$   output a unit suffix after the measure (without space)
+ *     .n   number of digits after the decimal point (the usual %f modifier)
+ *     .0n  where n is a digit; same as %.n, but truncates trailing zeros
+ *     [n]  use stored format n
+ *     #    prevents all scaling for %mS/D/1/.../9 (this should
+ *          ONLY be used for debug code since its output exposes
+ *          pcb's base units).
+ *
+ * The usual printf(3) precision and length modifiers should work with
+ * any format specifier that outputs coords, e.g. %.3mm will output in
+ * mm up to 3 decimal digits after the decimal point.
+ *
+ * The new string specifiers are:
+ *   %mq    output a quoted string (""); quote if contains quote. Use
+ *          backslash to protect quotes within the quoted string. Modifiers:
+ *           {chars} start quoting if any of these appear; "\}" in {chars} is a plain '}'
+ *
+ *
+ * KNOWN ISSUES:
+ *   No support for %zu size_t printf spec
+ */
+
+#ifndef	PCB_PCB_PRINTF_H
+#define	PCB_PCB_PRINTF_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <genvector/gds_char.h>
+#include "unit.h"
+
+int pcb_fprintf(FILE * f, const char *fmt, ...);
+int pcb_vfprintf(FILE * f, const char *fmt, va_list args);
+int pcb_sprintf(char *string, const char *fmt, ...);
+int pcb_snprintf(char *string, size_t len, const char *fmt, ...);
+int pcb_vsnprintf(char *string, size_t len, const char *fmt, va_list args);
+int pcb_printf(const char *fmt, ...);
+char *pcb_strdup_printf(const char *fmt, ...);
+char *pcb_strdup_vprintf(const char *fmt, va_list args);
+
+int pcb_append_printf(gds_t *str, const char *fmt, ...);
+int pcb_append_vprintf(gds_t *string, const char *fmt, va_list args);
+
+/* Predefined slots (macros): %[n] will use the nth string from this list.
+   The first 8 are user-definable. */
+typedef enum {
+	PCB_PRINTF_SLOT_USER0,
+	PCB_PRINTF_SLOT_USER1,
+	PCB_PRINTF_SLOT_USER2,
+	PCB_PRINTF_SLOT_USER3,
+	PCB_PRINTF_SLOT_USER4,
+	PCB_PRINTF_SLOT_USER5,
+	PCB_PRINTF_SLOT_USER6,
+	PCB_PRINTF_SLOT_USER7,
+	PCB_PRINTF_SLOT_FF_ORIG_COORD, /* %[8] original .pcb file format coord prints */
+	PCB_PRINTF_SLOT_FF_SAFE_COORD, /* %[9] safe .pcb file format coord print that doesn't lose precision */
+	PCB_PRINTF_SLOT_max
+} pcb_printf_slot_idx_t;
+extern const char *pcb_printf_slot[PCB_PRINTF_SLOT_max];
+
+/* strdup and return a string built from a template, controlled by flags:
+
+   PCB_SUBST_HOME: replace leading ~ with the user's home directory
+
+   PCB_SUBST_PERCENT: attempt to replace printf-like formatting
+   directives (e.g. %P) using an user provided callback function. The callback
+   function needs to recognize the directive at **input (pointing to the byte
+   after the %) and append the substitution to s and increase *input to point
+   beyond the format directive. The callback returns 0 on success or -1
+   on unknown directive (which will be copied verbatim). %% will always
+   be translated into a single %, without calling cb.
+
+   PCB_SUBST_CONF: replace $(conf) automatically (no callback)
+
+   Implemented in paths.c because it depends on conf_core.h and error.h .
+*/
+typedef enum {
+	PCB_SUBST_HOME = 1,
+	PCB_SUBST_PERCENT = 2,
+	PCB_SUBST_CONF = 4,
+	PCB_SUBST_BACKSLASH = 8, /* substitute \ sequences as printf(3) does */
+
+	PCB_SUBST_ALL = 0xff
+} pcb_strdup_subst_t;
+
+/* Substitute template using cb, leaving extra room at the end and append the
+   result to s. Returns 0 on success. */
+int pcb_subst_append(gds_t *s, const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags, size_t extra_room);
+
+/* Same as pcb_subst_append(), but returns a dynamic allocated string
+   (the caller needs to free() after use) or NULL on error. */
+char *pcb_strdup_subst(const char *template, int (*cb)(void *ctx, gds_t *s, const char **input), void *ctx, pcb_strdup_subst_t flags);
+
+#endif
Index: tags/2.0.1/src/pcb_bool.c
===================================================================
--- tags/2.0.1/src/pcb_bool.c	(nonexistent)
+++ tags/2.0.1/src/pcb_bool.c	(revision 18980)
@@ -0,0 +1,38 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "pcb_bool.h"
+#include "compat_misc.h"
+
+pcb_bool_op_t pcb_str2boolop(const char *s)
+{
+	if (pcb_strcasecmp(s, "set") == 0)       return PCB_BOOL_SET;
+	if (pcb_strcasecmp(s, "clear") == 0)     return PCB_BOOL_CLEAR;
+	if (pcb_strcasecmp(s, "toggle") == 0)    return PCB_BOOL_TOGGLE;
+	if (pcb_strcasecmp(s, "preserve") == 0)  return PCB_BOOL_PRESERVE;
+	return PCB_BOOL_INVALID;
+}
Index: tags/2.0.1/src/pcb_bool.h
===================================================================
--- tags/2.0.1/src/pcb_bool.h	(nonexistent)
+++ tags/2.0.1/src/pcb_bool.h	(revision 18980)
@@ -0,0 +1,61 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_BOOL_H
+#define PCB_BOOL_H
+/* Because stdbool is not c89 */
+typedef int pcb_bool;
+typedef enum pcb_bool_e {
+	pcb_false = 0,
+	pcb_true = 1
+} pcb_bool_t;
+
+
+	/* for arguments optionally changing the value of a bool */
+typedef enum pcb_bool_op_e {
+	PCB_BOOL_CLEAR = 0,
+	PCB_BOOL_SET = 1,
+	PCB_BOOL_TOGGLE = -1,
+	PCB_BOOL_PRESERVE = -2,
+	PCB_BOOL_INVALID = -8
+} pcb_bool_op_t;
+
+/* changes the value of pcb_bool dst as requested by pcb_bool_op_t op
+   WARNING: evaluates dst multiple times */
+#define pcb_bool_op(dst, op) \
+do { \
+	switch(op) { \
+		case PCB_BOOL_CLEAR:   (dst) = 0; break; \
+		case PCB_BOOL_SET:     (dst) = 1; break; \
+		case PCB_BOOL_TOGGLE:  (dst) = !(dst); break; \
+		case PCB_BOOL_INVALID: \
+		case PCB_BOOL_PRESERVE: break; \
+	} \
+} while(0)
+
+pcb_bool_op_t pcb_str2boolop(const char *s);
+
+#endif
Index: tags/2.0.1/src/pcb_minuid.c
===================================================================
--- tags/2.0.1/src/pcb_minuid.c	(nonexistent)
+++ tags/2.0.1/src/pcb_minuid.c	(revision 18980)
@@ -0,0 +1,14 @@
+#include <libminuid/libminuid.h>
+#include "compat_misc.h"
+#include "pcb_minuid.h"
+
+minuid_session_t pcb_minuid;
+
+
+void pcb_minuid_init(void)
+{
+	int pid = pcb_getpid();
+	minuid_init(&pcb_minuid);
+	minuid_salt(&pcb_minuid, &pid, sizeof(pid));
+}
+
Index: tags/2.0.1/src/pcb_minuid.h
===================================================================
--- tags/2.0.1/src/pcb_minuid.h	(nonexistent)
+++ tags/2.0.1/src/pcb_minuid.h	(revision 18980)
@@ -0,0 +1,4 @@
+#include <libminuid/libminuid.h>
+extern minuid_session_t pcb_minuid;
+
+void pcb_minuid_init(void);
Index: tags/2.0.1/src/plug_footprint.c
===================================================================
--- tags/2.0.1/src/plug_footprint.c	(nonexistent)
+++ tags/2.0.1/src/plug_footprint.c	(revision 18980)
@@ -0,0 +1,476 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "plug_footprint.h"
+#include "plugins.h"
+
+#include <genht/htsp.h>
+#include <genht/hash.h>
+#include "conf_core.h"
+#include "error.h"
+#include "compat_misc.h"
+#include "event.h"
+
+pcb_plug_fp_t *pcb_plug_fp_chain = NULL;
+pcb_fplibrary_t pcb_library;
+
+int pcb_fp_dupname(const char *name, char **basename, char **params)
+{
+	char *newname, *s;
+
+	*basename = newname = pcb_strdup(name);
+	s = strchr(newname, '(');
+	if (s == NULL) {
+		*params = NULL;
+		return 0;
+	}
+
+	/* split at '(' */
+	*s = '\0';
+	*params = s + 1;
+	s = *params + strlen(*params) - 1;
+
+	/* strip ')' */
+	if (*s == ')')
+		*s = '\0';
+
+	return 1;
+}
+
+static htsp_t *fp_tags = NULL;
+
+const void *pcb_fp_tag(const char *tag, int alloc)
+{
+	htsp_entry_t *e;
+	static char *counter = NULL;
+
+	if (fp_tags == NULL)
+		fp_tags = htsp_alloc(strhash, strkeyeq);
+	e = htsp_getentry(fp_tags, tag);
+	if ((e == NULL) && alloc) {
+		htsp_set(fp_tags, pcb_strdup(tag), (void *) counter);
+		counter++;
+		e = htsp_getentry(fp_tags, tag);
+	}
+	return e == NULL ? NULL : e->key;
+}
+
+void pcb_fp_init()
+{
+	pcb_library.type = LIB_DIR;
+	pcb_library.name = pcb_strdup("/");  /* All names are eventually free()'d */
+}
+
+void pcb_fp_uninit()
+{
+	htsp_entry_t *e;
+
+	if (pcb_plug_fp_chain != NULL)
+		pcb_message(PCB_MSG_ERROR, "pcb_plug_fp_chain is not empty; a plugin did not remove itself from the chain. Fix your plugins!\n");
+
+	pcb_fp_free_children(&pcb_library);
+	if (fp_tags != NULL) {
+		for (e = htsp_first(fp_tags); e; e = htsp_next(fp_tags, e))
+			free(e->key);
+		htsp_free(fp_tags);
+		fp_tags = NULL;
+	}
+	free(pcb_library.name);
+	pcb_library.name = NULL;
+}
+
+const char *pcb_fp_tagname(const void *tagid)
+{
+	return (char *) tagid;
+}
+
+FILE *pcb_fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
+{
+	FILE *res = NULL;
+	if (strchr(path, ':') != NULL)  {
+		char *tmp, *next, *curr;
+
+		curr = tmp = pcb_strdup(path);
+		while((res == NULL) && (curr != NULL)) {
+			next = strchr(curr, ':');
+			if (next != NULL) {
+				*next= '\0';
+				next++;
+			}
+
+			PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fp_fopen, res, != NULL, (self, curr, name, fctx));
+			curr = next;
+		}
+		free(tmp);
+	}
+	else
+		PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fp_fopen, res, != NULL, (self, path, name, fctx));
+	return res;
+}
+
+void pcb_fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx)
+{
+	if ((fctx->backend != NULL) && (fctx->backend->fp_fclose != NULL))
+		fctx->backend->fp_fclose(fctx->backend, f, fctx);
+}
+
+pcb_fplibrary_t *pcb_fp_append_entry(pcb_fplibrary_t *parent, const char *name, pcb_fptype_t type, void *tags[])
+{
+	pcb_fplibrary_t *entry;   /* Pointer to individual menu entry */
+
+	assert(parent->type == LIB_DIR);
+	entry = pcb_get_library_memory(parent);
+	if (entry == NULL)
+		return NULL;
+
+	if (type == PCB_FP_PARAMETRIC) {
+		/* concat name and () */
+		/* do not use pcb_strdup_printf or Concat here, do not increase gsch2pcb-rnd deps */
+		int nl = strlen(name);
+		entry->name = malloc(nl+3);
+		memcpy(entry->name, name, nl);
+		strcpy(entry->name+nl, "()");
+	}
+	else
+		entry->name = pcb_strdup(name);
+
+	entry->type = LIB_FOOTPRINT;
+	entry->data.fp.type = type;
+	entry->data.fp.tags = tags;
+	entry->data.fp.loc_info = NULL;
+	entry->data.fp.backend_data = NULL;
+	return entry;
+}
+
+pcb_fplibrary_t *fp_lib_search_len(pcb_fplibrary_t *dir, const char *name, int name_len)
+{
+	pcb_fplibrary_t *l;
+	int n;
+
+	if (dir->type != LIB_DIR)
+		return NULL;
+
+	for(n = 0, l = dir->data.dir.children.array; n < dir->data.dir.children.used; n++, l++)
+		if (strncmp(l->name, name, name_len) == 0)
+			return l;
+
+	return NULL;
+}
+
+pcb_fplibrary_t *pcb_fp_lib_search(pcb_fplibrary_t *dir, const char *name)
+{
+	pcb_fplibrary_t *l;
+	int n;
+
+	if (dir->type != LIB_DIR)
+		return NULL;
+
+	for(n = 0, l = dir->data.dir.children.array; n < dir->data.dir.children.used; n++, l++)
+		if (strcmp(l->name, name) == 0)
+			return l;
+
+	return NULL;
+}
+
+
+pcb_fplibrary_t *pcb_fp_mkdir_len(pcb_fplibrary_t *parent, const char *name, int name_len)
+{
+	pcb_fplibrary_t *l = pcb_get_library_memory(parent);
+
+	if (name_len > 0)
+		l->name = pcb_strndup(name, name_len);
+	else
+		l->name = pcb_strdup(name);
+	l->parent = parent;
+	l->type = LIB_DIR;
+	l->data.dir.backend = NULL;
+	vtlib_init(&l->data.dir.children);
+	return l;
+}
+
+pcb_fplibrary_t *pcb_fp_mkdir_p(const char *path)
+{
+	pcb_fplibrary_t *l, *parent = NULL;
+	const char *next;
+
+	/* search for the last existing dir in the path */
+
+	while(*path == '/') path++;
+	for(parent = l = &pcb_library; l != NULL; parent = l,path = next) {
+		next = strchr(path, '/');
+		if (next == NULL)
+			l = pcb_fp_lib_search(l, path);
+		else
+			l = fp_lib_search_len(l, path, next-path);
+
+		/* skip path sep */
+		if (next != NULL) {
+			while(*next == '/') next++;
+			if (*next == '\0')
+				next = NULL;
+		}
+
+		/* last elem of the path */
+		if (next == NULL) {
+			if (l != NULL)
+				return l;
+			break; /* found a non-existing node */
+		}
+
+		if (l == NULL)
+			break;
+	}
+
+	/* by now path points to the first non-existing dir, under parent */
+	for(;path != NULL; path = next) {
+		next = strchr(path, '/');
+		parent = pcb_fp_mkdir_len(parent, path, next-path);
+		if (next != NULL) {
+			while(*next == '/') next++;
+			if (*next == '\0')
+				next = NULL;
+		}
+	}
+
+	return parent;
+}
+
+static int fp_sort_cb(const void *a, const void *b)
+{
+	const pcb_fplibrary_t *fa = a, *fb = b;
+	int res = strcmp(fa->name, fb->name);
+	return res == 0 ? 1 : res;
+}
+
+void pcb_fp_sort_children(pcb_fplibrary_t *parent)
+{
+	vtlib_t *v;
+	int n;
+
+	if (parent->type != LIB_DIR)
+		return;
+
+	v = &parent->data.dir.children;
+	qsort(v->array, vtlib_len(v), sizeof(pcb_fplibrary_t), fp_sort_cb);
+
+	for (n = 0; n < vtlib_len(v); n++)
+		pcb_fp_sort_children(&v->array[n]);
+}
+
+void fp_free_entry(pcb_fplibrary_t *l)
+{
+	switch(l->type) {
+		case LIB_DIR:
+			pcb_fp_free_children(l);
+			vtlib_uninit(&(l->data.dir.children));
+			break;
+		case LIB_FOOTPRINT:
+			if (l->data.fp.loc_info != NULL)
+				free(l->data.fp.loc_info);
+			if (l->data.fp.tags != NULL)
+				free(l->data.fp.tags);
+			break;
+		case LIB_INVALID: break; /* suppress compiler warning */
+	}
+	if (l->name != NULL) {
+		free(l->name);
+		l->name = NULL;
+	}
+	l->type = LIB_INVALID;
+}
+
+void pcb_fp_free_children(pcb_fplibrary_t *parent)
+{
+	int n;
+	pcb_fplibrary_t *l;
+
+	assert(parent->type == LIB_DIR);
+
+	for(n = 0, l = parent->data.dir.children.array; n < parent->data.dir.children.used; n++, l++)
+		fp_free_entry(l);
+
+	vtlib_truncate(&(parent->data.dir.children), 0);
+}
+
+
+void pcb_fp_rmdir(pcb_fplibrary_t *dir)
+{
+	pcb_fplibrary_t *l, *parent = dir->parent;
+	int n;
+	fp_free_entry(dir);
+	if (parent != NULL) {
+		for(n = 0, l = parent->data.dir.children.array; n < parent->data.dir.children.used; n++,l++) {
+			if (l == dir) {
+				vtlib_remove(&(parent->data.dir.children), n, 1);
+				break;
+			}
+		}
+	}
+}
+
+/* Debug functions */
+void fp_dump_dir(pcb_fplibrary_t *dir, int level)
+{
+	pcb_fplibrary_t *l;
+	int n, p;
+
+	for(n = 0, l = dir->data.dir.children.array; n < dir->data.dir.children.used; n++, l++) {
+		for(p = 0; p < level; p++)
+			putchar(' ');
+		if (l->type == LIB_DIR) {
+			printf("%s/\n", l->name);
+			fp_dump_dir(l, level+1);
+		}
+		else if (l->type == LIB_FOOTPRINT)
+			printf("%s\n", l->name);
+		else
+			printf("*INVALID*\n");
+	}
+}
+
+void fp_dump()
+{
+	fp_dump_dir(&pcb_library, 0);
+}
+
+/* This function loads the newlib footprints into the Library.
+ * It examines all directories pointed to by the search paths
+ * (normally Settings.LibraryTree).
+ * In each directory specified there, it looks both in that directory,
+ * as well as *one* level down.  It calls the subfunction
+ * fp_fs_load_dir to put the footprints into PCB's internal
+ * datastructures.
+ */
+static int fp_read_lib_all_(const char *searchpath)
+{
+	char *toppath, toppath_[PCB_PATH_MAX + 1];  /* String holding abs path to top level library dir */
+	char *libpaths;        /* String holding list of library paths to search */
+	char *p;               /* Helper string used in iteration */
+	int n_footprints = 0;  /* Running count of footprints found */
+	int res;
+
+	/* Additional loop to allow for multiple 'newlib' style library directories
+	 * called out in Settings.LibraryTree
+	 */
+	libpaths = pcb_strdup(searchpath);
+	for (p = strtok(libpaths, PCB_PATH_DELIMETER); p && *p; p = strtok(NULL, PCB_PATH_DELIMETER)) {
+		int silent_fail = 0;
+
+		/* remove trailing path delimiter */
+		strncpy(toppath_, p, sizeof(toppath_) - 1);
+		toppath_[sizeof(toppath_) - 1] = '\0';
+
+		/* make paths starting with '?' optional (silently fail) */
+		toppath = toppath_;
+		if (toppath[0] == '?') {
+			toppath++;
+			silent_fail = 1;
+		}
+
+#ifdef DEBUG
+		printf("In ParseLibraryTree, looking for newlib footprints inside top level directory %s ... \n", toppath);
+#endif
+
+		/* Next read in any footprints in the top level dir */
+		res = -1;
+		PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, load_dir, res, >= 0, (self, toppath, 0));
+		if (res >= 0)
+			n_footprints += res;
+		else if (!silent_fail)
+			pcb_message(PCB_MSG_WARNING, "Warning: footprint library list error on %s\n", toppath);
+	}
+
+#ifdef DEBUG
+	printf("Leaving ParseLibraryTree, found %d footprints.\n", n_footprints);
+#endif
+
+	free(libpaths);
+	return n_footprints;
+}
+
+static gds_t fpds_paths;
+static int fpds_inited = 0;
+
+const char *pcb_fp_default_search_path(void)
+{
+	return conf_concat_strlist(&conf_core.rc.library_search_paths, &fpds_paths, &fpds_inited, ':');
+}
+
+int pcb_fp_host_uninit(void)
+{
+	if (fpds_inited)
+		gds_uninit(&fpds_paths);
+	return 0;
+}
+
+int pcb_fp_read_lib_all(void)
+{
+	FILE *resultFP = NULL;
+
+	/* List all footprint libraries.  Then sort the whole
+	 * library.
+	 */
+	if (fp_read_lib_all_(pcb_fp_default_search_path()) > 0 || resultFP != NULL) {
+		pcb_fp_sort_children(&pcb_library);
+		return 0;
+	}
+
+	return 1;
+}
+
+int pcb_fp_rehash(pcb_fplibrary_t *l)
+{
+	pcb_plug_fp_t *be;
+	char *path;
+	int res;
+
+	if (l == NULL) {
+		pcb_fp_free_children(&pcb_library);
+		return pcb_fp_read_lib_all();
+	}
+	if (l->type != LIB_DIR)
+		return -1;
+
+	be = l->data.dir.backend;
+	if ((be == NULL) || (be->load_dir == NULL))
+		return -1;
+
+	path = pcb_strdup(l->name);
+	pcb_fp_rmdir(l);
+	res = be->load_dir(be, path, 1);
+	pcb_fp_sort_children(&pcb_library);
+	free(path);
+
+	if (res >= 0) {
+		pcb_event(PCB_EVENT_LIBRARY_CHANGED, NULL);
+		return 0;
+	}
+	return -1;
+}
Index: tags/2.0.1/src/plug_footprint.h
===================================================================
--- tags/2.0.1/src/plug_footprint.h	(nonexistent)
+++ tags/2.0.1/src/plug_footprint.h	(revision 18980)
@@ -0,0 +1,91 @@
+#ifndef PCB_PLUG_FOOTPRINT_H
+#define PCB_PLUG_FOOTPRINT_H
+
+#include <stdio.h>
+#include "vtlibrary.h"
+
+typedef struct pcb_plug_fp_s pcb_plug_fp_t;
+
+typedef struct {
+	pcb_plug_fp_t *backend;
+	union {
+		int i;
+		void *p;
+	} field[4];
+} pcb_fp_fopen_ctx_t;
+
+/* hook bindings, see below */
+FILE *pcb_fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+void pcb_fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx);
+
+/* duplicates the name and splits it into a basename and params;
+   params is NULL if the name is not parametric (and "" if parameter list is empty)
+   returns 1 if name is parametric footprint, 0 if static file footprint.
+   The caller shall free only *basename at the end.
+   */
+int pcb_fp_dupname(const char *name, char **basename, char **params);
+
+/**** tag management ****/
+/* Resolve a tag name to an unique void * ID; create unknown tag if alloc != 0 */
+const void *pcb_fp_tag(const char *tag, int alloc);
+
+/* Resolve a tag ID to a tag name */
+const char *pcb_fp_tagname(const void *tagid);
+
+/* init/uninit the footprint lib, free tag key memory */
+void pcb_fp_init();
+void pcb_fp_uninit();
+
+/**************************** API definition *********************************/
+struct pcb_plug_fp_s {
+	pcb_plug_fp_t *next;
+	void *plugin_data;
+
+	/* returns the number of footprints loaded into the library or -1 on
+	   error; next in chain is run only on error. If force is 1, force doing the
+	   expensive part of the load (e.g. wget) */
+	int (*load_dir)(pcb_plug_fp_t *ctx, const char *path, int force);
+
+/* Open a footprint for reading; if the footprint is parametric, it's run
+   prefixed with libshell (or executed directly, if libshell is NULL).
+   If name is not an absolute path, search_path is searched for the first match.
+   The user has to supply a state integer that will be used by pcb_pcb_fp_fclose().
+   Must fill in fctx->backend, may use any other field of fctx as well.
+ */
+	FILE *(*fp_fopen)(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+
+/* Close the footprint file opened by pcb_pcb_fp_fopen(). */
+	void (*fp_fclose)(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
+};
+
+extern pcb_plug_fp_t *pcb_plug_fp_chain;
+
+
+/* Optional pcb-rnd-side glue for some implementations */
+
+extern pcb_fplibrary_t pcb_library; /* the footprint library */
+
+#define pcb_get_library_memory(parent) vtlib_alloc_append(((parent) == NULL ? &pcb_library.data.dir.children : &(parent)->data.dir.children), 1);
+
+void pcb_fp_free_children(pcb_fplibrary_t *parent);
+void pcb_fp_sort_children(pcb_fplibrary_t *parent);
+void pcb_fp_rmdir(pcb_fplibrary_t *dir);
+pcb_fplibrary_t *pcb_fp_mkdir_p(const char *path);
+pcb_fplibrary_t *pcb_fp_mkdir_len(pcb_fplibrary_t *parent, const char *name, int name_len);
+pcb_fplibrary_t *pcb_fp_lib_search(pcb_fplibrary_t *dir, const char *name);
+
+/* Append a menu entry in the tree */
+pcb_fplibrary_t *pcb_fp_append_entry(pcb_fplibrary_t *parent, const char *name, pcb_fptype_t type, void *tags[]);
+
+/* walk through all lib paths and build the library menu */
+int pcb_fp_read_lib_all(void);
+
+
+const char *pcb_fp_default_search_path(void);
+
+int pcb_fp_host_uninit(void);
+
+/* rescan/reload all footprints in the library cache */
+int pcb_fp_rehash(pcb_fplibrary_t *l);
+
+#endif
Index: tags/2.0.1/src/plug_footprint_act.c
===================================================================
--- tags/2.0.1/src/plug_footprint_act.c	(nonexistent)
+++ tags/2.0.1/src/plug_footprint_act.c	(revision 18980)
@@ -0,0 +1,82 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "actions.h"
+#include "plug_footprint.h"
+
+static const char pcb_acts_fp_rehash[] = "fp_rehash()" ;
+static const char pcb_acth_fp_rehash[] = "Flush the library index; rescan all library search paths and rebuild the library index. Useful if there are changes in the library during a pcb-rnd session.";
+static fgw_error_t pcb_act_fp_rehash(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *name = NULL;
+	pcb_fplibrary_t *l;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, fp_rehash, name = argv[1].val.str);
+	PCB_ACT_IRES(0);
+
+	if (name == NULL) {
+		pcb_fp_rehash(NULL);
+		return 0;
+	}
+
+	l = pcb_fp_lib_search(&pcb_library, name);
+	if (l == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't find library path %s\n", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (l->type != LIB_DIR) {
+		pcb_message(PCB_MSG_ERROR, "Library path %s is not a directory\n", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (l->data.dir.backend == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Library path %s is not a top level directory of a fp_ plugin\n", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (pcb_fp_rehash(l) != 0) {
+		pcb_message(PCB_MSG_ERROR, "Failed to rehash %s\n", name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	return 0;
+}
+
+
+pcb_action_t conf_plug_footprint_list[] = {
+	{"fp_rehash", pcb_act_fp_rehash, pcb_acth_fp_rehash, pcb_acts_fp_rehash}
+};
+
+PCB_REGISTER_ACTIONS(conf_plug_footprint_list, NULL)
Index: tags/2.0.1/src/plug_import.c
===================================================================
--- tags/2.0.1/src/plug_import.c	(nonexistent)
+++ tags/2.0.1/src/plug_import.c	(revision 18980)
@@ -0,0 +1,126 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2015,2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This used to be file.c; it's a hook based plugin API now */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <locale.h>
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "plugins.h"
+#include "plug_import.h"
+#include "error.h"
+#include "safe_fs.h"
+
+
+pcb_plug_import_t *pcb_plug_import_chain = NULL;
+
+typedef struct {
+	pcb_plug_import_t *plug;
+	int prio;
+} find_t;
+
+/* Find the plugin that offers the highest write prio for the format */
+static pcb_plug_import_t *find_importer(unsigned int aspects, FILE *f, const char *filename)
+{
+	find_t available[32]; /* wish we had more than 32 import plugins... */
+	int n, len = 0, best = 0, bestidx = -1;
+
+#define cb_append(pl, pr) \
+	do { \
+		rewind(f); \
+		if (pr > 0) { \
+			assert(len < sizeof(available)/sizeof(available[0])); \
+			available[len].plug = pl; \
+			available[len++].prio = pr; \
+		} \
+	} while(0)
+
+	PCB_HOOK_CALL_ALL(pcb_plug_import_t, pcb_plug_import_chain, fmt_support_prio, cb_append,   (self, aspects, f, filename));
+	if (len == 0)
+		return NULL;
+
+	for(n = 0; n < len; n++) {
+		if (available[n].prio > best) {
+			bestidx = n;
+			best = available[n].prio;
+		}
+	}
+
+	if (best == 0)
+		return NULL;
+
+	return available[bestidx].plug;
+#undef cb_append
+}
+
+
+int pcb_import(char *filename, unsigned int aspect)
+{
+	pcb_plug_import_t *plug;
+	FILE *fp;
+
+	if (!filename) {
+		pcb_message(PCB_MSG_ERROR, "Error: need a file name for pcb_import_netlist()\n");
+		return 1; /* nothing to do */
+	}
+	fp = pcb_fopen(filename, "r");
+
+	plug = find_importer(aspect, fp, filename);
+	if (plug == NULL) {
+		if (fp != NULL) {
+			pcb_message(PCB_MSG_ERROR, "Error: can't find a suitable netlist parser for %s\n", filename);
+			fclose(fp);
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "Error: can't find a suitable netlist parser for %s - might be related: can't open %s for reading\n", filename, filename);
+		return 1;
+	}
+
+	if (fp != NULL)
+		fclose(fp);
+
+	return plug->import(plug, aspect, filename);
+}
+
+int pcb_import_netlist(char *filename)
+{
+	return pcb_import(filename, IMPORT_ASPECT_NETLIST);
+}
+
+void pcb_import_uninit(void)
+{
+	if (pcb_plug_import_chain != NULL)
+		pcb_message(PCB_MSG_ERROR, "pcb_plug_import_chain is not empty; a plugin did not remove itself from the chain. Fix your plugins!\n");
+}
Index: tags/2.0.1/src/plug_import.h
===================================================================
--- tags/2.0.1/src/plug_import.h	(nonexistent)
+++ tags/2.0.1/src/plug_import.h	(revision 18980)
@@ -0,0 +1,66 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_PLUG_IMPORT_H
+#define PCB_PLUG_IMPORT_H
+
+#include "config.h"
+#include "conf.h"
+
+/**************************** API definition *********************************/
+
+typedef enum pcb_plug_import_aspect_e { /* bitfield of aspects that can be imported */
+	IMPORT_ASPECT_NETLIST = 1
+} pcb_plug_import_aspect_t;
+
+typedef struct pcb_plug_import_s pcb_plug_import_t;
+struct pcb_plug_import_s {
+	pcb_plug_import_t *next;
+	void *plugin_data;
+
+	/* Check if the plugin supports format fmt. Return 0 if not supported or
+	   an integer priority if supported. The higher the prio is the more likely
+	   the plugin gets the next operation on the file. Base prio should be 100
+	   for native formats. Return non-0 only if all aspects are supported. */
+	int (*fmt_support_prio)(pcb_plug_import_t *ctx, unsigned int aspects, FILE *f, const char *filename);
+
+	/* Perform the import; return 0 on success */
+	int (*import)(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn);
+};
+
+extern pcb_plug_import_t *pcb_plug_import_chain;
+
+void pcb_import_uninit(void);
+
+/********** hook wrappers **********/
+int pcb_import(char *filename, unsigned int aspect);
+int pcb_import_netlist(char *);
+
+
+#endif
Index: tags/2.0.1/src/plug_io.c
===================================================================
--- tags/2.0.1/src/plug_io.c	(nonexistent)
+++ tags/2.0.1/src/plug_io.c	(revision 18980)
@@ -0,0 +1,1110 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2015,2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* This used to be file.c; some of the code landed in the io_pcb plugin,
+   the format-independent parts ended up here. */
+
+/* file save, load, merge ... routines */
+
+/* If emergency format is not configured but emergency file name is, default
+   to saving in the native format */
+#define DEFAULT_EMERGENCY_FMT "lihata"
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <locale.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "change.h"
+#include "conf.h"
+#include "data.h"
+#include "error.h"
+#include "plug_io.h"
+#include "remove.h"
+#include "paths.h"
+#include "rats_patch.h"
+#include "actions.h"
+#include "hid_flags.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "event.h"
+#include "compat_misc.h"
+#include "route_style.h"
+#include "compat_fs.h"
+#include "compat_nls.h"
+#include "compat_lrealpath.h"
+#include "layer_vis.h"
+#include "safe_fs.h"
+#include "plug_footprint.h"
+#include "build_run.h"
+#include "macro.h"
+
+/* for opendir */
+#include "compat_inc.h"
+
+pcb_plug_io_t *pcb_plug_io_chain = NULL;
+int pcb_io_err_inhibit = 0;
+
+static void plug_io_err(int res, const char *what, const char *filename)
+{
+	if (pcb_io_err_inhibit)
+		return;
+	if (res != 0) {
+		const char *reason = "", *comment = "";
+		if (pcb_plug_io_chain != NULL) {
+			if (filename == NULL) {
+				reason = "none of io plugins could successfully write the file";
+				filename = "";
+			}
+			else {
+				FILE *f;
+				reason = "none of io plugins could successfully read file";
+				f = pcb_fopen(filename, "r");
+				if (f != NULL) {
+					fclose(f);
+					comment = "(unknown/invalid file format?)";
+				}
+				else
+					comment = "(can not open the file for reading)";
+			}
+		}
+		else {
+			reason = "no io plugin loaded, I don't know any file format";
+			if (filename == NULL)
+				filename = "";
+		}
+		pcb_message(PCB_MSG_ERROR, "IO error during %s: %s %s %s\n", what, reason, filename, comment);
+	}
+}
+
+static char *last_design_dir = NULL;
+void pcb_set_design_dir(const char *fn)
+{
+	char *end;
+
+	free(last_design_dir);
+	last_design_dir = NULL;
+
+	if (fn != NULL)
+		last_design_dir = pcb_lrealpath(fn);
+
+	if (last_design_dir == NULL) {
+		last_design_dir = pcb_strdup("<invalid>");
+		conf_force_set_str(conf_core.rc.path.design, last_design_dir);
+		pcb_conf_ro("rc/path/design");
+		return;
+	}
+
+	end = strrchr(last_design_dir, PCB_DIR_SEPARATOR_C);
+	if (end != NULL)
+		*end = '\0';
+
+	conf_force_set_str(conf_core.rc.path.design, last_design_dir);
+	pcb_conf_ro("rc/path/design");
+}
+
+static int pcb_test_parse_all(FILE *ft, const char *Filename, const char *fmt, pcb_plug_iot_t type, pcb_find_io_t *available, int *accepts, int *accept_total, int maxav, int ignore_missing, int gen_event)
+{
+	int len, n;
+
+	if (ft == NULL) {
+		if (!ignore_missing)
+			pcb_message(PCB_MSG_ERROR, "Error: can't open %s for reading (format is %s)\n", Filename, fmt);
+		return -1;
+	}
+
+	if (gen_event)
+		pcb_event(PCB_EVENT_LOAD_PRE, "s", Filename);
+
+	len = pcb_find_io(available, maxav, type, 0, fmt);
+	if (fmt != NULL) {
+		/* explicit format */
+		for(n = 0; n < len; n++) {
+			void (*f)();
+			switch(type) {
+				case PCB_IOT_PCB: f = (void (*)())available[n].plug->parse_pcb; break;
+				default: assert(!"internal error: pcb_test_parse_all: wrong type"); f = NULL;
+			}
+			if (f != NULL) {
+				accepts[n] = 1; /* force-accept - if it can handle the format, and the user explicitly wanted this format, let's try it */
+				(*accept_total)++;
+			}
+		}
+
+		if (*accept_total <= 0) {
+			pcb_message(PCB_MSG_ERROR, "can't find a IO_ plugin to load a PCB using format %s\n", fmt);
+			return -1;
+		}
+
+		if (*accept_total > 1) {
+			pcb_message(PCB_MSG_INFO, "multiple IO_ plugins can handle format %s - I'm going to try them all, but you may want to be more specific next time; formats found:\n", fmt);
+			for(n = 0; n < len; n++)
+				pcb_message(PCB_MSG_INFO, "    %s\n", available[n].plug->description);
+		}
+	}
+	else {
+		/* test-parse with all plugins to see who can handle the syntax */
+		if((fgetc(ft) != EOF)) {
+			rewind(ft);
+			for(n = 0; n < len; n++) {
+				if ((available[n].plug->test_parse == NULL) || (available[n].plug->test_parse(available[n].plug, type, Filename, ft))) {
+					accepts[n] = 1;
+					(*accept_total)++;
+				}
+				else
+					accepts[n] = 0;
+				rewind(ft);
+			}
+		}
+	}
+
+	if (*accept_total == 0) {
+		pcb_message(PCB_MSG_ERROR, "none of the IO_ plugin recognized the file format of %s - it's either not a valid board file or does not match the format specified\n", Filename);
+		return -1;
+	}
+	return len;
+}
+
+int pcb_parse_pcb(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings, int ignore_missing)
+{
+	int res = -1, len, n;
+	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
+	int accepts[PCB_IO_MAX_FORMATS]; /* test-parse output */
+	int accept_total = 0;
+	FILE *ft;
+
+	ft = pcb_fopen(Filename, "r");
+	len = pcb_test_parse_all(ft, Filename, fmt, PCB_IOT_PCB, available, accepts, &accept_total, sizeof(available)/sizeof(available[0]), ignore_missing, load_settings);
+	if (ft != NULL)
+		fclose(ft);
+	if (len < 0)
+		return -1;
+
+	Ptr->Data->loader = NULL;
+
+	/* try all plugins that said it could handle the file */
+	for(n = 0; n < len; n++) {
+		if ((available[n].plug->parse_pcb == NULL) || (!accepts[n])) /* can't parse or doesn't want to parse this file */
+			continue;
+		res = available[n].plug->parse_pcb(available[n].plug, Ptr, Filename, load_settings);
+		if (res == 0) {
+			if (Ptr->Data->loader == NULL) /* if the loader didn't set this (to some more fine grained, e.g. depending on file format version) */
+				Ptr->Data->loader = available[n].plug;
+			break;
+		}
+	}
+
+	if ((res == 0) && (load_settings))
+		conf_load_project(NULL, Filename);
+
+	if (res == 0)
+		pcb_set_design_dir(Filename);
+
+	if (load_settings)
+		pcb_event(PCB_EVENT_LOAD_POST, "si", Filename, res);
+	pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+
+	plug_io_err(res, "load pcb", Filename);
+	return res;
+}
+
+int pcb_parse_footprint(pcb_data_t *Ptr, const char *Filename, const char *fmt)
+{
+	int res = -1, len, n;
+	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
+	int accepts[PCB_IO_MAX_FORMATS]; /* test-parse output */
+	int accept_total = 0;
+	FILE *f;
+	pcb_fp_fopen_ctx_t fctx;
+
+	f = pcb_fp_fopen(pcb_fp_default_search_path(), Filename, &fctx);
+	len = pcb_test_parse_all(f, Filename, fmt, PCB_IOT_FOOTPRINT, available, accepts, &accept_total, sizeof(available)/sizeof(available[0]), 0, 0);
+	if (f != NULL)
+		pcb_fp_fclose(f, &fctx);
+	if (len < 0)
+		return -1;
+
+	Ptr->loader = NULL;
+
+	/* try all plugins that said it could handle the file */
+	for(n = 0; n < len; n++) {
+		if ((available[n].plug->parse_footprint == NULL) || (!accepts[n])) /* can't parse or doesn't want to parse this file */
+			continue;
+		res = available[n].plug->parse_footprint(available[n].plug, Ptr, Filename);
+		if (res == 0) {
+			if (Ptr->loader == NULL) /* if the loader didn't set this (to some more fine grained, e.g. depending on file format version) */
+				Ptr->loader = available[n].plug;
+			break;
+		}
+	}
+
+	/* remove selected/found flag when loading reusable footprints */
+	if (res == 0)
+		pcb_data_flag_change(Ptr, PCB_OBJ_CLASS_REAL, PCB_CHGFLG_CLEAR, PCB_FLAG_FOUND | PCB_FLAG_SELECTED);
+
+	plug_io_err(res, "load footprint", Filename);
+	return res;
+}
+
+int pcb_parse_font(pcb_font_t *Ptr, const char *Filename)
+{
+	int res = -1;
+	PCB_HOOK_CALL(pcb_plug_io_t, pcb_plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename));
+
+	plug_io_err(res, "load font", Filename);
+	return res;
+}
+
+static int find_prio_cmp(const void *p1, const void *p2)
+{
+	const pcb_find_io_t *f1 = p1, *f2 = p2;
+	if (f1->prio < f2->prio)
+		return 1;
+	return -1;
+}
+
+int pcb_find_io(pcb_find_io_t *available, int avail_len, pcb_plug_iot_t typ, int is_wr, const char *fmt)
+{
+	int len = 0;
+
+#define cb_append(pl, pr) \
+	do { \
+		if (pr > 0) { \
+			assert(len < avail_len ); \
+			available[len].plug = pl; \
+			if (fmt == NULL) \
+				available[len].prio = pl->save_preference_prio; \
+			else \
+				available[len].prio = pr; \
+			len++; \
+		} \
+	} while(0)
+
+	PCB_HOOK_CALL_ALL(pcb_plug_io_t, pcb_plug_io_chain, fmt_support_prio, cb_append, (self, typ, is_wr, (fmt == NULL ? self->default_fmt : fmt)));
+
+	if (len > 0)
+		qsort(available, len, sizeof(available[0]), find_prio_cmp);
+#undef cb_append
+
+	return len;
+}
+
+/* Find the plugin that offers the highest write prio for the format */
+static pcb_plug_io_t *find_writer(pcb_plug_iot_t typ, const char *fmt)
+{
+	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
+	int len;
+
+	if (fmt == NULL) {
+		if (PCB->Filename != NULL) { /* have a file name, guess from extension */
+			int fn_len = strlen(PCB->Filename);
+			const char *end = PCB->Filename + fn_len;
+			pcb_plug_io_t *n, *best = NULL;
+			int best_score = 0;
+
+			/* the the plugin that has a matching extension and has the highest save_preference_prio value */
+			for(n = pcb_plug_io_chain; n != NULL; n = n->next) {
+				if (n->default_extension != NULL) {
+					int elen = strlen(n->default_extension);
+					if ((elen < fn_len) && (strcmp(end-elen, n->default_extension) == 0)) {
+						if (n->save_preference_prio > best_score) {
+							best_score = n->save_preference_prio;
+							best = n;
+						}
+					}
+				}
+			}
+			if (best != NULL)
+				return best;
+		}
+
+		/* no file name or format hint, or file name not recognized: choose the ultimate default */
+		fmt = conf_core.rc.save_final_fallback_fmt;
+		if (fmt == NULL) {
+			pcb_message(PCB_MSG_WARNING, "Saving a file with unknown format: failed to guess format from file name, no value configured in rc/save_final_fallback_fmt - CAN NOT SAVE FILE, try save as.\n");
+			return NULL;
+		}
+		else {
+			if (PCB->Filename != NULL)
+				pcb_message(PCB_MSG_WARNING, "Saving a file with unknown format: failed to guess format from file name, falling back to %s as configured in rc/save_final_fallback_fmt\n", fmt);
+		}
+	}
+
+	len = pcb_find_io(available, sizeof(available)/sizeof(available[0]), typ, 1, fmt);
+
+	if (len == 0)
+		return NULL;
+
+	return available[0].plug;
+}
+
+
+int pcb_write_buffer(FILE *f, pcb_buffer_t *buff, const char *fmt, pcb_bool elem_only)
+{
+	int res/*, newfmt = 0*/;
+	pcb_plug_io_t *p = find_writer(PCB_IOT_BUFFER, fmt);
+
+	if (p != NULL) {
+		res = p->write_buffer(p, f, buff, elem_only);
+		/*newfmt = 1;*/
+	}
+
+/*	if ((res == 0) && (newfmt))
+		PCB->Data->loader = p;*/
+
+	plug_io_err(res, "write buffer", NULL);
+	return res;
+}
+
+int pcb_write_footprint_data(FILE *f, pcb_data_t *e, const char *fmt)
+{
+	int res, newfmt = 0;
+	pcb_plug_io_t *p = e->loader;
+
+	if ((p == NULL) || ((fmt != NULL) && (*fmt != '\0'))) {
+		p = find_writer(PCB_IOT_FOOTPRINT, fmt);
+		newfmt = 1;
+	}
+
+	if ((p != NULL) && (p->write_footprint != NULL))
+		res = p->write_footprint(p, f, e);
+
+	if ((res == 0) && (newfmt))
+		e->loader = p;
+
+	plug_io_err(res, "write element", NULL);
+	return res;
+}
+
+int pcb_write_font(pcb_font_t *Ptr, const char *Filename, const char *fmt)
+{
+	int res/*, newfmt = 0*/;
+	pcb_plug_io_t *p = find_writer(PCB_IOT_FONT, fmt);
+
+	if (p != NULL) {
+		res = p->write_font(p, Ptr, Filename);
+		/*newfmt = 1;*/
+	}
+	else
+		res = -1;
+
+/*	if ((res == 0) && (newfmt))
+		PCB->Data->loader = p;*/
+
+	plug_io_err(res, "write font", NULL);
+	return res;
+}
+
+
+static int pcb_write_pcb(FILE *f, const char *old_filename, const char *new_filename, const char *fmt, pcb_bool emergency)
+{
+	int res, newfmt = 0;
+	pcb_plug_io_t *p = PCB->Data->loader;
+
+	if ((p == NULL) || ((fmt != NULL) && (*fmt != '\0'))) {
+		p = find_writer(PCB_IOT_PCB, fmt);
+		newfmt = 1;
+	}
+
+	if (p != NULL) {
+		if (p->write_pcb != NULL) {
+			pcb_event(PCB_EVENT_SAVE_PRE, "s", fmt);
+			res = p->write_pcb(p, f, old_filename, new_filename, emergency);
+			pcb_event(PCB_EVENT_SAVE_POST, "si", fmt, res);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Can't write PCB: internal error: io plugin %s doesn't implement write_pcb()\n", p->description);
+			res = -1;
+		}
+	}
+
+	if ((res == 0) && (newfmt))
+		PCB->Data->loader = p;
+
+	if (res == 0)
+		pcb_set_design_dir(new_filename);
+
+	plug_io_err(res, "write pcb", NULL);
+	return res;
+}
+
+/* ---------------------------------------------------------------------------
+ * load PCB
+ * parse the file with enabled 'PCB mode' (see parser)
+ * if successful, update some other stuff
+ *
+ * If revert is pcb_true, we pass "revert" as a parameter
+ * to the pcb changed event.
+ */
+static int real_load_pcb(const char *Filename, const char *fmt, pcb_bool revert, pcb_bool require_font, int how)
+{
+	const char *unit_suffix;
+	char *new_filename;
+	pcb_board_t *newPCB = pcb_board_new_(pcb_false);
+	pcb_board_t *oldPCB;
+	conf_role_t settings_dest;
+#ifdef DEBUG
+	double elapsed;
+	clock_t start, end;
+
+	start = clock();
+#endif
+
+	pcb_path_resolve(Filename, &new_filename, 0);
+
+	oldPCB = PCB;
+	PCB = newPCB;
+
+	/* mark the default font invalid to know if the file has one */
+	newPCB->fontkit.valid = pcb_false;
+
+	switch(how & 0x0F) {
+		case 0: settings_dest = CFR_DESIGN; break;
+		case 1: settings_dest = CFR_DEFAULTPCB; break;
+		case 2: settings_dest = CFR_invalid; break;
+		default: abort();
+	}
+
+	/* new data isn't added to the undo list */
+	if (!pcb_parse_pcb(PCB, new_filename, fmt, settings_dest, how & 0x10)) {
+		pcb_board_remove(oldPCB);
+
+		pcb_board_new_postproc(PCB, 0);
+		if (how == 0) {
+			/* update cursor location */
+			pcb_crosshair.X = PCB_CLAMP(PCB->CursorX, 0, PCB->MaxWidth);
+			pcb_crosshair.Y = PCB_CLAMP(PCB->CursorY, 0, PCB->MaxHeight);
+
+			/* update cursor confinement and output area (scrollbars) */
+			pcb_board_resize(PCB->MaxWidth, PCB->MaxHeight);
+		}
+
+		/* have to be called after pcb_board_resize() so vis update is after a board changed update */
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+		pcb_layervis_reset_stack();
+
+		/* enable default font if necessary */
+		if (!PCB->fontkit.valid) {
+			if ((require_font) && (!PCB->is_footprint))
+				pcb_message(PCB_MSG_WARNING, _("File '%s' has no font information, using default font\n"), new_filename);
+			PCB->fontkit.valid = pcb_true;
+		}
+
+		/* footprint edition: let the user directly manipulate subc parts */
+		PCB->loose_subc = PCB->is_footprint;
+
+		/* clear 'changed flag' */
+		pcb_board_set_changed_flag(pcb_false);
+		PCB->Filename = new_filename;
+		/* just in case a bad file saved file is loaded */
+
+		/* Use attribute PCB::grid::unit as unit, if we can */
+		unit_suffix = pcb_attrib_get(PCB, "PCB::grid::unit");
+		if (unit_suffix && *unit_suffix) {
+			const pcb_unit_t *new_unit = get_unit_struct(unit_suffix);
+			if (new_unit)
+				conf_set(settings_dest, "editor/grid_unit", -1, unit_suffix, POL_OVERWRITE);
+		}
+		pcb_attrib_put(PCB, "PCB::grid::unit", conf_core.editor.grid_unit->suffix);
+
+		pcb_sort_netlist();
+		pcb_ratspatch_make_edited(PCB);
+
+/* set route style to the first one, if the current one doesn't
+   happen to match any.  This way, "revert" won't change the route style. */
+		if (pcb_hid_get_flag("GetStyle()") < 0)
+			pcb_use_route_style_idx(&PCB->RouteStyle, 0);
+
+		if ((how == 0) || (revert))
+			pcb_board_changed(revert);
+
+#ifdef DEBUG
+		end = clock();
+		elapsed = ((double) (end - start)) / CLOCKS_PER_SEC;
+		pcb_gui->log("Loading file %s took %f seconds of CPU time\n", new_filename, elapsed);
+#endif
+
+		return 0;
+	}
+
+	free(new_filename);
+	PCB = oldPCB;
+	if (PCB == NULL) {
+		/* bozo: we are trying to revert back to a non-existing pcb... create one to avoid a segfault */
+		PCB = pcb_board_new_(pcb_false);
+		if (PCB == NULL) {
+			pcb_message(PCB_MSG_ERROR, "FATAL: can't create a new empty pcb!");
+			exit(1);
+		}
+	}
+
+	if (!(how & PCB_INHIBIT_BOARD_CHANGED))
+		pcb_board_changed(0);
+
+	/* release unused memory */
+	pcb_board_remove(newPCB);
+
+	return 1;
+}
+
+
+#if !defined(HAS_ATEXIT)
+/* ---------------------------------------------------------------------------
+ * some local identifiers for OS without an atexit() call
+ */
+static char *TMPFilename = NULL;
+#endif
+
+/* ---------------------------------------------------------------------------
+ * Flag helper functions
+ */
+
+#define F2S(OBJ, TYPE) pcb_strflg_f2s((OBJ)->Flags, TYPE)
+
+/* --------------------------------------------------------------------------- */
+
+static int string_cmp(const char *a, const char *b)
+{
+	while (*a && *b) {
+		if (isdigit((int) *a) && isdigit((int) *b)) {
+			int ia = atoi(a);
+			int ib = atoi(b);
+			if (ia != ib)
+				return ia - ib;
+			while (isdigit((int) *a) && *(a + 1))
+				a++;
+			while (isdigit((int) *b) && *(b + 1))
+				b++;
+		}
+		else if (tolower((int) *a) != tolower((int) *b))
+			return tolower((int) *a) - tolower((int) *b);
+		a++;
+		b++;
+	}
+	if (*a)
+		return 1;
+	if (*b)
+		return -1;
+	return 0;
+}
+
+static int netlist_sort_offset = 0;
+
+static int netlist_sort(const void *va, const void *vb)
+{
+	const pcb_lib_menu_t *am = (const pcb_lib_menu_t *) va;
+	const pcb_lib_menu_t *bm = (const pcb_lib_menu_t *) vb;
+	const char *a = am->Name;
+	const char *b = bm->Name;
+	if (*a == '~')
+		a++;
+	if (*b == '~')
+		b++;
+	return string_cmp(a, b);
+}
+
+static int netnode_sort(const void *va, const void *vb)
+{
+	const pcb_lib_entry_t *am = (const pcb_lib_entry_t *) va;
+	const pcb_lib_entry_t *bm = (const pcb_lib_entry_t *) vb;
+	const char *a = am->ListEntry;
+	const char *b = bm->ListEntry;
+	return string_cmp(a, b);
+}
+
+void pcb_library_sort(pcb_lib_t *lib)
+{
+	int i;
+	qsort(lib->Menu, lib->MenuN, sizeof(lib->Menu[0]), netlist_sort);
+	for (i = 0; i < lib->MenuN; i++)
+		qsort(lib->Menu[i].Entry, lib->Menu[i].EntryN, sizeof(lib->Menu[i].Entry[0]), netnode_sort);
+}
+
+void pcb_sort_netlist()
+{
+	netlist_sort_offset = 2;
+	pcb_library_sort(&(PCB->NetlistLib[PCB_NETLIST_INPUT]));
+	netlist_sort_offset = 0;
+}
+
+/* ---------------------------------------------------------------------------
+ * opens a file and check if it exists
+ */
+FILE *pcb_check_and_open_file(const char *Filename, pcb_bool Confirm, pcb_bool AllButton, pcb_bool * WasAllButton, pcb_bool * WasCancelButton)
+{
+	FILE *fp = NULL;
+	struct stat buffer;
+	char message[PCB_PATH_MAX + 80];
+	int response;
+
+	if (Filename && *Filename) {
+		if (!stat(Filename, &buffer) && Confirm) {
+			sprintf(message, _("File '%s' exists, use anyway?"), Filename);
+			if (WasAllButton)
+				*WasAllButton = pcb_false;
+			if (WasCancelButton)
+				*WasCancelButton = pcb_false;
+			if (AllButton)
+				response = pcb_gui->confirm_dialog(message, "Cancel", "Ok", AllButton ? "Sequence OK" : 0);
+			else
+				response = pcb_gui->confirm_dialog(message, "Cancel", "Ok", "Sequence OK");
+
+			switch (response) {
+			case 2:
+				if (WasAllButton)
+					*WasAllButton = pcb_true;
+				break;
+			case 0:
+				if (WasCancelButton)
+					*WasCancelButton = pcb_true;
+			}
+		}
+		if ((fp = pcb_fopen(Filename, "w")) == NULL)
+			pcb_open_error_message(Filename);
+	}
+	return fp;
+}
+
+/* ---------------------------------------------------------------------------
+ * opens a file for saving connection data
+ */
+FILE *pcb_open_connection_file(void)
+{
+	char *fname;
+	FILE *fp;
+	static char *default_file = NULL;
+	pcb_bool result;									/* not used */
+
+	/* CheckAndOpenFile deals with the case where fname already exists */
+	fname = pcb_gui->fileselect(_("Save Connection Data As ..."),
+													_("Choose a file to save all connection data to."), default_file, ".net", "connection_data", 0);
+	if (fname == NULL)
+		return NULL;
+
+	if (default_file != NULL) {
+		free(default_file);
+		default_file = NULL;
+	}
+
+	if (fname && *fname)
+		default_file = pcb_strdup(fname);
+
+	fp = pcb_check_and_open_file(fname, pcb_true, pcb_false, &result, NULL);
+	free(fname);
+
+	return fp;
+}
+
+/* ---------------------------------------------------------------------------
+ * save elements in the current buffer
+ */
+int pcb_save_buffer_elements(const char *Filename, const char *fmt)
+{
+	int result;
+
+	if (conf_core.editor.show_solder_side)
+		pcb_buffers_flip_side(PCB);
+	result = pcb_write_pipe(Filename, pcb_false, fmt, pcb_true);
+	if (conf_core.editor.show_solder_side)
+		pcb_buffers_flip_side(PCB);
+	return result;
+}
+
+/* ---------------------------------------------------------------------------
+ * save PCB
+ */
+int pcb_save_pcb(const char *file, const char *fmt)
+{
+	int retcode;
+
+	if (pcb_gui->notify_save_pcb == NULL)
+		return pcb_write_pipe(file, pcb_true, fmt, pcb_false);
+
+	pcb_gui->notify_save_pcb(file, pcb_false);
+	retcode = pcb_write_pipe(file, pcb_true, fmt, pcb_false);
+	pcb_gui->notify_save_pcb(file, pcb_true);
+
+	return retcode;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * Load PCB
+ */
+int pcb_load_pcb(const char *file, const char *fmt, pcb_bool require_font, int how)
+{
+	int res = real_load_pcb(file, fmt, pcb_false, require_font, how);
+	if (res == 0) {
+		pcb_file_loaded_set_at("design", "main", file, PCB->is_footprint ? "footprint" : "board");
+		if (PCB->is_footprint) {
+			pcb_box_t b;
+			/* a footprint has no board size set, need to invent one */
+			pcb_data_bbox(&b, PCB->Data, 0);
+			pcb_board_resize(b.X2*1.5, b.Y2*1.5);
+		}
+	}
+	return res;
+}
+
+/* ---------------------------------------------------------------------------
+ * Revert PCB
+ */
+int pcb_revert_pcb(void)
+{
+	return real_load_pcb(PCB->Filename, NULL, pcb_true, pcb_true, 1);
+}
+
+/* ---------------------------------------------------------------------------
+ * writes the quoted string created by another subroutine
+ */
+void pcb_print_quoted_string(FILE * FP, const char *S)
+{
+	const char *start;
+
+	fputc('"', FP);
+	for(start = S; *S != '\0'; S++) {
+		if (*S == '"' || *S == '\\') {
+			if (start != S)
+				fwrite(start, S-start, 1, FP);
+			fputc('\\', FP);
+			fputc(*S, FP);
+			start = S+1;
+		}
+	}
+
+	if (start != S)
+		fwrite(start, S-start, 1, FP);
+
+	fputc('"', FP);
+}
+
+/* ---------------------------------------------------------------------------
+ * saves the layout in a temporary file
+ * this is used for fatal errors and does not call the program specified
+ * in 'saveCommand' for safety reasons
+ */
+void pcb_save_in_tmp(void)
+{
+	char filename[256];
+
+	/* memory might have been released before this function is called */
+	if (PCB && PCB->Changed && (conf_core.rc.emergency_name != NULL) && (*conf_core.rc.emergency_name != '\0')) {
+		const char *fmt = conf_core.rc.emergency_format == NULL ? DEFAULT_EMERGENCY_FMT : conf_core.rc.emergency_format;
+		sprintf(filename, conf_core.rc.emergency_name, (long int)pcb_getpid());
+		pcb_message(PCB_MSG_INFO, _("Trying to save your layout in '%s'\n"), filename);
+		pcb_write_pcb_file(filename, pcb_true, fmt, pcb_true, pcb_false);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * front-end for 'pcb_save_in_tmp()'
+ * just makes sure that the routine is only called once
+ */
+static pcb_bool dont_save_any_more = pcb_false;
+void pcb_emergency_save(void)
+{
+
+	if (!dont_save_any_more) {
+		dont_save_any_more = pcb_true;
+		pcb_save_in_tmp();
+	}
+}
+
+void pcb_disable_emergency_save(void)
+{
+	dont_save_any_more = pcb_true;
+}
+
+/* ----------------------------------------------------------------------
+ * Callback for the autosave
+ */
+
+static pcb_hidval_t backup_timer;
+
+/*
+ * If the backup interval is > 0 then set another timer.  Otherwise
+ * we do nothing and it is up to the GUI to call pcb_enable_autosave()
+ * after setting conf_core.rc.backup_interval > 0 again.
+ */
+static void backup_cb(pcb_hidval_t data)
+{
+	backup_timer.ptr = NULL;
+	pcb_backup();
+	if (conf_core.rc.backup_interval > 0 && pcb_gui->add_timer)
+		backup_timer = pcb_gui->add_timer(backup_cb, 1000 * conf_core.rc.backup_interval, data);
+}
+
+void pcb_enable_autosave(void)
+{
+	pcb_hidval_t x;
+
+	x.ptr = NULL;
+
+	/* If we already have a timer going, then cancel it out */
+	if (backup_timer.ptr != NULL && pcb_gui->stop_timer)
+		pcb_gui->stop_timer(backup_timer);
+
+	backup_timer.ptr = NULL;
+	/* Start up a new timer */
+	if (conf_core.rc.backup_interval > 0 && pcb_gui->add_timer)
+		backup_timer = pcb_gui->add_timer(backup_cb, 1000 * conf_core.rc.backup_interval, x);
+}
+
+/* ---------------------------------------------------------------------------
+ * creates backup file.  The default is to use the pcb file name with
+ * a "-" appended (like "foo.pcb-") and if we don't have a pcb file name
+ * then use the template in conf_core.rc.backup_name
+ */
+void pcb_backup(void)
+{
+	char *filename = NULL;
+	const char *fmt = NULL;
+	pcb_plug_io_t *orig;
+
+	if (PCB && PCB->Filename) {
+		filename = (char *) malloc(sizeof(char) * (strlen(PCB->Filename) + 2));
+		if (filename == NULL) {
+			fprintf(stderr, "pcb_backup():  malloc failed\n");
+			exit(1);
+		}
+		sprintf(filename, "%s-", PCB->Filename);
+	}
+	else {
+		/* conf_core.rc.backup_name has %.8i which  will be replaced by the process ID */
+		filename = pcb_build_fn(conf_core.rc.backup_name);
+		if (filename == NULL) {
+			fprintf(stderr, "pcb_backup(): can't build file name for a backup\n");
+			exit(1);
+		}
+	}
+
+	if ((conf_core.rc.backup_format != NULL) && (strcmp(conf_core.rc.backup_format, "original") != 0))
+		fmt = conf_core.rc.backup_format;
+
+	orig = PCB->Data->loader;
+	pcb_write_pcb_file(filename, pcb_true, fmt, pcb_true, pcb_false);
+	PCB->Data->loader = orig;
+
+	free(filename);
+}
+
+#if !defined(HAS_ATEXIT)
+/* ---------------------------------------------------------------------------
+ * makes a temporary copy of the data. This is useful for systems which
+ * doesn't support calling functions on exit. We use this to save the data
+ * before LEX and YACC functions are called because they are able to abort
+ * the program.
+ */
+void pcb_tmp_data_save(void)
+{
+	char *fn = pcb_build_fn(conf_core.rc.emergency_name);
+	pcb_write_pcb_file(fn, pcb_true, NULL, pcb_true, pcb_false);
+	if (TMPFilename != NULL)
+		free(TMPFilename);
+	TMPFilename = fn;
+}
+
+/* ---------------------------------------------------------------------------
+ * removes the temporary copy of the data file
+ */
+void pcb_tmp_data_remove(void)
+{
+	if (TMPFilename != NULL)
+		unlink(TMPFilename);
+}
+#endif
+
+/* Write the pcb file, a footprint or a buffer */
+static int pcb_write_file(FILE *fp, pcb_bool thePcb, const char *old_path, const char *new_path, const char *fmt, pcb_bool emergency, pcb_bool elem_only)
+{
+	if (thePcb) {
+		if (PCB->is_footprint)
+			return pcb_write_footprint_data(fp, PCB->Data, fmt);
+		return pcb_write_pcb(fp, old_path, new_path, fmt, emergency);
+	}
+	return pcb_write_buffer(fp, PCB_PASTEBUFFER, fmt, elem_only);
+}
+
+/* ---------------------------------------------------------------------------
+ * writes PCB to file
+ */
+int pcb_write_pcb_file(const char *Filename, pcb_bool thePcb, const char *fmt, pcb_bool emergency, pcb_bool elem_only)
+{
+	FILE *fp;
+	int result, overwrite;
+	char *fn_tmp = NULL;
+
+	overwrite = pcb_file_readable(Filename);
+	if (overwrite) {
+		int len = strlen(Filename);
+		fn_tmp = malloc(len+8);
+		memcpy(fn_tmp, Filename, len);
+		strcpy(fn_tmp+len, ".old");
+		if (pcb_rename(Filename, fn_tmp) != 0) {
+			if (emergency) {
+				/* Try an alternative emergency file */
+				strcpy(fn_tmp+len, ".emr");
+				Filename = fn_tmp;
+			}
+			else {
+				pcb_message(PCB_MSG_ERROR, "Can't rename %s to %s before save\n", Filename, fn_tmp);
+				return -1;
+			}
+		}
+	}
+
+	if ((fp = pcb_fopen(Filename, "w")) == NULL) {
+		pcb_open_error_message(Filename);
+		return (-1);
+	}
+
+	result = pcb_write_file(fp, thePcb, fn_tmp, Filename, fmt, emergency, elem_only);
+
+	fclose(fp);
+	if (fn_tmp != NULL) {
+		if ((result == 0) && (!conf_core.rc.keep_save_backups))
+			unlink(fn_tmp);
+		free(fn_tmp);
+	}
+	return result;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * writes to pipe using the command defined by conf_core.rc.save_command
+ * %f are replaced by the passed filename
+ */
+int pcb_write_pipe(const char *Filename, pcb_bool thePcb, const char *fmt, pcb_bool elem_only)
+{
+	FILE *fp;
+	int result;
+	const char *p;
+	static gds_t command;
+	const char *save_cmd;
+
+	if (PCB_EMPTY_STRING_P(conf_core.rc.save_command))
+		return pcb_write_pcb_file(Filename, thePcb, fmt, pcb_false, elem_only);
+
+	if (!pcb_conf_cmd_is_safe(rc.save_command, &save_cmd, 1))
+		return -1;
+
+	/* setup commandline */
+	gds_truncate(&command,0);
+	for (p = save_cmd; *p; p++) {
+		/* copy character if not special or add string to command */
+		if (!(p[0] == '%' && p[1] == 'f'))
+			gds_append(&command, *p);
+		else {
+			gds_append_str(&command, Filename);
+
+			/* skip the character */
+			p++;
+		}
+	}
+	printf("write to pipe \"%s\"\n", command.array);
+	if ((fp = pcb_popen(command.array, "w")) == NULL) {
+		pcb_popen_error_message(command.array);
+		return (-1);
+	}
+
+	result = pcb_write_file(fp, thePcb, NULL, NULL, fmt, pcb_false, elem_only);
+
+	return (pcb_pclose(fp) ? (-1) : result);
+}
+
+
+int pcb_io_list(pcb_io_formats_t *out, pcb_plug_iot_t typ, int wr, int do_digest, pcb_io_list_ext_t ext)
+{
+	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
+	int n;
+
+	memset(out, 0, sizeof(pcb_io_formats_t));
+	out->len = pcb_find_io(available, sizeof(available)/sizeof(available[0]), typ, 1, NULL);
+
+	if (out->len == 0)
+		return 0;
+
+	for(n = 0; n < out->len; n++) {
+		out->plug[n] = available[n].plug;
+		switch(ext) {
+			case PCB_IOL_EXT_NONE:  out->extension[n] = NULL; break;
+			case PCB_IOL_EXT_BOARD: out->extension[n] = out->plug[n]->default_extension; break;
+			case PCB_IOL_EXT_FP:    out->extension[n] = out->plug[n]->fp_extension; break;
+		}
+	}
+
+	if (do_digest) {
+		for(n = 0; n < out->len; n++)
+			out->digest[n] = pcb_strdup_printf("%s (%s)", out->plug[n]->default_fmt, out->plug[n]->description);
+		out->digest[n] = NULL;
+	}
+
+	return out->len;
+}
+
+void pcb_io_list_free(pcb_io_formats_t *out)
+{
+	int n;
+
+	for(n = 0; n < out->len; n++) {
+		if (out->digest[n] != NULL) {
+			free(out->digest[n]);
+			out->digest[n] = NULL;
+		}
+	}
+}
+
+pcb_cardinal_t pcb_io_incompat_save(pcb_data_t *data, pcb_any_obj_t *obj, const char *desc, const char *hint)
+{
+	pcb_message(PCB_MSG_ERROR, "save error: %s\n", desc);
+	if (obj != NULL) {
+		pcb_coord_t x = (obj->BoundingBox.X1 + obj->BoundingBox.X2)/2;
+		pcb_coord_t y = (obj->BoundingBox.Y1 + obj->BoundingBox.Y2)/2;
+		pcb_message(PCB_MSG_ERROR, " near %$mm %$mm\n", x, y);
+	}
+	if (hint != NULL)
+		pcb_message(PCB_MSG_ERROR, " (%s)\n", hint);
+	return 0;
+}
+
+
+void pcb_io_uninit(void)
+{
+	if (pcb_plug_io_chain != NULL) {
+		pcb_message(PCB_MSG_ERROR, "pcb_plug_io_chain is not empty; a plugin did not remove itself from the chain. Fix your plugins!\n");
+		pcb_message(PCB_MSG_ERROR, "head: desc='%s'\n", pcb_plug_io_chain->description);
+	}
+	free(last_design_dir);
+	last_design_dir = NULL;
+}
Index: tags/2.0.1/src/plug_io.h
===================================================================
--- tags/2.0.1/src/plug_io.h	(nonexistent)
+++ tags/2.0.1/src/plug_io.h	(revision 18980)
@@ -0,0 +1,194 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_PLUG_IO_H
+#define PCB_PLUG_IO_H
+
+#include "library.h"
+#include "global_typedefs.h"
+#include "conf.h"
+
+typedef enum { /* I/O type bitmask; each bit is one thing to save or load, not all formats support all things */
+	PCB_IOT_PCB        = 1,
+	PCB_IOT_FOOTPRINT  = 2,
+	PCB_IOT_FONT       = 4,
+	PCB_IOT_BUFFER     = 8
+} pcb_plug_iot_t;
+
+/**************************** API definition *********************************/
+struct pcb_plug_io_s {
+	pcb_plug_io_t *next;
+	void *plugin_data;
+
+	/* Check if the plugin supports format fmt, for writing (if wr != 0) or for
+	   reading (if wr == 0) for I/O type typ. Return 0 if not supported or an
+	   integer priority if supported. The higher the prio is the more likely
+	   the plugin gets the next operation on the file. Base prio should be
+	   100 for native formats.
+	   NOTE: if any format can be chosen for output, the user will have to pick
+	         one; for ordering plugins in that case, the format-neutral
+	         save_preference_prio field is used.
+	   */
+	int (*fmt_support_prio)(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt);
+
+	/* Test if the given file is readable by the plugin. The plugin should return
+	   1 if it can handle the file or 0 if it can not. This check is not a deep
+	   syntax analysis; the plugin should read barely enough headers to decide if
+	   the file contains a the format it expect, then return error from parse_pcb
+	   if there are syntax errors later. The file is open for read and positioned
+	   to file begin in f */
+	int (*test_parse)(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+
+	/* Attempt to load a pcb design from Filename to Ptr.
+	   Conf subtree at settings_dest is replaced by settings loaded from the
+	   file unless it's CFR_invalid.
+	   Return 0 on success. */
+	int (*parse_pcb)(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+
+	/* Attempt to load an element from Filename to Ptr. Return 0 on success. */
+	int (*parse_footprint)(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
+
+	/* Attempt to load fonts from a file. Return 0 on success. */
+	int (*parse_font)(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename);
+
+
+	/* Write the buffer to a file. Return 0 on success. */
+	int (*write_buffer)(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only);
+
+	/* Write element data to a file. Return 0 on success. */
+	int (*write_footprint)(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *e);
+
+	/* Write PCB to f; there's a copy of the file we are going to
+	   "overwrite", named in old_filename and the new file name we are
+	   using is new_filename. The file names are NULL if we are saving
+	   into a pipe. If emergency is true, do the safest save possible,
+	   don't mind formatting and extras.
+	   Return 0 on success. */
+	int (*write_pcb)(pcb_plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
+
+	/* Attempt to write the font to file. Return 0 on success. */
+	int (*write_font)(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename);
+
+	const char *default_fmt;
+	const char *description;
+	const char *default_extension; /* used to generate save-as filename */
+	const char *fp_extension;      /* used to generate save-as filename for footprints */
+	const char *mime_type;
+
+	int save_preference_prio; /* all available save plugins are sorted by this before presenting them to the user to choose one */
+};
+extern pcb_plug_io_t *pcb_plug_io_chain;
+
+
+/********** hook wrappers **********/
+int pcb_parse_pcb(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings, int ignore_missing);
+int pcb_parse_footprint(pcb_data_t *Ptr, const char *name, const char *fmt);
+int pcb_parse_font(pcb_font_t *Ptr, const char *Filename);
+int pcb_write_buffer(FILE *f, pcb_buffer_t *buff, const char *fmt, pcb_bool elem_only);
+int pcb_write_footprint_data(FILE *f, pcb_data_t *e, const char *fmt);
+int pcb_write_font(pcb_font_t *Ptr, const char *Filename, const char *fmt);
+
+/********** common function used to be part of file.[ch] and friends **********/
+FILE *pcb_check_and_open_file(const char *, pcb_bool, pcb_bool, pcb_bool *, pcb_bool *);
+FILE *pcb_open_connection_file(void);
+int pcb_save_pcb(const char *, const char *fmt);
+#define PCB_INHIBIT_BOARD_CHANGED 0x20
+int pcb_load_pcb(const char *name, const char *fmt, pcb_bool, int how); /* how: 0=normal pcb; 1=default.pcb, 2=misc (do not load settings) | 0x10: ignore missing file, | PCB_INHIBIT_BOARD_CHANGED: do not send a board changed event */
+void pcb_enable_autosave(void);
+void pcb_backup(void);
+void pcb_save_in_tmp(void);
+void pcb_emergency_save(void);
+void pcb_disable_emergency_save(void);
+int pcb_revert_pcb(void);
+int pcb_save_buffer_elements(const char *, const char *fmt);
+void pcb_sort_netlist(void);
+void pcb_print_quoted_string(FILE *, const char *);
+void pcb_library_sort(pcb_lib_t *lib);
+void pcb_set_some_route_style();
+int pcb_write_pcb_file(const char *Filename, pcb_bool thePcb, const char *fmt, pcb_bool emergency, pcb_bool elem_only);
+int pcb_write_pipe(const char *, pcb_bool, const char *fmt, pcb_bool elem_only);
+void pcb_set_design_dir(const char *fn);
+
+#ifndef HAS_ATEXIT
+void pcb_tmp_data_save(void);
+void pcb_tmp_data_remove(void);
+#endif
+
+/********** helpers **********/
+
+/* wish we had more than 32 IO plugins... */
+#define PCB_IO_MAX_FORMATS 32
+
+/* A list of format plugins available for a given purpose */
+typedef struct {
+	int len;
+	const pcb_plug_io_t *plug[PCB_IO_MAX_FORMATS+1];
+	char *digest[PCB_IO_MAX_FORMATS+1];           /* string that contains the format identifier and the description (strdup'd) */
+	const char *extension[PCB_IO_MAX_FORMATS+1];  /* default file extension, with the leading . (not strdup'd) */
+} pcb_io_formats_t;
+
+typedef enum {
+	PCB_IOL_EXT_NONE,
+	PCB_IOL_EXT_BOARD,
+	PCB_IOL_EXT_FP
+} pcb_io_list_ext_t;
+
+/* Search all io plugins to see if typ/wr is supported. Return an ordered
+   list in out. If do_digest is non-zero, fill in the digest field. Returns
+   number of suitable io plugins. Call pcb_io_list_free() on out when it is not
+   needed anymore. */
+int pcb_io_list(pcb_io_formats_t *out, pcb_plug_iot_t typ, int wr, int do_digest, pcb_io_list_ext_t ext);
+void pcb_io_list_free(pcb_io_formats_t *out);
+
+extern int pcb_io_err_inhibit;
+#define pcb_io_err_inhibit_inc() pcb_io_err_inhibit++
+#define pcb_io_err_inhibit_dec() \
+do { \
+	if (pcb_io_err_inhibit > 0) \
+		pcb_io_err_inhibit--; \
+} while(0)
+
+/* Find all plugins that can handle typ/is_wr and build an ordered list in available[],
+   highest prio first. If fmt is NULL, use the default fmt for each plugin.
+   Return the length of the array. */
+typedef struct {
+	pcb_plug_io_t *plug;
+	int prio;
+} pcb_find_io_t;
+int pcb_find_io(pcb_find_io_t *available, int avail_len, pcb_plug_iot_t typ, int is_wr, const char *fmt);
+
+/* Indicate an incompatibility on save; data and obj may be NULL (they are
+   used for navigating the user to the problem). Desc should be a short
+   description (must not be NULL), details should go in hint (can be NULL).
+   Returns a report ID. */
+pcb_cardinal_t pcb_io_incompat_save(pcb_data_t *data, pcb_any_obj_t *obj, const char *desc, const char *hint);
+
+void pcb_io_uninit(void);
+
+#endif
Index: tags/2.0.1/src/plugins.c
===================================================================
--- tags/2.0.1/src/plugins.c	(nonexistent)
+++ tags/2.0.1/src/plugins.c	(revision 18980)
@@ -0,0 +1,120 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "plugins.h"
+
+/* for the action */
+#include "config.h"
+#include "genvector/gds_char.h"
+#include "compat_misc.h"
+#include "actions.h"
+
+unsigned long pcb_api_ver = PCB_API_VER;
+
+pup_context_t pcb_pup;
+char **pcb_pup_paths = NULL;
+static int paths_used = 0, paths_alloced = 0;
+
+void pcb_plugin_add_dir(const char *dir)
+{
+	if (paths_used+1 >= paths_alloced) {
+		paths_alloced += 16;
+		pcb_pup_paths = realloc(pcb_pup_paths, sizeof(char *) * paths_alloced);
+	}
+	pcb_pup_paths[paths_used] = pcb_strdup(dir);
+	paths_used++;
+	pcb_pup_paths[paths_used] = NULL;
+}
+
+void pcb_plugin_uninit(void)
+{
+	int n;
+	for(n = 0; n < paths_used; n++)
+		free(pcb_pup_paths[n]);
+	free(pcb_pup_paths);
+	pcb_pup_paths = NULL;
+}
+
+
+static const char pcb_acts_ManagePlugins[] = "ManagePlugins()\n";
+static const char pcb_acth_ManagePlugins[] = "Manage plugins dialog.";
+static fgw_error_t pcb_act_ManagePlugins(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pup_plugin_t *p;
+	int nump = 0, numb = 0;
+	gds_t str;
+
+	gds_init(&str);
+
+	for (p = pcb_pup.plugins; p != NULL; p = p->next)
+		if (p->flags & PUP_FLG_STATIC)
+			numb++;
+		else
+			nump++;
+
+	gds_append_str(&str, "Plugins loaded:\n");
+	if (nump > 0) {
+		for (p = pcb_pup.plugins; p != NULL; p = p->next) {
+			if (!(p->flags & PUP_FLG_STATIC)) {
+				gds_append(&str, ' ');
+				gds_append_str(&str, p->name);
+				gds_append(&str, ' ');
+				gds_append_str(&str, p->path);
+				gds_append(&str, '\n');
+			}
+		}
+	}
+	else
+		gds_append_str(&str, " (none)\n");
+
+	gds_append_str(&str, "\n\nBuildins:\n");
+	if (numb > 0) {
+		for (p = pcb_pup.plugins; p != NULL; p = p->next) {
+			if (p->flags & PUP_FLG_STATIC) {
+				gds_append(&str, ' ');
+				gds_append_str(&str, p->name);
+				gds_append(&str, '\n');
+			}
+		}
+	}
+	else
+		gds_append_str(&str, " (none)\n");
+
+	gds_append_str(&str, "\n\nNOTE: this is the alpha version, can only list plugins/buildins\n");
+	pcb_gui->report_dialog("Manage plugins", str.array);
+	gds_uninit(&str);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t plugins_action_list[] = {
+	{"ManagePlugins", pcb_act_ManagePlugins, pcb_acth_ManagePlugins, pcb_acts_ManagePlugins}
+};
+
+PCB_REGISTER_ACTIONS(plugins_action_list, NULL)
Index: tags/2.0.1/src/plugins.h
===================================================================
--- tags/2.0.1/src/plugins.h	(nonexistent)
+++ tags/2.0.1/src/plugins.h	(revision 18980)
@@ -0,0 +1,103 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_RND_PLUGINS_H
+#define PCB_RND_PLUGINS_H
+
+#include <puplug/puplug.h>
+#include <puplug/error.h>
+
+/* core's version stored in plugins.o */
+extern unsigned long pcb_api_ver;
+
+#define PCB_API_VER_MATCH (PCB_API_VER == pcb_api_ver)
+#define PCB_API_CHK_VER \
+do { \
+	if (!PCB_API_VER_MATCH) {\
+		fprintf(stderr, "pcb-rnd API version incompatibility: " __FILE__ "=%lu core=%lu\n(not loading this plugin)\n", (unsigned long)PCB_API_VER, pcb_api_ver); \
+		return 1; \
+	} \
+} while(0)
+
+extern pup_context_t pcb_pup;
+extern char **pcb_pup_paths;
+
+void pcb_plugin_add_dir(const char *dir);
+void pcb_plugin_uninit(void);
+
+/* Hook based plugin generics; plugins that implement a common API should use
+   HOOK_REGISTER with an api struct. The core should run the plugins using
+   HOOK_CALL */
+
+#define PCB_HOOK_CALL_DO(chain_type, chain, func, res, accept, funcargs, do_on_success) \
+do { \
+	chain_type *self; \
+	for(self = (chain); self != NULL; self = self->next) { \
+		if (self->func == NULL) \
+			continue; \
+		res = self->func funcargs; \
+		if (res accept) {\
+			do_on_success; \
+			break; \
+		} \
+	} \
+} while(0)
+
+#define PCB_HOOK_CALL(chain_type, chain, func, res, accept, funcargs) \
+	PCB_HOOK_CALL_DO(chain_type, chain, func, res, accept, funcargs, (void)0)
+
+#define PCB_HOOK_CALL_ALL(chain_type, chain, func, cb, funcargs) \
+do { \
+	chain_type *self; \
+	for(self = (chain); self != NULL; self = self->next) { \
+		int res; \
+		if (self->func == NULL) \
+			continue; \
+		res = self->func funcargs; \
+		cb(self, res); \
+	} \
+} while(0)
+
+#define PCB_HOOK_REGISTER(chain_type, chain, hstruct) \
+do { \
+	(hstruct)->next = chain; \
+	chain = (hstruct); \
+} while(0)
+
+
+#define PCB_HOOK_UNREGISTER(chain_type, chain, hstruct) \
+do { \
+	chain_type *__n__, *__prev__ = NULL, *__h__ = (hstruct); \
+	while (chain == __h__) \
+		chain = chain->next; \
+	for(__n__ = chain; __n__ != NULL; __n__ = __n__->next) { \
+		if ((__n__ == __h__) && (__prev__ != NULL)) \
+			__prev__->next = __n__->next; \
+		__prev__ = __n__; \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src/polyarea.h
===================================================================
--- tags/2.0.1/src/polyarea.h	(nonexistent)
+++ tags/2.0.1/src/polyarea.h	(revision 18980)
@@ -0,0 +1,166 @@
+/*
+      poly_Boolean: a polygon clip library
+      Copyright (C) 1997  Alexey Nikitin, Michael Leonov
+      leonov@propro.iis.nsk.su
+
+      This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Library General Public
+      License as published by the Free Software Foundation; either
+      version 2 of the License, or (at your option) any later version.
+
+      This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Library General Public License for more details.
+
+      You should have received a copy of the GNU Library General Public
+      License along with this library; if not, write to the Free
+      Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+      polyarea.h
+      (C) 1997 Alexey Nikitin, Michael Leonov
+      (C) 1997 Klamer Schutte (minor patches)
+*/
+
+#ifndef	PCB_POLYAREA_H
+#define	PCB_POLYAREA_H
+
+#define PCB_PLF_DIR 1
+#define PCB_PLF_INV 0
+#define PCB_PLF_MARK 1
+
+typedef pcb_coord_t pcb_vertex_t[2];				/* longing point representation of
+																   coordinates */
+typedef pcb_vertex_t pcb_vector_t;
+
+#define pcb_vertex_equ(a,b) (memcmp((a),(b),sizeof(pcb_vector_t))==0)
+#define pcb_vertex_cpy(a,b) memcpy((a),(b),sizeof(pcb_vector_t))
+
+
+extern pcb_vector_t vect_zero;
+
+enum {
+	pcb_err_no_memory = 2,
+	pcb_err_bad_parm = 3,
+	pcb_err_ok = 0
+};
+
+
+typedef struct pcb_cvc_list_s pcb_cvc_list_t;
+typedef struct pcb_vnode_s pcb_vnode_t;
+struct pcb_cvc_list_s {
+	double angle;
+	pcb_vnode_t *parent;
+	pcb_cvc_list_t *prev, *next, *head;
+	char poly, side;
+};
+struct pcb_vnode_s {
+	pcb_vnode_t *next, *prev, *shared;
+	struct {
+		unsigned int status:3;
+		unsigned int mark:1;
+		unsigned int in_hub:1;
+	} Flags;
+	pcb_cvc_list_t *cvc_prev;
+	pcb_cvc_list_t *cvc_next;
+	pcb_vector_t point;
+};
+
+typedef struct pcb_pline_s pcb_pline_t;
+struct pcb_pline_s {
+	pcb_coord_t xmin, ymin, xmax, ymax;
+	pcb_pline_t *next;
+	pcb_vnode_t head;
+	unsigned int Count;
+	double area;
+	pcb_rtree_t *tree;
+	pcb_bool is_round;
+	pcb_coord_t cx, cy;
+	pcb_coord_t radius;
+	struct {
+		unsigned int status:3;
+		unsigned int orient:1;
+	} Flags;
+};
+
+pcb_pline_t *pcb_poly_contour_new(pcb_vector_t v);
+
+void pcb_poly_contour_init(pcb_pline_t * c);
+void pcb_poly_contour_clear(pcb_pline_t * c);	/* clears list of vertices */
+void pcb_poly_contour_del(pcb_pline_t ** c);
+
+pcb_bool pcb_poly_contour_copy(pcb_pline_t ** dst, pcb_pline_t * src);
+
+void pcb_poly_contour_pre(pcb_pline_t * c, pcb_bool optimize);	/* prepare contour */
+void pcb_poly_contour_inv(pcb_pline_t * c);	/* invert contour */
+
+pcb_vnode_t *pcb_poly_node_create(pcb_vector_t v);
+
+void pcb_poly_vertex_include(pcb_vnode_t * after, pcb_vnode_t * node);
+void pcb_poly_vertex_exclude(pcb_vnode_t * node);
+
+/**********************************************************************/
+
+typedef struct pcb_polyarea_s pcb_polyarea_t;
+struct pcb_polyarea_s {
+	pcb_polyarea_t *f, *b;
+	pcb_pline_t *contours;
+	pcb_rtree_t *contour_tree;
+};
+
+pcb_bool pcb_polyarea_m_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst);
+void pcb_polyarea_m_include(pcb_polyarea_t ** list, pcb_polyarea_t * a);
+
+pcb_bool pcb_polyarea_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src);
+pcb_bool pcb_polyarea_copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src);
+
+pcb_bool pcb_polyarea_contour_include(pcb_polyarea_t * p, pcb_pline_t * c);
+pcb_bool pcb_polyarea_contour_exclude(pcb_polyarea_t * p, pcb_pline_t * c);
+
+
+pcb_bool pcb_polyarea_contour_check(pcb_pline_t * a);
+
+pcb_bool pcb_polyarea_contour_inside(pcb_polyarea_t * c, pcb_vector_t v0);
+pcb_bool pcb_polyarea_touching(pcb_polyarea_t * p1, pcb_polyarea_t * p2);
+
+/**********************************************************************/
+
+/* tools for clipping */
+
+/* checks whether point lies within contour
+independently of its orientation */
+
+int pcb_poly_contour_inside(pcb_pline_t * c, pcb_vector_t v);
+int pcb_poly_contour_in_contour(pcb_pline_t * poly, pcb_pline_t * inner);
+pcb_polyarea_t *pcb_polyarea_create(void);
+
+void pcb_polyarea_free(pcb_polyarea_t ** p);
+void pcb_polyarea_init(pcb_polyarea_t * p);
+void pcb_poly_contours_free(pcb_pline_t ** pl);
+pcb_bool pcb_poly_valid(pcb_polyarea_t * p);
+
+enum pcb_poly_bool_op_e {
+	PCB_PBO_UNITE,
+	PCB_PBO_ISECT,
+	PCB_PBO_SUB,
+	PCB_PBO_XOR
+};
+
+double pcb_vect_dist2(pcb_vector_t v1, pcb_vector_t v2);
+double pcb_vect_det2(pcb_vector_t v1, pcb_vector_t v2);
+double pcb_vect_len2(pcb_vector_t v1);
+
+int pcb_vect_inters2(pcb_vector_t A, pcb_vector_t B, pcb_vector_t C, pcb_vector_t D, pcb_vector_t S1, pcb_vector_t S2);
+
+int pcb_polyarea_boolean(const pcb_polyarea_t * a, const pcb_polyarea_t * b, pcb_polyarea_t ** res, int action);
+int pcb_polyarea_boolean_free(pcb_polyarea_t * a, pcb_polyarea_t * b, pcb_polyarea_t ** res, int action);
+int pcb_polyarea_and_subtract_free(pcb_polyarea_t * a, pcb_polyarea_t * b, pcb_polyarea_t ** aandb, pcb_polyarea_t ** aminusb);
+int pcb_polyarea_save(pcb_polyarea_t * PA, char *fname);
+
+/* calculate the bounding box of a pcb_polyarea_t and save result in b */
+void pcb_polyarea_bbox(pcb_polyarea_t * p, pcb_box_t * b);
+
+/* Move each point of pa1 by dx and dy */
+void pcb_polyarea_move(pcb_polyarea_t *pa1, pcb_coord_t dx, pcb_coord_t dy);
+
+#endif /* PCB_POLYAREA_H */
Index: tags/2.0.1/src/polygon.c
===================================================================
--- tags/2.0.1/src/polygon.c	(nonexistent)
+++ tags/2.0.1/src/polygon.c	(revision 18980)
@@ -0,0 +1,2114 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2010 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* pcb-rnd specific polygon editing routines
+   see doc/developer/polygon.html for more info */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <assert.h>
+#include <math.h>
+#include <memory.h>
+#include <setjmp.h>
+
+#include "board.h"
+#include "box.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "polygon.h"
+#include "remove.h"
+#include "search.h"
+#include "thermal.h"
+#include "undo.h"
+#include "layer.h"
+#include "compat_nls.h"
+#include "obj_poly_draw.h"
+#include "polygon_selfi.h"
+
+#define ROUND(x) ((long)(((x) >= 0 ? (x) + 0.5  : (x) - 0.5)))
+
+#define UNSUBTRACT_BLOAT 10
+#define SUBTRACT_PIN_VIA_BATCH_SIZE 100
+#define SUBTRACT_PADSTACK_BATCH_SIZE 50
+#define SUBTRACT_LINE_BATCH_SIZE 20
+
+#define sqr(x) ((x)*(x))
+
+#undef min
+#undef max
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
+
+static double rotate_circle_seg[4];
+
+static int Unsubtract(pcb_polyarea_t * np1, pcb_poly_t * p);
+
+void pcb_polygon_init(void)
+{
+	double cos_ang = cos(2.0 * M_PI / PCB_POLY_CIRC_SEGS_F);
+	double sin_ang = sin(2.0 * M_PI / PCB_POLY_CIRC_SEGS_F);
+
+	rotate_circle_seg[0] = cos_ang;
+	rotate_circle_seg[1] = -sin_ang;
+	rotate_circle_seg[2] = sin_ang;
+	rotate_circle_seg[3] = cos_ang;
+}
+
+pcb_cardinal_t pcb_poly_point_idx(pcb_poly_t *polygon, pcb_point_t *point)
+{
+	assert(point >= polygon->Points);
+	assert(point <= polygon->Points + polygon->PointN);
+	return ((char *) point - (char *) polygon->Points) / sizeof(pcb_point_t);
+}
+
+/* Find contour number: 0 for outer, 1 for first hole etc.. */
+pcb_cardinal_t pcb_poly_contour_point(pcb_poly_t *polygon, pcb_cardinal_t point)
+{
+	pcb_cardinal_t i;
+	pcb_cardinal_t contour = 0;
+
+	for (i = 0; i < polygon->HoleIndexN; i++)
+		if (point >= polygon->HoleIndex[i])
+			contour = i + 1;
+	return contour;
+}
+
+pcb_cardinal_t pcb_poly_contour_next_point(pcb_poly_t *polygon, pcb_cardinal_t point)
+{
+	pcb_cardinal_t contour;
+	pcb_cardinal_t this_contour_start;
+	pcb_cardinal_t next_contour_start;
+
+	contour = pcb_poly_contour_point(polygon, point);
+
+	this_contour_start = (contour == 0) ? 0 : polygon->HoleIndex[contour - 1];
+	next_contour_start = (contour == polygon->HoleIndexN) ? polygon->PointN : polygon->HoleIndex[contour];
+
+	/* Wrap back to the start of the contour we're in if we pass the end */
+	if (++point == next_contour_start)
+		point = this_contour_start;
+
+	return point;
+}
+
+pcb_cardinal_t pcb_poly_contour_prev_point(pcb_poly_t *polygon, pcb_cardinal_t point)
+{
+	pcb_cardinal_t contour;
+	pcb_cardinal_t prev_contour_end;
+	pcb_cardinal_t this_contour_end;
+
+	contour = pcb_poly_contour_point(polygon, point);
+
+	prev_contour_end = (contour == 0) ? 0 : polygon->HoleIndex[contour - 1];
+	this_contour_end = (contour == polygon->HoleIndexN) ? polygon->PointN - 1 : polygon->HoleIndex[contour] - 1;
+
+	/* Wrap back to the start of the contour we're in if we pass the end */
+	if (point == prev_contour_end)
+		point = this_contour_end;
+	else
+		point--;
+
+	return point;
+}
+
+static void add_noholes_polyarea(pcb_pline_t * pline, void *user_data)
+{
+	pcb_poly_t *poly = (pcb_poly_t *) user_data;
+
+	/* Prepend the pline into the NoHoles linked list */
+	pline->next = poly->NoHoles;
+	poly->NoHoles = pline;
+}
+
+void pcb_poly_compute_no_holes(pcb_poly_t * poly)
+{
+	pcb_poly_contours_free(&poly->NoHoles);
+	if (poly->Clipped)
+		pcb_poly_no_holes_dicer(poly, NULL, add_noholes_polyarea, poly);
+	else
+		printf("Compute_noholes caught poly->Clipped = NULL\n");
+	poly->NoHolesValid = 1;
+}
+
+static pcb_polyarea_t *biggest(pcb_polyarea_t * p)
+{
+	pcb_polyarea_t *n, *top = NULL;
+	pcb_pline_t *pl;
+	pcb_rtree_t *tree;
+	double big = -1;
+	if (!p)
+		return NULL;
+	n = p;
+	do {
+#if 0
+		if (n->contours->area < conf_core.design.poly_isle_area) {
+			n->b->f = n->f;
+			n->f->b = n->b;
+			pcb_poly_contour_del(&n->contours);
+			if (n == p)
+				p = n->f;
+			n = n->f;
+			if (!n->contours) {
+				free(n);
+				return NULL;
+			}
+		}
+#endif
+		if (n->contours->area > big) {
+			top = n;
+			big = n->contours->area;
+		}
+	}
+	while ((n = n->f) != p);
+	assert(top);
+	if (top == p)
+		return p;
+	pl = top->contours;
+	tree = top->contour_tree;
+	top->contours = p->contours;
+	top->contour_tree = p->contour_tree;
+	p->contours = pl;
+	p->contour_tree = tree;
+	assert(pl);
+	assert(p->f);
+	assert(p->b);
+	return p;
+}
+
+pcb_polyarea_t *pcb_poly_from_contour(pcb_pline_t * contour)
+{
+	pcb_polyarea_t *p;
+	pcb_poly_contour_pre(contour, pcb_true);
+	assert(contour->Flags.orient == PCB_PLF_DIR);
+	if (!(p = pcb_polyarea_create()))
+		return NULL;
+	pcb_polyarea_contour_include(p, contour);
+	assert(pcb_poly_valid(p));
+	return p;
+}
+
+/* Convert a polygon to an unclipped polyarea */
+static pcb_polyarea_t *original_poly(pcb_poly_t *p, pcb_bool *need_full)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_polyarea_t *np1 = NULL, *np = NULL;
+	pcb_cardinal_t n;
+	pcb_vector_t v;
+	int hole = 0;
+
+	*need_full = pcb_false;
+
+	np1 = np = pcb_polyarea_create();
+	if (np == NULL)
+		return NULL;
+
+	/* first make initial polygon contour */
+	for (n = 0; n < p->PointN; n++) {
+		/* No current contour? Make a new one starting at point */
+		/*   (or) Add point to existing contour */
+
+		v[0] = p->Points[n].X;
+		v[1] = p->Points[n].Y;
+		if (contour == NULL) {
+			if ((contour = pcb_poly_contour_new(v)) == NULL)
+				return NULL;
+		}
+		else {
+			pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+		}
+
+		/* Is current point last in contour? If so process it. */
+		if (n == p->PointN - 1 || (hole < p->HoleIndexN && n == p->HoleIndex[hole] - 1)) {
+			pcb_poly_contour_pre(contour, pcb_true);
+
+			/* make sure it is a positive contour (outer) or negative (hole) */
+			if (contour->Flags.orient != (hole ? PCB_PLF_INV : PCB_PLF_DIR))
+				pcb_poly_contour_inv(contour);
+			assert(contour->Flags.orient == (hole ? PCB_PLF_INV : PCB_PLF_DIR));
+
+			/* attempt to auto-correct simple self intersecting cases */
+			if (0 && pcb_pline_is_selfint(contour)) {
+				vtp0_t islands;
+				int n;
+
+				/* self intersecting polygon - attempt to fix it by splitting up into multiple polyareas */
+				vtp0_init(&islands);
+				pcb_pline_split_selfint(contour, &islands);
+				for(n = 0; n < vtp0_len(&islands); n++) {
+					pcb_pline_t *pl = *vtp0_get(&islands, n, 0);
+					if (n > 0) {
+						pcb_polyarea_t *newpa = pcb_polyarea_create();
+						newpa->b = np;
+						newpa->f = np->f;
+						np->f->b = newpa;
+						np->f = newpa;
+						np = newpa;
+						*need_full = pcb_true;
+					}
+					pcb_poly_contour_pre(pl, pcb_true);
+					if (pl->Flags.orient != (hole ? PCB_PLF_INV : PCB_PLF_DIR))
+						pcb_poly_contour_inv(pl);
+					assert(pl->Flags.orient == (hole ? PCB_PLF_INV : PCB_PLF_DIR));
+					pcb_polyarea_contour_include(np, pl);
+				}
+				vtp0_uninit(&islands);
+				free(contour);
+			}
+			else
+				pcb_polyarea_contour_include(np, contour);
+			contour = NULL;
+			assert(pcb_poly_valid(np));
+
+			hole++;
+		}
+	}
+	return biggest(np1);
+}
+
+pcb_polyarea_t *pcb_poly_from_poly(pcb_poly_t * p)
+{
+	pcb_bool tmp;
+	return original_poly(p, &tmp);
+}
+
+pcb_polyarea_t *pcb_poly_from_rect(pcb_coord_t x1, pcb_coord_t x2, pcb_coord_t y1, pcb_coord_t y2)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_vector_t v;
+
+	/* Return NULL for zero or negatively sized rectangles */
+	if (x2 <= x1 || y2 <= y1)
+		return NULL;
+
+	v[0] = x1;
+	v[1] = y1;
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return NULL;
+	v[0] = x2;
+	v[1] = y1;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	v[0] = x2;
+	v[1] = y2;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	v[0] = x1;
+	v[1] = y2;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	return pcb_poly_from_contour(contour);
+}
+
+pcb_polyarea_t *pcb_poly_from_octagon(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, int style)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_vector_t v;
+	double xm[8], ym[8];
+
+	pcb_poly_square_pin_factors(style, xm, ym);
+
+#warning TODO: rewrite this to use the same table as the square/oct pin draw function
+	/* point 7 */
+	v[0] = x + ROUND(radius * 0.5) * xm[7];
+	v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[7];
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return NULL;
+	/* point 6 */
+	v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[6];
+	v[1] = y + ROUND(radius * 0.5) * ym[6];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 5 */
+	v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[5];
+	v[1] = y + ROUND(radius * 0.5) * ym[5];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 4 */
+	v[0] = x - ROUND(radius * 0.5) * xm[4];
+	v[1] = y + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[4];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 3 */
+	v[0] = x - ROUND(radius * 0.5) * xm[3];
+	v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[3];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 2 */
+	v[0] = x - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[2];
+	v[1] = y - ROUND(radius * 0.5) * ym[2];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 1 */
+	v[0] = x + ROUND(radius * PCB_TAN_22_5_DEGREE_2) * xm[1];
+	v[1] = y - ROUND(radius * 0.5) * ym[1];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	/* point 0 */
+	v[0] = x + ROUND(radius * 0.5) * xm[0];
+	v[1] = y - ROUND(radius * PCB_TAN_22_5_DEGREE_2) * ym[0];
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	return pcb_poly_from_contour(contour);
+}
+
+static void pcb_poly_frac_circle_(pcb_pline_t * c, pcb_coord_t X, pcb_coord_t Y, pcb_vector_t v, int range, int add_last)
+{
+	double oe1, oe2, e1, e2, t1;
+	int i, orange = range;
+
+	oe1 = (v[0] - X);
+	oe2 = (v[1] - Y);
+
+	pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+
+	/* move vector to origin */
+	e1 = (v[0] - X) * PCB_POLY_CIRC_RADIUS_ADJ;
+	e2 = (v[1] - Y) * PCB_POLY_CIRC_RADIUS_ADJ;
+
+	/* NB: the caller adds the last vertex, hence the -1 */
+	range = PCB_POLY_CIRC_SEGS / range - 1;
+	for (i = 0; i < range; i++) {
+		/* rotate the vector */
+		t1 = rotate_circle_seg[0] * e1 + rotate_circle_seg[1] * e2;
+		e2 = rotate_circle_seg[2] * e1 + rotate_circle_seg[3] * e2;
+		e1 = t1;
+		v[0] = X + ROUND(e1);
+		v[1] = Y + ROUND(e2);
+		pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+	}
+
+	if ((add_last) && (orange == 4)) {
+		v[0] = X - ROUND(oe2);
+		v[1] = Y + ROUND(oe1);
+		pcb_poly_vertex_include(c->head.prev, pcb_poly_node_create(v));
+	}
+}
+
+
+/* add vertices in a fractional-circle starting from v
+ * centered at X, Y and going counter-clockwise
+ * does not include the first point
+ * last argument is 1 for a full circle
+ * 2 for a half circle
+ * or 4 for a quarter circle
+ */
+void pcb_poly_frac_circle(pcb_pline_t * c, pcb_coord_t X, pcb_coord_t Y, pcb_vector_t v, int range)
+{
+	pcb_poly_frac_circle_(c, X, Y, v, range, 0);
+}
+
+/* same but adds the last vertex */
+void pcb_poly_frac_circle_end(pcb_pline_t * c, pcb_coord_t X, pcb_coord_t Y, pcb_vector_t v, int range)
+{
+	pcb_poly_frac_circle_(c, X, Y, v, range, 1);
+}
+
+
+/* create a circle approximation from lines */
+pcb_polyarea_t *pcb_poly_from_circle(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius)
+{
+	pcb_pline_t *contour;
+	pcb_vector_t v;
+
+	if (radius <= 0)
+		return NULL;
+	v[0] = x + radius;
+	v[1] = y;
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return NULL;
+	pcb_poly_frac_circle(contour, x, y, v, 1);
+	contour->is_round = pcb_true;
+	contour->cx = x;
+	contour->cy = y;
+	contour->radius = radius;
+	return pcb_poly_from_contour(contour);
+}
+
+/* make a rounded-corner rectangle with radius t beyond x1,x2,y1,y2 rectangle */
+pcb_polyarea_t *RoundRect(pcb_coord_t x1, pcb_coord_t x2, pcb_coord_t y1, pcb_coord_t y2, pcb_coord_t t)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_vector_t v;
+
+	assert(x2 > x1);
+	assert(y2 > y1);
+	v[0] = x1 - t;
+	v[1] = y1;
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return NULL;
+	pcb_poly_frac_circle_end(contour, x1, y1, v, 4);
+	v[0] = x2;
+	v[1] = y1 - t;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	pcb_poly_frac_circle_end(contour, x2, y1, v, 4);
+	v[0] = x2 + t;
+	v[1] = y2;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	pcb_poly_frac_circle_end(contour, x2, y2, v, 4);
+	v[0] = x1;
+	v[1] = y2 + t;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	pcb_poly_frac_circle_end(contour, x1, y2, v, 4);
+	return pcb_poly_from_contour(contour);
+}
+
+#define ARC_ANGLE 5
+static pcb_polyarea_t *ArcPolyNoIntersect(pcb_arc_t * a, pcb_coord_t thick, int end_caps)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_polyarea_t *np = NULL;
+	pcb_vector_t v, v2;
+	pcb_box_t ends;
+	int i, segs;
+	double ang, da, rx, ry;
+	long half;
+	double radius_adj;
+	pcb_coord_t edx, edy;
+
+	if (thick <= 0)
+		return NULL;
+	if (a->Delta < 0) {
+		a->StartAngle += a->Delta;
+		a->Delta = -a->Delta;
+	}
+	half = (thick + 1) / 2;
+
+	pcb_arc_get_end(a, 0, &ends.X1, &ends.Y1);
+	pcb_arc_get_end(a, 1, &ends.X2, &ends.Y2);
+
+	/* start with inner radius */
+	rx = MAX(a->Width - half, 0);
+	ry = MAX(a->Height - half, 0);
+	segs = 1;
+	if (thick > 0)
+		segs = MAX(segs, a->Delta * M_PI / 360 *
+							 sqrt(sqrt((double) rx * rx + (double) ry * ry) / PCB_POLY_ARC_MAX_DEVIATION / 2 / thick));
+	segs = MAX(segs, a->Delta / ARC_ANGLE);
+
+	ang = a->StartAngle;
+	da = (1.0 * a->Delta) / segs;
+	radius_adj = (M_PI * da / 360) * (M_PI * da / 360) / 2;
+	v[0] = a->X - rx * cos(ang * PCB_M180);
+	v[1] = a->Y + ry * sin(ang * PCB_M180);
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return 0;
+	for (i = 0; i < segs - 1; i++) {
+		ang += da;
+		v[0] = a->X - rx * cos(ang * PCB_M180);
+		v[1] = a->Y + ry * sin(ang * PCB_M180);
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	}
+	/* find last point */
+	ang = a->StartAngle + a->Delta;
+	v[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj);
+	v[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj);
+
+	/* add the round cap at the end */
+	if (end_caps)
+		pcb_poly_frac_circle(contour, ends.X2, ends.Y2, v, 2);
+
+	/* and now do the outer arc (going backwards) */
+	rx = (a->Width + half) * (1 + radius_adj);
+	ry = (a->Width + half) * (1 + radius_adj);
+	da = -da;
+	for (i = 0; i < segs; i++) {
+		v[0] = a->X - rx * cos(ang * PCB_M180);
+		v[1] = a->Y + ry * sin(ang * PCB_M180);
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+		ang += da;
+	}
+
+	/* explicitly draw the last point if the manhattan-distance is large enough */
+	ang = a->StartAngle;
+	v2[0] = a->X - rx * cos(ang * PCB_M180) * (1 - radius_adj);
+	v2[1] = a->Y + ry * sin(ang * PCB_M180) * (1 - radius_adj);
+	edx = (v[0] - v2[0]);
+	edy = (v[1] - v2[1]);
+	if (edx < 0) edx = -edx;
+	if (edy < 0) edy = -edy;
+	if (edx+edy > PCB_MM_TO_COORD(0.001))
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v2));
+
+
+	/* now add other round cap */
+	if (end_caps)
+		pcb_poly_frac_circle(contour, ends.X1, ends.Y1, v2, 2);
+
+	/* now we have the whole contour */
+	if (!(np = pcb_poly_from_contour(contour)))
+		return NULL;
+	return np;
+}
+
+#define MIN_CLEARANCE_BEFORE_BISECT 10.
+pcb_polyarea_t *pcb_poly_from_arc(pcb_arc_t * a, pcb_coord_t thick)
+{
+	double delta;
+	pcb_arc_t seg1, seg2;
+	pcb_coord_t half;
+
+	delta = (a->Delta < 0) ? -a->Delta : a->Delta;
+
+	half = (thick + 1) / 2;
+
+	/* corner case: can't even calculate the end cap properly because radius
+	   is so small that there's no inner arc of the clearance */
+	if ((a->Width - half <= 0) || (a->Height - half <= 0)) {
+		pcb_line_t lin = {0};
+		pcb_polyarea_t *tmp_arc, *tmp1, *tmp2, *res, *ends;
+
+		tmp_arc = ArcPolyNoIntersect(a, thick, 0);
+
+		pcb_arc_get_end(a, 0, &lin.Point1.X, &lin.Point1.Y);
+		lin.Point2.X = lin.Point1.X;
+		lin.Point2.Y = lin.Point1.Y;
+		tmp1 = pcb_poly_from_line(&lin, thick);
+
+		pcb_arc_get_end(a, 1, &lin.Point1.X, &lin.Point1.Y);
+		lin.Point2.X = lin.Point1.X;
+		lin.Point2.Y = lin.Point1.Y;
+		tmp2 = pcb_poly_from_line(&lin, thick);
+
+		pcb_polyarea_boolean_free(tmp1, tmp2, &ends, PCB_PBO_UNITE);
+		pcb_polyarea_boolean_free(ends, tmp_arc, &res, PCB_PBO_UNITE);
+		return res;
+	}
+
+	/* If the arc segment would self-intersect, we need to construct it as the union of
+	   two non-intersecting segments */
+	if (2 * M_PI * a->Width * (1. - (double) delta / 360.) - thick < MIN_CLEARANCE_BEFORE_BISECT) {
+		pcb_polyarea_t *tmp1, *tmp2, *res;
+		int half_delta = a->Delta / 2;
+
+		seg1 = seg2 = *a;
+		seg1.Delta = half_delta;
+		seg2.Delta -= half_delta;
+		seg2.StartAngle += half_delta;
+
+		tmp1 = ArcPolyNoIntersect(&seg1, thick, 1);
+		tmp2 = ArcPolyNoIntersect(&seg2, thick, 1);
+		pcb_polyarea_boolean_free(tmp1, tmp2, &res, PCB_PBO_UNITE);
+		return res;
+	}
+
+	return ArcPolyNoIntersect(a, thick, 1);
+}
+
+pcb_polyarea_t *pcb_poly_from_line(pcb_line_t * L, pcb_coord_t thick)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_polyarea_t *np = NULL;
+	pcb_vector_t v;
+	double d, dx, dy;
+	long half;
+	pcb_line_t _l = *L, *l = &_l;
+
+	if (thick <= 0)
+		return NULL;
+	half = (thick + 1) / 2;
+	d = sqrt(PCB_SQUARE(l->Point1.X - l->Point2.X) + PCB_SQUARE(l->Point1.Y - l->Point2.Y));
+	if (!PCB_FLAG_TEST(PCB_FLAG_SQUARE, l))
+		if (d == 0)									/* line is a point */
+			return pcb_poly_from_circle(l->Point1.X, l->Point1.Y, half);
+	if (d != 0) {
+		d = half / d;
+		dx = (l->Point1.Y - l->Point2.Y) * d;
+		dy = (l->Point2.X - l->Point1.X) * d;
+	}
+	else {
+		dx = half;
+		dy = 0;
+	}
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l)) {	/* take into account the ends */
+		l->Point1.X -= dy;
+		l->Point1.Y += dx;
+		l->Point2.X += dy;
+		l->Point2.Y -= dx;
+	}
+	v[0] = l->Point1.X - dx;
+	v[1] = l->Point1.Y - dy;
+	if ((contour = pcb_poly_contour_new(v)) == NULL)
+		return 0;
+	v[0] = l->Point2.X - dx;
+	v[1] = l->Point2.Y - dy;
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l))
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	else
+		pcb_poly_frac_circle(contour, l->Point2.X, l->Point2.Y, v, 2);
+	v[0] = l->Point2.X + dx;
+	v[1] = l->Point2.Y + dy;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	v[0] = l->Point1.X + dx;
+	v[1] = l->Point1.Y + dy;
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l))
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	else
+		pcb_poly_frac_circle(contour, l->Point1.X, l->Point1.Y, v, 2);
+	/* now we have the line contour */
+	if (!(np = pcb_poly_from_contour(contour)))
+		return NULL;
+	return np;
+}
+
+/* clear np1 from the polygon - should be inline with -O3 */
+static int Subtract(pcb_polyarea_t * np1, pcb_poly_t * p, pcb_bool fnp)
+{
+	pcb_polyarea_t *merged = NULL, *np = np1;
+	int x;
+	assert(np);
+	assert(p);
+	if (!p->Clipped) {
+		if (fnp)
+			pcb_polyarea_free(&np);
+		return 1;
+	}
+	assert(pcb_poly_valid(p->Clipped));
+	assert(pcb_poly_valid(np));
+	if (fnp)
+		x = pcb_polyarea_boolean_free(p->Clipped, np, &merged, PCB_PBO_SUB);
+	else {
+		x = pcb_polyarea_boolean(p->Clipped, np, &merged, PCB_PBO_SUB);
+		pcb_polyarea_free(&p->Clipped);
+	}
+	assert(!merged || pcb_poly_valid(merged));
+	if (x != pcb_err_ok) {
+		fprintf(stderr, "Error while clipping PCB_PBO_SUB: %d\n", x);
+		pcb_polyarea_free(&merged);
+		p->Clipped = NULL;
+		if (p->NoHoles)
+			printf("Just leaked in Subtract\n");
+		p->NoHoles = NULL;
+		return -1;
+	}
+	p->Clipped = biggest(merged);
+	assert(!p->Clipped || pcb_poly_valid(p->Clipped));
+	if (!p->Clipped)
+		pcb_message(PCB_MSG_WARNING, "Polygon cleared out of existence near (%$mm, %$mm)\n",
+						(p->BoundingBox.X1 + p->BoundingBox.X2) / 2, (p->BoundingBox.Y1 + p->BoundingBox.Y2) / 2);
+	return 1;
+}
+
+int pcb_poly_subtract(pcb_polyarea_t *np1, pcb_poly_t *p, pcb_bool fnp)
+{
+	return Subtract(np1, p, fnp);
+}
+
+pcb_polyarea_t *pcb_poly_from_box_bloated(pcb_box_t * box, pcb_coord_t bloat)
+{
+	return pcb_poly_from_rect(box->X1 - bloat, box->X2 + bloat, box->Y1 - bloat, box->Y2 + bloat);
+}
+
+/* remove the padstack clearance from the polygon */
+static int SubtractPadstack(pcb_data_t *d, pcb_pstk_t *ps, pcb_layer_t *l, pcb_poly_t *p)
+{
+	pcb_polyarea_t *np;
+	pcb_layer_id_t i;
+
+	/* ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps))
+		return 0;
+	i = pcb_layer_id(d, l);
+	np = pcb_thermal_area_pstk(pcb_data_get_top(d), ps, i);
+	if (np == 0)
+		return 0;
+
+	return Subtract(np, p, pcb_true);
+}
+
+/* return the clearance polygon for a line */
+static pcb_polyarea_t *line_clearance_poly(pcb_cardinal_t layernum, pcb_board_t *pcb, pcb_line_t *line)
+{
+	if (line->thermal & PCB_THERMAL_ON)
+		return pcb_thermal_area_line(pcb, line, layernum);
+	return pcb_poly_from_line(line, line->Thickness + line->Clearance);
+}
+
+static int SubtractLine(pcb_line_t * line, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+
+	if (!PCB_NONPOLY_HAS_CLEARANCE(line))
+		return 0;
+	if (!(np = line_clearance_poly(-1, NULL, line)))
+		return -1;
+	return Subtract(np, p, pcb_true);
+}
+
+static int SubtractArc(pcb_arc_t * arc, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+
+	if (!PCB_NONPOLY_HAS_CLEARANCE(arc))
+		return 0;
+	if (!(np = pcb_poly_from_arc(arc, arc->Thickness + arc->Clearance)))
+		return -1;
+	return Subtract(np, p, pcb_true);
+}
+
+static int SubtractText(pcb_text_t * text, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+	const pcb_box_t *b = &text->BoundingBox;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text))
+		return 0;
+	if (!(np = RoundRect(b->X1 + conf_core.design.bloat, b->X2 - conf_core.design.bloat, b->Y1 + conf_core.design.bloat, b->Y2 - conf_core.design.bloat, conf_core.design.bloat)))
+		return -1;
+	return Subtract(np, p, pcb_true);
+}
+
+struct cpInfo {
+	const pcb_box_t *other;
+	pcb_data_t *data;
+	pcb_layer_t *layer;
+	pcb_poly_t *polygon;
+	pcb_bool solder;
+	pcb_polyarea_t *accumulate;
+	int batch_size;
+	jmp_buf env;
+};
+
+static void subtract_accumulated(struct cpInfo *info, pcb_poly_t *polygon)
+{
+	if (info->accumulate == NULL)
+		return;
+	Subtract(info->accumulate, polygon, pcb_true);
+	info->accumulate = NULL;
+	info->batch_size = 0;
+}
+
+static int pcb_poly_clip_noop = 0;
+static void *pcb_poly_clip_prog_ctx;
+static void (*pcb_poly_clip_prog)(void *ctx) = NULL;
+
+/* call the progress report callback and return if no-op is set */
+#define POLY_CLIP_PROG() \
+do { \
+	if (pcb_poly_clip_prog != NULL) \
+		pcb_poly_clip_prog(pcb_poly_clip_prog_ctx); \
+	if (pcb_poly_clip_noop) \
+		return PCB_R_DIR_FOUND_CONTINUE; \
+} while(0)
+
+static pcb_r_dir_t padstack_sub_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	struct cpInfo *info = (struct cpInfo *)cl;
+	pcb_poly_t *polygon;
+	pcb_polyarea_t *np;
+	pcb_polyarea_t *merged;
+	pcb_layer_id_t i;
+
+	/* don't subtract the object that was put back! */
+	if (b == info->other)
+		return PCB_R_DIR_NOT_FOUND;
+	polygon = info->polygon;
+
+	/* ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps))
+		return PCB_R_DIR_NOT_FOUND;
+
+	i = pcb_layer_id(info->data, info->layer);
+
+	np = pcb_thermal_area_pstk(pcb_data_get_top(info->data), ps, i);
+	if (np == 0)
+			return PCB_R_DIR_FOUND_CONTINUE;
+
+	info->batch_size++;
+	POLY_CLIP_PROG();
+
+	pcb_polyarea_boolean_free(info->accumulate, np, &merged, PCB_PBO_UNITE);
+	info->accumulate = merged;
+
+	if (info->batch_size == SUBTRACT_PADSTACK_BATCH_SIZE)
+		subtract_accumulated(info, polygon);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t arc_sub_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct cpInfo *info = (struct cpInfo *) cl;
+	pcb_poly_t *polygon;
+
+	/* don't subtract the object that was put back! */
+	if (b == info->other)
+		return PCB_R_DIR_NOT_FOUND;
+	if (!PCB_NONPOLY_HAS_CLEARANCE(arc))
+		return PCB_R_DIR_NOT_FOUND;
+
+	POLY_CLIP_PROG();
+
+	polygon = info->polygon;
+
+	if (SubtractArc(arc, polygon) < 0)
+		longjmp(info->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* quick create a polygon area from a line, knowing the coords and width */
+static pcb_polyarea_t *poly_sub_callback_line(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t width)
+{
+	static pcb_line_t lin;
+	static int inited = 0;
+
+	if (!inited) {
+		lin.type = PCB_OBJ_LINE;
+		lin.Flags = pcb_no_flags();
+		PCB_FLAG_SET(PCB_FLAG_CLEARLINE, &lin);
+		lin.Thickness = 0;
+		inited = 1;
+	}
+
+	lin.Point1.X = x1;
+	lin.Point1.Y = y1;
+	lin.Point2.X = x2;
+	lin.Point2.Y = y2;
+	lin.Clearance = width;
+
+	return pcb_poly_from_line(&lin, width);
+}
+
+#define pa_append(src) \
+	do { \
+		pcb_polyarea_boolean(*dst, src, &tmp, PCB_PBO_UNITE); \
+		pcb_polyarea_free(dst); \
+		*dst = tmp; \
+	} while(0)
+
+void pcb_poly_pa_clearance_construct(pcb_polyarea_t **dst, pcb_poly_it_t *it, pcb_coord_t clearance)
+{
+	pcb_polyarea_t *tmp, *lin;
+	pcb_coord_t x, y, px, py, x0, y0;
+	pcb_pline_t *pl;
+	int go;
+	pcb_cardinal_t cnt;
+
+	if (*dst != NULL)
+		pa_append(it->pa);
+	else
+		pcb_polyarea_copy0(dst, it->pa);
+
+	clearance *= 2;
+
+	/* care about the outer contours only */
+	pl = pcb_poly_contour(it);
+	if (pl != NULL) {
+		/* iterate over the vectors of the contour */
+		for(go = pcb_poly_vect_first(it, &x, &y), cnt = 0; go; go = pcb_poly_vect_next(it, &x, &y), cnt++) {
+			if (cnt > 0) {
+				lin = poly_sub_callback_line(px, py, x, y, clearance);
+				pa_append(lin);
+				pcb_polyarea_free(&lin);
+			}
+			else {
+				x0 = x;
+				y0 = y;
+			}
+			px = x;
+			py = y;
+		}
+		if (cnt > 0) {
+			lin = poly_sub_callback_line(px, py, x0, y0, clearance);
+			pa_append(lin);
+			pcb_polyarea_free(&lin);
+		}
+	}
+}
+#undef pa_append
+
+/* Construct a poly area that represents the enlarged subpoly - so it can be
+   subtracted from the parent poly to form the clearance for subpoly */
+pcb_polyarea_t *pcb_poly_clearance_construct(pcb_poly_t *subpoly)
+{
+	pcb_polyarea_t *ret = NULL, *pa;
+	pcb_poly_it_t it;
+
+	/* iterate over all islands of a polygon */
+	for(pa = pcb_poly_island_first(subpoly, &it); pa != NULL; pa = pcb_poly_island_next(&it))
+		pcb_poly_pa_clearance_construct(&ret, &it, subpoly->Clearance/2);
+
+	return ret;
+}
+
+/* return the clearance polygon for a line */
+static pcb_polyarea_t *poly_clearance_poly(pcb_cardinal_t layernum, pcb_board_t *pcb, pcb_poly_t *subpoly)
+{
+	if (subpoly->thermal & PCB_THERMAL_ON)
+		return pcb_thermal_area_poly(pcb, subpoly, layernum);
+	return pcb_poly_clearance_construct(subpoly);
+}
+
+
+static int SubtractPolyPoly(pcb_poly_t *subpoly, pcb_poly_t *frompoly)
+{
+	pcb_polyarea_t *pa;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, frompoly)) /* two clearing polys won't interact */
+		return 0; /* but it's not an error, that'd kill other clearances in the same poly */
+
+	pa = poly_clearance_poly(-1, NULL, subpoly);
+	if (pa == NULL)
+		return -1;
+
+	Subtract(pa, frompoly, pcb_true);
+	frompoly->NoHolesValid = 0;
+	return 0;
+}
+
+
+static int UnsubtractPolyPoly(pcb_poly_t *subpoly, pcb_poly_t *frompoly)
+{
+	pcb_polyarea_t *pa;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, frompoly)) /* two clearing polys won't interact */
+		return 0; /* but it's not an error, that'd kill other clearances in the same poly */
+
+	pa = poly_clearance_poly(-1, NULL, subpoly);
+	if (pa == NULL)
+		return -1;
+
+	if (!Unsubtract(pa, frompoly))
+		return -1;
+	frompoly->NoHolesValid = 0;
+	return 0;
+}
+
+static pcb_r_dir_t poly_sub_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_poly_t *subpoly = (pcb_poly_t *)b;
+	struct cpInfo *info = (struct cpInfo *) cl;
+	pcb_poly_t *polygon;
+
+	polygon = info->polygon;
+
+	/* don't do clearance in itself */
+	if (subpoly == polygon)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* don't subtract the object that was put back! */
+	if (b == info->other)
+		return PCB_R_DIR_NOT_FOUND;
+	if (!PCB_POLY_HAS_CLEARANCE(subpoly))
+		return PCB_R_DIR_NOT_FOUND;
+
+	POLY_CLIP_PROG();
+
+	if (SubtractPolyPoly(subpoly, polygon) < 0)
+		longjmp(info->env, 1);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t line_sub_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct cpInfo *info = (struct cpInfo *) cl;
+	pcb_poly_t *polygon;
+	pcb_polyarea_t *np;
+	pcb_polyarea_t *merged;
+
+	/* don't subtract the object that was put back! */
+	if (b == info->other)
+		return PCB_R_DIR_NOT_FOUND;
+	if (!PCB_NONPOLY_HAS_CLEARANCE(line))
+		return PCB_R_DIR_NOT_FOUND;
+	polygon = info->polygon;
+
+	POLY_CLIP_PROG();
+
+	np = line_clearance_poly(-1, NULL, line);
+	if (!np)
+		longjmp(info->env, 1);
+
+	pcb_polyarea_boolean_free(info->accumulate, np, &merged, PCB_PBO_UNITE);
+	info->accumulate = merged;
+	info->batch_size++;
+
+	if (info->batch_size == SUBTRACT_LINE_BATCH_SIZE)
+		subtract_accumulated(info, polygon);
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t text_sub_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_text_t *text = (pcb_text_t *) b;
+	struct cpInfo *info = (struct cpInfo *) cl;
+	pcb_poly_t *polygon;
+
+	/* don't subtract the object that was put back! */
+	if (b == info->other)
+		return PCB_R_DIR_NOT_FOUND;
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text))
+		return PCB_R_DIR_NOT_FOUND;
+
+	POLY_CLIP_PROG();
+
+	polygon = info->polygon;
+	if (SubtractText(text, polygon) < 0)
+		longjmp(info->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_cardinal_t clearPoly(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *polygon, const pcb_box_t *here, pcb_coord_t expand, int noop)
+{
+	pcb_cardinal_t r = 0;
+	int seen;
+	pcb_box_t region;
+	struct cpInfo info;
+	pcb_layergrp_id_t group;
+	unsigned int gflg;
+	pcb_layer_type_t lf;
+	int old_noop;
+
+	lf = pcb_layer_flags_(Layer);
+	if (!(lf & PCB_LYT_COPPER)) { /* also handles lf == 0 */
+		polygon->NoHolesValid = 0;
+		return 0;
+	}
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon))
+		return 0;
+
+	old_noop = pcb_poly_clip_noop;
+	pcb_poly_clip_noop = noop;
+
+	group = pcb_layer_get_group_(Layer);
+	gflg = pcb_layergrp_flags(PCB, group);
+	info.solder = (gflg & PCB_LYT_BOTTOM);
+	info.data = Data;
+	info.other = here;
+	info.layer = Layer;
+	info.polygon = polygon;
+	if (here)
+		region = pcb_clip_box(here, &polygon->BoundingBox);
+	else
+		region = polygon->BoundingBox;
+	region = pcb_bloat_box(&region, expand);
+
+	if (setjmp(info.env) == 0) {
+
+		r = 0;
+		info.accumulate = NULL;
+		info.batch_size = 0;
+		PCB_COPPER_GROUP_LOOP(Data, group);
+		{
+			pcb_r_search(layer->line_tree, &region, NULL, line_sub_callback, &info, &seen);
+			r += seen;
+			subtract_accumulated(&info, polygon);
+			pcb_r_search(layer->arc_tree, &region, NULL, arc_sub_callback, &info, &seen);
+			r += seen;
+			pcb_r_search(layer->text_tree, &region, NULL, text_sub_callback, &info, &seen);
+			r += seen;
+			pcb_r_search(layer->polygon_tree, &region, NULL, poly_sub_callback, &info, &seen);
+			r += seen;
+		}
+		PCB_END_LOOP;
+		pcb_r_search(Data->padstack_tree, &region, NULL, padstack_sub_callback, &info, &seen);
+		r += seen;
+		subtract_accumulated(&info, polygon);
+	}
+	if (!noop)
+		polygon->NoHolesValid = 0;
+	pcb_poly_clip_noop = old_noop;
+	return r;
+}
+
+static int Unsubtract(pcb_polyarea_t * np1, pcb_poly_t * p)
+{
+	pcb_polyarea_t *merged = NULL, *np = np1;
+	pcb_polyarea_t *orig_poly, *clipped_np;
+	int x;
+	pcb_bool need_full;
+	assert(np);
+	assert(p); /* NOTE: p->clipped might be NULL if a poly is "cleared out of existence" and is now coming back */
+
+	orig_poly = original_poly(p, &need_full);
+
+	x = pcb_polyarea_boolean_free(np, orig_poly, &clipped_np, PCB_PBO_ISECT);
+	if (x != pcb_err_ok) {
+		fprintf(stderr, "Error while clipping PCB_PBO_ISECT: %d\n", x);
+		pcb_polyarea_free(&clipped_np);
+		goto fail;
+	}
+
+	x = pcb_polyarea_boolean_free(p->Clipped, clipped_np, &merged, PCB_PBO_UNITE);
+	if (x != pcb_err_ok) {
+		fprintf(stderr, "Error while clipping PCB_PBO_UNITE: %d\n", x);
+		pcb_polyarea_free(&merged);
+		goto fail;
+	}
+	p->Clipped = biggest(merged);
+	assert(!p->Clipped || pcb_poly_valid(p->Clipped));
+	return 1;
+
+fail:
+	p->Clipped = NULL;
+	if (p->NoHoles)
+		printf("Just leaked in Unsubtract\n");
+	p->NoHoles = NULL;
+	return 0;
+}
+
+static int UnsubtractPadstack(pcb_data_t *data, pcb_pstk_t *ps, pcb_layer_t *l, pcb_poly_t *p)
+{
+	pcb_polyarea_t *np;
+
+	/* overlap a bit to prevent gaps from rounding errors */
+	np = pcb_poly_from_box_bloated(&ps->BoundingBox, UNSUBTRACT_BLOAT * 400000);
+
+	if (!np)
+		return 0;
+	if (!Unsubtract(np, p))
+		return 0;
+
+	clearPoly(PCB->Data, l, p, (const pcb_box_t *)ps, 2 * UNSUBTRACT_BLOAT * 400000, 0);
+	return 1;
+}
+
+
+
+static int UnsubtractArc(pcb_arc_t * arc, pcb_layer_t * l, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+
+	if (!PCB_NONPOLY_HAS_CLEARANCE(arc))
+		return 0;
+
+	/* overlap a bit to prevent gaps from rounding errors */
+	np = pcb_poly_from_box_bloated(&arc->BoundingBox, UNSUBTRACT_BLOAT);
+
+	if (!np)
+		return 0;
+	if (!Unsubtract(np, p))
+		return 0;
+	clearPoly(PCB->Data, l, p, (const pcb_box_t *) arc, 2 * UNSUBTRACT_BLOAT, 0);
+	return 1;
+}
+
+static int UnsubtractLine(pcb_line_t * line, pcb_layer_t * l, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+
+	if (!PCB_NONPOLY_HAS_CLEARANCE(line))
+		return 0;
+
+	/* overlap a bit to prevent notches from rounding errors */
+	np = pcb_poly_from_box_bloated(&line->BoundingBox, UNSUBTRACT_BLOAT);
+
+	if (!np)
+		return 0;
+	if (!Unsubtract(np, p))
+		return 0;
+	clearPoly(PCB->Data, l, p, (const pcb_box_t *) line, 2 * UNSUBTRACT_BLOAT, 0);
+	return 1;
+}
+
+static int UnsubtractText(pcb_text_t * text, pcb_layer_t * l, pcb_poly_t * p)
+{
+	pcb_polyarea_t *np;
+
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, text))
+		return 0;
+
+	/* overlap a bit to prevent notches from rounding errors */
+	np = pcb_poly_from_box_bloated(&text->BoundingBox, UNSUBTRACT_BLOAT);
+
+	if (!np)
+		return -1;
+	if (!Unsubtract(np, p))
+		return 0;
+	clearPoly(PCB->Data, l, p, (const pcb_box_t *) text, 2 * UNSUBTRACT_BLOAT, 0);
+	return 1;
+}
+
+static pcb_bool inhibit = pcb_false;
+
+int pcb_poly_init_clip_prog(pcb_data_t *Data, pcb_layer_t *layer, pcb_poly_t *p, void (*cb)(void *ctx), void *ctx)
+{
+	pcb_board_t *pcb;
+	pcb_bool need_full;
+	void (*old_cb)(void *ctx);
+	void *old_ctx;
+
+	if (inhibit)
+		return 0;
+
+	if (Data->clip_inhibit > 0) {
+		p->clip_dirty = 1;
+		return 0;
+	}
+
+	if (layer->is_bound)
+		layer = layer->meta.bound.real;
+
+	if (p->Clipped)
+		pcb_polyarea_free(&p->Clipped);
+	p->Clipped = original_poly(p, &need_full);
+	if (need_full && !PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, p)) {
+		pcb_message(PCB_MSG_WARNING, "Polygon #%ld was self intersecting; it had to be split up and\nthe full poly flag set.\n", (long)p->ID);
+		PCB_FLAG_SET(PCB_FLAG_FULLPOLY, p);
+	}
+	pcb_poly_contours_free(&p->NoHoles);
+
+	if (layer == NULL)
+		return 0;
+
+	if (!p->Clipped)
+		return 0;
+	assert(pcb_poly_valid(p->Clipped));
+
+	/* calculate clipping for the real data (in case of subcircuits) */
+	pcb = pcb_data_get_top(Data);
+	if (pcb != NULL)
+		Data = pcb->Data;
+
+	old_cb = pcb_poly_clip_prog;
+	old_ctx = pcb_poly_clip_prog_ctx;
+	pcb_poly_clip_prog = cb;
+	pcb_poly_clip_prog_ctx = ctx;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, p))
+		clearPoly(Data, layer, p, NULL, 0, 0);
+	else
+		p->NoHolesValid = 0;
+
+	pcb_poly_clip_prog = old_cb;
+	pcb_poly_clip_prog_ctx = old_ctx;
+	return 1;
+}
+
+int pcb_poly_init_clip(pcb_data_t *Data, pcb_layer_t *layer, pcb_poly_t *p)
+{
+	return pcb_poly_init_clip_prog(Data, layer, p, NULL, NULL);
+}
+
+pcb_cardinal_t pcb_poly_num_clears(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *polygon)
+{
+	pcb_cardinal_t res;
+	void (*old_cb)(void *ctx);
+
+	if (layer->is_bound)
+		layer = layer->meta.bound.real;
+
+	old_cb = pcb_poly_clip_prog;
+	pcb_poly_clip_prog = NULL;
+
+	res = clearPoly(data, layer, polygon, NULL, 0, 1);
+
+	pcb_poly_clip_prog = old_cb;
+	return res;
+}
+
+/* --------------------------------------------------------------------------
+ * remove redundant polygon points. Any point that lies on the straight
+ * line between the points on either side of it is redundant.
+ * returns pcb_true if any points are removed
+ */
+pcb_bool pcb_poly_remove_excess_points(pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	pcb_point_t *p;
+	pcb_cardinal_t n, prev, next;
+	pcb_line_t line;
+	pcb_bool changed = pcb_false;
+
+	if (pcb_undoing())
+		return pcb_false;
+
+	for (n = 0; n < Polygon->PointN; n++) {
+		prev = pcb_poly_contour_prev_point(Polygon, n);
+		next = pcb_poly_contour_next_point(Polygon, n);
+		p = &Polygon->Points[n];
+
+		line.Point1 = Polygon->Points[prev];
+		line.Point2 = Polygon->Points[next];
+		line.Thickness = 0;
+		if (pcb_is_point_on_line(p->X, p->Y, 0.0, &line)) {
+			pcb_remove_object(PCB_OBJ_POLY_POINT, Layer, Polygon, p);
+			changed = pcb_true;
+		}
+	}
+	return changed;
+}
+
+/* ---------------------------------------------------------------------------
+ * returns the index of the polygon point which is the end
+ * point of the segment with the lowest distance to the passed
+ * coordinates
+ */
+pcb_cardinal_t pcb_poly_get_lowest_distance_point(pcb_poly_t *Polygon, pcb_coord_t X, pcb_coord_t Y)
+{
+	double mindistance = (double) PCB_MAX_COORD * PCB_MAX_COORD;
+	pcb_point_t *ptr1, *ptr2;
+	pcb_cardinal_t n, result = 0;
+
+	/* we calculate the distance to each segment and choose the
+	 * shortest distance. If the closest approach between the
+	 * given point and the projected line (i.e. the segment extended)
+	 * is not on the segment, then the distance is the distance
+	 * to the segment end point.
+	 */
+
+	for (n = 0; n < Polygon->PointN; n++) {
+		double u, dx, dy;
+		ptr1 = &Polygon->Points[pcb_poly_contour_prev_point(Polygon, n)];
+		ptr2 = &Polygon->Points[n];
+
+		dx = ptr2->X - ptr1->X;
+		dy = ptr2->Y - ptr1->Y;
+		if (dx != 0.0 || dy != 0.0) {
+			/* projected intersection is at P1 + u(P2 - P1) */
+			u = ((X - ptr1->X) * dx + (Y - ptr1->Y) * dy) / (dx * dx + dy * dy);
+
+			if (u < 0.0) {						/* ptr1 is closest point */
+				u = PCB_SQUARE(X - ptr1->X) + PCB_SQUARE(Y - ptr1->Y);
+			}
+			else if (u > 1.0) {				/* ptr2 is closest point */
+				u = PCB_SQUARE(X - ptr2->X) + PCB_SQUARE(Y - ptr2->Y);
+			}
+			else {										/* projected intersection is closest point */
+				u = PCB_SQUARE(X - ptr1->X * (1.0 - u) - u * ptr2->X) + PCB_SQUARE(Y - ptr1->Y * (1.0 - u) - u * ptr2->Y);
+			}
+			if (u < mindistance) {
+				mindistance = u;
+				result = n;
+			}
+		}
+	}
+	return result;
+}
+
+/* ---------------------------------------------------------------------------
+ * go back to the previous point of the polygon (undo)
+ */
+void pcb_polygon_go_to_prev_point(void)
+{
+	switch (pcb_crosshair.AttachedPolygon.PointN) {
+		/* do nothing if mode has just been entered */
+	case 0:
+		break;
+
+		/* reset number of points and 'PCB_MODE_LINE' state */
+	case 1:
+		pcb_crosshair.AttachedPolygon.PointN = 0;
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+		break;
+
+		/* back-up one point */
+	default:
+		{
+			pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+			pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN - 2;
+
+			pcb_crosshair.AttachedPolygon.PointN--;
+			pcb_crosshair.AttachedLine.Point1.X = points[n].X;
+			pcb_crosshair.AttachedLine.Point1.Y = points[n].Y;
+			break;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * go forward to the next point of the polygon (redo)
+ */
+void pcb_polygon_go_to_next_point(void)
+{
+	if ((pcb_crosshair.AttachedPolygon.PointN > 0) && (pcb_crosshair.AttachedPolygon.PointN < pcb_crosshair.AttachedPolygon_pts)) {
+		pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+		pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+
+		pcb_crosshair.AttachedPolygon.PointN++;
+		pcb_crosshair.AttachedLine.Point1.X = points[n].X;
+		pcb_crosshair.AttachedLine.Point1.Y = points[n].Y;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * close polygon if possible
+ */
+void pcb_polygon_close_poly(void)
+{
+	pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+
+	/* check number of points */
+	if (n >= 3) {
+		/* if 45 degree lines are what we want do a quick check
+		 * if closing the polygon makes sense
+		 */
+		if (!conf_core.editor.all_direction_lines) {
+			pcb_coord_t dx, dy;
+
+			dx = coord_abs(pcb_crosshair.AttachedPolygon.Points[n - 1].X - pcb_crosshair.AttachedPolygon.Points[0].X);
+			dy = coord_abs(pcb_crosshair.AttachedPolygon.Points[n - 1].Y - pcb_crosshair.AttachedPolygon.Points[0].Y);
+			if (!(dx == 0 || dy == 0 || dx == dy)) {
+				pcb_message(PCB_MSG_ERROR, _("Cannot close polygon because 45 degree lines are requested.\n"));
+				return;
+			}
+		}
+		pcb_polygon_copy_attached_to_layer();
+		pcb_draw();
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, _("A polygon has to have at least 3 points\n"));
+}
+
+static void poly_copy_data(pcb_poly_t *dst, pcb_poly_t *src)
+{
+	pcb_poly_t p;
+	void *old_parent = dst->parent.any;
+	pcb_parenttype_t old_pt = dst->parent_type;
+
+	memcpy(dst, src, ((char *)&p.link - (char *)&p));
+	dst->type = PCB_OBJ_POLY;
+	dst->parent.any = old_parent;
+	dst->parent_type = old_pt;
+}
+
+/* ---------------------------------------------------------------------------
+ * moves the data of the attached (new) polygon to the current layer
+ */
+void pcb_polygon_copy_attached_to_layer(void)
+{
+	pcb_layer_t *layer = pcb_loose_subc_layer(PCB, CURRENT);
+	pcb_poly_t *polygon;
+	int saveID;
+
+	/* move data to layer and clear attached struct */
+	polygon = pcb_poly_new(layer, 0, pcb_no_flags());
+	saveID = polygon->ID;
+	poly_copy_data(polygon, &pcb_crosshair.AttachedPolygon);
+	polygon->Clearance = 2 * conf_core.design.clearance;
+	polygon->ID = saveID;
+	PCB_FLAG_SET(PCB_FLAG_CLEARPOLY, polygon);
+	if (conf_core.editor.full_poly)
+		PCB_FLAG_SET(PCB_FLAG_FULLPOLY, polygon);
+	if (conf_core.editor.clear_polypoly)
+		PCB_FLAG_SET(PCB_FLAG_CLEARPOLYPOLY, polygon);
+
+	memset(&pcb_crosshair.AttachedPolygon, 0, sizeof(pcb_poly_t));
+
+	pcb_add_poly_on_layer(layer, polygon);
+
+	pcb_poly_init_clip(PCB->Data, layer, polygon);
+	pcb_poly_invalidate_draw(layer, polygon);
+	pcb_board_set_changed_flag(pcb_true);
+
+	/* reset state of attached line */
+	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+
+	/* add to undo list */
+	pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, polygon, polygon);
+	pcb_undo_inc_serial();
+}
+
+/* ---------------------------------------------------------------------------
+ * close polygon hole if possible
+ */
+void pcb_polygon_close_hole(void)
+{
+	pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+
+	/* check number of points */
+	if (n >= 3) {
+		/* if 45 degree lines are what we want do a quick check
+		 * if closing the polygon makes sense
+		 */
+		if (!conf_core.editor.all_direction_lines) {
+			pcb_coord_t dx, dy;
+
+			dx = coord_abs(pcb_crosshair.AttachedPolygon.Points[n - 1].X - pcb_crosshair.AttachedPolygon.Points[0].X);
+			dy = coord_abs(pcb_crosshair.AttachedPolygon.Points[n - 1].Y - pcb_crosshair.AttachedPolygon.Points[0].Y);
+			if (!(dx == 0 || dy == 0 || dx == dy)) {
+				pcb_message(PCB_MSG_ERROR, _("Cannot close polygon hole because 45 degree lines are requested.\n"));
+				return;
+			}
+		}
+		pcb_polygon_hole_create_from_attached();
+		pcb_draw();
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, _("A polygon hole has to have at least 3 points\n"));
+}
+
+/* ---------------------------------------------------------------------------
+ * creates a hole of attached polygon shape in the underneath polygon
+ */
+void pcb_polygon_hole_create_from_attached(void)
+{
+	pcb_polyarea_t *original, *new_hole, *result;
+	pcb_flag_t Flags;
+	
+	/* Create pcb_polyarea_ts from the original polygon
+	 * and the new hole polygon */
+	original = pcb_poly_from_poly((pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2);
+	new_hole = pcb_poly_from_poly(&pcb_crosshair.AttachedPolygon);
+
+	/* Subtract the hole from the original polygon shape */
+	pcb_polyarea_boolean_free(original, new_hole, &result, PCB_PBO_SUB);
+
+	/* Convert the resulting polygon(s) into a new set of nodes
+	 * and place them on the page. Delete the original polygon.
+	 */
+	pcb_undo_save_serial();
+	Flags = ((pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2)->Flags;
+	pcb_poly_to_polygons_on_layer(PCB->Data, (pcb_layer_t *) pcb_crosshair.AttachedObject.Ptr1, result, Flags);
+	pcb_remove_object(PCB_OBJ_POLY,
+							 pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3);
+	pcb_undo_restore_serial();
+	pcb_undo_inc_serial();
+
+	/* reset state of attached line */
+	memset(&pcb_crosshair.AttachedPolygon, 0, sizeof(pcb_poly_t));
+	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+}
+
+/* find polygon holes in range, then call the callback function for
+ * each hole. If the callback returns non-zero, stop
+ * the search.
+ */
+int
+pcb_poly_holes(pcb_poly_t * polygon, const pcb_box_t * range, int (*callback) (pcb_pline_t * contour, void *user_data), void *user_data)
+{
+	pcb_polyarea_t *pa = polygon->Clipped;
+	pcb_pline_t *pl;
+	/* If this hole is so big the polygon doesn't exist, then it's not
+	 * really a hole.
+	 */
+	if (!pa)
+		return 0;
+	for (pl = pa->contours->next; pl; pl = pl->next) {
+		if (range != NULL && (pl->xmin > range->X2 || pl->xmax < range->X1 || pl->ymin > range->Y2 || pl->ymax < range->Y1))
+			continue;
+		if (callback(pl, user_data)) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+struct plow_info {
+	int type;
+	void *ptr1, *ptr2;
+	pcb_layer_t *layer;
+	pcb_data_t *data;
+	pcb_r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_poly_t *, int, void *, void *);
+};
+
+static pcb_r_dir_t subtract_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2)
+{
+	if (!Polygon->Clipped)
+		return 0;
+	switch (type) {
+	case PCB_OBJ_PSTK:
+		SubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon);
+		Polygon->NoHolesValid = 0;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_LINE:
+		SubtractLine((pcb_line_t *) ptr2, Polygon);
+		Polygon->NoHolesValid = 0;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_ARC:
+		SubtractArc((pcb_arc_t *) ptr2, Polygon);
+		Polygon->NoHolesValid = 0;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_POLY:
+		if (ptr2 != Polygon) {
+			SubtractPolyPoly((pcb_poly_t *) ptr2, Polygon);
+			Polygon->NoHolesValid = 0;
+			return PCB_R_DIR_FOUND_CONTINUE;
+		}
+		break;
+	case PCB_OBJ_TEXT:
+		SubtractText((pcb_text_t *) ptr2, Polygon);
+		Polygon->NoHolesValid = 0;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t add_plow(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *ptr1, void *ptr2)
+{
+	switch (type) {
+	case PCB_OBJ_PSTK:
+		UnsubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_LINE:
+		UnsubtractLine((pcb_line_t *) ptr2, Layer, Polygon);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_ARC:
+		UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	case PCB_OBJ_POLY:
+		if (ptr2 != Polygon) {
+			UnsubtractPolyPoly((pcb_poly_t *) ptr2, Polygon);
+			return PCB_R_DIR_FOUND_CONTINUE;
+		}
+		break;
+	case PCB_OBJ_TEXT:
+		UnsubtractText((pcb_text_t *) ptr2, Layer, Polygon);
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+int pcb_poly_sub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj)
+{
+	if (subtract_plow(Data, Layer, Polygon, type, NULL, obj) == PCB_R_DIR_FOUND_CONTINUE)
+		return 0;
+	return -1;
+}
+
+int pcb_poly_unsub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj)
+{
+	if (add_plow(Data, Layer, Polygon, type, NULL, obj) == PCB_R_DIR_FOUND_CONTINUE)
+		return 0;
+	return -1;
+}
+
+
+static pcb_r_dir_t plow_callback(const pcb_box_t * b, void *cl)
+{
+	struct plow_info *plow = (struct plow_info *) cl;
+	pcb_poly_t *polygon = (pcb_poly_t *) b;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon))
+		return plow->callback(plow->data, plow->layer, polygon, plow->type, plow->ptr1, plow->ptr2);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* poly plows while clipping inhibit is on: mark any potentail polygon dirty */
+static pcb_r_dir_t poly_plows_inhibited_cb(pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2)
+{
+	poly->clip_dirty = 1;
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+
+int
+pcb_poly_plows(pcb_data_t * Data, int type, void *ptr1, void *ptr2,
+						 pcb_r_dir_t (*call_back) (pcb_data_t *data, pcb_layer_t *lay, pcb_poly_t *poly, int type, void *ptr1, void *ptr2))
+{
+	pcb_box_t sb = ((pcb_any_obj_t *) ptr2)->BoundingBox;
+	int r = 0, seen;
+	struct plow_info info;
+
+	if (Data->clip_inhibit > 0)
+		call_back = poly_plows_inhibited_cb;
+
+	info.type = type;
+	info.ptr1 = ptr1;
+	info.ptr2 = ptr2;
+	info.data = Data;
+	info.callback = call_back;
+	switch (type) {
+	case PCB_OBJ_PSTK:
+		if (Data->parent_type != PCB_PARENT_BOARD)
+			return 0;
+		if (ptr1 == NULL) { /* no layer specified: run on all layers */
+			LAYER_LOOP(Data, pcb_max_layer);
+			{
+				if (!(pcb_layer_flags_(layer) & PCB_LYT_COPPER))
+					continue;
+				r += pcb_poly_plows(Data, type, layer, ptr2, call_back);
+			}
+			PCB_END_LOOP;
+			return r;
+		}
+
+		/* run on the specified layer (ptr1), if there's any need for clearing */
+	/* ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */
+		if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_pstk_t *)ptr2))
+			return 0;
+		goto doit;
+	case PCB_OBJ_POLY:
+		if (!PCB_POLY_HAS_CLEARANCE((pcb_poly_t *) ptr2))
+			return 0;
+		goto doit;
+
+	case PCB_OBJ_LINE:
+	case PCB_OBJ_ARC:
+		/* the cast works equally well for lines and arcs */
+		if (!PCB_NONPOLY_HAS_CLEARANCE((pcb_line_t *) ptr2))
+			return 0;
+		goto doit;
+
+	case PCB_OBJ_TEXT:
+		/* text has no clearance property */
+		if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, (pcb_line_t *) ptr2))
+			return 0;
+		/* non-copper (e.g. silk, outline) doesn't plow */
+#warning TODO: use pcb_layer_flags_ here - but what PCB?
+		if (!(pcb_layer_flags(PCB, pcb_layer_id(Data, (pcb_layer_t *) ptr1) & PCB_LYT_COPPER)))
+			return 0;
+		doit:;
+		PCB_COPPER_GROUP_LOOP(Data, pcb_layer_get_group(PCB, pcb_layer_id(Data, ((pcb_layer_t *) ptr1))));
+		{
+			info.layer = layer;
+			pcb_r_search(layer->polygon_tree, &sb, NULL, plow_callback, &info, &seen);
+			r += seen;
+		}
+		PCB_END_LOOP;
+		break;
+	}
+	return r;
+}
+
+void pcb_poly_restore_to_poly(pcb_data_t * Data, int type, void *ptr1, void *ptr2)
+{
+	pcb_data_t *dt = Data;
+	while((dt != NULL) && (dt->parent_type == PCB_PARENT_SUBC))
+		dt = dt->parent.subc->parent.data;
+	if ((dt == NULL) || (dt->parent_type != PCB_PARENT_BOARD)) /* clear/restore only on boards */
+		return;
+	if (type == PCB_OBJ_POLY)
+		pcb_poly_init_clip(dt, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2);
+	pcb_poly_plows(dt, type, ptr1, ptr2, add_plow);
+}
+
+void pcb_poly_clear_from_poly(pcb_data_t * Data, int type, void *ptr1, void *ptr2)
+{
+	pcb_data_t *dt = Data;
+	while((dt != NULL) && (dt->parent_type == PCB_PARENT_SUBC))
+		dt = dt->parent.subc->parent.data;
+	if ((dt == NULL) || (dt->parent_type != PCB_PARENT_BOARD)) /* clear/restore only on boards */
+		return;
+	if (type == PCB_OBJ_POLY)
+		pcb_poly_init_clip(dt, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2);
+	pcb_poly_plows(dt, type, ptr1, ptr2, subtract_plow);
+}
+
+pcb_bool pcb_poly_isects_poly(pcb_polyarea_t * a, pcb_poly_t *p, pcb_bool fr)
+{
+	pcb_polyarea_t *x;
+	pcb_bool ans;
+	ans = pcb_polyarea_touching(a, p->Clipped);
+	/* argument may be register, so we must copy it */
+	x = a;
+	if (fr)
+		pcb_polyarea_free(&x);
+	return ans;
+}
+
+
+pcb_bool pcb_poly_is_point_in_p(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t r, pcb_poly_t *p)
+{
+	pcb_polyarea_t *c;
+	pcb_vector_t v;
+	v[0] = X;
+	v[1] = Y;
+	if (pcb_polyarea_contour_inside(p->Clipped, v))
+		return pcb_true;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, p)) {
+		pcb_poly_t tmp = *p;
+
+		/* Check all clipped-away regions that are now drawn because of full-poly */
+		for (tmp.Clipped = p->Clipped->f; tmp.Clipped != p->Clipped; tmp.Clipped = tmp.Clipped->f)
+			if (pcb_polyarea_contour_inside(tmp.Clipped, v))
+				return pcb_true;
+	}
+
+	if (r < 1)
+		return pcb_false;
+	if (!(c = pcb_poly_from_circle(X, Y, r)))
+		return pcb_false;
+	return pcb_poly_isects_poly(c, p, pcb_true);
+}
+
+
+pcb_bool pcb_poly_is_point_in_p_ignore_holes(pcb_coord_t X, pcb_coord_t Y, pcb_poly_t *p)
+{
+	pcb_vector_t v;
+	v[0] = X;
+	v[1] = Y;
+	return pcb_poly_contour_inside(p->Clipped->contours, v);
+}
+
+pcb_bool pcb_poly_is_rect_in_p(pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_poly_t *p)
+{
+	pcb_polyarea_t *s;
+	if (!(s = pcb_poly_from_rect(min(X1, X2), max(X1, X2), min(Y1, Y2), max(Y1, Y2))))
+		return pcb_false;
+	return pcb_poly_isects_poly(s, p, pcb_true);
+}
+
+#warning TODO: this should be in polygon1.c
+/* NB: This function will free the passed pcb_polyarea_t.
+ *     It must only be passed a single pcb_polyarea_t (pa->f == pa->b == pa)
+ */
+static void r_NoHolesPolygonDicer(pcb_polyarea_t * pa, void (*emit) (pcb_pline_t *, void *), void *user_data)
+{
+	pcb_pline_t *p = pa->contours;
+
+	if (!pa->contours->next) {		/* no holes */
+		pa->contours = NULL;				/* The callback now owns the contour */
+		/* Don't bother removing it from the pcb_polyarea_t's rtree
+		   since we're going to free the pcb_polyarea_t below anyway */
+		emit(p, user_data);
+		pcb_polyarea_free(&pa);
+		return;
+	}
+	else {
+		pcb_polyarea_t *poly2, *left, *right;
+
+		/* make a rectangle of the left region slicing through the middle of the first hole */
+		poly2 = pcb_poly_from_rect(p->xmin, (p->next->xmin + p->next->xmax) / 2, p->ymin, p->ymax);
+		pcb_polyarea_and_subtract_free(pa, poly2, &left, &right);
+		if (left) {
+			pcb_polyarea_t *cur, *next;
+			cur = left;
+			do {
+				next = cur->f;
+				cur->f = cur->b = cur;	/* Detach this polygon piece */
+				r_NoHolesPolygonDicer(cur, emit, user_data);
+				/* NB: The pcb_polyarea_t was freed by its use in the recursive dicer */
+			}
+			while ((cur = next) != left);
+		}
+		if (right) {
+			pcb_polyarea_t *cur, *next;
+			cur = right;
+			do {
+				next = cur->f;
+				cur->f = cur->b = cur;	/* Detach this polygon piece */
+				r_NoHolesPolygonDicer(cur, emit, user_data);
+				/* NB: The pcb_polyarea_t was freed by its use in the recursive dicer */
+			}
+			while ((cur = next) != right);
+		}
+	}
+}
+
+void pcb_poly_no_holes_dicer(pcb_poly_t *p, const pcb_box_t * clip, void (*emit) (pcb_pline_t *, void *), void *user_data)
+{
+	pcb_polyarea_t *main_contour, *cur, *next;
+
+	main_contour = pcb_polyarea_create();
+	/* copy the main poly only */
+	pcb_polyarea_copy1(main_contour, p->Clipped);
+	/* clip to the bounding box */
+	if (clip) {
+		pcb_polyarea_t *cbox = pcb_poly_from_rect(clip->X1, clip->X2, clip->Y1, clip->Y2);
+		pcb_polyarea_boolean_free(main_contour, cbox, &main_contour, PCB_PBO_ISECT);
+	}
+	if (main_contour == NULL)
+		return;
+	/* Now dice it up.
+	 * NB: Could be more than one piece (because of the clip above)
+	 */
+	cur = main_contour;
+	do {
+		next = cur->f;
+		cur->f = cur->b = cur;			/* Detach this polygon piece */
+		r_NoHolesPolygonDicer(cur, emit, user_data);
+		/* NB: The pcb_polyarea_t was freed by its use in the recursive dicer */
+	}
+	while ((cur = next) != main_contour);
+}
+
+/* make a polygon split into multiple parts into multiple polygons */
+pcb_bool pcb_poly_morph(pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	pcb_polyarea_t *p, *start;
+	pcb_bool many = pcb_false;
+	pcb_flag_t flags;
+
+	if (!poly->Clipped || PCB_FLAG_TEST(PCB_FLAG_LOCK, poly))
+		return pcb_false;
+	if (poly->Clipped->f == poly->Clipped)
+		return pcb_false;
+	pcb_poly_invalidate_erase(poly);
+	start = p = poly->Clipped;
+	/* This is ugly. The creation of the new polygons can cause
+	 * all of the polygon pointers (including the one we're called
+	 * with to change if there is a realloc in pcb_poly_alloc().
+	 * That will invalidate our original "poly" argument, potentially
+	 * inside the loop. We need to steal the Clipped pointer and
+	 * hide it from the Remove call so that it still exists while
+	 * we do this dirty work.
+	 */
+	poly->Clipped = NULL;
+	if (poly->NoHoles)
+		printf("Just leaked in MorpyPolygon\n");
+	poly->NoHoles = NULL;
+	flags = poly->Flags;
+	pcb_poly_remove(layer, poly);
+	inhibit = pcb_true;
+	do {
+		pcb_vnode_t *v;
+		pcb_poly_t *newone;
+
+		if (p->contours->area > conf_core.design.poly_isle_area) {
+			newone = pcb_poly_new(layer, poly->Clearance, flags);
+			if (!newone)
+				return pcb_false;
+			many = pcb_true;
+			v = &p->contours->head;
+			pcb_poly_point_new(newone, v->point[0], v->point[1]);
+			for (v = v->next; v != &p->contours->head; v = v->next)
+				pcb_poly_point_new(newone, v->point[0], v->point[1]);
+			newone->BoundingBox.X1 = p->contours->xmin;
+			newone->BoundingBox.X2 = p->contours->xmax + 1;
+			newone->BoundingBox.Y1 = p->contours->ymin;
+			newone->BoundingBox.Y2 = p->contours->ymax + 1;
+			pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, newone, newone);
+			newone->Clipped = p;
+			p = p->f;									/* go to next pline */
+			newone->Clipped->b = newone->Clipped->f = newone->Clipped;	/* unlink from others */
+			pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *) newone);
+			pcb_poly_invalidate_draw(layer, newone);
+		}
+		else {
+			pcb_polyarea_t *t = p;
+
+			p = p->f;
+			pcb_poly_contour_del(&t->contours);
+			free(t);
+		}
+	}
+	while (p != start);
+	inhibit = pcb_false;
+	pcb_undo_inc_serial();
+	return many;
+}
+
+void debug_pline(pcb_pline_t * pl)
+{
+	pcb_vnode_t *v;
+	pcb_fprintf(stderr, "\txmin %#mS xmax %#mS ymin %#mS ymax %#mS\n", pl->xmin, pl->xmax, pl->ymin, pl->ymax);
+	v = &pl->head;
+	while (v) {
+		pcb_fprintf(stderr, "\t\tvnode: %#mD\n", v->point[0], v->point[1]);
+		v = v->next;
+		if (v == &pl->head)
+			break;
+	}
+}
+
+void debug_polyarea(pcb_polyarea_t * p)
+{
+	pcb_pline_t *pl;
+
+	fprintf(stderr, "pcb_polyarea_t %p\n", (void *)p);
+	for (pl = p->contours; pl; pl = pl->next)
+		debug_pline(pl);
+}
+
+void debug_polygon(pcb_poly_t * p)
+{
+	pcb_cardinal_t i;
+	pcb_polyarea_t *pa;
+	fprintf(stderr, "POLYGON %p  %d pts\n", (void *)p, p->PointN);
+	for (i = 0; i < p->PointN; i++)
+		pcb_fprintf(stderr, "\t%d: %#mD\n", i, p->Points[i].X, p->Points[i].Y);
+	if (p->HoleIndexN) {
+		fprintf(stderr, "%d holes, starting at indices\n", p->HoleIndexN);
+		for (i = 0; i < p->HoleIndexN; i++)
+			fprintf(stderr, "\t%d: %d\n", i, p->HoleIndex[i]);
+	}
+	else
+		fprintf(stderr, "it has no holes\n");
+	pa = p->Clipped;
+	while (pa) {
+		debug_polyarea(pa);
+		pa = pa->f;
+		if (pa == p->Clipped)
+			break;
+	}
+}
+
+/* Convert a pcb_polyarea_t (and all linked pcb_polyarea_t) to
+ * raw PCB polygons on the given layer.
+ */
+void pcb_poly_to_polygons_on_layer(pcb_data_t * Destination, pcb_layer_t * Layer, pcb_polyarea_t * Input, pcb_flag_t Flags)
+{
+	pcb_poly_t *Polygon;
+	pcb_polyarea_t *pa;
+	pcb_pline_t *pline;
+	pcb_vnode_t *node;
+	pcb_bool outer;
+
+	if (Input == NULL)
+		return;
+
+	pa = Input;
+	do {
+		Polygon = pcb_poly_new(Layer, 2 * conf_core.design.clearance, Flags);
+
+		pline = pa->contours;
+		outer = pcb_true;
+
+		do {
+			if (!outer)
+				pcb_poly_hole_new(Polygon);
+			outer = pcb_false;
+
+			node = &pline->head;
+			do {
+				pcb_poly_point_new(Polygon, node->point[0], node->point[1]);
+			}
+			while ((node = node->next) != &pline->head);
+
+		}
+		while ((pline = pline->next) != NULL);
+
+		pcb_poly_init_clip(Destination, Layer, Polygon);
+		pcb_poly_bbox(Polygon);
+		if (!Layer->polygon_tree)
+			Layer->polygon_tree = pcb_r_create_tree();
+		pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+
+		pcb_poly_invalidate_draw(Layer, Polygon);
+		/* add to undo list */
+		pcb_undo_add_obj_to_create(PCB_OBJ_POLY, Layer, Polygon, Polygon);
+	}
+	while ((pa = pa->f) != Input);
+
+	pcb_board_set_changed_flag(pcb_true);
+}
+
+pcb_bool pcb_pline_is_rectangle(pcb_pline_t *pl)
+{
+	int n;
+	pcb_coord_t x[4], y[4];
+	pcb_vnode_t *v;
+
+	v = pl->head.next;
+	n = 0;
+	do {
+		x[n] = v->point[0];
+		y[n] = v->point[1];
+		n++;
+		v = v->next;
+	} while((n < 4) && (v != pl->head.next));
+	
+	if (n != 4)
+		return pcb_false;
+
+	if (sqr(x[0] - x[2]) + sqr(y[0] - y[2]) == sqr(x[1] - x[3]) + sqr(y[1] - y[3]))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+#include "polygon_offs.c"
Index: tags/2.0.1/src/polygon.h
===================================================================
--- tags/2.0.1/src/polygon.h	(nonexistent)
+++ tags/2.0.1/src/polygon.h	(revision 18980)
@@ -0,0 +1,127 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* High level polygon support: pcb-specific polygon operations on complex
+   polygon objects with islands and holes */
+
+#ifndef	PCB_POLYGON_H
+#define	PCB_POLYGON_H
+
+#include "config.h"
+#include "flag.h"
+#include "rtree.h"
+#include "math_helper.h"
+#include "polyarea.h"
+
+/* Implementation constants */
+
+#define PCB_POLY_CIRC_SEGS 40
+#define PCB_POLY_CIRC_SEGS_F ((float)PCB_POLY_CIRC_SEGS)
+
+/* adjustment to make the segments outline the circle rather than connect
+ * points on the circle: 1 - cos (\alpha / 2) < (\alpha / 2) ^ 2 / 2
+ */
+#define PCB_POLY_CIRC_RADIUS_ADJ (1.0 + M_PI / PCB_POLY_CIRC_SEGS_F * \
+                                    M_PI / PCB_POLY_CIRC_SEGS_F / 2.0)
+
+/* polygon diverges from modelled arc no more than MAX_ARC_DEVIATION * thick */
+#define PCB_POLY_ARC_MAX_DEVIATION 0.02
+
+/* Prototypes */
+
+void pcb_polygon_init(void);
+pcb_cardinal_t pcb_poly_point_idx(pcb_poly_t *polygon, pcb_point_t *point);
+pcb_cardinal_t pcb_poly_contour_point(pcb_poly_t *polygon, pcb_cardinal_t point);
+pcb_cardinal_t pcb_poly_contour_prev_point(pcb_poly_t *polygon, pcb_cardinal_t point);
+pcb_cardinal_t pcb_poly_contour_next_point(pcb_poly_t *polygon, pcb_cardinal_t point);
+pcb_cardinal_t pcb_poly_get_lowest_distance_point(pcb_poly_t *, pcb_coord_t, pcb_coord_t);
+pcb_bool pcb_poly_remove_excess_points(pcb_layer_t *, pcb_poly_t *);
+void pcb_polygon_go_to_prev_point(void); /* undo */
+void pcb_polygon_go_to_next_point(void); /* redo */
+void pcb_polygon_close_poly(void);
+void pcb_polygon_copy_attached_to_layer(void);
+void pcb_polygon_close_hole(void);
+void pcb_polygon_hole_create_from_attached(void);
+int pcb_poly_holes(pcb_poly_t * ptr, const pcb_box_t * range, int (*callback) (pcb_pline_t *, void *user_data), void *user_data);
+int pcb_poly_plows(pcb_data_t *, int, void *, void *,
+								 pcb_r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, pcb_poly_t *, int, void *, void *));
+void pcb_poly_compute_no_holes(pcb_poly_t * poly);
+
+/* helpers: create complex shaped polygons */
+pcb_polyarea_t *pcb_poly_from_contour(pcb_pline_t *);
+pcb_polyarea_t *pcb_poly_from_poly(pcb_poly_t *);
+pcb_polyarea_t *pcb_poly_from_rect(pcb_coord_t x1, pcb_coord_t x2, pcb_coord_t y1, pcb_coord_t y2);
+pcb_polyarea_t *pcb_poly_from_circle(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius);
+pcb_polyarea_t *pcb_poly_from_octagon(pcb_coord_t x, pcb_coord_t y, pcb_coord_t radius, int style);
+pcb_polyarea_t *pcb_poly_from_line(pcb_line_t * l, pcb_coord_t thick);
+pcb_polyarea_t *pcb_poly_from_arc(pcb_arc_t * l, pcb_coord_t thick);
+pcb_polyarea_t *pcb_poly_from_box_bloated(pcb_box_t * box, pcb_coord_t radius);
+pcb_polyarea_t *pcb_poly_clearance_construct(pcb_poly_t *subpoly); /* clearance shape for when clearpolypoly is set */
+
+
+void pcb_poly_frac_circle(pcb_pline_t *, pcb_coord_t, pcb_coord_t, pcb_vector_t, int);
+int pcb_poly_init_clip(pcb_data_t * d, pcb_layer_t * l, pcb_poly_t * p);
+void pcb_poly_restore_to_poly(pcb_data_t *, int, void *, void *);
+void pcb_poly_clear_from_poly(pcb_data_t *, int, void *, void *);
+
+/* Same as pcb_poly_init_clip() but also call cb before each operation,
+   giving the caller a chance to draw a progress bar */
+int pcb_poly_init_clip_prog(pcb_data_t *Data, pcb_layer_t *layer, pcb_poly_t *p, void (*cb)(void *ctx), void *ctx);
+
+/* Return the number of subtractions that have to be executed by a
+   pcb_poly_init_clip() on the given polygon */
+pcb_cardinal_t pcb_poly_num_clears(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *polygon);
+
+
+pcb_bool pcb_poly_is_point_in_p(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_poly_t *);
+pcb_bool pcb_poly_is_point_in_p_ignore_holes(pcb_coord_t, pcb_coord_t, pcb_poly_t *);
+pcb_bool_t pcb_is_point_in_convex_quad(pcb_vector_t p, pcb_vector_t *q);
+pcb_bool pcb_poly_is_rect_in_p(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_poly_t *);
+pcb_bool pcb_poly_isects_poly(pcb_polyarea_t *, pcb_poly_t *, pcb_bool);
+pcb_bool pcb_pline_isect_line(pcb_pline_t *pl, pcb_coord_t lx1, pcb_coord_t ly1, pcb_coord_t lx2, pcb_coord_t ly2, pcb_coord_t *cx, pcb_coord_t *cy);
+pcb_bool pcb_pline_isect_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r); /* cirlce contour crosses polyline contour */
+pcb_bool pcb_pline_embraces_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r); /* circle is within the polyline; caller must make sure they do not cross! */
+pcb_bool pcb_pline_overlaps_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r); /* circle is within or is crossing the polyline */
+pcb_bool pcb_poly_morph(pcb_layer_t *, pcb_poly_t *);
+void pcb_poly_no_holes_dicer(pcb_poly_t * p, const pcb_box_t * clip, void (*emit) (pcb_pline_t *, void *), void *user_data);
+void pcb_poly_to_polygons_on_layer(pcb_data_t *, pcb_layer_t *, pcb_polyarea_t *, pcb_flag_t);
+
+void pcb_poly_square_pin_factors(int style, double *xm, double *ym);
+
+pcb_bool pcb_pline_is_rectangle(pcb_pline_t *pl);
+
+/* clear np1 from the polygon; also free np1 if fnp is true. Returns 1 on
+   success. */
+int pcb_poly_subtract(pcb_polyarea_t *np1, pcb_poly_t *p, pcb_bool fnp);
+
+/* Subtract or unsubtract obj from poly; Layer is used for looking up thermals */
+int pcb_poly_sub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj);
+int pcb_poly_unsub_obj(pcb_data_t *Data, pcb_layer_t *Layer, pcb_poly_t *Polygon, int type, void *obj);
+
+
+#endif
Index: tags/2.0.1/src/polygon1.c
===================================================================
--- tags/2.0.1/src/polygon1.c	(nonexistent)
+++ tags/2.0.1/src/polygon1.c	(revision 18980)
@@ -0,0 +1,3568 @@
+/*
+       polygon clipping functions. harry eaton implemented the algorithm
+       described in "A Closed Set of Algorithms for Performing Set
+       Operations on Polygonal Regions in the Plane" which the original
+       code did not do. I also modified it for integer coordinates
+       and faster computation. The license for this modified copy was
+       switched to the GPL per term (3) of the original LGPL license.
+       Copyright (C) 2006 harry eaton
+ 
+   based on:
+       poly_Boolean: a polygon clip library
+       Copyright (C) 1997  Alexey Nikitin, Michael Leonov
+       (also the authors of the paper describing the actual algorithm)
+       leonov@propro.iis.nsk.su
+
+   in turn based on:
+       nclip: a polygon clip library
+       Copyright (C) 1993  Klamer Schutte
+ 
+       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 2 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, write to the Free
+       Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+      polygon1.c
+      (C) 1997 Alexey Nikitin, Michael Leonov
+      (C) 1993 Klamer Schutte
+
+      all cases where original (Klamer Schutte) code is present
+      are marked
+*/
+
+#include	<assert.h>
+#include	<stdlib.h>
+#include	<stdio.h>
+#include	<setjmp.h>
+#include	<string.h>
+
+#include "config.h"
+#include "rtree.h"
+#include "math_helper.h"
+#include "heap.h"
+#include "compat_cc.h"
+#include "pcb-printf.h"
+#include "polyarea.h"
+#include "obj_common.h"
+#include "macro.h"
+#include "box.h"
+
+
+#define ROUND(a) (long)((a) > 0 ? ((a) + 0.5) : ((a) - 0.5))
+
+#define EPSILON (1E-8)
+#define IsZero(a, b) (fabs((a) - (b)) < EPSILON)
+
+#undef min
+#undef max
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
+
+/*********************************************************************/
+/*              L o n g   V e c t o r   S t u f f                    */
+/*********************************************************************/
+
+#define Vcopy(a,b) {(a)[0]=(b)[0];(a)[1]=(b)[1];}
+int vect_equal(pcb_vector_t v1, pcb_vector_t v2);
+void vect_init(pcb_vector_t v, double x, double y);
+void vect_sub(pcb_vector_t res, pcb_vector_t v2, pcb_vector_t v3);
+
+void vect_min(pcb_vector_t res, pcb_vector_t v2, pcb_vector_t v3);
+void vect_max(pcb_vector_t res, pcb_vector_t v2, pcb_vector_t v3);
+
+double pcb_vect_dist2(pcb_vector_t v1, pcb_vector_t v2);
+double pcb_vect_det2(pcb_vector_t v1, pcb_vector_t v2);
+double pcb_vect_len2(pcb_vector_t v1);
+
+int pcb_vect_inters2(pcb_vector_t A, pcb_vector_t B, pcb_vector_t C, pcb_vector_t D, pcb_vector_t S1, pcb_vector_t S2);
+
+/* note that a vertex v's Flags.status represents the edge defined by
+ * v to v->next (i.e. the edge is forward of v)
+ */
+#define ISECTED 3
+#define UNKNWN  0
+#define INSIDE  1
+#define OUTSIDE 2
+#define SHARED 3
+#define SHARED2 4
+
+#define TOUCHES 99
+
+#define NODE_LABEL(n)  ((n)->Flags.status)
+#define LABEL_NODE(n,l) ((n)->Flags.status = (l))
+
+#define error(code)  longjmp(*(e), code)
+
+#define MemGet(ptr, type) \
+  if (PCB_UNLIKELY(((ptr) = (type *)malloc(sizeof(type))) == NULL))	\
+    error(pcb_err_no_memory);
+
+#undef DEBUG_LABEL
+#undef DEBUG_ALL_LABELS
+#undef DEBUG_JUMP
+#undef DEBUG_GATHER
+#undef DEBUG_ANGLE
+#undef DEBUG
+
+#ifndef NDEBUG
+#include <stdarg.h>
+PCB_INLINE void DEBUGP(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	pcb_vfprintf(stderr, fmt, ap);
+	va_end(ap);
+}
+#else
+PCB_INLINE void DEBUGP(const char *fmt, ...) { }
+#endif
+
+/* ///////////////////////////////////////////////////////////////////////////// * /
+/ *  2-Dimensional stuff
+/ * ///////////////////////////////////////////////////////////////////////////// */
+
+#define Vsub2(r,a,b)	{(r)[0] = (a)[0] - (b)[0]; (r)[1] = (a)[1] - (b)[1];}
+#define Vadd2(r,a,b)	{(r)[0] = (a)[0] + (b)[0]; (r)[1] = (a)[1] + (b)[1];}
+#define Vsca2(r,a,s)	{(r)[0] = (a)[0] * (s); (r)[1] = (a)[1] * (s);}
+#define Vcpy2(r,a)		{(r)[0] = (a)[0]; (r)[1] = (a)[1];}
+#define Vequ2(a,b)		((a)[0] == (b)[0] && (a)[1] == (b)[1])
+#define Vadds(r,a,b,s)	{(r)[0] = ((a)[0] + (b)[0]) * (s); (r)[1] = ((a)[1] + (b)[1]) * (s);}
+#define Vswp2(a,b) { long t; \
+	t = (a)[0], (a)[0] = (b)[0], (b)[0] = t; \
+	t = (a)[1], (a)[1] = (b)[1], (b)[1] = t; \
+}
+
+#ifdef DEBUG
+static char *theState(pcb_vnode_t * v);
+
+static void pline_dump(pcb_vnode_t * v)
+{
+	pcb_vnode_t *s, *n;
+
+	s = v;
+	do {
+		n = v->next;
+		pcb_fprintf(stderr, "Line [%#mS %#mS %#mS %#mS 10 10 \"%s\"]\n",
+								v->point[0], v->point[1], n->point[0], n->point[1], theState(v));
+	}
+	while ((v = v->next) != s);
+}
+
+static void poly_dump(pcb_polyarea_t * p)
+{
+	pcb_polyarea_t *f = p;
+	pcb_pline_t *pl;
+
+	do {
+		pl = p->contours;
+		do {
+			pline_dump(&pl->head);
+			fprintf(stderr, "NEXT pcb_pline_t\n");
+		}
+		while ((pl = pl->next) != NULL);
+		fprintf(stderr, "NEXT POLY\n");
+	}
+	while ((p = p->f) != f);
+}
+#endif
+
+/***************************************************************/
+/* routines for processing intersections */
+
+/*
+node_add
+ (C) 1993 Klamer Schutte
+ (C) 1997 Alexey Nikitin, Michael Leonov
+ (C) 2006 harry eaton
+
+ returns a bit field in new_point that indicates where the
+ point was.
+ 1 means a new node was created and inserted
+ 4 means the intersection was not on the dest point
+*/
+static pcb_vnode_t *node_add_single(pcb_vnode_t * dest, pcb_vector_t po)
+{
+	pcb_vnode_t *p;
+
+	if (vect_equal(po, dest->point))
+		return dest;
+	if (vect_equal(po, dest->next->point))
+		return dest->next;
+	p = pcb_poly_node_create(po);
+	if (p == NULL)
+		return NULL;
+	p->cvc_prev = p->cvc_next = NULL;
+	p->Flags.status = UNKNWN;
+	return p;
+}																/* node_add */
+
+#define ISECT_BAD_PARAM (-1)
+#define ISECT_NO_MEMORY (-2)
+
+
+/*
+new_descriptor
+  (C) 2006 harry eaton
+*/
+static pcb_cvc_list_t *new_descriptor(pcb_vnode_t * a, char poly, char side)
+{
+	pcb_cvc_list_t *l = (pcb_cvc_list_t *) malloc(sizeof(pcb_cvc_list_t));
+	pcb_vector_t v;
+	register double ang, dx, dy;
+
+	if (!l)
+		return NULL;
+	l->head = NULL;
+	l->parent = a;
+	l->poly = poly;
+	l->side = side;
+	l->next = l->prev = l;
+	if (side == 'P')							/* previous */
+		vect_sub(v, a->prev->point, a->point);
+	else													/* next */
+		vect_sub(v, a->next->point, a->point);
+	/* Uses slope/(slope+1) in quadrant 1 as a proxy for the angle.
+	 * It still has the same monotonic sort result
+	 * and is far less expensive to compute than the real angle.
+	 */
+	if (vect_equal(v, vect_zero)) {
+		if (side == 'P') {
+			if (a->prev->cvc_prev == (pcb_cvc_list_t *) - 1)
+				a->prev->cvc_prev = a->prev->cvc_next = NULL;
+			pcb_poly_vertex_exclude(a->prev);
+			vect_sub(v, a->prev->point, a->point);
+		}
+		else {
+			if (a->next->cvc_prev == (pcb_cvc_list_t *) - 1)
+				a->next->cvc_prev = a->next->cvc_next = NULL;
+			pcb_poly_vertex_exclude(a->next);
+			vect_sub(v, a->next->point, a->point);
+		}
+	}
+	assert(!vect_equal(v, vect_zero));
+	dx = fabs((double) v[0]);
+	dy = fabs((double) v[1]);
+	ang = dy / (dy + dx);
+	/* now move to the actual quadrant */
+	if (v[0] < 0 && v[1] >= 0)
+		ang = 2.0 - ang;						/* 2nd quadrant */
+	else if (v[0] < 0 && v[1] < 0)
+		ang += 2.0;									/* 3rd quadrant */
+	else if (v[0] >= 0 && v[1] < 0)
+		ang = 4.0 - ang;						/* 4th quadrant */
+	l->angle = ang;
+	assert(ang >= 0.0 && ang <= 4.0);
+#ifdef DEBUG_ANGLE
+	DEBUGP("node on %c at %#mD assigned angle %g on side %c\n", poly, a->point[0], a->point[1], ang, side);
+#endif
+	return l;
+}
+
+/*
+insert_descriptor
+  (C) 2006 harry eaton
+
+   argument a is a cross-vertex node.
+   argument poly is the polygon it comes from ('A' or 'B')
+   argument side is the side this descriptor goes on ('P' for previous
+   'N' for next.
+   argument start is the head of the list of cvclists
+*/
+static pcb_cvc_list_t *insert_descriptor(pcb_vnode_t * a, char poly, char side, pcb_cvc_list_t * start)
+{
+	pcb_cvc_list_t *l, *newone, *big, *small;
+
+	if (!(newone = new_descriptor(a, poly, side)))
+		return NULL;
+	/* search for the pcb_cvc_list_t for this point */
+	if (!start) {
+		start = newone;							/* return is also new, so we know where start is */
+		start->head = newone;				/* circular list */
+		return newone;
+	}
+	else {
+		l = start;
+		do {
+			assert(l->head);
+			if (l->parent->point[0] == a->point[0]
+					&& l->parent->point[1] == a->point[1]) {	/* this pcb_cvc_list_t is at our point */
+				start = l;
+				newone->head = l->head;
+				break;
+			}
+			if (l->head->parent->point[0] == start->parent->point[0]
+					&& l->head->parent->point[1] == start->parent->point[1]) {
+				/* this seems to be a new point */
+				/* link this cvclist to the list of all cvclists */
+				for (; l->head != newone; l = l->next)
+					l->head = newone;
+				newone->head = start;
+				return newone;
+			}
+			l = l->head;
+		}
+		while (1);
+	}
+	assert(start);
+	l = big = small = start;
+	do {
+		if (l->next->angle < l->angle) {	/* find start/end of list */
+			small = l->next;
+			big = l;
+		}
+		else if (newone->angle >= l->angle && newone->angle <= l->next->angle) {
+			/* insert new cvc if it lies between existing points */
+			newone->prev = l;
+			newone->next = l->next;
+			l->next = l->next->prev = newone;
+			return newone;
+		}
+	}
+	while ((l = l->next) != start);
+	/* didn't find it between points, it must go on an end */
+	if (big->angle <= newone->angle) {
+		newone->prev = big;
+		newone->next = big->next;
+		big->next = big->next->prev = newone;
+		return newone;
+	}
+	assert(small->angle >= newone->angle);
+	newone->next = small;
+	newone->prev = small->prev;
+	small->prev = small->prev->next = newone;
+	return newone;
+}
+
+/*
+node_add_point
+ (C) 1993 Klamer Schutte
+ (C) 1997 Alexey Nikitin, Michael Leonov
+
+ return 1 if new node in b, 2 if new node in a and 3 if new node in both
+*/
+
+static pcb_vnode_t *node_add_single_point(pcb_vnode_t * a, pcb_vector_t p)
+{
+	pcb_vnode_t *next_a, *new_node;
+
+	next_a = a->next;
+
+	new_node = node_add_single(a, p);
+	assert(new_node != NULL);
+
+	new_node->cvc_prev = new_node->cvc_next = (pcb_cvc_list_t *) - 1;
+
+	if (new_node == a || new_node == next_a)
+		return NULL;
+
+	return new_node;
+}																/* node_add_point */
+
+/*
+node_label
+ (C) 2006 harry eaton
+*/
+static unsigned int node_label(pcb_vnode_t * pn)
+{
+	pcb_cvc_list_t *first_l, *l;
+	char this_poly;
+	int region = UNKNWN;
+
+	assert(pn);
+	assert(pn->cvc_next);
+	this_poly = pn->cvc_next->poly;
+	/* search counter-clockwise in the cross vertex connectivity (CVC) list
+	 *
+	 * check for shared edges (that could be prev or next in the list since the angles are equal)
+	 * and check if this edge (pn -> pn->next) is found between the other poly's entry and exit
+	 */
+	if (pn->cvc_next->angle == pn->cvc_next->prev->angle)
+		l = pn->cvc_next->prev;
+	else
+		l = pn->cvc_next->next;
+
+	first_l = l;
+	while ((l->poly == this_poly) && (l != first_l->prev))
+		l = l->next;
+	assert(l->poly != this_poly);
+
+	assert(l && l->angle >= 0 && l->angle <= 4.0);
+	if (l->poly != this_poly) {
+		if (l->side == 'P') {
+			if (l->parent->prev->point[0] == pn->next->point[0] && l->parent->prev->point[1] == pn->next->point[1]) {
+				region = SHARED2;
+				pn->shared = l->parent->prev;
+			}
+			else
+				region = INSIDE;
+		}
+		else {
+			if (l->angle == pn->cvc_next->angle) {
+				assert(l->parent->next->point[0] == pn->next->point[0] && l->parent->next->point[1] == pn->next->point[1]);
+				region = SHARED;
+				pn->shared = l->parent;
+			}
+			else
+				region = OUTSIDE;
+		}
+	}
+	if (region == UNKNWN) {
+		for (l = l->next; l != pn->cvc_next; l = l->next) {
+			if (l->poly != this_poly) {
+				if (l->side == 'P')
+					region = INSIDE;
+				else
+					region = OUTSIDE;
+				break;
+			}
+		}
+	}
+	assert(region != UNKNWN);
+	assert(NODE_LABEL(pn) == UNKNWN || NODE_LABEL(pn) == region);
+	LABEL_NODE(pn, region);
+	if (region == SHARED || region == SHARED2)
+		return UNKNWN;
+	return region;
+}																/* node_label */
+
+/*
+ add_descriptors
+ (C) 2006 harry eaton
+*/
+static pcb_cvc_list_t *add_descriptors(pcb_pline_t * pl, char poly, pcb_cvc_list_t * list)
+{
+	pcb_vnode_t *node = &pl->head;
+
+	do {
+		if (node->cvc_prev) {
+			assert(node->cvc_prev == (pcb_cvc_list_t *) - 1 && node->cvc_next == (pcb_cvc_list_t *) - 1);
+			list = node->cvc_prev = insert_descriptor(node, poly, 'P', list);
+			if (!node->cvc_prev)
+				return NULL;
+			list = node->cvc_next = insert_descriptor(node, poly, 'N', list);
+			if (!node->cvc_next)
+				return NULL;
+		}
+	}
+	while ((node = node->next) != &pl->head);
+	return list;
+}
+
+static inline void cntrbox_adjust(pcb_pline_t * c, pcb_vector_t p)
+{
+	c->xmin = min(c->xmin, p[0]);
+	c->xmax = max(c->xmax, p[0] + 1);
+	c->ymin = min(c->ymin, p[1]);
+	c->ymax = max(c->ymax, p[1] + 1);
+}
+
+/* some structures for handling segment intersections using the rtrees */
+
+typedef struct seg {
+	pcb_box_t box;
+	pcb_vnode_t *v;
+	pcb_pline_t *p;
+	int intersected;
+} seg;
+
+typedef struct _insert_node_task insert_node_task;
+
+struct _insert_node_task {
+	insert_node_task *next;
+	seg *node_seg;
+	pcb_vnode_t *new_node;
+};
+
+typedef struct info {
+	double m, b;
+	pcb_rtree_t *tree;
+	pcb_vnode_t *v;
+	struct seg *s;
+	jmp_buf *env, sego, *touch;
+	int need_restart;
+	insert_node_task *node_insert_list;
+} info;
+
+typedef struct contour_info {
+	pcb_pline_t *pa;
+	jmp_buf restart;
+	jmp_buf *getout;
+	int need_restart;
+	insert_node_task *node_insert_list;
+} contour_info;
+
+
+/*
+ * adjust_tree()
+ * (C) 2006 harry eaton
+ * This replaces the segment in the tree with the two new segments after
+ * a vertex has been added
+ */
+static int adjust_tree(pcb_rtree_t * tree, struct seg *s)
+{
+	struct seg *q;
+
+	q = (seg *) malloc(sizeof(struct seg));
+	if (!q)
+		return 1;
+	q->intersected = 0;
+	q->v = s->v;
+	q->p = s->p;
+	q->box.X1 = min(q->v->point[0], q->v->next->point[0]);
+	q->box.X2 = max(q->v->point[0], q->v->next->point[0]) + 1;
+	q->box.Y1 = min(q->v->point[1], q->v->next->point[1]);
+	q->box.Y2 = max(q->v->point[1], q->v->next->point[1]) + 1;
+	pcb_r_insert_entry(tree, (const pcb_box_t *) q);
+	q = (seg *) malloc(sizeof(struct seg));
+	if (!q)
+		return 1;
+	q->intersected = 0;
+	q->v = s->v->next;
+	q->p = s->p;
+	q->box.X1 = min(q->v->point[0], q->v->next->point[0]);
+	q->box.X2 = max(q->v->point[0], q->v->next->point[0]) + 1;
+	q->box.Y1 = min(q->v->point[1], q->v->next->point[1]);
+	q->box.Y2 = max(q->v->point[1], q->v->next->point[1]) + 1;
+	pcb_r_insert_entry(tree, (const pcb_box_t *) q);
+	pcb_r_delete_entry(tree, (const pcb_box_t *) s);
+	free(s);
+	return 0;
+}
+
+/*
+ * seg_in_region()
+ * (C) 2006, harry eaton
+ * This prunes the search for boxes that don't intersect the segment.
+ */
+static pcb_r_dir_t seg_in_region(const pcb_box_t * b, void *cl)
+{
+	struct info *i = (struct info *) cl;
+	double y1, y2;
+	/* for zero slope the search is aligned on the axis so it is already pruned */
+	if (i->m == 0.)
+		return PCB_R_DIR_FOUND_CONTINUE;
+	y1 = i->m * b->X1 + i->b;
+	y2 = i->m * b->X2 + i->b;
+	if (min(y1, y2) >= b->Y2)
+		return PCB_R_DIR_NOT_FOUND;
+	if (max(y1, y2) < b->Y1)
+		return PCB_R_DIR_NOT_FOUND;
+	return PCB_R_DIR_FOUND_CONTINUE;											/* might intersect */
+}
+
+/* Prepend a deferred node-insertion task to a list */
+static insert_node_task *prepend_insert_node_task(insert_node_task * list, seg * seg, pcb_vnode_t * new_node)
+{
+	insert_node_task *task = (insert_node_task *) malloc(sizeof(*task));
+	task->node_seg = seg;
+	task->new_node = new_node;
+	task->next = list;
+	return task;
+}
+
+/*
+ * seg_in_seg()
+ * (C) 2006 harry eaton
+ * This routine checks if the segment in the tree intersect the search segment.
+ * If it does, the plines are marked as intersected and the point is marked for
+ * the cvclist. If the point is not already a vertex, a new vertex is inserted
+ * and the search for intersections starts over at the beginning.
+ * That is potentially a significant time penalty, but it does solve the snap rounding
+ * problem. There are efficient algorithms for finding intersections with snap
+ * rounding, but I don't have time to implement them right now.
+ */
+static pcb_r_dir_t seg_in_seg(const pcb_box_t * b, void *cl)
+{
+	struct info *i = (struct info *) cl;
+	struct seg *s = (struct seg *) b;
+	pcb_vector_t s1, s2;
+	int cnt;
+	pcb_vnode_t *new_node;
+
+	/* When new nodes are added at the end of a pass due to an intersection
+	 * the segments may be altered. If either segment we're looking at has
+	 * already been intersected this pass, skip it until the next pass.
+	 */
+	if (s->intersected || i->s->intersected)
+		return PCB_R_DIR_NOT_FOUND;
+
+	cnt = pcb_vect_inters2(s->v->point, s->v->next->point, i->v->point, i->v->next->point, s1, s2);
+	if (!cnt)
+		return PCB_R_DIR_NOT_FOUND;
+	if (i->touch)									/* if checking touches one find and we're done */
+		longjmp(*i->touch, TOUCHES);
+	i->s->p->Flags.status = ISECTED;
+	s->p->Flags.status = ISECTED;
+	for (; cnt; cnt--) {
+		pcb_bool done_insert_on_i = pcb_false;
+		new_node = node_add_single_point(i->v, cnt > 1 ? s2 : s1);
+		if (new_node != NULL) {
+#ifdef DEBUG_INTERSECT
+			DEBUGP("new intersection on segment \"i\" at %#mD\n", cnt > 1 ? s2[0] : s1[0], cnt > 1 ? s2[1] : s1[1]);
+#endif
+			i->node_insert_list = prepend_insert_node_task(i->node_insert_list, i->s, new_node);
+			i->s->intersected = 1;
+			done_insert_on_i = pcb_true;
+		}
+		new_node = node_add_single_point(s->v, cnt > 1 ? s2 : s1);
+		if (new_node != NULL) {
+#ifdef DEBUG_INTERSECT
+			DEBUGP("new intersection on segment \"s\" at %#mD\n", cnt > 1 ? s2[0] : s1[0], cnt > 1 ? s2[1] : s1[1]);
+#endif
+			i->node_insert_list = prepend_insert_node_task(i->node_insert_list, s, new_node);
+			s->intersected = 1;
+			return PCB_R_DIR_NOT_FOUND;									/* Keep looking for intersections with segment "i" */
+		}
+		/* Skip any remaining r_search hits against segment i, as any further
+		 * intersections will be rejected until the next pass anyway.
+		 */
+		if (done_insert_on_i)
+			longjmp(*i->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static void *make_edge_tree(pcb_pline_t * pb)
+{
+	struct seg *s;
+	pcb_vnode_t *bv;
+	pcb_rtree_t *ans = pcb_r_create_tree();
+	bv = &pb->head;
+	do {
+		s = (seg *) malloc(sizeof(struct seg));
+		s->intersected = 0;
+		if (bv->point[0] < bv->next->point[0]) {
+			s->box.X1 = bv->point[0];
+			s->box.X2 = bv->next->point[0] + 1;
+		}
+		else {
+			s->box.X2 = bv->point[0] + 1;
+			s->box.X1 = bv->next->point[0];
+		}
+		if (bv->point[1] < bv->next->point[1]) {
+			s->box.Y1 = bv->point[1];
+			s->box.Y2 = bv->next->point[1] + 1;
+		}
+		else {
+			s->box.Y2 = bv->point[1] + 1;
+			s->box.Y1 = bv->next->point[1];
+		}
+		s->v = bv;
+		s->p = pb;
+		pcb_r_insert_entry(ans, (const pcb_box_t *) s);
+	}
+	while ((bv = bv->next) != &pb->head);
+	return (void *) ans;
+}
+
+static pcb_r_dir_t get_seg(const pcb_box_t * b, void *cl)
+{
+	struct info *i = (struct info *) cl;
+	struct seg *s = (struct seg *) b;
+	if (i->v == s->v) {
+		i->s = s;
+		return PCB_R_DIR_CANCEL; /* found */
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/*
+ * intersect() (and helpers)
+ * (C) 2006, harry eaton
+ * This uses an rtree to find A-B intersections. Whenever a new vertex is
+ * added, the search for intersections is re-started because the rounding
+ * could alter the topology otherwise. 
+ * This should use a faster algorithm for snap rounding intersection finding.
+ * The best algorithm is probably found in:
+ *
+ * "Improved output-sensitive snap rounding," John Hershberger, Proceedings
+ * of the 22nd annual symposium on Computational geometry, 2006, pp 357-366.
+ * http://doi.acm.org/10.1145/1137856.1137909
+ *
+ * Algorithms described by de Berg, or Goodrich or Halperin, or Hobby would
+ * probably work as well.
+ *
+ */
+
+static pcb_r_dir_t contour_bounds_touch(const pcb_box_t * b, void *cl)
+{
+	contour_info *c_info = (contour_info *) cl;
+	pcb_pline_t *pa = c_info->pa;
+	pcb_pline_t *pb = (pcb_pline_t *) b;
+	pcb_pline_t *rtree_over;
+	pcb_pline_t *looping_over;
+	pcb_vnode_t *av;										/* node iterators */
+	struct info info;
+	pcb_box_t box;
+	jmp_buf restart;
+
+	/* Have seg_in_seg return to our desired location if it touches */
+	info.env = &restart;
+	info.touch = c_info->getout;
+	info.need_restart = 0;
+	info.node_insert_list = c_info->node_insert_list;
+
+	/* Pick which contour has the fewer points, and do the loop
+	 * over that. The r_tree makes hit-testing against a contour
+	 * faster, so we want to do that on the bigger contour.
+	 */
+	if (pa->Count < pb->Count) {
+		rtree_over = pb;
+		looping_over = pa;
+	}
+	else {
+		rtree_over = pa;
+		looping_over = pb;
+	}
+
+	av = &looping_over->head;
+	do {													/* Loop over the nodes in the smaller contour */
+		pcb_r_dir_t rres;
+		/* check this edge for any insertions */
+		double dx;
+		info.v = av;
+		/* compute the slant for region trimming */
+		dx = av->next->point[0] - av->point[0];
+		if (dx == 0)
+			info.m = 0;
+		else {
+			info.m = (av->next->point[1] - av->point[1]) / dx;
+			info.b = av->point[1] - info.m * av->point[0];
+		}
+		box.X2 = (box.X1 = av->point[0]) + 1;
+		box.Y2 = (box.Y1 = av->point[1]) + 1;
+
+		/* fill in the segment in info corresponding to this node */
+		rres = pcb_r_search(looping_over->tree, &box, NULL, get_seg, &info, NULL);
+		assert(rres == PCB_R_DIR_CANCEL);
+
+		/* If we're going to have another pass anyway, skip this */
+		if (info.s->intersected && info.node_insert_list != NULL)
+			continue;
+
+		if (setjmp(restart))
+			continue;
+
+		/* NB: If this actually hits anything, we are teleported back to the beginning */
+		info.tree = rtree_over->tree;
+		if (info.tree) {
+			int seen;
+			pcb_r_search(info.tree, &info.s->box, seg_in_region, seg_in_seg, &info, &seen);
+			if (PCB_UNLIKELY(seen))
+				assert(0);							/* XXX: Memory allocation failure */
+		}
+	}
+	while ((av = av->next) != &looping_over->head);
+
+	c_info->node_insert_list = info.node_insert_list;
+	if (info.need_restart)
+		c_info->need_restart = 1;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static int intersect_impl(jmp_buf * jb, pcb_polyarea_t * b, pcb_polyarea_t * a, int add)
+{
+	pcb_polyarea_t *t;
+	pcb_pline_t *pa;
+	contour_info c_info;
+	int need_restart = 0;
+	insert_node_task *task;
+	c_info.need_restart = 0;
+	c_info.node_insert_list = NULL;
+
+	/* Search the r-tree of the object with most contours
+	 * We loop over the contours of "a". Swap if necessary.
+	 */
+	if (a->contour_tree->size > b->contour_tree->size) {
+		t = b;
+		b = a;
+		a = t;
+	}
+
+	for (pa = a->contours; pa; pa = pa->next) {	/* Loop over the contours of pcb_polyarea_t "a" */
+		pcb_box_t sb;
+		jmp_buf out;
+		int retval;
+
+		c_info.getout = NULL;
+		c_info.pa = pa;
+
+		if (!add) {
+			retval = setjmp(out);
+			if (retval) {
+				/* The intersection test short-circuited back here,
+				 * we need to clean up, then longjmp to jb */
+				longjmp(*jb, retval);
+			}
+			c_info.getout = &out;
+		}
+
+		sb.X1 = pa->xmin;
+		sb.Y1 = pa->ymin;
+		sb.X2 = pa->xmax + 1;
+		sb.Y2 = pa->ymax + 1;
+
+		pcb_r_search(b->contour_tree, &sb, NULL, contour_bounds_touch, &c_info, NULL);
+		if (c_info.need_restart)
+			need_restart = 1;
+	}
+
+	/* Process any deferred node insertions */
+	task = c_info.node_insert_list;
+	while (task != NULL) {
+		insert_node_task *next = task->next;
+
+		/* Do insertion */
+		task->new_node->prev = task->node_seg->v;
+		task->new_node->next = task->node_seg->v->next;
+		task->node_seg->v->next->prev = task->new_node;
+		task->node_seg->v->next = task->new_node;
+		task->node_seg->p->Count++;
+
+		cntrbox_adjust(task->node_seg->p, task->new_node->point);
+		if (adjust_tree(task->node_seg->p->tree, task->node_seg))
+			assert(0);								/* XXX: Memory allocation failure */
+
+		need_restart = 1;						/* Any new nodes could intersect */
+
+		free(task);
+		task = next;
+	}
+
+	return need_restart;
+}
+
+static int intersect(jmp_buf * jb, pcb_polyarea_t * b, pcb_polyarea_t * a, int add)
+{
+	int call_count = 1;
+	while (intersect_impl(jb, b, a, add))
+		call_count++;
+	return 0;
+}
+
+static void M_pcb_polyarea_t_intersect(jmp_buf * e, pcb_polyarea_t * afst, pcb_polyarea_t * bfst, int add)
+{
+	pcb_polyarea_t *a = afst, *b = bfst;
+	pcb_pline_t *curcA, *curcB;
+	pcb_cvc_list_t *the_list = NULL;
+
+	if (a == NULL || b == NULL)
+		error(pcb_err_bad_parm);
+	do {
+		do {
+			if (a->contours->xmax >= b->contours->xmin &&
+					a->contours->ymax >= b->contours->ymin &&
+					a->contours->xmin <= b->contours->xmax && a->contours->ymin <= b->contours->ymax) {
+				if (PCB_UNLIKELY(intersect(e, a, b, add)))
+					error(pcb_err_no_memory);
+			}
+		}
+		while (add && (a = a->f) != afst);
+		for (curcB = b->contours; curcB != NULL; curcB = curcB->next)
+			if (curcB->Flags.status == ISECTED) {
+				the_list = add_descriptors(curcB, 'B', the_list);
+				if (PCB_UNLIKELY(the_list == NULL))
+					error(pcb_err_no_memory);
+			}
+	}
+	while (add && (b = b->f) != bfst);
+	do {
+		for (curcA = a->contours; curcA != NULL; curcA = curcA->next)
+			if (curcA->Flags.status == ISECTED) {
+				the_list = add_descriptors(curcA, 'A', the_list);
+				if (PCB_UNLIKELY(the_list == NULL))
+					error(pcb_err_no_memory);
+			}
+	}
+	while (add && (a = a->f) != afst);
+}																/* M_pcb_polyarea_t_intersect */
+
+static inline int cntrbox_inside(pcb_pline_t * c1, pcb_pline_t * c2)
+{
+	assert(c1 != NULL && c2 != NULL);
+	return ((c1->xmin >= c2->xmin) && (c1->ymin >= c2->ymin) && (c1->xmax <= c2->xmax) && (c1->ymax <= c2->ymax));
+}
+
+/*****************************************************************/
+/* Routines for making labels */
+
+static pcb_r_dir_t count_contours_i_am_inside(const pcb_box_t * b, void *cl)
+{
+	pcb_pline_t *me = (pcb_pline_t *) cl;
+	pcb_pline_t *check = (pcb_pline_t *) b;
+
+	if (pcb_poly_contour_in_contour(check, me))
+		return PCB_R_DIR_FOUND_CONTINUE;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* cntr_in_M_pcb_polyarea_t
+returns poly is inside outfst ? pcb_true : pcb_false */
+static int cntr_in_M_pcb_polyarea_t(pcb_pline_t * poly, pcb_polyarea_t * outfst, pcb_bool test)
+{
+	pcb_polyarea_t *outer = outfst;
+	pcb_heap_t *heap;
+
+	assert(poly != NULL);
+	assert(outer != NULL);
+
+	heap = pcb_heap_create();
+	do {
+		if (cntrbox_inside(poly, outer->contours))
+			pcb_heap_insert(heap, outer->contours->area, (void *) outer);
+	}
+	/* if checking touching, use only the first polygon */
+	while (!test && (outer = outer->f) != outfst);
+	/* we need only check the smallest poly container
+	 * but we must loop in case the box container is not
+	 * the poly container */
+	do {
+		int cnt;
+
+		if (pcb_heap_is_empty(heap))
+			break;
+		outer = (pcb_polyarea_t *) pcb_heap_remove_smallest(heap);
+
+		pcb_r_search(outer->contour_tree, (pcb_box_t *) poly, NULL, count_contours_i_am_inside, poly, &cnt);
+		switch (cnt) {
+		case 0:										/* Didn't find anything in this piece, Keep looking */
+			break;
+		case 1:										/* Found we are inside this piece, and not any of its holes */
+			pcb_heap_destroy(&heap);
+			return pcb_true;
+		case 2:										/* Found inside a hole in the smallest polygon so far. No need to check the other polygons */
+			pcb_heap_destroy(&heap);
+			return pcb_false;
+		default:
+			printf("Something strange here\n");
+			break;
+		}
+	}
+	while (1);
+	pcb_heap_destroy(&heap);
+	return pcb_false;
+}																/* cntr_in_M_pcb_polyarea_t */
+
+#ifdef DEBUG
+
+static char *theState(pcb_vnode_t * v)
+{
+	static char u[] = "UNKNOWN";
+	static char i[] = "INSIDE";
+	static char o[] = "OUTSIDE";
+	static char s[] = "SHARED";
+	static char s2[] = "SHARED2";
+
+	switch (NODE_LABEL(v)) {
+	case INSIDE:
+		return i;
+	case OUTSIDE:
+		return o;
+	case SHARED:
+		return s;
+	case SHARED2:
+		return s2;
+	default:
+		return u;
+	}
+}
+
+#ifdef DEBUG_ALL_LABELS
+static void print_labels(pcb_pline_t * a)
+{
+	pcb_vnode_t *c = &a->head;
+
+	do {
+		DEBUGP("%#mD->%#mD labeled %s\n", c->point[0], c->point[1], c->next->point[0], c->next->point[1], theState(c));
+	}
+	while ((c = c->next) != &a->head);
+}
+#endif
+#endif
+
+/*
+label_contour
+ (C) 2006 harry eaton
+ (C) 1993 Klamer Schutte
+ (C) 1997 Alexey Nikitin, Michael Leonov
+*/
+
+static pcb_bool label_contour(pcb_pline_t * a)
+{
+	pcb_vnode_t *cur = &a->head;
+	pcb_vnode_t *first_labelled = NULL;
+	int label = UNKNWN;
+
+	do {
+		if (cur->cvc_next) {				/* examine cross vertex */
+			label = node_label(cur);
+			if (first_labelled == NULL)
+				first_labelled = cur;
+			continue;
+		}
+
+		if (first_labelled == NULL)
+			continue;
+
+		/* This labels nodes which aren't cross-connected */
+		assert(label == INSIDE || label == OUTSIDE);
+		LABEL_NODE(cur, label);
+	}
+	while ((cur = cur->next) != first_labelled);
+#ifdef DEBUG_ALL_LABELS
+	print_labels(a);
+	DEBUGP("\n\n");
+#endif
+	return pcb_false;
+}																/* label_contour */
+
+static pcb_bool cntr_label_pcb_polyarea_t(pcb_pline_t * poly, pcb_polyarea_t * ppl, pcb_bool test)
+{
+	assert(ppl != NULL && ppl->contours != NULL);
+	if (poly->Flags.status == ISECTED) {
+		label_contour(poly);				/* should never get here when pcb_bool is pcb_true */
+	}
+	else if (cntr_in_M_pcb_polyarea_t(poly, ppl, test)) {
+		if (test)
+			return pcb_true;
+		poly->Flags.status = INSIDE;
+	}
+	else {
+		if (test)
+			return pcb_false;
+		poly->Flags.status = OUTSIDE;
+	}
+	return pcb_false;
+}																/* cntr_label_pcb_polyarea_t */
+
+static pcb_bool M_pcb_polyarea_t_label_separated(pcb_pline_t * afst, pcb_polyarea_t * b, pcb_bool touch)
+{
+	pcb_pline_t *curc = afst;
+
+	for (curc = afst; curc != NULL; curc = curc->next) {
+		if (cntr_label_pcb_polyarea_t(curc, b, touch) && touch)
+			return pcb_true;
+	}
+	return pcb_false;
+}
+
+static pcb_bool M_pcb_polyarea_t_label(pcb_polyarea_t * afst, pcb_polyarea_t * b, pcb_bool touch)
+{
+	pcb_polyarea_t *a = afst;
+	pcb_pline_t *curc;
+
+	assert(a != NULL);
+	do {
+		for (curc = a->contours; curc != NULL; curc = curc->next)
+			if (cntr_label_pcb_polyarea_t(curc, b, touch)) {
+				if (touch)
+					return pcb_true;
+			}
+	}
+	while (!touch && (a = a->f) != afst);
+	return pcb_false;
+}
+
+/****************************************************************/
+
+/* routines for temporary storing resulting contours */
+static void InsCntr(jmp_buf * e, pcb_pline_t * c, pcb_polyarea_t ** dst)
+{
+	pcb_polyarea_t *newp;
+
+	if (*dst == NULL) {
+		MemGet(*dst, pcb_polyarea_t);
+		(*dst)->f = (*dst)->b = *dst;
+		newp = *dst;
+	}
+	else {
+		MemGet(newp, pcb_polyarea_t);
+		newp->f = *dst;
+		newp->b = (*dst)->b;
+		newp->f->b = newp->b->f = newp;
+	}
+	newp->contours = c;
+	newp->contour_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(newp->contour_tree, (pcb_box_t *) c);
+	c->next = NULL;
+}																/* InsCntr */
+
+static void
+PutContour(jmp_buf * e, pcb_pline_t * cntr, pcb_polyarea_t ** contours, pcb_pline_t ** holes,
+					 pcb_polyarea_t * owner, pcb_polyarea_t * parent, pcb_pline_t * parent_contour)
+{
+	assert(cntr != NULL);
+	assert(cntr->Count > 2);
+	cntr->next = NULL;
+
+	if (cntr->Flags.orient == PCB_PLF_DIR) {
+		if (owner != NULL)
+			pcb_r_delete_entry(owner->contour_tree, (pcb_box_t *) cntr);
+		InsCntr(e, cntr, contours);
+	}
+	/* put hole into temporary list */
+	else {
+		/* if we know this belongs inside the parent, put it there now */
+		if (parent_contour) {
+			cntr->next = parent_contour->next;
+			parent_contour->next = cntr;
+			if (owner != parent) {
+				if (owner != NULL)
+					pcb_r_delete_entry(owner->contour_tree, (pcb_box_t *) cntr);
+				pcb_r_insert_entry(parent->contour_tree, (pcb_box_t *) cntr);
+			}
+		}
+		else {
+			cntr->next = *holes;
+			*holes = cntr;						/* let cntr be 1st hole in list */
+			/* We don't insert the holes into an r-tree,
+			 * they just form a linked list */
+			if (owner != NULL)
+				pcb_r_delete_entry(owner->contour_tree, (pcb_box_t *) cntr);
+		}
+	}
+}																/* PutContour */
+
+static inline void remove_contour(pcb_polyarea_t * piece, pcb_pline_t * prev_contour, pcb_pline_t * contour, int remove_rtree_entry)
+{
+	if (piece->contours == contour)
+		piece->contours = contour->next;
+	else if (prev_contour != NULL) {
+		assert(prev_contour->next == contour);
+		prev_contour->next = contour->next;
+	}
+
+	contour->next = NULL;
+
+	if (remove_rtree_entry)
+		pcb_r_delete_entry(piece->contour_tree, (pcb_box_t *) contour);
+}
+
+struct polyarea_info {
+	pcb_box_t BoundingBox;
+	pcb_polyarea_t *pa;
+};
+
+static pcb_r_dir_t heap_it(const pcb_box_t * b, void *cl)
+{
+	pcb_heap_t *heap = (pcb_heap_t *) cl;
+	struct polyarea_info *pa_info = (struct polyarea_info *) b;
+	pcb_pline_t *p = pa_info->pa->contours;
+	if (p->Count == 0)
+		return PCB_R_DIR_NOT_FOUND;										/* how did this happen? */
+	pcb_heap_insert(heap, p->area, pa_info);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+struct find_inside_info {
+	jmp_buf jb;
+	pcb_pline_t *want_inside;
+	pcb_pline_t *result;
+};
+
+static pcb_r_dir_t find_inside(const pcb_box_t * b, void *cl)
+{
+	struct find_inside_info *info = (struct find_inside_info *) cl;
+	pcb_pline_t *check = (pcb_pline_t *) b;
+	/* Do test on check to see if it inside info->want_inside */
+	/* If it is: */
+	if (check->Flags.orient == PCB_PLF_DIR) {
+		return PCB_R_DIR_NOT_FOUND;
+	}
+	if (pcb_poly_contour_in_contour(info->want_inside, check)) {
+		info->result = check;
+		longjmp(info->jb, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+void pcb_poly_insert_holes(jmp_buf * e, pcb_polyarea_t * dest, pcb_pline_t ** src)
+{
+	pcb_polyarea_t *curc;
+	pcb_pline_t *curh, *container;
+	pcb_heap_t *heap;
+	pcb_rtree_t *tree;
+	int i;
+	int num_polyareas = 0;
+	struct polyarea_info *all_pa_info, *pa_info;
+
+	if (*src == NULL)
+		return;											/* empty hole list */
+	if (dest == NULL)
+		error(pcb_err_bad_parm);				/* empty contour list */
+
+	/* Count dest polyareas */
+	curc = dest;
+	do {
+		num_polyareas++;
+	}
+	while ((curc = curc->f) != dest);
+
+	/* make a polyarea info table */
+	/* make an rtree of polyarea info table */
+	all_pa_info = (struct polyarea_info *) malloc(sizeof(struct polyarea_info) * num_polyareas);
+	tree = pcb_r_create_tree();
+	i = 0;
+	curc = dest;
+	do {
+		all_pa_info[i].BoundingBox.X1 = curc->contours->xmin;
+		all_pa_info[i].BoundingBox.Y1 = curc->contours->ymin;
+		all_pa_info[i].BoundingBox.X2 = curc->contours->xmax;
+		all_pa_info[i].BoundingBox.Y2 = curc->contours->ymax;
+		all_pa_info[i].pa = curc;
+		pcb_r_insert_entry(tree, (const pcb_box_t *) &all_pa_info[i]);
+		i++;
+	}
+	while ((curc = curc->f) != dest);
+
+	/* loop through the holes and put them where they belong */
+	while ((curh = *src) != NULL) {
+		*src = curh->next;
+
+		container = NULL;
+		/* build a heap of all of the polys that the hole is inside its bounding box */
+		heap = pcb_heap_create();
+		pcb_r_search(tree, (pcb_box_t *) curh, NULL, heap_it, heap, NULL);
+		if (pcb_heap_is_empty(heap)) {
+#ifndef NDEBUG
+#ifdef DEBUG
+			poly_dump(dest);
+#endif
+#endif
+			pcb_poly_contour_del(&curh);
+			error(pcb_err_bad_parm);
+		}
+		/* Now search the heap for the container. If there was only one item
+		 * in the heap, assume it is the container without the expense of
+		 * proving it.
+		 */
+		pa_info = (struct polyarea_info *) pcb_heap_remove_smallest(heap);
+		if (pcb_heap_is_empty(heap)) {	/* only one possibility it must be the right one */
+			assert(pcb_poly_contour_in_contour(pa_info->pa->contours, curh));
+			container = pa_info->pa->contours;
+		}
+		else {
+			do {
+				if (pcb_poly_contour_in_contour(pa_info->pa->contours, curh)) {
+					container = pa_info->pa->contours;
+					break;
+				}
+				if (pcb_heap_is_empty(heap))
+					break;
+				pa_info = (struct polyarea_info *) pcb_heap_remove_smallest(heap);
+			}
+			while (1);
+		}
+		pcb_heap_destroy(&heap);
+		if (container == NULL) {
+			/* bad input polygons were given */
+#ifndef NDEBUG
+#ifdef DEBUG
+			poly_dump(dest);
+#endif
+#endif
+			curh->next = NULL;
+			pcb_poly_contour_del(&curh);
+			error(pcb_err_bad_parm);
+		}
+		else {
+			/* Need to check if this new hole means we need to kick out any old ones for reprocessing */
+			while (1) {
+				struct find_inside_info info;
+				pcb_pline_t *prev;
+
+				info.want_inside = curh;
+
+				/* Set jump return */
+				if (setjmp(info.jb)) {
+					/* Returned here! */
+				}
+				else {
+					info.result = NULL;
+					/* Rtree search, calling back a routine to longjmp back with data about any hole inside the added one */
+					/*   Be sure not to bother jumping back to report the main contour! */
+					pcb_r_search(pa_info->pa->contour_tree, (pcb_box_t *) curh, NULL, find_inside, &info, NULL);
+
+					/* Nothing found? */
+					break;
+				}
+
+				/* We need to find the contour before it, so we can update its next pointer */
+				prev = container;
+				while (prev->next != info.result) {
+					prev = prev->next;
+				}
+
+				/* Remove hole from the contour */
+				remove_contour(pa_info->pa, prev, info.result, pcb_true);
+
+				/* Add hole as the next on the list to be processed in this very function */
+				info.result->next = *src;
+				*src = info.result;
+			}
+			/* End check for kicked out holes */
+
+			/* link at front of hole list */
+			curh->next = container->next;
+			container->next = curh;
+			pcb_r_insert_entry(pa_info->pa->contour_tree, (pcb_box_t *) curh);
+
+		}
+	}
+	pcb_r_destroy_tree(&tree);
+	free(all_pa_info);
+}																/* pcb_poly_insert_holes */
+
+
+/****************************************************************/
+/* routines for collecting result */
+
+typedef enum {
+	FORW, BACKW
+} DIRECTION;
+
+/* Start Rule */
+typedef int (*S_Rule) (pcb_vnode_t *, DIRECTION *);
+
+/* Jump Rule  */
+typedef int (*J_Rule) (char, pcb_vnode_t *, DIRECTION *);
+
+static int UniteS_Rule(pcb_vnode_t * cur, DIRECTION * initdir)
+{
+	*initdir = FORW;
+	return (NODE_LABEL(cur) == OUTSIDE) || (NODE_LABEL(cur) == SHARED);
+}
+
+static int IsectS_Rule(pcb_vnode_t * cur, DIRECTION * initdir)
+{
+	*initdir = FORW;
+	return (NODE_LABEL(cur) == INSIDE) || (NODE_LABEL(cur) == SHARED);
+}
+
+static int SubS_Rule(pcb_vnode_t * cur, DIRECTION * initdir)
+{
+	*initdir = FORW;
+	return (NODE_LABEL(cur) == OUTSIDE) || (NODE_LABEL(cur) == SHARED2);
+}
+
+static int XorS_Rule(pcb_vnode_t * cur, DIRECTION * initdir)
+{
+	if (cur->Flags.status == INSIDE) {
+		*initdir = BACKW;
+		return pcb_true;
+	}
+	if (cur->Flags.status == OUTSIDE) {
+		*initdir = FORW;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+static int IsectJ_Rule(char p, pcb_vnode_t * v, DIRECTION * cdir)
+{
+	assert(*cdir == FORW);
+	return (v->Flags.status == INSIDE || v->Flags.status == SHARED);
+}
+
+static int UniteJ_Rule(char p, pcb_vnode_t * v, DIRECTION * cdir)
+{
+	assert(*cdir == FORW);
+	return (v->Flags.status == OUTSIDE || v->Flags.status == SHARED);
+}
+
+static int XorJ_Rule(char p, pcb_vnode_t * v, DIRECTION * cdir)
+{
+	if (v->Flags.status == INSIDE) {
+		*cdir = BACKW;
+		return pcb_true;
+	}
+	if (v->Flags.status == OUTSIDE) {
+		*cdir = FORW;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+static int SubJ_Rule(char p, pcb_vnode_t * v, DIRECTION * cdir)
+{
+	if (p == 'B' && v->Flags.status == INSIDE) {
+		*cdir = BACKW;
+		return pcb_true;
+	}
+	if (p == 'A' && v->Flags.status == OUTSIDE) {
+		*cdir = FORW;
+		return pcb_true;
+	}
+	if (v->Flags.status == SHARED2) {
+		if (p == 'A')
+			*cdir = FORW;
+		else
+			*cdir = BACKW;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* return the edge that comes next.
+ * if the direction is BACKW, then we return the next vertex
+ * so that prev vertex has the flags for the edge
+ *
+ * returns pcb_true if an edge is found, pcb_false otherwise
+ */
+static int jump(pcb_vnode_t ** cur, DIRECTION * cdir, J_Rule rule)
+{
+	pcb_cvc_list_t *d, *start;
+	pcb_vnode_t *e;
+	DIRECTION newone;
+
+	if (!(*cur)->cvc_prev) {			/* not a cross-vertex */
+		if (*cdir == FORW ? (*cur)->Flags.mark : (*cur)->prev->Flags.mark)
+			return pcb_false;
+		return pcb_true;
+	}
+#ifdef DEBUG_JUMP
+	DEBUGP("jump entering node at %$mD\n", (*cur)->point[0], (*cur)->point[1]);
+#endif
+	if (*cdir == FORW)
+		d = (*cur)->cvc_prev->prev;
+	else
+		d = (*cur)->cvc_next->prev;
+	start = d;
+	do {
+		e = d->parent;
+		if (d->side == 'P')
+			e = e->prev;
+		newone = *cdir;
+		if (!e->Flags.mark && rule(d->poly, e, &newone)) {
+			if ((d->side == 'N' && newone == FORW) || (d->side == 'P' && newone == BACKW)) {
+#ifdef DEBUG_JUMP
+				if (newone == FORW)
+					DEBUGP("jump leaving node at %#mD\n", e->next->point[0], e->next->point[1]);
+				else
+					DEBUGP("jump leaving node at %#mD\n", e->point[0], e->point[1]);
+#endif
+				*cur = d->parent;
+				*cdir = newone;
+				return pcb_true;
+			}
+		}
+	}
+	while ((d = d->prev) != start);
+	return pcb_false;
+}
+
+static int Gather(pcb_vnode_t * start, pcb_pline_t ** result, J_Rule v_rule, DIRECTION initdir)
+{
+	pcb_vnode_t *cur = start, *newn;
+	DIRECTION dir = initdir;
+#ifdef DEBUG_GATHER
+	DEBUGP("gather direction = %d\n", dir);
+#endif
+	assert(*result == NULL);
+	do {
+		/* see where to go next */
+		if (!jump(&cur, &dir, v_rule))
+			break;
+		/* add edge to polygon */
+		if (!*result) {
+			*result = pcb_poly_contour_new(cur->point);
+			if (*result == NULL)
+				return pcb_err_no_memory;
+		}
+		else {
+			if ((newn = pcb_poly_node_create(cur->point)) == NULL)
+				return pcb_err_no_memory;
+			pcb_poly_vertex_include((*result)->head.prev, newn);
+		}
+#ifdef DEBUG_GATHER
+		DEBUGP("gather vertex at %#mD\n", cur->point[0], cur->point[1]);
+#endif
+		/* Now mark the edge as included.  */
+		newn = (dir == FORW ? cur : cur->prev);
+		newn->Flags.mark = 1;
+		/* for SHARED edge mark both */
+		if (newn->shared)
+			newn->shared->Flags.mark = 1;
+
+		/* Advance to the next edge.  */
+		cur = (dir == FORW ? cur->next : cur->prev);
+	}
+	while (1);
+	return pcb_err_ok;
+}																/* Gather */
+
+static void Collect1(jmp_buf * e, pcb_vnode_t * cur, DIRECTION dir, pcb_polyarea_t ** contours, pcb_pline_t ** holes, J_Rule j_rule)
+{
+	pcb_pline_t *p = NULL;							/* start making contour */
+	int errc = pcb_err_ok;
+	if ((errc = Gather(dir == FORW ? cur : cur->next, &p, j_rule, dir)) != pcb_err_ok) {
+		if (p != NULL)
+			pcb_poly_contour_del(&p);
+		error(errc);
+	}
+	if (!p)
+		return;
+	pcb_poly_contour_pre(p, pcb_true);
+	if (p->Count > 2) {
+#ifdef DEBUG_GATHER
+		DEBUGP("adding contour with %d vertices and direction %c\n", p->Count, p->Flags.orient ? 'F' : 'B');
+#endif
+		PutContour(e, p, contours, holes, NULL, NULL, NULL);
+	}
+	else {
+		/* some sort of computation error ? */
+#ifdef DEBUG_GATHER
+		DEBUGP("Bad contour! Not enough points!!\n");
+#endif
+		pcb_poly_contour_del(&p);
+	}
+}
+
+static void Collect(jmp_buf * e, pcb_pline_t * a, pcb_polyarea_t ** contours, pcb_pline_t ** holes, S_Rule s_rule, J_Rule j_rule)
+{
+	pcb_vnode_t *cur, *other;
+	DIRECTION dir;
+
+	cur = &a->head;
+	do {
+		if (s_rule(cur, &dir) && cur->Flags.mark == 0)
+			Collect1(e, cur, dir, contours, holes, j_rule);
+		other = cur;
+		if ((other->cvc_prev && jump(&other, &dir, j_rule)))
+			Collect1(e, other, dir, contours, holes, j_rule);
+	}
+	while ((cur = cur->next) != &a->head);
+}																/* Collect */
+
+
+static int
+cntr_Collect(jmp_buf * e, pcb_pline_t ** A, pcb_polyarea_t ** contours, pcb_pline_t ** holes,
+						 int action, pcb_polyarea_t * owner, pcb_polyarea_t * parent, pcb_pline_t * parent_contour)
+{
+	pcb_pline_t *tmprev;
+
+	if ((*A)->Flags.status == ISECTED) {
+		switch (action) {
+		case PCB_PBO_UNITE:
+			Collect(e, *A, contours, holes, UniteS_Rule, UniteJ_Rule);
+			break;
+		case PCB_PBO_ISECT:
+			Collect(e, *A, contours, holes, IsectS_Rule, IsectJ_Rule);
+			break;
+		case PCB_PBO_XOR:
+			Collect(e, *A, contours, holes, XorS_Rule, XorJ_Rule);
+			break;
+		case PCB_PBO_SUB:
+			Collect(e, *A, contours, holes, SubS_Rule, SubJ_Rule);
+			break;
+		};
+	}
+	else {
+		switch (action) {
+		case PCB_PBO_ISECT:
+			if ((*A)->Flags.status == INSIDE) {
+				tmprev = *A;
+				/* disappear this contour (rtree entry removed in PutContour) */
+				*A = tmprev->next;
+				tmprev->next = NULL;
+				PutContour(e, tmprev, contours, holes, owner, NULL, NULL);
+				return pcb_true;
+			}
+			break;
+		case PCB_PBO_XOR:
+			if ((*A)->Flags.status == INSIDE) {
+				tmprev = *A;
+				/* disappear this contour (rtree entry removed in PutContour) */
+				*A = tmprev->next;
+				tmprev->next = NULL;
+				pcb_poly_contour_inv(tmprev);
+				PutContour(e, tmprev, contours, holes, owner, NULL, NULL);
+				return pcb_true;
+			}
+			/* break; *//* Fall through (I think this is correct! pcjc2) */
+		case PCB_PBO_UNITE:
+		case PCB_PBO_SUB:
+			if ((*A)->Flags.status == OUTSIDE) {
+				tmprev = *A;
+				/* disappear this contour (rtree entry removed in PutContour) */
+				*A = tmprev->next;
+				tmprev->next = NULL;
+				PutContour(e, tmprev, contours, holes, owner, parent, parent_contour);
+				return pcb_true;
+			}
+			break;
+		}
+	}
+	return pcb_false;
+}																/* cntr_Collect */
+
+static void M_B_AREA_Collect(jmp_buf * e, pcb_polyarea_t * bfst, pcb_polyarea_t ** contours, pcb_pline_t ** holes, int action)
+{
+	pcb_polyarea_t *b = bfst;
+	pcb_pline_t **cur, **next, *tmp;
+
+	assert(b != NULL);
+	do {
+		for (cur = &b->contours; *cur != NULL; cur = next) {
+			next = &((*cur)->next);
+			if ((*cur)->Flags.status == ISECTED)
+				continue;
+
+			if ((*cur)->Flags.status == INSIDE)
+				switch (action) {
+				case PCB_PBO_XOR:
+				case PCB_PBO_SUB:
+					pcb_poly_contour_inv(*cur);
+				case PCB_PBO_ISECT:
+					tmp = *cur;
+					*cur = tmp->next;
+					next = cur;
+					tmp->next = NULL;
+					tmp->Flags.status = UNKNWN;
+					PutContour(e, tmp, contours, holes, b, NULL, NULL);
+					break;
+				case PCB_PBO_UNITE:
+					break;								/* nothing to do - already included */
+				}
+			else if ((*cur)->Flags.status == OUTSIDE)
+				switch (action) {
+				case PCB_PBO_XOR:
+				case PCB_PBO_UNITE:
+					/* include */
+					tmp = *cur;
+					*cur = tmp->next;
+					next = cur;
+					tmp->next = NULL;
+					tmp->Flags.status = UNKNWN;
+					PutContour(e, tmp, contours, holes, b, NULL, NULL);
+					break;
+				case PCB_PBO_ISECT:
+				case PCB_PBO_SUB:
+					break;								/* do nothing, not included */
+				}
+		}
+	}
+	while ((b = b->f) != bfst);
+}
+
+
+static inline int contour_is_first(pcb_polyarea_t * a, pcb_pline_t * cur)
+{
+	return (a->contours == cur);
+}
+
+
+static inline int contour_is_last(pcb_pline_t * cur)
+{
+	return (cur->next == NULL);
+}
+
+
+static inline void remove_polyarea(pcb_polyarea_t ** list, pcb_polyarea_t * piece)
+{
+	/* If this item was the start of the list, advance that pointer */
+	if (*list == piece)
+		*list = (*list)->f;
+
+	/* But reset it to NULL if it wraps around and hits us again */
+	if (*list == piece)
+		*list = NULL;
+
+	piece->b->f = piece->f;
+	piece->f->b = piece->b;
+	piece->f = piece->b = piece;
+}
+
+static void M_pcb_polyarea_separate_isected(jmp_buf * e, pcb_polyarea_t ** pieces, pcb_pline_t ** holes, pcb_pline_t ** isected)
+{
+	pcb_polyarea_t *a = *pieces;
+	pcb_polyarea_t *anext;
+	pcb_pline_t *curc, *next, *prev;
+	int finished;
+
+	if (a == NULL)
+		return;
+
+	/* TODO: STASH ENOUGH INFORMATION EARLIER ON, SO WE CAN REMOVE THE INTERSECTED
+	   CONTOURS WITHOUT HAVING TO WALK THE FULL DATA-STRUCTURE LOOKING FOR THEM. */
+
+	do {
+		int hole_contour = 0;
+		int is_outline = 1;
+
+		anext = a->f;
+		finished = (anext == *pieces);
+
+		prev = NULL;
+		for (curc = a->contours; curc != NULL; curc = next, is_outline = 0) {
+			int is_first = contour_is_first(a, curc);
+			int is_last = contour_is_last(curc);
+			int isect_contour = (curc->Flags.status == ISECTED);
+
+			next = curc->next;
+
+			if (isect_contour || hole_contour) {
+
+				/* Reset the intersection flags, since we keep these pieces */
+				if (curc->Flags.status != ISECTED)
+					curc->Flags.status = UNKNWN;
+
+				remove_contour(a, prev, curc, !(is_first && is_last));
+
+				if (isect_contour) {
+					/* Link into the list of intersected contours */
+					curc->next = *isected;
+					*isected = curc;
+				}
+				else if (hole_contour) {
+					/* Link into the list of holes */
+					curc->next = *holes;
+					*holes = curc;
+				}
+				else {
+					assert(0);
+				}
+
+				if (is_first && is_last) {
+					remove_polyarea(pieces, a);
+					pcb_polyarea_free(&a);				/* NB: Sets a to NULL */
+				}
+
+			}
+			else {
+				/* Note the item we just didn't delete as the next
+				   candidate for having its "next" pointer adjusted.
+				   Saves walking the contour list when we delete one. */
+				prev = curc;
+			}
+
+			/* If we move or delete an outer contour, we need to move any holes
+			   we wish to keep within that contour to the holes list. */
+			if (is_outline && isect_contour)
+				hole_contour = 1;
+
+		}
+
+		/* If we deleted all the pieces of the polyarea, *pieces is NULL */
+	}
+	while ((a = anext), *pieces != NULL && !finished);
+}
+
+
+struct find_inside_m_pa_info {
+	jmp_buf jb;
+	pcb_polyarea_t *want_inside;
+	pcb_pline_t *result;
+};
+
+static pcb_r_dir_t find_inside_m_pa(const pcb_box_t * b, void *cl)
+{
+	struct find_inside_m_pa_info *info = (struct find_inside_m_pa_info *) cl;
+	pcb_pline_t *check = (pcb_pline_t *) b;
+	/* Don't report for the main contour */
+	if (check->Flags.orient == PCB_PLF_DIR)
+		return PCB_R_DIR_NOT_FOUND;
+	/* Don't look at contours marked as being intersected */
+	if (check->Flags.status == ISECTED)
+		return PCB_R_DIR_NOT_FOUND;
+	if (cntr_in_M_pcb_polyarea_t(check, info->want_inside, pcb_false)) {
+		info->result = check;
+		longjmp(info->jb, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+static void M_pcb_polyarea_t_update_primary(jmp_buf * e, pcb_polyarea_t ** pieces, pcb_pline_t ** holes, int action, pcb_polyarea_t * bpa)
+{
+	pcb_polyarea_t *a = *pieces;
+	pcb_polyarea_t *b;
+	pcb_polyarea_t *anext;
+	pcb_pline_t *curc, *next, *prev;
+	pcb_box_t box;
+	/* int inv_inside = 0; */
+	int del_inside = 0;
+	int del_outside = 0;
+	int finished;
+
+	if (a == NULL)
+		return;
+
+	switch (action) {
+	case PCB_PBO_ISECT:
+		del_outside = 1;
+		break;
+	case PCB_PBO_UNITE:
+	case PCB_PBO_SUB:
+		del_inside = 1;
+		break;
+	case PCB_PBO_XOR:								/* NOT IMPLEMENTED OR USED */
+		/* inv_inside = 1; */
+		assert(0);
+		break;
+	}
+
+	box = *((pcb_box_t *) bpa->contours);
+	b = bpa;
+	while ((b = b->f) != bpa) {
+		pcb_box_t *b_box = (pcb_box_t *) b->contours;
+		PCB_MAKE_MIN(box.X1, b_box->X1);
+		PCB_MAKE_MIN(box.Y1, b_box->Y1);
+		PCB_MAKE_MAX(box.X2, b_box->X2);
+		PCB_MAKE_MAX(box.Y2, b_box->Y2);
+	}
+
+	if (del_inside) {
+
+		do {
+			anext = a->f;
+			finished = (anext == *pieces);
+
+			/* Test the outer contour first, as we may need to remove all children */
+
+			/* We've not yet split intersected contours out, just ignore them */
+			if (a->contours->Flags.status != ISECTED &&
+					/* Pre-filter on bounding box */
+					((a->contours->xmin >= box.X1) && (a->contours->ymin >= box.Y1)
+					 && (a->contours->xmax <= box.X2)
+					 && (a->contours->ymax <= box.Y2)) &&
+					/* Then test properly */
+					cntr_in_M_pcb_polyarea_t(a->contours, bpa, pcb_false)) {
+
+				/* Delete this contour, all children -> holes queue */
+
+				/* Delete the outer contour */
+				curc = a->contours;
+				remove_contour(a, NULL, curc, pcb_false);	/* Rtree deleted in poly_Free below */
+				/* a->contours now points to the remaining holes */
+				pcb_poly_contour_del(&curc);
+
+				if (a->contours != NULL) {
+					/* Find the end of the list of holes */
+					curc = a->contours;
+					while (curc->next != NULL)
+						curc = curc->next;
+
+					/* Take the holes and prepend to the holes queue */
+					curc->next = *holes;
+					*holes = a->contours;
+					a->contours = NULL;
+				}
+
+				remove_polyarea(pieces, a);
+				pcb_polyarea_free(&a);					/* NB: Sets a to NULL */
+
+				continue;
+			}
+
+			/* Loop whilst we find INSIDE contours to delete */
+			while (1) {
+				struct find_inside_m_pa_info info;
+				pcb_pline_t *prev;
+
+				info.want_inside = bpa;
+
+				/* Set jump return */
+				if (setjmp(info.jb)) {
+					/* Returned here! */
+				}
+				else {
+					info.result = NULL;
+					/* r-tree search, calling back a routine to longjmp back with
+					 * data about any hole inside the B polygon.
+					 * NB: Does not jump back to report the main contour!
+					 */
+					pcb_r_search(a->contour_tree, &box, NULL, find_inside_m_pa, &info, NULL);
+
+					/* Nothing found? */
+					break;
+				}
+
+				/* We need to find the contour before it, so we can update its next pointer */
+				prev = a->contours;
+				while (prev->next != info.result) {
+					prev = prev->next;
+				}
+
+				/* Remove hole from the contour */
+				remove_contour(a, prev, info.result, pcb_true);
+				pcb_poly_contour_del(&info.result);
+			}
+			/* End check for deleted holes */
+
+			/* If we deleted all the pieces of the polyarea, *pieces is NULL */
+		}
+		while ((a = anext), *pieces != NULL && !finished);
+
+		return;
+	}
+	else {
+		/* This path isn't optimised for speed */
+	}
+
+	do {
+		int hole_contour = 0;
+		int is_outline = 1;
+
+		anext = a->f;
+		finished = (anext == *pieces);
+
+		prev = NULL;
+		for (curc = a->contours; curc != NULL; curc = next, is_outline = 0) {
+			int is_first = contour_is_first(a, curc);
+			int is_last = contour_is_last(curc);
+			int del_contour = 0;
+
+			next = curc->next;
+
+			if (del_outside)
+				del_contour = curc->Flags.status != ISECTED && !cntr_in_M_pcb_polyarea_t(curc, bpa, pcb_false);
+
+			/* Skip intersected contours */
+			if (curc->Flags.status == ISECTED) {
+				prev = curc;
+				continue;
+			}
+
+			/* Reset the intersection flags, since we keep these pieces */
+			curc->Flags.status = UNKNWN;
+
+			if (del_contour || hole_contour) {
+
+				remove_contour(a, prev, curc, !(is_first && is_last));
+
+				if (del_contour) {
+					/* Delete the contour */
+					pcb_poly_contour_del(&curc);	/* NB: Sets curc to NULL */
+				}
+				else if (hole_contour) {
+					/* Link into the list of holes */
+					curc->next = *holes;
+					*holes = curc;
+				}
+				else {
+					assert(0);
+				}
+
+				if (is_first && is_last) {
+					remove_polyarea(pieces, a);
+					pcb_polyarea_free(&a);				/* NB: Sets a to NULL */
+				}
+
+			}
+			else {
+				/* Note the item we just didn't delete as the next
+				   candidate for having its "next" pointer adjusted.
+				   Saves walking the contour list when we delete one. */
+				prev = curc;
+			}
+
+			/* If we move or delete an outer contour, we need to move any holes
+			   we wish to keep within that contour to the holes list. */
+			if (is_outline && del_contour)
+				hole_contour = 1;
+
+		}
+
+		/* If we deleted all the pieces of the polyarea, *pieces is NULL */
+	}
+	while ((a = anext), *pieces != NULL && !finished);
+}
+
+static void
+M_pcb_polyarea_t_Collect_separated(jmp_buf * e, pcb_pline_t * afst, pcb_polyarea_t ** contours, pcb_pline_t ** holes, int action, pcb_bool maybe)
+{
+	pcb_pline_t **cur, **next;
+
+	for (cur = &afst; *cur != NULL; cur = next) {
+		next = &((*cur)->next);
+		/* if we disappear a contour, don't advance twice */
+		if (cntr_Collect(e, cur, contours, holes, action, NULL, NULL, NULL))
+			next = cur;
+	}
+}
+
+static void M_pcb_polyarea_t_Collect(jmp_buf * e, pcb_polyarea_t * afst, pcb_polyarea_t ** contours, pcb_pline_t ** holes, int action, pcb_bool maybe)
+{
+	pcb_polyarea_t *a = afst;
+	pcb_polyarea_t *parent = NULL;			/* Quiet compiler warning */
+	pcb_pline_t **cur, **next, *parent_contour;
+
+	assert(a != NULL);
+	while ((a = a->f) != afst);
+	/* now the non-intersect parts are collected in temp/holes */
+	do {
+		if (maybe && a->contours->Flags.status != ISECTED)
+			parent_contour = a->contours;
+		else
+			parent_contour = NULL;
+
+		/* Take care of the first contour - so we know if we
+		 * can shortcut reparenting some of its children
+		 */
+		cur = &a->contours;
+		if (*cur != NULL) {
+			next = &((*cur)->next);
+			/* if we disappear a contour, don't advance twice */
+			if (cntr_Collect(e, cur, contours, holes, action, a, NULL, NULL)) {
+				parent = (*contours)->b;	/* InsCntr inserts behind the head */
+				next = cur;
+			}
+			else
+				parent = a;
+			cur = next;
+		}
+		for (; *cur != NULL; cur = next) {
+			next = &((*cur)->next);
+			/* if we disappear a contour, don't advance twice */
+			if (cntr_Collect(e, cur, contours, holes, action, a, parent, parent_contour))
+				next = cur;
+		}
+	}
+	while ((a = a->f) != afst);
+}
+
+/* determine if two polygons touch or overlap */
+pcb_bool pcb_polyarea_touching(pcb_polyarea_t * a, pcb_polyarea_t * b)
+{
+	jmp_buf e;
+	int code;
+
+	if ((code = setjmp(e)) == 0) {
+#ifdef DEBUG
+		if (!pcb_poly_valid(a))
+			return -1;
+		if (!pcb_poly_valid(b))
+			return -1;
+#endif
+		M_pcb_polyarea_t_intersect(&e, a, b, pcb_false);
+
+		if (M_pcb_polyarea_t_label(a, b, pcb_true))
+			return pcb_true;
+		if (M_pcb_polyarea_t_label(b, a, pcb_true))
+			return pcb_true;
+	}
+	else if (code == TOUCHES)
+		return pcb_true;
+	return pcb_false;
+}
+
+/* the main clipping routines */
+int pcb_polyarea_boolean(const pcb_polyarea_t * a_org, const pcb_polyarea_t * b_org, pcb_polyarea_t ** res, int action)
+{
+	pcb_polyarea_t *a = NULL, *b = NULL;
+
+	if (!pcb_polyarea_m_copy0(&a, a_org) || !pcb_polyarea_m_copy0(&b, b_org))
+		return pcb_err_no_memory;
+
+	return pcb_polyarea_boolean_free(a, b, res, action);
+}																/* poly_Boolean */
+
+/* just like poly_Boolean but frees the input polys */
+int pcb_polyarea_boolean_free(pcb_polyarea_t * ai, pcb_polyarea_t * bi, pcb_polyarea_t ** res, int action)
+{
+	pcb_polyarea_t *a = ai, *b = bi;
+	pcb_pline_t *a_isected = NULL;
+	pcb_pline_t *p, *holes = NULL;
+	jmp_buf e;
+	int code;
+
+	*res = NULL;
+
+	if (!a) {
+		switch (action) {
+		case PCB_PBO_XOR:
+		case PCB_PBO_UNITE:
+			*res = bi;
+			return pcb_err_ok;
+		case PCB_PBO_SUB:
+		case PCB_PBO_ISECT:
+			if (b != NULL)
+				pcb_polyarea_free(&b);
+			return pcb_err_ok;
+		}
+	}
+	if (!b) {
+		switch (action) {
+		case PCB_PBO_SUB:
+		case PCB_PBO_XOR:
+		case PCB_PBO_UNITE:
+			*res = ai;
+			return pcb_err_ok;
+		case PCB_PBO_ISECT:
+			if (a != NULL)
+				pcb_polyarea_free(&a);
+			return pcb_err_ok;
+		}
+	}
+
+	if ((code = setjmp(e)) == 0) {
+#ifdef DEBUG
+		assert(pcb_poly_valid(a));
+		assert(pcb_poly_valid(b));
+#endif
+
+		/* intersect needs to make a list of the contours in a and b which are intersected */
+		M_pcb_polyarea_t_intersect(&e, a, b, pcb_true);
+
+		/* We could speed things up a lot here if we only processed the relevant contours */
+		/* NB: Relevant parts of a are labeled below */
+		M_pcb_polyarea_t_label(b, a, pcb_false);
+
+		*res = a;
+		M_pcb_polyarea_t_update_primary(&e, res, &holes, action, b);
+		M_pcb_polyarea_separate_isected(&e, res, &holes, &a_isected);
+		M_pcb_polyarea_t_label_separated(a_isected, b, pcb_false);
+		M_pcb_polyarea_t_Collect_separated(&e, a_isected, res, &holes, action, pcb_false);
+		M_B_AREA_Collect(&e, b, res, &holes, action);
+		pcb_polyarea_free(&b);
+
+		/* free a_isected */
+		while ((p = a_isected) != NULL) {
+			a_isected = p->next;
+			pcb_poly_contour_del(&p);
+		}
+
+		pcb_poly_insert_holes(&e, *res, &holes);
+	}
+	/* delete holes if any left */
+	while ((p = holes) != NULL) {
+		holes = p->next;
+		pcb_poly_contour_del(&p);
+	}
+
+	if (code) {
+		pcb_polyarea_free(res);
+		return code;
+	}
+	assert(!*res || pcb_poly_valid(*res));
+	return code;
+}																/* poly_Boolean_free */
+
+static void clear_marks(pcb_polyarea_t * p)
+{
+	pcb_polyarea_t *n = p;
+	pcb_pline_t *c;
+	pcb_vnode_t *v;
+
+	do {
+		for (c = n->contours; c; c = c->next) {
+			v = &c->head;
+			do {
+				v->Flags.mark = 0;
+			}
+			while ((v = v->next) != &c->head);
+		}
+	}
+	while ((n = n->f) != p);
+}
+
+/* compute the intersection and subtraction (divides "a" into two pieces)
+ * and frees the input polys. This assumes that bi is a single simple polygon.
+ */
+int pcb_polyarea_and_subtract_free(pcb_polyarea_t * ai, pcb_polyarea_t * bi, pcb_polyarea_t ** aandb, pcb_polyarea_t ** aminusb)
+{
+	pcb_polyarea_t *a = ai, *b = bi;
+	pcb_pline_t *p, *holes = NULL;
+	jmp_buf e;
+	int code;
+
+	*aandb = NULL;
+	*aminusb = NULL;
+
+	if ((code = setjmp(e)) == 0) {
+
+#ifdef DEBUG
+		if (!pcb_poly_valid(a))
+			return -1;
+		if (!pcb_poly_valid(b))
+			return -1;
+#endif
+		M_pcb_polyarea_t_intersect(&e, a, b, pcb_true);
+
+		M_pcb_polyarea_t_label(a, b, pcb_false);
+		M_pcb_polyarea_t_label(b, a, pcb_false);
+
+		M_pcb_polyarea_t_Collect(&e, a, aandb, &holes, PCB_PBO_ISECT, pcb_false);
+		pcb_poly_insert_holes(&e, *aandb, &holes);
+		assert(pcb_poly_valid(*aandb));
+		/* delete holes if any left */
+		while ((p = holes) != NULL) {
+			holes = p->next;
+			pcb_poly_contour_del(&p);
+		}
+		holes = NULL;
+		clear_marks(a);
+		clear_marks(b);
+		M_pcb_polyarea_t_Collect(&e, a, aminusb, &holes, PCB_PBO_SUB, pcb_false);
+		pcb_poly_insert_holes(&e, *aminusb, &holes);
+		pcb_polyarea_free(&a);
+		pcb_polyarea_free(&b);
+		assert(pcb_poly_valid(*aminusb));
+	}
+	/* delete holes if any left */
+	while ((p = holes) != NULL) {
+		holes = p->next;
+		pcb_poly_contour_del(&p);
+	}
+
+
+	if (code) {
+		pcb_polyarea_free(aandb);
+		pcb_polyarea_free(aminusb);
+		return code;
+	}
+	assert(!*aandb || pcb_poly_valid(*aandb));
+	assert(!*aminusb || pcb_poly_valid(*aminusb));
+	return code;
+}																/* poly_AndSubtract_free */
+
+static inline int cntrbox_pointin(pcb_pline_t * c, pcb_vector_t p)
+{
+	return (p[0] >= c->xmin && p[1] >= c->ymin && p[0] <= c->xmax && p[1] <= c->ymax);
+
+}
+
+static inline int node_neighbours(pcb_vnode_t * a, pcb_vnode_t * b)
+{
+	return (a == b) || (a->next == b) || (b->next == a) || (a->next == b->next);
+}
+
+pcb_vnode_t *pcb_poly_node_create(pcb_vector_t v)
+{
+	pcb_vnode_t *res;
+	pcb_coord_t *c;
+
+	assert(v);
+	res = (pcb_vnode_t *) calloc(1, sizeof(pcb_vnode_t));
+	if (res == NULL)
+		return NULL;
+	/* bzero (res, sizeof (pcb_vnode_t) - sizeof(pcb_vector_t)); */
+	c = res->point;
+	*c++ = *v++;
+	*c = *v;
+	return res;
+}
+
+void pcb_poly_contour_init(pcb_pline_t * c)
+{
+	if (c == NULL)
+		return;
+	/* bzero (c, sizeof(pcb_pline_t)); */
+	c->head.next = c->head.prev = &c->head;
+	c->xmin = c->ymin = COORD_MAX;
+	c->xmax = c->ymax = -COORD_MAX-1;
+	c->is_round = pcb_false;
+	c->cx = 0;
+	c->cy = 0;
+	c->radius = 0;
+}
+
+pcb_pline_t *pcb_poly_contour_new(pcb_vector_t v)
+{
+	pcb_pline_t *res;
+
+	res = (pcb_pline_t *) calloc(1, sizeof(pcb_pline_t));
+	if (res == NULL)
+		return NULL;
+
+	pcb_poly_contour_init(res);
+
+	if (v != NULL) {
+		Vcopy(res->head.point, v);
+		cntrbox_adjust(res, v);
+	}
+
+	return res;
+}
+
+void pcb_poly_contour_clear(pcb_pline_t * c)
+{
+	pcb_vnode_t *cur;
+
+	assert(c != NULL);
+	while ((cur = c->head.next) != &c->head) {
+		pcb_poly_vertex_exclude(cur);
+		free(cur);
+	}
+	pcb_poly_contour_init(c);
+}
+
+void pcb_poly_contour_del(pcb_pline_t ** c)
+{
+	pcb_vnode_t *cur, *prev;
+
+	if (*c == NULL)
+		return;
+	for (cur = (*c)->head.prev; cur != &(*c)->head; cur = prev) {
+		prev = cur->prev;
+		if (cur->cvc_next != NULL) {
+			free(cur->cvc_next);
+			free(cur->cvc_prev);
+		}
+		free(cur);
+	}
+	if ((*c)->head.cvc_next != NULL) {
+		free((*c)->head.cvc_next);
+		free((*c)->head.cvc_prev);
+	}
+	/* FIXME -- strict aliasing violation.  */
+	if ((*c)->tree) {
+		pcb_rtree_t *r = (*c)->tree;
+		pcb_r_free_tree_data(r, free);
+		pcb_r_destroy_tree(&r);
+	}
+	free(*c), *c = NULL;
+}
+
+void pcb_poly_contour_pre(pcb_pline_t * C, pcb_bool optimize)
+{
+	double area = 0;
+	pcb_vnode_t *p, *c;
+	pcb_vector_t p1, p2;
+
+	assert(C != NULL);
+
+	if (optimize) {
+		for (c = (p = &C->head)->next; c != &C->head; c = (p = c)->next) {
+			/* if the previous node is on the same line with this one, we should remove it */
+			Vsub2(p1, c->point, p->point);
+			Vsub2(p2, c->next->point, c->point);
+			/* If the product below is zero then
+			 * the points on either side of c 
+			 * are on the same line!
+			 * So, remove the point c
+			 */
+
+			if (pcb_vect_det2(p1, p2) == 0) {
+				pcb_poly_vertex_exclude(c);
+				free(c);
+				c = p;
+			}
+		}
+	}
+	C->Count = 0;
+	C->xmin = C->xmax = C->head.point[0];
+	C->ymin = C->ymax = C->head.point[1];
+
+	p = (c = &C->head)->prev;
+	if (c != p) {
+		do {
+			/* calculate area for orientation */
+			area += (double) (p->point[0] - c->point[0]) * (p->point[1] + c->point[1]);
+			cntrbox_adjust(C, c->point);
+			C->Count++;
+		}
+		while ((c = (p = c)->next) != &C->head);
+	}
+	C->area = PCB_ABS(area);
+	if (C->Count > 2)
+		C->Flags.orient = ((area < 0) ? PCB_PLF_INV : PCB_PLF_DIR);
+	C->tree = (pcb_rtree_t *) make_edge_tree(C);
+}																/* poly_PreContour */
+
+static pcb_r_dir_t flip_cb(const pcb_box_t * b, void *cl)
+{
+	struct seg *s = (struct seg *) b;
+	s->v = s->v->prev;
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+void pcb_poly_contour_inv(pcb_pline_t * c)
+{
+	pcb_vnode_t *cur, *next;
+	int r;
+
+	assert(c != NULL);
+	cur = &c->head;
+	do {
+		next = cur->next;
+		cur->next = cur->prev;
+		cur->prev = next;
+		/* fix the segment tree */
+	}
+	while ((cur = next) != &c->head);
+	c->Flags.orient ^= 1;
+	if (c->tree) {
+		pcb_r_search(c->tree, NULL, NULL, flip_cb, NULL, &r);
+		assert(r == c->Count);
+	}
+}
+
+void pcb_poly_vertex_exclude(pcb_vnode_t * node)
+{
+	assert(node != NULL);
+	if (node->cvc_next) {
+		free(node->cvc_next);
+		free(node->cvc_prev);
+	}
+	node->prev->next = node->next;
+	node->next->prev = node->prev;
+}
+
+void pcb_poly_vertex_include(pcb_vnode_t * after, pcb_vnode_t * node)
+{
+	double a, b;
+	assert(after != NULL);
+	assert(node != NULL);
+
+	node->prev = after;
+	node->next = after->next;
+	after->next = after->next->prev = node;
+	/* remove points on same line */
+	if (node->prev->prev == node)
+		return;											/* we don't have 3 points in the poly yet */
+	a = (node->point[1] - node->prev->prev->point[1]);
+	a *= (node->prev->point[0] - node->prev->prev->point[0]);
+	b = (node->point[0] - node->prev->prev->point[0]);
+	b *= (node->prev->point[1] - node->prev->prev->point[1]);
+	if (fabs(a - b) < EPSILON) {
+		pcb_vnode_t *t = node->prev;
+		t->prev->next = node;
+		node->prev = t->prev;
+		free(t);
+	}
+}
+
+pcb_bool pcb_poly_contour_copy(pcb_pline_t ** dst, pcb_pline_t * src)
+{
+	pcb_vnode_t *cur, *newnode;
+
+	assert(src != NULL);
+	*dst = NULL;
+	*dst = pcb_poly_contour_new(src->head.point);
+	if (*dst == NULL)
+		return pcb_false;
+
+	(*dst)->Count = src->Count;
+	(*dst)->Flags.orient = src->Flags.orient;
+	(*dst)->xmin = src->xmin, (*dst)->xmax = src->xmax;
+	(*dst)->ymin = src->ymin, (*dst)->ymax = src->ymax;
+	(*dst)->area = src->area;
+
+	for (cur = src->head.next; cur != &src->head; cur = cur->next) {
+		if ((newnode = pcb_poly_node_create(cur->point)) == NULL)
+			return pcb_false;
+		/* newnode->Flags = cur->Flags; */
+		pcb_poly_vertex_include((*dst)->head.prev, newnode);
+	}
+	(*dst)->tree = (pcb_rtree_t *) make_edge_tree(*dst);
+	return pcb_true;
+}
+
+/**********************************************************************/
+/* polygon routines */
+
+pcb_bool pcb_polyarea_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * src)
+{
+	*dst = NULL;
+	if (src != NULL)
+		*dst = (pcb_polyarea_t *) calloc(1, sizeof(pcb_polyarea_t));
+	if (*dst == NULL)
+		return pcb_false;
+	(*dst)->contour_tree = pcb_r_create_tree();
+
+	return pcb_polyarea_copy1(*dst, src);
+}
+
+pcb_bool pcb_polyarea_copy1(pcb_polyarea_t * dst, const pcb_polyarea_t * src)
+{
+	pcb_pline_t *cur, **last = &dst->contours;
+
+	*last = NULL;
+	dst->f = dst->b = dst;
+
+	for (cur = src->contours; cur != NULL; cur = cur->next) {
+		if (!pcb_poly_contour_copy(last, cur))
+			return pcb_false;
+		pcb_r_insert_entry(dst->contour_tree, (pcb_box_t *) * last);
+		last = &(*last)->next;
+	}
+	return pcb_true;
+}
+
+void pcb_polyarea_m_include(pcb_polyarea_t ** list, pcb_polyarea_t * a)
+{
+	if (*list == NULL)
+		a->f = a->b = a, *list = a;
+	else {
+		a->f = *list;
+		a->b = (*list)->b;
+		(*list)->b = (*list)->b->f = a;
+	}
+}
+
+pcb_bool pcb_polyarea_m_copy0(pcb_polyarea_t ** dst, const pcb_polyarea_t * srcfst)
+{
+	const pcb_polyarea_t *src = srcfst;
+	pcb_polyarea_t *di;
+
+	*dst = NULL;
+	if (src == NULL)
+		return pcb_false;
+	do {
+		if ((di = pcb_polyarea_create()) == NULL || !pcb_polyarea_copy1(di, src))
+			return pcb_false;
+		pcb_polyarea_m_include(dst, di);
+	}
+	while ((src = src->f) != srcfst);
+	return pcb_true;
+}
+
+pcb_bool pcb_polyarea_contour_include(pcb_polyarea_t * p, pcb_pline_t * c)
+{
+	pcb_pline_t *tmp;
+
+	if ((c == NULL) || (p == NULL))
+		return pcb_false;
+	if (c->Flags.orient == PCB_PLF_DIR) {
+		if (p->contours != NULL)
+			return pcb_false;
+		p->contours = c;
+	}
+	else {
+		if (p->contours == NULL)
+			return pcb_false;
+		/* link at front of hole list */
+		tmp = p->contours->next;
+		p->contours->next = c;
+		c->next = tmp;
+	}
+	pcb_r_insert_entry(p->contour_tree, (pcb_box_t *) c);
+	return pcb_true;
+}
+
+typedef struct pip {
+	int f;
+	pcb_vector_t p;
+	jmp_buf env;
+} pip;
+
+
+static pcb_r_dir_t crossing(const pcb_box_t * b, void *cl)
+{
+	struct seg *s = (struct seg *) b;
+	struct pip *p = (struct pip *) cl;
+
+	if (s->v->point[1] <= p->p[1]) {
+		if (s->v->next->point[1] > p->p[1]) {
+			pcb_vector_t v1, v2;
+			pcb_long64_t cross;
+			Vsub2(v1, s->v->next->point, s->v->point);
+			Vsub2(v2, p->p, s->v->point);
+			cross = (pcb_long64_t) v1[0] * v2[1] - (pcb_long64_t) v2[0] * v1[1];
+			if (cross == 0) {
+				p->f = 1;
+				longjmp(p->env, 1);
+			}
+			if (cross > 0)
+				p->f += 1;
+		}
+	}
+	else {
+		if (s->v->next->point[1] <= p->p[1]) {
+			pcb_vector_t v1, v2;
+			pcb_long64_t cross;
+			Vsub2(v1, s->v->next->point, s->v->point);
+			Vsub2(v2, p->p, s->v->point);
+			cross = (pcb_long64_t) v1[0] * v2[1] - (pcb_long64_t) v2[0] * v1[1];
+			if (cross == 0) {
+				p->f = 1;
+				longjmp(p->env, 1);
+			}
+			if (cross < 0)
+				p->f -= 1;
+		}
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+int pcb_poly_contour_inside(pcb_pline_t * c, pcb_vector_t p)
+{
+	struct pip info;
+	pcb_box_t ray;
+
+	if (!cntrbox_pointin(c, p))
+		return pcb_false;
+	info.f = 0;
+	info.p[0] = ray.X1 = p[0];
+	info.p[1] = ray.Y1 = p[1];
+	ray.X2 = COORD_MAX;
+	ray.Y2 = p[1] + 1;
+	if (setjmp(info.env) == 0)
+		pcb_r_search(c->tree, &ray, NULL, crossing, &info, NULL);
+	return info.f;
+}
+
+pcb_bool pcb_polyarea_contour_inside(pcb_polyarea_t * p, pcb_vector_t v0)
+{
+	pcb_pline_t *cur;
+
+	if ((p == NULL) || (v0 == NULL) || (p->contours == NULL))
+		return pcb_false;
+	cur = p->contours;
+	if (pcb_poly_contour_inside(cur, v0)) {
+		for (cur = cur->next; cur != NULL; cur = cur->next)
+			if (pcb_poly_contour_inside(cur, v0))
+				return pcb_false;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+pcb_bool poly_M_CheckInside(pcb_polyarea_t * p, pcb_vector_t v0)
+{
+	pcb_polyarea_t *cur;
+
+	if ((p == NULL) || (v0 == NULL))
+		return pcb_false;
+	cur = p;
+	do {
+		if (pcb_polyarea_contour_inside(cur, v0))
+			return pcb_true;
+	}
+	while ((cur = cur->f) != p);
+	return pcb_false;
+}
+
+static double dot(pcb_vector_t A, pcb_vector_t B)
+{
+	return (double) A[0] * (double) B[0] + (double) A[1] * (double) B[1];
+}
+
+/* Compute whether point is inside a triangle formed by 3 other points */
+/* Algorithm from http://www.blackpawn.com/texts/pointinpoly/default.html */
+static int point_in_triangle(pcb_vector_t A, pcb_vector_t B, pcb_vector_t C, pcb_vector_t P)
+{
+	pcb_vector_t v0, v1, v2;
+	double dot00, dot01, dot02, dot11, dot12;
+	double invDenom;
+	double u, v;
+
+	/* Compute vectors */
+	v0[0] = C[0] - A[0];
+	v0[1] = C[1] - A[1];
+	v1[0] = B[0] - A[0];
+	v1[1] = B[1] - A[1];
+	v2[0] = P[0] - A[0];
+	v2[1] = P[1] - A[1];
+
+	/* Compute dot products */
+	dot00 = dot(v0, v0);
+	dot01 = dot(v0, v1);
+	dot02 = dot(v0, v2);
+	dot11 = dot(v1, v1);
+	dot12 = dot(v1, v2);
+
+	/* Compute barycentric coordinates */
+	invDenom = 1. / (dot00 * dot11 - dot01 * dot01);
+	u = (dot11 * dot02 - dot01 * dot12) * invDenom;
+	v = (dot00 * dot12 - dot01 * dot02) * invDenom;
+
+	/* Check if point is in triangle */
+	return (u > 0.0) && (v > 0.0) && (u + v < 1.0);
+}
+
+
+/* Returns the dot product of pcb_vector_t A->B, and a vector
+ * orthogonal to pcb_vector_t C->D. The result is not normalised, so will be
+ * weighted by the magnitude of the C->D vector.
+ */
+static double dot_orthogonal_to_direction(pcb_vector_t A, pcb_vector_t B, pcb_vector_t C, pcb_vector_t D)
+{
+	pcb_vector_t l1, l2, l3;
+	l1[0] = B[0] - A[0];
+	l1[1] = B[1] - A[1];
+	l2[0] = D[0] - C[0];
+	l2[1] = D[1] - C[1];
+
+	l3[0] = -l2[1];
+	l3[1] = l2[0];
+
+	return dot(l1, l3);
+}
+
+/* Algorithm from http://www.exaflop.org/docs/cgafaq/cga2.html
+ *
+ * "Given a simple polygon, find some point inside it. Here is a method based
+ * on the proof that there exists an internal diagonal, in [O'Rourke, 13-14].
+ * The idea is that the midpoint of a diagonal is interior to the polygon.
+ *
+ * 1.  Identify a convex vertex v; let its adjacent vertices be a and b.
+ * 2.  For each other vertex q do:
+ * 2a. If q is inside avb, compute distance to v (orthogonal to ab).
+ * 2b. Save point q if distance is a new min.
+ * 3.  If no point is inside, return midpoint of ab, or centroid of avb.
+ * 4.  Else if some point inside, qv is internal: return its midpoint."
+ *
+ * [O'Rourke]: Computational Geometry in C (2nd Ed.)
+ *             Joseph O'Rourke, Cambridge University Press 1998,
+ *             ISBN 0-521-64010-5 Pbk, ISBN 0-521-64976-5 Hbk
+ */
+static void poly_ComputeInteriorPoint(pcb_pline_t * poly, pcb_vector_t v)
+{
+	pcb_vnode_t *pt1, *pt2, *pt3, *q;
+	pcb_vnode_t *min_q = NULL;
+	double dist;
+	double min_dist = 0.0;
+	double dir = (poly->Flags.orient == PCB_PLF_DIR) ? 1. : -1;
+
+	/* Find a convex node on the polygon */
+	pt1 = &poly->head;
+	do {
+		double dot_product;
+
+		pt2 = pt1->next;
+		pt3 = pt2->next;
+
+		dot_product = dot_orthogonal_to_direction(pt1->point, pt2->point, pt3->point, pt2->point);
+
+		if (dot_product * dir > 0.)
+			break;
+	}
+	while ((pt1 = pt1->next) != &poly->head);
+
+	/* Loop over remaining vertices */
+	q = pt3;
+	do {
+		/* Is current vertex "q" outside pt1 pt2 pt3 triangle? */
+		if (!point_in_triangle(pt1->point, pt2->point, pt3->point, q->point))
+			continue;
+
+		/* NO: compute distance to pt2 (v) orthogonal to pt1 - pt3) */
+		/*     Record minimum */
+		dist = dot_orthogonal_to_direction(q->point, pt2->point, pt1->point, pt3->point);
+		if (min_q == NULL || dist < min_dist) {
+			min_dist = dist;
+			min_q = q;
+		}
+	}
+	while ((q = q->next) != pt2);
+
+	/* Were any "q" found inside pt1 pt2 pt3? */
+	if (min_q == NULL) {
+		/* NOT FOUND: Return midpoint of pt1 pt3 */
+		v[0] = (pt1->point[0] + pt3->point[0]) / 2;
+		v[1] = (pt1->point[1] + pt3->point[1]) / 2;
+	}
+	else {
+		/* FOUND: Return mid point of min_q, pt2 */
+		v[0] = (pt2->point[0] + min_q->point[0]) / 2;
+		v[1] = (pt2->point[1] + min_q->point[1]) / 2;
+	}
+}
+
+
+/* NB: This function assumes the caller _knows_ the contours do not
+ *     intersect. If the contours intersect, the result is undefined.
+ *     It will return the correct result if the two contours share
+ *     common points between their contours. (Identical contours
+ *     are treated as being inside each other).
+ */
+int pcb_poly_contour_in_contour(pcb_pline_t * poly, pcb_pline_t * inner)
+{
+	pcb_vector_t point;
+	assert(poly != NULL);
+	assert(inner != NULL);
+	if (cntrbox_inside(inner, poly)) {
+		/* We need to prove the "inner" contour is not outside
+		 * "poly" contour. If it is outside, we can return.
+		 */
+		if (!pcb_poly_contour_inside(poly, inner->head.point))
+			return 0;
+
+		poly_ComputeInteriorPoint(inner, point);
+		return pcb_poly_contour_inside(poly, point);
+	}
+	return 0;
+}
+
+void pcb_polyarea_init(pcb_polyarea_t * p)
+{
+	p->f = p->b = p;
+	p->contours = NULL;
+	p->contour_tree = pcb_r_create_tree();
+}
+
+pcb_polyarea_t *pcb_polyarea_create(void)
+{
+	pcb_polyarea_t *res;
+
+	if ((res = (pcb_polyarea_t *) malloc(sizeof(pcb_polyarea_t))) != NULL)
+		pcb_polyarea_init(res);
+	return res;
+}
+
+void pcb_poly_contours_free(pcb_pline_t ** pline)
+{
+	pcb_pline_t *pl;
+
+	while ((pl = *pline) != NULL) {
+		*pline = pl->next;
+		pcb_poly_contour_del(&pl);
+	}
+}
+
+void pcb_polyarea_free(pcb_polyarea_t ** p)
+{
+	pcb_polyarea_t *cur;
+
+	if (*p == NULL)
+		return;
+	for (cur = (*p)->f; cur != *p; cur = (*p)->f) {
+		pcb_poly_contours_free(&cur->contours);
+		pcb_r_destroy_tree(&cur->contour_tree);
+		cur->f->b = cur->b;
+		cur->b->f = cur->f;
+		free(cur);
+	}
+	pcb_poly_contours_free(&cur->contours);
+	pcb_r_destroy_tree(&cur->contour_tree);
+	free(*p), *p = NULL;
+}
+
+static pcb_bool inside_sector(pcb_vnode_t * pn, pcb_vector_t p2)
+{
+	pcb_vector_t cdir, ndir, pdir;
+	int p_c, n_c, p_n;
+
+	assert(pn != NULL);
+	vect_sub(cdir, p2, pn->point);
+	vect_sub(pdir, pn->point, pn->prev->point);
+	vect_sub(ndir, pn->next->point, pn->point);
+
+	p_c = pcb_vect_det2(pdir, cdir) >= 0;
+	n_c = pcb_vect_det2(ndir, cdir) >= 0;
+	p_n = pcb_vect_det2(pdir, ndir) >= 0;
+
+	if ((p_n && p_c && n_c) || ((!p_n) && (p_c || n_c)))
+		return pcb_true;
+	else
+		return pcb_false;
+}																/* inside_sector */
+
+/* returns pcb_true if bad contour */
+typedef struct {
+	int marks, lines;
+#ifndef NDEBUG
+	pcb_coord_t x[8], y[8];
+	pcb_coord_t x1[8], y1[8], x2[8], y2[8];
+	char msg[256];
+#endif
+} pa_chk_res_t;
+
+
+#ifndef NDEBUG
+#define PA_CHK_MARK(x_, y_) \
+do { \
+	if (res->marks < sizeof(res->x) / sizeof(res->x[0])) { \
+		res->x[res->marks] = x_; \
+		res->y[res->marks] = y_; \
+		res->marks++; \
+	} \
+} while(0)
+#define PA_CHK_LINE(x1_, y1_, x2_, y2_) \
+do { \
+	if (res->lines < sizeof(res->x1) / sizeof(res->x1[0])) { \
+		res->x1[res->lines] = x1_; \
+		res->y1[res->lines] = y1_; \
+		res->x2[res->lines] = x2_; \
+		res->y2[res->lines] = y2_; \
+		res->lines++; \
+	} \
+} while(0)
+#else
+#define PA_CHK_MARK(x, y)
+#define PA_CHK_LINE(x1, y1, x2, y2)
+#endif
+
+
+PCB_INLINE pcb_bool PA_CHK_ERROR(pa_chk_res_t *res, const char *fmt, ...)
+{
+#ifndef NDEBUG
+	va_list ap;
+	va_start(ap, fmt);
+	pcb_vsnprintf(res->msg, sizeof(res->msg), fmt, ap);
+	va_end(ap);
+#endif
+	return pcb_true;
+}
+
+pcb_bool pcb_polyarea_contour_check_(pcb_pline_t *a, pa_chk_res_t *res)
+{
+	pcb_vnode_t *a1, *a2, *hit1, *hit2;
+	pcb_vector_t i1, i2;
+	int icnt;
+
+#ifndef NDEBUG
+	*res->msg = '\0';
+#endif
+	res->marks = res->lines = 0;
+
+	assert(a != NULL);
+	a1 = &a->head;
+	do {
+		a2 = a1;
+		do {
+			if (!node_neighbours(a1, a2) && (icnt = pcb_vect_inters2(a1->point, a1->next->point, a2->point, a2->next->point, i1, i2)) > 0) {
+				if (icnt > 1) {
+					PA_CHK_MARK(a1->point[0], a1->point[1]);
+					PA_CHK_MARK(a2->point[0], a2->point[1]);
+					return PA_CHK_ERROR(res, "icnt > 1 (%d) at %mm;%mm or  %mm;%mm", icnt, a1->point[0], a1->point[1], a2->point[0], a2->point[1]);
+				}
+
+#warning TODO: ugly workaround: test where exactly the intersection happens and tune the endpoint of the line
+				/* EPSILON^2 for endpoint matching; the bool algebra code is not
+				   perfect and causes tiny self intersections at the end of sharp
+				   spikes. Accept at most 10 nanometer of such intersection */
+#				define ENDP_EPSILON 100
+
+				if (pcb_vect_dist2(i1, a1->point) < ENDP_EPSILON)
+					hit1 = a1;
+				else if (pcb_vect_dist2(i1, a1->next->point) < ENDP_EPSILON)
+					hit1 = a1->next;
+				else
+					hit1 = NULL;
+
+				if (pcb_vect_dist2(i1, a2->point) < ENDP_EPSILON)
+					hit2 = a2;
+				else if (pcb_vect_dist2(i1, a2->next->point) < ENDP_EPSILON)
+					hit2 = a2->next;
+				else
+					hit2 = NULL;
+
+				if ((hit1 == NULL) && (hit2 == NULL)) {
+					/* If the intersection didn't land on an end-point of either
+					 * line, we know the lines cross and we return pcb_true.
+					 */
+					PA_CHK_LINE(a1->point[0], a1->point[1], a1->next->point[0], a1->next->point[1]);
+					PA_CHK_LINE(a2->point[0], a2->point[1], a2->next->point[0], a2->next->point[1]);
+					return PA_CHK_ERROR(res, "lines cross between %mm;%mm and %mm;%mm", a1->point[0], a1->point[1], a2->point[0], a2->point[1]);
+				}
+				else if (hit1 == NULL) {
+					/* An end-point of the second line touched somewhere along the
+					   length of the first line. Check where the second line leads. */
+					if (inside_sector(hit2, a1->point) != inside_sector(hit2, a1->next->point)) {
+						PA_CHK_MARK(a1->point[0], a1->point[1]);
+						PA_CHK_MARK(hit2->point[0], hit2->point[1]);
+						return PA_CHK_ERROR(res, "lines is inside sector (1) at %mm;%mm", a1->point[0], a1->point[1]);
+					}
+				}
+				else if (hit2 == NULL) {
+					/* An end-point of the first line touched somewhere along the
+					   length of the second line. Check where the first line leads. */
+					if (inside_sector(hit1, a2->point) != inside_sector(hit1, a2->next->point)) {
+						PA_CHK_MARK(a2->point[0], a2->point[1]);
+						PA_CHK_MARK(hit1->point[0], hit1->point[1]);
+						return PA_CHK_ERROR(res, "lines is inside sector (2) at %mm;%mm", a2->point[0], a2->point[1]);
+					}
+				}
+				else {
+					/* Both lines intersect at an end-point. Check where they lead. */
+					if (inside_sector(hit1, hit2->prev->point) != inside_sector(hit1, hit2->next->point)) {
+						PA_CHK_MARK(hit1->point[0], hit2->point[1]);
+						PA_CHK_MARK(hit2->point[0], hit2->point[1]);
+						return PA_CHK_ERROR(res, "lines is inside sector (3) at %mm;%mm or %mm;%mm", hit1->point[0], hit1->point[1], hit2->point[0], hit2->point[1]);
+					}
+				}
+			}
+		}
+		while ((a2 = a2->next) != &a->head);
+	}
+	while ((a1 = a1->next) != &a->head);
+	return pcb_false;
+}
+
+pcb_bool pcb_polyarea_contour_check(pcb_pline_t *a)
+{
+	pa_chk_res_t res;
+	return pcb_polyarea_contour_check_(a, &res);
+}
+
+void pcb_polyarea_bbox(pcb_polyarea_t * p, pcb_box_t * b)
+{
+	pcb_pline_t *n;
+	/*int cnt;*/
+
+	n = p->contours;
+	b->X1 = b->X2 = n->xmin;
+	b->Y1 = b->Y2 = n->ymin;
+
+	for (/*cnt = 0*/; /*cnt < 2 */ n != NULL; n = n->next) {
+		if (n->xmin < b->X1)
+			b->X1 = n->xmin;
+		if (n->ymin < b->Y1)
+			b->Y1 = n->ymin;
+		if (n->xmax > b->X2)
+			b->X2 = n->xmax;
+		if (n->ymax > b->Y2)
+			b->Y2 = n->ymax;
+/*		if (n == p->contours)
+			cnt++;*/
+	}
+}
+
+#ifndef NDEBUG
+static void pcb_poly_valid_report(pcb_pline_t *c, pcb_vnode_t *pl, pa_chk_res_t *chk)
+{
+	pcb_vnode_t *v, *n;
+	pcb_coord_t minx = COORD_MAX, miny = COORD_MAX, maxx = -COORD_MAX, maxy = -COORD_MAX;
+
+#define update_minmax(min, max, val) \
+	if (val < min) min = val; \
+	if (val > max) max = val;
+	if (chk != NULL)
+		pcb_fprintf(stderr, "Details: %s\n", chk->msg);
+	pcb_fprintf(stderr, "!!!animator start\n");
+	v = pl;
+	do {
+		n = v->next;
+		update_minmax(minx, maxx, v->point[0]);
+		update_minmax(miny, maxy, v->point[1]);
+		update_minmax(minx, maxx, n->point[0]);
+		update_minmax(miny, maxy, n->point[1]);
+	}
+	while ((v = v->next) != pl);
+	pcb_fprintf(stderr, "scale 1 -1\n");
+	pcb_fprintf(stderr, "viewport %mm %mm - %mm %mm\n", minx, miny, maxx, maxy);
+	pcb_fprintf(stderr, "frame\n");
+	v = pl;
+	do {
+		n = v->next;
+		pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]);
+	}
+	while ((v = v->next) != pl);
+
+	if ((chk != NULL) && (chk->marks > 0)) {
+		int n, MR=PCB_MM_TO_COORD(0.05);
+		fprintf(stderr, "color #770000\n");
+		for(n = 0; n < chk->marks; n++) {
+			pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]-MR, chk->x[n]+MR, chk->y[n]+MR);
+			pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x[n]-MR, chk->y[n]+MR, chk->x[n]+MR, chk->y[n]-MR);
+		}
+	}
+
+	if ((chk != NULL) && (chk->lines > 0)) {
+		int n;
+		fprintf(stderr, "color #990000\n");
+		for(n = 0; n < chk->lines; n++)
+			pcb_fprintf(stderr, "line %#mm %#mm %#mm %#mm\n", chk->x1[n], chk->y1[n], chk->x2[n], chk->y2[n]);
+	}
+
+	fprintf(stderr, "flush\n");
+	fprintf(stderr, "!!!animator end\n");
+
+#undef update_minmax
+}
+#endif
+
+
+pcb_bool pcb_poly_valid(pcb_polyarea_t * p)
+{
+	pcb_pline_t *c;
+	pa_chk_res_t chk;
+
+	if ((p == NULL) || (p->contours == NULL))
+		return pcb_false;
+
+	if (p->contours->Flags.orient == PCB_PLF_INV) {
+#ifndef NDEBUG
+		pcb_fprintf(stderr, "Invalid Outer pcb_pline_t: failed orient\n");
+		pcb_poly_valid_report(p->contours, &p->contours->head, NULL);
+#endif
+		return pcb_false;
+	}
+
+	if (pcb_polyarea_contour_check_(p->contours, &chk)) {
+#ifndef NDEBUG
+		pcb_fprintf(stderr, "Invalid Outer pcb_pline_t: failed contour check\n");
+		pcb_poly_valid_report(p->contours, &p->contours->head, &chk);
+#endif
+		return pcb_false;
+	}
+
+	for (c = p->contours->next; c != NULL; c = c->next) {
+		if (c->Flags.orient == PCB_PLF_DIR) {
+#ifndef NDEBUG
+			pcb_fprintf(stderr, "Invalid Inner: pcb_pline_t orient = %d\n", c->Flags.orient);
+			pcb_poly_valid_report(c, &c->head, NULL);
+#endif
+			return pcb_false;
+		}
+		if (pcb_polyarea_contour_check_(c, &chk)) {
+#ifndef NDEBUG
+			pcb_fprintf(stderr, "Invalid Inner: failed contour check\n");
+			pcb_poly_valid_report(c, &c->head, &chk);
+#endif
+			return pcb_false;
+		}
+		if (!pcb_poly_contour_in_contour(p->contours, c)) {
+#ifndef NDEBUG
+			pcb_fprintf(stderr, "Invalid Inner: overlap with outer\n");
+			pcb_poly_valid_report(c, &c->head, NULL);
+#endif
+			return pcb_false;
+		}
+	}
+	return pcb_true;
+}
+
+
+pcb_vector_t vect_zero = { (long) 0, (long) 0 };
+
+/*********************************************************************/
+/*             L o n g   V e c t o r   S t u f f                     */
+/*********************************************************************/
+
+void vect_init(pcb_vector_t v, double x, double y)
+{
+	v[0] = (long) x;
+	v[1] = (long) y;
+}																/* vect_init */
+
+#define Vzero(a)   ((a)[0] == 0. && (a)[1] == 0.)
+
+#define Vsub(a,b,c) {(a)[0]=(b)[0]-(c)[0];(a)[1]=(b)[1]-(c)[1];}
+
+int vect_equal(pcb_vector_t v1, pcb_vector_t v2)
+{
+	return (v1[0] == v2[0] && v1[1] == v2[1]);
+}																/* vect_equal */
+
+
+void vect_sub(pcb_vector_t res, pcb_vector_t v1, pcb_vector_t v2)
+{
+Vsub(res, v1, v2)}							/* vect_sub */
+
+void vect_min(pcb_vector_t v1, pcb_vector_t v2, pcb_vector_t v3)
+{
+	v1[0] = (v2[0] < v3[0]) ? v2[0] : v3[0];
+	v1[1] = (v2[1] < v3[1]) ? v2[1] : v3[1];
+}																/* vect_min */
+
+void vect_max(pcb_vector_t v1, pcb_vector_t v2, pcb_vector_t v3)
+{
+	v1[0] = (v2[0] > v3[0]) ? v2[0] : v3[0];
+	v1[1] = (v2[1] > v3[1]) ? v2[1] : v3[1];
+}																/* vect_max */
+
+double pcb_vect_len2(pcb_vector_t v)
+{
+	return ((double) v[0] * v[0] + (double) v[1] * v[1]);	/* why sqrt? only used for compares */
+}
+
+double pcb_vect_dist2(pcb_vector_t v1, pcb_vector_t v2)
+{
+	double dx = v1[0] - v2[0];
+	double dy = v1[1] - v2[1];
+
+	return (dx * dx + dy * dy);		/* why sqrt */
+}
+
+/* value has sign of angle between vectors */
+double pcb_vect_det2(pcb_vector_t v1, pcb_vector_t v2)
+{
+	return (((double) v1[0] * v2[1]) - ((double) v2[0] * v1[1]));
+}
+
+static double vect_m_dist(pcb_vector_t v1, pcb_vector_t v2)
+{
+	double dx = v1[0] - v2[0];
+	double dy = v1[1] - v2[1];
+	double dd = (dx * dx + dy * dy);	/* sqrt */
+
+	if (dx > 0)
+		return +dd;
+	if (dx < 0)
+		return -dd;
+	if (dy > 0)
+		return +dd;
+	return -dd;
+}																/* vect_m_dist */
+
+/*
+vect_inters2
+ (C) 1993 Klamer Schutte
+ (C) 1997 Michael Leonov, Alexey Nikitin
+*/
+
+int pcb_vect_inters2(pcb_vector_t p1, pcb_vector_t p2, pcb_vector_t q1, pcb_vector_t q2, pcb_vector_t S1, pcb_vector_t S2)
+{
+	double s, t, deel;
+	double rpx, rpy, rqx, rqy;
+
+	if (max(p1[0], p2[0]) < min(q1[0], q2[0]) ||
+			max(q1[0], q2[0]) < min(p1[0], p2[0]) || max(p1[1], p2[1]) < min(q1[1], q2[1]) || max(q1[1], q2[1]) < min(p1[1], p2[1]))
+		return 0;
+
+	rpx = p2[0] - p1[0];
+	rpy = p2[1] - p1[1];
+	rqx = q2[0] - q1[0];
+	rqy = q2[1] - q1[1];
+
+	deel = rpy * rqx - rpx * rqy;	/* -vect_det(rp,rq); */
+
+	/* coordinates are 30-bit integers so deel will be exactly zero
+	 * if the lines are parallel
+	 */
+
+	if (deel == 0) {							/* parallel */
+		double dc1, dc2, d1, d2, h;	/* Check to see whether p1-p2 and q1-q2 are on the same line */
+		pcb_vector_t hp1, hq1, hp2, hq2, q1p1, q1q2;
+
+		Vsub2(q1p1, q1, p1);
+		Vsub2(q1q2, q1, q2);
+
+
+		/* If this product is not zero then p1-p2 and q1-q2 are not on same line! */
+		if (pcb_vect_det2(q1p1, q1q2) != 0)
+			return 0;
+		dc1 = 0;										/* m_len(p1 - p1) */
+
+		dc2 = vect_m_dist(p1, p2);
+		d1 = vect_m_dist(p1, q1);
+		d2 = vect_m_dist(p1, q2);
+
+/* Sorting the independent points from small to large */
+		Vcpy2(hp1, p1);
+		Vcpy2(hp2, p2);
+		Vcpy2(hq1, q1);
+		Vcpy2(hq2, q2);
+		if (dc1 > dc2) {						/* hv and h are used as help-variable. */
+			Vswp2(hp1, hp2);
+			h = dc1, dc1 = dc2, dc2 = h;
+		}
+		if (d1 > d2) {
+			Vswp2(hq1, hq2);
+			h = d1, d1 = d2, d2 = h;
+		}
+
+/* Now the line-pieces are compared */
+
+		if (dc1 < d1) {
+			if (dc2 < d1)
+				return 0;
+			if (dc2 < d2) {
+				Vcpy2(S1, hp2);
+				Vcpy2(S2, hq1);
+			}
+			else {
+				Vcpy2(S1, hq1);
+				Vcpy2(S2, hq2);
+			};
+		}
+		else {
+			if (dc1 > d2)
+				return 0;
+			if (dc2 < d2) {
+				Vcpy2(S1, hp1);
+				Vcpy2(S2, hp2);
+			}
+			else {
+				Vcpy2(S1, hp1);
+				Vcpy2(S2, hq2);
+			};
+		}
+		return (Vequ2(S1, S2) ? 1 : 2);
+	}
+	else {												/* not parallel */
+		/*
+		 * We have the lines:
+		 * l1: p1 + s(p2 - p1)
+		 * l2: q1 + t(q2 - q1)
+		 * And we want to know the intersection point.
+		 * Calculate t:
+		 * p1 + s(p2-p1) = q1 + t(q2-q1)
+		 * which is similar to the two equations:
+		 * p1x + s * rpx = q1x + t * rqx
+		 * p1y + s * rpy = q1y + t * rqy
+		 * Multiplying these by rpy resp. rpx gives:
+		 * rpy * p1x + s * rpx * rpy = rpy * q1x + t * rpy * rqx
+		 * rpx * p1y + s * rpx * rpy = rpx * q1y + t * rpx * rqy
+		 * Subtracting these gives:
+		 * rpy * p1x - rpx * p1y = rpy * q1x - rpx * q1y + t * ( rpy * rqx - rpx * rqy )
+		 * So t can be isolated:
+		 * t = (rpy * ( p1x - q1x ) + rpx * ( - p1y + q1y )) / ( rpy * rqx - rpx * rqy )
+		 * and s can be found similarly
+		 * s = (rqy * (q1x - p1x) + rqx * (p1y - q1y))/( rqy * rpx - rqx * rpy)
+		 */
+
+		if (Vequ2(q1, p1) || Vequ2(q1, p2)) {
+			S1[0] = q1[0];
+			S1[1] = q1[1];
+		}
+		else if (Vequ2(q2, p1) || Vequ2(q2, p2)) {
+			S1[0] = q2[0];
+			S1[1] = q2[1];
+		}
+		else {
+			s = (rqy * (p1[0] - q1[0]) + rqx * (q1[1] - p1[1])) / deel;
+			if (s < 0 || s > 1.)
+				return 0;
+			t = (rpy * (p1[0] - q1[0]) + rpx * (q1[1] - p1[1])) / deel;
+			if (t < 0 || t > 1.)
+				return 0;
+
+			S1[0] = q1[0] + ROUND(t * rqx);
+			S1[1] = q1[1] + ROUND(t * rqy);
+		}
+		return 1;
+	}
+}																/* vect_inters2 */
+
+/*
+ * pcb_pline_isect_line()
+ * (C) 2017, 2018 Tibor 'Igor2' Palinkas
+*/
+
+typedef struct {
+	pcb_vector_t l1, l2;
+	pcb_coord_t cx, cy;
+} pline_isect_line_t;
+
+static pcb_r_dir_t pline_isect_line_cb(const pcb_box_t * b, void *cl)
+{
+	pline_isect_line_t *ctx = (pline_isect_line_t *)cl;
+	struct seg *s = (struct seg *)b;
+	pcb_vector_t S1, S2;
+
+	if (pcb_vect_inters2(s->v->point, s->v->next->point, ctx->l1, ctx->l2, S1, S2)) {
+		ctx->cx = S1[0];
+		ctx->cy = S1[1];
+		return PCB_R_DIR_CANCEL; /* found */
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+pcb_bool pcb_pline_isect_line(pcb_pline_t *pl, pcb_coord_t lx1, pcb_coord_t ly1, pcb_coord_t lx2, pcb_coord_t ly2, pcb_coord_t *cx, pcb_coord_t *cy)
+{
+	pline_isect_line_t ctx;
+	pcb_box_t lbx;
+	ctx.l1[0] = lx1; ctx.l1[1] = ly1;
+	ctx.l2[0] = lx2; ctx.l2[1] = ly2;
+	lbx.X1 = MIN(lx1, lx2);
+	lbx.Y1 = MIN(ly1, ly2);
+	lbx.X2 = MAX(lx1, lx2);
+	lbx.Y2 = MAX(ly1, ly2);
+
+	if (pl->tree == NULL)
+		pl->tree = (pcb_rtree_t *) make_edge_tree(pl);
+
+	if (pcb_r_search(pl->tree, &lbx, NULL, pline_isect_line_cb, &ctx, NULL) == PCB_R_DIR_CANCEL) {
+		if (cx != NULL) *cx = ctx.cx;
+		if (cy != NULL) *cy = ctx.cy;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/*
+ * pcb_pline_isect_circle()
+ * (C) 2017 Tibor 'Igor2' Palinkas
+*/
+
+typedef struct {
+	pcb_coord_t cx, cy, r;
+	double r2;
+} pline_isect_circ_t;
+
+static pcb_r_dir_t pline_isect_circ_cb(const pcb_box_t * b, void *cl)
+{
+	pline_isect_circ_t *ctx = (pline_isect_circ_t *)cl;
+	struct seg *s = (struct seg *)b;
+	pcb_vector_t S1, S2;
+	pcb_vector_t ray1, ray2;
+	double ox, oy, dx, dy, l;
+
+	/* Cheap: if either line endpoint is within the circle, we sure have an intersection */
+	if ((PCB_SQUARE(s->v->point[0] - ctx->cx) + PCB_SQUARE(s->v->point[1] - ctx->cy)) <= ctx->r2)
+		return PCB_R_DIR_CANCEL; /* found */
+	if ((PCB_SQUARE(s->v->next->point[0] - ctx->cx) + PCB_SQUARE(s->v->next->point[1] - ctx->cy)) <= ctx->r2)
+		return PCB_R_DIR_CANCEL; /* found */
+
+	dx = s->v->point[0] - s->v->next->point[0];
+	dy = s->v->point[1] - s->v->next->point[1];
+	l = sqrt(PCB_SQUARE(dx) + PCB_SQUARE(dy));
+	ox = -dy / l * (double)ctx->r;
+	oy = dx / l * (double)ctx->r;
+
+	ray1[0] = ctx->cx - ox; ray1[1] = ctx->cy - oy;
+	ray2[0] = ctx->cx + ox; ray2[1] = ctx->cy + oy;
+
+	if (pcb_vect_inters2(s->v->point, s->v->next->point, ray1, ray2, S1, S2))
+		return PCB_R_DIR_CANCEL; /* found */
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+pcb_bool pcb_pline_isect_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r)
+{
+	pline_isect_circ_t ctx;
+	pcb_box_t cbx;
+	ctx.cx = cx; ctx.cy = cy;
+	ctx.r = r; ctx.r2 = (double)r * (double)r;
+	cbx.X1 = cx - r; cbx.Y1 = cy - r;
+	cbx.X2 = cx + r; cbx.Y2 = cy + r;
+
+	if (pl->tree == NULL)
+		pl->tree = (pcb_rtree_t *) make_edge_tree(pl);
+
+	return pcb_r_search(pl->tree, &cbx, NULL, pline_isect_circ_cb, &ctx, NULL) == PCB_R_DIR_CANCEL;
+}
+
+
+/*
+ * pcb_pline_embraces_circle()
+ * If the circle does not intersect the polygon (the caller needs to check this)
+ * return whether the circle is fully within the polygon or not.
+ * Shoots a ray to the right from center+radius, then one to the left from
+ * center-radius; if both ray cross odd number of pline segments, we are in
+ * (or intersecting).
+ * (C) 2017 Tibor 'Igor2' Palinkas
+*/
+static pcb_r_dir_t pline_embraces_circ_cb(const pcb_box_t * b, void *cl)
+{
+	int *cnt = (int *)cl;
+	(*cnt)++;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+pcb_bool pcb_pline_embraces_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r)
+{
+	pcb_box_t bx;
+	int cnt;
+
+	bx.Y1 = cy; bx.Y2 = cy+1;
+	if (pl->tree == NULL)
+		pl->tree = (pcb_rtree_t *) make_edge_tree(pl);
+
+	/* ray to the right */
+	bx.X1 = cx + r;
+	bx.X2 = COORD_MAX;
+	cnt = 0;
+	pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL);
+	if ((cnt % 2) == 0)
+		return pcb_false;
+
+	/* ray to the right */
+	bx.X1 = -COORD_MAX;
+	bx.X2 = cx - r;
+	cnt = 0;
+	pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL);
+	if ((cnt % 2) == 0)
+		return pcb_false;
+
+	return pcb_true;
+}
+
+/*
+ * pcb_pline_isect_circle()
+ * (C) 2017 Tibor 'Igor2' Palinkas
+*/
+pcb_bool pcb_pline_overlaps_circ(pcb_pline_t *pl, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r)
+{
+	pcb_box_t cbx, pbx;
+	cbx.X1 = cx - r; cbx.Y1 = cy - r;
+	cbx.X2 = cx + r; cbx.Y2 = cy + r;
+	pbx.X1 = pl->xmin; pbx.Y1 = pl->ymin;
+	pbx.X2 = pl->xmax; pbx.Y2 = pl->ymax;
+
+	/* if there's no overlap in bounding boxes, don't do any expensive calc */
+	if (!(pcb_box_intersect(&cbx, &pbx)))
+		return pcb_false;
+
+	if (pl->tree == NULL)
+		pl->tree = (pcb_rtree_t *) make_edge_tree(pl);
+
+	if (pcb_pline_isect_circ(pl, cx, cy, r))
+		return pcb_true;
+
+	return pcb_pline_embraces_circ(pl, cx, cy, r);
+}
+
+
+/*
+ * pcb_is_point_in_convex_quad()
+ * (C) 2017 Tibor 'Igor2' Palinkas
+*/
+pcb_bool_t pcb_is_point_in_convex_quad(pcb_vector_t p, pcb_vector_t *q)
+{
+	return point_in_triangle(q[0], q[1], q[2], p) || point_in_triangle(q[0], q[3], q[2], p);
+}
+
+
+/*
+ * pcb_polyarea_move()
+ * (C) 2017 Tibor 'Igor2' Palinkas
+*/
+void pcb_polyarea_move(pcb_polyarea_t *pa1, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int cnt;
+	pcb_polyarea_t *pa;
+
+	for (pa = pa1, cnt = 0; pa != NULL; pa = pa->f) {
+		pcb_pline_t *pl;
+		if (pa == pa1) {
+			cnt++;
+			if (cnt > 1)
+				break;
+		}
+		if (pa->contour_tree != NULL)
+			pcb_r_destroy_tree(&pa->contour_tree);
+		pa->contour_tree = pcb_r_create_tree();
+		for(pl = pa->contours; pl != NULL; pl = pl->next) {
+			pcb_vnode_t *v;
+			int cnt2 = 0;
+			for(v = &pl->head; v != NULL; v = v->next) {
+				if (v == &pl->head) {
+					cnt2++;
+					if (cnt2 > 1)
+						break;
+				}
+				v->point[0] += dx;
+				v->point[1] += dy;
+			}
+			pl->xmin += dx;
+			pl->ymin += dy;
+			pl->xmax += dx;
+			pl->ymax += dy;
+			if (pl->tree != NULL) {
+				pcb_r_free_tree_data(pl->tree, free);
+				pcb_r_destroy_tree(&pl->tree);
+			}
+			pl->tree = (pcb_rtree_t *)make_edge_tree(pl);
+
+			pcb_r_insert_entry(pa->contour_tree, (pcb_box_t *)pl);
+		}
+	}
+}
+
+#include "polygon_selfi.c"
+
+/* how about expanding polygons so that edges can be arcs rather than
+ * lines. Consider using the third coordinate to store the radius of the
+ * arc. The arc would pass through the vertex points. Positive radius
+ * would indicate the arc bows left (center on right of P1-P2 path)
+ * negative radius would put the center on the other side. 0 radius
+ * would mean the edge is a line instead of arc
+ * The intersections of the two circles centered at the vertex points
+ * would determine the two possible arc centers. If P2.x > P1.x then
+ * the center with smaller Y is selected for positive r. If P2.y > P1.y
+ * then the center with greater X is selected for positive r.
+ *
+ * the vec_inters2() routine would then need to handle line-line
+ * line-arc and arc-arc intersections.
+ *
+ * perhaps reverse tracing the arc would require look-ahead to check
+ * for arcs
+ */
Index: tags/2.0.1/src/polygon_act.c
===================================================================
--- tags/2.0.1/src/polygon_act.c	(nonexistent)
+++ tags/2.0.1/src/polygon_act.c	(revision 18980)
@@ -0,0 +1,163 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "undo.h"
+#include "funchash_core.h"
+
+#include "polygon.h"
+#include "draw.h"
+#include "search.h"
+#include "crosshair.h"
+#include "compat_nls.h"
+#include "tool.h"
+#include "actions.h"
+
+#include "obj_poly.h"
+
+static const char pcb_acts_MorphPolygon[] = "pcb_poly_morph(Object|Selected)";
+static const char pcb_acth_MorphPolygon[] = "Converts dead polygon islands into separate polygons.";
+
+/* %start-doc actions MorphPolygon
+
+If a polygon is divided into unconnected "islands", you can use
+this command to convert the otherwise disappeared islands into
+separate polygons. Be sure the cursor is over a portion of the
+polygon that remains visible. Very small islands that may flake
+off are automatically deleted.
+
+%end-doc */
+
+static fgw_error_t pcb_act_MorphPolygon(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, MorphPolygon, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_Object:
+			{
+				pcb_coord_t x, y;
+				int type;
+				void *ptr1, *ptr2, *ptr3;
+
+				pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+				if ((type = pcb_search_screen(x, y, PCB_OBJ_POLY, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+					pcb_poly_morph((pcb_layer_t *) ptr1, (pcb_poly_t *) ptr3);
+					pcb_draw();
+					pcb_undo_inc_serial();
+				}
+				break;
+			}
+		case F_Selected:
+		case F_SelectedObjects:
+			PCB_POLY_ALL_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+					pcb_poly_morph(layer, polygon);
+			}
+			PCB_ENDALL_LOOP;
+			pcb_draw();
+			pcb_undo_inc_serial();
+			break;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_Polygon[] = "Polygon(Close|CloseHole|PreviousPoint)";
+static const char pcb_acth_Polygon[] = "Some polygon related stuff.";
+
+/* %start-doc actions Polygon
+
+Polygons need a special action routine to make life easier.
+
+@table @code
+
+@item Close
+Creates the final segment of the polygon.  This may fail if clipping
+to 45 degree lines is switched on, in which case a warning is issued.
+
+@item CloseHole
+Creates the final segment of the polygon hole.  This may fail if clipping
+to 45 degree lines is switched on, in which case a warning is issued.
+
+@item PreviousPoint
+Resets the newly entered corner to the previous one. The Undo action
+will call Polygon(PreviousPoint) when appropriate to do so.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Polygon(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Polygon, op = fgw_keyword(&argv[1]));
+
+	if ((argc > 1) && ((conf_core.editor.mode == PCB_MODE_POLYGON) || (conf_core.editor.mode == PCB_MODE_POLYGON_HOLE))) {
+		pcb_notify_crosshair_change(pcb_false);
+		switch(op) {
+			/* close open polygon if possible */
+		case F_Close:
+			pcb_polygon_close_poly();
+			break;
+			
+			/* close open polygon hole if possible */
+		case F_CloseHole:
+			pcb_polygon_close_hole();
+			break;
+		
+			/* go back to the previous point */
+		case F_PreviousPoint:
+			pcb_polygon_go_to_prev_point();
+			break;
+		}
+		pcb_notify_crosshair_change(pcb_true);
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t polygon_action_list[] = {
+	{"MorphPolygon", pcb_act_MorphPolygon, pcb_acth_MorphPolygon, pcb_acts_MorphPolygon},
+	{"Polygon", pcb_act_Polygon, pcb_acth_Polygon, pcb_acts_Polygon}
+};
+
+PCB_REGISTER_ACTIONS(polygon_action_list, NULL)
Index: tags/2.0.1/src/polygon_offs.c
===================================================================
--- tags/2.0.1/src/polygon_offs.c	(nonexistent)
+++ tags/2.0.1/src/polygon_offs.c	(revision 18980)
@@ -0,0 +1,120 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Polygon contour offset calculation */
+
+static void norm(double *nx, double *ny, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double dx = x2 - x1, dy = y2 - y1, len = sqrt(dx*dx + dy*dy);
+	*nx = -dy / len;
+	*ny = dx / len;
+}
+
+static void ll_intersect(double *xi, double *yi, double ax1, double ay1, double ax2, double ay2, double bx1, double by1, double bx2, double by2)
+{
+	double ua, X1, Y1, X2, Y2, X3, Y3, X4, Y4, tmp;
+
+	/* maths from http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/ */
+	X1 = ax1;
+	X2 = ax2;
+	X3 = bx1;
+	X4 = bx2;
+	Y1 = ay1;
+	Y2 = ay2;
+	Y3 = by1;
+	Y4 = by2;
+
+	tmp = ((Y4 - Y3) * (X2 - X1) - (X4 - X3) * (Y2 - Y1));
+
+	if (tmp == 0) {
+		/* Corner case: parallel lines; intersect only if the endpoint of either line
+		   is on the other line */
+		*xi = ax2;
+		*yi = ay2;
+	}
+
+
+	ua = ((X4 - X3) * (Y1 - Y3) - (Y4 - Y3) * (X1 - X3)) / tmp;
+/*	ub = ((X2 - X1) * (Y1 - Y3) - (Y2 - Y1) * (X1 - X3)) / tmp;*/
+	*xi = X1 + ua * (X2 - X1);
+	*yi = Y1 + ua * (Y2 - Y1);
+}
+
+
+pcb_pline_t *pcb_pline_dup_offset(const pcb_pline_t *src, pcb_coord_t offs)
+{
+	const pcb_vnode_t *p = NULL, *v, *n;
+	pcb_vector_t tmp;
+	pcb_pline_t *res = NULL;
+	double nx, ny, px, py;
+	int num_pts, i;
+
+	v = &src->head;
+	num_pts = 0;
+	do {
+		num_pts++;
+	} while((v = v->next) != &src->head);
+
+
+	v = &src->head;
+	i = 0;
+	do {
+		n = v->next;
+		norm(&nx, &ny, v->point[0], v->point[1], n->point[0], n->point[1]);
+
+		if (p != NULL) {
+			double xi, yi, vx1, vy1, vx2, vy2, nx1, ny1, nx2, ny2;
+			
+			vx1 = p->point[0] - px*offs;
+			vy1 = p->point[1] - py*offs;
+			vx2 = v->point[0] - px*offs;
+			vy2 = v->point[1] - py*offs;
+
+			nx1 = v->point[0] - nx*offs;
+			ny1 = v->point[1] - ny*offs;
+			nx2 = n->point[0] - nx*offs;
+			ny2 = n->point[1] - ny*offs;
+
+			ll_intersect(&xi, &yi, vx1, vy1, vx2, vy2, nx1, ny1, nx2, ny2);
+
+			tmp[0] = xi;
+			tmp[1] = yi;
+			if (res == NULL)
+				res = pcb_poly_contour_new(tmp);
+			else
+				pcb_poly_vertex_include(res->head.prev, pcb_poly_node_create(tmp));
+		}
+
+		p = v;
+		v = v->next;
+		px = nx;
+		py = ny;
+		i++;
+	}
+	while(i <= num_pts);
+
+	return res;
+}
Index: tags/2.0.1/src/polygon_offs.h
===================================================================
--- tags/2.0.1/src/polygon_offs.h	(nonexistent)
+++ tags/2.0.1/src/polygon_offs.h	(revision 18980)
@@ -0,0 +1,30 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Polygon contour offset calculation */
+
+pcb_pline_t *pcb_pline_dup_offset(const pcb_pline_t *src, pcb_coord_t offs);
+
Index: tags/2.0.1/src/polygon_selfi.c
===================================================================
--- tags/2.0.1/src/polygon_selfi.c	(nonexistent)
+++ tags/2.0.1/src/polygon_selfi.c	(revision 18980)
@@ -0,0 +1,243 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "polygon_selfi.h"
+
+/* expect no more than this number of hubs in a complex polygon */
+#define MAX_HUB_TRIES 1024
+
+#if 0
+#	define TRACE pcb_trace
+#else
+	void TRACE(const char *fmt, ...) {}
+#endif
+
+typedef struct {
+	vtp0_t node;
+} vhub_t;
+
+static pcb_vnode_t *pcb_pline_split(pcb_vnode_t *v, pcb_vector_t at)
+{
+	pcb_vnode_t *v2 = node_add_single(v, at);
+
+	v2 = pcb_poly_node_create(at);
+	assert(v2 != NULL);
+	v2->cvc_prev = v2->cvc_next = NULL;
+	v2->Flags.status = UNKNWN;
+
+	/* link in */
+	v->next->prev = v2;
+	v2->next = v->next;
+	v2->prev = v;
+	v->next = v2;
+	
+	return v2;
+}
+
+static pcb_vnode_t *pcb_pline_end_at(pcb_vnode_t *v, pcb_vector_t at)
+{
+	if (pcb_vect_dist2(at, v->point) < ENDP_EPSILON)
+		return v;
+	if (pcb_vect_dist2(at, v->next->point) < ENDP_EPSILON)
+		return v->next;
+	return NULL;
+}
+
+static vhub_t *hub_find(vtp0_t *hubs, pcb_vnode_t *v, pcb_bool insert)
+{
+	int n, m;
+	vhub_t *h;
+
+	for(n = 0, h = hubs->array[0]; n < vtp0_len(hubs); n++,h++) {
+		pcb_vnode_t *stored = *vtp0_get(&h->node, 0, 0);
+		/* found the hub at the specific location */
+		if (pcb_vect_dist2(stored->point, v->point) < ENDP_EPSILON) {
+			for(m = 0; m < vtp0_len(&h->node); m++) {
+				stored = *vtp0_get(&h->node, m, 0);
+				if (stored == v) /* already on the list */
+					return h;
+			}
+			/* not found on the hub's list, maybe insert */
+			if (insert) {
+				vtp0_append(&h->node, v);
+				return h;
+			}
+			return NULL; /* there is only one hub per point - if the coord matched and the node is not on, it's not going to be on any other hub's list */
+		}
+	}
+	return NULL;
+}
+
+/* returns 1 if a new intersection is mapped */
+static int pcb_pline_add_isectp(vtp0_t *hubs, pcb_vnode_t *v)
+{
+	vhub_t *h;
+
+	assert(v != NULL);
+
+	v->Flags.in_hub = 1;
+	if (hubs->array != NULL) {
+		if (hub_find(hubs, v, pcb_true) != NULL) /* already on the list (... by now) */
+				return 0;
+	}
+
+	h = malloc(sizeof(vhub_t));
+	vtp0_append(hubs, h);
+	vtp0_init(&h->node);
+	vtp0_append(&h->node, v);
+	return 1;
+}
+
+static int pline_split_off_loop(vtp0_t *hubs, vtp0_t *out, vhub_t *h, pcb_vnode_t *start)
+{
+	pcb_vnode_t *v, *next, *tmp;
+	pcb_pline_t *newpl = NULL;
+	pcb_cardinal_t cnt;
+	vhub_t *endh;
+
+	for(v = start->next, cnt = 0; v->Flags.in_hub == 0; v = v->next) cnt++;
+	endh = hub_find(hubs, v, pcb_false);
+	if (h == endh) { /* forward loop */
+		TRACE("  Fwd %ld!\n", (long)cnt);
+		newpl = pcb_poly_contour_new(start->point);
+		next = start->next;
+		pcb_poly_vertex_exclude(start);
+		for(v = next; cnt > 0; v = next, cnt--) {
+			TRACE("   Append %mm %mm!\n", v->point[0], v->point[1]);
+			next = v->next;
+			pcb_poly_vertex_exclude(v);
+			tmp = pcb_poly_node_create(v->point);
+			pcb_poly_vertex_include(newpl->head.prev, tmp);
+		}
+		goto new_pl;
+	}
+
+	for(v = start->prev, cnt = 0; v->Flags.in_hub == 0; v = v->prev) cnt++;
+	if (h == endh) { /* backward loop */
+		TRACE("  Bwd %ld!\n", (long)cnt);
+		newpl = pcb_poly_contour_new(start->point);
+		next = start->prev;
+		newpl->head = *start;
+		pcb_poly_vertex_exclude(start);
+		for(v = next; cnt > 0; v = next, cnt--) {
+			TRACE("   Append!\n");
+			next = v->prev;
+			pcb_poly_vertex_exclude(v);
+			tmp = pcb_poly_node_create(v->point);
+			pcb_poly_vertex_include(start, tmp);
+		}
+		goto new_pl;
+	}
+	return 0;
+
+	new_pl:;
+TRACE("APPEND: %p %p\n", newpl, newpl->head.next);
+	vtp0_append(out, newpl);
+	return 1;
+}
+
+pcb_bool pcb_pline_is_selfint(pcb_pline_t *pl)
+{
+	pcb_vnode_t *va, *vb;
+
+	va = (pcb_vnode_t *)&pl->head;
+	do {
+		for(vb = va->next->next; vb->next != va; vb = vb->next) {
+			pcb_vector_t i, tmp;
+			if (pcb_vect_inters2(va->point, va->next->point, vb->point, vb->next->point, i, tmp) > 0)
+				return pcb_true;
+		}
+		va = va->next;
+	} while (va != &pl->head);
+	return pcb_false;
+}
+
+
+void pcb_pline_split_selfint(pcb_pline_t *pl, vtp0_t *out)
+{
+	int n;
+	vtp0_t hubs;
+	pcb_vnode_t *va, *vb, *iva, *ivb;
+
+	vtp0_init(&hubs);
+
+	/* reset the in_hub flag */
+	va = (pcb_vnode_t *)&pl->head;
+	do {
+		va->Flags.in_hub = 0;
+		va = va->next;
+	} while (va != &pl->head);
+
+	/* insert corners at intersections, collect a list of intersection hubs */
+	va = (pcb_vnode_t *)&pl->head;
+	do {
+		for(vb = va->next->next; vb->next != va; vb = vb->next) {
+			pcb_vector_t i, tmp;
+			if (pcb_vect_inters2(va->point, va->next->point, vb->point, vb->next->point, i, tmp) > 0) {
+				iva = pcb_pline_end_at(va, i);
+				if (iva == NULL)
+					iva = pcb_pline_split(va, i);
+				ivb = pcb_pline_end_at(vb, i);
+				if (ivb == NULL)
+					ivb = pcb_pline_split(vb, i);
+				if (pcb_pline_add_isectp(&hubs, iva) || pcb_pline_add_isectp(&hubs, ivb))
+					TRACE("Intersect at %mm;%mm\n", i[0], i[1]);
+			}
+		}
+		va = va->next;
+	} while (va != &pl->head);
+
+/*	for(t = MAX_HUB_TRIES; t > 0; t--)*/ {
+
+		for(n = 0; n < vtp0_len(&hubs); n++) {
+			int m;
+			vhub_t *h = *vtp0_get(&hubs, n, 0);
+			pcb_vnode_t *v = *vtp0_get(&h->node, 0, 0);
+			TRACE("hub %p at %mm;%mm:\n", h, v->point[0], v->point[1]);
+			for(m = 0; m < vtp0_len(&h->node); m++) {
+				v = *vtp0_get(&h->node, m, 0);
+				TRACE(" %d=%p\n", m, v);
+				/* try to split off a leaf loop from the hub */
+				
+				if (pline_split_off_loop(&hubs, out, h, v)) {
+					vtp0_remove(&h->node, m, 1);
+					m--;
+					if (vtp0_len(&h->node) == 0) {
+						vtp0_uninit(&h->node);
+						free(h);
+						vtp0_remove(&hubs, n, 1);
+						n--;
+						break;
+					}
+				}
+			}
+			TRACE("\n");
+		}
+	}
+
+	vtp0_uninit(&hubs);
+}
Index: tags/2.0.1/src/polygon_selfi.h
===================================================================
--- tags/2.0.1/src/polygon_selfi.h	(nonexistent)
+++ tags/2.0.1/src/polygon_selfi.h	(revision 18980)
@@ -0,0 +1,41 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Resolve polygon self intersections */
+
+#include <genvector/vtp0.h>
+#include "polyarea.h"
+
+/* Returns whether a polyline is self-intersecting. O(n^2) */
+pcb_bool pcb_pline_is_selfint(pcb_pline_t *pl);
+
+
+/* Assume pl is self-intersecting split it up into a list of freshly allocated
+   plines in out. Converts the original pline into a version that has a point
+   on each intersection; O(n^2) */
+void pcb_pline_split_selfint(pcb_pline_t *pl, vtp0_t *out);
+
+
Index: tags/2.0.1/src/rats.c
===================================================================
--- tags/2.0.1/src/rats.c	(nonexistent)
+++ tags/2.0.1/src/rats.c	(revision 18980)
@@ -0,0 +1,986 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  This module, rats.c, was written and is Copyright (C) 1997 by harry eaton
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* rats nest routines */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "find.h"
+#include "polygon.h"
+#include "rats.h"
+#include "search.h"
+#include "undo.h"
+#include "stub_mincut.h"
+#include "route_style.h"
+#include "compat_misc.h"
+#include "netlist.h"
+#include "compat_nls.h"
+#include "macro.h"
+#include <genvector/vtp0.h>
+#include "obj_rat_draw.h"
+#include "obj_term.h"
+#include "obj_subc_parent.h"
+#include "obj_pstk_inlines.h"
+
+#define STEP_POINT 100
+
+#define TRIEDFIRST 0x1
+#define BESTFOUND 0x2
+
+static pcb_bool ParseConnection(const char *, char *, char *);
+static pcb_bool DrawShortestRats(pcb_netlist_t *,
+														 void (*)(register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *));
+static pcb_bool GatherSubnets(pcb_netlist_t *, pcb_bool, pcb_bool);
+static pcb_bool CheckShorts(pcb_lib_menu_t *);
+static void TransferNet(pcb_netlist_t *, pcb_net_t *, pcb_net_t *);
+
+static pcb_bool badnet = pcb_false;
+static pcb_layergrp_id_t Sgrp = -1, Cgrp = -1; /* layer group holding solder/component side */
+
+static pcb_layergrp_id_t rat_padstack_side(pcb_pstk_t *padstack)
+{
+	pcb_pstk_tshape_t *ts = pcb_pstk_get_tshape(padstack);
+	if (ts != NULL) { /* if there are copper shapes, decide side by where the padstack has copper */
+		int n;
+		for(n = 0; n < ts->len; n++) {
+			if (!(ts->shape[n].layer_mask & PCB_LYT_COPPER)) continue;
+			if (ts->shape[n].layer_mask & PCB_LYT_TOP)
+				return Cgrp;
+			else if (ts->shape[n].layer_mask & PCB_LYT_BOTTOM)
+				return Sgrp;
+		}
+	}
+	return Sgrp; /* ultimate fallback */
+}
+
+/* parse a connection description from a string
+ * puts the subcircuit name in the string and the pin number in
+ * the number.  If a valid connection is found, it returns the
+ * number of characters processed from the string, otherwise
+ * it returns 0 */
+static pcb_bool ParseConnection(const char *InString, char *refdes, char *termid)
+{
+	int i, j;
+
+	/* copy element name portion */
+	for (j = 0; InString[j] != '\0' && InString[j] != '-'; j++)
+		refdes[j] = InString[j];
+	if (InString[j] == '-') {
+		for (i = j; i > 0 && refdes[i - 1] >= 'a'; i--);
+		refdes[i] = '\0';
+		for (i = 0, j++; InString[j] != '\0'; i++, j++)
+			termid[i] = InString[j];
+		termid[i] = '\0';
+		return pcb_false;
+	}
+	else {
+		refdes[j] = '\0';
+		pcb_message(PCB_MSG_ERROR, _("Bad net-list format encountered near: \"%s\"\n"), refdes);
+		return pcb_true;
+	}
+}
+
+/* Find a particular terminal from an subc name and terminal number */
+static pcb_bool pcb_term_find_name_term(const char *refdes, const char *termid, pcb_connection_t *conn, pcb_bool Same)
+{
+	pcb_any_obj_t *obj;
+
+	/* first check for subcircuits; this is the only one thing we'll need to do
+	   once elements are removed */
+	obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, refdes, termid, Same, (pcb_subc_t **)&conn->ptr1, &conn->group);
+	if (obj != NULL) {
+		conn->obj = obj;
+		pcb_obj_center(obj, &conn->X, &conn->Y);
+		if (obj->type == PCB_OBJ_PSTK)
+			conn->group = rat_padstack_side((pcb_pstk_t *)obj);
+#warning subc TODO: heavy terminals: calculate side
+		return pcb_true;
+	}
+
+	return pcb_false;
+}
+
+pcb_bool pcb_rat_seek_pad(pcb_lib_entry_t * entry, pcb_connection_t * conn, pcb_bool Same)
+{
+	int j;
+	char refdes[256];
+	char termid[256];
+
+	if (ParseConnection(entry->ListEntry, refdes, termid))
+		return pcb_false;
+	for (j = 0; termid[j] != '\0'; j++);
+	if (j == 0) {
+		pcb_message(PCB_MSG_ERROR, _("Error! Netlist file is missing pin!\n" "white space after \"%s-\"\n"), refdes);
+		badnet = pcb_true;
+	}
+	else {
+		if (pcb_term_find_name_term(refdes, termid, conn, Same))
+			return pcb_true;
+		if (Same)
+			return pcb_false;
+		if (termid[j - 1] < '0' || termid[j - 1] > '9') {
+			pcb_message(PCB_MSG_WARNING, "WARNING! Pin number ending with '%c'"
+							" encountered in netlist file\n" "Probably a bad netlist file format\n", termid[j - 1]);
+		}
+	}
+	pcb_message(PCB_MSG_WARNING, _("Can't find %s pin %s called for in netlist.\n"), refdes, termid);
+	return pcb_false;
+}
+
+static const char *get_refdes(void *ptr1)
+{
+	pcb_any_obj_t *obj = ptr1;
+	switch(obj->type) {
+		case PCB_OBJ_SUBC:
+			if (((pcb_subc_t *)ptr1)->refdes != NULL)
+				return ((pcb_subc_t *)ptr1)->refdes;
+			return "<anon>";
+		default:
+			break;
+	}
+	return "<invalid>";
+}
+
+#warning padstack TODO: remove this bloat
+static const char *get_termid(pcb_any_obj_t *obj)
+{
+	return obj->term;
+}
+
+#warning padstack TODO: consider using some data.h call instead of this local implementation
+static void clear_drc_flag(int clear_ratconn)
+{
+	pcb_rtree_it_t it;
+	pcb_box_t *n;
+	int li;
+	pcb_layer_t *l;
+
+	for(n = pcb_r_first(PCB->Data->padstack_tree, &it); n != NULL; n = pcb_r_next(&it))
+		PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, (pcb_pstk_t *)n);
+	pcb_r_end(&it);
+
+	for(li = 0, l = PCB->Data->Layer; li < PCB->Data->LayerN; li++,l++) {
+		for(n = pcb_r_first(l->line_tree, &it); n != NULL; n = pcb_r_next(&it))
+			PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, (pcb_line_t *)n);
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->arc_tree, &it); n != NULL; n = pcb_r_next(&it))
+			PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, (pcb_arc_t *)n);
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->polygon_tree, &it); n != NULL; n = pcb_r_next(&it))
+			PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, (pcb_poly_t *)n);
+		pcb_r_end(&it);
+
+		for(n = pcb_r_first(l->text_tree, &it); n != NULL; n = pcb_r_next(&it))
+			PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, (pcb_text_t *)n);
+		pcb_r_end(&it);
+	}
+}
+
+pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu)
+{
+	pcb_connection_t *connection;
+	pcb_connection_t LastPoint;
+	pcb_net_t *net;
+	static pcb_netlist_t *Wantlist = NULL;
+
+	if (!net_menu->MenuN)
+		return NULL;
+	pcb_netlist_free(Wantlist);
+	free(Wantlist);
+	badnet = pcb_false;
+
+	/* find layer groups of the component side and solder side */
+	Sgrp = Cgrp = -1;
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1);
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1);
+
+	Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t));
+	if (Wantlist) {
+		clear_drc_flag(1);
+		PCB_MENU_LOOP(net_menu);
+		{
+			if (menu->Name[0] == '*' || menu->flag == 0) {
+				badnet = pcb_true;
+				continue;
+			}
+			net = pcb_net_new(PCB, Wantlist);
+			if (menu->Style) {
+				int idx = pcb_route_style_lookup(&PCB->RouteStyle, -1, -1, -1, -1, menu->Style);
+				if (idx >= 0)
+					net->Style = PCB->RouteStyle.array+idx;
+			}
+			else											/* default to NULL if none found */
+				net->Style = NULL;
+			PCB_ENTRY_LOOP(menu);
+			{
+				if (pcb_rat_seek_pad(entry, &LastPoint, pcb_false)) {
+					if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_any_obj_t *)LastPoint.obj))
+						pcb_message(PCB_MSG_ERROR,
+										"Error! Subcircuit %s terminal %s appears multiple times in the netlist file.\n",
+										get_refdes(LastPoint.ptr1), get_termid(LastPoint.obj));
+					else {
+						connection = pcb_rat_connection_alloc(net);
+						*connection = LastPoint;
+						/* indicate expect net */
+						connection->menu = menu;
+						/* mark as visited */
+						PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_any_obj_t *)LastPoint.obj);
+						LastPoint.obj->ratconn = (void *)menu;
+					}
+				}
+				else
+					badnet = pcb_true;
+				/* check for more pins with the same number */
+				for (; pcb_rat_seek_pad(entry, &LastPoint, pcb_true);) {
+					connection = pcb_rat_connection_alloc(net);
+					*connection = LastPoint;
+					/* indicate expect net */
+					connection->menu = menu;
+					/* mark as visited */
+					PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_any_obj_t *)LastPoint.obj);
+					LastPoint.obj->ratconn = (void *)menu;
+				}
+			}
+			PCB_END_LOOP;
+		}
+		PCB_END_LOOP;
+	}
+
+	/* clear all visit marks */
+	clear_drc_flag(0);
+
+	return Wantlist;
+}
+
+/* copy all connections from one net into another and then remove the first net from its netlist */
+static void TransferNet(pcb_netlist_t *Netl, pcb_net_t *SourceNet, pcb_net_t *DestNet)
+{
+	pcb_connection_t *conn;
+
+	/* It would be worth checking if SourceNet is NULL here to avoid a segfault. Seb James. */
+	PCB_CONNECTION_LOOP(SourceNet);
+	{
+		conn = pcb_rat_connection_alloc(DestNet);
+		*conn = *connection;
+	}
+	PCB_END_LOOP;
+	DestNet->Style = SourceNet->Style;
+	/* free the connection memory */
+	pcb_net_free(SourceNet);
+	/* remove SourceNet from its netlist */
+	*SourceNet = Netl->Net[--(Netl->NetN)];
+	/* zero out old garbage */
+	memset(&Netl->Net[Netl->NetN], 0, sizeof(pcb_net_t));
+}
+
+static void **found_short(pcb_any_obj_t *parent, pcb_any_obj_t *term, vtp0_t *generic, pcb_lib_menu_t *theNet, void **menu)
+{
+	pcb_bool newone;
+	int i;
+
+	if (!term->ratconn) {
+		pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to %s terminal %s\n"),
+						&theNet->Name[2], PCB_UNKNOWN(get_refdes(parent)), PCB_UNKNOWN(get_termid(term)));
+		pcb_stub_rat_found_short(term, &theNet->Name[2]);
+		return menu;
+	}
+
+	newone = pcb_true;
+	for(i = 0; i < vtp0_len(generic); i++) {
+		if (generic->array[i] == term->ratconn) {
+			newone = pcb_false;
+			break;
+		}
+	}
+
+	if (newone) {
+		menu = vtp0_alloc_append(generic, 1);
+		*menu = term->ratconn;
+		pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"),
+						&theNet->Name[2], &((pcb_lib_menu_t *) (term->ratconn))->Name[2]);
+		pcb_stub_rat_found_short((pcb_any_obj_t *)term, &theNet->Name[2]);
+	}
+	return menu;
+}
+
+static void **find_shorts_in_subc(pcb_subc_t *subc_in, vtp0_t *generic, pcb_lib_menu_t *theNet, void **menu, pcb_bool *warn)
+{
+	if (PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc_in))
+		return menu;
+
+	PCB_PADSTACK_LOOP(subc_in->data);
+	{
+		if (padstack->term == NULL)
+			continue;
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, padstack)) {
+			*warn = pcb_true;
+			menu = found_short((pcb_any_obj_t *)subc_in, (pcb_any_obj_t *)padstack, generic, theNet, menu);
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_LINE_ALL_LOOP(subc_in->data);
+	{
+		if (line->term == NULL)
+			continue;
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) {
+			*warn = pcb_true;
+			menu = found_short((pcb_any_obj_t *)subc_in, (pcb_any_obj_t *)line, generic, theNet, menu);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_ARC_ALL_LOOP(subc_in->data);
+	{
+		if (arc->term == NULL)
+			continue;
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, arc)) {
+			*warn = pcb_true;
+			menu = found_short((pcb_any_obj_t *)subc_in, (pcb_any_obj_t *)arc, generic, theNet, menu);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_POLY_ALL_LOOP(subc_in->data);
+	{
+		if (polygon->term == NULL)
+			continue;
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon)) {
+			*warn = pcb_true;
+			menu = found_short((pcb_any_obj_t *)subc_in, (pcb_any_obj_t *)polygon, generic, theNet, menu);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_TEXT_ALL_LOOP(subc_in->data);
+	{
+		if (text->term == NULL)
+			continue;
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, text)) {
+			*warn = pcb_true;
+			menu = found_short((pcb_any_obj_t *)subc_in, (pcb_any_obj_t *)text, generic, theNet, menu);
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_SUBC_LOOP(subc_in->data);
+	{
+		menu = find_shorts_in_subc(subc, generic, theNet, menu, warn);
+	}
+	PCB_END_LOOP;
+	return menu;
+}
+
+
+static pcb_bool CheckShorts(pcb_lib_menu_t *theNet)
+{
+	pcb_bool warn = pcb_false;
+	vtp0_t generic;
+	/* the first connection was starting point so
+	 * the menu is always non-null */
+	void **menu;
+
+	vtp0_init(&generic);
+	menu = vtp0_alloc_append(&generic, 1);
+	*menu = theNet;
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		menu = find_shorts_in_subc(subc, &generic, theNet, menu, &warn);
+	}
+	PCB_END_LOOP;
+	vtp0_uninit(&generic);
+	return warn;
+}
+
+static void gather_subnet_objs(pcb_data_t *data, pcb_netlist_t *Netl, pcb_net_t *a)
+{
+	pcb_connection_t *conn;
+
+	/* now add other possible attachment points to the subnet */
+	/* e.g. line end-points and vias */
+	/* don't add non-manhattan lines, the auto-router can't route to them */
+	PCB_LINE_COPPER_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)
+				&& ((line->Point1.X == line->Point2.X)
+						|| (line->Point1.Y == line->Point2.Y))) {
+			conn = pcb_rat_connection_alloc(a);
+			conn->X = line->Point1.X;
+			conn->Y = line->Point1.Y;
+			conn->ptr1 = layer;
+			conn->obj = (pcb_any_obj_t *)line;
+			conn->group = pcb_layer_get_group_(layer);
+			conn->menu = NULL;			/* agnostic view of where it belongs */
+			conn = pcb_rat_connection_alloc(a);
+			conn->X = line->Point2.X;
+			conn->Y = line->Point2.Y;
+			conn->ptr1 = layer;
+			conn->obj = (pcb_any_obj_t *)line;
+			conn->group = pcb_layer_get_group_(layer);
+			conn->menu = NULL;
+			if PCB_FLAG_TEST(PCB_FLAG_DRC_INTCONN, line)
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, line);
+		}
+	}
+	PCB_ENDALL_LOOP;
+#warning term TODO: and what about arcs and text?
+	/* add polygons so the auto-router can see them as targets */
+	PCB_POLY_COPPER_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon)) {
+			conn = pcb_rat_connection_alloc(a);
+			/* make point on a vertex */
+			conn->X = polygon->Clipped->contours->head.point[0];
+			conn->Y = polygon->Clipped->contours->head.point[1];
+			conn->ptr1 = layer;
+			conn->obj = (pcb_any_obj_t *)polygon;
+			conn->group = pcb_layer_get_group_(layer);
+			conn->menu = NULL;			/* agnostic view of where it belongs */
+			if PCB_FLAG_TEST(PCB_FLAG_DRC_INTCONN, polygon)
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, polygon);
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_PADSTACK_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, padstack)) {
+
+			conn = pcb_rat_connection_alloc(a);
+			conn->X = padstack->x;
+			conn->Y = padstack->y;
+			conn->ptr1 = padstack;
+			conn->obj = (pcb_any_obj_t *)padstack;
+			conn->group = rat_padstack_side(padstack);
+			if PCB_FLAG_TEST(PCB_FLAG_DRC_INTCONN, padstack)
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC | PCB_FLAG_DRC_INTCONN, padstack);
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(data);
+	{
+		gather_subnet_objs(subc->data, Netl, a);
+	}
+	PCB_END_LOOP;
+}
+
+/* Determine existing interconnections of the net and gather into sub-nets.
+ * Initially the netlist has each connection in its own individual net
+ * afterwards there can be many fewer nets with multiple connections each */
+static pcb_bool GatherSubnets(pcb_netlist_t *Netl, pcb_bool NoWarn, pcb_bool AndRats)
+{
+	pcb_net_t *a, *b;
+	pcb_bool Warned = pcb_false;
+	pcb_cardinal_t m, n;
+
+	for (m = 0; Netl->NetN > 0 && m < Netl->NetN; m++) {
+		a = &Netl->Net[m];
+		pcb_reset_conns(pcb_false);
+		pcb_rat_find_hook(a->Connection[0].obj, pcb_false, AndRats);
+
+		/* now anybody connected to the first point has PCB_FLAG_DRC set */
+		/* so move those to this subnet */
+		PCB_FLAG_CLEAR(PCB_FLAG_DRC, (pcb_any_obj_t *)a->Connection[0].obj);
+		for (n = m + 1; n < Netl->NetN; n++) {
+			b = &Netl->Net[n];
+			/* There can be only one connection in net b */
+			if (PCB_FLAG_TEST(PCB_FLAG_DRC, (pcb_any_obj_t *)b->Connection[0].obj)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC, (pcb_any_obj_t *)b->Connection[0].obj);
+				TransferNet(Netl, b, a);
+				/* back up since new subnet is now at old index */
+				n--;
+			}
+		}
+
+		gather_subnet_objs(PCB->Data, Netl, a);
+		if (!NoWarn)
+			Warned |= CheckShorts(a->Connection[0].menu);
+	}
+	pcb_reset_conns(pcb_false);
+	return Warned;
+}
+
+/* Draw a rat net (tree) having the shortest lines
+ * this also frees the subnet memory as they are consumed.
+ * Note that the Netl we are passed is NOT the main netlist - it's the
+ * connectivity for ONE net.  It represents the CURRENT connectivity
+ * state for the net, with each Netl->Net[N] representing one
+ * copper-connected subset of the net. */
+static pcb_bool
+DrawShortestRats(pcb_netlist_t *Netl,
+								 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *))
+{
+	pcb_rat_t *line;
+	register float distance, temp;
+	register pcb_connection_t *conn1, *conn2, *firstpoint, *secondpoint;
+	pcb_poly_t *polygon;
+	pcb_bool changed = pcb_false;
+	pcb_bool havepoints;
+	pcb_cardinal_t n, m, j;
+	pcb_net_t *next, *subnet, *theSubnet = NULL;
+
+	/* This is just a sanity check, to make sure we're passed
+	 * *something*.
+	 */
+	if (!Netl || Netl->NetN < 1)
+		return pcb_false;
+
+	/*
+	 * Everything inside the NetList Netl should be connected together.
+	 * Each Net in Netl is a group of Connections which are already
+	 * connected together somehow, either by real wires or by rats we've
+	 * already drawn.  Each Connection is a vertex within that blob of
+	 * connected items.  This loop finds the closest vertex pairs between
+	 * each blob and draws rats that merge the blobs until there's just
+	 * one big blob.
+	 *
+	 * Just to clarify, with some examples:
+	 *
+	 * Each Netl is one full net from a netlist, like from gnetlist.
+	 * Each Netl->Net[N] is a subset of that net that's already
+	 * physically connected on the pcb.
+	 *
+	 * So a new design with no traces yet, would have a huge list of Net[N],
+	 * each with one pin in it.
+	 *
+	 * A fully routed design would have one Net[N] with all the pins
+	 * (for that net) in it.
+	 */
+
+	/*
+	 * We keep doing this do/while loop until everything's connected.
+	 * I.e. once per rat we add.
+	 */
+	distance = 0.0;
+	havepoints = pcb_true;						/* so we run the loop at least once */
+	while (Netl->NetN > 1 && havepoints) {
+		/* This is the top of the "find one rat" logic.  */
+		havepoints = pcb_false;
+		firstpoint = secondpoint = NULL;
+
+		/* Test Net[0] vs Net[N] for N=1..max.  Find the shortest
+		   distance between any two points in different blobs.  */
+		subnet = &Netl->Net[0];
+		for (j = 1; j < Netl->NetN; j++) {
+			/*
+			 * Scan between Net[0] blob (subnet) and Net[N] blob (next).
+			 * Note the shortest distance we find.
+			 */
+			next = &Netl->Net[j];
+			for (n = subnet->ConnectionN - 1; n != -1; n--) {
+				conn1 = &subnet->Connection[n];
+				for (m = next->ConnectionN - 1; m != -1; m--) {
+					conn2 = &next->Connection[m];
+					/*
+					 * At this point, conn1 and conn2 are two pins in
+					 * different blobs of the same net.  See how far
+					 * apart they are, and if they're "closer" than what
+					 * we already have.
+					 */
+
+					/*
+					 * Prefer to connect Connections over polygons to the
+					 * polygons (ie assume the user wants a via to a plane,
+					 * not a daisy chain).  Further prefer to pick an existing
+					 * via in the Net to make that connection.
+					 */
+					if (conn1->obj->type == PCB_OBJ_POLY &&
+							(polygon = (pcb_poly_t *) conn1->obj) &&
+							!(distance == 0 &&
+								firstpoint && firstpoint->obj->type == PCB_OBJ_PSTK) && pcb_poly_is_point_in_p_ignore_holes(conn2->X, conn2->Y, polygon)) {
+						distance = 0;
+						firstpoint = conn2;
+						secondpoint = conn1;
+						theSubnet = next;
+						havepoints = pcb_true;
+					}
+					else if (conn2->obj->type == PCB_OBJ_POLY &&
+									 (polygon = (pcb_poly_t *) conn2->obj) &&
+									 !(distance == 0 &&
+										 firstpoint && firstpoint->obj->type == PCB_OBJ_PSTK) && pcb_poly_is_point_in_p_ignore_holes(conn1->X, conn1->Y, polygon)) {
+						distance = 0;
+						firstpoint = conn1;
+						secondpoint = conn2;
+						theSubnet = next;
+						havepoints = pcb_true;
+					}
+					else if ((temp = PCB_SQUARE(conn1->X - conn2->X) + PCB_SQUARE(conn1->Y - conn2->Y)) < distance || !firstpoint) {
+						distance = temp;
+						firstpoint = conn1;
+						secondpoint = conn2;
+						theSubnet = next;
+						havepoints = pcb_true;
+					}
+				}
+			}
+		}
+
+		/*
+		 * If HAVEPOINTS is pcb_true, we've found a pair of points in two
+		 * separate blobs of the net, and need to connect them together.
+		 */
+		if (havepoints) {
+			if (funcp) {
+				(*funcp) (firstpoint, secondpoint, subnet->Style);
+			}
+			else {
+				/* found the shortest distance subnet, draw the rat */
+				if ((line = pcb_rat_new(PCB->Data,
+																 firstpoint->X, firstpoint->Y,
+																 secondpoint->X, secondpoint->Y,
+																 firstpoint->group, secondpoint->group, conf_core.appearance.rat_thickness, pcb_no_flags())) != NULL) {
+					if (distance == 0)
+						PCB_FLAG_SET(PCB_FLAG_VIA, line);
+					pcb_undo_add_obj_to_create(PCB_OBJ_RAT, line, line, line);
+					pcb_rat_invalidate_draw(line);
+					changed = pcb_true;
+				}
+			}
+
+			/* copy theSubnet into the current subnet */
+			TransferNet(Netl, theSubnet, subnet);
+		}
+	}
+
+	/* presently nothing to do with the new subnet */
+	/* so we throw it away and free the space */
+	pcb_net_free(&Netl->Net[--(Netl->NetN)]);
+	/* Sadly adding a rat line messes up the sorted arrays in connection finder */
+	/* hace: perhaps not necessarily now that they aren't stored in normal layers */
+	if (changed) {
+		pcb_conn_lookup_uninit();
+		pcb_conn_lookup_init();
+	}
+	return changed;
+}
+
+pcb_bool
+pcb_rat_add_all(pcb_bool SelectedOnly,
+					 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *))
+{
+	pcb_netlist_t *Nets, *Wantlist;
+	pcb_net_t *lonesome;
+	pcb_connection_t *onepin;
+	pcb_bool changed, Warned = pcb_false;
+
+	/* the netlist library has the text form
+	 * ProcNetlist fills in the Netlist
+	 * structure the way the final routing
+	 * is supposed to look
+	 */
+	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
+	if (!Wantlist) {
+		pcb_message(PCB_MSG_WARNING, _("Can't add rat lines because no netlist is loaded.\n"));
+		return pcb_false;
+	}
+	changed = pcb_false;
+	/* initialize finding engine */
+	pcb_conn_lookup_init();
+	pcb_save_find_flag(PCB_FLAG_DRC);
+	Nets = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t));
+	/* now we build another netlist (Nets) for each
+	 * net in Wantlist that shows how it actually looks now,
+	 * then fill in any missing connections with rat lines.
+	 *
+	 * we first assume each connection is separate
+	 * (no routing), then gather them into groups
+	 * if the net is all routed, the new netlist (Nets)
+	 * will have only one net entry.
+	 * Note that DrawShortestRats consumes all nets
+	 * from Nets, so *Nets is empty after the
+	 * DrawShortestRats call
+	 */
+	PCB_NET_LOOP(Wantlist);
+	{
+		PCB_CONNECTION_LOOP(net);
+		{
+			if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_any_obj_t *)connection->obj)) {
+				lonesome = pcb_net_new(PCB, Nets);
+				onepin = pcb_rat_connection_alloc(lonesome);
+				*onepin = *connection;
+				lonesome->Style = net->Style;
+			}
+		}
+		PCB_END_LOOP;
+		Warned |= GatherSubnets(Nets, SelectedOnly, pcb_true);
+		if (Nets->NetN > 0)
+			changed |= DrawShortestRats(Nets, funcp);
+	}
+	PCB_END_LOOP;
+	pcb_netlist_free(Nets);
+	free(Nets);
+	pcb_conn_lookup_uninit();
+	pcb_restore_find_flag();
+	if (funcp)
+		return pcb_true;
+
+	if (Warned || changed) {
+		pcb_stub_rat_proc_shorts();
+		pcb_draw();
+	}
+
+	if (Warned)
+		conf_core.temp.rat_warn = pcb_true;
+
+	if (changed) {
+		pcb_undo_inc_serial();
+		if (ratlist_length(&PCB->Data->Rat) > 0) {
+			pcb_message(PCB_MSG_INFO, "%d rat line%s remaining\n", ratlist_length(&PCB->Data->Rat), ratlist_length(&PCB->Data->Rat) > 1 ? "s" : "");
+		}
+		return pcb_true;
+	}
+	if (!SelectedOnly && !Warned) {
+		if (!ratlist_length(&PCB->Data->Rat) && !badnet)
+			pcb_message(PCB_MSG_INFO, _("Congratulations!!\n" "The layout is complete and has no shorted nets.\n"));
+		else
+			pcb_message(PCB_MSG_WARNING, _("Nothing more to add, but there are\n"
+								"either rat-lines in the layout, disabled nets\n" "in the net-list, or missing components\n"));
+	}
+	return pcb_false;
+}
+
+/* XXX: This is copied in large part from AddAllRats above; for
+ * maintainability, AddAllRats probably wants to be tweaked to use this
+ * version of the code so that we don't have duplication. */
+pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool SelectedOnly)
+{
+	pcb_netlist_list_t result = { 0, 0, NULL };
+	pcb_netlist_t *Nets, *Wantlist;
+	pcb_net_t *lonesome;
+	pcb_connection_t *onepin;
+
+	/* the netlist library has the text form
+	 * ProcNetlist fills in the Netlist
+	 * structure the way the final routing
+	 * is supposed to look
+	 */
+	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
+	if (!Wantlist) {
+		pcb_message(PCB_MSG_WARNING, _("Can't add rat lines because no netlist is loaded.\n"));
+		return result;
+	}
+	/* initialize finding engine */
+	pcb_conn_lookup_init();
+	pcb_save_find_flag(PCB_FLAG_DRC);
+	/* now we build another netlist (Nets) for each
+	 * net in Wantlist that shows how it actually looks now,
+	 * then fill in any missing connections with rat lines.
+	 *
+	 * we first assume each connection is separate
+	 * (no routing), then gather them into groups
+	 * if the net is all routed, the new netlist (Nets)
+	 * will have only one net entry.
+	 * Note that DrawShortestRats consumes all nets
+	 * from Nets, so *Nets is empty after the
+	 * DrawShortestRats call
+	 */
+	PCB_NET_LOOP(Wantlist);
+	{
+		Nets = pcb_netlist_new(&result);
+		PCB_CONNECTION_LOOP(net);
+		{
+			if (!SelectedOnly || PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_any_obj_t *)connection->obj)) {
+				lonesome = pcb_net_new(PCB, Nets);
+				onepin = pcb_rat_connection_alloc(lonesome);
+				*onepin = *connection;
+				lonesome->Style = net->Style;
+			}
+		}
+		PCB_END_LOOP;
+		/* Note that AndRats is *pcb_false* here! */
+		GatherSubnets(Nets, SelectedOnly, pcb_false);
+	}
+	PCB_END_LOOP;
+	pcb_conn_lookup_uninit();
+	pcb_restore_find_flag();
+	return result;
+}
+
+/* Check to see if a particular name is the name of an already existing rats line */
+static int rat_used(char *name)
+{
+	if (name == NULL)
+		return -1;
+
+	PCB_MENU_LOOP(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
+	{
+		if (menu->Name && (strcmp(menu->Name, name) == 0))
+			return 1;
+	}
+	PCB_END_LOOP;
+
+	return 0;
+}
+
+pcb_rat_t *pcb_rat_add_net(void)
+{
+	static int ratDrawn = 0;
+	char name1[256], *name2;
+	pcb_cardinal_t group1, group2;
+	char ratname[20];
+	const char *rd;
+	int found;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_lib_menu_t *menu;
+	pcb_lib_entry_t *entry;
+
+	if (pcb_crosshair.AttachedLine.Point1.X == pcb_crosshair.AttachedLine.Point2.X
+			&& pcb_crosshair.AttachedLine.Point1.Y == pcb_crosshair.AttachedLine.Point2.Y)
+		return NULL;
+
+	found = pcb_search_obj_by_location(PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3,
+																 pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 5);
+	if (found == PCB_OBJ_VOID) {
+		pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n"));
+		return NULL;
+	}
+	rd = get_refdes(ptr1);
+	if ((rd == NULL) || (*rd == 0) || (*rd == '<')) {
+		pcb_message(PCB_MSG_ERROR, _("You must name the starting subcricuit first\n"));
+		return NULL;
+	}
+
+	Sgrp = Cgrp = -1;
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &Sgrp, 1);
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &Cgrp, 1);
+
+	/* will work for pins to since the FLAG is common */
+	group1 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_any_obj_t *) ptr2) ? Sgrp : Cgrp);
+	strcpy(name1, pcb_connection_name(ptr2));
+	found = pcb_search_obj_by_location(PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3,
+																 pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 5);
+	if (found == PCB_OBJ_VOID) {
+		pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n"));
+		return NULL;
+	}
+	rd = get_refdes(ptr1);
+	if ((rd == NULL) || (*rd == 0) || (*rd == '<')) {
+		pcb_message(PCB_MSG_ERROR, _("You must name the ending subcircuit first\n"));
+		return NULL;
+	}
+	group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_any_obj_t *) ptr2) ? Sgrp : Cgrp);
+	name2 = pcb_connection_name(ptr2);
+
+	menu = pcb_netnode_to_netname(name1);
+	if (menu) {
+		if (pcb_netnode_to_netname(name2)) {
+			pcb_message(PCB_MSG_ERROR, _("Both connections already in netlist - cannot merge nets\n"));
+			return NULL;
+		}
+		entry = pcb_lib_entry_new(menu);
+		entry->ListEntry = pcb_strdup(name2);
+		entry->ListEntry_dontfree = 0;
+		pcb_netnode_to_netname(name2);
+		goto ratIt;
+	}
+	/* ok, the first name did not belong to a net */
+	menu = pcb_netnode_to_netname(name2);
+	if (menu) {
+		entry = pcb_lib_entry_new(menu);
+		entry->ListEntry = pcb_strdup(name1);
+		entry->ListEntry_dontfree = 0;
+		pcb_netnode_to_netname(name1);
+		goto ratIt;
+	}
+
+	/*
+	 * neither belong to a net, so create a new one.
+	 *
+	 * before creating a new rats here, we need to search
+	 * for a unique name.
+	 */
+	sprintf(ratname, "  ratDrawn%i", ++ratDrawn);
+	while (rat_used(ratname)) {
+		sprintf(ratname, "  ratDrawn%i", ++ratDrawn);
+	}
+
+	menu = pcb_lib_menu_new(&(PCB->NetlistLib[PCB_NETLIST_EDITED]), NULL);
+	menu->Name = pcb_strdup(ratname);
+	entry = pcb_lib_entry_new(menu);
+	entry->ListEntry = pcb_strdup(name1);
+	entry->ListEntry_dontfree = 0;
+
+	entry = pcb_lib_entry_new(menu);
+	entry->ListEntry = pcb_strdup(name2);
+	entry->ListEntry_dontfree = 0;
+	menu->flag = 1;
+
+ratIt:
+	pcb_netlist_changed(0);
+	return (pcb_rat_new(PCB->Data, pcb_crosshair.AttachedLine.Point1.X,
+											 pcb_crosshair.AttachedLine.Point1.Y,
+											 pcb_crosshair.AttachedLine.Point2.X,
+											 pcb_crosshair.AttachedLine.Point2.Y, group1, group2, conf_core.appearance.rat_thickness, pcb_no_flags()));
+}
+
+
+char *pcb_connection_name(pcb_any_obj_t *obj)
+{
+	static char name[256];
+	const char *num, *parent = NULL;
+	pcb_subc_t *subc;
+
+	if (obj->term == NULL)
+		return NULL;
+	num = obj->term;
+	subc = pcb_obj_parent_subc(obj);
+	if (subc != NULL)
+		parent = subc->refdes;
+
+	strcpy(name, PCB_UNKNOWN(parent));
+	strcat(name, "-");
+	strcat(name, PCB_UNKNOWN(num));
+	return name;
+}
+
+/* get next slot for a connection, allocates memory if necessary */
+pcb_connection_t *pcb_rat_connection_alloc(pcb_net_t *Net)
+{
+	pcb_connection_t *con = Net->Connection;
+
+	/* realloc new memory if necessary and clear it */
+	if (Net->ConnectionN >= Net->ConnectionMax) {
+		Net->ConnectionMax += STEP_POINT;
+		con = (pcb_connection_t *) realloc(con, Net->ConnectionMax * sizeof(pcb_connection_t));
+		Net->Connection = con;
+		memset(con + Net->ConnectionN, 0, STEP_POINT * sizeof(pcb_connection_t));
+	}
+	return (con + Net->ConnectionN++);
+}
Index: tags/2.0.1/src/rats.h
===================================================================
--- tags/2.0.1/src/rats.h	(nonexistent)
+++ tags/2.0.1/src/rats.h	(revision 18980)
@@ -0,0 +1,83 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *	rats.c, rats.h Copyright (C) 1997, harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_RATS_H
+#define PCB_RATS_H
+
+#include "config.h"
+#include "netlist.h"
+#include "layer.h"
+#include "layer_grp.h"
+
+struct pcb_connection_s {  /* holds a connection (rat) */
+	pcb_coord_t X, Y;        /* coordinate of connection */
+	void *ptr1;              /* parent of ptr2??? */
+	pcb_any_obj_t *obj;      /* the object of the connection */
+	pcb_layergrp_id_t group; /* the layer group of the connection */
+	pcb_lib_menu_t *menu;    /* the netmenu this *SHOULD* belong too */
+};
+
+
+pcb_rat_t *pcb_rat_add_net(void);
+
+/* Put the rats nest into the layout from the loaded netlist; if SelectedOnly
+   is pcb_true, it will only draw rats to selected pins and pads */
+pcb_bool pcb_rat_add_all(pcb_bool SelectedOnly, void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register pcb_route_style_t *));
+
+char *pcb_connection_name(pcb_any_obj_t *obj);
+
+
+/* Search a netlist menu entry and locate the corresponding pad returns
+   pcb_true if found, and fills in Connection information */
+pcb_bool pcb_rat_seek_pad(pcb_lib_entry_t * entry, pcb_connection_t * conn, pcb_bool Same);
+
+
+/* Read the library-netlist and build a pcb_true Netlist structure */
+pcb_netlist_t *pcb_rat_proc_netlist(pcb_lib_t *net_menu);
+
+pcb_netlist_list_t pcb_rat_collect_subnets(pcb_bool SelectedOnly);
+
+pcb_connection_t *pcb_rat_connection_alloc(pcb_net_t *Net);
+
+#define PCB_CONNECTION_LOOP(net) do {                         \
+        long n;                                               \
+        pcb_connection_t *connection;                         \
+        if ((net)->ConnectionN > 0)                           \
+        for (n = (net)->ConnectionN-1; n >= 0; n--)           \
+        {                                                     \
+                connection = & (net)->Connection[n]
+
+#define PCB_RAT_LOOP(top) do {                                          \
+  pcb_rat_t *line;                                                    \
+  gdl_iterator_t __it__;                                            \
+  ratlist_foreach(&(top)->Rat, &__it__, line) {
+
+
+#endif
Index: tags/2.0.1/src/rats_act.c
===================================================================
--- tags/2.0.1/src/rats_act.c	(nonexistent)
+++ tags/2.0.1/src/rats_act.c	(revision 18980)
@@ -0,0 +1,249 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "undo.h"
+#include "find.h"
+#include "remove.h"
+#include "funchash_core.h"
+#include "compat_nls.h"
+#include "obj_rat.h"
+#include "actions.h"
+
+#include "rats.h"
+#include "draw.h"
+
+#include "obj_rat_draw.h"
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_AddRats[] = "AddRats(AllRats|SelectedRats|Close)";
+
+static const char pcb_acth_AddRats[] = "Add one or more rat lines to the board.";
+
+/* %start-doc actions AddRats
+
+@table @code
+
+@item AllRats
+Create rat lines for all loaded nets that aren't already connected on
+with copper.
+
+@item SelectedRats
+Similarly, but only add rat lines for nets connected to selected pins
+and pads.
+
+@item Close
+Selects the shortest unselected rat on the board.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_AddRats(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	pcb_rat_t *shorty;
+	float len, small;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, AddRats, op = fgw_keyword(&argv[1]));
+
+	if (conf_core.temp.rat_warn) {
+		pcb_clear_warnings();
+		pcb_draw();
+	}
+	switch (op) {
+		case F_AllRats:
+			if (pcb_rat_add_all(pcb_false, NULL))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_SelectedRats:
+		case F_Selected:
+			if (pcb_rat_add_all(pcb_true, NULL))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_Close:
+			small = PCB_SQUARE(PCB_MAX_COORD);
+			shorty = NULL;
+			PCB_RAT_LOOP(PCB->Data);
+			{
+				if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line))
+					continue;
+				len = PCB_SQUARE(line->Point1.X - line->Point2.X) + PCB_SQUARE(line->Point1.Y - line->Point2.Y);
+				if (len < small) {
+					small = len;
+					shorty = line;
+				}
+			}
+			PCB_END_LOOP;
+			if (shorty) {
+				pcb_undo_add_obj_to_flag(shorty);
+				PCB_FLAG_SET(PCB_FLAG_SELECTED, shorty);
+				pcb_rat_invalidate_draw(shorty);
+				pcb_draw();
+				pcb_center_display((shorty->Point2.X + shorty->Point1.X) / 2, (shorty->Point2.Y + shorty->Point1.Y) / 2);
+			}
+			break;
+
+		default:
+			PCB_ACT_FAIL(AddRats);
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Connection[] = "Connection(Find|ResetLinesAndPolygons|ResetPinsAndVias|Reset)";
+
+static const char pcb_acth_Connection[] = "Searches connections of the object at the cursor position.";
+
+/* %start-doc actions Connection
+
+Connections found with this action will be highlighted in the
+``connected-color'' color and will have the ``found'' flag set.
+
+@table @code
+
+@item Find
+The net under the cursor is ``found''.
+
+@item ResetLinesAndPolygons
+Any ``found'' lines and polygons are marked ``not found''.
+
+@item ResetPinsAndVias
+Any ``found'' pins and vias are marked ``not found''.
+
+@item Reset
+All ``found'' objects are marked ``not found''.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Connection(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Connection, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_Find:
+			{
+				pcb_coord_t x, y;
+				pcb_hid_get_coords(_("Click on a connection"), &x, &y, 0);
+				pcb_lookup_conn(x, y, pcb_true, 1, PCB_FLAG_FOUND);
+				break;
+			}
+
+		case F_ResetLinesAndPolygons:
+			if (pcb_reset_found_lines_polys(pcb_true)) {
+				pcb_undo_inc_serial();
+				pcb_draw();
+			}
+			break;
+
+		case F_ResetPinsViasAndPads:
+			if (pcb_reset_found_pins_vias_pads(pcb_true)) {
+				pcb_undo_inc_serial();
+				pcb_draw();
+			}
+			break;
+
+		case F_Reset:
+			if (pcb_reset_conns(pcb_true)) {
+				pcb_undo_inc_serial();
+				pcb_draw();
+			}
+			break;
+
+		default:
+			PCB_ACT_FAIL(Connection);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_DeleteRats[] = "DeleteRats(AllRats|Selected|SelectedRats)";
+
+static const char pcb_acth_DeleteRats[] = "Delete rat lines.";
+
+/* %start-doc actions DeleteRats
+
+%end-doc */
+
+static fgw_error_t pcb_act_DeleteRats(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, DeleteRats, op = fgw_keyword(&argv[1]));
+
+	if (conf_core.temp.rat_warn) {
+		pcb_clear_warnings();
+		pcb_draw();
+	}
+	switch(op) {
+		case F_AllRats:
+			if (pcb_rats_destroy(pcb_false))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_SelectedRats:
+		case F_Selected:
+			if (pcb_rats_destroy(pcb_true))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+		default:
+			PCB_ACT_FAIL(DeleteRats);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t rats_action_list[] = {
+	{"AddRats", pcb_act_AddRats, pcb_acth_AddRats, pcb_acts_AddRats},
+	{"Connection", pcb_act_Connection, pcb_acth_Connection, pcb_acts_Connection},
+	{"DeleteRats", pcb_act_DeleteRats, pcb_acth_DeleteRats, pcb_acts_DeleteRats}
+};
+
+PCB_REGISTER_ACTIONS(rats_action_list, NULL)
Index: tags/2.0.1/src/rats_patch.c
===================================================================
--- tags/2.0.1/src/rats_patch.c	(nonexistent)
+++ tags/2.0.1/src/rats_patch.c	(revision 18980)
@@ -0,0 +1,525 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "rats_patch.h"
+#include "genht/htsp.h"
+#include "genht/hash.h"
+
+#include "config.h"
+#include "actions.h"
+#include "data.h"
+#include "error.h"
+#include "copy.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "safe_fs.h"
+
+static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free);
+
+const char *pcb_netlist_names[PCB_NUM_NETLISTS] = {
+	"input",
+	"edited"
+};
+
+void pcb_ratspatch_append(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2)
+{
+	pcb_ratspatch_line_t *n;
+
+	n = malloc(sizeof(pcb_ratspatch_line_t));
+
+	n->op = op;
+	n->id = pcb_strdup(id);
+	n->arg1.net_name = pcb_strdup(a1);
+	if (a2 != NULL)
+		n->arg2.attrib_val = pcb_strdup(a2);
+	else
+		n->arg2.attrib_val = NULL;
+
+	/* link in */
+	n->prev = pcb->NetlistPatchLast;
+	if (pcb->NetlistPatches != NULL) {
+		pcb->NetlistPatchLast->next = n;
+		pcb->NetlistPatchLast = n;
+	}
+	else
+		pcb->NetlistPatchLast = pcb->NetlistPatches = n;
+	n->next = NULL;
+}
+
+static void rats_patch_free_fields(pcb_ratspatch_line_t *n)
+{
+	if (n->id != NULL)
+		free(n->id);
+	if (n->arg1.net_name != NULL)
+		free(n->arg1.net_name);
+	if (n->arg2.attrib_val != NULL)
+		free(n->arg2.attrib_val);
+}
+
+void pcb_ratspatch_destroy(pcb_board_t *pcb)
+{
+	pcb_ratspatch_line_t *n, *next;
+
+	for(n = pcb->NetlistPatches; n != NULL; n = next) {
+		next = n->next;
+		rats_patch_free_fields(n);
+		free(n);
+	}
+}
+
+void pcb_ratspatch_append_optimize(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2)
+{
+	pcb_rats_patch_op_t seek_op;
+	pcb_ratspatch_line_t *n;
+
+	switch (op) {
+	case RATP_ADD_CONN:
+		seek_op = RATP_DEL_CONN;
+		break;
+	case RATP_DEL_CONN:
+		seek_op = RATP_ADD_CONN;
+		break;
+	case RATP_CHANGE_ATTRIB:
+		seek_op = RATP_CHANGE_ATTRIB;
+		break;
+	}
+
+	/* keep the list clean: remove the last operation that becomes obsolete by the new one */
+	for (n = pcb->NetlistPatchLast; n != NULL; n = n->prev) {
+		if ((n->op == seek_op) && (strcmp(n->id, id) == 0)) {
+			switch (op) {
+			case RATP_CHANGE_ATTRIB:
+				if (strcmp(n->arg1.attrib_name, a1) != 0)
+					break;
+				rats_patch_remove(pcb, n, 1);
+				goto quit;
+			case RATP_ADD_CONN:
+			case RATP_DEL_CONN:
+				if (strcmp(n->arg1.net_name, a1) != 0)
+					break;
+				rats_patch_remove(pcb, n, 1);
+				goto quit;
+			}
+		}
+	}
+
+quit:;
+	pcb_ratspatch_append(pcb, op, id, a1, a2);
+}
+
+/* Unlink n from the list; if do_free is non-zero, also free fields and n */
+static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free)
+{
+	/* if we are the first or last... */
+	if (n == pcb->NetlistPatches)
+		pcb->NetlistPatches = n->next;
+	if (n == pcb->NetlistPatchLast)
+		pcb->NetlistPatchLast = n->prev;
+
+	/* extra ifs, just in case n is already unlinked */
+	if (n->prev != NULL)
+		n->prev->next = n->next;
+	if (n->next != NULL)
+		n->next->prev = n->prev;
+
+	if (do_free) {
+		rats_patch_free_fields(n);
+		free(n);
+	}
+}
+
+static void netlist_free(pcb_lib_t *dst)
+{
+	int n, p;
+
+	if (dst->Menu == NULL)
+		return;
+
+	for (n = 0; n < dst->MenuN; n++) {
+		pcb_lib_menu_t *dmenu = &dst->Menu[n];
+		free(dmenu->Name);
+		for (p = 0; p < dmenu->EntryN; p++) {
+			pcb_lib_entry_t *dentry = &dmenu->Entry[p];
+			free((char*)dentry->ListEntry);
+		}
+		free(dmenu->Entry);
+	}
+	free(dst->Menu);
+	dst->Menu = NULL;
+}
+
+static void netlist_copy(pcb_lib_t *dst, pcb_lib_t *src)
+{
+	int n, p;
+	dst->MenuMax = dst->MenuN = src->MenuN;
+	if (src->MenuN != 0) {
+		dst->Menu = calloc(sizeof(pcb_lib_menu_t), dst->MenuN);
+		for (n = 0; n < src->MenuN; n++) {
+			pcb_lib_menu_t *smenu = &src->Menu[n];
+			pcb_lib_menu_t *dmenu = &dst->Menu[n];
+/*		fprintf(stderr, "Net %d name='%s': ", n, smenu->Name+2);*/
+			dmenu->Name = pcb_strdup(smenu->Name);
+			dmenu->EntryMax = dmenu->EntryN = smenu->EntryN;
+			dmenu->Entry = calloc(sizeof(pcb_lib_entry_t), dmenu->EntryN);
+			dmenu->flag = smenu->flag;
+			dmenu->internal = smenu->internal;
+			for (p = 0; p < smenu->EntryN; p++) {
+			pcb_lib_entry_t *sentry = &smenu->Entry[p];
+				pcb_lib_entry_t *dentry = &dmenu->Entry[p];
+				dentry->ListEntry = pcb_strdup(sentry->ListEntry);
+				dentry->ListEntry_dontfree = 0;
+/*			fprintf (stderr, " '%s'/%p", dentry->ListEntry, dentry->ListEntry);*/
+			}
+/*		fprintf(stderr, "\n");*/
+		}
+	}
+	else
+		dst->Menu = NULL;
+}
+
+
+int rats_patch_apply_conn(pcb_board_t *pcb, pcb_ratspatch_line_t * patch, int del)
+{
+	int n;
+
+	for (n = 0; n < pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++) {
+		pcb_lib_menu_t *menu = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
+		if (strcmp(menu->Name + 2, patch->arg1.net_name) == 0) {
+			int p;
+			for (p = 0; p < menu->EntryN; p++) {
+				pcb_lib_entry_t *entry = &menu->Entry[p];
+/*				fprintf (stderr, "C'%s'/%p '%s'/%p\n", entry->ListEntry, entry->ListEntry, patch->id, patch->id);*/
+				if (strcmp(entry->ListEntry, patch->id) == 0) {
+					if (del) {
+						/* want to delete and it's on the list */
+						memmove(&menu->Entry[p], &menu->Entry[p + 1], (menu->EntryN - p - 1) * sizeof(pcb_lib_entry_t));
+						menu->EntryN--;
+						return 0;
+					}
+					/* want to add, and pin is on the list -> already added */
+					return 1;
+				}
+			}
+			/* If we got here, pin is not on the list */
+			if (del)
+				return 1;
+
+			/* Wanted to add, let's add it */
+			pcb_lib_conn_new(menu, (char *) patch->id);
+			return 0;
+		}
+	}
+
+	/* couldn't find the net: create it */
+	{
+		pcb_lib_menu_t *net = NULL;
+		net = pcb_lib_net_new(&pcb->NetlistLib[PCB_NETLIST_EDITED], patch->arg1.net_name, NULL);
+		if (net == NULL)
+			return 1;
+		pcb_lib_conn_new(net, (char *) patch->id);
+	}
+	return 0;
+}
+
+
+int pcb_ratspatch_apply(pcb_board_t *pcb, pcb_ratspatch_line_t * patch)
+{
+	switch (patch->op) {
+	case RATP_ADD_CONN:
+		return rats_patch_apply_conn(pcb, patch, 0);
+	case RATP_DEL_CONN:
+		return rats_patch_apply_conn(pcb, patch, 1);
+	case RATP_CHANGE_ATTRIB:
+#warning TODO: just check wheter it is still valid
+		break;
+	}
+	return 0;
+}
+
+void pcb_ratspatch_make_edited(pcb_board_t *pcb)
+{
+	pcb_ratspatch_line_t *n;
+
+	netlist_free(&(pcb->NetlistLib[PCB_NETLIST_EDITED]));
+	netlist_copy(&(pcb->NetlistLib[PCB_NETLIST_EDITED]), &(pcb->NetlistLib[PCB_NETLIST_INPUT]));
+	for (n = pcb->NetlistPatches; n != NULL; n = n->next)
+		pcb_ratspatch_apply(pcb, n);
+}
+
+static pcb_lib_menu_t *rats_patch_find_net(pcb_board_t *pcb, const char *netname, int listidx)
+{
+	int n;
+
+	for (n = 0; n < pcb->NetlistLib[listidx].MenuN; n++) {
+		pcb_lib_menu_t *menu = &pcb->NetlistLib[listidx].Menu[n];
+		if (strcmp(menu->Name + 2, netname) == 0)
+			return menu;
+	}
+	return NULL;
+}
+
+int pcb_rats_patch_export(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx)
+{
+	pcb_ratspatch_line_t *n;
+
+	if (need_info_lines) {
+		htsp_t *seen;
+		seen = htsp_alloc(strhash, strkeyeq);
+
+		/* have to print net_info lines */
+		for (n = pat; n != NULL; n = n->next) {
+			switch (n->op) {
+			case RATP_ADD_CONN:
+			case RATP_DEL_CONN:
+				if (htsp_get(seen, n->arg1.net_name) == NULL) {
+					pcb_lib_menu_t *net;
+					int p;
+
+					net = rats_patch_find_net(pcb, n->arg1.net_name, PCB_NETLIST_INPUT);
+/*					printf("net: '%s' %p\n", n->arg1.net_name, (void *)net);*/
+					if (net != NULL) {
+						htsp_set(seen, n->arg1.net_name, net);
+						cb(ctx, PCB_RPE_INFO_BEGIN, n->arg1.net_name, NULL, NULL);
+						for (p = 0; p < net->EntryN; p++) {
+							pcb_lib_entry_t *entry = &net->Entry[p];
+							cb(ctx, PCB_RPE_INFO_TERMINAL, n->arg1.net_name, NULL, entry->ListEntry);
+						}
+						cb(ctx, PCB_RPE_INFO_END, n->arg1.net_name, NULL, NULL);
+
+					}
+				}
+			case RATP_CHANGE_ATTRIB:
+				break;
+			}
+		}
+		htsp_free(seen);
+	}
+
+	/* action lines */
+	for (n = pat; n != NULL; n = n->next) {
+		switch (n->op) {
+		case RATP_ADD_CONN:
+			cb(ctx, PCB_RPE_CONN_ADD, n->arg1.net_name, NULL, n->id);
+			break;
+		case RATP_DEL_CONN:
+			cb(ctx, PCB_RPE_CONN_DEL, n->arg1.net_name, NULL, n->id);
+			break;
+		case RATP_CHANGE_ATTRIB:
+			cb(ctx, PCB_RPE_ATTR_CHG, n->id, n->arg1.attrib_name, n->arg2.attrib_val);
+			break;
+		}
+	}
+	return 0;
+}
+
+typedef struct {
+	FILE *f;
+	const char *q, *po, *pc, *line_prefix;
+} fexport_t;
+
+static void fexport_cb(void *ctx_, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val)
+{
+	fexport_t *ctx = ctx_;
+	switch(ev) {
+		case PCB_RPE_INFO_BEGIN:     fprintf(ctx->f, "%snet_info%s%s%s%s", ctx->line_prefix, ctx->po, ctx->q, netn, ctx->q); break;
+		case PCB_RPE_INFO_TERMINAL:  fprintf(ctx->f, " %s%s%s", ctx->q, val, ctx->q); break;
+		case PCB_RPE_INFO_END:       fprintf(ctx->f, "%s\n", ctx->pc); break;
+		case PCB_RPE_CONN_ADD:       fprintf(ctx->f, "%sadd_conn%s%s%s%s %s%s%s%s\n", ctx->line_prefix, ctx->po, ctx->q, val, ctx->q, ctx->q, netn, ctx->q, ctx->pc); break;
+		case PCB_RPE_CONN_DEL:       fprintf(ctx->f, "%sdel_conn%s%s%s%s %s%s%s%s\n", ctx->line_prefix, ctx->po, ctx->q, val, ctx->q, ctx->q, netn, ctx->q, ctx->pc); break;
+		case PCB_RPE_ATTR_CHG:
+			fprintf(ctx->f, "%schange_attrib%s%s%s%s %s%s%s %s%s%s%s\n",
+				ctx->line_prefix, ctx->po,
+				ctx->q, netn, ctx->q,
+				ctx->q, key, ctx->q,
+				ctx->q, val, ctx->q,
+				ctx->pc);
+	}
+}
+
+int pcb_ratspatch_fexport(pcb_board_t *pcb, FILE *f, int fmt_pcb)
+{
+	fexport_t ctx;
+	if (fmt_pcb) {
+		ctx.q = "\"";
+		ctx.po = "(";
+		ctx.pc = ")";
+		ctx.line_prefix = "\t";
+	}
+	else {
+		ctx.q = "";
+		ctx.po = " ";
+		ctx.pc = "";
+		ctx.line_prefix = "";
+	}
+	ctx.f = f;
+	return pcb_rats_patch_export(pcb, pcb->NetlistPatches, !fmt_pcb, fexport_cb, &ctx);
+}
+
+
+static const char pcb_acts_ReplaceFootprint[] = "ReplaceFootprint()\n";
+static const char pcb_acth_ReplaceFootprint[] = "Replace the footprint of the selected components with the footprint specified.";
+
+static fgw_error_t pcb_act_ReplaceFootprint(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fpname = NULL;
+	int found = 0, len;
+	pcb_subc_t *news, *placed;
+
+	/* check if we have elements selected and quit if not */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc) && (subc->refdes != NULL)) {
+			found = 1;
+			break;
+		}
+	}
+	PCB_END_LOOP;
+
+	if (!(found)) {
+		pcb_message(PCB_MSG_ERROR, "ReplaceFootprint works on selected subcircuits with refdes, please select subcircuits first!\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* fetch the name of the new footprint */
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, ReplaceFootprint, fpname = argv[1].val.str);
+	if (fpname == NULL) {
+		fpname = pcb_gui->prompt_for("Footprint name", "");
+		if (fpname == NULL) {
+			pcb_message(PCB_MSG_ERROR, "No footprint name supplied\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+
+	/* check if the footprint is available */
+	pcb_buffer_load_footprint(&pcb_buffers[PCB_MAX_BUFFER-1], fpname, NULL);
+	len = pcb_subclist_length(&pcb_buffers[PCB_MAX_BUFFER-1].Data->subc);
+	if (len == 0) {
+		pcb_message(PCB_MSG_ERROR, "Footprint %s contains no subcircuits", fpname);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	if (len > 1) {
+		pcb_message(PCB_MSG_ERROR, "Footprint %s contains multiple subcircuits", fpname);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	news = pcb_subclist_first(&pcb_buffers[PCB_MAX_BUFFER-1].Data->subc);
+
+	/* action: replace selected elements */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_coord_t ox, oy;
+		double rot = 0;
+
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc) || (subc->refdes == NULL))
+			continue;
+
+		if (pcb_subc_get_origin(subc, &ox, &oy) != 0) {
+			ox = (subc->BoundingBox.X1 + subc->BoundingBox.X2) / 2;
+			oy = (subc->BoundingBox.Y1 + subc->BoundingBox.Y2) / 2;
+		}
+		pcb_subc_get_rotation(subc, &rot);
+
+
+		placed = pcb_subc_dup_at(PCB, PCB->Data, news, ox, oy, 0);
+		placed->ID = subc->ID;
+		if (rot != 0)
+			pcb_subc_rotate(placed, ox, oy, cos(rot / PCB_RAD_TO_DEG), sin(rot / PCB_RAD_TO_DEG), rot);
+
+		pcb_ratspatch_append_optimize(PCB, RATP_CHANGE_ATTRIB, subc->refdes, "footprint", fpname);
+		{ /* copy attributes */
+			int n;
+			pcb_attribute_list_t *dst = &news->Attributes, *src = &subc->Attributes;
+			for (n = 0; n < src->Number; n++)
+				if (strcmp(src->List[n].name, "footprint") != 0)
+					pcb_attribute_put(dst, src->List[n].name, src->List[n].value);
+		}
+		pcb_subc_remove(subc);
+	}
+	PCB_END_LOOP;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_SavePatch[] = "SavePatch(filename)";
+static const char pcb_acth_SavePatch[] = "Save netlist patch for back annotation.";
+
+/* %start-doc actions SavePatch
+Save netlist patch for back annotation.
+%end-doc */
+static fgw_error_t pcb_act_SavePatch(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fn = NULL;
+	FILE *f;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, SavePatch, fn = argv[1].val.str);
+
+	if (fn == NULL) {
+		char *default_file;
+
+		if (PCB->Filename != NULL) {
+			char *end;
+			int len;
+			len = strlen(PCB->Filename);
+			default_file = malloc(len + 8);
+			memcpy(default_file, PCB->Filename, len + 1);
+			end = strrchr(default_file, '.');
+			if ((end == NULL) || (pcb_strcasecmp(end, ".pcb") != 0))
+				end = default_file + len;
+			strcpy(end, ".bap");
+		}
+		else
+			default_file = pcb_strdup("unnamed.bap");
+
+		fn = pcb_gui->fileselect("Save netlist patch as ...",
+			"Choose a file to save netlist patch to\n"
+			"for back annotation\n", default_file, ".bap", "patch", 0);
+
+		free(default_file);
+	}
+
+	f = pcb_fopen(fn, "w");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open netlist patch file %s for writing\n", fn);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	pcb_ratspatch_fexport(PCB, f, 0);
+	fclose(f);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t rats_patch_action_list[] = {
+	{"ReplaceFootprint", pcb_act_ReplaceFootprint, pcb_acth_ReplaceFootprint, pcb_acts_ReplaceFootprint},
+	{"SavePatch", pcb_act_SavePatch, pcb_acth_SavePatch, pcb_acts_SavePatch}
+};
+
+PCB_REGISTER_ACTIONS(rats_patch_action_list, NULL)
Index: tags/2.0.1/src/rats_patch.h
===================================================================
--- tags/2.0.1/src/rats_patch.h	(nonexistent)
+++ tags/2.0.1/src/rats_patch.h	(revision 18980)
@@ -0,0 +1,98 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2013..2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_RATS_PATCH_H
+#define PCB_RATS_PATCH_H
+
+#include <stdio.h>
+#include "board.h"
+
+typedef enum {
+	RATP_ADD_CONN,
+	RATP_DEL_CONN,
+	RATP_CHANGE_ATTRIB
+} pcb_rats_patch_op_t;
+
+struct pcb_ratspatch_line_s {
+	pcb_rats_patch_op_t op;
+	char *id;
+	union {
+		char *net_name;
+		char *attrib_name;
+	} arg1;
+	union {
+		char *attrib_val;
+	} arg2;
+
+	pcb_ratspatch_line_t *prev, *next;
+};
+
+
+
+/* Single-word netlist class names */
+const char *pcb_netlist_names[PCB_NUM_NETLISTS];
+
+/* Allocate and append a patch line to the patch list */
+void pcb_ratspatch_append(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2);
+
+/* Free the patch list and all memory claimed by patch list items */
+void pcb_ratspatch_destroy(pcb_board_t *pcb);
+
+/* Same as pcb_ratspatch_append() but also optimize previous entries so that
+   redundant entries are removed */
+void pcb_ratspatch_append_optimize(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2);
+
+/* Create [PCB_NETLIST_EDITED] from [PCB_NETLIST_INPUT] applying the patch */
+void pcb_ratspatch_make_edited(pcb_board_t *pcb);
+
+/* apply a single patch record on [PCB_NETLIST_EDITED]; returns non-zero on failure */
+int pcb_ratspatch_apply(pcb_board_t *pcb, pcb_ratspatch_line_t * patch);
+
+/**** exporter ****/
+
+/* Special text exporter:
+   save all patch lines as an ordered list of text lines
+   if fmt is non-zero, generate pcb savefile compatible lines, else generate a back annotation patch */
+int pcb_ratspatch_fexport(pcb_board_t *pcb, FILE * f, int fmt_pcb);
+
+/* Generic, callback based exporter: */
+
+                          /* EVENT ARGUMENTS */
+typedef enum {            /* netn is always the net name, unless specified otherwise */
+	PCB_RPE_INFO_BEGIN,     /* netn */
+	PCB_RPE_INFO_TERMINAL,  /* netn; val is the terminal pin/pad name */
+	PCB_RPE_INFO_END,       /* netn */
+
+	PCB_RPE_CONN_ADD,       /* netn; val is the terminal pin/pad name */
+	PCB_RPE_CONN_DEL,       /* netn; val is the terminal pin/pad name */
+	PCB_RPE_ATTR_CHG        /* netn; key is the attribute name, val is the new attribute value */
+} pcb_rats_patch_export_ev_t;
+
+/* Call cb() for each item to output; PCB_PTRE_INFO* is calculated/called only
+   if need_info_lines is true; the pcb pointer is used for looking up connections */
+int pcb_rats_patch_export(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx);
+
+#endif
Index: tags/2.0.1/src/remove.c
===================================================================
--- tags/2.0.1/src/remove.c	(nonexistent)
+++ tags/2.0.1/src/remove.c	(revision 18980)
@@ -0,0 +1,117 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "draw.h"
+#include "remove.h"
+#include "select.h"
+#include "undo.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_poly_op.h"
+#include "obj_text_op.h"
+#include "obj_rat_op.h"
+#include "obj_subc_op.h"
+#include "obj_pstk_op.h"
+
+static pcb_opfunc_t RemoveFunctions = {
+	pcb_lineop_remove,
+	pcb_textop_remove,
+	pcb_polyop_remove,
+	pcb_lineop_remove_point,
+	pcb_polyop_remove_point,
+	pcb_arcop_remove,
+	pcb_ratop_remove,
+	pcb_arcop_remove_point,
+	pcb_subcop_remove,
+	pcb_pstkop_remove
+};
+
+static pcb_opfunc_t DestroyFunctions = {
+	pcb_lineop_destroy,
+	pcb_textop_destroy,
+	pcb_polyop_destroy,
+	NULL,
+	pcb_polyop_destroy_point,
+	pcb_arcop_destroy,
+	pcb_ratop_destroy,
+	NULL,
+	pcb_subcop_destroy,
+	pcb_pstkop_destroy,
+};
+
+/* ----------------------------------------------------------------------
+ * removes all selected and visible objects
+ * returns pcb_true if any objects have been removed
+ */
+pcb_bool pcb_remove_selected(pcb_bool locked_too)
+{
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	if (pcb_selected_operation(PCB, PCB->Data, &RemoveFunctions, &ctx, pcb_false, PCB_OBJ_ANY & (~PCB_OBJ_SUBC_PART), locked_too)) {
+		pcb_undo_inc_serial();
+		pcb_draw();
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * remove object as referred by pointers and type,
+ * allocated memory is passed to the 'remove undo' list
+ */
+void *pcb_remove_object(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	pcb_opctx_t ctx;
+	void *ptr;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = NULL;
+
+	ptr = pcb_object_operation(&RemoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	pcb_draw();
+	return ptr;
+}
+
+void *pcb_destroy_object(pcb_data_t *Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	void *res;
+	pcb_opctx_t ctx;
+
+	ctx.remove.pcb = PCB;
+	ctx.remove.destroy_target = Target;
+
+	res = pcb_object_operation(&DestroyFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	pcb_draw();
+	return res;
+}
Index: tags/2.0.1/src/remove.h
===================================================================
--- tags/2.0.1/src/remove.h	(nonexistent)
+++ tags/2.0.1/src/remove.h	(revision 18980)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Remove objects from the board */
+
+#ifndef	PCB_REMOVE_H
+#define	PCB_REMOVE_H
+
+#include "config.h"
+
+#define PCB_REMOVE_TYPES \
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE_POINT | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_SUBC | \
+	PCB_OBJ_POLY_POINT | PCB_OBJ_POLY | PCB_OBJ_RAT | PCB_OBJ_ARC | PCB_OBJ_ARC_POINT)
+
+pcb_bool pcb_remove_selected(pcb_bool locked_too);
+
+/* Undoable delete (operation wrapper) */
+void *pcb_remove_object(int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+/* Non-undoable delete (operation wrapper) */
+void *pcb_destroy_object(pcb_data_t *Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+
+#endif
Index: tags/2.0.1/src/remove_act.c
===================================================================
--- tags/2.0.1/src/remove_act.c	(nonexistent)
+++ tags/2.0.1/src/remove_act.c	(revision 18980)
@@ -0,0 +1,106 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "data.h"
+#include "actions.h"
+#include "tool.h"
+#include "remove.h"
+#include "board.h"
+#include "funchash_core.h"
+
+static const char pcb_acts_Delete[] = "Delete(Object|Selected)\n" "Delete(AllRats|SelectedRats)";
+static const char pcb_acth_Delete[] = "Delete stuff.";
+
+/* %start-doc actions Delete
+
+%end-doc */
+
+static fgw_error_t pcb_act_Delete(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int id;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1]));
+
+	if (id == -1) { /* no arg */
+		if (pcb_remove_selected(pcb_false) == pcb_false)
+			id = F_Object;
+	}
+
+	switch(id) {
+	case F_Object:
+		pcb_hid_get_coords("Click on object to delete", &pcb_tool_note.X, &pcb_tool_note.Y, 0);
+		pcb_tool_save();
+		pcb_tool_select_by_id(PCB_MODE_REMOVE);
+		pcb_notify_mode();
+		pcb_tool_restore();
+		break;
+	case F_Selected:
+		pcb_remove_selected(pcb_false);
+		break;
+	case F_AllRats:
+		if (pcb_rats_destroy(pcb_false))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+	case F_SelectedRats:
+		if (pcb_rats_destroy(pcb_true))
+			pcb_board_set_changed_flag(pcb_true);
+		break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_RemoveSelected[] = "pcb_remove_selected()";
+static const char pcb_acth_RemoveSelected[] = "Removes any selected objects.";
+
+/* %start-doc actions RemoveSelected
+
+%end-doc */
+
+static fgw_error_t pcb_act_RemoveSelected(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (pcb_remove_selected(pcb_false))
+		pcb_board_set_changed_flag(pcb_true);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t remove_action_list[] = {
+	{"Delete", pcb_act_Delete, pcb_acth_Delete, pcb_acts_Delete},
+	{"RemoveSelected", pcb_act_RemoveSelected, pcb_acth_RemoveSelected, pcb_acts_RemoveSelected}
+};
+
+PCB_REGISTER_ACTIONS(remove_action_list, NULL)
Index: tags/2.0.1/src/rotate.c
===================================================================
--- tags/2.0.1/src/rotate.c	(nonexistent)
+++ tags/2.0.1/src/rotate.c	(revision 18980)
@@ -0,0 +1,174 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "polygon.h"
+#include "rotate.h"
+#include "search.h"
+#include "select.h"
+#include "undo.h"
+#include "event.h"
+#include "conf_core.h"
+#include "compat_nls.h"
+#include "obj_arc_op.h"
+#include "obj_line_op.h"
+#include "obj_poly_op.h"
+#include "obj_text_op.h"
+#include "obj_subc_op.h"
+#include "obj_pstk_op.h"
+
+#include "obj_line_draw.h"
+#include "obj_rat_draw.h"
+
+pcb_opfunc_t Rotate90Functions = {
+	pcb_lineop_rotate90,
+	pcb_textop_rotate90,
+	pcb_polyop_rotate90,
+	pcb_lineop_rotate90_point,
+	NULL,
+	pcb_arcop_rotate90,
+	NULL,
+	NULL,
+	pcb_subcop_rotate90,
+	pcb_pstkop_rotate90
+};
+
+pcb_opfunc_t RotateFunctions = {
+	pcb_lineop_rotate,
+	pcb_textop_rotate,
+	pcb_polyop_rotate,
+	NULL,
+	NULL,
+	pcb_arcop_rotate,
+	NULL,
+	NULL,
+	pcb_subcop_rotate,
+	pcb_pstkop_rotate
+};
+
+/* ---------------------------------------------------------------------------
+ * rotates a point in 90 degree steps
+ */
+void pcb_point_rotate90(pcb_point_t *Point, pcb_coord_t X, pcb_coord_t Y, unsigned Number)
+{
+	PCB_COORD_ROTATE90(Point->X, Point->Y, X, Y, Number);
+}
+
+void *pcb_obj_rotate90(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t X, pcb_coord_t Y, unsigned Steps)
+{
+	void *ptr2;
+	int changed = 0;
+	pcb_opctx_t ctx;
+
+	/* setup default  global identifiers */
+	ctx.rotate.pcb = PCB;
+	ctx.rotate.number = Steps;
+	ctx.rotate.center_x = X;
+	ctx.rotate.center_y = Y;
+
+	pcb_event(PCB_EVENT_RUBBER_ROTATE90, "ipppccip", Type, Ptr1, Ptr2, Ptr2, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.number, &changed);
+
+	if (Type != PCB_OBJ_PSTK) /* padstack has its own way doing the rotation-undo */
+		pcb_undo_add_obj_to_rotate90(Type, Ptr1, Ptr2, Ptr3, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.number);
+	ptr2 = pcb_object_operation(&Rotate90Functions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	changed |= (ptr2 != NULL);
+	if (changed) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return ptr2;
+}
+
+void *pcb_obj_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t X, pcb_coord_t Y, pcb_angle_t angle)
+{
+	void *ptr2;
+	int changed = 0;
+	pcb_opctx_t ctx;
+
+	/* setup default  global identifiers */
+	ctx.rotate.pcb = PCB;
+	ctx.rotate.angle = angle;
+	ctx.rotate.center_x = X;
+	ctx.rotate.center_y = Y;
+
+	pcb_event(PCB_EVENT_RUBBER_ROTATE, "ipppccip", Type, Ptr1, Ptr2, Ptr2, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.angle, &changed);
+
+	if (Type != PCB_OBJ_PSTK) /* padstack has its own way doing the rotation-undo */
+		pcb_undo_add_obj_to_rotate(Type, Ptr1, Ptr2, Ptr3, ctx.rotate.center_x, ctx.rotate.center_y, ctx.rotate.angle);
+	ptr2 = pcb_object_operation(&RotateFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
+	changed |= (ptr2 != NULL);
+	if (changed) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+	return ptr2;
+}
+
+void pcb_screen_obj_rotate90(pcb_coord_t X, pcb_coord_t Y, unsigned Steps)
+{
+	int type;
+	void *ptr1, *ptr2, *ptr3;
+	if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) {
+			pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+			return;
+		}
+		pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
+		if (conf_core.editor.rubber_band_mode)
+			pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3);
+		if (type == PCB_OBJ_SUBC)
+			pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3);
+		pcb_obj_rotate90(type, ptr1, ptr2, ptr3, X, Y, Steps);
+		pcb_board_set_changed_flag(pcb_true);
+	}
+}
+
+void pcb_screen_obj_rotate(pcb_coord_t X, pcb_coord_t Y, pcb_angle_t angle)
+{
+	int type;
+	void *ptr1, *ptr2, *ptr3;
+	if ((type = pcb_search_screen(X, Y, PCB_ROTATE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_arc_t *) ptr2)) {
+			pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+			return;
+		}
+		pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
+		if (conf_core.editor.rubber_band_mode)
+			pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", type, ptr1, ptr2, ptr3);
+		if (type == PCB_OBJ_SUBC)
+			pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", type, ptr1, ptr2, ptr3);
+		pcb_obj_rotate(type, ptr1, ptr2, ptr3, X, Y, angle);
+		pcb_board_set_changed_flag(pcb_true);
+	}
+}
Index: tags/2.0.1/src/rotate.h
===================================================================
--- tags/2.0.1/src/rotate.h	(nonexistent)
+++ tags/2.0.1/src/rotate.h	(revision 18980)
@@ -0,0 +1,82 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_ROTATE_H
+#define	PCB_ROTATE_H
+
+#include "config.h"
+#include "global_typedefs.h"
+#include "compat_misc.h"
+
+/*** Transformation macros ***/
+#define	PCB_COORD_ROTATE90(x,y,x0,y0,n)							\
+	do {												\
+		pcb_coord_t	dx = (x)-(x0),					\
+					dy = (y)-(y0);					\
+													\
+		switch(n & 0x03)									\
+		{											\
+			case 1:		(x)=(x0)+dy; (y)=(y0)-dx;	\
+						break;						\
+			case 2:		(x)=(x0)-dx; (y)=(y0)-dy;	\
+						break;						\
+			case 3:		(x)=(x0)-dy; (y)=(y0)+dx;	\
+						break;						\
+			default:	break;						\
+		}											\
+	} while(0)
+
+#define PCB_ROTATE_TYPES (PCB_OBJ_PSTK | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_ARC | PCB_OBJ_LINE_POINT | PCB_OBJ_LINE | PCB_OBJ_POLY | PCB_OBJ_FLOATER)
+
+/* rotates an object passed;
+ * the center of rotation is determined by the current cursor location
+ */
+void *pcb_obj_rotate90(int, void *, void *, void *, pcb_coord_t, pcb_coord_t, unsigned);
+
+/* rotates an objects passed;
+ * the center of rotation is determined by the current cursor location */
+void *pcb_obj_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t X, pcb_coord_t Y, pcb_angle_t angle);
+
+void pcb_screen_obj_rotate90(pcb_coord_t, pcb_coord_t, unsigned);
+void pcb_screen_obj_rotate(pcb_coord_t X, pcb_coord_t Y, pcb_angle_t angle);
+void pcb_point_rotate90(pcb_point_t *Point, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
+
+PCB_INLINE void pcb_rotate(pcb_coord_t * x, pcb_coord_t * y, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina)
+{
+	double nx, ny;
+	pcb_coord_t px = *x - cx;
+	pcb_coord_t py = *y - cy;
+
+	nx = pcb_round(px * cosa + py * sina + cx);
+	ny = pcb_round(py * cosa - px * sina + cy);
+
+	*x = nx;
+	*y = ny;
+}
+
+#endif
Index: tags/2.0.1/src/route.c
===================================================================
--- tags/2.0.1/src/route.c	(nonexistent)
+++ tags/2.0.1/src/route.c	(revision 18980)
@@ -0,0 +1,583 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  Copyright (C) 2017 Adrian Purser
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#include "compat_misc.h"
+#include "conf_core.h"
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "find.h"
+#include "polygon.h"
+#include "rtree.h"
+#include "route.h"
+#include "undo.h"
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_line.h"
+#include "obj_line_op.h"
+#include "draw_wireframe.h"
+
+void pcb_route_init(pcb_route_t *p_route)
+{
+	p_route->size = 0;
+	p_route->capacity = ROUTE_SMALL_DATA_SIZE;
+	p_route->objects = &p_route->small_data[0];
+}
+
+void pcb_route_destroy(pcb_route_t *p_route)
+{
+	if (p_route->capacity > ROUTE_SMALL_DATA_SIZE)
+		free(p_route->objects);
+	p_route->size = 0;
+	p_route->capacity = ROUTE_SMALL_DATA_SIZE;
+	p_route->objects = &p_route->small_data[0];
+}
+
+void pcb_route_reset(pcb_route_t *p_route)
+{
+	/* NOTE:  Currently this function just sets the size back to zero. It does not
+	   free any memory used so the capacity will stay the same. 
+	 */
+
+	p_route->size = 0;
+}
+
+void pcb_route_reserve(pcb_route_t *p_route, int size)
+{
+	int grow;
+
+	if (size <= p_route->capacity)
+		return;
+
+	grow = size - p_route->capacity;
+	if (grow < 8)
+		grow = 8;
+
+	if (p_route->capacity == ROUTE_SMALL_DATA_SIZE) {
+		p_route->capacity += grow;
+		p_route->objects = (pcb_route_object_t *) malloc(p_route->capacity * sizeof(pcb_route_object_t));
+		memcpy(p_route->objects, &p_route->small_data[0], p_route->size * sizeof(pcb_route_object_t));
+	}
+	else {
+		p_route->capacity += grow;
+		p_route->objects = (pcb_route_object_t *) realloc(p_route->objects, p_route->capacity * sizeof(pcb_route_object_t));
+	}
+}
+
+void pcb_route_resize(pcb_route_t *p_route, int size)
+{
+	pcb_route_reserve(p_route, size);
+	p_route->size = size;
+}
+
+pcb_route_object_t *pcb_route_alloc_object(pcb_route_t *p_route)
+{
+	pcb_route_resize(p_route, p_route->size + 1);
+	return &p_route->objects[p_route->size - 1];
+}
+
+void pcb_route_add_line(pcb_route_t *p_route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer)
+{
+	pcb_route_object_t *p_object = pcb_route_alloc_object(p_route);
+	if (p_object == NULL)
+		return;
+
+	p_object->point1 = *point1;
+	p_object->point2 = *point2;
+	p_object->layer = layer;
+	p_object->type = PCB_OBJ_LINE;
+}
+
+void pcb_route_add_arc(pcb_route_t *p_route, pcb_point_t *center, pcb_angle_t start_angle, pcb_angle_t delta, pcb_coord_t radius, pcb_layer_id_t layer)
+{
+	pcb_route_object_t *p_object = pcb_route_alloc_object(p_route);
+	if (p_object == NULL)
+		return;
+
+	p_object->point1 = *center;
+	p_object->start_angle = start_angle;
+	p_object->delta_angle = delta;
+	p_object->radius = radius;
+	p_object->layer = layer;
+	p_object->type = PCB_OBJ_ARC;
+}
+
+
+void pcb_route_direct(pcb_board_t *PCB, pcb_route_t *route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags)
+{
+	pcb_route_reset(route);
+	route->start_point = *point1;
+	route->end_point = *point2;
+	route->start_layer = layer;
+	route->end_layer = layer;
+	route->thickness = thickness;
+	route->clearance = clearance;
+	route->PCB = PCB;
+	route->flags = flags;
+	pcb_route_add_line(route, point1, point2, layer);
+}
+
+/*-----------------------------------------------------------
+ * Calculate an arc fitted to a corner.
+ *---------------------------------------------------------*/
+
+void pcb_route_calculate_corner_arc(const pcb_point_t *point1, const pcb_point_t *point2, const pcb_point_t *point3, double radius, pcb_route_object_t *p_out_obj, pcb_point_t *p_endpoint1, pcb_point_t *p_endpoint2)
+{
+	const double r_min = 10.0;
+
+	const pcb_coord_t dx1 = point1->X - point2->X;
+	const pcb_coord_t dy1 = point1->Y - point2->Y;
+	const pcb_coord_t dx2 = point3->X - point2->X;
+	const pcb_coord_t dy2 = point3->Y - point2->Y;
+
+	const double angle1 = atan2(dy1, dx1);
+	const double angle2 = atan2(dy2, dx2);
+
+	const double ad = angle2 - angle1;
+	const double d = ad > M_PI ? ad - (M_PI * 2.0) : (ad < -M_PI ? ad + (M_PI * 2.0) : ad);
+
+	const double hangle = fabs(d * 0.5);
+	const double angle3 = angle1 + (d * 0.5);
+
+	/* Vector from point2 to the other points */
+	const double vx1 = cos(angle1);
+	const double vy1 = sin(angle1);
+	const double vx2 = cos(angle2);
+	const double vy2 = sin(angle2);
+
+	/* Distance from point2 to the other points */
+	const double l1 = fabs(abs(vx1) > fabs(vy1) ? dx1 / vx1 : dy1 / vy1);
+	const double l2 = fabs(abs(vx2) > fabs(vy2) ? dx2 / vx2 : dy2 / vy2);
+
+	/* Calculate maximum possible radius */
+	const double rmax = (l1 < l2 ? l1 : l2) * tan(hangle);
+	const double r = rmax < radius ? rmax : radius;
+
+	if (r >= r_min) {
+		/* Calculate arc center coordinates. */
+		const double sh = sin(hangle);
+		const pcb_coord_t xc = point2->X + (pcb_coord_t) ((cos(angle3) * r) / sh);
+		const pcb_coord_t yc = point2->Y + (pcb_coord_t) ((sin(angle3) * r) / sh);
+
+		/* Calculate arc start and delta angles. */
+		const double delta = d < 0 ? -(M_PI + d) : M_PI - d;
+		const double start = (d < 0.0 ? (M_PI * 0.5) - angle1 : ((M_PI * 0.5) - angle2) - delta);
+
+		p_out_obj->point1.X = xc;
+		p_out_obj->point1.Y = yc;
+		p_out_obj->start_angle = start * PCB_RAD_TO_DEG; /* Start Angle */
+		p_out_obj->delta_angle = delta * PCB_RAD_TO_DEG; /* Delta Angle */
+		p_out_obj->radius = r;
+
+		if (p_endpoint1) {
+			p_endpoint1->X = xc - (pcb_coord_t) (r * cos(start));
+			p_endpoint1->Y = yc + (pcb_coord_t) (r * sin(start));
+		}
+
+		if (p_endpoint1) {
+			p_endpoint2->X = xc - (pcb_coord_t) (r * cos(start + delta));
+			p_endpoint2->Y = yc + (pcb_coord_t) (r * sin(start + delta));
+		}
+	}
+	else {
+		if (p_endpoint1)
+			*p_endpoint1 = *point2;
+
+		if (p_endpoint2)
+			*p_endpoint2 = *point2;
+	}
+}
+
+void pcb_route_calculate_45(pcb_point_t *start_point, pcb_point_t *target_point)
+{
+
+	pcb_coord_t dx, dy, min;
+	unsigned direction = 0;
+	double m;
+
+	/* first calculate direction of line */
+	dx = target_point->X - start_point->X;
+	dy = target_point->Y - start_point->Y;
+
+	if (!dx) {
+		if (!dy)
+			/* zero length line, don't draw anything */
+			return;
+		else
+			direction = dy > 0 ? 0 : 4;
+	}
+	else {
+		m = (double)dy / dx;
+		direction = 2;
+		if (m > PCB_TAN_30_DEGREE)
+			direction = m > PCB_TAN_60_DEGREE ? 0 : 1;
+		else if (m < -PCB_TAN_30_DEGREE)
+			direction = m < -PCB_TAN_60_DEGREE ? 0 : 3;
+	}
+
+	if (dx < 0)
+		direction += 4;
+
+	dx = coord_abs(dx);
+	dy = coord_abs(dy);
+	min = MIN(dx, dy);
+
+	/* now set up the second pair of coordinates */
+	switch (direction) {
+		case 0:
+		case 4:
+			target_point->X = start_point->X;
+			break;
+
+		case 2:
+		case 6:
+			target_point->Y = start_point->Y;
+			break;
+
+		case 1:
+			target_point->X = start_point->X + min;
+			target_point->Y = start_point->Y + min;
+			break;
+
+		case 3:
+			target_point->X = start_point->X + min;
+			target_point->Y = start_point->Y - min;
+			break;
+
+		case 5:
+			target_point->X = start_point->X - min;
+			target_point->Y = start_point->Y - min;
+			break;
+
+		case 7:
+			target_point->X = start_point->X - min;
+			target_point->Y = start_point->Y + min;
+			break;
+	}
+}
+
+
+/* TODO: Pass in other required information such as object flags */
+void pcb_route_calculate(pcb_board_t *PCB, pcb_route_t *route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer_id, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags, int mod1, int mod2)
+{
+
+	/* TODO: If an external route calculator has been selected then use it instead of this default one. */
+	/* TODO: Add DRC Checking */
+
+
+	/* Set radius to 0 for standard 45/90 operation */
+	const pcb_coord_t radius = thickness * conf_core.editor.route_radius;
+
+	/* If the line can be drawn directly to the target then add a single line segment. */
+	if (conf_core.editor.all_direction_lines) {
+		pcb_route_direct(PCB, route, point1, point2, layer_id, thickness, clearance, flags);
+		return;
+	}
+
+	/* Restart the route */
+	pcb_route_reset(route);
+	route->start_point = *point1;
+	route->thickness = thickness;
+	route->clearance = clearance;
+	route->start_layer = layer_id;
+	route->end_layer = layer_id;
+	route->PCB = PCB;
+	route->flags = flags;
+
+	/* If the start point is the same as the end point then add a single 0-length line. 
+	 * If a 0-length line is not added then some operations such as moving a line point
+	 * could cause the line to disappear.
+	 */
+	if ((point1->X == point2->X) && (point1->Y == point2->Y)) {
+		route->end_point = *point2;
+		pcb_route_add_line(route, point1, point2, layer_id);
+	}
+	/* If Refraction is 0 then add a single line segment that is horizontal, vertical or 45 degrees. 
+	 * This line segment might not end under the crosshair.
+	 */
+	else if (conf_core.editor.line_refraction == 0) {
+		pcb_point_t target = *point2;
+		pcb_route_calculate_45(point1, &target);
+		pcb_route_add_line(route, point1, &target, layer_id);
+		route->end_point = target;
+	}
+	else {
+		/* Refraction is non-zero so add multiple lines (horizontal, vertical and/or 45 degrees). */
+		pcb_coord_t dx, dy;
+		pcb_point_t target;
+		pcb_bool way = (conf_core.editor.line_refraction == 1 ? pcb_false : pcb_true);
+
+		/* swap the 'way' if mod1 is set (typically the shift key) */
+		if (mod1)
+			way = !way;
+
+		dx = point2->X - point1->X;
+		dy = point2->Y - point1->Y;
+
+		if (!way) {
+			if (coord_abs(dx) > coord_abs(dy)) {
+				target.X = point2->X - SGN(dx) * coord_abs(dy);
+				target.Y = point1->Y;
+			}
+			else {
+				target.X = point1->X;
+				target.Y = point2->Y - SGN(dy) * coord_abs(dx);
+			}
+		}
+		else {
+			if (coord_abs(dx) > coord_abs(dy)) {
+				target.X = point1->X + SGN(dx) * coord_abs(dy);
+				target.Y = point2->Y;
+			}
+			else {
+				target.X = point2->X;
+				target.Y = point1->Y + SGN(dy) * coord_abs(dx);;
+			}
+		}
+
+		if (radius > 0.0) {
+			pcb_route_object_t arc;
+			pcb_point_t target1;
+			pcb_point_t target2;
+
+			pcb_route_calculate_corner_arc(point1, &target, point2, radius, &arc, &target1, &target2);
+
+			if ((point1->X != target1.X) || (point1->Y != target1.Y))
+				pcb_route_add_line(route, point1, &target1, layer_id);
+
+			if ((target1.X != target2.X) || (target1.Y != target2.Y))
+				pcb_route_add_arc(route, &arc.point1, arc.start_angle, arc.delta_angle, arc.radius, layer_id);
+
+			if ((point2->X != target2.X) || (point2->Y != target2.Y))
+				pcb_route_add_line(route, &target2, point2, layer_id);
+
+			route->end_point = *point2;
+		}
+		else {
+			if ((point1->X != target.X) || (point1->Y != target.Y))
+				pcb_route_add_line(route, point1, &target, layer_id);
+			if ((point2->X != target.X) || (point2->Y != target.Y))
+				pcb_route_add_line(route, &target, point2, layer_id);
+			route->end_point = *point2;
+		}
+	}
+}
+
+int pcb_route_apply(const pcb_route_t *p_route)
+{
+	return pcb_route_apply_to_line(p_route, NULL, NULL);
+}
+
+int pcb_route_apply_to_line(const pcb_route_t *p_route, pcb_layer_t *apply_to_line_layer, pcb_line_t *apply_to_line)
+{
+
+	int i;
+	int applied = 0;
+
+	for(i = 0; i < p_route->size; i++) {
+		pcb_route_object_t const *p_obj = &p_route->objects[i];
+		pcb_layer_t *layer = pcb_loose_subc_layer(PCB, pcb_get_layer(PCB->Data, p_obj->layer));
+
+		switch (p_obj->type) {
+			case PCB_OBJ_LINE:
+				/*  If the route is being applied to an existing line then the existing
+				   line will be used as the first line in the route. This maintains the
+				   ID of the line and line points. This is especially useful if the 
+				   route contains a single line.
+				 */
+				if (apply_to_line) {
+					/* Move the existing line points to the position of the route line. */
+					if ((p_obj->point1.X != apply_to_line->Point1.X) || (p_obj->point1.Y != apply_to_line->Point1.Y))
+						pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, apply_to_line_layer, apply_to_line, &apply_to_line->Point1, p_obj->point1.X - apply_to_line->Point1.X, p_obj->point1.Y - apply_to_line->Point1.Y);
+
+					if ((p_obj->point2.X != apply_to_line->Point2.X) || (p_obj->point2.Y != apply_to_line->Point2.Y))
+						pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, apply_to_line_layer, apply_to_line, &apply_to_line->Point2, p_obj->point2.X - apply_to_line->Point2.X, p_obj->point2.Y - apply_to_line->Point2.Y);
+
+					/* Move the existing line point/s */
+					pcb_line_invalidate_erase(apply_to_line);
+					pcb_r_delete_entry(apply_to_line_layer->line_tree, (pcb_box_t *) apply_to_line);
+					pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, apply_to_line_layer, apply_to_line);
+					apply_to_line->Point1.X = p_obj->point1.X;
+					apply_to_line->Point1.Y = p_obj->point1.Y;
+					apply_to_line->Point2.X = p_obj->point2.X;
+					apply_to_line->Point2.Y = p_obj->point2.Y;
+					pcb_line_bbox(apply_to_line);
+					pcb_r_insert_entry(layer->line_tree, (pcb_box_t *) apply_to_line);
+					pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, apply_to_line);
+					pcb_line_invalidate_draw(layer, apply_to_line);
+					apply_to_line_layer = layer;
+
+					/* The existing line has been used so forget about it. */
+					apply_to_line = NULL;
+					applied = 1;
+				}
+				else {
+					/* Create a new line */
+					pcb_line_t *line = pcb_line_new_merge(layer,
+																								p_obj->point1.X,
+																								p_obj->point1.Y,
+																								p_obj->point2.X,
+																								p_obj->point2.Y,
+																								p_route->thickness,
+																								p_route->clearance,
+																								p_route->flags);
+					if (line) {
+						pcb_added_lines++;
+						pcb_obj_add_attribs(line, PCB->pen_attr);
+						pcb_line_invalidate_draw(layer, line);
+						pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line);
+						applied = 1;
+					}
+				}
+				break;
+
+			case PCB_OBJ_ARC:
+				{
+					/* Create a new arc */
+					pcb_arc_t *arc = pcb_arc_new(layer,
+																			 p_obj->point1.X,
+																			 p_obj->point1.Y,
+																			 p_obj->radius,
+																			 p_obj->radius,
+																			 p_obj->start_angle,
+																			 p_obj->delta_angle,
+																			 p_route->thickness,
+																			 p_route->clearance,
+																			 p_route->flags, pcb_true);
+					if (arc) {
+						pcb_added_lines++;
+						pcb_obj_add_attribs(arc, PCB->pen_attr);
+						pcb_undo_add_obj_to_create(PCB_OBJ_ARC, layer, arc, arc);
+						pcb_arc_invalidate_draw(layer, arc);
+						applied = 1;
+					}
+				}
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	/* If the existing apply-to-line wasn't updated then it should be deleted */
+	/* (This can happen if the route does not contain any lines.)             */
+	if (apply_to_line != NULL)
+		pcb_line_destroy(apply_to_line_layer, apply_to_line);
+
+	return applied;
+}
+
+/*=============================================================================
+ * 
+ *  Route Drawing
+ *
+ *===========================================================================*/
+
+/*-----------------------------------------------------------
+ * Draws the outline of an arc
+ *---------------------------------------------------------*/
+void pcb_route_draw_arc(pcb_hid_gc_t GC, pcb_coord_t x, pcb_coord_t y, pcb_angle_t start_angle, pcb_angle_t delta, pcb_coord_t radius, pcb_coord_t thickness)
+{
+	double x1, y1, x2, y2, wid = thickness / 2;
+
+	if (delta < 0) {
+		start_angle += delta;
+		delta = -delta;
+	}
+
+	x1 = x - (cos(PCB_M180 * start_angle) * radius);
+	y1 = y + (sin(PCB_M180 * start_angle) * radius);
+	x2 = x - (cos(PCB_M180 * (start_angle + delta)) * radius);
+	y2 = y + (sin(PCB_M180 * (start_angle + delta)) * radius);
+
+	pcb_gui->draw_arc(GC, x, y, radius + wid, radius + wid, start_angle, delta);
+	if (wid > pcb_pixel_slop) {
+		pcb_gui->draw_arc(GC, x, y, radius - wid, radius - wid, start_angle, delta);
+		pcb_gui->draw_arc(GC, x1, y1, wid, wid, start_angle, -180 * SGN(delta));
+		pcb_gui->draw_arc(GC, x2, y2, wid, wid, start_angle + delta, 180 * SGN(delta));
+	}
+
+}
+
+/*-----------------------------------------------------------
+ * Draws the route as outlines
+ *---------------------------------------------------------*/
+void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC)
+{
+	int i = 0;
+	for(i = 0; i < p_route->size; ++i) {
+		const pcb_route_object_t *p_obj = &p_route->objects[i];
+
+		pcb_layer_t *layer = pcb_get_layer(PCB->Data, p_obj->layer);
+		if (layer)
+			pcb_gui->set_color(GC, layer->meta.real.color);
+
+		switch (p_obj->type) {
+			case PCB_OBJ_LINE:
+				pcb_draw_wireframe_line(GC, p_obj->point1.X, p_obj->point1.Y, p_obj->point2.X, p_obj->point2.Y, p_route->thickness, 0);
+				break;
+
+			case PCB_OBJ_ARC:
+				pcb_route_draw_arc(GC, p_obj->point1.X, p_obj->point1.Y, p_obj->start_angle, p_obj->delta_angle, p_obj->radius, p_route->thickness);
+				break;
+
+			default:
+				break;
+		}
+	}
+}
+
+/*-----------------------------------------------------------
+ * Draws a drc outline around the route
+ *---------------------------------------------------------*/
+void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC)
+{
+	pcb_coord_t thickness = p_route->thickness + 2 * conf_core.design.bloat;
+	int i;
+
+	pcb_gui->set_color(GC, conf_core.appearance.color.cross);
+
+	for(i = 0; i < p_route->size; ++i) {
+		const pcb_route_object_t *p_obj = &p_route->objects[i];
+
+		switch (p_obj->type) {
+			case PCB_OBJ_LINE:
+				pcb_draw_wireframe_line(GC, p_obj->point1.X, p_obj->point1.Y, p_obj->point2.X, p_obj->point2.Y, thickness, 0);
+				break;
+
+			case PCB_OBJ_ARC:
+				pcb_route_draw_arc(GC, p_obj->point1.X, p_obj->point1.Y, p_obj->start_angle, p_obj->delta_angle, p_obj->radius, thickness);
+				break;
+
+			default:
+				break;
+		}
+	}
+}
Index: tags/2.0.1/src/route.h
===================================================================
--- tags/2.0.1/src/route.h	(nonexistent)
+++ tags/2.0.1/src/route.h	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  Copyright (C) 2017 Adrian Purser
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef GUARD_PCB_RND_ROUTE_H
+#define GUARD_PCB_RND_ROUTE_H
+
+#define ROUTE_SMALL_DATA_SIZE 4
+
+typedef struct {
+	pcb_objtype_t type;
+	pcb_point_t point1; /* Line: Start Point, Arc: Center Point */
+	pcb_point_t point2; /* Line: End Point */
+	pcb_coord_t radius; /* Arc */
+	pcb_angle_t start_angle; /* Arc */
+	pcb_angle_t delta_angle; /* Arc */
+	pcb_layer_id_t layer;
+} pcb_route_object_t;
+
+typedef struct {
+	pcb_point_t start_point;
+	pcb_point_t end_point;
+	pcb_coord_t thickness;
+	pcb_coord_t clearance;
+	pcb_layer_id_t start_layer; /* The ID of the layer that the route started on */
+	pcb_layer_id_t end_layer; /* The ID of the layer that the route ended on, usually the same as the start for simple routes */
+	pcb_board_t *PCB;
+	pcb_flag_t flags;
+	int size; /* The number of active objects in the array */
+	int capacity; /* The size of the object array */
+	pcb_route_object_t *objects; /* Pointer to the object array data */
+	pcb_route_object_t small_data[ROUTE_SMALL_DATA_SIZE]; /* Small object array used to avoid allocating memory for small routes */
+} pcb_route_t;
+
+
+void pcb_route_init(pcb_route_t *p_route);
+void pcb_route_destroy(pcb_route_t *p_route);
+void pcb_route_reset(pcb_route_t *p_route);
+void pcb_route_reserve(pcb_route_t *p_route, int size);
+void pcb_route_resize(pcb_route_t *p_route, int size);
+
+void pcb_route_add_line(pcb_route_t *p_route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer);
+
+void pcb_route_add_arc(pcb_route_t *p_route, pcb_point_t *center, pcb_angle_t start_angle, pcb_angle_t delta, pcb_coord_t radius, pcb_layer_id_t layer);
+
+void pcb_route_calculate(pcb_board_t *PCB, pcb_route_t *route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer_id, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags, int mod1, int mod2);
+
+void pcb_route_direct(pcb_board_t *PCB, pcb_route_t *p_route, pcb_point_t *point1, pcb_point_t *point2, pcb_layer_id_t layer, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags);
+
+int pcb_route_apply(const pcb_route_t *p_route);
+int pcb_route_apply_to_line(const pcb_route_t *p_route, pcb_layer_t *Layer, pcb_line_t *apply_to_line);
+
+void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC);
+void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC);
+
+#endif /* ! defined GUARD_PCB_RND_ROUTE_H */
Index: tags/2.0.1/src/route_style.c
===================================================================
--- tags/2.0.1/src/route_style.c	(nonexistent)
+++ tags/2.0.1/src/route_style.c	(revision 18980)
@@ -0,0 +1,245 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include <ctype.h>
+#include "config.h"
+#include "pcb-printf.h"
+#include "genvector/gds_char.h"
+#include "route_style.h"
+#include "error.h"
+#include "conf.h"
+#include "misc_util.h"
+#include "board.h"
+#include "funchash_core.h"
+#include "conf_core.h"
+#include "compat_nls.h"
+
+pcb_route_style_t pcb_custom_route_style;
+
+
+static pcb_coord_t pcb_get_num(char **s, const char *default_unit)
+{
+	/* Read value */
+	pcb_coord_t ret_val = pcb_get_value_ex(*s, NULL, NULL, NULL, default_unit, NULL);
+	/* Advance pointer */
+	while (isalnum(**s) || **s == '.')
+		(*s)++;
+	return ret_val;
+}
+
+
+/* Serializes the route style list */
+char *pcb_route_string_make(vtroutestyle_t *styles)
+{
+	gds_t str;
+	int i;
+
+	gds_init(&str);
+	for (i = 0; i < vtroutestyle_len(styles); ++i) {
+		pcb_append_printf(&str, "%s,%mc,%mc,%mc,%mc", styles->array[i].name,
+																				 styles->array[i].Thick, styles->array[i].Diameter,
+																				 styles->array[i].Hole, styles->array[i].Clearance);
+		if (i > 0)
+			gds_append(&str, ':');
+	}
+	return str.array; /* this is the only allocation made, return this and don't uninit */
+}
+
+/* ----------------------------------------------------------------------
+ * parses the routes definition string which is a colon separated list of
+ * comma separated Name, Dimension, Dimension, Dimension, Dimension
+ * e.g. Signal,20,40,20,10:Power,40,60,28,10:...
+ */
+int pcb_route_string_parse1(char **str, pcb_route_style_t *routeStyle, const char *default_unit)
+{
+	char *s = *str;
+	char Name[256];
+	int i, len;
+
+	while (*s && isspace((int) *s))
+		s++;
+	for (i = 0; *s && *s != ','; i++)
+		Name[i] = *s++;
+	Name[i] = '\0';
+	len = strlen(Name);
+	if (len > sizeof(routeStyle->name)-1) {
+		memcpy(routeStyle->name, Name, sizeof(routeStyle->name)-1);
+		routeStyle->name[sizeof(routeStyle->name)-1] = '\0';
+		pcb_message(PCB_MSG_WARNING, "Route style name '%s' too long, truncated to '%s'\n", Name, routeStyle->name);
+	}
+	else
+		strcpy(routeStyle->name, Name);
+	if (!isdigit((int) *++s))
+		goto error;
+	routeStyle->Thick = pcb_get_num(&s, default_unit);
+	while (*s && isspace((int) *s))
+		s++;
+	if (*s++ != ',')
+		goto error;
+	while (*s && isspace((int) *s))
+		s++;
+	if (!isdigit((int) *s))
+		goto error;
+	routeStyle->Diameter = pcb_get_num(&s, default_unit);
+	while (*s && isspace((int) *s))
+		s++;
+	if (*s++ != ',')
+		goto error;
+	while (*s && isspace((int) *s))
+		s++;
+	if (!isdigit((int) *s))
+		goto error;
+	routeStyle->Hole = pcb_get_num(&s, default_unit);
+	/* for backwards-compatibility, we use a 10-mil default
+	 * for styles which omit the clearance specification. */
+	if (*s != ',')
+		routeStyle->Clearance = PCB_MIL_TO_COORD(10);
+	else {
+		s++;
+		while (*s && isspace((int) *s))
+			s++;
+		if (!isdigit((int) *s))
+			goto error;
+		routeStyle->Clearance = pcb_get_num(&s, default_unit);
+		while (*s && isspace((int) *s))
+			s++;
+	}
+
+	*str = s;
+	return 0;
+	error:;
+		*str = s;
+		return -1;
+}
+
+int pcb_route_string_parse(char *s, vtroutestyle_t *styles, const char *default_unit)
+{
+	int n;
+
+	vtroutestyle_truncate(styles, 0);
+	for(n = 0;;n++) {
+		vtroutestyle_enlarge(styles, n+1);
+		if (pcb_route_string_parse1(&s, &styles->array[n], default_unit) != 0) {
+			n--;
+			break;
+		}
+		while (*s && isspace((int) *s))
+			s++;
+		if (*s == '\0')
+			break;
+		if (*s++ != ':') {
+			vtroutestyle_truncate(styles, 0);
+			return -1;
+		}
+	}
+	vtroutestyle_truncate(styles, n+1);
+	return 0;
+}
+
+void pcb_use_route_style(pcb_route_style_t * rst)
+{
+	conf_set_design("design/line_thickness", "%$mS", rst->Thick);
+	conf_set_design("design/via_thickness", "%$mS", rst->Diameter);
+	conf_set_design("design/via_drilling_hole", "%$mS", rst->Hole);
+	conf_set_design("design/clearance", "%$mS", rst->Clearance);
+	PCB->pen_attr = &rst->attr;
+}
+
+int pcb_use_route_style_idx(vtroutestyle_t *styles, int idx)
+{
+	if ((idx < 0) || (idx >= vtroutestyle_len(styles)))
+		return -1;
+	pcb_use_route_style(styles->array+idx);
+	return 0;
+}
+
+#define cmp(a,b) (((a) != -1) && (coord_abs((a)-(b)) > 32))
+#define cmps(a,b) (((a) != NULL) && (strcmp((a), (b)) != 0))
+int pcb_route_style_match(pcb_route_style_t *rst, pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name)
+{
+	if (cmp(Thick, rst->Thick)) return 0;
+	if (cmp(Diameter, rst->Diameter)) return 0;
+	if (cmp(Hole, rst->Hole)) return 0;
+	if (cmp(Clearance, rst->Clearance)) return 0;
+	if (cmps(Name, rst->name)) return 0;
+	return 1;
+}
+#undef cmp
+#undef cmps
+
+int pcb_route_style_lookup(vtroutestyle_t *styles, pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name)
+{
+	int n;
+	for (n = 0; n < vtroutestyle_len(styles); n++)
+		if (pcb_route_style_match(&styles->array[n], Thick, Diameter, Hole, Clearance, Name))
+			return n;
+	return -1;
+}
+
+
+int pcb_get_style_size(int funcid, pcb_coord_t * out, int type, int size_id)
+{
+	switch (funcid) {
+	case F_Object:
+		switch (type) {
+		case PCB_OBJ_LINE:
+			return pcb_get_style_size(F_SelectedLines, out, 0, size_id);
+		case PCB_OBJ_ARC:
+			return pcb_get_style_size(F_SelectedArcs, out, 0, size_id);
+		}
+		pcb_message(PCB_MSG_ERROR, _("Sorry, can't fetch the style of that object type (%x)\n"), type);
+		return -1;
+	case F_SelectedPads:
+		if (size_id != 2)						/* don't mess with pad size */
+			return -1;
+	case F_SelectedVias:
+	case F_SelectedPins:
+	case F_SelectedObjects:
+	case F_Selected:
+	case F_SelectedElements:
+		if (size_id == 0)
+			*out = conf_core.design.via_thickness;
+		else if (size_id == 1)
+			*out = conf_core.design.via_drilling_hole;
+		else
+			*out = conf_core.design.clearance;
+		break;
+	case F_SelectedArcs:
+	case F_SelectedLines:
+		if (size_id == 2)
+			*out = conf_core.design.clearance;
+		else
+			*out = conf_core.design.line_thickness;
+		return 0;
+	case F_SelectedTexts:
+	case F_SelectedNames:
+		pcb_message(PCB_MSG_ERROR, _("Sorry, can't change style of every selected object\n"));
+		return -1;
+	}
+	return 0;
+}
Index: tags/2.0.1/src/route_style.h
===================================================================
--- tags/2.0.1/src/route_style.h	(nonexistent)
+++ tags/2.0.1/src/route_style.h	(revision 18980)
@@ -0,0 +1,62 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2004 Thomas Nau
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "vtroutestyle.h"
+
+/* Parse a single route string into one pcb_route_style_t *slot. Returns 0 on success.  */
+int pcb_route_string_parse1(char **str, pcb_route_style_t *routeStyle, const char *default_unit);
+
+/* Parse a ':' separated list of route strings into a styles vector
+   The vector is initialized before the call. On error the vector is left empty
+   (but still initialized). Returns 0 on success. */
+int pcb_route_string_parse(char *s, vtroutestyle_t *styles, const char *default_unit);
+
+char *pcb_route_string_make(vtroutestyle_t *styles);
+
+/* Set design configuration (the pen we draw with) to a given route style */
+void pcb_use_route_style(pcb_route_style_t *rst);
+
+/* Same as pcb_use_route_style() but uses one of the styles in a vector;
+   returns -1 if idx is out of bounds, 0 on success. */
+int pcb_use_route_style_idx(vtroutestyle_t *styles, int idx);
+
+/* Compare supplied parameters to each style in the vector and return the index
+   of the first matching style. All non-(-1) parameters need to match to accept
+   a style. Return -1 on no match. */
+int pcb_route_style_lookup(vtroutestyle_t *styles, pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name);
+
+/* Return 1 if rst matches the style in supplied args. Same matching rules as
+   in pcb_route_style_lookup(). */
+int pcb_route_style_match(pcb_route_style_t *rst, pcb_coord_t Thick, pcb_coord_t Diameter, pcb_coord_t Hole, pcb_coord_t Clearance, char *Name);
+
+extern pcb_route_style_t pcb_custom_route_style;
+
+/* helper: get route style size for a function and selected object type.
+   size_id: 0=main size; 1=2nd size (drill); 2=clearance */
+int pcb_get_style_size(int funcid, pcb_coord_t * out, int type, int size_id);
Index: tags/2.0.1/src/rtree.c
===================================================================
--- tags/2.0.1/src/rtree.c	(nonexistent)
+++ tags/2.0.1/src/rtree.c	(revision 18980)
@@ -0,0 +1,173 @@
+ /*
+  *                            COPYRIGHT
+  *
+  *  pcb-rnd, interactive printed circuit board design
+  *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+  *
+  *  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 2 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, write to the Free Software
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+  */
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "unit.h"
+#include "rtree.h"
+
+#include <genrtree/genrtree_impl.h>
+#include <genrtree/genrtree_search.h>
+#include <genrtree/genrtree_delete.h>
+#include <genrtree/genrtree_debug.h>
+
+/* Temporary compatibility layer for the transition */
+pcb_rtree_t *pcb_r_create_tree(void)
+{
+	pcb_rtree_t *root = malloc(sizeof(pcb_rtree_t));
+	pcb_rtree_init(root);
+	return root;
+}
+
+void pcb_r_destroy_tree(pcb_rtree_t **tree)
+{
+	pcb_rtree_uninit(*tree);
+	free(*tree);
+	*tree = NULL;
+}
+
+void pcb_r_insert_entry(pcb_rtree_t *rtree, const pcb_box_t *which)
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)which; /* assumes first field is the bounding box */
+	assert(obj != NULL);
+	pcb_rtree_insert(rtree, obj, (pcb_rtree_box_t *)which);
+}
+
+void pcb_r_insert_array(pcb_rtree_t *rtree, const pcb_box_t *boxlist[], pcb_cardinal_t len)
+{
+	pcb_cardinal_t n;
+
+	if (len == 0)
+		return;
+
+	assert(boxlist != 0);
+
+	for(n = 0; n < len; n++)
+		pcb_r_insert_entry(rtree, boxlist[n]);
+}
+
+pcb_bool pcb_r_delete_entry(pcb_rtree_t *rtree, const pcb_box_t *which)
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)which; /* assumes first field is the bounding box */
+	assert(obj != NULL);
+	return pcb_rtree_delete(rtree, obj, (pcb_rtree_box_t *)which) == 0;
+}
+
+pcb_bool pcb_r_delete_entry_free_data(pcb_rtree_t *rtree, const pcb_box_t *box, void (*free_data)(void *d))
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)box; /* assumes first field is the bounding box */
+	assert(obj != NULL);
+	if (pcb_rtree_delete(rtree, obj, (pcb_rtree_box_t *)box) != 0)
+		return pcb_false;
+	free_data(obj);
+	return pcb_true;
+}
+
+typedef struct {
+	pcb_r_dir_t (*region_in_search)(const pcb_box_t *region, void *closure);
+	pcb_r_dir_t (*rectangle_in_region)(const pcb_box_t *box, void *closure);
+	void *clo;
+} r_cb_t;
+
+static pcb_rtree_dir_t r_cb_node(void *ctx_, void *obj, const pcb_rtree_box_t *box)
+{
+	r_cb_t *ctx = (r_cb_t *)ctx_;
+	return ctx->region_in_search((const pcb_box_t *)box, ctx->clo);
+}
+
+static pcb_rtree_dir_t r_cb_obj(void *ctx_, void *obj, const pcb_rtree_box_t *box)
+{
+	r_cb_t *ctx = (r_cb_t *)ctx_;
+	return ctx->rectangle_in_region((const pcb_box_t *)obj, ctx->clo);
+}
+
+
+pcb_r_dir_t pcb_r_search(pcb_rtree_t *rtree, const pcb_box_t *query,
+	pcb_r_dir_t (*region_in_search)(const pcb_box_t *region, void *closure),
+	pcb_r_dir_t (*rectangle_in_region)(const pcb_box_t *box, void *closure),
+	void *closure, int *num_found)
+{
+	pcb_r_dir_t res;
+	pcb_rtree_cardinal_t out_cnt;
+	r_cb_t ctx;
+	ctx.region_in_search = region_in_search;
+	ctx.rectangle_in_region = rectangle_in_region;
+	ctx.clo = closure;
+
+	res = pcb_rtree_search_any(rtree, (const pcb_rtree_box_t *)query,
+		(ctx.region_in_search != NULL) ? r_cb_node : NULL,
+		(ctx.rectangle_in_region != NULL) ? r_cb_obj : NULL,
+		&ctx, &out_cnt);
+
+	if (num_found != NULL)
+		*num_found = out_cnt;
+
+	return res;
+}
+
+int pcb_r_region_is_empty(pcb_rtree_t *rtree, const pcb_box_t *region)
+{
+	return pcb_rtree_is_box_empty(rtree, (const pcb_rtree_box_t *)region);
+}
+
+static void r_print_obj(FILE *f, void *obj)
+{
+	fprintf(f, "<obj %p>\n", obj);
+}
+
+void pcb_r_dump_tree(pcb_rtree_t *root, int unused)
+{
+	pcb_rtree_dump_text(stdout, root, r_print_obj);
+}
+
+void pcb_r_free_tree_data(pcb_rtree_t *rtree, void (*free)(void *ptr))
+{
+	pcb_rtree_it_t it;
+	void *o;
+
+	for(o = pcb_rtree_all_first(&it, rtree); o != NULL; o = pcb_rtree_all_next(&it))
+		free(o);
+}
+
+pcb_box_t *pcb_r_first(pcb_rtree_t *tree, pcb_rtree_it_t *it)
+{
+	if (tree == NULL)
+		return NULL;
+	return (pcb_box_t *)pcb_rtree_all_first(it, tree);
+}
+
+pcb_box_t *pcb_r_next(pcb_rtree_it_t *it)
+{
+	return (pcb_box_t *)pcb_rtree_all_next(it);
+}
+
+void pcb_r_end(pcb_rtree_it_t *it)
+{
+}
Index: tags/2.0.1/src/rtree.h
===================================================================
--- tags/2.0.1/src/rtree.h	(nonexistent)
+++ tags/2.0.1/src/rtree.h	(revision 18980)
@@ -0,0 +1,48 @@
+ /*
+  *                            COPYRIGHT
+  *
+  *  pcb-rnd, interactive printed circuit board design
+  *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+  *
+  *  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 2 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, write to the Free Software
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+  */
+
+#ifndef PCB_RTREE_H
+#define PCB_RTREE_H
+
+#include "global_typedefs.h"
+
+typedef long int pcb_rtree_cardinal_t;
+typedef pcb_coord_t pcb_rtree_coord_t;
+
+/* Instantiate an rtree */
+#define RTR(n)  pcb_rtree_ ## n
+#define RTRU(n) pcb_RTREE_ ## n
+#define pcb_rtree_privfunc static
+#define pcb_rtree_size 6
+#define pcb_rtree_stack_max 1024
+
+#define RTREE_NO_TREE_TYPEDEFS
+
+#include <genrtree/genrtree_api.h>
+
+#include "rtree2_compat.h"
+
+#endif /* PCB_RTREE_H */
Index: tags/2.0.1/src/rtree2_compat.h
===================================================================
--- tags/2.0.1/src/rtree2_compat.h	(nonexistent)
+++ tags/2.0.1/src/rtree2_compat.h	(revision 18980)
@@ -0,0 +1,91 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, rtree.h, was written and is
+ *  Copyright (c) 2004 harry eaton, it's based on C. Scott's kdtree.h template
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* Compatibility layer between the new rtree and the old rtree for the
+   period of transition */
+
+/* callback direction to the search engine */
+typedef enum pcb_r_dir_e {
+	PCB_R_DIR_NOT_FOUND = 0,         /* object not found or not accepted */
+	PCB_R_DIR_FOUND_CONTINUE = 1,    /* object found or accepted, go on searching */
+	PCB_R_DIR_CANCEL = 2             /* cancel the search and return immediately */
+} pcb_r_dir_t;
+
+pcb_rtree_t *pcb_r_create_tree(void);
+void pcb_r_destroy_tree(pcb_rtree_t **tree);
+void pcb_r_free_tree_data(pcb_rtree_t *rtree, void (*free)(void *ptr));
+
+void pcb_r_insert_entry(pcb_rtree_t *rtree, const pcb_box_t *which);
+void pcb_r_insert_array(pcb_rtree_t *rtree, const pcb_box_t *boxlist[], pcb_cardinal_t len);
+
+pcb_bool pcb_r_delete_entry(pcb_rtree_t *rtree, const pcb_box_t *which);
+pcb_bool pcb_r_delete_entry_free_data(pcb_rtree_t *rtree, const pcb_box_t *box, void (*free_data)(void *d));
+
+/* generic search routine */
+/* region_in_search should return pcb_true if "what you're looking for" is
+ * within the specified region; 
+ * rectangle_in_region should return pcb_true if the given rectangle is
+ * "what you're looking for".
+ * The search will find all rectangles matching the criteria given
+ * by region_in_search and rectangle_in_region and return a count of
+ * how many things rectangle_in_region returned pcb_true for. closure is
+ * used to abort the search if desired from within rectangle_in_region
+ * Look at the implementation of r_region_is_empty for how to
+ * abort the search if that is the desired behavior.
+ */
+pcb_r_dir_t pcb_r_search(pcb_rtree_t *rtree, const pcb_box_t *query,
+	pcb_r_dir_t (*region_in_search)(const pcb_box_t *region, void *closure),
+	pcb_r_dir_t (*rectangle_in_region)(const pcb_box_t *box, void *closure),
+	void *closure, int *num_found);
+
+/* return 0 if there are any rectangles in the given region. */
+int pcb_r_region_is_empty(pcb_rtree_t *rtree, const pcb_box_t *region);
+
+void pcb_r_dump_tree(pcb_rtree_t *root, int unused);
+
+#define PCB_RTREE_EMPTY(rt) (((rt) == NULL) || ((rt)->size == 0))
+
+/* -- Iterate through an rtree; DO NOT modify the tree while iterating -- */
+
+/* Get the first item, get fields of iterator set up; return can be casted to an object; returns NULL if rtree is empty */
+pcb_box_t *pcb_r_first(pcb_rtree_t *tree, pcb_rtree_it_t *it);
+
+/* Get the next item, return can be casted to an object; returns NULL if no more items */
+pcb_box_t *pcb_r_next(pcb_rtree_it_t *it);
+
+/* Free fields of the iterator - not needed anymore, will be removed */
+void pcb_r_end(pcb_rtree_it_t *it);
Index: tags/2.0.1/src/safe_fs.c
===================================================================
--- tags/2.0.1/src/safe_fs.c	(nonexistent)
+++ tags/2.0.1/src/safe_fs.c	(revision 18980)
@@ -0,0 +1,292 @@
+ /*
+  *                            COPYRIGHT
+  *
+  *  pcb-rnd, interactive printed circuit board design
+  *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+  *
+  *  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 2 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, write to the Free Software
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+  */
+
+/* permit direct access to the libc calls (turn off config.h masking) */
+#define PCB_SAFE_FS
+
+/* opendir, readdir */
+#include "compat_inc.h"
+
+#include "config.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "safe_fs.h"
+
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "error.h"
+#include "globalconst.h"
+#include "paths.h"
+
+
+/* Evaluates op(arg1,arg2); returns 0 if the operation is permitted */
+static int pcb_safe_fs_check(const char *op, const char *arg1, const char *arg2)
+{
+	return 0;
+}
+
+/* Evaluate op(arg1,arg2) and print error and return err_ret if not permitted */
+#define CHECK(func, op, arg1, arg2, err_inst) \
+do { \
+	if (pcb_safe_fs_check(op, arg1, arg2) != 0) { \
+		pcb_message(PCB_MSG_ERROR, "File system operation %s(): access denied on %s(%s,%s)\n", func, op, arg1, arg2); \
+		err_inst; \
+	} \
+} while(0)
+
+FILE *pcb_fopen_fn(const char *path, const char *mode, char **fn_out)
+{
+	FILE *f;
+	char *path_exp;
+
+	/* skip expensive path building for empty paths that are going to fail anyway */
+	if ((path == NULL) || (*path == '\0')) {
+		if (fn_out != NULL)
+			*fn_out = NULL;
+		return NULL;
+	}
+
+	path_exp = pcb_build_fn(path);
+
+	CHECK("fopen", "access", path_exp, mode, goto err);
+	CHECK("fopen", "fopen", path_exp, mode, goto err);
+
+	f = fopen(path_exp, mode);
+	if (f == NULL)
+		goto err;
+
+	if (fn_out != NULL)
+		*fn_out = path_exp;
+	else
+		free(path_exp);
+
+	return f;
+
+	err:;
+	free(path_exp);
+	if (fn_out != NULL)
+		*fn_out = NULL;
+	return NULL;
+}
+
+FILE *pcb_fopen(const char *path, const char *mode)
+{
+	return pcb_fopen_fn(path, mode, NULL);
+}
+
+char *pcb_fopen_check(const char *path, const char *mode)
+{
+	char *path_exp = pcb_build_fn(path);
+
+	CHECK("fopen", "access", path_exp, mode, goto err);
+	CHECK("fopen", "fopen", path_exp, mode, goto err);
+	return path_exp;
+
+	err:;
+	free(path_exp);
+	return NULL;
+}
+
+FILE *pcb_popen(const char *cmd, const char *mode)
+{
+	FILE *f = NULL;
+	char *cmd_exp = pcb_build_fn(cmd);
+
+	CHECK("popen", "access", cmd_exp, mode, goto err);
+	CHECK("popen", "exec", cmd_exp, NULL, goto err);
+	CHECK("popen", "popen", cmd_exp, mode, goto err);
+
+	f = popen(cmd_exp, mode);
+
+	err:;
+	free(cmd_exp);
+	return f;
+}
+
+int pcb_pclose(FILE *f)
+{
+	return pclose(f);
+}
+
+
+int pcb_system(const char *cmd)
+{
+	int res = -1;
+	char *cmd_exp = pcb_build_fn(cmd);
+
+	CHECK("access", "access", cmd_exp, "r", goto err);
+	CHECK("access", "exec", cmd_exp, NULL, goto err);
+	CHECK("access", "system", cmd_exp, NULL, goto err);
+
+	res = system(cmd_exp);
+
+	err:;
+	free(cmd_exp);
+	return res;
+}
+
+int pcb_remove(const char *path)
+{
+	int res = -1;
+	char *path_exp = pcb_build_fn(path);
+
+	CHECK("remove", "access", path_exp, "w", goto err);
+	CHECK("remove", "remove", path_exp, NULL, goto err);
+
+	res = remove(path);
+
+	err:;
+	free(path_exp);
+	return res;
+}
+
+int pcb_rename(const char *old_path, const char *new_path)
+{
+	int res = -1;
+	char *old_path_exp = pcb_build_fn(old_path);
+	char *new_path_exp = pcb_build_fn(new_path);
+
+	CHECK("rename", "access", old_path_exp, "w", goto err);
+	CHECK("rename", "access", new_path_exp, "w", goto err);
+	CHECK("rename", "rename", old_path_exp, new_path_exp, goto err);
+
+	res = rename(old_path_exp, new_path_exp);
+
+	err:;
+	free(old_path_exp);
+	free(new_path_exp);
+	return res;
+}
+
+static FILE *pcb_fopen_at_(const char *from, const char *fn, const char *mode, char **full_path, int recursive)
+{
+	char tmp[PCB_PATH_MAX];
+	DIR *d;
+	struct dirent *de;
+	FILE *res;
+
+	/* try the trivial: directly under this  dir */
+	pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, PCB_DIR_SEPARATOR_C, fn);
+	res = pcb_fopen(tmp, mode);
+
+	if (res != NULL) {
+		if (full_path != NULL)
+			*full_path = pcb_strdup(tmp);
+		return res;
+	}
+
+	/* no luck, recurse into each subdir */
+	if (!recursive)
+		return NULL;
+
+	d = opendir(from);
+	if (d == NULL)
+		return NULL;
+
+	while((de = readdir(d)) != NULL) {
+		struct stat st;
+		if (de->d_name[0] == '.')
+			continue;
+		pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, PCB_DIR_SEPARATOR_C, de->d_name);
+		if (stat(tmp, &st) != 0)
+			continue;
+		if (!S_ISDIR(st.st_mode))
+			continue;
+
+		/* dir: recurse */
+		res = pcb_fopen_at_(tmp, fn, mode, full_path, recursive);
+		if (res != NULL) {
+			closedir(d);
+			return res;
+		}
+	}
+	closedir(d);
+	return NULL;
+}
+
+FILE *pcb_fopen_at(const char *dir, const char *fn, const char *mode, char **full_path, int recursive)
+{
+	if (full_path != NULL)
+		*full_path = NULL;
+
+	return pcb_fopen_at_(dir, fn, mode, full_path, recursive);
+}
+
+FILE *pcb_fopen_first(const conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive)
+{
+	FILE *res;
+	char *real_fn = pcb_build_fn(fn);
+	conf_listitem_t *ci;
+
+	if (full_path != NULL)
+		*full_path = NULL;
+
+	if (real_fn == NULL)
+		return NULL;
+
+	if (pcb_is_path_abs(fn)) {
+		res = pcb_fopen(real_fn, mode);
+		if ((res != NULL) && (full_path != NULL))
+			*full_path = real_fn;
+		else
+			free(real_fn);
+		return res;
+	}
+
+	/* have to search paths */
+	{
+		for (ci = conflist_first((conflist_t *)paths); ci != NULL; ci = conflist_next(ci)) {
+			const char *p = ci->val.string[0];
+			char *real_p;
+			size_t pl;
+
+			if (ci->type != CFN_STRING)
+				continue;
+			if (*p == '?')
+				p++;
+
+			/* resolve the path from the list, truncate trailing '/' */
+			real_p = pcb_build_fn(p);
+			pl = strlen(real_p);
+			if ((pl > 0) && (real_p[pl-1] == '/'))
+				real_p[pl-1] = '\0';
+	
+			res = pcb_fopen_at(real_p, real_fn, mode, full_path, recursive);
+			free(real_p);
+
+			if (res != NULL) {
+				free(real_fn);
+				return res;
+			}
+		}
+	}
+
+	return NULL;
+}
+
Index: tags/2.0.1/src/safe_fs.h
===================================================================
--- tags/2.0.1/src/safe_fs.h	(nonexistent)
+++ tags/2.0.1/src/safe_fs.h	(revision 18980)
@@ -0,0 +1,68 @@
+ /*
+  *                            COPYRIGHT
+  *
+  *  pcb-rnd, interactive printed circuit board design
+  *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+  *
+  *  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 2 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, write to the Free Software
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+  */
+
+/* Wrap standard file system calls, giving the user a chance to control
+   where pcb-rnd may go on the file system */
+
+#ifndef PCB_SAFE_FS_H
+#define PCB_SAFE_FS_H
+
+#include <stdio.h>
+
+
+FILE *pcb_fopen(const char *path, const char *mode);
+FILE *pcb_popen(const char *cmd, const char *mode);
+int pcb_pclose(FILE *f);
+int pcb_system(const char *cmd);
+int pcb_remove(const char *path);
+int pcb_rename(const char *old_path, const char *new_path);
+
+/* Check if path could be open with mode; if yes, return the substituted/expanded
+   file name, if no, return NULL */
+char *pcb_fopen_check(const char *path, const char *mode);
+
+/* Same as pcb_fopen(), but on success load fn_out() with the malloc()'d
+   file name as it looked after the substitution */
+FILE *pcb_fopen_fn(const char *path, const char *mode, char **fn_out);
+
+/* Open a file given as a basename fn, under the directory dir, optionally
+   doing a recusrive search in the directory tree. If full_path is not NULL,
+   and the call succeeds, load it with the full path of the file opened. */
+FILE *pcb_fopen_at(const char *dir, const char *fn, const char *mode, char **full_path, int recursive);
+
+
+#include "conf.h"
+
+/* Open a file with standard path search and substitutions performed on
+   the file name. If fn is not an absolute path, search paths for the
+   first directory from which fn is accessible. If the call doesn't fail
+   and full_path is not NULL, it is set to point to the final full path
+   (or NULL on failure); the caller needs to call free() on it.
+   If recursive is set, all subcirectories under each path is also searched for the file.
+   */
+FILE *pcb_fopen_first(const conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive);
+
+#endif
Index: tags/2.0.1/src/search.c
===================================================================
--- tags/2.0.1/src/search.c	(nonexistent)
+++ tags/2.0.1/src/search.c	(revision 18980)
@@ -0,0 +1,1542 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* search routines
+ * some of the functions use dummy parameters
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <math.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "find.h"
+#include "polygon.h"
+#include "search.h"
+#include "obj_subc_parent.h"
+#include "obj_pstk_inlines.h"
+
+static double PosX, PosY;				/* search position for subroutines */
+static pcb_coord_t SearchRadius;
+static pcb_box_t SearchBox;
+static pcb_layer_t *SearchLayer;
+
+/* ---------------------------------------------------------------------------
+ * The first parameter includes PCB_OBJ_LOCKED if we
+ * want to include locked object in the search and PCB_OBJ_SUBC_PART if
+ * objects that are part of a subcircuit should be found.
+ */
+static pcb_bool SearchLineByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_line_t **, pcb_line_t **);
+static pcb_bool SearchArcByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_arc_t **, pcb_arc_t **);
+static pcb_bool SearchRatLineByLocation(unsigned long, unsigned long, pcb_rat_t **, pcb_rat_t **, pcb_rat_t **);
+static pcb_bool SearchTextByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_text_t **, pcb_text_t **);
+static pcb_bool SearchPolygonByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_poly_t **, pcb_poly_t **);
+static pcb_bool SearchLinePointByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_line_t **, pcb_point_t **);
+static pcb_bool SearchArcPointByLocation(unsigned long, unsigned long, pcb_layer_t **, pcb_arc_t **, int **);
+static pcb_bool SearchPointByLocation(unsigned long, unsigned long, unsigned long, pcb_layer_t **, pcb_poly_t **, pcb_point_t **);
+static pcb_bool SearchSubcByLocation(unsigned long, unsigned long, pcb_subc_t **, pcb_subc_t **, pcb_subc_t **, pcb_bool);
+
+/* Return not-found for subc parts and locked items unless objst says otherwise
+   obj is the object to be checked if part of subc; check lock on locked_obj
+   Also return not-found if flags are required but the object doesn't have them */
+#define TEST_OBJST_(objst, req_flag, locality, obj, locked_obj, reject) \
+do { \
+	if ((req_flag != 0) && (!PCB_FLAG_TEST(req_flag, obj))) \
+		reject; \
+	if (!(objst & PCB_OBJ_SUBC_PART) && (pcb_ ## locality ## obj_parent_subc(obj->parent_type, &obj->parent))) \
+		reject; \
+	if (!(objst & PCB_OBJ_LOCKED) && (PCB_FLAG_TEST(objst & PCB_FLAG_LOCK, locked_obj))) \
+		reject; \
+} while(0)
+
+#define TEST_OBJST(objst, req_flag, locality, obj, locked_obj) \
+	TEST_OBJST_(objst, req_flag, locality, obj, locked_obj, return PCB_R_DIR_NOT_FOUND)
+
+struct ans_info {
+	void **ptr1, **ptr2, **ptr3;
+	pcb_bool BackToo;
+	double area;
+	unsigned long objst, req_flag;
+	int on_current;
+	pcb_layer_type_t on_lyt;
+};
+
+/* ---------------------------------------------------------------------------
+ * searches a padstack
+ */
+static pcb_r_dir_t padstack_callback(const pcb_box_t *box, void *cl)
+{
+	struct ans_info *i = (struct ans_info *) cl;
+	pcb_pstk_t *ps = (pcb_pstk_t *) box;
+	pcb_data_t *pdata;
+
+	TEST_OBJST(i->objst, i->req_flag, g, ps, ps);
+
+	if (!pcb_is_point_in_pstk(PosX, PosY, SearchRadius, ps, NULL))
+		return PCB_R_DIR_NOT_FOUND;
+	if ((i->on_current) && (pcb_pstk_shape_at(PCB, ps, CURRENT) == NULL) && (!pcb_pstk_bb_drills(PCB, ps, CURRENT->meta.real.grp, NULL)))
+		return PCB_R_DIR_NOT_FOUND;
+	if ((i->on_lyt != 0) && (pcb_pstk_shape(ps, i->on_lyt, 0) == NULL))
+		return PCB_R_DIR_NOT_FOUND;
+	*i->ptr2 = *i->ptr3 = ps;
+	assert(ps->parent_type == PCB_PARENT_DATA);
+	pdata = ps->parent.data;
+	if (pdata->parent_type == PCB_PARENT_SUBC)
+		*i->ptr1 = pdata->parent.subc; /* padstack of a subcircuit */
+	else
+		*i->ptr1 = ps; /* padstack on a board (e.g. via) */
+	return PCB_R_DIR_CANCEL; /* found, stop searching */
+}
+
+static pcb_bool SearchPadstackByLocation(unsigned long objst, unsigned long req_flag, pcb_pstk_t **ps, pcb_pstk_t **Dummy1, pcb_pstk_t **Dummy2, int on_current, pcb_layer_type_t on_lyt)
+{
+	struct ans_info info;
+
+	/* search only if via-layer is visible */
+	if (!PCB->pstk_on)
+		return pcb_false;
+
+	info.ptr1 = (void **)ps;
+	info.ptr2 = (void **)Dummy1;
+	info.ptr3 = (void **)Dummy2;
+	info.objst = objst;
+	info.req_flag = req_flag;
+	info.on_current = on_current;
+	info.on_lyt = on_lyt;
+
+	if (pcb_r_search(PCB->Data->padstack_tree, &SearchBox, NULL, padstack_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches ordinary line on the SearchLayer
+ */
+
+struct line_info {
+	pcb_line_t **Line;
+	pcb_point_t **Point;
+	double least;
+	unsigned long objst, req_flag;
+};
+
+
+static pcb_r_dir_t line_callback(const pcb_box_t * box, void *cl)
+{
+	struct line_info *i = (struct line_info *) cl;
+	pcb_line_t *l = (pcb_line_t *) box;
+
+	TEST_OBJST(i->objst, i->req_flag, l, l, l);
+
+	if (!pcb_is_point_in_line(PosX, PosY, SearchRadius, (pcb_any_line_t *)l))
+		return PCB_R_DIR_NOT_FOUND;
+	*i->Line = l;
+	*i->Point = (pcb_point_t *) l;
+
+	return PCB_R_DIR_CANCEL; /* found what we were looking for */
+}
+
+
+static pcb_bool SearchLineByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_line_t ** Line, pcb_line_t ** Dummy)
+{
+	struct line_info info;
+
+	info.Line = Line;
+	info.Point = (pcb_point_t **) Dummy;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	*Layer = SearchLayer;
+	if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, line_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+
+	return pcb_false;
+}
+
+static pcb_r_dir_t rat_callback(const pcb_box_t * box, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) box;
+	struct ans_info *i = (struct ans_info *) cl;
+
+	TEST_OBJST(i->objst, i->req_flag, l, line, line);
+
+	if (PCB_FLAG_TEST(PCB_FLAG_VIA, line) ?
+			(pcb_distance(line->Point1.X, line->Point1.Y, PosX, PosY) <=
+			 line->Thickness * 2 + SearchRadius) : pcb_is_point_on_line(PosX, PosY, SearchRadius, line)) {
+		*i->ptr1 = *i->ptr2 = *i->ptr3 = line;
+		return PCB_R_DIR_CANCEL;
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches rat lines if they are visible
+ */
+static pcb_bool SearchRatLineByLocation(unsigned long objst, unsigned long req_flag, pcb_rat_t ** Line, pcb_rat_t ** Dummy1, pcb_rat_t ** Dummy2)
+{
+	struct ans_info info;
+
+	info.ptr1 = (void **) Line;
+	info.ptr2 = (void **) Dummy1;
+	info.ptr3 = (void **) Dummy2;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(PCB->Data->rat_tree, &SearchBox, NULL, rat_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches arc on the SearchLayer
+ */
+struct arc_info {
+	pcb_arc_t **Arc, **Dummy;
+	unsigned long objst, req_flag;
+	int **arc_pt; /* 0=start, 1=end (start+delta) */
+	double least;
+};
+
+static pcb_r_dir_t arc_callback(const pcb_box_t * box, void *cl)
+{
+	struct arc_info *i = (struct arc_info *) cl;
+	pcb_arc_t *a = (pcb_arc_t *) box;
+
+	TEST_OBJST(i->objst, i->req_flag, l, a, a);
+
+	if (!pcb_is_point_on_arc(PosX, PosY, SearchRadius, a))
+		return 0;
+	*i->Arc = a;
+	*i->Dummy = a;
+	return PCB_R_DIR_CANCEL; /* found */
+}
+
+
+static pcb_bool SearchArcByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_arc_t ** Arc, pcb_arc_t ** Dummy)
+{
+	struct arc_info info;
+
+	info.Arc = Arc;
+	info.Dummy = Dummy;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	*Layer = SearchLayer;
+	if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arc_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+	return pcb_false;
+}
+
+static pcb_r_dir_t text_callback(const pcb_box_t * box, void *cl)
+{
+	pcb_text_t *text = (pcb_text_t *) box;
+	struct ans_info *i = (struct ans_info *) cl;
+
+	TEST_OBJST(i->objst, i->req_flag, l, text, text);
+
+	if (PCB_POINT_IN_BOX(PosX, PosY, &text->BoundingBox)) {
+		*i->ptr2 = *i->ptr3 = text;
+		return PCB_R_DIR_CANCEL; /* found */
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches text on the SearchLayer
+ */
+static pcb_bool SearchTextByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_text_t ** Text, pcb_text_t ** Dummy)
+{
+	struct ans_info info;
+
+	*Layer = SearchLayer;
+	info.ptr2 = (void **) Text;
+	info.ptr3 = (void **) Dummy;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(SearchLayer->text_tree, &SearchBox, NULL, text_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+	return pcb_false;
+}
+
+static pcb_r_dir_t polygon_callback(const pcb_box_t * box, void *cl)
+{
+	pcb_poly_t *polygon = (pcb_poly_t *) box;
+	struct ans_info *i = (struct ans_info *) cl;
+
+	TEST_OBJST(i->objst, i->req_flag, l, polygon, polygon);
+
+	if (pcb_poly_is_point_in_p(PosX, PosY, SearchRadius, polygon)) {
+		*i->ptr2 = *i->ptr3 = polygon;
+		return PCB_R_DIR_CANCEL; /* found */
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * searches a polygon on the SearchLayer
+ */
+static pcb_bool SearchPolygonByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_poly_t ** Polygon, pcb_poly_t ** Dummy)
+{
+	struct ans_info info;
+
+	*Layer = SearchLayer;
+	info.ptr2 = (void **) Polygon;
+	info.ptr3 = (void **) Dummy;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polygon_callback, &info, NULL) != PCB_R_DIR_NOT_FOUND)
+		return pcb_true;
+	return pcb_false;
+}
+
+static pcb_r_dir_t linepoint_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	struct line_info *i = (struct line_info *) cl;
+	pcb_r_dir_t ret_val = PCB_R_DIR_NOT_FOUND;
+	double d;
+
+	TEST_OBJST(i->objst, i->req_flag, l, line, line);
+
+	/* some stupid code to check both points */
+	d = pcb_distance(PosX, PosY, line->Point1.X, line->Point1.Y);
+	if (d < i->least) {
+		i->least = d;
+		*i->Line = line;
+		*i->Point = &line->Point1;
+		ret_val = PCB_R_DIR_FOUND_CONTINUE;
+	}
+
+	d = pcb_distance(PosX, PosY, line->Point2.X, line->Point2.Y);
+	if (d < i->least) {
+		i->least = d;
+		*i->Line = line;
+		*i->Point = &line->Point2;
+		ret_val = PCB_R_DIR_FOUND_CONTINUE;
+	}
+	return ret_val;
+}
+
+static pcb_r_dir_t arcpoint_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_box_t ab;
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct arc_info *i = (struct arc_info *) cl;
+	pcb_r_dir_t ret_val = PCB_R_DIR_NOT_FOUND;
+	double d;
+
+	TEST_OBJST(i->objst, i->req_flag, l, arc, arc);
+
+	/* some stupid code to check both points */
+	pcb_arc_get_end(arc, 0, &ab.X1, &ab.Y1);
+	pcb_arc_get_end(arc, 1, &ab.X2, &ab.Y2);
+
+	d = pcb_distance(PosX, PosY, ab.X1, ab.Y1);
+	if (d < i->least) {
+		i->least = d;
+		*i->Arc = arc;
+		*i->arc_pt = pcb_arc_start_ptr;
+		ret_val = PCB_R_DIR_FOUND_CONTINUE;
+	}
+
+	d = pcb_distance(PosX, PosY, ab.X2, ab.Y2);
+	if (d < i->least) {
+		i->least = d;
+		*i->Arc = arc;
+		*i->arc_pt = pcb_arc_end_ptr;
+		ret_val = PCB_R_DIR_FOUND_CONTINUE;
+	}
+	return ret_val;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches a line-point on all the search layer
+ */
+static pcb_bool SearchLinePointByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_line_t ** Line, pcb_point_t ** Point)
+{
+	struct line_info info;
+	*Layer = SearchLayer;
+	info.Line = Line;
+	info.Point = Point;
+	*Point = NULL;
+	info.least = PCB_MAX_LINE_POINT_DISTANCE + SearchRadius;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(SearchLayer->line_tree, &SearchBox, NULL, linepoint_callback, &info, NULL))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches a line-point on all the search layer
+ */
+static pcb_bool SearchArcPointByLocation(unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_arc_t ** Arc, int **Point)
+{
+	struct arc_info info;
+	*Layer = SearchLayer;
+	info.Arc = Arc;
+	info.arc_pt = Point;
+	*Point = NULL;
+	info.least = PCB_MAX_LINE_POINT_DISTANCE + SearchRadius;
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(SearchLayer->arc_tree, &SearchBox, NULL, arcpoint_callback, &info, NULL))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches a polygon-point on all layers that are switched on
+ * in layerstack order
+ */
+typedef struct {
+	double least;
+	pcb_bool found;
+	unsigned long Type;
+
+	/* result */
+	pcb_poly_t **Polygon;
+	pcb_point_t **Point;
+} ptcb_t;
+
+static pcb_r_dir_t polypoint_callback(const pcb_box_t *box, void *cl)
+{
+	pcb_poly_t *polygon = (pcb_poly_t *)box;
+	ptcb_t *ctx = (ptcb_t *)cl;
+	double d;
+	pcb_data_t *dt;
+
+	dt = polygon->parent.layer->parent.data; /* polygon -> layer -> data */
+	if ((dt != NULL) && (dt->parent_type == PCB_PARENT_SUBC)) {
+		/* do not find subc part poly points if not explicitly requested */
+		if (!(ctx->Type & PCB_OBJ_SUBC_PART))
+			return PCB_R_DIR_NOT_FOUND;
+
+		/* don't find subc poly points even as subc part unless we are editing a subc */
+		if (!PCB->loose_subc)
+			return PCB_R_DIR_NOT_FOUND;
+	}
+
+	PCB_POLY_POINT_LOOP(polygon);
+	{
+		d = pcb_distance2(point->X, point->Y, PosX, PosY);
+		if (d < ctx->least) {
+			ctx->least = d;
+			*ctx->Polygon = polygon;
+			*ctx->Point = point;
+			ctx->found = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_bool SearchPointByLocation(unsigned long Type, unsigned long objst, unsigned long req_flag, pcb_layer_t ** Layer, pcb_poly_t ** Polygon, pcb_point_t ** Point)
+{
+	ptcb_t ctx;
+
+	*Layer = SearchLayer;
+	ctx.Type = Type;
+	ctx.Polygon = Polygon;
+	ctx.Point = Point;
+	ctx.found = pcb_false;;
+	ctx.least = SearchRadius + PCB_MAX_POLYGON_POINT_DISTANCE;
+	ctx.least = ctx.least * ctx.least;
+	pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polypoint_callback, &ctx, NULL);
+
+	if (ctx.found)
+		return pcb_true;
+	return pcb_false;
+}
+
+
+static pcb_r_dir_t subc_callback(const pcb_box_t *box, void *cl)
+{
+	pcb_subc_t *subc = (pcb_subc_t *) box;
+	struct ans_info *i = (struct ans_info *) cl;
+	double newarea;
+	int subc_on_bottom = 0, front;
+
+	pcb_subc_get_side(subc, &subc_on_bottom);
+	front = subc_on_bottom == conf_core.editor.show_solder_side;
+
+	TEST_OBJST(i->objst, i->req_flag, g, subc, subc);
+
+	if ((front || i->BackToo) && PCB_POINT_IN_BOX(PosX, PosY, &subc->BoundingBox)) {
+		/* use the subcircuit with the smallest bounding box */
+		newarea = (subc->BoundingBox.X2 - subc->BoundingBox.X1) * (double) (subc->BoundingBox.Y2 - subc->BoundingBox.Y1);
+		if (newarea < i->area) {
+			i->area = newarea;
+			*i->ptr1 = *i->ptr2 = *i->ptr3 = subc;
+			return PCB_R_DIR_FOUND_CONTINUE;
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * searches a subcircuit
+ * if more than one subc matches, the smallest one is taken
+ */
+static pcb_bool
+SearchSubcByLocation(unsigned long objst, unsigned long req_flag, pcb_subc_t **subc, pcb_subc_t ** Dummy1, pcb_subc_t ** Dummy2, pcb_bool BackToo)
+{
+	struct ans_info info;
+
+	/* Both package layers have to be switched on */
+	info.ptr1 = (void **) subc;
+	info.ptr2 = (void **) Dummy1;
+	info.ptr3 = (void **) Dummy2;
+	info.area = PCB_SQUARE(PCB_MAX_COORD);
+	info.BackToo = (BackToo && PCB->InvisibleObjectsOn);
+	info.objst = objst;
+	info.req_flag = req_flag;
+
+	if (pcb_r_search(PCB->Data->subc_tree, &SearchBox, NULL, subc_callback, &info, NULL))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* find the first floater on any layer */
+static pcb_bool SearchSubcFloaterByLocation(unsigned long objst, unsigned long req_flag, pcb_subc_t **out_subc, pcb_text_t **out_txt, void **dummy, pcb_bool other_side)
+{
+	pcb_rtree_it_t it;
+	void *obj;
+	int n;
+	pcb_layer_type_t my_side_lyt;
+
+	if (other_side)
+		my_side_lyt = conf_core.editor.show_solder_side ? PCB_LYT_TOP : PCB_LYT_BOTTOM;
+	else
+		my_side_lyt = conf_core.editor.show_solder_side ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+
+	for(n = 0; n < PCB->Data->LayerN; n++)  {
+		pcb_layer_t *ly = &PCB->Data->Layer[n];
+		pcb_layer_type_t lyt;
+
+		if ((ly->text_tree == NULL) || (!ly->meta.real.vis))
+			continue;
+
+		lyt = pcb_layer_flags_(ly);
+		if (!(lyt & my_side_lyt))
+			continue;
+
+		for(obj = pcb_rtree_first(&it, ly->text_tree, (pcb_rtree_box_t *)&SearchBox); obj != NULL; obj = pcb_rtree_next(&it)) {
+			pcb_text_t *txt = (pcb_text_t *)obj;
+			pcb_subc_t *subc;
+
+			if (PCB_FLAG_TEST(PCB_FLAG_FLOATER, txt) == 0)
+				continue;
+
+			subc = pcb_lobj_parent_subc(txt->parent_type, &txt->parent);
+			if (subc == NULL)
+				continue;
+
+			TEST_OBJST_(objst, req_flag, l, txt, subc, continue);
+
+			*out_subc = subc;
+			*out_txt = txt;
+			*dummy = txt;
+			return pcb_true;
+		}
+	}
+
+	return pcb_false;
+}
+
+/* for checking if a rat-line end is on a PV */
+pcb_bool pcb_is_point_on_line_end(pcb_coord_t X, pcb_coord_t Y, pcb_rat_t *Line)
+{
+	if (((X == Line->Point1.X) && (Y == Line->Point1.Y)) || ((X == Line->Point2.X) && (Y == Line->Point2.Y)))
+		return pcb_true;
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * Calculate the distance (squared) from a point to a line.
+ *
+ * let the point be (X,Y) and the line (X1,Y1)(X2,Y2)
+ *
+ * Calculate the position along the line that is closest to X,Y. The value 
+ * ranges from 0 to 1 when the point is within the line boundaries with a 
+ * value of 0 being at point X1,Y1 and a value of 1.0 being at point X2,Y2.
+  *
+ *   t = ((X-X1)*(X2-X1)) + ((Y-Y1)*(Y2-Y1))
+ *       -----------------------------------
+ *             (X2-X1)^2 + (Y2-Y1)^2
+ *
+ * let Q be the point of perpendicular projection of (X,Y) onto the line
+ *
+ *   QX = X1 + t * (X2-X1)
+ *   QY = Y1 + t * (Y2-Y1)
+ *
+ * Calculate the distace (squared) using Pythagorean theorem.
+ *
+ *   distance^2 = (X-QX)^2 + (Y-QY)^2
+ */
+
+double pcb_point_line_dist2(pcb_coord_t X, pcb_coord_t Y, pcb_line_t *Line)
+{
+	const double abx = Line->Point2.X - Line->Point1.X;
+	const double aby = Line->Point2.Y - Line->Point1.Y;
+	const double apx = X - Line->Point1.X;
+	const double apy = Y - Line->Point1.Y;
+	double qx,qy,dx,dy;
+
+	/* Calculate t, the normalised position along the line of the closest point 
+	 * to (X,Y). A value between 0 and 1 indicates that the closest point on the 
+	 * line is within the bounds of the end points. 
+	 */
+	double t = ( (apx * abx) + (apy * aby) ) / ( (abx * abx) + (aby * aby) );
+
+	/* Clamp 't' to the line bounds */
+	if(t < 0.0)		t = 0.0;
+	if(t > 1.0)		t = 1.0;
+
+	/* Calculate the point Q on the line that is closest to (X,Y) */
+	qx = Line->Point1.X + (t * abx);
+	qy = Line->Point1.Y + (t * aby);
+
+	/* Return the distance from Q to (X,Y), squared */
+	dx = X - qx;
+	dy = Y - qy;
+
+	return (dx * dx) + (dy * dy);
+}
+
+pcb_bool pcb_is_point_on_line(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_line_t *Line)
+{
+	double max = Radius + Line->Thickness / 2;
+
+	return pcb_point_line_dist2(X, Y, Line) < (max * max);
+}
+
+static int is_point_on_line(pcb_coord_t px, pcb_coord_t py, pcb_coord_t lx1, pcb_coord_t ly1, pcb_coord_t lx2, pcb_coord_t ly2)
+{
+	/* ohh well... let's hope the optimizer does something clever with inlining... */
+	pcb_line_t l;
+	l.Point1.X = lx1;
+	l.Point1.Y = ly1;
+	l.Point2.X = lx2;
+	l.Point2.Y = ly2;
+	l.Thickness = 1;
+	return pcb_is_point_on_line(px, py, 1, &l);
+}
+
+pcb_bool pcb_is_point_on_thinline( pcb_coord_t X, pcb_coord_t Y, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2,pcb_coord_t Y2 )
+{
+	/* Calculate the cross product of the vector from the first line point to the test point
+	 * and the vector from the first line point to the second line point. If the result is 
+	 * not 0 then the point does not lie on the line.
+	 */
+	const pcb_coord_t lx = X2 - X1;
+	const pcb_coord_t ly = Y2 - Y1;
+	const pcb_coord_t cross = ((X-X1) * ly) - ((Y-Y1) * lx);
+
+	if(cross != 0)
+		return pcb_false;
+
+	/* If the point does lie on the line then we do a simple check to see if the point is
+	 * between the end points. Use the longest side of the line to perform the check.
+	 */
+	if(abs(lx) > abs(ly))
+		return (X >= MIN(X1,X2)) && (X <= MAX(X1,X2)) ? pcb_true : pcb_false;
+
+	return (Y >= MIN(Y1,Y2)) && (Y <= MAX(Y1,Y2)) ? pcb_true : pcb_false;
+}
+
+/* checks if a line crosses a rectangle or is within the rectangle */
+pcb_bool pcb_is_line_in_rectangle(pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_line_t *Line)
+{
+	pcb_line_t line;
+
+	/* first, see if point 1 is inside the rectangle */
+	/* in case the whole line is inside the rectangle */
+	if (X1 < Line->Point1.X && X2 > Line->Point1.X && Y1 < Line->Point1.Y && Y2 > Line->Point1.Y)
+		return pcb_true;
+	/* construct a set of dummy lines and check each of them */
+	line.Thickness = 0;
+	line.Flags = pcb_no_flags();
+
+	/* upper-left to upper-right corner */
+	line.Point1.Y = line.Point2.Y = Y1;
+	line.Point1.X = X1;
+	line.Point2.X = X2;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* upper-right to lower-right corner */
+	line.Point1.X = X2;
+	line.Point1.Y = Y1;
+	line.Point2.Y = Y2;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* lower-right to lower-left corner */
+	line.Point1.Y = Y2;
+	line.Point1.X = X1;
+	line.Point2.X = X2;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* lower-left to upper-left corner */
+	line.Point2.X = X1;
+	line.Point1.Y = Y1;
+	line.Point2.Y = Y2;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+/*checks if a point (of null radius) is in a slanted rectangle */
+static int IsPointInQuadrangle(pcb_point_t p[4], pcb_point_t *l)
+{
+	pcb_coord_t dx, dy, x, y;
+	double prod0, prod1;
+
+	dx = p[1].X - p[0].X;
+	dy = p[1].Y - p[0].Y;
+	x = l->X - p[0].X;
+	y = l->Y - p[0].Y;
+	prod0 = (double) x *dx + (double) y *dy;
+	x = l->X - p[1].X;
+	y = l->Y - p[1].Y;
+	prod1 = (double) x *dx + (double) y *dy;
+	if (prod0 * prod1 <= 0) {
+		dx = p[1].X - p[2].X;
+		dy = p[1].Y - p[2].Y;
+		prod0 = (double) x *dx + (double) y *dy;
+		x = l->X - p[2].X;
+		y = l->Y - p[2].Y;
+		prod1 = (double) x *dx + (double) y *dy;
+		if (prod0 * prod1 <= 0)
+			return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * checks if a line crosses a quadrangle or is within the quadrangle: almost
+ * copied from pcb_is_line_in_rectangle()
+ * Note: actually this quadrangle is a slanted rectangle
+ */
+pcb_bool pcb_is_line_in_quadrangle(pcb_point_t p[4], pcb_line_t *Line)
+{
+	pcb_line_t line;
+
+	/* first, see if point 1 is inside the rectangle */
+	/* in case the whole line is inside the rectangle */
+	if (IsPointInQuadrangle(p, &(Line->Point1)))
+		return pcb_true;
+	if (IsPointInQuadrangle(p, &(Line->Point2)))
+		return pcb_true;
+	/* construct a set of dummy lines and check each of them */
+	line.Thickness = 0;
+	line.Flags = pcb_no_flags();
+
+	/* upper-left to upper-right corner */
+	line.Point1.X = p[0].X;
+	line.Point1.Y = p[0].Y;
+	line.Point2.X = p[1].X;
+	line.Point2.Y = p[1].Y;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* upper-right to lower-right corner */
+	line.Point1.X = p[2].X;
+	line.Point1.Y = p[2].Y;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* lower-right to lower-left corner */
+	line.Point2.X = p[3].X;
+	line.Point2.Y = p[3].Y;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	/* lower-left to upper-left corner */
+	line.Point1.X = p[0].X;
+	line.Point1.Y = p[0].Y;
+	if (pcb_intersect_line_line(&line, Line))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * checks if an arc crosses a rectangle (or arc is within the rectangle)
+ */
+pcb_bool pcb_is_arc_in_rectangle(pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_arc_t *Arc)
+{
+	pcb_line_t line;
+	pcb_coord_t x, y;
+	pcb_box_t box;
+	
+	/* check if any of arc endpoints is inside the rectangle */
+	box.X1 = X1; box.Y1 = Y1;
+	box.X2 = X2; box.Y2 = Y2;
+	pcb_arc_get_end (Arc, 0, &x, &y);
+	if (PCB_POINT_IN_BOX(x, y, &box))
+		return pcb_true;
+	pcb_arc_get_end (Arc, 1, &x, &y);
+	if (PCB_POINT_IN_BOX(x, y, &box))
+		return pcb_true;
+
+	/* construct a set of dummy lines and check each of them */
+	line.Thickness = 0;
+	line.Flags = pcb_no_flags();
+
+	/* upper-left to upper-right corner */
+	line.Point1.Y = line.Point2.Y = Y1;
+	line.Point1.X = X1;
+	line.Point2.X = X2;
+	if (pcb_intersect_line_arc(&line, Arc))
+		return pcb_true;
+
+	/* upper-right to lower-right corner */
+	line.Point1.X = line.Point2.X = X2;
+	line.Point1.Y = Y1;
+	line.Point2.Y = Y2;
+	if (pcb_intersect_line_arc(&line, Arc))
+		return pcb_true;
+
+	/* lower-right to lower-left corner */
+	line.Point1.Y = line.Point2.Y = Y2;
+	line.Point1.X = X1;
+	line.Point2.X = X2;
+	if (pcb_intersect_line_arc(&line, Arc))
+		return pcb_true;
+
+	/* lower-left to upper-left corner */
+	line.Point1.X = line.Point2.X = X1;
+	line.Point1.Y = Y1;
+	line.Point2.Y = Y2;
+	if (pcb_intersect_line_arc(&line, Arc))
+		return pcb_true;
+
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * Check if a circle of Radius with center at (X, Y) intersects a line.
+ * Written to enable arbitrary line directions; for rounded/square lines, too.
+ */
+pcb_bool pcb_is_point_in_line(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_any_line_t *Pad)
+{
+	double r, Sin, Cos;
+	pcb_coord_t x;
+
+	/* Also used from line_callback with line type smaller than pad type;
+	   use the smallest common subset; ->Thickness is still ok. */
+	pcb_coord_t t2 = (Pad->Thickness + 1) / 2, range;
+	pcb_any_line_t pad = *Pad;
+
+
+	/* series of transforms saving range */
+	/* move Point1 to the origin */
+	X -= pad.Point1.X;
+	Y -= pad.Point1.Y;
+
+	pad.Point2.X -= pad.Point1.X;
+	pad.Point2.Y -= pad.Point1.Y;
+	/* so, pad.Point1.X = pad.Point1.Y = 0; */
+
+	/* rotate round (0, 0) so that Point2 coordinates be (r, 0) */
+	r = pcb_distance(0, 0, pad.Point2.X, pad.Point2.Y);
+	if (r < .1) {
+		Cos = 1;
+		Sin = 0;
+	}
+	else {
+		Sin = pad.Point2.Y / r;
+		Cos = pad.Point2.X / r;
+	}
+	x = X;
+	X = X * Cos + Y * Sin;
+	Y = Y * Cos - x * Sin;
+	/* now pad.Point2.X = r; pad.Point2.Y = 0; */
+
+	/* take into account the ends */
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) {
+		r += Pad->Thickness;
+		X += t2;
+	}
+	if (Y < 0)
+		Y = -Y;											/* range value is evident now */
+
+	if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad)) {
+		if (X <= 0) {
+			if (Y <= t2)
+				range = -X;
+			else
+				return Radius > pcb_distance(0, t2, X, Y);
+		}
+		else if (X >= r) {
+			if (Y <= t2)
+				range = X - r;
+			else
+				return Radius > pcb_distance(r, t2, X, Y);
+		}
+		else
+			range = Y - t2;
+	}
+	else {												/*Rounded pad: even more simple */
+
+		if (X <= 0)
+			return (Radius + t2) > pcb_distance(0, 0, X, Y);
+		else if (X >= r)
+			return (Radius + t2) > pcb_distance(r, 0, X, Y);
+		else
+			range = Y - t2;
+	}
+	return range < Radius;
+}
+
+pcb_bool pcb_is_point_in_box(pcb_coord_t X, pcb_coord_t Y, pcb_box_t *box, pcb_coord_t Radius)
+{
+	pcb_coord_t width, height, range;
+
+	/* NB: Assumes box has point1 with numerically lower X and Y coordinates */
+
+	/* Compute coordinates relative to Point1 */
+	X -= box->X1;
+	Y -= box->Y1;
+
+	width = box->X2 - box->X1;
+	height = box->Y2 - box->Y1;
+
+	if (X <= 0) {
+		if (Y < 0)
+			return Radius > pcb_distance(0, 0, X, Y);
+		else if (Y > height)
+			return Radius > pcb_distance(0, height, X, Y);
+		else
+			range = -X;
+	}
+	else if (X >= width) {
+		if (Y < 0)
+			return Radius > pcb_distance(width, 0, X, Y);
+		else if (Y > height)
+			return Radius > pcb_distance(width, height, X, Y);
+		else
+			range = X - width;
+	}
+	else {
+		if (Y < 0)
+			range = -Y;
+		else if (Y > height)
+			range = Y - height;
+		else
+			return pcb_true;
+	}
+
+	return range < Radius;
+}
+
+pcb_bool pcb_arc_in_box(pcb_arc_t *arc, pcb_box_t *b)
+{
+	pcb_box_t ab = pcb_arc_mini_bbox(arc);
+	return PCB_BOX_IN_BOX(&ab, b);
+}
+
+/* TODO: this code is BROKEN in the case of non-circular arcs,
+ *       and in the case that the arc thickness is greater than
+ *       the radius.
+ */
+pcb_bool pcb_is_point_on_arc(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_arc_t *Arc)
+{
+	/* Calculate angle of point from arc center */
+	double p_dist = pcb_distance(X, Y, Arc->X, Arc->Y);
+	double p_cos = (X - Arc->X) / p_dist;
+	pcb_angle_t p_ang = acos(p_cos) * PCB_RAD_TO_DEG;
+	pcb_angle_t ang1, ang2;
+#define angle_in_range(r1, r2, ang) (((ang) >= (r1)) && ((ang) <= (r2)))
+
+
+	/* Convert StartAngle, Delta into bounding angles in [0, 720) */
+	if (Arc->Delta > 0) {
+		ang1 = pcb_normalize_angle(Arc->StartAngle);
+		ang2 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta);
+	}
+	else {
+		ang1 = pcb_normalize_angle(Arc->StartAngle + Arc->Delta);
+		ang2 = pcb_normalize_angle(Arc->StartAngle);
+	}
+	if (ang1 > ang2)
+		ang2 += 360;
+	/* Make sure full circles aren't treated as zero-length arcs */
+	if (Arc->Delta == 360 || Arc->Delta == -360)
+		ang2 = ang1 + 360;
+
+	if (Y > Arc->Y)
+		p_ang = -p_ang;
+	p_ang += 180;
+
+
+	/* Check point is outside arc range, check distance from endpoints
+	   Need to check p_ang+360 too, because after the angle swaps above ang2
+	   might be larger than 360 and that section of the arc shouldn't be missed
+	   either. */
+	if (!angle_in_range(ang1, ang2, p_ang) && !angle_in_range(ang1, ang2, p_ang+360)) {
+		pcb_coord_t ArcX, ArcY;
+		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + 180) / PCB_RAD_TO_DEG);
+		ArcY = Arc->Y - Arc->Height * sin((Arc->StartAngle + 180) / PCB_RAD_TO_DEG);
+		if (pcb_distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2)
+			return pcb_true;
+
+		ArcX = Arc->X + Arc->Width * cos((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG);
+		ArcY = Arc->Y - Arc->Height * sin((Arc->StartAngle + Arc->Delta + 180) / PCB_RAD_TO_DEG);
+		if (pcb_distance(X, Y, ArcX, ArcY) < Radius + Arc->Thickness / 2)
+			return pcb_true;
+		return pcb_false;
+	}
+
+	if ((Arc->Width == Arc->Height) || (fabs(Arc->Width - Arc->Height) < PCB_MM_TO_COORD(0.1))) {
+		/* Simple circular case: if point is inside the arc range, just compare it to the arc */
+		return fabs(pcb_distance(X, Y, Arc->X, Arc->Y) - Arc->Width) < Radius + Arc->Thickness / 2;
+	}
+	else {
+		/* elliptical case: guess where the arc would be in that point, by angle */
+		double ang, dx, dy;
+		pcb_coord_t ax, ay, d;
+
+#warning TODO: elliptical arc: rewrite this, as it does not work properly on extreme cases
+		dy = (double)(Y - Arc->Y) / (double)Arc->Height;
+		dx = (double)(X - Arc->X) / (double)Arc->Width;
+		ang = -atan2(dy, dx);
+
+		ax = Arc->X + cos(ang) * Arc->Width;
+		ay = Arc->Y - sin(ang) * Arc->Height;
+
+		d = fabs(pcb_distance(X, Y, ax, ay));
+
+		return d < Arc->Thickness / 2;
+	}
+#undef angle_in_range
+}
+
+pcb_line_t *pcb_line_center_cross_point(pcb_layer_t *layer, pcb_coord_t x, pcb_coord_t y, pcb_angle_t *ang, pcb_bool no_subc_part, pcb_bool no_term)
+{
+	pcb_rtree_it_t it;
+	pcb_rtree_box_t pt;
+	pcb_line_t *l;
+
+/* TODO: set pt coords to x and y */
+
+	for(l = pcb_rtree_first(&it, layer->line_tree, &pt); l != NULL; l = pcb_rtree_next(&it)) {
+		/* check if line needs to be ignored and "continue;" if so:
+		   l->term is non-NULL if it's a terminal,
+		   pcb_lobj_parent_subc(pcb_parenttype_t pt, pcb_parent_t *p) returns non-NULL if it's in a subc
+		 */
+		/* if the line shouldn't be ignored, check if x;y is on the centerline and
+		   "continue;" if bad */
+		/* check if angle is required and is correct; "continue;" on mismatch */
+		return l;
+	}
+	return NULL; /* found nothing */
+}
+
+pcb_layer_type_t pstk_vis_layers(pcb_board_t *pcb, pcb_layer_type_t material)
+{
+	pcb_layer_type_t res = 0, lyt;
+	pcb_layer_id_t lid;
+	for(lid = 0; lid < pcb->Data->LayerN; lid++) {
+		pcb_layer_t *ly = &pcb->Data->Layer[lid];
+		lyt = pcb_layer_flags_(ly);
+		if ((ly->meta.real.vis) && (lyt & material))
+			res |= (lyt & PCB_LYT_ANYWHERE);
+	}
+	return res | material;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches for any kind of object or for a set of object types
+ * the calling routine passes two pointers to allocated memory for storing
+ * the results.
+ * A type value is returned too which is PCB_OBJ_VOID if no objects has been found.
+ * A set of object types is passed in.
+ * The object is located by it's position.
+ *
+ * The layout is checked in the following order:
+ *   polygon-point, padstack, line, text, polygon, subcircuit
+ *
+ * Note that if Type includes PCB_OBJ_LOCKED, then the search includes
+ * locked items.  Otherwise, locked items are ignored.
+
+ * Note that if Type includes PCB_OBJ_SUBC_PART, then the search includes
+ * objects that are part of subcircuits, else they are ignored.
+ */
+static int pcb_search_obj_by_location_(unsigned long Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, unsigned long req_flag)
+{
+	void *r1, *r2, *r3;
+	void **pr1 = &r1, **pr2 = &r2, **pr3 = &r3;
+	int i;
+	double HigherBound = 0;
+	int HigherAvail = PCB_OBJ_VOID;
+	int objst = Type & (PCB_OBJ_LOCKED | PCB_OBJ_SUBC_PART);
+
+	/* setup variables used by local functions */
+	PosX = X;
+	PosY = Y;
+	SearchRadius = Radius;
+	if (Radius) {
+		SearchBox.X1 = X - Radius;
+		SearchBox.Y1 = Y - Radius;
+		SearchBox.X2 = X + Radius;
+		SearchBox.Y2 = Y + Radius;
+	}
+	else {
+		SearchBox = pcb_point_box(X, Y);
+	}
+
+	if (conf_core.editor.only_names) {
+		Type &= PCB_OBJ_TEXT;
+	}
+
+	if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) {
+		Type &= ~PCB_OBJ_POLY;
+	}
+
+	if (Type & PCB_OBJ_RAT && PCB->RatOn &&
+			SearchRatLineByLocation(objst, req_flag, (pcb_rat_t **) Result1, (pcb_rat_t **) Result2, (pcb_rat_t **) Result3))
+		return PCB_OBJ_RAT;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 1, 0))
+		return PCB_OBJ_PSTK;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0, PCB_LYT_VISIBLE_SIDE() | PCB_LYT_COPPER))
+		return PCB_OBJ_PSTK;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0, (PCB_LYT_VISIBLE_SIDE() | PCB_LYT_ANYTHING) & pstk_vis_layers(PCB, PCB_LYT_ANYTHING)))
+		return PCB_OBJ_PSTK;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0, pstk_vis_layers(PCB, PCB_LYT_MASK)))
+		return PCB_OBJ_PSTK;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0, pstk_vis_layers(PCB, PCB_LYT_COPPER)))
+		return PCB_OBJ_PSTK;
+
+	if (Type & PCB_OBJ_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3, 0, pstk_vis_layers(PCB, PCB_LYT_PASTE)))
+		return PCB_OBJ_PSTK;
+
+	if (!HigherAvail && (Type & PCB_OBJ_FLOATER) && (Type & PCB_OBJ_TEXT) &&
+			SearchSubcFloaterByLocation(objst, req_flag, (pcb_subc_t **)pr1, (pcb_text_t **) pr2, pr3, pcb_false)) {
+		*Result1 = ((pcb_text_t *)r2)->parent.layer;
+		*Result2 = r2;
+		*Result3 = r3;
+		return PCB_OBJ_TEXT;
+	}
+
+	if (!HigherAvail && Type & PCB_OBJ_SUBC && PCB->SubcOn &&
+			SearchSubcByLocation(objst, req_flag, (pcb_subc_t **) pr1, (pcb_subc_t **) pr2, (pcb_subc_t **) pr3, pcb_false)) {
+		pcb_box_t *box = &((pcb_subc_t *) r1)->BoundingBox;
+		HigherBound = (double) (box->X2 - box->X1) * (double) (box->Y2 - box->Y1);
+		HigherAvail = PCB_OBJ_SUBC;
+	}
+
+	for (i = -1; i < pcb_max_layer + 1; i++) {
+		if (pcb_layer_flags(PCB, i) & PCB_LYT_SILK) /* special order: silks are i=-1 and i=max+1, if we meet them elsewhere, skip */
+			continue;
+		if (i < 0)
+			SearchLayer = &PCB->Data->SILKLAYER;
+		else if (i < pcb_max_layer)
+			SearchLayer = LAYER_ON_STACK(i);
+
+		else {
+			SearchLayer = &PCB->Data->BACKSILKLAYER;
+			if (!PCB->InvisibleObjectsOn)
+				continue;
+		}
+		if (SearchLayer->meta.real.vis) {
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 &&
+					Type & PCB_OBJ_POLY_POINT &&
+					SearchPointByLocation(Type, objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_point_t **) Result3))
+				return PCB_OBJ_POLY_POINT;
+
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 &&
+					Type & PCB_OBJ_LINE_POINT &&
+					SearchLinePointByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (pcb_point_t **) Result3))
+				return PCB_OBJ_LINE_POINT;
+
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 &&
+					Type & PCB_OBJ_ARC_POINT &&
+					SearchArcPointByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_arc_t **) Result2, (int **) Result3))
+				return PCB_OBJ_ARC_POINT;
+
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_LINE
+					&& SearchLineByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_line_t **) Result2, (pcb_line_t **) Result3))
+				return PCB_OBJ_LINE;
+
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_ARC &&
+					SearchArcByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_arc_t **) Result2, (pcb_arc_t **) Result3))
+				return PCB_OBJ_ARC;
+
+			if ((HigherAvail & (PCB_OBJ_PSTK)) == 0 && Type & PCB_OBJ_TEXT
+					&& SearchTextByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_text_t **) Result2, (pcb_text_t **) Result3))
+				return PCB_OBJ_TEXT;
+
+			if (Type & PCB_OBJ_POLY &&
+					SearchPolygonByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_poly_t **) Result3)) {
+				if (HigherAvail) {
+					pcb_box_t *box = &(*(pcb_poly_t **) Result2)->BoundingBox;
+					double area = (double) (box->X2 - box->X1) * (double) (box->X2 - box->X1);
+					if (HigherBound < area)
+						break;
+					else
+						return PCB_OBJ_POLY;
+				}
+				else
+					return PCB_OBJ_POLY;
+			}
+		}
+	}
+	/* return any previously found objects */
+	if (HigherAvail & PCB_OBJ_PSTK) {
+		*Result1 = r1;
+		*Result2 = r2;
+		*Result3 = r3;
+		return PCB_OBJ_PSTK;
+	}
+
+	if (HigherAvail & PCB_OBJ_SUBC) {
+		*Result1 = r1;
+		*Result2 = r2;
+		*Result3 = r3;
+		return PCB_OBJ_SUBC;
+	}
+
+	/* search the 'invisible objects' last */
+	if (!PCB->InvisibleObjectsOn)
+		return PCB_OBJ_VOID;
+
+	if ((Type & PCB_OBJ_FLOATER) && (Type & PCB_OBJ_TEXT) &&
+			SearchSubcFloaterByLocation(objst, req_flag, (pcb_subc_t **)pr1, (pcb_text_t **) pr2, pr3, pcb_true)) {
+		*Result1 = ((pcb_text_t *)r2)->parent.layer;
+		*Result2 = r2;
+		*Result3 = r3;
+		return PCB_OBJ_TEXT;
+	}
+
+	if (Type & PCB_OBJ_SUBC && PCB->SubcOn &&
+			SearchSubcByLocation(objst, req_flag, (pcb_subc_t **) Result1, (pcb_subc_t **) Result2, (pcb_subc_t **) Result3, pcb_true))
+		return PCB_OBJ_SUBC;
+
+	return PCB_OBJ_VOID;
+}
+
+int pcb_search_obj_by_location(unsigned long Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius)
+{
+	int res;
+
+	if ((conf_core.editor.lock_names) || (conf_core.editor.hide_names))
+		Type &= ~ PCB_OBJ_FLOATER;
+
+	res = pcb_search_obj_by_location_(Type, Result1, Result2, Result3, X, Y, Radius, 0);
+	if ((res != PCB_OBJ_VOID) && (res != PCB_OBJ_SUBC))
+		return res;
+
+	/* found a subc because it was still the best option over all the plain
+	   objects; if floaters can be found, repeat the search on them, they
+	   have higher prio than subc, but lower prio than plain objects */
+	if ((!conf_core.editor.lock_names) && (!conf_core.editor.hide_names)) {
+		int fres;
+		void *fr1, *fr2, *fr3;
+		Type &= ~PCB_OBJ_SUBC;
+		Type |= PCB_OBJ_SUBC_PART;
+		fres = pcb_search_obj_by_location_(Type, &fr1, &fr2, &fr3, X, Y, Radius, PCB_FLAG_FLOATER);
+		if (fres != PCB_OBJ_VOID) {
+			*Result1 = fr1;
+			*Result2 = fr2;
+			*Result3 = fr3;
+			return fres;
+		}
+	}
+	
+	return res;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * searches for a object by it's unique ID. It doesn't matter if
+ * the object is visible or not. The search is performed on a PCB, a
+ * buffer or on the remove list.
+ * The calling routine passes two pointers to allocated memory for storing
+ * the results.
+ * A type value is returned too which is PCB_OBJ_VOID if no objects has been found.
+ */
+int pcb_search_obj_by_id_(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type)
+{
+	if (type == PCB_OBJ_LINE || type == PCB_OBJ_LINE_POINT) {
+		PCB_LINE_ALL_LOOP(Base);
+		{
+			if (line->ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = *Result3 = (void *) line;
+				return PCB_OBJ_LINE;
+			}
+			if (line->Point1.ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = (void *) line;
+				*Result3 = (void *) &line->Point1;
+				return PCB_OBJ_LINE_POINT;
+			}
+			if (line->Point2.ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = (void *) line;
+				*Result3 = (void *) &line->Point2;
+				return PCB_OBJ_LINE_POINT;
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+	if (type == PCB_OBJ_ARC || type == PCB_OBJ_ARC_POINT) {
+		PCB_ARC_ALL_LOOP(Base);
+		{
+			if (arc->ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = *Result3 = (void *) arc;
+				return PCB_OBJ_ARC;
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if (type == PCB_OBJ_TEXT) {
+		PCB_TEXT_ALL_LOOP(Base);
+		{
+			if (text->ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = *Result3 = (void *) text;
+				return PCB_OBJ_TEXT;
+			}
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if (type == PCB_OBJ_POLY || type == PCB_OBJ_POLY_POINT) {
+		PCB_POLY_ALL_LOOP(Base);
+		{
+			if (polygon->ID == ID) {
+				*Result1 = (void *) layer;
+				*Result2 = *Result3 = (void *) polygon;
+				return PCB_OBJ_POLY;
+			}
+			if (type == PCB_OBJ_POLY_POINT)
+				PCB_POLY_POINT_LOOP(polygon);
+			{
+				if (point->ID == ID) {
+					*Result1 = (void *) layer;
+					*Result2 = (void *) polygon;
+					*Result3 = (void *) point;
+					return PCB_OBJ_POLY_POINT;
+				}
+			}
+			PCB_END_LOOP;
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	if (type == PCB_OBJ_PSTK) {
+		PCB_PADSTACK_LOOP(Base);
+		{
+			if (padstack->ID == ID) {
+				*Result1 = *Result2 = *Result3 = (void *)padstack;
+				return PCB_OBJ_PSTK;
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+	if (type == PCB_OBJ_RAT || type == PCB_OBJ_LINE_POINT) {
+		PCB_RAT_LOOP(Base);
+		{
+			if (line->ID == ID) {
+				*Result1 = *Result2 = *Result3 = (void *) line;
+				return PCB_OBJ_RAT;
+			}
+			if (line->Point1.ID == ID) {
+				*Result1 = (void *) NULL;
+				*Result2 = (void *) line;
+				*Result3 = (void *) &line->Point1;
+				return PCB_OBJ_LINE_POINT;
+			}
+			if (line->Point2.ID == ID) {
+				*Result1 = (void *) NULL;
+				*Result2 = (void *) line;
+				*Result3 = (void *) &line->Point2;
+				return PCB_OBJ_LINE_POINT;
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+#warning subc TODO: once elements are gone, rewrite these to search the rtree instead of recursion
+	PCB_SUBC_LOOP(Base);
+	{
+		int res;
+		if (type == PCB_OBJ_SUBC) {
+			if (subc->ID == ID) {
+				*Result1 = *Result2 = *Result3 = (void *)subc;
+				return PCB_OBJ_SUBC;
+			}
+		}
+
+		res = pcb_search_obj_by_id_(subc->data, Result1, Result2, Result3, ID, type);
+		if (res != PCB_OBJ_VOID)
+			return res;
+	}
+	PCB_END_LOOP;
+
+	return PCB_OBJ_VOID;
+}
+
+int pcb_search_obj_by_id(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type)
+{
+	int res = pcb_search_obj_by_id_(Base, Result1, Result2, Result3, ID, type);
+	if (res == PCB_OBJ_VOID)
+		pcb_message(PCB_MSG_ERROR, "hace: Internal error, search for ID %d failed\n", ID);
+	return res;
+}
+
+int pcb_search_obj_by_id_buf2(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type)
+{
+	int bid = 0;
+	long res;
+
+	res = pcb_search_obj_by_id_(Base, Result1, Result2, Result3, ID, type);
+	if (res != PCB_OBJ_VOID)
+		return res;
+
+	while(res == PCB_OBJ_VOID) {
+		res = pcb_search_obj_by_id_(pcb_buffers[bid].Data, Result1, Result2, Result3, ID, type);
+		if (res != PCB_OBJ_VOID)
+			return res;
+		bid++;
+		if (bid >= PCB_MAX_BUFFER)
+			break;
+	}
+
+	pcb_message(PCB_MSG_ERROR, "hace: Internal error, search for ID %d failed\n", ID);
+	return PCB_OBJ_VOID;
+}
+
+/* ---------------------------------------------------------------------------
+ * searches the cursor position for the type
+ */
+int pcb_search_screen(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3)
+{
+	return pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB_SLOP * pcb_pixel_slop);
+}
+
+/* ---------------------------------------------------------------------------
+ * searches the cursor position for the type
+ */
+int pcb_search_grid_slop(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3)
+{
+	int ans;
+
+	ans = pcb_search_obj_by_location(Type, Result1, Result2, Result3, X, Y, PCB->Grid / 2);
+	return ans;
+}
+
+int pcb_lines_intersect(pcb_coord_t ax1, pcb_coord_t ay1, pcb_coord_t ax2, pcb_coord_t ay2, pcb_coord_t bx1, pcb_coord_t by1, pcb_coord_t bx2, pcb_coord_t by2)
+{
+/* TODO: this should be long double if pcb_coord_t is 64 bits */
+	double ua, xi, yi, X1, Y1, X2, Y2, X3, Y3, X4, Y4, tmp;
+	int is_a_pt, is_b_pt;
+
+	/* degenerate cases: a line is actually a point */
+	is_a_pt = (ax1 == ax2) && (ay1 == ay2);
+	is_b_pt = (bx1 == bx2) && (by1 == by2);
+
+	if (is_a_pt && is_b_pt)
+		return (ax1 == bx1) && (ay1 == by1);
+
+	if (is_a_pt)
+		return is_point_on_line(ax1, ay1, bx1, by1, bx2, by2);
+	if (is_b_pt)
+		return is_point_on_line(bx1, by1, ax1, ay1, ax2, ay2);
+
+	/* maths from http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/ */
+
+	X1 = ax1;
+	X2 = ax2;
+	X3 = bx1;
+	X4 = bx2;
+	Y1 = ay1;
+	Y2 = ay2;
+	Y3 = by1;
+	Y4 = by2;
+
+	tmp = ((Y4 - Y3) * (X2 - X1) - (X4 - X3) * (Y2 - Y1));
+
+	if (tmp == 0) {
+		/* Corner case: parallel lines; intersect only if the endpoint of either line
+		   is on the other line */
+		return
+			is_point_on_line(ax1, ay1,  bx1, by1, bx2, by2) ||
+			is_point_on_line(ax2, ay2,  bx1, by1, bx2, by2) ||
+			is_point_on_line(bx1, by1,  ax1, ay1, ax2, ay2) ||
+			is_point_on_line(bx2, by2,  ax1, ay1, ax2, ay2);
+	}
+
+
+	ua = ((X4 - X3) * (Y1 - Y3) - (Y4 - Y3) * (X1 - X3)) / tmp;
+/*	ub = ((X2 - X1) * (Y1 - Y3) - (Y2 - Y1) * (X1 - X3)) / tmp;*/
+	xi = X1 + ua * (X2 - X1);
+	yi = Y1 + ua * (Y2 - Y1);
+
+#define check(e1, e2, i) \
+	if (e1 < e2) { \
+		if ((i < e1) || (i > e2)) \
+			return 0; \
+	} \
+	else { \
+		if ((i > e1) || (i < e2)) \
+			return 0; \
+	}
+
+	check(ax1, ax2, xi);
+	check(bx1, bx2, xi);
+	check(ay1, ay2, yi);
+	check(by1, by2, yi);
+	return 1;
+}
+
Index: tags/2.0.1/src/search.h
===================================================================
--- tags/2.0.1/src/search.h	(nonexistent)
+++ tags/2.0.1/src/search.h	(revision 18980)
@@ -0,0 +1,196 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Search object by location routines */
+
+#ifndef	PCB_SEARCH_H
+#define	PCB_SEARCH_H
+
+#include "global_typedefs.h"
+#include "rats.h"
+#include "misc_util.h"
+#include "layer.h"
+
+int pcb_lines_intersect(pcb_coord_t ax1, pcb_coord_t ay1, pcb_coord_t ax2, pcb_coord_t ay2, pcb_coord_t bx1, pcb_coord_t by1, pcb_coord_t bx2, pcb_coord_t by2);
+pcb_bool pcb_arc_in_box(pcb_arc_t *arc, pcb_box_t *b);
+
+#define PCB_SLOP 5
+
+/* ---------------------------------------------------------------------------
+ * some define to check for 'type' in box
+ */
+#define	PCB_POINT_IN_BOX(x,y,b)	\
+	(PCB_IS_BOX_NEGATIVE(b) ?  \
+	((x) >= (b)->X2 && (x) <= (b)->X1 && (y) >= (b)->Y2 && (y) <= (b)->Y1) \
+	: \
+	((x) >= (b)->X1 && (x) <= (b)->X2 && (y) >= (b)->Y1 && (y) <= (b)->Y2))
+
+#define	PCB_VIA_OR_PIN_IN_BOX(v,b) \
+	( \
+	PCB_POINT_IN_BOX((v)->X-(v)->Thickness/2,(v)->Y-(v)->Thickness/2,(b)) && \
+	PCB_POINT_IN_BOX((v)->X+(v)->Thickness/2,(v)->Y+(v)->Thickness/2,(b)) \
+	)
+
+#define	PCB_LINE_IN_BOX(l,b)	\
+	(PCB_POINT_IN_BOX((l)->Point1.X,(l)->Point1.Y,(b)) &&	\
+	PCB_POINT_IN_BOX((l)->Point2.X,(l)->Point2.Y,(b)))
+
+#define	PCB_PAD_IN_BOX(p,b)	PCB_LINE_IN_BOX((pcb_line_t *)(p),(b))
+
+#define	PCB_BOX_IN_BOX(b1,b)	\
+	((b1)->X1 >= (b)->X1 && (b1)->X2 <= (b)->X2 &&	\
+	((b1)->Y1 >= (b)->Y1 && (b1)->Y2 <= (b)->Y2))
+
+#define	PCB_TEXT_IN_BOX(t,b)	\
+	(PCB_BOX_IN_BOX(&((t)->BoundingBox), (b)))
+
+#define	PCB_POLYGON_IN_BOX(p,b)	\
+	(PCB_BOX_IN_BOX(&((p)->BoundingBox), (b)))
+
+#define	PCB_SUBC_IN_BOX(s,b)	\
+	(PCB_BOX_IN_BOX(&((s)->BoundingBox), (b)))
+
+#define	PCB_ELEMENT_IN_BOX(e,b)	\
+	(PCB_BOX_IN_BOX(&((e)->BoundingBox), (b)))
+
+/* the bounding box is much larger than the minimum, use it to decide it
+   it is worth doing the expensive precise calculations */
+#define PCB_ARC_IN_BOX(a,b)		\
+	((PCB_BOX_TOUCHES_BOX(&((a)->BoundingBox), (b))) && (pcb_arc_in_box(a,b)))
+
+/* == the same but accept if any part of the object touches the box == */
+#define PCB_POINT_IN_CIRCLE(x, y, cx, cy, r) \
+	(pcb_distance2(x, y, cx, cy) <= (double)(r) * (double)(r))
+
+#define PCB_CIRCLE_TOUCHES_BOX(cx, cy, r, b) \
+	(    PCB_POINT_IN_BOX((cx)-(r),(cy),(b)) || PCB_POINT_IN_BOX((cx)+(r),(cy),(b)) || PCB_POINT_IN_BOX((cx),(cy)-(r),(b)) || PCB_POINT_IN_BOX((cx),(cy)+(r),(b)) \
+	  || PCB_POINT_IN_CIRCLE((b)->X1, (b)->Y1, (cx), (cy), (r)) || PCB_POINT_IN_CIRCLE((b)->X2, (b)->Y1, (cx), (cy), (r)) || PCB_POINT_IN_CIRCLE((b)->X1, (b)->Y2, (cx), (cy), (r)) || PCB_POINT_IN_CIRCLE((b)->X2, (b)->Y2, (cx), (cy), (r)))
+
+#define	PCB_VIA_OR_PIN_TOUCHES_BOX(v,b) \
+	PCB_CIRCLE_TOUCHES_BOX((v)->X,(v)->Y,((v)->Thickness + (v)->DrillingHole/2),(b))
+
+#define	PCB_LINE_TOUCHES_BOX(l,b)	\
+	(    pcb_lines_intersect((l)->Point1.X,(l)->Point1.Y,(l)->Point2.X,(l)->Point2.Y, (b)->X1, (b)->Y1, (b)->X2, (b)->Y1) \
+	  || pcb_lines_intersect((l)->Point1.X,(l)->Point1.Y,(l)->Point2.X,(l)->Point2.Y, (b)->X1, (b)->Y1, (b)->X1, (b)->Y2) \
+	  || pcb_lines_intersect((l)->Point1.X,(l)->Point1.Y,(l)->Point2.X,(l)->Point2.Y, (b)->X2, (b)->Y2, (b)->X1, (b)->Y2) \
+	  || pcb_lines_intersect((l)->Point1.X,(l)->Point1.Y,(l)->Point2.X,(l)->Point2.Y, (b)->X2, (b)->Y2, (b)->X2, (b)->Y1) \
+	  || PCB_LINE_IN_BOX((l), (b)))
+
+#define	PCB_XYLINE_ISECTS_BOX(x1,y1,x2,y2,b)	\
+	(    pcb_lines_intersect(x1,y1,x2,y2, (b)->X1, (b)->Y1, (b)->X2, (b)->Y1) \
+	  || pcb_lines_intersect(x1,y1,x2,y2, (b)->X1, (b)->Y1, (b)->X1, (b)->Y2) \
+	  || pcb_lines_intersect(x1,y1,x2,y2, (b)->X2, (b)->Y2, (b)->X1, (b)->Y2) \
+	  || pcb_lines_intersect(x1,y1,x2,y2, (b)->X2, (b)->Y2, (b)->X2, (b)->Y1) \
+	)
+
+#define	PCB_PAD_TOUCHES_BOX(p,b)	PCB_LINE_TOUCHES_BOX((pcb_line_t *)(p),(b))
+
+/* a corner of either box is within the other, or edges cross */
+#define	PCB_BOX_TOUCHES_BOX(b1,b2)	\
+	(   PCB_POINT_IN_BOX((b1)->X1,(b1)->Y1,b2) || PCB_POINT_IN_BOX((b1)->X1,(b1)->Y2,b2) || PCB_POINT_IN_BOX((b1)->X2,(b1)->Y1,b2) || PCB_POINT_IN_BOX((b1)->X2,(b1)->Y2,b2)  \
+	 || PCB_POINT_IN_BOX((b2)->X1,(b2)->Y1,b1) || PCB_POINT_IN_BOX((b2)->X1,(b2)->Y2,b1) || PCB_POINT_IN_BOX((b2)->X2,(b2)->Y1,b1) || PCB_POINT_IN_BOX((b2)->X2,(b2)->Y2,b1)  \
+	 || pcb_lines_intersect((b1)->X1,(b1)->Y1, (b1)->X2,(b1)->Y1, (b2)->X1,(b2)->Y1, (b2)->X1,(b2)->Y2) \
+	 || pcb_lines_intersect((b2)->X1,(b2)->Y1, (b2)->X2,(b2)->Y1, (b1)->X1,(b1)->Y1, (b1)->X1,(b1)->Y2))
+
+#define	PCB_TEXT_TOUCHES_BOX(t,b)	\
+	(PCB_BOX_TOUCHES_BOX(&((t)->BoundingBox), (b)))
+
+#define	PCB_POLYGON_TOUCHES_BOX(p,b)	\
+	(pcb_poly_is_rect_in_p((b)->X2, (b)->Y2, (b)->X1, (b)->Y1, (p)))
+
+#define	PCB_SUBC_TOUCHES_BOX(s,b)	\
+	(PCB_BOX_TOUCHES_BOX(&((s)->BoundingBox), (b)))
+
+#define	PCB_ELEMENT_TOUCHES_BOX(e,b)	\
+	(PCB_BOX_TOUCHES_BOX(&((e)->BoundingBox), (b)))
+
+#define PCB_ARC_TOUCHES_BOX(a,b)		\
+	(pcb_is_arc_in_rectangle((b)->X2, (b)->Y2, (b)->X1, (b)->Y1, (a)))
+
+
+/* == the combination of *_IN_* and *_TOUCHES_*: use IN for positive boxes == */
+#define PCB_IS_BOX_NEGATIVE(b) (((b)->X2 < (b)->X1) || ((b)->Y2 < (b)->Y1))
+
+#define	PCB_BOX_NEAR_BOX(b1,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_BOX_TOUCHES_BOX(b1,b) : PCB_BOX_IN_BOX(b1,b))
+
+#define	PCB_VIA_OR_PIN_NEAR_BOX(v,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_VIA_OR_PIN_TOUCHES_BOX(v,b) : PCB_VIA_OR_PIN_IN_BOX(v,b))
+
+#define	PCB_LINE_NEAR_BOX(l,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_LINE_TOUCHES_BOX(l,b) : PCB_LINE_IN_BOX(l,b))
+
+#define	PCB_PAD_NEAR_BOX(p,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_PAD_TOUCHES_BOX(p,b) : PCB_PAD_IN_BOX(p,b))
+
+#define	PCB_TEXT_NEAR_BOX(t,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_TEXT_TOUCHES_BOX(t,b) : PCB_TEXT_IN_BOX(t,b))
+
+#define	PCB_POLYGON_NEAR_BOX(p,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_POLYGON_TOUCHES_BOX(p,b) : PCB_POLYGON_IN_BOX(p,b))
+
+#define	PCB_SUBC_NEAR_BOX(s,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_SUBC_TOUCHES_BOX(s,b) : PCB_SUBC_IN_BOX(s,b))
+
+#define	PCB_ELEMENT_NEAR_BOX(e,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_ELEMENT_TOUCHES_BOX(e,b) : PCB_ELEMENT_IN_BOX(e,b))
+
+#define PCB_ARC_NEAR_BOX(a,b) \
+	(PCB_IS_BOX_NEGATIVE(b) ? PCB_ARC_TOUCHES_BOX(a,b) : PCB_ARC_IN_BOX(a,b))
+
+pcb_bool pcb_is_point_on_line(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_line_t *Line);
+pcb_bool pcb_is_point_on_thinline( pcb_coord_t X, pcb_coord_t Y, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2,pcb_coord_t Y2 );
+pcb_bool pcb_is_point_on_line_end(pcb_coord_t X, pcb_coord_t Y, pcb_rat_t *Line);
+pcb_bool pcb_is_point_on_arc(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_arc_t *Arc);
+pcb_bool pcb_is_line_in_rectangle(pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_line_t *Line);
+pcb_bool pcb_is_line_in_quadrangle(pcb_point_t p[4], pcb_line_t *Line);
+pcb_bool pcb_is_arc_in_rectangle(pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_arc_t *Arc);
+pcb_bool pcb_is_point_in_line(pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius, pcb_any_line_t *Pad);
+pcb_bool pcb_is_point_in_box(pcb_coord_t X, pcb_coord_t Y, pcb_box_t *box, pcb_coord_t Radius);
+
+/* Return the distance^2 between a line-center and a point */
+double pcb_point_line_dist2(pcb_coord_t X, pcb_coord_t Y, pcb_line_t *Line);
+
+/* Return the first line object that has its centerline crossing the point;
+   if ang is not NULL, only return lines that are pointing in the right
+   angle (also accept 180 degree rotation)
+   if no_subc_part is true, ignore lines that are part of subcircuits;
+   if no_term is true, ignore lines that are terminals */
+pcb_line_t *pcb_line_center_cross_point(pcb_layer_t *layer, pcb_coord_t x, pcb_coord_t y, pcb_angle_t *ang, pcb_bool no_subc_part, pcb_bool no_term);
+
+int pcb_search_screen(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3);
+int pcb_search_grid_slop(pcb_coord_t X, pcb_coord_t Y, int Type, void **Result1, void **Result2, void **Result3);
+int pcb_search_obj_by_location(unsigned long Type, void **Result1, void **Result2, void **Result3, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Radius);
+int pcb_search_obj_by_id(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type);
+int pcb_search_obj_by_id_(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type); /* no-hace version */
+
+/* Same as pcb_search_obj_by_id, but search in buffers too */
+int pcb_search_obj_by_id_buf2(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type);
+
+#endif
+
Index: tags/2.0.1/src/select.c
===================================================================
--- tags/2.0.1/src/select.c	(nonexistent)
+++ tags/2.0.1/src/select.c	(revision 18980)
@@ -0,0 +1,483 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* select routines
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "draw.h"
+#include "error.h"
+#include "polygon.h"
+#include "search.h"
+#include "select.h"
+#include "undo.h"
+#include "find.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+#include "obj_arc_draw.h"
+#include "obj_line_draw.h"
+#include "obj_poly_draw.h"
+#include "obj_text_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_pstk_draw.h"
+
+#include <genregex/regex_sei.h>
+
+/* ---------------------------------------------------------------------------
+ * toggles the selection of any kind of object
+ * the different types are defined by search.h
+ */
+pcb_bool pcb_select_object(pcb_board_t *pcb)
+{
+	void *ptr1, *ptr2, *ptr3;
+	pcb_layer_t *layer;
+	int type;
+
+	pcb_bool changed = pcb_true;
+
+	type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_SELECT_TYPES | PCB_LOOSE_SUBC | PCB_OBJ_FLOATER, &ptr1, &ptr2, &ptr3);
+	if (type == PCB_OBJ_VOID || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2))
+		return pcb_false;
+	switch (type) {
+
+	case PCB_OBJ_PSTK:
+		pcb_undo_add_obj_to_flag(ptr1);
+		PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pstk_t *) ptr1);
+		pcb_pstk_invalidate_draw((pcb_pstk_t *) ptr1);
+		break;
+
+	case PCB_OBJ_LINE:
+		{
+			pcb_line_t *line = (pcb_line_t *) ptr2;
+
+			layer = (pcb_layer_t *) ptr1;
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, line);
+			pcb_line_invalidate_draw(layer, line);
+			break;
+		}
+
+	case PCB_OBJ_RAT:
+		{
+			pcb_rat_t *rat = (pcb_rat_t *) ptr2;
+
+			pcb_undo_add_obj_to_flag(ptr1);
+			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, rat);
+			pcb_rat_invalidate_draw(rat);
+			break;
+		}
+
+	case PCB_OBJ_ARC:
+		{
+			pcb_arc_t *arc = (pcb_arc_t *) ptr2;
+
+			layer = (pcb_layer_t *) ptr1;
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, arc);
+			pcb_arc_invalidate_draw(layer, arc);
+			break;
+		}
+
+	case PCB_OBJ_TEXT:
+		{
+			pcb_text_t *text = (pcb_text_t *) ptr2;
+
+			layer = (pcb_layer_t *) ptr1;
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, text);
+			pcb_text_invalidate_draw(layer, text);
+			break;
+		}
+
+	case PCB_OBJ_POLY:
+		{
+			pcb_poly_t *poly = (pcb_poly_t *) ptr2;
+
+			layer = (pcb_layer_t *) ptr1;
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, poly);
+			pcb_poly_invalidate_draw(layer, poly);
+			/* changing memory order no longer effects draw order */
+			break;
+		}
+
+	case PCB_OBJ_SUBC:
+		pcb_subc_select(pcb, (pcb_subc_t *) ptr1, PCB_CHGFLG_TOGGLE, 1);
+		break;
+	}
+	pcb_draw();
+	pcb_undo_inc_serial();
+	return changed;
+}
+
+static void fix_box_dir(pcb_box_t *Box, int force_pos)
+{
+#define swap(a,b) \
+do { \
+	pcb_coord_t tmp; \
+	tmp = a; \
+	a = b; \
+	b = tmp; \
+} while(0)
+
+	/* If board view is flipped, box coords need to be flipped too to reflect
+	   the on-screen direction of draw */
+	if (conf_core.editor.view.flip_x)
+		swap(Box->X1, Box->X2);
+	if (conf_core.editor.view.flip_y)
+		swap(Box->Y1, Box->Y2);
+
+	if ((force_pos) || (conf_core.editor.selection.disable_negative)) {
+		if (Box->X1 > Box->X2)
+			swap(Box->X1, Box->X2);
+		if (Box->Y1 > Box->Y2)
+			swap(Box->Y1, Box->Y2);
+	}
+	else {
+		if (conf_core.editor.selection.symmetric_negative) {
+			if (Box->Y1 > Box->Y2)
+				swap(Box->Y1, Box->Y2);
+		}
+		/* Make sure our negative box is canonical: always from bottom-right to top-left
+		   This limits all possible box coordinate orders to two, one for positive and
+		   one for negative. */
+		if (PCB_IS_BOX_NEGATIVE(Box)) {
+			if (Box->X1 < Box->X2)
+				swap(Box->X1, Box->X2);
+			if (Box->Y1 < Box->Y2)
+				swap(Box->Y1, Box->Y2);
+		}
+	}
+#undef swap
+
+}
+
+/* ----------------------------------------------------------------------
+ * selects/unselects or lists visible objects within the passed box
+ * If len is NULL:
+ *  Flag determines if the block is to be selected or unselected
+ *  returns non-NULL if the state of any object has changed
+ * if len is non-NULL:
+ *  returns a list of object IDs matched the search and loads len with the
+ *  length of the list. Returns NULL on no match.
+ */
+#warning cleanup TODO: should be rewritten with generic ops and rtree
+static long int *ListBlock_(pcb_board_t *pcb, pcb_box_t *Box, pcb_bool Flag, int *len)
+{
+	int changed = 0;
+	int used = 0, alloced = 0;
+	long int *list = NULL;
+
+	fix_box_dir(Box, 0);
+/*pcb_printf("box: %mm %mm - %mm %mm    [ %d ] %d %d\n", Box->X1, Box->Y1, Box->X2, Box->Y2, PCB_IS_BOX_NEGATIVE(Box), conf_core.editor.view.flip_x, conf_core.editor.view.flip_y);*/
+
+/* append an object to the return list OR set the flag if there's no list */
+#define append(undo_type, p1, obj) \
+do { \
+	if (len == NULL) { \
+		pcb_undo_add_obj_to_flag(obj); \
+		PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, obj); \
+	} \
+	else { \
+		if (used >= alloced) { \
+			alloced += 64; \
+			list = realloc(list, sizeof(*list) * alloced); \
+		} \
+		list[used] = obj->ID; \
+		used++; \
+	} \
+	changed = 1; \
+} while(0)
+
+	if (PCB_IS_BOX_NEGATIVE(Box) && ((Box->X1 == Box->X2) || (Box->Y2 == Box->Y1))) {
+		if (len != NULL)
+			*len = 0;
+		return NULL;
+	}
+
+	if (pcb->RatOn || !Flag)
+		PCB_RAT_LOOP(pcb->Data);
+	{
+		if (PCB_LINE_NEAR_BOX((pcb_line_t *) line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) {
+			append(PCB_OBJ_RAT, line, line);
+			if (pcb->RatOn)
+				pcb_rat_invalidate_draw(line);
+		}
+	}
+	PCB_END_LOOP;
+
+	/* check layers */
+	LAYER_LOOP(pcb->Data, pcb_max_layer);
+	{
+		unsigned int lflg = pcb_layer_flags(pcb, n);
+
+		if ((lflg & PCB_LYT_SILK) && (PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))) {
+			if (!(pcb_silk_on(pcb) || !Flag))
+				continue;
+		}
+		else if ((lflg & PCB_LYT_SILK) && !(PCB_LAYERFLG_ON_VISIBLE_SIDE(lflg))) {
+			if (!(pcb->InvisibleObjectsOn || !Flag))
+				continue;
+		}
+		else if (!(layer->meta.real.vis || !Flag))
+			continue;
+
+		PCB_LINE_LOOP(layer);
+		{
+			if (PCB_LINE_NEAR_BOX(line, Box)
+					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)
+					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) {
+				append(PCB_OBJ_LINE, layer, line);
+				if (layer->meta.real.vis)
+					pcb_line_invalidate_draw(layer, line);
+			}
+		}
+		PCB_END_LOOP;
+		PCB_ARC_LOOP(layer);
+		{
+			if (PCB_ARC_NEAR_BOX(arc, Box)
+					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc)
+					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, arc) != Flag) {
+				append(PCB_OBJ_ARC, layer, arc);
+				if (layer->meta.real.vis)
+					pcb_arc_invalidate_draw(layer, arc);
+			}
+		}
+		PCB_END_LOOP;
+		PCB_TEXT_LOOP(layer);
+		{
+			if (!Flag || pcb_text_is_visible(PCB, layer, text)) {
+				if (PCB_TEXT_NEAR_BOX(text, Box)
+						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, text)
+						&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) {
+					append(PCB_OBJ_TEXT, layer, text);
+					if (pcb_text_is_visible(PCB, layer, text))
+						pcb_text_invalidate_draw(layer, text);
+				}
+			}
+		}
+		PCB_END_LOOP;
+		PCB_POLY_LOOP(layer);
+		{
+			if (PCB_POLYGON_NEAR_BOX(polygon, Box)
+					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon)
+					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon) != Flag) {
+				append(PCB_OBJ_POLY, layer, polygon);
+				if (layer->meta.real.vis)
+					pcb_poly_invalidate_draw(layer, polygon);
+			}
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+
+	if (PCB->SubcOn) {
+		PCB_SUBC_LOOP(pcb->Data);
+		{
+			if (PCB_SUBC_NEAR_BOX(subc, Box)
+					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)
+					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc) != Flag) {
+
+				if (len == NULL) {
+					pcb_subc_select(PCB, subc, Flag, 1);
+				}
+				else {
+					if (used >= alloced) {
+						alloced += 64;
+						list = realloc(list, sizeof(*list) * alloced);
+					}
+					list[used] = subc->ID;
+					used++;
+				}
+				changed = 1;
+				DrawSubc(subc);
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+	/* end with vias */
+	if (pcb->pstk_on || !Flag) {
+		PCB_PADSTACK_LOOP(pcb->Data);
+		{
+			if (pcb_pstk_near_box(padstack, Box, NULL)
+					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)
+					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack) != Flag) {
+				append(PCB_OBJ_PSTK, padstack, padstack);
+				if (pcb->pstk_on)
+					pcb_pstk_invalidate_draw(padstack);
+			}
+		}
+		PCB_END_LOOP;
+	}
+
+	if (changed) {
+		pcb_draw();
+		pcb_undo_inc_serial();
+	}
+
+	if (len == NULL) {
+		static long int non_zero;
+		return (changed ? &non_zero : NULL);
+	}
+	else {
+		*len = used;
+		return list;
+	}
+}
+
+#undef append
+
+static int pcb_obj_near_box(pcb_any_obj_t *obj, pcb_box_t *box)
+{
+	switch(obj->type) {
+		case PCB_OBJ_RAT:
+		case PCB_OBJ_LINE: return PCB_LINE_NEAR_BOX((pcb_line_t *)obj, box);
+		case PCB_OBJ_TEXT: return PCB_TEXT_NEAR_BOX((pcb_text_t *)obj, box);
+		case PCB_OBJ_POLY: return PCB_POLYGON_NEAR_BOX((pcb_poly_t *)obj, box);
+		case PCB_OBJ_ARC:  return PCB_ARC_NEAR_BOX((pcb_arc_t *)obj, box);
+		case PCB_OBJ_PSTK: return pcb_pstk_near_box((pcb_pstk_t *)obj, box, NULL);
+		case PCB_OBJ_SUBC: return PCB_SUBC_NEAR_BOX((pcb_subc_t *)obj, box);
+		default: return 0;
+	}
+}
+
+typedef struct {
+	pcb_box_t box;
+	pcb_bool flag;
+} select_ctx_t;
+
+static pcb_r_dir_t pcb_select_block_cb(const pcb_box_t *box, void *cl)
+{
+	select_ctx_t *ctx = cl;
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)box;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj) == ctx->flag) /* cheap check on the flag: don't do anything if the flag is already right */
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* do not let locked object selected, but allow deselection */
+	if ((PCB_FLAG_TEST(PCB_FLAG_LOCK, obj) == pcb_true) && (ctx->flag))
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (!pcb_obj_near_box(obj, &ctx->box)) /* detailed box matching */
+		return PCB_R_DIR_NOT_FOUND;
+
+	pcb_undo_add_obj_to_flag((void *)obj);
+	pcb_draw_obj(obj);
+	PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, ctx->flag, obj);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* ----------------------------------------------------------------------
+ * selects/unselects all visible objects within the passed box
+ * Flag determines if the block is to be selected or unselected
+ * returns pcb_true if the state of any object has changed
+ */
+pcb_bool pcb_select_block(pcb_board_t *pcb, pcb_box_t *Box, pcb_bool flag, pcb_bool vis_only)
+{
+	select_ctx_t ctx;
+
+	fix_box_dir(Box, 0);
+
+	ctx.box = *Box;
+	ctx.flag = flag;
+
+	fix_box_dir(Box, 1);
+
+	return pcb_data_r_search(pcb->Data, PCB_OBJ_ANY, Box, NULL, pcb_select_block_cb, &ctx, NULL, vis_only) == PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* ----------------------------------------------------------------------
+ * List all visible objects within the passed box
+ */
+long int *pcb_list_block(pcb_board_t *pcb, pcb_box_t *Box, int *len)
+{
+	return ListBlock_(pcb, Box, 1, len);
+}
+
+/* ----------------------------------------------------------------------
+ * selects/unselects all objects which were found during a connection scan
+ * Flag determines if they are to be selected or unselected
+ * returns pcb_true if the state of any object has changed
+ *
+ * text objects and subcircuits cannot be selected by this routine
+ */
+static pcb_bool pcb_select_connection_(pcb_data_t *data, pcb_bool Flag)
+{
+	pcb_bool changed = pcb_false;
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	for(o = pcb_data_first(&it, data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, o)) {
+			pcb_undo_add_obj_to_flag(o);
+			PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, o);
+			pcb_draw_obj(o);
+			changed = pcb_true;
+		}
+		if ((o->type == PCB_OBJ_SUBC) && (pcb_select_connection_(((pcb_subc_t *)o)->data, Flag)))
+			changed = pcb_true;
+	}
+
+	return changed;
+}
+
+pcb_bool pcb_select_connection(pcb_board_t *pcb, pcb_bool Flag)
+{
+	return pcb_select_connection_(pcb->Data, Flag);
+}
+
+/* ---------------------------------------------------------------------------
+ * selects objects as defined by Type by name;
+ * it's a case insensitive match
+ * returns pcb_true if any object has been selected
+ */
+#define REGEXEC(arg) \
+	(method == PCB_SM_REGEX ? regexec_match_all(regex, (arg)) : strlst_match(pat, (arg)))
+
+static int regexec_match_all(re_sei_t *preg, const char *string)
+{
+	return !!re_sei_exec(preg, string);
+}
+
+/* case insensitive match of each item in the array pat against name
+   returns 1 if any of them matched */
+static int strlst_match(const char **pat, const char *name)
+{
+	for (; *pat != NULL; pat++)
+		if (pcb_strcasecmp(*pat, name) == 0)
+			return 1;
+	return 0;
+}
Index: tags/2.0.1/src/select.h
===================================================================
--- tags/2.0.1/src/select.h	(nonexistent)
+++ tags/2.0.1/src/select.h	(revision 18980)
@@ -0,0 +1,45 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_SELECT_H
+#define	PCB_SELECT_H
+
+#include "config.h"
+#include "operation.h"
+
+#define PCB_SELECT_TYPES	\
+	(PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | PCB_OBJ_SUBC | \
+	 PCB_OBJ_PSTK | PCB_OBJ_RAT | PCB_OBJ_ARC)
+
+pcb_bool pcb_select_object(pcb_board_t *pcb);
+pcb_bool pcb_select_block(pcb_board_t *pcb, pcb_box_t *Box, pcb_bool flag, pcb_bool vis_only);
+long int *pcb_list_block(pcb_board_t *pcb, pcb_box_t *Box, int *len);
+
+pcb_bool pcb_select_connection(pcb_board_t *pcb, pcb_bool);
+
+#endif
Index: tags/2.0.1/src/select_act.c
===================================================================
--- tags/2.0.1/src/select_act.c	(nonexistent)
+++ tags/2.0.1/src/select_act.c	(revision 18980)
@@ -0,0 +1,256 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "undo.h"
+#include "funchash_core.h"
+
+#include "tool.h"
+#include "select.h"
+#include "draw.h"
+#include "remove.h"
+#include "copy.h"
+#include "grid.h"
+#include "hid_attrib.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "actions.h"
+
+
+static const char pcb_acts_Select[] =
+	"Select(Object|ToggleObject)\n"
+	"Select(All|Block|Connection)\n"
+	"Select(Convert)";
+static const char pcb_acth_Select[] = "Toggles or sets the selection.";
+
+/* %start-doc actions Select
+
+@table @code
+
+@item Object
+@item ToggleObject
+Selects the object under the cursor.
+
+@item Block
+Selects all objects in a rectangle indicated by the cursor.
+
+@item All
+Selects all objects on the board.
+
+@item Connection
+Selects all connections with the ``found'' flag set.
+
+@item Convert
+Converts the selected objects to a subcircuit.  This uses the highest
+numbered paste buffer.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Select(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Select, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+
+			/* select a single object */
+		case F_ToggleObject:
+		case F_Object:
+			if (pcb_select_object(PCB))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+
+			/* all objects in block */
+		case F_Block:
+			{
+				pcb_box_t box;
+
+				box.X1 = MIN(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
+				box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
+				box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
+				box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
+				pcb_notify_crosshair_change(pcb_false);
+				pcb_tool_notify_block();
+				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_true, pcb_true)) {
+					pcb_board_set_changed_flag(pcb_true);
+					pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+				}
+				pcb_notify_crosshair_change(pcb_true);
+				break;
+			}
+
+			/* select all visible(?) objects */
+		case F_All:
+			{
+				pcb_box_t box;
+
+				box.X1 = -PCB_MAX_COORD;
+				box.Y1 = -PCB_MAX_COORD;
+				box.X2 = PCB_MAX_COORD;
+				box.Y2 = PCB_MAX_COORD;
+				if (pcb_select_block(PCB, &box, pcb_true, pcb_true))
+					pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+
+			/* all found connections */
+		case F_Connection:
+			if (pcb_select_connection(PCB, pcb_true)) {
+				pcb_draw();
+				pcb_undo_inc_serial();
+				pcb_board_set_changed_flag(pcb_true);
+			}
+			break;
+
+		case F_Convert:
+		case F_ConvertSubc:
+			{
+				pcb_coord_t x, y;
+				pcb_tool_note.Buffer = conf_core.editor.buffer_number;
+				pcb_buffer_set_number(PCB_MAX_BUFFER - 1);
+				pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+				pcb_hid_get_coords(_("Select the Subcircuit's Origin (mark) Location"), &x, &y, 0);
+				x = pcb_grid_fit(x, PCB->Grid, PCB->GridOffsetX);
+				y = pcb_grid_fit(y, PCB->Grid, PCB->GridOffsetY);
+				pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, x, y, pcb_true);
+				pcb_undo_save_serial();
+				pcb_remove_selected(pcb_false);
+				pcb_subc_convert_from_buffer(PCB_PASTEBUFFER);
+				pcb_undo_restore_serial();
+				pcb_buffer_copy_to_layout(PCB, x, y);
+				pcb_buffer_set_number(pcb_tool_note.Buffer);
+			}
+			break;
+
+		default:
+			PCB_ACT_FAIL(Select);
+			break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Unselect[] = "Unselect(All|Block|Connection)\n";
+static const char pcb_acth_Unselect[] = "Unselects the object at the pointer location or the specified objects.";
+
+/* %start-doc actions Unselect
+
+@table @code
+
+@item All
+Unselect all objects.
+
+@item Block
+Unselect all objects in a rectangle given by the cursor.
+
+@item Connection
+Unselect all connections with the ``found'' flag set.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Unselect(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Unselect, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+
+			/* all objects in block */
+		case F_Block:
+			{
+				pcb_box_t box;
+
+				box.X1 = MIN(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
+				box.Y1 = MIN(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
+				box.X2 = MAX(pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point2.X);
+				box.Y2 = MAX(pcb_crosshair.AttachedBox.Point1.Y, pcb_crosshair.AttachedBox.Point2.Y);
+				pcb_notify_crosshair_change(pcb_false);
+				pcb_tool_notify_block();
+				if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD && pcb_select_block(PCB, &box, pcb_false, pcb_true)) {
+					pcb_board_set_changed_flag(pcb_true);
+					pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+				}
+				pcb_notify_crosshair_change(pcb_true);
+				break;
+			}
+
+			/* unselect all visible objects */
+		case F_All:
+			{
+				pcb_box_t box;
+
+				box.X1 = -PCB_MAX_COORD;
+				box.Y1 = -PCB_MAX_COORD;
+				box.X2 = PCB_MAX_COORD;
+				box.Y2 = PCB_MAX_COORD;
+				if (pcb_select_block(PCB, &box, pcb_false, pcb_false))
+					pcb_board_set_changed_flag(pcb_true);
+				break;
+			}
+
+			/* all found connections */
+		case F_Connection:
+			if (pcb_select_connection(PCB, pcb_false)) {
+				pcb_draw();
+				pcb_undo_inc_serial();
+				pcb_board_set_changed_flag(pcb_true);
+			}
+			break;
+
+		default:
+			PCB_ACT_FAIL(Unselect);
+			break;
+
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t select_action_list[] = {
+	{"Select", pcb_act_Select, pcb_acth_Select, pcb_acts_Select},
+	{"Unselect", pcb_act_Unselect, pcb_acth_Unselect, pcb_acts_Unselect}
+};
+
+PCB_REGISTER_ACTIONS(select_action_list, NULL)
Index: tags/2.0.1/src/stub_draw.c
===================================================================
--- tags/2.0.1/src/stub_draw.c	(nonexistent)
+++ tags/2.0.1/src/stub_draw.c	(revision 18980)
@@ -0,0 +1,99 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+#include "stub_draw.h"
+#include "obj_text.h"
+#include "obj_text_draw.h"
+
+/****** common code ******/
+void dummy_draw_text(pcb_hid_gc_t gc, const char *str)
+{
+	pcb_text_t t;
+
+	pcb_gui->set_color(gc, "#FF0000");
+
+	t.X = 0;
+	t.Y = 0;
+	t.TextString = (char *)str;
+	t.Direction = 0;
+	t.fid = 0; /* use the default font */
+	t.Scale = 150;
+	t.Flags = pcb_no_flags();
+	pcb_text_draw_(&t, 0, 0, PCB_TXT_TINY_ACCURATE);
+}
+
+static pcb_bool dummy_mouse(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
+{
+	return 0;
+}
+
+
+/****** fab ******/
+
+int dummy_DrawFab_overhang(void)
+{
+	return 0;
+}
+
+void dummy_DrawFab(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	dummy_draw_text(gc, "Can't render the fab layer: the draw_fab plugin is not compiled and/or not loaded");
+}
+
+int (*pcb_stub_draw_fab_overhang)(void) = dummy_DrawFab_overhang;
+void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e) = dummy_DrawFab;
+
+
+/****** csect - cross section of the board ******/
+
+
+static void dummy_draw_csect(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	dummy_draw_text(gc, "Can't render the fab layer: the draw_csect plugin is not compiled and/or not loaded");
+}
+
+
+void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e) = dummy_draw_csect;
+pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) = dummy_mouse;
+
+
+/****** font selector GUI ******/
+static void dummy_draw_fontsel(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	dummy_draw_text(gc, "Can't render the font selector: the draw_fontsel plugin is not compiled and/or not loaded");
+}
+
+static pcb_text_t *dummy_fontsel_text = NULL;
+static pcb_layer_t *dummy_fontsel_layer = NULL;
+static int dummy_fontsel_type = 0;
+
+void (*pcb_stub_draw_fontsel)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e) = dummy_draw_fontsel;
+pcb_bool (*pcb_stub_draw_fontsel_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y) = dummy_mouse;
+pcb_text_t **pcb_stub_draw_fontsel_text_obj = &dummy_fontsel_text;
+pcb_layer_t **pcb_stub_draw_fontsel_layer_obj = &dummy_fontsel_layer;
+int *pcb_stub_draw_fontsel_text_type = &dummy_fontsel_type;
Index: tags/2.0.1/src/stub_draw.h
===================================================================
--- tags/2.0.1/src/stub_draw.h	(nonexistent)
+++ tags/2.0.1/src/stub_draw.h	(revision 18980)
@@ -0,0 +1,53 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* drawing the fab layer is a plugin now */
+
+#ifndef PCB_STUB_DRAW_FAB_H
+#define PCB_STUB_DRAW_FAB_H
+
+#include "hid.h"
+#include "pcb_bool.h"
+#include "global_typedefs.h"
+
+/* fab */
+extern int (*pcb_stub_draw_fab_overhang)(void);
+extern void (*pcb_stub_draw_fab)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e);
+
+/* csect */
+extern void (*pcb_stub_draw_csect)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e);
+extern pcb_bool (*pcb_stub_draw_csect_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y);
+
+/* fontsel */
+extern void (*pcb_stub_draw_fontsel)(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e);
+extern pcb_bool (*pcb_stub_draw_fontsel_mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y);
+extern pcb_text_t **pcb_stub_draw_fontsel_text_obj;
+extern pcb_layer_t **pcb_stub_draw_fontsel_layer_obj;
+extern int *pcb_stub_draw_fontsel_text_type;
+
+#endif
Index: tags/2.0.1/src/stub_mincut.c
===================================================================
--- tags/2.0.1/src/stub_mincut.c	(nonexistent)
+++ tags/2.0.1/src/stub_mincut.c	(revision 18980)
@@ -0,0 +1,45 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include "stub_mincut.h"
+#include "obj_common.h"
+
+static void stub_rat_proc_shorts_dummy(void)
+{
+}
+
+static void stub_rat_found_short_dummy(pcb_any_obj_t *term, const char *with_net)
+{
+	/* original behavior: just warn at random pins/pads */
+	PCB_FLAG_SET(PCB_FLAG_WARN, term);
+
+	stub_rat_proc_shorts_dummy();
+}
+
+void (*pcb_stub_rat_found_short)(pcb_any_obj_t *term, const char *with_net) = stub_rat_found_short_dummy;
+void (*pcb_stub_rat_proc_shorts)(void) = stub_rat_proc_shorts_dummy;
Index: tags/2.0.1/src/stub_mincut.h
===================================================================
--- tags/2.0.1/src/stub_mincut.h	(nonexistent)
+++ tags/2.0.1/src/stub_mincut.h	(revision 18980)
@@ -0,0 +1,31 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "global_typedefs.h"
+
+extern void (*pcb_stub_rat_found_short)(pcb_any_obj_t *term, const char *with_net);
+extern void (*pcb_stub_rat_proc_shorts)(void);
+
Index: tags/2.0.1/src/stub_stroke.c
===================================================================
--- tags/2.0.1/src/stub_stroke.c	(nonexistent)
+++ tags/2.0.1/src/stub_stroke.c	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "error.h"
+#include "config.h"
+#include "pcb_bool.h"
+
+pcb_bool pcb_mid_stroke = pcb_false;
+
+/* Warn if gesture is wider or higher than this amount of coords (2mm) */
+#define MIN_CDIFF 2*1000000
+
+/* Warn only once, for large gestures */
+static pcb_bool far = pcb_false, warned = pcb_false;
+static pcb_coord_t x1 = -1, y1;
+
+static void stub_stroke_record_dummy(pcb_coord_t ev_x, pcb_coord_t ev_y)
+{
+	if (x1 < 0) {
+		x1 = ev_x;
+		y1 = ev_y;
+	}
+	else {
+		pcb_coord_t d;
+
+		d = x1 - ev_x;
+		if (d < 0) d = -d;
+		if (d > MIN_CDIFF) far = pcb_true;
+
+		d = y1 - ev_y;
+		if (d < 0) d = -d;
+		if (d > MIN_CDIFF) far = pcb_true;
+	}
+}
+
+static void stub_stroke_start_dummy(void)
+{
+	pcb_mid_stroke = pcb_true;
+}
+
+static int stub_stroke_finish_dummy(void)
+{
+	if (far) {
+		if (!warned) {
+			pcb_message(PCB_MSG_WARNING, "No gesture recognition, can not use libstroke: not compiled as a buildin and not loaded as a plugin\n");
+			warned = pcb_true;
+		}
+	}
+	pcb_mid_stroke = pcb_false;
+	x1 = -1;
+
+	return -1;
+}
+
+void (*pcb_stub_stroke_record)(pcb_coord_t ev_x, pcb_coord_t ev_y) = stub_stroke_record_dummy;
+void (*pcb_stub_stroke_start)(void) = stub_stroke_start_dummy;
+
+/* Returns 0 on success (gesture recognized) */
+int (*pcb_stub_stroke_finish)(void) = stub_stroke_finish_dummy;
Index: tags/2.0.1/src/stub_stroke.h
===================================================================
--- tags/2.0.1/src/stub_stroke.h	(nonexistent)
+++ tags/2.0.1/src/stub_stroke.h	(revision 18980)
@@ -0,0 +1,30 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+extern pcb_bool pcb_mid_stroke;
+extern void (*pcb_stub_stroke_record)(pcb_coord_t ev_x, pcb_coord_t ev_y);
+extern void (*pcb_stub_stroke_start)(void);
+extern int (*pcb_stub_stroke_finish)(void);
Index: tags/2.0.1/src/thermal.c
===================================================================
--- tags/2.0.1/src/thermal.c	(nonexistent)
+++ tags/2.0.1/src/thermal.c	(revision 18980)
@@ -0,0 +1,808 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "thermal.h"
+
+#include "compat_misc.h"
+#include "data.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "obj_pinvia_therm.h"
+#include "polygon.h"
+
+pcb_cardinal_t pcb_themal_style_new2old(unsigned char t)
+{
+	switch(t) {
+		case 0: return 0;
+		case PCB_THERMAL_ON | PCB_THERMAL_SHARP | PCB_THERMAL_DIAGONAL: return 1;
+		case PCB_THERMAL_ON | PCB_THERMAL_SHARP: return 2;
+		case PCB_THERMAL_ON | PCB_THERMAL_SOLID: return 3;
+		case PCB_THERMAL_ON | PCB_THERMAL_ROUND | PCB_THERMAL_DIAGONAL: return 4;
+		case PCB_THERMAL_ON | PCB_THERMAL_ROUND: return 5;
+	}
+	return 0;
+}
+
+unsigned char pcb_themal_style_old2new(pcb_cardinal_t t)
+{
+	switch(t) {
+		case 0: return 0;
+		case 1: return PCB_THERMAL_ON | PCB_THERMAL_SHARP | PCB_THERMAL_DIAGONAL;
+		case 2: return PCB_THERMAL_ON | PCB_THERMAL_SHARP;
+		case 3: return PCB_THERMAL_ON | PCB_THERMAL_SOLID;
+		case 4: return PCB_THERMAL_ON | PCB_THERMAL_ROUND | PCB_THERMAL_DIAGONAL;
+		case 5: return PCB_THERMAL_ON | PCB_THERMAL_ROUND;
+	}
+	return 0;
+}
+
+pcb_thermal_t pcb_thermal_str2bits(const char *str)
+{
+	/* shape */
+	if (strcmp(str, "noshape") == 0) return PCB_THERMAL_NOSHAPE;
+	if (strcmp(str, "round") == 0)   return PCB_THERMAL_ROUND;
+	if (strcmp(str, "sharp") == 0)   return PCB_THERMAL_SHARP;
+	if (strcmp(str, "solid") == 0)   return PCB_THERMAL_SOLID;
+
+	/* orientation */
+	if (strcmp(str, "diag") == 0)   return PCB_THERMAL_DIAGONAL;
+
+	if (strcmp(str, "on") == 0)     return PCB_THERMAL_ON;
+
+	return 0;
+}
+
+const char *pcb_thermal_bits2str(pcb_thermal_t *bit)
+{
+	if ((*bit) & PCB_THERMAL_ON) {
+		*bit &= ~PCB_THERMAL_ON;
+		return "on";
+	}
+	if ((*bit) & PCB_THERMAL_DIAGONAL) {
+		*bit &= ~PCB_THERMAL_DIAGONAL;
+		return "diag";
+	}
+	if ((*bit) & 3) {
+		int shape = (*bit) & 3;
+		*bit &= ~3;
+		switch(shape) {
+			case PCB_THERMAL_NOSHAPE: return "noshape";
+			case PCB_THERMAL_ROUND: return "round";
+			case PCB_THERMAL_SHARP: return "sharp";
+			case PCB_THERMAL_SOLID: return "solid";
+			default: return NULL;
+		}
+	}
+	return NULL;
+}
+
+
+/* generate a round-cap line polygon */
+static pcb_polyarea_t *pa_line_at(double x1, double y1, double x2, double y2, pcb_coord_t clr, pcb_bool square)
+{
+	pcb_line_t ltmp;
+
+	if (square)
+		ltmp.Flags = pcb_flag_make(PCB_FLAG_SQUARE);
+	else
+		ltmp.Flags = pcb_no_flags();
+	ltmp.Point1.X = pcb_round(x1); ltmp.Point1.Y = pcb_round(y1);
+	ltmp.Point2.X = pcb_round(x2); ltmp.Point2.Y = pcb_round(y2);
+	return pcb_poly_from_line(&ltmp, clr);
+}
+
+/* generate a round-cap arc polygon knowing the center and endpoints */
+static pcb_polyarea_t *pa_arc_at(double cx, double cy, double r, double e1x, double e1y, double e2x, double e2y, pcb_coord_t clr, double max_span_angle)
+{
+	double sa, ea, da;
+	pcb_arc_t atmp;
+
+	sa = atan2(-(e1y - cy), e1x - cx) * PCB_RAD_TO_DEG + 180.0;
+	ea = atan2(-(e2y - cy), e2x - cx) * PCB_RAD_TO_DEG + 180.0;
+
+/*	pcb_trace("sa=%f ea=%f diff=%f\n", sa, ea, ea-sa);*/
+
+	atmp.Flags = pcb_no_flags();
+	atmp.X = pcb_round(cx);
+	atmp.Y = pcb_round(cy);
+
+	da = ea-sa;
+	if ((da < max_span_angle) && (da > -max_span_angle)) {
+		atmp.StartAngle = sa;
+		atmp.Delta = ea-sa;
+	}
+	else {
+		if (ea < sa) {
+			double tmp = ea;
+			ea = sa;
+			sa = tmp;
+		}
+		atmp.StartAngle = ea;
+		atmp.Delta = 360-ea+sa;
+	}
+	atmp.Width = atmp.Height = r;
+	return pcb_poly_from_arc(&atmp, clr);
+}
+
+pcb_polyarea_t *pcb_thermal_area_line(pcb_board_t *pcb, pcb_line_t *line, pcb_layer_id_t lid)
+{
+	pcb_polyarea_t *pa, *pb, *pc;
+	double dx, dy, len, vx, vy, nx, ny, clr, clrth, x1, y1, x2, y2, mx, my;
+	pcb_coord_t th;
+
+	if ((line->Point1.X == line->Point2.X) && (line->Point1.Y == line->Point2.Y)) {
+		/* conrer case zero-long line is a circle: do the same as for vias */
+#warning thermal TODO
+		abort();
+	}
+
+	x1 = line->Point1.X;
+	y1 = line->Point1.Y;
+	x2 = line->Point2.X;
+	y2 = line->Point2.Y;
+	mx = (x1+x2)/2.0;
+	my = (y1+y2)/2.0;
+	dx = x1 - x2;
+	dy = y1 - y2;
+
+	len = sqrt(dx*dx + dy*dy);
+	vx = dx / len;
+	vy = dy / len;
+	nx = -vy;
+	ny = vx;
+
+	clr = line->Clearance/2;
+	clrth = (line->Clearance/2 + line->Thickness) / 2;
+
+	assert(line->thermal & PCB_THERMAL_ON); /* caller should have checked this */
+	switch(line->thermal & 3) {
+		case PCB_THERMAL_NOSHAPE:
+		case PCB_THERMAL_SOLID: return 0;
+
+		case PCB_THERMAL_ROUND:
+			if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, line)) {
+
+				if (line->thermal & PCB_THERMAL_DIAGONAL) {
+					/* side clear lines */
+					pa = pa_line_at(
+						x1 - clrth * nx + clrth * vx - clr*vx, y1 - clrth * ny + clrth * vy - clr*vy,
+						x2 - clrth * nx - clrth * vx + clr*vx, y2 - clrth * ny - clrth * vy + clr*vy,
+						clr, pcb_false);
+					pb = pa_line_at(
+						x1 + clrth * nx + clrth * vx - clr*vx, y1 + clrth * ny + clrth * vy - clr*vy,
+						x2 + clrth * nx - clrth * vx + clr*vx, y2 + clrth * ny - clrth * vy + clr*vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* cross clear lines */
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x1 - clrth * nx + clrth * vx + clr*nx, y1 - clrth * ny + clrth * vy + clr*ny,
+						x1 + clrth * nx + clrth * vx - clr*nx, y1 + clrth * ny + clrth * vy - clr*ny,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x2 - clrth * nx - clrth * vx + clr*nx, y2 - clrth * ny - clrth * vy + clr*ny,
+						x2 + clrth * nx - clrth * vx - clr*nx, y2 + clrth * ny - clrth * vy - clr*ny,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+				}
+				else {
+					/* side clear lines */
+					pa = pa_line_at(
+						x1 - clrth * nx + clrth * vx, y1 - clrth * ny + clrth * vy,
+						mx - clrth * nx + clr * vx, my - clrth * ny + clr * vy,
+						clr, pcb_false);
+					pb = pa_line_at(
+						x1 + clrth * nx + clrth * vx, y1 + clrth * ny + clrth * vy,
+						mx + clrth * nx + clr * vx, my + clrth * ny + clr * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x2 - clrth * nx - clrth * vx, y2 - clrth * ny - clrth * vy,
+						mx - clrth * nx - clr * vx, my - clrth * ny - clr * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x2 + clrth * nx - clrth * vx, y2 + clrth * ny - clrth * vy,
+						mx + clrth * nx - clr * vx, my + clrth * ny - clr * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* cross clear lines */
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x1 - clrth * nx + clrth * vx, y1 - clrth * ny + clrth * vy,
+						x1 - clr * nx + clrth * vx, y1 - clr * ny + clrth * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x1 + clrth * nx + clrth * vx, y1 + clrth * ny + clrth * vy,
+						x1 + clr * nx + clrth * vx, y1 + clr * ny + clrth * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x2 - clrth * nx - clrth * vx, y2 - clrth * ny - clrth * vy,
+						x2 - clr * nx - clrth * vx, y2 - clr * ny - clrth * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						x2 + clrth * nx - clrth * vx, y2 + clrth * ny - clrth * vy,
+						x2 + clr * nx - clrth * vx, y2 + clr * ny - clrth * vy,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+				}
+			}
+			else {
+				/* round cap line: arcs! */
+				if (line->thermal & PCB_THERMAL_DIAGONAL) {
+					/* side clear lines */
+					pa = pa_line_at(
+						x1 - clrth * nx - clr * vx * 0.75, y1 - clrth * ny - clr * vy * 0.75,
+						x2 - clrth * nx + clr * vx * 0.75, y2 - clrth * ny + clr * vy * 0.75,
+						clr, pcb_false);
+					pb = pa_line_at(
+						x1 + clrth * nx - clr * vx * 0.75, y1 + clrth * ny - clr * vy * 0.75,
+						x2 + clrth * nx + clr * vx * 0.75, y2 + clrth * ny + clr * vy * 0.75,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* x1;y1 cap arc */
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x1, y1, clrth,
+						x1 - clrth * nx + clr * vx * 2.0, y1 - clrth * ny + clr * vy * 2.0,
+						x1 + clrth * nx + clr * vx * 2.0, y1 + clrth * ny + clr * vy * 2.0,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* x2;y2 cap arc */
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x2, y2, clrth,
+						x2 - clrth * nx - clr * vx * 2.0, y2 - clrth * ny - clr * vy * 2.0,
+						x2 + clrth * nx - clr * vx * 2.0, y2 + clrth * ny - clr * vy * 2.0,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+				}
+				else { /* non-diagonal */
+					/* split side lines */
+					pa = pa_line_at(
+						x1 - clrth * nx - clr * vx * 0.00, y1 - clrth * ny - clr * vy * 0.00,
+						mx - clrth * nx + clr * vx * 1.00, my - clrth * ny + clr * vy * 1.00,
+						clr, pcb_false);
+					pb = pa_line_at(
+						x1 + clrth * nx - clr * vx * 0.00, y1 + clrth * ny - clr * vy * 0.00,
+						mx + clrth * nx + clr * vx * 1.00, my + clrth * ny + clr * vy * 1.00,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						mx - clrth * nx - clr * vx * 1.00, my - clrth * ny - clr * vy * 1.00,
+						x2 - clrth * nx + clr * vx * 0.00, y2 - clrth * ny + clr * vy * 0.00,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_line_at(
+						mx + clrth * nx - clr * vx * 1.00, my + clrth * ny - clr * vy * 1.00,
+						x2 + clrth * nx + clr * vx * 0.00, y2 + clrth * ny + clr * vy * 0.00,
+						clr, pcb_false);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* split round cap, x1;y1 */
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x1, y1, clrth,
+						x1 - clrth * nx, y1 - clrth * ny,
+						x1 + clrth * vx - clr * nx, y1 + clrth * vy - clr * ny,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x1, y1, clrth,
+						x1 + clrth * nx, y1 + clrth * ny,
+						x1 + clrth * vx + clr * nx, y1 + clrth * vy + clr * ny,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					/* split round cap, x2;y2 */
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x2, y2, clrth,
+						x2 - clrth * nx, y2 - clrth * ny,
+						x2 - clrth * vx - clr * nx, y2 - clrth * vy - clr * ny,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+
+					pa = pc; pc = NULL;
+					pb = pa_arc_at(x2, y2, clrth,
+						x2 + clrth * nx, y2 + clrth * ny,
+						x2 - clrth * vx + clr * nx, y2 - clrth * vy + clr * ny,
+						clr, 180.0);
+					pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_UNITE);
+				}
+			}
+			return pc;
+		case PCB_THERMAL_SHARP:
+			pa = pcb_poly_from_line(line, line->Thickness + line->Clearance);
+			th = line->Thickness/2 < clr ? line->Thickness/2 : clr;
+			clrth *= 2;
+			if (line->thermal & PCB_THERMAL_DIAGONAL) {
+				/* x1;y1 V-shape */
+				pb = pa_line_at(x1, y1, x1-nx*clrth+vx*clrth, y1-ny*clrth+vy*clrth, th, pcb_false);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+
+				pa = pc; pc = NULL;
+				pb = pa_line_at(x1, y1, x1+nx*clrth+vx*clrth, y1+ny*clrth+vy*clrth, th, pcb_false);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+
+				/* x2;y2 V-shape */
+				pa = pc; pc = NULL;
+				pb = pa_line_at(x2, y2, x2-nx*clrth-vx*clrth, y2-ny*clrth-vy*clrth, th, pcb_false);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+
+				pa = pc; pc = NULL;
+				pb = pa_line_at(x2, y2, x2+nx*clrth-vx*clrth, y2+ny*clrth-vy*clrth, th, pcb_false);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+			}
+			else {
+				/* perpendicular */
+				pb = pa_line_at(mx-nx*clrth, my-ny*clrth, mx+nx*clrth, my+ny*clrth, th, pcb_true);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+
+				/* straight */
+				pa = pc; pc = NULL;
+				pb = pa_line_at(x1+vx*clrth, y1+vy*clrth, x2-vx*clrth, y2-vy*clrth, th, pcb_true);
+				pcb_polyarea_boolean_free(pa, pb, &pc, PCB_PBO_SUB);
+			}
+			return pc;
+	}
+	return NULL;
+}
+
+/* combine a base poly-area into the result area (pres) */
+static void polytherm_base(pcb_polyarea_t **pres, const pcb_polyarea_t *src)
+{
+	pcb_polyarea_t *p;
+
+	if (*pres != NULL) {
+		pcb_polyarea_boolean(src, *pres, &p, PCB_PBO_UNITE);
+		pcb_polyarea_free(pres);
+		*pres = p;
+	}
+	else
+		pcb_polyarea_copy0(pres, src);
+}
+
+#define CONG_MAX 256
+
+static int cong_map(char *cong, pcb_poly_it_t *it, pcb_coord_t clr)
+{
+	int n, go, first = 1;
+	pcb_coord_t cx, cy;
+	double cl2 = (double)clr * (double)clr * 1.5;
+	double px, py, x, y;
+
+	for(n = 0, go = pcb_poly_vect_first(it, &cx, &cy); go; go = pcb_poly_vect_next(it, &cx, &cy), n++) {
+		x = cx; y = cy;
+		if (first) {
+/*pcb_trace("prev %mm;%mm\n", cx, cy);*/
+			pcb_poly_vect_peek_prev(it, &cx, &cy);
+/*pcb_trace("     %mm;%mm\n", cx, cy);*/
+			px = cx; py = cy;
+			first = 0;
+		}
+		if (n >= CONG_MAX-1) {
+			n++;
+			break;
+		}
+		cong[n] = (pcb_distance2(x, y, px, py) < cl2);
+		px = x; py = y;
+	}
+	return n;
+}
+
+/* combine a round clearance line set into pres; "it" is an iterator
+   already initialized to a polyarea contour */
+static void polytherm_round(pcb_polyarea_t **pres, pcb_poly_it_t *it, pcb_coord_t clr, pcb_bool is_diag)
+{
+	pcb_polyarea_t *ptmp, *p;
+	double fact = 0.5, fact_ortho=0.75;
+	pcb_coord_t cx, cy;
+	double px, py, x, y, dx, dy, vx, vy, nx, ny, mx, my, len;
+	int n, go, first = 1;
+	char cong[CONG_MAX];
+
+	clr -= 2;
+
+	cong_map(cong, it, clr);
+
+	/* iterate over the vectors of the contour */
+	for(n = 0, go = pcb_poly_vect_first(it, &cx, &cy); go; go = pcb_poly_vect_next(it, &cx, &cy), n++) {
+		x = cx; y = cy;
+		if (first) {
+			pcb_poly_vect_peek_prev(it, &cx, &cy);
+			px = cx; py = cy;
+
+			first = 0;
+		}
+
+/*pcb_trace("[%d] %d %mm;%mm\n", n, cong[n], (pcb_coord_t)x, (pcb_coord_t)y);*/
+
+
+		dx = x - px;
+		dy = y - py;
+		mx = (x+px)/2.0;
+		my = (y+py)/2.0;
+
+		len = sqrt(dx*dx + dy*dy);
+		vx = dx / len;
+		vy = dy / len;
+
+		nx = -vy;
+		ny = vx;
+
+		/* skip points too dense */
+		if ((n >= CONG_MAX) || (cong[n])) {
+			if (!is_diag) {
+				/* have to draw a short clearance for the small segments */
+				ptmp = pa_line_at(x - nx * clr/2, y - ny * clr/2, px - nx * clr/2, py - ny * clr/2, clr+4, pcb_false);
+
+				pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+				pcb_polyarea_free(pres);
+				pcb_polyarea_free(&ptmp);
+				*pres = p;
+			}
+			px = x; py = y;
+			continue;
+		}
+
+		/* cheat: clr-2+4 to guarantee some overlap with the poly cutout */
+		if (is_diag) {
+			/* one line per edge, slightly shorter than the edge */
+			ptmp = pa_line_at(x - vx * clr * fact - nx * clr/2, y - vy * clr * fact - ny * clr/2, px + vx * clr *fact - nx * clr/2, py + vy * clr * fact - ny * clr/2, clr+4, pcb_false);
+
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		else {
+			/* two half lines per edge */
+			ptmp = pa_line_at(x - nx * clr/2 , y - ny * clr/2, mx + vx * clr * fact_ortho - nx * clr/2, my + vy * clr * fact_ortho - ny * clr/2, clr+4, pcb_false);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+
+			ptmp = pa_line_at(px - nx * clr/2, py - ny * clr/2, mx - vx * clr * fact_ortho - nx * clr/2, my - vy * clr * fact_ortho - ny * clr/2, clr+4, pcb_false);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+
+			/* optical tuning: make sure the clearance is large enough around corners
+			   even if lines didn't meet - just throw in a big circle */
+			ptmp = pcb_poly_from_circle(x, y, clr);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		px = x;
+		py = y;
+	}
+}
+
+static void polytherm_sharp(pcb_polyarea_t **pres, pcb_poly_it_t *it, pcb_coord_t clr, pcb_bool is_diag)
+{
+	pcb_polyarea_t *ptmp, *p;
+	pcb_coord_t cx, cy, x2c, y2c;
+	double px, py, x, y, dx, dy, vx, vy, nx, ny, mx, my, len, x2, y2, vx2, vy2, len2, dx2, dy2;
+	int n, go, first = 1;
+	char cong[CONG_MAX], cong2[CONG_MAX];
+
+	if (is_diag) {
+		int start = -1, v = cong_map(cong2, it, clr);
+		memset(cong, 1, sizeof(cong));
+
+		/* in case of sharp-diag, draw the bridge in the middle of each congestion;
+		   run *2 and do module v so congestions spanning over the end are no special */
+		for(n = 0; n < v*2; n++) {
+			if (cong2[n % v] == 0) {
+				if (start >= 0)
+					cong[((start+n)/2) % v] = 0;
+				start = n;
+			}
+		}
+	}
+	else {
+		/* normal congestion logic: use long edges only */
+		cong_map(cong, it, clr);
+	}
+
+	/* iterate over the vectors of the contour */
+	for(n = 0, go = pcb_poly_vect_first(it, &cx, &cy); go; go = pcb_poly_vect_next(it, &cx, &cy), n++) {
+		x = cx; y = cy;
+		if (first) {
+			pcb_poly_vect_peek_prev(it, &cx, &cy);
+			px = cx; py = cy;
+			first = 0;
+		}
+
+/*pcb_trace("[%d] %d %mm;%mm\n", n, cong[n], (pcb_coord_t)x, (pcb_coord_t)y);*/
+
+		/* skip points too dense */
+		if ((n >= CONG_MAX) || (cong[n])) {
+			px = x; py = y;
+			continue;
+		}
+
+
+		dx = x - px;
+		dy = y - py;
+
+		len = sqrt(dx*dx + dy*dy);
+		vx = dx / len;
+		vy = dy / len;
+
+		if (is_diag) {
+			pcb_poly_vect_peek_next(it, &x2c, &y2c);
+			x2 = x2c; y2 = y2c;
+			dx2 = x - x2;
+			dy2 = y - y2;
+			len2 = sqrt(dx2*dx2 + dy2*dy2);
+			vx2 = dx2 / len2;
+			vy2 = dy2 / len2;
+
+			nx = -(vy2 - vy);
+			ny = vx2 - vx;
+
+			/* line from each corner at the average angle of the two edges from the corner */
+			ptmp = pa_line_at(x-nx*clr*0.2, y-ny*clr*0.2, x + nx*clr*4, y + ny*clr*4, clr/2, pcb_false);
+			pcb_polyarea_boolean(*pres, ptmp, &p, PCB_PBO_SUB);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		else {
+			nx = -vy;
+			ny = vx;
+			mx = (x+px)/2.0;
+			my = (y+py)/2.0;
+
+			/* perpendicular line from the middle of each edge */
+			ptmp = pa_line_at(mx, my, mx - nx*clr, my - ny*clr, clr/2, pcb_true);
+			pcb_polyarea_boolean(*pres, ptmp, &p, PCB_PBO_SUB);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		px = x;
+		py = y;
+	}
+}
+
+/* generate round thermal around a polyarea specified by the iterator */
+static void pcb_thermal_area_pa_round(pcb_polyarea_t **pres, pcb_poly_it_t *it, pcb_coord_t clr, pcb_bool_t is_diag)
+{
+	pcb_pline_t *pl;
+
+/* cut out the poly so terminals will be displayed proerply */
+	polytherm_base(pres, it->pa);
+
+	/* generate the clear-lines */
+	pl = pcb_poly_contour(it);
+	if (pl != NULL)
+		polytherm_round(pres, it, clr, is_diag);
+}
+
+/* generate sharp thermal around a polyarea specified by the iterator */
+static void pcb_thermal_area_pa_sharp(pcb_polyarea_t **pres, pcb_poly_it_t *it, pcb_coord_t clr, pcb_bool_t is_diag)
+{
+	pcb_pline_t *pl;
+
+	/* add the usual clearance glory around the polygon */
+	pcb_poly_pa_clearance_construct(pres, it, clr);
+
+	pl = pcb_poly_contour(it);
+	if (pl != NULL)
+		polytherm_sharp(pres, it, clr, is_diag);
+
+	/* trim internal stubs */
+	polytherm_base(pres, it->pa);
+}
+
+pcb_polyarea_t *pcb_thermal_area_poly(pcb_board_t *pcb, pcb_poly_t *poly, pcb_layer_id_t lid)
+{
+	pcb_polyarea_t *pa, *pres = NULL;
+	pcb_coord_t clr = poly->Clearance/2;
+	pcb_poly_it_t it;
+
+	assert(poly->thermal & PCB_THERMAL_ON); /* caller should have checked this */
+	switch(poly->thermal & 3) {
+		case PCB_THERMAL_NOSHAPE:
+		case PCB_THERMAL_SOLID: return NULL;
+
+		case PCB_THERMAL_ROUND:
+			for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it))
+				pcb_thermal_area_pa_round(&pres, &it, clr, (poly->thermal & PCB_THERMAL_DIAGONAL));
+			return pres;
+
+		case PCB_THERMAL_SHARP:
+			for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it))
+				pcb_thermal_area_pa_sharp(&pres, &it, clr, (poly->thermal & PCB_THERMAL_DIAGONAL));
+			return pres;
+	}
+
+	return NULL;
+}
+
+/* Generate a clearance around a padstack shape, with no thermal */
+static pcb_polyarea_t *pcb_thermal_area_pstk_nothermal(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_id_t lid, pcb_pstk_shape_t *shp, pcb_coord_t clearance)
+{
+	pcb_poly_it_t it;
+	pcb_polyarea_t *pres = NULL;
+
+	switch(shp->shape) {
+		case PCB_PSSH_CIRC:
+			return pcb_poly_from_circle(ps->x + shp->data.circ.x, ps->y + shp->data.circ.y, shp->data.circ.dia/2 + clearance);
+		case PCB_PSSH_LINE:
+			return pa_line_at(ps->x + shp->data.line.x1, ps->y + shp->data.line.y1, ps->x + shp->data.line.x2, ps->y + shp->data.line.y2, shp->data.line.thickness + clearance*2, shp->data.line.square);
+		case PCB_PSSH_POLY:
+			if (shp->data.poly.pa == NULL)
+				pcb_pstk_shape_update_pa(&shp->data.poly);
+			if (shp->data.poly.pa == NULL)
+				return NULL;
+			pcb_poly_iterate_polyarea(shp->data.poly.pa, &it);
+			pcb_poly_pa_clearance_construct(&pres, &it, clearance);
+			pcb_polyarea_move(pres, ps->x, ps->y);
+			return pres;
+	}
+	return NULL;
+}
+
+pcb_polyarea_t *pcb_thermal_area_pstk(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_id_t lid)
+{
+	unsigned char thr;
+	pcb_pstk_shape_t *shp;
+	pcb_polyarea_t *pres = NULL;
+	pcb_layer_t *layer = pcb_get_layer(pcb->Data, lid);
+	pcb_coord_t clearance = ps->Clearance;
+
+	/* if we have no clearance, there's no reason to do anything;
+	   ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */
+	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps))
+		return NULL;
+
+	/* retrieve shape; assume 0 (no shape) for layers not named */
+	if (lid < ps->thermals.used)
+		thr = ps->thermals.shape[lid];
+	else
+		thr = 0;
+
+	shp = pcb_pstk_shape_at(pcb, ps, layer);
+	if (shp == NULL)
+		return NULL;
+
+	if (clearance <= 0)
+		clearance = shp->clearance/2;
+
+	if (clearance <= 0)
+		return NULL;
+
+	if (!(thr & PCB_THERMAL_ON))
+		return pcb_thermal_area_pstk_nothermal(pcb, ps, lid, shp, clearance);
+
+	switch(thr & 3) {
+		case PCB_THERMAL_NOSHAPE:
+			{
+				pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+				return pcb_poly_from_circle(ps->x, ps->y, proto->hdia/2 + clearance);
+			}
+		case PCB_THERMAL_SOLID: return NULL;
+
+		case PCB_THERMAL_ROUND:
+		case PCB_THERMAL_SHARP:
+			switch(shp->shape) {
+				case PCB_PSSH_CIRC:
+					return ThermPoly_(pcb, ps->x + shp->data.circ.x, ps->y + shp->data.circ.y, shp->data.circ.dia, clearance*2, pcb_themal_style_new2old(thr));
+				case PCB_PSSH_LINE:
+				{
+					pcb_line_t ltmp;
+					if (shp->data.line.square)
+						ltmp.Flags = pcb_flag_make(PCB_FLAG_SQUARE);
+					else
+						ltmp.Flags = pcb_no_flags();
+					ltmp.Point1.X = ps->x + shp->data.line.x1;
+					ltmp.Point1.Y = ps->y + shp->data.line.y1;
+					ltmp.Point2.X = ps->x + shp->data.line.x2;
+					ltmp.Point2.Y = ps->y + shp->data.line.y2;
+					ltmp.Thickness = shp->data.line.thickness;
+					ltmp.Clearance = clearance*2;
+					ltmp.thermal = thr;
+					pres = pcb_thermal_area_line(pcb, &ltmp, lid);
+				}
+				return pres;
+
+				case PCB_PSSH_POLY:
+				{
+					pcb_poly_it_t it;
+					if (shp->data.poly.pa == NULL)
+						pcb_pstk_shape_update_pa(&shp->data.poly);
+					if (shp->data.poly.pa == NULL)
+						return NULL;
+					pcb_poly_iterate_polyarea(shp->data.poly.pa, &it);
+					if (thr & PCB_THERMAL_ROUND)
+						pcb_thermal_area_pa_round(&pres, &it, clearance, (thr & PCB_THERMAL_DIAGONAL));
+					else
+						pcb_thermal_area_pa_sharp(&pres, &it, clearance, (thr & PCB_THERMAL_DIAGONAL));
+
+					if (pres != NULL)
+						pcb_polyarea_move(pres, ps->x, ps->y);
+				}
+				return pres;
+			}
+
+	}
+
+	return NULL;
+}
+
+pcb_polyarea_t *pcb_thermal_area(pcb_board_t *pcb, pcb_any_obj_t *obj, pcb_layer_id_t lid)
+{
+	switch(obj->type) {
+
+		case PCB_OBJ_LINE:
+			return pcb_thermal_area_line(pcb, (pcb_line_t *)obj, lid);
+
+		case PCB_OBJ_POLY:
+			return pcb_thermal_area_poly(pcb, (pcb_poly_t *)obj, lid);
+
+		case PCB_OBJ_PSTK:
+			return pcb_thermal_area_pstk(pcb, (pcb_pstk_t *)obj, lid);
+
+		case PCB_OBJ_ARC:
+			break;
+
+		default: break;
+	}
+
+	return NULL;
+}
+
Index: tags/2.0.1/src/thermal.h
===================================================================
--- tags/2.0.1/src/thermal.h	(nonexistent)
+++ tags/2.0.1/src/thermal.h	(revision 18980)
@@ -0,0 +1,65 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_THERMAL_H
+#define PCB_THERMAL_H
+
+#include "obj_common.h"
+#include "layer.h"
+
+typedef enum pcb_thermal_e {
+	/* bit 0 and 1: shape */
+	PCB_THERMAL_NOSHAPE = 0,  /* padstack: no shape shall be drawn, omit copper, no connection */
+	PCB_THERMAL_ROUND = 1,
+	PCB_THERMAL_SHARP = 2,
+	PCB_THERMAL_SOLID = 3,
+
+	/* bit 2: orientation */
+	PCB_THERMAL_DIAGONAL = 4,
+
+	/* bit 3: do we have a thermal at all? */
+	PCB_THERMAL_ON = 8
+} pcb_thermal_t;
+
+/* convert the textual version of thermal to a bitmask */
+pcb_thermal_t pcb_thermal_str2bits(const char *str);
+
+/* convert a bitmask to a single word of thermal description and remove the
+   affected bits from bits. Call this repeatedly until bits == 0 to get
+   all words. */
+const char *pcb_thermal_bits2str(pcb_thermal_t *bits);
+
+
+pcb_polyarea_t *pcb_thermal_area(pcb_board_t *p, pcb_any_obj_t *obj, pcb_layer_id_t lid);
+pcb_polyarea_t *pcb_thermal_area_line(pcb_board_t *pcb, pcb_line_t *line, pcb_layer_id_t lid);
+pcb_polyarea_t *pcb_thermal_area_poly(pcb_board_t *pcb, pcb_poly_t *poly, pcb_layer_id_t lid);
+pcb_polyarea_t *pcb_thermal_area_pstk(pcb_board_t *pcb, pcb_pstk_t *ps, pcb_layer_id_t lid);
+
+unsigned char pcb_themal_style_old2new(pcb_cardinal_t t);
+pcb_cardinal_t pcb_themal_style_new2old(unsigned char t);
+
+
+#endif
Index: tags/2.0.1/src/tool.c
===================================================================
--- tags/2.0.1/src/tool.c	(nonexistent)
+++ tags/2.0.1/src/tool.c	(revision 18980)
@@ -0,0 +1,420 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "tool.h"
+
+#include "board.h"
+#include "conf_core.h"
+#include "crosshair.h"
+#include "compat_nls.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "event.h"
+#include "find.h"
+#include "grid.h"
+#include "undo.h"
+#include "actions.h"
+
+
+pcb_toolid_t pcb_tool_prev_id;
+pcb_toolid_t pcb_tool_next_id;
+static int save_position = 0;
+static int save_stack[PCB_MAX_MODESTACK_DEPTH];
+
+static void default_tool_reg(void);
+static void default_tool_unreg(void);
+static void init_current_tool(void);
+static void uninit_current_tool(void);
+
+void pcb_tool_init(void)
+{
+	vtp0_init(&pcb_tools);
+	default_tool_reg(); /* temporary */
+}
+
+void pcb_tool_uninit(void)
+{
+	default_tool_unreg(); /* temporary */
+	while(vtp0_len(&pcb_tools) != 0) {
+		const pcb_tool_t *tool = pcb_tool_get(0);
+		pcb_message(PCB_MSG_WARNING, "Unregistered tool: %s of %s; check your plugins, fix them to unregister their tools!\n", tool->name, tool->cookie);
+		pcb_tool_unreg_by_cookie(tool->cookie);
+	}
+	vtp0_uninit(&pcb_tools);
+}
+
+int pcb_tool_reg(pcb_tool_t *tool, const char *cookie)
+{
+	if (pcb_tool_lookup(tool->name) != PCB_TOOLID_INVALID) /* don't register two tools with the same name */
+		return -1;
+	tool->cookie = cookie;
+	vtp0_append(&pcb_tools, (void *)tool);
+	return 0;
+}
+
+void pcb_tool_unreg_by_cookie(const char *cookie)
+{
+	pcb_toolid_t n;
+	for(n = 0; n < vtp0_len(&pcb_tools); n++) {
+		const pcb_tool_t *tool = (const pcb_tool_t *)pcb_tools.array[n];
+		if (tool->cookie == cookie) {
+			vtp0_remove(&pcb_tools, n, 1);
+			n--;
+		}
+	}
+}
+
+pcb_toolid_t pcb_tool_lookup(const char *name)
+{
+	pcb_toolid_t n;
+	for(n = 0; n < vtp0_len(&pcb_tools); n++) {
+		const pcb_tool_t *tool = (const pcb_tool_t *)pcb_tools.array[n];
+		if (strcmp(tool->name, name) == 0)
+			return n;
+	}
+	return PCB_TOOLID_INVALID;
+}
+
+int pcb_tool_select_by_name(const char *name)
+{
+	pcb_toolid_t id = pcb_tool_lookup(name);
+	if (id == PCB_TOOLID_INVALID)
+		return -1;
+	return pcb_tool_select_by_id(id);
+}
+
+int pcb_tool_select_by_id(pcb_toolid_t id)
+{
+	char id_s[32];
+	static pcb_bool recursing = pcb_false;
+	
+	if ((id < 0) || (id > vtp0_len(&pcb_tools)))
+		return -1;
+	
+	/* protect the cursor while changing the mode
+	 * perform some additional stuff depending on the new mode
+	 * reset 'state' of attached objects
+	 */
+	if (recursing)
+		return -1;
+	recursing = pcb_true;
+	
+	if (PCB->RatDraw && !pcb_tool_get(id)->allow_when_drawing_ratlines) {
+		pcb_message(PCB_MSG_WARNING, _("That mode is NOT allowed when drawing ratlines!\n"));
+		id = PCB_MODE_NO;
+	}
+	
+	pcb_tool_prev_id = conf_core.editor.mode;
+	pcb_tool_next_id = id;
+	uninit_current_tool();
+	sprintf(id_s, "%d", id);
+	conf_set(CFR_DESIGN, "editor/mode", -1, id_s, POL_OVERWRITE);
+	init_current_tool();
+
+	recursing = pcb_false;
+
+	/* force a crosshair grid update because the valid range
+	 * may have changed
+	 */
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair_move_relative(0, 0);
+	pcb_notify_crosshair_change(pcb_true);
+	return 0;
+}
+
+int pcb_tool_select_highest(void)
+{
+	pcb_toolid_t n, bestn = PCB_TOOLID_INVALID;
+	unsigned int bestp = -1;
+	for(n = 0; n < vtp0_len(&pcb_tools) && (bestp > 0); n++) {
+		const pcb_tool_t *tool = (const pcb_tool_t *)pcb_tools.array[n];
+		if (tool->priority < bestp) {
+			bestp = tool->priority;
+			bestn = n;
+		}
+	}
+	if (bestn == PCB_TOOLID_INVALID)
+		return -1;
+	return pcb_tool_select_by_id(bestn);
+}
+
+int pcb_tool_save(void)
+{
+	save_stack[save_position] = conf_core.editor.mode;
+	if (save_position < PCB_MAX_MODESTACK_DEPTH - 1)
+		save_position++;
+	else
+		return -1;
+	return 0;
+}
+
+int pcb_tool_restore(void)
+{
+	if (save_position == 0) {
+		pcb_message(PCB_MSG_ERROR, "hace: underflow of restore mode\n");
+		return -1;
+	}
+	return pcb_tool_select_by_id(save_stack[--save_position]);
+}
+
+/**** current tool function wrappers ****/
+#define wrap(func, err_ret, prefix, args) \
+	do { \
+		const pcb_tool_t *tool; \
+		if ((conf_core.editor.mode < 0) || (conf_core.editor.mode >= vtp0_len(&pcb_tools))) \
+			{ err_ret; } \
+		tool = (const pcb_tool_t *)pcb_tools.array[conf_core.editor.mode]; \
+		if (tool->func == NULL) \
+			{ err_ret; } \
+		prefix tool->func args; \
+	} while(0)
+
+#define wrap_void(func, args)           wrap(func, return,  ;,      args)
+#define wrap_retv(func, err_ret, args)  wrap(func, err_ret, return, args)
+
+static void init_current_tool(void)
+{
+	wrap_void(init, ());
+}
+
+static void uninit_current_tool(void)
+{
+	wrap_void(uninit, ());
+}
+
+void pcb_tool_notify_mode(void)
+{
+	wrap_void(notify_mode, ());
+}
+
+void pcb_tool_release_mode(void)
+{
+	wrap_void(release_mode, ());
+}
+
+void pcb_tool_adjust_attached_objects(void)
+{
+	wrap_void(adjust_attached_objects, ());
+}
+
+void pcb_tool_draw_attached(void)
+{
+	wrap_void(draw_attached, ());
+}
+
+pcb_bool pcb_tool_undo_act(void)
+{
+	wrap_retv(undo_act, return pcb_true, ());
+}
+
+pcb_bool pcb_tool_redo_act(void)
+{
+	wrap_retv(redo_act, return pcb_true, ());
+}
+
+
+/**** tool helper functions ****/
+
+pcb_tool_note_t pcb_tool_note;
+pcb_bool pcb_tool_is_saved = pcb_false;
+
+static void get_grid_lock_coordinates(int type, void *ptr1, void *ptr2, void *ptr3, pcb_coord_t * x, pcb_coord_t * y)
+{
+	switch (type) {
+	case PCB_OBJ_LINE:
+		*x = ((pcb_line_t *) ptr2)->Point1.X;
+		*y = ((pcb_line_t *) ptr2)->Point1.Y;
+		break;
+	case PCB_OBJ_TEXT:
+		*x = ((pcb_text_t *) ptr2)->X;
+		*y = ((pcb_text_t *) ptr2)->Y;
+		break;
+	case PCB_OBJ_POLY:
+		*x = ((pcb_poly_t *) ptr2)->Points[0].X;
+		*y = ((pcb_poly_t *) ptr2)->Points[0].Y;
+		break;
+
+	case PCB_OBJ_LINE_POINT:
+	case PCB_OBJ_POLY_POINT:
+		*x = ((pcb_point_t *) ptr3)->X;
+		*y = ((pcb_point_t *) ptr3)->Y;
+		break;
+	case PCB_OBJ_ARC:
+		pcb_arc_get_end((pcb_arc_t *) ptr2, 0, x, y);
+		break;
+	case PCB_OBJ_ARC_POINT:
+		if (ptr3 != NULL) /* need to check because: if snap off, there's no known endpoint (leave x;y as is, then) */
+			pcb_arc_get_end((pcb_arc_t *) ptr2, ((*(int **)ptr3) != pcb_arc_start_ptr), x, y);
+		break;
+	}
+}
+
+void pcb_tool_attach_for_copy(pcb_coord_t PlaceX, pcb_coord_t PlaceY, pcb_bool do_rubberband)
+{
+	pcb_box_t box;
+	pcb_coord_t mx = 0, my = 0;
+
+	pcb_event(PCB_EVENT_RUBBER_RESET, NULL);
+	if (!conf_core.editor.snap_pin) {
+		/* dither the grab point so that the mark, center, etc
+		 * will end up on a grid coordinate
+		 */
+		get_grid_lock_coordinates(pcb_crosshair.AttachedObject.Type,
+															pcb_crosshair.AttachedObject.Ptr1,
+															pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, &mx, &my);
+		mx = pcb_grid_fit(mx, PCB->Grid, PCB->GridOffsetX) - mx;
+		my = pcb_grid_fit(my, PCB->Grid, PCB->GridOffsetY) - my;
+	}
+	pcb_crosshair.AttachedObject.X = PlaceX - mx;
+	pcb_crosshair.AttachedObject.Y = PlaceY - my;
+	if (!pcb_marked.status || conf_core.editor.local_ref)
+		pcb_crosshair_set_local_ref(PlaceX - mx, PlaceY - my, pcb_true);
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
+
+	/* get boundingbox of object and set cursor range */
+	pcb_obj_get_bbox_naked(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, &box);
+	pcb_crosshair_set_range(pcb_crosshair.AttachedObject.X - box.X1,
+										pcb_crosshair.AttachedObject.Y - box.Y1,
+										PCB->MaxWidth - (box.X2 - pcb_crosshair.AttachedObject.X),
+										PCB->MaxHeight - (box.Y2 - pcb_crosshair.AttachedObject.Y));
+
+	/* get all attached objects if necessary */
+	if (do_rubberband && conf_core.editor.rubber_band_mode)
+		pcb_event(PCB_EVENT_RUBBER_LOOKUP_LINES, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3);
+	if (do_rubberband &&
+			(pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC ||
+			 pcb_crosshair.AttachedObject.Type == PCB_OBJ_PSTK ||
+			 pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE || pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE_POINT))
+		pcb_event(PCB_EVENT_RUBBER_LOOKUP_RATS, "ippp", pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3);
+}
+
+void pcb_tool_notify_block(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	switch (pcb_crosshair.AttachedBox.State) {
+	case PCB_CH_STATE_FIRST:						/* setup first point */
+		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
+		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.Y;
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
+		break;
+
+	case PCB_CH_STATE_SECOND:						/* setup second point */
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_THIRD;
+		break;
+	}
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+pcb_bool pcb_tool_should_snap_offgrid_line(pcb_layer_t *layer, pcb_line_t *line)
+{
+	/* Allow snapping to off-grid lines when drawing new lines (on
+	 * the same layer), and when moving a line end-point
+	 * (but don't snap to the same line)
+	 */
+	if ((conf_core.editor.mode == PCB_MODE_LINE && CURRENT == layer) ||
+			(conf_core.editor.mode == PCB_MODE_MOVE
+			 && pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE_POINT
+			 && pcb_crosshair.AttachedObject.Ptr1 == layer
+			 && pcb_crosshair.AttachedObject.Ptr2 != line))
+		return pcb_true;
+	else
+		return pcb_false;
+}
+
+#warning tool TODO: move this out to a tool plugin
+
+#include "tool_arc.h"
+#include "tool_arrow.h"
+#include "tool_buffer.h"
+#include "tool_copy.h"
+#include "tool_insert.h"
+#include "tool_line.h"
+#include "tool_lock.h"
+#include "tool_move.h"
+#include "tool_poly.h"
+#include "tool_polyhole.h"
+#include "tool_rectangle.h"
+#include "tool_remove.h"
+#include "tool_rotate.h"
+#include "tool_text.h"
+#include "tool_thermal.h"
+#include "tool_via.h"
+
+static const char *pcb_tool_cookie = "default tools";
+
+static void default_tool_reg(void)
+{
+	pcb_tool_reg(&pcb_tool_arc, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_arrow, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_buffer, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_copy, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_insert, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_line, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_lock, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_move, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_poly, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_polyhole, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_rectangle, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_remove, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_rotate, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_text, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_thermal, pcb_tool_cookie);
+	pcb_tool_reg(&pcb_tool_via, pcb_tool_cookie);
+}
+
+static void default_tool_unreg(void)
+{
+	pcb_tool_unreg_by_cookie(pcb_tool_cookie);
+}
+
+
+/*** old helpers ***/
+void pcb_release_mode(void)
+{
+	if (pcb_crosshair.click_cmd_entry_active && (pcb_cli_mouse(0) == 0))
+		return;
+
+	pcb_tool_release_mode();
+
+	if (pcb_tool_is_saved)
+		pcb_tool_restore();
+	pcb_tool_is_saved = pcb_false;
+	pcb_draw();
+}
+
+void pcb_notify_mode(void)
+{
+	if (pcb_crosshair.click_cmd_entry_active && (pcb_cli_mouse(1) == 0))
+		return;
+
+	if (conf_core.temp.rat_warn)
+		pcb_clear_warnings();
+	pcb_tool_notify_mode();
+	pcb_draw();
+}
Index: tags/2.0.1/src/tool.h
===================================================================
--- tags/2.0.1/src/tool.h	(nonexistent)
+++ tags/2.0.1/src/tool.h	(revision 18980)
@@ -0,0 +1,150 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_TOOL_H
+#define PCB_TOOL_H
+
+#include <genvector/vtp0.h>
+
+#include "global_typedefs.h"
+#include "pcb_bool.h"
+
+typedef enum {
+	PCB_MODE_NO              = -1,  /* no mode selected - panning - TODO: remove this in favor of the default mode (it's the same as the arrow mode) */
+	PCB_MODE_VIA             = 15,  /* draw vias */
+	PCB_MODE_LINE            = 5,   /* draw lines */
+	PCB_MODE_RECTANGLE       = 10,  /* create rectangles */
+	PCB_MODE_POLYGON         = 8,   /* draw filled polygons */
+	PCB_MODE_PASTE_BUFFER    = 2,   /* paste objects from buffer */
+	PCB_MODE_TEXT            = 13,  /* create text objects */
+	PCB_MODE_ROTATE          = 12,  /* rotate objects */
+	PCB_MODE_REMOVE          = 11,  /* remove objects */
+	PCB_MODE_MOVE            = 7,   /* move objects */
+	PCB_MODE_COPY            = 3,   /* copy objects */
+	PCB_MODE_INSERT_POINT    = 4,   /* insert point into line/polygon */
+	PCB_MODE_RUBBERBAND_MOVE = 16,  /* move objects and attached lines */
+	PCB_MODE_THERMAL         = 14,  /* toggle thermal layer flag */
+	PCB_MODE_ARC             = 0,   /* draw arcs */
+	PCB_MODE_ARROW           = 1,   /* selection with arrow mode */
+	PCB_MODE_LOCK            = 6,   /* lock/unlock objects */
+	PCB_MODE_POLYGON_HOLE    = 9    /* cut holes in filled polygons */
+} pcb_mode_t;
+
+typedef int pcb_toolid_t;
+#define PCB_TOOLID_INVALID (-1)
+
+typedef struct pcb_tool_s {
+	const char *name;             /* textual name of the tool */
+	const char *cookie;           /* plugin cookie _pointer_ of the registrar (comparision is pointer based, not strcmp) */
+	unsigned int priority;        /* lower values are higher priorities; escaping mode will try to select the highest prio tool */
+
+	/* tool implementation */
+	void     (*init)(void);
+	void     (*uninit)(void);
+	void     (*notify_mode)(void);
+	void     (*release_mode)(void);
+	void     (*adjust_attached_objects)(void);
+	void     (*draw_attached)(void);
+	pcb_bool (*undo_act)(void);
+	pcb_bool (*redo_act)(void);
+	
+	pcb_bool allow_when_drawing_ratlines;
+} pcb_tool_t;
+
+vtp0_t pcb_tools;
+
+/* (un)initialize the tool subsystem */
+void pcb_tool_init(void);
+void pcb_tool_uninit(void);
+
+/* Insert a new tool in pcb_tools; returns 0 on success */
+int pcb_tool_reg(pcb_tool_t *tool, const char *cookie);
+
+/* Unregister all tools that has matching cookie */
+void pcb_tool_unreg_by_cookie(const char *cookie);
+
+/* Return the ID of a tool by name; returns -1 on error */
+pcb_toolid_t pcb_tool_lookup(const char *name);
+
+
+/* Select a tool by name, id or pick the highest prio tool; return 0 on success */
+int pcb_tool_select_by_name(const char *name);
+int pcb_tool_select_by_id(pcb_toolid_t id);
+int pcb_tool_select_highest(void);
+
+int pcb_tool_save(void);
+int pcb_tool_restore(void);
+
+/**** Tool function wrappers; calling these will operate on the current tool 
+      as defined in conf_core.editor.mode ****/
+
+void pcb_tool_notify_mode(void);
+void pcb_tool_release_mode(void);
+void pcb_tool_adjust_attached_objects(void);
+void pcb_tool_draw_attached(void);
+pcb_bool pcb_tool_undo_act(void);
+pcb_bool pcb_tool_redo_act(void);
+
+
+/**** tool helper functions ****/
+
+typedef struct {
+	pcb_coord_t X, Y;
+	pcb_cardinal_t Buffer;	/* buffer number */
+	pcb_bool Click;		/* true if clicked somewhere with the arrow tool */
+	pcb_bool Moving;	/* true if clicked on an object of PCB_SELECT_TYPES */
+	int Hit;					/* type of a hit object of PCB_MOVE_TYPES; 0 if there was no PCB_MOVE_TYPES object under the crosshair */
+	void *ptr1;
+	void *ptr2;
+	void *ptr3;
+} pcb_tool_note_t;
+
+extern pcb_tool_note_t pcb_tool_note;
+extern pcb_bool pcb_tool_is_saved;
+extern pcb_toolid_t pcb_tool_prev_id;
+extern pcb_toolid_t pcb_tool_next_id;
+
+void pcb_tool_attach_for_copy(pcb_coord_t PlaceX, pcb_coord_t PlaceY, pcb_bool do_rubberband);
+void pcb_tool_notify_block(void);	/* create first or second corner of a marked block (when clicked) */
+pcb_bool pcb_tool_should_snap_offgrid_line(pcb_layer_t *layer, pcb_line_t *line);
+
+
+/**** old heleprs ****/
+
+/* does what's appropriate for the current mode setting (when clicked). This
+   normally means creation of an object at the current crosshair location.
+   new created objects are added to the create undo list of course */
+void pcb_notify_mode(void);
+
+void pcb_release_mode(void);
+
+
+/**** Low level, for internal use ****/
+
+/* Get the tool pointer of a tool by id */
+#define pcb_tool_get(id) ((const pcb_tool_t *)*vtp0_get(&pcb_tools, id, 0))
+
+#endif
Index: tags/2.0.1/src/tool_arc.c
===================================================================
--- tags/2.0.1/src/tool_arc.c	(nonexistent)
+++ tags/2.0.1/src/tool_arc.c	(revision 18980)
@@ -0,0 +1,201 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "data.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "search.h"
+#include "tool.h"
+#include "undo.h"
+#include "macro.h"
+
+#include "obj_arc_draw.h"
+
+
+void pcb_tool_arc_init(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	if (pcb_tool_prev_id == PCB_MODE_LINE && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
+		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.AttachedLine.Point1.X;
+		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y;
+		pcb_tool_adjust_attached_objects();
+	}
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_arc_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_added_lines = 0;
+	if (pcb_tool_next_id != PCB_MODE_LINE) {
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+		pcb_crosshair_set_local_ref(0, 0, pcb_false);
+	}
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_arc_notify_mode(void)
+{
+	switch (pcb_crosshair.AttachedBox.State) {
+	case PCB_CH_STATE_FIRST:
+		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X = pcb_tool_note.X;
+		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_tool_note.Y;
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
+		break;
+
+	case PCB_CH_STATE_SECOND:
+	case PCB_CH_STATE_THIRD:
+		{
+			pcb_arc_t *arc;
+			pcb_coord_t wx, wy;
+			pcb_angle_t sa, dir;
+
+			wx = pcb_tool_note.X - pcb_crosshair.AttachedBox.Point1.X;
+			wy = pcb_tool_note.Y - pcb_crosshair.AttachedBox.Point1.Y;
+			if (PCB_XOR(pcb_crosshair.AttachedBox.otherway, coord_abs(wy) > coord_abs(wx))) {
+				pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.AttachedBox.Point1.X + coord_abs(wy) * PCB_SGNZ(wx);
+				sa = (wx >= 0) ? 0 : 180;
+				dir = (PCB_SGNZ(wx) == PCB_SGNZ(wy)) ? 90 : -90;
+			}
+			else {
+				pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedBox.Point1.Y + coord_abs(wx) * PCB_SGNZ(wy);
+				sa = (wy >= 0) ? -90 : 90;
+				dir = (PCB_SGNZ(wx) == PCB_SGNZ(wy)) ? -90 : 90;
+				wy = wx;
+			}
+			if (coord_abs(wy) > 0 && (arc = pcb_arc_new(pcb_loose_subc_layer(PCB, CURRENT),
+																										pcb_crosshair.AttachedBox.Point2.X,
+																										pcb_crosshair.AttachedBox.Point2.Y,
+																										coord_abs(wy),
+																										coord_abs(wy),
+																										sa,
+																										dir,
+																										conf_core.design.line_thickness,
+																										2 * conf_core.design.clearance,
+																										pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0), pcb_true))) {
+				pcb_obj_add_attribs(arc, PCB->pen_attr);
+				pcb_arc_get_end(arc, 1, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y);
+				pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X;
+				pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y;
+				pcb_undo_add_obj_to_create(PCB_OBJ_ARC, CURRENT, arc, arc);
+				pcb_undo_inc_serial();
+				pcb_added_lines++;
+				pcb_arc_invalidate_draw(CURRENT, arc);
+				pcb_draw();
+				pcb_crosshair.AttachedBox.State = PCB_CH_STATE_THIRD;
+			}
+			break;
+		}
+	}
+}
+
+void pcb_tool_arc_adjust_attached_objects(void)
+{
+	pcb_crosshair.AttachedBox.otherway = pcb_gui->shift_is_pressed();
+}
+
+void pcb_tool_arc_draw_attached(void)
+{
+	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
+		pcb_xordraw_attached_arc(conf_core.design.line_thickness);
+		if (conf_core.editor.show_drc) {
+			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+			pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
+			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+		}
+	}
+	else {
+		/* Draw a circle (0 length line) to show where the arc will start when placed */
+		if(CURRENT)
+			pcb_gui->set_color(pcb_crosshair.GC,CURRENT->meta.real.color);
+
+		pcb_draw_wireframe_line(pcb_crosshair.GC,
+			pcb_crosshair.X, pcb_crosshair.Y,
+			pcb_crosshair.X, pcb_crosshair.Y,
+			conf_core.design.line_thickness, 0);
+
+		if(conf_core.editor.show_drc) {
+			pcb_gui->set_color(pcb_crosshair.GC,conf_core.appearance.color.cross);
+			pcb_draw_wireframe_line(pcb_crosshair.GC,
+				pcb_crosshair.X, pcb_crosshair.Y,
+				pcb_crosshair.X, pcb_crosshair.Y,
+				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
+			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+		}
+	}
+
+}
+
+pcb_bool pcb_tool_arc_undo_act(void)
+{
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+		pcb_notify_crosshair_change(pcb_true);
+		return pcb_false;
+	}
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) {
+		void *ptr1, *ptr2, *ptr3;
+		/* guaranteed to succeed */
+		pcb_search_obj_by_location(PCB_OBJ_ARC, &ptr1, &ptr2, &ptr3,
+													 pcb_crosshair.AttachedBox.Point1.X, pcb_crosshair.AttachedBox.Point1.Y, 0);
+		pcb_arc_get_end((pcb_arc_t *) ptr2, 0, &pcb_crosshair.AttachedBox.Point2.X, &pcb_crosshair.AttachedBox.Point2.Y);
+		pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair.AttachedBox.Point2.X;
+		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y;
+		pcb_tool_adjust_attached_objects();
+		if (--pcb_added_lines == 0)
+			pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
+	}
+	return pcb_true;
+}
+
+pcb_tool_t pcb_tool_arc = {
+	"arc", NULL, 100,
+	pcb_tool_arc_init,
+	pcb_tool_arc_uninit,
+	pcb_tool_arc_notify_mode,
+	NULL,
+	pcb_tool_arc_adjust_attached_objects,
+	pcb_tool_arc_draw_attached,
+	pcb_tool_arc_undo_act,
+	NULL,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_arc.h
===================================================================
--- tags/2.0.1/src/tool_arc.h	(nonexistent)
+++ tags/2.0.1/src/tool_arc.h	(revision 18980)
@@ -0,0 +1,8 @@
+extern pcb_tool_t pcb_tool_arc;
+
+void pcb_tool_arc_init(void);
+void pcb_tool_arc_uninit(void);
+void pcb_tool_arc_notify_mode(void);
+void pcb_tool_arc_adjust_attached_objects(void);
+void pcb_tool_arc_draw_attached(void);
+pcb_bool pcb_tool_arc_undo_act(void);
Index: tags/2.0.1/src/tool_arrow.c
===================================================================
--- tags/2.0.1/src/tool_arrow.c	(nonexistent)
+++ tags/2.0.1/src/tool_arrow.c	(revision 18980)
@@ -0,0 +1,229 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "buffer.h"
+#include "crosshair.h"
+#include "data.h"
+#include "actions.h"
+#include "remove.h"
+#include "search.h"
+#include "select.h"
+#include "tool.h"
+#include "undo.h"
+
+
+void pcb_tool_arrow_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+/* Called some time after the click if there was a release but no second click
+	 a.k.a. finalize single click (some things are already done in pcb_notify_mode
+	 at the initial click event) */
+static void click_timer_cb(pcb_hidval_t hv)
+{
+	if (pcb_tool_note.Click) {
+		pcb_notify_crosshair_change(pcb_false);
+		pcb_tool_note.Click = pcb_false;
+		if (pcb_tool_note.Moving && !pcb_gui->shift_is_pressed()) {
+			pcb_tool_note.Buffer = conf_core.editor.buffer_number;
+			pcb_buffer_set_number(PCB_MAX_BUFFER - 1);
+			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+			pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, pcb_tool_note.X, pcb_tool_note.Y, pcb_true);
+			pcb_undo_save_serial();
+			pcb_remove_selected(pcb_false);
+			pcb_tool_save();
+			pcb_tool_is_saved = pcb_true;
+			pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+		}
+		else if (pcb_tool_note.Hit && !pcb_gui->shift_is_pressed()) {
+			pcb_box_t box;
+
+			pcb_tool_save();
+			pcb_tool_is_saved = pcb_true;
+			pcb_tool_select_by_id(pcb_gui->control_is_pressed()? PCB_MODE_COPY : PCB_MODE_MOVE);
+			pcb_crosshair.AttachedObject.Ptr1 = pcb_tool_note.ptr1;
+			pcb_crosshair.AttachedObject.Ptr2 = pcb_tool_note.ptr2;
+			pcb_crosshair.AttachedObject.Ptr3 = pcb_tool_note.ptr3;
+			pcb_crosshair.AttachedObject.Type = pcb_tool_note.Hit;
+
+			if (pcb_crosshair.drags != NULL) {
+				free(pcb_crosshair.drags);
+				pcb_crosshair.drags = NULL;
+			}
+			pcb_crosshair.dragx = pcb_tool_note.X;
+			pcb_crosshair.dragy = pcb_tool_note.Y;
+			box.X1 = pcb_tool_note.X + PCB_SLOP * pcb_pixel_slop;
+			box.X2 = pcb_tool_note.X - PCB_SLOP * pcb_pixel_slop;
+			box.Y1 = pcb_tool_note.Y + PCB_SLOP * pcb_pixel_slop;
+			box.Y2 = pcb_tool_note.Y - PCB_SLOP * pcb_pixel_slop;
+			pcb_crosshair.drags = pcb_list_block(PCB, &box, &pcb_crosshair.drags_len);
+			pcb_crosshair.drags_current = 0;
+			pcb_tool_attach_for_copy(pcb_tool_note.X, pcb_tool_note.Y, pcb_true);
+		}
+		else {
+			pcb_box_t box;
+
+			pcb_tool_note.Hit = 0;
+			pcb_tool_note.Moving = pcb_false;
+			pcb_undo_save_serial();
+			box.X1 = -PCB_MAX_COORD;
+			box.Y1 = -PCB_MAX_COORD;
+			box.X2 = PCB_MAX_COORD;
+			box.Y2 = PCB_MAX_COORD;
+			/* unselect first if shift key not down */
+			if (!pcb_gui->shift_is_pressed() && pcb_select_block(PCB, &box, pcb_false, pcb_false))
+				pcb_board_set_changed_flag(pcb_true);
+			pcb_tool_notify_block();
+			pcb_crosshair.AttachedBox.Point1.X = pcb_tool_note.X;
+			pcb_crosshair.AttachedBox.Point1.Y = pcb_tool_note.Y;
+		}
+		pcb_notify_crosshair_change(pcb_true);
+	}
+}
+
+void pcb_tool_arrow_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	int test;
+	pcb_hidval_t hv;
+
+	pcb_tool_note.Click = pcb_true;
+	/* do something after click time */
+	pcb_gui->add_timer(click_timer_cb, conf_core.editor.click_time, hv);
+
+	/* see if we clicked on something already selected
+	 * (pcb_tool_note.Moving) or clicked on a MOVE_TYPE
+	 * (pcb_tool_note.Hit)
+	 */
+	for (test = (PCB_SELECT_TYPES | PCB_MOVE_TYPES | PCB_OBJ_FLOATER | PCB_LOOSE_SUBC) & ~PCB_OBJ_RAT; test; test &= ~type) {
+		type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, test, &ptr1, &ptr2, &ptr3);
+		if (!pcb_tool_note.Hit && (type & PCB_MOVE_TYPES) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) ptr2)) {
+			pcb_tool_note.Hit = type;
+			pcb_tool_note.ptr1 = ptr1;
+			pcb_tool_note.ptr2 = ptr2;
+			pcb_tool_note.ptr3 = ptr3;
+			pcb_crosshair.AttachedObject.tx = pcb_tool_note.X;
+			pcb_crosshair.AttachedObject.ty = pcb_tool_note.Y;
+		}
+		if (!pcb_tool_note.Moving && (type & (PCB_SELECT_TYPES | PCB_LOOSE_SUBC)) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, (pcb_any_obj_t *) ptr2)) {
+			pcb_tool_note.Moving = pcb_true;
+			/* remember where the user clicked to start this op */
+			pcb_crosshair.AttachedObject.tx = pcb_crosshair.AttachedObject.X = pcb_tool_note.X;
+			pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y = pcb_tool_note.Y;
+		}
+		if ((pcb_tool_note.Hit && pcb_tool_note.Moving) || type == PCB_OBJ_VOID)
+			return;
+	}
+}
+
+void pcb_tool_arrow_release_mode(void)
+{
+	pcb_box_t box;
+
+	if (pcb_tool_note.Click) {
+		pcb_box_t box;
+
+		box.X1 = -PCB_MAX_COORD;
+		box.Y1 = -PCB_MAX_COORD;
+		box.X2 = PCB_MAX_COORD;
+		box.Y2 = PCB_MAX_COORD;
+
+		pcb_tool_note.Click = pcb_false;					/* inhibit timer action */
+		pcb_undo_save_serial();
+		/* unselect first if shift key not down */
+		if (!pcb_gui->shift_is_pressed()) {
+			if (pcb_select_block(PCB, &box, pcb_false, pcb_false))
+				pcb_board_set_changed_flag(pcb_true);
+			if (pcb_tool_note.Moving) {
+				pcb_tool_note.Moving = 0;
+				pcb_tool_note.Hit = 0;
+				return;
+			}
+		}
+		/* Restore the SN so that if we select something the deselect/select combo
+		   gets the same SN. */
+		pcb_undo_restore_serial();
+		if (pcb_select_object(PCB))
+			pcb_board_set_changed_flag(pcb_true);
+		else
+			pcb_undo_inc_serial(); /* We didn't select anything new, so, the deselection should get its  own SN. */
+		pcb_tool_note.Hit = 0;
+		pcb_tool_note.Moving = 0;
+	}
+	else {
+		box.X1 = pcb_crosshair.AttachedBox.Point1.X;
+		box.Y1 = pcb_crosshair.AttachedBox.Point1.Y;
+		box.X2 = pcb_crosshair.AttachedBox.Point2.X;
+		box.Y2 = pcb_crosshair.AttachedBox.Point2.Y;
+
+		pcb_undo_restore_serial();
+		if (pcb_select_block(PCB, &box, pcb_true, pcb_true))
+			pcb_board_set_changed_flag(pcb_true);
+		else if (pcb_bumped)
+			pcb_undo_inc_serial();
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+	}
+}
+
+void pcb_tool_arrow_adjust_attached_objects(void)
+{
+	if (pcb_crosshair.AttachedBox.State) {
+		pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
+		pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.Y;
+	}
+}
+
+pcb_tool_t pcb_tool_arrow = {
+	"arrow", NULL, 10,
+	NULL,
+	pcb_tool_arrow_uninit,
+	pcb_tool_arrow_notify_mode,
+	pcb_tool_arrow_release_mode,
+	pcb_tool_arrow_adjust_attached_objects,
+	NULL,
+	NULL,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_arrow.h
===================================================================
--- tags/2.0.1/src/tool_arrow.h	(nonexistent)
+++ tags/2.0.1/src/tool_arrow.h	(revision 18980)
@@ -0,0 +1,6 @@
+extern pcb_tool_t pcb_tool_arrow;
+
+void pcb_tool_arrow_uninit(void);
+void pcb_tool_arrow_notify_mode(void);
+void pcb_tool_arrow_release_mode(void);
+void pcb_tool_arrow_adjust_attached_objects(void);
Index: tags/2.0.1/src/tool_buffer.c
===================================================================
--- tags/2.0.1/src/tool_buffer.c	(nonexistent)
+++ tags/2.0.1/src/tool_buffer.c	(revision 18980)
@@ -0,0 +1,127 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "buffer.h"
+#include "compat_misc.h"
+#include "data.h"
+#include "actions.h"
+#include "rtree.h"
+#include "search.h"
+#include "tool.h"
+#include "undo.h"
+
+void pcb_tool_buffer_init(void)
+{
+	pcb_crosshair_range_to_buffer();
+}
+
+void pcb_tool_buffer_uninit(void)
+{
+	pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight);
+}
+
+void pcb_tool_buffer_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	pcb_subc_t *orig_subc = NULL;
+	int need_redraw = 0;
+
+	if (pcb_gui->shift_is_pressed()) {
+		int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3);
+		if (type == PCB_OBJ_SUBC) {
+			orig_subc = (pcb_subc_t *) ptr1;
+			pcb_subc_remove(orig_subc);
+			need_redraw = 1;
+		}
+	}
+	if (pcb_buffer_copy_to_layout(PCB, pcb_crosshair.AttachedObject.tx, pcb_crosshair.AttachedObject.ty)) {
+		pcb_board_set_changed_flag(pcb_true);
+		need_redraw = 1;
+	}
+
+	if (orig_subc != NULL) {
+		int type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3);
+		if (type == PCB_OBJ_SUBC && (ptr1 != NULL)) {
+			int n;
+			pcb_attribute_list_t *dst = &(((pcb_subc_t *)ptr1)->Attributes), *src = &orig_subc->Attributes;
+			for (n = 0; n < src->Number; n++)
+				if (strcmp(src->List[n].name, "footprint") != 0)
+					pcb_attribute_put(dst, src->List[n].name, src->List[n].value);
+		}
+	}
+
+	if (need_redraw)
+		pcb_gui->invalidate_all();
+}
+
+void pcb_tool_buffer_release_mode(void)
+{
+	if (pcb_tool_note.Moving) {
+		pcb_undo_restore_serial();
+		pcb_tool_buffer_notify_mode();
+		pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+		pcb_buffer_set_number(pcb_tool_note.Buffer);
+		pcb_tool_note.Moving = pcb_false;
+		pcb_tool_note.Hit = 0;
+	}
+}
+
+void pcb_tool_buffer_adjust_attached_objects(void)
+{
+	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
+	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
+}
+
+void pcb_tool_buffer_draw_attached(void)
+{
+	pcb_xordraw_buffer(PCB_PASTEBUFFER);
+}
+
+pcb_tool_t pcb_tool_buffer = {
+	"buffer", NULL, 100,
+	pcb_tool_buffer_init,
+	pcb_tool_buffer_uninit,
+	pcb_tool_buffer_notify_mode,
+	pcb_tool_buffer_release_mode,
+	pcb_tool_buffer_adjust_attached_objects,
+	pcb_tool_buffer_draw_attached,
+	NULL,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_buffer.h
===================================================================
--- tags/2.0.1/src/tool_buffer.h	(nonexistent)
+++ tags/2.0.1/src/tool_buffer.h	(revision 18980)
@@ -0,0 +1,7 @@
+extern pcb_tool_t pcb_tool_buffer;
+
+void pcb_tool_buffer_init(void);
+void pcb_tool_buffer_uninit(void);
+void pcb_tool_buffer_notify_mode(void);
+void pcb_tool_buffer_release_mode(void);
+void pcb_tool_buffer_draw_attached(void);
Index: tags/2.0.1/src/tool_copy.c
===================================================================
--- tags/2.0.1/src/tool_copy.c	(nonexistent)
+++ tags/2.0.1/src/tool_copy.c	(revision 18980)
@@ -0,0 +1,128 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "copy.h"
+#include "crosshair.h"
+#include "search.h"
+#include "tool.h"
+
+void pcb_tool_copy_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_copy_notify_mode(void)
+{
+	switch (pcb_crosshair.AttachedObject.State) {
+		/* first notify, lookup object */
+	case PCB_CH_STATE_FIRST:
+		{
+			int types = PCB_COPY_TYPES;
+
+			pcb_crosshair.AttachedObject.Type =
+				pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, types,
+										 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
+			if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
+				pcb_tool_attach_for_copy(pcb_tool_note.X, pcb_tool_note.Y, pcb_false);
+			}
+			break;
+		}
+
+		/* second notify, move or copy object */
+	case PCB_CH_STATE_SECOND:
+
+		if ((PCB->is_footprint) && (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC)) {
+			pcb_message(PCB_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n");
+		}
+		else {
+			pcb_copy_obj(pcb_crosshair.AttachedObject.Type,
+							 pcb_crosshair.AttachedObject.Ptr1,
+							 pcb_crosshair.AttachedObject.Ptr2,
+							 pcb_crosshair.AttachedObject.Ptr3, pcb_crosshair.AttachedObject.tx - pcb_crosshair.AttachedObject.X, pcb_crosshair.AttachedObject.ty - pcb_crosshair.AttachedObject.Y);
+			pcb_board_set_changed_flag(pcb_true);
+		}
+
+		/* reset identifiers */
+		pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+		pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+		break;
+	}
+}
+
+void pcb_tool_copy_release_mode (void)
+{
+	if (pcb_tool_note.Hit) {
+		pcb_tool_copy_notify_mode();
+		pcb_tool_note.Hit = 0;
+	}
+}
+
+void pcb_tool_copy_adjust_attached_objects(void)
+{
+	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
+	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
+}
+
+void pcb_tool_copy_draw_attached(void)
+{
+	pcb_xordraw_movecopy();
+}
+
+pcb_bool pcb_tool_copy_undo_act(void)
+{
+	/* don't allow undo in the middle of an operation */
+	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
+		return pcb_false;
+	return pcb_true;
+}
+
+pcb_tool_t pcb_tool_copy = {
+	"copy", NULL, 100,
+	NULL,
+	pcb_tool_copy_uninit,
+	pcb_tool_copy_notify_mode,
+	pcb_tool_copy_release_mode,
+	pcb_tool_copy_adjust_attached_objects,
+	pcb_tool_copy_draw_attached,
+	pcb_tool_copy_undo_act,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_copy.h
===================================================================
--- tags/2.0.1/src/tool_copy.h	(nonexistent)
+++ tags/2.0.1/src/tool_copy.h	(revision 18980)
@@ -0,0 +1,7 @@
+extern pcb_tool_t pcb_tool_copy;
+
+void pcb_tool_copy_uninit(void);
+void pcb_tool_copy_notify_mode(void);
+void pcb_tool_copy_release_mode (void);
+void pcb_tool_copy_draw_attached(void);
+pcb_bool pcb_tool_copy_undo_act(void);
Index: tags/2.0.1/src/tool_insert.c
===================================================================
--- tags/2.0.1/src/tool_insert.c	(nonexistent)
+++ tags/2.0.1/src/tool_insert.c	(revision 18980)
@@ -0,0 +1,147 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "compat_nls.h"
+#include "crosshair.h"
+#include "insert.h"
+#include "polygon.h"
+#include "search.h"
+#include "tool.h"
+
+
+static struct {
+	pcb_poly_t *poly;
+	pcb_line_t line;
+} fake;
+
+static pcb_point_t InsertedPoint;
+static pcb_cardinal_t polyIndex = 0;
+
+
+void pcb_tool_insert_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_insert_notify_mode(void)
+{
+	switch (pcb_crosshair.AttachedObject.State) {
+		/* first notify, lookup object */
+	case PCB_CH_STATE_FIRST:
+		pcb_crosshair.AttachedObject.Type =
+			pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_INSERT_TYPES,
+									 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
+
+		if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
+			if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)
+										pcb_crosshair.AttachedObject.Ptr2)) {
+				pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+				break;
+			}
+			else {
+				/* get starting point of nearest segment */
+				if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY) {
+					fake.poly = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2;
+					polyIndex = pcb_poly_get_lowest_distance_point(fake.poly, pcb_tool_note.X, pcb_tool_note.Y);
+					fake.line.Point1 = fake.poly->Points[polyIndex];
+					fake.line.Point2 = fake.poly->Points[pcb_poly_contour_prev_point(fake.poly, polyIndex)];
+					pcb_crosshair.AttachedObject.Ptr2 = &fake.line;
+
+				}
+				pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
+				InsertedPoint = *pcb_adjust_insert_point();
+			}
+		}
+		break;
+
+		/* second notify, insert new point into object */
+	case PCB_CH_STATE_SECOND:
+		if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_POLY)
+			pcb_insert_point_in_object(PCB_OBJ_POLY,
+														pcb_crosshair.AttachedObject.Ptr1, fake.poly,
+														&polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false);
+		else
+			pcb_insert_point_in_object(pcb_crosshair.AttachedObject.Type,
+														pcb_crosshair.AttachedObject.Ptr1,
+														pcb_crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false);
+		pcb_board_set_changed_flag(pcb_true);
+
+		/* reset identifiers */
+		pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+		pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+		break;
+	}
+}
+
+void pcb_tool_insert_adjust_attached_objects(void)
+{
+	pcb_point_t *pnt;
+	pnt = pcb_adjust_insert_point();
+	if (pnt)
+		InsertedPoint = *pnt;
+}
+
+void pcb_tool_insert_draw_attached(void)
+{
+	pcb_xordraw_insert_pt_obj();
+}
+
+pcb_bool pcb_tool_insert_undo_act(void)
+{
+	/* don't allow undo in the middle of an operation */
+	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
+		return pcb_false;
+	return pcb_true;
+}
+
+pcb_tool_t pcb_tool_insert = {
+	"insert", NULL, 100,
+	NULL,
+	pcb_tool_insert_uninit,
+	pcb_tool_insert_notify_mode,
+	NULL,
+	pcb_tool_insert_adjust_attached_objects,
+	pcb_tool_insert_draw_attached,
+	pcb_tool_insert_undo_act,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_insert.h
===================================================================
--- tags/2.0.1/src/tool_insert.h	(nonexistent)
+++ tags/2.0.1/src/tool_insert.h	(revision 18980)
@@ -0,0 +1,7 @@
+extern pcb_tool_t pcb_tool_insert;
+
+void pcb_tool_insert_uninit(void);
+void pcb_tool_insert_notify_mode(void);
+void pcb_tool_insert_adjust_attached_objects(void);
+void pcb_tool_insert_draw_attached(void);
+pcb_bool pcb_tool_insert_undo_act(void);
Index: tags/2.0.1/src/tool_line.c
===================================================================
--- tags/2.0.1/src/tool_line.c	(nonexistent)
+++ tags/2.0.1/src/tool_line.c	(revision 18980)
@@ -0,0 +1,466 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "data.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "find.h"
+#include "obj_line.h"
+#include "obj_subc.h"
+#include "rats.h"
+#include "search.h"
+#include "tool.h"
+#include "undo.h"
+
+#include "obj_line_draw.h"
+#include "obj_pstk_draw.h"
+#include "obj_rat_draw.h"
+
+#warning padstack TODO: remove this when via is removed and the padstack is created from style directly
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+static pcb_layer_t *last_layer;
+
+
+void pcb_tool_line_init(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	if (pcb_tool_prev_id == PCB_MODE_ARC && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
+		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.AttachedBox.Point1.X;
+		pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.AttachedBox.Point1.Y;
+		pcb_tool_adjust_attached_objects();
+	}
+	else {
+		if (conf_core.editor.auto_drc) {
+			if (pcb_reset_conns(pcb_true)) {
+				pcb_undo_inc_serial();
+				pcb_draw();
+			}
+		}
+	}
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_line_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_added_lines = 0;
+	pcb_route_reset(&pcb_crosshair.Route);
+	if (pcb_tool_next_id != PCB_MODE_ARC) {
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+		pcb_crosshair_set_local_ref(0, 0, pcb_false);
+	}
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+/* creates points of a line (when clicked) */
+static void notify_line(void)
+{
+	int type = PCB_OBJ_VOID;
+	void *ptr1, *ptr2, *ptr3;
+
+	if (!pcb_marked.status || conf_core.editor.local_ref)
+		pcb_crosshair_set_local_ref(pcb_crosshair.X, pcb_crosshair.Y, pcb_true);
+	switch (pcb_crosshair.AttachedLine.State) {
+	case PCB_CH_STATE_FIRST:						/* first point */
+#warning subc TODO: this should work on heavy terminals too!
+		if (PCB->RatDraw && pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr1, &ptr1) == PCB_OBJ_VOID) {
+			pcb_gui->beep();
+			break;
+		}
+		if (conf_core.editor.auto_drc) {
+			type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &ptr1, &ptr2, &ptr3);
+			pcb_lookup_conn(pcb_crosshair.X, pcb_crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND);
+		}
+		if (type == PCB_OBJ_PSTK) {
+			pcb_pstk_t *pstk = (pcb_pstk_t *)ptr2;
+			pcb_crosshair.AttachedLine.Point1.X = pstk->x;
+			pcb_crosshair.AttachedLine.Point1.Y = pstk->y;
+		}
+		else {
+			pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.Y;
+		}
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
+		break;
+
+	case PCB_CH_STATE_SECOND:
+		/* fall through to third state too */
+		last_layer = CURRENT;
+	default:											/* all following points */
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_THIRD;
+		break;
+	}
+}
+
+void pcb_tool_line_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	
+	/* do update of position */
+	notify_line();
+	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_THIRD)
+		return;
+	/* Remove anchor if clicking on start point;
+	 * this means we can't paint 0 length lines
+	 * which could be used for square SMD pads.
+	 * Instead use a very small delta, or change
+	 * the file after saving.
+	 */
+	if (pcb_crosshair.X == pcb_crosshair.AttachedLine.Point1.X && pcb_crosshair.Y == pcb_crosshair.AttachedLine.Point1.Y) {
+		pcb_tool_select_by_id(PCB_MODE_LINE);
+		return;
+	}
+
+	if (PCB->RatDraw) {
+		pcb_rat_t *line;
+		if ((line = pcb_rat_add_net())) {
+			pcb_added_lines++;
+			pcb_undo_add_obj_to_create(PCB_OBJ_RAT, line, line, line);
+			pcb_undo_inc_serial();
+			pcb_rat_invalidate_draw(line);
+			pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
+			pcb_draw();
+		}
+		return;
+	}
+	else if(pcb_crosshair.Route.size > 0)
+	{
+		pcb_pstk_t *ps = NULL;
+
+		/* place a via if vias are visible, the layer is
+			 in a new group since the last line and there
+			 isn't a pin already here */
+		if (conf_core.editor.auto_via && PCB->pstk_on
+				&& pcb_layer_get_group_(CURRENT) != pcb_layer_get_group_(last_layer)
+				&& pcb_search_obj_by_location(PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3,
+																			pcb_crosshair.AttachedLine.Point1.X,
+																			pcb_crosshair.AttachedLine.Point1.Y,
+																			conf_core.design.via_thickness / 2) ==
+																				PCB_OBJ_VOID
+				&& (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER)
+				&& (pcb_layer_flags_(last_layer) & PCB_LYT_COPPER)
+				&& (!PCB->is_footprint)
+#warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too
+				&& ((ps = pcb_pstk_new_compat_via(PCB->Data,
+															pcb_crosshair.AttachedLine.Point1.X,
+															pcb_crosshair.AttachedLine.Point1.Y,
+				conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance,
+			0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) {
+					pcb_obj_add_attribs(ps, PCB->pen_attr);
+					pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps);
+		}
+
+		/* Add the route to the design */
+		pcb_route_apply(&pcb_crosshair.Route);
+
+		/* move to new start point */
+		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.Route.end_point.X;
+		pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.Route.end_point.Y;
+		pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.Route.end_point.X;
+		pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.Route.end_point.Y;
+
+		if (conf_core.editor.swap_start_direction) 
+			conf_setf(CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3);
+
+		if (conf_core.editor.orthogonal_moves) {
+			/* set the mark to the new starting point so ortho works as expected and we can draw a perpendicular line from here */
+			pcb_marked.X = pcb_crosshair.Route.end_point.X;
+			pcb_marked.Y = pcb_crosshair.Route.end_point.Y;
+		}
+
+		if (ps)
+			pcb_pstk_invalidate_draw(ps);
+
+		pcb_draw();
+		pcb_undo_inc_serial();
+		last_layer = CURRENT;
+	}
+	else
+		/* create line if both ends are determined && length != 0 */
+	{
+		pcb_line_t *line;
+		int maybe_found_flag;
+
+		if (conf_core.editor.line_refraction
+				&& pcb_crosshair.AttachedLine.Point1.X ==
+				pcb_crosshair.AttachedLine.Point2.X
+				&& pcb_crosshair.AttachedLine.Point1.Y ==
+				pcb_crosshair.AttachedLine.Point2.Y
+				&& (pcb_crosshair.AttachedLine.Point2.X != pcb_tool_note.X || pcb_crosshair.AttachedLine.Point2.Y != pcb_tool_note.Y)) {
+			/* We will only need to paint the second line segment.
+				 Since we only check for vias on the first segment,
+				 swap them so the non-empty segment is the first segment. */
+			pcb_crosshair.AttachedLine.Point2.X = pcb_tool_note.X;
+			pcb_crosshair.AttachedLine.Point2.Y = pcb_tool_note.Y;
+		}
+
+		if (conf_core.editor.auto_drc
+				&& (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER))
+			maybe_found_flag = PCB_FLAG_FOUND;
+		else
+			maybe_found_flag = 0;
+
+		if ((pcb_crosshair.AttachedLine.Point1.X !=
+				 pcb_crosshair.AttachedLine.Point2.X || pcb_crosshair.AttachedLine.Point1.Y != pcb_crosshair.AttachedLine.Point2.Y)
+				&& (line =
+						pcb_line_new_merge(pcb_loose_subc_layer(PCB, CURRENT),
+																	 pcb_crosshair.AttachedLine.Point1.X,
+																	 pcb_crosshair.AttachedLine.Point1.Y,
+																	 pcb_crosshair.AttachedLine.Point2.X,
+																	 pcb_crosshair.AttachedLine.Point2.Y,
+																	 conf_core.design.line_thickness,
+																	 2 * conf_core.design.clearance,
+																	 pcb_flag_make(maybe_found_flag |
+																						 (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) {
+			pcb_pstk_t *ps = NULL;
+
+			pcb_added_lines++;
+			pcb_obj_add_attribs(line, PCB->pen_attr);
+			pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line);
+			pcb_line_invalidate_draw(CURRENT, line);
+			/* place a via if vias are visible, the layer is
+				 in a new group since the last line and there
+				 isn't a pin already here */
+			if (PCB->pstk_on
+					&& pcb_layer_get_group_(CURRENT) != pcb_layer_get_group_(last_layer) 
+					&& (pcb_layer_flags_(CURRENT) & PCB_LYT_COPPER)
+					&& (pcb_layer_flags_(last_layer) & PCB_LYT_COPPER)
+					&& (!PCB->is_footprint)
+					&& pcb_search_obj_by_location(PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3,
+																 pcb_crosshair.AttachedLine.Point1.X,
+																 pcb_crosshair.AttachedLine.Point1.Y,
+																 conf_core.design.via_thickness / 2) == PCB_OBJ_VOID
+#warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too
+				&& ((ps = pcb_pstk_new_compat_via(PCB->Data,
+															pcb_crosshair.AttachedLine.Point1.X,
+															pcb_crosshair.AttachedLine.Point1.Y,
+															conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance,
+															0, PCB_PSTK_COMPAT_ROUND, pcb_true)) != NULL)) {
+				pcb_obj_add_attribs(ps, PCB->pen_attr);
+				pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps);
+				pcb_pstk_invalidate_draw(ps);
+			}
+			/* copy the coordinates */
+			pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
+			pcb_undo_inc_serial();
+			last_layer = CURRENT;
+		}
+		if (conf_core.editor.line_refraction && (pcb_tool_note.X != pcb_crosshair.AttachedLine.Point2.X || pcb_tool_note.Y != pcb_crosshair.AttachedLine.Point2.Y)
+				&& (line =
+						pcb_line_new_merge(pcb_loose_subc_layer(PCB, CURRENT),
+																	 pcb_crosshair.AttachedLine.Point2.X,
+																	 pcb_crosshair.AttachedLine.Point2.Y,
+																	 pcb_tool_note.X, pcb_tool_note.Y,
+																	 conf_core.design.line_thickness,
+																	 2 * conf_core.design.clearance,
+																	 pcb_flag_make((conf_core.editor.auto_drc ? PCB_FLAG_FOUND : 0) |
+																						 (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) != NULL) {
+			pcb_added_lines++;
+			pcb_obj_add_attribs(line, PCB->pen_attr);
+			pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line);
+			pcb_undo_inc_serial();
+			pcb_line_invalidate_draw(CURRENT, line);
+			/* move to new start point */
+			pcb_crosshair.AttachedLine.Point1.X = pcb_tool_note.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_tool_note.Y;
+			pcb_crosshair.AttachedLine.Point2.X = pcb_tool_note.X;
+			pcb_crosshair.AttachedLine.Point2.Y = pcb_tool_note.Y;
+
+
+			if (conf_core.editor.swap_start_direction) {
+				conf_setf(CFR_DESIGN,"editor/line_refraction", -1, "%d",conf_core.editor.line_refraction ^ 3);
+			}
+		}
+		if (conf_core.editor.orthogonal_moves) {
+			/* set the mark to the new starting point so ortho works as expected and we can draw a perpendicular line from here */
+			pcb_marked.X = pcb_tool_note.X;
+			pcb_marked.Y = pcb_tool_note.Y;
+		}
+		pcb_draw();
+	}
+}
+
+void pcb_tool_line_adjust_attached_objects(void)
+{
+	/* don't draw outline when ctrl key is pressed */
+	if (pcb_gui->control_is_pressed()) {
+		pcb_crosshair.AttachedLine.draw = pcb_false;
+	}
+	else {
+		pcb_crosshair.AttachedLine.draw = pcb_true;
+		pcb_line_adjust_attached();
+	}
+}
+
+void pcb_tool_line_draw_attached(void)
+{
+	if (PCB->RatDraw) {
+		/* draw only if starting point exists and the line has length */
+		if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST && pcb_crosshair.AttachedLine.draw) 
+			pcb_draw_wireframe_line(pcb_crosshair.GC,
+				pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y,
+				pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y,
+				10, 0);
+	}
+	else if (pcb_crosshair.Route.size > 0) {
+		pcb_route_draw(&pcb_crosshair.Route,pcb_crosshair.GC);
+		if (conf_core.editor.show_drc)
+			pcb_route_draw_drc(&pcb_crosshair.Route,pcb_crosshair.GC);
+		pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+	}
+	else {
+		/* Draw a circle (0 length line) to show where the line will be placed */
+		if (CURRENT)
+			pcb_gui->set_color(pcb_crosshair.GC,CURRENT->meta.real.color);
+
+		pcb_draw_wireframe_line(pcb_crosshair.GC,
+			pcb_crosshair.X, pcb_crosshair.Y,
+			pcb_crosshair.X, pcb_crosshair.Y, 
+			conf_core.design.line_thickness,0 );
+
+		if (conf_core.editor.show_drc) {
+			pcb_gui->set_color(pcb_crosshair.GC,conf_core.appearance.color.cross);
+			pcb_draw_wireframe_line(pcb_crosshair.GC,
+				pcb_crosshair.X, pcb_crosshair.Y,
+				pcb_crosshair.X, pcb_crosshair.Y, 
+				conf_core.design.line_thickness + (2 * conf_core.design.bloat), 0);
+			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+		}
+	}
+}
+
+pcb_bool pcb_tool_line_undo_act(void)
+{
+	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) {
+		if (conf_core.editor.auto_drc)
+			pcb_undo(pcb_true);	  /* undo the connection find */
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+		pcb_route_reset(&pcb_crosshair.Route);
+		pcb_crosshair_set_local_ref(0, 0, pcb_false);
+		return pcb_false;
+	}
+	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD) {
+		int type;
+		void *ptr1, *ptr3, *ptrtmp;
+		pcb_line_t *ptr2;
+		ptrtmp = &pcb_crosshair.AttachedLine; /* a workaround for the line undo bug */
+		/* this search is guaranteed to succeed */
+		pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1,
+			&ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 0);
+		ptr2 = (pcb_line_t *) ptrtmp;
+
+		/* save both ends of line */
+		pcb_crosshair.AttachedLine.Point2.X = ptr2->Point1.X;
+		pcb_crosshair.AttachedLine.Point2.Y = ptr2->Point1.Y;
+		if ((type = pcb_undo(pcb_true)) == 0)
+			pcb_board_set_changed_flag(pcb_true);
+		/* check that the undo was of the right type */
+		if ((type & PCB_UNDO_CREATE) == 0) {
+			/* wrong undo type, restore anchor points */
+			pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.AttachedLine.Point1.X;
+			pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y;
+			return pcb_false;
+		}
+		/* move to new anchor */
+		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
+		pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
+		/* check if an intermediate point was removed */
+		if (type & PCB_UNDO_REMOVE) {
+			/* this search should find the restored line */
+			pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1, &ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 0);
+			ptr2 = (pcb_line_t *) ptrtmp;
+			if (conf_core.editor.auto_drc) {
+				/* undo loses PCB_FLAG_FOUND */
+				PCB_FLAG_SET(PCB_FLAG_FOUND, ptr2);
+				pcb_line_invalidate_draw(CURRENT, ptr2);
+			}
+			pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = ptr2->Point2.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = ptr2->Point2.Y;
+		}
+		pcb_crosshair_grid_fit(pcb_crosshair.X, pcb_crosshair.Y);
+		pcb_tool_adjust_attached_objects();
+		if (--pcb_added_lines == 0) {
+			pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
+			last_layer = CURRENT;
+		}
+		else {
+			/* this search is guaranteed to succeed too */
+			pcb_search_obj_by_location(PCB_OBJ_LINE | PCB_OBJ_RAT, &ptr1, &ptrtmp, &ptr3, pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 0);
+			ptr2 = (pcb_line_t *) ptrtmp;
+			last_layer = (pcb_layer_t *) ptr1;
+		}
+		return pcb_false;
+	}
+	return pcb_true;
+}
+
+pcb_bool pcb_tool_line_redo_act(void)
+{
+	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND)
+		return pcb_false;
+	if (pcb_redo(pcb_true)) {
+		pcb_board_set_changed_flag(pcb_true);
+		if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
+			pcb_line_t *line = linelist_last(&CURRENT->Line);
+			pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = line->Point2.X;
+			pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = line->Point2.Y;
+			pcb_added_lines++;
+		}
+	}
+	return pcb_false;
+}
+
+pcb_tool_t pcb_tool_line = {
+	"line", NULL, 100,
+	pcb_tool_line_init,
+	pcb_tool_line_uninit,
+	pcb_tool_line_notify_mode,
+	NULL,
+	pcb_tool_line_adjust_attached_objects,
+	pcb_tool_line_draw_attached,
+	pcb_tool_line_undo_act,
+	pcb_tool_line_redo_act,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_line.h
===================================================================
--- tags/2.0.1/src/tool_line.h	(nonexistent)
+++ tags/2.0.1/src/tool_line.h	(revision 18980)
@@ -0,0 +1,9 @@
+extern pcb_tool_t pcb_tool_line;
+
+void pcb_tool_line_init(void);
+void pcb_tool_line_uninit(void);
+void pcb_tool_line_notify_mode(void);
+void pcb_tool_line_adjust_attached_objects(void);
+void pcb_tool_line_draw_attached(void);
+pcb_bool pcb_tool_line_undo_act(void);
+pcb_bool pcb_tool_line_redo_act(void);
Index: tags/2.0.1/src/tool_lock.c
===================================================================
--- tags/2.0.1/src/tool_lock.c	(nonexistent)
+++ tags/2.0.1/src/tool_lock.c	(revision 18980)
@@ -0,0 +1,89 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "change.h"
+#include "data.h"
+#include "draw.h"
+#include "actions.h"
+#include "search.h"
+#include "tool.h"
+#include "tool_lock.h"
+
+#define PCB_OBJ_CLASS_LOCK (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_LOCKED)
+
+void pcb_tool_lock_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	
+	type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_CLASS_LOCK, &ptr1, &ptr2, &ptr3);
+
+	if (type == PCB_OBJ_SUBC) {
+		pcb_subc_t *subc = (pcb_subc_t *)ptr2;
+		pcb_flag_change(PCB, PCB_CHGFLG_TOGGLE, PCB_FLAG_LOCK, PCB_OBJ_SUBC, ptr1, ptr2, ptr3);
+
+		DrawSubc(subc);
+		pcb_draw();
+		pcb_actionl("Report", "Subc", NULL);
+	}
+	else if (type != PCB_OBJ_VOID) {
+		pcb_text_t *thing = (pcb_text_t *) ptr3;
+		PCB_FLAG_TOGGLE(PCB_FLAG_LOCK, thing);
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, thing)
+				&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, thing)) {
+			/* this is not un-doable since LOCK isn't */
+			PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, thing);
+			pcb_draw_obj((pcb_any_obj_t *)ptr2);
+			pcb_draw();
+		}
+		pcb_actionl("Report", "Object", NULL);
+	}
+}
+
+pcb_tool_t pcb_tool_lock = {
+	"lock", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_lock_notify_mode,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_lock.h
===================================================================
--- tags/2.0.1/src/tool_lock.h	(nonexistent)
+++ tags/2.0.1/src/tool_lock.h	(revision 18980)
@@ -0,0 +1,3 @@
+extern pcb_tool_t pcb_tool_lock;
+
+void pcb_tool_lock_notify_mode(void);
Index: tags/2.0.1/src/tool_move.c
===================================================================
--- tags/2.0.1/src/tool_move.c	(nonexistent)
+++ tags/2.0.1/src/tool_move.c	(revision 18980)
@@ -0,0 +1,134 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "compat_nls.h"
+#include "copy.h"
+#include "crosshair.h"
+#include "search.h"
+#include "tool.h"
+
+
+void pcb_tool_move_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_move_notify_mode(void)
+{
+	pcb_coord_t dx, dy;
+
+	switch (pcb_crosshair.AttachedObject.State) {
+		/* first notify, lookup object */
+	case PCB_CH_STATE_FIRST:
+		{
+			int types = PCB_MOVE_TYPES;
+
+			pcb_crosshair.AttachedObject.Type =
+				pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, types,
+										 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
+			if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
+				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_any_obj_t *) pcb_crosshair.AttachedObject.Ptr2)) {
+					pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+				}
+				else
+					pcb_tool_attach_for_copy(pcb_tool_note.X, pcb_tool_note.Y, pcb_true);
+			}
+			break;
+		}
+
+		/* second notify, move object */
+	case PCB_CH_STATE_SECOND:
+		dx = pcb_crosshair.AttachedObject.tx - pcb_crosshair.AttachedObject.X;
+		dy = pcb_crosshair.AttachedObject.ty - pcb_crosshair.AttachedObject.Y;
+		if ((dx != 0) || (dy != 0)) {
+			pcb_move_obj_and_rubberband(pcb_crosshair.AttachedObject.Type, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3, dx, dy);
+			pcb_crosshair_set_local_ref(0, 0, pcb_false);
+			pcb_board_set_changed_flag(pcb_true);
+		}
+
+		/* reset identifiers */
+		pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+		pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+		pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight);
+		break;
+	}
+}
+
+void pcb_tool_move_release_mode (void)
+{
+	if (pcb_tool_note.Hit) {
+		pcb_tool_move_notify_mode();
+		pcb_tool_note.Hit = 0;
+	}
+}
+
+void pcb_tool_move_adjust_attached_objects(void)
+{
+	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
+	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
+}
+
+void pcb_tool_move_draw_attached(void)
+{
+	pcb_xordraw_movecopy();
+}
+
+pcb_bool pcb_tool_move_undo_act(void)
+{
+	/* don't allow undo in the middle of an operation */
+	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
+		return pcb_false;
+	return pcb_true;
+}
+
+pcb_tool_t pcb_tool_move = {
+	"move", NULL, 100,
+	NULL,
+	pcb_tool_move_uninit,
+	pcb_tool_move_notify_mode,
+	pcb_tool_move_release_mode,
+	pcb_tool_move_adjust_attached_objects,
+	pcb_tool_move_draw_attached,
+	pcb_tool_move_undo_act,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_move.h
===================================================================
--- tags/2.0.1/src/tool_move.h	(nonexistent)
+++ tags/2.0.1/src/tool_move.h	(revision 18980)
@@ -0,0 +1,7 @@
+extern pcb_tool_t pcb_tool_move;
+
+void pcb_tool_move_uninit(void);
+void pcb_tool_move_notify_mode(void);
+void pcb_tool_move_release_mode (void);
+void pcb_tool_move_draw_attached(void);
+pcb_bool pcb_tool_move_undo_act(void);
Index: tags/2.0.1/src/tool_poly.c
===================================================================
--- tags/2.0.1/src/tool_poly.c	(nonexistent)
+++ tags/2.0.1/src/tool_poly.c	(revision 18980)
@@ -0,0 +1,160 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "crosshair.h"
+#include "actions.h"
+#include "polygon.h"
+#include "tool.h"
+
+
+void pcb_tool_poly_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedPolygon.PointN = 0;
+	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_poly_notify_mode(void)
+{
+	pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+	pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+
+	/* do update of position */
+	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) {
+		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.X;
+		pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.Y;
+		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_THIRD;
+		pcb_crosshair.AttachedPolygon_pts = 0;
+	}
+
+	/* check if this is the last point of a polygon */
+	if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) {
+		pcb_actionl("Polygon", "Close", NULL);
+		return;
+	}
+
+	/* Someone clicking twice on the same point ('doubleclick'): close polygon */
+	if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) {
+		pcb_actionl("Polygon", "Close", NULL);
+		return;
+	}
+
+	/* create new point if it's the first one or if it's
+	 * different to the last one
+	 */
+	if (!n || points[n - 1].X != pcb_crosshair.AttachedLine.Point2.X || points[n - 1].Y != pcb_crosshair.AttachedLine.Point2.Y) {
+		pcb_poly_point_new(&pcb_crosshair.AttachedPolygon, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
+		pcb_crosshair.AttachedPolygon_pts = pcb_crosshair.AttachedPolygon.PointN;
+
+		/* copy the coordinates */
+		pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
+		pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
+	}
+
+	if (conf_core.editor.orthogonal_moves) {
+		/* set the mark to the new starting point so ortho works */
+		pcb_marked.X = pcb_tool_note.X;
+		pcb_marked.Y = pcb_tool_note.Y;
+	}
+}
+
+void pcb_tool_poly_adjust_attached_objects(void)
+{
+	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
+
+	if (pcb_gui->control_is_pressed()) {
+		line->draw = pcb_false;
+		return;
+	}
+	else
+		line->draw = pcb_true;
+	if (conf_core.editor.all_direction_lines) {
+		line->Point2.X = pcb_crosshair.X;
+		line->Point2.Y = pcb_crosshair.Y;
+		return;
+	}
+
+	pcb_line_45(line);
+}
+
+void pcb_tool_poly_draw_attached(void)
+{
+	/* draw only if starting point is set */
+	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
+		pcb_gui->draw_line(pcb_crosshair.GC,
+									 pcb_crosshair.AttachedLine.Point1.X,
+									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
+
+	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
+	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
+		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
+	}
+}
+
+pcb_bool pcb_tool_poly_undo_act(void)
+{
+	if (pcb_crosshair.AttachedPolygon.PointN) {
+		pcb_polygon_go_to_prev_point();
+		return pcb_false;
+	}
+	return pcb_true;
+}
+
+pcb_bool pcb_tool_poly_redo_act(void)
+{
+	if (pcb_crosshair.AttachedPolygon.PointN) {
+		pcb_polygon_go_to_next_point();
+		return pcb_false;
+	}
+	else
+		return pcb_true;
+}
+
+pcb_tool_t pcb_tool_poly = {
+	"poly", NULL, 100,
+	NULL,
+	pcb_tool_poly_uninit,
+	pcb_tool_poly_notify_mode,
+	NULL,
+	pcb_tool_poly_adjust_attached_objects,
+	pcb_tool_poly_draw_attached,
+	pcb_tool_poly_undo_act,
+	pcb_tool_poly_redo_act,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_poly.h
===================================================================
--- tags/2.0.1/src/tool_poly.h	(nonexistent)
+++ tags/2.0.1/src/tool_poly.h	(revision 18980)
@@ -0,0 +1,8 @@
+extern pcb_tool_t pcb_tool_poly;
+
+void pcb_tool_poly_uninit(void);
+void pcb_tool_poly_notify_mode(void);
+void pcb_tool_poly_adjust_attached_objects(void);
+void pcb_tool_poly_draw_attached(void);
+pcb_bool pcb_tool_poly_undo_act(void);
+pcb_bool pcb_tool_poly_redo_act(void);
Index: tags/2.0.1/src/tool_polyhole.c
===================================================================
--- tags/2.0.1/src/tool_polyhole.c	(nonexistent)
+++ tags/2.0.1/src/tool_polyhole.c	(revision 18980)
@@ -0,0 +1,191 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "compat_nls.h"
+#include "crosshair.h"
+#include "actions.h"
+#include "polygon.h"
+#include "search.h"
+#include "tool.h"
+
+
+void pcb_tool_polyhole_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedPolygon.PointN = 0;
+	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_polyhole_notify_mode(void)
+{
+	switch (pcb_crosshair.AttachedObject.State) {
+		/* first notify, lookup object */
+	case PCB_CH_STATE_FIRST:
+		pcb_crosshair.AttachedPolygon_pts = 0;
+		pcb_crosshair.AttachedObject.Type =
+			pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_POLY,
+									 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
+
+		if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_VOID) {
+			pcb_message(PCB_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n");
+			break; /* don't start doing anything if clicket out of polys */
+		}
+
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)
+									pcb_crosshair.AttachedObject.Ptr2)) {
+			pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+			pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+			break;
+		}
+		else
+			pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
+	/* fall thru: first click is also the first point of the poly hole */
+
+		/* second notify, insert new point into object */
+	case PCB_CH_STATE_SECOND:
+		{
+			pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+			pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+
+			/* do update of position */
+			if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) {
+				pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X = pcb_crosshair.X;
+				pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y = pcb_crosshair.Y;
+				pcb_crosshair.AttachedLine.State = PCB_CH_STATE_THIRD;
+			}
+
+			if (conf_core.editor.orthogonal_moves) {
+				/* set the mark to the new starting point so ortho works */
+				pcb_marked.X = pcb_tool_note.X;
+				pcb_marked.Y = pcb_tool_note.Y;
+			}
+
+			/* check if this is the last point of a polygon */
+			if (n >= 3 && points[0].X == pcb_crosshair.AttachedLine.Point2.X && points[0].Y == pcb_crosshair.AttachedLine.Point2.Y) {
+				pcb_actionl("Polygon", "CloseHole", NULL);
+				break;
+			}
+
+			/* Someone clicking twice on the same point ('doubleclick'): close polygon hole */
+			if (n >= 3 && points[n - 1].X == pcb_crosshair.AttachedLine.Point2.X && points[n - 1].Y == pcb_crosshair.AttachedLine.Point2.Y) {
+				pcb_actionl("Polygon", "CloseHole", NULL);
+				break;
+			}
+
+			/* create new point if it's the first one or if it's
+			 * different to the last one
+			 */
+			if (!n || points[n - 1].X != pcb_crosshair.AttachedLine.Point2.X || points[n - 1].Y != pcb_crosshair.AttachedLine.Point2.Y) {
+				pcb_poly_point_new(&pcb_crosshair.AttachedPolygon,
+																pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
+				pcb_crosshair.AttachedPolygon_pts = pcb_crosshair.AttachedPolygon.PointN;
+
+				/* copy the coordinates */
+				pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
+				pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
+			}
+			break;
+		}
+	}
+}
+
+void pcb_tool_polyhole_adjust_attached_objects(void)
+{
+	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
+
+	if (pcb_gui->control_is_pressed()) {
+		line->draw = pcb_false;
+		return;
+	}
+	else
+		line->draw = pcb_true;
+	if (conf_core.editor.all_direction_lines) {
+		line->Point2.X = pcb_crosshair.X;
+		line->Point2.Y = pcb_crosshair.Y;
+		return;
+	}
+
+	pcb_line_45(line);
+}
+
+void pcb_tool_polyhole_draw_attached(void)
+{
+	/* draw only if starting point is set */
+	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
+		pcb_gui->draw_line(pcb_crosshair.GC,
+									 pcb_crosshair.AttachedLine.Point1.X,
+									 pcb_crosshair.AttachedLine.Point1.Y, pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y);
+
+	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
+	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
+		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
+	}
+}
+
+pcb_bool pcb_tool_polyhole_undo_act(void)
+{
+	if (pcb_crosshair.AttachedPolygon.PointN) {
+		pcb_polygon_go_to_prev_point();
+		return pcb_false;
+	}
+	return pcb_true;
+}
+
+pcb_bool pcb_tool_polyhole_redo_act(void)
+{
+	if (pcb_crosshair.AttachedPolygon.PointN) {
+		pcb_polygon_go_to_next_point();
+		return pcb_false;
+	}
+	else
+		return pcb_true;
+}
+
+pcb_tool_t pcb_tool_polyhole = {
+	"polyhole", NULL, 100,
+	NULL,
+	pcb_tool_polyhole_uninit,
+	pcb_tool_polyhole_notify_mode,
+	NULL,
+	pcb_tool_polyhole_adjust_attached_objects,
+	pcb_tool_polyhole_draw_attached,
+	pcb_tool_polyhole_undo_act,
+	pcb_tool_polyhole_redo_act,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_polyhole.h
===================================================================
--- tags/2.0.1/src/tool_polyhole.h	(nonexistent)
+++ tags/2.0.1/src/tool_polyhole.h	(revision 18980)
@@ -0,0 +1,8 @@
+extern pcb_tool_t pcb_tool_polyhole;
+
+void pcb_tool_polyhole_uninit(void);
+void pcb_tool_polyhole_notify_mode(void);
+void pcb_tool_polyhole_adjust_attached_objects(void);
+void pcb_tool_polyhole_draw_attached(void);
+pcb_bool pcb_tool_polyhole_undo_act(void);
+pcb_bool pcb_tool_polyhole_redo_act(void);
Index: tags/2.0.1/src/tool_rectangle.c
===================================================================
--- tags/2.0.1/src/tool_rectangle.c	(nonexistent)
+++ tags/2.0.1/src/tool_rectangle.c	(revision 18980)
@@ -0,0 +1,126 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "data.h"
+#include "draw.h"
+#include "tool.h"
+#include "undo.h"
+
+#include "obj_poly_draw.h"
+
+
+void pcb_tool_rectangle_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+void pcb_tool_rectangle_notify_mode(void)
+{
+	/* do update of position */
+	pcb_tool_notify_block();
+
+	/* create rectangle if both corners are determined
+	 * and width, height are != 0
+	 */
+	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD &&
+			pcb_crosshair.AttachedBox.Point1.X != pcb_crosshair.AttachedBox.Point2.X &&
+			pcb_crosshair.AttachedBox.Point1.Y != pcb_crosshair.AttachedBox.Point2.Y) {
+		pcb_poly_t *polygon;
+		pcb_layer_t *layer = pcb_loose_subc_layer(PCB, CURRENT);
+
+		int flags = PCB_FLAG_CLEARPOLY;
+		if (conf_core.editor.full_poly)
+			flags |= PCB_FLAG_FULLPOLY;
+		if (conf_core.editor.clear_polypoly)
+			flags |= PCB_FLAG_CLEARPOLYPOLY;
+		if ((polygon = pcb_poly_new_from_rectangle(layer,
+																								 pcb_crosshair.AttachedBox.Point1.X,
+																								 pcb_crosshair.AttachedBox.Point1.Y,
+																								 pcb_crosshair.AttachedBox.Point2.X,
+																								 pcb_crosshair.AttachedBox.Point2.Y,
+																								 2 * conf_core.design.clearance,
+																								 pcb_flag_make(flags))) != NULL) {
+			pcb_obj_add_attribs(polygon, PCB->pen_attr);
+			pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, polygon, polygon);
+			pcb_undo_inc_serial();
+			pcb_poly_invalidate_draw(layer, polygon);
+			pcb_draw();
+		}
+
+		/* reset state to 'first corner' */
+		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+	}
+}
+
+void pcb_tool_rectangle_adjust_attached_objects(void)
+{
+	switch (pcb_crosshair.AttachedBox.State) {
+	case PCB_CH_STATE_SECOND:						/* one corner is selected */
+		{
+			/* update coordinates */
+			pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
+			pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.Y;
+			break;
+		}
+	}
+}
+
+pcb_bool pcb_tool_rectangle_anydo_act(void)
+{
+	/* don't allow undo in the middle of an operation */
+	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
+		return pcb_false;
+	return pcb_true;
+}
+
+pcb_tool_t pcb_tool_rectangle = {
+	"rectangle", NULL, 100,
+	NULL,
+	pcb_tool_rectangle_uninit,
+	pcb_tool_rectangle_notify_mode,
+	NULL,
+	pcb_tool_rectangle_adjust_attached_objects,
+	NULL,
+	pcb_tool_rectangle_anydo_act,
+	pcb_tool_rectangle_anydo_act,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_rectangle.h
===================================================================
--- tags/2.0.1/src/tool_rectangle.h	(nonexistent)
+++ tags/2.0.1/src/tool_rectangle.h	(revision 18980)
@@ -0,0 +1,6 @@
+extern pcb_tool_t pcb_tool_rectangle;
+
+void pcb_tool_rectangle_uninit(void);
+void pcb_tool_rectangle_notify_mode(void);
+void pcb_tool_rectangle_adjust_attached_objects(void);
+pcb_bool pcb_tool_rectangle_undo_act(void);
Index: tags/2.0.1/src/tool_remove.c
===================================================================
--- tags/2.0.1/src/tool_remove.c	(nonexistent)
+++ tags/2.0.1/src/tool_remove.c	(revision 18980)
@@ -0,0 +1,94 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "compat_nls.h"
+#include "event.h"
+#include "actions.h"
+#include "undo.h"
+#include "remove.h"
+#include "search.h"
+#include "tool.h"
+
+
+void pcb_tool_remove_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	pcb_any_obj_t *obj;
+	int type;
+	
+	if ((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_line_t *) ptr2)) {
+			pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+			return;
+		}
+
+		if (type == PCB_OBJ_SUBC) {
+			if(PCB->is_footprint) {
+				pcb_message(PCB_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n");
+				return;
+			}
+			pcb_event(PCB_EVENT_RUBBER_REMOVE_SUBC, "ppp", ptr1, ptr2, ptr3);
+		}
+
+		/* preserve original parent over the board layer pcb_search_screen operated on -
+		   this is essential for undo: it needs to put back the object to the original
+		   layer (e.g. inside a subc) instead of on the board layer */
+		obj = ptr2;
+		if (obj->parent_type == PCB_PARENT_LAYER)
+			ptr1 = obj->parent.layer;
+		else if (obj->parent_type == PCB_PARENT_DATA)
+			ptr1 = obj->parent.data;
+
+		pcb_remove_object(type, ptr1, ptr2, ptr3);
+		pcb_undo_inc_serial();
+		pcb_board_set_changed_flag(pcb_true);
+	}
+}
+
+pcb_tool_t pcb_tool_remove = {
+	"remove", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_remove_notify_mode,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_remove.h
===================================================================
--- tags/2.0.1/src/tool_remove.h	(nonexistent)
+++ tags/2.0.1/src/tool_remove.h	(revision 18980)
@@ -0,0 +1,3 @@
+extern pcb_tool_t pcb_tool_remove;
+
+void pcb_tool_remove_notify_mode(void);
Index: tags/2.0.1/src/tool_rotate.c
===================================================================
--- tags/2.0.1/src/tool_rotate.c	(nonexistent)
+++ tags/2.0.1/src/tool_rotate.c	(revision 18980)
@@ -0,0 +1,61 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "actions.h"
+#include "rotate.h"
+#include "tool.h"
+
+
+void pcb_tool_rotate_notify_mode(void)
+{
+	pcb_screen_obj_rotate90(pcb_tool_note.X, pcb_tool_note.Y, pcb_gui->shift_is_pressed()? (conf_core.editor.show_solder_side ? 1 : 3)
+									 : (conf_core.editor.show_solder_side ? 3 : 1));
+}
+
+pcb_tool_t pcb_tool_rotate = {
+	"rotate", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_rotate_notify_mode,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	
+	pcb_true
+};
Index: tags/2.0.1/src/tool_rotate.h
===================================================================
--- tags/2.0.1/src/tool_rotate.h	(nonexistent)
+++ tags/2.0.1/src/tool_rotate.h	(revision 18980)
@@ -0,0 +1,3 @@
+extern pcb_tool_t pcb_tool_rotate;
+
+void pcb_tool_rotate_notify_mode(void);
Index: tags/2.0.1/src/tool_text.c
===================================================================
--- tags/2.0.1/src/tool_text.c	(nonexistent)
+++ tags/2.0.1/src/tool_text.c	(revision 18980)
@@ -0,0 +1,106 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "compat_nls.h"
+#include "data.h"
+#include "draw.h"
+#include "actions.h"
+#include "tool.h"
+#include "undo.h"
+
+#include "obj_text_draw.h"
+
+
+void pcb_tool_text_notify_mode(void)
+{
+	char *string;
+
+	if ((string = pcb_gui->prompt_for(_("Enter text:"), "")) != NULL) {
+		if (strlen(string) > 0) {
+			pcb_text_t *text;
+			int flag = PCB_FLAG_CLEARLINE;
+
+			if (pcb_layer_flags(PCB, INDEXOFCURRENT) & PCB_LYT_BOTTOM)
+				flag |= PCB_FLAG_ONSOLDER;
+			if ((text = pcb_text_new(pcb_loose_subc_layer(PCB, CURRENT), pcb_font(PCB, conf_core.design.text_font_id, 1), pcb_tool_note.X,
+																pcb_tool_note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) {
+				pcb_undo_add_obj_to_create(PCB_OBJ_TEXT, CURRENT, text, text);
+				pcb_undo_inc_serial();
+				pcb_text_invalidate_draw(CURRENT, text);
+				pcb_draw();
+			}
+		}
+		free(string);
+	}
+}
+
+void pcb_tool_text_draw_attached(void)
+{
+	pcb_text_t text;
+	int flag = PCB_FLAG_CLEARLINE;
+
+	if (pcb_layer_flags(PCB, INDEXOFCURRENT) & PCB_LYT_BOTTOM)
+		flag |= PCB_FLAG_ONSOLDER;
+
+	text.X = pcb_crosshair.X;
+	text.Y = pcb_crosshair.Y;
+	text.Direction = 0;
+	text.Flags = pcb_flag_make(flag);
+	text.Scale = conf_core.design.text_scale;
+	text.TextString = "A";
+	text.fid = conf_core.design.text_font_id;
+	text.ID = 0;
+
+	pcb_text_draw_xor(&text,0,0);
+
+}
+
+pcb_tool_t pcb_tool_text = {
+	"text", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_text_notify_mode,
+	NULL,
+	NULL,
+	pcb_tool_text_draw_attached,
+	NULL,
+	NULL,
+	
+	pcb_false
+};
+
Index: tags/2.0.1/src/tool_text.h
===================================================================
--- tags/2.0.1/src/tool_text.h	(nonexistent)
+++ tags/2.0.1/src/tool_text.h	(revision 18980)
@@ -0,0 +1,3 @@
+extern pcb_tool_t pcb_tool_text;
+
+void pcb_tool_text_notify_mode(void);
Index: tags/2.0.1/src/tool_thermal.c
===================================================================
--- tags/2.0.1/src/tool_thermal.c	(nonexistent)
+++ tags/2.0.1/src/tool_thermal.c	(revision 18980)
@@ -0,0 +1,115 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "change.h"
+#include "data.h"
+#include "actions.h"
+#include "obj_pstk.h"
+#include "search.h"
+#include "thermal.h"
+#include "tool.h"
+
+void pcb_tool_thermal_on_pstk(pcb_pstk_t *ps, unsigned long lid)
+{
+	unsigned char *th, newth = 0;
+	unsigned char cycle[] = {
+		PCB_THERMAL_ON | PCB_THERMAL_ROUND | PCB_THERMAL_DIAGONAL, /* default start shape */
+		PCB_THERMAL_ON | PCB_THERMAL_ROUND,
+		PCB_THERMAL_ON | PCB_THERMAL_SHARP | PCB_THERMAL_DIAGONAL,
+		PCB_THERMAL_ON | PCB_THERMAL_SHARP,
+		PCB_THERMAL_ON | PCB_THERMAL_SOLID
+	};
+	int cycles = sizeof(cycle) / sizeof(cycle[0]);
+
+	th = pcb_pstk_get_thermal(ps, lid, 1);
+	if (pcb_gui->shift_is_pressed()) {
+		int n, curr = -1;
+		/* cycle through the variants to find the current one */
+		for(n = 0; n < cycles; n++) {
+			if (*th == cycle[n]) {
+				curr = n;
+				break;
+			}
+		}
+		
+		/* bump current pattern to the next or set it up */
+		if (curr >= 0) {
+			curr++;
+			if (curr >= cycles)
+				curr = 0;
+		}
+		else
+			curr = 0;
+
+		newth = cycle[curr];
+	}
+	else {
+		if ((th != NULL) && (*th != 0))
+			newth = *th ^ PCB_THERMAL_ON; /* existing thermal, toggle */
+		else
+			newth = cycle[0]; /* new thermal, use default */
+	}
+
+	pcb_chg_obj_thermal(PCB_OBJ_PSTK, ps, ps, ps, newth, lid);
+}
+
+
+void pcb_tool_thermal_notify_mode(void)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	if (((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_CLASS_PIN, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID)
+			&& !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_any_obj_t *) ptr3)) {
+		if (type == PCB_OBJ_PSTK)
+			pcb_tool_thermal_on_pstk((pcb_pstk_t *)ptr2, INDEXOFCURRENT);
+	}
+}
+
+pcb_tool_t pcb_tool_thermal = {
+	"thermal", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_thermal_notify_mode,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_thermal.h
===================================================================
--- tags/2.0.1/src/tool_thermal.h	(nonexistent)
+++ tags/2.0.1/src/tool_thermal.h	(revision 18980)
@@ -0,0 +1,6 @@
+extern pcb_tool_t pcb_tool_thermal;
+
+void pcb_tool_thermal_notify_mode(void);
+
+/* direct call: cycle through thermal modes on a padstack - provided for tool_via.h */
+void pcb_tool_thermal_on_pstk(pcb_pstk_t *ps, unsigned long lid);
Index: tags/2.0.1/src/tool_via.c
===================================================================
--- tags/2.0.1/src/tool_via.c	(nonexistent)
+++ tags/2.0.1/src/tool_via.c	(revision 18980)
@@ -0,0 +1,117 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "change.h"
+#include "compat_nls.h"
+#include "hid_inlines.h"
+#include "data.h"
+#include "draw.h"
+#include "tool.h"
+#include "tool_thermal.h"
+#include "undo.h"
+
+#include "obj_pstk_draw.h"
+
+#warning padstack TODO: remove this when via is removed and the padstack is created from style directly
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+void pcb_tool_via_notify_mode(void)
+{
+
+	if (!PCB->pstk_on) {
+		pcb_message(PCB_MSG_WARNING, _("You must turn via visibility on before\n" "you can place vias\n"));
+		return;
+	}
+
+	if (conf_core.design.via_drilling_hole >= conf_core.design.via_thickness) {
+		pcb_message(PCB_MSG_ERROR, "Can't place via: invalid via geometry (hole too large for via size)\n");
+		return;
+	}
+
+#warning pdstk TODO #21: do not work in comp mode, use a pstk proto - scconfig also has TODO #21, fix it there too
+	{
+		pcb_pstk_t *ps = pcb_pstk_new_compat_via(PCB->Data, pcb_tool_note.X, pcb_tool_note.Y,
+			conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance,
+			0, PCB_PSTK_COMPAT_ROUND, pcb_true);
+		if (ps == NULL)
+			return;
+
+		pcb_obj_add_attribs(ps, PCB->pen_attr);
+		pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, ps, ps, ps);
+
+		if (pcb_gui->shift_is_pressed())
+			pcb_tool_thermal_on_pstk(ps, INDEXOFCURRENT);
+
+		pcb_undo_inc_serial();
+		pcb_pstk_invalidate_draw(ps);
+		pcb_draw();
+	}
+}
+
+static void xor_draw_fake_via(pcb_coord_t x, pcb_coord_t y, pcb_coord_t dia, pcb_coord_t clearance)
+{
+	pcb_coord_t r = (dia/2)+clearance;
+	pcb_gui->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360);
+}
+
+
+void pcb_tool_via_draw_attached(void)
+{
+#warning padstack TODO: replace this when route style has a prototype
+	xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0);
+	if (conf_core.editor.show_drc) {
+		/* XXX: Naughty cheat - use the mask to draw DRC clearance! */
+		pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+		xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance);
+		pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+	}
+}
+
+pcb_tool_t pcb_tool_via = {
+	"via", NULL, 100,
+	NULL,
+	NULL,
+	pcb_tool_via_notify_mode,
+	NULL,
+	NULL,
+	pcb_tool_via_draw_attached,
+	NULL,
+	NULL,
+	
+	pcb_false
+};
Index: tags/2.0.1/src/tool_via.h
===================================================================
--- tags/2.0.1/src/tool_via.h	(nonexistent)
+++ tags/2.0.1/src/tool_via.h	(revision 18980)
@@ -0,0 +1,4 @@
+extern pcb_tool_t pcb_tool_via;
+
+void pcb_tool_via_notify_mode(void);
+void pcb_tool_via_draw_attached(void);
Index: tags/2.0.1/src/undo.c
===================================================================
--- tags/2.0.1/src/undo.c	(nonexistent)
+++ tags/2.0.1/src/undo.c	(revision 18980)
@@ -0,0 +1,293 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* functions used to undo operations
+ *
+ * Description:
+ * There are two lists which hold
+ *   - the uundo list (information about a command)
+ *   - data of removed objects
+ * Both lists are organized as first-in-last-out which means that the undo
+ * list can always use the last entry of the remove list.
+ * A serial number is incremented whenever an operation is completed.
+ * An operation itself may consist of several basic instructions.
+ * E.g.: removing all selected objects is one operation with exactly one
+ * serial number even if the remove function is called several times.
+ *
+ * a lock flag ensures that no infinite loops occur
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <libuundo/uundo_debug.h>
+
+#include "board.h"
+#include "change.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "insert.h"
+#include "polygon.h"
+#include "remove.h"
+#include "rotate.h"
+#include "search.h"
+#include "undo.h"
+#include "undo_old.h"
+#include "flag_str.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+#include "obj_poly_draw.h"
+
+static pcb_bool between_increment_and_restore = pcb_false;
+static pcb_bool added_undo_between_increment_and_restore = pcb_false;
+
+pcb_data_t *pcb_removelist = NULL; /* lists of removed objects */
+static pcb_bool Locked = pcb_false; /* do not add entries if */
+pcb_bool pcb_undo_and_draw = pcb_true; /* flag is set; prevents from infinite loops */
+static uundo_list_t pcb_uundo;
+
+void *pcb_undo_alloc(pcb_board_t *pcb, const uundo_oper_t *oper, size_t data_len)
+{
+	return uundo_append(&pcb_uundo, oper, data_len);
+}
+
+int pcb_undo(pcb_bool draw)
+{
+	int res;
+
+	pcb_undo_and_draw = draw;
+
+	if (pcb_uundo.num_undo == 0) {
+		pcb_message(PCB_MSG_INFO, _("Nothing to undo - buffer is empty\n"));
+		return -1;
+	}
+
+	if (pcb_uundo.serial == 0) {
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Attempt to pcb_undo() with Serial == 0\n" "       Please save your work and report this bug.\n"));
+		return -1;
+	}
+
+	if ((pcb_uundo.tail != NULL) && (pcb_uundo.tail->serial > pcb_uundo.serial)) {
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Bad undo serial number %d in undo stack - expecting %d or lower\n"
+							"       Please save your work and report this bug.\n"), pcb_uundo.tail->serial, pcb_uundo.serial);
+
+	/* It is likely that the serial number got corrupted through some bad
+		 * use of the pcb_undo_save_serial() / pcb_undo_restore_serial() APIs.
+		 *
+		 * Reset the serial number to be consistent with that of the last
+		 * operation on the undo stack in the hope that this might clear
+		 * the problem and  allow the user to hit Undo again.
+		 */
+		pcb_uundo.serial = pcb_uundo.tail->serial + 1;
+		return -1;
+	}
+
+	pcb_undo_lock(); /* lock undo module to prevent from loops */
+	res = uundo_undo(&pcb_uundo);
+	pcb_undo_unlock();
+
+	if (res != 0)
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Failed to undo some operations\n"));
+	else if (pcb_undo_and_draw)
+		pcb_draw();
+
+	return res;
+}
+
+int pcb_redo(pcb_bool draw)
+{
+	int res;
+
+	pcb_undo_and_draw = draw;
+
+	if (pcb_uundo.num_redo == 0) {
+		pcb_message(PCB_MSG_INFO, _("Nothing to redo. Perhaps changes have been made since last undo\n"));
+		return 0;
+	}
+
+	if ((pcb_uundo.tail != NULL) && (pcb_uundo.tail->next != NULL) && (pcb_uundo.tail->next->serial > pcb_uundo.serial)) {
+
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Bad undo serial number %d in redo stack - expecting %d or higher\n"
+							"       Please save your work and report this bug.\n"), pcb_uundo.tail->next->serial, pcb_uundo.serial);
+
+		/* It is likely that the serial number got corrupted through some bad
+		 * use of the pcb_undo_save_serial() / pcb_undo_restore_serial() APIs.
+		 *
+		 * Reset the serial number to be consistent with that of the first
+		 * operation on the redo stack in the hope that this might clear
+		 * the problem and  allow the user to hit Redo again.
+		 */
+
+		pcb_uundo.serial = pcb_uundo.tail->next->serial;
+		return 0;
+	}
+
+	pcb_undo_lock(); /* lock undo module to prevent from loops */
+	uundo_freeze_add(&pcb_uundo);
+	res = uundo_redo(&pcb_uundo);
+	uundo_unfreeze_add(&pcb_uundo);
+	pcb_undo_unlock();
+
+	if (res != 0)
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Failed to redo some operations\n"));
+	else if (pcb_undo_and_draw)
+		pcb_draw();
+
+	return res;
+}
+
+/* ---------------------------------------------------------------------------
+ * restores the serial number of the undo list
+ */
+void pcb_undo_restore_serial(void)
+{
+	if (added_undo_between_increment_and_restore)
+		pcb_message(PCB_MSG_ERROR, _("ERROR: Operations were added to the Undo stack with an incorrect serial number\n"));
+	between_increment_and_restore = pcb_false;
+	added_undo_between_increment_and_restore = pcb_false;
+	uundo_restore_serial(&pcb_uundo);
+}
+
+/* ---------------------------------------------------------------------------
+ * saves the serial number of the undo list
+ */
+void pcb_undo_save_serial(void)
+{
+	pcb_bumped = pcb_false;
+	between_increment_and_restore = pcb_false;
+	added_undo_between_increment_and_restore = pcb_false;
+	uundo_save_serial(&pcb_uundo);
+}
+
+/* ---------------------------------------------------------------------------
+ * increments the serial number of the undo list
+ * it's not done automatically because some operations perform more
+ * than one request with the same serial #
+ */
+void pcb_undo_inc_serial(void)
+{
+	if (!Locked) {
+		/* Set the changed flag if anything was added prior to this bump */
+		if ((pcb_uundo.tail != NULL) && (pcb_uundo.tail->serial == pcb_uundo.serial))
+			pcb_board_set_changed_flag(pcb_true);
+
+		uundo_inc_serial(&pcb_uundo);
+		pcb_bumped = pcb_true;
+		between_increment_and_restore = pcb_true;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * releases memory of the undo- and remove list
+ */
+void pcb_undo_clear_list(pcb_bool Force)
+{
+	if (pcb_uundo.num_undo && (Force || pcb_gui->confirm_dialog("OK to clear 'undo' buffer?", 0)))
+		uundo_list_clear(&pcb_uundo);
+}
+
+/* ---------------------------------------------------------------------------
+ * set lock flag
+ */
+void pcb_undo_lock(void)
+{
+	Locked = pcb_true;
+}
+
+/* ---------------------------------------------------------------------------
+ * reset lock flag
+ */
+void pcb_undo_unlock(void)
+{
+	Locked = pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * return undo lock state
+ */
+pcb_bool pcb_undoing(void)
+{
+	return Locked;
+}
+
+uundo_serial_t pcb_undo_serial(void)
+{
+	return pcb_uundo.serial;
+}
+
+
+void pcb_undo_truncate_from(uundo_serial_t sfirst)
+{
+	uundo_list_truncate_from(&pcb_uundo, sfirst);
+}
+
+int undo_check(void)
+{
+	const char *res = uundo_check(&pcb_uundo, NULL);
+
+#ifndef NDEBUG
+	if (res != NULL) {
+		printf("Undo broken: %s\n", res);
+		uundo_dump(&pcb_uundo, NULL, NULL);
+	}
+#endif
+
+	return (res != NULL);
+}
+
+#ifndef NDEBUG
+void undo_dump(void)
+{
+	uundo_dump(&pcb_uundo, NULL, NULL);
+}
+#endif
+
+void pcb_undo_freeze_serial(void)
+{
+	uundo_freeze_serial(&pcb_uundo);
+}
+
+void pcb_undo_unfreeze_serial(void)
+{
+	uundo_unfreeze_serial(&pcb_uundo);
+}
+
+
+void pcb_undo_freeze_add(void)
+{
+	uundo_freeze_add(&pcb_uundo);
+}
+
+void pcb_undo_unfreeze_add(void)
+{
+	uundo_unfreeze_add(&pcb_uundo);
+}
+
Index: tags/2.0.1/src/undo.h
===================================================================
--- tags/2.0.1/src/undo.h	(nonexistent)
+++ tags/2.0.1/src/undo.h	(revision 18980)
@@ -0,0 +1,68 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_UNDO_H
+#define	PCB_UNDO_H
+
+#include <stdlib.h>
+#include <libuundo/uundo.h>
+
+/* Temporary for compatibility */
+#include "undo_old.h"
+
+void *pcb_undo_alloc(pcb_board_t *pcb, const uundo_oper_t *oper, size_t data_len);
+int pcb_undo(pcb_bool);
+int pcb_redo(pcb_bool);
+void pcb_undo_inc_serial(void);
+void pcb_undo_save_serial(void);
+void pcb_undo_restore_serial(void);
+void pcb_undo_clear_list(pcb_bool);
+
+void pcb_undo_lock(void);
+void pcb_undo_unlock(void);
+pcb_bool pcb_undoing(void);
+
+uundo_serial_t pcb_undo_serial(void);
+void pcb_undo_truncate_from(uundo_serial_t sfirst);
+
+void pcb_undo_freeze_serial(void);
+void pcb_undo_unfreeze_serial(void);
+void pcb_undo_freeze_add(void);
+void pcb_undo_unfreeze_add(void);
+
+/* Returns 0 if undo integrity is not broken */
+int undo_check(void);
+
+void undo_dump(void);
+
+/* temporary */
+#include "pcb_bool.h"
+extern pcb_data_t *pcb_removelist;
+extern pcb_bool pcb_undo_and_draw;
+
+#endif
Index: tags/2.0.1/src/undo_act.c
===================================================================
--- tags/2.0.1/src/undo_act.c	(nonexistent)
+++ tags/2.0.1/src/undo_act.c	(revision 18980)
@@ -0,0 +1,200 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "actions.h"
+#include "data.h"
+#include "compat_misc.h"
+#include "error.h"
+#include "funchash_core.h"
+
+#include "undo.h"
+#include "undo_act.h"
+#include "polygon.h"
+#include "search.h"
+
+#include "obj_line_draw.h"
+
+#include "tool.h"
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Atomic[] = "Atomic(Save|Restore|Close|Block)";
+
+static const char pcb_acth_Atomic[] = "Save or restore the undo serial number.";
+
+/* %start-doc actions Atomic
+
+This action allows making multiple-action bindings into an atomic
+operation that will be undone by a single Undo command.  For example,
+to optimize rat lines, you'd delete the rats and re-add them.  To
+group these into a single undo, you'd want the deletions and the
+additions to have the same undo serial number.  So, you @code{Save},
+delete the rats, @code{Restore}, add the rats - using the same serial
+number as the deletes, then @code{Block}, which checks to see if the
+deletions or additions actually did anything.  If not, the serial
+number is set to the saved number, as there's nothing to undo.  If
+something did happen, the serial number is incremented so that these
+actions are counted as a single undo step.
+
+@table @code
+
+@item Save
+Saves the undo serial number.
+
+@item Restore
+Returns it to the last saved number.
+
+@item Close
+Sets it to 1 greater than the last save.
+
+@item Block
+Does a Restore if there was nothing to undo, else does a Close.
+
+@end table
+
+%end-doc */
+
+fgw_error_t pcb_act_Atomic(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, Atomic, op = fgw_keyword(&argv[1]));
+
+	switch (op) {
+	case F_Save:
+		pcb_undo_save_serial();
+		break;
+	case F_Restore:
+		pcb_undo_restore_serial();
+		break;
+	case F_Close:
+		pcb_undo_restore_serial();
+		pcb_undo_inc_serial();
+		break;
+	case F_Block:
+		pcb_undo_restore_serial();
+		if (pcb_bumped)
+			pcb_undo_inc_serial();
+		break;
+	default:
+		pcb_message(PCB_MSG_ERROR, "Invalid argument for Atomic()\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Undo[] = "undo()\n" "undo(ClearList)";
+
+static const char pcb_acth_Undo[] = "Undo recent changes.";
+
+/* %start-doc actions Undo
+
+The unlimited undo feature of @code{Pcb} allows you to recover from
+most operations that materially affect you work.  Calling
+@code{pcb_undo()} without any parameter recovers from the last (non-undo)
+operation. @code{ClearList} is used to release the allocated
+memory. @code{ClearList} is called whenever a new layout is started or
+loaded. See also @code{Redo} and @code{Atomic}.
+
+Note that undo groups operations by serial number; changes with the
+same serial number will be undone (or redone) as a group.  See
+@code{Atomic}.
+
+%end-doc */
+
+fgw_error_t pcb_act_Undo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function = NULL;
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Undo, function = argv[1].val.str);
+	if (!function || !*function) {
+		pcb_notify_crosshair_change(pcb_false);
+		if (pcb_tool_undo_act())
+			if (pcb_undo(pcb_true) == 0)
+				pcb_board_set_changed_flag(pcb_true);
+	}
+	else if (function) {
+		if (pcb_strcasecmp(function, "ClearList") == 0)
+			pcb_undo_clear_list(pcb_false);
+	}
+	pcb_notify_crosshair_change(pcb_true);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Redo[] = "redo()";
+
+static const char pcb_acth_Redo[] = "Redo recent \"undo\" operations.";
+
+/* %start-doc actions Redo
+
+This routine allows you to recover from the last undo command.  You
+might want to do this if you thought that undo was going to revert
+something other than what it actually did (in case you are confused
+about which operations are un-doable), or if you have been backing up
+through a long undo list and over-shoot your stopping point.  Any
+change that is made since the undo in question will trim the redo
+list.  For example if you add ten lines, then undo three of them you
+could use redo to put them back, but if you move a line on the board
+before performing the redo, you will lose the ability to "redo" the
+three "undone" lines.
+
+%end-doc */
+
+fgw_error_t pcb_act_Redo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	if (pcb_tool_redo_act())
+		if (pcb_redo(pcb_true))
+			pcb_board_set_changed_flag(pcb_true);
+	pcb_notify_crosshair_change(pcb_true);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t undo_action_list[] = {
+	{"Atomic", pcb_act_Atomic, pcb_acth_Atomic, pcb_acts_Atomic},
+	{"Undo", pcb_act_Undo, pcb_acth_Undo, pcb_acts_Undo},
+	{"Redo", pcb_act_Redo, pcb_acth_Redo, pcb_acts_Redo}
+};
+
+PCB_REGISTER_ACTIONS(undo_action_list, NULL)
Index: tags/2.0.1/src/undo_act.h
===================================================================
--- tags/2.0.1/src/undo_act.h	(nonexistent)
+++ tags/2.0.1/src/undo_act.h	(revision 18980)
@@ -0,0 +1,4 @@
+/* Publish actions - these may be useful for other actions */
+fgw_error_t pcb_act_Undo(fgw_arg_t *res, int oargc, fgw_arg_t *oargv);
+fgw_error_t pcb_act_Redo(fgw_arg_t *res, int oargc, fgw_arg_t *oargv);
+fgw_error_t pcb_act_Atomic(fgw_arg_t *res, int oargc, fgw_arg_t *oargv);
Index: tags/2.0.1/src/undo_old.c
===================================================================
--- tags/2.0.1/src/undo_old.c	(nonexistent)
+++ tags/2.0.1/src/undo_old.c	(revision 18980)
@@ -0,0 +1,1278 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* functions used to undo operations
+ *
+ * Description:
+ * There are two lists which hold
+ *   - information about a command
+ *   - data of removed objects
+ * Both lists are organized as first-in-last-out which means that the undo
+ * list can always use the last entry of the remove list.
+ * A serial number is incremented whenever an operation is completed.
+ * An operation itself may consist of several basic instructions.
+ * E.g.: removing all selected objects is one operation with exactly one
+ * serial number even if the remove function is called several times.
+ *
+ * a lock flag ensures that no infinite loops occur
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <libuundo/uundo.h>
+
+#include "board.h"
+#include "change.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "insert.h"
+#include "polygon.h"
+#include "remove.h"
+#include "rotate.h"
+#include "search.h"
+#include "undo.h"
+#include "undo_old.h"
+#include "flag_str.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+#include "obj_poly_draw.h"
+#include "obj_subc_parent.h"
+
+#define STEP_REMOVELIST 500
+#define STEP_UNDOLIST   500
+
+#define Locked pcb_undoing()
+
+#include "undo_old_str.h"
+
+static pcb_bool UndoRotate90(UndoListTypePtr);
+static pcb_bool UndoRotate(UndoListTypePtr);
+static pcb_bool UndoChangeName(UndoListTypePtr);
+static pcb_bool UndoCopyOrCreate(UndoListTypePtr);
+static pcb_bool UndoMove(UndoListTypePtr);
+static pcb_bool UndoRemove(UndoListTypePtr);
+static pcb_bool UndoRemovePoint(UndoListTypePtr);
+static pcb_bool UndoInsertPoint(UndoListTypePtr);
+static pcb_bool UndoRemoveContour(UndoListTypePtr);
+static pcb_bool UndoInsertContour(UndoListTypePtr);
+static pcb_bool UndoMoveToLayer(UndoListTypePtr);
+static pcb_bool UndoFlag(UndoListTypePtr);
+static pcb_bool UndoOtherSide(UndoListTypePtr);
+static pcb_bool UndoChangeSize(UndoListTypePtr);
+static pcb_bool UndoChangeAngles(UndoListTypePtr);
+static pcb_bool UndoChangeRadii(UndoListTypePtr);
+static pcb_bool UndoChangeClearSize(UndoListTypePtr);
+static pcb_bool UndoClearPoly(UndoListTypePtr);
+
+#define PCB_OBJECT_ID(p) (((pcb_any_obj_t *) p)->ID)
+
+static void pcb_undo_old_free(void *udata);
+static int pcb_undo_old_undo(void *udata);
+
+void pcb_undo_old_print(void *udata, char *dst, size_t dst_len)
+{
+	UndoListType *slot = udata;
+#ifndef NDEBUG
+	const char *res = undo_type2str(slot->Type);
+	pcb_snprintf(dst, dst_len, "%s ser=%d id=%d", res, slot->Serial, slot->ID);
+#else
+	sprintf(dst, "%d", slot->Type);
+#endif
+
+}
+
+static const uundo_oper_t pcb_undo_old_oper = {
+	"core-old",
+	pcb_undo_old_free,
+	pcb_undo_old_undo,
+	pcb_undo_old_undo, /* redo is the same as undo */
+	pcb_undo_old_print
+};
+
+static UndoListType *GetUndoSlot(int CommandType, int ID, int Kind)
+{
+	UndoListType *slot = pcb_undo_alloc(PCB, &pcb_undo_old_oper, sizeof(UndoListType));
+
+	slot->Type = CommandType;
+	slot->ID = ID;
+	slot->Kind = Kind;
+
+	return slot;
+}
+
+
+/* ---------------------------------------------------------------------------
+ * redraws the recovered object
+ */
+static void DrawRecoveredObject(pcb_any_obj_t *obj)
+{
+	pcb_draw_obj(obj);
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a 90 deg 'rotate' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoRotate90(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		pcb_obj_rotate90(type, ptr1, ptr2, ptr3,
+								 Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, (4 - Entry->Data.Rotate.Steps) & 0x03);
+		Entry->Data.Rotate.Steps = (4 - Entry->Data.Rotate.Steps) & 0x03;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from an arbitrary angle 'rotate' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoRotate(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		pcb_obj_rotate(type, ptr1, ptr2, ptr3, Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, -(Entry->Data.Angle));
+		Entry->Data.Angle = -(Entry->Data.Angle);
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a clear/restore poly operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoClearPoly(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		if (Entry->Data.ClearPoly.Clear)
+			pcb_poly_restore_to_poly(PCB->Data, type, Entry->Data.ClearPoly.Layer, ptr3);
+		else
+			pcb_poly_clear_from_poly(PCB->Data, type, Entry->Data.ClearPoly.Layer, ptr3);
+		Entry->Data.ClearPoly.Clear = !Entry->Data.ClearPoly.Clear;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a 'change name' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoChangeName(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_name(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name));
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a ChangeAngles change operation
+ */
+static pcb_bool UndoChangeAngles(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	double old_sa, old_da;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type == PCB_OBJ_ARC) {
+		pcb_layer_t *Layer = (pcb_layer_t *) ptr1;
+		pcb_arc_t *a = (pcb_arc_t *) ptr2;
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a);
+		old_sa = a->StartAngle;
+		old_da = a->Delta;
+		if (pcb_undo_and_draw)
+			pcb_erase_obj(type, Layer, a);
+		a->StartAngle = Entry->Data.AngleChange.angle[0];
+		a->Delta = Entry->Data.AngleChange.angle[1];
+		pcb_arc_bbox(a);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a);
+		Entry->Data.AngleChange.angle[0] = old_sa;
+		Entry->Data.AngleChange.angle[1] = old_da;
+		pcb_draw_obj((pcb_any_obj_t *)a);
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a ChangeRadii change operation
+ */
+static pcb_bool UndoChangeRadii(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	pcb_coord_t old_w, old_h;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type == PCB_OBJ_ARC) {
+		pcb_layer_t *Layer = (pcb_layer_t *) ptr1;
+		pcb_arc_t *a = (pcb_arc_t *) ptr2;
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) a);
+		old_w = a->Width;
+		old_h = a->Height;
+		if (pcb_undo_and_draw)
+			pcb_erase_obj(type, Layer, a);
+		a->Width = Entry->Data.Move.DX;
+		a->Height = Entry->Data.Move.DY;
+		pcb_arc_bbox(a);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) a);
+		Entry->Data.Move.DX = old_w;
+		Entry->Data.Move.DY = old_h;
+		pcb_draw_obj((pcb_any_obj_t *)a);
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a clearance size change operation
+ */
+static pcb_bool UndoChangeClearSize(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	pcb_coord_t swap;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		swap = ((pcb_line_t *) ptr2)->Clearance;
+		pcb_poly_restore_to_poly(PCB->Data, type, ptr1, ptr2);
+		if (pcb_undo_and_draw)
+			pcb_erase_obj(type, ptr1, ptr2);
+		((pcb_line_t *) ptr2)->Clearance = Entry->Data.Size;
+		pcb_poly_clear_from_poly(PCB->Data, type, ptr1, ptr2);
+		Entry->Data.Size = swap;
+		if (pcb_undo_and_draw)
+			pcb_draw_obj((pcb_any_obj_t *)ptr2);
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a Size change operation
+ */
+static pcb_bool UndoChangeSize(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3, *ptr1e;
+	int type;
+	pcb_coord_t swap;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	ptr1e = ptr1;
+
+	if (type != PCB_OBJ_VOID) {
+		/* Size change for lines and arcs can. Text has it's own mechanism */
+		swap = ((pcb_line_t *) ptr2)->Thickness;
+		pcb_poly_restore_to_poly(PCB->Data, type, ptr1, ptr2);
+		if ((pcb_undo_and_draw) && (ptr1e != NULL))
+			pcb_erase_obj(type, ptr1e, ptr2);
+		((pcb_line_t *) ptr2)->Thickness = Entry->Data.Size;
+		Entry->Data.Size = swap;
+		pcb_poly_clear_from_poly(PCB->Data, type, ptr1, ptr2);
+		if (pcb_undo_and_draw)
+			pcb_draw_obj((pcb_any_obj_t *)ptr2);
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a FLAG change operation
+ */
+static pcb_bool UndoFlag(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr1e, *ptr2, *ptr3;
+	int type;
+	pcb_flag_t swap;
+	int must_redraw;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		pcb_flag_t f1, f2;
+		pcb_any_obj_t *obj = (pcb_any_obj_t *)ptr2;
+
+		ptr1e = ptr1;
+		swap = obj->Flags;
+
+		must_redraw = 0;
+		f1 = pcb_flag_mask(obj->Flags, ~DRAW_FLAGS);
+		f2 = pcb_flag_mask(Entry->Data.Flags, ~DRAW_FLAGS);
+
+		if (!PCB_FLAG_EQ(f1, f2))
+			must_redraw = 1;
+
+		if (pcb_undo_and_draw && must_redraw && (ptr1e != NULL))
+			pcb_erase_obj(type, ptr1e, ptr2);
+
+		obj->Flags = Entry->Data.Flags;
+
+		Entry->Data.Flags = swap;
+
+		if (pcb_undo_and_draw && must_redraw)
+			pcb_draw_obj((pcb_any_obj_t *)ptr2);
+		return pcb_true;
+	}
+	pcb_message(PCB_MSG_ERROR, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind);
+	pcb_message(PCB_MSG_ERROR, "for UndoFlag Operation. Previous flags: %s\n", pcb_strflg_f2s(Entry->Data.Flags, 0, NULL, 0));
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers a subc from an other-side  operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoOtherSide(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type == PCB_OBJ_SUBC) {
+		pcb_subc_t *subc = (pcb_subc_t *)ptr3;
+		if (pcb_undo_and_draw)
+			EraseSubc(subc);
+		pcb_subc_change_side(&subc, Entry->Data.Move.DY);
+		if (pcb_undo_and_draw)
+			DrawSubc(subc);
+		return pcb_true;
+	}
+	pcb_message(PCB_MSG_ERROR, "hace Internal error: UndoOtherside on object type %x\n", type);
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a 'copy' or 'create' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoCopyOrCreate(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		Removed *r = &Entry->Data.Removed;
+		if (!pcb_removelist)
+			pcb_removelist = pcb_buffer_new(NULL);
+		if (pcb_undo_and_draw)
+			pcb_erase_obj(type, ptr1, ptr2);
+		/* in order to make this re-doable we move it to the pcb_removelist */
+		pcb_move_obj_to_buffer(PCB, pcb_removelist, PCB->Data, type, ptr1, ptr2, ptr3);
+		Entry->Type = PCB_UNDO_REMOVE;
+		r->p_subc_id = 0;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an object from a 'move' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoMove(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		pcb_move_obj(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY);
+		Entry->Data.Move.DX *= -1;
+		Entry->Data.Move.DY *= -1;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ----------------------------------------------------------------------
+ * recovers an object from a 'remove' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoRemove(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	Removed *r = &Entry->Data.Removed;
+	pcb_data_t *data = PCB->Data;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		if (r->p_subc_id > 0) { /* need to use a subc layer - putting back a floater */
+			void *p1, *p2, *p3;
+			if (pcb_search_obj_by_id(PCB->Data, &p1, &p2, &p3, r->p_subc_id, PCB_OBJ_SUBC) != 0) {
+				pcb_subc_t *subc = p2;
+				if (r->p_subc_layer < subc->data->LayerN) {
+					data = subc->data;
+					ptr1 = &data->Layer[r->p_subc_layer];
+				}
+			}
+		}
+		pcb_move_obj_to_buffer(PCB, data, pcb_removelist, type, ptr1, ptr2, ptr3);
+		if (pcb_undo_and_draw)
+			DrawRecoveredObject((pcb_any_obj_t *)ptr2);
+		Entry->Type = PCB_UNDO_CREATE;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ----------------------------------------------------------------------
+ * recovers an object from a 'move to another layer' operation
+ * returns pcb_true if anything has been recovered
+ */
+static pcb_bool UndoMoveToLayer(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	pcb_layer_id_t swap;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
+	if (type != PCB_OBJ_VOID) {
+		swap = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1);
+		pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true);
+		Entry->Data.MoveToLayer.OriginalLayer = swap;
+		return pcb_true;
+	}
+	return pcb_false;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers a removed polygon point
+ * returns pcb_true on success
+ */
+static pcb_bool UndoRemovePoint(UndoListTypePtr Entry)
+{
+	pcb_layer_t *layer;
+	pcb_poly_t *polygon;
+	void *ptr3;
+	int type;
+
+	/* lookup entry (polygon not point was saved) by it's ID */
+	assert(Entry->Kind == PCB_OBJ_POLY);
+	type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, &ptr3, Entry->ID, Entry->Kind);
+	switch (type) {
+	case PCB_OBJ_POLY:						/* restore the removed point */
+		{
+			/* recover the point */
+			if (pcb_undo_and_draw && layer->meta.real.vis)
+				pcb_poly_invalidate_erase(polygon);
+			pcb_insert_point_in_object(PCB_OBJ_POLY, layer, polygon,
+														&Entry->Data.RemovedPoint.Index,
+														Entry->Data.RemovedPoint.X,
+														Entry->Data.RemovedPoint.Y, pcb_true, Entry->Data.RemovedPoint.last_in_contour);
+
+			polygon->Points[Entry->Data.RemovedPoint.Index].ID = Entry->Data.RemovedPoint.ID;
+			if (pcb_undo_and_draw && layer->meta.real.vis)
+				pcb_poly_invalidate_draw(layer, polygon);
+			Entry->Type = PCB_UNDO_INSERT_POINT;
+			Entry->ID = Entry->Data.RemovedPoint.ID;
+			Entry->Kind = PCB_OBJ_POLY_POINT;
+			return pcb_true;
+		}
+
+	default:
+		return pcb_false;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an inserted polygon point
+ * returns pcb_true on success
+ */
+static pcb_bool UndoInsertPoint(UndoListTypePtr Entry)
+{
+	pcb_layer_t *layer;
+	pcb_poly_t *polygon;
+	pcb_point_t *pnt;
+	int type;
+	pcb_cardinal_t point_idx;
+	pcb_cardinal_t hole;
+	pcb_bool last_in_contour = pcb_false;
+
+	assert(Entry->Kind == PCB_OBJ_POLY_POINT);
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, (void **) &pnt, Entry->ID, Entry->Kind);
+	switch (type) {
+	case PCB_OBJ_POLY_POINT:			/* removes an inserted polygon point */
+		{
+			if (pcb_undo_and_draw && layer->meta.real.vis)
+				pcb_poly_invalidate_erase(polygon);
+
+			/* Check whether this point was at the end of its contour.
+			 * If so, we need to flag as such when re-adding the point
+			 * so it goes back in the correct place
+			 */
+			point_idx = pcb_poly_point_idx(polygon, pnt);
+			for (hole = 0; hole < polygon->HoleIndexN; hole++)
+				if (point_idx == polygon->HoleIndex[hole] - 1)
+					last_in_contour = pcb_true;
+			if (point_idx == polygon->PointN - 1)
+				last_in_contour = pcb_true;
+			Entry->Data.RemovedPoint.last_in_contour = last_in_contour;
+
+			Entry->Data.RemovedPoint.X = pnt->X;
+			Entry->Data.RemovedPoint.Y = pnt->Y;
+			Entry->Data.RemovedPoint.ID = pnt->ID;
+			Entry->ID = polygon->ID;
+			Entry->Kind = PCB_OBJ_POLY;
+			Entry->Type = PCB_UNDO_REMOVE_POINT;
+			Entry->Data.RemovedPoint.Index = point_idx;
+			pcb_destroy_object(PCB->Data, PCB_OBJ_POLY_POINT, layer, polygon, pnt);
+			if (pcb_undo_and_draw && layer->meta.real.vis)
+				pcb_poly_invalidate_draw(layer, polygon);
+			return pcb_true;
+		}
+
+	default:
+		return pcb_false;
+	}
+}
+
+static pcb_bool UndoSwapCopiedObject(UndoListTypePtr Entry)
+{
+	void *ptr1, *ptr2, *ptr3;
+	void *ptr1b, *ptr2b, *ptr3b;
+	pcb_any_obj_t *obj, *obj2;
+	int type;
+	long int swap_id;
+
+	/* lookup entry by it's ID */
+	type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, Entry->Data.CopyID, Entry->Kind);
+	if (type == PCB_OBJ_VOID)
+		return pcb_false;
+
+	type = pcb_search_obj_by_id(PCB->Data, &ptr1b, &ptr2b, &ptr3b, Entry->ID, Entry->Kind);
+	if (type == PCB_OBJ_VOID)
+		return pcb_false;
+
+	obj = (pcb_any_obj_t *) ptr2;
+	obj2 = (pcb_any_obj_t *) ptr2b;
+
+	swap_id = obj->ID;
+	obj->ID = obj2->ID;
+	obj2->ID = swap_id;
+
+	pcb_move_obj_to_buffer(PCB, pcb_removelist, PCB->Data, type, ptr1b, ptr2b, ptr3b);
+
+	if (pcb_undo_and_draw)
+		DrawRecoveredObject((pcb_any_obj_t *)ptr2);
+
+	obj = (pcb_any_obj_t *) pcb_move_obj_to_buffer(PCB, PCB->Data, pcb_removelist, type, ptr1, ptr2, ptr3);
+	if (Entry->Kind == PCB_OBJ_POLY)
+		pcb_poly_init_clip(PCB->Data, (pcb_layer_t *) ptr1b, (pcb_poly_t *) obj);
+	return pcb_true;
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an removed polygon point
+ * returns pcb_true on success
+ */
+static pcb_bool UndoRemoveContour(UndoListTypePtr Entry)
+{
+	assert(Entry->Kind == PCB_OBJ_POLY);
+	return UndoSwapCopiedObject(Entry);
+}
+
+/* ---------------------------------------------------------------------------
+ * recovers an inserted polygon point
+ * returns pcb_true on success
+ */
+static pcb_bool UndoInsertContour(UndoListTypePtr Entry)
+{
+	assert(Entry->Kind == PCB_OBJ_POLY);
+	return UndoSwapCopiedObject(Entry);
+}
+
+/* ---------------------------------------------------------------------------
+ * undo a layer change
+ * returns pcb_true on success
+ */
+static pcb_bool UndoLayerMove(UndoListTypePtr Entry)
+{
+	LayerChangeTypePtr l = &Entry->Data.LayerChange;
+	int tmp;
+
+	if (l->old_index == -1) { /* was creating new */
+		l->old_index = l->at;
+		l->at = l->new_index;
+		l->new_index = -1;
+	}
+	else if (l->new_index == -1) { /* was deleting existing */
+		l->new_index = l->at;
+		l->at = l->old_index;
+		l->old_index = -1;
+	}
+	else {
+		tmp = l->new_index;
+		l->new_index = l->old_index;
+		l->old_index = tmp;
+	}
+
+	if (pcb_layer_move(PCB, l->old_index, l->new_index, -1))
+		return pcb_false;
+	else
+		return pcb_true;
+}
+
+/* ---------------------------------------------------------------------------
+ * undo a netlist change
+ * returns pcb_true on success
+ */
+static pcb_bool UndoNetlistChange(UndoListTypePtr Entry)
+{
+	NetlistChangeTypePtr l = &Entry->Data.NetlistChange;
+	unsigned int i, j;
+	pcb_lib_t *lib, *saved;
+
+	lib = l->lib;
+	saved = l->old;
+
+	/* iterate over each net */
+	for (i = 0; i < lib->MenuN; i++) {
+		free(lib->Menu[i].Name);
+		free(lib->Menu[i].directory);
+		free(lib->Menu[i].Style);
+
+		/* iterate over each pin on the net */
+		for (j = 0; j < lib->Menu[i].EntryN; j++) {
+			if (!lib->Menu[i].Entry[j].ListEntry_dontfree)
+				free((char*)lib->Menu[i].Entry[j].ListEntry);
+
+			free((char*)lib->Menu[i].Entry[j].Package);
+			free((char*)lib->Menu[i].Entry[j].Value);
+			free((char*)lib->Menu[i].Entry[j].Description);
+		}
+	}
+
+	free(lib->Menu);
+
+	*lib = *saved;
+
+	pcb_netlist_changed(0);
+	return pcb_true;
+}
+
+static int pcb_undo_old_undo(void *ptr_)
+{
+	UndoListTypePtr ptr = ptr_;
+	switch (ptr->Type) {
+	case PCB_UNDO_CHANGENAME:
+		if (UndoChangeName(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CREATE:
+		if (UndoCopyOrCreate(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_MOVE:
+		if (UndoMove(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_REMOVE:
+		if (UndoRemove(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_REMOVE_POINT:
+		if (UndoRemovePoint(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_INSERT_POINT:
+		if (UndoInsertPoint(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_REMOVE_CONTOUR:
+		if (UndoRemoveContour(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_INSERT_CONTOUR:
+		if (UndoInsertContour(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_ROTATE:
+		if (UndoRotate(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_ROTATE90:
+		if (UndoRotate90(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CLEAR:
+		if (UndoClearPoly(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_MOVETOLAYER:
+		if (UndoMoveToLayer(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_FLAG:
+		if (UndoFlag(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CHANGESIZE:
+		if (UndoChangeSize(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CHANGECLEARSIZE:
+		if (UndoChangeClearSize(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CHANGEANGLES:
+		if (UndoChangeAngles(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_CHANGERADII:
+		if (UndoChangeRadii(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_LAYERMOVE:
+		if (UndoLayerMove(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_NETLISTCHANGE:
+		if (UndoNetlistChange(ptr))
+			return 0;
+		break;
+
+	case PCB_UNDO_OTHERSIDE:
+		if (UndoOtherSide(ptr))
+			return 0;
+		break;
+	}
+	return -1;
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of clearpoly objects
+ */
+void pcb_undo_add_obj_to_clear_poly(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_bool clear)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CLEAR, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.ClearPoly.Clear = clear;
+		undo->Data.ClearPoly.Layer = (pcb_layer_t *) Ptr1;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an subc to the list of objects tossed to the other side
+ */
+void pcb_undo_add_subc_to_otherside(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t yoff)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_OTHERSIDE, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.Move.DY = yoff;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of 90-deg rotated objects
+ */
+void pcb_undo_add_obj_to_rotate90(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t CenterX, pcb_coord_t CenterY, pcb_uint8_t Steps)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_ROTATE90, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.Rotate.CenterX = CenterX;
+		undo->Data.Rotate.CenterY = CenterY;
+		undo->Data.Rotate.Steps = Steps;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of rotated objects
+ */
+void pcb_undo_add_obj_to_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t CenterX, pcb_coord_t CenterY, pcb_angle_t angle)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_ROTATE, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.Rotate.CenterX = CenterX;
+		undo->Data.Rotate.CenterY = CenterY;
+		undo->Data.Angle = angle;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of removed objects and removes it from
+ * the current PCB
+ */
+void pcb_undo_move_obj_to_remove(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	UndoListTypePtr Entry;
+	Removed *r;
+	pcb_any_obj_t *o = Ptr3;
+	pcb_subc_t *subc;
+
+	if (Locked)
+		return;
+
+	if (!pcb_removelist)
+		pcb_removelist = pcb_buffer_new(NULL);
+
+	Entry = GetUndoSlot(PCB_UNDO_REMOVE, PCB_OBJECT_ID(Ptr3), Type);
+	r = &Entry->Data.Removed;
+	r->p_subc_id = 0;
+
+	switch(o->type) {
+		case PCB_OBJ_LINE:
+		case PCB_OBJ_ARC:
+		case PCB_OBJ_TEXT:
+		case PCB_OBJ_POLY:
+			subc = pcb_obj_parent_subc(Ptr3);
+			if (subc != NULL) {
+				r->p_subc_id = subc->ID;
+				r->p_subc_layer = o->parent.layer - subc->data->Layer;
+			}
+			break;
+		case PCB_OBJ_PSTK:
+			subc = pcb_obj_parent_subc(Ptr3);
+			if (subc != NULL)
+				r->p_subc_id = subc->ID;
+			break;
+#warning subc TODO: floater subc in subc should remember its subc parent too
+		default:
+			break;
+	}
+
+
+	pcb_move_obj_to_buffer(PCB, pcb_removelist, PCB->Data, Type, Ptr1, Ptr2, Ptr3);
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of removed polygon/... points
+ */
+void pcb_undo_add_obj_to_remove_point(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t index)
+{
+	UndoListTypePtr undo;
+	pcb_poly_t *polygon = (pcb_poly_t *) Ptr2;
+	pcb_cardinal_t hole;
+	pcb_bool last_in_contour = pcb_false;
+
+	if (!Locked) {
+		switch (Type) {
+		case PCB_OBJ_POLY_POINT:
+			{
+				/* save the ID of the parent object; else it will be
+				 * impossible to recover the point
+				 */
+				undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_OBJ_POLY);
+				undo->Data.RemovedPoint.X = polygon->Points[index].X;
+				undo->Data.RemovedPoint.Y = polygon->Points[index].Y;
+				undo->Data.RemovedPoint.ID = polygon->Points[index].ID;
+				undo->Data.RemovedPoint.Index = index;
+
+				/* Check whether this point was at the end of its contour.
+				 * If so, we need to flag as such when re-adding the point
+				 * so it goes back in the correct place
+				 */
+				for (hole = 0; hole < polygon->HoleIndexN; hole++)
+					if (index == polygon->HoleIndex[hole] - 1)
+						last_in_contour = pcb_true;
+				if (index == polygon->PointN - 1)
+					last_in_contour = pcb_true;
+				undo->Data.RemovedPoint.last_in_contour = last_in_contour;
+			}
+			break;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of inserted polygon/... points
+ */
+void pcb_undo_add_obj_to_insert_point(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	if (!Locked)
+		GetUndoSlot(PCB_UNDO_INSERT_POINT, PCB_OBJECT_ID(Ptr3), Type);
+}
+
+static void CopyObjectToUndoList(int undo_type, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	UndoListTypePtr undo;
+	pcb_any_obj_t *copy;
+
+	if (Locked)
+		return;
+
+	if (!pcb_removelist)
+		pcb_removelist = pcb_buffer_new(NULL);
+
+	undo = GetUndoSlot(undo_type, PCB_OBJECT_ID(Ptr2), Type);
+	copy = (pcb_any_obj_t *) pcb_copy_obj_to_buffer(PCB, pcb_removelist, PCB->Data, Type, Ptr1, Ptr2, Ptr3);
+	undo->Data.CopyID = copy->ID;
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of removed contours
+ * (Actually just takes a copy of the whole polygon to restore)
+ */
+void pcb_undo_add_obj_to_remove_contour(int Type, pcb_layer_t * Layer, pcb_poly_t * Polygon)
+{
+	CopyObjectToUndoList(PCB_UNDO_REMOVE_CONTOUR, Type, Layer, Polygon, NULL);
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of insert contours
+ * (Actually just takes a copy of the whole polygon to restore)
+ */
+void pcb_undo_add_obj_to_insert_contour(int Type, pcb_layer_t * Layer, pcb_poly_t * Polygon)
+{
+	CopyObjectToUndoList(PCB_UNDO_INSERT_CONTOUR, Type, Layer, Polygon, NULL);
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of moved objects
+ */
+void pcb_undo_add_obj_to_move(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_MOVE, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.Move.DX = DX;
+		undo->Data.Move.DY = DY;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of objects with changed names
+ */
+void pcb_undo_add_obj_to_change_name(int Type, void *Ptr1, void *Ptr2, void *Ptr3, const char *OldName)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CHANGENAME, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.ChangeName.Name = OldName;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of objects moved to another layer
+ */
+void pcb_undo_add_obj_to_move_to_layer(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_MOVETOLAYER, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.MoveToLayer.OriginalLayer = pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of created objects
+ */
+void pcb_undo_add_obj_to_create(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	if (!Locked)
+		GetUndoSlot(PCB_UNDO_CREATE, PCB_OBJECT_ID(Ptr3), Type);
+	pcb_poly_clear_from_poly(PCB->Data, Type, Ptr1, Ptr2);
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of objects with flags changed
+ */
+extern unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
+void pcb_undo_add_obj_to_flag(void *obj_)
+{
+	UndoListTypePtr undo;
+	pcb_any_obj_t *obj = obj_;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_FLAG, PCB_OBJECT_ID(obj), pcb_obj_type2oldtype(obj->type));
+		undo->Data.Flags = obj->Flags;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of objects with Size changes
+ */
+void pcb_undo_add_obj_to_size(int Type, void *ptr1, void *ptr2, void *ptr3)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CHANGESIZE, PCB_OBJECT_ID(ptr2), Type);
+		switch (Type) {
+		case PCB_OBJ_LINE:
+			undo->Data.Size = ((pcb_line_t *) ptr2)->Thickness;
+			break;
+		case PCB_OBJ_TEXT:
+			undo->Data.Size = ((pcb_text_t *) ptr2)->Scale;
+			break;
+		case PCB_OBJ_ARC:
+			undo->Data.Size = ((pcb_arc_t *) ptr2)->Thickness;
+			break;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of objects with Size changes
+ */
+void pcb_undo_add_obj_to_clear_size(int Type, void *ptr1, void *ptr2, void *ptr3)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CHANGECLEARSIZE, PCB_OBJECT_ID(ptr2), Type);
+		switch (Type) {
+		case PCB_OBJ_LINE:
+			undo->Data.Size = ((pcb_line_t *) ptr2)->Clearance;
+			break;
+		case PCB_OBJ_ARC:
+			undo->Data.Size = ((pcb_arc_t *) ptr2)->Clearance;
+			break;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of changed angles.  Note that you must
+ * call this before changing the angles, passing the new start/delta.
+ */
+void pcb_undo_add_obj_to_change_angles(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	UndoListTypePtr undo;
+	pcb_arc_t *a = (pcb_arc_t *) Ptr3;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CHANGEANGLES, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.AngleChange.angle[0] = a->StartAngle;
+		undo->Data.AngleChange.angle[1] = a->Delta;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds an object to the list of changed radii.  Note that you must
+ * call this before changing the radii, passing the new width/height.
+ */
+void pcb_undo_add_obj_to_change_radii(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	UndoListTypePtr undo;
+	pcb_arc_t *a = (pcb_arc_t *) Ptr3;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_CHANGERADII, PCB_OBJECT_ID(Ptr3), Type);
+		undo->Data.Move.DX = a->Width;
+		undo->Data.Move.DY = a->Height;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds a layer change (new, delete, move) to the undo list.
+ */
+void pcb_undo_add_layer_move(int old_index, int new_index, int at)
+{
+	UndoListTypePtr undo;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_LAYERMOVE, 0, 0);
+		undo->Data.LayerChange.old_index = old_index;
+		undo->Data.LayerChange.new_index = new_index;
+		undo->Data.LayerChange.at = at;
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * adds a netlist change to the undo list
+ */
+void pcb_undo_add_netlist_lib(pcb_lib_t *lib)
+{
+	UndoListTypePtr undo;
+	unsigned int i, j;
+	pcb_lib_t *old;
+
+	if (!Locked) {
+		undo = GetUndoSlot(PCB_UNDO_NETLISTCHANGE, 0, 0);
+		/* keep track of where the data needs to go */
+		undo->Data.NetlistChange.lib = lib;
+
+		/* and what the old data is that we'll need to restore */
+		undo->Data.NetlistChange.old = (pcb_lib_t *) malloc(sizeof(pcb_lib_t *));
+		old = undo->Data.NetlistChange.old;
+		old->MenuN = lib->MenuN;
+		old->MenuMax = lib->MenuMax;
+		old->Menu = (pcb_lib_menu_t *) malloc(old->MenuMax * sizeof(pcb_lib_menu_t));
+		if (old->Menu == NULL) {
+			fprintf(stderr, "malloc() failed in AddNetlistLibToUndoList\n");
+			exit(1);
+		}
+
+		/* iterate over each net */
+		for (i = 0; i < lib->MenuN; i++) {
+			old->Menu[i].EntryN = lib->Menu[i].EntryN;
+			old->Menu[i].EntryMax = lib->Menu[i].EntryMax;
+
+			old->Menu[i].Name = lib->Menu[i].Name ? pcb_strdup(lib->Menu[i].Name) : NULL;
+
+			old->Menu[i].directory = lib->Menu[i].directory ? pcb_strdup(lib->Menu[i].directory) : NULL;
+
+			old->Menu[i].Style = lib->Menu[i].Style ? pcb_strdup(lib->Menu[i].Style) : NULL;
+
+
+			old->Menu[i].Entry = (pcb_lib_entry_t *) malloc(old->Menu[i].EntryMax * sizeof(pcb_lib_entry_t));
+			if (old->Menu[i].Entry == NULL) {
+				fprintf(stderr, "malloc() failed in AddNetlistLibToUndoList\n");
+				exit(1);
+			}
+
+			/* iterate over each pin on the net */
+			for (j = 0; j < lib->Menu[i].EntryN; j++) {
+
+				old->Menu[i].Entry[j].ListEntry = lib->Menu[i].Entry[j].ListEntry ? pcb_strdup(lib->Menu[i].Entry[j].ListEntry) : NULL;
+				old->Menu[i].Entry[j].ListEntry_dontfree = 0;
+
+				old->Menu[i].Entry[j].Package = lib->Menu[i].Entry[j].Package ? pcb_strdup(lib->Menu[i].Entry[j].Package) : NULL;
+
+				old->Menu[i].Entry[j].Value = lib->Menu[i].Entry[j].Value ? pcb_strdup(lib->Menu[i].Entry[j].Value) : NULL;
+
+				old->Menu[i].Entry[j].Description =
+					lib->Menu[i].Entry[j].Description ? pcb_strdup(lib->Menu[i].Entry[j].Description) : NULL;
+
+
+			}
+		}
+
+	}
+}
+
+#ifndef NDEBUG
+const char *undo_type2str(int type)
+{
+	static char buff[32];
+	switch(type) {
+		case PCB_UNDO_CHANGENAME: return "changename";
+		case PCB_UNDO_MOVE: return "move";
+		case PCB_UNDO_REMOVE: return "remove";
+		case PCB_UNDO_REMOVE_POINT: return "remove_point";
+		case PCB_UNDO_INSERT_POINT: return "insert_point";
+		case PCB_UNDO_REMOVE_CONTOUR: return "remove_contour";
+		case PCB_UNDO_INSERT_CONTOUR: return "insert_contour";
+		case PCB_UNDO_ROTATE90: return "rotate90";
+		case PCB_UNDO_ROTATE: return "rotate";
+		case PCB_UNDO_CREATE: return "create";
+		case PCB_UNDO_MOVETOLAYER: return "movetolayer";
+		case PCB_UNDO_FLAG: return "flag";
+		case PCB_UNDO_CHANGESIZE: return "changesize";
+		case PCB_UNDO_OTHERSIDE: return "otherside";
+		case PCB_UNDO_CHANGECLEARSIZE: return "chngeclearsize";
+		case PCB_UNDO_CHANGEANGLES: return "changeangles";
+		case PCB_UNDO_CHANGERADII: return "changeradii";
+		case PCB_UNDO_LAYERMOVE: return "layermove";
+		case PCB_UNDO_CLEAR: return "clear";
+		case PCB_UNDO_NETLISTCHANGE: return "netlistchange";
+	}
+	sprintf(buff, "Unknown %d", type);
+	return buff;
+}
+
+#endif
+
+static void pcb_undo_old_free(void *ptr_)
+{
+	UndoListTypePtr ptr = ptr_;
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+
+	switch (ptr->Type) {
+		case PCB_UNDO_CHANGENAME:
+			free(ptr->Data.ChangeName.Name);
+			break;
+		case PCB_UNDO_REMOVE:
+			type = pcb_search_obj_by_id(pcb_removelist, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind);
+			if (type != PCB_OBJ_VOID)
+				pcb_destroy_object(pcb_removelist, type, ptr1, ptr2, ptr3);
+			break;
+		default:
+			break;
+	}
+}
Index: tags/2.0.1/src/undo_old.h
===================================================================
--- tags/2.0.1/src/undo_old.h	(nonexistent)
+++ tags/2.0.1/src/undo_old.h	(revision 18980)
@@ -0,0 +1,92 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* old undo infra: should be replaced by per operation local undo */
+
+#ifndef	PCB_UNDO_OLD_H
+#define	PCB_UNDO_OLD_H
+
+#include "library.h"
+
+#define DRAW_FLAGS	(PCB_FLAG_RAT | PCB_FLAG_SELECTED \
+			| PCB_FLAG_HIDENAME | PCB_FLAG_HOLE | PCB_FLAG_OCTAGON | PCB_FLAG_FOUND | PCB_FLAG_CLEARLINE)
+
+/* different layers */
+
+void pcb_undo_move_obj_to_remove(int, void *, void *, void *);
+void pcb_undo_add_obj_to_remove_point(int, void *, void *, pcb_cardinal_t);
+void pcb_undo_add_obj_to_insert_point(int, void *, void *, void *);
+void pcb_undo_add_obj_to_remove_contour(int, pcb_layer_t *, pcb_poly_t *);
+void pcb_undo_add_obj_to_insert_contour(int, pcb_layer_t *, pcb_poly_t *);
+void pcb_undo_add_obj_to_move(int, void *, void *, void *, pcb_coord_t, pcb_coord_t);
+void pcb_undo_add_obj_to_change_name(int, void *, void *, void *, const char *);
+void pcb_undo_add_obj_to_change_pinnum(int, void *, void *, void *, char *);
+void pcb_undo_add_obj_to_rotate90(int, void *, void *, void *, pcb_coord_t, pcb_coord_t, pcb_uint8_t);
+void pcb_undo_add_obj_to_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t CenterX, pcb_coord_t CenterY, pcb_angle_t angle);
+void pcb_undo_add_obj_to_create(int, void *, void *, void *);
+void pcb_undo_add_subc_to_otherside(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t yoff);
+void pcb_undo_add_obj_to_move_to_layer(int, void *, void *, void *);
+void pcb_undo_add_obj_to_flag(void *obj);
+void pcb_undo_add_obj_to_size(int, void *, void *, void *);
+void pcb_undo_add_obj_to_clear_size(int, void *, void *, void *);
+void pcb_undo_add_obj_to_change_angles(int, void *, void *, void *);
+void pcb_undo_add_obj_to_change_radii(int, void *, void *, void *);
+void pcb_undo_add_obj_to_clear_poly(int, void *, void *, void *, pcb_bool);
+void pcb_undo_add_layer_move(int, int, int);
+void pcb_undo_add_netlist_lib(pcb_lib_t *);
+
+/* ---------------------------------------------------------------------------
+ * define supported types of undo operations
+ * note these must be separate bits now
+ */
+typedef enum {
+	PCB_UNDO_CHANGENAME        = 0x000001, /* change of names */
+	PCB_UNDO_MOVE              = 0x000002, /* moving objects */
+	PCB_UNDO_REMOVE            = 0x000004, /* removing objects */
+	PCB_UNDO_REMOVE_POINT      = 0x000008, /* removing polygon/... points */
+	PCB_UNDO_INSERT_POINT      = 0x000010, /* inserting polygon/... points */
+	PCB_UNDO_REMOVE_CONTOUR    = 0x000020, /* removing a contour from a polygon */
+	PCB_UNDO_INSERT_CONTOUR    = 0x000040, /* inserting a contour from a polygon */
+	PCB_UNDO_ROTATE90          = 0x000080, /* rotations by 90 deg steps */
+	PCB_UNDO_CREATE            = 0x000100, /* creation of objects */
+	PCB_UNDO_MOVETOLAYER       = 0x000200, /* moving objects to */
+	PCB_UNDO_FLAG              = 0x000400, /* toggling SELECTED flag */
+	PCB_UNDO_CHANGESIZE        = 0x000800, /* change size of object */
+	PCB_UNDO_CHANGECLEARSIZE   = 0x004000, /* change clearance size */
+	PCB_UNDO_CHANGEANGLES      = 0x010000, /* change arc angles */
+	PCB_UNDO_LAYERMOVE         = 0x020000, /* layer new/delete/move */
+	PCB_UNDO_CLEAR             = 0x040000, /* clear/restore to polygons */
+	PCB_UNDO_NETLISTCHANGE     = 0x080000, /* netlist change */
+	PCB_UNDO_CHANGERADII       = 0x200000, /* change arc radii */
+	PCB_UNDO_OTHERSIDE         = 0x400000, /* change side of board (subcircuit) */
+	PCB_UNDO_ROTATE            = 0x800000  /* rotations at arbitrary angle */
+} pcb_undo_op_t;
+
+const char *undo_type2str(int type);
+
+#endif
Index: tags/2.0.1/src/undo_old_str.h
===================================================================
--- tags/2.0.1/src/undo_old_str.h	(nonexistent)
+++ tags/2.0.1/src/undo_old_str.h	(revision 18980)
@@ -0,0 +1,73 @@
+#warning cleanup TODO: move this back to undo_old.c
+
+typedef struct {								/* information about a change command */
+	char *Name;
+} ChangeNameType, *ChangeNameTypePtr;
+
+typedef struct {								/* information about a move command */
+	pcb_coord_t DX, DY;									/* movement vector */
+} MoveType, *MoveTypePtr;
+
+typedef struct {
+	long p_subc_id;             /* parent subc ID (0 if parent is not a subc) */
+	int p_subc_layer;           /* parent subc layer index, for layer objects */
+} Removed;
+
+typedef struct {								/* information about removed polygon points */
+	pcb_coord_t X, Y;										/* data */
+	int ID;
+	pcb_cardinal_t Index;								/* index in a polygons array of points */
+	pcb_bool last_in_contour;					/* Whether the point was the last in its contour */
+} RemovedPointType, *RemovedPointTypePtr;
+
+typedef struct {								/* information about rotation */
+	pcb_coord_t CenterX, CenterY;				/* center of rotation */
+	pcb_cardinal_t Steps;								/* number of steps */
+} RotateType, *RotateTypePtr;
+
+typedef struct {								/* information about moves between layers */
+	pcb_cardinal_t OriginalLayer;				/* the index of the original layer */
+} MoveToLayer;
+
+typedef struct {								/* information about layer changes */
+	int old_index;
+	int new_index;
+	int at;
+} LayerChangeType, *LayerChangeTypePtr;
+
+typedef struct {								/* information about poly clear/restore */
+	pcb_bool Clear;										/* pcb_true was clear, pcb_false was restore */
+	pcb_layer_t *Layer;
+} ClearPolyType, *ClearPolyTypePtr;
+
+typedef struct {
+	pcb_angle_t angle[2];
+} AngleChangeType;
+
+typedef struct {								/* information about netlist lib changes */
+	pcb_lib_t *old;
+	pcb_lib_t *lib;
+} NetlistChangeType, *NetlistChangeTypePtr;
+
+typedef struct {								/* holds information about an operation */
+	int Serial,										/* serial number of operation */
+	  Type,												/* type of operation */
+	  Kind,												/* type of object with given ID */
+	  ID;													/* object ID */
+	union {												/* some additional information */
+		ChangeNameType ChangeName;
+		MoveType Move;
+		Removed Removed;
+		RemovedPointType RemovedPoint;
+		RotateType Rotate;
+		MoveToLayer MoveToLayer;
+		pcb_flag_t Flags;
+		pcb_coord_t Size;
+		LayerChangeType LayerChange;
+		ClearPolyType ClearPoly;
+		NetlistChangeType NetlistChange;
+		long int CopyID;
+		AngleChangeType AngleChange;
+		pcb_angle_t Angle;
+	} Data;
+} UndoListType, *UndoListTypePtr;
Index: tags/2.0.1/src/unit.c
===================================================================
--- tags/2.0.1/src/unit.c	(nonexistent)
+++ tags/2.0.1/src/unit.c	(revision 18980)
@@ -0,0 +1,207 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2011 Andrew Poelstra
+ *  Copyright (C) 2016,2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Andrew Poelstra, 16966 60A Ave, V3S 8X5 Surrey, BC, Canada
+ *  asp11@sfu.ca
+ *
+ */
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "unit.h"
+
+/* Helper macros for tables */
+#define PCB_MM_TO_COORD3(a,b,c)		PCB_MM_TO_COORD (a), PCB_MM_TO_COORD (b), PCB_MM_TO_COORD (c)
+#define PCB_MIL_TO_COORD3(a,b,c)		PCB_MIL_TO_COORD (a), PCB_MIL_TO_COORD (b), PCB_MIL_TO_COORD (c)
+#define PCB_MM_TO_COORD5(a,b,c,d,e)		PCB_MM_TO_COORD (a), PCB_MM_TO_COORD (b), PCB_MM_TO_COORD (c),	\
+                              		PCB_MM_TO_COORD (d), PCB_MM_TO_COORD (e)
+#define PCB_MIL_TO_COORD5(a,b,c,d,e)	PCB_MIL_TO_COORD (a), PCB_MIL_TO_COORD (b), PCB_MIL_TO_COORD (c),	\
+                               		PCB_MIL_TO_COORD (d), PCB_MIL_TO_COORD (e)
+
+/* These should be kept in order of smallest scale_factor
+ * to largest -- the code uses this ordering when finding
+ * the best scale to use for a group of measures */
+pcb_unit_t pcb_units[] = {
+	{0, "km", NULL, 'k', 0.000001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_KM, 5,
+	 0.00005, 0.0005, 0.0025, 0.05, 0.25,
+	 {""}},
+	{0, "m", NULL, 'f', 0.001, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_M, 5,
+	 0.0005, 0.005, 0.025, 0.5, 2.5,
+	 {""}},
+	{0, "cm", NULL, 'e', 0.1, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_CM, 5,
+	 0.005, 0.05, 0.25, 5, 25,
+	 {""}},
+	{0, "mm", NULL, 'm', 1, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_MM, 4,
+	 0.005, 0.05, 0.25, 5, 25,
+	 {""}},
+	{0, "um", NULL, 'u', 1000, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_UM, 2,
+	 0.005, 0.05, 0.25, 5, 25,
+	 {""}},
+	{0, "du", NULL, 'd', 10000, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_DU, 2, /* eagle bin decimicron */
+	 0.005, 0.05, 0.25, 5, 25,
+	 {""}},
+	{0, "nm", NULL, 'n', 1000000, PCB_UNIT_METRIC, PCB_UNIT_ALLOW_NM, 0,
+	 5, 50, 2500, 5000, 25000,
+	 {""}},
+
+	{0, "in", NULL, 'i', 0.001, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_IN, 5,
+	 0.1, 1.0, 5.0, 25, 100,
+	 {"inch"}},
+	{0, "mil", NULL, 'l', 1, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_MIL, 2,
+	 0.1, 1.0, 10, 100, 1000,
+	 {""}},
+	{0, "dmil", NULL, 'k', 10, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_DMIL, 1,	/* kicad legacy decimil unit */
+	 0.1, 1.0, 10, 100, 1000,				/* wild guess at factors */
+	 {""}},
+	{0, "cmil", NULL, 'c', 100, PCB_UNIT_IMPERIAL, PCB_UNIT_ALLOW_CMIL, 0,
+	 1, 10, 100, 1000, 10000,
+	 {"pcb"}}
+};
+
+#define N_UNITS ((int) (sizeof pcb_units / sizeof pcb_units[0]))
+
+void pcb_units_init(void)
+{
+	int i;
+	for (i = 0; i < N_UNITS; ++i) {
+		pcb_units[i].index = i;
+		pcb_units[i].in_suffix = _(pcb_units[i].suffix);
+	}
+}
+
+const pcb_unit_t *get_unit_struct_(const char *suffix, int strict)
+{
+	int i;
+	int s_len = 0;
+
+	/* Determine bounds */
+	while (isspace(*suffix))
+		suffix++;
+	while (isalnum(suffix[s_len]))
+		s_len++;
+
+	/* Also understand plural suffixes: "inches", "mils" */
+	if (s_len > 2) {
+		if (suffix[s_len - 2] == 'e' && suffix[s_len - 1] == 's')
+			s_len -= 2;
+		else if (suffix[s_len - 1] == 's')
+			s_len -= 1;
+	}
+
+	/* Do lookup */
+	if (s_len <= 0)
+		return NULL;
+
+	if (strict) {
+		for (i = 0; i < N_UNITS; ++i)
+			if (strcmp(suffix, pcb_units[i].suffix) == 0)
+				return &pcb_units[i];
+	}
+	else {
+		for (i = 0; i < N_UNITS; ++i)
+			if (strncmp(suffix, pcb_units[i].suffix, s_len) == 0 || strncmp(suffix, pcb_units[i].alias[0], s_len) == 0)
+				return &pcb_units[i];
+	}
+
+	return NULL;
+}
+
+const pcb_unit_t *get_unit_struct(const char *suffix)
+{
+	return get_unit_struct_(suffix, 0);
+}
+
+
+const pcb_unit_t *get_unit_struct_by_allow(enum pcb_allow_e allow)
+{
+	int i;
+	for (i = 0; i < N_UNITS; ++i)
+		if (pcb_units[i].allow == allow)
+			return &pcb_units[i];
+
+	return NULL;
+}
+
+const pcb_unit_t *get_unit_by_idx(int idx)
+{
+	if ((idx < 0) || (idx >= N_UNITS))
+		return NULL;
+	return pcb_units + idx;
+}
+
+int pcb_get_n_units(void)
+{
+	return N_UNITS;
+}
+
+double pcb_coord_to_unit(const pcb_unit_t * unit, pcb_coord_t x)
+{
+	double base;
+	if (unit == NULL)
+		return -1;
+	base = unit->family == PCB_UNIT_METRIC ? PCB_COORD_TO_MM(1)
+		: PCB_COORD_TO_MIL(1);
+	return x * unit->scale_factor * base;
+}
+
+pcb_coord_t pcb_unit_to_coord(const pcb_unit_t * unit, double x)
+{
+	double base, res;
+
+	if (unit == NULL)
+		return -1;
+
+	base = unit->family == PCB_UNIT_METRIC ? PCB_MM_TO_COORD(x) : PCB_MIL_TO_COORD(x);
+	res = pcb_round(base/unit->scale_factor);
+
+	/* clamp */
+	if (res >= (double)COORD_MAX)
+		return COORD_MAX;
+	if (res <= -1.0 * (double)COORD_MAX)
+		return -COORD_MAX;
+
+	return res;
+}
+
+double pcb_unit_to_factor(const pcb_unit_t * unit)
+{
+	return 1.0 / pcb_coord_to_unit(unit, 1);
+}
+
+pcb_angle_t pcb_normalize_angle(pcb_angle_t a)
+{
+	while (a < 0)
+		a += 360.0;
+	while (a >= 360.0)
+		a -= 360.0;
+	return a;
+}
Index: tags/2.0.1/src/unit.h
===================================================================
--- tags/2.0.1/src/unit.h	(nonexistent)
+++ tags/2.0.1/src/unit.h	(revision 18980)
@@ -0,0 +1,153 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2011 Andrew Poelstra
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Andrew Poelstra, 16966 60A Ave, V3S 8X5 Surrey, BC, Canada
+ *  asp11@sfu.ca
+ *
+ */
+
+#ifndef	PCB_UNIT_H
+#define	PCB_UNIT_H
+
+#include "config.h"
+
+/* typedef ... pcb_coord_t;				pcb base unit, typedef'd in config.h */
+typedef double pcb_angle_t;						/* degrees */
+
+enum pcb_allow_e {
+	PCB_UNIT_NO_PRINT = 0,									/* suffixes we can read but not print (i.e., "inch") */
+	PCB_UNIT_ALLOW_NM = 1,
+	PCB_UNIT_ALLOW_UM = 2,
+	PCB_UNIT_ALLOW_MM = 4,
+	PCB_UNIT_ALLOW_CM = 8,
+	PCB_UNIT_ALLOW_M = 16,
+	PCB_UNIT_ALLOW_KM = 32,
+	PCB_UNIT_ALLOW_DU = 64, /* "du" = 0.1 micron "decimicron" units, for eagle bin */
+
+	PCB_UNIT_ALLOW_CMIL = 1024,
+	PCB_UNIT_ALLOW_MIL = 2048,
+	PCB_UNIT_ALLOW_IN = 4096,
+
+	PCB_UNIT_ALLOW_DMIL = 8192, /* for kicad legacy decimil units */
+
+	PCB_UNIT_ALLOW_METRIC = PCB_UNIT_ALLOW_NM  | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_CM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_KM,
+	PCB_UNIT_ALLOW_IMPERIAL = PCB_UNIT_ALLOW_DMIL | PCB_UNIT_ALLOW_CMIL | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
+	/* This is all units allowed in parse_l.l */
+#if 0
+	PCB_UNIT_ALLOW_READABLE = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_KM | PCB_UNIT_ALLOW_CMIL | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
+#else
+	PCB_UNIT_ALLOW_READABLE = PCB_UNIT_ALLOW_CMIL,
+#endif
+
+	/* Used for pcb-printf %mS - should not include unusual units like km, cmil and dmil */
+	PCB_UNIT_ALLOW_NATURAL = PCB_UNIT_ALLOW_NM | PCB_UNIT_ALLOW_UM | PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M | PCB_UNIT_ALLOW_MIL | PCB_UNIT_ALLOW_IN,
+
+	/* Allow all but the most exotic */
+	PCB_UNIT_ALLOW_ALL_SANE = ~(PCB_UNIT_ALLOW_DU | PCB_UNIT_ALLOW_DMIL),
+
+	PCB_UNIT_ALLOW_ALL = ~0
+};
+
+enum pcb_family_e { PCB_UNIT_METRIC, PCB_UNIT_IMPERIAL };
+enum pcb_suffix_e { PCB_UNIT_NO_SUFFIX, PCB_UNIT_SUFFIX, PCB_UNIT_FILE_MODE };
+
+struct pcb_unit_s {
+	int index;										/* Index into Unit[] list */
+	const char *suffix;
+	const char *in_suffix;				/* internationalized suffix */
+	char printf_code;
+	double scale_factor;
+	enum pcb_family_e family;
+	enum pcb_allow_e allow;
+	int default_prec;
+	/* used for gui spinboxes */
+	double step_tiny;
+	double step_small;
+	double step_medium;
+	double step_large;
+	double step_huge;
+	/* aliases -- right now we only need 1 ("inch"->"in"), add as needed */
+	const char *alias[1];
+};
+
+typedef struct pcb_unit_s pcb_unit_t;
+extern pcb_unit_t pcb_units[];
+
+/* Look up a given suffix in the units array. Pluralized units are supported.
+   The _ version allows strict (full name match) lookup if strict iz non-zero. */
+const pcb_unit_t *get_unit_struct(const char *suffix);
+const pcb_unit_t *get_unit_struct_(const char *suffix, int strict);
+
+/* Return the furst unit that matches allow */
+const pcb_unit_t *get_unit_struct_by_allow(enum pcb_allow_e allow);
+
+/* Return the list of units and number of units (obsolete, do not use) */
+int pcb_get_n_units(void);
+
+/* Return the idxth unit or NULL (bounds check) */
+const pcb_unit_t *get_unit_by_idx(int idx);
+
+/* Convert x to the given unit */
+double pcb_coord_to_unit(const pcb_unit_t *unit, pcb_coord_t x);
+
+/* Return how many PCB-internal-Coord-unit a unit translates to */
+double pcb_unit_to_factor(const pcb_unit_t * unit);
+
+/* Convert a given unit to pcb coords; clamp at the end of the ranges */
+pcb_coord_t pcb_unit_to_coord(const pcb_unit_t * unit, double x);
+
+/* Bring an angle into [0, 360) range */
+pcb_angle_t pcb_normalize_angle(pcb_angle_t a);
+
+
+/* Initialize non-static unit data: assigns each unit its index for
+   quick access through the main units array, and internationalize
+   the units for GUI display. */
+void pcb_units_init(void);
+
+/* PCB/physical unit conversions */
+#define PCB_COORD_TO_MIL(n)	((n) / 25400.0)
+#define PCB_MIL_TO_COORD(n)	((n) * 25400.0)
+#define PCB_COORD_TO_MM(n)	((n) / 1000000.0)
+#define PCB_MM_TO_COORD(n)	((n) * 1000000.0)
+#define PCB_COORD_TO_INCH(n)	(PCB_COORD_TO_MIL(n) / 1000.0)
+#define PCB_INCH_TO_COORD(n)	(PCB_MIL_TO_COORD(n) * 1000.0)
+#define PCB_COORD_TO_DECIMIL(n)    (PCB_COORD_TO_MIL(n) * 10.0)
+#define PCB_DECIMIL_TO_COORD(n)    (PCB_MIL_TO_COORD(n) / 10.0)
+
+#define	PCB_SWAP_ANGLE(a)		(-(a))
+#define	PCB_SWAP_DELTA(d)		(-(d))
+
+PCB_INLINE pcb_coord_t pcb_coord_abs(pcb_coord_t c)
+{
+	if (c < 0) return -c;
+	return c;
+}
+
+#endif
Index: tags/2.0.1/src/vtc0.c
===================================================================
--- tags/2.0.1/src/vtc0.c	(nonexistent)
+++ tags/2.0.1/src/vtc0.c	(revision 18980)
@@ -0,0 +1,3 @@
+#define GVT_DONT_UNDEF
+#include "vtc0.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtc0.h
===================================================================
--- tags/2.0.1/src/vtc0.h	(nonexistent)
+++ tags/2.0.1/src/vtc0.h	(revision 18980)
@@ -0,0 +1,21 @@
+#ifndef VTC0_H
+#define VTC0_H
+
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
+
+#define GVT(x) vtc0_ ## x
+#define GVT_ELEM_TYPE pcb_coord_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src/vtlibrary.c
===================================================================
--- tags/2.0.1/src/vtlibrary.c	(nonexistent)
+++ tags/2.0.1/src/vtlibrary.c	(revision 18980)
@@ -0,0 +1,3 @@
+#define GVT_DONT_UNDEF
+#include "vtlibrary.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtlibrary.h
===================================================================
--- tags/2.0.1/src/vtlibrary.h	(nonexistent)
+++ tags/2.0.1/src/vtlibrary.h	(revision 18980)
@@ -0,0 +1,74 @@
+#include <stdlib.h>
+#include <string.h>
+
+typedef enum {
+	LIB_INVALID,
+	LIB_DIR,
+	LIB_FOOTPRINT
+} pcb_fplibrary_type_t;
+
+typedef enum {
+	PCB_FP_INVALID,
+	PCB_FP_DIR,       /* used temporarily during the mapping - a finalized tree wouldn't have this */
+	PCB_FP_FILE,
+	PCB_FP_PARAMETRIC
+} pcb_fptype_t;
+
+
+typedef struct pcb_fplibrary_s pcb_fplibrary_t;
+
+/* Elem=library_t; init=none */
+
+/* all public symbols are wrapped in GVT() - see vt_t(7) */
+#define GVT(x) vtlib_ ## x
+
+/* Array elem type - see vt_t(7) */
+#define GVT_ELEM_TYPE pcb_fplibrary_t
+
+/* Type that represents array lengths - see vt_t(7) */
+#define GVT_SIZE_TYPE size_t
+
+/* Below this length, always double allocation size when the array grows */
+#define GVT_DOUBLING_THRS 64
+
+/* Initial array size when the first element is written */
+#define GVT_START_SIZE 8
+
+/* Optional prefix for function definitions (e.g. static inline) */
+#define GVT_FUNC
+
+/* Enable this to set all new bytes ever allocated to this value - see
+   vt_set_new_bytes_to(7) */
+#define GVT_SET_NEW_BYTES_TO 0
+
+
+/* Include the actual header implementation */
+#include <genvector/genvector_impl.h>
+
+/* Memory allocator - see vt_allocation(7) */
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+
+/* clean up #defines */
+#include <genvector/genvector_undef.h>
+
+/* An element of a library: either a directory or a footprint */
+struct pcb_fplibrary_s {
+	char *name;            /* visible name */
+	pcb_fplibrary_type_t type;
+	pcb_fplibrary_t *parent;
+
+	union {
+		struct { /* type == LIB_DIR */
+			vtlib_t children;
+			void *backend; /* pcb_plug_fp_t* */
+		} dir;
+		struct { /* type == LIB_FOOTPRINT */
+			char *loc_info;
+			void *backend_data;
+			pcb_fptype_t type;
+			void **tags;        /* an array of void * tag IDs; last tag ID is NULL */
+		} fp;
+	} data;
+} ;
+
Index: tags/2.0.1/src/vtonpoint.c
===================================================================
--- tags/2.0.1/src/vtonpoint.c	(nonexistent)
+++ tags/2.0.1/src/vtonpoint.c	(revision 18980)
@@ -0,0 +1,6 @@
+#define GVT_DONT_UNDEF
+
+#warning cleanup TODO: this should be replaced with pcb_obj_t
+
+#include "vtonpoint.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtonpoint.h
===================================================================
--- tags/2.0.1/src/vtonpoint.h	(nonexistent)
+++ tags/2.0.1/src/vtonpoint.h	(revision 18980)
@@ -0,0 +1,78 @@
+#ifndef PCB_VTOP_H
+#define PCB_VTOP_H
+
+#include <stdlib.h>
+#include <string.h>
+#include "global_typedefs.h"
+
+typedef struct pcb_onpoint_st {
+	int type;
+	union {
+		void *any;
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+	} obj;
+} pcb_onpoint_t;
+
+/* Elem=pcb_onpoint_t; init=none */
+
+/* all public symbols are wrapped in GVT() - see vt_t(7) */
+#define GVT(x) vtop_ ## x
+
+/* Array elem type - see vt_t(7) */
+#define GVT_ELEM_TYPE pcb_onpoint_t
+
+/* Type that represents array lengths - see vt_t(7) */
+#define GVT_SIZE_TYPE size_t
+
+/* Below this length, always double allocation size when the array grows */
+#define GVT_DOUBLING_THRS 64
+
+/* Initial array size when the first element is written */
+#define GVT_START_SIZE 8
+
+/* Optional terminator; when present, it is always appended at the end - see
+   vt_term(7)*/
+/* #define GVT_TERM '\0' */
+
+/* Optional prefix for function definitions (e.g. static inline) */
+#define GVT_FUNC
+
+/* Enable this to set all new bytes ever allocated to this value - see
+   vt_set_new_bytes_to(7) */
+/* #define GVT_SET_NEW_BYTES_TO 0 */
+
+/* Enable GVT_INIT_ELEM_FUNC and an user configured function is called
+   for each new element allocated (even between used and alloced).
+   See vt_init_elem(7) */
+/*#define GVT_INIT_ELEM_FUNC*/
+
+/* Enable GVT_ELEM_CONSTRUCTOR and an user configured function is called
+   for each element that is getting within the range of ->used.
+   See vt_construction(7) */
+/*#define GVT_ELEM_CONSTRUCTOR */
+
+/* Enable GVT_ELEM_DESTRUCTOR and an user configured function is called
+   for each element that was once constructed and now getting beyond ->used.
+   See vt_construction(7) */
+/*#define GVT_ELEM_DESTRUCTOR */
+
+/* Enable GVT_ELEM_COPY and an user configured function is called
+   for copying elements into the array.
+   See vt_construction(7) */
+/*#define GVT_ELEM_COPY */
+
+/* Optional extra fields in the vector struct - see vt_user_fields(7) */
+/* #define GVT_USER_FIELDS int foo; char bar[12]; */
+
+/* Include the actual header implementation */
+#include <genvector/genvector_impl.h>
+
+/* Memory allocator - see vt_allocation(7) */
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+
+/* clean up #defines */
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src/vtpadstack.c
===================================================================
--- tags/2.0.1/src/vtpadstack.c	(nonexistent)
+++ tags/2.0.1/src/vtpadstack.c	(revision 18980)
@@ -0,0 +1,6 @@
+#include "obj_pstk.h"
+
+#define GVT_DONT_UNDEF
+#include "vtpadstack.h"
+#include <genvector/genvector_impl.c>
+
Index: tags/2.0.1/src/vtpadstack.h
===================================================================
--- tags/2.0.1/src/vtpadstack.h	(nonexistent)
+++ tags/2.0.1/src/vtpadstack.h	(revision 18980)
@@ -0,0 +1,41 @@
+#ifndef PCB_VTPADSTACK_H
+#define PCB_VTPADSTACK_H
+
+/* Elem=pcb_pstk_proto_t; init=none */
+
+#include "obj_pstk.h"
+
+/* all public symbols are wrapped in GVT() - see vt_t(7) */
+#define GVT(x) pcb_vtpadstack_proto_ ## x
+
+/* Array elem type - see vt_t(7) */
+#define GVT_ELEM_TYPE pcb_pstk_proto_t
+
+/* Type that represents array lengths - see vt_t(7) */
+#define GVT_SIZE_TYPE size_t
+
+/* Below this length, always double allocation size when the array grows */
+#define GVT_DOUBLING_THRS 64
+
+/* Initial array size when the first element is written */
+#define GVT_START_SIZE 8
+
+/* Optional prefix for function definitions (e.g. static inline) */
+#define GVT_FUNC
+
+/* Enable this to set all new bytes ever allocated to this value - see
+   vt_set_new_bytes_to(7) */
+#define GVT_SET_NEW_BYTES_TO 0
+
+
+/* Include the actual header implementation */
+#include <genvector/genvector_impl.h>
+
+/* Memory allocator - see vt_allocation(7) */
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+
+/* clean up #defines */
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src/vtpadstack_t.c
===================================================================
--- tags/2.0.1/src/vtpadstack_t.c	(nonexistent)
+++ tags/2.0.1/src/vtpadstack_t.c	(revision 18980)
@@ -0,0 +1,5 @@
+#include <genvector/vtp0.h>
+#include <genvector/gds_char.h>
+#define GVT_DONT_UNDEF
+#include "vtpadstack_t.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtpadstack_t.h
===================================================================
--- tags/2.0.1/src/vtpadstack_t.h	(nonexistent)
+++ tags/2.0.1/src/vtpadstack_t.h	(revision 18980)
@@ -0,0 +1,41 @@
+#ifndef PCB_VTPADSTACK_T_H
+#define PCB_VTPADSTACK_T_H
+
+/* Elem=pcb_pstk_proto_t; init=none */
+
+#include "obj_pstk_shape.h"
+
+/* all public symbols are wrapped in GVT() - see vt_t(7) */
+#define GVT(x) pcb_vtpadstack_tshape_ ## x
+
+/* Array elem type - see vt_t(7) */
+#define GVT_ELEM_TYPE pcb_pstk_tshape_t
+
+/* Type that represents array lengths - see vt_t(7) */
+#define GVT_SIZE_TYPE size_t
+
+/* Below this length, always double allocation size when the array grows */
+#define GVT_DOUBLING_THRS 32
+
+/* Initial array size when the first element is written */
+#define GVT_START_SIZE 6
+
+/* Optional prefix for function definitions (e.g. static inline) */
+#define GVT_FUNC
+
+/* Enable this to set all new bytes ever allocated to this value - see
+   vt_set_new_bytes_to(7) */
+#define GVT_SET_NEW_BYTES_TO 0
+
+
+/* Include the actual header implementation */
+#include <genvector/genvector_impl.h>
+
+/* Memory allocator - see vt_allocation(7) */
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+
+/* clean up #defines */
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src/vtr0.c
===================================================================
--- tags/2.0.1/src/vtr0.c	(nonexistent)
+++ tags/2.0.1/src/vtr0.c	(revision 18980)
@@ -0,0 +1,3 @@
+#define GVT_DONT_UNDEF
+#include "vtr0.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtr0.h
===================================================================
--- tags/2.0.1/src/vtr0.h	(nonexistent)
+++ tags/2.0.1/src/vtr0.h	(revision 18980)
@@ -0,0 +1,31 @@
+#ifndef VTR0_H
+#define VTR0_H
+
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct pcb_range_s {
+	pcb_coord_t begin, end;
+	union {
+		long l;
+		pcb_coord_t c;
+		double d;
+		void *ptr;
+	} data[4];
+} pcb_range_t;
+
+#define GVT(x) vtr0_ ## x
+#define GVT_ELEM_TYPE pcb_range_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src/vtroutestyle.c
===================================================================
--- tags/2.0.1/src/vtroutestyle.c	(nonexistent)
+++ tags/2.0.1/src/vtroutestyle.c	(revision 18980)
@@ -0,0 +1,3 @@
+#define GVT_DONT_UNDEF
+#include "vtroutestyle.h"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src/vtroutestyle.h
===================================================================
--- tags/2.0.1/src/vtroutestyle.h	(nonexistent)
+++ tags/2.0.1/src/vtroutestyle.h	(revision 18980)
@@ -0,0 +1,81 @@
+#ifndef PCB_VTROUTESTYLE_H
+#define PCB_VTROUTESTYLE_H
+#include <stdlib.h>
+#include <string.h>
+#include "unit.h"
+#include "attrib.h"
+#include "global_typedefs.h"
+
+/* Elem=RouteStyle; init=0 */
+
+typedef struct {
+	pcb_coord_t Thick;            /* line thickness */
+	pcb_coord_t Clearance;        /* min. separation from other nets */
+	pcb_cardinal_t via_proto;     /* via padstack prototype ID */
+	int via_proto_set;            /* 1 if via_proto is set/valid, 0 for old file formats */
+	pcb_coord_t Diameter, Hole;   /* OBSOLETE: via diameter and drill hole; kept for compatibility with old file formats (lihata board v1..v4) */
+	char name[32];                /* fixed length name to save malloc/free */
+	pcb_attribute_list_t attr;
+} pcb_route_style_t;
+
+/* all public symbols are wrapped in GVT() - see vt_t(7) */
+#define GVT(x) vtroutestyle_ ## x
+#define HAVE_VTROUTESTYLE_T
+
+/* Array elem type - see vt_t(7) */
+#define GVT_ELEM_TYPE pcb_route_style_t
+
+/* Type that represents array lengths - see vt_t(7) */
+#define GVT_SIZE_TYPE size_t
+
+/* Below this length, always double allocation size when the array grows */
+#define GVT_DOUBLING_THRS 16
+
+/* Initial array size when the first element is written */
+#define GVT_START_SIZE 4
+
+/* Optional terminator; when present, it is always appended at the end - see
+   vt_term(7)*/
+/* #define GVT_TERM '\0' */
+
+/* Optional prefix for function definitions (e.g. static inline) */
+#define GVT_FUNC
+
+/* Enable this to set all new bytes ever allocated to this value - see
+   vt_set_new_bytes_to(7) */
+#define GVT_SET_NEW_BYTES_TO 0
+
+/* Enable GVT_INIT_ELEM_FUNC and an user configured function is called
+   for each new element allocated (even between used and alloced).
+   See vt_init_elem(7) */
+/*#define GVT_INIT_ELEM_FUNC*/
+
+/* Enable GVT_ELEM_CONSTRUCTOR and an user configured function is called
+   for each element that is getting within the range of ->used.
+   See vt_construction(7) */
+/*#define GVT_ELEM_CONSTRUCTOR */
+
+/* Enable GVT_ELEM_DESTRUCTOR and an user configured function is called
+   for each element that was once constructed and now getting beyond ->used.
+   See vt_construction(7) */
+/*#define GVT_ELEM_DESTRUCTOR */
+
+/* Enable GVT_ELEM_COPY and an user configured function is called
+   for copying elements into the array.
+   See vt_construction(7) */
+/*#define GVT_ELEM_COPY */
+
+/* Optional extra fields in the vector struct - see vt_user_fields(7) */
+/* #define GVT_USER_FIELDS int foo; char bar[12]; */
+
+/* Include the actual header implementation */
+#include <genvector/genvector_impl.h>
+
+/* Memory allocator - see vt_allocation(7) */
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+
+/* clean up #defines */
+#include <genvector/genvector_undef.h>
+
+#endif
Index: tags/2.0.1/src
===================================================================
--- tags/2.0.1/src	(nonexistent)
+++ tags/2.0.1/src	(revision 18980)

Property changes on: tags/2.0.1/src
___________________________________________________________________
Added: svn:externals
## -0,0 +1 ##
+
Index: tags/2.0.1/src_3rd/Makefile.conf
===================================================================
--- tags/2.0.1/src_3rd/Makefile.conf	(nonexistent)
+++ tags/2.0.1/src_3rd/Makefile.conf	(revision 18980)
@@ -0,0 +1 @@
+# placeholder for genvector
Index: tags/2.0.1/src_3rd/README
===================================================================
--- tags/2.0.1/src_3rd/README	(nonexistent)
+++ tags/2.0.1/src_3rd/README	(revision 18980)
@@ -0,0 +1 @@
+3rd party software libs
Index: tags/2.0.1/src_3rd/libuhpgl/Makefile
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/Makefile	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/Makefile	(revision 18980)
@@ -0,0 +1,4 @@
+CFLAGS = -Wall -g -ansi -pedantic
+
+parse.o: parse.c uhpgl_math.h libuhpgl.h arc_iterate.h
+
Index: tags/2.0.1/src_3rd/libuhpgl/README
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/README	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/README	(revision 18980)
@@ -0,0 +1,15 @@
+The micro HP-GL library
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Libuhpgl is a small, portable (C89) library for parsing and generating
+HP-GL data. It is designed for use as a converter in an application that
+has its own 2d object model.
+
+To accomodate to the object model of the application, the lib offers different
+options for the drawing primitives, e.g. the application may chose whether to
+support filled polygons or vurves (arcs, circles). The lib loads a sequence
+of HP-GL instructions, builds a complex object (such as a polygon) in memory
+and passes it to the application when all details of the object is already
+known.
+
+
Index: tags/2.0.1/src_3rd/libuhpgl/arc_iterate.h
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/arc_iterate.h	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/arc_iterate.h	(revision 18980)
@@ -0,0 +1,125 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+/* Arc approximation loops for internal use - not intended to be
+   included by the library user */
+
+#ifndef LIBUHPGL_ARC_ITERATE_H
+#define LIBUHPGL_ARC_ITERATE_H
+
+/* Arc approximation loops */
+
+typedef struct uhpgl_arc_it_s {
+	const uhpgl_arc_t *arc;
+	double step;   /* stepping angle */
+	double ang;
+	uhpgl_point_t pt;
+	int remain;
+} uhpgl_arc_it_t;
+
+/* Do not call directly. Set up iterator for angle based steps. */
+static uhpgl_point_t *uhpgl_arc_it_first_ang(uhpgl_arc_it_t *it, const uhpgl_arc_t *arc, double step)
+{
+	double minstep = 360.0 / (arc->r*CONST_PI*2.0);
+
+	if (step < 0)
+		step = -step;
+	else if (step == 0)
+		step = 5;
+
+	if (step < minstep)
+		step = minstep;
+
+	if (arc->deltaa < 0)
+		step = -step;
+
+	it->arc = arc;
+	it->step = step;
+	it->remain = floor(arc->deltaa / step)+2;
+
+	it->pt = arc->startp;
+	it->ang = arc->starta;
+	return &it->pt;
+}
+
+/* Do not call directly. Set up iterator for radius error based steps. */
+static uhpgl_point_t *uhpgl_arc_it_first_err(uhpgl_arc_it_t *it, const uhpgl_arc_t *arc, double err)
+{
+	double step;
+
+	if (err > arc->r / 4)
+		return uhpgl_arc_it_first_ang(it, arc, 0);
+
+	step = RAD2DEG(acos((arc->r - err) / arc->r) * 2);
+	if (step < 0)
+		step = -step;
+
+	if (step < 0.1)
+		step = 0.1;
+	else if (step > 15)
+		step = 15;
+
+	return uhpgl_arc_it_first_ang(it, arc, step);
+}
+
+/* Start an iteration, return the first point */
+static uhpgl_point_t *uhpgl_arc_it_first(uhpgl_ctx_t *ctx, uhpgl_arc_it_t *it, const uhpgl_arc_t *arc, double resolution)
+{
+	if (ctx->state.ct == 0)
+		return uhpgl_arc_it_first_ang(it, arc, resolution);
+	return uhpgl_arc_it_first_err(it, arc, resolution);
+}
+
+/* Return the next point or NULL if there are no more points */
+static uhpgl_point_t *uhpgl_arc_it_next(uhpgl_arc_it_t *it)
+{
+	uhpgl_coord_t x, y;
+	it->remain--;
+	switch(it->remain) {
+		case 0: /* beyond the endpoint */
+			return NULL;
+		case 1: /* at the endpoint */
+			last_pt:;
+			/* special case: endpoint reached in the previous iterationm remaining correction path is 0 long */
+			if ((it->pt.x == it->arc->endp.x) && (it->pt.y == it->arc->endp.y))
+				return NULL;
+			it->pt = it->arc->endp;
+			return &it->pt;
+		default:
+			for(;;) {
+				it->ang += it->step;
+				x = ROUND((double)it->arc->center.x + it->arc->r * cos(DEG2RAD(it->ang)));
+				y = ROUND((double)it->arc->center.y + it->arc->r * sin(DEG2RAD(it->ang)));
+				if ((it->pt.x != x) || (it->pt.y != y)) {
+					it->pt.x = x;
+					it->pt.y = y;
+					return &it->pt;
+				}
+				it->remain--;
+				if (it->remain == 1)
+					goto last_pt;
+			}
+	}
+	return NULL;
+}
+
+#endif
Index: tags/2.0.1/src_3rd/libuhpgl/examples/Makefile
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/Makefile	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/Makefile	(revision 18980)
@@ -0,0 +1,7 @@
+CFLAGS = -I../..
+CFLAGS += -Wall -g -ansi -pedantic
+LDFLAGS = -lm
+
+dump_hpgl: dump_hpgl.o ../parse.o
+
+dump_hpgl.o: dump_hpgl.c
Index: tags/2.0.1/src_3rd/libuhpgl/examples/aa.hpgl
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/aa.hpgl	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/aa.hpgl	(revision 18980)
@@ -0,0 +1,10 @@
+IN;
+SP1;
+CT1;
+PU;
+PA5,0;
+PD;
+AA5,5,-180,0.1;
+PA15,10;
+AA15,5,-180,0.4;
+PA5,0;
Index: tags/2.0.1/src_3rd/libuhpgl/examples/circ.hpgl
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/circ.hpgl	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/circ.hpgl	(revision 18980)
@@ -0,0 +1,7 @@
+IN;
+
+SP1;
+
+PA50,50;
+CI20,10;
+
Index: tags/2.0.1/src_3rd/libuhpgl/examples/dump_hpgl.c
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/dump_hpgl.c	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/dump_hpgl.c	(revision 18980)
@@ -0,0 +1,102 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <libuhpgl/libuhpgl.h>
+#include <libuhpgl/parse.h>
+
+
+static int dump_line(uhpgl_ctx_t *ctx, uhpgl_line_t *line)
+{
+	printf("line {%d}: %ld;%ld  %ld;%ld\n", line->pen, line->p1.x, line->p1.y, line->p2.x, line->p2.y);
+	return 0;
+}
+
+static void dump_arc_(uhpgl_ctx_t *ctx, uhpgl_arc_t *arc, const char *type)
+{
+	printf("%s {%d}: %ld;%ld;%ld %f->%f (%f) (%ld;%ld->%ld;%ld)\n", type, arc->pen,
+		arc->center.x, arc->center.y, arc->r,
+		arc->starta, arc->enda, arc->deltaa,
+		arc->startp.x, arc->startp.y, arc->endp.x, arc->endp.y);
+}
+
+static int dump_arc(uhpgl_ctx_t *ctx, uhpgl_arc_t *arc)
+{
+	dump_arc_(ctx, arc, "arc");
+	return 0;
+}
+
+
+static int dump_circ(uhpgl_ctx_t *ctx, uhpgl_arc_t *circ)
+{
+	printf("circ {%d}: %ld;%ld;%ld\n", circ->pen,
+		circ->center.x, circ->center.y, circ->r);
+	return 0;
+}
+
+static int dump_poly(uhpgl_ctx_t *ctx, uhpgl_poly_t *poly)
+{
+#warning TODO
+	return 0;
+}
+
+static int dump_wedge(uhpgl_ctx_t *ctx, uhpgl_wedge_t *wedge)
+{
+	dump_arc_(ctx, &wedge->arc, "wedge");
+	return 0;
+}
+
+static int dump_rect(uhpgl_ctx_t *ctx, uhpgl_rect_t *rect)
+{
+	printf("rect {%d}: %ld;%ld  %ld;%ld\n", rect->pen, rect->p1.x, rect->p1.y, rect->p2.x, rect->p2.y);
+	return 0;
+}
+
+static int print_error(uhpgl_ctx_t *ctx)
+{
+	fprintf(stderr, "Error on stdin:%d.%d: %s\n", ctx->error.line, ctx->error.col, ctx->error.msg);
+	return -1;
+}
+
+int main()
+{
+	uhpgl_ctx_t ctx;
+
+	memset(&ctx, 0, sizeof(ctx));
+
+	ctx.conf.line  = dump_line;
+	ctx.conf.arc   = dump_arc;
+	ctx.conf.circ  = dump_circ;
+	ctx.conf.poly  = dump_poly;
+	ctx.conf.wedge = dump_wedge;
+	ctx.conf.rect  = dump_rect;
+
+	if (uhpgl_parse_open(&ctx) != 0)
+		return print_error(&ctx);
+	if (uhpgl_parse_file(&ctx, stdin) != 0)
+		return print_error(&ctx);
+	if (uhpgl_parse_close(&ctx) != 0)
+		return print_error(&ctx);
+	return 0;
+}
+
Index: tags/2.0.1/src_3rd/libuhpgl/examples/rect.hpgl
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/rect.hpgl	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/rect.hpgl	(revision 18980)
@@ -0,0 +1,13 @@
+IN;
+
+SP1;
+
+PA0,0;
+
+PD;
+PA200,0;
+PA200,200;
+PA0,200;
+PR0,-200;
+PU;
+
Index: tags/2.0.1/src_3rd/libuhpgl/examples/rect_bound.hpgl
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/rect_bound.hpgl	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/rect_bound.hpgl	(revision 18980)
@@ -0,0 +1,13 @@
+IN;
+IP0,0,4000,4000;
+SC0,200,0,200;
+SP1;
+PA0,0;
+
+PD;
+PA200,0;
+PA200,200;
+PA0,200;
+PA0,0;
+PU;
+
Index: tags/2.0.1/src_3rd/libuhpgl/examples/vararg.hpgl
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/examples/vararg.hpgl	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/examples/vararg.hpgl	(revision 18980)
@@ -0,0 +1,9 @@
+IN;
+SP1;
+PU;
+PA10,10;
+PD;
+PD20,10,20,20,10,20,10,10;
+PR2,2,-3,3;
+PA5,5,3,7;
+PU;
Index: tags/2.0.1/src_3rd/libuhpgl/libuhpgl.h
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/libuhpgl.h	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/libuhpgl.h	(revision 18980)
@@ -0,0 +1,151 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+#ifndef LIBUHPGL_H
+#define LIBUHPGL_H
+
+#include <stddef.h>
+
+/*** low level types ***/
+typedef long int uhpgl_coord_t;  /* 1 unit is 0.025 mm */
+typedef double uhpgl_angle_t;    /* in degrees; absolute angles are [0..360], relative angles are [-360..+360] */
+
+typedef enum uhpgl_obj_type_s {
+	UHPGL_OBJ_INVALID,
+	UHPGL_OBJ_LINE,
+	UHPGL_OBJ_ARC,
+	UHPGL_OBJ_WEDGE,
+	UHPGL_OBJ_RECT,
+	UHPGL_OBJ_POLY
+} uhpgl_obj_type_t;
+
+typedef enum uhpgl_fill_type_s {
+	UHPGL_FILL_NONE,
+	UHPGL_FILL_PAINT1,
+	UHPGL_FILL_PAINT2,
+	UHPGL_FILL_SINGLE,
+	UHPGL_FILL_CROSS
+} uhpgl_fill_type_t;
+
+typedef struct uhpgl_fill_stroke_s {
+	uhpgl_fill_type_t  type;       /* UHPGL_FILL_NONE if no fill */
+	uhpgl_coord_t      spacing;
+	uhpgl_angle_t      angle;
+	double             pen_thick;
+	unsigned           stroke:1;   /* 1 if stroked */
+} uhpgl_fill_stroke_t;
+
+typedef struct uhpgl_point_s {
+	uhpgl_coord_t x, y;
+} uhpgl_point_t;
+
+typedef struct uhpgl_obj_s uhpgl_obj_t;
+
+/*** drawing objects ***/
+typedef struct uhpgl_line_s {
+	int pen;
+	uhpgl_point_t p1, p2;
+} uhpgl_line_t;
+
+typedef struct uhpgl_arc_s {
+	int pen;
+	uhpgl_point_t center;
+	uhpgl_coord_t r;
+	uhpgl_point_t startp, endp;
+	uhpgl_angle_t starta, enda, deltaa;
+} uhpgl_arc_t;
+
+typedef struct uhpgl_wedge_s {
+	int pen;
+	uhpgl_arc_t arc;
+	uhpgl_fill_stroke_t fill_stroke;
+} uhpgl_wedge_t;
+
+typedef struct uhpgl_rect_s {
+	int pen;
+	uhpgl_point_t p1, p2; /* p1 is the minimal x;y and p2 is the maximal x;y */
+	uhpgl_fill_stroke_t fill_stroke;
+} uhpgl_rect_t;
+
+typedef struct uhpgl_poly_s {
+	int pen;
+	uhpgl_point_t bb1, bb2; /* bounding box; bb1 is the minimal x;y and bb2 is the maximal x;y */
+	uhpgl_obj_t *outline;   /* outer contour (linked list of non-poly objects) */
+	int num_holes;
+	uhpgl_obj_t **holes;    /* inner/hole contours (each is a linked list of non-poly objects) */
+	uhpgl_fill_stroke_t fill_stroke;
+} uhpgl_poly_t;
+
+/*** common object and context ***/
+struct uhpgl_obj_s {
+	uhpgl_obj_type_t type;
+	union {
+		uhpgl_line_t line;
+		uhpgl_arc_t arc;
+		uhpgl_wedge_t wedge;
+		uhpgl_rect_t rect;
+		uhpgl_poly_t poly;
+	} obj;
+	uhpgl_obj_t *next; /* singly linked list of objects, NULL terminates the list */
+};
+
+typedef struct uhpgl_ctx_s uhpgl_ctx_t;
+struct uhpgl_ctx_s {
+	/* configuration: read-only for the lib, written by the caller */
+	struct {
+		unsigned approx_curve_in_poly:1; /* if 1, use line approx in polygons even if arc() is non-NULL */
+
+		/* callbacks for objects found; if returns non-zero, parsing is abandoned */
+		int (*line)(uhpgl_ctx_t *ctx, uhpgl_line_t *line);    /* must NOT be NULL */
+		int (*arc)(uhpgl_ctx_t *ctx, uhpgl_arc_t *arc);       /* if NULL, use line() approx */
+		int (*circ)(uhpgl_ctx_t *ctx, uhpgl_arc_t *circ);     /* if NULL, use arc() */
+		int (*poly)(uhpgl_ctx_t *ctx, uhpgl_poly_t *poly);    /* if NULL, use draw the outline only (even for filled polygons) */
+		int (*wedge)(uhpgl_ctx_t *ctx, uhpgl_wedge_t *wedge); /* if NULL, use polygon() */
+		int (*rect)(uhpgl_ctx_t *ctx, uhpgl_rect_t *rect);    /* if NULL, use polygon() */
+	} conf;
+
+	/* current state: read-only for the caller, written by the lib */
+	struct {
+		int pen;              /* selected pen [0..255] */
+		int pen_speed;
+		unsigned pen_down:1;  /* whether pen is down (drawing) */
+		uhpgl_point_t at;     /* last known coordinate of the pen */
+		int ct;               /* Chord Tolerance */
+		uhpgl_fill_stroke_t fill;
+
+		/* last char parsed */
+		size_t offs;
+		size_t line, col;
+	} state;
+
+	/* parser error report: written by the lib, read-only for the caller */
+	struct {
+		size_t offs;
+		size_t line, col;
+		const char *msg;
+	} error;
+
+	void *parser;    /* opaque parser data */
+	void *user_data; /* only used by the caller */
+};
+
+#endif
Index: tags/2.0.1/src_3rd/libuhpgl/parse.c
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/parse.c	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/parse.c	(revision 18980)
@@ -0,0 +1,503 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+#include <stdlib.h>
+#include <ctype.h>
+#include "uhpgl_math.h"
+#include "libuhpgl.h"
+#include "parse.h"
+#include "arc_iterate.h"
+
+#define inst2num(s1, s2) ((((int)s1) << 8) | (int)s2)
+
+typedef enum state_e {
+	ST_IDLE,
+	ST_INST,
+	ST_INST_END,
+	ST_NUMBERS_OR_END,
+	ST_SPC_NUMBERS_OR_END,
+	ST_NUMBERS,
+	ST_ESCAPED
+} state_t;
+
+typedef struct {
+	size_t token_offs;
+	size_t token_line, token_col;
+	char inst[2];
+	char token[32];
+	int len; /* token length */
+
+	double argv[32];
+	int argc;
+
+	state_t state;
+	unsigned error:1;
+	unsigned eof:1;
+} parse_t;
+
+static int error(uhpgl_ctx_t *ctx, const char *msg)
+{
+	parse_t *p = ctx->parser;
+
+	ctx->error.offs = p->token_offs;
+	ctx->error.line = p->token_line;
+	ctx->error.col = p->token_col;
+	ctx->error.msg = msg;
+
+	p->error = 1;
+	return -1;
+}
+
+static const char *err_beyond_end = "Character after EOF";
+static const char *err_not_open   = "Parser is not open";
+
+#define decl_parser_ctx \
+	parse_t *p = ctx->parser; \
+	if (p == NULL) {\
+		ctx->error.msg = err_not_open; \
+		return -1; \
+	} \
+	if (p->error) \
+		return -1; \
+	if (p->eof) \
+		return error(ctx, err_beyond_end);
+
+int uhpgl_parse_str(uhpgl_ctx_t *ctx, const char *str)
+{
+	int ret;
+	decl_parser_ctx;
+
+	for(;*str != '\0'; str++) {
+		ret = uhpgl_parse_char(ctx, *str);
+		if (ret != 0)
+			return ret;
+	}
+	return 0;
+}
+
+int uhpgl_parse_file(uhpgl_ctx_t *ctx, FILE *f)
+{
+	int ret, c;
+	decl_parser_ctx;
+
+	while((c = fgetc(f)) != EOF) {
+		ret = uhpgl_parse_char(ctx, c);
+		if (ret != 0)
+			return ret;
+	}
+	return 0;
+}
+
+int uhpgl_parse_open(uhpgl_ctx_t *ctx)
+{
+	if (ctx->parser != NULL) {
+		ctx->error.msg = "Parser already open";
+		return -1;
+	}
+	ctx->parser = calloc(sizeof(parse_t), 1);
+	ctx->state.offs = 0;
+	ctx->state.line = 1;
+	ctx->state.col = 1;
+	return 0;
+}
+
+int uhpgl_parse_close(uhpgl_ctx_t *ctx)
+{
+	decl_parser_ctx;
+	if (p->state != ST_IDLE) {
+		error(ctx, "premature end of stream");
+		free(p);
+		ctx->parser = NULL;
+		return -1;
+	}
+
+	free(p);
+	ctx->parser = NULL;
+	return 0;
+}
+
+/*** execute ***/
+static void move_to(uhpgl_ctx_t *ctx, uhpgl_coord_t x, uhpgl_coord_t y)
+{
+	ctx->state.at.x = x;
+	ctx->state.at.y = y;
+}
+
+static int draw_line(uhpgl_ctx_t *ctx, uhpgl_coord_t x1, uhpgl_coord_t y1, uhpgl_coord_t x2, uhpgl_coord_t y2)
+{
+	uhpgl_line_t line;
+	line.pen = ctx->state.pen;
+	line.p1.x = x1;
+	line.p1.y = y1;
+	line.p2.x = x2;
+	line.p2.y = y2;
+	move_to(ctx, x2, y2);
+	return ctx->conf.line(ctx, &line);
+}
+
+static int draw_arc_(uhpgl_ctx_t *ctx, uhpgl_arc_t *arc, double resolution)
+{
+	uhpgl_arc_it_t it;
+	int cnt;
+	uhpgl_point_t *p, prev;
+
+	move_to(ctx, arc->endp.x, arc->endp.y);
+	if (ctx->conf.arc != NULL)
+		return ctx->conf.arc(ctx, arc);
+
+	for(cnt = 0, p = uhpgl_arc_it_first(ctx, &it, arc, resolution); p != NULL; cnt++, p = uhpgl_arc_it_next(&it)) {
+		if (cnt > 0) {
+			if (draw_line(ctx, prev.x, prev.y, p->x, p->y) != 0)
+				return -1;
+		}
+		prev = *p;
+	}
+
+	return 0;
+}
+
+static int draw_arc(uhpgl_ctx_t *ctx, uhpgl_coord_t cx, uhpgl_coord_t cy, double da, double res)
+{
+	uhpgl_arc_t arc;
+	arc.pen = ctx->state.pen;
+	arc.center.x = cx;
+	arc.center.y = cy;
+	arc.startp.x = ctx->state.at.x;
+	arc.startp.y = ctx->state.at.y;
+	arc.r = ROUND(DDIST(arc.startp.y - arc.center.y, arc.startp.x - arc.center.x));
+	arc.deltaa = da;
+
+	arc.starta = RAD2DEG(atan2(arc.startp.y - arc.center.y, arc.startp.x - arc.center.x));
+	arc.enda = arc.starta + da;
+
+	arc.endp.x = ROUND((double)cx + arc.r * cos(DEG2RAD(arc.enda)));
+	arc.endp.y = ROUND((double)cy + arc.r * sin(DEG2RAD(arc.enda)));
+
+	return draw_arc_(ctx, &arc, res);
+}
+
+
+static int draw_circ(uhpgl_ctx_t *ctx, uhpgl_coord_t cx, uhpgl_coord_t cy, uhpgl_coord_t r, uhpgl_coord_t res)
+{
+	uhpgl_arc_t arc;
+	arc.pen = ctx->state.pen;
+	arc.center.x = cx;
+	arc.center.y = cy;
+	arc.r = r;
+	arc.startp.x = cx + r;
+	arc.startp.y = cy;
+	arc.endp.x = cx + r;
+	arc.endp.y = cy;
+	arc.starta = 0;
+	arc.enda = 360;
+	arc.deltaa = 360;
+	if (ctx->conf.circ != NULL) {
+		move_to(ctx, arc.endp.x, arc.endp.y);
+		return ctx->conf.circ(ctx, &arc);
+	}
+	return draw_arc_(ctx, &arc, res);
+}
+
+
+/*** the actual parser: high level (grammar) ***/
+static int parse_inst(uhpgl_ctx_t *ctx)
+{
+	parse_t *p = ctx->parser;
+	p->inst[0] = p->token[0];
+	p->inst[1] = p->token[1];
+	switch(inst2num(p->inst[0], p->inst[1])) {
+		case inst2num('I','N'):
+			/* ignore */
+			p->state = ST_INST_END;
+			return 0;
+		case inst2num('P','U'):
+			ctx->state.pen_down = 0;
+			p->state = ST_NUMBERS_OR_END;
+			return 0;
+		case inst2num('P','D'):
+			ctx->state.pen_down = 1;
+			p->state = ST_NUMBERS_OR_END;
+			return 0;
+		case inst2num('W','U'):
+		case inst2num('P','W'):
+		case inst2num('L','T'):
+			p->state = ST_NUMBERS_OR_END;
+			return 0;
+
+		case inst2num('P','A'):
+		case inst2num('P','R'):
+		case inst2num('S','P'):
+		case inst2num('C','T'):
+		case inst2num('C','I'):
+		case inst2num('A','A'):
+		case inst2num('A','R'):
+		case inst2num('F','T'):
+		case inst2num('P','T'):
+/*
+		case inst2num('L','T'):
+		case inst2num('W','G'):
+		case inst2num('E','W'):
+		case inst2num('R','A'):
+		case inst2num('E','A'):
+		case inst2num('R','R'):
+		case inst2num('E','R'):
+		case inst2num('P','M'):
+		case inst2num('E','P'):
+		case inst2num('F','P'):
+*/
+			/* prepare to read coords */
+			p->state = ST_NUMBERS;
+			return 0;
+		case inst2num('V','S'):
+			p->state = ST_SPC_NUMBERS_OR_END;
+			return 0;
+	}
+	return error(ctx, "unimplemented instruction");
+}
+
+/* Consume all current arguments and report end or go on for the next set
+   of arguments; useful for vararg instructions like PA */
+#define shift_all() \
+do { \
+	if (!is_last) {\
+		p->argc = 0; \
+		p->state = ST_NUMBERS; \
+	} \
+	else \
+		p->state = ST_INST_END; \
+} while(0)
+
+static int parse_coord(uhpgl_ctx_t *ctx, double coord, int is_last)
+{
+	parse_t *p = ctx->parser;
+	p->argv[p->argc] = coord;
+	p->argc++;
+	switch(inst2num(p->inst[0], p->inst[1])) {
+		case inst2num('S','P'):
+			if ((coord < 0) || (coord > 255))
+				return error(ctx, "invalid pen index");
+			ctx->state.pen = coord;
+			p->state = ST_INST_END;
+			return 0;
+		case inst2num('C','T'):
+			ctx->state.ct = coord;
+			p->state = ST_INST_END;
+			return 0;
+		case inst2num('P','U'):
+		case inst2num('P','A'):
+		case inst2num('P','D'):
+			p->state = ST_NUMBERS; /* make sure to load even a single pair */
+			if (p->argc == 2) {
+				if (ctx->state.pen_down) {
+					if (draw_line(ctx, ctx->state.at.x, ctx->state.at.y, p->argv[0], p->argv[1]) < 0)
+						return -1;
+				}
+				else
+					move_to(ctx, p->argv[0], p->argv[1]);
+				shift_all();
+			}
+			return 0;
+		case inst2num('P','R'):
+			if (p->argc == 2) {
+				if (ctx->state.pen_down) {
+					if (draw_line(ctx, ctx->state.at.x, ctx->state.at.y, ctx->state.at.x + p->argv[0], ctx->state.at.y + p->argv[1]) < 0)
+						return -1;
+				}
+				else
+					move_to(ctx, ctx->state.at.x + p->argv[0], ctx->state.at.y + p->argv[1]);
+				shift_all();
+			}
+			return 0;
+		case inst2num('C','I'):
+			if ((p->argc == 2) || (is_last)) {
+				p->state = ST_INST_END;
+				if (draw_circ(ctx, ctx->state.at.x, ctx->state.at.y, p->argv[0], (p->argc == 2 ? p->argv[1] : -1)) < 0)
+					return -1;
+			}
+			return 0;
+		case inst2num('A','A'):
+			if ((p->argc == 4) || (is_last)) {
+				p->state = ST_INST_END;
+				if (draw_arc(ctx, p->argv[0], p->argv[1], p->argv[2], (p->argc == 4 ? p->argv[3] : 0)) < 0)
+					return -1;
+			}
+			return 0;
+		case inst2num('A','R'):
+			if ((p->argc == 4) || (is_last)) {
+				p->state = ST_INST_END;
+				if (draw_arc(ctx, ctx->state.at.x + p->argv[0], ctx->state.at.y + p->argv[1], p->argv[2], (p->argc == 4 ? p->argv[3] : 0)) < 0)
+					return -1;
+			}
+			return 0;
+		case inst2num('F','T'):
+			if (is_last) {
+				switch(p->argc) {
+					case 3: ctx->state.fill.angle = p->argv[2];
+					case 2: ctx->state.fill.spacing = p->argv[1];
+					case 1: ctx->state.fill.type = p->argv[0]; break;
+					case 0: ctx->state.fill.type = 1; break;
+					default:
+						return error(ctx, "Wrong number of arguments (expected 0, 1, 2 or 3)");
+				}
+			}
+			return 0;
+		case inst2num('P','T'):
+			if ((p->argc == 1) && (is_last)) {
+				ctx->state.fill.pen_thick = p->argv[0];
+				return 0;
+			}
+			return error(ctx, "PT needs 1 argument");
+		case inst2num('L','T'):
+			if (is_last) {
+				if ((p->argc <= 3) && (is_last))
+					return 0;
+				return error(ctx, "LT needs at most 3 argument");
+			}
+			return 0;
+		case inst2num('V','S'):
+			if (is_last) {
+				if ((p->argc == 1) || (p->argc == 2)) {
+					ctx->state.pen_speed = p->argv[0];
+					p->state = ST_INST_END;
+					return 0;
+				}
+				printf("argc=%d\n", p->argc);
+				return error(ctx, "VS needs 1 or 2 arguments");
+			}
+			return 0;
+		case inst2num('W','U'): /* unknown */
+			if (is_last) {
+				if (p->argc == 1)
+					return 0;
+				return error(ctx, "WU needs 1 argument");
+			}
+			return 0;
+		case inst2num('P','W'): /* unknown; maybe pen width? */
+			if (is_last) {
+				if (p->argc == 2)
+					return 0;
+				return error(ctx, "PW needs 2 arguments");
+			}
+			return 0;
+	}
+	return error(ctx, "unimplemented coord instruction");
+}
+
+/*** the actual parser: low level (tokens) ***/
+#define token_start() \
+do { \
+	p->len = 0; \
+	p->token_offs = ctx->state.offs; \
+	p->token_line = ctx->state.line; \
+	p->token_col = ctx->state.col-1; \
+} while(0)
+
+int uhpgl_parse_char(uhpgl_ctx_t *ctx, int c)
+{
+	int res;
+	decl_parser_ctx;
+
+	ctx->state.col++;
+	switch(c) {
+		case EOF:
+			p->eof = 1;
+			return 0;
+		case '\n': 
+			ctx->state.line++;
+			ctx->state.col = 1;
+			return 0;
+		case '\r':
+		case '\t':
+			return 0;
+		case ' ':
+			if ((p->state == ST_NUMBERS) || (p->state == ST_NUMBERS_OR_END))
+				break;
+			return 0;
+	}
+
+	switch(p->state) {
+		case ST_IDLE:
+			if (c == 0x1B) { /* starting at ESC, spans till the first ':' - ignore it */
+				p->state = ST_ESCAPED;
+				return 0;
+			}
+			if (c == ';') /* be liberal: accept multiple terminators or empty instructions */
+				return 0;
+			p->state = ST_INST;
+			p->argc = 0;
+			token_start();
+			/* fall through to read the first char */
+		case ST_INST:
+			if (!isalpha(c))
+				return error(ctx, "Invalid character in instruction (must be alpha)");
+			p->token[p->len] = toupper(c);
+			p->len++;
+			if (p->len == 2) {
+				p->len = 0;
+				return parse_inst(ctx);
+			}
+			return 0;
+		case ST_INST_END:
+			got_end:;
+			if (c != ';')
+				return error(ctx, "Expected semicolon to terminate instruction");
+			p->state = ST_IDLE;
+			return 0;
+		case ST_SPC_NUMBERS_OR_END:
+			if (c == ' ')
+				return 0;
+			p->state = ST_NUMBERS;
+			/* fall thru: number */
+		case ST_NUMBERS_OR_END:
+			if (c == ';')
+				goto got_end;
+			/* fall thru: number */
+		case ST_NUMBERS:
+			if ((c == ',') || (c == ' ') || (c == ';')) {
+				char *end;
+				int last = (c == ';');
+				p->token[p->len] = '\0';
+				res = parse_coord(ctx, strtod(p->token, &end), last);
+				if (*end != '\0')
+					return error(ctx, "Invalid numeric format");
+				token_start();
+				if ((p->state == ST_INST_END) && (!last))
+					return error(ctx, "Expected semicolon");
+				else if ((p->state != ST_INST_END) && (last))
+					return error(ctx, "Premature semicolon");
+				else if ((p->state == ST_INST_END) && (last))
+					p->state = ST_IDLE; /* wanted to finish and finished */
+				return res;
+			}
+			if (isdigit(c) || (c == '.') || ((c == '-') && (p->len == 0))) {
+				p->token[p->len] = c;
+				p->len++;
+				return 0;
+			}
+			return error(ctx, "Expected digit or separator in number");
+		case ST_ESCAPED:
+			if (c == ':')
+				p->state = ST_IDLE;
+			return 0;
+	}
+	return error(ctx, "Internal error: broken state machine");
+}
Index: tags/2.0.1/src_3rd/libuhpgl/parse.h
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/parse.h	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/parse.h	(revision 18980)
@@ -0,0 +1,45 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+
+#ifndef LIBUHPGL_PRASE_H
+#define LIBUHPGL_PRASE_H
+
+#include <stdio.h>
+#include "libuhpgl.h"
+
+/* Shall be called before parsing starts (call uhpgl_parse_open() at the end) */
+int uhpgl_parse_open(uhpgl_ctx_t *ctx);
+
+/* Parse next character of a stream; c may be EOF; returns 0 on success */
+int uhpgl_parse_char(uhpgl_ctx_t *ctx, int c);
+
+/* Parse next portion of a stream from a string; returns 0 on success */
+int uhpgl_parse_str(uhpgl_ctx_t *ctx, const char *str);
+
+/* Parse next portion of a stream from a file; returns 0 on success */
+int uhpgl_parse_file(uhpgl_ctx_t *ctx, FILE *f);
+
+/* Shall be called after the last portion parsed; returns 0 on success */
+int uhpgl_parse_close(uhpgl_ctx_t *ctx);
+
+#endif
Index: tags/2.0.1/src_3rd/libuhpgl/uhpgl_math.h
===================================================================
--- tags/2.0.1/src_3rd/libuhpgl/uhpgl_math.h	(nonexistent)
+++ tags/2.0.1/src_3rd/libuhpgl/uhpgl_math.h	(revision 18980)
@@ -0,0 +1,54 @@
+/*
+    libuhpgl - the micro HP-GL library
+    Copyright (C) 2017  Tibor 'Igor2' Palinkas
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+    This library is part of pcb-rnd: http://repo.hu/projects/pcb-rnd
+*/
+
+/* Math helper for internal use - not intended to be included by the
+   library user */
+
+#ifndef LIBUHPGL_MATH_H
+#define LIBUHPGL_MATH_H
+
+#include <math.h>
+
+#define CONST_PI       3.14159265358979323846
+#define RAD2DEG(r)     ((r) * 180.0 / CONST_PI)
+#define DEG2RAD(d)     ((d) * CONST_PI / 180.0)
+#define DDIST(dx, dy)  sqrt((double)(dx)*(double)(dx) + (double)(dy)*(double)(dy))
+
+/* Implementation idea borrowed from an old gcc */
+static double ROUND(double x)
+{
+	double t;
+
+	if (x >= 0.0) {
+		t = ceil(x);
+		if (t - x > 0.5)
+			t -= 1.0;
+		return t;
+	}
+
+	t = ceil(-x);
+	if ((t + x) > 0.5)
+		t -= 1.0;
+	return -t;
+}
+
+#endif
Index: tags/2.0.1/src_3rd/qparse/Makefile
===================================================================
--- tags/2.0.1/src_3rd/qparse/Makefile	(nonexistent)
+++ tags/2.0.1/src_3rd/qparse/Makefile	(revision 18980)
@@ -0,0 +1,10 @@
+#CFLAGS = -Wall -Wextra -g
+CFLAGS = -g
+
+example: example.o qparse.o
+
+qparse.o: qparse.c qparse.h
+	$(CC) -c qparse.c -o qparse.o
+
+clean:
+	rm qparse.o example example.o ; true
Index: tags/2.0.1/src_3rd/qparse/example.c
===================================================================
--- tags/2.0.1/src_3rd/qparse/example.c	(nonexistent)
+++ tags/2.0.1/src_3rd/qparse/example.c	(revision 18980)
@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include <string.h>
+#include "qparse.h"
+
+/* Read lines of text from stdin and split them in fields using qparse. */
+
+int main()
+{
+	char s[1024];
+	while(fgets(s, sizeof(s), stdin) != NULL) {
+		int n, argc;
+		char *end, **argv;
+
+		/* remove trailing newline (if we don't we just get an extra empty field at the end) */
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--)
+			*end = '\0';
+
+		/* split and print fields */
+		printf("Splitting '%s':\n", s);
+		argc = qparse2(s, &argv, QPARSE_DOUBLE_QUOTE | QPARSE_SINGLE_QUOTE);
+		for(n = 0; n < argc; n++)
+			printf(" [%d] '%s'\n", n, argv[n]);
+		qparse_free(argc, &argv);
+	}
+	return 0;
+}
Index: tags/2.0.1/src_3rd/qparse/qparse.c
===================================================================
--- tags/2.0.1/src_3rd/qparse/qparse.c	(nonexistent)
+++ tags/2.0.1/src_3rd/qparse/qparse.c	(revision 18980)
@@ -0,0 +1,209 @@
+/*
+    libgpmi - General Package/Module Interface - qparse package
+    Copyright (C) 2006-2007, 2017 Tibor 'Igor2' Palinkas
+  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+  
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+  
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "qparse.h"
+
+typedef enum qp_state_e {
+	qp_normal,
+	qp_dquote,
+	qp_squote,
+	qp_paren
+} qp_state_t;
+
+#define qpush(chr) \
+	{ \
+	 if (buff_used >= buff_len) { \
+	 	buff_len += 128; \
+		buff = realloc(buff, buff_len); \
+	 } \
+	 buff[buff_used] = chr; \
+	 buff_used++; \
+	}
+
+#define qbackslash(chr) \
+	switch(chr) { \
+		case 'n': qpush('\n'); break; \
+		case 'r': qpush('\r'); break; \
+		case 't': qpush('\t'); break; \
+		case 'b': qpush('\b'); break; \
+		case '"': qpush('"'); break; \
+		case '\'': qpush('\''); break; \
+		case ' ': qpush(' '); break; \
+		case '\0': break; \
+		default: \
+			qpush('\\'); \
+			qpush(chr); \
+	}
+
+#define qnext() \
+	{ \
+		if (argc >= allocated) { \
+			allocated += 8; \
+			argv = realloc(argv, sizeof(char *) * allocated); \
+		} \
+		buff[buff_used] = '\0'; \
+		argv[argc] = qparse_strdup(buff); \
+		argc++; \
+		*buff = '\0'; \
+		buff_used = 0; \
+	}
+
+int qparse2(const char *input, char **argv_ret[], flags_t flg)
+{
+	int argc;
+	int allocated;
+	qp_state_t state;
+	const char *s;
+	char *buff;
+	int buff_len, buff_used;
+	char **argv;
+
+	argc      = 0;
+	allocated = 0;
+	argv      = NULL;
+	state     = qp_normal;
+
+	buff_len  = 128;
+	buff_used = 0;
+	buff      = malloc(buff_len);
+
+	for(s = input; *s != '\0'; s++) {
+		switch (state) {
+			case qp_normal:
+				switch (*s) {
+					case '\\':
+						s++;
+						qbackslash(*s);
+						break;
+					case '"':
+						if (flg & QPARSE_DOUBLE_QUOTE)
+							state = qp_dquote;
+						else
+							qpush(*s);
+						break;
+					case '\'':
+						if (flg & QPARSE_SINGLE_QUOTE)
+							state = qp_squote;
+						else
+							qpush(*s);
+						break;
+					case '(':
+						if (flg & QPARSE_PAREN)
+							state = qp_paren;
+						else
+							qpush(*s);
+						break;
+					case ' ':
+					case '\t':
+					case '\n':
+					case '\r':
+						if (flg & QPARSE_MULTISEP)
+							while(isspace(s[1])) s++;
+						qnext();
+						break;
+					default:
+						qpush(*s);
+				}
+				/* End of qp_normal */
+				break;
+
+			case qp_dquote:
+				switch (*s) {
+					case '\\':
+						s++;
+						qbackslash(*s);
+						break;
+					case '"':
+						state = qp_normal;
+						break;
+					default:
+						qpush(*s);
+				}
+				/* End of qp_dquote */
+				break;
+
+			case qp_squote:
+				switch (*s) {
+					case '\\':
+						s++;
+						qbackslash(*s);
+						break;
+					case '\'':
+						state = qp_normal;
+						break;
+					default:
+						qpush(*s);
+				}
+				/* End of qp_dquote */
+				break;
+
+			case qp_paren:
+				switch (*s) {
+					case '\\':
+						s++;
+						qbackslash(*s);
+						break;
+					case ')':
+						state = qp_normal;
+						break;
+					default:
+						qpush(*s);
+				}
+				/* End of qp_paren */
+				break;
+		}
+	}
+
+	qnext();
+
+	if (buff != NULL)
+		free(buff);
+
+	*argv_ret = argv;
+	return argc;
+}
+
+int qparse(const char *input, char **argv_ret[])
+{
+	return qparse2(input, argv_ret, QPARSE_DOUBLE_QUOTE);
+}
+
+
+void qparse_free(int argc, char **argv_ret[])
+{
+	int n;
+
+	for (n = 0; n < argc; n++)
+		free((*argv_ret)[n]);
+
+	free(*argv_ret);
+	*argv_ret = NULL;
+}
+
+char *qparse_strdup(const char *s)
+{
+	int l = strlen(s);
+	char *o;
+	o = malloc(l+1);
+	memcpy(o, s, l+1);
+	return o;
+}
Index: tags/2.0.1/src_3rd/qparse/qparse.h
===================================================================
--- tags/2.0.1/src_3rd/qparse/qparse.h	(nonexistent)
+++ tags/2.0.1/src_3rd/qparse/qparse.h	(revision 18980)
@@ -0,0 +1,22 @@
+/* Split input into a list of strings in argv_ret[] using whitepsace as field
+   separator. It supports double quoted fields and backslash as escape character.
+   Returns the number of arguments. argv_ret should be free'd using
+   qparse_free(). */
+int qparse(const char *input, char **argv_ret[]);
+
+/* Free an argv_ret array allocated by qparse. */
+void qparse_free(int argc, char **argv_ret[]);
+
+/* for C89 - that doesn't have strdup()*/
+char *qparse_strdup(const char *s);
+
+/* More advanced API with more control over the format */
+typedef enum {
+	QPARSE_DOUBLE_QUOTE = 1,
+	QPARSE_SINGLE_QUOTE = 2,
+	QPARSE_PAREN = 4,
+	QPARSE_MULTISEP = 8 /* multiple separators are taken as a single separator */
+} flags_t;
+
+int qparse2(const char *input, char **argv_ret[], flags_t flg);
+
Index: tags/2.0.1/src_3rd
===================================================================
--- tags/2.0.1/src_3rd	(nonexistent)
+++ tags/2.0.1/src_3rd	(revision 18980)

Property changes on: tags/2.0.1/src_3rd
___________________________________________________________________
Added: svn:externals
## -0,0 +1,13 ##
+genht svn://repo.hu/genht/trunk/src
+genlist svn://repo.hu/genlist/trunk/genlist
+genvector svn://repo.hu/genvector/trunk/genvector
+liblihata svn://repo.hu/lihata/trunk/src/liblihata
+liblhtpers svn://repo.hu/lihata/trunk/src/liblhtpers
+genregex svn://repo.hu/genregex/trunk/src
+sphash svn://repo.hu/sphash/trunk
+gensexpr svn://repo.hu/gensexpr/trunk/gensexpr
+puplug svn://repo.hu/puplug/trunk/puplug
+libminuid svn://repo.hu/libminuid/trunk/libminuid
+libuundo svn://repo.hu/libuundo/trunk/libuundo
+genrtree svn://repo.hu/genrtree/trunk/genrtree
+libfungw svn://repo.hu/fungw/trunk/libfungw
Index: tags/2.0.1/src_plugins/Buildin.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/Buildin.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/Buildin.tmpasm	(revision 18980)
@@ -0,0 +1,27 @@
+# tmpasm script for compiling a plugin_src/ module as a buildin
+# Requires variables before the include:
+#  /local/pcb/mod       basename of the module (e.g. autoplace)
+#  /local/pcb/mod/OBJS  full path of all object files
+#  /local/pcb/mod/OBJS_C99  full path of all object files for non-c89
+#  /local/pcb/mod/CONF  config file name
+
+append /local/pcb/buildin_init_extern    [@extern pcb_uninit_t hid_@/local/pcb/mod@_init();@] {\n}
+
+append /local/pcb/buildin_pups [@@/local/pcb/mod@=@/local/pcb/mod@/@/local/pcb/mod@.pup@] {\n}
+
+append /local/pcb/buildin_init_code    [@
+	uninit_func = hid_@/local/pcb/mod@_init();
+	pcb_plugin_register("@/local/pcb/mod@", "<@/local/pcb/mod@>", NULL, 0, uninit_func);
+@]  {\n}
+
+append /local/pcb/OBJS            ?/local/pcb/mod/OBJS
+append /local/pcb/OBJS_C99        ?/local/pcb/mod/OBJS_C99
+append /local/pcb/LDFLAGS         /local/pcb/mod/LDFLAGS
+append /local/pcb/CFLAGS          /local/pcb/mod/CFLAGS
+append /local/pcb/RULES [@
+
+mod_@/local/pcb/mod@: all
+
+@]
+
+include /local/pcb/tmpasm/common_enabled
Index: tags/2.0.1/src_plugins/Common_enabled.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/Common_enabled.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/Common_enabled.tmpasm	(revision 18980)
@@ -0,0 +1,75 @@
+# explicit rules: .y -> .c
+#  do not assume old yacc to work to different file names, do the generation
+#  in a separate directory to allow parallel compilation with -j
+switch /local/pcb/mod/YACC
+	case {^$} end
+	default
+		foreach /local/n in /local/pcb/mod/YACC
+			put /local/bn /local/n
+			sub {/local/bn} {^.*/} {}
+			put /local/dn /local/n
+			sub {/local/dn} {/[^/]*$} {}
+
+			if /local/pcb/want_parsgen
+			then
+				append /local/pcb/RULES [@
+# yacc for @/local/pcb/mod@
+@/local/n@.c @/local/n@.h: @/local/n@.y
+	cd @/local/dn@ && bison --defines=@/local/bn@.h --output=@/local/bn@.c --report-file=@/local/bn@.output -d @/local/bn@.y
+@]
+			else
+				append /local/pcb/RULES [@
+# dummy yacc for @/local/pcb/mod@
+@/local/n@.c @/local/n@.h:
+	echo "skipping yacc..."
+@]
+			end
+		end
+	end
+end
+
+# explicit rules: .l -> .c
+#  do not assume old lex to work to different file names, do the generation
+#  in a separate directory to allow parallel compilation with -j
+switch /local/pcb/mod/LEX
+	case {^$} end
+	default
+		foreach /local/n in /local/pcb/mod/LEX
+			if /local/pcb/want_parsgen
+			then
+				put /local/bn /local/n
+				sub {/local/bn} {^.*/} {}
+				put /local/dn /local/n
+				sub {/local/dn} {/[^/]*$} {}
+
+				append /local/pcb/RULES [@
+# lex for @/local/pcb/mod@
+@/local/n@.c @/local/n@.h: @/local/n@.l
+	cd @/local/dn@ && flex --outfile=@/local/bn@.c --header-file=@/local/bn@.h @/local/bn@.l
+@]
+			else
+				append /local/pcb/RULES [@
+# dummy lex for @/local/pcb/mod@
+@/local/n@.c:
+	echo "skipping flex..."
+@]
+			end
+		end
+	end
+end
+
+include  /local/pcb/tmpasm/plugin_conf
+include  /local/pcb/tmpasm/plugin_sphash
+
+append /local/pcb/CLEANFILES ?/local/pcb/mod/CLEANFILES
+
+put /local/pcb/mod/OBJS {}
+put /local/pcb/mod/OBJS_C99 {}
+put /local/pcb/mod/LDFLAGS {}
+put /local/pcb/mod/CFLAGS {}
+put /local/pcb/mod/YACC {}
+put /local/pcb/mod/LEX {}
+put /local/pcb/mod/SPHASH {}
+put /local/pcb/mod/CLEANFILES {}
+put /local/pcb/mod {}
+
Index: tags/2.0.1/src_plugins/Disable.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/Disable.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/Disable.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+# tmpasm script for disable a plugin_src/ module 
+# Requires variables before the include:
+#  /local/pcb/mod/OBJS  full path of all object files
+
+# append all objects to the source list used only for dependencies
+# NOTE: .o suffixes will be replaced with .c before generating the dep
+append /local/pcb/DEPSRCS            ?/local/pcb/mod/OBJS
+append /local/pcb/DEPSRCS            ?/local/pcb/mod/OBJS_C99
+
+
+include  /local/pcb/tmpasm/plugin_conf
+include  /local/pcb/tmpasm/plugin_sphash
+
+put /local/pcb/mod/OBJS {}
+put /local/pcb/mod/OBJS_C99 {}
+put /local/pcb/mod/CONF {}
+put /local/pcb/mod/LDFLAGS {}
+put /local/pcb/mod/CFLAGS {}
+put /local/pcb/mod {}
Index: tags/2.0.1/src_plugins/Plugin.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/Plugin.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/Plugin.tmpasm	(revision 18980)
@@ -0,0 +1,48 @@
+# tmpasm script for compiling a plugin_src/ module as a plugin
+# Requires variables before the include:
+#  /local/pcb/mod       basename of the module (e.g. autoplace)
+#  /local/pcb/mod/OBJS  full path of all object files
+#  /local/pcb/mod/OBJS_C99  full path of all object files for non-c89
+
+# clean up input vars
+uniq /local/pcb/mod/OBJS
+uniq /local/pcb/mod/OBJS_C99
+uniq /local/pcb/mod/CFLAGS
+uniq /local/pcb/mod/LDFLAGS
+uniq /local/pcb/mod/LIBS
+
+# generate .c -> .o rules in /local/comp/output
+put /local/comp/OBJS ?/local/pcb/mod/OBJS
+put /local/comp/OBJS_C99 ?/local/pcb/mod/OBJS_C99
+put /local/comp/CFLAGS /local/pcb/mod/CFLAGS
+include {../scconfig/template/comp_var.tmpasm}
+
+append /local/pcb/all   [@ $(PLUGIDIR)/@/local/pcb/mod@.so @]
+
+append /local/pcb/rules/install_ [@
+	$(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so" "$(LIBDIR)/plugins/@/local/pcb/mod@.so"
+	$(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.pup" "$(LIBDIR)/plugins/@/local/pcb/mod@.pup"@]
+
+append /local/pcb/CLEANFILES [@ $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so $(PLUGIDIR)/@/local/pcb/mod@.so @/local/pcb/mod/OBJS@  @/local/pcb/mod/OBJS_C99@ @]
+
+append /local/pcb/RULES [@
+
+### Module @/local/pcb/mod@: plugin ###
+
+$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so: @/local/pcb/mod/OBJS@ @/local/pcb/mod/OBJS_C99@
+	$(CC) $(LDFLAGS) @/local/pcb/mod/LDFLAGS@ -shared @cc/rdynamic@ -o $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so @/local/pcb/mod/OBJS@ @/local/pcb/mod/OBJS_C99@
+
+mod_@/local/pcb/mod@: $(PLUGIDIR)/@/local/pcb/mod@.so
+
+$(PLUGIDIR)/@/local/pcb/mod@.so: $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so
+	$(MKDIR) $(PLUGIDIR)
+	$(CP) $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so $(PLUGIDIR)/@/local/pcb/mod@.so
+	$(CP) $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.pup $(PLUGIDIR)/@/local/pcb/mod@.pup
+
+# module .c -> .o rules
+@/local/comp/output@
+
+### Module @/local/pcb/mod@ end ###
+@]
+
+include /local/pcb/tmpasm/common_enabled
Index: tags/2.0.1/src_plugins/README
===================================================================
--- tags/2.0.1/src_plugins/README	(nonexistent)
+++ tags/2.0.1/src_plugins/README	(revision 18980)
@@ -0,0 +1,13 @@
+This directory hosts core plugins. They are feature, IO, lib and hid plugins.
+
+Each subdirectory is a standalone plugin that can be selected to be a
+(static linked) buildin, a (dynamic linked) plugin or disabled
+(not compiled at all). The selection is made in ./configure.
+
+HID plugins are user interfaces; IO plugins convert the current design to
+an alien format or imports from those formats; feature plugins create
+actions or otherwise add functionality to the system independent of which
+HID is running. Lib plugins provide common code for other plugins to use.
+
+Some of the plugins depend on ../src_3rd and all of them depend on
+core (../src). There are also internal plugin-plugin dependencies.
Index: tags/2.0.1/src_plugins/acompnet/Makefile
===================================================================
--- tags/2.0.1/src_plugins/acompnet/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/acompnet/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_acompnet
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/acompnet/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/acompnet/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/acompnet/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {acompnet}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/acompnet/acompnet.o @]
+
+switch /local/pcb/acompnet/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/acompnet/acompnet.c
===================================================================
--- tags/2.0.1/src_plugins/acompnet/acompnet.c	(nonexistent)
+++ tags/2.0.1/src_plugins/acompnet/acompnet.c	(revision 18980)
@@ -0,0 +1,118 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "layer.h"
+#include "layer_ui.h"
+/*#include "acompnet_conf.h"*/
+#include "actions.h"
+#include "plugins.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "error.h"
+
+static pcb_layer_t *ly;
+
+pcb_flag_t flg_mesh_pt;
+static void acompnet_mesh_addpt(double x, double y, int score)
+{
+	x = pcb_round(x);
+	y = pcb_round(y);
+	
+	pcb_line_new(ly, x, y, x, y, conf_core.design.line_thickness, conf_core.design.bloat, flg_mesh_pt);
+}
+
+static void acompnet_mesh()
+{
+	double sep = conf_core.design.line_thickness + conf_core.design.bloat;
+	int n;
+
+	PCB_LINE_LOOP(CURRENT) {
+		double len, vx, vy, x1, y1, x2, y2, nx, ny;
+		x1 = line->Point1.X;
+		x2 = line->Point2.X;
+		y1 = line->Point1.Y;
+		y2 = line->Point2.Y;
+		vx = x2 - x1;
+		vy = y2 - y1;
+		len = sqrt(vx*vx + vy*vy);
+		vx = vx/len;
+		vy = vy/len;
+		nx = vy;
+		ny = -vx;
+
+		for(n = 1; n <= 2; n++) {
+			acompnet_mesh_addpt(x1 - n*vx*sep, y1 - n*vy*sep, n-1);
+			acompnet_mesh_addpt(x1 - n*vx*sep + nx*sep, y1 - n*vy*sep + ny*sep, n);
+			acompnet_mesh_addpt(x1 - n*vx*sep - nx*sep, y1 - n*vy*sep - ny*sep, n);
+
+			acompnet_mesh_addpt(x2 + n*vx*sep, y2 + n*vy*sep, n-1);
+			acompnet_mesh_addpt(x2 + n*vx*sep + nx*sep, y2 + n*vy*sep + ny*sep, n);
+			acompnet_mesh_addpt(x2 + n*vx*sep - nx*sep, y2 + n*vy*sep - ny*sep, n);
+		}
+	}
+	PCB_END_LOOP;
+}
+
+
+static const char pcb_acts_acompnet[] = "acompnet()\n" ;
+static const char pcb_acth_acompnet[] = "Attempt to auto-complete the current network";
+
+static fgw_error_t pcb_act_acompnet(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	acompnet_mesh();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t acompnet_action_list[] = {
+	{"acompnet", pcb_act_acompnet, pcb_acth_acompnet, pcb_acts_acompnet},
+};
+
+static const char *acompnet_cookie = "acompnet plugin";
+
+PCB_REGISTER_ACTIONS(acompnet_action_list, acompnet_cookie)
+
+int pplg_check_ver_acompnet(int ver_needed) { return 0; }
+
+void pplg_uninit_acompnet(void)
+{
+	pcb_remove_actions_by_cookie(acompnet_cookie);
+	pcb_uilayer_free_all_cookie(acompnet_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_acompnet(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(acompnet_action_list, acompnet_cookie)
+	ly = pcb_uilayer_alloc(acompnet_cookie, "autocomp-net", "#c09920");
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/acompnet/acompnet.pup
===================================================================
--- tags/2.0.1/src_plugins/acompnet/acompnet.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/acompnet/acompnet.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short net auto-completion
+$long Auto-complete the current network. A very limited autorouter/assistant.
+$state WIP
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/autocrop/Makefile
===================================================================
--- tags/2.0.1/src_plugins/autocrop/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/autocrop/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_autocrop
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/autocrop/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/autocrop/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/autocrop/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {autocrop}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/autocrop/autocrop.o @]
+
+switch /local/pcb/autocrop/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/autocrop/autocrop.c
===================================================================
--- tags/2.0.1/src_plugins/autocrop/autocrop.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autocrop/autocrop.c	(revision 18980)
@@ -0,0 +1,96 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, debug, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "undo.h"
+#include "actions.h"
+#include "plugins.h"
+
+static const char pcb_acth_autocrop[] = "Autocrops the board dimensions to (extants + a margin of 1 grid), keeping the move and board size grid aligned";
+static const char pcb_acts_autocrop[] = "autocrop()";
+static fgw_error_t pcb_act_autocrop(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_box_t box;
+	pcb_coord_t dx, dy, w, h;
+
+	if (pcb_data_is_empty(PCB->Data))
+		return 0;
+
+	pcb_data_bbox(&box, PCB->Data, 0);
+	dx = -((box.X1 / PCB->Grid - 1) * PCB->Grid);
+	dy = -((box.Y1 / PCB->Grid - 1) * PCB->Grid);
+	w = ((box.X2 + dx) / PCB->Grid + 2) * PCB->Grid;
+	h = ((box.Y2 + dy) / PCB->Grid + 2) * PCB->Grid;
+
+	if ((dx == 0) && (dy == 0) && (w == PCB->MaxWidth) && (h == PCB->MaxHeight))
+		return 0;
+
+	pcb_draw_inhibit_inc();
+	pcb_data_clip_inhibit_inc(PCB->Data);
+	pcb_data_move(PCB->Data, dx, dy);
+	pcb_board_resize(w, h);
+	pcb_data_clip_inhibit_dec(PCB->Data, 1);
+	pcb_draw_inhibit_dec();
+
+	pcb_undo_inc_serial();
+	pcb_redraw();
+	pcb_board_set_changed_flag(1);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t autocrop_action_list[] = {
+	{"autocrop", pcb_act_autocrop, pcb_acth_autocrop, pcb_acts_autocrop}
+};
+
+char *autocrop_cookie = "autocrop plugin";
+
+PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie)
+
+int pplg_check_ver_autocrop(int ver_needed) { return 0; }
+
+void pplg_uninit_autocrop(void)
+{
+	pcb_remove_actions_by_cookie(autocrop_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_autocrop(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(autocrop_action_list, autocrop_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/autocrop/autocrop.pup
===================================================================
--- tags/2.0.1/src_plugins/autocrop/autocrop.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/autocrop/autocrop.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short crop board to fit objects
+$long Reduce the board dimensions to just enclose the objects on the board.
+$package (core)
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/autoplace/Makefile
===================================================================
--- tags/2.0.1/src_plugins/autoplace/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_autoplace
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/autoplace/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/autoplace/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {autoplace}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/autoplace/autoplace.o $(PLUGDIR)/autoplace/action.o @]
+
+switch /local/pcb/autoplace/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/autoplace/action.c
===================================================================
--- tags/2.0.1/src_plugins/autoplace/action.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/action.c	(revision 18980)
@@ -0,0 +1,86 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "autoplace.h"
+#include "plugins.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "board.h"
+#include "event.h"
+
+static const char autoplace_syntax[] = "AutoPlaceSelected()";
+
+static const char autoplace_help[] = "Auto-place selected components.";
+
+/* %start-doc actions AutoPlaceSelected
+
+Attempts to re-arrange the selected components such that the nets
+connecting them are minimized.  Note that you cannot undo this.
+
+%end-doc */
+
+static fgw_error_t pcb_act_AutoPlaceSelected(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_event(PCB_EVENT_BUSY, NULL);
+	if (pcb_gui->confirm_dialog(_("Auto-placement can NOT be undone.\n" "Do you want to continue anyway?\n"), 0)) {
+		if (AutoPlaceSelected())
+			pcb_board_set_changed_flag(pcb_true);
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char *autoplace_cookie = "autoplace plugin";
+
+pcb_action_t autoplace_action_list[] = {
+	{"AutoPlaceSelected", pcb_act_AutoPlaceSelected, autoplace_help, autoplace_syntax}
+};
+
+PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie)
+
+int pplg_check_ver_autoplace(int ver_needed) { return 0; }
+
+void pplg_uninit_autoplace(void)
+{
+	pcb_remove_actions_by_cookie(autoplace_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_autoplace(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(autoplace_action_list, autoplace_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/autoplace/autoplace.c
===================================================================
--- tags/2.0.1/src_plugins/autoplace/autoplace.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/autoplace.c	(revision 18980)
@@ -0,0 +1,839 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/*
+ * This moduel, autoplace.c, was written by and is
+ * Copyright (c) 2001 C. Scott Ananian
+ */
+
+/* functions used to autoplace subcircuits.
+ */
+
+#include "config.h"
+
+#include <assert.h>
+#include <math.h>
+#include <memory.h>
+#include <stdlib.h>
+
+#include "board.h"
+#include "autoplace.h"
+#include "box.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "layer.h"
+#include "intersect.h"
+#include "rtree.h"
+#include "macro.h"
+#include "move.h"
+#include "rats.h"
+#include "remove.h"
+#include "rotate.h"
+#include "obj_rat.h"
+#include "obj_term.h"
+#include "obj_pstk_inlines.h"
+#include "board.h"
+#include "data_it.h"
+#include <genvector/vtp0.h>
+
+
+#define EXPANDRECTXY(r1, x1, y1, x2, y2) { \
+  r1->X1=MIN(r1->X1, x1); r1->Y1=MIN(r1->Y1, y1); \
+  r1->X2=MAX(r1->X2, x2); r1->Y2=MAX(r1->Y2, y2); \
+}
+#define EXPANDRECT(r1, r2) EXPANDRECTXY(r1, r2->X1, r2->Y1, r2->X2, r2->Y2)
+
+static double ComputeCost(pcb_netlist_t *Nets, double T0, double T);
+
+const struct {
+	double via_cost;
+	double congestion_penalty;		/* penalty length / unit area */
+	double overlap_penalty_min;		/* penalty length / unit area at start */
+	double overlap_penalty_max;		/* penalty length / unit area at end */
+	double out_of_bounds_penalty;	/* assessed for each component oob */
+	double overall_area_penalty;	/* penalty length / unit area */
+	double matching_neighbor_bonus;	/* length bonus per same-type neigh. */
+	double aligned_neighbor_bonus;	/* length bonus per aligned neigh. */
+	double oriented_neighbor_bonus;	/* length bonus per same-rot neigh. */
+#if 0
+	double pin_alignment_bonus;		/* length bonus per exact alignment */
+	double bound_alignment_bonus;	/* length bonus per exact alignment */
+#endif
+	double m;											/* annealing stage cutoff constant */
+	double gamma;									/* annealing schedule constant */
+	int good_ratio;								/* ratio of moves to good moves for halting */
+	pcb_bool fast;										/* ignore SMD/pin conflicts */
+	pcb_coord_t large_grid_size;				/* snap perturbations to this grid when T is high */
+	pcb_coord_t small_grid_size;				/* snap to this grid when T is small. */
+}
+/* wire cost is manhattan distance (in mils), thus 1 inch = 1000 */ CostParameter =
+{
+	3e3,													/* via cost */
+		2e-2,												/* congestion penalty */
+		1e-2,												/* initial overlap penalty */
+		1e2,												/* final overlap penalty */
+		1e3,												/* out of bounds penalty */
+		1e0,												/* penalty for total area used */
+		1e0,												/* subtract 1000 from cost for every same-type neighbor */
+		1e0,												/* subtract 1000 from cost for every aligned neighbor */
+		1e0,												/* subtract 1000 from cost for every same-rotation neighbor */
+		20,													/* move on when each module has been profitably moved 20 times */
+		0.75,												/* annealing schedule constant: 0.85 */
+		40,													/* halt when there are 60 times as many moves as good moves */
+		pcb_false,											/* don't ignore SMD/pin conflicts */
+		PCB_MIL_TO_COORD(100),					/* coarse grid is 100 mils */
+		PCB_MIL_TO_COORD(10),						/* fine grid is 10 mils */
+};
+
+enum ewhich { SHIFT, ROTATE, EXCHANGE };
+
+typedef struct {
+	pcb_any_obj_t *comp;
+	enum ewhich which;
+	pcb_coord_t DX, DY;									/* for shift */
+	unsigned rotate;							/* for rotate/flip */
+	pcb_any_obj_t *other;					/* for exchange */
+} PerturbationType;
+
+#warning cleanup TODO: remove this and use genvect
+#define STEP_POINT 100
+
+/* get next slot for a box, allocates memory if necessary */
+static pcb_box_t *pcb_box_new(pcb_box_list_t *Boxes)
+{
+	pcb_box_t *box = Boxes->Box;
+
+	/* realloc new memory if necessary and clear it */
+	if (Boxes->BoxN >= Boxes->BoxMax) {
+		Boxes->BoxMax = STEP_POINT + (2 * Boxes->BoxMax);
+		box = (pcb_box_t *) realloc(box, Boxes->BoxMax * sizeof(pcb_box_t));
+		Boxes->Box = box;
+		memset(box + Boxes->BoxN, 0, (Boxes->BoxMax - Boxes->BoxN) * sizeof(pcb_box_t));
+	}
+	return (box + Boxes->BoxN++);
+}
+
+/* frees memory used by a box list */
+static void pcb_box_free(pcb_box_list_t *Boxlist)
+{
+	if (Boxlist) {
+		free(Boxlist->Box);
+		memset(Boxlist, 0, sizeof(pcb_box_list_t));
+	}
+}
+
+
+/* ---------------------------------------------------------------------------
+ * Update the X, Y and group position information stored in the NetList after
+ * subcircuits have possibly been moved, rotated, flipped, etc.
+ */
+static void UpdateXY(pcb_netlist_t *Nets)
+{
+	pcb_layergrp_id_t SLayer = -1, CLayer = -1;
+	pcb_cardinal_t i, j;
+	/* find layer groups of the component side and solder side */
+
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &SLayer, 1);
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &CLayer, 1);
+
+	/* update all nets */
+	for (i = 0; i < Nets->NetN; i++) {
+		for (j = 0; j < Nets->Net[i].ConnectionN; j++) {
+			pcb_connection_t *c = &(Nets->Net[i].Connection[j]);
+			switch (c->obj->type) {
+			case PCB_OBJ_PSTK:
+				c->group = SLayer;  /* any layer will do */
+				c->X = ((pcb_pstk_t *) c->obj)->x;
+				c->Y = ((pcb_pstk_t *) c->obj)->y;
+				break;
+			/* terminals on layer */
+			case PCB_OBJ_LINE:
+			case PCB_OBJ_ARC:
+			case PCB_OBJ_TEXT:
+			case PCB_OBJ_POLY:
+				{
+					pcb_layer_t *layer = pcb_layer_get_real(c->obj->parent.layer);
+					if (layer != NULL)
+						c->group = layer->meta.real.grp;
+					else
+						c->group = SLayer;  /* any layer will do */
+					c->X = (c->obj->BoundingBox.X1 + c->obj->BoundingBox.X2) / 2;
+					c->Y = (c->obj->BoundingBox.Y1 + c->obj->BoundingBox.Y2) / 2;
+				}
+				break;
+			default:
+				pcb_message(PCB_MSG_ERROR, "Odd connection type encountered in " "UpdateXY");
+				break;
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * Create a list of selected subcircuits
+ */
+static vtp0_t collectSelectedSubcircuits()
+{
+	vtp0_t list;
+
+	vtp0_init(&list);
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)) {
+			pcb_subc_t **epp = (pcb_subc_t **)vtp0_alloc_append(&list, 1);
+			*epp = subc;
+		}
+	}
+	PCB_END_LOOP;
+	return list;
+}
+
+#if 0														/* only for debugging box lists */
+/* makes a line on the solder layer surrounding all boxes in blist */
+static void showboxes(pcb_box_list_t *blist)
+{
+	pcb_cardinal_t i;
+	pcb_layer_t *SLayer = &(PCB->Data->Layer[pcb_solder_silk_layer]);
+	for (i = 0; i < blist->BoxN; i++) {
+		pcb_line_new(SLayer, blist->Box[i].X1, blist->Box[i].Y1, blist->Box[i].X2, blist->Box[i].Y1, 1, 1, 0);
+		pcb_line_new(SLayer, blist->Box[i].X1, blist->Box[i].Y2, blist->Box[i].X2, blist->Box[i].Y2, 1, 1, 0);
+		pcb_line_new(SLayer, blist->Box[i].X1, blist->Box[i].Y1, blist->Box[i].X1, blist->Box[i].Y2, 1, 1, 0);
+		pcb_line_new(SLayer, blist->Box[i].X2, blist->Box[i].Y1, blist->Box[i].X2, blist->Box[i].Y2, 1, 1, 0);
+	}
+}
+#endif
+
+/* ---------------------------------------------------------------------------
+ * Helper function to compute "closest neighbor" for a box in a rtree.
+ * The closest neighbor on a certain side is the closest one in a trapezoid
+ * emanating from that side.
+ */
+/*------ r_find_neighbor ------*/
+struct r_neighbor_info {
+	const pcb_box_t *neighbor;
+	pcb_box_t trap;
+	pcb_direction_t search_dir;
+};
+#define ROTATEBOX(box) { pcb_coord_t t;\
+    t = (box).X1; (box).X1 = - (box).Y1; (box).Y1 = t;\
+    t = (box).X2; (box).X2 = - (box).Y2; (box).Y2 = t;\
+    t = (box).X1; (box).X1 =   (box).X2; (box).X2 = t;\
+}
+/* helper methods for __r_find_neighbor */
+static pcb_r_dir_t __r_find_neighbor_reg_in_sea(const pcb_box_t * region, void *cl)
+{
+	struct r_neighbor_info *ni = (struct r_neighbor_info *) cl;
+	pcb_box_t query = *region;
+	PCB_BOX_ROTATE_TO_NORTH(query, ni->search_dir);
+	/*  ______________ __ trap.y1     __
+	 *  \            /               |__| query rect.
+	 *   \__________/  __ trap.y2
+	 *   |          |
+	 *   trap.x1    trap.x2   sides at 45-degree angle
+	 */
+	if ((query.Y2 > ni->trap.Y1) && (query.Y1 < ni->trap.Y2) && (query.X2 + ni->trap.Y2 > ni->trap.X1 + query.Y1) && (query.X1 + query.Y1 < ni->trap.X2 + ni->trap.Y2))
+		return PCB_R_DIR_FOUND_CONTINUE;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t __r_find_neighbor_rect_in_reg(const pcb_box_t * box, void *cl)
+{
+	struct r_neighbor_info *ni = (struct r_neighbor_info *) cl;
+	pcb_box_t query = *box;
+	int r;
+	PCB_BOX_ROTATE_TO_NORTH(query, ni->search_dir);
+	/*  ______________ __ trap.y1     __
+	 *  \            /               |__| query rect.
+	 *   \__________/  __ trap.y2
+	 *   |          |
+	 *   trap.x1    trap.x2   sides at 45-degree angle
+	 */
+	r = (query.Y2 > ni->trap.Y1) && (query.Y1 < ni->trap.Y2) &&
+		(query.X2 + ni->trap.Y2 > ni->trap.X1 + query.Y1) && (query.X1 + query.Y1 < ni->trap.X2 + ni->trap.Y2);
+	r = r && (query.Y2 <= ni->trap.Y2);
+	if (r) {
+		ni->trap.Y1 = query.Y2;
+		ni->neighbor = box;
+	}
+	return r ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND;
+}
+
+/* main r_find_neighbor routine.  Returns NULL if no neighbor in the
+ * requested direction. */
+static const pcb_box_t *r_find_neighbor(pcb_rtree_t * rtree, const pcb_box_t * box, pcb_direction_t search_direction)
+{
+	struct r_neighbor_info ni;
+	pcb_box_t bbox;
+
+	ni.neighbor = NULL;
+	ni.trap = *box;
+	ni.search_dir = search_direction;
+
+	bbox.X1 = bbox.Y1 = 0;
+	bbox.X2 = PCB->MaxWidth;
+	bbox.Y2 = PCB->MaxHeight;
+	/* rotate so that we can use the 'north' case for everything */
+	PCB_BOX_ROTATE_TO_NORTH(bbox, search_direction);
+	PCB_BOX_ROTATE_TO_NORTH(ni.trap, search_direction);
+	/* shift Y's such that trap contains full bounds of trapezoid */
+	ni.trap.Y2 = ni.trap.Y1;
+	ni.trap.Y1 = bbox.Y1;
+	/* do the search! */
+	pcb_r_search(rtree, NULL, __r_find_neighbor_reg_in_sea, __r_find_neighbor_rect_in_reg, &ni, NULL);
+	return ni.neighbor;
+}
+
+static int pstk_ispad(pcb_pstk_t *ps)
+{
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+	return (proto->hdia <= 0);
+}
+
+/* ---------------------------------------------------------------------------
+ * Compute cost function.
+ *  note that area overlap cost is correct for SMD devices: SMD devices on
+ *  opposite sides of the board don't overlap.
+ *
+ * Algorithms follow those described in sections 4.1 of
+ *  "Placement and Routing of Electronic Modules" edited by Michael Pecht
+ *  Marcel Dekker, Inc. 1993.  ISBN: 0-8247-8916-4 TK7868.P7.P57 1993
+ */
+static double ComputeCost(pcb_netlist_t *Nets, double T0, double T)
+{
+	double W = 0;									/* wire cost */
+	double delta1 = 0;						/* wire congestion penalty function */
+	double delta2 = 0;						/* module overlap penalty function */
+	double delta3 = 0;						/* out of bounds penalty */
+	double delta4 = 0;						/* alignment bonus */
+	double delta5 = 0;						/* total area penalty */
+	pcb_cardinal_t i, j;
+	pcb_coord_t minx, maxx, miny, maxy;
+	pcb_bool allpads, allsameside;
+	pcb_cardinal_t thegroup;
+	pcb_box_list_t bounds = { 0, 0, NULL };	/* save bounding rectangles here */
+	pcb_box_list_t solderside = { 0, 0, NULL };	/* solder side component bounds */
+	pcb_box_list_t componentside = { 0, 0, NULL };	/* component side bounds */
+	/* make sure the NetList have the proper updated X and Y coords */
+	UpdateXY(Nets);
+	/* wire length term.  approximated by half-perimeter of minimum
+	 * rectangle enclosing the net.  Note that we penalize vias in
+	 * all-SMD nets by making the rectangle a cube and weighting
+	 * the "layer height" of the net. */
+	for (i = 0; i < Nets->NetN; i++) {
+		pcb_net_t *n = &Nets->Net[i];
+		if (n->ConnectionN < 2)
+			continue;									/* no cost to go nowhere */
+		minx = maxx = n->Connection[0].X;
+		miny = maxy = n->Connection[0].Y;
+		thegroup = n->Connection[0].group;
+		allpads = pstk_ispad((pcb_pstk_t *)n->Connection[0].obj);
+		allsameside = pcb_true;
+		for (j = 1; j < n->ConnectionN; j++) {
+			pcb_connection_t *c = &(n->Connection[j]);
+			PCB_MAKE_MIN(minx, c->X);
+			PCB_MAKE_MAX(maxx, c->X);
+			PCB_MAKE_MIN(miny, c->Y);
+			PCB_MAKE_MAX(maxy, c->Y);
+			if (!pstk_ispad((pcb_pstk_t *)c->obj))
+				allpads = pcb_false;
+			if (c->group != thegroup)
+				allsameside = pcb_false;
+		}
+		/* save bounding rectangle */
+		{
+			pcb_box_t *box = pcb_box_new(&bounds);
+			box->X1 = minx;
+			box->Y1 = miny;
+			box->X2 = maxx;
+			box->Y2 = maxy;
+		}
+		/* okay, add half-perimeter to cost! */
+		W += PCB_COORD_TO_MIL(maxx - minx) + PCB_COORD_TO_MIL(maxy - miny) + ((allpads && !allsameside) ? CostParameter.via_cost : 0);
+	}
+	/* now compute penalty function Wc which is proportional to
+	 * amount of overlap and congestion. */
+	/* delta1 is congestion penalty function */
+	delta1 = CostParameter.congestion_penalty * sqrt(fabs(pcb_intersect_box_box(&bounds)));
+#if 0
+	printf("Wire Congestion Area: %f\n", pcb_intersect_box_box(&bounds));
+#endif
+	/* free bounding rectangles */
+	pcb_box_free(&bounds);
+	/* now collect module areas (bounding rect of pins/pads) */
+	/* two lists for solder side / component side. */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_box_list_t *thisside, *otherside;
+		pcb_box_t *box, *lastbox = NULL;
+		pcb_coord_t clearance;
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+		int onbtm = 0;
+
+		pcb_subc_get_side(subc, &onbtm);
+#warning subc TODO: this ignores the possibility of other-side pads; need to do this on a per object basis
+		if (onbtm) {
+			thisside = &solderside;
+			otherside = &componentside;
+		}
+		else {
+			thisside = &componentside;
+			otherside = &solderside;
+		}
+		box = pcb_box_new(thisside);
+		/* initialize box so that it will take the dimensions of the first pin/pad */
+		box->X1 = box->Y1 = PCB_MAX_COORD;
+		box->X2 = box->Y2 = -PCB_MAX_COORD;
+		for(o = pcb_data_first(&it, subc->data, PCB_TERM_OBJ_TYPES); o != NULL; o = pcb_data_next(&it)) {
+			if (o->term == NULL)
+				continue; /* we are interested in terminals only */
+
+#warning subc TODO: look up clearance
+			clearance = 0;
+			EXPANDRECTXY(box,
+				o->BoundingBox.X1 - clearance, o->BoundingBox.Y1 - clearance,
+				o->BoundingBox.X2 + clearance, o->BoundingBox.Y2 + clearance);
+
+			/* add a box for each thru-hole pin to the "opposite side":
+			 * surface mount components can't sit on top of pins */
+			if ((!CostParameter.fast) && (o->type == PCB_OBJ_PSTK)) {
+				pcb_box_t box2;
+				box2.X1 = o->BoundingBox.X1 - clearance;
+				box2.Y1 = o->BoundingBox.Y1 - clearance;
+				box2.X2 = o->BoundingBox.X2 + clearance;
+				box2.Y2 = o->BoundingBox.Y2 + clearance;
+				/* speed hack! coalesce with last box if we can */
+				if (lastbox != NULL &&
+						((lastbox->X1 == box2.X1 &&
+							lastbox->X2 == box2.X2 &&
+							MIN(labs(lastbox->Y1 - box2.Y2), labs(box2.Y1 - lastbox->Y2)) < clearance) ||
+							(lastbox->Y1 == box2.Y1 && lastbox->Y2 == box2.Y2 && MIN(labs(lastbox->X1 - box2.X2), labs(box2.X1 - lastbox->X2)) < clearance))) {
+					EXPANDRECT(lastbox, box);
+					otherside->BoxN--;
+				}
+				else
+					lastbox = box;
+			}
+		}
+	}
+	PCB_END_LOOP;
+
+	/* compute intersection area of module areas box list */
+	delta2 = sqrt(fabs(pcb_intersect_box_box(&solderside) + pcb_intersect_box_box(&componentside))) * (CostParameter.overlap_penalty_min + (1 - (T / T0)) * CostParameter.overlap_penalty_max);
+#if 0
+	printf("Module Overlap Area (solder): %f\n", pcb_intersect_box_box(&solderside));
+	printf("Module Overlap Area (component): %f\n", pcb_intersect_box_box(&componentside));
+#endif
+	pcb_box_free(&solderside);
+	pcb_box_free(&componentside);
+	/* reward pin/pad x/y alignment */
+	/* score higher if pins/pads belong to same *type* of component */
+	/* XXX: subkey should be *distance* from thing aligned with, so that
+	 * aligning to something far away isn't profitable */
+	{
+		/* create r tree */
+		vtp0_t seboxes, ceboxes;
+		struct ebox {
+			pcb_box_t box;
+#warning subc TODO: when elements are removed, turn this into pcb_subc_t * and remove the fields below
+			pcb_any_obj_t *comp;
+			const char *refdes;
+			int rot90;
+			pcb_box_t *vbox;
+		};
+		pcb_direction_t dir[4] = { PCB_NORTH, PCB_EAST, PCB_SOUTH, PCB_WEST };
+		struct ebox **boxpp, *boxp;
+		pcb_rtree_t *rt_s, *rt_c;
+		int factor;
+
+		vtp0_init(&seboxes);
+		vtp0_init(&ceboxes);
+
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			int onbtm = 0;
+			double rot = 0;
+
+			pcb_subc_get_side(subc, &onbtm);
+			boxpp = (struct ebox **) vtp0_alloc_append(onbtm ? &seboxes : &ceboxes, 1);
+			*boxpp = (struct ebox *) malloc(sizeof(**boxpp));
+			if (*boxpp == NULL) {
+				fprintf(stderr, "malloc() failed in ComputeCost\n");
+				exit(1);
+			}
+
+			pcb_subc_get_rotation(subc, &rot);
+			(*boxpp)->box = subc->BoundingBox;
+			(*boxpp)->comp = (pcb_any_obj_t *)subc;
+			(*boxpp)->refdes = subc->refdes;
+			(*boxpp)->rot90 = pcb_round(rot / 90.0);
+			(*boxpp)->vbox = &subc->BoundingBox;
+		}
+		PCB_END_LOOP;
+
+		rt_s = pcb_r_create_tree();
+		pcb_r_insert_array(rt_s, (const pcb_box_t **) seboxes.array, vtp0_len(&seboxes));
+		rt_c = pcb_r_create_tree();
+		pcb_r_insert_array(rt_c, (const pcb_box_t **) ceboxes.array, vtp0_len(&ceboxes));
+		vtp0_uninit(&seboxes);
+		vtp0_uninit(&ceboxes);
+		/* now, for each subcircuit, find its neighbor on all four sides */
+		delta4 = 0;
+		for (i = 0; i < 4; i++) {
+			PCB_SUBC_LOOP(PCB->Data);
+			{
+				int onbtm = 0, rot90;
+				double rot = 0;
+
+				pcb_subc_get_side(subc, &onbtm);
+				pcb_subc_get_rotation(subc, &rot);
+				rot90 = pcb_round(rot / 90.0);
+
+				boxp = (struct ebox *)r_find_neighbor(onbtm ? rt_s : rt_c, &subc->BoundingBox, dir[i]);
+				/* score bounding box alignments */
+				if (!boxp)
+					continue;
+				factor = 1;
+				if (subc->refdes && boxp->refdes && 0 == PCB_NSTRCMP(subc->refdes, boxp->refdes)) {
+					delta4 += CostParameter.matching_neighbor_bonus;
+					factor++;
+				}
+				if (rot90 == boxp->rot90)
+					delta4 += factor * CostParameter.oriented_neighbor_bonus;
+				if (subc->BoundingBox.X1 == boxp->vbox->X1 ||
+						subc->BoundingBox.X1 == boxp->vbox->X2 ||
+						subc->BoundingBox.X2 == boxp->vbox->X1 ||
+						subc->BoundingBox.X2 == boxp->vbox->X2 ||
+						subc->BoundingBox.Y1 == boxp->vbox->Y1 ||
+						subc->BoundingBox.Y1 == boxp->vbox->Y2 ||
+						subc->BoundingBox.Y2 == boxp->vbox->Y1 ||
+						subc->BoundingBox.Y2 == boxp->vbox->Y2)
+					delta4 += factor * CostParameter.aligned_neighbor_bonus;
+			}
+			PCB_END_LOOP;
+		}
+		/* free k-d tree memory */
+		pcb_r_free_tree_data(rt_s, free);
+		pcb_r_free_tree_data(rt_c, free);
+		pcb_r_destroy_tree(&rt_s);
+		pcb_r_destroy_tree(&rt_c);
+	}
+	/* penalize total area used by this layout */
+	{
+		pcb_coord_t minX = PCB_MAX_COORD, minY = PCB_MAX_COORD;
+		pcb_coord_t maxX = -PCB_MAX_COORD, maxY = -PCB_MAX_COORD;
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			PCB_MAKE_MIN(minX, subc->BoundingBox.X1);
+			PCB_MAKE_MIN(minY, subc->BoundingBox.Y1);
+			PCB_MAKE_MAX(maxX, subc->BoundingBox.X2);
+			PCB_MAKE_MAX(maxY, subc->BoundingBox.Y2);
+		}
+		PCB_END_LOOP;
+		if (minX < maxX && minY < maxY)
+			delta5 = CostParameter.overall_area_penalty * sqrt(PCB_COORD_TO_MIL(maxX - minX) * PCB_COORD_TO_MIL(maxY - minY));
+	}
+	if (T == 5) {
+		T = W + delta1 + delta2 + delta3 - delta4 + delta5;
+		printf("cost components are %.3f %.3f %.3f %.3f %.3f %.3f\n",
+			W / T, delta1 / T, delta2 / T, delta3 / T, -delta4 / T, delta5 / T);
+	}
+	/* done! */
+	return W + (delta1 + delta2 + delta3 - delta4 + delta5);
+}
+
+static pcb_bool is_smd(const pcb_any_obj_t *obj)
+{
+	return padstacklist_length(&(((pcb_subc_t *)obj)->data->padstack)) != 0;
+}
+
+static pcb_bool on_bottom(const pcb_any_obj_t *obj)
+{
+	int onbtm = 0;
+	pcb_subc_get_side((pcb_subc_t *)obj, &onbtm);
+	return onbtm;
+}
+
+/* ---------------------------------------------------------------------------
+ * Perturb:
+ *  1) flip SMD from solder side to component side or vice-versa.
+ *  2) rotate component 90, 180, or 270 degrees.
+ *  3) shift component random + or - amount in random direction.
+ *     (magnitude of shift decreases over time)
+ *  -- Only perturb selected subcircuits (need count/list of selected?) --
+ */
+PerturbationType createPerturbation(vtp0_t *selected, double T)
+{
+	PerturbationType pt = { 0 };
+	/* pick subcircuit to perturb */
+	pt.comp = (pcb_any_obj_t *) selected->array[pcb_rand() % vtp0_len(selected)];
+	/* exchange, flip/rotate or shift? */
+	switch (pcb_rand() % ((vtp0_len(selected) > 1) ? 3 : 2)) {
+	case 0:
+		{														/* shift! */
+			pcb_coord_t grid;
+			double scaleX = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->MaxWidth / 3);
+			double scaleY = PCB_CLAMP(sqrt(T), PCB_MIL_TO_COORD(2.5), PCB->MaxHeight / 3);
+			pt.which = SHIFT;
+			pt.DX = scaleX * 2 * ((((double) pcb_rand()) / RAND_MAX) - 0.5);
+			pt.DY = scaleY * 2 * ((((double) pcb_rand()) / RAND_MAX) - 0.5);
+			/* snap to grid. different grids for "high" and "low" T */
+			grid = (T > PCB_MIL_TO_COORD(10)) ? CostParameter.large_grid_size : CostParameter.small_grid_size;
+			/* (round away from zero) */
+			pt.DX = ((pt.DX / grid) + SGN(pt.DX)) * grid;
+			pt.DY = ((pt.DY / grid) + SGN(pt.DY)) * grid;
+			/* limit DX/DY so we don't fall off board */
+			{
+				pcb_subc_t *s = (pcb_subc_t *)pt.comp;
+				pt.DX = MAX(pt.DX, -s->BoundingBox.X1);
+				pt.DX = MIN(pt.DX, PCB->MaxWidth - s->BoundingBox.X2);
+				pt.DY = MAX(pt.DY, -s->BoundingBox.Y1);
+				pt.DY = MIN(pt.DY, PCB->MaxHeight - s->BoundingBox.Y2);
+			}
+			/* all done but the movin' */
+			break;
+		}
+	case 1:
+		{														/* flip/rotate! */
+			/* only flip if it's an SMD component */
+			pcb_bool isSMD = is_smd(pt.comp);
+
+			pt.which = ROTATE;
+			pt.rotate = isSMD ? (pcb_rand() & 3) : (1 + (pcb_rand() % 3));
+			/* 0 - flip; 1-3, rotate. */
+			break;
+		}
+	case 2:
+		{														/* exchange! */
+			pt.which = EXCHANGE;
+			pt.other = (pcb_any_obj_t *)selected->array[pcb_rand() % (vtp0_len(selected) - 1)];
+			if (pt.other == pt.comp)
+				pt.other = (pcb_any_obj_t *)selected->array[vtp0_len(selected) - 1];
+			/* don't allow exchanging a solderside-side SMD component
+			 * with a non-SMD component. */
+			if ((!is_smd(pt.comp) && on_bottom(pt.other)) ||
+			    (!is_smd(pt.other) && on_bottom(pt.comp)))
+				return createPerturbation(selected, T);
+			break;
+		}
+	default:
+		assert(0);
+	}
+	return pt;
+}
+
+void doPerturb(vtp0_t *selected, PerturbationType *pt, pcb_bool undo)
+{
+	pcb_box_t *bb;
+	pcb_coord_t bbcx, bbcy;
+	pcb_subc_t *subc = (pcb_subc_t *)pt->comp;
+	/* compute center of element bounding box */
+
+	bb = &subc->BoundingBox;
+	bbcx = (bb->X1 + bb->X2) / 2;
+	bbcy = (bb->Y1 + bb->Y2) / 2;
+	/* do exchange, shift or flip/rotate */
+	switch (pt->which) {
+	case SHIFT:
+		{
+			pcb_coord_t DX = pt->DX, DY = pt->DY;
+			if (undo) {
+				DX = -DX;
+				DY = -DY;
+			}
+			pcb_subc_move(subc, DX, DY, 1);
+			return;
+		}
+	case ROTATE:
+		{
+			unsigned b = pt->rotate;
+			if (undo)
+				b = (4 - b) & 3;
+			/* 0 - flip; 1-3, rotate. */
+			if (b) {
+				pcb_subc_rotate90(subc, bbcx, bbcy, b);
+			}
+			else {
+				pcb_cardinal_t n;
+				pcb_coord_t y = bb->Y1;
+				pcb_subc_change_side(&subc, (bb->Y1+bb->Y2)/2);
+				/* mirroring moves the subc.  move it back. */
+				pcb_subc_move(subc, 0, y - subc->BoundingBox.Y1, 1);
+				for(n = 0; n < vtp0_len(selected); n++)
+					if (selected->array[n] == pt->comp)
+						selected->array[n] = subc;
+				pt->comp = (pcb_any_obj_t *)subc;
+			}
+			return;
+		}
+	case EXCHANGE:
+		{
+			/* first exchange positions */
+			pcb_coord_t x1 = bb->X1;
+			pcb_coord_t y1 = bb->Y1;
+			pcb_coord_t x2 = pt->other->BoundingBox.X1;
+			pcb_coord_t y2 = pt->other->BoundingBox.Y1;
+
+			pcb_subc_move(subc, x2 - x1, y2 - y1, 1);
+			pcb_subc_move((pcb_subc_t *)pt->other, x1 - x2, y1 - y2, 1);
+
+			/* then flip both subcircuits if they are on opposite sides */
+			if (on_bottom(pt->comp) != on_bottom(pt->other)) {
+				PerturbationType mypt;
+				mypt.comp = pt->comp;
+				mypt.which = ROTATE;
+				mypt.rotate = 0;				/* flip */
+				doPerturb(selected, &mypt, undo);
+				pt->comp = mypt.comp;
+				mypt.comp = pt->other;
+				doPerturb(selected, &mypt, undo);
+				pt->other = mypt.comp;
+			}
+			/* done */
+			return;
+		}
+	default:
+		assert(0);
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * Auto-place selected components.
+ */
+pcb_bool AutoPlaceSelected(void)
+{
+	pcb_netlist_t *Nets;
+	vtp0_t Selected;
+	PerturbationType pt;
+	double C00, C0, T0;
+	pcb_bool changed = pcb_false;
+
+	vtp0_init(&Selected);
+
+	/* (initial netlist processing copied from AddAllRats) */
+	/* the netlist library has the text form
+	 * ProcNetlist fills in the Netlist
+	 * structure the way the final routing
+	 * is supposed to look
+	 */
+	Nets = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
+	if (!Nets) {
+		pcb_message(PCB_MSG_ERROR, _("Can't add rat lines because no netlist is loaded.\n"));
+		goto done;
+	}
+
+	Selected = collectSelectedSubcircuits();
+	if (vtp0_len(&Selected) == 0) {
+		pcb_message(PCB_MSG_ERROR, _("No subcircuits selected to autoplace.\n"));
+		goto done;
+	}
+
+	/* simulated annealing */
+	{															/* compute T0 by doing a random series of moves. */
+		const int TRIALS = 10;
+		const double Tx = PCB_MIL_TO_COORD(300), P = 0.95;
+		double Cs = 0.0;
+		int i;
+		C00 = C0 = ComputeCost(Nets, Tx, Tx);
+		for (i = 0; i < TRIALS; i++) {
+			pt = createPerturbation(&Selected, PCB_INCH_TO_COORD(1));
+			doPerturb(&Selected, &pt, pcb_false);
+			Cs += fabs(ComputeCost(Nets, Tx, Tx) - C0);
+			doPerturb(&Selected, &pt, pcb_true);
+		}
+		T0 = -(Cs / TRIALS) / log(P);
+		printf("Initial T: %f\n", T0);
+	}
+	/* now anneal in earnest */
+	{
+		double T = T0;
+		long steps = 0;
+		int good_moves = 0, moves = 0;
+		const int good_move_cutoff = CostParameter.m * vtp0_len(&Selected);
+		const int move_cutoff = 2 * good_move_cutoff;
+		printf("Starting cost is %.0f\n", ComputeCost(Nets, T0, 5));
+		C0 = ComputeCost(Nets, T0, T);
+		while (1) {
+			double Cprime;
+			pt = createPerturbation(&Selected, T);
+			doPerturb(&Selected, &pt, pcb_false);
+			Cprime = ComputeCost(Nets, T0, T);
+			if (Cprime < C0) {				/* good move! */
+				C0 = Cprime;
+				good_moves++;
+				steps++;
+			}
+			else if ((pcb_rand() / (double) RAND_MAX) < exp(MIN(MAX(-20, (C0 - Cprime) / T), 20))) {
+				/* not good but keep it anyway */
+				C0 = Cprime;
+				steps++;
+			}
+			else
+				doPerturb(&Selected, &pt, pcb_true);		/* undo last change */
+			moves++;
+			/* are we at the end of a stage? */
+			if (good_moves >= good_move_cutoff || moves >= move_cutoff) {
+				printf("END OF STAGE: COST %.0f\t" "GOOD_MOVES %d\tMOVES %d\t" "T: %.1f\n", C0, good_moves, moves, T);
+				pcb_draw();
+				if ((pcb_gui != NULL) && (pcb_gui->progress != NULL)) {
+					if (pcb_gui->progress(C00-T, C00, "Optimizing the placement..."))
+						break;
+				}
+				/* is this the end? */
+				if (T < 5 || good_moves < moves / CostParameter.good_ratio)
+					break;
+				/* nope, adjust T and continue */
+				moves = good_moves = 0;
+				T *= CostParameter.gamma;
+				/* cost is T dependent, so recompute */
+				C0 = ComputeCost(Nets, T0, T);
+			}
+		}
+		changed = (steps > 0);
+	}
+done:
+	if ((pcb_gui != NULL) && (pcb_gui->progress != NULL))
+		pcb_gui->progress(0, 0, NULL);
+	if (changed) {
+		pcb_rats_destroy(pcb_false);
+		pcb_rat_add_all(pcb_false, NULL);
+		pcb_redraw();
+	}
+	vtp0_uninit(&Selected);
+	return changed;
+}
Index: tags/2.0.1/src_plugins/autoplace/autoplace.h
===================================================================
--- tags/2.0.1/src_plugins/autoplace/autoplace.h	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/autoplace.h	(revision 18980)
@@ -0,0 +1,45 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, autoplace.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#ifndef PCB_AUTOPLACE_H
+#define PCB_AUTOPLACE_H
+
+#include "global_typedefs.h"
+
+pcb_bool AutoPlaceSelected(void);
+
+#endif
Index: tags/2.0.1/src_plugins/autoplace/autoplace.pup
===================================================================
--- tags/2.0.1/src_plugins/autoplace/autoplace.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/autoplace/autoplace.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short auto place components
+$long Automatically place subcircuits.
+$package auto
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/autoroute/Makefile
===================================================================
--- tags/2.0.1/src_plugins/autoroute/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_autoroute
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/autoroute/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/autoroute/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {autoroute}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/autoroute/autoroute.o $(PLUGDIR)/autoroute/mtspace.o $(PLUGDIR)/autoroute/action.o $(PLUGDIR)/autoroute/vector.o @]
+
+switch /local/pcb/autoroute/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/autoroute/action.c
===================================================================
--- tags/2.0.1/src_plugins/autoroute/action.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/action.c	(revision 18980)
@@ -0,0 +1,119 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include "autoroute.h"
+#include "plugins.h"
+#include "actions.h"
+#include "event.h"
+#include "funchash_core.h"
+
+/* action routines for the autorouter
+ */
+
+static const char pcb_acts_AutoRoute[] = "AutoRoute(AllRats|SelectedRats)";
+
+static const char pcb_acth_AutoRoute[] = "Auto-route some or all rat lines.";
+
+/* %start-doc actions AutoRoute
+
+@table @code
+
+@item AllRats
+Attempt to autoroute all rats.
+
+@item SelectedRats
+Attempt to autoroute the selected rats.
+
+@end table
+
+Before autorouting, it's important to set up a few things.  First,
+make sure any layers you aren't using are disabled, else the
+autorouter may use them.  Next, make sure the current line and via
+styles are set accordingly.  Last, make sure "new lines clear
+polygons" is set, in case you eventually want to add a copper pour.
+
+Autorouting takes a while.  During this time, the program may not be
+responsive.
+
+%end-doc */
+
+static fgw_error_t pcb_act_AutoRoute(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, AutoRoute, op = fgw_keyword(&argv[1]));
+
+	pcb_event(PCB_EVENT_BUSY, NULL);
+	switch(op) {
+		case F_AllRats:
+		case F_All:
+			if (AutoRoute(pcb_false))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		case F_SelectedRats:
+		case F_Selected:
+			if (AutoRoute(pcb_true))
+				pcb_board_set_changed_flag(pcb_true);
+			break;
+		default:
+			PCB_ACT_FAIL(AutoRoute);
+			return 1;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char *autoroute_cookie = "autoroute plugin";
+
+pcb_action_t autoroute_action_list[] = {
+	{"AutoRoute", pcb_act_AutoRoute, pcb_acth_AutoRoute, pcb_acts_AutoRoute},
+};
+
+PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie)
+
+int pplg_check_ver_autoroute(int ver_needed) { return 0; }
+
+void pplg_uninit_autoroute(void)
+{
+	pcb_remove_actions_by_cookie(autoroute_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_autoroute(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(autoroute_action_list, autoroute_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/autoroute/autoroute.c
===================================================================
--- tags/2.0.1/src_plugins/autoroute/autoroute.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/autoroute.c	(revision 18980)
@@ -0,0 +1,4752 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, autoroute.c, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian
+ *  Copyright (c) 2006 harry eaton
+ *  Copyright (c) 2009 harry eaton
+ *
+ *  Updated for pcb-rnd for subcircuits and padstacks
+ *  Copyright (c) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/*
+ *-------------------------------------------------------------------
+ * This file implements a rectangle-expansion router, based on
+ * "A Method for Gridless Routing of Printed Circuit Boards" by
+ * A. C. Finch, K. J. Mackenzie, G. J. Balsdon, and G. Symonds in the
+ * 1985 Proceedings of the 22nd ACM/IEEE Design Automation Conference.
+ * This reference is available from the ACM Digital Library at
+ * http://www.acm.org/dl for those with institutional or personal
+ * access to it.  It's also available from your local engineering
+ * library.
+ *
+ * The code is much closer to what is described in the paper now,
+ * in that expansion areas can grow from corners and in all directions
+ * at once. Previously, these were emulated with discrete boxes moving
+ * in the cardinal directions. With the new method, there are fewer but
+ * larger expansion boxes that one might do a better job of routing in.
+ *--------------------------------------------------------------------
+ */
+#define NET_HEAP 1
+#include "config.h"
+#include "conf_core.h"
+
+#include <assert.h>
+#include <setjmp.h>
+
+#include "data.h"
+#include "macro.h"
+#include "autoroute.h"
+#include "box.h"
+#include "draw.h"
+#include "error.h"
+#include "find.h"
+#include "heap.h"
+#include "rtree.h"
+#include "mtspace.h"
+#include "polygon.h"
+#include "rats.h"
+#include "remove.h"
+#include "obj_pinvia_therm.h"
+#include "undo.h"
+#include "vector.h"
+#include "pcb-printf.h"
+#include "layer.h"
+#include "compat_nls.h"
+#include <genvector/vtp0.h>
+#include "layer.h"
+
+#include "obj_line_draw.h"
+#include "obj_pstk_draw.h"
+#include "obj_pstk_inlines.h"
+
+#warning padstack TODO: when style contains proto, remove this
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+#define autoroute_therm_style 4
+
+/* #defines to enable some debugging output */
+/*
+#define ROUTE_VERBOSE
+*/
+
+/*
+#define ROUTE_DEBUG
+//#define DEBUG_SHOW_ROUTE_BOXES
+#define DEBUG_SHOW_EXPANSION_BOXES
+//#define DEBUG_SHOW_EDGES
+//#define DEBUG_SHOW_VIA_BOXES
+#define DEBUG_SHOW_TARGETS
+#define DEBUG_SHOW_SOURCES
+//#define DEBUG_SHOW_ZIGZAG
+*/
+
+static pcb_direction_t directionIncrement(pcb_direction_t dir)
+{
+	switch (dir) {
+	case PCB_NORTH:
+		dir = PCB_EAST;
+		break;
+	case PCB_EAST:
+		dir = PCB_SOUTH;
+		break;
+	case PCB_SOUTH:
+		dir = PCB_WEST;
+		break;
+	case PCB_WEST:
+		dir = PCB_NE;
+		break;
+	case PCB_NE:
+		dir = PCB_SE;
+		break;
+	case PCB_SE:
+		dir = PCB_SW;
+		break;
+	case PCB_SW:
+		dir = PCB_NW;
+		break;
+	case PCB_NW:
+		dir = PCB_ANY_DIR;
+		break;
+	case PCB_ANY_DIR:
+		dir = PCB_NORTH;
+		break;
+	}
+	return dir;
+}
+
+#ifdef ROUTE_DEBUG
+pcb_hid_t *ddraw = NULL;
+static pcb_hid_gc_t ar_gc = 0;
+#endif
+
+#define EXPENSIVE 3e28
+/* round up "half" thicknesses */
+#define HALF_THICK(x) (((x)+1)/2)
+/* a styles maximum bloat is its clearance plus the larger of its via radius
+ * or line half-thickness. */
+#define BLOAT(style)\
+	((style)->Clearance + HALF_THICK((style)->Thick))
+/* conflict penalty is less for traces laid down during previous pass than
+ * it is for traces already laid down in this pass. */
+#define CONFLICT_LEVEL(rb)\
+	(((rb)->flags.is_odd==AutoRouteParameters.is_odd) ?\
+	 HI_CONFLICT : LO_CONFLICT )
+#define CONFLICT_PENALTY(rb)\
+	((CONFLICT_LEVEL(rb)==HI_CONFLICT ? \
+	 AutoRouteParameters.ConflictPenalty : \
+	 CONFLICT_LEVEL(rb)==LO_CONFLICT ? \
+	 AutoRouteParameters.LastConflictPenalty : 1) * (rb)->pass)
+
+#define _NORTH 1
+#define _EAST 2
+#define _SOUTH 4
+#define _WEST 8
+
+#define LIST_LOOP(init, which, x) do {\
+     routebox_t *__next_one__ = (init);\
+   x = NULL;\
+   if (!__next_one__)\
+     assert(__next_one__);\
+   else\
+   while (!x  || __next_one__ != (init)) {\
+     x = __next_one__;\
+     /* save next one first in case the command modifies or frees it */\
+     __next_one__ = x->which.next
+#define FOREACH_SUBNET(net, p) do {\
+  routebox_t *_pp_;\
+  /* fail-fast: check subnet_processed flags */\
+  LIST_LOOP(net, same_net, p); \
+  assert(!p->flags.subnet_processed);\
+  PCB_END_LOOP;\
+  /* iterate through *distinct* subnets */\
+  LIST_LOOP(net, same_net, p); \
+  if (!p->flags.subnet_processed) {\
+    LIST_LOOP(p, same_subnet, _pp_);\
+    _pp_->flags.subnet_processed=1;\
+    PCB_END_LOOP
+#define END_FOREACH(net, p) \
+  }; \
+  PCB_END_LOOP;\
+  /* reset subnet_processed flags */\
+  LIST_LOOP(net, same_net, p); \
+  p->flags.subnet_processed=0;\
+  PCB_END_LOOP;\
+} while (0)
+#define SWAP(t, f, s) do { t a=s; s=f; f=a; } while (0)
+/* notes:
+ * all rectangles are assumed to be closed on the top and left and
+ * open on the bottom and right.   That is, they include their top-left
+ * corner but don't include their bottom and right edges.
+ *
+ * expansion regions are always half-closed.  This means that when
+ * tracing paths, you must steer clear of the bottom and right edges.,
+ * because these are not actually in the allowed box.
+ *
+ * All routeboxes *except* EXPANSION_AREAS now have their "box" bloated by
+ * their particular required clearance. This simplifies the tree searching.
+ * the "sbox" contains the unbloated box.
+ */
+
+/* enumerated type for conflict levels */
+typedef enum { NO_CONFLICT = 0, LO_CONFLICT = 1, HI_CONFLICT = 2 } conflict_t;
+
+typedef struct routebox_s routebox_t;
+
+typedef struct routebox_list_s {
+	routebox_t *next, *prev;
+} routebox_list_t;
+
+typedef enum etype { TERM, VIA, VIA_SHADOW, LINE, OTHER, EXPANSION_AREA, PLANE, THERMAL } etype;
+
+struct routebox_s {
+	pcb_box_t box, sbox;
+	struct {
+		pcb_coord_t x1, y1, x2, y2;
+	} line; /* exact coords of the line we are going to draw if type is line; reverse engineering these from the bounding box using halfthick and other hacks lead to rounding errors, a few LSB flicker in coords, e.g. breaking rubber band */
+	union {
+		pcb_pstk_t *via;
+		pcb_any_obj_t *term;
+		routebox_t *via_shadow;	/* points to the via in r-tree which
+																	 * points to the pcb_pstk_t in the PCB. */
+		pcb_line_t *line;
+		void *generic;							/* 'other' is polygon, arc, text */
+		routebox_t *expansion_area;	/* previous expansion area in search */
+	} parent;
+	unsigned short group;
+	unsigned short layer;
+	etype type;
+	struct {
+		unsigned nonstraight:1;
+		unsigned fixed:1;
+		/* for searches */
+		unsigned source:1;
+		unsigned target:1;
+		/* rects on same net as source and target don't need clearance areas */
+		unsigned nobloat:1;
+		/* mark circular pins, so that we be sure to connect them up properly */
+		unsigned circular:1;
+		/* we sometimes create routeboxen that don't actually belong to a
+		 * r-tree yet -- make sure refcount of homelesss is set properly */
+		unsigned homeless:1;
+		/* was this nonfixed obstacle generated on an odd or even pass? */
+		unsigned is_odd:1;
+		/* fixed route boxes that have already been "routed through" in this
+		 * search have their "touched" flag set. */
+		unsigned touched:1;
+		/* this is a status bit for iterating through *different* subnets */
+		unsigned subnet_processed:1;
+		/* some expansion_areas represent via candidates */
+		unsigned is_via:1;
+		/* mark non-straight lines which go from bottom-left to upper-right,
+		 * instead of from upper-left to bottom-right. */
+		unsigned bl_to_ur:1;
+		/* mark polygons which are "transparent" for via-placement; that is,
+		 * vias through the polygon will automatically be given a clearance
+		 * and will not electrically connect to the polygon. */
+		unsigned clear_poly:1;
+		/* this marks "conflicting" routes that must be torn up to obtain
+		 * a correct routing.  This flag allows us to return a correct routing
+		 * even if the user cancels auto-route after a non-final pass. */
+		unsigned is_bad:1;
+		/* for assertion that 'box' is never changed after creation */
+		unsigned inited:1;
+		/* indicate this expansion ares is a thermal between the pin and plane */
+		unsigned is_thermal;
+	} flags;
+	/* indicate the direction an expansion box came from */
+	pcb_cost_t cost;
+	pcb_cheap_point_t cost_point;
+	/* reference count for homeless routeboxes; free when refcount==0 */
+	int refcount;
+	/* when routing with conflicts, we keep a record of what we're
+	 * conflicting with.
+	 */
+	vector_t *conflicts_with;
+	/* route style of the net associated with this routebox */
+	pcb_route_style_t *style;
+	/* congestion values for the edges of an expansion box */
+	unsigned char n, e, s, w;
+	/* what pass this this track was laid down on */
+	unsigned char pass;
+	/* the direction this came from, if any */
+	pcb_direction_t came_from;
+	/* circular lists with connectivity information. */
+	routebox_list_t same_net, same_subnet, original_subnet, different_net;
+	union {
+		pcb_pstk_t *via;
+		pcb_line_t *line;
+	} livedraw_obj;
+};
+
+typedef struct routedata_s {
+	int max_styles;
+	/* one rtree per layer *group */
+	pcb_rtree_t *layergrouptree[PCB_MAX_LAYERGRP];	/* no silkscreen layers here =) */
+	/* root pointer into connectivity information */
+	routebox_t *first_net;
+	/* default routing style */
+	pcb_route_style_t defaultstyle;
+	/* style structures */
+	pcb_route_style_t **styles; /* [max_styles+1] */
+	/* what is the maximum bloat (clearance+line half-width or
+	 * clearance+via_radius) for any style we've seen? */
+	pcb_coord_t max_bloat;
+	pcb_coord_t max_keep;
+	mtspace_t *mtspace;
+} routedata_t;
+
+typedef struct edge_struct_s {
+	routebox_t *rb;								/* path expansion edges are real routeboxen. */
+	pcb_cheap_point_t cost_point;
+	pcb_cost_t pcb_cost_to_point;					/* from source */
+	pcb_cost_t cost;									/* cached edge cost */
+	routebox_t *minpcb_cost_target;		/* minimum cost from cost_point to any target */
+	vetting_t *work;							/* for via search edges */
+	pcb_direction_t expand_dir;
+	struct {
+		/* this indicates that this 'edge' is a via candidate. */
+		unsigned is_via:1;
+		/* record "conflict level" of via candidates, in case we need to split
+		 * them later. */
+		unsigned via_conflict_level:2; /* conflict_t */
+		/* when "routing with conflicts", sometimes edge is interior. */
+		unsigned is_interior:1;
+		/* this is a fake edge used to defer searching for via spaces */
+		unsigned via_search:1;
+		/* this is a via edge in a plane where the cost point moves for free */
+		unsigned in_plane:1;
+	} flags;
+} edge_t;
+
+static struct AutoRouteParameters_s {
+	/* net style parameters */
+	pcb_route_style_t *style;
+	/* the present bloat */
+	pcb_coord_t bloat;
+	/* cost parameters */
+	pcb_cost_t ViaCost,								/* additional "length" cost for using a via */
+	  LastConflictPenalty,				/* length mult. for routing over last pass' trace */
+	  ConflictPenalty,						/* length multiplier for routing over another trace */
+	  JogPenalty,									/* additional "length" cost for changing direction */
+	  CongestionPenalty,					/* (rational) length multiplier for routing in */
+	  NewLayerPenalty,						/* penalty for routing on a previously unused layer */
+	  MinPenalty;									/* smallest Direction Penalty */
+	/* maximum conflict incidence before calling it "no path found" */
+	int hi_conflict;
+	/* are vias allowed? */
+	pcb_bool use_vias;
+	/* is this an odd or even pass? */
+	pcb_bool is_odd;
+	/* permit conflicts? */
+	pcb_bool with_conflicts;
+	/* is this a final "smoothing" pass? */
+	pcb_bool is_smoothing;
+	/* rip up nets regardless of conflicts? */
+	pcb_bool rip_always;
+	pcb_bool last_smooth;
+	unsigned char pass;
+} AutoRouteParameters;
+
+typedef struct routeone_state_s {
+	/* heap of all candidate expansion edges */
+	pcb_heap_t *workheap;
+	/* information about the best path found so far. */
+	routebox_t *best_path, *best_target;
+	pcb_cost_t best_cost;
+} routeone_state_t;
+
+
+static routebox_t *CreateExpansionArea(const pcb_box_t * area, pcb_cardinal_t group,
+																			 routebox_t * parent, pcb_bool relax_edge_requirements, edge_t * edge);
+
+static pcb_cost_t edge_cost(const edge_t * e, const pcb_cost_t too_big);
+static void best_path_candidate(routeone_state_t *s, edge_t * e, routebox_t * best_target);
+
+static pcb_box_t edge_to_box(const routebox_t * rb, pcb_direction_t expand_dir);
+
+static void add_or_destroy_edge(routeone_state_t *s, edge_t * e);
+
+static void
+RD_DrawThermal(routedata_t * rd, pcb_coord_t X, pcb_coord_t Y, pcb_cardinal_t group, pcb_cardinal_t layer, routebox_t * subnet, pcb_bool is_bad);
+static void ResetSubnet(routebox_t * net);
+#ifdef ROUTE_DEBUG
+static int showboxen = -2;
+static int aabort = 0;
+static void showroutebox(routebox_t * rb);
+#endif
+
+/* group number of groups that hold surface mount pads */
+static pcb_layergrp_id_t front, back;
+static pcb_bool usedGroup[PCB_MAX_LAYERGRP];
+static int x_cost[PCB_MAX_LAYERGRP], y_cost[PCB_MAX_LAYERGRP];
+static pcb_bool is_layer_group_active[PCB_MAX_LAYERGRP];
+static int ro = 0;
+static int smoothes = 1;
+static int passes = 12;
+static int routing_layers = 0;
+static float total_wire_length = 0;
+static int total_via_count = 0;
+
+/* assertion helper for routeboxen */
+#ifndef NDEBUG
+static int __routepcb_box_is_good(routebox_t * rb)
+{
+	assert(rb && (rb->group < pcb_max_group(PCB)) &&
+				 (rb->box.X1 <= rb->box.X2) && (rb->box.Y1 <= rb->box.Y2) &&
+				 (rb->flags.homeless ?
+					(rb->box.X1 != rb->box.X2) || (rb->box.Y1 != rb->box.Y2) : (rb->box.X1 != rb->box.X2) && (rb->box.Y1 != rb->box.Y2)));
+	assert((rb->flags.source ? rb->flags.nobloat : 1) &&
+				 (rb->flags.target ? rb->flags.nobloat : 1) &&
+				 (rb->flags.homeless ? !rb->flags.touched : rb->refcount == 0) && (rb->flags.touched ? rb->type != EXPANSION_AREA : 1));
+	assert((rb->flags.is_odd ? (!rb->flags.fixed) &&
+					(rb->type == VIA || rb->type == VIA_SHADOW || rb->type == LINE || rb->type == PLANE) : 1));
+	assert(rb->flags.clear_poly ? ((rb->type == OTHER || rb->type == PLANE) && rb->flags.fixed && !rb->flags.homeless) : 1);
+	assert(rb->flags.inited);
+/* run through conflict list showing none are homeless, targets or sources */
+	if (rb->conflicts_with) {
+		int i;
+		for (i = 0; i < vector_size(rb->conflicts_with); i++) {
+			routebox_t *c = vector_element(rb->conflicts_with, i);
+			assert(!c->flags.homeless && !c->flags.source && !c->flags.target && !c->flags.fixed);
+		}
+	}
+	assert(rb->style != NULL && rb->style != NULL);
+	assert(rb->type == EXPANSION_AREA
+				 || (rb->same_net.next && rb->same_net.prev && rb->same_subnet.next
+						 && rb->same_subnet.prev && rb->original_subnet.next
+						 && rb->original_subnet.prev && rb->different_net.next && rb->different_net.prev));
+	return 1;
+}
+
+static int __edge_is_good(edge_t * e)
+{
+	assert(e && e->rb && __routepcb_box_is_good(e->rb));
+	assert((e->rb->flags.homeless ? e->rb->refcount > 0 : 1));
+	assert((0 <= e->expand_dir) && (e->expand_dir < 9)
+				 && (e->flags.is_interior ? (e->expand_dir == PCB_ANY_DIR && e->rb->conflicts_with) : 1));
+	assert((e->flags.is_via ? e->rb->flags.is_via : 1)
+				 && (e->flags.via_conflict_level >= 0 && e->flags.via_conflict_level <= 2)
+				 && (e->flags.via_conflict_level != 0 ? e->flags.is_via : 1));
+	assert((e->pcb_cost_to_point >= 0) && e->cost >= 0);
+	return 1;
+}
+
+int no_planes(const pcb_box_t * b, void *cl)
+{
+	routebox_t *rb = (routebox_t *) b;
+	if (rb->type == PLANE)
+		return 0;
+	return 1;
+}
+#endif /* !NDEBUG */
+
+/*---------------------------------------------------------------------
+ * route utility functions.
+ */
+
+enum boxlist { NET, SUBNET, ORIGINAL, DIFFERENT_NET };
+static routebox_list_t *__select_list(routebox_t * r, enum boxlist which)
+{
+	assert(r);
+	switch (which) {
+	default:
+		assert(0);
+	case NET:
+		return &(r->same_net);
+	case SUBNET:
+		return &(r->same_subnet);
+	case ORIGINAL:
+		return &(r->original_subnet);
+	case DIFFERENT_NET:
+		return &(r->different_net);
+	}
+}
+
+static void InitLists(routebox_t * r)
+{
+	static enum boxlist all[] = { NET, SUBNET, ORIGINAL, DIFFERENT_NET }
+	, *p;
+	for (p = all; p < all + (sizeof(all) / sizeof(*p)); p++) {
+		routebox_list_t *rl = __select_list(r, *p);
+		rl->prev = rl->next = r;
+	}
+}
+
+static void MergeNets(routebox_t * a, routebox_t * b, enum boxlist which)
+{
+	routebox_list_t *al, *bl, *anl, *bnl;
+	routebox_t *an, *bn;
+	assert(a && b);
+	assert(a != b);
+	assert(a->type != EXPANSION_AREA);
+	assert(b->type != EXPANSION_AREA);
+	al = __select_list(a, which);
+	bl = __select_list(b, which);
+	assert(al && bl);
+	an = al->next;
+	bn = bl->next;
+	assert(an && bn);
+	anl = __select_list(an, which);
+	bnl = __select_list(bn, which);
+	assert(anl && bnl);
+	bl->next = an;
+	anl->prev = b;
+	al->next = bn;
+	bnl->prev = a;
+}
+
+static void RemoveFromNet(routebox_t * a, enum boxlist which)
+{
+	routebox_list_t *al, *anl, *apl;
+	routebox_t *an, *ap;
+	assert(a);
+	al = __select_list(a, which);
+	assert(al);
+	an = al->next;
+	ap = al->prev;
+	if (an == a || ap == a)
+		return;											/* not on any list */
+	assert(an && ap);
+	anl = __select_list(an, which);
+	apl = __select_list(ap, which);
+	assert(anl && apl);
+	anl->prev = ap;
+	apl->next = an;
+	al->next = al->prev = a;
+	return;
+}
+
+static void init_const_box(routebox_t * rb, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t clearance)
+{
+	pcb_box_t *bp = (pcb_box_t *) & rb->box;	/* note discarding const! */
+	assert(!rb->flags.inited);
+	assert(X1 <= X2 && Y1 <= Y2);
+	bp->X1 = X1 - clearance;
+	bp->Y1 = Y1 - clearance;
+	bp->X2 = X2 + clearance;
+	bp->Y2 = Y2 + clearance;
+	bp = (pcb_box_t *) & rb->sbox;
+	bp->X1 = X1;
+	bp->Y1 = Y1;
+	bp->X2 = X2;
+	bp->Y2 = Y2;
+	rb->flags.inited = 1;
+}
+
+static inline pcb_box_t shrink_routebox(const routebox_t * rb)
+{
+	return rb->sbox;
+}
+
+static inline pcb_cost_t box_area(const pcb_box_t b)
+{
+	pcb_cost_t ans = b.X2 - b.X1;
+	return ans * (b.Y2 - b.Y1);
+}
+
+static inline pcb_cheap_point_t closest_point_in_routebox(const pcb_cheap_point_t * from, const routebox_t * rb)
+{
+	return pcb_closest_pcb_point_in_box(from, &rb->sbox);
+}
+
+static inline pcb_bool point_in_shrunk_box(const routebox_t * box, pcb_coord_t X, pcb_coord_t Y)
+{
+	pcb_box_t b = shrink_routebox(box);
+	return pcb_point_in_box(&b, X, Y);
+}
+
+/*---------------------------------------------------------------------
+ * routedata initialization functions.
+ */
+static routebox_t *AddTerm_(vtp0_t layergroupboxes[], pcb_any_obj_t *term, pcb_route_style_t *style, pcb_layer_t *layer)
+{
+	routebox_t **rbpp;
+	pcb_layer_type_t lyt;
+	int layergroup = -1;
+	pcb_coord_t clr;
+
+	lyt = pcb_layer_flags_(layer);
+	if (!(lyt & PCB_LYT_COPPER))
+		return NULL;
+	if (lyt & PCB_LYT_TOP)
+		layergroup = front;
+	else if (lyt & PCB_LYT_BOTTOM)
+		layergroup = back;
+	else {
+		if (term->type != PCB_OBJ_PSTK)
+			assert(!"won't route to pad on internal layer");
+		layergroup = pcb_layer_get_group_(layer);
+	}
+	assert(0 <= layergroup && layergroup < pcb_max_group(PCB));
+
+	assert(PCB->LayerGroups.grp[layergroup].len > 0);
+	rbpp = (routebox_t **)vtp0_alloc_append(&layergroupboxes[layergroup], 1);
+	assert(rbpp);
+	*rbpp = (routebox_t *)calloc(sizeof(**rbpp), 1);
+	assert(*rbpp);
+	(*rbpp)->group = layergroup;
+	clr = pcb_obj_clearance_at(PCB, term, layer);
+pcb_printf("***** CLR=%mm\n", clr);
+	init_const_box(*rbpp,
+								 /*X1 */ term->BoundingBox.X1 + clr,
+								 /*Y1 */ term->BoundingBox.Y1 + clr,
+								 /*X2 */ term->BoundingBox.X2 - clr,
+								 /*Y2 */ term->BoundingBox.Y2 - clr,
+								 style->Clearance);
+	/* kludge for non-manhattan pads (which are not allowed at present) */
+#warning term TODO:
+/*
+	if (pad->Point1.X != pad->Point2.X && pad->Point1.Y != pad->Point2.Y)
+		(*rbpp)->flags.nonstraight = 1;
+*/
+	(*rbpp)->flags.nonstraight = 0; /* otherwise the autorouter just ignores it */
+	/* set aux. properties */
+	(*rbpp)->type = TERM;
+	(*rbpp)->parent.term = term;
+	(*rbpp)->flags.fixed = 1;
+	(*rbpp)->came_from = PCB_ANY_DIR;
+	(*rbpp)->style = style;
+	/* circular lists */
+	InitLists(*rbpp);
+	return *rbpp;
+}
+
+static routebox_t *AddTerm(vtp0_t layergroupboxes[], pcb_any_obj_t *term, pcb_route_style_t *style)
+{
+	assert(term->parent_type == PCB_PARENT_LAYER);
+	return AddTerm_(layergroupboxes, term, style, term->parent.layer);
+}
+
+static routebox_t *AddPstk(vtp0_t layergroupboxes[], pcb_pstk_t *ps, pcb_route_style_t *style)
+{
+	int i;
+	routebox_t *r, *last = NULL;
+
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		if (pcb_pstk_shape_at(PCB, ps, &PCB->Data->Layer[i]) != NULL) {
+			r = AddTerm_(layergroupboxes, (pcb_any_obj_t *)ps, style, &PCB->Data->Layer[i]);
+			if (r != NULL) {
+				if (last != NULL) {
+					MergeNets(r, last, NET);
+					MergeNets(r, last, SUBNET);
+					MergeNets(r, last, ORIGINAL);
+				}
+				last = r;
+			}
+		}
+	}
+
+	return last;
+}
+
+
+static routebox_t *AddLine(vtp0_t layergroupboxes[], int layergroup, pcb_line_t *line,
+													 pcb_line_t *ptr, pcb_route_style_t * style)
+{
+	routebox_t **rbpp;
+	assert(layergroupboxes && line);
+	assert(0 <= layergroup && layergroup < pcb_max_group(PCB));
+	assert(PCB->LayerGroups.grp[layergroup].len > 0);
+
+	rbpp = (routebox_t **) vtp0_alloc_append(&layergroupboxes[layergroup], 1);
+	*rbpp = (routebox_t *) malloc(sizeof(**rbpp));
+	memset(*rbpp, 0, sizeof(**rbpp));
+	(*rbpp)->group = layergroup;
+	init_const_box(*rbpp,
+								 /*X1 */ MIN(line->Point1.X,
+														 line->Point2.X) - HALF_THICK(line->Thickness),
+								 /*Y1 */ MIN(line->Point1.Y,
+														 line->Point2.Y) - HALF_THICK(line->Thickness),
+								 /*X2 */ MAX(line->Point1.X,
+														 line->Point2.X) + HALF_THICK(line->Thickness),
+								 /*Y2 */ MAX(line->Point1.Y,
+														 line->Point2.Y) + HALF_THICK(line->Thickness), style->Clearance);
+	/* kludge for non-manhattan lines */
+	if (line->Point1.X != line->Point2.X && line->Point1.Y != line->Point2.Y) {
+		(*rbpp)->flags.nonstraight = 1;
+		(*rbpp)->flags.bl_to_ur =
+			(MIN(line->Point1.X, line->Point2.X) == line->Point1.X) != (MIN(line->Point1.Y, line->Point2.Y) == line->Point1.Y);
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_ZIGZAG)
+		showroutebox(*rbpp);
+#endif
+	}
+	/* set aux. properties */
+	(*rbpp)->type = LINE;
+	(*rbpp)->line.x1 = line->Point1.X;
+	(*rbpp)->line.y1 = line->Point1.Y;
+	(*rbpp)->line.x2 = line->Point2.X;
+	(*rbpp)->line.y2 = line->Point2.Y;
+	(*rbpp)->parent.line = ptr;
+	(*rbpp)->flags.fixed = 1;
+	(*rbpp)->came_from = PCB_ANY_DIR;
+	(*rbpp)->style = style;
+	/* circular lists */
+	InitLists(*rbpp);
+	return *rbpp;
+}
+
+static routebox_t *AddIrregularObstacle(vtp0_t layergroupboxes[],
+																				pcb_coord_t X1, pcb_coord_t Y1,
+																				pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t layergroup, void *parent, pcb_route_style_t * style)
+{
+	routebox_t **rbpp;
+	pcb_coord_t keep = style->Clearance;
+	assert(layergroupboxes && parent);
+	assert(X1 <= X2 && Y1 <= Y2);
+	assert(0 <= layergroup && layergroup < pcb_max_group(PCB));
+	assert(PCB->LayerGroups.grp[layergroup].len > 0);
+
+	rbpp = (routebox_t **) vtp0_alloc_append(&layergroupboxes[layergroup], 1);
+	*rbpp = (routebox_t *) malloc(sizeof(**rbpp));
+	memset(*rbpp, 0, sizeof(**rbpp));
+	(*rbpp)->group = layergroup;
+	init_const_box(*rbpp, X1, Y1, X2, Y2, keep);
+	(*rbpp)->flags.nonstraight = 1;
+	(*rbpp)->type = OTHER;
+	(*rbpp)->parent.generic = parent;
+	(*rbpp)->flags.fixed = 1;
+	(*rbpp)->style = style;
+	/* circular lists */
+	InitLists(*rbpp);
+	return *rbpp;
+}
+
+static routebox_t *AddPolygon(vtp0_t layergroupboxes[], pcb_cardinal_t layer, pcb_poly_t *polygon, pcb_route_style_t * style)
+{
+	int is_not_rectangle = 1;
+	pcb_layergrp_id_t layergroup = pcb_layer_get_group(PCB, layer);
+	routebox_t *rb;
+	assert(0 <= layergroup && layergroup < pcb_max_group(PCB));
+	rb = AddIrregularObstacle(layergroupboxes,
+														polygon->BoundingBox.X1,
+														polygon->BoundingBox.Y1,
+														polygon->BoundingBox.X2, polygon->BoundingBox.Y2, layergroup, polygon, style);
+	if (polygon->PointN == 4 &&
+			polygon->HoleIndexN == 0 &&
+			(polygon->Points[0].X == polygon->Points[1].X ||
+			 polygon->Points[0].Y == polygon->Points[1].Y) &&
+			(polygon->Points[1].X == polygon->Points[2].X ||
+			 polygon->Points[1].Y == polygon->Points[2].Y) &&
+			(polygon->Points[2].X == polygon->Points[3].X ||
+			 polygon->Points[2].Y == polygon->Points[3].Y) &&
+			(polygon->Points[3].X == polygon->Points[0].X || polygon->Points[3].Y == polygon->Points[0].Y))
+		is_not_rectangle = 0;
+	rb->flags.nonstraight = is_not_rectangle;
+	rb->layer = layer;
+	rb->came_from = PCB_ANY_DIR;
+	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY, polygon)) {
+		rb->flags.clear_poly = 1;
+		if (!is_not_rectangle)
+			rb->type = PLANE;
+	}
+	return rb;
+}
+
+static void AddText(vtp0_t layergroupboxes[], pcb_cardinal_t layergroup, pcb_text_t *text, pcb_route_style_t * style)
+{
+	AddIrregularObstacle(layergroupboxes,
+											 text->BoundingBox.X1, text->BoundingBox.Y1,
+											 text->BoundingBox.X2, text->BoundingBox.Y2, layergroup, text, style);
+}
+
+static routebox_t *AddArc(vtp0_t layergroupboxes[], pcb_cardinal_t layergroup, pcb_arc_t *arc, pcb_route_style_t * style)
+{
+	return AddIrregularObstacle(layergroupboxes,
+															arc->BoundingBox.X1, arc->BoundingBox.Y1,
+															arc->BoundingBox.X2, arc->BoundingBox.Y2, layergroup, arc, style);
+}
+
+struct rb_info {
+	pcb_box_t query;
+	routebox_t *winner;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t __found_one_on_lg(const pcb_box_t * box, void *cl)
+{
+	struct rb_info *inf = (struct rb_info *) cl;
+	routebox_t *rb = (routebox_t *) box;
+	pcb_box_t sb;
+
+	if (rb->flags.nonstraight)
+		return PCB_R_DIR_NOT_FOUND;
+	sb = pcb_shrink_box(&rb->box, rb->style->Clearance);
+	if (inf->query.X1 >= sb.X2 || inf->query.X2 <= sb.X1 || inf->query.Y1 >= sb.Y2 || inf->query.Y2 <= sb.Y1)
+		return PCB_R_DIR_NOT_FOUND;
+	inf->winner = rb;
+	if (rb->type == PLANE)
+		return PCB_R_DIR_FOUND_CONTINUE;										/* keep looking for something smaller if a plane was found */
+	longjmp(inf->env, 1);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static routebox_t *FindRouteBoxOnLayerGroup(routedata_t * rd, pcb_coord_t X, pcb_coord_t Y, pcb_cardinal_t layergroup)
+{
+	struct rb_info info;
+	info.winner = NULL;
+	info.query = pcb_point_box(X, Y);
+	if (setjmp(info.env) == 0)
+		pcb_r_search(rd->layergrouptree[layergroup], &info.query, NULL, __found_one_on_lg, &info, NULL);
+	return info.winner;
+}
+
+#ifdef ROUTE_DEBUG_VERBOSE
+static void DumpRouteBox(routebox_t * rb)
+{
+	pcb_printf("RB: %#mD-%#mD l%d; ", rb->box.X1, rb->box.Y1, rb->box.X2, rb->box.Y2, (int) rb->group);
+	switch (rb->type) {
+	case TERM:
+		printf("TERM[%s] ", rb->parent.term->term);
+		break;
+	case LINE:
+		printf("LINE ");
+		break;
+	case OTHER:
+		printf("OTHER ");
+		break;
+	case EXPANSION_AREA:
+		printf("EXPAREA ");
+		break;
+	default:
+		printf("UNKNOWN ");
+		break;
+	}
+	if (rb->flags.nonstraight)
+		printf("(nonstraight) ");
+	if (rb->flags.fixed)
+		printf("(fixed) ");
+	if (rb->flags.source)
+		printf("(source) ");
+	if (rb->flags.target)
+		printf("(target) ");
+	if (rb->flags.homeless)
+		printf("(homeless) ");
+	printf("\n");
+}
+#endif
+
+/* Add obstacles extracting them from data (subc-recursive) */
+static void CreateRouteData_(routedata_t *rd, vtp0_t layergroupboxes[], pcb_data_t *data)
+{
+	int i;
+
+	PCB_PADSTACK_LOOP(data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_DRC, padstack))
+			PCB_FLAG_CLEAR(PCB_FLAG_DRC, padstack);
+		else
+			AddPstk(layergroupboxes, padstack, rd->styles[rd->max_styles]);
+	}
+	PCB_END_LOOP;
+
+	for (i = 0; i < data->LayerN; i++) {
+		pcb_layergrp_id_t layergroup;
+		pcb_layer_t *ly = &data->Layer[i];
+
+		if (!(pcb_layer_flags_(ly) & PCB_LYT_COPPER))
+			continue;
+
+		layergroup = pcb_layer_get_group_(ly);
+
+		/* add all (non-rat) lines */
+		PCB_LINE_LOOP(ly);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) {
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC, line);
+				continue;
+			}
+			/* dice up non-straight lines into many tiny obstacles */
+			if (line->Point1.X != line->Point2.X && line->Point1.Y != line->Point2.Y) {
+				pcb_line_t fake_line = *line;
+				pcb_coord_t dx = (line->Point2.X - line->Point1.X);
+				pcb_coord_t dy = (line->Point2.Y - line->Point1.Y);
+				int segs = MAX(PCB_ABS(dx), PCB_ABS(dy)) / (4 * rd->max_bloat + 1);
+				int qq;
+				segs = PCB_CLAMP(segs, 1, 32);	/* don't go too crazy */
+				dx /= segs;
+				dy /= segs;
+				for (qq = 0; qq < segs - 1; qq++) {
+					fake_line.Point2.X = fake_line.Point1.X + dx;
+					fake_line.Point2.Y = fake_line.Point1.Y + dy;
+					if (fake_line.Point2.X == line->Point2.X && fake_line.Point2.Y == line->Point2.Y)
+						break;
+					AddLine(layergroupboxes, layergroup, &fake_line, line, rd->styles[rd->max_styles]);
+					fake_line.Point1 = fake_line.Point2;
+				}
+				fake_line.Point2 = line->Point2;
+				AddLine(layergroupboxes, layergroup, &fake_line, line, rd->styles[rd->max_styles]);
+			}
+			else {
+				AddLine(layergroupboxes, layergroup, line, line, rd->styles[rd->max_styles]);
+			}
+		}
+		PCB_END_LOOP;
+		/* add all polygons */
+		PCB_POLY_LOOP(ly);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_DRC, polygon))
+				PCB_FLAG_CLEAR(PCB_FLAG_DRC, polygon);
+			else
+				AddPolygon(layergroupboxes, i, polygon, rd->styles[rd->max_styles]);
+		}
+		PCB_END_LOOP;
+		/* add all copper text */
+		PCB_TEXT_LOOP(ly);
+		{
+			AddText(layergroupboxes, layergroup, text, rd->styles[rd->max_styles]);
+		}
+		PCB_END_LOOP;
+		/* add all arcs */
+		PCB_ARC_LOOP(ly);
+		{
+			AddArc(layergroupboxes, layergroup, arc, rd->styles[rd->max_styles]);
+		}
+		PCB_END_LOOP;
+	}
+
+	/* subc recursion - re-add terms */
+	PCB_SUBC_LOOP(data);
+	{
+		CreateRouteData_(rd, layergroupboxes, subc->data);
+	}
+	PCB_END_LOOP;
+
+}
+
+
+static routedata_t *CreateRouteData()
+{
+	pcb_netlist_list_t Nets;
+	vtp0_t layergroupboxes[PCB_MAX_LAYERGRP];
+	pcb_box_t bbox;
+	routedata_t *rd;
+	int group, i;
+
+	/* check which layers are active first */
+	routing_layers = 0;
+	for (group = 0; group < pcb_max_group(PCB); group++) {
+		for (i = 0; i < PCB->LayerGroups.grp[group].len; i++) {
+			pcb_layer_id_t lid = PCB->LayerGroups.grp[group].lid[i];
+			/* layer must be 1) copper and 2) on */
+			if ((pcb_layer_flags(PCB, lid) & PCB_LYT_COPPER) && PCB->Data->Layer[lid].meta.real.vis) {
+				routing_layers++;
+				is_layer_group_active[group] = pcb_true;
+				break;
+			}
+			else
+				is_layer_group_active[group] = pcb_false;
+		}
+	}
+	/* if via visibility is turned off, don't use them */
+	AutoRouteParameters.use_vias = routing_layers > 1 && PCB->pstk_on;
+
+	back = front = -1;
+	if (pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &back, 1) <= 0)
+		return NULL;
+	if (pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &front, 1) <= 0)
+		return NULL;
+
+	/* determine preferred routing direction on each group */
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		if (i != back && i != front) {
+			x_cost[i] = (i & 1) ? 2 : 1;
+			y_cost[i] = (i & 1) ? 1 : 2;
+		}
+		else if (i == back) {
+			x_cost[i] = 4;
+			y_cost[i] = 2;
+		}
+		else {
+			x_cost[i] = 2;
+			y_cost[i] = 2;
+		}
+	}
+	/* create routedata */
+	rd = (routedata_t *) malloc(sizeof(*rd));
+	memset((void *) rd, 0, sizeof(*rd));
+
+	rd->max_styles = vtroutestyle_len(&PCB->RouteStyle);
+/*	rd->layergrouptree = calloc(sizeof(rd->layergrouptree[0]), rd->max_layers);*/
+	rd->styles = calloc(sizeof(rd->styles[0]), rd->max_styles+1);
+
+	/* create default style */
+	rd->defaultstyle.Thick = conf_core.design.line_thickness;
+	rd->defaultstyle.Diameter = conf_core.design.via_thickness;
+	rd->defaultstyle.Hole = conf_core.design.via_drilling_hole;
+	rd->defaultstyle.Clearance = conf_core.design.clearance;
+	rd->max_bloat = BLOAT(&rd->defaultstyle);
+	rd->max_keep = conf_core.design.clearance;
+	/* create styles structures */
+	bbox.X1 = bbox.Y1 = 0;
+	bbox.X2 = PCB->MaxWidth;
+	bbox.Y2 = PCB->MaxHeight;
+	for (i = 0; i < rd->max_styles + 1; i++) {
+		pcb_route_style_t *style = (i < rd->max_styles) ? &PCB->RouteStyle.array[i] : &rd->defaultstyle;
+		rd->styles[i] = style;
+	}
+
+	/* initialize pointer vectors */
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		vtp0_init(&layergroupboxes[i]);
+		PCB_COPPER_GROUP_LOOP(PCB->Data, i);
+		{
+			if (!PCB_RTREE_EMPTY(layer->line_tree) || !PCB_RTREE_EMPTY(layer->arc_tree))
+				usedGroup[i] = pcb_true;
+			else
+				usedGroup[i] = pcb_false;
+		}
+		PCB_END_LOOP;
+	}
+	usedGroup[front] = pcb_true;
+	usedGroup[back] = pcb_true;
+	/* add the objects in the netlist first.
+	 * then go and add all other objects that weren't already added
+	 *
+	 * this saves on searching the trees to find the nets
+	 */
+	/* use the PCB_FLAG_DRC to mark objects as they are entered */
+	pcb_reset_conns(pcb_false);
+	Nets = pcb_rat_collect_subnets(pcb_false);
+	{
+		routebox_t *last_net = NULL;
+		PCB_NETLIST_LOOP(&Nets);
+		{
+			routebox_t *last_in_net = NULL;
+			PCB_NET_LOOP(netlist);
+			{
+				routebox_t *last_in_subnet = NULL;
+				int j;
+
+				for (j = 0; j < rd->max_styles; j++)
+					if (net->Style == rd->styles[j])
+						break;
+				PCB_CONNECTION_LOOP(net);
+				{
+					routebox_t *rb = NULL;
+					PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pstk_t *) connection->obj);
+
+					if ((connection->obj->type == PCB_OBJ_LINE) && (connection->obj->term != NULL)) {
+						rb = AddTerm(layergroupboxes, connection->obj, rd->styles[j]);
+					}
+					else if (connection->obj->type == PCB_OBJ_LINE) {
+						pcb_line_t *line = (pcb_line_t *) connection->obj;
+
+						/* lines are listed at each end, so skip one */
+						/* this should probably by a macro named "BUMP_LOOP" */
+						if (line->term == NULL)
+							n--;
+
+						/* dice up non-straight lines into many tiny obstacles */
+						if (line->Point1.X != line->Point2.X && line->Point1.Y != line->Point2.Y) {
+							pcb_line_t fake_line = *line;
+							pcb_coord_t dx = (line->Point2.X - line->Point1.X);
+							pcb_coord_t dy = (line->Point2.Y - line->Point1.Y);
+							int segs = MAX(PCB_ABS(dx),
+														 PCB_ABS(dy)) / (4 * BLOAT(rd->styles[j]) + 1);
+							int qq;
+							segs = PCB_CLAMP(segs, 1, 32);	/* don't go too crazy */
+							dx /= segs;
+							dy /= segs;
+							for (qq = 0; qq < segs - 1; qq++) {
+								fake_line.Point2.X = fake_line.Point1.X + dx;
+								fake_line.Point2.Y = fake_line.Point1.Y + dy;
+								if (fake_line.Point2.X == line->Point2.X && fake_line.Point2.Y == line->Point2.Y)
+									break;
+								rb = AddLine(layergroupboxes, connection->group, &fake_line, line, rd->styles[j]);
+								if (last_in_subnet && rb != last_in_subnet)
+									MergeNets(last_in_subnet, rb, ORIGINAL);
+								if (last_in_net && rb != last_in_net)
+									MergeNets(last_in_net, rb, NET);
+								last_in_subnet = last_in_net = rb;
+								fake_line.Point1 = fake_line.Point2;
+							}
+							fake_line.Point2 = line->Point2;
+							rb = AddLine(layergroupboxes, connection->group, &fake_line, line, rd->styles[j]);
+						}
+						else {
+							rb = AddLine(layergroupboxes, connection->group, line, line, rd->styles[j]);
+						}
+					}
+					else
+						switch (connection->obj->type) {
+						case PCB_OBJ_VOID: break;
+						case PCB_OBJ_PSTK:
+							rb = AddPstk(layergroupboxes, (pcb_pstk_t *)connection->obj, rd->styles[j]);
+							break;
+						case PCB_OBJ_POLY:
+							{
+								pcb_poly_t *poly = (pcb_poly_t *)connection->obj;
+								pcb_layer_t *layer = (pcb_layer_t *)connection->ptr1;
+								if (poly->term != NULL)
+									rb = AddTerm(layergroupboxes, connection->obj, rd->styles[j]);
+								else
+									rb = AddPolygon(layergroupboxes, pcb_layer_id(PCB->Data, layer), poly, rd->styles[j]);
+							}
+							break;
+						case PCB_OBJ_LINE:
+						case PCB_OBJ_TEXT:
+						case PCB_OBJ_ARC:
+							if (connection->obj->term != NULL)
+								rb = AddTerm(layergroupboxes, connection->obj, rd->styles[j]);
+							break;
+
+						case PCB_OBJ_RAT:
+						case PCB_OBJ_SUBC:
+						case PCB_OBJ_NET:
+						case PCB_OBJ_LAYER:
+						case PCB_OBJ_LAYERGRP:
+							break; /* don't care about these */
+						}
+					assert(rb);
+					/* update circular connectivity lists */
+					if (last_in_subnet && rb != last_in_subnet)
+						MergeNets(last_in_subnet, rb, ORIGINAL);
+					if (last_in_net && rb != last_in_net)
+						MergeNets(last_in_net, rb, NET);
+					last_in_subnet = last_in_net = rb;
+					rd->max_bloat = MAX(rd->max_bloat, BLOAT(rb->style));
+					rd->max_keep = MAX(rd->max_keep, rb->style->Clearance);
+				}
+				PCB_END_LOOP;
+			}
+			PCB_END_LOOP;
+			if (last_net && last_in_net)
+				MergeNets(last_net, last_in_net, DIFFERENT_NET);
+			last_net = last_in_net;
+		}
+		PCB_END_LOOP;
+		rd->first_net = last_net;
+	}
+	pcb_netlist_list_free(&Nets);
+
+	/* reset all nets to "original" connectivity (which we just set) */
+	{
+		routebox_t *net;
+		LIST_LOOP(rd->first_net, different_net, net);
+		ResetSubnet(net);
+		PCB_END_LOOP;
+	}
+
+
+	/* subc-recursively add all obstacles */
+	CreateRouteData_(rd, layergroupboxes, PCB->Data);
+
+	/* create r-trees from pointer lists */
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		/* create the r-tree */
+		rd->layergrouptree[i] = pcb_r_create_tree();
+		pcb_r_insert_array(rd->layergrouptree[i], (const pcb_box_t **) layergroupboxes[i].array, vtp0_len(&layergroupboxes[i]));
+	}
+
+	if (AutoRouteParameters.use_vias) {
+		rd->mtspace = mtspace_create();
+
+		/* create "empty-space" structures for via placement (now that we know
+		 * appropriate clearances for all the fixed elements) */
+		for (i = 0; i < pcb_max_group(PCB); i++) {
+			int ip;
+			for(ip = 0; ip < vtp0_len(&layergroupboxes[i]); ip++) {
+				void **ptr = &layergroupboxes[i].array[ip];
+				routebox_t *rb = (routebox_t *) * ptr;
+				if (!rb->flags.clear_poly)
+					mtspace_add(rd->mtspace, &rb->box, FIXED, rb->style->Clearance);
+			}
+		}
+	}
+	/* free pointer lists */
+	for (i = 0; i < pcb_max_group(PCB); i++)
+		vtp0_uninit(&layergroupboxes[i]);
+	/* done! */
+	return rd;
+}
+
+void DestroyRouteData(routedata_t ** rd)
+{
+	int i;
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		pcb_r_free_tree_data((*rd)->layergrouptree[i], free);
+		pcb_r_destroy_tree(&(*rd)->layergrouptree[i]);
+	}
+	if (AutoRouteParameters.use_vias)
+		mtspace_destroy(&(*rd)->mtspace);
+/*	free((*rd)->layergrouptree);*/
+	free((*rd)->styles);
+	free(*rd);
+	*rd = NULL;
+}
+
+/*-----------------------------------------------------------------
+ * routebox reference counting.
+ */
+
+/* increment the reference count on a routebox. */
+static void RB_up_count(routebox_t * rb)
+{
+	assert(rb->flags.homeless);
+	rb->refcount++;
+}
+
+/* decrement the reference count on a routebox, freeing if this box becomes
+ * unused. */
+static void RB_down_count(routebox_t * rb)
+{
+	assert(rb->type == EXPANSION_AREA);
+	assert(rb->flags.homeless);
+	assert(rb->refcount > 0);
+	if (--rb->refcount == 0) {
+		if (rb->parent.expansion_area->flags.homeless)
+			RB_down_count(rb->parent.expansion_area);
+		free(rb);
+	}
+}
+
+/*-----------------------------------------------------------------
+ * Rectangle-expansion routing code.
+ */
+
+static void ResetSubnet(routebox_t * net)
+{
+	routebox_t *rb;
+	/* reset connectivity of everything on this net */
+	LIST_LOOP(net, same_net, rb);
+	rb->same_subnet = rb->original_subnet;
+	PCB_END_LOOP;
+}
+
+static inline pcb_cost_t pcb_cost_to_point_on_layer(const pcb_cheap_point_t * p1, const pcb_cheap_point_t * p2, pcb_cardinal_t point_layer)
+{
+	pcb_cost_t x_dist = p1->X - p2->X, y_dist = p1->Y - p2->Y, r;
+	x_dist *= x_cost[point_layer];
+	y_dist *= y_cost[point_layer];
+	/* cost is proportional to orthogonal distance. */
+	r = PCB_ABS(x_dist) + PCB_ABS(y_dist);
+	if (p1->X != p2->X && p1->Y != p2->Y)
+		r += AutoRouteParameters.JogPenalty;
+	return r;
+}
+
+static pcb_cost_t pcb_cost_to_point(const pcb_cheap_point_t * p1, pcb_cardinal_t point_layer1, const pcb_cheap_point_t * p2, pcb_cardinal_t point_layer2)
+{
+	pcb_cost_t r = pcb_cost_to_point_on_layer(p1, p2, point_layer1);
+	/* apply via cost penalty if layers differ */
+	if (point_layer1 != point_layer2)
+		r += AutoRouteParameters.ViaCost;
+	return r;
+}
+
+/* return the minimum *cost* from a point to a box on any layer.
+ * It's safe to return a smaller than minimum cost
+ */
+static pcb_cost_t pcb_cost_to_layerless_box(const pcb_cheap_point_t * p, pcb_cardinal_t point_layer, const pcb_box_t * b)
+{
+	pcb_cheap_point_t p2 = pcb_closest_pcb_point_in_box(p, b);
+	register pcb_cost_t c1, c2;
+
+	c1 = p2.X - p->X;
+	c2 = p2.Y - p->Y;
+
+	c1 = PCB_ABS(c1);
+	c2 = PCB_ABS(c2);
+	if (c1 < c2)
+		return c1 * AutoRouteParameters.MinPenalty + c2;
+	else
+		return c2 * AutoRouteParameters.MinPenalty + c1;
+}
+
+/* get to actual pins/pad target coordinates */
+pcb_bool TargetPoint(pcb_cheap_point_t * nextpoint, const routebox_t * target)
+{
+/*	if (target->type == PIN) {
+		nextpoint->X = target->parent.pin->X;
+		nextpoint->Y = target->parent.pin->Y;
+		return pcb_true;
+	}*/
+	nextpoint->X = PCB_BOX_CENTER_X(target->sbox);
+	nextpoint->Y = PCB_BOX_CENTER_Y(target->sbox);
+	return pcb_false;
+}
+
+/* return the *minimum cost* from a point to a route box, including possible
+ * via costs if the route box is on a different layer.
+ * assume routbox is bloated unless it is an expansion area
+ */
+static pcb_cost_t pcb_cost_to_routebox(const pcb_cheap_point_t * p, pcb_cardinal_t point_layer, const routebox_t * rb)
+{
+	register pcb_cost_t trial = 0;
+	pcb_cheap_point_t p2 = closest_point_in_routebox(p, rb);
+	if (!usedGroup[point_layer] || !usedGroup[rb->group])
+		trial = AutoRouteParameters.NewLayerPenalty;
+	if ((p2.X - p->X) * (p2.Y - p->Y) != 0)
+		trial += AutoRouteParameters.JogPenalty;
+	/* special case for defered via searching */
+	if (point_layer > pcb_max_group(PCB) || point_layer == rb->group)
+		return trial + PCB_ABS(p2.X - p->X) + PCB_ABS(p2.Y - p->Y);
+	/* if this target is only a via away, then the via is cheaper than the congestion */
+	if (p->X == p2.X && p->Y == p2.Y)
+		return trial + 1;
+	trial += AutoRouteParameters.ViaCost;
+	trial += PCB_ABS(p2.X - p->X) + PCB_ABS(p2.Y - p->Y);
+	return trial;
+}
+
+
+static pcb_box_t bloat_routebox(routebox_t * rb)
+{
+	pcb_box_t r;
+	pcb_coord_t clearance;
+	assert(__routepcb_box_is_good(rb));
+
+	if (rb->flags.nobloat)
+		return rb->sbox;
+
+	/* Obstacle exclusion zones get bloated by the larger of
+	 * the two required clearances plus half the track width.
+	 */
+	clearance = MAX(AutoRouteParameters.style->Clearance, rb->style->Clearance);
+	r = pcb_bloat_box(&rb->sbox, clearance + HALF_THICK(AutoRouteParameters.style->Thick));
+	return r;
+}
+
+
+#ifdef ROUTE_DEBUG  /* only for debugging expansion areas */
+
+typedef short pcb_dimension_t;
+/* makes a line on the solder layer silk surrounding the box */
+static void showbox(pcb_box_t b, pcb_dimension_t thickness, int group)
+{
+	pcb_line_t *line;
+	pcb_layer_t *csl, *SLayer = LAYER_PTR(group);
+	pcb_layer_id_t cs_id;
+	if (showboxen < -1)
+		return;
+	if (showboxen != -1 && showboxen != group)
+		return;
+
+	if (ddraw != NULL) {
+		ddraw->set_line_width(ar_gc, thickness);
+		ddraw->set_line_cap(ar_gc, pcb_cap_round);
+		ddraw->set_color(ar_gc, SLayer->Color);
+
+		ddraw->draw_line(ar_gc, b.X1, b.Y1, b.X2, b.Y1);
+		ddraw->draw_line(ar_gc, b.X1, b.Y2, b.X2, b.Y2);
+		ddraw->draw_line(ar_gc, b.X1, b.Y1, b.X1, b.Y2);
+		ddraw->draw_line(ar_gc, b.X2, b.Y1, b.X2, b.Y2);
+	}
+
+#if 1
+	if (pcb_layer_find(PCB_LYT_TOP | PCB_LYT_SILK, &cs_id, 1) > 0)  {
+		csl = LAYER_PTR(cs_id);
+		if (b.Y1 == b.Y2 || b.X1 == b.X2)
+			thickness = 5;
+		line = pcb_line_new(csl, b.X1, b.Y1, b.X2, b.Y1, thickness, 0, pcb_flag_make(0));
+		pcb_undo_add_obj_to_create(csl, line, line);
+		if (b.Y1 != b.Y2) {
+			line = pcb_line_new(csl, b.X1, b.Y2, b.X2, b.Y2, thickness, 0, pcb_flag_make(0));
+			pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line);
+		}
+		line = pcb_line_new(csl, b.X1, b.Y1, b.X1, b.Y2, thickness, 0, pcb_flag_make(0));
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line);
+		if (b.X1 != b.X2) {
+			line = pcb_line_new(csl, b.X2, b.Y1, b.X2, b.Y2, thickness, 0, pcb_flag_make(0));
+			pcb_undo_add_obj_to_create(PCB_OBJ_LINE, csl, line, line);
+		}
+	}
+#endif
+}
+#endif
+
+#if defined(ROUTE_DEBUG)
+static void showedge(edge_t * e)
+{
+	pcb_box_t *b = (pcb_box_t *) e->rb;
+
+	if (ddraw == NULL)
+		return;
+
+	ddraw->set_line_cap(ar_gc, pcb_cap_round);
+	ddraw->set_line_width(ar_gc, 1);
+	ddraw->set_color(ar_gc, Settings.MaskColor);
+
+	switch (e->expand_dir) {
+	case PCB_NORTH:
+		ddraw->draw_line(ar_gc, b->X1, b->Y1, b->X2, b->Y1);
+		break;
+	case PCB_SOUTH:
+		ddraw->draw_line(ar_gc, b->X1, b->Y2, b->X2, b->Y2);
+		break;
+	case PCB_WEST:
+		ddraw->draw_line(ar_gc, b->X1, b->Y1, b->X1, b->Y2);
+		break;
+	case PCB_EAST:
+		ddraw->draw_line(ar_gc, b->X2, b->Y1, b->X2, b->Y2);
+		break;
+	default:
+		break;
+	}
+}
+#endif
+
+#if defined(ROUTE_DEBUG)
+static void showroutebox(routebox_t * rb)
+{
+	pcb_layerid_t cs_id;
+	if (pcb_layer_find(PCB_LYT_TOP | PCB_LYT_SILK, &cs_id, 1) > 0)
+		showbox(rb->sbox, rb->flags.source ? 20 : (rb->flags.target ? 10 : 1), rb->flags.is_via ? LAYER_PTR(cs_id) : rb->group);
+}
+#endif
+
+/* return a "parent" of this edge which immediately precedes it in the route.*/
+static routebox_t *route_parent(routebox_t * rb)
+{
+	while (rb->flags.homeless && !rb->flags.is_via && !rb->flags.is_thermal) {
+		assert(rb->type == EXPANSION_AREA);
+		rb = rb->parent.expansion_area;
+		assert(rb);
+	}
+	return rb;
+}
+
+static vector_t *path_conflicts(routebox_t * rb, routebox_t * conflictor, pcb_bool branch)
+{
+	if (branch)
+		rb->conflicts_with = vector_duplicate(rb->conflicts_with);
+	else if (!rb->conflicts_with)
+		rb->conflicts_with = vector_create();
+	vector_append(rb->conflicts_with, conflictor);
+	return rb->conflicts_with;
+}
+
+/* Touch everything (except fixed) on each net found
+ * in the conflicts vector. If the vector is different
+ * from the last one touched, untouch the last batch
+ * and touch the new one. Always call with touch=1
+ * (except for recursive call). Call with NULL, 1 to
+ * clear the last batch touched.
+ *
+ * touched items become invisible to current path
+ * so we don't encounter the same conflictor more
+ * than once
+ */
+
+static void touch_conflicts(vector_t * conflicts, int touch)
+{
+	static vector_t *last = NULL;
+	static int last_size = 0;
+	int i, n;
+	i = 0;
+	if (touch) {
+		if (last && conflicts != last)
+			touch_conflicts(last, 0);
+		if (!conflicts)
+			return;
+		last = conflicts;
+		i = last_size;
+	}
+	n = vector_size(conflicts);
+	for (; i < n; i++) {
+		routebox_t *rb = (routebox_t *) vector_element(conflicts, i);
+		routebox_t *p;
+		LIST_LOOP(rb, same_net, p);
+		if (!p->flags.fixed)
+			p->flags.touched = touch;
+		PCB_END_LOOP;
+	}
+	if (!touch) {
+		last = NULL;
+		last_size = 0;
+	}
+	else
+		last_size = n;
+}
+
+/* return a "parent" of this edge which resides in a r-tree somewhere */
+/* -- actually, this "parent" *may* be a via box, which doesn't live in
+ * a r-tree. -- */
+static routebox_t *nonhomeless_parent(routebox_t * rb)
+{
+	return route_parent(rb);
+}
+
+/* some routines to find the minimum *cost* from a cost point to
+ * a target (any target) */
+struct minpcb_cost_target_closure {
+	const pcb_cheap_point_t *CostPoint;
+	pcb_cardinal_t CostPointLayer;
+	routebox_t *nearest;
+	pcb_cost_t nearest_cost;
+};
+static pcb_r_dir_t __region_within_guess(const pcb_box_t * region, void *cl)
+{
+	struct minpcb_cost_target_closure *mtc = (struct minpcb_cost_target_closure *) cl;
+	pcb_cost_t pcb_cost_to_region;
+	if (mtc->nearest == NULL)
+		return PCB_R_DIR_FOUND_CONTINUE;
+	pcb_cost_to_region = pcb_cost_to_layerless_box(mtc->CostPoint, mtc->CostPointLayer, region);
+	assert(pcb_cost_to_region >= 0);
+	/* if no guess yet, all regions are "close enough" */
+	/* note that cost is *strictly more* than minimum distance, so we'll
+	 * always search a region large enough. */
+	return (pcb_cost_to_region < mtc->nearest_cost) ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t __found_new_guess(const pcb_box_t * box, void *cl)
+{
+	struct minpcb_cost_target_closure *mtc = (struct minpcb_cost_target_closure *) cl;
+	routebox_t *guess = (routebox_t *) box;
+	pcb_cost_t pcb_cost_to_guess = pcb_cost_to_routebox(mtc->CostPoint, mtc->CostPointLayer, guess);
+	assert(pcb_cost_to_guess >= 0);
+	/* if this is cheaper than previous guess... */
+	if (pcb_cost_to_guess < mtc->nearest_cost) {
+		mtc->nearest = guess;
+		mtc->nearest_cost = pcb_cost_to_guess;	/* this is our new guess! */
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+	else
+		return PCB_R_DIR_NOT_FOUND;										/* not less expensive than our last guess */
+}
+
+/* target_guess is our guess at what the nearest target is, or NULL if we
+ * just plum don't have a clue. */
+static routebox_t *minpcb_cost_target_to_point(const pcb_cheap_point_t * CostPoint,
+																					 pcb_cardinal_t CostPointLayer, pcb_rtree_t * targets, routebox_t * target_guess)
+{
+	struct minpcb_cost_target_closure mtc;
+	assert(target_guess == NULL || target_guess->flags.target);	/* this is a target, right? */
+	mtc.CostPoint = CostPoint;
+	mtc.CostPointLayer = CostPointLayer;
+	mtc.nearest = target_guess;
+	if (mtc.nearest)
+		mtc.nearest_cost = pcb_cost_to_routebox(mtc.CostPoint, mtc.CostPointLayer, mtc.nearest);
+	else
+		mtc.nearest_cost = EXPENSIVE;
+	pcb_r_search(targets, NULL, __region_within_guess, __found_new_guess, &mtc, NULL);
+	assert(mtc.nearest != NULL && mtc.nearest_cost >= 0);
+	assert(mtc.nearest->flags.target);	/* this is a target, right? */
+	return mtc.nearest;
+}
+
+/* create edge from field values */
+/* minpcb_cost_target_guess can be NULL */
+static edge_t *CreateEdge(routebox_t * rb,
+													pcb_coord_t CostPointX, pcb_coord_t CostPointY,
+													pcb_cost_t pcb_cost_to_point, routebox_t * minpcb_cost_target_guess, pcb_direction_t expand_dir, pcb_rtree_t * targets)
+{
+	edge_t *e;
+	assert(__routepcb_box_is_good(rb));
+	e = (edge_t *) malloc(sizeof(*e));
+	memset((void *) e, 0, sizeof(*e));
+	assert(e);
+	e->rb = rb;
+	if (rb->flags.homeless)
+		RB_up_count(rb);
+	e->cost_point.X = CostPointX;
+	e->cost_point.Y = CostPointY;
+	e->pcb_cost_to_point = pcb_cost_to_point;
+	e->flags.via_search = 0;
+	/* if this edge is created in response to a target, use it */
+	if (targets)
+		e->minpcb_cost_target = minpcb_cost_target_to_point(&e->cost_point, rb->group, targets, minpcb_cost_target_guess);
+	else
+		e->minpcb_cost_target = minpcb_cost_target_guess;
+	e->expand_dir = expand_dir;
+	assert(e->rb && e->minpcb_cost_target);	/* valid edge? */
+	assert(!e->flags.is_via || e->expand_dir == PCB_ANY_DIR);
+	/* cost point should be on edge (unless this is a plane/via/conflict edge) */
+#if 0
+	assert(rb->type == PLANE || rb->conflicts_with != NULL || rb->flags.is_via
+				 || rb->flags.is_thermal
+				 || ((expand_dir == PCB_NORTH || expand_dir == PCB_SOUTH) ? rb->sbox.X1 <=
+						 CostPointX && CostPointX < rb->sbox.X2 && CostPointY == (expand_dir == PCB_NORTH ? rb->sbox.Y1 : rb->sbox.Y2 - 1) :
+						 /* expand_dir==EAST || expand_dir==WEST */
+						 rb->sbox.Y1 <= CostPointY && CostPointY < rb->sbox.Y2 &&
+						 CostPointX == (expand_dir == PCB_EAST ? rb->sbox.X2 - 1 : rb->sbox.X1)));
+#endif
+	assert(__edge_is_good(e));
+	/* done */
+	return e;
+}
+
+/* create edge, using previous edge to fill in defaults. */
+/* most of the work here is in determining a new cost point */
+static edge_t *CreateEdge2(routebox_t * rb, pcb_direction_t expand_dir,
+													 edge_t * previous_edge, pcb_rtree_t * targets, routebox_t * guess)
+{
+	pcb_box_t thisbox;
+	pcb_cheap_point_t thiscost, prevcost;
+	pcb_cost_t d;
+
+	assert(rb && previous_edge);
+	/* okay, find cheapest costpoint to costpoint of previous edge */
+	thisbox = edge_to_box(rb, expand_dir);
+	prevcost = previous_edge->cost_point;
+	/* find point closest to target */
+	thiscost = pcb_closest_pcb_point_in_box(&prevcost, &thisbox);
+	/* compute cost-to-point */
+	d = pcb_cost_to_point_on_layer(&prevcost, &thiscost, rb->group);
+	/* add in jog penalty */
+	if (previous_edge->expand_dir != expand_dir)
+		d += AutoRouteParameters.JogPenalty;
+	/* okay, new edge! */
+	return CreateEdge(rb, thiscost.X, thiscost.Y,
+										previous_edge->pcb_cost_to_point + d, guess ? guess : previous_edge->minpcb_cost_target, expand_dir, targets);
+}
+
+/* create via edge, using previous edge to fill in defaults. */
+static edge_t *CreateViaEdge(const pcb_box_t * area, pcb_cardinal_t group,
+														 routebox_t * parent, edge_t * previous_edge,
+														 conflict_t to_site_conflict, conflict_t through_site_conflict, pcb_rtree_t * targets)
+{
+	routebox_t *rb;
+	pcb_cheap_point_t costpoint;
+	pcb_cost_t d;
+	edge_t *ne;
+	pcb_cost_t scale[3];
+
+	scale[0] = 1;
+	scale[1] = AutoRouteParameters.LastConflictPenalty;
+	scale[2] = AutoRouteParameters.ConflictPenalty;
+
+	assert(pcb_box_is_good(area));
+	assert(AutoRouteParameters.with_conflicts || (to_site_conflict == NO_CONFLICT && through_site_conflict == NO_CONFLICT));
+	rb = CreateExpansionArea(area, group, parent, pcb_true, previous_edge);
+	rb->flags.is_via = 1;
+	rb->came_from = PCB_ANY_DIR;
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_VIA_BOXES)
+	showroutebox(rb);
+#endif /* ROUTE_DEBUG && DEBUG_SHOW_VIA_BOXES */
+	/* for planes, choose a point near the target */
+	if (previous_edge->flags.in_plane) {
+		routebox_t *target;
+		pcb_cheap_point_t pnt;
+		/* find a target near this via box */
+		pnt.X = PCB_BOX_CENTER_X(*area);
+		pnt.Y = PCB_BOX_CENTER_Y(*area);
+		target = minpcb_cost_target_to_point(&pnt, rb->group, targets, previous_edge->minpcb_cost_target);
+		/* now find point near the target */
+		pnt.X = PCB_BOX_CENTER_X(target->box);
+		pnt.Y = PCB_BOX_CENTER_Y(target->box);
+		costpoint = closest_point_in_routebox(&pnt, rb);
+		/* we moved from the previous cost point through the plane which is free travel */
+		d = (scale[through_site_conflict] * pcb_cost_to_point(&costpoint, group, &costpoint, previous_edge->rb->group));
+		ne = CreateEdge(rb, costpoint.X, costpoint.Y, previous_edge->pcb_cost_to_point + d, target, PCB_ANY_DIR, NULL);
+		ne->minpcb_cost_target = target;
+	}
+	else {
+		routebox_t *target;
+		target = previous_edge->minpcb_cost_target;
+		costpoint = closest_point_in_routebox(&previous_edge->cost_point, rb);
+		d =
+			(scale[to_site_conflict] *
+			 pcb_cost_to_point_on_layer(&costpoint, &previous_edge->cost_point,
+															previous_edge->rb->group)) +
+			(scale[through_site_conflict] * pcb_cost_to_point(&costpoint, group, &costpoint, previous_edge->rb->group));
+		/* if the target is just this via away, then this via is cheaper */
+		if (target->group == group && point_in_shrunk_box(target, costpoint.X, costpoint.Y))
+			d -= AutoRouteParameters.ViaCost / 2;
+		ne =
+			CreateEdge(rb, costpoint.X, costpoint.Y, previous_edge->pcb_cost_to_point + d, previous_edge->minpcb_cost_target, PCB_ANY_DIR, targets);
+	}
+	ne->flags.is_via = 1;
+	ne->flags.via_conflict_level = to_site_conflict;
+	assert(__edge_is_good(ne));
+	return ne;
+}
+
+/* create "interior" edge for routing with conflicts */
+/* Presently once we "jump inside" the conflicting object
+ * we consider it a routing highway to travel inside since
+ * it will become available if the conflict is elliminated.
+ * That is why we ignore the interior_edge argument.
+ */
+static edge_t *CreateEdgeWithConflicts(const pcb_box_t * interior_edge,
+																			 routebox_t * container, edge_t * previous_edge,
+																			 pcb_cost_t cost_penalty_to_box, pcb_rtree_t * targets)
+{
+	routebox_t *rb;
+	pcb_cheap_point_t costpoint;
+	pcb_cost_t d;
+	edge_t *ne;
+	assert(interior_edge && container && previous_edge && targets);
+	assert(!container->flags.homeless);
+	assert(AutoRouteParameters.with_conflicts);
+	assert(container->flags.touched == 0);
+	assert(previous_edge->rb->group == container->group);
+	/* use the caller's idea of what this box should be */
+	rb = CreateExpansionArea(interior_edge, previous_edge->rb->group, previous_edge->rb, pcb_true, previous_edge);
+	path_conflicts(rb, container, pcb_true);	/* crucial! */
+	costpoint = pcb_closest_pcb_point_in_box(&previous_edge->cost_point, interior_edge);
+	d = pcb_cost_to_point_on_layer(&costpoint, &previous_edge->cost_point, previous_edge->rb->group);
+	d *= cost_penalty_to_box;
+	d += previous_edge->pcb_cost_to_point;
+	ne = CreateEdge(rb, costpoint.X, costpoint.Y, d, NULL, PCB_ANY_DIR, targets);
+	ne->flags.is_interior = 1;
+	assert(__edge_is_good(ne));
+	return ne;
+}
+
+static void KillEdge(void *edge)
+{
+	edge_t *e = (edge_t *) edge;
+	assert(e);
+	if (e->rb->flags.homeless)
+		RB_down_count(e->rb);
+	if (e->flags.via_search)
+		mtsFreeWork(&e->work);
+	free(e);
+}
+
+static void DestroyEdge(edge_t ** e)
+{
+	assert(e && *e);
+	KillEdge(*e);
+	*e = NULL;
+}
+
+/* cost function for an edge. */
+static pcb_cost_t edge_cost(const edge_t * e, const pcb_cost_t too_big)
+{
+	pcb_cost_t penalty = e->pcb_cost_to_point;
+	if (e->rb->flags.is_thermal || e->rb->type == PLANE)
+		return penalty;							/* thermals are cheap */
+	if (penalty > too_big)
+		return penalty;
+
+	/* pcb_cost_to_routebox adds in our via correction, too. */
+	return penalty + pcb_cost_to_routebox(&e->cost_point, e->rb->group, e->minpcb_cost_target);
+}
+
+/* given an edge of a box, return a box containing exactly the points on that
+ * edge.  Note that the return box is treated as closed; that is, the bottom and
+ * right "edges" consist of points (just barely) not in the (half-open) box. */
+static pcb_box_t edge_to_box(const routebox_t * rb, pcb_direction_t expand_dir)
+{
+	pcb_box_t b = shrink_routebox(rb);
+	/* narrow box down to just the appropriate edge */
+	switch (expand_dir) {
+	case PCB_NORTH:
+		b.Y2 = b.Y1 + 1;
+		break;
+	case PCB_EAST:
+		b.X1 = b.X2 - 1;
+		break;
+	case PCB_SOUTH:
+		b.Y1 = b.Y2 - 1;
+		break;
+	case PCB_WEST:
+		b.X2 = b.X1 + 1;
+		break;
+	default:
+		assert(0);
+	}
+	/* done! */
+	return b;
+}
+
+struct broken_boxes {
+	pcb_box_t left, center, right;
+	pcb_bool is_valid_left, is_valid_center, is_valid_right;
+};
+
+static struct broken_boxes break_box_edge(const pcb_box_t * original, pcb_direction_t which_edge, routebox_t * breaker)
+{
+	pcb_box_t origbox, breakbox;
+	struct broken_boxes result;
+
+	assert(original && breaker);
+
+	origbox = *original;
+	breakbox = bloat_routebox(breaker);
+	PCB_BOX_ROTATE_TO_NORTH(origbox, which_edge);
+	PCB_BOX_ROTATE_TO_NORTH(breakbox, which_edge);
+	result.right.Y1 = result.center.Y1 = result.left.Y1 = origbox.Y1;
+	result.right.Y2 = result.center.Y2 = result.left.Y2 = origbox.Y1 + 1;
+	/* validity of breaker is not important because the boxes are marked invalid */
+	/*assert (breakbox.X1 <= origbox.X2 && breakbox.X2 >= origbox.X1); */
+	/* left edge piece */
+	result.left.X1 = origbox.X1;
+	result.left.X2 = breakbox.X1;
+	/* center (ie blocked) edge piece */
+	result.center.X1 = MAX(breakbox.X1, origbox.X1);
+	result.center.X2 = MIN(breakbox.X2, origbox.X2);
+	/* right edge piece */
+	result.right.X1 = breakbox.X2;
+	result.right.X2 = origbox.X2;
+	/* validity: */
+	result.is_valid_left = (result.left.X1 < result.left.X2);
+	result.is_valid_center = (result.center.X1 < result.center.X2);
+	result.is_valid_right = (result.right.X1 < result.right.X2);
+	/* rotate back */
+	PCB_BOX_ROTATE_FROM_NORTH(result.left, which_edge);
+	PCB_BOX_ROTATE_FROM_NORTH(result.center, which_edge);
+	PCB_BOX_ROTATE_FROM_NORTH(result.right, which_edge);
+	/* done */
+	return result;
+}
+
+#ifndef NDEBUG
+static int share_edge(const pcb_box_t * child, const pcb_box_t * parent)
+{
+	return
+		(child->X1 == parent->X2 || child->X2 == parent->X1 ||
+		 child->Y1 == parent->Y2 || child->Y2 == parent->Y1) &&
+		((parent->X1 <= child->X1 && child->X2 <= parent->X2) || (parent->Y1 <= child->Y1 && child->Y2 <= parent->Y2));
+}
+
+static int edge_intersect(const pcb_box_t * child, const pcb_box_t * parent)
+{
+	return (child->X1 <= parent->X2) && (child->X2 >= parent->X1) && (child->Y1 <= parent->Y2) && (child->Y2 >= parent->Y1);
+}
+#endif
+
+/* area is the expansion area, on layer group 'group'. 'parent' is the
+ * immediately preceding expansion area, for backtracing. 'lastarea' is
+ * the last expansion area created, we string these together in a loop
+ * so we can remove them all easily at the end. */
+static routebox_t *CreateExpansionArea(const pcb_box_t * area, pcb_cardinal_t group,
+																			 routebox_t * parent, pcb_bool relax_edge_requirements, edge_t * src_edge)
+{
+	routebox_t *rb = (routebox_t *) malloc(sizeof(*rb));
+	memset((void *) rb, 0, sizeof(*rb));
+	assert(area && parent);
+	init_const_box(rb, area->X1, area->Y1, area->X2, area->Y2, 0);
+	rb->group = group;
+	rb->type = EXPANSION_AREA;
+	/* should always share edge or overlap with parent */
+#ifndef NDEBUG
+	{
+		/* work around rounding errors: grow both boxes by 2 nm */
+		pcb_box_t b1 = rb->sbox, b2 = parent->sbox;
+		b1.X1--;b1.Y1--;b1.X2++;b1.Y2++;
+		b2.X1--;b2.Y1--;b2.X2++;b2.Y2++;
+		assert(relax_edge_requirements ? pcb_box_intersect(&b1, &b2)
+					 : share_edge(&rb->sbox, &parent->sbox));
+	}
+#endif
+	rb->parent.expansion_area = route_parent(parent);
+	rb->cost_point = pcb_closest_pcb_point_in_box(&rb->parent.expansion_area->cost_point, area);
+	rb->cost =
+		rb->parent.expansion_area->cost +
+		pcb_cost_to_point_on_layer(&rb->parent.expansion_area->cost_point, &rb->cost_point, rb->group);
+	assert(relax_edge_requirements ? edge_intersect(&rb->sbox, &parent->sbox)
+				 : share_edge(&rb->sbox, &parent->sbox));
+	if (rb->parent.expansion_area->flags.homeless)
+		RB_up_count(rb->parent.expansion_area);
+	rb->flags.homeless = 1;
+	rb->flags.nobloat = 1;
+	rb->style = AutoRouteParameters.style;
+	rb->conflicts_with = parent->conflicts_with;
+/* we will never link an EXPANSION_AREA into the nets because they
+ * are *ONLY* used for path searching. No need to call  InitLists ()
+ */
+	rb->came_from = src_edge->expand_dir;
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_EXPANSION_BOXES)
+	showroutebox(rb);
+#endif /* ROUTE_DEBUG && DEBUG_SHOW_EXPANSION_BOXES */
+	return rb;
+}
+
+/*------ Expand ------*/
+struct E_result {
+	routebox_t *parent;
+	routebox_t *n, *e, *s, *w;
+	pcb_coord_t keep, bloat;
+	pcb_box_t inflated, orig;
+	int done;
+};
+
+/* test method for Expand()
+ * this routebox potentially is a blocker limiting expansion
+ * if this is so, we limit the inflate box so another exactly
+ * like it wouldn't be seen. We do this while keep the inflated
+ * box as large as possible.
+ */
+static pcb_r_dir_t __Expand_this_rect(const pcb_box_t * box, void *cl)
+{
+	struct E_result *res = (struct E_result *) cl;
+	routebox_t *rb = (routebox_t *) box;
+	pcb_box_t rbox;
+	pcb_coord_t dn, de, ds, dw, bloat;
+
+	/* we don't see conflicts already encountered */
+	if (rb->flags.touched)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* The inflated box outer edges include its own
+	 * track width plus its own clearance.
+	 *
+	 * To check for intersection, we need to expand
+	 * anything with greater clearance by its excess
+	 * clearance.
+	 *
+	 * If something has nobloat then we need to shrink
+	 * the inflated box back and see if it still touches.
+	 */
+
+	if (rb->flags.nobloat) {
+		rbox = rb->sbox;
+		bloat = res->bloat;
+		if (rbox.X2 <= res->inflated.X1 + bloat ||
+				rbox.X1 >= res->inflated.X2 - bloat || rbox.Y1 >= res->inflated.Y2 - bloat || rbox.Y2 <= res->inflated.Y1 + bloat)
+			return PCB_R_DIR_NOT_FOUND;									/* doesn't touch */
+	}
+	else {
+		if (rb->style->Clearance > res->keep)
+			rbox = pcb_bloat_box(&rb->sbox, rb->style->Clearance - res->keep);
+		else
+			rbox = rb->sbox;
+
+		if (rbox.X2 <= res->inflated.X1 || rbox.X1 >= res->inflated.X2
+				|| rbox.Y1 >= res->inflated.Y2 || rbox.Y2 <= res->inflated.Y1)
+			return PCB_R_DIR_NOT_FOUND;									/* doesn't touch */
+		bloat = 0;
+	}
+
+	/* this is an intersecting box; it has to jump through a few more hoops */
+	if (rb == res->parent || rb->parent.expansion_area == res->parent)
+		return PCB_R_DIR_NOT_FOUND;										/* don't see what we came from */
+
+	/* if we are expanding a source edge, don't let other sources
+	 * or their expansions stop us.
+	 */
+#if 1
+	if (res->parent->flags.source)
+		if (rb->flags.source || (rb->type == EXPANSION_AREA && rb->parent.expansion_area->flags.source))
+			return PCB_R_DIR_NOT_FOUND;
+#endif
+
+	/* we ignore via expansion boxes because maybe its
+	 * cheaper to get there without the via through
+	 * the path we're exploring  now.
+	 */
+	if (rb->flags.is_via && rb->type == EXPANSION_AREA)
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (rb->type == PLANE) {			/* expanding inside a plane is not good */
+		if (rbox.X1 < res->orig.X1 && rbox.X2 > res->orig.X2 && rbox.Y1 < res->orig.Y1 && rbox.Y2 > res->orig.Y2) {
+			res->inflated = pcb_bloat_box(&res->orig, res->bloat);
+			return PCB_R_DIR_FOUND_CONTINUE;
+		}
+	}
+	/* calculate the distances from original box to this blocker */
+	dn = de = ds = dw = 0;
+	if (!(res->done & _NORTH) && rbox.Y1 <= res->orig.Y1 && rbox.Y2 > res->inflated.Y1)
+		dn = res->orig.Y1 - rbox.Y2;
+	if (!(res->done & _EAST) && rbox.X2 >= res->orig.X2 && rbox.X1 < res->inflated.X2)
+		de = rbox.X1 - res->orig.X2;
+	if (!(res->done & _SOUTH) && rbox.Y2 >= res->orig.Y2 && rbox.Y1 < res->inflated.Y2)
+		ds = rbox.Y1 - res->orig.Y2;
+	if (!(res->done & _WEST) && rbox.X1 <= res->orig.X1 && rbox.X2 > res->inflated.X1)
+		dw = res->orig.X1 - rbox.X2;
+	if (dn <= 0 && de <= 0 && ds <= 0 && dw <= 0)
+		return PCB_R_DIR_FOUND_CONTINUE;
+	/* now shrink the inflated box to the largest blocking direction */
+	if (dn >= de && dn >= ds && dn >= dw) {
+		res->inflated.Y1 = rbox.Y2 - bloat;
+		res->n = rb;
+	}
+	else if (de >= ds && de >= dw) {
+		res->inflated.X2 = rbox.X1 + bloat;
+		res->e = rb;
+	}
+	else if (ds >= dw) {
+		res->inflated.Y2 = rbox.Y1 + bloat;
+		res->s = rb;
+	}
+	else {
+		res->inflated.X1 = rbox.X2 - bloat;
+		res->w = rb;
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_bool boink_box(routebox_t * rb, struct E_result *res, pcb_direction_t dir)
+{
+	pcb_coord_t bloat;
+	if (rb->style->Clearance > res->keep)
+		bloat = res->keep - rb->style->Clearance;
+	else
+		bloat = 0;
+	if (rb->flags.nobloat)
+		bloat = res->bloat;
+	switch (dir) {
+	case PCB_NORTH:
+	case PCB_SOUTH:
+		if (rb->sbox.X2 <= res->inflated.X1 + bloat || rb->sbox.X1 >= res->inflated.X2 - bloat)
+			return pcb_false;
+		return pcb_true;
+	case PCB_EAST:
+	case PCB_WEST:
+		if (rb->sbox.Y1 >= res->inflated.Y2 - bloat || rb->sbox.Y2 <= res->inflated.Y1 + bloat)
+			return pcb_false;
+		return pcb_true;
+		break;
+	default:
+		assert(0);
+	}
+	return pcb_false;
+}
+
+/* main Expand routine.
+ *
+ * The expansion probe edge includes the clearance and half thickness
+ * as the search is performed in order to see everything relevant.
+ * The result is backed off by this amount before being returned.
+ * Targets (and other no-bloat routeboxes) go all the way to touching.
+ * This is accomplished by backing off the probe edge when checking
+ * for touch against such an object. Usually the expanding edge
+ * bumps into neighboring pins on the same device that require a
+ * clearance, preventing seeing a target immediately. Rather than await
+ * another expansion to actually touch the target, the edge breaker code
+ * looks past the clearance to see these targets even though they
+ * weren't actually touched in the expansion.
+ */
+struct E_result *Expand(pcb_rtree_t * rtree, edge_t * e, const pcb_box_t * box)
+{
+	static struct E_result ans;
+	int noshrink;									/* bit field of which edges to not shrink */
+
+	ans.bloat = AutoRouteParameters.bloat;
+	ans.orig = *box;
+	ans.n = ans.e = ans.s = ans.w = NULL;
+
+	/* the inflated box must be bloated in all directions that it might
+	 * hit something in order to guarantee that we see object in the
+	 * tree it might hit. The tree holds objects bloated by their own
+	 * clearance so we are guaranteed to honor that.
+	 */
+	switch (e->expand_dir) {
+	case PCB_ANY_DIR:
+		ans.inflated.X1 = (e->rb->came_from == PCB_EAST ? ans.orig.X1 : 0);
+		ans.inflated.Y1 = (e->rb->came_from == PCB_SOUTH ? ans.orig.Y1 : 0);
+		ans.inflated.X2 = (e->rb->came_from == PCB_WEST ? ans.orig.X2 : PCB->MaxWidth);
+		ans.inflated.Y2 = (e->rb->came_from == PCB_NORTH ? ans.orig.Y2 : PCB->MaxHeight);
+		if (e->rb->came_from == PCB_NORTH)
+			ans.done = noshrink = _SOUTH;
+		else if (e->rb->came_from == PCB_EAST)
+			ans.done = noshrink = _WEST;
+		else if (e->rb->came_from == PCB_SOUTH)
+			ans.done = noshrink = _NORTH;
+		else if (e->rb->came_from == PCB_WEST)
+			ans.done = noshrink = _EAST;
+		else
+			ans.done = noshrink = 0;
+		break;
+	case PCB_NORTH:
+		ans.done = _SOUTH + _EAST + _WEST;
+		noshrink = _SOUTH;
+		ans.inflated.X1 = box->X1 - ans.bloat;
+		ans.inflated.X2 = box->X2 + ans.bloat;
+		ans.inflated.Y2 = box->Y2;
+		ans.inflated.Y1 = 0;				/* far north */
+		break;
+	case PCB_NE:
+		ans.done = _SOUTH + _WEST;
+		noshrink = 0;
+		ans.inflated.X1 = box->X1 - ans.bloat;
+		ans.inflated.X2 = PCB->MaxWidth;
+		ans.inflated.Y2 = box->Y2 + ans.bloat;
+		ans.inflated.Y1 = 0;
+		break;
+	case PCB_EAST:
+		ans.done = _NORTH + _SOUTH + _WEST;
+		noshrink = _WEST;
+		ans.inflated.Y1 = box->Y1 - ans.bloat;
+		ans.inflated.Y2 = box->Y2 + ans.bloat;
+		ans.inflated.X1 = box->X1;
+		ans.inflated.X2 = PCB->MaxWidth;
+		break;
+	case PCB_SE:
+		ans.done = _NORTH + _WEST;
+		noshrink = 0;
+		ans.inflated.X1 = box->X1 - ans.bloat;
+		ans.inflated.X2 = PCB->MaxWidth;
+		ans.inflated.Y2 = PCB->MaxHeight;
+		ans.inflated.Y1 = box->Y1 - ans.bloat;
+		break;
+	case PCB_SOUTH:
+		ans.done = _NORTH + _EAST + _WEST;
+		noshrink = _NORTH;
+		ans.inflated.X1 = box->X1 - ans.bloat;
+		ans.inflated.X2 = box->X2 + ans.bloat;
+		ans.inflated.Y1 = box->Y1;
+		ans.inflated.Y2 = PCB->MaxHeight;
+		break;
+	case PCB_SW:
+		ans.done = _NORTH + _EAST;
+		noshrink = 0;
+		ans.inflated.X1 = 0;
+		ans.inflated.X2 = box->X2 + ans.bloat;
+		ans.inflated.Y2 = PCB->MaxHeight;
+		ans.inflated.Y1 = box->Y1 - ans.bloat;
+		break;
+	case PCB_WEST:
+		ans.done = _NORTH + _SOUTH + _EAST;
+		noshrink = _EAST;
+		ans.inflated.Y1 = box->Y1 - ans.bloat;
+		ans.inflated.Y2 = box->Y2 + ans.bloat;
+		ans.inflated.X1 = 0;
+		ans.inflated.X2 = box->X2;
+		break;
+	case PCB_NW:
+		ans.done = _SOUTH + _EAST;
+		noshrink = 0;
+		ans.inflated.X1 = 0;
+		ans.inflated.X2 = box->X2 + ans.bloat;
+		ans.inflated.Y2 = box->Y2 + ans.bloat;
+		ans.inflated.Y1 = 0;
+		break;
+	default:
+		noshrink = ans.done = 0;
+		assert(0);
+	}
+	ans.keep = e->rb->style->Clearance;
+	ans.parent = nonhomeless_parent(e->rb);
+	pcb_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL);
+/* because the overlaping boxes are found in random order, some blockers
+ * may have limited edges prematurely, so we check if the blockers realy
+ * are blocking, and make another try if not
+ */
+	if (ans.n && !boink_box(ans.n, &ans, PCB_NORTH))
+		ans.inflated.Y1 = 0;
+	else
+		ans.done |= _NORTH;
+	if (ans.e && !boink_box(ans.e, &ans, PCB_EAST))
+		ans.inflated.X2 = PCB->MaxWidth;
+	else
+		ans.done |= _EAST;
+	if (ans.s && !boink_box(ans.s, &ans, PCB_SOUTH))
+		ans.inflated.Y2 = PCB->MaxHeight;
+	else
+		ans.done |= _SOUTH;
+	if (ans.w && !boink_box(ans.w, &ans, PCB_WEST))
+		ans.inflated.X1 = 0;
+	else
+		ans.done |= _WEST;
+	if (ans.done != _NORTH + _EAST + _SOUTH + _WEST) {
+		pcb_r_search(rtree, &ans.inflated, NULL, __Expand_this_rect, &ans, NULL);
+	}
+	if ((noshrink & _NORTH) == 0)
+		ans.inflated.Y1 += ans.bloat;
+	if ((noshrink & _EAST) == 0)
+		ans.inflated.X2 -= ans.bloat;
+	if ((noshrink & _SOUTH) == 0)
+		ans.inflated.Y2 -= ans.bloat;
+	if ((noshrink & _WEST) == 0)
+		ans.inflated.X1 += ans.bloat;
+	return &ans;
+}
+
+/* blocker_to_heap puts the blockers into a heap so they
+ * can be retrieved in clockwise order. If a blocker
+ * is also a target, it gets put into the vector too.
+ * It returns 1 for any fixed blocker that is not part
+ * of this net and zero otherwise.
+ */
+static int blocker_to_heap(pcb_heap_t * heap, routebox_t * rb, pcb_box_t * box, pcb_direction_t dir)
+{
+	pcb_box_t b = rb->sbox;
+	if (rb->style->Clearance > AutoRouteParameters.style->Clearance)
+		b = pcb_bloat_box(&b, rb->style->Clearance - AutoRouteParameters.style->Clearance);
+	b = pcb_clip_box(&b, box);
+	assert(pcb_box_is_good(&b));
+	/* we want to look at the blockers clockwise around the box */
+	switch (dir) {
+		/* we need to use the other coordinate fraction to resolve
+		 * ties since we want the shorter of the furthest
+		 * first.
+		 */
+	case PCB_NORTH:
+		pcb_heap_insert(heap, b.X1 - b.X1 / (b.X2 + 1.0), rb);
+		break;
+	case PCB_EAST:
+		pcb_heap_insert(heap, b.Y1 - b.Y1 / (b.Y2 + 1.0), rb);
+		break;
+	case PCB_SOUTH:
+		pcb_heap_insert(heap, -(b.X2 + b.X1 / (b.X2 + 1.0)), rb);
+		break;
+	case PCB_WEST:
+		pcb_heap_insert(heap, -(b.Y2 + b.Y1 / (b.Y2 + 1.0)), rb);
+		break;
+	default:
+		assert(0);
+	}
+	if (rb->flags.fixed && !rb->flags.target && !rb->flags.source)
+		return 1;
+	return 0;
+}
+
+/* this creates an EXPANSION_AREA to bridge small gaps or,
+ * (more commonly) create a supper-thin box to provide a
+ * home for an expansion edge.
+ */
+static routebox_t *CreateBridge(const pcb_box_t * area, routebox_t * parent, pcb_direction_t dir)
+{
+	routebox_t *rb = (routebox_t *) malloc(sizeof(*rb));
+	memset((void *) rb, 0, sizeof(*rb));
+	assert(area && parent);
+	init_const_box(rb, area->X1, area->Y1, area->X2, area->Y2, 0);
+	rb->group = parent->group;
+	rb->type = EXPANSION_AREA;
+	rb->came_from = dir;
+	rb->cost_point = pcb_closest_pcb_point_in_box(&parent->cost_point, area);
+	rb->cost = parent->cost + pcb_cost_to_point_on_layer(&parent->cost_point, &rb->cost_point, rb->group);
+	rb->parent.expansion_area = route_parent(parent);
+	if (rb->parent.expansion_area->flags.homeless)
+		RB_up_count(rb->parent.expansion_area);
+	rb->flags.homeless = 1;
+	rb->flags.nobloat = 1;
+	rb->style = parent->style;
+	rb->conflicts_with = parent->conflicts_with;
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_EDGES)
+	showroutebox(rb);
+#endif
+	return rb;
+}
+
+/* moveable_edge prepares the new search edges based on the
+ * starting box, direction and blocker if any.
+ */
+void
+moveable_edge(vector_t * result, const pcb_box_t * box, pcb_direction_t dir,
+							routebox_t * rb,
+							routebox_t * blocker, edge_t * e, pcb_rtree_t * targets,
+							routeone_state_t *s, pcb_rtree_t * tree, vector_t * area_vec)
+{
+	pcb_box_t b;
+	assert(pcb_box_is_good(box));
+	b = *box;
+	/* for the cardinal directions, move the box to overlap the
+	 * the parent by 1 unit. Corner expansions overlap more
+	 * and their starting boxes are pre-prepared.
+	 * Check if anything is headed off the board edges
+	 */
+	switch (dir) {
+	default:
+		break;
+	case PCB_NORTH:
+		b.Y2 = b.Y1;
+		b.Y1--;
+		if (b.Y1 <= AutoRouteParameters.bloat)
+			return;										/* off board edge */
+		break;
+	case PCB_EAST:
+		b.X1 = b.X2;
+		b.X2++;
+		if (b.X2 >= PCB->MaxWidth - AutoRouteParameters.bloat)
+			return;										/* off board edge */
+		break;
+	case PCB_SOUTH:
+		b.Y1 = b.Y2;
+		b.Y2++;
+		if (b.Y2 >= PCB->MaxHeight - AutoRouteParameters.bloat)
+			return;										/* off board edge */
+		break;
+	case PCB_WEST:
+		b.X2 = b.X1;
+		b.X1--;
+		if (b.X1 <= AutoRouteParameters.bloat)
+			return;										/* off board edge */
+		break;
+	case PCB_NE:
+		if (b.Y1 <= AutoRouteParameters.bloat + 1 && b.X2 >= PCB->MaxWidth - AutoRouteParameters.bloat - 1)
+			return;										/* off board edge */
+		if (b.Y1 <= AutoRouteParameters.bloat + 1)
+			dir = PCB_EAST;								/* north off board edge */
+		if (b.X2 >= PCB->MaxWidth - AutoRouteParameters.bloat - 1)
+			dir = PCB_NORTH;							/* east off board edge */
+		break;
+	case PCB_SE:
+		if (b.Y2 >= PCB->MaxHeight - AutoRouteParameters.bloat - 1 && b.X2 >= PCB->MaxWidth - AutoRouteParameters.bloat - 1)
+			return;										/* off board edge */
+		if (b.Y2 >= PCB->MaxHeight - AutoRouteParameters.bloat - 1)
+			dir = PCB_EAST;								/* south off board edge */
+		if (b.X2 >= PCB->MaxWidth - AutoRouteParameters.bloat - 1)
+			dir = PCB_SOUTH;							/* east off board edge */
+		break;
+	case PCB_SW:
+		if (b.Y2 >= PCB->MaxHeight - AutoRouteParameters.bloat - 1 && b.X1 <= AutoRouteParameters.bloat + 1)
+			return;										/* off board edge */
+		if (b.Y2 >= PCB->MaxHeight - AutoRouteParameters.bloat - 1)
+			dir = PCB_WEST;								/* south off board edge */
+		if (b.X1 <= AutoRouteParameters.bloat + 1)
+			dir = PCB_SOUTH;							/* west off board edge */
+		break;
+	case PCB_NW:
+		if (b.Y1 <= AutoRouteParameters.bloat + 1 && b.X1 <= AutoRouteParameters.bloat + 1)
+			return;										/* off board edge */
+		if (b.Y1 <= AutoRouteParameters.bloat + 1)
+			dir = PCB_WEST;								/* north off board edge */
+		if (b.X1 <= AutoRouteParameters.bloat + 1)
+			dir = PCB_NORTH;							/* west off board edge */
+		break;
+	}
+
+	if (!blocker) {
+		edge_t *ne;
+		routebox_t *nrb = CreateBridge(&b, rb, dir);
+		/* move the cost point in corner expansions
+		 * these boxes are bigger, so move close to the target
+		 */
+		if (dir == PCB_NE || dir == PCB_SE || dir == PCB_SW || dir == PCB_NW) {
+			pcb_cheap_point_t p;
+			p = pcb_closest_pcb_point_in_box(&nrb->cost_point, &e->minpcb_cost_target->sbox);
+			p = pcb_closest_pcb_point_in_box(&p, &b);
+			nrb->cost += pcb_cost_to_point_on_layer(&p, &nrb->cost_point, nrb->group);
+			nrb->cost_point = p;
+		}
+		ne = CreateEdge(nrb, nrb->cost_point.X, nrb->cost_point.Y, nrb->cost, NULL, dir, targets);
+		vector_append(result, ne);
+	}
+	else if (AutoRouteParameters.with_conflicts && !blocker->flags.target
+					 && !blocker->flags.fixed && !blocker->flags.touched && !blocker->flags.source && blocker->type != EXPANSION_AREA) {
+		edge_t *ne;
+		routebox_t *nrb;
+		/* make a bridge to the edge of the blocker
+		 * in all directions from there
+		 */
+		switch (dir) {
+		case PCB_NORTH:
+			b.Y1 = blocker->sbox.Y2 - 1;
+			break;
+		case PCB_EAST:
+			b.X2 = blocker->sbox.X1 + 1;
+			break;
+		case PCB_SOUTH:
+			b.Y2 = blocker->sbox.Y1 + 1;
+			break;
+		case PCB_WEST:
+			b.X1 = blocker->sbox.X2 - 1;
+			break;
+		default:
+			assert(0);
+		}
+		if (!pcb_box_is_good(&b))
+			return;										/* how did this happen ? */
+		nrb = CreateBridge(&b, rb, dir);
+		pcb_r_insert_entry(tree, &nrb->box);
+		vector_append(area_vec, nrb);
+		nrb->flags.homeless = 0;		/* not homeless any more */
+		/* mark this one as conflicted */
+		path_conflicts(nrb, blocker, pcb_true);
+		/* and make an expansion edge */
+		nrb->cost_point = pcb_closest_pcb_point_in_box(&nrb->cost_point, &blocker->sbox);
+		nrb->cost +=
+			pcb_cost_to_point_on_layer(&nrb->parent.expansion_area->cost_point, &nrb->cost_point, nrb->group) * CONFLICT_PENALTY(blocker);
+
+		ne = CreateEdge(nrb, nrb->cost_point.X, nrb->cost_point.Y, nrb->cost, NULL, PCB_ANY_DIR, targets);
+		ne->flags.is_interior = 1;
+		vector_append(result, ne);
+	}
+#if 1
+	else if (blocker->type == EXPANSION_AREA) {
+		if (blocker->cost < rb->cost || blocker->cost <= rb->cost +
+				pcb_cost_to_point_on_layer(&blocker->cost_point, &rb->cost_point, rb->group))
+			return;
+		if (blocker->conflicts_with || rb->conflicts_with)
+			return;
+		/* does the blocker overlap this routebox ?? */
+		/* does this re-parenting operation leave a memory leak? */
+		if (blocker->parent.expansion_area->flags.homeless)
+			RB_down_count(blocker->parent.expansion_area);
+		blocker->parent.expansion_area = rb;
+		return;
+	}
+#endif
+	else if (blocker->flags.target) {
+		routebox_t *nrb;
+		edge_t *ne;
+		b = pcb_bloat_box(&b, 1);
+		if (!pcb_box_intersect(&b, &blocker->sbox)) {
+			/* if the expansion edge stopped before touching, expand the bridge */
+			switch (dir) {
+			case PCB_NORTH:
+				b.Y1 -= AutoRouteParameters.bloat + 1;
+				break;
+			case PCB_EAST:
+				b.X2 += AutoRouteParameters.bloat + 1;
+				break;
+			case PCB_SOUTH:
+				b.Y2 += AutoRouteParameters.bloat + 1;
+				break;
+			case PCB_WEST:
+				b.X1 -= AutoRouteParameters.bloat + 1;
+				break;
+			default:
+				assert(0);
+			}
+		}
+		assert(pcb_box_intersect(&b, &blocker->sbox));
+		b = pcb_shrink_box(&b, 1);
+		nrb = CreateBridge(&b, rb, dir);
+		pcb_r_insert_entry(tree, &nrb->box);
+		vector_append(area_vec, nrb);
+		nrb->flags.homeless = 0;		/* not homeless any more */
+		ne = CreateEdge(nrb, nrb->cost_point.X, nrb->cost_point.Y, nrb->cost, blocker, dir, NULL);
+		best_path_candidate(s, ne, blocker);
+		DestroyEdge(&ne);
+	}
+}
+
+struct break_info {
+	pcb_heap_t *heap;
+	routebox_t *parent;
+	pcb_box_t box;
+	pcb_direction_t dir;
+	pcb_bool ignore_source;
+};
+
+static pcb_r_dir_t __GatherBlockers(const pcb_box_t * box, void *cl)
+{
+	routebox_t *rb = (routebox_t *) box;
+	struct break_info *bi = (struct break_info *) cl;
+	pcb_box_t b;
+
+	if (bi->parent == rb || rb->flags.touched || bi->parent->parent.expansion_area == rb)
+		return PCB_R_DIR_NOT_FOUND;
+	if (rb->flags.source && bi->ignore_source)
+		return PCB_R_DIR_NOT_FOUND;
+	b = rb->sbox;
+	if (rb->style->Clearance > AutoRouteParameters.style->Clearance)
+		b = pcb_bloat_box(&b, rb->style->Clearance - AutoRouteParameters.style->Clearance);
+	if (b.X2 <= bi->box.X1 || b.X1 >= bi->box.X2 || b.Y1 >= bi->box.Y2 || b.Y2 <= bi->box.Y1)
+		return PCB_R_DIR_NOT_FOUND;
+	if (blocker_to_heap(bi->heap, rb, &bi->box, bi->dir))
+		return PCB_R_DIR_FOUND_CONTINUE;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+/* shrink the box to the last limit for the previous direction,
+ * i.e. if dir is SOUTH, then this means fixing up an EAST leftover
+ * edge, which would be the southern most edge for that example.
+ */
+static inline pcb_box_t previous_edge(pcb_coord_t last, pcb_direction_t i, const pcb_box_t * b)
+{
+	pcb_box_t db = *b;
+	switch (i) {
+	case PCB_EAST:
+		db.X1 = last;
+		break;
+	case PCB_SOUTH:
+		db.Y1 = last;
+		break;
+	case PCB_WEST:
+		db.X2 = last;
+		break;
+	default:
+		pcb_message(PCB_MSG_ERROR, "previous edge bogus direction!");
+		assert(0);
+	}
+	return db;
+}
+
+/* Break all the edges of the box that need breaking, handling
+ * targets as they are found, and putting any moveable edges
+ * in the return vector.
+ */
+vector_t *BreakManyEdges(routeone_state_t * s, pcb_rtree_t * targets, pcb_rtree_t * tree,
+												 vector_t * area_vec, struct E_result * ans, routebox_t * rb, edge_t * e)
+{
+	struct break_info bi;
+	vector_t *edges;
+	pcb_heap_t *heap[4];
+	pcb_coord_t first, last;
+	pcb_coord_t bloat;
+	pcb_direction_t dir;
+	routebox_t fake;
+
+	edges = vector_create();
+	bi.ignore_source = rb->parent.expansion_area->flags.source;
+	bi.parent = rb;
+	/* we add 2 to the bloat.
+	 * 1 will get us to the actual blocker that Expand() hit
+	 * but 1 more is needed because the new expansion edges
+	 * move out by 1 so they don't overlap their parents
+	 * this extra expansion could "trap" the edge if
+	 * there is a blocker 2 units from the original rb,
+	 * it is 1 unit from the new expansion edge which
+	 * would prevent expansion. So we want to break the
+	 * edge on it now to avoid the trap.
+	 */
+
+	bloat = AutoRouteParameters.bloat + 2;
+	/* for corner expansion, we need to have a fake blocker
+	 * to prevent expansion back where we came from since
+	 * we still need to break portions of all 4 edges
+	 */
+	if (e->expand_dir == PCB_NE || e->expand_dir == PCB_SE || e->expand_dir == PCB_SW || e->expand_dir == PCB_NW) {
+		pcb_box_t *fb = (pcb_box_t *) & fake.sbox;
+		memset(&fake, 0, sizeof(fake));
+		*fb = e->rb->sbox;
+		fake.flags.fixed = 1;				/* this stops expansion there */
+		fake.type = LINE;
+		fake.style = AutoRouteParameters.style;
+#ifndef NDEBUG
+		/* the routbox_is_good checker wants a lot more! */
+		fake.flags.inited = 1;
+		fb = (pcb_box_t *) & fake.box;
+		*fb = e->rb->sbox;
+		fake.same_net.next = fake.same_net.prev = &fake;
+		fake.same_subnet.next = fake.same_subnet.prev = &fake;
+		fake.original_subnet.next = fake.original_subnet.prev = &fake;
+		fake.different_net.next = fake.different_net.prev = &fake;
+#endif
+	}
+	/* gather all of the blockers in heaps so they can be accessed
+	 * in clockwise order, which allows finding corners that can
+	 * be expanded.
+	 */
+	for (dir = PCB_NORTH; dir <= PCB_WEST; dir = directionIncrement(dir)) {
+		int tmp;
+		/* don't break the edge we came from */
+		if (e->expand_dir != ((dir + 2) % 4)) {
+			heap[dir] = pcb_heap_create();
+			bi.box = pcb_bloat_box(&rb->sbox, bloat);
+			bi.heap = heap[dir];
+			bi.dir = dir;
+			/* convert to edge */
+			switch (dir) {
+			case PCB_NORTH:
+				bi.box.Y2 = bi.box.Y1 + bloat + 1;
+				/* for corner expansion, block the start edges and
+				 * limit the blocker search to only the new edge segment
+				 */
+				if (e->expand_dir == PCB_SE || e->expand_dir == PCB_SW)
+					blocker_to_heap(heap[dir], &fake, &bi.box, dir);
+				if (e->expand_dir == PCB_SE)
+					bi.box.X1 = e->rb->sbox.X2;
+				if (e->expand_dir == PCB_SW)
+					bi.box.X2 = e->rb->sbox.X1;
+				pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp);
+				rb->n = tmp;
+				break;
+			case PCB_EAST:
+				bi.box.X1 = bi.box.X2 - bloat - 1;
+				/* corner, same as above */
+				if (e->expand_dir == PCB_SW || e->expand_dir == PCB_NW)
+					blocker_to_heap(heap[dir], &fake, &bi.box, dir);
+				if (e->expand_dir == PCB_SW)
+					bi.box.Y1 = e->rb->sbox.Y2;
+				if (e->expand_dir == PCB_NW)
+					bi.box.Y2 = e->rb->sbox.Y1;
+				pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp);
+				rb->e = tmp;
+				break;
+			case PCB_SOUTH:
+				bi.box.Y1 = bi.box.Y2 - bloat - 1;
+				/* corner, same as above */
+				if (e->expand_dir == PCB_NE || e->expand_dir == PCB_NW)
+					blocker_to_heap(heap[dir], &fake, &bi.box, dir);
+				if (e->expand_dir == PCB_NE)
+					bi.box.X1 = e->rb->sbox.X2;
+				if (e->expand_dir == PCB_NW)
+					bi.box.X2 = e->rb->sbox.X1;
+				pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp);
+				rb->s = tmp;
+				break;
+			case PCB_WEST:
+				bi.box.X2 = bi.box.X1 + bloat + 1;
+				/* corner, same as above */
+				if (e->expand_dir == PCB_NE || e->expand_dir == PCB_SE)
+					blocker_to_heap(heap[dir], &fake, &bi.box, dir);
+				if (e->expand_dir == PCB_SE)
+					bi.box.Y1 = e->rb->sbox.Y2;
+				if (e->expand_dir == PCB_NE)
+					bi.box.Y2 = e->rb->sbox.Y1;
+				pcb_r_search(tree, &bi.box, NULL, __GatherBlockers, &bi, &tmp);
+				rb->w = tmp;
+				break;
+			default:
+				assert(0);
+			}
+		}
+		else
+			heap[dir] = NULL;
+	}
+#if 1
+	rb->cost += (rb->n + rb->e + rb->s + rb->w) * AutoRouteParameters.CongestionPenalty / box_area(rb->sbox);
+#endif
+/* now handle the blockers:
+ * Go around the expansion area clockwise (North->East->South->West)
+ * pulling blockers from the heap (which makes them come out in the right
+ * order). Break the edges on the blocker and make the segments and corners
+ * moveable as possible.
+ */
+	first = last = -1;
+	for (dir = PCB_NORTH; dir <= PCB_WEST; dir = directionIncrement(dir)) {
+		if (heap[dir] && !pcb_heap_is_empty(heap[dir])) {
+			/* pull the very first one out of the heap outside of the
+			 * heap loop because it is special; it can be part of a corner
+			 */
+			routebox_t *blk = (routebox_t *) pcb_heap_remove_smallest(heap[dir]);
+			pcb_box_t b = rb->sbox;
+			struct broken_boxes broke = break_box_edge(&b, dir, blk);
+			if (broke.is_valid_left) {
+				/* if last > 0, then the previous edge had a segment
+				 * joining this one, so it forms a valid corner expansion
+				 */
+				if (last > 0) {
+					/* make a corner expansion */
+					pcb_box_t db = b;
+					switch (dir) {
+					case PCB_EAST:
+						/* possible NE expansion */
+						db.X1 = last;
+						db.Y2 = MIN(db.Y2, broke.left.Y2);
+						break;
+					case PCB_SOUTH:
+						/* possible SE expansion */
+						db.Y1 = last;
+						db.X1 = MAX(db.X1, broke.left.X1);
+						break;
+					case PCB_WEST:
+						/* possible SW expansion */
+						db.X2 = last;
+						db.Y1 = MAX(db.Y1, broke.left.Y1);
+						break;
+					default:
+						assert(0);
+						break;
+					}
+					moveable_edge(edges, &db, (pcb_direction_t) (dir + 3), rb, NULL, e, targets, s, NULL, NULL);
+				}
+				else if (dir == PCB_NORTH) {	/* north is start, so nothing "before" it */
+					/* save for a possible corner once we've
+					 * finished circling the box
+					 */
+					first = MAX(b.X1, broke.left.X2);
+				}
+				else {
+					/* this is just a boring straight expansion
+					 * since the orthogonal segment was blocked
+					 */
+					moveable_edge(edges, &broke.left, dir, rb, NULL, e, targets, s, NULL, NULL);
+				}
+			}													/* broke.is_valid_left */
+			else if (last > 0) {
+				/* if the last one didn't become a corner,
+				 * we still want to expand it straight out
+				 * in the direction of the previous edge,
+				 * which it belongs to.
+				 */
+				pcb_box_t db = previous_edge(last, dir, &rb->sbox);
+				moveable_edge(edges, &db, (pcb_direction_t) (dir - 1), rb, NULL, e, targets, s, NULL, NULL);
+			}
+			if (broke.is_valid_center && !blk->flags.source)
+				moveable_edge(edges, &broke.center, dir, rb, blk, e, targets, s, tree, area_vec);
+			/* this is the heap extraction loop. We break out
+			 * if there's nothing left in the heap, but if we * are blocked all the way to the far edge, we can
+			 * just leave stuff in the heap when it is destroyed
+			 */
+			while (broke.is_valid_right) {
+				/* move the box edge to the next potential free point */
+				switch (dir) {
+				case PCB_NORTH:
+					last = b.X1 = MAX(broke.right.X1, b.X1);
+					break;
+				case PCB_EAST:
+					last = b.Y1 = MAX(broke.right.Y1, b.Y1);
+					break;
+				case PCB_SOUTH:
+					last = b.X2 = MIN(broke.right.X2, b.X2);
+					break;
+				case PCB_WEST:
+					last = b.Y2 = MIN(broke.right.Y2, b.Y2);
+					break;
+				default:
+					assert(0);
+				}
+				if (pcb_heap_is_empty(heap[dir]))
+					break;
+				blk = (routebox_t *) pcb_heap_remove_smallest(heap[dir]);
+				broke = break_box_edge(&b, dir, blk);
+				if (broke.is_valid_left)
+					moveable_edge(edges, &broke.left, dir, rb, NULL, e, targets, s, NULL, NULL);
+				if (broke.is_valid_center && !blk->flags.source)
+					moveable_edge(edges, &broke.center, dir, rb, blk, e, targets, s, tree, area_vec);
+			}
+			if (!broke.is_valid_right)
+				last = -1;
+		}
+		else {											/* if (heap[dir]) */
+
+			/* nothing touched this edge! Expand the whole edge unless
+			 * (1) it hit the board edge or (2) was the source of our expansion
+			 *
+			 * for this case (of hitting nothing) we give up trying for corner
+			 * expansions because it is likely that they're not possible anyway
+			 */
+			if ((e->expand_dir == PCB_ANY_DIR ? e->rb->came_from : e->expand_dir) != ((dir + 2) % 4)) {
+				/* ok, we are not going back on ourselves, and the whole edge seems free */
+				moveable_edge(edges, &rb->sbox, dir, rb, NULL, e, targets, s, NULL, NULL);
+			}
+
+			if (last > 0) {
+				/* expand the leftover from the prior direction */
+				pcb_box_t db = previous_edge(last, dir, &rb->sbox);
+				moveable_edge(edges, &db, (pcb_direction_t) (dir - 1), rb, NULL, e, targets, s, NULL, NULL);
+			}
+			last = -1;
+		}
+	}															/* for loop */
+	/* finally, check for the NW corner now that we've come full circle */
+	if (first > 0 && last > 0) {
+		pcb_box_t db = rb->sbox;
+		db.X2 = first;
+		db.Y2 = last;
+		moveable_edge(edges, &db, PCB_NW, rb, NULL, e, targets, s, NULL, NULL);
+	}
+	else {
+		if (first > 0) {
+			pcb_box_t db = rb->sbox;
+			db.X2 = first;
+			moveable_edge(edges, &db, PCB_NORTH, rb, NULL, e, targets, s, NULL, NULL);
+		}
+		else if (last > 0) {
+			pcb_box_t db = rb->sbox;
+			db.Y2 = last;
+			moveable_edge(edges, &db, PCB_WEST, rb, NULL, e, targets, s, NULL, NULL);
+		}
+	}
+	/* done with all expansion edges of this box */
+	for (dir = PCB_NORTH; dir <= PCB_WEST; dir = directionIncrement(dir)) {
+		if (heap[dir])
+			pcb_heap_destroy(&heap[dir]);
+	}
+	return edges;
+}
+
+static routebox_t *rb_source(routebox_t * rb)
+{
+	while (rb && !rb->flags.source) {
+		assert(rb->type == EXPANSION_AREA);
+		rb = rb->parent.expansion_area;
+	}
+	assert(rb);
+	return rb;
+}
+
+/* ------------ */
+
+struct foib_info {
+	const pcb_box_t *box;
+	routebox_t *intersect;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t foib_rect_in_reg(const pcb_box_t * box, void *cl)
+{
+	struct foib_info *foib = (struct foib_info *) cl;
+	pcb_box_t rbox;
+	routebox_t *rb = (routebox_t *) box;
+	if (rb->flags.touched)
+		return PCB_R_DIR_NOT_FOUND;
+/*  if (rb->type == EXPANSION_AREA && !rb->flags.is_via)*/
+	/*   return PCB_R_DIR_NOT_FOUND; */
+	rbox = bloat_routebox(rb);
+	if (!pcb_box_intersect(&rbox, foib->box))
+		return PCB_R_DIR_NOT_FOUND;
+	/* this is an intersector! */
+	foib->intersect = (routebox_t *) box;
+	longjmp(foib->env, 1);				/* skip to the end! */
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static routebox_t *FindOneInBox(pcb_rtree_t * rtree, routebox_t * rb)
+{
+	struct foib_info foib;
+	pcb_box_t r;
+
+	r = rb->sbox;
+	foib.box = &r;
+	foib.intersect = NULL;
+
+	if (setjmp(foib.env) == 0)
+		pcb_r_search(rtree, &r, NULL, foib_rect_in_reg, &foib, NULL);
+	return foib.intersect;
+}
+
+struct therm_info {
+	routebox_t *plane;
+	pcb_box_t query;
+	jmp_buf env;
+};
+static pcb_r_dir_t ftherm_rect_in_reg(const pcb_box_t * box, void *cl)
+{
+	routebox_t *rbox = (routebox_t *) box;
+	struct therm_info *ti = (struct therm_info *) cl;
+	pcb_box_t sq, sb;
+
+	if (rbox->type != TERM)
+		return PCB_R_DIR_NOT_FOUND;
+	if (rbox->group != ti->plane->group)
+		return PCB_R_DIR_NOT_FOUND;
+
+	sb = shrink_routebox(rbox);
+	switch (rbox->type) {
+	case TERM:
+	case VIA_SHADOW:
+		sq = pcb_shrink_box(&ti->query, rbox->style->Diameter);
+		if (!pcb_box_intersect(&sb, &sq))
+			return PCB_R_DIR_NOT_FOUND;
+		sb.X1 = PCB_BOX_CENTER_X(sb);
+		sb.Y1 = PCB_BOX_CENTER_Y(sb);
+		break;
+	default:
+		assert(0);
+	}
+	ti->plane = rbox;
+	longjmp(ti->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+/* check for a pin or via target that a polygon can just use a thermal to connect to */
+routebox_t *FindThermable(pcb_rtree_t * rtree, routebox_t * rb)
+{
+	struct therm_info info;
+
+	info.plane = rb;
+	info.query = shrink_routebox(rb);
+
+	if (setjmp(info.env) == 0) {
+		pcb_r_search(rtree, &info.query, NULL, ftherm_rect_in_reg, &info, NULL);
+		return NULL;
+	}
+	return info.plane;
+}
+
+/*--------------------------------------------------------------------
+ * Route-tracing code: once we've got a path of expansion boxes, trace
+ * a line through them to actually create the connection.
+ */
+static void RD_DrawThermal(routedata_t * rd, pcb_coord_t X, pcb_coord_t Y, pcb_cardinal_t group, pcb_cardinal_t layer, routebox_t * subnet, pcb_bool is_bad)
+{
+	routebox_t *rb;
+	rb = (routebox_t *) malloc(sizeof(*rb));
+	memset((void *) rb, 0, sizeof(*rb));
+	init_const_box(rb, X, Y, X + 1, Y + 1, 0);
+	rb->group = group;
+	rb->layer = layer;
+	rb->flags.fixed = 0;
+	rb->flags.is_bad = is_bad;
+	rb->flags.is_odd = AutoRouteParameters.is_odd;
+	rb->flags.circular = 0;
+	rb->style = AutoRouteParameters.style;
+	rb->type = THERMAL;
+	InitLists(rb);
+	MergeNets(rb, subnet, NET);
+	MergeNets(rb, subnet, SUBNET);
+	/* add it to the r-tree, this may be the whole route! */
+	pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box);
+	rb->flags.homeless = 0;
+}
+
+static void RD_DrawVia(routedata_t * rd, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t radius, routebox_t * subnet, pcb_bool is_bad)
+{
+	routebox_t *rb, *first_via = NULL;
+	int i;
+	int ka = AutoRouteParameters.style->Clearance;
+	pcb_pstk_t *live_via = NULL;
+
+	if (conf_core.editor.live_routing) {
+#warning padstack TODO: when style contains proto, remove this
+		live_via = pcb_pstk_new_compat_via(PCB->Data, X, Y, AutoRouteParameters.style->Hole, radius * 2, 2 * AutoRouteParameters.style->Clearance, 0, PCB_PSTK_COMPAT_ROUND, 1);
+		if (live_via != NULL)
+			pcb_pstk_invalidate_draw(live_via);
+	}
+
+	/* a via cuts through every layer group */
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		if (!is_layer_group_active[i])
+			continue;
+		rb = (routebox_t *) malloc(sizeof(*rb));
+		memset((void *) rb, 0, sizeof(*rb));
+		init_const_box(rb,
+									 /*X1 */ X - radius, /*Y1 */ Y - radius,
+									 /*X2 */ X + radius + 1, /*Y2 */ Y + radius + 1, ka);
+		rb->group = i;
+		rb->flags.fixed = 0;				/* indicates that not on PCB yet */
+		rb->flags.is_odd = AutoRouteParameters.is_odd;
+		rb->flags.is_bad = is_bad;
+		rb->came_from = PCB_ANY_DIR;
+		rb->flags.circular = pcb_true;
+		rb->style = AutoRouteParameters.style;
+		rb->pass = AutoRouteParameters.pass;
+		if (first_via == NULL) {
+			rb->type = VIA;
+			rb->parent.via = NULL;		/* indicates that not on PCB yet */
+			first_via = rb;
+			/* only add the first via to mtspace, not the shadows too */
+			mtspace_add(rd->mtspace, &rb->box, rb->flags.is_odd ? ODD : EVEN, rb->style->Clearance);
+		}
+		else {
+			rb->type = VIA_SHADOW;
+			rb->parent.via_shadow = first_via;
+		}
+		InitLists(rb);
+		/* add these to proper subnet. */
+		MergeNets(rb, subnet, NET);
+		MergeNets(rb, subnet, SUBNET);
+		assert(__routepcb_box_is_good(rb));
+		/* and add it to the r-tree! */
+		pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box);
+		rb->flags.homeless = 0;			/* not homeless anymore */
+		rb->livedraw_obj.via = live_via;
+	}
+}
+
+static void
+RD_DrawLine(routedata_t * rd,
+						pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2,
+						pcb_coord_t Y2, pcb_coord_t halfthick, pcb_cardinal_t group, routebox_t * subnet, pcb_bool is_bad, pcb_bool is_45)
+{
+	/* we hold the line in a queue to concatenate segments that
+	 * ajoin one another. That reduces the number of things in
+	 * the trees and allows conflict boxes to be larger, both of
+	 * which are really useful.
+	 */
+	static pcb_coord_t qX1 = -1, qY1, qX2, qY2;
+	static pcb_coord_t qhthick;
+	static pcb_cardinal_t qgroup;
+	static pcb_bool qis_45, qis_bad;
+	static routebox_t *qsn;
+
+	routebox_t *rb;
+	pcb_coord_t ka = AutoRouteParameters.style->Clearance;
+
+	/* don't draw zero-length segments. */
+	if (X1 == X2 && Y1 == Y2)
+		return;
+	if (qX1 == -1) {							/* first ever */
+		qX1 = X1;
+		qY1 = Y1;
+		qX2 = X2;
+		qY2 = Y2;
+		qhthick = halfthick;
+		qgroup = group;
+		qis_45 = is_45;
+		qis_bad = is_bad;
+		qsn = subnet;
+		return;
+	}
+	/* Check if the lines concatenat. We only check the
+	 * normal expected nextpoint=lastpoint condition
+	 */
+	if (X1 == qX2 && Y1 == qY2 && qhthick == halfthick && qgroup == group) {
+		if (qX1 == qX2 && X1 == X2) {	/* everybody on the same X here */
+			qY2 = Y2;
+			return;
+		}
+		if (qY1 == qY2 && Y1 == Y2) {	/* same Y all around */
+			qX2 = X2;
+			return;
+		}
+	}
+	/* dump the queue, no match here */
+	if (qX1 == -1)
+		return;											/* but not this! */
+	rb = (routebox_t *) malloc(sizeof(*rb));
+	memset((void *) rb, 0, sizeof(*rb));
+	assert(is_45 ? (PCB_ABS(qX2 - qX1) == PCB_ABS(qY2 - qY1))	/* line must be 45-degrees */
+				 : (qX1 == qX2 || qY1 == qY2) /* line must be ortho */ );
+	init_const_box(rb,
+								 /*X1 */ MIN(qX1, qX2) - qhthick,
+								 /*Y1 */ MIN(qY1, qY2) - qhthick,
+								 /*X2 */ MAX(qX1, qX2) + qhthick + 1,
+								 /*Y2 */ MAX(qY1, qY2) + qhthick + 1, ka);
+	rb->group = qgroup;
+	rb->type = LINE;
+	rb->line.x1 = qX1;
+	rb->line.x2 = qX2;
+	rb->line.y1 = qY1;
+	rb->line.y2 = qY2;
+	rb->parent.line = NULL;				/* indicates that not on PCB yet */
+	rb->flags.fixed = 0;					/* indicates that not on PCB yet */
+	rb->flags.is_odd = AutoRouteParameters.is_odd;
+	rb->flags.is_bad = qis_bad;
+	rb->came_from = PCB_ANY_DIR;
+	rb->flags.homeless = 0;				/* we're putting this in the tree */
+	rb->flags.nonstraight = qis_45;
+	rb->flags.bl_to_ur = ((qX2 >= qX1 && qY2 <= qY1)
+												|| (qX2 <= qX1 && qY2 >= qY1));
+	rb->style = AutoRouteParameters.style;
+	rb->pass = AutoRouteParameters.pass;
+	InitLists(rb);
+	/* add these to proper subnet. */
+	MergeNets(rb, qsn, NET);
+	MergeNets(rb, qsn, SUBNET);
+	assert(__routepcb_box_is_good(rb));
+	/* and add it to the r-tree! */
+	pcb_r_insert_entry(rd->layergrouptree[rb->group], &rb->box);
+
+	if (conf_core.editor.live_routing) {
+		pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.grp[rb->group].lid[0]);
+		pcb_line_t *line = pcb_line_new(layer, qX1, qY1, qX2, qY2,
+																					2 * qhthick, 0, pcb_flag_make(0));
+		rb->livedraw_obj.line = line;
+		if (line != NULL)
+			pcb_line_invalidate_draw(layer, line);
+	}
+
+	/* and to the via space structures */
+	if (AutoRouteParameters.use_vias)
+		mtspace_add(rd->mtspace, &rb->box, rb->flags.is_odd ? ODD : EVEN, rb->style->Clearance);
+	usedGroup[rb->group] = pcb_true;
+	/* and queue this one */
+	qX1 = X1;
+	qY1 = Y1;
+	qX2 = X2;
+	qY2 = Y2;
+	qhthick = halfthick;
+	qgroup = group;
+	qis_45 = is_45;
+	qis_bad = is_bad;
+	qsn = subnet;
+}
+
+static pcb_bool
+RD_DrawManhattanLine(routedata_t * rd,
+										 const pcb_box_t * box1, const pcb_box_t * box2,
+										 pcb_cheap_point_t start, pcb_cheap_point_t end,
+										 pcb_coord_t halfthick, pcb_cardinal_t group, routebox_t * subnet, pcb_bool is_bad, pcb_bool last_was_x)
+{
+	pcb_cheap_point_t knee = start;
+	if (end.X == start.X) {
+		RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false);
+		return pcb_false;
+	}
+	else if (end.Y == start.Y) {
+		RD_DrawLine(rd, start.X, start.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false);
+		return pcb_true;
+	}
+	/* find where knee belongs */
+	if (pcb_point_in_box(box1, end.X, start.Y)
+			|| pcb_point_in_box(box2, end.X, start.Y)) {
+		knee.X = end.X;
+		knee.Y = start.Y;
+	}
+	else {
+		knee.X = start.X;
+		knee.Y = end.Y;
+	}
+	if ((knee.X == end.X && !last_was_x) && (pcb_point_in_box(box1, start.X, end.Y)
+																					 || pcb_point_in_box(box2, start.X, end.Y))) {
+		knee.X = start.X;
+		knee.Y = end.Y;
+	}
+	assert(AutoRouteParameters.is_smoothing || pcb_point_in_closed_box(box1, knee.X, knee.Y)
+				 || pcb_point_in_closed_box(box2, knee.X, knee.Y));
+
+	if (1 || !AutoRouteParameters.is_smoothing) {
+		/* draw standard manhattan paths */
+		RD_DrawLine(rd, start.X, start.Y, knee.X, knee.Y, halfthick, group, subnet, is_bad, pcb_false);
+		RD_DrawLine(rd, knee.X, knee.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false);
+	}
+	else {
+		/* draw 45-degree path across knee */
+		pcb_coord_t len45 = MIN(PCB_ABS(start.X - end.X), PCB_ABS(start.Y - end.Y));
+		pcb_cheap_point_t kneestart = knee, kneeend = knee;
+		if (kneestart.X == start.X)
+			kneestart.Y += (kneestart.Y > start.Y) ? -len45 : len45;
+		else
+			kneestart.X += (kneestart.X > start.X) ? -len45 : len45;
+		if (kneeend.X == end.X)
+			kneeend.Y += (kneeend.Y > end.Y) ? -len45 : len45;
+		else
+			kneeend.X += (kneeend.X > end.X) ? -len45 : len45;
+		RD_DrawLine(rd, start.X, start.Y, kneestart.X, kneestart.Y, halfthick, group, subnet, is_bad, pcb_false);
+		RD_DrawLine(rd, kneestart.X, kneestart.Y, kneeend.X, kneeend.Y, halfthick, group, subnet, is_bad, pcb_true);
+		RD_DrawLine(rd, kneeend.X, kneeend.Y, end.X, end.Y, halfthick, group, subnet, is_bad, pcb_false);
+	}
+	return (knee.X != end.X);
+}
+
+/* for smoothing, don't pack traces to min clearance gratuitously */
+#if 0
+static void add_clearance(pcb_cheap_point_t * nextpoint, const pcb_box_t * b)
+{
+	if (nextpoint->X == b->X1) {
+		if (nextpoint->X + AutoRouteParameters.style->Clearance < (b->X1 + b->X2) / 2)
+			nextpoint->X += AutoRouteParameters.style->Clearance;
+		else
+			nextpoint->X = (b->X1 + b->X2) / 2;
+	}
+	else if (nextpoint->X == b->X2) {
+		if (nextpoint->X - AutoRouteParameters.style->Clearance > (b->X1 + b->X2) / 2)
+			nextpoint->X -= AutoRouteParameters.style->Clearance;
+		else
+			nextpoint->X = (b->X1 + b->X2) / 2;
+	}
+	else if (nextpoint->Y == b->Y1) {
+		if (nextpoint->Y + AutoRouteParameters.style->Clearance < (b->Y1 + b->Y2) / 2)
+			nextpoint->Y += AutoRouteParameters.style->Clearance;
+		else
+			nextpoint->Y = (b->Y1 + b->Y2) / 2;
+	}
+	else if (nextpoint->Y == b->Y2) {
+		if (nextpoint->Y - AutoRouteParameters.style->Clearance > (b->Y1 + b->Y2) / 2)
+			nextpoint->Y -= AutoRouteParameters.style->Clearance;
+		else
+			nextpoint->Y = (b->Y1 + b->Y2) / 2;
+	}
+}
+#endif
+
+/* This back-traces the expansion boxes along the best path
+ * it draws the lines that will make the actual path.
+ * during refinement passes, it should try to maximize the area
+ * for other tracks so routing completion is easier.
+ *
+ * during smoothing passes, it should try to make a better path,
+ * possibly using diagonals, etc. The path boxes are larger on
+ * average now so there is more possiblity to decide on a nice
+ * path. Any combination of lines and arcs is possible, so long
+ * as they don't poke more than half thick outside the path box.
+ */
+
+static void TracePath(routedata_t * rd, routebox_t * path, const routebox_t * target, routebox_t * subnet, pcb_bool is_bad)
+{
+	pcb_bool last_x = pcb_false;
+	pcb_coord_t halfwidth = HALF_THICK(AutoRouteParameters.style->Thick);
+	pcb_coord_t radius = HALF_THICK(AutoRouteParameters.style->Diameter);
+	pcb_cheap_point_t lastpoint, nextpoint;
+	routebox_t *lastpath;
+	pcb_box_t b;
+
+	assert(subnet->style == AutoRouteParameters.style);
+	/*XXX: because we round up odd thicknesses, there's the possibility that
+	 * a connecting line end-point might be 0.005 mil off the "real" edge.
+	 * don't worry about this because line *thicknesses* are always >= 0.01 mil. */
+
+	/* if we start with a thermal the target was a plane
+	 * or the target was a pin and the source a plane
+	 * in which case this thermal is the whole path
+	 */
+	if (path->flags.is_thermal) {
+		/* the target was a plane, so we need to find a good spot for the via
+		 * now. It's logical to place it close to the source box which
+		 * is where we're utlimately headed on this path. However, it
+		 * must reside in the plane as well as the via area too.
+		 */
+		nextpoint.X = PCB_BOX_CENTER_X(path->sbox);
+		nextpoint.Y = PCB_BOX_CENTER_Y(path->sbox);
+		if (path->parent.expansion_area->flags.is_via) {
+			TargetPoint(&nextpoint, rb_source(path));
+			/* nextpoint is the middle of the source terminal now */
+			b = pcb_clip_box(&path->sbox, &path->parent.expansion_area->sbox);
+			nextpoint = pcb_closest_pcb_point_in_box(&nextpoint, &b);
+			/* now it's in the via and plane near the source */
+		}
+		else {											/* no via coming, target must have been a pin */
+
+			assert(target->type == TERM);
+			TargetPoint(&nextpoint, target);
+		}
+		assert(pcb_point_in_box(&path->sbox, nextpoint.X, nextpoint.Y));
+		RD_DrawThermal(rd, nextpoint.X, nextpoint.Y, path->group, path->layer, subnet, is_bad);
+	}
+	else {
+		/* start from best place of target box */
+		lastpoint.X = PCB_BOX_CENTER_X(target->sbox);
+		lastpoint.Y = PCB_BOX_CENTER_Y(target->sbox);
+		TargetPoint(&lastpoint, target);
+		if (AutoRouteParameters.last_smooth && pcb_box_in_box(&path->sbox, &target->sbox))
+			path = path->parent.expansion_area;
+		b = path->sbox;
+		if (path->flags.circular)
+			b = pcb_shrink_box(&b, MIN(b.X2 - b.X1, b.Y2 - b.Y1) / 5);
+		nextpoint = pcb_closest_pcb_point_in_box(&lastpoint, &b);
+		if (AutoRouteParameters.last_smooth)
+			RD_DrawLine(rd, lastpoint.X, lastpoint.Y, nextpoint.X, nextpoint.Y, halfwidth, path->group, subnet, is_bad, pcb_true);
+		else
+			last_x = RD_DrawManhattanLine(rd, &target->sbox, &path->sbox,
+																		lastpoint, nextpoint, halfwidth, path->group, subnet, is_bad, last_x);
+	}
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_ROUTE_BOXES)
+	showroutebox(path);
+#if defined(ROUTE_VERBOSE)
+	pcb_printf("TRACEPOINT start %#mD\n", nextpoint.X, nextpoint.Y);
+#endif
+#endif
+
+	do {
+		lastpoint = nextpoint;
+		lastpath = path;
+		assert(path->type == EXPANSION_AREA);
+		path = path->parent.expansion_area;
+		b = path->sbox;
+		if (path->flags.circular)
+			b = pcb_shrink_box(&b, MIN(b.X2 - b.X1, b.Y2 - b.Y1) / 5);
+		assert(b.X1 != b.X2 && b.Y1 != b.Y2);	/* need someplace to put line! */
+		/* find point on path perimeter closest to last point */
+		/* if source terminal, try to hit a good place */
+		nextpoint = pcb_closest_pcb_point_in_box(&lastpoint, &b);
+#if 0
+		/* leave more clearance if this is a smoothing pass */
+		if (AutoRouteParameters.is_smoothing && (nextpoint.X != lastpoint.X || nextpoint.Y != lastpoint.Y))
+			add_clearance(&nextpoint, &b);
+#endif
+		if (path->flags.source && path->type != PLANE)
+			TargetPoint(&nextpoint, path);
+		assert(pcb_point_in_box(&lastpath->box, lastpoint.X, lastpoint.Y));
+		assert(pcb_point_in_box(&path->box, nextpoint.X, nextpoint.Y));
+#if defined(ROUTE_DEBUG_VERBOSE)
+		printf("TRACEPATH: ");
+		DumpRouteBox(path);
+		pcb_printf("TRACEPATH: point %#mD to point %#mD layer %d\n",
+							 lastpoint.X, lastpoint.Y, nextpoint.X, nextpoint.Y, path->group);
+#endif
+
+		/* draw orthogonal lines from lastpoint to nextpoint */
+		/* knee is placed in lastpath box */
+		/* should never cause line to leave union of lastpath/path boxes */
+		if (AutoRouteParameters.last_smooth)
+			RD_DrawLine(rd, lastpoint.X, lastpoint.Y, nextpoint.X, nextpoint.Y, halfwidth, path->group, subnet, is_bad, pcb_true);
+		else
+			last_x = RD_DrawManhattanLine(rd, &lastpath->sbox, &path->sbox,
+																		lastpoint, nextpoint, halfwidth, path->group, subnet, is_bad, last_x);
+		if (path->flags.is_via) {		/* if via, then add via */
+#ifdef ROUTE_VERBOSE
+			printf(" (vias)");
+#endif
+			assert(pcb_point_in_box(&path->box, nextpoint.X, nextpoint.Y));
+			RD_DrawVia(rd, nextpoint.X, nextpoint.Y, radius, subnet, is_bad);
+		}
+
+		assert(lastpath->flags.is_via || path->group == lastpath->group);
+
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_ROUTE_BOXES)
+		showroutebox(path);
+#endif /* ROUTE_DEBUG && DEBUG_SHOW_ROUTE_BOXES */
+		/* if this is connected to a plane, draw the thermal */
+		if (path->flags.is_thermal || path->type == PLANE)
+			RD_DrawThermal(rd, lastpoint.X, lastpoint.Y, path->group, path->layer, subnet, is_bad);
+		/* when one hop from the source, make an extra path in *this* box */
+		if (path->type == EXPANSION_AREA && path->parent.expansion_area->flags.source && path->parent.expansion_area->type != PLANE) {
+			/* find special point on source (if it exists) */
+			if (TargetPoint(&lastpoint, path->parent.expansion_area)) {
+				lastpoint = closest_point_in_routebox(&lastpoint, path);
+				b = shrink_routebox(path);
+#if 0
+				if (AutoRouteParameters.is_smoothing)
+					add_clearance(&lastpoint, &b);
+#else
+				if (AutoRouteParameters.last_smooth)
+					RD_DrawLine(rd, lastpoint.X, lastpoint.Y, nextpoint.X, nextpoint.Y, halfwidth, path->group, subnet, is_bad, pcb_true);
+				else
+#endif
+					last_x = RD_DrawManhattanLine(rd, &b, &b, nextpoint, lastpoint, halfwidth, path->group, subnet, is_bad, last_x);
+#if defined(ROUTE_DEBUG_VERBOSE)
+				printf("TRACEPATH: ");
+				DumpRouteBox(path);
+				pcb_printf
+					("TRACEPATH: (to source) point %#mD to point %#mD layer %d\n",
+					 nextpoint.X, nextpoint.Y, lastpoint.X, lastpoint.Y, path->group);
+#endif
+
+				nextpoint = lastpoint;
+			}
+		}
+	}
+	while (!path->flags.source);
+	/* flush the line queue */
+	RD_DrawLine(rd, -1, 0, 0, 0, 0, 0, NULL, pcb_false, pcb_false);
+
+	if (conf_core.editor.live_routing)
+		pcb_draw();
+
+#ifdef ROUTE_DEBUG
+	if (ddraw != NULL)
+		ddraw->flush_debug_draw();
+#endif
+}
+
+/* create a fake "edge" used to defer via site searching. */
+static void
+CreateSearchEdge(routeone_state_t *s, vetting_t * work, edge_t * parent,
+								 routebox_t * rb, conflict_t conflict, pcb_rtree_t * targets, pcb_bool in_plane)
+{
+	routebox_t *target;
+	pcb_box_t b;
+	pcb_cost_t cost;
+	assert(__routepcb_box_is_good(rb));
+	/* find the cheapest target */
+#if 0
+	target = minpcb_cost_target_to_point(&parent->cost_point, pcb_max_group(PCB) + 1, targets, parent->minpcb_cost_target);
+#else
+	target = parent->minpcb_cost_target;
+#endif
+	b = shrink_routebox(target);
+	cost = parent->pcb_cost_to_point + AutoRouteParameters.ViaCost + pcb_cost_to_layerless_box(&rb->cost_point, 0, &b);
+	if (cost < s->best_cost) {
+		edge_t *ne;
+		ne = (edge_t *) malloc(sizeof(*ne));
+		memset((void *) ne, 0, sizeof(*ne));
+		assert(ne);
+		ne->flags.via_search = 1;
+		ne->flags.in_plane = in_plane;
+		ne->rb = rb;
+		if (rb->flags.homeless)
+			RB_up_count(rb);
+		ne->work = work;
+		ne->minpcb_cost_target = target;
+		ne->flags.via_conflict_level = conflict;
+		ne->pcb_cost_to_point = parent->pcb_cost_to_point;
+		ne->cost_point = parent->cost_point;
+		ne->cost = cost;
+		pcb_heap_insert(s->workheap, ne->cost, ne);
+	}
+	else {
+		mtsFreeWork(&work);
+	}
+}
+
+static void add_or_destroy_edge(routeone_state_t *s, edge_t * e)
+{
+	e->cost = edge_cost(e, s->best_cost);
+	assert(__edge_is_good(e));
+	assert(is_layer_group_active[e->rb->group]);
+	if (e->cost < s->best_cost)
+		pcb_heap_insert(s->workheap, e->cost, e);
+	else
+		DestroyEdge(&e);
+}
+
+static void best_path_candidate(routeone_state_t *s, edge_t * e, routebox_t * best_target)
+{
+	e->cost = edge_cost(e, EXPENSIVE);
+	if (s->best_path == NULL || e->cost < s->best_cost) {
+#if defined(ROUTE_DEBUG) && defined (ROUTE_VERBOSE)
+		printf("New best path seen! cost = %f\n", e->cost);
+#endif
+		/* new best path! */
+		if (s->best_path && s->best_path->flags.homeless)
+			RB_down_count(s->best_path);
+		s->best_path = e->rb;
+		s->best_target = best_target;
+		s->best_cost = e->cost;
+		assert(s->best_cost >= 0);
+		/* don't free this when we destroy edge! */
+		if (s->best_path->flags.homeless)
+			RB_up_count(s->best_path);
+	}
+}
+
+
+/* vectors for via site candidates (see mtspace.h) */
+struct routeone_via_site_state {
+	vector_t *free_space_vec;
+	vector_t *lo_conflict_space_vec;
+	vector_t *hi_conflict_space_vec;
+};
+
+void
+add_via_sites(routeone_state_t *s,
+							struct routeone_via_site_state *vss,
+							mtspace_t * mtspace, routebox_t * within,
+							conflict_t within_conflict_level, edge_t * parent_edge, pcb_rtree_t * targets, pcb_coord_t shrink, pcb_bool in_plane)
+{
+	pcb_coord_t radius, clearance;
+	vetting_t *work;
+	pcb_box_t region = shrink_routebox(within);
+	pcb_shrink_box(&region, shrink);
+
+	radius = HALF_THICK(AutoRouteParameters.style->Diameter);
+	clearance = AutoRouteParameters.style->Clearance;
+	assert(AutoRouteParameters.use_vias);
+	/* XXX: need to clip 'within' to shrunk_pcb_bounds, because when
+	   XXX: routing with conflicts may poke over edge. */
+
+	/* ask for a via box near our cost_point first */
+	work = mtspace_query_rect(mtspace, &region, radius, clearance,
+														NULL, vss->free_space_vec,
+														vss->lo_conflict_space_vec,
+														vss->hi_conflict_space_vec,
+														AutoRouteParameters.is_odd, AutoRouteParameters.with_conflicts, &parent_edge->cost_point);
+	if (!work)
+		return;
+	CreateSearchEdge(s, work, parent_edge, within, within_conflict_level, targets, in_plane);
+}
+
+void
+do_via_search(edge_t * search, routeone_state_t *s,
+							struct routeone_via_site_state *vss, mtspace_t * mtspace, pcb_rtree_t * targets)
+{
+	int i, j, count = 0;
+	pcb_coord_t radius, clearance;
+	vetting_t *work;
+	routebox_t *within;
+	conflict_t within_conflict_level;
+
+	radius = HALF_THICK(AutoRouteParameters.style->Diameter);
+	clearance = AutoRouteParameters.style->Clearance;
+	work = mtspace_query_rect(mtspace, NULL, 0, 0,
+														search->work, vss->free_space_vec,
+														vss->lo_conflict_space_vec,
+														vss->hi_conflict_space_vec, AutoRouteParameters.is_odd, AutoRouteParameters.with_conflicts, NULL);
+	within = search->rb;
+	within_conflict_level = search->flags.via_conflict_level;
+	for (i = 0; i < 3; i++) {
+		vector_t *v =
+			(i == NO_CONFLICT ? vss->free_space_vec :
+			 i == LO_CONFLICT ? vss->lo_conflict_space_vec : i == HI_CONFLICT ? vss->hi_conflict_space_vec : NULL);
+		assert(v);
+		while (!vector_is_empty(v)) {
+			pcb_box_t cliparea;
+			pcb_box_t *area = (pcb_box_t *) vector_remove_last(v);
+			if (!(i == NO_CONFLICT || AutoRouteParameters.with_conflicts)) {
+				free(area);
+				continue;
+			}
+			/* answers are bloated by radius + clearance */
+			cliparea = pcb_shrink_box(area, radius + clearance);
+			pcb_close_box(&cliparea);
+			free(area);
+			assert(pcb_box_is_good(&cliparea));
+			count++;
+			for (j = 0; j < pcb_max_group(PCB); j++) {
+				edge_t *ne;
+				if (j == within->group || !is_layer_group_active[j])
+					continue;
+				ne = CreateViaEdge(&cliparea, j, within, search, within_conflict_level, (conflict_t) i, targets);
+				add_or_destroy_edge(s, ne);
+			}
+		}
+	}
+	/* prevent freeing of work when this edge is destroyed */
+	search->flags.via_search = 0;
+	if (!work)
+		return;
+	CreateSearchEdge(s, work, search, within, within_conflict_level, targets, search->flags.in_plane);
+	assert(vector_is_empty(vss->free_space_vec));
+	assert(vector_is_empty(vss->lo_conflict_space_vec));
+	assert(vector_is_empty(vss->hi_conflict_space_vec));
+}
+
+/* vector of expansion areas to be eventually removed from r-tree
+ * this is a global for troubleshooting
+ */
+vector_t *area_vec;
+
+/* some routines for use in gdb while debugging */
+#if defined(ROUTE_DEBUG)
+static void list_conflicts(routebox_t * rb)
+{
+	int i, n;
+	if (!rb->conflicts_with)
+		return;
+	n = vector_size(rb->conflicts_with);
+	for (i = 0; i < n; i++)
+		printf("%p, ", (void *)vector_element(rb->conflicts_with, i));
+}
+
+static void show_area_vec(int lay)
+{
+	int n, save;
+
+	if (!area_vec)
+		return;
+	save = showboxen;
+	showboxen = lay;
+	for (n = 0; n < vector_size(area_vec); n++) {
+		routebox_t *rb = (routebox_t *) vector_element(area_vec, n);
+		showroutebox(rb);
+	}
+	showboxen = save;
+}
+
+static pcb_bool net_id(routebox_t * rb, long int id)
+{
+	routebox_t *p;
+	LIST_LOOP(rb, same_net, p);
+	if (p->flags.source && p->parent.pad->ID == id)
+		return pcb_true;
+	PCB_END_LOOP;
+	return pcb_false;
+}
+
+static void trace_parents(routebox_t * rb)
+{
+	while (rb && rb->type == EXPANSION_AREA) {
+		printf(" %p ->", (void *)rb);
+		rb = rb->parent.expansion_area;
+	}
+	if (rb)
+		printf(" %p is source\n", (void *)rb);
+	else
+		printf("NULL!\n");
+}
+
+static void show_one(routebox_t * rb)
+{
+	int save = showboxen;
+	showboxen = -1;
+	showroutebox(rb);
+	showboxen = save;
+}
+
+static void show_path(routebox_t * rb)
+{
+	while (rb && rb->type == EXPANSION_AREA) {
+		show_one(rb);
+		rb = rb->parent.expansion_area;
+	}
+	show_one(rb);
+}
+
+static void show_sources(routebox_t * rb)
+{
+	routebox_t *p;
+	if (!rb->flags.source && !rb->flags.target) {
+		printf("start with a source or target please\n");
+		return;
+	}
+	LIST_LOOP(rb, same_net, p);
+	if (p->flags.source)
+		show_one(p);
+	PCB_END_LOOP;
+}
+
+#endif
+
+static pcb_r_dir_t __conflict_source(const pcb_box_t * box, void *cl)
+{
+	routebox_t *rb = (routebox_t *) box;
+	if (rb->flags.touched || rb->flags.fixed)
+		return PCB_R_DIR_NOT_FOUND;
+	else {
+		routebox_t *dis = (routebox_t *) cl;
+		path_conflicts(dis, rb, pcb_false);
+		touch_conflicts(dis->conflicts_with, 1);
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static void source_conflicts(pcb_rtree_t * tree, routebox_t * rb)
+{
+	if (!AutoRouteParameters.with_conflicts)
+		return;
+	pcb_r_search(tree, &rb->sbox, NULL, __conflict_source, rb, NULL);
+	touch_conflicts(NULL, 1);
+}
+
+typedef struct routeone_status_s {
+	pcb_bool found_route;
+	int route_had_conflicts;
+	pcb_cost_t best_route_cost;
+	pcb_bool net_completely_routed;
+} routeone_status_t;
+
+
+static routeone_status_t RouteOne(routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
+{
+	routeone_status_t result;
+	routebox_t *p;
+	int seen, i;
+	const pcb_box_t **target_list;
+	int num_targets;
+	pcb_rtree_t *targets;
+	/* vector of source edges for filtering */
+	vector_t *source_vec;
+	/* working vector */
+	vector_t *edge_vec;
+
+	routeone_state_t s;
+	struct routeone_via_site_state vss;
+
+	assert(rd && from);
+	result.route_had_conflicts = 0;
+	/* no targets on to/from net need clearance areas */
+	LIST_LOOP(from, same_net, p);
+	p->flags.nobloat = 1;
+	PCB_END_LOOP;
+	/* set 'source' flags */
+	LIST_LOOP(from, same_subnet, p);
+	if (!p->flags.nonstraight)
+		p->flags.source = 1;
+	PCB_END_LOOP;
+
+	/* count up the targets */
+	num_targets = 0;
+	seen = 0;
+	/* remove source/target flags from non-straight obstacles, because they
+	 * don't fill their bounding boxes and so connecting to them
+	 * after we've routed is problematic.  Better solution? */
+	if (to) {											/* if we're routing to a specific target */
+		if (!to->flags.source) {		/* not already connected */
+			/* check that 'to' and 'from' are on the same net */
+			seen = 0;
+#ifndef NDEBUG
+			LIST_LOOP(from, same_net, p);
+			if (p == to)
+				seen = 1;
+			PCB_END_LOOP;
+#endif
+			assert(seen);							/* otherwise from and to are on different nets! */
+			/* set target flags only on 'to's subnet */
+			LIST_LOOP(to, same_subnet, p);
+			if (!p->flags.nonstraight && is_layer_group_active[p->group]) {
+				p->flags.target = 1;
+				num_targets++;
+			}
+			PCB_END_LOOP;
+		}
+	}
+	else {
+		/* all nodes on the net but not connected to from are targets */
+		LIST_LOOP(from, same_net, p);
+		if (!p->flags.source && is_layer_group_active[p->group]
+				&& !p->flags.nonstraight) {
+			p->flags.target = 1;
+			num_targets++;
+		}
+		PCB_END_LOOP;
+	}
+
+	/* if no targets, then net is done!  reset flags and return. */
+	if (num_targets == 0) {
+		LIST_LOOP(from, same_net, p);
+		p->flags.source = p->flags.target = p->flags.nobloat = 0;
+		PCB_END_LOOP;
+		result.found_route = pcb_false;
+		result.net_completely_routed = pcb_true;
+		result.best_route_cost = 0;
+		result.route_had_conflicts = 0;
+
+		return result;
+	}
+	result.net_completely_routed = pcb_false;
+
+	/* okay, there's stuff to route */
+	assert(!from->flags.target);
+	assert(num_targets > 0);
+	/* create list of target pointers and from that a r-tree of targets */
+	target_list = (const pcb_box_t **) malloc(num_targets * sizeof(*target_list));
+	i = 0;
+	LIST_LOOP(from, same_net, p);
+	if (p->flags.target) {
+		target_list[i++] = &p->box;
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_TARGETS)
+		showroutebox(p);
+#endif
+	}
+	PCB_END_LOOP;
+	targets = pcb_r_create_tree();
+	pcb_r_insert_array(targets, (const pcb_box_t **)target_list, i);
+	assert(i <= num_targets);
+	free(target_list);
+
+	source_vec = vector_create();
+	/* touch the source subnet to prepare check for conflictors */
+	LIST_LOOP(from, same_subnet, p);
+	p->flags.touched = 1;
+	PCB_END_LOOP;
+	LIST_LOOP(from, same_subnet, p);
+	{
+		/* we need the test for 'source' because this box may be nonstraight */
+		if (p->flags.source && is_layer_group_active[p->group]) {
+			pcb_cheap_point_t cp;
+			edge_t *e;
+			pcb_box_t b = shrink_routebox(p);
+
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_SOURCES)
+			showroutebox(p);
+#endif
+			/* may expand in all directions from source; center edge cost point. */
+			/* note that planes shouldn't really expand, but we need an edge */
+
+			cp.X = PCB_BOX_CENTER_X(b);
+			cp.Y = PCB_BOX_CENTER_Y(b);
+			e = CreateEdge(p, cp.X, cp.Y, 0, NULL, PCB_ANY_DIR, targets);
+			cp = pcb_closest_pcb_point_in_box(&cp, &e->minpcb_cost_target->sbox);
+			cp = pcb_closest_pcb_point_in_box(&cp, &b);
+			e->cost_point = cp;
+			p->cost_point = cp;
+			source_conflicts(rd->layergrouptree[p->group], p);
+			vector_append(source_vec, e);
+		}
+	}
+	PCB_END_LOOP;
+	LIST_LOOP(from, same_subnet, p);
+	p->flags.touched = 0;
+	PCB_END_LOOP;
+	/* break source edges; some edges may be too near obstacles to be able
+	 * to exit from. */
+
+	/* okay, main expansion-search routing loop. */
+	/* set up the initial activity heap */
+	s.workheap = pcb_heap_create();
+	assert(s.workheap);
+	while (!vector_is_empty(source_vec)) {
+		edge_t *e = (edge_t *) vector_remove_last(source_vec);
+		assert(is_layer_group_active[e->rb->group]);
+		e->cost = edge_cost(e, EXPENSIVE);
+		pcb_heap_insert(s.workheap, e->cost, e);
+	}
+	vector_destroy(&source_vec);
+	/* okay, process items from heap until it is empty! */
+	s.best_path = NULL;
+	s.best_cost = EXPENSIVE;
+	area_vec = vector_create();
+	edge_vec = vector_create();
+	vss.free_space_vec = vector_create();
+	vss.lo_conflict_space_vec = vector_create();
+	vss.hi_conflict_space_vec = vector_create();
+	while (!pcb_heap_is_empty(s.workheap)) {
+		edge_t *e = (edge_t *) pcb_heap_remove_smallest(s.workheap);
+#ifdef ROUTE_DEBUG
+		if (aabort)
+			goto dontexpand;
+#endif
+		/* don't bother expanding this edge if the minimum possible edge cost
+		 * is already larger than the best edge cost we've found. */
+		if (s.best_path && e->cost >= s.best_cost) {
+			pcb_heap_free(s.workheap, KillEdge);
+			goto dontexpand;					/* skip this edge */
+		}
+		/* surprisingly it helps to give up and not try too hard to find
+		 * a route! This is not only faster, but results in better routing.
+		 * who would have guessed?
+		 */
+		if (seen++ > max_edges)
+			goto dontexpand;
+		assert(__edge_is_good(e));
+		/* mark or unmark conflictors as needed */
+		touch_conflicts(e->rb->conflicts_with, 1);
+		if (e->flags.via_search) {
+			do_via_search(e, &s, &vss, rd->mtspace, targets);
+			goto dontexpand;
+		}
+		/* we should never add edges on inactive layer groups to the heap. */
+		assert(is_layer_group_active[e->rb->group]);
+#if defined(ROUTE_DEBUG) && defined(DEBUG_SHOW_EXPANSION_BOXES)
+		/*showedge (e); */
+#endif
+		if (e->rb->flags.is_thermal) {
+			best_path_candidate(&s, e, e->minpcb_cost_target);
+			goto dontexpand;
+		}
+		/* for a plane, look for quick connections with thermals or vias */
+		if (e->rb->type == PLANE) {
+			routebox_t *pin = FindThermable(targets, e->rb);
+			if (pin) {
+				pcb_box_t b = shrink_routebox(pin);
+				edge_t *ne;
+				routebox_t *nrb;
+				assert(pin->flags.target);
+				nrb = CreateExpansionArea(&b, e->rb->group, e->rb, pcb_true, e);
+				nrb->flags.is_thermal = 1;
+				/* moving through the plane is free */
+				e->cost_point.X = b.X1;
+				e->cost_point.Y = b.Y1;
+				ne = CreateEdge2(nrb, e->expand_dir, e, NULL, pin);
+				best_path_candidate(&s, ne, pin);
+				DestroyEdge(&ne);
+			}
+			else {
+				/* add in possible via sites in plane */
+				if (AutoRouteParameters.use_vias && e->cost + AutoRouteParameters.ViaCost < s.best_cost) {
+					/* we need a giant thermal */
+					routebox_t *nrb = CreateExpansionArea(&e->rb->sbox, e->rb->group, e->rb,
+																								pcb_true, e);
+					edge_t *ne = CreateEdge2(nrb, e->expand_dir, e, NULL,
+																	 e->minpcb_cost_target);
+					nrb->flags.is_thermal = 1;
+					add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, ne, targets, e->rb->style->Diameter, pcb_true);
+				}
+			}
+			goto dontexpand;					/* planes only connect via thermals */
+		}
+		if (e->flags.is_via) {			/* special case via */
+			routebox_t *intersecting;
+			assert(AutoRouteParameters.use_vias);
+			assert(e->expand_dir == PCB_ANY_DIR);
+			assert(vector_is_empty(edge_vec));
+			/* if there is already something here on this layer (like an
+			 * EXPANSION_AREA), then we don't want to expand from here
+			 * at least not inside the expansion area. A PLANE on the
+			 * other hand may be a target, or not.
+			 */
+			intersecting = FindOneInBox(rd->layergrouptree[e->rb->group], e->rb);
+
+			if (intersecting && intersecting->flags.target && intersecting->type == PLANE) {
+				/* we have hit a plane */
+				edge_t *ne;
+				routebox_t *nrb;
+				pcb_box_t b = shrink_routebox(e->rb);
+				/* limit via region to that inside the plane */
+				pcb_clip_box(&b, &intersecting->sbox);
+				nrb = CreateExpansionArea(&b, e->rb->group, e->rb, pcb_true, e);
+				nrb->flags.is_thermal = 1;
+				ne = CreateEdge2(nrb, e->expand_dir, e, NULL, intersecting);
+				best_path_candidate(&s, ne, intersecting);
+				DestroyEdge(&ne);
+				goto dontexpand;
+			}
+			else if (intersecting == NULL) {
+				/* this via candidate is in an open area; add it to r-tree as
+				 * an expansion area */
+				assert(e->rb->type == EXPANSION_AREA && e->rb->flags.is_via);
+				/*assert (!pcb_r_search(rd->layergrouptree[e->rb->group],
+				   &e->rb->box, NULL, no_planes,0));
+				 */
+				pcb_r_insert_entry(rd->layergrouptree[e->rb->group], &e->rb->box);
+				e->rb->flags.homeless = 0;	/* not homeless any more */
+				/* add to vector of all expansion areas in r-tree */
+				vector_append(area_vec, e->rb);
+				/* mark reset refcount to 0, since this is not homeless any more. */
+				e->rb->refcount = 0;
+				/* go ahead and expand this edge! */
+			}
+			else if (1)
+				goto dontexpand;
+			else if (0) {							/* XXX: disabling this causes no via
+																   collisions. */
+				pcb_box_t a = bloat_routebox(intersecting), b;
+				edge_t *ne;
+				int i, j;
+				/* something intersects this via candidate.  split via candidate
+				 * into pieces and add these pieces to the workheap. */
+				for (i = 0; i < 3; i++) {
+					for (j = 0; j < 3; j++) {
+						b = shrink_routebox(e->rb);
+						switch (i) {
+						case 0:
+							b.X2 = MIN(b.X2, a.X1);
+							break;						/* left */
+						case 1:
+							b.X1 = MAX(b.X1, a.X1);
+							b.X2 = MIN(b.X2, a.X2);
+							break;						/*c */
+						case 2:
+							b.X1 = MAX(b.X1, a.X2);
+							break;						/* right */
+						default:
+							assert(0);
+						}
+						switch (j) {
+						case 0:
+							b.Y2 = MIN(b.Y2, a.Y1);
+							break;						/* top */
+						case 1:
+							b.Y1 = MAX(b.Y1, a.Y1);
+							b.Y2 = MIN(b.Y2, a.Y2);
+							break;						/*c */
+						case 2:
+							b.Y1 = MAX(b.Y1, a.Y2);
+							break;						/* bottom */
+						default:
+							assert(0);
+						}
+						/* skip if this box is not valid */
+						if (!(b.X1 < b.X2 && b.Y1 < b.Y2))
+							continue;
+						if (i == 1 && j == 1) {
+							/* this bit of the via space is obstructed. */
+							if (intersecting->type == EXPANSION_AREA || intersecting->flags.fixed)
+								continue;				/* skip this bit, it's already been done. */
+							/* create an edge with conflicts, if enabled */
+							if (!AutoRouteParameters.with_conflicts)
+								continue;
+							ne = CreateEdgeWithConflicts(&b, intersecting, e, 1
+																					 /*cost penalty to box */
+																					 , targets);
+							add_or_destroy_edge(&s, ne);
+						}
+						else {
+							/* if this is not the intersecting piece, create a new
+							 * (hopefully unobstructed) via edge and add it back to the
+							 * workheap. */
+							ne = CreateViaEdge(&b, e->rb->group, e->rb->parent.expansion_area, e, e->flags.via_conflict_level, NO_CONFLICT
+																 /* value here doesn't matter */
+																 , targets);
+							add_or_destroy_edge(&s, ne);
+						}
+					}
+				}
+				goto dontexpand;
+			}
+			/* between the time these edges are inserted and the
+			 * time they are processed, new expansion boxes (which
+			 * conflict with these edges) may be added to the graph!
+			 * w.o vias this isn't a problem because the broken box
+			 * is not homeless. */
+		}
+		if (1) {
+			routebox_t *nrb;
+			struct E_result *ans;
+			pcb_box_t b;
+			vector_t *broken;
+			if (e->flags.is_interior) {
+				assert(AutoRouteParameters.with_conflicts);	/* no interior edges unless
+																										   routing with conflicts! */
+				assert(e->rb->conflicts_with);
+				b = e->rb->sbox;
+				switch (e->rb->came_from) {
+				case PCB_NORTH:
+					b.Y2 = b.Y1 + 1;
+					b.X1 = PCB_BOX_CENTER_X(b);
+					b.X2 = b.X1 + 1;
+					break;
+				case PCB_EAST:
+					b.X1 = b.X2 - 1;
+					b.Y1 = PCB_BOX_CENTER_Y(b);
+					b.Y2 = b.Y1 + 1;
+					break;
+				case PCB_SOUTH:
+					b.Y1 = b.Y2 - 1;
+					b.X1 = PCB_BOX_CENTER_X(b);
+					b.X2 = b.X1 + 1;
+					break;
+				case PCB_WEST:
+					b.X2 = b.X1 + 1;
+					b.Y1 = PCB_BOX_CENTER_Y(b);
+					b.Y2 = b.Y1 + 1;
+					break;
+				default:
+					assert(0);
+				}
+			}
+			/* sources may not expand to their own edges because of
+			 * adjacent blockers.
+			 */
+			else if (e->rb->flags.source)
+				b = pcb_box_center(&e->rb->sbox);
+			else
+				b = e->rb->sbox;
+			ans = Expand(rd->layergrouptree[e->rb->group], e, &b);
+			if (!pcb_box_intersect(&ans->inflated, &ans->orig))
+				goto dontexpand;
+#if 0
+			/* skip if it didn't actually expand */
+			if (ans->inflated.X1 >= e->rb->sbox.X1 &&
+					ans->inflated.X2 <= e->rb->sbox.X2 && ans->inflated.Y1 >= e->rb->sbox.Y1 && ans->inflated.Y2 <= e->rb->sbox.Y2)
+				goto dontexpand;
+#endif
+
+			if (!pcb_box_is_good(&ans->inflated))
+				goto dontexpand;
+			nrb = CreateExpansionArea(&ans->inflated, e->rb->group, e->rb, pcb_true, e);
+			pcb_r_insert_entry(rd->layergrouptree[nrb->group], &nrb->box);
+			vector_append(area_vec, nrb);
+			nrb->flags.homeless = 0;	/* not homeless any more */
+			broken = BreakManyEdges(&s, targets, rd->layergrouptree[nrb->group], area_vec, ans, nrb, e);
+			while (!vector_is_empty(broken)) {
+				edge_t *ne = (edge_t *) vector_remove_last(broken);
+				add_or_destroy_edge(&s, ne);
+			}
+			vector_destroy(&broken);
+
+			/* add in possible via sites in nrb */
+			if (AutoRouteParameters.use_vias && !e->rb->flags.is_via && e->cost + AutoRouteParameters.ViaCost < s.best_cost)
+				add_via_sites(&s, &vss, rd->mtspace, nrb, NO_CONFLICT, e, targets, 0, pcb_false);
+			goto dontexpand;
+		}
+	dontexpand:
+		DestroyEdge(&e);
+	}
+	touch_conflicts(NULL, 1);
+	pcb_heap_destroy(&s.workheap);
+	pcb_r_destroy_tree(&targets);
+	assert(vector_is_empty(edge_vec));
+	vector_destroy(&edge_vec);
+
+	/* we should have a path in best_path now */
+	if (s.best_path) {
+		routebox_t *rb;
+#ifdef ROUTE_VERBOSE
+		printf("%d:%d RC %.0f", ro++, seen, s.best_cost);
+#endif
+		result.found_route = pcb_true;
+		result.best_route_cost = s.best_cost;
+		/* determine if the best path had conflicts */
+		result.route_had_conflicts = 0;
+		if (AutoRouteParameters.with_conflicts && s.best_path->conflicts_with) {
+			while (!vector_is_empty(s.best_path->conflicts_with)) {
+				rb = (routebox_t *) vector_remove_last(s.best_path->conflicts_with);
+				rb->flags.is_bad = 1;
+				result.route_had_conflicts++;
+			}
+		}
+#ifdef ROUTE_VERBOSE
+		if (result.route_had_conflicts)
+			printf(" (%d conflicts)", result.route_had_conflicts);
+#endif
+		if (result.route_had_conflicts < AutoRouteParameters.hi_conflict) {
+			/* back-trace the path and add lines/vias to r-tree */
+			TracePath(rd, s.best_path, s.best_target, from, result.route_had_conflicts);
+			MergeNets(from, s.best_target, SUBNET);
+		}
+		else {
+#ifdef ROUTE_VERBOSE
+			printf(" (too many in fact)");
+#endif
+			result.found_route = pcb_false;
+		}
+#ifdef ROUTE_VERBOSE
+		printf("\n");
+#endif
+	}
+	else {
+#ifdef ROUTE_VERBOSE
+		printf("%d:%d NO PATH FOUND.\n", ro++, seen);
+#endif
+		result.best_route_cost = s.best_cost;
+		result.found_route = pcb_false;
+	}
+	/* now remove all expansion areas from the r-tree. */
+	while (!vector_is_empty(area_vec)) {
+		routebox_t *rb = (routebox_t *) vector_remove_last(area_vec);
+		assert(!rb->flags.homeless);
+		if (rb->conflicts_with && rb->parent.expansion_area->conflicts_with != rb->conflicts_with)
+			vector_destroy(&rb->conflicts_with);
+		pcb_r_delete_entry_free_data(rd->layergrouptree[rb->group], &rb->box, free);
+	}
+	vector_destroy(&area_vec);
+	/* clean up; remove all 'source', 'target', and 'nobloat' flags */
+	LIST_LOOP(from, same_net, p);
+	if (p->flags.source && p->conflicts_with)
+		vector_destroy(&p->conflicts_with);
+	p->flags.touched = p->flags.source = p->flags.target = p->flags.nobloat = 0;
+	PCB_END_LOOP;
+
+	vector_destroy(&vss.free_space_vec);
+	vector_destroy(&vss.lo_conflict_space_vec);
+	vector_destroy(&vss.hi_conflict_space_vec);
+
+	return result;
+}
+
+static void InitAutoRouteParameters(int pass, pcb_route_style_t * style, pcb_bool with_conflicts, pcb_bool is_smoothing, pcb_bool lastpass)
+{
+	int i;
+	/* routing style */
+	AutoRouteParameters.style = style;
+	AutoRouteParameters.bloat = style->Clearance + HALF_THICK(style->Thick);
+	/* costs */
+	AutoRouteParameters.ViaCost = PCB_INCH_TO_COORD(3.5) + style->Diameter * (is_smoothing ? 80 : 30);
+	AutoRouteParameters.LastConflictPenalty = (400 * pass / passes + 2) / (pass + 1);
+	AutoRouteParameters.ConflictPenalty = 4 * AutoRouteParameters.LastConflictPenalty;
+	AutoRouteParameters.JogPenalty = 1000 * (is_smoothing ? 20 : 4);
+	AutoRouteParameters.CongestionPenalty = 1e6;
+	AutoRouteParameters.MinPenalty = EXPENSIVE;
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		if (is_layer_group_active[i]) {
+			AutoRouteParameters.MinPenalty = MIN(x_cost[i], AutoRouteParameters.MinPenalty);
+			AutoRouteParameters.MinPenalty = MIN(y_cost[i], AutoRouteParameters.MinPenalty);
+		}
+	}
+	AutoRouteParameters.NewLayerPenalty = is_smoothing ? 0.5 * EXPENSIVE : 10 * AutoRouteParameters.ViaCost;
+	/* other */
+	AutoRouteParameters.hi_conflict = MAX(8 * (passes - pass + 1), 6);
+	AutoRouteParameters.is_odd = (pass & 1);
+	AutoRouteParameters.with_conflicts = with_conflicts;
+	AutoRouteParameters.is_smoothing = is_smoothing;
+	AutoRouteParameters.rip_always = is_smoothing;
+	AutoRouteParameters.last_smooth = 0;	/*lastpass; */
+	AutoRouteParameters.pass = pass + 1;
+}
+
+#ifndef NDEBUG
+pcb_r_dir_t bad_boy(const pcb_box_t * b, void *cl)
+{
+	routebox_t *box = (routebox_t *) b;
+	if (box->type == EXPANSION_AREA)
+		return PCB_R_DIR_FOUND_CONTINUE;
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+pcb_bool no_expansion_boxes(routedata_t * rd)
+{
+	int i;
+	pcb_box_t big;
+	big.X1 = 0;
+	big.X2 = PCB_MAX_COORD;
+	big.Y1 = 0;
+	big.Y2 = PCB_MAX_COORD;
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		if (pcb_r_search(rd->layergrouptree[i], &big, NULL, bad_boy, NULL, NULL))
+			return pcb_false;
+	}
+	return pcb_true;
+}
+#endif
+
+static void ripout_livedraw_obj(routebox_t * rb)
+{
+	if (rb->type == LINE && rb->livedraw_obj.line) {
+		pcb_layer_t *layer = LAYER_PTR(PCB->LayerGroups.grp[rb->group].lid[0]);
+		pcb_line_invalidate_erase(rb->livedraw_obj.line);
+		pcb_destroy_object(PCB->Data, PCB_OBJ_LINE, layer, rb->livedraw_obj.line, NULL);
+		rb->livedraw_obj.line = NULL;
+	}
+
+	if (rb->type == VIA && rb->livedraw_obj.via) {
+		pcb_pstk_invalidate_erase(rb->livedraw_obj.via);
+		pcb_destroy_object(PCB->Data, PCB_OBJ_PSTK, rb->livedraw_obj.via, NULL, NULL);
+		rb->livedraw_obj.via = NULL;
+	}
+}
+
+static pcb_r_dir_t ripout_livedraw_obj_cb(const pcb_box_t * b, void *cl)
+{
+	routebox_t *box = (routebox_t *) b;
+	ripout_livedraw_obj(box);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+struct routeall_status {
+	/* --- for completion rate statistics ---- */
+	int total_subnets;
+	/* total subnets routed without conflicts */
+	int routed_subnets;
+	/* total subnets routed with conflicts */
+	int conflict_subnets;
+	/* net failted entirely */
+	int failed;
+	/* net was ripped */
+	int ripped;
+	int total_nets_routed;
+};
+
+static double calculate_progress(double this_heap_item, double this_heap_size, struct routeall_status *ras)
+{
+	double total_passes = passes + smoothes + 1;	/* + 1 is the refinement pass */
+	double this_pass = AutoRouteParameters.pass - 1;	/* Number passes from zero */
+	double heap_fraction = (double) (ras->routed_subnets + ras->conflict_subnets + ras->failed) / (double) ras->total_subnets;
+	double pass_fraction = (this_heap_item + heap_fraction) / this_heap_size;
+	double process_fraction = (this_pass + pass_fraction) / total_passes;
+
+	return process_fraction;
+}
+
+struct routeall_status RouteAll(routedata_t * rd)
+{
+	struct routeall_status ras;
+	routeone_status_t ros;
+	pcb_bool rip;
+	int request_cancel;
+#ifdef NET_HEAP
+	pcb_heap_t *net_heap;
+#endif
+	pcb_heap_t *this_pass, *next_pass, *tmp;
+	routebox_t *net, *p, *pp;
+	pcb_cost_t total_net_cost, last_cost = 0, this_cost = 0;
+	int i;
+	int this_heap_size;
+	int this_heap_item;
+
+	/* initialize heap for first pass;
+	 * do smallest area first; that makes
+	 * the subsequent costs more representative */
+	this_pass = pcb_heap_create();
+	next_pass = pcb_heap_create();
+#ifdef NET_HEAP
+	net_heap = pcb_heap_create();
+#endif
+	LIST_LOOP(rd->first_net, different_net, net);
+	{
+		double area;
+		pcb_box_t bb = shrink_routebox(net);
+		LIST_LOOP(net, same_net, p);
+		{
+			PCB_MAKE_MIN(bb.X1, p->sbox.X1);
+			PCB_MAKE_MIN(bb.Y1, p->sbox.Y1);
+			PCB_MAKE_MAX(bb.X2, p->sbox.X2);
+			PCB_MAKE_MAX(bb.Y2, p->sbox.Y2);
+		}
+		PCB_END_LOOP;
+		area = (double) (bb.X2 - bb.X1) * (bb.Y2 - bb.Y1);
+		pcb_heap_insert(this_pass, area, net);
+	}
+	PCB_END_LOOP;
+
+	ras.total_nets_routed = 0;
+	/* refinement/finishing passes */
+	for (i = 0; i <= passes + smoothes; i++) {
+#ifdef ROUTE_VERBOSE
+		if (i > 0 && i <= passes)
+			printf("--------- STARTING REFINEMENT PASS %d ------------\n", i);
+		else if (i > passes)
+			printf("--------- STARTING SMOOTHING PASS %d -------------\n", i - passes);
+#endif
+		ras.total_subnets = ras.routed_subnets = ras.conflict_subnets = ras.failed = ras.ripped = 0;
+		assert(pcb_heap_is_empty(next_pass));
+
+		this_heap_size = pcb_heap_size(this_pass);
+		for (this_heap_item = 0; !pcb_heap_is_empty(this_pass); this_heap_item++) {
+#ifdef ROUTE_DEBUG
+			if (aabort)
+				break;
+#endif
+			net = (routebox_t *) pcb_heap_remove_smallest(this_pass);
+			InitAutoRouteParameters(i, net->style, i < passes, i > passes, i == passes + smoothes);
+			if (i > 0) {
+				/* rip up all unfixed traces in this net ? */
+				if (AutoRouteParameters.rip_always)
+					rip = pcb_true;
+				else {
+					rip = pcb_false;
+					LIST_LOOP(net, same_net, p);
+					if (p->flags.is_bad) {
+						rip = pcb_true;
+						break;
+					}
+					PCB_END_LOOP;
+				}
+
+				LIST_LOOP(net, same_net, p);
+				p->flags.is_bad = 0;
+				if (!p->flags.fixed) {
+#ifndef NDEBUG
+					pcb_bool del;
+#endif
+					assert(!p->flags.homeless);
+					if (rip) {
+						RemoveFromNet(p, NET);
+						RemoveFromNet(p, SUBNET);
+					}
+					if (AutoRouteParameters.use_vias && p->type != VIA_SHADOW && p->type != PLANE) {
+						mtspace_remove(rd->mtspace, &p->box, p->flags.is_odd ? ODD : EVEN, p->style->Clearance);
+						if (!rip)
+							mtspace_add(rd->mtspace, &p->box, p->flags.is_odd ? EVEN : ODD, p->style->Clearance);
+					}
+					if (rip) {
+						if (conf_core.editor.live_routing)
+							ripout_livedraw_obj(p);
+#ifndef NDEBUG
+						del =
+#endif
+							pcb_r_delete_entry_free_data(rd->layergrouptree[p->group], &p->box, free);
+#ifndef NDEBUG
+						assert(del);
+#endif
+					}
+					else {
+						p->flags.is_odd = AutoRouteParameters.is_odd;
+					}
+				}
+				PCB_END_LOOP;
+				if (conf_core.editor.live_routing)
+					pcb_draw();
+				/* reset to original connectivity */
+				if (rip) {
+					ras.ripped++;
+					ResetSubnet(net);
+				}
+				else {
+					pcb_heap_insert(next_pass, 0, net);
+					continue;
+				}
+			}
+			/* count number of subnets */
+			FOREACH_SUBNET(net, p);
+			ras.total_subnets++;
+			END_FOREACH(net, p);
+			/* the first subnet doesn't require routing. */
+			ras.total_subnets--;
+			/* and re-route! */
+			total_net_cost = 0;
+			/* only route that which isn't fully routed */
+#ifdef ROUTE_DEBUG
+			if (ras.total_subnets == 0 || aabort)
+#else
+			if (ras.total_subnets == 0)
+#endif
+			{
+				pcb_heap_insert(next_pass, 0, net);
+				continue;
+			}
+
+			/* the loop here ensures that we get to all subnets even if
+			 * some of them are unreachable from the first subnet. */
+			LIST_LOOP(net, same_net, p);
+			{
+#ifdef NET_HEAP
+				pcb_box_t b = shrink_routebox(p);
+				/* using a heap allows us to start from smaller objects and
+				 * end at bigger ones. also prefer to start at planes, then pads */
+				pcb_heap_insert(net_heap, (float) (b.X2 - b.X1) *
+#if defined(ROUTE_RANDOMIZED)
+										(0.3 + pcb_rand() / (RAND_MAX + 1.0)) *
+#endif
+										(b.Y2 - b.Y1) * (p->type == PLANE ? -1 : ((p->type == TERM) ? 1 : 10)), p);
+			}
+			PCB_END_LOOP;
+			ros.net_completely_routed = 0;
+			while (!pcb_heap_is_empty(net_heap)) {
+				p = (routebox_t *) pcb_heap_remove_smallest(net_heap);
+#endif
+				if (!p->flags.fixed || p->flags.subnet_processed || p->type == OTHER)
+					continue;
+
+				while (!ros.net_completely_routed) {
+					double percent;
+
+					assert(no_expansion_boxes(rd));
+					/* FIX ME: the number of edges to examine should be in autoroute parameters
+					 * i.e. the 2000 and 800 hard-coded below should be controllable by the user
+					 */
+					ros = RouteOne(rd, p, NULL, ((AutoRouteParameters.is_smoothing ? 2000 : 800) * (i + 1)) * routing_layers);
+					total_net_cost += ros.best_route_cost;
+					if (ros.found_route) {
+						if (ros.route_had_conflicts)
+							ras.conflict_subnets++;
+						else {
+							ras.routed_subnets++;
+							ras.total_nets_routed++;
+						}
+					}
+					else {
+						if (!ros.net_completely_routed)
+							ras.failed++;
+						/* don't bother trying any other source in this subnet */
+						LIST_LOOP(p, same_subnet, pp);
+						pp->flags.subnet_processed = 1;
+						PCB_END_LOOP;
+						break;
+					}
+					/* note that we can infer nothing about ras.total_subnets based
+					 * on the number of calls to RouteOne, because we may be unable
+					 * to route a net from a particular starting point, but perfectly
+					 * able to route it from some other. */
+					percent = calculate_progress(this_heap_item, this_heap_size, &ras);
+					request_cancel = pcb_gui->progress(percent * 100., 100, _("Autorouting tracks"));
+					if (request_cancel) {
+						ras.total_nets_routed = 0;
+						ras.conflict_subnets = 0;
+						pcb_message(PCB_MSG_INFO, "Autorouting cancelled\n");
+						goto out;
+					}
+				}
+			}
+#ifndef NET_HEAP
+			PCB_END_LOOP;
+#endif
+			if (!ros.net_completely_routed)
+				net->flags.is_bad = 1;	/* don't skip this the next round */
+
+			/* Route easiest nets from this pass first on next pass.
+			 * This works best because it's likely that the hardest
+			 * is the last one routed (since it has the most obstacles)
+			 * but it will do no good to rip it up and try it again
+			 * without first changing any of the other routes
+			 */
+			pcb_heap_insert(next_pass, total_net_cost, net);
+			if (total_net_cost < EXPENSIVE)
+				this_cost += total_net_cost;
+			/* reset subnet_processed flags */
+			LIST_LOOP(net, same_net, p);
+			{
+				p->flags.subnet_processed = 0;
+			}
+			PCB_END_LOOP;
+		}
+		/* swap this_pass and next_pass and do it all over again! */
+		ro = 0;
+		assert(pcb_heap_is_empty(this_pass));
+		tmp = this_pass;
+		this_pass = next_pass;
+		next_pass = tmp;
+#if defined(ROUTE_DEBUG) || defined (ROUTE_VERBOSE)
+		printf
+			("END OF PASS %d: %d/%d subnets routed without conflicts at cost %.0f, %d conflicts, %d failed %d ripped\n",
+			 i, ras.routed_subnets, ras.total_subnets, this_cost, ras.conflict_subnets, ras.failed, ras.ripped);
+#endif
+#ifdef ROUTE_DEBUG
+		if (aabort)
+			break;
+#endif
+		/* if no conflicts found, skip directly to smoothing pass! */
+		if (ras.conflict_subnets == 0 && ras.routed_subnets == ras.total_subnets && i <= passes)
+			i = passes - (smoothes ? 0 : 1);
+		/* if no changes in a smoothing round, then we're done */
+		if (this_cost == last_cost && i > passes && i < passes + smoothes)
+			i = passes + smoothes - 1;
+		last_cost = this_cost;
+		this_cost = 0;
+	}
+
+	pcb_message(PCB_MSG_INFO, "%d of %d nets successfully routed.\n", ras.routed_subnets, ras.total_subnets);
+
+out:
+	pcb_heap_destroy(&this_pass);
+	pcb_heap_destroy(&next_pass);
+#ifdef NET_HEAP
+	pcb_heap_destroy(&net_heap);
+#endif
+
+	/* no conflicts should be left at the end of the process. */
+	assert(ras.conflict_subnets == 0);
+
+	return ras;
+}
+
+struct fpin_info {
+	pcb_pstk_t *ps;
+	pcb_coord_t x, y;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t fpstk_rect(const pcb_box_t * b, void *cl)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b;
+	struct fpin_info *info = (struct fpin_info *) cl;
+	if (ps->x == info->x && ps->y == info->y) {
+		info->ps = ps;
+		longjmp(info->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static int FindPin(const pcb_box_t *box, pcb_pstk_t **ps_out)
+{
+	struct fpin_info info;
+
+	info.ps = NULL;
+	info.x = box->X1;
+	info.y = box->Y1;
+	if (setjmp(info.env) == 0) {
+		pcb_r_search(PCB->Data->padstack_tree, box, NULL, fpstk_rect, &info, NULL);
+	}
+	else {
+		*ps_out = info.ps;
+		return PCB_OBJ_PSTK;
+	}
+
+	*ps_out = NULL;
+	return PCB_OBJ_VOID;
+}
+
+
+/* paths go on first 'on' layer in group */
+/* returns 'pcb_true' if any paths were added. */
+pcb_bool IronDownAllUnfixedPaths(routedata_t * rd)
+{
+	pcb_bool changed = pcb_false;
+	pcb_layer_t *layer;
+	routebox_t *net, *p;
+	int i;
+	LIST_LOOP(rd->first_net, different_net, net);
+	{
+		LIST_LOOP(net, same_net, p);
+		{
+			if (!p->flags.fixed) {
+				/* find first on layer in this group */
+				assert(PCB->LayerGroups.grp[p->group].len > 0);
+				assert(is_layer_group_active[p->group]);
+				for (i = 0, layer = NULL; i < PCB->LayerGroups.grp[p->group].len; i++) {
+					layer = LAYER_PTR(PCB->LayerGroups.grp[p->group].lid[i]);
+					if (layer->meta.real.vis)
+						break;
+				}
+				assert(layer && layer->meta.real.vis);	/*at least one layer must be on in this group! */
+				assert(p->type != EXPANSION_AREA);
+				if (p->type == LINE) {
+					pcb_coord_t halfwidth = HALF_THICK(p->style->Thick);
+					double th = halfwidth * 2 + 1;
+					pcb_box_t b;
+					assert(p->parent.line == NULL);
+					/* orthogonal; thickness is 2*halfwidth */
+					/* flip coordinates, if bl_to_ur */
+					b = p->sbox;
+					total_wire_length += sqrt((b.X2 - b.X1 - th) * (b.X2 - b.X1 - th) + (b.Y2 - b.Y1 - th) * (b.Y2 - b.Y1 - th));
+					b = pcb_shrink_box(&b, halfwidth);
+					if (b.X2 == b.X1 + 1)
+						b.X2 = b.X1;
+					if (b.Y2 == b.Y1 + 1)
+						b.Y2 = b.Y1;
+					if (p->flags.bl_to_ur) {
+						pcb_coord_t t;
+						t = b.X1;
+						b.X1 = b.X2;
+						b.X2 = t;
+					}
+					/* using CreateDrawn instead of CreateNew concatenates sequential lines */
+					p->parent.line = pcb_line_new_merge
+						(layer, p->line.x1, p->line.y1, p->line.x2, p->line.y2,
+						 p->style->Thick, p->style->Clearance * 2, pcb_flag_make(PCB_FLAG_AUTO | (conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)));
+
+					if (p->parent.line) {
+						pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, p->parent.line, p->parent.line);
+						changed = pcb_true;
+					}
+				}
+				else if (p->type == VIA || p->type == VIA_SHADOW) {
+					routebox_t *pp = (p->type == VIA_SHADOW) ? p->parent.via_shadow : p;
+					pcb_coord_t radius = HALF_THICK(pp->style->Diameter);
+					pcb_box_t b = shrink_routebox(p);
+					total_via_count++;
+					assert(pp->type == VIA);
+					if (pp->parent.via == NULL) {
+						assert(labs((b.X1 + radius) - (b.X2 - radius)) < 2);
+						assert(labs((b.Y1 + radius) - (b.Y2 - radius)) < 2);
+#warning padstack TODO: when style contains proto, remove this
+						pp->parent.via = pcb_pstk_new_compat_via(PCB->Data,
+							b.X1 + radius, b.Y1 + radius, 
+							pp->style->Hole, pp->style->Diameter, 2 * pp->style->Clearance, 0, PCB_PSTK_COMPAT_ROUND, 1);
+						assert(pp->parent.via);
+						PCB_FLAG_SET(PCB_FLAG_AUTO, pp->parent.via);
+						if (pp->parent.via) {
+							pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, pp->parent.via, pp->parent.via, pp->parent.via);
+							changed = pcb_true;
+						}
+					}
+					assert(pp->parent.via);
+					if (p->type == VIA_SHADOW) {
+						p->type = VIA;
+						p->parent.via = pp->parent.via;
+					}
+				}
+				else if (p->type == THERMAL)
+					/* nothing to do because, the via might not be there yet */ ;
+				else
+					assert(0);
+			}
+		}
+		PCB_END_LOOP;
+		/* loop again to place all the thermals now that the vias are down */
+		LIST_LOOP(net, same_net, p);
+		{
+			if (p->type == THERMAL) {
+				pcb_pstk_t *pin = NULL;
+				/* thermals are alread a single point search, no need to shrink */
+				int type = FindPin(&p->box, &pin);
+				if (pin) {
+					pcb_undo_add_obj_to_clear_poly(type, pin->parent.data, pin, pin, pcb_false);
+					pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_PSTK, LAYER_PTR(p->layer), pin);
+					pcb_undo_add_obj_to_flag(pin);
+					PCB_FLAG_THERM_ASSIGN(p->layer, autoroute_therm_style, pin);
+					pcb_undo_add_obj_to_clear_poly(type, pin->parent.data, pin, pin, pcb_true);
+					pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_PSTK, LAYER_PTR(p->layer), pin);
+					changed = pcb_true;
+				}
+			}
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+	return changed;
+}
+
+pcb_bool AutoRoute(pcb_bool selected)
+{
+	pcb_bool changed = pcb_false;
+	routedata_t *rd;
+	int i;
+
+	total_wire_length = 0;
+	total_via_count = 0;
+
+#ifdef ROUTE_DEBUG
+	ddraw = pcb_gui->request_debug_draw();
+	if (ddraw != NULL) {
+		ar_gc = ddraw->make_gc();
+		ddraw->set_line_cap(ar_gc, pcb_cap_round);
+	}
+#endif
+
+	for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); i++) {
+		if (PCB->RouteStyle.array[i].Thick == 0 ||
+				PCB->RouteStyle.array[i].Diameter == 0 || PCB->RouteStyle.array[i].Hole == 0 || PCB->RouteStyle.array[i].Clearance == 0) {
+			pcb_message(PCB_MSG_ERROR, "You must define proper routing styles\n" "before auto-routing.\n");
+			return pcb_false;
+		}
+	}
+	if (ratlist_length(&PCB->Data->Rat) == 0)
+		return pcb_false;
+	pcb_save_find_flag(PCB_FLAG_DRC);
+	rd = CreateRouteData();
+	if (rd == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to initialize data; might be missing\n" "top or bottom copper layer.\n");
+		return pcb_false;
+	}
+
+	if (1) {
+		routebox_t *net, *rb, *last;
+		int i = 0;
+		/* count number of rats selected */
+		PCB_RAT_LOOP(PCB->Data);
+		{
+			if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line))
+				i++;
+		}
+		PCB_END_LOOP;
+#ifdef ROUTE_VERBOSE
+		printf("%d nets!\n", i);
+#endif
+		if (i == 0)
+			goto donerouting;					/* nothing to do here */
+		/* if only one rat selected, do things the quick way. =) */
+		if (i == 1) {
+			PCB_RAT_LOOP(PCB->Data);
+			if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) {
+				/* look up the end points of this rat line */
+				routebox_t *a;
+				routebox_t *b;
+				a = FindRouteBoxOnLayerGroup(rd, line->Point1.X, line->Point1.Y, line->group1);
+				b = FindRouteBoxOnLayerGroup(rd, line->Point2.X, line->Point2.Y, line->group2);
+				assert(a != NULL && b != NULL);
+				assert(a->style == b->style);
+/*
+	      if (a->type != PAD && b->type == PAD)
+	        {
+	          routebox_t *t = a;
+		  a = b;
+		  b = t;
+	        }
+*/
+				/* route exactly one net, without allowing conflicts */
+				InitAutoRouteParameters(0, a->style, pcb_false, pcb_true, pcb_true);
+				/* hace planes work better as sources than targets */
+				changed = RouteOne(rd, a, b, 150000).found_route || changed;
+				goto donerouting;
+			}
+			PCB_END_LOOP;
+		}
+		/* otherwise, munge the netlists so that only the selected rats
+		 * get connected. */
+		/* first, separate all sub nets into separate nets */
+		/* note that this code works because LIST_LOOP is clever enough not to
+		 * be fooled when the list is changing out from under it. */
+		last = NULL;
+		LIST_LOOP(rd->first_net, different_net, net);
+		{
+			FOREACH_SUBNET(net, rb);
+			{
+				if (last) {
+					last->different_net.next = rb;
+					rb->different_net.prev = last;
+				}
+				last = rb;
+			}
+			END_FOREACH(net, rb);
+			LIST_LOOP(net, same_net, rb);
+			{
+				rb->same_net = rb->same_subnet;
+			}
+			PCB_END_LOOP;
+			/* at this point all nets are equal to their subnets */
+		}
+		PCB_END_LOOP;
+		if (last) {
+			last->different_net.next = rd->first_net;
+			rd->first_net->different_net.prev = last;
+		}
+
+		/* now merge only those subnets connected by a rat line */
+		PCB_RAT_LOOP(PCB->Data);
+		if (!selected || PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) {
+			/* look up the end points of this rat line */
+			routebox_t *a;
+			routebox_t *b;
+			a = FindRouteBoxOnLayerGroup(rd, line->Point1.X, line->Point1.Y, line->group1);
+			b = FindRouteBoxOnLayerGroup(rd, line->Point2.X, line->Point2.Y, line->group2);
+			if (!a || !b) {
+#ifdef DEBUG_STALE_RATS
+				pcb_undo_add_obj_to_flag(line);
+				PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, pcb_true, line);
+				pcb_rat_invalidate_draw(line, 0);
+#endif /* DEBUG_STALE_RATS */
+				pcb_message(PCB_MSG_ERROR, "The rats nest is stale! Aborting autoroute...\n");
+				goto donerouting;
+			}
+			/* merge subnets into a net! */
+			MergeNets(a, b, NET);
+		}
+		PCB_END_LOOP;
+		/* now 'different_net' may point to too many different nets.  Reset. */
+		LIST_LOOP(rd->first_net, different_net, net);
+		{
+			if (!net->flags.touched) {
+				LIST_LOOP(net, same_net, rb);
+				rb->flags.touched = 1;
+				PCB_END_LOOP;
+			}
+			else											/* this is not a "different net"! */
+				RemoveFromNet(net, DIFFERENT_NET);
+		}
+		PCB_END_LOOP;
+		/* reset "touched" flag */
+		LIST_LOOP(rd->first_net, different_net, net);
+		{
+			LIST_LOOP(net, same_net, rb);
+			{
+				assert(rb->flags.touched);
+				rb->flags.touched = 0;
+			}
+			PCB_END_LOOP;
+		}
+		PCB_END_LOOP;
+	}
+	/* okay, rd's idea of netlist now corresponds to what we want routed */
+	/* auto-route all nets */
+	changed = (RouteAll(rd).total_nets_routed > 0) || changed;
+donerouting:
+	pcb_gui->progress(0, 0, NULL);
+	if (conf_core.editor.live_routing) {
+		int i;
+		pcb_box_t big = { 0, 0, PCB_MAX_COORD, PCB_MAX_COORD };
+		for (i = 0; i < pcb_max_group(PCB); i++) {
+			pcb_r_search(rd->layergrouptree[i], &big, NULL, ripout_livedraw_obj_cb, NULL, NULL);
+		}
+	}
+#ifdef ROUTE_DEBUG
+	if (ddraw != NULL)
+		ddraw->finish_debug_draw();
+#endif
+
+	if (changed)
+		changed = IronDownAllUnfixedPaths(rd);
+	pcb_message(PCB_MSG_INFO, "Total added wire length = %$mS, %d vias added\n", (pcb_coord_t) total_wire_length, total_via_count);
+	DestroyRouteData(&rd);
+	if (changed) {
+		pcb_undo_save_serial();
+
+		/* optimize rats, we've changed connectivity a lot. */
+		pcb_rats_destroy(pcb_false /*all rats */ );
+		pcb_undo_restore_serial();
+		pcb_rat_add_all(pcb_false /*all rats */ , NULL);
+		pcb_undo_restore_serial();
+
+		pcb_undo_inc_serial();
+
+		pcb_redraw();
+	}
+	pcb_restore_find_flag();
+#if defined (ROUTE_DEBUG)
+	aabort = 0;
+#endif
+	return changed;
+}
Index: tags/2.0.1/src_plugins/autoroute/autoroute.h
===================================================================
--- tags/2.0.1/src_plugins/autoroute/autoroute.h	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/autoroute.h	(revision 18980)
@@ -0,0 +1,46 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, autoroute.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#ifndef PCB_AUTOROUTE_H
+#define PCB_AUTOROUTE_H
+
+#include "config.h"
+#include "board.h"
+
+pcb_bool AutoRoute(pcb_bool);
+
+#endif
Index: tags/2.0.1/src_plugins/autoroute/autoroute.pup
===================================================================
--- tags/2.0.1/src_plugins/autoroute/autoroute.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/autoroute.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class feature
+$short the original autorouter
+$long Automatically route selected or all rats. This is the original autorouter.
+$package auto
+$state works
+default buildin
+dep lib_compat_help
+autoload 1
Index: tags/2.0.1/src_plugins/autoroute/mtspace.c
===================================================================
--- tags/2.0.1/src_plugins/autoroute/mtspace.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/mtspace.c	(revision 18980)
@@ -0,0 +1,525 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, mtspace.c, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *  Copyright (c) 2006 harry eaton.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+
+/* implementation for "empty space" routines (needed for via-space tracking
+ * in the auto-router.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <setjmp.h>
+
+#include "box.h"
+#include "heap.h"
+#include "rtree.h"
+#include "mtspace.h"
+#include "vector.h"
+
+/* mtspace data structures are built on r-trees. */
+
+typedef struct mtspacebox {
+	const pcb_box_t box;
+	pcb_coord_t clearance;								/* the smallest clearance around this box */
+} mtspacebox_t;
+
+/* this is an mtspace_t */
+struct mtspace {
+	/* rtrees keeping track of regions expanded by their required clearance. */
+	/* one for fixed, even, and odd */
+	pcb_rtree_t *ftree, *etree, *otree;
+};
+
+typedef union {
+	vector_t *v;
+	pcb_heap_t *h;
+} heap_or_vector;
+
+/* this is a vetting_t */
+struct vetting {
+	heap_or_vector untested;
+	heap_or_vector no_fix;
+	heap_or_vector no_hi;
+	heap_or_vector hi_candidate;
+	pcb_coord_t radius;
+	pcb_coord_t clearance;
+	pcb_cheap_point_t desired;
+};
+
+#define SPECIAL 823157
+
+mtspacebox_t *mtspace_create_box(const pcb_box_t * box, pcb_coord_t clearance)
+{
+	mtspacebox_t *mtsb;
+	assert(pcb_box_is_good(box));
+	mtsb = (mtspacebox_t *) malloc(sizeof(*mtsb));
+	/* the box was sent to us pre-bloated by the clearance amount */
+	*((pcb_box_t *) & mtsb->box) = *box;
+	mtsb->clearance = clearance;
+	assert(pcb_box_is_good(&mtsb->box));
+	return mtsb;
+}
+
+/* create an "empty space" representation */
+mtspace_t *mtspace_create(void)
+{
+	mtspace_t *mtspace;
+
+	/* create mtspace data structure */
+	mtspace = (mtspace_t *) malloc(sizeof(*mtspace));
+	mtspace->ftree = pcb_r_create_tree();
+	mtspace->etree = pcb_r_create_tree();
+	mtspace->otree = pcb_r_create_tree();
+	/* done! */
+	return mtspace;
+}
+
+/* destroy an "empty space" representation. */
+void mtspace_destroy(mtspace_t ** mtspacep)
+{
+	assert(mtspacep);
+	pcb_r_free_tree_data((*mtspacep)->ftree, free);
+	pcb_r_free_tree_data((*mtspacep)->etree, free);
+	pcb_r_free_tree_data((*mtspacep)->otree, free);
+	pcb_r_destroy_tree(&(*mtspacep)->ftree);
+	pcb_r_destroy_tree(&(*mtspacep)->etree);
+	pcb_r_destroy_tree(&(*mtspacep)->otree);
+	free(*mtspacep);
+	*mtspacep = NULL;
+}
+
+struct mts_info {
+	pcb_coord_t clearance;
+	pcb_box_t box;
+	pcb_rtree_t *tree;
+	jmp_buf env;
+};
+
+static pcb_r_dir_t mts_remove_one(const pcb_box_t * b, void *cl)
+{
+	struct mts_info *info = (struct mts_info *) cl;
+	mtspacebox_t *box = (mtspacebox_t *) b;
+
+	/* there can be duplicate boxes, we just remove one */
+	/* the info box is pre-bloated, so just check equality */
+	if (b->X1 == info->box.X1 && b->X2 == info->box.X2 &&
+			b->Y1 == info->box.Y1 && b->Y2 == info->box.Y2 && box->clearance == info->clearance) {
+		pcb_r_delete_entry_free_data(info->tree, b, free);
+		longjmp(info->env, 1);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+pcb_rtree_t *which_tree(mtspace_t * mtspace, mtspace_type_t which)
+{
+	switch (which) {
+	case FIXED:
+		return mtspace->ftree;
+	case EVEN:
+		return mtspace->etree;
+	default:
+		return mtspace->otree;
+	}
+}
+
+/* add a space-filler to the empty space representation.  */
+void mtspace_add(mtspace_t * mtspace, const pcb_box_t * box, mtspace_type_t which, pcb_coord_t clearance)
+{
+	mtspacebox_t *filler = mtspace_create_box(box, clearance);
+	pcb_r_insert_entry(which_tree(mtspace, which), (const pcb_box_t *) filler);
+}
+
+/* remove a space-filler from the empty space representation. */
+void mtspace_remove(mtspace_t * mtspace, const pcb_box_t * box, mtspace_type_t which, pcb_coord_t clearance)
+{
+	struct mts_info cl;
+	pcb_box_t small_search;
+
+	cl.clearance = clearance;
+	cl.box = *box;
+	cl.tree = which_tree(mtspace, which);
+	small_search = pcb_box_center(box);
+	if (setjmp(cl.env) == 0) {
+		pcb_r_search(cl.tree, &small_search, NULL, mts_remove_one, &cl, NULL);
+		assert(0);									/* didn't find it?? */
+	}
+}
+
+struct query_closure {
+	pcb_box_t *cbox;
+	heap_or_vector checking;
+	heap_or_vector touching;
+	pcb_cheap_point_t *desired;
+	pcb_coord_t radius, clearance;
+	jmp_buf env;
+	pcb_bool touch_is_vec;
+};
+
+static inline void heap_append(pcb_heap_t * heap, pcb_cheap_point_t * desired, pcb_box_t * newone)
+{
+	pcb_cheap_point_t p = *desired;
+	assert(desired);
+	pcb_closest_pcb_point_in_box(&p, newone);
+	pcb_heap_insert(heap, PCB_ABS(p.X - desired->X) + (p.Y - desired->Y), newone);
+}
+
+static inline void append(struct query_closure *qc, pcb_box_t * newone)
+{
+	if (qc->desired)
+		heap_append(qc->checking.h, qc->desired, newone);
+	else
+		vector_append(qc->checking.v, newone);
+}
+
+/* we found some space filler that may intersect this query.
+ * First check if it does intersect, then break it into
+ * overlaping regions that don't intersect this box.
+ */
+static pcb_r_dir_t query_one(const pcb_box_t * box, void *cl)
+{
+	struct query_closure *qc = (struct query_closure *) cl;
+	mtspacebox_t *mtsb = (mtspacebox_t *) box;
+	pcb_coord_t shrink;
+
+#ifndef NDEBUG
+	{
+		/* work around rounding errors: grow both boxes by 2 nm */
+		pcb_box_t b1 = *qc->cbox, b2 = mtsb->box;
+		b1.X1--;b1.Y1--;b1.X2++;b1.Y2++;
+		b2.X1--;b2.Y1--;b2.X2++;b2.Y2++;
+		assert(pcb_box_intersect(&b1, &b2));
+	}
+#endif
+
+	/* we need to satisfy the larger of the two clearances */
+	if (qc->clearance > mtsb->clearance)
+		shrink = mtsb->clearance;
+	else
+		shrink = qc->clearance;
+	/* if we shrink qc->box by this amount and it doesn't intersect
+	 * then we didn't actually touch this box */
+	if (qc->cbox->X1 + shrink >= mtsb->box.X2 ||
+			qc->cbox->X2 - shrink <= mtsb->box.X1 || qc->cbox->Y1 + shrink >= mtsb->box.Y2 || qc->cbox->Y2 - shrink <= mtsb->box.Y1)
+		return PCB_R_DIR_NOT_FOUND;
+	/* ok, we do touch this box, now create up to 4 boxes that don't */
+	if (mtsb->box.Y1 > qc->cbox->Y1 + shrink) {	/* top region exists */
+		pcb_coord_t Y1 = qc->cbox->Y1;
+		pcb_coord_t Y2 = mtsb->box.Y1 + shrink;
+		if (Y2 - Y1 >= 2 * (qc->radius + qc->clearance)) {
+			pcb_box_t *newone = (pcb_box_t *) malloc(sizeof(pcb_box_t));
+			newone->X1 = qc->cbox->X1;
+			newone->X2 = qc->cbox->X2;
+			newone->Y1 = Y1;
+			newone->Y2 = Y2;
+			assert(newone->Y2 < qc->cbox->Y2);
+			append(qc, newone);
+		}
+	}
+	if (mtsb->box.Y2 < qc->cbox->Y2 - shrink) {	/* bottom region exists */
+		pcb_coord_t Y1 = mtsb->box.Y2 - shrink;
+		pcb_coord_t Y2 = qc->cbox->Y2;
+		if (Y2 - Y1 >= 2 * (qc->radius + qc->clearance)) {
+			pcb_box_t *newone = (pcb_box_t *) malloc(sizeof(pcb_box_t));
+			newone->X1 = qc->cbox->X1;
+			newone->X2 = qc->cbox->X2;
+			newone->Y2 = qc->cbox->Y2;
+			newone->Y1 = Y1;
+			assert(newone->Y1 > qc->cbox->Y1);
+			append(qc, newone);
+		}
+	}
+	if (mtsb->box.X1 > qc->cbox->X1 + shrink) {	/* left region exists */
+		pcb_coord_t X1 = qc->cbox->X1;
+		pcb_coord_t X2 = mtsb->box.X1 + shrink;
+		if (X2 - X1 >= 2 * (qc->radius + qc->clearance)) {
+			pcb_box_t *newone;
+			newone = (pcb_box_t *) malloc(sizeof(pcb_box_t));
+			newone->Y1 = qc->cbox->Y1;
+			newone->Y2 = qc->cbox->Y2;
+			newone->X1 = qc->cbox->X1;
+			newone->X2 = X2;
+			assert(newone->X2 < qc->cbox->X2);
+			append(qc, newone);
+		}
+	}
+	if (mtsb->box.X2 < qc->cbox->X2 - shrink) {	/* right region exists */
+		pcb_coord_t X1 = mtsb->box.X2 - shrink;
+		pcb_coord_t X2 = qc->cbox->X2;
+		if (X2 - X1 >= 2 * (qc->radius + qc->clearance)) {
+			pcb_box_t *newone = (pcb_box_t *) malloc(sizeof(pcb_box_t));
+			newone->Y1 = qc->cbox->Y1;
+			newone->Y2 = qc->cbox->Y2;
+			newone->X2 = qc->cbox->X2;
+			newone->X1 = X1;
+			assert(newone->X1 > qc->cbox->X1);
+			append(qc, newone);
+		}
+	}
+	if (qc->touching.v) {
+		if (qc->touch_is_vec || !qc->desired)
+			vector_append(qc->touching.v, qc->cbox);
+		else
+			heap_append(qc->touching.h, qc->desired, qc->cbox);
+	}
+	else
+		free(qc->cbox);							/* done with this one */
+	longjmp(qc->env, 1);
+	return PCB_R_DIR_FOUND_CONTINUE;											/* never reached */
+}
+
+/* qloop takes a vector (or heap) of regions to check (checking) if they don't intersect
+ * anything. If a region does intersect something, it is broken into
+ * pieces that don't intersect that thing (if possible) which are
+ * put back into the vector/heap of regions to check.
+ * qloop returns pcb_false when it finds the first empty region
+ * it returns pcb_true if it has exhausted the region vector/heap and never
+ * found an empty area.
+ */
+static void qloop(struct query_closure *qc, pcb_rtree_t * tree, heap_or_vector res, pcb_bool is_vec)
+{
+	pcb_box_t *cbox;
+	int n;
+
+	while (!(qc->desired ? pcb_heap_is_empty(qc->checking.h) : vector_is_empty(qc->checking.v))) {
+		cbox = qc->desired ? (pcb_box_t *) pcb_heap_remove_smallest(qc->checking.h) : (pcb_box_t *) vector_remove_last(qc->checking.v);
+		if (setjmp(qc->env) == 0) {
+			assert(pcb_box_is_good(cbox));
+			qc->cbox = cbox;
+			pcb_r_search(tree, cbox, NULL, query_one, qc, &n);
+			assert(n == 0);
+			/* nothing intersected with this tree, put it in the result vector */
+			if (is_vec)
+				vector_append(res.v, cbox);
+			else {
+				if (qc->desired)
+					heap_append(res.h, qc->desired, cbox);
+				else
+					vector_append(res.v, cbox);
+			}
+			return;										/* found one - perhaps one answer is good enough */
+		}
+	}
+}
+
+/* free the memory used by the vetting structure */
+void mtsFreeWork(vetting_t ** w)
+{
+	vetting_t *work = (*w);
+	if (work->desired.X != -SPECIAL || work->desired.Y != -SPECIAL) {
+		pcb_heap_free(work->untested.h, free);
+		pcb_heap_destroy(&work->untested.h);
+		pcb_heap_free(work->no_fix.h, free);
+		pcb_heap_destroy(&work->no_fix.h);
+		pcb_heap_free(work->no_hi.h, free);
+		pcb_heap_destroy(&work->no_hi.h);
+		pcb_heap_free(work->hi_candidate.h, free);
+		pcb_heap_destroy(&work->hi_candidate.h);
+	}
+	else {
+		while (!vector_is_empty(work->untested.v))
+			free(vector_remove_last(work->untested.v));
+		vector_destroy(&work->untested.v);
+		while (!vector_is_empty(work->no_fix.v))
+			free(vector_remove_last(work->no_fix.v));
+		vector_destroy(&work->no_fix.v);
+		while (!vector_is_empty(work->no_hi.v))
+			free(vector_remove_last(work->no_hi.v));
+		vector_destroy(&work->no_hi.v);
+		while (!vector_is_empty(work->hi_candidate.v))
+			free(vector_remove_last(work->hi_candidate.v));
+		vector_destroy(&work->hi_candidate.v);
+	}
+	free(work);
+	(*w) = NULL;
+}
+
+
+/* returns some empty spaces in 'region' (or former narrowed regions)
+ * that may hold a feature with the specified radius and clearance
+ * It tries first to find Completely empty regions (which are appended
+ * to the free_space_vec vector). If that fails, it looks for regions
+ * filled only by objects generated by the previous pass (which are
+ * appended to the lo_conflict_space_vec vector). Then it looks for
+ * regions that are filled by objects generated during *this* pass
+ * (which  are appended to the hi_conflict_space_vec vector). The
+ * current pass identity is given by 'is_odd'.  As soon as one completely
+ * free region is found, it returns with that answer. It saves partially
+ * searched regions in vectors "untested", "no_fix", "no_hi", and
+ * "hi_candidate" which can be passed to future calls of this function
+ * to search harder for such regions if the computation becomes
+ * necessary.
+ */
+vetting_t *mtspace_query_rect(mtspace_t * mtspace, const pcb_box_t * region,
+															pcb_coord_t radius, pcb_coord_t clearance,
+															vetting_t * work,
+															vector_t * free_space_vec,
+															vector_t * lo_conflict_space_vec,
+															vector_t * hi_conflict_space_vec, pcb_bool is_odd, pcb_bool with_conflicts, pcb_cheap_point_t * desired)
+{
+	struct query_closure qc;
+
+	/* pre-assertions */
+	assert(free_space_vec);
+	assert(lo_conflict_space_vec);
+	assert(hi_conflict_space_vec);
+	/* search out to anything that might matter */
+	if (region) {
+		pcb_box_t *cbox;
+		assert(work == NULL);
+		assert(pcb_box_is_good(region));
+		assert(vector_is_empty(free_space_vec));
+		assert(vector_is_empty(lo_conflict_space_vec));
+		assert(vector_is_empty(hi_conflict_space_vec));
+		work = (vetting_t *) malloc(sizeof(vetting_t));
+		work->clearance = clearance;
+		work->radius = radius;
+		cbox = (pcb_box_t *) malloc(sizeof(pcb_box_t));
+		*cbox = pcb_bloat_box(region, clearance + radius);
+		if (desired) {
+			work->untested.h = pcb_heap_create();
+			work->no_fix.h = pcb_heap_create();
+			work->hi_candidate.h = pcb_heap_create();
+			work->no_hi.h = pcb_heap_create();
+			assert(work->untested.h && work->no_fix.h && work->no_hi.h && work->hi_candidate.h);
+			pcb_heap_insert(work->untested.h, 0, cbox);
+			work->desired = *desired;
+		}
+		else {
+			work->untested.v = vector_create();
+			work->no_fix.v = vector_create();
+			work->hi_candidate.v = vector_create();
+			work->no_hi.v = vector_create();
+			assert(work->untested.v && work->no_fix.v && work->no_hi.v && work->hi_candidate.v);
+			vector_append(work->untested.v, cbox);
+			work->desired.X = work->desired.Y = -SPECIAL;
+		}
+		return work;
+	}
+	qc.clearance = work->clearance;
+	qc.radius = work->radius;
+	if (work->desired.X == -SPECIAL && work->desired.Y == -SPECIAL)
+		qc.desired = NULL;
+	else
+		qc.desired = &work->desired;
+	/* do the query */
+	do {
+		heap_or_vector temporary;
+		temporary.v = free_space_vec;
+
+		/* search the fixed object tree discarding any intersections
+		 * and placing empty regions in the no_fix vector.
+		 */
+		qc.checking = work->untested;
+		qc.touching.v = NULL;
+		qloop(&qc, mtspace->ftree, work->no_fix, pcb_false);
+		/* search the hi-conflict tree placing intersectors in the
+		 * hi_candidate vector (if conflicts are allowed) and
+		 * placing empty regions in the no_hi vector.
+		 */
+		qc.checking.v = work->no_fix.v;
+		qc.touching.v = with_conflicts ? work->hi_candidate.v : NULL;
+		qc.touch_is_vec = pcb_false;
+		qloop(&qc, is_odd ? mtspace->otree : mtspace->etree, work->no_hi, pcb_false);
+		/* search the lo-conflict tree placing intersectors in the
+		 * lo-conflict answer vector (if conflicts allowed) and
+		 * placing emptry regions in the free-space answer vector.
+		 */
+		qc.checking = work->no_hi;
+/* XXX lo_conflict_space_vec will be treated like a heap! */
+		qc.touching.v = (with_conflicts ? lo_conflict_space_vec : NULL);
+		qc.touch_is_vec = pcb_true;
+		qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, pcb_true);
+
+		/* qloop (&qc, is_odd ? mtspace->etree : mtspace->otree, (heap_or_vector)free_space_vec, pcb_true); */
+		if (!vector_is_empty(free_space_vec)) {
+			if (qc.desired) {
+				if (pcb_heap_is_empty(work->untested.h))
+					break;
+			}
+			else {
+				if (vector_is_empty(work->untested.v))
+					break;
+			}
+			return work;
+		}
+		/* finally check the hi-conflict intersectors against the
+		 * lo-conflict tree discarding intersectors (two types of conflict is real bad)
+		 * and placing empty regions in the hi-conflict answer vector.
+		 */
+		if (with_conflicts) {
+			heap_or_vector temporary;
+			temporary.v = hi_conflict_space_vec;
+
+			qc.checking = work->hi_candidate;
+			qc.touching.v = NULL;
+			qloop(&qc, is_odd ? mtspace->etree : mtspace->otree, temporary, pcb_true);
+
+			/* qloop (&qc, is_odd ? mtspace->etree : mtspace->otree, */
+			/*   (heap_or_vector)hi_conflict_space_vec, pcb_true); */
+		}
+	}
+	while (!(qc.desired ? pcb_heap_is_empty(work->untested.h) : vector_is_empty(work->untested.v)));
+	if (qc.desired) {
+		if (pcb_heap_is_empty(work->no_fix.h) && pcb_heap_is_empty(work->no_hi.h) && pcb_heap_is_empty(work->hi_candidate.h)) {
+			mtsFreeWork(&work);
+			return NULL;
+		}
+	}
+	else {
+		if (vector_is_empty(work->no_fix.v) && vector_is_empty(work->no_hi.v) && vector_is_empty(work->hi_candidate.v)) {
+			mtsFreeWork(&work);
+			return NULL;
+		}
+	}
+	return work;
+}
+
+int mtsBoxCount(vetting_t * w)
+{
+#if 0
+	int ans;
+	ans = 3 * vector_size(w->untested);
+	ans += 2 * vector_size(w->no_fix);
+	ans += vector_size(w->no_hi);
+	ans += vector_size(w->hi_candidate);
+	return ans;
+#endif
+	return 100;
+}
Index: tags/2.0.1/src_plugins/autoroute/mtspace.h
===================================================================
--- tags/2.0.1/src_plugins/autoroute/mtspace.h	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/mtspace.h	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, mtspace.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* "empty space" routines (needed for via-space tracking in the auto-router. */
+
+#ifndef PCB_MTSPACE_H
+#define PCB_MTSPACE_H
+
+/* mtspace data structures are built on r-trees. */
+
+#include "config.h"
+#include "vector.h"							/* for vector_t in mtspace_query_rect prototype */
+
+typedef struct mtspace mtspace_t;
+typedef enum { FIXED, ODD, EVEN } mtspace_type_t;
+typedef struct vetting vetting_t;
+
+/* create an "empty space" representation with a shrunken boundary */
+mtspace_t *mtspace_create(void);
+/* destroy an "empty space" representation. */
+void mtspace_destroy(mtspace_t ** mtspacep);
+
+/* -- mutation -- */
+
+/* add a space-filler to the empty space representation.  The given box
+ * should *not* be bloated; it should be "true".  The feature will fill
+ * *at least* a radius of clearance around it;
+ */
+void mtspace_add(mtspace_t * mtspace, const pcb_box_t * box, mtspace_type_t which, pcb_coord_t clearance);
+/* remove a space-filler from the empty space representation.  The given box
+ * should *not* be bloated; it should be "true".  The feature will fill
+ * *at least* a radius of clearance around it;
+ */
+void mtspace_remove(mtspace_t * mtspace, const pcb_box_t * box, mtspace_type_t which, pcb_coord_t clearance);
+
+
+vetting_t *mtspace_query_rect(mtspace_t * mtspace, const pcb_box_t * region,
+															pcb_coord_t radius, pcb_coord_t clearance,
+															vetting_t * work,
+															vector_t * free_space_vec,
+															vector_t * lo_conflict_space_vec,
+															vector_t * hi_conflict_space_vec, pcb_bool is_odd, pcb_bool with_conflicts, pcb_cheap_point_t * desired);
+
+void mtsFreeWork(vetting_t **);
+int mtsBoxCount(vetting_t *);
+
+#endif /* ! PCB_MTSPACE_H */
Index: tags/2.0.1/src_plugins/autoroute/vector.c
===================================================================
--- tags/2.0.1/src_plugins/autoroute/vector.c	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/vector.c	(revision 18980)
@@ -0,0 +1,206 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, vector.c, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* operations on vectors. */
+
+#include "config.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "math_helper.h"
+#include "vector.h"
+#include "macro.h"
+
+struct vector_struct {
+	vector_element_t *element;
+	int size, max;
+};
+
+/* helper function for assertions */
+#ifndef NDEBUG
+static int __vector_is_good(vector_t * vector)
+{
+	return vector && (vector->max == 0 || vector->element) &&
+		(vector->max >= 0) && (vector->size >= 0) && (vector->size <= vector->max) && 1;
+}
+#endif /* !NDEBUG */
+
+/* create an empty vector */
+vector_t *vector_create()
+{
+	vector_t *vector;
+	/* okay, create empty vector */
+	vector = (vector_t *) calloc(1, sizeof(*vector));
+	assert(vector);
+	assert(__vector_is_good(vector));
+	return vector;
+}
+
+/* destroy a vector */
+void vector_destroy(vector_t ** vector)
+{
+	assert(vector && *vector);
+	assert(__vector_is_good(*vector));
+	if ((*vector)->element)
+		free((*vector)->element);
+	free(*vector);
+	*vector = NULL;
+}
+
+/* -- interrogation -- */
+int vector_is_empty(vector_t * vector)
+{
+	assert(__vector_is_good(vector));
+	return (vector->size == 0);
+}
+
+int vector_size(vector_t * vector)
+{
+	assert(__vector_is_good(vector));
+	return (vector->size);
+}
+
+vector_element_t vector_element(vector_t * vector, int N)
+{
+	assert(__vector_is_good(vector));
+	assert(N < vector->size);
+	return vector->element[N];
+}
+
+/* return the first element of the vector. */
+vector_element_t vector_element_first(vector_t * vector)
+{
+	assert(__vector_is_good(vector));
+	assert(vector->size > 0);
+	return vector_element(vector, 0);
+}
+
+/* return the last element of the vector. */
+vector_element_t vector_element_last(vector_t * vector)
+{
+	assert(__vector_is_good(vector));
+	assert(vector->size > 0);
+	return vector_element(vector, vector->size - 1);
+}
+
+/* -- mutation -- */
+/* add data to end of vector */
+void vector_append(vector_t * vector, vector_element_t data)
+{
+	vector_insert_many(vector, vector->size, &data, 1);
+}
+
+void vector_append_many(vector_t * vector, vector_element_t data[], int count)
+{
+	vector_insert_many(vector, vector->size, data, count);
+}
+
+void vector_append_vector(vector_t * vector, vector_t * other_vector)
+{
+	vector_append_many(vector, other_vector->element, other_vector->size);
+}
+
+void vector_insert(vector_t * vector, int N, vector_element_t data)
+{
+	vector_insert_many(vector, N, &data, 1);
+}
+
+/* add data at specified position of vector */
+void vector_insert_many(vector_t * vector, int N, vector_element_t data[], int count)
+{
+	assert(__vector_is_good(vector));
+	assert(N <= vector->size);
+	if (count == 0)
+		return;
+	assert(data && count > 0);
+	if (vector->size + count > vector->max) {
+		vector->max = MAX(32, MAX(vector->size + count, vector->max * 2));
+		vector->element = (void **) realloc(vector->element, vector->max * sizeof(*vector->element));
+	}
+	memmove(vector->element + N + count, vector->element + N, (vector->size - N) * sizeof(*vector->element));
+	memmove(vector->element + N, data, count * sizeof(*data));
+	vector->size += count;
+	assert(__vector_is_good(vector));
+}
+
+vector_t *vector_duplicate(vector_t * orig)
+{
+	vector_t *newone = vector_create();
+	if (!orig)
+		return newone;
+	newone->element = (void **) malloc(orig->max * sizeof(*orig->element));
+	newone->max = orig->max;
+	newone->size = orig->size;
+	memcpy(newone->element, orig->element, orig->size * sizeof(vector_element_t));
+	assert(__vector_is_good(newone));
+	return newone;
+}
+
+/* return and delete the *last* element of vector */
+vector_element_t vector_remove_last(vector_t * vector)
+{
+	assert(vector->size > 0);
+	return vector_remove(vector, vector->size - 1);
+}
+
+/* return and delete data at specified position of vector */
+vector_element_t vector_remove(vector_t * vector, int N)
+{
+	vector_element_t old;
+	assert(__vector_is_good(vector));
+	assert(N < vector->size);
+	old = vector->element[N];
+	memmove(vector->element + N, vector->element + N + 1, (vector->size - (N + 1)) * sizeof(*vector->element));
+	vector->size--;
+	assert(__vector_is_good(vector));
+	return old;
+}
+
+/* replace the data at the specified position with the given data.
+ * returns the old data. */
+vector_element_t vector_replace(vector_t * vector, vector_element_t data, int N)
+{
+	vector_element_t old;
+	assert(__vector_is_good(vector));
+	assert(N < vector->size);
+	old = vector->element[N];
+	vector->element[N] = data;
+	assert(__vector_is_good(vector));
+	return old;
+}
Index: tags/2.0.1/src_plugins/autoroute/vector.h
===================================================================
--- tags/2.0.1/src_plugins/autoroute/vector.h	(nonexistent)
+++ tags/2.0.1/src_plugins/autoroute/vector.h	(revision 18980)
@@ -0,0 +1,79 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1998,1999,2000,2001 harry eaton
+ *
+ *  this file, vector.h, was written and is
+ *  Copyright (c) 2001 C. Scott Ananian.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  harry eaton, 6697 Buttonhole Ct, Columbia, MD 21044 USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#ifndef PCB_VECTOR_H
+#define PCB_VECTOR_H
+
+/* what a vector looks like */
+typedef struct vector_struct vector_t;
+/* what data in a vector looks like */
+typedef void *vector_element_t;
+
+/* create an empty vector */
+vector_t *vector_create();
+/* destroy a vector */
+void vector_destroy(vector_t ** vector);
+/* copy a vector */
+vector_t *vector_duplicate(vector_t * vector);
+
+/* -- interrogation -- */
+int vector_is_empty(vector_t * vector);
+int vector_size(vector_t * vector);
+vector_element_t vector_element(vector_t * vector, int N);
+vector_element_t vector_element_first(vector_t * vector);
+vector_element_t vector_element_last(vector_t * vector);
+
+/* -- mutation -- */
+/* add data to end of vector */
+void vector_append(vector_t * vector, vector_element_t data);
+/* add multiple elements to end of vector */
+void vector_append_many(vector_t * vector, vector_element_t data[], int count);
+/* add a vector of elements to the end of vector */
+void vector_append_vector(vector_t * vector, vector_t * other_vector);
+/* add data at specified position of vector */
+void vector_insert(vector_t * vector, int N, vector_element_t data);
+/* add multiple elements at specified position of vector */
+void vector_insert_many(vector_t * vector, int N, vector_element_t data[], int count);
+/* return and delete the *last* element of vector */
+vector_element_t vector_remove_last(vector_t * vector);
+/* return and delete data at specified position of vector */
+vector_element_t vector_remove(vector_t * vector, int N);
+/* replace the data at the specified position with the given data.
+ * returns the old data. */
+vector_element_t vector_replace(vector_t * vector, vector_element_t data, int N);
+
+#endif /* PCB_VECTOR_H */
Index: tags/2.0.1/src_plugins/boardflip/Makefile
===================================================================
--- tags/2.0.1/src_plugins/boardflip/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/boardflip/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_boardflip
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/boardflip/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/boardflip/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/boardflip/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {boardflip}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/boardflip/boardflip.o @]
+
+switch /local/pcb/boardflip/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/boardflip/boardflip.c
===================================================================
--- tags/2.0.1/src_plugins/boardflip/boardflip.c	(nonexistent)
+++ tags/2.0.1/src_plugins/boardflip/boardflip.c	(revision 18980)
@@ -0,0 +1,208 @@
+/*
+ * BoardFlip plug-in for PCB.
+ *
+ * Copyright (C) 2008 DJ Delorie <dj@delorie.com>
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016 and generalized in 2017, 2018.
+ *
+ * Original source was: http://www.delorie.com/pcb/boardflip.c
+ *
+ * Usage: Boardflip()
+ *
+ * All objects on the board are up-down flipped.
+ *
+ * Command line board flipping:
+ *
+ * pcb --action-string "BoardFlip() SaveTo(LayoutAs,$OUTFILE) Quit()" $INFILE
+ *
+ * To flip the board physically, use BoardFlip(sides)
+ *
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "board.h"
+#include "rats.h"
+#include "polygon.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "boardflip.h"
+#include "funchash_core.h"
+
+#define XFLIP(v) (v) = ((flip_x ? -(v) : (v)) + xo)
+#define YFLIP(v) (v) = ((flip_y ? -(v) : (v)) + yo)
+#define AFLIP(a) (a) = aflip((a), flip_x, flip_y)
+#define NEG(a) (a) = -(a)
+#define ONLY1 ((flip_x || flip_y) && !(flip_x && flip_y))
+
+static double aflip(double a, pcb_bool flip_x, pcb_bool flip_y)
+{
+	if (flip_x) {
+		while(a > 360.0) a -= 360.0;
+		while(a < 0.0) a += 360.0;
+
+		if ((0.0 <= a) && (a <= 90.0)) a = (90.0 - a) + 90.0;
+		else if ((0 < 90.0) && (a <= 180.0)) a = 90.0 - (a - 90.0);
+		else if ((0 < 180.0) && (a <= 270.0)) a = 270.0 + (270.0 - a);
+		else if ((0 < 270.0) && (a <= 360.0)) a = 270.0 - (a - 270.0);
+
+		while(a > 360.0) a -= 360.0;
+		while(a < 0.0) a += 360.0;
+	}
+	if (flip_y)
+		a = -a;
+	return a;
+}
+
+void pcb_flip_data(pcb_data_t *data, pcb_bool flip_x, pcb_bool flip_y, pcb_coord_t xo, pcb_coord_t yo, pcb_bool et_swap_sides)
+{
+	LAYER_LOOP(data, pcb_max_layer);
+	{
+		PCB_LINE_LOOP(layer);
+		{
+			pcb_poly_restore_to_poly(data, PCB_OBJ_LINE, layer, line);
+			pcb_r_delete_entry(layer->line_tree, (pcb_box_t *)line);
+			XFLIP(line->Point1.X);
+			XFLIP(line->Point2.X);
+			YFLIP(line->Point1.Y);
+			YFLIP(line->Point2.Y);
+			pcb_line_bbox(line);
+			pcb_r_insert_entry(layer->line_tree, (pcb_box_t *)line);
+			pcb_poly_clear_from_poly(data, PCB_OBJ_LINE, layer, line);
+		}
+		PCB_END_LOOP;
+		PCB_TEXT_LOOP(layer);
+		{
+			pcb_poly_restore_to_poly(data, PCB_OBJ_TEXT, layer, text);
+			pcb_r_delete_entry(layer->text_tree, (pcb_box_t *)text);
+			XFLIP(text->X);
+			YFLIP(text->Y);
+			if (et_swap_sides && ONLY1)
+				PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
+			pcb_text_bbox(pcb_font(PCB, text->fid, 1), text);
+			pcb_r_insert_entry(layer->text_tree, (pcb_box_t *)text);
+			pcb_poly_clear_from_poly(data, PCB_OBJ_TEXT, layer, text);
+		}
+		PCB_END_LOOP;
+		PCB_POLY_LOOP(layer);
+		{
+			int i, j;
+			pcb_r_delete_entry(layer->polygon_tree, (pcb_box_t *)polygon);
+			PCB_POLY_POINT_LOOP(polygon);
+			{
+				XFLIP(point->X);
+				YFLIP(point->Y);
+			}
+			PCB_END_LOOP;
+			if (ONLY1) {
+				i = 0;
+				j = polygon->PointN - 1;
+				while (i < j) {
+					pcb_point_t p = polygon->Points[i];
+					polygon->Points[i] = polygon->Points[j];
+					polygon->Points[j] = p;
+					i++;
+					j--;
+				}
+			}
+			pcb_poly_bbox(polygon);
+			pcb_r_insert_entry(layer->polygon_tree, (pcb_box_t *)polygon);
+			pcb_poly_init_clip(data, layer, polygon);
+		}
+		PCB_END_LOOP;
+		PCB_ARC_LOOP(layer);
+		{
+			pcb_poly_restore_to_poly(data, PCB_OBJ_ARC, layer, arc);
+			pcb_r_delete_entry(layer->arc_tree, (pcb_box_t *)arc);
+			XFLIP(arc->X);
+			YFLIP(arc->Y);
+			AFLIP(arc->StartAngle);
+			if (ONLY1)
+				NEG(arc->Delta);
+			pcb_arc_bbox(arc);
+			pcb_r_insert_entry(layer->arc_tree, (pcb_box_t *)arc);
+			pcb_poly_clear_from_poly(data, PCB_OBJ_ARC, layer, arc);
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+	PCB_PADSTACK_LOOP(data);
+	{
+		pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)padstack);
+		pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, padstack, padstack);
+		XFLIP(padstack->x);
+		YFLIP(padstack->y);
+		pcb_pstk_bbox(padstack);
+		pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)padstack);
+		pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, padstack, padstack);
+	}
+	PCB_END_LOOP;
+	PCB_SUBC_LOOP(data);
+	{
+		pcb_flip_data(subc->data, flip_x, flip_y, xo, yo, et_swap_sides);
+		if (et_swap_sides) {
+#warning subc TODO: layer mirror, also test one-sided padstack
+		}
+	}
+	PCB_END_LOOP;
+	PCB_RAT_LOOP(data);
+	{
+		pcb_r_delete_entry(data->rat_tree, (pcb_box_t *)line);
+		XFLIP(line->Point1.X);
+		XFLIP(line->Point2.X);
+		YFLIP(line->Point1.Y);
+		YFLIP(line->Point2.Y);
+		pcb_r_insert_entry(data->rat_tree, (pcb_box_t *)line);
+	}
+	PCB_END_LOOP;
+}
+
+static const char pcb_acts_boardflip[] = "BoardFlip([sides])";
+static const char pcb_acth_boardflip[] = "Mirror the board over the x axis, optionally mirroring sides as well.";
+static fgw_error_t pcb_act_boardflip(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = -2;
+	int h = PCB->MaxHeight;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, boardflip, op = fgw_keyword(&argv[1]));
+
+	pcb_flip_data(PCB->Data, pcb_false, pcb_true, 0, h, (op == F_Sides));
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static pcb_action_t boardflip_action_list[] = {
+	{"BoardFlip", pcb_act_boardflip, pcb_acth_boardflip, pcb_acts_boardflip}
+};
+
+char *boardflip_cookie = "boardflip plugin";
+
+PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie)
+
+int pplg_check_ver_boardflip(int ver_needed) { return 0; }
+
+void pplg_uninit_boardflip(void)
+{
+	pcb_remove_actions_by_cookie(boardflip_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_boardflip(void)
+{
+	PCB_API_CHK_VER;
+
+	PCB_REGISTER_ACTIONS(boardflip_action_list, boardflip_cookie);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/boardflip/boardflip.h
===================================================================
--- tags/2.0.1/src_plugins/boardflip/boardflip.h	(nonexistent)
+++ tags/2.0.1/src_plugins/boardflip/boardflip.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include "data.h"
+#include "unit.h"
+
+/* et_swap_sides: toggle elements/text solder side flag */
+void pcb_flip_data(pcb_data_t *data, pcb_bool flip_x, pcb_bool flip_y, pcb_coord_t xo, pcb_coord_t yo, pcb_bool et_swap_sides);
+
Index: tags/2.0.1/src_plugins/boardflip/boardflip.pup
===================================================================
--- tags/2.0.1/src_plugins/boardflip/boardflip.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/boardflip/boardflip.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short flip board objects
+$long All objects on the board are up-down flipped.
+$package (core)
+$lstate doesn't update rtrees
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/cam/Makefile
===================================================================
--- tags/2.0.1/src_plugins/cam/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_cam
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/cam/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/cam/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,23 @@
+put /local/pcb/mod {cam}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/cam/cam.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/cam/cam_conf.h}
+
+switch /local/pcb/cam/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
+switch /local/pcb/cam/controls
+	case {disable}   end;
+	default
+		append /local/pcb/DEPDEPS { ../src_plugins/cam/conf_internal.c }
+		append /local/pcb/DISTCLEANFILES { ../src_plugins/cam/conf_internal.c }
+		append /local/pcb/rules/install_ {\n	$(SCCBOX) $(HOW) "../src_plugins/cam/cam.conf" "$(DATADIR)/cam.conf"}
+
+		append /local/pcb/RULES [@
+../src_plugins/cam/conf_internal.c: ../src_plugins/cam/cam.conf $(CQUOTE)
+	$(CQUOTE) -n cam_conf_internal < ../src_plugins/cam/cam.conf > ../src_plugins/cam/conf_internal.c
+@]
+	end
+end
Index: tags/2.0.1/src_plugins/cam/cam.c
===================================================================
--- tags/2.0.1/src_plugins/cam/cam.c	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/cam.c	(revision 18980)
@@ -0,0 +1,283 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  cam export jobs plugin
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <ctype.h>
+#include <genvector/gds_char.h>
+
+#include "hid_cam.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "plugins.h"
+#include "actions.h"
+#include "cam_conf.h"
+#include "compat_misc.h"
+#include "compat_fs.h"
+#include "../src_plugins/cam/conf_internal.c"
+
+
+static const char *cam_cookie = "cam exporter";
+
+conf_cam_t conf_cam;
+#define CAM_CONF_FN "cam.conf"
+
+typedef struct {
+	char *prefix;            /* strdup'd file name prefix from the last prefix command */
+	pcb_hid_t *exporter;
+
+	char *args;              /* strdup'd argument string from the last plugin command - already split up */
+	char *argv[128];         /* [0] and [1] are for --cam; the rest point into args */
+	int argc;
+
+	gds_t tmp;
+} cam_ctx_t;
+
+static void cam_init_inst(cam_ctx_t *ctx)
+{
+	memset(ctx, 0, sizeof(cam_ctx_t));
+}
+
+static void cam_uninit_inst(cam_ctx_t *ctx)
+{
+	free(ctx->prefix);
+	free(ctx->args);
+	gds_uninit(&ctx->tmp);
+}
+
+static int cam_exec_inst(void *ctx_, char *cmd, char *arg)
+{
+	cam_ctx_t *ctx = ctx_;
+	char *curr, *next;
+	char **argv = ctx->argv;
+
+
+	if (strcmp(cmd, "prefix") == 0) {
+		char *end;
+
+		free(ctx->prefix);
+		ctx->prefix = pcb_strdup(arg);
+
+		/* mkdir -p if there's a path sep in the prefix */
+		end = strrchr(arg, PCB_DIR_SEPARATOR_C);
+		if (end == NULL)
+			return 0;
+		*end = '\0';
+
+		for(curr = arg; curr != NULL; curr = next) {
+			next = strrchr(curr, PCB_DIR_SEPARATOR_C);
+			if (next != NULL)
+				*next = '\0';
+			pcb_mkdir(arg, 0755);
+			if (next != NULL) {
+				*next = PCB_DIR_SEPARATOR_C;
+				next++;
+			}
+		}
+
+	}
+	else if (strcmp(cmd, "desc") == 0) {
+		/* ignore */
+	}
+	else if (strcmp(cmd, "write") == 0) {
+		int argc = ctx->argc;
+		if (ctx->exporter == NULL) {
+			pcb_message(PCB_MSG_ERROR, "cam: no exporter selected before write\n");
+			return -1;
+		}
+
+		/* build the --cam args using the prefix */
+		ctx->argv[0] = "--cam";
+		gds_truncate(&ctx->tmp, 0);
+		if (ctx->prefix != NULL)
+			gds_append_str(&ctx->tmp, ctx->prefix);
+		gds_append_str(&ctx->tmp, arg);
+		ctx->argv[1] = ctx->tmp.array;
+
+		if (ctx->exporter->parse_arguments(&argc, &argv) != 0) {
+			pcb_message(PCB_MSG_ERROR, "cam: exporter '%s' refused the arguments\n", arg);
+			return -1;
+		}
+		ctx->exporter->do_export(0);
+		return 0;
+	}
+	else if (strcmp(cmd, "plugin") == 0) {
+		curr = strpbrk(arg, " \t");
+		if (curr != NULL) {
+			*curr = '\0';
+			curr++;
+		}
+		ctx->exporter = pcb_hid_find_exporter(arg);
+		if (ctx->exporter == NULL) {
+			pcb_message(PCB_MSG_ERROR, "cam: can not find export plugin: '%s'\n", arg);
+			return -1;
+		}
+		free(ctx->args);
+		curr = ctx->args = pcb_strdup(curr);
+		ctx->argc = 2; /* [0] and [1] are reserved for the --cam argument */
+		for(; curr != NULL; curr = next) {
+			if (ctx->argc >= (sizeof(ctx->argv) / sizeof(ctx->argv[0]))) {
+				pcb_message(PCB_MSG_ERROR, "cam: too many arguments for plugin '%s'\n", arg);
+				return -1;
+			}
+			while(isspace(*curr)) curr++;
+			next = strpbrk(curr, " \t");
+			if (next != NULL) {
+				*next = '\0';
+				next++;
+			}
+			if (*curr == '\0')
+				continue;
+			argv[ctx->argc] = curr;
+			ctx->argc++;
+			
+		}
+		argv[ctx->argc] = NULL;
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "cam: syntax error (unknown instruction): '%s'\n", cmd);
+		return -1;
+	}
+	return 0;
+}
+
+/* Parse and execute a script */
+static int cam_exec(const char *script_in, int (*exec)(void *ctx, char *cmd, char *arg), void *ctx)
+{
+	char *arg, *curr, *next, *script = pcb_strdup(script_in);
+	int res = 0;
+
+	for(curr = script; curr != NULL; curr = next) {
+		while(isspace(*curr)) curr++;
+		next = strpbrk(curr, ";\r\n");
+		if (next != NULL) {
+			*next = '\0';
+			next++;
+		}
+		if (*curr == '\0')
+			continue;
+		arg = strpbrk(curr, " \t");
+		if (arg != NULL) {
+			*arg = '\0';
+			arg++;
+		}
+		res |= exec(ctx, curr, arg);
+	}
+
+	free(script);
+	return res;
+}
+
+/* look up a job by name in the config */
+static const char *cam_find_job(const char *job)
+{
+	conf_listitem_t *j;
+	int idx;
+
+	conf_loop_list(&conf_cam.plugins.cam.jobs, j, idx)
+		if (strcmp(j->name, job) == 0)
+			return j->payload;
+
+	return NULL;
+}
+
+/* execute the instructions of a job specified by name */
+static int cam_call(const char *job)
+{
+	const char *script = cam_find_job(job);
+
+	if (script != NULL) {
+		int res;
+		cam_ctx_t ctx;
+
+
+		cam_init_inst(&ctx);
+		res = cam_exec(script, cam_exec_inst, &ctx);
+		cam_uninit_inst(&ctx);
+		return res;
+	}
+
+	pcb_message(PCB_MSG_ERROR, "cam: can not find job configuration '%s'\n", job);
+	return -1;
+}
+
+
+static const char pcb_acts_cam[] = "cam(exec, script)\ncam(call, jobname)";
+static const char pcb_acth_cam[] = "Export jobs for feeding cam processes";
+static fgw_error_t pcb_act_cam(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd, *arg;
+	int rs = -1;
+
+	PCB_ACT_CONVARG(1, FGW_STR, cam, cmd = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, cam, arg = argv[2].val.str);
+
+	if (pcb_strcasecmp(cmd, "exec") == 0) {
+		cam_ctx_t ctx;
+
+		cam_init_inst(&ctx);
+		rs = cam_exec(arg, cam_exec_inst, &ctx);
+		cam_uninit_inst(&ctx);
+	}
+	else if (pcb_strcasecmp(cmd, "call") == 0)
+		rs = cam_call(arg);
+
+	PCB_ACT_IRES(rs);
+	return 0;
+}
+
+
+static pcb_action_t cam_action_list[] = {
+	{"cam", pcb_act_cam, pcb_acth_cam, pcb_acts_cam}
+};
+
+PCB_REGISTER_ACTIONS(cam_action_list, cam_cookie)
+
+int pplg_check_ver_cam(int ver_needed) { return 0; }
+
+void pplg_uninit_cam(void)
+{
+	conf_unreg_file(CAM_CONF_FN, cam_conf_internal);
+	conf_unreg_fields("plugins/cam/");
+	pcb_remove_actions_by_cookie(cam_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_cam(void)
+{
+	PCB_API_CHK_VER;
+	conf_reg_file(CAM_CONF_FN, cam_conf_internal);
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags);
+#include "cam_conf_fields.h"
+
+	PCB_REGISTER_ACTIONS(cam_action_list, cam_cookie)
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/cam/cam.conf
===================================================================
--- tags/2.0.1/src_plugins/cam/cam.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/cam.conf	(revision 18980)
@@ -0,0 +1,16 @@
+li:pcb-rnd-conf-v1 {
+	ha:append {
+		ha:plugins {
+			ha:cam {
+				li:jobs {
+					doc_png {
+						desc export top and bottom copper and silk in 600 DPI pngs
+						plugin png --dpi 600
+						write top.png=top-copper,top-silk
+						write bottom.png=bottom-copper,bottom-silk
+					}
+				}
+			}
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/cam/cam.pup
===================================================================
--- tags/2.0.1/src_plugins/cam/cam.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/cam.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class export
+$short cam/job based export
+$long Configurable output job based batch exporting
+$state WIP
+$package export
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/cam/cam_conf.h
===================================================================
--- tags/2.0.1/src_plugins/cam/cam_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/cam/cam_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_VENDOR_CONF_H
+#define PCB_VENDOR_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct cam {
+			CFT_LIST jobs;         /* named cam scripts */
+		} cam;
+	} plugins;
+} conf_cam_t;
+
+#endif
Index: tags/2.0.1/src_plugins/ddraft/Makefile
===================================================================
--- tags/2.0.1/src_plugins/ddraft/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_ddraft
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/ddraft/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/ddraft/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,13 @@
+put /local/pcb/mod {ddraft}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/ddraft/ddraft.o
+	$(PLUGDIR)/ddraft/centgeo.o
+	$(PLUGDIR)/ddraft/fields_sphash.o
+@]
+put /local/pcb/mod/SPHASH  {$(PLUGDIR)/ddraft/fields.sphash}
+
+switch /local/pcb/ddraft/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/ddraft/centgeo.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/centgeo.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/centgeo.c	(revision 18980)
@@ -0,0 +1,419 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  2d drafting plugin: center line geometry
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "centgeo.h"
+
+#include "obj_line.h"
+#include "obj_arc.h"
+#include "math_helper.h"
+#include "compat_misc.h"
+#include "search.h"
+
+/* Note about all intersection code: same basic algo as in find_geo.c -
+   see comment for the algo description there */
+
+int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, pcb_box_t *ip, double offs[2])
+{
+	double s, r;
+	double line1_dx, line1_dy, line2_dx, line2_dy, point1_dx, point1_dy;
+
+	/* setup some constants */
+	line1_dx = Line1->Point2.X - Line1->Point1.X;
+	line1_dy = Line1->Point2.Y - Line1->Point1.Y;
+	line2_dx = Line2->Point2.X - Line2->Point1.X;
+	line2_dy = Line2->Point2.Y - Line2->Point1.Y;
+	point1_dx = Line1->Point1.X - Line2->Point1.X;
+	point1_dy = Line1->Point1.Y - Line2->Point1.Y;
+
+	/* set s to cross product of Line1 and the line
+	 *   Line1.Point1--Line2.Point1 (as vectors) */
+	s = point1_dy * line1_dx - point1_dx * line1_dy;
+
+	/* set r to cross product of both lines (as vectors) */
+	r = line1_dx * line2_dy - line1_dy * line2_dx;
+
+	/* No cross product means parallel or overlapping lines */
+	if (r == 0.0) {
+		if (s == 0.0) { /* overlap; r and [0] will be Line2's point offset within Line1; s and [1] will be an endpoint of line1 */
+
+			r = pcb_cline_pt_offs(Line1, Line2->Point1.X, Line2->Point1.Y);
+			if ((r < 0.0) || (r > 1.0))
+				r = pcb_cline_pt_offs(Line1, Line2->Point2.X, Line2->Point2.Y);
+
+			s = pcb_cline_pt_offs(Line2, Line1->Point1.X, Line1->Point1.Y);
+			if ((s < 0.0) || (s > 1.0))
+				s = 0.0;
+			else
+				s = 1.0;
+
+			if (ip != NULL) {
+				ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx);
+				ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy);
+				if (s == 1.0) {
+					ip->X2 = Line1->Point2.X;
+					ip->Y2 = Line1->Point2.Y;
+				}
+				else {
+					ip->X2 = Line1->Point1.X;
+					ip->Y2 = Line1->Point1.Y;
+				}
+			}
+			if (offs != NULL) {
+				offs[0] = r;
+				offs[1] = s;
+			}
+			return 2;
+		}
+		return 0;
+	}
+
+	s /= r;
+	r = (point1_dy * line2_dx - point1_dx * line2_dy) / r;
+
+	/* intersection is at least on AB */
+	if (r >= 0.0 && r <= 1.0) {
+		if (s >= 0.0 && s <= 1.0) {
+			if (ip != NULL) {
+				ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx);
+				ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy);
+			}
+			if (offs != NULL)
+				offs[0] = r;
+			return 1;
+		}
+		return 0;
+	}
+
+	/* intersection is at least on CD */
+	/* [removed this case since it always returns pcb_false --asp] */
+	return 0;
+}
+
+void pcb_cline_offs(pcb_line_t *line, double offs, pcb_coord_t *dstx, pcb_coord_t *dsty)
+{
+	double line_dx, line_dy;
+
+	line_dx = line->Point2.X - line->Point1.X;
+	line_dy = line->Point2.Y - line->Point1.Y;
+
+	*dstx = pcb_round((double)line->Point1.X + offs * line_dx);
+	*dsty = pcb_round((double)line->Point1.Y + offs * line_dy);
+}
+
+double pcb_cline_pt_offs(pcb_line_t *line, pcb_coord_t px, pcb_coord_t py)
+{
+	double line_dx, line_dy, pt_dx, pt_dy;
+
+	line_dx = line->Point2.X - line->Point1.X;
+	line_dy = line->Point2.Y - line->Point1.Y;
+
+	pt_dx = px - line->Point1.X;
+	pt_dy = py - line->Point1.Y;
+
+	return (line_dx * pt_dx + line_dy * pt_dy) / (line_dx*line_dx + line_dy*line_dy);
+}
+
+static int line_ep(pcb_line_t *line, pcb_coord_t x, pcb_coord_t y)
+{
+	if ((line->Point1.X == x) && (line->Point1.Y == y)) return 1;
+	if ((line->Point2.X == x) && (line->Point2.Y == y)) return 1;
+	return 0;
+}
+
+/* Assumme there will be at two intersection points; load ofs/ix/iy in the
+   next slot of the result, return from the function if both intersections
+   found */
+#define append(ofs, ix, iy) \
+do { \
+	if (ip != NULL) { \
+		if (found == 0) { \
+			ip->X1 = ix; \
+			ip->Y1 = iy; \
+		} \
+		else { \
+			ip->X2 = ix; \
+			ip->Y2 = iy; \
+		} \
+	} \
+	if (offs != NULL) \
+		offs[found] = ofs; \
+	found++; \
+	if (found == 2) \
+		return found; \
+} while(0)
+
+static int intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs[2], int oline)
+{
+	double dx, dy, dx1, dy1, l, d, r, r2, Radius;
+	pcb_coord_t ex, ey, ix, iy;
+	int found = 0;
+
+	dx = Line->Point2.X - Line->Point1.X;
+	dy = Line->Point2.Y - Line->Point1.Y;
+	dx1 = Line->Point1.X - Arc->X;
+	dy1 = Line->Point1.Y - Arc->Y;
+	l = dx * dx + dy * dy;
+	d = dx * dy1 - dy * dx1;
+	d *= d;
+
+	/* use the larger diameter circle first */
+	Radius = Arc->Width;
+	Radius *= Radius;
+	r2 = Radius * l - d;
+	/* projection doesn't even intersect circle when r2 < 0 */
+	if (r2 < 0)
+		return 0;
+
+	/* line ends on arc? */
+	if (pcb_is_point_on_arc(Line->Point1.X, Line->Point1.Y, 0, Arc)) {
+		if (oline)
+			append(0, Line->Point1.X, Line->Point1.Y);
+		else
+			append(pcb_carc_pt_offs(Arc, Line->Point1.X, Line->Point1.Y), Line->Point1.X, Line->Point1.Y);
+	}
+	if (pcb_is_point_on_arc(Line->Point2.X, Line->Point2.Y, 0, Arc)) {
+		if (oline)
+			append(1, Line->Point2.X, Line->Point2.Y);
+		else
+			append(pcb_carc_pt_offs(Arc, Line->Point2.X, Line->Point2.Y), Line->Point2.X, Line->Point2.Y);
+	}
+
+	/* if line is a single point, there is no other way an intersection can happen */
+	if (l == 0.0)
+		return found;
+
+	r2 = sqrt(r2);
+	Radius = -(dx * dx1 + dy * dy1);
+	r = (Radius + r2) / l;
+
+	if ((r >= 0) && (r <= 1)) {
+		ix = pcb_round(Line->Point1.X + r * dx);
+		iy = pcb_round(Line->Point1.Y + r * dy);
+		if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) {
+			if (oline)
+				append(r, ix, iy);
+			else
+				append(pcb_carc_pt_offs(Arc, ix, iy), ix, iy);
+		}
+	}
+
+	r = (Radius - r2) / l;
+	if ((r >= 0) && (r <= 1)) {
+		ix = pcb_round(Line->Point1.X + r * dx);
+		iy = pcb_round(Line->Point1.Y + r * dy);
+		if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) {
+			if (oline)
+				append(r, ix, iy);
+			else
+				append(pcb_carc_pt_offs(Arc, ix, iy), ix, iy);
+		}
+	}
+
+	/* check if an arc end point is on the line */
+	pcb_arc_get_end(Arc, 0, &ex, &ey);
+	if (pcb_is_point_in_line(ex, ey, 1, (pcb_any_line_t *) Line)) {
+		if (oline) {
+			r = pcb_cline_pt_offs(Line, ex, ey);
+			append(r, ex, ey);
+		}
+		else
+			append(0, ex, ey);
+	}
+	pcb_arc_get_end(Arc, 1, &ex, &ey);
+	if (pcb_is_point_in_line(ex, ey, 1, (pcb_any_line_t *) Line)) {
+		if (oline) {
+			r = pcb_cline_pt_offs(Line, ex, ey);
+			append(r, ex, ey);
+		}
+		else
+			append(1, ex, ey);
+	}
+
+	return found;
+}
+
+int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs[2])
+{
+	return intersect_cline_carc(Line, Arc, ip, offs, 1);
+}
+
+int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, pcb_box_t *ip, double offs[2])
+{
+	return intersect_cline_carc(Line, Arc, ip, offs, 0);
+}
+
+
+void pcb_carc_offs(pcb_arc_t *arc, double offs, pcb_coord_t *dstx, pcb_coord_t *dsty)
+{
+	double ang = (arc->StartAngle + offs * arc->Delta) / PCB_RAD_TO_DEG;
+
+	*dstx = arc->X + cos(ang) * arc->Width;
+	*dsty = arc->Y - sin(ang) * arc->Height;
+}
+
+double pcb_carc_pt_offs(pcb_arc_t *arc, pcb_coord_t px, pcb_coord_t py)
+{
+	double dx, dy, ang, end;
+
+	/* won't work with elliptical arc - see also pcb_is_point_on_arc */
+	dy = (double)(py - arc->Y) / (double)arc->Height;
+	dx = (double)(px - arc->X) / (double)arc->Width;
+	ang = (-atan2(dy, dx)) * PCB_RAD_TO_DEG + 180;
+	end = arc->StartAngle + arc->Delta;
+
+	/* normalize the angle: there are multiple ways an arc can cover the same
+	   angle range, e.g.  -10+30 and +20-30 - make sure the angle falls between
+	   the start/end (generic) range */
+	if (arc->StartAngle < end) {
+		if (ang > end)
+			ang -= 360;
+		if (ang < arc->StartAngle)
+			ang += 360;
+	}
+	else {
+		if (ang > arc->StartAngle)
+			ang -= 360;
+		if (ang < end)
+			ang += 360;
+	}
+
+	ang = (ang - arc->StartAngle) / arc->Delta;
+
+	return ang;
+}
+
+
+static void get_arc_ends(pcb_coord_t *box, pcb_arc_t *arc)
+{
+	box[0] = arc->X - arc->Width * cos(PCB_M180 * arc->StartAngle);
+	box[1] = arc->Y + arc->Height * sin(PCB_M180 * arc->StartAngle);
+	box[2] = arc->X - arc->Width * cos(PCB_M180 * (arc->StartAngle + arc->Delta));
+	box[3] = arc->Y + arc->Height * sin(PCB_M180 * (arc->StartAngle + arc->Delta));
+}
+
+/* reduce arc start angle and delta to 0..360 */
+static void normalize_angles(pcb_angle_t *sa, pcb_angle_t *d)
+{
+	if (*d < 0) {
+		*sa += *d;
+		*d = -*d;
+	}
+	if (*d > 360) /* full circle */
+		*d = 360;
+	*sa = pcb_normalize_angle(*sa);
+}
+
+static int radius_crosses_arc(double x, double y, pcb_arc_t *arc)
+{
+	double alpha = atan2(y - arc->Y, -x + arc->X) * PCB_RAD_TO_DEG;
+	pcb_angle_t sa = arc->StartAngle, d = arc->Delta;
+
+	normalize_angles(&sa, &d);
+	if (alpha < 0)
+		alpha += 360;
+	if (sa <= alpha)
+		return (sa + d) >= alpha;
+	return (sa + d - 360) >= alpha;
+}
+
+int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, pcb_box_t *ip, double offs[2])
+{
+	double x, y, dx, dy, r1, r2, a, d, l, dl;
+	pcb_coord_t pdx, pdy;
+	pcb_coord_t box[8];
+	int found = 0;
+
+	/* try the end points first */
+	get_arc_ends(&box[0], Arc1);
+	get_arc_ends(&box[4], Arc2);
+	if (pcb_is_point_on_arc(box[0], box[1], 1, Arc2)) append(0, box[0], box[1]);
+	if (pcb_is_point_on_arc(box[2], box[3], 1, Arc2)) append(1, box[2], box[3]);
+	if (pcb_is_point_on_arc(box[4], box[5], 1, Arc1)) append(pcb_carc_pt_offs(Arc1, box[4], box[5]), box[4], box[5]);
+	if (pcb_is_point_on_arc(box[6], box[7], 1, Arc1)) append(pcb_carc_pt_offs(Arc1, box[6], box[7]), box[6], box[7]);
+
+	pdx = Arc2->X - Arc1->X;
+	pdy = Arc2->Y - Arc1->Y;
+	dl = pcb_distance(Arc1->X, Arc1->Y, Arc2->X, Arc2->Y);
+
+	/* the original code used to do angle checks for concentric case here but
+	   those cases are already handled by the above endpoint checks. */
+
+	r1 = Arc1->Width;
+	r2 = Arc2->Width;
+	/* arcs centerlines are too far or too near */
+	if (dl > r1 + r2 || dl + r1 < r2 || dl + r2 < r1) {
+		/* check the nearest to the other arc's center point */
+		dx = pdx * r1 / dl;
+		dy = pdy * r1 / dl;
+		if (dl + r1 < r2) { /* Arc1 inside Arc2 */
+			dx = -dx;
+			dy = -dy;
+		}
+
+		if (radius_crosses_arc(Arc1->X + dx, Arc1->Y + dy, Arc1) && pcb_is_point_on_arc(Arc1->X + dx, Arc1->Y + dy, 1, Arc2))
+			append(pcb_carc_pt_offs(Arc1, Arc1->X + dx, Arc1->Y + dy), Arc1->X + dx, Arc1->Y + dy);
+
+		dx = -pdx * r2 / dl;
+		dy = -pdy * r2 / dl;
+		if (dl + r2 < r1) { /* Arc2 inside Arc1 */
+			dx = -dx;
+			dy = -dy;
+		}
+
+		if (radius_crosses_arc(Arc2->X + dx, Arc2->Y + dy, Arc2) && pcb_is_point_on_arc(Arc2->X + dx, Arc2->Y + dy, 1, Arc1))
+			append(pcb_carc_pt_offs(Arc1, Arc2->X + dx, Arc2->Y + dy), Arc2->X + dx, Arc2->Y + dy);
+	}
+
+	l = dl * dl;
+	r1 *= r1;
+	r2 *= r2;
+	a = 0.5 * (r1 - r2 + l) / l;
+	r1 = r1 / l;
+	d = r1 - a * a;
+	/* the circles are too far apart to touch or probably just touch:
+	   check the nearest point */
+	if (d < 0)
+		d = 0;
+	else
+		d = sqrt(d);
+	x = Arc1->X + a * pdx;
+	y = Arc1->Y + a * pdy;
+	dx = d * pdx;
+	dy = d * pdy;
+	if ((radius_crosses_arc(x + dy, y - dx, Arc1) && pcb_is_point_on_arc(x + dy, y - dx, 1, Arc2)) || (radius_crosses_arc(x + dy, y - dx, Arc2) && pcb_is_point_on_arc(x + dy, y - dx, 1, Arc1)))
+		append(pcb_carc_pt_offs(Arc1, x + dy, y - dx), x + dy, y - dx);
+
+	if ((radius_crosses_arc(x - dy, y + dx, Arc1) && pcb_is_point_on_arc(x - dy, y + dx, 1, Arc2)) || (radius_crosses_arc(x - dy, y + dx, Arc2) && pcb_is_point_on_arc(x - dy, y + dx, 1, Arc1)))
+		append(pcb_carc_pt_offs(Arc1, x - dy, y + dx), x - dy, y + dx);
+
+	return found;
+}
+
Index: tags/2.0.1/src_plugins/ddraft/centgeo.h
===================================================================
--- tags/2.0.1/src_plugins/ddraft/centgeo.h	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/centgeo.h	(revision 18980)
@@ -0,0 +1,41 @@
+#ifndef PCB_CENTGEO_H
+#define PCB_CENTGEO_H
+
+#include "obj_line.h"
+
+/*** Calculate centerpoint intersections of objects (thickness ignored) ***/
+
+/* Calculate the intersection point(s) of two lines and store them in ip
+   and/or offs (on Line1) if they are not NULL. Returns:
+   0 = no intersection
+   1 = one intersection (X1;Y1 of ip is loaded)
+   2 = overlapping segments (overlap endpoitns are stored in X1;Y1 and X2;Y2 of ip) */
+int pcb_intersect_cline_cline(pcb_line_t *Line1, pcb_line_t *Line2, pcb_box_t *ip, double offs[2]);
+
+/* Calculate the intersection point(s) of a lines and an arc and store them
+   in ip and/or offs if they are not NULL. Returns:
+   0 = no intersection
+   1 = one intersection (X1;Y1 of ip is loaded)
+   2 = two intersections (stored in X1;Y1 and X2;Y2 of ip) */
+int pcb_intersect_cline_carc(pcb_line_t *Line, pcb_arc_t *Arc, pcb_box_t *ip, double offs_line[2]);
+int pcb_intersect_carc_cline(pcb_arc_t *Arc, pcb_line_t *Line, pcb_box_t *ip, double offs_arc[2]);
+
+/* Calculate the intersection point(s) of two arcs and store them in ip
+   and/or offs (on Line1) if they are not NULL. Returns:
+   0 = no intersection
+   1 = one intersection (X1;Y1 of ip is loaded)
+   2 = two intersections or overlapping segments (overlap endpoints are stored in X1;Y1 and X2;Y2 of ip) */
+int pcb_intersect_carc_carc(pcb_arc_t *Arc1, pcb_arc_t *Arc2, pcb_box_t *ip, double offs[2]);
+
+
+/* Calculate the point on an object corresponding to a [0..1] offset and store
+   the result in dstx;dsty. */
+void pcb_cline_offs(pcb_line_t *line, double offs, pcb_coord_t *dstx, pcb_coord_t *dsty);
+void pcb_carc_offs(pcb_arc_t *arc, double offs, pcb_coord_t *dstx, pcb_coord_t *dsty);
+
+/* Project a point (px;py) onto an object and return the offset from point1 */
+double pcb_cline_pt_offs(pcb_line_t *line, pcb_coord_t px, pcb_coord_t py);
+double pcb_carc_pt_offs(pcb_arc_t *arc, pcb_coord_t px, pcb_coord_t py);
+
+
+#endif
Index: tags/2.0.1/src_plugins/ddraft/cli.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/cli.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/cli.c	(revision 18980)
@@ -0,0 +1,580 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  2d drafting plugin
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "hid_inlines.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+
+#define CLI_MAX_INS_LEN 128
+
+typedef struct cli_node_s cli_node_t;
+
+typedef struct {
+	const char *name;
+	int (*exec)(char *line, int argc, cli_node_t *argv);                 /* command line entered (finished, accepted) */
+	int (*click)(char *line, int cursor, int argc, cli_node_t *argv);    /* user clicked on the GUI while editing the command line */
+	int (*tab)(char *line, int cursor, int argc, cli_node_t *argv);      /* tab completion */
+	int (*edit)(char *line, int cursor, int argc, cli_node_t *argv);     /* called after editing the line or moving the cursor */
+} ddraft_op_t;
+
+typedef enum cli_ntype_e {
+	CLI_INVALID,
+	CLI_FROM,
+	CLI_TO,
+	CLI_ANGLE,
+	CLI_ABSOLUTE,
+	CLI_RELATIVE,
+
+	CLI_PERP,
+	CLI_PARAL,
+	CLI_TANGENT,
+	CLI_CENTER,
+	CLI_START,
+	CLI_END,
+
+	CLI_DIST,
+	CLI_OFFS,
+	CLI_COORD
+} cli_ntype_t;
+
+#define case_object \
+	case CLI_PERP: case CLI_PARAL: case CLI_TANGENT: case CLI_CENTER: \
+	case CLI_START: case CLI_END
+
+typedef struct cli_ntname_s {
+	const char *name;
+	cli_ntype_t type;
+} cli_ntname_t;
+
+static const cli_ntname_t cli_tnames[] = {
+	{"from",          CLI_FROM},
+	{"to",            CLI_TO},
+	{"angle",         CLI_ANGLE},
+	{"absolute",      CLI_ABSOLUTE},
+	{"relative",      CLI_RELATIVE},
+	{"perpendicular", CLI_PERP},
+	{"parallel",      CLI_PARAL},
+	{"tangential",    CLI_TANGENT},
+	{"center",        CLI_CENTER},
+	{"start",         CLI_START},
+	{"end",           CLI_END},
+	{"coord",         CLI_COORD},
+	{"distance",      CLI_DIST},
+	{"length",        CLI_DIST},
+	{"offset",        CLI_OFFS},
+	{NULL,            0}
+};
+
+struct cli_node_s {
+	cli_ntype_t type;
+	int begin, end; /* cursor pos */
+	int invalid;
+
+	pcb_coord_t x, y, dist;
+	pcb_angle_t angle, offs;
+	pcb_cardinal_t id;
+};
+
+static const cli_ntype_t find_type(const char *type, int typelen)
+{
+	const cli_ntname_t *p, *found = NULL;
+
+	if (typelen < 1)
+		return CLI_INVALID;
+
+	for(p = cli_tnames; p->name != NULL; p++) {
+		if (pcb_strncasecmp(p->name, type, typelen) == 0) {
+			if (found != NULL)
+				return CLI_INVALID; /* multiple match */
+			found = p;
+		}
+	}
+
+	if (found == NULL)
+		return CLI_INVALID;
+	return found->type;
+}
+
+static const char *find_rev_type(cli_ntype_t type)
+{
+	const cli_ntname_t *p;
+
+	for(p = cli_tnames; p->name != NULL; p++)
+		if (p->type == type)
+			return p->name;
+
+	return "INVALID";
+}
+
+#define APPEND(type_, end_) \
+do { \
+	memset(&dst[i], 0, sizeof(cli_node_t)); \
+	dst[i].type = type_; \
+	dst[i].begin = s - line; \
+	dst[i].end = end_ - line; \
+	i++; \
+	if (i >= dstlen) \
+		return i; \
+} while(0)
+
+#define iscrd(c) ((c == '+') || (c == '-') || (c == '.')  || isdigit(c))
+#define last_type ((i > 0) ? dst[i-1].type : CLI_INVALID)
+
+static int cli_parse(cli_node_t *dst, int dstlen, const char *line)
+{
+	char tmp[128];
+	char *end, *sep, *s = strchr(line, ' '), *next; /* skip the instruction */
+	int i;
+	pcb_bool succ;
+
+	if (s == NULL)
+		return 0;
+
+	for(i = 0;; s = next) {
+		while(isspace(*s)) s++;
+		if (*s == '\0')
+			break;
+		switch(*s) {
+			case '@':
+				next = s+1;
+				APPEND(CLI_RELATIVE, next);
+				continue;
+			case '*':
+				next = s+1;
+				APPEND(CLI_ABSOLUTE, next);
+				continue;
+			case '<':
+				next = s+1;
+				APPEND(CLI_ANGLE, next);
+				continue;
+			case '%':
+				APPEND(CLI_OFFS, next);
+				dst[i-1].offs = strtod(s+1, &next);
+				dst[i-1].invalid = (next == s);
+				continue;
+			case '~':
+				next = s+1;
+				APPEND(CLI_DIST, next);
+				break;
+			default:
+				next = strchr(s, ' ');
+				if (next == NULL)
+					next = s+strlen(s);
+				if (iscrd(*s)) {
+					switch(last_type) {
+						case CLI_INVALID:
+						case CLI_FROM:
+						case CLI_TO:
+							APPEND(CLI_ABSOLUTE, s);
+						case CLI_RELATIVE:
+						case CLI_ABSOLUTE:
+							APPEND(CLI_COORD, next);
+							sep = strchr(s, ',');
+							if ((sep == NULL) || ((sep - s) > sizeof(tmp)-2)) {
+								dst[i-1].invalid = 1;
+								break;
+							}
+							memcpy(tmp, s, sep-s);
+							tmp[sep-s] = '\0';
+							dst[i-1].x = pcb_get_value_ex(tmp, NULL, NULL, NULL, conf_core.editor.grid_unit->suffix, &succ);
+							if (!succ)
+								dst[i-1].invalid = 1;
+
+							sep++;
+							if ((next - sep) > sizeof(tmp)-2) {
+								dst[i-1].invalid = 1;
+								break;
+							}
+							memcpy(tmp, sep, next-sep);
+							tmp[next-sep] = '\0';
+							dst[i-1].y = pcb_get_value_ex(tmp, NULL, NULL, NULL, conf_core.editor.grid_unit->suffix, &succ);
+							if (!succ)
+								dst[i-1].invalid = 1;
+							break;
+						case CLI_DIST:
+							dst[i-1].dist = pcb_get_value_ex(s, NULL, NULL, NULL, conf_core.editor.grid_unit->suffix, &succ);
+							dst[i-1].invalid = !succ;
+							dst[i-1].end = next - line;
+							break;
+						case CLI_ANGLE:
+							dst[i-1].angle = strtod(s, &next);
+							dst[i-1].invalid = (dst[i-1].angle > 360.0) || (dst[i-1].angle < -360.0);
+							dst[i-1].end = next - line;
+							break;
+						case_object :
+							dst[i-1].id = strtol(s, &next, 10);
+							dst[i-1].end = next - line;
+							break;
+						default:
+							APPEND(CLI_INVALID, next);
+					}
+				}
+				else
+					APPEND(find_type(s, next-s), next);
+		}
+		if ((next == NULL) || (*next == '\0'))
+			break;
+	}
+
+	return i;
+}
+
+#undef APPEND
+#undef iscrd
+#undef last_type
+
+static int cli_cursor_arg(int argc, cli_node_t *argv, int cursor)
+{
+	int n;
+	for(n = 0; n < argc; n++)
+		if ((cursor >= argv[n].begin) && (cursor <= argv[n].end))
+			return n;
+	return -1;
+}
+
+static void cli_str_remove(char *str, int from, int to)
+{
+	if (from >= to)
+		return;
+	memmove(str+from, str+to, strlen(str+to)+1);
+}
+
+
+static int cli_str_insert(char *str, int from, char *ins, int enforce_space_before)
+{
+	int inslen = strlen(ins), remain = strlen(str+from), extra = 0;
+	if (enforce_space_before && (str[from-1] != ' '))
+		extra=1;
+	memmove(str+from+inslen+extra, str+from, remain+1);
+	if (extra)
+		str[from] = ' ';
+	memcpy(str+from+extra, ins, inslen);
+	return from + inslen + extra;
+}
+
+static int cli_apply_coord(cli_node_t *argv, int start, int end, pcb_coord_t *ox, pcb_coord_t *oy, int annot)
+{
+	int n, relative = 0, have_angle = 0, have_dist = 0, len = (start > 1);
+	double angle = 0, dist = 0, lx, ly, x = *ox, y = *oy;
+	pcb_coord_t tx, ty;
+
+	for(n = start; n < end; n++) {
+		int moved = 0;
+		pcb_any_obj_t *to = NULL;
+
+		/* look up the target object for instructions referencing an object */
+		switch(argv[n].type) {
+			case_object :
+				if (argv[n].id > 0) {
+					void *p1, *p2, *p3;
+					int res;
+					res = pcb_search_obj_by_id_(PCB->Data, &p1, &p2, &p3, argv[n].id, PCB_OBJ_LINE);
+					if (res == 0)
+						res = pcb_search_obj_by_id_(PCB->Data, &p1, &p2, &p3, argv[n].id, PCB_OBJ_ARC);
+					if (res == 0)
+						res = pcb_search_obj_by_id_(PCB->Data, &p1, &p2, &p3, argv[n].id, PCB_OBJ_POLY);
+					if (res != 0)
+						to = p2;
+				}
+				if (to == NULL)
+					return -1;
+				break;
+			default:;
+		}
+
+		switch(argv[n].type) {
+			case CLI_ABSOLUTE:
+				relative = 0;
+				len = 0;
+				lx = ly = 0;
+				break;
+			case CLI_RELATIVE:
+				relative = 1;
+				break;
+
+			case CLI_ANGLE:
+				have_angle = 1;
+				if (relative) {
+					angle += argv[n].angle;
+					relative = 0;
+				}
+				else
+					angle = argv[n].angle;
+				goto apply;
+
+			case CLI_DIST:
+				have_dist = 1;
+				if (relative) {
+					dist += argv[n].dist;
+					relative = 0;
+				}
+				else
+					dist = argv[n].dist;
+				goto apply;
+
+			case CLI_COORD:
+				if (relative) {
+					x += argv[n].x;
+					y += argv[n].y;
+					relative = 0;
+					moved = 1;
+				}
+				else {
+					x = argv[n].x;
+					y = argv[n].y;
+					len = 0;
+					lx = ly = 0;
+					moved = 1;
+				}
+				break;
+
+			case CLI_PERP:
+				pcb_message(PCB_MSG_ERROR, "perp not yet implemented\n");
+				return -1;
+			case CLI_PARAL:
+				pcb_message(PCB_MSG_ERROR, "paral not yet implemented\n");
+				return -1;
+			case CLI_TANGENT:
+				pcb_message(PCB_MSG_ERROR, "tangent not yet implemented\n");
+				return -1;
+
+			case CLI_CENTER:
+				switch(to->type) {
+					case PCB_OBJ_LINE:
+						x = (((pcb_line_t *)to)->Point1.X + ((pcb_line_t *)to)->Point2.X)/2;
+						y = (((pcb_line_t *)to)->Point1.Y + ((pcb_line_t *)to)->Point2.Y)/2;
+						break;
+					case PCB_OBJ_ARC:
+						x = ((pcb_arc_t *)to)->X;
+						y = ((pcb_arc_t *)to)->Y;
+						break;
+					default:
+						return -1;
+					}
+				break;
+			case CLI_START:
+				switch(to->type) {
+					case PCB_OBJ_LINE:
+						x = ((pcb_line_t *)to)->Point1.X;
+						y = ((pcb_line_t *)to)->Point1.Y;
+						break;
+					case PCB_OBJ_ARC:
+						pcb_arc_get_end((pcb_arc_t *)to, 0, &tx, &ty);
+						x = tx;
+						y = ty;
+						break;
+					default:
+						return -1;
+				}
+				break;
+			case CLI_END:
+				switch(to->type) {
+					case PCB_OBJ_LINE:
+						x = ((pcb_line_t *)to)->Point2.X;
+						y = ((pcb_line_t *)to)->Point2.Y;
+						break;
+					case PCB_OBJ_ARC:
+						pcb_arc_get_end((pcb_arc_t *)to, 1, &tx, &ty);
+						x = tx;
+						y = ty;
+						break;
+					default:
+						return -1;
+				}
+				break;
+
+			default:
+				goto over;
+			apply:;
+				if (have_angle && have_dist) {
+					x += cos(angle / PCB_RAD_TO_DEG) * dist;
+					y += sin(angle / PCB_RAD_TO_DEG) * dist;
+					have_angle = have_dist = 0;
+					moved = 1;
+				}
+				break;
+		}
+		if (argv[n].invalid)
+			return -1;
+
+		if (moved) {
+			if ((annot) && (len > 0)) {
+				pcb_coord_t *c = vtc0_alloc_append(&pcb_ddraft_attached.annot_lines, 4);
+				c[0] = pcb_round(lx);
+				c[1] = pcb_round(ly);
+				c[2] = pcb_round(x);
+				c[3] = pcb_round(y);
+			}
+			angle = atan2(y - ly, x - lx) * PCB_RAD_TO_DEG;
+			lx = x;
+			ly = y;
+			len++;
+		}
+	}
+
+	over:;
+		if (have_angle || have_dist) /* could not apply */
+			return -1;
+	*ox = pcb_round(x);
+	*oy = pcb_round(y);
+	return n;
+}
+
+static void cli_print_args(int argc, cli_node_t *argv)
+{
+	int n;
+	for(n = 0; n < argc; n++) {
+		pcb_trace(" [%d] %s/%d {%d..%d}", n, find_rev_type(argv[n].type), argv[n].type, argv[n].begin, argv[n].end);
+		if (!argv[n].invalid) {
+			switch(argv[n].type) {
+				case CLI_COORD: pcb_trace(": %$mm,%$mm", argv[n].x, argv[n].y); break;
+				case CLI_ANGLE: pcb_trace(": %f", argv[n].angle); break;
+				case CLI_DIST: pcb_trace(": %$mm", argv[n].dist); break;
+				case CLI_OFFS: pcb_trace(": %f", argv[n].offs); break;
+				case_object: pcb_trace(": %ld", (long)argv[n].id); break;
+				default:;
+			}
+			pcb_trace("\n");
+		}
+		else
+			pcb_trace(": INVALID\n");
+	}
+}
+
+#include "cli_line.c"
+
+static const ddraft_op_t ddraft_ops[] = {
+	{"line",    line_exec,    line_click,    line_tab,     line_edit},
+	{NULL,      NULL,         NULL,          NULL,         NULL}
+};
+
+static const ddraft_op_t *find_op(const char *op, int oplen)
+{
+	const ddraft_op_t *p, *found = NULL;
+
+	if (oplen < 1)
+		return NULL;
+
+	for(p = ddraft_ops; p->name != NULL; p++) {
+		if (pcb_strncasecmp(p->name, op, oplen) == 0) {
+			if (found != NULL)
+				return NULL; /* multiple match */
+			found = p;
+		}
+	}
+
+	return found;
+}
+
+static const char pcb_acts_ddraft[] = "ddraft([command])";
+static const char pcb_acth_ddraft[] = "Enter 2d drafting CLI mode or execute command";
+static fgw_error_t pcb_act_ddraft(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *args, *cmd, *line, sline[1024], *op;
+	const char *cline = NULL;
+	int cursor, len, oplen;
+	const ddraft_op_t *opp;
+	cli_node_t nd[128];
+	int ndlen;
+
+	if (argc == 1) {
+		pcb_cli_enter("ddraft", "ddraft");
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, ddraft, cmd = argv[1].val.str);
+	if (strcmp(cmd, "/exit") == 0) {
+		pcb_cli_leave();
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	/* make a safe copy of the command line, either on stack or on heap if too large */
+	if ((cmd != NULL) && (*cmd != '/'))
+		cline = cmd;
+	else
+		cline = pcb_hid_command_entry(NULL, &cursor);
+	if (cline == NULL)
+		cline = "";
+
+	while(isspace(*cline)) cline++;
+	if ((*cline == '\n') || (*cline == '#') || (*cline == '\0')) { /* empty or comment */
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	len = strlen(cline);
+	if (len >= sizeof(cline) - CLI_MAX_INS_LEN)
+		line = malloc(len + 1 + CLI_MAX_INS_LEN);
+	else
+		line = sline;
+	memcpy(line, cline, len+1);
+
+	/* split op and arguments; recalculate cursor so it's within the arguments */
+	op = line;
+	args = strpbrk(op, " \t");
+	if (args != NULL)
+		oplen = args - op;
+	else
+		oplen = len;
+
+	/* look up op */
+	opp = find_op(op, oplen);
+	if (opp == NULL) {
+		if (strcmp(cmd, "/edit") != 0)
+			pcb_message(PCB_MSG_ERROR, "ddraft: unknown operator '%s'\n", op);
+		PCB_ACT_IRES(-1);
+		goto ret0;
+	}
+
+	reparse:;
+	ndlen = cli_parse(nd, sizeof(nd) / sizeof(nd[0]), line);
+
+	if (*cmd == '/') {
+		if (strcmp(cmd, "/click") == 0) {
+			PCB_ACT_IRES(opp->click(line, cursor, ndlen, nd));
+			cmd = "/edit";
+			goto reparse;
+		}
+		else if (strcmp(cmd, "/tab") == 0)
+			PCB_ACT_IRES(opp->tab(line, cursor, ndlen, nd));
+		else if (strcmp(cmd, "/edit") == 0)
+			PCB_ACT_IRES(opp->edit(line, cursor, ndlen, nd));
+		else
+			PCB_ACT_IRES(0); /* ignore anything unhandled */
+		goto ret0;
+	}
+
+	PCB_ACT_IRES(opp->exec(line, ndlen, nd));
+
+	ret0:;
+	if (line != sline)
+		free(line);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/ddraft/cli_line.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/cli_line.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/cli_line.c	(revision 18980)
@@ -0,0 +1,223 @@
+static int line_parse(char *line, int argc, cli_node_t *argv, pcb_box_t *box, int verbose, int annot)
+{
+	int n = 0;
+
+	if (argv[n].type == CLI_FROM)
+		n++;
+	else if (argv[n].type == CLI_TO) {
+		pcb_message(PCB_MSG_ERROR, "Incremental line drawing is not yet supported\n");
+		return -1;
+	}
+	n = cli_apply_coord(argv, n, argc, &box->X1, &box->Y1, annot);
+	if (n < 0) {
+		if (verbose)
+			pcb_message(PCB_MSG_ERROR, "Invalid 'from' coord\n");
+		return -1;
+	}
+	if (argv[n].type != CLI_TO) {
+		if (verbose)
+			pcb_message(PCB_MSG_ERROR, "Missing 'to'\n");
+		return -1;
+	}
+	n++;
+	box->X2 = box->X1;
+	box->Y2 = box->Y1;
+	n = cli_apply_coord(argv, n, argc, &box->X2, &box->Y2, annot);
+	if (n < 0) {
+		if (verbose)
+			pcb_message(PCB_MSG_ERROR, "Invalid 'to' coord\n");
+		return -1;
+	}
+	if (n != argc) {
+		if (verbose)
+			pcb_message(PCB_MSG_ERROR, "Excess tokens after the to coord\n");
+		return -1;
+	}
+	return 0;
+}
+
+static int line_exec(char *line, int argc, cli_node_t *argv)
+{
+	int res;
+	pcb_box_t box;
+
+	pcb_trace("line e: '%s'\n", line);
+
+	memset(&box, 0, sizeof(box));
+	res = line_parse(line, argc, argv, &box, 1, 0);
+	if (res == 0) {
+		pcb_trace("line_exec: %mm;%mm -> %mm;%mm\n", box.X1, box.Y1, box.X2, box.Y2);
+		pcb_line_new(CURRENT, box.X1, box.Y1, box.X2, box.Y2,
+			conf_core.design.line_thickness, 2 * conf_core.design.clearance,
+			pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0));
+	}
+	pcb_ddraft_attached_reset();
+	return res;
+}
+
+static int line_edit(char *line, int cursor, int argc, cli_node_t *argv)
+{
+	int res;
+	pcb_box_t box;
+
+	pcb_ddraft_attached_reset();
+
+	if (pcb_tool_next_id != pcb_ddraft_tool)
+		pcb_tool_select_by_id(pcb_ddraft_tool);
+
+	pcb_trace("line e: '%s':%d\n", line, cursor);
+	memset(&box, 0, sizeof(box));
+	res = line_parse(line, argc, argv, &box, 0, 1);
+	if (res == 0) {
+		pcb_ddraft_attached.line_valid = 1;
+		pcb_ddraft_attached.line.Point1.X = box.X1;
+		pcb_ddraft_attached.line.Point1.Y = box.Y1;
+		pcb_ddraft_attached.line.Point2.X = box.X2;
+		pcb_ddraft_attached.line.Point2.Y = box.Y2;
+		pcb_gui->invalidate_all();
+	}
+	return res;
+}
+
+static int get_rel_coord(int argc, cli_node_t *argv, int argn, pcb_coord_t *ox, pcb_coord_t *oy)
+{
+	int nto, res;
+
+	for(nto = 0; nto < argc; nto++)
+		if (argv[nto].type == CLI_TO)
+			break;
+
+	*ox = *oy = 0;
+	res = 0;
+	if (argv[res].type == CLI_FROM)
+		res++;
+	if (argn < nto) {
+		res = cli_apply_coord(argv, res, argn, ox, oy, 0);
+	}
+	else {
+		res = cli_apply_coord(argv, res, nto, ox, oy, 0); /* 'to' may be relative to 'from', so eval 'from' first */
+		res |= cli_apply_coord(argv, nto+1, argn, ox, oy, 0);
+	}
+
+	return res;
+}
+
+static int line_click(char *line, int cursor, int argc, cli_node_t *argv)
+{
+	int argn = cli_cursor_arg(argc, argv, cursor);
+	int replace = 0, by, res;
+	pcb_coord_t ox, oy;
+	char buff[CLI_MAX_INS_LEN];
+
+	pcb_trace("line c: '%s':%d (argn=%d)\n", line, cursor, argn);
+	cli_print_args(argc, argv);
+
+	if (argn < 0) {
+		/* at the end */
+		argn = argc - 1;
+		if (argn < 0) {
+			/* empty arg list */
+			pcb_snprintf(buff, sizeof(buff), " from %.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y);
+			printf("append: '%s'\n", buff);
+			cursor = cli_str_insert(line, strlen(line), buff, 1);
+			goto update;
+		}
+	}
+
+	*buff = '\0';
+	by = argn;
+
+
+	retry:;
+
+	switch(argv[by].type) {
+		case CLI_COORD:
+			if (by > 0) {
+				by--;
+				replace = 1;
+				goto retry;
+			}
+			/* fall through: when clicked at the first coord */
+		case CLI_ABSOLUTE:
+		case CLI_FROM:
+		case CLI_TO:
+			pcb_trace("abs");
+			pcb_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X, pcb_crosshair.Y);
+			goto maybe_replace_after;
+			break;
+		case CLI_RELATIVE:
+			res = get_rel_coord(argc, argv, argn, &ox, &oy);
+			if (res < 0) {
+				pcb_message(PCB_MSG_ERROR, "Failed to interpret coords already entered\n");
+				return 0;
+			}
+			pcb_trace("rel from %$mm,%$mm", ox, oy);
+			pcb_snprintf(buff, sizeof(buff), "%.08$$mm,%.08$$mm", pcb_crosshair.X - ox, pcb_crosshair.Y - oy);
+			maybe_replace_after:;
+			if ((by+1 < argc) && (argv[by+1].type == CLI_COORD)) {
+				argn = by+1;
+				replace = 1;
+			}
+			break;
+		case CLI_ANGLE:
+			res = get_rel_coord(argc, argv, argn, &ox, &oy);
+			if (res < 0) {
+				pcb_message(PCB_MSG_ERROR, "Failed to interpret coords already entered\n");
+				return 0;
+			}
+			replace=1;
+			pcb_snprintf(buff, sizeof(buff), "<%f", atan2(pcb_crosshair.Y - oy, pcb_crosshair.X - ox) * PCB_RAD_TO_DEG);
+			break;
+		case CLI_DIST:
+			res = get_rel_coord(argc, argv, argn, &ox, &oy);
+			if (res < 0) {
+				pcb_message(PCB_MSG_ERROR, "Failed to interpret coords already entered\n");
+				return 0;
+			}
+			replace=1;
+			pcb_snprintf(buff, sizeof(buff), "~%.08$$mm", pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, ox, oy));
+			break;
+		case_object: ;
+			{
+				void *p1, *p2, *p3;
+				pcb_any_obj_t *o;
+				if (pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_OBJ_LINE | PCB_OBJ_ARC, &p1, &p2, &p3) == 0)
+					return 0;
+				o = p2;
+				replace=1;
+				pcb_snprintf(buff, sizeof(buff), "%s %ld", find_rev_type(argv[by].type), (long)o->ID);
+			}
+			break;
+		default:
+			return 0;
+	}
+
+	if (*buff == '\0') {
+		pcb_trace("nope...\n");
+		return 0;
+	}
+
+	if (replace) {
+		pcb_trace(" replace %d: '%s'\n", argn, buff);
+		cli_str_remove(line, argv[argn].begin, argv[argn].end);
+		cursor = cli_str_insert(line, argv[argn].begin, buff, 1);
+		
+	}
+	else {
+		pcb_trace(" insert-after %d: '%s'\n", argn, buff);
+		cursor = cli_str_insert(line, argv[argn].end, buff, 1);
+	}
+
+pcb_trace("line='%s'\n", line);
+	update:;
+	pcb_hid_command_entry(line, &cursor);
+
+	return 0;
+}
+
+static int line_tab(char *line, int cursor, int argc, cli_node_t *argv)
+{
+	pcb_trace("line t: '%s':%d\n", line, cursor);
+	return -1;
+}
+
Index: tags/2.0.1/src_plugins/ddraft/constraint.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/constraint.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/constraint.c	(revision 18980)
@@ -0,0 +1,183 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  2d drafting plugin: trim objects
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "crosshair.h"
+#include "obj_line.h"
+#include "tool.h"
+
+typedef struct {
+	double line_angle[32], move_angle[32];
+	pcb_coord_t line_length[32], move_length[32];
+	double line_angle_mod, move_angle_mod;
+	pcb_coord_t line_length_mod, move_length_mod;
+	
+	int line_angle_len, line_length_len, move_angle_len, move_length_len;
+} ddraft_cnst_t;
+
+static ddraft_cnst_t cons;
+
+static int find_best_angle(double *out_ang, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, double *angles, int anglen, double angle_mod)
+{
+	double diff, ang, best_diff, target_ang;
+	int n, best;
+
+	ang = atan2(y2 - y1, x2 - x1) * PCB_RAD_TO_DEG;
+
+	if (anglen > 0) {
+		/* find the best matching constraint angle */
+		best = -1;
+		best_diff = 1000.0;
+		for(n = 0; n < anglen; n++) {
+			if (angles[n] < 180)
+				diff = fabs(ang - angles[n]);
+			else
+				diff = fabs(ang + (angles[n]-180));
+			if (diff < best_diff) {
+				best_diff = diff;
+				best = n;
+			}
+		}
+		if (best < 0)
+			return -1;
+
+		target_ang = angles[best];
+	}
+	else
+		target_ang = ang;
+
+	if (angle_mod > 0)
+		target_ang = floor(target_ang / angle_mod) * angle_mod;
+
+	target_ang /= PCB_RAD_TO_DEG;
+	*out_ang = target_ang;
+	return 0;
+}
+
+static int find_best_length(double *out_len, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t *lengths, int lengthlen, pcb_coord_t length_mod)
+{
+	double len, best_diff, diff, target_len;
+	int n, best;
+
+	len = pcb_distance(x1, y1, x2, y2);
+
+	if (lengthlen > 0) {
+		/* find the best matching constraint length */
+		best = -1;
+		best_diff = COORD_MAX;
+		for(n = 0; n < lengthlen; n++) {
+			diff = fabs(len - lengths[n]);
+			if (diff < best_diff) {
+				best_diff = diff;
+				best = n;
+			}
+		}
+		if (best < 0)
+			return -1;
+
+		target_len = lengths[best];
+	}
+	else
+		target_len = len;
+
+	if (length_mod > 0)
+		target_len = floor(target_len / (double)length_mod) * (double)length_mod;
+
+	*out_len = target_len;
+	return 0;
+}
+
+static void cnst_line_anglen(ddraft_cnst_t *cn)
+{
+	double target_ang, dx, dy, target_len;
+	pcb_route_object_t *line;
+	int res;
+
+	if (((cn->line_angle_len == 0) && (cn->line_length_len == 0) && (cn->line_angle_mod <= 0) && (cn->line_length_mod <= 0)) || (pcb_crosshair.Route.size < 1))
+		return;
+
+	line = &pcb_crosshair.Route.objects[pcb_crosshair.Route.size-1];
+	if (line->type != PCB_OBJ_LINE)
+		return;
+
+	res = find_best_angle(&target_ang,
+		line->point1.X, line->point1.Y, pcb_crosshair.X, pcb_crosshair.Y,
+		cn->line_angle, cn->line_angle_len, cn->line_angle_mod);
+	if (res < 0) return;
+
+	res = find_best_length(&target_len,
+		line->point1.X, line->point1.Y, pcb_crosshair.X, pcb_crosshair.Y,
+		cn->line_length, cn->line_length_len, cn->line_length_mod);
+	if (res < 0) return;
+
+	dx = target_len * cos(target_ang);
+	dy = target_len * sin(target_ang);
+
+	line->point2.X = line->point1.X + dx;
+	line->point2.Y = line->point1.Y + dy;
+}
+
+static void cnst_line2(ddraft_cnst_t *cn)
+{
+	cnst_line_anglen(cn);
+}
+
+static void cnst_move(ddraft_cnst_t *cn)
+{
+	double target_ang, dx, dy, target_len;
+	int res;
+
+	if (((cn->move_angle_len == 0) && (cn->move_length_len == 0) && (cn->move_angle_mod <= 0) && (cn->move_length_mod <= 0)))
+		return;
+
+	res = find_best_angle(&target_ang,
+		pcb_crosshair.AttachedObject.X, pcb_crosshair.AttachedObject.Y, pcb_crosshair.X, pcb_crosshair.Y,
+		cn->move_angle, cn->move_angle_len, cn->move_angle_mod);
+	if (res < 0) return;
+
+	res = find_best_length(&target_len,
+		pcb_crosshair.AttachedObject.X, pcb_crosshair.AttachedObject.Y, pcb_crosshair.X, pcb_crosshair.Y,
+		cn->move_length, cn->move_length_len, cn->move_length_mod);
+	if (res < 0) return;
+
+	dx = target_len * cos(target_ang);
+	dy = target_len * sin(target_ang);
+
+	pcb_crosshair.AttachedObject.tx = pcb_crosshair.AttachedObject.X + dx;
+	pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y + dy;
+}
+
+static void cnst_enforce(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if ((pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) || (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD))
+		cnst_line2(&cons);
+	else if (pcb_crosshair.AttachedObject.State == PCB_CH_STATE_SECOND) /* normal d&d move or copy */
+		cnst_move(&cons);
+	else if (pcb_tool_note.Moving) /* selected copy (buffer mode) */
+		cnst_move(&cons);
+
+}
Index: tags/2.0.1/src_plugins/ddraft/constraint_gui.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/constraint_gui.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/constraint_gui.c	(revision 18980)
@@ -0,0 +1,327 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  2d drafting plugin: trim objects
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "hid_dad.h"
+
+typedef struct{
+	PCB_DAD_DECL_NOINIT(dlg)
+	int active; /* already open - allow only one instance */
+
+	/* widget IDs */
+	int alldir;
+	int line_angle, move_angle;
+	int line_length, move_length;
+	int line_angle_mod, move_angle_mod;
+	int line_length_mod, move_length_mod;
+
+	int inhibit_confchg;
+} cnstgui_ctx_t;
+
+cnstgui_ctx_t cnstgui_ctx;
+
+static void cnstgui_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+{
+	cnstgui_ctx_t *ctx = caller_data;
+	PCB_DAD_FREE(ctx->dlg);
+	memset(ctx, 0, sizeof(cnstgui_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */
+}
+
+
+#define c2g_array(name, fmt) \
+do { \
+	int n, l, len = sizeof(buff)-1; \
+	char *end = buff; \
+	*end = 0; \
+	for(n = 0; n < cons.name ## _len; n++) { \
+		if (n > 0) { \
+			*end++ = ' '; \
+			len--; \
+		} \
+		l = pcb_snprintf(end, len, fmt, cons.name[n]); \
+		len -= l; \
+		end += l; \
+	} \
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, str_value, pcb_strdup(buff)); \
+} while(0)
+
+#define c2g_float(name) \
+do { \
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, real_value, cons.name); \
+} while(0)
+
+#define c2g_coord(name) \
+do { \
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, coord_value, cons.name); \
+} while(0)
+
+/* copy all cons fields into the GUI struct */
+static void cons_changed(void)
+{
+	char buff[1024];
+
+	c2g_array(line_angle, "%f");
+	c2g_float(line_angle_mod);
+	c2g_array(line_length, "%.08$$mH");
+	c2g_coord(line_length_mod);
+
+	c2g_array(move_angle, "%f");
+	c2g_float(move_angle_mod);
+	c2g_array(move_length, "%.08$$mH");
+	c2g_coord(move_length_mod);
+}
+
+#define g2c_array(name, conv) \
+do { \
+	const char *inp = cnstgui_ctx.dlg[cnstgui_ctx.name].default_val.str_value; \
+	char *curr, *next; \
+	cons.name ## _len = 0; \
+	if (inp == NULL) break; \
+	strncpy(buff, inp, sizeof(buff)); \
+	for(curr = buff; curr != NULL; curr = next) { \
+		while(isspace(*curr)) curr++; \
+		if (*curr == '\0') break; \
+		next = strpbrk(curr, ",; "); \
+		if (next != NULL) { \
+			*next = '\0'; \
+			next++; \
+			while(isspace(*next)) next++;  \
+		} \
+		cons.name[cons.name ## _len++] = conv; \
+	} \
+} while(0)
+
+#define g2c_scalar(name, valty) \
+do { \
+	cons.name = cnstgui_ctx.dlg[cnstgui_ctx.name].default_val.valty; \
+} while(0)
+
+
+/* copy all GUI fields into the cons struct */
+static void gui2cons(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	char *end, buff[1024];
+	pcb_bool succ;
+
+	g2c_array(line_angle, strtod(curr, &end));
+	g2c_scalar(line_angle_mod, real_value);
+	g2c_array(line_length, pcb_get_value(curr, NULL, NULL, &succ));
+	g2c_scalar(line_length_mod, coord_value);
+
+	g2c_array(move_angle, strtod(curr, &end));
+	g2c_scalar(move_angle_mod, real_value);
+	g2c_array(move_length, pcb_get_value(curr, NULL, NULL, &succ));
+	g2c_scalar(move_length_mod, coord_value);
+}
+
+static void reset_line(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str_value, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle_mod, real_value, 0);
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str_value, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length_mod, coord_value, 0);
+	gui2cons(hid_ctx, caller_data, attr);
+}
+
+static void reset_move(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str_value, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle_mod, real_value, 0);
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str_value, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length_mod, coord_value, 0);
+	gui2cons(hid_ctx, caller_data, attr);
+}
+
+static void set_paral(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pcb_actionl("paral", NULL);
+}
+
+static void set_perp(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pcb_actionl("perp", NULL);
+}
+
+
+static void set_tang(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pcb_actionl("tang", NULL);
+}
+
+void cons_gui_confchg(conf_native_t *cfg, int arr_idx)
+{
+	if (!cnstgui_ctx.active || cnstgui_ctx.inhibit_confchg)
+		return;
+
+	cnstgui_ctx.inhibit_confchg++;
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.alldir, int_value, conf_core.editor.all_direction_lines);
+	cnstgui_ctx.inhibit_confchg--;
+}
+
+static void set_alldir(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	const char *nv;
+	if (cnstgui_ctx.inhibit_confchg)
+		return;
+
+	cnstgui_ctx.inhibit_confchg++;
+	nv = (cnstgui_ctx.dlg[cnstgui_ctx.alldir].default_val.int_value) ? "1" : "0";
+	conf_set(CFR_DESIGN, "editor/all_direction_lines", -1, nv, POL_OVERWRITE);
+	cnstgui_ctx.inhibit_confchg--;
+}
+
+
+
+int constraint_gui(void)
+{
+	const char *tab_names[] = {"line", "move", NULL};
+	if (cnstgui_ctx.active)
+		return 0; /* do not open another */
+
+	PCB_DAD_BEGIN_TABBED(cnstgui_ctx.dlg, tab_names);
+
+		/* line */
+		PCB_DAD_BEGIN_VBOX(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "All direction lines:");
+				PCB_DAD_BOOL(cnstgui_ctx.dlg, "");
+					cnstgui_ctx.alldir = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, set_alldir);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "Constraints work well only when\nthe all-direction-lines is enabled");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Fixed angles:");
+				PCB_DAD_STRING(cnstgui_ctx.dlg);
+					cnstgui_ctx.line_angle = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "space separated list of valid line angles in degree");
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "apply");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Angle modulo:");
+				PCB_DAD_REAL(cnstgui_ctx.dlg, "");
+					cnstgui_ctx.line_angle_mod = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_MINVAL(cnstgui_ctx.dlg, 0);
+					PCB_DAD_MAXVAL(cnstgui_ctx.dlg, 180);
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nline angle must be an integer multiply of this value");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Fixed lengths:");
+				PCB_DAD_STRING(cnstgui_ctx.dlg);
+					cnstgui_ctx.line_length = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "space separated list of valid line lengths");
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "apply");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Length modulo:");
+				PCB_DAD_COORD(cnstgui_ctx.dlg, "");
+					cnstgui_ctx.line_length_mod = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_MINVAL(cnstgui_ctx.dlg, 0);
+					PCB_DAD_MAXVAL(cnstgui_ctx.dlg, PCB_MM_TO_COORD(1000));
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nline length must be an integer multiply of this value");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "perpendicular to line");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, set_perp);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "sets the angle constraint perpendicular to a line\nselected on the drawing");
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "parallel with line");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, set_paral);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "sets the angle constraint parallel to a line\nselected on the drawing");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "tangential to arc");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, set_tang);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "sets the angle constraint to be tangential to the circle of an arc\nselected on the drawing");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "Reset");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, reset_line);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "clear line constraint values");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+
+		PCB_DAD_END(cnstgui_ctx.dlg);
+
+		/* move */
+		PCB_DAD_BEGIN_VBOX(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Fixed angles:");
+				PCB_DAD_STRING(cnstgui_ctx.dlg);
+					cnstgui_ctx.move_angle = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "space separated list of valid move vector angles in degree");
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "apply");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Angle modulo:");
+				PCB_DAD_REAL(cnstgui_ctx.dlg, "");
+					cnstgui_ctx.move_angle_mod = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_MINVAL(cnstgui_ctx.dlg, 0);
+					PCB_DAD_MAXVAL(cnstgui_ctx.dlg, 180);
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nmove vector angle must be an integer multiply of this value");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Fixed lengths:");
+				PCB_DAD_STRING(cnstgui_ctx.dlg);
+					cnstgui_ctx.move_length = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "space separated list of valid move distances");
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "apply");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_LABEL(cnstgui_ctx.dlg, "Length modulo:");
+				PCB_DAD_COORD(cnstgui_ctx.dlg, "");
+					cnstgui_ctx.move_length_mod = PCB_DAD_CURRENT(cnstgui_ctx.dlg);
+					PCB_DAD_MINVAL(cnstgui_ctx.dlg, 0);
+					PCB_DAD_MAXVAL(cnstgui_ctx.dlg, PCB_MM_TO_COORD(1000));
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, gui2cons);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "if non-zero:\nmove distance must be an integer multiply of this value");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+			PCB_DAD_BEGIN_HBOX(cnstgui_ctx.dlg);
+				PCB_DAD_BUTTON(cnstgui_ctx.dlg, "Reset");
+					PCB_DAD_CHANGE_CB(cnstgui_ctx.dlg, reset_move);
+					PCB_DAD_HELP(cnstgui_ctx.dlg, "clear move constraint values");
+			PCB_DAD_END(cnstgui_ctx.dlg);
+		PCB_DAD_END(cnstgui_ctx.dlg);
+
+	PCB_DAD_END(cnstgui_ctx.dlg);
+
+	/* set up the context */
+	cnstgui_ctx.active = 1;
+
+	PCB_DAD_NEW(cnstgui_ctx.dlg, "Drawing constraints", "constraints", &cnstgui_ctx, pcb_false, cnstgui_close_cb);
+
+	cons_changed();
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/ddraft/ddraft.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/ddraft.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/ddraft.c	(revision 18980)
@@ -0,0 +1,453 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  2d drafting plugin
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <ctype.h>
+#include <genvector/gds_char.h>
+#include <genvector/vtp0.h>
+
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "plugins.h"
+#include "event.h"
+#include "actions.h"
+#include "funchash_core.h"
+#include "search.h"
+#include "centgeo.h"
+#include "misc_util.h"
+#include "board.h"
+#include "data_it.h"
+#include "obj_line.h"
+#include "undo.h"
+#include "fields_sphash.h"
+#include "draw_wireframe.h"
+#include "conf_core.h"
+#include "conf_hid.h"
+#include "vtc0.h"
+
+static const char *ddraft_cookie = "ddraft plugin";
+static int pcb_ddraft_tool;
+
+typedef struct {
+	pcb_line_t line;
+	int line_valid;
+
+	vtc0_t annot_lines; /* each 4 coords specify a line */
+} pcb_ddraft_attached_t;
+
+pcb_ddraft_attached_t pcb_ddraft_attached;
+
+void pcb_ddraft_attached_reset(void)
+{
+	pcb_ddraft_attached.line_valid = 0;
+	vtc0_truncate(&pcb_ddraft_attached.annot_lines, 0);
+}
+
+#define EDGE_TYPES (PCB_OBJ_LINE | PCB_OBJ_ARC)
+#define CUT_TYPES (PCB_OBJ_LINE | PCB_OBJ_ARC)
+
+static void list_by_flag(pcb_data_t *data, vtp0_t *dst, unsigned long types, unsigned long flag)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+	
+	for(o = pcb_data_first(&it, data, types); o != NULL; o = pcb_data_next(&it))
+		if (PCB_FLAG_TEST(flag, o))
+			vtp0_append(dst, o);
+}
+
+#include "trim.c"
+#include "constraint.c"
+
+static long do_trim_split(vtp0_t *edges, int kwobj, int trim)
+{
+	pcb_objtype_t type;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_coord_t x, y;
+	long res = 0;
+
+	switch(kwobj) {
+		case F_Object:
+			for(;;) {
+				x = PCB_MAX_COORD;
+				pcb_hid_get_coords("Select an object to cut or press esc", &x, &y, 1);
+				if (x == PCB_MAX_COORD)
+					break;
+
+				type = pcb_search_screen(x, y, CUT_TYPES, &ptr1, &ptr2, &ptr3);
+				if (type == 0) {
+					pcb_message(PCB_MSG_ERROR, "Can't cut that object\n");
+					continue;
+				}
+				res += pcb_trim_split(edges, (pcb_any_obj_t *)ptr2, REMO_INVALID, x, y, trim);
+				pcb_gui->invalidate_all();
+			}
+			break;
+		default:
+			pcb_message(PCB_MSG_ERROR, "Invalid second argument\n");
+			return -1;
+	}
+
+	return res;
+}
+
+static const char pcb_acts_trim_split[] = "trim([selected|found|object], [selected|found|object])\nsplit([selected|found|object], [selected|found|object])";
+static const char pcb_acth_trim_split[] = "Use one or more objects as cutting edge and trim or split other objects. First argument is the cutting edge";
+static fgw_error_t pcb_act_trim_split(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *actname = argv[0].val.func->name;
+	int kwcut = F_Object, kwobj = F_Object;
+	pcb_objtype_t type;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_coord_t x, y;
+	vtp0_t edges;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, trim_split, kwcut = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_KEYWORD, trim_split, kwobj = fgw_keyword(&argv[2]));
+
+	vtp0_init(&edges);
+
+	if ((kwobj == kwcut) && (kwobj != F_Object)) {
+		pcb_message(PCB_MSG_ERROR, "Both cutting edge and objects to cut can't be '%s'\n", kwcut == F_Selected ? "selected" : "found");
+		goto err;
+	}
+
+	switch(kwcut) {
+		case F_Object:
+			pcb_hid_get_coords("Select cutting edge object", &x, &y, 0);
+			type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3);
+			if (type == 0) {
+				pcb_message(PCB_MSG_ERROR, "Invalid cutting edge object\n");
+				goto err;
+			}
+			vtp0_append(&edges, ptr2);
+			break;
+		case F_Selected:
+			list_by_flag(PCB->Data, &edges, EDGE_TYPES, PCB_FLAG_SELECTED);
+			break;
+		case F_Found:
+			list_by_flag(PCB->Data, &edges, EDGE_TYPES, PCB_FLAG_FOUND);
+			break;
+		default:
+			pcb_message(PCB_MSG_ERROR, "Invalid first argument\n");
+			goto err;
+	}
+
+	if (vtp0_len(&edges) < 1) {
+		pcb_message(PCB_MSG_ERROR, "No cutting edge found\n");
+		goto err;
+	}
+
+
+	if (do_trim_split(&edges, kwobj, (*actname == 't')) < 0)
+		goto err;
+
+	PCB_ACT_IRES(0);
+	vtp0_uninit(&edges);
+	return 0;
+
+	err:;
+	PCB_ACT_IRES(-1);
+	vtp0_uninit(&edges);
+	return 0;
+}
+
+#include "constraint_gui.c"
+
+#define load_arr(arr, ctr, msg, fgw_type_, fgw_val_) \
+do { \
+	int n; \
+	if (argc-2 >= sizeof(arr) / sizeof(arr[0])) { \
+		pcb_message(PCB_MSG_ERROR, "constraint: Too many " msg "\n"); \
+		PCB_ACT_IRES(-1); \
+		return 0; \
+	} \
+	ctr = 0; \
+	for(n = 2; n < argc; n++) { \
+		PCB_ACT_CONVARG(n, fgw_type_, constraint, arr[ctr] = fgw_val_); \
+		ctr++; \
+	} \
+} while(0)
+
+static const char pcb_acts_constraint[] = "constraint(type, off)\nconstraint(type, value, [value...])";
+static const char pcb_acth_constraint[] = "Configure or remove a drawing constraint";
+static fgw_error_t pcb_act_constraint(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *stype = NULL;
+	int type;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, constraint, stype = argv[1].val.str);
+	if (stype == NULL) {
+		PCB_ACT_IRES(constraint_gui());
+		return 0;
+	}
+	type = ddraft_fields_sphash(stype);
+	switch(type) {
+		case ddraft_fields_line_angle:
+			load_arr(cons.line_angle, cons.line_angle_len, "line angles", FGW_DOUBLE, argv[n].val.nat_double);
+			cons_changed();
+			break;
+		case ddraft_fields_move_angle:
+			load_arr(cons.move_angle, cons.move_angle_len, "move angles", FGW_DOUBLE, argv[n].val.nat_double);
+			cons_changed();
+			break;
+		case ddraft_fields_line_angle_mod:
+			cons.line_angle_mod = 0;
+			PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.line_angle_mod = argv[2].val.nat_double);
+			cons_changed();
+			break;
+		case ddraft_fields_move_angle_mod:
+			cons.move_angle_mod = 0;
+			PCB_ACT_MAY_CONVARG(2, FGW_DOUBLE, constraint, cons.move_angle_mod = argv[2].val.nat_double);
+			cons_changed();
+			break;
+		case ddraft_fields_line_length:
+			load_arr(cons.line_length, cons.line_length_len, "line lengths", FGW_COORD, fgw_coord(&argv[n]));
+			cons_changed();
+			break;
+		case ddraft_fields_move_length:
+			load_arr(cons.move_length, cons.move_length_len, "move lengths", FGW_COORD, fgw_coord(&argv[n]));
+			cons_changed();
+			break;
+		case ddraft_fields_line_length_mod:
+			cons.line_length_mod = 0;
+			PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.line_length_mod = fgw_coord(&argv[2]));
+			cons_changed();
+			break;
+		case ddraft_fields_move_length_mod:
+			cons.move_length_mod = 0;
+			PCB_ACT_MAY_CONVARG(2, FGW_COORD, constraint, cons.move_length_mod = fgw_coord(&argv[2]));
+			cons_changed();
+			break;
+
+		case ddraft_fields_reset:
+			memset(&cons, 0, sizeof(cons));
+			cons_changed();
+			break;
+		case ddraft_fields_SPHASH_INVALID:
+			pcb_message(PCB_MSG_ERROR, "constraint: invalid field '%s'\n", stype);
+			PCB_ACT_IRES(-1);
+			return 0;
+			break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_perp_paral[] = "perp()";
+static const char pcb_acth_perp_paral[] = "Draw a line perpendicular to another line";
+static fgw_error_t pcb_act_perp_paral(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *actname = argv[0].val.func->name;
+	pcb_objtype_t type;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_coord_t x, y;
+	double dx, dy;
+	pcb_line_t *line;
+
+	pcb_hid_get_coords("Select target object", &x, &y, 0);
+	type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3);
+
+	if (type != PCB_OBJ_LINE) {
+		pcb_hid_get_coords("Select target object", &x, &y, 1);
+		type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3);
+	}
+
+	if (type != PCB_OBJ_LINE) {
+		pcb_message(PCB_MSG_ERROR, "%s: target object must be a line\n", actname);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	line = (pcb_line_t *)ptr2;
+	dx = line->Point2.X - line->Point1.X;
+	dy = line->Point2.Y - line->Point1.Y;
+	if ((dx == 0.0) && (dy == 0.0)) {
+		pcb_message(PCB_MSG_ERROR, "%s: target line must be longer than 0\n", actname);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	cons.line_angle_len = 2;
+	cons.line_angle[0] = atan2(dy, dx) * PCB_RAD_TO_DEG;
+	if (actname[1] == 'e') /* perp */
+		cons.line_angle[0] += 90;
+	cons.line_angle[1] = fmod(cons.line_angle[0]+180, 360);
+	cons_changed();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_tang[] = "tang()";
+static const char pcb_acth_tang[] = "Draw a line to be tangential to a circle";
+static fgw_error_t pcb_act_tang(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_objtype_t type;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_coord_t x, y;
+	double d, r, base;
+	pcb_route_object_t *line;
+	pcb_arc_t *arc;
+
+
+	if (((pcb_crosshair.AttachedLine.State != PCB_CH_STATE_SECOND) && (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_THIRD)) || (pcb_crosshair.Route.size < 1)) {
+		err_nonline:;
+		pcb_message(PCB_MSG_ERROR, "tang: must be in line drawing mode with the first point already set\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	line = &pcb_crosshair.Route.objects[pcb_crosshair.Route.size-1];
+	if (line->type != PCB_OBJ_LINE)
+		goto err_nonline;
+
+
+	pcb_hid_get_coords("Select target arc", &x, &y, 0);
+	type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3);
+
+	if (type != PCB_OBJ_ARC) {
+		pcb_hid_get_coords("Select target arc", &x, &y, 1);
+		type = pcb_search_screen(x, y, EDGE_TYPES, &ptr1, &ptr2, &ptr3);
+	}
+
+	if (type != PCB_OBJ_ARC) {
+		pcb_message(PCB_MSG_ERROR, "tang: target object must be an arc\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	arc = (pcb_arc_t *)ptr2;
+	if (fabs(arc->Height - arc->Width) > 100) {
+		pcb_message(PCB_MSG_ERROR, "tang: elliptical arcs are not supported (%$mm != %$mm)\n", arc->Height, arc->Width);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	d = pcb_distance(arc->X, arc->Y, line->point1.X, line->point1.Y);
+	r = arc->Width;
+
+	if (d <= r) {
+		pcb_message(PCB_MSG_ERROR, "tang: line must start outside of the circle\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	base = atan2(arc->Y - line->point1.Y, arc->X - line->point1.X);
+
+	cons.line_angle_len = 2;
+	cons.line_angle[0] = (base + asin(r / d)) * PCB_RAD_TO_DEG;
+	cons.line_angle[1] = (base + asin(-r / d)) * PCB_RAD_TO_DEG;
+	cons_changed();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+void ddraft_tool_draw_attached(void)
+{
+	int n;
+	pcb_gui->set_line_cap(pcb_crosshair.GC, pcb_cap_round);
+	pcb_gui->set_line_width(pcb_crosshair.GC, 1);
+	pcb_gui->set_color(pcb_crosshair.GC, "#333333");
+	for(n = 0; n < vtc0_len(&pcb_ddraft_attached.annot_lines); n += 4) {
+		pcb_coord_t *c = &pcb_ddraft_attached.annot_lines.array[n];
+		pcb_gui->draw_line(pcb_crosshair.GC, c[0], c[1], c[2], c[3]);
+	}
+
+	if (pcb_ddraft_attached.line_valid) {
+		pcb_gui->set_color(pcb_crosshair.GC, CURRENT->meta.real.color);
+		pcb_draw_wireframe_line(pcb_crosshair.GC,
+			pcb_ddraft_attached.line.Point1.X, pcb_ddraft_attached.line.Point1.Y, pcb_ddraft_attached.line.Point2.X, pcb_ddraft_attached.line.Point2.Y,
+			conf_core.design.line_thickness, 0);
+	}
+}
+
+#include "cli.c"
+
+static pcb_action_t ddraft_action_list[] = {
+	{"trim", pcb_act_trim_split, pcb_acth_trim_split, pcb_acts_trim_split},
+	{"split", pcb_act_trim_split, pcb_acth_trim_split, pcb_acts_trim_split},
+	{"constraint", pcb_act_constraint, pcb_acth_constraint, pcb_acts_constraint},
+	{"perp", pcb_act_perp_paral, pcb_acth_perp_paral, pcb_acts_perp_paral},
+	{"paral", pcb_act_perp_paral, pcb_acth_perp_paral, pcb_acts_perp_paral},
+	{"tang", pcb_act_tang, pcb_acth_tang, pcb_acts_tang},
+	{"ddraft", pcb_act_ddraft, pcb_acth_ddraft, pcb_acts_ddraft}
+};
+
+PCB_REGISTER_ACTIONS(ddraft_action_list, ddraft_cookie)
+
+static pcb_tool_t tool_ddraft = {
+	"ddraft", NULL, 1000,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	ddraft_tool_draw_attached,
+	NULL,
+	NULL,
+	pcb_false
+};
+
+int pplg_check_ver_ddraft(int ver_needed) { return 0; }
+
+void pplg_uninit_ddraft(void)
+{
+	pcb_event_unbind_allcookie(ddraft_cookie);
+	pcb_remove_actions_by_cookie(ddraft_cookie);
+	pcb_tool_unreg_by_cookie(ddraft_cookie);
+}
+
+
+static const conf_hid_callbacks_t conf_cbs = { NULL, cons_gui_confchg, NULL, NULL };
+
+#include "dolists.h"
+int pplg_init_ddraft(void)
+{
+	conf_native_t *cn;
+	conf_hid_id_t confid;
+
+	PCB_API_CHK_VER;
+
+	PCB_REGISTER_ACTIONS(ddraft_action_list, ddraft_cookie)
+	pcb_event_bind(PCB_EVENT_DRAW_CROSSHAIR_CHATT, cnst_enforce, NULL, ddraft_cookie);
+
+	pcb_tool_reg(&tool_ddraft, ddraft_cookie);
+	pcb_ddraft_tool = pcb_tool_lookup(tool_ddraft.name);
+
+
+	cn = conf_get_field("editor/all_direction_lines");
+	confid = conf_hid_reg(ddraft_cookie, NULL);
+	conf_hid_set_cb(cn, confid, &conf_cbs);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/ddraft/ddraft.pup
===================================================================
--- tags/2.0.1/src_plugins/ddraft/ddraft.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/ddraft.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class export
+$short 2D drafting helper
+$long Actions and a command interpreter for supporting advanced/precise 2 dimensional drafting
+$state WIP
+$package core
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/ddraft/fields.sphash
===================================================================
--- tags/2.0.1/src_plugins/ddraft/fields.sphash	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/fields.sphash	(revision 18980)
@@ -0,0 +1,9 @@
+line_angle
+line_length
+line_angle_mod
+line_length_mod
+move_angle
+move_length
+move_angle_mod
+move_length_mod
+reset
Index: tags/2.0.1/src_plugins/ddraft/trim.c
===================================================================
--- tags/2.0.1/src_plugins/ddraft/trim.c	(nonexistent)
+++ tags/2.0.1/src_plugins/ddraft/trim.c	(revision 18980)
@@ -0,0 +1,378 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  2d drafting plugin: trim objects
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "undo_old.h"
+
+#define REMO_INVALID -1000.0
+#define remo_is_valid(v) ((v) > REMO_INVALID)
+
+/* Move a line endpoint to a new absoltue coord in an undoable way */
+static void move_lp(pcb_line_t *line, int pt_idx, pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_point_t *pt;
+
+	switch(pt_idx) {
+		case 1: pt = &line->Point1; break;
+		case 2: pt = &line->Point2; break;
+		default:
+			abort();
+	}
+
+	pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, line->parent.layer, line, pt, x - pt->X, y - pt->Y);
+	pcb_line_pre(line);
+	pt->X = x;
+	pt->Y = y;
+	pcb_line_post(line);
+}
+
+/* normallize mino and maxo: make sure they are in the [0..1] range */
+#define norm_minmaxo() \
+	do { \
+		if (mino < 0.0) \
+			mino = 0.0; \
+		if (maxo > 1.0) \
+			mino = 1.0; \
+	} while(0)
+
+static int pcb_trim_line(vtp0_t *cut_edges, pcb_line_t *line, double remo_in, pcb_coord_t rem_x, pcb_coord_t rem_y)
+{
+	int p, n;
+	double io[2];
+	double mino = 0.0, maxo = 1.0, remo = remo_in;
+	pcb_coord_t x, y;
+
+	if (!remo_is_valid(remo))
+		remo = pcb_cline_pt_offs(line, rem_x, rem_y);
+
+	for(n = 0; n < vtp0_len(cut_edges); n++) {
+		pcb_any_obj_t *cut_edge = (pcb_any_obj_t *)cut_edges->array[n];
+
+		p = 0;
+		switch(cut_edge->type) {
+			case PCB_OBJ_LINE:
+				p = pcb_intersect_cline_cline(line, (pcb_line_t *)cut_edge, NULL, io);
+				break;
+			case PCB_OBJ_ARC:
+				p = pcb_intersect_cline_carc(line, (pcb_arc_t *)cut_edge, NULL, io);
+				break;
+			default: continue;
+		}
+
+		switch(p) {
+			case 0: continue; /* no intersection, skip to the next potential cutting edge */
+			case 2:
+				if (io[1] < remo) {
+					if (io[1] > mino) mino = io[1];
+				}
+				else {
+					if (io[1] < maxo) maxo = io[1];
+				}
+			case 1:
+				if (io[0] < remo) {
+					if (io[0] > mino) mino = io[0];
+				}
+				else {
+					if (io[0] < maxo) maxo = io[0];
+				}
+				break;
+		}
+	}
+
+	norm_minmaxo();
+
+	if ((mino == 0.0) && (maxo == 1.0))
+		return 0; /* nothing to be done */
+
+	if (mino == maxo)
+		return 0; /* refuse to end up with 0-length lines */
+
+	/* mino and maxo holds the two endpoint offsets after the cuts, in respect
+	   to the original line. Cut/split the line using them. */
+	if ((mino > 0.0) && (maxo < 1.0)) { /* remove (shortest) middle section */
+		pcb_line_t *new_line = pcb_line_dup(line->parent.layer, line);
+
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, new_line->parent.layer, new_line, new_line);
+
+		pcb_cline_offs(line, maxo, &x, &y);
+		move_lp(line, 1, x, y);
+
+		pcb_cline_offs(new_line, mino, &x, &y);
+		move_lp(new_line, 2, x, y);
+	}
+	else if ((mino == 0.0) && (maxo < 1.0)) { /* truncate at point1 (shortest overdue) */
+		pcb_cline_offs(line, maxo, &x, &y);
+		move_lp(line, 1, x, y);
+	}
+	else if ((mino > 0.0) && (maxo == 1.0)) { /* truncate at point2 (shortest overdue) */
+		pcb_cline_offs(line, mino, &x, &y);
+		move_lp(line, 2, x, y);
+	}
+	else
+		return -1;
+
+	return 1;
+}
+
+/* Move arc start or end angle to a specific absolute angle (undoable) */
+static void move_arc_angs(pcb_arc_t *arc, int ep, double offs)
+{
+	double chg = offs * arc->Delta;
+
+	pcb_undo_add_obj_to_change_angles(PCB_OBJ_ARC, arc->parent.layer, arc, arc);
+	pcb_arc_pre(arc);
+	switch(ep) {
+		case 1:
+			arc->StartAngle += chg;
+			arc->Delta -= chg;
+			break;
+		case 2:
+			arc->Delta = chg;
+			break;
+	}
+	pcb_arc_post(arc);
+}
+
+
+static int pcb_trim_arc(vtp0_t *cut_edges, pcb_arc_t *arc, double remo_in, pcb_coord_t rem_x, pcb_coord_t rem_y)
+{
+	int p, n;
+	double io[2];
+	double mino = 0.0, maxo = 1.0, remo = remo_in;
+	
+	if (!remo_is_valid(remo))
+		remo = pcb_carc_pt_offs(arc, rem_x, rem_y);
+
+	for(n = 0; n < vtp0_len(cut_edges); n++) {
+		pcb_any_obj_t *cut_edge = (pcb_any_obj_t *)cut_edges->array[n];
+
+		p = 0;
+		switch(cut_edge->type) {
+			case PCB_OBJ_LINE:
+				p = pcb_intersect_carc_cline(arc, (pcb_line_t *)cut_edge, NULL, io);
+				break;
+			case PCB_OBJ_ARC:
+				p = pcb_intersect_carc_carc(arc, (pcb_arc_t *)cut_edge, NULL, io);
+				break;
+			default: continue;
+		}
+
+		switch(p) {
+			case 0: continue; /* no intersection, skip to the next potential cutting edge */
+			case 2:
+				if (io[1] < remo) {
+					if (io[1] > mino) mino = io[1];
+				}
+				else {
+					if (io[1] < maxo) maxo = io[1];
+				}
+			case 1:
+				if (io[0] < remo) {
+					if (io[0] > mino) mino = io[0];
+				}
+				else {
+					if (io[0] < maxo) maxo = io[0];
+				}
+				break;
+		}
+	}
+
+	norm_minmaxo();
+
+	if ((mino == 0.0) && (maxo == 1.0))
+		return 0; /* nothing to be done */
+
+	if (mino == maxo)
+		return 0; /* refuse to end up with 0-length lines */
+
+	/* mino and maxo holds the two endpoint offsets after the cuts, in respect
+	   to the original line. Cut/split the line using them. */
+	if ((mino > 0.0) && (maxo < 1.0)) { /* remove (shortest) middle section */
+		pcb_arc_t *new_arc = pcb_arc_dup(arc->parent.layer, arc);
+
+		pcb_undo_add_obj_to_create(PCB_OBJ_ARC, new_arc->parent.layer, new_arc, new_arc);
+
+		move_arc_angs(arc, 1, maxo);
+		move_arc_angs(new_arc, 2, mino);
+	}
+	else if ((mino == 0.0) && (maxo < 1.0)) { /* truncate at point1 (shortest overdue) */
+		move_arc_angs(arc, 1, maxo);
+	}
+	else if ((mino > 0.0) && (maxo == 1.0)) { /* truncate at point2 (shortest overdue) */
+		move_arc_angs(arc, 2, mino);
+	}
+	else
+		return -1;
+	return 1;
+}
+
+/* Split a line in two lines at a specific offset (undoable) */
+static pcb_line_t *split_lp(pcb_line_t *line, double offs)
+{
+	pcb_coord_t x, y;
+	pcb_line_t *new_line = pcb_line_dup(line->parent.layer, line);
+
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, new_line->parent.layer, new_line, new_line);
+
+	pcb_cline_offs(line, offs, &x, &y);
+	move_lp(line, 2, x, y);
+	move_lp(new_line, 1, x, y);
+
+	return new_line;
+}
+
+/* Split an arc in two arcs at a specific offset (undoable) */
+static pcb_arc_t *split_arcp(pcb_arc_t *arc, double offs)
+{
+	pcb_arc_t *new_arc = pcb_arc_dup(arc->parent.layer, arc);
+
+	pcb_undo_add_obj_to_create(PCB_OBJ_ARC, new_arc->parent.layer, new_arc, new_arc);
+
+	move_arc_angs(arc, 2, offs);
+	move_arc_angs(new_arc, 1, offs);
+
+	return new_arc;
+}
+
+
+static int pcb_split_line(vtp0_t *cut_edges, pcb_line_t *line, double remo_in, pcb_coord_t rem_x, pcb_coord_t rem_y)
+{
+	int p, n, numsplt = 0, res;
+	double io[2];
+	pcb_line_t *new_line;
+
+	for(n = 0; n < vtp0_len(cut_edges); n++) {
+		pcb_any_obj_t *cut_edge = (pcb_any_obj_t *)cut_edges->array[n];
+		p = 0;
+		switch(cut_edge->type) {
+			case PCB_OBJ_LINE:
+				p = pcb_intersect_cline_cline(line, (pcb_line_t *)cut_edge, NULL, io);
+				break;
+			case PCB_OBJ_ARC:
+				p = pcb_intersect_cline_carc(line, (pcb_arc_t *)cut_edge, NULL, io);
+				break;
+			default: continue;
+		}
+		switch(p) {
+			case 0: continue; /* no intersection, skip to the next potential cutting edge */
+			case 2:
+				if ((io[1] != 0.0) && (io[1] != 1.0)) {
+					new_line = split_lp(line, io[1]);
+					numsplt++;
+					res = pcb_split_line(cut_edges, line, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					res = pcb_split_line(cut_edges, new_line, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					break; /* can't use the other point if we did a split here, because that changes the meaning of offsets */
+				}
+			case 1:
+				if ((io[0] != 0.0) && (io[0] != 1.0)) {
+					new_line = split_lp(line, io[0]);
+					numsplt++;
+					res = pcb_split_line(cut_edges, line, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					res = pcb_split_line(cut_edges, new_line, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+				}
+				break;
+		}
+	}
+
+	return numsplt;
+}
+
+static int pcb_split_arc(vtp0_t *cut_edges, pcb_arc_t *arc, double remo_in, pcb_coord_t rem_x, pcb_coord_t rem_y)
+{
+	int p, n, numsplt = 0, res;
+	double io[2];
+	pcb_arc_t *new_arc;
+
+	for(n = 0; n < vtp0_len(cut_edges); n++) {
+		pcb_any_obj_t *cut_edge = (pcb_any_obj_t *)cut_edges->array[n];
+		p = 0;
+		switch(cut_edge->type) {
+			case PCB_OBJ_LINE:
+				p = pcb_intersect_carc_cline(arc, (pcb_line_t *)cut_edge, NULL, io);
+				break;
+			case PCB_OBJ_ARC:
+				p = pcb_intersect_carc_carc(arc, (pcb_arc_t *)cut_edge, NULL, io);
+				break;
+			default: continue;
+		}
+		switch(p) {
+			case 0: continue; /* no intersection, skip to the next potential cutting edge */
+			case 2:
+				if ((io[1] != 0.0) && (io[1] != 1.0)) {
+					new_arc = split_arcp(arc, io[1]);
+					numsplt++;
+					res = pcb_split_arc(cut_edges, arc, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					res = pcb_split_arc(cut_edges, new_arc, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					break; /* can't use the other point if we did a split here, because that changes the meaning of offsets */
+				}
+			case 1:
+				if ((io[0] != 0.0) && (io[0] != 1.0)) {
+					new_arc = split_arcp(arc, io[0]);
+					numsplt++;
+					res = pcb_split_arc(cut_edges, arc, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+					res = pcb_split_arc(cut_edges, new_arc, remo_in, rem_x, rem_y);
+					if (res > 0) numsplt += res;
+				}
+				break;
+		}
+	}
+
+	return numsplt;
+}
+
+int pcb_trim_split(vtp0_t *cut_edges, pcb_any_obj_t *obj, double remo, pcb_coord_t rem_x, pcb_coord_t rem_y, int trim)
+{
+	int res = 0;
+	switch(obj->type) {
+		case PCB_OBJ_LINE:
+			if (trim)
+				res = pcb_trim_line(cut_edges, (pcb_line_t *)obj, remo, rem_x, rem_y);
+			else
+				res = pcb_split_line(cut_edges, (pcb_line_t *)obj, remo, rem_x, rem_y);
+			break;
+		case PCB_OBJ_ARC:
+			if (trim)
+				res = pcb_trim_arc(cut_edges, (pcb_arc_t *)obj, remo, rem_x, rem_y);
+			else
+				res = pcb_split_arc(cut_edges, (pcb_arc_t *)obj, remo, rem_x, rem_y);
+			break;
+		default:
+			return -1;
+	}
+
+	if (res > 0)
+		pcb_undo_inc_serial();
+	return res;
+}
+
Index: tags/2.0.1/src_plugins/diag/Makefile
===================================================================
--- tags/2.0.1/src_plugins/diag/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_diag
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/diag/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/diag/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,14 @@
+put /local/pcb/mod {diag}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/diag/diag.o
+ $(PLUGDIR)/diag/diag_conf.o
+ $(PLUGDIR)/diag/integrity.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/diag/diag_conf.h}
+
+
+switch /local/pcb/diag/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/diag/diag.c
===================================================================
--- tags/2.0.1/src_plugins/diag/diag.c	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/diag.c	(revision 18980)
@@ -0,0 +1,478 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, diag, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "flag_str.h"
+#include "layer.h"
+#include "diag_conf.h"
+#include "actions.h"
+#include "plugins.h"
+#include "conf.h"
+#include "error.h"
+#include "event.h"
+#include "integrity.h"
+#include "hid.h"
+#include "hid_attrib.h"
+#include "hid_dad.h"
+#include "search.h"
+#include "macro.h"
+#include "funchash_core.h"
+
+conf_diag_t conf_diag;
+
+static const char pcb_acts_DumpConf[] =
+	"dumpconf(native, [verbose], [prefix]) - dump the native (binary) config tree to stdout\n"
+	"dumpconf(lihata, role, [prefix]) - dump in-memory lihata representation of a config tree\n"
+	;
+static const char pcb_acth_DumpConf[] = "Perform various operations on the configuration tree.";
+
+extern lht_doc_t *conf_main_root[];
+extern lht_doc_t *conf_plug_root[];
+static fgw_error_t pcb_act_DumpConf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op;
+
+	PCB_ACT_CONVARG(1, FGW_KEYWORD, DumpConf, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_Native:
+		{
+			int verbose = 0;
+			const char *prefix = "";
+			PCB_ACT_MAY_CONVARG(2, FGW_INT, DumpConf, verbose = argv[2].val.nat_int);
+			PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str);
+			conf_dump(stdout, prefix, verbose, NULL);
+		}
+		break;
+		case F_Lihata:
+		{
+		conf_role_t role;
+		const char *srole, *prefix = "";
+		PCB_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str);
+		PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str);
+		role = conf_role_parse(srole);
+		if (role == CFR_invalid) {
+			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'\n", argv[1]);
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+		if (conf_main_root[role] != NULL) {
+			printf("%s### main\n", prefix);
+			if (conf_main_root[role] != NULL)
+				lht_dom_export(conf_main_root[role]->root, stdout, prefix);
+			printf("%s### plugin\n", prefix);
+			if (conf_plug_root[role] != NULL)
+				lht_dom_export(conf_plug_root[role]->root, stdout, prefix);
+		}
+		else
+			printf("%s <empty>\n", prefix);
+		}
+		break;
+		default:
+			PCB_ACT_FAIL(DumpConf);
+			return 1;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_EvalConf[] =
+	"EvalConf(path) - evaluate a config path in different config sources to figure how it ended up in the native database\n"
+	;
+static const char pcb_acth_EvalConf[] = "Perform various operations on the configuration tree.";
+
+static fgw_error_t pcb_act_EvalConf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *path;
+	conf_native_t *nat;
+	int role;
+
+	PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str);
+
+	nat = conf_get_field(path);
+	if (nat == NULL) {
+		pcb_message(PCB_MSG_ERROR, "EvalConf: invalid path %s - no such config setting\n", path);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	printf("Conf node %s\n", path);
+	for(role = 0; role < CFR_max_real; role++) {
+		lht_node_t *n;
+		printf(" Role: %s\n", conf_role_name(role));
+		n = conf_lht_get_at(role, path, 0);
+		if (n != NULL) {
+			conf_policy_t pol = -1;
+			long prio = conf_default_prio[role];
+
+
+			if (conf_get_policy_prio(n, &pol, &prio) == 0)
+				printf("  * policy=%s\n  * prio=%ld\n", conf_policy_name(pol), prio);
+
+			if (n->file_name != NULL)
+				printf("  * from=%s:%d.%d\n", n->file_name, n->line, n->col);
+			else
+				printf("  * from=(unknown)\n");
+
+			lht_dom_export(n, stdout, "  ");
+		}
+		else
+			printf("  * not present\n");
+	}
+
+	printf(" Native:\n");
+	conf_print_native((conf_pfn)pcb_fprintf, stdout, "  ", 1, nat);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_DumpLayers[] = "dumplayers([all])\n";
+static const char pcb_acth_DumpLayers[] = "Print info about each layer";
+
+extern lht_doc_t *conf_main_root[];
+static fgw_error_t pcb_act_DumpLayers(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = -2, g, n, used;
+	pcb_layer_id_t arr[128]; /* WARNING: this assumes we won't have more than 128 layers */
+	pcb_layergrp_id_t garr[128]; /* WARNING: this assumes we won't have more than 128 layers */
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, DumpLayers, op = fgw_keyword(&argv[1]));
+
+	if (op == F_All) {
+		printf("Per group:\n");
+		for(g = 0; g < PCB->LayerGroups.len; g++) {
+			pcb_layergrp_t *grp = &PCB->LayerGroups.grp[g];
+			printf(" Group %d: '%s' %x\n", g, grp->name, grp->ltype);
+			for(n = 0; n < grp->len; n++) {
+				pcb_layer_t *ly = pcb_get_layer(PCB->Data, grp->lid[n]);
+				if (ly != NULL) {
+					printf("  layer %d: '%s'\n", n, ly->name);
+					if (ly->meta.real.grp != g)
+						printf("   ERROR: invalid back-link to group: %ld should be %d\n", ly->meta.real.grp, g);
+				}
+				else
+					printf("  layer %d: <invalid>\n", g);
+			}
+		}
+
+		printf("Per layer:\n");
+		for(n = 0; n < PCB->Data->LayerN; n++) {
+			pcb_layer_t *ly = &PCB->Data->Layer[n];
+			printf(" layer %d: '%s'\n", n, ly->name);
+			if (ly->meta.real.grp >= 0) {
+				pcb_layergrp_t *grp = &PCB->LayerGroups.grp[ly->meta.real.grp];
+				int i, ok = 0;
+				for(i = 0; i < grp->len; i++) {
+					if (grp->lid[i] == n) {
+						ok = 1;
+						break;
+					}
+				}
+				if (!ok)
+					printf("   ERROR: invalid back-link to group: %ld\n", ly->meta.real.grp);
+			}
+		}
+
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	printf("Max: theoretical=%d current_board=%d\n", PCB_MAX_LAYER+2, pcb_max_layer);
+	used = pcb_layer_list_any(PCB, PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, arr, sizeof(arr)/sizeof(arr[0]));
+	for(n = 0; n < used; n++) {
+		pcb_layer_id_t layer_id = arr[n];
+		pcb_layergrp_id_t grp = pcb_layer_get_group(PCB, layer_id);
+		printf(" [%lx] %04x group=%ld %s\n", layer_id, pcb_layer_flags(PCB, layer_id), grp, pcb_layer_name(PCB->Data, layer_id));
+	}
+
+	/* query by logical layer: any bottom copper */
+	used = pcb_layer_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, arr, sizeof(arr)/sizeof(arr[0]));
+	printf("All %d bottom copper layers are:\n", used);
+	for(n = 0; n < used; n++) {
+		pcb_layer_id_t layer_id = arr[n];
+		printf(" [%lx] %s \n", layer_id, PCB->Data->Layer[layer_id].name);
+	}
+
+	/* query by groups (physical layers): any copper in group */
+	used = pcb_layergrp_list(PCB, PCB_LYT_COPPER, garr, sizeof(garr)/sizeof(garr[0]));
+	printf("All %d groups containing copper layers are:\n", used);
+	for(g = 0; g < used; g++) {
+		pcb_layergrp_id_t group_id = garr[g];
+		printf(" group %ld (%d layers)\n", group_id, PCB->LayerGroups.grp[group_id].len);
+		for(n = 0; n < PCB->LayerGroups.grp[group_id].len; n++) {
+			pcb_layer_id_t layer_id = PCB->LayerGroups.grp[group_id].lid[n];
+			printf("  [%lx] %s\n", layer_id, PCB->Data->Layer[layer_id].name);
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static void print_font(pcb_font_t *f, const char *prefix)
+{
+	int n, g = 0, gletter = 0, gdigit = 0;
+	const char *name;
+
+	/* count valid glyphs and classes */
+	for(n = 0; n < PCB_MAX_FONTPOSITION + 1; n++) {
+		if (f->Symbol[n].Valid) {
+			g++;
+			if (isalpha(n)) gletter++;
+			if (isdigit(n)) gdigit++;
+		}
+	}
+
+	name = f->name == NULL ? "<anon>" : f->name;
+	pcb_printf("%s: %d %s; dim: %$$mm * %$$mm glyphs: %d (letter: %d, digit: %d)\n", prefix, f->id, name, f->MaxWidth, f->MaxHeight, g, gletter, gdigit);
+}
+
+static const char dump_fonts_syntax[] = "dumpfonts()\n";
+static const char dump_fonts_help[] = "Print info about fonts";
+static fgw_error_t pcb_act_DumpFonts(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	printf("Font summary:\n");
+	print_font(&PCB->fontkit.dflt, " Default");
+	if (PCB->fontkit.hash_inited) {
+		htip_entry_t *e;
+		for (e = htip_first(&PCB->fontkit.fonts); e; e = htip_next(&PCB->fontkit.fonts, e))
+			print_font(e->value, " Extra  ");
+	}
+	else
+		printf(" <no extra font loaded>\n");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+#ifndef NDEBUG
+extern void undo_dump(void);
+static const char dump_undo_syntax[] = "dumpfonts()\n";
+static const char dump_undo_help[] = "Print info about fonts";
+static fgw_error_t pcb_act_DumpUndo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	printf("Undo:\n");
+	undo_dump();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+#endif
+
+typedef enum { /* bitfield */
+	DD_DRC = 1,
+	DD_COPPER_ONLY = 2
+} dd_flags;
+
+static void dump_data(pcb_data_t *data, dd_flags what, int ind, const char *parent)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+	ind++;
+	for(o = pcb_data_first(&it, data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		const char *type = pcb_obj_type_name(o->type);
+		pcb_coord_t cx, cy;
+
+		if ((what & DD_COPPER_ONLY) && (o->type == PCB_OBJ_SUBC))
+			goto skip;
+
+		if ((what & DD_COPPER_ONLY) && (o->parent_type == PCB_PARENT_LAYER)) {
+			pcb_layer_type_t lyt = pcb_layer_flags_(o->parent.layer);
+			if (!(lyt & PCB_LYT_COPPER))
+				goto skip;
+		}
+
+		cx = (o->BoundingBox.X1+o->BoundingBox.X2)/2;
+		cy = (o->BoundingBox.Y1+o->BoundingBox.Y2)/2;
+		printf("%*s %s", ind, "", type);
+		pcb_printf(" #%ld %mm;%mm ", o->ID, cx, cy);
+
+		if (parent != NULL)
+			printf("%s", parent);
+		printf("-");
+		if (o->term != NULL)
+			printf("%s", o->term);
+
+		if (what & DD_DRC)
+			printf(" DRC=%c%c", PCB_FLAG_TEST(PCB_FLAG_FOUND, o) ? 'f':'.', PCB_FLAG_TEST(PCB_FLAG_SELECTED, o) ? 's':'.');
+
+		printf("\n");
+		
+		skip:;
+		if (o->type == PCB_OBJ_SUBC)
+			dump_data(((pcb_subc_t *)o)->data, what, ind, ((pcb_subc_t *)o)->refdes);
+	}
+}
+
+static const char dump_data_syntax[] = "dumpdata()\n";
+static const char dump_data_help[] = "Dump an aspect of the data";
+static fgw_error_t pcb_act_DumpData(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	dd_flags what = DD_DRC | DD_COPPER_ONLY;
+	printf("DumpData:\n");
+	dump_data(PCB->Data, what, 0, NULL);
+	printf("\n");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char integrity_syntax[] = "integrity()\n";
+static const char integrity_help[] = "perform integrirty check on the current board and generate errors if needed";
+static fgw_error_t pcb_act_integrity(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_check_integrity(PCB);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static int dumpflag_cb(void *ctx, gds_t *s, const char **input)
+{
+	pcb_flag_bits_t *flag = (pcb_flag_bits_t *)ctx;
+	switch(**input) {
+		case 'm': (*input)++; pcb_append_printf(s, "%lx", flag->mask); break;
+		case 'M': (*input)++; gds_append_str(s, flag->mask_name); break;
+		case 'N': (*input)++; gds_append_str(s, flag->name); break;
+		case 't': (*input)++; pcb_append_printf(s, "%lx", flag->object_types); break;
+		case 'H': (*input)++; gds_append_str(s, flag->name); break;
+		default:
+			return -1;
+	}
+	return 0;
+}
+
+static const char pcb_acts_dumpflags[] = "dumpflags([fmt])\n";
+static const char pcb_acth_dumpflags[] = "dump flags, optionally using the format string provided by the user";
+static fgw_error_t pcb_act_dumpflags(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int n;
+	const char *default_fmt = "%m (%M %N) for %t:\n  %H\n";
+	const char *fmt = default_fmt;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, dumpflags, fmt = argv[1].val.str);
+
+	for(n = 0; n < pcb_object_flagbits_len; n++) {
+		char *tmp;
+		tmp = pcb_strdup_subst(fmt, dumpflag_cb, &pcb_object_flagbits[n], PCB_SUBST_PERCENT /*| PCB_SUBST_BACKSLASH*/);
+		printf("%s", tmp);
+		free(tmp);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static void ev_ui_post(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+
+	if (conf_diag.plugins.diag.auto_integrity) {
+		static int cnt = 0;
+		if ((cnt++ % 100) == 0) {
+			pcb_trace("Number of integrity checks so far: %d\n", cnt);
+		}
+		pcb_check_integrity(PCB);
+	}
+}
+
+static const char pcb_acts_d1[] = "d1()\n";
+static const char pcb_acth_d1[] = "debug action for development";
+static fgw_error_t pcb_act_d1(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+#define	PCB_FORCECOLOR_TYPES        \
+	(PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC | PCB_OBJ_RAT)
+
+static const char pcb_acts_forcecolor[] = "forcecolor(#RRGGBB)\n";
+static const char pcb_acth_forcecolor[] = "change selected objects' color to #RRGGBB, reset if does not start with '#'";
+static fgw_error_t pcb_act_forcecolor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	int type;
+	void *ptr1, *ptr2, *ptr3;
+	const char *new_color;
+
+	PCB_ACT_CONVARG(1, FGW_STR, forcecolor, new_color = argv[1].val.str);
+
+	pcb_hid_get_coords("Click on object to change", &x, &y, 0);
+
+	if ((type = pcb_search_screen(x, y, PCB_FORCECOLOR_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID){
+		strncpy(((pcb_any_obj_t *)ptr2)->override_color, new_color, sizeof(((pcb_any_obj_t *)ptr2)->override_color)-1);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t diag_action_list[] = {
+	{"dumpconf", pcb_act_DumpConf, pcb_acth_DumpConf, pcb_acts_DumpConf},
+	{"dumplayers", pcb_act_DumpLayers, pcb_acth_DumpLayers, pcb_acts_DumpLayers},
+	{"dumpfonts", pcb_act_DumpFonts, dump_fonts_help, dump_fonts_syntax},
+	{"dumpdata", pcb_act_DumpData, dump_data_help, dump_data_syntax},
+#ifndef NDEBUG
+	{"dumpundo", pcb_act_DumpUndo, dump_undo_help, dump_undo_syntax},
+#endif
+	{"EvalConf", pcb_act_EvalConf, pcb_acth_EvalConf, pcb_acts_EvalConf},
+	{"d1", pcb_act_d1, pcb_acth_d1, pcb_acts_d1},
+	{"integrity", pcb_act_integrity, integrity_help, integrity_syntax},
+	{"dumpflags", pcb_act_dumpflags, pcb_acth_dumpflags, pcb_acts_dumpflags},
+	{"forcecolor", pcb_act_forcecolor, pcb_acth_forcecolor, pcb_acts_forcecolor}
+};
+
+static const char *diag_cookie = "diag plugin";
+
+PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie)
+
+int pplg_check_ver_diag(int ver_needed) { return 0; }
+
+void pplg_uninit_diag(void)
+{
+	pcb_remove_actions_by_cookie(diag_cookie);
+	conf_unreg_fields("plugins/diag/");
+	pcb_event_unbind_allcookie(diag_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_diag(void)
+{
+	PCB_API_CHK_VER;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_diag, field,isarray,type_name,cpath,cname,desc,flags);
+#include "diag_conf_fields.h"
+
+	pcb_event_bind(PCB_EVENT_USER_INPUT_POST, ev_ui_post, NULL, diag_cookie);
+	PCB_REGISTER_ACTIONS(diag_action_list, diag_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/diag/diag.pup
===================================================================
--- tags/2.0.1/src_plugins/diag/diag.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/diag.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short diagnostic acts. for devs
+$long Actions for pcb-rnd core diagnostics, intended for developers. These are not in core because end users normally don't need these. As a plugin, due to dynamic loading, it can be dropped on an existing pcb-rnd installation with minimal risk of scaring away a reproducible bug.
+$package debug
+$state works
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/diag/diag_conf.c
===================================================================
--- tags/2.0.1/src_plugins/diag/diag_conf.c	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/diag_conf.c	(revision 18980)
@@ -0,0 +1,46 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf.h"
+
+void conf_dump(FILE *f, const char *prefix, int verbose, const char *match_prefix)
+{
+	htsp_entry_t *e;
+	int pl;
+
+	if (match_prefix != NULL)
+		pl = strlen(match_prefix);
+
+	for (e = htsp_first(conf_fields); e; e = htsp_next(conf_fields, e)) {
+		conf_native_t *node = (conf_native_t *)e->value;
+		if (match_prefix != NULL) {
+			if (strncmp(node->hash_path, match_prefix, pl) != 0)
+				continue;
+		}
+		conf_print_native((conf_pfn)pcb_fprintf, f, prefix, verbose, node);
+	}
+}
Index: tags/2.0.1/src_plugins/diag/diag_conf.h
===================================================================
--- tags/2.0.1/src_plugins/diag/diag_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/diag_conf.h	(revision 18980)
@@ -0,0 +1,20 @@
+#ifndef PCB_DIAG_CONF_H
+#define PCB_DIAG_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct diag {
+			CFT_BOOLEAN auto_integrity;         /* Enable (expensive) automatic integrity check after each user action */
+		} diag;
+	} plugins;
+} conf_diag_t;
+
+extern conf_diag_t conf_diag;
+
+/* Print all configuration items to f, prefixing each line with prefix
+   If match_prefix is not NULL, print only items with matching path prefix */
+void conf_dump(FILE *f, const char *prefix, int verbose, const char *match_prefix);
+
+#endif
Index: tags/2.0.1/src_plugins/diag/integrity.c
===================================================================
--- tags/2.0.1/src_plugins/diag/integrity.c	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/integrity.c	(revision 18980)
@@ -0,0 +1,276 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ * 
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "undo.h"
+
+#define CHK "Broken integrity: "
+
+#define check_type(obj, exp_type) \
+	do { \
+		pcb_any_obj_t *__obj__ = (pcb_any_obj_t *)(obj); \
+		if (__obj__->type != exp_type) \
+			pcb_message(PCB_MSG_ERROR, CHK "%s %ld type proken (%d != %d)\n", pcb_obj_type_name(exp_type), __obj__->ID, __obj__->type, exp_type); \
+	} while(0)
+
+#define check_parent(name, obj, pt, prnt) \
+	do { \
+		if (obj->parent_type != pt) \
+			pcb_message(PCB_MSG_ERROR, CHK "%s " name " %ld parent type proken (%d != %d)\n", whose, obj->ID, obj->parent_type, pt); \
+		else if (obj->parent.any != prnt) \
+			pcb_message(PCB_MSG_ERROR, CHK "%s " name " %ld parent type proken (%p != %p)\n", whose, obj->ID, obj->parent.any, prnt); \
+	} while(0)
+
+#define chk_attr(name, obj) \
+	do { \
+		if (((obj)->Attributes.Number > 0) && ((obj)->Attributes.List == NULL)) \
+			pcb_message(PCB_MSG_ERROR, CHK "%s " name " %ld broken empty attribute list\n", whose, (obj)->ID); \
+	} while(0)
+
+#define check_field_eq(name, obj, st1, st2, fld, fmt) \
+	do { \
+		if ((st1)->fld != (st2)->fld) \
+			pcb_message(PCB_MSG_ERROR, CHK "%s " name " field ." #fld " value mismatch (" fmt " != " fmt ")\n", whose, obj->ID, (st1)->fld, (st2)->fld); \
+	} while(0)
+
+static void chk_layers(const char *whose, pcb_data_t *data, pcb_parenttype_t pt, void *parent, int name_chk);
+
+static void chk_term(const char *whose, pcb_any_obj_t *obj)
+{
+	const char *aterm = pcb_attribute_get(&obj->Attributes, "term");
+	const char *s_intconn = pcb_attribute_get(&obj->Attributes, "intconn");
+
+	if (pcb_obj_id_invalid(aterm))
+		pcb_message(PCB_MSG_ERROR, CHK "%s %ld has term attribute '%s' with invalid characters\n", whose, obj->ID, aterm);
+
+	if ((aterm == NULL) && (obj->term == NULL))
+		return;
+	if (obj->term == NULL) {
+		pcb_message(PCB_MSG_ERROR, CHK "%s %ld has term attribute '%s' but no ->term set\n", whose, obj->ID, aterm);
+		return;
+	}
+	if (aterm == NULL) {
+		pcb_message(PCB_MSG_ERROR, CHK "%s %ld has ->term '%s' but no attribute term set\n", whose, obj->ID, obj->term);
+		return;
+	}
+	if (aterm != obj->term) {
+		pcb_message(PCB_MSG_ERROR, CHK "%s %ld has mismatching pointer of ->term ('%s') and attribute term ('%s')\n", whose, obj->ID, obj->term, aterm);
+		return;
+	}
+
+	if (s_intconn != NULL) {
+		char *end;
+		long intconn = strtol(s_intconn, &end, 10);
+		if (*end == '\0') {
+			if (intconn != obj->intconn) {
+				pcb_message(PCB_MSG_ERROR, CHK "%s %ld has mismatching intconn: cached is %d, attribute is '%s'\n", whose, obj->ID, obj->intconn, s_intconn);
+				return;
+			}
+		}
+	}
+}
+
+static void chk_subc_cache(pcb_subc_t *subc)
+{
+	const char *arefdes = pcb_attribute_get(&subc->Attributes, "refdes");
+
+	if (pcb_obj_id_invalid(arefdes))
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld has refdes attribute '%s' with invalid characters\n", subc->ID, arefdes);
+
+	if ((subc->BoundingBox.X2 < 0) || (subc->BoundingBox.Y2 < 0))
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld is on negative coordinates; its bottom right corner is %$mm;%$mm\n", subc->ID, subc->BoundingBox.X2, subc->BoundingBox.Y2);
+
+	if ((subc->BoundingBox.X1 > PCB->MaxWidth) || (subc->BoundingBox.Y1 > PCB->MaxHeight))
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld is olost beyond board extents; its top left corner is %$mm;%$mm\n", subc->ID, subc->BoundingBox.X1, subc->BoundingBox.Y1);
+
+	if ((arefdes == NULL) && (subc->refdes == NULL))
+		return;
+	if (subc->refdes == NULL) {
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld has refdes attribute '%s' but no ->refdes set\n", subc->ID, arefdes);
+		return;
+	}
+	if (arefdes == NULL) {
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld has ->refdes '%s' but no attribute refdes set\n", subc->ID, subc->refdes);
+		return;
+	}
+	if (arefdes != subc->refdes) {
+		pcb_message(PCB_MSG_ERROR, CHK "subc %ld has mismatching pointer of ->refdes ('%s') and attribute refdes ('%s')\n", subc->ID, subc->refdes, arefdes);
+		return;
+	}
+}
+
+
+static void chk_subc(const char *whose, pcb_subc_t *subc)
+{
+	int n;
+	pcb_pstk_t *ps;
+
+	chk_layers("subc", subc->data, PCB_PARENT_SUBC, subc, 0);
+	chk_subc_cache(subc);
+
+	/* check term chaches */
+	for(ps = padstacklist_first(&subc->data->padstack); ps != NULL; ps = padstacklist_next(ps))
+		chk_term("padstack", (pcb_any_obj_t *)ps);
+
+	for(n = 0; n < subc->data->LayerN; n++) {
+		pcb_layer_t *ly = &subc->data->Layer[n];
+		pcb_line_t *lin;
+		pcb_arc_t *arc;
+		pcb_text_t *txt;
+		pcb_poly_t *pol;
+
+		if (!ly->is_bound)
+			pcb_message(PCB_MSG_ERROR, CHK "%ld subc layer %ld is not a bound layer\n", subc->ID, n);
+
+		for(lin = linelist_first(&ly->Line); lin != NULL; lin = linelist_next(lin))
+			chk_term("line", (pcb_any_obj_t *)lin);
+
+		for(arc = arclist_first(&ly->Arc); arc != NULL; arc = arclist_next(arc))
+			chk_term("arc", (pcb_any_obj_t *)arc);
+
+		for(txt = textlist_first(&ly->Text); txt != NULL; txt = textlist_next(txt))
+			chk_term("text", (pcb_any_obj_t *)txt);
+
+		for(pol = polylist_first(&ly->Polygon); pol != NULL; pol = polylist_next(pol))
+			chk_term("polygon", (pcb_any_obj_t *)pol);
+	}
+}
+
+/* Check layers and objects: walk the tree top->down and check ->parent
+   references from any node */
+static void chk_layers(const char *whose, pcb_data_t *data, pcb_parenttype_t pt, void *parent, int name_chk)
+{
+	pcb_layer_id_t n;
+
+	if (data->parent_type != pt)
+		pcb_message(PCB_MSG_ERROR, CHK "%s data: parent type proken (%d != %d)\n", whose, data->parent_type, pt);
+	else if (data->parent.any != parent)
+		pcb_message(PCB_MSG_ERROR, CHK "%s data: parent proken (%p != %p)\n", whose, data->parent, parent);
+
+
+	for(n = 0; n < data->LayerN; n++) {
+		pcb_line_t *lin;
+		pcb_text_t *txt;
+		pcb_arc_t *arc;
+		pcb_poly_t *poly;
+	
+		/* check layers */
+		if (data->Layer[n].parent.data != data)
+			pcb_message(PCB_MSG_ERROR, CHK "%s layer %ld/%s parent proken (%p != %p)\n", whose, n, data->Layer[n].name, data->Layer[n].parent, data);
+		if (name_chk && ((data->Layer[n].name == NULL) || (*data->Layer[n].name == '\0')))
+			pcb_message(PCB_MSG_ERROR, CHK "%s layer %ld has invalid name\n", whose, n);
+		check_type(&data->Layer[n], PCB_OBJ_LAYER);
+		check_parent("layer", (&data->Layer[n]), PCB_PARENT_DATA, data);
+		chk_attr("layer", &data->Layer[n]);
+
+		if (data->Layer[n].is_bound) {
+			if ((data->Layer[n].meta.bound.type & PCB_LYT_OUTLINE) && (data->Layer[n].meta.bound.type & PCB_LYT_ANYWHERE))
+				pcb_message(PCB_MSG_ERROR, CHK "%s layer %ld/%s is a non-global outline (bound layer)\n", whose, n, data->Layer[n].name);
+		}
+
+		/* check layer objects */
+		for(lin = linelist_first(&data->Layer[n].Line); lin != NULL; lin = linelist_next(lin)) {
+			check_parent("line", lin, PCB_PARENT_LAYER, &data->Layer[n]);
+			check_type(lin, PCB_OBJ_LINE);
+			chk_attr("line", lin);
+		}
+
+		for(txt = textlist_first(&data->Layer[n].Text); txt != NULL; txt = textlist_next(txt)) {
+			check_parent("text", txt, PCB_PARENT_LAYER, &data->Layer[n]);
+			check_type(txt, PCB_OBJ_TEXT);
+			chk_attr("text", txt);
+		}
+
+		for(poly = polylist_first(&data->Layer[n].Polygon); poly != NULL; poly = polylist_next(poly)) {
+			check_parent("polygon", poly, PCB_PARENT_LAYER, &data->Layer[n]);
+			check_type(poly, PCB_OBJ_POLY);
+			chk_attr("polygon", poly);
+		}
+
+		for(arc = arclist_first(&data->Layer[n].Arc); arc != NULL; arc = arclist_next(arc)) {
+			check_parent("arc", arc, PCB_PARENT_LAYER, &data->Layer[n]);
+			check_type(arc, PCB_OBJ_ARC);
+			chk_attr("arc", arc);
+		}
+	}
+
+	/* check global objects */
+	{
+		pcb_subc_t *subc;
+		pcb_pstk_t *ps;
+
+		for(ps = padstacklist_first(&data->padstack); ps != NULL; ps = padstacklist_next(ps)) {
+			check_parent("padstack", ps, PCB_PARENT_DATA, data);
+			check_type(ps, PCB_OBJ_PSTK);
+			chk_attr("padstack", ps);
+			chk_term("padstack", (pcb_any_obj_t *)ps);
+		}
+
+		for(subc = pcb_subclist_first(&data->subc); subc != NULL; subc = pcb_subclist_next(subc)) {
+			check_parent("subc", subc, PCB_PARENT_DATA, data);
+			check_type(subc, PCB_OBJ_SUBC);
+			chk_subc(whose, subc);
+			chk_attr("subc", subc);
+		}
+	}
+#warning subc TODO: check buffers: parents
+}
+
+static void chk_layergrps(pcb_board_t *pcb)
+{
+	pcb_layergrp_id_t n;
+	const char *whose = "board";
+
+	for(n = 0; n < pcb->LayerGroups.len; n++) {
+		pcb_layergrp_t *grp = &pcb->LayerGroups.grp[n];
+		check_parent("layer_group", grp, PCB_PARENT_BOARD, pcb);
+		check_type(grp, PCB_OBJ_LAYERGRP);
+		if ((grp->ltype & PCB_LYT_OUTLINE) && (grp->ltype & PCB_LYT_ANYWHERE))
+			pcb_message(PCB_MSG_ERROR, CHK "layer group %ld/%s is a non-global outline\n", n, grp->name);
+	}
+}
+
+
+void pcb_check_integrity(pcb_board_t *pcb)
+{
+	int n;
+
+	chk_layergrps(pcb);
+	chk_layers("board", pcb->Data, PCB_PARENT_BOARD, pcb, 1);
+
+	for (n = 0; n < PCB_MAX_BUFFER; n++) {
+		char bn[16];
+		sprintf(bn, "buffer #%d", n);
+		chk_layers(bn, pcb_buffers[n].Data, PCB_PARENT_INVALID, NULL, 0);
+	}
+
+	if (undo_check() != 0)
+		pcb_message(PCB_MSG_ERROR, CHK "undo\n");
+}
Index: tags/2.0.1/src_plugins/diag/integrity.h
===================================================================
--- tags/2.0.1/src_plugins/diag/integrity.h	(nonexistent)
+++ tags/2.0.1/src_plugins/diag/integrity.h	(revision 18980)
@@ -0,0 +1,3 @@
+#include "board.h"
+void pcb_check_integrity(pcb_board_t *pcb);
+
Index: tags/2.0.1/src_plugins/dialogs/Makefile
===================================================================
--- tags/2.0.1/src_plugins/dialogs/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_dialogs
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/dialogs/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/dialogs/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {dialogs}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/dialogs/dialogs.o
+@]
+
+switch /local/pcb/dialogs/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/dialogs/TEMPLATE.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/TEMPLATE.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/TEMPLATE.c	(revision 18980)
@@ -0,0 +1,91 @@
+/*
+	HOW TO USE THE TEMPLATE:
+		1. decide about the name of your dialog box, e.g. foo in this example
+		2. svn copy this file to dlg_foo.c - do not use plain fs copy, use svn copy!
+		3. rename functions in this file to
+		4. add '#include "dlg_foo.c"' in dialogs.c at the end of the list where
+		   all the other dlg_*.c files are included
+		5. add an action to pcb_act*_Foo in dialogs.c
+		6. edit the parts marked with '<<<- edit this' or 'EDIT THIS' - do not
+		   yet add the implementation
+		7. run 'make dep' in src/
+		8. remove this comment block so copyright is on top
+		9. edit the copyright message: year and author
+		10. test compile
+		11. in trunk/: 'svn commit src_plugins/dialogs src/Makefile.dep'
+		12. start implementing the dialog box
+
+		This simplistic example is a single-instance non-modal dialog;
+		there should be only one global variable, created out of the
+		context struct. This ensures it is easy to convert the dialog
+		to multi-instance in the future, if needed.
+		
+		If you need a multi-instance dialog, there should be no global variable
+		at all and the context struct should be allocated. A good example
+		on this is the shape dialog in ../shape/shape_dialog.c
+*/
+
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "core headers this file depends on (even if other dialogs include them)"
+
+typedef struct{
+	PCB_DAD_DECL_NOINIT(dlg)
+	int active; /* already open - allow only one instance */
+	int whatever;
+} foo_ctx_t; <<<- rename this
+
+foo_ctx_t foo_ctx;
+
+static void foo_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) <<<- rename this
+{
+	foo_ctx_t *ctx = caller_data;
+	PCB_DAD_FREE(ctx->dlg);
+	memset(ctx, 0, sizeof(foo_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */
+}
+
+static void pcb_dlg_foo(whatever args) <<<- edit this
+{
+	if (foo_ctx.active)
+		return; /* do not open another */
+
+	PCB_DAD_BEGIN_VBOX(foo_ctx.dlg);
+		PCB_DAD_LABEL(foo_ctx.dlg, "foo");
+	PCB_DAD_END(foo_ctx.dlg);
+
+	/* set up the context */
+	foo_ctx.active = 1;
+
+	PCB_DAD_NEW(foo_ctx.dlg, "EDIT THIS", "EDIT THIS", &foo_ctx, pcb_false, foo_close_cb);
+}
+
+static const char pcb_acts_Foo[] = "Foo(object)\n"; <<<- edit this
+static const char pcb_acth_Foo[] = ""; <<<- edit this
+static fgw_error_t pcb_act_Foo(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) <<<- edit this
+{
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/TEMPLATE_MODAL.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/TEMPLATE_MODAL.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/TEMPLATE_MODAL.c	(revision 18980)
@@ -0,0 +1,74 @@
+/*
+	HOW TO USE THE TEMPLATE:
+		0. reconsider: does this dialog have to be modal?
+		1. decide about the name of your dialog box, e.g. foo in this example
+		2. svn copy this file to dlg_foo.c - do not use plain fs copy, use svn copy!
+		3. rename functions in this file to
+		4. add '#include "dlg_foo.c"' in dialogs.c at the end of the list where
+		   all the other dlg_*.c files are included
+		5. add an action to pcb_act*_Foo in dialogs.c
+		6. edit the parts marked with '<<<- edit this' or 'EDIT THIS' - do not
+		   yet add the implementation
+		7. run 'make dep' in src/
+		8. remove this comment block so copyright is on top
+		9. edit the copyright message: year and author
+		10. test compile
+		11. in trunk/: 'svn commit src_plugins/dialogs src/Makefile.dep'
+		12. start implementing the dialog box
+*/
+
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "core headers this file depends on (even if other dialogs include them)"
+
+typedef struct{
+	pcb_hid_attribute_t *attrs;
+} foo_ctx_t; <<<- rename this
+
+static void pcb_dlg_foo(whatever args) <<<- edit this
+{
+	foo_ctx_t ctx;
+	PCB_DAD_DECL(dlg);
+
+	PCB_DAD_BEGIN_VBOX(dlg);
+		PCB_DAD_LABEL(dlg, "foo");
+	PCB_DAD_END(dlg);
+
+	/* set up the context */
+	ctx.attrs = dlg;
+
+	PCB_DAD_NEW(dlg, "EDIT THIS", "EDIT THIS", &ctx, pcb_true, NULL);
+	PCB_DAD_RUN(dlg);
+	PCB_DAD_FREE(dlg);
+}
+
+static const char pcb_acts_Foo[] = "Foo(object)\n"; <<<- edit this
+static const char pcb_acth_Foo[] = ""; <<<- edit this
+static fgw_error_t pcb_act_Foo(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv) <<<- edit this
+{
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dialogs.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dialogs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dialogs.c	(revision 18980)
@@ -0,0 +1,72 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, dialogs, was written and is Copyright (C) 2017 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "hid.h"
+#include "hid_attrib.h"
+#include "actions.h"
+#include "hid_dad.h"
+#include "plugins.h"
+#include "funchash_core.h"
+
+/* include them all for static inlines */
+#include "dlg_test.c"
+#include "dlg_layer_binding.c"
+#include "dlg_flag_edit.c"
+#include "dlg_padstack.c"
+#include "dlg_about.c"
+#include "dlg_export.c"
+
+pcb_action_t dialogs_action_list[] = {
+	{"dlg_test", pcb_act_dlg_test, dlg_test_help, dlg_test_syntax},
+	{"LayerBinding", pcb_act_LayerBinding, pcb_acth_LayerBinding, pcb_acts_LayerBinding},
+	{"FlagEdit", pcb_act_FlagEdit, pcb_acth_FlagEdit, pcb_acts_FlagEdit},
+	{"PadstackEdit", pcb_act_PadstackEdit, pcb_acth_PadstackEdit, pcb_acts_PadstackEdit},
+	{"About", pcb_act_About, pcb_acth_About, pcb_acts_About},
+	{"ExportGUI", pcb_act_ExportGUI, pcb_acth_ExportGUI, pcb_acts_ExportGUI}
+};
+
+static const char *dialogs_cookie = "dialogs plugin";
+
+PCB_REGISTER_ACTIONS(dialogs_action_list, dialogs_cookie)
+
+int pplg_check_ver_dialogs(int ver_needed) { return 0; }
+
+void pplg_uninit_dialogs(void)
+{
+	pcb_remove_actions_by_cookie(dialogs_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_dialogs(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(dialogs_action_list, dialogs_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dialogs.pup
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dialogs.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dialogs.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short HID-independent GUI dialogs
+$long Interactive core functionality: HID-independent GUI dialogs (enabled by GUI HIDs)
+$package lib-gui
+$state works
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/dialogs/dlg_about.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_about.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_about.c	(revision 18980)
@@ -0,0 +1,105 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <genvector/gds_char.h>
+#include "build_run.h"
+#include "pcb-printf.h"
+
+typedef struct{
+	PCB_DAD_DECL_NOINIT(dlg)
+	int active; /* already open - allow only one instance */
+} about_ctx_t;
+
+about_ctx_t about_ctx;
+
+static void about_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+{
+	about_ctx_t *ctx = caller_data;
+	PCB_DAD_FREE(ctx->dlg);
+	memset(ctx, 0, sizeof(about_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */
+}
+
+
+static void pcb_dlg_about(void)
+{
+	const char *tabs[] = { "About pcb-rnd", "Options", "Paths", "License", NULL };
+	htsp_entry_t *e;
+	gds_t s;
+
+	if (about_ctx.active)
+		return;
+
+	PCB_DAD_BEGIN_TABBED(about_ctx.dlg, tabs);
+		PCB_DAD_BEGIN_VBOX(about_ctx.dlg);
+			PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_program());
+			PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_copyright());
+			PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_websites(NULL));
+		PCB_DAD_END(about_ctx.dlg);
+
+		PCB_DAD_BEGIN_VBOX(about_ctx.dlg);
+			PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_SCROLL);
+			PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_compile_options());
+		PCB_DAD_END(about_ctx.dlg);
+
+
+		PCB_DAD_BEGIN_VBOX(about_ctx.dlg);
+			PCB_DAD_COMPFLAG(about_ctx.dlg, PCB_HATF_SCROLL);
+			gds_init(&s);
+			for (e = htsp_first(&pcb_file_loaded); e; e = htsp_next(&pcb_file_loaded, e)) {
+				htsp_entry_t *e2;
+				pcb_file_loaded_t *cat = e->value;
+				PCB_DAD_LABEL(about_ctx.dlg, cat->name);
+				gds_truncate(&s, 0);
+				for (e2 = htsp_first(&cat->data.category.children); e2; e2 = htsp_next(&cat->data.category.children, e2)) {
+					pcb_file_loaded_t *file = e2->value;
+					pcb_append_printf(&s, "  %s\t%s\t%s\n", file->name, file->data.file.path, file->data.file.desc);
+				}
+				PCB_DAD_LABEL(about_ctx.dlg, s.array);
+			}
+			gds_uninit(&s);
+		PCB_DAD_END(about_ctx.dlg);
+
+		PCB_DAD_BEGIN_VBOX(about_ctx.dlg);
+			PCB_DAD_LABEL(about_ctx.dlg, pcb_get_info_license());
+		PCB_DAD_END(about_ctx.dlg);
+
+	PCB_DAD_END(about_ctx.dlg);
+
+	/* set up the context */
+	about_ctx.active = 1;
+
+	/* this is the modal version - please consider using the non-modal version */
+	PCB_DAD_NEW(about_ctx.dlg, "About pcb-rnd", "About", &about_ctx, pcb_false, about_close_cb);
+}
+
+static const char pcb_acts_About[] = "About()\n";
+static const char pcb_acth_About[] = "Present the about box";
+static fgw_error_t pcb_act_About(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_dlg_about();
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dlg_export.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_export.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_export.c	(revision 18980)
@@ -0,0 +1,172 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "hid.h"
+#include "hid_init.h"
+
+typedef struct{
+	PCB_DAD_DECL_NOINIT(dlg)
+	int active; /* already open - allow only one instance */
+
+	int tabs, len;
+
+	/* per exporter data */
+	pcb_hid_t **hid;
+	const char **tab_name;
+	int *first_attr;          /* widget ID of the first attribute for a specific exporter */
+	int *button;              /* widget ID of the export button for a specific exporter */
+	int *numa;                /* number of exporter attributes */
+	pcb_hid_attribute_t **ea; /* original exporter attribute arrays */
+} export_ctx_t;
+
+export_ctx_t export_ctx;
+
+static pcb_hid_attr_val_t *get_results(export_ctx_t *export_ctx, int id)
+{
+	pcb_hid_attr_val_t *r;
+	int n, numa = export_ctx->numa[id];
+
+	r = malloc(sizeof(pcb_hid_attr_val_t) * numa);
+
+	for(n = 0; n < numa; n++) {
+		int src = export_ctx->first_attr[id] + n;
+		memcpy(&r[n], &(export_ctx->dlg[src].default_val), sizeof(pcb_hid_attr_val_t));
+	}
+	return r;
+}
+
+static void export_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	export_ctx_t *export_ctx = caller_data;
+	int h, wid;
+	wid = attr - export_ctx->dlg;
+	for(h = 0; h < export_ctx->len; h++) {
+		if (export_ctx->button[h] == wid) {
+			pcb_hid_attr_val_t *results = get_results(export_ctx, h);
+			export_ctx->hid[h]->do_export(results);
+			free(results);
+			pcb_message(PCB_MSG_INFO, "Export done using exporter: %s\n", export_ctx->hid[h]->name);
+			return;
+		}
+	}
+
+	pcb_message(PCB_MSG_ERROR, "Internal error: can not find which exporter to call\n");
+}
+
+static void export_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+{
+	export_ctx_t *ctx = caller_data;
+	PCB_DAD_FREE(ctx->dlg);
+	free(ctx->hid);
+	free(ctx->tab_name);
+	free(ctx->first_attr);
+	free(ctx->button);
+	free(ctx->numa);
+	free(ctx->ea);
+	memset(ctx, 0, sizeof(export_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */
+}
+
+static void pcb_dlg_export(void)
+{
+	pcb_hid_t **hids;
+	int n, i;
+
+	if (export_ctx.active)
+		return; /* do not open another */
+
+	hids = pcb_hid_enumerate();
+	for(n = 0, export_ctx.len = 0; hids[n] != NULL; n++) {
+		if (!hids[n]->exporter)
+			continue;
+		export_ctx.len++;
+	}
+
+	if (export_ctx.len == 0) {
+		pcb_message(PCB_MSG_ERROR, "Can not export: there are no export plugins available\n");
+		return;
+	}
+
+	export_ctx.tab_name = malloc(sizeof(char *) * (export_ctx.len+1));
+	export_ctx.hid = malloc(sizeof(pcb_hid_t *) * (export_ctx.len));
+	export_ctx.first_attr = malloc(sizeof(int) * (export_ctx.len));
+	export_ctx.button = malloc(sizeof(int) * (export_ctx.len));
+	export_ctx.numa = malloc(sizeof(int) * (export_ctx.len));
+	export_ctx.ea = malloc(sizeof(pcb_hid_attribute_t *) * (export_ctx.len));
+
+	for(i = n = 0; hids[n] != NULL; n++) {
+		if (!hids[n]->exporter)
+			continue;
+		export_ctx.tab_name[i] = hids[n]->name;
+		export_ctx.hid[i] = hids[n];
+		i++;
+	}
+
+	export_ctx.tab_name[i] = NULL;
+
+	PCB_DAD_BEGIN_TABBED(export_ctx.dlg, export_ctx.tab_name);
+		PCB_DAD_COMPFLAG(export_ctx.dlg, PCB_HATF_LEFT_TAB);
+		export_ctx.tabs = PCB_DAD_CURRENT(export_ctx.dlg);
+		for(n = 0; n < export_ctx.len; n++) {
+			int numa;
+			pcb_hid_attribute_t *attrs = export_ctx.hid[n]->get_export_options(&numa);
+			export_ctx.numa[n] = numa;
+			export_ctx.ea[n] = attrs;
+			if (numa < 1) {
+				PCB_DAD_LABEL(export_ctx.dlg, "Exporter unavailable for direct export");
+				continue;
+			}
+			PCB_DAD_BEGIN_VBOX(export_ctx.dlg);
+				PCB_DAD_COMPFLAG(export_ctx.dlg, PCB_HATF_LABEL);
+				for(i = 0; i < numa; i++) {
+					PCB_DAD_DUP_ATTR(export_ctx.dlg, attrs+i);
+					if (i == 0)
+						export_ctx.first_attr[n] = PCB_DAD_CURRENT(export_ctx.dlg);
+				}
+				PCB_DAD_LABEL(export_ctx.dlg, " "); /* ugly way of inserting some vertical spacing */
+				PCB_DAD_BEGIN_HBOX(export_ctx.dlg)
+					PCB_DAD_LABEL(export_ctx.dlg, "Apply attributes and export: ");
+					PCB_DAD_BUTTON(export_ctx.dlg, "Export!");
+						export_ctx.button[n] = PCB_DAD_CURRENT(export_ctx.dlg);
+						PCB_DAD_CHANGE_CB(export_ctx.dlg, export_cb);
+				PCB_DAD_END(export_ctx.dlg);
+				PCB_DAD_CURRENT(export_ctx.dlg);
+			PCB_DAD_END(export_ctx.dlg);
+		}
+	PCB_DAD_END(export_ctx.dlg);
+
+	/* set up the context */
+	export_ctx.active = 1;
+
+	PCB_DAD_NEW(export_ctx.dlg, "Export", "Export in various formats", &export_ctx, pcb_false, export_close_cb);
+}
+
+static const char pcb_acts_ExportGUI[] = "ExportGUI()\n";
+static const char pcb_acth_ExportGUI[] = "Open the export dialog.";
+static fgw_error_t pcb_act_ExportGUI(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv)
+{
+	pcb_dlg_export();
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dlg_flag_edit.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_flag_edit.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_flag_edit.c	(revision 18980)
@@ -0,0 +1,148 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "flag.h"
+#include "flag_str.h"
+#include "change.h"
+
+typedef struct{
+	unsigned long flag_bit[64];
+	int wid[64];
+	int len;
+	pcb_board_t *pcb;
+	int obj_type;
+	void *ptr1;
+	pcb_any_obj_t *obj;
+	pcb_hid_attribute_t *attrs;
+} fe_ctx_t;
+
+#define PCB_FLAGEDIT_TYPES \
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_POLY | \
+	PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_ARC)
+
+static void fe_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	int n;
+	fe_ctx_t *ctx = caller_data;
+	unsigned long set = 0, clr = 0;
+
+	for(n = 0; n < ctx->len; n++) {
+		int wid = ctx->wid[n];
+		if ((ctx->attrs[wid].default_val.int_value) && (!PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj)))
+			set |= ctx->flag_bit[n];
+		else if (!(ctx->attrs[wid].default_val.int_value) && PCB_FLAG_TEST(ctx->flag_bit[n], ctx->obj))
+			clr |= ctx->flag_bit[n];
+	}
+
+	if ((set == 0) && (clr == 0))
+		return;
+
+	/* Note: this function is called upon each change so only one of these will be non-zero: */
+
+	if (set != 0)
+		pcb_flag_change(ctx->pcb, PCB_CHGFLG_SET, set, ctx->obj_type, ctx->ptr1, ctx->obj, ctx->obj);
+
+	if (clr != 0)
+		pcb_flag_change(ctx->pcb, PCB_CHGFLG_CLEAR, clr, ctx->obj_type, ctx->ptr1, ctx->obj, ctx->obj);
+
+	pcb_gui->invalidate_all();
+}
+
+
+
+static const char pcb_acts_FlagEdit[] = "FlagEdit(object)\n";
+static const char pcb_acth_FlagEdit[] = "Change the layer binding.";
+static fgw_error_t pcb_act_FlagEdit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = F_Object;
+	fe_ctx_t ctx;
+	pcb_hid_attr_val_t val;
+	int type;
+
+	memset(&ctx, 0, sizeof(ctx));
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, FlagEdit, op = fgw_keyword(&argv[1]));
+
+	if (op == F_Object) {
+		pcb_coord_t x, y;
+		void *ptr1, *ptr2, *ptr3;
+		pcb_hid_get_coords("Click on object to change flags of", &x, &y, 0);
+		type = pcb_search_screen(x, y, PCB_FLAGEDIT_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3);
+		ctx.ptr1 = ptr1;
+		ctx.obj = (pcb_any_obj_t *)ptr2;
+		ctx.obj_type = (type & 0xFFFF) | (type & PCB_OBJ_PSTK);
+	}
+	else
+		PCB_ACT_FAIL(FlagEdit);
+
+	if ((ctx.obj_type != 0) && (PCB_FLAG_TEST(PCB_FLAG_LOCK, ctx.obj))) {
+		pcb_message(PCB_MSG_ERROR, "Can't edit the flags of a locked object, unlock first.\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	if (ctx.obj_type != 0) { /* interactive mode */
+		int n;
+		char tmp[128];
+		PCB_DAD_DECL(dlg);
+
+		ctx.pcb = PCB;
+		ctx.len = 0;
+
+		PCB_DAD_BEGIN_VBOX(dlg);
+		PCB_DAD_COMPFLAG(dlg, PCB_HATF_LABEL);
+
+		sprintf(tmp, "Object flags of %s #%ld\n", pcb_obj_type_name(ctx.obj_type), ctx.obj->ID);
+		PCB_DAD_LABEL(dlg, tmp);
+
+		for(n = 0; n < pcb_object_flagbits_len; n++) {
+			if (pcb_object_flagbits[n].object_types & ctx.obj_type) {
+				PCB_DAD_BOOL(dlg, pcb_object_flagbits[n].name);
+				PCB_DAD_HELP(dlg, pcb_object_flagbits[n].help);
+				ctx.wid[ctx.len] = PCB_DAD_CURRENT(dlg);
+				ctx.flag_bit[ctx.len] = pcb_object_flagbits[n].mask;
+				if (PCB_FLAG_TEST(ctx.flag_bit[ctx.len], ctx.obj))
+					PCB_DAD_DEFAULT(dlg, 1);
+				ctx.len++;
+			}
+		}
+		PCB_DAD_END(dlg);
+
+		ctx.attrs = dlg;
+
+		PCB_DAD_NEW(dlg, "flag_edit", "Edit flags", &ctx, pcb_true, NULL);
+
+		val.func = fe_attr_chg;
+		pcb_gui->attr_dlg_property(dlg_hid_ctx, PCB_HATP_GLOBAL_CALLBACK, &val);
+
+		PCB_DAD_RUN(dlg);
+
+		PCB_DAD_FREE(dlg);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dlg_layer_binding.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_layer_binding.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_layer_binding.c	(revision 18980)
@@ -0,0 +1,321 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "obj_subc.h"
+#include "search.h"
+
+static const char *lb_comp[] = { "+manual", "-manual", "+auto", "-auto", NULL };
+static const char *lb_types[] = { "UNKNOWN", "paste", "mask", "silk", "copper", "outline", "virtual", NULL };
+static const char *lb_side[] = { "top", "bottom", NULL };
+
+typedef struct {
+	int name, comp, type, offs, from, side, layer; /* widet indices */
+} lb_widx_t;
+
+typedef struct {
+	const char **layer_names;
+	lb_widx_t *widx;
+	pcb_data_t *data;
+	pcb_subc_t *subc;
+	pcb_board_t *pcb;
+	int no_layer; /* the "invalid layer" in the layer names enum */
+	pcb_hid_attribute_t *attrs;
+} lb_ctx_t;
+
+static void set_ly_type(void *hid_ctx, int wid, pcb_layer_type_t type)
+{
+	int val;
+
+	val = 0;
+	if (type & PCB_LYT_PASTE)        val = 1;
+	else if (type & PCB_LYT_MASK)    val = 2;
+	else if (type & PCB_LYT_SILK)    val = 3;
+	else if (type & PCB_LYT_COPPER)  val = 4;
+	else if (type & PCB_LYT_OUTLINE) val = 5;
+	else if (type & PCB_LYT_VIRTUAL) val = 6;
+
+	PCB_DAD_SET_VALUE(hid_ctx, wid, int_value, val);
+}
+
+static void get_ly_type(int combo_type, int combo_side, int dlg_offs, pcb_layer_type_t *type, int *offs)
+{
+	/* clear relevant flags */
+	*type &= ~(PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL);
+
+	/* set type */
+	switch(combo_type) {
+		case 1: *type |= PCB_LYT_PASTE; break;
+		case 2: *type |= PCB_LYT_MASK; break;
+		case 3: *type |= PCB_LYT_SILK; break;
+		case 4: *type |= PCB_LYT_COPPER; break;
+		case 5: *type |= PCB_LYT_OUTLINE; break;
+		case 6: *type |= PCB_LYT_VIRTUAL; break;
+	}
+
+	/* set side and offset */
+	if (dlg_offs == 0) {
+		if (combo_side == 0)
+			*type |= PCB_LYT_TOP;
+		else
+			*type |= PCB_LYT_BOTTOM;
+	}
+	else {
+		if (combo_side != 0)
+			dlg_offs = -dlg_offs;
+		*type |= PCB_LYT_INTERN;
+	}
+	*offs = dlg_offs;
+}
+
+
+#define layer_name_mismatch(w, layer) \
+((ctx->attrs[w->name].default_val.str_value == NULL) || (strcmp(layer->name, ctx->attrs[w->name].default_val.str_value) != 0))
+
+static void lb_data2dialog(void *hid_ctx, lb_ctx_t *ctx)
+{
+	int n;
+	pcb_bool enable;
+
+	for(n = 0; n < ctx->data->LayerN; n++) {
+		lb_widx_t *w = ctx->widx + n;
+		pcb_layer_t *layer = ctx->data->Layer + n;
+		pcb_layer_id_t lid;
+		int ofs;
+
+		/* disable comp for copper and outline */
+		enable = !(layer->meta.bound.type & PCB_LYT_COPPER) && !(layer->meta.bound.type & PCB_LYT_OUTLINE);
+		pcb_gui->attr_dlg_widget_state(hid_ctx, w->comp, enable);
+		if (!enable)
+			layer->comb = 0; /* copper and outline must be +manual */
+
+		/* name and type */
+		if (layer_name_mismatch(w, layer))
+			PCB_DAD_SET_VALUE(hid_ctx, w->name, str_value, pcb_strdup(layer->name));
+
+		PCB_DAD_SET_VALUE(hid_ctx, w->comp, int_value, layer->comb);
+
+		set_ly_type(hid_ctx, w->type, layer->meta.bound.type);
+
+		/* side & offset */
+		PCB_DAD_SET_VALUE(hid_ctx, w->side, int_value, !!(layer->meta.bound.type & PCB_LYT_BOTTOM));
+
+		ofs = layer->meta.bound.stack_offs;
+		if (ofs < 0) {
+			PCB_DAD_SET_VALUE(hid_ctx, w->side, int_value, 1);
+			ofs = -layer->meta.bound.stack_offs;
+		}
+		PCB_DAD_SET_VALUE(hid_ctx, w->offs, int_value, ofs);
+
+		/* enable offset only for copper */
+		enable = (layer->meta.bound.type & PCB_LYT_COPPER);
+		pcb_gui->attr_dlg_widget_state(hid_ctx, w->offs, enable);
+		pcb_gui->attr_dlg_widget_state(hid_ctx, w->from, enable);
+
+		enable = !(layer->meta.bound.type & PCB_LYT_VIRTUAL) && !(layer->meta.bound.type & PCB_LYT_OUTLINE);
+		pcb_gui->attr_dlg_widget_state(hid_ctx, w->side, enable);
+
+
+		/* real layer */
+		if (layer->meta.bound.real != NULL)
+			lid = pcb_layer_id(PCB->Data, layer->meta.bound.real);
+		else
+			lid = ctx->no_layer;
+		PCB_DAD_SET_VALUE(hid_ctx, w->layer, int_value, lid);
+		pcb_gui->attr_dlg_widget_state(hid_ctx, w->layer, 0);
+	}
+}
+
+static void lb_dialog2data(void *hid_ctx, lb_ctx_t *ctx)
+{
+	int n;
+
+	for(n = 0; n < ctx->data->LayerN; n++) {
+		lb_widx_t *w = ctx->widx + n;
+		pcb_layer_t *layer = ctx->data->Layer + n;
+
+		if (layer_name_mismatch(w, layer)) {
+			free((char *)layer->name);
+			layer->name = pcb_strdup(ctx->attrs[w->name].default_val.str_value);
+		}
+
+		layer->comb = ctx->attrs[w->comp].default_val.int_value;
+		get_ly_type(ctx->attrs[w->type].default_val.int_value, ctx->attrs[w->side].default_val.int_value, ctx->attrs[w->offs].default_val.int_value, &layer->meta.bound.type, &layer->meta.bound.stack_offs);
+
+		/* enforce some sanity rules */
+		if (layer->meta.bound.type & PCB_LYT_OUTLINE) {
+			/* outline must be positive global */
+			layer->comb = 0;
+			layer->meta.bound.type &= ~PCB_LYT_ANYWHERE;
+		}
+		if (!(layer->meta.bound.type & PCB_LYT_COPPER)) {
+			/* temporary: offset is useful only for copper layers */
+			layer->meta.bound.stack_offs = 0;
+		}
+	}
+}
+
+
+static void lb_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	lb_ctx_t *ctx = caller_data;
+	lb_dialog2data(hid_ctx, ctx);
+	if (ctx->subc != NULL) {
+		if (pcb_subc_rebind(ctx->pcb, ctx->subc) > 0)
+			pcb_gui->invalidate_all();
+	}
+	else { /* buffer */
+		pcb_data_binding_update(ctx->pcb, ctx->data);
+		pcb_gui->invalidate_all();
+	}
+	lb_data2dialog(hid_ctx, ctx); /* update disables */
+}
+
+static const char pcb_acts_LayerBinding[] = "LayerBinding(object)\nLayerBinding(selected)\nLayerBinding(buffer)\n";
+static const char pcb_acth_LayerBinding[] = "Change the layer binding.";
+static fgw_error_t pcb_act_LayerBinding(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = F_Object;
+	lb_ctx_t ctx;
+	int num_copper;
+	pcb_hid_attr_val_t val;
+
+	memset(&ctx, 0, sizeof(ctx));
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, LayerBinding, op = fgw_keyword(&argv[1]));
+
+	if (op == F_Object) {
+		pcb_coord_t x, y;
+		int type;
+		void *ptr1, *ptr2, *ptr3;
+		pcb_hid_get_coords("Click on subc to change the layer binding of", &x, &y, 0);
+		type = pcb_search_screen(x, y, PCB_OBJ_SUBC, &ptr1, &ptr2, &ptr3);
+		if (type != PCB_OBJ_SUBC) {
+			pcb_message(PCB_MSG_ERROR, "No subc under the cursor\n");
+			return -1;
+		}
+		ctx.subc = ptr2;
+		ctx.data = ctx.subc->data;
+	}
+	else if (op == F_Selected) {
+#warning subc TODO
+		pcb_message(PCB_MSG_ERROR, "TODO\n");
+		return 1;
+	}
+	else if (op == F_Buffer) {
+		ctx.data = PCB_PASTEBUFFER->Data;
+	}
+	else
+		PCB_ACT_FAIL(LayerBinding);
+
+	{ /* interactive mode */
+		int n;
+
+		PCB_DAD_DECL(dlg);
+
+		ctx.pcb = PCB;
+		ctx.widx = malloc(sizeof(lb_widx_t) * ctx.data->LayerN);
+		ctx.layer_names = calloc(sizeof(char *), PCB->Data->LayerN+2);
+		for(n = 0; n < PCB->Data->LayerN; n++)
+			ctx.layer_names[n] = PCB->Data->Layer[n].name;
+		ctx.no_layer = n;
+		ctx.layer_names[n] = "invalid/unbound";
+		n++;
+		ctx.layer_names[n] = NULL;
+
+		for(n = 0, num_copper = -1; n < PCB->LayerGroups.len; n++)
+			if (pcb_layergrp_flags(PCB, n) & PCB_LYT_COPPER)
+				num_copper++;
+
+		PCB_DAD_BEGIN_TABLE(dlg, 2);
+			PCB_DAD_COMPFLAG(dlg, PCB_HATF_SCROLL);
+		for(n = 0; n < ctx.data->LayerN; n++) {
+			lb_widx_t *w = ctx.widx+n;
+			/* left side */
+			PCB_DAD_BEGIN_VBOX(dlg);
+				if (n == 0)
+					PCB_DAD_LABEL(dlg, "RECIPE");
+				else
+					PCB_DAD_LABEL(dlg, "\n");
+
+				PCB_DAD_BEGIN_HBOX(dlg);
+					PCB_DAD_LABEL(dlg, "Name:");
+					PCB_DAD_STRING(dlg);
+						w->name = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+				PCB_DAD_BEGIN_HBOX(dlg);
+					PCB_DAD_ENUM(dlg, lb_comp); /* coposite */
+						w->comp = PCB_DAD_CURRENT(dlg);
+					PCB_DAD_ENUM(dlg, lb_types); /* lyt */
+						w->type = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+				PCB_DAD_BEGIN_HBOX(dlg);
+					PCB_DAD_INTEGER(dlg, NULL);
+						PCB_DAD_MINVAL(dlg, 0);
+						PCB_DAD_MAXVAL(dlg, num_copper);
+						w->offs = PCB_DAD_CURRENT(dlg);
+					PCB_DAD_LABEL(dlg, "from");
+						w->from = PCB_DAD_CURRENT(dlg);
+					PCB_DAD_ENUM(dlg, lb_side);
+						w->side = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+			PCB_DAD_END(dlg);
+
+			/* right side */
+			PCB_DAD_BEGIN_HBOX(dlg);
+				PCB_DAD_LABELF(dlg, ("\n\n layer #%d ", n));
+				PCB_DAD_BEGIN_VBOX(dlg);
+					if (n == 0)
+						PCB_DAD_LABEL(dlg, "BOARD LAYER");
+					else
+						PCB_DAD_LABEL(dlg, "\n\n");
+					PCB_DAD_LABEL(dlg, "Automatic");
+					PCB_DAD_ENUM(dlg, ctx.layer_names);
+						w->layer = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+			PCB_DAD_END(dlg);
+		}
+		PCB_DAD_END(dlg);
+
+		ctx.attrs = dlg;
+
+		PCB_DAD_NEW(dlg, "layer_binding", "Layer bindings", &ctx, pcb_true, NULL);
+		val.func = lb_attr_chg;
+		pcb_gui->attr_dlg_property(dlg_hid_ctx, PCB_HATP_GLOBAL_CALLBACK, &val);
+		lb_data2dialog(dlg_hid_ctx, &ctx);
+
+		PCB_DAD_RUN(dlg);
+
+		PCB_DAD_FREE(dlg);
+		free(ctx.widx);
+		free(ctx.layer_names);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/dialogs/dlg_padstack.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_padstack.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_padstack.c	(revision 18980)
@@ -0,0 +1,794 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "obj_pstk.h"
+#include "obj_pstk_op.h"
+#include "obj_pstk_inlines.h"
+#include "operation.h"
+
+typedef struct pse_proto_layer_s {
+	const char *name;
+	pcb_layer_type_t mask;
+	pcb_layer_combining_t comb;
+
+	int auto_from[2];
+	pcb_coord_t auto_bloat;
+} pse_proto_layer_t;
+
+#define PSE_MASK_BLOAT PCB_MIL_TO_COORD(4)
+
+static const pse_proto_layer_t pse_layer[] = {
+	{"top paste",            PCB_LYT_TOP | PCB_LYT_PASTE,     PCB_LYC_AUTO,             {2,-1}, 0},
+	{"top mask",             PCB_LYT_TOP | PCB_LYT_MASK,      PCB_LYC_SUB|PCB_LYC_AUTO, {2,-1}, PSE_MASK_BLOAT},
+	{"top copper",           PCB_LYT_TOP | PCB_LYT_COPPER,    0,                        {4,3},  0},
+	{"any internal copper",  PCB_LYT_INTERN | PCB_LYT_COPPER, 0,                        {2,4},  0},
+	{"bottom copper",        PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0,                        {2,3},  0},
+	{"bottom mask",          PCB_LYT_BOTTOM | PCB_LYT_MASK,   PCB_LYC_SUB|PCB_LYC_AUTO, {4,-1}, PSE_MASK_BLOAT},
+	{"bottom paste",         PCB_LYT_BOTTOM | PCB_LYT_PASTE,  PCB_LYC_AUTO,             {4,-1}, 0}
+};
+#define pse_num_layers (sizeof(pse_layer) / sizeof(pse_layer[0]))
+
+static const char *shapes[] = { "circle", "square", NULL };
+static const char *sides[] = { "all (top, bottom, intern)", "top & bottom only", "top only", "bottom only", "none", NULL };
+static pcb_layer_type_t sides_lyt[] = { PCB_LYT_TOP | PCB_LYT_BOTTOM | PCB_LYT_INTERN, PCB_LYT_TOP | PCB_LYT_BOTTOM, PCB_LYT_TOP, PCB_LYT_BOTTOM, 0 };
+
+typedef struct pse_s {
+	pcb_hid_attribute_t *attrs;
+	pcb_board_t *pcb;
+	pcb_pstk_t *ps;
+	int tab;
+
+	/* widget IDs */
+	int but_instance, but_prototype;
+	int proto_id, clearance, rot, xmirror, smirror;
+	int proto_shape[pse_num_layers];
+	int proto_info[pse_num_layers];
+	int proto_change[pse_num_layers];
+	pcb_coord_t proto_clr[pse_num_layers];
+	int prname;
+	int hole_header;
+	int hdia, hplated;
+	int htop_val, htop_text, htop_layer;
+	int hbot_val, hbot_text, hbot_layer;
+	int gen_shp, gen_size, gen_drill, gen_sides, gen_expose, gen_paste, gen_do;
+
+	/* sub-dialog: shape change */
+	void *parent_hid_ctx;
+	int editing_shape; /* index of the shape being edited */
+	pcb_hid_attribute_t *shape_chg;
+	int text_shape, del, derive;
+	int copy_do, copy_from;
+	int shrink, amount, grow;
+} pse_t;
+
+/* build a group/layer name string in tmp */
+char *pse_group_string(pcb_board_t *pcb, pcb_layergrp_t *grp, char *out, int size)
+{
+	const char *lname = "", *gname = "";
+
+	if (grp != NULL) {
+		gname = grp->name;
+		if (grp->len > 0) {
+			pcb_layer_t *l = pcb_get_layer(pcb->Data, grp->lid[0]);
+			if (l != NULL)
+				lname = l->name;
+		}
+	}
+
+	pcb_snprintf(out, size, "%s\n[%s]", gname, lname);
+	return out;
+}
+
+/* Convert from padstack to dialog */
+static void pse_ps2dlg(void *hid_ctx, pse_t *pse)
+{
+	char tmp[256], *s;
+	const char *prn = "";
+	int n;
+	pcb_pstk_proto_t *proto;
+	pcb_layergrp_id_t top_gid, bottom_gid;
+	pcb_layergrp_t *top_grp, *bottom_grp;
+	pcb_bb_type_t htype;
+
+	htype = pcb_pstk_bbspan(pse->pcb, pse->ps, &top_gid, &bottom_gid, &proto);
+	top_grp = pcb_get_layergrp(pse->pcb, top_gid);
+	bottom_grp = pcb_get_layergrp(pse->pcb, bottom_gid);
+
+	/* instance */
+	if ((proto != NULL) && (proto->name != NULL))
+		prn = proto->name;
+	pcb_snprintf(tmp, sizeof(tmp), "#%ld:%d (%s)", (long int)pse->ps->proto, pse->ps->protoi, prn);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->proto_id, str_value, tmp);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->clearance, coord_value, pse->ps->Clearance);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->rot, real_value, pse->ps->rot);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->xmirror, int_value, pse->ps->xmirror);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->smirror, int_value, pse->ps->smirror);
+
+	/* proto - layers */
+	for(n = 0; n < pse_num_layers; n++) {
+		pcb_pstk_shape_t *shape = pcb_pstk_shape(pse->ps, pse_layer[n].mask, pse_layer[n].comb);
+		if (shape != NULL) {
+			switch(shape->shape) {
+				case PCB_PSSH_CIRC:
+					PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "circle");
+					if ((shape->data.circ.x != 0) || (shape->data.circ.y != 0))
+						pcb_snprintf(tmp, sizeof(tmp), "dia=%.06$mm\nat %.06$mm;%.06$mm", shape->data.circ.dia, shape->data.circ.x, shape->data.circ.y);
+					else
+						pcb_snprintf(tmp, sizeof(tmp), "dia=%.06$mm", shape->data.circ.dia);
+					break;
+				case PCB_PSSH_LINE:
+					if (shape->data.line.square)
+						PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "square line");
+					else
+						PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "round line");
+					pcb_snprintf(tmp, sizeof(tmp), "thickness=%.06$mm", shape->data.line.thickness);
+					break;
+				case PCB_PSSH_POLY:
+					PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "polygon");
+					pcb_snprintf(tmp, sizeof(tmp), "corners=%d", shape->data.poly.len);
+					break;
+				default:
+					PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "<unknown>");
+					strcpy(tmp, "<unknown>");
+			}
+			PCB_DAD_SET_VALUE(hid_ctx, pse->proto_info[n], str_value, tmp);
+			PCB_DAD_SET_VALUE(hid_ctx, pse->proto_clr[n], coord_value, shape->clearance);
+		}
+		else {
+			PCB_DAD_SET_VALUE(hid_ctx, pse->proto_shape[n], str_value, "");
+			PCB_DAD_SET_VALUE(hid_ctx, pse->proto_info[n], str_value, "");
+			PCB_DAD_SET_VALUE(hid_ctx, pse->proto_clr[n], coord_value, 0);
+		}
+	}
+
+	/* proto - hole */
+	s = "Hole geometry (<unknown>):";
+	switch(htype) {
+		case PCB_BB_NONE: s = "Hole geometry (there is no hole in this padstack):"; break;
+		case PCB_BB_THRU: s = "Hole geometry (all-way-through hole):"; break;
+		case PCB_BB_BB: s = "Hole geometry (blind and/or buried hole):"; break;
+		case PCB_BB_INVALID: s = "Hole geometry (INVALID HOLE):"; break;
+	}
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hole_header, str_value, s);
+
+	free((char *)pse->attrs[pse->prname].default_val.str_value);
+	pse->attrs[pse->prname].default_val.str_value = NULL;
+	PCB_DAD_SET_VALUE(hid_ctx, pse->prname, str_value, pcb_strdup(proto->name == NULL ? "" : proto->name));
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hdia, coord_value, proto->hdia);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hplated, int_value, proto->hplated);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->htop_val, int_value, proto->htop);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hbot_val, int_value, proto->hbottom);
+
+	if (proto->htop == 0)
+		strcpy(tmp, "top copper group");
+	else
+		sprintf(tmp, "%d groups from\nthe %s copper group", proto->htop, proto->htop > 0 ? "top" : "bottom");
+	PCB_DAD_SET_VALUE(hid_ctx, pse->htop_text, str_value, tmp);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->htop_layer, str_value, pse_group_string(pse->pcb, top_grp, tmp, sizeof(tmp)));
+
+	if (proto->hbottom == 0)
+		strcpy(tmp, "bottom copper group");
+	else
+		sprintf(tmp, "%d groups from\nthe %s copper group", proto->hbottom, proto->hbottom > 0 ? "bottom" : "top");
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hbot_text, str_value, tmp);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->hbot_layer, str_value, pse_group_string(pse->pcb, bottom_grp, tmp, sizeof(tmp)));
+
+}
+
+static void pse_chg_instance(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	static int lock = 0;
+
+	if (lock != 0)
+		return;
+
+	pcb_pstk_change_instance(pse->ps,
+		NULL,
+		&pse->attrs[pse->clearance].default_val.coord_value,
+		&pse->attrs[pse->rot].default_val.real_value,
+		&pse->attrs[pse->xmirror].default_val.int_value,
+		&pse->attrs[pse->smirror].default_val.int_value);
+
+	lock++;
+	pse_ps2dlg(hid_ctx, pse); /* to get calculated text fields updated */
+	lock--;
+
+	pcb_gui->invalidate_all();
+}
+
+static void pse_chg_prname(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	static int lock = 0;
+	const char *new_name = pse->attrs[pse->prname].default_val.str_value;
+
+	if ((lock != 0) || (proto == NULL))
+		return;
+
+	if (proto->name == NULL) {
+		if ((new_name == NULL) || (*new_name == '\0'))
+			return;
+	}
+	else {
+		if (strcmp(proto->name, new_name) == 0)
+			return;
+	}
+
+	pcb_pstk_proto_change_name(proto, new_name);
+
+	lock++;
+	pse_ps2dlg(hid_ctx, pse); /* to get calculated text fields updated */
+	lock--;
+
+	pcb_gui->invalidate_all();
+}
+
+static void pse_chg_hole(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	static int lock = 0;
+
+	if (lock != 0)
+		return;
+
+	if (proto != NULL) {
+		pcb_pstk_proto_change_hole(proto,
+			&pse->attrs[pse->hplated].default_val.int_value,
+			&pse->attrs[pse->hdia].default_val.coord_value,
+			&pse->attrs[pse->htop_val].default_val.int_value,
+			&pse->attrs[pse->hbot_val].default_val.int_value);
+	}
+
+	lock++;
+	pse_ps2dlg(hid_ctx, pse); /* to get calculated text fields updated */
+	lock--;
+
+	pcb_gui->invalidate_all();
+}
+
+static void pse_chg_proto_clr(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	static int lock = 0;
+
+	if (lock != 0)
+		return;
+
+	if (proto != NULL) {
+		int n, idx = -1, sidx;
+		pcb_opctx_t ctx;
+
+		for(n = 0; n < pse_num_layers; n++)
+			if (pse->proto_clr[n] == (attr - pse->attrs))
+				idx = n;
+		if (idx < 0) {
+			pcb_message(PCB_MSG_ERROR, "Can't find shape - clearance unchanged (a)\n");
+			return;
+		}
+
+		sidx = pcb_pstk_get_shape_idx(&proto->tr.array[0], pse_layer[idx].mask, pse_layer[idx].comb);
+		if (sidx < 0) {
+			pcb_message(PCB_MSG_ERROR, "Can't find shape - clearance unchanged (b)\n");
+			return;
+		}
+
+		ctx.clip.clear = 0;
+		ctx.clip.restore = 1;
+		pcb_pstkop_clip(&ctx, pse->ps);
+
+		for(n = 0; n < proto->tr.used; n++)
+			pcb_pstk_shape_clr_grow(&proto->tr.array[n].shape[sidx], pcb_true, pse->attrs[pse->proto_clr[idx]].default_val.coord_value);
+
+		ctx.clip.clear = 1;
+		ctx.clip.restore = 0;
+		pcb_pstkop_clip(&ctx, pse->ps);
+	}
+
+	lock++;
+	pse_ps2dlg(hid_ctx, pse); /* to get calculated text fields updated */
+	lock--;
+
+	pcb_gui->invalidate_all();
+}
+
+static void pse_shape_del(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	pcb_pstk_proto_del_shape(proto, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+
+	pse_ps2dlg(pse->parent_hid_ctx, pse);
+	pcb_gui->invalidate_all();
+}
+
+static void pse_shape_auto(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	int n, src_idx = -1;
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	pcb_pstk_tshape_t *ts = &proto->tr.array[0];
+	int dst_idx = pcb_pstk_get_shape_idx(ts, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+	char src_shape_names[128];
+	char *end = src_shape_names;
+
+	for(n = 0; n < 2; n++) {
+		int from = pse_layer[pse->editing_shape].auto_from[n];
+		if (from < 0)
+			continue;
+		src_idx = pcb_pstk_get_shape_idx(ts, pse_layer[from].mask, pse_layer[from].comb);
+		if (src_idx >= 0)
+			break;
+		strcpy(end, pse_layer[from].name);
+		end += strlen(pse_layer[from].name);
+		*end = ',';
+		end++;
+	}
+
+	if (src_idx < 0) {
+		if (end > src_shape_names)
+			end--;
+		*end = 0;
+		pcb_message(PCB_MSG_ERROR, "Can't derive shape: source shapes (%s) are empty\n", src_shape_names);
+		return;
+	}
+
+	pcb_pstk_shape_derive(proto, dst_idx, src_idx, pse_layer[pse->editing_shape].auto_bloat, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+
+	pse_ps2dlg(pse->parent_hid_ctx, pse);
+	pcb_gui->invalidate_all();
+}
+
+static void pse_shape_copy(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	pcb_pstk_tshape_t *ts = &proto->tr.array[0];
+	int from = pse->shape_chg[pse->copy_from].default_val.int_value;
+	int dst_idx = pcb_pstk_get_shape_idx(ts, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+	int src_idx = pcb_pstk_get_shape_idx(ts, pse_layer[from].mask, pse_layer[from].comb);
+
+	if (src_idx < 0) {
+		pcb_message(PCB_MSG_ERROR, "Can't copy shape: source shape (%s) is empty\n", pse_layer[from].name);
+		return;
+	}
+
+	if (src_idx == dst_idx) {
+		pcb_message(PCB_MSG_ERROR, "Can't copy shape: source shape and destination shape are the same layer type\n");
+		return;
+	}
+
+	pcb_pstk_shape_derive(proto, dst_idx, src_idx, 0, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+
+	pse_ps2dlg(pse->parent_hid_ctx, pse);
+	pcb_gui->invalidate_all();
+}
+
+
+static void pse_shape_bloat(void *hid_ctx, void *caller_data, pcb_coord_t sign)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pse->ps);
+	pcb_pstk_tshape_t *ts = &proto->tr.array[0];
+	int n, dst_idx = pcb_pstk_get_shape_idx(ts, pse_layer[pse->editing_shape].mask, pse_layer[pse->editing_shape].comb);
+	pcb_coord_t bloat = pse->shape_chg[pse->amount].default_val.coord_value;
+
+	if (bloat <= 0)
+		return;
+
+	if (dst_idx < 0) {
+		pcb_message(PCB_MSG_ERROR, "Can't copy shape: source shape (%s) is empty\n", pse_layer[pse->editing_shape].name);
+		return;
+	}
+
+	bloat *= sign;
+	for(n = 0; n < proto->tr.used; n++)
+		pcb_pstk_shape_grow(&proto->tr.array[n].shape[dst_idx], pcb_false, bloat);
+
+	pse_ps2dlg(pse->parent_hid_ctx, pse);
+	pcb_gui->invalidate_all();
+}
+
+static void pse_shape_shrink(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_shape_bloat(hid_ctx, caller_data, -1);
+}
+
+static void pse_shape_grow(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_shape_bloat(hid_ctx, caller_data, +1);
+}
+
+static void pse_chg_shape(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	int n;
+	char tmp[256];
+	const char *copy_from_names[pse_num_layers+1];
+	PCB_DAD_DECL(dlg);
+
+	pse->parent_hid_ctx = hid_ctx;
+
+	for(n = 0; n < pse_num_layers; n++)
+		copy_from_names[n] = pse_layer[n].name;
+	copy_from_names[n] = NULL;
+
+	pse->editing_shape = -1;
+	for(n = 0; n < pse_num_layers; n++) {
+		if (pse->proto_change[n] == (attr - pse->attrs)) {
+			pse->editing_shape = n;
+			break;
+		}
+	}
+
+	PCB_DAD_BEGIN_VBOX(dlg);
+		sprintf(tmp, "Automatically generate shape for ...");
+		PCB_DAD_LABEL(dlg, tmp);
+		PCB_DAD_LABEL(dlg, "");
+			pse->text_shape = PCB_DAD_CURRENT(dlg);
+		PCB_DAD_BUTTON(dlg, "Delete (no shape)");
+			pse->del = PCB_DAD_CURRENT(dlg);
+			PCB_DAD_CHANGE_CB(dlg, pse_shape_del);
+			PCB_DAD_HELP(dlg, "Remove the shape from this layer type");
+		PCB_DAD_BUTTON(dlg, "Derive automatically");
+			pse->derive = PCB_DAD_CURRENT(dlg);
+			PCB_DAD_CHANGE_CB(dlg, pse_shape_auto);
+			PCB_DAD_HELP(dlg, "Derive the shape for this layer type\nfrom other, existing shapes of this padstack\n(automatic)");
+		PCB_DAD_BEGIN_HBOX(dlg);
+			PCB_DAD_BUTTON(dlg, "Copy shape from");
+				pse->copy_do = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_CHANGE_CB(dlg, pse_shape_copy);
+				PCB_DAD_HELP(dlg, "Copy the shape for this layer type\nfrom other, existing shapes of this padstack\nfrom the layer type selected");
+			PCB_DAD_ENUM(dlg, copy_from_names); /* coposite */
+				pse->copy_from = PCB_DAD_CURRENT(dlg);
+			PCB_DAD_HELP(dlg, "Select the source layer type for manual shape copy");
+		PCB_DAD_END(dlg);
+
+		PCB_DAD_BEGIN_HBOX(dlg);
+			PCB_DAD_BUTTON(dlg, "Shrink");
+				pse->shrink = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_CHANGE_CB(dlg, pse_shape_shrink);
+				PCB_DAD_HELP(dlg, "Make the shape smaller by the selected amount");
+			PCB_DAD_COORD(dlg, "");
+				pse->amount = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_MINMAX(dlg, 1, PCB_MM_TO_COORD(100));
+			PCB_DAD_BUTTON(dlg, "Grow");
+				pse->grow = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_CHANGE_CB(dlg, pse_shape_grow);
+				PCB_DAD_HELP(dlg, "Make the shape larger by the selected amount");
+		PCB_DAD_END(dlg);
+	PCB_DAD_END(dlg);
+
+	PCB_DAD_NEW(dlg, "dlg_padstack_edit_shape", "Edit padstack shape", pse, pcb_true, NULL);
+	pse->shape_chg = dlg;
+
+/*	pse_ps2dlg(dlg_hid_ctx, pse);*/
+	PCB_DAD_RUN(dlg);
+
+	pse->shape_chg = NULL;
+	PCB_DAD_FREE(dlg);
+}
+
+/* Auto gen shape on a single layer */
+static void pse_gen_shape(pcb_pstk_tshape_t *ts, pcb_layer_type_t lyt, int shape, pcb_coord_t size)
+{
+	int idx = ts->len;
+
+	ts->len++;
+	ts->shape = realloc(ts->shape, ts->len * sizeof(pcb_pstk_shape_t));
+
+	ts->shape[idx].layer_mask = lyt;
+	ts->shape[idx].comb = 0;
+	ts->shape[idx].clearance = 0;
+
+	switch(shape) {
+		case 0:
+			ts->shape[idx].shape = PCB_PSSH_CIRC;
+			ts->shape[idx].data.circ.x = ts->shape[idx].data.circ.y = 0;
+			ts->shape[idx].data.circ.dia = size;
+			break;
+		case 1:
+			ts->shape[idx].shape = PCB_PSSH_POLY;
+			pcb_pstk_shape_alloc_poly(&ts->shape[idx].data.poly, 4);
+			ts->shape[idx].data.poly.x[0] = -size/2;
+			ts->shape[idx].data.poly.y[0] = -size/2;
+			ts->shape[idx].data.poly.x[1] = ts->shape[idx].data.poly.x[0];
+			ts->shape[idx].data.poly.y[1] = ts->shape[idx].data.poly.y[0] + size;
+			ts->shape[idx].data.poly.x[2] = ts->shape[idx].data.poly.x[0] + size;
+			ts->shape[idx].data.poly.y[2] = ts->shape[idx].data.poly.y[0] + size;
+			ts->shape[idx].data.poly.x[3] = ts->shape[idx].data.poly.x[0] + size;
+			ts->shape[idx].data.poly.y[3] = ts->shape[idx].data.poly.y[0];
+			break;
+	}
+}
+
+/* Auto derive shape from the related copper layer */
+static void pse_drv_shape(pcb_pstk_proto_t *proto, pcb_pstk_tshape_t *ts, pcb_layer_type_t lyt, int paste)
+{
+	int srci = (lyt & PCB_LYT_TOP) ? 0 : 1;
+	pcb_pstk_shape_derive(proto, -1, srci, PSE_MASK_BLOAT, lyt | PCB_LYT_MASK, PCB_LYC_SUB|PCB_LYC_AUTO);
+	if (paste)
+		pcb_pstk_shape_derive(proto, -1, srci, 0, lyt | PCB_LYT_PASTE, PCB_LYC_AUTO);
+}
+
+/* Auto gen shapes for all layers the user selected on the dialog plus add the hole */
+static void pse_gen(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pse_t *pse = caller_data;
+	pcb_pstk_proto_t proto;
+	int sides = pse->attrs[pse->gen_sides].default_val.int_value;
+	int shape = pse->attrs[pse->gen_shp].default_val.int_value;
+	int expose = pse->attrs[pse->gen_expose].default_val.int_value;
+	int paste = pse->attrs[pse->gen_paste].default_val.int_value;
+	pcb_coord_t size = pse->attrs[pse->gen_size].default_val.coord_value;
+	pcb_layer_type_t lyt = sides_lyt[sides];
+	pcb_pstk_tshape_t *ts;
+	pcb_cardinal_t pid;
+
+	memset(&proto, 0, sizeof(proto));
+
+	ts = pcb_vtpadstack_tshape_alloc_append(&proto.tr, 1);
+	ts->rot = 0.0;
+	ts->xmirror = 0;
+	ts->smirror = 0;
+	ts->len = 0;
+
+	if (lyt & PCB_LYT_TOP)     pse_gen_shape(ts, PCB_LYT_COPPER | PCB_LYT_TOP, shape, size);
+	if (lyt & PCB_LYT_BOTTOM)  pse_gen_shape(ts, PCB_LYT_COPPER | PCB_LYT_BOTTOM, shape, size);
+	if (lyt & PCB_LYT_INTERN)  pse_gen_shape(ts, PCB_LYT_COPPER | PCB_LYT_INTERN, shape, size);
+	if (expose) {
+		if (lyt & PCB_LYT_TOP)    pse_drv_shape(&proto, ts, PCB_LYT_TOP, paste);
+		if (lyt & PCB_LYT_BOTTOM) pse_drv_shape(&proto, ts, PCB_LYT_BOTTOM, paste);
+	}
+
+	proto.hdia = pse->attrs[pse->gen_drill].default_val.coord_value;
+	proto.hplated = 1;
+
+	pid = pcb_pstk_proto_insert_dup(pse->pcb->Data, &proto, 1);
+	pcb_pstk_change_instance(pse->ps, &pid, NULL, NULL, NULL, NULL);
+
+	pse_ps2dlg(hid_ctx, pse);
+	PCB_DAD_SET_VALUE(hid_ctx, pse->tab, int_value, 1); /* switch to the prototype view where the new attributes are visible */
+}
+
+static const char pcb_acts_PadstackEdit[] = "PadstackEdit(object, [tab])\n";
+static const char pcb_acth_PadstackEdit[] = "interactive pad stack editor";
+static fgw_error_t pcb_act_PadstackEdit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = F_Object, n, target_tab = -1;
+	pse_t pse;
+	const char *tabs[] = { "this instance", "prototype", "generate common geometry", NULL };
+	PCB_DAD_DECL(dlg);
+
+	memset(&pse, 0, sizeof(pse));
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, PadstackEdit, op = fgw_keyword(&argv[1]));
+	PCB_ACT_MAY_CONVARG(2, FGW_INT, PadstackEdit, target_tab = argv[2].val.nat_int);
+	PCB_ACT_IRES(0);
+
+	if (op == F_Object) {
+		pcb_coord_t x, y;
+		void *ptr1, *ptr2 = NULL, *ptr3;
+		long type;
+		pcb_hid_get_coords("Click on a padstack to edit", &x, &y, 0);
+		type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3);
+		if (type != PCB_OBJ_PSTK) {
+			pcb_message(PCB_MSG_ERROR, "Need a padstack.\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+		pse.ps = ptr2;
+	}
+	else
+		PCB_ACT_FAIL(PadstackEdit);
+
+	pse.pcb = pcb_data_get_top(pse.ps->parent.data);
+	if (pse.pcb == NULL)
+		pse.pcb = PCB;
+
+	PCB_DAD_BEGIN_TABBED(dlg, tabs);
+		pse.tab = PCB_DAD_CURRENT(dlg);
+		/* Tab 0: this instance */
+		PCB_DAD_BEGIN_VBOX(dlg);
+			PCB_DAD_BEGIN_VBOX(dlg);
+				PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME);
+				PCB_DAD_LABEL(dlg, "Settings that affect only this padstack instance");
+				PCB_DAD_BEGIN_HBOX(dlg);
+					PCB_DAD_LABEL(dlg, "prototype");
+					PCB_DAD_BUTTON(dlg, "#5");
+						pse.proto_id = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_HELP(dlg, "Padstack prototype ID\n(click to use a different prototype)");
+				PCB_DAD_END(dlg);
+				PCB_DAD_BEGIN_TABLE(dlg, 2);
+					PCB_DAD_LABEL(dlg, "Clearance");
+					PCB_DAD_COORD(dlg, "");
+						pse.clearance = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, 0);
+						PCB_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000));
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_instance);
+						PCB_DAD_HELP(dlg, "global clearance (affects all layers)");
+					PCB_DAD_LABEL(dlg, "Rotation");
+					PCB_DAD_REAL(dlg, "");
+						pse.rot = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, 0);
+						PCB_DAD_MAXVAL(dlg, 360);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_instance);
+					PCB_DAD_LABEL(dlg, "X-mirror");
+					PCB_DAD_BOOL(dlg, "");
+						pse.xmirror = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_instance);
+					PCB_DAD_LABEL(dlg, "S-mirror");
+					PCB_DAD_BOOL(dlg, "");
+						pse.smirror = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_instance);
+				PCB_DAD_END(dlg);
+			PCB_DAD_END(dlg);
+		PCB_DAD_END(dlg);
+
+		/* Tab 1: prototype */
+		PCB_DAD_BEGIN_VBOX(dlg);
+			PCB_DAD_BEGIN_VBOX(dlg);
+				PCB_DAD_LABEL(dlg, "Settings that affect all padstacks with the same prototype");
+				PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME);
+				PCB_DAD_LABEL(dlg, "Pad geometry per layer type:");
+				PCB_DAD_BEGIN_TABLE(dlg, 5);
+					PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME);
+					for(n = 0; n < pse_num_layers; n++) {
+						PCB_DAD_LABEL(dlg, pse_layer[n].name);
+						PCB_DAD_LABEL(dlg, "-");
+							pse.proto_shape[n] = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_LABEL(dlg, "-");
+							pse.proto_info[n] = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_BUTTON(dlg, "change...");
+							pse.proto_change[n] = PCB_DAD_CURRENT(dlg);
+							PCB_DAD_CHANGE_CB(dlg, pse_chg_shape);
+							PCB_DAD_HELP(dlg, "Change the shape on this layer type");
+						PCB_DAD_COORD(dlg, "");
+							pse.proto_clr[n] = PCB_DAD_CURRENT(dlg);
+							PCB_DAD_MINVAL(dlg, 1);
+							PCB_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000));
+							PCB_DAD_CHANGE_CB(dlg, pse_chg_proto_clr);
+							PCB_DAD_HELP(dlg, "local, per layer type clearance\n(only when global padstack clearance is 0)");
+					}
+				PCB_DAD_END(dlg);
+
+				PCB_DAD_BEGIN_HBOX(dlg);
+					PCB_DAD_COMPFLAG(dlg, PCB_HATF_FRAME);
+					PCB_DAD_LABEL(dlg, "Prototype name:");
+					PCB_DAD_STRING(dlg);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_prname);
+						pse.prname = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+
+				PCB_DAD_LABEL(dlg, "Hole properties:");
+					pse.hole_header = PCB_DAD_CURRENT(dlg);
+
+				PCB_DAD_BEGIN_TABLE(dlg, 4);
+
+					PCB_DAD_LABEL(dlg, "Diameter:");
+					PCB_DAD_COORD(dlg, "");
+						pse.hdia = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, 1);
+						PCB_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000));
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_hole);
+					PCB_DAD_LABEL(dlg, ""); /* dummy */
+					PCB_DAD_LABEL(dlg, ""); /* dummy */
+
+					PCB_DAD_LABEL(dlg, "Plating:");
+					PCB_DAD_BOOL(dlg, "");
+						pse.hplated = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_hole);
+						PCB_DAD_HELP(dlg, "A plated hole galvanically connects layers");
+					PCB_DAD_LABEL(dlg, ""); /* dummy */
+					PCB_DAD_LABEL(dlg, ""); /* dummy */
+
+					PCB_DAD_LABEL(dlg, "Hole top:");
+					PCB_DAD_INTEGER(dlg, "");
+						pse.htop_val = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, -(pse.pcb->LayerGroups.cache.copper_len-1));
+						PCB_DAD_MAXVAL(dlg, pse.pcb->LayerGroups.cache.copper_len-1);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_hole);
+						PCB_DAD_HELP(dlg, "Blind/buried via: top end of the hole");
+					PCB_DAD_LABEL(dlg, "<text>");
+						pse.htop_text = PCB_DAD_CURRENT(dlg);
+					PCB_DAD_LABEL(dlg, "<layer>");
+						pse.htop_layer = PCB_DAD_CURRENT(dlg);
+
+					PCB_DAD_LABEL(dlg, "Hole bottom:");
+					PCB_DAD_INTEGER(dlg, "");
+						pse.hbot_val = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, -(pse.pcb->LayerGroups.cache.copper_len-1));
+						PCB_DAD_MAXVAL(dlg, pse.pcb->LayerGroups.cache.copper_len-1);
+						PCB_DAD_CHANGE_CB(dlg, pse_chg_hole);
+						PCB_DAD_HELP(dlg, "Blind/buried via: bottom end of the hole");
+					PCB_DAD_LABEL(dlg, "<text>");
+						pse.hbot_text = PCB_DAD_CURRENT(dlg);
+					PCB_DAD_LABEL(dlg, "<layer>");
+						pse.hbot_layer = PCB_DAD_CURRENT(dlg);
+				PCB_DAD_END(dlg);
+			PCB_DAD_END(dlg);
+		PCB_DAD_END(dlg);
+
+		/* Tab 2: generate common geometry */
+		PCB_DAD_BEGIN_VBOX(dlg);
+			PCB_DAD_BEGIN_VBOX(dlg);
+				PCB_DAD_LABEL(dlg, "Generate a new prototype using a few numeric input");
+
+				PCB_DAD_BEGIN_TABLE(dlg, 2);
+					PCB_DAD_LABEL(dlg, "Copper shape:");
+					PCB_DAD_ENUM(dlg, shapes);
+						pse.gen_shp = PCB_DAD_CURRENT(dlg);
+
+					PCB_DAD_LABEL(dlg, "Size (cirlce diameter or square side):");
+					PCB_DAD_COORD(dlg, "");
+						pse.gen_size = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, 1);
+						PCB_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000));
+
+					PCB_DAD_LABEL(dlg, "Drill diameter (0 means no hole):");
+					PCB_DAD_COORD(dlg, "");
+						pse.gen_drill = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_MINVAL(dlg, 1);
+						PCB_DAD_MAXVAL(dlg, PCB_MM_TO_COORD(1000));
+
+					PCB_DAD_LABEL(dlg, "Copper shapes on:");
+					PCB_DAD_ENUM(dlg, sides);
+						pse.gen_sides = PCB_DAD_CURRENT(dlg);
+
+					PCB_DAD_LABEL(dlg, "Expose top/bottom copper:");
+					PCB_DAD_BOOL(dlg, "");
+						pse.gen_expose = PCB_DAD_CURRENT(dlg);
+
+					PCB_DAD_LABEL(dlg, "Paste exposed copper:");
+					PCB_DAD_BOOL(dlg, "");
+						pse.gen_paste = PCB_DAD_CURRENT(dlg);
+
+					PCB_DAD_LABEL(dlg, "");
+					PCB_DAD_BUTTON(dlg, "Generate!");
+						pse.gen_do = PCB_DAD_CURRENT(dlg);
+						PCB_DAD_CHANGE_CB(dlg, pse_gen);
+				PCB_DAD_END(dlg);
+			PCB_DAD_END(dlg);
+		PCB_DAD_END(dlg);
+	PCB_DAD_END(dlg);
+
+	PCB_DAD_NEW(dlg, "dlg_padstack_edit", "Edit padstack", &pse, pcb_true, NULL);
+	pse.attrs = dlg;
+	pse_ps2dlg(dlg_hid_ctx, &pse);
+	if (target_tab > 0)
+		PCB_DAD_SET_VALUE(dlg_hid_ctx, pse.tab, int_value, target_tab);
+	PCB_DAD_RUN(dlg);
+
+	free((char *)pse.attrs[pse.prname].default_val.str_value);
+
+	PCB_DAD_FREE(dlg);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/dialogs/dlg_test.c
===================================================================
--- tags/2.0.1/src_plugins/dialogs/dlg_test.c	(nonexistent)
+++ tags/2.0.1/src_plugins/dialogs/dlg_test.c	(revision 18980)
@@ -0,0 +1,120 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+static const char dlg_test_syntax[] = "dlg_test()\n";
+static const char dlg_test_help[] = "test the attribute dialog";
+
+typedef struct {
+	PCB_DAD_DECL_NOINIT(dlg)
+	int wtab;
+} test_t;
+
+
+static void pcb_act_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr);
+static void cb_tab_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr);
+static void cb_jump(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr);
+
+static int attr_idx, attr_idx2;
+static fgw_error_t pcb_act_dlg_test(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *vals[] = { "foo", "bar", "baz", NULL };
+	const char *tabs[] = { "original test", "new test", NULL };
+
+	test_t ctx;
+	memset(&ctx, 0, sizeof(ctx));
+
+	PCB_DAD_BEGIN_TABBED(ctx.dlg, tabs);
+		PCB_DAD_CHANGE_CB(ctx.dlg, cb_tab_chg);
+		ctx.wtab = PCB_DAD_CURRENT(ctx.dlg);
+
+		/* tab 0: "original test" */
+		PCB_DAD_BEGIN_VBOX(ctx.dlg);
+			PCB_DAD_LABEL(ctx.dlg, "text1");
+			PCB_DAD_BEGIN_TABLE(ctx.dlg, 3);
+				PCB_DAD_LABEL(ctx.dlg, "text2a");
+				PCB_DAD_LABEL(ctx.dlg, "text2b");
+				PCB_DAD_LABEL(ctx.dlg, "text2c");
+				PCB_DAD_LABEL(ctx.dlg, "text2d");
+			PCB_DAD_END(ctx.dlg);
+			PCB_DAD_LABEL(ctx.dlg, "text3");
+
+			PCB_DAD_ENUM(ctx.dlg, vals);
+				PCB_DAD_CHANGE_CB(ctx.dlg, pcb_act_attr_chg);
+				attr_idx = PCB_DAD_CURRENT(ctx.dlg);
+			PCB_DAD_INTEGER(ctx.dlg, "text2e");
+				PCB_DAD_MINVAL(ctx.dlg, 1);
+				PCB_DAD_MAXVAL(ctx.dlg, 10);
+				PCB_DAD_DEFAULT(ctx.dlg, 3);
+				PCB_DAD_CHANGE_CB(ctx.dlg, pcb_act_attr_chg);
+				attr_idx2 = PCB_DAD_CURRENT(ctx.dlg);
+			PCB_DAD_BUTTON(ctx.dlg, "update!");
+				PCB_DAD_CHANGE_CB(ctx.dlg, pcb_act_attr_chg);
+		PCB_DAD_END(ctx.dlg);
+
+		/* tab 1: "new test" */
+		PCB_DAD_BEGIN_VBOX(ctx.dlg);
+			PCB_DAD_LABEL(ctx.dlg, "new test.");
+			PCB_DAD_BUTTON(ctx.dlg, "jump to the first tab");
+				PCB_DAD_CHANGE_CB(ctx.dlg, cb_jump);
+		PCB_DAD_END(ctx.dlg);
+	PCB_DAD_END(ctx.dlg);
+
+	PCB_DAD_AUTORUN(ctx.dlg, "dlg_test", "attribute dialog test", &ctx);
+
+	PCB_DAD_FREE(ctx.dlg);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static void pcb_act_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	static pcb_hid_attr_val_t val;
+	static pcb_bool st;
+	printf("Chg\n");
+
+	st = !st;
+	val.int_value = (val.int_value + 1) % 3;
+/*	pcb_gui->attr_dlg_widget_state(hid_ctx, attr_idx, st);*/
+
+	pcb_gui->attr_dlg_set_value(hid_ctx, attr_idx, &val);
+}
+
+static void cb_tab_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	test_t *ctx = caller_data;
+	printf("Tab switch to %d!\n", ctx->dlg[ctx->wtab].default_val.int_value);
+}
+
+static void cb_jump(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	pcb_hid_attr_val_t val;
+	test_t *ctx = caller_data;
+
+	printf("Jumping tabs\n");
+	val.int_value = 0;
+	pcb_gui->attr_dlg_set_value(hid_ctx, ctx->wtab, &val);
+}
Index: tags/2.0.1/src_plugins/distalign/Makefile
===================================================================
--- tags/2.0.1/src_plugins/distalign/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/distalign/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_distalign
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/distalign/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/distalign/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/distalign/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {distalign}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/distalign/distalign.o @]
+
+switch /local/pcb/distalign/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/distalign/distalign.c
===================================================================
--- tags/2.0.1/src_plugins/distalign/distalign.c	(nonexistent)
+++ tags/2.0.1/src_plugins/distalign/distalign.c	(revision 18980)
@@ -0,0 +1,574 @@
+/* Functions to distribute (evenly spread out) and align PCB subcircuits.
+ *
+ * Copyright (C) 2007 Ben Jackson <ben@ben.com>
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ *
+ * Original source was:  http://ad7gd.net/geda/distalign.c
+ *
+ * Ben Jackson AD7GD <ben@ben.com>
+ *
+ * http://www.ben.com/
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "board.h"
+#include "config.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "rats.h"
+#include "error.h"
+#include "move.h"
+#include "draw.h"
+#include "plugins.h"
+#include "macro.h"
+#include "actions.h"
+#include "compat_misc.h"
+
+enum {
+	K_X,
+	K_Y,
+	K_Lefts,
+	K_Rights,
+	K_Tops,
+	K_Bottoms,
+	K_Centers,
+	K_Marks,
+	K_Gaps,
+	K_First,
+	K_Last,
+	K_Average,
+	K_Crosshair,
+	K_Gridless,
+	K_none,
+	K_align,
+	K_distribute
+};
+
+static const char *keywords[] = {
+	/*[K_X] */ "X",
+	/*[K_Y] */ "Y",
+	/*[K_Lefts] */ "Lefts",
+	/*[K_Rights] */ "Rights",
+	/*[K_Tops] */ "Tops",
+	/*[K_Bottoms] */ "Bottoms",
+	/*[K_Centers] */ "Centers",
+	/*[K_Marks] */ "Marks",
+	/*[K_Gaps] */ "Gaps",
+	/*[K_First] */ "First",
+	/*[K_Last] */ "Last",
+	/*[K_Average] */ "Average",
+	/*[K_Crosshair] */ "pcb_crosshair",
+	/*[K_Gridless] */ "Gridless",
+};
+
+static int keyword(const char *s)
+{
+	int i;
+
+	if (!s) {
+		return K_none;
+	}
+	for (i = 0; i < PCB_ENTRIES(keywords); ++i) {
+		if (keywords[i] && pcb_strcasecmp(s, keywords[i]) == 0)
+			return i;
+	}
+	return -1;
+}
+
+
+/* this macro produces a function in X or Y that switches on 'point' */
+#define COORD(DIR)						\
+static inline pcb_coord_t		        			\
+coord ## DIR(pcb_subc_t *subc, int point)			\
+{								\
+	pcb_coord_t oX, oY; \
+	switch (point) {					\
+	case K_Marks:						\
+		oX = oY = 0; \
+		pcb_subc_get_origin(subc, &oX, &oY); \
+		return o ## DIR;			\
+	case K_Lefts:						\
+	case K_Tops:						\
+		return subc->BoundingBox.DIR ## 1;		\
+	case K_Rights:						\
+	case K_Bottoms:						\
+		return subc->BoundingBox.DIR ## 2;		\
+	case K_Centers:						\
+	case K_Gaps:						\
+		return (subc->BoundingBox.DIR ## 1 +		\
+		       subc->BoundingBox.DIR ## 2) / 2;	\
+	}							\
+	return 0;						\
+}
+
+COORD(X)
+COORD(Y)
+
+/* return the subcircuit coordinate associated with the given internal point */
+static pcb_coord_t coord(pcb_subc_t *subc, int dir, int point)
+{
+	if (dir == K_X)
+		return coordX(subc, point);
+	else
+		return coordY(subc, point);
+}
+
+static struct subc_by_pos {
+	pcb_subc_t *subc;
+	pcb_coord_t pos;
+	pcb_coord_t width;
+} *subcs_by_pos;
+
+static int nsubcs_by_pos;
+
+static int cmp_ebp(const void *a, const void *b)
+{
+	const struct subc_by_pos *ea = a;
+	const struct subc_by_pos *eb = b;
+
+	return ea->pos - eb->pos;
+}
+
+/*
+ * Find all selected objects, then order them in order by coordinate in
+ * the 'dir' axis. This is used to find the "First" and "Last" subcircuits
+ * and also to choose the distribution order.
+ *
+ * For alignment, first and last are in the orthogonal axis (imagine if
+ * you were lining up letters in a sentence, aligning *vertically* to the
+ * first letter means selecting the first letter *horizontally*).
+ *
+ * For distribution, first and last are in the distribution axis.
+ */
+static int sort_subcs_by_pos(int op, int dir, int point)
+{
+	int nsel = 0;
+
+	if (nsubcs_by_pos)
+		return nsubcs_by_pos;
+	if (op == K_align)
+		dir = dir == K_X ? K_Y : K_X;	/* see above */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc))
+			continue;
+		nsel++;
+	}
+	PCB_END_LOOP;
+	if (!nsel)
+		return 0;
+	subcs_by_pos = malloc(nsel * sizeof(*subcs_by_pos));
+	nsubcs_by_pos = nsel;
+	nsel = 0;
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc))
+			continue;
+		subcs_by_pos[nsel].subc = subc;
+		subcs_by_pos[nsel++].pos = coord(subc, dir, point);
+	}
+	PCB_END_LOOP;
+	qsort(subcs_by_pos, nsubcs_by_pos, sizeof(*subcs_by_pos), cmp_ebp);
+	return nsubcs_by_pos;
+}
+
+static void free_subcs_by_pos(void)
+{
+	if (nsubcs_by_pos) {
+		free(subcs_by_pos);
+		subcs_by_pos = NULL;
+		nsubcs_by_pos = 0;
+	}
+}
+
+/* Find the reference coordinate from the specified points of all
+ * selected subcircuits. */
+static pcb_coord_t reference_coord(int op, int x, int y, int dir, int point, int reference)
+{
+	pcb_coord_t q;
+	int nsel;
+
+	q = 0;
+	switch (reference) {
+	case K_Crosshair:
+		if (dir == K_X)
+			q = x;
+		else
+			q = y;
+		break;
+	case K_Average:							/* the average among selected subcircuits */
+		nsel = 0;
+		q = 0;
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc))
+				continue;
+			q += coord(subc, dir, point);
+			nsel++;
+		}
+		PCB_END_LOOP;
+		if (nsel)
+			q /= nsel;
+		break;
+	case K_First:								/* first or last in the orthogonal direction */
+	case K_Last:
+		if (!sort_subcs_by_pos(op, dir, point)) {
+			q = 0;
+			break;
+		}
+		if (reference == K_First) {
+			q = coord(subcs_by_pos[0].subc, dir, point);
+		}
+		else {
+			q = coord(subcs_by_pos[nsubcs_by_pos - 1].subc, dir, point);
+		}
+		break;
+	}
+	return q;
+}
+
+/*
+ * Align(X, [Lefts/Rights/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])
+ * Align(Y, [Tops/Bottoms/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])
+ *
+ * X or Y - Select which axis will move, other is untouched.
+ * Lefts, Rights,
+ * Tops, Bottoms,
+ * Centers, Marks - Pick alignment point within each subcircuit
+ * First, Last,
+ * pcb_crosshair,
+ * Average - Alignment reference, First=Topmost/Leftmost,
+ * Last=Bottommost/Rightmost, Average or pcb_crosshair point
+ * Gridless - Do not force results to align to prevailing grid.
+ *
+ * Defaults are Marks, First.
+ */
+static const char pcb_acts_align[] = "Align(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks, [First/Last/pcb_crosshair/Average[, Gridless]]])";
+static fgw_error_t pcb_act_align(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1, *a2, *a3;
+	int dir;
+	int point;
+	int reference;
+	int gridless;
+	pcb_coord_t q;
+	int changed = 0;
+
+	if (argc < 2 || argc > 5) {
+		PCB_ACT_FAIL(align);
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, align, a0 = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, align, a1 = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, align, a2 = argv[3].val.str);
+	PCB_ACT_CONVARG(4, FGW_STR, align, a3 = argv[4].val.str);
+
+	/* parse direction arg */
+	switch ((dir = keyword(a0))) {
+	case K_X:
+	case K_Y:
+		break;
+	default:
+		PCB_ACT_FAIL(align);
+	}
+	/* parse point (within each subcircuit) which will be aligned */
+	switch ((point = keyword(a1))) {
+	case K_Centers:
+	case K_Marks:
+		break;
+	case K_Lefts:
+	case K_Rights:
+		if (dir == K_Y) {
+			PCB_ACT_FAIL(align);
+		}
+		break;
+	case K_Tops:
+	case K_Bottoms:
+		if (dir == K_X) {
+			PCB_ACT_FAIL(align);
+		}
+		break;
+	case K_none:
+		point = K_Marks;						/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(align);
+	}
+	/* parse reference which will determine alignment coordinates */
+	switch ((reference = keyword(a2))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		reference = K_First;				/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(align);
+	}
+	/* optionally work off the grid (solar cells!) */
+	switch (keyword(a3)) {
+	case K_Gridless:
+		gridless = 1;
+		break;
+	case K_none:
+		gridless = 0;
+		break;
+	default:
+		PCB_ACT_FAIL(align);
+	}
+	/* find the final alignment coordinate using the above options */
+	q = reference_coord(K_align, pcb_crosshair.X, pcb_crosshair.Y, dir, point, reference);
+	/* move all selected subcircuits to the new coordinate */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_coord_t p, dp, dx, dy;
+
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc))
+			continue;
+		/* find delta from reference point to reference point */
+		p = coord(subc, dir, point);
+		dp = q - p;
+		/* ...but if we're gridful, keep the mark on the grid */
+		if (!gridless) {
+			dp -= (coord(subc, dir, K_Marks) + dp) % (long) (PCB->Grid);
+		}
+		if (dp) {
+			/* move from generic to X or Y */
+			dx = dy = dp;
+			if (dir == K_X)
+				dy = 0;
+			else
+				dx = 0;
+			pcb_subc_move(subc, dx, dy, 1);
+			pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, subc, dx, dy);
+			changed = 1;
+		}
+	}
+	PCB_END_LOOP;
+	if (changed) {
+		pcb_undo_inc_serial();
+		pcb_redraw();
+		pcb_board_set_changed_flag(1);
+	}
+	free_subcs_by_pos();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/*
+ * Distribute(X, [Lefts/Rights/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])
+ * Distribute(Y, [Tops/Bottoms/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])
+ *
+ * As with align, plus:
+ *
+ * Gaps - Make gaps even rather than spreading points evenly.
+ * First, Last,
+ * pcb_crosshair - Two arguments specifying both ends of the distribution,
+ * they can't both be the same.
+ *
+ * Defaults are Marks, First, Last
+ *
+ * Distributed subcircuits always retain the same relative order they had
+ * before they were distributed.
+ */
+static const char pcb_acts_distribute[] = "Distribute(X/Y, [Lefts/Rights/Tops/Bottoms/Centers/Marks/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])";
+static fgw_error_t pcb_act_distribute(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1, *a2 = NULL, *a3 = NULL, *a4 = NULL;
+	int dir;
+	int point;
+	int refa, refb;
+	int gridless;
+	pcb_coord_t s, e, slack;
+	int divisor;
+	int changed = 0;
+	int i;
+
+	if (argc < 2 || argc == 4 || argc > 6) {
+		PCB_ACT_FAIL(distribute);
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, distribute, a0 = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, distribute, a1 = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, distribute, a2 = argv[3].val.str);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, distribute, a3 = argv[4].val.str);
+	PCB_ACT_MAY_CONVARG(5, FGW_STR, distribute, a4 = argv[5].val.str);
+
+
+	/* parse direction arg */
+	switch ((dir = keyword(a0))) {
+	case K_X:
+	case K_Y:
+		break;
+	default:
+		PCB_ACT_FAIL(distribute);
+	}
+	/* parse point (within each subcircuit) which will be distributed */
+	switch ((point = keyword(a1))) {
+	case K_Centers:
+	case K_Marks:
+	case K_Gaps:
+		break;
+	case K_Lefts:
+	case K_Rights:
+		if (dir == K_Y) {
+			PCB_ACT_FAIL(distribute);
+		}
+		break;
+	case K_Tops:
+	case K_Bottoms:
+		if (dir == K_X) {
+			PCB_ACT_FAIL(distribute);
+		}
+		break;
+	case K_none:
+		point = K_Marks;						/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(distribute);
+	}
+	/* parse reference which will determine first distribution coordinate */
+	switch ((refa = keyword(a2))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		refa = K_First;							/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(distribute);
+	}
+	/* parse reference which will determine final distribution coordinate */
+	switch ((refb = keyword(a3))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		refb = K_Last;							/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(distribute);
+	}
+	if (refa == refb) {
+		PCB_ACT_FAIL(distribute);
+	}
+	/* optionally work off the grid (solar cells!) */
+	switch (keyword(a4)) {
+	case K_Gridless:
+		gridless = 1;
+		break;
+	case K_none:
+		gridless = 0;
+		break;
+	default:
+		PCB_ACT_FAIL(distribute);
+	}
+	/* build list of subcircuitss in orthogonal axis order */
+	sort_subcs_by_pos(K_distribute, dir, point);
+	/* find the endpoints given the above options */
+	s = reference_coord(K_distribute, pcb_crosshair.X, pcb_crosshair.Y, dir, point, refa);
+	e = reference_coord(K_distribute, pcb_crosshair.X, pcb_crosshair.Y, dir, point, refb);
+	slack = e - s;
+	/* use this divisor to calculate spacing (for 1 elt, avoid 1/0) */
+	divisor = (nsubcs_by_pos > 1) ? (nsubcs_by_pos - 1) : 1;
+	/* even the gaps instead of the edges or whatnot */
+	/* find the "slack" in the row */
+	if (point == K_Gaps) {
+		pcb_coord_t w;
+
+		/* subtract all the "widths" from the slack */
+		for (i = 0; i < nsubcs_by_pos; ++i) {
+			pcb_subc_t *subc = subcs_by_pos[i].subc;
+			/* coord doesn't care if I mix Lefts/Tops */
+			w = subcs_by_pos[i].width = coord(subc, dir, K_Rights) - coord(subc, dir, K_Lefts);
+			/* Gaps distribution is on centers, so half of
+			 * first and last subcircuit don't count */
+			if (i == 0 || i == nsubcs_by_pos - 1) {
+				w /= 2;
+			}
+			slack -= w;
+		}
+		/* slack could be negative */
+	}
+	/* move all selected subcircuits to the new coordinate */
+	for (i = 0; i < nsubcs_by_pos; ++i) {
+		pcb_subc_t *subc = subcs_by_pos[i].subc;
+		pcb_coord_t p, q, dp, dx, dy;
+
+		/* find reference point for this subcircuit */
+		q = s + slack * i / divisor;
+		/* find delta from reference point to reference point */
+		p = coord(subc, dir, point);
+		dp = q - p;
+		/* ...but if we're gridful, keep the mark on the grid */
+		if (!gridless) {
+			dp -= (coord(subc, dir, K_Marks) + dp) % (long) (PCB->Grid);
+		}
+		if (dp) {
+			/* move from generic to X or Y */
+			dx = dy = dp;
+			if (dir == K_X)
+				dy = 0;
+			else
+				dx = 0;
+			pcb_subc_move(subc, dx, dy, 1);
+			pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, subc, dx, dy);
+			changed = 1;
+		}
+		/* in gaps mode, accumulate part widths */
+		if (point == K_Gaps) {
+			/* move remaining half of our subcircuits */
+			s += subcs_by_pos[i].width / 2;
+			/* move half of next subcircuits */
+			if (i < nsubcs_by_pos - 1)
+				s += subcs_by_pos[i + 1].width / 2;
+		}
+	}
+	if (changed) {
+		pcb_undo_inc_serial();
+		pcb_redraw();
+		pcb_board_set_changed_flag(1);
+	}
+	free_subcs_by_pos();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t distalign_action_list[] = {
+	{"distribute", pcb_act_distribute, "Distribute subcircuits", pcb_acts_distribute},
+	{"align", pcb_act_align, "Align subcircuits", pcb_acts_align}
+};
+
+static char *distalign_cookie = "distalign plugin";
+
+PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie)
+
+int pplg_check_ver_distalign(int ver_needed) { return 0; }
+
+void pplg_uninit_distalign(void)
+{
+	pcb_remove_actions_by_cookie(distalign_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_distalign(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(distalign_action_list, distalign_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/distalign/distalign.pup
===================================================================
--- tags/2.0.1/src_plugins/distalign/distalign.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/distalign/distalign.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short distribute and align objs
+$long Introducing Align() and Distribute(), which work much like the similarly named functions in Visio. Given that PCB does not have the concept of "first selected object" to draw on, the reference points can be selected by arguments.
+$package extra
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/distaligntext/Makefile
===================================================================
--- tags/2.0.1/src_plugins/distaligntext/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/distaligntext/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_distaligntext
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/distaligntext/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/distaligntext/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/distaligntext/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {distaligntext}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/distaligntext/distaligntext.o @]
+
+switch /local/pcb/distaligntext/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/distaligntext/distaligntext.c
===================================================================
--- tags/2.0.1/src_plugins/distaligntext/distaligntext.c	(nonexistent)
+++ tags/2.0.1/src_plugins/distaligntext/distaligntext.c	(revision 18980)
@@ -0,0 +1,637 @@
+/*
+ * distaligntext plug-in for PCB.
+ *
+ * Copyright (C) 2012 Dan White <dan@whiteaudio.com>
+ * Functions to distribute (evenly spread out) and align PCB text.
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Substantially from distalign.c
+ * Copyright (C) 2007 Ben Jackson <ben@ben.com>
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016, 2018.
+ *
+ *
+ * Modifications and internal differences are significant enough warrant
+ * a new related plugin.
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "rats.h"
+#include "error.h"
+#include "move.h"
+#include "draw.h"
+#include "plugins.h"
+#include "actions.h"
+#include "conf_core.h"
+#include "box.h"
+#include "macro.h"
+#include "compat_misc.h"
+
+enum {
+	K_X,
+	K_Y,
+	K_Lefts,
+	K_Rights,
+	K_Tops,
+	K_Bottoms,
+	K_Centers,
+	K_Gaps,
+	K_First,
+	K_Last,
+	K_Average,
+	K_Crosshair,
+	K_Gridless,
+	K_none,
+	K_aligntext,
+	K_distributetext
+};
+
+static const char *keywords[] = {
+	/* [K_X] */ "X",
+	/* [K_Y] */ "Y",
+	/* [K_Lefts] */ "Lefts",
+	/* [K_Rights] */ "Rights",
+	/* [K_Tops] */ "Tops",
+	/* [K_Bottoms] */ "Bottoms",
+	/* [K_Centers] */ "Centers",
+	/* [K_Gaps] */ "Gaps",
+	/* [K_First] */ "First",
+	/* [K_Last] */ "Last",
+	/* [K_Average] */ "Average",
+	/* [K_Crosshair] */ "pcb_crosshair",
+	/* [K_Gridless] */ "Gridless",
+};
+
+static int keyword(const char *s)
+{
+	int i;
+
+	if (!s) {
+		return K_none;
+	}
+	for (i = 0; i < PCB_ENTRIES(keywords); ++i) {
+		if (keywords[i] && pcb_strcasecmp(s, keywords[i]) == 0)
+			return i;
+	}
+	return -1;
+}
+
+
+/* this macro produces a function in X or Y that switches on 'point' */
+#define COORD(DIR)						\
+static inline pcb_coord_t				        	\
+coord ## DIR(pcb_text_t *text, int point)		        	\
+{								\
+	switch (point) {					\
+	case K_Lefts:						\
+	case K_Tops:						\
+		return text->BoundingBox.DIR ## 1;		\
+	case K_Rights:						\
+	case K_Bottoms:						\
+		return text->BoundingBox.DIR ## 2;		\
+	case K_Centers:						\
+	case K_Gaps:						\
+		return (text->BoundingBox.DIR ## 1 +		\
+		       text->BoundingBox.DIR ## 2) / 2;	        \
+	}							\
+	return 0;						\
+}
+
+COORD(X)
+	COORD(Y)
+
+/* Return the text coordinate associated with the given internal point. */
+static pcb_coord_t coord(pcb_text_t * text, int dir, int point)
+{
+	if (dir == K_X)
+		return coordX(text, point);
+	else
+		return coordY(text, point);
+}
+
+static struct text_by_pos {
+	pcb_text_t *text;
+	pcb_coord_t pos;
+	pcb_coord_t width;
+} *texts_by_pos;
+
+static int ntexts_by_pos;
+
+static int cmp_tbp(const void *a, const void *b)
+{
+	const struct text_by_pos *ta = a;
+	const struct text_by_pos *tb = b;
+
+	return ta->pos - tb->pos;
+}
+
+/* Find all selected text objects, then order them in order by coordinate in
+ * the 'dir' axis.  This is used to find the "First" and "Last" elements
+ * and also to choose the distribution order.
+ *
+ * For alignment, first and last are in the orthogonal axis (imagine if
+ * you were lining up letters in a sentence, aligning *vertically* to the
+ * first letter means selecting the first letter *horizontally*).
+ *
+ * For distribution, first and last are in the distribution axis. */
+static int sort_texts_by_pos(int op, int dir, int point)
+{
+	int nsel = 0;
+
+	if (ntexts_by_pos)
+		return ntexts_by_pos;
+	if (op == K_aligntext)
+		dir = dir == K_X ? K_Y : K_X;	/* see above */
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		PCB_TEXT_ALL_LOOP(subc->data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, text))
+				continue;
+			nsel++;
+		}
+		PCB_ENDALL_LOOP;
+	}
+	PCB_END_LOOP;
+
+	PCB_TEXT_ALL_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
+			continue;
+		nsel++;
+	}
+	PCB_ENDALL_LOOP;
+	if (!nsel)
+		return 0;
+	texts_by_pos = malloc(nsel * sizeof(*texts_by_pos));
+	ntexts_by_pos = nsel;
+	nsel = 0;
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		PCB_TEXT_ALL_LOOP(subc->data);
+		{
+			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, text))
+				continue;
+			texts_by_pos[nsel].text = text;
+			texts_by_pos[nsel++].pos = coord(text, dir, point);
+		}
+		PCB_ENDALL_LOOP;
+	}
+	PCB_END_LOOP;
+
+	PCB_TEXT_ALL_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
+			continue;
+		texts_by_pos[nsel].text = text;
+		texts_by_pos[nsel++].pos = coord(text, dir, point);
+	}
+	PCB_ENDALL_LOOP;
+	qsort(texts_by_pos, ntexts_by_pos, sizeof(*texts_by_pos), cmp_tbp);
+	return ntexts_by_pos;
+}
+
+static void free_texts_by_pos(void)
+{
+	if (ntexts_by_pos) {
+		free(texts_by_pos);
+		texts_by_pos = NULL;
+		ntexts_by_pos = 0;
+	}
+}
+
+
+/* Find the reference coordinate from the specified points of all selected text. */
+static pcb_coord_t reference_coord(int op, int x, int y, int dir, int point, int reference)
+{
+	pcb_coord_t q;
+	int i, nsel;
+
+	q = 0;
+	switch (reference) {
+	case K_Crosshair:
+		if (dir == K_X)
+			q = x;
+		else
+			q = y;
+		break;
+	case K_Average:							/* the average among selected text */
+		nsel = ntexts_by_pos;
+		for (i = 0; i < ntexts_by_pos; ++i) {
+			q += coord(texts_by_pos[i].text, dir, point);
+		}
+		if (nsel)
+			q /= nsel;
+		break;
+	case K_First:								/* first or last in the orthogonal direction */
+	case K_Last:
+		if (!sort_texts_by_pos(op, dir, point)) {
+			q = 0;
+			break;
+		}
+		if (reference == K_First) {
+			q = coord(texts_by_pos[0].text, dir, point);
+		}
+		else {
+			q = coord(texts_by_pos[ntexts_by_pos - 1].text, dir, point);
+		}
+		break;
+	}
+	return q;
+}
+
+
+/*
+ * AlignText(X, [Lefts/Rights/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])\n
+ * AlignText(Y, [Tops/Bottoms/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])
+ *
+ * X or Y - Select which axis will move, other is untouched. \n
+ * Lefts, Rights, \n
+ * Tops, Bottoms, \n
+ * Centers - Pick alignment point within each element. \n
+ * NB: text objects have no Mark. \n
+ * First, Last, \n
+ * pcb_crosshair, \n
+ * Average - Alignment reference, First=Topmost/Leftmost, \n
+ * Last=Bottommost/Rightmost, Average or pcb_crosshair point \n
+ * Gridless - Do not force results to align to prevailing grid. \n
+ *
+ * Defaults are Lefts/Tops, First */
+static const char pcb_acts_aligntext[] = "AlignText(X/Y, [Lefts/Rights/Tops/Bottoms/Centers, [First/Last/pcb_crosshair/Average[, Gridless]]])";
+static fgw_error_t pcb_act_aligntext(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1, *a2, *a3;
+	int dir;
+	int point;
+	int reference;
+	int gridless;
+	pcb_coord_t q;
+	pcb_coord_t p, dp, dx, dy;
+	int changed = 0;
+
+	if (argc < 2 || argc > 5) {
+		PCB_ACT_FAIL(aligntext);
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, aligntext, a0 = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, aligntext, a1 = argv[2].val.str);
+	PCB_ACT_CONVARG(3, FGW_STR, aligntext, a2 = argv[3].val.str);
+	PCB_ACT_CONVARG(4, FGW_STR, aligntext, a3 = argv[4].val.str);
+
+	/* parse direction arg */
+	switch ((dir = keyword(a0))) {
+	case K_X:
+	case K_Y:
+		break;
+	default:
+		PCB_ACT_FAIL(aligntext);
+	}
+	/* parse point (within each element) which will be aligned */
+	switch ((point = keyword(a1))) {
+	case K_Centers:
+		break;
+	case K_Lefts:
+	case K_Rights:
+		if (dir == K_Y) {
+			PCB_ACT_FAIL(aligntext);
+		}
+		break;
+	case K_Tops:
+	case K_Bottoms:
+		if (dir == K_X) {
+			PCB_ACT_FAIL(aligntext);
+		}
+		break;
+	case K_none:									/* default value */
+		if (dir == K_X) {
+			point = K_Lefts;
+		}
+		else {
+			point = K_Tops;
+		}
+		break;
+	default:
+		PCB_ACT_FAIL(aligntext);
+	}
+	/* parse reference which will determine alignment coordinates */
+	switch ((reference = keyword(a2))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		reference = K_First;				/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(aligntext);
+	}
+	/* optionally work off the grid (solar cells!) */
+	switch (keyword(a3)) {
+	case K_Gridless:
+		gridless = 1;
+		break;
+	case K_none:
+		gridless = 0;
+		break;
+	default:
+		PCB_ACT_FAIL(aligntext);
+	}
+	pcb_undo_save_serial();
+	/* find the final alignment coordinate using the above options */
+	q = reference_coord(K_aligntext, pcb_crosshair.X, pcb_crosshair.Y, dir, point, reference);
+	/* move all selected elements to the new coordinate */
+	/* selected text part of an element */
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		PCB_TEXT_ALL_LOOP(subc->data) {
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) || !PCB_FLAG_TEST(PCB_FLAG_FLOATER, text))
+			continue;
+		/* find delta from reference point to reference point */
+		p = coord(text, dir, point);
+		dp = q - p;
+		/* ...but if we're gridful, keep the mark on the grid */
+		/* TODO re-enable for text, need textcoord()
+		   if (!gridless)
+		   {
+		   dp -= (coord (text, dir, K_Marks) + dp) % (long) (PCB->Grid);
+		   }
+		 */
+		if (dp) {
+			/* move from generic to X or Y */
+			dx = dy = dp;
+			if (dir == K_X)
+				dy = 0;
+			else
+				dx = 0;
+			pcb_move_obj(PCB_OBJ_TEXT, text->parent.layer, text, text, dx, dy);
+			changed = 1;
+		}
+		} PCB_ENDALL_LOOP;
+	}
+	PCB_END_LOOP;
+
+	/* Selected bare text objects */
+	PCB_TEXT_ALL_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) {
+			/* find delta from reference point to reference point */
+			p = coord(text, dir, point);
+			dp = q - p;
+			/* ...but if we're gridful, keep the mark on the grid */
+			/* TODO re-enable for text, need textcoord()
+			   if (!gridless)
+			   {
+			   dp -= (coord (text, dir, K_Marks) + dp) % (long) (PCB->Grid);
+			   }
+			 */
+			if (dp) {
+				/* move from generic to X or Y */
+				dx = dy = dp;
+				if (dir == K_X)
+					dy = 0;
+				else
+					dx = 0;
+				pcb_move_obj(PCB_OBJ_TEXT, layer, text, text, dx, dy);
+				changed = 1;
+			}
+		}
+	}
+	PCB_ENDALL_LOOP;
+	if (changed) {
+		pcb_undo_restore_serial();
+		pcb_undo_inc_serial();
+		pcb_redraw();
+		pcb_board_set_changed_flag(pcb_true);
+	}
+	free_texts_by_pos();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* DistributeText(X, [Lefts/Rights/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]]) \n
+   DistributeText(Y, [Tops/Bottoms/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]]) \n
+
+   As with align, plus:
+
+   Gaps - Make gaps even rather than spreading points evenly.
+   First, Last, pcb_crosshair - Two arguments specifying both ends of the distribution, they can't both be the same.
+
+   Defaults are Lefts/Tops, First, Last 
+
+   Distributed texts always retain the same relative order they had
+   before they were distributed. */
+static const char pcb_acts_distributetext[] = "DistributeText(Y, [Lefts/Rights/Tops/Bottoms/Centers/Gaps, [First/Last/pcb_crosshair, First/Last/pcb_crosshair[, Gridless]]])";
+static fgw_error_t pcb_act_distributetext(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1, *a2 = NULL, *a3 = NULL, *a4 = NULL;
+	int dir;
+	int point;
+	int refa, refb;
+	int gridless;
+	pcb_coord_t s, e, slack;
+	int divisor;
+	int changed = 0;
+	int i;
+
+	if (argc < 2 || argc == 4 || argc > 5) {
+		PCB_ACT_FAIL(distributetext);
+	}
+
+	PCB_ACT_CONVARG(1, FGW_STR, distributetext, a0 = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, distributetext, a1 = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, distributetext, a2 = argv[3].val.str);
+	PCB_ACT_MAY_CONVARG(4, FGW_STR, distributetext, a3 = argv[4].val.str);
+	PCB_ACT_MAY_CONVARG(5, FGW_STR, distributetext, a4 = argv[5].val.str);
+
+	/* parse direction arg */
+	switch ((dir = keyword(a0))) {
+	case K_X:
+	case K_Y:
+		break;
+	default:
+		PCB_ACT_FAIL(distributetext);
+	}
+
+
+	/* parse point (within each element) which will be distributed */
+	switch ((point = keyword(a1))) {
+	case K_Centers:
+	case K_Gaps:
+		break;
+	case K_Lefts:
+	case K_Rights:
+		if (dir == K_Y) {
+			PCB_ACT_FAIL(distributetext);
+		}
+		break;
+	case K_Tops:
+	case K_Bottoms:
+		if (dir == K_X) {
+			PCB_ACT_FAIL(distributetext);
+		}
+		break;
+	case K_none:									/* default value */
+		if (dir == K_X) {
+			point = K_Lefts;
+		}
+		else {
+			point = K_Tops;
+		}
+		break;
+	default:
+		PCB_ACT_FAIL(distributetext);
+	}
+	/* parse reference which will determine first distribution coordinate */
+	switch ((refa = keyword(a2))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		refa = K_First;							/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(distributetext);
+	}
+	/* parse reference which will determine final distribution coordinate */
+	switch ((refb = keyword(a3))) {
+	case K_First:
+	case K_Last:
+	case K_Average:
+	case K_Crosshair:
+		break;
+	case K_none:
+		refb = K_Last;							/* default value */
+		break;
+	default:
+		PCB_ACT_FAIL(distributetext);
+	}
+	if (refa == refb) {
+		PCB_ACT_FAIL(distributetext);
+	}
+	/* optionally work off the grid (solar cells!) */
+	switch (keyword(a4)) {
+	case K_Gridless:
+		gridless = 1;
+		break;
+	case K_none:
+		gridless = 0;
+		break;
+	default:
+		PCB_ACT_FAIL(distributetext);
+	}
+	pcb_undo_save_serial();
+	/* build list of texts in orthogonal axis order */
+	sort_texts_by_pos(K_distributetext, dir, point);
+	/* find the endpoints given the above options */
+	s = reference_coord(K_distributetext, pcb_crosshair.X, pcb_crosshair.Y, dir, point, refa);
+	e = reference_coord(K_distributetext, pcb_crosshair.X, pcb_crosshair.Y, dir, point, refb);
+	slack = e - s;
+	/* use this divisor to calculate spacing (for 1 elt, avoid 1/0) */
+	divisor = (ntexts_by_pos > 1) ? (ntexts_by_pos - 1) : 1;
+	/* even the gaps instead of the edges or whatnot */
+	/* find the "slack" in the row */
+	if (point == K_Gaps) {
+		pcb_coord_t w;
+
+		/* subtract all the "widths" from the slack */
+		for (i = 0; i < ntexts_by_pos; ++i) {
+			pcb_text_t *text = texts_by_pos[i].text;
+
+			/* coord doesn't care if I mix Lefts/Tops */
+			w = texts_by_pos[i].width = coord(text, dir, K_Rights) - coord(text, dir, K_Lefts);
+			/* Gaps distribution is on centers, so half of
+			 * first and last text don't count */
+			if (i == 0 || i == ntexts_by_pos - 1) {
+				w /= 2;
+			}
+			slack -= w;
+		}
+		/* slack could be negative */
+	}
+	/* move all selected texts to the new coordinate */
+	for (i = 0; i < ntexts_by_pos; ++i) {
+		pcb_text_t *text = texts_by_pos[i].text;
+		pcb_coord_t p, q, dp, dx, dy;
+
+		/* find reference point for this text */
+		q = s + slack * i / divisor;
+		/* find delta from reference point to reference point */
+		p = coord(text, dir, point);
+		dp = q - p;
+		/* ...but if we're gridful, keep the mark on the grid */
+		/* TODO re-enable grid
+		   if (! gridless)
+		   {
+		   dp -= (coord (text, dir, K_Marks) + dp) % (long) (PCB->Grid);
+		   }
+		 */
+		if (dp) {
+			/* move from generic to X or Y */
+			dx = dy = dp;
+			if (dir == K_X)
+				dy = 0;
+			else
+				dx = 0;
+			pcb_text_move(text, dx, dy);
+			pcb_undo_add_obj_to_move(PCB_OBJ_TEXT, NULL, NULL, text, dx, dy);
+			changed = 1;
+		}
+		/* in gaps mode, accumulate part widths */
+		if (point == K_Gaps) {
+			/* move remaining half of our text */
+			s += texts_by_pos[i].width / 2;
+			/* move half of next text */
+			if (i < ntexts_by_pos - 1)
+				s += texts_by_pos[i + 1].width / 2;
+		}
+	}
+	if (changed) {
+		pcb_undo_restore_serial();
+		pcb_undo_inc_serial();
+		pcb_redraw();
+		pcb_board_set_changed_flag(pcb_true);
+	}
+	free_texts_by_pos();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t distaligntext_action_list[] = {
+	{"distributetext", pcb_act_distributetext, "Distribute Text Elements", pcb_acts_distributetext},
+	{"aligntext", pcb_act_aligntext, "Align Text Elements", pcb_acts_aligntext}
+};
+
+char *distaligntext_cookie = "distaligntext plugin";
+
+PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie)
+
+int pplg_check_ver_distaligntext(int ver_needed) { return 0; }
+
+void pplg_uninit_distaligntext(void)
+{
+	pcb_remove_actions_by_cookie(distaligntext_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_distaligntext(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(distaligntext_action_list, distaligntext_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/distaligntext/distaligntext.pup
===================================================================
--- tags/2.0.1/src_plugins/distaligntext/distaligntext.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/distaligntext/distaligntext.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short distribute and align text
+$long Same as distalign, operates on text objects.
+$package extra
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/djopt/Makefile
===================================================================
--- tags/2.0.1/src_plugins/djopt/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_djopt
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/djopt/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/djopt/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {djopt}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/djopt/djopt.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/djopt/djopt_conf.h}
+
+switch /local/pcb/djopt/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/djopt/djopt.c
===================================================================
--- tags/2.0.1/src_plugins/djopt/djopt.c	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/djopt.c	(revision 18980)
@@ -0,0 +1,2643 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2003 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+#include "board.h"
+
+#include <memory.h>
+#include <limits.h>
+
+
+#include "data.h"
+#include "remove.h"
+#include "move.h"
+#include "draw.h"
+#include "undo.h"
+#include "flag_str.h"
+#include "find.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "plugins.h"
+#include "hid_flags.h"
+#include "actions.h"
+#include "djopt_conf.h"
+#include "obj_line.h"
+#include "event.h"
+#include "macro.h"
+#include "obj_pstk_inlines.h"
+
+conf_djopt_t conf_djopt;
+
+static const char *djopt_cookie = "djopt";
+
+#define dprintf if(0)pcb_printf
+
+#define selected(x) PCB_FLAG_TEST(PCB_FLAG_SELECTED, (x))
+#define autorouted(x) PCB_FLAG_TEST(PCB_FLAG_AUTO, (x))
+
+#define SB (conf_core.design.bloat+1)
+
+/* must be 2^N-1 */
+#define INC 7
+
+#define O_HORIZ		0x10
+#define O_VERT		0x20
+#define LEFT		0x11
+#define RIGHT		0x12
+#define UP		0x24
+#define DOWN		0x28
+#define DIAGONAL	0xf0
+#define ORIENT(x) ((x) & 0xf0)
+#define DIRECT(x) ((x) & 0x0f)
+
+/* Manhattan length of the longest "freckle" */
+#define LONGEST_FRECKLE	2
+
+struct line_s;
+
+typedef struct corner_s {
+	int layer;
+	struct corner_s *next;
+	int x, y;
+	int net;
+	pcb_pstk_t *via, *pad, *pin;
+	int miter;
+	int n_lines;
+	struct line_s **lines;
+} corner_s;
+
+typedef struct line_s {
+	int layer;
+	struct line_s *next;
+	corner_s *s, *e;
+	pcb_line_t *line;
+	char is_pad;
+} line_s;
+
+typedef struct rect_s {
+	int x1, y1, x2, y2;
+} rect_s;
+
+#define DELETE(q) (q)->layer = 0xdeadbeef
+#define DELETED(q) ((q)->layer == 0xdeadbeef)
+
+static corner_s *corners, *next_corner = 0;
+static line_s *lines;
+
+static int layer_groupings[PCB_MAX_LAYERGRP];
+static char layer_type[PCB_MAX_LAYER];
+#define LT_COMPONENT 1
+#define LT_SOLDER 2
+
+static const char *element_name_for(corner_s * c)
+{
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		PCB_PADSTACK_LOOP(subc->data);
+		{
+			if ((padstack == c->pin) || (padstack == c->pad))
+				return subc->refdes;
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+
+	return "unknown";
+}
+
+static const char *corner_name(corner_s * c)
+{
+	static char buf[4][100];
+	static int bn = 0;
+	char *bp;
+	bn = (bn + 1) % 4;
+
+	if (c->net == 0xf1eef1ee) {
+		sprintf(buf[bn], "\033[31m[%p freed corner]\033[0m", (void *) c);
+		return buf[bn];
+	}
+
+	sprintf(buf[bn], "\033[%dm[%p ", (c->pin || c->pad || c->via) ? 33 : 34, (void *) c);
+	bp = buf[bn] + strlen(buf[bn]);
+
+	if (c->pin)
+		pcb_sprintf(bp, "pin %s:%s at %#mD", element_name_for(c), c->pin->term, c->x, c->y);
+	else if (c->via)
+		pcb_sprintf(bp, "via at %#mD", c->x, c->y);
+	else if (c->pad) {
+		pcb_sprintf(bp, "pad %s:%s at %#mD %#mD-%#mD",
+								element_name_for(c), c->pad->term, c->x, c->y,
+								c->pad->BoundingBox.X1, c->pad->BoundingBox.Y1, c->pad->BoundingBox.X2, c->pad->BoundingBox.Y2);
+	}
+	else
+		pcb_sprintf(bp, "at %#mD", c->x, c->y);
+	sprintf(bp + strlen(bp), " n%d l%d]\033[0m", c->n_lines, c->layer);
+	return buf[bn];
+}
+
+static int solder_layer, component_layer;
+
+static void dj_abort(const char *msg, ...)
+{
+	va_list a;
+	va_start(a, msg);
+	vprintf(msg, a);
+	va_end(a);
+	fflush(stdout);
+	abort();
+}
+
+#if 1
+#define check(c,l)
+#else
+#define check(c,l) check2(__LINE__,c,l)
+static void check2(int srcline, corner_s * c, line_s * l)
+{
+	int saw_c = 0, saw_l = 0;
+	corner_s *cc;
+	line_s *ll;
+	int i;
+
+	for (cc = corners; cc; cc = cc->next) {
+		if (DELETED(cc))
+			continue;
+		if (cc == c)
+			saw_c = 1;
+		for (i = 0; i < cc->n_lines; i++)
+			if (cc->lines[i]->s != cc && cc->lines[i]->e != cc)
+				dj_abort("check:%d: cc has line without backref\n", srcline);
+		if (cc->via && (cc->x != cc->via->X || cc->y != cc->via->Y))
+			dj_abort("check:%d: via not at corner\n", srcline);
+		if (cc->pin && (cc->x != cc->pin->X || cc->y != cc->pin->Y))
+			dj_abort("check:%d: pin not at corner\n", srcline);
+	}
+	if (c && !saw_c)
+		dj_abort("check:%d: corner not in corners list\n", srcline);
+	for (ll = lines; ll; ll = ll->next) {
+		if (DELETED(ll))
+			continue;
+		if (ll == l)
+			saw_l = 1;
+		for (i = 0; i < ll->s->n_lines; i++)
+			if (ll->s->lines[i] == ll)
+				break;
+		if (i == ll->s->n_lines)
+			dj_abort("check:%d: ll->s has no backref\n", srcline);
+		for (i = 0; i < ll->e->n_lines; i++)
+			if (ll->e->lines[i] == ll)
+				break;
+		if (i == ll->e->n_lines)
+			dj_abort("check:%d: ll->e has no backref\n", srcline);
+		if (!ll->is_pad
+				&& (ll->s->x != ll->line->Point1.X
+						|| ll->s->y != ll->line->Point1.Y || ll->e->x != ll->line->Point2.X || ll->e->y != ll->line->Point2.Y)) {
+			pcb_printf("line: %#mD to %#mD  pcbline: %#mD to %#mD\n",
+								 ll->s->x, ll->s->y,
+								 ll->e->x, ll->e->y, ll->line->Point1.X, ll->line->Point1.Y, ll->line->Point2.X, ll->line->Point2.Y);
+			dj_abort("check:%d: line doesn't match pcbline\n", srcline);
+		}
+	}
+	if (l && !saw_l)
+		dj_abort("check:%d: line not in lines list\n", srcline);
+}
+
+#endif
+
+#define SWAP(a,b) { a^=b; b^=a; a^=b; }
+
+static int gridsnap(pcb_coord_t n)
+{
+	if (n <= 0)
+		return 0;
+	return n - n % (conf_core.editor.grid);
+}
+
+/* Avoid commonly used names. */
+
+static int djabs(int x)
+{
+	return x > 0 ? x : -x;
+}
+
+static int djmax(int x, int y)
+{
+	return x > y ? x : y;
+}
+
+static int djmin(int x, int y)
+{
+	return x < y ? x : y;
+}
+
+/*
+ * Find distance between 2 points.  We use floating point math here
+ * because we can fairly easily overflow a 32 bit integer here.  In
+ * fact it only takes 0.46" to do so.
+ */
+static int dist(int x1, int y1, int x2, int y2)
+{
+	double dx1, dy1, dx2, dy2, d;
+
+	dx1 = (double) x1;
+	dy1 = (double) y1;
+	dx2 = (double) x2;
+	dy2 = (double) y2;
+
+	d = sqrt((dx1 - dx2) * (dx1 - dx2) + (dy1 - dy2) * (dy1 - dy2));
+	d = pcb_round(d);
+
+	return (int) d;
+}
+
+static int line_length(line_s * l)
+{
+	if (l->s->x == l->e->x)
+		return djabs(l->s->y - l->e->y);
+	if (l->s->y == l->e->y)
+		return djabs(l->s->x - l->e->x);
+	return dist(l->s->x, l->s->y, l->e->x, l->e->y);
+}
+
+static int dist_ltp2(int dx, int y, int y1, int y2)
+{
+	if (y1 > y2)
+		SWAP(y1, y2);
+	if (y < y1)
+		return dist(dx, y, 0, y1);
+	if (y > y2)
+		return dist(dx, y, 0, y2);
+	return djabs(dx);
+}
+
+int sqr(int a)
+{
+	return a * a;
+}
+
+static int intersecting_layers(int l1, int l2)
+{
+	if (l1 == -1 || l2 == -1)
+		return 1;
+	if (l1 == l2)
+		return 1;
+	if (layer_groupings[l1] == layer_groupings[l2])
+		return 1;
+	return 0;
+}
+
+static int dist_line_to_point(line_s * l, corner_s * c)
+{
+	double len, r, d;
+	/* We can do this quickly if l is vertical or horizontal.  */
+	if (l->s->x == l->e->x)
+		return dist_ltp2(l->s->x - c->x, c->y, l->s->y, l->e->y);
+	if (l->s->y == l->e->y)
+		return dist_ltp2(l->s->y - c->y, c->x, l->s->x, l->e->x);
+
+	/* Do it the hard way.  See comments for pcb_is_point_on_line() in search.c */
+	len = sqrt(sqr(l->s->x - l->e->x) + sqr(l->s->y - l->e->y));
+	if (len == 0)
+		return dist(l->s->x, l->s->y, c->x, c->y);
+	r = (l->s->y - c->y) * (l->s->y - l->e->y) + (l->s->x - c->x) * (l->s->x - l->e->x);
+	r /= len * len;
+	if (r < 0)
+		return dist(l->s->x, l->s->y, c->x, c->y);
+	if (r > 1)
+		return dist(l->e->x, l->e->y, c->x, c->y);
+	d = (l->e->y - l->s->y) * (c->x * l->s->x) + (l->e->x - l->s->x) * (c->y - l->s->y);
+	return (int) (d / len);
+}
+
+static int line_orient(line_s * l, corner_s * c)
+{
+	int x1, y1, x2, y2;
+	if (c == l->s) {
+		x1 = l->s->x;
+		y1 = l->s->y;
+		x2 = l->e->x;
+		y2 = l->e->y;
+	}
+	else {
+		x1 = l->e->x;
+		y1 = l->e->y;
+		x2 = l->s->x;
+		y2 = l->s->y;
+	}
+	if (x1 == x2) {
+		if (y1 < y2)
+			return DOWN;
+		return UP;
+	}
+	else if (y1 == y2) {
+		if (x1 < x2)
+			return RIGHT;
+		return LEFT;
+	}
+	return DIAGONAL;
+}
+
+static corner_s *other_corner(line_s * l, corner_s * c)
+{
+	if (l->s == c)
+		return l->e;
+	if (l->e == c)
+		return l->s;
+	dj_abort("other_corner: neither corner passed\n");
+	return NULL;
+}
+
+static corner_s *find_corner_if(int x, int y, int l)
+{
+	corner_s *c;
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (c->x != x || c->y != y)
+			continue;
+		if (!(c->layer == -1 || intersecting_layers(c->layer, l)))
+			continue;
+		return c;
+	}
+	return 0;
+}
+
+static corner_s *find_corner(int x, int y, int l)
+{
+	corner_s *c;
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (c->x != x || c->y != y)
+			continue;
+		if (!(c->layer == -1 || intersecting_layers(c->layer, l)))
+			continue;
+		return c;
+	}
+	c = (corner_s *) malloc(sizeof(corner_s));
+	c->next = corners;
+	corners = c;
+	c->x = x;
+	c->y = y;
+	c->net = 0;
+	c->via = 0;
+	c->pad = 0;
+	c->pin = 0;
+	c->layer = l;
+	c->n_lines = 0;
+	c->lines = (line_s **) malloc(INC * sizeof(line_s *));
+	return c;
+}
+
+static void add_line_to_corner(line_s * l, corner_s * c)
+{
+	int n;
+	n = (c->n_lines + 1 + INC) & ~INC;
+	c->lines = (line_s **) realloc(c->lines, n * sizeof(line_s *));
+	c->lines[c->n_lines] = l;
+	c->n_lines++;
+	dprintf("add_line_to_corner %#mD\n", c->x, c->y);
+}
+
+static pcb_line_t *create_pcb_line(int layer, int x1, int y1, int x2, int y2, int thick, int clear, pcb_flag_t flags)
+{
+	char *from, *to;
+	pcb_line_t *nl;
+	pcb_layer_t *lyr = LAYER_PTR(layer);
+
+	from = (char *) linelist_first(&lyr->Line);
+	nl = pcb_line_new(PCB->Data->Layer + layer, x1, y1, x2, y2, thick, clear, flags);
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, lyr, nl, nl);
+
+	to = (char *) linelist_first(&lyr->Line);
+	if (from != to) {
+		line_s *lp;
+		for (lp = lines; lp; lp = lp->next) {
+			if (DELETED(lp))
+				continue;
+			if ((char *) (lp->line) >= from && (char *) (lp->line) <= from + linelist_length(&lyr->Line) * sizeof(pcb_line_t))
+				lp->line = (pcb_line_t *) ((char *) (lp->line) + (to - from));
+		}
+	}
+	return nl;
+}
+
+static void new_line(corner_s * s, corner_s * e, int layer, pcb_line_t * example)
+{
+	line_s *ls;
+
+	if (!(pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+		dj_abort("layer %d\n", layer);
+
+	if (example == NULL)
+		dj_abort("NULL example passed to new_line()\n", layer);
+
+	if (s->x == e->x && s->y == e->y)
+		return;
+
+	ls = (line_s *) malloc(sizeof(line_s));
+	ls->next = lines;
+	lines = ls;
+	ls->is_pad = 0;
+	ls->s = s;
+	ls->e = e;
+	ls->layer = layer;
+#if 0
+	if ((example->Point1.X == s->x && example->Point1.Y == s->y && example->Point2.X == e->x && example->Point2.Y == e->y)
+			|| (example->Point2.X == s->x && example->Point2.Y == s->y && example->Point1.X == e->x && example->Point1.Y == e->y)) {
+		ls->line = example;
+	}
+	else
+#endif
+	{
+		pcb_line_t *nl;
+		dprintf
+			("New line \033[35m%#mD to %#mD from l%d t%#mS c%#mS f%s\033[0m\n",
+			 s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_OBJ_LINE, NULL, 0));
+		nl = create_pcb_line(layer, s->x, s->y, e->x, e->y, example->Thickness, example->Clearance, example->Flags);
+
+		if (!nl)
+			dj_abort("can't create new line!");
+		ls->line = nl;
+	}
+	add_line_to_corner(ls, s);
+	add_line_to_corner(ls, e);
+	check(s, ls);
+	check(e, ls);
+}
+
+static line_s *other_line(corner_s * c, line_s * l)
+{
+	int i;
+	line_s *rv = 0;
+	if (c->pin || c->pad || c->via)
+		return 0;
+	for (i = 0; i < c->n_lines; i++) {
+		if (c->lines[i] == l)
+			continue;
+		if (rv)
+			return 0;
+		rv = c->lines[i];
+	}
+	return rv;
+}
+
+static void empty_rect(rect_s * rect)
+{
+	rect->x1 = rect->y1 = INT_MAX;
+	rect->x2 = rect->y2 = INT_MIN;
+}
+
+static void add_point_to_rect(rect_s * rect, int x, int y, int w)
+{
+	if (rect->x1 > x - w)
+		rect->x1 = x - w;
+	if (rect->x2 < x + w)
+		rect->x2 = x + w;
+	if (rect->y1 > y - w)
+		rect->y1 = y - w;
+	if (rect->y2 < y + w)
+		rect->y2 = y + w;
+}
+
+static void add_line_to_rect(rect_s * rect, line_s * l)
+{
+	add_point_to_rect(rect, l->s->x, l->s->y, 0);
+	add_point_to_rect(rect, l->e->x, l->e->y, 0);
+}
+
+static int pin_in_rect(rect_s * r, int x, int y, int w)
+{
+	if (x < r->x1 && x + w < r->x1)
+		return 0;
+	if (x > r->x2 && x - w > r->x2)
+		return 0;
+	if (y < r->y1 && y + w < r->y1)
+		return 0;
+	if (y > r->y2 && y - w > r->y2)
+		return 0;
+	return 1;
+}
+
+static int line_in_rect(rect_s * r, line_s * l)
+{
+	rect_s lr;
+	empty_rect(&lr);
+	add_point_to_rect(&lr, l->s->x, l->s->y, l->line->Thickness / 2);
+	add_point_to_rect(&lr, l->e->x, l->e->y, l->line->Thickness / 2);
+	dprintf("line_in_rect %#mD-%#mD vs %#mD-%#mD\n", r->x1, r->y1, r->x2, r->y2, lr.x1, lr.y1, lr.x2, lr.y2);
+	/* simple intersection of rectangles */
+	if (lr.x1 < r->x1)
+		lr.x1 = r->x1;
+	if (lr.x2 > r->x2)
+		lr.x2 = r->x2;
+	if (lr.y1 < r->y1)
+		lr.y1 = r->y1;
+	if (lr.y2 > r->y2)
+		lr.y2 = r->y2;
+	if (lr.x1 < lr.x2 && lr.y1 < lr.y2)
+		return 1;
+	return 0;
+}
+
+static int corner_radius(corner_s * c)
+{
+	pcb_pstk_t *p = NULL;
+	int diam = 0;
+	int i;
+
+	if (c->pin) p = c->pin;
+	if (c->via) p = c->via;
+	if (c->pad) p = c->pad;
+	if (p != NULL)
+		diam = djmax(p->BoundingBox.X2 - p->BoundingBox.X1, p->BoundingBox.Y2 - p->BoundingBox.Y1);
+
+	for (i = 0; i < c->n_lines; i++)
+		if (c->lines[i]->line)
+			diam = djmax(c->lines[i]->line->Thickness, diam);
+	diam = (diam + 1) / 2;
+	return diam;
+}
+
+static void add_corner_to_rect_if(rect_s * rect, corner_s * c, rect_s * e)
+{
+	int diam = corner_radius(c);
+	if (!pin_in_rect(e, c->x, c->y, diam))
+		return;
+	if (c->x < e->x1 && c->y < e->y1 && dist(c->x, c->y, e->x1, e->y1) > diam)
+		return;
+	if (c->x > e->x2 && c->y < e->y1 && dist(c->x, c->y, e->x2, e->y1) > diam)
+		return;
+	if (c->x < e->x1 && c->y > e->y2 && dist(c->x, c->y, e->x1, e->y2) > diam)
+		return;
+	if (c->x > e->x2 && c->y > e->y2 && dist(c->x, c->y, e->x2, e->y2) > diam)
+		return;
+
+	/*pcb_printf("add point %#mD diam %#mS\n", c->x, c->y, diam); */
+	add_point_to_rect(rect, c->x, c->y, diam);
+}
+
+static void remove_line(line_s * l)
+{
+	int i, j;
+	pcb_layer_t *layer = &(PCB->Data->Layer[l->layer]);
+
+	check(0, 0);
+
+	if (l->line)
+		pcb_line_destroy(layer, l->line);
+
+	DELETE(l);
+
+	for (i = 0, j = 0; i < l->s->n_lines; i++)
+		if (l->s->lines[i] != l)
+			l->s->lines[j++] = l->s->lines[i];
+	l->s->n_lines = j;
+
+	for (i = 0, j = 0; i < l->e->n_lines; i++)
+		if (l->e->lines[i] != l)
+			l->e->lines[j++] = l->e->lines[i];
+	l->e->n_lines = j;
+	check(0, 0);
+}
+
+static void move_line_to_layer(line_s * l, int layer)
+{
+	pcb_layer_t *ls, *ld;
+
+	ls = LAYER_PTR(l->layer);
+	ld = LAYER_PTR(layer);
+
+	pcb_move_obj_to_layer(PCB_OBJ_LINE, ls, l->line, 0, ld, 0);
+	l->layer = layer;
+}
+
+static void remove_via_at(corner_s * c)
+{
+	pcb_remove_object(PCB_OBJ_PSTK, c->via, 0, 0);
+	c->via = 0;
+}
+
+static void remove_corner(corner_s * c2)
+{
+	corner_s *c;
+	dprintf("remove corner %s\n", corner_name(c2));
+	if (corners == c2)
+		corners = c2->next;
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (c->next == c2)
+			c->next = c2->next;
+	}
+	if (next_corner == c2)
+		next_corner = c2->next;
+	free(c2->lines);
+	c2->lines = 0;
+	DELETE(c2);
+}
+
+static void merge_corners(corner_s * c1, corner_s * c2)
+{
+	int i;
+	if (c1 == c2)
+		abort();
+	dprintf("merge corners %s %s\n", corner_name(c1), corner_name(c2));
+	for (i = 0; i < c2->n_lines; i++) {
+		add_line_to_corner(c2->lines[i], c1);
+		if (c2->lines[i]->s == c2)
+			c2->lines[i]->s = c1;
+		if (c2->lines[i]->e == c2)
+			c2->lines[i]->e = c1;
+	}
+	if (c1->via && c2->via)
+		remove_via_at(c2);
+	else if (c2->via)
+		c1->via = c2->via;
+	if (c2->pad)
+		c1->pad = c2->pad;
+	if (c2->pin)
+		c1->pin = c2->pin;
+	if (c2->layer != c1->layer)
+		c1->layer = -1;
+
+	remove_corner(c2);
+}
+
+static void move_corner(corner_s * c, int x, int y)
+{
+	pcb_pstk_t *via;
+	int i;
+	corner_s *pad;
+
+	check(c, 0);
+	if (c->pad || c->pin)
+		dj_abort("move_corner: has pin or pad\n");
+	dprintf("move_corner %p from %#mD to %#mD\n", (void *) c, c->x, c->y, x, y);
+	pad = find_corner_if(x, y, c->layer);
+	c->x = x;
+	c->y = y;
+	via = c->via;
+	if (via) {
+		pcb_move_obj(PCB_OBJ_PSTK, via, via, via, x - via->x, y - via->y);
+		dprintf("via move %#mD to %#mD\n", via->x, via->y, x, y);
+	}
+	for (i = 0; i < c->n_lines; i++) {
+		pcb_line_t *tl = c->lines[i]->line;
+		if (tl) {
+			if (c->lines[i]->s == c) {
+				pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y));
+			}
+			else {
+				pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y));
+			}
+			dprintf("Line %p moved to %#mD %#mD\n", (void *) tl, tl->Point1.X, tl->Point1.Y, tl->Point2.X, tl->Point2.Y);
+		}
+	}
+	if (pad && pad != c)
+		merge_corners(c, pad);
+	else
+		for (i = 0; i < c->n_lines; i++) {
+			if (c->lines[i]->s->x == c->lines[i]->e->x && c->lines[i]->s->y == c->lines[i]->e->y) {
+				corner_s *c2 = other_corner(c->lines[i], c);
+				dprintf("move_corner: removing line %#mD %#mD %p %p\n", c->x, c->y, c2->x, c2->y, (void *) c, (void *) c2);
+
+				remove_line(c->lines[i]);
+				if (c != c2)
+					merge_corners(c, c2);
+				check(c, 0);
+				i--;
+				break;
+			}
+		}
+	pcb_gui->progress(0, 0, 0);
+	check(c, 0);
+}
+
+static int any_line_selected()
+{
+	line_s *l;
+	for (l = lines; l; l = l->next) {
+		if (DELETED(l))
+			continue;
+		if (l->line && selected(l->line))
+			return 1;
+	}
+	return 0;
+}
+
+static int trim_step(int s, int l1, int l2)
+{
+	dprintf("trim %d %d %d\n", s, l1, l2);
+	if (s > l1)
+		s = l1;
+	if (s > l2)
+		s = l2;
+	if (s != l1 && s != l2)
+		s = gridsnap(s);
+	return s;
+}
+
+static int canonicalize_line(line_s * l);
+
+static int split_line(line_s * l, corner_s * c)
+{
+	int i;
+	pcb_line_t *pcbline;
+	line_s *ls;
+
+	if (!intersecting_layers(l->layer, c->layer))
+		return 0;
+	if (l->is_pad)
+		return 0;
+	if (c->pad) {
+		dprintf("split on pad!\n");
+		if (l->s->pad == c->pad || l->e->pad == c->pad)
+			return 0;
+		dprintf("splitting...\n");
+	}
+
+	check(c, l);
+	pcbline = create_pcb_line(l->layer, c->x, c->y, l->e->x, l->e->y, l->line->Thickness, l->line->Clearance, l->line->Flags);
+	if (pcbline == 0)
+		return 0;										/* already a line there */
+
+	check(c, l);
+
+	dprintf("split line from %#mD to %#mD at %#mD\n", l->s->x, l->s->y, l->e->x, l->e->y, c->x, c->y);
+	ls = (line_s *) malloc(sizeof(line_s));
+
+	ls->next = lines;
+	lines = ls;
+	ls->is_pad = 0;
+	ls->s = c;
+	ls->e = l->e;
+	ls->line = pcbline;
+	ls->layer = l->layer;
+	for (i = 0; i < l->e->n_lines; i++)
+		if (l->e->lines[i] == l)
+			l->e->lines[i] = ls;
+	l->e = c;
+	add_line_to_corner(l, c);
+	add_line_to_corner(ls, c);
+
+	pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2,
+						 c->x - (l->line->Point2.X), c->y - (l->line->Point2.Y));
+
+	return 1;
+}
+
+static int canonicalize_line(line_s * l)
+{
+	/* This could be faster */
+	corner_s *c;
+	if (l->s->x == l->e->x) {
+		int y1 = l->s->y;
+		int y2 = l->e->y;
+		int x1 = l->s->x - l->line->Thickness / 2;
+		int x2 = l->s->x + l->line->Thickness / 2;
+		if (y1 > y2) {
+			int t = y1;
+			y1 = y2;
+			y2 = t;
+		}
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if ((y1 < c->y && c->y < y2)
+					&& intersecting_layers(l->layer, c->layer)) {
+				if (c->x != l->s->x && c->x < x2 && c->x > x1 && !(c->pad || c->pin)) {
+					move_corner(c, l->s->x, c->y);
+				}
+				if (c->x == l->s->x) {
+					/* FIXME: if the line is split, we have to re-canonicalize
+					   both segments. */
+					return split_line(l, c);
+				}
+			}
+		}
+	}
+	else if (l->s->y == l->e->y) {
+		int x1 = l->s->x;
+		int x2 = l->e->x;
+		int y1 = l->s->y - l->line->Thickness / 2;
+		int y2 = l->s->y + l->line->Thickness / 2;
+		if (x1 > x2) {
+			int t = x1;
+			x1 = x2;
+			x2 = t;
+		}
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if ((x1 < c->x && c->x < x2)
+					&& intersecting_layers(l->layer, c->layer)) {
+				if (c->y != l->s->y && c->y < y2 && c->y > y1 && !(c->pad || c->pin)) {
+					move_corner(c, c->x, l->s->y);
+				}
+				if (c->y == l->s->y) {
+					/* FIXME: Likewise.  */
+					return split_line(l, c);
+				}
+			}
+		}
+	}
+	else {
+		/* diagonal lines.  Let's try to split them at pins/vias
+		   anyway.  */
+		int x1 = l->s->x;
+		int x2 = l->e->x;
+		int y1 = l->s->y;
+		int y2 = l->e->y;
+		if (x1 > x2) {
+			int t = x1;
+			x1 = x2;
+			x2 = t;
+		}
+		if (y1 > y2) {
+			int t = y1;
+			y1 = y2;
+			y2 = t;
+		}
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if (!c->via && !c->pin)
+				continue;
+			if ((x1 < c->x && c->x < x2)
+					&& (y1 < c->y && c->y < y2)
+					&& intersecting_layers(l->layer, c->layer)) {
+				pcb_pstk_t *p = c->pin ? c->pin : c->via;
+				int th = djmax(p->BoundingBox.X2 - p->BoundingBox.X1, p->BoundingBox.Y2 - p->BoundingBox.Y1);
+				th /= 2;
+				if (dist(l->s->x, l->s->y, c->x, c->y) > th
+						&& dist(l->e->x, l->e->y, c->x, c->y) > th && pcb_pstk_intersect_line(p, l->line)) {
+					return split_line(l, c);
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+/* Make sure all vias are at line end points */
+static int canonicalize_lines()
+{
+	int changes = 0;
+	int count;
+	line_s *l;
+	while (1) {
+		count = 0;
+		for (l = lines; l; l = l->next) {
+			if (DELETED(l))
+				continue;
+			count += canonicalize_line(l);
+		}
+		changes += count;
+		if (count == 0)
+			break;
+	}
+	return changes;
+}
+
+static int simple_optimize_corner(corner_s * c)
+{
+	int i;
+	int rv = 0;
+
+	check(c, 0);
+	if (c->via) {
+		/* see if no via is needed */
+		if (selected(c->via))
+			dprintf("via check: line[0] layer %d at %#mD nl %d\n", c->lines[0]->layer, c->x, c->y, c->n_lines);
+		/* We can't delete vias that connect to power planes, or vias
+		   have terminal name (assume they're test points).  */
+		if (!PCB_FLAG_THERM_TEST_ANY(c->via) && (c->via->term == NULL)) {
+			for (i = 1; i < c->n_lines; i++) {
+				if (selected(c->via))
+					dprintf("           line[%d] layer %d %#mD to %#mD\n",
+									i, c->lines[i]->layer, c->lines[i]->s->x, c->lines[i]->s->y, c->lines[i]->e->x, c->lines[i]->e->y);
+				if (c->lines[i]->layer != c->lines[0]->layer)
+					break;
+			}
+			if (i == c->n_lines) {
+				if (selected(c->via))
+					dprintf("           remove it\n");
+				remove_via_at(c);
+				rv++;
+			}
+		}
+	}
+
+	check(c, 0);
+	if (c->n_lines == 2 && !c->via) {
+		/* see if it is an unneeded corner */
+		int o = line_orient(c->lines[0], c);
+		corner_s *c2 = other_corner(c->lines[1], c);
+		corner_s *c0 = other_corner(c->lines[0], c);
+		if (o == line_orient(c->lines[1], c2) && o != DIAGONAL) {
+			dprintf("straight %#mD to %#mD to %#mD\n", c0->x, c0->y, c->x, c->y, c2->x, c2->y);
+			if (selected(c->lines[0]->line))
+				PCB_FLAG_SET(PCB_FLAG_SELECTED, c->lines[1]->line);
+			if (selected(c->lines[1]->line))
+				PCB_FLAG_SET(PCB_FLAG_SELECTED, c->lines[0]->line);
+			move_corner(c, c2->x, c2->y);
+		}
+	}
+	check(c, 0);
+	if (c->n_lines == 1 && !c->via) {
+		corner_s *c0 = other_corner(c->lines[0], c);
+		if (abs(c->x - c0->x) + abs(c->y - c0->y) <= LONGEST_FRECKLE) {
+			/*
+			 * Remove this line, as it is a "freckle".  A freckle is an extremely
+			 * short line (around 0.01 thou) that is unconnected at one end.
+			 * Freckles are almost insignificantly small, but are annoying as
+			 * they prevent the mitering optimiser from working.
+			 * Freckles sometimes arise because of a bug in the autorouter that
+			 * causes it to create small overshoots (typically 0.01 thou) at the
+			 * intersections of vertical and horizontal lines. These overshoots
+			 * are converted to freckles as a side effect of canonicalize_line().
+			 * Note that canonicalize_line() is not at fault, the bug is in the
+			 * autorouter creating overshoots.
+			 * The autorouter bug arose some time between the 20080202 and 20091103
+			 * releases.
+			 * This code is probably worth keeping even when the autorouter bug is
+			 * fixed, as "freckles" could conceivably arise in other ways.
+			 */
+			dprintf("freckle %#mD to %#mD\n", c->x, c->y, c0->x, c0->y);
+			move_corner(c, c0->x, c0->y);
+		}
+	}
+	check(c, 0);
+	return rv;
+}
+
+/* We always run these */
+static int simple_optimizations()
+{
+	corner_s *c;
+	int rv = 0;
+
+	/* Look for corners that aren't */
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (c->pad || c->pin)
+			continue;
+		rv += simple_optimize_corner(c);
+	}
+	return rv;
+}
+
+static int is_hole(corner_s * c)
+{
+	return c->pin || c->pad || c->via;
+}
+
+static int orthopull_1(corner_s * c, int fdir, int rdir, int any_sel)
+{
+	static corner_s **cs = 0;
+	static int cm = 0;
+	static line_s **ls = 0;
+	static int lm = 0;
+	int i, li, ln, cn, snap;
+	line_s *l = 0;
+	corner_s *c2, *cb;
+	int adir = 0, sdir = 0, pull;
+	int saw_sel = 0, saw_auto = 0;
+	int max, len = 0, r1 = 0, r2;
+	rect_s rr;
+	int edir = 0, done;
+
+	if (cs == 0) {
+		cs = (corner_s **) malloc(10 * sizeof(corner_s));
+		cm = 10;
+		ls = (line_s **) malloc(10 * sizeof(line_s));
+		lm = 10;
+	}
+
+	for (i = 0; i < c->n_lines; i++) {
+		int o = line_orient(c->lines[i], c);
+		if (o == rdir)
+			return 0;
+	}
+
+	switch (fdir) {
+	case RIGHT:
+		adir = DOWN;
+		sdir = UP;
+		break;
+	case DOWN:
+		adir = RIGHT;
+		sdir = LEFT;
+		break;
+	default:
+		dj_abort("fdir not right or down\n");
+	}
+
+	c2 = c;
+	cn = 0;
+	ln = 0;
+	pull = 0;
+	while (c2) {
+		if (c2->pad || c2->pin || c2->n_lines < 2)
+			return 0;
+		if (cn >= cm) {
+			cm = cn + 10;
+			cs = (corner_s **) realloc(cs, cm * sizeof(corner_s));
+		}
+		cs[cn++] = c2;
+		r2 = corner_radius(c2);
+		if (r1 < r2)
+			r1 = r2;
+		l = 0;
+		for (i = 0; i < c2->n_lines; i++) {
+			int o = line_orient(c2->lines[i], c2);
+			if (o == DIAGONAL)
+				return 0;
+			if (o == fdir) {
+				if (l)
+					return 0;							/* we don't support overlapping lines yet */
+				l = c2->lines[i];
+			}
+			if (o == rdir && c2->lines[i] != ls[ln - 1])
+				return 0;								/* likewise */
+			if (o == adir)
+				pull++;
+			if (o == sdir)
+				pull--;
+		}
+		if (!l)
+			break;
+		if (selected(l->line))
+			saw_sel = 1;
+		if (autorouted(l->line))
+			saw_auto = 1;
+		if (ln >= lm) {
+			lm = ln + 10;
+			ls = (line_s **) realloc(ls, lm * sizeof(line_s));
+		}
+		ls[ln++] = l;
+		c2 = other_corner(l, c2);
+	}
+	if (cn < 2 || pull == 0)
+		return 0;
+	if (any_sel && !saw_sel)
+		return 0;
+	if (!any_sel && conf_djopt.plugins.djopt.auto_only && !saw_auto)
+		return 0;
+
+	/* Ok, now look for other blockages. */
+
+	empty_rect(&rr);
+	add_point_to_rect(&rr, c->x, c->y, corner_radius(c));
+	add_point_to_rect(&rr, c2->x, c2->y, corner_radius(c2));
+
+	if (fdir == RIGHT && pull < 0)
+		edir = UP;
+	else if (fdir == RIGHT && pull > 0)
+		edir = DOWN;
+	else if (fdir == DOWN && pull < 0)
+		edir = LEFT;
+	else if (fdir == DOWN && pull > 0)
+		edir = RIGHT;
+
+	max = -1;
+	for (i = 0; i < cn; i++)
+		for (li = 0; li < cs[i]->n_lines; li++) {
+			if (line_orient(cs[i]->lines[li], cs[i]) != edir)
+				continue;
+			len = line_length(cs[i]->lines[li]);
+			if (max > len || max == -1)
+				max = len;
+		}
+	dprintf("c %s %4#mD  cn %d pull %3d  max %4#mS\n", fdir == RIGHT ? "right" : "down ", c->x, c->y, cn, pull, max);
+
+	switch (edir) {
+	case UP:
+		rr.y1 = c->y - r1 - max;
+		break;
+	case DOWN:
+		rr.y2 = c->y + r1 + max;
+		break;
+	case LEFT:
+		rr.x1 = c->x - r1 - max;
+		break;
+	case RIGHT:
+		rr.x2 = c->x + r1 + max;
+		break;
+	}
+	rr.x1 -= SB + 1;
+	rr.x2 += SB + 1;
+	rr.y1 -= SB + 1;
+	rr.y2 += SB + 1;
+
+	snap = 0;
+	for (cb = corners; cb; cb = cb->next) {
+		int sep;
+		if (DELETED(cb))
+			continue;
+		r1 = corner_radius(cb);
+		if (cb->net == c->net && !cb->pad)
+			continue;
+		if (!pin_in_rect(&rr, cb->x, cb->y, r1))
+			continue;
+		switch (edir) {
+#define ECHK(X,Y,LT) \
+	  for (i=0; i<cn; i++) \
+	    { \
+	      if (!intersecting_layers(cs[i]->layer, cb->layer)) \
+		continue; \
+	      r2 = corner_radius(cs[i]); \
+	      if (cb->X + r1 <= cs[i]->X - r2 - SB - 1) \
+		continue; \
+	      if (cb->X - r1 >= cs[i]->X + r2 + SB + 1) \
+		continue; \
+	      if (cb->Y LT cs[i]->Y) \
+		continue; \
+	      sep = djabs(cb->Y - cs[i]->Y) - r1 - r2 - SB - 1; \
+	      if (max > sep) \
+		{ max = sep; snap = 1; }\
+	    } \
+	  for (i=0; i<ln; i++) \
+	    { \
+	      if (!intersecting_layers(ls[i]->layer, cb->layer)) \
+		continue; \
+	      if (cb->X <= cs[i]->X || cb->X >= cs[i+1]->X) \
+		continue; \
+	      sep = (djabs(cb->Y - cs[i]->Y) - ls[i]->line->Thickness/2 \
+		     - r1 - SB - 1); \
+	      if (max > sep) \
+		{ max = sep; snap = 1; }\
+	    }
+		case UP:
+			ECHK(x, y, >=);
+			break;
+		case DOWN:
+			ECHK(x, y, <=);
+			break;
+		case LEFT:
+			ECHK(y, x, >=);
+			break;
+		case RIGHT:
+			ECHK(y, x, <=);
+			break;
+		}
+	}
+
+	/* We must now check every line segment against our corners.  */
+	for (l = lines; l; l = l->next) {
+		int o, x1, x2, y1, y2;
+		if (DELETED(l))
+			continue;
+		dprintf("check line %#mD to %#mD\n", l->s->x, l->s->y, l->e->x, l->e->y);
+		if (l->s->net == c->net) {
+			dprintf("  same net\n");
+			continue;
+		}
+		o = line_orient(l, 0);
+		/* We don't need to check perpendicular lines, because their
+		   corners already take care of it.  */
+		if ((fdir == RIGHT && (o == UP || o == DOWN))
+				|| (fdir == DOWN && (o == RIGHT || o == LEFT))) {
+			dprintf("  perpendicular\n");
+			continue;
+		}
+
+		/* Choose so that x1,y1 is closest to corner C */
+		if ((fdir == RIGHT && l->s->x < l->e->x)
+				|| (fdir == DOWN && l->s->y < l->e->y)) {
+			x1 = l->s->x;
+			y1 = l->s->y;
+			x2 = l->e->x;
+			y2 = l->e->y;
+		}
+		else {
+			x1 = l->e->x;
+			y1 = l->e->y;
+			x2 = l->s->x;
+			y2 = l->s->y;
+		}
+
+		/* Eliminate all lines outside our range */
+		if ((fdir == RIGHT && (x2 < c->x || x1 > c2->x))
+				|| (fdir == DOWN && (y2 < c->y || y1 > c2->y))) {
+			dprintf("  outside our range\n");
+			continue;
+		}
+
+		/* Eliminate all lines on the wrong side of us */
+		if ((edir == UP && y1 > c->y && y2 > c->y)
+				|| (edir == DOWN && y1 < c->y && y2 < c->y)
+				|| (edir == LEFT && x1 > c->x && x2 > c->x)
+				|| (edir == RIGHT && x1 < c->x && x2 < c->x)) {
+			dprintf("  wrong side\n");
+			continue;
+		}
+
+		/* For now, cheat on diagonals */
+		switch (edir) {
+		case RIGHT:
+			if (x1 > x2)
+				x1 = x2;
+			break;
+		case LEFT:
+			if (x1 < x2)
+				x1 = x2;
+			break;
+		case DOWN:
+			if (y1 > y2)
+				y1 = y2;
+			break;
+		case UP:
+			if (y1 < y2)
+				y1 = y2;
+			break;
+		}
+
+		/* Ok, now see how far we can get for each of our corners. */
+		for (i = 0; i < cn; i++) {
+			int r = l->line->Thickness + SB + corner_radius(cs[i]) + 1;
+			int len = 0;
+			if ((fdir == RIGHT && (x2 < cs[i]->x || x1 > cs[i]->x))
+					|| (fdir == DOWN && (y2 < cs[i]->y || y1 > cs[i]->y)))
+				continue;
+			if (!intersecting_layers(cs[i]->layer, l->layer))
+				continue;
+			switch (edir) {
+			case RIGHT:
+				len = x1 - c->x;
+				break;
+			case LEFT:
+				len = c->x - x1;
+				break;
+			case DOWN:
+				len = y1 - c->y;
+				break;
+			case UP:
+				len = c->y - y1;
+				break;
+			}
+			len -= r;
+			dprintf("  len is %#mS vs corner at %#mD\n", len, cs[i]->x, cs[i]->y);
+			if (len <= 0)
+				return 0;
+			if (max > len)
+				max = len;
+		}
+
+	}
+
+	/* We must make sure that if a segment isn't being completely
+	   removed, that any vias and/or pads don't overlap.  */
+	done = 0;
+	while (!done) {
+		done = 1;
+		for (i = 0; i < cn; i++)
+			for (li = 0; li < cs[i]->n_lines; li++) {
+				line_s *l = cs[i]->lines[li];
+				corner_s *oc = other_corner(l, cs[i]);
+				if (line_orient(l, cs[i]) != edir)
+					continue;
+				len = line_length(l);
+				if (!oc->pad || !cs[i]->via) {
+					if (!is_hole(l->s) || !is_hole(l->e))
+						continue;
+					if (len == max)
+						continue;
+				}
+				len -= corner_radius(l->s);
+				len -= corner_radius(l->e);
+				len -= SB + 1;
+				if (max > len) {
+					max = len;
+					done = 0;
+				}
+			}
+	}
+
+	if (max <= 0)
+		return 0;
+	switch (edir) {
+	case UP:
+		len = c->y - max;
+		break;
+	case DOWN:
+		len = c->y + max;
+		break;
+	case LEFT:
+		len = c->x - max;
+		break;
+	case RIGHT:
+		len = c->x + max;
+		break;
+	}
+	if (snap && max > conf_core.editor.grid) {
+		if (pull < 0)
+			len += conf_core.editor.grid - 1;
+		len = gridsnap(len);
+	}
+	if ((fdir == RIGHT && len == cs[0]->y) || (fdir == DOWN && len == cs[0]->x))
+		return 0;
+	for (i = 0; i < cn; i++) {
+		if (fdir == RIGHT) {
+			max = len - cs[i]->y;
+			move_corner(cs[i], cs[i]->x, len);
+		}
+		else {
+			max = len - cs[i]->x;
+			move_corner(cs[i], len, cs[i]->y);
+		}
+	}
+	return max * pull;
+}
+
+static int orthopull()
+{
+	/* Look for straight runs which could be moved to reduce total trace
+	   length.  */
+	int any_sel = any_line_selected();
+	corner_s *c;
+	int rv = 0;
+
+	for (c = corners; c;) {
+		if (DELETED(c))
+			continue;
+		if (c->pin || c->pad) {
+			c = c->next;
+			continue;
+		}
+		next_corner = c;
+		rv += orthopull_1(c, RIGHT, LEFT, any_sel);
+		if (c != next_corner) {
+			c = next_corner;
+			continue;
+		}
+		rv += orthopull_1(c, DOWN, UP, any_sel);
+		if (c != next_corner) {
+			c = next_corner;
+			continue;
+		}
+		c = c->next;
+	}
+	if (rv)
+		pcb_printf("orthopull: %ml mils saved\n", rv);
+	return rv;
+}
+
+static int debumpify()
+{
+	/* Look for "U" shaped traces we can shorten (or eliminate) */
+	int rv = 0;
+	int any_selected = any_line_selected();
+	line_s *l, *l1, *l2;
+	corner_s *c, *c1, *c2;
+	rect_s rr, rp;
+	int o, o1, o2, step, w;
+	for (l = lines; l; l = l->next) {
+		if (DELETED(l))
+			continue;
+		if (!l->line)
+			continue;
+		if (any_selected && !selected(l->line))
+			continue;
+		if (!any_selected && conf_djopt.plugins.djopt.auto_only && !autorouted(l->line))
+			continue;
+		if (l->s->pin || l->s->pad || l->e->pin || l->e->pad)
+			continue;
+		o = line_orient(l, 0);
+		if (o == DIAGONAL)
+			continue;
+		l1 = other_line(l->s, l);
+		if (!l1)
+			continue;
+		o1 = line_orient(l1, l->s);
+		l2 = other_line(l->e, l);
+		if (!l2)
+			continue;
+		o2 = line_orient(l2, l->e);
+		if (ORIENT(o) == ORIENT(o1) || o1 != o2 || o1 == DIAGONAL)
+			continue;
+
+		dprintf("\nline: %#mD to %#mD\n", l->s->x, l->s->y, l->e->x, l->e->y);
+		w = l->line->Thickness / 2 + SB + 1;
+		empty_rect(&rr);
+		add_line_to_rect(&rr, l1);
+		add_line_to_rect(&rr, l2);
+		if (rr.x1 != l->s->x && rr.x1 != l->e->x)
+			rr.x1 -= w;
+		if (rr.x2 != l->s->x && rr.x2 != l->e->x)
+			rr.x2 += w;
+		if (rr.y1 != l->s->y && rr.y1 != l->e->y)
+			rr.y1 -= w;
+		if (rr.y2 != l->s->y && rr.y2 != l->e->y)
+			rr.y2 += w;
+		dprintf("range: x %#mS..%#mS y %#mS..%#mS\n", rr.x1, rr.x2, rr.y1, rr.y2);
+
+		c1 = other_corner(l1, l->s);
+		c2 = other_corner(l2, l->e);
+
+		empty_rect(&rp);
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if (c->net != l->s->net && intersecting_layers(c->layer, l->s->layer))
+				add_corner_to_rect_if(&rp, c, &rr);
+		}
+		if (rp.x1 == INT_MAX) {
+			rp.x1 = rr.x2;
+			rp.x2 = rr.x1;
+			rp.y1 = rr.y2;
+			rp.y2 = rr.y1;
+		}
+		dprintf("pin r: x %#mS..%#mS y %#mS..%#mS\n", rp.x1, rp.x2, rp.y1, rp.y2);
+
+		switch (o1) {
+		case LEFT:
+			step = l->s->x - rp.x2 - w;
+			step = gridsnap(step);
+			if (step > l->s->x - c1->x)
+				step = l->s->x - c1->x;
+			if (step > l->s->x - c2->x)
+				step = l->s->x - c2->x;
+			if (step > 0) {
+				dprintf("left step %#mS at %#mD\n", step, l->s->x, l->s->y);
+				move_corner(l->s, l->s->x - step, l->s->y);
+				move_corner(l->e, l->e->x - step, l->e->y);
+				rv += step;
+			}
+			break;
+		case RIGHT:
+			step = rp.x1 - l->s->x - w;
+			step = gridsnap(step);
+			if (step > c1->x - l->s->x)
+				step = c1->x - l->s->x;
+			if (step > c2->x - l->s->x)
+				step = c2->x - l->s->x;
+			if (step > 0) {
+				dprintf("right step %#mS at %#mD\n", step, l->s->x, l->s->y);
+				move_corner(l->s, l->s->x + step, l->s->y);
+				move_corner(l->e, l->e->x + step, l->e->y);
+				rv += step;
+			}
+			break;
+		case UP:
+			if (rp.y2 == INT_MIN)
+				rp.y2 = rr.y1;
+			step = trim_step(l->s->y - rp.y2 - w, l->s->y - c1->y, l->s->y - c2->y);
+			if (step > 0) {
+				dprintf("up step %#mS at %#mD\n", step, l->s->x, l->s->y);
+				move_corner(l->s, l->s->x, l->s->y - step);
+				move_corner(l->e, l->e->x, l->e->y - step);
+				rv += step;
+			}
+			break;
+		case DOWN:
+			step = rp.y1 - l->s->y - w;
+			step = gridsnap(step);
+			if (step > c1->y - l->s->y)
+				step = c1->y - l->s->y;
+			if (step > c2->y - l->s->y)
+				step = c2->y - l->s->y;
+			if (step > 0) {
+				dprintf("down step %#mS at %#mD\n", step, l->s->x, l->s->y);
+				move_corner(l->s, l->s->x, l->s->y + step);
+				move_corner(l->e, l->e->x, l->e->y + step);
+				rv += step;
+			}
+			break;
+		}
+		check(0, l);
+	}
+
+	rv += simple_optimizations();
+	if (rv)
+		pcb_printf("debumpify: %ml mils saved\n", rv / 50);
+	return rv;
+}
+
+static int simple_corner(corner_s * c)
+{
+	int o1, o2;
+	if (c->pad || c->pin || c->via)
+		return 0;
+	if (c->n_lines != 2)
+		return 0;
+	o1 = line_orient(c->lines[0], c);
+	o2 = line_orient(c->lines[1], c);
+	if (ORIENT(o1) == ORIENT(o2))
+		return 0;
+	if (ORIENT(o1) == DIAGONAL || ORIENT(o2) == DIAGONAL)
+		return 0;
+	return 1;
+}
+
+static int unjaggy_once()
+{
+	/* Look for sequences of simple corners we can reduce. */
+	int rv = 0;
+	corner_s *c, *c0, *c1, *cc;
+	int l, w, sel = any_line_selected();
+	int o0, o1, s0, s1;
+	rect_s rr, rp;
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (!simple_corner(c))
+			continue;
+		if (!c->lines[0]->line || !c->lines[1]->line)
+			continue;
+		if (sel && !(selected(c->lines[0]->line)
+								 || selected(c->lines[1]->line)))
+			continue;
+		if (!sel && conf_djopt.plugins.djopt.auto_only && !(autorouted(c->lines[0]->line)
+																		 || autorouted(c->lines[1]->line)))
+			continue;
+		dprintf("simple at %#mD\n", c->x, c->y);
+
+		c0 = other_corner(c->lines[0], c);
+		o0 = line_orient(c->lines[0], c);
+		s0 = simple_corner(c0);
+
+		c1 = other_corner(c->lines[1], c);
+		o1 = line_orient(c->lines[1], c);
+		s1 = simple_corner(c1);
+
+		if (!s0 && !s1)
+			continue;
+		dprintf("simples at %#mD\n", c->x, c->y);
+
+		w = 1;
+		for (l = 0; l < c0->n_lines; l++)
+			if (c0->lines[l] != c->lines[0]
+					&& c0->lines[l]->layer == c->lines[0]->layer) {
+				int o = line_orient(c0->lines[l], c0);
+				if (o == o1)
+					w = 0;
+			}
+		for (l = 0; l < c1->n_lines; l++)
+			if (c1->lines[l] != c->lines[0]
+					&& c1->lines[l]->layer == c->lines[0]->layer) {
+				int o = line_orient(c1->lines[l], c1);
+				if (o == o0)
+					w = 0;
+			}
+		if (!w)
+			continue;
+		dprintf("orient ok\n");
+
+		w = c->lines[0]->line->Thickness / 2 + SB + 1;
+		empty_rect(&rr);
+		add_line_to_rect(&rr, c->lines[0]);
+		add_line_to_rect(&rr, c->lines[1]);
+		if (c->x != rr.x1)
+			rr.x1 -= w;
+		else
+			rr.x2 += w;
+		if (c->y != rr.y1)
+			rr.y1 -= w;
+		else
+			rr.y2 += w;
+
+		empty_rect(&rp);
+		for (cc = corners; cc; cc = cc->next) {
+			if (DELETED(cc))
+				continue;
+			if (cc->net != c->net && intersecting_layers(cc->layer, c->layer))
+				add_corner_to_rect_if(&rp, cc, &rr);
+		}
+		dprintf("rp x %#mS..%#mS  y %#mS..%#mS\n", rp.x1, rp.x2, rp.y1, rp.y2);
+		if (rp.x1 <= rp.x2)					/* something triggered */
+			continue;
+
+		dprintf("unjaggy at %#mD layer %d\n", c->x, c->y, c->layer);
+		if (c->x == c0->x)
+			move_corner(c, c1->x, c0->y);
+		else
+			move_corner(c, c0->x, c1->y);
+		rv++;
+		check(c, 0);
+	}
+	rv += simple_optimizations();
+	check(c, 0);
+	return rv;
+}
+
+static int unjaggy()
+{
+	int i, r = 0, j;
+	for (i = 0; i < 100; i++) {
+		j = unjaggy_once();
+		if (j == 0)
+			break;
+		r += j;
+	}
+	if (r)
+		printf("%d unjagg%s    \n", r, r == 1 ? "y" : "ies");
+	return r;
+}
+
+static int vianudge()
+{
+	/* Look for vias with all lines leaving the same way, try to nudge
+	   via to eliminate one or more of them. */
+	int rv = 0;
+	corner_s *c, *c2, *c3;
+	line_s *l;
+	unsigned char directions[PCB_MAX_LAYER];
+	unsigned char counts[PCB_MAX_LAYER];
+
+	memset(directions, 0, sizeof(directions));
+	memset(counts, 0, sizeof(counts));
+
+	for (c = corners; c; c = c->next) {
+		int o, i, vr, cr, oboth;
+		int len = 0, saved = 0;
+
+		if (DELETED(c))
+			continue;
+
+		if (!c->via)
+			continue;
+
+		memset(directions, 0, sizeof(directions));
+		memset(counts, 0, sizeof(counts));
+
+		for (i = 0; i < c->n_lines; i++) {
+			o = line_orient(c->lines[i], c);
+			counts[c->lines[i]->layer]++;
+			directions[c->lines[i]->layer] |= o;
+		}
+		for (o = 0, i = 0; i < pcb_max_layer; i++) {
+			if (!(pcb_layer_flags(PCB, i) & PCB_LYT_COPPER))
+				continue;
+			if (counts[i] == 1) {
+				o = directions[i];
+				break;
+			}
+		}
+		switch (o) {
+		case LEFT:
+		case RIGHT:
+			oboth = LEFT | RIGHT;
+			break;
+		case UP:
+		case DOWN:
+			oboth = UP | DOWN;
+			break;
+		default:
+			continue;
+		}
+		for (i = 0; i < pcb_max_layer; i++) {
+			if (!(pcb_layer_flags(PCB, i) & PCB_LYT_COPPER))
+				continue;
+			if (counts[i] && directions[i] != o && directions[i] != oboth)
+				goto vianudge_continue;
+		}
+		c2 = 0;
+		for (i = 0; i < c->n_lines; i++) {
+			int ll = line_length(c->lines[i]);
+			if (line_orient(c->lines[i], c) != o) {
+				saved--;
+				continue;
+			}
+			saved++;
+			if (c2 == 0 || len > ll) {
+				len = ll;
+				c2 = other_corner(c->lines[i], c);
+			}
+		}
+		if (c2->pad || c2->pin || c2->via)
+			continue;
+
+		/* Now look for clearance in the new position */
+		vr = djmax(c->via->BoundingBox.X2 - c->via->BoundingBox.X1, c->via->BoundingBox.Y2 - c->via->BoundingBox.Y1);
+		vr = vr / 2 + SB + 1;
+		for (c3 = corners; c3; c3 = c3->next) {
+			if (DELETED(c3))
+				continue;
+			if ((c3->net != c->net && (c3->pin || c3->via)) || c3->pad) {
+				cr = corner_radius(c3);
+				if (dist(c2->x, c2->y, c3->x, c3->y) < vr + cr)
+					goto vianudge_continue;
+			}
+		}
+		for (l = lines; l; l = l->next) {
+			if (DELETED(l))
+				continue;
+			if (l->s->net != c->net) {
+				int ld = dist_line_to_point(l, c2);
+				if (ld < l->line->Thickness / 2 + vr)
+					goto vianudge_continue;
+			}
+		}
+
+		/* at this point, we know we can move it */
+
+		dprintf("vianudge: nudging via at %#mD by %#mS saving %#mS\n", c->x, c->y, len, saved);
+		rv += len * saved;
+		move_corner(c, c2->x, c2->y);
+
+		check(c, 0);
+
+	vianudge_continue:
+		continue;
+	}
+
+	if (rv)
+		pcb_printf("vianudge: %ml mils saved\n", rv);
+	return rv;
+}
+
+static int viatrim()
+{
+	/* Look for traces that can be moved to the other side of the board,
+	   to reduce the number of vias needed.  For now, we look for simple
+	   lines, not multi-segmented lines.  */
+	line_s *l, *l2;
+	int i, rv = 0, vrm = 0;
+	int any_sel = any_line_selected();
+
+	for (l = lines; l; l = l->next) {
+		rect_s r;
+		int my_layer, other_layer;
+
+		if (DELETED(l))
+			continue;
+		if (!l->s->via)
+			continue;
+		if (!l->e->via)
+			continue;
+		if (any_sel && !selected(l->line))
+			continue;
+		if (!any_sel && conf_djopt.plugins.djopt.auto_only && !autorouted(l->line))
+			continue;
+
+		my_layer = l->layer;
+		other_layer = -1;
+		dprintf("line %p on layer %d from %#mD to %#mD\n", (void *) l, l->layer, l->s->x, l->s->y, l->e->x, l->e->y);
+		for (i = 0; i < l->s->n_lines; i++)
+			if (l->s->lines[i] != l) {
+				if (other_layer == -1) {
+					other_layer = l->s->lines[i]->layer;
+					dprintf("noting other line %p on layer %d\n", (void *) (l->s->lines[i]), my_layer);
+				}
+				else if (l->s->lines[i]->layer != other_layer) {
+					dprintf("saw other line %p on layer %d (not %d)\n", (void *) (l->s->lines[i]), l->s->lines[i]->layer, my_layer);
+					other_layer = -1;
+					goto viatrim_other_corner;
+				}
+			}
+	viatrim_other_corner:
+		if (other_layer == -1)
+			for (i = 0; i < l->e->n_lines; i++)
+				if (l->e->lines[i] != l) {
+					if (other_layer == -1) {
+						other_layer = l->s->lines[i]->layer;
+						dprintf("noting other line %p on layer %d\n", (void *) (l->s->lines[i]), my_layer);
+					}
+					else if (l->e->lines[i]->layer != other_layer) {
+						dprintf("saw end line on layer %d (not %d)\n", l->e->lines[i]->layer, other_layer);
+						goto viatrim_continue;
+					}
+				}
+
+		/* Now see if any other line intersects us.  We don't need to
+		   check corners, because they'd either be pins/vias and
+		   already conflict, or pads, which we'll check here anyway.  */
+		empty_rect(&r);
+		add_point_to_rect(&r, l->s->x, l->s->y, l->line->Thickness);
+		add_point_to_rect(&r, l->e->x, l->e->y, l->line->Thickness);
+
+		for (l2 = lines; l2; l2 = l2->next) {
+			if (DELETED(l2))
+				continue;
+			if (l2->s->net != l->s->net && l2->layer == other_layer) {
+				dprintf("checking other line %#mD to %#mD\n", l2->s->x, l2->s->y, l2->e->x, l2->e->y);
+				if (line_in_rect(&r, l2)) {
+					dprintf("line from %#mD to %#mD in the way\n", l2->s->x, l2->s->y, l2->e->x, l2->e->y);
+					goto viatrim_continue;
+				}
+			}
+		}
+
+		if (l->layer == other_layer)
+			continue;
+		move_line_to_layer(l, other_layer);
+		rv++;
+
+	viatrim_continue:
+		continue;
+	}
+	vrm = simple_optimizations();
+	if (rv > 0)
+		printf("viatrim: %d traces moved, %d vias removed\n", rv, vrm);
+	return rv + vrm;
+}
+
+static int automagic()
+{
+	int more = 1, oldmore = 0;
+	int toomany = 100;
+	while (more != oldmore && --toomany) {
+		oldmore = more;
+		more += debumpify();
+		more += unjaggy();
+		more += orthopull();
+		more += vianudge();
+		more += viatrim();
+	}
+	return more - 1;
+}
+
+static int miter()
+{
+	corner_s *c;
+	int done, progress;
+	int sel = any_line_selected();
+	int saved = 0;
+
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		c->miter = 0;
+		if (c->n_lines == 2 && !c->via && !c->pin && !c->via) {
+			int o1 = line_orient(c->lines[0], c);
+			int o2 = line_orient(c->lines[1], c);
+			if (ORIENT(o1) != ORIENT(o2)
+					&& o1 != DIAGONAL && o2 != DIAGONAL && c->lines[0]->line->Thickness == c->lines[1]->line->Thickness)
+				c->miter = -1;
+		}
+	}
+
+	done = 0;
+	progress = 1;
+	while (!done && progress) {
+		done = 1;
+		progress = 0;
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if (c->miter == -1) {
+				int max = line_length(c->lines[0]);
+				int len = line_length(c->lines[1]);
+				int bloat;
+				int ref, dist;
+				corner_s *closest_corner = 0, *c2, *oc1, *oc2;
+				int mx = 0, my = 0, x, y;
+				int o1 = line_orient(c->lines[0], c);
+				int o2 = line_orient(c->lines[1], c);
+
+				if (c->pad || c->pin || c->via) {
+					c->miter = 0;
+					progress = 1;
+					continue;
+				}
+
+				oc1 = other_corner(c->lines[0], c);
+				oc2 = other_corner(c->lines[1], c);
+#if 0
+				if (oc1->pad)
+					oc1 = 0;
+				if (oc2->pad)
+					oc2 = 0;
+#endif
+
+				if ((sel && !(selected(c->lines[0]->line)
+											|| selected(c->lines[1]->line)))
+						|| (!sel && conf_djopt.plugins.djopt.auto_only && !(autorouted(c->lines[0]->line)
+																						 || autorouted(c->lines[1]->line)))) {
+					c->miter = 0;
+					progress = 1;
+					continue;
+				}
+
+				if (max > len)
+					max = len;
+				switch (o1) {
+				case LEFT:
+					mx = -1;
+					break;
+				case RIGHT:
+					mx = 1;
+					break;
+				case UP:
+					my = -1;
+					break;
+				case DOWN:
+					my = 1;
+					break;
+				}
+				switch (o2) {
+				case LEFT:
+					mx = -1;
+					break;
+				case RIGHT:
+					mx = 1;
+					break;
+				case UP:
+					my = -1;
+					break;
+				case DOWN:
+					my = 1;
+					break;
+				}
+				ref = c->x * mx + c->y * my;
+				dist = max;
+
+				bloat = (c->lines[0]->line->Thickness / 2 + SB + 1) * 3 / 2;
+
+				for (c2 = corners; c2; c2 = c2->next) {
+					if (DELETED(c2))
+						continue;
+					if (c2 != c && c2 != oc1 && c2 != oc2
+							&& c->x * mx <= c2->x * mx
+							&& c->y * my <= c2->y * my && c->net != c2->net && intersecting_layers(c->layer, c2->layer)) {
+						int cr = corner_radius(c2);
+						len = c2->x * mx + c2->y * my - ref - cr - bloat;
+						if (c->x != c2->x && c->y != c2->y)
+							len -= cr;
+						if (len < dist || (len == dist && c->miter != -1)) {
+							dist = len;
+							closest_corner = c2;
+						}
+					}
+				}
+
+				if (closest_corner && closest_corner->miter == -1) {
+					done = 0;
+					continue;
+				}
+
+#if 0
+				if (dist < conf_core.editor.grid) {
+					c->miter = 0;
+					progress = 1;
+					continue;
+				}
+
+				dist -= dist % conf_core.editor.grid;
+#endif
+				if (dist <= 0) {
+					c->miter = 0;
+					progress = 1;
+					continue;
+				}
+
+				x = c->x;
+				y = c->y;
+				switch (o1) {
+				case LEFT:
+					x -= dist;
+					break;
+				case RIGHT:
+					x += dist;
+					break;
+				case UP:
+					y -= dist;
+					break;
+				case DOWN:
+					y += dist;
+					break;
+				}
+				c2 = find_corner(x, y, c->layer);
+				if (c2 != other_corner(c->lines[0], c))
+					split_line(c->lines[0], c2);
+				x = c->x;
+				y = c->y;
+				switch (o2) {
+				case LEFT:
+					x -= dist;
+					break;
+				case RIGHT:
+					x += dist;
+					break;
+				case UP:
+					y -= dist;
+					break;
+				case DOWN:
+					y += dist;
+					break;
+				}
+				move_corner(c, x, y);
+				c->miter = 0;
+				c2->miter = 0;
+				progress = 1;
+				saved++;
+			}
+		}
+	}
+	return saved;
+}
+
+static void classify_corner(corner_s * c, int this_net)
+{
+	int i;
+	if (c->net == this_net)
+		return;
+	c->net = this_net;
+	for (i = 0; i < c->n_lines; i++)
+		classify_corner(other_corner(c->lines[i], c), this_net);
+}
+
+static void classify_nets()
+{
+	static int this_net = 1;
+	corner_s *c;
+
+	for (c = corners; c; c = c->next) {
+		if (DELETED(c))
+			continue;
+		if (c->net)
+			continue;
+		classify_corner(c, this_net);
+		this_net++;
+	}
+}
+
+#if 0
+static void nudge_corner(corner_s * c, int dx, int dy, corner_s * prev_corner)
+{
+	int ox = c->x;
+	int oy = c->y;
+	int l;
+	if (prev_corner && (c->pin || c->pad))
+		return;
+	move_corner(c, ox + dx, oy + dy);
+	for (l = 0; l < c->n_lines; l++) {
+		corner_s *oc = other_corner(c->lines[l], c);
+		if (oc == prev_corner)
+			continue;
+		if (dx && oc->x == ox)
+			nudge_corner(oc, dx, 0, c);
+		if (dy && oc->y == oy)
+			nudge_corner(oc, 0, dy, c);
+	}
+}
+#endif
+
+static line_s *choose_example_line(corner_s * c1, corner_s * c2)
+{
+	int ci, li;
+	corner_s *c[2];
+	c[0] = c1;
+	c[1] = c2;
+	dprintf("choose_example_line\n");
+	for (ci = 0; ci < 2; ci++)
+		for (li = 0; li < c[ci]->n_lines; li++) {
+			dprintf("  try[%d,%d] \033[36m<%#mD-%#mD t%#mS c%#mS f%s>\033[0m\n",
+							ci, li,
+							c[ci]->lines[li]->s->x, c[ci]->lines[li]->s->y,
+							c[ci]->lines[li]->e->x, c[ci]->lines[li]->e->y,
+							c[ci]->lines[li]->line->Thickness,
+							c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_OBJ_LINE, NULL, 0));
+			/* Pads are disqualified, as we want to mimic a trace line. */
+			if (c[ci]->lines[li]->line == (pcb_line_t *) c[ci]->pad) {
+				dprintf("  bad, pad\n");
+				continue;
+			}
+			/* Lines on layers that don't connect to the other pad are bad too.  */
+			if (!intersecting_layers(c[ci]->lines[li]->layer, c[1 - ci]->layer)) {
+				dprintf("  bad, layers\n");
+				continue;
+			}
+			dprintf("  good\n");
+			return c[ci]->lines[li];
+		}
+	dprintf("choose_example_line: none found!\n");
+	return 0;
+}
+
+static int connect_corners(corner_s * c1, corner_s * c2)
+{
+	int layer;
+	line_s *ex = choose_example_line(c1, c2);
+	pcb_line_t *example = ex->line;
+
+	dprintf
+		("connect_corners \033[32m%#mD to %#mD, example line %#mD to %#mD l%d\033[0m\n",
+		 c1->x, c1->y, c2->x, c2->y, ex->s->x, ex->s->y, ex->e->x, ex->e->y, ex->layer);
+
+	layer = ex->layer;
+
+	/* Assume c1 is the moveable one.  */
+	if (!(c1->pin || c1->pad || c1->via) && c1->n_lines == 1) {
+		int nx, ny;
+		/* Extend the line */
+		if (c1->lines[0]->s->x == c1->lines[0]->e->x)
+			nx = c1->x, ny = c2->y;
+		else
+			nx = c2->x, ny = c1->y;
+		if (nx != c2->x || ny != c2->y) {
+			move_corner(c1, nx, ny);
+			new_line(c1, c2, layer, example);
+			return 1;
+		}
+		else {
+			move_corner(c1, nx, ny);
+			return 1;
+		}
+	}
+	else {
+		corner_s *nc = find_corner(c1->x, c2->y, layer);
+		new_line(c1, nc, layer, example);
+		new_line(nc, c2, layer, example);
+		return 0;
+	}
+}
+
+static void pinsnap()
+{
+	corner_s *c;
+	int best_dist[PCB_MAX_LAYER + 1];
+	corner_s *best_c[PCB_MAX_LAYER + 1];
+	int l, got_one;
+	int left = 0, right = 0, top = 0, bottom = 0;
+	pcb_pstk_t *pin;
+	int again = 1;
+
+	int close = 0;
+	corner_s *c2;
+
+	memset(best_c, 0, sizeof(best_c));
+	memset(best_dist, 0, sizeof(best_dist));
+
+	/* Look for pins that have no connections.  See if there's a corner
+	   close by that should be connected to it.  This usually happens
+	   when the MUCS router needs to route to an off-grid pin.  */
+	while (again) {
+		again = 0;
+		for (c = corners; c; c = c->next) {
+			if (DELETED(c))
+				continue;
+			if (!(c->pin || c->via || c->pad))
+				continue;
+
+			pin = NULL;
+
+			dprintf("\ncorner %s\n", corner_name(c));
+			if (c->pin) pin = c->pin;
+			if (c->via) pin = c->via;
+			if (c->pad) pin = c->pad;
+			left = pin->BoundingBox.X1;
+			right = pin->BoundingBox.X2;
+			top = pin->BoundingBox.Y1;
+			bottom = pin->BoundingBox.Y2;
+
+			dprintf("%s x %#mS-%#mS y %#mS-%#mS\n", corner_name(c), left, right, bottom, top);
+			for (l = 0; l <= pcb_max_layer; l++) {
+				if (!(pcb_layer_flags(PCB, l) & PCB_LYT_COPPER))
+					continue;
+				best_dist[l] = close * 2;
+				best_c[l] = 0;
+			}
+			got_one = 0;
+			for (c2 = corners; c2; c2 = c2->next) {
+				int lt;
+				pcb_coord_t thick;
+
+				if (DELETED(c2))
+					continue;
+				thick = djmax(pin->BoundingBox.X2 - pin->BoundingBox.X1, pin->BoundingBox.Y2 - pin->BoundingBox.Y1);
+				lt = corner_radius(c2);
+				if (c2->n_lines && c2 != c && !(c2->pin || c2->pad || c2->via)
+						&& intersecting_layers(c->layer, c2->layer)
+						&& c2->x >= left - lt && c2->x <= right + lt && c2->y >= bottom - lt && c2->y <= top + lt) {
+					int d = dist(c->x, c->y, c2->x, c2->y);
+					if (pin && d > thick / 2 + lt)
+						continue;
+					if (c2->n_lines == 1) {
+						got_one++;
+						dprintf("found orphan %s vs %s\n", corner_name(c2), corner_name(c));
+						connect_corners(c, c2);
+						again = 1;
+						continue;
+					}
+					if (best_c[c2->layer] == 0 || c2->n_lines < best_c[c2->layer]->n_lines || (d < best_dist[c2->layer]
+																																										 && c2->n_lines <=
+																																										 best_c[c2->layer]->n_lines)) {
+						best_dist[c2->layer] = d;
+						best_c[c2->layer] = c2;
+						dprintf("layer %d best now %s\n", c2->layer, corner_name(c2));
+					}
+				}
+				if (!got_one && c->n_lines == (c->pad ? 1 : 0)) {
+					for (l = 0; l <= pcb_max_layer; l++)
+						if (best_c[l])
+							dprintf("best[%d] = %s\n", l, corner_name(best_c[l]));
+					for (l = 0; l <= pcb_max_layer; l++)
+						if (best_c[l]) {
+							dprintf("move %s to %s\n", corner_name(best_c[l]), corner_name(c));
+							connect_corners(best_c[l], c);
+							again = 1;
+							continue;
+						}
+				}
+			}
+		}
+	}
+
+	/* Now look for line ends that don't connect, see if they need to be
+	   extended to intersect another line.  */
+	for (c = corners; c; c = c->next) {
+		line_s *l, *t;
+		int lo;
+
+		if (DELETED(c))
+			continue;
+		if (c->pin || c->via || c->pad)
+			continue;
+		if (c->n_lines != 1)
+			continue;
+
+		l = c->lines[0];
+		lo = line_orient(l, c);
+		dprintf("line end %#mD orient %d\n", c->x, c->y, lo);
+
+		for (t = lines; t; t = t->next) {
+			if (DELETED(t))
+				continue;
+			if (t->layer != c->lines[0]->layer)
+				continue;
+			switch (lo) {							/* remember, orient is for the line relative to the corner */
+			case LEFT:
+				if (t->s->x == t->e->x
+						&& c->x < t->s->x
+						&& t->s->x < c->x + (l->line->Thickness + t->line->Thickness) / 2 && ((t->s->y < c->y && c->y < t->e->y)
+																																									|| (t->e->y < c->y && c->y < t->s->y))) {
+					dprintf("found %#mD - %#mD\n", t->s->x, t->s->y, t->e->x, t->e->y);
+					move_corner(c, t->s->x, c->y);
+				}
+				break;
+			case RIGHT:
+				if (t->s->x == t->e->x
+						&& c->x > t->s->x
+						&& t->s->x > c->x - (l->line->Thickness + t->line->Thickness) / 2 && ((t->s->y < c->y && c->y < t->e->y)
+																																									|| (t->e->y < c->y && c->y < t->s->y))) {
+					dprintf("found %#mD - %#mD\n", t->s->x, t->s->y, t->e->x, t->e->y);
+					move_corner(c, t->s->x, c->y);
+				}
+				break;
+			case UP:
+				if (t->s->y == t->e->y
+						&& c->y < t->s->y
+						&& t->s->y < c->y + (l->line->Thickness + t->line->Thickness) / 2 && ((t->s->x < c->x && c->x < t->e->x)
+																																									|| (t->e->x < c->x && c->x < t->s->x))) {
+					dprintf("found %#mD - %#mD\n", t->s->x, t->s->y, t->e->x, t->e->y);
+					move_corner(c, c->x, t->s->y);
+				}
+				break;
+			case DOWN:
+				if (t->s->y == t->e->y
+						&& c->y > t->s->y
+						&& t->s->y > c->y - (l->line->Thickness + t->line->Thickness) / 2 && ((t->s->x < c->x && c->x < t->e->x)
+																																									|| (t->e->x < c->x && c->x < t->s->x))) {
+					dprintf("found %#mD - %#mD\n", t->s->x, t->s->y, t->e->x, t->e->y);
+					move_corner(c, c->x, t->s->y);
+				}
+				break;
+			}
+		}
+	}
+}
+
+static int pstk_orient(pcb_pstk_t *p)
+{
+	pcb_coord_t dx = p->BoundingBox.X2 - p->BoundingBox.X1;
+	pcb_coord_t dy = p->BoundingBox.Y2 - p->BoundingBox.Y1;
+	if (dx < dy * 3)
+		return O_VERT;
+	if (dx > dy * 3)
+		return O_HORIZ;
+	return DIAGONAL;
+}
+
+static void padcleaner_(pcb_data_t *data)
+{
+	line_s *l, *nextl;
+	rect_s r;
+
+	dprintf("\ndj: padcleaner\n");
+	for (l = lines; l; l = nextl) {
+		nextl = l->next;
+
+		if (l->is_pad)
+			continue;
+
+		if (DELETED(l))
+			continue;
+
+		dprintf("dj: line %p\n", (void *) l);
+		check(0, l);
+
+		if (l->s->pad && l->s->pad == l->e->pad)
+			continue;
+
+		PCB_PADSTACK_LOOP(data);
+		{
+			pcb_pstk_shape_t *shape = NULL;
+
+			/* check if the padstack has copper on the given side */
+			switch(layer_type[l->layer]) {
+				case LT_SOLDER:     shape = pcb_pstk_shape(padstack, PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0); break;
+				case LT_COMPONENT:  shape = pcb_pstk_shape(padstack, PCB_LYT_TOP | PCB_LYT_COPPER, 0); break;
+			}
+			if (shape == NULL)
+				continue;
+
+			empty_rect(&r);
+			add_point_to_rect(&r, padstack->BoundingBox.X1, padstack->BoundingBox.Y1, 0);
+			add_point_to_rect(&r, padstack->BoundingBox.X2, padstack->BoundingBox.Y2, 0);
+			if (pin_in_rect(&r, l->s->x, l->s->y, 0)
+					&& pin_in_rect(&r, l->e->x, l->e->y, 0)
+					&& ORIENT(line_orient(l, 0)) == pstk_orient(padstack)) {
+				dprintf
+					("padcleaner %#mD-%#mD vs line %#mD-%#mD %#mS\n",
+					 padstack->BoundingBox.X1, padstack->BoundingBox.Y1, padstack->BoundingBox.X2, padstack->BoundingBox.Y2,
+					 l->s->x, l->s->y, l->e->x, l->e->y, l->line->Thickness);
+				remove_line(l);
+				goto next_line;
+			}
+		}
+		PCB_END_LOOP;
+	next_line:;
+	}
+}
+
+static void padcleaner(void)
+{
+	padcleaner_(PCB->Data);
+	PCB_SUBC_LOOP(PCB->Data); {
+		padcleaner_(subc->data);
+	} PCB_END_LOOP;
+}
+
+
+static void grok_layer_groups()
+{
+	int i, j, f;
+	pcb_layer_stack_t *l = &(PCB->LayerGroups);
+
+	solder_layer = component_layer = -1;
+	for (i = 0; i < pcb_max_layer; i++) {
+		layer_type[i] = 0;
+		layer_groupings[i] = 0;
+	}
+	for (i = 0; i < pcb_max_group(PCB); i++) {
+		f = 0;
+		for (j = 0; j < l->grp[i].len; j++) {
+			unsigned int lflg = pcb_layer_flags(PCB, l->grp[i].lid[j]);
+			if (lflg & PCB_LYT_BOTTOM)
+				f |= LT_SOLDER;
+			if (lflg & PCB_LYT_TOP)
+				f |= LT_COMPONENT;
+		}
+		for (j = 0; j < l->grp[i].len; j++) {
+			if (l->grp[i].lid[j] < pcb_max_layer) {
+				layer_type[l->grp[i].lid[j]] |= f;
+				layer_groupings[l->grp[i].lid[j]] = i;
+				if (solder_layer == -1 && f == LT_SOLDER)
+					solder_layer = l->grp[i].lid[j];
+				if (component_layer == -1 && f == LT_COMPONENT)
+					component_layer = l->grp[i].lid[j];
+			}
+		}
+	}
+}
+
+static const char pcb_acts_DJopt[] =
+	"djopt(debumpify|unjaggy|simple|vianudge|viatrim|orthopull)\n" "djopt(auto) - all of the above\n" "djopt(miter)";
+
+static const char pcb_acth_DJopt[] = "Perform various optimizations on the current board.";
+
+/* %start-doc actions djopt
+
+The different types of optimizations change your board in order to
+reduce the total trace length and via count.
+
+@table @code
+
+@item debumpify
+Looks for U-shaped traces that can be shortened or eliminated.
+
+@item unjaggy
+Looks for corners which could be flipped to eliminate one or more
+corners (i.e. jaggy lines become simpler).
+
+@item simple
+Removing uneeded vias, replacing two or more trace segments in a row
+with a single segment.  This is usually performed automatically after
+other optimizations.
+
+@item vianudge
+Looks for vias where all traces leave in the same direction.  Tries to
+move via in that direction to eliminate one of the traces (and thus a
+corner).
+
+@item viatrim
+Looks for traces that go from via to via, where moving that trace to a
+different layer eliminates one or both vias.
+
+@item orthopull
+Looks for chains of traces all going in one direction, with more
+traces orthogonal on one side than on the other.  Moves the chain in
+that direction, causing a net reduction in trace length, possibly
+eliminating traces and/or corners.
+
+@item splitlines
+Looks for lines that pass through vias, pins, or pads, and splits them
+into separate lines so they can be managed separately.
+
+@item auto
+Performs the above options, repeating until no further optimizations
+can be made.
+
+@item miter
+Replaces 90 degree corners with a pair of 45 degree corners, to reduce
+RF losses and trace length.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_DJopt(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *arg = NULL;
+	int layn, saved = 0;
+	corner_s *c;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, DJopt, arg = argv[1].val.str);
+
+#ifdef ENDIF
+	SwitchDrawingWindow(PCB->Zoom, Output.drawing_area->window, conf_core.editor.show_solder_side, pcb_false);
+#endif
+
+	pcb_event(PCB_EVENT_BUSY, NULL);
+
+	lines = 0;
+	corners = 0;
+
+	grok_layer_groups();
+
+	PCB_SUBC_LOOP(PCB->Data);
+		PCB_PADSTACK_LOOP(subc->data);
+		{
+			pcb_pstk_proto_t *proto;
+			proto = pcb_pstk_get_proto(padstack);
+			if (proto == NULL)
+				continue;
+
+			c = find_corner(padstack->x, padstack->y, -1);
+			if (proto->hdia <= 0)
+				c->pad = padstack;
+			else
+				c->pin = padstack;
+		}
+		PCB_END_LOOP;
+	PCB_END_LOOP;
+
+	PCB_PADSTACK_LOOP(PCB->Data);
+	/* hace don't mess with vias that have thermals */
+	/* but then again don't bump into them if (!PCB_FLAG_TEST(ALLTHERMFLAGS, via)) */
+	{
+		c = find_corner(padstack->x, padstack->y, -1);
+		c->via = padstack;
+	}
+	PCB_END_LOOP;
+
+	check(0, 0);
+
+	if (PCB_NSTRCMP(arg, "splitlines") == 0) {
+		if (canonicalize_lines())
+			pcb_undo_inc_serial();
+		return 0;
+	}
+
+	for (layn = 0; layn < pcb_max_layer; layn++) {
+		pcb_layer_t *layer = LAYER_PTR(layn);
+
+		if (!(pcb_layer_flags(PCB, layn) & PCB_LYT_COPPER))
+			continue;
+
+		PCB_LINE_LOOP(layer);
+		{
+			line_s *ls;
+
+			if (conf_djopt.plugins.djopt.auto_only && !autorouted(line))
+				continue;
+
+			if (line->Point1.X == line->Point2.X && line->Point1.Y == line->Point2.Y) {
+				pcb_line_destroy(layer, line);
+				continue;
+			}
+
+			ls = (line_s *) malloc(sizeof(line_s));
+			ls->next = lines;
+			lines = ls;
+			ls->is_pad = 0;
+			ls->s = find_corner(line->Point1.X, line->Point1.Y, layn);
+			ls->e = find_corner(line->Point2.X, line->Point2.Y, layn);
+			ls->line = line;
+			add_line_to_corner(ls, ls->s);
+			add_line_to_corner(ls, ls->e);
+			ls->layer = layn;
+		}
+		PCB_END_LOOP;
+	}
+
+	check(0, 0);
+	pinsnap();
+	canonicalize_lines();
+	check(0, 0);
+	classify_nets();
+	/*dump_all(); */
+	check(0, 0);
+
+	if (PCB_NSTRCMP(arg, "debumpify") == 0)
+		saved += debumpify();
+	else if (PCB_NSTRCMP(arg, "unjaggy") == 0)
+		saved += unjaggy();
+	else if (PCB_NSTRCMP(arg, "simple") == 0)
+		saved += simple_optimizations();
+	else if (PCB_NSTRCMP(arg, "vianudge") == 0)
+		saved += vianudge();
+	else if (PCB_NSTRCMP(arg, "viatrim") == 0)
+		saved += viatrim();
+	else if (PCB_NSTRCMP(arg, "orthopull") == 0)
+		saved += orthopull();
+	else if (PCB_NSTRCMP(arg, "auto") == 0)
+		saved += automagic();
+	else if (PCB_NSTRCMP(arg, "miter") == 0)
+		saved += miter();
+	else {
+		printf("unknown command: %s\n", arg);
+		return 1;
+	}
+
+	padcleaner();
+
+	check(0, 0);
+	if (saved)
+		pcb_undo_inc_serial();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t djopt_action_list[] = {
+	{"djopt", pcb_act_DJopt, pcb_acth_DJopt, pcb_acts_DJopt}
+};
+
+PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie)
+
+int pplg_check_ver_djopt(int ver_needed) { return 0; }
+
+void pplg_uninit_djopt(void)
+{
+	pcb_remove_actions_by_cookie(djopt_cookie);
+	conf_unreg_fields("plugins/djopt/");
+}
+
+#include "dolists.h"
+int pplg_init_djopt(void)
+{
+	PCB_API_CHK_VER;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_djopt, field,isarray,type_name,cpath,cname,desc,flags);
+#include "djopt_conf_fields.h"
+
+	PCB_REGISTER_ACTIONS(djopt_action_list, djopt_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/djopt/djopt.h
===================================================================
--- tags/2.0.1/src_plugins/djopt/djopt.h	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/djopt.h	(revision 18980)
@@ -0,0 +1,41 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2003 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#ifndef	PCB_DJOPT_H
+#define	PCB_DJOPT_H
+
+#include "config.h"
+
+fgw_error_t pcb_act_DJopt(int, char **, pcb_coord_t, pcb_coord_t);
+int djopt_set_auto_only(int, char **, pcb_coord_t, pcb_coord_t);
+#endif
Index: tags/2.0.1/src_plugins/djopt/djopt.pup
===================================================================
--- tags/2.0.1/src_plugins/djopt/djopt.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/djopt.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short djopt board optimization
+$long Various board optimization algorithms.
+$package extra
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/djopt/djopt_conf.h
===================================================================
--- tags/2.0.1/src_plugins/djopt/djopt_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/djopt/djopt_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_DJOPT_CONF_H
+#define PCB_DJOPT_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct djopt {
+			CFT_BOOLEAN auto_only;         /* Operate on autorouted tracks only */
+		} djopt;
+	} plugins;
+} conf_djopt_t;
+
+#endif
Index: tags/2.0.1/src_plugins/draw_csect/Makefile
===================================================================
--- tags/2.0.1/src_plugins/draw_csect/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_csect/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_draw_csect
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/draw_csect/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/draw_csect/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_csect/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {draw_csect}
+append /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/draw_csect/draw_csect.o
+@]
+
+switch /local/pcb/draw_csect/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/draw_csect/draw_csect.c
===================================================================
--- tags/2.0.1/src_plugins/draw_csect/draw_csect.c	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_csect/draw_csect.c	(revision 18980)
@@ -0,0 +1,929 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* draw cross section */
+#include "config.h"
+
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "plugins.h"
+#include "stub_draw.h"
+#include "compat_misc.h"
+#include "actions.h"
+#include "event.h"
+#include "layer_vis.h"
+
+#include "obj_text_draw.h"
+#include "obj_line_draw.h"
+
+extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
+
+static const char *COLOR_ANNOT = "#000000";
+static const char *COLOR_BG = "#f0f0f0";
+
+static const char *COLOR_COPPER = "#C05020";
+static const char *COLOR_SUBSTRATE = "#E0D090";
+static const char *COLOR_SILK = "#000000";
+static const char *COLOR_MASK = "#30d030";
+static const char *COLOR_PASTE = "#60e0e0";
+static const char *COLOR_MISC = "#e0e000";
+static const char *COLOR_OUTLINE = "#000000";
+
+static pcb_layer_id_t drag_lid = -1;
+static pcb_layergrp_id_t drag_gid = -1, drag_gid_subst = -1;
+
+#define GROUP_WIDTH_MM 75
+
+/* Draw a text at x;y sized scale percentage */
+static pcb_text_t *dtext(int x, int y, int scale, int dir, const char *txt)
+{
+	static pcb_text_t t;
+
+	t.X = PCB_MM_TO_COORD(x);
+	t.Y = PCB_MM_TO_COORD(y);
+	t.TextString = (char *)txt;
+	t.Direction = dir;
+	t.Scale = scale;
+	t.fid = 0; /* use the default font */
+	t.Flags = pcb_no_flags();
+	pcb_text_draw_(&t, 0, 0, PCB_TXT_TINY_ACCURATE);
+	return &t;
+}
+
+/* Draw a text at x;y sized scale percentage */
+static pcb_text_t *dtext_(pcb_coord_t x, pcb_coord_t y, int scale, int dir, const char *txt, pcb_coord_t th)
+{
+	static pcb_text_t t;
+
+	t.X = x;
+	t.Y = y;
+	t.TextString = (char *)txt;
+	t.Direction = dir;
+	t.Scale = scale;
+	t.fid = 0; /* use the default font */
+	t.Flags = pcb_no_flags();
+	pcb_text_draw_(&t, th, 0, PCB_TXT_TINY_ACCURATE);
+	return &t;
+}
+
+/* Draw a text at x;y with a background */
+static pcb_text_t *dtext_bg(pcb_hid_gc_t gc, int x, int y, int scale, int dir, const char *txt, const char *bgcolor, const char *fgcolor)
+{
+	static pcb_text_t t;
+
+	t.X = PCB_MM_TO_COORD(x);
+	t.Y = PCB_MM_TO_COORD(y);
+	t.TextString = (char *)txt;
+	t.Direction = dir;
+	t.Scale = scale;
+	t.fid = 0; /* use the default font */
+	t.Flags = pcb_no_flags();
+
+	if (pcb_gui->gui) { /* it is unreadable on black&white and on most exporters */
+		pcb_gui->set_color(gc, bgcolor);
+		pcb_text_draw_(&t, 1000000, 0, PCB_TXT_TINY_ACCURATE);
+	}
+
+	pcb_gui->set_color(gc, fgcolor);
+	pcb_text_draw_(&t, 0, 0, PCB_TXT_TINY_ACCURATE);
+
+	return &t;
+}
+
+/* draw a line of a specific thickness */
+static void dline(int x1, int y1, int x2, int y2, float thick)
+{
+	pcb_line_t l;
+	l.Point1.X = PCB_MM_TO_COORD(x1);
+	l.Point1.Y = PCB_MM_TO_COORD(y1);
+	l.Point2.X = PCB_MM_TO_COORD(x2);
+	l.Point2.Y = PCB_MM_TO_COORD(y2);
+	l.Thickness = PCB_MM_TO_COORD(thick);
+	if (l.Thickness == 0)
+		l.Thickness = 1;
+	pcb_line_draw_(&l, 0);
+}
+
+/* draw a line of a specific thickness */
+static void dline_(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, float thick)
+{
+	pcb_line_t l;
+	l.Point1.X = x1;
+	l.Point1.Y = y1;
+	l.Point2.X = x2;
+	l.Point2.Y = y2;
+	l.Thickness = PCB_MM_TO_COORD(thick);
+	if (l.Thickness == 0)
+		l.Thickness = 1;
+	pcb_line_draw_(&l, 0);
+}
+
+
+/* draw a line clipped with two imaginary vertical lines at cx1 and cx2 */
+static void dline_vclip(int x1, int y1, int x2, int y2, float thick, int cx1, int cx2)
+{
+	if (cx2 < cx1) { /* make sure cx2 > cx1 */
+		int tmp;
+		tmp = cx1;
+		cx1 = cx2;
+		cx2 = tmp;
+	}
+
+	if (x2 == x1) { /* do not clip vertical lines */
+		if ((x1 >= cx1) && (x1 <= cx2))
+			dline(x1, y1, x2, y2, thick);
+		return;
+	}
+
+	if (x2 < x1) { /* make sure x2 > x1 */
+		int tmp;
+		tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+		tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+
+	/* clip */
+	if (x2 > cx2) {
+		y2 = (double)(cx2 - x1) / (double)(x2 - x1) * (double)(y2 - y1) + y1;
+		x2 = cx2;
+	}
+	if (x1 < cx1) {
+		y1 = (double)(cx1 - x1) / (double)(x2 - x1) * (double)(y2 - y1) + y1;
+		x1 = cx1;
+	}
+
+	dline(x1, y1, x2, y2, thick);
+}
+
+
+/* Draw a 45-deg hactched box wihtout the rectangle;
+   if step > 0 use \ hatching, else use / */
+static void hatch_box(int x1, int y1, int x2, int y2, float thick, int step)
+{
+	int n, h = y2 - y1;
+
+	if (step > 0)
+		for(n = x1 - h; n <= x2; n += step)
+			dline_vclip(n, y1, n+h, y2, thick,  x1, x2);
+	else
+		for(n = x2; n >= x1-h; n += step)
+			dline_vclip(n+h, y1, n, y2, thick,  x1, x2);
+}
+
+enum {
+	OMIT_NONE = 0,
+	OMIT_TOP = 1,
+	OMIT_BOTTOM = 2,
+	OMIT_LEFT = 4,
+	OMIT_RIGHT = 8,
+	OMIT_ALL = 1|2|4|8
+};
+
+/* draw a hatched rectangle; to turn off hatching in a directon set the
+   corresponding step to 0 */
+static void dhrect(int x1, int y1, int x2, int y2, float thick_rect, float thick_hatch, int step_fwd, int step_back, unsigned omit)
+{
+	if (!(omit & OMIT_TOP))
+		dline(x1, y1, x2, y1, thick_rect);
+	if (!(omit & OMIT_RIGHT))
+		dline(x2, y1, x2, y2, thick_rect);
+	if (!(omit & OMIT_BOTTOM))
+		dline(x1, y2, x2, y2, thick_rect);
+	if (!(omit & OMIT_LEFT))
+		dline(x1, y1, x1, y2, thick_rect);
+
+	if (step_fwd > 0)
+		hatch_box(x1, y1, x2, y2, thick_hatch, +step_fwd);
+
+	if (step_back > 0)
+		hatch_box(x1, y1, x2, y2, thick_hatch, -step_back);
+}
+
+static pcb_box_t btn_addgrp, btn_delgrp, btn_addlayer, btn_dellayer, btn_addoutline;
+static pcb_box_t layer_crd[PCB_MAX_LAYER];
+static pcb_box_t group_crd[PCB_MAX_LAYERGRP];
+static pcb_box_t outline_crd;
+static char layer_valid[PCB_MAX_LAYER];
+static char group_valid[PCB_MAX_LAYERGRP];
+static char outline_valid;
+
+static void reg_layer_coords(pcb_layer_id_t lid, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	if ((lid < 0) || (lid >= PCB_MAX_LAYER))
+		return;
+	layer_crd[lid].X1 = x1;
+	layer_crd[lid].Y1 = y1;
+	layer_crd[lid].X2 = x2;
+	layer_crd[lid].Y2 = y2;
+	layer_valid[lid] = 1;
+}
+
+static void reg_group_coords(pcb_layergrp_id_t gid, pcb_coord_t y1, pcb_coord_t y2)
+{
+	if ((gid < 0) || (gid >= PCB_MAX_LAYER))
+		return;
+	group_crd[gid].Y1 = y1;
+	group_crd[gid].Y2 = y2;
+	group_valid[gid] = 1;
+}
+
+static void reg_outline_coords(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	outline_crd.X1 = x1;
+	outline_crd.Y1 = y1;
+	outline_crd.X2 = x2;
+	outline_crd.Y2 = y2;
+	outline_valid = 1;
+}
+
+static void reset_layer_coords(void)
+{
+	memset(layer_valid, 0, sizeof(layer_valid));
+	memset(group_valid, 0, sizeof(group_valid));
+	outline_valid = 0;
+}
+
+static pcb_layer_id_t get_layer_coords(pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_layer_id_t n;
+
+	for(n = 0; n < PCB_MAX_LAYER; n++) {
+		if (!layer_valid[n]) continue;
+		if ((layer_crd[n].X1 <= x) && (layer_crd[n].Y1 <= y) &&
+		    (layer_crd[n].X2 >= x) && (layer_crd[n].Y2 >= y))
+			return n;
+	}
+	return -1;
+}
+
+static pcb_layergrp_id_t get_group_coords(pcb_coord_t y, pcb_coord_t *y1, pcb_coord_t *y2)
+{
+	pcb_layergrp_id_t n;
+
+	for(n = 0; n < PCB_MAX_LAYERGRP; n++) {
+		if (!group_valid[n]) continue;
+		if ((group_crd[n].Y1 <= y) && (group_crd[n].Y2 >= y)) {
+			*y1 = group_crd[n].Y1;
+			*y2 = group_crd[n].Y2;
+			return n;
+		}
+	}
+	return -1;
+}
+
+static pcb_coord_t create_button(pcb_hid_gc_t gc, int x, int y, const char *label, pcb_box_t *box)
+{
+	pcb_text_t *t;
+	t = dtext_bg(gc, x, y, 200, 0, label, COLOR_BG, COLOR_ANNOT);
+	pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+	dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE);
+	box->X1 = t->BoundingBox.X1;
+	box->Y1 = PCB_MM_TO_COORD(y);
+	box->X2 = t->BoundingBox.X2+PCB_MM_TO_COORD(1);
+	box->Y2 = PCB_MM_TO_COORD(y+4);
+	return PCB_COORD_TO_MM(box->X2);
+}
+
+static int is_button(int x, int y, const pcb_box_t *box)
+{
+	return (x >= box->X1) && (x <= box->X2) && (y >= box->Y1) && (y <= box->Y2);
+}
+
+static pcb_hid_gc_t csect_gc;
+
+static pcb_coord_t ox, oy, cx, cy;
+static int drag_addgrp, drag_delgrp, drag_addlayer, drag_dellayer, drag_addoutline;
+static pcb_layergrp_id_t gactive = -1;
+static pcb_layergrp_id_t outline_gactive = -1;
+static pcb_layer_id_t lactive = -1;
+int lactive_idx = -1;
+
+typedef enum {
+	MARK_GRP_FRAME,
+	MARK_GRP_MIDDLE,
+	MARK_GRP_TOP
+} mark_grp_loc_t;
+
+static void mark_grp(pcb_coord_t y, unsigned int accept_mask, mark_grp_loc_t loc)
+{
+	pcb_coord_t y1, y2, x0 = -PCB_MM_TO_COORD(5);
+	pcb_layergrp_id_t g;
+
+	g = get_group_coords(y, &y1, &y2);
+
+	if ((g >= 0) && ((pcb_layergrp_flags(PCB, g) & accept_mask) & accept_mask)) {
+		gactive = g;
+		switch(loc) {
+			case MARK_GRP_FRAME:
+				dline_(x0, y1, PCB_MM_TO_COORD(200), y1, 0.1);
+				dline_(x0, y2, PCB_MM_TO_COORD(200), y2, 0.1);
+				break;
+			case MARK_GRP_MIDDLE:
+				dline_(x0, (y1+y2)/2, PCB_MM_TO_COORD(200), (y1+y2)/2, 0.1);
+				break;
+			case MARK_GRP_TOP:
+				dline_(x0, y1, PCB_MM_TO_COORD(200), y1, 0.1);
+				break;
+		}
+	}
+	else
+		gactive = -1;
+}
+
+static void mark_outline_grp(pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid)
+{
+	if (outline_valid &&
+			(outline_crd.X1 <= x) && (outline_crd.Y1 <= y) &&
+			(outline_crd.X2 >= x) && (outline_crd.Y2 >= y)) {
+		outline_gactive = gid;
+	}
+	else
+		outline_gactive = -1;
+}
+
+static void mark_layer(pcb_coord_t x, pcb_coord_t y)
+{
+	lactive = get_layer_coords(x, y);
+	if (lactive >= 0) {
+		dhrect(
+			PCB_COORD_TO_MM(layer_crd[lactive].X1)-1, PCB_COORD_TO_MM(layer_crd[lactive].Y1)-1,
+			PCB_COORD_TO_MM(layer_crd[lactive].X2)+1, PCB_COORD_TO_MM(layer_crd[lactive].Y2)+1,
+			0.1, 0.1, 3, 3, 0
+		);
+	}
+}
+
+static void mark_layer_order(pcb_coord_t x)
+{
+	pcb_layergrp_t *g;
+	pcb_coord_t tx, ty1, ty2;
+	lactive_idx = -1;
+
+	if ((gactive < 0) || (PCB->LayerGroups.grp[gactive].len < 1))
+		return;
+
+	g = &PCB->LayerGroups.grp[gactive];
+
+	tx = layer_crd[g->lid[0]].X1 - PCB_MM_TO_COORD(1.5);
+	ty1 = layer_crd[g->lid[0]].Y1;
+	ty2 = layer_crd[g->lid[0]].Y2;
+
+	for(lactive_idx = g->len-1; lactive_idx >= 0; lactive_idx--) {
+		pcb_layer_id_t lid = g->lid[lactive_idx];
+		if (x > (layer_crd[lid].X1 + layer_crd[lid].X2)/2) {
+			tx = layer_crd[lid].X2;
+			break;
+		}
+	}
+	dline_(tx, ty1-PCB_MM_TO_COORD(1.5), tx-PCB_MM_TO_COORD(0.75), ty2+PCB_MM_TO_COORD(1.5), 0.1);
+	dline_(tx, ty1-PCB_MM_TO_COORD(1.5), tx+PCB_MM_TO_COORD(0.75), ty2+PCB_MM_TO_COORD(1.5), 0.1);
+	lactive_idx++;
+}
+
+static void draw_hover_label(const char *str)
+{
+	int x0 = PCB_MM_TO_COORD(2.5); /* compensate for the mouse cursor (sort of random) */
+	dtext_(cx+x0, cy, 250, 0, str, PCB_MM_TO_COORD(0.01));
+}
+
+/* Draw the cross-section layer */
+static void draw_csect(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	pcb_layergrp_id_t gid, outline_gid = -1;
+	int ystart = 10, x, y, last_copper_step = 5;
+
+	reset_layer_coords();
+	csect_gc = gc;
+
+	pcb_gui->set_color(gc, COLOR_ANNOT);
+	dtext(0, 0, 500, 0, "Board cross section");
+
+	/* draw physical layers */
+	y = ystart;
+	for(gid = 0; gid < pcb_max_group(PCB); gid++) {
+		int i, stepf = 0, stepb = 0, th;
+		pcb_layergrp_t *g = PCB->LayerGroups.grp + gid;
+		const char *color = "#ff0000";
+
+		if ((!g->valid) || (gid == drag_gid)  || (gid == drag_gid_subst))
+			continue;
+		else if (g->ltype & PCB_LYT_COPPER) {
+			last_copper_step = -last_copper_step;
+			if (last_copper_step > 0)
+				stepf = last_copper_step;
+			else
+				stepb = -last_copper_step;
+			th = 5;
+			color = COLOR_COPPER;
+		}
+		else if (g->ltype & PCB_LYT_SUBSTRATE) {
+			stepf = stepb = 7;
+			th = 10;
+			color = COLOR_SUBSTRATE;
+		}
+		else if (g->ltype & PCB_LYT_SILK) {
+			th = 5;
+			color = COLOR_SILK;
+			stepb = 3;
+		}
+		else if (g->ltype & PCB_LYT_MASK) {
+			th = 5;
+			color = COLOR_MASK;
+			stepb = 9;
+		}
+		else if (g->ltype & PCB_LYT_PASTE) {
+			th = 5;
+			color = COLOR_PASTE;
+			stepf = 9;
+		}
+		else if (g->ltype & PCB_LYT_MISC) {
+			th = 5;
+			color = COLOR_MISC;
+			stepf = 3;
+		}
+		else if (g->ltype & PCB_LYT_OUTLINE) {
+			outline_gid = gid;
+			continue;
+		}
+		else
+			continue;
+
+		pcb_gui->set_color(gc, color);
+		dhrect(0, y, GROUP_WIDTH_MM, y+th,  1, 0.5,  stepf, stepb, OMIT_LEFT | OMIT_RIGHT);
+		dtext_bg(gc, 5, y, 200, 0, g->name, COLOR_BG, COLOR_ANNOT);
+		reg_group_coords(gid, PCB_MM_TO_COORD(y), PCB_MM_TO_COORD(y+th));
+
+
+		/* draw layer names */
+		{
+			x = GROUP_WIDTH_MM + 3;
+			for(i = 0; i < g->len; i++) {
+				pcb_text_t *t;
+				pcb_layer_id_t lid = g->lid[i];
+				pcb_layer_t *l = &PCB->Data->Layer[lid];
+				int redraw_text = 0;
+
+				if (lid == drag_lid)
+					continue;
+				t = dtext_bg(gc, x, y, 200, 0, l->name, COLOR_BG, l->meta.real.color);
+				pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+				if (l->comb & PCB_LYC_SUB) {
+					dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1.2, 0, 0, 0, OMIT_NONE);
+					redraw_text = 1;
+				}
+
+				if (redraw_text)
+					t = dtext_bg(gc, x, y, 200, 0, l->name, COLOR_BG, l->meta.real.color);
+				else
+					dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.25, 0, 0, 0, OMIT_NONE);
+
+				if (l->comb & PCB_LYC_AUTO)
+					dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 0.0, 0, 3, 0, OMIT_ALL);
+
+				reg_layer_coords(lid, t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4));
+				x += PCB_COORD_TO_MM(t->BoundingBox.X2 - t->BoundingBox.X1) + 3;
+			}
+		}
+
+		/* increment y */
+		y += th + 1;
+	}
+
+	/* draw global/special layers */
+	y+=7;
+	if (outline_gid >= 0) {
+		pcb_layergrp_t *g = PCB->LayerGroups.grp + outline_gid;
+		pcb_text_t *t;
+		if (g->len > 0) {
+			pcb_layer_t *l = &PCB->Data->Layer[g->lid[0]];
+			pcb_gui->set_color(gc, l->meta.real.color);
+			t = dtext_bg(gc, 1, y, 200, 0, l->name, COLOR_BG, l->meta.real.color);
+			pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+			dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE);
+			dtext_bg(gc, 1, y, 200, 0, l->name, COLOR_BG, l->meta.real.color);
+			reg_layer_coords(g->lid[0], t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2+PCB_MM_TO_COORD(1), PCB_MM_TO_COORD(y+4));
+		}
+		else {
+			pcb_gui->set_color(gc, COLOR_OUTLINE);
+			t = dtext_bg(gc, 1, y, 200, 0, "<outline>", COLOR_BG, COLOR_OUTLINE);
+			pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+			dhrect(PCB_COORD_TO_MM(t->BoundingBox.X1), y, PCB_COORD_TO_MM(t->BoundingBox.X2)+1, y+4, 1, 0, 0, 0, OMIT_NONE);
+			dtext_bg(gc, 1, y, 200, 0, "<outline>", COLOR_BG, COLOR_OUTLINE);
+		}
+		dline(0, ystart, 0, y+4, 1);
+		reg_outline_coords(t->BoundingBox.X1, PCB_MM_TO_COORD(y), t->BoundingBox.X2, PCB_MM_TO_COORD(y+4));
+	}
+	else {
+		create_button(gc, 2, y, "Create outline", &btn_addoutline);
+	}
+
+	x=30;
+	x = 2 + create_button(gc, x, y, "Add copper group", &btn_addgrp);
+	x = 2 + create_button(gc, x, y, "Del copper group", &btn_delgrp);
+
+	x += 2;
+	x = 2 + create_button(gc, x, y, "Add logical layer", &btn_addlayer);
+	x = 2 + create_button(gc, x, y, "Del logical layer", &btn_dellayer);
+
+
+	if ((drag_lid >= 0) || (drag_addgrp | drag_delgrp | drag_addlayer | drag_dellayer) || (drag_gid >= 0)) {
+		pcb_gui->set_color(gc, "#000000");
+
+		/* draw the actual operation */
+		if (drag_addgrp) {
+			mark_grp(cy, PCB_LYT_SUBSTRATE, MARK_GRP_MIDDLE);
+			draw_hover_label("INSERT GRP");
+		}
+		if (drag_delgrp) {
+			mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_INTERN, MARK_GRP_FRAME);
+			draw_hover_label("DEL GROUP");
+		}
+		if (drag_addlayer) {
+			mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_MASK | PCB_LYT_PASTE | PCB_LYT_SILK, MARK_GRP_FRAME);
+			mark_outline_grp(cx, cy, outline_gid);
+			draw_hover_label("ADD LAYER");
+		}
+		if (drag_dellayer) {
+			mark_layer(cx, cy);
+			draw_hover_label("DEL LAYER");
+		}
+		else if (drag_lid >= 0) {
+			pcb_layer_t *l = &PCB->Data->Layer[drag_lid];
+			draw_hover_label(l->name);
+			mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_MASK | PCB_LYT_PASTE | PCB_LYT_SILK, MARK_GRP_FRAME);
+			mark_outline_grp(cx, cy, outline_gid);
+			mark_layer_order(cx);
+		}
+		else if (drag_gid >= 0) {
+			pcb_layergrp_t *g = &PCB->LayerGroups.grp[drag_gid];
+			const char *name = g->name == NULL ? "<unnamed group>" : g->name;
+			draw_hover_label(name);
+			mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_INTERN, MARK_GRP_TOP);
+			if (gactive < 0)
+				mark_grp(cy, PCB_LYT_COPPER | PCB_LYT_BOTTOM, MARK_GRP_TOP);
+			if (gactive < 0)
+				mark_grp(cy, PCB_LYT_SUBSTRATE, MARK_GRP_TOP);
+		}
+	}
+}
+
+/* Returns 0 if gactive can be removed from its current group */
+static int check_layer_del(pcb_layer_id_t lid)
+{
+	pcb_layergrp_t *grp;
+	unsigned int tflg;
+
+	tflg = pcb_layer_flags(PCB, lid);
+	grp = pcb_get_layergrp(PCB, pcb_layer_get_group(PCB, lid));
+
+	if (grp == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Invalid source group.\n");
+		return -1;
+	}
+
+	if ((tflg & PCB_LYT_SILK) && (grp->len == 1)) {
+		pcb_message(PCB_MSG_ERROR, "Can not remove the last layer of this group because this group must have at least one layer.\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+static void do_move_grp()
+{
+	unsigned int tflg;
+
+	if ((gactive < 0) || (gactive == drag_gid+1))
+		return;
+
+	tflg = pcb_layergrp_flags(PCB, gactive);
+
+	pcb_layergrp_move(PCB, drag_gid, gactive);
+
+	if (drag_gid_subst >= 0) {
+		if ((drag_gid < drag_gid_subst) && (gactive > drag_gid))
+			drag_gid_subst--; /* the move shifted this down one slot */
+
+		if (gactive < drag_gid_subst)
+			drag_gid_subst++; /* the move shifted this up one slot */
+
+		if (tflg & PCB_LYT_COPPER) {
+			if (tflg & PCB_LYT_BOTTOM)
+				pcb_layergrp_move(PCB, drag_gid_subst, gactive);
+			else
+				pcb_layergrp_move(PCB, drag_gid_subst, gactive+1);
+		}
+		else if (tflg & PCB_LYT_SUBSTRATE) {
+			if (gactive < drag_gid)
+				pcb_layergrp_move(PCB, drag_gid_subst, gactive);
+			else
+				pcb_layergrp_move(PCB, drag_gid_subst, gactive-1);
+		}
+	}
+}
+
+
+static pcb_bool mouse_csect(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_bool res = 0;
+	pcb_layer_id_t lid;
+
+	switch(kind) {
+		case PCB_HID_MOUSE_PRESS:
+			if (is_button(x, y, &btn_addoutline)) {
+				drag_addoutline = 1;
+				res = 1;
+				break;
+			}
+			
+			if (is_button(x, y, &btn_addgrp)) {
+				drag_addgrp = 1;
+				res = 1;
+				break;
+			}
+
+			if (is_button(x, y, &btn_delgrp)) {
+				drag_delgrp = 1;
+				res = 1;
+				break;
+			}
+
+			if (is_button(x, y, &btn_addlayer)) {
+				drag_addlayer = 1;
+				res = 1;
+				break;
+			}
+
+			if (is_button(x, y, &btn_dellayer)) {
+				drag_dellayer = 1;
+				res = 1;
+				break;
+			}
+
+			drag_lid = get_layer_coords(x, y);
+			if (drag_lid >= 0) {
+				ox = x;
+				oy = y;
+				res = 1;
+				break;
+			}
+			
+			if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) {
+				pcb_coord_t tmp;
+				pcb_layergrp_id_t gid;
+				gid = get_group_coords(y, &tmp, &tmp);
+				if ((gid >= 0) && (pcb_layergrp_flags(PCB, gid) & PCB_LYT_COPPER) && (pcb_layergrp_flags(PCB, gid) & PCB_LYT_INTERN)) {
+					drag_gid = gid;
+					/* temporary workaround for the restricted setup */
+					if (pcb_layergrp_flags(PCB, gid - 1) & PCB_LYT_SUBSTRATE)
+						drag_gid_subst = gid - 1;
+					else if ((pcb_layergrp_flags(PCB, gid - 1) & PCB_LYT_OUTLINE) && (pcb_layergrp_flags(PCB, gid - 2) & PCB_LYT_SUBSTRATE))
+						drag_gid_subst = gid - 2;
+					res = 1;
+				}
+			}
+			break;
+		case PCB_HID_MOUSE_RELEASE:
+			if (drag_addoutline) {
+				if (is_button(x, y, &btn_addoutline)) {
+					pcb_layergrp_t *g = pcb_get_grp_new_misc(PCB);
+					g->name = pcb_strdup("global_outline");
+					g->ltype = PCB_LYT_OUTLINE;
+					g->valid = 1;
+					g->open = 1;
+
+					outline_gactive = pcb_layergrp_id(PCB, g);
+					pcb_layer_create(PCB, outline_gactive, "outline");
+					pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+				}
+				drag_addoutline = 0;
+				gactive = -1;
+				res = 1;
+			}
+			else if (drag_addgrp) {
+				if (gactive >= 0) {
+					pcb_layergrp_t *g;
+					g = pcb_layergrp_insert_after(PCB, gactive);
+					g->name = NULL;
+					g->ltype = PCB_LYT_INTERN | PCB_LYT_SUBSTRATE;
+					g->valid = 1;
+					g = pcb_layergrp_insert_after(PCB, gactive);
+					g->name = pcb_strdup("Intern");
+					g->ltype = PCB_LYT_INTERN | PCB_LYT_COPPER;
+					g->valid = 1;
+				}
+				drag_addgrp = 0;
+				gactive = -1;
+				res = 1;
+			}
+			else if (drag_delgrp) {
+				if (gactive >= 0) {
+					pcb_layergrp_del(PCB, gactive, 1);
+					if (pcb_layergrp_flags(PCB, gactive) & PCB_LYT_SUBSTRATE)
+						pcb_layergrp_del(PCB, gactive, 1);
+					else if (pcb_layergrp_flags(PCB, gactive-1) & PCB_LYT_SUBSTRATE)
+						pcb_layergrp_del(PCB, gactive-1, 1);
+				}
+				drag_delgrp = 0;
+				gactive = -1;
+				res = 1;
+			}
+			else if (drag_addlayer) {
+				if (gactive >= 0) {
+					pcb_layer_create(PCB, gactive, "New Layer");
+					pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+				}
+				else if (outline_gactive >= 0 && PCB->LayerGroups.grp[outline_gactive].len == 0) {
+					pcb_layer_create(PCB, outline_gactive, "outline");
+					pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+				}
+				drag_addlayer = 0;
+				gactive = -1;
+				res = 1;
+			}
+			else if (drag_dellayer) {
+				if (lactive >= 0) {
+					char tmp[32];
+					sprintf(tmp, "%ld", lactive);
+					pcb_actionl("MoveLayer", tmp, "-1", NULL);
+				}
+				drag_dellayer = 0;
+				lactive = -1;
+				res = 1;
+			}
+			else if (drag_lid >= 0) {
+				if (gactive >= 0) {
+					pcb_layer_t *l = &PCB->Data->Layer[drag_lid];
+					pcb_layergrp_t *g;
+					if (l->meta.real.grp == gactive) { /* move within the group */
+						int d, s, at;
+						g = &PCB->LayerGroups.grp[gactive];
+
+						/* move drag_lid to the end of the list within the group */
+						for(s = d = 0; s < g->len; s++) {
+							if (g->lid[s] != drag_lid) {
+								g->lid[d] = g->lid[s];
+								d++;
+							}
+							else
+								at = s;
+						}
+						g->lid[g->len-1] = drag_lid;
+						if (lactive_idx >= at) /* because lactive_idx was calculated with this layer in the middle */
+							lactive_idx--;
+						goto move_layer_to_its_place;
+					}
+					else if (check_layer_del(drag_lid) == 0) {
+						g = &PCB->LayerGroups.grp[gactive];
+						pcb_layer_move_to_group(PCB, drag_lid, gactive);
+						pcb_message(PCB_MSG_INFO, "moved layer %s to group %d\n", l->name, gactive);
+						move_layer_to_its_place:;
+						if (lactive_idx < g->len-1) {
+							memmove(g->lid + lactive_idx + 1, g->lid + lactive_idx, (g->len - 1 - lactive_idx) * sizeof(pcb_layer_id_t));
+							g->lid[lactive_idx] = drag_lid;
+						}
+						pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+					}
+				}
+				else if (outline_gactive >= 0 && PCB->LayerGroups.grp[outline_gactive].len == 0) {
+					pcb_layer_t *l = &PCB->Data->Layer[drag_lid];
+					pcb_layer_move_to_group(PCB, drag_lid, outline_gactive);
+					pcb_message(PCB_MSG_INFO, "moved layer %s to group %d\n", l->name, outline_gactive);
+				}
+				else
+					pcb_message(PCB_MSG_ERROR, "Can not move layer into that layer group\n");
+				res = 1;
+				drag_lid = -1;
+				gactive = -1;
+			}
+			else if (drag_gid > 0) {
+				do_move_grp();
+				res = 1;
+				drag_gid = -1;
+				drag_gid_subst = -1;
+			}
+			break;
+		case PCB_HID_MOUSE_MOTION:
+			cx = x;
+			cy = y;
+			break;
+		case PCB_HID_MOUSE_POPUP:
+			lid = get_layer_coords(x, y);
+			if (lid >= 0) {
+				pcb_layervis_change_group_vis(lid, 1, 1);
+				pcb_actionl("Popup", "layer", NULL);
+			}
+			else if ((x > 0) && (x < PCB_MM_TO_COORD(GROUP_WIDTH_MM))) {
+				pcb_coord_t tmp;
+				pcb_actd_EditGroup_gid = get_group_coords(y, &tmp, &tmp);
+				if (pcb_actd_EditGroup_gid >= 0)
+					pcb_actionl("Popup", "group", NULL);
+			}
+			break;
+
+	}
+	return res;
+}
+
+
+
+
+static const char pcb_acts_dump_csect[] = "DumpCsect()";
+static const char pcb_acth_dump_csect[] = "Print the cross-section of the board (layer stack)";
+
+static fgw_error_t pcb_act_dump_csect(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layergrp_id_t gid;
+
+	for(gid = 0; gid < pcb_max_group(PCB); gid++) {
+		int i;
+		const char *type_gfx;
+		pcb_layergrp_t *g = PCB->LayerGroups.grp + gid;
+
+		if (!g->valid) {
+			if (g->len <= 0)
+				continue;
+			type_gfx = "old";
+		}
+		else if (g->ltype & PCB_LYT_VIRTUAL) continue;
+		else if (g->ltype & PCB_LYT_COPPER) type_gfx = "====";
+		else if (g->ltype & PCB_LYT_SUBSTRATE) type_gfx = "xxxx";
+		else if (g->ltype & PCB_LYT_SILK) type_gfx = "silk";
+		else if (g->ltype & PCB_LYT_MASK) type_gfx = "mask";
+		else if (g->ltype & PCB_LYT_PASTE) type_gfx = "pst.";
+		else if (g->ltype & PCB_LYT_MISC) type_gfx = "misc";
+		else if (g->ltype & PCB_LYT_OUTLINE) type_gfx = "||||";
+		else type_gfx = "????";
+
+		printf("%s {%ld} %s\n", type_gfx, gid, g->name);
+		for(i = 0; i < g->len; i++) {
+			pcb_layer_id_t lid = g->lid[i];
+			pcb_layer_t *l = &PCB->Data->Layer[lid];
+			printf("      [%ld] %s comb=", lid, l->name);
+			if (l->comb & PCB_LYC_SUB) printf(" sub");
+			if (l->comb & PCB_LYC_AUTO) printf(" auto");
+			printf("\n");
+			if (l->meta.real.grp != gid)
+				printf("         *** broken layer-to-group cross reference: %ld\n", l->meta.real.grp);
+		}
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char *draw_csect_cookie = "draw_csect";
+
+pcb_action_t draw_csect_action_list[] = {
+	{"DumpCsect", pcb_act_dump_csect, pcb_acth_dump_csect, pcb_acts_dump_csect}
+};
+
+
+PCB_REGISTER_ACTIONS(draw_csect_action_list, draw_csect_cookie)
+
+int pplg_check_ver_draw_csect(int ver_needed) { return 0; }
+
+void pplg_uninit_draw_csect(void)
+{
+	pcb_remove_actions_by_cookie(draw_csect_cookie);
+}
+
+#include "dolists.h"
+
+int pplg_init_draw_csect(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(draw_csect_action_list, draw_csect_cookie)
+
+	pcb_stub_draw_csect = draw_csect;
+	pcb_stub_draw_csect_mouse_ev = mouse_csect;
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/draw_csect/draw_csect.pup
===================================================================
--- tags/2.0.1/src_plugins/draw_csect/draw_csect.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_csect/draw_csect.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short draw cross-section (layers)
+$long Draw cross section and layer map.
+$package (core)
+$state works
+default disable
Index: tags/2.0.1/src_plugins/draw_fab/Makefile
===================================================================
--- tags/2.0.1/src_plugins/draw_fab/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fab/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_draw_fab
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/draw_fab/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/draw_fab/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fab/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {draw_fab}
+append /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/draw_fab/draw_fab.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/draw_fab/draw_fab_conf.h}
+
+switch /local/pcb/draw_fab/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/draw_fab/draw_fab.c
===================================================================
--- tags/2.0.1/src_plugins/draw_fab/draw_fab.c	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fab/draw_fab.c	(revision 18980)
@@ -0,0 +1,344 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2003 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* printing routines */
+#include "config.h"
+
+#include <time.h>
+
+#include "board.h"
+#include "build_run.h"
+#include "compat_misc.h"
+#include "data.h"
+#include "draw.h"
+#include "../report/drill.h"
+#include "plugins.h"
+#include "stub_draw.h"
+#include "draw_fab_conf.h"
+#include "conf_core.h"
+#include "macro.h"
+#include "obj_pstk_inlines.h"
+#include "hid_inlines.h"
+
+#include "obj_text_draw.h"
+
+
+conf_draw_fab_t conf_draw_fab;
+
+/* ---------------------------------------------------------------------------
+ * prints a FAB drawing.
+ */
+
+#define TEXT_SIZE	PCB_MIL_TO_COORD(150)
+#define TEXT_LINE	PCB_MIL_TO_COORD(150)
+#define DRILL_MARK_SIZE	PCB_MIL_TO_COORD(16)
+#define FAB_LINE_W      PCB_MIL_TO_COORD(8)
+
+static void fab_line(pcb_hid_gc_t gc, int x1, int y1, int x2, int y2)
+{
+	pcb_gui->draw_line(gc, x1, y1, x2, y2);
+}
+
+static void fab_circle(pcb_hid_gc_t gc, int x, int y, int r)
+{
+	pcb_gui->draw_arc(gc, x, y, r, r, 0, 180);
+	pcb_gui->draw_arc(gc, x, y, r, r, 180, 180);
+}
+
+/* align is 0=left, 1=center, 2=right, add 8 for underline */
+static void text_at(pcb_hid_gc_t gc, int x, int y, int align, const char *fmt, ...)
+{
+	char tmp[512];
+	int w = 0, i;
+	pcb_text_t t;
+	va_list a;
+	pcb_font_t *font = pcb_font(PCB, 0, 1);
+	va_start(a, fmt);
+	vsprintf(tmp, fmt, a);
+	va_end(a);
+	t.Direction = 0;
+	t.TextString = tmp;
+	t.Scale = PCB_COORD_TO_MIL(TEXT_SIZE);	/* pcnt of 100mil base height */
+	t.Flags = pcb_no_flags();
+	t.fid = 0; /* use the default font */
+	t.X = x;
+	t.Y = y;
+	for (i = 0; tmp[i]; i++)
+		w += (font->Symbol[(int) tmp[i]].Width + font->Symbol[(int) tmp[i]].Delta);
+	w = PCB_SCALE_TEXT(w, t.Scale);
+	t.X -= w * (align & 3) / 2;
+	if (t.X < 0)
+		t.X = 0;
+	pcb_text_draw_(&t, 0,0, PCB_TXT_TINY_ACCURATE);
+	if (align & 8)
+		fab_line(gc, t.X,
+						 t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10),
+						 t.X + w, t.Y + PCB_SCALE_TEXT(font->MaxHeight, t.Scale) + PCB_MIL_TO_COORD(10));
+}
+
+/* Y, +, X, circle, square */
+static void drill_sym(pcb_hid_gc_t gc, int idx, int x, int y)
+{
+	int type = idx % 5;
+	int size = idx / 5;
+	int s2 = (size + 1) * DRILL_MARK_SIZE;
+	int i;
+	switch (type) {
+	case 0:											/* Y */ ;
+		fab_line(gc, x, y, x, y + s2);
+		fab_line(gc, x, y, x + s2 * 13 / 15, y - s2 / 2);
+		fab_line(gc, x, y, x - s2 * 13 / 15, y - s2 / 2);
+		for (i = 1; i <= size; i++)
+			fab_circle(gc, x, y, i * DRILL_MARK_SIZE);
+		break;
+	case 1:											/* + */
+		;
+		fab_line(gc, x, y - s2, x, y + s2);
+		fab_line(gc, x - s2, y, x + s2, y);
+		for (i = 1; i <= size; i++) {
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+		}
+		break;
+	case 2:											/* X */ ;
+		fab_line(gc, x - s2 * 3 / 4, y - s2 * 3 / 4, x + s2 * 3 / 4, y + s2 * 3 / 4);
+		fab_line(gc, x - s2 * 3 / 4, y + s2 * 3 / 4, x + s2 * 3 / 4, y - s2 * 3 / 4);
+		for (i = 1; i <= size; i++) {
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+		}
+		break;
+	case 3:											/* circle */ ;
+		for (i = 0; i <= size; i++)
+			fab_circle(gc, x, y, (i + 1) * DRILL_MARK_SIZE - DRILL_MARK_SIZE / 2);
+		break;
+	case 4:											/* square */
+		for (i = 1; i <= size + 1; i++) {
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x - i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+			fab_line(gc, x + i * DRILL_MARK_SIZE, y - i * DRILL_MARK_SIZE, x + i * DRILL_MARK_SIZE, y + i * DRILL_MARK_SIZE);
+		}
+		break;
+	}
+}
+
+static int count_drill_lines(pcb_drill_info_t *AllDrills)
+{
+	int n, ds = 0;
+	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
+		pcb_drill_t *drill = &(AllDrills->Drill[n]);
+		if (drill->PinCount + drill->ViaCount > drill->UnplatedCount)
+			ds++;
+		if (drill->UnplatedCount)
+			ds++;
+	}
+	return ds;
+}
+
+
+static int DrawFab_overhang(void)
+{
+	pcb_drill_info_t *AllDrills = drill_get_info(PCB->Data);
+	int ds = count_drill_lines(AllDrills);
+	if (ds < 4)
+		ds = 4;
+	return (ds + 2) * TEXT_LINE;
+}
+
+static void DrawFab(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	pcb_drill_info_t *AllDrills;
+	int i, n, yoff, total_drills = 0, ds = 0, found;
+	char utcTime[64];
+	AllDrills = drill_get_info(PCB->Data);
+	if (conf_core.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+		drill_round_info(AllDrills, PCB_MIL_TO_COORD(1));
+	else
+		drill_round_info(AllDrills, PCB_MM_TO_COORD(0.01));
+	yoff = -TEXT_LINE;
+
+	/* count how many drill description lines will be needed */
+	ds = count_drill_lines(AllDrills);
+
+	/*
+	 * When we only have a few drill sizes we need to make sure the
+	 * drill table header doesn't fall on top of the board info
+	 * section.
+	 */
+	if (ds < 4) {
+		yoff -= (4 - ds) * TEXT_LINE;
+	}
+
+	pcb_hid_set_line_width(gc, FAB_LINE_W);
+
+	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
+		int plated_sym = -1, unplated_sym = -1;
+		pcb_drill_t *drill = &(AllDrills->Drill[n]);
+		if (drill->PinCount + drill->ViaCount > drill->UnplatedCount)
+			plated_sym = --ds;
+		if (drill->UnplatedCount)
+			unplated_sym = --ds;
+		pcb_gui->set_color(gc, conf_core.appearance.color.pin);
+		for (i = 0; i < drill->PinN; i++) {
+			int unplated = 1;
+			pcb_coord_t x, y;
+			assert(drill->hole[i]->type == PCB_OBJ_PSTK);
+			{
+				pcb_pstk_t *ps = (pcb_pstk_t *)drill->hole[i];
+				pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+				unplated = !proto->hplated;
+				x = ps->x;
+				y = ps->y;
+			}
+			drill_sym(gc, unplated ? unplated_sym : plated_sym, x, y);
+		}
+		if (plated_sym != -1) {
+			drill_sym(gc, plated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4);
+			text_at(gc, PCB_MIL_TO_COORD(1350), yoff, PCB_MIL_TO_COORD(2), "YES");
+			text_at(gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->PinCount + drill->ViaCount - drill->UnplatedCount);
+
+			if (unplated_sym != -1)
+				yoff -= TEXT_LINE;
+		}
+		if (unplated_sym != -1) {
+			drill_sym(gc, unplated_sym, TEXT_SIZE, yoff + TEXT_SIZE / 4);
+			text_at(gc, PCB_MIL_TO_COORD(1400), yoff, PCB_MIL_TO_COORD(2), "NO");
+			text_at(gc, PCB_MIL_TO_COORD(980), yoff, PCB_MIL_TO_COORD(2), "%d", drill->UnplatedCount);
+		}
+		pcb_gui->set_color(gc, conf_core.appearance.color.element);
+		if (conf_core.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+			text_at(gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize));
+		else
+			text_at(gc, PCB_MIL_TO_COORD(450), yoff, PCB_MIL_TO_COORD(2), "%1.2f", PCB_COORD_TO_MM(drill->DrillSize));
+		if (plated_sym != -1 && unplated_sym != -1) {
+			if (conf_core.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+				text_at(gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%0.3f", PCB_COORD_TO_INCH(drill->DrillSize));
+			else
+				text_at(gc, PCB_MIL_TO_COORD(450), yoff + TEXT_LINE, PCB_MIL_TO_COORD(2), "%1.2f", PCB_COORD_TO_MM(drill->DrillSize));
+		}
+		yoff -= TEXT_LINE;
+		total_drills += drill->PinCount;
+		total_drills += drill->ViaCount;
+	}
+
+	pcb_gui->set_color(gc, conf_core.appearance.color.element);
+	text_at(gc, 0, yoff, PCB_MIL_TO_COORD(9), "Symbol");
+	if (conf_core.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+		text_at(gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (Inch)");
+	else
+		text_at(gc, PCB_MIL_TO_COORD(410), yoff, PCB_MIL_TO_COORD(9), "Diam. (mm)");
+	text_at(gc, PCB_MIL_TO_COORD(950), yoff, PCB_MIL_TO_COORD(9), "Count");
+	text_at(gc, PCB_MIL_TO_COORD(1300), yoff, PCB_MIL_TO_COORD(9), "Plated?");
+	yoff -= TEXT_LINE;
+	text_at(gc, 0, yoff, 0,
+					"There are %d different drill sizes used in this layout, %d holes total", AllDrills->DrillN, total_drills);
+	/* Create a portable timestamp. */
+
+	if (!conf_draw_fab.plugins.draw_fab.omit_date)
+		pcb_print_utc(utcTime, sizeof(utcTime), 0);
+	else
+		strcpy(utcTime, "<date>");
+
+	yoff = -TEXT_LINE;
+	for (found = 0, i = 0; i < pcb_max_layer; i++) {
+		pcb_layer_t *l = LAYER_PTR(i);
+		if ((pcb_layer_flags(PCB, i) & PCB_LYT_OUTLINE) && (!PCB_RTREE_EMPTY(l->line_tree) || !PCB_RTREE_EMPTY(l->arc_tree))) {
+			found = 1;
+			break;
+		}
+	}
+	if (!found) {
+		pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
+		pcb_gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0);
+		pcb_gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight);
+		pcb_gui->draw_line(gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
+		pcb_gui->draw_line(gc, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
+		/*FPrintOutline (); */
+		pcb_hid_set_line_width(gc, FAB_LINE_W);
+		text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0,
+						"Maximum Dimensions: %f mils wide, %f mils high", PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight));
+		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1,
+						"Board outline is the centerline of this %f mil"
+						" rectangle - 0,0 to %f,%f mils",
+						PCB_COORD_TO_MIL(FAB_LINE_W), PCB_COORD_TO_MIL(PCB->MaxWidth), PCB_COORD_TO_MIL(PCB->MaxHeight));
+	}
+	else {
+		pcb_layer_t *layer = LAYER_PTR(i);
+		pcb_hid_set_line_width(gc, PCB_MIL_TO_COORD(10));
+		PCB_LINE_LOOP(layer);
+		{
+			pcb_gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+		}
+		PCB_END_LOOP;
+		PCB_ARC_LOOP(layer);
+		{
+			pcb_gui->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
+		}
+		PCB_END_LOOP;
+		PCB_TEXT_LOOP(layer);
+		{
+			pcb_text_draw_(text, 0, 0, PCB_TXT_TINY_ACCURATE);
+		}
+		PCB_END_LOOP;
+		pcb_hid_set_line_width(gc, FAB_LINE_W);
+		text_at(gc, PCB->MaxWidth / 2, PCB->MaxHeight + PCB_MIL_TO_COORD(20), 1, "Board outline is the centerline of this path");
+	}
+	yoff -= TEXT_LINE;
+
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Date: %s", utcTime);
+	yoff -= TEXT_LINE;
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Author: %s", pcb_author());
+	yoff -= TEXT_LINE;
+	text_at(gc, PCB_MIL_TO_COORD(2000), yoff, 0, "Title: %s - Fabrication Drawing", PCB_UNKNOWN(PCB->Name));
+}
+
+int pplg_check_ver_draw_fab(int ver_needed) { return 0; }
+
+void pplg_uninit_draw_fab(void)
+{
+	conf_unreg_fields("plugins/draw_fab/");
+}
+
+int pplg_init_draw_fab(void)
+{
+	PCB_API_CHK_VER;
+	pcb_stub_draw_fab = DrawFab;
+	pcb_stub_draw_fab_overhang = DrawFab_overhang;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_draw_fab, field,isarray,type_name,cpath,cname,desc,flags);
+#include "draw_fab_conf_fields.h"
+
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/draw_fab/draw_fab.pup
===================================================================
--- tags/2.0.1/src_plugins/draw_fab/draw_fab.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fab/draw_fab.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class feature
+$short fab layer in some exports
+$long Draw the fab layer (for various exporters).
+$package (core)
+$state works
+default buildin
+
+# for drill.[ch]
+dep report
+autoload 1
Index: tags/2.0.1/src_plugins/draw_fab/draw_fab_conf.h
===================================================================
--- tags/2.0.1/src_plugins/draw_fab/draw_fab_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fab/draw_fab_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_DRAW_FAB_CONF_H
+#define PCB_DRAW_FAB_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct draw_fab {
+			CFT_BOOLEAN omit_date;         /* do not draw date (useful for testing) */
+		} draw_fab;
+	} plugins;
+} conf_draw_fab_t;
+
+#endif
Index: tags/2.0.1/src_plugins/draw_fontsel/Makefile
===================================================================
--- tags/2.0.1/src_plugins/draw_fontsel/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fontsel/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_draw_fontsel
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/draw_fontsel/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/draw_fontsel/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fontsel/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {draw_fontsel}
+append /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/draw_fontsel/draw_fontsel.o
+@]
+
+switch /local/pcb/draw_fontsel/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.c
===================================================================
--- tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.c	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.c	(revision 18980)
@@ -0,0 +1,254 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* printing routines */
+#include "config.h"
+
+#include <time.h>
+
+#include "board.h"
+#include "build_run.h"
+#include "data.h"
+#include "draw.h"
+#include "font.h"
+#include "actions.h"
+#include "plugins.h"
+#include "stub_draw.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+
+#include "obj_text.h"
+#include "obj_text_draw.h"
+#include "obj_line_draw.h"
+
+static pcb_text_t *dtext(int x, int y, int scale, pcb_font_id_t fid, const char *txt)
+{
+	static pcb_text_t t;
+
+	t.X = PCB_MM_TO_COORD(x);
+	t.Y = PCB_MM_TO_COORD(y);
+	t.TextString = (char *)txt;
+	t.Direction = 0;
+	t.Scale = scale;
+	t.fid = fid;
+	t.Flags = pcb_no_flags();
+	pcb_text_draw_(&t, 0, 0, PCB_TXT_TINY_ACCURATE);
+	return &t;
+}
+
+/* draw a line of a specific thickness */
+static void dline(int x1, int y1, int x2, int y2, float thick)
+{
+	pcb_line_t l;
+	l.Point1.X = PCB_MM_TO_COORD(x1);
+	l.Point1.Y = PCB_MM_TO_COORD(y1);
+	l.Point2.X = PCB_MM_TO_COORD(x2);
+	l.Point2.Y = PCB_MM_TO_COORD(y2);
+	l.Thickness = PCB_MM_TO_COORD(thick);
+	pcb_line_draw_(&l, 0);
+}
+
+static void dchkbox(pcb_hid_gc_t gc, int x0, int y0, int checked)
+{
+	int w = 2, h = 2;
+	float th = 0.1, th2 = 0.4;
+
+	pcb_gui->set_color(gc, "#000000");
+	dline(x0, y0, x0+w, y0, th);
+	dline(x0+w, y0, x0+w, y0+h, th);
+	dline(x0+w, y0+h, x0, y0+h, th);
+	dline(x0, y0+h, x0, y0, th);
+	if (checked) {
+		pcb_gui->set_color(gc, "#AA0033");
+		dline(x0, y0, x0+w, y0+h, th2);
+		dline(x0, y0+h, x0+w, y0, th2);
+	}
+}
+
+#define MAX_FONT 128
+typedef struct {
+	int y1, y2;
+	pcb_font_id_t fid;
+} font_coord_t;
+
+font_coord_t font_coord[MAX_FONT];
+int font_coords;
+int font_new_y1, font_new_y2;
+int font_replace_y1, font_replace_y2;
+int font_del_y1, font_del_y2;
+
+pcb_text_t *fontsel_txt = NULL;
+pcb_layer_t *fontsel_layer = NULL;
+int fontsel_txt_type = 0;
+
+static void pcb_draw_font(pcb_hid_gc_t gc, pcb_font_t *f, int x, int *y)
+{
+	char txt[256];
+	pcb_text_t *t;
+	const char *nm;
+	int y_old = *y;
+	pcb_font_id_t target_fid = (fontsel_txt == NULL) ? conf_core.design.text_font_id : fontsel_txt->fid;
+
+	nm = (f->name == NULL) ? "<anonymous>" : f->name;
+	pcb_snprintf(txt, sizeof(txt), "#%d [abc ABC 123] %s", f->id, nm);
+
+	dchkbox(gc, x-4, *y, (f->id == target_fid));
+
+	pcb_gui->set_color(gc, "#000000");
+	t = dtext(x, *y, 200, f->id, txt);
+	pcb_text_bbox(pcb_font(PCB, f->id, 1), t);
+
+	*y += pcb_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5);
+
+	if (font_coords < MAX_FONT) {
+		font_coord[font_coords].y1 = y_old;
+		font_coord[font_coords].y2 = *y;
+		font_coord[font_coords].fid = f->id;
+		font_coords++;
+	}
+}
+
+
+static void pcb_draw_fontsel(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	int y = 10;
+	pcb_text_t *t;
+
+	pcb_gui->set_color(gc, "#FF0000");
+	dtext(0, 0, 300, 0, "Select font");
+
+	font_coords = 0;
+	pcb_draw_font(gc, &PCB->fontkit.dflt, 10, &y);
+
+	if (PCB->fontkit.hash_inited) {
+		htip_entry_t *e;
+		for (e = htip_first(&PCB->fontkit.fonts); e; e = htip_next(&PCB->fontkit.fonts, e))
+			pcb_draw_font(gc, e->value, 10, &y);
+	}
+
+	/* New font */
+	pcb_gui->set_color(gc, "#000000");
+	t = dtext(5, y, 250, 0, "[Load font from file]");
+	pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+	font_new_y1 = y;
+	y += pcb_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5);
+	font_new_y2 = y;
+	
+	/* Replace font */
+	pcb_gui->set_color(gc, "#000000");
+	t = dtext(5, y, 250, 0, "[Replace font]");
+	pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+	font_replace_y1 = y;
+	y += pcb_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5);
+	font_replace_y2 = y;
+
+	/* Del font */
+	pcb_gui->set_color(gc, "#550000");
+	t = dtext(5, y, 250, 0, "[Remove current font]");
+	pcb_text_bbox(pcb_font(PCB, 0, 1), t);
+	font_del_y1 = y;
+	y += pcb_round(PCB_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5);
+	font_del_y2 = y;
+
+}
+
+static pcb_font_id_t lookup_fid_for_coord(int ymm)
+{
+	int n;
+
+	for(n = 0; n < font_coords; n++)
+		if ((ymm >= font_coord[n].y1) && (ymm <= font_coord[n].y2))
+			return font_coord[n].fid;
+	return -1;
+}
+
+static pcb_bool pcb_mouse_fontsel(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_font_id_t fid;
+	int ymm;
+
+	switch(kind) {
+		case PCB_HID_MOUSE_PRESS:
+			ymm = PCB_COORD_TO_MM(y);
+			fid = lookup_fid_for_coord(ymm);
+			if (fid >= 0) {
+				if (fontsel_txt == NULL) {
+					char sval[128];
+					sprintf(sval, "%ld", fid);
+					conf_set(CFR_DESIGN, "design/text_font_id", 0, sval, POL_OVERWRITE);
+				}
+				else {
+					switch(fontsel_txt_type) {
+						case PCB_OBJ_TEXT:
+							pcb_text_set_font(fontsel_layer, fontsel_txt, fid);
+							break;
+					}
+					pcb_gui->invalidate_all();
+				}
+				return 1;
+			}
+			else if ((ymm >= font_new_y1) && (ymm <= font_new_y2)) {
+				pcb_actionl("LoadFontFrom", NULL); /* modal, blocking */
+				return 1;
+			}
+			else if ((ymm >= font_replace_y1) && (ymm <= font_replace_y2)) {
+				char file[1] = "", id[5];
+				pcb_snprintf(id, sizeof(id), "%ld", conf_core.design.text_font_id);
+				pcb_actionl("LoadFontFrom", file, id, NULL); /* modal, blocking */
+				return 1;
+			}
+			else if ((ymm >= font_del_y1) && (ymm <= font_del_y2)) {
+				if (conf_core.design.text_font_id == 0) {
+					pcb_message(PCB_MSG_ERROR, "Can not remove the default font.\n");
+					return 0;
+				}
+				pcb_del_font(&PCB->fontkit, conf_core.design.text_font_id);
+				conf_set(CFR_DESIGN, "design/text_font_id", 0, "0", POL_OVERWRITE);
+				return 1;
+			}
+	}
+	return 0;
+}
+
+int pplg_check_ver_draw_fontsel(int ver_needed) { return 0; }
+
+void pplg_uninit_draw_fontsel(void)
+{
+}
+
+int pplg_init_draw_fontsel(void)
+{
+	PCB_API_CHK_VER;
+	pcb_stub_draw_fontsel = pcb_draw_fontsel;
+	pcb_stub_draw_fontsel_mouse_ev = pcb_mouse_fontsel;
+	pcb_stub_draw_fontsel_text_obj = &fontsel_txt;
+	pcb_stub_draw_fontsel_layer_obj = &fontsel_layer;
+	pcb_stub_draw_fontsel_text_type = &fontsel_txt_type;
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.pup
===================================================================
--- tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/draw_fontsel/draw_fontsel.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short font selection GUI
+$long Draw the font selector GUI
+$package lib-gui
+$state works
+default disable
Index: tags/2.0.1/src_plugins/expfeat/Makefile
===================================================================
--- tags/2.0.1/src_plugins/expfeat/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/expfeat/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_expfeat
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/expfeat/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/expfeat/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/expfeat/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {expfeat}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/expfeat/expfeat.o @]
+
+switch /local/pcb/expfeat/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/expfeat/expfeat.c
===================================================================
--- tags/2.0.1/src_plugins/expfeat/expfeat.c	(nonexistent)
+++ tags/2.0.1/src_plugins/expfeat/expfeat.c	(revision 18980)
@@ -0,0 +1,71 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+
+
+static const char pcb_acts_ExpFeatTmp[] = "ExpFeatTmp(...)";
+static const char pcb_acth_ExpFeatTmp[] = "Experimental Feature Template.";
+/* %start-doc actions Debug
+This action is a template, copy and rename this to create new actions.
+%end-doc */
+static fgw_error_t pcb_act_ExpFeatTmp(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_INFO, "Hello world from expfeat!\n");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+pcb_action_t expfeat_action_list[] = {
+	{"ExpFeatTmp", pcb_act_ExpFeatTmp, pcb_acth_ExpFeatTmp, pcb_acts_ExpFeatTmp}
+};
+
+static const char *expfeat_cookie = "experimental features plugin";
+
+PCB_REGISTER_ACTIONS(expfeat_action_list, expfeat_cookie)
+
+int pplg_check_ver_expfeat(int ver_needed) { return 0; }
+
+void pplg_uninit_expfeat(void)
+{
+	pcb_remove_actions_by_cookie(expfeat_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_expfeat(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(expfeat_action_list, expfeat_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/expfeat/expfeat.pup
===================================================================
--- tags/2.0.1/src_plugins/expfeat/expfeat.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/expfeat/expfeat.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short experimental features
+$long Staging plugin for experimenting with new actions and dialogs before getting them into core or other plugins
+$state works
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/export_bboard/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_bboard/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bboard/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_bboard
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_bboard/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_bboard/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bboard/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,16 @@
+put /local/pcb/mod {export_bboard}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_bboard/bboard.o @]
+
+switch /local/pcb/export_bboard/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/cairo/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/cairo/ldflags
+	end
+end
+
+switch /local/pcb/export_bboard/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_bboard/bboard.c
===================================================================
--- tags/2.0.1/src_plugins/export_bboard/bboard.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bboard/bboard.c	(revision 18980)
@@ -0,0 +1,628 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  Breadboard export HID
+ *  This code is based on the GERBER and OpenSCAD export HID
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#include <math.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <time.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "config.h"
+#include "data.h"
+#include "error.h"
+#include "buffer.h"
+#include "layer.h"
+#include "layer_grp.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "compat_fs.h"
+#include "misc_util.h"
+#include "rtree.h"
+
+#include "hid.h"
+#include "hid_attrib.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "hid_init.h"
+#include "hid_cam.h"
+
+#include <cairo.h>
+
+static const char *bboard_cookie = "bboard exporter";
+
+static cairo_surface_t *bboard_cairo_sfc;
+static cairo_t *bboard_cairo_ctx;
+#define ASSERT_CAIRO  if ((bboard_cairo_ctx == NULL) || (bboard_cairo_sfc == NULL)) \
+                         return;
+
+#define DPI_SCALE	150
+
+#define BBEXT		".png"
+#define MODELBASE	"models"
+#define BBOARDBASE	"bboard"
+
+/****************************************************************************************************
+* Breadboard export filter parameters and options
+****************************************************************************************************/
+
+static pcb_hid_t bboard_hid;
+
+static struct {
+	int draw;
+	int exp;
+	float z_offset;
+	int solder;
+	int component;
+} group_data[PCB_MAX_LAYERGRP];
+
+
+#define HA_bboardfile 		0
+#define HA_bgcolor	 	1
+#define HA_skipsolder	 	2
+#define HA_antialias 		3
+
+static pcb_hid_attribute_t bboard_options[] = {
+/*
+%start-doc options "Breadboard Export"
+@ftable @code
+@item --bbfile <string>
+Name of breadboard image output file.
+@end ftable
+%end-doc
+*/
+	{
+	 "bbfile", "Braedboard file name", PCB_HATT_STRING, 0, 0,
+	 {
+		0, 0, 0}, 0, 0},
+/*
+%start-doc options "Breadboard Export"
+@ftable @code
+@item --bgcolor <string>
+Background color. It can be HTML color code (RRGGBB); if left empty or set to 'transparent', transparent background is used.
+@end ftable
+%end-doc
+*/
+	{
+	 "bgcolor", "Background color (rrggbb)", PCB_HATT_STRING, 0, 0,
+	 {
+		0, 0, 0}, 0, 0},
+/*
+%start-doc options "Breadboard Export"
+@ftable @code
+@item --skipsolder <bool>
+The solder layer will be ommited (if set to true) from output.
+@end ftable
+%end-doc
+*/
+	{
+	 "skipsolder", "Ignore solder layer", PCB_HATT_BOOL, 0, 0,
+	 {
+		1, 0, 0}, 0, 0},
+/*
+%start-doc options "Breadboard Export"
+@ftable @code
+@item --antialias <bool>
+Connections are antialiased. Antialiasing applies only to wires, models are not antialiased..
+@end ftable
+%end-doc
+*/
+	{
+	 "antialias", "Antialiasing", PCB_HATT_BOOL, 0, 0,
+	 {
+		1, 0, 0}, 0, 0},
+};
+
+#define NUM_OPTIONS (sizeof(bboard_options)/sizeof(bboard_options[0]))
+
+static pcb_hid_attr_val_t bboard_values[NUM_OPTIONS];
+
+/****************************************************************************************************/
+static const char *bboard_filename = 0;
+static const char *bboard_bgcolor = 0;
+
+pcb_coord_t bboard_scale_coord(pcb_coord_t x)
+{
+	return ((x * DPI_SCALE / 254 / 10000) + 0) / 10;
+}
+
+
+/*******************************************
+* Export filter implementation starts here
+********************************************/
+
+static pcb_hid_attribute_t *bboard_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &bboard_options[HA_bboardfile], ".png", &last_made_filename);
+
+	bboard_options[HA_bgcolor].default_val.str_value = pcb_strdup("#FFFFFF");
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return bboard_options;
+}
+
+static int bboard_validate_layer(unsigned long flags, int group, int skipsolder)
+{
+	if ((flags & PCB_LYT_INVIS) || (flags & PCB_LYT_ASSY) || (flags & PCB_LYT_OUTLINE))
+		return 0;
+
+	if (group_data[group].solder && skipsolder)
+		return 0;
+
+	if (group >= 0 && group < pcb_max_group(PCB)) {
+		if (!group_data[group].draw)
+			return 0;
+		group_data[group].exp = 1;
+		return 1;
+	}
+	else
+		return 0;
+}
+
+static void bboard_get_layer_color(pcb_layer_t * layer, int *clr_r, int *clr_g, int *clr_b)
+{
+	char *clr;
+	unsigned int r, g, b;
+
+	if ((clr = pcb_attribute_get(&(layer->Attributes), "BBoard::LayerColor")) != NULL) {
+		if (clr[0] == '#') {
+			if (sscanf(&(clr[1]), "%02x%02x%02x", &r, &g, &b) == 3)
+				goto ok;
+		}
+	}
+
+	if (layer->meta.real.color && (layer->meta.real.color[0] == '#')) {
+		if (sscanf(&(layer->meta.real.color[1]), "%02x%02x%02x", &r, &g, &b) == 3)
+			goto ok;
+	}
+
+	/* default color */
+	*clr_r = 0xff;
+	*clr_g = 0xff;
+	*clr_b = 0xff;
+	return;
+
+ok:
+	*clr_r = r;
+	*clr_g = g;
+	*clr_b = b;
+	return;
+}
+
+
+static void bboard_set_color_cairo(int r, int g, int b)
+{
+	ASSERT_CAIRO;
+
+	cairo_set_source_rgb(bboard_cairo_ctx, ((float) r) / 255., ((float) g) / 255., ((float) b) / 255.);
+}
+
+
+static void bboard_draw_line_cairo(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness)
+{
+	ASSERT_CAIRO;
+
+	cairo_set_line_cap(bboard_cairo_ctx, CAIRO_LINE_CAP_ROUND);
+
+	cairo_move_to(bboard_cairo_ctx, bboard_scale_coord(x1), bboard_scale_coord(y1));
+	cairo_line_to(bboard_cairo_ctx, bboard_scale_coord(x2), bboard_scale_coord(y2));
+
+	cairo_set_line_width(bboard_cairo_ctx, bboard_scale_coord(thickness));
+	cairo_stroke(bboard_cairo_ctx);
+}
+
+static void bboard_draw_arc_cairo(pcb_coord_t x, pcb_coord_t y, pcb_coord_t w, pcb_coord_t h, pcb_angle_t sa, pcb_angle_t a, pcb_coord_t thickness)
+{
+	ASSERT_CAIRO;
+
+	cairo_set_line_cap(bboard_cairo_ctx, CAIRO_LINE_CAP_ROUND);
+
+	cairo_save(bboard_cairo_ctx);
+	cairo_translate(bboard_cairo_ctx, bboard_scale_coord(x), bboard_scale_coord(y));
+	cairo_scale(bboard_cairo_ctx, bboard_scale_coord(w), -bboard_scale_coord(h));
+	if (a < 0) {
+		cairo_arc_negative(bboard_cairo_ctx, 0., 0., 1., (sa + 180.) * M_PI / 180., (a + sa + 180.) * M_PI / 180.);
+	}
+	else {
+		cairo_arc(bboard_cairo_ctx, 0., 0., 1., (sa + 180.) * M_PI / 180., (a + sa + 180.) * M_PI / 180.);
+	}
+	cairo_restore(bboard_cairo_ctx);
+
+	cairo_set_line_width(bboard_cairo_ctx, bboard_scale_coord(thickness));
+	cairo_stroke(bboard_cairo_ctx);
+}
+
+static pcb_bool bboard_init_board_cairo(pcb_coord_t x1, pcb_coord_t y1, const char *color, int antialias)
+{
+	unsigned int r, g, b;
+	float tr = 1.;								/* background transparency */
+
+	if (color) {
+		if (strlen(color) == 0 || !strcmp(color, "transparent")) {
+			tr = 0.;
+			r = g = b = 0xff;
+		}
+		else {
+			if ((color[0] != '#')
+					|| sscanf(&(color[1]), "%02x%02x%02x", &r, &g, &b) != 3) {
+				pcb_message(PCB_MSG_ERROR, "BBExport: Invalid background color \"%s\"", color);
+				r = g = b = 0xff;
+			}
+
+		}
+	}
+
+	bboard_cairo_sfc = NULL;
+	bboard_cairo_ctx = NULL;
+	bboard_cairo_sfc = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, bboard_scale_coord(x1), bboard_scale_coord(y1));
+	if (bboard_cairo_sfc) {
+		bboard_cairo_ctx = cairo_create(bboard_cairo_sfc);
+		if (!bboard_cairo_ctx) {
+			cairo_surface_destroy(bboard_cairo_sfc);
+			bboard_cairo_sfc = NULL;
+		}
+
+	}
+
+	if ((bboard_cairo_ctx != NULL) && (bboard_cairo_sfc != NULL)) {
+		cairo_set_antialias(bboard_cairo_ctx, (antialias) ? CAIRO_ANTIALIAS_DEFAULT : CAIRO_ANTIALIAS_NONE);
+		cairo_rectangle(bboard_cairo_ctx, 0, 0, bboard_scale_coord(x1), bboard_scale_coord(y1));
+		cairo_set_source_rgba(bboard_cairo_ctx, ((float) r) / 255., ((float) g) / 255., ((float) b) / 255., tr);
+		cairo_fill(bboard_cairo_ctx);
+		return 1;
+	}
+
+	return 0;
+}
+
+static void bboard_finish_board_cairo(void)
+{
+	ASSERT_CAIRO;
+
+	cairo_surface_write_to_png(bboard_cairo_sfc, bboard_filename);
+
+	cairo_destroy(bboard_cairo_ctx);
+	cairo_surface_destroy(bboard_cairo_sfc);
+}
+
+static char *bboard_get_model_filename(char *basename, char *value, pcb_bool nested)
+{
+	char *s;
+
+/*
+	s = pcb_concat(pcblibdir, PCB_DIR_SEPARATOR_S, MODELBASE, PCB_DIR_SEPARATOR_S,
+					 BBOARDBASE, PCB_DIR_SEPARATOR_S, basename, (value
+																											 && nested) ?
+					 PCB_DIR_SEPARATOR_S : "", (value && nested) ? basename : "", (value) ? "-" : "", (value) ? value : "", BBEXT, NULL);
+*/
+	s = pcb_strdup("TODO_fn1");
+	if (s != NULL) {
+		if (!pcb_file_readable(s)) {
+			free(s);
+			s = NULL;
+		}
+	}
+	return s;
+}
+
+
+static int bboard_parse_offset(char *s, pcb_coord_t * ox, pcb_coord_t * oy)
+{
+	pcb_coord_t xx = 0, yy = 0;
+	int n = 0, ln = 0;
+	char val[32];
+
+	while (sscanf(s, "%30s%n", val, &ln) >= 1) {
+		switch (n) {
+		case 0:
+			xx = pcb_get_value_ex(val, NULL, NULL, NULL, "mm", NULL);
+			break;
+		case 1:
+			yy = pcb_get_value_ex(val, NULL, NULL, NULL, "mm", NULL);
+			break;
+		}
+		s = s + ln;
+		n++;
+	}
+	if (n == 2) {
+		*ox = xx;
+		*oy = yy;
+		return pcb_true;
+	}
+	else {
+		return pcb_false;
+	}
+
+}
+
+
+static void bboard_export_element_cairo(pcb_subc_t *subc, pcb_bool onsolder)
+{
+	cairo_surface_t *sfc;
+	pcb_coord_t ex, ey;
+	pcb_coord_t ox = 0, oy = 0;
+	int w, h;
+	pcb_angle_t tmp_angle = 0.0;
+	char *model_angle, *s = 0, *s1, *s2, *fname = NULL;
+	pcb_bool offset_in_model = pcb_false;
+
+	ASSERT_CAIRO;
+
+	s1 = pcb_attribute_get(&(subc->Attributes), "BBoard::Model");
+	if (s1) {
+		s = pcb_strdup(s1);
+		if (!s)
+			return;
+
+		if ((s2 = strchr(s, ' ')) != NULL) {
+			*s2 = 0;
+			offset_in_model = bboard_parse_offset(s2 + 1, &ox, &oy);
+		}
+#warning subc TODO: rewrite
+#if 0
+		if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+			fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true);
+			if (!fname)
+				fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false);
+		}
+#endif
+		if (!fname)
+			fname = bboard_get_model_filename(s, NULL, pcb_false);
+
+		if (s)
+			free(s);
+	}
+	if (!fname) {
+		/* invalidate offset from BBoard::Model, if such model does not exist */
+		offset_in_model = pcb_false;
+
+		s = pcb_attribute_get(&(subc->Attributes), "Footprint::File");
+		if (s) {
+#warning subc TODO: rewrite
+#if 0
+			if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+				fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true);
+				if (!fname)
+					fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false);
+			}
+#endif
+			if (!fname)
+				fname = bboard_get_model_filename(s, NULL, pcb_false);
+		}
+	}
+	if (!fname) {
+#warning subc TODO: rewrite
+#if 0
+		s = PCB_ELEM_NAME_DESCRIPTION(element);
+		if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_DESCRIPTION(element))) {
+			if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+				fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_true);
+				if (!fname)
+					fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_false);
+
+			}
+			if (!fname)
+				fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), NULL, pcb_false);
+		}
+#endif
+	}
+
+	if (!fname)
+		return;
+
+	sfc = cairo_image_surface_create_from_png(fname);
+
+	free(fname);
+
+	if (sfc) {
+		w = cairo_image_surface_get_width(sfc);
+		h = cairo_image_surface_get_height(sfc);
+
+		/* read offest from attribute */
+		if (!offset_in_model) {
+			s = pcb_attribute_get(&(subc->Attributes), "BBoard::Offset");
+
+			/* Parse values with units... */
+			if (s) {
+				bboard_parse_offset(s, &ox, &oy);
+			}
+		}
+
+		{
+			pcb_coord_t ox = 0, oy = 0;
+			pcb_subc_get_origin(subc, &ox, &oy);
+			ex = bboard_scale_coord(ox);
+			ey = bboard_scale_coord(oy);
+		}
+
+		cairo_save(bboard_cairo_ctx);
+
+		if ((model_angle = pcb_attribute_get(&(subc->Attributes), "Footprint::RotationTracking")) != NULL) {
+			sscanf(model_angle, "%lf", &tmp_angle);
+		}
+
+
+		cairo_translate(bboard_cairo_ctx, ex, ey);
+		if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (subc))) {
+			cairo_scale(bboard_cairo_ctx, 1, -1);
+		}
+		cairo_rotate(bboard_cairo_ctx, -tmp_angle * M_PI / 180.);
+		cairo_set_source_surface(bboard_cairo_ctx, sfc, bboard_scale_coord(ox) - w / 2, bboard_scale_coord(oy) - h / 2);
+		cairo_paint(bboard_cairo_ctx);
+
+		cairo_restore(bboard_cairo_ctx);
+
+		cairo_surface_destroy(sfc);
+	}
+}
+
+
+static void bboard_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+	int clr_r, clr_g, clr_b;
+	pcb_layer_t *layer;
+	pcb_layergrp_id_t gtop, gbottom;
+
+	if (!options) {
+		bboard_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			bboard_values[i] = bboard_options[i].default_val;
+		options = bboard_values;
+	}
+	bboard_filename = options[HA_bboardfile].str_value;
+	if (!bboard_filename)
+		bboard_filename = "unknown.png";
+
+	bboard_bgcolor = options[HA_bgcolor].str_value;
+	if (!bboard_bgcolor)
+		bboard_bgcolor = "FFFFFF";
+
+	memset(group_data, 0, sizeof(group_data));
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gbottom, 1) > 0)
+		group_data[gbottom].solder = 1;
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, &gtop, 1) > 0)
+		group_data[gtop].component = 1;
+
+	for (i = 0; i < pcb_max_layer; i++) {
+		layer = PCB->Data->Layer + i;
+		if (!PCB_RTREE_EMPTY(layer->line_tree))
+			group_data[pcb_layer_get_group(PCB, i)].draw = 1;
+	}
+
+	bboard_init_board_cairo(PCB->MaxWidth, PCB->MaxHeight, bboard_bgcolor, options[HA_antialias].int_value);
+
+#warning subc TODO: rewrite
+#if 0
+	/* write out components on solder side */
+	PCB_ELEMENT_LOOP(PCB->Data);
+	if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) {
+		bboard_export_element_cairo(element, 1);
+	}
+	PCB_END_LOOP;
+
+	/* write out components on component side */
+	PCB_ELEMENT_LOOP(PCB->Data);
+	if (!PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) {
+		bboard_export_element_cairo(element, 0);
+	}
+	PCB_END_LOOP;
+#endif
+
+	/* draw all wires from all valid layers */
+	for (i = pcb_max_layer; i >= 0; i--) {
+		unsigned int flg = pcb_layer_flags(PCB, i);
+		if (flg & PCB_LYT_SILK)
+			continue;
+		if (bboard_validate_layer(flg, pcb_layer_get_group(PCB, i), options[HA_skipsolder].int_value)) {
+			bboard_get_layer_color(&(PCB->Data->Layer[i]), &clr_r, &clr_g, &clr_b);
+			bboard_set_color_cairo(clr_r, clr_g, clr_b);
+			PCB_LINE_LOOP(&(PCB->Data->Layer[i]));
+			{
+				bboard_draw_line_cairo(line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness);
+			}
+			PCB_END_LOOP;
+			PCB_ARC_LOOP(&(PCB->Data->Layer[i]));
+			{
+#warning TODO: remove x1;y1;x2;y2
+				bboard_draw_arc_cairo(/*arc->Point1.X, arc->Point1.Y,
+															arc->Point2.X, arc->Point2.Y,*/
+															arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness);
+			}
+			PCB_END_LOOP;
+		}
+	}
+
+	bboard_finish_board_cairo();
+
+}
+
+static int bboard_parse_arguments(int *argc, char ***argv)
+{
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+
+static void bboard_calibrate(double xval, double yval)
+{
+	fprintf(stderr, "HID error: pcb called unimplemented breaboard function bboard_calibrate.\n");
+	abort();
+}
+
+static void bboard_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static pcb_hid_t bboard_hid;
+
+int pplg_check_ver_export_bboard(int ver_needed) { return 0; }
+
+void pplg_uninit_export_bboard(void)
+{
+	pcb_hid_remove_attributes_by_cookie(bboard_cookie);
+}
+
+
+int pplg_init_export_bboard(void)
+{
+	PCB_API_CHK_VER;
+	memset(&bboard_hid, 0, sizeof(bboard_hid));
+
+	pcb_hid_nogui_init(&bboard_hid);
+
+	bboard_hid.struct_size = sizeof(bboard_hid);
+	bboard_hid.name = "bboard";
+	bboard_hid.description = "Breadboard export";
+	bboard_hid.exporter = 1;
+
+	bboard_hid.get_export_options = bboard_get_export_options;
+	bboard_hid.do_export = bboard_do_export;
+	bboard_hid.parse_arguments = bboard_parse_arguments;
+	bboard_hid.calibrate = bboard_calibrate;
+	bboard_hid.set_crosshair = bboard_set_crosshair;
+	pcb_hid_register_hid(&bboard_hid);
+
+	pcb_hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/export_bboard/export_bboard.pup
===================================================================
--- tags/2.0.1/src_plugins/export_bboard/export_bboard.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bboard/export_bboard.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class export
+$short breadboard pcb_exporter
+$long Export breadboard
+$state WIP
+$fmt-native no
+$fmt-feature-w export breadboard assembly drawing in png
+default disable-all
+autoload 1
Index: tags/2.0.1/src_plugins/export_bom/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_bom/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bom/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_bom
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_bom/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_bom/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bom/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_bom}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_bom/bom.o @]
+
+switch /local/pcb/export_bom/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_bom/bom.c
===================================================================
--- tags/2.0.1/src_plugins/export_bom/bom.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bom/bom.c	(revision 18980)
@@ -0,0 +1,330 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "build_run.h"
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_attrib.h"
+#include "hid_cam.h"
+#include "hid_init.h"
+#include "macro.h"
+
+const char *bom_cookie = "bom HID";
+
+static pcb_hid_attribute_t bom_options[] = {
+/* %start-doc options "8 BOM Creation"
+@ftable @code
+@item --bomfile <string>
+Name of the BOM output file.
+@end ftable
+%end-doc
+*/
+	{"bomfile", "Name of the BOM output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_bomfile 0
+/* %start-doc options "8 BOM Creation"
+@ftable @code
+@item --xyfile <string>
+Name of the XY output file.
+@end ftable
+%end-doc
+*/
+};
+
+#define NUM_OPTIONS (sizeof(bom_options)/sizeof(bom_options[0]))
+
+static pcb_hid_attr_val_t bom_values[NUM_OPTIONS];
+
+static const char *bom_filename;
+
+typedef struct _StringList {
+	char *str;
+	struct _StringList *next;
+} StringList;
+
+typedef struct _BomList {
+	char *descr;
+	char *value;
+	int num;
+	StringList *refdes;
+	struct _BomList *next;
+} BomList;
+
+static pcb_hid_attribute_t *bom_get_export_options(int *n)
+{
+	static char *last_bom_filename = NULL;
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &bom_options[HA_bomfile], ".bom", &last_bom_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return bom_options;
+}
+
+/* ---------------------------------------------------------------------------
+ * prints a centroid file in a format which includes data needed by a
+ * pick and place machine.  Further formatting for a particular factory setup
+ * can easily be generated with awk or perl.  In addition, a bill of materials
+ * file is generated which can be used for checking stock and purchasing needed
+ * materials.
+ * returns != zero on error
+ */
+char *CleanBOMString(const char *in)
+{
+	char *out;
+	int i;
+
+	if ((out = (char *) malloc((strlen(in) + 1) * sizeof(char))) == NULL) {
+		fprintf(stderr, "Error:  CleanBOMString() malloc() failed\n");
+		exit(1);
+	}
+
+	/*
+	 * copy over in to out with some character conversions.
+	 * Go all the way to then end to get the terminating \0
+	 */
+	for (i = 0; i <= strlen(in); i++) {
+		switch (in[i]) {
+		case '"':
+			out[i] = '\'';
+			break;
+		default:
+			out[i] = in[i];
+		}
+	}
+
+	return out;
+}
+
+static StringList *string_insert(char *str, StringList * list)
+{
+	StringList *newlist, *cur;
+
+	if ((newlist = (StringList *) malloc(sizeof(StringList))) == NULL) {
+		fprintf(stderr, "malloc() failed in string_insert()\n");
+		exit(1);
+	}
+
+	newlist->next = NULL;
+	newlist->str = pcb_strdup(str);
+
+	if (list == NULL)
+		return newlist;
+
+	cur = list;
+	while (cur->next != NULL)
+		cur = cur->next;
+
+	cur->next = newlist;
+
+	return list;
+}
+
+static BomList *bom_insert(char *refdes, char *descr, char *value, BomList * bom)
+{
+	BomList *newlist, *cur, *prev = NULL;
+
+	if (bom == NULL) {
+		/* this is the first subcircuit so automatically create an entry */
+		if ((newlist = (BomList *) malloc(sizeof(BomList))) == NULL) {
+			fprintf(stderr, "malloc() failed in bom_insert()\n");
+			exit(1);
+		}
+
+		newlist->next = NULL;
+		newlist->descr = pcb_strdup(descr);
+		newlist->value = pcb_strdup(value);
+		newlist->num = 1;
+		newlist->refdes = string_insert(refdes, NULL);
+		return newlist;
+	}
+
+	/* search and see if we already have used one of these
+	   components */
+	cur = bom;
+	while (cur != NULL) {
+		if ((PCB_NSTRCMP(descr, cur->descr) == 0) && (PCB_NSTRCMP(value, cur->value) == 0)) {
+			cur->num++;
+			cur->refdes = string_insert(refdes, cur->refdes);
+			break;
+		}
+		prev = cur;
+		cur = cur->next;
+	}
+
+	if (cur == NULL) {
+		if ((newlist = (BomList *) malloc(sizeof(BomList))) == NULL) {
+			fprintf(stderr, "malloc() failed in bom_insert()\n");
+			exit(1);
+		}
+
+		prev->next = newlist;
+
+		newlist->next = NULL;
+		newlist->descr = pcb_strdup(descr);
+		newlist->value = pcb_strdup(value);
+		newlist->num = 1;
+		newlist->refdes = string_insert(refdes, NULL);
+	}
+
+	return bom;
+
+}
+
+/*
+ * If fp is not NULL then print out the bill of materials contained in
+ * bom.  Either way, free all memory which has been allocated for bom.
+ */
+static void print_and_free(FILE * fp, BomList * bom)
+{
+	BomList *lastb;
+	StringList *lasts;
+	char *descr, *value;
+
+	while (bom != NULL) {
+		if (fp) {
+			descr = CleanBOMString(bom->descr);
+			value = CleanBOMString(bom->value);
+			fprintf(fp, "%d,\"%s\",\"%s\",", bom->num, descr, value);
+			free(descr);
+			free(value);
+		}
+
+		while (bom->refdes != NULL) {
+			if (fp) {
+				fprintf(fp, "%s ", bom->refdes->str);
+			}
+			free(bom->refdes->str);
+			lasts = bom->refdes;
+			bom->refdes = bom->refdes->next;
+			free(lasts);
+		}
+		if (fp) {
+			fprintf(fp, "\n");
+		}
+		lastb = bom;
+		bom = bom->next;
+		free(lastb);
+	}
+}
+
+static int PrintBOM(void)
+{
+	char utcTime[64];
+	FILE *fp;
+	BomList *bom = NULL;
+
+	pcb_print_utc(utcTime, sizeof(utcTime), 0);
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		/* insert this component into the bill of materials list */
+		bom = bom_insert((char *) PCB_UNKNOWN(subc->refdes),
+			(char *) PCB_UNKNOWN(pcb_subc_name(subc, "bom::footprint")),
+			(char *) PCB_UNKNOWN(pcb_attribute_get(&subc->Attributes, "value")),
+			bom);
+	}
+	PCB_END_LOOP;
+
+	fp = pcb_fopen(bom_filename, "w");
+	if (!fp) {
+		pcb_gui->log("Cannot open file %s for writing\n", bom_filename);
+		print_and_free(NULL, bom);
+		return 1;
+	}
+
+	fprintf(fp, "# $Id");
+	fprintf(fp, "$\n");
+	fprintf(fp, "# PcbBOM Version 1.0\n");
+	fprintf(fp, "# Date: %s\n", utcTime);
+	fprintf(fp, "# Author: %s\n", pcb_author());
+	fprintf(fp, "# Title: %s - PCB BOM\n", PCB_UNKNOWN(PCB->Name));
+	fprintf(fp, "# Quantity, Description, Value, RefDes\n");
+	fprintf(fp, "# --------------------------------------------\n");
+
+	print_and_free(fp, bom);
+
+	fclose(fp);
+
+	return 0;
+}
+
+static void bom_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+
+	if (!options) {
+		bom_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			bom_values[i] = bom_options[i].default_val;
+		options = bom_values;
+	}
+
+	bom_filename = options[HA_bomfile].str_value;
+	if (!bom_filename)
+		bom_filename = "pcb-out.bom";
+
+	PrintBOM();
+}
+
+static int bom_usage(const char *topic)
+{
+	fprintf(stderr, "\nbom exporter command line arguments:\n\n");
+	pcb_hid_usage(bom_options, sizeof(bom_options) / sizeof(bom_options[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x bom [bom_options] foo.pcb\n\n");
+	return 0;
+}
+
+
+static int bom_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+pcb_hid_t bom_hid;
+
+int pplg_check_ver_export_bom(int ver_needed) { return 0; }
+
+void pplg_uninit_export_bom(void)
+{
+	pcb_hid_remove_attributes_by_cookie(bom_cookie);
+}
+
+int pplg_init_export_bom(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&bom_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&bom_hid);
+
+	bom_hid.struct_size = sizeof(pcb_hid_t);
+	bom_hid.name = "bom";
+	bom_hid.description = "Exports a Bill of Materials";
+	bom_hid.exporter = 1;
+
+	bom_hid.get_export_options = bom_get_export_options;
+	bom_hid.do_export = bom_do_export;
+	bom_hid.parse_arguments = bom_parse_arguments;
+
+	bom_hid.usage = bom_usage;
+
+	pcb_hid_register_hid(&bom_hid);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_bom/export_bom.pup
===================================================================
--- tags/2.0.1/src_plugins/export_bom/export_bom.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_bom/export_bom.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short bom pcb_exporter
+$long Export bom (Bill of Materials)
+$state works
+$fmt-native no
+$fmt-feature-w export bom (Bill of Materials) in plain text
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_dsn/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_dsn/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dsn/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_dsn
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_dsn/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_dsn/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dsn/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_dsn}
+put /local/pcb/mod/OBJS_C99 [@ $(PLUGDIR)/export_dsn/dsn.o @]
+
+switch /local/pcb/export_dsn/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_dsn/dsn.c
===================================================================
--- tags/2.0.1/src_plugins/export_dsn/dsn.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dsn/dsn.c	(revision 18980)
@@ -0,0 +1,629 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  Specctra .dsn export HID
+ *  Copyright (C) 2008, 2011 Josh Jordan, Dan McMahill, and Jared Casper
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+This program exports specctra .dsn files from geda .pcb files.
+By Josh Jordan and Dan McMahill, modified from bom.c
+  -- Updated to use Coord and other fixes by Jared Casper 16 Sep 2011
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <genvector/gds_char.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "rats.h"
+#include "buffer.h"
+#include "change.h"
+#include "draw.h"
+#include "undo.h"
+#include "pcb-printf.h"
+#include "polygon.h"
+#include "compat_misc.h"
+#include "layer.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_draw_helpers.h"
+#include "hid_nogui.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_cam.h"
+#include "plugins.h"
+#include "obj_line.h"
+#include "obj_pstk_inlines.h"
+
+static const char *dsn_cookie = "dsn exporter";
+
+#define GRP_NAME(grp_) ((grp_) - PCB->LayerGroups.grp), ((grp_)->name)
+
+static pcb_coord_t trackwidth = 8;  /* user options defined in export dialog */
+static pcb_coord_t clearance = 8;
+static pcb_coord_t viawidth = 45;
+static pcb_coord_t viadrill = 25;
+
+static pcb_hid_t dsn_hid;
+
+static pcb_hid_attribute_t dsn_options[] = {
+	{"dsnfile", "SPECCTRA output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_dsnfile 0
+	{"trackwidth", "track width in mils",
+	 PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0},
+#define HA_trackwidth 1
+	{"clearance", "clearance in mils",
+	 PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(8)}, 0, 0},
+#define HA_clearance 2
+	{"viawidth", "via width in mils",
+	 PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(27)}, 0,
+	 0},
+#define HA_viawidth 3
+	{"viadrill", "via drill diameter in mils",
+	 PCB_HATT_COORD, PCB_MIL_TO_COORD(0), PCB_MIL_TO_COORD(100), {0, 0, 0, PCB_MIL_TO_COORD(15)}, 0,
+	 0},
+#define HA_viadrill 4
+};
+
+#define NUM_OPTIONS (sizeof(dsn_options)/sizeof(dsn_options[0]))
+PCB_REGISTER_ATTRIBUTES(dsn_options, dsn_cookie)
+
+static pcb_hid_attr_val_t dsn_values[NUM_OPTIONS];
+
+static const char *dsn_filename;
+
+static pcb_hid_attribute_t *dsn_get_export_options(int *n)
+{
+	static char *last_dsn_filename = 0;
+	if (PCB) {
+		pcb_derive_default_filename(PCB->Filename, &dsn_options[HA_dsnfile], ".dsn", &last_dsn_filename);
+	}
+	if (n)
+		*n = NUM_OPTIONS;
+	return dsn_options;
+}
+
+static void print_structure(FILE * fp)
+{
+	pcb_layergrp_id_t group, top_group, bot_group;
+
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &top_group, 1);
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &bot_group, 1);
+
+	fprintf(fp, "  (structure\n");
+	for (group = 0; group < pcb_max_group(PCB); group++) {
+		int ni;
+		pcb_layergrp_t *g = &PCB->LayerGroups.grp[group];
+		char *layeropts = pcb_strdup("(type signal)");
+		
+		if (!(g->ltype & PCB_LYT_COPPER))
+			continue;
+
+#warning TODO: revise this; use attributes instead
+		/* see if group has same name as a net and make it a power layer */
+		/* loop thru all nets */
+		for(ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+			char *nname;
+			nname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
+			if (!strcmp(g->name, nname)) {
+				free(layeropts);
+				layeropts = pcb_strdup_printf("(type power) (use_net \"%s\")", g->name);
+			}
+		}
+		fprintf(fp, "    (layer \"%d__%s\"\n", GRP_NAME(g));
+		fprintf(fp, "      %s\n", layeropts);
+		fprintf(fp, "    )\n");
+		free(layeropts);
+	}
+
+	/* PCB outline */
+	pcb_fprintf(fp, "    (boundary\n");
+	pcb_fprintf(fp, "      (rect pcb 0.0 0.0 %.6mm %.6mm)\n", PCB->MaxWidth, PCB->MaxHeight);
+	pcb_fprintf(fp, "    )\n");
+	pcb_fprintf(fp, "    (via via_%ld_%ld)\n", viawidth, viadrill);
+
+	/* DRC rules */
+	pcb_fprintf(fp, "    (rule\n");
+	pcb_fprintf(fp, "      (width %mm)\n", trackwidth);
+	pcb_fprintf(fp, "      (clear %mm)\n", clearance);
+	pcb_fprintf(fp, "      (clear %mm (type wire_area))\n", clearance);
+	pcb_fprintf(fp, "      (clear %mm (type via_smd via_pin))\n", clearance);
+	pcb_fprintf(fp, "      (clear %mm (type smd_smd))\n", clearance);
+	pcb_fprintf(fp, "      (clear %mm (type default_smd))\n", clearance);
+	pcb_fprintf(fp, "    )\n  )\n");
+}
+
+static void print_placement(FILE * fp)
+{
+	fprintf(fp, "  (placement\n");
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		char *ename;
+		pcb_coord_t ox, oy;
+		char *side;
+		int res;
+		int subc_on_solder = 0;
+
+		pcb_subc_get_side(subc, &subc_on_solder);
+		side = subc_on_solder ? "back" : "front";
+
+		res = pcb_subc_get_origin(subc, &ox, &oy);
+		assert(res == 0);
+		if (subc->refdes != NULL)
+			ename = pcb_strdup(subc->refdes);
+		else
+			ename = pcb_strdup("null");
+		pcb_fprintf(fp, "    (component %d\n", subc->ID);
+		pcb_fprintf(fp, "      (place \"%s\" %.6mm %.6mm %s 0 (PN 0))\n", ename, ox, PCB->MaxHeight - oy, side);
+		pcb_fprintf(fp, "    )\n");
+		free(ename);
+	}
+	PCB_END_LOOP;
+
+#warning padstack TODO: check if real shapes are exported
+	PCB_PADSTACK_LOOP(PCB->Data);
+	{ /* add mounting holes */
+		pcb_fprintf(fp, "    (component %d\n", padstack->ID);
+		pcb_fprintf(fp, "      (place %d %.6mm %.6mm %s 0 (PN 0))\n", padstack->ID, padstack->x, (PCB->MaxHeight - padstack->y), "front");
+		pcb_fprintf(fp, "    )\n");
+	}
+	PCB_END_LOOP;
+
+	fprintf(fp, "  )\n");
+}
+
+static void print_polyshape(gds_t *term_shapes, pcb_pstk_poly_t *ply, pcb_coord_t ox, pcb_coord_t oy, pcb_layergrp_t *grp, int partsidesign)
+{
+	char tmp[512];
+	int fld;
+	int n;
+
+	pcb_snprintf(tmp, sizeof(tmp), "        (polygon \"%d__%s\" 0", GRP_NAME(grp));
+	gds_append_str(term_shapes, tmp);
+
+	fld = 0;
+	for(n = 0; n < ply->len; n++) {
+		if ((fld % 3) == 0)
+			gds_append_str(term_shapes, "\n       ");
+		pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (ply->x[n] - ox) * partsidesign, -(ply->y[n] - oy));
+		gds_append_str(term_shapes, tmp);
+		fld++;
+	}
+
+	gds_append_str(term_shapes, "\n        )\n");
+}
+
+static void print_lineshape(gds_t *term_shapes, pcb_pstk_line_t *lin, pcb_coord_t ox, pcb_coord_t oy, pcb_layergrp_t *grp, int partsidesign)
+{
+	char tmp[512];
+	int fld;
+	pcb_coord_t x[4], y[4];
+	int n;
+	pcb_line_t ltmp;
+
+	pcb_snprintf(tmp, sizeof(tmp), "        (polygon \"%d__%s\" 0", GRP_NAME(grp));
+	gds_append_str(term_shapes, tmp);
+
+	memset(&ltmp, 0, sizeof(ltmp));
+	ltmp.Point1.X = lin->x1;
+	ltmp.Point1.Y = lin->y1;
+	ltmp.Point2.X = lin->x2;
+	ltmp.Point2.Y = lin->y2;
+	ltmp.Thickness = lin->thickness;
+	pcb_sqline_to_rect(&ltmp, x, y);
+
+#warning padstack TODO: this ignores round cap
+
+	fld = 0;
+	for(n = 0; n < 4; n++) {
+		if ((fld % 3) == 0)
+			gds_append_str(term_shapes, "\n       ");
+		pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x[n] - ox) * partsidesign, -(y[n] - oy));
+		gds_append_str(term_shapes, tmp);
+		fld++;
+	}
+
+	gds_append_str(term_shapes, "\n        )\n");
+}
+
+static void print_circshape(gds_t *term_shapes, pcb_pstk_circ_t *circ, pcb_coord_t ox, pcb_coord_t oy, pcb_layergrp_t *grp, int partsidesign)
+{
+	char tmp[512];
+
+	pcb_snprintf(tmp, sizeof(tmp), "        (circle \"%d__%s\"", GRP_NAME(grp));
+	gds_append_str(term_shapes, tmp);
+
+#warning padstack TODO: this ignores circle center offset
+
+	pcb_snprintf(tmp, sizeof(tmp), " %.6mm)\n", circ->dia);
+	gds_append_str(term_shapes, tmp);
+}
+
+static void print_polyline(gds_t *term_shapes, pcb_poly_it_t *it, pcb_pline_t *pl, pcb_coord_t ox, pcb_coord_t oy, pcb_layergrp_t *grp, int partsidesign)
+{
+	char tmp[512];
+	int fld;
+	pcb_coord_t x, y;
+	int go;
+
+	if (pl != NULL) {
+		pcb_snprintf(tmp, sizeof(tmp), "(polygon \"%d__%s\" 0", GRP_NAME(grp));
+		gds_append_str(term_shapes, tmp);
+
+		fld = 0;
+		for(go = pcb_poly_vect_first(it, &x, &y); go; go = pcb_poly_vect_next(it, &x, &y)) {
+			if ((fld % 3) == 0)
+				gds_append_str(term_shapes, "\n       ");
+			pcb_snprintf(tmp, sizeof(tmp), " %.6mm %.6mm", (x - ox) * partsidesign, -(y - oy));
+			gds_append_str(term_shapes, tmp);
+			fld++;
+		}
+
+		gds_append_str(term_shapes, "\n        )\n");
+	}
+}
+
+static void print_term_poly(FILE *fp, gds_t *term_shapes, pcb_poly_t *poly, pcb_coord_t ox, pcb_coord_t oy, int term_on_bottom, int partsidesign)
+{
+	if (poly->term != NULL) {
+		pcb_layergrp_id_t gid = term_on_bottom ? pcb_layergrp_get_bottom_copper() : pcb_layergrp_get_top_copper();
+		pcb_layergrp_t *grp = pcb_get_layergrp(PCB, gid);
+		char *padstack = pcb_strdup_printf("Term_poly_%ld", poly->ID);
+		pcb_poly_it_t it;
+		pcb_polyarea_t *pa;
+
+
+		pcb_fprintf(fp, "      (pin %s \"%s\" %.6mm %.6mm)\n", padstack, poly->term, 0, 0);
+
+		gds_append_str(term_shapes, "    (padstack ");
+		gds_append_str(term_shapes, padstack);
+		gds_append_str(term_shapes, "\n");
+
+		gds_append_str(term_shapes, "      (shape ");
+
+		for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+			pcb_pline_t *pl;
+
+			pl = pcb_poly_contour(&it);
+
+			print_polyline(term_shapes, &it, pl, ox, oy, grp, partsidesign);
+		}
+
+		gds_append_str(term_shapes, "      )\n");
+		gds_append_str(term_shapes, "      (attach off)\n");
+		gds_append_str(term_shapes, "    )\n");
+	}
+}
+
+void print_pstk_shape(gds_t *term_shapes, pcb_pstk_t *padstack, pcb_layergrp_id_t gid, pcb_coord_t ox, pcb_coord_t oy, int partsidesign)
+{
+	pcb_pstk_shape_t *shp;
+	pcb_layergrp_t *grp = pcb_get_layergrp(PCB, gid);
+	pcb_layer_type_t lyt = grp->ltype;
+
+	shp = pcb_pstk_shape(padstack, lyt, 0);
+	if (shp == NULL)
+		return;
+
+	/* if the subc is placed on the other side, need to invert the output layerstack as well */
+	if (partsidesign < 0) {
+		pcb_layergrp_id_t n, offs = 0;
+
+		/* determine copper offset from the top */
+		for(n = 0; (n < PCB->LayerGroups.len) && (n != gid); n++)
+			if (PCB->LayerGroups.grp[n].type & PCB_LYT_COPPER)
+				offs++;
+
+		/* count it back from the bottom and set grp */
+		for(n = PCB->LayerGroups.len-1; (n > 0) && (n != gid); n--) {
+			if (PCB->LayerGroups.grp[n].type & PCB_LYT_COPPER) {
+				if (offs == 0) {
+					grp = &PCB->LayerGroups.grp[n];
+					break;
+				}
+				offs--;
+			}
+		}
+	}
+
+	switch(shp->shape) {
+		case PCB_PSSH_POLY:
+			print_polyshape(term_shapes, &shp->data.poly, ox, oy, grp, partsidesign);
+			break;
+		case PCB_PSSH_LINE:
+			print_lineshape(term_shapes, &shp->data.line, ox, oy, grp, partsidesign);
+			break;
+		case PCB_PSSH_CIRC:
+			print_circshape(term_shapes, &shp->data.circ, ox, oy, grp, partsidesign);
+			break;
+	}
+}
+
+static void print_library(FILE * fp)
+{
+	gds_t term_shapes;
+
+	gds_init(&term_shapes);
+
+	fprintf(fp, "  (library\n");
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_coord_t ox, oy;
+		int partsidesign, subc_on_solder = 0;
+		pcb_layer_type_t lyt_side;
+
+		pcb_subc_get_side(subc, &subc_on_solder);
+		partsidesign = subc_on_solder ? -1 : 1;
+		lyt_side = subc_on_solder ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+
+		pcb_subc_get_origin(subc, &ox, &oy);
+
+		fprintf(fp, "    (image %ld\n", subc->ID); /* map every subc by ID */
+		PCB_POLY_COPPER_LOOP(subc->data);
+		{
+			pcb_layer_type_t lyt = pcb_layer_flags_(layer);
+			if ((lyt & PCB_LYT_COPPER) && ((lyt & PCB_LYT_TOP) || (lyt & PCB_LYT_BOTTOM)))
+				print_term_poly(fp, &term_shapes, polygon, ox, oy, !(lyt & lyt_side), partsidesign);
+		}
+		PCB_ENDALL_LOOP;
+
+		PCB_PADSTACK_LOOP(subc->data);
+		{
+			pcb_layergrp_id_t group;
+			char *pid = pcb_strdup_printf("Pstk_shape_%ld", padstack->ID);
+
+			pcb_fprintf(fp, "      (pin %s \"%s\" %.6mm %.6mm)\n", pid, padstack->term, (padstack->x-ox)*partsidesign, -(padstack->y-oy));
+
+			gds_append_str(&term_shapes, "    (padstack ");
+			gds_append_str(&term_shapes, pid);
+			gds_append_str(&term_shapes, "\n");
+
+			gds_append_str(&term_shapes, "      (shape\n");
+
+			for (group = 0; group < pcb_max_group(PCB); group++) {
+				pcb_layergrp_t *g = &PCB->LayerGroups.grp[group];
+				if (g->ltype & PCB_LYT_COPPER)
+					print_pstk_shape(&term_shapes, padstack, group, 0, 0, partsidesign);
+			}
+
+			gds_append_str(&term_shapes, "      )\n");
+			gds_append_str(&term_shapes, "      (attach off)\n");
+			gds_append_str(&term_shapes, "    )\n");
+		}
+		PCB_END_LOOP;
+
+		fprintf(fp, "    )\n");
+	}
+	PCB_END_LOOP;
+
+	/* add padstack for terminals */
+	pcb_fprintf(fp, "%s", term_shapes.array);
+	pcb_fprintf(fp, "  )\n");
+
+
+	gds_uninit(&term_shapes);
+}
+
+static void print_quoted_pin(FILE * fp, const char *s)
+{
+	char *hyphen_pos = strchr(s, '-');
+	if (!hyphen_pos) {
+		fprintf(fp, " %s", s);
+	}
+	else {
+		char refdes_name[1024];
+		int copy_len = hyphen_pos - s;
+		if (copy_len >= sizeof(refdes_name))
+			copy_len = sizeof(refdes_name) - 1;
+		strncpy(refdes_name, s, copy_len);
+		refdes_name[copy_len] = 0;
+		fprintf(fp, " \"%s\"-\"%s\"", refdes_name, hyphen_pos + 1);
+	}
+}
+
+static void print_network(FILE * fp)
+{
+	int ni, nei;
+	fprintf(fp, "  (network\n");
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		fprintf(fp, "    (net \"%s\"\n", PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2);
+		fprintf(fp, "      (pins");
+		for (nei = 0; nei < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].EntryN; nei++)
+			print_quoted_pin(fp, PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry);
+		fprintf(fp, ")\n");
+		fprintf(fp, "    )\n");
+	}
+
+	fprintf(fp, "    (class geda_default");
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		fprintf(fp, " \"%s\"", PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2);
+	}
+	pcb_fprintf(fp, "\n");
+	pcb_fprintf(fp, "      (circuit\n");
+	pcb_fprintf(fp, "        (use_via via_%ld_%ld)\n", viawidth, viadrill);
+	pcb_fprintf(fp, "      )\n");
+	pcb_fprintf(fp, "      (rule (width %.6mm))\n    )\n  )\n", trackwidth);
+}
+
+static void print_wires(FILE * fp)
+{
+	int group;
+	fprintf(fp, "    (wiring\n");
+
+	for (group = 0; group < pcb_max_group(PCB); group++) {
+		pcb_layergrp_t *g = &PCB->LayerGroups.grp[group];
+		pcb_cardinal_t n;
+		if (!(g->ltype & PCB_LYT_COPPER))
+			continue;
+		for(n = 0; n < g->len; n++) {
+			pcb_layer_t *lay = pcb_get_layer(PCB->Data, g->lid[n]);
+
+			PCB_LINE_LOOP(lay);
+			{
+				pcb_fprintf(fp,
+					"        (wire (path %d__%s %.6mm %.6mm %.6mm %.6mm %.6mm)\n", GRP_NAME(g), line->Thickness,
+					line->Point1.X, (PCB->MaxHeight - line->Point1.Y),
+					line->Point2.X, (PCB->MaxHeight - line->Point2.Y));
+				fprintf(fp, "            (type protect))\n");
+			}
+			PCB_END_LOOP;
+		}
+	}
+	fprintf(fp, "\n    )\n)\n"); /* close all braces */
+}
+
+static int PrintSPECCTRA(void)
+{
+	FILE *fp;
+	/* Print out the dsn .dsn file. */
+	fp = pcb_fopen(dsn_filename, "w");
+	if (!fp) {
+		pcb_message(PCB_MSG_WARNING, "Cannot open file %s for writing\n", dsn_filename);
+		return 1;
+	}
+
+	/* pcb [required] */
+	fprintf(fp, "(pcb %s\n", ((PCB->Name) && *(PCB->Name) ? (PCB->Name) : "notnamed"));
+
+	/* parser descriptor [optional] */
+	fprintf(fp, "  (parser\n");
+	fprintf(fp, "    (string_quote \")\n");
+	fprintf(fp, "    (space_in_quoted_tokens on)\n");
+	fprintf(fp, "    (host_cad \"pcb-rnd\")\n");
+	fprintf(fp, "    (host_version \"%s\")\n", PCB_VERSION);
+	fprintf(fp, "  )\n");
+
+	/* capacitance resolution descriptor [optional] */
+
+	/* conductance resolution descriptor [optional] */
+
+	/* current resolution descriptor [optional] */
+
+	/* inductance resolution descriptor [optional] */
+
+	/* resistance resolution descriptor [optional] */
+
+	/* resolution descriptor [optional] */
+	fprintf(fp, "  (resolution mm 1000000)\n");
+
+	/* time resolution descriptor [optional] */
+
+	/* voltage resolution descriptor [optional] */
+
+	/* unit descriptor [optional] */
+
+	/* structure descriptor [required] */
+	print_structure(fp);
+
+	/* placement descriptor [optional] */
+	print_placement(fp);
+
+	/* library descriptor [required] */
+	print_library(fp);
+
+	/* floor plan descriptor [optional] */
+
+	/* part library descriptor [optional] */
+
+	/* network descriptor [required] */
+	print_network(fp);
+
+	/* wiring descriptor [optional] */
+	print_wires(fp);
+
+	/* color descriptor [optional] */
+
+	fclose(fp);
+
+	return 0;
+}
+
+
+static void dsn_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+	if (!options) {
+		dsn_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			dsn_values[i] = dsn_options[i].default_val;
+		options = dsn_values;
+	}
+	dsn_filename = options[HA_dsnfile].str_value;
+	if (!dsn_filename)
+		dsn_filename = "pcb-out.dsn";
+
+	trackwidth = options[HA_trackwidth].coord_value;
+	clearance = options[HA_clearance].coord_value;
+	viawidth = options[HA_viawidth].coord_value;
+	viadrill = options[HA_viadrill].coord_value;
+	PrintSPECCTRA();
+}
+
+static int dsn_parse_arguments(int *argc, char ***argv)
+{
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+int pplg_check_ver_export_dsn(int ver_needed) { return 0; }
+
+void pplg_uninit_export_dsn(void)
+{
+	pcb_hid_remove_attributes_by_cookie(dsn_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_export_dsn(void)
+{
+	PCB_API_CHK_VER;
+	memset(&dsn_hid, 0, sizeof(pcb_hid_t));
+	pcb_hid_nogui_init(&dsn_hid);
+
+	dsn_hid.struct_size = sizeof(pcb_hid_t);
+	dsn_hid.name = "dsn";
+	dsn_hid.description = "Exports DSN format";
+	dsn_hid.exporter = 1;
+	dsn_hid.get_export_options = dsn_get_export_options;
+	dsn_hid.do_export = dsn_do_export;
+	dsn_hid.parse_arguments = dsn_parse_arguments;
+	pcb_hid_register_hid(&dsn_hid);
+
+	pcb_hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/export_dsn/export_dsn.pup
===================================================================
--- tags/2.0.1/src_plugins/export_dsn/export_dsn.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dsn/export_dsn.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short specctra .dsn pcb_exporter
+$long Export specctra .dsn files
+$state works
+$fmt-native no
+$fmt-feature-w export specctra .dsn files with padstacks and subcircuits (usable for freerouting)
+$package auto
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_dxf/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_dxf
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_dxf/Makefile.test
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/Makefile.test	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/Makefile.test	(revision 18980)
@@ -0,0 +1,15 @@
+LHT=../../src_3rd/liblihata
+HT=../../src_3rd/genht
+CFLAGS = -Wall -g -I../../src_3rd -DTESTER
+LDFLAGS =
+OBJS =  $(LHT)/parser.o $(LHT)/lihata.o  $(HT)/htsp.o $(HT)/hash.o \
+  $(LHT)/dom.o $(LHT)/dom_list.o $(LHT)/dom_hash.o $(LHT)/dom_table.o \
+  $(LHT)/tree_path.o $(LHT)/tree.o $(LHT)/tree_list.o $(LHT)/tree_hash.o \
+  $(LHT)/tree_table.o $(LHT)/hash_str.o
+
+lht_template: lht_template.o $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+lht_template.o: lht_template.c
+	$(CC) -c -o $@ $(CFLAGS) lht_template.c
+
Index: tags/2.0.1/src_plugins/export_dxf/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,21 @@
+put /local/pcb/mod {export_dxf}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/export_dxf/dxf.o
+	$(PLUGDIR)/export_dxf/lht_template.o
+	$(PLUGDIR)/export_dxf/dxf_templ_lht.o
+@]
+
+switch /local/pcb/export_dxf/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
+# always generate the template lht rule so make dep can be run
+append /local/pcb/CLEANFILES { $(PLUGDIR)/export_dxf/dxf_templ_lht.c }
+append /local/pcb/DEPDEPS { $(PLUGDIR)/export_dxf/dxf_templ_lht.c }
+append /local/pcb/RULES [@
+### export_dxf: dxf template embed
+$(PLUGDIR)/export_dxf/dxf_templ_lht.c: $(PLUGDIR)/export_dxf/dxf_templ.lht $(CQUOTE)
+	$(CQUOTE) -n dxf_templ_default <$(PLUGDIR)/export_dxf/dxf_templ.lht >$(PLUGDIR)/export_dxf/dxf_templ_lht.c
+@]
Index: tags/2.0.1/src_plugins/export_dxf/dxf.c
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/dxf.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/dxf.c	(revision 18980)
@@ -0,0 +1,542 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017,2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "layer.h"
+#include "plugins.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "lht_template.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+static const char *layer_names[] = {
+	"outline",
+	"bottom_copper", "top_copper",
+	"bottom_silk", "top_silk",
+	"drill_plated", "drill_unplated",
+	NULL
+};
+
+static pcb_hid_t dxf_hid;
+
+const char *dxf_cookie = "dxf HID";
+
+static pcb_cam_t dxf_cam;
+
+
+typedef struct {
+	FILE *f;
+	unsigned long handle;
+	lht_doc_t *temp;
+	const char *layer_name;
+	unsigned force_thin:1;
+	unsigned enable_force_thin:1;
+	unsigned poly_fill:1;
+	unsigned poly_contour:1;
+	unsigned drill_fill:1;
+	unsigned drill_contour:1;
+} dxf_ctx_t;
+
+static dxf_ctx_t dxf_ctx;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	pcb_coord_t width;
+	char *color;
+	int drill;
+	unsigned warned_elliptical:1;
+	unsigned drawing_hole:1;
+} hid_gc_s;
+
+static struct hid_gc_s thin = {
+	{0},
+	NULL,
+	0, 1,
+	NULL, 0, 0
+};
+
+
+#include "dxf_draw.c"
+
+
+pcb_hid_attribute_t dxf_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --outfile <string>
+Name of the file to be exported to. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"outfile", "Graphics output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_dxffile 0
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --template <string>
+Name of the lihata template file to be used instead of the default dxf template. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"template", "DXF template (lihata file)",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_template 1
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --thin
+Draw outline and drills with thin lines.
+@end ftable
+%end-doc
+*/
+	{"thin", "Draw outline and drill with thin lines",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_thin 2
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --poly-fill
+Fill polygons using hatch
+@end ftable
+%end-doc
+*/
+	{"poly-fill", "Fill polygons using hatch",
+	 PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0},
+#define HA_poly_fill 3
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --poly-fill
+Draw polygons contour with thin line
+@end ftable
+%end-doc
+*/
+	{"poly-contour", "Draw polygons contour with thin line",
+	 PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0},
+#define HA_poly_contour 4
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --drill-fill
+Fill drill (hole) circles using hatch
+@end ftable
+%end-doc
+*/
+	{"drill-fill", "Fill drill (hole) circles using hatch",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_drill_fill 5
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --polyfill
+Draw drill contour with thin line
+@end ftable
+%end-doc
+*/
+	{"drill-contour", "Draw drill contour with thin line",
+	 PCB_HATT_BOOL, 0, 0, {1, (void *)1, 1}, 0, 0},
+#define HA_drill_contour 6
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cam 7
+
+};
+
+#define NUM_OPTIONS (sizeof(dxf_attribute_list)/sizeof(dxf_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(dxf_attribute_list, dxf_cookie)
+
+static pcb_hid_attr_val_t dxf_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *dxf_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".dxf";
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &dxf_attribute_list[HA_dxffile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return dxf_attribute_list;
+}
+
+void dxf_hid_export_to_file(dxf_ctx_t *ctx, pcb_hid_attr_val_t * options)
+{
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_hid_expose_ctx_t hectx;
+
+	hectx.view.X1 = 0;
+	hectx.view.Y1 = 0;
+	hectx.view.X2 = PCB->MaxWidth;
+	hectx.view.Y2 = PCB->MaxHeight;
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+/*		conf_force_set_bool(conf_core.editor.check_planes, 0);*/
+	conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+	dxf_ctx.enable_force_thin = options[HA_thin].int_value;
+	dxf_ctx.poly_fill = options[HA_poly_fill].int_value;
+	dxf_ctx.poly_contour = options[HA_poly_contour].int_value;
+	dxf_ctx.drill_fill = options[HA_drill_fill].int_value;
+	dxf_ctx.drill_contour = options[HA_drill_contour].int_value;
+
+	pcb_hid_expose_all(&dxf_hid, &hectx);
+
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+int insert_hdr(FILE *f, const char *prefix, char *name, lht_err_t *err)
+{
+	if (strcmp(name, "extmin") == 0)
+		fprintf(f, "10\n0\n20\n0\n30\n0\n");
+	else if (strcmp(name, "extmax") == 0)
+		pcb_fprintf(f, "10\n%mm\n20\n0\n30\n%mm\n", PCB->MaxWidth, PCB->MaxHeight);
+	else if (strcmp(name, "layers") == 0) {
+		const char **s;
+		for(s = layer_names; *s != NULL; s++)
+			dxf_gen_layer(&dxf_ctx, *s);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Invalid header insertion: '%s'\n", name);
+		return -1;
+	}
+
+	return 0;
+}
+
+int insert_ftr(FILE *f, const char *prefix, char *name, lht_err_t *err)
+{
+	pcb_message(PCB_MSG_ERROR, "Invalid footer insertion: '%s'\n", name);
+	return -1;
+}
+
+extern const char dxf_templ_default_arr[];
+static void dxf_do_export(pcb_hid_attr_val_t * options)
+{
+	const char *filename;
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+	const char *fn;
+	char *errmsg;
+	lht_err_t err;
+
+	if (!options) {
+		dxf_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			dxf_values[i] = dxf_attribute_list[i].default_val;
+		options = dxf_values;
+	}
+
+	pcb_cam_begin(PCB, &dxf_cam, options[HA_cam].str_value, dxf_attribute_list, NUM_OPTIONS, options);
+
+	filename = options[HA_dxffile].str_value;
+	if (!filename)
+		filename = "pcb.dxf";
+
+	dxf_ctx.f = pcb_fopen(dxf_cam.active ? dxf_cam.fn : filename, "wb");
+	if (!dxf_ctx.f) {
+		perror(filename);
+		return;
+	}
+
+	fn = options[HA_template].str_value;
+	if (fn == NULL) {
+		fn = "<embedded template>";
+		dxf_ctx.temp = lht_dom_load_string(dxf_templ_default_arr, fn, &errmsg);
+	}
+	else {
+		char *real_fn;
+		dxf_ctx.temp = NULL;
+		real_fn = pcb_fopen_check(fn, "r");
+		if (real_fn != NULL)
+			dxf_ctx.temp = lht_dom_load(real_fn, &errmsg);
+		free(real_fn);
+	}
+
+	if (dxf_ctx.temp == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open dxf template: %s\n", fn);
+		fclose(dxf_ctx.f);
+		return;
+	}
+
+	dxf_ctx.handle = 100;
+	if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "header", insert_hdr, &err) != 0)
+		pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+
+	if (!dxf_cam.active)
+		pcb_hid_save_and_show_layer_ons(save_ons);
+
+	dxf_hid_export_to_file(&dxf_ctx, options);
+
+	if (!dxf_cam.active)
+		pcb_hid_restore_layer_ons(save_ons);
+
+	if (lht_temp_exec(dxf_ctx.f, "", dxf_ctx.temp, "footer", insert_ftr, &err) != 0)
+		pcb_message(PCB_MSG_ERROR, "Can't render dxf template header\n");
+
+	fclose(dxf_ctx.f);
+
+	if (pcb_cam_end(&dxf_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "dxf cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+}
+
+static int dxf_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]), dxf_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int dxf_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	pcb_cam_set_layer_group(&dxf_cam, group, flags);
+
+	if (!dxf_cam.active) {
+		if (flags & PCB_LYT_INVIS)
+			return 0;
+	}
+
+	dxf_ctx.force_thin = 0;
+
+	if (flags & PCB_LYT_OUTLINE) {
+		dxf_ctx.layer_name = "outline";
+		dxf_ctx.force_thin = 1;
+		return 1;
+	}
+
+	if (flags & PCB_LYT_PDRILL) {
+		dxf_ctx.layer_name = "drill_plated";
+		dxf_ctx.force_thin = 1;
+		return 1;
+	}
+
+	if (flags & PCB_LYT_UDRILL) {
+		dxf_ctx.layer_name = "drill_unplated";
+		dxf_ctx.force_thin = 1;
+		return 1;
+	}
+
+	if ((flags & PCB_LYT_TOP) && (flags & PCB_LYT_COPPER)) {
+		dxf_ctx.layer_name = "top_copper";
+		return 1;
+	}
+
+	if ((flags & PCB_LYT_TOP) && (flags & PCB_LYT_SILK)) {
+		dxf_ctx.layer_name = "top_silk";
+		return 1;
+	}
+
+	if ((flags & PCB_LYT_BOTTOM) && (flags & PCB_LYT_COPPER)) {
+		dxf_ctx.layer_name = "bottom_copper";
+		return 1;
+	}
+
+	if ((flags & PCB_LYT_BOTTOM) && (flags & PCB_LYT_SILK)) {
+		dxf_ctx.layer_name = "bottom_silk";
+		return 1;
+	}
+
+	return 0;
+}
+
+
+static pcb_hid_gc_t dxf_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
+	rv->me_pointer = &dxf_hid;
+	return rv;
+}
+
+static void dxf_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void dxf_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	if (direct)
+		return;
+
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+		case PCB_HID_COMP_NEGATIVE:
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			break;
+	}
+}
+
+static void dxf_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	if (strcmp(name, "drill") == 0)
+		gc->drawing_hole = 1;
+}
+
+static void dxf_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void dxf_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+
+static void dxf_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+#define fix_rect_coords() \
+	if (x1 > x2) {\
+		pcb_coord_t t = x1; \
+		x1 = x2; \
+		x2 = t; \
+	} \
+	if (y1 > y2) { \
+		pcb_coord_t t = y1; \
+		y1 = y2; \
+		y2 = t; \
+	}
+
+static void dxf_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	fix_rect_coords();
+}
+
+static void dxf_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	fix_rect_coords();
+}
+
+static void dxf_calibrate(double xval, double yval)
+{
+	pcb_message(PCB_MSG_ERROR, "dxf_calibrate() not implemented");
+	return;
+}
+
+static void dxf_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int dxf_usage(const char *topic)
+{
+	fprintf(stderr, "\ndxf exporter command line arguments:\n\n");
+	pcb_hid_usage(dxf_attribute_list, sizeof(dxf_attribute_list) / sizeof(dxf_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x dxf [dxf options] foo.pcb\n\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+int pplg_check_ver_export_dxf(int ver_needed) { return 0; }
+
+void pplg_uninit_export_dxf(void)
+{
+	pcb_hid_remove_attributes_by_cookie(dxf_cookie);
+}
+
+int pplg_init_export_dxf(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&dxf_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&dxf_hid);
+	pcb_dhlp_draw_helpers_init(&dxf_hid);
+
+	dxf_hid.struct_size = sizeof(pcb_hid_t);
+	dxf_hid.name = "dxf";
+	dxf_hid.description = "Drawing eXchange Format exporter";
+	dxf_hid.exporter = 1;
+
+	dxf_hid.get_export_options = dxf_get_export_options;
+	dxf_hid.do_export = dxf_do_export;
+	dxf_hid.parse_arguments = dxf_parse_arguments;
+	dxf_hid.set_layer_group = dxf_set_layer_group;
+	dxf_hid.make_gc = dxf_make_gc;
+	dxf_hid.destroy_gc = dxf_destroy_gc;
+	dxf_hid.set_drawing_mode = dxf_set_drawing_mode;
+	dxf_hid.set_color = dxf_set_color;
+	dxf_hid.set_line_cap = dxf_set_line_cap;
+	dxf_hid.set_line_width = dxf_set_line_width;
+	dxf_hid.set_draw_xor = dxf_set_draw_xor;
+	dxf_hid.draw_line = dxf_draw_line;
+	dxf_hid.draw_arc = dxf_draw_arc;
+	dxf_hid.draw_rect = dxf_draw_rect;
+	dxf_hid.fill_circle = dxf_fill_circle;
+	dxf_hid.fill_polygon = dxf_fill_polygon;
+	dxf_hid.fill_polygon_offs = dxf_fill_polygon_offs;
+	dxf_hid.fill_rect = dxf_fill_rect;
+	dxf_hid.calibrate = dxf_calibrate;
+	dxf_hid.set_crosshair = dxf_set_crosshair;
+
+	dxf_hid.usage = dxf_usage;
+
+	pcb_hid_register_hid(&dxf_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_dxf/dxf_draw.c
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/dxf_draw.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/dxf_draw.c	(revision 18980)
@@ -0,0 +1,202 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define TRX(x)   (x)
+#define TRY(y)   (PCB->MaxHeight - (y))
+
+static void dxf_draw_handle(dxf_ctx_t *ctx)
+{
+	ctx->handle++;
+	fprintf(ctx->f, "5\n%lu\n", ctx->handle);
+}
+
+static void dxf_draw_line_props(dxf_ctx_t *ctx, pcb_hid_gc_t gc)
+{
+	fprintf(ctx->f, "100\nAcDbEntity\n");
+	fprintf(ctx->f, "8\n%s\n", ctx->layer_name); /* layer name */
+	fprintf(ctx->f, "6\nByLayer\n"); /* linetype name */
+	fprintf(ctx->f, "62\n256\n"); /* color; 256=ByLayer */
+
+	/* lineweight enum (width in 0.01mm) */
+	if (ctx->enable_force_thin && ctx->force_thin)
+		fprintf(ctx->f, "370\n1\n");
+	else
+		fprintf(ctx->f, "370\n%d\n", (int)pcb_round(PCB_COORD_TO_MM(gc->width)*100.0));
+}
+
+static void dxf_hatch_pre(dxf_ctx_t *ctx, pcb_hid_gc_t gc, int n_coords)
+{
+	fprintf(ctx->f, "0\nHATCH\n");
+	dxf_draw_handle(ctx);
+	dxf_draw_line_props(ctx, gc);
+	fprintf(ctx->f, "100\nAcDbHatch\n");
+	fprintf(ctx->f, "10\n0\n20\n0\n30\n0\n"); /* elevation */
+	fprintf(ctx->f, "210\n0\n220\n0\n230\n1\n"); /* extrusion */
+	fprintf(ctx->f, "2\nSOLID\n");
+	fprintf(ctx->f, "70\n1\n"); /* solid fill */
+	fprintf(ctx->f, "71\n0\n"); /* associativity: non */
+	fprintf(ctx->f, "91\n1\n"); /* number of loops (contours) */
+	fprintf(ctx->f, "92\n0\n"); /* boundary path type: default */
+	fprintf(ctx->f, "93\n%d\n", n_coords);
+}
+
+static void dxf_hatch_post(dxf_ctx_t *ctx)
+{
+	fprintf(ctx->f, "97\n0\n"); /* number of source boundaries */
+	fprintf(ctx->f, "75\n0\n"); /* hatch style: normal, odd parity */
+	fprintf(ctx->f, "76\n1\n"); /* pattern type: predefined */
+	fprintf(ctx->f, "98\n0\n"); /* number of seed points */
+}
+
+static void dxf_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	dxf_ctx_t *ctx = &dxf_ctx;
+	fprintf(ctx->f, "0\nLINE\n");
+	dxf_draw_handle(ctx);
+	dxf_draw_line_props(ctx, gc);
+	fprintf(ctx->f, "100\nAcDbLine\n");
+	pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x1), TRY(y1));
+	pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x2), TRY(y2));
+}
+
+static void dxf_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r)
+{
+	dxf_ctx_t *ctx = &dxf_ctx;
+	fprintf(ctx->f, "0\nCIRCLE\n");
+	dxf_draw_handle(ctx);
+	dxf_draw_line_props(ctx, &thin);
+
+	/* contour, just in case the hatch fails */
+	if (ctx->drill_contour) {
+		fprintf(ctx->f, "100\nAcDbCircle\n");
+		pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+		pcb_fprintf(ctx->f, "40\n%mm\n", r);
+	}
+
+	/* hatch for fill circle: use it for copper or if explicitly requested */
+	if (ctx->drill_fill || !gc->drawing_hole) {
+		dxf_hatch_pre(ctx, &thin, 1);
+		pcb_fprintf(ctx->f, "72\n2\n"); /* circular contour */
+		pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+		pcb_fprintf(ctx->f, "40\n%mm\n", r);
+		pcb_fprintf(ctx->f, "50\n0\n");
+		pcb_fprintf(ctx->f, "51\n360\n");
+		pcb_fprintf(ctx->f, "73\n1\n"); /* is closed */
+		dxf_hatch_post(ctx);
+	}
+}
+
+static void dxf_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t end_angle, tmp;
+	dxf_ctx_t *ctx = &dxf_ctx;
+
+	end_angle = start_angle + delta_angle;
+
+	if (delta_angle < 0) {
+		tmp = start_angle;
+		start_angle = end_angle;
+		end_angle = tmp;
+	}
+
+	start_angle -= 180;
+	end_angle -= 180;
+	if (end_angle >= 360)
+		end_angle -= 360;
+	if (end_angle < 0)
+		end_angle += 360;
+
+	fprintf(ctx->f, "0\nARC\n");
+	dxf_draw_handle(ctx);
+	dxf_draw_line_props(ctx, gc);
+	fprintf(ctx->f, "100\nAcDbCircle\n");
+	pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(cx), TRY(cy));
+	pcb_fprintf(ctx->f, "40\n%mm\n", (width + height)/2);
+	fprintf(ctx->f, "100\nAcDbArc\n");
+	fprintf(ctx->f, "50\n%f\n", start_angle);
+	fprintf(ctx->f, "51\n%f\n", end_angle);
+}
+
+static void dxf_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	dxf_ctx_t *ctx = &dxf_ctx;
+	int n, to;
+
+#if HATCH_NEEDS_BBOX
+	pcb_coord_t x_min, x_max, y_min, y_max;
+	x_max = x_min = *x + dx;
+	y_max = y_min = *y + dy;
+	for(n = 1; n < n_coords; n++) {
+		if (x[n] < x_min) x_min = x[n] + dx;
+		if (x[n] > x_max) x_max = x[n] + dx;
+		if (y[n] < y_min) y_min = y[n] + dy;
+		if (y[n] > y_max) y_max = y[n] + dy;
+	}
+#endif
+
+	if (ctx->poly_fill) {
+		dxf_hatch_pre(ctx, &thin, n_coords);
+		for(n = 0; n < n_coords; n++) {
+			to = n+1;
+			if (to == n_coords)
+				to = 0;
+			fprintf(ctx->f, "72\n1\n"); /* edge=line */
+			pcb_fprintf(ctx->f, "10\n%mm\n20\n%mm\n", TRX(x[n]+dx), TRY(y[n]+dy));
+			pcb_fprintf(ctx->f, "11\n%mm\n21\n%mm\n", TRX(x[to]+dx), TRY(y[to]+dy));
+		}
+		dxf_hatch_post(ctx);
+	}
+
+	if (ctx->poly_contour) {
+		for(n = 0; n < n_coords; n++) {
+			to = n+1;
+			if (to == n_coords)
+				to = 0;
+			dxf_draw_line(&thin, x[n]+dx, y[n]+dy, x[to]+dx, y[to]+dy);
+		}
+	}
+}
+
+
+static void dxf_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	dxf_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+static void dxf_gen_layer(dxf_ctx_t *ctx, const char *name)
+{
+	fprintf(ctx->f, "0\nLAYER\n");
+	dxf_draw_handle(ctx);
+	fprintf(ctx->f, "330\n2\n"); /* BLOCK_RECORD handle */
+	fprintf(ctx->f, "100\nAcDbSymbolTableRecord\n");
+	fprintf(ctx->f, "100\nAcDbLayerTableRecord\n");
+	fprintf(ctx->f, "2\n%s\n", name);
+	fprintf(ctx->f, "70\n0\n"); /* flags */
+	fprintf(ctx->f, "62\n7\n"); /* color */
+	fprintf(ctx->f, "6\nCONTINUOUS\n"); /* default line type */
+	fprintf(ctx->f, "370\n15\n"); /* default line width in 0.01mm */
+	fprintf(ctx->f, "390\nF\n"); /* plot style */
+}
Index: tags/2.0.1/src_plugins/export_dxf/dxf_templ.lht
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/dxf_templ.lht	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/dxf_templ.lht	(revision 18980)
@@ -0,0 +1,1554 @@
+ha:template {
+	trim_indent=1
+	ha:template {
+		li:header {
+			verbatim {
+				999
+				dxfrw 0.5.11
+				0
+				SECTION
+				2
+				HEADER
+				9
+				$ACADVER
+				1
+				AC1021
+				9
+				$HANDSEED
+				5
+				20000
+				9
+				$DWGCODEPAGE
+				3
+				ANSI_1252
+				9
+				$INSBASE
+				10
+				0
+				20
+				0
+				30
+				0
+				9
+				$EXTMIN
+			}
+			insert {extmin}
+			verbatim {
+				9
+				$EXTMAX
+			}
+			insert {extmax}
+			verbatim {
+				9
+				$LIMMIN
+				10
+				0
+				20
+				0
+				9
+				$LIMMAX
+				10
+				420
+				20
+				297
+				9
+				$ORTHOMODE
+				70
+				0
+				9
+				$LTSCALE
+				40
+				1
+				9
+				$TEXTSTYLE
+				7
+				STANDARD
+				9
+				$CLAYER
+				8
+				0
+				9
+				$DIMASZ
+				40
+				2.5
+				9
+				$DIMLFAC
+				40
+				1
+				9
+				$DIMSCALE
+				40
+				1
+				9
+				$DIMEXO
+				40
+				0.625
+				9
+				$DIMEXE
+				40
+				1.25
+				9
+				$DIMTXT
+				40
+				2.5
+				9
+				$DIMTSZ
+				40
+				0
+				9
+				$DIMAUNIT
+				70
+				0
+				9
+				$DIMADEC
+				70
+				0
+				9
+				$DIMLUNIT
+				70
+				2
+				9
+				$DIMSTYLE
+				2
+				STANDARD
+				9
+				$DIMGAP
+				40
+				0.625
+				9
+				$DIMTIH
+				70
+				0
+				9
+				$LUNITS
+				70
+				2
+				9
+				$LUPREC
+				70
+				4
+				9
+				$AUNITS
+				70
+				0
+				9
+				$AUPREC
+				70
+				2
+				9
+				$SPLINESEGS
+				70
+				8
+				9
+				$SNAPSTYLE
+				70
+				0
+				9
+				$PINSBASE
+				10
+				0
+				20
+				0
+				30
+				0
+				9
+				$PLIMMIN
+				10
+				0
+				20
+				0
+				9
+				$PLIMMAX
+				10
+				210
+				20
+				297
+				9
+				$INSUNITS
+				70
+				4
+				9
+				$PSVPSCALE
+				40
+				1
+				0
+				ENDSEC
+				0
+				SECTION
+				2
+				CLASSES
+				0
+				ENDSEC
+				0
+				SECTION
+				2
+				TABLES
+				0
+				TABLE
+				2
+				VPORT
+				5
+				8
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				1
+				0
+				VPORT
+				5
+				31
+				330
+				2
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbViewportTableRecord
+				2
+				*ACTIVE
+				70
+				0
+				10
+				0
+				20
+				0
+				11
+				1
+				21
+				1
+				12
+				73.375
+				22
+				51.875
+				13
+				0
+				23
+				0
+				14
+				10
+				24
+				10
+				15
+				10
+				25
+				10
+				16
+				0
+				26
+				0
+				36
+				1
+				17
+				0
+				27
+				0
+				37
+				0
+				40
+				116.25
+				41
+				1.36989247312
+				42
+				50
+				43
+				0
+				44
+				0
+				50
+				0
+				51
+				0
+				71
+				0
+				72
+				100
+				73
+				1
+				74
+				3
+				75
+				0
+				76
+				1
+				77
+				0
+				78
+				0
+				281
+				0
+				65
+				1
+				110
+				0
+				120
+				0
+				130
+				0
+				111
+				1
+				121
+				0
+				131
+				0
+				112
+				0
+				122
+				1
+				132
+				0
+				79
+				0
+				146
+				0
+				348
+				10020
+				60
+				7
+				61
+				5
+				292
+				1
+				282
+				1
+				141
+				0
+				142
+				0
+				63
+				250
+				421
+				3358443
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				LTYPE
+				5
+				5
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				4
+				0
+				LTYPE
+				5
+				14
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				ByBlock
+				70
+				0
+				3
+				
+				72
+				65
+				73
+				0
+				40
+				0
+				0
+				LTYPE
+				5
+				15
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				ByLayer
+				70
+				0
+				3
+				
+				72
+				65
+				73
+				0
+				40
+				0
+				0
+				LTYPE
+				5
+				16
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				Continuous
+				70
+				0
+				3
+				Solid line
+				72
+				65
+				73
+				0
+				40
+				0
+				0
+				LTYPE
+				5
+				32
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DOT
+				70
+				0
+				3
+				Dot . . . . . . . . . . . . . . . . . . . . . .
+				72
+				65
+				73
+				2
+				40
+				6.35
+				49
+				0
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				33
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DOT2
+				70
+				0
+				3
+				Dot (.5x) .....................................
+				72
+				65
+				73
+				2
+				40
+				3.175
+				49
+				0
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				34
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DOTX2
+				70
+				0
+				3
+				Dot (2x) .  .  .  .  .  .  .  .  .  .  .  .  .
+				72
+				65
+				73
+				2
+				40
+				12.7
+				49
+				0
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				LTYPE
+				5
+				35
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHED
+				70
+				0
+				3
+				Dot . . . . . . . . . . . . . . . . . . . . . .
+				72
+				65
+				73
+				2
+				40
+				19.05
+				49
+				12.7
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				36
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHED2
+				70
+				0
+				3
+				Dashed (.5x) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+				72
+				65
+				73
+				2
+				40
+				9.525
+				49
+				6.35
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				37
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHEDX2
+				70
+				0
+				3
+				Dashed (2x) ____  ____  ____  ____  ____  ___
+				72
+				65
+				73
+				2
+				40
+				38.1
+				49
+				25.4
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				LTYPE
+				5
+				38
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHDOT
+				70
+				0
+				3
+				Dash dot __ . __ . __ . __ . __ . __ . __ . __
+				72
+				65
+				73
+				4
+				40
+				25.4
+				49
+				12.7
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				39
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHDOT2
+				70
+				0
+				3
+				Dash dot (.5x) _._._._._._._._._._._._._._._.
+				72
+				65
+				73
+				4
+				40
+				12.7
+				49
+				6.35
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				3A
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DASHDOTX2
+				70
+				0
+				3
+				Dash dot (2x) ____  .  ____  .  ____  .  ___
+				72
+				65
+				73
+				4
+				40
+				50.8
+				49
+				25.4
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				LTYPE
+				5
+				3B
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DIVIDE
+				70
+				0
+				3
+				Divide ____ . . ____ . . ____ . . ____ . . ____
+				72
+				65
+				73
+				6
+				40
+				31.75
+				49
+				12.7
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				3C
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DIVIDE2
+				70
+				0
+				3
+				Divide (.5x) __..__..__..__..__..__..__..__.._
+				72
+				65
+				73
+				6
+				40
+				15.875
+				49
+				6.35
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				3D
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				DIVIDEX2
+				70
+				0
+				3
+				Divide (2x) ________  .  .  ________  .  .  _
+				72
+				65
+				73
+				6
+				40
+				63.5
+				49
+				25.4
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				LTYPE
+				5
+				3E
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				BORDER
+				70
+				0
+				3
+				Border __ __ . __ __ . __ __ . __ __ . __ __ .
+				72
+				65
+				73
+				6
+				40
+				44.45
+				49
+				12.7
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				12.7
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				3F
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				BORDER2
+				70
+				0
+				3
+				Border (.5x) __.__.__.__.__.__.__.__.__.__.__.
+				72
+				65
+				73
+				6
+				40
+				22.225
+				49
+				6.35
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				6.35
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				40
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				BORDERX2
+				70
+				0
+				3
+				Border (2x) ____  ____  .  ____  ____  .  ___
+				72
+				65
+				73
+				6
+				40
+				88.9
+				49
+				25.4
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				25.4
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				0
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				LTYPE
+				5
+				41
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				CENTER
+				70
+				0
+				3
+				Center ____ _ ____ _ ____ _ ____ _ ____ _ ____
+				72
+				65
+				73
+				4
+				40
+				50.8
+				49
+				31.75
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				49
+				6.35
+				74
+				0
+				49
+				-6.35
+				74
+				0
+				0
+				LTYPE
+				5
+				42
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				CENTER2
+				70
+				0
+				3
+				Center (.5x) ___ _ ___ _ ___ _ ___ _ ___ _ ___
+				72
+				65
+				73
+				4
+				40
+				28.575
+				49
+				19.05
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				49
+				3.175
+				74
+				0
+				49
+				-3.175
+				74
+				0
+				0
+				LTYPE
+				5
+				43
+				330
+				5
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLinetypeTableRecord
+				2
+				CENTERX2
+				70
+				0
+				3
+				Center (2x) ________  __  ________  __  _____
+				72
+				65
+				73
+				4
+				40
+				101.6
+				49
+				63.5
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				49
+				12.7
+				74
+				0
+				49
+				-12.7
+				74
+				0
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				LAYER
+				5
+				2
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				1
+				0
+				LAYER
+				5
+				10
+				330
+				2
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbLayerTableRecord
+				2
+				0
+				70
+				0
+				62
+				7
+				6
+				CONTINUOUS
+				370
+				0
+				390
+				F
+			}
+			insert {layers}
+			verbatim {
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				STYLE
+				5
+				3
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				3
+				0
+				STYLE
+				5
+				44
+				330
+				2
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbTextStyleTableRecord
+				2
+				Standard
+				70
+				0
+				40
+				0
+				41
+				1
+				50
+				0
+				71
+				0
+				42
+				1
+				3
+				txt
+				4
+				
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				VIEW
+				5
+				6
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				0
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				UCS
+				5
+				7
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				0
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				APPID
+				5
+				9
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				1
+				0
+				APPID
+				5
+				12
+				330
+				9
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbRegAppTableRecord
+				2
+				ACAD
+				70
+				0
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				DIMSTYLE
+				5
+				A
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				1
+				100
+				AcDbDimStyleTable
+				71
+				1
+				0
+				DIMSTYLE
+				105
+				45
+				330
+				A
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbDimStyleTableRecord
+				2
+				Standard
+				70
+				0
+				40
+				1
+				41
+				2.5
+				42
+				0.625
+				43
+				0.38
+				44
+				1.25
+				45
+				0
+				46
+				0
+				47
+				0
+				48
+				0
+				140
+				2.5
+				141
+				0.09
+				142
+				0
+				143
+				25.4
+				144
+				1
+				145
+				0
+				146
+				1
+				147
+				0.625
+				148
+				0
+				71
+				0
+				72
+				0
+				73
+				0
+				74
+				1
+				75
+				0
+				76
+				0
+				77
+				0
+				78
+				0
+				79
+				0
+				170
+				0
+				171
+				2
+				172
+				0
+				173
+				0
+				174
+				0
+				175
+				0
+				176
+				0
+				177
+				0
+				178
+				0
+				179
+				0
+				271
+				4
+				272
+				4
+				273
+				2
+				274
+				2
+				275
+				0
+				276
+				0
+				277
+				2
+				278
+				46
+				279
+				0
+				280
+				0
+				281
+				0
+				282
+				0
+				283
+				1
+				284
+				0
+				285
+				0
+				286
+				0
+				288
+				0
+				289
+				3
+				340
+				Standard
+				341
+				
+				371
+				-2
+				372
+				-2
+				0
+				ENDTAB
+				0
+				TABLE
+				2
+				BLOCK_RECORD
+				5
+				1
+				330
+				0
+				100
+				AcDbSymbolTable
+				70
+				2
+				0
+				BLOCK_RECORD
+				5
+				1F
+				330
+				1
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbBlockTableRecord
+				2
+				*Model_Space
+				70
+				0
+				280
+				1
+				281
+				0
+				0
+				BLOCK_RECORD
+				5
+				1E
+				330
+				1
+				100
+				AcDbSymbolTableRecord
+				100
+				AcDbBlockTableRecord
+				2
+				*Paper_Space
+				70
+				0
+				280
+				1
+				281
+				0
+				0
+				ENDTAB
+				0
+				ENDSEC
+				0
+				SECTION
+				2
+				BLOCKS
+				0
+				BLOCK
+				5
+				20
+				330
+				1F
+				100
+				AcDbEntity
+				8
+				0
+				100
+				AcDbBlockBegin
+				2
+				*Model_Space
+				70
+				0
+				10
+				0
+				20
+				0
+				30
+				0
+				3
+				*Model_Space
+				1
+				
+				0
+				ENDBLK
+				5
+				21
+				330
+				1F
+				100
+				AcDbEntity
+				8
+				0
+				100
+				AcDbBlockEnd
+				0
+				BLOCK
+				5
+				1C
+				330
+				1B
+				100
+				AcDbEntity
+				8
+				0
+				100
+				AcDbBlockBegin
+				2
+				*Paper_Space
+				70
+				0
+				10
+				0
+				20
+				0
+				30
+				0
+				3
+				*Paper_Space
+				1
+				
+				0
+				ENDBLK
+				5
+				1D
+				330
+				1F
+				100
+				AcDbEntity
+				8
+				0
+				100
+				AcDbBlockEnd
+				0
+				ENDSEC
+				0
+				SECTION
+				2
+				ENTITIES
+			}
+		}
+		li:footer {
+			verbatim {
+				0
+				ENDSEC
+				0
+				SECTION
+				2
+				OBJECTS
+				0
+				DICTIONARY
+				5
+				C
+				330
+				0
+				100
+				AcDbDictionary
+				281
+				1
+				3
+				ACAD_GROUP
+				350
+				D
+				0
+				DICTIONARY
+				5
+				D
+				330
+				C
+				100
+				AcDbDictionary
+				281
+				1
+				0
+				ENDSEC
+				0
+				EOF
+			}
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/export_dxf/export_dxf.pup
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/export_dxf.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/export_dxf.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short DXF pcb_exporter
+$long Export dxf
+$state works
+$fmt-native no
+$fmt-feature-w export to 2D .dxf (for mech CADs)
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_dxf/lht_template.c
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/lht_template.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/lht_template.c	(revision 18980)
@@ -0,0 +1,129 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Generate output using a lihata template */
+
+#ifndef TESTER
+#include "config.h"
+#endif
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <liblihata/dom.h>
+#include <liblihata/tree.h>
+#include "lht_template.h"
+
+static void verbatim(FILE *f, const char *prefix, const char *value, int trim_indent)
+{
+	const char *s, *next;
+	int indent_len = 0;
+	if (*value == '\n')
+		value++;
+
+	if (trim_indent)
+		for(s = value; isspace(*s); s++)
+			indent_len++;
+
+	for(s = value; *s != '\0'; s = next) {
+		if (trim_indent) {
+			int n;
+			for(n = 0; (n < indent_len) && (isspace(*s)); n++) s++;
+		}
+		next = strpbrk(s, "\r\n");
+		if (next == NULL) {
+			fprintf(f, "%s%s", prefix, s);
+			break;
+		}
+		while((*next == '\r') || (*next == '\n')) next++;
+		fprintf(f, "%s", prefix);
+		fwrite(s, 1, next-s, f);
+	}
+}
+
+int lht_temp_exec(FILE *f, const char *prefix, lht_doc_t *doc, const char *name, lht_temp_insert_t ins, lht_err_t *err)
+{
+	lht_node_t *t, *n, *cfg;
+	int trim_indent = 0;
+
+	if (prefix == NULL)
+		prefix = "";
+
+	t = lht_tree_path(doc, "/template", name, 1, err);
+	if (t == NULL)
+		return -1;
+
+	if (t->type != LHT_LIST) {
+		*err = LHTE_INVALID_TYPE;
+		return -1;
+	}
+
+	cfg = lht_tree_path(doc, "/", "trim_indent", 1, NULL);
+	if ((cfg != NULL) && (cfg->type == LHT_TEXT) && (cfg->data.text.value != NULL))
+		trim_indent = ((strcmp(cfg->data.text.value, "1") == 0) || (strcmp(cfg->data.text.value, "yes") == 0) || (strcmp(cfg->data.text.value, "true") == 0));
+
+	for(n = t->data.list.first; n != NULL; n = n->next) {
+		if (strcmp(n->name, "verbatim") == 0)
+			verbatim(f, prefix, n->data.text.value, trim_indent);
+		if (strcmp(n->name, "insert") == 0) {
+			int res = ins(f, prefix, n->data.text.value, err);
+			if (res != 0)
+				return res;
+		}
+	}
+
+	return 0;
+}
+
+#ifdef TESTER
+int ins_(FILE *f, const char *prefix, char *name, lht_err_t *err)
+{
+	printf("INSERT: %s\n", name);
+	return 0;
+}
+
+int main()
+{
+	lht_doc_t *doc;
+	lht_err_t err;
+	char *errmsg;
+	const char *fn = "dxf_templ.lht";
+
+	/* do not do safe_fs here - it's just a test code that never ends up in pcb_rnd */
+	doc = lht_dom_load(fn, &errmsg);
+	if (doc == NULL) {
+		fprintf(stderr, "Error loading %s: %s\n", fn, errmsg);
+		exit(1);
+	}
+
+	lht_temp_exec(stdout, "", doc, "header", ins_, &err);
+
+	lht_dom_uninit(doc);
+	return 0;
+}
+#endif
Index: tags/2.0.1/src_plugins/export_dxf/lht_template.h
===================================================================
--- tags/2.0.1/src_plugins/export_dxf/lht_template.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_dxf/lht_template.h	(revision 18980)
@@ -0,0 +1,10 @@
+#ifndef PCB_LHT_TEMPLATE_H
+#define PCB_LHT_TEMPLATE_H
+#include <stdio.h>
+#include <liblihata/dom.h>
+
+typedef int (*lht_temp_insert_t)(FILE *f, const char *prefix, char *name, lht_err_t *err);
+
+int lht_temp_exec(FILE *f, const char *prefix, lht_doc_t *doc, const char *name, lht_temp_insert_t ins, lht_err_t *err);
+
+#endif
Index: tags/2.0.1/src_plugins/export_fidocadj/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_fidocadj/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_fidocadj/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_fidocadj
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_fidocadj/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_fidocadj/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_fidocadj/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_fidocadj}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_fidocadj/fidocadj.o @]
+
+switch /local/pcb/export_fidocadj/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_fidocadj/export_fidocadj.pup
===================================================================
--- tags/2.0.1/src_plugins/export_fidocadj/export_fidocadj.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_fidocadj/export_fidocadj.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short FidoCadJ .fcd pcb_exporter
+$long Export to FidoCadJ format (.fcd)
+$state WIP
+$fmt-native no
+$fmt-feature-w partial export in fidocad .fcd format
+$package export-extra
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_fidocadj/fidocadj.c
===================================================================
--- tags/2.0.1/src_plugins/export_fidocadj/fidocadj.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_fidocadj/fidocadj.c	(revision 18980)
@@ -0,0 +1,393 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+ *  Based on the png exporter by Dan McMahill
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+#include <time.h>
+
+#include "genht/htsi.h"
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "plugins.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "plug_io.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+
+static pcb_hid_t fidocadj_hid;
+
+const char *fidocadj_cookie = "fidocadj HID";
+
+pcb_hid_attribute_t fidocadj_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+	{"outfile", "Output file name",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_fidocadjfile 0
+
+	{"libfile", "path to PCB.fcl",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_libfile 1
+};
+
+#define NUM_OPTIONS (sizeof(fidocadj_attribute_list)/sizeof(fidocadj_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(fidocadj_attribute_list, fidocadj_cookie)
+
+static pcb_hid_attr_val_t fidocadj_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *fidocadj_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".fcd";
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &fidocadj_attribute_list[HA_fidocadjfile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return fidocadj_attribute_list;
+}
+
+/* index PCB.fcl so we have a list of known fidocadj footprints */
+static int load_lib(htsi_t *ht, const char *fn)
+{
+	FILE *f;
+	char line[1024];
+	f = pcb_fopen(fn, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open fidocadj PCB library file '%s' for read\n", fn);
+		return -1;
+	}
+	*line = '\0';
+	fgets(line, sizeof(line), f);
+	if (pcb_strncasecmp(line, "[FIDOLIB PCB Footprints]", 24) != 0) {
+		pcb_message(PCB_MSG_ERROR, "'%s' doesn't have the fidocadj lib header\n", fn);
+		fclose(f);
+		return -1;
+	}
+	while(fgets(line, sizeof(line), f) != NULL) {
+		char *end, *s = line;
+
+		if (*line != '[')
+			continue;
+
+		s++;
+		end = strchr(s, ' ');
+		if (end != NULL) {
+			*end = '\0';
+			htsi_set(ht, pcb_strdup(s), 1);
+		}
+	}
+	fclose(f);
+	return 0;
+}
+
+static long int crd(pcb_coord_t c)
+{
+	return pcb_round((double)PCB_COORD_TO_MIL(c) / 5.0);
+}
+
+static int layer_map(unsigned int lflg, int *fidoly_next, const char *lyname)
+{
+	if (lflg & PCB_LYT_COPPER) {
+		if (lflg & PCB_LYT_BOTTOM)
+			return 1;
+		if (lflg & PCB_LYT_TOP)
+			return 2;
+	}
+	if (lflg & PCB_LYT_SILK)
+		return 3;
+
+	(*fidoly_next)++;
+	if (*fidoly_next > 15) {
+		char *msg = pcb_strdup_printf("FidoCadJ can't handle this many layers - layer %s is not exported\n", lyname);
+		pcb_io_incompat_save(NULL, NULL, msg, NULL);
+		free(msg);
+		return -1;
+	}
+	return *fidoly_next;
+}
+
+static void write_custom_subc(FILE *f, pcb_subc_t *sc)
+{
+	char *msg = pcb_strdup_printf("Can't export custom footprint for %s yet\n", sc->refdes);
+	pcb_io_incompat_save(sc->parent.data, (pcb_any_obj_t *)sc, msg, "subcircuit omitted - add the footprint type on the footprint list!");
+	free(msg);
+}
+
+static void fidocadj_do_export(pcb_hid_attr_val_t * options)
+{
+	FILE *f;
+	const char *filename, *libfile;
+	int n, fidoly_next, have_lib;
+	pcb_layer_id_t lid;
+	htsi_t lib_names; /* hash of names found in the library, if have_lib is 1 */
+
+	if (!options) {
+		fidocadj_get_export_options(0);
+		for (n = 0; n < NUM_OPTIONS; n++)
+			fidocadj_values[n] = fidocadj_attribute_list[n].default_val;
+		options = fidocadj_values;
+	}
+
+	libfile = options[HA_libfile].str_value;
+	if ((libfile != NULL) && (*libfile != '\0')) {
+		htsi_init(&lib_names, strhash, strkeyeq);
+		have_lib = 1;
+		if (load_lib(&lib_names, libfile) != 0)
+			goto free_lib;
+	}
+	else
+		have_lib = 0;
+
+	filename = options[HA_fidocadjfile].str_value;
+	if (!filename)
+		filename = "pcb-rnd-default.fcd";
+
+	f = pcb_fopen(filename, "w");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	fprintf(f, "[FIDOCAD]\n");
+
+	fidoly_next = 3;
+	for(lid = 0; lid < pcb_max_layer; lid++) {
+		pcb_layer_t *ly = PCB->Data->Layer+lid;
+		unsigned int lflg = pcb_layer_flags(PCB, lid);
+		int fidoly = layer_map(lflg, &fidoly_next, ly->name);
+
+		if (fidoly < 0)
+			continue;
+
+		PCB_LINE_LOOP(ly) {
+			fprintf(f, "PL %ld %ld %ld %ld %ld %d\n",
+				crd(line->Point1.X), crd(line->Point1.Y),
+				crd(line->Point2.X), crd(line->Point2.Y),
+				crd(line->Thickness), fidoly);
+		}
+		PCB_END_LOOP;
+
+		PCB_ARC_LOOP(ly) {
+#warning TODO: fprintf() some curve using arc->*
+			;
+		}
+		PCB_END_LOOP;
+
+		PCB_POLY_LOOP(ly) {
+			pcb_vnode_t *v;
+			pcb_pline_t *pl = polygon->Clipped->contours;
+
+			if (polygon->HoleIndexN > 0) {
+				pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)polygon, "FidoCadJ can't handle holes in polygons, ignoring holes for this export", "(some of the polygons will look different unless you remove the holes or split up the polygons)");
+			}
+
+			fprintf(f, "PP %ld %ld", crd(pl->head.point[0]), crd(pl->head.point[1]));
+			v = pl->head.next;
+			do {
+				fprintf(f, " %ld %ld", crd(v->point[0]), crd(v->point[1]));
+			} while ((v = v->next) != pl->head.next);
+			fprintf(f, " %d\n", fidoly);
+		}
+		PCB_END_LOOP;
+
+		PCB_TEXT_LOOP(ly) {
+			char *s;
+			/* default_font 'm' = 4189 wide
+			 * default_font 'l', starts at y = 1000
+			 * default_font 'p','q', finish at y = 6333
+			 * default_font stroke thickness = 800
+			 * giving sx = (4189+800)/(5333+800) ~= 0.813
+			 */
+			pcb_coord_t x0 = text->X;
+			/*pcb_coord_t sx = text->BoundingBox.X2 - text->BoundingBox.X1; unused */
+			pcb_coord_t y0 = text->Y;
+			/* pcb_coord_t sy = text->BoundingBox.Y2 - text->BoundingBox.Y1; unused */
+			pcb_coord_t glyphy = 5789*(text->Scale); /* (ascent+descent)*Scale */
+			pcb_coord_t glyphx = 813*(glyphy/1000); /* based on 'm' glyph dimensions */
+			glyphy = 10*glyphy/7;  /* empirically determined */
+			glyphx = 10*glyphx/7;  /* scaling voodoo */
+			/*switch(text->Direction) {
+				case 0:
+					x0 += sx;
+					break;
+				case 1: 
+					y0 += sy;
+					break;
+				case 2: 
+					x0 -= sx;
+					break;
+				case 3: 
+					y0 -= sy;
+					break;
+			}*/
+			fprintf(f, "TY %ld %ld %ld %ld %d 1 %d * ", /* 1 = bold */
+				crd(x0), crd(y0), crd(glyphy), crd(glyphx),
+				90*(text->Direction), fidoly);
+			for(s = text->TextString; *s != '\0'; s++) {
+				if (*s == ' ')
+					fprintf(f, "++");
+				else
+					fputc(*s, f);
+			}
+			fputc('\n', f);
+		}
+		PCB_END_LOOP;
+	}
+
+	PCB_PADSTACK_LOOP(PCB->Data) {
+		int oshape;
+		pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask;
+		pcb_pstk_compshape_t cshape;
+		pcb_bool plated;
+		if (!pcb_pstk_export_compat_via(padstack, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+			pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)padstack, "can't export non-uniform padstacl", "use a simpler padstack - omiting this one from the export");
+			continue;
+		}
+		switch(cshape) {
+			case PCB_PSTK_COMPAT_OCTAGON:
+				pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)padstack, "can't export octagonal shape", "use round or square instead; (fallback to round for now)");
+				/* fall-through */
+			case PCB_PSTK_COMPAT_ROUND:  oshape = 0; break;
+			case PCB_PSTK_COMPAT_SQUARE: oshape = 1; break;  /* rectangle with sharp corners */
+			default:
+				pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)padstack, "can't export shaped padstack", "use round or square instead; (fallback to round for now)");
+				oshape = 0;
+		}
+		fprintf(f, "pa %ld %ld %ld %ld %ld %d\n", crd(x), crd(y), crd(pad_dia), crd(pad_dia), crd(drill_dia), oshape);
+	}
+	PCB_END_LOOP;
+
+	PCB_SUBC_LOOP(PCB->Data) {
+		const char *fp = pcb_attribute_get(&subc->Attributes, "footprint");
+		if ((fp != NULL) && have_lib && (htsi_get(&lib_names, fp))) {
+			pcb_coord_t x, y;
+			double rot = 0.0;
+			int on_bottom = 0;
+			if (pcb_subc_get_origin(subc, &x, &y)) {
+				pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)subc, "can't figure subcircuit origin", "omitting this part until the proper subc-aux layer objects are added");
+				continue;
+			}
+			pcb_subc_get_rotation(subc, &rot);
+			pcb_subc_get_side(subc, &on_bottom);
+
+#warning TODO: figure how to store rotation
+#warning TODO: figure how to store side
+			fprintf(f, "MC %ld %ld %d 0 %s\n", crd(x), crd(y), 0, fp);
+		}
+		else
+			write_custom_subc(f, subc);
+	}
+	PCB_END_LOOP;
+
+
+	fclose(f);
+
+	free_lib:;
+	if (have_lib) {
+		htsi_entry_t *e;
+		for (e = htsi_first(&lib_names); e; e = htsi_next(&lib_names, e))
+			free(e->key);
+
+		htsi_uninit(&lib_names);
+	}
+}
+
+static int fidocadj_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]), fidocadj_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int fidocadj_usage(const char *topic)
+{
+	fprintf(stderr, "\nfidocadj exporter command line arguments:\n\n");
+	pcb_hid_usage(fidocadj_attribute_list, sizeof(fidocadj_attribute_list) / sizeof(fidocadj_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x fidocadj [fidocadj options] foo.pcb\n\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+int pplg_check_ver_export_fidocadj(int ver_needed) { return 0; }
+
+void pplg_uninit_export_fidocadj(void)
+{
+	pcb_hid_remove_attributes_by_cookie(fidocadj_cookie);
+}
+
+int pplg_init_export_fidocadj(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&fidocadj_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&fidocadj_hid);
+	pcb_dhlp_draw_helpers_init(&fidocadj_hid);
+
+	fidocadj_hid.struct_size = sizeof(pcb_hid_t);
+	fidocadj_hid.name = "fidocadj";
+	fidocadj_hid.description = "export board in FidoCadJ .fcd format";
+	fidocadj_hid.exporter = 1;
+
+	fidocadj_hid.get_export_options = fidocadj_get_export_options;
+	fidocadj_hid.do_export = fidocadj_do_export;
+	fidocadj_hid.parse_arguments = fidocadj_parse_arguments;
+
+	fidocadj_hid.usage = fidocadj_usage;
+
+	pcb_hid_register_hid(&fidocadj_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_gcode/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_gcode
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_gcode/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,17 @@
+put /local/pcb/mod {export_gcode}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_gcode/gcode.o $(PLUGDIR)/export_gcode/decompose.o $(PLUGDIR)/export_gcode/trace.o $(PLUGDIR)/export_gcode/curve.o @]
+
+switch /local/pcb/export_gcode/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/LDFLAGS         libs/gui/gd/ldflags
+		put /local/pcb/mod/CFLAGS          libs/gui/gd/cflags
+		end
+end
+
+
+switch /local/pcb/export_gcode/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_gcode/auxiliary.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/auxiliary.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/auxiliary.h	(revision 18980)
@@ -0,0 +1,80 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* This header file collects some general-purpose macros (and static
+   inline functions) that are used in various places. */
+
+#ifndef AUXILIARY_H
+#define AUXILIARY_H
+
+#include "config.h"
+
+/* ---------------------------------------------------------------------- */
+/* point arithmetic */
+
+#include "potracelib.h"
+
+struct point_s {
+	long x;
+	long y;
+};
+typedef struct point_s point_t;
+
+typedef potrace_dpoint_t dpoint_t;
+
+/* convert point_t to dpoint_t */
+PCB_INLINE dpoint_t dpoint(point_t p)
+{
+	dpoint_t res;
+	res.x = p.x;
+	res.y = p.y;
+	return res;
+}
+
+/* range over the straight line segment [a,b] when lambda ranges over [0,1] */
+PCB_INLINE dpoint_t interval(double lambda, dpoint_t a, dpoint_t b)
+{
+	dpoint_t res;
+
+	res.x = a.x + lambda * (b.x - a.x);
+	res.y = a.y + lambda * (b.y - a.y);
+	return res;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Note: the "mod" function works correctly for
+   negative a. Also note that the test for a>=n, while redundant,
+   speeds up the mod function by 70% in the average case (significant
+   since the program spends about 16% of its time here - or 40%
+   without the test). The "floordiv" function returns the largest integer
+   <= a/n, and again this works correctly for negative a, as long as
+   a,n are integers and n>0. */
+
+/* integer arithmetic */
+
+PCB_INLINE int mod(int a, int n)
+{
+	return a >= n ? a % n : a >= 0 ? a : n - 1 - (-1 - a) % n;
+}
+
+PCB_INLINE int floordiv(int a, int n)
+{
+	return a >= 0 ? a / n : -1 - (-1 - a) / n;
+}
+
+/* Note: the following work for integers and other numeric types. */
+#undef sign
+#undef abs
+#undef min
+#undef max
+#undef sq
+#undef cu
+#define sign(x) ((x)>0 ? 1 : (x)<0 ? -1 : 0)
+#define abs(a) ((a)>0 ? (a) : -(a))
+#define min(a,b) ((a)<(b) ? (a) : (b))
+#define max(a,b) ((a)>(b) ? (a) : (b))
+#define sq(a) ((a)*(a))
+#define cu(a) ((a)*(a)*(a))
+
+#endif /* AUXILIARY_H */
Index: tags/2.0.1/src_plugins/export_gcode/bitmap.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/bitmap.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/bitmap.h	(revision 18980)
@@ -0,0 +1,104 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+#ifndef BITMAP_H
+#define BITMAP_H
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+/* The bitmap type is defined in potracelib.h */
+#include "potracelib.h"
+
+/* The present file defines some convenient macros and static inline
+   functions for accessing bitmaps. Since they only produce inline
+   code, they can be conveniently shared by the library and frontends,
+   if desired */
+
+/* ---------------------------------------------------------------------- */
+/* some measurements */
+
+#define BM_WORDSIZE ((int)sizeof(potrace_word))
+#define BM_WORDBITS (8*BM_WORDSIZE)
+#define BM_HIBIT (((potrace_word)1)<<(BM_WORDBITS-1))
+#define BM_ALLBITS (~(potrace_word)0)
+
+/* macros for accessing pixel at index (x,y). U* macros omit the
+   bounds check. */
+
+#define bm_scanline(bm, y) ((bm)->map + (y)*(bm)->dy)
+#define bm_index(bm, x, y) (&bm_scanline(bm, y)[(x)/BM_WORDBITS])
+#define bm_mask(x) (BM_HIBIT >> ((x) & (BM_WORDBITS-1)))
+#define bm_range(x, a) ((int)(x) >= 0 && (int)(x) < (a))
+#define bm_safe(bm, x, y) (bm_range(x, (bm)->w) && bm_range(y, (bm)->h))
+#define BM_UGET(bm, x, y) ((*bm_index(bm, x, y) & bm_mask(x)) != 0)
+#define BM_USET(bm, x, y) (*bm_index(bm, x, y) |= bm_mask(x))
+#define BM_UCLR(bm, x, y) (*bm_index(bm, x, y) &= ~bm_mask(x))
+#define BM_UINV(bm, x, y) (*bm_index(bm, x, y) ^= bm_mask(x))
+#define BM_UPUT(bm, x, y, b) ((b) ? BM_USET(bm, x, y) : BM_UCLR(bm, x, y))
+#define BM_GET(bm, x, y) (bm_safe(bm, x, y) ? BM_UGET(bm, x, y) : 0)
+#define BM_SET(bm, x, y) (bm_safe(bm, x, y) ? BM_USET(bm, x, y) : 0)
+#define BM_CLR(bm, x, y) (bm_safe(bm, x, y) ? BM_UCLR(bm, x, y) : 0)
+#define BM_INV(bm, x, y) (bm_safe(bm, x, y) ? BM_UINV(bm, x, y) : 0)
+#define BM_PUT(bm, x, y, b) (bm_safe(bm, x, y) ? BM_UPUT(bm, x, y, b) : 0)
+
+/* free the given bitmap. Leaves errno untouched. */
+PCB_INLINE void bm_free(potrace_bitmap_t * bm)
+{
+	if (bm) {
+		free(bm->map);
+	}
+	free(bm);
+}
+
+/* return new un-initialized bitmap. NULL with errno on error */
+PCB_INLINE potrace_bitmap_t *bm_new(int w, int h)
+{
+	potrace_bitmap_t *bm;
+	int dy = (w + BM_WORDBITS - 1) / BM_WORDBITS;
+
+	bm = (potrace_bitmap_t *) malloc(sizeof(potrace_bitmap_t));
+	if (!bm) {
+		return NULL;
+	}
+	bm->w = w;
+	bm->h = h;
+	bm->dy = dy;
+	bm->map = (potrace_word *) malloc(dy * h * BM_WORDSIZE);
+	if (!bm->map) {
+		free(bm);
+		return NULL;
+	}
+	return bm;
+}
+
+/* clear the given bitmap. Set all bits to c. */
+PCB_INLINE void bm_clear(potrace_bitmap_t * bm, int c)
+{
+	memset(bm->map, c ? -1 : 0, bm->dy * bm->h * BM_WORDSIZE);
+}
+
+/* duplicate the given bitmap. Return NULL on error with errno set. */
+PCB_INLINE potrace_bitmap_t *bm_dup(const potrace_bitmap_t * bm)
+{
+	potrace_bitmap_t *bm1 = bm_new(bm->w, bm->h);
+	if (!bm1) {
+		return NULL;
+	}
+	memcpy(bm1->map, bm->map, bm->dy * bm->h * BM_WORDSIZE);
+	return bm1;
+}
+
+/* invert the given bitmap. */
+PCB_INLINE void bm_invert(potrace_bitmap_t * bm)
+{
+	int i;
+	for (i = 0; i < bm->dy * bm->h; i++) {
+		bm->map[i] ^= BM_ALLBITS;
+	}
+}
+
+#endif /* BITMAP_H */
Index: tags/2.0.1/src_plugins/export_gcode/curve.c
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/curve.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/curve.c	(revision 18980)
@@ -0,0 +1,115 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: curve.c 147 2007-04-09 00:44:09Z selinger $ */
+/* private part of the path and curve data structures */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "potracelib.h"
+#include "lists.h"
+#include "curve.h"
+
+#define SAFE_MALLOC(var, n, typ) \
+  if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error
+
+/* ---------------------------------------------------------------------- */
+/* allocate and free path objects */
+
+path_t *path_new(void)
+{
+	path_t *p = NULL;
+	privpath_t *priv = NULL;
+
+	SAFE_MALLOC(p, 1, path_t);
+	memset(p, 0, sizeof(path_t));
+	SAFE_MALLOC(priv, 1, privpath_t);
+	memset(priv, 0, sizeof(privpath_t));
+	p->priv = priv;
+	return p;
+
+malloc_error:
+	free(p);
+	free(priv);
+	return NULL;
+}
+
+/* free the members of the given curve structure. Leave errno unchanged. */
+static void privcurve_free_members(privcurve_t * curve)
+{
+	free(curve->tag);
+	free(curve->c);
+	free(curve->vertex);
+	free(curve->alpha);
+	free(curve->alpha0);
+	free(curve->beta);
+}
+
+/* free a path. Leave errno untouched. */
+void path_free(path_t * p)
+{
+	if (p) {
+		if (p->priv) {
+			free(p->priv->pt);
+			free(p->priv->lon);
+			free(p->priv->sums);
+			free(p->priv->po);
+			privcurve_free_members(&p->priv->curve);
+			privcurve_free_members(&p->priv->ocurve);
+		}
+		free(p->priv);
+		/* do not free p->fcurve ! */
+	}
+	free(p);
+}
+
+/* free a pathlist, leaving errno untouched. */
+void pathlist_free(path_t * plist)
+{
+	path_t *p;
+
+	list_forall_unlink(p, plist) {
+		path_free(p);
+	}
+}
+
+/* ---------------------------------------------------------------------- */
+/* initialize and finalize curve structures */
+
+typedef dpoint_t dpoint3_t[3];
+
+/* initialize the members of the given curve structure to size m.
+   Return 0 on success, 1 on error with errno set. */
+int privcurve_init(privcurve_t * curve, int n)
+{
+	memset(curve, 0, sizeof(privcurve_t));
+	curve->n = n;
+	SAFE_MALLOC(curve->tag, n, int);
+	SAFE_MALLOC(curve->c, n, dpoint3_t);
+	SAFE_MALLOC(curve->vertex, n, dpoint_t);
+	SAFE_MALLOC(curve->alpha, n, double);
+	SAFE_MALLOC(curve->alpha0, n, double);
+	SAFE_MALLOC(curve->beta, n, double);
+	return 0;
+
+malloc_error:
+	free(curve->tag);
+	free(curve->c);
+	free(curve->vertex);
+	free(curve->alpha);
+	free(curve->alpha0);
+	free(curve->beta);
+	return 1;
+}
+
+/* copy private to public curve structure */
+void privcurve_to_curve(privcurve_t * pc, potrace_curve_t * c)
+{
+	c->n = pc->n;
+	c->tag = pc->tag;
+	c->c = pc->c;
+}
Index: tags/2.0.1/src_plugins/export_gcode/curve.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/curve.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/curve.h	(revision 18980)
@@ -0,0 +1,76 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+#ifndef CURVE_H
+#define CURVE_H
+
+#include "auxiliary.h"
+
+/* vertex is c[1] for tag=POTRACE_CORNER, and the intersection of
+   .c[-1][2]..c[0] and c[1]..c[2] for tag=POTRACE_CURVETO. alpha is only
+   defined for tag=POTRACE_CURVETO and is the alpha parameter of the curve:
+   .c[-1][2]..c[0] = alpha*(.c[-1][2]..vertex), and
+   c[2]..c[1] = alpha*(c[2]..vertex).
+   Beta is so that (.beta[i])[.vertex[i],.vertex[i+1]] = .c[i][2].
+*/
+
+struct privcurve_s {
+	int n;												/* number of segments */
+	int *tag;											/* tag[n]: POTRACE_CORNER or POTRACE_CURVETO */
+	  dpoint_t(*c)[3];						/* c[n][i]: control points. 
+																   c[n][0] is unused for tag[n]=POTRACE_CORNER */
+	/* the remainder of this structure is special to privcurve, and is
+	   used in EPS debug output and special EPS "short coding". These
+	   fields are valid only if "alphacurve" is set. */
+	int alphacurve;								/* have the following fields been initialized? */
+	dpoint_t *vertex;							/* for POTRACE_CORNER, this equals c[1] */
+	double *alpha;								/* only for POTRACE_CURVETO */
+	double *alpha0;								/* "uncropped" alpha parameter - for debug output only */
+	double *beta;
+};
+typedef struct privcurve_s privcurve_t;
+
+struct sums_s {
+	double x;
+	double y;
+	double x2;
+	double xy;
+	double y2;
+};
+typedef struct sums_s sums_t;
+
+/* the path structure is filled in with information about a given path
+   as it is accumulated and passed through the different stages of the
+   Potrace algorithm. Backends only need to read the fcurve and fm
+   fields of this data structure, but debugging backends may read
+   other fields. */
+struct potrace_privpath_s {
+	int len;
+	point_t *pt;									/* pt[len]: path as extracted from bitmap */
+	int *lon;											/* lon[len]: (i,lon[i]) = longest straight line from i */
+
+	int x0, y0;										/* origin for sums */
+	sums_t *sums;									/* sums[len+1]: cache for fast summing */
+
+	int m;												/* length of optimal polygon */
+	int *po;											/* po[m]: optimal polygon */
+
+	privcurve_t curve;						/* curve[m]: array of curve elements */
+	privcurve_t ocurve;						/* ocurve[om]: array of curve elements */
+	privcurve_t *fcurve;					/* final curve: this points to either curve or
+																   ocurve. Do not free this separately. */
+};
+typedef struct potrace_privpath_s potrace_privpath_t;
+
+/* shorter names */
+typedef potrace_privpath_t privpath_t;
+typedef potrace_path_t path_t;
+
+path_t *path_new(void);
+void path_free(path_t * p);
+void pathlist_free(path_t * plist);
+int privcurve_init(privcurve_t * curve, int n);
+void privcurve_to_curve(privcurve_t * pc, potrace_curve_t * c);
+
+#endif /* CURVE_H */
Index: tags/2.0.1/src_plugins/export_gcode/decompose.c
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/decompose.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/decompose.c	(revision 18980)
@@ -0,0 +1,526 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: decompose.c 146 2007-04-09 00:43:46Z selinger $ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#include "config.h"
+#include "potracelib.h"
+#include "curve.h"
+#include "lists.h"
+#include "auxiliary.h"
+#include "bitmap.h"
+#include "decompose.h"
+/*#include "progress.h"*/
+
+/* ---------------------------------------------------------------------- */
+/* auxiliary bitmap manipulations */
+
+/* set the excess padding to 0 */
+static void bm_clearexcess(potrace_bitmap_t * bm)
+{
+	potrace_word mask;
+	int y;
+
+	if (bm->w % BM_WORDBITS != 0) {
+		mask = BM_ALLBITS << (BM_WORDBITS - (bm->w % BM_WORDBITS));
+		for (y = 0; y < bm->h; y++) {
+			*bm_index(bm, bm->w, y) &= mask;
+		}
+	}
+}
+
+struct bbox_s {
+	int x0, x1, y0, y1;						/* bounding box */
+};
+typedef struct bbox_s bbox_t;
+
+/* clear the bm, assuming the bounding box is set correctly (faster
+   than clearing the whole bitmap) */
+static void clear_bm_with_bbox(potrace_bitmap_t * bm, bbox_t * bbox)
+{
+	int imin = (bbox->x0 / BM_WORDBITS);
+	int imax = ((bbox->x1 + BM_WORDBITS - 1) / BM_WORDBITS);
+	int i, y;
+
+	for (y = bbox->y0; y < bbox->y1; y++) {
+		for (i = imin; i < imax; i++) {
+			bm_scanline(bm, y)[i] = 0;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------- */
+/* auxiliary functions */
+
+/* deterministically and efficiently hash (x,y) into a pseudo-random bit */
+static inline int detrand(int x, int y)
+{
+	unsigned int z;
+	static const unsigned char t[256] = {
+		/* non-linear sequence: constant term of inverse in GF(8), 
+		   mod x^8+x^4+x^3+x+1 */
+		0, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1,
+		0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0,
+		0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1,
+		1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1,
+		0, 0, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0,
+		0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 0,
+		0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 1, 0, 1, 0,
+		0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1,
+		1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0,
+		0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1,
+		1, 1, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
+	};
+
+	/* 0x04b3e375 and 0x05a8ef93 are chosen to contain every possible
+	   5-bit sequence */
+	z = ((0x04b3e375 * x) ^ y) * 0x05a8ef93;
+	z = t[z & 0xff] ^ t[(z >> 8) & 0xff] ^ t[(z >> 16) & 0xff] ^ t[(z >> 24) & 0xff];
+	return z & 1;
+}
+
+/* return the "majority" value of bitmap bm at intersection (x,y). We
+   assume that the bitmap is balanced at "radius" 1.  */
+static int majority(potrace_bitmap_t * bm, int x, int y)
+{
+	int i, a, ct;
+
+	for (i = 2; i < 5; i++) {			/* check at "radius" i */
+		ct = 0;
+		for (a = -i + 1; a <= i - 1; a++) {
+			ct += BM_GET(bm, x + a, y + i - 1) ? 1 : -1;
+			ct += BM_GET(bm, x + i - 1, y + a - 1) ? 1 : -1;
+			ct += BM_GET(bm, x + a - 1, y - i) ? 1 : -1;
+			ct += BM_GET(bm, x - i, y + a) ? 1 : -1;
+		}
+		if (ct > 0) {
+			return 1;
+		}
+		else if (ct < 0) {
+			return 0;
+		}
+	}
+	return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+/* decompose image into paths */
+
+/* efficiently invert bits [x,infty) and [xa,infty) in line y. Here xa
+   must be a multiple of BM_WORDBITS. */
+static void xor_to_ref(potrace_bitmap_t * bm, int x, int y, int xa)
+{
+	int xhi = x & -BM_WORDBITS;
+	int xlo = x & (BM_WORDBITS - 1);	/* = x % BM_WORDBITS */
+	int i;
+
+	if (xhi < xa) {
+		for (i = xhi; i < xa; i += BM_WORDBITS) {
+			*bm_index(bm, i, y) ^= BM_ALLBITS;
+		}
+	}
+	else {
+		for (i = xa; i < xhi; i += BM_WORDBITS) {
+			*bm_index(bm, i, y) ^= BM_ALLBITS;
+		}
+	}
+	/* note: the following "if" is needed because x86 treats a<<b as
+	   a<<(b&31). I spent hours looking for this bug. */
+	if (xlo) {
+		*bm_index(bm, xhi, y) ^= (BM_ALLBITS << (BM_WORDBITS - xlo));
+	}
+}
+
+/* a path is represented as an array of points, which are thought to
+   lie on the corners of pixels (not on their centers). The path point
+   (x,y) is the lower left corner of the pixel (x,y). Paths are
+   represented by the len/pt components of a path_t object (which
+   also stores other information about the path) */
+
+/* xor the given pixmap with the interior of the given path. Note: the
+   path must be within the dimensions of the pixmap. */
+static void xor_path(potrace_bitmap_t * bm, path_t * p)
+{
+	int xa, x, y, k, y1;
+
+	if (p->priv->len <= 0) {			/* a path of length 0 is silly, but legal */
+		return;
+	}
+
+	y1 = p->priv->pt[p->priv->len - 1].y;
+
+	xa = p->priv->pt[0].x & -BM_WORDBITS;
+	for (k = 0; k < p->priv->len; k++) {
+		x = p->priv->pt[k].x;
+		y = p->priv->pt[k].y;
+
+		if (y != y1) {
+			/* efficiently invert the rectangle [x,xa] x [y,y1] */
+			xor_to_ref(bm, x, min(y, y1), xa);
+			y1 = y;
+		}
+	}
+}
+
+/* Find the bounding box of a given path. Path is assumed to be of
+   non-zero length. */
+static void setbbox_path(bbox_t * bbox, path_t * p)
+{
+	int x, y;
+	int k;
+
+	bbox->y0 = INT_MAX;
+	bbox->y1 = 0;
+	bbox->x0 = INT_MAX;
+	bbox->x1 = 0;
+
+	for (k = 0; k < p->priv->len; k++) {
+		x = p->priv->pt[k].x;
+		y = p->priv->pt[k].y;
+
+		if (x < bbox->x0) {
+			bbox->x0 = x;
+		}
+		if (x > bbox->x1) {
+			bbox->x1 = x;
+		}
+		if (y < bbox->y0) {
+			bbox->y0 = y;
+		}
+		if (y > bbox->y1) {
+			bbox->y1 = y;
+		}
+	}
+}
+
+/* compute a path in the given pixmap, separating black from white.
+   Start path at the point (x0,x1), which must be an upper left corner
+   of the path. Also compute the area enclosed by the path. Return a
+   new path_t object, or NULL on error (note that a legitimate path
+   cannot have length 0). Sign is required for correct interpretation
+   of turnpolicies. */
+static path_t *findpath(potrace_bitmap_t * bm, int x0, int y0, int sign, int turnpolicy)
+{
+	int x, y, dirx, diry, len, size, area;
+	int c, d, tmp;
+	point_t *pt, *pt1;
+	path_t *p = NULL;
+
+	x = x0;
+	y = y0;
+	dirx = 0;
+	diry = -1;
+
+	len = size = 0;
+	pt = NULL;
+	area = 0;
+
+	while (1) {
+		/* add point to path */
+		if (len >= size) {
+			size += 100;
+			size = (int) (1.3 * size);
+			pt1 = (point_t *) realloc(pt, size * sizeof(point_t));
+			if (!pt1) {
+				goto error;
+			}
+			pt = pt1;
+		}
+		pt[len].x = x;
+		pt[len].y = y;
+		len++;
+
+		/* move to next point */
+		x += dirx;
+		y += diry;
+		area += x * diry;
+
+		/* path complete? */
+		if (x == x0 && y == y0) {
+			break;
+		}
+
+		/* determine next direction */
+		c = BM_GET(bm, x + (dirx + diry - 1) / 2, y + (diry - dirx - 1) / 2);
+		d = BM_GET(bm, x + (dirx - diry - 1) / 2, y + (diry + dirx - 1) / 2);
+
+		if (c && !d) {							/* ambiguous turn */
+			if (turnpolicy == POTRACE_TURNPOLICY_RIGHT || (turnpolicy == POTRACE_TURNPOLICY_BLACK && sign == '+')
+					|| (turnpolicy == POTRACE_TURNPOLICY_WHITE && sign == '-')
+					|| (turnpolicy == POTRACE_TURNPOLICY_RANDOM && detrand(x, y))
+					|| (turnpolicy == POTRACE_TURNPOLICY_MAJORITY && majority(bm, x, y))
+					|| (turnpolicy == POTRACE_TURNPOLICY_MINORITY && !majority(bm, x, y))) {
+				tmp = dirx;							/* right turn */
+				dirx = diry;
+				diry = -tmp;
+			}
+			else {
+				tmp = dirx;							/* left turn */
+				dirx = -diry;
+				diry = tmp;
+			}
+		}
+		else if (c) {								/* right turn */
+			tmp = dirx;
+			dirx = diry;
+			diry = -tmp;
+		}
+		else if (!d) {							/* left turn */
+			tmp = dirx;
+			dirx = -diry;
+			diry = tmp;
+		}
+	}															/* while this path */
+
+	/* allocate new path object */
+	p = path_new();
+	if (!p) {
+		goto error;
+	}
+
+	p->priv->pt = pt;
+	p->priv->len = len;
+	p->area = area;
+	p->sign = sign;
+
+	return p;
+
+error:
+	free(pt);
+	return NULL;
+}
+
+/* Give a tree structure to the given path list, based on "insideness"
+   testing. I.e., path A is considered "below" path B if it is inside
+   path B. The input pathlist is assumed to be ordered so that "outer"
+   paths occur before "inner" paths. The tree structure is stored in
+   the "childlist" and "sibling" components of the path_t
+   structure. The linked list structure is also changed so that
+   negative path components are listed immediately after their
+   positive parent.  Note: some backends may ignore the tree
+   structure, others may use it e.g. to group path components. We
+   assume that in the input, point 0 of each path is an "upper left"
+   corner of the path, as returned by bm_to_pathlist. This makes it
+   easy to find an "interior" point. The bm argument should be a
+   bitmap of the correct size (large enough to hold all the paths),
+   and will be used as scratch space. Return 0 on success or -1 on
+   error with errno set. */
+
+static void pathlist_to_tree(path_t * plist, potrace_bitmap_t * bm)
+{
+	path_t *p, *p1;
+	path_t *heap, *heap1;
+	path_t *cur;
+	path_t *head;
+	path_t **hook, **hook_in, **hook_out;	/* for fast appending to linked list */
+	bbox_t bbox;
+
+	bm_clear(bm, 0);
+
+	/* save original "next" pointers */
+	list_forall(p, plist) {
+		p->sibling = p->next;
+		p->childlist = NULL;
+	}
+
+	heap = plist;
+
+	/* the heap holds a list of lists of paths. Use "childlist" field
+	   for outer list, "next" field for inner list. Each of the sublists
+	   is to be turned into a tree. This code is messy, but it is
+	   actually fast. Each path is rendered exactly once. We use the
+	   heap to get a tail recursive algorithm: the heap holds a list of
+	   pathlists which still need to be transformed. */
+
+	while (heap) {
+		/* unlink first sublist */
+		cur = heap;
+		heap = heap->childlist;
+		cur->childlist = NULL;
+
+		/* unlink first path */
+		head = cur;
+		cur = cur->next;
+		head->next = NULL;
+
+		/* render path */
+		xor_path(bm, head);
+		setbbox_path(&bbox, head);
+
+		/* now do insideness test for each element of cur; append it to
+		   head->childlist if it's inside head, else append it to
+		   head->next. */
+		hook_in = &head->childlist;
+		hook_out = &head->next;
+		list_forall_unlink(p, cur) {
+			if (p->priv->pt[0].y <= bbox.y0) {
+				list_insert_beforehook(p, hook_out);
+				/* append the remainder of the list to hook_out */
+				*hook_out = cur;
+				break;
+			}
+			if (BM_GET(bm, p->priv->pt[0].x, p->priv->pt[0].y - 1)) {
+				list_insert_beforehook(p, hook_in);
+			}
+			else {
+				list_insert_beforehook(p, hook_out);
+			}
+		}
+
+		/* clear bm */
+		clear_bm_with_bbox(bm, &bbox);
+
+		/* now schedule head->childlist and head->next for further
+		   processing */
+		if (head->next) {
+			head->next->childlist = heap;
+			heap = head->next;
+		}
+		if (head->childlist) {
+			head->childlist->childlist = heap;
+			heap = head->childlist;
+		}
+	}
+
+	/* copy sibling structure from "next" to "sibling" component */
+	p = plist;
+	while (p) {
+		p1 = p->sibling;
+		p->sibling = p->next;
+		p = p1;
+	}
+
+	/* reconstruct a new linked list ("next") structure from tree
+	   ("childlist", "sibling") structure. This code is slightly messy,
+	   because we use a heap to make it tail recursive: the heap
+	   contains a list of childlists which still need to be
+	   processed. */
+	heap = plist;
+	if (heap) {
+		heap->next = NULL;					/* heap is a linked list of childlists */
+	}
+	plist = NULL;
+	hook = &plist;
+	while (heap) {
+		heap1 = heap->next;
+		for (p = heap; p; p = p->sibling) {
+			/* p is a positive path */
+			/* append to linked list */
+			list_insert_beforehook(p, hook);
+
+			/* go through its children */
+			for (p1 = p->childlist; p1; p1 = p1->sibling) {
+				/* append to linked list */
+				list_insert_beforehook(p1, hook);
+				/* append its childlist to heap, if non-empty */
+				if (p1->childlist) {
+					list_append(path_t, heap1, p1->childlist);
+				}
+			}
+		}
+		heap = heap1;
+	}
+
+	return;
+}
+
+/* find the next set pixel in a row <= y. Pixels are searched first
+   left-to-right, then top-down. In other words, (x,y)<(x',y') if y>y'
+   or y=y' and x<x'. If found, return 0 and store pixel in
+   (*xp,*yp). Else return 1. Note that this function assumes that
+   excess bytes have been cleared with bm_clearexcess. */
+static int findnext(potrace_bitmap_t * bm, int *xp, int *yp)
+{
+	int x;
+	int y;
+
+	for (y = *yp; y >= 0; y--) {
+		for (x = 0; x < bm->w; x += BM_WORDBITS) {
+			if (*bm_index(bm, x, y)) {
+				while (!BM_GET(bm, x, y)) {
+					x++;
+				}
+				/* found */
+				*xp = x;
+				*yp = y;
+				return 0;
+			}
+		}
+	}
+	/* not found */
+	return 1;
+}
+
+/* Decompose the given bitmap into paths. Returns a linked list of
+   path_t objects with the fields len, pt, area, sign filled
+   in. Returns 0 on success with plistp set, or -1 on error with errno
+   set. */
+
+int bm_to_pathlist(const potrace_bitmap_t * bm, path_t ** plistp, const potrace_param_t * param)
+{
+	int x;
+	int y;
+	path_t *p;
+	path_t *plist = NULL;					/* linked list of path objects */
+	path_t **hook = &plist;				/* used to speed up appending to linked list */
+	potrace_bitmap_t *bm1 = NULL;
+	int sign;
+
+	bm1 = bm_dup(bm);
+	if (!bm1) {
+		goto error;
+	}
+
+	/* be sure the byte padding on the right is set to 0, as the fast
+	   pixel search below relies on it */
+	bm_clearexcess(bm1);
+
+	/* iterate through components */
+	y = bm1->h - 1;
+	while (findnext(bm1, &x, &y) == 0) {
+		/* calculate the sign by looking at the original */
+		sign = BM_GET(bm, x, y) ? '+' : '-';
+
+		/* calculate the path */
+		p = findpath(bm1, x, y + 1, sign, param->turnpolicy);
+		if (p == NULL) {
+			goto error;
+		}
+
+		/* update buffered image */
+		xor_path(bm1, p);
+
+		/* if it's a turd, eliminate it, else append it to the list */
+		if (p->area <= param->turdsize) {
+			path_free(p);
+		}
+		else {
+			list_insert_beforehook(p, hook);
+		}
+
+		if (bm1->h > 0) {						/* to be sure */
+			/*progress_update(1-y/(double)bm1->h, progress); */
+		}
+	}
+
+	pathlist_to_tree(plist, bm1);
+	bm_free(bm1);
+	*plistp = plist;
+
+/*  progress_update(1.0, progress);*/
+
+	return 0;
+
+error:
+	bm_free(bm1);
+	list_forall_unlink(p, plist) {
+		path_free(p);
+	}
+	return -1;
+}
Index: tags/2.0.1/src_plugins/export_gcode/decompose.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/decompose.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/decompose.h	(revision 18980)
@@ -0,0 +1,15 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: decompose.h 147 2007-04-09 00:44:09Z selinger $ */
+
+#ifndef DECOMPOSE_H
+#define DECOMPOSE_H
+
+#include "potracelib.h"
+/*#include "progress.h"*/
+
+int bm_to_pathlist(const potrace_bitmap_t * bm, path_t ** plistp, const potrace_param_t * param);
+
+#endif /* DECOMPOSE_H */
Index: tags/2.0.1/src_plugins/export_gcode/export_gcode.pup
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/export_gcode.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/export_gcode.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short gcode pcb_exporter
+$long Export to gcode
+$state works
+$fmt-native no
+$fmt-feature-w export gcode (for milling)
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_gcode/gcode.c
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/gcode.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/gcode.c	(revision 18980)
@@ -0,0 +1,931 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  GCODE export HID
+ *  Copyright (C) 2010 Alberto Maccioni
+ *  this code is based on the NELMA export HID, the PNG export HID,
+ *  and potrace, a tracing program by Peter Selinger
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+ * This HID exports a PCB layout into: 
+ * one layer mask file (PNG format) per copper layer,
+ * one G-CODE CNC drill file.
+ * one G-CODE CNC file per copper layer.
+ * The latter is used by a CNC milling machine to mill the pcb.  
+ */
+
+#include "config.h"
+#include "conf_core.h"
+#include "plugins.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <time.h>
+
+#include "board.h"
+#include "error.h"
+#include "data.h"
+#include "rats.h"
+#include "hid_cam.h"
+#include "layer.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include <gd.h>
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "gcode.h"
+#include "bitmap.h"
+#include "curve.h"
+#include "potracelib.h"
+#include "trace.h"
+#include "decompose.h"
+#include "pcb-printf.h"
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_flags.h"
+#include "hid_color.h"
+
+
+const char *gcode_cookie = "gcode HID";
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented GCODE function %s.\n", func); abort()
+struct color_struct {
+	/* the descriptor used by the gd library */
+	int c;
+
+	/* so I can figure out what rgb value c refers to */
+	unsigned int r, g, b;
+};
+
+struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	int width;
+	unsigned char r, g, b;
+	int erase;
+	int faded;
+	struct color_struct *color;
+	gdImagePtr brush;
+};
+
+static struct color_struct *black = NULL, *white = NULL;
+static int linewidth = -1;
+static gdImagePtr lastbrush = (gdImagePtr) ((void *) -1);
+static int lastcolor = -1;
+
+/* gd image and file for PNG export */
+static gdImagePtr gcode_im = NULL;
+static FILE *gcode_f = NULL, *gcode_f2 = NULL;
+
+static int is_mask;
+static int is_drill;
+static int is_solder;
+
+/*
+ * Which groups of layers to export into PNG layer masks. 1 means export, 0
+ * means do not export.
+ */
+static int gcode_export_group[PCB_MAX_LAYERGRP];
+
+/* Group that is currently exported. */
+static int gcode_cur_group;
+
+/* Filename prefix that will be used when saving files. */
+static const char *gcode_basename = NULL;
+
+/* Horizontal DPI (grid points per inch) */
+static int gcode_dpi = -1;
+
+static double gcode_cutdepth = 0;	/* milling depth (inch) */
+static double gcode_drilldepth = 0;	/* drilling depth (inch) */
+static double gcode_safeZ = 100;	/* safe Z (inch) */
+static double gcode_toolradius = 0;	/* tool radius(inch) */
+static int save_drill = 0;
+static int n_drill = 0;
+static int nmax_drill = 0;
+struct drill_struct {
+	double x;
+	double y;
+};
+
+static struct drill_struct *drill = 0;
+
+static const char *units[] = {
+	"mm",
+	"mil",
+	"um",
+	"inch",
+	NULL
+};
+
+pcb_hid_attribute_t gcode_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+	{"basename", "File name prefix",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_basename 0
+
+	{"dpi", "Resolution of intermediate image (pixels/inch)",
+	 PCB_HATT_INTEGER, 0, 2000, {600, 0, 0}, 0, 0},
+#define HA_dpi 1
+
+	{"mill-depth", "Milling depth",
+	 PCB_HATT_REAL, -1000, 1000, {0, 0, -0.05}, 0, 0},
+#define HA_cutdepth 2
+
+	{"safe-Z", "Safe Z for traverse move",
+	 PCB_HATT_REAL, -1000, 10000, {0, 0, 2}, 0, 0},
+#define HA_safeZ 3
+
+	{"tool-radius", "Milling tool radius compensation",
+	 PCB_HATT_REAL, 0, 10000, {0, 0, 0.1}, 0, 0},
+#define HA_toolradius 4
+
+	{"drill-depth", "Drilling depth",
+	 PCB_HATT_REAL, -10000, 10000, {0, 0, -2}, 0, 0},
+#define HA_drilldepth 5
+
+	{"measurement-unit", "Measurement unit",
+	 PCB_HATT_UNIT, 0, 0, {-1, 0, 0}, units, 0},
+#define HA_unit 6
+
+};
+
+#define NUM_OPTIONS (sizeof(gcode_attribute_list)/sizeof(gcode_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(gcode_attribute_list, gcode_cookie)
+		 static pcb_hid_attr_val_t gcode_values[NUM_OPTIONS];
+
+/* *** Utility funcions **************************************************** */
+
+/* convert from default PCB units to gcode units */
+		 static int pcb_to_gcode(int pcb)
+{
+	return pcb_round(PCB_COORD_TO_INCH(pcb) * gcode_dpi);
+}
+
+static char *gcode_get_png_name(const char *basename, const char *suffix)
+{
+	return pcb_strdup_printf("%s.%s.png", basename, suffix);
+}
+
+/* Sorts drills in order of distance from the origin */
+struct drill_struct *sort_drill(struct drill_struct *drill, int n_drill)
+{
+	int i, j, imin;
+	double dmin, d;
+	struct drill_struct p = { 0, 0 };
+	struct drill_struct *temp = (struct drill_struct *) malloc(n_drill * sizeof(struct drill_struct));
+	for (j = 0; j < n_drill; j++) {
+		dmin = 1e20;
+		imin = 0;
+		for (i = 0; i < n_drill - j; i++) {
+			d = (drill[i].x - p.x) * (drill[i].x - p.x) + (drill[i].y - p.y) * (drill[i].y - p.y);
+			if (d < dmin) {
+				imin = i;
+				dmin = d;
+			}
+		}
+		/* printf("j=%d imin=%d dmin=%f p=(%f,%f)\n",j,imin,dmin,p.x,p.y); */
+		temp[j] = drill[imin];
+		drill[imin] = drill[n_drill - j - 1];
+		p = temp[j];
+	}
+	free(drill);
+	return temp;
+}
+
+/* *** Main export callback ************************************************ */
+
+static int gcode_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static pcb_hid_attribute_t *gcode_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	static int last_unit_value = -1;
+
+	if (gcode_attribute_list[HA_unit].default_val.int_value == last_unit_value) {
+		if (conf_core.editor.grid_unit)
+			gcode_attribute_list[HA_unit].default_val.int_value = conf_core.editor.grid_unit->index;
+		else
+			gcode_attribute_list[HA_unit].default_val.int_value = get_unit_struct("mil")->index;
+		last_unit_value = gcode_attribute_list[HA_unit].default_val.int_value;
+	}
+
+	if (PCB) {
+		pcb_derive_default_filename(PCB->Filename, &gcode_attribute_list[HA_basename], ".gcode", &last_made_filename);
+	}
+	if (n) {
+		*n = NUM_OPTIONS;
+	}
+	return gcode_attribute_list;
+}
+
+/* Populates gcode_export_group array */
+void gcode_choose_groups()
+{
+	int n, m;
+	pcb_layer_t *layer;
+
+	/* Set entire array to 0 (don't export any layer groups by default */
+	memset(gcode_export_group, 0, sizeof(gcode_export_group));
+
+	for (n = 0; n < pcb_max_layer; n++) {
+		unsigned int flags = pcb_layer_flags(PCB, n);
+		if (flags & PCB_LYT_SILK)
+			continue;
+		layer = &PCB->Data->Layer[n];
+
+		if (!pcb_layer_is_empty_(PCB, layer)) {
+			/* layer isn't empty */
+
+			/*
+			 * is this check necessary? It seems that special
+			 * layers have negative indexes?
+			 */
+
+			if ((flags & PCB_LYT_COPPER) || (flags & PCB_LYT_OUTLINE)) {
+				m = pcb_layer_get_group(PCB, n);
+
+				/* the export layer */
+				gcode_export_group[m] = 1;
+			}
+		}
+	}
+}
+
+static void gcode_alloc_colors()
+{
+	/*
+	 * Allocate white and black -- the first color allocated becomes the
+	 * background color
+	 */
+
+	white = (struct color_struct *) malloc(sizeof(*white));
+	white->r = white->g = white->b = 255;
+	white->c = gdImageColorAllocate(gcode_im, white->r, white->g, white->b);
+
+	black = (struct color_struct *) malloc(sizeof(*black));
+	black->r = black->g = black->b = 0;
+	black->c = gdImageColorAllocate(gcode_im, black->r, black->g, black->b);
+}
+
+static void gcode_start_png(const char *basename, const char *suffix)
+{
+	int h, w;
+	char *buf;
+
+	buf = gcode_get_png_name(basename, suffix);
+
+	h = pcb_to_gcode(PCB->MaxHeight);
+	w = pcb_to_gcode(PCB->MaxWidth);
+
+	/* Nelma only works with true color images */
+	gcode_im = gdImageCreate(w, h);
+	gcode_f = pcb_fopen(buf, "wb");
+
+	gcode_alloc_colors();
+
+	free(buf);
+}
+
+static void gcode_finish_png()
+{
+#ifdef HAVE_GDIMAGEPNG
+	gdImagePng(gcode_im, gcode_f);
+#else
+	pcb_message(PCB_MSG_WARNING, "GCODE: PNG not supported by gd. Can't write layer mask.\n");
+#endif
+	gdImageDestroy(gcode_im);
+	fclose(gcode_f);
+
+	free(white);
+	free(black);
+
+	gcode_im = NULL;
+	gcode_f = NULL;
+}
+
+void gcode_start_png_export()
+{
+	pcb_hid_expose_ctx_t ctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	linewidth = -1;
+	lastbrush = (gdImagePtr) ((void *) -1);
+	lastcolor = -1;
+
+	pcb_hid_expose_all(&gcode_hid, &ctx);
+}
+
+static void gcode_do_export(pcb_hid_attr_val_t * options)
+{
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i, idx;
+	time_t t;
+	const pcb_unit_t *unit;
+	double scale = 0, d = 0;
+	int r, c, v, p, metric;
+	char *filename;
+	path_t *plist = NULL;
+	potrace_bitmap_t *bm = NULL;
+	potrace_param_t param_default = {
+		2,													/* turnsize */
+		POTRACE_TURNPOLICY_MINORITY,	/* turnpolicy */
+		1.0,												/* alphamax */
+		1,													/* opticurve */
+		0.2,												/* opttolerance */
+		{
+		 NULL,											/* callback function */
+		 NULL,											/* callback data */
+		 0.0, 1.0,									/* progress range  */
+		 0.0,												/* granularity  */
+		 },
+	};
+
+	if (!options) {
+		gcode_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++) {
+			gcode_values[i] = gcode_attribute_list[i].default_val;
+		}
+		options = gcode_values;
+	}
+	gcode_basename = options[HA_basename].str_value;
+	if (!gcode_basename) {
+		gcode_basename = "pcb-out";
+	}
+	gcode_dpi = options[HA_dpi].int_value;
+	if (gcode_dpi < 0) {
+		fprintf(stderr, "ERROR:  dpi may not be < 0\n");
+		return;
+	}
+	unit = &(pcb_units[options[HA_unit].int_value]);
+	metric = (unit->family == PCB_UNIT_METRIC);
+	scale = metric ? 1.0 / pcb_coord_to_unit(unit, PCB_MM_TO_COORD(1.0))
+		: 1.0 / pcb_coord_to_unit(unit, PCB_INCH_TO_COORD(1.0));
+
+	gcode_cutdepth = options[HA_cutdepth].real_value * scale;
+	gcode_drilldepth = options[HA_drilldepth].real_value * scale;
+	gcode_safeZ = options[HA_safeZ].real_value * scale;
+	gcode_toolradius = metric ? PCB_MM_TO_COORD(options[HA_toolradius].real_value * scale)
+		: PCB_INCH_TO_COORD(options[HA_toolradius].real_value * scale);
+	gcode_choose_groups();
+
+	for (i = 0; i < PCB_MAX_LAYERGRP; i++) {
+		if (gcode_export_group[i]) {
+			char tmp_ln[PCB_PATH_MAX];
+			const char *name = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+			gcode_cur_group = i;
+
+			/* magic */
+			idx = (i >= 0 && i < pcb_max_group(PCB)) ? PCB->LayerGroups.grp[i].lid[0] : i;
+			printf("idx=%d %s\n", idx, name);
+			is_solder = (pcb_layergrp_flags(PCB, pcb_layer_get_group(PCB, idx)) & PCB_LYT_BOTTOM) ? 1 : 0;
+			save_drill = is_solder;		/* save drills for one layer only */
+			gcode_start_png(gcode_basename, name);
+			pcb_hid_save_and_show_layer_ons(save_ons);
+			gcode_start_png_export();
+			pcb_hid_restore_layer_ons(save_ons);
+
+/* ***************** gcode conversion *************************** */
+/* potrace uses a different kind of bitmap; for simplicity gcode_im is copied to this format */
+			bm = bm_new(gdImageSX(gcode_im), gdImageSY(gcode_im));
+			filename = (char *) malloc(PCB_PATH_MAX);
+			plist = NULL;
+			if (is_solder) {					/* only for back layer */
+				gdImagePtr temp_im = gdImageCreate(gdImageSX(gcode_im), gdImageSY(gcode_im));
+				gdImageCopy(temp_im, gcode_im, 0, 0, 0, 0, gdImageSX(gcode_im), gdImageSY(gcode_im));
+				for (r = 0; r < gdImageSX(gcode_im); r++) {
+					for (c = 0; c < gdImageSY(gcode_im); c++) {
+						gdImageSetPixel(gcode_im, r, c, gdImageGetPixel(temp_im, gdImageSX(gcode_im) - 1 - r, c));
+					}
+				}
+				gdImageDestroy(temp_im);
+			}
+			sprintf(filename, "%s.%s.cnc", gcode_basename, name);
+			for (r = 0; r < gdImageSX(gcode_im); r++) {
+				for (c = 0; c < gdImageSY(gcode_im); c++) {
+					v = gdImageGetPixel(gcode_im, r, gdImageSY(gcode_im) - 1 - c);
+					p = (gcode_im->red[v] || gcode_im->green[v]
+							 || gcode_im->blue[v]) ? 0 : 0xFFFFFF;
+					BM_PUT(bm, r, c, p);
+				}
+			}
+			gcode_f2 = pcb_fopen(filename, "wb");
+			if (!gcode_f2) {
+				perror(filename);
+				return;
+			}
+			fprintf(gcode_f2, "(Created by G-code exporter)\n");
+			t = time(NULL);
+			sprintf(filename, "%s", ctime(&t));
+			filename[strlen(filename) - 1] = 0;
+			fprintf(gcode_f2, "( %s )\n", filename);
+			fprintf(gcode_f2, "(%d dpi)\n", gcode_dpi);
+			fprintf(gcode_f2, "(Unit: %s)\n", metric ? "mm" : "inch");
+			if (metric)
+				pcb_fprintf(gcode_f2, "(Board size: %.2mmx%.2mm mm)", PCB->MaxWidth, PCB->MaxHeight);
+			else
+				pcb_fprintf(gcode_f2, "(Board size: %.2mix%.2mi inches)", PCB->MaxWidth, PCB->MaxHeight);
+			fprintf(gcode_f2, "#100=%f  (safe Z)\n", gcode_safeZ);
+			fprintf(gcode_f2, "#101=%f  (cutting depth)\n", gcode_cutdepth);
+			fprintf(gcode_f2, "(---------------------------------)\n");
+			fprintf(gcode_f2, "G17 G%d G90 G64 P0.003 M3 S3000 M7 F%d\n", metric ? 21 : 20, metric ? 25 : 1);
+			fprintf(gcode_f2, "G0 Z#100\n");
+			/* extract contour points from image */
+			r = bm_to_pathlist(bm, &plist, &param_default);
+			if (r) {
+				fprintf(stderr, "ERROR: pathlist function failed\n");
+				return;
+			}
+			/* generate best polygon and write vertices in g-code format */
+			d = process_path(plist, &param_default, bm, gcode_f2, metric ? 25.4 / gcode_dpi : 1.0 / gcode_dpi);
+			if (d < 0) {
+				fprintf(stderr, "ERROR: path process function failed\n");
+				return;
+			}
+			if (metric)
+				fprintf(gcode_f2, "(end, total distance %.2fmm = %.2fin)\n", d, d * 1 / 25.4);
+			else
+				fprintf(gcode_f2, "(end, total distance %.2fmm = %.2fin)\n", 25.4 * d, d);
+			fprintf(gcode_f2, "M5 M9 M2\n");
+			pathlist_free(plist);
+			bm_free(bm);
+			fclose(gcode_f2);
+			if (save_drill) {
+				d = 0;
+				drill = sort_drill(drill, n_drill);
+				sprintf(filename, "%s.drill.cnc", gcode_basename);
+				gcode_f2 = pcb_fopen(filename, "wb");
+				if (!gcode_f2) {
+					perror(filename);
+					return;
+				}
+				fprintf(gcode_f2, "(Created by G-code exporter)\n");
+				fprintf(gcode_f2, "(drill file: %d drills)\n", n_drill);
+				sprintf(filename, "%s", ctime(&t));
+				filename[strlen(filename) - 1] = 0;
+				fprintf(gcode_f2, "( %s )\n", filename);
+				fprintf(gcode_f2, "(Unit: %s)\n", metric ? "mm" : "inch");
+				if (metric)
+					pcb_fprintf(gcode_f2, "(Board size: %.2mmx%.2mm mm)", PCB->MaxWidth, PCB->MaxHeight);
+				else
+					pcb_fprintf(gcode_f2, "(Board size: %.2mix%.2mi inches)", PCB->MaxWidth, PCB->MaxHeight);
+				fprintf(gcode_f2, "#100=%f  (safe Z)\n", gcode_safeZ);
+				fprintf(gcode_f2, "#101=%f  (drill depth)\n", gcode_drilldepth);
+				fprintf(gcode_f2, "(---------------------------------)\n");
+				fprintf(gcode_f2, "G17 G%d G90 G64 P0.003 M3 S3000 M7 F%d\n", metric ? 21 : 20, metric ? 25 : 1);
+/*                              fprintf(gcode_f2,"G0 Z#100\n"); */
+				for (r = 0; r < n_drill; r++) {
+/*                                      if(metric) fprintf(gcode_f2,"G0 X%f Y%f\n",drill[r].x*25.4,drill[r].y*25.4); */
+/*                                      else fprintf(gcode_f2,"G0 X%f Y%f\n",drill[r].x,drill[r].y); */
+					if (metric)
+						fprintf(gcode_f2, "G81 X%f Y%f Z#101 R#100\n", drill[r].x * 25.4, drill[r].y * 25.4);
+					else
+						fprintf(gcode_f2, "G81 X%f Y%f Z#101 R#100\n", drill[r].x, drill[r].y);
+/*                                      fprintf(gcode_f2,"G1 Z#101\n"); */
+/*                                      fprintf(gcode_f2,"G0 Z#100\n"); */
+					if (r > 0)
+						d +=
+							sqrt((drill[r].x - drill[r - 1].x) * (drill[r].x -
+																										drill[r - 1].x) +
+									 (drill[r].y - drill[r - 1].y) * (drill[r].y - drill[r - 1].y));
+				}
+				fprintf(gcode_f2, "M5 M9 M2\n");
+				fprintf(gcode_f2, "(end, total distance %.2fmm = %.2fin)\n", 25.4 * d, d);
+				fclose(gcode_f2);
+				free(drill);
+				drill = NULL;
+				n_drill = nmax_drill = 0;
+			}
+			free(filename);
+
+/* ******************* end gcode conversion **************************** */
+			gcode_finish_png();
+		}
+	}
+}
+
+/* *** PNG export (slightly modified code from PNG export HID) ************* */
+
+static int gcode_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	if (flags & PCB_LYT_INVIS)
+		return 0;
+
+	if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK)
+		return 0;
+
+	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_mask = !!(flags & PCB_LYT_MASK);
+
+	if (is_mask) {
+		/* Don't print masks */
+		return 0;
+	}
+	if (is_drill) {
+		/*
+		 * Print 'holes', so that we can fill gaps in the copper
+		 * layer
+		 */
+		return 1;
+	}
+	if (group == gcode_cur_group) {
+		return 1;
+	}
+	return 0;
+}
+
+static pcb_hid_gc_t gcode_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(struct hid_gc_s));
+	rv->me_pointer = &gcode_hid;
+	rv->cap = pcb_cap_round;
+	rv->width = 1;
+	rv->color = (struct color_struct *) malloc(sizeof(*rv->color));
+	rv->color->r = rv->color->g = rv->color->b = 0;
+	rv->color->c = 0;
+	return rv;
+}
+
+static void gcode_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void gcode_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	if (gcode_im == NULL) {
+		return;
+	}
+	if (name == NULL) {
+		name = "#ff0000";
+	}
+	if (!strcmp(name, "drill")) {
+		gc->color = black;
+		gc->erase = 0;
+		return;
+	}
+	gc->color = black;
+	gc->erase = 0;
+	return;
+}
+
+static void gcode_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void gcode_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void gcode_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void gcode_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	gc->faded = faded;
+}
+
+static void use_gc(pcb_hid_gc_t gc)
+{
+	int need_brush = 0;
+
+	if (gc->me_pointer != &gcode_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to gcode HID\n");
+		abort();
+	}
+	if (linewidth != gc->width) {
+		/* Make sure the scaling doesn't erase lines completely */
+		/*
+		   if (SCALE (gc->width) == 0 && gc->width > 0)
+		   gdImageSetThickness (im, 1);
+		   else
+		 */
+		gdImageSetThickness(gcode_im, pcb_to_gcode(gc->width + 2 * gcode_toolradius));
+		linewidth = gc->width;
+		need_brush = 1;
+	}
+	if (lastbrush != gc->brush || need_brush) {
+		static void *bcache = 0;
+		pcb_hidval_t bval;
+		char name[256];
+		char type;
+		int r;
+
+		switch (gc->cap) {
+		case pcb_cap_round:
+			type = 'C';
+			r = pcb_to_gcode(gc->width / 2 + gcode_toolradius);
+			break;
+		case pcb_cap_square:
+			r = pcb_to_gcode(gc->width + gcode_toolradius * 2);
+			type = 'S';
+			break;
+		default:
+			assert(!"unhandled cap");
+			r = 1;
+			type = 'C';
+		}
+		sprintf(name, "#%.2x%.2x%.2x_%c_%d", gc->color->r, gc->color->g, gc->color->b, type, r);
+
+		if (pcb_hid_cache_color(0, name, &bval, &bcache)) {
+			gc->brush = (gdImagePtr) bval.ptr;
+		}
+		else {
+			int bg, fg;
+			if (type == 'C')
+				gc->brush = gdImageCreate(2 * r + 1, 2 * r + 1);
+			else
+				gc->brush = gdImageCreate(r + 1, r + 1);
+			bg = gdImageColorAllocate(gc->brush, 255, 255, 255);
+			fg = gdImageColorAllocate(gc->brush, gc->color->r, gc->color->g, gc->color->b);
+			gdImageColorTransparent(gc->brush, bg);
+
+			/*
+			 * if we shrunk to a radius/box width of zero, then just use
+			 * a single pixel to draw with.
+			 */
+			if (r == 0)
+				gdImageFilledRectangle(gc->brush, 0, 0, 0, 0, fg);
+			else {
+				if (type == 'C')
+					gdImageFilledEllipse(gc->brush, r, r, 2 * r, 2 * r, fg);
+				else
+					gdImageFilledRectangle(gc->brush, 0, 0, r, r, fg);
+			}
+			bval.ptr = gc->brush;
+			pcb_hid_cache_color(1, name, &bval, &bcache);
+		}
+
+		gdImageSetBrush(gcode_im, gc->brush);
+		lastbrush = gc->brush;
+
+	}
+#define CBLEND(gc) (((gc->r)<<24)|((gc->g)<<16)|((gc->b)<<8)|(gc->faded))
+	if (lastcolor != CBLEND(gc)) {
+		if (is_drill || is_mask) {
+#ifdef FIXME
+			fprintf(f, "%d gray\n", gc->erase ? 0 : 1);
+#endif
+			lastcolor = 0;
+		}
+		else {
+			double r, g, b;
+			r = gc->r;
+			g = gc->g;
+			b = gc->b;
+			if (gc->faded) {
+				r = 0.8 * 255 + 0.2 * r;
+				g = 0.8 * 255 + 0.2 * g;
+				b = 0.8 * 255 + 0.2 * b;
+			}
+#ifdef FIXME
+			if (gc->r == gc->g && gc->g == gc->b)
+				fprintf(f, "%g gray\n", r / 255.0);
+			else
+				fprintf(f, "%g %g %g rgb\n", r / 255.0, g / 255.0, b / 255.0);
+#endif
+			lastcolor = CBLEND(gc);
+		}
+	}
+}
+
+static void gcode_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	gdImageRectangle(gcode_im,
+									 pcb_to_gcode(x1 - gcode_toolradius),
+									 pcb_to_gcode(y1 - gcode_toolradius),
+									 pcb_to_gcode(x2 + gcode_toolradius), pcb_to_gcode(y2 + gcode_toolradius), gc->color->c);
+/*      printf("Rect %d %d %d %d\n",x1,y1,x2,y2); */
+}
+
+static void gcode_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	gdImageSetThickness(gcode_im, 0);
+	linewidth = 0;
+	gdImageFilledRectangle(gcode_im,
+												 pcb_to_gcode(x1 - gcode_toolradius),
+												 pcb_to_gcode(y1 - gcode_toolradius),
+												 pcb_to_gcode(x2 + gcode_toolradius), pcb_to_gcode(y2 + gcode_toolradius), gc->color->c);
+/*      printf("FillRect %d %d %d %d\n",x1,y1,x2,y2); */
+}
+
+static void gcode_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	if (x1 == x2 && y1 == y2) {
+		pcb_coord_t w = gc->width / 2;
+		gcode_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
+		return;
+	}
+	use_gc(gc);
+
+	gdImageSetThickness(gcode_im, 0);
+	linewidth = 0;
+	gdImageLine(gcode_im, pcb_to_gcode(x1), pcb_to_gcode(y1), pcb_to_gcode(x2), pcb_to_gcode(y2), gdBrushed);
+}
+
+static void gcode_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t sa, ea;
+
+	/*
+	 * in gdImageArc, 0 degrees is to the right and +90 degrees is down
+	 * in pcb, 0 degrees is to the left and +90 degrees is down
+	 */
+	start_angle = 180 - start_angle;
+	delta_angle = -delta_angle;
+	if (delta_angle > 0) {
+		sa = start_angle;
+		ea = start_angle + delta_angle;
+	}
+	else {
+		sa = start_angle + delta_angle;
+		ea = start_angle;
+	}
+
+	/*
+	 * make sure we start between 0 and 360 otherwise gd does strange
+	 * things
+	 */
+	sa = pcb_normalize_angle(sa);
+	ea = pcb_normalize_angle(ea);
+
+#if 0
+	printf("draw_arc %d,%d %dx%d %d..%d %d..%d\n", cx, cy, width, height, start_angle, delta_angle, sa, ea);
+	printf("gdImageArc (%p, %d, %d, %d, %d, %d, %d, %d)\n",
+				 (void *)im, SCALE_X(cx), SCALE_Y(cy), SCALE(width), SCALE(height), sa, ea, gc->color->c);
+#endif
+	use_gc(gc);
+	gdImageSetThickness(gcode_im, 0);
+	linewidth = 0;
+	gdImageArc(gcode_im, pcb_to_gcode(cx), pcb_to_gcode(cy),
+						 pcb_to_gcode(2 * width + gcode_toolradius * 2),
+						 pcb_to_gcode(2 * height + gcode_toolradius * 2), sa, ea, gdBrushed);
+}
+
+static void gcode_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	use_gc(gc);
+
+	gdImageSetThickness(gcode_im, 0);
+	linewidth = 0;
+	gdImageFilledEllipse(gcode_im, pcb_to_gcode(cx), pcb_to_gcode(cy),
+											 pcb_to_gcode(2 * radius + gcode_toolradius * 2),
+											 pcb_to_gcode(2 * radius + gcode_toolradius * 2), gc->color->c);
+	if (save_drill && is_drill) {
+		if (n_drill == nmax_drill) {
+			drill = (struct drill_struct *) realloc(drill, (nmax_drill + 100) * sizeof(struct drill_struct));
+			nmax_drill += 100;
+		}
+		drill[n_drill].x = PCB_COORD_TO_INCH(PCB->MaxWidth - cx);	/* convert to inch, flip: will drill from bottom side */
+		drill[n_drill].y = PCB_COORD_TO_INCH(PCB->MaxHeight - cy);	/* PCB reverses y axis */
+		n_drill++;
+/*              printf("Circle %d %d\n",cx,cy); */
+	}
+}
+
+static void gcode_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	gdPoint *points;
+
+	points = (gdPoint *) malloc(n_coords * sizeof(gdPoint));
+	if (points == NULL) {
+		fprintf(stderr, "ERROR:  gcode_fill_polygon():  malloc failed\n");
+		exit(1);
+	}
+	use_gc(gc);
+	for (i = 0; i < n_coords; i++) {
+		points[i].x = pcb_to_gcode(x[i] + dx);
+		points[i].y = pcb_to_gcode(y[i] + dy);
+	}
+	gdImageSetThickness(gcode_im, 0);
+	linewidth = 0;
+	gdImageFilledPolygon(gcode_im, points, n_coords, gc->color->c);
+	free(points);
+/*      printf("FillPoly\n"); */
+}
+
+static void gcode_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	gcode_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void gcode_calibrate(double xval, double yval)
+{
+	CRASH("gcode_calibrate");
+}
+
+static void gcode_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int gcode_usage(const char *topic)
+{
+	fprintf(stderr, "\ngcode exporter command line arguments:\n\n");
+	pcb_hid_usage(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gcode [gcode options] foo.pcb\n\n");
+	return 0;
+}
+
+/* *** Miscellaneous ******************************************************* */
+
+#include "dolists.h"
+
+pcb_hid_t gcode_hid;
+
+int pplg_check_ver_export_gcode(int ver_needed) { return 0; }
+
+void pplg_uninit_export_gcode(void)
+{
+}
+
+int pplg_init_export_gcode(void)
+{
+	PCB_API_CHK_VER;
+	memset(&gcode_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&gcode_hid);
+	pcb_dhlp_draw_helpers_init(&gcode_hid);
+
+	gcode_hid.struct_size = sizeof(pcb_hid_t);
+	gcode_hid.name = "gcode";
+	gcode_hid.description = "G-CODE export";
+	gcode_hid.exporter = 1;
+
+	gcode_hid.get_export_options = gcode_get_export_options;
+	gcode_hid.do_export = gcode_do_export;
+	gcode_hid.parse_arguments = gcode_parse_arguments;
+	gcode_hid.set_layer_group = gcode_set_layer_group;
+	gcode_hid.make_gc = gcode_make_gc;
+	gcode_hid.destroy_gc = gcode_destroy_gc;
+	gcode_hid.set_color = gcode_set_color;
+	gcode_hid.set_line_cap = gcode_set_line_cap;
+	gcode_hid.set_line_width = gcode_set_line_width;
+	gcode_hid.set_draw_xor = gcode_set_draw_xor;
+	gcode_hid.set_draw_faded = gcode_set_draw_faded;
+	gcode_hid.draw_line = gcode_draw_line;
+	gcode_hid.draw_arc = gcode_draw_arc;
+	gcode_hid.draw_rect = gcode_draw_rect;
+	gcode_hid.fill_circle = gcode_fill_circle;
+	gcode_hid.fill_polygon = gcode_fill_polygon;
+	gcode_hid.fill_polygon_offs = gcode_fill_polygon_offs;
+	gcode_hid.fill_rect = gcode_fill_rect;
+	gcode_hid.calibrate = gcode_calibrate;
+	gcode_hid.set_crosshair = gcode_set_crosshair;
+
+	gcode_hid.usage = gcode_usage;
+
+	pcb_hid_register_hid(&gcode_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_gcode/gcode.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/gcode.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/gcode.h	(revision 18980)
@@ -0,0 +1,3 @@
+/* $Id: nelma.h,v 1.2 2007/04/20 11:31:15 danmc Exp $ */
+extern const char *gcode_cookie;
+extern pcb_hid_t gcode_hid;
Index: tags/2.0.1/src_plugins/export_gcode/lists.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/lists.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/lists.h	(revision 18980)
@@ -0,0 +1,285 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: lists.h 147 2007-04-09 00:44:09Z selinger $ */
+
+#ifndef PCB_HID_GCODE_LISTS_H
+#define PCB_HID_GCODE_LISTS_H
+
+/* here we define some general list macros. Because they are macros,
+   they should work on any datatype with a "->next" component. Some of
+   them use a "hook". If elt and list are of type t* then hook is of
+   type t**. A hook stands for an insertion point in the list, i.e.,
+   either before the first element, or between two elements, or after
+   the last element. If an operation "sets the hook" for an element,
+   then the hook is set to just before the element. One can insert
+   something at a hook. One can also unlink at a hook: this means,
+   unlink the element just after the hook. By "to unlink", we mean the
+   element is removed from the list, but not deleted. Thus, it and its
+   components still need to be freed. */
+
+/* Note: these macros are somewhat experimental. Only the ones that
+   are actually *used* have been tested. So be careful to test any
+   that you use. Looking at the output of the preprocessor, "gcc -E"
+   (possibly piped though "indent"), might help too. Also: these
+   macros define some internal (local) variables that start with
+   "_". */
+
+/* we enclose macro definitions whose body consists of more than one
+   statement in MACRO_BEGIN and MACRO_END, rather than '{' and '}'.  The
+   reason is that we want to be able to use the macro in a context
+   such as "if (...) macro(...); else ...". If we didn't use this obscure
+   trick, we'd have to omit the ";" in such cases. */
+
+#define MACRO_BEGIN do {
+#define MACRO_END   } while (0)
+
+/* ---------------------------------------------------------------------- */
+/* macros for singly-linked lists */
+
+/* traverse list. At the end, elt is set to NULL. */
+#define list_forall(elt, list)   for (elt=list; elt!=NULL; elt=elt->next)
+
+/* set elt to the first element of list satisfying boolean condition
+   c, or NULL if not found */
+#define list_find(elt, list, c) \
+  MACRO_BEGIN list_forall(elt, list) if (c) break; MACRO_END
+
+/* like forall, except also set hook for elt. */
+#define list_forall2(elt, list, hook) \
+  for (elt=list, hook=&list; elt!=NULL; hook=&elt->next, elt=elt->next)
+
+/* same as list_find, except also set hook for elt. */
+#define list_find2(elt, list, c, hook) \
+  MACRO_BEGIN list_forall2(elt, list, hook) if (c) break; MACRO_END
+
+/* same, except only use hook. */
+#define _list_forall_hook(list, hook) \
+  for (hook=&list; *hook!=NULL; hook=&(*hook)->next)
+
+/* same, except only use hook. Note: c may only refer to *hook, not elt. */
+#define _list_find_hook(list, c, hook) \
+  MACRO_BEGIN _list_forall_hook(list, hook) if (c) break; MACRO_END
+
+/* insert element after hook */
+#define list_insert_athook(elt, hook) \
+  MACRO_BEGIN elt->next = *hook; *hook = elt; MACRO_END
+
+/* insert element before hook */
+#define list_insert_beforehook(elt, hook) \
+  MACRO_BEGIN elt->next = *hook; *hook = elt; hook=&elt->next; MACRO_END
+
+/* unlink element after hook, let elt be unlinked element, or NULL.
+   hook remains. */
+#define list_unlink_athook(list, elt, hook) \
+  MACRO_BEGIN \
+  elt = hook ? *hook : NULL; if (elt) { *hook = elt->next; elt->next = NULL; }\
+  MACRO_END
+
+/* unlink the specific element, if it is in the list. Otherwise, set
+   elt to NULL */
+#define list_unlink(listtype, list, elt)      \
+  MACRO_BEGIN  	       	       	       	      \
+  listtype **_hook;			      \
+  _list_find_hook(list, *_hook==elt, _hook);  \
+  list_unlink_athook(list, elt, _hook);	      \
+  MACRO_END
+
+/* prepend elt to list */
+#define list_prepend(list, elt) \
+  MACRO_BEGIN elt->next = list; list = elt; MACRO_END
+
+/* append elt to list. */
+#define list_append(listtype, list, elt)     \
+  MACRO_BEGIN                                \
+  listtype **_hook;                          \
+  _list_forall_hook(list, _hook) {}          \
+  list_insert_athook(elt, _hook);            \
+  MACRO_END
+
+/* unlink the first element that satisfies the condition. */
+#define list_unlink_cond(listtype, list, elt, c)     \
+  MACRO_BEGIN                                        \
+  listtype **_hook;			  	     \
+  list_find2(elt, list, c, _hook);                   \
+  list_unlink_athook(list, elt, _hook);              \
+  MACRO_END
+
+/* let elt be the nth element of the list, starting to count from 0.
+   Return NULL if out of bounds.   */
+#define list_nth(elt, list, n)                                \
+  MACRO_BEGIN                                                 \
+  int _x;  /* only evaluate n once */                         \
+  for (_x=(n), elt=list; _x && elt; _x--, elt=elt->next) {}   \
+  MACRO_END
+
+/* let elt be the nth element of the list, starting to count from 0.
+   Return NULL if out of bounds.   */
+#define list_nth_hook(elt, list, n, hook)                     \
+  MACRO_BEGIN                                                 \
+  int _x;  /* only evaluate n once */                         \
+  for (_x=(n), elt=list, hook=&list; _x && elt; _x--, hook=&elt->next, elt=elt->next) {}   \
+  MACRO_END
+
+/* set n to the length of the list */
+#define list_length(listtype, list, n)                   \
+  MACRO_BEGIN          	       	       	       	       	 \
+  listtype *_elt;   			 		 \
+  n=0;					 		 \
+  list_forall(_elt, list) 		 		 \
+    n++;				 		 \
+  MACRO_END
+
+/* set n to the index of the first element satisfying cond, or -1 if
+   none found. Also set elt to the element, or NULL if none found. */
+#define list_index(list, n, elt, c)                      \
+  MACRO_BEGIN				 		 \
+  n=0;					 		 \
+  list_forall(elt, list) {		 		 \
+    if (c) break;			 		 \
+    n++;				 		 \
+  }					 		 \
+  if (!elt)				 		 \
+    n=-1;				 		 \
+  MACRO_END
+
+/* set n to the number of elements in the list that satisfy condition c */
+#define list_count(list, n, elt, c)                      \
+  MACRO_BEGIN				 		 \
+  n=0;					 		 \
+  list_forall(elt, list) {		 		 \
+    if (c) n++;				 		 \
+  }                                                      \
+  MACRO_END
+
+/* let elt be each element of the list, unlinked. At the end, set list=NULL. */
+#define list_forall_unlink(elt, list) \
+  for (elt=list; elt ? (list=elt->next, elt->next=NULL), 1 : 0; elt=list)
+
+/* reverse a list (efficient) */
+#define list_reverse(listtype, list)            \
+  MACRO_BEGIN				 	\
+  listtype *_list1=NULL, *elt;			\
+  list_forall_unlink(elt, list) 		\
+    list_prepend(_list1, elt);			\
+  list = _list1;				\
+  MACRO_END
+
+/* insert the element ELT just before the first element TMP of the
+   list for which COND holds. Here COND must be a condition of ELT and
+   TMP.  Typical usage is to insert an element into an ordered list:
+   for instance, list_insert_ordered(listtype, list, elt, tmp,
+   elt->size <= tmp->size).  Note: if we give a "less than or equal"
+   condition, the new element will be inserted just before a sequence
+   of equal elements. If we give a "less than" condition, the new
+   element will be inserted just after a list of equal elements.
+   Note: it is much more efficient to construct a list with
+   list_prepend and then order it with list_merge_sort, than to
+   construct it with list_insert_ordered. */
+#define list_insert_ordered(listtype, list, elt, tmp, cond) \
+  MACRO_BEGIN                                               \
+  listtype **_hook;                                         \
+  _list_find_hook(list, (tmp=*_hook, (cond)), _hook);       \
+  list_insert_athook(elt, _hook);                           \
+  MACRO_END
+
+/* sort the given list, according to the comparison condition.
+   Typical usage is list_sort(listtype, list, a, b, a->size <
+   b->size).  Note: if we give "less than or equal" condition, each
+   segment of equal elements will be reversed in order. If we give a
+   "less than" condition, each segment of equal elements will retain
+   the original order. The latter is slower but sometimes
+   prettier. Average running time: n*n/2. */
+#define list_sort(listtype, list, a, b, cond)            \
+  MACRO_BEGIN                                            \
+  listtype *_newlist=NULL;                               \
+  list_forall_unlink(a, list)                            \
+    list_insert_ordered(listtype, _newlist, a, b, cond); \
+  list = _newlist;                                       \
+  MACRO_END
+
+/* a much faster sort algorithm (merge sort, n log n worst case). It
+   is required that the list type has an additional, unused next1
+   component. Note there is no curious reversal of order of equal
+   elements as for list_sort. */
+
+#define list_mergesort(listtype, list, a, b, cond)              \
+  MACRO_BEGIN						        \
+  listtype *_elt, **_hook1;				    	\
+							    	\
+  for (_elt=list; _elt; _elt=_elt->next1) {			\
+    _elt->next1 = _elt->next;				    	\
+    _elt->next = NULL;					    	\
+  }							    	\
+  do {			                               	    	\
+    _hook1 = &(list);				    	    	\
+    while ((a = *_hook1) != NULL && (b = a->next1) != NULL ) {  \
+      _elt = b->next1;					    	\
+      _list_merge_cond(listtype, a, b, cond, *_hook1);      	\
+      _hook1 = &((*_hook1)->next1);			    	\
+      *_hook1 = _elt;				            	\
+    }							    	\
+  } while (_hook1 != &(list));                                 	\
+  MACRO_END
+
+/* merge two sorted lists. Store result at &result */
+#define _list_merge_cond(listtype, a, b, cond, result)   \
+  MACRO_BEGIN                                            \
+  listtype **_hook;					 \
+  _hook = &(result);					 \
+  while (1) {                                            \
+     if (a==NULL) {					 \
+       *_hook = b;					 \
+       break;						 \
+     } else if (b==NULL) {				 \
+       *_hook = a;					 \
+       break;						 \
+     } else if (cond) {					 \
+       *_hook = a;					 \
+       _hook = &(a->next);				 \
+       a = a->next;					 \
+     } else {						 \
+       *_hook = b;					 \
+       _hook = &(b->next);				 \
+       b = b->next;					 \
+     }							 \
+  }							 \
+  MACRO_END
+
+/* ---------------------------------------------------------------------- */
+/* macros for doubly-linked lists */
+
+#define dlist_append(head, end, elt)                    \
+  MACRO_BEGIN  	       	       	       	       	       	 \
+  elt->prev = end;					 \
+  elt->next = NULL;					 \
+  if (end) {						 \
+    end->next = elt;					 \
+  } else {  						 \
+    head = elt;						 \
+  }	    						 \
+  end = elt;						 \
+  MACRO_END
+
+/* let elt be each element of the list, unlinked. At the end, set list=NULL. */
+#define dlist_forall_unlink(elt, head, end) \
+  for (elt=head; elt ? (head=elt->next, elt->next=NULL, elt->prev=NULL), 1 : (end=NULL, 0); elt=head)
+
+/* unlink the first element of the list */
+#define dlist_unlink_first(head, end, elt)               \
+  MACRO_BEGIN				       	       	 \
+  elt = head;						 \
+  if (head) {						 \
+    head = head->next;					 \
+    if (head) {						 \
+      head->prev = NULL;				 \
+    } else {						 \
+      end = NULL;					 \
+    }    						 \
+    elt->prev = NULL;					 \
+    elt->next = NULL;					 \
+  }							 \
+  MACRO_END
+
+#endif /* PCB_HID_GCODE_LISTS_H */
Index: tags/2.0.1/src_plugins/export_gcode/potracelib.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/potracelib.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/potracelib.h	(revision 18980)
@@ -0,0 +1,130 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+#ifndef POTRACELIB_H
+#define POTRACELIB_H
+
+/* this file defines the API for the core Potrace library. For a more
+   detailed description of the API, see doc/potracelib.txt */
+
+/* ---------------------------------------------------------------------- */
+/* tracing parameters */
+
+/* turn policies */
+#define POTRACE_TURNPOLICY_BLACK 0
+#define POTRACE_TURNPOLICY_WHITE 1
+#define POTRACE_TURNPOLICY_LEFT 2
+#define POTRACE_TURNPOLICY_RIGHT 3
+#define POTRACE_TURNPOLICY_MINORITY 4
+#define POTRACE_TURNPOLICY_MAJORITY 5
+#define POTRACE_TURNPOLICY_RANDOM 6
+
+/* structure to hold progress bar callback data */
+struct potrace_progress_s {
+	void (*callback) (double progress, void *privdata);	/* callback fn */
+	void *data;										/* callback function's private data */
+	double min, max;							/* desired range of progress, e.g. 0.0 to 1.0 */
+	double epsilon;								/* granularity: can skip smaller increments */
+};
+typedef struct potrace_progress_s potrace_progress_t;
+
+/* structure to hold tracing parameters */
+struct potrace_param_s {
+	int turdsize;									/* area of largest path to be ignored */
+	int turnpolicy;								/* resolves ambiguous turns in path decomposition */
+	double alphamax;							/* corner threshold */
+	int opticurve;								/* use curve optimization? */
+	double opttolerance;					/* curve optimization tolerance */
+	potrace_progress_t progress;	/* progress callback function */
+};
+typedef struct potrace_param_s potrace_param_t;
+
+/* ---------------------------------------------------------------------- */
+/* bitmaps */
+
+/* native word size */
+typedef unsigned long potrace_word;
+
+/* Internal bitmap format. The n-th scanline starts at scanline(n) =
+   (map + n*dy). Raster data is stored as a sequence of potrace_words
+   (NOT bytes). The leftmost bit of scanline n is the most significant
+   bit of scanline(n)[0]. */
+struct potrace_bitmap_s {
+	int w, h;											/* width and height, in pixels */
+	int dy;												/* words per scanline (not bytes) */
+	potrace_word *map;						/* raw data, dy*h words */
+};
+typedef struct potrace_bitmap_s potrace_bitmap_t;
+
+/* ---------------------------------------------------------------------- */
+/* curves */
+
+/* point */
+struct potrace_dpoint_s {
+	double x, y;
+};
+typedef struct potrace_dpoint_s potrace_dpoint_t;
+
+/* segment tags */
+#define POTRACE_CURVETO 1
+#define POTRACE_CORNER 2
+
+/* closed curve segment */
+struct potrace_curve_s {
+	int n;												/* number of segments */
+	int *tag;											/* tag[n]: POTRACE_CURVETO or POTRACE_CORNER */
+	  potrace_dpoint_t(*c)[3];		/* c[n][3]: control points. 
+																   c[n][0] is unused for tag[n]=POTRACE_CORNER */
+};
+typedef struct potrace_curve_s potrace_curve_t;
+
+/* Linked list of signed curve segments. Also carries a tree structure. */
+struct potrace_path_s {
+	int area;											/* area of the bitmap path */
+	int sign;											/* '+' or '-', depending on orientation */
+	potrace_curve_t curve;				/* this path's vector data */
+
+	struct potrace_path_s *next;	/* linked list structure */
+
+	struct potrace_path_s *childlist;	/* tree structure */
+	struct potrace_path_s *sibling;	/* tree structure */
+
+	struct potrace_privpath_s *priv;	/* private state */
+};
+typedef struct potrace_path_s potrace_path_t;
+
+/* ---------------------------------------------------------------------- */
+/* Potrace state */
+
+#define POTRACE_STATUS_OK         0
+#define POTRACE_STATUS_INCOMPLETE 1
+
+struct potrace_state_s {
+	int status;
+	potrace_path_t *plist;				/* vector data */
+
+	struct potrace_privstate_s *priv;	/* private state */
+};
+typedef struct potrace_state_s potrace_state_t;
+
+/* ---------------------------------------------------------------------- */
+/* API functions */
+
+/* get default parameters */
+potrace_param_t *potrace_param_default(void);
+
+/* free parameter set */
+void potrace_param_free(potrace_param_t * p);
+
+/* trace a bitmap*/
+potrace_state_t *potrace_trace(const potrace_param_t * param, const potrace_bitmap_t * bm);
+
+/* free a Potrace state */
+void potrace_state_free(potrace_state_t * st);
+
+/* return a static plain text version string identifying this version
+   of potracelib */
+char *potrace_version(void);
+
+#endif /* POTRACELIB_H */
Index: tags/2.0.1/src_plugins/export_gcode/trace.c
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/trace.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/trace.c	(revision 18980)
@@ -0,0 +1,1293 @@
+/* This file was slightly modified by Alberto Maccioni to be used with PCB G-CODE exporter*/
+
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: trace.c 147 2007-04-09 00:44:09Z selinger $ */
+/* transform jaggy paths into smooth curves */
+
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "potracelib.h"
+#include "curve.h"
+#include "lists.h"
+#include "auxiliary.h"
+#include "trace.h"
+#include "compat_cc.h"
+/*#include "progress.h"*/
+
+#define INFTY 10000000					/* it suffices that this is longer than any
+																   path; it need not be really infinite */
+#define COS179 -0.999847695156	/* the cosine of 179 degrees */
+
+/* ---------------------------------------------------------------------- */
+#define SAFE_MALLOC(var, n, typ) \
+  if ((var = (typ *)malloc((n)*sizeof(typ))) == NULL) goto malloc_error
+
+/* ---------------------------------------------------------------------- */
+/* auxiliary functions */
+
+/* return a direction that is 90 degrees counterclockwise from p2-p0,
+   but then restricted to one of the major wind directions (n, nw, w, etc) */
+static inline point_t dorth_infty(dpoint_t p0, dpoint_t p2)
+{
+	point_t r;
+
+	r.y = sign(p2.x - p0.x);
+	r.x = -sign(p2.y - p0.y);
+
+	return r;
+}
+
+/* return (p1-p0)x(p2-p0), the area of the parallelogram */
+static inline double dpara(dpoint_t p0, dpoint_t p1, dpoint_t p2)
+{
+	double x1, y1, x2, y2;
+
+	x1 = p1.x - p0.x;
+	y1 = p1.y - p0.y;
+	x2 = p2.x - p0.x;
+	y2 = p2.y - p0.y;
+
+	return x1 * y2 - x2 * y1;
+}
+
+/* ddenom/dpara have the property that the square of radius 1 centered
+   at p1 intersects the line p0p2 iff |dpara(p0,p1,p2)| <= ddenom(p0,p2) */
+static inline double ddenom(dpoint_t p0, dpoint_t p2)
+{
+	point_t r = dorth_infty(p0, p2);
+
+	return r.y * (p2.x - p0.x) - r.x * (p2.y - p0.y);
+}
+
+/* return 1 if a <= b < c < a, in a cyclic sense (mod n) */
+static inline int cyclic(int a, int b, int c)
+{
+	if (a <= c) {
+		return (a <= b && b < c);
+	}
+	else {
+		return (a <= b || b < c);
+	}
+}
+
+/* determine the center and slope of the line i..j. Assume i<j. Needs
+   "sum" components of p to be set. */
+static void pointslope(privpath_t * pp, int i, int j, dpoint_t * ctr, dpoint_t * dir)
+{
+	/* assume i<j */
+
+	int n = pp->len;
+	sums_t *sums = pp->sums;
+
+	double x, y, x2, xy, y2;
+	double k;
+	double a, b, c, lambda2, l;
+	int r = 0;										/* rotations from i to j */
+
+	while (j >= n) {
+		j -= n;
+		r += 1;
+	}
+	while (i >= n) {
+		i -= n;
+		r -= 1;
+	}
+	while (j < 0) {
+		j += n;
+		r -= 1;
+	}
+	while (i < 0) {
+		i += n;
+		r += 1;
+	}
+
+	x = sums[j + 1].x - sums[i].x + r * sums[n].x;
+	y = sums[j + 1].y - sums[i].y + r * sums[n].y;
+	x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2;
+	xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy;
+	y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2;
+	k = j + 1 - i + r * n;
+
+	ctr->x = x / k;
+	ctr->y = y / k;
+
+	a = (x2 - (double) x * x / k) / k;
+	b = (xy - (double) x * y / k) / k;
+	c = (y2 - (double) y * y / k) / k;
+
+	lambda2 = (a + c + sqrt((a - c) * (a - c) + 4 * b * b)) / 2;	/* larger e.value */
+
+	/* now find e.vector for lambda2 */
+	a -= lambda2;
+	c -= lambda2;
+
+	if (fabs(a) >= fabs(c)) {
+		l = sqrt(a * a + b * b);
+		if (l != 0) {
+			dir->x = -b / l;
+			dir->y = a / l;
+		}
+	}
+	else {
+		l = sqrt(c * c + b * b);
+		if (l != 0) {
+			dir->x = -c / l;
+			dir->y = b / l;
+		}
+	}
+	if (l == 0) {
+		dir->x = dir->y = 0;				/* sometimes this can happen when k=4:
+																   the two eigenvalues coincide */
+	}
+}
+
+/* the type of (affine) quadratic forms, represented as symmetric 3x3
+   matrices.  The value of the quadratic form at a vector (x,y) is v^t
+   Q v, where v = (x,y,1)^t. */
+typedef double quadform_t[3][3];
+
+/* Apply quadratic form Q to vector w = (w.x,w.y) */
+static inline double quadform(quadform_t Q, dpoint_t w)
+{
+	double v[3];
+	int i, j;
+	double sum;
+
+	v[0] = w.x;
+	v[1] = w.y;
+	v[2] = 1;
+	sum = 0.0;
+
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 3; j++) {
+			sum += v[i] * Q[i][j] * v[j];
+		}
+	}
+	return sum;
+}
+
+/* calculate p1 x p2 */
+static inline int xprod(point_t p1, point_t p2)
+{
+	return p1.x * p2.y - p1.y * p2.x;
+}
+
+/* calculate (p1-p0)x(p3-p2) */
+static inline double cprod(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3)
+{
+	double x1, y1, x2, y2;
+
+	x1 = p1.x - p0.x;
+	y1 = p1.y - p0.y;
+	x2 = p3.x - p2.x;
+	y2 = p3.y - p2.y;
+
+	return x1 * y2 - x2 * y1;
+}
+
+/* calculate (p1-p0)*(p2-p0) */
+static inline double iprod(dpoint_t p0, dpoint_t p1, dpoint_t p2)
+{
+	double x1, y1, x2, y2;
+
+	x1 = p1.x - p0.x;
+	y1 = p1.y - p0.y;
+	x2 = p2.x - p0.x;
+	y2 = p2.y - p0.y;
+
+	return x1 * x2 + y1 * y2;
+}
+
+/* calculate (p1-p0)*(p3-p2) */
+static inline double iprod1(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3)
+{
+	double x1, y1, x2, y2;
+
+	x1 = p1.x - p0.x;
+	y1 = p1.y - p0.y;
+	x2 = p3.x - p2.x;
+	y2 = p3.y - p2.y;
+
+	return x1 * x2 + y1 * y2;
+}
+
+/* calculate distance between two points */
+static inline double ddist(dpoint_t p, dpoint_t q)
+{
+	return sqrt(sq(p.x - q.x) + sq(p.y - q.y));
+}
+
+/* calculate point of a bezier curve */
+static inline dpoint_t bezier(double t, dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3)
+{
+	double s = 1 - t;
+	dpoint_t res;
+
+	/* Note: a good optimizing compiler (such as gcc-3) reduces the
+	   following to 16 multiplications, using common subexpression
+	   elimination. */
+
+	res.x = s * s * s * p0.x + 3 * (s * s * t) * p1.x + 3 * (t * t * s) * p2.x + t * t * t * p3.x;
+	res.y = s * s * s * p0.y + 3 * (s * s * t) * p1.y + 3 * (t * t * s) * p2.y + t * t * t * p3.y;
+
+	return res;
+}
+
+/* calculate the point t in [0..1] on the (convex) bezier curve
+   (p0,p1,p2,p3) which is tangent to q1-q0. Return -1.0 if there is no
+   solution in [0..1]. */
+static double tangent(dpoint_t p0, dpoint_t p1, dpoint_t p2, dpoint_t p3, dpoint_t q0, dpoint_t q1)
+{
+	double A, B, C;								/* (1-t)^2 A + 2(1-t)t B + t^2 C = 0 */
+	double a, b, c;								/* a t^2 + b t + c = 0 */
+	double d, s, r1, r2;
+
+	A = cprod(p0, p1, q0, q1);
+	B = cprod(p1, p2, q0, q1);
+	C = cprod(p2, p3, q0, q1);
+
+	a = A - 2 * B + C;
+	b = -2 * A + 2 * B;
+	c = A;
+
+	d = b * b - 4 * a * c;
+
+	if (a == 0 || d < 0) {
+		return -1.0;
+	}
+
+	s = sqrt(d);
+
+	r1 = (-b + s) / (2 * a);
+	r2 = (-b - s) / (2 * a);
+
+	if (r1 >= 0 && r1 <= 1) {
+		return r1;
+	}
+	else if (r2 >= 0 && r2 <= 1) {
+		return r2;
+	}
+	else {
+		return -1.0;
+	}
+}
+
+/* ---------------------------------------------------------------------- */
+/* Preparation: fill in the sum* fields of a path (used for later
+   rapid summing). Return 0 on success, 1 with errno set on
+   failure. */
+static int calc_sums(privpath_t * pp)
+{
+	int i, x, y;
+	int n = pp->len;
+
+	SAFE_MALLOC(pp->sums, pp->len + 1, sums_t);
+
+	/* origin */
+	pp->x0 = pp->pt[0].x;
+	pp->y0 = pp->pt[0].y;
+
+	/* preparatory computation for later fast summing */
+	pp->sums[0].x2 = pp->sums[0].xy = pp->sums[0].y2 = pp->sums[0].x = pp->sums[0].y = 0;
+	for (i = 0; i < n; i++) {
+		x = pp->pt[i].x - pp->x0;
+		y = pp->pt[i].y - pp->y0;
+		pp->sums[i + 1].x = pp->sums[i].x + x;
+		pp->sums[i + 1].y = pp->sums[i].y + y;
+		pp->sums[i + 1].x2 = pp->sums[i].x2 + x * x;
+		pp->sums[i + 1].xy = pp->sums[i].xy + x * y;
+		pp->sums[i + 1].y2 = pp->sums[i].y2 + y * y;
+	}
+	return 0;
+
+malloc_error:
+	return 1;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Stage 1: determine the straight subpaths (Sec. 2.2.1). Fill in the
+   "lon" component of a path object (based on pt/len).	For each i,
+   lon[i] is the furthest index such that a straight line can be drawn
+   from i to lon[i]. Return 1 on error with errno set, else 0. */
+
+/* this algorithm depends on the fact that the existence of straight
+   subpaths is a triplewise property. I.e., there exists a straight
+   line through squares i0,...,in iff there exists a straight line
+   through i,j,k, for all i0<=i<j<k<=in. (Proof?) */
+
+/* this implementation of calc_lon is O(n^2). It replaces an older
+   O(n^3) version. A "constraint" means that future points must
+   satisfy xprod(constraint[0], cur) >= 0 and xprod(constraint[1],
+   cur) <= 0. */
+
+/* Remark for Potrace 1.1: the current implementation of calc_lon is
+   more complex than the implementation found in Potrace 1.0, but it
+   is considerably faster. The introduction of the "nc" data structure
+   means that we only have to test the constraints for "corner"
+   points. On a typical input file, this speeds up the calc_lon
+   function by a factor of 31.2, thereby decreasing its time share
+   within the overall Potrace algorithm from 72.6% to 7.82%, and
+   speeding up the overall algorithm by a factor of 3.36. On another
+   input file, calc_lon was sped up by a factor of 6.7, decreasing its
+   time share from 51.4% to 13.61%, and speeding up the overall
+   algorithm by a factor of 1.78. In any case, the savings are
+   substantial. */
+
+/* returns 0 on success, 1 on error with errno set */
+static int calc_lon(privpath_t * pp)
+{
+	point_t *pt = pp->pt;
+	int n = pp->len;
+	int i, j, k, k1;
+	int ct[4], dir;
+	point_t constraint[2];
+	point_t cur;
+	point_t off;
+	int *pivk = NULL;							/* pivk[n] */
+	int *nc = NULL;								/* nc[n]: next corner */
+	point_t dk;										/* direction of k-k1 */
+	int a, b, c, d;
+
+	SAFE_MALLOC(pivk, n, int);
+	SAFE_MALLOC(nc, n, int);
+
+	/* initialize the nc data structure. Point from each point to the
+	   furthest future point to which it is connected by a vertical or
+	   horizontal segment. We take advantage of the fact that there is
+	   always a direction change at 0 (due to the path decomposition
+	   algorithm). But even if this were not so, there is no harm, as
+	   in practice, correctness does not depend on the word "furthest"
+	   above.  */
+	k = 0;
+	for (i = n - 1; i >= 0; i--) {
+		if (pt[i].x != pt[k].x && pt[i].y != pt[k].y) {
+			k = i + 1;								/* necessarily i<n-1 in this case */
+		}
+		nc[i] = k;
+	}
+
+	SAFE_MALLOC(pp->lon, n, int);
+
+	/* determine pivot points: for each i, let pivk[i] be the furthest k
+	   such that all j with i<j<k lie on a line connecting i,k. */
+
+	for (i = n - 1; i >= 0; i--) {
+		ct[0] = ct[1] = ct[2] = ct[3] = 0;
+
+		/* keep track of "directions" that have occurred */
+		dir = (3 + 3 * (pt[mod(i + 1, n)].x - pt[i].x) + (pt[mod(i + 1, n)].y - pt[i].y)) / 2;
+		ct[dir]++;
+
+		constraint[0].x = 0;
+		constraint[0].y = 0;
+		constraint[1].x = 0;
+		constraint[1].y = 0;
+
+		/* find the next k such that no straight line from i to k */
+		k = nc[i];
+		k1 = i;
+		while (1) {
+
+			dir = (3 + 3 * sign(pt[k].x - pt[k1].x) + sign(pt[k].y - pt[k1].y)) / 2;
+			ct[dir]++;
+
+			/* if all four "directions" have occurred, cut this path */
+			if (ct[0] && ct[1] && ct[2] && ct[3]) {
+				pivk[i] = k1;
+				goto foundk;
+			}
+
+			cur.x = pt[k].x - pt[i].x;
+			cur.y = pt[k].y - pt[i].y;
+
+			/* see if current constraint is violated */
+			if (xprod(constraint[0], cur) < 0 || xprod(constraint[1], cur) > 0) {
+				goto constraint_viol;
+			}
+
+			/* else, update constraint */
+			if (abs(cur.x) <= 1 && abs(cur.y) <= 1) {
+				/* no constraint */
+			}
+			else {
+				off.x = cur.x + ((cur.y >= 0 && (cur.y > 0 || cur.x < 0)) ? 1 : -1);
+				off.y = cur.y + ((cur.x <= 0 && (cur.x < 0 || cur.y < 0)) ? 1 : -1);
+				if (xprod(constraint[0], off) >= 0) {
+					constraint[0] = off;
+				}
+				off.x = cur.x + ((cur.y <= 0 && (cur.y < 0 || cur.x < 0)) ? 1 : -1);
+				off.y = cur.y + ((cur.x >= 0 && (cur.x > 0 || cur.y < 0)) ? 1 : -1);
+				if (xprod(constraint[1], off) <= 0) {
+					constraint[1] = off;
+				}
+			}
+			k1 = k;
+			k = nc[k1];
+			if (!cyclic(k, i, k1)) {
+				break;
+			}
+		}
+	constraint_viol:
+		/* k1 was the last "corner" satisfying the current constraint, and
+		   k is the first one violating it. We now need to find the last
+		   point along k1..k which satisfied the constraint. */
+		dk.x = sign(pt[k].x - pt[k1].x);
+		dk.y = sign(pt[k].y - pt[k1].y);
+		cur.x = pt[k1].x - pt[i].x;
+		cur.y = pt[k1].y - pt[i].y;
+		/* find largest integer j such that xprod(constraint[0], cur+j*dk)
+		   >= 0 and xprod(constraint[1], cur+j*dk) <= 0. Use bilinearity
+		   of xprod. */
+		a = xprod(constraint[0], cur);
+		b = xprod(constraint[0], dk);
+		c = xprod(constraint[1], cur);
+		d = xprod(constraint[1], dk);
+		/* find largest integer j such that a+j*b>=0 and c+j*d<=0. This
+		   can be solved with integer arithmetic. */
+		j = INFTY;
+		if (b < 0) {
+			j = floordiv(a, -b);
+		}
+		if (d > 0) {
+			j = min(j, floordiv(-c, d));
+		}
+		pivk[i] = mod(k1 + j, n);
+	foundk:
+		;
+	}															/* for i */
+
+	/* clean up: for each i, let lon[i] be the largest k such that for
+	   all i' with i<=i'<k, i'<k<=pivk[i']. */
+
+	j = pivk[n - 1];
+	pp->lon[n - 1] = j;
+	for (i = n - 2; i >= 0; i--) {
+		if (cyclic(i + 1, pivk[i], j)) {
+			j = pivk[i];
+		}
+		pp->lon[i] = j;
+	}
+
+	for (i = n - 1; cyclic(mod(i + 1, n), j, pp->lon[i]); i--) {
+		pp->lon[i] = j;
+	}
+
+	free(pivk);
+	free(nc);
+	return 0;
+
+malloc_error:
+	free(pivk);
+	free(nc);
+	return 1;
+}
+
+
+/* ---------------------------------------------------------------------- */
+/* Stage 2: calculate the optimal polygon (Sec. 2.2.2-2.2.4). */
+
+/* Auxiliary function: calculate the penalty of an edge from i to j in
+   the given path. This needs the "lon" and "sum*" data. */
+
+static double penalty3(privpath_t * pp, int i, int j)
+{
+	int n = pp->len;
+	point_t *pt = pp->pt;
+	sums_t *sums = pp->sums;
+
+	/* assume 0<=i<j<=n  */
+	double x, y, x2, xy, y2;
+	double k;
+	double a, b, c, s;
+	double px, py, ex, ey;
+
+	int r = 0;										/* rotations from i to j */
+
+	if (j >= n) {
+		j -= n;
+		r += 1;
+	}
+
+	x = sums[j + 1].x - sums[i].x + r * sums[n].x;
+	y = sums[j + 1].y - sums[i].y + r * sums[n].y;
+	x2 = sums[j + 1].x2 - sums[i].x2 + r * sums[n].x2;
+	xy = sums[j + 1].xy - sums[i].xy + r * sums[n].xy;
+	y2 = sums[j + 1].y2 - sums[i].y2 + r * sums[n].y2;
+	k = j + 1 - i + r * n;
+
+	px = (pt[i].x + pt[j].x) / 2.0 - pt[0].x;
+	py = (pt[i].y + pt[j].y) / 2.0 - pt[0].y;
+	ey = (pt[j].x - pt[i].x);
+	ex = -(pt[j].y - pt[i].y);
+
+	a = ((x2 - 2 * x * px) / k + px * px);
+	b = ((xy - x * py - y * px) / k + px * py);
+	c = ((y2 - 2 * y * py) / k + py * py);
+
+	s = ex * ex * a + 2 * ex * ey * b + ey * ey * c;
+
+	return sqrt(s);
+}
+
+/* find the optimal polygon. Fill in the m and po components. Return 1
+   on failure with errno set, else 0. Non-cyclic version: assumes i=0
+   is in the polygon. Fixme: ### implement cyclic version. */
+static int bestpolygon(privpath_t * pp)
+{
+	int i, j, m, k;
+	int n = pp->len;
+	double *pen = NULL;						/* pen[n+1]: penalty vector */
+	int *prev = NULL;							/* prev[n+1]: best path pointer vector */
+	int *clip0 = NULL;						/* clip0[n]: longest segment pointer, non-cyclic */
+	int *clip1 = NULL;						/* clip1[n+1]: backwards segment pointer, non-cyclic */
+	int *seg0 = NULL;							/* seg0[m+1]: forward segment bounds, m<=n */
+	int *seg1 = NULL;							/* seg1[m+1]: backward segment bounds, m<=n */
+	double thispen;
+	double best;
+	int c;
+
+	SAFE_MALLOC(pen, n + 1, double);
+	SAFE_MALLOC(prev, n + 1, int);
+	SAFE_MALLOC(clip0, n, int);
+	SAFE_MALLOC(clip1, n + 1, int);
+	SAFE_MALLOC(seg0, n + 1, int);
+	SAFE_MALLOC(seg1, n + 1, int);
+
+	/* calculate clipped paths */
+	for (i = 0; i < n; i++) {
+		c = mod(pp->lon[mod(i - 1, n)] - 1, n);
+		if (c == i) {
+			c = mod(i + 1, n);
+		}
+		if (c < i) {
+			clip0[i] = n;
+		}
+		else {
+			clip0[i] = c;
+		}
+	}
+
+	/* calculate backwards path clipping, non-cyclic. j <= clip0[i] iff
+	   clip1[j] <= i, for i,j=0..n. */
+	j = 1;
+	for (i = 0; i < n; i++) {
+		while (j <= clip0[i]) {
+			clip1[j] = i;
+			j++;
+		}
+	}
+
+	/* calculate seg0[j] = longest path from 0 with j segments */
+	i = 0;
+	for (j = 0; i < n; j++) {
+		seg0[j] = i;
+		i = clip0[i];
+	}
+	seg0[j] = n;
+	m = j;
+
+	/* calculate seg1[j] = longest path to n with m-j segments */
+	i = n;
+	for (j = m; j > 0; j--) {
+		seg1[j] = i;
+		i = clip1[i];
+	}
+	seg1[0] = 0;
+
+	/* now find the shortest path with m segments, based on penalty3 */
+	/* note: the outer 2 loops jointly have at most n interations, thus
+	   the worst-case behavior here is quadratic. In practice, it is
+	   close to linear since the inner loop tends to be short. */
+	pen[0] = 0;
+	for (j = 1; j <= m; j++) {
+		for (i = seg1[j]; i <= seg0[j]; i++) {
+			best = -1;
+			for (k = seg0[j - 1]; k >= clip1[i]; k--) {
+				thispen = penalty3(pp, k, i) + pen[k];
+				if (best < 0 || thispen < best) {
+					prev[i] = k;
+					best = thispen;
+				}
+			}
+			pen[i] = best;
+		}
+	}
+
+	pp->m = m;
+	SAFE_MALLOC(pp->po, m, int);
+
+	/* read off shortest path */
+	for (i = n, j = m - 1; i > 0; j--) {
+		i = prev[i];
+		pp->po[j] = i;
+	}
+
+	free(pen);
+	free(prev);
+	free(clip0);
+	free(clip1);
+	free(seg0);
+	free(seg1);
+	return 0;
+
+malloc_error:
+	free(pen);
+	free(prev);
+	free(clip0);
+	free(clip1);
+	free(seg0);
+	free(seg1);
+	return 1;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Stage 3: vertex adjustment (Sec. 2.3.1). */
+
+/* Adjust vertices of optimal polygon: calculate the intersection of
+   the two "optimal" line segments, then move it into the unit square
+   if it lies outside. Return 1 with errno set on error; 0 on
+   success. */
+
+static int adjust_vertices(privpath_t * pp)
+{
+	int m = pp->m;
+	int *po = pp->po;
+	int n = pp->len;
+	point_t *pt = pp->pt;
+	int x0 = pp->x0;
+	int y0 = pp->y0;
+
+	dpoint_t *ctr = NULL;					/* ctr[m] */
+	dpoint_t *dir = NULL;					/* dir[m] */
+	quadform_t *q = NULL;					/* q[m] */
+	double v[3];
+	double d;
+	int i, j, k, l;
+	dpoint_t s;
+	int r;
+
+	SAFE_MALLOC(ctr, m, dpoint_t);
+	SAFE_MALLOC(dir, m, dpoint_t);
+	SAFE_MALLOC(q, m, quadform_t);
+
+	r = privcurve_init(&pp->curve, m);
+	if (r) {
+		goto malloc_error;
+	}
+
+	/* calculate "optimal" point-slope representation for each line
+	   segment */
+	for (i = 0; i < m; i++) {
+		j = po[mod(i + 1, m)];
+		j = mod(j - po[i], n) + po[i];
+		pointslope(pp, po[i], j, &ctr[i], &dir[i]);
+	}
+
+	/* represent each line segment as a singular quadratic form; the
+	   distance of a point (x,y) from the line segment will be
+	   (x,y,1)Q(x,y,1)^t, where Q=q[i]. */
+	for (i = 0; i < m; i++) {
+		d = sq(dir[i].x) + sq(dir[i].y);
+		if (d == 0.0) {
+			for (j = 0; j < 3; j++) {
+				for (k = 0; k < 3; k++) {
+					q[i][j][k] = 0;
+				}
+			}
+		}
+		else {
+			v[0] = dir[i].y;
+			v[1] = -dir[i].x;
+			v[2] = -v[1] * ctr[i].y - v[0] * ctr[i].x;
+			for (l = 0; l < 3; l++) {
+				for (k = 0; k < 3; k++) {
+					q[i][l][k] = v[l] * v[k] / d;
+				}
+			}
+		}
+	}
+
+	/* now calculate the "intersections" of consecutive segments.
+	   Instead of using the actual intersection, we find the point
+	   within a given unit square which minimizes the square distance to
+	   the two lines. */
+	for (i = 0; i < m; i++) {
+		quadform_t Q;
+		dpoint_t w;
+		double dx, dy;
+		double det;
+		double min, cand;						/* minimum and candidate for minimum of quad. form */
+		double xmin, ymin;					/* coordinates of minimum */
+		int z;
+
+		/* let s be the vertex, in coordinates relative to x0/y0 */
+		s.x = pt[po[i]].x - x0;
+		s.y = pt[po[i]].y - y0;
+
+		/* intersect segments i-1 and i */
+
+		j = mod(i - 1, m);
+
+		/* add quadratic forms */
+		for (l = 0; l < 3; l++) {
+			for (k = 0; k < 3; k++) {
+				Q[l][k] = q[j][l][k] + q[i][l][k];
+			}
+		}
+
+		while (1) {
+			/* minimize the quadratic form Q on the unit square */
+			/* find intersection */
+
+#ifdef HAVE_GCC_LOOP_BUG
+			/* work around gcc bug #12243 */
+			free(NULL);
+#endif
+
+			det = Q[0][0] * Q[1][1] - Q[0][1] * Q[1][0];
+			if (det != 0.0) {
+				w.x = (-Q[0][2] * Q[1][1] + Q[1][2] * Q[0][1]) / det;
+				w.y = (Q[0][2] * Q[1][0] - Q[1][2] * Q[0][0]) / det;
+				break;
+			}
+
+			/* matrix is singular - lines are parallel. Add another,
+			   orthogonal axis, through the center of the unit square */
+			if (Q[0][0] > Q[1][1]) {
+				v[0] = -Q[0][1];
+				v[1] = Q[0][0];
+			}
+			else if (Q[1][1]) {
+				v[0] = -Q[1][1];
+				v[1] = Q[1][0];
+			}
+			else {
+				v[0] = 1;
+				v[1] = 0;
+			}
+			d = sq(v[0]) + sq(v[1]);
+			v[2] = -v[1] * s.y - v[0] * s.x;
+			for (l = 0; l < 3; l++) {
+				for (k = 0; k < 3; k++) {
+					Q[l][k] += v[l] * v[k] / d;
+				}
+			}
+		}
+		dx = fabs(w.x - s.x);
+		dy = fabs(w.y - s.y);
+		if (dx <= .5 && dy <= .5) {
+			pp->curve.vertex[i].x = w.x + x0;
+			pp->curve.vertex[i].y = w.y + y0;
+			continue;
+		}
+
+		/* the minimum was not in the unit square; now minimize quadratic
+		   on boundary of square */
+		min = quadform(Q, s);
+		xmin = s.x;
+		ymin = s.y;
+
+		if (Q[0][0] == 0.0) {
+			goto fixx;
+		}
+		for (z = 0; z < 2; z++) {		/* value of the y-coordinate */
+			w.y = s.y - 0.5 + z;
+			w.x = -(Q[0][1] * w.y + Q[0][2]) / Q[0][0];
+			dx = fabs(w.x - s.x);
+			cand = quadform(Q, w);
+			if (dx <= .5 && cand < min) {
+				min = cand;
+				xmin = w.x;
+				ymin = w.y;
+			}
+		}
+	fixx:
+		if (Q[1][1] == 0.0) {
+			goto corners;
+		}
+		for (z = 0; z < 2; z++) {		/* value of the x-coordinate */
+			w.x = s.x - 0.5 + z;
+			w.y = -(Q[1][0] * w.x + Q[1][2]) / Q[1][1];
+			dy = fabs(w.y - s.y);
+			cand = quadform(Q, w);
+			if (dy <= .5 && cand < min) {
+				min = cand;
+				xmin = w.x;
+				ymin = w.y;
+			}
+		}
+	corners:
+		/* check four corners */
+		for (l = 0; l < 2; l++) {
+			for (k = 0; k < 2; k++) {
+				w.x = s.x - 0.5 + l;
+				w.y = s.y - 0.5 + k;
+				cand = quadform(Q, w);
+				if (cand < min) {
+					min = cand;
+					xmin = w.x;
+					ymin = w.y;
+				}
+			}
+		}
+
+		pp->curve.vertex[i].x = xmin + x0;
+		pp->curve.vertex[i].y = ymin + y0;
+		continue;
+	}
+
+	free(ctr);
+	free(dir);
+	free(q);
+	return 0;
+
+malloc_error:
+	free(ctr);
+	free(dir);
+	free(q);
+	return 1;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Stage 4: smoothing and corner analysis (Sec. 2.3.3) */
+
+/* Always succeeds and returns 0 */
+static int
+PCB_ATTRIBUTE_UNUSED smooth(privcurve_t * curve, int sign, double alphamax)
+{
+	int m = curve->n;
+
+	int i, j, k;
+	double dd, denom, alpha;
+	dpoint_t p2, p3, p4;
+
+	if (sign == '-') {
+		/* reverse orientation of negative paths */
+		for (i = 0, j = m - 1; i < j; i++, j--) {
+			dpoint_t tmp;
+			tmp = curve->vertex[i];
+			curve->vertex[i] = curve->vertex[j];
+			curve->vertex[j] = tmp;
+		}
+	}
+
+	/* examine each vertex and find its best fit */
+	for (i = 0; i < m; i++) {
+		j = mod(i + 1, m);
+		k = mod(i + 2, m);
+		p4 = interval(1 / 2.0, curve->vertex[k], curve->vertex[j]);
+
+		denom = ddenom(curve->vertex[i], curve->vertex[k]);
+		if (denom != 0.0) {
+			dd = dpara(curve->vertex[i], curve->vertex[j], curve->vertex[k]) / denom;
+			dd = fabs(dd);
+			alpha = dd > 1 ? (1 - 1.0 / dd) : 0;
+			alpha = alpha / 0.75;
+		}
+		else {
+			alpha = 4 / 3.0;
+		}
+		curve->alpha0[j] = alpha;		/* remember "original" value of alpha */
+
+		if (alpha > alphamax) {			/* pointed corner */
+			curve->tag[j] = POTRACE_CORNER;
+			curve->c[j][1] = curve->vertex[j];
+			curve->c[j][2] = p4;
+		}
+		else {
+			if (alpha < 0.55) {
+				alpha = 0.55;
+			}
+			else if (alpha > 1) {
+				alpha = 1;
+			}
+			p2 = interval(.5 + .5 * alpha, curve->vertex[i], curve->vertex[j]);
+			p3 = interval(.5 + .5 * alpha, curve->vertex[k], curve->vertex[j]);
+			curve->tag[j] = POTRACE_CURVETO;
+			curve->c[j][0] = p2;
+			curve->c[j][1] = p3;
+			curve->c[j][2] = p4;
+		}
+		curve->alpha[j] = alpha;		/* store the "cropped" value of alpha */
+		curve->beta[j] = 0.5;
+	}
+	curve->alphacurve = 1;
+
+	return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Stage 5: Curve optimization (Sec. 2.4) */
+
+/* a private type for the result of opti_penalty */
+struct opti_s {
+	double pen;										/* penalty */
+	dpoint_t c[2];								/* curve parameters */
+	double t, s;									/* curve parameters */
+	double alpha;									/* curve parameter */
+};
+typedef struct opti_s opti_t;
+
+/* calculate best fit from i+.5 to j+.5.  Assume i<j (cyclically).
+   Return 0 and set badness and parameters (alpha, beta), if
+   possible. Return 1 if impossible. */
+static int opti_penalty(privpath_t * pp, int i, int j, opti_t * res, double opttolerance, int *convc, double *areac)
+{
+	int m = pp->curve.n;
+	int k, k1, k2, conv, i1;
+	double area, alpha, d, d1, d2;
+	dpoint_t p0, p1, p2, p3, pt;
+	double A, R, A1, A2, A3, A4;
+	double s, t;
+
+	/* check convexity, corner-freeness, and maximum bend < 179 degrees */
+
+	if (i == j) {									/* sanity - a full loop can never be an opticurve */
+		return 1;
+	}
+
+	k = i;
+	i1 = mod(i + 1, m);
+	k1 = mod(k + 1, m);
+	conv = convc[k1];
+	if (conv == 0) {
+		return 1;
+	}
+	d = ddist(pp->curve.vertex[i], pp->curve.vertex[i1]);
+	for (k = k1; k != j; k = k1) {
+		k1 = mod(k + 1, m);
+		k2 = mod(k + 2, m);
+		if (convc[k1] != conv) {
+			return 1;
+		}
+		if (sign(cprod(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1], pp->curve.vertex[k2])) != conv) {
+			return 1;
+		}
+		if (iprod1
+				(pp->curve.vertex[i], pp->curve.vertex[i1], pp->curve.vertex[k1],
+				 pp->curve.vertex[k2]) < d * ddist(pp->curve.vertex[k1], pp->curve.vertex[k2]) * COS179) {
+			return 1;
+		}
+	}
+
+	/* the curve we're working in: */
+	p0 = pp->curve.c[mod(i, m)][2];
+	p1 = pp->curve.vertex[mod(i + 1, m)];
+	p2 = pp->curve.vertex[mod(j, m)];
+	p3 = pp->curve.c[mod(j, m)][2];
+
+	/* determine its area */
+	area = areac[j] - areac[i];
+	area -= dpara(pp->curve.vertex[0], pp->curve.c[i][2], pp->curve.c[j][2]) / 2;
+	if (i >= j) {
+		area += areac[m];
+	}
+
+	/* find intersection o of p0p1 and p2p3. Let t,s such that o =
+	   interval(t,p0,p1) = interval(s,p3,p2). Let A be the area of the
+	   triangle (p0,o,p3). */
+
+	A1 = dpara(p0, p1, p2);
+	A2 = dpara(p0, p1, p3);
+	A3 = dpara(p0, p2, p3);
+	/* A4 = dpara(p1, p2, p3); */
+	A4 = A1 + A3 - A2;
+
+	if (A2 == A1) {								/* this should never happen */
+		return 1;
+	}
+
+	t = A3 / (A3 - A4);
+	s = A2 / (A2 - A1);
+	A = A2 * t / 2.0;
+
+	if (A == 0.0) {								/* this should never happen */
+		return 1;
+	}
+
+	R = area / A;									/* relative area */
+	alpha = 2 - sqrt(4 - R / 0.3);	/* overall alpha for p0-o-p3 curve */
+
+	res->c[0] = interval(t * alpha, p0, p1);
+	res->c[1] = interval(s * alpha, p3, p2);
+	res->alpha = alpha;
+	res->t = t;
+	res->s = s;
+
+	p1 = res->c[0];
+	p2 = res->c[1];								/* the proposed curve is now (p0,p1,p2,p3) */
+
+	res->pen = 0;
+
+	/* calculate penalty */
+	/* check tangency with edges */
+	for (k = mod(i + 1, m); k != j; k = k1) {
+		k1 = mod(k + 1, m);
+		t = tangent(p0, p1, p2, p3, pp->curve.vertex[k], pp->curve.vertex[k1]);
+		if (t < -.5) {
+			return 1;
+		}
+		pt = bezier(t, p0, p1, p2, p3);
+		d = ddist(pp->curve.vertex[k], pp->curve.vertex[k1]);
+		if (d == 0.0) {							/* this should never happen */
+			return 1;
+		}
+		d1 = dpara(pp->curve.vertex[k], pp->curve.vertex[k1], pt) / d;
+		if (fabs(d1) > opttolerance) {
+			return 1;
+		}
+		if (iprod(pp->curve.vertex[k], pp->curve.vertex[k1], pt) < 0 || iprod(pp->curve.vertex[k1], pp->curve.vertex[k], pt) < 0) {
+			return 1;
+		}
+		res->pen += sq(d1);
+	}
+
+	/* check corners */
+	for (k = i; k != j; k = k1) {
+		k1 = mod(k + 1, m);
+		t = tangent(p0, p1, p2, p3, pp->curve.c[k][2], pp->curve.c[k1][2]);
+		if (t < -.5) {
+			return 1;
+		}
+		pt = bezier(t, p0, p1, p2, p3);
+		d = ddist(pp->curve.c[k][2], pp->curve.c[k1][2]);
+		if (d == 0.0) {							/* this should never happen */
+			return 1;
+		}
+		d1 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pt) / d;
+		d2 = dpara(pp->curve.c[k][2], pp->curve.c[k1][2], pp->curve.vertex[k1]) / d;
+		d2 *= 0.75 * pp->curve.alpha[k1];
+		if (d2 < 0) {
+			d1 = -d1;
+			d2 = -d2;
+		}
+		if (d1 < d2 - opttolerance) {
+			return 1;
+		}
+		if (d1 < d2) {
+			res->pen += sq(d1 - d2);
+		}
+	}
+
+	return 0;
+}
+
+/* optimize the path p, replacing sequences of Bezier segments by a
+   single segment when possible. Return 0 on success, 1 with errno set
+   on failure. */
+static int
+PCB_ATTRIBUTE_UNUSED opticurve(privpath_t * pp, double opttolerance)
+{
+	int m = pp->curve.n;
+	int *pt = NULL;								/* pt[m+1] */
+	double *pen = NULL;						/* pen[m+1] */
+	int *len = NULL;							/* len[m+1] */
+	opti_t *opt = NULL;						/* opt[m+1] */
+	int om;
+	int i, j, r;
+	opti_t o;
+	dpoint_t p0;
+	int i1;
+	double area;
+	double alpha;
+	double *s = NULL;
+	double *t = NULL;
+
+	int *convc = NULL;						/* conv[m]: pre-computed convexities */
+	double *areac = NULL;					/* cumarea[m+1]: cache for fast area computation */
+
+	SAFE_MALLOC(pt, m + 1, int);
+	SAFE_MALLOC(pen, m + 1, double);
+	SAFE_MALLOC(len, m + 1, int);
+	SAFE_MALLOC(opt, m + 1, opti_t);
+	SAFE_MALLOC(convc, m, int);
+	SAFE_MALLOC(areac, m + 1, double);
+
+	/* pre-calculate convexity: +1 = right turn, -1 = left turn, 0 = corner */
+	for (i = 0; i < m; i++) {
+		if (pp->curve.tag[i] == POTRACE_CURVETO) {
+			convc[i] = sign(dpara(pp->curve.vertex[mod(i - 1, m)], pp->curve.vertex[i], pp->curve.vertex[mod(i + 1, m)]));
+		}
+		else {
+			convc[i] = 0;
+		}
+	}
+
+	/* pre-calculate areas */
+	area = 0.0;
+	areac[0] = 0.0;
+	p0 = pp->curve.vertex[0];
+	for (i = 0; i < m; i++) {
+		i1 = mod(i + 1, m);
+		if (pp->curve.tag[i1] == POTRACE_CURVETO) {
+			alpha = pp->curve.alpha[i1];
+			area += 0.3 * alpha * (4 - alpha) * dpara(pp->curve.c[i][2], pp->curve.vertex[i1], pp->curve.c[i1][2]) / 2;
+			area += dpara(p0, pp->curve.c[i][2], pp->curve.c[i1][2]) / 2;
+		}
+		areac[i + 1] = area;
+	}
+
+	pt[0] = -1;
+	pen[0] = 0;
+	len[0] = 0;
+
+	/* Fixme: we always start from a fixed point -- should find the best
+	   curve cyclically ### */
+
+	for (j = 1; j <= m; j++) {
+		/* calculate best path from 0 to j */
+		pt[j] = j - 1;
+		pen[j] = pen[j - 1];
+		len[j] = len[j - 1] + 1;
+
+		for (i = j - 2; i >= 0; i--) {
+			r = opti_penalty(pp, i, mod(j, m), &o, opttolerance, convc, areac);
+			if (r) {
+				break;
+			}
+			if (len[j] > len[i] + 1 || (len[j] == len[i] + 1 && pen[j] > pen[i] + o.pen)) {
+				pt[j] = i;
+				pen[j] = pen[i] + o.pen;
+				len[j] = len[i] + 1;
+				opt[j] = o;
+			}
+		}
+	}
+	om = len[m];
+	r = privcurve_init(&pp->ocurve, om);
+	if (r) {
+		goto malloc_error;
+	}
+	SAFE_MALLOC(s, om, double);
+	SAFE_MALLOC(t, om, double);
+
+	j = m;
+	for (i = om - 1; i >= 0; i--) {
+		if (pt[j] == j - 1) {
+			pp->ocurve.tag[i] = pp->curve.tag[mod(j, m)];
+			pp->ocurve.c[i][0] = pp->curve.c[mod(j, m)][0];
+			pp->ocurve.c[i][1] = pp->curve.c[mod(j, m)][1];
+			pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2];
+			pp->ocurve.vertex[i] = pp->curve.vertex[mod(j, m)];
+			pp->ocurve.alpha[i] = pp->curve.alpha[mod(j, m)];
+			pp->ocurve.alpha0[i] = pp->curve.alpha0[mod(j, m)];
+			pp->ocurve.beta[i] = pp->curve.beta[mod(j, m)];
+			s[i] = t[i] = 1.0;
+		}
+		else {
+			pp->ocurve.tag[i] = POTRACE_CURVETO;
+			pp->ocurve.c[i][0] = opt[j].c[0];
+			pp->ocurve.c[i][1] = opt[j].c[1];
+			pp->ocurve.c[i][2] = pp->curve.c[mod(j, m)][2];
+			pp->ocurve.vertex[i] = interval(opt[j].s, pp->curve.c[mod(j, m)][2], pp->curve.vertex[mod(j, m)]);
+			pp->ocurve.alpha[i] = opt[j].alpha;
+			pp->ocurve.alpha0[i] = opt[j].alpha;
+			s[i] = opt[j].s;
+			t[i] = opt[j].t;
+		}
+		j = pt[j];
+	}
+
+	/* calculate beta parameters */
+	for (i = 0; i < om; i++) {
+		i1 = mod(i + 1, om);
+		pp->ocurve.beta[i] = s[i] / (s[i] + t[i1]);
+	}
+	pp->ocurve.alphacurve = 1;
+
+	free(pt);
+	free(pen);
+	free(len);
+	free(opt);
+	free(s);
+	free(t);
+	free(convc);
+	free(areac);
+	return 0;
+
+malloc_error:
+	free(pt);
+	free(pen);
+	free(len);
+	free(opt);
+	free(s);
+	free(t);
+	free(convc);
+	free(areac);
+	return 1;
+}
+
+/* ---------------------------------------------------------------------- */
+double plotpolygon(privpath_t * pp, FILE * f, double scale)
+{
+	int i;
+	int m = pp->m;
+	int *po = pp->po;
+	point_t *pt = pp->pt;
+	/* double scale=1.0/dpi; */
+	double dm = 0;
+
+	if (!m)
+		return 0;
+
+	po = pp->po;
+	pt = pp->pt;
+
+	fprintf(f, "G0 X%f Y%f    (start point)\n", pt[po[0]].x * scale, pt[po[0]].y * scale);
+	fprintf(f, "G1 Z#101\n");
+	for (i = 1; i < m; i++) {
+		fprintf(f, "G1 X%f Y%f\n", pt[po[i]].x * scale, pt[po[i]].y * scale);
+		dm +=
+			sqrt((pt[po[i]].x - pt[po[i - 1]].x) * scale * (pt[po[i]].x -
+																											pt[po[i - 1]].x) *
+					 scale + (pt[po[i]].y - pt[po[i - 1]].y) * scale * (pt[po[i]].y - pt[po[i - 1]].y) * scale);
+	}
+	fprintf(f, "G1 X%f Y%f\n", pt[po[0]].x * scale, pt[po[0]].y * scale);
+	fprintf(f, "G0 Z#100\n");
+	dm +=
+		sqrt((pt[po[m - 1]].x - pt[po[0]].x) * scale * (pt[po[m - 1]].x -
+																										pt[po[0]].x) * scale +
+				 (pt[po[m - 1]].y - pt[po[0]].y) * scale * (pt[po[m - 1]].y - pt[po[0]].y) * scale);
+	fprintf(f, "(polygon end, distance %.2f)\n", dm);
+	return dm;
+}
+
+#define TRY(x) if (x) goto try_error
+
+/* return distance on success, -1 on error with errno set. */
+double process_path(path_t * plist, const potrace_param_t * param, const potrace_bitmap_t * bm, FILE * f, double scale)
+{
+	path_t *p;
+	double dm = 0;
+	int n = 0;
+	/* call downstream function with each path */
+	list_forall(p, plist) {
+		TRY(calc_sums(p->priv));
+		TRY(calc_lon(p->priv));
+		TRY(bestpolygon(p->priv));
+		TRY(adjust_vertices(p->priv));
+		fprintf(f, "(polygon %d)\n", ++n);
+		dm += plotpolygon(p->priv, f, scale);
+/*  No need to extract curves
+	TRY(smooth(&p->priv->curve, p->sign, param->alphamax));
+    if (param->opticurve) {
+      TRY(opticurve(p->priv, param->opttolerance));
+      p->priv->fcurve = &p->priv->ocurve;
+    } else {
+      p->priv->fcurve = &p->priv->curve;
+    }
+    privcurve_to_curve(p->priv->fcurve, &p->curve);*/
+	}
+/*      fprintf(f,"(end, total distance %.2fmm = %.2fin)\n",25.4*dm,dm); */
+	return dm;
+
+try_error:
+	return -1;
+}
Index: tags/2.0.1/src_plugins/export_gcode/trace.h
===================================================================
--- tags/2.0.1/src_plugins/export_gcode/trace.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gcode/trace.h	(revision 18980)
@@ -0,0 +1,14 @@
+/* Copyright (C) 2001-2007 Peter Selinger.
+   This file is part of Potrace. It is free software and it is covered
+   by the GNU General Public License. See the file COPYING for details. */
+
+/* $Id: trace.h 147 2007-04-09 00:44:09Z selinger $ */
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include "potracelib.h"
+
+double process_path(path_t * plist, const potrace_param_t * param, const potrace_bitmap_t * bm, FILE * f, double scale);
+
+#endif /* TRACE_H */
Index: tags/2.0.1/src_plugins/export_gerber/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_gerber/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gerber/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_gerber
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_gerber/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_gerber/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gerber/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_gerber}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_gerber/gerber.o @]
+
+switch /local/pcb/export_gerber/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_gerber/export_gerber.pup
===================================================================
--- tags/2.0.1/src_plugins/export_gerber/export_gerber.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gerber/export_gerber.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short Gerber pcb_exporter
+$long Export to gerber
+$state works
+$fmt-native no
+$fmt-feature-w export gerber for PCB fabbing, multiple files (configurable)
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_gerber/gerber.c
===================================================================
--- tags/2.0.1/src_plugins/export_gerber/gerber.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_gerber/gerber.c	(revision 18980)
@@ -0,0 +1,1365 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#include <math.h>
+
+#include <time.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "build_run.h"
+#include "config.h"
+#include "data.h"
+#include "error.h"
+#include "draw.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_cam.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "macro.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_flags.h"
+#include "hid_inlines.h"
+#include "conf_core.h"
+
+const char *gerber_cookie = "gerber HID";
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented Gerber function %s.\n", func); abort()
+
+#define SUFF_LEN 256
+
+#if SUFF_LEN < PCB_DERIVE_FN_SUFF_LEN
+#	error SUFF_LEN needs at least PCB_DERIVE_FN_SUFF_LEN
+#endif
+
+static pcb_cam_t gerber_cam;
+
+static pcb_hid_attribute_t *gerber_get_export_options(int *n);
+static void gerber_do_export(pcb_hid_attr_val_t * options);
+static int gerber_parse_arguments(int *argc, char ***argv);
+static pcb_hid_gc_t gerber_make_gc(void);
+static void gerber_destroy_gc(pcb_hid_gc_t gc);
+static void gerber_set_color(pcb_hid_gc_t gc, const char *name);
+static void gerber_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
+static void gerber_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
+static void gerber_set_draw_xor(pcb_hid_gc_t gc, int _xor);
+static void gerber_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void gerber_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle);
+static void gerber_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void gerber_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+static void gerber_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void gerber_calibrate(double xval, double yval);
+static void gerber_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action);
+static void gerber_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+static void gerber_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y);
+
+/*----------------------------------------------------------------------------*/
+/* Utility routines                                                           */
+/*----------------------------------------------------------------------------*/
+
+/* These are for films */
+#define gerberX(pcb, x) ((pcb_coord_t) (x))
+#define gerberY(pcb, y) ((pcb_coord_t) ((pcb)->MaxHeight - (y)))
+#define gerberXOffset(pcb, x) ((pcb_coord_t) (x))
+#define gerberYOffset(pcb, y) ((pcb_coord_t) (-(y)))
+
+/* Note: these are for drills (printed as mils but are really 1/10th mil) so print them with %mk  */
+#define gerberDrX(pcb, x) ((pcb_coord_t) (x))
+#define gerberDrY(pcb, y) ((pcb_coord_t) ((pcb)->MaxHeight - (y)))
+
+/*----------------------------------------------------------------------------*/
+/* Private data structures                                                    */
+/*----------------------------------------------------------------------------*/
+
+static int verbose;
+static int all_layers;
+static int is_mask, was_drill;
+static int is_drill;
+static pcb_composite_op_t gerber_drawing_mode, drawing_mode_issued;
+static int flash_drills;
+static int copy_outline_mode;
+static int name_style;
+static int want_cross_sect;
+static pcb_layer_t *outline_layer;
+static int gerber_debug;
+
+enum ApertureShape {
+	ROUND,												/* Shaped like a circle */
+	OCTAGON,											/* octagonal shape */
+	SQUARE												/* Shaped like a square */
+};
+typedef enum ApertureShape ApertureShape;
+
+/* This is added to the global aperture array indexes to get gerber
+   dcode and macro numbers.  */
+#define DCODE_BASE 11
+
+typedef struct aperture {
+	int dCode;										/* The RS-274X D code */
+	pcb_coord_t width;									/* Size in pcb units */
+	ApertureShape shape;					/* ROUND/SQUARE etc */
+	struct aperture *next;
+} Aperture;
+
+typedef struct {
+	Aperture *data;
+	int count;
+} ApertureList;
+
+static ApertureList *layer_aptr_list;
+static ApertureList *curr_aptr_list;
+static int layer_list_max;
+static int layer_list_idx;
+
+typedef struct {
+	pcb_coord_t diam;
+	pcb_coord_t x;
+	pcb_coord_t y;
+} PendingDrills;
+PendingDrills *pending_drills = NULL;
+int n_pending_drills = 0, max_pending_drills = 0;
+
+/*----------------------------------------------------------------------------*/
+/* Defined Constants                                                          */
+/*----------------------------------------------------------------------------*/
+#define AUTO_OUTLINE_WIDTH PCB_MIL_TO_COORD(8)	/* Auto-geneated outline width of 8 mils */
+
+/*----------------------------------------------------------------------------*/
+/* Aperture Routines                                                          */
+/*----------------------------------------------------------------------------*/
+
+/* Initialize aperture list */
+static void initApertureList(ApertureList * list)
+{
+	list->data = NULL;
+	list->count = 0;
+}
+
+static void deinitApertureList(ApertureList * list)
+{
+	Aperture *search = list->data;
+	Aperture *next;
+	while (search) {
+		next = search->next;
+		free(search);
+		search = next;
+	}
+	initApertureList(list);
+}
+
+static void resetApertures()
+{
+	int i;
+	for (i = 0; i < layer_list_max; ++i)
+		deinitApertureList(&layer_aptr_list[i]);
+	free(layer_aptr_list);
+	layer_aptr_list = NULL;
+	curr_aptr_list = NULL;
+	layer_list_max = 0;
+	layer_list_idx = 0;
+}
+
+/* Create and add a new aperture to the list */
+static Aperture *addAperture(ApertureList * list, pcb_coord_t width, ApertureShape shape)
+{
+	static int aperture_count;
+
+	Aperture *app = (Aperture *) malloc(sizeof *app);
+	if (app == NULL)
+		return NULL;
+
+	app->width = width;
+	app->shape = shape;
+	app->dCode = DCODE_BASE + aperture_count++;
+	app->next = list->data;
+
+	list->data = app;
+	++list->count;
+
+	return app;
+}
+
+/* Fetch an aperture from the list with the specified
+ *  width/shape, creating a new one if none exists */
+static Aperture *findAperture(ApertureList * list, pcb_coord_t width, ApertureShape shape)
+{
+	Aperture *search;
+
+	/* we never draw zero-width lines */
+	if (width == 0)
+		return NULL;
+
+	/* Search for an appropriate aperture. */
+	for (search = list->data; search; search = search->next)
+		if (search->width == width && search->shape == shape)
+			return search;
+
+	/* Failing that, create a new one */
+	return addAperture(list, width, shape);
+}
+
+/* Output aperture data to the file */
+static void fprintAperture(FILE * f, Aperture * aptr)
+{
+	switch (aptr->shape) {
+	case ROUND:
+		pcb_fprintf(f, "%%ADD%dC,%.4mi*%%\r\n", aptr->dCode, aptr->width);
+		break;
+	case SQUARE:
+		pcb_fprintf(f, "%%ADD%dR,%.4miX%.4mi*%%\r\n", aptr->dCode, aptr->width, aptr->width);
+		break;
+	case OCTAGON:
+		pcb_fprintf(f, "%%AMOCT%d*5,0,8,0,0,%.4mi,22.5*%%\r\n"
+								"%%ADD%dOCT%d*%%\r\n", aptr->dCode, (pcb_coord_t) ((double) aptr->width / PCB_COS_22_5_DEGREE), aptr->dCode, aptr->dCode);
+		break;
+	}
+}
+
+/* Set the aperture list for the current layer,
+ * expanding the list buffer if needed  */
+static ApertureList *setLayerApertureList(int layer_idx)
+{
+	if (layer_idx >= layer_list_max) {
+		int i = layer_list_max;
+		layer_list_max = 2 * (layer_idx + 1);
+		layer_aptr_list = (ApertureList *)
+			realloc(layer_aptr_list, layer_list_max * sizeof(*layer_aptr_list));
+		for (; i < layer_list_max; ++i)
+			initApertureList(&layer_aptr_list[i]);
+	}
+	curr_aptr_list = &layer_aptr_list[layer_idx];
+	return curr_aptr_list;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static pcb_hid_t gerber_hid;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_cap_style_t cap;
+	int width;
+	int color;
+	int erase;
+	int drill;
+} hid_gc_s;
+
+static FILE *f = NULL;
+static char *filename = NULL;
+static char *filesuff = NULL;
+static char *layername = NULL;
+static int lncount = 0;
+
+static int finding_apertures = 0;
+static int pagecount = 0;
+static int linewidth = -1;
+static pcb_layergrp_id_t lastgroup = -1;
+static int lastcap = -1;
+static int lastcolor = -1;
+static int lastX, lastY;				/* the last X and Y coordinate */
+
+static const char *copy_outline_names[] = {
+#define COPY_OUTLINE_NONE 0
+	"none",
+#define COPY_OUTLINE_MASK 1
+	"mask",
+#define COPY_OUTLINE_SILK 2
+	"silk",
+#define COPY_OUTLINE_ALL 3
+	"all",
+	NULL
+};
+
+static const char *name_style_names[] = {
+#define NAME_STYLE_FIXED 0
+	"fixed",
+#define NAME_STYLE_SINGLE 1
+	"single",
+#define NAME_STYLE_FIRST 2
+	"first",
+#define NAME_STYLE_EAGLE 3
+	"eagle",
+#define NAME_STYLE_HACKVANA 4
+	"hackvana",
+#define NAME_STYLE_UNIVERSAL 5
+	"universal",
+	NULL
+};
+
+static pcb_hid_attribute_t gerber_options[] = {
+
+/* %start-doc options "90 Gerber Export"
+@ftable @code
+@item --gerberfile <string>
+Gerber output file prefix. Can include a path.
+@end ftable
+%end-doc
+*/
+	{"gerberfile", "Gerber output file base",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_gerberfile 0
+
+/* %start-doc options "90 Gerber Export"
+@ftable @code
+@item --all-layers
+Output contains all layers, even empty ones.
+@end ftable
+%end-doc
+*/
+	{"all-layers", "Output all layers, even empty ones",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_all_layers 1
+
+/* %start-doc options "90 Gerber Export"
+@ftable @code
+@item --verbose
+Print file names and aperture counts on stdout.
+@end ftable
+%end-doc
+*/
+	{"verbose", "Print file names and aperture counts on stdout",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_verbose 2
+	{"copy-outline", "Copy outline onto other layers",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, copy_outline_names, 0},
+#define HA_copy_outline 3
+	{"name-style", "Naming style for individual gerber files",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, name_style_names, 0},
+#define HA_name_style 4
+	{"cross-sect", "Export the cross section layer",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cross_sect 5
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cam 6
+};
+
+#define NUM_OPTIONS (sizeof(gerber_options)/sizeof(gerber_options[0]))
+
+static pcb_hid_attr_val_t gerber_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *gerber_get_export_options(int *n)
+{
+	static char *last_made_filename = NULL;
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &gerber_options[HA_gerberfile], "", &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return gerber_options;
+}
+
+static pcb_layergrp_id_t group_for_layer(int l)
+{
+	if (l < pcb_max_layer && l >= 0)
+		return pcb_layer_get_group(PCB, l);
+	/* else something unique */
+	return pcb_max_group(PCB) + 3 + l;
+}
+
+static int layer_sort(const void *va, const void *vb)
+{
+	int a = *(int *) va;
+	int b = *(int *) vb;
+	int d = group_for_layer(b) - group_for_layer(a);
+	if (d)
+		return d;
+	return b - a;
+}
+
+static void maybe_close_f(FILE * f)
+{
+	if (f) {
+		if (was_drill)
+			fprintf(f, "M30\r\n");
+		else
+			fprintf(f, "M02*\r\n");
+		fclose(f);
+	}
+}
+
+static pcb_box_t region;
+
+#define fmatch(flags, bits) (((flags) & (bits)) == (bits))
+
+/* Very similar to pcb_layer_to_file_name() but appends only a
+   three-character suffix compatible with Eagle's defaults.  */
+static void assign_eagle_file_suffix(char *dest, pcb_layer_id_t lid, unsigned int flags)
+{
+	const char *suff = "out";
+
+	if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_COPPER))
+		suff = "cmp";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_COPPER))
+		suff = "sol";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_SILK))
+		suff = "plc";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_SILK))
+		suff = "pls";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_MASK))
+		suff = "stc";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_MASK))
+		suff = "sts";
+	else if (fmatch(flags, PCB_LYT_PDRILL))
+		suff = "drd";
+	else if (fmatch(flags, PCB_LYT_UDRILL))
+		suff = "dru";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_PASTE))
+		suff = "crc";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_PASTE))
+		suff = "crs";
+	else if (fmatch(flags, PCB_LYT_INVIS))
+		suff = "inv";
+	else if (fmatch(flags, PCB_LYT_FAB))
+		suff = "fab";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_ASSY))
+		suff = "ast";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_ASSY))
+		suff = "asb";
+	else if (fmatch(flags, PCB_LYT_OUTLINE))
+		suff = "oln";
+	else {
+		static char buf[20];
+		pcb_layergrp_id_t group = pcb_layer_get_group(PCB, lid);
+		sprintf(buf, "ly%ld", group);
+		suff = buf;
+	}
+	strcpy(dest, suff);
+}
+
+/* Very similar to layer_type_to_file_name() but appends only a
+   three-character suffix compatible with Hackvana's naming requirements  */
+static void assign_hackvana_file_suffix(char *dest, pcb_layer_id_t lid, unsigned int flags)
+{
+	char *suff;
+
+	if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_COPPER))
+		suff = "gtl";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_COPPER))
+		suff = "gbl";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_SILK))
+		suff = "gto";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_SILK))
+		suff = "gbo";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_MASK))
+		suff = "gts";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_MASK))
+		suff = "gbs";
+	else if (fmatch(flags, PCB_LYT_PDRILL))
+		suff = "cnc";
+	else if (fmatch(flags, PCB_LYT_UDRILL))
+		suff = "_NPTH.drl";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_PASTE))
+		suff = "gtp";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_PASTE))
+		suff = "gbp";
+	else if (fmatch(flags, PCB_LYT_INVIS))
+		suff = "inv";
+	else if (fmatch(flags, PCB_LYT_FAB))
+		suff = "fab";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_ASSY))
+		suff = "ast";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_ASSY))
+		suff = "asb";
+	else if (fmatch(flags, PCB_LYT_OUTLINE))
+		suff = "gm1";
+	else {
+		static char buf[20];
+		pcb_layergrp_id_t group = pcb_layer_get_group(PCB, lid);
+		sprintf(buf, "g%ld", group);
+		suff = buf;
+	}
+	strcpy(dest, suff);
+}
+
+/* Very similar to layer_type_to_file_name() but appends the group name _and_ the magic suffix */
+static void assign_universal_file_suffix(char *dest, pcb_layergrp_id_t gid, unsigned int flags)
+{
+	char *suff;
+	int name_len;
+	pcb_layergrp_t *g;
+
+	if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_COPPER))
+		suff = "gtl";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_COPPER))
+		suff = "gbl";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_SILK))
+		suff = "gto";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_SILK))
+		suff = "gbo";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_MASK))
+		suff = "gts";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_MASK))
+		suff = "gbs";
+	else if (fmatch(flags, PCB_LYT_PDRILL))
+		suff = "drl";
+	else if (fmatch(flags, PCB_LYT_UDRILL))
+		suff = "_NPTH.drl";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_PASTE))
+		suff = "gtp";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_PASTE))
+		suff = "gbp";
+	else if (fmatch(flags, PCB_LYT_INVIS))
+		suff = "inv";
+	else if (fmatch(flags, PCB_LYT_FAB))
+		suff = "fab";
+	else if (fmatch(flags, PCB_LYT_TOP | PCB_LYT_ASSY))
+		suff = "ast";
+	else if (fmatch(flags, PCB_LYT_BOTTOM | PCB_LYT_ASSY))
+		suff = "asb";
+	else if (fmatch(flags, PCB_LYT_OUTLINE))
+		suff = "gko";
+	else {
+		static char buf[20];
+		sprintf(buf, "g%ld", gid);
+		suff = buf;
+	}
+
+	/* insert group name if available */
+	g = pcb_get_layergrp(PCB, gid);
+	if (g != NULL) {
+		name_len = strlen(g->name);
+		if (name_len >= SUFF_LEN-5)
+			name_len = SUFF_LEN-5; /* truncate group name */
+		memcpy(dest, g->name, name_len);
+		dest += name_len;
+		*dest = '.';
+		dest++;
+	}
+	strcpy(dest, suff);
+}
+
+
+#undef fmatch
+
+
+static void assign_file_suffix(char *dest, pcb_layergrp_id_t gid, pcb_layer_id_t lid, unsigned int flags)
+{
+	int fns_style;
+	const char *sext = ".gbr";
+
+	switch (name_style) {
+	default:
+	case NAME_STYLE_FIXED:
+		fns_style = PCB_FNS_fixed;
+		break;
+	case NAME_STYLE_SINGLE:
+		fns_style = PCB_FNS_single;
+		break;
+	case NAME_STYLE_FIRST:
+		fns_style = PCB_FNS_first;
+		break;
+	case NAME_STYLE_EAGLE:
+		assign_eagle_file_suffix(dest, lid, flags);
+		return;
+	case NAME_STYLE_HACKVANA:
+		assign_hackvana_file_suffix(dest, lid, flags);
+		return;
+	case NAME_STYLE_UNIVERSAL:
+		assign_universal_file_suffix(dest, gid, flags);
+		return;
+	}
+
+	if ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL))
+		sext = ".cnc";
+	pcb_layer_to_file_name(dest, lid, flags, fns_style);
+	strcat(dest, sext);
+}
+
+static void gerber_do_export(pcb_hid_attr_val_t * options)
+{
+	const char *fnbase;
+	int i;
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	int save_ons[PCB_MAX_LAYER + 2];
+	pcb_hid_expose_ctx_t ctx;
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+	conf_force_set_bool(conf_core.editor.check_planes, 0);
+
+	drawing_mode_issued = PCB_HID_COMP_POSITIVE;
+
+	if (!options) {
+		gerber_get_export_options(NULL);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			gerber_values[i] = gerber_options[i].default_val;
+		options = gerber_values;
+	}
+
+	pcb_cam_begin(PCB, &gerber_cam, options[HA_cam].str_value, gerber_options, NUM_OPTIONS, options);
+
+	fnbase = options[HA_gerberfile].str_value;
+	if (!fnbase)
+		fnbase = "pcb-out";
+
+	verbose = options[HA_verbose].int_value;
+	all_layers = options[HA_all_layers].int_value;
+
+	copy_outline_mode = options[HA_copy_outline].int_value;
+	name_style = options[HA_name_style].int_value;
+
+	want_cross_sect = options[HA_cross_sect].int_value;
+
+#warning layer TODO: this assumes there is only one outline layer; instead of this, just use a boolthat says whether we had an outline layer and redo the search
+	outline_layer = NULL;
+
+	for (i = 0; i < pcb_max_layer; i++)
+		if (pcb_layer_flags(PCB, i) & PCB_LYT_OUTLINE)
+			outline_layer = PCB->Data->Layer + i;
+
+	i = strlen(fnbase);
+	filename = (char *) realloc(filename, i + SUFF_LEN);
+	strcpy(filename, fnbase);
+	strcat(filename, ".");
+	filesuff = filename + strlen(filename);
+
+	if (!gerber_cam.active)
+		pcb_hid_save_and_show_layer_ons(save_ons);
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+	qsort(pcb_layer_stack, pcb_max_layer, sizeof(pcb_layer_stack[0]), layer_sort);
+	linewidth = -1;
+	lastcap = -1;
+	lastgroup = -1;
+	lastcolor = -1;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	pagecount = 1;
+	resetApertures();
+
+	lastgroup = -1;
+	layer_list_idx = 0;
+	finding_apertures = 1;
+	pcb_hid_expose_all(&gerber_hid, &ctx);
+
+	lastgroup = -2;
+	layer_list_idx = 0;
+	finding_apertures = 0;
+	pcb_hid_expose_all(&gerber_hid, &ctx);
+
+	memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack));
+
+	maybe_close_f(f);
+	f = NULL;
+	if (!gerber_cam.active)
+		pcb_hid_restore_layer_ons(save_ons);
+	conf_update(NULL, -1); /* resotre forced sets */
+
+	if (pcb_cam_end(&gerber_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "gerber cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+
+	/* in cam mode we have f still open */
+	maybe_close_f(f);
+	f = NULL;
+
+}
+
+static int gerber_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(gerber_options, NUM_OPTIONS, gerber_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int drill_sort(const void *va, const void *vb)
+{
+	PendingDrills *a = (PendingDrills *) va;
+	PendingDrills *b = (PendingDrills *) vb;
+	if (a->diam != b->diam)
+		return a->diam - b->diam;
+	if (a->x != b->x)
+		return a->x - a->x;
+	return b->y - b->y;
+}
+
+static int gerber_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	int want_outline;
+	char *cp;
+	const char *group_name;
+
+	/* before cam lets this happen... */
+	if (flags & PCB_LYT_ASSY)
+		return 0;
+
+	pcb_cam_set_layer_group(&gerber_cam, group, flags);
+
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+#if 0
+	printf(" Layer %s group %lx drill %d mask %d flags=%lx\n", pcb_layer_name(PCB, layer), group, is_drill, is_mask, flags);
+#endif
+
+
+	if (!all_layers) {
+		int stay = 0;
+		if ((group >= 0) && pcb_layergrp_is_empty(PCB, group) && !(flags & PCB_LYT_SILK)) {
+			/* layer is empty and the user didn't want to have empty layers; however;
+			   if the user wants to copy the outline to specific layers, those
+			   layers will become non-empty: even an empty outline would bring
+			   the implicit outline rectangle at board extents! */
+
+			if (copy_outline_mode == COPY_OUTLINE_MASK && (flags & PCB_LYT_MASK)) stay = 1;
+			if (copy_outline_mode == COPY_OUTLINE_SILK && (flags & PCB_LYT_SILK)) stay = 1;
+			if (copy_outline_mode == COPY_OUTLINE_ALL && \
+				((flags & PCB_LYT_SILK) || (flags & PCB_LYT_MASK) ||
+				(flags & PCB_LYT_FAB) || (flags & PCB_LYT_ASSY) || 
+				(flags & PCB_LYT_OUTLINE))) stay = 1;
+
+			if (!stay) return 0;
+		}
+	}
+
+	if ((flags & PCB_LYT_INVIS) || (flags & PCB_LYT_ASSY)) {
+/*		printf("  nope: invis %d or assy %d\n", (flags & PCB_LYT_INVIS), (flags & PCB_LYT_ASSY));*/
+		return 0;
+	}
+
+	if ((flags & PCB_LYT_CSECT) && (!want_cross_sect))
+		return 0;
+
+	if ((group >= 0) && (group < pcb_max_group(PCB))) {
+		group_name = PCB->LayerGroups.grp[group].name;
+		if (group_name == NULL)
+			group_name = "<unknown>";
+	}
+	else
+		group_name = "<virtual group>";
+
+	flash_drills = 0;
+	if (flags & PCB_LYT_OUTLINE)
+		flash_drills = 1;
+
+	if (is_drill && n_pending_drills) {
+		int i;
+		/* dump pending drills in sequence */
+		qsort(pending_drills, n_pending_drills, sizeof(pending_drills[0]), drill_sort);
+		for (i = 0; i < n_pending_drills; i++) {
+			if (i == 0 || pending_drills[i].diam != pending_drills[i - 1].diam) {
+				Aperture *ap = findAperture(curr_aptr_list, pending_drills[i].diam, ROUND);
+				fprintf(f, "T%02d\r\n", ap->dCode);
+			}
+			pcb_fprintf(f, "X%06.0mkY%06.0mk\r\n", gerberDrX(PCB, pending_drills[i].x), gerberDrY(PCB, pending_drills[i].y));
+		}
+		free(pending_drills);
+		n_pending_drills = max_pending_drills = 0;
+		pending_drills = NULL;
+	}
+
+	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_mask = !!(flags & PCB_LYT_MASK);
+	if (group < 0 || group != lastgroup) {
+		char utcTime[64];
+		ApertureList *aptr_list;
+		Aperture *search;
+
+		lastgroup = group;
+		lastX = -1;
+		lastY = -1;
+		lastcolor = 0;
+		linewidth = -1;
+		lastcap = -1;
+
+		aptr_list = setLayerApertureList(layer_list_idx++);
+
+		if (finding_apertures)
+			goto emit_outline;
+
+		if (aptr_list->count == 0 && !all_layers)
+			return 0;
+
+		if (!gerber_cam.active) {
+			/* in cam mode we reuse f */
+			maybe_close_f(f);
+			f = NULL;
+		}
+
+		pagecount++;
+		assign_file_suffix(filesuff, group, layer, flags);
+		if (f == NULL) { /* open a new file if we closed the previous (cam mode: only one file) */
+			f = pcb_fopen(gerber_cam.active ? gerber_cam.fn : filename, "wb"); /* Binary needed to force CR-LF */
+			if (f == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Error:  Could not open %s for writing.\n", filename);
+				return 1;
+			}
+		}
+
+		was_drill = is_drill;
+
+		if (verbose) {
+			int c = aptr_list->count;
+			printf("Gerber: %d aperture%s in %s\n", c, c == 1 ? "" : "s", filename);
+		}
+
+		if (is_drill) {
+			/* We omit the ,TZ here because we are not omitting trailing zeros.  Our format is
+			   always six-digit 0.1 mil resolution (i.e. 001100 = 0.11") */
+			fprintf(f, "M48\r\n" "INCH\r\n");
+			for (search = aptr_list->data; search; search = search->next)
+				pcb_fprintf(f, "T%02dC%.3mi\r\n", search->dCode, search->width);
+			fprintf(f, "%%\r\n");
+			/* FIXME */
+			return 1;
+		}
+
+		fprintf(f, "G04 start of page %d for group %ld layer_idx %ld *\r\n", pagecount, group, layer);
+
+		/* Create a portable timestamp. */
+		pcb_print_utc(utcTime, sizeof(utcTime), 0);
+
+		/* Print a cute file header at the beginning of each file. */
+		fprintf(f, "G04 Title: %s, %s *\r\n", PCB_UNKNOWN(PCB->Name), PCB_UNKNOWN(group_name));
+		fprintf(f, "G04 Creator: pcb-rnd " PCB_VERSION " *\r\n");
+		fprintf(f, "G04 CreationDate: %s *\r\n", utcTime);
+
+		/* ID the user. */
+		fprintf(f, "G04 For: %s *\r\n", pcb_author());
+
+		fprintf(f, "G04 Format: Gerber/RS-274X *\r\n");
+		pcb_fprintf(f, "G04 PCB-Dimensions: %.0mc %.0mc *\r\n", PCB->MaxWidth, PCB->MaxHeight);
+		fprintf(f, "G04 PCB-Coordinate-Origin: lower left *\r\n");
+
+		/* Signal data in inches. */
+		fprintf(f, "%%MOIN*%%\r\n");
+
+		/* Signal Leading zero suppression, Absolute Data, 2.5 format */
+		fprintf(f, "%%FSLAX25Y25*%%\r\n");
+
+		/* build a legal identifier. */
+		if (layername)
+			free(layername);
+		layername = pcb_strdup(filesuff);
+		if (strrchr(layername, '.'))
+			*strrchr(layername, '.') = 0;
+
+		for (cp = layername; *cp; cp++) {
+			if (isalnum((int) *cp))
+				*cp = toupper((int) *cp);
+			else
+				*cp = '_';
+		}
+		fprintf(f, "%%LN%s*%%\r\n", layername);
+		lncount = 1;
+
+		for (search = aptr_list->data; search; search = search->next)
+			fprintAperture(f, search);
+		if (aptr_list->count == 0)
+			/* We need to put *something* in the file to make it be parsed
+			   as RS-274X instead of RS-274D. */
+			fprintf(f, "%%ADD11C,0.0100*%%\r\n");
+	}
+
+emit_outline:
+	/* If we're printing a copper layer other than the outline layer,
+	   and we want to "print outlines", and we have an outline layer,
+	   print the outline layer on this layer also.  */
+	want_outline = 0;
+	if (copy_outline_mode == COPY_OUTLINE_MASK && (flags & PCB_LYT_MASK))
+		want_outline = 1;
+	if (copy_outline_mode == COPY_OUTLINE_SILK && (flags & PCB_LYT_SILK))
+		want_outline = 1;
+
+	if (copy_outline_mode == COPY_OUTLINE_ALL && ((flags & PCB_LYT_SILK) || (flags & PCB_LYT_MASK) || (flags & PCB_LYT_FAB) || (flags & PCB_LYT_ASSY)))
+		want_outline = 1;
+
+	if (want_outline && !(flags & PCB_LYT_OUTLINE)) {
+		if (outline_layer && outline_layer != PCB->Data->Layer + layer)
+			pcb_draw_layer(outline_layer, &region);
+		else if (!outline_layer) {
+			pcb_hid_gc_t gc = pcb_hid_make_gc();
+			if (flags & PCB_LYT_SILK)
+				pcb_hid_set_line_width(gc, conf_core.design.min_slk);
+			else if (group >= 0)
+				pcb_hid_set_line_width(gc, conf_core.design.min_wid);
+			else
+				pcb_hid_set_line_width(gc, AUTO_OUTLINE_WIDTH);
+			pcb_gui->draw_line(gc, 0, 0, PCB->MaxWidth, 0);
+			pcb_gui->draw_line(gc, 0, 0, 0, PCB->MaxHeight);
+			pcb_gui->draw_line(gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
+			pcb_gui->draw_line(gc, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
+			pcb_hid_destroy_gc(gc);
+		}
+	}
+
+	return 1;
+}
+
+static pcb_hid_gc_t gerber_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(1, sizeof(*rv));
+	rv->cap = pcb_cap_round;
+	return rv;
+}
+
+static void gerber_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void gerber_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *drw_screen)
+{
+	gerber_drawing_mode = op;
+	if ((f != NULL) && (gerber_debug))
+		fprintf(f, "G04 hid debug composite: %d*\r\n", op);
+}
+
+static void gerber_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	if (strcmp(name, "drill") == 0) {
+		gc->color = 1;
+		gc->erase = 0;
+		gc->drill = 1;
+	}
+	else {
+		gc->color = 0;
+		gc->erase = 0;
+		gc->drill = 0;
+	}
+}
+
+static void gerber_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void gerber_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void gerber_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void use_gc(pcb_hid_gc_t gc, int radius)
+{
+	if ((f != NULL) && (gerber_drawing_mode != drawing_mode_issued)) {
+		if ((gerber_drawing_mode == PCB_HID_COMP_POSITIVE) || (gerber_drawing_mode == PCB_HID_COMP_POSITIVE_XOR)) {
+			fprintf(f, "%%LPD*%%\r\n");
+			drawing_mode_issued = gerber_drawing_mode;
+		}
+		else if (gerber_drawing_mode == PCB_HID_COMP_NEGATIVE) {
+			fprintf(f, "%%LPC*%%\r\n");
+			drawing_mode_issued = gerber_drawing_mode;
+		}
+	}
+
+	if (radius) {
+		radius *= 2;
+		if (radius != linewidth || lastcap != pcb_cap_round) {
+			Aperture *aptr = findAperture(curr_aptr_list, radius, ROUND);
+			if (aptr == NULL)
+				pcb_fprintf(stderr, "error: aperture for radius %$mS type ROUND is null\n", radius);
+			else if (f && !is_drill)
+				fprintf(f, "G54D%d*", aptr->dCode);
+			linewidth = radius;
+			lastcap = pcb_cap_round;
+		}
+	}
+	else if (linewidth != gc->width || lastcap != gc->cap) {
+		Aperture *aptr;
+		ApertureShape shape;
+
+		linewidth = gc->width;
+		lastcap = gc->cap;
+		switch (gc->cap) {
+		case pcb_cap_round:
+			shape = ROUND;
+			break;
+		case pcb_cap_square:
+			shape = SQUARE;
+			break;
+		default:
+			assert(!"unhandled cap");
+			shape = ROUND;
+		}
+		aptr = findAperture(curr_aptr_list, linewidth, shape);
+		if (aptr == NULL)
+			pcb_fprintf(stderr, "error: aperture for width %$mS type %s is null\n", linewidth, shape == ROUND ? "ROUND" : "SQUARE");
+		if (f && aptr)
+			fprintf(f, "G54D%d*", aptr->dCode);
+	}
+
+
+#if 0
+	if (lastcolor != gc->color) {
+		c = gc->color;
+		if (is_drill)
+			return;
+		if (is_mask)
+			c = (gc->erase ? 0 : 1);
+		lastcolor = gc->color;
+		if (f) {
+			if (c) {
+				fprintf(f, "%%LN%s_C%d*%%\r\n", layername, lncount++);
+				fprintf(f, "%%LPC*%%\r\n");
+			}
+			else {
+				fprintf(f, "%%LN%s_D%d*%%\r\n", layername, lncount++);
+				fprintf(f, "%%LPD*%%\r\n");
+			}
+		}
+	}
+#endif
+}
+
+static void gerber_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gerber_draw_line(gc, x1, y1, x1, y2);
+	gerber_draw_line(gc, x1, y1, x2, y1);
+	gerber_draw_line(gc, x1, y2, x2, y2);
+	gerber_draw_line(gc, x2, y1, x2, y2);
+}
+
+static void gerber_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_bool m = pcb_false;
+
+	if (x1 != x2 && y1 != y2 && gc->cap == pcb_cap_square) {
+		pcb_coord_t x[5], y[5];
+		double tx, ty, theta;
+
+		theta = atan2(y2 - y1, x2 - x1);
+
+		/* T is a vector half a thickness long, in the direction of
+		   one of the corners.  */
+		tx = gc->width / 2.0 * cos(theta + M_PI / 4) * sqrt(2.0);
+		ty = gc->width / 2.0 * sin(theta + M_PI / 4) * sqrt(2.0);
+
+		x[0] = x1 - tx;
+		y[0] = y1 - ty;
+		x[1] = x2 + ty;
+		y[1] = y2 - tx;
+		x[2] = x2 + tx;
+		y[2] = y2 + ty;
+		x[3] = x1 - ty;
+		y[3] = y1 + tx;
+
+		x[4] = x[0];
+		y[4] = y[0];
+		gerber_fill_polygon(gc, 5, x, y);
+		return;
+	}
+
+	use_gc(gc, 0);
+	if (!f)
+		return;
+
+	if (x1 != lastX) {
+		m = pcb_true;
+		lastX = x1;
+		pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX));
+	}
+	if (y1 != lastY) {
+		m = pcb_true;
+		lastY = y1;
+		pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+	}
+	if ((x1 == x2) && (y1 == y2))
+		fprintf(f, "D03*\r\n");
+	else {
+		if (m)
+			fprintf(f, "D02*");
+		if (x2 != lastX) {
+			lastX = x2;
+			pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX));
+		}
+		if (y2 != lastY) {
+			lastY = y2;
+			pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+
+		}
+		fprintf(f, "D01*\r\n");
+	}
+
+}
+
+static void gerber_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_bool m = pcb_false;
+	double arcStartX, arcStopX, arcStartY, arcStopY;
+
+	/* we never draw zero-width lines */
+	if (gc->width == 0)
+		return;
+
+	use_gc(gc, 0);
+	if (!f)
+		return;
+
+	/* full circle is full.... truncate so that the arc split code never needs to
+	   do more than 180 deg */
+	if (delta_angle < -360.0)
+		delta_angle = -360.0;
+	if (delta_angle > +360.0)
+		delta_angle = +360.0;
+
+
+	/* some gerber interpreters (gerbv for one) have hard time dealing with
+	   full-circle arcs - split large arcs up into 2 smaller ones */
+	if (delta_angle < -180.0) {
+		gerber_draw_arc(gc, cx, cy, width, height, start_angle, -180.0);
+		gerber_draw_arc(gc, cx, cy, width, height, start_angle-180, delta_angle+180.0);
+		return;
+	}
+	if (delta_angle > +180.0) {
+		gerber_draw_arc(gc, cx, cy, width, height, start_angle, 180.0);
+		gerber_draw_arc(gc, cx, cy, width, height, start_angle+180, delta_angle-180.0);
+		return;
+	}
+
+
+	arcStartX = cx - width * cos(PCB_TO_RADIANS(start_angle));
+	arcStartY = cy + height * sin(PCB_TO_RADIANS(start_angle));
+
+	if (fabs(delta_angle) < 0.01) {
+		gerber_draw_line(gc, arcStartX, arcStartY, arcStartX, arcStartY);
+		return;
+	}
+
+	/* I checked three different gerber viewers, and they all disagreed
+	   on how ellipses should be drawn.  The spec just calls G74/G75
+	   "circular interpolation" so there's a chance it just doesn't
+	   support ellipses at all.  Thus, we draw them out with line
+	   segments.  Note that most arcs in pcb are circles anyway.  */
+	if (width != height) {
+		double step, angle;
+		pcb_coord_t max = width > height ? width : height;
+		pcb_coord_t minr = max - gc->width / 10;
+		int nsteps;
+		pcb_coord_t x0, y0, x1, y1;
+
+		if (minr >= max)
+			minr = max - 1;
+		step = acos((double) minr / (double) max) * 180.0 / M_PI;
+		if (step > 5)
+			step = 5;
+		nsteps = fabs(delta_angle) / step + 1;
+		step = (double) delta_angle / nsteps;
+
+		x0 = arcStartX;
+		y0 = arcStartY;
+		angle = start_angle;
+		while (nsteps > 0) {
+			nsteps--;
+			x1 = cx - width * cos(PCB_TO_RADIANS(angle + step));
+			y1 = cy + height * sin(PCB_TO_RADIANS(angle + step));
+			gerber_draw_line(gc, x0, y0, x1, y1);
+			x0 = x1;
+			y0 = y1;
+			angle += step;
+		}
+		return;
+	}
+
+	arcStopX = cx - width * cos(PCB_TO_RADIANS(start_angle + delta_angle));
+	arcStopY = cy + height * sin(PCB_TO_RADIANS(start_angle + delta_angle));
+	if (arcStartX != lastX) {
+		m = pcb_true;
+		lastX = arcStartX;
+		pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX));
+	}
+	if (arcStartY != lastY) {
+		m = pcb_true;
+		lastY = arcStartY;
+		pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+	}
+	if (m)
+		fprintf(f, "D02*");
+	pcb_fprintf(f,
+							"G75*G0%1dX%.0mcY%.0mcI%.0mcJ%.0mcD01*G01*\r\n",
+							(delta_angle < 0) ? 2 : 3,
+							gerberX(PCB, arcStopX), gerberY(PCB, arcStopY),
+							gerberXOffset(PCB, cx - arcStartX), gerberYOffset(PCB, cy - arcStartY));
+	lastX = arcStopX;
+	lastY = arcStopY;
+}
+
+static void gerber_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	if (radius <= 0)
+		return;
+	if (is_drill)
+		radius = 50 * pcb_round(radius / 50.0);
+	use_gc(gc, radius);
+	if (!f)
+		return;
+	if (is_drill) {
+		if (n_pending_drills >= max_pending_drills) {
+			max_pending_drills += 100;
+			pending_drills = (PendingDrills *) realloc(pending_drills, max_pending_drills * sizeof(pending_drills[0]));
+		}
+		pending_drills[n_pending_drills].x = cx;
+		pending_drills[n_pending_drills].y = cy;
+		pending_drills[n_pending_drills].diam = radius * 2;
+		n_pending_drills++;
+		return;
+	}
+	else if (gc->drill && !flash_drills)
+		return;
+	if (cx != lastX) {
+		lastX = cx;
+		pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX));
+	}
+	if (cy != lastY) {
+		lastY = cy;
+		pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+	}
+	fprintf(f, "D03*\r\n");
+}
+
+static void gerber_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_bool m = pcb_false;
+	int i;
+	int firstTime = 1;
+	pcb_coord_t startX = 0, startY = 0;
+
+	if (is_mask && (gerber_drawing_mode != PCB_HID_COMP_POSITIVE) && (gerber_drawing_mode != PCB_HID_COMP_POSITIVE_XOR) && (gerber_drawing_mode != PCB_HID_COMP_NEGATIVE))
+		return;
+
+	use_gc(gc, 10 * 100);
+	if (!f)
+		return;
+	fprintf(f, "G36*\r\n");
+	for (i = 0; i < n_coords; i++) {
+		if (x[i]+dx != lastX) {
+			m = pcb_true;
+			lastX = x[i]+dx;
+			pcb_fprintf(f, "X%.0mc", gerberX(PCB, lastX));
+		}
+		if (y[i]+dy != lastY) {
+			m = pcb_true;
+			lastY = y[i]+dy;
+			pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+		}
+		if (firstTime) {
+			firstTime = 0;
+			startX = x[i]+dx;
+			startY = y[i]+dy;
+			if (m)
+				fprintf(f, "D02*");
+		}
+		else if (m)
+			fprintf(f, "D01*\r\n");
+		m = pcb_false;
+	}
+	if (startX != lastX) {
+		m = pcb_true;
+		lastX = startX;
+		pcb_fprintf(f, "X%.0mc", gerberX(PCB, startX));
+	}
+	if (startY != lastY) {
+		m = pcb_true;
+		lastY = startY;
+		pcb_fprintf(f, "Y%.0mc", gerberY(PCB, lastY));
+	}
+	if (m)
+		fprintf(f, "D01*\r\n");
+	fprintf(f, "G37*\r\n");
+}
+
+static void gerber_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	gerber_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void gerber_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_coord_t x[5];
+	pcb_coord_t y[5];
+	x[0] = x[4] = x1;
+	y[0] = y[4] = y1;
+	x[1] = x1;
+	y[1] = y2;
+	x[2] = x2;
+	y[2] = y2;
+	x[3] = x2;
+	y[3] = y1;
+	gerber_fill_polygon(gc, 5, x, y);
+}
+
+static void gerber_calibrate(double xval, double yval)
+{
+	CRASH("gerber_calibrate");
+}
+
+static int gerber_usage(const char *topic)
+{
+	fprintf(stderr, "\ngerber exporter command line arguments:\n\n");
+	pcb_hid_usage(gerber_options, sizeof(gerber_options) / sizeof(gerber_options[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x gerber [gerber options] foo.pcb\n\n");
+	return 0;
+}
+
+static void gerber_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+int pplg_check_ver_export_gerber(int ver_needed) { return 0; }
+
+void pplg_uninit_export_gerber(void)
+{
+	pcb_hid_remove_attributes_by_cookie(gerber_cookie);
+}
+
+int pplg_init_export_gerber(void)
+{
+	PCB_API_CHK_VER;
+	memset(&gerber_hid, 0, sizeof(gerber_hid));
+
+	pcb_hid_nogui_init(&gerber_hid);
+	pcb_dhlp_draw_helpers_init(&gerber_hid);
+
+	gerber_hid.struct_size = sizeof(gerber_hid);
+	gerber_hid.name = "gerber";
+	gerber_hid.description = "RS-274X (Gerber) export";
+	gerber_hid.exporter = 1;
+
+	gerber_hid.mask_invert = 1;
+
+	gerber_hid.get_export_options = gerber_get_export_options;
+	gerber_hid.do_export = gerber_do_export;
+	gerber_hid.parse_arguments = gerber_parse_arguments;
+	gerber_hid.set_layer_group = gerber_set_layer_group;
+	gerber_hid.make_gc = gerber_make_gc;
+	gerber_hid.destroy_gc = gerber_destroy_gc;
+	gerber_hid.set_drawing_mode = gerber_set_drawing_mode;
+	gerber_hid.set_color = gerber_set_color;
+	gerber_hid.set_line_cap = gerber_set_line_cap;
+	gerber_hid.set_line_width = gerber_set_line_width;
+	gerber_hid.set_draw_xor = gerber_set_draw_xor;
+	gerber_hid.draw_line = gerber_draw_line;
+	gerber_hid.draw_arc = gerber_draw_arc;
+	gerber_hid.draw_rect = gerber_draw_rect;
+	gerber_hid.fill_circle = gerber_fill_circle;
+	gerber_hid.fill_polygon = gerber_fill_polygon;
+	gerber_hid.fill_polygon_offs = gerber_fill_polygon_offs;
+	gerber_hid.fill_rect = gerber_fill_rect;
+	gerber_hid.calibrate = gerber_calibrate;
+	gerber_hid.set_crosshair = gerber_set_crosshair;
+	gerber_hid.usage = gerber_usage;
+
+	pcb_hid_register_hid(&gerber_hid);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_ipcd356/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_ipcd356/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ipcd356/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_ipcd356
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_ipcd356/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_ipcd356/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ipcd356/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_ipcd356}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_ipcd356/ipcd356.o @]
+
+switch /local/pcb/export_ipcd356/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_ipcd356/export_ipcd356.pup
===================================================================
--- tags/2.0.1/src_plugins/export_ipcd356/export_ipcd356.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ipcd356/export_ipcd356.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short IPC-D-356 Netlist pcb_exporter
+$long IPC-D-356 Netlist export.
+$state works
+$fmt-native no
+$fmt-feature-w export IPC-D-356 Netlist (for automated testing)
+$package export-extra
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- tags/2.0.1/src_plugins/export_ipcd356/ipcd356.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ipcd356/ipcd356.c	(revision 18980)
@@ -0,0 +1,488 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  ipc-d-356 export plugin
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+
+#include "board.h"
+#include "data.h"
+#include "safe_fs.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "netlist.h"
+#include "math_helper.h"
+#include "layer.h"
+#include "obj_arc.h"
+#include "obj_line.h"
+#include "obj_poly.h"
+#include "obj_subc.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_cam.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "plugins.h"
+
+static const char *ipcd356_cookie = "ipcd356 exporter";
+
+/*** low level export code ***/
+typedef struct {
+	pcb_board_t *pcb;
+	FILE *f;
+	int is_mil;
+} write_ctx_t;
+
+typedef struct {
+	pcb_any_obj_t *o;
+	const char *netname, *refdes, *term;
+	int is_plated, access_top, access_bottom, rot, masked_top, masked_bottom;
+	pcb_coord_t hole, width, height, cx, cy;
+} test_feature_t;
+
+static int getattr(pcb_any_obj_t *o, const char *key)
+{
+	char *val = pcb_attribute_get(&o->Attributes, key);
+	if (val == NULL) return 0;
+	if (pcb_strcasecmp(val, "yes") == 0) return 1;
+	return 0;
+}
+
+static void fill_field(char *dst, int start, int end, const char *data, const char *name)
+{
+	int n;
+	const char *d = data;
+
+	if (data == NULL)
+		d = "";
+
+	for(n = start; n <= end; n++) {
+		if (*d != '\0')
+			dst[n] = *d++;
+		else
+			dst[n] = ' ';
+	}
+	if (*d != '\0')
+		pcb_message(PCB_MSG_WARNING, "Data '%s' is too long for a(n) %s, truncated\n", data, name);
+}
+
+static void fill_field_coord(write_ctx_t *ctx, char *dst, int start, int end, pcb_coord_t crd, int sign, const char *name)
+{
+	int len = end-start+1;
+	char tmp[32], fmt[16];
+	if (sign) {
+		dst[start] =  (crd >= 0) ? '+' : '-';
+		start++;
+		len--;
+	}
+	if (ctx->is_mil) {
+		sprintf(fmt, "%%0%d.0ml", len);
+		crd *= 10;
+	}
+	else {
+		sprintf(fmt, "%%0%d.0mm", len);
+		crd *= 1000;
+	}
+	pcb_snprintf(tmp, sizeof(tmp), fmt, crd);
+	fill_field(dst, start, end, tmp, name);
+}
+
+static void ipcd356_write_head(write_ctx_t *ctx)
+{
+	char utc[64];
+
+	pcb_print_utc(utc, sizeof(utc), 0);
+
+	fprintf(ctx->f, "C  IPC-D-356 Netlist generated by pcb-rnd " PCB_VERSION "\n");
+	fprintf(ctx->f, "C  \n");
+	fprintf(ctx->f, "C  File created on %s\n", utc);
+	fprintf(ctx->f, "C  \n");
+	fprintf(ctx->f, "P  JOB   %s\n", (PCB->Name == NULL) ? PCB->Filename : PCB->Name);
+	fprintf(ctx->f, "P  CODE  00\n");
+	fprintf(ctx->f, "P  UNITS CUST %d\n", ctx->is_mil ? 0 : 1);
+	fprintf(ctx->f, "P  DIM   N\n");
+	fprintf(ctx->f, "P  VER   IPC-D-356\n");
+	fprintf(ctx->f, "P  IMAGE PRIMARY\n");
+	fprintf(ctx->f, "C  \n");
+}
+
+static void ipcd356_write_foot(write_ctx_t *ctx)
+{
+	fprintf(ctx->f, "999\n\n");
+}
+
+static void ipcd356_write_feature(write_ctx_t *ctx, test_feature_t *t)
+{
+	char line[128];
+	int is_tooling, is_mid;
+
+	is_tooling = getattr(t->o, "ipcd356::tooling");
+	is_mid = getattr(t->o, "ipcd356::mid");
+
+	line[0] = '3';
+	if (is_tooling)
+		line[1] = '4';
+	else if (t->hole > 0)
+		line[1] = '1';
+	else
+		line[1] = '2';
+	line[2] = '7';
+
+	fill_field(line, 3, 16, t->netname, "netname");
+	fill_field(line, 17, 19, NULL, NULL);
+	fill_field(line, 20, 25, t->refdes, "refdes");
+	line[26] = '-';
+	fill_field(line, 27, 30, t->term, "term ID");
+	line[31] = is_mid ? 'M' : ' ';
+
+	if (t->hole > 0) {
+		line[32] = 'D';
+		fill_field_coord(ctx, line, 33, 36, t->hole, 0, "hole");
+	}
+	else
+		fill_field(line, 32, 36, NULL, NULL);
+
+	if (t->hole > 0)
+		line[37] = t->is_plated ? 'P' : 'U';
+	else
+		line[37] = ' ';
+
+	if ((t->access_top) && (t->access_bottom))
+		strcpy(line+38, "A00");
+	else if (t->access_top)
+		strcpy(line+38, "A01");
+	else if (t->access_bottom)
+		strcpy(line+38, "A02");
+	else
+		return; /* do not export something that's not accessible from top or bottom */
+
+	line[41] = 'X';
+	fill_field_coord(ctx, line, 42, 48, t->cx, 1, "X coord");
+	line[49] = 'Y';
+	fill_field_coord(ctx, line, 50, 56, PCB->MaxHeight - t->cy, 1, "Y coord");
+
+	line[57] = 'X';
+	fill_field_coord(ctx, line, 58, 61, t->width, 0, "width");
+	line[62] = 'Y';
+	fill_field_coord(ctx, line, 63, 66, t->height, 0, "height");
+	line[67] = 'R';
+	fill_field_coord(ctx, line, 68, 70, t->rot, 0, "rotation");
+
+	line[71] = ' ';
+	if ((t->masked_top) && (t->masked_bottom))
+		strcpy(line+72, "S3");
+	else if (t->masked_top)
+		strcpy(line+72, "S1");
+	else if (t->masked_bottom)
+		strcpy(line+72, "S2");
+	else
+		strcpy(line+72, "S0");
+	fill_field(line, 74, 79, NULL, NULL);
+
+	line[80] = '\n';
+	line[81] = '\0';
+	fprintf(ctx->f, "%s", line);
+}
+
+/* light terminals */
+static void ipcd356_pstk_shape(test_feature_t *t, pcb_pstk_shape_t *sh)
+{
+	int n;
+	pcb_coord_t x1, y1, x2, y2;
+	switch(sh->shape) {
+		case PCB_PSSH_CIRC:
+			t->width = sh->data.circ.dia;
+			t->height = 0;
+			t->cx += sh->data.circ.x;
+			t->cy += sh->data.circ.y;
+			break;
+		case PCB_PSSH_LINE:
+			t->height = t->width = sh->data.line.thickness;
+			t->cx += (sh->data.line.x1 + sh->data.line.x2)/2;
+			t->cy += (sh->data.line.y1 + sh->data.line.y2)/2;
+			break;
+		case PCB_PSSH_POLY:
+			t->height = t->width = sh->data.line.thickness;
+			x1 = x2 = sh->data.poly.x[0];
+			y1 = y2 = sh->data.poly.y[0];
+			for(n = 1; n < sh->data.poly.len; n++) {
+				if (sh->data.poly.x[n] < x1) x1 = sh->data.poly.x[n];
+				if (sh->data.poly.x[n] > x2) x2 = sh->data.poly.x[n];
+				if (sh->data.poly.y[n] < y1) y1 = sh->data.poly.y[n];
+				if (sh->data.poly.y[n] > y2) y2 = sh->data.poly.y[n];
+			}
+
+			t->cx += (x1 + x2)/2;
+			t->cy += (y1 + y2)/2;
+			if (pcb_pline_is_rectangle(sh->data.poly.pa->contours)) {
+				t->width = (x2 - x1);
+				t->height = (y2 - y1);
+			}
+			else {
+				t->width = (x2 - x1) / 4 + 1;
+				t->height = (y2 - y1) / 4 + 1;
+			}
+			break;
+	}
+}
+
+static void ipcd356_write_pstk(write_ctx_t *ctx, pcb_subc_t *subc, pcb_pstk_t *pstk)
+{
+	test_feature_t t;
+	pcb_pstk_proto_t *proto;
+	pcb_pstk_shape_t *st, *sb;
+	pcb_pstk_tshape_t *tshp;
+	pcb_lib_menu_t *mn;
+
+	if (pstk->term == NULL)
+		return;
+
+	proto = pcb_pstk_get_proto(pstk);
+	if (proto == NULL)
+		return;
+
+	mn = pcb_netlist_find_net4term(ctx->pcb, (pcb_any_obj_t *)pstk);
+
+	t.o = (pcb_any_obj_t *)pstk;
+	t.netname = (mn == NULL) ? "N/C" : pcb_netlist_name(mn);
+	t.refdes = subc->refdes;
+	t.term = pstk->term;
+	t.is_plated = proto->hplated;
+	t.access_top = ((st = pcb_pstk_shape(pstk, PCB_LYT_TOP | PCB_LYT_COPPER, 0)) != NULL);
+	t.access_bottom = ((sb = pcb_pstk_shape(pstk, PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0)) != NULL);
+	/* this assumes the mask shape will expose all copper */
+	t.masked_top = (pcb_pstk_shape(pstk, PCB_LYT_TOP | PCB_LYT_MASK, 0) == NULL);
+	t.masked_bottom = (pcb_pstk_shape(pstk, PCB_LYT_BOTTOM | PCB_LYT_MASK, 0) == NULL);
+	t.hole = proto->hdia;
+	t.cx = pstk->x;
+	t.cy = pstk->y;
+
+	/* this assumes bottom shape is not smaller than top shape */
+	if (st != NULL) ipcd356_pstk_shape(&t, st);
+	else if (sb != NULL) ipcd356_pstk_shape(&t, sb);
+
+	tshp = pcb_pstk_get_tshape(pstk);
+	t.rot = tshp->rot;
+
+	ipcd356_write_feature(ctx, &t);
+}
+
+/* heavy terminals: lines, arcs, polygons */
+static int ipcd356_heavy(write_ctx_t *ctx, test_feature_t *t, pcb_subc_t *subc, pcb_layer_t *layer, pcb_any_obj_t *o)
+{
+	pcb_layer_type_t flg;
+	pcb_lib_menu_t *mn;
+
+	if (o->term == NULL)
+		return -1;
+	flg = pcb_layer_flags_(layer);
+	if (!(flg & PCB_LYT_COPPER))
+		return -1;
+
+	mn = pcb_netlist_find_net4term(ctx->pcb, o);
+
+	memset(&t, 0, sizeof(t));
+	t->o = o;
+	t->netname = (mn == NULL) ? "N/C" : pcb_netlist_name(mn);
+	t->refdes = subc->refdes;
+	t->term = o->term;
+	t->access_top = (flg & PCB_LYT_TOP);
+	t->access_bottom = (flg & PCB_LYT_BOTTOM);
+	return 0;
+}
+
+static void ipcd356_write_line(write_ctx_t *ctx, pcb_subc_t *subc, pcb_layer_t *layer, pcb_line_t *line)
+{
+	test_feature_t t;
+
+	if (ipcd356_heavy(ctx, &t, subc, layer, (pcb_any_obj_t *)line) != 0)
+		return;
+
+	t.cx = (line->Point1.X + line->Point2.X) / 2;
+	t.cy = (line->Point1.Y + line->Point2.Y) / 2;
+	t.width = t.height = line->Thickness;
+	t.rot = atan2(line->Point2.Y - line->Point1.Y, line->Point2.X - line->Point1.X) * PCB_RAD_TO_DEG;
+	ipcd356_write_feature(ctx, &t);
+}
+
+static void ipcd356_write_arc(write_ctx_t *ctx, pcb_subc_t *subc, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	test_feature_t t;
+
+	if (ipcd356_heavy(ctx, &t, subc, layer, (pcb_any_obj_t *)arc) != 0)
+		return;
+
+	pcb_arc_middle(arc, &t.cx, &t.cy);
+	t.width = t.height = arc->Thickness;
+	t.rot = arc->StartAngle + (arc->Delta / 2);
+	ipcd356_write_feature(ctx, &t);
+}
+
+static void ipcd356_write_poly(write_ctx_t *ctx, pcb_subc_t *subc, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	test_feature_t t;
+
+	if (ipcd356_heavy(ctx, &t, subc, layer, (pcb_any_obj_t *)poly) != 0)
+		return;
+
+	t.cx = (poly->BoundingBox.X1 + poly->BoundingBox.X2) / 2;
+	t.cy = (poly->BoundingBox.Y1 + poly->BoundingBox.Y2) / 2;
+	t.width = (poly->BoundingBox.X2 - poly->BoundingBox.X1) / 8 + 1;
+	t.height = (poly->BoundingBox.Y2 - poly->BoundingBox.Y1) / 8 + 1;
+	t.rot = 0;
+	ipcd356_write_feature(ctx, &t);
+}
+
+static void ipcd356_write(pcb_board_t *pcb, FILE *f)
+{
+	write_ctx_t ctx;
+
+	ctx.pcb = pcb;
+	ctx.f = f;
+	ctx.is_mil = (strcmp(conf_core.editor.grid_unit->suffix, "mil") == 0);
+
+	ipcd356_write_head(&ctx);
+	PCB_SUBC_LOOP(pcb->Data); {
+#warning subc TODO: subc-in-subc
+		PCB_PADSTACK_LOOP(subc->data); {
+			ipcd356_write_pstk(&ctx, subc, padstack);
+		} PCB_END_LOOP;
+		PCB_LINE_ALL_LOOP(subc->data); {
+			ipcd356_write_line(&ctx, subc, layer, line);
+		} PCB_ENDALL_LOOP;
+		PCB_ARC_ALL_LOOP(subc->data); {
+			ipcd356_write_arc(&ctx, subc, layer, arc);
+		} PCB_ENDALL_LOOP;
+		PCB_POLY_ALL_LOOP(subc->data); {
+			ipcd356_write_poly(&ctx, subc, layer, polygon);
+		} PCB_ENDALL_LOOP;
+	} PCB_END_LOOP;
+	ipcd356_write_foot(&ctx);
+}
+
+/*** export hid administration and API/glu ***/
+
+static pcb_hid_attribute_t ipcd356_options[] = {
+/* %start-doc options "8 IPC-D-356 Netlist Export"
+@ftable @code
+@item --netlist-file <string>
+Name of the IPC-D-356 Netlist output file.
+@end ftable
+%end-doc
+*/
+	{
+	 "netlistfile",
+	 "Name of the IPC-D-356 Netlist output file",
+	 PCB_HATT_STRING,
+	 0, 0, {0, 0, 0}, 0, 0},
+#define HA_ipcd356_filename 0
+};
+
+#define NUM_OPTIONS (sizeof(ipcd356_options)/sizeof(ipcd356_options[0]))
+
+static pcb_hid_attr_val_t ipcd356_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *ipcd356_get_export_options(int *n)
+{
+	static char *last_fn = NULL;
+
+	if (PCB != NULL)
+		pcb_derive_default_filename(PCB->Filename, &ipcd356_options[HA_ipcd356_filename], ".net", &last_fn);
+
+	if (n != NULL)
+		*n = NUM_OPTIONS;
+
+	return ipcd356_options;
+}
+
+static int ipcd356_parse_arguments(int *argc, char ***argv)
+{
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static void ipcd356_do_export(pcb_hid_attr_val_t *options)
+{
+	int n;
+	const char *fn;
+	FILE *f;
+
+	if (!options) {
+		ipcd356_get_export_options(0);
+
+		for (n = 0; n < NUM_OPTIONS; n++)
+			ipcd356_values[n] = ipcd356_options[n].default_val;
+
+		options = ipcd356_values;
+	}
+
+	fn = options[HA_ipcd356_filename].str_value;
+	if (fn == NULL)
+		fn = "pcb-rnd-out.net";
+
+	f = pcb_fopen(fn, "w");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open %s for write\n", fn);
+		return;
+	}
+	ipcd356_write(PCB, f);
+	fclose(f);
+}
+
+static pcb_hid_t ipcd356_hid;
+
+int pplg_check_ver_export_ipcd356(int ver_needed) { return 0; }
+
+void pplg_uninit_export_ipcd356(void)
+{
+	pcb_hid_remove_attributes_by_cookie(ipcd356_cookie);
+}
+
+int pplg_init_export_ipcd356(void)
+{
+	PCB_API_CHK_VER;
+	memset(&ipcd356_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&ipcd356_hid);
+
+	ipcd356_hid.struct_size = sizeof(pcb_hid_t);
+	ipcd356_hid.name = "IPC-D-356";
+	ipcd356_hid.description = "Exports to IPC-D-356 netlist";
+	ipcd356_hid.exporter = 1;
+
+	ipcd356_hid.get_export_options = ipcd356_get_export_options;
+	ipcd356_hid.do_export = ipcd356_do_export;
+	ipcd356_hid.parse_arguments = ipcd356_parse_arguments;
+
+	pcb_hid_register_hid(&ipcd356_hid);
+
+	pcb_hid_register_attributes(ipcd356_options, sizeof(ipcd356_options) / sizeof(ipcd356_options[0]), ipcd356_cookie, 0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_lpr/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_lpr/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_lpr/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_lpr
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_lpr/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_lpr/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_lpr/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_lpr}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_lpr/lpr.o @]
+
+switch /local/pcb/export_lpr/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_lpr/export_lpr.pup
===================================================================
--- tags/2.0.1/src_plugins/export_lpr/export_lpr.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_lpr/export_lpr.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short lpr pcb_exporter (printer)
+$long Export to lpr (using export_ps to generate postscript)
+$state works
+$fmt-native no
+$fmt-feature-w use export_ps and lpr to print a board directly
+$package export-extra
+default buildin
+dep export_ps
+autoload 1
Index: tags/2.0.1/src_plugins/export_lpr/lpr.c
===================================================================
--- tags/2.0.1/src_plugins/export_lpr/lpr.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_lpr/lpr.c	(revision 18980)
@@ -0,0 +1,148 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "data.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "../export_ps/ps.h"
+#include "hid_nogui.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "actions.h"
+
+const char *lpr_cookie = "lpr HID";
+
+static pcb_hid_attribute_t base_lpr_options[] = {
+
+/* %start-doc options "98 lpr Printing Options"
+@ftable @code
+@item --lprcommand <string>
+Command to use for printing. Defaults to @code{lpr}. This can be used to produce
+PDF output with a virtual PDF printer. Example: @*
+@code{--lprcommand "lp -d CUPS-PDF-Printer"}.
+@end ftable
+@noindent In addition, all @ref{Postscript Export} options are valid.
+%end-doc
+*/
+	{"lprcommand", "Command to use for printing",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_lprcommand 0
+};
+
+#define NUM_OPTIONS (sizeof(lpr_options)/sizeof(lpr_options[0]))
+
+static pcb_hid_attribute_t *lpr_options = 0;
+static int num_lpr_options = 0;
+static pcb_hid_attr_val_t *lpr_values;
+
+static pcb_hid_attribute_t *lpr_get_export_options(int *n)
+{
+	/*
+	 * We initialize the default value in this manner because the GUI
+	 * HID's may want to free() this string value and replace it with a
+	 * new one based on how a user fills out a print dialog.
+	 */
+	if (base_lpr_options[HA_lprcommand].default_val.str_value == NULL) {
+		base_lpr_options[HA_lprcommand].default_val.str_value = pcb_strdup("lpr");
+	}
+
+	if (lpr_options == 0) {
+		pcb_hid_attribute_t *ps_opts = ps_hid.get_export_options(&num_lpr_options);
+		lpr_options = (pcb_hid_attribute_t *) calloc(num_lpr_options, sizeof(pcb_hid_attribute_t));
+		memcpy(lpr_options, ps_opts, num_lpr_options * sizeof(pcb_hid_attribute_t));
+		memcpy(lpr_options, base_lpr_options, sizeof(base_lpr_options));
+		lpr_values = (pcb_hid_attr_val_t *) calloc(num_lpr_options, sizeof(pcb_hid_attr_val_t));
+	}
+	if (n)
+		*n = num_lpr_options;
+	return lpr_options;
+}
+
+static void lpr_do_export(pcb_hid_attr_val_t * options)
+{
+	FILE *f;
+	int i;
+	const char *filename;
+
+	if (!options) {
+		lpr_get_export_options(0);
+		for (i = 0; i < num_lpr_options; i++)
+			lpr_values[i] = lpr_options[i].default_val;
+		options = lpr_values;
+	}
+
+	filename = options[HA_lprcommand].str_value;
+
+	printf("LPR: open %s\n", filename);
+	f = pcb_popen(filename, "w");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	ps_hid_export_to_file(f, options);
+
+	pcb_pclose(f);
+}
+
+static int lpr_parse_arguments(int *argc, char ***argv)
+{
+	lpr_get_export_options(0);
+	pcb_hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static void lpr_calibrate(double xval, double yval)
+{
+	ps_calibrate_1(xval, yval, 1);
+}
+
+static pcb_hid_t lpr_hid;
+
+static int lpr_usage(const char *topic)
+{
+	fprintf(stderr, "\nlpr exporter command line arguments:\n\n");
+	pcb_hid_usage(base_lpr_options, sizeof(base_lpr_options) / sizeof(base_lpr_options[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x lpr [lpr options] foo.pcb\n\n");
+	return 0;
+}
+
+int pplg_check_ver_export_lpr(int ver_needed) { return 0; }
+
+void pplg_uninit_export_lpr(void)
+{
+	pcb_remove_actions_by_cookie(lpr_cookie);
+}
+
+int pplg_init_export_lpr(void)
+{
+	PCB_API_CHK_VER;
+	memset(&lpr_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&lpr_hid);
+	ps_ps_init(&lpr_hid);
+
+	lpr_hid.struct_size = sizeof(pcb_hid_t);
+	lpr_hid.name = "lpr";
+	lpr_hid.description = "Postscript print";
+	lpr_hid.printer = 1;
+
+	lpr_hid.get_export_options = lpr_get_export_options;
+	lpr_hid.do_export = lpr_do_export;
+	lpr_hid.parse_arguments = lpr_parse_arguments;
+	lpr_hid.calibrate = lpr_calibrate;
+
+	lpr_hid.usage = lpr_usage;
+
+	pcb_hid_register_hid(&lpr_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_nelma/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_nelma/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_nelma/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_nelma
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_nelma/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_nelma/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_nelma/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,16 @@
+put /local/pcb/mod {export_nelma}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_nelma/nelma.o @]
+
+switch /local/pcb/export_nelma/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/LDFLAGS         libs/gui/gd/ldflags
+		put /local/pcb/mod/CFLAGS          libs/gui/gd/cflags
+		end
+end
+
+switch /local/pcb/export_nelma/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_nelma/export_nelma.pup
===================================================================
--- tags/2.0.1/src_plugins/export_nelma/export_nelma.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_nelma/export_nelma.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short nelma pcb_exporter
+$long Export to nelma (Numerical capacitance calculator) - the 3rd party software, Nelma is not maintained any more.
+$state deprecated
+$fmt-native no
+$fmt-feature-w export a board in the nelma format for Numerical capacitance calculation
+#$package export-sim
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/export_nelma/nelma.c
===================================================================
--- tags/2.0.1/src_plugins/export_nelma/nelma.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_nelma/nelma.c	(revision 18980)
@@ -0,0 +1,1017 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  NELMA (Numerical capacitance calculator) export HID
+ *  Copyright (C) 2006 Tomaz Solc (tomaz.solc@tablix.org)
+ *
+ *  PNG export code is based on the PNG export HID
+ *  Copyright (C) 2006 Dan McMahill
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+ * This HID exports a PCB layout into: o One layer mask file (PNG format) per
+ * copper layer. o Nelma configuration file that contains netlist and pin
+ * information.
+ */
+
+/*
+ * FIXME:
+ *
+ * If you have a section of a net that does not contain any pins then that
+ * section will be missing from the Nelma's copper geometry.
+ *
+ * For example:
+ *
+ * this section will be ignored by Nelma |       |
+ *
+ * ||             ||=======||            ||     component layer ||
+ * ||       ||            || ||=============||       ||============||
+ * solder layer
+ *
+ * pin1           via      via           pin2
+ *
+ * Single layer layouts are always exported correctly.
+ *
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <time.h>
+
+#include "board.h"
+#include "error.h"
+#include "data.h"
+#include "layer.h"
+#include "rats.h"
+#include "plugins.h"
+#include "hid_cam.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include <gd.h>
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_flags.h"
+#include "hid_color.h"
+
+const char *nelma_cookie = "nelma HID";
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented PNG function %s.\n", func); abort()
+
+/* Needed for PNG export */
+
+struct color_struct {
+	/* the descriptor used by the gd library */
+	int c;
+
+	/* so I can figure out what rgb value c refers to */
+	unsigned int r, g, b;
+};
+
+struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	pcb_coord_t width;
+	unsigned char r, g, b;
+	int erase;
+	int faded;
+	struct color_struct *color;
+	gdImagePtr brush;
+};
+
+static pcb_hid_t nelma_hid;
+
+static struct color_struct *black = NULL, *white = NULL;
+static pcb_coord_t linewidth = -1;
+static gdImagePtr lastbrush = (gdImagePtr) ((void *) -1);
+static int lastcolor = -1;
+
+/* gd image and file for PNG export */
+static gdImagePtr nelma_im = NULL;
+static FILE *nelma_f = NULL;
+
+static int is_mask;
+static int is_drill;
+
+/*
+ * Which groups of layers to export into PNG layer masks. 1 means export, 0
+ * means do not export.
+ */
+static int nelma_export_group[PCB_MAX_LAYERGRP];
+
+/* Group that is currently exported. */
+static int nelma_cur_group;
+
+/* Filename prefix that will be used when saving files. */
+static const char *nelma_basename = NULL;
+
+/* Horizontal DPI (grid points per inch) */
+static int nelma_dpi = -1;
+
+/* Height of the copper layers in micrometers. */
+
+/*
+ * The height of the copper layer is currently taken as the vertical grid
+ * step, since this is the smallest vertical feature in the layout.
+ */
+static int nelma_copperh = -1;
+/* Height of the substrate layers in micrometers. */
+static int nelma_substrateh = -1;
+/* Relative permittivity of the substrate. */
+static double nelma_substratee = -1;
+
+/* Permittivity of empty space (As/Vm) */
+static const double nelma_air_epsilon = 8.85e-12;
+
+pcb_hid_attribute_t nelma_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "nelma Options"
+@ftable @code
+@item -- basename <string>
+File name prefix.
+@end ftable
+%end-doc
+*/
+	{"basename", "File name prefix",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_basename 0
+
+/* %start-doc options "nelma Options"
+@ftable @code
+@item --dpi <num>
+Horizontal scale factor (grid points/inch).
+@end ftable
+%end-doc
+*/
+	{"dpi", "Horizontal scale factor (grid points/inch)",
+	 PCB_HATT_INTEGER, 0, 1000, {100, 0, 0}, 0, 0},
+#define HA_dpi 1
+
+/* %start-doc options "nelma Options"
+@ftable @code
+@item --copper-height <num>
+Copper layer height (um).
+@end ftable
+%end-doc
+*/
+	{"copper-height", "Copper layer height (um)",
+	 PCB_HATT_INTEGER, 0, 200, {100, 0, 0}, 0, 0},
+#define HA_copperh 2
+
+/* %start-doc options "nelma Options"
+@ftable @code
+@item --substrate-height <num>
+Substrate layer height (um).
+@end ftable
+%end-doc
+*/
+	{"substrate-height", "Substrate layer height (um)",
+	 PCB_HATT_INTEGER, 0, 10000, {2000, 0, 0}, 0, 0},
+#define HA_substrateh 3
+
+/* %start-doc options "nelma Options"
+@ftable @code
+@item --substrate-epsilon <num>
+Substrate relative epsilon.
+@end ftable
+%end-doc
+*/
+	{"substrate-epsilon", "Substrate relative epsilon",
+	 PCB_HATT_REAL, 0, 100, {0, 0, 4.0}, 0, 0},
+#define HA_substratee 4
+};
+
+#define NUM_OPTIONS (sizeof(nelma_attribute_list)/sizeof(nelma_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(nelma_attribute_list, nelma_cookie)
+		 static pcb_hid_attr_val_t nelma_values[NUM_OPTIONS];
+
+/* *** Utility funcions **************************************************** */
+
+/* convert from default PCB units to nelma units */
+		 static int pcb_to_nelma(pcb_coord_t pcb)
+{
+	return PCB_COORD_TO_INCH(pcb) * nelma_dpi;
+}
+
+static char *nelma_get_png_name(const char *basename, const char *suffix)
+{
+	char *buf;
+	int len;
+
+	len = strlen(basename) + strlen(suffix) + 6;
+	buf = (char *) malloc(sizeof(*buf) * len);
+
+	sprintf(buf, "%s.%s.png", basename, suffix);
+
+	return buf;
+}
+
+/* *** Exporting netlist data and geometry to the nelma config file ******** */
+
+static void nelma_write_space(FILE * out)
+{
+	double xh, zh;
+	int z, i;
+
+	xh = 2.54e-2 / ((double) nelma_dpi);
+	zh = nelma_copperh * 1e-6;
+
+	fprintf(out, "\n/* **** Space **** */\n\n");
+
+	fprintf(out, "space pcb {\n");
+	fprintf(out, "\tstep = { %e, %e, %e }\n", xh, xh, zh);
+	fprintf(out, "\tlayers = {\n");
+
+	fprintf(out, "\t\t\"air-top\",\n");
+	fprintf(out, "\t\t\"air-bottom\"");
+
+	z = 10;
+	for (i = 0; i < PCB_MAX_LAYERGRP; i++)
+		if (nelma_export_group[i]) {
+			char tmp_ln[PCB_PATH_MAX];
+			const char *ext = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+
+			if (z != 10) {
+				fprintf(out, ",\n");
+				fprintf(out, "\t\t\"substrate-%d\"", z);
+				z++;
+			}
+			fprintf(out, ",\n");
+			fprintf(out, "\t\t\"%s\"", ext);
+			z++;
+		}
+	fprintf(out, "\n\t}\n");
+	fprintf(out, "}\n");
+}
+
+
+static void nelma_write_material(FILE * out, const char *name, const char *type, double e)
+{
+	fprintf(out, "material %s {\n", name);
+	fprintf(out, "\ttype = \"%s\"\n", type);
+	fprintf(out, "\tpermittivity = %e\n", e);
+	fprintf(out, "\tconductivity = 0.0\n");
+	fprintf(out, "\tpermeability = 0.0\n");
+	fprintf(out, "}\n");
+}
+
+static void nelma_write_materials(FILE * out)
+{
+	fprintf(out, "\n/* **** Materials **** */\n\n");
+
+	nelma_write_material(out, "copper", "metal", nelma_air_epsilon);
+	nelma_write_material(out, "air", "dielectric", nelma_air_epsilon);
+	nelma_write_material(out, "composite", "dielectric", nelma_air_epsilon * nelma_substratee);
+}
+
+static void nelma_write_nets(FILE * out)
+{
+	pcb_lib_t netlist;
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *pin;
+
+	int n, m, i;
+
+	netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
+
+	fprintf(out, "\n/* **** Nets **** */\n\n");
+
+	for (n = 0; n < netlist.MenuN; n++) {
+		net = &netlist.Menu[n];
+
+		/* Weird, but correct */
+		fprintf(out, "net %s {\n", &net->Name[2]);
+
+		fprintf(out, "\tobjects = {\n");
+
+		for (m = 0; m < net->EntryN; m++) {
+			pin = &net->Entry[m];
+
+			/* pcb_pin_name_to_xy(pin, &x, &y); */
+
+			for (i = 0; i < PCB_MAX_LAYERGRP; i++)
+				if (nelma_export_group[i]) {
+					char tmp_ln[PCB_PATH_MAX];
+					const char *ext = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+
+					if (m != 0 || i != 0)
+						fprintf(out, ",\n");
+					fprintf(out, "\t\t\"%s-%s\"", pin->ListEntry, ext);
+				}
+		}
+
+		fprintf(out, "\n");
+		fprintf(out, "\t}\n");
+		fprintf(out, "}\n");
+	}
+}
+
+static void nelma_write_layer(FILE * out, int z, int h, const char *name, int full, const char *mat)
+{
+	pcb_lib_t netlist;
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *pin;
+
+	int n, m;
+
+	fprintf(out, "layer %s {\n", name);
+	fprintf(out, "\theight = %d\n", h);
+	fprintf(out, "\tz-order = %d\n", z);
+	fprintf(out, "\tmaterial = \"%s\"\n", mat);
+
+	if (full) {
+		fprintf(out, "\tobjects = {\n");
+		netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
+
+		for (n = 0; n < netlist.MenuN; n++) {
+			net = &netlist.Menu[n];
+
+			for (m = 0; m < net->EntryN; m++) {
+				pin = &net->Entry[m];
+
+				if (m != 0 || n != 0)
+					fprintf(out, ",\n");
+				fprintf(out, "\t\t\"%s-%s\"", pin->ListEntry, name);
+			}
+
+		}
+		fprintf(out, "\n\t}\n");
+	}
+	fprintf(out, "}\n");
+}
+
+static void nelma_write_layers(FILE * out)
+{
+	int i, subh, z;
+	char buf[100];
+
+	subh = nelma_substrateh / nelma_copperh;
+
+	fprintf(out, "\n/* **** Layers **** */\n\n");
+
+	/* Air layers on top and bottom of the stack */
+	/* Their height is double substrate height. */
+	nelma_write_layer(out, 1, 2 * subh, "air-top", 0, "air");
+	nelma_write_layer(out, 1000, 2 * subh, "air-bottom", 0, "air");
+
+	z = 10;
+	for (i = 0; i < PCB_MAX_LAYERGRP; i++)
+		if (nelma_export_group[i]) {
+			char tmp_ln[PCB_PATH_MAX];
+			const char *ext = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+
+			if (z != 10) {
+				sprintf(buf, "substrate-%d", z);
+				nelma_write_layer(out, z, subh, buf, 0, "composite");
+				z++;
+			}
+			/*
+			 * FIXME: for layers that are not on top or bottom,
+			 * the material should be "composite"
+			 */
+			nelma_write_layer(out, z, 1, ext, 1, "air");
+
+			z++;
+		}
+}
+
+static void nelma_write_object(FILE * out, pcb_lib_entry_t *pin)
+{
+	pcb_coord_t px = 0, py = 0;
+	int x, y, i;
+	char *f;
+
+	pcb_pin_name_to_xy(pin, &px, &py);
+
+	x = pcb_to_nelma(px);
+	y = pcb_to_nelma(py);
+
+	for (i = 0; i < PCB_MAX_LAYERGRP; i++)
+		if (nelma_export_group[i]) {
+			char tmp_ln[PCB_PATH_MAX];
+			const char *ext = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+
+			fprintf(out, "object %s-%s {\n", pin->ListEntry, ext);
+			fprintf(out, "\tposition = { 0, 0 }\n");
+			fprintf(out, "\tmaterial = \"copper\"\n");
+			fprintf(out, "\ttype = \"image\"\n");
+			fprintf(out, "\trole = \"net\"\n");
+
+			f = nelma_get_png_name(nelma_basename, ext);
+
+			fprintf(out, "\tfile = \"%s\"\n", f);
+
+			free(f);
+
+			fprintf(out, "\tfile-pos = { %d, %d }\n", x, y);
+			fprintf(out, "}\n");
+		}
+}
+
+static void nelma_write_objects(FILE * out)
+{
+	pcb_lib_t netlist;
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *pin;
+
+	int n, m;
+
+	netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
+
+	fprintf(out, "\n/* **** Objects **** */\n\n");
+
+	for (n = 0; n < netlist.MenuN; n++) {
+		net = &netlist.Menu[n];
+
+		for (m = 0; m < net->EntryN; m++) {
+			pin = &net->Entry[m];
+
+			nelma_write_object(out, pin);
+		}
+	}
+}
+
+/* *** Main export callback ************************************************ */
+
+static int nelma_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0]), nelma_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static pcb_hid_attribute_t *nelma_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+
+	if (PCB) {
+		pcb_derive_default_filename(PCB->Filename, &nelma_attribute_list[HA_basename], ".nelma", &last_made_filename);
+	}
+	if (n) {
+		*n = NUM_OPTIONS;
+	}
+	return nelma_attribute_list;
+}
+
+/* Populates nelma_export_group array */
+void nelma_choose_groups()
+{
+	int n, m;
+	pcb_layer_t *layer;
+
+	/* Set entire array to 0 (don't export any layer groups by default */
+	memset(nelma_export_group, 0, sizeof(nelma_export_group));
+
+	for (n = 0; n < pcb_max_layer; n++) {
+		unsigned int flags = pcb_layer_flags(PCB, n);
+		if (flags & PCB_LYT_SILK)
+			continue;
+		layer = &PCB->Data->Layer[n];
+
+		if (!pcb_layer_is_empty_(PCB, layer)) {
+			/* layer isn't empty */
+			if ((flags & PCB_LYT_COPPER) || (flags & PCB_LYT_OUTLINE)) {
+				/* layer is a copper layer */
+				m = pcb_layer_get_group(PCB, n);
+
+				/* the export layer */
+				nelma_export_group[m] = 1;
+			}
+		}
+	}
+}
+
+static void nelma_alloc_colors()
+{
+	/*
+	 * Allocate white and black -- the first color allocated becomes the
+	 * background color
+	 */
+
+	white = (struct color_struct *) malloc(sizeof(*white));
+	white->r = white->g = white->b = 255;
+	white->c = gdImageColorAllocate(nelma_im, white->r, white->g, white->b);
+
+	black = (struct color_struct *) malloc(sizeof(*black));
+	black->r = black->g = black->b = 0;
+	black->c = gdImageColorAllocate(nelma_im, black->r, black->g, black->b);
+}
+
+static void nelma_start_png(const char *basename, const char *suffix)
+{
+	int h, w;
+	char *buf;
+
+	buf = nelma_get_png_name(basename, suffix);
+
+	h = pcb_to_nelma(PCB->MaxHeight);
+	w = pcb_to_nelma(PCB->MaxWidth);
+
+	/* nelma_im = gdImageCreate (w, h); */
+
+	/* Nelma only works with true color images */
+	nelma_im = gdImageCreate(w, h);
+	nelma_f = pcb_fopen(buf, "wb");
+
+	nelma_alloc_colors();
+
+	free(buf);
+}
+
+static void nelma_finish_png()
+{
+#ifdef HAVE_GDIMAGEPNG
+	gdImagePng(nelma_im, nelma_f);
+#else
+	pcb_message(PCB_MSG_WARNING, "NELMA: PNG not supported by gd. Can't write layer mask.\n");
+#endif
+	gdImageDestroy(nelma_im);
+	fclose(nelma_f);
+
+	free(white);
+	free(black);
+
+	nelma_im = NULL;
+	nelma_f = NULL;
+}
+
+void nelma_start_png_export()
+{
+	pcb_hid_expose_ctx_t ctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	linewidth = -1;
+	lastbrush = (gdImagePtr) ((void *) -1);
+	lastcolor = -1;
+
+	pcb_hid_expose_all(&nelma_hid, &ctx);
+}
+
+static void nelma_do_export(pcb_hid_attr_val_t * options)
+{
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i, len;
+	FILE *nelma_config;
+	char *buf;
+	time_t t;
+
+	if (!options) {
+		nelma_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++) {
+			nelma_values[i] = nelma_attribute_list[i].default_val;
+		}
+		options = nelma_values;
+	}
+	nelma_basename = options[HA_basename].str_value;
+	if (!nelma_basename) {
+		nelma_basename = "pcb-out";
+	}
+	nelma_dpi = options[HA_dpi].int_value;
+	if (nelma_dpi < 0) {
+		fprintf(stderr, "ERROR:  dpi may not be < 0\n");
+		return;
+	}
+	nelma_copperh = options[HA_copperh].int_value;
+	nelma_substrateh = options[HA_substrateh].int_value;
+	nelma_substratee = options[HA_substratee].real_value;
+
+	nelma_choose_groups();
+
+	for (i = 0; i < PCB_MAX_LAYERGRP; i++) {
+		if (nelma_export_group[i]) {
+			char tmp_ln[PCB_PATH_MAX];
+			const char *ext = pcb_layer_to_file_name(tmp_ln, -1, pcb_layergrp_flags(PCB, i), PCB_FNS_fixed);
+
+			nelma_cur_group = i;
+
+			nelma_start_png(nelma_basename, ext);
+
+			pcb_hid_save_and_show_layer_ons(save_ons);
+			nelma_start_png_export();
+			pcb_hid_restore_layer_ons(save_ons);
+
+			nelma_finish_png();
+		}
+	}
+
+	len = strlen(nelma_basename) + 4;
+	buf = (char *) malloc(sizeof(*buf) * len);
+
+	sprintf(buf, "%s.em", nelma_basename);
+	nelma_config = pcb_fopen(buf, "w");
+
+	free(buf);
+
+	fprintf(nelma_config, "/* Made with PCB Nelma export HID */");
+	t = time(NULL);
+	fprintf(nelma_config, "/* %s */", ctime(&t));
+
+	nelma_write_nets(nelma_config);
+	nelma_write_objects(nelma_config);
+	nelma_write_layers(nelma_config);
+	nelma_write_materials(nelma_config);
+	nelma_write_space(nelma_config);
+
+	fclose(nelma_config);
+}
+
+/* *** PNG export (slightly modified code from PNG export HID) ************* */
+
+static int nelma_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_INVIS)
+		return 0;
+
+	if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK)
+		return 0;
+
+	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_mask = !!(flags & PCB_LYT_MASK);
+
+	if (is_mask) {
+		/* Don't print masks */
+		return 0;
+	}
+	if (is_drill) {
+		/*
+		 * Print 'holes', so that we can fill gaps in the copper
+		 * layer
+		 */
+		return 1;
+	}
+	if (group == nelma_cur_group) {
+		return 1;
+	}
+	return 0;
+}
+
+static pcb_hid_gc_t nelma_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(struct hid_gc_s));
+	rv->me_pointer = &nelma_hid;
+	rv->cap = pcb_cap_round;
+	rv->width = 1;
+	rv->color = (struct color_struct *) malloc(sizeof(*rv->color));
+	rv->color->r = rv->color->g = rv->color->b = 0;
+	rv->color->c = 0;
+	return rv;
+}
+
+static void nelma_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void nelma_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	if (nelma_im == NULL) {
+		return;
+	}
+	if (name == NULL) {
+		name = "#ff0000";
+	}
+	if (!strcmp(name, "drill")) {
+		gc->color = black;
+		gc->erase = 0;
+		return;
+	}
+	gc->color = black;
+	gc->erase = 0;
+	return;
+}
+
+static void nelma_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void nelma_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void nelma_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void nelma_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	gc->faded = faded;
+}
+
+static void use_gc(pcb_hid_gc_t gc)
+{
+	int need_brush = 0;
+
+	if (gc->me_pointer != &nelma_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to nelma HID\n");
+		abort();
+	}
+	if (linewidth != gc->width) {
+		/* Make sure the scaling doesn't erase lines completely */
+		/*
+		   if (SCALE (gc->width) == 0 && gc->width > 0)
+		   gdImageSetThickness (im, 1);
+		   else
+		 */
+		gdImageSetThickness(nelma_im, pcb_to_nelma(gc->width));
+		linewidth = gc->width;
+		need_brush = 1;
+	}
+	if (lastbrush != gc->brush || need_brush) {
+		static void *bcache = 0;
+		pcb_hidval_t bval;
+		char name[256];
+		char type;
+		int r;
+
+		switch (gc->cap) {
+		case pcb_cap_round:
+			type = 'C';
+			r = pcb_to_nelma(gc->width / 2);
+			break;
+		case pcb_cap_square:
+			r = pcb_to_nelma(gc->width);
+			type = 'S';
+			break;
+		default:
+			assert(!"unhandled cap");
+			type = 'C';
+			r = 1;
+		}
+		sprintf(name, "#%.2x%.2x%.2x_%c_%d", gc->color->r, gc->color->g, gc->color->b, type, r);
+
+		if (pcb_hid_cache_color(0, name, &bval, &bcache)) {
+			gc->brush = (gdImagePtr) bval.ptr;
+		}
+		else {
+			int bg, fg;
+			if (type == 'C')
+				gc->brush = gdImageCreate(2 * r + 1, 2 * r + 1);
+			else
+				gc->brush = gdImageCreate(r + 1, r + 1);
+			bg = gdImageColorAllocate(gc->brush, 255, 255, 255);
+			fg = gdImageColorAllocate(gc->brush, gc->color->r, gc->color->g, gc->color->b);
+			gdImageColorTransparent(gc->brush, bg);
+
+			/*
+			 * if we shrunk to a radius/box width of zero, then just use
+			 * a single pixel to draw with.
+			 */
+			if (r == 0)
+				gdImageFilledRectangle(gc->brush, 0, 0, 0, 0, fg);
+			else {
+				if (type == 'C')
+					gdImageFilledEllipse(gc->brush, r, r, 2 * r, 2 * r, fg);
+				else
+					gdImageFilledRectangle(gc->brush, 0, 0, r, r, fg);
+			}
+			bval.ptr = gc->brush;
+			pcb_hid_cache_color(1, name, &bval, &bcache);
+		}
+
+		gdImageSetBrush(nelma_im, gc->brush);
+		lastbrush = gc->brush;
+
+	}
+#define CBLEND(gc) (((gc->r)<<24)|((gc->g)<<16)|((gc->b)<<8)|(gc->faded))
+	if (lastcolor != CBLEND(gc)) {
+		if (is_drill || is_mask) {
+#ifdef FIXME
+			fprintf(f, "%d gray\n", gc->erase ? 0 : 1);
+#endif
+			lastcolor = 0;
+		}
+		else {
+			double r, g, b;
+			r = gc->r;
+			g = gc->g;
+			b = gc->b;
+			if (gc->faded) {
+				r = 0.8 * 255 + 0.2 * r;
+				g = 0.8 * 255 + 0.2 * g;
+				b = 0.8 * 255 + 0.2 * b;
+			}
+#ifdef FIXME
+			if (gc->r == gc->g && gc->g == gc->b)
+				fprintf(f, "%g gray\n", r / 255.0);
+			else
+				fprintf(f, "%g %g %g rgb\n", r / 255.0, g / 255.0, b / 255.0);
+#endif
+			lastcolor = CBLEND(gc);
+		}
+	}
+}
+
+static void nelma_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	gdImageRectangle(nelma_im, pcb_to_nelma(x1), pcb_to_nelma(y1), pcb_to_nelma(x2), pcb_to_nelma(y2), gc->color->c);
+}
+
+static void nelma_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	gdImageSetThickness(nelma_im, 0);
+	linewidth = 0;
+	gdImageFilledRectangle(nelma_im, pcb_to_nelma(x1), pcb_to_nelma(y1), pcb_to_nelma(x2), pcb_to_nelma(y2), gc->color->c);
+}
+
+static void nelma_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	if (x1 == x2 && y1 == y2) {
+		pcb_coord_t w = gc->width / 2;
+		nelma_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
+		return;
+	}
+	use_gc(gc);
+
+	gdImageSetThickness(nelma_im, 0);
+	linewidth = 0;
+	gdImageLine(nelma_im, pcb_to_nelma(x1), pcb_to_nelma(y1), pcb_to_nelma(x2), pcb_to_nelma(y2), gdBrushed);
+}
+
+static void nelma_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t sa, ea;
+
+	/*
+	 * in gdImageArc, 0 degrees is to the right and +90 degrees is down
+	 * in pcb, 0 degrees is to the left and +90 degrees is down
+	 */
+	start_angle = 180 - start_angle;
+	delta_angle = -delta_angle;
+	if (delta_angle > 0) {
+		sa = start_angle;
+		ea = start_angle + delta_angle;
+	}
+	else {
+		sa = start_angle + delta_angle;
+		ea = start_angle;
+	}
+
+	/*
+	 * make sure we start between 0 and 360 otherwise gd does strange
+	 * things
+	 */
+	sa = pcb_normalize_angle(sa);
+	ea = pcb_normalize_angle(ea);
+
+#if 0
+	printf("draw_arc %d,%d %dx%d %d..%d %d..%d\n", cx, cy, width, height, start_angle, delta_angle, sa, ea);
+	printf("gdImageArc (%p, %d, %d, %d, %d, %d, %d, %d)\n",
+				 (void *)im, SCALE_X(cx), SCALE_Y(cy), SCALE(width), SCALE(height), sa, ea, gc->color->c);
+#endif
+	use_gc(gc);
+	gdImageSetThickness(nelma_im, 0);
+	linewidth = 0;
+	gdImageArc(nelma_im, pcb_to_nelma(cx), pcb_to_nelma(cy),
+						 pcb_to_nelma(2 * width), pcb_to_nelma(2 * height), sa, ea, gdBrushed);
+}
+
+static void nelma_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	use_gc(gc);
+
+	gdImageSetThickness(nelma_im, 0);
+	linewidth = 0;
+	gdImageFilledEllipse(nelma_im, pcb_to_nelma(cx), pcb_to_nelma(cy),
+											 pcb_to_nelma(2 * radius), pcb_to_nelma(2 * radius), gc->color->c);
+
+}
+
+static void nelma_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	gdPoint *points;
+
+	points = (gdPoint *) malloc(n_coords * sizeof(gdPoint));
+	if (points == NULL) {
+		fprintf(stderr, "ERROR:  nelma_fill_polygon():  malloc failed\n");
+		exit(1);
+	}
+	use_gc(gc);
+	for (i = 0; i < n_coords; i++) {
+		points[i].x = pcb_to_nelma(x[i]+dx);
+		points[i].y = pcb_to_nelma(y[i]+dy);
+	}
+	gdImageSetThickness(nelma_im, 0);
+	linewidth = 0;
+	gdImageFilledPolygon(nelma_im, points, n_coords, gc->color->c);
+	free(points);
+}
+
+static void nelma_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	nelma_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void nelma_calibrate(double xval, double yval)
+{
+	CRASH("nelma_calibrate");
+}
+
+static void nelma_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int nelma_usage(const char *topic)
+{
+	fprintf(stderr, "\nnelma exporter command line arguments:\n\n");
+	pcb_hid_usage(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x nelma [nelma options] foo.pcb\n\n");
+	return 0;
+}
+
+/* *** Miscellaneous ******************************************************* */
+
+#include "dolists.h"
+
+int pplg_check_ver_export_nelma(int ver_needed) { return 0; }
+
+int pplg_uninit_export_nelma(void)
+{
+	pcb_hid_remove_attributes_by_cookie(nelma_cookie);
+	return 0;
+}
+
+int pplg_init_export_nelma(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&nelma_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&nelma_hid);
+	pcb_dhlp_draw_helpers_init(&nelma_hid);
+
+	nelma_hid.struct_size = sizeof(pcb_hid_t);
+	nelma_hid.name = "nelma";
+	nelma_hid.description = "Numerical analysis package export";
+	nelma_hid.exporter = 1;
+
+	nelma_hid.get_export_options = nelma_get_export_options;
+	nelma_hid.do_export = nelma_do_export;
+	nelma_hid.parse_arguments = nelma_parse_arguments;
+	nelma_hid.set_layer_group = nelma_set_layer_group;
+	nelma_hid.make_gc = nelma_make_gc;
+	nelma_hid.destroy_gc = nelma_destroy_gc;
+	nelma_hid.set_color = nelma_set_color;
+	nelma_hid.set_line_cap = nelma_set_line_cap;
+	nelma_hid.set_line_width = nelma_set_line_width;
+	nelma_hid.set_draw_xor = nelma_set_draw_xor;
+	nelma_hid.set_draw_faded = nelma_set_draw_faded;
+	nelma_hid.draw_line = nelma_draw_line;
+	nelma_hid.draw_arc = nelma_draw_arc;
+	nelma_hid.draw_rect = nelma_draw_rect;
+	nelma_hid.fill_circle = nelma_fill_circle;
+	nelma_hid.fill_polygon = nelma_fill_polygon;
+	nelma_hid.fill_polygon_offs = nelma_fill_polygon_offs;
+	nelma_hid.fill_rect = nelma_fill_rect;
+	nelma_hid.calibrate = nelma_calibrate;
+	nelma_hid.set_crosshair = nelma_set_crosshair;
+
+	nelma_hid.usage = nelma_usage;
+
+	pcb_hid_register_hid(&nelma_hid);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_openems/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_openems/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_openems
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_openems/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_openems/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {export_openems}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/export_openems/export_openems.o
+	$(PLUGDIR)/export_openems/mesh.o
+@]
+
+switch /local/pcb/export_openems/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_openems/export_openems.c
===================================================================
--- tags/2.0.1/src_plugins/export_openems/export_openems.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/export_openems.c	(revision 18980)
@@ -0,0 +1,855 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "compat_misc.h"
+#include "plugins.h"
+#include "safe_fs.h"
+#include "obj_subc_parent.h"
+#include "obj_pstk_inlines.h"
+
+#include "hid.h"
+#include "actions.h"
+#include "hid_nogui.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "hid_draw_helpers.h"
+#include "../src_plugins/lib_polyhelp/topoly.h"
+#include "mesh.h"
+
+static pcb_hid_t openems_hid;
+
+const char *openems_cookie = "openems HID";
+
+#define MESH_NAME "openems"
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	int width;
+} hid_gc_s;
+
+typedef struct {
+	/* input/output */
+	FILE *f;
+	pcb_board_t *pcb;
+	pcb_hid_attr_val_t *options;
+
+	/* local cache */
+	int lg_pcb2ems[PCB_MAX_LAYERGRP]; /* indexed by gid, gives 0 or the ems-side layer ID */
+	int lg_ems2pcb[PCB_MAX_LAYERGRP]; /* indexed by the ems-side layer ID, gives -1 or a gid */
+	int lg_next;
+	int clayer; /* current layer (lg index really) */
+	long oid; /* unique object ID - we need some unique variable names, keep on counting them */
+	long port_id; /* unique port ID for similar reasons */
+	pcb_coord_t ox, oy;
+	unsigned warn_subc_term:1;
+	unsigned warn_port_pstk:1;
+} wctx_t;
+
+static FILE *f = NULL;
+static wctx_t *ems_ctx;
+
+#define THMAX PCB_MM_TO_COORD(100)
+
+pcb_hid_attribute_t openems_attribute_list[] = {
+	{"outfile", "Graphics output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_openemsfile 0
+
+	{"def-copper-thick", "Default copper thickness",
+	 PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0},
+#define HA_def_copper_thick 1
+
+	{"def-substrate-thick", "Default substrate thickness",
+	 PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0},
+#define HA_def_substrate_thick 2
+
+	{"def-copper-cond", "Default copper conductivity",
+	 PCB_HATT_STRING, 0, 0, {0, "56*10^6", 0}, 0, 0},
+#define HA_def_copper_cond 3
+
+	{"def-subst-epsilon", "Default substrate epsilon",
+	 PCB_HATT_STRING, 0, 0, {0, "3.66", 0}, 0, 0},
+#define HA_def_subst_epsilon 4
+
+	{"def-subst-mue", "Default substrate mue",
+	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+#define HA_def_subst_mue 5
+
+	{"def-subst-kappa", "Default substrate kappa",
+	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+#define HA_def_subst_kappa 6
+
+	{"def-subst-sigma", "Default substrate sigma",
+	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+#define HA_def_subst_sigma 7
+
+	{"void-name", "Name of the void (sorrunding material)",
+	 PCB_HATT_STRING, 0, 0, {0, "AIR", 0}, 0, 0},
+#define HA_void_name 8
+
+	{"void-epsilon", "epsilon value for the void (sorrunding material)",
+	 PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
+#define HA_void_epsilon 9
+
+	{"void-mue", "mue value for the void (sorrunding material)",
+	 PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
+#define HA_void_mue 10
+
+	{"segments", "kludge: number of segments used to approximate round cap trace ends",
+	 PCB_HATT_INTEGER, 0, 100, {10, 0, 0}, 0, 0},
+#define HA_segments 11
+
+	{"base-prio", "base priority: if the board displaces the chassis",
+	 PCB_HATT_INTEGER, 0, 10, {0, 0, 0}, 0, 0},
+#define HA_base_prio 12
+
+	{"f_max", "maximum frequency",
+	 PCB_HATT_STRING, 0, 0, {0, "7e9", 0}, 0, 0},
+#define HA_f_max 13
+
+	{"excite", "Excite directive",
+	 PCB_HATT_STRING, 0, 0, {0, "SetGaussExcite(FDTD, f_max/2, f_max/2)", 0}, 0, 0},
+#define HA_excite 14
+
+	{"port-resistance", "default port resistance",
+	 PCB_HATT_REAL, 0, 1000, {0, 0, 50}, 0, 0}
+#define HA_def_port_res 15
+
+};
+
+#define NUM_OPTIONS (sizeof(openems_attribute_list)/sizeof(openems_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(openems_attribute_list, openems_cookie)
+
+static pcb_hid_attr_val_t openems_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *openems_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".m";
+	pcb_mesh_t *mesh = pcb_mesg_get(MESH_NAME);
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &openems_attribute_list[HA_openemsfile], suffix, &last_made_filename);
+
+	if (mesh != NULL) {
+		openems_attribute_list[HA_def_substrate_thick].default_val.coord_value = mesh->def_subs_thick;
+		openems_attribute_list[HA_def_copper_thick].default_val.coord_value = mesh->def_copper_thick;
+	}
+
+#warning TODO: when export dialogs change into DAD, this hack to convert the strings to allocated ones will not be needed anymore
+	openems_attribute_list[HA_f_max].default_val.str_value = pcb_strdup(openems_attribute_list[HA_f_max].default_val.str_value);
+	openems_attribute_list[HA_excite].default_val.str_value = pcb_strdup(openems_attribute_list[HA_excite].default_val.str_value);
+	openems_attribute_list[HA_def_copper_cond].default_val.str_value = pcb_strdup(openems_attribute_list[HA_def_copper_cond].default_val.str_value);
+	openems_attribute_list[HA_def_subst_epsilon].default_val.str_value = pcb_strdup(openems_attribute_list[HA_def_subst_epsilon].default_val.str_value);
+	openems_attribute_list[HA_def_subst_mue].default_val.str_value = pcb_strdup(openems_attribute_list[HA_def_subst_mue].default_val.str_value);
+	openems_attribute_list[HA_def_subst_kappa].default_val.str_value = pcb_strdup(openems_attribute_list[HA_def_subst_kappa].default_val.str_value);
+	openems_attribute_list[HA_def_subst_sigma].default_val.str_value = pcb_strdup(openems_attribute_list[HA_def_subst_sigma].default_val.str_value);
+	openems_attribute_list[HA_void_name].default_val.str_value = pcb_strdup(openems_attribute_list[HA_void_name].default_val.str_value);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return openems_attribute_list;
+}
+
+/* Find the openems 0;0 mark, if there is any */
+static void find_origin_bump(void *ctx_, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	wctx_t *ctx = ctx_;
+	if (pcb_attribute_get(&line->Attributes, "openems-origin") != NULL) {
+		ctx->ox = (line->BoundingBox.X1 + line->BoundingBox.X2) / 2;
+		ctx->oy = (line->BoundingBox.Y1 + line->BoundingBox.Y2) / 2;
+	}
+}
+
+static void find_origin(wctx_t *ctx)
+{
+	pcb_loop_layers(ctx->pcb, ctx, NULL, find_origin_bump, NULL, NULL, NULL);
+}
+
+static void openems_write_tunables(wctx_t *ctx)
+{
+	fprintf(ctx->f, "%%%%%% User tunables\n");
+	fprintf(ctx->f, "\n");
+
+	fprintf(ctx->f, "%%%% base_priority and offset: chassis for the board to sit in.\n");
+	fprintf(ctx->f, "%% base priority: if the board displaces the model of the chassis or the other way around.\n");
+	fprintf(ctx->f, "base_priority=%d;\n", ctx->options[HA_base_prio].int_value);
+	fprintf(ctx->f, "\n");
+	fprintf(ctx->f, "%% offset on the whole layout to locate it relative to the simulation origin\n");
+	pcb_fprintf(ctx->f, "offset.x = %mm;\n", -ctx->ox);
+	pcb_fprintf(ctx->f, "offset.y = %mm;\n", ctx->oy);
+	fprintf(ctx->f, "offset.z = 0;\n");
+	fprintf(ctx->f, "\n");
+
+	fprintf(ctx->f, "%% void is the material used for: fill holes, cutouts in substrate, etc\n");
+	fprintf(ctx->f, "void.name = '%s';\n", ctx->options[HA_void_name].str_value);
+	fprintf(ctx->f, "void.epsilon = %f;\n", ctx->options[HA_void_epsilon].real_value);
+	fprintf(ctx->f, "void.mue = %f;\n", ctx->options[HA_void_mue].real_value);
+	fprintf(ctx->f, "%% void.kappa = kappa;\n");
+	fprintf(ctx->f, "%% void.sigma = sigma;\n");
+	fprintf(ctx->f, "\n");
+
+	fprintf(ctx->f, "%% how many points should be used to describe the round end of traces.\n");
+	fprintf(ctx->f, "kludge.segments = %d;\n", ctx->options[HA_segments].int_value);
+	fprintf(ctx->f, "\n");
+
+	fprintf(ctx->f, "\n");
+}
+
+static void print_lparm(wctx_t *ctx, pcb_layergrp_t *grp, const char *attr, int cop_opt, int subs_opt, int is_str)
+{
+	int opt;
+
+#warning TODO: this needs layer group attributes in core (planned for lihata v5)
+#if 0
+#warning TODO: try openems::attr first - make a new core call for prefixed get, this will be a real common pattern
+	const char *val = pcb_attribute_get(&grp->Attributes, attr);
+
+	if (val != NULL) {
+		/* specified by a layer group attribute: overrides anything else */
+		if (is_str)
+			fprintf(ctx->f, "%s", val);
+		else
+			TODO: getvalue, print as coord
+		return;
+	}
+#endif
+
+	opt = (grp->ltype & PCB_LYT_COPPER) ? cop_opt : subs_opt;
+	assert(opt >= 0);
+	if (is_str)
+		pcb_fprintf(ctx->f, "%s", ctx->options[opt].str_value);
+	else
+		pcb_fprintf(ctx->f, "%mm", ctx->options[opt].coord_value);
+}
+
+static void openems_write_layers(wctx_t *ctx)
+{
+	pcb_layergrp_id_t gid;
+	int next = 1;
+
+	for(gid = 0; gid < PCB_MAX_LAYERGRP; gid++)
+		ctx->lg_ems2pcb[gid] = -1;
+
+	fprintf(ctx->f, "%%%%%% Layer mapping\n");
+
+	/* linear map of copper and substrate layers */
+	for(gid = 0; gid < ctx->pcb->LayerGroups.len; gid++) {
+		pcb_layergrp_t *grp = &ctx->pcb->LayerGroups.grp[gid];
+		int iscop = (grp->ltype & PCB_LYT_COPPER);
+
+		if (!(iscop) && !(grp->ltype & PCB_LYT_SUBSTRATE))
+			continue;
+		ctx->lg_ems2pcb[next] = gid;
+		ctx->lg_pcb2ems[gid] = next;
+
+		fprintf(ctx->f, "layers(%d).number = %d;\n", next, next); /* type index really */
+		fprintf(ctx->f, "layers(%d).name = '%s';\n", next, (grp->name == NULL ? "anon" : grp->name));
+		fprintf(ctx->f, "layers(%d).clearn = 0;\n", next);
+		fprintf(ctx->f, "layer_types(%d).name = '%s_%d';\n", next, iscop ? "COPPER" : "SUBSTRATE", next);
+		fprintf(ctx->f, "layer_types(%d).subtype = %d;\n", next, iscop ? 2 : 3);
+
+		fprintf(ctx->f, "layer_types(%d).thickness = ", next);
+		print_lparm(ctx, grp, "thickness", HA_def_copper_thick, HA_def_substrate_thick, 0);
+		fprintf(ctx->f, ";\n");
+
+		if (iscop) {
+			fprintf(ctx->f, "layer_types(%d).conductivity = ", next);
+			print_lparm(ctx, grp, "conductivity", HA_def_copper_cond, -1, 1);
+			fprintf(ctx->f, ";\n");
+		}
+		else { /* substrate */
+			fprintf(ctx->f, "layer_types(%d).epsilon = ", next);
+			print_lparm(ctx, grp, "epsilon", -1, HA_def_subst_epsilon, 1);
+			fprintf(ctx->f, ";\n");
+
+			fprintf(ctx->f, "layer_types(%d).mue = ", next);
+			print_lparm(ctx, grp, "mue", -1, HA_def_subst_mue, 1);
+			fprintf(ctx->f, ";\n");
+
+			fprintf(ctx->f, "layer_types(%d).kappa = ", next);
+			print_lparm(ctx, grp, "kappa", -1, HA_def_subst_kappa, 1);
+			fprintf(ctx->f, ";\n");
+
+			fprintf(ctx->f, "layer_types(%d).sigma = ", next);
+			print_lparm(ctx, grp, "sigma", -1, HA_def_subst_sigma, 1);
+			fprintf(ctx->f, ";\n");
+
+		}
+
+		next++;
+		fprintf(ctx->f, "\n");
+	}
+	fprintf(ctx->f, "\n");
+
+	ctx->lg_next = next;
+}
+
+static void openems_write_init(wctx_t *ctx)
+{
+	fprintf(ctx->f, "%%%%%% Initialize pcb2csx\n");
+	fprintf(ctx->f, "PCBRND = InitPCBRND(layers, layer_types, void, base_priority, offset, kludge);\n");
+	fprintf(ctx->f, "CSX = InitPcbrndLayers(CSX, PCBRND);\n");
+	fprintf(ctx->f, "\n");
+}
+
+static void openems_write_outline(wctx_t *ctx)
+{
+	int n;
+	pcb_any_obj_t *out1;
+
+	fprintf(ctx->f, "%%%%%% Board outline\n");
+
+	out1 = pcb_topoly_find_1st_outline(ctx->pcb);
+	if (out1 != NULL) {
+		long n;
+		pcb_poly_t *p = pcb_topoly_conn(ctx->pcb, out1, PCB_TOPOLY_KEEP_ORIG | PCB_TOPOLY_FLOATING);
+		for(n = 0; n < p->PointN; n++)
+			pcb_fprintf(ctx->f, "outline_xy(1, %ld) = %mm; outline_xy(2, %ld) = %mm;\n", n+1, p->Points[n].X, n+1, -p->Points[n].Y);
+		pcb_poly_free(p);
+	}
+	else {
+		/* rectangular board size */
+		pcb_fprintf(ctx->f, "outline_xy(1, 1) = 0; outline_xy(2, 1) = 0;\n");
+		pcb_fprintf(ctx->f, "outline_xy(1, 2) = %mm; outline_xy(2, 2) = 0;\n", ctx->pcb->MaxWidth);
+		pcb_fprintf(ctx->f, "outline_xy(1, 3) = %mm; outline_xy(2, 3) = %mm;\n", ctx->pcb->MaxWidth, -ctx->pcb->MaxHeight);
+		pcb_fprintf(ctx->f, "outline_xy(1, 4) = 0; outline_xy(2, 4) = %mm;\n", -ctx->pcb->MaxHeight);
+	}
+
+	/* create all substrate layers using this polygon*/
+	for(n = 1; n < ctx->lg_next; n++) {
+		pcb_layergrp_t *grp = &ctx->pcb->LayerGroups.grp[ctx->lg_ems2pcb[n]];
+		if (grp->ltype & PCB_LYT_SUBSTRATE)
+			fprintf(ctx->f, "CSX = AddPcbrndPoly(CSX, PCBRND, %d, outline_xy, 1);\n", n);
+	}
+
+	fprintf(ctx->f, "\n");
+}
+
+static void openems_vport_write(wctx_t *ctx, pcb_any_obj_t *o, pcb_coord_t x, pcb_coord_t y, pcb_layergrp_id_t gid1, pcb_layergrp_id_t gid2, const char *port_name)
+{
+	char *end, *s, *safe_name = pcb_strdup(port_name);
+	const char *att;
+	double resistance = ctx->options[HA_def_port_res].real_value;
+	int act = 1;
+
+	ctx->port_id++;
+
+	att = pcb_attribute_get(&o->Attributes, "openems::resistance");
+	if (att != NULL) {
+		double tmp = strtod(att, &end);
+		if (*end == '\0')
+			resistance = tmp;
+		else
+			pcb_message(PCB_MSG_WARNING, "Ignoring invalid openems::resistance value for port %s: '%s' (must be a number without suffix)\n", port_name, att);
+	}
+
+	att = pcb_attribute_get(&o->Attributes, "openems::active");
+	if (att != NULL) {
+		if (pcb_strcasecmp(att, "true") == 0)
+			act = 1;
+		else if (pcb_strcasecmp(att, "false") == 0)
+			act = 0;
+		else
+			pcb_message(PCB_MSG_WARNING, "Ignoring invalid openems::active value for port %s: '%s' (must be true or false)\n", port_name, att);
+	}
+
+	for(s = safe_name; *s != '\0'; s++)
+		if (!isalnum(*s))
+			*s = '_';
+
+	pcb_fprintf(ctx->f, "\npoint(1, 1) = %mm; point(2, 1) = %mm;\n",x, y);
+	fprintf(ctx->f, "start_layer = %d;\n", ctx->lg_pcb2ems[gid1]);
+	fprintf(ctx->f, "stop_layer = %d;\n", ctx->lg_pcb2ems[gid2]);
+	fprintf(ctx->f, "[%s_start, %s_stop] = CalcPcbrnd2PortV(PCBRND, point, start_layer, stop_layer);\n", safe_name, safe_name);
+	fprintf(ctx->f, "[CSX, port{%ld}] = AddLumpedPort(CSX, 999, %ld, %f, %s_start, %s_stop, [0 0 -1], %s);\n", ctx->port_id, ctx->port_id, resistance, safe_name, safe_name, act ? "true" : "false");
+
+	free(safe_name);
+}
+
+pcb_layergrp_id_t openems_vport_main_group_pstk(pcb_board_t *pcb, pcb_pstk_t *ps, int *gstep, const char *port_name)
+{
+	int top, bot, intern;
+	pcb_layergrp_id_t gid1;
+
+	top = (pcb_pstk_shape(ps, PCB_LYT_COPPER | PCB_LYT_TOP, 0) != NULL);
+	bot = (pcb_pstk_shape(ps, PCB_LYT_COPPER | PCB_LYT_BOTTOM, 0) != NULL);
+	intern = (pcb_pstk_shape(ps, PCB_LYT_INTERN | PCB_LYT_BOTTOM, 0) != NULL);
+	if (intern) {
+		pcb_message(PCB_MSG_ERROR, "Can not export openems vport %s: it has internal copper\n(must be either top or bottom copper)\n", port_name);
+		return -1;
+	}
+	if (top && bot) {
+		pcb_message(PCB_MSG_ERROR, "Can not export openems vport %s: it has both top and bottom copper\n", port_name);
+		return -1;
+	}
+	if (!top && !bot) {
+		pcb_message(PCB_MSG_ERROR, "Can not export openems vport %s: it does not have copper either on top or bottom\n", port_name);
+		return -1;
+	}
+
+	/* pick main group */
+	if (top) {
+		gid1 = pcb_layergrp_get_top_copper();
+		*gstep = +1;
+	}
+	else {
+		gid1 = pcb_layergrp_get_bottom_copper();
+		*gstep = -1;
+	}
+	if (gid1 < 0) {
+		pcb_message(PCB_MSG_ERROR, "Can not export openems vport %s: can not find top or bottom layer group ID\n", port_name);
+		return -1;
+	}
+
+	return gid1;
+}
+
+pcb_layergrp_id_t openems_vport_aux_group(pcb_board_t *pcb, pcb_layergrp_id_t gid1, int gstep, const char *port_name)
+{
+	pcb_layergrp_id_t gid2;
+
+	for(gid2 = gid1 + gstep; (gid2 >= 0) && (gid2 <= pcb->LayerGroups.len); gid2 += gstep)
+		if (pcb->LayerGroups.grp[gid2].ltype & PCB_LYT_COPPER)
+			return gid2;
+
+	pcb_message(PCB_MSG_ERROR, "Can not export openems vport %s: can not find pair layer\n", port_name);
+	return -1;
+}
+
+#define TPMASK (PCB_OBJ_LINE | PCB_OBJ_PSTK | PCB_OBJ_SUBC)
+static void openems_write_testpoints(wctx_t *ctx, pcb_data_t *data)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	for(o = pcb_data_first(&it, data, TPMASK); o != NULL; o = pcb_data_next(&it)) {
+		const char *port_name;
+		if (o->type == PCB_OBJ_SUBC)
+			openems_write_testpoints(ctx, ((pcb_subc_t *)o)->data);
+
+		port_name = pcb_attribute_get(&o->Attributes, "openems::vport");
+		if (port_name == NULL)
+			continue;
+
+		if (o->type == PCB_OBJ_SUBC) {
+			if (!ctx->warn_subc_term)
+				pcb_message(PCB_MSG_ERROR, "Subcircuit being a terminal is not supported.\n");
+			ctx->warn_subc_term = 1;
+			continue;
+		}
+
+		/* place the vertical port */
+		switch(o->type) {
+			case PCB_OBJ_PSTK:
+				{
+					int gstep;
+					pcb_layergrp_id_t gid1, gid2;
+					pcb_pstk_t *ps = (pcb_pstk_t *)o;
+
+					if (port_name == NULL)
+						break;
+
+					gid1 = openems_vport_main_group_pstk(ctx->pcb, ps, &gstep, port_name);
+					if (gid1 < 0)
+						break;
+
+					gid2 = openems_vport_aux_group(ctx->pcb, gid1, gstep, port_name);
+					if (gid2 < 0)
+						break;
+
+#warning TODO: check if there is copper object on hid2 at x;y
+
+					if (pcb_attribute_get(&o->Attributes, "openems::vport-reverse") == NULL)
+						openems_vport_write(ctx, (pcb_any_obj_t *)ps, ps->x, ps->y, gid1, gid2, port_name);
+					else
+						openems_vport_write(ctx, (pcb_any_obj_t *)ps, ps->x, ps->y, gid2, gid1, port_name);
+				}
+				break;
+				default:
+					if (!ctx->warn_port_pstk)
+						pcb_message(PCB_MSG_ERROR, "Only padstacks can be openems ports at the moment\n");
+					ctx->warn_port_pstk = 1;
+					break;
+		}
+	}
+}
+
+static void openems_write_mesh_lines(wctx_t *ctx, pcb_mesh_lines_t *l)
+{
+	pcb_cardinal_t n;
+	for(n = 0; n < vtc0_len(&l->result); n++)
+		pcb_fprintf(ctx->f, "%s%mm", (n == 0 ? "" : " "), l->result.array[n]);
+}
+
+static void openems_write_mesh1(wctx_t *ctx)
+{
+	pcb_mesh_t *mesh = pcb_mesg_get(MESH_NAME);
+	int n;
+
+	fprintf(ctx->f, "%%%%%% Board mesh, part 1\n");
+	fprintf(ctx->f, "unit = 1.0e-3;\n");
+	fprintf(ctx->f, "f_max = %s;\n", ctx->options[HA_f_max].str_value);
+	fprintf(ctx->f, "FDTD = InitFDTD();\n");
+	fprintf(ctx->f, "FDTD = %s;\n", ctx->options[HA_excite].str_value);
+
+	if (mesh != NULL) {
+
+		fprintf(ctx->f, "BC = {");
+
+		for(n = 0; n < 6; n++)
+			fprintf(ctx->f, "%s'%s'", (n == 0 ? "" : " "), mesh->bnd[n]);
+		fprintf(ctx->f, "};\n");
+
+		fprintf(ctx->f, "FDTD = SetBoundaryCond(FDTD, BC);\n");
+	}
+	fprintf(ctx->f, "physical_constants;\n");
+	fprintf(ctx->f, "CSX = InitCSX();\n");
+	fprintf(ctx->f, "\n");
+}
+
+static void openems_write_mesh2(wctx_t *ctx)
+{
+	pcb_mesh_t *mesh = pcb_mesg_get(MESH_NAME);
+
+	if (mesh == NULL) {
+		fprintf(ctx->f, "%%%%%% Board mesh (NOT defined in pcb-rnd)\n");
+		return;
+	}
+	fprintf(ctx->f, "%%%%%% Board mesh, part 2\n");
+
+	fprintf(ctx->f, "mesh.y=[");
+	openems_write_mesh_lines(ctx, &mesh->line[PCB_MESH_HORIZONTAL]);
+	fprintf(ctx->f, "];\n");
+
+	fprintf(ctx->f, "mesh.x=[");
+	openems_write_mesh_lines(ctx, &mesh->line[PCB_MESH_VERTICAL]);
+	fprintf(ctx->f, "];\n");
+
+	fprintf(ctx->f, "mesh.z=[");
+	openems_write_mesh_lines(ctx, &mesh->line[PCB_MESH_Z]);
+	fprintf(ctx->f, "];\n");
+
+	fprintf(ctx->f, "mesh.x = mesh.x .+ offset.x;\n");
+	fprintf(ctx->f, "mesh.y = offset.y .- mesh.y;\n");
+	fprintf(ctx->f, "mesh.z = mesh.z .+ offset.z;\n");
+	fprintf(ctx->f, "CSX = DefineRectGrid(CSX, unit, mesh);\n");
+	fprintf(ctx->f, "\n");
+}
+
+
+void openems_hid_export_to_file(FILE *the_file, pcb_hid_attr_val_t *options)
+{
+	pcb_hid_expose_ctx_t ctx;
+	wctx_t wctx;
+
+	memset(&wctx, 0, sizeof(wctx));
+	wctx.f = the_file;
+	wctx.pcb = PCB;
+	wctx.options = options;
+	ems_ctx = &wctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	f = the_file;
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+/*		conf_force_set_bool(conf_core.editor.check_planes, 0);*/
+	conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+	find_origin(&wctx);
+	openems_write_mesh1(&wctx);
+	openems_write_tunables(&wctx);
+	openems_write_mesh2(&wctx);
+	openems_write_layers(&wctx);
+	openems_write_init(&wctx);
+	openems_write_outline(&wctx);
+
+	fprintf(wctx.f, "%%%%%% Copper objects\n");
+	pcb_hid_expose_all(&openems_hid, &ctx);
+
+	fprintf(wctx.f, "%%%%%% Testpoints on terminals\n");
+	openems_write_testpoints(&wctx, wctx.pcb->Data);
+
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void openems_do_export(pcb_hid_attr_val_t * options)
+{
+	const char *filename;
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+
+	if (!options) {
+		openems_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			openems_values[i] = openems_attribute_list[i].default_val;
+		options = openems_values;
+	}
+
+	filename = options[HA_openemsfile].str_value;
+	if (!filename)
+		filename = "pcb.m";
+
+	f = pcb_fopen(filename, "wb");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	pcb_hid_save_and_show_layer_ons(save_ons);
+
+	openems_hid_export_to_file(f, options);
+
+	pcb_hid_restore_layer_ons(save_ons);
+
+	fclose(f);
+	f = NULL;
+}
+
+static int openems_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int openems_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_COPPER) { /* export copper layers only */
+		ems_ctx->clayer = ems_ctx->lg_pcb2ems[group];
+		return 1;
+	}
+	return 0;
+}
+
+static pcb_hid_gc_t openems_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
+	rv->me_pointer = &openems_hid;
+	return rv;
+}
+
+static void openems_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void openems_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			break;
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			break;
+		case PCB_HID_COMP_NEGATIVE:
+			pcb_message(PCB_MSG_ERROR, "Can't draw composite layer, especially not on copper\n");
+			break;
+		case PCB_HID_COMP_FLUSH:
+			break;
+	}
+}
+
+static void openems_set_color(pcb_hid_gc_t gc, const char *name)
+{
+}
+
+static void openems_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void openems_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+
+static void openems_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void openems_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+}
+
+static void openems_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+}
+
+static void openems_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+}
+
+static void openems_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	wctx_t *ctx = ems_ctx;
+	long oid = ctx->oid++;
+
+	pcb_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, cx, oid, -cy);
+	pcb_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, cx, oid, -cy);
+	pcb_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, radius*2);
+}
+
+static void openems_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	wctx_t *ctx = ems_ctx;
+	int n;
+	long oid = ctx->oid++;
+
+	for(n = 0; n < n_coords; n++)
+		pcb_fprintf(ctx->f, "poly%ld_xy(1, %ld) = %mm; poly%ld_xy(2, %ld) = %mm;\n", oid, n+1, x[n]+dx, oid, n+1, -(y[n]+dy));
+
+	fprintf(ctx->f, "CSX = AddPcbrndPoly(CSX, PCBRND, %d, poly%ld_xy, 1);\n", ctx->clayer, oid);
+}
+
+static void openems_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	openems_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+static void openems_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	wctx_t *ctx = ems_ctx;
+
+	if (gc->cap == pcb_cap_square) {
+		pcb_coord_t x[4], y[4];
+		pcb_line_t tmp;
+		tmp.Point1.X = x1;
+		tmp.Point1.Y = y1;
+		tmp.Point2.X = x2;
+		tmp.Point2.Y = y2;
+		pcb_sqline_to_rect(&tmp, x, y);
+		openems_fill_polygon_offs(gc, 4, x, y, 0, 0);
+	}
+	else {
+		long oid = ctx->oid++;
+		pcb_fprintf(ctx->f, "points%ld(1, 1) = %mm; points%ld(2, 1) = %mm;\n", oid, x1, oid, -y1);
+		pcb_fprintf(ctx->f, "points%ld(1, 2) = %mm; points%ld(2, 2) = %mm;\n", oid, x2, oid, -y2);
+		pcb_fprintf(ctx->f, "CSX = AddPcbrndTrace(CSX, PCBRND, %d, points%ld, %mm, 0);\n", ctx->clayer, oid, gc->width);
+	}
+}
+
+
+static void openems_calibrate(double xval, double yval)
+{
+	pcb_message(PCB_MSG_ERROR, "openems_calibrate() not implemented");
+	return;
+}
+
+static void openems_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int openems_usage(const char *topic)
+{
+	fprintf(stderr, "\nopenems exporter command line arguments:\n\n");
+	pcb_hid_usage(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x openems [openems options] foo.pcb\n\n");
+	return 0;
+}
+
+static pcb_action_t openems_action_list[] = {
+	{"mesh", pcb_act_mesh, pcb_acth_mesh, pcb_acts_mesh}
+};
+
+PCB_REGISTER_ACTIONS(openems_action_list, openems_cookie)
+
+#include "dolists.h"
+
+int pplg_check_ver_export_openems(int ver_needed) { return 0; }
+
+void pplg_uninit_export_openems(void)
+{
+	pcb_remove_actions_by_cookie(openems_cookie);
+	pcb_hid_remove_attributes_by_cookie(openems_cookie);
+}
+
+int pplg_init_export_openems(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&openems_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&openems_hid);
+	pcb_dhlp_draw_helpers_init(&openems_hid);
+
+	openems_hid.struct_size = sizeof(pcb_hid_t);
+	openems_hid.name = "openems";
+	openems_hid.description = "OpenEMS exporter";
+	openems_hid.exporter = 1;
+
+	openems_hid.get_export_options = openems_get_export_options;
+	openems_hid.do_export = openems_do_export;
+	openems_hid.parse_arguments = openems_parse_arguments;
+	openems_hid.set_layer_group = openems_set_layer_group;
+	openems_hid.make_gc = openems_make_gc;
+	openems_hid.destroy_gc = openems_destroy_gc;
+	openems_hid.set_drawing_mode = openems_set_drawing_mode;
+	openems_hid.set_color = openems_set_color;
+	openems_hid.set_line_cap = openems_set_line_cap;
+	openems_hid.set_line_width = openems_set_line_width;
+	openems_hid.set_draw_xor = openems_set_draw_xor;
+	openems_hid.draw_line = openems_draw_line;
+	openems_hid.draw_arc = openems_draw_arc;
+	openems_hid.draw_rect = openems_draw_rect;
+	openems_hid.fill_circle = openems_fill_circle;
+	openems_hid.fill_polygon = openems_fill_polygon;
+	openems_hid.fill_polygon_offs = openems_fill_polygon_offs;
+	openems_hid.fill_rect = openems_fill_rect;
+	openems_hid.calibrate = openems_calibrate;
+	openems_hid.set_crosshair = openems_set_crosshair;
+
+	openems_hid.usage = openems_usage;
+
+	pcb_hid_register_hid(&openems_hid);
+
+	PCB_REGISTER_ACTIONS(openems_action_list, openems_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_openems/export_openems.pup
===================================================================
--- tags/2.0.1/src_plugins/export_openems/export_openems.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/export_openems.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short openems exporter
+$long Export copper to OpenEMS simulation
+$state WIP
+$fmt-native no
+$fmt-feature-w export a matlab file suitable for OpenEMS simulation
+$package export-sim
+dep lib_polyhelp
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/export_openems/mesh.c
===================================================================
--- tags/2.0.1/src_plugins/export_openems/mesh.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/mesh.c	(revision 18980)
@@ -0,0 +1,903 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "mesh.h"
+#include "layer.h"
+#include "layer_ui.h"
+#include "actions.h"
+#include "board.h"
+#include "data.h"
+#include "hid_dad.h"
+#include "event.h"
+
+static pcb_mesh_t mesh;
+static const char *mesh_ui_cookie = "mesh ui layer cookie";
+
+static const char *bnds[] = { "PEC", "PMC", "MUR", "PML_8", NULL };
+static const char *bnd_names[] = { "xmin", "xmax", "ymin", "ymax", "zmin", "zmax" };
+static const char *subslines[] =   { "0", "1", "3", "5", NULL };
+static const int num_subslines[] = { 0,    1,   3,   5 };
+
+typedef struct {
+	PCB_DAD_DECL_NOINIT(dlg)
+	int dens_obj, dens_gap, min_space, smooth, hor, ver, noimpl;
+	int bnd[6], subslines, air_top, air_bot, dens_air, smoothz, max_air, def_subs_thick, def_copper_thick;
+} mesh_dlg_t;
+static mesh_dlg_t ia;
+
+
+#if 1
+	static void mesh_trace(const char *fmt, ...) { }
+#else
+#	define mesh_trace pcb_trace
+#endif
+
+#warning reorder to avoid fwd decl
+static void mesh_auto_add_smooth(vtc0_t *v, pcb_coord_t c1, pcb_coord_t c2, pcb_coord_t d1, pcb_coord_t d, pcb_coord_t d2);
+
+static void mesh_add_edge(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t crd)
+{
+	vtc0_append(&mesh->line[dir].edge, crd);
+}
+
+static void mesh_add_result(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t crd)
+{
+	vtc0_append(&mesh->line[dir].result, crd);
+}
+
+static void mesh_add_range(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t c1, pcb_coord_t c2, pcb_coord_t dens)
+{
+	pcb_range_t *r = vtr0_alloc_append(&mesh->line[dir].dens, 1);
+	r->begin = c1;
+	r->end = c2;
+	r->data[0].c = dens;
+}
+
+static void mesh_add_obj(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t c1, pcb_coord_t c2, int aligned)
+{
+	if (aligned) {
+		mesh_add_edge(mesh, dir, c1 - mesh->dens_obj * 2 / 3);
+		mesh_add_edge(mesh, dir, c1 + mesh->dens_obj * 1 / 3);
+		mesh_add_edge(mesh, dir, c2 - mesh->dens_obj * 1 / 3);
+		mesh_add_edge(mesh, dir, c2 + mesh->dens_obj * 2 / 3);
+	}
+	mesh_add_range(mesh, dir, c1, c2, mesh->dens_obj);
+}
+
+/* generate edges and ranges looking at objects on the given layer */
+static int mesh_gen_obj(pcb_mesh_t *mesh, pcb_mesh_dir_t dir)
+{
+	pcb_data_t *data = mesh->layer->parent.data;
+	pcb_line_t *line;
+	pcb_line_t *arc;
+	pcb_poly_t *poly;
+	pcb_pstk_t *ps;
+	gdl_iterator_t it;
+
+	padstacklist_foreach(&data->padstack, &it, ps) {
+		if (pcb_attribute_get(&ps->Attributes, "openems::vport") != 0) {
+			switch(dir) {
+				case PCB_MESH_HORIZONTAL: mesh_add_edge(mesh, dir, ps->y); break;
+				case PCB_MESH_VERTICAL:   mesh_add_edge(mesh, dir, ps->x); break;
+			}
+		}
+	}
+
+	linelist_foreach(&mesh->layer->Line, &it, line) {
+		pcb_coord_t x1 = line->Point1.X, y1 = line->Point1.Y, x2 = line->Point2.X, y2 = line->Point2.Y;
+		int aligned = (x1 == x2) || (y1 == y2);
+
+		switch(dir) {
+			case PCB_MESH_HORIZONTAL:
+				if (y1 < y2)
+					mesh_add_obj(mesh, dir, y1 - line->Thickness/2, y2 + line->Thickness/2, aligned);
+				else
+					mesh_add_obj(mesh, dir, y2 - line->Thickness/2, y1 + line->Thickness/2, aligned);
+				break;
+			case PCB_MESH_VERTICAL:
+				if (x1 < x2)
+					mesh_add_obj(mesh, dir, x1 - line->Thickness/2, x2 + line->Thickness/2, aligned);
+				else
+					mesh_add_obj(mesh, dir, x2 - line->Thickness/2, x1 + line->Thickness/2, aligned);
+				break;
+			default: break;
+		}
+	}
+
+	arclist_foreach(&mesh->layer->Arc, &it, arc) {
+		/* no point in encorcinf 1/3 2/3 rule, just set the range */
+		switch(dir) {
+			case PCB_MESH_HORIZONTAL: mesh_add_range(mesh, dir, arc->BoundingBox.Y1 + arc->Clearance/2, arc->BoundingBox.Y2 - arc->Clearance/2, mesh->dens_obj); break;
+			case PCB_MESH_VERTICAL:   mesh_add_range(mesh, dir, arc->BoundingBox.X1 + arc->Clearance/2, arc->BoundingBox.X2 - arc->Clearance/2, mesh->dens_obj); break;
+			default: break;
+		}
+	}
+
+#warning TODO: text and padstacks
+
+	polylist_foreach(&mesh->layer->Polygon, &it, poly) {
+		pcb_poly_it_t it;
+		pcb_polyarea_t *pa;
+
+		for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+			pcb_coord_t x, y;
+			pcb_pline_t *pl;
+			int go;
+
+			pl = pcb_poly_contour(&it);
+			if (pl != NULL) {
+				pcb_coord_t lx, ly, minx, miny, maxx, maxy;
+				
+				pcb_poly_vect_first(&it, &minx, &miny);
+				maxx = minx;
+				maxy = miny;
+				pcb_poly_vect_peek_prev(&it, &lx, &ly);
+				/* find axis aligned contour edges for the 2/3 1/3 rule */
+				for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y)) {
+					switch(dir) {
+						case PCB_MESH_HORIZONTAL:
+							if (y == ly) {
+								int sign = (x < lx) ? +1 : -1;
+								mesh_add_edge(mesh, dir, y - sign * mesh->dens_obj * 2 / 3);
+								mesh_add_edge(mesh, dir, y + sign * mesh->dens_obj * 1 / 3);
+							}
+							break;
+						case PCB_MESH_VERTICAL:
+							if (x == lx) {
+								int sign = (y < ly) ? +1 : -1;
+								mesh_add_edge(mesh, dir, x - sign * mesh->dens_obj * 2 / 3);
+								mesh_add_edge(mesh, dir, x + sign * mesh->dens_obj * 1 / 3);
+							}
+							break;
+						default: break;
+					}
+					lx = x;
+					ly = y;
+					if (x < minx) minx = x;
+					if (y < miny) miny = y;
+					if (x > maxx) maxx = x;
+					if (y > maxy) maxy = y;
+				}
+				switch(dir) {
+					case PCB_MESH_HORIZONTAL: mesh_add_range(mesh, dir, miny, maxy, mesh->dens_obj); break;
+					case PCB_MESH_VERTICAL:   mesh_add_range(mesh, dir, minx, maxx, mesh->dens_obj); break;
+					default: break;
+				}
+				/* Note: holes can be ignored: holes are sorrunded by polygons, the grid is dense over them already */
+			}
+		}
+	}
+	return 0;
+}
+
+static int cmp_coord(const void *v1, const void *v2)
+{
+	const pcb_coord_t *c1 = v1, *c2 = v2;
+	return *c1 < *c2 ? -1 : +1;
+}
+
+static int cmp_range(const void *v1, const void *v2)
+{
+	const pcb_range_t *c1 = v1, *c2 = v2;
+	return c1->begin < c2->begin ? -1 : +1;
+}
+
+
+typedef struct {
+	pcb_coord_t min;
+	pcb_coord_t max;
+	int found;
+} mesh_maybe_t;
+
+static int cmp_maybe_add(const void *k, const void *v)
+{
+	const mesh_maybe_t *ctx = k;
+	const pcb_coord_t *c = v;
+
+	if ((*c >= ctx->min) && (*c <= ctx->max))
+		return 0;
+	if (*c < ctx->min)
+		return +1;
+	return -1;
+}
+
+static void mesh_maybe_add_edge(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t at, pcb_coord_t dist)
+{
+	mesh_maybe_t ctx;
+	pcb_coord_t *c;
+	ctx.min = at - dist;
+	ctx.max = at + dist;
+	ctx.found = 0;
+
+	c = bsearch(&ctx, mesh->line[dir].edge.array, vtc0_len(&mesh->line[dir].edge), sizeof(pcb_coord_t), cmp_maybe_add);
+	if (c == NULL) {
+#warning TODO: optimization: run a second bsearch and insert instead of this; testing: 45 deg line (won't have axis aligned edge for the 2/3 1/3 rule)
+		vtc0_append(&mesh->line[dir].edge, at);
+		qsort(mesh->line[dir].edge.array, vtc0_len(&mesh->line[dir].edge), sizeof(pcb_coord_t), cmp_coord);
+	}
+}
+
+static int mesh_sort(pcb_mesh_t *mesh, pcb_mesh_dir_t dir)
+{
+	size_t n;
+	pcb_range_t *r;
+
+	if (vtr0_len(&mesh->line[dir].dens) < 1) {
+		pcb_message(PCB_MSG_ERROR, "There are not enough objects to do the meshing\n");
+		return -1;
+	}
+
+	qsort(mesh->line[dir].edge.array, vtc0_len(&mesh->line[dir].edge), sizeof(pcb_coord_t), cmp_coord);
+	qsort(mesh->line[dir].dens.array, vtr0_len(&mesh->line[dir].dens), sizeof(pcb_range_t), cmp_range);
+
+	/* merge edges too close */
+	for(n = 0; n < vtc0_len(&mesh->line[dir].edge)-1; n++) {
+		pcb_coord_t c1 = mesh->line[dir].edge.array[n], c2 = mesh->line[dir].edge.array[n+1];
+		if (c2 - c1 < mesh->min_space) {
+			mesh->line[dir].edge.array[n] = (c1 + c2) / 2;
+			vtc0_remove(&mesh->line[dir].edge, n+1, 1);
+		}
+	}
+
+
+	/* merge overlapping ranges of the same density */
+	for(n = 0; n < vtr0_len(&mesh->line[dir].dens)-1; n++) {
+		pcb_range_t *r1 = &mesh->line[dir].dens.array[n], *r2 = &mesh->line[dir].dens.array[n+1];
+		if (r1->data[0].c != r2->data[0].c) continue;
+		if (r2->begin < r1->end) {
+			if (r2->end > r1->end)
+				r1->end = r2->end;
+			vtr0_remove(&mesh->line[dir].dens, n+1, 1);
+			n--; /* make sure to check the next range against the current one, might be overlapping as well */
+		}
+	}
+
+	/* continous ranges: fill in the gaps */
+	for(n = 0; n < vtr0_len(&mesh->line[dir].dens)-1; n++) {
+		pcb_range_t *r1 = &mesh->line[dir].dens.array[n], *r2 = &mesh->line[dir].dens.array[n+1];
+		if (r1->end < r2->begin) {
+			pcb_coord_t my_end = r2->begin; /* the insert will change r2 pointer */
+			pcb_range_t *r = vtr0_alloc_insert(&mesh->line[dir].dens, n+1, 1);
+			r->begin = r1->end;
+			r->end = my_end;
+			r->data[0].c = mesh->dens_gap;
+			n++; /* no need to check the new block */
+		}
+	}
+
+	/* make sure there's a forced mesh line at region transitions */
+	for(n = 0; n < vtr0_len(&mesh->line[dir].dens); n++) {
+		pcb_range_t *r = &mesh->line[dir].dens.array[n];
+		if (n == 0)
+			mesh_maybe_add_edge(mesh, dir, r->begin, mesh->dens_gap);
+		mesh_maybe_add_edge(mesh, dir, r->end, mesh->dens_gap);
+	}
+
+	/* continous ranges: start and end */
+	r = vtr0_alloc_insert(&mesh->line[dir].dens, 0, 1);
+	r->begin = 0;
+	r->end = mesh->line[dir].dens.array[1].begin;
+	r->data[0].c = mesh->dens_gap;
+
+	r = vtr0_alloc_append(&mesh->line[dir].dens, 1);
+	r->begin = mesh->line[dir].dens.array[vtr0_len(&mesh->line[dir].dens)-2].end;
+	r->end = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxHeight : PCB->MaxWidth;
+	r->data[0].c = mesh->dens_gap;
+
+
+	return 0;
+}
+
+static int cmp_range_at(const void *key_, const void *v_)
+{
+	const pcb_coord_t *key = key_;
+	const pcb_range_t *v = v_;
+
+	if ((*key >= v->begin) && (*key <= v->end))
+		return 0;
+	if (*key < v->begin) return -1;
+	return +1;
+}
+
+static pcb_range_t *mesh_find_range(const vtr0_t *v, pcb_coord_t at, pcb_coord_t *dens, pcb_coord_t *dens_left, pcb_coord_t *dens_right)
+{
+	pcb_range_t *r;
+	r = bsearch(&at, v->array, vtr0_len((vtr0_t *)v), sizeof(pcb_range_t), cmp_range_at);
+	if (dens != NULL) {
+		if (r == NULL)
+			return NULL;
+		*dens = r->data[0].c;
+	}
+	if (dens_left != NULL) {
+		if (r == v->array)
+			*dens_left = r->data[0].c;
+		else
+			*dens_left = r[-1].data[0].c;
+	}
+	if (dens_right != NULL) {
+		if (r == v->array+v->used-1)
+			*dens_right = r->data[0].c;
+		else
+			*dens_right = r[+1].data[0].c;
+	}
+	return r;
+}
+
+static int mesh_auto_z(pcb_mesh_t *mesh)
+{
+	pcb_layergrp_id_t gid;
+	pcb_coord_t y = 0, ytop = 0, ybottom, top_dens, bottom_dens;
+	int n, lns, first = 1;
+
+	vtc0_truncate(&mesh->line[PCB_MESH_Z].result, 0);
+
+	lns = num_subslines[ia.dlg[ia.subslines].default_val.int_value];
+	if (lns != 0) lns++;
+
+	for(gid = 0; gid < PCB->LayerGroups.len; gid++) {
+		pcb_layergrp_t *grp = &PCB->LayerGroups.grp[gid];
+		if (grp->ltype & PCB_LYT_COPPER) {
+			y += mesh->def_copper_thick;
+		}
+		else if (grp->ltype & PCB_LYT_SUBSTRATE) {
+			pcb_coord_t d, t = mesh->def_subs_thick;
+			double dens = (double)t/(double)lns;
+			bottom_dens = pcb_round(dens);
+			if (lns != 0) {
+				for(n = 0; n <= lns; n++) {
+					if (n == 0) {
+						if (first) {
+							ytop = y;
+							top_dens = pcb_round(dens);
+							mesh_add_result(mesh, PCB_MESH_Z, y);
+							first = 0;
+						}
+						else
+							continue;
+					}
+					d = pcb_round((double)y+dens*(double)n);
+					mesh_add_result(mesh, PCB_MESH_Z, d);
+				}
+			}
+			else {
+				if (first) {
+					ytop = y;
+					first = 0;
+					top_dens = mesh->def_subs_thick;
+				}
+				mesh_add_result(mesh, PCB_MESH_Z, y);
+			}
+			y += t;
+			ybottom = y;
+		}
+	}
+
+	if (ia.dlg[ia.air_top].default_val.int_value) {
+		if (ia.dlg[ia.smoothz].default_val.int_value) {
+			mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ytop - ia.dlg[ia.max_air].default_val.coord_value, ytop,
+				ia.dlg[ia.dens_air].default_val.coord_value, ia.dlg[ia.dens_air].default_val.coord_value, top_dens);
+		}
+		else {
+			for(y = ytop; y > ytop - ia.dlg[ia.max_air].default_val.coord_value ; y -= ia.dlg[ia.dens_air].default_val.coord_value)
+				mesh_add_result(mesh, PCB_MESH_Z, y);
+		}
+	}
+
+	if (ia.dlg[ia.air_bot].default_val.int_value) {
+		if (ia.dlg[ia.smoothz].default_val.int_value) {
+			mesh_auto_add_smooth(&mesh->line[PCB_MESH_Z].result, ybottom, ybottom + ia.dlg[ia.max_air].default_val.coord_value,
+				bottom_dens, ia.dlg[ia.dens_air].default_val.coord_value, ia.dlg[ia.dens_air].default_val.coord_value);
+		}
+		else {
+			for(y = ybottom; y < ybottom + ia.dlg[ia.max_air].default_val.coord_value ; y += ia.dlg[ia.dens_air].default_val.coord_value)
+				mesh_add_result(mesh, PCB_MESH_Z, y);
+		}
+	}
+
+
+	return 0;
+}
+
+static void mesh_draw_line(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t at, pcb_coord_t aux1, pcb_coord_t aux2, pcb_coord_t thick)
+{
+	if (dir == PCB_MESH_HORIZONTAL)
+		pcb_line_new(mesh->ui_layer_xy, aux1, at, aux2, at, thick, 0, pcb_no_flags());
+	else
+		pcb_line_new(mesh->ui_layer_xy, at, aux1, at, aux2, thick, 0, pcb_no_flags());
+}
+
+static void mesh_draw_range(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t at1, pcb_coord_t at2, pcb_coord_t aux, pcb_coord_t thick)
+{
+	if (dir == PCB_MESH_HORIZONTAL)
+		pcb_line_new(mesh->ui_layer_xy, aux, at1, aux, at2, thick, 0, pcb_no_flags());
+	else
+		pcb_line_new(mesh->ui_layer_xy, at1, aux, at2, aux, thick, 0, pcb_no_flags());
+}
+
+static void mesh_draw_label(pcb_mesh_t *mesh, pcb_mesh_dir_t dir, pcb_coord_t aux, const char *label)
+{
+	aux -= PCB_MM_TO_COORD(0.6);
+	if (dir == PCB_MESH_HORIZONTAL)
+		pcb_text_new(mesh->ui_layer_xy, pcb_font(PCB, 0, 0), aux, 0, 1, 75, label, pcb_no_flags());
+	else
+		pcb_text_new(mesh->ui_layer_xy, pcb_font(PCB, 0, 0), 0, aux, 0, 75, label, pcb_no_flags());
+
+}
+
+static int mesh_vis_xy(pcb_mesh_t *mesh, pcb_mesh_dir_t dir)
+{
+	size_t n;
+	pcb_coord_t end;
+
+	mesh_draw_label(mesh, dir, PCB_MM_TO_COORD(0.1), "object edge");
+
+	mesh_trace("%s edges:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical");
+	for(n = 0; n < vtc0_len(&mesh->line[dir].edge); n++) {
+		mesh_trace(" %mm", mesh->line[dir].edge.array[n]);
+		mesh_draw_line(mesh, dir, mesh->line[dir].edge.array[n], PCB_MM_TO_COORD(0.1), PCB_MM_TO_COORD(0.5), PCB_MM_TO_COORD(0.1));
+	}
+	mesh_trace("\n");
+
+	mesh_draw_label(mesh, dir, PCB_MM_TO_COORD(2), "density ranges");
+
+	mesh_trace("%s ranges:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical");
+	for(n = 0; n < vtr0_len(&mesh->line[dir].dens); n++) {
+		pcb_range_t *r = &mesh->line[dir].dens.array[n];
+		mesh_trace(" [%mm..%mm=%mm]", r->begin, r->end, r->data[0].c);
+		mesh_draw_range(mesh, dir, r->begin, r->end, PCB_MM_TO_COORD(2)+r->data[0].c/2, PCB_MM_TO_COORD(0.05));
+	}
+	mesh_trace("\n");
+
+	mesh_trace("%s result:\n", dir == PCB_MESH_HORIZONTAL ? "horizontal" : "vertical");
+	end = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxWidth : PCB->MaxHeight;
+	for(n = 0; n < vtc0_len(&mesh->line[dir].result); n++) {
+		mesh_trace(" %mm", mesh->line[dir].result.array[n]);
+		mesh_draw_line(mesh, dir, mesh->line[dir].result.array[n], 0, end, PCB_MM_TO_COORD(0.03));
+	}
+	mesh_trace("\n");
+
+	return 0;
+}
+
+static int mesh_vis_z(pcb_mesh_t *mesh)
+{
+	int n;
+	pcb_layergrp_id_t gid;
+	pcb_coord_t x0 = PCB->MaxWidth/15, y0 = PCB->MaxHeight/3, y = y0, y2;
+	pcb_coord_t xl = PCB->MaxWidth/5; /* board left */
+	pcb_coord_t xr = PCB->MaxWidth/5*3; /* board right */
+	pcb_coord_t spen = PCB_MM_TO_COORD(0.3), cpen = PCB_MM_TO_COORD(0.2), mpen = PCB_MM_TO_COORD(0.03);
+	int mag = 2;
+
+	for(gid = 0; gid < PCB->LayerGroups.len; gid++) {
+		pcb_layergrp_t *grp = &PCB->LayerGroups.grp[gid];
+		if (grp->ltype & PCB_LYT_COPPER) {
+			y2 = y + mesh->def_copper_thick * mag / 2;
+			pcb_line_new(mesh->ui_layer_z, xr, y2, xr+PCB_MM_TO_COORD(2), y2, cpen, 0, pcb_no_flags());
+			pcb_text_new(mesh->ui_layer_z, pcb_font(PCB, 0, 0), xr+PCB_MM_TO_COORD(3), y2 - PCB_MM_TO_COORD(1), 0, 100, grp->name, pcb_no_flags());
+			y += mesh->def_copper_thick * mag;
+		}
+		else if (grp->ltype & PCB_LYT_SUBSTRATE) {
+			y2 = y + mesh->def_subs_thick * mag;
+			pcb_line_new(mesh->ui_layer_z, xl, y, xr, y, spen, 0, pcb_no_flags());
+			pcb_line_new(mesh->ui_layer_z, xl, y2, xr, y2, spen, 0, pcb_no_flags());
+			pcb_line_new(mesh->ui_layer_z, xl, y, xl, y2, spen, 0, pcb_no_flags());
+			pcb_line_new(mesh->ui_layer_z, xr, y, xr, y2, spen, 0, pcb_no_flags());
+			y = y2;
+		}
+	}
+
+	mesh_trace("Z lines:\n");
+	for(n = 0; n < vtc0_len(&mesh->line[PCB_MESH_Z].result); n++) {
+		pcb_coord_t y = y0+mesh->line[PCB_MESH_Z].result.array[n]*mag;
+		mesh_trace(" %mm", y);
+		pcb_line_new(mesh->ui_layer_z, 0, y, PCB->MaxWidth, y, mpen, 0, pcb_no_flags());
+	}
+	mesh_trace("\n");
+	return 0;
+}
+
+
+static void mesh_auto_add_even(vtc0_t *v, pcb_coord_t c1, pcb_coord_t c2, pcb_coord_t d)
+{
+	long num = (c2 - c1) / d;
+
+	if (num < 1)
+		return;
+
+	d = (c2 - c1)/(num+1);
+	if (d > 0)
+		for(c1 += d; c1 < c2; c1 += d)
+			vtc0_append(v, c1);
+}
+
+static pcb_coord_t mesh_auto_add_interp(vtc0_t *v, pcb_coord_t c, pcb_coord_t d1, pcb_coord_t d2, pcb_coord_t dd)
+{
+	if (dd > 0) {
+		for(; d1 <= d2; d1 += dd) {
+			c += d1;
+			vtc0_append(v, c);
+		}
+		return c;
+	}
+	else {
+		for(; d1 <= d2; d1 -= dd) {
+			c -= d1;
+			vtc0_append(v, c);
+		}
+		return c;
+	}
+
+}
+
+static void mesh_auto_add_smooth(vtc0_t *v, pcb_coord_t c1, pcb_coord_t c2, pcb_coord_t d1, pcb_coord_t d, pcb_coord_t d2)
+{
+	pcb_coord_t len = c2 - c1, begin = c1, end = c2, glen;
+	int lines;
+
+	/* ramp up (if there's room) */
+	if (d > d1) {
+		lines = (d / d1) + 0;
+		if (lines > 0) {
+			glen = lines * d;
+			if (glen < len/4)
+				begin = mesh_auto_add_interp(v, c1, d1, d, (d-d1)/lines);
+		}
+		else
+			begin = c1;
+	}
+
+	/* ramp down (if there's room) */
+	if (d > d2) {
+		lines = (d / d2) + 0;
+		if (lines > 0) {
+			glen = lines * d;
+			if (glen < len/4)
+				end = mesh_auto_add_interp(v, c2, d2, d, -(d-d2)/lines);
+		}
+		else
+			end = c2;
+	}
+
+	/* middle section: linear */
+	mesh_auto_add_even(v, begin, end, d);
+}
+
+static int mesh_auto_build(pcb_mesh_t *mesh, pcb_mesh_dir_t dir)
+{
+	size_t n;
+	pcb_coord_t c1, c2;
+	pcb_coord_t d1, d, d2;
+
+	mesh_trace("build:\n");
+
+	/* left edge, before the first known line */
+	if (!mesh->noimpl) {
+		c1 = 0;
+		c2 = mesh->line[dir].edge.array[0];
+		mesh_find_range(&mesh->line[dir].dens, (c1+c2)/2, &d, &d1, &d2);
+		if (mesh->smooth)
+			mesh_auto_add_smooth(&mesh->line[dir].result, c1, c2, d1, d, d2);
+		else
+			mesh_auto_add_even(&mesh->line[dir].result, c1, c2, d);
+	}
+
+	/* normal, between known lines */
+	for(n = 0; n < vtc0_len(&mesh->line[dir].edge); n++) {
+		c1 = mesh->line[dir].edge.array[n];
+		c2 = mesh->line[dir].edge.array[n+1];
+
+		vtc0_append(&mesh->line[dir].result, c1);
+
+		if (c2 - c1 < mesh->dens_obj / 2)
+			continue; /* don't attempt to insert lines where it won't fit */
+
+		mesh_find_range(&mesh->line[dir].dens, (c1+c2)/2, &d, &d1, &d2);
+		if (c2 - c1 < d * 2)
+			continue; /* don't attempt to insert lines where it won't fit */
+
+		mesh_trace(" %mm..%mm %mm,%mm,%mm\n", c1, c2, d1, d, d2);
+
+		if (mesh->noimpl)
+			continue;
+
+		/* place mesh lines between c1 and c2 */
+		if (mesh->smooth)
+			mesh_auto_add_smooth(&mesh->line[dir].result, c1, c2, d1, d, d2);
+		else
+			mesh_auto_add_even(&mesh->line[dir].result, c1, c2, d);
+	}
+
+	/* right edge, after the last known line */
+	if (!mesh->noimpl) {
+		c1 = mesh->line[dir].edge.array[vtc0_len(&mesh->line[dir].edge)-1];
+		c2 = (dir == PCB_MESH_HORIZONTAL) ? PCB->MaxHeight : PCB->MaxWidth;
+		mesh_find_range(&mesh->line[dir].dens, (c1+c2)/2, &d, &d1, &d2);
+		if (mesh->smooth)
+			mesh_auto_add_smooth(&mesh->line[dir].result, c1, c2, d1, d, d2);
+		else
+			mesh_auto_add_even(&mesh->line[dir].result, c1, c2, d);
+	}
+
+	mesh_trace("\n");
+	return 0;
+}
+
+int mesh_auto(pcb_mesh_t *mesh, pcb_mesh_dir_t dir)
+{
+	vtc0_truncate(&mesh->line[dir].edge, 0);
+	vtr0_truncate(&mesh->line[dir].dens, 0);
+	vtc0_truncate(&mesh->line[dir].result, 0);
+
+	mesh_gen_obj(mesh, dir);
+	mesh_sort(mesh, dir);
+	mesh_auto_build(mesh, dir);
+
+	if (mesh->ui_layer_xy != NULL)
+		mesh_vis_xy(mesh, dir);
+
+	return 0;
+}
+
+static void mesh_layer_reset()
+{
+	if (mesh.ui_layer_xy != NULL)
+		pcb_uilayer_free(mesh.ui_layer_xy);
+	if (mesh.ui_layer_z != NULL)
+		pcb_uilayer_free(mesh.ui_layer_z);
+	mesh.ui_layer_xy = pcb_uilayer_alloc(mesh_ui_cookie, "mesh xy", "#007733");
+	mesh.ui_layer_z = pcb_uilayer_alloc(mesh_ui_cookie, "mesh z", "#007733");
+}
+
+static void ia_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+{
+	PCB_DAD_FREE(ia.dlg);
+	memset(&ia, 0, sizeof(ia));
+}
+
+static void ia_gen_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	int n;
+	mesh_layer_reset();
+
+	mesh.layer = CURRENT;
+
+	mesh.dens_obj = ia.dlg[ia.dens_obj].default_val.coord_value;
+	mesh.dens_gap = ia.dlg[ia.dens_gap].default_val.coord_value;
+	mesh.min_space = ia.dlg[ia.min_space].default_val.coord_value;
+	mesh.smooth = ia.dlg[ia.smooth].default_val.int_value;
+	mesh.noimpl = ia.dlg[ia.noimpl].default_val.int_value;;
+	mesh.def_subs_thick = ia.dlg[ia.def_subs_thick].default_val.coord_value;
+	mesh.def_copper_thick = ia.dlg[ia.def_copper_thick].default_val.coord_value;
+	for(n = 0; n < 6; n++)
+		mesh.bnd[n] = bnds[ia.dlg[ia.bnd[n]].default_val.int_value];
+
+	if (ia.dlg[ia.hor].default_val.int_value)
+		mesh_auto(&mesh, PCB_MESH_HORIZONTAL);
+	if (ia.dlg[ia.ver].default_val.int_value)
+		mesh_auto(&mesh, PCB_MESH_VERTICAL);
+
+	mesh_auto_z(&mesh);
+	if (mesh.ui_layer_z != NULL)
+		mesh_vis_z(&mesh);
+
+	free(mesh.ui_name_xy);
+	mesh.ui_name_xy = pcb_strdup_printf("mesh 0: %s", mesh.layer->name);
+	mesh.ui_layer_xy->name = mesh.ui_name_xy;
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+
+	pcb_gui->invalidate_all();
+}
+
+pcb_mesh_t *pcb_mesg_get(const char *name)
+{
+	return &mesh;
+}
+
+int pcb_mesh_interactive(void)
+{
+	int n;
+
+	PCB_DAD_BEGIN_VBOX(ia.dlg);
+		PCB_DAD_BEGIN_HBOX(ia.dlg);
+			PCB_DAD_BEGIN_VBOX(ia.dlg);
+				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_LABEL(ia.dlg, "XY-mesh");
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.dens_obj = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "copper dens.");
+					PCB_DAD_HELP(ia.dlg, "mesh density over copper");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.dens_gap = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "gap dens.");
+					PCB_DAD_HELP(ia.dlg, "mesh density over gaps");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.min_space = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "min. spacing");
+					PCB_DAD_HELP(ia.dlg, "minimum distance between mesh lines");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.smooth = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "smooth mesh");
+					PCB_DAD_HELP(ia.dlg, "avoid jumps between different mesh densities,\nuse smooth (gradual) changes");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.hor = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "horizontal");
+					PCB_DAD_HELP(ia.dlg, "enable adding horizontal mesh lines");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.ver = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "vertical");
+					PCB_DAD_HELP(ia.dlg, "enable adding vertical mesh lines");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.noimpl = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "omit implicit");
+					PCB_DAD_HELP(ia.dlg, "add only the mesh lines for boundaries,\nomit in-material meshing");
+				PCB_DAD_END(ia.dlg);
+			PCB_DAD_END(ia.dlg);
+
+			PCB_DAD_BEGIN_VBOX(ia.dlg);
+				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_LABEL(ia.dlg, "Z-mesh");
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_ENUM(ia.dlg, subslines);
+						ia.subslines = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "num in substrate");
+					PCB_DAD_HELP(ia.dlg, "number of mesh lines in substrate");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.def_subs_thick = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "def. subst. thick");
+					PCB_DAD_HELP(ia.dlg, "default substrate thickness\n(for substrate layer groups without\nthickness specified in attribute)");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.def_copper_thick = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "def. copper thick");
+					PCB_DAD_HELP(ia.dlg, "default copper thickness\n(for copper layer groups without\nthickness specified in attribute)");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.air_top = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "in air top");
+					PCB_DAD_HELP(ia.dlg, "add mesh lines in air above the top of the board");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.air_bot = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "in air bottom");
+					PCB_DAD_HELP(ia.dlg, "add mesh lines in air below the bottom of the board");
+				PCB_DAD_END(ia.dlg);
+
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.dens_air = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "dens. air");
+					PCB_DAD_HELP(ia.dlg, "mesh line density (spacing) in air");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_COORD(ia.dlg, "");
+						ia.max_air = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_MINMAX(ia.dlg, 0, PCB_MM_TO_COORD(5));
+					PCB_DAD_LABEL(ia.dlg, "air thickness");
+					PCB_DAD_HELP(ia.dlg, "how far out to mesh in air");
+				PCB_DAD_END(ia.dlg);
+
+				PCB_DAD_BEGIN_HBOX(ia.dlg);
+					PCB_DAD_BOOL(ia.dlg, "");
+						ia.smoothz = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_LABEL(ia.dlg, "smooth mesh");
+					PCB_DAD_HELP(ia.dlg, "avoid jumps between different mesh densities,\nuse smooth (gradual) changes");
+				PCB_DAD_END(ia.dlg);
+
+			PCB_DAD_END(ia.dlg);
+		PCB_DAD_END(ia.dlg);
+
+		PCB_DAD_BEGIN_HBOX(ia.dlg);
+			PCB_DAD_BEGIN_VBOX(ia.dlg);
+				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_LABEL(ia.dlg, "Boundary");
+				for(n = 0; n < 6; n+=2) {
+					char name[64];
+					sprintf(name, "%s %s", bnd_names[n], bnd_names[n+1]);
+					PCB_DAD_BEGIN_HBOX(ia.dlg);
+						PCB_DAD_ENUM(ia.dlg, bnds);
+							ia.bnd[n] = PCB_DAD_CURRENT(ia.dlg);
+						PCB_DAD_LABEL(ia.dlg, name);
+						PCB_DAD_ENUM(ia.dlg, bnds);
+							ia.bnd[n+1] = PCB_DAD_CURRENT(ia.dlg);
+					PCB_DAD_END(ia.dlg);
+				}
+			PCB_DAD_END(ia.dlg);
+
+			PCB_DAD_BEGIN_VBOX(ia.dlg);
+				PCB_DAD_BUTTON(ia.dlg, "Generate mesh!");
+					PCB_DAD_CHANGE_CB(ia.dlg, ia_gen_cb);
+			PCB_DAD_END(ia.dlg);
+		PCB_DAD_END(ia.dlg);
+
+	PCB_DAD_END(ia.dlg);
+
+	PCB_DAD_NEW(ia.dlg, "mesher", "Generate mesh", &ia, 0, ia_close_cb);
+
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_obj, coord_value, PCB_MM_TO_COORD(0.15));
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_gap, coord_value, PCB_MM_TO_COORD(0.5));
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.min_space, coord_value, PCB_MM_TO_COORD(0.1));
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smooth, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.hor, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.ver, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.noimpl, int_value, 0);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.subslines, int_value, 3);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.def_subs_thick, coord_value, PCB_MM_TO_COORD(1.5));
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_top, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.air_bot, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.dens_air, coord_value, PCB_MM_TO_COORD(0.7));
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.smoothz, int_value, 1);
+	PCB_DAD_SET_VALUE(ia.dlg_hid_ctx, ia.max_air, coord_value, PCB_MM_TO_COORD(4));
+	return 0;
+}
+
+const char pcb_acts_mesh[] = "mesh()";
+const char pcb_acth_mesh[] = "generate a mesh for simulation";
+fgw_error_t pcb_act_mesh(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_mesh_interactive();
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_openems/mesh.h
===================================================================
--- tags/2.0.1/src_plugins/export_openems/mesh.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openems/mesh.h	(revision 18980)
@@ -0,0 +1,40 @@
+#include "layer.h"
+#include "vtc0.h"
+#include "vtr0.h"
+#include <libfungw/fungw.h>
+
+typedef struct {
+	vtc0_t user_line; /* input: lines forced by the user */
+	vtr0_t user_dens; /* input: density forced by the user */
+	vtc0_t edge;      /* input: around object edge - lines that must be in the mesh */
+	vtr0_t dens;      /* input: density ranges; data[0].c is the target density */
+	vtc0_t result;    /* resulting line coordinates */
+} pcb_mesh_lines_t;
+
+typedef enum {
+	PCB_MESH_HORIZONTAL, /* variable y coord (horizontal lines) */
+	PCB_MESH_VERTICAL,   /* variable x coord (vertical lines) */
+	PCB_MESH_Z,
+	PCB_MESH_max
+} pcb_mesh_dir_t;
+
+typedef struct {
+	pcb_layer_t *layer;                    /* input layer (objects are picked up from this layer) */
+	pcb_layer_t *ui_layer_xy, *ui_layer_z; /* optional UI layers to draw the mesh on */
+	char *ui_name_xy;                      /* name of the UI layer */
+	pcb_coord_t dens_obj, dens_gap;        /* target density: distance between mesh lines above objects and above gaps */
+	pcb_coord_t min_space;                 /* make sure there's always at least this much space between two mesh lines */
+	pcb_coord_t def_subs_thick;            /* default substrate thickness */
+	pcb_coord_t def_copper_thick;          /* default copper thickness */
+	pcb_mesh_lines_t line[PCB_MESH_max];   /* actual lines of the mesh */
+	const char *bnd[6];                    /* temporary: boundary conditions */
+	unsigned smooth:1;                     /* if set, avoid jumps in the meshing by gradually changing meshing distance */
+	unsigned noimpl:1;                     /* when set, do not add extra implicit mesh lines, keep the explicit ones only */
+} pcb_mesh_t;
+
+extern const char pcb_acts_mesh[];
+extern const char pcb_acth_mesh[];
+fgw_error_t pcb_act_mesh(fgw_arg_t *res, int oargc, fgw_arg_t *oargv);
+
+/* Get one of the configured meshes */
+pcb_mesh_t *pcb_mesg_get(const char *name);
Index: tags/2.0.1/src_plugins/export_openscad/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_openscad
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_openscad/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {export_openscad}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/export_openscad/export_openscad.o
+@]
+
+switch /local/pcb/export_openscad/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_openscad/export_openscad.c
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/export_openscad.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/export_openscad.c	(revision 18980)
@@ -0,0 +1,707 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+#include <genvector/gds_char.h>
+#include <genvector/vti0.h>
+#include <genht/htsp.h>
+
+#include "compat_misc.h"
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "layer.h"
+#include "math_helper.h"
+#include "misc_util.h"
+#include "plugins.h"
+#include "safe_fs.h"
+#include "obj_pstk_inlines.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include "hid_init.h"
+#include "actions.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+
+static pcb_hid_t openscad_hid;
+
+const char *openscad_cookie = "openscad HID";
+
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	int width;
+} hid_gc_s;
+
+static FILE *f = NULL;
+static unsigned layer_open;
+static double layer_thickness = 0.01, effective_layer_thickness;
+static gds_t layer_group_calls, model_calls;
+static const char *scad_group_name;
+static int scad_group_level;
+static const char *scad_group_color;
+static int scad_layer_cnt;
+static vti0_t scad_comp;
+
+pcb_hid_attribute_t openscad_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "93 DXF Options"
+@ftable @code
+@item --outfile <string>
+Name of the file to be exported to. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"outfile", "Graphics output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_openscadfile 0
+
+	{"copper", "enable exporting outer copper layers",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_copper 1
+
+	{"silk", "enable exporting silk layers",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_silk 2
+
+	{"mask", "enable exporting mask layers",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_mask 3
+
+	{"models", "enable searching and inserting model files",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_models 4
+
+	{"drill", "enable drilling holes",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_drill 5
+};
+
+#define NUM_OPTIONS (sizeof(openscad_attribute_list)/sizeof(openscad_attribute_list[0]))
+
+#include "scad_draw.c"
+#include "scad_models.c"
+
+PCB_REGISTER_ATTRIBUTES(openscad_attribute_list, openscad_cookie)
+
+static pcb_hid_attr_val_t openscad_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *openscad_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".scad";
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &openscad_attribute_list[HA_openscadfile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return openscad_attribute_list;
+}
+
+void openscad_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options)
+{
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_hid_expose_ctx_t ctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	f = the_file;
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+/*		conf_force_set_bool(conf_core.editor.check_planes, 0);*/
+	conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+	pcb_hid_expose_all(&openscad_hid, &ctx);
+
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void scad_close_layer()
+{
+	if (layer_open) {
+		fprintf(f, "		}\n");
+		fprintf(f, "}\n\n");
+		layer_open = 0;
+	}
+}
+
+static void scad_dump_comp(void)
+{
+	int n, closes = 0;
+
+/*
+	a layer list like this: +4 -5 -0 +6 -7
+	becomes script like this:
+
+	difference()
+	{
+		union() {
+			difference() {
+				4
+				5
+				0
+			}
+			6
+		}
+		7
+	}
+
+*/
+
+	/* add an union or difference on polarity change */
+	for(n = vti0_len(&scad_comp)-2; n >= 0; n--) {
+		int p1 = (scad_comp.array[n]) > 0, p2 = (scad_comp.array[n+1] > 0);
+		if (p2 && !p1) {
+			fprintf(f, "	union() {\n");
+			closes++;
+		}
+		if (!p2 && p1) {
+			fprintf(f, "	difference() {\n");
+			closes++;
+		}
+	}
+
+	/* list layer calls, add a close on polarity change */
+	for(n = 0; n < vti0_len(&scad_comp); n++) {
+		int id = scad_comp.array[n], is_pos = id > 0;
+		if (id < 0)
+			id = -id;
+		fprintf(f, "	layer_%s_%s_%d();\n", scad_group_name, is_pos ? "pos" : "neg", id);
+		if ((n > 0) && (n < vti0_len(&scad_comp)-1)) {
+			int id2 = scad_comp.array[n+1];
+			int p1 = is_pos, p2 = (id2 > 0);
+			if (p2 != p1) {
+				fprintf(f, "}\n");
+				closes--;
+			}
+		}
+	}
+
+	/* the first open needs to be closed manually */
+	if (closes)
+		fprintf(f, "}\n");
+}
+
+static void scad_close_layer_group()
+{
+	if (scad_group_name != NULL) {
+		fprintf(f, "module layer_group_%s() {\n", scad_group_name);
+		scad_dump_comp();
+		fprintf(f, "}\n\n");
+
+		pcb_append_printf(&layer_group_calls, "	layer_group_%s();\n", scad_group_name);
+		scad_group_name = NULL;
+		scad_group_color = NULL;
+		scad_group_level = 0;
+		vti0_truncate(&scad_comp, 0);
+	}
+}
+
+static void scad_new_layer(int is_pos)
+{
+	double h;
+	scad_layer_cnt++;
+
+	if (is_pos)
+		vti0_append(&scad_comp, scad_layer_cnt);
+	else
+		vti0_append(&scad_comp, -scad_layer_cnt);
+
+	scad_close_layer();
+
+	if (is_pos) {
+		effective_layer_thickness = layer_thickness;
+		if (scad_group_level > 0)
+			h = 0.8+((double)scad_group_level*1.1) * effective_layer_thickness;
+		else
+			h = -0.8+((double)scad_group_level*1.1) * effective_layer_thickness;
+	}
+	else {
+		double mult = 2.0;
+		effective_layer_thickness = layer_thickness * mult;
+		if (scad_group_level > 0)
+			h = 0.8+((double)scad_group_level*1.1) * layer_thickness;
+		else
+			h = -0.8+((double)scad_group_level*1.1) * layer_thickness;
+		h -= effective_layer_thickness/2.0;
+		effective_layer_thickness+=1.0;
+	}
+	fprintf(f, "module layer_%s_%s_%d() {\n", scad_group_name, is_pos ? "pos" : "neg", scad_layer_cnt);
+	fprintf(f, "	color([%s])\n", scad_group_color);
+	fprintf(f, "		translate([0,0,%f]) {\n", h);
+	layer_open = 1;
+
+}
+
+
+static void scad_new_layer_group(const char *group_name, int level, const char *color)
+{
+	scad_close_layer_group();
+
+	scad_group_name = group_name;
+	scad_group_level = level;
+	scad_group_color = color;
+	scad_group_level = level;
+}
+
+
+static void openscad_do_export(pcb_hid_attr_val_t * options)
+{
+	const char *filename;
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+
+	if (!options) {
+		openscad_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			openscad_values[i] = openscad_attribute_list[i].default_val;
+		options = openscad_values;
+	}
+
+	filename = options[HA_openscadfile].str_value;
+	if (!filename)
+		filename = "pcb.openscad";
+
+	f = pcb_fopen(filename, "wb");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	pcb_hid_save_and_show_layer_ons(save_ons);
+
+	scad_layer_cnt = 0;
+	scad_draw_primitives();
+
+	if (scad_draw_outline() < 0)
+		return;
+
+	gds_init(&layer_group_calls);
+	gds_init(&model_calls);
+	vti0_init(&scad_comp);
+
+	if (openscad_attribute_list[HA_models].default_val.int_value)
+		scad_insert_models();
+
+	openscad_hid_export_to_file(f, options);
+	scad_close_layer_group();
+
+	if (openscad_attribute_list[HA_drill].default_val.int_value)
+		scad_draw_drills();
+
+	scad_draw_finish();
+
+	pcb_hid_restore_layer_ons(save_ons);
+
+	gds_uninit(&layer_group_calls);
+	gds_uninit(&model_calls);
+	vti0_uninit(&scad_comp);
+
+	fclose(f);
+	f = NULL;
+}
+
+static int openscad_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]), openscad_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+
+
+static int openscad_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	if (flags & PCB_LYT_INVIS)
+		return 0;
+
+	if (flags & PCB_LYT_OUTLINE) {
+		return 0;
+	}
+
+	if (flags & PCB_LYT_PDRILL)
+		return 0;
+
+	if (flags & PCB_LYT_UDRILL)
+		return 0;
+
+	if (flags & PCB_LYT_MASK) {
+		if (!openscad_attribute_list[HA_mask].default_val.int_value)
+			return 0;
+		if (flags & PCB_LYT_TOP) {
+			scad_new_layer_group("top_mask", +2, "0,0.7,0,0.5");
+			return 1;
+		}
+		if (flags & PCB_LYT_BOTTOM) {
+			scad_new_layer_group("bottom_mask", -2, "0,0.7,0,0.5");
+			return 1;
+		}
+	}
+
+	if (flags & PCB_LYT_SILK) {
+		if (!openscad_attribute_list[HA_silk].default_val.int_value)
+			return 0;
+		if (flags & PCB_LYT_TOP) {
+			scad_new_layer_group("top_silk", +3, "0,0,0");
+			return 1;
+		}
+		if (flags & PCB_LYT_BOTTOM) {
+			scad_new_layer_group("bottom_silk", -3, "0,0,0");
+			return 1;
+		}
+	}
+
+	if (flags & PCB_LYT_COPPER) {
+		if (!openscad_attribute_list[HA_copper].default_val.int_value)
+			return 0;
+		if (flags & PCB_LYT_TOP) {
+			scad_new_layer_group("top_copper", +1, "1,0.4,0.2");
+			return 1;
+		}
+		if (flags & PCB_LYT_BOTTOM) {
+			scad_new_layer_group("bottom_copper", -1, "1,0.4,0.2");
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
+static pcb_hid_gc_t openscad_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
+	rv->me_pointer = &openscad_hid;
+	return rv;
+}
+
+static void openscad_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void openscad_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			scad_new_layer(1);
+			break;
+		case PCB_HID_COMP_NEGATIVE:
+			scad_new_layer(0);
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			scad_close_layer();
+			break;
+	}
+}
+
+static void openscad_set_color(pcb_hid_gc_t gc, const char *name)
+{
+}
+
+static void openscad_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void openscad_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+
+static void openscad_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+#define fix_rect_coords() \
+	if (x1 > x2) {\
+		pcb_coord_t t = x1; \
+		x1 = x2; \
+		x2 = t; \
+	} \
+	if (y1 > y2) { \
+		pcb_coord_t t = y1; \
+		y1 = y2; \
+		y2 = t; \
+	}
+
+
+static void openscad_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	TRX(x1); TRY(y1);
+	TRX(x2); TRY(y2);
+
+	fix_rect_coords();
+	pcb_fprintf(f, "			pcb_fill_rect(%mm, %mm, %mm, %mm, %f, %f);\n",
+		x1, y1, x2, y2, 0.0, effective_layer_thickness);
+}
+
+static void openscad_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double length, angle;
+	const char *cap_style;
+
+	TRX(x1); TRY(y1);
+	TRX(x2); TRY(y2);
+
+	length = pcb_distance(x1, y1, x2, y2);
+	angle = atan2((double)y2-y1, (double)x2-x1);
+
+	if (gc->cap == pcb_cap_square)
+		cap_style = "sc";
+	else
+		cap_style = "rc";
+
+	pcb_fprintf(f, "			pcb_line_%s(%mm, %mm, %mm, %f, %mm, %f);\n", cap_style,
+		x1, y1, (pcb_coord_t)pcb_round(length), angle * PCB_RAD_TO_DEG, gc->width, effective_layer_thickness);
+}
+
+static void openscad_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	TRX(x1); TRY(y1);
+	TRX(x2); TRY(y2);
+
+	fix_rect_coords();
+	openscad_draw_line(gc, x1, y1, x2, y1);
+	openscad_draw_line(gc, x2, y1, x2, y2);
+	openscad_draw_line(gc, x2, y2, x1, y2);
+	openscad_draw_line(gc, x1, y2, x1, y1);
+}
+
+static void openscad_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	double a, step = delta_angle/10.0, end_angle = start_angle + delta_angle;
+	int first;
+	pcb_coord_t lx, ly, x, y;
+
+	if (step < 1)
+		step = 1;
+	if (step > 10)
+		step = 10;
+
+	/* only recent versions support angle for rotate_extrude(), so use line approximation for now */
+	fprintf(f, "			// line-approx arc %f .. %f by %f\n", start_angle, end_angle, step);
+
+	for(first = 1, a = start_angle; step > 0 ? (a < end_angle) : (a > end_angle); a += step) {
+		x = (double)cx + cos((180-a) / PCB_RAD_TO_DEG) * (double)width;
+		y = (double)cy + sin((180-a) / PCB_RAD_TO_DEG) * (double)height;
+		if (!first) {
+			fprintf(f, "\t");
+			openscad_draw_line(gc, lx, ly, x, y);
+		}
+		lx = x;
+		ly = y;
+		first = 0;
+	}
+	x = (double)cx + cos((180 - end_angle) / PCB_RAD_TO_DEG) * (double)width;
+	y = (double)cy + sin((180 - end_angle) / PCB_RAD_TO_DEG) * (double)height;
+	fprintf(f, "\t");
+	openscad_draw_line(gc, lx, ly, x, y);
+}
+
+static void openscad_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	TRX(cx); TRY(cy);
+
+	pcb_fprintf(f, "			pcb_fcirc(%mm, %mm, %mm, %f);\n", cx, cy, radius, effective_layer_thickness);
+}
+
+static void openscad_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int n;
+	fprintf(f, "			pcb_fill_poly([");
+	for(n = 0; n < n_coords-1; n++)
+		pcb_fprintf(f, "[%mm,%mm],", TRX_(x[n]+dx), TRY_(y[n]+dy));
+	pcb_fprintf(f, "[%mm,%mm]], %f);\n", TRX_(x[n]+dx), TRY_(y[n]+dy), effective_layer_thickness);
+}
+
+static void openscad_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	openscad_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+static void openscad_calibrate(double xval, double yval)
+{
+	pcb_message(PCB_MSG_ERROR, "openscad_calibrate() not implemented");
+	return;
+}
+
+static void openscad_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int openscad_usage(const char *topic)
+{
+	fprintf(stderr, "\nopenscad exporter command line arguments:\n\n");
+	pcb_hid_usage(openscad_attribute_list, sizeof(openscad_attribute_list) / sizeof(openscad_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x openscad [openscad options] foo.pcb\n\n");
+	return 0;
+}
+
+
+static const char pcb_acts_scad_export_poly[] = "ScadExportPoly(filename)\n";
+static const char pcb_acth_scad_export_poly[] = "exports all selected polygons to an openscad script; only the outmost contour of each poly is exported";
+static fgw_error_t pcb_act_scad_export_poly(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	FILE *f;
+	const char *name;
+
+	PCB_ACT_CONVARG(1, FGW_STR, scad_export_poly, name = argv[1].val.str);
+
+	f = pcb_fopen(name, "w");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to open %s for writing\n", name);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+
+	PCB_POLY_ALL_LOOP(PCB->Data); {
+		pcb_poly_it_t it;
+		pcb_polyarea_t *pa;
+
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+			continue;
+
+		/* iterate over all islands of a polygon */
+		for(pa = pcb_poly_island_first(polygon, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+			pcb_coord_t x, y;
+			pcb_pline_t *pl;
+			int go;
+
+			/* check if we have a contour for the given island */
+			pl = pcb_poly_contour(&it);
+			if (pl != NULL) {
+				int cnt;
+
+				fprintf(f, "polygon([");
+				/* iterate over the vectors of the contour */
+				for(go = pcb_poly_vect_first(&it, &x, &y),cnt = 0; go; go = pcb_poly_vect_next(&it, &x, &y), cnt++)
+					pcb_fprintf(f, "%s[%mm,%mm]", (cnt > 0 ? "," : ""), x, y);
+				fprintf(f, "]);\n");
+			}
+		}
+	} PCB_ENDALL_LOOP;
+
+	fclose(f);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static pcb_action_t scad_action_list[] = {
+	{"ExportScadPoly", pcb_act_scad_export_poly, pcb_acth_scad_export_poly, pcb_acts_scad_export_poly}
+};
+
+PCB_REGISTER_ACTIONS(scad_action_list, openscad_cookie)
+
+#include "dolists.h"
+
+int pplg_check_ver_export_openscad(int ver_needed) { return 0; }
+
+void pplg_uninit_export_openscad(void)
+{
+	pcb_hid_remove_attributes_by_cookie(openscad_cookie);
+	pcb_remove_actions_by_cookie(openscad_cookie);
+}
+
+int pplg_init_export_openscad(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&openscad_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&openscad_hid);
+	pcb_dhlp_draw_helpers_init(&openscad_hid);
+
+	openscad_hid.struct_size = sizeof(pcb_hid_t);
+	openscad_hid.name = "openscad";
+	openscad_hid.description = "OpenSCAD exporter";
+	openscad_hid.exporter = 1;
+
+	openscad_hid.get_export_options = openscad_get_export_options;
+	openscad_hid.do_export = openscad_do_export;
+	openscad_hid.parse_arguments = openscad_parse_arguments;
+	openscad_hid.set_layer_group = openscad_set_layer_group;
+	openscad_hid.make_gc = openscad_make_gc;
+	openscad_hid.destroy_gc = openscad_destroy_gc;
+	openscad_hid.set_drawing_mode = openscad_set_drawing_mode;
+	openscad_hid.set_color = openscad_set_color;
+	openscad_hid.set_line_cap = openscad_set_line_cap;
+	openscad_hid.set_line_width = openscad_set_line_width;
+	openscad_hid.set_draw_xor = openscad_set_draw_xor;
+	openscad_hid.draw_line = openscad_draw_line;
+	openscad_hid.draw_arc = openscad_draw_arc;
+	openscad_hid.draw_rect = openscad_draw_rect;
+	openscad_hid.fill_circle = openscad_fill_circle;
+	openscad_hid.fill_polygon = openscad_fill_polygon;
+	openscad_hid.fill_polygon_offs = openscad_fill_polygon_offs;
+	openscad_hid.fill_rect = openscad_fill_rect;
+	openscad_hid.calibrate = openscad_calibrate;
+	openscad_hid.set_crosshair = openscad_set_crosshair;
+
+	openscad_hid.usage = openscad_usage;
+
+	pcb_hid_register_hid(&openscad_hid);
+
+	PCB_REGISTER_ACTIONS(scad_action_list, openscad_cookie)
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_openscad/export_openscad.pup
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/export_openscad.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/export_openscad.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short openscad pcb_exporter
+$long Export openscad
+$state WIP
+$fmt-native no
+$fmt-feature-w export a colored 3D model as an openscad script
+$package export
+dep lib_polyhelp
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_openscad/scad_draw.c
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/scad_draw.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/scad_draw.c	(revision 18980)
@@ -0,0 +1,170 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "../lib_polyhelp/topoly.h"
+#include "plug_io.h"
+
+#define TRX_(x) (x)
+#define TRY_(y) (PCB->MaxHeight - (y))
+
+#define TRX(x)
+#define TRY(y) y = TRY_(y)
+
+static void scad_draw_primitives(void)
+{
+	fprintf(f, "// Round cap line\n");
+	fprintf(f, "module pcb_line_rc(x1, y1, length, angle, width, thick) {\n");
+	fprintf(f, "	translate([x1,y1,0]) {\n");
+	fprintf(f, "		rotate([0,0,angle]) {\n");
+	fprintf(f, "			translate([length/2, 0, 0])\n");
+	fprintf(f, "				cube([length, width, thick], center=true);\n");
+	fprintf(f, "			cylinder(r=width/2, h=thick, center=true, $fn=30);\n");
+	fprintf(f, "			translate([length, 0, 0])\n");
+	fprintf(f, "				cylinder(r=width/2, h=thick, center=true, $fn=30);\n");
+	fprintf(f, "		}\n");
+	fprintf(f, "	}\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "// Square cap line\n");
+	fprintf(f, "module pcb_line_sc(x1, y1, length, angle, width, thick) {\n");
+	fprintf(f, "	translate([x1,y1,0]) {\n");
+	fprintf(f, "		rotate([0,0,angle]) {\n");
+	fprintf(f, "			translate([length/2, 0, 0])\n");
+	fprintf(f, "				cube([length + width, width, thick], center=true);\n");
+	fprintf(f, "		}\n");
+	fprintf(f, "	}\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "// filled rectangle\n");
+	fprintf(f, "module pcb_fill_rect(x1, y1, x2, y2, angle, thick) {\n");
+	fprintf(f, "	translate([(x1+x2)/2,(y1+y2)/2,0])\n");
+	fprintf(f, "		rotate([0,0,angle])\n");
+	fprintf(f, "			cube([x2-x1, y2-y1, thick], center=true);\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "// filled polygon\n");
+	fprintf(f, "module pcb_fill_poly(coords, thick) {\n");
+	fprintf(f, "	linear_extrude(height=thick)\n");
+	fprintf(f, "		polygon(coords);\n");
+	fprintf(f, "}\n");
+
+	fprintf(f, "// filled circle\n");
+	fprintf(f, "module pcb_fcirc(x1, y1, radius, thick) {\n");
+	fprintf(f, "	translate([x1,y1,0])\n");
+	fprintf(f, "		cylinder(r=radius, h=thick, center=true, $fn=30);\n");
+	fprintf(f, "}\n");
+}
+
+static int scad_draw_outline(void)
+{
+	pcb_any_obj_t *start = pcb_topoly_find_1st_outline(PCB);
+	pcb_poly_t *poly;
+	int n;
+
+	if (start == NULL) {
+		poly = pcb_poly_alloc(PCB->Data->Layer);
+		pcb_poly_point_new(poly, 0, 0);
+		pcb_poly_point_new(poly, PCB->MaxWidth, 0);
+		pcb_poly_point_new(poly, PCB->MaxWidth, PCB->MaxHeight);
+		pcb_poly_point_new(poly, 0, PCB->MaxHeight);
+	}
+	else {
+		poly = pcb_topoly_conn(PCB, start, PCB_TOPOLY_FLOATING);
+		if (poly == NULL)
+			return -1;
+	}
+
+	fprintf(f, "module pcb_outline() {\n");
+	fprintf(f, "	polygon([\n\t\t");
+	/* we need the as-drawn polygon and we know there are no holes */
+	for(n = 0; n < poly->PointN; n++)
+		pcb_fprintf(f, "[%mm,%mm]%s", TRX_(poly->Points[n].X), TRY_(poly->Points[n].Y), ((n < (poly->PointN-1)) ? "," : "\n"));
+	fprintf(f, "	]);\n");
+	fprintf(f, "}\n");
+
+	pcb_poly_free(poly);
+	return 0;
+}
+
+static void scad_draw_pstk(const pcb_pstk_t *ps)
+{
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	if (proto == NULL) {
+		pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "failed to retrieve padstack prototype", "internal pcb-rnd error, please file a bugreport");
+		return;
+	}
+
+#warning padstack TODO: this ignores bbvias
+	if (proto->hdia > 0) {
+		pcb_fprintf(f, "	translate([%mm,%mm,0])\n", TRX_(ps->x), TRY_(ps->y));
+		pcb_fprintf(f, "		cylinder(r=%mm, h=4, center=true, $fn=30);\n", proto->hdia/2);
+	}
+}
+
+static void scad_draw_drills(void)
+{
+	pcb_rtree_it_t it;
+	pcb_box_t *obj;
+
+	fprintf(f, "module pcb_drill() {\n");
+
+	for(obj = pcb_r_first(PCB->Data->padstack_tree, &it); obj != NULL; obj = pcb_r_next(&it))
+		scad_draw_pstk((pcb_pstk_t *)obj);
+	pcb_r_end(&it);
+
+	fprintf(f, "}\n");
+}
+
+static void scad_draw_finish()
+{
+	fprintf(f, "module pcb_board_main() {\n");
+	fprintf(f, "	translate ([0, 0, -0.8])\n");
+	fprintf(f, "		linear_extrude(height=1.6)\n");
+	fprintf(f, "			pcb_outline();\n");
+	fprintf(f, "%s", layer_group_calls.array);
+	fprintf(f, "}\n");
+	fprintf(f, "\n");
+
+	fprintf(f, "module pcb_board() {\n");
+	fprintf(f, "	intersection() {\n");
+	fprintf(f, "		translate ([0, 0, -4])\n");
+	fprintf(f, "			linear_extrude(height=8)\n");
+	fprintf(f, "				pcb_outline();\n");
+	fprintf(f, "		union() {\n");
+	fprintf(f, "			difference() {\n");
+	fprintf(f, "				pcb_board_main();\n");
+	if (openscad_attribute_list[HA_drill].default_val.int_value)
+		fprintf(f, "				pcb_drill();\n");
+	fprintf(f, "			}\n");
+	fprintf(f, "		}\n");
+	fprintf(f, "	}\n");
+	fprintf(f, "%s", model_calls.array);
+	fprintf(f, "}\n");
+	fprintf(f, "\n");
+
+	fprintf(f, "pcb_board();\n");
+}
Index: tags/2.0.1/src_plugins/export_openscad/scad_models.c
===================================================================
--- tags/2.0.1/src_plugins/export_openscad/scad_models.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_openscad/scad_models.c	(revision 18980)
@@ -0,0 +1,135 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "conf_core.h"
+
+static void scad_insert_model(htsp_t *models, const char *name, pcb_coord_t x0, pcb_coord_t y0, double rot, int on_bottom, const char *transf, const char *param)
+{
+	FILE *fin;
+	char *ref;
+
+	if (!htsp_has(models, name)) {
+		char buff[1024], *full_path;
+		fin = pcb_fopen_first(&conf_core.rc.library_search_paths, name, "r", &full_path, pcb_true);
+
+		if (fin != NULL) {
+			char *s, *safe_name = pcb_strdup(name);
+			for(s = safe_name; *s != '\0'; s++)
+				if (!isalnum(*s))
+					*s = '_';
+
+			fprintf(f, "// Model loaded from '%s'\n", full_path);
+			free(full_path);
+
+			/* replace the module line */
+			while(fgets(buff, sizeof(buff), fin) != NULL) {
+				if (strstr(buff, "module") != NULL) {
+					fprintf(f, "module pcb_part_%s()", safe_name);
+					if (strchr(buff, '{') != NULL)
+						fprintf(f, "{\n");
+					else
+						fprintf(f, "\n");
+					break;
+				}
+				fprintf(f, "%s", buff);
+			}
+			
+			/* copy the rest */
+			while(fgets(buff, sizeof(buff), fin) != NULL) {
+				fprintf(f, "%s", buff);
+			}
+			fclose(fin);
+			pcb_snprintf(buff, sizeof(buff), "pcb_part_%s", safe_name);
+			htsp_set(models, (char *)name, pcb_strdup(buff));
+			free(safe_name);
+		}
+		else {
+			htsp_set(models, (char *)name, NULL);
+			pcb_message(PCB_MSG_WARNING, "openscad: can't find model file for %s in the footprint library\n", name);
+		}
+	}
+	ref = htsp_get(models, (char *)name);
+	if (ref != NULL) {
+		char tab[] = "\t\t\t\t\t\t\t\t";
+		int ind = 0;
+		pcb_append_printf(&model_calls, "	translate([%mm,%mm,%c0.8])\n", x0, y0, on_bottom ? '-' : '+');
+		ind++;
+		tab[ind] = '\0';
+
+		if (on_bottom) {
+			pcb_append_printf(&model_calls, "	%smirror([0,0,1])\n", tab);
+			tab[ind] = '\t'; ind++; tab[ind] = '\0';
+		}
+		if (rot != 0) {
+			pcb_append_printf(&model_calls, "	%srotate([0,0,%f])\n", tab, rot);
+			tab[ind] = '\t'; ind++; tab[ind] = '\0';
+		}
+		if (transf != NULL) {
+			pcb_append_printf(&model_calls, "	%s%s\n", tab, transf);
+			tab[ind] = '\t'; ind++; tab[ind] = '\0';
+		}
+
+		
+		if (param != NULL)
+			pcb_append_printf(&model_calls, "	%s%s(%s);\n", tab, ref, param);
+		else
+			pcb_append_printf(&model_calls, "	%s%s();\n", tab, ref);
+	}
+}
+
+static void scad_insert_models(void)
+{
+	htsp_t models;
+	const char *mod, *transf, *param;
+	htsp_entry_t *e;
+
+	htsp_init(&models, strhash, strkeyeq);
+
+	PCB_SUBC_LOOP(PCB->Data); {
+		mod = pcb_attribute_get(&subc->Attributes, "openscad");
+		if (mod != NULL) {
+			pcb_coord_t ox, oy;
+			double rot = 0;
+			int on_bottom = 0;
+			
+			if (pcb_subc_get_origin(subc, &ox, &oy) != 0) {
+				pcb_io_incompat_save(PCB->Data, (pcb_any_obj_t *)subc, "Failed to get origin of subcircuit", "fix the missing subc-aux layer");
+				continue;
+			}
+			pcb_subc_get_rotation(subc, &rot);
+			pcb_subc_get_side(subc, &on_bottom);
+
+			transf = pcb_attribute_get(&subc->Attributes, "openscad-transformation");
+			param = pcb_attribute_get(&subc->Attributes, "openscad-param");
+			scad_insert_model(&models, mod, TRX_(ox), TRY_(oy), rot, on_bottom, transf, param);
+		}
+	} PCB_END_LOOP;
+
+	for (e = htsp_first(&models); e; e = htsp_next(&models, e))
+		free(e->value);
+
+	htsp_uninit(&models);
+}
Index: tags/2.0.1/src_plugins/export_png/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_png/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_png/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_png
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_png/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_png/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_png/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,16 @@
+put /local/pcb/mod {export_png}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_png/png.o @]
+
+switch /local/pcb/export_png/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/LDFLAGS         libs/gui/gd/ldflags
+		put /local/pcb/mod/CFLAGS          libs/gui/gd/cflags
+		end
+end
+
+switch /local/pcb/export_png/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_png/export_png.pup
===================================================================
--- tags/2.0.1/src_plugins/export_png/export_png.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_png/export_png.pup	(revision 18980)
@@ -0,0 +1,11 @@
+$class export
+$short png/gif/jpg pcb_exporter
+$long Export to png, gif and jpeg
+$state works
+$fmt-native no
+$fmt-feature-w render the on-screen version or emulated photo mode version in .png
+$fmt-feature-w render the on-screen version or emulated photo mode version in .gif
+$fmt-feature-w render the on-screen version or emulated photo mode version in .jpeg
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_png/png.c
===================================================================
--- tags/2.0.1/src_plugins/export_png/png.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_png/png.c	(revision 18980)
@@ -0,0 +1,1910 @@
+ /*
+  *                            COPYRIGHT
+  *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+  *  Copyright (C) 2006 Dan McMahill
+  *
+  *  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 2 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, write to the Free Software
+  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+  */
+
+/*
+ *  Heavily based on the ps HID written by DJ Delorie
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "layer.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "plugins.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "png.h"
+
+/* the gd library which makes this all so easy */
+#include <gd.h>
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+#define PNG_SCALE_HACK1 0
+#include "compat_misc.h"
+#define pcb_hack_round(d) pcb_round(d)
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented PNG function %s.\n", func); abort()
+
+static pcb_hid_t png_hid;
+
+const char *png_cookie = "png HID";
+
+static pcb_cam_t png_cam;
+
+static void *color_cache = NULL;
+static void *brush_cache = NULL;
+
+static double bloat = 0;
+static double scale = 1;
+static pcb_coord_t x_shift = 0;
+static pcb_coord_t y_shift = 0;
+static int show_solder_side;
+#define SCALE(w)   ((int)pcb_round((w)/scale))
+#define SCALE_X(x) ((int)pcb_hack_round(((x) - x_shift)/scale))
+#define SCALE_Y(y) ((int)pcb_hack_round(((show_solder_side ? (PCB->MaxHeight-(y)) : (y)) - y_shift)/scale))
+#define SWAP_IF_SOLDER(a,b) do { int c; if (show_solder_side) { c=a; a=b; b=c; }} while (0)
+
+/* Used to detect non-trivial outlines */
+#define NOT_EDGE_X(x) ((x) != 0 && (x) != PCB->MaxWidth)
+#define NOT_EDGE_Y(y) ((y) != 0 && (y) != PCB->MaxHeight)
+#define NOT_EDGE(x,y) (NOT_EDGE_X(x) || NOT_EDGE_Y(y))
+
+static void png_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+
+/* The result of a failed gdImageColorAllocate() call */
+#define BADC -1
+
+typedef struct color_struct {
+	/* the descriptor used by the gd library */
+	int c;
+
+	/* so I can figure out what rgb value c refers to */
+	unsigned int r, g, b, a;
+
+} color_struct;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	int width;
+	unsigned char r, g, b;
+	color_struct *color;
+	gdImagePtr brush;
+	int is_erase;
+} hid_gc_s;
+
+static color_struct *black = NULL, *white = NULL;
+static gdImagePtr im = NULL, master_im, comp_im = NULL, erase_im = NULL;
+static FILE *f = 0;
+static int linewidth = -1;
+static int lastgroup = -1;
+static gdImagePtr lastbrush = (gdImagePtr) ((void *) -1);
+static int lastcap = -1;
+static int last_color_r, last_color_g, last_color_b, last_cap;
+
+/* For photo-mode we need the following layers as monochrome masks:
+
+   top soldermask
+   top silk
+   copper layers
+   drill
+*/
+
+#define PHOTO_FLIP_X	1
+#define PHOTO_FLIP_Y	2
+
+static int photo_mode, photo_flip;
+static gdImagePtr photo_copper[PCB_MAX_LAYER + 2];
+static gdImagePtr photo_silk, photo_mask, photo_drill, *photo_im;
+static gdImagePtr photo_outline;
+static int photo_groups[PCB_MAX_LAYERGRP + 2], photo_ngroups;
+static int photo_has_inners;
+
+static int doing_outline, have_outline;
+
+#define FMT_gif "GIF"
+#define FMT_jpg "JPEG"
+#define FMT_png "PNG"
+
+/* If this table has no elements in it, then we have no reason to
+   register this HID and will refrain from doing so at the end of this
+   file.  */
+
+#undef HAVE_SOME_FORMAT
+
+static const char *filetypes[] = {
+#ifdef HAVE_GDIMAGEPNG
+	FMT_png,
+#define HAVE_SOME_FORMAT 1
+#endif
+
+#ifdef HAVE_GDIMAGEGIF
+	FMT_gif,
+#define HAVE_SOME_FORMAT 1
+#endif
+
+#ifdef HAVE_GDIMAGEJPEG
+	FMT_jpg,
+#define HAVE_SOME_FORMAT 1
+#endif
+
+	NULL
+};
+
+static const char *mask_colour_names[] = {
+	"green",
+	"red",
+	"blue",
+	"purple",
+	"black",
+	"white",
+	NULL
+};
+
+/*  These values were arrived at through trial and error.
+    One potential improvement (especially for white) is
+    to use separate color_structs for the multiplication
+    and addition parts of the mask math.
+ */
+static const color_struct mask_colours[] = {
+#define MASK_COLOUR_GREEN 0
+	{0x3CA03CFF, 60, 160, 60, 255},
+#define MASK_COLOUR_RED 1
+	{0x8C1919FF, 140, 25, 25, 255},
+#define MASK_COLOUR_BLUE 2
+	{0x3232A0FF, 50, 50, 160, 255},
+#define MASK_COLOUR_PURPLE 3
+	{0x3C1446FF, 60, 20, 70, 255},
+#define MASK_COLOUR_BLACK 4
+	{0x141414FF, 20, 20, 20, 255},
+#define MASK_COLOUR_WHITE 5
+	{0xA7E6A2FF, 167, 230, 162, 255}	/* <-- needs improvement over FR4 */
+};
+
+static const char *plating_type_names[] = {
+#define PLATING_TIN 0
+	"tinned",
+#define PLATING_GOLD 1
+	"gold",
+#define PLATING_SILVER 2
+	"silver",
+#define PLATING_COPPER 3
+	"copper",
+	NULL
+};
+
+static const char *silk_colour_names[] = {
+	"white",
+	"black",
+	"yellow",
+	NULL
+};
+
+static const color_struct silk_colours[] = {
+#define SILK_COLOUR_WHITE 0
+	{0xE0E0E0FF, 224, 224, 224, 255},
+#define SILK_COLOUR_BLACK 1
+	{0x0E0E0EFF, 14, 14, 14, 255},
+#define SILK_COLOUR_YELLOW 2
+	{0xB9B90AFF, 185, 185, 10, 255}
+};
+
+static const color_struct silk_top_shadow = {0x151515FF, 21, 21, 21, 255};
+static const color_struct silk_bottom_shadow = {0x0E0E0EFF, 14, 14, 14, 255};
+
+pcb_hid_attribute_t png_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --outfile <string>
+Name of the file to be exported to. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"outfile", "Graphics output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_pngfile 0
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --dpi
+Scale factor in pixels/inch. Set to 0 to scale to size specified in the layout.
+@end ftable
+%end-doc
+*/
+	{"dpi", "Scale factor (pixels/inch). 0 to scale to specified size",
+	 PCB_HATT_INTEGER, 0, 10000, {100, 0, 0}, 0, 0},
+#define HA_dpi 1
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --x-max
+Width of the png image in pixels. No constraint, when set to 0.
+@end ftable
+%end-doc
+*/
+	{"x-max", "Maximum width (pixels).  0 to not constrain",
+	 PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+#define HA_xmax 2
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --y-max
+Height of the png output in pixels. No constraint, when set to 0.
+@end ftable
+%end-doc
+*/
+	{"y-max", "Maximum height (pixels).  0 to not constrain",
+	 PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+#define HA_ymax 3
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --xy-max
+Maximum width and height of the PNG output in pixels. No constraint, when set to 0.
+@end ftable
+%end-doc
+*/
+	{"xy-max", "Maximum width and height (pixels).  0 to not constrain",
+	 PCB_HATT_INTEGER, 0, 10000, {0, 0, 0}, 0, 0},
+#define HA_xymax 4
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --as-shown
+Export layers as shown on screen.
+@end ftable
+%end-doc
+*/
+	{"as-shown", "Export layers as shown on screen",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_as_shown 5
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --monochrome
+Convert output to monochrome.
+@end ftable
+%end-doc
+*/
+	{"monochrome", "Convert to monochrome",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_mono 6
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --only-vivible
+Limit the bounds of the exported PNG image to the visible items.
+@end ftable
+%end-doc
+*/
+	{"only-visible", "Limit the bounds of the PNG image to the visible items",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_only_visible 7
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --use-alpha
+Make the background and any holes transparent.
+@end ftable
+%end-doc
+*/
+	{"use-alpha", "Make the background and any holes transparent",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_use_alpha 8
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --format <string>
+File format to be exported. Parameter @code{<string>} can be @samp{PNG},
+@samp{GIF}, or @samp{JPEG}.
+@end ftable
+%end-doc
+*/
+	{"format", "Export file format",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, filetypes, 0},
+#define HA_filetype 9
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --png-bloat <num><dim>
+Amount of extra thickness to add to traces, pads, or pin edges. The parameter
+@samp{<num><dim>} is a number, appended by a dimension @samp{mm}, @samp{mil}, or
+@samp{pix}. If no dimension is given, the default dimension is 1/100 mil.
+@end ftable
+%end-doc
+*/
+	{"png-bloat", "Amount (in/mm/mil/pix) to add to trace/pad/pin edges (1 = 1/100 mil)",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_bloat 10
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@cindex photo-mode
+@item --photo-mode
+Export a photo realistic image of the layout.
+@end ftable
+%end-doc
+*/
+	{"photo-mode", "Photo-realistic export mode",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_photo_mode 11
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --photo-flip-x
+In photo-realistic mode, export the reverse side of the layout. Left-right flip.
+@end ftable
+%end-doc
+*/
+	{"photo-flip-x", "Show reverse side of the board, left-right flip",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_photo_flip_x 12
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@item --photo-flip-y
+In photo-realistic mode, export the reverse side of the layout. Up-down flip.
+@end ftable
+%end-doc
+*/
+	{"photo-flip-y", "Show reverse side of the board, up-down flip",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_photo_flip_y 13
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@cindex photo-mask-colour
+@item --photo-mask-colour <colour>
+In photo-realistic mode, export the solder mask as this colour. Parameter
+@code{<colour>} can be @samp{green}, @samp{red}, @samp{blue}, or @samp{purple}.
+@end ftable
+%end-doc
+*/
+	{"photo-mask-colour", "Colour for the exported colour mask (green, red, blue, purple)",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, mask_colour_names, 0},
+#define HA_photo_mask_colour 14
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@cindex photo-plating
+@item --photo-plating
+In photo-realistic mode, export the exposed copper as though it has this type
+of plating. Parameter @code{<colour>} can be @samp{tinned}, @samp{gold},
+@samp{silver}, or @samp{copper}.
+@end ftable
+%end-doc
+*/
+	{"photo-plating", "Type of plating applied to exposed copper in photo-mode (tinned, gold, silver, copper)",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, plating_type_names, 0},
+#define HA_photo_plating 15
+
+/* %start-doc options "93 PNG Options"
+@ftable @code
+@cindex photo-silk-colour
+@item --photo-silk-colour
+In photo-realistic mode, export the silk screen as this colour. Parameter
+@code{<colour>} can be @samp{white}, @samp{black}, or @samp{yellow}.
+@end ftable
+%end-doc
+*/
+	{"photo-silk-colour", "Colour for the exported colour silk (white, black, yellow)",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, silk_colour_names, 0},
+#define HA_photo_silk_colour 16
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cam 17
+
+	{"ben-mode", ATTR_UNDOCUMENTED,
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_ben_mode 11
+
+	{"ben-flip-x", ATTR_UNDOCUMENTED,
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_ben_flip_x 12
+
+	{"ben-flip-y", ATTR_UNDOCUMENTED,
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0}
+#define HA_ben_flip_y 13
+
+};
+
+#define NUM_OPTIONS (sizeof(png_attribute_list)/sizeof(png_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(png_attribute_list, png_cookie)
+
+static pcb_hid_attr_val_t png_values[NUM_OPTIONS];
+
+static const char *get_file_suffix(void)
+{
+	const char *result = NULL;
+	const char *fmt;
+
+	fmt = filetypes[png_attribute_list[HA_filetype].default_val.int_value];
+
+	if (fmt == NULL) { /* Do nothing */ }
+	else if (strcmp(fmt, FMT_gif) == 0)
+		result = ".gif";
+	else if (strcmp(fmt, FMT_jpg) == 0)
+		result = ".jpg";
+	else if (strcmp(fmt, FMT_png) == 0)
+		result = ".png";
+
+	if (result == NULL) {
+		fprintf(stderr, "Error:  Invalid graphic file format\n");
+		result = ".???";
+	}
+	return result;
+}
+
+static pcb_hid_attribute_t *png_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = get_file_suffix();
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &png_attribute_list[HA_pngfile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return png_attribute_list;
+}
+
+
+static pcb_layergrp_id_t group_for_layer(int l)
+{
+	if (l < pcb_max_layer && l >= 0)
+		return pcb_layer_get_group(PCB, l);
+	/* else something unique */
+	return pcb_max_group(PCB) + 3 + l;
+}
+
+static int is_solder(pcb_layergrp_id_t grp)     { return pcb_layergrp_flags(PCB, grp) & PCB_LYT_BOTTOM; }
+static int is_component(pcb_layergrp_id_t grp)  { return pcb_layergrp_flags(PCB, grp) & PCB_LYT_TOP; }
+
+static int layer_sort(const void *va, const void *vb)
+{
+	int a = *(int *) va;
+	int b = *(int *) vb;
+	pcb_layergrp_id_t al = group_for_layer(a);
+	pcb_layergrp_id_t bl = group_for_layer(b);
+	int d = bl - al;
+
+	if (a >= 0 && a < pcb_max_layer) {
+		int aside = (is_solder(al) ? 0 : is_component(al) ? 2 : 1);
+		int bside = (is_solder(bl) ? 0 : is_component(bl) ? 2 : 1);
+
+		if (bside != aside)
+			return bside - aside;
+	}
+	if (d)
+		return d;
+	return b - a;
+}
+
+static const char *filename;
+static pcb_box_t *bounds;
+static int in_mono, as_shown;
+
+static void parse_bloat(const char *str)
+{
+	int n;
+	pcb_unit_list_t extra_units = {
+		{"pix", 0, 0},
+		{"px", 0, 0},
+		{"", 0, 0}
+	};
+	for(n = 0; n < (sizeof(extra_units)/sizeof(extra_units[0]))-1; n++)
+		extra_units[n].scale = scale;
+	if (str == NULL)
+		return;
+	bloat = pcb_get_value_ex(str, NULL, NULL, extra_units, "", NULL);
+}
+
+void png_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options)
+{
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_box_t tmp, region;
+	pcb_hid_expose_ctx_t ctx;
+
+	f = the_file;
+
+	region.X1 = 0;
+	region.Y1 = 0;
+	region.X2 = PCB->MaxWidth;
+	region.Y2 = PCB->MaxHeight;
+
+	if (options[HA_only_visible].int_value)
+		bounds = pcb_data_bbox(&tmp, PCB->Data, pcb_false);
+	else
+		bounds = &region;
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+
+	as_shown = options[HA_as_shown].int_value;
+	if (!options[HA_as_shown].int_value) {
+		conf_force_set_bool(conf_core.editor.thin_draw, 0);
+		conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+/*		conf_force_set_bool(conf_core.editor.check_planes, 0);*/
+		conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+		qsort(pcb_layer_stack, pcb_max_layer, sizeof(pcb_layer_stack[0]), layer_sort);
+
+		if (photo_mode) {
+			int i, n = 0;
+			pcb_layergrp_id_t solder_layer = -1, comp_layer = -1;
+	
+			pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_layer, 1);
+			pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_layer, 1);
+			assert(solder_layer >= 0);
+			assert(comp_layer >= 0);
+
+			photo_has_inners = 0;
+			if (comp_layer < solder_layer)
+				for (i = comp_layer; i <= solder_layer; i++) {
+					photo_groups[n++] = i;
+					if (i != comp_layer && i != solder_layer && !pcb_layergrp_is_empty(PCB, i))
+						photo_has_inners = 1;
+				}
+			else
+				for (i = comp_layer; i >= solder_layer; i--) {
+					photo_groups[n++] = i;
+					if (i != comp_layer && i != solder_layer && !pcb_layergrp_is_empty(PCB, i))
+						photo_has_inners = 1;
+				}
+			if (!photo_has_inners) {
+				photo_groups[1] = photo_groups[n - 1];
+				n = 2;
+			}
+			photo_ngroups = n;
+
+			if (photo_flip) {
+				for (i = 0, n = photo_ngroups - 1; i < n; i++, n--) {
+					int tmp = photo_groups[i];
+					photo_groups[i] = photo_groups[n];
+					photo_groups[n] = tmp;
+				}
+			}
+		}
+	}
+	linewidth = -1;
+	lastbrush = (gdImagePtr) ((void *) -1);
+	lastcap = -1;
+	lastgroup = -1;
+	show_solder_side = conf_core.editor.show_solder_side;
+	last_color_r = last_color_g = last_color_b = last_cap = -1;
+
+	in_mono = options[HA_mono].int_value;
+
+	if (!photo_mode && conf_core.editor.show_solder_side) {
+		int i, j;
+		for (i = 0, j = pcb_max_layer - 1; i < j; i++, j--) {
+			int k = pcb_layer_stack[i];
+			pcb_layer_stack[i] = pcb_layer_stack[j];
+			pcb_layer_stack[j] = k;
+		}
+	}
+
+	ctx.view = *bounds;
+	pcb_hid_expose_all(&png_hid, &ctx);
+
+	memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack));
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void clip(color_struct * dest, color_struct * source)
+{
+#define CLIP(var) \
+  dest->var = source->var;	\
+  if (dest->var > 255) dest->var = 255;	\
+  if (dest->var < 0)   dest->var = 0;
+
+	CLIP(r);
+	CLIP(g);
+	CLIP(b);
+#undef CLIP
+}
+
+static void blend(color_struct * dest, float a_amount, color_struct * a, color_struct * b)
+{
+	dest->r = a->r * a_amount + b->r * (1 - a_amount);
+	dest->g = a->g * a_amount + b->g * (1 - a_amount);
+	dest->b = a->b * a_amount + b->b * (1 - a_amount);
+}
+
+static void multiply(color_struct * dest, color_struct * a, color_struct * b)
+{
+	dest->r = (a->r * b->r) / 255;
+	dest->g = (a->g * b->g) / 255;
+	dest->b = (a->b * b->b) / 255;
+}
+
+static void add(color_struct * dest, double a_amount, const color_struct * a, double b_amount, const color_struct * b)
+{
+	dest->r = a->r * a_amount + b->r * b_amount;
+	dest->g = a->g * a_amount + b->g * b_amount;
+	dest->b = a->b * a_amount + b->b * b_amount;
+
+	clip(dest, dest);
+}
+
+static void subtract(color_struct * dest, double a_amount, const color_struct * a, double b_amount, const color_struct * b)
+{
+	dest->r = a->r * a_amount - b->r * b_amount;
+	dest->g = a->g * a_amount - b->g * b_amount;
+	dest->b = a->b * a_amount - b->b * b_amount;
+
+	clip(dest, dest);
+}
+
+static void rgb(color_struct * dest, int r, int g, int b)
+{
+	dest->r = r;
+	dest->g = g;
+	dest->b = b;
+}
+
+static int smshadows[3][3] = {
+	{1, 0, -1},
+	{0, 0, -1},
+	{-1, -1, -1},
+};
+
+static int shadows[5][5] = {
+	{1, 1, 0, 0, -1},
+	{1, 1, 1, -1, 0},
+	{0, 1, 0, -1, 0},
+	{0, -1, -1, -1, 0},
+	{-1, 0, 0, 0, -1},
+};
+
+/* black and white are 0 and 1 */
+#define TOP_SHADOW 2
+#define BOTTOM_SHADOW 3
+
+static void ts_bs(gdImagePtr im)
+{
+	int x, y, sx, sy, si;
+	for (x = 0; x < gdImageSX(im); x++)
+		for (y = 0; y < gdImageSY(im); y++) {
+			si = 0;
+			for (sx = -2; sx < 3; sx++)
+				for (sy = -2; sy < 3; sy++)
+					if (!gdImageGetPixel(im, x + sx, y + sy))
+						si += shadows[sx + 2][sy + 2];
+			if (gdImageGetPixel(im, x, y)) {
+				if (si > 1)
+					gdImageSetPixel(im, x, y, TOP_SHADOW);
+				else if (si < -1)
+					gdImageSetPixel(im, x, y, BOTTOM_SHADOW);
+			}
+		}
+}
+
+static void ts_bs_sm(gdImagePtr im)
+{
+	int x, y, sx, sy, si;
+	for (x = 0; x < gdImageSX(im); x++)
+		for (y = 0; y < gdImageSY(im); y++) {
+			si = 0;
+			for (sx = -1; sx < 2; sx++)
+				for (sy = -1; sy < 2; sy++)
+					if (!gdImageGetPixel(im, x + sx, y + sy))
+						si += smshadows[sx + 1][sy + 1];
+			if (gdImageGetPixel(im, x, y)) {
+				if (si > 1)
+					gdImageSetPixel(im, x, y, TOP_SHADOW);
+				else if (si < -1)
+					gdImageSetPixel(im, x, y, BOTTOM_SHADOW);
+			}
+		}
+}
+
+static void png_brush_free(void **vcache, const char *name, pcb_hidval_t *val)
+{
+	gdImage *brush = (gdImage *)val->ptr;
+	if (brush != NULL)
+		gdImageDestroy(brush);
+}
+
+static void png_color_free(void **vcache, const char *name, pcb_hidval_t *val)
+{
+	color_struct *color = (color_struct *)val->ptr;
+	free(color);
+}
+
+static void png_free_cache(void)
+{
+	if (color_cache)
+		pcb_hid_cache_color_destroy(&color_cache, png_color_free);
+	if (brush_cache != NULL)
+		pcb_hid_cache_color_destroy(&brush_cache, png_brush_free);
+}
+
+static void png_do_export(pcb_hid_attr_val_t * options)
+{
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+	pcb_box_t tmp, *bbox;
+	int w, h;
+	int xmax, ymax, dpi;
+	const char *fmt;
+	pcb_bool format_error = pcb_false;
+
+	png_free_cache();
+
+	if (!options) {
+		png_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			png_values[i] = png_attribute_list[i].default_val;
+		options = png_values;
+	}
+
+	pcb_cam_begin(PCB, &png_cam, options[HA_cam].str_value, png_attribute_list, NUM_OPTIONS, options);
+
+	if (options[HA_photo_mode].int_value || options[HA_ben_mode].int_value) {
+		photo_mode = 1;
+		options[HA_mono].int_value = 1;
+		options[HA_as_shown].int_value = 0;
+		memset(photo_copper, 0, sizeof(photo_copper));
+		photo_silk = photo_mask = photo_drill = 0;
+		photo_outline = 0;
+		if (options[HA_photo_flip_x].int_value || options[HA_ben_flip_x].int_value)
+			photo_flip = PHOTO_FLIP_X;
+		else if (options[HA_photo_flip_y].int_value || options[HA_ben_flip_y].int_value)
+			photo_flip = PHOTO_FLIP_Y;
+		else
+			photo_flip = 0;
+	}
+	else
+		photo_mode = 0;
+
+	filename = options[HA_pngfile].str_value;
+	if (!filename)
+		filename = "pcb-out.png";
+
+	/* figure out width and height of the board */
+	if (options[HA_only_visible].int_value) {
+		bbox = pcb_data_bbox(&tmp, PCB->Data, pcb_false);
+		x_shift = bbox->X1;
+		y_shift = bbox->Y1;
+		h = bbox->Y2 - bbox->Y1;
+		w = bbox->X2 - bbox->X1;
+	}
+	else {
+		x_shift = 0;
+		y_shift = 0;
+		h = PCB->MaxHeight;
+		w = PCB->MaxWidth;
+	}
+
+	/*
+	 * figure out the scale factor we need to make the image
+	 * fit in our specified PNG file size
+	 */
+	xmax = ymax = dpi = 0;
+	if (options[HA_dpi].int_value != 0) {
+		dpi = options[HA_dpi].int_value;
+		if (dpi < 0) {
+			fprintf(stderr, "ERROR:  dpi may not be < 0\n");
+			return;
+		}
+	}
+
+	if (options[HA_xmax].int_value > 0) {
+		xmax = options[HA_xmax].int_value;
+		dpi = 0;
+	}
+
+	if (options[HA_ymax].int_value > 0) {
+		ymax = options[HA_ymax].int_value;
+		dpi = 0;
+	}
+
+	if (options[HA_xymax].int_value > 0) {
+		dpi = 0;
+		if (options[HA_xymax].int_value < xmax || xmax == 0)
+			xmax = options[HA_xymax].int_value;
+		if (options[HA_xymax].int_value < ymax || ymax == 0)
+			ymax = options[HA_xymax].int_value;
+	}
+
+	if (xmax < 0 || ymax < 0) {
+		fprintf(stderr, "ERROR:  xmax and ymax may not be < 0\n");
+		return;
+	}
+
+	if (dpi > 0) {
+		/*
+		 * a scale of 1  means 1 pixel is 1 inch
+		 * a scale of 10 means 1 pixel is 10 inches
+		 */
+		scale = PCB_INCH_TO_COORD(1) / dpi;
+		w = pcb_round(w / scale) - PNG_SCALE_HACK1;
+		h = pcb_round(h / scale) - PNG_SCALE_HACK1;
+	}
+	else if (xmax == 0 && ymax == 0) {
+		fprintf(stderr, "ERROR:  You may not set both xmax, ymax," "and xy-max to zero\n");
+		return;
+	}
+	else {
+		if (ymax == 0 || ((xmax > 0)
+											&& ((w / xmax) > (h / ymax)))) {
+			h = (h * xmax) / w;
+			scale = w / xmax;
+			w = xmax;
+		}
+		else {
+			w = (w * ymax) / h;
+			scale = h / ymax;
+			h = ymax;
+		}
+	}
+
+	im = gdImageCreate(w, h);
+	if (im == NULL) {
+		pcb_message(PCB_MSG_ERROR, "png_do_export():  gdImageCreate(%d, %d) returned NULL.  Aborting export.\n", w, h);
+		return;
+	}
+
+	master_im = im;
+
+	parse_bloat(options[HA_bloat].str_value);
+
+	/* 
+	 * Allocate white and black -- the first color allocated
+	 * becomes the background color
+	 */
+
+	white = (color_struct *) malloc(sizeof(color_struct));
+	white->r = white->g = white->b = 255;
+	if (options[HA_use_alpha].int_value)
+		white->a = 127;
+	else
+		white->a = 0;
+	white->c = gdImageColorAllocateAlpha(im, white->r, white->g, white->b, white->a);
+	if (white->c == BADC) {
+		pcb_message(PCB_MSG_ERROR, "png_do_export():  gdImageColorAllocateAlpha() returned NULL.  Aborting export.\n");
+		return;
+	}
+
+	gdImageFilledRectangle(im, 0, 0, gdImageSX(im), gdImageSY(im), white->c);
+
+	black = (color_struct *) malloc(sizeof(color_struct));
+	black->r = black->g = black->b = black->a = 0;
+	black->c = gdImageColorAllocate(im, black->r, black->g, black->b);
+	if (black->c == BADC) {
+		pcb_message(PCB_MSG_ERROR, "png_do_export():  gdImageColorAllocateAlpha() returned NULL.  Aborting export.\n");
+		return;
+	}
+
+	f = pcb_fopen(png_cam.active ? png_cam.fn : filename, "wb");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	png_hid.force_compositing = !!photo_mode;
+
+	if ((!png_cam.active) && (!options[HA_as_shown].int_value))
+		pcb_hid_save_and_show_layer_ons(save_ons);
+
+	png_hid_export_to_file(f, options);
+
+	if ((!png_cam.active) && (!options[HA_as_shown].int_value))
+		pcb_hid_restore_layer_ons(save_ons);
+
+	if (photo_mode) {
+		int x, y, darken, lg;
+		color_struct white, black, fr4;
+
+		rgb(&white, 255, 255, 255);
+		rgb(&black, 0, 0, 0);
+		rgb(&fr4, 70, 70, 70);
+
+		im = master_im;
+
+		ts_bs(photo_copper[photo_groups[0]]);
+		ts_bs(photo_silk);
+		ts_bs_sm(photo_mask);
+
+		if (photo_outline && have_outline) {
+			int black = gdImageColorResolve(photo_outline, 0x00, 0x00, 0x00);
+
+			/* go all the way around the image, trying to fill the outline */
+			for (x = 0; x < gdImageSX(im); x++) {
+				gdImageFillToBorder(photo_outline, x, 0, black, black);
+				gdImageFillToBorder(photo_outline, x, gdImageSY(im) - 1, black, black);
+			}
+			for (y = 1; y < gdImageSY(im) - 1; y++) {
+				gdImageFillToBorder(photo_outline, 0, y, black, black);
+				gdImageFillToBorder(photo_outline, gdImageSX(im) - 1, y, black, black);
+
+			}
+		}
+
+
+		for (x = 0; x < gdImageSX(im); x++) {
+			for (y = 0; y < gdImageSY(im); y++) {
+				color_struct p, cop;
+				color_struct mask_colour, silk_colour;
+				int cc, mask, silk;
+				int transparent;
+
+				if (photo_outline && have_outline) {
+					transparent = gdImageGetPixel(photo_outline, x, y);
+				}
+				else {
+					transparent = 0;
+				}
+
+				mask = photo_mask ? gdImageGetPixel(photo_mask, x, y) : 0;
+				silk = photo_silk ? gdImageGetPixel(photo_silk, x, y) : 0;
+
+				darken = 0;
+				for(lg = 1; lg < photo_ngroups; lg++) {
+					if (photo_copper[photo_groups[lg]] && gdImageGetPixel(photo_copper[photo_groups[lg]], x, y)) {
+						darken = 1;
+						break;
+					}
+				}
+
+				if (darken)
+					rgb(&cop, 40, 40, 40);
+				else
+					rgb(&cop, 100, 100, 110);
+
+				blend(&cop, 0.3, &cop, &fr4);
+
+				cc = gdImageGetPixel(photo_copper[photo_groups[0]], x, y);
+				if (cc) {
+					int r;
+
+					if (mask)
+						rgb(&cop, 220, 145, 230);
+					else {
+
+						if (options[HA_photo_plating].int_value == PLATING_GOLD) {
+							/* ENIG */
+							rgb(&cop, 185, 146, 52);
+
+							/* increase top shadow to increase shininess */
+							if (cc == TOP_SHADOW)
+								blend(&cop, 0.7, &cop, &white);
+						}
+						else if (options[HA_photo_plating].int_value == PLATING_TIN) {
+							/* tinned */
+							rgb(&cop, 140, 150, 160);
+
+							/* add some variation to make it look more matte */
+							r = (rand() % 5 - 2) * 2;
+							cop.r += r;
+							cop.g += r;
+							cop.b += r;
+						}
+						else if (options[HA_photo_plating].int_value == PLATING_SILVER) {
+							/* silver */
+							rgb(&cop, 192, 192, 185);
+
+							/* increase top shadow to increase shininess */
+							if (cc == TOP_SHADOW)
+								blend(&cop, 0.7, &cop, &white);
+						}
+						else if (options[HA_photo_plating].int_value == PLATING_COPPER) {
+							/* copper */
+							rgb(&cop, 184, 115, 51);
+
+							/* increase top shadow to increase shininess */
+							if (cc == TOP_SHADOW)
+								blend(&cop, 0.7, &cop, &white);
+						}
+						/*FIXME: old code...can be removed after validation.   rgb(&cop, 140, 150, 160);
+						   r = (pcb_rand() % 5 - 2) * 2;
+						   cop.r += r;
+						   cop.g += r;
+						   cop.b += r; */
+					}
+
+					if (cc == TOP_SHADOW) {
+						cop.r = 255 - (255 - cop.r) * 0.7;
+						cop.g = 255 - (255 - cop.g) * 0.7;
+						cop.b = 255 - (255 - cop.b) * 0.7;
+					}
+					if (cc == BOTTOM_SHADOW) {
+						cop.r *= 0.7;
+						cop.g *= 0.7;
+						cop.b *= 0.7;
+					}
+				}
+
+				if (photo_drill && !gdImageGetPixel(photo_drill, x, y)) {
+					rgb(&p, 0, 0, 0);
+					transparent = 1;
+				}
+				else if (silk) {
+					silk_colour = silk_colours[options[HA_photo_silk_colour].int_value];
+					blend(&p, 1.0, &silk_colour, &silk_colour);
+
+					if (silk == TOP_SHADOW)
+						add(&p, 1.0, &p, 1.0, &silk_top_shadow);
+					else if (silk == BOTTOM_SHADOW)
+						subtract(&p, 1.0, &p, 1.0, &silk_bottom_shadow);
+				}
+				else if (mask) {
+					p = cop;
+					mask_colour = mask_colours[options[HA_photo_mask_colour].int_value];
+					multiply(&p, &p, &mask_colour);
+					add(&p, 1, &p, 0.2, &mask_colour);
+					if (mask == TOP_SHADOW)
+						blend(&p, 0.7, &p, &white);
+					if (mask == BOTTOM_SHADOW)
+						blend(&p, 0.7, &p, &black);
+				}
+				else
+					p = cop;
+
+				if (options[HA_use_alpha].int_value) {
+
+					cc = (transparent) ? gdImageColorResolveAlpha(im, 0, 0, 0, 127) : gdImageColorResolveAlpha(im, p.r, p.g, p.b, 0);
+
+				}
+				else {
+					cc = (transparent) ? gdImageColorResolve(im, 0, 0, 0) : gdImageColorResolve(im, p.r, p.g, p.b);
+				}
+
+				if (photo_flip == PHOTO_FLIP_X)
+					gdImageSetPixel(im, gdImageSX(im) - x - 1, y, cc);
+				else if (photo_flip == PHOTO_FLIP_Y)
+					gdImageSetPixel(im, x, gdImageSY(im) - y - 1, cc);
+				else
+					gdImageSetPixel(im, x, y, cc);
+			}
+		}
+	}
+
+	/* actually write out the image */
+	fmt = filetypes[options[HA_filetype].int_value];
+
+	if (fmt == NULL)
+		format_error = pcb_true;
+	else if (strcmp(fmt, FMT_gif) == 0)
+#ifdef HAVE_GDIMAGEGIF
+		gdImageGif(im, f);
+#else
+		format_error = pcb_true;
+#endif
+	else if (strcmp(fmt, FMT_jpg) == 0)
+#ifdef HAVE_GDIMAGEJPEG
+		gdImageJpeg(im, f, -1);
+#else
+		format_error = pcb_true;
+#endif
+	else if (strcmp(fmt, FMT_png) == 0)
+#ifdef HAVE_GDIMAGEPNG
+		gdImagePng(im, f);
+#else
+		format_error = pcb_true;
+#endif
+	else
+		format_error = pcb_true;
+
+	if (format_error)
+		fprintf(stderr, "Error:  Invalid graphic file format." "  This is a bug.  Please report it.\n");
+
+	fclose(f);
+
+	if (master_im != NULL) {
+		gdImageDestroy(master_im);
+		master_im = NULL;
+	}
+	if (comp_im != NULL) {
+		gdImageDestroy(comp_im);
+		comp_im = NULL;
+	}
+	if (erase_im != NULL) {
+		gdImageDestroy(erase_im);
+		erase_im = NULL;
+	}
+	if (photo_silk != NULL) {
+		gdImageDestroy(photo_silk);
+		photo_silk = NULL;
+	}
+	if (photo_mask != NULL) {
+		gdImageDestroy(photo_mask);
+		photo_mask = NULL;
+	}
+	if (photo_drill != NULL) {
+		gdImageDestroy(photo_drill);
+		photo_drill = NULL;
+	}
+	if (photo_outline != NULL) {
+		gdImageDestroy(photo_outline);
+		photo_outline = NULL;
+	}
+	for(i = 0; i < PCB_MAX_LAYER + 2; i++) {
+		if (photo_copper[i] != NULL) {
+			gdImageDestroy(photo_copper[i]);
+			photo_copper[i] = NULL;
+		}
+	}
+	png_free_cache();
+	free(white);
+	free(black);
+
+	if (pcb_cam_end(&png_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "png cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+}
+
+static int png_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+
+static int is_mask;
+static int is_drill;
+
+
+static int png_set_layer_group_photo(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+		if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_TOP)) {
+			if (photo_flip)
+				return 0;
+			photo_im = &photo_silk;
+		}
+		else if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_BOTTOM)) {
+			if (!photo_flip)
+				return 0;
+			photo_im = &photo_silk;
+		}
+		else if ((flags & PCB_LYT_MASK) && (flags & PCB_LYT_TOP)) {
+			if (photo_flip)
+				return 0;
+			photo_im = &photo_mask;
+		}
+		else if ((flags & PCB_LYT_MASK) && (flags & PCB_LYT_BOTTOM)) {
+			if (!photo_flip)
+				return 0;
+			photo_im = &photo_mask;
+		}
+		else if ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL)) {
+			photo_im = &photo_drill;
+		}
+		else {
+			if (flags & PCB_LYT_OUTLINE) {
+				doing_outline = 1;
+				have_outline = 0;
+				photo_im = &photo_outline;
+			}
+			else if (flags & PCB_LYT_COPPER) {
+				photo_im = photo_copper + group;
+			}
+			else
+				return 0;
+		}
+
+		if (!*photo_im) {
+			static color_struct *black = NULL, *white = NULL;
+			*photo_im = gdImageCreate(gdImageSX(im), gdImageSY(im));
+			if (photo_im == NULL) {
+				pcb_message(PCB_MSG_ERROR, "png_set_layer():  gdImageCreate(%d, %d) returned NULL.  Aborting export.\n", gdImageSX(im), gdImageSY(im));
+				return 0;
+			}
+
+
+			white = (color_struct *) malloc(sizeof(color_struct));
+			white->r = white->g = white->b = 255;
+			white->a = 0;
+			white->c = gdImageColorAllocate(*photo_im, white->r, white->g, white->b);
+			if (white->c == BADC) {
+				pcb_message(PCB_MSG_ERROR, "png_set_layer():  gdImageColorAllocate() returned NULL.  Aborting export.\n");
+				return 0;
+			}
+
+			black = (color_struct *) malloc(sizeof(color_struct));
+			black->r = black->g = black->b = black->a = 0;
+			black->c = gdImageColorAllocate(*photo_im, black->r, black->g, black->b);
+			if (black->c == BADC) {
+				pcb_message(PCB_MSG_ERROR, "png_set_layer(): gdImageColorAllocate() returned NULL.  Aborting export.\n");
+				return 0;
+			}
+
+			if ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL))
+				gdImageFilledRectangle(*photo_im, 0, 0, gdImageSX(im), gdImageSY(im), black->c);
+		}
+		im = *photo_im;
+		return 1;
+}
+
+static int png_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	doing_outline = 0;
+
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	pcb_cam_set_layer_group(&png_cam, group, flags);
+
+
+	if (!png_cam.active) {
+		if (flags & PCB_LYT_NOEXPORT)
+			return 0;
+
+		if ((flags & PCB_LYT_ASSY) || (flags & PCB_LYT_FAB) || (flags & PCB_LYT_PASTE) || (flags & PCB_LYT_INVIS) || (flags & PCB_LYT_CSECT))
+			return 0;
+	}
+
+	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_mask = (flags & PCB_LYT_MASK);
+
+	if (photo_mode)
+		return png_set_layer_group_photo(group, layer, flags, is_empty);
+
+	if (as_shown) {
+		if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) {
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
+				return pcb_silk_on(PCB);
+			return 0;
+		}
+
+		if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_MASK)
+			return PCB->LayerGroups.grp[group].vis && PCB_LAYERFLG_ON_VISIBLE_SIDE(flags);
+	}
+	else {
+		if (is_mask)
+			return 0;
+
+		if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK)
+			return !!(flags & PCB_LYT_TOP);
+	}
+
+	return 1;
+}
+
+
+static pcb_hid_gc_t png_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
+	rv->me_pointer = &png_hid;
+	rv->cap = pcb_cap_round;
+	rv->width = 1;
+	rv->color = (color_struct *) malloc(sizeof(color_struct));
+	rv->color->r = rv->color->g = rv->color->b = rv->color->a = 0;
+	rv->color->c = 0;
+	rv->is_erase = 0;
+	return rv;
+}
+
+static void png_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static pcb_composite_op_t drawing_mode;
+static void png_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	static gdImagePtr dst_im;
+	drawing_mode = op;
+	if (direct)
+		return;
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+
+			/* the main pixel buffer; drawn with color */
+			if (comp_im == NULL) {
+				comp_im = gdImageCreate(gdImageSX(im), gdImageSY(im));
+				if (!comp_im) {
+					pcb_message(PCB_MSG_ERROR, "png_set_drawing_mode():  gdImageCreate(%d, %d) returned NULL on comp_im.  Corrupt export!\n", gdImageSY(im), gdImageSY(im));
+					return;
+				}
+			}
+
+			/* erase mask: for composite layers, tells whether the color pixel
+			   should be combined back to the master image; white means combine back,
+			   anything else means cut-out/forget/ignore that pixel */
+			if (erase_im == NULL) {
+				erase_im = gdImageCreate(gdImageSX(im), gdImageSY(im));
+				if (!erase_im) {
+					pcb_message(PCB_MSG_ERROR, "png_set_drawing_mode():  gdImageCreate(%d, %d) returned NULL on erase_im.  Corrupt export!\n", gdImageSY(im), gdImageSY(im));
+					return;
+				}
+			}
+			gdImagePaletteCopy(comp_im, im);
+			dst_im = im;
+			gdImageFilledRectangle(comp_im, 0, 0, gdImageSX(comp_im), gdImageSY(comp_im), white->c);
+
+			gdImagePaletteCopy(erase_im, im);
+			gdImageFilledRectangle(erase_im, 0, 0, gdImageSX(erase_im), gdImageSY(erase_im), black->c);
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			im = comp_im;
+			break;
+		case PCB_HID_COMP_NEGATIVE:
+			im = erase_im;
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+		{
+			int x, y, c, e;
+			im = dst_im;
+			gdImagePaletteCopy(im, comp_im);
+			for (x = 0; x < gdImageSX(im); x++) {
+				for (y = 0; y < gdImageSY(im); y++) {
+					e = gdImageGetPixel(erase_im, x, y);
+					c = gdImageGetPixel(comp_im, x, y);
+					if ((e == white->c) && (c))
+						gdImageSetPixel(im, x, y, c);
+				}
+			}
+			break;
+		}
+	}
+}
+
+static void png_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	pcb_hidval_t cval;
+
+	if (im == NULL)
+		return;
+
+	if (name == NULL)
+		name = "#ff0000";
+
+	if (strcmp(name, "drill") == 0) {
+		gc->color = white;
+		gc->is_erase = 1;
+		return;
+	}
+	gc->is_erase = 0;
+
+	if (in_mono || (strcmp(name, "#000000") == 0)) {
+		gc->color = black;
+		return;
+	}
+
+	if (pcb_hid_cache_color(0, name, &cval, &color_cache)) {
+		gc->color = (color_struct *) cval.ptr;
+	}
+	else if (name[0] == '#') {
+		gc->color = (color_struct *) malloc(sizeof(color_struct));
+		sscanf(name + 1, "%2x%2x%2x", &(gc->color->r), &(gc->color->g), &(gc->color->b));
+		gc->color->c = gdImageColorAllocate(im, gc->color->r, gc->color->g, gc->color->b);
+		if (gc->color->c == BADC) {
+			pcb_message(PCB_MSG_ERROR, "png_set_color():  gdImageColorAllocate() returned NULL.  Aborting export.\n");
+			return;
+		}
+		cval.ptr = gc->color;
+		pcb_hid_cache_color(1, name, &cval, &color_cache);
+	}
+	else {
+		fprintf(stderr, "WE SHOULD NOT BE HERE!!!\n");
+		gc->color = black;
+	}
+
+}
+
+static void png_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void png_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void png_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static int unerase_override = 0;
+static void use_gc(gdImagePtr im, pcb_hid_gc_t gc)
+{
+	int need_brush = 0;
+	unsigned int gc_r = gc->color->r, gc_g = gc->color->g, gc_b = gc->color->b;
+
+	if (unerase_override) {
+		gc_r = -1;
+		gc_g = -1;
+		gc_b = -1;
+	}
+	else {
+		gc_r = gc->color->r;
+		gc_g = gc->color->g;
+		gc_b = gc->color->b;
+	}
+
+	if (gc->me_pointer != &png_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to png HID\n");
+		abort();
+	}
+
+	if (linewidth != gc->width) {
+		/* Make sure the scaling doesn't erase lines completely */
+		if (SCALE(gc->width) == 0 && gc->width > 0)
+			gdImageSetThickness(im, 1);
+		else
+			gdImageSetThickness(im, SCALE(gc->width + 2 * bloat));
+		linewidth = gc->width;
+		need_brush = 1;
+	}
+
+	need_brush |= (gc_r != last_color_r) || (gc_g != last_color_g) || (gc_b != last_color_b) || (gc->cap != last_cap);
+
+	if (lastbrush != gc->brush || need_brush) {
+		pcb_hidval_t bval;
+		char name[256];
+		char type;
+		int r;
+
+		switch (gc->cap) {
+		case pcb_cap_round:
+			type = 'C';
+			break;
+		case pcb_cap_square:
+			type = 'S';
+			break;
+		default:
+			assert(!"unhandled cap");
+			type = 'C';
+		}
+		if (gc->width)
+			r = SCALE(gc->width + 2 * bloat);
+		else
+			r = 1;
+
+		/* do not allow a brush size that is zero width.  In this case limit to a single pixel. */
+		if (r == 0) {
+			r = 1;
+		}
+
+		sprintf(name, "#%.2x%.2x%.2x_%c_%d", gc_r, gc_g, gc_b, type, r);
+
+		last_color_r = gc_r;
+		last_color_g = gc_g;
+		last_color_b = gc_b;
+		last_cap = gc->cap;
+
+		if (pcb_hid_cache_color(0, name, &bval, &brush_cache)) {
+			gc->brush = (gdImagePtr) bval.ptr;
+		}
+		else {
+			int bg, fg;
+			gc->brush = gdImageCreate(r, r);
+			if (gc->brush == NULL) {
+				pcb_message(PCB_MSG_ERROR, "use_gc():  gdImageCreate(%d, %d) returned NULL.  Aborting export.\n", r, r);
+				return;
+			}
+
+			bg = gdImageColorAllocate(gc->brush, 255, 255, 255);
+			if (bg == BADC) {
+				pcb_message(PCB_MSG_ERROR, "use_gc():  gdImageColorAllocate() returned NULL.  Aborting export.\n");
+				return;
+			}
+			if (unerase_override)
+				fg = gdImageColorAllocateAlpha(gc->brush, 255, 255, 255, 0);
+			else
+				fg = gdImageColorAllocateAlpha(gc->brush, gc_r, gc_g, gc_b, 0);
+			if (fg == BADC) {
+				pcb_message(PCB_MSG_ERROR, "use_gc():  gdImageColorAllocate() returned NULL.  Aborting export.\n");
+				return;
+			}
+			gdImageColorTransparent(gc->brush, bg);
+
+			/*
+			 * if we shrunk to a radius/box width of zero, then just use
+			 * a single pixel to draw with.
+			 */
+			if (r <= 1)
+				gdImageFilledRectangle(gc->brush, 0, 0, 0, 0, fg);
+			else {
+				if (type == 'C') {
+					gdImageFilledEllipse(gc->brush, r / 2, r / 2, r, r, fg);
+					/* Make sure the ellipse is the right exact size.  */
+					gdImageSetPixel(gc->brush, 0, r / 2, fg);
+					gdImageSetPixel(gc->brush, r - 1, r / 2, fg);
+					gdImageSetPixel(gc->brush, r / 2, 0, fg);
+					gdImageSetPixel(gc->brush, r / 2, r - 1, fg);
+				}
+				else
+					gdImageFilledRectangle(gc->brush, 0, 0, r - 1, r - 1, fg);
+			}
+			bval.ptr = gc->brush;
+			pcb_hid_cache_color(1, name, &bval, &brush_cache);
+		}
+
+		gdImageSetBrush(im, gc->brush);
+		lastbrush = gc->brush;
+
+	}
+}
+
+static void png_draw_rect_(gdImagePtr im, pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(im, gc);
+	gdImageRectangle(im, SCALE_X(x1), SCALE_Y(y1), SCALE_X(x2), SCALE_Y(y2), unerase_override ? white->c : gc->color->c);
+}
+
+static void png_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	png_draw_rect_(im, gc, x1, y1, x2, y2);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_draw_rect_(erase_im, gc, x1, y1, x2, y2);
+		unerase_override = 0;
+	}
+}
+
+static void png_fill_rect_(gdImagePtr im, pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(im, gc);
+	gdImageSetThickness(im, 0);
+	linewidth = 0;
+
+	if (x1 > x2) {
+		pcb_coord_t t = x1;
+		x2 = x2;
+		x2 = t;
+	}
+	if (y1 > y2) {
+		pcb_coord_t t = y1;
+		y2 = y2;
+		y2 = t;
+	}
+	y1 -= bloat;
+	y2 += bloat;
+	SWAP_IF_SOLDER(y1, y2);
+
+	gdImageFilledRectangle(im, SCALE_X(x1 - bloat), SCALE_Y(y1), SCALE_X(x2 + bloat) - 1, SCALE_Y(y2) - 1, unerase_override ? white->c : gc->color->c);
+	have_outline |= doing_outline;
+}
+
+static void png_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	png_fill_rect_(im, gc, x1, y1, x2, y2);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_fill_rect_(erase_im, gc, x1, y1, x2, y2);
+		unerase_override = 0;
+	}
+}
+
+
+static void png_draw_line_(gdImagePtr im, pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	if (x1 == x2 && y1 == y2 && !photo_mode) {
+		pcb_coord_t w = gc->width / 2;
+		if (gc->cap != pcb_cap_square)
+			png_fill_circle(gc, x1, y1, w);
+		else
+			png_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
+		return;
+	}
+	use_gc(im, gc);
+
+	if (NOT_EDGE(x1, y1) || NOT_EDGE(x2, y2))
+		have_outline |= doing_outline;
+	if (doing_outline) {
+		/* Special case - lines drawn along the bottom or right edges
+		   are brought in by a pixel to make sure we have contiguous
+		   outlines.  */
+		if (x1 == PCB->MaxWidth && x2 == PCB->MaxWidth) {
+			x1 -= pcb_round(scale / 2);
+			x2 -= pcb_round(scale / 2);
+		}
+		if (y1 == PCB->MaxHeight && y2 == PCB->MaxHeight) {
+			y1 -= pcb_round(scale / 2);
+			y2 -= pcb_round(scale / 2);
+		}
+	}
+
+	gdImageSetThickness(im, 0);
+	linewidth = 0;
+	if (gc->cap != pcb_cap_square || x1 == x2 || y1 == y2) {
+		gdImageLine(im, SCALE_X(x1), SCALE_Y(y1), SCALE_X(x2), SCALE_Y(y2), gdBrushed);
+	}
+	else {
+		/*
+		 * if we are drawing a line with a square end cap and it is
+		 * not purely horizontal or vertical, then we need to draw
+		 * it as a filled polygon.
+		 */
+		int fg, w = gc->width, dx = x2 - x1, dy = y2 - y1, dwx, dwy;
+		gdPoint p[4];
+		double l = sqrt((double)dx * (double)dx + (double)dy * (double)dy) * 2.0;
+
+		if (unerase_override)
+			fg = gdImageColorResolve(im, 255, 255, 255);
+		else
+			fg = gdImageColorResolve(im, gc->color->r, gc->color->g, gc->color->b);
+
+		w += 2 * bloat;
+		dwx = -w / l * dy;
+		dwy = w / l * dx;
+		p[0].x = SCALE_X(x1 + dwx - dwy);
+		p[0].y = SCALE_Y(y1 + dwy + dwx);
+		p[1].x = SCALE_X(x1 - dwx - dwy);
+		p[1].y = SCALE_Y(y1 - dwy + dwx);
+		p[2].x = SCALE_X(x2 - dwx + dwy);
+		p[2].y = SCALE_Y(y2 - dwy - dwx);
+		p[3].x = SCALE_X(x2 + dwx + dwy);
+		p[3].y = SCALE_Y(y2 + dwy - dwx);
+		gdImageFilledPolygon(im, p, 4, fg);
+	}
+}
+
+static void png_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	png_draw_line_(im, gc, x1, y1, x2, y2);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_draw_line_(erase_im, gc, x1, y1, x2, y2);
+		unerase_override = 0;
+	}
+}
+
+
+static void png_draw_arc_(gdImagePtr im, pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t sa, ea;
+
+	use_gc(im, gc);
+	gdImageSetThickness(im, 0);
+	linewidth = 0;
+
+	/*
+	 * zero angle arcs need special handling as gd will output either
+	 * nothing at all or a full circle when passed delta angle of 0 or 360.
+	 */
+	if (delta_angle == 0) {
+		pcb_coord_t x = (width * cos(start_angle * M_PI / 180));
+		pcb_coord_t y = (width * sin(start_angle * M_PI / 180));
+		x = cx - x;
+		y = cy + y;
+		png_fill_circle(gc, x, y, gc->width / 2);
+		return;
+	}
+
+	if ((delta_angle >= 360) || (delta_angle <= -360)) {
+		/* save some expensive calculations if we are going to draw a full circle anyway */
+		sa = 0;
+		ea = 360;
+	}
+	else {
+		/*
+		 * in gdImageArc, 0 degrees is to the right and +90 degrees is down
+		 * in pcb, 0 degrees is to the left and +90 degrees is down
+		 */
+		start_angle = 180 - start_angle;
+		delta_angle = -delta_angle;
+		if (show_solder_side) {
+			start_angle = -start_angle;
+			delta_angle = -delta_angle;
+		}
+		if (delta_angle > 0) {
+			sa = start_angle;
+			ea = start_angle + delta_angle;
+		}
+		else {
+			sa = start_angle + delta_angle;
+			ea = start_angle;
+		}
+
+		/*
+		 * make sure we start between 0 and 360 otherwise gd does
+		 * strange things
+		 */
+		sa = pcb_normalize_angle(sa);
+		ea = pcb_normalize_angle(ea);
+	}
+
+	have_outline |= doing_outline;
+
+#if 0
+	printf("draw_arc %d,%d %dx%d %d..%d %d..%d\n", cx, cy, width, height, start_angle, delta_angle, sa, ea);
+	printf("gdImageArc (%p, %d, %d, %d, %d, %d, %d, %d)\n",
+				 (void *)im, SCALE_X(cx), SCALE_Y(cy), SCALE(width), SCALE(height), sa, ea, gc->color->c);
+#endif
+	gdImageArc(im, SCALE_X(cx), SCALE_Y(cy), SCALE(2 * width), SCALE(2 * height), sa, ea, gdBrushed);
+}
+
+static void png_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	png_draw_arc_(im, gc, cx, cy, width, height, start_angle, delta_angle);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_draw_arc_(erase_im, gc, cx, cy, width, height, start_angle, delta_angle);
+		unerase_override = 0;
+	}
+}
+
+static void png_fill_circle_(gdImagePtr im, pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	pcb_coord_t my_bloat;
+
+	use_gc(im, gc);
+
+	if (gc->is_erase)
+		my_bloat = -2 * bloat;
+	else
+		my_bloat = 2 * bloat;
+
+	have_outline |= doing_outline;
+
+	gdImageSetThickness(im, 0);
+	linewidth = 0;
+	gdImageFilledEllipse(im, SCALE_X(cx), SCALE_Y(cy), SCALE(2 * radius + my_bloat), SCALE(2 * radius + my_bloat), unerase_override ? white->c : gc->color->c);
+}
+
+static void png_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	png_fill_circle_(im, gc, cx, cy, radius);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_fill_circle_(erase_im, gc, cx, cy, radius);
+		unerase_override = 0;
+	}
+}
+
+
+static void png_fill_polygon_offs_(gdImagePtr im, pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	gdPoint *points;
+
+	points = (gdPoint *) malloc(n_coords * sizeof(gdPoint));
+	if (points == NULL) {
+		fprintf(stderr, "ERROR:  png_fill_polygon():  malloc failed\n");
+		exit(1);
+	}
+
+	use_gc(im, gc);
+	for (i = 0; i < n_coords; i++) {
+		if (NOT_EDGE(x[i], y[i]))
+			have_outline |= doing_outline;
+		points[i].x = SCALE_X(x[i]+dx);
+		points[i].y = SCALE_Y(y[i]+dy);
+	}
+	gdImageSetThickness(im, 0);
+	linewidth = 0;
+	gdImageFilledPolygon(im, points, n_coords, unerase_override ? white->c : gc->color->c);
+	free(points);
+}
+
+static void png_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	png_fill_polygon_offs_(im, gc, n_coords, x, y, dx, dy);
+	if ((im != erase_im) && (erase_im != NULL)) {
+		unerase_override = 1;
+		png_fill_polygon_offs_(erase_im, gc, n_coords, x, y, dx, dy);
+		unerase_override = 0;
+	}
+}
+
+
+static void png_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	png_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void png_calibrate(double xval, double yval)
+{
+	CRASH("png_calibrate");
+}
+
+static void png_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int png_usage(const char *topic)
+{
+	fprintf(stderr, "\npng exporter command line arguments:\n\n");
+	pcb_hid_usage(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x png [png options] foo.pcb\n\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+int pplg_check_ver_export_png(int ver_needed) { return 0; }
+
+void pplg_uninit_export_png(void)
+{
+	pcb_hid_remove_attributes_by_cookie(png_cookie);
+}
+
+int pplg_init_export_png(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&png_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&png_hid);
+	pcb_dhlp_draw_helpers_init(&png_hid);
+
+	png_hid.struct_size = sizeof(pcb_hid_t);
+	png_hid.name = "png";
+	png_hid.description = "GIF/JPEG/PNG export";
+	png_hid.exporter = 1;
+
+	png_hid.get_export_options = png_get_export_options;
+	png_hid.do_export = png_do_export;
+	png_hid.parse_arguments = png_parse_arguments;
+	png_hid.set_layer_group = png_set_layer_group;
+	png_hid.make_gc = png_make_gc;
+	png_hid.destroy_gc = png_destroy_gc;
+	png_hid.set_drawing_mode = png_set_drawing_mode;
+	png_hid.set_color = png_set_color;
+	png_hid.set_line_cap = png_set_line_cap;
+	png_hid.set_line_width = png_set_line_width;
+	png_hid.set_draw_xor = png_set_draw_xor;
+	png_hid.draw_line = png_draw_line;
+	png_hid.draw_arc = png_draw_arc;
+	png_hid.draw_rect = png_draw_rect;
+	png_hid.fill_circle = png_fill_circle;
+	png_hid.fill_polygon = png_fill_polygon;
+	png_hid.fill_polygon_offs = png_fill_polygon_offs;
+	png_hid.fill_rect = png_fill_rect;
+	png_hid.calibrate = png_calibrate;
+	png_hid.set_crosshair = png_set_crosshair;
+
+	png_hid.usage = png_usage;
+
+#ifdef HAVE_SOME_FORMAT
+	pcb_hid_register_hid(&png_hid);
+
+#endif
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_png/png.h
===================================================================
--- tags/2.0.1/src_plugins/export_png/png.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_png/png.h	(revision 18980)
@@ -0,0 +1,2 @@
+extern const char *png_cookie;
+extern void png_hid_export_to_file(FILE *, pcb_hid_attr_val_t *);
Index: tags/2.0.1/src_plugins/export_ps/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_ps/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_ps
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_ps/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_ps/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_ps}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_ps/ps.o  $(PLUGDIR)/export_ps/eps.o  @]
+
+switch /local/pcb/export_ps/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_ps/eps.c
===================================================================
--- tags/2.0.1/src_plugins/export_ps/eps.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/eps.c	(revision 18980)
@@ -0,0 +1,678 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "ps.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+#include "hid_color.h"
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented EPS function %s.\n", func); abort()
+
+/*----------------------------------------------------------------------------*/
+/* Function prototypes                                                        */
+/*----------------------------------------------------------------------------*/
+static pcb_hid_attribute_t *eps_get_export_options(int *n);
+static void eps_do_export(pcb_hid_attr_val_t * options);
+static int eps_parse_arguments(int *argc, char ***argv);
+static int eps_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
+static pcb_hid_gc_t eps_make_gc(void);
+static void eps_destroy_gc(pcb_hid_gc_t gc);
+static void eps_set_color(pcb_hid_gc_t gc, const char *name);
+static void eps_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
+static void eps_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
+static void eps_set_draw_xor(pcb_hid_gc_t gc, int _xor);
+static void eps_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void eps_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void eps_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle);
+static void eps_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void eps_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+static void eps_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y);
+static void eps_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+static void eps_calibrate(double xval, double yval);
+static void eps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action);
+/*----------------------------------------------------------------------------*/
+
+static pcb_cam_t eps_cam;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_cap_style_t cap;
+	pcb_coord_t width;
+	int color;
+	int erase;
+
+} hid_gc_s;
+
+static pcb_hid_t eps_hid;
+
+static FILE *f = 0;
+static pcb_coord_t linewidth = -1;
+static int lastcap = -1;
+static int lastcolor = -1;
+static int print_group[PCB_MAX_LAYERGRP];
+static int print_layer[PCB_MAX_LAYER];
+static int fast_erase = -1;
+static pcb_composite_op_t drawing_mode;
+
+static pcb_hid_attribute_t eps_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "92 Encapsulated Postscript Export"
+@ftable @code
+@item --eps-file <string>
+Name of the encapsulated postscript output file. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"eps-file", "Encapsulated Postscript output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_psfile 0
+
+/* %start-doc options "92 Encapsulated Postscript Export"
+@ftable @code
+@item --eps-scale <num>
+Scale EPS output by the parameter @samp{num}.
+@end ftable
+%end-doc
+*/
+	{"eps-scale", "EPS scale",
+	 PCB_HATT_REAL, 0, 100, {0, 0, 1.0}, 0, 0},
+#define HA_scale 1
+
+/* %start-doc options "92 Encapsulated Postscript Export"
+@ftable @code
+@cindex as-shown (EPS)
+@item --as-shown
+Export layers as shown on screen.
+@end ftable
+%end-doc
+*/
+	{"as-shown", "Export layers as shown on screen",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_as_shown 2
+
+/* %start-doc options "92 Encapsulated Postscript Export"
+@ftable @code
+@item --monochrome
+Convert output to monochrome.
+@end ftable
+%end-doc
+*/
+	{"monochrome", "Convert to monochrome",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_mono 3
+
+/* %start-doc options "92 Encapsulated Postscript Export"
+@ftable @code
+@cindex only-visible
+@item --only-visible
+Limit the bounds of the EPS file to the visible items.
+@end ftable
+%end-doc
+*/
+	{"only-visible", "Limit the bounds of the EPS file to the visible items",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_only_visible 4
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cam 5
+
+};
+
+#define NUM_OPTIONS (sizeof(eps_attribute_list)/sizeof(eps_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(eps_attribute_list, ps_cookie)
+
+static pcb_hid_attr_val_t eps_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *eps_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &eps_attribute_list[HA_psfile], ".eps", &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return eps_attribute_list;
+}
+
+static pcb_layergrp_id_t group_for_layer(int l)
+{
+	if (l < pcb_max_layer && l >= 0)
+		return pcb_layer_get_group(PCB, l);
+	/* else something unique */
+	return pcb_max_group(PCB) + 3 + l;
+}
+
+static int is_solder(pcb_layergrp_id_t grp)     { return pcb_layergrp_flags(PCB, grp) & PCB_LYT_BOTTOM; }
+static int is_component(pcb_layergrp_id_t grp)  { return pcb_layergrp_flags(PCB, grp) & PCB_LYT_TOP; }
+
+static int layer_sort(const void *va, const void *vb)
+{
+	int a = *(int *) va;
+	int b = *(int *) vb;
+	pcb_layergrp_id_t al = group_for_layer(a);
+	pcb_layergrp_id_t bl = group_for_layer(b);
+	int d = bl - al;
+
+	if (a >= 0 && a < pcb_max_layer) {
+		int aside = (is_solder(al) ? 0 : is_component(al) ? 2 : 1);
+		int bside = (is_solder(bl) ? 0 : is_component(bl) ? 2 : 1);
+		if (bside != aside)
+			return bside - aside;
+	}
+	if (d)
+		return d;
+	return b - a;
+}
+
+static const char *filename;
+static pcb_box_t *bounds;
+static int in_mono, as_shown;
+
+void eps_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options)
+{
+	int i;
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_box_t tmp, region;
+	pcb_hid_expose_ctx_t ctx;
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+	conf_force_set_bool(conf_core.editor.check_planes, 0);
+
+	f = the_file;
+
+	region.X1 = 0;
+	region.Y1 = 0;
+	region.X2 = PCB->MaxWidth;
+	region.Y2 = PCB->MaxHeight;
+
+	if (options[HA_only_visible].int_value)
+		bounds = pcb_data_bbox(&tmp, PCB->Data, pcb_false);
+	else
+		bounds = &region;
+
+	memset(print_group, 0, sizeof(print_group));
+	memset(print_layer, 0, sizeof(print_layer));
+
+	/* Figure out which layers actually have stuff on them.  */
+	for (i = 0; i < pcb_max_layer; i++) {
+		pcb_layer_t *layer = PCB->Data->Layer + i;
+		if (pcb_layer_flags(PCB, i) & PCB_LYT_SILK)
+			continue;
+		if (layer->meta.real.vis)
+			if (!pcb_layer_is_empty_(PCB, layer))
+				print_group[pcb_layer_get_group(PCB, i)] = 1;
+	}
+
+	/* Now, if only one layer has real stuff on it, we can use the fast
+	   erase logic.  Otherwise, we have to use the expensive multi-mask
+	   erase.  */
+	fast_erase = 0;
+	for (i = 0; i < pcb_max_group(PCB); i++)
+		if (print_group[i])
+			fast_erase++;
+
+	/* If NO layers had anything on them, at least print the component
+	   layer to get the pins.  */
+	if (fast_erase == 0) {
+		pcb_layergrp_id_t comp_copp;
+		if (pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_copp, 1) > 0) {
+			print_group[pcb_layer_get_group(PCB, comp_copp)] = 1;
+			fast_erase = 1;
+		}
+	}
+
+	/* "fast_erase" is 1 if we can just paint white to erase.  */
+	fast_erase = fast_erase == 1 ? 1 : 0;
+
+	/* Now, for each group we're printing, mark its layers for
+	   printing.  */
+	for (i = 0; i < pcb_max_layer; i++) {
+		if (pcb_layer_flags(PCB, i) & PCB_LYT_SILK)
+			continue;
+		if (print_group[pcb_layer_get_group(PCB, i)])
+			print_layer[i] = 1;
+	}
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+	as_shown = options[HA_as_shown].int_value;
+	if (!options[HA_as_shown].int_value) {
+		qsort(pcb_layer_stack, pcb_max_layer, sizeof(pcb_layer_stack[0]), layer_sort);
+	}
+	fprintf(f, "%%!PS-Adobe-3.0 EPSF-3.0\n");
+	linewidth = -1;
+	lastcap = -1;
+	lastcolor = -1;
+
+	in_mono = options[HA_mono].int_value;
+
+#define pcb2em(x) 1 + PCB_COORD_TO_INCH (x) * 72.0 * options[HA_scale].real_value
+	fprintf(f, "%%%%BoundingBox: 0 0 %f %f\n", pcb2em(bounds->X2 - bounds->X1), pcb2em(bounds->Y2 - bounds->Y1));
+#undef pcb2em
+	fprintf(f, "%%%%Pages: 1\n");
+	fprintf(f, "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def\n");
+	fprintf(f, "%%%%EndProlog\n");
+	fprintf(f, "%%%%Page: 1 1\n");
+	fprintf(f, "%%%%BeginDocument: %s\n\n", filename);
+
+	fprintf(f, "72 72 scale\n");
+	fprintf(f, "1 dup neg scale\n");
+	fprintf(f, "%g dup scale\n", options[HA_scale].real_value);
+	pcb_fprintf(f, "%mi %mi translate\n", -bounds->X1, -bounds->Y2);
+	if (options[HA_as_shown].int_value && conf_core.editor.show_solder_side)
+		pcb_fprintf(f, "-1 1 scale %mi 0 translate\n", bounds->X1 - bounds->X2);
+	linewidth = -1;
+	lastcap = -1;
+	lastcolor = -1;
+#define Q (pcb_coord_t) PCB_MIL_TO_COORD(10)
+	pcb_fprintf(f,
+							"/nclip { %mi %mi moveto %mi %mi lineto %mi %mi lineto %mi %mi lineto %mi %mi lineto eoclip newpath } def\n",
+							bounds->X1 - Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y2 + Q,
+							bounds->X2 + Q, bounds->Y2 + Q, bounds->X2 + Q, bounds->Y1 - Q, bounds->X1 - Q, bounds->Y1 - Q);
+#undef Q
+	fprintf(f, "/t { moveto lineto stroke } bind def\n");
+	fprintf(f, "/tc { moveto lineto strokepath nclip } bind def\n");
+	fprintf(f, "/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def\n");
+	fprintf(f, "     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def\n");
+	fprintf(f, "/c { 0 360 arc fill } bind def\n");
+	fprintf(f, "/cc { 0 360 arc nclip } bind def\n");
+	fprintf(f, "/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def\n");
+
+	ctx.view = *bounds;
+	pcb_hid_expose_all(&eps_hid, &ctx);
+
+	fprintf(f, "showpage\n");
+
+	fprintf(f, "%%%%EndDocument\n");
+	fprintf(f, "%%%%Trailer\n");
+	fprintf(f, "cleartomark countdictstack exch sub { end } repeat restore\n");
+	fprintf(f, "%%%%EOF\n");
+
+	memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack));
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void eps_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+	int save_ons[PCB_MAX_LAYER + 2];
+
+	if (!options) {
+		eps_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			eps_values[i] = eps_attribute_list[i].default_val;
+		options = eps_values;
+	}
+
+	pcb_cam_begin(PCB, &eps_cam, options[HA_cam].str_value, eps_attribute_list, NUM_OPTIONS, options);
+
+	filename = options[HA_psfile].str_value;
+	if (!filename)
+		filename = "pcb-out.eps";
+
+	f = pcb_fopen(eps_cam.active ? eps_cam.fn : filename, "w");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	if ((!eps_cam.active) && (!options[HA_as_shown].int_value))
+		pcb_hid_save_and_show_layer_ons(save_ons);
+	eps_hid_export_to_file(f, options);
+	if ((!eps_cam.active) && (!options[HA_as_shown].int_value))
+		pcb_hid_restore_layer_ons(save_ons);
+
+	fclose(f);
+
+	if (pcb_cam_end(&eps_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+}
+
+static int eps_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int is_mask;
+static int is_paste;
+static int is_drill;
+
+static int eps_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	char tmp_ln[PCB_PATH_MAX];
+	const char *name;
+
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	pcb_cam_set_layer_group(&eps_cam, group, flags);
+
+	if (!eps_cam.active) {
+		if (flags & PCB_LYT_NOEXPORT)
+			return 0;
+
+		if ((flags & PCB_LYT_ASSY) || (flags & PCB_LYT_FAB) || (flags & PCB_LYT_CSECT) || (flags & PCB_LYT_INVIS))
+			return 0;
+
+		if ((group >= 0) && pcb_layergrp_is_empty(PCB, group) && (flags & PCB_LYT_OUTLINE))
+			return 0;
+	}
+
+	is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	is_mask = (flags & PCB_LYT_MASK);
+	is_paste = !!(flags & PCB_LYT_PASTE);
+
+	if (is_mask || is_paste)
+		return 0;
+
+	name = pcb_layer_to_file_name(tmp_ln, layer, flags, PCB_FNS_fixed);
+
+#if 0
+	printf("Layer %s group %d drill %d mask %d\n", name, group, is_drill, is_mask);
+#endif
+	fprintf(f, "%% Layer %s group %ld drill %d mask %d\n", name, group, is_drill, is_mask);
+
+	if (as_shown) {
+		if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
+			return pcb_silk_on(PCB);
+		else
+			return 0;
+	}
+	else {
+		if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_TOP))
+			return 1;
+		if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_BOTTOM))
+			return 0;
+	}
+
+	return 1;
+}
+
+static pcb_hid_gc_t eps_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) malloc(sizeof(hid_gc_s));
+	rv->cap = pcb_cap_round;
+	rv->width = 0;
+	rv->color = 0;
+	return rv;
+}
+
+static void eps_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void eps_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	if (direct)
+		return;
+	drawing_mode = op;
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			fprintf(f, "gsave\n");
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+		case PCB_HID_COMP_NEGATIVE:
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			fprintf(f, "grestore\n");
+			lastcolor = -1;
+			break;
+	}
+}
+
+
+static void eps_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	static void *cache = 0;
+	pcb_hidval_t cval;
+
+	if (drawing_mode == PCB_HID_COMP_NEGATIVE) {
+		gc->color = 0xffffff;
+		gc->erase = 1;
+		return;
+	}
+	if (strcmp(name, "drill") == 0) {
+		gc->color = 0xffffff;
+		gc->erase = 0;
+		return;
+	}
+	gc->erase = 0;
+	if (pcb_hid_cache_color(0, name, &cval, &cache)) {
+		gc->color = cval.lval;
+	}
+	else if (in_mono) {
+		gc->color = 0;
+	}
+	else if (name[0] == '#') {
+		unsigned int r, g, b;
+		sscanf(name + 1, "%2x%2x%2x", &r, &g, &b);
+		gc->color = (r << 16) + (g << 8) + b;
+	}
+	else
+		gc->color = 0;
+}
+
+static void eps_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void eps_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void eps_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void use_gc(pcb_hid_gc_t gc)
+{
+	if (linewidth != gc->width) {
+		pcb_fprintf(f, "%mi setlinewidth\n", gc->width);
+		linewidth = gc->width;
+	}
+	if (lastcap != gc->cap) {
+		int c;
+		switch (gc->cap) {
+		case pcb_cap_round:
+			c = 1;
+			break;
+		case pcb_cap_square:
+			c = 2;
+			break;
+		default:
+			assert(!"unhandled cap");
+			c = 1;
+		}
+		fprintf(f, "%d setlinecap\n", c);
+		lastcap = gc->cap;
+	}
+	if (lastcolor != gc->color) {
+		int c = gc->color;
+#define CV(x,b) (((x>>b)&0xff)/255.0)
+		fprintf(f, "%g %g %g setrgbcolor\n", CV(c, 16), CV(c, 8), CV(c, 0));
+		lastcolor = gc->color;
+	}
+}
+
+static void eps_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void eps_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+
+static void eps_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	pcb_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2);
+}
+
+static void eps_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_coord_t w = gc->width / 2;
+	if (x1 == x2 && y1 == y2) {
+		if (gc->cap == pcb_cap_square)
+			eps_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
+		else
+			eps_fill_circle(gc, x1, y1, w);
+		return;
+	}
+	use_gc(gc);
+	if (gc->erase && gc->cap != pcb_cap_square) {
+		double ang = atan2(y2 - y1, x2 - x1);
+		double dx = w * sin(ang);
+		double dy = -w * cos(ang);
+		double deg = ang * 180.0 / M_PI;
+		pcb_coord_t vx1 = x1 + dx;
+		pcb_coord_t vy1 = y1 + dy;
+
+		pcb_fprintf(f, "%mi %mi moveto ", vx1, vy1);
+		pcb_fprintf(f, "%mi %mi %mi %g %g arc\n", x2, y2, w, deg - 90, deg + 90);
+		pcb_fprintf(f, "%mi %mi %mi %g %g arc\n", x1, y1, w, deg + 90, deg + 270);
+		fprintf(f, "nclip\n");
+
+		return;
+	}
+	pcb_fprintf(f, "%mi %mi %mi %mi %s\n", x1, y1, x2, y2, gc->erase ? "tc" : "t");
+}
+
+static void eps_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t sa, ea;
+	double w;
+
+	if ((width == 0) && (height == 0)) {
+		/* degenerate case, draw dot */
+		eps_draw_line(gc, cx, cy, cx, cy);
+		return;
+	}
+
+	if (delta_angle > 0) {
+		sa = start_angle;
+		ea = start_angle + delta_angle;
+	}
+	else {
+		sa = start_angle + delta_angle;
+		ea = start_angle;
+	}
+#if 0
+	printf("draw_arc %d,%d %dx%d %d..%d %d..%d\n", cx, cy, width, height, start_angle, delta_angle, sa, ea);
+#endif
+	use_gc(gc);
+	w = width;
+	if (w == 0) /* make sure not to div by zero; this hack will have very similar effect */
+		w = 0.0001;
+	pcb_fprintf(f, "%ma %ma %mi %mi %mi %mi %f a\n", sa, ea, -width, height, cx, cy, (double) linewidth / w);
+}
+
+static void eps_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	use_gc(gc);
+	pcb_fprintf(f, "%mi %mi %mi %s\n", cx, cy, radius, gc->erase ? "cc" : "c");
+}
+
+static void eps_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	const char *op = "moveto";
+	use_gc(gc);
+	for (i = 0; i < n_coords; i++) {
+		pcb_fprintf(f, "%mi %mi %s\n", x[i] + dx, y[i] + dy, op);
+		op = "lineto";
+	}
+
+	fprintf(f, "fill\n");
+}
+
+static void eps_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	eps_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void eps_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	pcb_fprintf(f, "%mi %mi %mi %mi r\n", x1, y1, x2, y2);
+}
+
+static void eps_calibrate(double xval, double yval)
+{
+	CRASH("eps_calibrate");
+}
+
+static void eps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static int eps_usage(const char *topic)
+{
+	fprintf(stderr, "\neps exporter command line arguments:\n\n");
+	pcb_hid_usage(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x eps [eps options] foo.pcb\n\n");
+	return 0;
+}
+
+void hid_eps_init()
+{
+	memset(&eps_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&eps_hid);
+	pcb_dhlp_draw_helpers_init(&eps_hid);
+
+	eps_hid.struct_size = sizeof(pcb_hid_t);
+	eps_hid.name = "eps";
+	eps_hid.description = "Encapsulated Postscript";
+	eps_hid.exporter = 1;
+
+	eps_hid.get_export_options = eps_get_export_options;
+	eps_hid.do_export = eps_do_export;
+	eps_hid.parse_arguments = eps_parse_arguments;
+	eps_hid.set_layer_group = eps_set_layer_group;
+	eps_hid.make_gc = eps_make_gc;
+	eps_hid.destroy_gc = eps_destroy_gc;
+	eps_hid.set_drawing_mode = eps_set_drawing_mode;
+	eps_hid.set_color = eps_set_color;
+	eps_hid.set_line_cap = eps_set_line_cap;
+	eps_hid.set_line_width = eps_set_line_width;
+	eps_hid.set_draw_xor = eps_set_draw_xor;
+	eps_hid.draw_line = eps_draw_line;
+	eps_hid.draw_arc = eps_draw_arc;
+	eps_hid.draw_rect = eps_draw_rect;
+	eps_hid.fill_circle = eps_fill_circle;
+	eps_hid.fill_polygon = eps_fill_polygon;
+	eps_hid.fill_polygon_offs = eps_fill_polygon_offs;
+	eps_hid.fill_rect = eps_fill_rect;
+	eps_hid.calibrate = eps_calibrate;
+	eps_hid.set_crosshair = eps_set_crosshair;
+
+	eps_hid.usage = eps_usage;
+
+	pcb_hid_register_hid(&eps_hid);
+}
Index: tags/2.0.1/src_plugins/export_ps/export_ps.pup
===================================================================
--- tags/2.0.1/src_plugins/export_ps/export_ps.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/export_ps.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class export
+$short postscript pcb_exporter
+$long Export postscript or embedded postscript.
+$state works
+$fmt-native no
+$fmt-feature-w render black&white postscript (single or multiple files)
+$fmt-feature-w render black&white or color embedded postscript (single file)
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_ps/ps.c
===================================================================
--- tags/2.0.1/src_plugins/export_ps/ps.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/ps.c	(revision 18980)
@@ -0,0 +1,1600 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>							/* not used */
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>							/* not used */
+#include <time.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "layer.h"
+#include "error.h"
+#include "draw.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_cam.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "ps.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_flags.h"
+#include "actions.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "stub_draw.h"
+
+const char *ps_cookie = "ps HID";
+
+static int ps_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
+static void use_gc(pcb_hid_gc_t gc);
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	pcb_coord_t width;
+	unsigned char r, g, b;
+	int erase;
+	int faded;
+} hid_gc_s;
+
+static const char *medias[] = {
+	"A0", "A1", "A2", "A3", "A4", "A5",
+	"A6", "A7", "A8", "A9", "A10",
+	"B0", "B1", "B2", "B3", "B4", "B5",
+	"B6", "B7", "B8", "B9", "B10",
+	"Letter", "11x17", "Ledger",
+	"Legal", "Executive",
+	"A-Size", "B-size",
+	"C-Size", "D-size", "E-size",
+	"US-Business_Card", "Intl-Business_Card",
+	0
+};
+
+typedef struct {
+	const char *name;
+	pcb_coord_t Width, Height;
+	pcb_coord_t MarginX, MarginY;
+} MediaType, *MediaTypePtr;
+
+/*
+ * Metric ISO sizes in mm.  See http://en.wikipedia.org/wiki/ISO_paper_sizes
+ *
+ * A0  841 x 1189
+ * A1  594 x 841
+ * A2  420 x 594
+ * A3  297 x 420
+ * A4  210 x 297
+ * A5  148 x 210
+ * A6  105 x 148
+ * A7   74 x 105
+ * A8   52 x  74
+ * A9   37 x  52
+ * A10  26 x  37
+ *
+ * B0  1000 x 1414
+ * B1   707 x 1000
+ * B2   500 x  707
+ * B3   353 x  500
+ * B4   250 x  353
+ * B5   176 x  250
+ * B6   125 x  176
+ * B7    88 x  125
+ * B8    62 x   88
+ * B9    44 x   62
+ * B10   31 x   44
+ *
+ * awk '{printf("  {\"%s\", %d, %d, MARGINX, MARGINY},\n", $2, $3*100000/25.4, $5*100000/25.4)}'
+ *
+ * See http://en.wikipedia.org/wiki/Paper_size#Loose_sizes for some of the other sizes.  The
+ * {A,B,C,D,E}-Size here are the ANSI sizes and not the architectural sizes.
+ */
+
+#define MARGINX PCB_MIL_TO_COORD(500)
+#define MARGINY PCB_MIL_TO_COORD(500)
+
+static MediaType media_data[] = {
+	{"A0", PCB_MM_TO_COORD(841), PCB_MM_TO_COORD(1189), MARGINX, MARGINY},
+	{"A1", PCB_MM_TO_COORD(594), PCB_MM_TO_COORD(841), MARGINX, MARGINY},
+	{"A2", PCB_MM_TO_COORD(420), PCB_MM_TO_COORD(594), MARGINX, MARGINY},
+	{"A3", PCB_MM_TO_COORD(297), PCB_MM_TO_COORD(420), MARGINX, MARGINY},
+	{"A4", PCB_MM_TO_COORD(210), PCB_MM_TO_COORD(297), MARGINX, MARGINY},
+	{"A5", PCB_MM_TO_COORD(148), PCB_MM_TO_COORD(210), MARGINX, MARGINY},
+	{"A6", PCB_MM_TO_COORD(105), PCB_MM_TO_COORD(148), MARGINX, MARGINY},
+	{"A7", PCB_MM_TO_COORD(74), PCB_MM_TO_COORD(105), MARGINX, MARGINY},
+	{"A8", PCB_MM_TO_COORD(52), PCB_MM_TO_COORD(74), MARGINX, MARGINY},
+	{"A9", PCB_MM_TO_COORD(37), PCB_MM_TO_COORD(52), MARGINX, MARGINY},
+	{"A10", PCB_MM_TO_COORD(26), PCB_MM_TO_COORD(37), MARGINX, MARGINY},
+	{"B0", PCB_MM_TO_COORD(1000), PCB_MM_TO_COORD(1414), MARGINX, MARGINY},
+	{"B1", PCB_MM_TO_COORD(707), PCB_MM_TO_COORD(1000), MARGINX, MARGINY},
+	{"B2", PCB_MM_TO_COORD(500), PCB_MM_TO_COORD(707), MARGINX, MARGINY},
+	{"B3", PCB_MM_TO_COORD(353), PCB_MM_TO_COORD(500), MARGINX, MARGINY},
+	{"B4", PCB_MM_TO_COORD(250), PCB_MM_TO_COORD(353), MARGINX, MARGINY},
+	{"B5", PCB_MM_TO_COORD(176), PCB_MM_TO_COORD(250), MARGINX, MARGINY},
+	{"B6", PCB_MM_TO_COORD(125), PCB_MM_TO_COORD(176), MARGINX, MARGINY},
+	{"B7", PCB_MM_TO_COORD(88), PCB_MM_TO_COORD(125), MARGINX, MARGINY},
+	{"B8", PCB_MM_TO_COORD(62), PCB_MM_TO_COORD(88), MARGINX, MARGINY},
+	{"B9", PCB_MM_TO_COORD(44), PCB_MM_TO_COORD(62), MARGINX, MARGINY},
+	{"B10", PCB_MM_TO_COORD(31), PCB_MM_TO_COORD(44), MARGINX, MARGINY},
+	{"Letter", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"11x17", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY},
+	{"Ledger", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"Legal", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(14), MARGINX, MARGINY},
+	{"Executive", PCB_INCH_TO_COORD(7.5), PCB_INCH_TO_COORD(10), MARGINX, MARGINY},
+	{"A-size", PCB_INCH_TO_COORD(8.5), PCB_INCH_TO_COORD(11), MARGINX, MARGINY},
+	{"B-size", PCB_INCH_TO_COORD(11), PCB_INCH_TO_COORD(17), MARGINX, MARGINY},
+	{"C-size", PCB_INCH_TO_COORD(17), PCB_INCH_TO_COORD(22), MARGINX, MARGINY},
+	{"D-size", PCB_INCH_TO_COORD(22), PCB_INCH_TO_COORD(34), MARGINX, MARGINY},
+	{"E-size", PCB_INCH_TO_COORD(34), PCB_INCH_TO_COORD(44), MARGINX, MARGINY},
+	{"US-Business_Card", PCB_INCH_TO_COORD(3.5), PCB_INCH_TO_COORD(2.0), 0, 0},
+	{"Intl-Business_Card", PCB_INCH_TO_COORD(3.375), PCB_INCH_TO_COORD(2.125), 0, 0}
+};
+
+#undef MARGINX
+#undef MARGINY
+
+static pcb_cam_t ps_cam;
+
+pcb_hid_attribute_t ps_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --psfile <string>
+Name of the postscript output file. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"psfile", "Postscript output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_psfile 0
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex drill-helper
+@item --drill-helper
+Print a centering target in large drill holes.
+@end ftable
+%end-doc
+*/
+	{"drill-helper", "Print a centering target in large drill holes",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_drillhelper 1
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex align-marks
+@item --align-marks
+Print alignment marks on each sheet. This is meant to ease alignment during exposure.
+@end ftable
+%end-doc
+*/
+	{"align-marks", "Print alignment marks on each sheet",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_alignmarks 2
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --outline
+Print the contents of the outline layer on each sheet.
+@end ftable
+%end-doc
+*/
+	{"outline", "Print outline on each sheet",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_outline 3
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --mirror
+Print mirror image.
+@end ftable
+%end-doc
+*/
+	{"mirror", "Print mirror image of every page",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_mirror 4
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --fill-page
+Scale output to make the board fit the page.
+@end ftable
+%end-doc
+*/
+	{"fill-page", "Scale board to fill page",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_fillpage 5
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --auto-mirror
+Print mirror image of appropriate layers.
+@end ftable
+%end-doc
+*/
+	{"auto-mirror", "Print mirror image of appropriate layers",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_automirror 6
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --ps-color
+Postscript output in color.
+@end ftable
+%end-doc
+*/
+	{"ps-color", "Prints in color",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_color 7
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex ps-bloat
+@item --ps-bloat <num>
+Amount to add to trace/pad/pin edges.
+@end ftable
+%end-doc
+*/
+	{"ps-bloat", "Amount to add to trace/pad/pin edges",
+	 PCB_HATT_COORD, -PCB_MIL_TO_COORD(100), PCB_MIL_TO_COORD(100), {0, 0, 0}, 0, 0},
+#define HA_psbloat 8
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex ps-invert
+@item --ps-invert
+Draw objects as white-on-black.
+@end ftable
+%end-doc
+*/
+	{"ps-invert", "Draw objects as white-on-black",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_psinvert 9
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --media <media-name>
+Size of the media, the postscript is fitted to. The parameter
+@code{<media-name>} can be any of the standard names for paper size: @samp{A0}
+to @samp{A10}, @samp{B0} to @samp{B10}, @samp{Letter}, @samp{11x17},
+@samp{Ledger}, @samp{Legal}, @samp{Executive}, @samp{A-Size}, @samp{B-size},
+@samp{C-Size}, @samp{D-size}, @samp{E-size}, @samp{US-Business_Card},
+@samp{Intl-Business_Card}.
+@end ftable
+%end-doc
+*/
+	{"media", "media type",
+	 PCB_HATT_ENUM, 0, 0, {22, 0, 0}, medias, 0},
+#define HA_media 10
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex psfade
+@item --psfade <num>
+Fade amount for assembly drawings (0.0=missing, 1.0=solid).
+@end ftable
+%end-doc
+*/
+	{"psfade", "Fade amount for assembly drawings (0.0=missing, 1.0=solid)",
+	 PCB_HATT_REAL, 0, 1, {0, 0, 0.40}, 0, 0},
+#define HA_psfade 11
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --scale <num>
+Scale value to compensate for printer sizing errors (1.0 = full scale).
+@end ftable
+%end-doc
+*/
+	{"scale", "Scale value to compensate for printer sizing errors (1.0 = full scale)",
+	 PCB_HATT_REAL, 0.01, 4, {0, 0, 1.00}, 0, 0},
+#define HA_scale 12
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex multi-file
+@item --multi-file
+Produce multiple files, one per page, instead of a single multi page file.
+@end ftable
+%end-doc
+*/
+	{"multi-file", "Produce multiple files, one per page, instead of a single file",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0.40}, 0, 0},
+#define HA_multifile 13
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --xcalib <num>
+Paper width. Used for x-Axis calibration.
+@end ftable
+%end-doc
+*/
+	{"xcalib", "Paper width. Used for x-Axis calibration",
+	 PCB_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0},
+#define HA_xcalib 14
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --ycalib <num>
+Paper height. Used for y-Axis calibration.
+@end ftable
+%end-doc
+*/
+	{"ycalib", "Paper height. Used for y-Axis calibration",
+	 PCB_HATT_REAL, 0, 2, {0, 0, 1.0}, 0, 0},
+#define HA_ycalib 15
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@item --drill-copper
+Draw drill holes in pins / vias, instead of leaving solid copper.
+@end ftable
+%end-doc
+*/
+	{"drill-copper", "Draw drill holes in pins / vias, instead of leaving solid copper",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_drillcopper 16
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex show-legend
+@item --show-legend
+Print file name and scale on printout.
+@end ftable
+%end-doc
+*/
+	{"show-legend", "Print file name and scale on printout",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_legend 17
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex show-toc
+@item --show-toc
+Generate Table of Contents
+@end ftable
+%end-doc
+*/
+	{"show-toc", "Print Table of Content",
+	 PCB_HATT_BOOL, 0, 0, {1, 0, 0}, 0, 0},
+#define HA_toc 18
+
+
+/* %start-doc options "91 Postscript Export"
+@ftable @code
+@cindex single-page
+@item --single-page
+Merge all drawings on a single page
+@end ftable
+%end-doc
+*/
+	{"single-page", "Merge all drawings on a single page",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_single_page 19
+
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_cam 20
+
+};
+
+#define NUM_OPTIONS (sizeof(ps_attribute_list)/sizeof(ps_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(ps_attribute_list, ps_cookie)
+
+/* All file-scope data is in global struct */
+static struct {
+	double calibration_x, calibration_y;
+
+	FILE *f;
+	int pagecount;
+	pcb_coord_t linewidth;
+	double fade_ratio;
+	pcb_bool multi_file;
+	pcb_coord_t media_width, media_height, ps_width, ps_height;
+
+	const char *filename;
+	pcb_bool drill_helper;
+	pcb_bool align_marks;
+	pcb_bool outline;
+	pcb_bool mirror;
+	pcb_bool fillpage;
+	pcb_bool automirror;
+	pcb_bool incolor;
+	pcb_bool doing_toc;
+	pcb_coord_t bloat;
+	pcb_bool invert;
+	int media_idx;
+	pcb_bool drillcopper;
+	pcb_bool legend;
+	pcb_bool single_page;
+
+	pcb_layer_t *outline_layer;
+
+	double scale_factor;
+
+	pcb_hid_expose_ctx_t exps;
+
+	pcb_hid_attr_val_t ps_values[NUM_OPTIONS];
+
+	pcb_bool is_mask;
+	pcb_bool is_drill;
+	pcb_bool is_assy;
+	pcb_bool is_copper;
+	pcb_bool is_paste;
+
+	pcb_composite_op_t drawing_mode;
+} global;
+
+static pcb_hid_attribute_t *ps_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &ps_attribute_list[HA_psfile], ".ps", &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return ps_attribute_list;
+}
+
+static pcb_layergrp_id_t group_for_layer(int l)
+{
+	if (l < pcb_max_layer && l >= 0)
+		return pcb_layer_get_group(PCB, l);
+	/* else something unique */
+	return pcb_max_group(PCB) + 3 + l;
+}
+
+static int layer_sort(const void *va, const void *vb)
+{
+	int a = *(int *) va;
+	int b = *(int *) vb;
+	int d = group_for_layer(b) - group_for_layer(a);
+	if (d)
+		return d;
+	return b - a;
+}
+
+void ps_start_file(FILE * f)
+{
+	time_t currenttime = time(NULL);
+
+	fprintf(f, "%%!PS-Adobe-3.0\n");
+
+	/* Document Structuring Conventions (DCS): */
+
+	/* Start General Header Comments: */
+
+	/*
+	 * %%Title DCS provides text title for the document that is useful
+	 * for printing banner pages.
+	 */
+	fprintf(f, "%%%%Title: %s\n", PCB->Filename);
+
+	/*
+	 * %%CreationDate DCS indicates the date and time the document was
+	 * created. Neither the date nor time need be in any standard
+	 * format. This comment is meant to be used purely for informational
+	 * purposes, such as printing on banner pages.
+	 */
+	fprintf(f, "%%%%CreationDate: %s", asctime(localtime(&currenttime)));
+
+	/*
+	 * %%Creator DCS indicates the document creator, usually the name of
+	 * the document composition software.
+	 */
+	fprintf(f, "%%%%Creator: PCB release: pcb-rnd " PCB_VERSION "\n");
+
+	/*
+	 * %%Version DCS comment can be used to note the version and
+	 * revision number of a document or resource. A document manager may
+	 * wish to provide version control services, or allow substitution
+	 * of compatible versions/revisions of a resource or document.
+	 *
+	 * The format should be in the form of 'procname':
+	 *  <procname>::= < name> < version> < revision>
+	 *  < name> ::= < text>
+	 *  < version> ::= < real>
+	 *  < revision> ::= < uint>
+	 *
+	 * If a version numbering scheme is not used, these fields should
+	 * still be filled with a dummy value of 0.
+	 *
+	 * There is currently no code in PCB to manage this revision number.
+	 *
+	 */
+	fprintf(f, "%%%%Version: (PCB pcb-rnd " PCB_VERSION ") 0.0 0\n");
+
+
+	/*
+	 * %%PageOrder DCS is intended to help document managers determine
+	 * the order of pages in the document file, which in turn enables a
+	 * document manager optionally to reorder the pages.  'Ascend'-The
+	 * pages are in ascending order for example, 1-2-3-4-5-6.
+	 */
+	fprintf(f, "%%%%PageOrder: Ascend\n");
+
+	/*
+	 * %%Pages: < numpages> | (atend) < numpages> ::= < uint> (Total
+	 * %%number of pages)
+	 *
+	 * %%Pages DCS defines the number of virtual pages that a document
+	 * will image.  (atend) defers the count until the end of the file,
+	 * which is useful for dynamically generated contents.
+	 */
+	fprintf(f, "%%%%Pages: (atend)\n");
+
+	/*
+	 * %%DocumentMedia: <name> <width> <height> <weight> <color> <type>
+	 *
+	 * Substitute 0 or "" for N/A.  Width and height are in points
+	 * (1/72").
+	 *
+	 * Media sizes are in PCB units
+	 */
+	pcb_fprintf(f, "%%%%DocumentMedia: %s %f %f 0 \"\" \"\"\n",
+							media_data[global.media_idx].name,
+							72 * PCB_COORD_TO_INCH(media_data[global.media_idx].Width),
+							72 * PCB_COORD_TO_INCH(media_data[global.media_idx].Height));
+	pcb_fprintf(f, "%%%%DocumentPaperSizes: %s\n", media_data[global.media_idx].name);
+
+	/* End General Header Comments. */
+
+	/* General Body Comments go here. Currently there are none. */
+
+	/*
+	 * %%EndComments DCS indicates an explicit end to the header
+	 * comments of the document.  All global DCS's must preceded
+	 * this.  A blank line gives an implicit end to the comments.
+	 */
+	fprintf(f, "%%%%EndComments\n\n");
+}
+
+static void ps_end_file(FILE * f)
+{
+	/*
+	 * %%Trailer DCS must only occur once at the end of the document
+	 * script.  Any post-processing or cleanup should be contained in
+	 * the trailer of the document, which is anything that follows the
+	 * %%Trailer comment. Any of the document level structure comments
+	 * that were deferred by using the (atend) convention must be
+	 * mentioned in the trailer of the document after the %%Trailer
+	 * comment.
+	 */
+	fprintf(f, "%%%%Trailer\n");
+
+	/*
+	 * %%Pages was deferred until the end of the document via the
+	 * (atend) mentioned, in the General Header section.
+	 */
+	fprintf(f, "%%%%Pages: %d\n", global.pagecount);
+
+	/*
+	 * %%EOF DCS signifies the end of the document. When the document
+	 * manager sees this comment, it issues an end-of-file signal to the
+	 * PostScript interpreter.  This is done so system-dependent file
+	 * endings, such as Control-D and end-of-file packets, do not
+	 * confuse the PostScript interpreter.
+	 */
+	fprintf(f, "%%%%EOF\n");
+}
+
+static FILE *psopen(const char *base, const char *which)
+{
+	FILE *ps_open_file;
+	char *buf, *suff, *buf2;
+
+	if (!global.multi_file)
+		return pcb_fopen(base, "w");
+
+	buf = (char *) malloc(strlen(base) + strlen(which) + 5);
+
+	suff = (char *) strrchr(base, '.');
+	if (suff) {
+		strcpy(buf, base);
+		buf2 = strrchr(buf, '.');
+		sprintf(buf2, ".%s.%s", which, suff + 1);
+	}
+	else {
+		sprintf(buf, "%s.%s.ps", base, which);
+	}
+	printf("PS: open %s\n", buf);
+	ps_open_file = pcb_fopen(buf, "w");
+	free(buf);
+	return ps_open_file;
+}
+
+/* This is used by other HIDs that use a postscript format, like lpr
+   or eps.  */
+void ps_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options)
+{
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_layer_id_t lid;
+
+	conf_force_set_bool(conf_core.editor.thin_draw, 0);
+	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+	conf_force_set_bool(conf_core.editor.check_planes, 0);
+
+	global.f = the_file;
+	global.drill_helper = options[HA_drillhelper].int_value;
+	global.align_marks = options[HA_alignmarks].int_value;
+	global.outline = options[HA_outline].int_value;
+	global.mirror = options[HA_mirror].int_value;
+	global.fillpage = options[HA_fillpage].int_value;
+	global.automirror = options[HA_automirror].int_value;
+	global.incolor = options[HA_color].int_value;
+	global.bloat = options[HA_psbloat].coord_value;
+	global.invert = options[HA_psinvert].int_value;
+	global.fade_ratio = PCB_CLAMP(options[HA_psfade].real_value, 0, 1);
+	global.media_idx = options[HA_media].int_value;
+	global.media_width = media_data[global.media_idx].Width;
+	global.media_height = media_data[global.media_idx].Height;
+	global.ps_width = global.media_width - 2.0 * media_data[global.media_idx].MarginX;
+	global.ps_height = global.media_height - 2.0 * media_data[global.media_idx].MarginY;
+	global.scale_factor = options[HA_scale].real_value;
+	global.calibration_x = options[HA_xcalib].real_value;
+	global.calibration_y = options[HA_ycalib].real_value;
+	global.drillcopper = options[HA_drillcopper].int_value;
+	global.legend = options[HA_legend].int_value;
+	global.single_page = options[HA_single_page].int_value;
+
+	if (the_file)
+		ps_start_file(the_file);
+
+	if (global.fillpage) {
+		double zx, zy;
+		if (PCB->MaxWidth > PCB->MaxHeight) {
+			zx = global.ps_height / PCB->MaxWidth;
+			zy = global.ps_width / PCB->MaxHeight;
+		}
+		else {
+			zx = global.ps_height / PCB->MaxHeight;
+			zy = global.ps_width / PCB->MaxWidth;
+		}
+		global.scale_factor *= MIN(zx, zy);
+	}
+
+	lid = -1;
+	pcb_layer_list(PCB, PCB_LYT_OUTLINE, &lid, 1);
+	if (lid >= 0)
+		global.outline_layer = pcb_get_layer(PCB->Data, lid);
+	else
+		global.outline_layer = NULL;
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+	qsort(pcb_layer_stack, pcb_max_layer, sizeof(pcb_layer_stack[0]), layer_sort);
+
+	global.linewidth = -1;
+	/* reset static vars */
+	ps_set_layer_group(-1, -1, 0, -1);
+	use_gc(NULL);
+
+	global.exps.view.X1 = 0;
+	global.exps.view.Y1 = 0;
+	global.exps.view.X2 = PCB->MaxWidth;
+	global.exps.view.Y2 = PCB->MaxHeight;
+
+	if ((!global.multi_file) && (options[HA_toc].int_value)) {
+		/* %%Page DSC requires both a label and an ordinal */
+		fprintf(the_file, "%%%%Page: TableOfContents 1\n");
+		fprintf(the_file, "/Times-Roman findfont 24 scalefont setfont\n");
+		fprintf(the_file, "/rightshow { /s exch def s stringwidth pop -1 mul 0 rmoveto s show } def\n");
+		fprintf(the_file, "/y 72 9 mul def /toc { 100 y moveto show /y y 24 sub def } bind def\n");
+		fprintf(the_file, "/tocp { /y y 12 sub def 90 y moveto rightshow } bind def\n");
+
+		global.doing_toc = 1;
+		global.pagecount = 1;				/* 'pagecount' is modified by pcb_hid_expose_all() call */
+		pcb_hid_expose_all(&ps_hid, &global.exps);
+	}
+
+	global.pagecount = 1;					/* Reset 'pagecount' if single file */
+	global.doing_toc = 0;
+	ps_set_layer_group(-1, -1, 0, -1); /* reset static vars */
+	pcb_hid_expose_all(&ps_hid, &global.exps);
+
+	if (the_file)
+		fprintf(the_file, "showpage\n");
+
+	memcpy(pcb_layer_stack, saved_layer_stack, sizeof(pcb_layer_stack));
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void ps_do_export(pcb_hid_attr_val_t * options)
+{
+	FILE *fh;
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+
+	if (!options) {
+		ps_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			global.ps_values[i] = ps_attribute_list[i].default_val;
+		options = global.ps_values;
+	}
+
+	pcb_cam_begin(PCB, &ps_cam, options[HA_cam].str_value, ps_attribute_list, NUM_OPTIONS, options);
+
+	global.filename = options[HA_psfile].str_value;
+	if (!global.filename)
+		global.filename = "pcb-out.ps";
+
+	/* cam mode shall result in a single file, no matter what other attributes say */
+	if (ps_cam.active)
+		global.multi_file = 0;
+	else
+		global.multi_file = options[HA_multifile].int_value;
+
+	if (global.multi_file)
+		fh = 0;
+	else {
+		fh = psopen(ps_cam.active ? ps_cam.fn : global.filename, "toc");
+		if (!fh) {
+			perror(global.filename);
+			return;
+		}
+	}
+
+	if (!ps_cam.active)
+		pcb_hid_save_and_show_layer_ons(save_ons);
+	ps_hid_export_to_file(fh, options);
+	if (!ps_cam.active)
+		pcb_hid_restore_layer_ons(save_ons);
+
+	global.multi_file = 0;
+	if (fh) {
+		ps_end_file(fh);
+		fclose(fh);
+	}
+
+	if (pcb_cam_end(&ps_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+}
+
+static int ps_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static void corner(FILE * fh, pcb_coord_t x, pcb_coord_t y, int dx, int dy)
+{
+	pcb_coord_t len = PCB_MIL_TO_COORD(2000);
+	pcb_coord_t len2 = PCB_MIL_TO_COORD(200);
+	pcb_coord_t thick = 0;
+	/*
+	 * Originally 'thick' used thicker lines.  Currently is uses
+	 * Postscript's "device thin" line - i.e. zero width means one
+	 * device pixel.  The code remains in case you want to make them
+	 * thicker - it needs to offset everything so that the *edge* of the
+	 * thick line lines up with the edge of the board, not the *center*
+	 * of the thick line.
+	 */
+
+	pcb_fprintf(fh, "gsave %mi setlinewidth %mi %mi translate %d %d scale\n", thick * 2, x, y, dx, dy);
+	pcb_fprintf(fh, "%mi %mi moveto %mi %mi %mi 0 90 arc %mi %mi lineto\n", len, thick, thick, thick, len2 + thick, thick, len);
+	if (dx < 0 && dy < 0)
+		pcb_fprintf(fh, "%mi %mi moveto 0 %mi rlineto\n", len2 * 2 + thick, thick, -len2);
+	fprintf(fh, "stroke grestore\n");
+}
+
+static int ps_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	char tmp_fn[PCB_PATH_MAX];
+	char tmp_ln[PCB_PATH_MAX];
+	static int lastgroup = -1;
+	time_t currenttime;
+	const char *name;
+	int newpage;
+
+	if (is_empty == -1) {
+		lastgroup = -1;
+		return 0;
+	}
+
+
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	pcb_cam_set_layer_group(&ps_cam, group, flags);
+
+	if (!ps_cam.active) {
+		if (flags & PCB_LYT_NOEXPORT)
+			return 0;
+
+		if (is_empty)
+			return 0;
+
+		if ((group >= 0) && pcb_layergrp_is_empty(PCB, group))
+			return 0;
+
+		if (flags & PCB_LYT_INVIS)
+			return 0;
+
+		if (flags & PCB_LYT_CSECT) /* not yet finished */
+			return 0;
+	}
+
+
+	name = pcb_layer_to_file_name(tmp_ln, layer, flags, PCB_FNS_fixed);
+
+	global.is_drill = ((flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL));
+	global.is_mask = !!(flags & PCB_LYT_MASK);
+	global.is_assy = !!(flags & PCB_LYT_ASSY);
+	global.is_copper = !!(flags & PCB_LYT_COPPER);
+	global.is_paste = !!(flags & PCB_LYT_PASTE);
+
+#if 0
+	printf("Layer %s group %d drill %d mask %d\n", name, group, global.is_drill, global.is_mask);
+#endif
+
+	if (global.doing_toc) {
+		if (group < 0 || group != lastgroup) {
+			if (global.pagecount == 1) {
+				currenttime = time(NULL);
+				fprintf(global.f, "30 30 moveto (%s) show\n", PCB->Filename);
+
+				fprintf(global.f, "(%d.) tocp\n", global.pagecount);
+				fprintf(global.f, "(Table of Contents \\(This Page\\)) toc\n");
+
+				fprintf(global.f, "(Created on %s) toc\n", asctime(localtime(&currenttime)));
+				fprintf(global.f, "( ) tocp\n");
+			}
+
+			global.pagecount++;
+			lastgroup = group;
+			fprintf(global.f, "(%d.) tocp\n", global.single_page ? 2 : global.pagecount);
+		}
+		fprintf(global.f, "(%s) toc\n", name);
+		return 0;
+	}
+
+	newpage = (group < 0 || group != lastgroup);
+	if ((global.pagecount > 1) && global.single_page)
+		newpage = 0;
+	if (newpage) {
+		double boffset;
+		int mirror_this = 0;
+		lastgroup = group;
+
+		if (global.pagecount != 0) {
+			pcb_fprintf(global.f, "showpage\n");
+		}
+		global.pagecount++;
+		if (global.multi_file) {
+			if (global.f) {
+				ps_end_file(global.f);
+				fclose(global.f);
+			}
+			global.f = psopen(global.filename, pcb_layer_to_file_name(tmp_fn, layer, flags, PCB_FNS_fixed));
+			if (!global.f) {
+				perror(global.filename);
+				return 0;
+			}
+
+			ps_start_file(global.f);
+		}
+
+		/*
+		 * %%Page DSC comment marks the beginning of the PostScript
+		 * language instructions that describe a particular
+		 * page. %%Page: requires two arguments: a page label and a
+		 * sequential page number. The label may be anything, but the
+		 * ordinal page number must reflect the position of that page in
+		 * the body of the PostScript file and must start with 1, not 0.
+		 */
+		fprintf(global.f, "%%%%Page: %s %d\n", pcb_layer_to_file_name(tmp_fn, layer, flags, PCB_FNS_fixed), global.pagecount);
+
+		if (global.mirror)
+			mirror_this = !mirror_this;
+		if (global.automirror && (flags & PCB_LYT_BOTTOM))
+			mirror_this = !mirror_this;
+
+		fprintf(global.f, "/Helvetica findfont 10 scalefont setfont\n");
+		if (global.legend) {
+			fprintf(global.f, "30 30 moveto (%s) show\n", PCB->Filename);
+			if (PCB->Name)
+				fprintf(global.f, "30 41 moveto (%s, %s) show\n", PCB->Name, pcb_layer_to_file_name(tmp_fn, layer, flags, PCB_FNS_fixed));
+			else
+				fprintf(global.f, "30 41 moveto (%s) show\n", pcb_layer_to_file_name(tmp_fn, layer, flags, PCB_FNS_fixed));
+			if (mirror_this)
+				fprintf(global.f, "( \\(mirrored\\)) show\n");
+
+			if (global.fillpage)
+				fprintf(global.f, "(, not to scale) show\n");
+			else
+				fprintf(global.f, "(, scale = 1:%.3f) show\n", global.scale_factor);
+		}
+		fprintf(global.f, "newpath\n");
+
+		pcb_fprintf(global.f, "72 72 scale %mi %mi translate\n", global.media_width / 2, global.media_height / 2);
+
+		boffset = global.media_height / 2;
+		if (PCB->MaxWidth > PCB->MaxHeight) {
+			fprintf(global.f, "90 rotate\n");
+			boffset = global.media_width / 2;
+			fprintf(global.f, "%g %g scale %% calibration\n", global.calibration_y, global.calibration_x);
+		}
+		else
+			fprintf(global.f, "%g %g scale %% calibration\n", global.calibration_x, global.calibration_y);
+
+		if (mirror_this)
+			fprintf(global.f, "1 -1 scale\n");
+
+		fprintf(global.f, "%g dup neg scale\n", (flags & PCB_LYT_FAB) ? 1.0 : global.scale_factor);
+		pcb_fprintf(global.f, "%mi %mi translate\n", -PCB->MaxWidth / 2, -PCB->MaxHeight / 2);
+
+		/* Keep the drill list from falling off the left edge of the paper,
+		 * even if it means some of the board falls off the right edge.
+		 * If users don't want to make smaller boards, or use fewer drill
+		 * sizes, they can always ignore this sheet. */
+		if (flags & PCB_LYT_FAB) {
+			pcb_coord_t natural = boffset - PCB_MIL_TO_COORD(500) - PCB->MaxHeight / 2;
+			pcb_coord_t needed = pcb_stub_draw_fab_overhang();
+			pcb_fprintf(global.f, "%% PrintFab overhang natural %mi, needed %mi\n", natural, needed);
+			if (needed > natural)
+				pcb_fprintf(global.f, "0 %mi translate\n", needed - natural);
+		}
+
+		if (global.invert) {
+			fprintf(global.f, "/gray { 1 exch sub setgray } bind def\n");
+			fprintf(global.f, "/rgb { 1 1 3 { pop 1 exch sub 3 1 roll } for setrgbcolor } bind def\n");
+		}
+		else {
+			fprintf(global.f, "/gray { setgray } bind def\n");
+			fprintf(global.f, "/rgb { setrgbcolor } bind def\n");
+		}
+
+		if ((global.outline && !global.outline_layer) ||global.invert) {
+			pcb_fprintf(global.f,
+									"0 setgray 0 setlinewidth 0 0 moveto 0 "
+									"%mi lineto %mi %mi lineto %mi 0 lineto closepath %s\n",
+									PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight, PCB->MaxWidth, global.invert ? "fill" : "stroke");
+		}
+
+		if (global.align_marks) {
+			corner(global.f, 0, 0, -1, -1);
+			corner(global.f, PCB->MaxWidth, 0, 1, -1);
+			corner(global.f, PCB->MaxWidth, PCB->MaxHeight, 1, 1);
+			corner(global.f, 0, PCB->MaxHeight, -1, 1);
+		}
+
+		global.linewidth = -1;
+		use_gc(NULL);								/* reset static vars */
+
+		fprintf(global.f,
+						"/ts 1 def\n"
+						"/ty ts neg def /tx 0 def /Helvetica findfont ts scalefont setfont\n"
+						"/t { moveto lineto stroke } bind def\n"
+						"/dr { /y2 exch def /x2 exch def /y1 exch def /x1 exch def\n"
+						"      x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath stroke } bind def\n");
+		fprintf(global.f,"/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def\n"
+						"     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def\n"
+						"/c { 0 360 arc fill } bind def\n"
+						"/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def\n");
+		if (global.drill_helper)
+			pcb_fprintf(global.f,
+									"/dh { gsave %mi setlinewidth 0 gray %mi 0 360 arc stroke grestore} bind def\n",
+									(pcb_coord_t) PCB_MIN_PINORVIAHOLE, (pcb_coord_t) (PCB_MIN_PINORVIAHOLE * 3 / 2));
+	}
+#if 0
+	/* Try to outsmart ps2pdf's heuristics for page rotation, by putting
+	 * text on all pages -- even if that text is blank */
+	if (!(flags & PCB_LYT_FAB))
+		fprintf(global.f, "gsave tx ty translate 1 -1 scale 0 0 moveto (Layer %s) show grestore newpath /ty ty ts sub def\n", name);
+	else
+		fprintf(global.f, "gsave tx ty translate 1 -1 scale 0 0 moveto ( ) show grestore newpath /ty ty ts sub def\n");
+#endif
+
+	/* If we're printing a layer other than the outline layer, and
+	   we want to "print outlines", and we have an outline layer,
+	   print the outline layer on this layer also.  */
+	if (global.outline &&
+			global.outline_layer != NULL &&
+			global.outline_layer != pcb_get_layer(PCB->Data, layer) &&
+			!(flags & PCB_LYT_OUTLINE)) {
+		int save_drill = global.is_drill;
+		global.is_drill = 0;
+		pcb_draw_layer(global.outline_layer, &global.exps.view);
+		global.is_drill = save_drill;
+	}
+
+	return 1;
+}
+
+static pcb_hid_gc_t ps_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(1, sizeof(hid_gc_s));
+	rv->me_pointer = &ps_hid;
+	rv->cap = pcb_cap_round;
+	return rv;
+}
+
+static void ps_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void ps_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	global.drawing_mode = op;
+}
+
+
+static void ps_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	if (global.drawing_mode == PCB_HID_COMP_NEGATIVE) {
+		gc->r = gc->g = gc->b = 255;
+		gc->erase = 0;
+	}
+	else if (strcmp(name, "drill") == 0) {
+		gc->r = gc->g = gc->b = 255;
+		gc->erase = 1;
+	}
+	else if (global.incolor) {
+		unsigned int r, g, b;
+		sscanf(name + 1, "%02x%02x%02x", &r, &g, &b);
+		gc->r = r;
+		gc->g = g;
+		gc->b = b;
+		gc->erase = 0;
+	}
+	else {
+		gc->r = gc->g = gc->b = 0;
+		gc->erase = 0;
+	}
+}
+
+static void ps_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void ps_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void ps_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+static void ps_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	gc->faded = faded;
+}
+
+static void use_gc(pcb_hid_gc_t gc)
+{
+	static int lastcap = -1;
+	static int lastcolor = -1;
+
+	if (gc == NULL) {
+		lastcap = lastcolor = -1;
+		return;
+	}
+	if (gc->me_pointer != &ps_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to ps HID\n");
+		abort();
+	}
+	if (global.linewidth != gc->width) {
+		pcb_fprintf(global.f, "%mi setlinewidth\n", gc->width + (gc->erase ? -2 : 2) * global.bloat);
+		global.linewidth = gc->width;
+	}
+	if (lastcap != gc->cap) {
+		int c;
+		switch (gc->cap) {
+		case pcb_cap_round:
+			c = 1;
+			break;
+		case pcb_cap_square:
+			c = 2;
+			break;
+		default:
+			assert(!"unhandled cap");
+			c = 1;
+		}
+		fprintf(global.f, "%d setlinecap %d setlinejoin\n", c, c);
+		lastcap = gc->cap;
+	}
+#define CBLEND(gc) (((gc->r)<<24)|((gc->g)<<16)|((gc->b)<<8)|(gc->faded))
+	if (lastcolor != CBLEND(gc)) {
+		if (global.is_drill || global.is_mask) {
+			fprintf(global.f, "%d gray\n", (gc->erase || global.is_mask) ? 0 : 1);
+			lastcolor = 0;
+		}
+		else {
+			double r, g, b;
+			r = gc->r;
+			g = gc->g;
+			b = gc->b;
+			if (gc->faded) {
+				r = (1 - global.fade_ratio) *255 + global.fade_ratio * r;
+				g = (1 - global.fade_ratio) *255 + global.fade_ratio * g;
+				b = (1 - global.fade_ratio) *255 + global.fade_ratio * b;
+			}
+			if (gc->r == gc->g && gc->g == gc->b)
+				fprintf(global.f, "%g gray\n", r / 255.0);
+			else
+				fprintf(global.f, "%g %g %g rgb\n", r / 255.0, g / 255.0, b / 255.0);
+			lastcolor = CBLEND(gc);
+		}
+	}
+}
+
+static void ps_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	pcb_fprintf(global.f, "%mi %mi %mi %mi dr\n", x1, y1, x2, y2);
+}
+
+static void ps_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+static void ps_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+
+static void ps_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+#if 0
+	/* If you're etching your own paste mask, this will reduce the
+	   amount of brass you need to etch by drawing outlines for large
+	   pads.  See also ps_fill_rect.  */
+	if (is_paste && gc->width > 2500 && gc->cap == pcb_cap_square && (x1 == x2 || y1 == y2)) {
+		pcb_coord_t t, w;
+		if (x1 > x2) {
+			t = x1;
+			x1 = x2;
+			x2 = t;
+		}
+		if (y1 > y2) {
+			t = y1;
+			y1 = y2;
+			y2 = t;
+		}
+		w = gc->width / 2;
+		ps_fill_rect(gc, x1 - w, y1 - w, x2 + w, y2 + w);
+		return;
+	}
+#endif
+	if (x1 == x2 && y1 == y2) {
+		pcb_coord_t w = gc->width / 2;
+		if (gc->cap == pcb_cap_square)
+			ps_fill_rect(gc, x1 - w, y1 - w, x1 + w, y1 + w);
+		else
+			ps_fill_circle(gc, x1, y1, w);
+		return;
+	}
+	use_gc(gc);
+	pcb_fprintf(global.f, "%mi %mi %mi %mi t\n", x1, y1, x2, y2);
+}
+
+static void ps_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_angle_t sa, ea;
+	double w;
+
+	if ((width == 0) && (height == 0)) {
+		/* degenerate case, draw dot */
+		ps_draw_line(gc, cx, cy, cx, cy);
+		return;
+	}
+
+	if (delta_angle > 0) {
+		sa = start_angle;
+		ea = start_angle + delta_angle;
+	}
+	else {
+		sa = start_angle + delta_angle;
+		ea = start_angle;
+	}
+#if 0
+	printf("draw_arc %d,%d %dx%d %d..%d %d..%d\n", cx, cy, width, height, start_angle, delta_angle, sa, ea);
+#endif
+	use_gc(gc);
+	w = width;
+	if (w == 0) /* make sure not to div by zero; this hack will have very similar effect */
+		w = 0.0001;
+	pcb_fprintf(global.f, "%ma %ma %mi %mi %mi %mi %f a\n",
+							sa, ea, -width, height, cx, cy, (double)(global.linewidth + 2 * global.bloat) / w);
+}
+
+static void ps_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	use_gc(gc);
+	if (!gc->erase || !global.is_copper || global.drillcopper) {
+		if (gc->erase && global.is_copper && global.drill_helper && radius >= conf_core.design.min_drill / 4)
+			radius = conf_core.design.min_drill / 4;
+		pcb_fprintf(global.f, "%mi %mi %mi c\n", cx, cy, radius + (gc->erase ? -1 : 1) * global.bloat);
+	}
+}
+
+static void ps_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	const char *op = "moveto";
+	use_gc(gc);
+	for (i = 0; i < n_coords; i++) {
+		pcb_fprintf(global.f, "%mi %mi %s\n", x[i]+dx, y[i]+dy, op);
+		op = "lineto";
+	}
+	fprintf(global.f, "fill\n");
+}
+
+static void ps_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	ps_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+typedef struct {
+	pcb_coord_t x1, y1, x2, y2;
+} lseg_t;
+
+typedef struct {
+	pcb_coord_t x, y;
+} lpoint_t;
+
+#define minmax(val, min, max) \
+do { \
+	if (val < min) min = val; \
+	if (val > max) max = val; \
+} while(0)
+
+#define lsegs_append(x1_, y1_, x2_, y2_) \
+do { \
+	if (y1_ < y2_) { \
+		lsegs[lsegs_used].x1 = x1_; \
+		lsegs[lsegs_used].y1 = y1_; \
+		lsegs[lsegs_used].x2 = x2_; \
+		lsegs[lsegs_used].y2 = y2_; \
+	} \
+	else { \
+		lsegs[lsegs_used].x2 = x1_; \
+		lsegs[lsegs_used].y2 = y1_; \
+		lsegs[lsegs_used].x1 = x2_; \
+		lsegs[lsegs_used].y1 = y2_; \
+	} \
+	lsegs_used++; \
+	minmax(y1_, lsegs_ymin, lsegs_ymax); \
+	minmax(y2_, lsegs_ymin, lsegs_ymax); \
+	minmax(x1_, lsegs_xmin, lsegs_xmax); \
+	minmax(x2_, lsegs_xmin, lsegs_xmax); \
+} while(0)
+
+#define lseg_line(x1_, y1_, x2_, y2_) \
+	do { \
+			fprintf(global.f, "newpath\n"); \
+			pcb_fprintf(global.f, "%mi %mi moveto\n", x1_, y1_); \
+			pcb_fprintf(global.f, "%mi %mi lineto\n", x2_, y2_); \
+			fprintf (global.f, "stroke\n"); \
+	} while(0)
+
+int coord_comp(const void *c1_, const void *c2_)
+{
+	const pcb_coord_t *c1 = c1_, *c2 = c2_;
+	return *c1 < *c2;
+}
+
+static void ps_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const pcb_box_t * clip_box)
+{
+	/* Ignore clip_box, just draw everything */
+
+	pcb_vnode_t *v;
+	pcb_pline_t *pl;
+	const char *op;
+	int len;
+
+	use_gc(gc);
+
+	pl = poly->Clipped->contours;
+	len = 0;
+
+	do {
+		v = pl->head.next;
+		op = "moveto";
+		do {
+			pcb_fprintf(global.f, "%mi %mi %s\n", v->point[0], v->point[1], op);
+			op = "lineto";
+			len++;
+		}
+		while ((v = v->next) != pl->head.next);
+		len++;
+	}
+	while ((pl = pl->next) != NULL);
+
+	fprintf(global.f, "fill\n");
+}
+
+static void ps_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	use_gc(gc);
+	if (x1 > x2) {
+		pcb_coord_t t = x1;
+		x1 = x2;
+		x2 = t;
+	}
+	if (y1 > y2) {
+		pcb_coord_t t = y1;
+		y1 = y2;
+		y2 = t;
+	}
+#if 0
+	/* See comment in ps_draw_line.  */
+	if (is_paste && (x2 - x1) > 2500 && (y2 - y1) > 2500) {
+		linewidth = 1000;
+		lastcap = pcb_cap_round;
+		fprintf(f, "1000 setlinewidth 1 setlinecap 1 setlinejoin\n");
+		fprintf(f, "%d %d moveto %d %d lineto %d %d lineto %d %d lineto closepath stroke\n",
+						x1 + 500 - bloat, y1 + 500 - bloat,
+						x1 + 500 - bloat, y2 - 500 + bloat, x2 - 500 + bloat, y2 - 500 + bloat, x2 - 500 + bloat, y1 + 500 - bloat);
+		return;
+	}
+#endif
+	pcb_fprintf(global.f, "%mi %mi %mi %mi r\n", x1 - global.bloat, y1 - global.bloat, x2 + global.bloat, y2 + global.bloat);
+}
+
+pcb_hid_attribute_t ps_calib_attribute_list[] = {
+	{"lprcommand", "Command to print",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+};
+
+static const char *const calib_lines[] = {
+	"%!PS-Adobe-3.0\n",
+	"%%Title: Calibration Page\n",
+	"%%PageOrder: Ascend\n",
+	"%%Pages: 1\n",
+	"%%EndComments\n",
+	"\n",
+	"%%Page: Calibrate 1\n",
+	"72 72 scale\n",
+	"\n",
+	"0 setlinewidth\n",
+	"0.375 0.375 moveto\n",
+	"8.125 0.375 lineto\n",
+	"8.125 10.625 lineto\n",
+	"0.375 10.625 lineto\n",
+	"closepath stroke\n",
+	"\n",
+	"0.5 0.5 translate\n",
+	"0.001 setlinewidth\n",
+	"\n",
+	"/Times-Roman findfont 0.2 scalefont setfont\n",
+	"\n",
+	"/sign {\n",
+	"    0 lt { -1 } { 1 } ifelse\n",
+	"} def\n",
+	"\n",
+	"/cbar {\n",
+	"    /units exch def\n",
+	"    /x exch def\n",
+	"    /y exch def  \n",
+	"\n",
+	"    /x x sign 0.5 mul def\n",
+	"\n",
+	"    0 setlinewidth\n",
+	"    newpath x y 0.25 0 180 arc gsave 0.85 setgray fill grestore closepath stroke\n",
+	"    newpath x 0 0.25 180 360 arc gsave 0.85 setgray fill grestore closepath stroke\n",
+	"    0.001 setlinewidth\n",
+	"\n",
+	"    x 0 moveto\n",
+	"    x y lineto\n",
+	"%    -0.07 -0.2 rlineto 0.14 0 rmoveto -0.07 0.2 rlineto\n",
+	"    x y lineto\n",
+	"    -0.1 0 rlineto 0.2 0 rlineto\n",
+	"    stroke\n",
+	"    x 0 moveto\n",
+	"%    -0.07 0.2 rlineto 0.14 0 rmoveto -0.07 -0.2 rlineto\n",
+	"    x 0 moveto\n",
+	"    -0.1 0 rlineto 0.2 0 rlineto\n",
+	"     stroke\n",
+	"\n",
+	"    x 0.1 add\n",
+	"    y 0.2 sub moveto\n",
+	"    units show\n",
+	"} bind def\n",
+	"\n",
+	"/y 9 def\n",
+	"/t {\n",
+	"    /str exch def\n",
+	"    1.5 y moveto str show\n",
+	"    /y y 0.25 sub def\n",
+	"} bind def\n",
+	"\n",
+	"(Please measure ONE of the horizontal lines, in the units indicated for)t\n",
+	"(that line, and enter that value as X.  Similarly, measure ONE of the)t\n",
+	"(vertical lines and enter that value as Y.  Measurements should be)t\n",
+	"(between the flat faces of the semicircles.)t\n",
+	"()t\n",
+	"(The large box is 10.25 by 7.75 inches)t\n",
+	"\n",
+	"/in { } bind def\n",
+	"/cm { 2.54 div } bind def\n",
+	"/mm { 25.4 div } bind def\n",
+	"\n",
+	0
+};
+
+static int guess(double val, double close_to, double *calib)
+{
+	if (val >= close_to * 0.9 && val <= close_to * 1.1) {
+		*calib = close_to / val;
+		return 0;
+	}
+	return 1;
+}
+
+void ps_calibrate_1(double xval, double yval, int use_command)
+{
+	pcb_hid_attr_val_t vals[3];
+	FILE *ps_cal_file;
+	int used_popen = 0, c;
+
+	if (xval > 0 && yval > 0) {
+		if (guess(xval, 4, &global.calibration_x))
+			if (guess(xval, 15, &global.calibration_x))
+				if (guess(xval, 7.5, &global.calibration_x)) {
+					if (xval < 2)
+						ps_attribute_list[HA_xcalib].default_val.real_value = global.calibration_x = xval;
+					else
+						pcb_message(PCB_MSG_ERROR, "X value of %g is too far off.\n" "Expecting it near: 1.0, 4.0, 15.0, 7.5\n", xval);
+				}
+		if (guess(yval, 4, &global.calibration_y))
+			if (guess(yval, 20, &global.calibration_y))
+				if (guess(yval, 10, &global.calibration_y)) {
+					if (yval < 2)
+						ps_attribute_list[HA_ycalib].default_val.real_value = global.calibration_y = yval;
+					else
+						pcb_message(PCB_MSG_ERROR, "Y value of %g is too far off.\n" "Expecting it near: 1.0, 4.0, 20.0, 10.0\n", yval);
+				}
+		return;
+	}
+
+	if (ps_calib_attribute_list[0].default_val.str_value == NULL) {
+		ps_calib_attribute_list[0].default_val.str_value = pcb_strdup("lpr");
+	}
+
+	if (pcb_attribute_dialog(ps_calib_attribute_list, 1, vals, _("Print Calibration Page"), _("Generates a printer calibration page"), NULL))
+		return;
+
+	if (use_command || strchr(vals[0].str_value, '|')) {
+		const char *cmd = vals[0].str_value;
+		while (*cmd == ' ' || *cmd == '|')
+			cmd++;
+		ps_cal_file = pcb_popen(cmd, "w");
+		used_popen = 1;
+	}
+	else
+		ps_cal_file = pcb_fopen(vals[0].str_value, "w");
+
+	for (c = 0; calib_lines[c]; c++)
+		fputs(calib_lines[c], ps_cal_file);
+
+	fprintf(ps_cal_file, "4 in 0.5 (Y in) cbar\n");
+	fprintf(ps_cal_file, "20 cm 1.5 (Y cm) cbar\n");
+	fprintf(ps_cal_file, "10 in 2.5 (Y in) cbar\n");
+	fprintf(ps_cal_file, "-90 rotate\n");
+	fprintf(ps_cal_file, "4 in -0.5 (X in) cbar\n");
+	fprintf(ps_cal_file, "15 cm -1.5 (X cm) cbar\n");
+	fprintf(ps_cal_file, "7.5 in -2.5 (X in) cbar\n");
+
+	fprintf(ps_cal_file, "showpage\n");
+
+	fprintf(ps_cal_file, "%%%%EOF\n");
+
+	if (used_popen)
+		pcb_pclose(ps_cal_file);
+	else
+		fclose(ps_cal_file);
+}
+
+static void ps_calibrate(double xval, double yval)
+{
+	ps_calibrate_1(xval, yval, 0);
+}
+
+static void ps_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static fgw_error_t pcb_act_PSCalib(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	ps_calibrate(0.0, 0.0);
+	return 0;
+}
+
+pcb_action_t hidps_action_list[] = {
+	{"pscalib", pcb_act_PSCalib, NULL, NULL}
+};
+
+PCB_REGISTER_ACTIONS(hidps_action_list, ps_cookie)
+
+
+#include "dolists.h"
+
+pcb_hid_t ps_hid;
+static int ps_inited = 0;
+void ps_ps_init(pcb_hid_t * hid)
+{
+	if (ps_inited)
+		return;
+
+	hid->get_export_options = ps_get_export_options;
+	hid->do_export = ps_do_export;
+	hid->parse_arguments = ps_parse_arguments;
+	hid->set_layer_group = ps_set_layer_group;
+	hid->make_gc = ps_make_gc;
+	hid->destroy_gc = ps_destroy_gc;
+	hid->set_drawing_mode = ps_set_drawing_mode;
+	hid->set_color = ps_set_color;
+	hid->set_line_cap = ps_set_line_cap;
+	hid->set_line_width = ps_set_line_width;
+	hid->set_draw_xor = ps_set_draw_xor;
+	hid->set_draw_faded = ps_set_draw_faded;
+	hid->draw_line = ps_draw_line;
+	hid->draw_arc = ps_draw_arc;
+	hid->draw_rect = ps_draw_rect;
+	hid->fill_circle = ps_fill_circle;
+	hid->fill_polygon_offs = ps_fill_polygon_offs;
+	hid->fill_polygon = ps_fill_polygon;
+	hid->fill_pcb_polygon = ps_fill_pcb_polygon;
+	hid->fill_rect = ps_fill_rect;
+	hid->calibrate = ps_calibrate;
+	hid->set_crosshair = ps_set_crosshair;
+
+	PCB_REGISTER_ACTIONS(hidps_action_list, ps_cookie)
+
+	ps_inited = 1;
+}
+
+static int ps_usage(const char *topic)
+{
+	fprintf(stderr, "\nps exporter command line arguments:\n\n");
+	pcb_hid_usage(ps_attribute_list, sizeof(ps_attribute_list) / sizeof(ps_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x ps [ps options] foo.pcb\n\n");
+	return 0;
+}
+
+static void plugin_ps_uninit(void)
+{
+	pcb_remove_actions_by_cookie(ps_cookie);
+	pcb_hid_remove_attributes_by_cookie(ps_cookie);
+	ps_inited = 0;
+}
+
+
+int pplg_check_ver_export_ps(int ver_needed) { return 0; }
+
+void pplg_uninit_export_ps(void)
+{
+	plugin_ps_uninit();
+}
+
+int pplg_init_export_ps(void)
+{
+	PCB_API_CHK_VER;
+	memset(&ps_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&ps_hid);
+	pcb_dhlp_draw_helpers_init(&ps_hid);
+	ps_ps_init(&ps_hid);
+
+	ps_hid.struct_size = sizeof(pcb_hid_t);
+	ps_hid.name = "ps";
+	ps_hid.description = "Postscript export";
+	ps_hid.exporter = 1;
+	ps_hid.mask_invert = 1;
+
+	ps_hid.usage = ps_usage;
+
+	pcb_hid_register_hid(&ps_hid);
+
+	hid_eps_init();
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_ps/ps.h
===================================================================
--- tags/2.0.1/src_plugins/export_ps/ps.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_ps/ps.h	(revision 18980)
@@ -0,0 +1,7 @@
+extern const char *ps_cookie;
+extern pcb_hid_t ps_hid;
+extern void ps_hid_export_to_file(FILE *, pcb_hid_attr_val_t *);
+extern void ps_start_file(FILE *);
+extern void ps_calibrate_1(double, double, int);
+extern void hid_eps_init();
+void ps_ps_init(pcb_hid_t * hid);
Index: tags/2.0.1/src_plugins/export_stat/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_stat/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_stat/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_stat
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_stat/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_stat/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_stat/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_stat}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_stat/stat.o @]
+
+switch /local/pcb/export_stat/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_stat/export_stat.pup
===================================================================
--- tags/2.0.1/src_plugins/export_stat/export_stat.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_stat/export_stat.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short export board statistics
+$long Export various board statistics in lihata format
+$state works
+$fmt-native no
+$fmt-feature-w export a lihata file with anonimized statistics of the board
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_stat/stat.c
===================================================================
--- tags/2.0.1/src_plugins/export_stat/stat.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_stat/stat.c	(revision 18980)
@@ -0,0 +1,401 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2006 Dan McMahill
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+ *  Based on the png exporter by Dan McMahill
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+#include <time.h>
+#include <genht/htsi.h>
+#include <genht/hash.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "plugins.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "plug_io.h"
+#include "safe_fs.h"
+#include "obj_pstk_inlines.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+
+static pcb_hid_t stat_hid;
+
+const char *stat_cookie = "stat HID";
+
+pcb_hid_attribute_t stat_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+	{"outfile", "Output file name",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_statfile 0
+
+	{"board_id", "Short name of the board so it can be identified for updates",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_board_id 1
+
+	{"orig", "This design started its life in pcb-rnd",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_orig 2
+
+	{"lht_built", "This design was already in lihata when real boards got built",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_lht_built 3
+
+
+	{"built", "how many actual/physical boards got built",
+	 PCB_HATT_INTEGER, 0, 1000000, {0, 0, 0}, 0, 0},
+#define HA_built 4
+
+	{"first_ver", "the version of pcb-rnd you first used on this board",
+	 PCB_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0},
+#define HA_first_ver 5
+
+	{"license", "license of the design",
+	 PCB_HATT_STRING, 0, 0, {0, NULL, 0}, 0, 0},
+#define HA_license 6
+
+};
+
+#define NUM_OPTIONS (sizeof(stat_attribute_list)/sizeof(stat_attribute_list[0]))
+
+PCB_REGISTER_ATTRIBUTES(stat_attribute_list, stat_cookie)
+
+static pcb_hid_attr_val_t stat_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *stat_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".stat.lht";
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &stat_attribute_list[HA_statfile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return stat_attribute_list;
+}
+
+typedef struct layer_stat_s {
+	pcb_coord_t trace_len;
+	double copper_area;
+	unsigned long int lines, arcs, polys, elements;
+} layer_stat_t;
+
+static void stat_do_export(pcb_hid_attr_val_t * options)
+{
+	FILE *f;
+	const char *filename;
+	int i, lid;
+	pcb_layergrp_id_t lgid;
+	char buff[1024];
+	layer_stat_t ls, *lgs, lgss[PCB_MAX_LAYERGRP];
+	int nl, phg, hp, hup, group_not_empty[PCB_MAX_LAYERGRP];
+	pcb_cardinal_t num_etop = 0, num_ebottom = 0, num_esmd = 0, num_epads = 0, num_epins = 0, num_terms = 0;
+
+	memset(lgss, 0, sizeof(lgss));
+	memset(group_not_empty, 0, sizeof(group_not_empty));
+
+	if (!options) {
+		stat_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			stat_values[i] = stat_attribute_list[i].default_val;
+		options = stat_values;
+	}
+
+	filename = options[HA_statfile].str_value;
+	if (!filename)
+		filename = "pcb.stat.lht";
+
+	f = pcb_fopen(filename, "w");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	pcb_board_count_holes(PCB, &hp, &hup, NULL);
+	pcb_print_utc(buff, sizeof(buff), 0);
+
+	fprintf(f, "ha:pcb-rnd-board-stats-v2 {\n");
+	fprintf(f, "	ha:meta {\n");
+	fprintf(f, "		date=%s\n", buff);
+	fprintf(f, "		built=%d\n", options[HA_built].int_value);
+	fprintf(f, "		lht_built=%s\n", (options[HA_lht_built].int_value ? "yes" : "no"));
+	fprintf(f, "		orig_rnd=%s\n", (options[HA_orig].int_value ? "yes" : "no"));
+	fprintf(f, "		first_ver=%s\n", options[HA_first_ver].str_value);
+	fprintf(f, "		curr_ver=%s\n", PCB_VERSION);
+#ifdef PCB_REVISION
+	fprintf(f, "		curr_rev=%s\n", PCB_REVISION);
+#endif
+
+	fprintf(f, "	}\n");
+
+	fprintf(f, "	li:logical_layers {\n");
+	for(lid = 0; lid < pcb_max_layer; lid++) {
+		pcb_layer_t *l = PCB->Data->Layer+lid;
+		int empty = pcb_layer_is_empty_(PCB, l);
+		unsigned int lflg = pcb_layer_flags(PCB, lid);
+
+		lgid = pcb_layer_get_group(PCB, lid);
+		lgs = lgss + lgid;
+
+		fprintf(f, "		ha:layer_%d {\n", lid);
+		fprintf(f, "			name={%s}\n", l->name);
+		fprintf(f, "			empty=%s\n", empty ? "yes" : "no");
+		fprintf(f, "			flags=%x\n", lflg);
+		fprintf(f, "			grp=%ld\n", lgid);
+
+		if (lflg & PCB_LYT_COPPER) {
+			memset(&ls, 0, sizeof(ls));
+
+			PCB_LINE_LOOP(l) {
+				pcb_coord_t v;
+				double d;
+				lgs->lines++;
+				ls.lines++;
+				v = pcb_line_length(line);
+				ls.trace_len += v;
+				lgs->trace_len += v;
+				d = pcb_line_area(line);
+				ls.copper_area += d;
+				lgs->copper_area += d;
+				
+			}
+			PCB_END_LOOP;
+
+			PCB_ARC_LOOP(l) {
+				pcb_coord_t v;
+				double d;
+				lgs->arcs++;
+				ls.arcs++;
+				v = pcb_arc_length(arc);
+				ls.trace_len += v;
+				lgs->trace_len += v;
+				d = pcb_arc_area(arc);
+				ls.copper_area += d;
+				lgs->copper_area += d;
+			}
+			PCB_END_LOOP;
+
+			PCB_POLY_LOOP(l) {
+				double v;
+				lgs->polys++;
+				ls.polys++;
+				v = pcb_poly_area(polygon);
+				ls.copper_area += v;
+				lgs->copper_area += v;
+			}
+			PCB_END_LOOP;
+
+			if (!empty)
+				group_not_empty[lgid] = 1;
+
+			fprintf(f, "			lines=%lu\n", ls.lines);
+			fprintf(f, "			arcs=%lu\n",  ls.arcs);
+			fprintf(f, "			polys=%lu\n", ls.polys);
+			pcb_fprintf(f, "			trace_len=%$mm\n", ls.trace_len);
+			fprintf(f, "			copper_area={%f mm^2}\n", (double)ls.copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1));
+		}
+		fprintf(f, "		}\n");
+	}
+	fprintf(f, "	}\n");
+
+	phg = 0;
+	fprintf(f, "	li:physical_layers {\n");
+	for(lgid = 0; lgid < pcb_max_group(PCB); lgid++) {
+		if (group_not_empty[lgid]) {
+			phg++;
+			fprintf(f, "		ha:layergroup_%ld {\n", lgid);
+			fprintf(f, "			lines=%lu\n", lgss[lgid].lines);
+			fprintf(f, "			arcs=%lu\n",  lgss[lgid].arcs);
+			fprintf(f, "			polys=%lu\n", lgss[lgid].polys);
+			pcb_fprintf(f, "			trace_len=%$mm\n", lgss[lgid].trace_len);
+			fprintf(f, "			copper_area={%f mm^2}\n", (double)lgss[lgid].copper_area / (double)PCB_MM_TO_COORD(1) / (double)PCB_MM_TO_COORD(1));
+			fprintf(f, "		}\n");
+		}
+	}
+	fprintf(f, "	}\n");
+
+	fprintf(f, "	li:netlist {\n");
+	for(nl = 0; nl < PCB_NUM_NETLISTS; nl++) {
+		pcb_cardinal_t m, terms = 0, best_terms = 0;
+		fprintf(f, "		ha:%s {\n", pcb_netlist_names[nl]);
+		for(m = 0; m < PCB->NetlistLib[nl].MenuN; m++) {
+			pcb_lib_menu_t *menu = &PCB->NetlistLib[nl].Menu[m];
+			terms += menu->EntryN;
+			if (menu->EntryN > best_terms)
+				best_terms = menu->EntryN;
+		}
+		fprintf(f, "			nets=%ld\n", (long int)PCB->NetlistLib[nl].MenuN);
+		fprintf(f, "			terminals=%ld\n", (long int)terms);
+		fprintf(f, "			max_term_per_net=%ld\n", (long int)best_terms);
+		fprintf(f, "		}\n");
+	}
+	fprintf(f, "	}\n");
+
+	PCB_SUBC_LOOP(PCB->Data) {
+		int bott;
+		pcb_cardinal_t hole = 0, all = 0;
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+		htsi_t t;
+		htsi_entry_t *e;
+
+		if (pcb_subc_get_side(subc, &bott) == 0) {
+			if (bott)
+				num_ebottom++;
+			else
+				num_etop++;
+		}
+
+		/* count each terminal ID only once, because of heavy terminals */
+		htsi_init(&t, strhash, strkeyeq);
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			if (o->term != NULL) {
+				htsi_set(&t, (char *)o->term, 1);
+				if (o->type == PCB_OBJ_PSTK) {
+					pcb_pstk_proto_t *proto = pcb_pstk_get_proto((pcb_pstk_t *)o);
+					if ((proto != NULL) && (proto->hdia > 0))
+						hole++;
+				}
+			}
+		}
+	
+		for (e = htsi_first(&t); e != NULL; e = htsi_next(&t, e)) {
+			num_terms++;
+			all++;
+		}
+
+		/* a part is considered smd if it has at most half as many holes as terminals total */
+		if (hole*2 < all)
+			num_esmd++;
+
+		htsi_uninit(&t);
+	}
+	PCB_END_LOOP;
+
+
+	fprintf(f, "	ha:board {\n");
+	fprintf(f, "		id={%s}\n", options[HA_board_id].str_value);
+	fprintf(f, "		license={%s}\n", options[HA_license].str_value);
+	fprintf(f, "		format={%s}\n", PCB->Data->loader == NULL ? "unknown" : PCB->Data->loader->description);
+	pcb_fprintf(f, "		width=%$mm\n", PCB->MaxWidth);
+	pcb_fprintf(f, "		height=%$mm\n", PCB->MaxHeight);
+	fprintf(f, "		gross_area={%.4f mm^2}\n", (double)PCB_COORD_TO_MM(PCB->MaxWidth) * (double)PCB_COORD_TO_MM(PCB->MaxWidth));
+	fprintf(f, "		holes_plated=%d\n", hp);
+	fprintf(f, "		holes_unplated=%d\n", hup);
+	fprintf(f, "		physical_copper_layers=%d\n", phg);
+	fprintf(f, "		ha:subcircuits {\n");
+	fprintf(f, "			total=%ld\n", (long int)num_ebottom + num_etop);
+	fprintf(f, "			top_side=%ld\n", (long int)num_etop);
+	fprintf(f, "			bottom_side=%ld\n", (long int)num_ebottom);
+	fprintf(f, "			smd=%ld\n", (long int)num_esmd);
+	fprintf(f, "			pads=%ld\n", (long int)num_epads);
+	fprintf(f, "			pins=%ld\n", (long int)num_epins);
+	fprintf(f, "			terms=%ld\n", (long int)num_terms);
+	fprintf(f, "		}\n");
+	fprintf(f, "	}\n");
+
+	fprintf(f, "}\n");
+	fclose(f);
+}
+
+static int stat_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]), stat_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int stat_usage(const char *topic)
+{
+	fprintf(stderr, "\nstat exporter command line arguments:\n\n");
+	pcb_hid_usage(stat_attribute_list, sizeof(stat_attribute_list) / sizeof(stat_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x stat [stat options] foo.pcb\n\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+int pplg_check_ver_export_stat(int ver_needed) { return 0; }
+
+void pplg_uninit_export_stat(void)
+{
+	free((char *)stat_attribute_list[HA_first_ver].default_val.str_value);
+	free((char *)stat_attribute_list[HA_license].default_val.str_value);
+	stat_attribute_list[HA_first_ver].default_val.str_value = NULL;
+	stat_attribute_list[HA_license].default_val.str_value = NULL;
+}
+
+int pplg_init_export_stat(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&stat_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&stat_hid);
+	pcb_dhlp_draw_helpers_init(&stat_hid);
+
+	stat_hid.struct_size = sizeof(pcb_hid_t);
+	stat_hid.name = "stat";
+	stat_hid.description = "board statistics";
+	stat_hid.exporter = 1;
+
+	stat_hid.get_export_options = stat_get_export_options;
+	stat_hid.do_export = stat_do_export;
+	stat_hid.parse_arguments = stat_parse_arguments;
+
+	stat_hid.usage = stat_usage;
+
+	stat_attribute_list[HA_first_ver].default_val.str_value = pcb_strdup(PCB_VERSION);
+	stat_attribute_list[HA_license].default_val.str_value = pcb_strdup("proprietary/private");
+
+	pcb_hid_register_hid(&stat_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_svg/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_svg/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_svg/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_svg
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_svg/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_svg/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_svg/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_svg}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_svg/svg.o @]
+
+switch /local/pcb/export_svg/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_svg/export_svg.pup
===================================================================
--- tags/2.0.1/src_plugins/export_svg/export_svg.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_svg/export_svg.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class export
+$short SVG pcb_exporter
+$long Scalable Vector Graphics (SVG) exporter
+$fmt-native no
+$fmt-feature-w write an svg (Scalable Vector Graphics)
+$state works
+$package export
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/export_svg/svg.c
===================================================================
--- tags/2.0.1/src_plugins/export_svg/svg.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_svg/svg.c	(revision 18980)
@@ -0,0 +1,865 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2006 Dan McMahill
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/*
+ *  Based on the png exporter by Dan McMahill
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <math.h>
+#include <genvector/gds_char.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "layer.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "plugins.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+#include "hid_cam.h"
+#include "hid_flags.h"
+
+
+static pcb_hid_t svg_hid;
+
+const char *svg_cookie = "svg HID";
+
+static pcb_cam_t svg_cam;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	pcb_cap_style_t cap;
+	int width;
+	char *color;
+	int drill;
+	unsigned warned_elliptical:1;
+} hid_gc_s;
+
+static const char *CAPS(pcb_cap_style_t cap)
+{
+	switch (cap) {
+		case pcb_cap_round:
+			return "round";
+		case pcb_cap_square:
+			return "square";
+		default:
+			assert(!"unhandled cap");
+			return "round";
+	}
+	return "";
+}
+
+static FILE *f = NULL;
+static int group_open = 0;
+static int opacity = 100, drawing_mask, drawing_hole, photo_mode, flip;
+
+static gds_t sbright, sdark, snormal, sclip;
+static pcb_composite_op_t drawing_mode;
+static int comp_cnt;
+
+/* Photo mode colors and hacks */
+static const char *board_color = "#464646";
+static const char *mask_color = "#00ff00";
+static float mask_opacity_factor = 0.5;
+
+static enum {
+	PHOTO_MASK,
+	PHOTO_SILK,
+	PHOTO_COPPER,
+	PHOTO_INNER
+} photo_color;
+
+static struct {
+	const char *bright;
+	const char *normal;
+	const char *dark;
+	pcb_coord_t offs;
+} photo_palette[] = {
+	/* MASK */   { "#00ff00", "#00ff00", "#00ff00", PCB_MM_TO_COORD(0) },
+	/* SILK */   { "#ffffff", "#eeeeee", "#aaaaaa", PCB_MM_TO_COORD(0) },
+	/* COPPER */ { "#bbbbbb", "#707090", "#555555", PCB_MM_TO_COORD(0.05) },
+	/* INNER */  { "#222222", "#111111", "#000000", PCB_MM_TO_COORD(0) }
+};
+
+pcb_hid_attribute_t svg_attribute_list[] = {
+	/* other HIDs expect this to be first.  */
+
+/* %start-doc options "93 SVG Options"
+@ftable @code
+@item --outfile <string>
+Name of the file to be exported to. Can contain a path.
+@end ftable
+%end-doc
+*/
+	{"outfile", "Graphics output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_svgfile 0
+
+/* %start-doc options "93 SVG Options"
+@ftable @code
+@cindex photo-mode
+@item --photo-mode
+Export a photo realistic image of the layout.
+@end ftable
+%end-doc
+*/
+	{"photo-mode", "Photo-realistic export mode",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_photo_mode 1
+
+/* %start-doc options "93 SVG Options"
+@ftable @code
+@cindex opacity
+@item --opacity
+Layer opacity
+@end ftable
+%end-doc
+*/
+	{"opacity", "Layer opacity",
+	 PCB_HATT_INTEGER, 0, 100, {100, 0, 0}, 0, 0},
+#define HA_opacity 2
+
+/* %start-doc options "93 SVG Options"
+@ftable @code
+@cindex flip
+@item --flip
+Flip board, look at it from the bottom side
+@end ftable
+%end-doc
+*/
+	{"flip", "Flip board",
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_flip 3
+
+	{"cam", "CAM instruction",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}
+#define HA_cam 4
+};
+
+#define NUM_OPTIONS (sizeof(svg_attribute_list)/sizeof(svg_attribute_list[0]))
+
+#define TRX(x)
+#define TRY(y) \
+do { \
+	if (flip) \
+		y = PCB->MaxHeight - y; \
+} while(0)
+
+
+PCB_REGISTER_ATTRIBUTES(svg_attribute_list, svg_cookie)
+
+static pcb_hid_attr_val_t svg_values[NUM_OPTIONS];
+
+static pcb_hid_attribute_t *svg_get_export_options(int *n)
+{
+	static char *last_made_filename = 0;
+	const char *suffix = ".svg";
+
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &svg_attribute_list[HA_svgfile], suffix, &last_made_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return svg_attribute_list;
+}
+
+void svg_hid_export_to_file(FILE * the_file, pcb_hid_attr_val_t * options)
+{
+	static int saved_layer_stack[PCB_MAX_LAYER];
+	pcb_hid_expose_ctx_t ctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	f = the_file;
+
+	memcpy(saved_layer_stack, pcb_layer_stack, sizeof(pcb_layer_stack));
+
+	{
+		conf_force_set_bool(conf_core.editor.thin_draw, 0);
+		conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
+/*		conf_force_set_bool(conf_core.editor.check_planes, 0);*/
+		conf_force_set_bool(conf_core.editor.show_solder_side, 0);
+
+		if (options[HA_photo_mode].int_value) {
+			photo_mode = 1;
+		}
+		else
+			photo_mode = 0;
+
+		if (options[HA_flip].int_value) {
+			flip = 1;
+			conf_force_set_bool(conf_core.editor.show_solder_side, 1);
+		}
+		else
+			flip = 0;
+	}
+
+	if (photo_mode) {
+		pcb_fprintf(f, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+			0, 0, PCB->MaxWidth, PCB->MaxHeight, board_color);
+	}
+
+	opacity = options[HA_opacity].int_value;
+
+	gds_init(&sbright);
+	gds_init(&sdark);
+	gds_init(&snormal);
+	pcb_hid_expose_all(&svg_hid, &ctx);
+
+	conf_update(NULL, -1); /* restore forced sets */
+}
+
+static void group_close()
+{
+	if (group_open == 1) {
+		if (gds_len(&sdark) > 0) {
+			fprintf(f, "<!--dark-->\n");
+			fprintf(f, "%s", sdark.array);
+			gds_truncate(&sdark, 0);
+		}
+
+		if (gds_len(&sbright) > 0) {
+			fprintf(f, "<!--bright-->\n");
+			fprintf(f, "%s", sbright.array);
+			gds_truncate(&sbright, 0);
+		}
+
+		if (gds_len(&snormal) > 0) {
+			fprintf(f, "<!--normal-->\n");
+			fprintf(f, "%s", snormal.array);
+			gds_truncate(&snormal, 0);
+		}
+
+	}
+	fprintf(f, "</g>\n");
+}
+
+static void svg_do_export(pcb_hid_attr_val_t * options)
+{
+	const char *filename;
+	int save_ons[PCB_MAX_LAYER + 2];
+	int i;
+	pcb_coord_t w, h, x1, y1, x2, y2;
+
+	comp_cnt = 0;
+
+	if (!options) {
+		svg_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			svg_values[i] = svg_attribute_list[i].default_val;
+		options = svg_values;
+	}
+
+	pcb_cam_begin(PCB, &svg_cam, options[HA_cam].str_value, svg_attribute_list, NUM_OPTIONS, options);
+
+	filename = options[HA_svgfile].str_value;
+	if (!filename)
+		filename = "pcb.svg";
+
+	f = pcb_fopen(svg_cam.active ? svg_cam.fn : filename, "wb");
+	if (!f) {
+		perror(filename);
+		return;
+	}
+
+	fprintf(f, "<?xml version=\"1.0\"?>\n");
+	w = PCB->MaxWidth;
+	h = PCB->MaxHeight;
+	while((w < PCB_MM_TO_COORD(1024)) && (h < PCB_MM_TO_COORD(1024))) {
+		w *= 2;
+		h *= 2;
+	}
+
+	x1 = PCB_MM_TO_COORD(2);
+	y1 = PCB_MM_TO_COORD(2);
+	x2 = PCB->MaxWidth;
+	y2 = PCB->MaxHeight;
+	x2 += PCB_MM_TO_COORD(5);
+	y2 += PCB_MM_TO_COORD(5);
+	pcb_fprintf(f, "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.0\" width=\"%mm\" height=\"%mm\" viewBox=\"-%mm -%mm %mm %mm\">\n", w, h, x1, y1, x2, y2);
+
+	if (!svg_cam.active)
+		pcb_hid_save_and_show_layer_ons(save_ons);
+
+	svg_hid_export_to_file(f, options);
+
+	if (!svg_cam.active)
+		pcb_hid_restore_layer_ons(save_ons);
+
+	while(group_open) {
+		group_close();
+		group_open--;
+	}
+
+	fprintf(f, "</svg>\n");
+	fclose(f);
+	f = NULL;
+
+	if (pcb_cam_end(&svg_cam) == 0)
+		pcb_message(PCB_MSG_ERROR, "svg cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+}
+
+static int svg_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static int svg_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	int opa, is_our_mask = 0, is_our_silk = 0;
+
+	if (flags & PCB_LYT_UI)
+		return 0;
+
+	pcb_cam_set_layer_group(&svg_cam, group, flags);
+
+	if (!svg_cam.active) {
+		if (flags & PCB_LYT_INVIS)
+			return 0;
+
+		if (flags & PCB_LYT_MASK) {
+			if ((!photo_mode) && (!PCB->LayerGroups.grp[group].vis))
+				return 0; /* not in photo mode or not visible */
+		}
+	}
+
+	switch(flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_MASK: is_our_mask = PCB_LAYERFLG_ON_VISIBLE_SIDE(flags); break;
+		case PCB_LYT_SILK: is_our_silk = PCB_LAYERFLG_ON_VISIBLE_SIDE(flags); break;
+		default:;
+	}
+
+	if (!(flags & PCB_LYT_COPPER) && (!is_our_silk) && (!is_our_mask) && !(flags & PCB_LYT_PDRILL) && !(flags & PCB_LYT_PDRILL) && !(flags & PCB_LYT_OUTLINE))
+		return 0;
+
+	while(group_open) {
+		group_close();
+		group_open--;
+	}
+
+	{
+		char tmp_ln[PCB_PATH_MAX];
+		const char *name = name = pcb_layer_to_file_name(tmp_ln, layer, flags, PCB_FNS_fixed);
+		fprintf(f, "<g id=\"layer_%ld_%s\"", group, name);
+	}
+
+	opa = opacity;
+	if (is_our_mask)
+		opa *= mask_opacity_factor;
+	if (opa != 100)
+		fprintf(f, " opacity=\"%.2f\"", ((float)opa) / 100.0);
+	fprintf(f, ">\n");
+	group_open = 1;
+
+	if (photo_mode) {
+		if (is_our_silk)
+			photo_color = PHOTO_SILK;
+		else if (is_our_mask)
+			photo_color = PHOTO_MASK;
+		else if (group >= 0) {
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
+				photo_color = PHOTO_COPPER;
+			else
+				photo_color = PHOTO_INNER;
+		}
+	}
+
+	drawing_hole = (flags & PCB_LYT_PDRILL) || (flags & PCB_LYT_UDRILL);
+
+	return 1;
+}
+
+
+static pcb_hid_gc_t svg_make_gc(void)
+{
+	pcb_hid_gc_t rv = (pcb_hid_gc_t) calloc(sizeof(hid_gc_s), 1);
+	rv->me_pointer = &svg_hid;
+	rv->cap = pcb_cap_round;
+	rv->width = 1;
+	rv->color = NULL;
+	return rv;
+}
+
+static void svg_destroy_gc(pcb_hid_gc_t gc)
+{
+	free(gc);
+}
+
+static void svg_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	drawing_mode = op;
+
+	if (direct)
+		return;
+
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			comp_cnt++;
+			gds_init(&sclip);
+			pcb_append_printf(&snormal, "<!-- Composite: reset -->\n");
+			pcb_append_printf(&snormal, "<defs>\n");
+			pcb_append_printf(&snormal, "<g id=\"comp_pixel_%d\">\n", comp_cnt);
+			pcb_append_printf(&sclip, "<mask id=\"comp_clip_%d\" maskUnits=\"userSpaceOnUse\" x=\"0\" y=\"0\" width=\"%mm\" height=\"%mm\">\n", comp_cnt, PCB->MaxWidth, PCB->MaxHeight);
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+		case PCB_HID_COMP_NEGATIVE:
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			pcb_append_printf(&snormal, "</g>\n");
+			pcb_append_printf(&sclip, "</mask>\n");
+			gds_append_str(&snormal, sclip.array);
+			pcb_append_printf(&snormal, "</defs>\n");
+			pcb_append_printf(&snormal, "<use xlink:href=\"#comp_pixel_%d\" mask=\"url(#comp_clip_%d)\"/>\n", comp_cnt, comp_cnt);
+			pcb_append_printf(&snormal, "<!-- Composite: finished -->\n");
+			gds_uninit(&sclip);
+			break;
+	}
+}
+
+static const char *svg_color(pcb_hid_gc_t gc)
+{
+	return gc->color;
+}
+
+static const char *svg_clip_color(pcb_hid_gc_t gc)
+{
+	if ((drawing_mode == PCB_HID_COMP_POSITIVE) || (drawing_mode == PCB_HID_COMP_POSITIVE_XOR))
+		return "#FFFFFF";
+	if (drawing_mode == PCB_HID_COMP_NEGATIVE)
+		return "#000000";
+	return NULL;
+}
+
+static void svg_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	gc->drill = 0;
+	if (name == NULL)
+		name = "#ff0000";
+	if (strcmp(name, "drill") == 0) {
+		name = "#ffffff";
+		gc->drill = 1;
+	}
+	if (drawing_mask)
+		name = mask_color;
+	if ((gc->color != NULL) && (strcmp(gc->color, name) == 0))
+		return;
+	free(gc->color);
+	gc->color = pcb_strdup(name);
+}
+
+static void svg_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void svg_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void indent(gds_t *s)
+{
+	static char ind[] = "                                                                              ";
+	if (group_open < sizeof(ind)-1) {
+		ind[group_open] = '\0';
+		if (s == NULL)
+			pcb_fprintf(f, ind);
+		else
+			pcb_append_printf(s, ind);
+		ind[group_open] = ' ';
+		return;
+	}
+
+	if (s == NULL)
+		pcb_fprintf(f, ind);
+	else
+		pcb_append_printf(s, ind);
+}
+
+static void svg_set_draw_xor(pcb_hid_gc_t gc, int xor_)
+{
+	;
+}
+
+#define fix_rect_coords() \
+	if (x1 > x2) {\
+		pcb_coord_t t = x1; \
+		x1 = x2; \
+		x2 = t; \
+	} \
+	if (y1 > y2) { \
+		pcb_coord_t t = y1; \
+		y1 = y2; \
+		y2 = t; \
+	}
+
+static void draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t w, pcb_coord_t h, pcb_coord_t stroke)
+{
+	const char *clip_color = svg_clip_color(gc);
+
+	indent(&snormal);
+	pcb_append_printf(&snormal, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+		x1, y1, w, h, stroke, svg_color(gc), CAPS(gc->cap));
+	if (clip_color != NULL) {
+		indent(&sclip);
+		pcb_append_printf(&sclip, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+			x1, y1, w, h, stroke, clip_color, CAPS(gc->cap));
+	}
+}
+
+static void svg_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	fix_rect_coords();
+	draw_rect(gc, x1, y1, x2-x1, y2-y1, gc->width);
+}
+
+static void draw_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t w, pcb_coord_t h)
+{
+	const char *clip_color = svg_clip_color(gc);
+	if ((photo_mode) && (clip_color == NULL)) {
+		pcb_coord_t photo_offs = photo_palette[photo_color].offs;
+		if (photo_offs != 0) {
+			indent(&sdark);
+			pcb_append_printf(&sdark, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				x1+photo_offs, y1+photo_offs, w, h, photo_palette[photo_color].dark);
+			indent(&sbright);
+			pcb_append_printf(&sbright, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				x1-photo_offs, y1-photo_offs, w, h, photo_palette[photo_color].bright);
+		}
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+			x1, y1, w, h, photo_palette[photo_color].normal);
+	}
+	else {
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+			x1, y1, w, h, svg_color(gc));
+		if (clip_color != NULL)
+			pcb_append_printf(&sclip, "<rect x=\"%mm\" y=\"%mm\" width=\"%mm\" height=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				x1, y1, w, h, clip_color);
+	}
+}
+
+static void svg_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	TRX(x1); TRY(y1); TRX(x2); TRY(y2);
+	fix_rect_coords();
+	draw_fill_rect(gc, x1, y1, x2-x1, y2-y1);
+}
+
+static void pcb_line_draw(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	const char *clip_color = svg_clip_color(gc);
+	if ((photo_mode) && (clip_color == NULL)) {
+		pcb_coord_t photo_offs = photo_palette[photo_color].offs;
+		if (photo_offs != 0) {
+			indent(&sbright);
+			pcb_append_printf(&sbright, "<line x1=\"%mm\" y1=\"%mm\" x2=\"%mm\" y2=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\"/>\n",
+				x1-photo_offs, y1-photo_offs, x2-photo_offs, y2-photo_offs, gc->width, photo_palette[photo_color].bright, CAPS(gc->cap));
+			indent(&sdark);
+			pcb_append_printf(&sdark, "<line x1=\"%mm\" y1=\"%mm\" x2=\"%mm\" y2=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\"/>\n",
+				x1+photo_offs, y1+photo_offs, x2+photo_offs, y2+photo_offs, gc->width, photo_palette[photo_color].dark, CAPS(gc->cap));
+		}
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<line x1=\"%mm\" y1=\"%mm\" x2=\"%mm\" y2=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\"/>\n",
+			x1, y1, x2, y2, gc->width, photo_palette[photo_color].normal, CAPS(gc->cap));
+	}
+	else {
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<line x1=\"%mm\" y1=\"%mm\" x2=\"%mm\" y2=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\"/>\n",
+			x1, y1, x2, y2, gc->width, svg_color(gc), CAPS(gc->cap));
+		if (clip_color != NULL) {
+			pcb_append_printf(&sclip, "<line x1=\"%mm\" y1=\"%mm\" x2=\"%mm\" y2=\"%mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\"/>\n",
+				x1, y1, x2, y2, gc->width, clip_color, CAPS(gc->cap));
+		}
+	}
+}
+
+static void svg_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	TRX(x1); TRY(y1); TRX(x2); TRY(y2);
+	pcb_line_draw(gc, x1, y1, x2, y2);
+}
+
+static void pcb_arc_draw(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t r, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t stroke, int large, int sweep)
+{
+	const char *clip_color = svg_clip_color(gc);
+	if ((photo_mode) && (clip_color == NULL)) {
+		pcb_coord_t photo_offs = photo_palette[photo_color].offs;
+		if (photo_offs != 0) {
+			indent(&sbright);
+			pcb_append_printf(&sbright, "<path d=\"M %.8mm %.8mm A %mm %mm 0 %d %d %mm %mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+				x1-photo_offs, y1-photo_offs, r, r, large, sweep, x2-photo_offs, y2-photo_offs, gc->width, photo_palette[photo_color].bright, CAPS(gc->cap));
+			indent(&sdark);
+			pcb_append_printf(&sdark, "<path d=\"M %.8mm %.8mm A %mm %mm 0 %d %d %mm %mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+				x1+photo_offs, y1+photo_offs, r, r, large, sweep, x2+photo_offs, y2+photo_offs, gc->width, photo_palette[photo_color].dark, CAPS(gc->cap));
+		}
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<path d=\"M %.8mm %.8mm A %mm %mm 0 %d %d %mm %mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+			x1, y1, r, r, large, sweep, x2, y2, gc->width, photo_palette[photo_color].normal, CAPS(gc->cap));
+	}
+	else {
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<path d=\"M %.8mm %.8mm A %mm %mm 0 %d %d %mm %mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+			x1, y1, r, r, large, sweep, x2, y2, gc->width, svg_color(gc), CAPS(gc->cap));
+		if (clip_color != NULL)
+			pcb_append_printf(&sclip, "<path d=\"M %.8mm %.8mm A %mm %mm 0 %d %d %mm %mm\" stroke-width=\"%mm\" stroke=\"%s\" stroke-linecap=\"%s\" fill=\"none\"/>\n",
+				x1, y1, r, r, large, sweep, x2, y2, gc->width, clip_color, CAPS(gc->cap));
+	}
+}
+
+static void svg_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_coord_t x1, y1, x2, y2, diff = 0, diff2, maxdiff;
+	pcb_angle_t sa, ea;
+
+ /* degenerate case: r=0 means a single dot */
+	if ((width == 0) && (height == 0)) {
+		pcb_line_draw(gc, cx, cy, cx, cy);
+		return;
+	}
+
+	/* detect elliptical arcs: if diff between radii is above 0.1% */
+	diff2 = width - height;
+	if (diff2 < 0)
+		diff2 = -diff2;
+	maxdiff = width;
+	if (height > maxdiff)
+		maxdiff = height;
+	if (diff2 > maxdiff / 1000) {
+		if (!gc->warned_elliptical) {
+			pcb_message(PCB_MSG_ERROR, "Can't draw elliptical arc on svg; object omitted; expect BROKEN TRACE\n");
+			gc->warned_elliptical = 1;
+		}
+		return;
+	}
+
+	TRX(cx); TRY(cy);
+
+	/* calculate start and end angles considering flip */
+	start_angle = 180 - start_angle;
+	delta_angle = -delta_angle;
+	if (flip) {
+		start_angle = -start_angle;
+		delta_angle = -delta_angle;
+	}
+
+	/* workaround for near-360 deg rendering bugs */
+	if ((delta_angle >= +360.0) || (delta_angle <= -360.0)) {
+		svg_draw_arc(gc, cx, cy, width, height, 0, 180);
+		svg_draw_arc(gc, cx, cy, width, height, 180, 180);
+		return;
+	}
+
+	if (fabs(delta_angle) <= 0.001) { delta_angle = 0.001; diff=1; }
+
+	sa = start_angle;
+	ea = start_angle + delta_angle;
+
+	/* calculate the endpoints */
+	x2 = pcb_round((double)cx + ((double)width * cos(sa * M_PI / 180)));
+	y2 = pcb_round((double)cy + ((double)width * sin(sa * M_PI / 180)));
+	x1 = pcb_round((double)cx + ((double)width * cos(ea * M_PI / 180))+diff);
+	y1 = pcb_round((double)cy + ((double)width * sin(ea * M_PI / 180))+diff);
+
+	pcb_arc_draw(gc, x1, y1, width, x2, y2, gc->width, (fabs(delta_angle) > 180), (delta_angle < 0.0));
+}
+
+static void draw_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t r, pcb_coord_t stroke)
+{
+	const char *clip_color = svg_clip_color(gc);
+	if ((photo_mode) && (clip_color == NULL)) {
+		if (!drawing_hole) {
+			pcb_coord_t photo_offs = photo_palette[photo_color].offs;
+			if ((!gc->drill) && (photo_offs != 0)) {
+				indent(&sbright);
+				pcb_append_printf(&sbright, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+					cx-photo_offs, cy-photo_offs, r, stroke, photo_palette[photo_color].bright);
+
+				indent(&sdark);
+				pcb_append_printf(&sdark, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+					cx+photo_offs, cy+photo_offs, r, stroke, photo_palette[photo_color].dark);
+			}
+			indent(&snormal);
+			pcb_append_printf(&snormal, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				cx, cy, r, stroke, photo_palette[photo_color].normal);
+		}
+		else {
+			indent(&snormal);
+			pcb_append_printf(&snormal, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				cx, cy, r, stroke, "#000000");
+		}
+	}
+	else{
+		indent(&snormal);
+		pcb_append_printf(&snormal, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+			cx, cy, r, stroke, svg_color(gc));
+		if (clip_color != NULL)
+			pcb_append_printf(&sclip, "<circle cx=\"%mm\" cy=\"%mm\" r=\"%mm\" stroke-width=\"%mm\" fill=\"%s\" stroke=\"none\"/>\n",
+				cx, cy, r, stroke, clip_color);
+	}
+}
+
+static void svg_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	TRX(cx); TRY(cy);
+	draw_fill_circle(gc, cx, cy, radius, gc->width);
+}
+
+static void draw_poly(gds_t *s, pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y, pcb_coord_t dx, pcb_coord_t dy, const char *clr)
+{
+	int i;
+	float poly_bloat = 0.01;
+
+	indent(s);
+	gds_append_str(s, "<polygon points=\"");
+	for (i = 0; i < n_coords; i++) {
+		pcb_coord_t px = x[i], py = y[i];
+		TRX(px); TRY(py);
+		pcb_append_printf(s, "%mm,%mm ", px+dx, py+dy);
+	}
+	pcb_append_printf(s, "\" stroke-width=\"%.3f\" stroke=\"%s\" fill=\"%s\"/>\n", poly_bloat, clr, clr);
+}
+
+static void svg_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	const char *clip_color = svg_clip_color(gc);
+	if ((photo_mode) && (clip_color == NULL)) {
+		pcb_coord_t photo_offs = photo_palette[photo_color].offs;
+		if (photo_offs != 0) {
+			draw_poly(&sbright, gc, n_coords, x, y, dx-photo_offs, dy-photo_offs, photo_palette[photo_color].bright);
+			draw_poly(&sdark, gc, n_coords, x, y, dx+photo_offs, dy+photo_offs, photo_palette[photo_color].dark);
+		}
+		draw_poly(&snormal, gc, n_coords, x, y, dx, dy, photo_palette[photo_color].normal);
+	}
+	else {
+		draw_poly(&snormal, gc, n_coords, x, y, dx, dy, svg_color(gc));
+		if (clip_color != NULL)
+			draw_poly(&sclip, gc, n_coords, x, y, dx, dy, clip_color);
+	}
+}
+
+static void svg_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	svg_fill_polygon_offs(gc, n_coords, x, y, 0, 0);
+}
+
+
+static void svg_calibrate(double xval, double yval)
+{
+	pcb_message(PCB_MSG_ERROR, "svg_calibrate() not implemented");
+	return;
+}
+
+static void svg_set_crosshair(pcb_coord_t x, pcb_coord_t y, int a)
+{
+}
+
+static int svg_usage(const char *topic)
+{
+	fprintf(stderr, "\nsvg exporter command line arguments:\n\n");
+	pcb_hid_usage(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x svg [svg options] foo.pcb\n\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+int pplg_check_ver_export_svg(int ver_needed) { return 0; }
+
+void pplg_uninit_export_svg(void)
+{
+	pcb_hid_remove_attributes_by_cookie(svg_cookie);
+}
+
+int pplg_init_export_svg(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&svg_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&svg_hid);
+	pcb_dhlp_draw_helpers_init(&svg_hid);
+
+	svg_hid.struct_size = sizeof(pcb_hid_t);
+	svg_hid.name = "svg";
+	svg_hid.description = "Scalable Vector Graphics export";
+	svg_hid.exporter = 1;
+
+	svg_hid.get_export_options = svg_get_export_options;
+	svg_hid.do_export = svg_do_export;
+	svg_hid.parse_arguments = svg_parse_arguments;
+	svg_hid.set_layer_group = svg_set_layer_group;
+	svg_hid.make_gc = svg_make_gc;
+	svg_hid.destroy_gc = svg_destroy_gc;
+	svg_hid.set_drawing_mode = svg_set_drawing_mode;
+	svg_hid.set_color = svg_set_color;
+	svg_hid.set_line_cap = svg_set_line_cap;
+	svg_hid.set_line_width = svg_set_line_width;
+	svg_hid.set_draw_xor = svg_set_draw_xor;
+	svg_hid.draw_line = svg_draw_line;
+	svg_hid.draw_arc = svg_draw_arc;
+	svg_hid.draw_rect = svg_draw_rect;
+	svg_hid.fill_circle = svg_fill_circle;
+	svg_hid.fill_polygon = svg_fill_polygon;
+	svg_hid.fill_polygon_offs = svg_fill_polygon_offs;
+	svg_hid.fill_rect = svg_fill_rect;
+	svg_hid.calibrate = svg_calibrate;
+	svg_hid.set_crosshair = svg_set_crosshair;
+
+	svg_hid.usage = svg_usage;
+
+	pcb_hid_register_hid(&svg_hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_test/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_test/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_test/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_export_test
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_test/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_test/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_test/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {export_test}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_test/export_test.o @]
+
+switch /local/pcb/export_test/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/export_test/export_test.c
===================================================================
--- tags/2.0.1/src_plugins/export_test/export_test.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_test/export_test.c	(revision 18980)
@@ -0,0 +1,136 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "build_run.h"
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_attrib.h"
+#include "hid_cam.h"
+#include "hid_init.h"
+
+const char *export_test_cookie = "export_test HID";
+
+static pcb_hid_attribute_t export_test_options[] = {
+/* %start-doc options "8 export_test Creation"
+@ftable @code
+@item --export_testfile <string>
+Name of the export_test output file. Use stdout if not specified.
+@end ftable
+%end-doc
+*/
+	{"export_testfile", "Name of the export_test output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_export_testfile 0
+};
+
+#define NUM_OPTIONS (sizeof(export_test_options)/sizeof(export_test_options[0]))
+
+static pcb_hid_attr_val_t export_test_values[NUM_OPTIONS];
+
+static const char *export_test_filename;
+
+static pcb_hid_attribute_t *export_test_get_export_options(int *n)
+{
+	static char *last_export_test_filename = 0;
+
+	if (PCB) {
+		pcb_derive_default_filename(PCB->Filename, &export_test_options[HA_export_testfile], ".export_test", &last_export_test_filename);
+	}
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return export_test_options;
+}
+
+
+/*
+ * If fp is not NULL then print out the bill of materials contained in
+ * export_test.  Either way, free all memory which has been allocated for export_test.
+ */
+static void print_and_free(FILE * fp, /*export_testList*/ void * export_test)
+{
+}
+
+static int Printexport_test(void)
+{
+	return 0;
+}
+
+static void export_test_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+
+	if (!options) {
+		export_test_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			export_test_values[i] = export_test_options[i].default_val;
+		options = export_test_values;
+	}
+
+	export_test_filename = options[HA_export_testfile].str_value;
+	if (!export_test_filename)
+		export_test_filename = "pcb-out.export_test";
+	else {
+#warning TODO: set some FILE *fp to stdout
+	}
+
+	Printexport_test();
+}
+
+static int export_test_usage(const char *topic)
+{
+	fprintf(stderr, "\nexport_test exporter command line arguments:\n\n");
+	pcb_hid_usage(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x export_test [export_test_options] foo.pcb\n\n");
+	return 0;
+}
+
+
+static int export_test_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+pcb_hid_t export_test_hid;
+
+int pplg_check_ver_export_test(int ver_needed) { return 0; }
+
+void pplg_uninit_export_test(void)
+{
+}
+
+int pplg_init_export_test(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&export_test_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&export_test_hid);
+
+	export_test_hid.struct_size = sizeof(pcb_hid_t);
+	export_test_hid.name = "export_test";
+	export_test_hid.description = "Exports a dump of HID calls";
+	export_test_hid.exporter = 1;
+
+	export_test_hid.get_export_options = export_test_get_export_options;
+	export_test_hid.do_export = export_test_do_export;
+	export_test_hid.parse_arguments = export_test_parse_arguments;
+
+	export_test_hid.usage = export_test_usage;
+
+	pcb_hid_register_hid(&export_test_hid);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_test/export_test.pup
===================================================================
--- tags/2.0.1/src_plugins/export_test/export_test.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_test/export_test.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class export
+$short dummy test pcb_exporter
+$long A thin layer of code to dump exporter calls for testing the HID exporter API.
+$state WIP
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/export_xy/Makefile
===================================================================
--- tags/2.0.1/src_plugins/export_xy/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_export_xy
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/export_xy/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/export_xy/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,23 @@
+put /local/pcb/mod {export_xy}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_xy/xy.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/export_xy/xy_conf.h}
+
+switch /local/pcb/export_xy/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
+switch /local/pcb/export_xy/controls
+	case {disable}   end;
+	default
+		append /local/pcb/DEPDEPS { ../src_plugins/export_xy/conf_internal.c }
+		append /local/pcb/DISTCLEANFILES { ../src_plugins/export_xy/conf_internal.c }
+		append /local/pcb/rules/install_ {\n	$(SCCBOX) $(HOW) "../src_plugins/export_xy/export_xy.conf" "$(DATADIR)/export_xy.conf"}
+
+		append /local/pcb/RULES [@
+../src_plugins/export_xy/conf_internal.c: ../src_plugins/export_xy/export_xy.conf $(CQUOTE)
+	$(CQUOTE) -n export_xy_conf_internal < ../src_plugins/export_xy/export_xy.conf > ../src_plugins/export_xy/conf_internal.c
+@]
+	end
+end
Index: tags/2.0.1/src_plugins/export_xy/export_xy.conf
===================================================================
--- tags/2.0.1/src_plugins/export_xy/export_xy.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/export_xy.conf	(revision 18980)
@@ -0,0 +1,97 @@
+### conf file header (compacted)
+li:pcb-rnd-conf-v1 { ha:overwrite { ha:plugins { ha:export_xy { li:templates {
+
+### tempalates
+
+# classis gEDA/PCB xy #########################################################
+xy.name = pcb xy
+xy.hdr = {# $Id$
+# PcbXY Version 1.0
+# Date: %UTC%
+# Author: %author%
+# Title: %title% - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in %suffix%.  rotation in degrees.
+# --------------------------------------------
+}
+xy.subc = {%subc.refdes%,"%subc.footprint%","%subc.value%",%subc.x%,%subc.y%,%subc.rot%,%subc.side%
+}
+
+# gxyrs #######################################################################
+gxyrs.name = gxyrs
+gxyrs.hdr = {#gxyrs version 1.0
+#Date: %UTC%
+#Author: %author%
+#Title: %title% - pcb-rnd gxyrs
+#Placement data:
+#Designator X-Loc Y-Loc Rotation Side Type X-Size Y-Size Value Footprint
+# --------------------------------------------
+}
+
+gxyrs.subc = {%subc.refdes_% %subc.x% %subc.y% %subc.rot% %subc.side% %subc.pad_width% %subc.pad_height% %subc.value_% %subc.footprint_%
+}
+
+
+# macrofab ####################################################################
+macrofab.name = Macrofab
+macrofab.hdr = {#pcb-rnd Macrofab export version 1.0
+#Date: %UTC%
+#Author: %author%
+#Title: %title% - pcb-rnd Macrofab export
+#Placement data:
+#Designator X-Loc Y-Loc Rotation Side Type X-Size Y-Size Value Footprint
+# --------------------------------------------
+}
+macrofab.subc = {%subc.refdes_%	%subc.padcx%	%subc.padcy%	%subc.rot%	%subc.num-side%	%subc.smdvsthrunum%	%subc.pad_width_prerot%	%subc.pad_height_prerot%	%subc.value_%	%subc.footprint_%	%subc.a.macrofab::DNP?0:1%	%subc.a.macrofab::MPN|<unspecified-MPN>%
+}
+
+# TM220/TM240 #################################################################
+tm220.name = TM220/TM240
+tm220.hdr = {#pcb-rnd TM220A/TM240A xyrs version 1.0
+#Date: %UTC%
+#Author: %author%
+#Title: %title% - pcb-rnd gxyrs
+#Placement data:
+#RefDes, top/bottom, X, Y, rotation
+# X,Y in %suffix%.  rotation in degrees.
+# --------------------------------------------
+}
+
+tm220.subc = {%subc.refdes%,%subc.side%,%subc.x%,%subc.y%,%subc.rot%
+}
+
+# KiCad .pos file #############################################################
+kicad_pos.name = {KiCad .pos}
+kicad_pos.hdr = {###pcb-rnd KiCad .pos compatible xyrs version 1.0
+###Date: %UTC%, Author: %author%, Title: %title% - pcb-rnd gxyrs
+## Unit = %suffix%., Angle = degrees.
+#, Ref, Val, Package, PosX, PosY, Rot, Side
+}
+kicad_pos.subc = {,"%subc.refdes%","%subc.value%","%subc.footprint%",%subc.x%,%subc.y%,%subc.rot%,%subc.side%
+}
+
+# ncap (work in progress) #####################################################
+ncap.name = {ncap export (WIP)}
+ncap.hdr = {ncapture 0
+4
+%boardw%
+%boardh%
+80hmmm
+-30hmmm;
+}
+
+ncap.subc = {%subc.count%
+0
+%subc.pincount%
+1
+%subc.refdes%
+%subc.90rot%
+%subc.x%
+%subc.y%
+0
+}
+ncap.term = {%term.netname%
+}
+
+### conf file footer (compacted)
+} } } } }
Index: tags/2.0.1/src_plugins/export_xy/export_xy.pup
===================================================================
--- tags/2.0.1/src_plugins/export_xy/export_xy.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/export_xy.pup	(revision 18980)
@@ -0,0 +1,14 @@
+$class export
+$short xy (centroid) pcb_exporter
+$long Template based export of XY centroid subcircuit data e.g. for pick & place.
+$state works
+$fmt-native no
+$fmt-feature-w geda/PCB xy
+$fmt-feature-w gxyrs
+$fmt-feature-w Macrofab's pick&place
+$fmt-feature-w pick&place file for the TM220/TM240 device
+$fmt-feature-w KiCad .pos file
+$package export
+default buildin
+dep export_bom
+autoload 1
Index: tags/2.0.1/src_plugins/export_xy/xy.c
===================================================================
--- tags/2.0.1/src_plugins/export_xy/xy.c	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/xy.c	(revision 18980)
@@ -0,0 +1,862 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <genvector/vts0.h>
+
+#include "math_helper.h"
+#include "build_run.h"
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "obj_pstk_inlines.h"
+#include "layer.h"
+#include "netlist.h"
+#include "safe_fs.h"
+#include "macro.h"
+#include "xy_conf.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_attrib.h"
+#include "hid_cam.h"
+#include "hid_init.h"
+
+#include "../src_plugins/lib_compat_help/elem_rot.h"
+#include "../src_plugins/export_xy/conf_internal.c"
+
+#define CONF_FN "export_xy.conf"
+
+conf_xy_t conf_xy;
+
+extern char *CleanBOMString(const char *in);
+
+const char *xy_cookie = "XY HID";
+
+/* Maximum length of a template name (in the config file, in the enum) */
+#define MAX_TEMP_NAME_LEN 128
+
+
+static pcb_hid_attribute_t xy_options[] = {
+/* %start-doc options "8 XY Creation"
+@ftable @code
+@item --xyfile <string>
+Name of the XY output file.
+@end ftable
+%end-doc
+*/
+	{"xyfile", "Name of the XY output file",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_xyfile 0
+
+/* %start-doc options "8 XY Creation"
+@ftable @code
+@item --xy-unit <unit>
+Unit of XY dimensions. Defaults to mil.
+@end ftable
+%end-doc
+*/
+	{"xy-unit", "XY units",
+	 PCB_HATT_UNIT, 0, 0, {-1, 0, 0}, NULL, 0},
+#define HA_unit 1
+	{"xy-in-mm", ATTR_UNDOCUMENTED,
+	 PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, 0},
+#define HA_xymm 2
+	{"format", "file format (template)",
+	 PCB_HATT_ENUM, 0, 0, {0, 0, 0}, NULL, 0},
+#define HA_format 3
+};
+
+#define NUM_OPTIONS (sizeof(xy_options)/sizeof(xy_options[0]))
+
+static pcb_hid_attr_val_t xy_values[NUM_OPTIONS];
+
+static const char *xy_filename;
+static const pcb_unit_t *xy_unit;
+vts0_t fmt_names; /* array of const char * long name of each format, pointing into the conf database */
+vts0_t fmt_ids;   /* array of strdup'd short name (ID) of each format */
+
+static void free_fmts(void)
+{
+	int n;
+	for(n = 0; n < fmt_ids.used; n++) {
+		free(fmt_ids.array[n]);
+		fmt_ids.array[n] = NULL;
+	}
+}
+
+static pcb_hid_attribute_t *xy_get_export_options(int *n)
+{
+	static char *last_xy_filename = 0;
+	static int last_unit_value = -1;
+	conf_listitem_t *li;
+	int idx;
+
+	/* load all formats from the config */
+	fmt_names.used = 0;
+	fmt_ids.used = 0;
+
+	free_fmts();
+	conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx) {
+		char id[MAX_TEMP_NAME_LEN];
+		const char *sep = strchr(li->name, '.');
+		int len;
+
+		if (sep == NULL) {
+			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (missing period): '%s'\n", li->name);
+			continue;
+		}
+		if (strcmp(sep+1, "name") != 0)
+			continue;
+		len = sep - li->name;
+		if (len > sizeof(id)-1) {
+			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (too long): '%s'\n", li->name);
+			continue;
+		}
+		memcpy(id, li->name, len);
+		id[len] = '\0';
+		vts0_append(&fmt_names, (char *)li->payload);
+		vts0_append(&fmt_ids, pcb_strdup(id));
+	}
+
+	if (fmt_names.used == 0) {
+		pcb_message(PCB_MSG_ERROR, "export_xy: can not set up export options: no template available\n");
+		return NULL;
+	}
+
+	xy_options[HA_format].enumerations = (const char **)fmt_names.array;
+
+	/* set default unit and filename */
+	if (xy_options[HA_unit].default_val.int_value == last_unit_value) {
+		if (conf_core.editor.grid_unit)
+			xy_options[HA_unit].default_val.int_value = conf_core.editor.grid_unit->index;
+		else
+			xy_options[HA_unit].default_val.int_value = get_unit_struct("mil")->index;
+		last_unit_value = xy_options[HA_unit].default_val.int_value;
+	}
+	if (PCB)
+		pcb_derive_default_filename(PCB->Filename, &xy_options[HA_xyfile], ".xy", &last_xy_filename);
+
+	if (n)
+		*n = NUM_OPTIONS;
+	return xy_options;
+}
+
+/* ---------------------------------------------------------------------------
+ * prints a centroid file in a format which includes data needed by a
+ * pick and place machine.  Further formatting for a particular factory setup
+ * can easily be generated with awk or perl.
+ * returns != zero on error
+ */
+
+typedef struct {
+	char utcTime[64];
+	char *name, *descr, *value;
+	const char *pad_netname;
+	pcb_coord_t x, y;
+	double theta, xray_theta;
+	pcb_subc_t *subc;
+	pcb_coord_t pad_cx, pad_cy;
+	pcb_coord_t pad_w, pad_h;
+	pcb_coord_t prpad_w, prpad_h;
+	pcb_cardinal_t count;
+	pcb_coord_t ox, oy;
+	int origin_score;
+	char *origin_tmp;
+	pcb_bool front;
+} subst_ctx_t;
+
+/* Find the pick and place 0;0 mark, if there is any */
+static void find_origin_bump(void *ctx_, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	subst_ctx_t *ctx = ctx_;
+	char *attr;
+	int score;
+
+	/* first look for the format-specific attribute */
+	attr = pcb_attribute_get(&line->Attributes, ctx->origin_tmp);
+	if (attr != NULL) {
+		score = 2;
+		goto found;
+	}
+
+	/* then for the generic pnp-specific attribute */
+	attr = pcb_attribute_get(&line->Attributes, "pnp-origin");
+	if (attr != NULL) {
+		score = 1;
+		goto found;
+	}
+	return;
+
+	found:;
+	if (score > ctx->origin_score) {
+		ctx->origin_score = score;
+		ctx->ox = (line->BoundingBox.X1 + line->BoundingBox.X2) / 2;
+		ctx->oy = (line->BoundingBox.Y1 + line->BoundingBox.Y2) / 2;
+	}
+}
+
+
+static void find_origin(subst_ctx_t *ctx, const char *format_name)
+{
+	char tmp[128];
+	pcb_snprintf(tmp, sizeof(tmp), "pnp-origin-%s", format_name);
+
+	ctx->origin_score = 0;
+	ctx->ox = ctx->oy = 0;
+	ctx->origin_tmp = tmp;
+
+	pcb_loop_layers(PCB, ctx, NULL, find_origin_bump, NULL, NULL, NULL);
+}
+
+static void calc_pad_bbox_(subst_ctx_t *ctx, pcb_coord_t *pw, pcb_coord_t *ph, pcb_coord_t *pcx, pcb_coord_t *pcy)
+{
+	pcb_box_t box;
+	box.X1 = box.Y1 = PCB_MAX_COORD;
+	box.X2 = box.Y2 = -PCB_MAX_COORD;
+
+	if (ctx->subc != NULL) {
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+
+		for(o = pcb_data_first(&it, ctx->subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			if (o->term != NULL) {
+				if ((o->type != PCB_OBJ_PSTK) && (o->type != PCB_OBJ_SUBC)) { /* layer objects */
+					pcb_layer_t *ly = o->parent.layer;
+					assert(o->parent_type == PCB_PARENT_LAYER);
+					if (!(pcb_layer_flags_(ly) & PCB_LYT_COPPER))
+						continue;
+				}
+#warning TODO: we should have the copper bbox only, but this bbox includes the clearance!
+				pcb_box_bump_box(&box, &o->BoundingBox);
+			}
+		}
+	}
+
+	*pw = box.X2 - box.X1;
+	*ph = box.Y2 - box.Y1;
+	*pcx = (box.X2 + box.X1)/2;
+	*pcy = (box.Y2 + box.Y1)/2;
+}
+
+static void count_pins_pads(subst_ctx_t *ctx, int *pins, int *pads)
+{
+	*pins = *pads = 0;
+
+	if (ctx->subc != NULL) {
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+		for(o = pcb_data_first(&it, ctx->subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			pcb_layer_type_t lyt;
+
+			if (o->term == NULL)
+				continue;
+
+			/* light terminals */
+			if (o->type == PCB_OBJ_PSTK) {
+				pcb_pstk_t *ps = (pcb_pstk_t *)o;
+				pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+				if (proto->hdia > 0) { /* through-hole */
+					(*pins)++;
+					continue;
+				}
+
+				/* smd */
+				if (pcb_pstk_shape(ps, PCB_LYT_TOP | PCB_LYT_COPPER, 0))
+					(*pads)++;
+				if (pcb_pstk_shape(ps, PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0))
+					(*pads)++;
+				continue;
+			}
+		
+			/* heavy terminal */
+			if (o->type == PCB_OBJ_SUBC) {
+#warning subc TODO: subc-in-subc
+				assert(!"no subc-in-subc support yet");
+				continue;
+			}
+			assert(o->parent_type == PCB_PARENT_LAYER);
+			lyt = pcb_layer_flags_(o->parent.layer);
+			if ((lyt & PCB_LYT_COPPER) && (lyt & (PCB_LYT_TOP || PCB_LYT_TOP)))
+				(*pads)++;
+		}
+	}
+}
+
+static void calc_pad_bbox(subst_ctx_t *ctx, int prerot, pcb_coord_t *pw, pcb_coord_t *ph, pcb_coord_t *pcx, pcb_coord_t *pcy)
+{
+	if (prerot) {
+		/* this is what we would do if we wanted to return the pre-rotation state */
+		if ((ctx->theta == 0) || (ctx->theta == 180) || (ctx->theta == -180)) {
+			calc_pad_bbox_(ctx, pw, ph, pcx, pcy);
+			return;
+		}
+		if ((ctx->theta == 90) || (ctx->theta == 270) || (ctx->theta == -90) || (ctx->theta == -270)) {
+			calc_pad_bbox_(ctx, ph, pw, pcx, pcy);
+			return;
+		}
+		pcb_message(PCB_MSG_ERROR, "XY can't calculate pad bbox for non-90-deg rotated elements yet (angle=%f)\n", ctx->theta);
+	}
+
+	calc_pad_bbox_(ctx, pw, ph, pcx, pcy);
+}
+
+static void append_clean(gds_t *dst, const char *text)
+{
+	const char *s;
+	for(s = text; *s != '\0'; s++)
+		if (isalnum(*s) || (*s == '.') || (*s == '-') || (*s == '+'))
+			gds_append(dst, *s);
+		else
+			gds_append(dst, '_');
+}
+
+static int is_val_true(const char *val)
+{
+	if (val == NULL) return 0;
+	if (strcmp(val, "yes") == 0) return 1;
+	if (strcmp(val, "on") == 0) return 1;
+	if (strcmp(val, "true") == 0) return 1;
+	if (strcmp(val, "1") == 0) return 1;
+	return 0;
+}
+
+static int subst_cb(void *ctx_, gds_t *s, const char **input)
+{
+	int pin_cnt = 0;
+	int pad_cnt = 0;
+	subst_ctx_t *ctx = ctx_;
+	if (strncmp(*input, "UTC%", 4) == 0) {
+		*input += 4;
+		gds_append_str(s, ctx->utcTime);
+		return 0;
+	}
+	if (strncmp(*input, "author%", 7) == 0) {
+		*input += 7;
+		gds_append_str(s, pcb_author());
+		return 0;
+	}
+	if (strncmp(*input, "title%", 6) == 0) {
+		*input += 6;
+		gds_append_str(s, PCB_UNKNOWN(PCB->Name));
+		return 0;
+	}
+	if (strncmp(*input, "suffix%", 7) == 0) {
+		*input += 7;
+		gds_append_str(s, xy_unit->in_suffix);
+		return 0;
+	}
+	if (strncmp(*input, "boardw%", 7) == 0) {
+		*input += 7;
+		pcb_append_printf(s, "%m+%mS", xy_unit->allow, PCB->MaxWidth);
+		return 0;
+	}
+	if (strncmp(*input, "boardh%", 7) == 0) {
+		*input += 7;
+		pcb_append_printf(s, "%m+%mS", xy_unit->allow, PCB->MaxHeight);
+		return 0;
+	}
+	if (strncmp(*input, "subc.", 5) == 0) {
+		*input += 5;
+
+		/* elem attribute print:
+		    subc.a.attribute            - print the attribute if exists, "n/a" if not
+		    subc.a.attribute|unk        - print the attribute if exists, unk if not
+		    subc.a.attribute?yes        - print yes if attribute is true, "n/a" if not
+		    subc.a.attribute?yes:nope   - print yes if attribute is true, nope if not
+		*/
+		if (strncmp(*input, "a.", 2) == 0) {
+			char aname[256], unk_buf[256], *nope;
+			const char *val, *end, *unk = "n/a";
+			long len;
+			
+			*input += 2;
+			end = strpbrk(*input, "?|%");
+			len = end - *input;
+			if (len >= sizeof(aname) - 1) {
+				pcb_message(PCB_MSG_ERROR, "xy tempalte error: attribute name '%s' too long\n", *input);
+				return 1;
+			}
+			memcpy(aname, *input, len);
+			aname[len] = '\0';
+			if (*end == '|') { /* "or unknown" */
+				*input = end+1;
+				end = strchr(*input, '%');
+				len = end - *input;
+				if (len >= sizeof(unk_buf) - 1) {
+					pcb_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute '|unknown' field '%s' too long\n", *input);
+					return 1;
+				}
+				memcpy(unk_buf, *input, len);
+				unk_buf[len] = '\0';
+				unk = unk_buf;
+				*input = end;
+			}
+			else if (*end == '?') { /* trenary */
+				*input = end+1;
+				end = strchr(*input, '%');
+				len = end - *input;
+				if (len >= sizeof(unk_buf) - 1) {
+					pcb_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute trenary field '%s' too long\n", *input);
+					return 1;
+				}
+
+				memcpy(unk_buf, *input, len);
+				unk_buf[len] = '\0';
+				*input = end+1;
+
+				nope = strchr(unk_buf, ':');
+				if (nope != NULL) {
+					*nope = '\0';
+					nope++;
+				}
+				else /* only '?' is given, no ':' */
+					nope = "n/a";
+
+				val = pcb_attribute_get(&ctx->subc->Attributes, aname);
+				if (is_val_true(val))
+					gds_append_str(s, unk_buf);
+				else
+					gds_append_str(s, nope);
+
+				return 0;
+			}
+			else
+				*input = end;
+			(*input)++;
+
+			val = pcb_attribute_get(&ctx->subc->Attributes, aname);
+			if (val == NULL)
+				val = unk;
+			gds_append_str(s, val);
+			return 0;
+		}
+		if (strncmp(*input, "refdes%", 7) == 0) {
+			*input += 7;
+			gds_append_str(s, ctx->name);
+			return 0;
+		}
+		if (strncmp(*input, "refdes_%", 8) == 0) {
+			*input += 8;
+			append_clean(s, ctx->name);
+			return 0;
+		}
+		if (strncmp(*input, "footprint%", 10) == 0) {
+			*input += 10;
+			gds_append_str(s, ctx->descr);
+			return 0;
+		}
+		if (strncmp(*input, "footprint_%", 11) == 0) {
+			*input += 11;
+			append_clean(s, ctx->descr);
+			return 0;
+		}
+		if (strncmp(*input, "value%", 6) == 0) {
+			*input += 6;
+			gds_append_str(s, ctx->value);
+			return 0;
+		}
+		if (strncmp(*input, "value_%", 7) == 0) {
+			*input += 7;
+			append_clean(s, ctx->value);
+			return 0;
+		}
+		if (strncmp(*input, "x%", 2) == 0) {
+			*input += 2;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->x);
+			return 0;
+		}
+		if (strncmp(*input, "y%", 2) == 0) {
+			*input += 2;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->y);
+			return 0;
+		}
+		if (strncmp(*input, "padcx%", 6) == 0) {
+			*input += 6;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->pad_cx);
+			return 0;
+		}
+		if (strncmp(*input, "padcy%", 6) == 0) {
+			*input += 6;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->pad_cy);
+			return 0;
+		}
+		if (strncmp(*input, "rot%", 4) == 0) {
+			*input += 4;
+			pcb_append_printf(s, "%g", ctx->theta);
+			return 0;
+		}
+		if (strncmp(*input, "siderot%", 8) == 0) {
+			*input += 8;
+			pcb_append_printf(s, "%g", ctx->xray_theta);
+			return 0;
+		}
+		if (strncmp(*input, "270-rot%", 8) == 0) {
+			*input += 8;
+			pcb_append_printf(s, "%g", (270-ctx->theta));
+			return 0;
+		}
+		if (strncmp(*input, "side270-rot%", 12) == 0) {
+			*input += 12;
+			pcb_append_printf(s, "%g", (270-ctx->theta));
+			return 0;
+		}
+		if (strncmp(*input, "90rot%", 6) == 0) {
+			*input += 6;
+			if (ctx->theta == 0) {
+				pcb_append_printf(s, "0");
+			} else if (ctx->theta == 90) {
+				pcb_append_printf(s, "1");
+			} else if (ctx->theta == 180) {
+				pcb_append_printf(s, "2");
+			} else {
+				pcb_append_printf(s, "3");
+			}
+			return 0;
+		}
+		if (strncmp(*input, "ncapbbox%", 9) == 0) {
+			*input += 9;
+			/* need to calculate element bounding box */
+			return 0;
+		}
+		if (strncmp(*input, "side%", 5) == 0) {
+			*input += 5;
+			gds_append_str(s, ctx->front ? "top" : "bottom");
+			return 0;
+		}
+		if (strncmp(*input, "count%", 6) == 0) {
+			*input += 6;
+			pcb_append_printf(s, "%d", ctx->count);
+			return 0;
+		}
+		if (strncmp(*input, "num-side%", 9) == 0) {
+			*input += 9;
+			gds_append_str(s, ctx->front ? "1" : "2");
+			return 0;
+		}
+		if (strncmp(*input, "pad_width%", 10) == 0) {
+			*input += 10;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->pad_w);
+			return 0;
+		}
+		if (strncmp(*input, "pad_height%", 11) == 0) {
+			*input += 11;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->pad_h);
+			return 0;
+		}
+		if (strncmp(*input, "pad_width_prerot%", 17) == 0) {
+			*input += 17;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->prpad_w);
+			return 0;
+		}
+		if (strncmp(*input, "pad_height_prerot%", 18) == 0) {
+			*input += 18;
+			pcb_append_printf(s, "%m+%mS", xy_unit->allow, ctx->prpad_h);
+			return 0;
+		}
+		if (strncmp(*input, "smdvsthru%", 10) == 0) {
+			*input += 10;
+			count_pins_pads(ctx, &pin_cnt, &pad_cnt);
+			if (pin_cnt > 0) {
+				pcb_append_printf(s, "PTH");
+			} else if (pad_cnt > 0) {
+				pcb_append_printf(s, "SMD");
+			} else {
+				pcb_append_printf(s, "0");
+			}
+			return 0;
+		}
+		if (strncmp(*input, "smdvsthrunum%", 13) == 0) {
+			*input += 13;
+			count_pins_pads(ctx, &pin_cnt, &pad_cnt);
+			if (pin_cnt > 0) {
+				pcb_append_printf(s, "2");
+			} else if (pad_cnt > 0) {
+				pcb_append_printf(s, "1");
+			} else {
+				pcb_append_printf(s, "0");
+			}
+			return 0;
+		}
+		if (strncmp(*input, "pincount%", 9) == 0) {
+			*input += 9;
+			count_pins_pads(ctx, &pin_cnt, &pad_cnt);
+			if (pin_cnt > 0) {
+				pcb_append_printf(s, "%d", pin_cnt);
+			} else if (pad_cnt > 0) {
+				pcb_append_printf(s, "%d", pad_cnt);
+			} else {
+				pcb_append_printf(s, "0");
+			}
+			return 0;
+		}
+	}
+	if (strncmp(*input, "term.", 5) == 0) {
+		*input += 5;
+		if (strncmp(*input, "netname%", 8) == 0) {
+			*input += 8;
+			if (*ctx->pad_netname != '\0')
+				pcb_append_printf(s, "%s", ctx->pad_netname);
+			else
+				pcb_append_printf(s, "NC");
+			return 0;
+		}
+	}
+	return -1;
+}
+
+static void fprintf_templ(FILE *f, subst_ctx_t *ctx, const char *templ)
+{
+	if (templ != NULL) {
+		char *tmp = pcb_strdup_subst(templ, subst_cb, ctx, PCB_SUBST_PERCENT);
+		fprintf(f, "%s", tmp);
+		free(tmp);
+	}
+}
+
+static void xy_translate(subst_ctx_t *ctx, pcb_coord_t *x, pcb_coord_t *y)
+{
+		/* translate the xy coords using explicit or implicit origin; implicit origin
+		   is lower left corner (looking from top) of board extents */
+		if (ctx->origin_score > 0) {
+			*y = ctx->oy - *y;
+			*x = *x - ctx->ox;
+		}
+		else
+			*y = PCB->MaxHeight - *y;
+}
+
+typedef struct {
+	const char *hdr, *subc, *term, *foot;
+} template_t;
+
+
+static int PrintXY(const template_t *templ, const char *format_name)
+{
+	FILE *fp;
+	subst_ctx_t ctx;
+
+	fp = pcb_fopen(xy_filename, "w");
+	if (!fp) {
+		pcb_gui->log("Cannot open file %s for writing\n", xy_filename);
+		return 1;
+	}
+
+	ctx.count = 0;
+
+	pcb_print_utc(ctx.utcTime, sizeof(ctx.utcTime), 0);
+
+	find_origin(&ctx, format_name);
+
+	fprintf_templ(fp, &ctx, templ->hdr);
+
+	/* For each subcircuit we calculate the centroid of the footprint. */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+		int bott;
+		ctx.count++;
+
+		ctx.pad_w = ctx.pad_h = 0;
+		ctx.theta = ctx.xray_theta = 0.0;
+
+		ctx.name = CleanBOMString((char *) PCB_UNKNOWN(pcb_attribute_get(&subc->Attributes, "refdes")));
+		ctx.descr = CleanBOMString((char *) PCB_UNKNOWN(pcb_subc_name(subc, "export_xy::footprint")));
+		ctx.value = CleanBOMString((char *) PCB_UNKNOWN(pcb_attribute_get(&subc->Attributes, "value")));
+
+		/* prefer the pnp-origin but if that doesn't exist, pick the subc origin */
+		if (!pcb_subc_find_aux_point(subc, "pnp-origin", &ctx.x, &ctx.y))
+			if (pcb_subc_get_origin(subc, &ctx.x, &ctx.y) != 0)
+				pcb_message(PCB_MSG_ERROR, "xy: can't get subc origin for %s\n", ctx.name);
+
+		if (pcb_subc_get_rotation(subc, &ctx.theta) != 0) pcb_message(PCB_MSG_ERROR, "xy: can't get subc rotation for %s\n", ctx.name);
+		if (pcb_subc_get_side(subc, &bott) != 0) pcb_message(PCB_MSG_ERROR, "xy: can't get subc side for %s\n", ctx.name);
+
+		ctx.theta = -ctx.theta;
+		if (ctx.theta == -0)
+			ctx.theta = 0;
+	
+		xy_translate(&ctx, &ctx.x, &ctx.y);
+
+		ctx.subc = subc;
+		ctx.front = !bott;
+
+#warning padstack TODO: do not depend on this, just use the normal bbox and rotate that back
+		calc_pad_bbox(&ctx, 0, &ctx.pad_w, &ctx.pad_h, &ctx.pad_cx, &ctx.pad_cy);
+		calc_pad_bbox(&ctx, 1, &ctx.prpad_w, &ctx.prpad_h, &ctx.pad_cx, &ctx.pad_cy);
+		xy_translate(&ctx, &ctx.pad_cx, &ctx.pad_cy);
+
+		fprintf_templ(fp, &ctx, templ->subc);
+
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			if (o->term != NULL) {
+				pcb_lib_menu_t *m = pcb_netlist_find_net4term(PCB, o);
+				if (m != NULL)
+					ctx.pad_netname = m->Name;
+				else
+					ctx.pad_netname = NULL;
+				fprintf_templ(fp, &ctx, templ->term);
+			}
+		}
+
+		ctx.pad_netname = NULL;
+
+		free(ctx.name);
+		free(ctx.descr);
+		free(ctx.value);
+	}
+	PCB_END_LOOP;
+
+	fprintf_templ(fp, &ctx, templ->foot);
+
+	fclose(fp);
+
+	return 0;
+}
+
+static void gather_templates(void)
+{
+	conf_listitem_t *i;
+	int n;
+
+	conf_loop_list(&conf_xy.plugins.export_xy.templates, i, n) {
+		char buff[256], *id, *sect;
+		int nl = strlen(i->name);
+		if (nl > sizeof(buff)-1) {
+			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': name too long\n", i->name);
+			continue;
+		}
+		memcpy(buff, i->name, nl+1);
+		id = buff;
+		sect = strchr(id, '.');
+		if (sect == NULL) {
+			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': does not have a .section suffix\n", i->name);
+			continue;
+		}
+		*sect = '\0';
+		sect++;
+	}
+}
+
+static const char *get_templ(const char *tid, const char *type)
+{
+	char path[MAX_TEMP_NAME_LEN + 16];
+	conf_listitem_t *li;
+	int idx;
+
+	sprintf(path, "%s.%s", tid, type); /* safe: tid's length is checked before it was put in the vector, type is hardwired in code and is never longer than a few chars */
+	conf_loop_list(&conf_xy.plugins.export_xy.templates, li, idx)
+		if (strcmp(li->name, path) == 0)
+			return li->payload;
+	return NULL;
+}
+
+static void xy_do_export(pcb_hid_attr_val_t * options)
+{
+	int i;
+	template_t templ;
+	char **tid;
+
+	memset(&templ, 0, sizeof(templ));
+
+	gather_templates();
+
+	if (!options) {
+		xy_get_export_options(0);
+		for (i = 0; i < NUM_OPTIONS; i++)
+			xy_values[i] = xy_options[i].default_val;
+		options = xy_values;
+	}
+
+	xy_filename = options[HA_xyfile].str_value;
+	if (!xy_filename)
+		xy_filename = "pcb-out.xy";
+
+	if (options[HA_unit].int_value == -1)
+		xy_unit = options[HA_xymm].int_value ? get_unit_struct("mm")
+			: get_unit_struct("mil");
+	else
+		xy_unit = &pcb_units[options[HA_unit].int_value];
+
+	tid = vts0_get(&fmt_ids, options[HA_format].int_value, 0);
+	if ((tid == NULL) || (*tid == NULL)) {
+		pcb_message(PCB_MSG_ERROR, "export_xy: invalid template selected\n");
+		return;
+	}
+	templ.hdr  = get_templ(*tid, "hdr");
+	templ.subc = get_templ(*tid, "subc");
+	templ.term = get_templ(*tid, "term");
+
+	PrintXY(&templ, options[HA_format].str_value);
+}
+
+static int xy_usage(const char *topic)
+{
+	fprintf(stderr, "\nXY exporter command line arguments:\n\n");
+	pcb_hid_usage(xy_options, sizeof(xy_options) / sizeof(xy_options[0]));
+	fprintf(stderr, "\nUsage: pcb-rnd [generic_options] -x xy [xy_options] foo.pcb\n\n");
+	return 0;
+}
+
+static int xy_parse_arguments(int *argc, char ***argv)
+{
+	pcb_hid_register_attributes(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0);
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+pcb_hid_t xy_hid;
+
+int pplg_check_ver_export_xy(int ver_needed) { return 0; }
+
+void pplg_uninit_export_xy(void)
+{
+	pcb_hid_remove_attributes_by_cookie(xy_cookie);
+	conf_unreg_file(CONF_FN, export_xy_conf_internal);
+	conf_unreg_fields("plugins/export_xy/");
+	free_fmts();
+	vts0_uninit(&fmt_names);
+	vts0_uninit(&fmt_ids);
+}
+
+
+int pplg_init_export_xy(void)
+{
+	PCB_API_CHK_VER;
+
+	conf_reg_file(CONF_FN, export_xy_conf_internal);
+
+	memset(&xy_hid, 0, sizeof(pcb_hid_t));
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_xy, field,isarray,type_name,cpath,cname,desc,flags);
+#include "xy_conf_fields.h"
+
+	pcb_hid_nogui_init(&xy_hid);
+
+	xy_hid.struct_size = sizeof(pcb_hid_t);
+	xy_hid.name = "XY";
+	xy_hid.description = "Exports a XY (centroid)";
+	xy_hid.exporter = 1;
+
+	xy_hid.get_export_options = xy_get_export_options;
+	xy_hid.do_export = xy_do_export;
+	xy_hid.parse_arguments = xy_parse_arguments;
+
+	xy_hid.usage = xy_usage;
+
+	pcb_hid_register_hid(&xy_hid);
+
+	vts0_init(&fmt_names);
+	vts0_init(&fmt_ids);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/export_xy/xy_conf.h
===================================================================
--- tags/2.0.1/src_plugins/export_xy/xy_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/export_xy/xy_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_VENDOR_CONF_H
+#define PCB_VENDOR_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct export_xy {
+			CFT_LIST templates;
+		} export_xy;
+	} plugins;
+} conf_xy_t;
+
+#endif
Index: tags/2.0.1/src_plugins/extedit/Makefile
===================================================================
--- tags/2.0.1/src_plugins/extedit/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/extedit/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_extedit
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/extedit/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/extedit/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/extedit/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {extedit}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/extedit/extedit.o
+@]
+
+switch /local/pcb/extedit/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/extedit/extedit.c
===================================================================
--- tags/2.0.1/src_plugins/extedit/extedit.c	(nonexistent)
+++ tags/2.0.1/src_plugins/extedit/extedit.c	(revision 18980)
@@ -0,0 +1,323 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, dialogs, was written and is Copyright (C) 2017 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "hid.h"
+#include "hid_attrib.h"
+#include "actions.h"
+#include "hid_dad.h"
+#include "plugins.h"
+
+#include "board.h"
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+#include "data.h"
+#include "buffer.h"
+#include "paths.h"
+#include "remove.h"
+#include "safe_fs.h"
+#include "search.h"
+#include "undo.h"
+#include "../src_plugins/io_lihata/io_lihata.h"
+#include "../src_plugins/io_lihata/write.h"
+#include "../src_plugins/io_lihata/read.h"
+
+/* List of all available external edit methods */
+typedef enum {
+	EEF_LIHATA,
+	EEF_max
+} extedit_fmt_t;
+
+const char *extedit_fmt_names[EEF_max+1] = {
+	"lihata",
+	NULL
+};
+
+typedef struct extedit_method_s {
+	char *name;
+	long types;
+	extedit_fmt_t fmt;
+	char *command;
+} extedit_method_t;
+
+static extedit_method_t methods[] = {
+	{"pcb-rnd",         PCB_OBJ_SUBC, EEF_LIHATA, "pcb-rnd \"%f\""},
+	{"editor",          PCB_OBJ_SUBC, EEF_LIHATA, "xterm -e editor \"%f\""},
+	{NULL, 0, 0, NULL}
+};
+
+/* accept these objects for external editing */
+#define EXTEDIT_TYPES (PCB_OBJ_SUBC)
+
+#include "extedit_dad.c"
+
+/* HID-dependent, portable watch of child process */
+typedef struct {
+	FILE *fc;
+	int stay;
+	pcb_hidval_t wid;
+} extedit_wait_t;
+
+pcb_bool extedit_fd_watch(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data)
+{
+	char tmp[128];
+	int res;
+	extedit_wait_t *ctx = user_data.ptr;
+
+	/* excess callbacks */
+	if (!ctx->stay)
+		return pcb_true;
+
+	res = fread(tmp, 1, sizeof(tmp), ctx->fc);
+	if (res <= 0) {
+		pcb_gui->unwatch_file(ctx->wid);
+		ctx->stay = 0;
+		return pcb_false;
+	}
+	return pcb_true;
+}
+
+/* Invoke the child process, display a "progress bar" or some other indication
+   while it's running and wait for it to exit (preferrably keeping the gui
+   refreshed, even if the process is blocking) */
+static void invoke(extedit_method_t *mth, const char *fn)
+{
+	pcb_build_argfn_t subs;
+	char *cmd;
+	FILE *fc;
+
+	memset(&subs, 0, sizeof(subs));
+	subs.params['f' - 'a'] = fn;
+	cmd = pcb_build_argfn(mth->command, &subs);
+
+	/* Don't use pcb_system() because that blocks the current process and the
+	   GUI toolkit won't have a chance to handle expose events */
+	fc = pcb_popen(cmd, "r");
+
+	if (pcb_gui != NULL) {
+		int fd = pcb_fileno(fc);
+		if (fd > 0) {
+			int n = 0;
+			pcb_hidval_t hd;
+			extedit_wait_t ctx;
+
+			ctx.stay = 1;
+			ctx.fc = fc;
+			hd.ptr = &ctx;
+			ctx.wid = pcb_gui->watch_file(fd, PCB_WATCH_READABLE | PCB_WATCH_HANGUP, extedit_fd_watch, hd);
+			while(ctx.stay) {
+				if (pcb_gui != NULL) {
+					n++;
+					pcb_gui->progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
+				}
+				pcb_ms_sleep(50);
+			}
+		}
+		else
+			goto old_wait;
+	}
+	else {
+		old_wait:;
+
+		if (pcb_gui != NULL) {
+			pcb_gui->progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
+			pcb_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */
+		}
+		while(!(feof(fc))) {
+			char tmp[128];
+			fread(tmp, 1, sizeof(tmp), fc);
+		}
+	}
+	fclose(fc);
+
+	if (pcb_gui != NULL)
+		pcb_gui->progress(0, 0, NULL);
+	free(cmd);
+}
+
+
+
+static const char pcb_acts_extedit[] = "extedit(object|selected, [interactive|method])\n";
+static const char pcb_acth_extedit[] = "Invoke an external program to edit a specific part of the current board.";
+static fgw_error_t pcb_act_extedit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd = NULL, *method = NULL;
+	long type;
+	void *ptr1, *ptr2, *ptr3;
+	extedit_method_t *mth = NULL;
+	char *tmp_fn;
+	int ret = 1;
+	FILE *f;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, extedit, cmd = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str);
+
+	/* pick up the object to edit */
+	if ((cmd == NULL) || (pcb_strcasecmp(cmd, "object") == 0)) {
+		pcb_coord_t x, y;
+		pcb_hid_get_coords("Click on object to edit", &x, &y, 0);
+		type = pcb_search_screen(x, y, EXTEDIT_TYPES, &ptr1, &ptr2, &ptr3);
+	}
+	else if ((argc > 1) && (pcb_strcasecmp(cmd, "selected") == 0)) {
+#warning TODO
+		pcb_message(PCB_MSG_ERROR, "\"Selected\" not supported yet\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Wrong 1st argument '%s'\n", cmd);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* determine the method */
+	if (argc > 2) {
+		for(mth = methods; mth->name != NULL; mth++) {
+			if (pcb_strcasecmp(mth->name, method) == 0)
+				break;
+		}
+		if (mth->name == NULL) {
+			pcb_message(PCB_MSG_ERROR, "unknown method '%s'; available methods:\n", method);
+			for(mth = methods; mth->name != NULL; mth++) {
+				if (mth != methods)
+					pcb_message(PCB_MSG_ERROR, ", ", mth->name);
+				pcb_message(PCB_MSG_ERROR, "%s", mth->name);
+			}
+			pcb_message(PCB_MSG_ERROR, "\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+	if (mth == NULL) {
+		mth = extedit_interactive();
+		if (mth == NULL) { /* no method selected */
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+
+	tmp_fn = pcb_tempfile_name_new("extedit");
+	if (tmp_fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to create temporary file\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* export */
+	switch(mth->fmt) {
+		case EEF_LIHATA:
+			{
+				int bn =PCB_MAX_BUFFER - 1;
+
+				pcb_buffer_set_number(bn);
+				pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+				if (pcb_copy_obj_to_buffer(PCB, pcb_buffers[bn].Data, PCB->Data, type, ptr1, ptr2, ptr3) == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Failed to copy target objects to temporary paste buffer\n");
+					goto quit1;
+				}
+
+				f = pcb_fopen(tmp_fn, "w");
+				if (f == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Failed to open temporary file\n");
+					goto quit1;
+				}
+
+				if (io_lihata_write_element(&plug_io_lihata_v4, f, pcb_buffers[bn].Data) != 0) {
+					fclose(f);
+					pcb_message(PCB_MSG_ERROR, "Failed to export target objects to lihata footprint.\n");
+					goto quit1;
+				}
+				fclose(f);
+			}
+			break;
+		case EEF_max:
+			break;
+	}
+
+	/* invoke external program */
+	invoke(mth, tmp_fn);
+
+	/* load the result */
+	switch(mth->fmt) {
+		case EEF_LIHATA:
+			{
+				int bn =PCB_MAX_BUFFER - 1;
+
+				pcb_buffer_set_number(bn);
+				pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+
+				if (io_lihata_parse_element(&plug_io_lihata_v4, pcb_buffers[bn].Data, tmp_fn) != 0) {
+					pcb_message(PCB_MSG_ERROR, "Failed to load the edited footprint. File left at '%s'.\n", tmp_fn);
+					goto quit0;
+				}
+
+				pcb_undo_save_serial();
+				pcb_buffer_copy_to_layout(PCB, 0, 0);
+				pcb_undo_restore_serial();
+				pcb_remove_object(type, ptr1, ptr2, ptr3);
+				pcb_undo_inc_serial();
+				ret = 0;
+			}
+		case EEF_max:
+			break;
+	}
+	if (pcb_gui != NULL)
+		pcb_gui->invalidate_all();
+
+	quit1:;
+	pcb_tempfile_unlink(tmp_fn);
+	quit0:;
+	PCB_ACT_IRES(ret);
+	return 0;
+}
+
+static pcb_action_t extedit_action_list[] = {
+	{"extedit", pcb_act_extedit, pcb_acts_extedit, pcb_acth_extedit}
+};
+
+static const char *extedit_cookie = "extedit plugin";
+
+PCB_REGISTER_ACTIONS(extedit_action_list, extedit_cookie)
+
+int pplg_check_ver_extedit(int ver_needed) { return 0; }
+
+void pplg_uninit_extedit(void)
+{
+	pcb_remove_actions_by_cookie(extedit_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_extedit(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(extedit_action_list, extedit_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/extedit/extedit.pup
===================================================================
--- tags/2.0.1/src_plugins/extedit/extedit.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/extedit/extedit.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class feature
+$short edit with external program
+$long invoke external program to edit parts of the current board
+$state works
+$package (core)
+dep io_lihata
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/extedit/extedit_dad.c
===================================================================
--- tags/2.0.1/src_plugins/extedit/extedit_dad.c	(nonexistent)
+++ tags/2.0.1/src_plugins/extedit/extedit_dad.c	(revision 18980)
@@ -0,0 +1,133 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, dialogs, was written and is Copyright (C) 2017 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "hid_dad.h"
+
+typedef struct {
+	PCB_DAD_DECL_NOINIT(dlg)
+	int mthi;
+
+	int wmethod, wfmt, wcmd;
+} ee_t;
+
+#define NUM_METHODS (sizeof(methods) / sizeof(methods[0]))
+
+static void ee_data2dialog(ee_t *ee)
+{
+	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wmethod, int_value, ee->mthi);
+	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wfmt, int_value, methods[ee->mthi].fmt);
+	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str_value, methods[ee->mthi].command);
+
+	/* we have only one format, so disable the combo box for selecting it */
+	pcb_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false);
+
+	/* default value string crashes for some reason, disable it for now */
+	pcb_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wcmd, pcb_false);
+}
+
+static void ee_chg_method(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	static int lock = 0;
+	ee_t *ee = caller_data;
+
+	if (lock)
+		return;
+
+	ee->mthi = ee->dlg[ee->wmethod].default_val.int_value;
+
+	lock = 1;
+	ee_data2dialog(ee);
+	lock = 0;
+}
+
+static void ee_chg_cmd(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	static int lock = 0;
+	ee_t *ee = caller_data;
+
+	if (lock)
+		return;
+
+	methods[ee->mthi].command = pcb_strdup(ee->dlg[ee->wcmd].default_val.str_value);
+
+	lock = 1;
+	ee_data2dialog(ee);
+	lock = 0;
+}
+
+
+/* DAD-based interactive method editor */
+static extedit_method_t *extedit_interactive(void)
+{
+	ee_t ee;
+	char tmp[256];
+	const char *names[NUM_METHODS+1];
+	int n, res;
+
+	for(n = 0; n < NUM_METHODS; n++)
+		names[n] = methods[n].name;
+	names[n] = NULL;
+
+	memset(&ee, 0, sizeof(ee));
+
+	PCB_DAD_BEGIN_VBOX(ee.dlg);
+		sprintf(tmp, "Select external editor...");
+		PCB_DAD_LABEL(ee.dlg, tmp);
+
+		PCB_DAD_BEGIN_HBOX(ee.dlg);
+			PCB_DAD_LABEL(ee.dlg, "Method name:");
+			PCB_DAD_ENUM(ee.dlg, names);
+			ee.wmethod = PCB_DAD_CURRENT(ee.dlg);
+			PCB_DAD_CHANGE_CB(ee.dlg, ee_chg_method);
+		PCB_DAD_END(ee.dlg);
+
+		PCB_DAD_BEGIN_HBOX(ee.dlg);
+			PCB_DAD_LABEL(ee.dlg, "File format:");
+			PCB_DAD_ENUM(ee.dlg, extedit_fmt_names);
+			ee.wfmt = PCB_DAD_CURRENT(ee.dlg);
+		PCB_DAD_END(ee.dlg);
+
+		PCB_DAD_BEGIN_HBOX(ee.dlg);
+			PCB_DAD_LABEL(ee.dlg, "Command template:");
+			PCB_DAD_STRING(ee.dlg);
+			ee.wcmd = PCB_DAD_CURRENT(ee.dlg);
+			PCB_DAD_CHANGE_CB(ee.dlg, ee_chg_cmd);
+		PCB_DAD_END(ee.dlg);
+	PCB_DAD_END(ee.dlg);
+
+	PCB_DAD_NEW(ee.dlg, "External editor", "External editor", &ee, pcb_true, NULL);
+
+	ee_data2dialog(&ee);
+	res = PCB_DAD_RUN(ee.dlg);
+
+	PCB_DAD_FREE(ee.dlg);
+	if (res != 0)
+		return NULL;
+	return &methods[ee.mthi];
+}
Index: tags/2.0.1/src_plugins/fontmode/Makefile
===================================================================
--- tags/2.0.1/src_plugins/fontmode/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/fontmode/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_fontmode
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/fontmode/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/fontmode/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/fontmode/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {fontmode}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/fontmode/fontmode.o @]
+
+switch /local/pcb/fontmode/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/fontmode/fontmode.c
===================================================================
--- tags/2.0.1/src_plugins/fontmode/fontmode.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fontmode/fontmode.c	(revision 18980)
@@ -0,0 +1,382 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2006 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+
+#include <math.h>
+#include <memory.h>
+#include <limits.h>
+#include <assert.h>
+
+#include "data.h"
+#include "draw.h"
+#include "flag.h"
+#include "layer.h"
+#include "move.h"
+#include "remove.h"
+#include "rtree.h"
+#include "flag_str.h"
+#include "undo.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "event.h"
+#include "polygon.h"
+#include "obj_poly_draw.h"
+
+/* FIXME - we currently hardcode the grid and PCB size.  What we
+   should do in the future is scan the font for its extents, and size
+   the grid appropriately.  Also, when we convert back to a font, we
+   should search the grid for the gridlines and use them to figure out
+   where the symbols are. */
+
+#define CELL_SIZE   ((pcb_coord_t)(PCB_MIL_TO_COORD (100)))
+
+#define XYtoSym(x,y) (((x) / CELL_SIZE - 1)  +  (16 * ((y) / CELL_SIZE - 1)))
+
+static const char pcb_acts_fontedit[] = "FontEdit()";
+static const char pcb_acth_fontedit[] = "Convert the current font to a PCB for editing.";
+
+/* %start-doc actions FontEdit
+
+%end-doc */
+
+static pcb_layer_t *make_layer(pcb_layergrp_id_t grp, const char *lname)
+{
+	pcb_layer_id_t lid;
+
+	assert(grp >= 0);
+	lid = pcb_layer_create(PCB, grp, lname);
+	assert(lid >= 0);
+	PCB->Data->Layer[lid].meta.real.vis = 1;
+	PCB->Data->Layer[lid].meta.real.color = pcb_strdup(pcb_layer_default_color(lid, 0));
+	return &PCB->Data->Layer[lid];
+}
+
+static void add_poly(pcb_layer_t *layer, pcb_poly_t *poly, pcb_coord_t ox, pcb_coord_t oy)
+{
+	pcb_poly_t *np;
+	
+	/* alloc */
+	np = pcb_poly_new(layer, 0, pcb_no_flags());
+	pcb_poly_copy(np, poly, ox, oy);
+
+	/* add */
+	pcb_add_poly_on_layer(layer, np);
+	pcb_poly_init_clip(PCB->Data, layer, np);
+	pcb_poly_invalidate_draw(layer, np);
+}
+
+static fgw_error_t pcb_act_FontEdit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_font_t *font;
+	pcb_symbol_t *symbol;
+	pcb_layer_t *lfont, *lorig, *lwidth, *lgrid, *lsilk;
+	pcb_layergrp_id_t grp[4];
+	pcb_poly_t *poly;
+	pcb_arc_t *arc, *newarc;
+	int s, l;
+
+	font = pcb_font_unlink(PCB, conf_core.design.text_font_id);
+	if (font == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't fetch font id %d\n", conf_core.design.text_font_id);
+		return 1;
+	}
+
+	if (pcb_actionl("New", "Font", 0))
+		return 1;
+
+#warning TODO do we need to change design.bloat here?
+	conf_set(CFR_DESIGN, "editor/grid_unit", -1, "mil", POL_OVERWRITE);
+	conf_set_design("design/bloat", "%s", "1");
+	conf_set_design("design/shrink", "%s", "1");
+	conf_set_design("design/min_wid", "%s", "1");
+	conf_set_design("design/min_slk", "%s", "1");
+	conf_set_design("design/text_font_id", "%s", "0");
+
+
+	PCB->MaxWidth = CELL_SIZE * 18;
+	PCB->MaxHeight = CELL_SIZE * ((PCB_MAX_FONTPOSITION + 15) / 16 + 2);
+	PCB->Grid = PCB_MIL_TO_COORD(5);
+
+	/* create the layer stack and logical layers */
+	pcb_layergrp_inhibit_inc();
+	pcb_layers_reset(PCB);
+	pcb_layer_group_setup_default(PCB);
+	pcb_get_grp_new_intern(PCB, 1);
+	pcb_get_grp_new_intern(PCB, 2);
+
+	assert(pcb_layergrp_list(PCB, PCB_LYT_COPPER, grp, 4) == 4);
+	lfont  = make_layer(grp[0], "Font");
+	lorig  = make_layer(grp[1], "OrigFont");
+	lwidth = make_layer(grp[2], "Width");
+	lgrid  = make_layer(grp[3], "Grid");
+
+	assert(pcb_layergrp_list(PCB, PCB_LYT_SILK, grp, 2) == 2);
+	make_layer(grp[0], "Silk");
+	lsilk = make_layer(grp[1], "Silk");
+
+	pcb_layergrp_inhibit_dec();
+
+	/* Inform the rest about the board change (layer stack, size) */
+	pcb_event(PCB_EVENT_BOARD_CHANGED, NULL);
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+
+	for (s = 0; s <= PCB_MAX_FONTPOSITION; s++) {
+		char txt[32];
+		pcb_coord_t ox = (s % 16 + 1) * CELL_SIZE;
+		pcb_coord_t oy = (s / 16 + 1) * CELL_SIZE;
+		pcb_coord_t w, miny, maxy, maxx = 0;
+
+		symbol = &font->Symbol[s];
+
+		miny = PCB_MIL_TO_COORD(5);
+		maxy = font->MaxHeight;
+
+		if ((s > 32) && (s < 127)) {
+			sprintf(txt, "%c", s);
+			pcb_text_new(lsilk, pcb_font(PCB, 0, 0), ox+CELL_SIZE-CELL_SIZE/3, oy+CELL_SIZE-CELL_SIZE/3, 0, 50, txt, pcb_no_flags());
+		}
+		sprintf(txt, "%d", s);
+		pcb_text_new(lsilk, pcb_font(PCB, 0, 0), ox+CELL_SIZE/20, oy+CELL_SIZE-CELL_SIZE/3, 0, 50, txt, pcb_no_flags());
+
+		for (l = 0; l < symbol->LineN; l++) {
+			pcb_line_new_merge(lfont,
+														 symbol->Line[l].Point1.X + ox,
+														 symbol->Line[l].Point1.Y + oy,
+														 symbol->Line[l].Point2.X + ox,
+														 symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, pcb_no_flags());
+			pcb_line_new_merge(lorig, symbol->Line[l].Point1.X + ox,
+														 symbol->Line[l].Point1.Y + oy,
+														 symbol->Line[l].Point2.X + ox,
+														 symbol->Line[l].Point2.Y + oy, symbol->Line[l].Thickness, symbol->Line[l].Thickness, pcb_no_flags());
+			if (maxx < symbol->Line[l].Point1.X)
+				maxx = symbol->Line[l].Point1.X;
+			if (maxx < symbol->Line[l].Point2.X)
+				maxx = symbol->Line[l].Point2.X;
+		}
+
+
+		for(arc = arclist_first(&symbol->arcs); arc != NULL; arc = arclist_next(arc)) {
+			pcb_arc_new(lfont, arc->X + ox, arc->Y + oy, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness, 0, pcb_no_flags(), pcb_true);
+			newarc = pcb_arc_new(lorig, arc->X + ox, arc->Y + oy, arc->Width, arc->Height, arc->StartAngle, arc->Delta, arc->Thickness, 0, pcb_no_flags(), pcb_true);
+			if (newarc != NULL) {
+				if (maxx < newarc->BoundingBox.X2 - ox)
+					maxx = newarc->BoundingBox.X2 - ox;
+				if (maxy < newarc->BoundingBox.Y2 - oy)
+					maxy = newarc->BoundingBox.Y2 - oy;
+			}
+		}
+
+		for(poly = polylist_first(&symbol->polys); poly != NULL; poly = polylist_next(poly)) {
+			int n;
+			pcb_point_t *pnt;
+
+			add_poly(lfont, poly, ox, oy);
+			add_poly(lorig, poly, ox, oy);
+
+			for(n = 0, pnt = poly->Points; n < poly->PointN; n++,pnt++) {
+				if (maxx < pnt->X)
+					maxx = pnt->X;
+				if (maxy < pnt->Y)
+					maxy = pnt->Y;
+			}
+		}
+
+		w = maxx + symbol->Delta + ox;
+		pcb_line_new_merge(lwidth, w, miny + oy, w, maxy + oy, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags());
+	}
+
+	for (l = 0; l < 16; l++) {
+		int x = (l + 1) * CELL_SIZE;
+		pcb_line_new_merge(lgrid, x, 0, x, PCB->MaxHeight, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags());
+	}
+	for (l = 0; l <= PCB_MAX_FONTPOSITION / 16 + 1; l++) {
+		int y = (l + 1) * CELL_SIZE;
+		pcb_line_new_merge(lgrid, 0, y, PCB->MaxWidth, y, PCB_MIL_TO_COORD(1), PCB_MIL_TO_COORD(1), pcb_no_flags());
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_fontsave[] = "FontSave()";
+static const char pcb_acth_fontsave[] = "Convert the current PCB back to a font.";
+
+/* %start-doc actions FontSave
+
+%end-doc */
+
+static fgw_error_t pcb_act_FontSave(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_font_t *font;
+	pcb_symbol_t *symbol;
+	int i;
+	pcb_line_t *l;
+	pcb_arc_t *a;
+	pcb_poly_t *p, *np;
+	gdl_iterator_t it;
+	pcb_layer_t *lfont, *lwidth;
+
+	font = pcb_font(PCB, 0, 1);
+	lfont = PCB->Data->Layer + 0;
+	lwidth = PCB->Data->Layer + 2;
+
+	for (i = 0; i <= PCB_MAX_FONTPOSITION; i++) {
+		font->Symbol[i].LineN = 0;
+		font->Symbol[i].Valid = 0;
+		font->Symbol[i].Width = 0;
+	}
+
+	/* pack lines */
+	linelist_foreach(&lfont->Line, &it, l) {
+		int x1 = l->Point1.X;
+		int y1 = l->Point1.Y;
+		int x2 = l->Point2.X;
+		int y2 = l->Point2.Y;
+		int ox, oy, s;
+
+		s = XYtoSym(x1, y1);
+		ox = (s % 16 + 1) * CELL_SIZE;
+		oy = (s / 16 + 1) * CELL_SIZE;
+		symbol = &font->Symbol[s];
+
+		x1 -= ox;
+		y1 -= oy;
+		x2 -= ox;
+		y2 -= oy;
+
+		if (symbol->Width < x1)
+			symbol->Width = x1;
+		if (symbol->Width < x2)
+			symbol->Width = x2;
+		symbol->Valid = 1;
+
+		pcb_font_new_line_in_sym(symbol, x1, y1, x2, y2, l->Thickness);
+	}
+
+	/* pack arcs */
+	arclist_foreach(&lfont->Arc, &it, a) {
+		int cx = a->X;
+		int cy = a->Y;
+		int ox, oy, s;
+
+		s = XYtoSym(cx, cy);
+		ox = (s % 16 + 1) * CELL_SIZE;
+		oy = (s / 16 + 1) * CELL_SIZE;
+		symbol = &font->Symbol[s];
+
+		cx -= ox;
+		cy -= oy;
+
+		pcb_arc_bbox(a);
+		if (symbol->Width < a->BoundingBox.X2 - ox)
+			symbol->Width = a->BoundingBox.X2 - ox;
+
+		if (symbol->Width < cx)
+			symbol->Width = cx;
+		symbol->Valid = 1;
+
+		pcb_font_new_arc_in_sym(symbol, cx, cy, a->Width, a->StartAngle, a->Delta, a->Thickness);
+	}
+
+	/* pack polygons */
+	polylist_foreach(&lfont->Polygon, &it, p) {
+		pcb_coord_t x1 = p->Points[0].X;
+		pcb_coord_t y1 = p->Points[0].Y;
+		pcb_coord_t s, ox, oy;
+		int n;
+
+		s = XYtoSym(x1, y1);
+		ox = (s % 16 + 1) * CELL_SIZE;
+		oy = (s / 16 + 1) * CELL_SIZE;
+		symbol = &font->Symbol[s];
+
+		np = pcb_font_new_poly_in_sym(symbol, p->PointN);
+
+		for(n = 0; n < p->PointN; n++) {
+			np->Points[n].X = p->Points[n].X - ox;
+			np->Points[n].Y = p->Points[n].Y - oy;
+			if (symbol->Width < np->Points[n].X)
+				symbol->Width = np->Points[n].X;
+		}
+	}
+
+	/* recalc delta */
+	linelist_foreach(&lwidth->Line, &it, l) {
+		pcb_coord_t x1 = l->Point1.X;
+		pcb_coord_t y1 = l->Point1.Y;
+		pcb_coord_t ox, s;
+
+		s = XYtoSym(x1, y1);
+		ox = (s % 16 + 1) * CELL_SIZE;
+		symbol = &font->Symbol[s];
+
+		x1 -= ox;
+
+		symbol->Delta = x1 - symbol->Width;
+	}
+
+	pcb_font_set_info(font);
+	pcb_actionl("SaveFontTo", NULL);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t fontmode_action_list[] = {
+	{"FontEdit", pcb_act_FontEdit, pcb_acth_fontedit, pcb_acts_fontedit},
+	{"FontSave", pcb_act_FontSave, pcb_acth_fontsave, pcb_acts_fontsave}
+};
+
+static const char *fontmode_cookie = "fontmode plugin";
+
+PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie)
+
+int pplg_check_ver_fontmode(int ver_needed) { return 0; }
+
+void pplg_uninit_fontmode(void)
+{
+	pcb_remove_actions_by_cookie(fontmode_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_fontmode(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(fontmode_action_list, fontmode_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/fontmode/fontmode.pup
===================================================================
--- tags/2.0.1/src_plugins/fontmode/fontmode.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/fontmode/fontmode.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short font editor
+$long Font editing actions.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/fp_board/Makefile
===================================================================
--- tags/2.0.1/src_plugins/fp_board/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_board/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_fp_board
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/fp_board/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/fp_board/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_board/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {fp_board}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/fp_board/fp_board.o @]
+
+switch /local/pcb/fp_board/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/fp_board/fp_board.c
===================================================================
--- tags/2.0.1/src_plugins/fp_board/fp_board.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_board/fp_board.c	(revision 18980)
@@ -0,0 +1,179 @@
+
+#include "config.h"
+
+#include "plugins.h"
+#include "plug_footprint.h"
+#include "board.h"
+#include "buffer.h"
+#include "data.h"
+#include "error.h"
+#include "obj_subc.h"
+#include "obj_subc_list.h"
+#include "obj_subc_op.h"
+#include "compat_misc.h"
+#include "pcb-printf.h"
+#include "operation.h"
+#include "plug_io.h"
+#include "safe_fs.h"
+
+#define REQUIRE_PATH_PREFIX "board@"
+
+static int fp_board_load_dir(pcb_plug_fp_t *ctx, const char *path, int force)
+{
+	const char *fpath;
+	pcb_fplibrary_t *l;
+	pcb_buffer_t buff;
+	unsigned long int id;
+	int old_dedup;
+	pcb_subclist_dedup_initializer(dedup);
+
+	if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0)
+		return -1;
+
+	fpath = path + strlen(REQUIRE_PATH_PREFIX);
+
+	/* load file */
+	memset(&buff, 0, sizeof(buff));
+	if (pcb_buffer_load_layout(PCB, &buff, fpath, NULL) != pcb_true) {
+		pcb_message(PCB_MSG_ERROR, "Warning: failed to load %s\n", fpath);
+		return -1;
+	}
+
+	/* make sure lib dir is ready */
+	l = pcb_fp_lib_search(&pcb_library, path);
+	if (l == NULL)
+		l = pcb_fp_mkdir_len(&pcb_library, path, -1);
+
+	/* add unique elements */
+	old_dedup = pcb_subc_hash_ignore_uid;
+	pcb_subc_hash_ignore_uid = 1;
+	id = 0;
+	PCB_SUBC_LOOP(buff.Data) {
+		const char *ename;
+		pcb_fplibrary_t *e;
+
+		id++;
+		pcb_subclist_dedup_skip(dedup, subc);
+
+		ename = pcb_attribute_get(&subc->Attributes, "footprint");
+		if (ename == NULL)
+			ename = subc->refdes;
+		if (ename == NULL)
+			ename = "anonymous";
+		e = pcb_fp_append_entry(l, ename, PCB_FP_FILE, NULL);
+
+		/* remember location by ID - because of the dedup search by name is unsafe */
+		if (e != NULL)
+			e->data.fp.loc_info = pcb_strdup_printf("%s@%lu", path, id);
+
+	} PCB_END_LOOP;
+
+	pcb_subc_hash_ignore_uid = old_dedup;
+	pcb_subclist_dedup_free(dedup);
+
+	/* clean up buffer */
+	pcb_buffer_clear(PCB, &buff);
+	free(buff.Data);
+
+	return 0;
+}
+
+static FILE *fp_board_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
+{
+	char *fpath, *ids, *end;
+	unsigned long int id, req_id;
+	pcb_buffer_t buff;
+	FILE *f = NULL;
+	pcb_opctx_t op;
+	char *tmp_name = ".board.fp";
+
+	if (strncmp(name, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0)
+		return NULL;
+
+	/* split file name and ID */
+	fpath = pcb_strdup(name + strlen(REQUIRE_PATH_PREFIX));
+	ids = strchr(fpath, '@');
+	if (ids == NULL)
+		goto err;
+
+	*ids = '\0';
+	ids++;
+
+	req_id = strtoul(ids, &end, 10);
+	if (*end != '\0')
+		goto err;
+
+	/* load file */
+	memset(&buff, 0, sizeof(buff));
+	if (pcb_buffer_load_layout(PCB, &buff, fpath, NULL) != pcb_true) {
+		pcb_message(PCB_MSG_ERROR, "Warning: failed to load %s\n", fpath);
+		goto err;
+	}
+
+	/* find the reuqested footprint in the file */
+	id = 0;
+	PCB_SUBC_LOOP(buff.Data) {
+		id++;
+		if (id == req_id) {
+/*			if (strcmp(element->Name[PCB_ELEMNAME_IDX_DESCRIPTION].TextString, l->name)) */
+			pcb_buffer_t buff2;
+
+#warning TODO: extend the API:
+			/* This is not pretty: we are saving the element to a file so we can return a FILE *.
+			   Later on we should just return the footprint. */
+			memset(&op, 0, sizeof(op));
+			op.buffer.dst = calloc(sizeof(pcb_data_t), 1);
+			pcb_data_set_layer_parents(op.buffer.dst);
+			pcb_subcop_add_to_buffer(&op, subc);
+
+			f = pcb_fopen(tmp_name, "w");
+			memset(&buff2, 0, sizeof(buff2));
+			buff2.Data = op.buffer.dst;
+			pcb_write_buffer(f, &buff2, NULL, pcb_true);
+			fclose(f);
+
+			pcb_data_free(op.buffer.dst);
+			free(op.buffer.dst);
+
+			f = pcb_fopen(tmp_name, "r");
+			break;
+		}
+	} PCB_END_LOOP;
+
+	/* clean up buffer */
+
+	pcb_buffer_clear(PCB, &buff);
+	free(buff.Data);
+	return f;
+
+err:;
+		free(fpath);
+		return NULL;
+}
+
+static void fp_board_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
+{
+	fclose(f);
+#warning TODO: remove file
+}
+
+
+static pcb_plug_fp_t fp_board;
+
+int pplg_check_ver_fp_board(int ver_needed) { return 0; }
+
+void pplg_uninit_fp_board(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_board);
+}
+
+int pplg_init_fp_board(void)
+{
+	PCB_API_CHK_VER;
+	fp_board.plugin_data = NULL;
+	fp_board.load_dir = fp_board_load_dir;
+	fp_board.fp_fopen = fp_board_fopen;
+	fp_board.fp_fclose = fp_board_fclose;
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_board);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/fp_board/fp_board.pup
===================================================================
--- tags/2.0.1/src_plugins/fp_board/fp_board.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_board/fp_board.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class fp
+$short footprint library from boards
+$long Footprint: load a board and expose all the unique subcircuits on that board as a footprint library
+$state WIP
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/fp_fs/Makefile
===================================================================
--- tags/2.0.1/src_plugins/fp_fs/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_fs/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_fp_fs
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/fp_fs/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/fp_fs/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_fs/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {fp_fs}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/fp_fs/fp_fs.o @]
+
+switch /local/pcb/fp_fs/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/fp_fs/fp_fs.c
===================================================================
--- tags/2.0.1/src_plugins/fp_fs/fp_fs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_fs/fp_fs.c	(revision 18980)
@@ -0,0 +1,568 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "data.h"
+#include "paths.h"
+#include "plugins.h"
+#include "plug_footprint.h"
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "error.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "compat_nls.h"
+#include "macro.h"
+#include "safe_fs.h"
+
+/* opendir, readdir */
+#include "compat_inc.h"
+
+static pcb_fptype_t pcb_fp_file_type(const char *fn, void ***tags);
+
+/* ---------------------------------------------------------------------------
+ * Parse the directory tree where newlib footprints are found
+ */
+typedef struct list_dir_s list_dir_t;
+
+struct list_dir_s {
+	char *parent;
+	char *subdir;
+	list_dir_t *next;
+};
+
+typedef struct {
+	pcb_fplibrary_t *menu;
+	list_dir_t *subdirs;
+	int children;
+} list_st_t;
+
+static int list_cb(void *cookie, const char *subdir, const char *name, pcb_fptype_t type, void *tags[])
+{
+	list_st_t *l = (list_st_t *) cookie;
+	pcb_fplibrary_t *e;
+
+	if (type == PCB_FP_DIR) {
+		list_dir_t *d;
+		/* can not recurse directly from here because that would ruin the menu
+		   pointer: pcb_lib_menu_new(&Library) calls realloc()!
+		   Build a list of directories to be visited later, instead. */
+		d = malloc(sizeof(list_dir_t));
+		d->subdir = pcb_strdup(name);
+		d->parent = pcb_strdup(subdir);
+		d->next = l->subdirs;
+		l->subdirs = d;
+		return 0;
+	}
+
+	l->children++;
+	e = pcb_fp_append_entry(l->menu, name, type, tags);
+
+/* Avoid using pcb_concat() - would be a new dependency for gsch2pcb-rnd */
+	{
+		int sl = strlen(subdir);
+		int nl = strlen(name);
+		char *end;
+
+		end = e->data.fp.loc_info = malloc(sl+nl+3);
+		memcpy(end, subdir, sl); end += sl;
+		*end = '/'; end++;
+		memcpy(end, name, nl+1); end += nl;
+	}
+
+	return 0;
+}
+
+static int fp_fs_list(pcb_fplibrary_t *pl, const char *subdir, int recurse,
+								int (*cb) (void *cookie, const char *subdir, const char *name, pcb_fptype_t type, void *tags[]), void *cookie,
+								int subdir_may_not_exist, int need_tags)
+{
+	char olddir[PCB_PATH_MAX + 1];	/* The directory we start out in (cwd) */
+	char new_subdir[PCB_PATH_MAX + 1];
+	char fn[PCB_PATH_MAX + 1], *fn_end;
+	DIR *subdirobj;								/* Interable object holding all subdir entries */
+	struct dirent *subdirentry;		/* Individual subdir entry */
+	struct stat buffer;						/* Buffer used in stat */
+	size_t l;
+	int n_footprints = 0;					/* Running count of footprints found in this subdir */
+
+	/* Cache old dir, then cd into subdir because stat is given relative file names. */
+	memset(olddir, 0, sizeof olddir);
+	if (pcb_get_wd(olddir) == NULL) {
+		pcb_message(PCB_MSG_ERROR, _("fp_fs_list(): Could not determine initial working directory\n"));
+		return 0;
+	}
+
+	if (strcmp(subdir, ".svn") == 0)
+		return 0;
+
+	if (chdir(subdir)) {
+		if (!subdir_may_not_exist)
+			pcb_chdir_error_message(subdir);
+		return 0;
+	}
+
+
+	/* Determine subdir's abs path */
+	if (pcb_get_wd(new_subdir) == NULL) {
+		pcb_message(PCB_MSG_ERROR, _("fp_fs_list(): Could not determine new working directory\n"));
+		if (chdir(olddir))
+			pcb_chdir_error_message(olddir);
+		return 0;
+	}
+
+	l = strlen(new_subdir);
+	memcpy(fn, new_subdir, l);
+	fn[l] = PCB_DIR_SEPARATOR_C;
+	fn_end = fn + l + 1;
+
+	/* First try opening the directory specified by path */
+	if ((subdirobj = opendir(new_subdir)) == NULL) {
+		pcb_opendir_error_message(new_subdir);
+		if (chdir(olddir))
+			pcb_chdir_error_message(olddir);
+		return 0;
+	}
+
+	/* Now loop over files in this directory looking for files.
+	 * We ignore certain files which are not footprints.
+	 */
+	while ((subdirentry = readdir(subdirobj)) != NULL) {
+#ifdef DEBUG
+/*    printf("...  Examining file %s ... \n", subdirentry->d_name); */
+#endif
+
+		/* Ignore non-footprint files found in this directory
+		 * We're skipping .png and .html because those
+		 * may exist in a library tree to provide an html browsable
+		 * index of the library.
+		 */
+#warning fp TODO: make this a configurable list
+		l = strlen(subdirentry->d_name);
+		if (!stat(subdirentry->d_name, &buffer)
+				&& subdirentry->d_name[0] != '.'
+				&& PCB_NSTRCMP(subdirentry->d_name, "CVS") != 0
+				&& PCB_NSTRCMP(subdirentry->d_name, "Makefile") != 0
+				&& PCB_NSTRCMP(subdirentry->d_name, "Makefile.am") != 0
+				&& PCB_NSTRCMP(subdirentry->d_name, "Makefile.in") != 0 && (l < 4 || PCB_NSTRCMP(subdirentry->d_name + (l - 4), ".png") != 0)
+				&& (l < 5 || PCB_NSTRCMP(subdirentry->d_name + (l - 5), ".html") != 0)
+				&& (l < 4 || PCB_NSTRCMP(subdirentry->d_name + (l - 4), ".pcb") != 0)) {
+
+#ifdef DEBUG
+/*	printf("...  Found a footprint %s ... \n", subdirentry->d_name); */
+#endif
+			strcpy(fn_end, subdirentry->d_name);
+			if ((S_ISREG(buffer.st_mode)) || (WRAP_S_ISLNK(buffer.st_mode))) {
+				pcb_fptype_t ty;
+				void **tags = NULL;
+				ty = pcb_fp_file_type(subdirentry->d_name, (need_tags ? &tags : NULL));
+				if ((ty == PCB_FP_FILE) || (ty == PCB_FP_PARAMETRIC)) {
+					n_footprints++;
+					if (cb(cookie, new_subdir, subdirentry->d_name, ty, tags))
+						break;
+					continue;
+				}
+				else
+					if (tags != NULL)
+						free(tags);
+			}
+
+			if ((S_ISDIR(buffer.st_mode)) || (WRAP_S_ISLNK(buffer.st_mode))) {
+				cb(cookie, new_subdir, subdirentry->d_name, PCB_FP_DIR, NULL);
+				if (recurse) {
+					n_footprints += fp_fs_list(pl, fn, recurse, cb, cookie, 0, need_tags);
+				}
+				continue;
+			}
+
+		}
+	}
+	/* Done.  Clean up, cd back into old dir, and return */
+	closedir(subdirobj);
+	if (chdir(olddir))
+		pcb_chdir_error_message(olddir);
+	return n_footprints;
+}
+
+static int fp_fs_load_dir_(pcb_fplibrary_t *pl, const char *subdir, const char *toppath, int is_root)
+{
+	list_st_t l;
+	list_dir_t *d, *nextd;
+	char working_[PCB_PATH_MAX + 1];
+	const char *visible_subdir;
+	char *working;								/* String holding abs path to working dir */
+
+
+
+	sprintf(working_, "%s%c%s", toppath, PCB_DIR_SEPARATOR_C, subdir);
+	pcb_path_resolve(working_, &working, 0);
+
+	/* Return error if the root is not a directory, to give other fp_ plugins a chance */
+	if ((is_root) && (!pcb_is_dir(working))) {
+		free(working);
+		return -1;
+	}
+
+	if (strcmp(subdir, ".") == 0)
+		visible_subdir = toppath;
+	else
+		visible_subdir = subdir;
+
+	l.menu = pcb_fp_lib_search(pl, visible_subdir);
+	if (l.menu == NULL)
+		l.menu = pcb_fp_mkdir_len(pl, visible_subdir, -1);
+	l.subdirs = NULL;
+	l.children = 0;
+
+	fp_fs_list(l.menu, working, 0, list_cb, &l, is_root, 1);
+
+	/* now recurse to each subdirectory mapped in the previous call;
+	   by now we don't care if menu is ruined by the realloc() in pcb_lib_menu_new() */
+	for (d = l.subdirs; d != NULL; d = nextd) {
+		l.children += fp_fs_load_dir_(l.menu, d->subdir, d->parent, 0);
+		nextd = d->next;
+		free(d->subdir);
+		free(d->parent);
+		free(d);
+	}
+	if ((l.children == 0) && (l.menu->data.dir.children.used == 0))
+		pcb_fp_rmdir(l.menu);
+	free(working);
+	return l.children;
+}
+
+
+static int fp_fs_load_dir(pcb_plug_fp_t *ctx, const char *path, int force)
+{
+	int res;
+
+	res = fp_fs_load_dir_(&pcb_library, ".", path, 1);
+	if (res >= 0) {
+		pcb_fplibrary_t *l = pcb_fp_lib_search(&pcb_library, path);
+		if ((l != NULL) && (l->type == LIB_DIR))
+			l->data.dir.backend = ctx;
+	}
+	return res;
+}
+
+typedef struct {
+	const char *target;
+	int target_len;
+	int parametric;
+	char *path;
+	char *real_name;
+} fp_search_t;
+
+static int fp_search_cb(void *cookie, const char *subdir, const char *name, pcb_fptype_t type, void *tags[])
+{
+	fp_search_t *ctx = (fp_search_t *) cookie;
+	if ((strncmp(ctx->target, name, ctx->target_len) == 0) && ((! !ctx->parametric) == (type == PCB_FP_PARAMETRIC))) {
+		const char *suffix = name + ctx->target_len;
+		/* ugly heuristics: footprint names may end in .fp or .ele or .subc.lht or .lht */
+		if ((*suffix == '\0') || (pcb_strcasecmp(suffix, ".fp") == 0) || (pcb_strcasecmp(suffix, ".ele") == 0) || (pcb_strcasecmp(suffix, ".subc.lht") == 0) || (pcb_strcasecmp(suffix, ".lht") == 0)) {
+			ctx->path = pcb_strdup(subdir);
+			ctx->real_name = pcb_strdup(name);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+/* walk the search_path for finding the first footprint for basename (shall not contain "(") */
+static char *fp_fs_search(const char *search_path, const char *basename, int parametric)
+{
+	const char *p, *end;
+	char path[PCB_PATH_MAX + 1];
+	fp_search_t ctx;
+
+	if ((*basename == '/') || (*basename == PCB_DIR_SEPARATOR_C))
+		return pcb_strdup(basename);
+
+	ctx.target = basename;
+	ctx.target_len = strlen(ctx.target);
+	ctx.parametric = parametric;
+	ctx.path = NULL;
+
+/*	fprintf("Looking for %s\n", ctx.target);*/
+
+	for (p = search_path; *p != '\0'; p = end + 1) {
+		char *fpath;
+		end = strchr(p, ':');
+		if (end == NULL)
+			end = p + strlen(p);
+		memcpy(path, p, end - p);
+		path[end - p] = '\0';
+
+		pcb_path_resolve(path, &fpath, 0);
+/*		fprintf(stderr, " in '%s'\n", fpath);*/
+
+		fp_fs_list(&pcb_library, fpath, 1, fp_search_cb, &ctx, 1, 0);
+		if (ctx.path != NULL) {
+			sprintf(path, "%s%c%s", ctx.path, PCB_DIR_SEPARATOR_C, ctx.real_name);
+			free(ctx.path);
+			free(ctx.real_name);
+/*			fprintf("  found '%s'\n", path);*/
+			free(fpath);
+			return pcb_strdup(path);
+		}
+		free(fpath);
+		if (end == NULL)
+			break;
+	}
+	return NULL;
+}
+
+#warning subc TODO: should be handled in io_*
+/* Decide about the type of a footprint file:
+   - it is a file element if the first non-comment is "Element(" or "Element["
+   - else it is a parametric element (footprint generator) if it contains
+     "@@" "purpose"
+   - else it's not an element.
+   - if a line of a file element starts with ## and doesn't contain @, it's a tag
+   - if tags is not NULL, it's a pointer to a void *tags[] - an array of tag IDs
+*/
+static pcb_fptype_t pcb_fp_file_type(const char *fn, void ***tags)
+{
+	int c, comment_len;
+	int first_element = 1;
+	FILE *f;
+	enum {
+		ST_WS,
+		ST_COMMENT,
+		ST_ELEMENT,
+		ST_TAG
+	} state = ST_WS;
+	char *tag = NULL;
+	int talloced = 0, tused = 0;
+	int Talloced = 0, Tused = 0;
+	pcb_fptype_t ret = PCB_FP_INVALID;
+
+#warning fp TODO: rather call plug_io if it is not parametric
+	if (tags != NULL)
+		*tags = NULL;
+
+	f = pcb_fopen(fn, "r");
+	if (f == NULL)
+		return PCB_FP_INVALID;
+
+	while ((c = fgetc(f)) != EOF) {
+		switch (state) {
+		case ST_ELEMENT:
+			if (isspace(c))
+				break;
+			if ((c == '(') || (c == '[')) {
+				ret = PCB_FP_FILE;
+				goto out;
+			}
+		case ST_WS:
+			if (isspace(c))
+				break;
+			if (c == '#') {
+				comment_len = 0;
+				state = ST_COMMENT;
+				break;
+			}
+#warning fp TODO: rather call plug_io if it is not parametric
+			else if ((first_element) && (c == 'l')) {
+				char s[23];
+				/* li:pcb-rnd-subcircuit */
+				fgets(s, 21, f);
+				s[20] = '\0';
+				if (strcmp(s, "i:pcb-rnd-subcircuit") == 0) {
+					ret = PCB_FP_FILE;
+					goto out;
+				}
+			}
+			else if ((first_element) && (c == 'E')) {
+				char s[8];
+				/* Element */
+				fgets(s, 7, f);
+				s[6] = '\0';
+				if (strcmp(s, "lement") == 0) {
+					state = ST_ELEMENT;
+					break;
+				}
+			}
+			else if ((first_element) && (c == '(')) {
+				char s[8];
+				/* module */
+				fgets(s, 7, f);
+				s[6] = '\0';
+				if (strcmp(s, "module") == 0) {
+					state = ST_ELEMENT;
+					break;
+				}
+			}
+			first_element = 0;
+			/* fall-thru for detecting @ */
+		case ST_COMMENT:
+			comment_len++;
+			if ((c == '#') && (comment_len == 1)) {
+				state = ST_TAG;
+				break;
+			}
+			if ((c == '\r') || (c == '\n'))
+				state = ST_WS;
+			if (c == '@') {
+				char s[10];
+			maybe_purpose:;
+				/* "@@" "purpose" */
+				fgets(s, 9, f);
+				s[8] = '\0';
+				if (strcmp(s, "@purpose") == 0) {
+					ret = PCB_FP_PARAMETRIC;
+					goto out;
+				}
+			}
+			break;
+		case ST_TAG:
+			if ((c == '\r') || (c == '\n')) {	/* end of a tag */
+				if ((tags != NULL) && (tag != NULL)) {
+					tag[tused] = '\0';
+					if (Tused >= Talloced) {
+						Talloced += 8;
+						*tags = realloc(*tags, (Talloced + 1) * sizeof(void *));
+					}
+					(*tags)[Tused] = (void *) pcb_fp_tag(tag, 1);
+					Tused++;
+					(*tags)[Tused] = NULL;
+				}
+
+				tused = 0;
+				state = ST_WS;
+				break;
+			}
+			if (c == '@')
+				goto maybe_purpose;
+			if (tused >= talloced) {
+				talloced += 64;
+				tag = realloc(tag, talloced + 1);	/* always make room for an extra \0 */
+			}
+			tag[tused] = c;
+			tused++;
+		}
+	}
+
+out:;
+	if (tag != NULL)
+		free(tag);
+	fclose(f);
+	return ret;
+}
+
+#define F_IS_PARAMETRIC 0
+#define F_TMPNAME 1
+static FILE *fp_fs_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
+{
+	char *basename, *params, *fullname;
+	FILE *fp, *f = NULL;
+	const char *libshell;
+
+	pcb_conf_cmd_is_safe(rc.library_shell, &libshell, 1);
+
+	fctx->field[F_TMPNAME].p = NULL;
+	fctx->field[F_IS_PARAMETRIC].i = pcb_fp_dupname(name, &basename, &params);
+	if (basename == NULL)
+		return NULL;
+
+	fctx->backend = ctx;
+
+	fullname = fp_fs_search(path, basename, fctx->field[F_IS_PARAMETRIC].i);
+/*	fprintf(stderr, "basename=%s fullname=%s\n", basename, fullname);*/
+/*	printf("pcb_fp_fopen: %d '%s' '%s' fullname='%s'\n", fctx->field[F_IS_PARAMETRIC].i, basename, params, fullname);*/
+
+
+	if (fullname != NULL) {
+/*fprintf(stderr, "fullname=%s param=%d\n",  fullname, fctx->field[F_IS_PARAMETRIC].i);*/
+		if (fctx->field[F_IS_PARAMETRIC].i) {
+			char *cmd;
+			const char *sep = " ";
+			if (libshell == NULL) {
+				libshell = "";
+				sep = "";
+			}
+			cmd = malloc(strlen(libshell) + strlen(fullname) + strlen(params) + 16);
+			sprintf(cmd, "%s%s%s %s", libshell, sep, fullname, params);
+/*fprintf(stderr, " cmd=%s\n",  cmd);*/
+			fctx->field[F_TMPNAME].p = pcb_tempfile_name_new("pcb-rnd-pfp");
+			f = pcb_fopen((char *)fctx->field[F_TMPNAME].p, "w+");
+			if (f != NULL) {
+				char buff[4096];
+				int len;
+				fp = pcb_popen(cmd, "r");
+				while((len = fread(buff, 1, sizeof(buff), fp)) > 0)
+					fwrite(buff, 1, len, f);
+				pcb_pclose(fp);
+				rewind(f);
+			}
+			free(cmd);
+		}
+		else
+			f = pcb_fopen(fullname, "r");
+		free(fullname);
+	}
+
+	free(basename);
+	return f;
+}
+
+static void fp_fs_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
+{
+	fclose(f);
+	if (fctx->field[F_TMPNAME].p != NULL)
+		pcb_tempfile_unlink((char *)fctx->field[F_TMPNAME].p);
+}
+
+
+static pcb_plug_fp_t fp_fs;
+
+int pplg_check_ver_fp_fs(int ver_needed) { return 0; }
+
+void pplg_uninit_fp_fs(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
+}
+
+int pplg_init_fp_fs(void)
+{
+	PCB_API_CHK_VER;
+	fp_fs.plugin_data = NULL;
+	fp_fs.load_dir = fp_fs_load_dir;
+	fp_fs.fp_fopen = fp_fs_fopen;
+	fp_fs.fp_fclose = fp_fs_fclose;
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/fp_fs/fp_fs.pup
===================================================================
--- tags/2.0.1/src_plugins/fp_fs/fp_fs.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_fs/fp_fs.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class fp
+$short filesystem footprints
+$long Footprint: file system based implementation. Used to be called Newlib: load footprints from directories. Run external processes for the parametric footprints.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/fp_wget/Makefile
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/Makefile	(revision 18980)
@@ -0,0 +1,12 @@
+all:
+	cd ../../src && $(MAKE) mod_fp_wget
+
+CFLAGS = -Wall -g -I../../src -I../.. -I../../src_3rd -I../../src_3rd/liblihata
+
+test: tester
+
+tester: tester.o gedasymbols.o wget_common.o ../../src_3rd/genvector/gds_char.o
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/fp_wget/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,28 @@
+put /local/pcb/mod {fp_wget}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/fp_wget/fp_wget.o
+	$(PLUGDIR)/fp_wget/wget_common.o
+	$(PLUGDIR)/fp_wget/gedasymbols.o
+	$(PLUGDIR)/fp_wget/edakrill.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/fp_wget/fp_wget_conf.h}
+
+switch /local/pcb/fp_wget/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
+switch /local/pcb/fp_wget/controls
+	case {disable}   end;
+	default
+		append /local/pcb/DEPDEPS { ../src_plugins/fp_wget/conf_internal.c }
+		append /local/pcb/DISTCLEANFILES { ../src_plugins/fp_wget/conf_internal.c }
+		append /local/pcb/rules/install_ {\n	$(SCCBOX) $(HOW) "../src_plugins/fp_wget/fp_wget.conf" "$(DATADIR)/fp_wget.conf"}
+
+		append /local/pcb/RULES [@
+../src_plugins/fp_wget/conf_internal.c: ../src_plugins/fp_wget/fp_wget.conf $(CQUOTE)
+	$(CQUOTE) -n fp_wget_conf_internal < ../src_plugins/fp_wget/fp_wget.conf > ../src_plugins/fp_wget/conf_internal.c
+@]
+	end
+end
Index: tags/2.0.1/src_plugins/fp_wget/edakrill.c
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/edakrill.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/edakrill.c	(revision 18980)
@@ -0,0 +1,306 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <genvector/gds_char.h>
+#include <genht/htsp.h>
+#include <genht/hash.h>
+#include "error.h"
+#include "wget_common.h"
+#include "edakrill.h"
+#include "plugins.h"
+#include "plug_footprint.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "fp_wget_conf.h"
+#include "globalconst.h"
+
+#define REQUIRE_PATH_PREFIX "wget@edakrill"
+
+#define ROOT_URL "http://www.repo.hu/projects/edakrill/"
+#define FP_URL ROOT_URL "user/"
+
+static const char *url_idx_md5 = ROOT_URL "tags.idx.md5";
+static const char *url_idx_list = ROOT_URL "tags.idx";
+
+struct {
+	char *name;
+	char *fname;
+	int fp;
+	long date;
+	void **tags;
+	int tags_used, tags_alloced;
+} krill;
+
+static void tag_add_(const char *kv)
+{
+	if (krill.tags_used >= krill.tags_alloced) {
+		krill.tags_alloced += 16;
+		krill.tags = realloc(krill.tags, sizeof(void *) * krill.tags_alloced);
+	}
+	krill.tags[krill.tags_used] = (void *)(kv == NULL ? NULL : pcb_fp_tag(kv, 1));
+	krill.tags_used++;
+}
+
+static void tag_add(const char *key, const char *val)
+{
+	char *next, *tmp;
+	for(; val != NULL; val = next) {
+		next = strchr(val, ',');
+		if (next != NULL) {
+			*next = '\0';
+			next++;
+		}
+		while(*val == ' ') val++;
+		if (*val == '\0')
+			break;
+		tmp = pcb_strdup_printf("%s:%s", key, val);
+		tag_add_(tmp);
+		free(tmp);
+	}
+}
+
+static void krill_flush(pcb_plug_fp_t *ctx, gds_t *vpath, int base_len)
+{
+	if ((krill.fp) && (krill.fname != NULL)) {
+		char *end, *fn;
+		pcb_fplibrary_t *l;
+
+/*		printf("Krill %s: %s [%ld]\n", krill.name, krill.fname, krill.date);*/
+
+		/* split path and fn; path stays in vpath.array, fn is a ptr to the file name */
+		gds_truncate(vpath, base_len);
+		gds_append_str(vpath, krill.fname);
+		end = vpath->array + vpath->used - 1;
+		while((end > vpath->array) && (*end != '/')) { end--; vpath->used--; }
+		*end = '\0';
+		vpath->used--;
+		end++;
+		fn = end;
+
+		/* add to the database */
+		l = pcb_fp_mkdir_p(vpath->array);
+		if (krill.tags != NULL)
+			tag_add_(NULL);
+		l = pcb_fp_append_entry(l, fn, PCB_FP_FILE, krill.tags);
+		fn[-1] = '/';
+		l->data.fp.loc_info = pcb_strdup(vpath->array);
+		
+		krill.tags = NULL;
+		krill.tags_used = 0;
+	}
+
+	krill.tags_used = 0;
+
+	free(krill.name);
+	free(krill.fname);
+	free(krill.tags);
+	krill.name = NULL;
+	krill.fname = NULL;
+	krill.fp = 0;
+	krill.date = 0;
+	krill.tags = NULL;
+	krill.tags_alloced = 0;
+}
+
+int fp_edakrill_load_dir(pcb_plug_fp_t *ctx, const char *path, int force)
+{
+	FILE *f;
+	int fctx;
+	char *md5_last, *md5_new;
+	char line[1024];
+	fp_get_mode mode;
+	gds_t vpath;
+	int vpath_base_len;
+	fp_get_mode wmode = FP_WGET_OFFLINE;
+	pcb_fplibrary_t *l;
+	char last_sum_fn[PCB_PATH_MAX];
+
+	if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0)
+		return -1;
+
+	pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" PCB_DIR_SEPARATOR_S "edakrill.last", conf_fp_wget.plugins.fp_wget.cache_dir);
+
+	gds_init(&vpath);
+	gds_append_str(&vpath, REQUIRE_PATH_PREFIX);
+
+	l = pcb_fp_mkdir_p(vpath.array);
+	if (l != NULL)
+		l->data.dir.backend = ctx;
+
+	if (force || (conf_fp_wget.plugins.fp_wget.auto_update_edakrill))
+		wmode &= ~FP_WGET_OFFLINE;
+
+	if (fp_wget_open(url_idx_md5, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &fctx, wmode) != 0) {
+		if (wmode & FP_WGET_OFFLINE) /* accept that we don't have the index in offline mode */
+			goto quit;
+		goto err;
+	}
+
+	md5_new = load_md5_sum(f);
+	fp_wget_close(&f, &fctx);
+
+	if (md5_new == NULL)
+		goto err;
+
+	f = pcb_fopen(last_sum_fn, "r");
+	md5_last = load_md5_sum(f);
+	if (f != NULL)
+		fclose(f);
+
+/*	printf("old='%s' new='%s'\n", md5_last, md5_new);*/
+
+	if (!md5_cmp_free(last_sum_fn, md5_last, md5_new)) {
+/*		printf("no chg.\n");*/
+		mode = FP_WGET_OFFLINE; /* use the cache */
+	}
+	else
+		mode = 0;
+
+	if (fp_wget_open(url_idx_list, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &fctx, mode) != 0) {
+		pcb_message(PCB_MSG_ERROR, "edakrill: failed to download the new list\n");
+		pcb_remove(last_sum_fn); /* make sure it is downloaded next time */
+		goto err;
+	}
+
+	gds_append(&vpath, '/');
+	vpath_base_len = vpath.used;
+
+	while(fgets(line, sizeof(line), f) != NULL) {
+		char *end;
+		if ((*line == '#') || (line[1] != ' '))
+			continue;
+
+		end = line + strlen(line) - 1;
+		*end = '\0';
+		if (*line == 'f') {
+			krill_flush(ctx, &vpath, vpath_base_len);
+			krill.name = pcb_strdup(line+2);
+		}
+		if (strncmp(line, "t type=", 7) == 0) {
+			if (strcmp(line+7, "footprint") == 0)
+				krill.fp = 1;
+		}
+		if (*line == 't') {
+			char *val, *key = line+2;
+			val = strchr(key, '=');
+			if (val != NULL) {
+				*val = '\0';
+				val++;
+				if ((strcmp(key, "auto/file") != 0) && (strcmp(key, "type") != 0)) {
+					tag_add(key, val);
+				}
+			}
+		}
+		if (*line == 'm') {
+			end = strstr(line, ".cnv.fp ");
+			if (end != NULL) {
+				end += 7;
+				*end = '\0';
+				end++;
+				krill.fname = pcb_strdup(line+2);
+				krill.date = strtol(end, NULL, 10);
+			}
+		}
+
+	}
+	krill_flush(ctx, &vpath, vpath_base_len);
+	fp_wget_close(&f, &fctx);
+
+	quit:;
+	gds_uninit(&vpath);
+	return 0;
+
+	err:;
+	gds_uninit(&vpath);
+	return -1;
+}
+
+#define FIELD_WGET_CTX 0
+
+FILE *fp_edakrill_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
+{
+	gds_t s;
+	char tmp[1024];
+	FILE *f;
+	int from_path = (path != NULL) && (strcmp(path, REQUIRE_PATH_PREFIX) == 0);
+
+	if (!from_path) {
+		if (strncmp(name, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) == 0)
+			name+=strlen(REQUIRE_PATH_PREFIX);
+		else
+			return NULL;
+	}
+
+	if (*name == '/')
+		name++;
+
+	if (from_path) {
+		if (fp_wget_search(tmp, sizeof(tmp), name, !conf_fp_wget.plugins.fp_wget.auto_update_edakrill, url_idx_list, conf_fp_wget.plugins.fp_wget.cache_dir) != 0)
+			goto bad;
+		name = tmp;
+	}
+
+	gds_init(&s);
+	gds_append_str(&s, FP_URL);
+	gds_append_str(&s, name);
+
+	fp_wget_open(s.array, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &(fctx->field[FIELD_WGET_CTX].i), FP_WGET_UPDATE);
+
+	gds_uninit(&s);
+
+	bad:;
+	fctx->backend = ctx;
+
+	return f;
+}
+
+void fp_edakrill_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
+{
+	fp_wget_close(&f, &(fctx->field[FIELD_WGET_CTX].i));
+}
+
+
+static pcb_plug_fp_t fp_edakrill;
+
+void fp_edakrill_uninit(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_edakrill);
+}
+
+void fp_edakrill_init(void)
+{
+	fp_edakrill.plugin_data = NULL;
+	fp_edakrill.load_dir = fp_edakrill_load_dir;
+	fp_edakrill.fp_fopen = fp_edakrill_fopen;
+	fp_edakrill.fp_fclose = fp_edakrill_fclose;
+
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_edakrill);
+}
Index: tags/2.0.1/src_plugins/fp_wget/edakrill.h
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/edakrill.h	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/edakrill.h	(revision 18980)
@@ -0,0 +1,8 @@
+#include "plug_footprint.h"
+#include "fp_wget_conf.h"
+int fp_edakrill_load_dir(pcb_plug_fp_t *ctx, const char *path, int force);
+FILE *fp_edakrill_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+void fp_edakrill_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
+void fp_edakrill_init(void);
+void fp_edakrill_uninit(void);
+
Index: tags/2.0.1/src_plugins/fp_wget/fp_wget.c
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/fp_wget.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/fp_wget.c	(revision 18980)
@@ -0,0 +1,36 @@
+#include "config.h"
+#include "gedasymbols.h"
+#include "edakrill.h"
+#include "plugins.h"
+#include "fp_wget_conf.h"
+#include "../src_plugins/fp_wget/conf_internal.c"
+
+
+conf_fp_wget_t conf_fp_wget;
+
+#define FP_WGET_CONF_FN "fp_wget.conf"
+
+int pplg_check_ver_fp_wget(int ver_needed) { return 0; }
+
+void pplg_uninit_fp_wget(void)
+{
+	conf_unreg_file(FP_WGET_CONF_FN, fp_wget_conf_internal);
+	fp_gedasymbols_uninit();
+	fp_edakrill_uninit();
+	conf_unreg_fields("plugins/fp_wget/");
+}
+
+int pplg_init_fp_wget(void)
+{
+	PCB_API_CHK_VER;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags);
+#include "fp_wget_conf_fields.h"
+
+	conf_reg_file(FP_WGET_CONF_FN, fp_wget_conf_internal);
+
+	fp_gedasymbols_init();
+	fp_edakrill_init();
+	return 0;
+}
Index: tags/2.0.1/src_plugins/fp_wget/fp_wget.conf
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/fp_wget.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/fp_wget.conf	(revision 18980)
@@ -0,0 +1,9 @@
+li:pcb-rnd-conf-v1 {
+	ha:overwrite {
+		ha:plugins {
+			ha:fp_wget {
+				cache_dir=fp_wget_cache
+			}
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/fp_wget/fp_wget.pup
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/fp_wget.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/fp_wget.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class fp
+$short web footprints
+$long Footprint: get static (file) footprints from the web, e.g. from http://gedasymbols.org
+$state works
+$package cloud
+default buildin
+dep fp_fs
+autoload 1
Index: tags/2.0.1/src_plugins/fp_wget/fp_wget_conf.h
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/fp_wget_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/fp_wget_conf.h	(revision 18980)
@@ -0,0 +1,18 @@
+#ifndef PCB_FP_WGET_CONF_H
+#define PCB_FP_WGET_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct fp_wget {
+			CFT_BOOLEAN auto_update_gedasymbols;       /* update the index of gedasymbols on startup automatically */
+			CFT_BOOLEAN auto_update_edakrill;          /* update the index of edakrill on startup automatically */
+			CFT_STRING cache_dir;                      /* where to build the cache */
+		} fp_wget;
+	} plugins;
+} conf_fp_wget_t;
+
+extern conf_fp_wget_t conf_fp_wget;
+
+#endif
Index: tags/2.0.1/src_plugins/fp_wget/gedasymbols.c
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/gedasymbols.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/gedasymbols.c	(revision 18980)
@@ -0,0 +1,215 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <genvector/gds_char.h>
+#include <genht/htsp.h>
+#include <genht/hash.h>
+#include "error.h"
+#include "wget_common.h"
+#include "gedasymbols.h"
+#include "plugins.h"
+#include "plug_footprint.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "fp_wget_conf.h"
+#include "globalconst.h"
+
+#define REQUIRE_PATH_PREFIX "wget@gedasymbols"
+
+#define CGI_URL "http://www.gedasymbols.org/scripts/global_list.cgi"
+#define FP_URL "http://www.gedasymbols.org/"
+#define FP_DL "?dl"
+static const char *url_idx_md5 = CGI_URL "?md5";
+static const char *url_idx_list = CGI_URL;
+
+
+int fp_gedasymbols_load_dir(pcb_plug_fp_t *ctx, const char *path, int force)
+{
+	FILE *f;
+	int fctx;
+	char *md5_last, *md5_new;
+	char line[1024];
+	fp_get_mode mode;
+	gds_t vpath;
+	int vpath_base_len;
+	fp_get_mode wmode = FP_WGET_OFFLINE;
+	pcb_fplibrary_t *l;
+	char last_sum_fn[PCB_PATH_MAX];
+
+	if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0)
+		return -1;
+
+	pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" PCB_DIR_SEPARATOR_S "gedasymbols.last", conf_fp_wget.plugins.fp_wget.cache_dir);
+
+	gds_init(&vpath);
+	gds_append_str(&vpath, REQUIRE_PATH_PREFIX);
+
+	l = pcb_fp_mkdir_p(vpath.array);
+	if (l != NULL)
+		l->data.dir.backend = ctx;
+
+	if (force || (conf_fp_wget.plugins.fp_wget.auto_update_gedasymbols))
+		wmode &= ~FP_WGET_OFFLINE;
+
+	if (fp_wget_open(url_idx_md5, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &fctx, wmode) != 0) {
+		if (wmode & FP_WGET_OFFLINE) /* accept that we don't have the index in offline mode */
+			goto quit;
+		goto err;
+	}
+
+	md5_new = load_md5_sum(f);
+	fp_wget_close(&f, &fctx);
+
+	if (md5_new == NULL)
+		goto err;
+
+	f = pcb_fopen(last_sum_fn, "r");
+	md5_last = load_md5_sum(f);
+	if (f != NULL)
+		fclose(f);
+
+/*	printf("old='%s' new='%s'\n", md5_last, md5_new);*/
+
+	if (!md5_cmp_free(last_sum_fn, md5_last, md5_new)) {
+/*		printf("no chg.\n");*/
+		mode = FP_WGET_OFFLINE; /* use the cache */
+	}
+	else
+		mode = 0;
+
+	if (fp_wget_open(url_idx_list, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &fctx, mode) != 0) {
+		pcb_message(PCB_MSG_ERROR, "gedasymbols: failed to download the new list\n");
+		pcb_remove(last_sum_fn); /* make sure it is downloaded next time */
+		goto err;
+	}
+
+	gds_append(&vpath, '/');
+	vpath_base_len = vpath.used;
+
+	while(fgets(line, sizeof(line), f) != NULL) {
+		char *end, *fn;
+
+		if (*line == '#')
+			continue;
+		end = strchr(line, '|');
+		if (end == NULL)
+			continue;
+		*end = '\0';
+
+		/* split path and fn; path stays in vpath.array, fn is a ptr to the file name */
+		gds_truncate(&vpath, vpath_base_len);
+		gds_append_str(&vpath, line);
+		end = vpath.array + vpath.used - 1;
+		while((end > vpath.array) && (*end != '/')) { end--; vpath.used--; }
+		*end = '\0';
+		vpath.used--;
+		end++;
+		fn = end;
+
+		/* add to the database */
+		l = pcb_fp_mkdir_p(vpath.array);
+		l = pcb_fp_append_entry(l, fn, PCB_FP_FILE, NULL);
+		fn[-1] = '/';
+		l->data.fp.loc_info = pcb_strdup(vpath.array);
+	}
+	fp_wget_close(&f, &fctx);
+
+	quit:;
+	gds_uninit(&vpath);
+	return 0;
+
+	err:;
+	gds_uninit(&vpath);
+	return -1;
+}
+
+#define FIELD_WGET_CTX 0
+
+FILE *fp_gedasymbols_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
+{
+	gds_t s;
+	char tmp[1024];
+	FILE *f = NULL;
+	int from_path = (path != NULL) && (strcmp(path, REQUIRE_PATH_PREFIX) == 0);
+
+	if (!from_path) {
+		if (strncmp(name, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) == 0)
+			name+=strlen(REQUIRE_PATH_PREFIX);
+		else
+			return NULL;
+	}
+
+	if (*name == '/')
+		name++;
+
+	if (from_path) {
+		if (fp_wget_search(tmp, sizeof(tmp), name, !conf_fp_wget.plugins.fp_wget.auto_update_gedasymbols, url_idx_list, conf_fp_wget.plugins.fp_wget.cache_dir) != 0)
+			goto bad;
+		name = tmp;
+	}
+
+	gds_init(&s);
+	gds_append_str(&s, FP_URL);
+	gds_append_str(&s, name);
+	gds_append_str(&s, FP_DL);
+
+	fp_wget_open(s.array, conf_fp_wget.plugins.fp_wget.cache_dir, &f, &(fctx->field[FIELD_WGET_CTX].i), FP_WGET_UPDATE);
+
+	gds_uninit(&s);
+
+	bad:;
+	fctx->backend = ctx;
+
+	return f;
+}
+
+void fp_gedasymbols_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
+{
+	fp_wget_close(&f, &(fctx->field[FIELD_WGET_CTX].i));
+}
+
+
+static pcb_plug_fp_t fp_gedasymbols;
+
+void fp_gedasymbols_uninit(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_gedasymbols);
+}
+
+void fp_gedasymbols_init(void)
+{
+	fp_gedasymbols.plugin_data = NULL;
+	fp_gedasymbols.load_dir = fp_gedasymbols_load_dir;
+	fp_gedasymbols.fp_fopen = fp_gedasymbols_fopen;
+	fp_gedasymbols.fp_fclose = fp_gedasymbols_fclose;
+
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_gedasymbols);
+}
Index: tags/2.0.1/src_plugins/fp_wget/gedasymbols.h
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/gedasymbols.h	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/gedasymbols.h	(revision 18980)
@@ -0,0 +1,8 @@
+#include "plug_footprint.h"
+#include "fp_wget_conf.h"
+int fp_gedasymbols_load_dir(pcb_plug_fp_t *ctx, const char *path, int force);
+FILE *fp_gedasymbols_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+void fp_gedasymbols_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
+void fp_gedasymbols_init(void);
+void fp_gedasymbols_uninit(void);
+
Index: tags/2.0.1/src_plugins/fp_wget/tester.c
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/tester.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/tester.c	(revision 18980)
@@ -0,0 +1,39 @@
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "gedasymbols.h"
+
+#undef strdup
+char *pcb_strdup(const char *s) { return strdup(s); }
+
+pcb_plug_fp_t *pcb_plug_fp_chain = NULL;
+
+pcb_library_t ltmp;
+pcb_library_t *pcb_fp_mkdir_p(const char *path)
+{
+	printf("lib mkdir: '%s'\n", path);
+	return (library_t *)&ltmp;
+}
+
+pcb_library_t *pcb_fp_append_entry(library_t *parent, const char *name, pcb_fp_type_t type, void *tags[])
+{
+	printf("lib entry: '%s'\n", name);
+	return (library_t *)&ltmp;
+}
+
+int main()
+{
+	pcb_fp_fopen_ctx_t fctx;
+	FILE *f;
+	char line[1024];
+
+/*	fp_gedasymbols_load_dir(NULL, "gedasymbols://", 1); */
+	f = fp_gedasymbols_fopen(NULL, NULL, "wget@gedasymbols/user/sean_depagnier/footprints/HDMI_CONN.fp", &fctx);
+
+	while(fgets(line, sizeof(line), f) != NULL)
+		printf("|%s", line);
+
+	fp_gedasymbols_fclose(NULL, f, &fctx);
+
+}
+
Index: tags/2.0.1/src_plugins/fp_wget/wget_common.c
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/wget_common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/wget_common.c	(revision 18980)
@@ -0,0 +1,229 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "config.h"
+#include "wget_common.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+enum {
+	FCTX_INVALID = 0,
+	FCTX_POPEN,
+	FCTX_FOPEN,
+	FCTX_NOP
+};
+
+const char *wget_cmd = "wget -U 'pcb-rnd-fp_wget'";
+int fp_wget_offline = 0;
+
+static int mkdirp(const char *dir)
+{
+/* TODO */
+	char buff[8192];
+	sprintf(buff, "mkdir -p '%s'", dir);
+	return pcb_system(buff);
+}
+
+int fp_wget_open(const char *url, const char *cache_path, FILE **f, int *fctx, fp_get_mode mode)
+{
+	char *cmd;
+	const char *upds;
+	int wl = strlen(wget_cmd), ul = strlen(url), cl = strlen(cache_path);
+	cmd = malloc(wl+ul*2+cl+32);
+
+	*fctx = FCTX_INVALID;
+
+	if (mode & FP_WGET_UPDATE)
+		upds = "-c";
+	else
+		upds = "";
+
+	if (cache_path == NULL) {
+		sprintf(cmd, "%s -O - %s '%s'", wget_cmd, upds, url);
+		if (f == NULL)
+			goto error;
+		if (!fp_wget_offline)
+			*f = pcb_popen(cmd, "r");
+		if (*f == NULL)
+			goto error;
+		*fctx = FCTX_POPEN;
+	}
+	else {
+		char *cdir;
+		cdir = strstr(url, "://");
+		if (cdir == NULL)
+			goto error;
+		cdir += 3;
+
+		{
+			char *end;
+			sprintf(cmd, "%s/%s", cache_path, cdir);
+			end = strrchr(cmd, '/');
+			if (end != NULL) {
+				*end = '\0';
+				if (mkdirp(cmd) != 0)
+					goto error;
+				*end = '/';
+			}
+		}
+
+		if ((!fp_wget_offline) && !(mode & FP_WGET_OFFLINE)) {
+			int res;
+			sprintf(cmd, "%s -O '%s/%s' %s '%s'", wget_cmd, cache_path, cdir, upds, url);
+			res = pcb_system(cmd);
+/*			pcb_trace("------res=%d\n", res); */
+			if ((res != 0) && (res != 768)) { /* some versions of wget will return error on -c if the file doesn't need update; try to guess whether it's really an error */
+				/* when wget fails, a 0-long file might be left there - remove it so it won't block new downloads */
+				sprintf(cmd, "%s/%s", cache_path, cdir);
+				pcb_remove(cmd);
+			}
+		}
+		if (f != NULL) {
+			sprintf(cmd, "%s/%s", cache_path, cdir);
+			*f = pcb_fopen(cmd, "r");
+			if (*f == NULL)
+				goto error;
+			*fctx = FCTX_FOPEN;
+		}
+		else
+			*fctx = FCTX_NOP;
+	}
+	free(cmd);
+	return 0;
+
+	error:;
+	free(cmd);
+	return -1;
+}
+
+int fp_wget_close(FILE **f, int *fctx)
+{
+	if (*fctx == FCTX_NOP)
+		return 0;
+
+	if (*f == NULL)
+		return -1;
+
+	switch(*fctx) {
+		case FCTX_POPEN: pcb_pclose(*f); *f = NULL; return 0;
+		case FCTX_FOPEN: fclose(*f); *f = NULL; return 0;
+	}
+
+	return -1;
+}
+
+
+char *load_md5_sum(FILE *f)
+{
+	char *s, sum[64];
+
+	if (f == NULL)
+		return NULL;
+
+	*sum = '\0';
+	fgets(sum, sizeof(sum), f);
+	sum[sizeof(sum)-1] = '\0';
+
+	for(s = sum;; s++) {
+		if ((*s == '\0') || (isspace(*s))) {
+			if ((s - sum) == 32) {
+				*s = '\0';
+				return pcb_strdup(sum);
+			}
+			else
+				return NULL;
+		}
+		if (isdigit(*s))
+			continue;
+		if ((*s >= 'a') && (*s <= 'f'))
+			continue;
+		if ((*s >= 'A') && (*s <= 'F'))
+			continue;
+		return NULL;
+	}
+}
+
+int md5_cmp_free(const char *last_fn, char *md5_last, char *md5_new)
+{
+	int changed = 0;
+
+	if ((md5_last == NULL) || (strcmp(md5_last, md5_new) != 0)) {
+		FILE *f;
+		f = pcb_fopen(last_fn, "w");
+		fputs(md5_new, f);
+		fclose(f);
+		changed = 1;
+	}
+	if (md5_last != NULL)
+		free(md5_last);
+	free(md5_new);
+	return changed;
+}
+
+int fp_wget_search_(char *out, int out_len, FILE *f, const char *fn)
+{
+	char *line, line_[8192];
+
+	*out = '\0';
+
+	if (f == NULL)
+		return -1;
+
+	while((line = fgets(line_, sizeof(line_), f)) != NULL) {
+		char *sep;
+		sep = strchr(line, '|');
+		if (sep == NULL)
+			continue;
+		*sep = '\0';
+		if ((strstr(line, fn) != NULL) && (strlen(line) < out_len)) {
+			strcpy(out, line);
+			return 0;
+		}
+	}
+	return -1;
+}
+
+
+int fp_wget_search(char *out, int out_len, char *name, int offline, const char *url, const char *cache)
+{
+	FILE *f_idx;
+	int fctx;
+	fp_get_mode mode = offline ? FP_WGET_OFFLINE : 0;
+
+	if (fp_wget_open(url, cache, &f_idx, &fctx, mode) == 0) {
+		if (fp_wget_search_(out, out_len, f_idx, name) != 0) {
+			fp_wget_close(&f_idx, &fctx);
+			return -1;
+		}
+	}
+	else
+		return -1;
+	fp_wget_close(&f_idx, &fctx);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/fp_wget/wget_common.h
===================================================================
--- tags/2.0.1/src_plugins/fp_wget/wget_common.h	(nonexistent)
+++ tags/2.0.1/src_plugins/fp_wget/wget_common.h	(revision 18980)
@@ -0,0 +1,21 @@
+#include <stdio.h>
+
+typedef enum {
+	FP_WGET_UPDATE = 1,  /* wget -c: update existing file, don't replace (a.k.a. cache) */
+	FP_WGET_OFFLINE = 2  /* do not wget, open cached file or fail */
+} fp_get_mode;
+
+int fp_wget_open(const char *url, const char *cache_path, FILE **f, int *fctx, fp_get_mode mode);
+int fp_wget_close(FILE **f, int *fctx);
+
+char *load_md5_sum(FILE *f);
+int md5_cmp_free(const char *last_fn, char *md5_last, char *md5_new);
+
+/* search fn in an auto updated index file; return 0 on success and
+   fill in out with the full path from the index. */
+int fp_wget_search(char *out, int out_len, char *fn, int offline, const char *idx_url, const char *idx_cache);
+
+/* search fn in an index file; return 0 on success and fill in out with the
+   full path from the index. */
+int fp_wget_search_(char *out, int out_len, FILE *f_idx, const char *fn);
+
Index: tags/2.0.1/src_plugins/gpmi/Makefile
===================================================================
--- tags/2.0.1/src_plugins/gpmi/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_pcb_gpmi
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/gpmi/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/gpmi/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,104 @@
+append /local/pcb/pcb_gpmi/enable {}
+append /local/pcb/pcb_gpmi/buildin {}
+
+switch /local/pcb/gpmi/controls
+case {disable}
+	put /local/pcb/TOPVARS     {}
+	put /local/pcb/CLEANRULES  {}
+	end
+default
+
+
+append /local/pcb/RULES [@
+### gpmi_plugin
+clean_gpmi: FORCE
+	cd $(PCB_GPMI) && make clean
+
+$(PLUGIDIR)/pcb-rnd-gpmi: $(PCB_GPMI)/gpmi_plugin/gpmi_plugin.o FORCE
+	$(MKDIR) $(PLUGIDIR)
+	$(MKDIR) $(PLUGIDIR)/pcb-rnd-gpmi
+	$(CP) $(PLUGDIR)/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/*.so $(PLUGIDIR)/pcb-rnd-gpmi
+
+# HACK: the gpmi plugin, for historical reasons, have an own build system,
+# need to go there to properly build it with prefixes.
+$(PCB_GPMI)/gpmi_plugin/gpmi_plugin.o:
+	cd $(PCB_GPMI)/gpmi_plugin && make
+@]
+
+
+append /local/pcb/all   [@ $(PLUGIDIR)/pcb-rnd-gpmi @]
+
+append /local/pcb/CLEANRULES  {clean_gpmi}
+
+append /local/pcb/TOPVARS [@
+PCB_GPMI=$(PLUGDIR)/gpmi/pcb-gpmi
+@]
+
+append /local/pcb/rules/install     {	cd $(PCB_GPMI) && make install} {
+}
+append /local/pcb/rules/linstall    {	cd $(PCB_GPMI) && make linstall} {
+}
+append /local/pcb/rules/uninstall   {	cd $(PCB_GPMI) && make uninstall} {
+}
+end
+end
+
+
+switch /local/pcb/gpmi/controls
+	case {buildin}
+		append /local/pcb/buildin_pups [@gpmi=gpmi/gpmi.pup@] {\n}
+		append /local/pcb/RULES [@
+
+mod_pcb_gpmi: all
+
+@]
+
+		append /local/pcb/LIBS_PRE    {$(PCB_GPMI)/gpmi_plugin/gpmi_buildin.a}
+		append /local/pcb/EXEDEPS     {$(PCB_GPMI)/gpmi_plugin/gpmi_buildin.a}
+		append /local/pcb/LIBS      /target/libs/script/gpmi/ldflags
+
+		append /local/pcb/buildin_init_extern    [@extern pcb_uninit_t hid_gpmi_init();@] {\n}
+
+
+		append /local/pcb/buildin_init_code    [@
+	uninit_func = hid_gpmi_init();
+	pcb_plugin_register("gpmi", "<gpmi>", NULL, 0, uninit_func);
+@]  {\n}
+
+
+#		append /local/pcb/CFLAGS   /target/libs/script/gpmi/cflags
+#		append /local/pcb/LDFLAGS  /target/libs/script/gpmi/ldflags
+#		append /local/pcb/LIBS     /target/libs/script/gpmi/libs
+
+		append /local/pcb/RULES [@
+
+$(PCB_GPMI)/gpmi_plugin/gpmi_buildin.a: FORCE
+	cd $(PCB_GPMI)/gpmi_plugin && make all_buildin
+
+@]
+
+		end
+	case {plugin}
+		append /local/pcb/all   [@ $(PLUGIDIR)/gpmi_plugin.so @]
+		append /local/pcb/RULES [@
+
+mod_pcb_gpmi: $(PLUGIDIR)/gpmi_plugin.so
+
+$(PLUGIDIR)/gpmi_plugin.so: $(PCB_GPMI)/gpmi_plugin/gpmi_plugin.so
+	$(MKDIR) $(PLUGIDIR)
+	$(CP) $(PCB_GPMI)/gpmi_plugin/gpmi_plugin.so $(PLUGIDIR)/gpmi_plugin.so
+
+@]
+
+		append /local/pcb/CLEANFILES [@ $(PLUGIDIR)/gpmi_plugin.so @]
+
+		append /local/pcb/RULES [@
+
+$(PCB_GPMI)/gpmi_plugin/gpmi_plugin.so: FORCE
+	cd $(PCB_GPMI)/gpmi_plugin && make all_plugin
+
+@]
+		end
+	case {disable}
+		end
+end
Index: tags/2.0.1/src_plugins/gpmi/gpmi.pup
===================================================================
--- tags/2.0.1/src_plugins/gpmi/gpmi.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/gpmi.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class feature
+$short GPMI scripting
+$long Scriptable plugin system with about 10 scripting languages supported and dynamic load/unload of scripts that can manipulate the GUI, the board, can implement exporters, etc.
+$state works
+$ldefault: if gpmi is installed
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile	(revision 18980)
@@ -0,0 +1,28 @@
+PCB_GPMI_ROOT=.
+
+all:
+	cd gpmi_plugin; $(MAKE) all
+
+include ../../../Makefile.conf
+PLUGIN_DIR=$(LIBDIR)/plugins
+
+clean:
+	cd gpmi_plugin; $(MAKE) clean
+
+test: all
+	cd host_lib; ./test.sh
+
+
+# TODO: temporary code until gpmi-config is fixed to generate install rules
+install:
+	-mkdir -p $(PLUGIN_DIR)/pcb-rnd-gpmi/
+	if test -f gpmi_plugin/gpmi_plugin.so; then cp gpmi_plugin/gpmi_plugin.so $(PLUGIN_DIR)/gpmi_plugin.so; fi
+	cp `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so` $(PLUGIN_DIR)/pcb-rnd-gpmi/
+
+linstall:
+	-mkdir -p $(PLUGIN_DIR)/pcb-rnd-gpmi/
+	-if test -f gpmi_plugin/gpmi_plugin.so; then ln -sf "`pwd`/gpmi_plugin/gpmi_plugin.so" "$(PLUGIN_DIR)/gpmi_plugin.so"; fi
+	-for n in `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so`; do ln -sf "`pwd`/$$n"  "$(PLUGIN_DIR)/pcb-rnd-gpmi/`basename $$n`"; done
+
+uninstall:
+	rm -rf $(PLUGIN_DIR)/pcb-rnd-gpmi
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile.config.in
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile.config.in	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/Makefile.config.in	(revision 18980)
@@ -0,0 +1,16 @@
+print [@
+### Generated by scconfig, do not edit ###
+
+###TODO1###
+PCB_SRC=$(PCB_GPMI_ROOT)/../../..
+
+PCB_CFLAGS= \
+ @/local/global_cflags@ \
+ @/target/libs/sul/glib/cflags@ \
+ @/target/libs/script/gpmi/cflags@ \
+ -I$(PCB_SRC)/src_3rd \
+ -I$(PCB_SRC)/src_3rd/liblihata
+
+PCB_LDFLAGS= @/target/libs/script/gpmi/ldflags@
+
+@]
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile	(revision 18980)
@@ -0,0 +1,37 @@
+PCB_GPMI_ROOT=..
+include Makefile.gpmi
+include $(PCB_GPMI_ROOT)/Makefile.config
+
+CFLAGS += -Wall -g -I$(PCB_SRC) $(PCB_CFLAGS)
+
+COMMON_OBJS = scripts.o manage_scripts.o
+BUILDIN_OBJS = gpmi_buildin.o $(COMMON_OBJS)
+PLUGIN_OBJS = gpmi_plugin.o $(COMMON_OBJS)
+
+all: gpmi_plugin.so gpmi_buildin.a
+	cd gpmi_pkg; make
+
+all_plugin: gpmi_plugin.so
+	cd gpmi_pkg; make
+
+all_buildin: gpmi_buildin.a
+	cd gpmi_pkg; make
+
+gpmi_buildin.a: $(BUILDIN_OBJS)
+	ar rvu gpmi_buildin.a $(BUILDIN_OBJS)
+
+gpmi_plugin.so: $(PLUGIN_OBJS)
+	$(CC) $(LDFLAGS) -shared -rdynamic  -o gpmi_plugin.so $(PLUGIN_OBJS) $(PCB_LDFLAGS)
+
+gpmi_plugin.o: gpmi_plugin.c scripts.h
+
+gpmi_buildin.o: gpmi_plugin.c scripts.h
+	$(CC) -DPLUGIN_INIT_NAME=hid_gpmi_init $(CFLAGS) -c gpmi_plugin.c -o gpmi_buildin.o
+
+scripts.o: scripts.c
+
+manage_scripts.o: manage_scripts.c
+
+clean:
+	rm gpmi_plugin.o gpmi_plugin.so gpmi_buildin.a gpmi_buildin.o $(COMMON_OBJS) 2>/dev/null ; true
+	cd gpmi_pkg; $(MAKE) clean
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.am
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.am	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.am	(revision 18980)
@@ -0,0 +1,15 @@
+# This file is package-specific. Do include it in the distribution.
+#
+# GPMI fingerprint: Makefile.am.ext-pkg
+
+# End INST_PATH with /
+INST_PATH = pcb-gpmi/
+FILE_NAME = actions
+
+SOURCE  = actions.c
+HEADER  = actions.h
+
+PKG_LDFLAGS = 
+
+include ../../../Makefile.config
+INCLUDES = -I $(PCB_SRC)
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.dep
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/Makefile.dep	(revision 18980)
@@ -0,0 +1 @@
+#Please run make depend!
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c	(revision 18980)
@@ -0,0 +1,134 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/hid.h"
+#include "src/error.h"
+#include "actions.h"
+#include "src/actions.h"
+#include "src/compat_misc.h"
+#include "src/crosshair.h"
+#include "../../gpmi_plugin.h"
+
+typedef struct acontext_s  acontext_t;
+
+struct acontext_s {
+	pcb_action_t action;
+	char *name;
+	gpmi_module *module;
+	acontext_t *next;
+};
+
+static int action_argc = 0;
+static const char **action_argv = NULL;
+
+const char *action_arg(int argn)
+{
+	if ((argn < 0) || (argn >= action_argc))
+		return NULL;
+	return action_argv[argn];
+}
+
+/*** temporary hack for smooth upgrade to fungw based actions ***/
+PCB_INLINE int pcb_old_act_begin_conv(int oargc, fgw_arg_t *oargv, char **argv)
+{
+	int n;
+	for(n = 0; n < PCB_ACTION_MAX_ARGS; n++)
+		argv[n] = NULL;
+	for(n = 1; n < oargc; n++) {
+		if (fgw_arg_conv(&pcb_fgw, &oargv[n], FGW_STR) == 0)
+			argv[n-1] = oargv[n].val.str;
+		else
+			argv[n-1] = "";
+	}
+	argv[n] = NULL;
+	return oargc - 1;
+}
+
+#define PCB_OLD_ACT_BEGIN \
+ores->type = FGW_INT; \
+ores->val.nat_int = 0; \
+{ \
+	char *argv__[PCB_ACTION_MAX_ARGS]; \
+	const char **argv = (const char **)argv__; \
+	int argc = pcb_old_act_begin_conv(oargc, oargv, argv__)
+
+#define PCB_OLD_ACT_END \
+	(void)argc; \
+	(void)argv; \
+}
+
+static fgw_error_t pcb_act_action_cb(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv)
+{
+	PCB_OLD_ACT_BEGIN;
+	acontext_t *ctx = (acontext_t *)pcb_current_action;
+	int action_argc_old;
+	const char **action_argv_old;
+
+	/* save argc/argv for action_arg() */
+	action_argc_old = action_argc;
+	action_argv_old = action_argv;
+	action_argc = argc;
+	action_argv = argv;
+
+	/* call event */
+	gpmi_event(ctx->module, ACTE_action, ctx->name, argc, pcb_crosshair.ptr_x, pcb_crosshair.ptr_y);
+
+	/* restore argc/argv of action_arg() */
+	action_argc = action_argc_old;
+	action_argv = action_argv_old;
+
+	return 0;
+	PCB_OLD_ACT_END;
+}
+
+static void cleanup_action(gpmi_module *mod, gpmi_cleanup *cl)
+{
+	acontext_t *ctx = cl->argv[0].p;
+	pcb_remove_actions(&ctx->action, 1);
+	free((char *)ctx->action.name);
+	free((char *)ctx->action.description);
+	free((char *)ctx->action.syntax);
+	free(ctx);
+}
+
+int action_register(const char *name, const char *need_xy, const char *description, const char *syntax)
+{
+	acontext_t *ctx;
+
+	ctx = malloc(sizeof(acontext_t));
+	ctx->action.name           = pcb_strdup(name);
+	ctx->action.description    = pcb_strdup(description);
+	ctx->action.syntax         = pcb_strdup(syntax);
+	ctx->action.trigger_cb     = pcb_act_action_cb;
+	ctx->name                  = pcb_strdup(name);
+	ctx->module                = gpmi_get_current_module();
+	ctx->next                  = NULL;
+
+	pcb_register_action(&ctx->action, gpmi_cookie);
+
+	gpmi_mod_cleanup_insert(ctx->module, cleanup_action, "p", ctx);
+
+	pcb_trace("action %d registered.\n", name);
+	return 0;
+}
+
+int action(const char *cmdline)
+{
+	return pcb_parse_command(cmdline, pcb_true);
+}
+
+void create_menu(const char *path, const char *action, const char *mnemonic, const char *hotkey, const char *tooltip)
+{
+	pcb_menu_prop_t mp;
+
+	memset(&mp, 0, sizeof(mp));
+	mp.action = action;
+	mp.mnemonic = mnemonic;
+	mp.accel = hotkey;
+	mp.tip = tooltip;
+	mp.cookie = "TODO#2";
+
+	pcb_gui->create_menu(path, &mp);
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.h	(revision 18980)
@@ -0,0 +1,56 @@
+#include <gpmi.h>
+#include "src/pcb-printf.h"
+
+#undef snprintf
+#define snprintf pcb_snprintf
+
+/* Generated when an action registered by the script is executed.
+   Arguments:
+    name: name of the action (as registed using function action_register())
+    argc: number of arguments. Arguments can be accessed using function action_arg
+    x, y: optional coords, if need_xy was not empty at action_register */
+gpmi_define_event(ACTE_action)(const char *name, int argc, int x, int y);
+
+/* Generated right after gui initialization, before the gui main loop.
+   Arguments:
+    argc: number of arguments the gui was initialized with.
+    argv[]: arguments the gui was initialized with - unaccessible for the scripts. */
+gpmi_define_event(ACTE_gui_init)(int argc, char **argv);
+
+
+/* Generated right before unloading a script to give the script a chance
+   to clean up.
+   Arguments:
+    conffile: the name of the config file that originally triggered laoding the script, or empty if the script was loaded from the gui. */
+gpmi_define_event(ACTE_unload)(const char *conffile);
+
+/* Register an action in PCB - when the action is executed, event
+   ACTE_action is generated with the action name.
+   Multiple actions can be registered. Any action registered by the script
+   will trigger an ACTE_event sent to the script.
+   Arguments:
+    name: name of the action
+    need_xy: the question the user is asked when he needs to choose a coordinate; if empty, no coordinate is asked
+    description: description of the action (for the help)
+    syntax: syntax of the action (for the help)
+   Returns 0 on success.
+ */
+int action_register(const char *name, const char *need_xy, const char *description, const char *syntax);
+
+/* extract the (argn)th event argument for the current action (makes sense only in an ACTE_action event handler */
+const char *action_arg(int argn);
+
+/* call an existing action using PCB syntax (e.g. foo(1, 2, 3))
+   Returns non-zero on error; generally returns value of the action
+   (which is also non-zero on error). */
+int action(const char *cmdline);
+
+/* Create a new menu or submenu at path. Missing parents are created
+   automatically with empty action, mnemonic, hotkey and tooltip.
+   Arguments:
+    path: the full path of the new menu
+    action: this action is executed when the user clicks on the menu
+    mnemonic: which letter to underline in the menu text (will be the fast-jump-there key once the menu is open)
+    hotkey: when this key is pressed in the main gui, the action is also triggered; the format is modifiers&lt;Key&gt;letter, where modifiers is Alt, Shift or Ctrl. This is the same syntax that is used in the .res files.
+    tooltip: short help text */
+void create_menu(const char *path, const char *action, const char *mnemonic, const char *hotkey, const char *tooltip);
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi/package.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi/package.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi/package.c	(revision 18980)
@@ -0,0 +1,19 @@
+#include <gpmi.h>
+
+int PKG_FUNC(init)()
+{
+	return 0;
+}
+
+void PKG_FUNC(uninit)() {
+}
+
+void PKG_FUNC(register)() {
+}
+
+int PKG_FUNC(checkver)(int requested) {
+	if (requested <= 1)
+		return 0;
+
+	return -1;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi.conf
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/gpmi.conf	(revision 18980)
@@ -0,0 +1,18 @@
+@/local/headers
+	actions.h
+
+@/local/srcs
+	actions.c
+
+@/local/file_name
+	actions
+
+@/local/inst_path
+	actions
+
+@/local/CFLAGS
+	-I.. -I$(PCB_SRC) $(PCB_CFLAGS)  -D###/target/sys/class###
+
+@@/local/hook/postall
+	PCB_GPMI_ROOT=../../..
+	include $(PCB_GPMI_ROOT)/Makefile.config
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.am
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.am	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.am	(revision 18980)
@@ -0,0 +1,17 @@
+# This file is package-specific. Do include it in the distribution.
+#
+# GPMI fingerprint: Makefile.am.ext-pkg
+
+# End INST_PATH with /
+INST_PATH = pcb-gpmi/
+FILE_NAME = coordgeo
+
+SOURCE  = coordgeo.c
+HEADER  = coordgeo.h
+
+PKG_LDFLAGS = -lm
+
+include ../../../Makefile.config
+INCLUDES = -I $(PCB_SRC)
+
+test: test.o coordgeo.o
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.dep
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/Makefile.dep	(revision 18980)
@@ -0,0 +1 @@
+#Please run make depend!
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.c	(revision 18980)
@@ -0,0 +1,580 @@
+#include <stdlib.h>
+#include <math.h>
+#include "coordgeo.h"
+#include "src/compat_misc.h"
+
+cg_obj_t *cg_objs = NULL;
+int cg_objs_used = 0, cg_objs_alloced = 0;
+
+#define DEGMPY 10000.0
+#define PI 3.141592654
+
+#define OBJ(i) cg_objs[i]
+#define OBJ_VALID(i) ((i >= 0) && (i < cg_objs_used))
+
+/* todo */
+#define invalid -0xFFFF
+
+static int oalloc()
+{
+	int id;
+	if (cg_objs_used >= cg_objs_alloced) {
+		cg_objs_alloced = cg_objs_used + 128;
+		cg_objs = realloc(cg_objs, sizeof(cg_obj_t) * cg_objs_alloced);
+	}
+	id = cg_objs_used;
+	cg_objs_used++;
+	return id;
+}
+
+static void ofree(int id)
+{
+	/* todo */
+}
+
+int cg_new_object(cg_obj_type_t type, int x1, int y1, int x2, int y2, int r)
+{
+	int id;
+
+	id = oalloc();
+	OBJ(id).type = type;
+	OBJ(id).x1 = x1;
+	OBJ(id).y1 = y1;
+	OBJ(id).x2 = x2;
+	OBJ(id).y2 = y2;
+	OBJ(id).r = r;
+	return id;
+}
+
+static inline int cg_clone_object_(cg_obj_t *o)
+{
+	int id;
+
+	id = oalloc();
+	OBJ(id) = *o;
+	return id;
+}
+
+int cg_clone_object(int objID)
+{
+	return cg_clone_object_(&OBJ(objID));
+}
+
+/* destroys an object by ID */
+void cg_destroy_object(int ID)
+{
+	ofree(ID);
+}
+
+/* -- field accessors -- */
+cg_obj_type_t cg_get_type(int objID)
+{
+	return OBJ(objID).type;
+}
+
+int cg_get_coord(int objID, cg_coord_t coordname)
+{
+	switch(coordname) {
+		case CG_X1: return OBJ(objID).x1;
+		case CG_Y1: return OBJ(objID).y1;
+		case CG_X2: return OBJ(objID).x2;
+		case CG_Y2: return OBJ(objID).y2;
+		case CG_R:  return OBJ(objID).r;
+	}
+	return invalid;
+}
+
+void cg_set_coord(int objID, cg_coord_t coordname, int newvalue)
+{
+	switch(coordname) {
+		case CG_X1: OBJ(objID).x1 = newvalue;
+		case CG_Y1: OBJ(objID).y1 = newvalue;
+		case CG_X2: OBJ(objID).x2 = newvalue;
+		case CG_Y2: OBJ(objID).y2 = newvalue;
+		case CG_R:  OBJ(objID).r  = newvalue;
+	}
+}
+
+
+/* -- object operations -- */
+double cg_dist_(int x1, int y1, int x2, int y2)
+{
+	int dx, dy;
+
+	dx = x2 - x1;
+	dy = y2 - y1;
+	return sqrt(dx * dx + dy * dy);
+}
+
+int cg_solve_quad(double a, double b, double c, double *x1, double *x2)
+{
+	double d;
+
+	d = b * b - 4 * a * c;
+	if (d < 0)
+		return 0;
+	if (d != 0)
+		d = sqrt(d);
+
+	if (x1 != NULL)
+		*x1 = (-b + d) / (2 * a);
+
+	if (x2 != NULL)
+		*x2 = (-b - d) / (2 * a);
+
+	if (d == 0)
+		return 1;
+	return 2;
+}
+
+
+/* return ID to a new object which is parallel obj in distance dist
+   - for a line dist > 0 means a new line right to the original
+     (looking from x1;y1 towards x2;y2)
+   - for arc the same rule applies, looking from angle x2 towards y2
+   - for circle dist > 0 means smaller concentric circle
+   - for point and vector always returns invalid
+*/
+int cg_para_obj(int objID, int dist)
+{
+	cg_obj_t v1, v2;
+	int rid;
+
+	switch(OBJ(objID).type) {
+		case CG_POINT:
+		case CG_VECTOR:
+			return -1;
+		case CG_ARC:
+			/* TODO */
+			abort();
+			break;
+		case CG_CIRCLE:
+			rid = cg_clone_object(objID);
+			OBJ(rid).r -= dist;
+			return rid;
+		case CG_LINE:
+			cg_perp_line_(&OBJ(objID), &v1, OBJ(objID).x1, OBJ(objID).y1, dist);
+			cg_perp_line_(&OBJ(objID), &v2, OBJ(objID).x2, OBJ(objID).y2, dist);
+			rid = oalloc();
+			OBJ(rid).type = CG_LINE;
+			OBJ(rid).x1 = v1.x2;
+			OBJ(rid).y1 = v1.y2;
+			OBJ(rid).x2 = v2.x2;
+			OBJ(rid).y2 = v2.y2;
+			OBJ(rid).r  = 0;
+			return rid;
+	}
+	return -1;
+}
+
+void cg_perp_line_(const cg_obj_t *i, cg_obj_t *o, int xp, int yp, int len)
+{
+	double dx, dy, dl;
+
+	dx = -(i->y2 - i->y1);
+	dy = +(i->x2 - i->x1);
+	dl = sqrt(dx * dx + dy * dy);
+	dx = dx / dl;
+	dy = dy / dl;
+
+	o->type = CG_LINE;
+	o->x1 = xp;
+	o->y1 = yp;
+	o->x2 = pcb_round((double)xp + dx * (double)len);
+	o->y2 = pcb_round((double)yp + dy * (double)len);
+	o->r  = 0;
+}
+
+
+/* return ID to a new line which is perpendicular to line1 and starts at
+   point xp;yp and is len long */
+int cg_perp_line(int line1ID, int xp, int yp, int len)
+{
+	int id;
+
+	id = oalloc();
+	cg_perp_line_(&OBJ(line1ID), &OBJ(id), xp, yp, len);
+
+	return id;
+}
+
+int cg_ison_line_(cg_obj_t *l, int x, int y, int extend)
+{
+	int vx, vy;
+
+	vx = l->x2 - l->x1;
+	vy = l->y2 - l->y1;
+
+	/* is the point on the extended line? */
+	if ((vy * x - vx * y) != (vy * l->x1 - vy * l->y1))
+		return 0;
+
+	if ((!extend) && ((x < l->x1) || (x > l->x2)))
+		return 0;
+	return 1;
+}
+
+int cg_ison_arc_(cg_obj_t *a, int x, int y, int extend)
+{
+	double deg;
+
+	/* is the point on the circle? */
+	if (cg_dist_(a->x1, a->y1, x, y) != a->r)
+		return 0;
+
+	/* for circles (or an extended arc, which is just a circle) this means the point must be on */
+	if (extend || (a->type == CG_CIRCLE))
+		return 1;
+
+	/* check if the point is between start and end angles */
+	deg = atan2(y - a->y1, x - a->x1) * DEGMPY;
+	if ((deg >= a->x2) && (deg >= a->y2))
+		return 1;
+
+	return 0;
+}
+
+int cg_ison_point_(cg_obj_t *p, int x, int y)
+{
+	return (p->x1 == x) && (p->y1 == y);
+}
+
+int cg_ison_(cg_obj_t *o, int x, int y, int extend)
+{
+	switch(o->type) {
+		case CG_POINT:  return cg_ison_point_(o, x, y);
+		case CG_VECTOR: return 1;
+		case CG_LINE:   return cg_ison_line_(o, x, y, extend);
+		case CG_ARC:    return cg_ison_arc_(o, x, y, extend);
+		case CG_CIRCLE: return cg_ison_circle_(o, x, y);
+	}
+
+	/* can't get here */
+	abort();
+	return 0;
+}
+
+/* intersection of 2 lines (always returns 1) */
+int cg_intersect_ll(cg_obj_t *l1, cg_obj_t *l2, cg_obj_t *o)
+{
+	double ua, ub, xi, yi, X1, Y1, X2, Y2, X3, Y3, X4, Y4, tmp;
+
+	/* maths from http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/ */
+
+	X1 = l1->x1;
+	X2 = l1->x2;
+	X3 = l2->x1;
+	X4 = l2->x2;
+	Y1 = l1->y1;
+	Y2 = l1->y2;
+	Y3 = l2->y1;
+	Y4 = l2->y2;
+
+	tmp = ((Y4-Y3)*(X2-X1) - (X4-X3)*(Y2-Y1));
+	ua=((X4-X3)*(Y1-Y3) - (Y4-Y3)*(X1-X3)) / tmp;
+	ub=((X2-X1)*(Y1-Y3) - (Y2-Y1)*(X1-X3)) / tmp;
+	xi = X1 + ua * (X2 - X1);
+	yi = Y1 + ua * (Y2 - Y1);
+
+	o->type = CG_LINE;
+	o->x1 = o->x2 = pcb_round(xi);
+	o->y1 = o->y2 = pcb_round(yi);
+	o->r = 0;
+	return 1;
+}
+
+/* intersections of a line and a circle (returns number of possible intersections) */
+int cg_intersect_lc(cg_obj_t *l, cg_obj_t *c, cg_obj_t *o)
+{
+	int x1, y1, vx, vy, a, vx2, ints;
+	double A, B, C, X1, X2, Y1, Y2;
+
+	/* first we transform the line to the coordinate system with origo in the
+	   center of the circle - this will simplify the equations */
+	x1 = l->x1 - c->x1;
+	y1 = l->y1 - c->y1;
+	vx = l->x2 - l->x1;
+	vy = l->y2 - l->y1;
+
+	/* some cache */
+	a = vy * x1 - vx * y1;
+	vx2 = vx * vx;
+
+	/* this quadratic equation results in the two intersections, X1 and X2 */
+	A = 1+vy*vy/vx2;
+	B = - 2*a*vy / (vx2);
+	C = a*a / vx2 - c->r * c->r;
+
+	ints = cg_solve_quad(A, B, C, &X1, &X2);
+	if (ints == 0)
+		return 0;
+
+	/* knowing X1 and X2 we can easily get Y1 and Y2 */
+	Y1 = (a - vy * X1) / (-vx);
+	Y2 = (a - vy * X2) / (-vx);
+
+	/* transoform back to the original coordinate system */
+	X1 += c->x1;
+	X2 += c->x1;
+	Y1 += c->y1;
+	Y2 += c->y1;
+
+	/* set up return line and return number of intersections */
+	o->type = CG_LINE;
+	o->x1 = X1;
+	o->y1 = Y1;
+	o->x2 = X2;
+	o->y2 = Y2;
+	o->r  = 0;
+	return ints;
+}
+
+/* intersections of 2 circles (returns number of possible intersections) */
+int cg_intersect_cc(cg_obj_t *c1, cg_obj_t *c2, cg_obj_t *o)
+{
+	double d, a, h;
+	int P2x, P2y;
+
+	d = cg_dist_(c1->x1, c1->y1, c2->x1, c2->y1);
+
+	if (d > c1->r + c2->r)
+		return 0; /* separate */
+	if (d < abs(c1->r - c2->r))
+		return 0; /* contained */
+	if ((d == 0) && (c1->r == c2->r))
+		return -1; /* they are the same circle */
+
+	/* some temps */
+	a = (double)(c1->r * c1->r - c2->r * c2->r + d * d) / (2.0 * d);
+	h = sqrt(c1->r * c1->r - a * a);
+	P2x = c1->x1 + a * (c2->x1 - c1->x1) / d;
+	P2y = c1->y1 + a * (c2->y1 - c1->y1) / d;
+
+	/* final coordinates */
+	o->type = CG_LINE;
+	o->x1 = P2x + h * (c2->y1 - c1->y1) / d;
+	o->y1 = P2y - h * (c2->x1 - c1->x1) / d;
+	o->x2 = P2x - h * (c2->y1 - c1->y1) / d;
+	o->y2 = P2y + h * (c2->x1 - c1->x1) / d;
+
+	if (d == c1->r + c2->r)
+		return 1;
+	return 2;
+}
+
+
+int cg_intersect_(cg_obj_t *i1, cg_obj_t *i2, cg_obj_t *o)
+{
+	switch(i1->type) {
+		case CG_VECTOR:
+			/* invalid */
+			return -1;
+		case CG_POINT:
+			/* TODO: ison */
+			break;
+		case CG_LINE:
+			switch(i2->type) {
+				case CG_VECTOR:
+					/* invalid */
+					return -1;
+				case CG_POINT:
+					/* TODO: ison */
+					break;
+				case CG_LINE:
+					return cg_intersect_ll(i1, i2, o);
+				case CG_CIRCLE:
+				case CG_ARC:
+					return cg_intersect_lc(i1, i2, o);
+			}
+			return -1;
+		case CG_CIRCLE:
+		case CG_ARC:
+			switch(i2->type) {
+				case CG_VECTOR:
+					/* invalid */
+					return -1;
+				case CG_POINT:
+					/* TODO: ison */
+					break;
+				case CG_LINE:
+					return cg_intersect_lc(i2, i1, o);
+				case CG_CIRCLE:
+				case CG_ARC:
+					return cg_intersect_cc(i1, i2, o);
+			}
+			return -1;
+	}
+	return -1;
+}
+
+int cg_intersect(int obj1ID, int obj2ID, int extend)
+{
+	cg_obj_t res;
+	int ints;
+
+	ints = cg_intersect_(&OBJ(obj1ID), &OBJ(obj2ID), &res);
+
+	/* if we needed to extend, we shouldn't care if the intersections
+	   are on the objects. */
+	if (extend)
+		return cg_clone_object_(&res);
+
+
+	while(1) {
+		if (ints == 0)
+			return -1;
+
+		if ((!cg_ison_(&OBJ(obj1ID), res.x1, res.y1, 0)) || (!cg_ison_(&OBJ(obj2ID), res.x1, res.y1, 0))) {
+			/* x1;y1 is not on the objects. make x2;y2 the new x1;y1 and test again */
+			res.x1 = res.x2;
+			res.y1 = res.y2;
+			ints--;
+		}
+		else
+			break;
+	}
+
+	/* x1;y1 is on the objects; check x2;y2 if we still have 2 intersections */
+	if ((ints == 2) && ((!cg_ison_(&OBJ(obj1ID), res.x2, res.y2, 0)) || (!cg_ison_(&OBJ(obj2ID), res.x2, res.y2, 0)))) {
+		/* x2;y2 not on the objects, kill it */
+		res.x2 = res.x1;
+		res.y2 = res.y1;
+		ints = 1;
+	}
+
+	return cg_clone_object_(&res);
+}
+
+/* Truncate an object at x;y. Point x;y must be on the object. Optionally
+   invert which part is kept. Default:
+    - line: keep the part that originates from x1;y1
+    - arc: keep the segment that is closer to the starting angle (x2)
+    - circle: always fails
+    - point: always fails
+    - vector: always fails
+   Returns 0 on success.
+*/
+int cg_truncate_(cg_obj_t *o, int x, int y, int invert_kept)
+{
+	double a;
+
+	/* point is not on the object */
+	if (!cg_ison_(o, x, y, 0))
+		return 1;
+
+	switch(o->type) {
+		case CG_VECTOR:
+		case CG_POINT:
+		case CG_CIRCLE:
+			return 2;
+		case CG_LINE:
+			if (!invert_kept) {
+				o->x2 = x;
+				o->y2 = y;
+			}
+			else {
+				o->x1 = x;
+				o->y1 = y;
+			}
+			break;
+		case CG_ARC:
+			a = atan2(y - o->y1, x - o->x1) * DEGMPY;
+			if (!invert_kept)
+				o->y2 = a;
+			else
+				o->x2 = a;
+			break;
+	}
+	return 0;
+}
+
+int cg_truncate(int objID, int x, int y, int invert_kept)
+{
+	return cg_truncate_(&OBJ(objID), x, y, invert_kept);
+}
+
+/* cut target object with cutting edge object; optionally invert which
+   part is kept of target. Default:
+    - when line cuts, looking from x1;y1 towards x2;y2, right is kept
+    - when circle or arc cuts, we are "walking" clock-wise, right is kept
+      (in short, inner part is kept)
+   Returns 0 on success.
+*/
+int cg_cut_(cg_obj_t *t, cg_obj_t *c, int invert_kept)
+{
+	cg_obj_t intersects;
+	int num_intersects, ni;
+
+	num_intersects = cg_intersect_(t, c, &intersects);
+	if (num_intersects < 1)
+		return 1;
+
+	for(; num_intersects > 0; num_intersects--)
+	{
+		switch(c->type)  {
+			case CG_POINT:
+			case CG_VECTOR:
+				return 1;
+			case CG_LINE:
+				/* TODO: leftof */
+				return 1;
+			case CG_CIRCLE:
+			case CG_ARC:
+				/* TODO: leftof */
+				break;
+		}
+		/* shift intersection */
+		intersects.x1 = intersects.x2;
+		intersects.y1 = intersects.y2;
+	}
+	return 0;
+}
+
+int cg_cut(int targetID, int cutting_edgeID, int invert_kept);
+
+cg_obj_t *cg_get_object(int ID)
+{
+	if (OBJ_VALID(ID))
+		return &OBJ(ID);
+	else
+		return NULL;
+}
+
+int cg_simplify_object_(cg_obj_t *o)
+{
+	int ret = 0; /* no direct returns because CG_ARC can have more than one optimization */
+	switch(o->type) {
+		case CG_LINE:
+			if ((o->x1 == o->x2) && (o->y1 == o->y2)) {
+				o->type = CG_POINT;
+				ret++;
+				break;
+			}
+			break;
+		case CG_ARC:
+			if ((fabs(o->x2 - o->y2) * DEGMPY) >= 2*PI) {
+				o->type = CG_CIRCLE;
+				ret++;
+			}
+			/* intended fall trough for r==0 check */
+		case CG_CIRCLE:
+			if (o->r == 0) {
+				o->type = CG_POINT;
+				ret++;
+				break;
+			}
+			break;
+		default:
+			/* no simplification possible */
+			;
+	}
+	return ret;
+}
+
+
+int cg_simplify_object(int ID)
+{
+	if (OBJ_VALID(ID))
+		return cg_simplify_object_(&OBJ(ID));
+	return -1;
+}
\ No newline at end of file
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/coordgeo.h	(revision 18980)
@@ -0,0 +1,127 @@
+#include <gpmi.h>
+#include "src/pcb-printf.h"
+
+#undef snprintf
+#define snprintf pcb_snprintf
+
+typedef enum cg_obj_type_e {
+	CG_POINT,   /* x1;y1 */
+	CG_LINE,    /* from x1;y1 to x2;y2 */
+	CG_VECTOR,  /* x1;y1 (not associated with a point) */
+	CG_CIRCLE,  /* center x1;y1, radius r */
+	CG_ARC      /* center x1;y1, radius r, from x2 rad to y2 rad */
+} cg_obj_type_t;
+
+typedef enum cg_coord_e {
+	CG_X1,
+	CG_Y1,
+	CG_X2,
+	CG_Y2,
+	CG_R
+} cg_coord_t;
+
+
+/* -- object administration -- */
+/* returns ID to the new object */
+int cg_new_object(cg_obj_type_t type, int x1, int y1, int x2, int y2, int r);
+
+/* cloned an existing object and returns ID to the new object */
+int cg_clone_object(int objID);
+
+/* destroys an object by ID */
+void cg_destroy_object(int ID);
+
+/* -- field accessors -- */
+cg_obj_type_t cg_get_type(int objID);
+int cg_get_coord(int objID, cg_coord_t coordname);
+void cg_set_coord(int objID, cg_coord_t coordname, int newvalue);
+
+
+/* -- object operations -- */
+/* return ID to a new object which is parallel obj in distance dist
+   - for a line dist > 0 means a new line right to the original
+     (looking from x1;y1 towards x2;y2)
+   - for arc the same rule applies, looking from angle x2 towards y2
+   - for circle dist > 0 means smaller concentric circle
+   - for point and vector always returns invalid
+*/
+int cg_para_obj(int objID, int dist);
+
+/* return ID to a new line which is perpendicular to line1 and starts at
+   point xp;yp and is len long */
+int cg_perp_line(int line1ID, int xp, int yp, int len);
+
+/* returns ID to a line which marks the intersection(s) of two objects or
+   returns -1 if there's no intersection. If there's only one intersection,
+   the start and end point of the line is the same point. With the current
+   primitives, there can not be more than 2 intersections between 2 objects,
+   except when they have infinite amount of intersections:
+    - overlapping lines
+    - overlapping arcs
+    - two circles with the same radius and center
+   If extend is non-zero, the objects are extended during the calculation.
+   For lines this means infinite length, for arcs this means handling them as
+   circles.
+*/
+int cg_intersect(int obj1ID, int obj2ID, int extend);
+
+/* Truncate an object at x;y. Point x;y must be on the object. Optionally
+   invert which part is kept. Default:
+    - line: keep the part that originates from x1;y1
+    - arc: keep the segment that is closer to the starting angle (x2)
+    - circle: always fails
+    - point: always fails
+    - vector: always fails
+   Returns 0 on success.
+*/
+int cg_truncate(int objID, int x, int y, int invert_kept);
+
+/* cut target object with cutting edge object; optionally invert which
+   part is kept of target. Defaults:
+    - when line cuts, looking from x1;y1 towards x2;y2, right is kept
+    - when circle or arc cuts, we are "walking" clock-wise, right is kept
+      (in short, inner part is kept)
+    - vector and point fails
+   Returns 0 on success.
+*/
+int cg_cut(int targetID, int cutting_edgeID, int invert_kept);
+
+/* Convert object to simpler form, if possible:
+    - if x1;y1 and x2;y2 are equal in a line, it is converted to a point
+    - if radius of a circle or arc is zero, it is converted to a point
+    - if an arc is a full circle, convert it to a circle
+   Returns number of simplifications (0, 1 or 2) issued or -1 for
+   invalid object ID.
+*/
+int cg_simplify_object(int ID);
+
+
+/* these are for C API, scripts have no direct access */
+typedef struct cg_obj_s {
+	cg_obj_type_t type;
+	int x1, y1, x2, y2;
+	int r;
+} cg_obj_t;
+
+extern cg_obj_t *cg_objs;
+extern int cg_objs_used, cg_objs_alloced;
+
+nowrap cg_obj_t *cg_get_object(int ID);
+
+/* create a line in o that is perpendicular to i and starts at point xp and yp */
+nowrap void cg_perp_line_(const cg_obj_t *i, cg_obj_t *o, int xp, int yp, int len);
+
+/* distance */
+nowrap double cg_dist_(int x1, int y1, int x2, int y2);
+
+/* is point on the object? Extend means the object is extended (lines become
+   infinite long, arcs become circles). pcb_vector_t always returns 1. */
+nowrap int cg_ison_(cg_obj_t *o, int x, int y, int extend);
+nowrap int cg_ison_line_(cg_obj_t *l, int x, int y, int extend);
+nowrap int cg_ison_arc_(cg_obj_t *a, int x, int y, int extend);
+nowrap int cg_ison_point_(cg_obj_t *p, int x, int y);
+#define cg_ison_circle_(c, x, y) cg_ison_arc_(c, x, y, 1)
+
+/* these calls are the low level versions of the ones defined for scripts above */
+nowrap int cg_simplify_object_(cg_obj_t *o);
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi/package.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi/package.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi/package.c	(revision 18980)
@@ -0,0 +1,19 @@
+#include <gpmi.h>
+
+int PKG_FUNC(init)()
+{
+	return 0;
+}
+
+void PKG_FUNC(uninit)() {
+}
+
+void PKG_FUNC(register)() {
+}
+
+int PKG_FUNC(checkver)(int requested) {
+	if (requested <= 1)
+		return 0;
+
+	return -1;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi.conf
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/gpmi.conf	(revision 18980)
@@ -0,0 +1,18 @@
+@/local/headers
+	coordgeo.h
+
+@/local/srcs
+	coordgeo.c
+
+@/local/file_name
+	coordgeo
+
+@/local/inst_path
+	coordgeo
+
+@/local/CFLAGS
+	-I$(PCB_SRC) $(PCB_CFLAGS)  -D###/target/sys/class###
+
+@@/local/hook/postall
+	PCB_GPMI_ROOT=../../..
+	include $(PCB_GPMI_ROOT)/Makefile.config
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/test.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/test.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/coordgeo/test.c	(revision 18980)
@@ -0,0 +1,199 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include "coordgeo.h"
+
+#define POINT_MARK_SIZE 2
+#define PS_SCALE 3
+#define PS_MARGIN 8
+
+#define SCALE(v) ((v+PS_MARGIN) * PS_SCALE)
+
+void line(FILE *ps, int x1, int y1, int x2, int y2)
+{
+	fprintf(ps, "%d %d moveto\n", SCALE(x1), SCALE(y1));
+	fprintf(ps, "%d %d lineto\n", SCALE(x2), SCALE(y2));
+}
+
+void color(FILE *ps, float r, float g, float b)
+{
+	static int colorspace=0;
+
+	if (colorspace == 0) {
+		fprintf(ps, "/DeviceRGB setcolorspace\n");
+		colorspace = 1;
+	}
+	fprintf(ps, "%f %f %f setcolor\n", r, g, b);
+}
+
+
+FILE *ps_start(const char *fn)
+{
+	FILE *f;
+
+	f = fopen(fn, "w");
+	if (f == NULL)
+		return NULL;
+
+	fprintf(f, "%%!\n");
+
+	return f;
+}
+
+int ps_draw(FILE *ps, int ID)
+{
+	cg_obj_t *o;
+	o = cg_get_object(ID);
+	assert(o != NULL);
+	fprintf(ps, "newpath\n");
+
+	switch(o->type) {
+		case CG_POINT:
+			fprintf(ps, "0.1 setlinewidth\n");
+			line(ps, o->x1-POINT_MARK_SIZE, o->y1, o->x1+POINT_MARK_SIZE, o->y1);
+			line(ps, o->x1, o->y1-POINT_MARK_SIZE, o->x1, o->y1+POINT_MARK_SIZE);
+			break;
+		case CG_LINE:
+			fprintf(ps, "0.1 setlinewidth\n");
+			line(ps, o->x1, o->y1, o->x2, o->y2);
+			break;
+		case CG_VECTOR:
+			fprintf(ps, "0.1 setlinewidth\n");
+			line(ps, o->x1, o->y1, o->x2, o->y2);
+			break;
+		case CG_CIRCLE:
+			fprintf(ps, "0.1 setlinewidth\n");
+			fprintf(ps, "%d %d %d %d %d arc\n", SCALE(o->x1), SCALE(o->y1), o->r*PS_SCALE, 0, 360);
+			break;
+		case CG_ARC:
+			fprintf(ps, "0.1 setlinewidth\n");
+			fprintf(ps, "%d %d %d %d %d arc\n", SCALE(o->x1), SCALE(o->y1), o->r*PS_SCALE, o->x2, o->y2);
+			break;
+	}
+
+	fprintf(ps, "stroke\n");	
+	return ID;
+}
+
+void ps_end(FILE *ps)
+{
+	fprintf(ps, "showpage\n");
+	fclose(ps);
+}
+
+void test_primitives()
+{
+	FILE *ps;
+
+	ps = ps_start("primitives.ps");
+	cg_destroy_object(ps_draw(ps, cg_new_object(CG_LINE, 0, 0, 10, 10, 0)));
+	cg_destroy_object(ps_draw(ps, cg_new_object(CG_VECTOR, 20, 0, 30, 10, 0)));
+	cg_destroy_object(ps_draw(ps, cg_new_object(CG_POINT, 40, 5, 0, 0, 0)));
+	cg_destroy_object(ps_draw(ps, cg_new_object(CG_CIRCLE, 70, 10, 0, 0, 5)));
+	cg_destroy_object(ps_draw(ps, cg_new_object(CG_ARC, 90, 10, 0, 45, 5)));
+	ps_end(ps);
+}
+
+void test_parallels()
+{
+	FILE *ps;
+	int obj;
+
+	ps = ps_start("parallels.ps");
+
+	obj = ps_draw(ps, cg_new_object(CG_LINE, 0, 0, 10, 10, 0));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, 4)));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, -4)));
+	cg_destroy_object(obj);
+
+	obj = ps_draw(ps, cg_new_object(CG_CIRCLE, 70, 10, 0, 0, 5));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, 4)));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, -4)));
+	cg_destroy_object(obj);
+
+/*	obj = ps_draw(ps, cg_new_object(CG_ARC, 90, 10, 0, 45, 5));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, 4)));
+	cg_destroy_object(ps_draw(ps, cg_para_obj(obj, -4)));
+	cg_destroy_object(obj);*/
+
+
+	ps_end(ps);
+
+}
+
+void test_perps()
+{
+	FILE *ps;
+	int obj;
+
+	ps = ps_start("perpendicular.ps");
+
+	obj = ps_draw(ps, cg_new_object(CG_LINE, 0, 0, 10, 10, 0));
+	cg_destroy_object(ps_draw(ps, cg_perp_line(obj, 0,0,4)));
+	cg_destroy_object(ps_draw(ps, cg_perp_line(obj, 10,10,-4)));
+	cg_destroy_object(obj);
+
+	ps_end(ps);
+
+}
+
+void test_intersect()
+{
+	FILE *ps;
+	int o1, o2, i;
+	cg_obj_t *oi;
+
+	ps = ps_start("intersect.ps");
+
+	/* two lines, intersecting */
+	color(ps, 0, 0, 0);
+	o1 = ps_draw(ps, cg_new_object(CG_LINE, 0, 0, 10, 10, 0));
+	o2 = ps_draw(ps, cg_new_object(CG_LINE, 5, 0, 6, 13, 0));
+	color(ps, 1, 0, 0);
+	cg_simplify_object(i = cg_intersect(o1, o2, 1));
+	cg_destroy_object(ps_draw(ps, i));
+	cg_destroy_object(o1);
+	cg_destroy_object(o2);
+
+	/* two lines, no visible intersection */
+	color(ps, 0, 0, 0);
+	o1 = ps_draw(ps, cg_new_object(CG_LINE, 20, 0, 30, 10, 0));
+	o2 = ps_draw(ps, cg_new_object(CG_LINE, 25, 0, 32, 13, 0));
+	color(ps, 1, 0, 0);
+	cg_simplify_object(i = cg_intersect(o1, o2, 1));
+	cg_destroy_object(ps_draw(ps, i));
+	cg_destroy_object(o1);
+	cg_destroy_object(o2);
+
+	/* circle vs. line */
+	color(ps, 0, 0, 0);
+	o1 = ps_draw(ps, cg_new_object(CG_LINE,   40, 0, 55, 15, 0));
+	o2 = ps_draw(ps, cg_new_object(CG_CIRCLE, 45, 8, 0, 0, 6));
+	color(ps, 1, 0, 0);
+	cg_simplify_object(i = cg_intersect(o1, o2, 1));
+	cg_destroy_object(ps_draw(ps, i));
+	cg_destroy_object(o1);
+	cg_destroy_object(o2);
+
+	/* circle vs. circle */
+	color(ps, 0, 0, 0);
+	o1 = ps_draw(ps, cg_new_object(CG_CIRCLE, 69, 6, 0, 0, 4));
+	o2 = ps_draw(ps, cg_new_object(CG_CIRCLE, 65, 8, 0, 0, 6));
+	color(ps, 1, 0, 0);
+	cg_simplify_object(i = cg_intersect(o1, o2, 1));
+	cg_destroy_object(ps_draw(ps, i));
+	cg_destroy_object(o1);
+	cg_destroy_object(o2);
+
+
+	ps_end(ps);
+}
+
+
+int main()
+{
+	test_primitives();
+	test_parallels();
+	test_perps();
+	test_intersect();
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.am
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.am	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.am	(revision 18980)
@@ -0,0 +1,16 @@
+# This file is package-specific. Do include it in the distribution.
+#
+# GPMI fingerprint: Makefile.am.ext-pkg
+
+# End INST_PATH with /
+INST_PATH = pcb-gpmi/
+FILE_NAME = dialogs
+
+SOURCE  = dialogs.c
+HEADER  = dialogs.h
+
+PKG_LDFLAGS = 
+
+PCB_GPMI_ROOT=../../..
+include $(PCB_GPMI_ROOT)/Makefile.config
+INCLUDES = -I.. -I../.. -I $(PCB_SRC)
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.dep
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/Makefile.dep	(revision 18980)
@@ -0,0 +1 @@
+#Please run make depend!
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.c	(revision 18980)
@@ -0,0 +1,91 @@
+#include "src/hid_attrib.h"
+#include "src/error.h"
+#include "dialogs.h"
+
+extern pcb_hid_t *pcb_gui;
+
+void dialog_log(const char *msg)
+{
+	if (pcb_gui == NULL)
+		fprintf(stderr, "couldn't find gui for log: \"%s\"\n", msg);
+	else
+		pcb_message(PCB_MSG_INFO, "%s", msg);
+}
+
+#define empty(s) (((s) == NULL) || ((*s) == '\0'))
+int dialog_confirm(const char *msg, const char *ok, const char *cancel)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "couldn't find gui for dialog_confirm: \"%s\"\n", msg);
+		return -1;
+	}
+
+	if (empty(ok))
+		ok = NULL;
+	if (empty(cancel))
+		cancel = NULL;
+
+	return pcb_gui->confirm_dialog(msg, cancel, ok, NULL);
+}
+#undef empty
+
+void dialog_report(const char *title, const char *msg)
+{
+	if (pcb_gui == NULL)
+		fprintf(stderr, "couldn't find gui for dialog_report: \"%s\" \"%s\"\n", title, msg);
+	else
+		pcb_gui->report_dialog(title, msg);
+}
+
+dynamic char *dialog_prompt(const char *msg, const char *default_)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "couldn't find gui for dialog_prompt: \"%s\" \"%s\"\n", msg, default_);
+		return NULL;
+	}
+	else
+		return pcb_gui->prompt_for(msg, default_);
+}
+
+dynamic char *dialog_fileselect(const char *title, const char *descr, char *default_file, char *default_ext, const char *history_tag, multiple dialog_fileselect_t flags)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "couldn't find gui for dialog_fileselect\n");
+		return NULL;
+	}
+	else
+		return pcb_gui->fileselect(title, descr, default_file, default_ext, history_tag, flags);
+}
+
+void dialog_beep(void)
+{
+	if (pcb_gui == NULL)
+		fprintf(stderr, "couldn't find gui for dialog_beep\n");
+	else
+		pcb_gui->beep();
+}
+
+int dialog_progress(int so_far, int total, const char *message)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "couldn't find gui for dialog_process: %d/%d \"%s\"\n", so_far, total, message);
+		return -1;
+	}
+	return pcb_gui->progress(so_far, total, message);
+}
+
+int dialog_attribute(gpmi_hid_t *hid, const char *title, const char *descr)
+{
+	if (pcb_gui == NULL) {
+		fprintf(stderr, "couldn't find gui for dialog_attribute: \"%s\" \"%s\"\n", title, descr);
+		return -1;
+	}
+
+	if (hid->result != NULL) {
+		/* TODO: free string fields to avoid memleaks */
+	}
+	else
+		hid->result = calloc(sizeof(pcb_hid_attribute_t), hid->attr_num);
+
+	return pcb_attribute_dialog(hid->attr, hid->attr_num, hid->result, title, descr, NULL);
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/dialogs.h	(revision 18980)
@@ -0,0 +1,79 @@
+#include <gpmi.h>
+#include "src/hid.h"
+#include "src/global_typedefs.h"
+#define FROM_PKG
+#include "hid/hid.h"
+#include "src/pcb-printf.h"
+
+#undef snprintf
+#define snprintf pcb_snprintf
+
+/* Filter on what files a file select dialog should list */
+typedef enum dialog_fileselect_e {
+	FS_NONE      = 0, /* none of the below */
+	FS_READ      = 1, /* when the selected file will be read, not written (HID_FILESELECT_READ) */
+	FS_NOT_EXIST = 2, /* the function calling hid->fileselect will deal with the case when the selected file already exists.  If not given, then the gui will prompt with an "overwrite?" prompt.  Only used when writing. (HID_FILESELECT_MAY_NOT_EXIST)  */
+	FS_TEMPLATE  = 4  /* the call is supposed to return a file template (for gerber output for example) instead of an actual file.  Only used when writing. (HID_FILESELECT_IS_TEMPLATE) */
+} dialog_fileselect_t;
+gpmi_keyword *kw_dialog_fileselect_e; /* of dialog_fileselect_t */
+
+/* Append a msg to the log (log window and/or stderr). */
+void dialog_log(const char *msg);
+
+/* Ask the user for confirmation (usually using a popup). Returns 0 for
+   cancel and 1 for ok.
+   Arguments:
+     msg: message to the user
+     ok: label of the OK button
+     cancel: label of the cancel button
+  Arguments "ok" and "cancel" may be empty (or NULL) in which
+  case the GUI will use the default (perhaps localized) labels for
+  those buttons. */
+int dialog_confirm(const char *msg, const char *ok, const char *cancel);
+
+
+/* Pop up a report dialog.
+   Arguments:
+     title: title of the window
+     msg: message */
+void dialog_report(const char *title, const char *msg);
+
+/* Ask the user to input a string (usually in a popup).
+   Arguments:
+     msg: message or question text
+     default_: default answer (this may be filled in on start)
+   Returns the answer. */
+dynamic char *dialog_prompt(const char *msg, const char *default_);
+
+/* Pops up a file selection dialog.
+   Arguments:
+     title: window title
+     descr: description
+     default_file_
+     default_ext: default file name extension
+     history_tag
+     flags: one or more flags (see below)
+   Returns the selected file or NULL (empty). */
+dynamic char *dialog_fileselect(const char *title, const char *descr, char *default_file_, char *default_ext, const char *history_tag, multiple dialog_fileselect_t flags);
+
+/* Audible beep */
+void dialog_beep(void);
+
+/* Request the GUI hid to draw a progress bar.
+   Arguments:
+     int so_far: achieved state
+     int total: maximum state
+     const char *message: informs the users what they are waiting for
+   If so_far is bigger than total, the progress bar is closed.
+   Returns nonzero if the user wishes to cancel the operation.
+*/
+int dialog_progress(int so_far, int total, const char *message);
+
+
+/* Pop up an attribute dialog; content (widgets) of the dialog box are coming
+   from hid (see the hid package).
+   Arguments:
+     hid: widgets
+     title: title of the window
+     descr: descripting printed in the dialog */
+int dialog_attribute(gpmi_hid_t *hid, const char *title, const char *descr);
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/gpmi.conf
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/gpmi.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/dialogs/gpmi.conf	(revision 18980)
@@ -0,0 +1,18 @@
+@/local/headers
+	dialogs.h
+
+@/local/srcs
+	dialogs.c
+
+@/local/file_name
+	dialogs
+
+@/local/inst_path
+	dialogs
+
+@/local/CFLAGS
+	-I.. -I$(PCB_SRC) $(PCB_CFLAGS)  -D###/target/sys/class###
+
+@@/local/hook/postall
+	PCB_GPMI_ROOT=../../..
+	include $(PCB_GPMI_ROOT)/Makefile.config
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.am
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.am	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.am	(revision 18980)
@@ -0,0 +1,13 @@
+# GPMI fingerprint: Makefile.am.ext-pkg
+
+# End INST_PATH with /
+INST_PATH = pcb-gpmi/
+FILE_NAME = hid
+
+SOURCE  = hid.c
+SOURCE += hid_callbacks.c
+
+HEADER  = hid.h
+HEADER += hid_events.h
+include ../../../Makefile.config
+INCLUDES = -I $(PCB_SRC)
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.dep
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/Makefile.dep	(revision 18980)
@@ -0,0 +1 @@
+#Please run make depend!
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi/package.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi/package.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi/package.c	(revision 18980)
@@ -0,0 +1,19 @@
+#include <gpmi.h>
+
+int PKG_FUNC(init)()
+{
+	return 0;
+}
+
+void PKG_FUNC(uninit)() {
+}
+
+void PKG_FUNC(register)() {
+}
+
+int PKG_FUNC(checkver)(int requested) {
+	if (requested <= 1)
+		return 0;
+
+	return -1;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi.conf
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/gpmi.conf	(revision 18980)
@@ -0,0 +1,20 @@
+@/local/headers
+	hid.h
+	hid_events.h
+
+@/local/srcs
+	hid.c
+	hid_callbacks.c
+
+@/local/file_name
+	hid
+
+@/local/inst_path
+	hid
+
+@/local/CFLAGS
+	-I.. -I$(PCB_SRC) $(PCB_CFLAGS)  -D###/target/sys/class###
+
+@@/local/hook/postall
+	PCB_GPMI_ROOT=../../..
+	include $(PCB_GPMI_ROOT)/Makefile.config
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c	(revision 18980)
@@ -0,0 +1,305 @@
+#include <stdlib.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/error.h"
+#include "src/hid.h"
+#include "src/hid_nogui.h"
+#include "src/pcb-printf.h"
+#include "src/hid_attrib.h"
+#include "src/hid_init.h"
+#include "src/compat_misc.h"
+
+#define FROM_PKG
+#include "hid.h"
+#include "hid_callbacks.h"
+
+
+void hid_gpmi_data_set(gpmi_hid_t *h, void *data)
+{
+	h->hid->user_context = data;
+}
+
+gpmi_hid_t *hid_gpmi_data_get(pcb_hid_t *h)
+{
+	if (h == NULL)
+		return NULL;
+	return (gpmi_hid_t *)h->user_context;
+}
+
+gpmi_hid_t *hid_create(char *hid_name, char *description)
+{
+	gpmi_hid_t *h;
+
+	h      = calloc(sizeof(gpmi_hid_t), 1);
+	h->hid = calloc(sizeof(pcb_hid_t), 1);
+
+	pcb_hid_nogui_init(h->hid);
+
+	h->module = gpmi_get_current_module();
+
+	h->hid->name        = pcb_strdup(hid_name);
+	h->hid->description = pcb_strdup(description);
+	h->hid->exporter    = 1;
+	h->hid->gui         = 0;
+	h->hid->struct_size = sizeof(pcb_hid_t);
+
+	h->hid->get_export_options = gpmi_hid_get_export_options;
+	h->hid->make_gc            = gpmi_hid_make_gc;
+	h->hid->destroy_gc         = gpmi_hid_destroy_gc;
+	h->hid->do_export          = gpmi_hid_do_export;
+	h->hid->parse_arguments    = gpmi_hid_parse_arguments;
+	h->hid->set_crosshair      = gpmi_hid_set_crosshair;
+	h->hid->set_layer_group    = gpmi_hid_set_layer_group;
+	h->hid->set_color          = gpmi_hid_set_color;
+	h->hid->set_line_cap       = gpmi_hid_set_line_cap;
+	h->hid->set_line_width     = gpmi_hid_set_line_width;
+	h->hid->set_draw_xor       = gpmi_hid_set_draw_xor;
+	h->hid->set_draw_faded     = gpmi_hid_set_draw_faded;
+	h->hid->draw_line          = gpmi_hid_draw_line;
+	h->hid->draw_arc           = gpmi_hid_draw_arc;
+	h->hid->draw_rect          = gpmi_hid_draw_rect;
+	h->hid->fill_circle        = gpmi_hid_fill_circle;
+	h->hid->fill_polygon       = gpmi_hid_fill_polygon;
+	h->hid->fill_pcb_polygon   = gpmi_hid_fill_pcb_polygon;
+	h->hid->fill_rect          = gpmi_hid_fill_rect;
+
+	h->attr_num = 0;
+	h->attr     = NULL;
+	h->new_gc   = NULL;
+
+	hid_gpmi_data_set(h, h);
+	return h;
+}
+
+dynamic char *hid_get_attribute(gpmi_hid_t *hid, int attr_id)
+{
+	const char *res;
+	char buff[128];
+	pcb_hid_attr_val_t *v;
+
+	if ((hid == NULL) || (attr_id < 0) || (attr_id >= hid->attr_num) || (hid->result == NULL))
+		return 0;
+
+	res = NULL;
+
+	v = &(hid->result[attr_id]);
+	switch(hid->type[attr_id]) {
+		case HIDA_Boolean:
+			if (v->int_value)
+				res = "true";
+			else
+				res = "false";
+			break;
+		case HIDA_Integer:
+			pcb_snprintf(buff, sizeof(buff), "%d", v->int_value);
+			res = buff;
+			break;
+		case HIDA_Real:
+			pcb_snprintf(buff, sizeof(buff), "%f", v->real_value);
+			res = buff;
+			break;
+		case HIDA_String:
+		case HIDA_Label:
+		case HIDA_Path:
+			res = v->str_value;
+			break;
+		case HIDA_Enum:
+			res = hid->attr[attr_id].enumerations[v->int_value];
+/*			printf("res='%s' %d\n", res, v->int_value);*/
+			break;
+		case HIDA_Coord:
+				pcb_sprintf(buff, "%mI", v->coord_value);
+				res = buff;
+				break;
+		case HIDA_Unit:
+			{
+				const pcb_unit_t *u;
+				double fact;
+				u = get_unit_by_idx(v->int_value);
+				if (u == NULL)
+					fact = 0;
+				else
+					fact = pcb_unit_to_factor(u);
+				pcb_snprintf(buff, sizeof(buff), "%f", fact);
+				res = buff;
+/*				fprintf(stderr, "unit idx: %d %p res='%s'\n", v->int_value, (void *)u, res);*/
+			}
+			break;
+		case HIDA_Mixed:
+		default:
+			fprintf(stderr, "error: hid_string2val: can't handle type %d\n", hid->type[attr_id]);
+
+	}
+	if (res == NULL)
+		return NULL;
+	return pcb_strdup(res);
+}
+
+
+pcb_hid_attr_val_t hid_string2val(const hid_attr_type_t type, const char *str)
+{
+	pcb_hid_attr_val_t v;
+	memset(&v, 0, sizeof(v));
+	switch(type) {
+		case HIDA_Boolean:
+			if ((pcb_strcasecmp(str, "true") == 0) || (pcb_strcasecmp(str, "yes") == 0) || (pcb_strcasecmp(str, "1") == 0))
+				v.int_value = 1;
+			else
+				v.int_value = 0;
+			break;
+		case HIDA_Integer:
+			v.int_value = atoi(str);
+			break;
+		case HIDA_Coord:
+			{
+				char *end;
+				double val;
+				val = strtod(str, &end);
+				while(isspace(*end)) end++;
+				if (*end != '\0') {
+					const pcb_unit_t *u;
+					u = get_unit_struct(end);
+					if (u == NULL) {
+						pcb_message(PCB_MSG_ERROR, "Invalid unit for HIDA_Coord in the script: '%s'\n", end);
+						v.coord_value = 0;
+					}
+					else
+						v.coord_value = pcb_unit_to_coord(u, val);
+				}
+				else 
+					v.coord_value = val;
+			}
+			break;
+		case HIDA_Unit:
+			{
+				const pcb_unit_t *u;
+				u = get_unit_struct(str);
+				if (u != NULL)
+					v.real_value = pcb_unit_to_factor(u);
+				else
+					v.real_value = 0;
+			}
+			break;
+		case HIDA_Real:
+			v.real_value = atof(str);
+			break;
+		case HIDA_String:
+		case HIDA_Label:
+		case HIDA_Enum:
+		case HIDA_Path:
+			v.str_value = pcb_strdup(str);
+			break;
+		case HIDA_Mixed:
+		default:
+			fprintf(stderr, "error: hid_string2val: can't handle type %d\n", type);
+	}
+	return v;
+}
+
+char **hid_string2enum(const char *str, pcb_hid_attr_val_t *def)
+{
+	char **e;
+	const char *s, *last;
+	int n, len;
+
+	for(n=0, s=str; *s != '\0'; s++)
+		if (*s == '|')
+			n++;
+	e = malloc(sizeof(char *) * (n+2));
+
+	def->int_value = 0;
+	def->str_value = NULL;
+	def->real_value = 0.0;
+
+	for(n = 0, last=s=str;; s++) {
+
+		if ((*s == '|') || (*s == '\0')) {
+			if (*last == '*') {
+				def->int_value = n;
+				last++;
+			}
+			len = s - last;
+			e[n] = malloc(len+1);
+			if (len != 0)
+				strncpy(e[n], last, len);
+			e[n][len] = '\0';
+			last = s+1;
+			n++;
+		}
+		if (*s == '\0')
+			break;
+	}
+	e[n] = NULL;
+	return e;
+}
+
+int hid_add_attribute(gpmi_hid_t *hid, char *attr_name, char *help, hid_attr_type_t type, int min, int max, char *default_val)
+{
+	int current = hid->attr_num;
+
+	/* TODO: should realloc more space here */
+	hid->attr_num++;
+	hid->attr = realloc(hid->attr, sizeof(pcb_hid_attribute_t) * hid->attr_num);
+	hid->type = realloc(hid->type, sizeof(hid_attr_type_t) * hid->attr_num);
+
+	hid->attr[current].name         = pcb_strdup(attr_name);
+	hid->attr[current].help_text    = pcb_strdup(help);
+	hid->attr[current].type         = type;
+	hid->attr[current].min_val      = min;
+	hid->attr[current].max_val      = max;
+	if (type == HIDA_Unit) {
+		const pcb_unit_t *u, *all;
+		all = pcb_units;
+		u = get_unit_struct(default_val);
+		if (u != NULL)
+			hid->attr[current].default_val.int_value = u-all;
+		else
+			hid->attr[current].default_val.int_value = -1;
+	}
+	else if (type == HIDA_Enum) {
+		hid->attr[current].enumerations = (const char **)hid_string2enum(default_val, &(hid->attr[current].default_val));
+	}
+	else {
+		hid->attr[current].default_val  = hid_string2val(type, default_val);
+		hid->attr[current].enumerations = NULL;
+	}
+
+	hid->type[current] = type;
+
+	return current;
+}
+
+static void cleanup_hid_reg(gpmi_module *mod, gpmi_cleanup *cl)
+{
+	gpmi_hid_t *hid = cl->argv[0].p;
+	int n;
+
+	pcb_hid_remove_hid(hid->hid);
+
+	for(n = 0; n < hid->attr_num; n++) {
+		free((char *)hid->attr[n].name);
+		free((char *)hid->attr[n].help_text);
+	}
+
+	if (hid->attr != NULL)
+		free(hid->attr);
+	if (hid->type != NULL)
+		free(hid->type);
+
+	free((char *)hid->hid->name);
+	free((char *)hid->hid->description);
+	free(hid->hid);
+	free(hid);
+}
+
+int hid_register(gpmi_hid_t *hid)
+{
+	pcb_hid_register_hid(hid->hid);
+
+	gpmi_mod_cleanup_insert(NULL, cleanup_hid_reg, "p", hid);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.h	(revision 18980)
@@ -0,0 +1,88 @@
+#include <gpmi.h>
+#include "src/pcb-printf.h"
+
+#undef snprintf
+#define snprintf pcb_snprintf
+
+/* Type of an HID attribute (usually a widget on an attribute dialog box) */
+typedef enum hid_attr_type_e {
+	HIDA_Label,    /* non-editable label displayed on the GUI */
+	HIDA_Integer,  /* a sugned integer value */
+	HIDA_Real,     /* a floating point value */
+	HIDA_String,   /* one line textual input */
+	HIDA_Boolean,  /* true/false boolean value */
+	HIDA_Enum,     /* select an item of a predefined list */
+	HIDA_Mixed,    /* TODO */
+	HIDA_Path,     /* path to a file or directory */
+	HIDA_Unit,     /* select a dimension unit */
+	HIDA_Coord     /* enter a coordinate */
+} hid_attr_type_t;
+
+gpmi_keyword *kw_hid_attr_type_e; /* of hid_attr_type_t */
+
+/* TODO: these should not be here; GPMI needs to switch over to c99tree! */
+#ifndef FROM_PKG
+typedef void pcb_hid_t;
+typedef void pcb_hid_attribute_t;
+typedef void* pcb_hid_gc_t;
+typedef char* pcb_hid_attr_val_t;
+
+/* Line or arc ending style */
+typedef enum pcb_cap_style_t_e {
+ Square_Cap,   /* rectangular lines (square pad) */
+ Round_Cap     /* round pins or round-ended pads, thermals */
+} pcb_cap_style_t;
+
+typedef void *pcb_poly_t;
+typedef void *pcb_box_t;
+#endif
+
+typedef struct gpmi_hid_s {
+	gpmi_module *module;
+	int attr_num;
+	pcb_hid_attribute_t *attr;
+	hid_attr_type_t *type;
+	pcb_hid_t *hid;
+	pcb_hid_attr_val_t *result;
+	pcb_hid_gc_t new_gc;
+} gpmi_hid_t;
+
+/* Creates a new hid context. Name and description matters only if the hid is
+registered as an pcb_exporter later. */
+gpmi_hid_t *hid_create(char *hid_name, char *description);
+
+/* Append an attribute in a hid previously created using hid_create().
+   Arguments:
+     hid: hid_t previously created using hid_create()
+     attr_name: name of the attribute
+     help: help text for the attribute
+     type: type of the attribute (input widget type)
+     min: minimum value of the attribute, if type is integer or real)
+     max: maximum value of the attribute, if type is integer or real)
+     default_val: default value of the attribute
+  Returns an unique ID of the attribute the caller should store for
+  later reference. For example this ID is used when retrieving the
+  value of the attribute after the user finished entering data in
+  the dialog. */
+int hid_add_attribute(gpmi_hid_t *hid, char *attr_name, char *help, hid_attr_type_t type, int min, int max, char *default_val);
+
+/* Query an attribute from the hid after dialog_attributes() returned.
+   Arguments:
+     hid: hid_t previously created using hid_create()
+     attr_id: the unique ID of the attribute (returned by hid_add_attribute())
+   Returns the value (converted to string) set by the user. */
+dynamic char *hid_get_attribute(gpmi_hid_t *hid, int attr_id);
+
+/* Register the hid; call it after a hid is created and its attributes
+   are all set up */
+int hid_register(gpmi_hid_t *hid);
+
+/* For internal use */
+void hid_gpmi_data_set(gpmi_hid_t *h, void *data);
+
+/* For internal use */
+gpmi_hid_t *hid_gpmi_data_get(pcb_hid_t *h);
+
+/* For internal use */
+nowrap pcb_hid_attr_val_t hid_string2val(const hid_attr_type_t type, const char *str);
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 18980)
@@ -0,0 +1,167 @@
+#include <stdlib.h>
+#include "src/board.h"
+#include "src/global_typedefs.h"
+#include "src/hid.h"
+#include "src/data.h"
+#define FROM_PKG
+#include "hid.h"
+#include "hid_events.h"
+#include "hid_callbacks.h"
+#include "src/hid_flags.h"
+#include "src/hid_init.h"
+
+pcb_hid_attribute_t *gpmi_hid_get_export_options(int *num)
+{
+	gpmi_hid_t *h;
+
+	h = hid_gpmi_data_get(pcb_exporter);
+
+	if (h == NULL)
+		return NULL;
+
+	gpmi_event(h->module, HIDE_get_export_options, h);
+
+	if (num != NULL)
+		*num = h->attr_num;
+	return h->attr;
+}
+
+static char *gcs = "abcdefghijklmnopqrstuvxyz";
+pcb_hid_gc_t gpmi_hid_make_gc(void)
+{
+	pcb_hid_gc_t ret;
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+
+	/* TODO: fix gc handling... */
+	h->new_gc = (void *)(gcs++);
+	gpmi_event(h->module, HIDE_make_gc, h, h->new_gc);
+	ret = h->new_gc;
+	h->new_gc = NULL;
+	return ret;
+}
+
+void gpmi_hid_destroy_gc(pcb_hid_gc_t gc)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_destroy_gc, h, gc);
+}
+
+void gpmi_hid_do_export(pcb_hid_attr_val_t * options)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	int save_ons[PCB_MAX_LAYER + 2];
+	pcb_hid_expose_ctx_t ctx;
+
+	h->result = options;
+	gpmi_event(h->module, HIDE_do_export_start, h);
+
+	pcb_hid_save_and_show_layer_ons(save_ons);
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	pcb_hid_expose_all(h->hid, &ctx);
+	pcb_hid_restore_layer_ons(save_ons);
+	gpmi_event(h->module, HIDE_do_export_finish, h);
+	h->result = NULL;
+}
+
+int gpmi_hid_parse_arguments(int *pcbargc, char ***pcbargv)
+{
+	/* Do nothing for now */
+	return pcb_hid_parse_command_line(pcbargc, pcbargv);
+}
+
+void gpmi_hid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int cursor_action)
+{
+	/* Do nothing */
+}
+
+int gpmi_hid_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_layer_group, h, group, layer, flags, is_empty);
+	return 1;
+}
+
+void gpmi_hid_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_color, h, gc, name);
+}
+
+void gpmi_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_line_cap, h, gc, style);
+}
+
+void gpmi_hid_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_line_width, h, gc, width);
+}
+
+void gpmi_hid_set_draw_xor(pcb_hid_gc_t gc, int xor)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_draw_xor, h, gc, xor);
+}
+
+void gpmi_hid_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_set_draw_faded, h, gc, faded);
+}
+
+void gpmi_hid_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_draw_line, h, gc, x1, y1, x2, y2);
+}
+
+void gpmi_hid_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_draw_arc, h, gc, cx, cy, xradius, yradius, start_angle, delta_angle);
+}
+
+void gpmi_hid_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_draw_rect, h, gc, x1, y1, x2, y2);
+}
+
+void gpmi_hid_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_fill_circle, h, gc, cx, cy, radius);
+}
+
+void gpmi_hid_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	/* TODO: need accessor for these */
+	gpmi_event(h->module, HIDE_fill_polygon, h, gc, x, y);
+}
+
+void gpmi_hid_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	/* TODO: need accessor for these */
+	gpmi_event(h->module, HIDE_fill_polygon_offs, h, gc, x, y, dx, dy);
+}
+
+void gpmi_hid_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box)
+{
+	/* TODO */
+}
+
+void gpmi_hid_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
+	gpmi_event(h->module, HIDE_fill_rect, h, gc, x1, y1, x2, y2);
+}
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(revision 18980)
@@ -0,0 +1,20 @@
+pcb_hid_attribute_t *gpmi_hid_get_export_options(int *num);
+pcb_hid_gc_t gpmi_hid_make_gc(void);
+void gpmi_hid_destroy_gc(pcb_hid_gc_t gc);
+void gpmi_hid_do_export(pcb_hid_attr_val_t * options);
+int gpmi_hid_parse_arguments(int *pcbargc, char ***pcbargv);
+void gpmi_hid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int cursor_action);
+int gpmi_hid_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
+void gpmi_hid_set_color(pcb_hid_gc_t gc, const char *name);
+void gpmi_hid_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
+void gpmi_hid_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
+void gpmi_hid_set_draw_xor(pcb_hid_gc_t gc, int xor);
+void gpmi_hid_set_draw_faded(pcb_hid_gc_t gc, int faded);
+void gpmi_hid_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+void gpmi_hid_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle);
+void gpmi_hid_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+void gpmi_hid_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+void gpmi_hid_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y);
+void gpmi_hid_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+void gpmi_hid_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box);
+void gpmi_hid_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_events.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_events.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_events.h	(revision 18980)
@@ -0,0 +1,58 @@
+/*********** Exporter events ************/
+
+/* Called before get_exporter_options returns the option list to the GUI hid */
+gpmi_define_event(HIDE_get_export_options)(void *hid);
+
+/* Called before export redraw starts */
+gpmi_define_event(HIDE_do_export_start)(void *hid);
+
+/* Called after export redraw finihsed */
+gpmi_define_event(HIDE_do_export_finish)(void *hid);
+
+/* DRAWING */
+
+/* PCB callback events for drawing: change layer */
+gpmi_define_event(HIDE_set_layer_group)(void *hid, long int group, long int layer, unsigned int flags, int is_empty);
+
+/* PCB callback events for drawing: change drawing color */
+gpmi_define_event(HIDE_set_color)(void *hid, void *gc, const char *name);
+
+/* PCB callback events for drawing: change drawing line cap style*/
+gpmi_define_event(HIDE_set_line_cap)(void *hid, void *gc, pcb_cap_style_t style);
+
+/* PCB callback events for drawing: change drawing line width */
+gpmi_define_event(HIDE_set_line_width)(void *hid, void *gc, int width);
+
+/* PCB callback events for drawing: toggle xor drawing method */
+gpmi_define_event(HIDE_set_draw_xor)(void *hid, void *gc, int xor);
+
+/* PCB callback events for drawing: toggle faded drawing method */
+gpmi_define_event(HIDE_set_draw_faded)(void *hid, void *gc, int faded);
+
+/* PCB callback events for drawing: draw a line */
+gpmi_define_event(HIDE_draw_line)(void *hid, void *gc, int x1, int y1, int x2, int y2);
+
+/* PCB callback events for drawing: draw an arc from center cx;cy */
+gpmi_define_event(HIDE_draw_arc)(void *hid, void *gc, int cx, int cy, int xradius, int yradius, double start_angle, double delta_angle);
+
+/* PCB callback events for drawing: draw a rectangle */
+gpmi_define_event(HIDE_draw_rect)(void *hid, void *gc, int x1, int y1, int x2, int y2);
+
+/* PCB callback events for drawing: draw a filled circle */
+gpmi_define_event(HIDE_fill_circle)(void *hid, void *gc, int cx, int cy, int radius);
+
+/* PCB callback events for drawing: draw a filled ploygon */
+gpmi_define_event(HIDE_fill_polygon)(void *hid, void *gc, int n_coords, int *x, int *y);
+
+/* PCB callback events for drawing: draw a filled polygon with offs*/
+gpmi_define_event(HIDE_fill_polygon_offs)(void *hid, void *gc, int n_coords, int *x, int *y, int dx, int dy);
+
+/* PCB callback events for drawing: draw a filled rectangle */
+gpmi_define_event(HIDE_fill_rect)(void *hid, void *gc, int x1, int y1, int x2, int y2);
+
+/* PCB callback events for drawing: create a new graphical context */
+gpmi_define_event(HIDE_make_gc)(void *hid, void *gc);
+
+/* PCB callback events for drawing: destroy a graphical context */
+gpmi_define_event(HIDE_destroy_gc)(void *hid, void *gc);
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.am
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.am	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.am	(revision 18980)
@@ -0,0 +1,22 @@
+# This file is package-specific. Do include it in the distribution.
+#
+# GPMI fingerprint: Makefile.am.ext-pkg
+
+# End INST_PATH with /
+INST_PATH = pcb-gpmi/
+FILE_NAME = layout
+
+SOURCE  = search.c
+SOURCE += object.c
+SOURCE += create.c
+SOURCE += layers.c
+SOURCE += page.c
+
+HEADER  = layout.h
+
+PKG_LDFLAGS = 
+
+include ../../../Makefile.config
+INCLUDES = -I$(PCB_SRC)/src
+INCLUDES += -I$(PCB_SRC)
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.dep
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.dep	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/Makefile.dep	(revision 18980)
@@ -0,0 +1 @@
+#Please run make depend!
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/coord.c	(revision 18980)
@@ -0,0 +1,21 @@
+#include "layout.h"
+#include "src/pcb-printf.h"
+#include "src/conf_core.h"
+
+double mil2pcb_multiplier()
+{
+	return 10000.0*2.54;
+}
+
+double mm2pcb_multiplier()
+{
+	return 1000000.0;
+}
+
+const char *current_grid_unit()
+{
+	const pcb_unit_t *u = conf_core.editor.grid_unit;
+	if (u == NULL)
+		return "";
+	return u->suffix;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/create.c	(revision 18980)
@@ -0,0 +1,149 @@
+#include <stdlib.h>
+#include <assert.h>
+#include "layout.h"
+#include "src/board.h"
+#include "src/undo.h"
+#include "src/conf_core.h"
+#include "src/layer.h"
+#include "src/compat_misc.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+
+typedef struct flag_tr_s {
+	int flag; /* flag or thermal */
+	int gpmi, pcb;
+} flag_tr_t;
+
+static flag_tr_t flags[] = {
+#warning TODO: get these from conf
+#if 0
+	{1, FL_SHOWNUMBER,   PCB_SHOWNUMBERFLAG},
+	{1, FL_LOCALREF,     PCB_LOCALREFFLAG},
+	{1, FL_CHECKPLANS,   PCB_CHECKPLANESFLAG},
+	{1, FL_SHOWDRC,      PCB_SHOWPCB_FLAG_DRC},
+	{1, FL_RUBBERBAND,   PCB_RUBBERBANDFLAG},
+	{1, FL_DESCRIPTION,  PCB_DESCRIPTIONFLAG},
+	{1, FL_NAMEONPCB,    PCB_NAMEONPCBFLAG},
+	{1, FL_AUTODRC,      PCB_AUTOPCB_FLAG_DRC},
+	{1, FL_ALLDIRECTION, PCB_ALLDIRECTIONFLAG},
+	{1, FL_SWAPSTARTDIR, PCB_SWAPSTARTDIRFLAG},
+	{1, FL_UNIQUENAME,   PCB_UNIQUENAMEFLAG},
+	{1, FL_CLEARNEW,     PCB_CLEARNEWFLAG},
+	{1, FL_SNAPPIN,      PCB_SNAPPCB_FLAG_PIN},
+	{1, FL_SHOWMASK,     PCB_SHOWMASKFLAG},
+	{1, FL_THINDRAW,     PCB_THINDRAWFLAG},
+	{1, FL_ORTHOMOVE,    PCB_ORTHOMOVEFLAG},
+	{1, FL_LIVEROUTE,    PCB_LIVEROUTEFLAG},
+	{1, FL_THINDRAWPOLY, PCB_THINDRAWPOLYFLAG},
+	{1, FL_LOCKNAMES,    PCB_LOCKNAMESFLAG},
+	{1, FL_ONLYNAMES,    PCB_ONLYNAMESFLAG},
+	{1, FL_NEWFULLPOLY,  PCB_NEWPCB_FLAG_FULLPOLY},
+	{1, FL_HIDENAMES,    PCB_HIDENAMESFLAG},
+#endif
+
+	{0, FL_THERMALSTYLE1, 1},
+	{0, FL_THERMALSTYLE2, 2},
+	{0, FL_THERMALSTYLE3, 3},
+	{0, FL_THERMALSTYLE4, 4},
+	{0, FL_THERMALSTYLE5, 5},
+	{0, 0, 0}
+};
+
+static pcb_flag_t get_flags(int in)
+{
+	flag_tr_t *f;
+	static pcb_flag_t out;
+
+	out.f = 0;
+	memset(out.t, 0, sizeof(out.t));
+	for(f = flags; f->gpmi != 0; f++) {
+		if (in & f->gpmi) {
+			if (f->flag)
+				out.f |= f->pcb;
+			else
+				memset(out.t, f->pcb, sizeof(out.t));
+		}
+	}
+	return out;
+}
+
+static void *layout_create_line_(pcb_layer_t *layer, int x1, int y1, int x2, int y2, int thickness, int clearance, multiple layout_flag_t flags)
+{
+	void *line;
+
+	line = pcb_line_new(layer, x1, y1, x2, y2, thickness, clearance, get_flags(flags));
+	if (line != NULL) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line);
+		return line;
+	}
+	return NULL;
+}
+
+layout_object_t *layout_create_line(const char *search_id, layer_id_t layer_id, int x1, int y1, int x2, int y2, int thickness, int clearance, multiple layout_flag_t flags)
+{
+	pcb_layer_t *layer = pcb_get_layer(PCB->Data, layer_id);
+	void *res;
+	if (layer == NULL)
+		return 0;
+	res = layout_create_line_(layer, x1, y1, x2, y2, thickness, clearance, flags);
+	return search_persist_created(search_id, layer_id, res, OM_LINE);
+}
+
+static void *layout_create_via_(int x, int y, int thickness, int clearance, int mask, int hole, const char *name, multiple layout_flag_t flags)
+{
+	void *pin;
+
+	pin = pcb_pstk_new_compat_via(PCB->Data, x, y, hole, thickness, clearance, mask, PCB_PSTK_COMPAT_ROUND, 1);
+
+	if (pin != NULL) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_PSTK, pin, pin, pin);
+		return pin;
+	}
+	return NULL;
+}
+
+layout_object_t *layout_create_via(const char *search_id, int x, int y, int thickness, int clearance, int mask, int hole, const char *name, multiple layout_flag_t flags)
+{
+	void *res = layout_create_via_(x, y, thickness, clearance, mask, hole, name, flags);
+	return search_persist_created(search_id, -1, res, OM_VIA);
+}
+
+static void *layout_create_arc_(pcb_layer_t *layer, int x, int y, int width, int height, int sa, int dir, int thickness, int clearance, multiple layout_flag_t flags)
+{
+	void *arc;
+	arc = pcb_arc_new(layer, x, y, width, height, sa, dir, thickness, clearance, get_flags(flags), pcb_true);
+	if (arc != NULL) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_ARC, layer, arc, arc);
+		return 0;
+	}
+	return NULL;
+}
+
+layout_object_t *layout_create_arc(const char *search_id, layer_id_t layer_id, int x, int y, int width, int height, int sa, int dir, int thickness, int clearance, multiple layout_flag_t flags)
+{
+	layout_search_t *s;
+	void *res;
+	pcb_layer_t *layer = pcb_get_layer(PCB->Data, layer_id);
+
+	if (layer == NULL)
+		return NULL;
+
+	res = layout_create_arc_(layer, x, y, width, height, sa, dir, thickness, clearance, flags);
+	return search_persist_created(search_id, layer_id, res, OM_ARC);
+}
+
+layout_object_t *layout_create_text(const char *search_id, layer_id_t layer_id, int x, int y, int direction, int scale, const char *str, multiple layout_flag_t flags)
+{
+	layout_search_t *s;
+	void *res;
+	pcb_layer_t *layer = pcb_get_layer(PCB->Data, layer_id);
+
+	if (layer == NULL)
+		return NULL;
+
+	res = pcb_text_new(layer, pcb_font(PCB, 0, 1), x, y, direction, scale, pcb_strdup(str), get_flags(flags));
+	return search_persist_created(search_id, layer_id, res, OM_ARC);
+}
+
+
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/draw.c	(revision 18980)
@@ -0,0 +1,45 @@
+#include <stdlib.h>
+#include <assert.h>
+#include "layout.h"
+#include "src/hid.h"
+#include "src/error.h"
+
+#define setup(func) \
+	pcb_hid_gc_t gc = ctx->gc; \
+	pcb_hid_t  *hid = ctx->hid; \
+	if ((hid == NULL) && (gc == NULL)) pcb_message(PCB_MSG_ERROR, "%s failed because of invalid hid or gc\n", func); \
+	if ((hid == NULL) && (gc == NULL)) return
+
+
+void draw_set_color(dctx_t *ctx, const char *name)
+{
+	setup("draw_set_color");
+	hid->set_color(gc, name);
+}
+
+/*void set_line_cap(dctx_t *ctx, pcb_cap_style_t style_);*/
+void draw_set_line_width(dctx_t *ctx, int width)
+{
+	setup("draw_set_line_width");
+	hid->set_line_width(gc, width);
+}
+
+void draw_set_draw_xor(dctx_t *ctx, int xor)
+{
+	setup("draw_set_draw_xor");
+	hid->set_draw_xor(gc, xor);
+}
+
+
+void draw_set_draw_faded(dctx_t *ctx, int faded)
+{
+	setup("draw_set_draw_faded");
+	hid->set_draw_faded(gc, faded);
+}
+
+void pcb_line_draw(dctx_t *ctx, int x1, int y1, int x2, int y2)
+{
+	setup("draw_line");
+	hid->draw_line(gc, x1, y1, x2, y2);
+}
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/gpmi.conf
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/gpmi.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/gpmi.conf	(revision 18980)
@@ -0,0 +1,18 @@
+@/local/headers
+	layout.h
+
+@/local/srcs
+	create.c layers.c object.c page.c search.c coord.c draw.c
+
+@/local/file_name
+	layout
+
+@/local/inst_path
+	layout
+
+@/local/CFLAGS
+	-I.. -I$(PCB_SRC) -I$(PCB_SRC)/src $(PCB_CFLAGS)  -D###/target/sys/class###
+
+@@/local/hook/postall
+	PCB_GPMI_ROOT=../../..
+	include $(PCB_GPMI_ROOT)/Makefile.config
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c	(revision 18980)
@@ -0,0 +1,111 @@
+#include <stdlib.h>
+#include <assert.h>
+#include "layout.h"
+#include "src/board.h"
+#include "src/draw.h"
+#include "src/conf_core.h"
+#include "src/layer.h"
+#include "src/layer_ui.h"
+#include "src/layer_vis.h"
+#include "src/compat_misc.h"
+
+#define LAYER_SEARCH_MAX 32
+
+#define layer_check(layer) \
+	if ((layer < 0) || (layer >= PCB_MAX_LAYER)) \
+		return
+
+
+void layout_switch_to_layer(int layer)
+{
+	layer_check(layer);
+	pcb_layervis_change_group_vis(layer, pcb_true, pcb_true);
+	pcb_redraw();
+}
+
+layer_id_t layout_get_current_layer()
+{
+	return pcb_layer_id(PCB->Data, CURRENT);
+}
+
+int layout_resolve_layer(const char *name)
+{
+	int n;
+	if (name == NULL)
+		return -2;
+	for(n = 0; n < PCB_MAX_LAYER; n++)
+		if ((PCB->Data->Layer[n].name != NULL) && (strcmp(PCB->Data->Layer[n].name, name) == 0))
+			return n;
+	return -1;
+}
+
+int layout_get_max_possible_layer()
+{
+	return PCB_MAX_LAYER;
+}
+
+int layout_get_max_layer()
+{
+	return pcb_max_layer;
+}
+
+const char *layout_layer_name(int layer)
+{
+	layer_check(layer)("");
+	return PCB->Data->Layer[layer].name;
+}
+
+const char *layout_layer_color(int layer)
+{
+	layer_check(layer)("");
+	return PCB->Data->Layer[layer].meta.real.color;
+}
+
+int layout_layer_field(int layer, layer_field_t fld)
+{
+	layer_check(layer)(-1);
+	switch(fld) {
+		case LFLD_NUM_LINES: return linelist_length(&(PCB->Data->Layer[layer].Line));
+		case LFLD_NUM_TEXTS: return textlist_length(&(PCB->Data->Layer[layer].Text));
+		case LFLD_NUM_POLYS: return polylist_length(&(PCB->Data->Layer[layer].Polygon));
+		case LFLD_NUM_ARCS:  return arclist_length(&(PCB->Data->Layer[layer].Arc));
+		case LFLD_VISIBLE:   return PCB->Data->Layer[layer].meta.real.vis;
+		case LFLD_NODRC:     return PCB->Data->Layer[layer].meta.real.no_drc;
+	}
+	return -1;
+}
+
+int layer_flag_is_set(unsigned int flags, multiple layer_type_t flg)
+{
+	return !!(flags & flg);
+}
+
+layer_id_t layer_list(multiple layer_type_t flags, int idx)
+{
+	pcb_layer_id_t ids[LAYER_SEARCH_MAX];
+	int len = pcb_layer_list(PCB, flags, ids, LAYER_SEARCH_MAX);
+	if (idx < 0)
+		return len;
+	if (idx >= len)
+		return -1;
+	return ids[idx];
+}
+
+layer_id_t layer_list_any(multiple layer_type_t flags, int idx)
+{
+	pcb_layer_id_t ids[LAYER_SEARCH_MAX];
+	int len = pcb_layer_list_any(PCB, flags, ids, LAYER_SEARCH_MAX);
+	if (idx < 0)
+		return len;
+	if (idx >= len)
+		return -1;
+	return ids[idx];
+}
+
+layer_id_t uilayer_alloc(const char *name, const char *color)
+{
+	pcb_layer_t *l = pcb_uilayer_alloc("script", name, pcb_strdup(color));
+	if (l == NULL)
+		return -1;
+	return pcb_layer_id(PCB->Data, l);
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h	(revision 18980)
@@ -0,0 +1,304 @@
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/rtree.h"
+#include "src/data.h"
+#include "src/layer.h"
+#include "src/pcb-printf.h"
+
+#undef snprintf
+#define snprintf pcb_snprintf
+
+typedef long int layer_id_t;
+
+/* Object type search mask bits */
+typedef enum layout_object_mask_e {
+	OM_LINE     = 1,       /* lines (traces, silk lines, not font) */
+	OM_TEXT     = 2,       /* text written using the font */
+	OM_POLYGON  = 4,       /* polygons, including rectangles */
+	OM_ARC      = 8,       /* arcs, circles */
+	OM_VIA      = 16,      /* vias and holes which are not part of a footprint */
+	OM_PIN      = 32,      /* pins/pads of a footprint */
+
+	OM_ANY      = 0xffff   /* shorthand for "find anything" */
+} layout_object_mask_t;
+gpmi_keyword *kw_layout_object_mask_e; /* of layout_object_mask_t */
+
+/* Which coordinate of the object is referenced */
+typedef enum layout_object_coord_e {
+/* X/Y coords */
+	OC_BX1 = 1, /* bounding box X1 */
+	OC_BX2 = 2, /* bounding box X2 */
+	OC_BY1 = 3, /* bounding box Y1 */
+	OC_BY2 = 4, /* bounding box Y2 */
+	OC_P1X = 5, /* point 1 X */
+	OC_P2X = 6, /* point 2 X */
+	OC_P1Y = 7, /* point 1 Y */
+	OC_P2Y = 8, /* point 2 Y */
+	OC_OBJ = 9, /* the whole object */
+
+/* point aliases for X/Y coords */
+	OC_P1  = 5, /* point 1 is P1X*/
+	OC_P2  = 6  /* point 2 is P2X */
+
+} layout_object_coord_t;
+gpmi_keyword *kw_layout_object_coord_e; /* of layout_object_coord_t */
+
+
+typedef enum layout_flag_e {
+	FL_NONE          = 0,
+	FL_SHOWNUMBER    = 0x00000001,
+	FL_LOCALREF      = 0x00000002,
+	FL_CHECKPLANS    = 0x00000004,
+	FL_SHOWDRC       = 0x00000008,
+	FL_RUBBERBAND    = 0x00000010,
+	FL_DESCRIPTION   = 0x00000020,
+	FL_NAMEONPCB     = 0x00000040,
+	FL_AUTODRC       = 0x00000080,
+	FL_ALLDIRECTION  = 0x00000100,
+	FL_SWAPSTARTDIR  = 0x00000200,
+	FL_UNIQUENAME    = 0x00000400,
+	FL_CLEARNEW      = 0x00000800,
+	FL_SNAPPIN       = 0x00001000,
+	FL_SHOWMASK      = 0x00002000,
+	FL_THINDRAW      = 0x00004000,
+	FL_ORTHOMOVE     = 0x00008000,
+	FL_LIVEROUTE     = 0x00010000,
+	FL_THINDRAWPOLY  = 0x00020000,
+	FL_LOCKNAMES     = 0x00040000,
+	FL_ONLYNAMES     = 0x00080000,
+	FL_NEWFULLPOLY   = 0x00100000,
+	FL_HIDENAMES     = 0x00200000,
+
+	FL_THERMALSTYLE1 = 0x08000000,
+	FL_THERMALSTYLE2 = 0x10000000,
+	FL_THERMALSTYLE3 = 0x20000000,
+	FL_THERMALSTYLE4 = 0x40000000,
+	FL_THERMALSTYLE5 = 0x80000000
+} layout_flag_t;
+gpmi_keyword *kw_layout_flag_e; /* of layout_flag_t */
+
+/* Layer type bitfield */
+typedef enum layer_flag_e {
+	LYT_TOP       = PCB_LYT_TOP,
+	LYT_BOTTOM    = PCB_LYT_BOTTOM,
+	LYT_INTERN    = PCB_LYT_INTERN,
+	LYT_LOGICAL   = PCB_LYT_LOGICAL,
+	LYT_ANYWHERE  = PCB_LYT_ANYWHERE,
+
+	LYT_COPPER    = PCB_LYT_COPPER,
+	LYT_SILK      = PCB_LYT_SILK,
+	LYT_MASK      = PCB_LYT_MASK,
+	LYT_PASTE     = PCB_LYT_PASTE,
+	LYT_OUTLINE   = PCB_LYT_OUTLINE,
+	LYT_RAT       = PCB_LYT_RAT,
+	LYT_INVIS     = PCB_LYT_INVIS,
+	LYT_ASSY      = PCB_LYT_ASSY,
+	LYT_FAB       = PCB_LYT_FAB,
+	LYT_PDRILL    = PCB_LYT_PDRILL,
+	LYT_UDRILL    = PCB_LYT_UDRILL,
+	LYT_ANYTHING  = PCB_LYT_ANYTHING,
+
+	LYT_VIRTUAL   = PCB_LYT_VIRTUAL,
+	LYT_ANYPROP   = PCB_LYT_ANYPROP 
+} layer_type_t;
+gpmi_keyword *kw_layer_flag_e; /* of layer_type_t */
+
+
+
+typedef struct layout_object_s {
+	layout_object_mask_t type;
+	union {
+		pcb_line_t    *l;
+		pcb_text_t    *t;
+		pcb_poly_t *p;
+		pcb_arc_t     *a;
+	} obj;
+	pcb_layer_id_t layer;
+} layout_object_t;
+
+
+typedef struct layout_search_s {
+	layout_object_mask_t searching; /* during the search, this field is used to communicate with the callback */
+	int used, alloced;
+	layout_object_t *objects;
+	int layer;
+} layout_search_t;
+
+/* -- search -- (search.c) */
+/* creates a new search and adds all objects that matches obj_types mask within the given rectangle on the current layer
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+     x1, y1, x2, y2: box the search is done within (PCB coords)
+   Returns the number of object on the search list. */
+int layout_search_box(const char *search_ID, layout_object_mask_t obj_types, int x1, int y1, int x2, int y2);
+
+/* creates a new search and adds all selected objects
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+   Returns the number of object on the search list. */
+int layout_search_selected(const char *search_ID, multiple layout_object_mask_t obj_types);
+
+/* creates a new search and adds all found objects (the green highlight)
+   Arguments:
+     search_ID: unique name of the search (overwrites existing search on the same name)
+     obj_types: on or more object types
+   Returns the number of object on the search list. */
+int layout_search_found(const char *search_ID, multiple layout_object_mask_t obj_types);
+
+/* Returns the nth object from a search list (or NULL pointer if n is beyond the list) */
+layout_object_t *layout_search_get(const char *search_ID, int n);
+
+/* Creates a new, empty search list. Useful for search list manipulation.
+   Returns 0 on succes. */
+int layout_search_empty(const char *search_ID);
+
+/* Frees all memory related to a search. Returns 0 on success.
+   Argument:
+     search_ID: unique name of the search (requires an existing search) */
+int layout_search_free(const char *search_ID);
+
+/* -- object accessors -- (object.c) */
+/* Return the requested coord of an object; except for the bounding box
+    coordinates, the meaning of coordinates are object-specific.
+    Point 1 and point 2 are usually endpoints of the object (line, arc),
+    "the whole object" coordinate is a central point. */
+int layout_obj_coord(layout_object_t *obj, layout_object_coord_t coord);
+
+/* Return the type of an object (always a single bit) */
+layout_object_mask_t layout_obj_type(layout_object_t *obj);
+
+/* Change location of an object or parts of the object (like move endpoint of a line);
+   Arguments:
+     obj: the object
+     coord: which coordinate to drag (e.g. move only the endpoint)
+     dx, dy: relative x and y coordinates the selected coordinate is displaced by
+   Returns 0 on success */
+int layout_obj_move(layout_object_t *obj, layout_object_coord_t coord, int dx, int dy);
+
+/* change angles of an arc; start and delate are relative if relative is non-zero; returns 0 on success */
+int layout_arc_angles(layout_object_t *obj, int relative, int start, int delta);
+
+/* -- create new objects -- (create.c) */
+/* if search_id is not empty, a referece to the new object is stored
+   on that search list and a persistent pointer is returned on success. If
+   search_id is empty, a temporary pointer is returned that should not be
+   used for anything else than checking against NULL. */
+
+/* create a line */
+layout_object_t *layout_create_line(const char *search_id, layer_id_t layer_id, int x1, int y1, int x2, int y2, int thickness, int clearance, multiple layout_flag_t flags);
+
+/* same as layout_create_line(), but appends the result to a list and
+   returns the index of the new object on the list (can be used as n for
+   layour_search_get)
+int layout_lcreate_line(const char *search_ID, int x1, int y1, int x2, int y2, int thickness, int clearance, multiple layout_flag_t flags);*/
+
+/* create a named via */
+layout_object_t *layout_create_via(const char *search_id, int x, int y, int thickness, int clearance, int mask, int hole, const char *name, multiple layout_flag_t flags);
+
+/* create a new arc; sa is start angle, dir is delta angle */
+layout_object_t *layout_create_arc(const char *search_id, layer_id_t layer_id, int x, int y, int width, int height, int sa, int dir, int thickness, int clearance, multiple layout_flag_t flags);
+
+/* create a new text (TODO) */
+layout_object_t *layout_create_text(const char *search_id, layer_id_t layer_id, int x, int y, int direction, int scale, const char *str, multiple layout_flag_t flags);
+
+/* -- layer manipulation -- (layers.c) */
+/* Field name of the layer structure */
+typedef enum layer_field_e {
+	LFLD_NUM_LINES,   /* number of lines on the layer */
+	LFLD_NUM_TEXTS,   /* number of texts on the layer */
+	LFLD_NUM_POLYS,   /* number of polygons on the layer */
+	LFLD_NUM_ARCS,    /* number of arcs on the layer */
+	LFLD_VISIBLE,     /* non-zero if the layer is visible */
+	LFLD_NODRC        /* non-zero if the layer doesn't use DRC */
+} layer_field_t;
+
+/* switch to layer (further layer-specific actions will take place there) */
+void layout_switch_to_layer(int layer);
+
+/* returns the number of the current layer */
+layer_id_t layout_get_current_layer();
+
+/* resolve layer number by name (case sensitive); returns negative number if not found */
+int layout_resolve_layer(const char *name);
+
+/* return the theoretical number of layers supported by PCB */
+int layout_get_max_possible_layer();
+
+/* return the actual number of layers on the current design */
+int layout_get_max_layer();
+
+/* return the name of a layer */
+const char *layout_layer_name(int layer);
+
+/* return the color of a layer */
+const char *layout_layer_color(int layer);
+
+/* return an integer field of a layer */
+int layout_layer_field(int layer, layer_field_t fld);
+
+
+/* -- page manipulation -- (page.c) */
+/* query or set width and height of the drawing */
+int layout_get_page_width();
+int layout_get_page_height();
+void layout_set_page_size(int width, int height);
+
+/* -- coordinate system -- (coord.c) */
+double mil2pcb_multiplier();
+double mm2pcb_multiplier();
+const char *current_grid_unit();
+
+typedef struct dctx_s {
+	void *hid;
+	void *gc;
+} dctx_t;
+
+/* -- draw on a GC -- */
+
+/* Debug draw style: set drawing color */
+void draw_set_color(dctx_t *ctx, const char *name);
+/*void set_line_cap(dctx_t *ctx, pcb_cap_style_t style_);*/
+
+/* Debug draw style: set line width */
+void draw_set_line_width(dctx_t *ctx, int width);
+
+/* Debug draw style: set whether drawing should happen in xor */
+void draw_set_draw_xor(dctx_t *ctx, int xor);
+
+/* Debug draw style: set whether drawing should happen in faded mode  */
+void draw_set_draw_faded(dctx_t *ctx, int faded);
+
+/* Debug draw: draw a line using the current style settings */
+void pcb_line_draw(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_);
+
+/*
+void pcb_arc_draw(dctx_t *ctx, int cx_, int cy_, int xradius_, int yradius_, double start_angle_, double delta_angle_);
+void draw_rect(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_);
+void fill_circle(dctx_t *ctx, int cx_, int cy_, int radius_);
+void fill_polygon(dctx_t *ctx, int n_ints_, int *x_, int *y_);
+void fill_pcb_polygon(dctx_t *ctx, pcb_poly_t *poly, const pcb_box_t *clip_box);
+void thindraw_pcb_polygon(dctx_t *ctx, pcb_poly_t *poly, const pcb_box_t *clip_box);
+void fill_rect(dctx_t *ctx, int x1_, int y1_, int x2_, int y2_);
+*/
+
+/* Returns 1 if flg is set in flags */
+int layer_flag_is_set(unsigned int flags, multiple layer_type_t flg);
+
+/* List layers IDs with exact match on flags. If idx is -1, return the
+   length of matches, else return the idxth match, */
+layer_id_t layer_list(multiple layer_type_t flags, int idx);
+
+/* List layers IDs with any match on flags. If idx is -1, return the
+   length of matches, else return the idxth match, */
+layer_id_t layer_list_any(multiple layer_type_t flags, int idx);
+
+/* Allocate a new UI layer */
+layer_id_t uilayer_alloc(const char *name, const char *color);
+
+/* Internal: */
+/* Append a newly created object to a search list or put it in a static var and
+   return the object */
+nowrap layout_object_t *search_persist_created(const char *search_id, pcb_layer_id_t layer, void *obj, layout_object_mask_t type);
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c	(revision 18980)
@@ -0,0 +1,130 @@
+#include <stdlib.h>
+#include <assert.h>
+#include "layout.h"
+#include "src/change.h"
+#include "src/board.h"
+#include "src/move.h"
+#include "src/conf_core.h"
+#include "src/layer.h"
+
+int layout_obj_coord(layout_object_t *obj, layout_object_coord_t coord)
+{
+	pcb_any_obj_t *o;
+
+	if (obj == NULL)
+		return -1;
+
+	o = (pcb_any_obj_t *)obj->obj.l;
+
+	/* bounding box is the same for any type */
+	switch (coord) {
+		case OC_BX1: return o->BoundingBox.X1;
+		case OC_BX2: return o->BoundingBox.X2;
+		case OC_BY1: return o->BoundingBox.Y1;
+		case OC_BY2: return o->BoundingBox.Y2;
+		case OC_OBJ: return -1;
+		default: /* avoids warnings for unhandled requests we handle later, per object type */
+			;
+	}
+
+	switch(obj->type) {
+		case OM_LINE:
+			switch (coord) {
+				case OC_P1X: return obj->obj.l->Point1.X;
+				case OC_P2X: return obj->obj.l->Point2.X;
+				case OC_P1Y: return obj->obj.l->Point1.Y;
+				case OC_P2Y: return obj->obj.l->Point2.Y;
+				default: /* avoids warnings for unhandled requests we handled above */
+				;
+			}
+			break;
+		case OM_TEXT:
+			switch (coord) {
+				case OC_P1X:
+				case OC_P2X: return obj->obj.t->X;
+				case OC_P1Y:
+				case OC_P2Y: return obj->obj.t->Y;
+				default: /* avoids warnings for unhandled requests we handled above */
+				;
+			}
+			break;
+	}
+
+	return -1;
+}
+
+layout_object_mask_t layout_obj_type(layout_object_t *obj)
+{
+	if (obj == NULL)
+		return 0;
+	return obj->type;
+}
+
+int layout_obj_move(layout_object_t *obj, layout_object_coord_t coord, int dx, int dy)
+{
+	void *what = NULL;;
+	pcb_layer_t *ly;
+
+	if (obj == NULL)
+		return -1;
+
+	ly = pcb_get_layer(PCB->Data, obj->layer);
+	if (ly == NULL)
+		return -1;
+
+	switch(obj->type) {
+		case OM_LINE:
+			switch(coord) {
+				case OC_OBJ:
+					pcb_move_obj(PCB_OBJ_LINE_POINT, ly, obj->obj.l, &(obj->obj.l->Point2), dx, dy);
+					/* intended falltrough */
+				case OC_P1X:
+				case OC_P1Y: what = &(obj->obj.l->Point1); break;
+				case OC_P2X:
+				case OC_P2Y: what = &(obj->obj.l->Point2); break;
+				default: /* we do not handle anything else for now */
+					;
+			}
+			pcb_move_obj(PCB_OBJ_LINE_POINT, ly, obj->obj.l, what, dx, dy);
+			return 0;
+		case OM_TEXT:
+			pcb_move_obj(PCB_OBJ_TEXT, ly, obj->obj.t, obj->obj.t, dx, dy);
+			return 0;
+		case OM_ARC:
+			switch(coord) {
+				case OC_OBJ:
+					pcb_move_obj(PCB_OBJ_ARC, ly, obj->obj.a, obj->obj.a, dx, dy);
+					return 0;
+				default: /* we do not handle anything else for now */
+					;
+			}
+			/*TODO: move endpoints! */
+			break;
+		case OM_POLYGON:
+			if (obj->layer != -1) {
+				pcb_move_obj(PCB_OBJ_POLY, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy);
+				return 0;
+			}
+	}
+	return -1;
+}
+
+int layout_arc_angles(layout_object_t *obj, int relative, int start, int delta)
+{
+	pcb_layer_t *ly;
+
+	ly = pcb_get_layer(PCB->Data, obj->layer);
+	if (ly == NULL)
+		return -1;
+
+	if (obj == NULL)
+		return -1;
+	if (obj->type != OM_ARC)
+		return 1;
+	if (relative) {
+		start += obj->obj.a->StartAngle;
+		delta += obj->obj.a->Delta;
+	}
+	pcb_arc_set_angles(ly, obj->obj.a, start, delta);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/page.c	(revision 18980)
@@ -0,0 +1,19 @@
+#include "layout.h"
+#include "src/board.h"
+#include "src/change.h"
+
+int layout_get_page_width()
+{
+	return PCB->MaxWidth;
+}
+
+int layout_get_page_height()
+{
+	return PCB->MaxHeight;
+}
+
+void layout_set_page_size(int width, int height)
+{
+	pcb_board_resize(MIN(PCB_MAX_COORD, MAX(width, PCB_MIN_SIZE)), MIN(PCB_MAX_COORD, MAX(height, PCB_MIN_SIZE)));
+}
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/search.c	(revision 18980)
@@ -0,0 +1,203 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "src/board.h"
+#include "src/conf_core.h"
+#include "src/layer.h"
+#include "layout.h"
+#include "config.h"
+
+static inline layout_object_t *search_append(layout_search_t *s, void *obj)
+{
+	layout_object_t *o;
+	if (s->used >= s->alloced) {
+		s->alloced += 256;
+		s->objects = realloc(s->objects, s->alloced * sizeof(layout_object_t));
+	}
+	o = s->objects + s->used;
+	s->used++;
+	o->type = s->searching;
+	o->layer = s->layer;
+	switch(s->searching) {
+		case OM_LINE:     o->obj.l   = obj; break;
+		case OM_TEXT:     o->obj.t   = obj; break;
+		case OM_POLYGON:  o->obj.p   = obj; break;
+		case OM_ARC:      o->obj.a   = obj; break;
+		default:
+			assert(!"Unimplemented object type");
+	}
+	return o;
+}
+
+static pcb_r_dir_t search_callback (const pcb_box_t * b, void *cl)
+{
+	search_append(cl, (void *)b);
+  return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+hash_t *layout_searches = NULL;
+static layout_search_t *new_search(const char *search_ID)
+{
+	layout_search_t *s;
+	layout_search_free(search_ID);
+
+	if (layout_searches == NULL) {
+		layout_searches = hash_create(64, gpmi_hash_ptr);
+		assert(layout_searches != NULL);
+	}
+
+	s = calloc(sizeof(layout_search_t), 1);
+
+	hash_store(layout_searches, search_ID, s);
+	return s;
+}
+
+int layout_search_empty(const char *search_ID)
+{
+	layout_search_t *s = new_search(search_ID);
+	if (s != NULL)
+		return 0;
+	return -1;
+}
+
+
+int layout_search_box(const char *search_ID, layout_object_mask_t obj_types, int x1, int y1, int x2, int y2)
+{
+  pcb_box_t spot;
+	layout_search_t *s = new_search(search_ID);
+
+	spot.X1 = x1;
+	spot.Y1 = y1;
+	spot.X2 = x2;
+	spot.Y2 = y2;
+
+	s->layer = -1;
+	if (obj_types & OM_LINE) {
+		s->searching = OM_LINE;
+		pcb_r_search(CURRENT->line_tree, &spot, NULL, search_callback, s, NULL);
+	}
+
+	if (obj_types & OM_TEXT) {
+		s->searching = OM_TEXT;
+		pcb_r_search(CURRENT->text_tree, &spot, NULL, search_callback, s, NULL);
+	}
+
+	if (obj_types & OM_ARC) {
+		s->searching = OM_ARC;
+		pcb_r_search(CURRENT->arc_tree, &spot, NULL, search_callback, s, NULL);
+	}
+
+	if (obj_types & OM_POLYGON) {
+		s->searching = OM_POLYGON;
+		for (s->layer = 0; s->layer < PCB_MAX_LAYER; s->layer++)
+			pcb_r_search(PCB->Data->Layer[s->layer].polygon_tree, &spot, NULL, search_callback, s, NULL);
+		s->layer = -1;
+	}
+
+	return s->used;
+}
+
+/* PCB_FLAG_SELECTED */
+
+typedef struct {
+	int flag;
+	layout_search_t *search;
+} select_t;
+
+static void select_cb(void *obj_, void *ud)
+{
+	select_t *ctx = ud;
+	pcb_any_obj_t *obj = obj_;
+	if (PCB_FLAG_TEST(ctx->flag, obj))
+		search_append(ctx->search, obj);
+}
+
+#define select2(s, om, flag, lst) \
+	do { \
+		gdl_iterator_t it; \
+		void *item; \
+		select_t ctx; \
+		ctx.flag = flag; \
+		ctx.search = s; \
+		s->searching = om; \
+		linelist_foreach(lst, &it, item) select_cb(item, &ctx); \
+		s->searching = 0; \
+	} while(0)
+
+static int layout_search_flag(const char *search_ID, multiple layout_object_mask_t obj_types, int flag)
+{
+	pcb_cardinal_t l, n;
+	layout_search_t *s = new_search(search_ID);
+	pcb_layer_t *layer = PCB->Data->Layer;
+
+	for (l =0; l < PCB_MAX_LAYER; l++, layer++) {
+		s->layer = l;
+		select2(s, OM_ARC,     flag, &layer->Arc);
+		select2(s, OM_LINE,    flag, &layer->Line);
+		select2(s, OM_TEXT,    flag, &layer->Text);
+		select2(s, OM_POLYGON, flag, &layer->Polygon);
+	}
+
+	return s->used;
+}
+#undef select
+
+int layout_search_selected(const char *search_ID, multiple layout_object_mask_t obj_types)
+{
+	return layout_search_flag(search_ID, obj_types, PCB_FLAG_SELECTED);
+}
+
+int layout_search_found(const char *search_ID, multiple layout_object_mask_t obj_types)
+{
+	return layout_search_flag(search_ID, obj_types, PCB_FLAG_FOUND);
+}
+
+layout_object_t *layout_search_get(const char *search_ID, int n)
+{
+	const layout_search_t *s;
+
+	s = hash_find(layout_searches, search_ID);
+
+/*	printf("s=%p\n", (void *)s);*/
+	if ((s == NULL) || (n < 0) || (n >= s->used))
+		return NULL;
+	return s->objects+n;
+}
+
+int layout_search_free(const char *search_ID)
+{
+	layout_search_t *s;
+
+	if (layout_searches == NULL)
+		return 1;
+
+	s = (layout_search_t *)hash_find(layout_searches, search_ID);
+	if (s != NULL) {
+		hash_del_key(layout_searches, search_ID);
+		free(s->objects);
+		free(s);
+		return 0;
+	}
+	return 2;
+}
+
+
+layout_object_t *search_persist_created(const char *search_id, pcb_layer_id_t layer, void *obj, layout_object_mask_t type)
+{
+	layout_search_t *s = NULL;
+	static layout_object_t temp;
+
+	if ((search_id != NULL) && (*search_id != '\0'))
+		s = (layout_search_t *)hash_find(layout_searches, search_id);
+
+	if (s == NULL) {
+		temp.layer = layer;
+		temp.obj.l = obj;
+		temp.type = type;
+		return &temp;
+	}
+	s->searching = type;
+	s->layer = layer;
+	return search_append(s, obj);
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(revision 18980)
@@ -0,0 +1,272 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/misc_util.h"
+#include "src/compat_misc.h"
+#include "src/conf_core.h"
+#include "src/event.h"
+#include "src/paths.h"
+#include "src/error.h"
+#include "src/plugins.h"
+#include "src/actions.h"
+#include "scripts.h"
+#include "manage_scripts.h"
+
+const char *gpmi_cookie = "GPMI plugin cookie";
+
+/* This function is used to print a detailed GPMI error message */
+void gpmi_hid_print_error(gpmi_err_stack_t *entry, char *string)
+{
+	pcb_message(PCB_MSG_ERROR, "[GPMI] %s\n", string);
+}
+
+static void start_timer(void);
+static void timer_cb(pcb_hidval_t hv)
+{
+	static int mono = 0;
+	hid_gpmi_script_info_t *i;
+	for(i = hid_gpmi_script_info; i != NULL; i = i->next)
+		gpmi_call_RunTick(i->module, mono++);
+	start_timer();
+}
+
+static void start_timer(void)
+{
+	pcb_hidval_t hv;
+	pcb_gui->add_timer(timer_cb, 100, hv);
+}
+
+int gpmi_hid_gui_inited = 0;
+static void ev_gui_init(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	int ev;
+	char *ev_args;
+	hid_gpmi_script_info_t *i;
+	const char *menu = "/main_menu/Plugins/GPMI scripting/Scripts";
+	pcb_menu_prop_t mp;
+
+	memset(&mp, 0, sizeof(mp));
+	mp.action = "gpmi_scripts()";
+	mp.mnemonic = "S";
+	mp.accel = "<Key>p;<key>g;<key>s";
+	mp.tip = "Manage GPMI scripts";
+	mp.cookie = gpmi_cookie;
+
+	pcb_gui->create_menu(menu, &mp);
+
+	ev = gpmi_event_find("ACTE_gui_init", &ev_args);
+	if (ev >= 0) {
+		for(i = hid_gpmi_script_info; i != NULL; i = i->next)
+			if (i->module != NULL)
+				gpmi_event(i->module, ev, argc, argv);
+	}
+	gpmi_hid_gui_inited = 1;
+
+	start_timer();
+}
+
+static void cmd_reload(const char *name)
+{
+	hid_gpmi_script_info_t *i;
+	if (name != NULL) {
+		i = hid_gpmi_lookup(name);
+		if (i != NULL)
+			hid_gpmi_reload_module(i);
+		else
+			pcb_message(PCB_MSG_ERROR, "Script %s not found\n", name);
+	}
+	else {
+		for(i = hid_gpmi_script_info; i != NULL; i = i->next)
+			hid_gpmi_reload_module(i);
+	}
+}
+static const char pcb_acts_gpmi_scripts[] = "TODO";
+static const char pcb_acth_gpmi_scripts[] = "Manage gpmi scripts";
+static fgw_error_t pcb_act_gpmi_scripts(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd = NULL, *arg = NULL, *arg2 = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, gpmi_scripts, cmd = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, gpmi_scripts, arg = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, gpmi_scripts, arg2 = argv[3].val.str);
+
+	if (cmd == NULL) {
+		gpmi_hid_manage_scripts();
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+	if (pcb_strcasecmp(cmd, "reload") == 0) {
+		if (arg != NULL)
+			cmd_reload(arg);
+		else
+			cmd_reload(NULL);
+	}
+	else if (pcb_strcasecmp(cmd, "load") == 0) {
+		if (arg2 != NULL) {
+			if (hid_gpmi_load_module(NULL, arg, arg2, NULL) == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Failed to load %s %s\n", arg, arg2);
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+		}
+		else
+			return FGW_ERR_ARGC;
+	}
+	else if (pcb_strcasecmp(cmd, "unload") == 0) {
+		if (argc == 3) {
+			hid_gpmi_script_info_t *i = hid_gpmi_lookup(arg);
+			if (i != NULL) {
+				if (gpmi_hid_script_unload(i) != 0) {
+					pcb_message(PCB_MSG_ERROR, "Failed to unload %s\n", arg);
+					PCB_ACT_IRES(1);
+					return 0;
+				}
+			}
+			else {
+				pcb_message(PCB_MSG_ERROR, "Failed to unload %s: not loaded\n", arg);
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+		}
+		else
+			return FGW_ERR_ARGC;
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Invalid arguments in gpmi_scripts()\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static fgw_error_t pcb_act_gpmi_rehash(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	cmd_reload(NULL);
+	return 0;
+}
+
+static void register_actions()
+{
+	static pcb_action_t act1, act2;
+
+	act1.name           = "gpmi_scripts";
+	act1.description    = pcb_acth_gpmi_scripts;
+	act1.syntax         = pcb_acts_gpmi_scripts;
+	act1.trigger_cb     = pcb_act_gpmi_scripts;
+	pcb_register_action(&act1, gpmi_cookie);
+
+	act2.name           = "rehash";
+	act2.description    = "Reload all gpmi scripts";
+	act2.syntax         = "TODO";
+	act2.trigger_cb     = pcb_act_gpmi_rehash;
+	pcb_register_action(&act2, gpmi_cookie);
+}
+
+static gpmi_package *pkg_scripts = NULL;
+
+static void load_base_and_cfg(void)
+{
+	char *dir, *libdirg, *libdirh, *wdir, *wdirh, *hdirh;
+	const char *home;
+	void **gpmi_asm_scriptname;
+
+	libdirg = pcb_path_resolve_inplace(pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S "plugins", NULL), 0);
+	libdirh = pcb_path_resolve_inplace(pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S "plugins" PCB_DIR_SEPARATOR_S, HOST, NULL), 0);
+	wdirh = pcb_path_resolve_inplace(pcb_concat("plugins" PCB_DIR_SEPARATOR_S, HOST, NULL), 0);
+	wdir = pcb_concat("plugins", NULL);
+
+	home = getenv ("PCB_RND_GPMI_HOME");
+	if (home == NULL)
+		home = conf_core.rc.path.home;
+
+	hdirh = pcb_path_resolve_inplace(pcb_concat(home, PCB_DIR_SEPARATOR_S ".pcb" PCB_DIR_SEPARATOR_S "plugins" PCB_DIR_SEPARATOR_S, HOST, NULL), 0);
+
+	pcb_message(PCB_MSG_DEBUG, "gpmi dirs: lg=%s lh=%s wh=%s w=%s hh=%s\n", libdirg, libdirh, wdirh, wdir, hdirh);
+
+	/* first add package search path to all host-specific plugin dirs
+	   This is needed because a script installed in ~/.pcb/plugins/ *.conf
+	   (added automatically from, the gui)
+	   could depend on a package being anywhere else
+	*/
+	gpmi_path_insert(GPMI_PATH_PACKAGES, libdirh);
+	gpmi_path_insert(GPMI_PATH_PACKAGES, libdirg);
+	gpmi_path_insert(GPMI_PATH_PACKAGES, wdirh);
+	gpmi_path_insert(GPMI_PATH_PACKAGES, hdirh);
+
+	/* the final fallback - append this as loading anything from here is arch-unsafe */
+	gpmi_path_append(GPMI_PATH_PACKAGES, wdir);
+
+
+	gpmi_err_stack_enable();
+	if (gpmi_pkg_load("gpmi_scripts", 0, NULL, NULL, &pkg_scripts))
+	{
+		gpmi_err_stack_process_str(gpmi_hid_print_error);
+		abort();
+	}
+	gpmi_err_stack_destroy(NULL);
+
+
+	gpmi_asm_scriptname = gpmi_pkg_resolve(pkg_scripts, "gpmi_scripts_asm_scriptname");
+	assert(gpmi_asm_scriptname != NULL);
+	*gpmi_asm_scriptname = gpmi_hid_asm_scriptname;
+
+	register_actions();
+	pcb_event_bind(PCB_EVENT_GUI_INIT, ev_gui_init, NULL, gpmi_cookie);
+
+	hid_gpmi_load_dir(libdirh, 0);
+	hid_gpmi_load_dir(libdirg, 0);
+
+	dir = pcb_concat(PCBLIBDIR, PCB_DIR_SEPARATOR_S "plugins", NULL);
+	hid_gpmi_load_dir(dir, 1);
+	free(dir);
+
+	if (home != NULL) {
+		hid_gpmi_load_dir (hdirh, 0);
+
+		dir = pcb_path_resolve_inplace(pcb_concat(home, PCB_DIR_SEPARATOR_S ".pcb" PCB_DIR_SEPARATOR_S "plugins", NULL), 0);
+		hid_gpmi_load_dir(dir, 1);
+		free(dir);
+	}
+
+	hid_gpmi_load_dir(wdirh, 0);
+	hid_gpmi_load_dir(wdir, 0);
+
+	free(wdir);
+	free(wdirh);
+	free(libdirg);
+	free(libdirh);
+	free(hdirh);
+}
+
+int pplg_check_ver_gpmi(int ver_needed)
+{
+	return 0;
+}
+
+void pplg_uninit_gpmi(void)
+{
+	pcb_event_unbind_allcookie(gpmi_cookie);
+	pcb_remove_actions_by_cookie(gpmi_cookie);
+	hid_gpmi_script_info_uninit();
+	gpmi_pkg_unload(pkg_scripts);
+	gpmi_uninit();
+}
+
+int pplg_init_gpmi(void)
+{
+	gpmi_init();
+	load_base_and_cfg();
+	return 0;
+}
+
+/* Workaround: can't call it gpmi.so so basename is gpmi_plugin thus init name must be that too for the loader */
+int pplg_init_gpmi_plugin(void)
+{
+	PCB_API_CHK_VER;
+	return pplg_init_gpmi();
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.h	(revision 18980)
@@ -0,0 +1,4 @@
+extern const char *gpmi_cookie;
+extern int gpmi_hid_gui_inited; /* whether the pcb_gui is already initialized */
+void gpmi_hid_print_error(gpmi_err_stack_t *entry, char *string);
+
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.c	(revision 18980)
@@ -0,0 +1,244 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/misc_util.h"
+#include "src/event.h"
+#include "gpmi_plugin.h"
+#include "scripts.h"
+#include "src/hid_attrib.h"
+
+
+extern pcb_hid_t *pcb_gui;
+
+#define attr_make_label(attr, name_, help_) \
+do { \
+	memset((attr), 0, sizeof(pcb_hid_attribute_t)); \
+	(attr)->name         = name_; \
+	(attr)->help_text    = help_; \
+	(attr)->type         = PCB_HATT_LABEL; \
+} while(0)
+
+#define attr_make_label_str(attr, name1, name2, help_) \
+do { \
+	char *__names__; \
+	__names__ = pcb_concat(name1, name2, NULL); \
+	attr_make_label(attr, __names__, help_); \
+} while(0)
+
+
+#define attr_make_enum(attr, name_, help_, enum_vals, default_item) \
+do { \
+	memset((attr), 0, sizeof(pcb_hid_attribute_t)); \
+	(attr)->name         = name_; \
+	(attr)->help_text    = help_; \
+	(attr)->type         = PCB_HATT_ENUM; \
+	(attr)->enumerations = enum_vals; \
+	(attr)->default_val.int_value = default_item; \
+} while(0)
+
+static hid_gpmi_script_info_t *choose_script(const char **operations, int *operation)
+{
+	pcb_hid_attribute_t attr[3];
+	pcb_hid_attr_val_t result[3];
+	char **scrl, **s;
+	hid_gpmi_script_info_t *i;
+	int n, res;
+
+	n = gpmi_hid_scripts_count();
+
+	scrl = malloc(sizeof(char *) * (n+1));
+	for(i = hid_gpmi_script_info, n = 0; i != NULL; i = i->next, n++) {
+		char *basename;
+
+		basename = strrchr(i->name, PCB_DIR_SEPARATOR_C);
+		if (basename == NULL)
+			basename = i->name;
+		else
+			basename++;
+
+		scrl[n] = pcb_concat(basename, "\t", i->module_name, NULL);
+	}
+	scrl[n] = NULL;
+
+	attr_make_enum(&attr[0],  "script", "Select an item from the list of scripts loaded", (const char **)scrl, -1);
+
+	if (operations != NULL)
+		attr_make_enum(&attr[1],  "operation", "Choose what to do with the script", operations, *operation);
+
+	res = pcb_attribute_dialog(attr, 1 + (operations != NULL), result, "GPMI manage scripts - select script", "Select one of the scripts already loaded", NULL);
+
+	/* free scrl slots before return */
+	for(s = scrl; *s != NULL; s++)
+		free(*s);
+
+	if (res) {
+		if (operation != NULL)
+			*operation = -1;
+		return NULL;
+	}
+
+	if ((operations != NULL) && (operation != NULL))
+		*operation = result[1].int_value;
+
+/*	printf("res=%d\n", result[0].int_value);*/
+
+	if (result[0].int_value != -1) {
+		for(i = hid_gpmi_script_info, n = result[0].int_value; i != NULL && n != 0; i = i->next, n--);
+/*		printf("name=%s\n", i->name);*/
+		return i;
+	}
+	return NULL;
+}
+
+static hid_gpmi_script_info_t *load_script(void)
+{
+	char *fn, *ext;
+	hid_gpmi_script_info_t *info;
+	int default_mod = -1;
+	pcb_hid_attribute_t attr[3];
+	pcb_hid_attr_val_t result[3];
+	char *exts[] = {
+		".tcl",    "tcl",
+		".lua",    "lua",
+		".awk",    "mawk",
+		".mawk",   "mawk",
+		".py",     "python",
+		".scm",    "scheme",
+		".rb",     "mruby",
+		".ruby",   "mruby",
+		".st",     "stutter",
+		".pas",    "ghli",
+		".pl",     "perl",
+		".php",    "php",
+		".sh",     "cli",
+		".bash",   "cli",
+		NULL,      NULL
+	};
+	const char *modules[] = { "tcl", "lua", "mawk", "python","scheme", "mruby",
+	                          "stutter", "ghli", "perl", "php", "cli", NULL };
+
+
+	fn = pcb_gui->fileselect("Load script", "Load a GPMI script", NULL, NULL, "gpmi_load_script", HID_FILESELECT_READ);
+
+	if (fn == NULL)
+		return NULL;
+
+	ext = strrchr(fn, '.');
+	if (ext != NULL) {
+		char **s;
+		const char **i;
+		/* find the extension in the extension->module pairs */
+		for(s = exts; s[0] != NULL; s+=2)
+			if (strcmp(ext, s[0]) == 0)
+				break;
+
+		/* if found, look up the "default enum value" for that module */
+		if (s[1] != NULL) {
+			int n;
+			for(i = modules, n = 0; *i != NULL; i++,n++) {
+				if (strcmp(*i, s[1]) == 0) {
+					default_mod = n;
+					break;
+				}
+			}
+		}
+	}
+
+	attr_make_enum(&attr[0],  "module", "Select a GPMI module to interpret the script", modules, default_mod);
+
+	if (pcb_attribute_dialog(attr, 1, result, "GPMI manage scripts - select module", "Select one of GPMI modules to interpret the script", NULL))
+		return NULL;
+
+	if (result[0].int_value < 0)
+		return NULL;
+
+	info = hid_gpmi_load_module(NULL, modules[result[0].int_value], fn, NULL);
+	if (info == NULL)
+		pcb_gui->report_dialog("GPMI script load", "Error loading the script.\nPlease consult the message log for details.");
+	return info;
+}
+
+static void script_details(hid_gpmi_script_info_t *i)
+{
+	pcb_hid_attribute_t attr[4];
+	pcb_hid_attr_val_t result[4];
+	char *cf;
+
+	cf = i->conffile_name == NULL ? "<none>" : i->conffile_name;
+
+
+	attr_make_label_str(&attr[0], "File name:   ", i->name, "File name of the script (if not absolute, it's relative to the config file)");
+	attr_make_label_str(&attr[1], "GPMI module: ", i->module_name, "Name of the GPMI module that is interpreting the script");
+	attr_make_label_str(&attr[2], "Config file: ", cf, "Name of config file that requested the script to be loaded ");
+	pcb_attribute_dialog(attr, 3, result, "GPMI manage scripts - script details", "Displaying detailed info on a script already loaded", NULL);
+	free((char *)attr[0].name);
+	free((char *)attr[1].name);
+	free((char *)attr[2].name);
+}
+
+void gpmi_hid_manage_scripts(void)
+{
+	hid_gpmi_script_info_t *i;
+	static const char *err_no_script = "Error: you didn't select a script";
+#define CONSULT "Please consult the message log for details."
+
+	const char *operations[] = {"show details...", "reload", "unload", "unload and remove from the config file", "load a new script...", "load a new script and add it in the config...", NULL};
+	int op = 0;
+	i = choose_script(operations, &op);
+	switch(op) {
+		case 0:
+			if (i != NULL)
+				script_details(i);
+			else
+				pcb_gui->report_dialog("GPMI script details", err_no_script);
+			break;
+		case 1:
+			if (i != NULL) {
+				i = hid_gpmi_reload_module(i);
+				if (i == NULL)
+					pcb_gui->report_dialog("GPMI script reload", "Error reloading the script.\nThe script is now unloaded.\n" CONSULT "\n(e.g. there may be syntax errors in the script source).");
+			}
+			else
+				pcb_gui->report_dialog("GPMI script reload", err_no_script);
+			break;
+		case 2:
+			if (i != NULL) {
+				if (gpmi_hid_script_unload(i) != 0)
+					pcb_gui->report_dialog("GPMI script unload", "Error unloading the script.\n" CONSULT "\n");
+			}
+			else
+				pcb_gui->report_dialog("GPMI script unload", err_no_script);
+			break;
+		case 3:
+			if (i != NULL) {
+				int r1, r2;
+				r1 = gpmi_hid_script_remove(i);
+				r2 = gpmi_hid_script_unload(i);
+				if (r1 || r2) {
+					char *msg;
+					msg = pcb_concat("Error:", 
+					             (r1 ? "couldnt't remove the script from the config file;" : ""), 
+					             (r2 ? "couldnt't unload the script;" : ""),
+					             "\n" CONSULT "\n", NULL);
+					pcb_gui->report_dialog("GPMI script unload and remove", msg);
+					free(msg);
+				}
+			else
+				pcb_gui->report_dialog("GPMI script unload and remove", err_no_script);
+			}
+			break;
+		case 4:
+			load_script();
+			break;
+		case 5:
+			i = load_script();
+			if (i != NULL) {
+				if (gpmi_hid_script_addcfg(i) != 0)
+					pcb_gui->report_dialog("GPMI script add to config", "Error adding the script in user configuration.\n" CONSULT "\n");
+			}
+			break;
+	}
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/manage_scripts.h	(revision 18980)
@@ -0,0 +1 @@
+void gpmi_hid_manage_scripts(void);
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.c
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.c	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.c	(revision 18980)
@@ -0,0 +1,387 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <gpmi.h>
+#include "src/global_typedefs.h"
+#include "src/misc_util.h"
+#include "src/event.h"
+#include "src/error.h"
+#include "gpmi_plugin.h"
+#include "scripts.h"
+#include "src/conf_core.h"
+#include "src/compat_fs.h"
+#include "src/compat_misc.h"
+#include "src/pcb-printf.h"
+#include "src/safe_fs.h"
+
+#define CONFNAME "pcb-rnd-gpmi.conf"
+
+hid_gpmi_script_info_t *hid_gpmi_script_info = NULL;
+
+int gpmi_hid_scripts_count()
+{
+	int n;
+	hid_gpmi_script_info_t *i;
+
+	for(i = hid_gpmi_script_info, n = 0; i != NULL; i = i->next, n++) ;
+
+	return n;
+}
+
+static void hid_gpmi_script_info_free(hid_gpmi_script_info_t *i)
+{
+	int ev;
+	char *ev_args;
+	ev = gpmi_event_find("ACTE_unload", &ev_args);
+	if (ev >= 0)
+		gpmi_event(i->module, ev, i->conffile_name);
+
+	gpmi_mod_unload(i->module);
+	free(i->name);
+	free(i->module_name);
+	free(i->conffile_name);
+}
+
+static hid_gpmi_script_info_t *hid_gpmi_script_info_add(hid_gpmi_script_info_t *i, gpmi_module *module, const char *name_, const char *module_name_, const char *conffile_name_)
+{
+	char *name, *module_name, *conffile_name;
+	/* make these copies before the free()'s because of reload calling us with
+	   the same pointers... */
+	name = pcb_strdup(name_);
+	module_name = pcb_strdup(module_name_);
+	if (conffile_name_ != NULL)
+		conffile_name = pcb_strdup(conffile_name_);
+	else
+		conffile_name = NULL;
+
+	if (i == NULL) {
+		i = malloc(sizeof(hid_gpmi_script_info_t));
+		i->next = hid_gpmi_script_info;
+		hid_gpmi_script_info = i;
+	}
+	else
+		hid_gpmi_script_info_free(i);
+
+	i->module = module;
+	i->name = name;
+	i->module_name = module_name;
+	i->conffile_name = conffile_name;
+	return i;
+}
+
+hid_gpmi_script_info_t *hid_gpmi_lookup(const char *name)
+{
+	hid_gpmi_script_info_t *i;
+	if (name == NULL)
+		return NULL;
+	for(i = hid_gpmi_script_info; i != NULL; i = i->next)
+		if (strcmp(name, i->name) == 0)
+			return i;
+	return NULL;
+}
+
+/* Unload a script and remove it from the list */
+static void hid_gpmi_script_info_del(hid_gpmi_script_info_t *inf)
+{
+	hid_gpmi_script_info_t *i, *prev;
+	prev = NULL;
+	for(i = hid_gpmi_script_info; i != NULL; prev = i, i = i->next) {
+		if (i == inf) {
+			/* unlink */
+			if (prev == NULL)
+				hid_gpmi_script_info = inf->next;
+			else
+				prev->next = inf->next;
+			hid_gpmi_script_info_free(inf);
+			free(inf);
+			return;
+		}
+	}
+}
+
+/* Unload all scripts and remove them from the list */
+void hid_gpmi_script_info_uninit(void)
+{
+	hid_gpmi_script_info_t *i, *next;
+
+	for(i = hid_gpmi_script_info; i != NULL; i = next) {
+		next = i->next;
+		hid_gpmi_script_info_free(i);
+		free(i);
+	}
+	hid_gpmi_script_info = NULL;
+}
+
+
+static const char *conf_dir = NULL;
+
+hid_gpmi_script_info_t *hid_gpmi_load_module(hid_gpmi_script_info_t *i, const char *module_name, const char *params, const char *config_file_name)
+{
+	gpmi_module *module;
+
+	pcb_message(PCB_MSG_INFO, "Loading GPMI module %s with params %s...\n", module_name, params);
+	module = gpmi_mod_load(module_name, params);
+	if (module == NULL) {
+		pcb_message(PCB_MSG_ERROR, " Failed loading the script. Details:\n");
+		gpmi_err_stack_process_str(gpmi_hid_print_error);
+	}
+	gpmi_err_stack_destroy(NULL);
+
+	if (module != NULL) {
+		hid_gpmi_script_info_t *ri;
+		int ev;
+
+		ri = hid_gpmi_script_info_add(i, module, params, module_name, config_file_name);
+		if ((ri != NULL) && (gpmi_hid_gui_inited)) {
+			char *ev_args;
+			/* If a script is loaded with a GUI already inited, send the event right after the load */
+			ev = gpmi_event_find("ACTE_gui_init", &ev_args);
+			gpmi_event(ri->module, ev, 0, NULL);
+		}
+		return ri;
+	}
+
+	return NULL;
+}
+
+hid_gpmi_script_info_t *hid_gpmi_reload_module(hid_gpmi_script_info_t *i)
+{
+	hid_gpmi_script_info_t *r;
+	const char *old_cd;
+
+	old_cd = conf_dir;
+
+	if (i->conffile_name != NULL) {
+		char *end;
+		conf_dir = pcb_strdup(i->conffile_name);
+		end = strrchr(conf_dir, PCB_DIR_SEPARATOR_C);
+		if (end == NULL) {
+			free((char *)conf_dir);
+			conf_dir = NULL;
+		}
+		else
+			*end = '\0';
+	}
+	else
+		conf_dir = NULL;
+
+	r = hid_gpmi_load_module(i, i->module_name, i->name, i->conffile_name);
+
+	if (conf_dir != NULL)
+		free((char *)conf_dir);
+	conf_dir = old_cd;
+
+	return r;
+}
+
+/* Read and parse gpmi config file fin;
+   if fout is NULL, take cfn as config name and load all modules, return number of modules loaded;
+   else write all lines to fout, but comment out the one whose second token matches cfn, return number of commented lines
+   
+*/
+
+static int cfgfile(FILE *fin, FILE *fout, char *cfn)
+{
+char line[1024], *module, *params, *s;
+	int found = 0;
+
+	while(!(feof(fin))) {
+		*line = '\0';
+		fgets(line, sizeof(line), fin);
+		switch(*line) {
+			case '\0':
+			case '\n':
+			case '\r':
+			case '#':
+				/* Empty line or comment */
+				if (fout != NULL)
+					fprintf(fout, "%s", line);
+				break;
+			default:
+				module = pcb_strdup(line);
+				params = module + strcspn(module, "\t ");
+				while((*params == ' ') || (*params == '\t')) {
+					*(params) = '\0';
+					params++;
+				}
+				s = strchr(params, '\n');
+				*s = '\0';
+				if (fout == NULL) {
+					fprintf(stderr, " ...loading %s %s\n", module, params);
+					hid_gpmi_load_module(NULL, module, params, cfn);
+					found++;
+				}
+				else {
+					if (strcmp(params, cfn) == 0) {
+						fprintf(fout, "# removed from pcb-rnd GUI: ");
+						found++;
+					}
+					if (fout != NULL)
+						fprintf(fout, "%s", line);
+				}
+				free(module);
+		}
+	}
+
+	return found;
+}
+
+void hid_gpmi_load_dir(const char *dir, int add_pkg_path)
+{
+	FILE *f;
+	char *cfn;
+
+	conf_dir = dir;
+	cfn = pcb_concat(dir, PCB_DIR_SEPARATOR_S, CONFNAME,  NULL);
+#ifdef CONFIG_DEBUG
+	fprintf(stderr, "pcb-gpmi: opening config: %s\n", cfn);
+#endif
+	f = pcb_fopen(cfn, "r");
+	if (f == NULL) {
+		free(cfn);
+#ifdef CONFIG_DEBUG
+		fprintf(stderr, " ...failed\n");
+#endif
+		return;
+	}
+
+	if (add_pkg_path)
+		gpmi_path_insert(GPMI_PATH_PACKAGES, dir);
+
+	cfgfile(f, NULL, cfn);
+
+	fclose(f);
+	free(cfn);
+	conf_dir = NULL;
+}
+
+/* Dummy script name generator allows loading from any path */
+char *gpmi_hid_asm_scriptname(const void *info, const char *file_name)
+{
+	char buffer[1024];
+	const char *cd;
+
+	switch(*file_name) {
+		case '~':
+			file_name += 2;
+			if (conf_core.rc.path.home != NULL) {
+				pcb_snprintf(buffer, sizeof(buffer), "%s%c%s", conf_core.rc.path.home, PCB_DIR_SEPARATOR_C, file_name);
+				fprintf(stderr, "asm_scriptname FN=%s\n", buffer);
+				return pcb_strdup(buffer);
+			}
+			else {
+				fprintf(stderr, "pcb-gpmi error: can't access $HOME for substituting ~\n");
+#ifdef CONFIG_DEBUG
+				printf("FN=%s\n", file_name);
+#endif
+				return pcb_strdup(file_name);
+			}
+		case PCB_DIR_SEPARATOR_C: /* full path */
+			return pcb_strdup(file_name);
+		default: /* relative path - must be relative to the current conf_dir */
+			if ((file_name[0] == '.') && (file_name[1] == PCB_DIR_SEPARATOR_C))
+				file_name += 2;
+			if (conf_dir == NULL)
+				cd = ".";
+			else
+				cd = conf_dir;
+			pcb_snprintf(buffer, sizeof(buffer), "%s%c%s", cd, PCB_DIR_SEPARATOR_C, file_name);
+#ifdef CONFIG_DEBUG
+			printf("FN=%s\n", buffer);
+#endif
+			return pcb_strdup(buffer);
+	}
+	return NULL;
+}
+
+int gpmi_hid_script_unload(hid_gpmi_script_info_t *i)
+{
+	hid_gpmi_script_info_del(i);
+	return 0;
+}
+
+int gpmi_hid_script_remove(hid_gpmi_script_info_t *i)
+{
+	FILE *fin, *fout;
+	char *tmpfn;
+	int res;
+
+	if (i->conffile_name == NULL) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_remove(): can't remove script from configs, the script is not loaded from a config.\n");
+		return -1;
+	}
+
+	fin = pcb_fopen(i->conffile_name, "r");
+	if (fin == NULL) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_remove(): can't remove script from configs, can't open %s for read.\n", i->conffile_name);
+		return -1;
+	}
+	tmpfn = pcb_concat(i->conffile_name, ".tmp", NULL);
+	fout = pcb_fopen(tmpfn, "w");
+	if (fout == NULL) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_remove(): can't remove script from configs, can't create %s.\n", tmpfn);
+		fclose(fin);
+		free(tmpfn);
+		return -1;
+	}
+
+	res = cfgfile(fin, fout, i->name);
+
+	fclose(fin);
+	fclose(fout);
+
+	if (res < 1) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_remove(): can't remove script from configs, can't find the correspondign config line in %s\n", i->conffile_name);
+		free(tmpfn);
+		return -1;
+	}
+
+	if (pcb_rename(tmpfn, i->conffile_name) != 0) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_remove(): can't remove script from configs, can't move %s to %s.\n", tmpfn, i->conffile_name);
+		free(tmpfn);
+		return -1;
+	}
+
+	free(tmpfn);
+	return 0;
+}
+
+int gpmi_hid_script_addcfg(hid_gpmi_script_info_t *i)
+{
+	char *fn;
+	const char *home;
+	FILE *f;
+
+	home = getenv ("PCB_RND_GPMI_HOME");
+	if (home == NULL)
+		home = conf_core.rc.path.home;
+
+	if (conf_core.rc.path.home != NULL) {
+		fn = pcb_concat(home, PCB_DIR_SEPARATOR_S ".pcb", NULL);
+		pcb_mkdir(fn, 0755);
+		free(fn);
+
+		fn = pcb_concat(home, PCB_DIR_SEPARATOR_S ".pcb" PCB_DIR_SEPARATOR_S "plugins", NULL);
+		pcb_mkdir(fn, 0755);
+		free(fn);
+		
+		fn = pcb_concat(home, PCB_DIR_SEPARATOR_S ".pcb" PCB_DIR_SEPARATOR_S "plugins" PCB_DIR_SEPARATOR_S, CONFNAME, NULL);
+	}
+	else
+		fn = pcb_concat("plugins" PCB_DIR_SEPARATOR_S, CONFNAME, NULL);
+
+	f = pcb_fopen(fn, "a");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "gpmi_hid_script_addcfg: can't open %s for write\n", fn);
+		return -1;
+	}
+
+	fprintf(f, "\n%s\t%s\n", i->module_name, i->name);
+	fclose(f);
+
+	free(fn);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.h
===================================================================
--- tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.h	(nonexistent)
+++ tags/2.0.1/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/scripts.h	(revision 18980)
@@ -0,0 +1,42 @@
+typedef struct hid_gpmi_script_info_s hid_gpmi_script_info_t;
+
+struct hid_gpmi_script_info_s {
+	char *name;
+	char *module_name;
+	char *conffile_name;
+	gpmi_module *module;
+	
+	hid_gpmi_script_info_t *next;
+};
+
+extern hid_gpmi_script_info_t *hid_gpmi_script_info;
+
+/* Load a GPMI module; if i is NULL, allocate a new slot on the list, else unload
+   i first and place the new module in place of i. */
+hid_gpmi_script_info_t *hid_gpmi_load_module(hid_gpmi_script_info_t *i, const char *module_name, const char *params, const char *config_file_name);
+
+/* Reload a script - useful if the source of the script has changed
+   Reloads a module already loaded; return NULL on error. */
+hid_gpmi_script_info_t *hid_gpmi_reload_module(hid_gpmi_script_info_t *i);
+
+/* look up a module by name - slow linear search */
+hid_gpmi_script_info_t *hid_gpmi_lookup(const char *name);
+
+void hid_gpmi_load_dir(const char *dir, int add_pkg_path);
+char *gpmi_hid_asm_scriptname(const void *info, const char *file_name);
+
+/* Return the number of scripts (gpmi modules) loaded */
+int gpmi_hid_scripts_count();
+
+/* Unload a script (also removes i from the list) - temporary effect,
+   the script will be loaded again on the next startup */
+int gpmi_hid_script_unload(hid_gpmi_script_info_t *i);
+
+/* Remove a script from the config file (but do not unload it now) */
+int gpmi_hid_script_remove(hid_gpmi_script_info_t *i);
+
+/* Edit a config file so that the script is in it */
+int gpmi_hid_script_addcfg(hid_gpmi_script_info_t *i);
+
+/* Uninit the script_info database, removing all scripts loaded */
+void hid_gpmi_script_info_uninit(void);
Index: tags/2.0.1/src_plugins/hid_batch/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_batch/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_batch/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_batch
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_batch/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_batch/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_batch/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {hid_batch}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/hid_batch/batch.o @]
+
+switch /local/pcb/hid_batch/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_batch/batch.c
===================================================================
--- tags/2.0.1/src_plugins/hid_batch/batch.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_batch/batch.c	(revision 18980)
@@ -0,0 +1,426 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "hid.h"
+#include "data.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "event.h"
+#include "conf_core.h"
+
+#include "hid_draw_helpers.h"
+#include "hid_nogui.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+
+static const char *batch_cookie = "batch HID";
+
+static void batch_begin(void);
+static void batch_end(void);
+
+/* This is a text-line "batch" HID, which exists for scripting and
+   non-GUI needs.  */
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+} hid_gc_s;
+
+static pcb_hid_attribute_t *batch_get_export_options(int *n_ret)
+{
+	if (n_ret != NULL)
+		*n_ret = 0;
+	return NULL;
+}
+
+static int batch_usage(const char *topic)
+{
+	fprintf(stderr, "\nbatch GUI command line arguments: none\n\n");
+	fprintf(stderr, "\nInvocation: pcb-rnd --gui batch [options]\n");
+	return 0;
+}
+
+
+/* ----------------------------------------------------------------------------- */
+
+static char *prompt = NULL;
+
+static void uninit_batch(void)
+{
+	pcb_remove_actions_by_cookie(batch_cookie);
+	pcb_event_unbind_allcookie(batch_cookie);
+	if (prompt != NULL) {
+		free(prompt);
+		prompt = NULL;
+	}
+}
+
+static void ev_pcb_changed(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (prompt != NULL)
+		free(prompt);
+	if (PCB && PCB->Filename) {
+		prompt = strrchr(PCB->Filename, '/');
+		if (prompt)
+			prompt++;
+		else
+			prompt = PCB->Filename;
+		if (prompt != NULL)
+			prompt = pcb_strdup(prompt);
+	}
+	else
+		prompt = pcb_strdup("no-board");
+}
+
+static fgw_error_t pcb_act_help(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_print_actions();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static fgw_error_t pcb_act_info(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int i, j;
+	if (!PCB || !PCB->Data || !PCB->Filename) {
+		printf("No PCB loaded.\n");
+		return 0;
+	}
+	printf("Filename: %s\n", PCB->Filename);
+	pcb_printf("Size: %ml x %ml mils, %mm x %mm mm\n", PCB->MaxWidth, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
+	for (i = 0; i < PCB_MAX_LAYER; i++) {
+		pcb_layergrp_id_t lg = pcb_layer_get_group(PCB, i);
+		unsigned int gflg = pcb_layergrp_flags(PCB, lg);
+		for (j = 0; j < PCB_MAX_LAYER; j++)
+			putchar(j == lg ? '#' : '-');
+		printf(" %c %s\n", (gflg & PCB_LYT_TOP) ? 'c' : (gflg & PCB_LYT_BOTTOM) ? 's' : '-', PCB->Data->Layer[i].name);
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t batch_action_list[] = {
+	{"Help", pcb_act_help},
+	{"Info", pcb_act_info}
+};
+
+PCB_REGISTER_ACTIONS(batch_action_list, batch_cookie)
+
+extern int isatty();
+
+/* ----------------------------------------------------------------------------- */
+static int batch_stay;
+static void batch_do_export(pcb_hid_attr_val_t * options)
+{
+	int interactive;
+	char line[1000];
+
+	batch_begin();
+
+	if (isatty(0))
+		interactive = 1;
+	else
+		interactive = 0;
+
+	if ((interactive) && (!conf_core.rc.quiet)) {
+		printf("Entering %s version %s batch mode.\n", PCB_PACKAGE, PCB_VERSION);
+		printf("See http://repo.hu/projects/pcb-rnd for project information\n");
+	}
+
+	batch_stay = 1;
+	while (batch_stay) {
+		if ((interactive) && (!conf_core.rc.quiet)) {
+			printf("%s:%s> ", prompt, pcb_cli_prompt(NULL));
+			fflush(stdout);
+		}
+		if (fgets(line, sizeof(line) - 1, stdin) == NULL) {
+			uninit_batch();
+			goto quit;
+		}
+		pcb_parse_command(line, pcb_false);
+	}
+
+	quit:;
+	batch_end();
+}
+
+static void batch_do_exit(pcb_hid_t *hid)
+{
+	batch_stay = 0;
+}
+
+static int batch_parse_arguments(int *argc, char ***argv)
+{
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static void batch_invalidate_lr(pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+{
+}
+
+static void batch_invalidate_all(void)
+{
+}
+
+static int batch_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	return 0;
+}
+
+static pcb_hid_gc_t batch_make_gc(void)
+{
+	static pcb_core_gc_t hc;
+	return (pcb_hid_gc_t)&hc;
+}
+
+static void batch_destroy_gc(pcb_hid_gc_t gc)
+{
+}
+
+static void batch_set_color(pcb_hid_gc_t gc, const char *name)
+{
+}
+
+static void batch_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+}
+
+static void batch_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+}
+
+static void batch_set_draw_xor(pcb_hid_gc_t gc, int xor_set)
+{
+}
+
+static void batch_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+}
+
+static void batch_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t end_angle)
+{
+}
+
+static void batch_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+}
+
+static void batch_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+}
+
+static void batch_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+}
+
+static void batch_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+}
+
+static void batch_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+}
+
+static void batch_calibrate(double xval, double yval)
+{
+}
+
+static int batch_shift_is_pressed(void)
+{
+	return 0;
+}
+
+static int batch_control_is_pressed(void)
+{
+	return 0;
+}
+
+static int batch_mod1_is_pressed(void)
+{
+	return 0;
+}
+
+static void batch_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+}
+
+static void batch_get_view_size(pcb_coord_t *width, pcb_coord_t *height)
+{
+	*width = PCB->MaxWidth;
+	*height = PCB->MaxHeight;
+}
+
+static void batch_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static pcb_hidval_t batch_add_timer(void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	pcb_hidval_t rv;
+	rv.lval = 0;
+	return rv;
+}
+
+static void batch_stop_timer(pcb_hidval_t timer)
+{
+}
+
+pcb_hidval_t
+batch_watch_file(int fd, unsigned int condition, pcb_bool (*func) (pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data),
+								 pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	ret.ptr = NULL;
+	return ret;
+}
+
+void batch_unwatch_file(pcb_hidval_t data)
+{
+}
+
+static pcb_hidval_t batch_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	ret.ptr = NULL;
+	return ret;
+}
+
+static void batch_stop_block_hook(pcb_hidval_t mlpoll)
+{
+}
+
+static int
+batch_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data)
+{
+	return 0;
+}
+
+static void batch_show_item(void *item)
+{
+}
+
+static void batch_create_menu(const char *menu_path, const pcb_menu_prop_t *props)
+{
+}
+
+static int batch_propedit_start(void *pe, int num_props, const char *(*query)(void *pe, const char *cmd, const char *key, const char *val, int idx))
+{
+	printf("propedit start %d\n", num_props);
+ 	return 0;
+}
+
+static void batch_propedit_end(void *pe)
+{
+	printf("propedit end\n");
+}
+
+static void *batch_propedit_add_prop(void *pe, const char *propname, int is_mutable, int num_vals)
+{
+	printf("  %s (%d) %s\n", propname, num_vals, is_mutable ? "mutable" : "immutable");
+	return NULL;
+}
+
+static void batch_propedit_add_value(void *pe, const char *propname, void *propctx, const char *value, int repeat_cnt)
+{
+	printf("    %s (%d)\n", value, repeat_cnt);
+}
+
+static void batch_propedit_add_stat(void *pe, const char *propname, void *propctx, const char *most_common, const char *min, const char *max, const char *avg)
+{
+	printf("    [%s|%s|%s|%s]\n", most_common, min, max, avg);
+}
+
+
+#include "dolists.h"
+
+static pcb_hid_t batch_hid;
+
+int pplg_check_ver_hid_batch(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_batch(void)
+{
+	pcb_event_unbind_allcookie(batch_cookie);
+	pcb_hid_remove_attributes_by_cookie(batch_cookie);
+}
+
+int pplg_init_hid_batch(void)
+{
+	PCB_API_CHK_VER;
+	memset(&batch_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&batch_hid);
+	pcb_dhlp_draw_helpers_init(&batch_hid);
+
+	batch_hid.struct_size = sizeof(pcb_hid_t);
+	batch_hid.name = "batch";
+	batch_hid.description = "Batch-mode GUI for non-interactive use.";
+	batch_hid.gui = 1;
+
+	batch_hid.get_export_options = batch_get_export_options;
+	batch_hid.do_export = batch_do_export;
+	batch_hid.do_exit = batch_do_exit;
+	batch_hid.parse_arguments = batch_parse_arguments;
+	batch_hid.invalidate_lr = batch_invalidate_lr;
+	batch_hid.invalidate_all = batch_invalidate_all;
+	batch_hid.set_layer_group = batch_set_layer_group;
+	batch_hid.make_gc = batch_make_gc;
+	batch_hid.destroy_gc = batch_destroy_gc;
+	batch_hid.set_color = batch_set_color;
+	batch_hid.set_line_cap = batch_set_line_cap;
+	batch_hid.set_line_width = batch_set_line_width;
+	batch_hid.set_draw_xor = batch_set_draw_xor;
+	batch_hid.draw_line = batch_draw_line;
+	batch_hid.draw_arc = batch_draw_arc;
+	batch_hid.draw_rect = batch_draw_rect;
+	batch_hid.fill_circle = batch_fill_circle;
+	batch_hid.fill_polygon = batch_fill_polygon;
+	batch_hid.fill_polygon_offs = batch_fill_polygon_offs;
+	batch_hid.fill_rect = batch_fill_rect;
+	batch_hid.calibrate = batch_calibrate;
+	batch_hid.shift_is_pressed = batch_shift_is_pressed;
+	batch_hid.control_is_pressed = batch_control_is_pressed;
+	batch_hid.mod1_is_pressed = batch_mod1_is_pressed;
+	batch_hid.get_coords = batch_get_coords;
+	batch_hid.get_view_size = batch_get_view_size;
+	batch_hid.set_crosshair = batch_set_crosshair;
+	batch_hid.add_timer = batch_add_timer;
+	batch_hid.stop_timer = batch_stop_timer;
+	batch_hid.watch_file = batch_watch_file;
+	batch_hid.unwatch_file = batch_unwatch_file;
+	batch_hid.add_block_hook = batch_add_block_hook;
+	batch_hid.stop_block_hook = batch_stop_block_hook;
+	batch_hid.attribute_dialog = batch_attribute_dialog;
+	batch_hid.show_item = batch_show_item;
+	batch_hid.create_menu = batch_create_menu;
+	batch_hid.usage = batch_usage;
+
+	batch_hid.propedit_start = batch_propedit_start;
+	batch_hid.propedit_end = batch_propedit_end;
+	batch_hid.propedit_add_prop = batch_propedit_add_prop;
+	batch_hid.propedit_add_value = batch_propedit_add_value;
+	batch_hid.propedit_add_stat = batch_propedit_add_stat;
+
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, batch_cookie);
+
+	pcb_hid_register_hid(&batch_hid);
+	return 0;
+}
+
+
+static void batch_begin(void)
+{
+	PCB_REGISTER_ACTIONS(batch_action_list, batch_cookie)
+}
+
+static void batch_end(void)
+{
+	pcb_remove_actions_by_cookie(batch_cookie);
+}
+
Index: tags/2.0.1/src_plugins/hid_batch/hid_batch.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_batch/hid_batch.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_batch/hid_batch.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class hid
+$short batch process (no-gui HID)
+$long HID without GUI: read actions from stdin.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_gtk2_gdk
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+put /local/pcb/mod {hid_gtk2_gdk}
+put /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/hid_gtk2_gdk/gtkhid-main.o
+	$(PLUGDIR)/hid_gtk2_gdk/gtkhid-gdk.o
+@]
+
+switch /local/pcb/hid_gtk2_gdk/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtk2/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtk2/ldflags
+	end
+end
+
+switch /local/pcb/hid_gtk2_gdk/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 18980)
@@ -0,0 +1,1646 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+
+#include "crosshair.h"
+#include "data.h"
+#include "layer.h"
+#include "grid.h"
+#include "hid_draw_helpers.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/coord_conv.h"
+#include "../src_plugins/lib_gtk_hid/preview_helper.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+#include "../src_plugins/lib_hid_common/clip.h"
+
+extern pcb_hid_t gtk2_gdk_hid;
+static void ghid_gdk_screen_update(void);
+
+/* Sets priv->u_gc to the "right" GC to use (wrt mask or window)
+*/
+#define USE_GC(gc)        if (!use_gc(gc, 1)) return
+#define USE_GC_NOPEN(gc)  if (!use_gc(gc, 0)) return
+
+typedef struct render_priv_s {
+	GdkGC *bg_gc;
+	GdkColor bg_color;
+	GdkGC *offlimits_gc;
+	GdkColor offlimits_color;
+	GdkGC *grid_gc;
+	GdkGC *clear_gc, *copy_gc;
+	GdkColor grid_color;
+	GdkRectangle clip_rect;
+	pcb_bool clip_rect_valid;
+	pcb_bool direct;
+	int attached_invalidate_depth;
+	int mark_invalidate_depth;
+
+	/* available canvases */
+	GdkPixmap *base_pixel;                  /* base canvas, pixel colors only */
+	GdkPixmap *sketch_pixel, *sketch_clip;  /* sketch canvas for compositing (non-direct) */
+
+	/* currently active: drawing routines draw to these*/
+	GdkDrawable *out_pixel, *out_clip;
+	GdkGC *pixel_gc, *clip_gc;
+	GdkColor clip_color;
+} render_priv_t;
+
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	GdkGC *pixel_gc;
+	GdkGC *clip_gc;
+
+	gchar *colorname;
+	pcb_coord_t width;
+	gint cap, join;
+	gchar xor_mask;
+	gint sketch_seq;
+} hid_gc_s;
+
+static void draw_lead_user(render_priv_t *priv_);
+
+static const gchar *get_color_name(pcb_gtk_color_t * color)
+{
+	static char tmp[16];
+
+	if (!color)
+		return "#000000";
+
+	sprintf(tmp, "#%2.2x%2.2x%2.2x", (color->red >> 8) & 0xff, (color->green >> 8) & 0xff, (color->blue >> 8) & 0xff);
+	return tmp;
+}
+
+/* Returns TRUE only if color_string has been allocated to color. */
+static pcb_bool map_color_string(const char *color_string, pcb_gtk_color_t * color)
+{
+	static GdkColormap *colormap = NULL;
+	pcb_bool parsed;
+
+	if (!color || !gport->top_window)
+		return FALSE;
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(gport->top_window);
+	if (color->red || color->green || color->blue)
+		gdk_colormap_free_colors(colormap, color, 1);
+	parsed = gdk_color_parse(color_string, color);
+	if (parsed)
+		gdk_color_alloc(colormap, color);
+
+	return parsed;
+}
+
+
+static int ghid_gdk_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	int idx = group;
+	if (idx >= 0 && idx < pcb_max_group(PCB)) {
+		int n = PCB->LayerGroups.grp[group].len;
+		for (idx = 0; idx < n - 1; idx++) {
+			int ni = PCB->LayerGroups.grp[group].lid[idx];
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].meta.real.vis)
+				break;
+		}
+		idx = PCB->LayerGroups.grp[group].lid[idx];
+	}
+
+	/* non-virtual layers with group visibility */
+	switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_MASK:
+		case PCB_LYT_PASTE:
+			return (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) && PCB->LayerGroups.grp[group].vis /*&& !pinout */ );
+	}
+
+	if (idx >= 0 && idx < pcb_max_layer && ((flags & PCB_LYT_ANYTHING) != PCB_LYT_SILK))
+		return /*pinout ? 1 : */ PCB->Data->Layer[idx].meta.real.vis;
+
+	/* virtual layers */
+	{
+		switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_INVIS:
+			return /* pinout ? 0 : */ PCB->InvisibleObjectsOn;
+		case PCB_LYT_SILK:
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) /*|| pinout */ )
+				return pcb_silk_on(PCB);
+			return 0;
+		case PCB_LYT_ASSY:
+			return 0;
+		case PCB_LYT_PDRILL:
+		case PCB_LYT_UDRILL:
+			return 1;
+		case PCB_LYT_UI:
+			return 1;
+		case PCB_LYT_RAT:
+			return PCB->RatOn;
+		}
+	}
+	return 0;
+}
+
+static void ghid_gdk_destroy_gc(pcb_hid_gc_t gc)
+{
+	if (gc->pixel_gc)
+		g_object_unref(gc->pixel_gc);
+	if (gc->clip_gc)
+		g_object_unref(gc->clip_gc);
+	if (gc->colorname != NULL)
+		g_free(gc->colorname);
+	g_free(gc);
+}
+
+static pcb_hid_gc_t ghid_gdk_make_gc(void)
+{
+	pcb_hid_gc_t rv;
+
+	rv = g_new0(hid_gc_s, 1);
+	rv->me_pointer = &gtk2_gdk_hid;
+	rv->colorname = g_strdup(conf_core.appearance.color.background);
+	return rv;
+}
+
+static void set_clip(render_priv_t *priv, GdkGC *gc)
+{
+	if (gc == NULL)
+		return;
+	if (priv->clip_rect_valid)
+		gdk_gc_set_clip_rectangle(gc, &priv->clip_rect);
+	else
+		gdk_gc_set_clip_mask(gc, NULL);
+}
+
+static inline void ghid_gdk_draw_grid_global(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	pcb_coord_t x, y, x1, y1, x2, y2, grd;
+	int n, i;
+	static GdkPoint *points = NULL;
+	static int npoints = 0;
+
+	x1 = pcb_grid_fit(MAX(0, SIDE_X(gport->view.x0)), PCB->Grid, PCB->GridOffsetX);
+	y1 = pcb_grid_fit(MAX(0, SIDE_Y(gport->view.y0)), PCB->Grid, PCB->GridOffsetY);
+	x2 = pcb_grid_fit(MIN(PCB->MaxWidth,  SIDE_X(gport->view.x0 + gport->view.width - 1)), PCB->Grid, PCB->GridOffsetX);
+	y2 = pcb_grid_fit(MIN(PCB->MaxHeight, SIDE_Y(gport->view.y0 + gport->view.height - 1)), PCB->Grid, PCB->GridOffsetY);
+
+	grd = PCB->Grid;
+
+	if (Vz(grd) < conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
+		if (!conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
+			return;
+		grd *= (conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
+	}
+
+	if (x1 > x2) {
+		pcb_coord_t tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+	if (y1 > y2) {
+		pcb_coord_t tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+	if (Vx(x1) < 0)
+		x1 += grd;
+	if (Vy(y1) < 0)
+		y1 += grd;
+	if (Vx(x2) >= gport->view.canvas_width)
+		x2 -= grd;
+	if (Vy(y2) >= gport->view.canvas_height)
+		y2 -= grd;
+
+
+	n = (x2 - x1) / grd + 1;
+	if (n > npoints) {
+		npoints = n + 10;
+		points = (GdkPoint *) realloc(points, npoints * sizeof(GdkPoint));
+	}
+	n = 0;
+	for (x = x1; x <= x2; x += grd) {
+		points[n].x = Vx(x);
+		n++;
+	}
+	if (n == 0)
+		return;
+	for (y = y1; y <= y2; y += grd) {
+		int vy = Vy(y);
+		for (i = 0; i < n; i++)
+			points[i].y = vy;
+		gdk_draw_points(priv->out_pixel, priv->grid_gc, points, n);
+	}
+}
+
+static void ghid_gdk_draw_grid_local_(pcb_coord_t cx, pcb_coord_t cy, int radius)
+{
+	render_priv_t *priv = gport->render_priv;
+	static GdkPoint *points_base = NULL;
+	static GdkPoint *points_abs = NULL;
+	static int apoints = 0, npoints = 0, old_radius = 0;
+	static pcb_coord_t last_grid = 0;
+	int recalc = 0, n, r2;
+	pcb_coord_t x, y;
+
+	/* PI is approximated with 3.25 here - allows a minimal overallocation, speeds up calculations */
+	r2 = radius * radius;
+	n = r2 * 3 + r2 / 4 + 1;
+	if (n > apoints) {
+		apoints = n;
+		points_base = (GdkPoint *) realloc(points_base, apoints * sizeof(GdkPoint));
+		points_abs  = (GdkPoint *) realloc(points_abs,  apoints * sizeof(GdkPoint));
+	}
+
+	if (radius != old_radius) {
+		old_radius = radius;
+		recalc = 1;
+	}
+
+	if (last_grid != PCB->Grid) {
+		last_grid = PCB->Grid;
+		recalc = 1;
+	}
+
+	/* reclaculate the 'filled circle' mask (base relative coords) if grid or radius changed */
+	if (recalc) {
+
+		npoints = 0;
+		for(y = -radius; y <= radius; y++) {
+			int y2 = y*y;
+			for(x = -radius; x <= radius; x++) {
+				if (x*x + y2 < r2) {
+					points_base[npoints].x = x*PCB->Grid;
+					points_base[npoints].y = y*PCB->Grid;
+					npoints++;
+				}
+			}
+		}
+	}
+
+	/* calculate absolute positions */
+	for(n = 0; n < npoints; n++) {
+		points_abs[n].x = Vx(points_base[n].x + cx);
+		points_abs[n].y = Vy(points_base[n].y + cy);
+	}
+
+	gdk_draw_points(priv->out_pixel, priv->grid_gc, points_abs, npoints);
+}
+
+
+static int grid_local_have_old = 0, grid_local_old_r = 0;
+static pcb_coord_t grid_local_old_x, grid_local_old_y;
+
+static void ghid_gdk_draw_grid_local(pcb_coord_t cx, pcb_coord_t cy)
+{
+	if (grid_local_have_old) {
+		ghid_gdk_draw_grid_local_(grid_local_old_x, grid_local_old_y, grid_local_old_r);
+		grid_local_have_old = 0;
+	}
+
+	if (!conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+		return;
+
+	if ((Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) || (!conf_core.editor.draw_grid))
+		return;
+
+	/* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */
+	cx = (cx / PCB->Grid) * PCB->Grid + PCB->GridOffsetX;
+	cy = (cy / PCB->Grid) * PCB->Grid + PCB->GridOffsetY;
+
+	grid_local_have_old = 1;
+	ghid_gdk_draw_grid_local_(cx, cy, conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
+	grid_local_old_x = cx;
+	grid_local_old_y = cy;
+	grid_local_old_r = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+}
+
+static void ghid_gdk_draw_grid(void)
+{
+	static GdkColormap *colormap = NULL;
+	render_priv_t *priv = gport->render_priv;
+
+	grid_local_have_old = 0;
+
+	if (!conf_core.editor.draw_grid)
+		return;
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(gport->top_window);
+
+	if (!priv->grid_gc) {
+		if (gdk_color_parse(conf_core.appearance.color.grid, &priv->grid_color)) {
+			priv->grid_color.red ^= priv->bg_color.red;
+			priv->grid_color.green ^= priv->bg_color.green;
+			priv->grid_color.blue ^= priv->bg_color.blue;
+			gdk_color_alloc(colormap, &priv->grid_color);
+		}
+		priv->grid_gc = gdk_gc_new(priv->out_pixel);
+		gdk_gc_set_function(priv->grid_gc, GDK_XOR);
+		gdk_gc_set_foreground(priv->grid_gc, &priv->grid_color);
+		gdk_gc_set_clip_origin(priv->grid_gc, 0, 0);
+		set_clip(priv, priv->grid_gc);
+	}
+
+	if (conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
+		ghid_gdk_draw_grid_local(grid_local_old_x, grid_local_old_y);
+		return;
+	}
+
+	ghid_gdk_draw_grid_global();
+}
+
+/* ------------------------------------------------------------ */
+static void ghid_gdk_draw_bg_image(void)
+{
+	static GdkPixbuf *pixbuf;
+	GdkInterpType interp_type;
+	gint src_x, src_y, dst_x, dst_y, w, h, w_src, h_src;
+	static gint w_scaled, h_scaled;
+	render_priv_t *priv = gport->render_priv;
+
+	if (!ghidgui->bg_pixbuf)
+		return;
+
+	src_x = gport->view.x0;
+	src_y = gport->view.y0;
+	dst_x = 0;
+	dst_y = 0;
+
+	if (src_x < 0) {
+		dst_x = -src_x;
+		src_x = 0;
+	}
+	if (src_y < 0) {
+		dst_y = -src_y;
+		src_y = 0;
+	}
+
+	w = PCB->MaxWidth / gport->view.coord_per_px;
+	h = PCB->MaxHeight / gport->view.coord_per_px;
+	src_x = src_x / gport->view.coord_per_px;
+	src_y = src_y / gport->view.coord_per_px;
+	dst_x = dst_x / gport->view.coord_per_px;
+	dst_y = dst_y / gport->view.coord_per_px;
+
+	if (w_scaled != w || h_scaled != h) {
+		if (pixbuf)
+			g_object_unref(G_OBJECT(pixbuf));
+
+		w_src = gdk_pixbuf_get_width(ghidgui->bg_pixbuf);
+		h_src = gdk_pixbuf_get_height(ghidgui->bg_pixbuf);
+		if (w > w_src && h > h_src)
+			interp_type = GDK_INTERP_NEAREST;
+		else
+			interp_type = GDK_INTERP_BILINEAR;
+
+		pixbuf = gdk_pixbuf_scale_simple(ghidgui->bg_pixbuf, w, h, interp_type);
+		w_scaled = w;
+		h_scaled = h;
+	}
+
+	if (pixbuf)
+		gdk_pixbuf_render_to_drawable(pixbuf, priv->out_pixel, priv->bg_gc, src_x, src_y, dst_x, dst_y, w - src_x, h - src_y, GDK_RGB_DITHER_NORMAL, 0, 0);
+}
+
+static pcb_composite_op_t curr_drawing_mode;
+
+static void ghid_sketch_setup(render_priv_t *priv)
+{
+	if (priv->sketch_pixel == NULL)
+		priv->sketch_pixel = gdk_pixmap_new(gtk_widget_get_window(gport->drawing_area), gport->view.canvas_width, gport->view.canvas_height, -1);
+	if (priv->sketch_clip == NULL)
+		priv->sketch_clip = gdk_pixmap_new(0, gport->view.canvas_width, gport->view.canvas_height, 1);
+
+	priv->out_pixel = priv->sketch_pixel;
+	priv->out_clip = priv->sketch_clip;
+}
+
+static void ghid_gdk_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if (!priv->base_pixel) {
+		abort();
+		return;
+	}
+
+	priv->direct = direct;
+
+	if (direct) {
+		priv->out_pixel = priv->base_pixel;
+		priv->out_clip = NULL;
+		curr_drawing_mode = PCB_HID_COMP_POSITIVE;
+		return;
+	}
+
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			ghid_sketch_setup(priv);
+
+		/* clear the canvas */
+			priv->clip_color.pixel = 0;
+			if (priv->clear_gc == NULL)
+				priv->clear_gc = gdk_gc_new(priv->out_clip);
+			gdk_gc_set_foreground(priv->clear_gc, &priv->clip_color);
+			set_clip(priv, priv->clear_gc);
+			gdk_draw_rectangle(priv->out_clip, priv->clear_gc, TRUE, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			priv->clip_color.pixel = 1;
+			break;
+
+		case PCB_HID_COMP_NEGATIVE:
+			priv->clip_color.pixel = 0;
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			if (priv->copy_gc == NULL)
+				priv->copy_gc = gdk_gc_new(priv->out_pixel);
+			gdk_gc_set_clip_mask(priv->copy_gc, priv->sketch_clip);
+			gdk_gc_set_clip_origin(priv->copy_gc, 0, 0);
+			gdk_draw_drawable(priv->base_pixel, priv->copy_gc, priv->sketch_pixel, 0, 0, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+
+			priv->out_pixel = priv->base_pixel;
+			priv->out_clip = NULL;
+			break;
+	}
+	curr_drawing_mode = op;
+}
+
+static void ghid_gdk_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	pcb_gui->coord_per_pix = gport->view.coord_per_px;
+}
+
+typedef struct {
+	int color_set;
+	GdkColor color;
+	int xor_set;
+	GdkColor xor_color;
+} ColorCache;
+
+
+	/* Config helper functions for when the user changes color preferences.
+	   |  set_special colors used in the gtkhid.
+	 */
+static void set_special_grid_color(void)
+{
+	render_priv_t *priv = gport->render_priv;
+
+          /* The color grid is combined with background color */
+	map_color_string(conf_core.appearance.color.grid, &priv->grid_color);
+	priv->grid_color.red = (priv->grid_color.red ^ priv->bg_color.red) & 0xFF;
+	priv->grid_color.green = (priv->grid_color.green ^ priv->bg_color.green) & 0xFF;
+	priv->grid_color.blue = (priv->grid_color.blue ^ priv->bg_color.blue) & 0xFF;
+
+	config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/grid"), -1);
+
+	if (priv->grid_gc)
+		gdk_gc_set_foreground(priv->grid_gc, &priv->grid_color);
+}
+
+static void ghid_gdk_set_special_colors(conf_native_t *cfg, int arr_idx)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.background) && priv->bg_gc) {
+		if (map_color_string(cfg->val.color[0], &priv->bg_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/background"), -1);
+			gdk_gc_set_foreground(priv->bg_gc, &priv->bg_color);
+			set_special_grid_color();
+		}
+	}
+	else if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.off_limit) && priv->offlimits_gc) {
+		if (map_color_string(cfg->val.color[0], &priv->offlimits_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/off_limit"), -1);
+			gdk_gc_set_foreground(priv->offlimits_gc, &priv->offlimits_color);
+		}
+	}
+	else if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.grid) && priv->grid_gc) {
+		if (map_color_string(cfg->val.color[0], &priv->grid_color)) {
+			conf_setf(CFR_DESIGN, "appearance/color/grid", -1, "%s", get_color_name(&priv->grid_color));
+			set_special_grid_color();
+		}
+	}
+}
+
+static void ghid_gdk_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	static void *cache = 0;
+	static GdkColormap *colormap = NULL;
+	render_priv_t *priv = gport->render_priv;
+	pcb_hidval_t cval;
+
+	if (name == NULL) {
+		fprintf(stderr, "ghid_gdk_set_color():  name = NULL, setting to magenta\n");
+		name = "magenta";
+	}
+
+	if (name != gc->colorname) {
+		if (gc->colorname != NULL)
+			g_free(gc->colorname);
+		gc->colorname = g_strdup(name);
+	}
+
+	if (!gc->pixel_gc)
+		return;
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(gport->top_window);
+
+	if (strcmp(name, "drill") == 0) {
+		gdk_gc_set_foreground(gc->pixel_gc, &priv->offlimits_color);
+	}
+	else {
+		ColorCache *cc;
+		if (pcb_hid_cache_color(0, name, &cval, &cache))
+			cc = (ColorCache *) cval.ptr;
+		else {
+			cc = (ColorCache *) malloc(sizeof(ColorCache));
+			memset(cc, 0, sizeof(*cc));
+			cval.ptr = cc;
+			pcb_hid_cache_color(1, name, &cval, &cache);
+		}
+
+		if (!cc->color_set) {
+			if (gdk_color_parse(name, &cc->color))
+				gdk_color_alloc(colormap, &cc->color);
+			else
+				gdk_color_white(colormap, &cc->color);
+			cc->color_set = 1;
+		}
+		if (gc->xor_mask) {
+			if (!cc->xor_set) {
+				cc->xor_color.red = cc->color.red ^ priv->bg_color.red;
+				cc->xor_color.green = cc->color.green ^ priv->bg_color.green;
+				cc->xor_color.blue = cc->color.blue ^ priv->bg_color.blue;
+				gdk_color_alloc(colormap, &cc->xor_color);
+				cc->xor_set = 1;
+			}
+			gdk_gc_set_foreground(gc->pixel_gc, &cc->xor_color);
+		}
+		else {
+			gdk_gc_set_foreground(gc->pixel_gc, &cc->color);
+		}
+	}
+}
+
+static void ghid_gdk_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	switch (style) {
+	case pcb_cap_round:
+		gc->cap = GDK_CAP_ROUND;
+		gc->join = GDK_JOIN_ROUND;
+		break;
+	case pcb_cap_square:
+		gc->cap = GDK_CAP_PROJECTING;
+		gc->join = GDK_JOIN_MITER;
+		break;
+	default:
+		assert(!"unhandled cap");
+		gc->cap = GDK_CAP_ROUND;
+		gc->join = GDK_JOIN_ROUND;
+	}
+	if (gc->pixel_gc)
+		gdk_gc_set_line_attributes(gc->pixel_gc, Vz(gc->width), GDK_LINE_SOLID, (GdkCapStyle) gc->cap, (GdkJoinStyle) gc->join);
+}
+
+static void ghid_gdk_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	/* If width is negative then treat it as pixel width, otherwise it is world coordinates. */
+	if(width < 0) {
+		gc->width = -width;
+		width = -width;
+	}
+	else {
+		gc->width = width;
+		width = Vz(width);
+	}
+
+	if (gc->pixel_gc)
+		gdk_gc_set_line_attributes(gc->pixel_gc, width, GDK_LINE_SOLID, (GdkCapStyle) gc->cap, (GdkJoinStyle) gc->join);
+	if (gc->clip_gc)
+		gdk_gc_set_line_attributes(gc->clip_gc, width, GDK_LINE_SOLID, (GdkCapStyle) gc->cap, (GdkJoinStyle) gc->join);
+}
+
+static void ghid_gdk_set_draw_xor(pcb_hid_gc_t gc, int xor_mask)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	gc->xor_mask = xor_mask;
+	if (gc->pixel_gc != NULL)
+		gdk_gc_set_function(gc->pixel_gc, xor_mask ? GDK_XOR : GDK_COPY);
+	if (gc->clip_gc != NULL)
+		gdk_gc_set_function(gc->clip_gc, xor_mask ? GDK_XOR : GDK_COPY);
+	ghid_gdk_set_color(gc, gc->colorname);
+
+	/* If not in direct mode then select the correct drawables so that the sketch and clip
+	 * drawables are not drawn to in XOR mode */
+	if (!priv->direct) {
+		/* If xor mode then draw directly to the base drawable */
+		if (xor_mask) {
+			priv->out_pixel = priv->base_pixel;
+			priv->out_clip = NULL;
+		}
+		else /* If not in direct mode then draw to the sketch and clip drawables */
+			ghid_sketch_setup(priv);
+	}
+}
+
+static int use_gc(pcb_hid_gc_t gc, int need_pen)
+{
+	render_priv_t *priv = gport->render_priv;
+	GdkWindow *window = gtk_widget_get_window(gport->top_window);
+	int need_setup = 0;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	if (gc->me_pointer != &gtk2_gdk_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to GTK HID\n");
+		abort();
+	}
+
+	if (!priv->base_pixel)
+		return 0;
+
+	if ((!gc->clip_gc) && (priv->out_clip != NULL)) {
+		gc->clip_gc = gdk_gc_new(priv->out_clip);
+		need_setup = 1;
+	}
+
+	if (!gc->pixel_gc) {
+		gc->pixel_gc = gdk_gc_new(window);
+		need_setup = 1;
+	}
+
+	if (need_setup) {
+		ghid_gdk_set_color(gc, gc->colorname);
+		ghid_gdk_set_line_width(gc, gc->core_gc.width);
+		if ((need_pen) || (gc->core_gc.cap != pcb_cap_invalid))
+			ghid_gdk_set_line_cap(gc, (pcb_cap_style_t) gc->core_gc.cap);
+		ghid_gdk_set_draw_xor(gc, gc->xor_mask);
+		gdk_gc_set_clip_origin(gc->pixel_gc, 0, 0);
+	}
+
+	if (priv->out_clip != NULL)
+		gdk_gc_set_foreground(gc->clip_gc, &priv->clip_color);
+
+	priv->pixel_gc = gc->pixel_gc;
+	priv->clip_gc = gc->clip_gc;
+	return 1;
+}
+
+static void ghid_gdk_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double dx1, dy1, dx2, dy2;
+	render_priv_t *priv = gport->render_priv;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	dx1 = Vx((double) x1);
+	dy1 = Vy((double) y1);
+
+	/* optimization: draw a single dot if object is too small */
+	if ((gc->core_gc.width > 0) && (pcb_gtk_1dot(gc->width, x1, y1, x2, y2))) {
+		if (pcb_gtk_dot_in_canvas(gc->width, dx1, dy1)) {
+			USE_GC(gc);
+			gdk_draw_point(priv->out_pixel, priv->pixel_gc, dx1, dy1);
+			if (priv->out_clip != NULL)
+				gdk_draw_point(priv->out_clip, priv->clip_gc, dx1, dy1);
+		}
+		return;
+	}
+
+	dx2 = Vx((double) x2);
+	dy2 = Vy((double) y2);
+
+	if (!pcb_line_clip(0, 0, gport->view.canvas_width, gport->view.canvas_height, &dx1, &dy1, &dx2, &dy2, gc->width / gport->view.coord_per_px))
+		return;
+
+	USE_GC(gc);
+	gdk_draw_line(priv->out_pixel, priv->pixel_gc, dx1, dy1, dx2, dy2);
+
+	if (priv->out_clip != NULL)
+		gdk_draw_line(priv->out_clip, priv->clip_gc, dx1, dy1, dx2, dy2);
+}
+
+static void ghid_gdk_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	gint vrx2, vry2;
+	double w, h, radius;
+	render_priv_t *priv = gport->render_priv;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+	radius = (xradius > yradius) ? xradius : yradius;
+	if (SIDE_X(cx) < gport->view.x0 - radius
+			|| SIDE_X(cx) > gport->view.x0 + w + radius
+			|| SIDE_Y(cy) < gport->view.y0 - radius || SIDE_Y(cy) > gport->view.y0 + h + radius)
+		return;
+
+	USE_GC(gc);
+	vrx2 = Vz(xradius*2.0);
+	vry2 = Vz(yradius*2.0);
+
+	if ((delta_angle > 360.0) || (delta_angle < -360.0)) {
+		start_angle = 0;
+		delta_angle = 360;
+	}
+
+	if (conf_core.editor.view.flip_x) {
+		start_angle = 180 - start_angle;
+		delta_angle = -delta_angle;
+	}
+	if (conf_core.editor.view.flip_y) {
+		start_angle = -start_angle;
+		delta_angle = -delta_angle;
+	}
+	/* make sure we fall in the -180 to +180 range */
+	start_angle = pcb_normalize_angle(start_angle);
+	if (start_angle >= 180)
+		start_angle -= 360;
+
+	gdk_draw_arc(priv->out_pixel, priv->pixel_gc, 0,
+							 pcb_round(Vxd(cx) - Vzd(xradius) + 0.5), pcb_round(Vyd(cy) - Vzd(yradius) + 0.5),
+							 pcb_round(vrx2), pcb_round(vry2),
+							 (start_angle + 180) * 64, delta_angle * 64);
+
+	if (priv->out_clip != NULL)
+		gdk_draw_arc(priv->out_clip, priv->clip_gc, 0,
+							 pcb_round(Vxd(cx) - Vzd(xradius) + 0.5), pcb_round(Vyd(cy) - Vzd(yradius) + 0.5),
+							 pcb_round(vrx2), pcb_round(vry2),
+							 (start_angle + 180) * 64, delta_angle * 64);
+}
+
+static void ghid_gdk_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gint w, h, lw, sx1, sy1;
+	render_priv_t *priv = gport->render_priv;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	lw = gc->width;
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+
+	if ((SIDE_X(x1) < gport->view.x0 - lw && SIDE_X(x2) < gport->view.x0 - lw)
+			|| (SIDE_X(x1) > gport->view.x0 + w + lw && SIDE_X(x2) > gport->view.x0 + w + lw)
+			|| (SIDE_Y(y1) < gport->view.y0 - lw && SIDE_Y(y2) < gport->view.y0 - lw)
+			|| (SIDE_Y(y1) > gport->view.y0 + h + lw && SIDE_Y(y2) > gport->view.y0 + h + lw))
+		return;
+
+	sx1 = Vx(x1);
+	sy1 = Vy(y1);
+
+	/* optimization: draw a single dot if object is too small */
+	if (pcb_gtk_1dot(gc->width, x1, y1, x2, y2)) {
+		if (pcb_gtk_dot_in_canvas(gc->width, sx1, sy1)) {
+			USE_GC(gc);
+			gdk_draw_point(priv->out_pixel, priv->pixel_gc, sx1, sy1);
+		}
+		return;
+	}
+
+	x1 = sx1;
+	y1 = sy1;
+	x2 = Vx(x2);
+	y2 = Vy(y2);
+
+	if (x1 > x2) {
+		gint xt = x1;
+		x1 = x2;
+		x2 = xt;
+	}
+	if (y1 > y2) {
+		gint yt = y1;
+		y1 = y2;
+		y2 = yt;
+	}
+
+	USE_GC(gc);
+	gdk_draw_rectangle(priv->out_pixel, priv->pixel_gc, FALSE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+
+	if (priv->out_clip != NULL)
+		gdk_draw_rectangle(priv->out_clip, priv->clip_gc, FALSE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+}
+
+
+static void ghid_gdk_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	gint w, h, vr;
+	render_priv_t *priv = gport->render_priv;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+	if (SIDE_X(cx) < gport->view.x0 - radius
+			|| SIDE_X(cx) > gport->view.x0 + w + radius
+			|| SIDE_Y(cy) < gport->view.y0 - radius || SIDE_Y(cy) > gport->view.y0 + h + radius)
+		return;
+
+	USE_GC(gc);
+
+	/* optimization: draw a single dot if object is too small */
+	if (pcb_gtk_1dot(radius*2, cx, cy, cx, cy)) {
+		pcb_coord_t sx1 = Vx(cx), sy1 = Vy(cy);
+		if (pcb_gtk_dot_in_canvas(radius*2, sx1, sy1)) {
+			USE_GC(gc);
+			gdk_draw_point(priv->out_pixel, priv->pixel_gc, sx1, sy1);
+		}
+		return;
+	}
+
+	vr = Vz(radius);
+	gdk_draw_arc(priv->out_pixel, priv->pixel_gc, TRUE, Vx(cx) - vr, Vy(cy) - vr, vr * 2, vr * 2, 0, 360 * 64);
+
+	if (priv->out_clip != NULL)
+		gdk_draw_arc(priv->out_clip, priv->clip_gc, TRUE, Vx(cx) - vr, Vy(cy) - vr, vr * 2, vr * 2, 0, 360 * 64);
+}
+
+/* Decide if a polygon is an axis aligned rectangle; if so, return non-zero
+   and save the corners in b */
+static int poly_is_aligned_rect(pcb_box_t *b, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	int n, xi1 = 0, yi1 = 0, xi2 = 0, yi2 = 0, xs1 = 0, ys1 = 0, xs2 = 0, ys2 = 0;
+	if (n_coords != 4)
+		return 0;
+	b->X1 = b->Y1 = PCB_MAX_COORD;
+	b->X2 = b->Y2 = -PCB_MAX_COORD;
+	for(n = 0; n < 4; n++) {
+		if (x[n] == b->X1)
+			xs1++;
+		else if (x[n] < b->X1) {
+			b->X1 = x[n];
+			xi1++;
+		}
+		else if (x[n] == b->X2)
+			xs2++;
+		else if (x[n] > b->X2) {
+			b->X2 = x[n];
+			xi2++;
+		}
+		else
+			return 0;
+		if (y[n] == b->Y1)
+			ys1++;
+		else if (y[n] < b->Y1) {
+			b->Y1 = y[n];
+			yi1++;
+		}
+		else if (y[n] == b->Y2)
+			ys2++;
+		else if (y[n] > b->Y2) {
+			b->Y2 = y[n];
+			yi2++;
+		}
+		else
+			return 0;
+	}
+	return (xi1 == 1) && (yi1 == 1) && (xi2 == 1) && (yi2 == 1) && \
+	       (xs1 == 1) && (ys1 == 1) && (xs2 == 1) && (ys2 == 1);
+}
+
+/* Intentional code duplication for performance */
+static void ghid_gdk_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	pcb_box_t b;
+	static GdkPoint *points = 0;
+	static int npoints = 0;
+	int i, len, sup = 0;
+	pcb_coord_t lsx, lsy, lastx = PCB_MAX_COORD, lasty = PCB_MAX_COORD, mindist = gport->view.coord_per_px * 2;
+
+	render_priv_t *priv = gport->render_priv;
+	USE_GC_NOPEN(gc);
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	/* optimization: axis aligned rectangles can be drawn cheaper than polygons and they are common because of smd pads */
+	if (poly_is_aligned_rect(&b, n_coords, x, y)) {
+		gint x1 = Vx(b.X1), y1 = Vy(b.Y1), x2 = Vx(b.X2), y2 = Vy(b.Y2), tmp;
+
+		if (x1 > x2) { tmp = x1; x1 = x2; x2 = tmp; }
+		if (y1 > y2) { tmp = y1; y1 = y2; y2 = tmp; }
+		gdk_draw_rectangle(priv->out_pixel, priv->pixel_gc, TRUE, x1, y1, x2 - x1, y2 - y1);
+		if (priv->out_clip != NULL)
+			gdk_draw_rectangle(priv->out_clip, priv->clip_gc, TRUE, x1, y1, x2 - x1, y2 - y1);
+		return;
+	}
+
+	if (npoints < n_coords) {
+		npoints = n_coords + 1;
+		points = (GdkPoint *) realloc(points, npoints * sizeof(GdkPoint));
+	}
+	for (len = i = 0; i < n_coords; i++) {
+		if ((i != n_coords-1) && (PCB_ABS(x[i] - lastx) < mindist) && (PCB_ABS(y[i] - lasty) < mindist)) {
+			lsx = x[i];
+			lsy = y[i];
+			sup = 1;
+			continue;
+		}
+		if (sup) { /* before a big jump, make sure to use the accurate coords of the last (suppressed) point of the crowd */
+			points[len].x = Vx(lsx);
+			points[len].y = Vy(lsy);
+			len++;
+			sup = 0;
+		}
+		points[len].x = Vx(x[i]);
+		points[len].y = Vy(y[i]);
+		len++;
+		lastx = x[i];
+		lasty = y[i];
+	}
+	if (len < 3) {
+		gdk_draw_point(priv->out_pixel, priv->pixel_gc, points[0].x, points[0].y);
+		if (priv->out_clip != NULL)
+			gdk_draw_point(priv->out_clip, priv->pixel_gc, points[0].x, points[0].y);
+		return;
+	}
+	gdk_draw_polygon(priv->out_pixel, priv->pixel_gc, 1, points, len);
+	if (priv->out_clip != NULL)
+		gdk_draw_polygon(priv->out_clip, priv->clip_gc, 1, points, len);
+}
+
+/* Intentional code duplication for performance */
+static void ghid_gdk_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_box_t b;
+	static GdkPoint *points = 0;
+	static int npoints = 0;
+	int i, len, sup = 0;
+	render_priv_t *priv = gport->render_priv;
+	pcb_coord_t lsx, lsy, lastx = PCB_MAX_COORD, lasty = PCB_MAX_COORD, mindist = gport->view.coord_per_px * 2;
+	USE_GC_NOPEN(gc);
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	/* optimization: axis aligned rectangles can be drawn cheaper than polygons and they are common because of smd pads */
+	if (poly_is_aligned_rect(&b, n_coords, x, y)) {
+		gint x1 = Vx(b.X1+dx), y1 = Vy(b.Y1+dy), x2 = Vx(b.X2+dx), y2 = Vy(b.Y2+dy), tmp;
+
+		if (x1 > x2) { tmp = x1; x1 = x2; x2 = tmp; }
+		if (y1 > y2) { tmp = y1; y1 = y2; y2 = tmp; }
+		gdk_draw_rectangle(priv->out_pixel, priv->pixel_gc, TRUE, x1, y1, x2 - x1, y2 - y1);
+		if (priv->out_clip != NULL)
+			gdk_draw_rectangle(priv->out_clip, priv->clip_gc, TRUE, x1, y1, x2 - x1, y2 - y1);
+		return;
+	}
+
+	if (npoints < n_coords) {
+		npoints = n_coords + 1;
+		points = (GdkPoint *) realloc(points, npoints * sizeof(GdkPoint));
+	}
+	for (len = i = 0; i < n_coords; i++) {
+		if ((i != n_coords-1) && (PCB_ABS(x[i] - lastx) < mindist) && (PCB_ABS(y[i] - lasty) < mindist)) {
+			lsx = x[i];
+			lsy = y[i];
+			sup = 1;
+			continue;
+		}
+		if (sup) { /* before a big jump, make sure to use the accurate coords of the last (suppressed) point of the crowd */
+			points[len].x = Vx(lsx+dx);
+			points[len].y = Vy(lsy+dy);
+			len++;
+			sup = 0;
+		}
+		points[len].x = Vx(x[i]+dx);
+		points[len].y = Vy(y[i]+dy);
+		len++;
+		lastx = x[i];
+		lasty = y[i];
+	}
+	if (len < 3) {
+		gdk_draw_point(priv->out_pixel, priv->pixel_gc, points[0].x, points[0].y);
+		if (priv->out_clip != NULL)
+			gdk_draw_point(priv->out_clip, priv->pixel_gc, points[0].x, points[0].y);
+		return;
+	}
+	gdk_draw_polygon(priv->out_pixel, priv->pixel_gc, 1, points, n_coords);
+	if (priv->out_clip != NULL)
+		gdk_draw_polygon(priv->out_clip, priv->clip_gc, 1, points, n_coords);
+}
+
+static void ghid_gdk_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gint w, h, lw, xx, yy, sx1, sy1;
+	render_priv_t *priv = gport->render_priv;
+
+	assert((curr_drawing_mode == PCB_HID_COMP_POSITIVE) || (curr_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (curr_drawing_mode == PCB_HID_COMP_NEGATIVE));
+
+	lw = gc->width;
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+
+	if ((SIDE_X(x1) < gport->view.x0 - lw && SIDE_X(x2) < gport->view.x0 - lw)
+			|| (SIDE_X(x1) > gport->view.x0 + w + lw && SIDE_X(x2) > gport->view.x0 + w + lw)
+			|| (SIDE_Y(y1) < gport->view.y0 - lw && SIDE_Y(y2) < gport->view.y0 - lw)
+			|| (SIDE_Y(y1) > gport->view.y0 + h + lw && SIDE_Y(y2) > gport->view.y0 + h + lw))
+		return;
+
+	sx1 = Vx(x1);
+	sy1 = Vy(y1);
+
+	/* optimization: draw a single dot if object is too small */
+	if (pcb_gtk_1dot(gc->width, x1, y1, x2, y2)) {
+		if (pcb_gtk_dot_in_canvas(gc->width, sx1, sy1)) {
+			USE_GC_NOPEN(gc);
+			gdk_draw_point(priv->out_pixel, priv->pixel_gc, sx1, sy1);
+		}
+		return;
+	}
+
+	x1 = sx1;
+	y1 = sy1;
+	x2 = Vx(x2);
+	y2 = Vy(y2);
+	if (x2 < x1) {
+		xx = x1;
+		x1 = x2;
+		x2 = xx;
+	}
+	if (y2 < y1) {
+		yy = y1;
+		y1 = y2;
+		y2 = yy;
+	}
+	USE_GC(gc);
+	gdk_draw_rectangle(priv->out_pixel, priv->pixel_gc, TRUE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+
+	if (priv->out_clip != NULL)
+		gdk_draw_rectangle(priv->out_clip, priv->clip_gc, TRUE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+}
+
+static void redraw_region(GdkRectangle * rect)
+{
+	int eleft, eright, etop, ebottom;
+	pcb_hid_expose_ctx_t ctx;
+	render_priv_t *priv = gport->render_priv;
+
+	if (!priv->base_pixel)
+		return;
+
+	if (rect != NULL) {
+		priv->clip_rect = *rect;
+		priv->clip_rect_valid = pcb_true;
+	}
+	else {
+		priv->clip_rect.x = 0;
+		priv->clip_rect.y = 0;
+		priv->clip_rect.width = gport->view.canvas_width;
+		priv->clip_rect.height = gport->view.canvas_height;
+		priv->clip_rect_valid = pcb_false;
+	}
+
+	set_clip(priv, priv->bg_gc);
+	set_clip(priv, priv->offlimits_gc);
+	set_clip(priv, priv->grid_gc);
+
+	ctx.view.X1 = MIN(Px(priv->clip_rect.x), Px(priv->clip_rect.x + priv->clip_rect.width + 1));
+	ctx.view.Y1 = MIN(Py(priv->clip_rect.y), Py(priv->clip_rect.y + priv->clip_rect.height + 1));
+	ctx.view.X2 = MAX(Px(priv->clip_rect.x), Px(priv->clip_rect.x + priv->clip_rect.width + 1));
+	ctx.view.Y2 = MAX(Py(priv->clip_rect.y), Py(priv->clip_rect.y + priv->clip_rect.height + 1));
+
+	ctx.view.X1 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X1));
+	ctx.view.X2 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X2));
+	ctx.view.Y1 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y1));
+	ctx.view.Y2 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y2));
+
+	ctx.force = 0;
+	ctx.content.obj = NULL;
+
+	eleft = Vx(0);
+	eright = Vx(PCB->MaxWidth);
+	etop = Vy(0);
+	ebottom = Vy(PCB->MaxHeight);
+	if (eleft > eright) {
+		int tmp = eleft;
+		eleft = eright;
+		eright = tmp;
+	}
+	if (etop > ebottom) {
+		int tmp = etop;
+		etop = ebottom;
+		ebottom = tmp;
+	}
+
+	if (eleft > 0)
+		gdk_draw_rectangle(priv->out_pixel, priv->offlimits_gc, 1, 0, 0, eleft, gport->view.canvas_height);
+	else
+		eleft = 0;
+	if (eright < gport->view.canvas_width)
+		gdk_draw_rectangle(priv->out_pixel, priv->offlimits_gc, 1, eright, 0, gport->view.canvas_width - eright, gport->view.canvas_height);
+	else
+		eright = gport->view.canvas_width;
+	if (etop > 0)
+		gdk_draw_rectangle(priv->out_pixel, priv->offlimits_gc, 1, eleft, 0, eright - eleft + 1, etop);
+	else
+		etop = 0;
+	if (ebottom < gport->view.canvas_height)
+		gdk_draw_rectangle(priv->out_pixel, priv->offlimits_gc, 1, eleft, ebottom, eright - eleft + 1, gport->view.canvas_height - ebottom);
+	else
+		ebottom = gport->view.canvas_height;
+
+	gdk_draw_rectangle(priv->out_pixel, priv->bg_gc, 1, eleft, etop, eright - eleft + 1, ebottom - etop + 1);
+
+	ghid_gdk_draw_bg_image();
+
+	pcb_hid_expose_all(&gtk2_gdk_hid, &ctx);
+	ghid_gdk_draw_grid();
+
+	/* In some cases we are called with the crosshair still off */
+	if (priv->attached_invalidate_depth == 0)
+		pcb_draw_attached(0);
+
+	/* In some cases we are called with the mark still off */
+	if (priv->mark_invalidate_depth == 0)
+		pcb_draw_mark(0);
+
+	draw_lead_user(priv);
+
+	priv->clip_rect_valid = pcb_false;
+
+	/* Rest the clip for bg_gc, as it is used outside this function */
+	gdk_gc_set_clip_mask(priv->bg_gc, NULL);
+}
+
+static void ghid_gdk_invalidate_lr(pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+{
+	int dleft, dright, dtop, dbottom;
+	int minx, maxx, miny, maxy;
+	GdkRectangle rect;
+
+	dleft = Vx(left);
+	dright = Vx(right);
+	dtop = Vy(top);
+	dbottom = Vy(bottom);
+
+	minx = MIN(dleft, dright);
+	maxx = MAX(dleft, dright);
+	miny = MIN(dtop, dbottom);
+	maxy = MAX(dtop, dbottom);
+
+	rect.x = minx;
+	rect.y = miny;
+	rect.width = maxx - minx;
+	rect.height = maxy - miny;
+
+	redraw_region(&rect);
+	ghid_gdk_screen_update();
+}
+
+
+static void ghid_gdk_invalidate_all()
+{
+	if (ghidgui && ghidgui->topwin.menu.menu_bar) {
+		redraw_region(NULL);
+		ghid_gdk_screen_update();
+	}
+}
+
+static void ghid_gdk_notify_crosshair_change(pcb_bool changes_complete)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	if (changes_complete)
+		priv->attached_invalidate_depth--;
+
+	assert(priv->attached_invalidate_depth >= 0);
+	if (priv->attached_invalidate_depth < 0) {
+		priv->attached_invalidate_depth = 0;
+		/* A mismatch of changes_complete == pcb_false and == pcb_true notifications
+		 * is not expected to occur, but we will try to handle it gracefully.
+		 * As we know the crosshair will have been shown already, we must
+		 * repaint the entire view to be sure not to leave an artaefact.
+		 */
+		ghid_gdk_invalidate_all();
+		return;
+	}
+
+	if (priv->attached_invalidate_depth == 0)
+		pcb_draw_attached(0);
+
+	if (!changes_complete) {
+		priv->attached_invalidate_depth++;
+	}
+	else if (gport->drawing_area != NULL) {
+		/* Queue a GTK expose when changes are complete */
+		ghid_draw_area_update(gport, NULL);
+	}
+}
+
+static void ghid_gdk_notify_mark_change(pcb_bool changes_complete)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	if (changes_complete)
+		priv->mark_invalidate_depth--;
+
+	if (priv->mark_invalidate_depth < 0) {
+		priv->mark_invalidate_depth = 0;
+		/* A mismatch of changes_complete == pcb_false and == pcb_true notifications
+		 * is not expected to occur, but we will try to handle it gracefully.
+		 * As we know the mark will have been shown already, we must
+		 * repaint the entire view to be sure not to leave an artaefact.
+		 */
+		ghid_gdk_invalidate_all();
+		return;
+	}
+
+	if (priv->mark_invalidate_depth == 0)
+		pcb_draw_mark(0);
+
+	if (!changes_complete) {
+		priv->mark_invalidate_depth++;
+	}
+	else if (gport->drawing_area != NULL) {
+		/* Queue a GTK expose when changes are complete */
+		ghid_draw_area_update(gport, NULL);
+	}
+}
+
+static void draw_right_cross(GdkGC * xor_gc, gint x, gint y)
+{
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	gdk_draw_line(window, xor_gc, x, 0, x, gport->view.canvas_height);
+	gdk_draw_line(window, xor_gc, 0, y, gport->view.canvas_width, y);
+}
+
+static void draw_slanted_cross(GdkGC * xor_gc, gint x, gint y)
+{
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	gint x0, y0, x1, y1;
+
+	x0 = x + (gport->view.canvas_height - y);
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x);
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y);
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x);
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_dozen_cross(GdkGC * xor_gc, gint x, gint y)
+{
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	gint x0, y0, x1, y1;
+	gdouble tan60 = sqrt(3);
+
+	x0 = x + (gport->view.canvas_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y / tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x) * tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x * tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x + (gport->view.canvas_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y * tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x) / tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x / tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y / tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x * tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x) * tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y * tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x / tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x) / tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_crosshair(GdkGC * xor_gc, gint x, gint y)
+{
+	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
+
+	draw_right_cross(xor_gc, x, y);
+	if (prev == pcb_ch_shape_union_jack)
+		draw_slanted_cross(xor_gc, x, y);
+	if (prev == pcb_ch_shape_dozen)
+		draw_dozen_cross(xor_gc, x, y);
+	prev = pcb_crosshair.shape;
+}
+
+static void show_crosshair(gboolean paint_new_location)
+{
+	render_priv_t *priv = gport->render_priv;
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	GtkStyle *style = gtk_widget_get_style(gport->drawing_area);
+	gint x, y;
+	static gint x_prev = -1, y_prev = -1;
+	static GdkGC *xor_gc;
+	static GdkColor cross_color;
+
+	if (gport->view.crosshair_x < 0 || !ghidgui->topwin.active || !gport->view.has_entered)
+		return;
+
+	if (!xor_gc) {
+		xor_gc = gdk_gc_new(window);
+		gdk_gc_copy(xor_gc, style->white_gc);
+		gdk_gc_set_function(xor_gc, GDK_XOR);
+		gdk_gc_set_clip_origin(xor_gc, 0, 0);
+		set_clip(priv, xor_gc);
+		/* FIXME: when CrossColor changed from config */
+		map_color_string(conf_core.appearance.color.cross, &cross_color);
+	}
+	x = Vx(gport->view.crosshair_x);
+	y = Vy(gport->view.crosshair_y);
+
+	gdk_gc_set_foreground(xor_gc, &cross_color);
+
+	if (x_prev >= 0 && !paint_new_location)
+		draw_crosshair(xor_gc, x_prev, y_prev);
+
+	if (x >= 0 && paint_new_location) {
+		draw_crosshair(xor_gc, x, y);
+		x_prev = x;
+		y_prev = y;
+	}
+	else
+		x_prev = y_prev = -1;
+}
+
+static void ghid_gdk_init_renderer(int *argc, char ***argv, void *vport)
+{
+	GHidPort *port = vport;
+	/* Init any GC's required */
+	port->render_priv = g_new0(render_priv_t, 1);
+}
+
+static void ghid_gdk_shutdown_renderer(void *vport)
+{
+	GHidPort *port = vport;
+	g_free(port->render_priv);
+	port->render_priv = NULL;
+}
+
+static void ghid_gdk_init_drawing_widget(GtkWidget * widget, void * port)
+{
+}
+
+static void ghid_gdk_drawing_area_configure_hook(void *vport)
+{
+	GHidPort *port = vport;
+	static int done_once = 0;
+	render_priv_t *priv = port->render_priv;
+
+	if (priv->base_pixel)
+		gdk_pixmap_unref(priv->base_pixel);
+
+	priv->base_pixel = gdk_pixmap_new(gtk_widget_get_window(gport->drawing_area),
+                                gport->view.canvas_width, gport->view.canvas_height, -1);
+	priv->out_pixel = priv->base_pixel;
+	gport->drawing_allowed = pcb_true;
+
+	if (!done_once) {
+		priv->bg_gc = gdk_gc_new(priv->out_pixel);
+		if (!map_color_string(conf_core.appearance.color.background, &priv->bg_color))
+			map_color_string("white", &priv->bg_color);
+		gdk_gc_set_foreground(priv->bg_gc, &priv->bg_color);
+		gdk_gc_set_clip_origin(priv->bg_gc, 0, 0);
+
+		priv->offlimits_gc = gdk_gc_new(priv->out_pixel);
+		if (!map_color_string(conf_core.appearance.color.off_limit, &priv->offlimits_color))
+			map_color_string("white", &priv->offlimits_color);
+		gdk_gc_set_foreground(priv->offlimits_gc, &priv->offlimits_color);
+		gdk_gc_set_clip_origin(priv->offlimits_gc, 0, 0);
+		done_once = 1;
+	}
+
+	if (priv->sketch_pixel) {
+		gdk_pixmap_unref(priv->sketch_pixel);
+		priv->sketch_pixel = gdk_pixmap_new(gtk_widget_get_window(gport->drawing_area), port->view.canvas_width, port->view.canvas_height, -1);
+	}
+	if (priv->sketch_clip) {
+		gdk_pixmap_unref(priv->sketch_clip);
+		priv->sketch_clip = gdk_pixmap_new(0, port->view.canvas_width, port->view.canvas_height, 1);
+	}
+}
+
+static void ghid_gdk_screen_update(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	if (priv->base_pixel == NULL)
+		return;
+
+	gdk_draw_drawable(window, priv->bg_gc, priv->base_pixel, 0, 0, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+	show_crosshair(TRUE);
+}
+
+static gboolean ghid_gdk_drawing_area_expose_cb(GtkWidget * widget, pcb_gtk_expose_t *ev, void *vport)
+{
+	GHidPort *port = vport;
+	render_priv_t *priv = port->render_priv;
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	gdk_draw_drawable(window, priv->bg_gc, priv->base_pixel,
+										ev->area.x, ev->area.y, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+	show_crosshair(TRUE);
+	return FALSE;
+}
+
+static void ghid_gdk_port_drawing_realize_cb(GtkWidget * widget, gpointer data)
+{
+}
+
+static gboolean ghid_gdk_preview_expose(GtkWidget * widget, pcb_gtk_expose_t *ev, pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t *ctx)
+{
+	GdkWindow *window = gtk_widget_get_window(widget);
+	GdkDrawable *save_drawable;
+	GtkAllocation allocation;
+	pcb_gtk_view_t save_view;
+	int save_width, save_height;
+	double xz, yz, vw, vh;
+	render_priv_t *priv = gport->render_priv;
+	pcb_coord_t ox1 = ctx->view.X1, oy1 = ctx->view.Y1, ox2 = ctx->view.X2, oy2 = ctx->view.Y2;
+
+	vw = ctx->view.X2 - ctx->view.X1;
+	vh = ctx->view.Y2 - ctx->view.Y1;
+
+	/* Setup drawable and zoom factor for drawing routines
+	 */
+	save_drawable = priv->base_pixel;
+	save_view = gport->view;
+	save_width = gport->view.canvas_width;
+	save_height = gport->view.canvas_height;
+
+	gtk_widget_get_allocation(widget, &allocation);
+	xz = vw / (double)allocation.width;
+	yz = vh / (double)allocation.height;
+	if (xz > yz)
+		gport->view.coord_per_px = xz;
+	else
+		gport->view.coord_per_px = yz;
+
+	priv->base_pixel = priv->out_pixel = window;
+	gport->view.canvas_width = allocation.width;
+	gport->view.canvas_height = allocation.height;
+	gport->view.width = allocation.width * gport->view.coord_per_px;
+	gport->view.height = allocation.height * gport->view.coord_per_px;
+	gport->view.x0 = (vw - gport->view.width) / 2 + ctx->view.X1;
+	gport->view.y0 = (vh - gport->view.height) / 2 + ctx->view.Y1;
+
+	/* clear background */
+	gdk_draw_rectangle(window, priv->bg_gc, TRUE, 0, 0, allocation.width, allocation.height);
+
+	PCB_GTK_PREVIEW_TUNE_EXTENT(ctx, allocation);
+
+	/* call the drawing routine */
+	expcall(&gtk2_gdk_hid, ctx);
+
+	/* restore the original context and priv */
+	ctx->view.X1 = ox1; ctx->view.X2 = ox2; ctx->view.Y1 = oy1; ctx->view.Y2 = oy2;
+	priv->out_pixel = priv->base_pixel = save_drawable;
+	gport->view = save_view;
+	gport->view.canvas_width = save_width;
+	gport->view.canvas_height = save_height;
+
+	return FALSE;
+}
+
+static void draw_lead_user(render_priv_t *priv)
+{
+	GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	GtkStyle *style = gtk_widget_get_style(gport->drawing_area);
+	int i;
+	pcb_lead_user_t *lead_user = &gport->lead_user;
+	pcb_coord_t radius = lead_user->radius;
+	pcb_coord_t width = PCB_MM_TO_COORD(LEAD_USER_WIDTH);
+	pcb_coord_t separation = PCB_MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
+	static GdkGC *lead_gc = NULL;
+	static GdkColormap *colormap = NULL;
+	GdkColor lead_color;
+
+	if (!lead_user->lead_user)
+		return;
+
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(gport->top_window);
+
+	if (lead_gc == NULL) {
+		lead_gc = gdk_gc_new(window);
+		gdk_gc_copy(lead_gc, style->white_gc);
+		gdk_gc_set_function(lead_gc, GDK_XOR);
+		gdk_gc_set_clip_origin(lead_gc, 0, 0);
+		lead_color.pixel = 0;
+		lead_color.red = (int) (65535. * LEAD_USER_COLOR_R);
+		lead_color.green = (int) (65535. * LEAD_USER_COLOR_G);
+		lead_color.blue = (int) (65535. * LEAD_USER_COLOR_B);
+		gdk_color_alloc(colormap, &lead_color);
+		gdk_gc_set_foreground(lead_gc, &lead_color);
+	}
+
+	set_clip(priv, lead_gc);
+	gdk_gc_set_line_attributes(lead_gc, Vz(width), GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+
+	/* arcs at the approrpriate radii */
+
+	for (i = 0; i < LEAD_USER_ARC_COUNT; i++, radius -= separation) {
+		if (radius < width)
+			radius += PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+
+		/* Draw an arc at radius */
+		gdk_draw_arc(gport->render_priv->out_pixel, lead_gc, FALSE,
+								 Vx(lead_user->x - radius), Vy(lead_user->y - radius), Vz(2. * radius), Vz(2. * radius), 0, 360 * 64);
+	}
+}
+
+static GtkWidget *ghid_gdk_new_drawing_widget(pcb_gtk_common_t *common)
+{
+	GtkWidget *w = gtk_drawing_area_new();
+
+	g_signal_connect(G_OBJECT(w), "expose_event", G_CALLBACK(common->drawing_area_expose), common->gport);
+
+	return w;
+}
+
+
+void ghid_gdk_install(pcb_gtk_common_t *common, pcb_hid_t *hid)
+{
+	if (common != NULL) {
+		common->new_drawing_widget = ghid_gdk_new_drawing_widget;
+		common->init_drawing_widget = ghid_gdk_init_drawing_widget;
+		common->drawing_realize = ghid_gdk_port_drawing_realize_cb;
+		common->drawing_area_expose = ghid_gdk_drawing_area_expose_cb;
+		common->preview_expose = ghid_gdk_preview_expose;
+		common->invalidate_all = ghid_gdk_invalidate_all;
+		common->set_special_colors = ghid_gdk_set_special_colors;
+		common->init_renderer = ghid_gdk_init_renderer;
+		common->screen_update = ghid_gdk_screen_update;
+		common->draw_grid_local = ghid_gdk_draw_grid_local;
+		common->drawing_area_configure_hook = ghid_gdk_drawing_area_configure_hook;
+		common->shutdown_renderer = ghid_gdk_shutdown_renderer;
+		common->get_color_name = get_color_name;
+		common->map_color_string = map_color_string;
+	}
+
+	if (hid != NULL) {
+		hid->invalidate_lr = ghid_gdk_invalidate_lr;
+		hid->invalidate_all = ghid_gdk_invalidate_all;
+		hid->notify_crosshair_change = ghid_gdk_notify_crosshair_change;
+		hid->notify_mark_change = ghid_gdk_notify_mark_change;
+		hid->set_layer_group = ghid_gdk_set_layer_group;
+		hid->make_gc = ghid_gdk_make_gc;
+		hid->destroy_gc = ghid_gdk_destroy_gc;
+		hid->set_drawing_mode = ghid_gdk_set_drawing_mode;
+		hid->render_burst = ghid_gdk_render_burst;
+		hid->set_color = ghid_gdk_set_color;
+		hid->set_line_cap = ghid_gdk_set_line_cap;
+		hid->set_line_width = ghid_gdk_set_line_width;
+		hid->set_draw_xor = ghid_gdk_set_draw_xor;
+		hid->draw_line = ghid_gdk_draw_line;
+		hid->draw_arc = ghid_gdk_draw_arc;
+		hid->draw_rect = ghid_gdk_draw_rect;
+		hid->fill_circle = ghid_gdk_fill_circle;
+		hid->fill_polygon = ghid_gdk_fill_polygon;
+		hid->fill_polygon_offs = ghid_gdk_fill_polygon_offs;
+		hid->fill_rect = ghid_gdk_fill_rect;
+	}
+}
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-main.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/gtkhid-main.c	(revision 18980)
@@ -0,0 +1,67 @@
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_init.h"
+#include "conf_core.h"
+
+#include "../src_plugins/lib_gtk_common/glue.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/glue_common.h"
+#include "../src_plugins/lib_gtk_hid/glue_hid.h"
+#include "../src_plugins/lib_gtk_hid/glue_conf.h"
+#include "../src_plugins/lib_gtk_hid/glue_event.h"
+#include "../src_plugins/lib_gtk_hid/glue_win32.h"
+#include "../src_plugins/lib_gtk_hid/common.h"
+#include "../src_plugins/lib_gtk_hid/render.h"
+
+const char *ghid_cookie = "gtk2 hid, gdk";
+const char *ghid_menu_cookie = "gtk2 hid menu, gdk";
+
+pcb_hid_t gtk2_gdk_hid;
+
+int gtk2_gdk_parse_arguments(int *argc, char ***argv)
+{
+	ghid_gdk_install(&ghidgui->common, NULL);
+	return gtkhid_parse_arguments(argc, argv);
+}
+
+int pplg_check_ver_hid_gtk2_gdk(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_gtk2_gdk(void)
+{
+	pcb_event_unbind_allcookie(ghid_cookie);
+	conf_hid_unreg(ghid_cookie);
+	conf_hid_unreg(ghid_menu_cookie);
+}
+
+int pplg_init_hid_gtk2_gdk(void)
+{
+	PCB_API_CHK_VER;
+	ghid_win32_init();
+
+	ghid_glue_hid_init(&gtk2_gdk_hid);
+	ghid_glue_common_init();
+
+	gtk2_gdk_hid.parse_arguments = gtk2_gdk_parse_arguments;
+	ghid_gdk_install(NULL, &gtk2_gdk_hid);
+
+	gtk2_gdk_hid.name = "gtk2_gdk";
+	gtk2_gdk_hid.description = "Gtk2 - The Gimp Toolkit, with GDK software pixmap rendering";
+
+	ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(ghid_menu_cookie, NULL);
+	ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox;
+	ghid_conf_regs(ghid_cookie);
+
+	pcb_hid_register_hid(&gtk2_gdk_hid);
+
+	glue_event_init(ghid_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/hid_gtk2_gdk.pup	(revision 18980)
@@ -0,0 +1,12 @@
+$class hid
+$short GTK2 GUI, software render
+$long GUI: GTK2 HID with GDK software rendering.
+$state works
+$package hid-gtk2-gdk
+default buildin
+dep lib_gtk_common
+dep lib_gtk_config
+dep lib_gtk_hid
+dep draw_csect
+dep draw_fontsel
+autoload 1
Index: tags/2.0.1/src_plugins/hid_gtk2_gdk/pcb.rc
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gdk/pcb.rc	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gdk/pcb.rc	(revision 18980)
@@ -0,0 +1 @@
+1 ICON "pcb_icon.ico"
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_gtk2_gl
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+put /local/pcb/mod {hid_gtk2_gl}
+put /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/hid_gtk2_gl/gtkhid-main.o
+	$(PLUGDIR)/hid_gtk2_gl/gtkhid-gl.o
+@]
+
+switch /local/pcb/hid_gtk2_gl/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   [@@/target/libs/gui/gtk2gl/cflags@ @libs/gui/glu/cflags@@]
+		put /local/pcb/mod/LDFLAGS  [@@/target/libs/gui/gtk2gl/ldflags@ @libs/gui/glu/ldflags@@]
+	end
+end
+
+switch /local/pcb/hid_gtk2_gl/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 18980)
@@ -0,0 +1,1212 @@
+#include "config.h"
+
+#include <stdio.h>
+
+#include "crosshair.h"
+#include "data.h"
+#include "layer.h"
+#include "hid_draw_helpers.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+
+#include "../src_plugins/lib_hid_common/clip.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/coord_conv.h"
+#include "../src_plugins/lib_gtk_hid/render.h"
+#include "../src_plugins/lib_gtk_hid/preview_helper.h"
+
+#include "../src_plugins/lib_hid_gl/opengl.h"
+#include "../src_plugins/lib_hid_gl/draw_gl.h"
+#include <gtk/gtkgl.h>
+#include "../src_plugins/lib_hid_gl/hidgl.h"
+#include "hid_draw_helpers.h"
+#include "../src_plugins/lib_hid_gl/stencil_gl.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#define Z_NEAR 3.0
+extern pcb_hid_t gtk2_gl_hid;
+
+static pcb_hid_gc_t current_gc = NULL;
+/* Sets gport->u_gc to the "right" GC to use (wrt mask or window)
+*/
+#define USE_GC(gc) if (!use_gc(gc)) return
+
+static pcb_coord_t grid_local_x = 0, grid_local_y = 0, grid_local_radius = 0;
+
+/*static int cur_mask = -1;*/
+
+typedef struct render_priv_s {
+	GdkGLConfig *				glconfig;
+	pcb_gtk_color_t			bg_color;
+	pcb_gtk_color_t			offlimits_color;
+	pcb_gtk_color_t			grid_color;
+	pcb_bool 						trans_lines;
+	pcb_bool 						in_context;
+	int 								subcomposite_stencil_bit;
+	char *							current_colorname;
+	double 							current_alpha_mult;
+} render_priv_t;
+
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+
+	const char *colorname;
+	double alpha_mult;
+	pcb_coord_t width;
+	gchar xor;
+} hid_gc_s;
+
+static void draw_lead_user(render_priv_t * priv);
+
+void ghid_gl_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	pcb_gui->coord_per_pix = gport->view.coord_per_px;
+}
+
+static const gchar *get_color_name(pcb_gtk_color_t * color)
+{
+	static char tmp[16];
+
+	if (!color)
+		return "#000000";
+
+	sprintf(tmp, "#%2.2x%2.2x%2.2x", (color->red >> 8) & 0xff, (color->green >> 8) & 0xff, (color->blue >> 8) & 0xff);
+	return tmp;
+}
+
+/* Returns TRUE only if color_string has been allocated to color. */
+static pcb_bool map_color_string(const char *color_string, pcb_gtk_color_t * color)
+{
+	static GdkColormap *colormap = NULL;
+	GHidPort *out = &ghid_port;
+	pcb_bool parsed;
+
+	if (!color || !out->top_window)
+		return FALSE;
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(out->top_window);
+	if (color->red || color->green || color->blue)
+		gdk_colormap_free_colors(colormap, color, 1);
+	parsed = gdk_color_parse(color_string, color);
+	if (parsed)
+		gdk_color_alloc(colormap, color);
+
+	return parsed;
+}
+
+
+#if 0
+static void start_subcomposite(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	int stencil_bit;
+
+	/* Flush out any existing geometry to be rendered */
+	hidgl_flush_triangles();
+
+	glEnable(GL_STENCIL_TEST);		/* Enable Stencil test */
+	glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);	/* Stencil pass => replace stencil value (with 1) */
+
+	stencil_bit = hidgl_assign_clear_stencil_bit();	/* Get a new (clean) bitplane to stencil with */
+	glStencilMask(stencil_bit);		/* Only write to our subcompositing stencil bitplane */
+	glStencilFunc(GL_GREATER, stencil_bit, stencil_bit);	/* Pass stencil test if our assigned bit is clear */
+
+	priv->subcomposite_stencil_bit = stencil_bit;
+}
+
+static void end_subcomposite(void)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	/* Flush out any existing geometry to be rendered */
+	hidgl_flush_triangles();
+
+	hidgl_return_stencil_bit(priv->subcomposite_stencil_bit);	/* Relinquish any bitplane we previously used */
+
+	glStencilMask(0);
+	glStencilFunc(GL_ALWAYS, 0, 0);	/* Always pass stencil test */
+	glDisable(GL_STENCIL_TEST);		/* Disable Stencil test */
+
+	priv->subcomposite_stencil_bit = 0;
+}
+#endif
+
+int ghid_gl_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	render_priv_t *priv = gport->render_priv;
+	int idx = group;
+
+	if (idx >= 0 && idx < pcb_max_group(PCB)) {
+		int n = PCB->LayerGroups.grp[group].len;
+		for (idx = 0; idx < n - 1; idx++) {
+			int ni = PCB->LayerGroups.grp[group].lid[idx];
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].meta.real.vis)
+				break;
+		}
+		idx = PCB->LayerGroups.grp[group].lid[idx];
+	}
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0.0f, 0.0f, -Z_NEAR);
+		
+	glScalef((conf_core.editor.view.flip_x ? -1. : 1.) / gport->view.coord_per_px,
+					 (conf_core.editor.view.flip_y ? -1. : 1.) / gport->view.coord_per_px,
+					 ((conf_core.editor.view.flip_x == conf_core.editor.view.flip_y) ? 1. : -1.) / gport->view.coord_per_px);
+	glTranslatef(conf_core.editor.view.flip_x ? gport->view.x0 - PCB->MaxWidth :
+							 -gport->view.x0, conf_core.editor.view.flip_y ? gport->view.y0 - PCB->MaxHeight : -gport->view.y0, 0);
+
+	/* Put the renderer into a good state so that any drawing is done in standard mode */
+	
+	drawgl_flush();
+	drawgl_reset();
+	glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
+	glDisable(GL_STENCIL_TEST);
+	
+/*
+	end_subcomposite();
+	start_subcomposite();
+*/
+	priv->trans_lines = pcb_true;
+
+	/* non-virtual layers with group visibility */
+	switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_MASK:
+		case PCB_LYT_PASTE:
+			return (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) && PCB->LayerGroups.grp[group].vis /*&& !pinout */ );
+	}
+
+	/* normal layers */
+	if (idx >= 0 && idx < pcb_max_layer && ((flags & PCB_LYT_ANYTHING) != PCB_LYT_SILK)) {
+		priv->trans_lines = pcb_true;
+		return PCB->Data->Layer[idx].meta.real.vis;
+	}
+
+	/* virtual layers */
+	{
+		switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_INVIS:
+			return PCB->InvisibleObjectsOn;
+		case PCB_LYT_SILK:
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
+				return pcb_silk_on(PCB);
+			return 0;
+		case PCB_LYT_ASSY:
+			return 0;
+		case PCB_LYT_PDRILL:
+		case PCB_LYT_UDRILL:
+			return 1;
+		case PCB_LYT_UI:
+			return 1;
+		case PCB_LYT_RAT:
+			return PCB->RatOn;
+		case PCB_LYT_CSECT:
+			/* Opaque draw */
+			priv->trans_lines = pcb_false;
+			/* Disable stencil for cross-section drawing; that code
+			 * relies on overdraw doing the right thing and doesn't
+			 * use layers */
+			/*glDisable(GL_STENCIL_TEST);*/
+			return 0;
+		}
+	}
+	return 0;
+}
+
+static void ghid_gl_end_layer(void)
+{
+	drawgl_flush();
+	drawgl_reset();
+}
+
+void ghid_gl_destroy_gc(pcb_hid_gc_t gc)
+{
+	g_free(gc);
+}
+
+pcb_hid_gc_t ghid_gl_make_gc(void)
+{
+	pcb_hid_gc_t rv;
+
+	rv = g_new0(hid_gc_s, 1);
+	rv->me_pointer = &gtk2_gl_hid;
+	rv->colorname = conf_core.appearance.color.background;
+	rv->alpha_mult = 1.0;
+	return rv;
+}
+
+void ghid_gl_draw_grid_local(pcb_coord_t cx, pcb_coord_t cy)
+{
+	/* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */
+	grid_local_x = (cx / PCB->Grid) * PCB->Grid + PCB->GridOffsetX;
+	grid_local_y = (cy / PCB->Grid) * PCB->Grid + PCB->GridOffsetY;
+	grid_local_radius = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+}
+
+static void ghid_gl_draw_grid(pcb_box_t *drawn_area)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if((Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) || (!conf_core.editor.draw_grid))
+		return;
+
+	glEnable(GL_COLOR_LOGIC_OP);
+	glLogicOp(GL_XOR);
+
+	glColor3f(priv->grid_color.red / 65535., priv->grid_color.green / 65535., priv->grid_color.blue / 65535.);
+
+	if(conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+		hidgl_draw_local_grid(grid_local_x,grid_local_y,grid_local_radius);
+	else
+		hidgl_draw_grid(drawn_area);
+
+	glDisable(GL_COLOR_LOGIC_OP);
+}
+
+void pcb_gl_draw_texture(GLuint texture_handle)
+{
+	glBindTexture(GL_TEXTURE_2D, texture_handle);
+
+	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+	glEnable(GL_TEXTURE_2D);
+
+	/* Render a quad with the background as a texture */
+
+	glBegin(GL_QUADS);
+	glTexCoord2d(0., 0.);
+	glVertex3i(0, 0, 0);
+	glTexCoord2d(1., 0.);
+	glVertex3i(PCB->MaxWidth, 0, 0);
+	glTexCoord2d(1., 1.);
+	glVertex3i(PCB->MaxWidth, PCB->MaxHeight, 0);
+	glTexCoord2d(0., 1.);
+	glVertex3i(0, PCB->MaxHeight, 0);
+	glEnd();
+
+	glDisable(GL_TEXTURE_2D);
+}
+
+static void ghid_gl_draw_bg_image(void)
+{
+	static GLuint texture_handle = 0;
+
+	if (!ghidgui->bg_pixbuf)
+		return;
+
+	if (texture_handle == 0) {
+		int width = gdk_pixbuf_get_width(ghidgui->bg_pixbuf);
+		int height = gdk_pixbuf_get_height(ghidgui->bg_pixbuf);
+		int rowstride = gdk_pixbuf_get_rowstride(ghidgui->bg_pixbuf);
+		int bits_per_sample = gdk_pixbuf_get_bits_per_sample(ghidgui->bg_pixbuf);
+		int n_channels = gdk_pixbuf_get_n_channels(ghidgui->bg_pixbuf);
+		unsigned char *pixels = gdk_pixbuf_get_pixels(ghidgui->bg_pixbuf);
+
+		g_warn_if_fail(bits_per_sample == 8);
+		g_warn_if_fail(rowstride == width * n_channels);
+
+		glGenTextures(1, &texture_handle);
+		glBindTexture(GL_TEXTURE_2D, texture_handle);
+
+		/* XXX: We should probably determine what the maximum texture supported is,
+		 *      and if our image is larger, shrink it down using GDK pixbuf routines
+		 *      rather than having it fail below.
+		 */
+
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, (n_channels == 4) ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE, pixels);
+	}
+
+	pcb_gl_draw_texture(texture_handle);
+}
+
+	/* Config helper functions for when the user changes color preferences.
+	   |  set_special colors used in the gtkhid.
+	 */
+static void set_special_grid_color(void)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	priv->grid_color.red ^= priv->bg_color.red;
+	priv->grid_color.green ^= priv->bg_color.green;
+	priv->grid_color.blue ^= priv->bg_color.blue;
+}
+
+void ghid_gl_set_special_colors(conf_native_t *cfg)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.background)) {
+		if (map_color_string(cfg->val.color[0], &priv->bg_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/background"), -1);
+			set_special_grid_color();
+		}
+	}
+	else if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.off_limit)) {
+		if (map_color_string(cfg->val.color[0], &priv->offlimits_color))
+      config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/off_limit"), -1);
+	}
+	else if (((CFT_COLOR *)cfg->val.color == &conf_core.appearance.color.grid)) {
+		if (map_color_string(cfg->val.color[0], &priv->grid_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/grid"), -1);
+			set_special_grid_color();
+		}
+	}
+}
+
+typedef struct {
+	int color_set;
+	pcb_gtk_color_t color;
+	int xor_set;
+	pcb_gtk_color_t xor_color;
+	double red;
+	double green;
+	double blue;
+} ColorCache;
+
+static void set_gl_color_for_gc(pcb_hid_gc_t gc)
+{
+	render_priv_t *priv = gport->render_priv;
+	static void *cache = NULL;
+	static GdkColormap *colormap = NULL;
+	pcb_hidval_t cval;
+	ColorCache *cc;
+	double r, g, b, a;
+
+	if(gc->colorname == NULL) {
+		fprintf(stderr, "set_gl_color_for_gc:  gc->colorname = NULL, setting to magenta\n");
+		gc->colorname = "magenta";
+	}
+	
+	if (	priv->current_colorname != NULL &&
+				strcmp(priv->current_colorname, gc->colorname) == 0 && 
+				priv->current_alpha_mult == gc->alpha_mult)
+		return;
+
+	free(priv->current_colorname);
+	priv->current_colorname = pcb_strdup(gc->colorname);
+	priv->current_alpha_mult = gc->alpha_mult;
+
+	if (colormap == NULL)
+		colormap = gtk_widget_get_colormap(gport->top_window);
+	if (strcmp(gc->colorname, "drill") == 0) {
+		r = priv->offlimits_color.red / 65535.;
+		g = priv->offlimits_color.green / 65535.;
+		b = priv->offlimits_color.blue / 65535.;
+		a = conf_core.appearance.drill_alpha;
+	}
+	else {
+		if (pcb_hid_cache_color(0, gc->colorname, &cval, &cache))
+			cc = (ColorCache *) cval.ptr;
+		else {
+			cc = (ColorCache *) malloc(sizeof(ColorCache));
+			memset(cc, 0, sizeof(*cc));
+			cval.ptr = cc;
+			pcb_hid_cache_color(1, gc->colorname, &cval, &cache);
+		}
+
+		if (!cc->color_set) {
+			if (gdk_color_parse(gc->colorname, &cc->color))
+				gdk_color_alloc(colormap, &cc->color);
+			else
+				gdk_color_white(colormap, &cc->color);
+			cc->red = cc->color.red / 65535.;
+			cc->green = cc->color.green / 65535.;
+			cc->blue = cc->color.blue / 65535.;
+			cc->color_set = 1;
+		}
+		if (gc->xor) {
+			if (!cc->xor_set) {
+				cc->xor_color.red = cc->color.red ^ priv->bg_color.red;
+				cc->xor_color.green = cc->color.green ^ priv->bg_color.green;
+				cc->xor_color.blue = cc->color.blue ^ priv->bg_color.blue;
+				gdk_color_alloc(colormap, &cc->xor_color);
+				cc->red = cc->color.red / 65535.;
+				cc->green = cc->color.green / 65535.;
+				cc->blue = cc->color.blue / 65535.;
+				cc->xor_set = 1;
+			}
+		}
+		r = cc->red;
+		g = cc->green;
+		b = cc->blue;
+		a = conf_core.appearance.layer_alpha;
+	}
+	if (1) {
+		double maxi, mult;
+		a *= gc->alpha_mult;
+		if (!priv->trans_lines)
+			a = 1.0;
+		maxi = r;
+		if (g > maxi)
+			maxi = g;
+		if (b > maxi)
+			maxi = b;
+		mult = MIN(1 / a, 1 / maxi);
+#if 1
+		r = r * mult;
+		g = g * mult;
+		b = b * mult;
+#endif
+	}
+
+	if (!priv->in_context)
+		return;
+
+
+	/* We need to flush the draw buffer when changing colour so that new primitives
+	 * don't get merged. This actually isn't a problem with the colour but due to 
+	 * way that the final render pass iterates through the primitive buffer in 
+	 * reverse order. If the new primitives are merged with previous ones then they
+	 * will be drawn in the wrong order.
+	 */
+	drawgl_flush();	
+
+	drawgl_set_colour(r,g,b,a);
+}
+
+void ghid_gl_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	
+	if(name == NULL) {
+		fprintf(stderr, "ghid_gl_set_color():  name = NULL, setting to magenta\n");
+		name = "magenta";
+	}
+
+	gc->colorname = name;
+	set_gl_color_for_gc(gc);
+}
+
+void ghid_gl_set_alpha_mult(pcb_hid_gc_t gc, double alpha_mult)
+{
+	gc->alpha_mult = alpha_mult;
+	set_gl_color_for_gc(gc);
+}
+
+void ghid_gl_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+}
+
+void ghid_gl_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width < 0 ? (-width) * gport->view.coord_per_px : width;
+}
+
+
+void ghid_gl_set_draw_xor(pcb_hid_gc_t gc, int xor)
+{
+	/* NOT IMPLEMENTED */
+
+	/* Only presently called when setting up a crosshair GC.
+	 * We manage our own drawing model for that anyway. */
+}
+
+void ghid_gl_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	printf("ghid_gl_set_draw_faded(%p,%d) -- not implemented\n", (void *)gc, faded);
+}
+
+void ghid_gl_set_line_cap_angle(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	printf("ghid_gl_set_line_cap_angle() -- not implemented\n");
+}
+
+static void ghid_gl_invalidate_current_gc(void)
+{
+	current_gc = NULL;
+}
+
+static int use_gc(pcb_hid_gc_t gc)
+{
+	if (gc->me_pointer != &gtk2_gl_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to GTK HID\n");
+		abort();
+	}
+
+	if (current_gc == gc)
+		return 1;
+
+	current_gc = gc;
+
+	set_gl_color_for_gc(gc);
+	return 1;
+}
+
+
+static void ghid_gl_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	USE_GC(gc);
+
+	hidgl_draw_line(gc->core_gc.cap, gc->width, x1, y1, x2, y2, gport->view.coord_per_px);
+}
+
+static void ghid_gl_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	USE_GC(gc);
+
+	hidgl_draw_arc(gc->width, cx, cy, xradius, yradius, start_angle, delta_angle, gport->view.coord_per_px);
+}
+
+static void ghid_gl_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	USE_GC(gc);
+
+	hidgl_draw_rect(x1, y1, x2, y2);
+}
+
+
+static void ghid_gl_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	USE_GC(gc);
+
+	hidgl_fill_circle(cx, cy, radius, gport->view.coord_per_px);
+}
+
+
+static void ghid_gl_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	USE_GC(gc);
+
+	hidgl_fill_polygon(n_coords, x, y);
+}
+
+static void ghid_gl_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	USE_GC(gc);
+
+	hidgl_fill_polygon_offs(n_coords, x, y, dx, dy);
+}
+
+static void ghid_gl_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box)
+{
+	USE_GC(gc);
+
+	hidgl_fill_pcb_polygon(poly, clip_box, gport->view.coord_per_px);
+}
+
+static void ghid_gl_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box)
+{
+	pcb_dhlp_thindraw_pcb_polygon(gc, poly, clip_box);
+	/* Disable thindraw poly filling until it is fixed. The poly fill overwrites lines and
+	 * arcs that are drawn underneath.
+	 * 
+	ghid_gl_set_alpha_mult(gc, 0.25);
+	ghid_gl_fill_pcb_polygon(gc, poly, clip_box);
+	ghid_gl_set_alpha_mult(gc, 1.0);
+	*/
+}
+
+static void ghid_gl_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	USE_GC(gc);
+
+	hidgl_fill_rect(x1, y1, x2, y2);
+}
+
+void ghid_gl_invalidate_all()
+{
+	if (ghidgui && ghidgui->topwin.menu.menu_bar)
+		ghid_draw_area_update(gport, NULL);
+}
+
+void ghid_gl_invalidate_lr(pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+{
+	ghid_gl_invalidate_all();
+}
+
+static void ghid_gl_notify_crosshair_change(pcb_bool changes_complete)
+{
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	/* FIXME: We could just invalidate the bounds of the crosshair attached objects? */
+	ghid_gl_invalidate_all();
+}
+
+static void ghid_gl_notify_mark_change(pcb_bool changes_complete)
+{
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	/* FIXME: We could just invalidate the bounds of the mark? */
+	ghid_gl_invalidate_all();
+}
+
+static void pcb_gl_draw_right_cross(GLint x, GLint y, GLint z)
+{
+	glVertex3i(x, 0, z);
+	glVertex3i(x, PCB->MaxHeight, z);
+	glVertex3i(0, y, z);
+	glVertex3i(PCB->MaxWidth, y, z);
+}
+
+static void pcb_gl_draw_slanted_cross(GLint x, GLint y, GLint z)
+{
+	GLint x0, y0, x1, y1;
+
+	x0 = x + (PCB->MaxHeight - y);
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x - y;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + (PCB->MaxWidth - x);
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - x;
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+
+	x0 = x - (PCB->MaxHeight - y);
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x + y;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + x;
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - (PCB->MaxWidth - x);
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+}
+
+static void pcb_gl_draw_dozen_cross(GLint x, GLint y, GLint z)
+{
+	GLint x0, y0, x1, y1;
+	gdouble tan60 = sqrt(3);
+
+	x0 = x + (PCB->MaxHeight - y) / tan60;
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x - y / tan60;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + (PCB->MaxWidth - x) * tan60;
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - x * tan60;
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+
+	x0 = x + (PCB->MaxHeight - y) * tan60;
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x - y * tan60;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + (PCB->MaxWidth - x) / tan60;
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - x / tan60;
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+
+	x0 = x - (PCB->MaxHeight - y) / tan60;
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x + y / tan60;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + x * tan60;
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - (PCB->MaxWidth - x) * tan60;
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+
+	x0 = x - (PCB->MaxHeight - y) * tan60;
+	x0 = MAX(0, MIN(x0, PCB->MaxWidth));
+	x1 = x + y * tan60;
+	x1 = MAX(0, MIN(x1, PCB->MaxWidth));
+	y0 = y + x / tan60;
+	y0 = MAX(0, MIN(y0, PCB->MaxHeight));
+	y1 = y - (PCB->MaxWidth - x) / tan60;
+	y1 = MAX(0, MIN(y1, PCB->MaxHeight));
+	glVertex3i(x0, y0, z);
+	glVertex3i(x1, y1, z);
+}
+
+void pcb_gl_draw_crosshair(GLint x, GLint y, GLint z)
+{
+	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
+
+	pcb_gl_draw_right_cross(x, y, z);
+	if (prev == pcb_ch_shape_union_jack)
+		pcb_gl_draw_slanted_cross(x, y, z);
+	if (prev == pcb_ch_shape_dozen)
+		pcb_gl_draw_dozen_cross(x, y, z);
+	prev = pcb_crosshair.shape;
+}
+
+static void ghid_gl_show_crosshair(gboolean paint_new_location)
+{
+	GLint x, y, z;
+	static int done_once = 0;
+	static pcb_gtk_color_t cross_color;
+
+	if (!paint_new_location)
+		return;
+
+	if (!done_once) {
+		done_once = 1;
+		/* FIXME: when CrossColor changed from config */
+		map_color_string(conf_core.appearance.color.cross, &cross_color);
+	}
+	x = gport->view.crosshair_x;
+	y = gport->view.crosshair_y;
+	z = 0;
+
+	glEnable(GL_COLOR_LOGIC_OP);
+	glLogicOp(GL_XOR);
+
+	glColor3f(cross_color.red / 65535., cross_color.green / 65535., cross_color.blue / 65535.);
+
+	if (x >= 0 && paint_new_location) {
+		glBegin(GL_LINES);
+		pcb_gl_draw_crosshair(x, y, z);
+		glEnd();
+	}
+
+	glDisable(GL_COLOR_LOGIC_OP);
+}
+
+static void ghid_gl_init_renderer(int *argc, char ***argv, void *vport)
+{
+	GHidPort * port = vport;
+	render_priv_t *priv;
+	
+	port->render_priv = priv = g_new0(render_priv_t, 1);
+
+	gtk_gl_init(argc, argv);
+
+	/* setup GL-context */
+	priv->glconfig = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGBA | GDK_GL_MODE_STENCIL | GDK_GL_MODE_DOUBLE);
+	if (!priv->glconfig) {
+		printf("Could not setup GL-context!\n");
+		return;											/* Should we abort? */
+	}
+
+	/* Setup HID function pointers specific to the GL renderer */
+	gtk2_gl_hid.end_layer = ghid_gl_end_layer;
+	gtk2_gl_hid.fill_pcb_polygon = ghid_gl_fill_pcb_polygon;
+	gtk2_gl_hid.thindraw_pcb_polygon = ghid_gl_thindraw_pcb_polygon;
+}
+
+static void ghid_gl_shutdown_renderer(void *p)
+{
+	GHidPort *port = p;
+
+	g_free(port->render_priv);
+	port->render_priv = NULL;
+}
+
+static void ghid_gl_init_drawing_widget(GtkWidget *widget, void *port_)
+{
+	GHidPort *port = port_;
+	render_priv_t *priv = port->render_priv;
+
+	gtk_widget_set_gl_capability(widget, priv->glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE);
+}
+
+static void ghid_gl_drawing_area_configure_hook(void *port)
+{
+	static int done_once = 0;
+	GHidPort *p = port;
+	render_priv_t *priv = p->render_priv;
+
+	gport->drawing_allowed = pcb_true;
+
+	if (!done_once) {
+		if (!map_color_string(conf_core.appearance.color.background, &priv->bg_color))
+			map_color_string("white", &priv->bg_color);
+
+		if (!map_color_string(conf_core.appearance.color.off_limit, &priv->offlimits_color))
+			map_color_string("white", &priv->offlimits_color);
+
+		if (!map_color_string(conf_core.appearance.color.grid, &priv->grid_color))
+			map_color_string("blue", &priv->grid_color);
+		set_special_grid_color();
+
+		done_once = 1;
+	}
+}
+
+static gboolean ghid_gl_start_drawing(GHidPort *port)
+{
+	GtkWidget *widget = port->drawing_area;
+	GdkGLContext *pGlContext = gtk_widget_get_gl_context(widget);
+	GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget);
+	
+	/* make GL-context "current" */
+	if (!gdk_gl_drawable_gl_begin(pGlDrawable, pGlContext))
+		return FALSE;
+
+	port->render_priv->in_context = pcb_true;
+
+	return TRUE;
+}
+
+static void ghid_gl_end_drawing(GHidPort *port)
+{
+	GtkWidget *widget = port->drawing_area;
+	GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget);
+
+	if (gdk_gl_drawable_is_double_buffered(pGlDrawable))
+		gdk_gl_drawable_swap_buffers(pGlDrawable);
+	else
+		glFlush();
+
+	port->render_priv->in_context = pcb_false;
+
+	/* end drawing to current GL-context */
+	gdk_gl_drawable_gl_end(pGlDrawable);
+}
+
+static void ghid_gl_screen_update(void)
+{
+}
+
+/* Settles background color + inital GL configuration, to allow further drawing in GL area.
+    (w, h) describes the total area concerned, while (xr, yr, wr, hr) describes area requested by an expose event.
+    The color structure holds the wanted solid back-ground color, used to first paint the exposed drawing area.
+ */
+static void pcb_gl_draw_expose_init(pcb_hid_t *hid, int w, int h, int xr, int yr, int wr, int hr, pcb_gl_color_t *bg_c)
+{
+	hidgl_init();
+
+	/* If we don't have any stencil bits available,
+	   we can't use the hidgl polygon drawing routine */
+	/* TODO: We could use the GLU tessellator though */
+	if (stencilgl_bit_count() == 0)
+		hid->fill_pcb_polygon = pcb_dhlp_fill_pcb_polygon;
+
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	glViewport(0, 0, w, h);
+
+	glEnable(GL_SCISSOR_TEST);
+	glScissor(xr, yr, wr, hr);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, w, h, 0, 0, 100);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0.0f, 0.0f, -Z_NEAR);
+
+	glEnable(GL_STENCIL_TEST);
+	glClearColor(bg_c->red, bg_c->green, bg_c->blue, 1.);
+	glStencilMask(~0);
+	glClearStencil(0);
+	glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+	stencilgl_reset_stencil_usage();
+
+	/* Disable the stencil test until we need it - otherwise it gets dirty */
+	glDisable(GL_STENCIL_TEST);
+	glStencilMask(0);
+	glStencilFunc(GL_ALWAYS, 0, 0);
+}
+
+/* alpha component is not part of GdkColor structure. Can't derive it from GTK2 pcb_gtk_color_t */
+static void gtk2gl_color(pcb_gl_color_t *gl_c, pcb_gtk_color_t *gtk_c)
+{
+	gl_c->red   = gtk_c->red   / 65535.;
+	gl_c->green = gtk_c->green / 65535.;
+	gl_c->blue  = gtk_c->blue  / 65535.;
+}
+
+static gboolean ghid_gl_drawing_area_expose_cb(GtkWidget *widget, pcb_gtk_expose_t *ev, void *vport)
+{
+	GHidPort * port = vport;
+	render_priv_t *priv = port->render_priv;
+	GtkAllocation allocation;
+	pcb_hid_expose_ctx_t ctx;
+	pcb_gl_color_t off_c, bg_c;
+
+	gtk_widget_get_allocation(widget, &allocation);
+
+	ghid_gl_start_drawing(port);
+
+	ctx.view.X1 = MIN(Px(ev->area.x), Px(ev->area.x + ev->area.width + 1));
+	ctx.view.X2 = MAX(Px(ev->area.x), Px(ev->area.x + ev->area.width + 1));
+	ctx.view.Y1 = MIN(Py(ev->area.y), Py(ev->area.y + ev->area.height + 1));
+	ctx.view.Y2 = MAX(Py(ev->area.y), Py(ev->area.y + ev->area.height + 1));
+
+	ctx.view.X1 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X1));
+	ctx.view.X2 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X2));
+	ctx.view.Y1 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y1));
+	ctx.view.Y2 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y2));
+
+	gtk2gl_color(&off_c, &priv->offlimits_color);
+	gtk2gl_color(&bg_c,  &priv->bg_color);
+
+	pcb_gl_draw_expose_init(&gtk2_gl_hid, allocation.width, allocation.height,
+				ev->area.x, allocation.height - ev->area.height - ev->area.y, ev->area.width, ev->area.height, &off_c);
+
+	glScalef((conf_core.editor.view.flip_x ? -1. : 1.) / port->view.coord_per_px,
+					 (conf_core.editor.view.flip_y ? -1. : 1.) / port->view.coord_per_px,
+					 ((conf_core.editor.view.flip_x == conf_core.editor.view.flip_y) ? 1. : -1.) / port->view.coord_per_px);
+	glTranslatef(conf_core.editor.view.flip_x ? port->view.x0 - PCB->MaxWidth :
+							 -port->view.x0, conf_core.editor.view.flip_y ? port->view.y0 - PCB->MaxHeight : -port->view.y0, 0);
+
+	/* Draw PCB background, before PCB primitives */
+	glColor3f(bg_c.red, bg_c.green, bg_c.blue);
+	glBegin(GL_QUADS);
+	glVertex3i(0, 0, 0);
+	glVertex3i(PCB->MaxWidth, 0, 0);
+	glVertex3i(PCB->MaxWidth, PCB->MaxHeight, 0);
+	glVertex3i(0, PCB->MaxHeight, 0);
+	glEnd();
+
+	ghid_gl_draw_bg_image();
+
+	ghid_gl_invalidate_current_gc();
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	pcb_hid_expose_all(&gtk2_gl_hid, &ctx);
+	drawgl_flush();
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+
+	ghid_gl_draw_grid(&ctx.view);
+
+	ghid_gl_invalidate_current_gc();
+
+	pcb_draw_attached(0);
+	pcb_draw_mark(0);
+	drawgl_flush();
+
+	ghid_gl_show_crosshair(TRUE);
+
+	drawgl_flush();
+
+	draw_lead_user(priv);
+
+	ghid_gl_end_drawing(port);
+
+	return FALSE;
+}
+
+/* This realize callback is used to work around a crash bug in some mesa
+ * versions (observed on a machine running the intel i965 driver. It isn't
+ * obvious why it helps, but somehow fiddling with the GL context here solves
+ * the issue. The problem appears to have been fixed in recent mesa versions.
+ */
+static void ghid_gl_port_drawing_realize_cb(GtkWidget *widget, gpointer data)
+{
+	GdkGLContext *glcontext = gtk_widget_get_gl_context(widget);
+	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget);
+	
+	if (!gdk_gl_drawable_gl_begin(gldrawable, glcontext))
+		return;
+
+	gdk_gl_drawable_gl_end(gldrawable);
+	return;
+}
+
+static gboolean ghid_gl_preview_expose(GtkWidget * widget, pcb_gtk_expose_t *ev, pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t *ctx)
+{
+/*	GdkWindow *window = gtk_widget_get_window(widget);*/
+	GdkGLContext *pGlContext = gtk_widget_get_gl_context(widget);
+	GdkGLDrawable *pGlDrawable = gtk_widget_get_gl_drawable(widget);
+	GtkAllocation allocation;
+	render_priv_t *priv = gport->render_priv;
+	pcb_gtk_view_t save_view;
+	int save_width, save_height;
+	double xz, yz, vw, vh;
+	double xr, yr, wr, hr;
+	pcb_coord_t ox1 = ctx->view.X1, oy1 = ctx->view.Y1, ox2 = ctx->view.X2, oy2 = ctx->view.Y2;
+	pcb_gl_color_t bg_c;
+
+	vw = ctx->view.X2 - ctx->view.X1;
+	vh = ctx->view.Y2 - ctx->view.Y1;
+
+	save_view = gport->view;
+	save_width = gport->view.canvas_width;
+	save_height = gport->view.canvas_height;
+
+	/* Setup zoom factor for drawing routines */
+
+	gtk_widget_get_allocation(widget, &allocation);
+	xz = vw / (double) allocation.width;
+	yz = vh / (double) allocation.height;
+
+	if (xz > yz)
+		gport->view.coord_per_px = xz;
+	else
+		gport->view.coord_per_px = yz;
+
+	gport->view.canvas_width = allocation.width;
+	gport->view.canvas_height = allocation.height;
+	gport->view.width = allocation.width * gport->view.coord_per_px;
+	gport->view.height = allocation.height * gport->view.coord_per_px;
+	gport->view.x0 = (vw - gport->view.width) / 2 + ctx->view.X1;
+	gport->view.y0 = (vh - gport->view.height) / 2 + ctx->view.Y1;
+
+	PCB_GTK_PREVIEW_TUNE_EXTENT(ctx, allocation);
+
+	/* make GL-context "current" */
+	if (!gdk_gl_drawable_gl_begin(pGlDrawable, pGlContext)) {
+		return FALSE;
+	}
+	gport->render_priv->in_context = pcb_true;
+
+	if (ev) {
+		xr = ev->area.x;
+		yr = allocation.height - ev->area.height - ev->area.y;
+		wr = ev->area.width;
+		hr = ev->area.height;
+	}
+	else {
+		xr = yr = 0;
+		wr = allocation.width;
+		hr = allocation.height;
+	}
+
+	gtk2gl_color(&bg_c, &priv->bg_color);
+
+	glEnable(GL_BLEND);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	glViewport(0, 0, allocation.width, allocation.height);
+
+	glEnable(GL_SCISSOR_TEST);
+	glScissor(xr, yr, wr, hr);
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0, allocation.width, allocation.height, 0, 0, 100);
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+	glTranslatef(0.0f, 0.0f, -Z_NEAR);
+
+	glEnable(GL_STENCIL_TEST);
+	glClearColor(bg_c.red, bg_c.green, bg_c.blue, 1.);
+	glStencilMask(~0);
+	glClearStencil(0);
+	glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+
+	stencilgl_reset_stencil_usage();
+	glDisable(GL_STENCIL_TEST);
+	glStencilMask(0);
+	glStencilFunc(GL_ALWAYS, 0, 0);
+
+	/* call the drawing routine */
+	ghid_gl_invalidate_current_gc();
+	glPushMatrix();
+	glScalef((conf_core.editor.view.flip_x ? -1. : 1.) / gport->view.coord_per_px,
+					 (conf_core.editor.view.flip_y ? -1. : 1.) / gport->view.coord_per_px, 1);
+	glTranslatef(conf_core.editor.view.flip_x ? gport->view.x0 - PCB->MaxWidth :
+							 -gport->view.x0, conf_core.editor.view.flip_y ? gport->view.y0 - PCB->MaxHeight : -gport->view.y0, 0);
+
+	expcall(&gtk2_gl_hid, ctx);
+
+	drawgl_flush();
+	glPopMatrix();
+
+	if (gdk_gl_drawable_is_double_buffered(pGlDrawable))
+		gdk_gl_drawable_swap_buffers(pGlDrawable);
+	else
+		glFlush();
+
+	/* end drawing to current GL-context */
+	gport->render_priv->in_context = pcb_false;
+	gdk_gl_drawable_gl_end(pGlDrawable);
+
+	/* restore the original context and priv */
+	ctx->view.X1 = ox1; ctx->view.X2 = ox2; ctx->view.Y1 = oy1; ctx->view.Y2 = oy2;
+	gport->view = save_view;
+	gport->view.canvas_width = save_width;
+	gport->view.canvas_height = save_height;
+
+	return FALSE;
+}
+
+static void draw_lead_user(render_priv_t * priv)
+{
+	int i;
+	pcb_lead_user_t *lead_user = &gport->lead_user;
+	double radius = lead_user->radius;
+	double width = PCB_MM_TO_COORD(LEAD_USER_WIDTH);
+	double separation = PCB_MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
+
+	if (!lead_user->lead_user)
+		return;
+
+	glPushAttrib(GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT);
+	glEnable(GL_COLOR_LOGIC_OP);
+	glLogicOp(GL_XOR);
+	glColor3f(LEAD_USER_COLOR_R, LEAD_USER_COLOR_G, LEAD_USER_COLOR_B);
+
+
+	/* arcs at the appropriate radii */
+
+	for (i = 0; i < LEAD_USER_ARC_COUNT; i++, radius -= separation) {
+		if (radius < width)
+			radius += PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+
+		/* Draw an arc at radius */
+		hidgl_draw_arc(width, lead_user->x, lead_user->y, radius, radius, 0, 360, gport->view.coord_per_px);
+	}
+
+	drawgl_flush();
+	glPopAttrib();
+}
+
+static GtkWidget *ghid_gl_new_drawing_widget(pcb_gtk_common_t *common)
+{
+	GtkWidget *w = gtk_drawing_area_new();
+
+	g_signal_connect(G_OBJECT(w), "expose_event", G_CALLBACK(common->drawing_area_expose), common->gport);
+
+	return w;
+}
+
+
+void ghid_gl_install(pcb_gtk_common_t *common, pcb_hid_t *hid)
+{
+
+	if (common != NULL) {
+	common->new_drawing_widget = ghid_gl_new_drawing_widget;
+	common->init_drawing_widget = ghid_gl_init_drawing_widget;
+	common->drawing_realize = ghid_gl_port_drawing_realize_cb;
+	common->drawing_area_expose = ghid_gl_drawing_area_expose_cb;
+	common->preview_expose = ghid_gl_preview_expose;
+	common->invalidate_all = ghid_gl_invalidate_all;
+	common->set_special_colors = ghid_gl_set_special_colors;
+	common->init_renderer = ghid_gl_init_renderer;
+	common->screen_update = ghid_gl_screen_update;
+	common->draw_grid_local = ghid_gl_draw_grid_local;
+	common->drawing_area_configure_hook = ghid_gl_drawing_area_configure_hook;
+	common->shutdown_renderer = ghid_gl_shutdown_renderer;
+	common->get_color_name = get_color_name;
+	common->map_color_string = map_color_string;
+	}
+
+	if (hid != NULL) {
+	hid->invalidate_lr = ghid_gl_invalidate_lr;
+	hid->invalidate_all = ghid_gl_invalidate_all;
+	hid->notify_crosshair_change = ghid_gl_notify_crosshair_change;
+	hid->notify_mark_change = ghid_gl_notify_mark_change;
+	hid->set_layer_group = ghid_gl_set_layer_group;
+	hid->make_gc = ghid_gl_make_gc;
+	hid->destroy_gc = ghid_gl_destroy_gc;
+	hid->set_color = ghid_gl_set_color;
+	hid->set_line_cap = ghid_gl_set_line_cap;
+	hid->set_line_width = ghid_gl_set_line_width;
+	hid->set_draw_xor = ghid_gl_set_draw_xor;
+	hid->draw_line = ghid_gl_draw_line;
+	hid->draw_arc = ghid_gl_draw_arc;
+	hid->draw_rect = ghid_gl_draw_rect;
+	hid->fill_circle = ghid_gl_fill_circle;
+	hid->fill_polygon = ghid_gl_fill_polygon;
+	hid->fill_polygon_offs = ghid_gl_fill_polygon_offs;
+	hid->fill_rect = ghid_gl_fill_rect;
+
+	hid->set_drawing_mode = hidgl_set_drawing_mode;
+	hid->render_burst = ghid_gl_render_burst;
+	}
+}
+
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-main.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/gtkhid-main.c	(revision 18980)
@@ -0,0 +1,70 @@
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_init.h"
+#include "conf_core.h"
+
+#include "../src_plugins/lib_hid_gl/draw_gl.h"
+
+#include "../src_plugins/lib_gtk_common/glue.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/glue_common.h"
+#include "../src_plugins/lib_gtk_hid/glue_hid.h"
+#include "../src_plugins/lib_gtk_hid/glue_conf.h"
+#include "../src_plugins/lib_gtk_hid/glue_event.h"
+#include "../src_plugins/lib_gtk_hid/glue_win32.h"
+#include "../src_plugins/lib_gtk_hid/common.h"
+#include "../src_plugins/lib_gtk_hid/render.h"
+
+const char *ghid_gl_cookie = "gtk2 hid, gl";
+const char *ghid_gl_menu_cookie = "gtk2 hid menu, gl";
+
+pcb_hid_t gtk2_gl_hid;
+
+int gtk2_gl_parse_arguments(int *argc, char ***argv)
+{
+	ghid_gl_install(&ghidgui->common, NULL);
+	return gtkhid_parse_arguments(argc, argv);
+}
+
+int pplg_check_ver_hid_gtk2_gl(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_gtk2_gl(void)
+{
+	pcb_event_unbind_allcookie(ghid_gl_cookie);
+	conf_hid_unreg(ghid_gl_cookie);
+	conf_hid_unreg(ghid_gl_menu_cookie);
+	drawgl_uninit();
+}
+
+int pplg_init_hid_gtk2_gl(void)
+{
+	PCB_API_CHK_VER;
+	ghid_win32_init();
+
+	ghid_glue_hid_init(&gtk2_gl_hid);
+	ghid_glue_common_init();
+
+	gtk2_gl_hid.parse_arguments = gtk2_gl_parse_arguments;
+	ghid_gl_install(NULL, &gtk2_gl_hid);
+
+	gtk2_gl_hid.name = "gtk2_gl";
+	gtk2_gl_hid.description = "Gtk2 - The Gimp Toolkit, with opengl rendering";
+
+	ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(ghid_gl_menu_cookie, NULL);
+	ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox;
+	ghid_conf_regs(ghid_gl_cookie);
+
+	pcb_hid_register_hid(&gtk2_gl_hid);
+
+	glue_event_init(ghid_gl_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/hid_gtk2_gl.pup	(revision 18980)
@@ -0,0 +1,13 @@
+$class hid
+$short GTK2 GUI, opengl render
+$long GUI: GTK2 with opengl rendering
+$state works
+$package hid-gtk2-gl
+default buildin
+dep lib_gtk_common
+dep lib_gtk_config
+dep lib_gtk_hid
+dep lib_hid_gl
+dep draw_csect
+dep draw_fontsel
+autoload 1
Index: tags/2.0.1/src_plugins/hid_gtk2_gl/pcb.rc
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk2_gl/pcb.rc	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk2_gl/pcb.rc	(revision 18980)
@@ -0,0 +1 @@
+1 ICON "pcb_icon.ico"
Index: tags/2.0.1/src_plugins/hid_gtk3_cairo/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_cairo/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_cairo/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_gtk3_cairo
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_gtk3_cairo/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_cairo/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_cairo/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,20 @@
+put /local/pcb/mod {hid_gtk3_cairo}
+put /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/hid_gtk3_cairo/gtkhid-main.o
+	$(PLUGDIR)/hid_gtk3_cairo/gtkhid-cairo.o
+@]
+
+switch /local/pcb/hid_gtk3_cairo/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtk3/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtk3/ldflags
+		append /local/pcb/CFLAGS { -DPCB_GTK3=1 }
+	end
+end
+
+switch /local/pcb/hid_gtk3_cairo/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 18980)
@@ -0,0 +1,1660 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017,2018 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+
+#include "crosshair.h"
+#include "data.h"
+#include "layer.h"
+#include "grid.h"
+#include "hid_draw_helpers.h"
+#include "hid_attrib.h"
+#include "hid_color.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/coord_conv.h"
+#include "../src_plugins/lib_gtk_hid/preview_helper.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+#include "../src_plugins/lib_hid_common/clip.h"
+
+extern pcb_hid_t gtk3_cairo_hid;
+static void ghid_cairo_screen_update(void);
+
+/* Sets priv->u_gc to the "right" GC to use (wrt mask or window)
+*/
+#define USE_GC(gc) if (!use_gc(gc)) return
+
+//static int cur_mask = -1;
+//static int mask_seq = 0;
+static pcb_composite_op_t curr_drawing_mode;
+
+typedef struct render_priv_s {
+	GdkRGBA bg_color;											/* cached back-ground color           */
+	GdkRGBA offlimits_color;							/* cached external board color        */
+	GdkRGBA grid_color;										/* cached grid color                  */
+	GdkRGBA crosshair_color;							/* cached crosshair color             */
+
+	cairo_t *cr;													/* pointer to current drawing context             */
+	cairo_t *cr_target;										/* pointer to destination widget drawing context  */
+
+	cairo_surface_t *surf_da;							/* cairo surface connected to gport->drawing_area */
+	cairo_t *cr_drawing_area;							/* cairo context created from surf_da             */
+
+	cairo_surface_t *surf_layer;					/* cairo surface for temporary layer composition  */
+	cairo_t *cr_layer;										/* cairo context created from surf_layer          */
+
+	//GdkPixmap *pixmap, *mask;
+
+	//GdkGC *bg_gc;
+	//GdkGC *offlimits_gc;
+	//GdkGC *mask_gc;
+	//GdkGC *u_gc;
+	//GdkGC *grid_gc;
+	pcb_bool clip;
+	GdkRectangle clip_rect;
+	int xor_mode;													/* 1 if drawn in XOR mode, 0 otherwise*/
+	int attached_invalidate_depth;
+	int mark_invalidate_depth;
+} render_priv_t;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+
+	const char *colorname;								/* current color name for this GC.    */
+	GdkRGBA color;												/* current color      for this GC.    */
+
+	pcb_coord_t width;
+	cairo_line_cap_t cap;
+	cairo_line_join_t join;
+	gchar xor_mask;
+	//gint mask_seq;
+} hid_gc_s;
+
+static void draw_lead_user(render_priv_t * priv_);
+
+static void copy_color(GdkRGBA * dest, GdkRGBA * source)
+{
+	dest->red = source->red;
+	dest->green = source->green;
+	dest->blue = source->blue;
+	dest->alpha = source->alpha;
+}
+
+static const gchar *get_color_name(pcb_gtk_color_t * color)
+{
+	static char tmp[16];
+
+	if (!color)
+		return "#000000";
+
+	sprintf(tmp, "#%2.2x%2.2x%2.2x",
+					(int) (color->red * 255) & 0xff, (int) (color->green * 255) & 0xff, (int) (color->blue * 255) & 0xff);
+	return tmp;
+}
+
+/* Returns TRUE if color_string has been successfully parsed to color. */
+static pcb_bool map_color_string(const char *color_string, pcb_gtk_color_t * color)
+{
+	pcb_bool parsed;
+
+	if (!color)
+		return FALSE;
+
+	parsed = gdk_rgba_parse(color, color_string);
+
+	return parsed;
+}
+
+static void cr_draw_line(cairo_t * cr, int fill, double x1, double y1, double x2, double y2)
+{
+	if (cr == NULL)
+		return;
+
+	cairo_move_to(cr, x1, y1);
+	cairo_line_to(cr, x2, y2);
+	if (fill)
+#warning gtk3 TODO: What means "fill a line" ? cairo_fill is not appropriate if path is only a line.
+		cairo_fill(cr);
+	else
+		cairo_stroke(cr);
+}
+
+static void cr_destroy_surf_and_context(cairo_surface_t ** psurf, cairo_t ** pcr)
+{
+	if (*psurf)
+		cairo_surface_destroy(*psurf);
+	if (*pcr)
+		cairo_destroy(*pcr);
+
+	*psurf = NULL;
+	*pcr = NULL;
+}
+
+/* First, frees previous surface and context, then creates new ones, similar to drawing_area. */
+static void cr_create_similar_surface_and_context(cairo_surface_t ** psurf, cairo_t ** pcr, void *vport)
+{
+	GHidPort *port = vport;
+	cairo_surface_t *surface;
+	cairo_t *cr;
+
+	cr_destroy_surf_and_context(psurf, pcr);
+
+	surface = gdk_window_create_similar_surface(gtk_widget_get_window(port->drawing_area),
+																							CAIRO_CONTENT_COLOR_ALPHA,
+																							gtk_widget_get_allocated_width(port->drawing_area),
+																							gtk_widget_get_allocated_height(port->drawing_area));
+	cr = cairo_create(surface);
+	*psurf = surface;
+	*pcr = cr;
+}
+
+/* Creates or reuses a context to render a single layer group with "union" type of shape rendering. */
+static void start_subcomposite(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr;
+
+	if (priv->surf_layer == NULL)
+		cr_create_similar_surface_and_context(&priv->surf_layer, &priv->cr_layer, gport);
+	cr = priv->cr_layer;
+	cairo_save(cr);
+	cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+	cairo_paint(cr);
+	cairo_restore(cr);
+	cairo_set_operator(priv->cr, CAIRO_OPERATOR_SOURCE);
+	priv->cr = priv->cr_layer;
+}
+
+/* Applies the layer composited so far, to the target, using translucency. */
+static void end_subcomposite(void)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	cairo_set_operator(priv->cr_target, CAIRO_OPERATOR_OVER);
+	cairo_set_source_surface(priv->cr_target, priv->surf_layer, 0, 0);
+	cairo_paint_with_alpha(priv->cr_target, conf_core.appearance.layer_alpha);
+	priv->cr = priv->cr_target;
+}
+
+static int ghid_cairo_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	int idx = group;
+	if (idx >= 0 && idx < pcb_max_group(PCB)) {
+		int n = PCB->LayerGroups.grp[group].len;
+		for (idx = 0; idx < n - 1; idx++) {
+			int ni = PCB->LayerGroups.grp[group].lid[idx];
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].meta.real.vis)
+				break;
+		}
+		idx = PCB->LayerGroups.grp[group].lid[idx];
+	}
+
+	start_subcomposite();
+
+	/* non-virtual layers with group visibility */
+	switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_MASK:
+		case PCB_LYT_PASTE:
+			return (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) && PCB->LayerGroups.grp[group].vis /*&& !pinout */ );
+	}
+
+	/* normal layers */
+	if (idx >= 0 && idx < pcb_max_layer && ((flags & PCB_LYT_ANYTHING) != PCB_LYT_SILK))
+		return /*pinout ? 1 : */ PCB->Data->Layer[idx].meta.real.vis;
+
+	/* virtual layers */
+	{
+		switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_INVIS:
+			return /* pinout ? 0 : */ PCB->InvisibleObjectsOn;
+		case PCB_LYT_SILK:
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) /*|| pinout */ )
+				return pcb_silk_on(PCB);
+			return 0;
+		case PCB_LYT_ASSY:
+			return 0;
+		case PCB_LYT_PDRILL:
+		case PCB_LYT_UDRILL:
+			return 1;
+		case PCB_LYT_UI:
+			return 1;
+		case PCB_LYT_RAT:
+			return PCB->RatOn;
+		}
+	}
+	return 0;
+}
+
+static void ghid_cairo_end_layer_group(void)
+{
+	end_subcomposite();
+}
+
+#warning TODO: misleading comment or broken code
+/* Do not clean up internal structures, as they will be used probably elsewhere. */
+static void ghid_cairo_destroy_gc(pcb_hid_gc_t gc)
+{
+	g_free(gc);
+}
+
+/* called from pcb_hid_t->make_gc() . Use only this to hold pointers, do not
+   own references, avoid costly memory allocation that needs to be destroyed with
+   ghid_cairo_destroy_gc(). */
+static pcb_hid_gc_t ghid_cairo_make_gc(void)
+{
+	pcb_hid_gc_t rv;
+
+	rv = g_new0(hid_gc_s, 1);
+	rv->me_pointer = &gtk3_cairo_hid;
+	rv->colorname = conf_core.appearance.color.background;
+	return rv;
+}
+
+#warning gtk3 TODO: check if clipping is not necessary
+//static void set_clip(render_priv_t * priv, cairo_t * cr)
+//{
+//	if (cr == NULL)
+//		return;
+//
+//	if (priv->clip) {
+//		gdk_cairo_rectangle(cr, &priv->clip_rect);
+//		cairo_clip(cr);
+//	}
+//	else {
+//		/*FIXME: do nothing if no clipping ? */
+//		//cairo_mask(cr, NULL);
+//		//gdk_gc_set_clip_mask(gc, NULL);
+//	}
+//}
+
+static inline void ghid_cairo_draw_grid_global(cairo_t *cr)
+{
+	//render_priv_t *priv = gport->render_priv;
+	pcb_coord_t x, y, x1, y1, x2, y2, grd;
+	int n, i;
+	static GdkPoint *points = NULL;
+	static int npoints = 0;
+
+	x1 = pcb_grid_fit(MAX(0, SIDE_X(gport->view.x0)), PCB->Grid, PCB->GridOffsetX);
+	y1 = pcb_grid_fit(MAX(0, SIDE_Y(gport->view.y0)), PCB->Grid, PCB->GridOffsetY);
+	x2 = pcb_grid_fit(MIN(PCB->MaxWidth, SIDE_X(gport->view.x0 + gport->view.width - 1)), PCB->Grid, PCB->GridOffsetX);
+	y2 = pcb_grid_fit(MIN(PCB->MaxHeight, SIDE_Y(gport->view.y0 + gport->view.height - 1)), PCB->Grid, PCB->GridOffsetY);
+
+	grd = PCB->Grid;
+
+	if (Vz(grd) < conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px) {
+		if (!conf_hid_gtk.plugins.hid_gtk.global_grid.sparse)
+			return;
+		grd *= (conf_hid_gtk.plugins.hid_gtk.global_grid.min_dist_px / Vz(grd));
+	}
+
+	if (x1 > x2) {
+		pcb_coord_t tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+	if (y1 > y2) {
+		pcb_coord_t tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+	if (Vx(x1) < 0)
+		x1 += grd;
+	if (Vy(y1) < 0)
+		y1 += grd;
+	if (Vx(x2) >= gport->view.canvas_width)
+		x2 -= grd;
+	if (Vy(y2) >= gport->view.canvas_height)
+		y2 -= grd;
+
+
+	n = (x2 - x1) / grd + 1;
+	if (n > npoints) {
+		npoints = n + 10;
+		points = (GdkPoint *) realloc(points, npoints * sizeof(GdkPoint));
+	}
+	n = 0;
+	for (x = x1; x <= x2; x += grd) {
+		points[n].x = Vx(x);
+		n++;
+	}
+	if (n == 0)
+		return;
+
+	/* Draw N points... is this the most efficient ? At least, it works.
+	   From cairo development :
+	   "    cairo_move_to (cr, x, y);
+	   .    cairo_line_to (cr, x, y);
+	   .    .. repeat for each point ..
+	   .    
+	   .    cairo_stroke (cr);
+	   .    
+	   .  Within the implementation (and test suite) we call these "degenerate"
+	   .  paths and we explicitly support drawing round caps for such degenerate
+	   .  paths. So this should work perfectly for the case of
+	   .  CAIRO_LINE_CAP_ROUND and you'll get the diameter controlled by
+	   .  cairo_set_line_width just like you want.
+	   "
+	 */
+	for (y = y1; y <= y2; y += grd) {
+		for (i = 0; i < n; i++) {
+			points[i].y = Vy(y);
+			cairo_move_to(cr, points[i].x, points[i].y);
+			cairo_line_to(cr, points[i].x, points[i].y);
+		}
+		cairo_stroke(cr);
+	}
+}
+
+static void ghid_cairo_draw_grid_local_(pcb_coord_t cx, pcb_coord_t cy, int radius)
+{
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr = priv->cr_target;
+	static GdkPoint *points_base = NULL;
+	static GdkPoint *points_abs = NULL;
+	static int apoints = 0, npoints = 0, old_radius = 0;
+	static pcb_coord_t last_grid = 0;
+	int recalc = 0, n, r2;
+	pcb_coord_t x, y;
+
+	/* PI is approximated with 3.25 here - allows a minimal overallocation, speeds up calculations */
+	r2 = radius * radius;
+	n = r2 * 3 + r2 / 4 + 1;
+	if (n > apoints) {
+		apoints = n;
+		points_base = (GdkPoint *) realloc(points_base, apoints * sizeof(GdkPoint));
+		points_abs = (GdkPoint *) realloc(points_abs, apoints * sizeof(GdkPoint));
+	}
+
+	if (radius != old_radius) {
+		old_radius = radius;
+		recalc = 1;
+	}
+
+	if (last_grid != PCB->Grid) {
+		last_grid = PCB->Grid;
+		recalc = 1;
+	}
+
+	/* recaculate the 'filled circle' mask (base relative coords) if grid or radius changed */
+	if (recalc) {
+
+		npoints = 0;
+		for (y = -radius; y <= radius; y++) {
+			int y2 = y * y;
+			for (x = -radius; x <= radius; x++) {
+				if (x * x + y2 < r2) {
+					points_base[npoints].x = x * PCB->Grid;
+					points_base[npoints].y = y * PCB->Grid;
+					npoints++;
+				}
+			}
+		}
+	}
+
+	/* calculate absolute positions */
+	for (n = 0; n < npoints; n++) {
+		points_abs[n].x = Vx(points_base[n].x + cx);
+		points_abs[n].y = Vy(points_base[n].y + cy);
+		cairo_move_to(cr, points_abs[n].x, points_abs[n].y);
+		cairo_line_to(cr, points_abs[n].x, points_abs[n].y);
+	}
+	cairo_stroke(cr);
+	//gdk_draw_points(gport->drawable, priv->grid_gc, points_abs, npoints);
+}
+
+static int grid_local_have_old = 0, grid_local_old_r = 0;
+static pcb_coord_t grid_local_old_x, grid_local_old_y;
+
+static void ghid_cairo_draw_grid_local(pcb_coord_t cx, pcb_coord_t cy)
+{
+	if (grid_local_have_old) {
+		ghid_cairo_draw_grid_local_(grid_local_old_x, grid_local_old_y, grid_local_old_r);
+		grid_local_have_old = 0;
+	}
+
+	if (!conf_hid_gtk.plugins.hid_gtk.local_grid.enable)
+		return;
+
+	if ((Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE) || (!conf_core.editor.draw_grid))
+		return;
+
+	/* cx and cy are the actual cursor snapped to wherever - round them to the nearest real grid point */
+	cx = (cx / PCB->Grid) * PCB->Grid + PCB->GridOffsetX;
+	cy = (cy / PCB->Grid) * PCB->Grid + PCB->GridOffsetY;
+
+	grid_local_have_old = 1;
+	ghid_cairo_draw_grid_local_(cx, cy, conf_hid_gtk.plugins.hid_gtk.local_grid.radius);
+	grid_local_old_x = cx;
+	grid_local_old_y = cy;
+	grid_local_old_r = conf_hid_gtk.plugins.hid_gtk.local_grid.radius;
+}
+
+static void ghid_cairo_draw_grid(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr = priv->cr_target;
+
+	if (cr == NULL)
+		return;
+
+	grid_local_have_old = 0;
+
+	if (!conf_core.editor.draw_grid)
+		return;
+	//if (!priv->grid_gc) {
+	//  if (gdk_color_parse(conf_core.appearance.color.grid, &gport->grid_color)) {
+	//    gport->grid_color.red ^= gport->bg_color.red;
+	//    gport->grid_color.green ^= gport->bg_color.green;
+	//    gport->grid_color.blue ^= gport->bg_color.blue;
+	//    gdk_color_alloc(gport->colormap, &gport->grid_color);
+	//  }
+	//  priv->grid_gc = gdk_gc_new(gport->drawable);
+	//  gdk_gc_set_function(priv->grid_gc, GDK_XOR);
+	//  gdk_gc_set_foreground(priv->grid_gc, &gport->grid_color);
+	//  gdk_gc_set_clip_origin(priv->grid_gc, 0, 0);
+	//  set_clip(priv, priv->grid_gc);
+	//}
+
+	cairo_save(cr);
+#warning gtk3 TODO: deal with gc
+	cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
+	cairo_set_line_width(cr, 1.0);
+	gdk_cairo_set_source_rgba(cr, &priv->grid_color);
+
+	if (conf_hid_gtk.plugins.hid_gtk.local_grid.enable) {
+		ghid_cairo_draw_grid_local(grid_local_old_x, grid_local_old_y);
+		cairo_restore(cr);
+		return;
+	}
+
+	ghid_cairo_draw_grid_global(cr);
+	cairo_restore(cr);
+}
+
+/* ------------------------------------------------------------ */
+static void ghid_cairo_draw_bg_image(void)
+{
+	static GdkPixbuf *pixbuf;
+	GdkInterpType interp_type;
+	gint src_x, src_y, dst_x, dst_y, w, h, w_src, h_src;
+	static gint w_scaled, h_scaled;
+	render_priv_t *priv = gport->render_priv;
+
+	if (!ghidgui->bg_pixbuf)
+		return;
+
+	src_x = gport->view.x0;
+	src_y = gport->view.y0;
+	dst_x = 0;
+	dst_y = 0;
+
+	if (src_x < 0) {
+		dst_x = -src_x;
+		src_x = 0;
+	}
+	if (src_y < 0) {
+		dst_y = -src_y;
+		src_y = 0;
+	}
+
+	w = PCB->MaxWidth / gport->view.coord_per_px;
+	h = PCB->MaxHeight / gport->view.coord_per_px;
+	src_x = src_x / gport->view.coord_per_px;
+	src_y = src_y / gport->view.coord_per_px;
+	dst_x = dst_x / gport->view.coord_per_px;
+	dst_y = dst_y / gport->view.coord_per_px;
+
+	if (w_scaled != w || h_scaled != h) {
+		if (pixbuf)
+			g_object_unref(G_OBJECT(pixbuf));
+
+		w_src = gdk_pixbuf_get_width(ghidgui->bg_pixbuf);
+		h_src = gdk_pixbuf_get_height(ghidgui->bg_pixbuf);
+		if (w > w_src && h > h_src)
+			interp_type = GDK_INTERP_NEAREST;
+		else
+			interp_type = GDK_INTERP_BILINEAR;
+
+		pixbuf = gdk_pixbuf_scale_simple(ghidgui->bg_pixbuf, w, h, interp_type);
+		w_scaled = w;
+		h_scaled = h;
+	}
+
+	if (pixbuf) {
+		gdk_cairo_set_source_pixbuf(priv->cr, pixbuf, src_x, src_y);
+		cairo_rectangle(priv->cr, dst_x, dst_y, gport->view.canvas_width, gport->view.canvas_height);
+		cairo_fill(priv->cr);
+		//gdk_pixbuf_render_to_drawable(pixbuf, gport->drawable, priv->bg_gc,
+		//                              src_x, src_y, dst_x, dst_y, w - src_x, h - src_y, GDK_RGB_DITHER_NORMAL, 0, 0);
+	}
+}
+
+static void ghid_cairo_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	pcb_gui->coord_per_pix = gport->view.coord_per_px;
+}
+
+/* Drawing modes usually cycle from RESET to (POSITIVE | NEGATIVE) to FLUSH. screen is not used in this HID. */
+static void ghid_cairo_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if (!priv->cr) {
+		//abort();
+		return;
+	}
+
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			//ghid_sketch_setup(priv);
+			start_subcomposite();
+
+		/* clear the canvas */
+			//priv->clip_color.pixel = 0;
+			//if (priv->clear_gc == NULL)
+			//	priv->clear_gc = gdk_gc_new(priv->out_clip);
+			//gdk_gc_set_foreground(priv->clear_gc, &priv->clip_color);
+			//set_clip(priv, priv->clear_gc);
+			//gdk_draw_rectangle(priv->out_clip, priv->clear_gc, TRUE, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			//priv->clip_color.pixel = 1;
+			cairo_set_operator(priv->cr, CAIRO_OPERATOR_SOURCE);
+			break;
+
+		case PCB_HID_COMP_NEGATIVE:
+			//priv->clip_color.pixel = 0;
+			cairo_set_operator(priv->cr, CAIRO_OPERATOR_CLEAR);
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			if (direct)
+				end_subcomposite();
+			else {
+				priv->cr = priv->cr_target;
+				cairo_mask_surface(priv->cr, priv->surf_layer, 0, 0);
+				cairo_fill(priv->cr);
+			}
+			//cairo_paint_with_alpha(priv->cr, conf_core.appearance.layer_alpha);
+			//cairo_paint_with_alpha(priv->cr, 1.0);
+
+			//if (priv->copy_gc == NULL)
+			//	priv->copy_gc = gdk_gc_new(priv->out_pixel);
+			//gdk_gc_set_clip_mask(priv->copy_gc, priv->sketch_clip);
+			//gdk_gc_set_clip_origin(priv->copy_gc, 0, 0);
+			//gdk_draw_drawable(priv->base_pixel, priv->copy_gc, priv->sketch_pixel, 0, 0, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+      //
+			//priv->out_pixel = priv->base_pixel;
+			//priv->out_clip = NULL;
+			break;
+	}
+	curr_drawing_mode = op;
+}
+
+typedef struct {
+	int color_set;
+	GdkRGBA color;
+	int xor_set;
+	GdkRGBA xor_color;
+} ColorCache;
+
+
+/*  Config helper functions for when the user changes color preferences.
+    set_special colors used in the gtkhid.
+ */
+//static void set_special_grid_color(void)
+//{
+//  render_priv_t *priv = gport->render_priv;
+//  int red, green, blue;
+//
+//  //if (!gport->colormap)
+//  //  return;
+//
+//  red = priv->grid_color.red;
+//  green = priv->grid_color.green;
+//  blue = priv->grid_color.blue;
+//  conf_setf(CFR_DESIGN, "appearance/color/grid", -1, "#%02x%02x%02x", red, green, blue);
+//  map_color_string(conf_core.appearance.color.grid, &priv->grid_color);
+//
+//  config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/grid"), -1);
+//
+//  //if (priv->grid_gc)
+//  //  gdk_gc_set_foreground(priv->grid_gc, &gport->grid_color);
+//}
+
+static void ghid_cairo_set_special_colors(conf_native_t * cfg)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	if (((CFT_COLOR *) cfg->val.color == &conf_core.appearance.color.background) /*&& priv->bg_gc */ ) {
+		if (map_color_string(cfg->val.color[0], &priv->bg_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/background"), -1);
+			//gdk_gc_set_foreground(priv->bg_gc, &priv->bg_color);
+			//set_special_grid_color();
+		}
+	}
+	else if (((CFT_COLOR *) cfg->val.color == &conf_core.appearance.color.off_limit) /*&& priv->offlimits_gc */ ) {
+		if (map_color_string(cfg->val.color[0], &priv->offlimits_color)) {
+			config_color_button_update(&ghidgui->common, conf_get_field("appearance/color/off_limit"), -1);
+			//gdk_gc_set_foreground(priv->offlimits_gc, &priv->offlimits_color);
+		}
+	}
+	else if (((CFT_COLOR *) cfg->val.color == &conf_core.appearance.color.grid) /*&& priv->grid_gc */ ) {
+		if (map_color_string(cfg->val.color[0], &priv->grid_color)) {
+			conf_setf(CFR_DESIGN, "appearance/color/grid", -1, "%s", get_color_name(&priv->grid_color));
+			//set_special_grid_color();
+		}
+	}
+}
+
+static void ghid_cairo_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	static void *cache = 0;
+	pcb_hidval_t cval;
+	render_priv_t *priv = gport->render_priv;
+
+	if (name == NULL) {
+		fprintf(stderr, "ghid_cairo_set_color():  name = NULL, setting to magenta\n");
+		name = "magenta";
+	}
+
+	//if (name != gc->colorname) {
+	//	if (gc->colorname != NULL)
+	//		g_free(gc->colorname);
+	//	gc->colorname = g_strdup(name);
+	//}
+	gc->colorname = name;
+
+	//if (!gc->gc)
+	//  return;
+	//if (gport->colormap == 0)
+	//  gport->colormap = gtk_widget_get_colormap(gport->top_window);
+
+	if (strcmp(name, "drill") == 0) {
+		copy_color(&gc->color, &priv->offlimits_color);
+		//gdk_cairo_set_source_rgba(cr, &priv->offlimits_color);
+		//gdk_gc_set_foreground(gc->gc, &gport->offlimits_color);
+	}
+	else {
+		ColorCache *cc;
+		if (pcb_hid_cache_color(0, name, &cval, &cache))
+			cc = (ColorCache *) cval.ptr;
+		else {
+			cc = (ColorCache *) malloc(sizeof(ColorCache));
+			memset(cc, 0, sizeof(*cc));
+			cval.ptr = cc;
+			pcb_hid_cache_color(1, name, &cval, &cache);
+		}
+
+		if (!cc->color_set) {
+			if (! gdk_rgba_parse(&cc->color, name))
+				gdk_rgba_parse(&cc->color, "white");
+				//gdk_color_white(gport->colormap, &cc->color);
+			//else
+				//gdk_color_alloc(gport->colormap, &cc->color);
+			cc->color_set = 1;
+		}
+		//if (gc->xor_mask) {
+		//  if (!cc->xor_set) {
+		//    cc->xor_color.red = cc->color.red ^ gport->bg_color.red;
+		//    cc->xor_color.green = cc->color.green ^ gport->bg_color.green;
+		//    cc->xor_color.blue = cc->color.blue ^ gport->bg_color.blue;
+		//    gdk_color_alloc(gport->colormap, &cc->xor_color);
+		//    cc->xor_set = 1;
+		//  }
+		//  gdk_gc_set_foreground(gc->gc, &cc->xor_color);
+		//}
+		//else {
+		//  gdk_gc_set_foreground(gc->gc, &cc->color);
+		//}
+		cc->color.alpha = 1.0;
+		copy_color(&gc->color, &cc->color);
+	}
+}
+
+static void ghid_cairo_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	cairo_line_cap_t cap = CAIRO_LINE_CAP_BUTT;
+	cairo_line_join_t join = CAIRO_LINE_JOIN_MITER;
+
+	switch (style) {
+	case pcb_cap_round:
+		cap = CAIRO_LINE_CAP_ROUND;
+		join = CAIRO_LINE_JOIN_ROUND;
+		break;
+	case pcb_cap_square:
+		cap = CAIRO_LINE_CAP_SQUARE;
+		join = CAIRO_LINE_JOIN_MITER;
+		break;
+	default:
+		assert(!"unhandled cap");
+	}
+	gc->cap = cap;
+	gc->join = join;
+
+	//if (gc->gc)
+	//  gdk_gc_set_line_attributes(WHICH_GC(gc), Vz(gc->width), GDK_LINE_SOLID, (GdkCapStyle) gc->cap, (GdkJoinStyle) gc->join);
+}
+
+static void ghid_cairo_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	//render_priv_t *priv = gport->render_priv;
+
+	//if (priv->cr == NULL)
+	//	return;
+
+	gc->width = width;
+	//cairo_set_line_width(priv->cr, Vz(gc->width));
+	//if (gc->gc)
+	//  gdk_gc_set_line_attributes(WHICH_GC(gc), Vz(gc->width), GDK_LINE_SOLID, (GdkCapStyle) gc->cap, (GdkJoinStyle) gc->join);
+}
+
+static void ghid_cairo_set_draw_xor(pcb_hid_gc_t gc, int xor_mask)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	priv->xor_mode = (xor_mask) ? 1 : 0;
+	//gc->xor_mask = xor_mask;
+	//if (!gc->gc)
+	//  return;
+	//gdk_gc_set_function(gc->gc, xor_mask ? GDK_XOR : GDK_COPY);
+	//ghid_cairo_set_color(gc, gc->colorname);
+}
+
+static int use_gc(pcb_hid_gc_t gc)
+{
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr = priv->cr;
+	//GdkWindow *window = gtk_widget_get_window(gport->top_window);
+
+	if (gc->me_pointer != &gtk3_cairo_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to GTK HID\n");
+		abort();
+	}
+
+	if (cr == NULL)
+		return 0;
+
+	//ghid_cairo_set_color(gc, gc->colorname);
+	gdk_cairo_set_source_rgba(cr, &gc->color);
+
+	/* negative line width means "unit is pixels", so -1 is "1 pixel", -5 is "5 pixels", regardless of the zoom. */
+	if (gc->width <= 0)
+		cairo_set_line_width(cr, 1.0 - gc->width);
+	else
+		cairo_set_line_width(cr, Vz(gc->width));
+
+	//ghid_cairo_set_line_cap(gc, (pcb_cap_style_t) gc->cap);
+	cairo_set_line_cap(cr, gc->cap);
+	cairo_set_line_join(cr, gc->join);
+
+
+	//if (!gc->gc) {
+	//  gc->gc = gdk_gc_new(window);
+	//  ghid_cairo_set_color(gc, gc->colorname);
+	//  ghid_cairo_set_line_width(gc, gc->width);
+	//  ghid_cairo_set_line_cap(gc, (pcb_cap_style_t) gc->cap);
+	//  ghid_cairo_set_draw_xor(gc, gc->xor_mask);
+	//  gdk_gc_set_clip_origin(gc->gc, 0, 0);
+	//}
+	//if (gc->mask_seq != mask_seq) {
+	//  if (mask_seq)
+	//    gdk_gc_set_clip_mask(gc->gc, gport->mask);
+	//  else
+	//    set_clip(priv, gc->gc);
+	//  gc->mask_seq = mask_seq;
+	//}
+	//priv->u_gc = WHICH_GC(gc);
+	return 1;
+}
+
+static void ghid_cairo_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double dx1, dy1, dx2, dy2;
+	render_priv_t *priv = gport->render_priv;
+
+	dx1 = Vx((double) x1);
+	dy1 = Vy((double) y1);
+	dx2 = Vx((double) x2);
+	dy2 = Vy((double) y2);
+
+	if (!pcb_line_clip
+			(0, 0, gport->view.canvas_width, gport->view.canvas_height, &dx1, &dy1, &dx2, &dy2, gc->width / gport->view.coord_per_px))
+		return;
+
+	USE_GC(gc);
+	cr_draw_line(priv->cr, FALSE, dx1, dy1, dx2, dy2);
+	//gdk_draw_line(gport->drawable, priv->u_gc, dx1, dy1, dx2, dy2);
+}
+
+/* Draws an arc from center (cx, cy), cx>0 to the right, cy>0 to the bottom, using
+   xradius on X axis, and yradius on Y axis, sweeping a delta_angle from start_angle.
+
+   Angles (in degres) originate at 9 o'clock and are positive CCW (counter clock wise).
+   delta_angle sweeps the angle from start_angle, CW if negative. */
+static void ghid_cairo_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy,
+																pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	double w, h, radius, angle1, angle2;
+	render_priv_t *priv = gport->render_priv;
+
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+	radius = (xradius > yradius) ? xradius : yradius;
+	if (SIDE_X(cx) < gport->view.x0 - radius
+			|| SIDE_X(cx) > gport->view.x0 + w + radius
+			|| SIDE_Y(cy) < gport->view.y0 - radius || SIDE_Y(cy) > gport->view.y0 + h + radius)
+		return;
+
+	USE_GC(gc);
+
+	if ((delta_angle > 360.0) || (delta_angle < -360.0)) {
+		start_angle = 0;
+		delta_angle = 360;
+	}
+
+	if (conf_core.editor.view.flip_x) {
+		start_angle = 180 - start_angle;
+		delta_angle = -delta_angle;
+	}
+	if (conf_core.editor.view.flip_y) {
+		start_angle = -start_angle;
+		delta_angle = -delta_angle;
+	}
+	/* make sure we fall in the -180 to +180 range */
+	start_angle = pcb_normalize_angle(start_angle);
+	if (start_angle >= 180)
+		start_angle -= 360;
+
+	/* cairo lib. originates angles at 3 o'clock, positive traveling CW, requires angle1 < angle2 */
+	angle1 = (180.0 - start_angle);
+	angle2 = (delta_angle < 0) ? (angle1 - delta_angle) : angle1;
+	if (delta_angle > 0) {
+		angle1 = (180.0 - start_angle - delta_angle);
+	}
+	angle1 *= (M_PI / 180.0);
+	angle2 *= (M_PI / 180.0);
+	cairo_save(priv->cr);
+#warning gtk3 TODO: this will draw an arc of a circle, not an ellipse! Explore matrix transformation here.
+	cairo_arc(priv->cr, pcb_round(Vxd(cx)), pcb_round(Vyd(cy)), Vzd(radius), angle1, angle2);
+	cairo_stroke(priv->cr);
+	cairo_restore(priv->cr);
+	//gdk_draw_arc(gport->drawable, priv->u_gc, 0,
+	//             pcb_round(Vxd(cx) - Vzd(xradius) + 0.5), pcb_round(Vyd(cy) - Vzd(yradius) + 0.5),
+	//             pcb_round(vrx2), pcb_round(vry2), (start_angle + 180) * 64, delta_angle * 64);
+}
+
+static void cr_draw_rect(pcb_hid_gc_t gc, int fill, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	gint w, h, lw;
+	render_priv_t *priv = gport->render_priv;
+
+	if (priv->cr == NULL)
+		return;
+
+	lw = gc->width;
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+
+	if ((SIDE_X(x1) < gport->view.x0 - lw && SIDE_X(x2) < gport->view.x0 - lw)
+			|| (SIDE_X(x1) > gport->view.x0 + w + lw && SIDE_X(x2) > gport->view.x0 + w + lw)
+			|| (SIDE_Y(y1) < gport->view.y0 - lw && SIDE_Y(y2) < gport->view.y0 - lw)
+			|| (SIDE_Y(y1) > gport->view.y0 + h + lw && SIDE_Y(y2) > gport->view.y0 + h + lw))
+		return;
+
+	x1 = Vx(x1);
+	y1 = Vy(y1);
+	x2 = Vx(x2);
+	y2 = Vy(y2);
+
+	if (x1 > x2) {
+		gint xt = x1;
+		x1 = x2;
+		x2 = xt;
+	}
+	if (y1 > y2) {
+		gint yt = y1;
+		y1 = y2;
+		y2 = yt;
+	}
+
+	USE_GC(gc);
+	cairo_rectangle(priv->cr, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+	//gdk_draw_rectangle(gport->drawable, priv->u_gc, FALSE, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+
+	if (fill)
+		cairo_fill(priv->cr);
+	else
+		cairo_stroke(priv->cr);
+}
+
+static void cr_paint_from_surface(cairo_t * cr, cairo_surface_t * surface)
+{
+	cairo_set_source_surface(cr, surface, 0, 0);
+	cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+	cairo_paint_with_alpha(cr, 1.0);
+}
+
+static void ghid_cairo_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	cr_draw_rect(gc, FALSE, x1, y1,x2, y2);
+}
+
+static void ghid_cairo_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	cr_draw_rect(gc, TRUE, x1, y1,x2, y2);
+}
+
+static void ghid_cairo_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	gint w, h, vr;
+	render_priv_t *priv = gport->render_priv;
+
+	if (priv->cr == NULL)
+		return;
+
+	w = gport->view.canvas_width * gport->view.coord_per_px;
+	h = gport->view.canvas_height * gport->view.coord_per_px;
+	if (SIDE_X(cx) < gport->view.x0 - radius
+			|| SIDE_X(cx) > gport->view.x0 + w + radius
+			|| SIDE_Y(cy) < gport->view.y0 - radius || SIDE_Y(cy) > gport->view.y0 + h + radius)
+		return;
+
+	USE_GC(gc);
+	vr = Vz(radius);
+	cairo_arc(priv->cr, Vx(cx), Vy(cy), vr, 0.0, 2 * M_PI);
+	cairo_fill(priv->cr);
+	//gdk_draw_arc(gport->drawable, priv->u_gc, TRUE, Vx(cx) - vr, Vy(cy) - vr, vr * 2, vr * 2, 0, 360 * 64);
+}
+
+/* Intentional code duplication from  ghid_cairo_fill_polygon_offs(), for performance */
+static void ghid_cairo_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	int i;
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr = priv->cr;
+	int _x, _y;
+
+	if (priv->cr == NULL)
+		return;
+
+	USE_GC(gc);
+
+	for (i = 0; i < n_coords; i++) {
+		_x = Vx(x[i]);
+		_y = Vy(y[i]);
+		if (i == 0)
+			cairo_move_to(cr, _x, _y);
+		else
+			cairo_line_to(cr, _x, _y);
+	}
+	cairo_fill(cr);
+}
+
+static void ghid_cairo_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	render_priv_t *priv = gport->render_priv;
+	cairo_t *cr = priv->cr;
+	int _x, _y;
+
+	if (priv->cr == NULL)
+		return;
+
+	USE_GC(gc);
+
+	for (i = 0; i < n_coords; i++) {
+		_x = Vx(x[i]);
+		_y = Vy(y[i]);
+		if (i == 0)
+			cairo_move_to(cr, _x + Vz(dx), _y + Vz(dy));
+		else
+			cairo_line_to(cr, _x + Vz(dx), _y + Vz(dy));
+	}
+	cairo_fill(cr);
+}
+
+/* Fills the drawing with only bg_color */
+static void erase_with_background_color(cairo_t * cr, GdkRGBA * bg_color)
+{
+	gdk_cairo_set_source_rgba(cr, bg_color);
+	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+	cairo_paint_with_alpha(cr, 1.0);
+}
+
+static void redraw_region(GdkRectangle * rect)
+{
+	int eleft, eright, etop, ebottom;
+	pcb_hid_expose_ctx_t ctx;
+	render_priv_t *priv = gport->render_priv;
+
+	if (priv->cr_drawing_area == NULL)
+	  return;
+
+	if (rect != NULL) {
+		priv->clip_rect = *rect;
+		priv->clip = pcb_true;
+	}
+	else {
+		priv->clip_rect.x = 0;
+		priv->clip_rect.y = 0;
+		priv->clip_rect.width = gport->view.canvas_width;
+		priv->clip_rect.height = gport->view.canvas_height;
+		priv->clip = pcb_false;
+	}
+
+	//set_clip(priv, priv->bg_gc);
+	//set_clip(priv, priv->offlimits_gc);
+	//set_clip(priv, priv->mask_gc);
+	//set_clip(priv, priv->grid_gc);
+
+	ctx.view.X1 = MIN(Px(priv->clip_rect.x), Px(priv->clip_rect.x + priv->clip_rect.width + 1));
+	ctx.view.Y1 = MIN(Py(priv->clip_rect.y), Py(priv->clip_rect.y + priv->clip_rect.height + 1));
+	ctx.view.X2 = MAX(Px(priv->clip_rect.x), Px(priv->clip_rect.x + priv->clip_rect.width + 1));
+	ctx.view.Y2 = MAX(Py(priv->clip_rect.y), Py(priv->clip_rect.y + priv->clip_rect.height + 1));
+
+	ctx.view.X1 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X1));
+	ctx.view.X2 = MAX(0, MIN(PCB->MaxWidth, ctx.view.X2));
+	ctx.view.Y1 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y1));
+	ctx.view.Y2 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y2));
+
+	ctx.force = 0;
+	ctx.content.obj = NULL;
+
+	eleft = Vx(0);
+	eright = Vx(PCB->MaxWidth);
+	etop = Vy(0);
+	ebottom = Vy(PCB->MaxHeight);
+	if (eleft > eright) {
+		int tmp = eleft;
+		eleft = eright;
+		eright = tmp;
+	}
+	if (etop > ebottom) {
+		int tmp = etop;
+		etop = ebottom;
+		ebottom = tmp;
+	}
+
+	/* Paints only on the drawing_area */
+	priv->cr = priv->cr_drawing_area;
+	priv->cr_target = priv->cr_drawing_area;
+
+	erase_with_background_color(priv->cr, &priv->bg_color);
+
+	gdk_cairo_set_source_rgba(priv->cr, &priv->offlimits_color);
+	if (eleft > 0) {
+		cairo_rectangle(priv->cr, 0.0, 0.0, eleft, gport->view.canvas_height);
+	}
+	else
+		eleft = 0;
+	if (eright < gport->view.canvas_width) {
+		cairo_rectangle(priv->cr, eright, 0.0, gport->view.canvas_width - eright, gport->view.canvas_height);
+	}
+	else
+		eright = gport->view.canvas_width;
+	if (etop > 0) {
+		cairo_rectangle(priv->cr, eleft, 0.0, eright - eleft + 1, etop);
+	}
+	else
+		etop = 0;
+	if (ebottom < gport->view.canvas_height) {
+		cairo_rectangle(priv->cr, eleft, ebottom, eright - eleft + 1, gport->view.canvas_height - ebottom);
+	}
+	else
+		ebottom = gport->view.canvas_height;
+
+	cairo_fill(priv->cr);
+	//gdk_draw_rectangle(gport->drawable, priv->bg_gc, 1, eleft, etop, eright - eleft + 1, ebottom - etop + 1);
+
+	ghid_cairo_draw_bg_image();
+
+	pcb_hid_expose_all(pcb_gui, &ctx);
+	ghid_cairo_draw_grid();
+
+	/* Draws "GUI" information on top of design */
+	priv->cr = priv->cr_drawing_area;
+	pcb_draw_attached(0);
+	pcb_draw_mark(0);
+
+	draw_lead_user(priv);
+
+	priv->clip = pcb_false;
+
+	/* Rest the clip for bg_gc, as it is used outside this function */
+	//gdk_gc_set_clip_mask(priv->bg_gc, NULL);
+	ghid_cairo_screen_update();
+}
+
+static void ghid_cairo_invalidate_lr(pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+{
+	int dleft, dright, dtop, dbottom;
+	int minx, maxx, miny, maxy;
+	GdkRectangle rect;
+
+	dleft = Vx(left);
+	dright = Vx(right);
+	dtop = Vy(top);
+	dbottom = Vy(bottom);
+
+	minx = MIN(dleft, dright);
+	maxx = MAX(dleft, dright);
+	miny = MIN(dtop, dbottom);
+	maxy = MAX(dtop, dbottom);
+
+	rect.x = minx;
+	rect.y = miny;
+	rect.width = maxx - minx;
+	rect.height = maxy - miny;
+
+	redraw_region(&rect);
+}
+
+static void ghid_cairo_invalidate_all()
+{
+	if (ghidgui && ghidgui->topwin.menu.menu_bar) {
+		redraw_region(NULL);
+	}
+}
+
+static void ghid_cairo_notify_crosshair_change(pcb_bool changes_complete)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	/* Keeps track of calls (including XOR draw mode), and draws only when complete and final. */
+	if (changes_complete)
+		priv->attached_invalidate_depth--;
+	else
+		priv->attached_invalidate_depth = 1 + priv->xor_mode;
+
+	if (changes_complete && gport->drawing_area != NULL && priv->attached_invalidate_depth <= 0) {
+		/* Queues a GTK redraw when changes are complete */
+		ghid_cairo_invalidate_all();
+		priv->attached_invalidate_depth = 0;
+	}
+}
+
+static void ghid_cairo_notify_mark_change(pcb_bool changes_complete)
+{
+	render_priv_t *priv = gport->render_priv;
+
+	/* We sometimes get called before the GUI is up */
+	if (gport->drawing_area == NULL)
+		return;
+
+	if (changes_complete)
+		priv->mark_invalidate_depth--;
+
+	if (priv->mark_invalidate_depth < 0) {
+		priv->mark_invalidate_depth = 0;
+		/* A mismatch of changes_complete == pcb_false and == pcb_true notifications
+		   is not expected to occur, but we will try to handle it gracefully.
+		   As we know the mark will have been shown already, we must
+		   repaint the entire view to be sure not to leave an artefact.
+		 */
+		ghid_cairo_invalidate_all();
+		return;
+	}
+
+	if (priv->mark_invalidate_depth == 0)
+		pcb_draw_mark(0);
+
+	if (!changes_complete) {
+		priv->mark_invalidate_depth++;
+	}
+	else if (gport->drawing_area != NULL) {
+		/* Queue a GTK expose when changes are complete */
+		ghid_draw_area_update(gport, NULL);
+	}
+}
+
+static void draw_right_cross(cairo_t * cr, gint x, gint y)
+{
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	cr_draw_line(cr, FALSE, x, 0, x, gport->view.canvas_height);
+	cr_draw_line(cr, FALSE, 0, y, gport->view.canvas_width, y);
+	//gdk_draw_line(window, xor_gc, x, 0, x, gport->view.canvas_height);
+	//gdk_draw_line(window, xor_gc, 0, y, gport->view.canvas_width, y);
+}
+
+static void draw_slanted_cross(cairo_t * xor_gc, gint x, gint y)
+{
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	gint x0, y0, x1, y1;
+
+	x0 = x + (gport->view.canvas_height - y);
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x);
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y);
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x);
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_dozen_cross(cairo_t * xor_gc, gint x, gint y)
+{
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	gint x0, y0, x1, y1;
+	gdouble tan60 = sqrt(3);
+
+	x0 = x + (gport->view.canvas_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y / tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x) * tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x * tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x + (gport->view.canvas_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x - y * tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + (gport->view.canvas_width - x) / tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - x / tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y / tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x * tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x) * tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (gport->view.canvas_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, gport->view.canvas_width));
+	x1 = x + y * tan60;
+	x1 = MAX(0, MIN(x1, gport->view.canvas_width));
+	y0 = y + x / tan60;
+	y0 = MAX(0, MIN(y0, gport->view.canvas_height));
+	y1 = y - (gport->view.canvas_width - x) / tan60;
+	y1 = MAX(0, MIN(y1, gport->view.canvas_height));
+	cr_draw_line(gport->render_priv->cr, FALSE, x0, y0, x1, y1);
+	//gdk_draw_line(window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_crosshair(cairo_t * xor_gc, gint x, gint y)
+{
+	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
+
+	draw_right_cross(xor_gc, x, y);
+	if (prev == pcb_ch_shape_union_jack)
+		draw_slanted_cross(xor_gc, x, y);
+	if (prev == pcb_ch_shape_dozen)
+		draw_dozen_cross(xor_gc, x, y);
+	prev = pcb_crosshair.shape;
+}
+
+static void show_crosshair(gboolean paint_new_location)
+{
+	render_priv_t *priv = gport->render_priv;
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	//GtkStyle *style = gtk_widget_get_style(gport->drawing_area);
+	gint x, y;
+	static gint x_prev = -1, y_prev = -1;
+	//static cairo_t *xor_gc;
+	//static GdkColor cross_color;
+	cairo_t *cr;
+
+	if (gport->view.crosshair_x < 0 || !ghidgui->topwin.active || !gport->view.has_entered)
+		return;
+
+#warning gtk3 TODO: when CrossColor changed from config
+	map_color_string(conf_core.appearance.color.cross, &priv->crosshair_color);
+	//cr = priv->cr_drawing_area;
+	cr = priv->cr;
+	gdk_cairo_set_source_rgba(cr, &priv->crosshair_color);
+	cairo_set_line_width(cr, 1.0);
+
+	//if (!xor_gc) {
+	//  xor_gc = gdk_gc_new(window);
+	//  gdk_gc_copy(xor_gc, style->white_gc);
+	//  gdk_gc_set_function(xor_gc, GDK_XOR);
+	//  gdk_gc_set_clip_origin(xor_gc, 0, 0);
+	//  set_clip(priv, xor_gc);
+#warning gtk3 TODO:FIXME: when CrossColor changed from config
+	//  map_color_string(conf_core.appearance.color.cross, &cross_color);
+	//}
+	x = Vx(gport->view.crosshair_x);
+	y = Vy(gport->view.crosshair_y);
+
+	//gdk_gc_set_foreground(xor_gc, &cross_color);
+
+	if (x_prev >= 0 && !paint_new_location)
+		draw_crosshair(cr, x_prev, y_prev);
+
+	if (x >= 0 && paint_new_location) {
+		draw_crosshair(cr, x, y);
+		x_prev = x;
+		y_prev = y;
+	}
+	else
+		x_prev = y_prev = -1;
+}
+
+static void ghid_cairo_init_renderer(int *argc, char ***argv, void *vport)
+{
+	GHidPort *port = vport;
+
+	/* Init any GC's required */
+	port->render_priv = g_new0(render_priv_t, 1);
+	port->render_priv->cr = NULL;
+	port->render_priv->surf_da = NULL;
+	port->render_priv->cr_drawing_area = NULL;
+}
+
+static void ghid_cairo_shutdown_renderer(void *vport)
+{
+	GHidPort *port = vport;
+	render_priv_t *priv = port->render_priv;
+
+	cairo_surface_destroy(priv->surf_da);
+	priv->surf_da = NULL;
+	cairo_destroy(priv->cr_drawing_area);
+	priv->cr_drawing_area = NULL;
+	priv->cr = NULL;
+
+	g_free(port->render_priv);
+	port->render_priv = NULL;
+}
+
+static void ghid_cairo_init_drawing_widget(GtkWidget * widget, void *vport)
+{
+}
+
+/* Callback function only applied to drawing_area, after some resizing or initialisation. */
+static void ghid_cairo_drawing_area_configure_hook(void *vport)
+{
+	GHidPort *port = vport;
+	static int done_once = 0;
+	render_priv_t *priv = port->render_priv;
+	cairo_t *cr;
+
+	gport->drawing_allowed = pcb_true;
+
+	if (!done_once) {
+		//priv->bg_gc = gdk_gc_new(port->drawable);
+		//gdk_gc_set_foreground(priv->bg_gc, &port->bg_color);
+		//gdk_gc_set_clip_origin(priv->bg_gc, 0, 0);
+		//
+		//priv->offlimits_gc = gdk_gc_new(port->drawable);
+		//gdk_gc_set_foreground(priv->offlimits_gc, &port->offlimits_color);
+		//gdk_gc_set_clip_origin(priv->offlimits_gc, 0, 0);
+
+		if (!map_color_string(conf_core.appearance.color.background, &priv->bg_color))
+			map_color_string("white", &priv->bg_color);
+
+		if (!map_color_string(conf_core.appearance.color.off_limit, &priv->offlimits_color))
+			map_color_string("white", &priv->offlimits_color);
+
+		if (!map_color_string(conf_core.appearance.color.grid, &priv->grid_color))
+			map_color_string("blue", &priv->grid_color);
+		//set_special_grid_color();
+
+		//if (port->mask) {
+		//  gdk_pixmap_unref(port->mask);
+		//  port->mask = gdk_pixmap_new(0, port->view.canvas_width, port->view.canvas_height, 1);
+		//}
+		done_once = 1;
+	}
+
+	/* Creates a single cairo surface/context for off-line painting */
+	cr_create_similar_surface_and_context(&priv->surf_da, &priv->cr_drawing_area, port);
+  cr_create_similar_surface_and_context(&priv->surf_layer, &priv->cr_layer, port);
+	priv->cr = priv->cr_drawing_area;
+}
+
+/* GtkDrawingArea -> GtkWidget "draw" signal Call-Back function */
+static gboolean ghid_cairo_drawing_area_expose_cb(GtkWidget * widget, pcb_gtk_expose_t * p, void *vport)
+{
+	GHidPort *port = vport;
+	render_priv_t *priv = port->render_priv;
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	//gdk_draw_drawable(window, priv->bg_gc, port->pixmap,
+	//                  ev->area.x, ev->area.y, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+
+	cr_paint_from_surface(p, priv->surf_da);
+
+	priv->cr = p;
+	show_crosshair(TRUE);
+	priv->cr = priv->cr_drawing_area;
+
+	return FALSE;
+}
+
+static void ghid_cairo_screen_update(void)
+{
+	render_priv_t *priv = gport->render_priv;
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+
+	if (priv->cr == NULL)
+	  return;
+
+	//gdk_draw_drawable(window, priv->bg_gc, gport->pixmap, 0, 0, 0, 0, gport->view.canvas_width, gport->view.canvas_height);
+	//show_crosshair(TRUE);
+	gtk_widget_queue_draw(gport->drawing_area);
+}
+
+static void ghid_cairo_port_drawing_realize_cb(GtkWidget * widget, gpointer data)
+{
+}
+
+static gboolean ghid_cairo_preview_expose(GtkWidget * widget, pcb_gtk_expose_t * p,
+																					pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t *ctx)
+{
+	//GdkWindow *window = gtk_widget_get_window(widget);
+	//GdkDrawable *save_drawable;
+	GtkAllocation allocation;			/* Assuming widget is a drawing widget, get the Rectangle allowed for drawing. */
+	pcb_gtk_view_t save_view;
+	int save_width, save_height;
+	double xz, yz, vw, vh;
+	render_priv_t *priv = gport->render_priv;
+	pcb_coord_t ox1 = ctx->view.X1, oy1 = ctx->view.Y1, ox2 = ctx->view.X2, oy2 = ctx->view.Y2;
+
+	vw = ctx->view.X2 - ctx->view.X1;
+	vh = ctx->view.Y2 - ctx->view.Y1;
+
+	/* Setup drawable and zoom factor for drawing routines
+	 */
+	//save_drawable = gport->drawable;
+	save_view = gport->view;
+	save_width = gport->view.canvas_width;
+	save_height = gport->view.canvas_height;
+
+	gtk_widget_get_allocation(widget, &allocation);
+	xz = vw / (double) allocation.width;
+	yz = vh / (double) allocation.height;
+	if (xz > yz)
+		gport->view.coord_per_px = xz;
+	else
+		gport->view.coord_per_px = yz;
+
+	//gport->drawable = window;
+	gport->view.canvas_width = allocation.width;
+	gport->view.canvas_height = allocation.height;
+	gport->view.width = allocation.width * gport->view.coord_per_px;
+	gport->view.height = allocation.height * gport->view.coord_per_px;
+	gport->view.x0 = (vw - gport->view.width) / 2 + ctx->view.X1;
+	gport->view.y0 = (vh - gport->view.height) / 2 + ctx->view.Y1;
+
+	PCB_GTK_PREVIEW_TUNE_EXTENT(ctx, allocation);
+
+	/* Change current pointer to draw in this widget, draws, then come back to pointer to drawing_area. */
+	priv->cr_target = p;
+	priv->cr = p;
+	cairo_save(p);
+	/* calls the off-line drawing routine */
+	expcall(&gtk3_cairo_hid, ctx);
+	cairo_restore(p);
+	priv->cr = priv->cr_drawing_area;
+	//gport->drawable = save_drawable;
+
+	/* restore the original context and priv */
+	ctx->view.X1 = ox1; ctx->view.X2 = ox2; ctx->view.Y1 = oy1; ctx->view.Y2 = oy2;
+	gport->view = save_view;
+	gport->view.canvas_width = save_width;
+	gport->view.canvas_height = save_height;
+
+	return FALSE;
+}
+
+static void draw_lead_user(render_priv_t * priv)
+{
+	//GdkWindow *window = gtk_widget_get_window(gport->drawing_area);
+	//GtkStyle *style = gtk_widget_get_style(gport->drawing_area);
+	int i;
+	pcb_lead_user_t *lead_user = &gport->lead_user;
+	pcb_coord_t radius = lead_user->radius;
+	pcb_coord_t width = PCB_MM_TO_COORD(LEAD_USER_WIDTH);
+	pcb_coord_t separation = PCB_MM_TO_COORD(LEAD_USER_ARC_SEPARATION);
+	//static GdkGC *lead_gc = NULL;
+	//GdkColor lead_color;
+
+	if (!lead_user->lead_user)
+		return;
+
+	//if (lead_gc == NULL) {
+	//  lead_gc = gdk_gc_new(window);
+	//  gdk_gc_copy(lead_gc, style->white_gc);
+	//  gdk_gc_set_function(lead_gc, GDK_XOR);
+	//  gdk_gc_set_clip_origin(lead_gc, 0, 0);
+	//  lead_color.pixel = 0;
+	//  lead_color.red = (int) (65535. * LEAD_USER_COLOR_R);
+	//  lead_color.green = (int) (65535. * LEAD_USER_COLOR_G);
+	//  lead_color.blue = (int) (65535. * LEAD_USER_COLOR_B);
+	//  gdk_color_alloc(gport->colormap, &lead_color);
+	//  gdk_gc_set_foreground(lead_gc, &lead_color);
+	//}
+
+	//set_clip(priv, lead_gc);
+	//gdk_gc_set_line_attributes(lead_gc, Vz(width), GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+
+	/* arcs at the appropriate radii */
+
+	for (i = 0; i < LEAD_USER_ARC_COUNT; i++, radius -= separation) {
+		if (radius < width)
+			radius += PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+
+		/* Draw an arc at radius */
+		//gdk_draw_arc(gport->drawable, lead_gc, FALSE,
+		//             Vx(lead_user->x - radius), Vy(lead_user->y - radius), Vz(2. * radius), Vz(2. * radius), 0, 360 * 64);
+	}
+}
+
+static GtkWidget *ghid_cairo_new_drawing_widget(pcb_gtk_common_t *common)
+{
+	GtkWidget *w = gtk_drawing_area_new();
+
+	g_signal_connect(G_OBJECT(w), "draw", G_CALLBACK(common->drawing_area_expose), common->gport);
+
+	return w;
+}
+
+
+void ghid_cairo_install(pcb_gtk_common_t * common, pcb_hid_t * hid)
+{
+	if (common != NULL) {
+		common->new_drawing_widget = ghid_cairo_new_drawing_widget;
+		common->init_drawing_widget = ghid_cairo_init_drawing_widget;
+		common->drawing_realize = ghid_cairo_port_drawing_realize_cb;
+		common->drawing_area_expose = ghid_cairo_drawing_area_expose_cb;
+		common->preview_expose = ghid_cairo_preview_expose;
+		common->invalidate_all = ghid_cairo_invalidate_all;
+		common->set_special_colors = ghid_cairo_set_special_colors;
+		common->init_renderer = ghid_cairo_init_renderer;
+		common->screen_update = ghid_cairo_screen_update;
+		common->draw_grid_local = ghid_cairo_draw_grid_local;
+		common->drawing_area_configure_hook = ghid_cairo_drawing_area_configure_hook;
+		common->shutdown_renderer = ghid_cairo_shutdown_renderer;
+		common->get_color_name = get_color_name;
+		common->map_color_string = map_color_string;
+	}
+
+	if (hid != NULL) {
+		hid->invalidate_lr = ghid_cairo_invalidate_lr;
+		hid->invalidate_all = ghid_cairo_invalidate_all;
+		hid->notify_crosshair_change = ghid_cairo_notify_crosshair_change;
+		hid->notify_mark_change = ghid_cairo_notify_mark_change;
+		hid->set_layer_group = ghid_cairo_set_layer_group;
+		hid->end_layer = ghid_cairo_end_layer_group;
+		hid->make_gc = ghid_cairo_make_gc;
+		hid->destroy_gc = ghid_cairo_destroy_gc;
+		hid->render_burst = ghid_cairo_render_burst;
+		hid->set_drawing_mode = ghid_cairo_set_drawing_mode;
+		hid->set_color = ghid_cairo_set_color;
+		hid->set_line_cap = ghid_cairo_set_line_cap;
+		hid->set_line_width = ghid_cairo_set_line_width;
+		hid->set_draw_xor = ghid_cairo_set_draw_xor;
+		hid->draw_line = ghid_cairo_draw_line;
+		hid->draw_arc = ghid_cairo_draw_arc;
+		hid->draw_rect = ghid_cairo_draw_rect;
+		hid->fill_circle = ghid_cairo_fill_circle;
+		hid->fill_polygon = ghid_cairo_fill_polygon;
+		hid->fill_polygon_offs = ghid_cairo_fill_polygon_offs;
+		hid->fill_rect = ghid_cairo_fill_rect;
+	}
+}
Index: tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-main.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_cairo/gtkhid-main.c	(revision 18980)
@@ -0,0 +1,70 @@
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_init.h"
+#include "conf_core.h"
+
+#include "../src_plugins/lib_gtk_common/glue.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/glue_common.h"
+#include "../src_plugins/lib_gtk_hid/glue_hid.h"
+#include "../src_plugins/lib_gtk_hid/glue_conf.h"
+#include "../src_plugins/lib_gtk_hid/glue_event.h"
+#include "../src_plugins/lib_gtk_hid/glue_win32.h"
+#include "../src_plugins/lib_gtk_hid/common.h"
+#include "../src_plugins/lib_gtk_hid/render.h"
+
+const char *ghid_cairo_cookie = "gtk3 hid, cairo";
+const char *ghid_cairo_menu_cookie = "gtk3 hid menu, cairo";
+
+pcb_hid_t gtk3_cairo_hid;
+
+void ghid_cairo_install(pcb_gtk_common_t * common, pcb_hid_t * hid);
+
+int gtk3_cairo_parse_arguments(int *argc, char ***argv)
+{
+	ghid_cairo_install(&ghidgui->common, NULL);
+	return gtkhid_parse_arguments(argc, argv);
+}
+
+int pplg_check_ver_hid_gtk3_cairo(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_gtk3_cairo(void)
+{
+	pcb_event_unbind_allcookie(ghid_cairo_cookie);
+	conf_hid_unreg(ghid_cairo_cookie);
+	conf_hid_unreg(ghid_cairo_menu_cookie);
+}
+
+int pplg_init_hid_gtk3_cairo(void)
+{
+	PCB_API_CHK_VER;
+
+	ghid_win32_init();
+
+	ghid_glue_hid_init(&gtk3_cairo_hid);
+	ghid_glue_common_init();
+
+	gtk3_cairo_hid.parse_arguments = gtk3_cairo_parse_arguments;
+	ghid_cairo_install(NULL, &gtk3_cairo_hid);
+
+	gtk3_cairo_hid.name = "gtk3_cairo";
+	gtk3_cairo_hid.description = "Gtk3 - The Gimp Toolkit, with cairo rendering";
+
+	ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(ghid_cairo_menu_cookie, NULL);
+	ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox;
+	ghid_conf_regs(ghid_cairo_cookie);
+
+	pcb_hid_register_hid(&gtk3_cairo_hid);
+
+	glue_event_init(ghid_cairo_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_cairo/hid_gtk3_cairo.pup	(revision 18980)
@@ -0,0 +1,11 @@
+$class hid
+$short GTK3 GUI, cairo render
+$long GUI: the GTK3 HID, using cairo for rendering
+$state WIP
+default disable-all
+dep lib_gtk_common
+dep lib_gtk_config
+dep lib_gtk_hid
+dep draw_csect
+dep draw_fontsel
+autoload 1
Index: tags/2.0.1/src_plugins/hid_gtk3_gl/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_gl/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_gl/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_gtk3_gl
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_gtk3_gl/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_gl/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_gl/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+put /local/pcb/mod {hid_gtk3_gl}
+put /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/hid_gtk3_gl/gtkhid-main.o
+@]
+
+switch /local/pcb/hid_gtk3_gl/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtk3/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtk3/ldflags
+		append /local/pcb/CFLAGS { -DPCB_GTK3=1 }
+	end
+end
+
+switch /local/pcb/hid_gtk3_gl/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_gtk3_gl/gtkhid-main.c
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_gl/gtkhid-main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_gl/gtkhid-main.c	(revision 18980)
@@ -0,0 +1,69 @@
+#include "config.h"
+
+#include <stdlib.h>
+
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "hid_init.h"
+#include "conf_core.h"
+
+#include "../src_plugins/lib_gtk_common/glue.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "../src_plugins/lib_gtk_hid/gui.h"
+#include "../src_plugins/lib_gtk_hid/glue_common.h"
+#include "../src_plugins/lib_gtk_hid/glue_hid.h"
+#include "../src_plugins/lib_gtk_hid/glue_conf.h"
+#include "../src_plugins/lib_gtk_hid/glue_event.h"
+#include "../src_plugins/lib_gtk_hid/glue_win32.h"
+#include "../src_plugins/lib_gtk_hid/common.h"
+#include "../src_plugins/lib_gtk_hid/render.h"
+
+const char *ghid_gl_cookie = "gtk3 hid, openGL";
+const char *ghid_gl_menu_cookie = "gtk3 hid menu, openGL";
+
+pcb_hid_t gtk3_gl_hid;
+
+void ghid_gl_install(pcb_gtk_common_t * common, pcb_hid_t * hid);
+
+int gtk3_gl_parse_arguments(int *argc, char ***argv)
+{
+	ghid_gl_install(&ghidgui->common, NULL);
+	return gtkhid_parse_arguments(argc, argv);
+}
+
+int pplg_check_ver_hid_gtk3_gl(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_gtk3_gl(void)
+{
+	pcb_event_unbind_allcookie(ghid_gl_cookie);
+	conf_hid_unreg(ghid_gl_cookie);
+	conf_hid_unreg(ghid_gl_menu_cookie);
+}
+
+int pplg_init_hid_gtk3_gl(void)
+{
+	PCB_API_CHK_VER;
+	ghid_win32_init();
+
+	ghid_glue_hid_init(&gtk3_gl_hid);
+	ghid_glue_common_init();
+
+	gtk3_gl_hid.parse_arguments = gtk3_gl_parse_arguments;
+	ghid_gl_install(NULL, &gtk3_gl_hid);
+
+	gtk3_gl_hid.name = "gtk3_gl";
+	gtk3_gl_hid.description = "Gtk3 - The Gimp Toolkit, with openGL rendering";
+
+	ghidgui->topwin.menu.ghid_menuconf_id = conf_hid_reg(ghid_gl_menu_cookie, NULL);
+	ghidgui->topwin.menu.confchg_checkbox = ghid_confchg_checkbox;
+	ghid_conf_regs(ghid_gl_cookie);
+
+	pcb_hid_register_hid(&gtk3_gl_hid);
+
+	glue_event_init(ghid_gl_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_gtk3_gl/hid_gtk3_gl.pup	(revision 18980)
@@ -0,0 +1,12 @@
+$class hid
+$short GTK3 GUI, gl render
+$long GUI: the GTK3 HID, using gl for rendering
+$state WIP
+default disable-all
+dep lib_gtk_common
+dep lib_gtk_config
+dep lib_gtk_hid
+dep lib_hid_gl
+dep draw_csect
+dep draw_fontsel
+autoload 1
Index: tags/2.0.1/src_plugins/hid_lesstif/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_lesstif
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_lesstif/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,33 @@
+put /local/pcb/mod {hid_lesstif}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/hid_lesstif/dialogs.o
+	$(PLUGDIR)/hid_lesstif/library.o
+	$(PLUGDIR)/hid_lesstif/main.o
+	$(PLUGDIR)/hid_lesstif/menu.o
+	$(PLUGDIR)/hid_lesstif/netlist.o
+	$(PLUGDIR)/hid_lesstif/styles.o
+	$(PLUGDIR)/hid_lesstif/stdarg.o
+@]
+
+switch /local/pcb/hid_lesstif/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS [@
+			@?/target/libs/gui/lesstif2/cflags@
+			@?/target/libs/gui/xinerama/cflags@
+			@?/target/libs/gui/xrender/cflags@
+		@]
+
+		put /local/pcb/mod/LDFLAGS [@
+			@?/target/libs/gui/lesstif2/ldflags@
+			@?/target/libs/gui/xinerama/ldflags@
+			@?/target/libs/gui/xrender/ldflags@
+		@]
+		end
+end
+
+switch /local/pcb/hid_lesstif/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/dialogs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/dialogs.c	(revision 18980)
@@ -0,0 +1,1917 @@
+#include "xincludes.h"
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <Xm/Notebook.h>
+
+#include "compat_misc.h"
+#include "data.h"
+#include "build_run.h"
+#include "crosshair.h"
+#include "layer.h"
+#include "pcb-printf.h"
+
+#include "hid.h"
+#include "lesstif.h"
+#include "hid_attrib.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "stdarg.h"
+#include "misc_util.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "search.h"
+#include "change.h"
+
+static int ok;
+
+#define COMPONENT_SIDE_NAME "(top)"
+#define SOLDER_SIDE_NAME "(bottom)"
+
+/* ------------------------------------------------------------ */
+
+static void dialog_callback_ok_value(Widget w, void *v, void *cbs)
+{
+	ok = (int) (size_t) v;
+}
+
+typedef struct {
+	void (*cb)(void *ctx, pcb_hid_attr_ev_t ev);
+	void *ctx;
+} dialog_cb_ctx_t;
+
+static void dialog_callback_cancel(Widget w, void *v, void *cbs)
+{
+	dialog_cb_ctx_t *ctx = (dialog_cb_ctx_t *)v;
+	if (ctx != NULL) {
+		ctx->cb(ctx->ctx, PCB_HID_ATTR_EV_CANCEL);
+		free(ctx);
+	}
+	ok = 0;
+}
+
+static void dialog_callback_ok(Widget w, void *v, void *cbs)
+{
+	dialog_cb_ctx_t *ctx = (dialog_cb_ctx_t *)v;
+	if (ctx != NULL) {
+		ctx->cb(ctx->ctx, PCB_HID_ATTR_EV_OK);
+		free(ctx);
+	}
+	ok = 1;
+}
+
+static int wait_for_dialog(Widget w)
+{
+	ok = -1;
+	XtManageChild(w);
+	while (ok == -1 && XtIsManaged(w)) {
+		XEvent e;
+		XtAppNextEvent(app_context, &e);
+		XtDispatchEvent(&e);
+	}
+	XtUnmanageChild(w);
+	return ok;
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget fsb = 0;
+static XmString xms_pcb, xms_net, xms_vend, xms_all, xms_load, xms_loadv, xms_save, xms_fp;
+
+static void setup_fsb_dialog()
+{
+	if (fsb)
+		return;
+
+	xms_pcb = XmStringCreatePCB("*.pcb");
+	xms_fp = XmStringCreatePCB("*.fp");
+	xms_net = XmStringCreatePCB("*.net");
+	xms_vend = XmStringCreatePCB("*.vend");
+	xms_all = XmStringCreatePCB("*");
+	xms_load = XmStringCreatePCB("Load From");
+	xms_loadv = XmStringCreatePCB("Load Vendor");
+	xms_save = XmStringCreatePCB("Save As");
+
+	stdarg_n = 0;
+	fsb = XmCreateFileSelectionDialog(mainwind, XmStrCast("file"), stdarg_args, stdarg_n);
+
+	XtAddCallback(fsb, XmNokCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 1);
+	XtAddCallback(fsb, XmNcancelCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 0);
+}
+
+static const char pcb_acts_Load[] = "Load()\n" "Load(Layout|LayoutToBuffer|ElementToBuffer|Netlist|Revert)";
+
+static const char pcb_acth_Load[] = "Load layout data from a user-selected file.";
+
+/* %start-doc actions Load
+
+This action is a GUI front-end to the core's @code{LoadFrom} action
+(@pxref{LoadFrom Action}).  If you happen to pass a filename, like
+@code{LoadFrom}, then @code{LoadFrom} is called directly.  Else, the
+user is prompted for a filename to load, and then @code{LoadFrom} is
+called with that filename.
+
+%end-doc */
+extern fgw_error_t pcb_act_LoadFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+static fgw_error_t pcb_act_Load(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function = "Layout";
+	char *name;
+	XmString xmname, pattern;
+
+	if (argc > 2)
+		return PCB_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str);
+
+	setup_fsb_dialog();
+
+	if (pcb_strcasecmp(function, "Netlist") == 0)
+		pattern = xms_net;
+	else if (pcb_strcasecmp(function, "ElementToBuffer") == 0)
+		pattern = xms_fp;
+	else
+		pattern = xms_pcb;
+
+	stdarg_n = 0;
+	stdarg(XmNtitle, "Load From");
+	XtSetValues(XtParent(fsb), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNpattern, pattern);
+	stdarg(XmNmustMatch, True);
+	stdarg(XmNselectionLabelString, xms_load);
+	XtSetValues(fsb, stdarg_args, stdarg_n);
+
+	if (!wait_for_dialog(fsb)) {
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	stdarg_n = 0;
+	stdarg(XmNdirSpec, &xmname);
+	XtGetValues(fsb, stdarg_args, stdarg_n);
+
+	XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name);
+
+	pcb_actionl("LoadFrom", function, name, NULL);
+
+	XtFree(name);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_Save[] = "Save()\n" "Save(Layout|LayoutAs)\n" "Save(AllConnections|AllUnusedPins|ElementConnections)\n" "Save(PasteBuffer)";
+
+static const char pcb_acth_Save[] = "Save layout data to a user-selected file.";
+
+/* %start-doc actions Save
+
+This action is a GUI front-end to the core's @code{SaveTo} action
+(@pxref{SaveTo Action}).  If you happen to pass a filename, like
+@code{SaveTo}, then @code{SaveTo} is called directly.  Else, the
+user is prompted for a filename to save, and then @code{SaveTo} is
+called with that filename.
+
+%end-doc */
+extern fgw_error_t pcb_act_SaveTo(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+static fgw_error_t pcb_act_Save(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function = "Layout";
+	char *name;
+	XmString xmname, pattern;
+
+	if (argc > 2)
+		return PCB_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Save, function = argv[1].val.str);
+
+	if (pcb_strcasecmp(function, "Layout") == 0)
+		if (PCB->Filename)
+			return pcb_actionl("SaveTo", "Layout", NULL);
+
+	setup_fsb_dialog();
+
+	pattern = xms_pcb;
+
+	XtManageChild(fsb);
+
+	stdarg_n = 0;
+	stdarg(XmNtitle, "Save As");
+	XtSetValues(XtParent(fsb), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNpattern, pattern);
+	stdarg(XmNmustMatch, False);
+	stdarg(XmNselectionLabelString, xms_save);
+	XtSetValues(fsb, stdarg_args, stdarg_n);
+
+	if (!wait_for_dialog(fsb)) {
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	stdarg_n = 0;
+	stdarg(XmNdirSpec, &xmname);
+	XtGetValues(fsb, stdarg_args, stdarg_n);
+
+	XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name);
+
+	if (pcb_strcasecmp(function, "PasteBuffer") == 0)
+		pcb_actionl("PasteBuffer", "Save", name, NULL);
+	else {
+		/*
+		 * if we got this far and the function is Layout, then
+		 * we really needed it to be a LayoutAs.  Otherwise
+		 * ActionSaveTo() will ignore the new file name we
+		 * just obtained.
+		 */
+		if (pcb_strcasecmp(function, "Layout") == 0)
+			pcb_actionl("SaveTo", "LayoutAs", name, NULL);
+		else
+			pcb_actionl("SaveTo", function, name, NULL);
+	}
+	XtFree(name);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget log_form, log_text;
+static int log_size = 0;
+static int pending_newline = 0;
+
+static void log_clear(Widget w, void *up, void *cbp)
+{
+	XmTextSetString(log_text, XmStrCast(""));
+	log_size = 0;
+	pending_newline = 0;
+}
+
+static void log_dismiss(Widget w, void *up, void *cbp)
+{
+	XtUnmanageChild(log_form);
+}
+
+void lesstif_logv(enum pcb_message_level level, const char *fmt, va_list ap)
+{
+	char *buf, *scan;
+	if (!mainwind) {
+		vprintf(fmt, ap);
+		return;
+	}
+	if (!log_form) {
+		Widget clear_button, dismiss_button;
+
+		stdarg_n = 0;
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNwidth, 600);
+		stdarg(XmNheight, 200);
+		stdarg(XmNtitle, "pcb-rnd Log");
+		log_form = XmCreateFormDialog(mainwind, XmStrCast("log"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		clear_button = XmCreatePushButton(log_form, XmStrCast("clear"), stdarg_args, stdarg_n);
+		XtManageChild(clear_button);
+		XtAddCallback(clear_button, XmNactivateCallback, (XtCallbackProc) log_clear, 0);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_WIDGET);
+		stdarg(XmNrightWidget, clear_button);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		dismiss_button = XmCreatePushButton(log_form, XmStrCast("dismiss"), stdarg_args, stdarg_n);
+		XtManageChild(dismiss_button);
+		XtAddCallback(dismiss_button, XmNactivateCallback, (XtCallbackProc) log_dismiss, 0);
+
+		stdarg_n = 0;
+		stdarg(XmNeditable, False);
+		stdarg(XmNeditMode, XmMULTI_LINE_EDIT);
+		stdarg(XmNcursorPositionVisible, True);
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, clear_button);
+		log_text = XmCreateScrolledText(log_form, XmStrCast("text"), stdarg_args, stdarg_n);
+		XtManageChild(log_text);
+
+		XtManageChild(log_form);
+	}
+	if (pending_newline) {
+		XmTextInsert(log_text, log_size++, XmStrCast("\n"));
+		pending_newline = 0;
+	}
+	buf = pcb_strdup_vprintf(fmt, ap);
+	scan = &buf[strlen(buf) - 1];
+	while (scan >= buf && *scan == '\n') {
+		pending_newline++;
+		*scan-- = 0;
+	}
+	switch(level) {
+		case PCB_MSG_ERROR:   XmTextInsert(log_text, log_size, "Err: "); break;
+		case PCB_MSG_WARNING: XmTextInsert(log_text, log_size, "Wrn: "); break;
+		case PCB_MSG_INFO:    XmTextInsert(log_text, log_size, "Inf: "); break;
+		case PCB_MSG_DEBUG:   XmTextInsert(log_text, log_size, "Dbg: "); break;
+	}
+	log_size += 5;
+	XmTextInsert(log_text, log_size, buf);
+	log_size += strlen(buf);
+
+	scan = strrchr(buf, '\n');
+	if (scan)
+		scan++;
+	else
+		scan = buf;
+	XmTextSetCursorPosition(log_text, log_size - strlen(scan));
+	free(buf);
+}
+
+void lesstif_log(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	lesstif_logv(PCB_MSG_INFO, fmt, ap);
+	va_end(ap);
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget confirm_dialog = 0;
+static Widget confirm_cancel, confirm_ok, confirm_label;
+
+int lesstif_confirm_dialog(const char *msg, ...)
+{
+	const char *cancelmsg, *okmsg;
+	va_list ap;
+	XmString xs;
+
+	if (mainwind == 0)
+		return 1;
+
+	if (confirm_dialog == 0) {
+		stdarg_n = 0;
+		stdarg(XmNdefaultButtonType, XmDIALOG_OK_BUTTON);
+		stdarg(XmNtitle, "Confirm");
+		confirm_dialog = XmCreateQuestionDialog(mainwind, XmStrCast("confirm"), stdarg_args, stdarg_n);
+		XtAddCallback(confirm_dialog, XmNcancelCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 0);
+		XtAddCallback(confirm_dialog, XmNokCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 1);
+
+		confirm_cancel = XmMessageBoxGetChild(confirm_dialog, XmDIALOG_CANCEL_BUTTON);
+		confirm_ok = XmMessageBoxGetChild(confirm_dialog, XmDIALOG_OK_BUTTON);
+		confirm_label = XmMessageBoxGetChild(confirm_dialog, XmDIALOG_MESSAGE_LABEL);
+		XtUnmanageChild(XmMessageBoxGetChild(confirm_dialog, XmDIALOG_HELP_BUTTON));
+	}
+
+	va_start(ap, msg);
+	cancelmsg = va_arg(ap, const char *);
+	okmsg = va_arg(ap, const char *);
+	va_end(ap);
+
+	if (!cancelmsg) {
+		cancelmsg = "Cancel";
+		okmsg = "Ok";
+	}
+
+	stdarg_n = 0;
+	xs = XmStringCreatePCB(cancelmsg);
+
+	if (okmsg) {
+		stdarg(XmNcancelLabelString, xs);
+		xs = XmStringCreatePCB(okmsg);
+		XtManageChild(confirm_cancel);
+	}
+	else
+		XtUnmanageChild(confirm_cancel);
+
+	stdarg(XmNokLabelString, xs);
+
+	xs = XmStringCreatePCB(msg);
+	stdarg(XmNmessageString, xs);
+	XtSetValues(confirm_dialog, stdarg_args, stdarg_n);
+
+	wait_for_dialog(confirm_dialog);
+
+	stdarg_n = 0;
+	stdarg(XmNdefaultPosition, False);
+	XtSetValues(confirm_dialog, stdarg_args, stdarg_n);
+
+	return ok;
+}
+
+static const char pcb_acts_ConfirmAction[] = "TODO";
+static const char pcb_acth_ConfirmAction[] = "TODO";
+static fgw_error_t pcb_act_ConfirmAction(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0 = NULL, *a1 = NULL, *a2 = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, ConfirmAction, a0 = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, ConfirmAction, a1 = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, ConfirmAction, a2 = argv[3].val.str);
+
+	PCB_ACT_IRES(lesstif_confirm_dialog(a0, a1, a2, 0));
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+int lesstif_close_confirm_dialog()
+{
+	return lesstif_confirm_dialog("OK to lose data ?", NULL);
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget report = 0, report_form;
+
+void lesstif_report_dialog(const char *title, const char *msg)
+{
+	if (!report) {
+		if (mainwind == 0)
+			return;
+
+		stdarg_n = 0;
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNwidth, 600);
+		stdarg(XmNheight, 200);
+		stdarg(XmNtitle, title);
+		report_form = XmCreateFormDialog(mainwind, XmStrCast("report"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNeditable, False);
+		stdarg(XmNeditMode, XmMULTI_LINE_EDIT);
+		stdarg(XmNcursorPositionVisible, False);
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		report = XmCreateScrolledText(report_form, XmStrCast("text"), stdarg_args, stdarg_n);
+		XtManageChild(report);
+	}
+	stdarg_n = 0;
+	stdarg(XmNtitle, title);
+	XtSetValues(report_form, stdarg_args, stdarg_n);
+	XmTextSetString(report, (char *) msg);
+
+	XtManageChild(report_form);
+}
+
+/* ------------------------------------------------------------ */
+/* FIXME -- make this a proper file select dialog box */
+char *lesstif_fileselect(const char *title, const char *descr,
+												 const char *default_file, const char *default_ext, const char *history_tag, int flags)
+{
+
+	return lesstif_prompt_for(title, default_file);
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget prompt_dialog = 0;
+static Widget prompt_label, prompt_text;
+
+char *lesstif_prompt_for(const char *msg, const char *default_string)
+{
+	char *rv;
+	XmString xs;
+	if (prompt_dialog == 0) {
+		stdarg_n = 0;
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNtitle, "pcb-rnd Prompt");
+		prompt_dialog = XmCreateFormDialog(mainwind, XmStrCast("prompt"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNalignment, XmALIGNMENT_BEGINNING);
+		prompt_label = XmCreateLabel(prompt_dialog, XmStrCast("label"), stdarg_args, stdarg_n);
+		XtManageChild(prompt_label);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_WIDGET);
+		stdarg(XmNtopWidget, prompt_label);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNeditable, True);
+		prompt_text = XmCreateText(prompt_dialog, XmStrCast("text"), stdarg_args, stdarg_n);
+		XtManageChild(prompt_text);
+		XtAddCallback(prompt_text, XmNactivateCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 1);
+	}
+	if (!default_string)
+		default_string = "";
+	if (!msg)
+		msg = "Enter text:";
+	stdarg_n = 0;
+	xs = XmStringCreatePCB(msg);
+	stdarg(XmNlabelString, xs);
+	XtSetValues(prompt_label, stdarg_args, stdarg_n);
+	XmTextSetString(prompt_text, (char *) default_string);
+	XmTextSetCursorPosition(prompt_text, strlen(default_string));
+	wait_for_dialog(prompt_dialog);
+	rv = XmTextGetString(prompt_text);
+	return rv;
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget create_form_ok_dialog(const char *name, int ok, void (*button_cb)(void *ctx, pcb_hid_attr_ev_t ev), void *ctx)
+{
+	Widget dialog, topform;
+	dialog_cb_ctx_t *cb_ctx = NULL;
+
+	stdarg_n = 0;
+	dialog = XmCreateQuestionDialog(mainwind, XmStrCast(name), stdarg_args, stdarg_n);
+
+	if (button_cb != NULL) {
+		cb_ctx = malloc(sizeof(dialog_cb_ctx_t));
+		cb_ctx->cb = button_cb;
+		cb_ctx->ctx = ctx;
+	}
+
+	XtUnmanageChild(XmMessageBoxGetChild(dialog, XmDIALOG_SYMBOL_LABEL));
+	XtUnmanageChild(XmMessageBoxGetChild(dialog, XmDIALOG_MESSAGE_LABEL));
+	XtUnmanageChild(XmMessageBoxGetChild(dialog, XmDIALOG_HELP_BUTTON));
+	XtAddCallback(dialog, XmNcancelCallback, (XtCallbackProc) dialog_callback_cancel, cb_ctx);
+	if (ok)
+		XtAddCallback(dialog, XmNokCallback, (XtCallbackProc) dialog_callback_ok, cb_ctx);
+	else
+		XtUnmanageChild(XmMessageBoxGetChild(dialog, XmDIALOG_OK_BUTTON));
+
+	stdarg_n = 0;
+	topform = XmCreateForm(dialog, XmStrCast("attributes"), stdarg_args, stdarg_n);
+	XtManageChild(topform);
+	return topform;
+}
+
+static Widget pcb_motif_box(Widget parent, char *name, char type, int num_table_rows, int want_frame, int want_scroll)
+{
+	Widget cnt;
+
+	if (want_frame) {
+		/* create and insert frame around the content table */
+		stdarg(XmNalignment, XmALIGNMENT_END);
+		parent = XmCreateFrame(parent, XmStrCast("box-frame"), stdarg_args, stdarg_n);
+		XtManageChild(parent);
+		stdarg_n = 0;
+	}
+
+	if (want_scroll) {
+		stdarg(XmNscrollingPolicy, XmAUTOMATIC);
+		stdarg(XmNvisualPolicy, XmVARIABLE);
+
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+
+		parent = XmCreateScrolledWindow(parent, "scrolled_box", stdarg_args, stdarg_n);
+		XtManageChild(parent);
+		stdarg_n = 0;
+	}
+
+	switch(type) {
+		case 'h': /* "hbox" */
+			stdarg(XmNorientation, XmHORIZONTAL);
+			stdarg(XmNpacking, XmPACK_TIGHT);
+			break;
+		case 'v': /* "vbox" */
+			stdarg(XmNorientation, XmVERTICAL);
+			stdarg(XmNpacking, XmPACK_COLUMN);
+			break;
+		case 't': /* "table" */
+			stdarg(XmNorientation, XmHORIZONTAL);
+			stdarg(XmNpacking, XmPACK_COLUMN);
+			stdarg(XmNnumColumns, num_table_rows);
+			stdarg(XmNisAligned, True);
+			stdarg(XmNentryAlignment, XmALIGNMENT_END);
+			break;
+		default:
+			abort();
+	}
+	cnt = XmCreateRowColumn(parent, name, stdarg_args, stdarg_n);
+	return cnt;
+}
+
+typedef struct {
+	pcb_hid_attribute_t *attrs;
+	int n_attrs, actual_nattrs;
+	Widget *wl;
+	Widget **btn; /* enum value buttons */
+	pcb_hid_attr_val_t *results;
+	void *caller_data;
+	Widget dialog;
+	pcb_hid_attr_val_t property[PCB_HATP_max];
+	unsigned inhibit_valchg:1;
+	Dimension minw, minh;
+} lesstif_attr_dlg_t;
+
+static void attribute_dialog_readres(lesstif_attr_dlg_t *ctx, int widx)
+{
+	char *cp;
+
+	if (ctx->attrs[widx].help_text == ATTR_UNDOCUMENTED)
+		return;
+
+	switch(ctx->attrs[widx].type) {
+		case PCB_HATT_BOOL:
+			ctx->attrs[widx].default_val.int_value = ctx->results[widx].int_value = XmToggleButtonGetState(ctx->wl[widx]);
+			break;
+		case PCB_HATT_STRING:
+			ctx->results[widx].str_value = pcb_strdup(XmTextGetString(ctx->wl[widx]));
+			break;
+		case PCB_HATT_INTEGER:
+			cp = XmTextGetString(ctx->wl[widx]);
+			sscanf(cp, "%d", &ctx->results[widx].int_value);
+			break;
+		case PCB_HATT_COORD:
+			cp = XmTextGetString(ctx->wl[widx]);
+			ctx->results[widx].coord_value = pcb_get_value(cp, NULL, NULL, NULL);
+			break;
+		case PCB_HATT_REAL:
+			cp = XmTextGetString(ctx->wl[widx]);
+			sscanf(cp, "%lg", &ctx->results[widx].real_value);
+			break;
+		case PCB_HATT_ENUM:
+			{
+				const char **uptr;
+				Widget btn;
+
+				stdarg_n = 0;
+				stdarg(XmNmenuHistory, &btn);
+				XtGetValues(ctx->wl[widx], stdarg_args, stdarg_n);
+				stdarg_n = 0;
+				stdarg(XmNuserData, &uptr);
+				XtGetValues(btn, stdarg_args, stdarg_n);
+				ctx->results[widx].int_value = uptr - ctx->attrs[widx].enumerations;
+			}
+			break;
+		default:
+			break;
+	}
+	ctx->attrs[widx].default_val = ctx->results[widx];
+}
+
+static void valchg(Widget w, XtPointer dlg_widget_, XtPointer call_data)
+{
+	lesstif_attr_dlg_t *ctx;
+	Widget dlg_widget = (Widget)dlg_widget_; /* ctx->wl[i] */
+	int widx;
+
+	if (dlg_widget == NULL)
+		return;
+
+	XtVaGetValues(dlg_widget, XmNuserData, &ctx, NULL);
+
+	if (ctx == NULL)
+		return;
+
+	if (ctx->inhibit_valchg)
+		return;
+
+	for(widx = 0; widx < ctx->n_attrs; widx++)
+		if (ctx->wl[widx] == dlg_widget)
+			break;
+
+	if (widx >= ctx->n_attrs)
+		return;
+
+	ctx->attrs[widx].changed = 1;
+
+	if ((ctx->attrs[widx].change_cb == NULL) && (ctx->property[PCB_HATP_GLOBAL_CALLBACK].func == NULL))
+		return;
+
+	attribute_dialog_readres(ctx, widx);
+	if (ctx->property[PCB_HATP_GLOBAL_CALLBACK].func != NULL)
+		ctx->property[PCB_HATP_GLOBAL_CALLBACK].func(ctx, ctx->caller_data, &ctx->attrs[widx]);
+	if (ctx->attrs[widx].change_cb != NULL)
+		ctx->attrs[widx].change_cb(ctx, ctx->caller_data, &ctx->attrs[widx]);
+}
+
+static void pagechg(Widget w, XtPointer client_data, XtPointer call_data)
+{
+	lesstif_attr_dlg_t *ctx;
+	pcb_hid_attribute_t *attr = (pcb_hid_attribute_t *)client_data;
+	XmNotebookCallbackStruct *nptr = (XmNotebookCallbackStruct *)call_data;
+	int widx;
+
+	XtVaGetValues(w, XmNuserData, &ctx, NULL);
+
+	if (ctx == NULL)
+		return;
+
+	if (ctx->inhibit_valchg)
+		return;
+
+	widx = attr - ctx->attrs;
+	if ((widx < 0) || (widx >= ctx->n_attrs))
+		return;
+
+	ctx->results[widx].int_value = nptr->page_number - 1;
+
+	attribute_dialog_readres(ctx, widx);
+	if (ctx->property[PCB_HATP_GLOBAL_CALLBACK].func != NULL)
+		ctx->property[PCB_HATP_GLOBAL_CALLBACK].func(ctx, ctx->caller_data, &ctx->attrs[widx]);
+	if (attr->change_cb != NULL)
+		attr->change_cb(ctx, ctx->caller_data, attr);
+}
+
+/* parent info for tabbed */
+typedef struct {
+	Widget notebook;
+	const char **tablab;
+	Dimension minw;
+	int tabs;
+} attr_dlg_tb_t;
+
+/* returns the index of HATT_END where the loop had to stop */
+static int attribute_dialog_add(lesstif_attr_dlg_t *ctx, Widget real_parent, attr_dlg_tb_t *tb, int start_from, int add_labels)
+{
+	int len, i, numch, numcol;
+	Widget parent;
+	static XmString empty = 0;
+
+	if (!empty)
+		empty = XmStringCreatePCB(" ");
+
+	for (i = start_from; i < ctx->n_attrs; i++) {
+		char buf[30];
+		Widget w;
+
+		if (ctx->attrs[i].type == PCB_HATT_END)
+			break;
+
+		if (ctx->attrs[i].help_text == ATTR_UNDOCUMENTED)
+			continue;
+
+		/* if we are in a notebook, a page needs to be created first */
+		if (tb != NULL) {
+			const char *lab;
+			Widget tab;
+			Dimension wi;
+
+			parent = XmCreateRowColumn(tb->notebook, "page", NULL, 0);
+
+			stdarg_n = 0;
+			stdarg(XmNnotebookChildType, XmMAJOR_TAB);
+			if (*tb->tablab != NULL) {
+				lab = *tb->tablab;
+				tb->tablab++;
+			}
+			else
+				lab = "<anon>";
+
+			tab = XmCreatePushButton(tb->notebook, (char *)lab, stdarg_args, stdarg_n);
+			XtManageChild(tab);
+
+			/* update minimum width for tabs */
+			stdarg_n = 0;
+			stdarg(XmNwidth, &wi);
+			XtGetValues(tab, stdarg_args, stdarg_n);
+			if (wi > tb->minw)
+				tb->minw = wi;
+			tb->tabs++;
+
+			XtManageChild(parent);
+		}
+		else
+			parent = real_parent;
+
+		/* Add label */
+		if ((add_labels) && (ctx->attrs[i].type != PCB_HATT_LABEL)) {
+			stdarg_n = 0;
+			stdarg(XmNalignment, XmALIGNMENT_END);
+			w = XmCreateLabel(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtManageChild(w);
+		}
+
+		/* Add content */
+		stdarg_n = 0;
+		stdarg(XmNalignment, XmALIGNMENT_END);
+		stdarg(XmNuserData, ctx);
+
+		switch(ctx->attrs[i].type) {
+		case PCB_HATT_BEGIN_HBOX:
+			w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'h', 0, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL));
+			XtManageChild(w);
+			ctx->wl[i] = w;
+			i = attribute_dialog_add(ctx, w, NULL, i+1, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LABEL));
+			break;
+
+		case PCB_HATT_BEGIN_VBOX:
+			w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 'v', 0, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL));
+			XtManageChild(w);
+			ctx->wl[i] = w;
+			i = attribute_dialog_add(ctx, w, NULL, i+1, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LABEL));
+			break;
+
+		case PCB_HATT_BEGIN_TABLE:
+			/* create content table */
+			numcol = ctx->attrs[i].pcb_hatt_table_cols;
+			len = pcb_hid_attrdlg_num_children(ctx->attrs, i+1, ctx->n_attrs);
+			numch = len  / numcol + !!(len % numcol);
+			w = pcb_motif_box(parent, XmStrCast(ctx->attrs[i].name), 't', numch, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_FRAME), (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_SCROLL));
+
+			ctx->wl[i] = w;
+
+			i = attribute_dialog_add(ctx, w, NULL, i+1, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LABEL));
+			while((len % numcol) != 0) {
+				Widget pad;
+
+				stdarg_n = 0;
+				stdarg(XmNalignment, XmALIGNMENT_END);
+				pad = XmCreateLabel(w, XmStrCast("."), stdarg_args, stdarg_n);
+				XtManageChild(pad);
+				len++;
+			}
+			XtManageChild(w);
+			break;
+
+		case PCB_HATT_BEGIN_TABBED:
+		{
+			Widget scroller;
+			attr_dlg_tb_t tb;
+
+			stdarg_n = 0;
+			if (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LEFT_TAB) {
+				stdarg(XmNbackPagePlacement, XmBOTTOM_LEFT);
+				stdarg(XmNorientation, XmHORIZONTAL);
+			}
+			else {
+				stdarg(XmNbackPagePlacement, XmTOP_RIGHT);
+				stdarg(XmNorientation, XmVERTICAL);
+			}
+			stdarg(XmNbackPageNumber, 1);
+			stdarg(XmNbackPageSize, 1);
+			stdarg(XmNbindingType, XmNONE);
+
+
+			stdarg(XmNleftAttachment, XmATTACH_FORM);
+			stdarg(XmNtopAttachment, XmATTACH_FORM);
+			stdarg(XmNrightAttachment, XmATTACH_FORM);
+			stdarg(XmNbottomAttachment, XmATTACH_FORM);
+			stdarg(XmNuserData, ctx);
+			ctx->wl[i] = w = XmCreateNotebook(parent, "notebook", stdarg_args, stdarg_n);
+
+			/* remove the page scroller widget that got automatically created by XmCreateNotebook() */
+			scroller = XtNameToWidget(w, "PageScroller");
+			XtUnmanageChild (scroller);
+
+			XtAddCallback(w, XmNpageChangedCallback, (XtCallbackProc)pagechg, (XtPointer)&ctx->attrs[i]);
+
+			tb.notebook = w;
+			tb.tablab = ctx->attrs[i].enumerations;
+			tb.minw = 0;
+			tb.tabs = 0;
+
+			i = attribute_dialog_add(ctx, w, &tb, i+1, (ctx->attrs[i].pcb_hatt_flags & PCB_HATF_LABEL));
+
+			XtManageChild(w);
+			break;
+		}
+
+		case PCB_HATT_LABEL:
+			stdarg_n = 0;
+			stdarg(XmNalignment, XmALIGNMENT_BEGINNING);
+			ctx->wl[i] = XmCreateLabel(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			break;
+		case PCB_HATT_BOOL:
+			stdarg(XmNlabelString, empty);
+			stdarg(XmNset, ctx->results[i].int_value);
+			ctx->wl[i] = XmCreateToggleButton(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]);
+			break;
+		case PCB_HATT_STRING:
+			stdarg(XmNcolumns, 40);
+			stdarg(XmNresizeWidth, True);
+			stdarg(XmNvalue, ctx->results[i].str_value);
+			ctx->wl[i] = XmCreateTextField(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]);
+			break;
+		case PCB_HATT_INTEGER:
+			stdarg(XmNcolumns, 13);
+			stdarg(XmNresizeWidth, True);
+			sprintf(buf, "%d", ctx->results[i].int_value);
+			stdarg(XmNvalue, buf);
+			ctx->wl[i] = XmCreateTextField(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]);
+			break;
+		case PCB_HATT_COORD:
+			stdarg(XmNcolumns, 13);
+			stdarg(XmNresizeWidth, True);
+			pcb_snprintf(buf, sizeof(buf), "%$mS", ctx->results[i].coord_value);
+			stdarg(XmNvalue, buf);
+			ctx->wl[i] = XmCreateTextField(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]);
+			break;
+		case PCB_HATT_REAL:
+			stdarg(XmNcolumns, 16);
+			stdarg(XmNresizeWidth, True);
+			pcb_snprintf(buf, sizeof(buf), "%g", ctx->results[i].real_value);
+			stdarg(XmNvalue, buf);
+			ctx->wl[i] = XmCreateTextField(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNvalueChangedCallback, valchg, ctx->wl[i]);
+			break;
+		case PCB_HATT_ENUM:
+			{
+				static XmString empty = 0;
+				Widget submenu, default_button = 0;
+				int sn = stdarg_n;
+
+				if (empty == 0)
+					empty = XmStringCreatePCB("");
+
+				submenu = XmCreatePulldownMenu(parent, XmStrCast(ctx->attrs[i].name == NULL ? "anon" : ctx->attrs[i].name), stdarg_args + sn, stdarg_n - sn);
+
+				stdarg_n = sn;
+				stdarg(XmNlabelString, empty);
+				stdarg(XmNsubMenuId, submenu);
+				ctx->wl[i] = XmCreateOptionMenu(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+				for (sn = 0; ctx->attrs[i].enumerations[sn]; sn++);
+				ctx->btn[i] = calloc(sizeof(Widget), sn);
+				for (sn = 0; ctx->attrs[i].enumerations[sn]; sn++) {
+					Widget btn;
+					XmString label;
+					stdarg_n = 0;
+					label = XmStringCreatePCB(ctx->attrs[i].enumerations[sn]);
+					stdarg(XmNuserData, &ctx->attrs[i].enumerations[sn]);
+					stdarg(XmNlabelString, label);
+					btn = XmCreatePushButton(submenu, XmStrCast("menubutton"), stdarg_args, stdarg_n);
+					XtManageChild(btn);
+					XmStringFree(label);
+					if (sn == ctx->attrs[i].default_val.int_value)
+						default_button = btn;
+					XtAddCallback(btn, XmNactivateCallback, valchg, ctx->wl[i]);
+					(ctx->btn[i])[sn] = btn;
+				}
+				if (default_button) {
+					stdarg_n = 0;
+					stdarg(XmNmenuHistory, default_button);
+					XtSetValues(ctx->wl[i], stdarg_args, stdarg_n);
+				}
+			}
+			break;
+		case PCB_HATT_BUTTON:
+			stdarg(XmNlabelString, XmStringCreatePCB(ctx->attrs[i].default_val.str_value));
+			ctx->wl[i] = XmCreatePushButton(parent, XmStrCast(ctx->attrs[i].name), stdarg_args, stdarg_n);
+			XtAddCallback(ctx->wl[i], XmNactivateCallback, valchg, ctx->wl[i]);
+			break;
+		default:
+			ctx->wl[i] = XmCreateLabel(parent, XmStrCast("UNIMPLEMENTED"), stdarg_args, stdarg_n);
+			break;
+		}
+		if (ctx->wl[i] != NULL)
+			XtManageChild(ctx->wl[i]);
+		if (tb != NULL) {
+			tb->minw = tb->tabs * (tb->minw+10) + 10;
+			if (tb->minw > ctx->minw)
+				ctx->minw = tb->minw;
+		}
+	}
+	return i;
+}
+
+
+static int attribute_dialog_set(lesstif_attr_dlg_t *ctx, int idx, const pcb_hid_attr_val_t *val)
+{
+	char buf[30];
+	int save, n;
+
+	save = ctx->inhibit_valchg;
+	ctx->inhibit_valchg = 1;
+	switch(ctx->attrs[idx].type) {
+		case PCB_HATT_BEGIN_HBOX:
+		case PCB_HATT_BEGIN_VBOX:
+		case PCB_HATT_BEGIN_TABLE:
+		case PCB_HATT_END:
+			goto err;
+		case PCB_HATT_BEGIN_TABBED:
+			XtVaSetValues(ctx->wl[idx], XmNcurrentPageNumber, val->int_value+1, NULL);
+			break;
+		case PCB_HATT_BUTTON:
+			XtVaSetValues(ctx->wl[idx], XmNlabelString, XmStringCreatePCB(val->str_value), NULL);
+			break;
+		case PCB_HATT_LABEL:
+			XtVaSetValues(ctx->wl[idx], XmNlabelString, XmStringCreatePCB(val->str_value), NULL);
+			break;
+		case PCB_HATT_BOOL:
+			XtVaSetValues(ctx->wl[idx], XmNset, val->int_value, NULL);
+			break;
+		case PCB_HATT_STRING:
+			XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(val->str_value), NULL);
+			break;
+		case PCB_HATT_INTEGER:
+			sprintf(buf, "%d", val->int_value);
+			XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(buf), NULL);
+			break;
+		case PCB_HATT_COORD:
+			pcb_snprintf(buf, sizeof(buf), "%$mS", val->coord_value);
+			XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(buf), NULL);
+			break;
+		case PCB_HATT_REAL:
+			pcb_snprintf(buf, sizeof(buf), "%g", val->real_value);
+			XtVaSetValues(ctx->wl[idx], XmNvalue, XmStrCast(buf), NULL);
+			break;
+		case PCB_HATT_ENUM:
+			for (n = 0; ctx->attrs[idx].enumerations[n]; n++) {
+				if (n == val->int_value) {
+					stdarg_n = 0;
+					stdarg(XmNmenuHistory, (ctx->btn[idx])[n]);
+					XtSetValues(ctx->wl[idx], stdarg_args, stdarg_n);
+					goto ok;
+				}
+			}
+			goto err;
+		default:
+			goto err;
+	}
+
+	ok:;
+	ctx->attrs[idx].default_val = *val;
+	ctx->inhibit_valchg = save;
+	return 0;
+
+	err:;
+	ctx->inhibit_valchg = save;
+	return -1;
+}
+
+void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+{
+	Widget topform, main_tbl;
+	int i;
+	lesstif_attr_dlg_t *ctx;
+
+	ctx = calloc(sizeof(lesstif_attr_dlg_t), 1);
+	ctx->attrs = attrs;
+	ctx->results = results;
+	ctx->n_attrs = n_attrs;
+	ctx->caller_data = caller_data;
+	ctx->minw = ctx->minh = 32;
+
+	for (i = 0; i < n_attrs; i++) {
+		if (attrs[i].help_text != ATTR_UNDOCUMENTED)
+			ctx->actual_nattrs++;
+		results[i] = attrs[i].default_val;
+		if (PCB_HAT_IS_STR(attrs[i].type) && (results[i].str_value))
+			results[i].str_value = pcb_strdup(results[i].str_value);
+		else
+			results[i].str_value = NULL;
+	}
+
+	ctx->wl = (Widget *) calloc(n_attrs, sizeof(Widget));
+	ctx->btn = (Widget **) calloc(n_attrs, sizeof(Widget *));
+
+	topform = create_form_ok_dialog(title, 1, button_cb, caller_data);
+	ctx->dialog = XtParent(topform);
+
+	stdarg_n = 0;
+	stdarg(XmNfractionBase, ctx->n_attrs);
+	XtSetValues(topform, stdarg_args, stdarg_n);
+
+
+	if (!PCB_HATT_IS_COMPOSITE(attrs[0].type)) {
+		stdarg_n = 0;
+		main_tbl = pcb_motif_box(topform, XmStrCast("layout"), 't', pcb_hid_attrdlg_num_children(ctx->attrs, 0, ctx->n_attrs), 0, 0);
+		XtManageChild(main_tbl);
+		attribute_dialog_add(ctx, main_tbl, NULL, 0, 1);
+	}
+	else
+		attribute_dialog_add(ctx, topform, NULL, 0, (ctx->attrs[0].pcb_hatt_flags & PCB_HATF_LABEL));
+
+	/* don't expect screens larger than 800x600 */
+	if (ctx->minw > 750)
+		ctx->minw = 750;
+	if (ctx->minw > 550)
+		ctx->minw = 550;
+
+	/* set top form's minimum width/height to content request */
+	stdarg_n = 0;
+	stdarg(XmNminWidth, ctx->minw);
+	stdarg(XmNminHeight, ctx->minh);
+	XtSetValues(XtParent(ctx->dialog), stdarg_args, stdarg_n);
+
+	if (!modal)
+		XtManageChild(ctx->dialog);
+
+	return ctx;
+}
+
+int lesstif_attr_dlg_run(void *hid_ctx)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+	return wait_for_dialog(ctx->dialog);
+}
+
+void lesstif_attr_dlg_free(void *hid_ctx)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+	int i;
+
+	for (i = 0; i < ctx->n_attrs; i++) {
+		attribute_dialog_readres(ctx, i);
+		free(ctx->btn[i]);
+	}
+
+	free(ctx->wl);
+	XtDestroyWidget(ctx->dialog);
+	free(ctx);
+}
+
+void lesstif_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+	if ((prop >= 0) && (prop < PCB_HATP_max))
+		ctx->property[prop] = *val;
+}
+
+int lesstif_attribute_dialog(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+{
+	int rv;
+	void *hid_ctx;
+	
+	hid_ctx = lesstif_attr_dlg_new(attrs, n_attrs, results, title, descr, caller_data, pcb_true, NULL);
+	rv = lesstif_attr_dlg_run(hid_ctx);
+	lesstif_attr_dlg_free(hid_ctx);
+
+	return rv ? 0 : 1;
+}
+
+int lesstif_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+
+	if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL))
+		return -1;
+
+	XtSetSensitive(ctx->wl[idx], enabled);
+	return 0;
+}
+
+int lesstif_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+
+	if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL))
+		return -1;
+
+	if (hide)
+		XtUnmanageChild(ctx->wl[idx]);
+	else
+		XtManageChild(ctx->wl[idx]);
+
+	return 0;
+}
+
+int lesstif_attr_dlg_set_value(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val)
+{
+	lesstif_attr_dlg_t *ctx = hid_ctx;
+
+	if ((idx < 0) || (idx >= ctx->n_attrs))
+		return -1;
+
+	if (attribute_dialog_set(ctx, idx, val) == 0) {
+		ctx->results[idx] = *val;
+		return 0;
+	}
+
+	return -1;
+}
+
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_DoWindows[] = "DoWindows(1|2|3|4)\n" "DoWindows(Layout|Library|Log|Netlist)";
+
+static const char pcb_acth_DoWindows[] = "Open various GUI windows.";
+
+/* %start-doc actions DoWindows
+
+@table @code
+
+@item 1
+@itemx Layout
+Open the layout window.  Since the layout window is always shown
+anyway, this has no effect.
+
+@item 2
+@itemx Library
+Open the library window.
+
+@item 3
+@itemx Log
+Open the log window.
+
+@item 4
+@itemx Netlist
+Open the netlist window.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_DoWindows(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a = "";
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str);
+	if (strcmp(a, "1") == 0 || pcb_strcasecmp(a, "Layout") == 0) {
+	}
+	else if (strcmp(a, "2") == 0 || pcb_strcasecmp(a, "Library") == 0) {
+		lesstif_show_library();
+	}
+	else if (strcmp(a, "3") == 0 || pcb_strcasecmp(a, "Log") == 0) {
+		if (log_form == 0)
+			lesstif_log("");
+		XtManageChild(log_form);
+	}
+	else if (strcmp(a, "4") == 0 || pcb_strcasecmp(a, "Netlist") == 0) {
+		lesstif_show_netlist();
+	}
+	else {
+		PCB_ACT_FAIL(DoWindows);
+		PCB_ACT_IRES(1);
+		return 1;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_Print[] = "Print()";
+
+static const char pcb_acth_Print[] = "Print the layout.";
+
+/* %start-doc actions Print
+
+This will find the default printing HID, prompt the user for its
+options, and print the layout.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Print(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_hid_attribute_t *opts;
+	pcb_hid_t *printer;
+	pcb_hid_attr_val_t *vals;
+	int n;
+
+	printer = pcb_hid_find_printer();
+	if (!printer) {
+		lesstif_confirm_dialog("No printer?", "Oh well", 0);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	opts = printer->get_export_options(&n);
+	vals = (pcb_hid_attr_val_t *) calloc(n, sizeof(pcb_hid_attr_val_t));
+	if (lesstif_attribute_dialog(opts, n, vals, "Print", "", NULL)) {
+		free(vals);
+		PCB_ACT_IRES(1);
+		return 1;
+	}
+	printer->do_export(vals);
+	free(vals);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static Widget sizes_dialog = 0;
+static Widget sz_pcb_w, sz_pcb_h, sz_bloat, sz_shrink, sz_drc_wid, sz_drc_slk, sz_drc_drill, sz_drc_ring;
+static Widget sz_text;
+static Widget sz_set, sz_reset, sz_units;
+
+static int sz_str2val(Widget w, pcb_bool pcbu)
+{
+	char *buf = XmTextGetString(w);
+	if (!pcbu)
+		return strtol(buf, NULL, 0);
+	return pcb_get_value_ex(buf, NULL, NULL, NULL, conf_core.editor.grid_unit->suffix, NULL);
+}
+
+static void sz_val2str(Widget w, pcb_coord_t u, int pcbu)
+{
+	static char buf[40];
+	if (pcbu)
+		pcb_sprintf(buf, "%m+%.2mS", conf_core.editor.grid_unit->allow, u);
+	else
+		pcb_snprintf(buf, sizeof(buf), "%#mS %%", u);
+	XmTextSetString(w, buf);
+}
+
+static void sizes_set()
+{
+	PCB->MaxWidth = sz_str2val(sz_pcb_w, 1);
+	PCB->MaxHeight = sz_str2val(sz_pcb_h, 1);
+
+	conf_set_design("design/text_scale", "%s", sz_text);
+	conf_set_design("design/bloat", "%s", sz_bloat);
+	conf_set_design("design/shrink", "%s", sz_shrink);
+	conf_set_design("design/min_wid", "%s", sz_drc_wid);
+	conf_set_design("design/min_slk", "%s", sz_drc_slk);
+	conf_set_design("design/min_drill", "%s", sz_drc_drill);
+	conf_set_design("design/min_ring", "%s", sz_drc_ring);
+
+	pcb_crosshair_set_range(0, 0, PCB->MaxWidth, PCB->MaxHeight);
+	lesstif_pan_fixup();
+}
+
+void lesstif_sizes_reset()
+{
+	char *ls;
+	if (!sizes_dialog)
+		return;
+	sz_val2str(sz_pcb_w, PCB->MaxWidth, 1);
+	sz_val2str(sz_pcb_h, PCB->MaxHeight, 1);
+	sz_val2str(sz_text, conf_core.design.text_scale, 0);
+
+	ls = pcb_strdup_printf(_("Units are %s."), conf_core.editor.grid_unit->in_suffix);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, XmStringCreatePCB(ls));
+	XtSetValues(sz_units, stdarg_args, stdarg_n);
+	free(ls);
+}
+
+static Widget size_field(Widget parent, const char *label, int posn)
+{
+	Widget w, l;
+	stdarg_n = 0;
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNtopAttachment, XmATTACH_POSITION);
+	stdarg(XmNtopPosition, posn);
+	stdarg(XmNbottomAttachment, XmATTACH_POSITION);
+	stdarg(XmNbottomPosition, posn + 1);
+	stdarg(XmNcolumns, 10);
+	w = XmCreateTextField(parent, XmStrCast("field"), stdarg_args, stdarg_n);
+	XtManageChild(w);
+
+	stdarg_n = 0;
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_WIDGET);
+	stdarg(XmNrightWidget, w);
+	stdarg(XmNtopAttachment, XmATTACH_POSITION);
+	stdarg(XmNtopPosition, posn);
+	stdarg(XmNbottomAttachment, XmATTACH_POSITION);
+	stdarg(XmNbottomPosition, posn + 1);
+	stdarg(XmNlabelString, XmStringCreatePCB(label));
+	stdarg(XmNalignment, XmALIGNMENT_END);
+	l = XmCreateLabel(parent, XmStrCast("label"), stdarg_args, stdarg_n);
+	XtManageChild(l);
+
+	return w;
+}
+
+static const char pcb_acts_AdjustSizes[] = "AdjustSizes()";
+
+static const char pcb_acth_AdjustSizes[] = "Let the user change the board size, DRC parameters, etc";
+
+/* %start-doc actions AdjustSizes
+
+Displays a dialog box that lets the user change the board
+size, DRC parameters, and text scale.
+
+The units are determined by the default display units.
+
+%end-doc */
+
+static fgw_error_t pcb_act_AdjustSizes(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (!sizes_dialog) {
+		Widget inf, sep;
+
+		stdarg_n = 0;
+		stdarg(XmNmarginWidth, 3);
+		stdarg(XmNmarginHeight, 3);
+		stdarg(XmNhorizontalSpacing, 3);
+		stdarg(XmNverticalSpacing, 3);
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNtitle, "Board Sizes");
+		sizes_dialog = XmCreateFormDialog(mainwind, XmStrCast("sizes"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		sz_reset = XmCreatePushButton(sizes_dialog, XmStrCast("Reset"), stdarg_args, stdarg_n);
+		XtManageChild(sz_reset);
+		XtAddCallback(sz_reset, XmNactivateCallback, (XtCallbackProc) lesstif_sizes_reset, 0);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_WIDGET);
+		stdarg(XmNrightWidget, sz_reset);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		sz_set = XmCreatePushButton(sizes_dialog, XmStrCast("Set"), stdarg_args, stdarg_n);
+		XtManageChild(sz_set);
+		XtAddCallback(sz_set, XmNactivateCallback, (XtCallbackProc) sizes_set, 0);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, sz_reset);
+		sep = XmCreateSeparator(sizes_dialog, XmStrCast("sep"), stdarg_args, stdarg_n);
+		XtManageChild(sep);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, sep);
+		sz_units = XmCreateLabel(sizes_dialog, XmStrCast("units"), stdarg_args, stdarg_n);
+		XtManageChild(sz_units);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, sz_units);
+		stdarg(XmNfractionBase, 9);
+		inf = XmCreateForm(sizes_dialog, XmStrCast("sizes"), stdarg_args, stdarg_n);
+		XtManageChild(inf);
+
+		sz_pcb_w = size_field(inf, "PCB Width", 0);
+		sz_pcb_h = size_field(inf, "PCB Height", 1);
+		sz_bloat = size_field(inf, "Bloat", 2);
+		sz_shrink = size_field(inf, "Shrink", 3);
+		sz_drc_wid = size_field(inf, "DRC Min Wid", 4);
+		sz_drc_slk = size_field(inf, "DRC Min Silk", 5);
+		sz_drc_drill = size_field(inf, "DRC Min Drill", 6);
+		sz_drc_ring = size_field(inf, "DRC Min Annular Ring", 7);
+		sz_text = size_field(inf, "Text Scale", 8);
+	}
+	lesstif_sizes_reset();
+	XtManageChild(sizes_dialog);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+void lesstif_update_layer_groups()
+{
+#warning layer TODO: call a redraw on the edit group
+}
+
+static const char pcb_acts_EditLayerGroups[] = "EditLayerGroups()";
+
+static const char pcb_acth_EditLayerGroups[] = "Let the user change the layer groupings";
+
+/* %start-doc actions EditLayerGroups
+
+Displays a dialog that lets the user view and change the layer
+groupings.  Each layer (row) can be a member of any one layer group
+(column).  Note the special layers @code{solder} and @code{component}
+allow you to specify which groups represent the top and bottom of the
+board.
+
+See @ref{ChangeName Action}.
+
+%end-doc */
+
+extern void lesstif_show_layergrp_edit(void);
+static fgw_error_t pcb_act_EditLayerGroups(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	lesstif_show_layergrp_edit();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_fontsel[] = "EditLayerGroups()";
+static const char pcb_acth_fontsel[] = "Let the user change fonts";
+extern void lesstif_show_fontsel_edit(pcb_layer_t *txtly, pcb_text_t *txt, int type);
+static fgw_error_t pcb_act_fontsel(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (argc > 2)
+		PCB_ACT_FAIL(fontsel);
+
+	if (argc > 1) {
+		const char *op;
+		PCB_ACT_CONVARG(1, FGW_STR, fontsel, op = argv[1].val.str);
+		if (pcb_strcasecmp(op, "Object") == 0) {
+			pcb_coord_t x, y;
+			int type;
+			void *ptr1, *ptr2, *ptr3;
+			pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+			if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+/*				pcb_undo_save_serial();*/
+				lesstif_show_fontsel_edit(ptr1, ptr2, type);
+			}
+		}
+		else
+			PCB_ACT_FAIL(fontsel);
+	}
+	else
+		lesstif_show_fontsel_edit(NULL, NULL, 0);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+typedef struct {
+	Widget del;
+	Widget w_name;
+	Widget w_value;
+} AttrRow;
+
+static AttrRow *attr_row = 0;
+static int attr_num_rows = 0;
+static int attr_max_rows = 0;
+static Widget attr_dialog = NULL, f_top;
+static pcb_attribute_list_t *attributes_list;
+
+static void attributes_delete_callback(Widget w, void *v, void *cbs);
+
+static void fiddle_with_bb_layout()
+{
+	int i;
+	int max_height = 0;
+	int max_del_width = 0;
+	int max_name_width = 0;
+	int max_value_width = 0;
+	short ncolumns = 20;
+	short vcolumns = 20;
+
+	for (i = 0; i < attr_num_rows; i++) {
+		String v;
+
+		stdarg_n = 0;
+		stdarg(XmNvalue, &v);
+		XtGetValues(attr_row[i].w_name, stdarg_args, stdarg_n);
+		if (ncolumns < strlen(v))
+			ncolumns = strlen(v);
+
+		stdarg_n = 0;
+		stdarg(XmNvalue, &v);
+		XtGetValues(attr_row[i].w_value, stdarg_args, stdarg_n);
+		if (vcolumns < strlen(v))
+			vcolumns = strlen(v);
+	}
+
+	for (i = 0; i < attr_num_rows; i++) {
+		stdarg_n = 0;
+		stdarg(XmNcolumns, ncolumns);
+		XtSetValues(attr_row[i].w_name, stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNcolumns, vcolumns);
+		XtSetValues(attr_row[i].w_value, stdarg_args, stdarg_n);
+	}
+
+	for (i = 0; i < attr_num_rows; i++) {
+		Dimension w, h;
+		stdarg_n = 0;
+		stdarg(XmNwidth, &w);
+		stdarg(XmNheight, &h);
+
+		XtGetValues(attr_row[i].del, stdarg_args, stdarg_n);
+		if (max_height < h)
+			max_height = h;
+		if (max_del_width < w)
+			max_del_width = w;
+
+		XtGetValues(attr_row[i].w_name, stdarg_args, stdarg_n);
+		if (max_height < h)
+			max_height = h;
+		if (max_name_width < w)
+			max_name_width = w;
+
+		XtGetValues(attr_row[i].w_value, stdarg_args, stdarg_n);
+		if (max_height < h)
+			max_height = h;
+		if (max_value_width < w)
+			max_value_width = w;
+	}
+
+	for (i = 0; i < attr_num_rows; i++) {
+		stdarg_n = 0;
+		stdarg(XmNx, 0);
+		stdarg(XmNy, i * max_height);
+		stdarg(XmNwidth, max_del_width);
+		stdarg(XmNheight, max_height);
+		XtSetValues(attr_row[i].del, stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNx, max_del_width);
+		stdarg(XmNy, i * max_height);
+		stdarg(XmNwidth, max_name_width);
+		stdarg(XmNheight, max_height);
+		XtSetValues(attr_row[i].w_name, stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNx, max_del_width + max_name_width);
+		stdarg(XmNy, i * max_height);
+		stdarg(XmNwidth, max_value_width);
+		stdarg(XmNheight, max_height);
+		XtSetValues(attr_row[i].w_value, stdarg_args, stdarg_n);
+	}
+
+	stdarg_n = 0;
+	stdarg(XmNwidth, max_del_width + max_name_width + max_value_width + 1);
+	stdarg(XmNheight, max_height * attr_num_rows + 1);
+	XtSetValues(f_top, stdarg_args, stdarg_n);
+}
+
+static void lesstif_attributes_need_rows(int new_max)
+{
+	if (attr_max_rows < new_max) {
+		if (attr_row)
+			attr_row = (AttrRow *) realloc(attr_row, new_max * sizeof(AttrRow));
+		else
+			attr_row = (AttrRow *) malloc(new_max * sizeof(AttrRow));
+	}
+
+	while (attr_max_rows < new_max) {
+		stdarg_n = 0;
+		attr_row[attr_max_rows].del = XmCreatePushButton(f_top, XmStrCast("del"), stdarg_args, stdarg_n);
+		XtManageChild(attr_row[attr_max_rows].del);
+		XtAddCallback(attr_row[attr_max_rows].del, XmNactivateCallback,
+									(XtCallbackProc) attributes_delete_callback, (XtPointer) (size_t) attr_max_rows);
+
+		stdarg_n = 0;
+		stdarg(XmNresizeWidth, True);
+		attr_row[attr_max_rows].w_name = XmCreateTextField(f_top, XmStrCast("name"), stdarg_args, stdarg_n);
+		XtManageChild(attr_row[attr_max_rows].w_name);
+		XtAddCallback(attr_row[attr_max_rows].w_name, XmNvalueChangedCallback, (XtCallbackProc) fiddle_with_bb_layout, NULL);
+
+		stdarg_n = 0;
+		stdarg(XmNresizeWidth, True);
+		attr_row[attr_max_rows].w_value = XmCreateTextField(f_top, XmStrCast("value"), stdarg_args, stdarg_n);
+		XtManageChild(attr_row[attr_max_rows].w_value);
+		XtAddCallback(attr_row[attr_max_rows].w_value, XmNvalueChangedCallback, (XtCallbackProc) fiddle_with_bb_layout, NULL);
+
+		attr_max_rows++;
+	}
+
+	/* Manage any previously unused rows we now need to show.  */
+	while (attr_num_rows < new_max) {
+		XtManageChild(attr_row[attr_num_rows].del);
+		XtManageChild(attr_row[attr_num_rows].w_name);
+		XtManageChild(attr_row[attr_num_rows].w_value);
+		attr_num_rows++;
+	}
+}
+
+static void lesstif_attributes_revert()
+{
+	int i;
+
+	lesstif_attributes_need_rows(attributes_list->Number);
+
+	/* Unmanage any previously used rows we don't need.  */
+	while (attr_num_rows > attributes_list->Number) {
+		attr_num_rows--;
+		XtUnmanageChild(attr_row[attr_num_rows].del);
+		XtUnmanageChild(attr_row[attr_num_rows].w_name);
+		XtUnmanageChild(attr_row[attr_num_rows].w_value);
+	}
+
+	/* Fill in values */
+	for (i = 0; i < attributes_list->Number; i++) {
+		XmTextFieldSetString(attr_row[i].w_name, attributes_list->List[i].name);
+		XmTextFieldSetString(attr_row[i].w_value, attributes_list->List[i].value);
+	}
+
+	fiddle_with_bb_layout();
+}
+
+static void attributes_new_callback(Widget w, void *v, void *cbs)
+{
+	lesstif_attributes_need_rows(attr_num_rows + 1);	/* also bumps attr_num_rows */
+	XmTextFieldSetString(attr_row[attr_num_rows - 1].w_name, XmStrCast(""));
+	XmTextFieldSetString(attr_row[attr_num_rows - 1].w_value, XmStrCast(""));
+
+	fiddle_with_bb_layout();
+}
+
+static void attributes_delete_callback(Widget w, void *v, void *cbs)
+{
+	int i, n;
+	Widget wn, wv;
+
+	n = (int) (size_t) v;
+
+	wn = attr_row[n].w_name;
+	wv = attr_row[n].w_value;
+
+	for (i = n; i < attr_num_rows - 1; i++) {
+		attr_row[i].w_name = attr_row[i + 1].w_name;
+		attr_row[i].w_value = attr_row[i + 1].w_value;
+	}
+	attr_row[attr_num_rows - 1].w_name = wn;
+	attr_row[attr_num_rows - 1].w_value = wv;
+	attr_num_rows--;
+
+	XtUnmanageChild(wn);
+	XtUnmanageChild(wv);
+
+	fiddle_with_bb_layout();
+}
+
+static void attributes_revert_callback(Widget w, void *v, void *cbs)
+{
+	lesstif_attributes_revert();
+}
+
+void lesstif_attributes_dialog(const char *owner, pcb_attribute_list_t * attrs_list)
+{
+	Widget bform, sw, b_ok, b_cancel, b_revert, b_new;
+	Widget sep;
+
+	if (attr_dialog == NULL) {
+		stdarg_n = 0;
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNtitle, owner);
+		stdarg(XmNwidth, 400);
+		stdarg(XmNheight, 300);
+		attr_dialog = XmCreateFormDialog(mainwind, XmStrCast("attributes"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		stdarg(XmNorientation, XmHORIZONTAL);
+		stdarg(XmNentryAlignment, XmALIGNMENT_CENTER);
+		stdarg(XmNpacking, XmPACK_COLUMN);
+		bform = XmCreateRowColumn(attr_dialog, XmStrCast("attributes"), stdarg_args, stdarg_n);
+		XtManageChild(bform);
+
+		stdarg_n = 0;
+		b_ok = XmCreatePushButton(bform, XmStrCast("OK"), stdarg_args, stdarg_n);
+		XtManageChild(b_ok);
+		XtAddCallback(b_ok, XmNactivateCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 0);
+
+		stdarg_n = 0;
+		b_new = XmCreatePushButton(bform, XmStrCast("New"), stdarg_args, stdarg_n);
+		XtManageChild(b_new);
+		XtAddCallback(b_new, XmNactivateCallback, (XtCallbackProc) attributes_new_callback, NULL);
+
+		stdarg_n = 0;
+		b_revert = XmCreatePushButton(bform, XmStrCast("Revert"), stdarg_args, stdarg_n);
+		XtManageChild(b_revert);
+		XtAddCallback(b_revert, XmNactivateCallback, (XtCallbackProc) attributes_revert_callback, NULL);
+
+		stdarg_n = 0;
+		b_cancel = XmCreatePushButton(bform, XmStrCast("Cancel"), stdarg_args, stdarg_n);
+		XtManageChild(b_cancel);
+		XtAddCallback(b_cancel, XmNactivateCallback, (XtCallbackProc) dialog_callback_ok_value, (XtPointer) 1);
+
+		stdarg_n = 0;
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, bform);
+		sep = XmCreateSeparator(attr_dialog, XmStrCast("attributes"), stdarg_args, stdarg_n);
+		XtManageChild(sep);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+		stdarg(XmNbottomWidget, sep);
+		stdarg(XmNscrollingPolicy, XmAUTOMATIC);
+		sw = XmCreateScrolledWindow(attr_dialog, XmStrCast("attributes"), stdarg_args, stdarg_n);
+		XtManageChild(sw);
+
+		stdarg_n = 0;
+		stdarg(XmNmarginHeight, 0);
+		stdarg(XmNmarginWidth, 0);
+		f_top = XmCreateBulletinBoard(sw, XmStrCast("f_top"), stdarg_args, stdarg_n);
+		XtManageChild(f_top);
+	}
+	else {
+		stdarg_n = 0;
+		stdarg(XmNtitle, owner);
+		XtSetValues(XtParent(attr_dialog), stdarg_args, stdarg_n);
+	}
+
+	attributes_list = attrs_list;
+	lesstif_attributes_revert();
+
+	fiddle_with_bb_layout();
+
+	if (wait_for_dialog(attr_dialog) == 0) {
+		int i;
+		/* Copy the values back */
+		pcb_attribute_copyback_begin(attributes_list);
+		for (i = 0; i < attr_num_rows; i++)
+			pcb_attribute_copyback(attributes_list, XmTextFieldGetString(attr_row[i].w_name), XmTextFieldGetString(attr_row[i].w_value));
+		pcb_attribute_copyback_end(attributes_list);
+	}
+
+	return;
+}
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_ImportGUI[] = "ImportGUI()";
+
+static const char pcb_acth_ImportGUI[] = "Lets the user choose the schematics to import from";
+
+/* %start-doc actions ImportGUI
+
+Displays a dialog that lets the user select the schematic(s) to import
+from, then saves that information in the layout's attributes for
+future imports.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	static int I_am_recursing = 0;
+	static XmString xms_sch = 0, xms_import = 0;
+	int rv;
+	XmString xmname;
+	char *name, *bname;
+	char *original_dir, *target_dir, *last_slash;
+
+	if (I_am_recursing)
+		return 1;
+
+	if (xms_sch == 0)
+		xms_sch = XmStringCreatePCB("*.sch");
+	if (xms_import == 0)
+		xms_import = XmStringCreatePCB("Import from");
+
+	setup_fsb_dialog();
+
+	stdarg_n = 0;
+	stdarg(XmNtitle, "Import From");
+	XtSetValues(XtParent(fsb), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNpattern, xms_sch);
+	stdarg(XmNmustMatch, True);
+	stdarg(XmNselectionLabelString, xms_import);
+	XtSetValues(fsb, stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNdirectory, &xmname);
+	XtGetValues(fsb, stdarg_args, stdarg_n);
+	XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &original_dir);
+
+	if (!wait_for_dialog(fsb))
+		return 1;
+
+	stdarg_n = 0;
+	stdarg(XmNdirectory, &xmname);
+	XtGetValues(fsb, stdarg_args, stdarg_n);
+	XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &target_dir);
+
+	stdarg_n = 0;
+	stdarg(XmNdirSpec, &xmname);
+	XtGetValues(fsb, stdarg_args, stdarg_n);
+
+	XmStringGetLtoR(xmname, XmFONTLIST_DEFAULT_TAG, &name);
+
+	/* If the user didn't change directories, use just the base name.
+	   This is the common case and means we don't have to get clever
+	   about converting absolute paths into relative paths.  */
+	bname = name;
+	if (strcmp(original_dir, target_dir) == 0) {
+		last_slash = strrchr(name, '/');
+		if (last_slash)
+			bname = last_slash + 1;
+	}
+
+	pcb_attrib_put(PCB, "import::src0", bname);
+
+	XtFree(name);
+
+
+	I_am_recursing = 1;
+	rv = pcb_action("Import");
+	I_am_recursing = 0;
+
+	PCB_ACT_IRES(rv);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+pcb_action_t lesstif_dialog_action_list[] = {
+	{"Load", pcb_act_Load, pcb_acth_Load, pcb_acts_Load},
+	{"Save", pcb_act_Save, pcb_acth_Save, pcb_acts_Save},
+	{"DoWindows", pcb_act_DoWindows, pcb_acth_DoWindows, pcb_acts_DoWindows},
+	{"Confirm", pcb_act_ConfirmAction, pcb_acth_ConfirmAction, pcb_acts_ConfirmAction},
+	{"Print", pcb_act_Print, pcb_acth_Print, pcb_acts_Print},
+	{"AdjustSizes", pcb_act_AdjustSizes, pcb_acth_AdjustSizes, pcb_acts_AdjustSizes},
+	{"EditLayerGroups", pcb_act_EditLayerGroups, pcb_acth_EditLayerGroups, pcb_acts_EditLayerGroups},
+	{"FontSel", pcb_act_fontsel, pcb_acth_fontsel, pcb_acts_fontsel},
+	{"ImportGUI", pcb_act_ImportGUI, pcb_acth_ImportGUI, pcb_acts_ImportGUI}
+};
+
+PCB_REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie)
Index: tags/2.0.1/src_plugins/hid_lesstif/dlg_preview.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/dlg_preview.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/dlg_preview.c	(revision 18980)
@@ -0,0 +1,373 @@
+/* Directly included by main.c for now */
+
+static int widget_depth(Widget w) {
+	Arg args[1];
+	int depth;
+
+	XtSetArg(args[0], XtNdepth, &depth);
+	XtGetValues(w, args, 1);
+	return depth;
+}
+
+#define SHOW_SAVES \
+	int save_vx, save_vy, save_vw, save_vh; \
+	int save_fx, save_fy; \
+	double save_vz; \
+	Pixmap save_px, save_main_px, save_mask_px, save_mask_bm
+
+/* saving flip setting in this macro is required to properly calculate coordinates of an event (Px, Py functions) */
+#define SHOW_ENTER \
+do { \
+	pinout = 0; \
+	save_vx = view_left_x; \
+	save_vy = view_top_y; \
+	save_vz = view_zoom; \
+	save_vw = view_width; \
+	save_vh = view_height; \
+	save_fx = conf_core.editor.view.flip_x; \
+	save_fy = conf_core.editor.view.flip_y; \
+	save_px = pixmap; \
+	save_main_px = main_pixmap; \
+	save_mask_px = mask_pixmap; \
+	save_mask_bm = mask_bitmap; \
+	main_pixmap = XCreatePixmap(XtDisplay(da), XtWindow(da), pd->v_width, pd->v_height, widget_depth(da)); \
+	mask_pixmap = XCreatePixmap(XtDisplay(da), XtWindow(da), pd->v_width, pd->v_height, widget_depth(da)); \
+	mask_bitmap = XCreatePixmap(XtDisplay(da), XtWindow(da), pd->v_width, pd->v_height, 1); \
+	pixmap = main_pixmap; \
+	view_left_x = pd->x; \
+	view_top_y = pd->y; \
+	view_zoom = pd->zoom; \
+	view_width = pd->v_width; \
+	view_height = pd->v_height; \
+	conf_force_set_bool(conf_core.editor.view.flip_x, 0); \
+	conf_force_set_bool(conf_core.editor.view.flip_y, 0); \
+} while(0)
+
+#define SHOW_LEAVE \
+do { \
+	view_left_x = save_vx; \
+	view_top_y = save_vy; \
+	view_zoom = save_vz; \
+	view_width = save_vw; \
+	view_height = save_vh; \
+	XFreePixmap(lesstif_display, main_pixmap); \
+	XFreePixmap(lesstif_display, mask_pixmap); \
+	XFreePixmap(lesstif_display, mask_bitmap); \
+	main_pixmap = save_main_px; \
+	mask_pixmap = save_mask_px; \
+	mask_bitmap = save_mask_bm; \
+	pixmap = save_px; \
+	conf_force_set_bool(conf_core.editor.view.flip_x, save_fx); \
+	conf_force_set_bool(conf_core.editor.view.flip_y, save_fy); \
+} while(0)
+
+#define SHOW_DRAW \
+do { \
+	XGCValues gcv; \
+	GC gc; \
+	memset(&gcv, 0, sizeof(gcv)); \
+	gcv.graphics_exposures = 0; \
+	gc = XtGetGC(da, GCGraphicsExposures, &gcv); \
+	XSetForeground(display, bg_gc, bgcolor); \
+	XFillRectangle(display, pixmap, bg_gc, 0, 0, pd->v_width, pd->v_height); \
+	pcb_hid_expose_layer(&lesstif_hid, &pd->ctx); \
+	XCopyArea(lesstif_display, pixmap, XtWindow(da), gc, 0, 0, pd->v_width, pd->v_height, 0, 0); \
+	XtReleaseGC(da, gc); \
+} while(0)
+
+static void show_layer_callback(Widget da, PreviewData * pd, XmDrawingAreaCallbackStruct * cbs)
+{
+	SHOW_SAVES;
+	int reason = cbs ? cbs->reason : 0;
+
+	if (pd->window == 0 && reason == XmCR_RESIZE)
+		return;
+	if (pd->window == 0 || reason == XmCR_RESIZE) {
+		Dimension w, h;
+		double z;
+
+		stdarg_n = 0;
+		stdarg(XmNwidth, &w);
+		stdarg(XmNheight, &h);
+		XtGetValues(da, stdarg_args, stdarg_n);
+
+		pd->window = XtWindow(da);
+		pd->v_width = w;
+		pd->v_height = h;
+		pd->zoom = (pd->right - pd->left + 1) / (double) w;
+		z = (pd->bottom - pd->top + 1) / (double) h;
+		if (pd->zoom < z)
+			pd->zoom = z;
+
+		pd->x = (pd->left + pd->right) / 2 - pd->v_width * pd->zoom / 2;
+		pd->y = (pd->top + pd->bottom) / 2 - pd->v_height * pd->zoom / 2;
+	}
+
+	SHOW_ENTER;
+	SHOW_DRAW;
+
+	SHOW_LEAVE;
+
+}
+
+static void show_layer_inp_callback(Widget da, PreviewData * pd, XmDrawingAreaCallbackStruct * cbs)
+{
+	SHOW_SAVES;
+	pcb_coord_t cx, cy;
+	pcb_hid_cfg_mod_t btn;
+	pcb_hid_mouse_ev_t kind;
+
+	SHOW_ENTER;
+
+	btn = lesstif_mb2cfg(cbs->event->xbutton.button);
+
+	cx = Px(cbs->event->xbutton.x);
+	cy = Py(cbs->event->xbutton.y);
+
+/*	pcb_printf("ev %d;%d %$mm;%$mm %x\n", cbs->event->xbutton.x, cbs->event->xbutton.y, cx, cy, btn);*/
+
+	kind = -1;
+	if (cbs->event->type == ButtonPress) kind = PCB_HID_MOUSE_PRESS;
+	if (cbs->event->type == ButtonRelease) kind = PCB_HID_MOUSE_RELEASE;
+
+	switch(btn) {
+		case PCB_MB_LEFT:
+			if (pd->mouse_ev != NULL)
+				if (pd->mouse_ev(da, kind, cx, cy))
+					SHOW_DRAW;
+			break;
+		case PCB_MB_RIGHT:
+			if (pd->mouse_ev != NULL)
+				if (pd->mouse_ev(da, PCB_HID_MOUSE_POPUP, cx, cy))
+					SHOW_DRAW;
+			break;
+		case PCB_MB_MIDDLE:
+			if (kind == PCB_HID_MOUSE_PRESS) {
+				pd->pan = 1;
+				pd->pan_ox = cbs->event->xbutton.x;
+				pd->pan_oy = cbs->event->xbutton.y;
+				pd->pan_opx = view_left_x;
+				pd->pan_opy = view_top_y;
+			}
+			else if (kind == PCB_HID_MOUSE_RELEASE)
+				pd->pan = 0;
+			break;
+		case PCB_MB_SCROLL_DOWN:
+			pd->zoom *= 1.25;
+			view_zoom = pd->zoom;
+			SHOW_DRAW;
+			break;
+		case PCB_MB_SCROLL_UP:
+			pd->zoom *= 0.8;
+			view_zoom = pd->zoom;
+			SHOW_DRAW;
+			break;
+		default:;
+	}
+
+	SHOW_LEAVE;
+}
+
+static void show_layer_mot_callback(Widget w, XtPointer pd_, XEvent * e, Boolean * ctd)
+{
+	Widget da = w;
+	PreviewData *pd = pd_;
+	SHOW_SAVES;
+	Window root, child;
+	unsigned int keys_buttons;
+	int root_x, root_y, pos_x, pos_y;
+	pcb_coord_t cx, cy;
+
+	while (XCheckMaskEvent(display, PointerMotionMask, e));
+	XQueryPointer(display, e->xmotion.window, &root, &child, &root_x, &root_y, &pos_x, &pos_y, &keys_buttons);
+
+	SHOW_ENTER;
+
+	cx = Px(pos_x);
+	cy = Py(pos_y);
+
+/*	pcb_printf("mo %d;%d %$mm;%$mm\n", pos_x, pos_y, cx, cy);*/
+	if (pd->pan) {
+/*		pcb_coord_t ol = pd->x, ot = pd->y;*/
+		pd->x = pd->pan_opx - (pos_x - pd->pan_ox) * view_zoom;
+		pd->y = pd->pan_opy - (pos_y - pd->pan_oy) * view_zoom;
+/*		pd->view_right += ol - pd->view_left_x;
+		pd->view_bottom += ot - pd->view_top_y;*/
+		SHOW_DRAW;
+	}
+	else if (pd->mouse_ev != NULL) {
+		pd->mouse_ev(w, PCB_HID_MOUSE_MOTION, cx, cy);
+		SHOW_DRAW;
+	}
+
+	SHOW_LEAVE;
+}
+
+
+static void show_layer_unmap(Widget w, PreviewData * pd, void *v)
+{
+	if (pd->pre_close != NULL)
+		pd->pre_close(pd);
+	XtDestroyWidget(XtParent(pd->form));
+	free(pd);
+}
+
+
+static PreviewData *lesstif_show_layer(pcb_layer_id_t layer, const char *title, int modal)
+{
+	double scale;
+	Widget da;
+	PreviewData *pd;
+
+	if (!mainwind)
+		return NULL;
+
+	pd = (PreviewData *) calloc(1, sizeof(PreviewData));
+
+	pd->ctx.content.layer_id = layer;
+
+	pd->ctx.view.X1 = pd->left = 0;
+	pd->ctx.view.X2 = pd->right = PCB_MM_TO_COORD(130);
+	pd->ctx.view.Y1 = pd->top = 0;
+	pd->ctx.view.Y2 = pd->bottom = PCB_MM_TO_COORD(130);
+	pd->ctx.force = 1;
+
+	pd->prev = 0;
+	pd->zoom = 0;
+
+	stdarg_n = 0;
+	pd->form = XmCreateFormDialog(mainwind, XmStrCast(title), stdarg_args, stdarg_n);
+	pd->window = 0;
+	XtAddCallback(pd->form, XmNunmapCallback, (XtCallbackProc) show_layer_unmap, (XtPointer) pd);
+
+	if (modal)
+		XtVaSetValues(pd->form, XmNdialogStyle, XmDIALOG_PRIMARY_APPLICATION_MODAL, NULL);
+
+	scale = sqrt(200.0 * 200.0 / ((pd->right - pd->left + 1.0) * (pd->bottom - pd->top + 1.0)));
+
+	stdarg_n = 0;
+	stdarg(XmNwidth, (int) (scale * (pd->right - pd->left + 1)));
+	stdarg(XmNheight, (int) (scale * (pd->bottom - pd->top + 1)));
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	da = XmCreateDrawingArea(pd->form, XmStrCast(title), stdarg_args, stdarg_n);
+	XtManageChild(da);
+
+	XtAddCallback(da, XmNexposeCallback, (XtCallbackProc) show_layer_callback, (XtPointer) pd);
+	XtAddCallback(da, XmNresizeCallback, (XtCallbackProc) show_layer_callback, (XtPointer) pd);
+	XtAddCallback(da, XmNinputCallback, (XtCallbackProc) show_layer_inp_callback, (XtPointer) pd);
+
+	XtAddEventHandler(da,
+		PointerMotionMask | PointerMotionHintMask | EnterWindowMask | LeaveWindowMask,
+		0, show_layer_mot_callback, pd);
+
+	XtManageChild(pd->form);
+
+	return pd;
+}
+
+/***************** instance for layer group edit **********************/
+
+#include "stub_draw.h"
+
+static PreviewData *layergrp_edit = NULL;
+
+static void layergrp_pre_close(struct PreviewData *pd)
+{
+	if (pd == layergrp_edit)
+		layergrp_edit = NULL;
+}
+
+void lesstif_show_layergrp_edit(void)
+{
+	pcb_layer_id_t lid;
+	if (layergrp_edit != NULL)
+		return;
+	if (pcb_layer_list(PCB, PCB_LYT_CSECT, &lid, 1) > 0) {
+		layergrp_edit = lesstif_show_layer(lid, "Layer groups", 0);
+		layergrp_edit->mouse_ev = pcb_stub_draw_csect_mouse_ev;
+		layergrp_edit->pre_close = layergrp_pre_close;
+	}
+}
+
+/***************** instance for font selection **********************/
+
+#include "stub_draw.h"
+
+static PreviewData *fontsel_glob = NULL;
+
+static void fontsel_pre_close_glob(struct PreviewData *pd)
+{
+	if (pd == fontsel_glob)
+		fontsel_glob = NULL;
+}
+
+static void lesstif_show_fontsel_global()
+{
+	pcb_layer_id_t lid;
+	if (fontsel_glob != NULL)
+		return;
+	if (pcb_layer_list(PCB, PCB_LYT_DIALOG, &lid, 1) > 0) {
+		fontsel_glob = lesstif_show_layer(lid, "Pen font selection", 0);
+		fontsel_glob->ctx.dialog_draw = pcb_stub_draw_fontsel;
+		fontsel_glob->mouse_ev = pcb_stub_draw_fontsel_mouse_ev;
+		fontsel_glob->overlay_draw = NULL;
+		fontsel_glob->pre_close = fontsel_pre_close_glob;
+	}
+}
+
+
+static PreviewData *fontsel_loc = NULL;
+
+
+static void fontsel_pre_close_loc(struct PreviewData *pd)
+{
+	if (pd == fontsel_loc)
+		fontsel_loc = NULL;
+}
+
+static void lesstif_show_fontsel_local(pcb_layer_t *txtly, pcb_text_t *txt, int type)
+{
+	pcb_layer_id_t lid;
+	pcb_text_t *old_txt;
+	pcb_layer_t *old_layer;
+	int old_type;
+
+	if (pcb_layer_list(PCB, PCB_LYT_DIALOG, &lid, 1) <= 0)
+		return;
+
+	old_txt = *pcb_stub_draw_fontsel_text_obj;
+	old_layer = *pcb_stub_draw_fontsel_layer_obj;
+	old_type = *pcb_stub_draw_fontsel_text_type;
+
+	*pcb_stub_draw_fontsel_text_obj = txt;
+	*pcb_stub_draw_fontsel_layer_obj = txtly;
+	*pcb_stub_draw_fontsel_text_type = type;
+
+	fontsel_loc = lesstif_show_layer(lid, "Change font of text object", 1);
+	fontsel_loc->mouse_ev = pcb_stub_draw_fontsel_mouse_ev;
+	fontsel_loc->overlay_draw = NULL;
+	fontsel_loc->pre_close = fontsel_pre_close_loc;
+
+
+	while (fontsel_loc != NULL) {
+		XEvent e;
+		XtAppNextEvent(app_context, &e);
+		XtDispatchEvent(&e);
+	}
+
+	*pcb_stub_draw_fontsel_text_obj = old_txt;
+	*pcb_stub_draw_fontsel_layer_obj = old_layer;
+	*pcb_stub_draw_fontsel_text_type = old_type;
+}
+
+void lesstif_show_fontsel_edit(pcb_layer_t *txtly, pcb_text_t *txt, int type)
+{
+	if (txt == NULL)
+		lesstif_show_fontsel_global();
+	else
+		lesstif_show_fontsel_local(txtly, txt, type);
+}
+
Index: tags/2.0.1/src_plugins/hid_lesstif/hid_lesstif.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/hid_lesstif.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/hid_lesstif.pup	(revision 18980)
@@ -0,0 +1,11 @@
+$class hid
+$short the lesstif gui
+$long GUI: the lesstif HID.
+$state works
+$package hid-lesstif
+default buildin
+dep draw_csect
+dep draw_fontsel
+dep lib_hid_common
+dep dialogs
+autoload 1
Index: tags/2.0.1/src_plugins/hid_lesstif/lesstif.h
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/lesstif.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/lesstif.h	(revision 18980)
@@ -0,0 +1,86 @@
+#include "hid_cfg_input.h"
+#include "compat_nls.h"
+#include "board.h"
+
+#define app_context lesstif_app_context
+#define appwidget lesstif_appwidget
+#define display lesstif_display
+#define screen_s lesstif_screen_s
+#define screen lesstif_screen
+#define mainwind lesstif_mainwind
+#define work_area lesstif_work_area
+#define messages lesstif_messages
+#define command lesstif_command
+#define hscroll lesstif_hscroll
+#define vscroll lesstif_vscroll
+#define m_click lesstif_message_click
+
+extern XtAppContext app_context;
+extern Widget appwidget;
+extern Display *display;
+extern Screen *screen_s;
+extern int screen;
+
+extern pcb_hid_cfg_mouse_t lesstif_mouse;
+extern pcb_hid_cfg_keys_t lesstif_keymap;
+
+extern Widget mainwind, work_area, command, hscroll, vscroll;
+extern Widget m_click;
+
+extern Widget lesstif_menu(Widget, const char *, Arg *, int);
+extern int lesstif_key_event(XKeyEvent *);
+extern int lesstif_button_event(Widget w, XEvent * e);
+
+/* Returns TRUE if the point mapped to the PCB region, FALSE (=0) if
+   we're off-board.  Note that *pcbxy is always written to, even if
+   out of range.  */
+extern int lesstif_winxy_to_pcbxy(int winx, int winy, int *pcbx, int *pcby);
+
+/* Returns TRUE if the point is in the window, FALSE (=0) otherwise. */
+extern int lesstif_pcbxy_to_winxy(int pcbx, int pcby, int *winx, int *winy);
+
+extern void lesstif_need_idle_proc(void);
+extern void lesstif_show_crosshair(int);
+extern void lesstif_invalidate_all(void);
+extern void lesstif_coords_to_pcb(int, int, pcb_coord_t *, pcb_coord_t *);
+extern void lesstif_get_xy(const char *msg);
+extern void lesstif_update_widget_flags(const char *cookie);
+extern int lesstif_call_action(const char *, int, char **);
+extern void lesstif_sizes_reset(void);
+extern void lesstif_pan_fixup(void);
+extern void lesstif_show_library(void);
+extern void lesstif_show_netlist(void);
+extern Pixel lesstif_parse_color(const char *value);
+extern void lesstif_styles_update_values();
+extern void lesstif_update_layer_groups();
+extern void lesstif_update_status_line();
+extern char *lesstif_prompt_for(const char *, const char *);
+extern char *lesstif_fileselect(const char *, const char *, const char *, const char *, const char *, int);
+extern void lesstif_log(const char *fmt, ...);
+extern void lesstif_attributes_dialog(const char *, pcb_attribute_list_t *);
+
+
+#ifndef XtRPCBCoord
+#define XtRPCBCoord	"PCBCoord"
+#endif
+
+#define need_idle_proc lesstif_need_idle_proc
+#define show_crosshair lesstif_show_crosshair
+
+/*
+ * Motif comes from a time when even constant strings where
+ * passed as char*. These days, this requires to do ugly
+ * type-casting. To better identify all the places where this
+ * is necessary, we make this cast even more ugly but unique
+ * enough that it is simple to grep.
+ */
+#define XmStrCast(s) ((char*)(s))
+
+static XmString XmStringCreatePCB(const char *x)
+{
+	if (x && x[0])
+		x = gettext(x);
+	return XmStringCreateLtoR(XmStrCast(x), XmFONTLIST_DEFAULT_TAG);
+}
+
+extern const char *lesstif_cookie;
Index: tags/2.0.1/src_plugins/hid_lesstif/library.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/library.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/library.c	(revision 18980)
@@ -0,0 +1,191 @@
+#include "xincludes.h"
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "compat_misc.h"
+#include "data.h"
+#include "actions.h"
+#include "buffer.h"
+#include <genvector/vtp0.h>
+#include "plug_footprint.h"
+
+#include "hid.h"
+#include "lesstif.h"
+#include "stdarg.h"
+#include "event.h"
+#include "tool.h"
+
+static Widget library_dialog = 0;
+static Widget library_list, libnode_list;
+
+static XmString *library_strings = 0;
+static XmString *libnode_strings = 0;
+static int last_pick = -1;
+
+vtp0_t picks;      /* of pcb_fplibrary_t * */
+vtp0_t pick_names; /* of char * */
+
+static void pick_net(int pick)
+{
+	pcb_fplibrary_t *menu = (pcb_fplibrary_t *)picks.array[pick];
+	int i, found;
+
+	if (pick == last_pick)
+		return;
+	last_pick = pick;
+
+	if (libnode_strings)
+		free(libnode_strings);
+
+	libnode_strings = (XmString *) malloc(menu->data.dir.children.used * sizeof(XmString));
+	for (found = 0, i = 0; i < menu->data.dir.children.used; i++) {
+		if (menu->data.dir.children.array[i].type == LIB_FOOTPRINT) {
+			libnode_strings[i] = XmStringCreatePCB(menu->data.dir.children.array[i].name);
+			found++;
+		}
+	}
+
+	stdarg_n = 0;
+	stdarg(XmNitems, libnode_strings);
+	stdarg(XmNitemCount, found);
+	XtSetValues(libnode_list, stdarg_args, stdarg_n);
+}
+
+static void library_browse(Widget w, void *v, XmListCallbackStruct * cbs)
+{
+	pick_net(cbs->item_position - 1);
+}
+
+static void libnode_select(Widget w, void *v, XmListCallbackStruct * cbs)
+{
+	pcb_fplibrary_t *e = picks.array[last_pick];
+	e = &e->data.dir.children.array[cbs->item_position - 1];
+	if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, e->data.fp.loc_info, NULL))
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+}
+
+static int build_library_dialog()
+{
+	if (!mainwind)
+		return 1;
+	if (library_dialog)
+		return 0;
+
+	stdarg_n = 0;
+	stdarg(XmNresizePolicy, XmRESIZE_GROW);
+	stdarg(XmNtitle, "Element Library");
+	library_dialog = XmCreateFormDialog(mainwind, XmStrCast("library"), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNvisibleItemCount, 10);
+	library_list = XmCreateScrolledList(library_dialog, XmStrCast("nets"), stdarg_args, stdarg_n);
+	XtManageChild(library_list);
+	XtAddCallback(library_list, XmNbrowseSelectionCallback, (XtCallbackProc) library_browse, 0);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+	stdarg(XmNleftWidget, library_list);
+	libnode_list = XmCreateScrolledList(library_dialog, XmStrCast("nodes"), stdarg_args, stdarg_n);
+	XtManageChild(libnode_list);
+	XtAddCallback(libnode_list, XmNbrowseSelectionCallback, (XtCallbackProc) libnode_select, 0);
+
+	return 0;
+}
+
+static void lib_dfs(pcb_fplibrary_t *parent, int level)
+{
+	pcb_fplibrary_t *l;
+	char *s;
+	int n, len;
+
+	if (parent->type != LIB_DIR)
+		return;
+
+	if (parent->name != NULL) {
+		vtp0_append(&picks, parent);
+		len = strlen(parent->name);
+		s = malloc(len+level+1);
+		for(n = 0; n < level-1; n++) s[n] = ' ';
+		strcpy(s+level-1, parent->name);
+		vtp0_append(&pick_names, s);
+	}
+
+	for(l = parent->data.dir.children.array, n = 0; n < parent->data.dir.children.used; n++,l++)
+		lib_dfs(l, level+1);
+}
+
+void LesstifLibraryChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	int i;
+	if (pcb_library.data.dir.children.used == 0)
+		return;
+	if (build_library_dialog())
+		return;
+	last_pick = -1;
+
+	for (i = 0; i < pick_names.used; i++)
+		free(pick_names.array[i]);
+
+	vtp0_truncate(&picks, 0);
+	vtp0_truncate(&pick_names, 0);
+
+	lib_dfs(&pcb_library, 0);
+
+
+	if (library_strings)
+		free(library_strings);
+	library_strings = (XmString *) malloc(picks.used * sizeof(XmString));
+	for (i = 0; i < picks.used; i++)
+		library_strings[i] = XmStringCreatePCB(pick_names.array[i]);
+
+	stdarg_n = 0;
+	stdarg(XmNitems, library_strings);
+	stdarg(XmNitemCount, picks.used);
+	XtSetValues(library_list, stdarg_args, stdarg_n);
+
+	pick_net(0);
+	return;
+}
+
+static const char pcb_acts_LibraryShow[] = "LibraryShow()";
+
+static const char pcb_acth_LibraryShow[] = "[DEPRECATED] Displays the library window.";
+
+/* %start-doc actions LibraryShow
+
+Deprecated.
+
+%end-doc */
+
+static fgw_error_t pcb_act_LibraryShow(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(build_library_dialog());
+	return 0;
+}
+
+void lesstif_show_library()
+{
+	if (mainwind) {
+		if (!library_dialog)
+			LesstifLibraryChanged(0, 0, 0);
+		XtManageChild(library_dialog);
+	}
+}
+
+pcb_action_t lesstif_library_action_list[] = {
+	{"LibraryShow", pcb_act_LibraryShow, pcb_acth_LibraryShow, pcb_acts_LibraryShow}
+};
+
+PCB_REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie)
Index: tags/2.0.1/src_plugins/hid_lesstif/main.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/main.c	(revision 18980)
@@ -0,0 +1,4048 @@
+/* 15 Oct 2008 Ineiev: add different crosshair shapes */
+
+#include "xincludes.h"
+
+#include "config.h"
+#include "math_helper.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <time.h>
+#include <unistd.h>
+#include <string.h>
+#include <math.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <setjmp.h>
+
+#include "data.h"
+#include "crosshair.h"
+#include "conf_hid.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "event.h"
+#include "error.h"
+#include "plugins.h"
+#include "macro.h"
+#include "safe_fs.h"
+
+#include "hid.h"
+#include "hid_nogui.h"
+#include "hid_draw_helpers.h"
+#include "hid_cfg.h"
+#include "lesstif.h"
+#include "hid_cfg_input.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "hid_color.h"
+#include "hid_extents.h"
+#include "hid_flags.h"
+#include "actions.h"
+#include "stdarg.h"
+#include "grid.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "layer_vis.h"
+#include "tool.h"
+
+#include "../src_plugins/lib_hid_common/clip.h"
+#include "../src_plugins/lib_hid_common/util.h"
+
+#include <sys/poll.h>
+
+const char *lesstif_cookie = "lesstif HID";
+
+pcb_hid_cfg_mouse_t lesstif_mouse;
+pcb_hid_cfg_keys_t lesstif_keymap;
+int lesstif_active = 0;
+
+static int idle_proc_set = 0;
+static int need_redraw = 0;
+
+#ifndef XtRDouble
+#define XtRDouble "Double"
+#endif
+
+/* How big the viewport can be relative to the pcb size.  */
+#define MAX_ZOOM_SCALE	10
+#define UUNIT	conf_core.editor.grid_unit->allow
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	pcb_hid_t *me_pointer;
+	Pixel color;
+	char *colorname;
+	int width;
+	pcb_cap_style_t cap;
+	char xor_set;
+	char erase;
+} hid_gc_s;
+
+pcb_hid_t lesstif_hid;
+
+#define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented GUI function %s\n", func), abort()
+
+XtAppContext app_context;
+Widget appwidget;
+Display *display;
+static Window window = 0;
+static Cursor my_cursor = 0;
+static int old_cursor_mode = -1;
+static int over_point = 0;
+
+static Pixmap pixmap = 0;          /* Current pixmap we are drawing to (either main_pixmap in direct mode or mask_pixmap when drawing the sketch) */
+static Pixmap main_pixmap = 0;     /* 'Base pixmap', the final output all sketches are composed onto (then drawn) */
+static Pixmap mask_pixmap = 0;     /* 'Sketch pixmap' for compositing: color array */
+static Pixmap mask_bitmap = 0;     /* 'Sketch transparency bitmap' for compositing: tells which pixels shall be copied and which one are transparent/erased */
+
+static int use_xrender = 0;
+#ifdef HAVE_XRENDER
+static Picture main_picture;
+static Picture mask_picture;
+static Pixmap pale_pixmap;
+static Picture pale_picture;
+#endif /* HAVE_XRENDER */
+
+static int pixmap_w = 0, pixmap_h = 0;
+Screen *screen_s;
+int screen;
+Colormap lesstif_colormap;
+static GC my_gc = 0, bg_gc, clip_gc = 0, bset_gc = 0, bclear_gc = 0, mask_gc = 0;
+static Pixel bgcolor, offlimit_color, grid_color;
+static int bgred, bggreen, bgblue;
+
+static GC arc1_gc, arc2_gc;
+
+/* These are for the pinout windows. */
+typedef struct PreviewData {
+	struct PreviewData *prev, *next;
+	Widget form;
+	Window window;
+	pcb_coord_t left, right, top, bottom;	/* PCB extents of item */
+	pcb_coord_t x, y;										/* PCB coordinates of upper right corner of window */
+	double zoom;									/* PCB units per screen pixel */
+	int v_width, v_height;				/* pixels */
+
+	pcb_hid_expose_ctx_t ctx;
+	pcb_bool (*mouse_ev)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y);
+	void (*pre_close)(struct PreviewData *pd);
+	pcb_hid_expose_t overlay_draw;
+	unsigned pan:1;
+	int pan_ox, pan_oy;
+	pcb_coord_t pan_opx, pan_opy;
+} PreviewData;
+
+/* Linked list of all pinout windows.  */
+static PreviewData *pinouts = 0;
+/* If set, we are currently updating this pinout window.  */
+static PreviewData *pinout = 0;
+
+static pcb_coord_t crosshair_x = 0, crosshair_y = 0;
+static int in_move_event = 0, crosshair_in_window = 1;
+
+Widget mainwind;
+Widget work_area, messages, command, hscroll, vscroll;
+static Widget m_mark, m_crosshair, m_grid, m_zoom, m_mode, m_status;
+static Widget m_rats;
+Widget lesstif_m_layer;
+Widget m_click;
+
+/* This is the size, in pixels, of the viewport.  */
+static int view_width, view_height;
+/* This is the PCB location represented by the upper left corner of
+   the viewport.  Note that PCB coordinates put 0,0 in the upper left,
+   much like X does.  */
+static pcb_coord_t view_left_x = 0, view_top_y = 0;
+/* Denotes PCB units per screen pixel.  Larger numbers mean zooming
+   out - the largest value means you are looking at the whole
+   board.  */
+static double view_zoom = PCB_MIL_TO_COORD(10), prev_view_zoom = PCB_MIL_TO_COORD(10);
+static pcb_bool autofade = 0;
+static pcb_bool crosshair_on = pcb_true;
+
+static void lesstif_reg_attrs(void);
+static void lesstif_begin(void);
+static void lesstif_end(void);
+
+static void ShowCrosshair(pcb_bool show)
+{
+	if (crosshair_on == show)
+		return;
+
+	pcb_notify_crosshair_change(pcb_false);
+	if (pcb_marked.status)
+		pcb_notify_mark_change(pcb_false);
+
+	crosshair_on = show;
+
+	pcb_notify_crosshair_change(pcb_true);
+	if (pcb_marked.status)
+		pcb_notify_mark_change(pcb_true);
+}
+
+/* This is the size of the current PCB work area.  */
+/* Use PCB->MaxWidth, PCB->MaxHeight.  */
+/* static int pcb_width, pcb_height; */
+static int use_private_colormap = 0;
+static int stdin_listen = 0;
+static char *background_image_file = 0;
+
+pcb_hid_attribute_t lesstif_attribute_list[] = {
+	{"install", "Install private colormap",
+		PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &use_private_colormap},
+#define HA_colormap 0
+
+/* %start-doc options "22 lesstif GUI Options"
+@ftable @code
+@item --listen
+Listen for actions on stdin.
+@end ftable
+%end-doc
+*/
+	{"listen", "Listen on standard input for actions",
+		PCB_HATT_BOOL, 0, 0, {0, 0, 0}, 0, &stdin_listen},
+#define HA_listen 1
+
+/* %start-doc options "22 lesstif GUI Options"
+@ftable @code
+@item --bg-image <string>
+File name of an image to put into the background of the GUI canvas. The image must
+be a color PPM image, in binary (not ASCII) format. It can be any size, and will be
+automatically scaled to fit the canvas.
+@end ftable
+%end-doc
+*/
+	{"bg-image", "Background Image",
+		PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, &background_image_file},
+#define HA_bg_image 2
+
+/* %start-doc options "22 lesstif GUI Options"
+@ftable @code
+@item --pcb-menu <string>
+Location of the @file{pcb-menu.res} file which defines the menu for the lesstif GUI.
+@end ftable
+%end-doc
+*/
+#warning TODO#1: this should be generic and not depend on the HID
+/*
+	{"pcb-menu", "Location of pcb-menu.res file",
+		PCB_HATT_STRING, 0, 0, {0, PCBSHAREDIR "/pcb-menu.res", 0}, 0, &lesstif_pcbmenu_path}
+#define HA_pcbmenu 3
+*/
+};
+
+PCB_REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie)
+
+static int lesstif_direct = 0;
+static pcb_composite_op_t lesstif_drawing_mode = 0;
+#define use_mask() ((!lesstif_direct) && ((lesstif_drawing_mode == PCB_HID_COMP_POSITIVE) || (lesstif_drawing_mode == PCB_HID_COMP_POSITIVE_XOR) || (lesstif_drawing_mode == PCB_HID_COMP_NEGATIVE)))
+
+static void zoom_max();
+static void zoom_to(double factor, pcb_coord_t x, pcb_coord_t y);
+static void zoom_win(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int setch);
+static void zoom_by(double factor, pcb_coord_t x, pcb_coord_t y);
+static void zoom_toggle(pcb_coord_t x, pcb_coord_t y);
+static void pinout_callback(Widget, PreviewData *, XmDrawingAreaCallbackStruct *);
+static void pinout_unmap(Widget, PreviewData *, void *);
+static void Pan(int mode, pcb_coord_t x, pcb_coord_t y);
+
+/* Px converts view->pcb, Vx converts pcb->view */
+
+static inline int Vx(pcb_coord_t x)
+{
+	int rv = (x - view_left_x) / view_zoom + 0.5;
+	if (conf_core.editor.view.flip_x)
+		rv = view_width - rv;
+	return rv;
+}
+
+static inline int Vy(pcb_coord_t y)
+{
+	int rv = (y - view_top_y) / view_zoom + 0.5;
+	if (conf_core.editor.view.flip_y)
+		rv = view_height - rv;
+	return rv;
+}
+
+static inline int Vz(pcb_coord_t z)
+{
+	return z / view_zoom + 0.5;
+}
+
+static inline int Vw(pcb_coord_t w)
+{
+	return w < 0 ? -w : w / view_zoom + 0.5;
+}
+
+static inline pcb_coord_t Px(int x)
+{
+	if (conf_core.editor.view.flip_x)
+		x = view_width - x;
+	return x * view_zoom + view_left_x;
+}
+
+static inline pcb_coord_t Py(int y)
+{
+	if (conf_core.editor.view.flip_y)
+		y = view_height - y;
+	return y * view_zoom + view_top_y;
+}
+
+static inline pcb_coord_t Pz(int z)
+{
+	return z * view_zoom;
+}
+
+void lesstif_coords_to_pcb(int vx, int vy, pcb_coord_t * px, pcb_coord_t * py)
+{
+	*px = Px(vx);
+	*py = Py(vy);
+}
+
+Pixel lesstif_parse_color(const char *value)
+{
+	XColor color;
+	if (XParseColor(display, lesstif_colormap, value, &color))
+		if (XAllocColor(display, lesstif_colormap, &color))
+			return color.pixel;
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static const char *cur_clip()
+{
+	if (conf_core.editor.orthogonal_moves)
+		return "+";
+	if (conf_core.editor.all_direction_lines)
+		return "*";
+	if (conf_core.editor.line_refraction == 0)
+		return "X";
+	if (conf_core.editor.line_refraction == 1)
+		return "_/";
+	return "\\_";
+}
+
+/* Called from the core when it's busy doing something and we need to
+   indicate that to the user.  */
+static void LesstifBusy(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	static Cursor busy_cursor = 0;
+	if (!lesstif_active)
+		return;
+	if (busy_cursor == 0)
+		busy_cursor = XCreateFontCursor(display, XC_watch);
+	XDefineCursor(display, window, busy_cursor);
+	XFlush(display);
+	old_cursor_mode = -1;
+	return;
+}
+
+/* ---------------------------------------------------------------------- */
+
+/* Local actions.  */
+
+static void PointCursor(pcb_bool grabbed)
+{
+	if (grabbed > 0)
+		over_point = 1;
+	else
+		over_point = 0;
+	old_cursor_mode = -1;
+}
+
+extern void LesstifNetlistChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+extern void LesstifRouteStylesChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+extern void LesstifLibraryChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+
+
+static void ev_pcb_changed(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (work_area == 0)
+		return;
+	/*pcb_printf("PCB Changed! %$mD\n", PCB->MaxWidth, PCB->MaxHeight); */
+	stdarg_n = 0;
+	stdarg(XmNminimum, 0);
+	stdarg(XmNvalue, 0);
+	stdarg(XmNsliderSize, PCB->MaxWidth ? PCB->MaxWidth : 1);
+	stdarg(XmNmaximum, PCB->MaxWidth ? PCB->MaxWidth : 1);
+	XtSetValues(hscroll, stdarg_args, stdarg_n);
+	stdarg_n = 0;
+	stdarg(XmNminimum, 0);
+	stdarg(XmNvalue, 0);
+	stdarg(XmNsliderSize, PCB->MaxHeight ? PCB->MaxHeight : 1);
+	stdarg(XmNmaximum, PCB->MaxHeight ? PCB->MaxHeight : 1);
+	XtSetValues(vscroll, stdarg_args, stdarg_n);
+	zoom_max();
+
+	LesstifNetlistChanged(NULL, 0, NULL);
+	LesstifRouteStylesChanged(NULL, 0, NULL);
+	lesstif_sizes_reset();
+	lesstif_update_layer_groups();
+	while (pinouts)
+		pinout_unmap(0, pinouts, 0);
+	if (PCB->Filename) {
+		char *cp = strrchr(PCB->Filename, '/');
+		stdarg_n = 0;
+		stdarg(XmNtitle, cp ? cp + 1 : PCB->Filename);
+		XtSetValues(appwidget, stdarg_args, stdarg_n);
+	}
+	return;
+}
+
+static const char pcb_acts_Zoom[] = "Zoom()\n" "Zoom(factor)";
+
+static const char pcb_acth_Zoom[] = "Various zoom factor changes.";
+
+/* %start-doc actions Zoom
+
+Changes the zoom (magnification) of the view of the board.  If no
+arguments are passed, the view is scaled such that the board just fits
+inside the visible window (i.e. ``view all'').  Otherwise,
+@var{factor} specifies a change in zoom factor.  It may be prefixed by
+@code{+}, @code{-}, or @code{=} to change how the zoom factor is
+modified.  The @var{factor} is a floating point number, such as
+@code{1.5} or @code{0.75}.
+
+@table @code
+
+@item +@var{factor}
+Values greater than 1.0 cause the board to be drawn smaller; more of
+the board will be visible.  Values between 0.0 and 1.0 cause the board
+to be drawn bigger; less of the board will be visible.
+
+@item -@var{factor}
+Values greater than 1.0 cause the board to be drawn bigger; less of
+the board will be visible.  Values between 0.0 and 1.0 cause the board
+to be drawn smaller; more of the board will be visible.
+
+@item =@var{factor}
+
+The @var{factor} is an absolute zoom factor; the unit for this value
+is "PCB units per screen pixel".  Since PCB units are 0.01 mil, a
+@var{factor} of 1000 means 10 mils (0.01 in) per pixel, or 100 DPI,
+about the actual resolution of most screens - resulting in an "actual
+size" board.  Similarly, a @var{factor} of 100 gives you a 10x actual
+size.
+
+@end table
+
+Note that zoom factors of zero are silently ignored.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	const char *vp, *ovp;
+	double v;
+
+	pcb_hid_get_coords("Click on a place to zoom in", &x, &y, 0);
+
+	if (x == 0 && y == 0) {
+		x = view_width / 2;
+		y = view_height / 2;
+	}
+	else {
+		x = Vx(x);
+		y = Vy(y);
+	}
+	if (argc < 1) {
+		zoom_max();
+		return 0;
+	}
+	PCB_ACT_CONVARG(1, FGW_STR, Zoom, ovp = vp = argv[1].val.str);
+	if (pcb_strcasecmp(vp, "toggle") == 0) {
+		zoom_toggle(x, y);
+		return 0;
+	}
+	if (*vp == '+' || *vp == '-' || *vp == '=')
+		vp++;
+	pcb_setlocale(LC_ALL, "C");
+	v = strtod(vp, NULL);
+	pcb_setlocale(LC_ALL, "");
+	if (v <= 0)
+		return 1;
+	switch (ovp[0]) {
+	case '-':
+		zoom_by(1 / v, x, y);
+		break;
+	default:
+	case '+':
+		zoom_by(v, x, y);
+		break;
+	case '=':
+		zoom_to(v, x, y);
+		break;
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_ZoomTo[] = "ZoomTo(x1, y1, x2, y2)";
+
+static const char pcb_acth_ZoomTo[] = "Zoom to a specific window on the board.";
+
+/* %start-doc actions ZoomTo
+
+Changes the zoom (magnification) of the view of the board.  If no
+arguments are passed, the view is scaled such that the board just fits
+inside the visible window (i.e. ``view all'').  Otherwise,
+@var{factor} specifies a change in zoom factor.  It may be prefixed by
+@code{+}, @code{-}, or @code{=} to change how the zoom factor is
+modified.  The @var{factor} is a floating point number, such as
+@code{1.5} or @code{0.75}.
+
+@table @code
+
+@item @var{x1}, @var{y1}, @var{x2}, @var{y2}
+Zoom and pan so that a specific box of the board is shown.
+@end table
+
+Note that zoom factors of zero are silently ignored.
+
+%end-doc */
+
+static fgw_error_t pcb_act_ZoomTo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x1, y1, x2, y2;
+
+	if ((argc > 1) && ((argv[1].type & FGW_STR) == FGW_STR)) {
+		if (pcb_strcasecmp(argv[1].val.str, "selected") == 0) {
+			pcb_box_t sb;
+			if (pcb_get_selection_bbox(&sb, PCB->Data) > 0)
+				zoom_win(sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+			else
+				pcb_message(PCB_MSG_ERROR, "Can't zoom to selection: nothing selected\n");
+			return 0;
+		}
+		if (pcb_strcasecmp(argv[1].val.str, "found") == 0) {
+			pcb_box_t sb;
+			if (pcb_get_found_bbox(&sb, PCB->Data) > 0)
+				zoom_win(sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+			else
+				pcb_message(PCB_MSG_ERROR, "Can't zoom to 'found': nothing is found\n");
+			return 0;
+		}
+	}
+
+	PCB_ACT_CONVARG(1, FGW_COORD, ZoomTo, x1 = fgw_coord(&argv[1]));
+	PCB_ACT_CONVARG(2, FGW_COORD, ZoomTo, y1 = fgw_coord(&argv[2]));
+	PCB_ACT_CONVARG(3, FGW_COORD, ZoomTo, x2 = fgw_coord(&argv[3]));
+	PCB_ACT_CONVARG(4, FGW_COORD, ZoomTo, y2 = fgw_coord(&argv[4]));
+
+	zoom_win(x1, y1, x2, y2, 1);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static int pan_thumb_mode;
+
+static const char pcb_acts_Pan[] = "Pan([thumb], mode)";
+static const char pcb_acth_Pan[] = "TODO";
+
+static fgw_error_t pcb_act_Pan(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a0, *a1;
+	pcb_coord_t x, y;
+	int mode;
+
+	pcb_hid_get_coords("Click on a place to pan", &x, &y, 0);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Pan, a0 = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Pan, a1 = argv[2].val.str);
+
+	if (argc == 3) {
+		pan_thumb_mode = (pcb_strcasecmp(a0, "thumb") == 0) ? 1 : 0;
+		mode = atoi(a1);
+	}
+	else {
+		pan_thumb_mode = 0;
+		mode = atoi(a0);
+	}
+	Pan(mode, Vx(x), Vy(y));
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_SwapSides[] = "SwapSides(|v|h|r)";
+
+static const char pcb_acth_SwapSides[] = "Swaps the side of the board you're looking at.";
+
+/* %start-doc actions SwapSides
+
+This action changes the way you view the board.
+
+@table @code
+
+@item v
+Flips the board over vertically (up/down).
+
+@item h
+Flips the board over horizontally (left/right), like flipping pages in
+a book.
+
+@item r
+Rotates the board 180 degrees without changing sides.
+
+@end table
+
+If no argument is given, the board isn't moved but the opposite side
+is shown.
+
+Normally, this action changes which pads and silk layer are drawn as
+pcb_true silk, and which are drawn as the "invisible" layer.  It also
+determines which solder mask you see.
+
+As a special case, if the layer group for the side you're looking at
+is visible and currently active, and the layer group for the opposite
+is not visible (i.e. disabled), then this action will also swap which
+layer group is visible and active, effectively swapping the ``working
+side'' of the board.
+
+%end-doc */
+static int group_showing(int g, int *c)
+{
+	int i, l;
+	*c = PCB->LayerGroups.grp[g].lid[0];
+	for (i = 0; i < PCB->LayerGroups.grp[g].len; i++) {
+		l = PCB->LayerGroups.grp[g].lid[i];
+		if (l >= 0 && l < pcb_max_layer && (!(pcb_layer_flags(PCB, l) & PCB_LYT_SILK))) {
+			*c = l;
+			if (PCB->Data->Layer[l].meta.real.vis)
+				return 1;
+		}
+	}
+	return 0;
+}
+
+#warning TODO: ui_zoomplan.c does the same, maybe make the code common?
+static fgw_error_t pcb_act_SwapSides(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op = NULL, *b = "";
+	int old_shown_side = conf_core.editor.show_solder_side;
+	pcb_layergrp_id_t comp_group = -1, solder_group = -1;
+	pcb_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
+	int comp_layer;
+	int solder_layer;
+	int comp_showing = 0, solder_showing = 0;
+	pcb_layer_id_t lid;
+	pcb_layer_type_t lyt;
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0)
+		solder_showing = group_showing(solder_group, &solder_layer);
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0)
+		comp_showing = group_showing(comp_group, &comp_layer);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, SwapSides, op = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str);
+
+	if (op != NULL) {
+		switch (op[0]) {
+		case 'h':
+		case 'H':
+			conf_toggle_editor_("view/flip_x", view.flip_x);
+			break;
+		case 'v':
+		case 'V':
+			conf_toggle_editor_("view/flip_y", view.flip_y);
+			break;
+		case 'r':
+		case 'R':
+			conf_toggle_editor_("view/flip_x", view.flip_x);
+			conf_toggle_editor_("view/flip_y", view.flip_y);
+			break;
+		default:
+			return 1;
+		}
+
+		switch (b[0]) {
+			case 'S':
+			case 's':
+				lyt = (pcb_layer_flags_(CURRENT) & PCB_LYT_ANYTHING) | (!conf_core.editor.show_solder_side ?  PCB_LYT_BOTTOM : PCB_LYT_TOP);
+				lid = pcb_layer_vis_last_lyt(lyt);
+				if (lid >= 0)
+					pcb_layervis_change_group_vis(lid, 1, 1);
+		}
+
+		/* SwapSides will swap this */
+		conf_set_editor(show_solder_side, (conf_core.editor.view.flip_x == conf_core.editor.view.flip_y));
+	}
+
+	stdarg_n = 0;
+	if (conf_core.editor.view.flip_x)
+		stdarg(XmNprocessingDirection, XmMAX_ON_LEFT);
+	else
+		stdarg(XmNprocessingDirection, XmMAX_ON_RIGHT);
+	XtSetValues(hscroll, stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	if (conf_core.editor.view.flip_y)
+		stdarg(XmNprocessingDirection, XmMAX_ON_TOP);
+	else
+		stdarg(XmNprocessingDirection, XmMAX_ON_BOTTOM);
+	XtSetValues(vscroll, stdarg_args, stdarg_n);
+
+	conf_toggle_editor(show_solder_side);
+
+	/* The idea is that if we're looking at the front side and the front
+	   layer is active (or visa versa), switching sides should switch
+	   layers too.  We used to only do this if the other layer wasn't
+	   shown, but we now do it always.  Change it back if users get
+	   confused.  */
+	if (conf_core.editor.show_solder_side != old_shown_side) {
+		if (conf_core.editor.show_solder_side) {
+			if (active_group == comp_group) {
+				if (comp_showing && !solder_showing)
+					pcb_layervis_change_group_vis(comp_layer, 0, 0);
+				pcb_layervis_change_group_vis(solder_layer, 1, 1);
+			}
+		}
+		else {
+			if (active_group == solder_group) {
+				if (solder_showing && !comp_showing)
+					pcb_layervis_change_group_vis(solder_layer, 0, 0);
+				pcb_layervis_change_group_vis(comp_layer, 1, 1);
+			}
+		}
+	}
+	lesstif_invalidate_all();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static Widget m_cmd = 0, m_cmd_label;
+static int cmd_is_active = 0;
+
+static void command_callback(Widget w, XtPointer uptr, XmTextVerifyCallbackStruct * cbs)
+{
+	char *s;
+	switch (cbs->reason) {
+	case XmCR_ACTIVATE:
+		s = XmTextGetString(w);
+		lesstif_show_crosshair(0);
+		pcb_parse_command(s, pcb_false);
+		XtFree(s);
+		XmTextSetString(w, XmStrCast(""));
+
+		XtUnmanageChild(m_cmd);
+		XtUnmanageChild(m_cmd_label);
+		cmd_is_active = 0;
+		break;
+	}
+}
+
+static void command_event_handler(Widget w, XtPointer p, XEvent * e, Boolean * cont)
+{
+	char buf[10];
+	KeySym sym;
+
+	switch (e->type) {
+		case KeyRelease:
+			if (cmd_is_active)
+				pcb_cli_edit();
+			break;
+		case KeyPress:
+			XLookupString((XKeyEvent *) e, buf, sizeof(buf), &sym, NULL);
+			switch (sym) {
+#warning TODO: lesstif command history
+				case XK_Tab:
+					pcb_cli_tab();
+					*cont = False;
+					break;
+				case XK_Escape:
+					XtUnmanageChild(m_cmd);
+					XtUnmanageChild(m_cmd_label);
+					XmTextSetString(w, XmStrCast(""));
+					cmd_is_active = 0;
+					*cont = False;
+					break;
+			}
+			break;
+		}
+}
+
+
+static const char *lesstif_command_entry(const char *ovr, int *cursor)
+{
+	if (!cmd_is_active) {
+		if (cursor != NULL)
+			*cursor = -1;
+		return NULL;
+	}
+
+	if (ovr != NULL) {
+		XmTextSetString(m_cmd, XmStrCast(ovr));
+		if (cursor != NULL)
+			XtVaSetValues(m_cmd, XmNcursorPosition, *cursor, NULL);
+	}
+
+	if (cursor != NULL) {
+		XmTextPosition pos;
+		stdarg_n = 0;
+		stdarg(XmNcursorPosition, &pos);
+		XtGetValues(m_cmd, stdarg_args, stdarg_n);
+		*cursor = pos;
+	}
+
+	return XmTextGetString(m_cmd);
+}
+
+static const char pcb_acts_Command[] = "Command()";
+
+static const char pcb_acth_Command[] = "Displays the command line input window.";
+
+/* %start-doc actions Command
+
+The command window allows the user to manually enter actions to be
+executed.
+
+There are two ways to finish with the command window.  If you press
+the @code{Enter} key, the command is invoked, the window goes away,
+and the next time you bring up the command window it's empty.  If you
+press the @code{Esc} key, the window goes away without invoking
+anything, and the next time you bring up the command window it's
+empty.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Command(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	XtManageChild(m_cmd_label);
+	XtManageChild(m_cmd);
+	XmProcessTraversal(m_cmd, XmTRAVERSE_CURRENT);
+	cmd_is_active = 1;
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_Benchmark[] = "Benchmark()";
+
+static const char pcb_acth_Benchmark[] = "Benchmark the GUI speed.";
+
+/* %start-doc actions Benchmark
+
+This action is used to speed-test the Lesstif graphics subsystem.  It
+redraws the current screen as many times as possible in ten seconds.
+It reports the amount of time needed to draw the screen once.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Benchmark(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int i = 0;
+	time_t start, end;
+	pcb_hid_expose_ctx_t ctx;
+	Drawable save_main;
+
+
+	save_main = main_pixmap;
+	main_pixmap = window;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+	pixmap = window;
+	XSync(display, 0);
+	time(&start);
+	do {
+		XFillRectangle(display, pixmap, bg_gc, 0, 0, view_width, view_height);
+		pcb_hid_expose_all(&lesstif_hid, &ctx);
+		XSync(display, 0);
+		time(&end);
+		i++;
+	}
+	while (end - start < 10);
+
+	printf("%g redraws per second\n", i / 10.0);
+
+	main_pixmap = save_main;
+	PCB_ACT_DRES(i/10.0);
+	return 0;
+}
+
+static fgw_error_t pcb_act_Center(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+
+	pcb_hid_get_coords("Click on a location to center", &x, &y, 0);
+
+	x = pcb_grid_fit(x, PCB->Grid, PCB->GridOffsetX);
+	y = pcb_grid_fit(y, PCB->Grid, PCB->GridOffsetY);
+	view_left_x = x - (view_width * view_zoom) / 2;
+	view_top_y = y - (view_height * view_zoom) / 2;
+	lesstif_pan_fixup();
+	/* Move the pointer to the center of the window, but only if it's
+	   currently within the window already.  Watch out for edges,
+	   though.  */
+	XWarpPointer(display, window, window, 0, 0, view_width, view_height, Vx(x), Vy(y));
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t lesstif_main_action_list[] = {
+	{"Zoom", pcb_act_Zoom, pcb_acth_Zoom, pcb_acts_Zoom},
+	{"ZoomTo", pcb_act_ZoomTo, pcb_acth_ZoomTo, pcb_acts_ZoomTo},
+	{"Pan", pcb_act_Pan, pcb_acth_Pan, pcb_acts_Pan},
+	{"SwapSides", pcb_act_SwapSides, pcb_acth_SwapSides, pcb_acts_SwapSides},
+	{"Command", pcb_act_Command, pcb_acth_Command, pcb_acts_Command},
+	{"Benchmark", pcb_act_Benchmark, pcb_acth_Benchmark, pcb_acts_Benchmark},
+	{"Center", pcb_act_Center}
+};
+
+PCB_REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie)
+
+
+/* ----------------------------------------------------------------------
+ * redraws the background image
+ */
+		 static int bg_w, bg_h, bgi_w, bgi_h;
+		 static Pixel **bg = 0;
+		 static XImage *bgi = 0;
+		 static enum {
+			 PT_unknown,
+			 PT_RGB565,
+			 PT_RGB888
+		 } pixel_type = PT_unknown;
+
+		 static void
+		   LoadBackgroundFile(FILE * f, char *filename)
+{
+	XVisualInfo vinfot, *vinfo;
+	Visual *vis;
+	int c, r, b;
+	int i, nret;
+	int p[3], rows, cols, maxval;
+
+	if (fgetc(f) != 'P') {
+		printf("bgimage: %s signature not P6\n", filename);
+		return;
+	}
+	if (fgetc(f) != '6') {
+		printf("bgimage: %s signature not P6\n", filename);
+		return;
+	}
+	for (i = 0; i < 3; i++) {
+		do {
+			b = fgetc(f);
+			if (feof(f))
+				return;
+			if (b == '#')
+				while (!feof(f) && b != '\n')
+					b = fgetc(f);
+		} while (!isdigit(b));
+		p[i] = b - '0';
+		while (isdigit(b = fgetc(f)))
+			p[i] = p[i] * 10 + b - '0';
+	}
+	bg_w = cols = p[0];
+	bg_h = rows = p[1];
+	maxval = p[2];
+
+	setbuf(stdout, 0);
+	bg = (Pixel **) malloc(rows * sizeof(Pixel *));
+	if (!bg) {
+		printf("Out of memory loading %s\n", filename);
+		return;
+	}
+	for (i = 0; i < rows; i++) {
+		bg[i] = (Pixel *) malloc(cols * sizeof(Pixel));
+		if (!bg[i]) {
+			printf("Out of memory loading %s\n", filename);
+			while (--i >= 0)
+				free(bg[i]);
+			free(bg);
+			bg = 0;
+			return;
+		}
+	}
+
+	vis = DefaultVisual(display, DefaultScreen(display));
+
+	vinfot.visualid = XVisualIDFromVisual(vis);
+	vinfo = XGetVisualInfo(display, VisualIDMask, &vinfot, &nret);
+
+#if 0
+	/* If you want to support more visuals below, you'll probably need
+	   this. */
+	printf("vinfo: rm %04x gm %04x bm %04x depth %d class %d\n",
+				 vinfo->red_mask, vinfo->green_mask, vinfo->blue_mask, vinfo->depth, vinfo->class);
+#endif
+
+#if !defined(__cplusplus)
+#define c_class class
+#endif
+
+	if (vinfo->c_class == TrueColor
+			&& vinfo->depth == 16 && vinfo->red_mask == 0xf800 && vinfo->green_mask == 0x07e0 && vinfo->blue_mask == 0x001f)
+		pixel_type = PT_RGB565;
+
+	if (vinfo->c_class == TrueColor
+			&& vinfo->depth == 24 && vinfo->red_mask == 0xff0000 && vinfo->green_mask == 0x00ff00 && vinfo->blue_mask == 0x0000ff)
+		pixel_type = PT_RGB888;
+
+	for (r = 0; r < rows; r++) {
+		for (c = 0; c < cols; c++) {
+			XColor pix;
+			unsigned int pr = (unsigned) fgetc(f);
+			unsigned int pg = (unsigned) fgetc(f);
+			unsigned int pb = (unsigned) fgetc(f);
+
+			switch (pixel_type) {
+			case PT_unknown:
+				pix.red = pr * 65535 / maxval;
+				pix.green = pg * 65535 / maxval;
+				pix.blue = pb * 65535 / maxval;
+				pix.flags = DoRed | DoGreen | DoBlue;
+				XAllocColor(display, lesstif_colormap, &pix);
+				bg[r][c] = pix.pixel;
+				break;
+			case PT_RGB565:
+				bg[r][c] = (pr >> 3) << 11 | (pg >> 2) << 5 | (pb >> 3);
+				break;
+			case PT_RGB888:
+				bg[r][c] = (pr << 16) | (pg << 8) | (pb);
+				break;
+			}
+		}
+	}
+}
+
+void LoadBackgroundImage(char *filename)
+{
+	FILE *f = pcb_fopen(filename, "rb");
+	if (!f) {
+		if (PCB_NSTRCMP(filename, "pcb-background.ppm"))
+			perror(filename);
+		return;
+	}
+	LoadBackgroundFile(f, filename);
+	fclose(f);
+}
+
+static void DrawBackgroundImage()
+{
+	int x, y, w, h;
+	double xscale, yscale;
+	int pcbwidth = PCB->MaxWidth / view_zoom;
+	int pcbheight = PCB->MaxHeight / view_zoom;
+
+	if (!window || !bg)
+		return;
+
+	if (!bgi || view_width != bgi_w || view_height != bgi_h) {
+		if (bgi)
+			XDestroyImage(bgi);
+		/* Cheat - get the image, which sets up the format too.  */
+		bgi = XGetImage(XtDisplay(work_area), window, 0, 0, view_width, view_height, -1, ZPixmap);
+		bgi_w = view_width;
+		bgi_h = view_height;
+	}
+
+	w = MIN(view_width, pcbwidth);
+	h = MIN(view_height, pcbheight);
+
+	xscale = (double) bg_w / PCB->MaxWidth;
+	yscale = (double) bg_h / PCB->MaxHeight;
+
+	for (y = 0; y < h; y++) {
+		int pr = Py(y);
+		int ir = pr * yscale;
+		for (x = 0; x < w; x++) {
+			int pc = Px(x);
+			int ic = pc * xscale;
+			XPutPixel(bgi, x, y, bg[ir][ic]);
+		}
+	}
+	XPutImage(display, main_pixmap, bg_gc, bgi, 0, 0, 0, 0, w, h);
+}
+
+/* ---------------------------------------------------------------------- */
+
+static pcb_hid_attribute_t *lesstif_get_export_options(int *n)
+{
+	if (n != NULL)
+		*n = sizeof(lesstif_attribute_list) / sizeof(pcb_hid_attribute_t);
+	return lesstif_attribute_list;
+}
+
+static void set_scroll(Widget s, int pos, int view, int pcb)
+{
+	unsigned int sz = view * view_zoom;
+	if (sz > pcb)
+		sz = pcb;
+	if (pos > pcb - sz)
+		pos = pcb - sz;
+	if (pos < 0)
+		pos = 0;
+	stdarg_n = 0;
+	stdarg(XmNvalue, pos);
+	stdarg(XmNsliderSize, sz);
+	stdarg(XmNincrement, view_zoom);
+	stdarg(XmNpageIncrement, sz);
+	stdarg(XmNmaximum, pcb);
+	XtSetValues(s, stdarg_args, stdarg_n);
+}
+
+void lesstif_pan_fixup()
+{
+	if (view_left_x > PCB->MaxWidth + (view_width * view_zoom))
+		view_left_x = PCB->MaxWidth + (view_width * view_zoom);
+	if (view_top_y > PCB->MaxHeight + (view_height * view_zoom))
+		view_top_y = PCB->MaxHeight + (view_height * view_zoom);
+	if (view_left_x < -(view_width * view_zoom))
+		view_left_x = -(view_width * view_zoom);
+	if (view_top_y < -(view_height * view_zoom))
+		view_top_y = -(view_height * view_zoom);
+
+	set_scroll(hscroll, view_left_x, view_width, PCB->MaxWidth);
+	set_scroll(vscroll, view_top_y, view_height, PCB->MaxHeight);
+
+	lesstif_invalidate_all();
+}
+
+static void zoom_max()
+{
+	double new_zoom = PCB->MaxWidth / view_width;
+	if (new_zoom < PCB->MaxHeight / view_height)
+		new_zoom = PCB->MaxHeight / view_height;
+
+	view_left_x = -(view_width * new_zoom - PCB->MaxWidth) / 2;
+	view_top_y = -(view_height * new_zoom - PCB->MaxHeight) / 2;
+	view_zoom = new_zoom;
+	pcb_pixel_slop = view_zoom;
+	lesstif_pan_fixup();
+}
+
+
+static void zoom_to(double new_zoom, pcb_coord_t x, pcb_coord_t y)
+{
+	double max_zoom, xfrac, yfrac;
+	pcb_coord_t cx, cy;
+
+	if (PCB == NULL)
+		return;
+
+	xfrac = (double) x / (double) view_width;
+	yfrac = (double) y / (double) view_height;
+
+	if (conf_core.editor.view.flip_x)
+		xfrac = 1 - xfrac;
+	if (conf_core.editor.view.flip_y)
+		yfrac = 1 - yfrac;
+
+	max_zoom = PCB->MaxWidth / view_width;
+	if (max_zoom < PCB->MaxHeight / view_height)
+		max_zoom = PCB->MaxHeight / view_height;
+
+	max_zoom *= MAX_ZOOM_SCALE;
+
+	if (new_zoom < 1)
+		new_zoom = 1;
+	if (new_zoom > max_zoom)
+		new_zoom = max_zoom;
+
+	cx = view_left_x + view_width * xfrac * view_zoom;
+	cy = view_top_y + view_height * yfrac * view_zoom;
+
+	if (view_zoom != new_zoom) {
+		view_zoom = new_zoom;
+		pcb_pixel_slop = view_zoom;
+
+		view_left_x = cx - view_width * xfrac * view_zoom;
+		view_top_y = cy - view_height * yfrac * view_zoom;
+	}
+	lesstif_pan_fixup();
+}
+
+static void zoom_win(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int setch)
+{
+	pcb_coord_t w = x2 - x1, h = y2 - y1;
+	double new_zoom = w / view_width;
+	if (new_zoom < h / view_height)
+		new_zoom = h / view_height;
+
+	if (new_zoom < 1)
+		new_zoom = 1;
+
+	if (view_zoom != new_zoom) {
+		view_zoom = new_zoom;
+		pcb_pixel_slop = view_zoom;
+	}
+
+	view_left_x = x1;
+	view_top_y = y1;
+
+	lesstif_pan_fixup();
+	if (setch)
+		pcb_crosshair_move_absolute((x1+x2)/2, (y1+y2)/2);
+}
+
+static void zoom_toggle(pcb_coord_t x, pcb_coord_t y)
+{
+	double tmp;
+
+	tmp = prev_view_zoom;
+	prev_view_zoom = view_zoom;
+	zoom_to(tmp, x, y);
+}
+
+void zoom_by(double factor, pcb_coord_t x, pcb_coord_t y)
+{
+	zoom_to(view_zoom * factor, x, y);
+}
+
+static int panning = 0;
+static int shift_pressed;
+static int ctrl_pressed;
+static int alt_pressed;
+
+/* X and Y are in screen coordinates.  */
+static void Pan(int mode, pcb_coord_t x, pcb_coord_t y)
+{
+	static pcb_coord_t ox, oy;
+	static pcb_coord_t opx, opy;
+
+	panning = mode;
+	/* This is for ctrl-pan, where the viewport's position is directly
+	   proportional to the cursor position in the window (like the Xaw
+	   thumb panner) */
+	if (pan_thumb_mode) {
+		opx = x * PCB->MaxWidth / view_width;
+		opy = y * PCB->MaxHeight / view_height;
+		if (conf_core.editor.view.flip_x)
+			opx = PCB->MaxWidth - opx;
+		if (conf_core.editor.view.flip_y)
+			opy = PCB->MaxHeight - opy;
+		view_left_x = opx - view_width / 2 * view_zoom;
+		view_top_y = opy - view_height / 2 * view_zoom;
+		lesstif_pan_fixup();
+	}
+	/* This is the start of a regular pan.  On the first click, we
+	   remember the coordinates where we "grabbed" the screen.  */
+	else if (mode == 1) {
+		ox = x;
+		oy = y;
+		opx = view_left_x;
+		opy = view_top_y;
+	}
+	/* continued drag, we calculate how far we've moved the cursor and
+	   set the position accordingly.  */
+	else {
+		if (conf_core.editor.view.flip_x)
+			view_left_x = opx + (x - ox) * view_zoom;
+		else
+			view_left_x = opx - (x - ox) * view_zoom;
+		if (conf_core.editor.view.flip_y)
+			view_top_y = opy + (y - oy) * view_zoom;
+		else
+			view_top_y = opy - (y - oy) * view_zoom;
+		lesstif_pan_fixup();
+	}
+}
+
+static void mod_changed(XKeyEvent * e, int set)
+{
+	switch (XKeycodeToKeysym(display, e->keycode, 0)) {
+	case XK_Shift_L:
+	case XK_Shift_R:
+		shift_pressed = set;
+		break;
+	case XK_Control_L:
+	case XK_Control_R:
+		ctrl_pressed = set;
+		break;
+#ifdef __APPLE__
+	case XK_Mode_switch:
+#else
+	case XK_Alt_L:
+	case XK_Alt_R:
+#endif
+		alt_pressed = set;
+		break;
+	default:
+		/* to include the Apple keyboard left and right command keys use XK_Meta_L and XK_Meta_R respectivly. */
+		return;
+	}
+	in_move_event = 1;
+	pcb_notify_crosshair_change(pcb_false);
+	if (panning)
+		Pan(2, e->x, e->y);
+	pcb_event_move_crosshair(Px(e->x), Py(e->y));
+	pcb_tool_adjust_attached_objects();
+	pcb_notify_crosshair_change(pcb_true);
+	in_move_event = 0;
+}
+
+static pcb_hid_cfg_mod_t lesstif_mb2cfg(int but)
+{
+	switch(but) {
+		case 1: return PCB_MB_LEFT;
+		case 2: return PCB_MB_MIDDLE;
+		case 3: return PCB_MB_RIGHT;
+		case 4: return PCB_MB_SCROLL_UP;
+		case 5: return PCB_MB_SCROLL_DOWN;
+	}
+	return 0;
+}
+
+static void work_area_input(Widget w, XtPointer v, XEvent * e, Boolean * ctd)
+{
+	static int pressed_button = 0;
+
+	show_crosshair(0);
+	switch (e->type) {
+	case KeyPress:
+		mod_changed(&(e->xkey), 1);
+		if (lesstif_key_event(&(e->xkey)))
+			return;
+		break;
+
+	case KeyRelease:
+		mod_changed(&(e->xkey), 0);
+		break;
+
+	case ButtonPress:
+		{
+			int mods;
+			if (pressed_button)
+				return;
+			/*printf("click %d\n", e->xbutton.button); */
+			if (lesstif_button_event(w, e))
+				return;
+
+			pcb_notify_crosshair_change(pcb_false);
+			pressed_button = e->xbutton.button;
+			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
+				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
+#ifdef __APPLE__
+				+ ((e->xbutton.state & (1 << 13)) ? PCB_M_Alt : 0);
+#else
+				+ ((e->xbutton.state & Mod1Mask) ? PCB_M_Alt : 0);
+#endif
+			hid_cfg_mouse_action(&lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
+
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+		}
+
+	case ButtonRelease:
+		{
+			int mods;
+			if (e->xbutton.button != pressed_button)
+				return;
+			lesstif_button_event(w, e);
+			pcb_notify_crosshair_change(pcb_false);
+			pressed_button = 0;
+			mods = ((e->xbutton.state & ShiftMask) ? PCB_M_Shift : 0)
+				+ ((e->xbutton.state & ControlMask) ? PCB_M_Ctrl : 0)
+#ifdef __APPLE__
+				+ ((e->xbutton.state & (1 << 13)) ? PCB_M_Alt : 0)
+#else
+				+ ((e->xbutton.state & Mod1Mask) ? PCB_M_Alt : 0)
+#endif
+				+ PCB_M_Release;
+			hid_cfg_mouse_action(&lesstif_mouse, lesstif_mb2cfg(e->xbutton.button) | mods, cmd_is_active);
+			pcb_notify_crosshair_change(pcb_true);
+			break;
+		}
+
+	case MotionNotify:
+		{
+			Window root, child;
+			unsigned int keys_buttons;
+			int root_x, root_y, pos_x, pos_y;
+			while (XCheckMaskEvent(display, PointerMotionMask, e));
+			XQueryPointer(display, e->xmotion.window, &root, &child, &root_x, &root_y, &pos_x, &pos_y, &keys_buttons);
+			shift_pressed = (keys_buttons & ShiftMask);
+			ctrl_pressed = (keys_buttons & ControlMask);
+#ifdef __APPLE__
+			alt_pressed = (keys_buttons & (1 << 13));
+#else
+			alt_pressed = (keys_buttons & Mod1Mask);
+#endif
+			/*pcb_printf("m %#mS %#mS\n", Px(e->xmotion.x), Py(e->xmotion.y)); */
+			crosshair_in_window = 1;
+			in_move_event = 1;
+			if (panning)
+				Pan(2, pos_x, pos_y);
+			pcb_event_move_crosshair(Px(pos_x), Py(pos_y));
+			in_move_event = 0;
+		}
+		break;
+
+	case LeaveNotify:
+		crosshair_in_window = 0;
+		if (crosshair_on)
+			pcb_draw_attached(1);
+		pcb_draw_mark(1);
+		ShowCrosshair(pcb_false);
+		need_idle_proc();
+		break;
+
+	case EnterNotify:
+		crosshair_in_window = 1;
+		in_move_event = 1;
+		pcb_event_move_crosshair(Px(e->xcrossing.x), Py(e->xcrossing.y));
+		ShowCrosshair(pcb_true);
+		in_move_event = 0;
+		need_redraw = 1;
+		need_idle_proc();
+		break;
+
+	default:
+		printf("work_area: unknown event %d\n", e->type);
+		break;
+	}
+
+	if (cmd_is_active)
+		XmProcessTraversal(m_cmd, XmTRAVERSE_CURRENT);
+}
+
+static void draw_right_cross(GC xor_gc, int x, int y, int view_width, int view_height)
+{
+	XDrawLine(display, window, xor_gc, 0, y, view_width, y);
+	XDrawLine(display, window, xor_gc, x, 0, x, view_height);
+}
+
+static void draw_slanted_cross(GC xor_gc, int x, int y, int view_width, int view_height)
+{
+	int x0, y0, x1, y1;
+
+	x0 = x + (view_height - y);
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x - y;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + (view_width - x);
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - x;
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+	x0 = x - (view_height - y);
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x + y;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + x;
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - (view_width - x);
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_dozen_cross(GC xor_gc, int x, int y, int view_width, int view_height)
+{
+	int x0, y0, x1, y1;
+	double tan60 = sqrt(3);
+
+	x0 = x + (view_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x - y / tan60;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + (view_width - x) * tan60;
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - x * tan60;
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x + (view_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x - y * tan60;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + (view_width - x) / tan60;
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - x / tan60;
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (view_height - y) / tan60;
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x + y / tan60;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + x * tan60;
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - (view_width - x) * tan60;
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+
+	x0 = x - (view_height - y) * tan60;
+	x0 = MAX(0, MIN(x0, view_width));
+	x1 = x + y * tan60;
+	x1 = MAX(0, MIN(x1, view_width));
+	y0 = y + x / tan60;
+	y0 = MAX(0, MIN(y0, view_height));
+	y1 = y - (view_width - x) / tan60;
+	y1 = MAX(0, MIN(y1, view_height));
+	XDrawLine(display, window, xor_gc, x0, y0, x1, y1);
+}
+
+static void draw_crosshair(GC xor_gc, int x, int y, int view_width, int view_height)
+{
+	draw_right_cross(xor_gc, x, y, view_width, view_height);
+	if (pcb_crosshair.shape == pcb_ch_shape_union_jack)
+		draw_slanted_cross(xor_gc, x, y, view_width, view_height);
+	if (pcb_crosshair.shape == pcb_ch_shape_dozen)
+		draw_dozen_cross(xor_gc, x, y, view_width, view_height);
+}
+
+void lesstif_show_crosshair(int show)
+{
+	static int showing = 0;
+	static int sx, sy;
+	static GC xor_gc = 0;
+	Pixel crosshair_color;
+
+	if (!crosshair_in_window || !window)
+		return;
+	if (xor_gc == 0) {
+		crosshair_color = lesstif_parse_color(conf_core.appearance.color.crosshair) ^ bgcolor;
+		xor_gc = XCreateGC(display, window, 0, 0);
+		XSetFunction(display, xor_gc, GXxor);
+		XSetForeground(display, xor_gc, crosshair_color);
+	}
+	if (show == showing)
+		return;
+	if (show) {
+		sx = Vx(crosshair_x);
+		sy = Vy(crosshair_y);
+	}
+	else
+		need_idle_proc();
+	draw_crosshair(xor_gc, sx, sy, view_width, view_height);
+	showing = show;
+}
+
+static void work_area_expose(Widget work_area, void *me, XmDrawingAreaCallbackStruct * cbs)
+{
+	XExposeEvent *e;
+
+	show_crosshair(0);
+	e = &(cbs->event->xexpose);
+	XSetFunction(display, my_gc, GXcopy);
+	XCopyArea(display, main_pixmap, window, my_gc, e->x, e->y, e->width, e->height, e->x, e->y);
+	show_crosshair(1);
+}
+
+static void scroll_callback(Widget scroll, int *view_dim, XmScrollBarCallbackStruct * cbs)
+{
+	*view_dim = cbs->value;
+	lesstif_invalidate_all();
+}
+
+static void work_area_make_pixmaps(Dimension width, Dimension height)
+{
+	if (main_pixmap)
+		XFreePixmap(display, main_pixmap);
+	main_pixmap = XCreatePixmap(display, window, width, height, XDefaultDepth(display, screen));
+
+	if (mask_pixmap)
+		XFreePixmap(display, mask_pixmap);
+	mask_pixmap = XCreatePixmap(display, window, width, height, XDefaultDepth(display, screen));
+#ifdef HAVE_XRENDER
+	if (main_picture) {
+		XRenderFreePicture(display, main_picture);
+		main_picture = 0;
+	}
+	if (mask_picture) {
+		XRenderFreePicture(display, mask_picture);
+		mask_picture = 0;
+	}
+	if (use_xrender) {
+		main_picture = XRenderCreatePicture(display, main_pixmap,
+																				XRenderFindVisualFormat(display, DefaultVisual(display, screen)), 0, 0);
+		mask_picture = XRenderCreatePicture(display, mask_pixmap,
+																				XRenderFindVisualFormat(display, DefaultVisual(display, screen)), 0, 0);
+		if (!main_picture || !mask_picture)
+			use_xrender = 0;
+	}
+#endif /* HAVE_XRENDER */
+
+	if (mask_bitmap)
+		XFreePixmap(display, mask_bitmap);
+	mask_bitmap = XCreatePixmap(display, window, width, height, 1);
+
+	pixmap = use_mask() ? main_pixmap : mask_pixmap;
+	pixmap_w = width;
+	pixmap_h = height;
+}
+
+static void work_area_resize(Widget work_area, void *me, XmDrawingAreaCallbackStruct * cbs)
+{
+	XColor color;
+	Dimension width, height;
+
+	show_crosshair(0);
+
+	stdarg_n = 0;
+	stdarg(XtNwidth, &width);
+	stdarg(XtNheight, &height);
+	stdarg(XmNbackground, &bgcolor);
+	XtGetValues(work_area, stdarg_args, stdarg_n);
+	view_width = width;
+	view_height = height;
+
+	color.pixel = bgcolor;
+	XQueryColor(display, lesstif_colormap, &color);
+	bgred = color.red;
+	bggreen = color.green;
+	bgblue = color.blue;
+
+	if (!window)
+		return;
+
+	work_area_make_pixmaps(view_width, view_height);
+
+	zoom_by(1, 0, 0);
+}
+
+static void work_area_first_expose(Widget work_area, void *me, XmDrawingAreaCallbackStruct * cbs)
+{
+	int c;
+	Dimension width, height;
+	static char dashes[] = { 4, 4 };
+
+	window = XtWindow(work_area);
+	my_gc = XCreateGC(display, window, 0, 0);
+
+	arc1_gc = XCreateGC(display, window, 0, 0);
+	c = lesstif_parse_color("#804000");
+	XSetForeground(display, arc1_gc, c);
+	arc2_gc = XCreateGC(display, window, 0, 0);
+	c = lesstif_parse_color("#004080");
+	XSetForeground(display, arc2_gc, c);
+	XSetLineAttributes(display, arc1_gc, 1, LineOnOffDash, 0, 0);
+	XSetLineAttributes(display, arc2_gc, 1, LineOnOffDash, 0, 0);
+	XSetDashes(display, arc1_gc, 0, dashes, 2);
+	XSetDashes(display, arc2_gc, 0, dashes, 2);
+
+	stdarg_n = 0;
+	stdarg(XtNwidth, &width);
+	stdarg(XtNheight, &height);
+	stdarg(XmNbackground, &bgcolor);
+	XtGetValues(work_area, stdarg_args, stdarg_n);
+	view_width = width;
+	view_height = height;
+
+	offlimit_color = lesstif_parse_color(conf_core.appearance.color.off_limit);
+	grid_color = lesstif_parse_color(conf_core.appearance.color.grid);
+
+	bg_gc = XCreateGC(display, window, 0, 0);
+	XSetForeground(display, bg_gc, bgcolor);
+
+	work_area_make_pixmaps(width, height);
+
+#ifdef HAVE_XRENDER
+	if (use_xrender) {
+		double l_alpha = conf_core.appearance.layer_alpha;
+		XRenderPictureAttributes pa;
+		XRenderColor a = { 0, 0, 0,  0x8000};
+		
+		if (l_alpha < 0)
+			l_alpha = 0;
+		else if (l_alpha > 1)
+			l_alpha = 1;
+		a.alpha = (int)(l_alpha * (double)0xFFFF);
+
+		pale_pixmap = XCreatePixmap(display, window, 1, 1, 8);
+		pa.repeat = True;
+		pale_picture = XRenderCreatePicture(display, pale_pixmap,
+																				XRenderFindStandardFormat(display, PictStandardA8), CPRepeat, &pa);
+		if (pale_picture)
+			XRenderFillRectangle(display, PictOpSrc, pale_picture, &a, 0, 0, 1, 1);
+		else
+			use_xrender = 0;
+	}
+#endif /* HAVE_XRENDER */
+
+	clip_gc = XCreateGC(display, window, 0, 0);
+	bset_gc = XCreateGC(display, mask_bitmap, 0, 0);
+	XSetForeground(display, bset_gc, 1);
+	bclear_gc = XCreateGC(display, mask_bitmap, 0, 0);
+	XSetForeground(display, bclear_gc, 0);
+
+	XtRemoveCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_first_expose, 0);
+	XtAddCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_expose, 0);
+	lesstif_invalidate_all();
+}
+
+static Widget make_message(const char *name, Widget left, int resizeable)
+{
+	Widget w, f;
+	stdarg_n = 0;
+	if (left) {
+		stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+		stdarg(XmNleftWidget, XtParent(left));
+	}
+	else {
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+	}
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNshadowType, XmSHADOW_IN);
+	stdarg(XmNshadowThickness, 1);
+	stdarg(XmNalignment, XmALIGNMENT_CENTER);
+	stdarg(XmNmarginWidth, 4);
+	stdarg(XmNmarginHeight, 1);
+	if (!resizeable)
+		stdarg(XmNresizePolicy, XmRESIZE_GROW);
+	f = XmCreateForm(messages, XmStrCast(name), stdarg_args, stdarg_n);
+	XtManageChild(f);
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	w = XmCreateLabel(f, XmStrCast(name), stdarg_args, stdarg_n);
+	XtManageChild(w);
+	return w;
+}
+
+static unsigned short int lesstif_translate_key(const char *desc, int len)
+{
+	KeySym key;
+
+	if (pcb_strcasecmp(desc, "enter") == 0) desc = "Return";
+
+	key = XStringToKeysym(desc);
+	if (key == NoSymbol && len > 1) {
+		pcb_message(PCB_MSG_INFO, "lesstif_translate_key: no symbol for %s\n", desc);
+		return 0;
+	}
+	return key;
+}
+
+int lesstif_key_name(unsigned short int key_raw, char *out, int out_len)
+{
+#warning TODO#3: do not ingore key_tr (either of them is 0)
+	char *name = XKeysymToString(key_raw);
+	if (name == NULL)
+		return -1;
+	strncpy(out, name, out_len);
+	out[out_len-1] = '\0';
+	return 0;
+}
+
+void lesstif_uninit_menu(void);
+void lesstif_init_menu(void);
+
+extern Widget lesstif_menubar;
+static int lesstif_hid_inited = 0;
+
+static void lesstif_do_export(pcb_hid_attr_val_t * options)
+{
+	Dimension width, height;
+	Widget menu;
+	Widget work_area_frame;
+
+	/* this only registers in core, safe to call before anything else */
+	lesstif_init_menu();
+
+	lesstif_begin();
+
+	pcb_hid_cfg_keys_init(&lesstif_keymap);
+	lesstif_keymap.translate_key = lesstif_translate_key;
+	lesstif_keymap.key_name = lesstif_key_name;
+	lesstif_keymap.auto_chr = 1;
+	lesstif_keymap.auto_tr = hid_cfg_key_default_trans;
+
+	stdarg_n = 0;
+	stdarg(XtNwidth, &width);
+	stdarg(XtNheight, &height);
+	XtGetValues(appwidget, stdarg_args, stdarg_n);
+
+	if (width < 1)
+		width = 640;
+	if (width > XDisplayWidth(display, screen))
+		width = XDisplayWidth(display, screen);
+	if (height < 1)
+		height = 480;
+	if (height > XDisplayHeight(display, screen))
+		height = XDisplayHeight(display, screen);
+
+	stdarg_n = 0;
+	stdarg(XmNwidth, width);
+	stdarg(XmNheight, height);
+	XtSetValues(appwidget, stdarg_args, stdarg_n);
+
+	stdarg(XmNspacing, 0);
+	mainwind = XmCreateMainWindow(appwidget, XmStrCast("mainWind"), stdarg_args, stdarg_n);
+	XtManageChild(mainwind);
+
+	stdarg_n = 0;
+	stdarg(XmNmarginWidth, 0);
+	stdarg(XmNmarginHeight, 0);
+	menu = lesstif_menu(mainwind, "menubar", stdarg_args, stdarg_n);
+	XtManageChild(menu);
+
+	stdarg_n = 0;
+	stdarg(XmNshadowType, XmSHADOW_IN);
+	work_area_frame = XmCreateFrame(mainwind, XmStrCast("work_area_frame"), stdarg_args, stdarg_n);
+	XtManageChild(work_area_frame);
+
+	stdarg_n = 0;
+	stdarg_do_color(conf_core.appearance.color.background, XmNbackground);
+	work_area = XmCreateDrawingArea(work_area_frame, XmStrCast("work_area"), stdarg_args, stdarg_n);
+	XtManageChild(work_area);
+	XtAddCallback(work_area, XmNexposeCallback, (XtCallbackProc) work_area_first_expose, 0);
+	XtAddCallback(work_area, XmNresizeCallback, (XtCallbackProc) work_area_resize, 0);
+	/* A regular callback won't work here, because lesstif swallows any
+	   Ctrl<Button>1 event.  */
+	XtAddEventHandler(work_area,
+										ButtonPressMask | ButtonReleaseMask
+										| PointerMotionMask | PointerMotionHintMask
+										| KeyPressMask | KeyReleaseMask | EnterWindowMask | LeaveWindowMask, 0, work_area_input, 0);
+
+	stdarg_n = 0;
+	stdarg(XmNorientation, XmVERTICAL);
+	stdarg(XmNprocessingDirection, XmMAX_ON_BOTTOM);
+	stdarg(XmNmaximum, PCB->MaxHeight ? PCB->MaxHeight : 1);
+	vscroll = XmCreateScrollBar(mainwind, XmStrCast("vscroll"), stdarg_args, stdarg_n);
+	XtAddCallback(vscroll, XmNvalueChangedCallback, (XtCallbackProc) scroll_callback, (XtPointer) & view_top_y);
+	XtAddCallback(vscroll, XmNdragCallback, (XtCallbackProc) scroll_callback, (XtPointer) & view_top_y);
+	XtManageChild(vscroll);
+
+	stdarg_n = 0;
+	stdarg(XmNorientation, XmHORIZONTAL);
+	stdarg(XmNmaximum, PCB->MaxWidth ? PCB->MaxWidth : 1);
+	hscroll = XmCreateScrollBar(mainwind, XmStrCast("hscroll"), stdarg_args, stdarg_n);
+	XtAddCallback(hscroll, XmNvalueChangedCallback, (XtCallbackProc) scroll_callback, (XtPointer) & view_left_x);
+	XtAddCallback(hscroll, XmNdragCallback, (XtCallbackProc) scroll_callback, (XtPointer) & view_left_x);
+	XtManageChild(hscroll);
+
+	stdarg_n = 0;
+	stdarg(XmNresize, True);
+	stdarg(XmNresizePolicy, XmRESIZE_ANY);
+	messages = XmCreateForm(mainwind, XmStrCast("messages"), stdarg_args, stdarg_n);
+	XtManageChild(messages);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNalignment, XmALIGNMENT_CENTER);
+	stdarg(XmNshadowThickness, 2);
+	m_click = XmCreateLabel(messages, XmStrCast("click"), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNlabelString, XmStringCreatePCB(pcb_cli_prompt(":")));
+	m_cmd_label = XmCreateLabel(messages, XmStrCast("command"), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+	stdarg(XmNleftWidget, m_cmd_label);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNshadowThickness, 1);
+	stdarg(XmNhighlightThickness, 0);
+	stdarg(XmNmarginWidth, 2);
+	stdarg(XmNmarginHeight, 2);
+	m_cmd = XmCreateTextField(messages, XmStrCast("command"), stdarg_args, stdarg_n);
+	XtAddCallback(m_cmd, XmNactivateCallback, (XtCallbackProc) command_callback, 0);
+	XtAddCallback(m_cmd, XmNlosingFocusCallback, (XtCallbackProc) command_callback, 0);
+	XtAddEventHandler(m_cmd, KeyPressMask | KeyReleaseMask, 0, command_event_handler, 0);
+
+	m_mark = make_message("m_mark", 0, 0);
+	m_crosshair = make_message("m_crosshair", m_mark, 0);
+	m_grid = make_message("m_grid", m_crosshair, 1);
+	m_zoom = make_message("m_zoom", m_grid, 1);
+	lesstif_m_layer = make_message("m_layer", m_zoom, 0);
+	m_mode = make_message("m_mode", lesstif_m_layer, 1);
+	m_rats = make_message("m_rats", m_mode, 1);
+	m_status = make_message("m_status", m_mode, 1);
+
+	XtUnmanageChild(XtParent(m_mark));
+	XtUnmanageChild(XtParent(m_rats));
+
+	stdarg_n = 0;
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	XtSetValues(XtParent(m_status), stdarg_args, stdarg_n);
+
+	/* We'll use this later.  */
+	stdarg_n = 0;
+	stdarg(XmNleftWidget, XtParent(m_mark));
+	XtSetValues(XtParent(m_crosshair), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	stdarg(XmNmessageWindow, messages);
+	XtSetValues(mainwind, stdarg_args, stdarg_n);
+
+	if (background_image_file)
+		LoadBackgroundImage(background_image_file);
+
+	XtRealizeWidget(appwidget);
+
+	while (!window) {
+		XEvent e;
+		XtAppNextEvent(app_context, &e);
+		XtDispatchEvent(&e);
+	}
+
+	pcb_board_changed(0);
+
+	lesstif_menubar = menu;
+	pcb_event(PCB_EVENT_GUI_INIT, NULL);
+
+
+	lesstif_hid_inited = 1;
+
+	XtAppMainLoop(app_context);
+
+	pcb_hid_cfg_keys_uninit(&lesstif_keymap);
+	lesstif_end();
+}
+
+static void lesstif_do_exit(pcb_hid_t *hid)
+{
+	XtAppSetExitFlag(app_context);
+}
+
+static void lesstif_uninit(pcb_hid_t *hid)
+{
+	if (lesstif_hid_inited) {
+		lesstif_uninit_menu();
+		lesstif_hid_inited = 0;
+	}
+}
+
+typedef union {
+	int i;
+	double f;
+	char *s;
+	pcb_coord_t c;
+} val_union;
+
+static Boolean
+pcb_cvt_string_to_double(Display * d, XrmValue * args, Cardinal * num_args, XrmValue * from, XrmValue * to, XtPointer * data)
+{
+	static double rv;
+	rv = strtod((char *) from->addr, 0);
+	if (to->addr)
+		*(double *) to->addr = rv;
+	else
+		to->addr = (XPointer) & rv;
+	to->size = sizeof(rv);
+	return True;
+}
+
+static Boolean
+pcb_cvt_string_to_coord(Display * d, XrmValue * args, Cardinal * num_args, XrmValue * from, XrmValue * to, XtPointer * data)
+{
+	static pcb_coord_t rv;
+	rv = pcb_get_value((char *) from->addr, NULL, NULL, NULL);
+	if (to->addr)
+		*(pcb_coord_t *) to->addr = rv;
+	else
+		to->addr = (XPointer) & rv;
+	to->size = sizeof(rv);
+	return TRUE;
+}
+
+static void mainwind_delete_cb()
+{
+	pcb_action("Quit");
+}
+
+static void lesstif_listener_cb(XtPointer client_data, int *fid, XtInputId * id)
+{
+	char buf[BUFSIZ];
+	int nbytes;
+
+	if ((nbytes = read(*fid, buf, BUFSIZ)) == -1)
+		perror("lesstif_listener_cb");
+
+	if (nbytes) {
+		buf[nbytes] = '\0';
+		pcb_parse_actions(buf);
+	}
+}
+
+static jmp_buf lesstif_err_jmp;
+static void lesstif_err_msg(String name, String type, String class, String dflt, String *params, Cardinal *num_params)
+{
+	char *par[8];
+	int n;
+	for(n = 0; n < 8; n++) par[n] = "";
+	for(n = 0; n < *num_params; n++) par[n] = params[n];
+	fprintf(stderr, "Lesstif/motif initializaion error:\n");
+	fprintf(stderr, dflt, par[0], par[1], par[2], par[3], par[4], par[5], par[6], par[7]);
+	fprintf(stderr, "\n");
+	longjmp(lesstif_err_jmp, 1);
+}
+
+
+static int lesstif_parse_arguments(int *argc, char ***argv)
+{
+	Atom close_atom;
+	pcb_hid_attr_node_t *ha;
+	int acount = 0, amax;
+	int rcount = 0, rmax;
+	int i, err;
+	XrmOptionDescRec *new_options;
+	XtResource *new_resources;
+	val_union *new_values;
+	int render_event, render_error;
+
+	XtSetTypeConverter(XtRString, XtRDouble, pcb_cvt_string_to_double, NULL, 0, XtCacheAll, NULL);
+	XtSetTypeConverter(XtRString, XtRPCBCoord, pcb_cvt_string_to_coord, NULL, 0, XtCacheAll, NULL);
+
+	lesstif_reg_attrs();
+
+	for (ha = hid_attr_nodes; ha; ha = ha->next)
+		for (i = 0; i < ha->n; i++) {
+			pcb_hid_attribute_t *a = ha->attributes + i;
+			switch (a->type) {
+			case PCB_HATT_INTEGER:
+			case PCB_HATT_COORD:
+			case PCB_HATT_REAL:
+			case PCB_HATT_STRING:
+			case PCB_HATT_PATH:
+			case PCB_HATT_BOOL:
+				acount++;
+				rcount++;
+				break;
+			default:
+				break;
+			}
+		}
+
+#if 0
+	amax = acount + XtNumber(lesstif_options);
+#else
+	amax = acount;
+#endif
+
+	new_options = (XrmOptionDescRec *) malloc((amax + 1) * sizeof(XrmOptionDescRec));
+
+#if 0
+	memcpy(new_options + acount, lesstif_options, sizeof(lesstif_options));
+#endif
+	acount = 0;
+
+#if 0
+	rmax = rcount + XtNumber(lesstif_resources);
+#else
+	rmax = rcount;
+#endif
+
+	new_resources = (XtResource *) malloc((rmax + 1) * sizeof(XtResource));
+	new_values = (val_union *) malloc((rmax + 1) * sizeof(val_union));
+#if 0
+	memcpy(new_resources + acount, lesstif_resources, sizeof(lesstif_resources));
+#endif
+	rcount = 0;
+
+	for (ha = hid_attr_nodes; ha; ha = ha->next)
+		for (i = 0; i < ha->n; i++) {
+			pcb_hid_attribute_t *a = ha->attributes + i;
+			XrmOptionDescRec *o = new_options + acount;
+			char *tmpopt, *tmpres;
+			XtResource *r = new_resources + rcount;
+
+			tmpopt = (char *) malloc(strlen(a->name) + 3);
+			tmpopt[0] = tmpopt[1] = '-';
+			strcpy(tmpopt + 2, a->name);
+			o->option = tmpopt;
+
+			tmpres = (char *) malloc(strlen(a->name) + 2);
+			tmpres[0] = '*';
+			strcpy(tmpres + 1, a->name);
+			o->specifier = tmpres;
+
+			switch (a->type) {
+			case PCB_HATT_INTEGER:
+			case PCB_HATT_COORD:
+			case PCB_HATT_REAL:
+			case PCB_HATT_STRING:
+			case PCB_HATT_PATH:
+				o->argKind = XrmoptionSepArg;
+				o->value = NULL;
+				acount++;
+				break;
+			case PCB_HATT_BOOL:
+				o->argKind = XrmoptionNoArg;
+				o->value = XmStrCast("True");
+				acount++;
+				break;
+			default:
+				break;
+			}
+
+			r->resource_name = XmStrCast(a->name);
+			r->resource_class = XmStrCast(a->name);
+			r->resource_offset = sizeof(val_union) * rcount;
+
+			switch (a->type) {
+			case PCB_HATT_INTEGER:
+				r->resource_type = XtRInt;
+				r->default_type = XtRInt;
+				r->resource_size = sizeof(int);
+				r->default_addr = &(a->default_val.int_value);
+				rcount++;
+				break;
+			case PCB_HATT_COORD:
+				r->resource_type = XmStrCast(XtRPCBCoord);
+				r->default_type = XmStrCast(XtRPCBCoord);
+				r->resource_size = sizeof(pcb_coord_t);
+				r->default_addr = &(a->default_val.coord_value);
+				rcount++;
+				break;
+			case PCB_HATT_REAL:
+				r->resource_type = XmStrCast(XtRDouble);
+				r->default_type = XmStrCast(XtRDouble);
+				r->resource_size = sizeof(double);
+				r->default_addr = &(a->default_val.real_value);
+				rcount++;
+				break;
+			case PCB_HATT_STRING:
+			case PCB_HATT_PATH:
+				r->resource_type = XtRString;
+				r->default_type = XtRString;
+				r->resource_size = sizeof(char *);
+				r->default_addr = (char *) a->default_val.str_value;
+				rcount++;
+				break;
+			case PCB_HATT_BOOL:
+				r->resource_type = XtRBoolean;
+				r->default_type = XtRInt;
+				r->resource_size = sizeof(int);
+				r->default_addr = &(a->default_val.int_value);
+				rcount++;
+				break;
+			default:
+				break;
+			}
+		}
+#if 0
+	for (i = 0; i < XtNumber(lesstif_resources); i++) {
+		XtResource *r = new_resources + rcount;
+		r->resource_offset = sizeof(val_union) * rcount;
+		rcount++;
+	}
+#endif
+
+	stdarg_n = 0;
+	stdarg(XmNdeleteResponse, XmDO_NOTHING);
+
+	XtSetErrorMsgHandler(lesstif_err_msg);
+	err = setjmp(lesstif_err_jmp);
+	if (err != 0)
+		return err;
+	appwidget = XtAppInitialize(&app_context, "Pcb", new_options, amax, argc, *argv, 0, stdarg_args, stdarg_n);
+	if (appwidget == NULL)
+		return 1;
+	XtSetErrorMsgHandler(NULL); /* restore the default handler */
+
+	display = XtDisplay(appwidget);
+	screen_s = XtScreen(appwidget);
+	screen = XScreenNumberOfScreen(screen_s);
+	lesstif_colormap = XDefaultColormap(display, screen);
+
+	close_atom = XmInternAtom(display, XmStrCast("WM_DELETE_WINDOW"), 0);
+	XmAddWMProtocolCallback(appwidget, close_atom, (XtCallbackProc) mainwind_delete_cb, 0);
+
+	/*  XSynchronize(display, True); */
+
+	XtGetApplicationResources(appwidget, new_values, new_resources, rmax, 0, 0);
+
+#ifdef HAVE_XRENDER
+	use_xrender = XRenderQueryExtension(display, &render_event, &render_error) &&
+		XRenderFindVisualFormat(display, DefaultVisual(display, screen));
+#ifdef HAVE_XINERAMA
+	/* Xinerama and XRender don't get along well */
+	if (XineramaQueryExtension(display, &render_event, &render_error)
+			&& XineramaIsActive(display))
+		use_xrender = 0;
+#endif /* HAVE_XINERAMA */
+#endif /* HAVE_XRENDER */
+
+	rcount = 0;
+	for (ha = hid_attr_nodes; ha; ha = ha->next)
+		for (i = 0; i < ha->n; i++) {
+			pcb_hid_attribute_t *a = ha->attributes + i;
+			val_union *v = new_values + rcount;
+			switch (a->type) {
+			case PCB_HATT_INTEGER:
+				if (a->value)
+					*(int *) a->value = v->i;
+				else
+					a->default_val.int_value = v->i;
+				rcount++;
+				break;
+			case PCB_HATT_COORD:
+				if (a->value)
+					*(pcb_coord_t *) a->value = v->c;
+				else
+					a->default_val.coord_value = v->c;
+				rcount++;
+				break;
+			case PCB_HATT_BOOL:
+				if (a->value)
+					*(char *) a->value = v->i;
+				else
+					a->default_val.int_value = v->i;
+				rcount++;
+				break;
+			case PCB_HATT_REAL:
+				if (a->value)
+					*(double *) a->value = v->f;
+				else
+					a->default_val.real_value = v->f;
+				rcount++;
+				break;
+			case PCB_HATT_STRING:
+			case PCB_HATT_PATH:
+				if (a->value)
+					*(char **) a->value = v->s;
+				else
+					a->default_val.str_value = v->s;
+				rcount++;
+				break;
+			default:
+				break;
+			}
+		}
+
+	pcb_hid_parse_command_line(argc, argv);
+
+	/* redefine lesstif_colormap, if requested via "-install" */
+	if (use_private_colormap) {
+		lesstif_colormap = XCopyColormapAndFree(display, lesstif_colormap);
+		XtVaSetValues(appwidget, XtNcolormap, lesstif_colormap, NULL);
+	}
+
+	/* listen on standard input for actions */
+	if (stdin_listen) {
+		XtAppAddInput(app_context, pcb_fileno(stdin), (XtPointer) XtInputReadMask, lesstif_listener_cb, NULL);
+	}
+	return 0;
+}
+
+static void draw_grid()
+{
+	static XPoint *points = 0;
+	static int npoints = 0;
+	pcb_coord_t x1, y1, x2, y2, prevx;
+	pcb_coord_t x, y;
+	int n;
+	static GC grid_gc = 0;
+
+	if (!conf_core.editor.draw_grid)
+		return;
+	if (Vz(PCB->Grid) < PCB_MIN_GRID_DISTANCE)
+		return;
+	if (!grid_gc) {
+		grid_gc = XCreateGC(display, window, 0, 0);
+		XSetFunction(display, grid_gc, GXxor);
+		XSetForeground(display, grid_gc, grid_color);
+	}
+	if (conf_core.editor.view.flip_x) {
+		x2 = pcb_grid_fit(Px(0), PCB->Grid, PCB->GridOffsetX);
+		x1 = pcb_grid_fit(Px(view_width), PCB->Grid, PCB->GridOffsetX);
+		if (Vx(x2) < 0)
+			x2 -= PCB->Grid;
+		if (Vx(x1) >= view_width)
+			x1 += PCB->Grid;
+	}
+	else {
+		x1 = pcb_grid_fit(Px(0), PCB->Grid, PCB->GridOffsetX);
+		x2 = pcb_grid_fit(Px(view_width), PCB->Grid, PCB->GridOffsetX);
+		if (Vx(x1) < 0)
+			x1 += PCB->Grid;
+		if (Vx(x2) >= view_width)
+			x2 -= PCB->Grid;
+	}
+	if (conf_core.editor.view.flip_y) {
+		y2 = pcb_grid_fit(Py(0), PCB->Grid, PCB->GridOffsetY);
+		y1 = pcb_grid_fit(Py(view_height), PCB->Grid, PCB->GridOffsetY);
+		if (Vy(y2) < 0)
+			y2 -= PCB->Grid;
+		if (Vy(y1) >= view_height)
+			y1 += PCB->Grid;
+	}
+	else {
+		y1 = pcb_grid_fit(Py(0), PCB->Grid, PCB->GridOffsetY);
+		y2 = pcb_grid_fit(Py(view_height), PCB->Grid, PCB->GridOffsetY);
+		if (Vy(y1) < 0)
+			y1 += PCB->Grid;
+		if (Vy(y2) >= view_height)
+			y2 -= PCB->Grid;
+	}
+	n = (x2 - x1) / PCB->Grid + 1;
+	if (n > npoints) {
+		npoints = n + 10;
+		points = (XPoint *) realloc(points, npoints * sizeof(XPoint));
+	}
+	n = 0;
+	prevx = 0;
+	for (x = x1; x <= x2; x += PCB->Grid) {
+		int temp = Vx(x);
+		points[n].x = temp;
+		if (n) {
+			points[n].x -= prevx;
+			points[n].y = 0;
+		}
+		prevx = temp;
+		n++;
+	}
+	for (y = y1; y <= y2; y += PCB->Grid) {
+		int vy = Vy(y);
+		points[0].y = vy;
+		XDrawPoints(display, pixmap, grid_gc, points, n, CoordModePrevious);
+	}
+}
+
+static void mark_delta_to_widget(pcb_coord_t dx, pcb_coord_t dy, Widget w)
+{
+	char *buf;
+	double g = pcb_coord_to_unit(conf_core.editor.grid_unit, PCB->Grid);
+	int prec;
+	XmString ms;
+
+	/* Integer-sized grid? */
+	if (((int) (g * 10000 + 0.5) % 10000) == 0)
+		prec = 0;
+	else
+		prec = conf_core.editor.grid_unit->default_prec;
+
+	if (dx == 0 && dy == 0)
+		buf = pcb_strdup_printf("%m+%+.*mS, %+.*mS", UUNIT, prec, dx, prec, dy);
+	else {
+		pcb_angle_t angle = atan2(dy, -dx) * 180 / M_PI;
+		pcb_coord_t dist = pcb_distance(0, 0, dx, dy);
+
+		buf = pcb_strdup_printf("%m+%+.*mS, %+.*mS (%.*mS, %.2f\260)", UUNIT, prec, dx, prec, dy, prec, dist, angle);
+	}
+
+	ms = XmStringCreatePCB(buf);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, ms);
+	XtSetValues(w, stdarg_args, stdarg_n);
+	free(buf);
+}
+
+static int cursor_pos_to_widget(pcb_coord_t x, pcb_coord_t y, Widget w, int prev_state)
+{
+	int this_state = prev_state;
+	char *buf = NULL;
+	const char *msg = "";
+	double g = pcb_coord_to_unit(conf_core.editor.grid_unit, PCB->Grid);
+	XmString ms;
+	int prec;
+
+	/* Determine necessary precision (and state) based
+	 * on the user's grid setting */
+	if (((int) (g * 10000 + 0.5) % 10000) == 0) {
+		prec = 0;
+		this_state = conf_core.editor.grid_unit->allow;
+	}
+	else {
+		prec = conf_core.editor.grid_unit->default_prec;
+		this_state = -conf_core.editor.grid_unit->allow;
+	}
+
+	if (x >= 0) {
+		buf = pcb_strdup_printf("%m+%.*mS, %.*mS", UUNIT, prec, x, prec, y);
+		msg = buf;
+	}
+
+	ms = XmStringCreatePCB(msg);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, ms);
+	XtSetValues(w, stdarg_args, stdarg_n);
+	free(buf);
+	return this_state;
+}
+
+void lesstif_update_status_line()
+{
+	const char *msg = "";
+	char *buf = NULL;
+	const char *s45 = cur_clip();
+	XmString xs;
+
+	switch (conf_core.editor.mode) {
+	case PCB_MODE_VIA:
+		buf = pcb_strdup_printf("%m+%.2mS/%.2mS \370=%.2mS", UUNIT, conf_core.design.via_thickness, conf_core.design.clearance, conf_core.design.via_drilling_hole);
+		break;
+	case PCB_MODE_LINE:
+	case PCB_MODE_ARC:
+		buf = pcb_strdup_printf("%m+%.2mS/%.2mS %s", UUNIT, conf_core.design.line_thickness, conf_core.design.clearance, s45);
+		break;
+	case PCB_MODE_RECTANGLE:
+	case PCB_MODE_POLYGON:
+		buf = pcb_strdup_printf("%m+%.2mS %s", UUNIT, conf_core.design.clearance, s45);
+		break;
+	case PCB_MODE_TEXT:
+		buf = pcb_strdup_printf("%d %%", conf_core.design.text_scale);
+		break;
+	case PCB_MODE_MOVE:
+	case PCB_MODE_COPY:
+	case PCB_MODE_INSERT_POINT:
+	case PCB_MODE_RUBBERBAND_MOVE:
+		if (s45 != NULL)
+			buf = pcb_strdup(s45);
+		break;
+	case PCB_MODE_NO:
+	case PCB_MODE_PASTE_BUFFER:
+	case PCB_MODE_ROTATE:
+	case PCB_MODE_REMOVE:
+	case PCB_MODE_THERMAL:
+	case PCB_MODE_ARROW:
+	case PCB_MODE_LOCK:
+	default:
+		break;
+	}
+
+	if (buf != NULL) {
+		msg = buf;
+	}
+	xs = XmStringCreatePCB(msg);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, xs);
+	XtSetValues(m_status, stdarg_args, stdarg_n);
+	free(buf);
+}
+
+
+static Boolean idle_proc(XtPointer dummy)
+{
+	if (need_redraw) {
+		int mx, my;
+		pcb_hid_expose_ctx_t ctx;
+
+		pixmap = main_pixmap;
+		mx = view_width;
+		my = view_height;
+		ctx.view.X1 = Px(0);
+		ctx.view.Y1 = Py(0);
+		ctx.view.X2 = Px(view_width);
+		ctx.view.Y2 = Py(view_height);
+		if (conf_core.editor.view.flip_x) {
+			pcb_coord_t tmp = ctx.view.X1;
+			ctx.view.X1 = ctx.view.X2;
+			ctx.view.X2 = tmp;
+		}
+		if (conf_core.editor.view.flip_y) {
+			pcb_coord_t tmp = ctx.view.Y1;
+			ctx.view.Y1 = ctx.view.Y2;
+			ctx.view.Y2 = tmp;
+		}
+		XSetForeground(display, bg_gc, bgcolor);
+		XFillRectangle(display, main_pixmap, bg_gc, 0, 0, mx, my);
+
+		if (ctx.view.X1 < 0 || ctx.view.Y1 < 0 || ctx.view.X2 > PCB->MaxWidth || ctx.view.Y2 > PCB->MaxHeight) {
+			int leftmost, rightmost, topmost, bottommost;
+
+			leftmost = Vx(0);
+			rightmost = Vx(PCB->MaxWidth);
+			topmost = Vy(0);
+			bottommost = Vy(PCB->MaxHeight);
+			if (leftmost > rightmost) {
+				int t = leftmost;
+				leftmost = rightmost;
+				rightmost = t;
+			}
+			if (topmost > bottommost) {
+				int t = topmost;
+				topmost = bottommost;
+				bottommost = t;
+			}
+			if (leftmost < 0)
+				leftmost = 0;
+			if (topmost < 0)
+				topmost = 0;
+			if (rightmost > view_width)
+				rightmost = view_width;
+			if (bottommost > view_height)
+				bottommost = view_height;
+
+			XSetForeground(display, bg_gc, offlimit_color);
+
+			/* L T R
+			   L x R
+			   L B R */
+
+			if (leftmost > 0) {
+				XFillRectangle(display, main_pixmap, bg_gc, 0, 0, leftmost, view_height);
+			}
+			if (rightmost < view_width) {
+				XFillRectangle(display, main_pixmap, bg_gc, rightmost + 1, 0, view_width - rightmost + 1, view_height);
+			}
+			if (topmost > 0) {
+				XFillRectangle(display, main_pixmap, bg_gc, leftmost, 0, rightmost - leftmost + 1, topmost);
+			}
+			if (bottommost < view_height) {
+				XFillRectangle(display, main_pixmap, bg_gc, leftmost, bottommost + 1,
+											 rightmost - leftmost + 1, view_height - bottommost + 1);
+			}
+		}
+		DrawBackgroundImage();
+		pcb_hid_expose_all(&lesstif_hid, &ctx);
+		lesstif_drawing_mode = PCB_HID_COMP_POSITIVE;
+		draw_grid();
+		show_crosshair(0);					/* To keep the drawn / not drawn info correct */
+		XSetFunction(display, my_gc, GXcopy);
+		XCopyArea(display, main_pixmap, window, my_gc, 0, 0, view_width, view_height, 0, 0);
+		pixmap = window;
+		need_redraw = 0;
+		if (crosshair_on) {
+			pcb_draw_attached(1);
+			pcb_draw_mark(1);
+		}
+	}
+
+	{
+		static int c_x = -2, c_y = -2;
+		static pcb_mark_t saved_mark;
+		static const pcb_unit_t *old_grid_unit = NULL;
+		if (crosshair_x != c_x || crosshair_y != c_y
+				|| conf_core.editor.grid_unit != old_grid_unit || memcmp(&saved_mark, &pcb_marked, sizeof(pcb_mark_t))) {
+			static int last_state = 0;
+			static int this_state = 0;
+
+			c_x = crosshair_x;
+			c_y = crosshair_y;
+
+			this_state = cursor_pos_to_widget(crosshair_x, crosshair_y, m_crosshair, this_state);
+			if (pcb_marked.status)
+				mark_delta_to_widget(crosshair_x - pcb_marked.X, crosshair_y - pcb_marked.Y, m_mark);
+
+			if (pcb_marked.status != saved_mark.status) {
+				if (pcb_marked.status) {
+					XtManageChild(XtParent(m_mark));
+					XtManageChild(m_mark);
+					stdarg_n = 0;
+					stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+					stdarg(XmNleftWidget, XtParent(m_mark));
+					XtSetValues(XtParent(m_crosshair), stdarg_args, stdarg_n);
+				}
+				else {
+					stdarg_n = 0;
+					stdarg(XmNleftAttachment, XmATTACH_FORM);
+					XtSetValues(XtParent(m_crosshair), stdarg_args, stdarg_n);
+					XtUnmanageChild(XtParent(m_mark));
+				}
+				last_state = this_state + 100;
+			}
+			memcpy(&saved_mark, &pcb_marked, sizeof(pcb_mark_t));
+
+			if (old_grid_unit != conf_core.editor.grid_unit) {
+				old_grid_unit = conf_core.editor.grid_unit;
+				/* Force a resize on units change.  */
+				last_state++;
+			}
+
+			/* This is obtuse.  We want to enable XmRESIZE_ANY long enough
+			   to shrink to fit the new format (if any), then switch it
+			   back to XmRESIZE_GROW to prevent it from shrinking due to
+			   changes in the number of actual digits printed.  Thus, when
+			   you switch from a small grid and %.2f formats to a large
+			   grid and %d formats, you aren't punished with a wide and
+			   mostly white-space label widget.  "this_state" indicates
+			   which of the above formats we're using.  "last_state" is
+			   either zero (when resizing) or the same as "this_state"
+			   (when grow-only), or a non-zero but not "this_state" which
+			   means we need to start a resize cycle.  */
+			if (this_state != last_state && last_state) {
+				stdarg_n = 0;
+				stdarg(XmNresizePolicy, XmRESIZE_ANY);
+				XtSetValues(XtParent(m_mark), stdarg_args, stdarg_n);
+				XtSetValues(XtParent(m_crosshair), stdarg_args, stdarg_n);
+				last_state = 0;
+			}
+			else if (this_state != last_state) {
+				stdarg_n = 0;
+				stdarg(XmNresizePolicy, XmRESIZE_GROW);
+				XtSetValues(XtParent(m_mark), stdarg_args, stdarg_n);
+				XtSetValues(XtParent(m_crosshair), stdarg_args, stdarg_n);
+				last_state = this_state;
+			}
+		}
+	}
+
+	{
+		static pcb_coord_t old_grid = -1;
+		static pcb_coord_t old_gx, old_gy;
+		static const pcb_unit_t *old_unit;
+		XmString ms;
+		if (PCB->Grid != old_grid || PCB->GridOffsetX != old_gx || PCB->GridOffsetY != old_gy || conf_core.editor.grid_unit != old_unit) {
+			static char buf[100];
+			old_grid = PCB->Grid;
+			old_unit = conf_core.editor.grid_unit;
+			old_gx = PCB->GridOffsetX;
+			old_gy = PCB->GridOffsetY;
+			if (old_grid == 1) {
+				strcpy(buf, "No Grid");
+			}
+			else {
+				if (old_gx || old_gy)
+					pcb_snprintf(buf, sizeof(buf), "%m+%$mS @%mS,%mS", UUNIT, old_grid, old_gx, old_gy);
+				else
+					pcb_snprintf(buf, sizeof(buf), "%m+%$mS", UUNIT, old_grid);
+			}
+			ms = XmStringCreatePCB(buf);
+			stdarg_n = 0;
+			stdarg(XmNlabelString, ms);
+			XtSetValues(m_grid, stdarg_args, stdarg_n);
+		}
+	}
+
+	{
+		static double old_zoom = -1;
+		static const pcb_unit_t *old_grid_unit = NULL;
+		if (view_zoom != old_zoom || conf_core.editor.grid_unit != old_grid_unit) {
+			char *buf = pcb_strdup_printf("%m+%$mS/pix",
+																			 conf_core.editor.grid_unit->allow, (pcb_coord_t) view_zoom);
+			XmString ms;
+
+			old_zoom = view_zoom;
+			old_grid_unit = conf_core.editor.grid_unit;
+
+			ms = XmStringCreatePCB(buf);
+			stdarg_n = 0;
+			stdarg(XmNlabelString, ms);
+			XtSetValues(m_zoom, stdarg_args, stdarg_n);
+			free(buf);
+		}
+	}
+
+	{
+		if (old_cursor_mode != conf_core.editor.mode) {
+			const char *s = "None";
+			XmString ms;
+			int cursor = -1;
+			static int free_cursor = 0;
+
+			old_cursor_mode = conf_core.editor.mode;
+			switch (conf_core.editor.mode) {
+			case PCB_MODE_NO:
+				s = "None";
+				cursor = XC_X_cursor;
+				break;
+			case PCB_MODE_VIA:
+				s = "Via";
+				cursor = -1;
+				break;
+			case PCB_MODE_LINE:
+				s = "Line";
+				cursor = XC_pencil;
+				break;
+			case PCB_MODE_RECTANGLE:
+				s = "Rectangle";
+				cursor = XC_ul_angle;
+				break;
+			case PCB_MODE_POLYGON:
+				s = "Polygon";
+				cursor = XC_sb_up_arrow;
+				break;
+			case PCB_MODE_POLYGON_HOLE:
+				s = "Polygon Hole";
+				cursor = XC_sb_up_arrow;
+				break;
+			case PCB_MODE_PASTE_BUFFER:
+				s = "Paste";
+				cursor = XC_hand1;
+				break;
+			case PCB_MODE_TEXT:
+				s = "Text";
+				cursor = XC_xterm;
+				break;
+			case PCB_MODE_ROTATE:
+				s = "Rotate";
+				cursor = XC_exchange;
+				break;
+			case PCB_MODE_REMOVE:
+				s = "Remove";
+				cursor = XC_pirate;
+				break;
+			case PCB_MODE_MOVE:
+				s = "Move";
+				cursor = XC_crosshair;
+				break;
+			case PCB_MODE_COPY:
+				s = "Copy";
+				cursor = XC_crosshair;
+				break;
+			case PCB_MODE_INSERT_POINT:
+				s = "Insert";
+				cursor = XC_dotbox;
+				break;
+			case PCB_MODE_RUBBERBAND_MOVE:
+				s = "RBMove";
+				cursor = XC_top_left_corner;
+				break;
+			case PCB_MODE_THERMAL:
+				s = "Thermal";
+				cursor = XC_iron_cross;
+				break;
+			case PCB_MODE_ARC:
+				s = "Arc";
+				cursor = XC_question_arrow;
+				break;
+			case PCB_MODE_ARROW:
+				s = "Arrow";
+				if (over_point)
+					cursor = XC_draped_box;
+				else
+					cursor = XC_left_ptr;
+				break;
+			case PCB_MODE_LOCK:
+				s = "Lock";
+				cursor = XC_hand2;
+				break;
+			}
+			ms = XmStringCreatePCB(s);
+			stdarg_n = 0;
+			stdarg(XmNlabelString, ms);
+			XtSetValues(m_mode, stdarg_args, stdarg_n);
+
+			if (free_cursor) {
+				XFreeCursor(display, my_cursor);
+				free_cursor = 0;
+			}
+			if (cursor == -1) {
+				static Pixmap nocur_source = 0;
+				static Pixmap nocur_mask = 0;
+				static Cursor nocursor = 0;
+				if (nocur_source == 0) {
+					XColor fg, bg;
+					nocur_source = XCreateBitmapFromData(display, window, "\0", 1, 1);
+					nocur_mask = XCreateBitmapFromData(display, window, "\0", 1, 1);
+
+					fg.red = fg.green = fg.blue = 65535;
+					bg.red = bg.green = bg.blue = 0;
+					fg.flags = bg.flags = DoRed | DoGreen | DoBlue;
+					nocursor = XCreatePixmapCursor(display, nocur_source, nocur_mask, &fg, &bg, 0, 0);
+				}
+				my_cursor = nocursor;
+			}
+			else {
+				my_cursor = XCreateFontCursor(display, cursor);
+				free_cursor = 1;
+			}
+			XDefineCursor(display, window, my_cursor);
+			lesstif_update_status_line();
+		}
+	}
+	{
+		static const char *old_clip = NULL;
+		static int old_tscale = -1;
+		const char *new_clip = cur_clip();
+
+		if (new_clip != old_clip || conf_core.design.text_scale != old_tscale) {
+			lesstif_update_status_line();
+			old_clip = new_clip;
+			old_tscale = conf_core.design.text_scale;
+		}
+	}
+
+	{
+		static int old_nrats = -1;
+		static char buf[20];
+
+		if (old_nrats != ratlist_length(&PCB->Data->Rat)) {
+			old_nrats = ratlist_length(&PCB->Data->Rat);
+			sprintf(buf, "%ld rat%s", (long)ratlist_length(&PCB->Data->Rat), ratlist_length(&PCB->Data->Rat) == 1 ? "" : "s");
+			if (ratlist_length(&PCB->Data->Rat)) {
+				XtManageChild(XtParent(m_rats));
+				XtManageChild(m_rats);
+				stdarg_n = 0;
+				stdarg(XmNleftWidget, m_rats);
+				XtSetValues(XtParent(m_status), stdarg_args, stdarg_n);
+			}
+
+			stdarg_n = 0;
+			stdarg(XmNlabelString, XmStringCreatePCB(buf));
+			XtSetValues(m_rats, stdarg_args, stdarg_n);
+
+			if (!ratlist_length(&PCB->Data->Rat)) {
+				stdarg_n = 0;
+				stdarg(XmNleftWidget, m_mode);
+				XtSetValues(XtParent(m_status), stdarg_args, stdarg_n);
+				XtUnmanageChild(XtParent(m_rats));
+			}
+		}
+	}
+
+#warning TODO: remove this, update-on should handle all cases
+	lesstif_update_widget_flags(NULL);
+
+	show_crosshair(1);
+	idle_proc_set = 0;
+	return True;
+}
+
+void lesstif_need_idle_proc()
+{
+	if (idle_proc_set || window == 0)
+		return;
+	XtAppAddWorkProc(app_context, idle_proc, 0);
+	idle_proc_set = 1;
+}
+
+static void lesstif_invalidate_lr(pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+{
+	if (!window)
+		return;
+
+	need_redraw = 1;
+	need_idle_proc();
+}
+
+void lesstif_invalidate_all(void)
+{
+	lesstif_invalidate_lr(0, PCB->MaxWidth, 0, PCB->MaxHeight);
+}
+
+static void lesstif_notify_crosshair_change(pcb_bool changes_complete)
+{
+	static int invalidate_depth = 0;
+	Pixmap save_pixmap;
+
+	if (!my_gc)
+		return;
+
+	if (changes_complete)
+		invalidate_depth--;
+
+	if (invalidate_depth < 0) {
+		invalidate_depth = 0;
+		/* A mismatch of changes_complete == pcb_false and == pcb_true notifications
+		 * is not expected to occur, but we will try to handle it gracefully.
+		 * As we know the crosshair will have been shown already, we must
+		 * repaint the entire view to be sure not to leave an artaefact.
+		 */
+		need_redraw = 1;
+		need_idle_proc();
+		return;
+	}
+
+	if (invalidate_depth == 0 && crosshair_on) {
+		save_pixmap = pixmap;
+		pixmap = window;
+		pcb_draw_attached(1);
+		pixmap = save_pixmap;
+	}
+
+	if (!changes_complete)
+		invalidate_depth++;
+}
+
+static void lesstif_notify_mark_change(pcb_bool changes_complete)
+{
+	static int invalidate_depth = 0;
+	Pixmap save_pixmap;
+
+	if (changes_complete)
+		invalidate_depth--;
+
+	if (invalidate_depth < 0) {
+		invalidate_depth = 0;
+		/* A mismatch of changes_complete == pcb_false and == pcb_true notifications
+		 * is not expected to occur, but we will try to handle it gracefully.
+		 * As we know the mark will have been shown already, we must
+		 * repaint the entire view to be sure not to leave an artaefact.
+		 */
+		need_idle_proc();
+		return;
+	}
+
+	if (invalidate_depth == 0 && crosshair_on) {
+		save_pixmap = pixmap;
+		pixmap = window;
+		pcb_draw_mark(1);
+		pixmap = save_pixmap;
+	}
+
+	if (!changes_complete)
+		invalidate_depth++;
+}
+
+static int lesstif_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	int idx = group;
+	if (idx >= 0 && idx < pcb_max_group(PCB)) {
+		int n = PCB->LayerGroups.grp[group].len;
+		for (idx = 0; idx < n - 1; idx++) {
+			int ni = PCB->LayerGroups.grp[group].lid[idx];
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].meta.real.vis)
+				break;
+		}
+		idx = PCB->LayerGroups.grp[group].lid[idx];
+#if 0
+		if (idx == pcb_layer_stack[0]
+				|| pcb_layer_get_group(PCB, idx) == pcb_layer_get_group(PCB, pcb_layer_stack[0]))
+			autofade = 0;
+		else
+			autofade = 1;
+#endif
+	}
+#if 0
+	else
+		autofade = 0;
+#endif
+
+	if ((flags & PCB_LYT_MASK) || (flags & PCB_LYT_PASTE)) {
+		if (pinout)
+			return 0;
+		return (PCB->Data->Layer[idx].meta.real.vis && PCB_LAYERFLG_ON_VISIBLE_SIDE(flags));
+	}
+
+	if (flags & PCB_LYT_COPPER)
+		return pinout ? 1 : PCB->Data->Layer[idx].meta.real.vis;
+
+	/* virtual layers */
+	{
+		switch (flags & PCB_LYT_ANYTHING) {
+		case PCB_LYT_INVIS:
+			return pinout ? 0 : PCB->InvisibleObjectsOn;
+		case PCB_LYT_SILK:
+			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
+				return pcb_silk_on(PCB);
+			return 0;
+		case PCB_LYT_ASSY:
+			return 0;
+		case PCB_LYT_UDRILL:
+		case PCB_LYT_PDRILL:
+			return 1;
+		case PCB_LYT_UI:
+			return 1;
+		case PCB_LYT_RAT:
+			return PCB->RatOn;
+		}
+	}
+	return 0;
+}
+
+static pcb_hid_gc_t lesstif_make_gc(void)
+{
+	pcb_hid_gc_t rv = (hid_gc_s *) malloc(sizeof(hid_gc_s));
+	memset(rv, 0, sizeof(hid_gc_s));
+	rv->me_pointer = &lesstif_hid;
+	rv->colorname = NULL;
+	return rv;
+}
+
+static void lesstif_destroy_gc(pcb_hid_gc_t gc)
+{
+	if (gc->colorname != NULL)
+		free(gc->colorname);
+	free(gc);
+}
+
+static void lesstif_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	pcb_gui->coord_per_pix = view_zoom;
+}
+
+static void lesstif_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *drw_screen)
+{
+	lesstif_drawing_mode = op;
+
+	lesstif_direct = direct;
+	if (direct) {
+		pixmap = main_pixmap;
+		return;
+	}
+
+	switch(op) {
+		case PCB_HID_COMP_RESET:
+			if (mask_pixmap == 0) {
+				mask_pixmap = XCreatePixmap(display, window, pixmap_w, pixmap_h, XDefaultDepth(display, screen));
+				mask_bitmap = XCreatePixmap(display, window, pixmap_w, pixmap_h, 1);
+			}
+			pixmap = mask_pixmap;
+			XSetForeground(display, my_gc, 0);
+			XSetFunction(display, my_gc, GXcopy);
+			XFillRectangle(display, mask_pixmap, my_gc, 0, 0, view_width, view_height);
+			XFillRectangle(display, mask_bitmap, bclear_gc, 0, 0, view_width, view_height);
+			mask_gc = bset_gc;
+			break;
+
+		case PCB_HID_COMP_POSITIVE:
+		case PCB_HID_COMP_POSITIVE_XOR:
+			mask_gc = bset_gc;
+			break;
+
+		case PCB_HID_COMP_NEGATIVE:
+			mask_gc = bclear_gc;
+			break;
+
+		case PCB_HID_COMP_FLUSH:
+			pixmap = main_pixmap;
+
+			/* blit back the result */
+#ifdef HAVE_XRENDER
+			if (use_xrender) {
+				XRenderPictureAttributes pa;
+
+				pa.clip_mask = mask_bitmap;
+				XRenderChangePicture(display, main_picture, CPClipMask, &pa);
+				XRenderComposite(display, PictOpOver, mask_picture, pale_picture,
+					main_picture, 0, 0, 0, 0, 0, 0, view_width, view_height);
+			}
+			else
+#endif /* HAVE_XRENDER */
+			{
+				XSetClipMask(display, clip_gc, mask_bitmap);
+				XCopyArea(display, mask_pixmap, main_pixmap, clip_gc, 0, 0, view_width, view_height, 0, 0);
+			}
+			break;
+	}
+}
+
+
+
+static void lesstif_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	static void *cache = 0;
+	pcb_hidval_t cval;
+	static XColor color, exact_color;
+
+	if (!display)
+		return;
+	if (!name)
+		name = "red";
+
+	if (name != gc->colorname) {
+		if (gc->colorname != NULL)
+			free(gc->colorname);
+		gc->colorname = pcb_strdup(name);
+	}
+
+	if (strcmp(name, "drill") == 0) {
+		gc->color = offlimit_color;
+		gc->erase = 0;
+	}
+	else if (pcb_hid_cache_color(0, name, &cval, &cache)) {
+		gc->color = cval.lval;
+		gc->erase = 0;
+	}
+	else {
+		if (!XAllocNamedColor(display, lesstif_colormap, name, &color, &exact_color))
+			color.pixel = WhitePixel(display, screen);
+#if 0
+		printf("lesstif_set_color `%s' %08x rgb/%d/%d/%d\n", name, color.pixel, color.red, color.green, color.blue);
+#endif
+		cval.lval = gc->color = color.pixel;
+		pcb_hid_cache_color(1, name, &cval, &cache);
+		gc->erase = 0;
+	}
+	if (autofade) {
+		static int lastcolor = -1, lastfade = -1;
+		if (gc->color == lastcolor)
+			gc->color = lastfade;
+		else {
+			lastcolor = gc->color;
+			color.pixel = gc->color;
+
+			XQueryColor(display, lesstif_colormap, &color);
+			color.red = (bgred + color.red) / 2;
+			color.green = (bggreen + color.green) / 2;
+			color.blue = (bgblue + color.blue) / 2;
+			XAllocColor(display, lesstif_colormap, &color);
+			lastfade = gc->color = color.pixel;
+		}
+	}
+}
+
+static void set_gc(pcb_hid_gc_t gc)
+{
+	int cap, join, width;
+	if (gc->me_pointer != &lesstif_hid) {
+		fprintf(stderr, "Fatal: GC from another HID passed to lesstif HID\n");
+		abort();
+	}
+#if 0
+	pcb_printf("set_gc c%s %08lx w%#mS c%d x%d e%d\n", gc->colorname, gc->color, gc->width, gc->cap, gc->xor_set, gc->erase);
+#endif
+	switch (gc->cap) {
+	case pcb_cap_square:
+		cap = CapProjecting;
+		join = JoinMiter;
+		break;
+	case pcb_cap_round:
+		cap = CapRound;
+		join = JoinRound;
+		break;
+	default:
+		assert(!"unhandled cap");
+		cap = CapRound;
+		join = JoinRound;
+	}
+	if (gc->xor_set) {
+		XSetFunction(display, my_gc, GXxor);
+		XSetForeground(display, my_gc, gc->color ^ bgcolor);
+	}
+	else if (gc->erase) {
+		XSetFunction(display, my_gc, GXcopy);
+		XSetForeground(display, my_gc, offlimit_color);
+	}
+	else {
+		XSetFunction(display, my_gc, GXcopy);
+		XSetForeground(display, my_gc, gc->color);
+	}
+	width = Vw(gc->width);
+	if (width < 0)
+		width = 0;
+	XSetLineAttributes(display, my_gc, width, LineSolid, cap, join);
+	if (use_mask()) {
+		XSetLineAttributes(display, mask_gc, width, LineSolid, cap, join);
+	}
+}
+
+static void lesstif_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	gc->cap = style;
+}
+
+static void lesstif_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	gc->width = width;
+}
+
+static void lesstif_set_draw_xor(pcb_hid_gc_t gc, int xor_set)
+{
+	gc->xor_set = xor_set;
+}
+
+#define ISORT(a,b) if (a>b) { a^=b; b^=a; a^=b; }
+
+static void lesstif_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double dx1, dy1, dx2, dy2;
+	int vw = Vw(gc->width);
+	if ((pinout || conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) && gc->erase)
+		return;
+#if 0
+	pcb_printf("draw_line %#mD-%#mD @%#mS", x1, y1, x2, y2, gc->width);
+#endif
+	dx1 = Vx(x1);
+	dy1 = Vy(y1);
+	dx2 = Vx(x2);
+	dy2 = Vy(y2);
+#if 0
+	pcb_printf(" = %#mD-%#mD %s\n", x1, y1, x2, y2, gc->colorname);
+#endif
+
+#if 1
+	if (!pcb_line_clip(0, 0, view_width, view_height, &dx1, &dy1, &dx2, &dy2, vw))
+		return;
+#endif
+
+	x1 = dx1;
+	y1 = dy1;
+	x2 = dx2;
+	y2 = dy2;
+
+	set_gc(gc);
+	if (gc->cap == pcb_cap_square && x1 == x2 && y1 == y2) {
+		XFillRectangle(display, pixmap, my_gc, x1 - vw / 2, y1 - vw / 2, vw, vw);
+		if (use_mask())
+			XFillRectangle(display, mask_bitmap, mask_gc, x1 - vw / 2, y1 - vw / 2, vw, vw);
+	}
+	else {
+		XDrawLine(display, pixmap, my_gc, x1, y1, x2, y2);
+		if (use_mask())
+			XDrawLine(display, mask_bitmap, mask_gc, x1, y1, x2, y2);
+	}
+}
+
+static void lesstif_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	if ((pinout || conf_core.editor.thin_draw) && gc->erase)
+		return;
+#if 0
+	pcb_printf("draw_arc %#mD %#mSx%#mS s %d d %d", cx, cy, width, height, start_angle, delta_angle);
+#endif
+	width = Vz(width);
+	height = Vz(height);
+	cx = Vx(cx) - width;
+	cy = Vy(cy) - height;
+
+	if ((delta_angle >= 360.0) || (delta_angle <= -360.0)) {
+		start_angle = 0;
+		delta_angle = 360;
+	}
+
+	if (conf_core.editor.view.flip_x) {
+		start_angle = 180 - start_angle;
+		delta_angle = -delta_angle;
+	}
+	if (conf_core.editor.view.flip_y) {
+		start_angle = -start_angle;
+		delta_angle = -delta_angle;
+	}
+	start_angle = pcb_normalize_angle(start_angle);
+	if (start_angle >= 180)
+		start_angle -= 360;
+#if 0
+	pcb_printf(" = %#mD %#mSx%#mS %d %s\n", cx, cy, width, height, gc->width, gc->colorname);
+#endif
+	set_gc(gc);
+	XDrawArc(display, pixmap, my_gc, cx, cy, width * 2, height * 2, (start_angle + 180) * 64, delta_angle * 64);
+	if (use_mask() && !conf_core.editor.thin_draw)
+		XDrawArc(display, mask_bitmap, mask_gc, cx, cy, width * 2, height * 2, (start_angle + 180) * 64, delta_angle * 64);
+#warning TODO: make this #if a flag and add it in the gtk hid as well
+#if 0
+	/* Enable this if you want to see the center and radii of drawn
+	   arcs, for debugging.  */
+	if (conf_core.editor.thin_draw && (delta_angle != 360)) {
+		cx += width;
+		cy += height;
+		XDrawLine(display, pixmap, arc1_gc, cx, cy,
+							cx - width * cos(start_angle * M_PI / 180), cy + width * sin(start_angle * M_PI / 180));
+		XDrawLine(display, pixmap, arc2_gc, cx, cy,
+							cx - width * cos((start_angle + delta_angle) * M_PI / 180),
+							cy + width * sin((start_angle + delta_angle) * M_PI / 180));
+	}
+#endif
+}
+
+static void lesstif_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	int vw = Vw(gc->width);
+	if ((pinout || conf_core.editor.thin_draw) && gc->erase)
+		return;
+	x1 = Vx(x1);
+	y1 = Vy(y1);
+	x2 = Vx(x2);
+	y2 = Vy(y2);
+	if (x1 < -vw && x2 < -vw)
+		return;
+	if (y1 < -vw && y2 < -vw)
+		return;
+	if (x1 > view_width + vw && x2 > view_width + vw)
+		return;
+	if (y1 > view_height + vw && y2 > view_height + vw)
+		return;
+	if (x1 > x2) {
+		pcb_coord_t xt = x1;
+		x1 = x2;
+		x2 = xt;
+	}
+	if (y1 > y2) {
+		int yt = y1;
+		y1 = y2;
+		y2 = yt;
+	}
+	set_gc(gc);
+	XDrawRectangle(display, pixmap, my_gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+	if (use_mask())
+		XDrawRectangle(display, mask_bitmap, mask_gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+}
+
+static void lesstif_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	if (pinout && use_mask() && gc->erase)
+		return;
+	if ((conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) && gc->erase)
+		return;
+#if 0
+	pcb_printf("fill_circle %#mD %#mS", cx, cy, radius);
+#endif
+	radius = Vz(radius);
+	cx = Vx(cx) - radius;
+	cy = Vy(cy) - radius;
+	if (cx < -2 * radius || cx > view_width)
+		return;
+	if (cy < -2 * radius || cy > view_height)
+		return;
+#if 0
+	pcb_printf(" = %#mD %#mS %lx %s\n", cx, cy, radius, gc->color, gc->colorname);
+#endif
+	set_gc(gc);
+	XFillArc(display, pixmap, my_gc, cx, cy, radius * 2, radius * 2, 0, 360 * 64);
+	if (use_mask())
+		XFillArc(display, mask_bitmap, mask_gc, cx, cy, radius * 2, radius * 2, 0, 360 * 64);
+}
+
+/* Intentaional code duplication for performance */
+static void lesstif_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	static XPoint *p = 0;
+	static int maxp = 0;
+	int i;
+
+	if (maxp < n_coords) {
+		maxp = n_coords + 10;
+		if (p)
+			p = (XPoint *) realloc(p, maxp * sizeof(XPoint));
+		else
+			p = (XPoint *) malloc(maxp * sizeof(XPoint));
+	}
+
+	for (i = 0; i < n_coords; i++) {
+		p[i].x = Vx(x[i]);
+		p[i].y = Vy(y[i]);
+	}
+#if 0
+	printf("fill_polygon %d pts\n", n_coords);
+#endif
+	set_gc(gc);
+	XFillPolygon(display, pixmap, my_gc, p, n_coords, Complex, CoordModeOrigin);
+	if (use_mask())
+		XFillPolygon(display, mask_bitmap, mask_gc, p, n_coords, Complex, CoordModeOrigin);
+}
+
+/* Intentaional code duplication for performance */
+static void lesstif_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	static XPoint *p = 0;
+	static int maxp = 0;
+	int i;
+
+	if (maxp < n_coords) {
+		maxp = n_coords + 10;
+		if (p)
+			p = (XPoint *) realloc(p, maxp * sizeof(XPoint));
+		else
+			p = (XPoint *) malloc(maxp * sizeof(XPoint));
+	}
+
+	for (i = 0; i < n_coords; i++) {
+		p[i].x = Vx(x[i] + dx);
+		p[i].y = Vy(y[i] + dy);
+	}
+
+	set_gc(gc);
+	XFillPolygon(display, pixmap, my_gc, p, n_coords, Complex, CoordModeOrigin);
+	if (use_mask())
+		XFillPolygon(display, mask_bitmap, mask_gc, p, n_coords, Complex, CoordModeOrigin);
+}
+
+static void lesstif_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	int vw = Vw(gc->width);
+	if ((pinout || conf_core.editor.thin_draw) && gc->erase)
+		return;
+	x1 = Vx(x1);
+	y1 = Vy(y1);
+	x2 = Vx(x2);
+	y2 = Vy(y2);
+	if (x1 < -vw && x2 < -vw)
+		return;
+	if (y1 < -vw && y2 < -vw)
+		return;
+	if (x1 > view_width + vw && x2 > view_width + vw)
+		return;
+	if (y1 > view_height + vw && y2 > view_height + vw)
+		return;
+	if (x1 > x2) {
+		pcb_coord_t xt = x1;
+		x1 = x2;
+		x2 = xt;
+	}
+	if (y1 > y2) {
+		int yt = y1;
+		y1 = y2;
+		y2 = yt;
+	}
+	set_gc(gc);
+	XFillRectangle(display, pixmap, my_gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+	if (use_mask())
+		XFillRectangle(display, mask_bitmap, mask_gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+}
+
+static void lesstif_calibrate(double xval, double yval)
+{
+	CRASH("lesstif_calibrate");
+}
+
+static int lesstif_shift_is_pressed(void)
+{
+	return shift_pressed;
+}
+
+static int lesstif_control_is_pressed(void)
+{
+	return ctrl_pressed;
+}
+
+static int lesstif_mod1_is_pressed(void)
+{
+	return alt_pressed;
+}
+
+extern void lesstif_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force);
+
+static void lesstif_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+	if (crosshair_x != x || crosshair_y != y) {
+		lesstif_show_crosshair(0);
+		crosshair_x = x;
+		crosshair_y = y;
+		need_idle_proc();
+
+		if (mainwind
+				&& !in_move_event
+				&& (x < view_left_x
+						|| x > view_left_x + view_width * view_zoom || y < view_top_y || y > view_top_y + view_height * view_zoom)) {
+			view_left_x = x - (view_width * view_zoom) / 2;
+			view_top_y = y - (view_height * view_zoom) / 2;
+			lesstif_pan_fixup();
+		}
+
+	}
+
+	if (action == HID_SC_PAN_VIEWPORT) {
+		Window root, child;
+		unsigned int keys_buttons;
+		int pos_x, pos_y, root_x, root_y;
+		XQueryPointer(display, window, &root, &child, &root_x, &root_y, &pos_x, &pos_y, &keys_buttons);
+		if (conf_core.editor.view.flip_x)
+			view_left_x = x - (view_width - pos_x) * view_zoom;
+		else
+			view_left_x = x - pos_x * view_zoom;
+		if (conf_core.editor.view.flip_y)
+			view_top_y = y - (view_height - pos_y) * view_zoom;
+		else
+			view_top_y = y - pos_y * view_zoom;
+		lesstif_pan_fixup();
+		action = HID_SC_WARP_POINTER;
+	}
+	if (action == HID_SC_WARP_POINTER) {
+		in_move_event++;
+		XWarpPointer(display, None, window, 0, 0, 0, 0, Vx(x), Vy(y));
+		in_move_event--;
+	}
+}
+
+typedef struct {
+	void (*func) (pcb_hidval_t);
+	pcb_hidval_t user_data;
+	XtIntervalId id;
+} TimerStruct;
+
+static void lesstif_timer_cb(XtPointer * p, XtIntervalId * id)
+{
+	TimerStruct *ts = (TimerStruct *) p;
+	ts->func(ts->user_data);
+	free(ts);
+}
+
+static pcb_hidval_t lesstif_add_timer(void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	TimerStruct *t;
+	pcb_hidval_t rv;
+	t = (TimerStruct *) malloc(sizeof(TimerStruct));
+	rv.ptr = t;
+	t->func = func;
+	t->user_data = user_data;
+	t->id = XtAppAddTimeOut(app_context, milliseconds, (XtTimerCallbackProc) lesstif_timer_cb, t);
+	return rv;
+}
+
+static void lesstif_stop_timer(pcb_hidval_t hv)
+{
+	TimerStruct *ts = (TimerStruct *) hv.ptr;
+	XtRemoveTimeOut(ts->id);
+	free(ts);
+}
+
+
+typedef struct {
+	pcb_bool (*func) (pcb_hidval_t, int, unsigned int, pcb_hidval_t);
+	pcb_hidval_t user_data;
+	int fd;
+	XtInputId id;
+} WatchStruct;
+
+void lesstif_unwatch_file(pcb_hidval_t data)
+{
+	WatchStruct *watch = (WatchStruct *) data.ptr;
+	XtRemoveInput(watch->id);
+	free(watch);
+}
+
+	/* We need a wrapper around the hid file watch because to pass the correct flags
+	 */
+static void lesstif_watch_cb(XtPointer client_data, int *fid, XtInputId * id)
+{
+	unsigned int pcb_condition = 0;
+	struct pollfd fds;
+	short condition;
+	pcb_hidval_t x;
+	WatchStruct *watch = (WatchStruct *) client_data;
+
+	fds.fd = watch->fd;
+	fds.events = POLLIN | POLLOUT;
+	poll(&fds, 1, 0);
+	condition = fds.revents;
+
+	/* Should we only include those we were asked to watch? */
+	if (condition & POLLIN)
+		pcb_condition |= PCB_WATCH_READABLE;
+	if (condition & POLLOUT)
+		pcb_condition |= PCB_WATCH_WRITABLE;
+	if (condition & POLLERR)
+		pcb_condition |= PCB_WATCH_ERROR;
+	if (condition & POLLHUP)
+		pcb_condition |= PCB_WATCH_HANGUP;
+
+	x.ptr = (void *) watch;
+	if (!watch->func(x, watch->fd, pcb_condition, watch->user_data))
+		lesstif_unwatch_file(x);
+	return;
+}
+
+pcb_hidval_t
+lesstif_watch_file(int fd, unsigned int condition,
+									 pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data), pcb_hidval_t user_data)
+{
+	WatchStruct *watch = (WatchStruct *) malloc(sizeof(WatchStruct));
+	pcb_hidval_t ret;
+	unsigned int xt_condition = 0;
+
+	if (condition & PCB_WATCH_READABLE)
+		xt_condition |= XtInputReadMask;
+	if (condition & PCB_WATCH_WRITABLE)
+		xt_condition |= XtInputWriteMask;
+	if (condition & PCB_WATCH_ERROR)
+		xt_condition |= XtInputExceptMask;
+	if (condition & PCB_WATCH_HANGUP)
+		xt_condition |= XtInputExceptMask;
+
+	watch->func = func;
+	watch->user_data = user_data;
+	watch->fd = fd;
+	watch->id = XtAppAddInput(app_context, fd, (XtPointer) (size_t) xt_condition, lesstif_watch_cb, watch);
+
+	ret.ptr = (void *) watch;
+	return ret;
+}
+
+
+typedef struct {
+	XtBlockHookId id;
+	void (*func) (pcb_hidval_t user_data);
+	pcb_hidval_t user_data;
+} BlockHookStruct;
+
+static void lesstif_block_hook_cb(XtPointer user_data);
+
+static void lesstif_block_hook_cb(XtPointer user_data)
+{
+	BlockHookStruct *block_hook = (BlockHookStruct *) user_data;
+	block_hook->func(block_hook->user_data);
+}
+
+static pcb_hidval_t lesstif_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	BlockHookStruct *block_hook = (BlockHookStruct *) malloc(sizeof(BlockHookStruct));
+
+	block_hook->func = func;
+	block_hook->user_data = user_data;
+
+	block_hook->id = XtAppAddBlockHook(app_context, lesstif_block_hook_cb, (XtPointer) block_hook);
+
+	ret.ptr = (void *) block_hook;
+	return ret;
+}
+
+static void lesstif_stop_block_hook(pcb_hidval_t mlpoll)
+{
+	BlockHookStruct *block_hook = (BlockHookStruct *) mlpoll.ptr;
+	XtRemoveBlockHook(block_hook->id);
+	free(block_hook);
+}
+
+
+extern void lesstif_logv(enum pcb_message_level level, const char *fmt, va_list ap);
+
+extern int lesstif_confirm_dialog(const char *msg, ...);
+
+extern int lesstif_close_confirm_dialog();
+
+extern void lesstif_report_dialog(const char *title, const char *msg);
+
+extern void *lesstif_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t *results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
+
+extern int lesstif_attr_dlg_run(void *hid_ctx);
+extern void lesstif_attr_dlg_free(void *hid_ctx);
+extern void lesstif_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
+extern int lesstif_attribute_dialog(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data);
+extern int lesstif_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled);
+extern int lesstif_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide);
+extern int lesstif_attr_dlg_set_value(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val);
+
+
+static void pinout_callback(Widget da, PreviewData * pd, XmDrawingAreaCallbackStruct * cbs)
+{
+	int save_vx, save_vy, save_vw, save_vh;
+	int save_fx, save_fy;
+	double save_vz;
+	Pixmap save_px;
+	int reason = cbs ? cbs->reason : 0;
+
+	if (pd->window == 0 && reason == XmCR_RESIZE)
+		return;
+	if (pd->window == 0 || reason == XmCR_RESIZE) {
+		Dimension w, h;
+		double z;
+
+		stdarg_n = 0;
+		stdarg(XmNwidth, &w);
+		stdarg(XmNheight, &h);
+		XtGetValues(da, stdarg_args, stdarg_n);
+
+		pd->window = XtWindow(da);
+		pd->v_width = w;
+		pd->v_height = h;
+		pd->zoom = (pd->right - pd->left + 1) / (double) w;
+		z = (pd->bottom - pd->top + 1) / (double) h;
+		if (pd->zoom < z)
+			pd->zoom = z;
+
+		pd->x = (pd->left + pd->right) / 2 - pd->v_width * pd->zoom / 2;
+		pd->y = (pd->top + pd->bottom) / 2 - pd->v_height * pd->zoom / 2;
+	}
+
+	save_vx = view_left_x;
+	save_vy = view_top_y;
+	save_vz = view_zoom;
+	save_vw = view_width;
+	save_vh = view_height;
+	save_fx = conf_core.editor.view.flip_x;
+	save_fy = conf_core.editor.view.flip_y;
+	save_px = main_pixmap;
+	pinout = pd;
+	main_pixmap = pd->window;
+	view_left_x = pd->x;
+	view_top_y = pd->y;
+	view_zoom = pd->zoom;
+	view_width = pd->v_width;
+	view_height = pd->v_height;
+	conf_force_set_bool(conf_core.editor.view.flip_x, 0);
+	conf_force_set_bool(conf_core.editor.view.flip_y, 0);
+/*	region.X1 = 0;
+	region.Y1 = 0;
+	region.X2 = PCB->MaxWidth;
+	region.Y2 = PCB->MaxHeight;*/
+
+	XFillRectangle(display, pixmap, bg_gc, 0, 0, pd->v_width, pd->v_height);
+	pcb_hid_expose_pinout(&lesstif_hid, &pd->ctx);
+
+	pinout = 0;
+	view_left_x = save_vx;
+	view_top_y = save_vy;
+	view_zoom = save_vz;
+	view_width = save_vw;
+	view_height = save_vh;
+	main_pixmap = save_px;
+	conf_force_set_bool(conf_core.editor.view.flip_x, save_fx);
+	conf_force_set_bool(conf_core.editor.view.flip_y, save_fy);
+}
+
+static void pinout_unmap(Widget w, PreviewData * pd, void *v)
+{
+	if (pd->prev)
+		pd->prev->next = pd->next;
+	else
+		pinouts = pd->next;
+	if (pd->next)
+		pd->next->prev = pd->prev;
+	XtDestroyWidget(XtParent(pd->form));
+	free(pd);
+}
+
+static void lesstif_show_item(void *item)
+{
+	double scale;
+	Widget da;
+	pcb_box_t *extents;
+	PreviewData *pd;
+
+	for (pd = pinouts; pd; pd = pd->next)
+		if (pd->ctx.content.obj == item)
+			return;
+	if (!mainwind)
+		return;
+
+	pd = (PreviewData *) calloc(1, sizeof(PreviewData));
+
+	pd->ctx.content.obj = item;
+
+	extents = pcb_hid_get_extents_pinout(&pd->ctx);
+	pd->left = extents->X1;
+	pd->right = extents->X2;
+	pd->top = extents->Y1;
+	pd->bottom = extents->Y2;
+
+	if (pd->left > pd->right) {
+		free(pd);
+		return;
+	}
+	pd->prev = 0;
+	pd->next = pinouts;
+	if (pd->next)
+		pd->next->prev = pd;
+	pinouts = pd;
+	pd->zoom = 0;
+
+	stdarg_n = 0;
+	pd->form = XmCreateFormDialog(mainwind, XmStrCast("pinout"), stdarg_args, stdarg_n);
+	pd->window = 0;
+	XtAddCallback(pd->form, XmNunmapCallback, (XtCallbackProc) pinout_unmap, (XtPointer) pd);
+
+	scale = sqrt(200.0 * 200.0 / ((pd->right - pd->left + 1.0) * (pd->bottom - pd->top + 1.0)));
+
+	stdarg_n = 0;
+	stdarg(XmNwidth, (int) (scale * (pd->right - pd->left + 1)));
+	stdarg(XmNheight, (int) (scale * (pd->bottom - pd->top + 1)));
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_FORM);
+	da = XmCreateDrawingArea(pd->form, XmStrCast("pinout"), stdarg_args, stdarg_n);
+	XtManageChild(da);
+
+	XtAddCallback(da, XmNexposeCallback, (XtCallbackProc) pinout_callback, (XtPointer) pd);
+	XtAddCallback(da, XmNresizeCallback, (XtCallbackProc) pinout_callback, (XtPointer) pd);
+
+	XtManageChild(pd->form);
+	pinout = 0;
+}
+
+#include "dlg_preview.c"
+
+static void lesstif_beep(void)
+{
+	putchar(7);
+	fflush(stdout);
+}
+
+
+static pcb_bool progress_cancelled = pcb_false;
+
+static void progress_cancel_callback(Widget w, void *v, void *cbs)
+{
+	progress_cancelled = pcb_true;
+}
+
+static Widget progress_dialog = 0;
+static Widget progress_cancel, progress_label;
+static Widget progress_scale;
+
+static void lesstif_progress_dialog(int so_far, int total, const char *msg)
+{
+	XmString xs;
+
+	if (mainwind == 0)
+		return;
+
+	if (progress_dialog == 0) {
+		Atom close_atom;
+
+		stdarg_n = 0;
+		stdarg(XmNdefaultButtonType, XmDIALOG_CANCEL_BUTTON);
+		stdarg(XmNtitle, "Progress");
+		stdarg(XmNdialogStyle, XmDIALOG_APPLICATION_MODAL);
+		stdarg(XmNdialogStyle, XmDIALOG_FULL_APPLICATION_MODAL);
+		progress_dialog = XmCreateInformationDialog(mainwind, XmStrCast("progress"), stdarg_args, stdarg_n);
+		XtAddCallback(progress_dialog, XmNcancelCallback, (XtCallbackProc) progress_cancel_callback, NULL);
+
+		progress_cancel = XmMessageBoxGetChild(progress_dialog, XmDIALOG_CANCEL_BUTTON);
+		progress_label = XmMessageBoxGetChild(progress_dialog, XmDIALOG_MESSAGE_LABEL);
+
+		XtUnmanageChild(XmMessageBoxGetChild(progress_dialog, XmDIALOG_OK_BUTTON));
+		XtUnmanageChild(XmMessageBoxGetChild(progress_dialog, XmDIALOG_HELP_BUTTON));
+
+		stdarg(XmNdefaultPosition, False);
+		XtSetValues(progress_dialog, stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNminimum, 0);
+		stdarg(XmNvalue, 0);
+		stdarg(XmNmaximum, total > 0 ? total : 1);
+		stdarg(XmNorientation, XmHORIZONTAL);
+		stdarg(XmNshowArrows, pcb_false);
+		progress_scale = XmCreateScrollBar(progress_dialog, XmStrCast("scale"), stdarg_args, stdarg_n);
+		XtManageChild(progress_scale);
+
+		close_atom = XmInternAtom(display, XmStrCast("WM_DELETE_WINDOW"), 0);
+		XmAddWMProtocolCallback(XtParent(progress_dialog), close_atom, (XtCallbackProc) progress_cancel_callback, 0);
+	}
+
+	stdarg_n = 0;
+	stdarg(XmNvalue, 0);
+	stdarg(XmNsliderSize, (so_far <= total) ? (so_far < 0) ? 0 : so_far : total);
+	stdarg(XmNmaximum, total > 0 ? total : 1);
+	XtSetValues(progress_scale, stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	xs = XmStringCreatePCB(msg);
+	stdarg(XmNmessageString, xs);
+	XtSetValues(progress_dialog, stdarg_args, stdarg_n);
+
+	return;
+}
+
+#define MIN_TIME_SEPARATION 0.1	/* seconds */
+
+static int lesstif_progress(int so_far, int total, const char *message)
+{
+	static pcb_bool started = pcb_false;
+	XEvent e;
+	struct timeval time;
+	double time_delta, time_now;
+	static double time_then = 0.0;
+	int retval = 0;
+
+	if (!lesstif_active) {
+		if (message != NULL)
+			fprintf(stderr, "progress: %d/%d %s\n", so_far, total, message);
+		return 0;
+	}
+
+	if (so_far == 0 && total == 0 && message == NULL) {
+		XtUnmanageChild(progress_dialog);
+		started = pcb_false;
+		progress_cancelled = pcb_false;
+		return retval;
+	}
+
+	gettimeofday(&time, NULL);
+	time_now = time.tv_sec + time.tv_usec / 1000000.0;
+
+	time_delta = time_now - time_then;
+
+	if (started && time_delta < MIN_TIME_SEPARATION)
+		return retval;
+
+	/* Create or update the progress dialog */
+	lesstif_progress_dialog(so_far, total, message);
+
+	if (!started) {
+		XtManageChild(progress_dialog);
+		started = pcb_true;
+	}
+
+	/* Dispatch pending events */
+	while (XtAppPending(app_context)) {
+		XtAppNextEvent(app_context, &e);
+		XtDispatchEvent(&e);
+	}
+	idle_proc(NULL);
+
+	/* If rendering takes a while, make sure the core has enough time to
+	   do work.  */
+	gettimeofday(&time, NULL);
+	time_then = time.tv_sec + time.tv_usec / 1000000.0;
+
+	return progress_cancelled;
+}
+
+static void lesstif_get_view_size(pcb_coord_t *width, pcb_coord_t *height)
+{
+	*width = Pz(view_width);
+	*width = Pz(view_height);
+}
+
+
+static int lesstif_usage(const char *topic)
+{
+	fprintf(stderr, "\nLesstif GUI command line arguments:\n\n");
+	pcb_hid_usage(lesstif_attribute_list, sizeof(lesstif_attribute_list) / sizeof(lesstif_attribute_list[0]));
+	fprintf(stderr, "\nInvocation: pcb-rnd --gui lesstif [options]\n");
+	return 0;
+}
+
+#include "dolists.h"
+
+static void lesstif_globconf_change_post(conf_native_t *cfg, int arr_idx)
+{
+	if (!lesstif_active)
+		return;
+	if (strncmp(cfg->hash_path, "appearance/color/", 17) == 0)
+		lesstif_invalidate_all();
+	if (strncmp(cfg->hash_path, "rc/cli_", 7) == 0) {
+		stdarg_n = 0;
+		stdarg(XmNlabelString, XmStringCreatePCB(pcb_cli_prompt(":")));
+		XtSetValues(m_cmd_label, stdarg_args, stdarg_n);
+	}
+}
+
+static conf_hid_id_t lesstif_conf_id = -1;
+void lesstif_confchg_grid_unit(conf_native_t *cfg, int arr_idx)
+{
+	/* test if PCB struct doesn't exist at startup */
+	if ((PCB == NULL) || (!lesstif_active))
+		return;
+
+	lesstif_sizes_reset();
+	lesstif_styles_update_values();
+}
+
+static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(conf_native_t *, int))
+{
+	conf_native_t *n = conf_get_field(path);
+	if (n != NULL) {
+		memset(cbs, 0, sizeof(conf_hid_callbacks_t));
+		cbs->val_change_post = func;
+		conf_hid_set_cb(n, lesstif_conf_id, cbs);
+	}
+}
+
+static void lesstif_conf_regs(const char *cookie)
+{
+	static conf_hid_callbacks_t cbs_grid_unit;
+	init_conf_watch(&cbs_grid_unit, "editor/grid_unit", lesstif_confchg_grid_unit);
+}
+
+
+void lesstif_create_menu(const char *menu, const pcb_menu_prop_t *props);
+int lesstif_remove_menu(const char *menu);
+int lesstif_remove_menu_node(lht_node_t *node);
+
+int pplg_check_ver_hid_lesstif(int version_we_need) { return 0; }
+
+void pplg_uninit_hid_lesstif(void)
+{
+	pcb_hid_remove_attributes_by_cookie(lesstif_cookie);
+	pcb_event_unbind_allcookie(lesstif_cookie);
+	conf_hid_unreg(lesstif_cookie);
+}
+
+int pplg_init_hid_lesstif(void)
+{
+	static conf_hid_callbacks_t ccb;
+
+	PCB_API_CHK_VER;
+
+	memset(&ccb, 0, sizeof(ccb));
+	ccb.val_change_post = lesstif_globconf_change_post;
+
+	memset(&lesstif_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&lesstif_hid);
+	pcb_dhlp_draw_helpers_init(&lesstif_hid);
+
+	lesstif_hid.struct_size = sizeof(pcb_hid_t);
+	lesstif_hid.name = "lesstif";
+	lesstif_hid.description = "LessTif - a Motif clone for X/Unix";
+	lesstif_hid.gui = 1;
+	lesstif_hid.can_mask_clear_rats = 1;
+
+	lesstif_hid.get_export_options = lesstif_get_export_options;
+	lesstif_hid.do_export = lesstif_do_export;
+	lesstif_hid.do_exit = lesstif_do_exit;
+	lesstif_hid.uninit = lesstif_uninit;
+	lesstif_hid.parse_arguments = lesstif_parse_arguments;
+	lesstif_hid.invalidate_lr = lesstif_invalidate_lr;
+	lesstif_hid.invalidate_all = lesstif_invalidate_all;
+	lesstif_hid.notify_crosshair_change = lesstif_notify_crosshair_change;
+	lesstif_hid.notify_mark_change = lesstif_notify_mark_change;
+	lesstif_hid.set_layer_group = lesstif_set_layer_group;
+	lesstif_hid.make_gc = lesstif_make_gc;
+	lesstif_hid.destroy_gc = lesstif_destroy_gc;
+	lesstif_hid.set_drawing_mode = lesstif_set_drawing_mode;
+	lesstif_hid.render_burst = lesstif_render_burst;
+	lesstif_hid.set_color = lesstif_set_color;
+	lesstif_hid.set_line_cap = lesstif_set_line_cap;
+	lesstif_hid.set_line_width = lesstif_set_line_width;
+	lesstif_hid.set_draw_xor = lesstif_set_draw_xor;
+	lesstif_hid.draw_line = lesstif_draw_line;
+	lesstif_hid.draw_arc = lesstif_draw_arc;
+	lesstif_hid.draw_rect = lesstif_draw_rect;
+	lesstif_hid.fill_circle = lesstif_fill_circle;
+	lesstif_hid.fill_polygon = lesstif_fill_polygon;
+	lesstif_hid.fill_polygon_offs = lesstif_fill_polygon_offs;
+	lesstif_hid.fill_rect = lesstif_fill_rect;
+
+	lesstif_hid.calibrate = lesstif_calibrate;
+	lesstif_hid.shift_is_pressed = lesstif_shift_is_pressed;
+	lesstif_hid.control_is_pressed = lesstif_control_is_pressed;
+	lesstif_hid.mod1_is_pressed = lesstif_mod1_is_pressed;
+	lesstif_hid.get_coords = lesstif_get_coords;
+	lesstif_hid.get_view_size = lesstif_get_view_size;
+	lesstif_hid.set_crosshair = lesstif_set_crosshair;
+	lesstif_hid.add_timer = lesstif_add_timer;
+	lesstif_hid.stop_timer = lesstif_stop_timer;
+	lesstif_hid.watch_file = lesstif_watch_file;
+	lesstif_hid.unwatch_file = lesstif_unwatch_file;
+	lesstif_hid.add_block_hook = lesstif_add_block_hook;
+	lesstif_hid.stop_block_hook = lesstif_stop_block_hook;
+
+	lesstif_hid.log = lesstif_log;
+	lesstif_hid.logv = lesstif_logv;
+	lesstif_hid.confirm_dialog = lesstif_confirm_dialog;
+	lesstif_hid.close_confirm_dialog = lesstif_close_confirm_dialog;
+	lesstif_hid.report_dialog = lesstif_report_dialog;
+	lesstif_hid.prompt_for = lesstif_prompt_for;
+	lesstif_hid.fileselect = lesstif_fileselect;
+	lesstif_hid.attr_dlg_new = lesstif_attr_dlg_new;
+	lesstif_hid.attr_dlg_run = lesstif_attr_dlg_run;
+	lesstif_hid.attr_dlg_free = lesstif_attr_dlg_free;
+	lesstif_hid.attr_dlg_property = lesstif_attr_dlg_property;
+	lesstif_hid.attribute_dialog = lesstif_attribute_dialog;
+	lesstif_hid.attr_dlg_widget_state = lesstif_attr_dlg_widget_state;
+	lesstif_hid.attr_dlg_widget_hide = lesstif_attr_dlg_widget_hide;
+	lesstif_hid.attr_dlg_set_value = lesstif_attr_dlg_set_value;
+	lesstif_hid.show_item = lesstif_show_item;
+	lesstif_hid.beep = lesstif_beep;
+	lesstif_hid.progress = lesstif_progress;
+	lesstif_hid.edit_attributes = lesstif_attributes_dialog;
+	lesstif_hid.point_cursor = PointCursor;
+	lesstif_hid.command_entry = lesstif_command_entry;
+
+	lesstif_hid.create_menu = lesstif_create_menu;
+	lesstif_hid.remove_menu = lesstif_remove_menu;
+	lesstif_hid.remove_menu_node = lesstif_remove_menu_node;
+	lesstif_hid.update_menu_checkbox = lesstif_update_widget_flags;
+	lesstif_hid.usage = lesstif_usage;
+
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, lesstif_cookie);
+	pcb_event_bind(PCB_EVENT_NETLIST_CHANGED, LesstifNetlistChanged, NULL, lesstif_cookie);
+	pcb_event_bind(PCB_EVENT_ROUTE_STYLES_CHANGED, LesstifRouteStylesChanged, NULL, lesstif_cookie);
+	pcb_event_bind(PCB_EVENT_LIBRARY_CHANGED, LesstifLibraryChanged, NULL, lesstif_cookie);
+	pcb_event_bind(PCB_EVENT_BUSY, LesstifBusy, NULL, lesstif_cookie);
+
+	pcb_hid_register_hid(&lesstif_hid);
+	if (lesstif_conf_id < 0)
+		lesstif_conf_id = conf_hid_reg(lesstif_cookie, &ccb);
+	lesstif_conf_regs(lesstif_cookie);
+
+	return 0;
+}
+
+static int lesstif_attrs_regd = 0;
+static void lesstif_reg_attrs(void)
+{
+	if (!lesstif_attrs_regd)
+		PCB_REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie)
+	lesstif_attrs_regd = 1;
+}
+
+static void lesstif_begin(void)
+{
+	PCB_REGISTER_ACTIONS(lesstif_library_action_list, lesstif_cookie)
+	lesstif_reg_attrs();
+	PCB_REGISTER_ACTIONS(lesstif_main_action_list, lesstif_cookie)
+	PCB_REGISTER_ACTIONS(lesstif_dialog_action_list, lesstif_cookie)
+	PCB_REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie)
+	PCB_REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie)
+
+	lesstif_active = 1;
+}
+
+static void lesstif_end(void)
+{
+	pcb_remove_actions_by_cookie(lesstif_cookie);
+	pcb_hid_remove_attributes_by_cookie(lesstif_cookie);
+	lesstif_active = 0;
+}
Index: tags/2.0.1/src_plugins/hid_lesstif/menu.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/menu.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/menu.c	(revision 18980)
@@ -0,0 +1,620 @@
+#include "xincludes.h"
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "layer.h"
+
+#include "hid.h"
+#include "hid_cfg.h"
+#include "hid_cfg_action.h"
+#include "hid_cfg_input.h"
+#include "conf_hid.h"
+#include "lesstif.h"
+#include "paths.h"
+#include "actions.h"
+#include "hid_flags.h"
+#include "stdarg.h"
+#include "event.h"
+#include "compat_misc.h"
+#include "layer_vis.h"
+#include <genht/hash.h>
+
+Widget lesstif_menubar;
+pcb_hid_cfg_t *lesstif_cfg;
+conf_hid_id_t lesstif_menuconf_id = -1;
+
+#ifndef R_OK
+/* Common value for systems that don't define it.  */
+#define R_OK 4
+#endif
+
+static Colormap cmap;
+
+static void note_accelerator(const lht_node_t *node);
+static int note_widget_flag(Widget w, char *type, const char *name);
+
+/*-----------------------------------------------------------------------------*/
+
+typedef struct {
+	Widget w;
+	const char *flagname;
+	int oldval;
+	char *xres;
+} Widgetpcb_flag_t;
+
+static Widgetpcb_flag_t *wflags = 0;
+static int n_wflags = 0;
+static int max_wflags = 0;
+
+static int note_widget_flag(Widget w, char *type, const char *name)
+{
+	int idx;
+
+	/* look for a free slot to reuse */
+	for(idx = 0; idx < n_wflags; idx++)
+		if (wflags[idx].w == NULL)
+			goto add;
+
+	/* no free slot, alloc a new one */
+	if (n_wflags >= max_wflags) {
+		max_wflags += 20;
+		wflags = (Widgetpcb_flag_t *) realloc(wflags, max_wflags * sizeof(Widgetpcb_flag_t));
+	}
+	idx = n_wflags++;
+
+	add:;
+	wflags[idx].w = w;
+	wflags[idx].flagname = name;
+	wflags[idx].oldval = -1;
+	wflags[idx].xres = type;
+	return idx;
+}
+
+static int del_widget_flag(int idx)
+{
+	wflags[idx].w = NULL;
+	wflags[idx].flagname = NULL;
+	wflags[idx].xres = NULL;
+	return 0;
+}
+
+void lesstif_update_widget_flags(const char *cookie)
+{
+	int i;
+	for (i = 0; i < n_wflags; i++) {
+		int v;
+		Arg args[2];
+
+		if (wflags[i].w == NULL)
+			continue;
+
+		v = pcb_hid_get_flag(wflags[i].flagname);
+		if (v < 0) {
+			XtSetArg(args[0], wflags[i].xres, 0);
+			XtSetArg(args[1], XtNsensitive, 0);
+			XtSetValues(wflags[i].w, args, 2);
+		}
+		else {
+			XtSetArg(args[0], wflags[i].xres, v ? 1 : 0);
+			XtSetValues(wflags[i].w, args, 1);
+		}
+		wflags[i].oldval = v;
+	}
+}
+
+/*-----------------------------------------------------------------------------*/
+
+#if 0
+static void stdarg_do_color(char *value, char *which)
+{
+	XColor color;
+	if (XParseColor(display, cmap, value, &color)) {
+		if (XAllocColor(display, cmap, &color)) {
+			stdarg(which, color.pixel);
+		}
+	}
+}
+#endif
+
+static int need_xy = 0, have_xy = 0, block_xy = 0, action_x, action_y;
+
+int lesstif_button_event(Widget w, XEvent * e)
+{
+	have_xy = 1;
+	action_x = e->xbutton.x;
+	action_y = e->xbutton.y;
+	if (!need_xy)
+		return 0;
+	if (w != work_area)
+		return 1;
+	if (block_xy)
+		return 1;
+	return 0;
+}
+
+void lesstif_get_xy(const char *message)
+{
+	XmString ls = XmStringCreatePCB(message);
+
+	XtManageChild(m_click);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, ls);
+	XtSetValues(m_click, stdarg_args, stdarg_n);
+	/*printf("need xy: msg `%s'\n", msg); */
+	need_xy = 1;
+	XBell(display, 100);
+	while (!have_xy) {
+		XEvent e;
+		XtAppNextEvent(app_context, &e);
+		XtDispatchEvent(&e);
+	}
+	need_xy = 0;
+	have_xy = 1;
+	XtUnmanageChild(m_click);
+}
+
+void lesstif_get_coords(const char *msg, pcb_coord_t *px, pcb_coord_t *py, int force)
+{
+	if ((force || !have_xy) && msg) {
+		if (force) {
+			have_xy = 0;
+			block_xy = 1;
+		}
+		lesstif_get_xy(msg);
+		block_xy = 0;
+	}
+	if (have_xy)
+		lesstif_coords_to_pcb(action_x, action_y, px, py);
+}
+
+static void callback(Widget w, lht_node_t * node, XmPushButtonCallbackStruct * pbcs)
+{
+	have_xy = 0;
+	lesstif_show_crosshair(0);
+	if (pbcs->event && pbcs->event->type == KeyPress) {
+		Dimension wx, wy;
+		Widget aw = XtWindowToWidget(display, pbcs->event->xkey.window);
+		action_x = pbcs->event->xkey.x;
+		action_y = pbcs->event->xkey.y;
+		if (aw) {
+			Widget p = work_area;
+			while (p && p != aw) {
+				stdarg_n = 0;
+				stdarg(XmNx, &wx);
+				stdarg(XmNy, &wy);
+				XtGetValues(p, stdarg_args, stdarg_n);
+				action_x -= wx;
+				action_y -= wy;
+				p = XtParent(p);
+			}
+			if (p == aw)
+				have_xy = 1;
+		}
+		/*pcb_printf("have xy from %s: %$mD\n", XtName(aw), action_x, action_y); */
+	}
+
+	lesstif_need_idle_proc();
+	pcb_hid_cfg_action(node);
+}
+
+static void note_accelerator(const lht_node_t *node)
+{
+	lht_node_t *anode, *knode;
+	assert(node != NULL);
+	anode = pcb_hid_cfg_menu_field(node, PCB_MF_ACTION, NULL);
+	knode = pcb_hid_cfg_menu_field(node, PCB_MF_ACCELERATOR, NULL);
+	if ((anode != NULL) && (knode != NULL))
+		pcb_hid_cfg_keys_add_by_desc(&lesstif_keymap, knode, anode);
+	else
+		pcb_hid_cfg_error(node, "No action specified for key accel\n");
+}
+
+int lesstif_key_event(XKeyEvent * e)
+{
+	char buf[10];
+	KeySym sym;
+	int slen;
+	int mods = 0;
+
+	if (e->state & ShiftMask)
+		mods |= PCB_M_Shift;
+	if (e->state & ControlMask)
+		mods |= PCB_M_Ctrl;
+	if (e->state & Mod1Mask)
+		mods |= PCB_M_Alt;
+
+	e->state &= ~(ControlMask | Mod1Mask);
+
+	if (e->state & ShiftMask)
+		e->state &= ~ShiftMask;
+	slen = XLookupString(e, buf, sizeof(buf), &sym, NULL);
+
+	switch (sym) {
+	/* Ignore these.  */
+		case XK_Shift_L:    case XK_Shift_R:
+		case XK_Control_L:  case XK_Control_R:
+		case XK_Caps_Lock:  case XK_Shift_Lock:
+		case XK_Meta_L:     case XK_Meta_R:
+		case XK_Alt_L:      case XK_Alt_R:
+		case XK_Super_L:    case XK_Super_R:
+		case XK_Hyper_L:    case XK_Hyper_R:
+		case XK_ISO_Level3_Shift:
+			return 1;
+
+		case XK_KP_Add: sym = '+'; break;
+		case XK_KP_Subtract: sym = '-'; break;
+		case XK_KP_Multiply: sym = '*'; break;
+		case XK_KP_Divide: sym = '/'; break;
+		case XK_KP_Enter: sym = XK_Return; break;
+	}
+
+/* TODO#3: this works only on US keyboard */
+	if (mods & PCB_M_Shift) {
+		static const char *lower = "`1234567890-=[]\\;',./";
+		static const char *upper = "~!@#$%^&*()_+{}|:\"<>?";
+		char *l;
+		if ((sym >= 'A') && (sym <= 'Z'))
+			sym = tolower(sym);
+		else if ((l = strchr(lower, sym)) != NULL) {
+			sym = upper[l - lower];
+			mods &= ~PCB_M_Shift;
+		}
+	}
+
+/*	printf("KEY lookup: mod=%x sym=%x/%d\n", mods, sym, slen); */
+#warning TODO#3: pass on raw and translated keys
+	slen = pcb_hid_cfg_keys_input(&lesstif_keymap, mods, sym, sym);
+	if (slen <= 0)
+		return 1;
+
+	if (e->window == XtWindow(work_area)) {
+		have_xy = 1;
+		action_x = e->x;
+		action_y = e->y;
+	}
+	else
+		have_xy = 0;
+
+	/* Parsing actions may not return until more user interaction
+	   happens.  */
+	pcb_hid_cfg_keys_action(&lesstif_keymap);
+
+	return 1;
+}
+
+static void add_node_to_menu(Widget menu, lht_node_t *ins_after, lht_node_t *node, XtCallbackProc callback, int level);
+
+typedef struct {
+	Widget sub;     /* the open menu pane that hosts all the submenus */
+	Widget btn;     /* the button in the menu line */
+	int wflag_idx;  /* index in the wflags[] array */
+} menu_data_t;
+
+menu_data_t *menu_data_alloc(void)
+{
+	menu_data_t *md = calloc(sizeof(menu_data_t), 1);
+	md->wflag_idx = -1;
+	return md;
+}
+
+static int del_menu(void *ctx, lht_node_t *node)
+{
+	menu_data_t *md = node->user_data;
+
+	if (md == NULL)
+		return 0;
+
+	if (md->wflag_idx >= 0)
+		del_widget_flag(md->wflag_idx);
+
+	if (md->sub != NULL) {
+		XtUnmanageChild(md->sub);
+		XtDestroyWidget(md->sub);
+	}
+	if (md->btn != NULL) {
+		XtUnmanageChild(md->btn);
+		XtDestroyWidget(md->btn);
+	}
+	free(md);
+
+	node->user_data = NULL;
+	return 0;
+}
+
+static void add_res2menu_main(Widget menu, lht_node_t *node, XtCallbackProc callback)
+{
+	menu_data_t *md = menu_data_alloc();
+
+	stdarg_n = 0;
+	stdarg(XmNtearOffModel, XmTEAR_OFF_ENABLED);
+	md->sub = XmCreatePulldownMenu(menu, node->name, stdarg_args, stdarg_n);
+	XtSetValues(md->sub, stdarg_args, stdarg_n);
+	stdarg_n = 0;
+	stdarg(XmNsubMenuId, md->sub);
+	md->btn = XmCreateCascadeButton(menu, node->name, stdarg_args, stdarg_n);
+	XtManageChild(md->btn);
+
+	node->user_data = md;
+
+	if (pcb_hid_cfg_has_submenus(node)) {
+		lht_node_t *i;
+		i = pcb_hid_cfg_menu_field(node, PCB_MF_SUBMENU, NULL);
+		for(i = i->data.list.first; i != NULL; i = i->next)
+			add_node_to_menu(md->sub, NULL, i, callback, 1);
+	}
+}
+
+/* when ins_after is specified, calculate where the new node needs to be
+   inserted and set the XmNpositionIndex accordingly */
+static void set_ins_after(Widget menu, lht_node_t *ins_after)
+{
+	WidgetList ch;
+	Cardinal n, nch;
+	lht_node_t *nd;
+
+	if (ins_after == NULL)
+		return;
+
+	XtVaGetValues(menu, XmNchildren, &ch, XmNnumChildren, &nch, NULL);
+	assert(ins_after->parent->type == LHT_LIST);
+	for(n = 0, nd = ins_after->parent->data.list.first; n < nch; n++,nd = nd->next) {
+		short pos;
+		
+		XtVaGetValues(ch[n], XmNpositionIndex, &pos, NULL);
+		if (nd == ins_after) {
+			stdarg(XmNpositionIndex, pos);
+			break;
+		}
+	}
+}
+
+static void lesstif_confchg_checkbox(conf_native_t *cfg, int arr_idx)
+{
+	lesstif_update_widget_flags(NULL);
+}
+
+static void add_res2menu_named(Widget menu, lht_node_t *ins_after, lht_node_t *node, XtCallbackProc callback, int level)
+{
+	const char *v;
+	lht_node_t *act, *kacc;
+	menu_data_t *md;
+
+	stdarg_n = 0;
+	v = pcb_hid_cfg_menu_field_str(node, PCB_MF_FOREGROUND);
+	if (v != NULL)
+		stdarg_do_color(v, XmNforeground);
+
+	v = pcb_hid_cfg_menu_field_str(node, PCB_MF_BACKGROUND);
+	if (v != NULL)
+		stdarg_do_color(v, XmNbackground);
+
+	v = pcb_hid_cfg_menu_field_str(node, PCB_MF_FONT);
+	if (v != NULL) {
+		XFontStruct *fs = XLoadQueryFont(display, v);
+		if (fs) {
+			XmFontList fl = XmFontListCreate(fs, XmSTRING_DEFAULT_CHARSET);
+			stdarg(XmNfontList, fl);
+		}
+	}
+
+	v = pcb_hid_cfg_menu_field_str(node, PCB_MF_MNEMONIC);
+	if (v != NULL)
+		stdarg(XmNmnemonic, v);
+
+	kacc = pcb_hid_cfg_menu_field(node, PCB_MF_ACCELERATOR, NULL);
+	if (kacc != NULL) {
+		char *acc_str = pcb_hid_cfg_keys_gen_accel(&lesstif_keymap, kacc, 1, NULL);
+
+		if (acc_str != NULL) {
+			XmString as = XmStringCreatePCB(acc_str);
+			stdarg(XmNacceleratorText, as);
+		}
+
+#warning TODO: remove this call
+		note_accelerator(node);
+	}
+
+	v = node->name;
+	stdarg(XmNlabelString, XmStringCreatePCB(pcb_strdup(v)));
+	set_ins_after(menu, ins_after);
+
+	md = menu_data_alloc();
+	if (pcb_hid_cfg_has_submenus(node)) {
+		int nn = stdarg_n;
+		lht_node_t *i;
+		const char *field_name;
+		lht_node_t *submenu_node = pcb_hid_cfg_menu_field(node, PCB_MF_SUBMENU, &field_name);
+
+		stdarg(XmNtearOffModel, XmTEAR_OFF_ENABLED);
+		md->sub = XmCreatePulldownMenu(menu, pcb_strdup(v), stdarg_args + nn, stdarg_n - nn);
+		node->user_data = md;
+		stdarg_n = nn;
+		stdarg(XmNsubMenuId, md->sub);
+		md->btn = XmCreateCascadeButton(menu, XmStrCast("menubutton"), stdarg_args, stdarg_n);
+		XtManageChild(md->btn);
+
+		/* assume submenu is a list, pcb_hid_cfg_has_submenus() already checked that */
+		for(i = submenu_node->data.list.first; i != NULL; i = i->next)
+			add_node_to_menu(md->sub, NULL, i, callback, level+1);
+	}
+	else {
+		/* doesn't have submenu */
+		const char *checked = pcb_hid_cfg_menu_field_str(node, PCB_MF_CHECKED);
+		const char *label = pcb_hid_cfg_menu_field_str(node, PCB_MF_SENSITIVE);
+
+		act = pcb_hid_cfg_menu_field(node, PCB_MF_ACTION, NULL);
+		if (checked) {
+			if (strchr(checked, '='))
+				stdarg(XmNindicatorType, XmONE_OF_MANY);
+			else
+				stdarg(XmNindicatorType, XmN_OF_MANY);
+			md->btn = XmCreateToggleButton(menu, XmStrCast("menubutton"), stdarg_args, stdarg_n);
+			if (act != NULL)
+				XtAddCallback(md->btn, XmNvalueChangedCallback, callback, (XtPointer) act);
+		}
+		else if (label && strcmp(label, "false") == 0) {
+			stdarg(XmNalignment, XmALIGNMENT_BEGINNING);
+			md->btn = XmCreateLabel(menu, XmStrCast("menulabel"), stdarg_args, stdarg_n);
+		}
+		else {
+
+			md->btn = XmCreatePushButton(menu, XmStrCast("menubutton"), stdarg_args, stdarg_n);
+			XtAddCallback(md->btn, XmNactivateCallback, callback, (XtPointer) act);
+		}
+
+		v = pcb_hid_cfg_menu_field_str(node, PCB_MF_CHECKED);
+		if (v != NULL) {
+			const char *uo;
+
+			md->wflag_idx = note_widget_flag(md->btn, XmNset, v);
+
+			/* set up the update-on callback */
+			uo = pcb_hid_cfg_menu_field_str(node, PCB_MF_UPDATE_ON);
+			if (uo == NULL)
+				uo = pcb_hid_cfg_menu_field_str(node, PCB_MF_CHECKED);
+			if (uo != NULL) {
+				static conf_hid_callbacks_t cbs;
+				static int cbs_inited = 0;
+				conf_native_t *nat = conf_get_field(uo);
+
+				if (nat != NULL) {
+					if (!cbs_inited) {
+						memset(&cbs, 0, sizeof(conf_hid_callbacks_t));
+						cbs.val_change_post = lesstif_confchg_checkbox;
+						cbs_inited = 1;
+					}
+					conf_hid_set_cb(nat, lesstif_menuconf_id, &cbs);
+				}
+				else {
+					if (*uo != '\0')
+						pcb_message(PCB_MSG_WARNING, "Checkbox menu item %s not updated on any conf change - try to use the update_on field\n", checked);
+				}
+			}
+		}
+
+		v = pcb_hid_cfg_menu_field_str(node, PCB_MF_ACTIVE);
+		if (v != NULL)
+			note_widget_flag(md->btn, XmNsensitive, v);
+
+		XtManageChild(md->btn);
+		node->user_data = md;
+	}
+}
+
+static void add_res2menu_text_special(Widget menu, lht_node_t *node, XtCallbackProc callback)
+{
+#warning TODO: make this a flag hash, also in the gtk hid
+	Widget btn = NULL;
+	stdarg_n = 0;
+	if (*node->data.text.value == '@') {
+		/* ignore anchors */
+	}
+	else if ((strcmp(node->data.text.value, "-") == 0) || (strcmp(node->data.text.value, "-"))) {
+		btn = XmCreateSeparator(menu, XmStrCast("sep"), stdarg_args, stdarg_n);
+		XtManageChild(btn);
+	}
+}
+
+static void add_node_to_menu(Widget in_menu, lht_node_t *ins_after, lht_node_t *node, XtCallbackProc callback, int level)
+{
+	if (level == 0) {
+		add_res2menu_main(in_menu, node, callback);
+		return;
+	}
+
+	switch(node->type) {
+		case LHT_HASH: add_res2menu_named(in_menu, ins_after, node, callback, level); break;
+		case LHT_TEXT: add_res2menu_text_special(in_menu, node, callback); break;
+		default: /* ignore them */;
+	}
+}
+
+extern char *lesstif_pcbmenu_path;
+extern const char *pcb_menu_default;
+extern pcb_hid_t lesstif_hid;
+
+Widget lesstif_menu(Widget parent, const char *name, Arg * margs, int mn)
+{
+	Widget mb = XmCreateMenuBar(parent, XmStrCast(name), margs, mn);
+	int screen;
+	lht_node_t *mr;
+
+	display = XtDisplay(mb);
+	screen = DefaultScreen(display);
+	cmap = DefaultColormap(display, screen);
+
+	lesstif_cfg = pcb_hid_cfg_load("lesstif", 0, pcb_menu_default);
+	lesstif_hid.hid_cfg = lesstif_cfg;
+	if (lesstif_cfg == NULL) {
+		pcb_message(PCB_MSG_ERROR, "FATAL: can't load the lesstif menu res either from file or from hardwired default.");
+		abort();
+	}
+
+	mr = pcb_hid_cfg_get_menu(lesstif_cfg, "/main_menu");
+	if (mr != NULL) {
+		if (mr->type == LHT_LIST) {
+			lht_node_t *n;
+			for(n = mr->data.list.first; n != NULL; n = n->next)
+				add_node_to_menu(mb, NULL, n, (XtCallbackProc) callback, 0);
+		}
+		else
+			pcb_hid_cfg_error(mr, "/main_menu should be a list");
+	}
+
+
+	hid_cfg_mouse_init(lesstif_cfg, &lesstif_mouse);
+
+	return mb;
+}
+
+static int lesstif_create_menu_widget(void *ctx, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item)
+{
+	Widget w = (is_main) ? lesstif_menubar : ((menu_data_t *)parent->user_data)->sub;
+
+	if (strncmp(path, "/popups", 7) == 0)
+		return -1; /* there's no popup support in lesstif */
+
+	add_node_to_menu(w, ins_after, menu_item, (XtCallbackProc) callback, is_main ? 0 : 2);
+
+	return 0;
+}
+
+
+void lesstif_create_menu(const char *menu_path, const pcb_menu_prop_t *props)
+{
+	pcb_hid_cfg_create_menu(lesstif_cfg, menu_path, props, lesstif_create_menu_widget, NULL);
+}
+
+int lesstif_remove_menu(const char *menu_path)
+{
+	return pcb_hid_cfg_remove_menu(lesstif_cfg, menu_path, del_menu, NULL);
+}
+
+int lesstif_remove_menu_node(lht_node_t *node)
+{
+	return pcb_hid_cfg_remove_menu_node(lesstif_cfg, node, del_menu, NULL);
+}
+
+static const char *lesstif_menu_cookie = "hid_lesstif_menu";
+void lesstif_init_menu(void)
+{
+	if (lesstif_menuconf_id < 0)
+		lesstif_menuconf_id = conf_hid_reg(lesstif_menu_cookie, NULL);
+}
+
+void lesstif_uninit_menu(void)
+{
+	conf_hid_unreg(lesstif_menu_cookie);
+	XtDestroyWidget(lesstif_menubar);
+	lesstif_menuconf_id = -1;
+}
Index: tags/2.0.1/src_plugins/hid_lesstif/netlist.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/netlist.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/netlist.c	(revision 18980)
@@ -0,0 +1,446 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "xincludes.h"
+
+#include "compat_misc.h"
+#include "data.h"
+
+#include "find.h"
+#include "rats.h"
+#include "select.h"
+#include "undo.h"
+#include "remove.h"
+#include "crosshair.h"
+#include "draw.h"
+#include "event.h"
+
+#include "hid.h"
+#include "actions.h"
+#include "lesstif.h"
+#include "stdarg.h"
+
+static Widget netlist_dialog = 0;
+static Widget netlist_list, netnode_list;
+
+static XmString *netlist_strings = 0;
+static XmString *netnode_strings = 0;
+static int n_netnode_strings;
+static int last_pick = -1;
+
+static void pick_net(int pick)
+{
+	pcb_lib_menu_t *menu = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + pick;
+	int i;
+
+	if (pick == last_pick)
+		return;
+	last_pick = pick;
+
+	if (netnode_strings)
+		free(netnode_strings);			/* XXX leaked all XmStrings??? */
+	n_netnode_strings = menu->EntryN;
+	netnode_strings = (XmString *) malloc(menu->EntryN * sizeof(XmString));
+	for (i = 0; i < menu->EntryN; i++)
+		netnode_strings[i] = XmStringCreatePCB(menu->Entry[i].ListEntry);
+	stdarg_n = 0;
+	stdarg(XmNitems, netnode_strings);
+	stdarg(XmNitemCount, menu->EntryN);
+	XtSetValues(netnode_list, stdarg_args, stdarg_n);
+}
+
+static void netlist_select(Widget w, void *v, XmListCallbackStruct * cbs)
+{
+	XmString str;
+	int pos = cbs->item_position;
+	pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[pos - 1]);
+	char *name = net->Name;
+	if (name[0] == ' ') {
+		name[0] = '*';
+		net->flag = 0;
+	}
+	else {
+		name[0] = ' ';
+		net->flag = 1;
+	}
+
+	str = XmStringCreatePCB(name);
+	XmListReplaceItemsPos(netlist_list, &str, 1, pos);
+	XmStringFree(str);
+	XmListSelectPos(netlist_list, pos, False);
+}
+
+static void netlist_extend(Widget w, void *v, XmListCallbackStruct * cbs)
+{
+	if (cbs->selected_item_count == 1)
+		pick_net(cbs->item_position - 1);
+}
+
+typedef void (*Std_Nbcb_Func) (pcb_lib_menu_t *, int);
+
+static void nbcb_rat_on(pcb_lib_menu_t *net, int pos)
+{
+	XmString str;
+	char *name = net->Name;
+	name[0] = ' ';
+	net->flag = 1;
+	str = XmStringCreatePCB(name);
+	XmListReplaceItemsPos(netlist_list, &str, 1, pos);
+	XmStringFree(str);
+}
+
+static void nbcb_rat_off(pcb_lib_menu_t *net, int pos)
+{
+	XmString str;
+	char *name = net->Name;
+	name[0] = '*';
+	net->flag = 0;
+	str = XmStringCreatePCB(name);
+	XmListReplaceItemsPos(netlist_list, &str, 1, pos);
+	XmStringFree(str);
+}
+
+
+/* Select on the layout the current net treeview selection
+ */
+static void nbcb_select_common(pcb_lib_menu_t *net, int pos, int select_flag)
+{
+	pcb_lib_entry_t *entry;
+	pcb_connection_t conn;
+	int i;
+
+	pcb_conn_lookup_init();
+	pcb_reset_conns(pcb_true);
+
+	for (i = net->EntryN, entry = net->Entry; i; i--, entry++)
+		if (pcb_rat_seek_pad(entry, &conn, pcb_false))
+			pcb_rat_find_hook(conn.obj, pcb_true, pcb_true);
+
+	pcb_select_connection(PCB, select_flag);
+	pcb_reset_conns(pcb_false);
+	pcb_conn_lookup_uninit();
+	pcb_undo_inc_serial();
+	pcb_draw();
+}
+
+static void nbcb_select(pcb_lib_menu_t *net, int pos)
+{
+	nbcb_select_common(net, pos, 1);
+}
+
+static void nbcb_deselect(pcb_lib_menu_t *net, int pos)
+{
+	nbcb_select_common(net, pos, 0);
+}
+
+static void nbcb_find(pcb_lib_menu_t *net, int pos)
+{
+	char *name = net->Name + 2;
+	pcb_actionl("netlist", "find", name, NULL);
+}
+
+static void nbcb_std_callback(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs)
+{
+	int *posl, posc, i;
+	XmString **items, **selected;
+	if (XmListGetSelectedPos(netlist_list, &posl, &posc) == False)
+		return;
+	if (v == nbcb_find)
+		pcb_actionl("connection", "reset", NULL);
+	for (i = 0; i < posc; i++) {
+		pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[posl[i] - 1]);
+		v(net, posl[i]);
+	}
+	stdarg_n = 0;
+	stdarg(XmNitems, &items);
+	XtGetValues(netlist_list, stdarg_args, stdarg_n);
+	selected = (XmString **) malloc(posc * sizeof(XmString *));
+	for (i = 0; i < posc; i++)
+		selected[i] = items[posl[i] - 1];
+
+	stdarg_n = 0;
+	stdarg(XmNselectedItems, selected);
+	XtSetValues(netlist_list, stdarg_args, stdarg_n);
+}
+
+static void nbcb_ripup(Widget w, Std_Nbcb_Func v, XmPushButtonCallbackStruct * cbs)
+{
+	nbcb_std_callback(w, nbcb_find, cbs);
+
+	PCB_LINE_VISIBLE_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+			pcb_remove_object(PCB_OBJ_LINE, layer, line, line);
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_ARC_VISIBLE_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc))
+			pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc);
+	}
+	PCB_ENDALL_LOOP;
+
+	if (PCB->pstk_on)
+		PCB_PADSTACK_LOOP(PCB->Data);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack))
+				pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack);
+		}
+		PCB_END_LOOP;
+}
+
+static void netnode_browse(Widget w, XtPointer v, XmListCallbackStruct * cbs)
+{
+	pcb_lib_menu_t *menu = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + last_pick;
+	const char *name = menu->Entry[cbs->item_position - 1].ListEntry;
+	char *ename, *pname;
+
+	ename = pcb_strdup(name);
+	pname = strchr(ename, '-');
+	if (!pname) {
+		free(ename);
+		return;
+	}
+	*pname++ = 0;
+
+#warning subc TODO
+#if 0
+	PCB_ELEMENT_LOOP(PCB->Data);
+	{
+		char *es = element->Name[PCB_ELEMNAME_IDX_REFDES].TextString;
+		if (es && strcmp(es, ename) == 0) {
+			PCB_PIN_LOOP(element);
+			{
+				if (strcmp(pin->Number, pname) == 0) {
+					pcb_crosshair_move_absolute(pin->X, pin->Y);
+					free(ename);
+					return;
+				}
+			}
+			PCB_END_LOOP;
+			PCB_PAD_LOOP(element);
+			{
+				if (strcmp(pad->Number, pname) == 0) {
+					pcb_coord_t x = (pad->Point1.X + pad->Point2.X) / 2;
+					pcb_coord_t y = (pad->Point1.Y + pad->Point2.Y) / 2;
+					pcb_gui->set_crosshair(x, y, HID_SC_PAN_VIEWPORT);
+					free(ename);
+					return;
+				}
+			}
+			PCB_END_LOOP;
+		}
+	}
+	PCB_END_LOOP;
+#endif
+	free(ename);
+}
+
+#define NLB_FORM ((Widget)(~0))
+static Widget
+netlist_button(Widget parent, const char *name, const char *string,
+							 Widget top, Widget bottom, Widget left, Widget right, XtCallbackProc callback, void *user_data)
+{
+	Widget rv;
+	XmString str;
+
+#define NLB_W(w) if (w == NLB_FORM) { stdarg(XmN ## w ## Attachment, XmATTACH_FORM); } \
+  else if (w) { stdarg(XmN ## w ## Attachment, XmATTACH_WIDGET); \
+    stdarg (XmN ## w ## Widget, w); }
+
+	NLB_W(top);
+	NLB_W(bottom);
+	NLB_W(left);
+	NLB_W(right);
+	str = XmStringCreatePCB(string);
+	stdarg(XmNlabelString, str);
+	rv = XmCreatePushButton(parent, XmStrCast(name), stdarg_args, stdarg_n);
+	XtManageChild(rv);
+	if (callback)
+		XtAddCallback(rv, XmNactivateCallback, callback, (XtPointer) user_data);
+	XmStringFree(str);
+	return rv;
+}
+
+static int build_netlist_dialog()
+{
+	Widget b_sel, b_unsel, b_find, /*b_ripup,*/ b_rat_on, /*b_rat_off,*/ l_ops;
+	XmString ops_str;
+
+	if (!mainwind)
+		return 1;
+	if (netlist_dialog)
+		return 0;
+
+	stdarg_n = 0;
+	stdarg(XmNresizePolicy, XmRESIZE_GROW);
+	stdarg(XmNtitle, "Netlists");
+	stdarg(XmNautoUnmanage, False);
+	netlist_dialog = XmCreateFormDialog(mainwind, XmStrCast("netlist"), stdarg_args, stdarg_n);
+
+	stdarg_n = 0;
+	b_rat_on = netlist_button(netlist_dialog, "rat_on", "Enable for rats",
+														0, NLB_FORM, NLB_FORM, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_rat_on);
+
+	stdarg_n = 0;
+	/*b_rat_off =*/ netlist_button(netlist_dialog, "rat_off", "Disable for rats",
+														 0, NLB_FORM, b_rat_on, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_rat_off);
+
+	stdarg_n = 0;
+	b_sel = netlist_button(netlist_dialog, "select", "Select",
+												 0, b_rat_on, NLB_FORM, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_select);
+
+	stdarg_n = 0;
+	b_unsel = netlist_button(netlist_dialog, "deselect", "Deselect",
+													 0, b_rat_on, b_sel, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_deselect);
+
+	stdarg_n = 0;
+	b_find = netlist_button(netlist_dialog, "find", "Find",
+													0, b_rat_on, b_unsel, 0, (XtCallbackProc) nbcb_std_callback, (void *) nbcb_find);
+
+
+	stdarg_n = 0;
+	/*b_ripup =*/ netlist_button(netlist_dialog, "ripup", "Rip Up", 0, b_rat_on, b_find, 0, (XtCallbackProc) nbcb_ripup, 0);
+
+	stdarg_n = 0;
+	stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+	stdarg(XmNbottomWidget, b_sel);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	ops_str = XmStringCreatePCB("Operations on selected net names:");
+	stdarg(XmNlabelString, ops_str);
+	l_ops = XmCreateLabel(netlist_dialog, XmStrCast("ops"), stdarg_args, stdarg_n);
+	XtManageChild(l_ops);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+	stdarg(XmNbottomWidget, l_ops);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_POSITION);
+	stdarg(XmNrightPosition, 50);
+	stdarg(XmNvisibleItemCount, 10);
+	stdarg(XmNselectionPolicy, XmEXTENDED_SELECT);
+	netlist_list = XmCreateScrolledList(netlist_dialog, XmStrCast("nets"), stdarg_args, stdarg_n);
+	XtManageChild(netlist_list);
+	XtAddCallback(netlist_list, XmNdefaultActionCallback, (XtCallbackProc) netlist_select, 0);
+	XtAddCallback(netlist_list, XmNextendedSelectionCallback, (XtCallbackProc) netlist_extend, 0);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_FORM);
+	stdarg(XmNbottomAttachment, XmATTACH_WIDGET);
+	stdarg(XmNbottomWidget, l_ops);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_POSITION);
+	stdarg(XmNleftPosition, 50);
+	netnode_list = XmCreateScrolledList(netlist_dialog, XmStrCast("nodes"), stdarg_args, stdarg_n);
+	XtManageChild(netnode_list);
+	XtAddCallback(netnode_list, XmNbrowseSelectionCallback, (XtCallbackProc) netnode_browse, 0);
+
+	return 0;
+}
+
+void LesstifNetlistChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	int i;
+	if (!PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN)
+		return;
+	if (build_netlist_dialog())
+		return;
+	last_pick = -1;
+	if (netlist_strings)
+		free(netlist_strings);
+	netlist_strings = (XmString *) malloc(PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN * sizeof(XmString));
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++)
+		netlist_strings[i] = XmStringCreatePCB(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name);
+	stdarg_n = 0;
+	stdarg(XmNitems, netlist_strings);
+	stdarg(XmNitemCount, PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN);
+	XtSetValues(netlist_list, stdarg_args, stdarg_n);
+	pick_net(0);
+	return;
+}
+
+static const char pcb_acts_LesstifNetlistShow[] = "NetlistShow(pinname|netname)";
+
+static const char pcb_acth_LesstifNetlistShow[] = "Selects the given pinname or netname in the netlist window.";
+
+/* %start-doc actions NetlistShow
+
+%end-doc */
+
+static fgw_error_t pcb_act_LesstifNetlistShow(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+		const char *nn;
+
+	if (build_netlist_dialog()) {
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+		PCB_ACT_CONVARG(1, FGW_STR, LesstifNetlistShow, nn = argv[1].val.str);
+
+	if (argc == 2) {
+		pcb_lib_menu_t *net;
+
+		net = pcb_netnode_to_netname(nn);
+		if (net) {
+			XmString item;
+			int vis = 0;
+
+			/* Select net first, 'True' causes pick_net() to be invoked */
+			item = XmStringCreatePCB(net->Name);
+			XmListSelectItem(netlist_list, item, True);
+			XmListSetItem(netlist_list, item);
+			XmStringFree(item);
+
+			/* Now the netnode_list has the right contents */
+			item = XmStringCreatePCB(nn);
+			XmListSelectItem(netnode_list, item, False);
+
+			/*
+			 * Only force the item to the top if there are enough to scroll.
+			 * A bug (?) in lesstif will cause the window to get ever wider
+			 * if an XmList that doesn't require a scrollbar is forced to
+			 * have one (when the top item is not the first item).
+			 */
+			stdarg_n = 0;
+			stdarg(XmNvisibleItemCount, &vis);
+			XtGetValues(netnode_list, stdarg_args, stdarg_n);
+			if (n_netnode_strings > vis) {
+				XmListSetItem(netnode_list, item);
+			}
+			XmStringFree(item);
+		}
+		else {
+			/* Try the argument as a netname */
+			net = pcb_netname_to_netname(nn);
+			if (net) {
+				XmString item;
+
+				item = XmStringCreatePCB(net->Name);
+				XmListSetItem(netlist_list, item);
+				XmListSelectItem(netlist_list, item, True);
+				XmStringFree(item);
+			}
+		}
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+void lesstif_show_netlist()
+{
+	build_netlist_dialog();
+	XtManageChild(netlist_dialog);
+}
+
+pcb_action_t lesstif_netlist_action_list[] = {
+	{"NetlistShow", pcb_act_LesstifNetlistShow, pcb_acth_LesstifNetlistShow, pcb_acts_LesstifNetlistShow}
+};
+
+PCB_REGISTER_ACTIONS(lesstif_netlist_action_list, lesstif_cookie)
Index: tags/2.0.1/src_plugins/hid_lesstif/stdarg.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/stdarg.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/stdarg.c	(revision 18980)
@@ -0,0 +1,15 @@
+#include "stdarg.h"
+Arg stdarg_args[30];
+int stdarg_n;
+
+extern Colormap lesstif_colormap;
+extern Display *lesstif_display;
+
+void stdarg_do_color(const char *value, char *which)
+{
+	XColor color;
+	if (XParseColor(lesstif_display, lesstif_colormap, value, &color))
+		if (XAllocColor(lesstif_display, lesstif_colormap, &color)) {
+			stdarg(which, color.pixel);
+		}
+}
Index: tags/2.0.1/src_plugins/hid_lesstif/stdarg.h
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/stdarg.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/stdarg.h	(revision 18980)
@@ -0,0 +1,10 @@
+#include "xincludes.h"
+
+extern Colormap lesstif_colormap;
+
+extern Arg stdarg_args[];
+extern int stdarg_n;
+#define stdarg(t,v) XtSetArg(stdarg_args[stdarg_n], t, v), stdarg_n++
+
+void stdarg_do_color(const char *value, char *which);
+
Index: tags/2.0.1/src_plugins/hid_lesstif/styles.c
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/styles.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/styles.c	(revision 18980)
@@ -0,0 +1,409 @@
+#include "xincludes.h"
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "compat_misc.h"
+#include "data.h"
+#include "pcb-printf.h"
+
+#include "actions.h"
+#include "hid.h"
+#include "lesstif.h"
+#include "hid_flags.h"
+#include "stdarg.h"
+#include "misc_util.h"
+#include "event.h"
+
+/* There are three places where styles are kept:
+
+   First, the "active" style is in conf_core.design.line_thickness et al.
+
+   Second, there are NUM_STYLES styles in PCB->RouteStyle[].
+
+   (not anymore: Third, there are NUM_STYLES styles in conf_core.design.RouteStyle[])
+
+   Selecting a style copies its values to the active style.  We also
+   need a way to modify the active style, copy the active style to
+   PCB->RouteStyle[], and copy PCB->RouteStyle[] to
+   Settings.RouteStyle[].  Since Lesstif reads the default style from
+   .Xdefaults, we can ignore Settings.RouteStyle[] in general, as it's
+   only used to initialize new PCB files.
+
+   So, we need to do PCB->RouteStyle <-> active style.
+*/
+
+void LesstifRouteStylesChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+
+
+typedef enum {
+	SSthick, SSdiam, SShole, SSkeep,
+	SSNUM
+} StyleValues;
+
+static Widget style_dialog = 0;
+static Widget style_values[SSNUM];
+
+/* dynamic arrays for styles */
+static int alloced_styles = 0;
+static Widget *style_pb;
+static Widget *units_pb;
+static int *name_hashes;
+typedef struct {
+	Widget *w;
+} StyleButtons;
+
+static StyleButtons *style_button_list = NULL;
+static int num_style_buttons = 0; /* number of style_button_list instances (depends on how many times it's placed in the menu) */
+/**/
+
+static Widget value_form, value_labels, value_texts, units_form;
+static int local_update = 0;
+XmString xms_mm, xms_mil;
+
+static const pcb_unit_t *unit = 0;
+static XmString ustr;
+
+static int hash(char *cp)
+{
+	int h = 0;
+	while (*cp) {
+		h = h * 13 + *(unsigned char *) cp;
+		h ^= (h >> 16);
+		cp++;
+	}
+	return h;
+}
+
+static const char *value_names[] = {
+	"Thickness", "Diameter", "Hole", "Clearance"
+};
+
+static void update_one_value(int i, pcb_coord_t v)
+{
+	char buf[100];
+
+	pcb_snprintf(buf, sizeof(buf), "%m+%.2mS", unit->allow, v);
+	XmTextSetString(style_values[i], buf);
+	stdarg_n = 0;
+	stdarg(XmNlabelString, ustr);
+	XtSetValues(units_pb[i], stdarg_args, stdarg_n);
+}
+
+static void update_values()
+{
+	local_update = 1;
+	update_one_value(SSthick, conf_core.design.line_thickness);
+	update_one_value(SSdiam, conf_core.design.via_thickness);
+	update_one_value(SShole, conf_core.design.via_drilling_hole);
+	update_one_value(SSkeep, conf_core.design.clearance);
+	local_update = 0;
+	lesstif_update_status_line();
+}
+
+void lesstif_styles_update_values()
+{
+	if (!style_dialog) {
+		lesstif_update_status_line();
+		return;
+	}
+	unit = conf_core.editor.grid_unit;
+	ustr = XmStringCreateLocalized((char *) conf_core.editor.grid_unit->suffix);
+	update_values();
+}
+
+static void update_style_buttons()
+{
+	int i = pcb_hid_get_flag("GetStyle()");
+	int j, n;
+
+	for (n = 0; n < num_style_buttons; n++) {
+		for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++)
+			if (j != i)
+				XmToggleButtonSetState(style_button_list[n].w[j], 0, 0);
+			else
+				XmToggleButtonSetState(style_button_list[n].w[j], 1, 0);
+	}
+	if (style_dialog) {
+		for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++)
+			if (j != i)
+				XmToggleButtonSetState(style_pb[j], 0, 0);
+			else
+				XmToggleButtonSetState(style_pb[j], 1, 0);
+	}
+}
+
+static void style_value_cb(Widget w, int i, void *cbs)
+{
+	char *s;
+
+	if (local_update)
+		return;
+	s = XmTextGetString(w);
+	pcb_get_value_ex(s, NULL, NULL, NULL, unit->suffix, NULL);
+	switch (i) {
+	case SSthick:
+		conf_setf(CFR_DESIGN, "design/line_thickness", -1, "%s %s", s, unit->suffix);
+		break;
+	case SSdiam:
+		conf_setf(CFR_DESIGN, "design/via_thickness", -1, "%s %s", s, unit->suffix);
+		break;
+	case SShole:
+		conf_setf(CFR_DESIGN, "design/via_drilling_hole", -1, "%s %s", s, unit->suffix);
+		break;
+	case SSkeep:
+		conf_setf(CFR_DESIGN, "design/clearance", -1, "%s %s", s, unit->suffix);
+		break;
+	}
+	update_style_buttons();
+}
+
+static void units_cb()
+{
+	if (unit == get_unit_struct("mm"))
+		unit = get_unit_struct("mil");
+	else
+		unit = get_unit_struct("mm");
+	ustr = XmStringCreateLocalized((char *) unit->suffix);
+	update_values();
+}
+
+static Widget style_value(int i)
+{
+	Widget w, l;
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_POSITION);
+	stdarg(XmNtopPosition, i);
+	stdarg(XmNbottomAttachment, XmATTACH_POSITION);
+	stdarg(XmNbottomPosition, i + 1);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNalignment, XmALIGNMENT_END);
+	l = XmCreateLabel(value_labels, XmStrCast(value_names[i]), stdarg_args, stdarg_n);
+	XtManageChild(l);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_POSITION);
+	stdarg(XmNtopPosition, i);
+	stdarg(XmNbottomAttachment, XmATTACH_POSITION);
+	stdarg(XmNbottomPosition, i + 1);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNcolumns, 8);
+	w = XmCreateTextField(value_texts, XmStrCast(value_names[i]), stdarg_args, stdarg_n);
+	XtAddCallback(w, XmNvalueChangedCallback, (XtCallbackProc) style_value_cb, (XtPointer) (size_t) i);
+	XtManageChild(w);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_POSITION);
+	stdarg(XmNtopPosition, i);
+	stdarg(XmNbottomAttachment, XmATTACH_POSITION);
+	stdarg(XmNbottomPosition, i + 1);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNlabelString, ustr);
+	units_pb[i] = XmCreatePushButton(units_form, XmStrCast(value_names[i]), stdarg_args, stdarg_n);
+	XtAddCallback(units_pb[i], XmNactivateCallback, (XtCallbackProc) units_cb, (XtPointer) (size_t) i);
+	XtManageChild(units_pb[i]);
+
+	return w;
+}
+
+static void style_name_cb(Widget w, int i, XmToggleButtonCallbackStruct * cbs)
+{
+	char *newname = lesstif_prompt_for("New name", PCB->RouteStyle.array[i].name);
+	strncpy(PCB->RouteStyle.array[i].name, newname, sizeof(PCB->RouteStyle.array[i].name)-1);
+	PCB->RouteStyle.array[i].name[sizeof(PCB->RouteStyle.array[i].name)-1] = '\0';
+	free(newname);
+
+	LesstifRouteStylesChanged(0, 0, 0);
+}
+
+static void style_set_cb(Widget w, int i, XmToggleButtonCallbackStruct * cbs)
+{
+	PCB->RouteStyle.array[i].Thick = conf_core.design.line_thickness;
+	PCB->RouteStyle.array[i].Diameter = conf_core.design.via_thickness;
+	PCB->RouteStyle.array[i].Hole = conf_core.design.via_drilling_hole;
+	PCB->RouteStyle.array[i].Clearance = conf_core.design.clearance;
+	update_style_buttons();
+}
+
+static void style_selected(Widget w, int i, XmToggleButtonCallbackStruct * cbs)
+{
+	pcb_route_style_t *style;
+	int j, n;
+	if (cbs && cbs->set == 0) {
+		XmToggleButtonSetState(w, 1, 0);
+		return;
+	}
+	style = PCB->RouteStyle.array + i;
+	pcb_board_set_line_width(style->Thick);
+	pcb_board_set_via_size(style->Diameter, pcb_true);
+	pcb_board_set_via_drilling_hole(style->Hole, pcb_true);
+	pcb_board_set_clearance(style->Clearance);
+	if (style_dialog) {
+		for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++)
+			if (j != i)
+				XmToggleButtonSetState(style_pb[j], 0, 0);
+			else
+				XmToggleButtonSetState(style_pb[j], 1, 0);
+		update_values();
+	}
+	else
+		lesstif_update_status_line();
+	for (n = 0; n < num_style_buttons; n++) {
+		for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++)
+			if (j != i)
+				XmToggleButtonSetState(style_button_list[n].w[j], 0, 0);
+			else
+				XmToggleButtonSetState(style_button_list[n].w[j], 1, 0);
+	}
+}
+
+static Widget style_button(int i)
+{
+	Widget pb, set;
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_WIDGET);
+	stdarg(XmNtopWidget, i ? style_pb[i - 1] : value_form);
+	stdarg(XmNleftAttachment, XmATTACH_FORM);
+	stdarg(XmNlabelString, XmStringCreatePCB("Name"));
+	set = XmCreatePushButton(style_dialog, XmStrCast("style"), stdarg_args, stdarg_n);
+	XtManageChild(set);
+	XtAddCallback(set, XmNactivateCallback, (XtCallbackProc) style_name_cb, (XtPointer) (size_t) i);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_WIDGET);
+	stdarg(XmNtopWidget, i ? style_pb[i - 1] : value_form);
+	stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+	stdarg(XmNleftWidget, set);
+	stdarg(XmNlabelString, XmStringCreatePCB("Set"));
+	set = XmCreatePushButton(style_dialog, XmStrCast("style"), stdarg_args, stdarg_n);
+	XtManageChild(set);
+	XtAddCallback(set, XmNactivateCallback, (XtCallbackProc) style_set_cb, (XtPointer) (size_t) i);
+
+	stdarg_n = 0;
+	stdarg(XmNtopAttachment, XmATTACH_WIDGET);
+	stdarg(XmNtopWidget, i ? style_pb[i - 1] : value_form);
+	stdarg(XmNrightAttachment, XmATTACH_FORM);
+	stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+	stdarg(XmNleftWidget, set);
+	stdarg(XmNlabelString, XmStringCreatePCB(PCB->RouteStyle.array[i].name));
+	stdarg(XmNindicatorType, XmONE_OF_MANY);
+	stdarg(XmNalignment, XmALIGNMENT_BEGINNING);
+	pb = XmCreateToggleButton(style_dialog, XmStrCast("style"), stdarg_args, stdarg_n);
+	XtManageChild(pb);
+	XtAddCallback(pb, XmNvalueChangedCallback, (XtCallbackProc) style_selected, (XtPointer) (size_t) i);
+	return pb;
+}
+
+static const char pcb_acts_AdjustStyle[] = "AdjustStyle()";
+
+static const char pcb_acth_AdjustStyle[] = "Displays the route style adjustment window.";
+
+/* %start-doc actions AdjustStyle
+
+%end-doc */
+
+static fgw_error_t pcb_act_AdjustStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if ((!mainwind) || (PCB->RouteStyle.array == NULL)) {
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (style_dialog == 0) {
+		int i;
+
+		unit = conf_core.editor.grid_unit;
+		ustr = XmStringCreateLocalized((char *) unit->suffix);
+
+		stdarg_n = 0;
+		stdarg(XmNautoUnmanage, False);
+		stdarg(XmNtitle, "Route Styles");
+		style_dialog = XmCreateFormDialog(mainwind, XmStrCast("style"), stdarg_args, stdarg_n);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		value_form = XmCreateForm(style_dialog, XmStrCast("values"), stdarg_args, stdarg_n);
+		XtManageChild(value_form);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		stdarg(XmNfractionBase, 4);
+		stdarg(XmNresizePolicy, XmRESIZE_GROW);
+		units_form = XmCreateForm(value_form, XmStrCast("units"), stdarg_args, stdarg_n);
+		XtManageChild(units_form);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		stdarg(XmNleftAttachment, XmATTACH_FORM);
+		stdarg(XmNfractionBase, 4);
+		value_labels = XmCreateForm(value_form, XmStrCast("values"), stdarg_args, stdarg_n);
+		XtManageChild(value_labels);
+
+		stdarg_n = 0;
+		stdarg(XmNtopAttachment, XmATTACH_FORM);
+		stdarg(XmNbottomAttachment, XmATTACH_FORM);
+		stdarg(XmNrightAttachment, XmATTACH_WIDGET);
+		stdarg(XmNrightWidget, units_form);
+		stdarg(XmNleftAttachment, XmATTACH_WIDGET);
+		stdarg(XmNleftWidget, value_labels);
+		stdarg(XmNfractionBase, 4);
+		value_texts = XmCreateForm(value_form, XmStrCast("values"), stdarg_args, stdarg_n);
+		XtManageChild(value_texts);
+
+		for (i = 0; i < SSNUM; i++) {
+			style_values[i] = style_value(i);
+			name_hashes[i] = hash(PCB->RouteStyle.array[i].name);
+		}
+		for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); i++)
+			style_pb[i] = style_button(i);
+		update_values();
+		update_style_buttons();
+	}
+	XtManageChild(style_dialog);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+void LesstifRouteStylesChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	int i, j, h;
+	if (!PCB || vtroutestyle_len(&PCB->RouteStyle) == 0)
+		return;
+	update_style_buttons();
+	if (!style_dialog)
+		return;
+	for (j = 0; j < vtroutestyle_len(&PCB->RouteStyle); j++) {
+		h = hash(PCB->RouteStyle.array[j].name);
+		if (name_hashes[j] == h)
+			continue;
+		name_hashes[j] = h;
+		stdarg_n = 0;
+		stdarg(XmNlabelString, XmStringCreatePCB(PCB->RouteStyle.array[j].name));
+		if (style_dialog)
+			XtSetValues(style_pb[j], stdarg_args, stdarg_n);
+		for (i = 0; i < num_style_buttons; i++)
+			XtSetValues(style_button_list[i].w[j], stdarg_args, stdarg_n);
+	}
+	update_values();
+	return;
+}
+
+pcb_action_t lesstif_styles_action_list[] = {
+	{"AdjustStyle", pcb_act_AdjustStyle, pcb_acth_AdjustStyle, pcb_acts_AdjustStyle}
+};
+
+PCB_REGISTER_ACTIONS(lesstif_styles_action_list, lesstif_cookie)
Index: tags/2.0.1/src_plugins/hid_lesstif/xincludes.h
===================================================================
--- tags/2.0.1/src_plugins/hid_lesstif/xincludes.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_lesstif/xincludes.h	(revision 18980)
@@ -0,0 +1,46 @@
+/*
+ * Some of the X headers are not very friendly in terms of namespace.
+ * For example, X.h typedef's Mask but we use Mask in the core of pcb
+ * and this causes problem.  To avoid this, pull in the X headers in
+ * this file where we can add workarounds as needed.
+ */
+
+#define Mask X_Mask
+
+#include <X11/Intrinsic.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+#include <Xm/CascadeB.h>
+#include <Xm/DrawingA.h>
+#include <Xm/FileSB.h>
+#include <Xm/Form.h>
+#include <Xm/Frame.h>
+#include <Xm/Label.h>
+#include <Xm/List.h>
+#include <Xm/MainW.h>
+#include <Xm/MenuShell.h>
+#include <Xm/MessageB.h>
+#include <Xm/Protocols.h>
+#include <Xm/PushB.h>
+#include <Xm/RowColumn.h>
+#include <Xm/Scale.h>
+#include <Xm/ScrollBar.h>
+#include <Xm/ScrolledW.h>
+#include <Xm/Separator.h>
+#include <Xm/Text.h>
+#include <Xm/TextF.h>
+#include <Xm/ToggleB.h>
+#include <Xm/Xm.h>
+
+#ifdef HAVE_XRENDER
+#include <X11/extensions/Xrender.h>
+#endif /* HAVE_XRENDER */
+
+#ifdef HAVE_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif /* HAVE_XINERAMA */
+
+#undef Mask
Index: tags/2.0.1/src_plugins/hid_remote/Makefile
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_hid_remote
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/hid_remote/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {hid_remote}
+append /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/hid_remote/remote.o
+	$(PLUGDIR)/hid_remote/base64.o
+	$(PLUGDIR)/hid_remote/proto.o
+@]
+
+switch /local/pcb/hid_remote/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/hid_remote/base64.c
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/base64.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/base64.c	(revision 18980)
@@ -0,0 +1,86 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include <limits.h>
+#include "base64.h"
+
+static char int2digit(int digit)
+{
+	if (digit < 26) return 'A' + digit;
+	if (digit < 52) return 'a' + digit - 26;
+	if (digit < 62) return '0' + digit - 52;
+	if (digit == 62) return '+';
+	if (digit == 63) return '/';
+	return '\0'; /* error */
+}
+
+static int digit2int(char c)
+{
+	if ((c >= 'A') && (c <= 'Z')) return c - 'A';
+	if ((c >= 'a') && (c <= 'z')) return c - 'a' + 26;
+	if ((c >= '0') && (c <= '9')) return c - 'a' + 52;
+	if (c == '+') return 62;
+	if (c == '/') return 63;
+	return -1;
+}
+
+
+size_t base64_write_right(char *buff_start, size_t buff_len, unsigned long int num)
+{
+	char *end = buff_start + buff_len;
+	size_t rlen = 0;
+
+	if (num == 0) {
+		*end = int2digit(0);
+		return 1;
+	}
+
+	while(num > 0) {
+		unsigned int digit = num & 0x3F;
+		*end = int2digit(digit);
+		num >>= 6;
+		rlen++;
+	}
+
+	return rlen;
+}
+
+int base64_parse_grow(unsigned long int *num, int chr, int term)
+{
+	int digit;
+	if (chr == term)
+		return 1;
+
+	if (*num >= (ULONG_MAX >> 6UL))
+		return -1;
+
+	digit = digit2int(chr);
+	if (digit < 0)
+		return -1;
+
+	(*num) <<= 6UL;
+	(*num) |= digit;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_remote/base64.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/base64.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/base64.h	(revision 18980)
@@ -0,0 +1,30 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+
+size_t base64_write_right(char *buff_start, size_t buff_len, unsigned long int num);
+int base64_parse_grow(unsigned long int *num, int chr, int term);
Index: tags/2.0.1/src_plugins/hid_remote/hid_remote.pup
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/hid_remote.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/hid_remote.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class hid
+$short remote HID server
+$long Remote access HID: implement a protocol and use it to relay between a core and a remote HID implementation.
+$state WIP
+default disable-all
+autoload 1
Index: tags/2.0.1/src_plugins/hid_remote/proto.c
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto.c	(revision 18980)
@@ -0,0 +1,352 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdarg.h>
+#include <ctype.h>
+#include "pcb-printf.h"
+#define proto_vsnprintf pcb_vsnprintf
+#include "proto_lowcommon.h"
+#include "proto_lowsend.h"
+#include "proto_lowparse.h"
+#include "layer.h"
+#include "layer_grp.h"
+
+static const int proto_ver = 1;
+static proto_ctx_t pctx;
+static const char *cfmt = "%.08mm";
+
+static proto_node_t *proto_error;
+static proto_node_t *remote_proto_parse(const char *wait_for, int cache_msgs);
+
+void remote_proto_send_ver()
+{
+	send_begin(&pctx, "ver");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%ld", proto_ver);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void remote_proto_send_unit()
+{
+	send_begin(&pctx, "unit");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "mm");
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void remote_proto_send_brddim(pcb_coord_t w, pcb_coord_t h)
+{
+	send_begin(&pctx, "brddim");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, cfmt, w);
+	sendf(&pctx, cfmt, h);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+int remote_proto_send_ready()
+{
+	proto_node_t *targ;
+	send_begin(&pctx, "ready");
+	send_open(&pctx, 0, 1);
+	send_close(&pctx);
+	send_end(&pctx);
+	targ = remote_proto_parse("Ready", 0);
+	if (targ == proto_error)
+		return -1;
+	proto_node_free(targ);
+	return 0;
+}
+
+void proto_send_invalidate(int l, int r, int t, int b)
+{
+	send_begin(&pctx, "inval");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", l);
+	sendf(&pctx, "%d", r);
+	sendf(&pctx, "%d", t);
+	sendf(&pctx, "%d", b);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_invalidate_all()
+{
+	send_begin(&pctx, "inval");
+	send_open(&pctx, 0, 1);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+int proto_send_set_layer_group(pcb_layergrp_id_t group, int is_empty)
+{
+	send_begin(&pctx, "setlg");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%ld", group);
+	sendf(&pctx, "%d", is_empty);
+	send_close(&pctx);
+	send_end(&pctx);
+	return 0;
+}
+
+
+static void remote_send_layer_flag_cb(void *ctx, pcb_layer_type_t bit, const char *name, int class, const char *class_name)
+{
+/*	sends(&pctx, class_name);*/
+	sends(&pctx, name);
+}
+
+static void	pcb_remote_send_layer_flags(unsigned int flags, int first_arg)
+{
+	send_open(&pctx, 0, first_arg); /* our flags and classes are nicely behaved, no need to do binary */
+	pcb_layer_type_map(flags, NULL, remote_send_layer_flag_cb);
+	send_close(&pctx);
+}
+
+int pcb_remote_new_layer_group(const char *name, pcb_layergrp_id_t idx, unsigned int flags)
+{
+	send_begin(&pctx, "newlg");
+	send_open(&pctx, str_is_bin(name), 1);
+	sends(&pctx, name);
+	sendf(&pctx, "%d", idx);
+	send_open(&pctx, 0, 0);
+	pcb_remote_send_layer_flags(flags & PCB_LYT_ANYWHERE, 1);
+	pcb_remote_send_layer_flags(flags & PCB_LYT_ANYTHING, 0);
+	pcb_remote_send_layer_flags(flags & PCB_LYT_ANYPROP, 0);
+	send_close(&pctx);
+	send_close(&pctx);
+	send_end(&pctx);
+	return 0;
+}
+
+
+int pcb_remote_new_layer(const char *name, pcb_layer_id_t lid, unsigned int gid)
+{
+	send_begin(&pctx, "newly");
+	send_open(&pctx, str_is_bin(name), 1);
+	sends(&pctx, name);
+	sendf(&pctx, "%ld", lid);
+	sendf(&pctx, "%ld", gid);
+	send_close(&pctx);
+	send_end(&pctx);
+	return 0;
+}
+
+int proto_send_make_gc(void)
+{
+	proto_node_t *targ;
+	int gci;
+
+	send_begin(&pctx, "makeGC");
+	send_open(&pctx, 0, 1);
+	send_close(&pctx);
+	send_end(&pctx);
+	targ = remote_proto_parse("MakeGC", 1);
+	if (targ == proto_error)
+		return -1;
+	gci = aint(child1(targ), -1);
+	if (gci < 0)
+		return -1;
+/*	printf("New GC: %s\n", gcs);*/
+	proto_node_free(targ);
+	return gci;
+}
+
+int proto_send_del_gc(int gc)
+{
+	send_begin(&pctx, "delGC");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	send_close(&pctx);
+	send_end(&pctx);
+	return 0;
+}
+
+void proto_send_set_color(int gc, const char *name)
+{
+	send_begin(&pctx, "clr");
+	send_open(&pctx, str_is_bin(name), 1);
+	sendf(&pctx, "%d", gc);
+	sends(&pctx, name);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_set_line_cap(int gc, char style)
+{
+	send_begin(&pctx, "cap");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, "%c", style);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_set_line_width(int gc, pcb_coord_t width)
+{
+	send_begin(&pctx, "linwid");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, cfmt, width);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_set_draw_xor(int gc, int xor_set)
+{
+	send_begin(&pctx, "setxor");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, "%d", xor_set);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_draw_line(int gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	send_begin(&pctx, "line");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, cfmt, x1);
+	sendf(&pctx, cfmt, y1);
+	sendf(&pctx, cfmt, x2);
+	sendf(&pctx, cfmt, y2);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_draw_arc(int gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	send_begin(&pctx, "arc");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, cfmt, cx);
+	sendf(&pctx, cfmt, cy);
+	sendf(&pctx, cfmt, width);
+	sendf(&pctx, cfmt, height);
+	sendf(&pctx, "%f", start_angle);
+	sendf(&pctx, "%f", delta_angle);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+
+
+void proto_send_draw_rect(int gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int is_filled)
+{
+	send_begin(&pctx, "rect");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, cfmt, x1);
+	sendf(&pctx, cfmt, y1);
+	sendf(&pctx, cfmt, x2);
+	sendf(&pctx, cfmt, y2);
+	sendf(&pctx, "%d", is_filled);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_fill_circle(int gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	send_begin(&pctx, "fcirc");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, cfmt, cx);
+	sendf(&pctx, cfmt, cy);
+	sendf(&pctx, cfmt, radius);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+void proto_send_draw_poly(int gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int n;
+	send_begin(&pctx, "poly");
+	send_open(&pctx, 0, 1);
+	sendf(&pctx, "%d", gc);
+	sendf(&pctx, "%d", n_coords);
+	send_open(&pctx, 0, 1);
+	for(n = 0; n < n_coords; n++) {
+		send_open(&pctx, 0, 1);
+		sendf(&pctx, cfmt, x[n] + dx);
+		sendf(&pctx, cfmt, y[n] + dy);
+		send_close(&pctx);
+	}
+	send_close(&pctx);
+	send_close(&pctx);
+	send_end(&pctx);
+}
+
+int proto_send_set_drawing_mode(const char *name, int direct)
+{
+	send_begin(&pctx, "drwmod");
+	send_open(&pctx, str_is_bin(name), 1);
+	sends(&pctx, name);
+	sendf(&pctx, "%d", direct);
+	send_close(&pctx);
+	send_end(&pctx);
+	return 0;
+}
+
+void proto_exec_cmd(const char *cmd, proto_node_t *targ)
+{
+
+}
+
+static proto_node_t *remote_proto_parse(const char *wait_for, int cache_msgs)
+{
+	for(;;) {
+		int c = getchar();
+		if (c == EOF)
+			return proto_error;
+		switch(parse_char(&pctx, c)) {
+			case PRES_ERR:
+				fprintf(stderr, "Protocol error.\n");
+				return proto_error;
+			case PRES_PROCEED:
+				break;
+			case PRES_GOT_MSG:
+				if ((wait_for != NULL) && (strcmp(wait_for, pctx.pcmd) == 0))
+					return pctx.targ;
+				if (cache_msgs) {
+#warning TODO
+				}
+				else
+					proto_exec_cmd(pctx.pcmd, pctx.targ);
+				proto_node_free(pctx.targ);
+				break;
+		}
+	}
+}
+
+int remote_proto_parse_all()
+{
+	if (remote_proto_parse(NULL, 0) == proto_error)
+		return -1;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_remote/proto.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto.h	(revision 18980)
@@ -0,0 +1,52 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+void remote_proto_send_ver();
+void remote_proto_send_unit();
+void remote_proto_send_brddim(pcb_coord_t w, pcb_coord_t h);
+int remote_proto_send_ready();
+void proto_send_invalidate(int l, int r, int t, int b);
+void proto_send_invalidate_all();
+
+int pcb_remote_new_layer_group(const char *name, pcb_layergrp_id_t idx, unsigned int flags);
+int pcb_remote_new_layer(const char *name, pcb_layer_id_t idx, unsigned int group);
+int proto_send_set_layer_group(pcb_layergrp_id_t group, int is_empty);
+
+int proto_send_make_gc(void);
+int proto_send_del_gc(int gc);
+void proto_send_set_color(int gc, const char *name);
+void proto_send_set_line_cap(int gc, char style);
+void proto_send_set_line_width(int gc, pcb_coord_t width);
+void proto_send_set_draw_xor(int gc, int xor_set);
+void proto_send_draw_line(int gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+void proto_send_draw_arc(int gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle);
+void proto_send_draw_rect(int gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int is_filled);
+void proto_send_fill_circle(int gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius);
+void proto_send_draw_poly(int gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+int proto_send_set_drawing_mode(const char *name, int direct);
+
+int remote_proto_parse_all();
Index: tags/2.0.1/src_plugins/hid_remote/proto_lowcommon.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto_lowcommon.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto_lowcommon.h	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+
+typedef enum {
+	PST_MSG,
+	PST_COMMENT,
+	PST_CMD,
+	PST_TSTR,
+	PST_BSTR,
+	PST_LIST
+} parse_state_t;
+
+
+typedef struct proto_node_s  proto_node_t;
+
+struct proto_node_s {
+	unsigned is_list:1;  /* whether current node is a list */
+	unsigned is_bin:1;   /* whether current node is a binary - {} list or len=str */
+	unsigned in_len:1;   /* for parser internal use */
+	proto_node_t *parent;
+	proto_node_t *next;                      /* next sibling on the current level (singly linked list) */
+	union {
+		struct { /* if ->is_list == 0  */
+			unsigned long int len; /* length of the string */
+			unsigned long int pos; /* for parser internal use */
+			char *str;
+		} s;
+		struct { /* if ->is_list == 1  */
+			proto_node_t *first_child, *last_child;
+		} l;
+	} data;
+};
+
+typedef struct {
+	int depth;    /* parenthesis nesting depth */
+	int bindepth; /* how many of the inmost levels are binary */
+	unsigned long int subseq_tab;
+
+	/* parser */
+	parse_state_t pst;
+	int pdepth;
+	char pcmd[18];
+	int pcmd_next;
+	proto_node_t *targ, *tcurr;
+	size_t palloc; /* field allocation total */
+} proto_ctx_t;
+
+static int chr_is_bin(char c)
+{
+	if (isalnum(c))
+		return 0;
+	if ((c == '-') || (c == '+') || (c == '.') || (c == '_') || (c == '#'))
+		return 0;
+	return 1;
+}
Index: tags/2.0.1/src_plugins/hid_remote/proto_lowdbg.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto_lowdbg.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto_lowdbg.h	(revision 18980)
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <string.h>
+
+static char ind[] = "                                ";
+static void proto_node_print(proto_node_t *n, int level)
+{
+	if (level < sizeof(ind)-1)
+		ind[level] = '\0';
+	printf("%s%s (%s):", ind, (n->is_list ? "list" : "str"), (n->is_bin ? "bin" : "text"));
+	if (level < sizeof(ind)-1)
+		ind[level] = ' ';
+
+	if (n->is_list) {
+		proto_node_t *ch;
+		printf("\n");
+		for(ch = n->data.l.first_child; ch != NULL; ch = ch->next)
+			proto_node_print(ch, level+1);
+	}
+	else
+		printf(" %lu/'%s'\n", n->data.s.len, n->data.s.str);
+}
Index: tags/2.0.1/src_plugins/hid_remote/proto_lowparse.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto_lowparse.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto_lowparse.h	(revision 18980)
@@ -0,0 +1,311 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <unistd.h>
+#include <stdarg.h>
+#include "base64.h"
+
+#define MAX_FIELD_ALLOC 1024*1024
+
+typedef enum {
+	PRES_ERR     = -1,
+	PRES_PROCEED = 0,
+	PRES_GOT_MSG = 1
+} parse_res_t;
+
+static proto_node_t *list_new(proto_ctx_t *ctx, proto_node_t *parent, int is_bin)
+{
+	proto_node_t *l;
+
+	if (ctx->palloc + sizeof(proto_node_t) > MAX_FIELD_ALLOC)
+		return NULL;
+	ctx->palloc += sizeof(proto_node_t);
+
+	l = calloc(sizeof(proto_node_t), 1);
+	if (l != NULL) {
+		l->is_list = 1;
+		l->is_bin = is_bin;
+		l->parent = parent;
+	}
+	return l;
+}
+
+static proto_node_t *str_new(proto_ctx_t *ctx, proto_node_t *parent, int is_bin)
+{
+	proto_node_t *l;
+
+	if (ctx->palloc + sizeof(proto_node_t) > MAX_FIELD_ALLOC)
+		return NULL;
+	ctx->palloc += sizeof(proto_node_t);
+
+	l = calloc(sizeof(proto_node_t), 1);
+	if (l != NULL) {
+		l->is_list = 0;
+		l->is_bin = is_bin;
+		l->in_len = 1;
+		l->parent = parent;
+	}
+	return l;
+}
+
+static void list_append(proto_ctx_t *ctx, proto_node_t *l)
+{
+	if (ctx->tcurr->data.l.last_child != NULL) {
+		ctx->tcurr->data.l.last_child->next = l;
+		ctx->tcurr->data.l.last_child = l;
+	}
+	else
+		ctx->tcurr->data.l.first_child = ctx->tcurr->data.l.last_child = l;
+	ctx->tcurr = l;
+}
+
+static void pop(proto_ctx_t *ctx)
+{
+	ctx->tcurr = ctx->tcurr->parent;
+	ctx->pst = PST_LIST;
+}
+
+static void proto_node_free(proto_node_t *n)
+{
+	if (n->is_list) {
+		proto_node_t *ch, *chn;
+		for(ch = n->data.l.first_child; ch != NULL; ch = chn) {
+			chn = ch->next;
+			proto_node_free(ch);
+		}
+	}
+	else
+		free(n->data.s.str);
+
+	free(n);
+}
+
+
+static parse_res_t parse_char(proto_ctx_t *ctx, int c)
+{
+	switch(ctx->pst) {
+		case PST_MSG:
+			if (c == '#') {
+				ctx->pst = PST_COMMENT;
+				break;
+			}
+			if ((c == '\r') || (c == '\n') || (c == ' ') || (c == '\t')) /* ignore empty lines */
+				break;
+			if (chr_is_bin(c)) /* invalid command */
+				return -1;
+			ctx->pst = PST_CMD;
+			ctx->palloc = 0;
+			ctx->pcmd[0] = c;
+			ctx->pcmd_next = 1;
+			break;
+
+		case PST_COMMENT:
+			if (c == '\n')
+				ctx->pst = PST_MSG;
+			break;
+
+		case PST_CMD:
+			if ((c == '(') || (c == '{')) {
+				ctx->targ = ctx->tcurr = list_new(ctx, NULL, c == '{');
+				if (ctx->tcurr == NULL)
+					return -1;
+				ctx->pst = PST_LIST;
+				break;
+			}
+			if (chr_is_bin(c)) /* invalid command */
+				return -1;
+			if (ctx->pcmd_next >= 16) /* command name too long */
+				return -1;
+			ctx->pcmd[ctx->pcmd_next++] = c;
+			break;
+
+		case PST_LIST:
+			do_list:;
+			if ((c == ')') || (c == '}')) { /* close current list */
+				pop(ctx);
+				break;
+			}
+			if (c == '\n') {
+				if (ctx->tcurr != NULL) /* unbalanced: newline before enough closes */
+					return -1;
+				if (ctx->pcmd_next >= 16) /* command name too long */
+					return -1;
+				ctx->pcmd[ctx->pcmd_next++] = '\0';
+				ctx->pst = PST_MSG;
+				return PRES_GOT_MSG;
+			}
+
+			if (ctx->tcurr == NULL) /* unbalanced: too many closes */
+				return -1;
+
+			if ((c == '(') || (c == '{')) { /* open new list */
+				proto_node_t *l = list_new(ctx, ctx->tcurr, c == '{');
+				if (l == NULL)
+					return -1;
+				list_append(ctx, l);
+				ctx->pst = PST_LIST;
+				break;
+			}
+			if (c == ' ') /* field separator - may be after a bin-string, but tolerate for now */
+				break;
+			
+			/* we are in a list and got a string char. It's the first char of a
+			   text string or the first character of a binary string length, depending
+			   on the list context */
+			if (ctx->tcurr->is_bin) {
+				proto_node_t *s = str_new(ctx, ctx->tcurr, 1);
+				if (s == NULL)
+					return -1;
+				list_append(ctx, s);
+				ctx->pst = PST_BSTR;
+				goto do_bstr;
+			}
+			else {
+				proto_node_t *s = str_new(ctx, ctx->tcurr, 0);
+				if (s == NULL)
+					return -1;
+				s->data.s.str = malloc(18);
+				list_append(ctx, s);
+				if (s->data.s.str == NULL)
+					goto error;
+				ctx->pst = PST_TSTR;
+				goto do_tstr;
+			}
+
+		case PST_TSTR:
+			do_tstr:;
+			if (c == ' ') {
+				ctx->tcurr->data.s.str[ctx->tcurr->data.s.len] = '\0';
+				pop(ctx);
+				break;
+			}
+			if ((c == ')') || (c == '}')) {
+				ctx->tcurr->data.s.str[ctx->tcurr->data.s.len] = '\0';
+				pop(ctx);
+				goto do_list;
+			}
+			if (chr_is_bin(c)) /* invalid: binary char in text string */
+				return -1;
+			if (ctx->tcurr->data.s.len >= 16) /* invalid: text string too long */
+				return -1;
+			ctx->tcurr->data.s.str[ctx->tcurr->data.s.len++] = c;
+			break;
+
+		case PST_BSTR:
+			do_bstr:;
+			if (ctx->tcurr->in_len) { /* parsing length */
+				int res = base64_parse_grow(&ctx->tcurr->data.s.len, c, '=');
+				if (res < 0) /* invalid length field */
+					return -1;
+				if (res == 0) /* proceed with len parsing */
+					break;
+				/* seen terminator, len parsing finished */
+				if (ctx->palloc + ctx->tcurr->data.s.len > MAX_FIELD_ALLOC) /* limit allocation */
+					return -1;
+				ctx->tcurr->in_len = 0;
+				if (ctx->tcurr->data.s.len == 0) {
+					pop(ctx);
+					break;
+				}
+				ctx->palloc += ctx->tcurr->data.s.len;
+				ctx->tcurr->data.s.str = malloc(ctx->tcurr->data.s.len+1);
+				ctx->tcurr->data.s.str[ctx->tcurr->data.s.len] = '\0';
+				if (ctx->tcurr->data.s.str == NULL)
+					return -1;
+			}
+			else { /* parsing the actual string */
+				ctx->tcurr->data.s.str[ctx->tcurr->data.s.pos++] = c;
+				if (ctx->tcurr->data.s.pos >= ctx->tcurr->data.s.len) {
+					pop(ctx);
+					break;
+				}
+			}
+			break;
+	}
+
+	return PRES_PROCEED;
+
+	error:;
+	proto_node_free(ctx->targ);
+	ctx->targ = ctx->tcurr = NULL;
+	return PRES_ERR;
+}
+
+/* Helpers */
+static proto_node_t *child1(proto_node_t *lst)
+{
+	if ((lst != NULL) && (lst->is_list))
+		return lst->data.l.first_child;
+	return NULL;
+}
+
+static proto_node_t *next(proto_node_t *nd)
+{
+	if (nd != NULL)
+		return nd->next;
+	return NULL;
+}
+
+static int is_list(proto_node_t *nd)
+{
+	return (nd != NULL) && nd->is_list;
+}
+
+static int is_str(proto_node_t *nd)
+{
+	return (nd != NULL) && !nd->is_list;
+}
+
+static char *astr(proto_node_t *nd)
+{
+	if ((nd != NULL) && !nd->is_list)
+		return nd->data.s.str;
+	return NULL;
+}
+
+static int aint(proto_node_t *nd, int badval)
+{
+	char *s = astr(nd), *end;
+	long int l;
+	if (s == NULL)
+		return badval;
+	l = strtol(s, &end, 10);
+	if (*end != '\0')
+		return badval;
+	return l;
+}
+
+static double adbl(proto_node_t *nd, double badval)
+{
+	char *s = astr(nd), *end;
+	double d;
+	if (s == NULL)
+		return badval;
+	d = strtod(s, &end);
+	if (*end != '\0')
+		return badval;
+	return d;
+}
Index: tags/2.0.1/src_plugins/hid_remote/proto_lowsend.h
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/proto_lowsend.h	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/proto_lowsend.h	(revision 18980)
@@ -0,0 +1,158 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <unistd.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include "base64.h"
+
+#define SUBSEQ_MASK (1 << (ctx->depth - 1))
+
+static int send_raw(proto_ctx_t *ctx, const void *data, size_t len)
+{
+	return write(1, data, len);
+}
+
+#define PREFIX_LEN 10
+static int sendf(proto_ctx_t *ctx, const char *fmt, ...)
+{
+	va_list ap;
+	char buff[8192];
+	char *out_start, *payload = buff + PREFIX_LEN;
+	size_t slen, len, payload_len = sizeof(buff) - PREFIX_LEN;
+
+	va_start(ap, fmt);
+	len = proto_vsnprintf(payload, payload_len, fmt, ap);
+	if (len >= payload_len-1)
+		return -1; /* too long, won't split for now */
+	va_end(ap);
+
+	if (ctx->bindepth > 0) {
+		size_t blen;
+		payload[-1] = '='; /* separator */
+		blen = base64_write_right(buff, PREFIX_LEN-2, len);
+		if (blen <= 0)
+			return -1;
+		blen++; /* for the separator */
+		out_start = payload - blen;
+		len += blen;
+	}
+	else
+		out_start = payload;
+
+	if (ctx->subseq_tab & SUBSEQ_MASK) {
+		/* subsequent field on the given level, insert a space */
+		out_start--;
+		*out_start = ' ';
+		len++;
+	}
+
+	slen = send_raw(ctx, out_start, len);
+
+	/* next on this field will be subsequent */
+	ctx->subseq_tab |= SUBSEQ_MASK;
+
+	if (slen != len)
+		return -1;
+	return 0;
+}
+
+#warning TODO: this is unsafe, s can have %
+static int sends(proto_ctx_t *ctx, const char *s)
+{
+	if (s == NULL)
+		s = "";
+	return sendf(ctx, s);
+}
+
+
+static int send_open(proto_ctx_t *ctx, int bin, int first_arg)
+{
+	int res;
+
+	if (!first_arg) {
+		if (send_raw(ctx, " ", 1) != 1)
+		return -1;
+	}
+
+	if (bin || (ctx->bindepth > 0)) {
+		res = send_raw(ctx, "{", 1);
+		ctx->bindepth++;
+	}
+	else
+		res = send_raw(ctx, "(", 1);
+	ctx->depth++;
+	ctx->subseq_tab &= ~SUBSEQ_MASK;
+
+	if (res != 1)
+		return -1;
+	return 0;
+}
+
+static int send_close(proto_ctx_t *ctx)
+{
+	int res;
+	if (ctx->bindepth > 0) {
+		res = send_raw(ctx, "}", 1);
+		ctx->bindepth--;
+	}
+	else
+		res = send_raw(ctx, ")", 1);
+	ctx->depth--;
+
+	if (res != 1)
+		return -1;
+	return 0;
+}
+
+static int send_begin(proto_ctx_t *ctx, const char *s)
+{
+	ctx->depth = 0;
+	ctx->bindepth = 0;
+	return send_raw(ctx, s, strlen(s));
+}
+
+static int send_end(proto_ctx_t *ctx)
+{
+	while(ctx->depth > 0)
+		if (send_close(ctx) < 0)
+			return -1;
+	return send_raw(ctx, "\n", 1);
+}
+
+/* Returns whether str needs to be sent as binary */
+static int str_is_bin(const char *str)
+{
+	const char *s;
+	int l;
+	if ((str == NULL) || (*str == '\0')) /* empty string can be encoded in bin only */
+		return 1;
+	for(s = str, l = 0; *s != '\0'; s++,l++)
+		if ((l > 16) || (chr_is_bin(*s)))
+			return 1;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/hid_remote/remote.c
===================================================================
--- tags/2.0.1/src_plugins/hid_remote/remote.c	(nonexistent)
+++ tags/2.0.1/src_plugins/hid_remote/remote.c	(revision 18980)
@@ -0,0 +1,496 @@
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "hid.h"
+#include "data.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "event.h"
+
+#include "proto.h"
+
+#include "hid_draw_helpers.h"
+#include "hid_nogui.h"
+#include "actions.h"
+#include "hid_init.h"
+
+static const char *remote_cookie = "remote HID";
+
+static pcb_hid_t remote_hid;
+
+typedef struct hid_gc_s {
+	pcb_core_gc_t core_gc;
+	int nop;
+} hid_gc_s;
+
+static pcb_hid_attribute_t *remote_get_export_options(int *n_ret)
+{
+	if (n_ret != NULL)
+		*n_ret = 0;
+	return 0;
+}
+
+/* ----------------------------------------------------------------------------- */
+
+static void ev_pcb_changed(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+}
+
+
+/*pcb_action_t remote_action_list[] = {
+};
+
+PCB_REGISTER_ACTIONS(remote_action_list, remote_cookie)*/
+
+
+static void remote_send_all_layers()
+{
+	pcb_layer_id_t arr[128];
+	pcb_layergrp_id_t garr[128];
+	int n, used;
+
+	used = pcb_layergrp_list_any(PCB, PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, garr, sizeof(garr)/sizeof(garr[0]));
+	for(n = 0; n < used; n++) {
+		pcb_layergrp_id_t gid = garr[n];
+		pcb_remote_new_layer_group(pcb_layergrp_name(PCB, gid), gid, pcb_layergrp_flags(PCB, gid));
+	}
+
+	used = pcb_layer_list_any(PCB, PCB_LYT_ANYTHING | PCB_LYT_ANYWHERE | PCB_LYT_VIRTUAL, arr, sizeof(arr)/sizeof(arr[0]));
+
+#warning layer TODO: remove this temporary hack for virtual layers
+	for(n = 0; n < used; n++) {
+		const char *name;
+		pcb_layer_id_t layer_id = arr[n];
+		pcb_layergrp_id_t gid = pcb_layer_get_group(PCB, layer_id);
+		name = pcb_layer_name(PCB->Data, layer_id);
+		if ((gid < 0) && (name != NULL)) {
+			pcb_remote_new_layer_group(name, layer_id, pcb_layer_flags(PCB, layer_id));
+			pcb_remote_new_layer(name, layer_id, layer_id);
+		}
+	}
+
+
+	for(n = 0; n < used; n++) {
+		pcb_layer_id_t lid = arr[n];
+		pcb_layergrp_id_t gid = pcb_layer_get_group(PCB, lid);
+		if (gid >= 0)
+			pcb_remote_new_layer(pcb_layer_name(PCB->Data, lid), lid, gid);
+	}
+}
+
+
+/* ----------------------------------------------------------------------------- */
+static int remote_stay;
+static void remote_do_export(pcb_hid_attr_val_t * options)
+{
+	pcb_hid_expose_ctx_t ctx;
+
+	ctx.view.X1 = 0;
+	ctx.view.Y1 = 0;
+	ctx.view.X2 = PCB->MaxWidth;
+	ctx.view.Y2 = PCB->MaxHeight;
+
+#warning TODO: wait for a connection?
+	remote_proto_send_ver();
+	remote_proto_send_unit();
+	remote_proto_send_brddim(PCB->MaxWidth, PCB->MaxHeight);
+	remote_send_all_layers();
+	if (remote_proto_send_ready() != 0)
+		exit(1);
+
+	pcb_hid_expose_all(&remote_hid, &ctx);
+
+/* main loop, parser */
+	if (remote_proto_parse_all() != 0)
+		exit(1);
+}
+
+static void remote_do_exit(pcb_hid_t *hid)
+{
+	remote_stay = 0;
+}
+
+static int remote_parse_arguments(int *argc, char ***argv)
+{
+	return pcb_hid_parse_command_line(argc, argv);
+}
+
+static void remote_invalidate_lr(pcb_coord_t l, pcb_coord_t r, pcb_coord_t t, pcb_coord_t b)
+{
+	proto_send_invalidate(l,r, t, b);
+}
+
+static void remote_invalidate_all(void)
+{
+	proto_send_invalidate_all();
+}
+
+static int remote_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	if (flags & PCB_LYT_UI) /* do not draw UI layers yet, we didn't create them */
+		return 0;
+	if (flags & PCB_LYT_NOEXPORT)
+		return 0;
+	if (flags & PCB_LYT_CSECT) /* do not draw cross-sect, we didn't create them */
+		return 0;
+	if (group >= 0)
+		proto_send_set_layer_group(group, is_empty);
+	else {
+#warning layer TODO: remove this temporary hack for virtual layers
+		proto_send_set_layer_group(layer, is_empty);
+	}
+
+	return 1; /* do draw */
+}
+
+typedef struct {
+	char color[64];
+	pcb_coord_t line_width;
+	char cap;
+} remote_gc_cache_t;
+static hid_gc_s remote_gc[32];
+static remote_gc_cache_t gc_cache[32];
+
+static pcb_hid_gc_t remote_make_gc(void)
+{
+	int gci = proto_send_make_gc();
+	int max = sizeof(remote_gc) / sizeof(remote_gc[0]);
+	if (gci >= max) {
+		pcb_message(PCB_MSG_ERROR, "remote_make_gc(): GC index too high: %d >= %d\n", gci, max);
+		proto_send_del_gc(gci);
+		return NULL;
+	}
+	memset(&gc_cache[gci], 0, sizeof(remote_gc_cache_t));
+	return remote_gc+gci;
+}
+
+static int gc2idx(pcb_hid_gc_t gc)
+{
+	int idx = gc - remote_gc;
+	int max = sizeof(remote_gc) / sizeof(remote_gc[0]);
+
+	if ((idx < 0) || (idx >= max)) {
+		pcb_message(PCB_MSG_ERROR, "GC index too high: %d >= %d\n", idx, max);
+		return -1;
+	}
+	return idx;
+}
+
+static void remote_destroy_gc(pcb_hid_gc_t gc)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_del_gc(idx);
+}
+
+static const char *drawing_mode_names[] = { "reset", "positive", "negative", "flush"};
+static void remote_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *drw_screen)
+{
+	if ((op >= 0) && (op < sizeof(drawing_mode_names) / sizeof(drawing_mode_names[0])))
+		proto_send_set_drawing_mode(drawing_mode_names[op], direct);
+	else
+		pcb_message(PCB_MSG_ERROR, "Invalid drawing mode %d\n", op);
+}
+
+static void remote_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0) {
+		if (strcmp(gc_cache[idx].color, name) != 0) {
+			proto_send_set_color(idx, name);
+			strcpy(gc_cache[idx].color, name);
+		}
+	}
+}
+
+/* r=round, s=square, b=beveled (octagon) */
+static const char *cap_style_names = "rsrb";
+static void remote_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	int idx = gc2idx(gc);
+	int max = strlen(cap_style_names);
+
+
+	if (style >= max) {
+		pcb_message(PCB_MSG_ERROR, "can't set invalid cap style: %d >= %d\n", style, max);
+		return;
+	}
+	if (idx >= 0) {
+		char cs = cap_style_names[style];
+		if (cs != gc_cache[idx].cap) {
+			proto_send_set_line_cap(idx, cs);
+			gc_cache[idx].cap = cs;
+		}
+	}
+}
+
+static void remote_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0) {
+		if (width != gc_cache[idx].line_width) {
+			proto_send_set_line_width(idx, width);
+			gc_cache[idx].line_width = width;
+		}
+	}
+}
+
+static void remote_set_draw_xor(pcb_hid_gc_t gc, int xor_set)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_set_draw_xor(idx, xor_set);
+}
+
+static void remote_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_line(idx, x1, y1, x2, y2);
+}
+
+static void remote_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t width, pcb_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_arc(idx, cx, cy, width, height, start_angle, delta_angle);
+}
+
+static void remote_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_rect(idx, x1, y1, x2, y2, 0);
+}
+
+static void remote_fill_circle(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t radius)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_fill_circle(idx, cx, cy, radius);
+}
+
+static void remote_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_poly(idx, n_coords, x, y, 0, 0);
+}
+
+static void remote_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_poly(idx, n_coords, x, y, dx, dy);
+}
+
+static void remote_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	int idx = gc2idx(gc);
+	if (idx >= 0)
+		proto_send_draw_rect(idx, x1, y1, x2, y2, 1);
+}
+
+static void remote_calibrate(double xval, double yval)
+{
+}
+
+static int remote_shift_is_pressed(void)
+{
+	return 0;
+}
+
+static int remote_control_is_pressed(void)
+{
+	return 0;
+}
+
+static int remote_mod1_is_pressed(void)
+{
+	return 0;
+}
+
+static void remote_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+}
+
+static void remote_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+}
+
+static pcb_hidval_t remote_add_timer(void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	pcb_hidval_t rv;
+	rv.lval = 0;
+	return rv;
+}
+
+static void remote_stop_timer(pcb_hidval_t timer)
+{
+}
+
+pcb_hidval_t
+remote_watch_file(int fd, unsigned int condition, pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data),
+								 pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	ret.ptr = NULL;
+	return ret;
+}
+
+void remote_unwatch_file(pcb_hidval_t data)
+{
+}
+
+static pcb_hidval_t remote_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	ret.ptr = NULL;
+	return ret;
+}
+
+static void remote_stop_block_hook(pcb_hidval_t mlpoll)
+{
+}
+
+static void *remote_attr_dlg_new(pcb_hid_attribute_t *attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+{
+	return NULL;
+}
+
+static int remote_attr_dlg_run(void *hid_ctx)
+{
+	return 0;
+}
+
+static void remote_attr_dlg_free(void *hid_ctx)
+{
+}
+
+static void remote_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val)
+{
+}
+
+static int remote_attribute_dialog(pcb_hid_attribute_t * attrs_, int n_attrs_, pcb_hid_attr_val_t * results_, const char *title_, const char *descr_, void *caller_data)
+{
+	return 0;
+}
+
+static void remote_show_item(void *item)
+{
+}
+
+static void remote_create_menu(const char *menu, const char *action, const char *mnemonic, const char *accel, const char *tip, const char *cookie)
+{
+}
+
+static int remote_propedit_start(void *pe, int num_props, const char *(*query)(void *pe, const char *cmd, const char *key, const char *val, int idx))
+{
+	return 0;
+}
+
+static void remote_propedit_end(void *pe)
+{
+}
+
+static void *remote_propedit_add_prop(void *pe, const char *propname, int is_mutable, int num_vals)
+{
+	return NULL;
+}
+
+static void remote_propedit_add_value(void *pe, const char *propname, void *propctx, const char *value, int repeat_cnt)
+{
+}
+
+static void remote_propedit_add_stat(void *pe, const char *propname, void *propctx, const char *most_common, const char *min, const char *max, const char *avg)
+{
+}
+
+
+#include "dolists.h"
+
+
+int pplg_check_ver_hid_remote(int ver_needed) { return 0; }
+
+void pplg_uninit_hid_remote(void)
+{
+/*	pcb_remove_actions_by_cookie(remote_cookie);*/
+	pcb_event_unbind_allcookie(remote_cookie);
+}
+
+int pplg_init_hid_remote(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&remote_hid, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(&remote_hid);
+	pcb_dhlp_draw_helpers_init(&remote_hid);
+
+	remote_hid.struct_size = sizeof(pcb_hid_t);
+	remote_hid.name = "remote";
+	remote_hid.description = "remote-mode GUI for non-interactive use.";
+	remote_hid.gui = 1;
+
+	remote_hid.get_export_options = remote_get_export_options;
+	remote_hid.do_export = remote_do_export;
+	remote_hid.do_exit = remote_do_exit;
+	remote_hid.parse_arguments = remote_parse_arguments;
+	remote_hid.invalidate_lr = remote_invalidate_lr;
+	remote_hid.invalidate_all = remote_invalidate_all;
+	remote_hid.set_layer_group = remote_set_layer_group;
+	remote_hid.make_gc = remote_make_gc;
+	remote_hid.destroy_gc = remote_destroy_gc;
+	remote_hid.set_drawing_mode = remote_set_drawing_mode;
+	remote_hid.set_color = remote_set_color;
+	remote_hid.set_line_cap = remote_set_line_cap;
+	remote_hid.set_line_width = remote_set_line_width;
+	remote_hid.set_draw_xor = remote_set_draw_xor;
+	remote_hid.draw_line = remote_draw_line;
+	remote_hid.draw_arc = remote_draw_arc;
+	remote_hid.draw_rect = remote_draw_rect;
+	remote_hid.fill_circle = remote_fill_circle;
+	remote_hid.fill_polygon = remote_fill_polygon;
+	remote_hid.fill_polygon_offs = remote_fill_polygon_offs;
+	remote_hid.fill_rect = remote_fill_rect;
+	remote_hid.calibrate = remote_calibrate;
+	remote_hid.shift_is_pressed = remote_shift_is_pressed;
+	remote_hid.control_is_pressed = remote_control_is_pressed;
+	remote_hid.mod1_is_pressed = remote_mod1_is_pressed;
+	remote_hid.get_coords = remote_get_coords;
+	remote_hid.set_crosshair = remote_set_crosshair;
+	remote_hid.add_timer = remote_add_timer;
+	remote_hid.stop_timer = remote_stop_timer;
+	remote_hid.watch_file = remote_watch_file;
+	remote_hid.unwatch_file = remote_unwatch_file;
+	remote_hid.add_block_hook = remote_add_block_hook;
+	remote_hid.stop_block_hook = remote_stop_block_hook;
+	remote_hid.attr_dlg_new = remote_attr_dlg_new;
+	remote_hid.attr_dlg_run = remote_attr_dlg_run;
+	remote_hid.attr_dlg_free = remote_attr_dlg_free;
+	remote_hid.attr_dlg_property = remote_attr_dlg_property;
+	remote_hid.attribute_dialog = remote_attribute_dialog;
+	remote_hid.show_item = remote_show_item;
+	remote_hid.create_menu = remote_create_menu;
+
+	remote_hid.propedit_start = remote_propedit_start;
+	remote_hid.propedit_end = remote_propedit_end;
+	remote_hid.propedit_add_prop = remote_propedit_add_prop;
+	remote_hid.propedit_add_value = remote_propedit_add_value;
+	remote_hid.propedit_add_stat = remote_propedit_add_stat;
+
+/*	PCB_REGISTER_ACTIONS(remote_action_list, remote_cookie)*/
+
+	pcb_hid_register_hid(&remote_hid);
+
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, remote_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_dsn/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_dsn/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_dsn/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_dsn
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_dsn/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_dsn/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_dsn/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_dsn}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_dsn/dsn.o @]
+
+switch /local/pcb/import_dsn/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_dsn/dsn.c
===================================================================
--- tags/2.0.1/src_plugins/import_dsn/dsn.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_dsn/dsn.c	(revision 18980)
@@ -0,0 +1,359 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  Specctra .dsn import HID
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <gensexpr/gsxl.h>
+
+#include "board.h"
+#include "data.h"
+#include "polygon.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "hid.h"
+#include "plugins.h"
+
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+static const char *dsn_cookie = "dsn importer";
+
+typedef enum {
+	TYPE_PCB,
+	TYPE_SESSION
+} dsn_type_t;
+
+static pcb_layer_id_t ses_layer_by_name(pcb_board_t *pcb, const char *name)
+{
+	char *end;
+	long gid;
+	pcb_layergrp_t *grp;
+
+	gid = strtol(name, &end, 10);
+	if ((end[0] != '_') || (end[1] != '_'))
+		return -1;
+
+	grp = pcb_get_layergrp(pcb, gid);
+	if (grp == NULL)
+		return -1;
+
+	if (strcmp(end+2, grp->name) != 0) {
+		pcb_message(PCB_MSG_ERROR, "layer (group) name mismatch: group %ld should be '%s' but is '%s'\nses file not for this board?\n", gid, grp->name, end+2);
+		return -1;
+	}
+
+	if (grp->len <= 0) {
+		pcb_message(PCB_MSG_ERROR, "layer (group) '%s' has no layers\nses file not for this board?\n", name);
+		return -1;
+	}
+
+	if (!(grp->ltype & PCB_LYT_COPPER)) {
+		pcb_message(PCB_MSG_ERROR, "layer (group) type %s should a copper layer group\nses file not for this board?\n", name);
+		return -1;
+	}
+
+	return grp->lid[0];
+}
+
+static void parse_polyline(long int *nlines, pcb_coord_t clear, const gsxl_node_t *n, const char *unit, int workaround0)
+{
+	const gsxl_node_t *c;
+	pcb_coord_t x, y, lx, ly, thick;
+	long pn;
+	const char *slayer = n->children->str;
+	const char *sthick = n->children->next->str;
+	pcb_bool succ;
+	pcb_layer_id_t lid;
+	pcb_layer_t *layer;
+
+	thick = pcb_get_value(sthick, unit, NULL, &succ);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping polyline because thickness is invalid: %s\n", sthick);
+		return;
+	}
+
+	lid = ses_layer_by_name(PCB, slayer);
+	if (lid < 0) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping polyline because layer name is invalid: %s\n", slayer);
+		return;
+	}
+	layer = PCB->Data->Layer+lid;
+
+	/*printf("- %s\n", slayer);*/
+	for(pn = 0, c = n->children->next->next; c != NULL; pn++, c = c->next->next) {
+		const char *sx = c->str;
+		const char *sy = c->next->str;
+		x = pcb_get_value(sx, unit, NULL, &succ);
+		if (!succ) {
+			pcb_message(PCB_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sx);
+			return;
+		}
+		y = pcb_get_value(sy, unit, NULL, &succ);
+		if (!succ) {
+			pcb_message(PCB_MSG_ERROR, "import_dsn: skipping polyline segment because x coord is invalid: %s\n", sy);
+			return;
+		}
+		if (workaround0 && ((y < PCB_MM_TO_COORD(0.01)) || (x < PCB_MM_TO_COORD(0.01)))) /* workaround for broken polyline coords */
+			return;
+		(*nlines)++;
+		if (pn > 0) {
+			/*pcb_line_t *line = */pcb_line_new_merge(layer, lx, PCB->MaxHeight - ly,
+				x, PCB->MaxHeight - y, thick, clear, pcb_flag_make(PCB_FLAG_AUTO | PCB_FLAG_CLEARLINE));
+/*				pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, layer, line);*/
+/*				pcb_printf("LINE: %$mm %$mm .. %$mm %$mm\n", lx, ly, x, y);*/
+		}
+		lx = x;
+		ly = y;
+	}
+}
+
+static void parse_wire(long int *nlines, pcb_coord_t clear, const gsxl_node_t *wire, dsn_type_t type)
+{
+	const gsxl_node_t *n;
+	for(n = wire->children; n != NULL; n = n->next) {
+		if ((type == TYPE_PCB) && (strcmp(n->str, "polyline_path") == 0))
+			parse_polyline(nlines, clear, n, "mm", 1);
+		else if ((type == TYPE_SESSION) && (strcmp(n->str, "path") == 0))
+			parse_polyline(nlines, clear, n, "nm", 0);
+		else if (strcmp(n->str, "net") == 0) {
+			/* ignore */
+		}
+		else if (strcmp(n->str, "type") == 0) {
+			/* ignore */
+		}
+		else if (strcmp(n->str, "clearance_class") == 0) {
+			/* ignore */
+		}
+		else
+			pcb_message(PCB_MSG_WARNING, "import_dsn: ignoring unknown wire directive %s\n", n->str);
+	}
+}
+
+static void parse_via(pcb_coord_t clear, const gsxl_node_t *via, dsn_type_t type)
+{
+	const gsxl_node_t *c = via->children->next;
+	const char *name = via->children->str;
+	const char *sx = c->str;
+	const char *sy = c->next->str;
+	pcb_bool succ;
+	pcb_coord_t x, y, dia, drill;
+	long l1, l2;
+	const char *unit = (type == TYPE_PCB) ? "mm" : "nm";
+
+	if (strncmp(name, "via_", 4) != 0) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping via with invalid name (prefix): %s\n", name);
+		return;
+	}
+
+	name += 4;
+	if (sscanf(name, "%ld_%ld", &l1, &l2) != 2) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping via with invalid name (diameters): %s\n", name);
+		return;
+	}
+
+	dia = l1;
+	drill = l2;
+
+	x = pcb_get_value(sx, unit, NULL, &succ);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sx);
+		return;
+	}
+	y = pcb_get_value(sy, unit, NULL, &succ);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: skipping via segment because x coord is invalid: %s\n", sy);
+		return;
+	}
+
+	{
+		pcb_pstk_t *ps = pcb_pstk_new_compat_via(PCB->Data, x, PCB->MaxHeight - y, drill, dia, clear, 0, PCB_PSTK_COMPAT_ROUND, 1);
+		PCB_FLAG_SET(PCB_FLAG_AUTO, ps);
+	}
+}
+
+static const char pcb_acts_LoadDsnFrom[] = "LoadDsnFrom(filename)";
+static const char pcb_acth_LoadDsnFrom[] = "Loads the specified routed dsn file.";
+
+fgw_error_t pcb_act_LoadDsnFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	pcb_coord_t clear;
+	FILE *f;
+	gsxl_dom_t dom;
+	int c, seek_quote = 1;
+	long int nlines = 0, nvias = 0;
+	gsx_parse_res_t rs;
+	gsxl_node_t *wiring, *w, *routes, *nout, *n;
+	dsn_type_t type;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadDsnFrom, fname = argv[1].val.str);
+
+	if ((fname == NULL) || (*fname == '\0')) {
+		fname = pcb_gui->fileselect(
+			"Load a routed dsn or ses file...",
+			"Select dsn or ses file to load.\nThe file could be generated using the tool downloaded from freeroute.net\n",
+			NULL, /* default file name */
+			".dsn", "dsn", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+	}
+
+	/* load and parse the file into a dom tree */
+	f = pcb_fopen(fname, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: can't open %s for read\n", fname);
+		return 1;
+	}
+	gsxl_init(&dom, gsxl_node_t);
+	dom.parse.line_comment_char = '#';
+	do {
+		c = fgetc(f);
+		rs = gsxl_parse_char(&dom, c);
+
+		/* Workaround: skip the unbalanced '"' in string_quote */
+		if (seek_quote && (dom.parse.used == 12) && (strncmp(dom.parse.atom, "string_quote", dom.parse.used) == 0)) {
+			do {
+				c = fgetc(f);
+			} while((c != ')') && (c != EOF));
+			rs = gsxl_parse_char(&dom, ')');
+			seek_quote = 0;
+		}
+	} while(rs == GSX_RES_NEXT);
+	fclose(f);
+
+	if (rs != GSX_RES_EOE) {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: parse error in %s at %d:%d\n", fname, dom.parse.line, dom.parse.col);
+		goto error;
+	}
+	gsxl_compact_tree(&dom);
+
+
+	/* parse the tree: find wiring */
+	clear = PCB->RouteStyle.array[0].Clearance * 2;
+	if (strcmp(dom.root->str, "PCB") == 0)
+		type = TYPE_PCB;
+	else if (strcmp(dom.root->str, "session") == 0)
+		type = TYPE_SESSION;
+	else {
+		pcb_message(PCB_MSG_ERROR, "import_dsn: s-expr is not a PCB or session\n");
+		goto error;
+	}
+
+	switch(type) {
+		case TYPE_PCB:
+			for(wiring = dom.root->children; wiring != NULL; wiring = wiring->next)
+				if (strcmp(wiring->str, "wiring") == 0)
+					break;
+
+			if (wiring == NULL) {
+				pcb_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a wiring section\n");
+				goto error;
+			}
+
+			/* parse wiring */
+			for(w = wiring->children; w != NULL; w = w->next) {
+				if (strcmp(w->str, "wire") == 0)
+					parse_wire(&nlines, clear, w, type);
+				if (strcmp(w->str, "via") == 0) {
+					parse_via(clear, w, type);
+					nvias++;
+				}
+			}
+			break;
+		case TYPE_SESSION:
+			for(routes = dom.root->children; routes != NULL; routes = routes->next)
+				if (strcmp(routes->str, "routes") == 0)
+					break;
+
+			if (routes == NULL) {
+				pcb_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a routes section\n");
+				goto error;
+			}
+
+			for(nout = routes->children; nout != NULL; nout = nout->next)
+				if (strcmp(nout->str, "network_out") == 0)
+					break;
+
+			if (nout == NULL) {
+				pcb_message(PCB_MSG_ERROR, "import_dsn: s-expr does not have a network_out section\n");
+				goto error;
+			}
+
+			for(n = nout->children; n != NULL; n = n->next) {
+				for(w = n->children; w != NULL; w = w->next) {
+					if (strcmp(w->str, "wire") == 0)
+						parse_wire(&nlines, clear, w, type);
+					if (strcmp(w->str, "via") == 0) {
+						parse_via(clear, w, type);
+						nvias++;
+					}
+				}
+			}
+			break;
+	}
+
+	pcb_message(PCB_MSG_INFO, "import_dsn: loaded %ld wires and %ld vias\n", nlines, nvias);
+
+	gsxl_uninit(&dom);
+	PCB_ACT_IRES(0);
+	return 0;
+
+	error:;
+	gsxl_uninit(&dom);
+
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+pcb_action_t dsn_action_list[] = {
+	{"LoadDsnFrom", pcb_act_LoadDsnFrom, pcb_acth_LoadDsnFrom, pcb_acts_LoadDsnFrom}
+};
+
+PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie)
+
+int pplg_check_ver_import_dsn(int ver_needed) { return 0; }
+
+void pplg_uninit_import_dsn(void)
+{
+	pcb_remove_actions_by_cookie(dsn_cookie);
+
+}
+
+#include "dolists.h"
+int pplg_init_import_dsn(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(dsn_action_list, dsn_cookie)
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/import_dsn/import_dsn.pup
===================================================================
--- tags/2.0.1/src_plugins/import_dsn/import_dsn.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_dsn/import_dsn.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class import
+$short specctra .dsn importer
+$long Import specctra .dsn files
+$state works
+$fmt-native no
+$fmt-feature-r import wires and vias from specctra .dsn
+$package auto
+default buildin
+dep lib_compat_help
+autoload 1
Index: tags/2.0.1/src_plugins/import_edif/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_edif/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_import_edif
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/import_edif/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_edif/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {import_edif}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_edif/edif.o $(PLUGDIR)/import_edif/import_edif.o @]
+append /local/pcb/mod/YACC {$(PLUGDIR)/import_edif/edif}
+
+switch /local/pcb/import_edif/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_edif/edif.c
===================================================================
--- tags/2.0.1/src_plugins/import_edif/edif.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/edif.c	(revision 18980)
@@ -0,0 +1,6247 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.2"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         edifparse
+#define yylex           ediflex
+#define yyerror         ediferror
+#define yydebug         edifdebug
+#define yynerrs         edifnerrs
+
+#define yylval          ediflval
+#define yychar          edifchar
+
+/* Copy the first part of user declarations.  */
+#line 1 "edif.y" /* yacc.c:339  */
+
+/*
+ * PCB Edif parser based heavily on:
+ *
+ *	Header: edif.y,v 1.18 87/12/07 19:59:49 roger Locked
+ */
+/************************************************************************
+ *									*
+ *				edif.y					*
+ *									*
+ *			EDIF 2.0.0 parser, Level 0			*
+ *									*
+ *	You are free to copy, distribute, use it, abuse it, make it	*
+ *	write bad tracks all over the disk ... or anything else.	*
+ *									*
+ *	Your friendly neighborhood Rogue Monster - roger@mips.com	*
+ *									*
+ ************************************************************************/
+#include <stdio.h>
+
+/* for malloc, free, atoi */
+#include <stdlib.h>
+
+/* for strcpy */
+#include <string.h>
+
+#include <ctype.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "library.h"
+#include "error.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "safe_fs.h"
+
+/* from mymem.h, not include because of the malloc junk */
+pcb_lib_menu_t *pcb_lib_menu_new(pcb_lib_t *, int *idx);
+pcb_lib_entry_t *pcb_lib_entry_new(pcb_lib_menu_t *);
+
+
+/*
+ *	Local definitions.
+ */
+#define	IDENT_LENGTH		255
+#define	Malloc(s)		malloc(s)
+#define	Free(p)			free(p)
+#define	Getc(s)			getc(s)
+#define	Ungetc(c)		ungetc(c,Input)
+
+ typedef struct _str_pair
+ {
+     char* str1;
+     char* str2;
+     struct _str_pair* next;
+ } str_pair;
+
+ typedef struct _pair_list
+ {
+     char* name;
+     str_pair* list;
+ } pair_list;
+
+ str_pair* new_str_pair(char* s1, char* s2)
+ {
+   str_pair* ps = (str_pair *)malloc(sizeof(str_pair));
+     ps->str1 = s1;
+     ps->str2 = s2;
+     ps->next = NULL;
+     return ps;
+ }
+
+ pair_list* new_pair_list(str_pair* ps)
+ {
+   pair_list* pl = (pair_list *)malloc(sizeof(pair_list));
+     pl->list = ps;
+     pl->name = NULL;
+     return pl;
+ }
+
+ void str_pair_free(str_pair* ps)
+ {
+     str_pair* node;
+     while ( ps )
+     {
+	 free(ps->str1);
+	 free(ps->str2);
+	 node = ps;
+	 ps = ps->next;
+	 free(node);
+     }
+ }
+
+ void pair_list_free(pair_list* pl)
+ {
+     str_pair_free(pl->list);
+     free(pl->name);
+     free(pl);
+ }
+
+ void define_pcb_net(str_pair* name, pair_list* nodes)
+ {
+     int tl;
+     str_pair* done_node;
+     str_pair* node;
+     char* buf;
+     char* p;
+     pcb_lib_entry_t *entry;
+     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
+
+     if ( !name->str1 )
+     {
+	 /* no net name given, stop now */
+	 /* if renamed str2 also exists and must be freed */
+	 if ( name->str2 )  free(name->str2);
+	 free(name);
+	 pair_list_free(nodes);
+	 return;
+     }
+     menu->Name = pcb_strdup (name->str1);
+     free(name->str1);
+     /* if renamed str2 also exists and must be freed */
+     if ( name->str2 )  free(name->str2);
+     free(name);
+     buf = (char *)malloc(256);
+     if ( !buf )
+     {
+	 /* no memory */
+	 pair_list_free(nodes);
+	 return;
+     }
+
+     node = nodes->list;
+     free(nodes->name);
+     free(nodes);
+     while ( node )
+     {
+	 /* check for node with no instance */
+	 if ( !node->str1 )
+	 {
+	     /* toss it and move on */
+	     free(node->str2);
+	     done_node = node;
+	     node = node->next;
+	     free(done_node);
+	     continue;
+	 }
+	 tl = strlen(node->str1) + strlen(node->str2);
+	 if ( tl + 3 > 256 )
+	 {
+	     free(buf);
+	     buf = (char *)malloc(tl+3);
+	     if ( !buf )
+	     {
+		 /* no memory */
+		 str_pair_free(node);
+		 return;
+	     }
+	 }
+	 strcpy(buf,node->str1);
+	 /* make all upper case, because of PCB funky behaviour */
+	 p=buf;
+	 while ( *p )
+	 {
+	     *p = toupper( (int) *p);
+	     p++;
+	 }
+	 /* add dash separating designator from node */
+	 *(buf+strlen(node->str1)) = '-';
+	 /* check for the edif number prefix */
+	 if ( node->str2[0] == '&' )
+	 {
+	     /* skip number prefix */
+	     strcpy(buf+strlen(node->str1)+1,node->str2 +1);
+	 }
+	 else
+	 {
+	     strcpy(buf+strlen(node->str1)+1,node->str2);
+	 }
+	 /* free the strings */
+	 free(node->str1);
+	 free(node->str2);
+	 entry = pcb_lib_entry_new(menu);
+	 entry->ListEntry = pcb_strdup(buf);
+	 done_node = node;
+	 node = node->next;
+	 free(done_node);
+     }
+ }
+
+
+/* forward function declarations */
+ static int yylex(void);
+ static void yyerror(const char *);
+ static void PopC(void);
+
+#line 273 "edif.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "edif.h".  */
+#ifndef YY_EDIF_EDIF_H_INCLUDED
+# define YY_EDIF_EDIF_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int edifdebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    EDIF_TOK_IDENT = 258,
+    EDIF_TOK_INT = 259,
+    EDIF_TOK_KEYWORD = 260,
+    EDIF_TOK_STR = 261,
+    EDIF_TOK_ANGLE = 262,
+    EDIF_TOK_BEHAVIOR = 263,
+    EDIF_TOK_CALCULATED = 264,
+    EDIF_TOK_CAPACITANCE = 265,
+    EDIF_TOK_CENTERCENTER = 266,
+    EDIF_TOK_CENTERLEFT = 267,
+    EDIF_TOK_CENTERRIGHT = 268,
+    EDIF_TOK_CHARGE = 269,
+    EDIF_TOK_CONDUCTANCE = 270,
+    EDIF_TOK_CURRENT = 271,
+    EDIF_TOK_DISTANCE = 272,
+    EDIF_TOK_DOCUMENT = 273,
+    EDIF_TOK_ENERGY = 274,
+    EDIF_TOK_EXTEND = 275,
+    EDIF_TOK_FLUX = 276,
+    EDIF_TOK_FREQUENCY = 277,
+    EDIF_TOK_GENERIC = 278,
+    EDIF_TOK_GRAPHIC = 279,
+    EDIF_TOK_INDUCTANCE = 280,
+    EDIF_TOK_INOUT = 281,
+    EDIF_TOK_INPUT = 282,
+    EDIF_TOK_LOGICMODEL = 283,
+    EDIF_TOK_LOWERCENTER = 284,
+    EDIF_TOK_LOWERLEFT = 285,
+    EDIF_TOK_LOWERRIGHT = 286,
+    EDIF_TOK_MASKLAYOUT = 287,
+    EDIF_TOK_MASS = 288,
+    EDIF_TOK_MEASURED = 289,
+    EDIF_TOK_MX = 290,
+    EDIF_TOK_MXR90 = 291,
+    EDIF_TOK_MY = 292,
+    EDIF_TOK_MYR90 = 293,
+    EDIF_TOK_NETLIST = 294,
+    EDIF_TOK_OUTPUT = 295,
+    EDIF_TOK_PCBLAYOUT = 296,
+    EDIF_TOK_POWER = 297,
+    EDIF_TOK_R0 = 298,
+    EDIF_TOK_R180 = 299,
+    EDIF_TOK_R270 = 300,
+    EDIF_TOK_R90 = 301,
+    EDIF_TOK_REQUIRED = 302,
+    EDIF_TOK_RESISTANCE = 303,
+    EDIF_TOK_RIPPER = 304,
+    EDIF_TOK_ROUND = 305,
+    EDIF_TOK_SCHEMATIC = 306,
+    EDIF_TOK_STRANGER = 307,
+    EDIF_TOK_SYMBOLIC = 308,
+    EDIF_TOK_TEMPERATURE = 309,
+    EDIF_TOK_TIE = 310,
+    EDIF_TOK_TIME = 311,
+    EDIF_TOK_TRUNCATE = 312,
+    EDIF_TOK_UPPERCENTER = 313,
+    EDIF_TOK_UPPERLEFT = 314,
+    EDIF_TOK_UPPERRIGHT = 315,
+    EDIF_TOK_VOLTAGE = 316,
+    EDIF_TOK_ACLOAD = 317,
+    EDIF_TOK_AFTER = 318,
+    EDIF_TOK_ANNOTATE = 319,
+    EDIF_TOK_APPLY = 320,
+    EDIF_TOK_ARC = 321,
+    EDIF_TOK_ARRAY = 322,
+    EDIF_TOK_ARRAYMACRO = 323,
+    EDIF_TOK_ARRAYRELATEDINFO = 324,
+    EDIF_TOK_ARRAYSITE = 325,
+    EDIF_TOK_ATLEAST = 326,
+    EDIF_TOK_ATMOST = 327,
+    EDIF_TOK_AUTHOR = 328,
+    EDIF_TOK_BASEARRAY = 329,
+    EDIF_TOK_BECOMES = 330,
+    EDIF_TOK_BETWEEN = 331,
+    EDIF_TOK_BOOLEAN = 332,
+    EDIF_TOK_BOOLEANDISPLAY = 333,
+    EDIF_TOK_BOOLEANMAP = 334,
+    EDIF_TOK_BORDERPATTERN = 335,
+    EDIF_TOK_BORDERWIDTH = 336,
+    EDIF_TOK_BOUNDINGBOX = 337,
+    EDIF_TOK_CELL = 338,
+    EDIF_TOK_CELLREF = 339,
+    EDIF_TOK_CELLTYPE = 340,
+    EDIF_TOK_CHANGE = 341,
+    EDIF_TOK_CIRCLE = 342,
+    EDIF_TOK_COLOR = 343,
+    EDIF_TOK_COMMENT = 344,
+    EDIF_TOK_COMMENTGRAPHICS = 345,
+    EDIF_TOK_COMPOUND = 346,
+    EDIF_TOK_CONNECTLOCATION = 347,
+    EDIF_TOK_CONTENTS = 348,
+    EDIF_TOK_CORNERTYPE = 349,
+    EDIF_TOK_CRITICALITY = 350,
+    EDIF_TOK_CURRENTMAP = 351,
+    EDIF_TOK_CURVE = 352,
+    EDIF_TOK_CYCLE = 353,
+    EDIF_TOK_DATAORIGIN = 354,
+    EDIF_TOK_DCFANINLOAD = 355,
+    EDIF_TOK_DCFANOUTLOAD = 356,
+    EDIF_TOK_DCMAXFANIN = 357,
+    EDIF_TOK_DCMAXFANOUT = 358,
+    EDIF_TOK_DELAY = 359,
+    EDIF_TOK_DELTA = 360,
+    EDIF_TOK_DERIVATION = 361,
+    EDIF_TOK_DESIGN = 362,
+    EDIF_TOK_DESIGNATOR = 363,
+    EDIF_TOK_DIFFERENCE = 364,
+    EDIF_TOK_DIRECTION = 365,
+    EDIF_TOK_DISPLAY = 366,
+    EDIF_TOK_DOMINATES = 367,
+    EDIF_TOK_DOT = 368,
+    EDIF_TOK_DURATION = 369,
+    EDIF_TOK_E = 370,
+    EDIF_TOK_EDIF = 371,
+    EDIF_TOK_EDIFLEVEL = 372,
+    EDIF_TOK_EDIFVERSION = 373,
+    EDIF_TOK_ENCLOSUREDISTANCE = 374,
+    EDIF_TOK_ENDTYPE = 375,
+    EDIF_TOK_ENTRY = 376,
+    EDIF_TOK_EVENT = 377,
+    EDIF_TOK_EXACTLY = 378,
+    EDIF_TOK_EXTERNAL = 379,
+    EDIF_TOK_FABRICATE = 380,
+    EDIF_TOK_FALSE = 381,
+    EDIF_TOK_FIGURE = 382,
+    EDIF_TOK_FIGUREAREA = 383,
+    EDIF_TOK_FIGUREGROUP = 384,
+    EDIF_TOK_FIGUREGROUPOBJECT = 385,
+    EDIF_TOK_FIGUREGROUPOVERRIDE = 386,
+    EDIF_TOK_FIGUREGROUPREF = 387,
+    EDIF_TOK_FIGUREPERIMETER = 388,
+    EDIF_TOK_FIGUREWIDTH = 389,
+    EDIF_TOK_FILLPATTERN = 390,
+    EDIF_TOK_FOLLOW = 391,
+    EDIF_TOK_FORBIDDENEVENT = 392,
+    EDIF_TOK_GLOBALPORTREF = 393,
+    EDIF_TOK_GREATERTHAN = 394,
+    EDIF_TOK_GRIDMAP = 395,
+    EDIF_TOK_IGNORE = 396,
+    EDIF_TOK_INCLUDEFIGUREGROUP = 397,
+    EDIF_TOK_INITIAL = 398,
+    EDIF_TOK_INSTANCE = 399,
+    EDIF_TOK_INSTANCEBACKANNOTATE = 400,
+    EDIF_TOK_INSTANCEGROUP = 401,
+    EDIF_TOK_INSTANCEMAP = 402,
+    EDIF_TOK_INSTANCEREF = 403,
+    EDIF_TOK_INTEGER = 404,
+    EDIF_TOK_INTEGERDISPLAY = 405,
+    EDIF_TOK_INTERFACE = 406,
+    EDIF_TOK_INTERFIGUREGROUPSPACING = 407,
+    EDIF_TOK_INTERSECTION = 408,
+    EDIF_TOK_INTRAFIGUREGROUPSPACING = 409,
+    EDIF_TOK_INVERSE = 410,
+    EDIF_TOK_ISOLATED = 411,
+    EDIF_TOK_JOINED = 412,
+    EDIF_TOK_JUSTIFY = 413,
+    EDIF_TOK_KEYWORDDISPLAY = 414,
+    EDIF_TOK_KEYWORDLEVEL = 415,
+    EDIF_TOK_KEYWORDMAP = 416,
+    EDIF_TOK_LESSTHAN = 417,
+    EDIF_TOK_LIBRARY = 418,
+    EDIF_TOK_LIBRARYREF = 419,
+    EDIF_TOK_LISTOFNETS = 420,
+    EDIF_TOK_LISTOFPORTS = 421,
+    EDIF_TOK_LOADDELAY = 422,
+    EDIF_TOK_LOGICASSIGN = 423,
+    EDIF_TOK_LOGICINPUT = 424,
+    EDIF_TOK_LOGICLIST = 425,
+    EDIF_TOK_LOGICMAPINPUT = 426,
+    EDIF_TOK_LOGICMAPOUTPUT = 427,
+    EDIF_TOK_LOGICONEOF = 428,
+    EDIF_TOK_LOGICOUTPUT = 429,
+    EDIF_TOK_LOGICPORT = 430,
+    EDIF_TOK_LOGICREF = 431,
+    EDIF_TOK_LOGICVALUE = 432,
+    EDIF_TOK_LOGICWAVEFORM = 433,
+    EDIF_TOK_MAINTAIN = 434,
+    EDIF_TOK_MATCH = 435,
+    EDIF_TOK_MEMBER = 436,
+    EDIF_TOK_MINOMAX = 437,
+    EDIF_TOK_MINOMAXDISPLAY = 438,
+    EDIF_TOK_MNM = 439,
+    EDIF_TOK_MULTIPLEVALUESET = 440,
+    EDIF_TOK_MUSTJOIN = 441,
+    EDIF_TOK_NAME = 442,
+    EDIF_TOK_NET = 443,
+    EDIF_TOK_NETBACKANNOTATE = 444,
+    EDIF_TOK_NETBUNDLE = 445,
+    EDIF_TOK_NETDELAY = 446,
+    EDIF_TOK_NETGROUP = 447,
+    EDIF_TOK_NETMAP = 448,
+    EDIF_TOK_NETREF = 449,
+    EDIF_TOK_NOCHANGE = 450,
+    EDIF_TOK_NONPERMUTABLE = 451,
+    EDIF_TOK_NOTALLOWED = 452,
+    EDIF_TOK_NOTCHSPACING = 453,
+    EDIF_TOK_NUMBER = 454,
+    EDIF_TOK_NUMBERDEFINITION = 455,
+    EDIF_TOK_NUMBERDISPLAY = 456,
+    EDIF_TOK_OFFPAGECONNECTOR = 457,
+    EDIF_TOK_OFFSETEVENT = 458,
+    EDIF_TOK_OPENSHAPE = 459,
+    EDIF_TOK_ORIENTATION = 460,
+    EDIF_TOK_ORIGIN = 461,
+    EDIF_TOK_OVERHANGDISTANCE = 462,
+    EDIF_TOK_OVERLAPDISTANCE = 463,
+    EDIF_TOK_OVERSIZE = 464,
+    EDIF_TOK_OWNER = 465,
+    EDIF_TOK_PAGE = 466,
+    EDIF_TOK_PAGESIZE = 467,
+    EDIF_TOK_PARAMETER = 468,
+    EDIF_TOK_PARAMETERASSIGN = 469,
+    EDIF_TOK_PARAMETERDISPLAY = 470,
+    EDIF_TOK_PATH = 471,
+    EDIF_TOK_PATHDELAY = 472,
+    EDIF_TOK_PATHWIDTH = 473,
+    EDIF_TOK_PERMUTABLE = 474,
+    EDIF_TOK_PHYSICALDESIGNRULE = 475,
+    EDIF_TOK_PLUG = 476,
+    EDIF_TOK_POINT = 477,
+    EDIF_TOK_POINTDISPLAY = 478,
+    EDIF_TOK_POINTLIST = 479,
+    EDIF_TOK_POLYGON = 480,
+    EDIF_TOK_PORT = 481,
+    EDIF_TOK_PORTBACKANNOTATE = 482,
+    EDIF_TOK_PORTBUNDLE = 483,
+    EDIF_TOK_PORTDELAY = 484,
+    EDIF_TOK_PORTGROUP = 485,
+    EDIF_TOK_PORTIMPLEMENTATION = 486,
+    EDIF_TOK_PORTINSTANCE = 487,
+    EDIF_TOK_PORTLIST = 488,
+    EDIF_TOK_PORTLISTALIAS = 489,
+    EDIF_TOK_PORTMAP = 490,
+    EDIF_TOK_PORTREF = 491,
+    EDIF_TOK_PROGRAM = 492,
+    EDIF_TOK_PROPERTY = 493,
+    EDIF_TOK_PROPERTYDISPLAY = 494,
+    EDIF_TOK_PROTECTIONFRAME = 495,
+    EDIF_TOK_PT = 496,
+    EDIF_TOK_RANGEVECTOR = 497,
+    EDIF_TOK_RECTANGLE = 498,
+    EDIF_TOK_RECTANGLESIZE = 499,
+    EDIF_TOK_RENAME = 500,
+    EDIF_TOK_RESOLVES = 501,
+    EDIF_TOK_SCALE = 502,
+    EDIF_TOK_SCALEX = 503,
+    EDIF_TOK_SCALEY = 504,
+    EDIF_TOK_SECTION = 505,
+    EDIF_TOK_SHAPE = 506,
+    EDIF_TOK_SIMULATE = 507,
+    EDIF_TOK_SIMULATIONINFO = 508,
+    EDIF_TOK_SINGLEVALUESET = 509,
+    EDIF_TOK_SITE = 510,
+    EDIF_TOK_SOCKET = 511,
+    EDIF_TOK_SOCKETSET = 512,
+    EDIF_TOK_STATUS = 513,
+    EDIF_TOK_STEADY = 514,
+    EDIF_TOK_STRING = 515,
+    EDIF_TOK_STRINGDISPLAY = 516,
+    EDIF_TOK_STRONG = 517,
+    EDIF_TOK_SYMBOL = 518,
+    EDIF_TOK_SYMMETRY = 519,
+    EDIF_TOK_TABLE = 520,
+    EDIF_TOK_TABLEDEFAULT = 521,
+    EDIF_TOK_TECHNOLOGY = 522,
+    EDIF_TOK_TEXTHEIGHT = 523,
+    EDIF_TOK_TIMEINTERVAL = 524,
+    EDIF_TOK_TIMESTAMP = 525,
+    EDIF_TOK_TIMING = 526,
+    EDIF_TOK_TRANSFORM = 527,
+    EDIF_TOK_TRANSITION = 528,
+    EDIF_TOK_TRIGGER = 529,
+    EDIF_TOK_TRUE = 530,
+    EDIF_TOK_UNCONSTRAINED = 531,
+    EDIF_TOK_UNDEFINED = 532,
+    EDIF_TOK_UNION = 533,
+    EDIF_TOK_UNIT = 534,
+    EDIF_TOK_UNUSED = 535,
+    EDIF_TOK_USERDATA = 536,
+    EDIF_TOK_VERSION = 537,
+    EDIF_TOK_VIEW = 538,
+    EDIF_TOK_VIEWLIST = 539,
+    EDIF_TOK_VIEWMAP = 540,
+    EDIF_TOK_VIEWREF = 541,
+    EDIF_TOK_VIEWTYPE = 542,
+    EDIF_TOK_VISIBLE = 543,
+    EDIF_TOK_VOLTAGEMAP = 544,
+    EDIF_TOK_WAVEVALUE = 545,
+    EDIF_TOK_WEAK = 546,
+    EDIF_TOK_WEAKJOINED = 547,
+    EDIF_TOK_WHEN = 548,
+    EDIF_TOK_WRITTEN = 549
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 202 "edif.y" /* yacc.c:355  */
+
+    char* s;
+    pair_list* pl;
+    str_pair* ps;
+
+#line 614 "edif.c" /* yacc.c:355  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ediflval;
+
+int edifparse (void);
+
+#endif /* !YY_EDIF_EDIF_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 629 "edif.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  11
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   2619
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  296
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  472
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  1129
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  1626
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   549
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint16 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   295,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   514,   514,   517,   520,   521,   522,   523,   524,   525,
+     526,   529,   532,   535,   539,   542,   543,   546,   549,   550,
+     551,   552,   553,   554,   557,   560,   561,   564,   567,   568,
+     569,   570,   571,   574,   577,   580,   581,   584,   587,   590,
+     591,   592,   593,   594,   597,   600,   603,   606,   609,   612,
+     615,   616,   617,   620,   623,   624,   627,   628,   631,   634,
+     635,   636,   637,   640,   643,   644,   647,   650,   651,   654,
+     657,   660,   663,   666,   667,   668,   669,   670,   671,   672,
+     675,   678,   681,   682,   685,   688,   691,   692,   693,   696,
+     699,   700,   701,   704,   705,   706,   709,   712,   713,   716,
+     719,   722,   723,   726,   729,   730,   731,   732,   733,   734,
+     735,   736,   739,   742,   745,   746,   747,   748,   749,   750,
+     751,   752,   753,   754,   755,   756,   757,   758,   759,   760,
+     761,   762,   765,   768,   769,   772,   775,   776,   777,   780,
+     783,   784,   787,   790,   793,   794,   795,   798,   801,   802,
+     805,   808,   809,   812,   815,   816,   819,   822,   823,   826,
+     829,   830,   833,   836,   837,   840,   843,   844,   847,   850,
+     851,   854,   857,   858,   859,   862,   865,   866,   867,   868,
+     869,   872,   875,   876,   879,   882,   885,   886,   887,   888,
+     889,   890,   891,   892,   893,   894,   895,   896,   897,   898,
+     899,   902,   905,   906,   907,   908,   911,   914,   915,   916,
+     919,   922,   923,   926,   927,   930,   931,   934,   935,   938,
+     941,   942,   945,   948,   949,   952,   955,   959,   960,   961,
+     962,   965,   968,   969,   970,   973,   977,   978,   979,   982,
+     983,   984,   985,   988,   989,   990,   993,   996,   997,   998,
+     999,  1000,  1001,  1002,  1005,  1008,  1011,  1012,  1013,  1014,
+    1015,  1018,  1021,  1024,  1027,  1028,  1029,  1030,  1031,  1032,
+    1033,  1034,  1035,  1036,  1037,  1038,  1039,  1040,  1043,  1046,
+    1049,  1052,  1053,  1054,  1057,  1060,  1061,  1062,  1063,  1064,
+    1065,  1066,  1067,  1068,  1069,  1070,  1071,  1072,  1075,  1078,
+    1079,  1082,  1085,  1086,  1087,  1088,  1089,  1090,  1091,  1092,
+    1093,  1094,  1095,  1098,  1101,  1102,  1103,  1104,  1107,  1108,
+    1109,  1110,  1111,  1114,  1117,  1118,  1119,  1120,  1123,  1126,
+    1127,  1128,  1129,  1132,  1135,  1138,  1139,  1142,  1143,  1144,
+    1145,  1148,  1151,  1152,  1155,  1158,  1159,  1160,  1161,  1162,
+    1165,  1168,  1171,  1174,  1177,  1180,  1181,  1184,  1187,  1190,
+    1191,  1192,  1193,  1194,  1195,  1196,  1197,  1198,  1199,  1202,
+    1205,  1206,  1207,  1210,  1213,  1214,  1215,  1216,  1217,  1220,
+    1223,  1224,  1227,  1230,  1231,  1232,  1233,  1234,  1237,  1238,
+    1241,  1242,  1245,  1248,  1249,  1252,  1255,  1256,  1257,  1258,
+    1261,  1264,  1265,  1266,  1267,  1268,  1269,  1270,  1271,  1272,
+    1273,  1274,  1275,  1276,  1277,  1278,  1279,  1280,  1283,  1287,
+    1288,  1289,  1290,  1293,  1296,  1297,  1298,  1299,  1302,  1305,
+    1306,  1307,  1308,  1311,  1314,  1315,  1318,  1321,  1324,  1325,
+    1326,  1327,  1330,  1333,  1334,  1335,  1336,  1337,  1338,  1339,
+    1340,  1341,  1344,  1347,  1348,  1351,  1354,  1357,  1358,  1361,
+    1364,  1367,  1370,  1373,  1376,  1379,  1380,  1381,  1382,  1383,
+    1386,  1389,  1392,  1393,  1396,  1399,  1400,  1401,  1404,  1407,
+    1408,  1411,  1414,  1415,  1418,  1419,  1420,  1423,  1424,  1425,
+    1428,  1431,  1432,  1433,  1434,  1437,  1440,  1441,  1442,  1443,
+    1446,  1449,  1450,  1453,  1456,  1457,  1460,  1463,  1466,  1469,
+    1470,  1471,  1474,  1477,  1478,  1479,  1480,  1483,  1486,  1487,
+    1488,  1489,  1492,  1495,  1496,  1499,  1502,  1503,  1504,  1505,
+    1506,  1507,  1508,  1509,  1510,  1511,  1512,  1513,  1514,  1515,
+    1516,  1519,  1522,  1523,  1524,  1525,  1526,  1529,  1532,  1533,
+    1536,  1537,  1538,  1541,  1544,  1545,  1546,  1549,  1550,  1551,
+    1554,  1557,  1558,  1561,  1564,  1565,  1566,  1567,  1570,  1573,
+    1574,  1577,  1578,  1581,  1584,  1585,  1586,  1589,  1592,  1593,
+    1596,  1599,  1600,  1601,  1602,  1603,  1606,  1609,  1610,  1613,
+    1614,  1615,  1618,  1619,  1622,  1625,  1626,  1627,  1628,  1629,
+    1630,  1631,  1632,  1633,  1634,  1637,  1640,  1641,  1642,  1643,
+    1644,  1647,  1650,  1651,  1652,  1653,  1654,  1655,  1658,  1661,
+    1662,  1663,  1666,  1669,  1670,  1671,  1674,  1677,  1678,  1679,
+    1680,  1681,  1684,  1685,  1689,  1690,  1693,  1696,  1697,  1698,
+    1699,  1702,  1705,  1708,  1709,  1710,  1713,  1716,  1717,  1718,
+    1721,  1724,  1725,  1726,  1727,  1730,  1733,  1734,  1735,  1736,
+    1739,  1742,  1743,  1746,  1749,  1750,  1751,  1752,  1755,  1758,
+    1759,  1760,  1761,  1762,  1765,  1768,  1771,  1772,  1775,  1778,
+    1779,  1780,  1781,  1782,  1783,  1784,  1785,  1788,  1791,  1795,
+    1796,  1797,  1798,  1801,  1805,  1806,  1807,  1808,  1811,  1814,
+    1815,  1818,  1821,  1824,  1825,  1826,  1827,  1828,  1829,  1830,
+    1831,  1832,  1833,  1836,  1839,  1842,  1843,  1846,  1849,  1850,
+    1853,  1856,  1859,  1860,  1863,  1866,  1867,  1870,  1873,  1876,
+    1877,  1878,  1879,  1882,  1885,  1886,  1889,  1892,  1893,  1894,
+    1895,  1898,  1901,  1902,  1905,  1908,  1909,  1912,  1915,  1918,
+    1919,  1922,  1925,  1926,  1927,  1928,  1929,  1930,  1931,  1932,
+    1933,  1934,  1935,  1936,  1937,  1940,  1943,  1944,  1945,  1946,
+    1947,  1948,  1949,  1950,  1951,  1952,  1955,  1958,  1959,  1960,
+    1961,  1964,  1967,  1968,  1969,  1970,  1973,  1976,  1977,  1978,
+    1981,  1984,  1985,  1986,  1987,  1988,  1989,  1990,  1991,  1992,
+    1993,  1994,  1997,  2000,  2001,  2002,  2003,  2004,  2005,  2006,
+    2007,  2008,  2009,  2010,  2011,  2012,  2015,  2018,  2019,  2020,
+    2023,  2026,  2029,  2030,  2031,  2032,  2033,  2036,  2037,  2040,
+    2041,  2044,  2059,  2060,  2061,  2062,  2065,  2068,  2069,  2072,
+    2075,  2076,  2079,  2082,  2083,  2084,  2085,  2086,  2089,  2092,
+    2095,  2098,  2099,  2100,  2101,  2102,  2103,  2104,  2105,  2106,
+    2107,  2108,  2109,  2112,  2113,  2114,  2115,  2116,  2117,  2120,
+    2123,  2124,  2125,  2128,  2131,  2132,  2135,  2138,  2139,  2140,
+    2141,  2144,  2148,  2149,  2152,  2153,  2156,  2159,  2160,  2163,
+    2166,  2169,  2170,  2173,  2176,  2179,  2182,  2183,  2184,  2185,
+    2188,  2191,  2192,  2195,  2198,  2201,  2202,  2203,  2204,  2205,
+    2206,  2209,  2212,  2213,  2214,  2215,  2218,  2221,  2222,  2225,
+    2228,  2229,  2232,  2235,  2236,  2239,  2242,  2243,  2246,  2249,
+    2250,  2251,  2252,  2255,  2258,  2259,  2260,  2263,  2264,  2265,
+    2268,  2271,  2274,  2275,  2276,  2277,  2280,  2281,  2284,  2287,
+    2290,  2291,  2292,  2293,  2294,  2295,  2296,  2297,  2298,  2299,
+    2300,  2301,  2302,  2303,  2306,  2309,  2310,  2313,  2316,  2317,
+    2318,  2321,  2324,  2325,  2326,  2327,  2330,  2331,  2332,  2335,
+    2338,  2339,  2340,  2341,  2342,  2343,  2344,  2347,  2350,  2353,
+    2354,  2357,  2358,  2359,  2362,  2366,  2369,  2370,  2371,  2372,
+    2373,  2376,  2380,  2381,  2384,  2385,  2388,  2389,  2392,  2393,
+    2396,  2397,  2400,  2403,  2404,  2405,  2408,  2411,  2412,  2413,
+    2414,  2417,  2420,  2421,  2422,  2423,  2424,  2425,  2428,  2431,
+    2434,  2437,  2438,  2439,  2440,  2443,  2446,  2447,  2448,  2449,
+    2450,  2451,  2452,  2453,  2454,  2455,  2456,  2457,  2458,  2459,
+    2460,  2461,  2464,  2467,  2470,  2471,  2472,  2473,  2474,  2477,
+    2478,  2481,  2482,  2485,  2488,  2491,  2492,  2493,  2494,  2495,
+    2496,  2499,  2502,  2503,  2504,  2507,  2510,  2511,  2512,  2513,
+    2514,  2515,  2516,  2517,  2518,  2521,  2524,  2527,  2530,  2531,
+    2534,  2537,  2538,  2539,  2540,  2541,  2542,  2543,  2544,  2545,
+    2546,  2549,  2552,  2555,  2558,  2561,  2564,  2565,  2566,  2567,
+    2570,  2573,  2574,  2575,  2576,  2577,  2578,  2579,  2582,  2585,
+    2586,  2587,  2588,  2589,  2590,  2591,  2594,  2597,  2600,  2603
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "EDIF_TOK_IDENT", "EDIF_TOK_INT",
+  "EDIF_TOK_KEYWORD", "EDIF_TOK_STR", "EDIF_TOK_ANGLE",
+  "EDIF_TOK_BEHAVIOR", "EDIF_TOK_CALCULATED", "EDIF_TOK_CAPACITANCE",
+  "EDIF_TOK_CENTERCENTER", "EDIF_TOK_CENTERLEFT", "EDIF_TOK_CENTERRIGHT",
+  "EDIF_TOK_CHARGE", "EDIF_TOK_CONDUCTANCE", "EDIF_TOK_CURRENT",
+  "EDIF_TOK_DISTANCE", "EDIF_TOK_DOCUMENT", "EDIF_TOK_ENERGY",
+  "EDIF_TOK_EXTEND", "EDIF_TOK_FLUX", "EDIF_TOK_FREQUENCY",
+  "EDIF_TOK_GENERIC", "EDIF_TOK_GRAPHIC", "EDIF_TOK_INDUCTANCE",
+  "EDIF_TOK_INOUT", "EDIF_TOK_INPUT", "EDIF_TOK_LOGICMODEL",
+  "EDIF_TOK_LOWERCENTER", "EDIF_TOK_LOWERLEFT", "EDIF_TOK_LOWERRIGHT",
+  "EDIF_TOK_MASKLAYOUT", "EDIF_TOK_MASS", "EDIF_TOK_MEASURED",
+  "EDIF_TOK_MX", "EDIF_TOK_MXR90", "EDIF_TOK_MY", "EDIF_TOK_MYR90",
+  "EDIF_TOK_NETLIST", "EDIF_TOK_OUTPUT", "EDIF_TOK_PCBLAYOUT",
+  "EDIF_TOK_POWER", "EDIF_TOK_R0", "EDIF_TOK_R180", "EDIF_TOK_R270",
+  "EDIF_TOK_R90", "EDIF_TOK_REQUIRED", "EDIF_TOK_RESISTANCE",
+  "EDIF_TOK_RIPPER", "EDIF_TOK_ROUND", "EDIF_TOK_SCHEMATIC",
+  "EDIF_TOK_STRANGER", "EDIF_TOK_SYMBOLIC", "EDIF_TOK_TEMPERATURE",
+  "EDIF_TOK_TIE", "EDIF_TOK_TIME", "EDIF_TOK_TRUNCATE",
+  "EDIF_TOK_UPPERCENTER", "EDIF_TOK_UPPERLEFT", "EDIF_TOK_UPPERRIGHT",
+  "EDIF_TOK_VOLTAGE", "EDIF_TOK_ACLOAD", "EDIF_TOK_AFTER",
+  "EDIF_TOK_ANNOTATE", "EDIF_TOK_APPLY", "EDIF_TOK_ARC", "EDIF_TOK_ARRAY",
+  "EDIF_TOK_ARRAYMACRO", "EDIF_TOK_ARRAYRELATEDINFO", "EDIF_TOK_ARRAYSITE",
+  "EDIF_TOK_ATLEAST", "EDIF_TOK_ATMOST", "EDIF_TOK_AUTHOR",
+  "EDIF_TOK_BASEARRAY", "EDIF_TOK_BECOMES", "EDIF_TOK_BETWEEN",
+  "EDIF_TOK_BOOLEAN", "EDIF_TOK_BOOLEANDISPLAY", "EDIF_TOK_BOOLEANMAP",
+  "EDIF_TOK_BORDERPATTERN", "EDIF_TOK_BORDERWIDTH", "EDIF_TOK_BOUNDINGBOX",
+  "EDIF_TOK_CELL", "EDIF_TOK_CELLREF", "EDIF_TOK_CELLTYPE",
+  "EDIF_TOK_CHANGE", "EDIF_TOK_CIRCLE", "EDIF_TOK_COLOR",
+  "EDIF_TOK_COMMENT", "EDIF_TOK_COMMENTGRAPHICS", "EDIF_TOK_COMPOUND",
+  "EDIF_TOK_CONNECTLOCATION", "EDIF_TOK_CONTENTS", "EDIF_TOK_CORNERTYPE",
+  "EDIF_TOK_CRITICALITY", "EDIF_TOK_CURRENTMAP", "EDIF_TOK_CURVE",
+  "EDIF_TOK_CYCLE", "EDIF_TOK_DATAORIGIN", "EDIF_TOK_DCFANINLOAD",
+  "EDIF_TOK_DCFANOUTLOAD", "EDIF_TOK_DCMAXFANIN", "EDIF_TOK_DCMAXFANOUT",
+  "EDIF_TOK_DELAY", "EDIF_TOK_DELTA", "EDIF_TOK_DERIVATION",
+  "EDIF_TOK_DESIGN", "EDIF_TOK_DESIGNATOR", "EDIF_TOK_DIFFERENCE",
+  "EDIF_TOK_DIRECTION", "EDIF_TOK_DISPLAY", "EDIF_TOK_DOMINATES",
+  "EDIF_TOK_DOT", "EDIF_TOK_DURATION", "EDIF_TOK_E", "EDIF_TOK_EDIF",
+  "EDIF_TOK_EDIFLEVEL", "EDIF_TOK_EDIFVERSION",
+  "EDIF_TOK_ENCLOSUREDISTANCE", "EDIF_TOK_ENDTYPE", "EDIF_TOK_ENTRY",
+  "EDIF_TOK_EVENT", "EDIF_TOK_EXACTLY", "EDIF_TOK_EXTERNAL",
+  "EDIF_TOK_FABRICATE", "EDIF_TOK_FALSE", "EDIF_TOK_FIGURE",
+  "EDIF_TOK_FIGUREAREA", "EDIF_TOK_FIGUREGROUP",
+  "EDIF_TOK_FIGUREGROUPOBJECT", "EDIF_TOK_FIGUREGROUPOVERRIDE",
+  "EDIF_TOK_FIGUREGROUPREF", "EDIF_TOK_FIGUREPERIMETER",
+  "EDIF_TOK_FIGUREWIDTH", "EDIF_TOK_FILLPATTERN", "EDIF_TOK_FOLLOW",
+  "EDIF_TOK_FORBIDDENEVENT", "EDIF_TOK_GLOBALPORTREF",
+  "EDIF_TOK_GREATERTHAN", "EDIF_TOK_GRIDMAP", "EDIF_TOK_IGNORE",
+  "EDIF_TOK_INCLUDEFIGUREGROUP", "EDIF_TOK_INITIAL", "EDIF_TOK_INSTANCE",
+  "EDIF_TOK_INSTANCEBACKANNOTATE", "EDIF_TOK_INSTANCEGROUP",
+  "EDIF_TOK_INSTANCEMAP", "EDIF_TOK_INSTANCEREF", "EDIF_TOK_INTEGER",
+  "EDIF_TOK_INTEGERDISPLAY", "EDIF_TOK_INTERFACE",
+  "EDIF_TOK_INTERFIGUREGROUPSPACING", "EDIF_TOK_INTERSECTION",
+  "EDIF_TOK_INTRAFIGUREGROUPSPACING", "EDIF_TOK_INVERSE",
+  "EDIF_TOK_ISOLATED", "EDIF_TOK_JOINED", "EDIF_TOK_JUSTIFY",
+  "EDIF_TOK_KEYWORDDISPLAY", "EDIF_TOK_KEYWORDLEVEL",
+  "EDIF_TOK_KEYWORDMAP", "EDIF_TOK_LESSTHAN", "EDIF_TOK_LIBRARY",
+  "EDIF_TOK_LIBRARYREF", "EDIF_TOK_LISTOFNETS", "EDIF_TOK_LISTOFPORTS",
+  "EDIF_TOK_LOADDELAY", "EDIF_TOK_LOGICASSIGN", "EDIF_TOK_LOGICINPUT",
+  "EDIF_TOK_LOGICLIST", "EDIF_TOK_LOGICMAPINPUT",
+  "EDIF_TOK_LOGICMAPOUTPUT", "EDIF_TOK_LOGICONEOF", "EDIF_TOK_LOGICOUTPUT",
+  "EDIF_TOK_LOGICPORT", "EDIF_TOK_LOGICREF", "EDIF_TOK_LOGICVALUE",
+  "EDIF_TOK_LOGICWAVEFORM", "EDIF_TOK_MAINTAIN", "EDIF_TOK_MATCH",
+  "EDIF_TOK_MEMBER", "EDIF_TOK_MINOMAX", "EDIF_TOK_MINOMAXDISPLAY",
+  "EDIF_TOK_MNM", "EDIF_TOK_MULTIPLEVALUESET", "EDIF_TOK_MUSTJOIN",
+  "EDIF_TOK_NAME", "EDIF_TOK_NET", "EDIF_TOK_NETBACKANNOTATE",
+  "EDIF_TOK_NETBUNDLE", "EDIF_TOK_NETDELAY", "EDIF_TOK_NETGROUP",
+  "EDIF_TOK_NETMAP", "EDIF_TOK_NETREF", "EDIF_TOK_NOCHANGE",
+  "EDIF_TOK_NONPERMUTABLE", "EDIF_TOK_NOTALLOWED", "EDIF_TOK_NOTCHSPACING",
+  "EDIF_TOK_NUMBER", "EDIF_TOK_NUMBERDEFINITION", "EDIF_TOK_NUMBERDISPLAY",
+  "EDIF_TOK_OFFPAGECONNECTOR", "EDIF_TOK_OFFSETEVENT",
+  "EDIF_TOK_OPENSHAPE", "EDIF_TOK_ORIENTATION", "EDIF_TOK_ORIGIN",
+  "EDIF_TOK_OVERHANGDISTANCE", "EDIF_TOK_OVERLAPDISTANCE",
+  "EDIF_TOK_OVERSIZE", "EDIF_TOK_OWNER", "EDIF_TOK_PAGE",
+  "EDIF_TOK_PAGESIZE", "EDIF_TOK_PARAMETER", "EDIF_TOK_PARAMETERASSIGN",
+  "EDIF_TOK_PARAMETERDISPLAY", "EDIF_TOK_PATH", "EDIF_TOK_PATHDELAY",
+  "EDIF_TOK_PATHWIDTH", "EDIF_TOK_PERMUTABLE",
+  "EDIF_TOK_PHYSICALDESIGNRULE", "EDIF_TOK_PLUG", "EDIF_TOK_POINT",
+  "EDIF_TOK_POINTDISPLAY", "EDIF_TOK_POINTLIST", "EDIF_TOK_POLYGON",
+  "EDIF_TOK_PORT", "EDIF_TOK_PORTBACKANNOTATE", "EDIF_TOK_PORTBUNDLE",
+  "EDIF_TOK_PORTDELAY", "EDIF_TOK_PORTGROUP",
+  "EDIF_TOK_PORTIMPLEMENTATION", "EDIF_TOK_PORTINSTANCE",
+  "EDIF_TOK_PORTLIST", "EDIF_TOK_PORTLISTALIAS", "EDIF_TOK_PORTMAP",
+  "EDIF_TOK_PORTREF", "EDIF_TOK_PROGRAM", "EDIF_TOK_PROPERTY",
+  "EDIF_TOK_PROPERTYDISPLAY", "EDIF_TOK_PROTECTIONFRAME", "EDIF_TOK_PT",
+  "EDIF_TOK_RANGEVECTOR", "EDIF_TOK_RECTANGLE", "EDIF_TOK_RECTANGLESIZE",
+  "EDIF_TOK_RENAME", "EDIF_TOK_RESOLVES", "EDIF_TOK_SCALE",
+  "EDIF_TOK_SCALEX", "EDIF_TOK_SCALEY", "EDIF_TOK_SECTION",
+  "EDIF_TOK_SHAPE", "EDIF_TOK_SIMULATE", "EDIF_TOK_SIMULATIONINFO",
+  "EDIF_TOK_SINGLEVALUESET", "EDIF_TOK_SITE", "EDIF_TOK_SOCKET",
+  "EDIF_TOK_SOCKETSET", "EDIF_TOK_STATUS", "EDIF_TOK_STEADY",
+  "EDIF_TOK_STRING", "EDIF_TOK_STRINGDISPLAY", "EDIF_TOK_STRONG",
+  "EDIF_TOK_SYMBOL", "EDIF_TOK_SYMMETRY", "EDIF_TOK_TABLE",
+  "EDIF_TOK_TABLEDEFAULT", "EDIF_TOK_TECHNOLOGY", "EDIF_TOK_TEXTHEIGHT",
+  "EDIF_TOK_TIMEINTERVAL", "EDIF_TOK_TIMESTAMP", "EDIF_TOK_TIMING",
+  "EDIF_TOK_TRANSFORM", "EDIF_TOK_TRANSITION", "EDIF_TOK_TRIGGER",
+  "EDIF_TOK_TRUE", "EDIF_TOK_UNCONSTRAINED", "EDIF_TOK_UNDEFINED",
+  "EDIF_TOK_UNION", "EDIF_TOK_UNIT", "EDIF_TOK_UNUSED",
+  "EDIF_TOK_USERDATA", "EDIF_TOK_VERSION", "EDIF_TOK_VIEW",
+  "EDIF_TOK_VIEWLIST", "EDIF_TOK_VIEWMAP", "EDIF_TOK_VIEWREF",
+  "EDIF_TOK_VIEWTYPE", "EDIF_TOK_VISIBLE", "EDIF_TOK_VOLTAGEMAP",
+  "EDIF_TOK_WAVEVALUE", "EDIF_TOK_WEAK", "EDIF_TOK_WEAKJOINED",
+  "EDIF_TOK_WHEN", "EDIF_TOK_WRITTEN", "')'", "$accept", "PopC", "Edif",
+  "_Edif", "EdifFileName", "EdifLevel", "EdifVersion", "AcLoad", "_AcLoad",
+  "After", "_After", "Annotate", "_Annotate", "Apply", "_Apply", "Arc",
+  "Array", "_Array", "ArrayMacro", "ArrayRelInfo", "_ArrayRelInfo",
+  "ArraySite", "AtLeast", "AtMost", "Author", "BaseArray", "Becomes",
+  "_Becomes", "Between", "__Between", "_Between", "Boolean", "_Boolean",
+  "BooleanDisp", "_BooleanDisp", "BooleanMap", "BooleanValue", "BorderPat",
+  "BorderWidth", "BoundBox", "Cell", "_Cell", "CellNameDef", "CellRef",
+  "_CellRef", "CellNameRef", "CellType", "_CellType", "Change", "__Change",
+  "_Change", "Circle", "_Circle", "Color", "Comment", "_Comment",
+  "CommGraph", "_CommGraph", "Compound", "Contents", "_Contents",
+  "ConnectLoc", "_ConnectLoc", "CornerType", "_CornerType", "Criticality",
+  "_Criticality", "CurrentMap", "Curve", "_Curve", "Cycle", "_Cycle",
+  "DataOrigin", "_DataOrigin", "DcFanInLoad", "_DcFanInLoad",
+  "DcFanOutLoad", "_DcFanOutLoad", "DcMaxFanIn", "_DcMaxFanIn",
+  "DcMaxFanOut", "_DcMaxFanOut", "Delay", "_Delay", "Delta", "_Delta",
+  "Derivation", "_Derivation", "Design", "_Design", "Designator",
+  "_Designator", "DesignNameDef", "DesignRule", "_DesignRule",
+  "Difference", "_Difference", "Direction", "_Direction", "Display",
+  "_Display", "_DisplayJust", "_DisplayOrien", "_DisplayOrg", "Dominates",
+  "_Dominates", "Dot", "_Dot", "Duration", "EncloseDist", "_EncloseDist",
+  "EndType", "_EndType", "Entry", "___Entry", "__Entry", "_Entry", "Event",
+  "_Event", "Exactly", "External", "_External", "Fabricate", "False",
+  "FigGrp", "_FigGrp", "FigGrpNameDef", "FigGrpNameRef", "FigGrpObj",
+  "_FigGrpObj", "FigGrpOver", "_FigGrpOver", "FigGrpRef", "_FigGrpRef",
+  "Figure", "_Figure", "FigureArea", "_FigureArea", "FigureOp",
+  "FigurePerim", "_FigurePerim", "FigureWidth", "_FigureWidth",
+  "FillPattern", "Follow", "__Follow", "_Follow", "Forbidden",
+  "_Forbidden", "Form", "_Form", "GlobPortRef", "GreaterThan", "GridMap",
+  "Ignore", "IncFigGrp", "_IncFigGrp", "Initial", "Instance", "_Instance",
+  "InstanceRef", "_InstanceRef", "InstBackAn", "_InstBackAn", "InstGroup",
+  "_InstGroup", "InstMap", "_InstMap", "InstNameDef", "InstNameRef",
+  "IntDisplay", "_IntDisplay", "Integer", "_Integer", "Interface",
+  "_Interface", "InterFigGrp", "_InterFigGrp", "Intersection",
+  "_Intersection", "IntraFigGrp", "_IntraFigGrp", "Inverse", "_Inverse",
+  "Isolated", "Joined", "_Joined", "Justify", "_Justify", "KeywordDisp",
+  "_KeywordDisp", "KeywordLevel", "KeywordMap", "_KeywordMap",
+  "KeywordName", "LayerNameDef", "LessThan", "LibNameDef", "LibNameRef",
+  "Library", "_Library", "LibraryRef", "ListOfNets", "_ListOfNets",
+  "ListOfPorts", "_ListOfPorts", "LoadDelay", "_LoadDelay", "LogicAssn",
+  "___LogicAssn", "__LogicAssn", "_LogicAssn", "LogicIn", "_LogicIn",
+  "LogicList", "_LogicList", "LogicMapIn", "_LogicMapIn", "LogicMapOut",
+  "_LogicMapOut", "LogicNameDef", "LogicNameRef", "LogicOneOf",
+  "_LogicOneOf", "LogicOut", "_LogicOut", "LogicPort", "_LogicPort",
+  "LogicRef", "_LogicRef", "LogicValue", "_LogicValue", "LogicWave",
+  "_LogicWave", "Maintain", "__Maintain", "_Maintain", "Match", "__Match",
+  "_Match", "Member", "_Member", "MiNoMa", "_MiNoMa", "MiNoMaDisp",
+  "_MiNoMaDisp", "MiNoMaValue", "Mnm", "_Mnm", "MultValSet", "_MultValSet",
+  "MustJoin", "_MustJoin", "Name", "_Name", "NameDef", "NameRef", "Net",
+  "_Net", "NetBackAn", "_NetBackAn", "NetBundle", "_NetBundle", "NetDelay",
+  "_NetDelay", "NetGroup", "_NetGroup", "NetMap", "_NetMap", "NetNameDef",
+  "NetNameRef", "NetRef", "_NetRef", "NoChange", "NonPermut", "_NonPermut",
+  "NotAllowed", "_NotAllowed", "NotchSpace", "_NotchSpace", "Number",
+  "_Number", "NumbDisplay", "_NumbDisplay", "NumberDefn", "_NumberDefn",
+  "OffPageConn", "_OffPageConn", "OffsetEvent", "OpenShape", "_OpenShape",
+  "Orientation", "_Orientation", "Origin", "OverhngDist", "_OverhngDist",
+  "OverlapDist", "_OverlapDist", "Oversize", "_Oversize", "Owner", "Page",
+  "_Page", "PageSize", "ParamDisp", "_ParamDisp", "Parameter",
+  "_Parameter", "ParamAssign", "Path", "_Path", "PathDelay", "_PathDelay",
+  "PathWidth", "Permutable", "_Permutable", "Plug", "_Plug", "Point",
+  "_Point", "PointDisp", "_PointDisp", "PointList", "_PointList",
+  "PointValue", "Polygon", "_Polygon", "Port", "_Port", "PortBackAn",
+  "_PortBackAn", "PortBundle", "_PortBundle", "PortDelay", "_PortDelay",
+  "PortGroup", "_PortGroup", "PortImpl", "_PortImpl", "PortInst",
+  "_PortInst", "PortList", "_PortList", "PortListAls", "PortMap",
+  "_PortMap", "PortNameDef", "PortNameRef", "PortRef", "_PortRef",
+  "Program", "_Program", "PropDisplay", "_PropDisplay", "Property",
+  "_Property", "PropNameDef", "PropNameRef", "ProtectFrame",
+  "_ProtectFrame", "Range", "RangeVector", "_RangeVector", "Rectangle",
+  "_Rectangle", "RectSize", "_RectSize", "Rename", "__Rename", "_Rename",
+  "Resolves", "_Resolves", "RuleNameDef", "Scale", "ScaledInt", "ScaleX",
+  "ScaleY", "Section", "_Section", "Shape", "_Shape", "SimNameDef",
+  "Simulate", "_Simulate", "SimulInfo", "_SimulInfo", "SingleValSet",
+  "_SingleValSet", "Site", "_Site", "Socket", "_Socket", "SocketSet",
+  "_SocketSet", "Status", "_Status", "Steady", "__Steady", "_Steady",
+  "StrDisplay", "String", "_String", "_StrDisplay", "Strong", "Symbol",
+  "_Symbol", "Symmetry", "_Symmetry", "Table", "_Table", "TableDeflt",
+  "__TableDeflt", "_TableDeflt", "Technology", "_Technology", "TextHeight",
+  "TimeIntval", "__TimeIntval", "_TimeIntval", "TimeStamp", "Timing",
+  "_Timing", "Transform", "_TransX", "_TransY", "_TransDelta",
+  "_TransOrien", "_TransOrg", "Transition", "_Transition", "Trigger",
+  "_Trigger", "True", "TypedValue", "Unconstrained", "Undefined", "Union",
+  "_Union", "Unit", "_Unit", "Unused", "UserData", "_UserData",
+  "ValueNameDef", "ValueNameRef", "Version", "View", "_View", "ViewList",
+  "_ViewList", "ViewMap", "_ViewMap", "ViewNameDef", "ViewNameRef",
+  "ViewRef", "_ViewRef", "ViewType", "_ViewType", "Visible", "VoltageMap",
+  "WaveValue", "Weak", "WeakJoined", "_WeakJoined", "When", "_When",
+  "Written", "_Written", "Ident", "Str", "Int", "Keyword", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
+     515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
+     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,   547,   548,   549,    41
+};
+# endif
+
+#define YYPACT_NINF -1333
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-1333)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+      41,   152,   149, -1333,   176,    81,   305, -1333, -1333, -1333,
+   -1333, -1333,    33, -1333, -1333,    59, -1333,   148,   317,   101,
+   -1333, -1333, -1333, -1333,   437,   150, -1333, -1333, -1333,   148,
+     148,   304,    81,   312, -1333, -1333, -1333, -1333, -1333,    33,
+   -1333, -1333,   148,   150,   316, -1333, -1333,  1508,  1780,   272,
+   -1333, -1333, -1333,   150, -1333,   148, -1333,   122,   715,   148,
+     148,   111, -1333,   997,  1020,   148,   148,   152,   148,   176,
+     300, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,   150,  1588,   280, -1333, -1333,   150, -1333,
+   -1333,   152,   152,   152, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333,   148,   150,   148,   111, -1333,    36, -1333, -1333,
+   -1333,   150, -1333, -1333, -1333,   150,   148,   150, -1333,  1023,
+     150,    66, -1333,   150,   150,   150, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333,   150,   260,   150,
+   -1333, -1333,   424, -1333,   317, -1333,   317,   273,   439, -1333,
+     148,   111, -1333, -1333, -1333, -1333,   439, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   310,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333,   148,   150, -1333,    81, -1333,   441,
+     254,   254,   266, -1333, -1333, -1333, -1333,   150,   150,   150,
+     150,   416,    49,   115,    91,   801,    77,   437,  2006, -1333,
+   -1333, -1333, -1333, -1333,    71,   148, -1333,   376, -1333, -1333,
+   -1333, -1333, -1333, -1333,   343,   445, -1333,   445, -1333,   148,
+   -1333,   158, -1333, -1333, -1333, -1333,   300, -1333, -1333, -1333,
+   -1333,   148, -1333, -1333, -1333, -1333,   276,   144, -1333, -1333,
+   -1333, -1333, -1333, -1333,   111, -1333, -1333, -1333, -1333,   260,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   150, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,   150, -1333, -1333, -1333, -1333,
+   -1333,   150,    81,   150, -1333, -1333, -1333,   546,   152, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   148,
+     437,   437,   437, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+      33, -1333,    33, -1333,    33, -1333,   150,   150,   144, -1333,
+   -1333, -1333,    33, -1333,    33, -1333, -1333, -1333, -1333,   150,
+   -1333, -1333,   132,   152,   152, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333,   468, -1333,   148,   150,   306,   306,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   144, -1333,
+   -1333, -1333, -1333, -1333,   111,   111, -1333, -1333, -1333, -1333,
+      81, -1333,  1442, -1333, -1333,  1794,   519,   832,   940, -1333,
+     148, -1333,   437,   150, -1333,   150, -1333,   150,   111,   111,
+     150,  1196, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   152,   152,   152,   152,
+     152,   152,   152,   152,   152,   152,   152, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333,   152, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     150,   152, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     148,   150, -1333, -1333, -1333,   150,   321, -1333,  1196,    81,
+    1196,  1196,   148,  1196, -1333, -1333, -1333,   150, -1333, -1333,
+   -1333, -1333, -1333,   461,   461,   461,   461,   461,   461,   461,
+     461,   461,   461,   461, -1333,  1198, -1333, -1333, -1333,   322,
+     867,   148, -1333, -1333,   150,  1263, -1333, -1333,   376, -1333,
+   -1333,  1263, -1333, -1333,   150,  1196, -1333, -1333,  1263, -1333,
+     342,   461,  1545,  1545,  1545,   461,  1545, -1333,   130,  1545,
+     461,   461,   -29,   300,    81,   276, -1333,   150, -1333, -1333,
+   -1333,    81,   276,    81, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,  1879,
+     444,   466, -1333,   425, -1333,   382, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   150, -1333, -1333, -1333,
+   -1333,   150, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   540,
+   -1333, -1333, -1333, -1333,   150, -1333, -1333,  1545,   111,   111,
+      42,   111,   111,   111,  1276, -1333, -1333, -1333, -1333,   130,
+   -1333, -1333, -1333, -1333,   130, -1333, -1333,   130, -1333, -1333,
+    1545,   130, -1333, -1333, -1333, -1333, -1333,   130, -1333, -1333,
+    1545,  1545, -1333, -1333, -1333, -1333,   130,   150,   150, -1333,
+     150,    63, -1333,    63,    63,    63,   150,   150,   150, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   150,
+   -1333, -1333,   186,   529, -1333,   653,   833,   529,   605, -1333,
+     171,   529,   581, -1333,   783, -1333, -1333,   150, -1333,   130,
+   -1333, -1333,   150,   150, -1333,    53, -1333,   150,   150,   150,
+   -1333,   150, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333,   130, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     130, -1333, -1333,   130, -1333, -1333,   -75,   361, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   990, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333,    81,   -34, -1333, -1333,    59,   548,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,   442,   460,   548, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   539,
+     523,    93,    93,    93,    93,   548, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   150,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   543,
+   -1333, -1333,   108, -1333,   108,   108, -1333,   152, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333,  1584,   148,    81,
+   -1333,   150, -1333,   150, -1333, -1333,   894, -1333,   708,   252,
+   -1333, -1333,   150, -1333,   150, -1333, -1333,   561,    46, -1333,
+   -1333,   150, -1333,   150, -1333, -1333,   150, -1333, -1333,   150,
+   -1333, -1333,   150, -1333, -1333,   150, -1333, -1333,    26,    86,
+   -1333,   431,   421,   150, -1333,   130, -1333, -1333,   531,   281,
+     152, -1333, -1333,  1023,   -73, -1333, -1333,   631, -1333,   512,
+     762, -1333, -1333,   481,   365,   588,   454, -1333,    76,   104,
+     108,   108,   108,   108,   108,   108,   104,   437,   418, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333,    51, -1333, -1333,
+     424, -1333, -1333, -1333, -1333, -1333,   150,   436,   561, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   523, -1333,
+     -31, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     523, -1333, -1333,   -31, -1333, -1333, -1333, -1333,   150,   453,
+     150, -1333, -1333, -1333, -1333,   529, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   148,   321, -1333, -1333,
+   -1333, -1333, -1333,   711,   150, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     726,   176,   529,    81, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   620,   108,   152, -1333,
+   -1333, -1333, -1333, -1333, -1333,    59,   454, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,   260,   150,   691, -1333, -1333,
+     751,   -85, -1333, -1333, -1333,  -115, -1333,   726, -1333, -1333,
+   -1333,   568,   562,   635, -1333, -1333,   449,  1253, -1333, -1333,
+      97, -1333, -1333, -1333,   448, -1333, -1333, -1333,   150, -1333,
+     384,   -24, -1333, -1333,   -24,   150, -1333, -1333,   950,   950,
+   -1333, -1333, -1333,   523, -1333, -1333, -1333, -1333, -1333,  -122,
+   -1333, -1333,   150, -1333, -1333,   150,    86,   148,   150, -1333,
+     -77, -1333, -1333, -1333,   150, -1333,   -90, -1333, -1333, -1333,
+   -1333,    33, -1333, -1333, -1333, -1333,    33, -1333, -1333,    33,
+   -1333,   148,   409, -1333,   530,   111,   150, -1333, -1333,   150,
+     260, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+     260,   260,   675,   553,   553,   675, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333,    99, -1333, -1333,
+   -1333,   812, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   679,
+   -1333, -1333,   946, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   651, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,    34,   276,   104,   104, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,  1014,   671, -1333, -1333,   634,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333,   150, -1333, -1333,
+   -1333, -1333, -1333, -1333,   950,   150,   453, -1333, -1333,  -119,
+   -1333, -1333, -1333, -1333, -1333,   150, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333,   684,   255,   255, -1333, -1333, -1333, -1333, -1333,   150,
+     624, -1333, -1333, -1333,  -117,   260,  -117, -1333, -1333, -1333,
+    -117, -1333,  -117, -1333, -1333,  -117, -1333,  -117,   269, -1333,
+   -1333, -1333,   428,   529,   104,   560, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,   -98, -1333, -1333, -1333, -1333,
+   -1333, -1333,   150, -1333,   255,   150,   255, -1333, -1333, -1333,
+   -1333,   739, -1333,   -64, -1333, -1333,    26, -1333, -1333,   -31,
+   -1333, -1333, -1333, -1333, -1333,   111,   111, -1333, -1333, -1333,
+     150,   114,    64, -1333,   150, -1333,  -127, -1333, -1333, -1333,
+   -1333,   150, -1333,   -52, -1333, -1333, -1333,   -52, -1333, -1333,
+   -1333, -1333, -1333,   150, -1333, -1333, -1333, -1333, -1333,    28,
+   -1333, -1333,   -46, -1333, -1333, -1333, -1333, -1333, -1333,   383,
+     890, -1333, -1333, -1333, -1333, -1333, -1333,  1023,   657, -1333,
+   -1333,   148, -1333,   564, -1333, -1333, -1333,    11, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,   684, -1333, -1333, -1333, -1333,
+   -1333, -1333,    81,    26, -1333, -1333, -1333, -1333, -1333,   150,
+   -1333, -1333, -1333,   150,   150, -1333,   150, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,   534, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,   113, -1333,  -117,   260, -1333, -1333, -1333,
+   -1333, -1333,   255, -1333,   890, -1333, -1333,   150, -1333, -1333,
+   -1333, -1333,    26,   150, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333, -1333,   148,   148, -1333,   725,
+   -1333,   150, -1333, -1333,   -31,   376, -1333, -1333,   150, -1333,
+   -1333, -1333, -1333,   577, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333,   260,   950, -1333, -1333, -1333,    26, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333,   150, -1333,   150,   148, -1333, -1333,
+     272, -1333, -1333, -1333, -1333, -1333,   150, -1333,   150, -1333,
+     260, -1333, -1333, -1333,   150, -1333,   150, -1333, -1333, -1333,
+     150,   -46, -1333,   280, -1333, -1333,   150, -1333, -1333, -1333,
+   -1333, -1333, -1333,   150, -1333, -1333
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       0,     0,     0,  1126,     0,     0,     0,   590,    11,   591,
+     589,     1,     0,   587,   883,     0,   882,     0,     0,     0,
+       2,   586,   588,  1127,     0,     0,   885,   884,  1128,     0,
+       0,     0,     0,   213,   211,   212,   593,   279,   592,     0,
+     946,   881,     0,     0,     0,     4,   285,     0,     0,   215,
+     214,   940,   947,     0,    12,     0,   457,     0,     0,     0,
+       0,     0,   101,     0,     0,     0,     0,     0,     0,     0,
+       0,   284,   292,   289,   290,   295,   286,   287,   291,   288,
+     296,   293,   297,   294,   443,   444,   445,   446,   447,   448,
+     449,   450,   451,     0,     0,   217,   216,    13,     0,   456,
+     458,     0,     0,     0,   929,     3,     9,     8,     6,     7,
+       5,    10,     0,     0,     0,     0,   891,     0,   136,   137,
+     138,     0,   232,   233,   234,     0,     0,     0,   848,     0,
+       0,     0,  1054,     0,     0,     0,    68,    67,   442,   683,
+     686,   684,   685,   679,   681,   682,   680,     0,     0,     0,
+     218,   455,     0,   184,     0,   462,     0,     0,     0,    70,
+       0,     0,   100,   102,   135,   231,     0,   727,    59,   396,
+     564,   656,   737,   942,  1022,  1023,  1024,  1025,  1026,     0,
+    1027,   843,   987,  1129,  1053,  1058,  1057,  1056,  1055,   345,
+     262,  1021,  1101,   678,     0,     0,   210,     0,   176,     0,
+       0,     0,     0,   928,   931,   932,   930,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   842,
+     847,   844,   846,   845,     0,     0,   687,    82,    84,   175,
+     178,   179,   177,   180,     0,     0,   256,     0,   465,     0,
+    1119,     0,    69,   892,    99,   333,     0,    58,    62,    61,
+      60,     0,   395,   398,   399,   397,     0,     0,   563,   567,
+     566,   565,   571,   572,     0,   655,   659,   658,   657,     0,
+     736,   740,   739,   738,   941,   944,   945,   943,     0,  1051,
+    1037,  1048,  1049,  1038,  1036,  1046,  1050,  1044,  1045,  1043,
+    1047,  1039,  1040,  1041,  1042,     0,   344,   349,   348,   347,
+     346,     0,     0,     0,    83,   664,   980,     0,     0,   255,
+     258,   259,   257,   260,   464,   467,   468,   466,   469,     0,
+       0,     0,     0,  1118,  1120,  1124,  1122,  1121,  1123,  1125,
+       0,    64,     0,   393,     0,   569,     0,     0,     0,   574,
+     576,   575,     0,   661,     0,   742,   701,  1035,   747,     0,
+     463,    81,     0,     0,     0,   186,   912,   979,   985,   984,
+     982,   981,   983,   986,     0,    80,     0,     0,   151,   837,
+      63,    65,   392,   394,   568,   570,  1028,  1029,     0,   660,
+     662,   741,   743,   470,     0,     0,   663,   667,   666,   665,
+       0,   460,     0,   264,   278,     0,     0,     0,     0,    73,
+       0,    47,     0,     0,   152,     0,   838,     0,     0,     0,
+       0,     0,   263,   271,   268,   269,   274,   265,   266,   270,
+     277,   267,   275,   272,   276,   273,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   185,   199,   193,
+     198,   188,   190,   187,   194,   195,   197,   196,   192,   191,
+     189,   200,     0,   911,   914,   913,   915,    88,    87,    86,
+       0,     0,  1076,    72,    77,    79,    74,    78,    76,    75,
+       0,     0,   150,   836,   573,     0,     0,   261,     0,     0,
+       0,     0,     0,     0,   320,   355,   356,     0,   318,   321,
+     322,   319,   889,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   526,     0,   506,    85,  1085,     0,
+       0,     0,  1063,   352,     0,     0,   202,   203,   299,   424,
+     425,     0,   434,   435,     0,     0,  1031,  1032,     0,   354,
+       0,     0,     0,     0,     0,     0,     0,   647,     0,     0,
+       0,     0,     0,     0,     0,     0,   220,     0,   501,   504,
+     887,     0,     0,     0,   525,   529,   539,   530,   528,   533,
+     536,   535,   534,   538,   537,   532,   540,   527,   531,     0,
+       0,     0,   383,     0,   627,     0,   822,  1075,  1083,  1080,
+    1079,  1082,  1081,  1078,  1077,  1084,     0,   890,   201,   204,
+     205,     0,   300,   423,   426,   427,   433,   699,   700,     0,
+    1030,  1033,  1034,   281,     0,   282,   283,     0,     0,     0,
+       0,     0,     0,     0,   917,   866,   865,   868,   867,     0,
+     864,   863,   314,   315,     0,   324,   325,     0,   329,   330,
+       0,     0,   429,   430,   646,   648,   649,     0,   651,   652,
+       0,     0,   578,   870,   878,   877,     0,     0,     0,   507,
+       0,     0,   436,     0,     0,     0,     0,     0,     0,  1096,
+    1098,  1099,  1097,  1091,  1093,  1092,  1094,  1100,  1095,     0,
+     401,  1065,     0,     0,   374,     0,     0,     0,     0,   606,
+       0,     0,     0,   766,     0,   994,   298,     0,   280,     0,
+     227,   228,     0,     0,    54,     0,    55,     0,     0,     0,
+     918,     0,   313,   316,   317,   323,   326,   327,   328,   331,
+     332,     0,   419,   420,   428,   431,   432,   650,   653,   654,
+       0,   689,   690,     0,   694,   695,     0,     0,   876,   879,
+     880,    66,   112,   142,   219,   221,   500,   502,   503,   505,
+     886,   888,   948,  1102,  1104,  1090,     0,   114,  1064,  1068,
+    1067,  1069,  1066,  1070,     0,   370,   391,   390,     0,     0,
+     373,   378,   375,   377,   376,   380,   382,   386,   384,   385,
+     387,   635,   634,   637,     0,     0,   605,   610,   608,   607,
+     609,   623,   626,   630,   629,   628,   631,   830,   829,   832,
+       0,     0,     0,     0,     0,     0,   765,   773,   775,   769,
+     770,   771,   772,   767,   768,   774,   787,   821,   825,   824,
+     823,   826,   698,   226,   229,   230,    45,    46,    56,     0,
+      57,   254,   351,   461,   916,   418,   421,   422,   688,   691,
+     692,   693,   696,   697,   577,   579,   869,   871,   872,     0,
+     438,   581,     0,   729,     0,     0,   851,     0,   950,  1106,
+     400,   406,   416,   414,   408,   409,   407,   411,   402,   403,
+     415,   405,   413,   404,   412,   417,   410,     0,     0,     0,
+     371,     0,   372,     0,   183,   182,     0,   996,     0,     0,
+     639,   638,     0,   640,     0,   141,   140,     0,     0,   834,
+     833,     0,   835,     0,    16,    15,     0,   155,   154,     0,
+     158,   157,     0,   161,   160,     0,   164,   163,     0,     0,
+      53,     0,     0,     0,    41,     0,    40,    39,     0,     0,
+       0,  1060,  1059,     0,     0,   828,   827,     0,   752,     0,
+       0,   903,   905,     0,     0,     0,     0,   104,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   113,
+     129,   130,   122,   117,   127,   115,   128,   119,   120,   116,
+     121,   123,   118,   125,   124,   131,   126,     0,   561,  1086,
+    1088,   369,   181,   172,   173,   174,     0,     0,     0,   995,
+     999,   998,   997,  1000,   379,   381,   636,   139,     0,   619,
+       0,   622,   624,   625,   831,    14,   153,   156,   159,   162,
+       0,   782,   783,     0,   786,   788,   789,   734,     0,   923,
+       0,    48,    38,    42,    43,     0,   817,   437,   441,   440,
+     439,   580,   585,   583,   582,   584,     0,   718,   643,   728,
+     732,   731,   730,     0,     0,   751,   761,   763,   757,   758,
+     759,   760,   756,   753,   755,   762,   754,   764,   475,   777,
+       0,     0,     0,     0,   850,   856,   861,   855,   853,   854,
+     858,   859,   852,   857,   860,   862,     0,     0,     0,   904,
+     908,   909,   906,   910,   907,     0,     0,   949,   955,   957,
+     962,   954,   952,   953,   959,   956,   960,   951,   958,   961,
+     963,  1105,  1109,  1108,  1107,     0,     0,     0,   302,   303,
+       0,     0,   335,   336,   389,     0,   388,     0,   518,   633,
+     632,     0,     0,     0,   669,   703,     0,     0,   792,   791,
+       0,   896,  1017,  1111,     0,   560,   562,  1089,     0,   171,
+       0,     0,   342,   725,     0,     0,   167,   166,     0,     0,
+     618,   621,   620,     0,   480,   479,   781,   785,   784,     0,
+      37,   965,     0,   924,    44,     0,     0,    35,     0,   719,
+       0,   207,   208,   209,     0,  1052,     0,   776,   779,   778,
+     780,     0,   453,   459,  1062,  1061,     0,   715,   849,     0,
+     840,     0,     0,    28,     0,     0,     0,    26,    25,     0,
+       0,    71,   103,   105,   108,   110,   106,   107,   109,   111,
+       0,     0,     0,     0,     0,     0,   301,   304,   311,   305,
+     306,   307,   308,   309,   310,   312,   968,     0,   337,   338,
+    1072,     0,   360,   359,   517,   520,   519,   521,   595,     0,
+     472,   612,     0,   668,   672,   671,   670,   673,   702,   710,
+     711,   707,   704,   705,   706,   709,   708,   712,   133,   790,
+     801,   796,   793,   794,   795,   798,   797,   799,   800,   895,
+     899,   897,   898,     0,     0,     0,     0,  1110,  1112,  1116,
+    1113,  1115,  1114,  1117,  1087,     0,     0,   989,   990,     0,
+     341,   343,   724,   726,   165,   496,   509,     0,    51,    50,
+      52,  1014,  1013,  1015,     0,     0,     0,   733,   735,     0,
+     922,   350,   816,   819,   818,     0,    36,   717,   642,   645,
+     644,   206,   474,   476,   477,   452,   454,   714,   716,   839,
+     841,   148,     0,     0,    27,    31,    29,    30,    32,     0,
+       0,    24,   713,   874,     0,     0,     0,   223,   144,   676,
+       0,   745,     0,   722,   749,     0,   901,     0,     0,   334,
+     339,   340,     0,     0,     0,  1002,   358,   367,   365,   362,
+     363,   366,   364,   361,   368,   594,   603,   601,   596,   598,
+     600,   599,   597,   602,   604,     0,   611,   616,   614,   613,
+     615,   617,     0,   134,     0,     0,     0,  1016,  1018,  1020,
+    1019,     0,    18,     0,   482,   483,   550,   548,   549,     0,
+     251,   250,   249,   248,   247,     0,     0,   993,   991,   992,
+       0,     0,     0,    49,     0,   478,     0,   926,   964,   966,
+      34,     0,   149,     0,   491,   493,   492,     0,   513,   515,
+     514,   820,   542,     0,   873,   875,    97,   222,   224,     0,
+     675,   677,     0,   721,   723,   748,   750,   900,   902,     0,
+       0,   967,   969,   970,  1071,  1074,  1073,     0,     0,   804,
+     803,     0,  1003,  1004,   471,   473,   132,    93,    92,    90,
+      91,   357,   936,   934,   935,     0,    17,    22,    19,    21,
+      20,    23,     0,   487,   485,   484,   486,   551,   552,     0,
+     246,   253,   252,     0,     0,   988,     0,   495,   499,   497,
+     498,   508,   511,   510,  1012,     0,   925,   927,   147,   490,
+     494,   512,   516,     0,  1103,     0,     0,   143,   145,   146,
+     744,   746,     0,   237,     0,   236,   238,     0,   972,   974,
+     973,   975,   976,     0,   802,   812,   814,   808,   809,   810,
+     811,   807,   806,   813,   805,   815,     0,     0,  1005,  1006,
+      94,     0,    95,   937,     0,   523,   488,   489,     0,   547,
+     674,   225,   353,   920,   541,   546,   544,   543,   545,    96,
+      98,     0,     0,   556,   554,   555,   243,   239,   241,   240,
+     242,   641,   977,   978,     0,   720,     0,     0,   169,  1007,
+    1008,    89,   933,   939,   938,   524,     0,   481,     0,   921,
+       0,   558,   557,   559,     0,   244,     0,   245,   971,   893,
+       0,     0,  1009,  1010,   522,   919,     0,   553,   235,   894,
+     168,   170,  1011,     0,    33,  1001
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+   -1333,   -25, -1333, -1333, -1333,     8, -1333,  -906, -1333, -1333,
+   -1333,  -265, -1333, -1333, -1333, -1333,   173, -1333, -1333, -1333,
+   -1333, -1333,   223,   139, -1333, -1333,  -996, -1333, -1333, -1333,
+   -1333,   645, -1333, -1333, -1333, -1333,  -168,   470,   473,  -285,
+     599, -1333, -1333,   -91, -1333, -1333, -1333, -1333,  -557, -1333,
+   -1333, -1333, -1333,   504,  1011, -1333,  -878, -1333, -1333, -1333,
+   -1333, -1333, -1333,  -310, -1333,  -316, -1333, -1333,  -291, -1333,
+   -1333, -1333, -1333, -1333,  -902, -1333,  -901, -1333,  -896, -1333,
+    -893, -1333,  -891, -1333, -1333, -1333,  -630, -1333, -1333, -1333,
+    -666, -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,   -26,
+   -1333, -1333, -1333, -1333, -1333, -1333, -1333, -1333,  -890, -1333,
+   -1333,   527, -1333, -1333, -1333, -1333, -1333,  -284, -1333, -1333,
+   -1333, -1333, -1333, -1333,   528, -1333,   -11,     3,  1663, -1333,
+      -7, -1333,  1085, -1333,  -880, -1333, -1333, -1333,  1301, -1333,
+   -1333, -1333, -1333,   544, -1043, -1333, -1333, -1333, -1333,   716,
+   -1333, -1333,   329, -1333,  -570, -1333, -1333, -1333,  -872, -1333,
+     308, -1333, -1333, -1333, -1333, -1333, -1333, -1333,     4, -1333,
+     180, -1333,   745, -1333, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333, -1333,  -834, -1333, -1333, -1333,  -871,
+   -1333, -1333, -1333, -1333, -1333, -1333,   263,   858, -1333, -1333,
+   -1333,  -517, -1333, -1333, -1333, -1333, -1202,  -181,  -428, -1333,
+   -1333, -1333, -1333, -1333, -1109, -1333, -1333, -1333, -1333, -1333,
+     -99,  -514, -1097, -1333, -1333, -1333, -1333, -1333, -1332, -1333,
+   -1333, -1333, -1227, -1333,  -420, -1333, -1333, -1333, -1333, -1333,
+    -665, -1333,   769, -1333,  -193, -1333,  -209, -1333,    90, -1333,
+   -1333, -1333, -1333,   355, -1333,   903,   128, -1025, -1333, -1333,
+   -1333,  -141, -1333,  -242, -1333,  -287, -1333, -1333, -1333,    55,
+     123,  -674, -1333,  -502, -1333, -1333, -1333, -1333, -1333, -1333,
+     813, -1333,   472, -1333, -1333, -1333, -1333, -1333,  -251, -1333,
+   -1333,  -560, -1333,  -582, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,   -83,   105, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333, -1333,   656,  -864, -1333, -1333, -1333,   830, -1333,
+   -1333, -1333,  -155, -1333,  -210, -1333, -1333,  -113, -1333, -1333,
+   -1333,  -105, -1333,  -889, -1333,  -213, -1333,  -803, -1333, -1333,
+   -1333,  -874, -1333, -1333, -1333, -1333,  -679,  -882,   502, -1333,
+   -1333, -1333,  -699, -1333,   767, -1333, -1333, -1333, -1333, -1333,
+     845,   339, -1333,  -942, -1333, -1333, -1333, -1333, -1333, -1333,
+   -1333, -1333,   902, -1333,   141, -1333, -1333,   -44, -1333, -1333,
+   -1333, -1333,   213, -1333, -1333, -1333,   411, -1333, -1333, -1333,
+   -1333, -1333, -1333, -1333,  -189, -1333,  -363, -1333, -1333,  -214,
+     873, -1333, -1333, -1333, -1333, -1333,  -195, -1333, -1300, -1333,
+   -1333, -1333, -1333,   904, -1333,   712, -1333, -1333, -1333, -1333,
+    -706, -1333, -1248, -1333, -1333, -1333, -1333, -1333,  -980,  -186,
+   -1333, -1333, -1333,  -912, -1333, -1333, -1333, -1333,  -467, -1333,
+   -1089,  1032, -1333, -1333,  -241,   742, -1333, -1333,  -235, -1333,
+   -1333, -1333, -1333, -1333,  -770, -1333, -1333, -1333,   727, -1333,
+   -1333, -1333,   203, -1333, -1333, -1333, -1333, -1333,  1551,    12,
+     347, -1333
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    21,     2,    58,     6,    31,    18,   797,   893,  1268,
+    1391,  1078,  1186,  1070,  1182,  1518,   925,  1305,   914,   851,
+     915,   916,   615,   616,   324,   917,  1141,  1287,   617,   695,
+     819,   174,   211,   249,   330,   555,   135,    72,    73,   950,
+     310,   398,   364,   198,   303,   227,   399,   460,  1388,  1467,
+    1551,  1207,  1515,    74,    75,   117,   952,  1097,   557,   750,
+     867,  1252,  1382,    76,   121,   778,   884,   558,  1339,  1439,
+    1183,  1421,   326,   403,   799,   896,   800,   899,   801,   902,
+     802,   905,   989,  1135,  1589,  1611,   877,   976,   107,   199,
+     762,   873,   152,   359,   395,   484,   515,  1043,  1164,    22,
+      33,    49,    95,   149,   559,   651,  1209,  1336,  1407,   439,
+     689,    77,   125,  1452,  1524,  1576,  1606,  1277,  1399,   618,
+     108,   235,   360,   136,   361,   392,   393,    34,   531,   604,
+      35,    47,   485,   591,   953,  1100,   441,   619,   486,   442,
+     624,   443,   627,    78,   954,  1101,  1217,   981,  1131,   185,
+     224,  1018,   620,   388,  1498,   420,   487,  1389,   955,  1221,
+     674,   871,   579,   675,   769,   879,   580,   676,  1105,   755,
+     253,   332,   175,   212,   671,   746,   444,   711,   488,   521,
+     445,   631,   489,   524,   560,   854,   918,    50,    93,  1060,
+    1171,    56,    45,    57,  1172,   390,   621,   154,   349,   109,
+     237,   304,  1231,  1375,  1049,  1166,  1002,  1143,  1271,  1393,
+    1483,  1558,  1326,  1423,  1291,  1411,   561,   653,   562,   654,
+     504,  1292,  1293,  1412,  1327,  1427,   956,  1107,  1484,  1596,
+     455,   505,  1433,  1513,  1272,  1396,  1489,  1525,  1572,  1604,
+     787,   967,   176,   213,  1144,   334,  1145,   262,   338,   644,
+     726,   855,   919,    36,    12,   492,   649,   957,  1229,   581,
+     678,   958,  1232,   779,   990,   784,   888,   582,   680,  1111,
+     773,   679,   882,  1529,  1030,  1160,   446,   538,   447,   637,
+     177,   214,   267,   342,   306,   352,   959,  1113,  1278,  1210,
+    1340,    96,   147,   150,   448,   720,   449,   723,   490,   599,
+     221,   960,  1116,  1085,  1061,  1176,   856,  1158,  1359,  1211,
+    1342,   982,  1134,    79,   857,   924,  1008,  1149,   178,   215,
+     272,   344,  1343,  1442,   195,  1212,  1345,   858,   927,   583,
+     682,   859,  1050,   804,  1003,   809,   909,   961,  1117,  1360,
+    1458,  1019,  1156,  1072,   584,   684,   928,   789,   683,   891,
+     327,   405,  1063,  1179,    80,   179,   129,  1180,   861,   930,
+     622,   645,   727,  1096,  1334,   450,   646,     9,    15,    25,
+     564,   655,   493,   389,   263,  1462,  1548,   962,  1120,  1214,
+    1347,   932,   862,   933,   362,   396,   623,   701,  1507,  1598,
+    1010,  1152,  1298,  1416,   110,   157,  1390,  1475,  1554,    26,
+     180,   216,    39,   565,   863,   934,  1153,  1299,  1219,  1348,
+    1453,  1532,  1584,   236,   307,    81,  1132,  1279,  1410,   240,
+     764,   878,  1363,  1463,  1549,  1590,  1613,  1623,  1142,  1294,
+    1123,  1263,   137,   181,   340,   341,   491,   528,   223,   295,
+    1046,    82,   131,   923,  1177,   404,   468,   672,  1222,  1352,
+     469,   510,   509,   970,   872,  1128,   570,   669,    83,   567,
+    1074,   568,   866,   935,   966,  1124,   206,   241,    38,    27,
+     116,   189
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_uint16 yytable[] =
+{
+      41,   592,   275,   883,   261,   273,   785,  1147,   756,   514,
+     232,  1027,   771,    52,    51,  1351,   803,  1001,    54,   892,
+     260,  1036,    71,  1148,  1236,  1038,  1039,  1005,    97,  1288,
+     648,  1040,    99,   105,  1041,    46,    40,   656,  1044,   658,
+     864,  1290,    23,   250,  1138,  1023,   312,   335,   317,     3,
+    1058,  1419,  1057,    28,  1082,    28,  1081,  1102,  1059,   345,
+    1031,  1093,  1083,  1084,  1118,    23,     3,     3,   138,     3,
+      28,   183,    23,   151,     3,    28,   183,    23,   331,     3,
+     853,  1270,   417,    23,     3,  1022,  1138,  1133,   159,     3,
+     942,  1243,   162,  1486,  1516,    28,   164,    28,  1275,   881,
+     165,  1092,   167,    23,     3,   182,   184,     3,   190,   191,
+     192,     3,  1482,   608,   673,    28,     3,     3,  1528,    28,
+    1384,    67,   193,  1028,   196,   609,  1432,  1062,  1505,   163,
+     988,  1087,   203,  1155,  1189,  1296,   844,   735,   845,   737,
+     739,   741,   843,   187,    19,   887,   843,    37,    28,    11,
+    1531,   681,    28,  1355,   219,     3,   642,     1,  1213,   681,
+      37,   964,   200,   681,   201,   908,   929,   643,    20,  1220,
+     226,   869,   681,    20,   229,   920,    20,  1385,    20,     3,
+    1216,   612,   242,   243,   244,   245,   247,   252,   258,   265,
+     270,   274,  1577,  1000,  1488,   194,  1510,    20,   169,   251,
+    1512,  1216,   115,   988,  1371,    20,   114,    32,   114,   466,
+     309,    62,   314,   643,   993,   613,   323,  1196,    20,    62,
+      20,    62,    20,   771,  1580,  1197,   114,   754,   277,   278,
+     114,   320,    32,     4,  1285,  1088,   299,  1253,  1241,  1251,
+     677,   940,  1139,    20,  1242,  1254,  1255,    62,  1260,    20,
+       4,     4,   869,   346,  1496,  1496,   161,   321,     3,   114,
+      62,  1042,  1108,     4,    20,  1114,  1000,   754,     4,   194,
+     347,    20,   384,     4,  1303,    62,   348,  1228,   351,   747,
+      28,  1557,   357,  1285,  1139,   754,  1286,  1286,     4,   687,
+     171,     4,   264,  1386,   264,     4,  1309,   170,   256,   257,
+       4,     4,   209,  1502,   371,   370,   373,   372,   375,   374,
+    1329,   376,   377,  1246,  1500,  1599,   380,   379,   382,   381,
+      24,     5,   681,    20,   383,   228,  1350,   386,    20,    20,
+    1583,    20,   367,   368,   369,  1223,   650,   173,    24,     4,
+     681,    20,   401,   657,    20,     3,    20,   947,  1478,  1369,
+    1465,  1367,  1379,     5,  1378,   268,     7,  1370,    20,    20,
+      14,    20,    62,   781,    29,   677,   296,   412,  1383,  1544,
+     437,   453,    20,   463,  1607,   647,    42,    43,   472,   385,
+     473,    20,   474,  1394,  1397,   477,    20,  1174,  1184,    53,
+    1449,   114,    20,   410,    20,   322,    67,     5,   339,    62,
+     673,  1403,    98,  1491,  1566,   343,   112,   113,    20,    20,
+      20,    69,   126,   127,   471,   130,  1568,    20,  1256,  1492,
+     336,   337,     7,    17,    67,    20,   133,    20,   378,  1075,
+     350,  1422,   608,   609,    30,   507,   754,   610,   840,    69,
+    1425,  1429,     4,    23,   104,    20,   512,   936,  1424,  1428,
+     513,   478,    69,    20,    62,   937,     7,     7,     7,   158,
+     257,   160,   529,  1601,    28,    44,    20,    69,   407,  1384,
+      48,  1550,  1459,   166,   479,  1603,    55,    94,   188,   339,
+     554,    20,   518,   752,   611,   577,   148,  1552,  1016,   587,
+     588,   681,   938,   168,   246,   480,   593,   481,    62,   596,
+     612,   194,  1469,   600,  1473,  1487,  1275,   208,   197,   940,
+    1468,  1264,  1472,   634,  1016,  1362,   168,   681,    37,   339,
+     217,   234,   652,   613,  1051,   408,   409,    28,   308,     4,
+      62,   936,     3,   603,    62,  1450,   239,    62,    62,   937,
+     302,   225,   133,   305,   874,  1533,  1066,    20,    67,   475,
+     476,   482,  1535,   397,    69,  1358,  1537,  1538,  1593,   255,
+    1159,   685,  1539,  1522,    20,  1540,   686,   202,    20,  1542,
+      62,   300,   301,   849,  1594,   134,    20,  1076,  1322,   688,
+    1052,   895,  1456,  1323,   939,  1553,   319,  1276,   402,   218,
+     673,   530,  1556,   940,   702,   670,   946,   894,   333,   705,
+     218,  1401,   708,    67,  1053,    20,   714,    37,    62,   569,
+     251,   911,   717,   912,   673,   614,  1265,   913,   681,   677,
+     483,   728,   731,   732,  1289,   733,   734,  1266,   736,   738,
+     740,   742,   743,   744,    63,    62,   677,   942,   114,   943,
+    1574,  1582,  1386,   790,   745,  1055,    69,   748,  1573,  1079,
+     760,   766,  1007,   776,   876,   782,    20,   796,    37,   807,
+      20,  1076,   812,     7,   813,   988,   366,   816,   817,  1015,
+      62,   353,   821,   822,   823,   354,   824,  1009,  1048,    67,
+     946,   791,   792,   793,   794,  1605,   825,   673,  1174,   758,
+      69,   134,  1122,   790,    62,   828,   452,  1095,   831,   104,
+     774,   834,   836,   104,    20,  1130,   256,   257,     7,     7,
+     754,    20,  1220,   400,   869,  1067,     4,  1151,  1181,   790,
+      62,   850,    69,    20,    62,   840,    69,  1230,   869,    69,
+      69,   791,   792,   793,   794,  1563,    20,  1161,  1162,   758,
+      20,  1033,    62,    20,    20,   840,    62,   470,  1406,   692,
+     693,  1163,   697,   698,   699,  1075,  1275,   791,   792,   793,
+     794,   758,    69,  1016,  1016,   758,   355,   681,    62,   937,
+     875,  1068,  1338,   936,   774,   681,    20,  1341,   938,  1137,
+      62,     7,     7,     7,     7,     7,     7,     7,     7,     7,
+       7,     7,  1541,  1275,   910,  1136,   775,    62,  1406,   356,
+      69,   757,  1432,   207,    62,   772,   938,     7,  1461,   788,
+     795,   210,  1194,  1547,    20,    62,     7,   511,   938,    67,
+     869,  1016,   101,   940,   681,   869,    20,    69,    62,   525,
+    1588,  1239,  1193,   694,   818,   940,   315,  1276,  1200,   102,
+      62,    20,   949,    67,   936,   977,   971,  1281,   972,  1355,
+    1283,    62,   937,   979,   984,   457,   248,   986,   586,   987,
+     795,  1187,   413,   991,  1201,   414,   994,   942,   995,    67,
+     775,   996,    62,    67,   997,   939,    20,   998,   103,  1127,
+     999,   458,   868,    20,  1004,  1190,   795,   459,  1011,   938,
+    1012,    67,  1523,  1017,  1021,    67,   415,  1499,  1503,  1029,
+      20,    62,  1035,   973,     8,  1054,   940,  1265,  1069,  1077,
+    1091,  1034,    69,  1368,  1346,  1034,    69,    67,  1266,   418,
+     758,  1051,    62,   440,   759,   978,    20,  1098,   974,    67,
+      20,  1099,   898,   901,   904,   907,   419,  1034,    69,   696,
+     297,   975,  1125,  1565,   626,   629,   222,   633,    20,  1115,
+     639,  1129,    20,     3,   885,  1202,    62,   254,   820,  1121,
+      69,   156,  1295,  1479,    67,  1140,   231,  1203,  1555,  1185,
+     128,  1480,    69,   104,    20,  1244,  1204,  1052,  1146,   765,
+    1333,   673,   259,  1150,   768,  1154,    20,  1372,  1400,    69,
+    1335,  1337,  1405,   946,  1095,  1408,    69,   969,  1112,  1567,
+      67,  1053,  1205,    20,   153,   155,   155,    69,   328,  1165,
+      20,   992,   571,   806,   572,   921,   772,   118,   691,   681,
+      69,    20,  1578,   172,   269,  1167,  1353,   266,  1409,    62,
+    1612,  1622,    69,  1245,    20,    62,   937,   788,  1595,  1086,
+     122,   713,   194,    69,  1354,   271,    20,   119,   421,  1344,
+      67,   722,   725,  1313,   120,  1392,   573,    20,  1602,   839,
+     574,  1314,  1402,   870,    69,   835,  1482,   788,   100,   106,
+     123,  1191,  1192,   938,   788,  1206,  1261,   124,    20,    62,
+     963,   880,  1224,   759,  1355,  1527,  1526,  1188,  1233,   276,
+     111,  1238,  1249,    69,   575,  1259,    20,   889,   758,  1267,
+     168,  1417,   576,  1274,   423,   238,  1280,    20,  1414,  1282,
+    1284,   406,  1457,  1104,    69,  1109,  1109,  1455,  1104,   425,
+    1285,   886,  1025,  1286,  1297,  1436,   681,  1300,    20,     0,
+    1301,  1302,  1262,  1307,     0,  1308,     0,     4,   838,  1311,
+       0,  1312,     0,   788,     0,  1316,  1315,   840,    69,     0,
+    1318,  1317,     0,  1320,  1319,  1216,     0,  1324,     0,   422,
+       0,  1331,    20,     0,  1332,   465,     0,     0,   204,     0,
+       0,     0,   169,     0,     0,     0,   841,     0,    67,     0,
+    1175,  1178,     0,     0,    67,     0,   810,   985,     0,   205,
+     220,     0,  1349,     0,     0,     0,  1356,     7,   104,     7,
+       7,     0,     7,   842,  1365,   170,   781,  1376,   677,   843,
+     230,   365,     0,     0,     0,   968,   844,     0,   845,     0,
+       0,    69,   171,   461,     0,   462,     0,    69,    67,  1519,
+     846,   233,  1521,     0,     0,    20,     0,     0,  1387,     0,
+       0,    20,   847,     0,   806,   172,   311,  1016,   316,     0,
+     681,     0,   325,   848,     0,     0,   391,   394,     0,     0,
+       0,   759,  1413,   897,   900,   903,   906,   313,     0,   318,
+    1415,    69,   563,   329,  1418,     7,     0,   543,     0,     0,
+    1420,     0,   849,   173,   788,    20,     0,    62,     0,   544,
+       0,   890,     0,     7,   545,     7,     7,     7,     7,     7,
+       7,     0,     0,     0,  1431,   478,  1571,     0,     0,  1434,
+     546,  1437,     0,     0,  1126,  1440,     0,  1443,   358,     0,
+    1445,     0,  1447,  1451,     0,     0,  1330,  1454,   479,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   363,
+       0,     0,    62,   937,     0,  1248,     0,   608,   609,   480,
+    1464,   481,   610,     0,   547,   506,     0,  1466,     0,     0,
+    1471,  1600,     0,   387,   508,     0,  1476,     0,     0,   548,
+     549,     0,   478,  1157,  1490,     0,     0,     0,   625,   628,
+     938,   632,     0,     0,   638,  1495,  1497,  1501,     0,  1504,
+    1616,  1506,     0,   788,   788,   479,  1508,   940,  1509,   611,
+       0,  1621,  1511,   416,     0,   482,   438,   454,  1514,   464,
+       0,  1006,  1051,     0,  1517,   612,   480,  1520,   481,     0,
+    1020,  1024,     7,     7,   424,     0,  1032,   451,   456,     0,
+     467,     0,     0,  1534,     0,     0,    67,  1094,   613,   751,
+       0,  1103,   763,     0,   550,   780,     0,     0,  1119,   805,
+     788,   788,   690,     0,     0,     0,     0,     0,     0,   700,
+     551,     0,     0,     0,  1559,     0,     0,     0,  1560,  1561,
+       0,  1562,   482,     0,   483,   712,     0,     0,     0,    69,
+       0,  1175,   788,     0,     0,   721,   724,   552,  1564,   553,
+    1569,    67,  1053,    20,     0,     0,     0,     0,     0,     0,
+       0,     0,  1581,     0,  1306,     0,     0,     0,  1585,     0,
+       0,     0,   788,   860,   788,     0,   556,     0,     0,     0,
+       0,   578,    59,    60,     0,     0,  1591,     0,  1321,  1592,
+      61,    62,     0,  1597,    69,     0,    63,   566,     0,     0,
+       0,   483,   585,     0,     0,     0,  1493,  1494,    20,   635,
+       0,     0,    10,     0,     0,    13,    16,     0,    20,  1608,
+       0,  1609,    64,   516,     0,   519,   522,     0,   526,     0,
+     636,  1614,   837,  1615,     0,     0,     0,    65,     0,  1617,
+       0,  1618,     0,     0,   411,  1619,  1620,     0,    59,    60,
+       0,  1624,     0,     0,     0,     0,    61,    62,  1625,     0,
+     589,     0,    63,  1218,     0,     0,   594,     0,     0,     0,
+     597,     0,     0,   601,     0,   605,   608,   609,    10,     0,
+     132,   610,     0,   139,   140,   141,   142,     0,    64,     0,
+     703,   143,   144,   145,   146,   706,     0,     0,   709,     0,
+       0,     0,   715,    65,     0,     0,     0,     0,   718,     0,
+     788,   704,    10,    10,    10,     0,   707,   729,  1304,   710,
+      66,     0,  1310,   716,     0,     0,   936,     0,   611,   719,
+       0,     0,     0,    62,   937,     0,     0,     0,   730,     0,
+      67,     0,   186,   749,   612,     0,   761,   767,     0,   777,
+       0,   783,     0,   798,  1045,   808,     0,  1064,     0,     0,
+     814,  1089,     0,     0,   753,     0,     0,   613,   770,     0,
+      68,   938,   786,     0,     0,     0,   811,     0,     0,     0,
+     939,   815,   826,    69,     0,     0,    66,     0,   940,     0,
+      70,   829,     0,     0,   832,     0,     0,    20,     0,     0,
+       0,     0,     0,   827,     0,   922,    67,   926,   926,     0,
+     931,     0,   830,     0,     0,   833,     0,   852,     0,   941,
+       0,     0,     0,     0,     0,     0,     0,  1395,  1398,     0,
+       0,     0,   942,     0,   943,   298,    68,  1404,   865,   517,
+       0,   520,   523,     0,   527,     0,   944,     0,     0,    69,
+       0,    84,    85,    86,     0,   945,    70,     0,     0,   614,
+       0,     0,     0,    20,     0,     0,     0,     0,  1546,    87,
+      88,    89,     0,     0,     0,   946,   590,  1169,     0,     0,
+       0,     0,   595,  1026,  1426,  1430,   598,     0,     0,   602,
+       0,   606,     0,     0,   947,     0,   847,     0,    90,    91,
+      92,   394,     0,  1106,   926,  1110,  1110,   926,  1106,     0,
+       0,     0,     0,     0,     0,   759,  1460,     0,     0,    10,
+       0,     0,     0,     0,  1198,    69,     0,     0,     0,     0,
+       0,     0,     0,     0,  1226,     0,     0,   948,   951,    20,
+    1235,     0,     0,    62,  1257,     0,  1470,   659,  1474,   980,
+       0,     0,     0,  1586,  1587,  1485,     0,   660,     0,   965,
+       0,     0,     0,   661,    10,    10,     0,   662,     0,     0,
+     983,   663,     0,   426,     0,     0,     0,     0,   664,     0,
+     665,     0,   427,   354,     0,     0,  1013,   428,   429,     0,
+     666,   667,   668,     0,  1610,     0,     0,     0,  1037,     0,
+       0,  1056,     0,     0,  1071,  1080,   430,  1014,   431,     0,
+       0,     0,  1530,     0,     0,     0,     0,     0,     0,  1047,
+       0,     0,  1065,     0,     0,  1073,  1090,     0,     0,     0,
+     926,   506,     0,     0,     0,     0,     0,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,  1361,     0,
+       0,   432,   433,     0,     0,     0,  1373,     0,     0,  1380,
+       0,   434,   435,    10,     0,     0,     0,     0,     0,     0,
+       0,     0,    10,   279,     0,     0,   280,     0,     0,     0,
+     281,   282,   283,   284,  1575,   285,  1579,   286,   287,     0,
+       0,   288,     0,     0,     0,     0,     0,     0,   436,   289,
+       0,     0,     0,     0,     0,     0,     0,     0,   290,     0,
+       0,     0,     0,     0,   291,     0,     0,     0,     0,     0,
+     292,  1168,   293,     0,     0,     0,     0,   294,     0,     0,
+       0,     0,     0,     0,     0,    69,     0,     0,     0,     0,
+       0,     0,  1170,     0,     0,     0,     0,     0,     0,    20,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1435,     0,  1438,     0,     0,     0,  1441,  1195,  1444,
+       0,  1208,  1446,     0,  1448,     0,     0,     0,  1225,     0,
+       0,     0,     0,     0,  1234,     0,     0,  1240,  1250,  1199,
+       0,     0,  1215,     0,     0,  1269,     0,     0,     0,  1227,
+       0,     0,     0,     0,     0,  1237,     0,     0,  1247,  1258,
+       0,     0,     0,     0,     0,     0,  1273,   532,   533,   534,
+     535,   536,   537,   539,   540,   541,   542,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1325,   607,     0,     0,     0,   630,     0,
+       0,     0,     0,   640,   641,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  1328,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  1543,     0,     0,     0,     0,
+       0,     0,  1357,     0,     0,     0,     0,     0,     0,     0,
+    1366,     0,     0,  1377,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1364,     0,     0,     0,     0,     0,     0,
+       0,  1374,     0,     0,  1381,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1570,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    10,     0,    10,    10,     0,    10,     0,
+       0,     0,  1477,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  1481,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  1536,
+       0,    10,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    10,
+    1545,    10,    10,    10,    10,    10,    10,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1173,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    10,    10
+};
+
+static const yytype_int16 yycheck[] =
+{
+      25,   518,   216,   773,   213,   215,   680,  1003,   673,   476,
+     199,   923,   677,    39,    39,  1217,   682,   908,    43,   789,
+     213,   927,    47,  1003,  1113,   927,   927,   909,    53,  1138,
+     544,   927,    57,    58,   927,    32,    24,   551,   927,   553,
+     746,  1138,     6,   211,    75,   919,   235,   256,   237,     3,
+     930,  1299,   930,     4,   934,     4,   934,   939,   930,   269,
+     924,   935,   934,   934,   946,     6,     3,     3,    93,     3,
+       4,     5,     6,    98,     3,     4,     5,     6,   246,     3,
+     746,  1124,   392,     6,     3,   919,    75,   978,   113,     3,
+     188,  1116,   117,  1393,    66,     4,   121,     4,   122,   773,
+     125,   935,   127,     6,     3,   130,   131,     3,   133,   134,
+     135,     3,   176,    71,   148,     4,     3,     3,  1450,     4,
+      86,   238,   147,   196,   149,    72,   178,   930,   255,   117,
+     104,   934,   157,  1015,  1076,   257,   226,   651,   228,   653,
+     654,   655,   219,   131,   111,   775,   219,    19,     4,     0,
+    1450,   236,     4,   272,   179,     3,   185,   116,  1100,   236,
+      32,   867,   154,   236,   156,   795,   845,   242,   295,   284,
+     195,   286,   236,   295,   199,    67,   295,   143,   295,     3,
+     265,   139,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,  1524,   167,  1396,   241,  1423,   295,   149,   150,
+    1427,   265,    61,   104,  1229,   295,   115,   131,   115,   398,
+     235,    89,   237,   242,   888,   162,   241,  1097,   295,    89,
+     295,    89,   295,   888,  1524,  1097,   115,   181,   216,   217,
+     115,    73,   131,   187,   170,   934,   224,  1117,  1116,  1117,
+     194,   144,   273,   295,  1116,  1117,  1117,    89,  1120,   295,
+     187,   187,   286,   278,   141,   141,   115,    99,     3,   115,
+      89,   927,   941,   187,   295,   944,   167,   181,   187,   241,
+     295,   295,   140,   187,  1156,    89,   301,  1111,   303,    93,
+       4,  1483,   307,   170,   273,   181,   173,   173,   187,   599,
+     199,   187,   201,   259,   201,   187,  1160,   182,   183,   184,
+     187,   187,   161,  1412,   330,   330,   332,   332,   334,   334,
+    1184,   336,   337,  1116,  1411,  1563,   342,   342,   344,   344,
+     261,   245,   236,   295,   349,   197,  1217,   352,   295,   295,
+    1532,   295,   320,   321,   322,  1105,   545,   260,   261,   187,
+     236,   295,   367,   552,   295,     3,   295,   250,  1391,  1229,
+    1375,  1229,  1232,   245,  1232,   214,     1,  1229,   295,   295,
+       5,   295,    89,   192,    17,   194,   295,   392,  1248,  1458,
+     395,   396,   295,   398,  1576,   543,    29,    30,   403,   247,
+     405,   295,   407,  1265,  1266,   410,   295,  1052,  1067,    42,
+     121,   115,   295,   390,   295,   237,   238,   245,   257,    89,
+     148,  1275,    55,  1399,  1513,   264,    59,    60,   295,   295,
+     295,   281,    65,    66,   402,    68,  1513,   295,  1117,  1399,
+     276,   277,    67,   118,   238,   295,   126,   295,   338,    64,
+     302,  1321,    71,    72,   117,   460,   181,    76,   157,   281,
+    1322,  1323,   187,     6,   258,   295,   471,    82,  1322,  1323,
+     475,   109,   281,   295,    89,    90,   101,   102,   103,   112,
+     184,   114,   487,  1572,     4,   161,   295,   281,   378,    86,
+     158,  1467,  1354,   126,   132,  1572,   160,   205,   131,   338,
+     505,   295,   479,   672,   123,   510,   206,  1467,   233,   514,
+     515,   236,   127,    77,    78,   153,   521,   155,    89,   524,
+     139,   241,  1384,   528,  1386,  1396,   122,   160,    84,   144,
+    1384,    63,  1386,   538,   233,  1221,    77,   236,   390,   378,
+     210,   267,   547,   162,   159,   384,   385,     4,    83,   187,
+      89,    82,     3,   530,    89,   266,   270,    89,    89,    90,
+     164,   194,   126,   200,   758,  1457,    65,   295,   238,   408,
+     409,   209,  1458,    85,   281,  1221,  1458,  1458,  1554,   212,
+    1027,   586,  1458,   180,   295,  1458,   591,   294,   295,  1458,
+      89,   224,   225,   292,  1554,   275,   295,   212,   169,   604,
+     215,   790,  1352,   174,   136,  1475,   239,   203,   282,   279,
+     148,   130,  1483,   144,   619,   151,   231,   790,   251,   624,
+     279,  1275,   627,   238,   239,   295,   631,   479,    89,   287,
+     150,    68,   637,    70,   148,   254,   168,    74,   236,   194,
+     278,   646,   647,   648,  1138,   650,   651,   179,   653,   654,
+     655,   656,   657,   658,    94,    89,   194,   188,   115,   190,
+    1522,  1532,   259,    62,   669,   930,   281,   672,  1522,   934,
+     675,   676,   221,   678,   106,   680,   295,   682,   530,   684,
+     295,   212,   687,   308,   689,   104,   319,   692,   693,   138,
+      89,   125,   697,   698,   699,   129,   701,   256,   166,   238,
+     231,   100,   101,   102,   103,  1576,   711,   148,  1353,   108,
+     281,   275,   274,    62,    89,   720,   177,   243,   723,   258,
+      95,   726,   727,   258,   295,   269,   183,   184,   353,   354,
+     181,   295,   284,   366,   286,   234,   187,   264,    98,    62,
+      89,   746,   281,   295,    89,   157,   281,   165,   286,   281,
+     281,   100,   101,   102,   103,  1505,   295,    26,    27,   108,
+     295,   110,    89,   295,   295,   157,    89,   400,   114,   608,
+     609,    40,   611,   612,   613,    64,   122,   100,   101,   102,
+     103,   108,   281,   233,   233,   108,   220,   236,    89,    90,
+     758,   290,    97,    82,    95,   236,   295,   224,   127,   988,
+      89,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+     435,   436,  1458,   122,   819,   988,   191,    89,   114,   253,
+     281,   673,   178,   158,    89,   677,   127,   452,   248,   681,
+     229,   166,  1097,   249,   295,    89,   461,   470,   127,   238,
+     286,   233,   107,   144,   236,   286,   295,   281,    89,   482,
+     105,  1116,  1097,   610,   695,   144,   237,   203,    87,   124,
+      89,   295,   867,   238,    82,   137,   871,  1131,   873,   272,
+    1134,    89,    90,   878,   879,    23,   211,   882,   511,   884,
+     229,  1075,   392,   888,   113,   392,   891,   188,   893,   238,
+     191,   896,    89,   238,   899,   136,   295,   902,   163,   970,
+     905,    49,   754,   295,   909,  1095,   229,    55,   913,   127,
+     915,   238,  1449,   918,   919,   238,   392,  1411,  1412,   924,
+     295,    89,   927,     9,     1,   930,   144,   168,   933,   934,
+     935,   280,   281,  1229,  1205,   280,   281,   238,   179,   392,
+     108,   159,    89,   395,   271,   217,   295,   938,    34,   238,
+     295,   938,   791,   792,   793,   794,   392,   280,   281,   610,
+     224,    47,   967,  1513,   533,   534,   179,   536,   295,   945,
+     539,   976,   295,     3,   774,   204,    89,   212,   695,   947,
+     281,   103,  1143,  1391,   238,   990,   199,   216,  1482,  1068,
+      67,  1391,   281,   258,   295,  1116,   225,   215,  1003,   146,
+    1190,   148,   213,  1008,   676,  1010,   295,  1229,  1275,   281,
+    1200,  1201,  1276,   231,   243,  1279,   281,   869,   943,  1513,
+     238,   239,   251,   295,   101,   102,   103,   281,   241,  1034,
+     295,   888,   145,   230,   147,   842,   888,    20,   607,   236,
+     281,   295,  1524,   222,   223,  1050,   214,   214,  1279,    89,
+    1590,  1613,   281,  1116,   295,    89,    90,   909,  1555,   934,
+      20,   630,   241,   281,   232,   215,   295,    50,   392,  1204,
+     238,   640,   641,  1166,    57,  1264,   189,   295,  1572,    69,
+     193,  1166,  1275,   755,   281,   726,   176,   939,    57,    58,
+      50,  1096,  1097,   127,   946,  1100,  1120,    57,   295,    89,
+     867,   773,  1107,   271,   272,   195,  1449,  1075,  1113,   216,
+      58,  1116,  1117,   281,   227,  1120,   295,   789,   108,  1124,
+      77,  1296,   235,  1128,   392,   201,  1131,   295,  1294,  1134,
+    1135,   369,  1353,   940,   281,   942,   943,  1352,   945,   392,
+     170,   774,   919,   173,  1149,  1335,   236,  1152,   295,    -1,
+    1155,  1156,  1120,  1158,    -1,  1160,    -1,   187,   727,  1164,
+      -1,  1166,    -1,  1015,    -1,  1171,  1171,   157,   281,    -1,
+    1176,  1176,    -1,  1179,  1179,   265,    -1,  1182,    -1,   392,
+      -1,  1186,   295,    -1,  1189,   398,    -1,    -1,   157,    -1,
+      -1,    -1,   149,    -1,    -1,    -1,   186,    -1,   238,    -1,
+    1052,  1053,    -1,    -1,   238,    -1,   684,   879,    -1,   157,
+     179,    -1,  1217,    -1,    -1,    -1,  1221,   842,   258,   844,
+     845,    -1,   847,   213,  1229,   182,   192,  1232,   194,   219,
+     199,   308,    -1,    -1,    -1,   868,   226,    -1,   228,    -1,
+      -1,   281,   199,   283,    -1,   285,    -1,   281,   238,  1439,
+     240,   199,  1442,    -1,    -1,   295,    -1,    -1,  1263,    -1,
+      -1,   295,   252,    -1,   230,   222,   235,   233,   237,    -1,
+     236,    -1,   241,   263,    -1,    -1,   353,   354,    -1,    -1,
+      -1,   271,  1287,   791,   792,   793,   794,   235,    -1,   237,
+    1295,   281,   505,   241,  1299,   920,    -1,    79,    -1,    -1,
+    1305,    -1,   292,   260,  1156,   295,    -1,    89,    -1,    91,
+      -1,   789,    -1,   938,    96,   940,   941,   942,   943,   944,
+     945,    -1,    -1,    -1,  1329,   109,  1516,    -1,    -1,  1334,
+     112,  1336,    -1,    -1,   967,  1340,    -1,  1342,   307,    -1,
+    1345,    -1,  1347,  1348,    -1,    -1,  1185,  1352,   132,   427,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   307,
+      -1,    -1,    89,    90,    -1,    92,    -1,    71,    72,   153,
+    1375,   155,    76,    -1,   156,   452,    -1,  1382,    -1,    -1,
+    1385,  1571,    -1,   352,   461,    -1,  1391,    -1,    -1,   171,
+     172,    -1,   109,  1026,  1399,    -1,    -1,    -1,   533,   534,
+     127,   536,    -1,    -1,   539,  1410,  1411,  1412,    -1,  1414,
+    1600,  1416,    -1,  1265,  1266,   132,  1421,   144,  1423,   123,
+      -1,  1611,  1427,   392,    -1,   209,   395,   396,  1433,   398,
+      -1,   909,   159,    -1,  1439,   139,   153,  1442,   155,    -1,
+     918,   919,  1067,  1068,   392,    -1,   924,   395,   396,    -1,
+     398,    -1,    -1,  1458,    -1,    -1,   238,   935,   162,   672,
+      -1,   939,   675,    -1,   246,   678,    -1,    -1,   946,   682,
+    1322,  1323,   607,    -1,    -1,    -1,    -1,    -1,    -1,   614,
+     262,    -1,    -1,    -1,  1489,    -1,    -1,    -1,  1493,  1494,
+      -1,  1496,   209,    -1,   278,   630,    -1,    -1,    -1,   281,
+      -1,  1353,  1354,    -1,    -1,   640,   641,   289,  1513,   291,
+    1515,   238,   239,   295,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1527,    -1,  1157,    -1,    -1,    -1,  1533,    -1,
+      -1,    -1,  1384,   746,  1386,    -1,   505,    -1,    -1,    -1,
+      -1,   510,    80,    81,    -1,    -1,  1551,    -1,  1181,  1554,
+      88,    89,    -1,  1558,   281,    -1,    94,   505,    -1,    -1,
+      -1,   278,   510,    -1,    -1,    -1,  1405,  1406,   295,   538,
+      -1,    -1,     1,    -1,    -1,     4,     5,    -1,   295,  1584,
+      -1,  1586,   120,   478,    -1,   480,   481,    -1,   483,    -1,
+     538,  1596,   727,  1598,    -1,    -1,    -1,   135,    -1,  1604,
+      -1,  1606,    -1,    -1,   142,  1610,  1611,    -1,    80,    81,
+      -1,  1616,    -1,    -1,    -1,    -1,    88,    89,  1623,    -1,
+     515,    -1,    94,  1101,    -1,    -1,   521,    -1,    -1,    -1,
+     525,    -1,    -1,   528,    -1,   530,    71,    72,    67,    -1,
+      69,    76,    -1,    35,    36,    37,    38,    -1,   120,    -1,
+     619,    43,    44,    45,    46,   624,    -1,    -1,   627,    -1,
+      -1,    -1,   631,   135,    -1,    -1,    -1,    -1,   637,    -1,
+    1522,   619,   101,   102,   103,    -1,   624,   646,  1156,   627,
+     218,    -1,  1160,   631,    -1,    -1,    82,    -1,   123,   637,
+      -1,    -1,    -1,    89,    90,    -1,    -1,    -1,   646,    -1,
+     238,    -1,   131,   672,   139,    -1,   675,   676,    -1,   678,
+      -1,   680,    -1,   682,   927,   684,    -1,   930,    -1,    -1,
+     689,   934,    -1,    -1,   672,    -1,    -1,   162,   676,    -1,
+     268,   127,   680,    -1,    -1,    -1,   684,    -1,    -1,    -1,
+     136,   689,   711,   281,    -1,    -1,   218,    -1,   144,    -1,
+     288,   720,    -1,    -1,   723,    -1,    -1,   295,    -1,    -1,
+      -1,    -1,    -1,   711,    -1,   842,   238,   844,   845,    -1,
+     847,    -1,   720,    -1,    -1,   723,    -1,   746,    -1,   175,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1265,  1266,    -1,
+      -1,    -1,   188,    -1,   190,   224,   268,  1275,   746,   478,
+      -1,   480,   481,    -1,   483,    -1,   202,    -1,    -1,   281,
+      -1,    11,    12,    13,    -1,   211,   288,    -1,    -1,   254,
+      -1,    -1,    -1,   295,    -1,    -1,    -1,    -1,  1461,    29,
+      30,    31,    -1,    -1,    -1,   231,   515,  1050,    -1,    -1,
+      -1,    -1,   521,   920,  1322,  1323,   525,    -1,    -1,   528,
+      -1,   530,    -1,    -1,   250,    -1,   252,    -1,    58,    59,
+      60,   938,    -1,   940,   941,   942,   943,   944,   945,    -1,
+      -1,    -1,    -1,    -1,    -1,   271,  1354,    -1,    -1,   308,
+      -1,    -1,    -1,    -1,  1097,   281,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1107,    -1,    -1,   293,   867,   295,
+    1113,    -1,    -1,    89,  1117,    -1,  1384,     8,  1386,   878,
+      -1,    -1,    -1,  1546,  1547,  1393,    -1,    18,    -1,   867,
+      -1,    -1,    -1,    24,   353,   354,    -1,    28,    -1,    -1,
+     878,    32,    -1,   119,    -1,    -1,    -1,    -1,    39,    -1,
+      41,    -1,   128,   129,    -1,    -1,   915,   133,   134,    -1,
+      51,    52,    53,    -1,  1587,    -1,    -1,    -1,   927,    -1,
+      -1,   930,    -1,    -1,   933,   934,   152,   915,   154,    -1,
+      -1,    -1,  1450,    -1,    -1,    -1,    -1,    -1,    -1,   927,
+      -1,    -1,   930,    -1,    -1,   933,   934,    -1,    -1,    -1,
+    1067,  1068,    -1,    -1,    -1,    -1,    -1,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,  1221,    -1,
+      -1,   197,   198,    -1,    -1,    -1,  1229,    -1,    -1,  1232,
+      -1,   207,   208,   452,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   461,     7,    -1,    -1,    10,    -1,    -1,    -1,
+      14,    15,    16,    17,  1522,    19,  1524,    21,    22,    -1,
+      -1,    25,    -1,    -1,    -1,    -1,    -1,    -1,   244,    33,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,
+      -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,
+      54,  1050,    56,    -1,    -1,    -1,    -1,    61,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   281,    -1,    -1,    -1,    -1,
+      -1,    -1,  1050,    -1,    -1,    -1,    -1,    -1,    -1,   295,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1334,    -1,  1336,    -1,    -1,    -1,  1340,  1097,  1342,
+      -1,  1100,  1345,    -1,  1347,    -1,    -1,    -1,  1107,    -1,
+      -1,    -1,    -1,    -1,  1113,    -1,    -1,  1116,  1117,  1097,
+      -1,    -1,  1100,    -1,    -1,  1124,    -1,    -1,    -1,  1107,
+      -1,    -1,    -1,    -1,    -1,  1113,    -1,    -1,  1116,  1117,
+      -1,    -1,    -1,    -1,    -1,    -1,  1124,   494,   495,   496,
+     497,   498,   499,   500,   501,   502,   503,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1182,   531,    -1,    -1,    -1,   535,    -1,
+      -1,    -1,    -1,   540,   541,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1182,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  1458,    -1,    -1,    -1,    -1,
+      -1,    -1,  1221,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    1229,    -1,    -1,  1232,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1221,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1229,    -1,    -1,  1232,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1515,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   842,    -1,   844,   845,    -1,   847,    -1,
+      -1,    -1,  1391,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1391,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1458,
+      -1,   920,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   938,
+    1458,   940,   941,   942,   943,   944,   945,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1051,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  1067,  1068
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint16 yystos[] =
+{
+       0,   116,   298,     3,   187,   245,   300,   549,   551,   663,
+     764,     0,   550,   764,   549,   664,   764,   118,   302,   111,
+     295,   297,   395,     6,   261,   665,   695,   765,     4,   766,
+     117,   301,   131,   396,   423,   426,   549,   552,   764,   698,
+     765,   297,   766,   766,   161,   488,   423,   427,   158,   397,
+     483,   297,   395,   766,   297,   160,   487,   489,   299,    80,
+      81,    88,    89,    94,   120,   135,   218,   238,   268,   281,
+     288,   297,   333,   334,   349,   350,   359,   407,   439,   609,
+     650,   711,   737,   754,    11,    12,    13,    29,    30,    31,
+      58,    59,    60,   484,   205,   398,   587,   297,   766,   297,
+     350,   107,   124,   163,   258,   297,   350,   384,   416,   495,
+     690,   737,   766,   766,   115,   670,   766,   351,    20,    50,
+      57,   360,    20,    50,    57,   408,   766,   766,   551,   652,
+     766,   738,   764,   126,   275,   332,   419,   728,   297,    35,
+      36,    37,    38,    43,    44,    45,    46,   588,   206,   399,
+     589,   297,   388,   551,   493,   551,   493,   691,   766,   297,
+     766,   670,   297,   765,   297,   297,   766,   297,    77,   149,
+     182,   199,   222,   260,   327,   468,   538,   576,   614,   651,
+     696,   729,   297,     5,   297,   445,   764,   765,   766,   767,
+     297,   297,   297,   297,   241,   620,   297,    84,   339,   385,
+     301,   301,   294,   297,   350,   737,   762,   327,   766,   670,
+     327,   328,   469,   539,   577,   615,   697,   210,   279,   297,
+     350,   596,   650,   734,   446,   766,   297,   341,   552,   297,
+     350,   650,   690,   737,   267,   417,   709,   496,   709,   270,
+     715,   763,   297,   297,   297,   297,    78,   297,   327,   329,
+     332,   150,   297,   466,   468,   766,   183,   184,   297,   538,
+     540,   542,   543,   670,   201,   297,   576,   578,   670,   223,
+     297,   614,   616,   620,   297,   695,   696,   765,   765,     7,
+      10,    14,    15,    16,    17,    19,    21,    22,    25,    33,
+      42,    48,    54,    56,    61,   735,   295,   445,   764,   765,
+     766,   766,   164,   340,   497,   200,   580,   710,    83,   297,
+     336,   350,   690,   737,   297,   336,   350,   690,   737,   766,
+      73,    99,   237,   297,   320,   350,   368,   646,   650,   737,
+     330,   332,   467,   766,   541,   542,   276,   277,   544,   670,
+     730,   731,   579,   670,   617,   620,   297,   297,   297,   494,
+     552,   297,   581,   125,   129,   220,   253,   297,   350,   389,
+     418,   420,   680,   737,   338,   551,   766,   765,   765,   765,
+     297,   395,   297,   395,   297,   395,   297,   297,   544,   297,
+     395,   297,   395,   297,   140,   247,   297,   350,   449,   669,
+     491,   551,   421,   422,   551,   390,   681,    85,   337,   342,
+     766,   297,   282,   369,   741,   647,   741,   544,   670,   670,
+     423,   142,   297,   333,   334,   349,   350,   359,   407,   439,
+     451,   609,   650,   711,   737,   754,   119,   128,   133,   134,
+     152,   154,   197,   198,   207,   208,   244,   297,   350,   405,
+     420,   432,   435,   437,   472,   476,   572,   574,   590,   592,
+     661,   737,   177,   297,   350,   526,   737,    23,    49,    55,
+     343,   283,   285,   297,   350,   650,   690,   737,   742,   746,
+     766,   765,   297,   297,   297,   670,   670,   297,   109,   132,
+     153,   155,   209,   278,   391,   428,   434,   452,   474,   478,
+     594,   732,   551,   668,   668,   668,   668,   668,   668,   668,
+     668,   668,   668,   668,   516,   527,   551,   297,   551,   748,
+     747,   766,   297,   297,   734,   392,   428,   434,   423,   428,
+     434,   475,   428,   434,   479,   766,   428,   434,   733,   297,
+     130,   424,   424,   424,   424,   424,   424,   424,   573,   424,
+     424,   424,   424,    79,    91,    96,   112,   156,   171,   172,
+     246,   262,   289,   291,   297,   331,   350,   354,   363,   400,
+     480,   512,   514,   650,   666,   699,   737,   755,   757,   287,
+     752,   145,   147,   189,   193,   227,   235,   297,   350,   458,
+     462,   555,   563,   625,   640,   737,   766,   297,   297,   428,
+     434,   429,   497,   297,   428,   434,   297,   428,   434,   595,
+     297,   428,   434,   423,   425,   428,   434,   424,    71,    72,
+      76,   123,   139,   162,   254,   318,   319,   324,   415,   433,
+     448,   492,   656,   682,   436,   656,   682,   438,   656,   682,
+     424,   477,   656,   682,   297,   350,   737,   575,   656,   682,
+     424,   424,   185,   242,   545,   657,   662,   332,   517,   552,
+     542,   401,   297,   513,   515,   667,   517,   542,   517,     8,
+      18,    24,    28,    32,    39,    41,    51,    52,    53,   753,
+     151,   470,   743,   148,   456,   459,   463,   194,   556,   567,
+     564,   236,   626,   644,   641,   297,   297,   359,   297,   406,
+     656,   682,   670,   670,   318,   325,   448,   670,   670,   670,
+     656,   683,   297,   350,   737,   297,   350,   737,   297,   350,
+     737,   473,   656,   682,   297,   350,   737,   297,   350,   737,
+     591,   656,   682,   593,   656,   682,   546,   658,   297,   350,
+     737,   297,   297,   297,   297,   517,   297,   517,   297,   517,
+     297,   517,   297,   297,   297,   297,   471,    93,   297,   350,
+     355,   650,   690,   737,   181,   465,   536,   552,   108,   271,
+     297,   350,   386,   650,   716,   146,   297,   350,   456,   460,
+     737,   536,   552,   566,    95,   191,   297,   350,   361,   559,
+     650,   192,   297,   350,   561,   567,   737,   536,   552,   643,
+      62,   100,   101,   102,   103,   229,   297,   303,   350,   370,
+     372,   374,   376,   386,   629,   650,   230,   297,   350,   631,
+     644,   737,   297,   297,   350,   737,   297,   297,   319,   326,
+     492,   297,   297,   297,   297,   297,   350,   737,   297,   350,
+     737,   297,   350,   737,   297,   657,   297,   656,   682,    69,
+     157,   186,   213,   219,   226,   228,   240,   252,   263,   292,
+     297,   315,   350,   386,   481,   547,   602,   610,   623,   627,
+     650,   654,   678,   700,   716,   737,   758,   356,   552,   286,
+     456,   457,   750,   387,   695,   765,   106,   382,   717,   461,
+     456,   567,   568,   750,   362,   466,   766,   382,   562,   456,
+     644,   645,   750,   304,   540,   542,   371,   578,   670,   373,
+     578,   670,   375,   578,   670,   377,   578,   670,   382,   632,
+     297,    68,    70,    74,   314,   316,   317,   321,   482,   548,
+      67,   312,   551,   739,   611,   312,   551,   624,   642,   642,
+     655,   551,   677,   679,   701,   759,    82,    90,   127,   136,
+     144,   175,   188,   190,   202,   211,   231,   250,   293,   297,
+     335,   350,   352,   430,   440,   454,   522,   553,   557,   582,
+     597,   633,   673,   678,   716,   737,   760,   537,   766,   552,
+     749,   297,   297,     9,    34,    47,   383,   137,   217,   297,
+     350,   443,   607,   737,   297,   456,   297,   297,   104,   378,
+     560,   297,   566,   567,   297,   297,   297,   297,   297,   297,
+     167,   378,   502,   630,   297,   643,   644,   221,   612,   256,
+     686,   297,   297,   350,   737,   138,   233,   297,   447,   637,
+     644,   297,   481,   637,   644,   758,   551,   729,   196,   297,
+     570,   610,   644,   110,   280,   297,   303,   350,   370,   372,
+     374,   376,   386,   393,   629,   650,   736,   737,   166,   500,
+     628,   159,   215,   239,   297,   335,   350,   352,   430,   454,
+     485,   600,   633,   648,   650,   737,    65,   234,   290,   297,
+     309,   350,   639,   737,   756,    64,   212,   297,   307,   335,
+     350,   352,   430,   454,   485,   599,   600,   633,   648,   650,
+     737,   297,   481,   637,   644,   243,   659,   353,   422,   426,
+     431,   441,   643,   644,   312,   464,   551,   523,   642,   312,
+     551,   565,   565,   583,   642,   464,   598,   634,   643,   644,
+     674,   765,   274,   726,   761,   297,   766,   339,   751,   297,
+     269,   444,   712,   378,   608,   379,   540,   542,    75,   273,
+     297,   322,   724,   503,   540,   542,   297,   322,   724,   613,
+     297,   264,   687,   702,   297,   643,   638,   766,   603,   734,
+     571,    26,    27,    40,   394,   297,   501,   297,   350,   650,
+     737,   486,   490,   764,   536,   552,   601,   740,   552,   649,
+     653,    98,   310,   366,   642,   516,   308,   695,   765,   659,
+     620,   297,   297,   307,   335,   350,   430,   454,   650,   737,
+      87,   113,   204,   216,   225,   251,   297,   347,   350,   402,
+     585,   605,   621,   659,   675,   737,   265,   442,   644,   704,
+     284,   455,   744,   750,   297,   350,   650,   737,   481,   554,
+     165,   498,   558,   297,   350,   650,   736,   737,   297,   335,
+     350,   352,   454,   553,   557,   599,   633,   737,    92,   297,
+     350,   352,   357,   430,   454,   485,   648,   650,   737,   297,
+     454,   673,   765,   727,    63,   168,   179,   297,   305,   350,
+     440,   504,   530,   737,   297,   122,   203,   413,   584,   713,
+     297,   413,   297,   413,   297,   170,   173,   323,   510,   517,
+     518,   510,   517,   518,   725,   503,   257,   297,   688,   703,
+     297,   297,   297,   643,   644,   313,   766,   297,   297,   610,
+     644,   297,   297,   623,   627,   297,   395,   297,   395,   297,
+     395,   766,   169,   174,   297,   350,   508,   520,   737,   637,
+     670,   297,   297,   620,   660,   620,   403,   620,    97,   364,
+     586,   224,   606,   618,   618,   622,   364,   676,   705,   297,
+     378,   502,   745,   214,   232,   272,   297,   350,   386,   604,
+     635,   650,   716,   718,   737,   297,   350,   352,   361,   430,
+     454,   553,   559,   650,   737,   499,   297,   350,   352,   430,
+     650,   737,   358,   430,    86,   143,   259,   297,   344,   453,
+     692,   306,   542,   505,   643,   644,   531,   643,   644,   414,
+     561,   567,   631,   637,   644,   413,   114,   404,   413,   584,
+     714,   511,   519,   297,   725,   297,   689,   702,   297,   718,
+     297,   367,   404,   509,   637,   643,   644,   521,   637,   643,
+     644,   297,   178,   528,   297,   650,   620,   297,   650,   365,
+     297,   650,   619,   297,   650,   297,   650,   297,   650,   121,
+     266,   297,   409,   706,   297,   744,   750,   740,   636,   643,
+     644,   248,   671,   719,   297,   553,   297,   345,   637,   643,
+     644,   297,   637,   643,   644,   693,   297,   350,   440,   504,
+     530,   737,   176,   506,   524,   644,   704,   378,   502,   532,
+     297,   322,   724,   670,   670,   297,   141,   297,   450,   517,
+     518,   297,   510,   517,   297,   255,   297,   684,   297,   297,
+     528,   297,   528,   529,   297,   348,    66,   297,   311,   620,
+     297,   620,   180,   344,   410,   533,   692,   195,   524,   569,
+     644,   704,   707,   729,   297,   303,   350,   370,   372,   374,
+     376,   386,   629,   650,   736,   737,   766,   249,   672,   720,
+     322,   346,   724,   404,   694,   517,   378,   502,   507,   297,
+     297,   297,   297,   750,   297,   450,   510,   517,   518,   297,
+     650,   620,   534,   637,   643,   644,   411,   524,   569,   644,
+     704,   297,   378,   502,   708,   297,   766,   766,   105,   380,
+     721,   297,   297,   322,   724,   497,   525,   297,   685,   718,
+     620,   510,   517,   518,   535,   378,   412,   502,   297,   297,
+     766,   381,   587,   722,   297,   297,   620,   297,   297,   297,
+     297,   620,   589,   723,   297,   297
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   296,   297,   298,   299,   299,   299,   299,   299,   299,
+     299,   300,   301,   302,   303,   304,   304,   305,   306,   306,
+     306,   306,   306,   306,   307,   308,   308,   309,   310,   310,
+     310,   310,   310,   311,   312,   313,   313,   314,   315,   316,
+     316,   316,   316,   316,   317,   318,   319,   320,   321,   322,
+     323,   323,   323,   324,   325,   325,   326,   326,   327,   328,
+     328,   328,   328,   329,   330,   330,   331,   332,   332,   333,
+     334,   335,   336,   337,   337,   337,   337,   337,   337,   337,
+     338,   339,   340,   340,   341,   342,   343,   343,   343,   344,
+     345,   345,   345,   346,   346,   346,   347,   348,   348,   349,
+     350,   351,   351,   352,   353,   353,   353,   353,   353,   353,
+     353,   353,   354,   355,   356,   356,   356,   356,   356,   356,
+     356,   356,   356,   356,   356,   356,   356,   356,   356,   356,
+     356,   356,   357,   358,   358,   359,   360,   360,   360,   361,
+     362,   362,   363,   364,   365,   365,   365,   366,   367,   367,
+     368,   369,   369,   370,   371,   371,   372,   373,   373,   374,
+     375,   375,   376,   377,   377,   378,   379,   379,   380,   381,
+     381,   382,   383,   383,   383,   384,   385,   385,   385,   385,
+     385,   386,   387,   387,   388,   389,   390,   390,   390,   390,
+     390,   390,   390,   390,   390,   390,   390,   390,   390,   390,
+     390,   391,   392,   392,   392,   392,   393,   394,   394,   394,
+     395,   396,   396,   397,   397,   398,   398,   399,   399,   400,
+     401,   401,   402,   403,   403,   404,   405,   406,   406,   406,
+     406,   407,   408,   408,   408,   409,   410,   410,   410,   411,
+     411,   411,   411,   412,   412,   412,   413,   414,   414,   414,
+     414,   414,   414,   414,   415,   416,   417,   417,   417,   417,
+     417,   418,   419,   420,   421,   421,   421,   421,   421,   421,
+     421,   421,   421,   421,   421,   421,   421,   421,   422,   423,
+     424,   425,   425,   425,   426,   427,   427,   427,   427,   427,
+     427,   427,   427,   427,   427,   427,   427,   427,   428,   429,
+     429,   430,   431,   431,   431,   431,   431,   431,   431,   431,
+     431,   431,   431,   432,   433,   433,   433,   433,   434,   434,
+     434,   434,   434,   435,   436,   436,   436,   436,   437,   438,
+     438,   438,   438,   439,   440,   441,   441,   442,   442,   442,
+     442,   443,   444,   444,   445,   446,   446,   446,   446,   446,
+     447,   448,   449,   450,   451,   452,   452,   453,   454,   455,
+     455,   455,   455,   455,   455,   455,   455,   455,   455,   456,
+     457,   457,   457,   458,   459,   459,   459,   459,   459,   460,
+     461,   461,   462,   463,   463,   463,   463,   463,   464,   464,
+     465,   465,   466,   467,   467,   468,   469,   469,   469,   469,
+     470,   471,   471,   471,   471,   471,   471,   471,   471,   471,
+     471,   471,   471,   471,   471,   471,   471,   471,   472,   473,
+     473,   473,   473,   474,   475,   475,   475,   475,   476,   477,
+     477,   477,   477,   478,   479,   479,   480,   481,   482,   482,
+     482,   482,   483,   484,   484,   484,   484,   484,   484,   484,
+     484,   484,   485,   486,   486,   487,   488,   489,   489,   490,
+     491,   492,   493,   494,   495,   496,   496,   496,   496,   496,
+     497,   498,   499,   499,   500,   501,   501,   501,   502,   503,
+     503,   504,   505,   505,   506,   506,   506,   507,   507,   507,
+     508,   509,   509,   509,   509,   510,   511,   511,   511,   511,
+     512,   513,   513,   514,   515,   515,   516,   517,   518,   519,
+     519,   519,   520,   521,   521,   521,   521,   522,   523,   523,
+     523,   523,   524,   525,   525,   526,   527,   527,   527,   527,
+     527,   527,   527,   527,   527,   527,   527,   527,   527,   527,
+     527,   528,   529,   529,   529,   529,   529,   530,   531,   531,
+     532,   532,   532,   533,   534,   534,   534,   535,   535,   535,
+     536,   537,   537,   538,   539,   539,   539,   539,   540,   541,
+     541,   542,   542,   543,   544,   544,   544,   545,   546,   546,
+     547,   548,   548,   548,   548,   548,   549,   550,   550,   551,
+     551,   551,   552,   552,   553,   554,   554,   554,   554,   554,
+     554,   554,   554,   554,   554,   555,   556,   556,   556,   556,
+     556,   557,   558,   558,   558,   558,   558,   558,   559,   560,
+     560,   560,   561,   562,   562,   562,   563,   564,   564,   564,
+     564,   564,   565,   565,   566,   566,   567,   568,   568,   568,
+     568,   569,   570,   571,   571,   571,   572,   573,   573,   573,
+     574,   575,   575,   575,   575,   576,   577,   577,   577,   577,
+     578,   579,   579,   580,   581,   581,   581,   581,   582,   583,
+     583,   583,   583,   583,   584,   585,   586,   586,   587,   588,
+     588,   588,   588,   588,   588,   588,   588,   589,   590,   591,
+     591,   591,   591,   592,   593,   593,   593,   593,   594,   595,
+     595,   596,   597,   598,   598,   598,   598,   598,   598,   598,
+     598,   598,   598,   599,   600,   601,   601,   602,   603,   603,
+     604,   605,   606,   606,   607,   608,   608,   609,   610,   611,
+     611,   611,   611,   612,   613,   613,   614,   615,   615,   615,
+     615,   616,   617,   617,   618,   619,   619,   620,   621,   622,
+     622,   623,   624,   624,   624,   624,   624,   624,   624,   624,
+     624,   624,   624,   624,   624,   625,   626,   626,   626,   626,
+     626,   626,   626,   626,   626,   626,   627,   628,   628,   628,
+     628,   629,   630,   630,   630,   630,   631,   632,   632,   632,
+     633,   634,   634,   634,   634,   634,   634,   634,   634,   634,
+     634,   634,   635,   636,   636,   636,   636,   636,   636,   636,
+     636,   636,   636,   636,   636,   636,   637,   638,   638,   638,
+     639,   640,   641,   641,   641,   641,   641,   642,   642,   643,
+     643,   644,   645,   645,   645,   645,   646,   647,   647,   648,
+     649,   649,   650,   651,   651,   651,   651,   651,   652,   653,
+     654,   655,   655,   655,   655,   655,   655,   655,   655,   655,
+     655,   655,   655,   656,   656,   656,   656,   656,   656,   657,
+     658,   658,   658,   659,   660,   660,   661,   662,   662,   662,
+     662,   663,   664,   664,   665,   665,   666,   667,   667,   668,
+     669,   670,   670,   671,   672,   673,   674,   674,   674,   674,
+     675,   676,   676,   677,   678,   679,   679,   679,   679,   679,
+     679,   680,   681,   681,   681,   681,   682,   683,   683,   684,
+     685,   685,   686,   687,   687,   688,   689,   689,   690,   691,
+     691,   691,   691,   692,   693,   693,   693,   694,   694,   694,
+     695,   696,   697,   697,   697,   697,   698,   698,   699,   700,
+     701,   701,   701,   701,   701,   701,   701,   701,   701,   701,
+     701,   701,   701,   701,   702,   703,   703,   704,   705,   705,
+     705,   706,   707,   707,   707,   707,   708,   708,   708,   709,
+     710,   710,   710,   710,   710,   710,   710,   711,   712,   713,
+     713,   714,   714,   714,   715,   716,   717,   717,   717,   717,
+     717,   718,   719,   719,   720,   720,   721,   721,   722,   722,
+     723,   723,   724,   725,   725,   725,   726,   727,   727,   727,
+     727,   728,   729,   729,   729,   729,   729,   729,   730,   731,
+     732,   733,   733,   733,   733,   734,   735,   735,   735,   735,
+     735,   735,   735,   735,   735,   735,   735,   735,   735,   735,
+     735,   735,   736,   737,   738,   738,   738,   738,   738,   739,
+     739,   740,   740,   741,   742,   743,   743,   743,   743,   743,
+     743,   744,   745,   745,   745,   746,   747,   747,   747,   747,
+     747,   747,   747,   747,   747,   748,   749,   750,   751,   751,
+     752,   753,   753,   753,   753,   753,   753,   753,   753,   753,
+     753,   754,   755,   756,   757,   758,   759,   759,   759,   759,
+     760,   761,   761,   761,   761,   761,   761,   761,   762,   763,
+     763,   763,   763,   763,   763,   763,   764,   765,   766,   767
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     7,     0,     2,     2,     2,     2,     2,
+       2,     1,     3,     5,     3,     1,     1,     3,     1,     2,
+       2,     2,     2,     2,     3,     1,     1,     3,     1,     2,
+       2,     2,     2,     5,     5,     0,     1,     3,     3,     1,
+       1,     1,     2,     2,     3,     3,     3,     3,     2,     3,
+       1,     1,     1,     4,     1,     1,     1,     1,     3,     0,
+       2,     2,     2,     3,     1,     2,     3,     1,     1,     5,
+       3,     3,     4,     1,     2,     2,     2,     2,     2,     2,
+       1,     4,     0,     1,     1,     3,     1,     1,     1,     4,
+       1,     1,     1,     0,     1,     1,     5,     0,     2,     5,
+       3,     0,     2,     3,     0,     2,     2,     2,     2,     2,
+       2,     2,     3,     3,     0,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     3,     0,     1,     3,     1,     1,     1,     3,
+       1,     1,     3,     3,     0,     2,     2,     4,     0,     1,
+       4,     0,     1,     3,     1,     1,     3,     1,     1,     3,
+       1,     1,     3,     1,     1,     3,     1,     1,     3,     0,
+       2,     3,     1,     1,     1,     4,     1,     2,     2,     2,
+       2,     3,     1,     1,     1,     3,     0,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     1,     1,     2,     2,     3,     1,     1,     1,
+       6,     1,     1,     0,     1,     0,     1,     0,     1,     3,
+       0,     2,     3,     1,     2,     3,     6,     1,     1,     2,
+       2,     3,     1,     1,     1,     5,     1,     1,     1,     1,
+       1,     1,     1,     0,     1,     1,     3,     1,     1,     1,
+       1,     1,     2,     2,     3,     5,     1,     2,     2,     2,
+       2,     4,     2,     3,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     1,
+       3,     1,     1,     1,     3,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     4,     0,
+       1,     3,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     5,     1,     1,     2,     2,     1,     1,
+       1,     1,     1,     5,     1,     1,     2,     2,     5,     1,
+       1,     2,     2,     5,     4,     1,     1,     1,     1,     2,
+       2,     3,     1,     2,     3,     0,     2,     2,     2,     2,
+       3,     3,     4,     2,     3,     1,     1,     2,     4,     1,
+       1,     2,     2,     2,     2,     2,     2,     2,     2,     4,
+       0,     1,     1,     3,     1,     2,     2,     2,     2,     3,
+       0,     2,     3,     0,     2,     2,     2,     2,     1,     1,
+       1,     1,     3,     1,     2,     3,     0,     2,     2,     2,
+       3,     0,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     6,     1,
+       1,     2,     2,     3,     1,     1,     2,     2,     5,     1,
+       1,     2,     2,     3,     1,     1,     2,     3,     0,     2,
+       2,     2,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     3,     1,     2,     3,     3,     1,     2,     1,
+       1,     3,     1,     1,     5,     1,     2,     2,     2,     2,
+       3,     3,     0,     2,     3,     0,     2,     2,     4,     1,
+       1,     5,     1,     1,     1,     1,     1,     0,     1,     1,
+       3,     1,     1,     1,     2,     3,     0,     2,     2,     2,
+       3,     0,     2,     3,     0,     2,     1,     1,     3,     0,
+       2,     2,     3,     1,     1,     1,     2,     3,     1,     2,
+       2,     2,     4,     0,     1,     3,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     0,     2,     2,     2,     2,     4,     1,     1,
+       0,     1,     1,     4,     1,     1,     1,     1,     1,     1,
+       4,     1,     2,     3,     0,     2,     2,     2,     3,     1,
+       2,     1,     1,     5,     1,     1,     1,     3,     0,     2,
+       3,     0,     2,     2,     2,     2,     3,     1,     2,     1,
+       1,     1,     1,     1,     4,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     1,     2,     2,     2,
+       2,     4,     1,     2,     2,     2,     2,     2,     4,     1,
+       2,     2,     3,     0,     2,     2,     3,     0,     2,     2,
+       2,     2,     1,     1,     1,     1,     4,     0,     1,     1,
+       1,     2,     3,     0,     2,     2,     4,     1,     2,     2,
+       5,     1,     1,     2,     2,     3,     0,     2,     2,     2,
+       3,     1,     2,     3,     0,     2,     2,     2,     3,     1,
+       2,     2,     2,     2,     4,     3,     1,     2,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     6,     1,
+       1,     2,     2,     6,     1,     1,     2,     2,     5,     1,
+       1,     3,     3,     1,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     3,     3,     1,     2,     5,     0,     1,
+       4,     3,     1,     2,     3,     1,     2,     3,     3,     0,
+       2,     2,     2,     3,     0,     2,     3,     0,     2,     2,
+       2,     3,     1,     2,     3,     0,     2,     4,     3,     1,
+       2,     3,     1,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     4,     1,     2,     2,
+       2,     4,     1,     1,     2,     2,     3,     0,     2,     2,
+       3,     1,     1,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     3,     1,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     0,     2,     2,
+       4,     3,     0,     2,     2,     2,     2,     1,     1,     1,
+       1,     4,     0,     1,     1,     1,     4,     0,     1,     3,
+       1,     2,     4,     1,     2,     2,     2,     2,     1,     1,
+       3,     0,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     1,     1,     1,     1,     1,     1,     3,
+       0,     2,     2,     4,     1,     2,     5,     1,     1,     2,
+       2,     4,     1,     1,     1,     1,     3,     0,     2,     1,
+       5,     1,     4,     4,     4,     3,     1,     2,     2,     2,
+       3,     1,     2,     1,     3,     1,     2,     2,     2,     2,
+       2,     3,     0,     2,     2,     2,     3,     0,     1,     4,
+       0,     1,     3,     0,     1,     3,     1,     2,     3,     0,
+       2,     2,     2,     4,     1,     1,     1,     1,     2,     2,
+       3,     3,     0,     2,     2,     2,     1,     2,     3,     3,
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     3,     0,     2,     3,     0,     2,
+       2,     4,     1,     1,     1,     1,     0,     1,     1,     3,
+       1,     2,     2,     2,     2,     2,     2,     3,     4,     1,
+       1,     1,     1,     1,     8,     3,     1,     2,     2,     2,
+       2,     7,     0,     1,     0,     1,     0,     1,     0,     1,
+       0,     1,     4,     1,     1,     1,     3,     0,     2,     2,
+       2,     2,     1,     1,     1,     1,     1,     1,     2,     2,
+       3,     1,     1,     2,     2,     3,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     3,     1,     2,     2,     2,     2,     1,
+       1,     1,     1,     3,     5,     1,     2,     2,     2,     2,
+       2,     3,     0,     2,     2,     3,     0,     2,     2,     2,
+       2,     2,     2,     2,     2,     1,     1,     4,     0,     1,
+       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     3,     3,     5,     3,     3,     0,     2,     2,     2,
+       3,     1,     2,     2,     2,     2,     2,     2,     3,     1,
+       2,     2,     2,     2,     2,     2,     1,     1,     1,     1
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (void)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 514 "edif.y" /* yacc.c:1646  */
+    { PopC(); }
+#line 3377 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 11:
+#line 529 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3383 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 12:
+#line 532 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3389 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 13:
+#line 536 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 3395 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 25:
+#line 560 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3401 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 34:
+#line 577 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); }
+#line 3407 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 36:
+#line 581 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3413 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 606 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3419 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 69:
+#line 654 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
+#line 3425 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 70:
+#line 657 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3431 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 80:
+#line 675 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3437 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 84:
+#line 685 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3443 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 91:
+#line 700 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3449 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 102:
+#line 723 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3455 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 140:
+#line 783 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3461 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 147:
+#line 798 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); }
+#line 3467 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 150:
+#line 805 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); }
+#line 3473 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 182:
+#line 875 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3479 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 184:
+#line 879 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3485 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 240:
+#line 983 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3491 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 247:
+#line 996 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3497 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 278:
+#line 1043 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3503 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 279:
+#line 1046 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3509 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 333:
+#line 1132 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
+#line 3515 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 336:
+#line 1139 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3521 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 337:
+#line 1142 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3527 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 344:
+#line 1155 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); }
+#line 3533 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 346:
+#line 1159 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3539 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 347:
+#line 1160 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3545 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 348:
+#line 1161 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3551 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 369:
+#line 1202 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[-2].s); }
+#line 3557 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 371:
+#line 1206 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3563 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 374:
+#line 1213 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3569 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 381:
+#line 1224 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3575 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 384:
+#line 1231 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3581 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 388:
+#line 1237 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3587 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 390:
+#line 1241 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3593 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 393:
+#line 1248 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3599 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 397:
+#line 1256 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3605 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 408:
+#line 1271 "edif.y" /* yacc.c:1646  */
+    { pair_list_free((yyvsp[0].pl)); }
+#line 3611 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 437:
+#line 1321 "edif.y" /* yacc.c:1646  */
+    { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); }
+#line 3617 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 438:
+#line 1324 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=NULL; }
+#line 3623 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 439:
+#line 1325 "edif.y" /* yacc.c:1646  */
+    { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); }
+#line 3629 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 455:
+#line 1351 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3635 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 459:
+#line 1361 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3641 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 460:
+#line 1364 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3647 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 462:
+#line 1370 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3653 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 463:
+#line 1373 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3659 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 483:
+#line 1415 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3665 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 484:
+#line 1418 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3671 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 492:
+#line 1432 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3677 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 506:
+#line 1460 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3683 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 507:
+#line 1463 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3689 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 514:
+#line 1478 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3695 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 549:
+#line 1533 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3701 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 555:
+#line 1545 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3707 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 560:
+#line 1554 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); }
+#line 3713 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 561:
+#line 1557 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3719 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 562:
+#line 1558 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3725 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 582:
+#line 1600 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3731 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 585:
+#line 1603 "edif.y" /* yacc.c:1646  */
+    { pair_list_free((yyvsp[0].pl)); }
+#line 3737 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 586:
+#line 1606 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[-1].s); }
+#line 3743 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 587:
+#line 1609 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3749 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 589:
+#line 1613 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
+#line 3755 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 590:
+#line 1614 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
+#line 3761 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 591:
+#line 1615 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=(yyvsp[0].ps); }
+#line 3767 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 592:
+#line 1618 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3773 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 593:
+#line 1619 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3779 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 594:
+#line 1622 "edif.y" /* yacc.c:1646  */
+    { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); }
+#line 3785 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 595:
+#line 1625 "edif.y" /* yacc.c:1646  */
+    { (yyval.pl)=(yyvsp[0].pl); }
+#line 3791 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 611:
+#line 1647 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[-2].ps)); }
+#line 3797 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 632:
+#line 1684 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=(yyvsp[0].ps); }
+#line 3803 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 633:
+#line 1685 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=NULL; }
+#line 3809 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 634:
+#line 1689 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3815 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 639:
+#line 1698 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3821 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 644:
+#line 1709 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3827 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 698:
+#line 1811 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-3].s)); }
+#line 3833 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 701:
+#line 1818 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3839 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 727:
+#line 1870 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 3845 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 730:
+#line 1877 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3851 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 747:
+#line 1912 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 3857 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 766:
+#line 1943 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3863 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 789:
+#line 1978 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3869 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 791:
+#line 1984 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3875 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 803:
+#line 2000 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3881 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 818:
+#line 2019 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3887 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 823:
+#line 2030 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3893 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 827:
+#line 2036 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3899 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 829:
+#line 2040 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3905 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 831:
+#line 2045 "edif.y" /* yacc.c:1646  */
+    {
+    if ((yyvsp[-1].ps))
+    {
+	(yyval.ps) = new_str_pair((yyvsp[-1].ps)->str1,(yyvsp[-2].s));
+	free((yyvsp[-1].ps));
+    }
+    else
+    {
+	/* handle port with no instance by passing up the chain */
+	(yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s));
+    }
+}
+#line 3922 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 832:
+#line 2059 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=NULL; }
+#line 3928 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 833:
+#line 2060 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=(yyvsp[0].ps); }
+#line 3934 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 834:
+#line 2061 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
+#line 3940 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 835:
+#line 2062 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps)=NULL; }
+#line 3946 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 848:
+#line 2089 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3952 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 849:
+#line 2092 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 3958 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 881:
+#line 2145 "edif.y" /* yacc.c:1646  */
+    { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); }
+#line 3964 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 882:
+#line 2148 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3970 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 883:
+#line 2149 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3976 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 884:
+#line 2152 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 3982 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 885:
+#line 2153 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=NULL; }
+#line 3988 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 889:
+#line 2163 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 3994 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 891:
+#line 2169 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4000 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 892:
+#line 2170 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 4006 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 893:
+#line 2173 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 4012 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 894:
+#line 2176 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 4018 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 896:
+#line 2182 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4024 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 898:
+#line 2184 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4030 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 903:
+#line 2195 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4036 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 935:
+#line 2259 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4042 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 943:
+#line 2275 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4048 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 946:
+#line 2280 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4054 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 973:
+#line 2325 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4060 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 987:
+#line 2347 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 4066 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 994:
+#line 2363 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-6].s)); free((yyvsp[-5].s)); free((yyvsp[-4].s)); free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
+#line 4072 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1054:
+#line 2470 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4078 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1055:
+#line 2471 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4084 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1056:
+#line 2472 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4090 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1057:
+#line 2473 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4096 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1059:
+#line 2477 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4102 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1061:
+#line 2481 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4108 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1063:
+#line 2485 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[-1].s)); }
+#line 4114 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1085:
+#line 2521 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4120 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1086:
+#line 2524 "edif.y" /* yacc.c:1646  */
+    { free((yyvsp[0].s)); }
+#line 4126 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1107:
+#line 2565 "edif.y" /* yacc.c:1646  */
+    { str_pair_free((yyvsp[0].ps)); }
+#line 4132 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1109:
+#line 2567 "edif.y" /* yacc.c:1646  */
+    { pair_list_free((yyvsp[0].pl)); }
+#line 4138 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1126:
+#line 2594 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 4144 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1127:
+#line 2597 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 4150 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1128:
+#line 2600 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 4156 "edif.c" /* yacc.c:1646  */
+    break;
+
+  case 1129:
+#line 2603 "edif.y" /* yacc.c:1646  */
+    { (yyval.s)=(yyvsp[0].s); }
+#line 4162 "edif.c" /* yacc.c:1646  */
+    break;
+
+
+#line 4166 "edif.c" /* yacc.c:1646  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 2606 "edif.y" /* yacc.c:1906  */
+
+/*
+ *	xmalloc:
+ *
+ *	  Garbage function for 'alloca()'.
+ */
+char *xmalloc(int siz)
+{
+  return ((char *)Malloc(siz));
+}
+/*
+ *	Token & context carriers:
+ *
+ *	  These are the linkage pointers for threading this context garbage
+ *	for converting identifiers into parser tokens.
+ */
+typedef struct TokenCar {
+  struct TokenCar *Next;	/* pointer to next carrier */
+  struct Token *Token;		/* associated token */
+} TokenCar;
+typedef struct UsedCar {
+  struct UsedCar *Next;		/* pointer to next carrier */
+  short Code;			/* used '%token' value */
+} UsedCar;
+typedef struct ContextCar {
+  struct ContextCar *Next;	/* pointer to next carrier */
+  struct Context *Context;	/* associated context */
+  union {
+    int Single;			/* single usage flag (context tree) */
+    struct UsedCar *Used;	/* single used list (context stack) */
+  } u;
+} ContextCar;
+/*
+ *	Token definitions:
+ *
+ *	  This associates the '%token' codings with strings which are to
+ *	be free standing tokens. Doesn't have to be in sorted order but the
+ *	strings must be in lower case.
+ */
+typedef struct Token {
+  const char *Name;			/* token name */
+  int Code;			/* '%token' value */
+  struct Token *Next;		/* hash table linkage */
+} Token;
+static Token TokenDef[] = {
+  {"angle",		EDIF_TOK_ANGLE},
+  {"behavior",		EDIF_TOK_BEHAVIOR},
+  {"calculated",	EDIF_TOK_CALCULATED},
+  {"capacitance",	EDIF_TOK_CAPACITANCE},
+  {"centercenter",	EDIF_TOK_CENTERCENTER},
+  {"centerleft",	EDIF_TOK_CENTERLEFT},
+  {"centerright",	EDIF_TOK_CENTERRIGHT},
+  {"charge",		EDIF_TOK_CHARGE},
+  {"conductance",	EDIF_TOK_CONDUCTANCE},
+  {"current",		EDIF_TOK_CURRENT},
+  {"distance",		EDIF_TOK_DISTANCE},
+  {"document",		EDIF_TOK_DOCUMENT},
+  {"energy",		EDIF_TOK_ENERGY},
+  {"extend",		EDIF_TOK_EXTEND},
+  {"flux",		EDIF_TOK_FLUX},
+  {"frequency",		EDIF_TOK_FREQUENCY},
+  {"generic",		EDIF_TOK_GENERIC},
+  {"graphic",		EDIF_TOK_GRAPHIC},
+  {"inductance",	EDIF_TOK_INDUCTANCE},
+  {"inout",		EDIF_TOK_INOUT},
+  {"input",		EDIF_TOK_INPUT},
+  {"logicmodel",	EDIF_TOK_LOGICMODEL},
+  {"lowercenter",	EDIF_TOK_LOWERCENTER},
+  {"lowerleft",		EDIF_TOK_LOWERLEFT},
+  {"lowerright",	EDIF_TOK_LOWERRIGHT},
+  {"masklayout",	EDIF_TOK_MASKLAYOUT},
+  {"mass",		EDIF_TOK_MASS},
+  {"measured",		EDIF_TOK_MEASURED},
+  {"mx",		EDIF_TOK_MX},
+  {"mxr90",		EDIF_TOK_MXR90},
+  {"my",		EDIF_TOK_MY},
+  {"myr90",		EDIF_TOK_MYR90},
+  {"netlist",		EDIF_TOK_NETLIST},
+  {"output",		EDIF_TOK_OUTPUT},
+  {"pcblayout",		EDIF_TOK_PCBLAYOUT},
+  {"power",		EDIF_TOK_POWER},
+  {"r0",		EDIF_TOK_R0},
+  {"r180",		EDIF_TOK_R180},
+  {"r270",		EDIF_TOK_R270},
+  {"r90",		EDIF_TOK_R90},
+  {"required",		EDIF_TOK_REQUIRED},
+  {"resistance",	EDIF_TOK_RESISTANCE},
+  {"ripper",		EDIF_TOK_RIPPER},
+  {"round",		EDIF_TOK_ROUND},
+  {"schematic",		EDIF_TOK_SCHEMATIC},
+  {"stranger",		EDIF_TOK_STRANGER},
+  {"symbolic",		EDIF_TOK_SYMBOLIC},
+  {"temperature",	EDIF_TOK_TEMPERATURE},
+  {"tie",		EDIF_TOK_TIE},
+  {"time",		EDIF_TOK_TIME},
+  {"truncate",		EDIF_TOK_TRUNCATE},
+  {"uppercenter",	EDIF_TOK_UPPERCENTER},
+  {"upperleft",		EDIF_TOK_UPPERLEFT},
+  {"upperright",	EDIF_TOK_UPPERRIGHT},
+  {"voltage",		EDIF_TOK_VOLTAGE}
+};
+static int TokenDefSize = sizeof(TokenDef) / sizeof(Token);
+/*
+ *	Token enable definitions:
+ *
+ *	  There is one array for each set of tokens enabled by a
+ *	particular context (barf). Another array is used to bind
+ *	these arrays to a context.
+ */
+static short e_CellType[] = {EDIF_TOK_TIE, EDIF_TOK_RIPPER, EDIF_TOK_GENERIC};
+static short e_CornerType[] = {EDIF_TOK_EXTEND, EDIF_TOK_TRUNCATE,
+			       EDIF_TOK_ROUND};
+static short e_Derivation[] = {EDIF_TOK_CALCULATED, EDIF_TOK_MEASURED,
+			       EDIF_TOK_REQUIRED};
+static short e_Direction[] = {EDIF_TOK_INPUT, EDIF_TOK_OUTPUT,
+			      EDIF_TOK_INOUT};
+static short e_EndType[] = {EDIF_TOK_EXTEND, EDIF_TOK_TRUNCATE,
+			    EDIF_TOK_ROUND};
+static short e_Justify[] = {EDIF_TOK_CENTERCENTER, EDIF_TOK_CENTERLEFT,
+			    EDIF_TOK_CENTERRIGHT, EDIF_TOK_LOWERCENTER,
+			    EDIF_TOK_LOWERLEFT, EDIF_TOK_LOWERRIGHT,
+			    EDIF_TOK_UPPERCENTER, EDIF_TOK_UPPERLEFT,
+			    EDIF_TOK_UPPERRIGHT};
+static short e_Orientation[] = {EDIF_TOK_R0, EDIF_TOK_R90, EDIF_TOK_R180,
+				EDIF_TOK_R270, EDIF_TOK_MX, EDIF_TOK_MY,
+				EDIF_TOK_MXR90, EDIF_TOK_MYR90};
+static short e_Unit[] = {EDIF_TOK_DISTANCE, EDIF_TOK_CAPACITANCE,
+			 EDIF_TOK_CURRENT, EDIF_TOK_RESISTANCE,
+			 EDIF_TOK_TEMPERATURE, EDIF_TOK_TIME,
+			 EDIF_TOK_VOLTAGE, EDIF_TOK_MASS, EDIF_TOK_FREQUENCY,
+			 EDIF_TOK_INDUCTANCE, EDIF_TOK_ENERGY,
+			 EDIF_TOK_POWER, EDIF_TOK_CHARGE,
+			 EDIF_TOK_CONDUCTANCE, EDIF_TOK_FLUX, EDIF_TOK_ANGLE};
+static short e_ViewType[] = {EDIF_TOK_MASKLAYOUT, EDIF_TOK_PCBLAYOUT,
+			     EDIF_TOK_NETLIST, EDIF_TOK_SCHEMATIC,
+			     EDIF_TOK_SYMBOLIC, EDIF_TOK_BEHAVIOR,
+			     EDIF_TOK_LOGICMODEL, EDIF_TOK_DOCUMENT,
+			     EDIF_TOK_GRAPHIC, EDIF_TOK_STRANGER};
+/*
+ *	Token tying table:
+ *
+ *	  This binds enabled tokens to a context.
+ */
+typedef struct Tie {
+  short *Enable;		/* pointer to enable array */
+  short Origin;			/* '%token' value of context */
+  short EnableSize;		/* size of enabled array */
+} Tie;
+#define	TE(e,o)			{e,o,sizeof(e)/sizeof(short)}
+static Tie TieDef[] = {
+  TE(e_CellType,	EDIF_TOK_CELLTYPE),
+  TE(e_CornerType,	EDIF_TOK_CORNERTYPE),
+  TE(e_Derivation,	EDIF_TOK_DERIVATION),
+  TE(e_Direction,	EDIF_TOK_DIRECTION),
+  TE(e_EndType,		EDIF_TOK_ENDTYPE),
+  TE(e_Justify,		EDIF_TOK_JUSTIFY),
+  TE(e_Orientation,	EDIF_TOK_ORIENTATION),
+  TE(e_Unit,		EDIF_TOK_UNIT),
+  TE(e_ViewType,	EDIF_TOK_VIEWTYPE)
+};
+static int TieDefSize = sizeof(TieDef) / sizeof(Tie);
+/*
+ *	Context definitions:
+ *
+ *	  This associates keyword strings with '%token' values. It
+ *	also creates a pretty much empty header for later building of
+ *	the context tree. Again they needn't be sorted, but strings
+ *	must be lower case.
+ */
+typedef struct Context {
+  const char *Name;			/* keyword name */
+  short Code;			/* '%token' value */
+  short Flags;			/* special operation flags */
+  struct ContextCar *Context;	/* contexts which can be moved to */
+  struct TokenCar *Token;	/* active tokens */
+  struct Context *Next;		/* hash table linkage */
+} Context;
+static Context ContextDef[] = {
+  {"",				0},		/* start context */
+  {"acload",			EDIF_TOK_ACLOAD},
+  {"after",			EDIF_TOK_AFTER},
+  {"annotate",			EDIF_TOK_ANNOTATE},
+  {"apply",			EDIF_TOK_APPLY},
+  {"arc",			EDIF_TOK_ARC},
+  {"array",			EDIF_TOK_ARRAY},
+  {"arraymacro",		EDIF_TOK_ARRAYMACRO},
+  {"arrayrelatedinfo",		EDIF_TOK_ARRAYRELATEDINFO},
+  {"arraysite",			EDIF_TOK_ARRAYSITE},
+  {"atleast",			EDIF_TOK_ATLEAST},
+  {"atmost",			EDIF_TOK_ATMOST},
+  {"author",			EDIF_TOK_AUTHOR},
+  {"basearray",			EDIF_TOK_BASEARRAY},
+  {"becomes",			EDIF_TOK_BECOMES},
+  {"between",			EDIF_TOK_BETWEEN},
+  {"boolean",			EDIF_TOK_BOOLEAN},
+  {"booleandisplay",		EDIF_TOK_BOOLEANDISPLAY},
+  {"booleanmap",		EDIF_TOK_BOOLEANMAP},
+  {"borderpattern",		EDIF_TOK_BORDERPATTERN},
+  {"borderwidth",		EDIF_TOK_BORDERWIDTH},
+  {"boundingbox",		EDIF_TOK_BOUNDINGBOX},
+  {"cell",			EDIF_TOK_CELL},
+  {"cellref",			EDIF_TOK_CELLREF},
+  {"celltype",			EDIF_TOK_CELLTYPE},
+  {"change",			EDIF_TOK_CHANGE},
+  {"circle",			EDIF_TOK_CIRCLE},
+  {"color",			EDIF_TOK_COLOR},
+  {"comment",			EDIF_TOK_COMMENT},
+  {"commentgraphics",		EDIF_TOK_COMMENTGRAPHICS},
+  {"compound",			EDIF_TOK_COMPOUND},
+  {"connectlocation",		EDIF_TOK_CONNECTLOCATION},
+  {"contents",			EDIF_TOK_CONTENTS},
+  {"cornertype",		EDIF_TOK_CORNERTYPE},
+  {"criticality",		EDIF_TOK_CRITICALITY},
+  {"currentmap",		EDIF_TOK_CURRENTMAP},
+  {"curve",			EDIF_TOK_CURVE},
+  {"cycle",			EDIF_TOK_CYCLE},
+  {"dataorigin",		EDIF_TOK_DATAORIGIN},
+  {"dcfaninload",		EDIF_TOK_DCFANINLOAD},
+  {"dcfanoutload",		EDIF_TOK_DCFANOUTLOAD},
+  {"dcmaxfanin",		EDIF_TOK_DCMAXFANIN},
+  {"dcmaxfanout",		EDIF_TOK_DCMAXFANOUT},
+  {"delay",			EDIF_TOK_DELAY},
+  {"delta",			EDIF_TOK_DELTA},
+  {"derivation",		EDIF_TOK_DERIVATION},
+  {"design",			EDIF_TOK_DESIGN},
+  {"designator",		EDIF_TOK_DESIGNATOR},
+  {"difference",		EDIF_TOK_DIFFERENCE},
+  {"direction",			EDIF_TOK_DIRECTION},
+  {"display",			EDIF_TOK_DISPLAY},
+  {"dominates",			EDIF_TOK_DOMINATES},
+  {"dot",			EDIF_TOK_DOT},
+  {"duration",			EDIF_TOK_DURATION},
+  {"e",				EDIF_TOK_E},
+  {"edif",			EDIF_TOK_EDIF},
+  {"ediflevel",			EDIF_TOK_EDIFLEVEL},
+  {"edifversion",		EDIF_TOK_EDIFVERSION},
+  {"enclosuredistance",		EDIF_TOK_ENCLOSUREDISTANCE},
+  {"endtype",			EDIF_TOK_ENDTYPE},
+  {"entry",			EDIF_TOK_ENTRY},
+  {"exactly",			EDIF_TOK_EXACTLY},
+  {"external",			EDIF_TOK_EXTERNAL},
+  {"fabricate",			EDIF_TOK_FABRICATE},
+  {"false",			EDIF_TOK_FALSE},
+  {"figure",			EDIF_TOK_FIGURE},
+  {"figurearea",		EDIF_TOK_FIGUREAREA},
+  {"figuregroup",		EDIF_TOK_FIGUREGROUP},
+  {"figuregroupobject",		EDIF_TOK_FIGUREGROUPOBJECT},
+  {"figuregroupoverride",	EDIF_TOK_FIGUREGROUPOVERRIDE},
+  {"figuregroupref",		EDIF_TOK_FIGUREGROUPREF},
+  {"figureperimeter",		EDIF_TOK_FIGUREPERIMETER},
+  {"figurewidth",		EDIF_TOK_FIGUREWIDTH},
+  {"fillpattern",		EDIF_TOK_FILLPATTERN},
+  {"follow",			EDIF_TOK_FOLLOW},
+  {"forbiddenevent",		EDIF_TOK_FORBIDDENEVENT},
+  {"globalportref",		EDIF_TOK_GLOBALPORTREF},
+  {"greaterthan",		EDIF_TOK_GREATERTHAN},
+  {"gridmap",			EDIF_TOK_GRIDMAP},
+  {"ignore",			EDIF_TOK_IGNORE},
+  {"includefiguregroup",	EDIF_TOK_INCLUDEFIGUREGROUP},
+  {"initial",			EDIF_TOK_INITIAL},
+  {"instance",			EDIF_TOK_INSTANCE},
+  {"instancebackannotate",	EDIF_TOK_INSTANCEBACKANNOTATE},
+  {"instancegroup",		EDIF_TOK_INSTANCEGROUP},
+  {"instancemap",		EDIF_TOK_INSTANCEMAP},
+  {"instanceref",		EDIF_TOK_INSTANCEREF},
+  {"integer",			EDIF_TOK_INTEGER},
+  {"integerdisplay",		EDIF_TOK_INTEGERDISPLAY},
+  {"interface",			EDIF_TOK_INTERFACE},
+  {"interfiguregroupspacing",	EDIF_TOK_INTERFIGUREGROUPSPACING},
+  {"intersection",		EDIF_TOK_INTERSECTION},
+  {"intrafiguregroupspacing",	EDIF_TOK_INTRAFIGUREGROUPSPACING},
+  {"inverse",			EDIF_TOK_INVERSE},
+  {"isolated",			EDIF_TOK_ISOLATED},
+  {"joined",			EDIF_TOK_JOINED},
+  {"justify",			EDIF_TOK_JUSTIFY},
+  {"keyworddisplay",		EDIF_TOK_KEYWORDDISPLAY},
+  {"keywordlevel",		EDIF_TOK_KEYWORDLEVEL},
+  {"keywordmap",		EDIF_TOK_KEYWORDMAP},
+  {"lessthan",			EDIF_TOK_LESSTHAN},
+  {"library",			EDIF_TOK_LIBRARY},
+  {"libraryref",		EDIF_TOK_LIBRARYREF},
+  {"listofnets",		EDIF_TOK_LISTOFNETS},
+  {"listofports",		EDIF_TOK_LISTOFPORTS},
+  {"loaddelay",			EDIF_TOK_LOADDELAY},
+  {"logicassign",		EDIF_TOK_LOGICASSIGN},
+  {"logicinput",		EDIF_TOK_LOGICINPUT},
+  {"logiclist",			EDIF_TOK_LOGICLIST},
+  {"logicmapinput",		EDIF_TOK_LOGICMAPINPUT},
+  {"logicmapoutput",		EDIF_TOK_LOGICMAPOUTPUT},
+  {"logiconeof",		EDIF_TOK_LOGICONEOF},
+  {"logicoutput",		EDIF_TOK_LOGICOUTPUT},
+  {"logicport",			EDIF_TOK_LOGICPORT},
+  {"logicref",			EDIF_TOK_LOGICREF},
+  {"logicvalue",		EDIF_TOK_LOGICVALUE},
+  {"logicwaveform",		EDIF_TOK_LOGICWAVEFORM},
+  {"maintain",			EDIF_TOK_MAINTAIN},
+  {"match",			EDIF_TOK_MATCH},
+  {"member",			EDIF_TOK_MEMBER},
+  {"minomax",			EDIF_TOK_MINOMAX},
+  {"minomaxdisplay",		EDIF_TOK_MINOMAXDISPLAY},
+  {"mnm",			EDIF_TOK_MNM},
+  {"multiplevalueset",		EDIF_TOK_MULTIPLEVALUESET},
+  {"mustjoin",			EDIF_TOK_MUSTJOIN},
+  {"name",			EDIF_TOK_NAME},
+  {"net",			EDIF_TOK_NET},
+  {"netbackannotate",		EDIF_TOK_NETBACKANNOTATE},
+  {"netbundle",			EDIF_TOK_NETBUNDLE},
+  {"netdelay",			EDIF_TOK_NETDELAY},
+  {"netgroup",			EDIF_TOK_NETGROUP},
+  {"netmap",			EDIF_TOK_NETMAP},
+  {"netref",			EDIF_TOK_NETREF},
+  {"nochange",			EDIF_TOK_NOCHANGE},
+  {"nonpermutable",		EDIF_TOK_NONPERMUTABLE},
+  {"notallowed",		EDIF_TOK_NOTALLOWED},
+  {"notchspacing",		EDIF_TOK_NOTCHSPACING},
+  {"number",			EDIF_TOK_NUMBER},
+  {"numberdefinition",		EDIF_TOK_NUMBERDEFINITION},
+  {"numberdisplay",		EDIF_TOK_NUMBERDISPLAY},
+  {"offpageconnector",		EDIF_TOK_OFFPAGECONNECTOR},
+  {"offsetevent",		EDIF_TOK_OFFSETEVENT},
+  {"openshape",			EDIF_TOK_OPENSHAPE},
+  {"orientation",		EDIF_TOK_ORIENTATION},
+  {"origin",			EDIF_TOK_ORIGIN},
+  {"overhangdistance",		EDIF_TOK_OVERHANGDISTANCE},
+  {"overlapdistance",		EDIF_TOK_OVERLAPDISTANCE},
+  {"oversize",			EDIF_TOK_OVERSIZE},
+  {"owner",			EDIF_TOK_OWNER},
+  {"page",			EDIF_TOK_PAGE},
+  {"pagesize",			EDIF_TOK_PAGESIZE},
+  {"parameter",			EDIF_TOK_PARAMETER},
+  {"parameterassign",		EDIF_TOK_PARAMETERASSIGN},
+  {"parameterdisplay",		EDIF_TOK_PARAMETERDISPLAY},
+  {"path",			EDIF_TOK_PATH},
+  {"pathdelay",			EDIF_TOK_PATHDELAY},
+  {"pathwidth",			EDIF_TOK_PATHWIDTH},
+  {"permutable",		EDIF_TOK_PERMUTABLE},
+  {"physicaldesignrule",	EDIF_TOK_PHYSICALDESIGNRULE},
+  {"plug",			EDIF_TOK_PLUG},
+  {"point",			EDIF_TOK_POINT},
+  {"pointdisplay",		EDIF_TOK_POINTDISPLAY},
+  {"pointlist",			EDIF_TOK_POINTLIST},
+  {"polygon",			EDIF_TOK_POLYGON},
+  {"port",			EDIF_TOK_PORT},
+  {"portbackannotate",		EDIF_TOK_PORTBACKANNOTATE},
+  {"portbundle",		EDIF_TOK_PORTBUNDLE},
+  {"portdelay",			EDIF_TOK_PORTDELAY},
+  {"portgroup",			EDIF_TOK_PORTGROUP},
+  {"portimplementation",	EDIF_TOK_PORTIMPLEMENTATION},
+  {"portinstance",		EDIF_TOK_PORTINSTANCE},
+  {"portlist",			EDIF_TOK_PORTLIST},
+  {"portlistalias",		EDIF_TOK_PORTLISTALIAS},
+  {"portmap",			EDIF_TOK_PORTMAP},
+  {"portref",			EDIF_TOK_PORTREF},
+  {"program",			EDIF_TOK_PROGRAM},
+  {"property",			EDIF_TOK_PROPERTY},
+  {"propertydisplay",		EDIF_TOK_PROPERTYDISPLAY},
+  {"protectionframe",		EDIF_TOK_PROTECTIONFRAME},
+  {"pt",			EDIF_TOK_PT},
+  {"rangevector",		EDIF_TOK_RANGEVECTOR},
+  {"rectangle",			EDIF_TOK_RECTANGLE},
+  {"rectanglesize",		EDIF_TOK_RECTANGLESIZE},
+  {"rename",			EDIF_TOK_RENAME},
+  {"resolves",			EDIF_TOK_RESOLVES},
+  {"scale",			EDIF_TOK_SCALE},
+  {"scalex",			EDIF_TOK_SCALEX},
+  {"scaley",			EDIF_TOK_SCALEY},
+  {"section",			EDIF_TOK_SECTION},
+  {"shape",			EDIF_TOK_SHAPE},
+  {"simulate",			EDIF_TOK_SIMULATE},
+  {"simulationinfo",		EDIF_TOK_SIMULATIONINFO},
+  {"singlevalueset",		EDIF_TOK_SINGLEVALUESET},
+  {"site",			EDIF_TOK_SITE},
+  {"socket",			EDIF_TOK_SOCKET},
+  {"socketset",			EDIF_TOK_SOCKETSET},
+  {"status",			EDIF_TOK_STATUS},
+  {"steady",			EDIF_TOK_STEADY},
+  {"string",			EDIF_TOK_STRING},
+  {"stringdisplay",		EDIF_TOK_STRINGDISPLAY},
+  {"strong",			EDIF_TOK_STRONG},
+  {"symbol",			EDIF_TOK_SYMBOL},
+  {"symmetry",			EDIF_TOK_SYMMETRY},
+  {"table",			EDIF_TOK_TABLE},
+  {"tabledefault",		EDIF_TOK_TABLEDEFAULT},
+  {"technology",		EDIF_TOK_TECHNOLOGY},
+  {"textheight",		EDIF_TOK_TEXTHEIGHT},
+  {"timeinterval",		EDIF_TOK_TIMEINTERVAL},
+  {"timestamp",			EDIF_TOK_TIMESTAMP},
+  {"timing",			EDIF_TOK_TIMING},
+  {"transform",			EDIF_TOK_TRANSFORM},
+  {"transition",		EDIF_TOK_TRANSITION},
+  {"trigger",			EDIF_TOK_TRIGGER},
+  {"true",			EDIF_TOK_TRUE},
+  {"unconstrained",		EDIF_TOK_UNCONSTRAINED},
+  {"undefined",			EDIF_TOK_UNDEFINED},
+  {"union",			EDIF_TOK_UNION},
+  {"unit",			EDIF_TOK_UNIT},
+  {"unused",			EDIF_TOK_UNUSED},
+  {"userdata",			EDIF_TOK_USERDATA},
+  {"version",			EDIF_TOK_VERSION},
+  {"view",			EDIF_TOK_VIEW},
+  {"viewlist",			EDIF_TOK_VIEWLIST},
+  {"viewmap",			EDIF_TOK_VIEWMAP},
+  {"viewref",			EDIF_TOK_VIEWREF},
+  {"viewtype",			EDIF_TOK_VIEWTYPE},
+  {"visible",			EDIF_TOK_VISIBLE},
+  {"voltagemap",		EDIF_TOK_VOLTAGEMAP},
+  {"wavevalue",			EDIF_TOK_WAVEVALUE},
+  {"weak",			EDIF_TOK_WEAK},
+  {"weakjoined",		EDIF_TOK_WEAKJOINED},
+  {"when",			EDIF_TOK_WHEN},
+  {"written",			EDIF_TOK_WRITTEN}
+};
+static int ContextDefSize = sizeof(ContextDef) / sizeof(Context);
+/*
+ *	Context follower tables:
+ *
+ *	  This is pretty ugly, an array is defined for each context
+ *	which has following context levels. Yet another table is used
+ *	to bind these arrays to the originating contexts.
+ *	  Arrays are declared as:
+ *
+ *		static short f_<Context name>[] = { ... };
+ *
+ *	The array entries are the '%token' values for all keywords which
+ *	can be reached from the <Context name> context. Like I said, ugly,
+ *	but it works.
+ *	  A negative entry means that the follow can only occur once within
+ *	the specified context.
+ */
+static short f_NULL[] = {EDIF_TOK_EDIF};
+static short f_Edif[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_EDIFVERSION,
+			 EDIF_TOK_EDIFLEVEL, EDIF_TOK_KEYWORDMAP,
+			 -EDIF_TOK_STATUS, EDIF_TOK_EXTERNAL,
+			 EDIF_TOK_LIBRARY, EDIF_TOK_DESIGN, EDIF_TOK_COMMENT,
+			 EDIF_TOK_USERDATA};
+static short f_AcLoad[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY};
+static short f_After[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_FOLLOW,
+			  EDIF_TOK_MAINTAIN, EDIF_TOK_LOGICASSIGN,
+			  EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Annotate[] = {EDIF_TOK_STRINGDISPLAY};
+static short f_Apply[] = {EDIF_TOK_CYCLE, EDIF_TOK_LOGICINPUT,
+			  EDIF_TOK_LOGICOUTPUT, EDIF_TOK_COMMENT,
+			  EDIF_TOK_USERDATA};
+static short f_Arc[] = {EDIF_TOK_PT};
+static short f_Array[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME};
+static short f_ArrayMacro[] = {EDIF_TOK_PLUG};
+static short f_ArrayRelatedInfo[] = {EDIF_TOK_BASEARRAY, EDIF_TOK_ARRAYSITE,
+				     EDIF_TOK_ARRAYMACRO, EDIF_TOK_COMMENT,
+				     EDIF_TOK_USERDATA};
+static short f_ArraySite[] = {EDIF_TOK_SOCKET};
+static short f_AtLeast[] = {EDIF_TOK_E};
+static short f_AtMost[] = {EDIF_TOK_E};
+static short f_Becomes[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+			    EDIF_TOK_LOGICONEOF};
+/*
+static short f_Between[] = {EDIF_TOK_ATLEAST, EDIF_TOK_GREATERTHAN,
+			    EDIF_TOK_ATMOST, EDIF_TOK_LESSTHAN};
+*/
+static short f_Boolean[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE,
+			    EDIF_TOK_BOOLEANDISPLAY, EDIF_TOK_BOOLEAN};
+static short f_BooleanDisplay[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE,
+				   EDIF_TOK_DISPLAY};
+static short f_BooleanMap[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE};
+static short f_BorderPattern[] = {EDIF_TOK_BOOLEAN};
+static short f_BoundingBox[] = {EDIF_TOK_RECTANGLE};
+static short f_Cell[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_CELLTYPE,
+			 -EDIF_TOK_STATUS, -EDIF_TOK_VIEWMAP, EDIF_TOK_VIEW,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA,
+			 EDIF_TOK_PROPERTY};
+static short f_CellRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_Change[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			   EDIF_TOK_BECOMES, EDIF_TOK_TRANSITION};
+static short f_Circle[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_Color[] = {EDIF_TOK_E};
+static short f_CommentGraphics[] = {EDIF_TOK_ANNOTATE, EDIF_TOK_FIGURE,
+				    EDIF_TOK_INSTANCE, -EDIF_TOK_BOUNDINGBOX,
+				    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_Compound[] = {EDIF_TOK_NAME};
+static short f_ConnectLocation[] = {EDIF_TOK_FIGURE};
+static short f_Contents[] = {EDIF_TOK_INSTANCE, EDIF_TOK_OFFPAGECONNECTOR,
+			     EDIF_TOK_FIGURE, EDIF_TOK_SECTION, EDIF_TOK_NET,
+			     EDIF_TOK_NETBUNDLE, EDIF_TOK_PAGE,
+			     EDIF_TOK_COMMENTGRAPHICS,
+			     EDIF_TOK_PORTIMPLEMENTATION,
+			     EDIF_TOK_TIMING, EDIF_TOK_SIMULATE,
+			     EDIF_TOK_WHEN, EDIF_TOK_FOLLOW,
+			     EDIF_TOK_LOGICPORT, -EDIF_TOK_BOUNDINGBOX,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Criticality[] = {EDIF_TOK_INTEGERDISPLAY};
+static short f_CurrentMap[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_Curve[] = {EDIF_TOK_ARC, EDIF_TOK_PT};
+static short f_Cycle[] = {EDIF_TOK_DURATION};
+static short f_DataOrigin[] = {EDIF_TOK_VERSION};
+static short f_DcFanInLoad[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcFanOutLoad[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcMaxFanIn[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcMaxFanOut[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_Delay[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_Delta[] = {EDIF_TOK_PT};
+static short f_Design[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_CELLREF,
+			   EDIF_TOK_STATUS, EDIF_TOK_COMMENT,
+			   EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_Designator[] = {EDIF_TOK_STRINGDISPLAY};
+static short f_Difference[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			       EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			       EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_Display[] = {EDIF_TOK_NAME, EDIF_TOK_FIGUREGROUPOVERRIDE,
+			    EDIF_TOK_JUSTIFY, EDIF_TOK_ORIENTATION,
+			    EDIF_TOK_ORIGIN};
+static short f_Dominates[] = {EDIF_TOK_NAME};
+static short f_Dot[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_Duration[] = {EDIF_TOK_E};
+static short f_EnclosureDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				      EDIF_TOK_FIGUREGROUPOBJECT,
+				      EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				      EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				      EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				      EDIF_TOK_SINGLEVALUESET,
+				      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Entry[] = {EDIF_TOK_MATCH, EDIF_TOK_CHANGE, EDIF_TOK_STEADY,
+			  EDIF_TOK_LOGICREF, EDIF_TOK_PORTREF,
+			  EDIF_TOK_NOCHANGE, EDIF_TOK_TABLE,
+			  EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_Exactly[] = {EDIF_TOK_E};
+static short f_External[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			     EDIF_TOK_EDIFLEVEL, EDIF_TOK_TECHNOLOGY,
+			     -EDIF_TOK_STATUS, EDIF_TOK_CELL, EDIF_TOK_COMMENT,
+			     EDIF_TOK_USERDATA};
+static short f_Fabricate[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME};
+static short f_Figure[] = {EDIF_TOK_NAME, EDIF_TOK_FIGUREGROUPOVERRIDE,
+			   EDIF_TOK_CIRCLE, EDIF_TOK_DOT, EDIF_TOK_OPENSHAPE,
+			   EDIF_TOK_PATH, EDIF_TOK_POLYGON,
+			   EDIF_TOK_RECTANGLE, EDIF_TOK_SHAPE,
+			   EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FigureArea[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+			       EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+			       EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+			       EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FigureGroup[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				-EDIF_TOK_CORNERTYPE, -EDIF_TOK_ENDTYPE,
+				-EDIF_TOK_PATHWIDTH, -EDIF_TOK_BORDERWIDTH,
+				-EDIF_TOK_COLOR, -EDIF_TOK_FILLPATTERN,
+				-EDIF_TOK_BORDERPATTERN, -EDIF_TOK_TEXTHEIGHT,
+				-EDIF_TOK_VISIBLE, EDIF_TOK_INCLUDEFIGUREGROUP,
+				EDIF_TOK_COMMENT, EDIF_TOK_PROPERTY,
+				EDIF_TOK_USERDATA};
+static short f_FigureGroupObject[] = {EDIF_TOK_NAME,
+				      EDIF_TOK_FIGUREGROUPOBJECT,
+				      EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				      EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				      EDIF_TOK_OVERSIZE};
+static short f_FigureGroupOverride[] = {EDIF_TOK_NAME, -EDIF_TOK_CORNERTYPE,
+					-EDIF_TOK_ENDTYPE, -EDIF_TOK_PATHWIDTH,
+					-EDIF_TOK_BORDERWIDTH, -EDIF_TOK_COLOR,
+					-EDIF_TOK_FILLPATTERN,
+					-EDIF_TOK_TEXTHEIGHT,
+					-EDIF_TOK_BORDERPATTERN,
+					EDIF_TOK_VISIBLE, EDIF_TOK_COMMENT,
+					EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_FigureGroupRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_FigurePerimeter[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				    EDIF_TOK_FIGUREGROUPOBJECT,
+				    EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				    EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				    EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				    EDIF_TOK_SINGLEVALUESET, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_FigureWidth[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FillPattern[] = {EDIF_TOK_BOOLEAN};
+static short f_Follow[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_TABLE,
+			   EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_ForbiddenEvent[] = {EDIF_TOK_TIMEINTERVAL, EDIF_TOK_EVENT};
+static short f_GlobalPortRef[] = {EDIF_TOK_NAME};
+static short f_GreaterThan[] = {EDIF_TOK_E};
+static short f_GridMap[] = {EDIF_TOK_E};
+static short f_IncludeFigureGroup[] = {EDIF_TOK_FIGUREGROUPREF,
+				       EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				       EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				       EDIF_TOK_OVERSIZE};
+static short f_Instance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			     EDIF_TOK_VIEWREF, EDIF_TOK_VIEWLIST,
+			     -EDIF_TOK_TRANSFORM, EDIF_TOK_PARAMETERASSIGN,
+			     EDIF_TOK_PORTINSTANCE, EDIF_TOK_TIMING,
+			     -EDIF_TOK_DESIGNATOR, EDIF_TOK_PROPERTY,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InstanceBackAnnotate[] = {EDIF_TOK_INSTANCEREF,
+					 -EDIF_TOK_DESIGNATOR, EDIF_TOK_TIMING,
+					 EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_InstanceGroup[] = {EDIF_TOK_INSTANCEREF};
+static short f_InstanceMap[] = {EDIF_TOK_INSTANCEREF, EDIF_TOK_INSTANCEGROUP,
+				EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InstanceRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				EDIF_TOK_INSTANCEREF, EDIF_TOK_VIEWREF};
+static short f_Integer[] = {EDIF_TOK_INTEGERDISPLAY, EDIF_TOK_INTEGER};
+static short f_IntegerDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_Interface[] = {EDIF_TOK_PORT, EDIF_TOK_PORTBUNDLE,
+			      -EDIF_TOK_SYMBOL, -EDIF_TOK_PROTECTIONFRAME,
+			      -EDIF_TOK_ARRAYRELATEDINFO, EDIF_TOK_PARAMETER,
+			      EDIF_TOK_JOINED, EDIF_TOK_MUSTJOIN,
+			      EDIF_TOK_WEAKJOINED, EDIF_TOK_PERMUTABLE,
+			      EDIF_TOK_TIMING, EDIF_TOK_SIMULATE,
+			      -EDIF_TOK_DESIGNATOR, EDIF_TOK_PROPERTY,
+			      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InterFigureGroupSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+					    EDIF_TOK_FIGUREGROUPOBJECT,
+					    EDIF_TOK_LESSTHAN,
+					    EDIF_TOK_GREATERTHAN,
+					    EDIF_TOK_ATMOST,
+					    EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+					    EDIF_TOK_BETWEEN,
+					    EDIF_TOK_SINGLEVALUESET,
+					    EDIF_TOK_COMMENT,
+					    EDIF_TOK_USERDATA};
+static short f_Intersection[] = {EDIF_TOK_FIGUREGROUPREF,
+				 EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				 EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				 EDIF_TOK_OVERSIZE};
+static short f_IntraFigureGroupSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+					    EDIF_TOK_FIGUREGROUPOBJECT,
+					    EDIF_TOK_LESSTHAN,
+					    EDIF_TOK_GREATERTHAN,
+					    EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+					    EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+					    EDIF_TOK_SINGLEVALUESET,
+					    EDIF_TOK_COMMENT,
+					    EDIF_TOK_USERDATA};
+static short f_Inverse[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			    EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			    EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_Joined[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			   EDIF_TOK_GLOBALPORTREF};
+static short f_KeywordDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_KeywordMap[] = {EDIF_TOK_KEYWORDLEVEL, EDIF_TOK_COMMENT};
+static short f_LessThan[] = {EDIF_TOK_E};
+static short f_Library[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_EDIFLEVEL,
+			    EDIF_TOK_TECHNOLOGY, -EDIF_TOK_STATUS,
+			    EDIF_TOK_CELL, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+static short f_LibraryRef[] = {EDIF_TOK_NAME};
+static short f_ListOfNets[] = {EDIF_TOK_NET};
+static short f_ListOfPorts[] = {EDIF_TOK_PORT, EDIF_TOK_PORTBUNDLE};
+static short f_LoadDelay[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY};
+static short f_LogicAssign[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF,
+				EDIF_TOK_LOGICREF, EDIF_TOK_TABLE,
+				EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_LogicInput[] = {EDIF_TOK_PORTLIST, EDIF_TOK_PORTREF,
+			       EDIF_TOK_NAME, EDIF_TOK_LOGICWAVEFORM};
+static short f_LogicList[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICONEOF,
+			      EDIF_TOK_IGNORE};
+static short f_LogicMapInput[] = {EDIF_TOK_LOGICREF};
+static short f_LogicMapOutput[] = {EDIF_TOK_LOGICREF};
+static short f_LogicOneOf[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST};
+static short f_LogicOutput[] = {EDIF_TOK_PORTLIST, EDIF_TOK_PORTREF,
+				EDIF_TOK_NAME, EDIF_TOK_LOGICWAVEFORM};
+static short f_LogicPort[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			      EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			      EDIF_TOK_USERDATA};
+static short f_LogicRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_LogicValue[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       -EDIF_TOK_VOLTAGEMAP, -EDIF_TOK_CURRENTMAP,
+			       -EDIF_TOK_BOOLEANMAP, -EDIF_TOK_COMPOUND,
+			       -EDIF_TOK_WEAK ,-EDIF_TOK_STRONG,
+			       -EDIF_TOK_DOMINATES, -EDIF_TOK_LOGICMAPOUTPUT,
+			       -EDIF_TOK_LOGICMAPINPUT,
+			       -EDIF_TOK_ISOLATED, EDIF_TOK_RESOLVES,
+			       EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			       EDIF_TOK_USERDATA};
+static short f_LogicWaveform[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+				  EDIF_TOK_LOGICONEOF, EDIF_TOK_IGNORE};
+static short f_Maintain[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_DELAY,
+			     EDIF_TOK_LOADDELAY};
+static short f_Match[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			  EDIF_TOK_LOGICLIST, EDIF_TOK_LOGICONEOF};
+static short f_Member[] = {EDIF_TOK_NAME};
+static short f_MiNoMax[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY,
+			    EDIF_TOK_MINOMAX};
+static short f_MiNoMaxDisplay[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_DISPLAY};
+static short f_Mnm[] = {EDIF_TOK_E, EDIF_TOK_UNDEFINED,
+			EDIF_TOK_UNCONSTRAINED};
+static short f_MultipleValueSet[] = {EDIF_TOK_RANGEVECTOR};
+static short f_MustJoin[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			     EDIF_TOK_WEAKJOINED, EDIF_TOK_JOINED};
+static short f_Name[] = {EDIF_TOK_DISPLAY};
+static short f_Net[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, -EDIF_TOK_CRITICALITY,
+			EDIF_TOK_NETDELAY, EDIF_TOK_FIGURE, EDIF_TOK_NET,
+			EDIF_TOK_INSTANCE, EDIF_TOK_COMMENTGRAPHICS,
+			EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			EDIF_TOK_USERDATA, EDIF_TOK_JOINED, EDIF_TOK_ARRAY};
+static short f_NetBackAnnotate[] = {EDIF_TOK_NETREF, EDIF_TOK_NETDELAY,
+				    -EDIF_TOK_CRITICALITY, EDIF_TOK_PROPERTY,
+				    EDIF_TOK_COMMENT};
+static short f_NetBundle[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			      EDIF_TOK_LISTOFNETS, EDIF_TOK_FIGURE,
+			      EDIF_TOK_COMMENTGRAPHICS, EDIF_TOK_PROPERTY,
+			      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_NetDelay[] = {EDIF_TOK_DERIVATION, EDIF_TOK_DELAY,
+			     EDIF_TOK_TRANSITION, EDIF_TOK_BECOMES};
+static short f_NetGroup[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_NETREF};
+static short f_NetMap[] = {EDIF_TOK_NETREF, EDIF_TOK_NETGROUP,
+			   EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_NetRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_NETREF,
+			   EDIF_TOK_INSTANCEREF, EDIF_TOK_VIEWREF};
+static short f_NonPermutable[] = {EDIF_TOK_PORTREF, EDIF_TOK_PERMUTABLE};
+static short f_NotAllowed[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_COMMENT,
+			       EDIF_TOK_USERDATA};
+static short f_NotchSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				 EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				 EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				 EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				 EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Number[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY, EDIF_TOK_NUMBER};
+static short f_NumberDefinition[] = {EDIF_TOK_SCALE, -EDIF_TOK_GRIDMAP,
+				     EDIF_TOK_COMMENT};
+static short f_NumberDisplay[] = {EDIF_TOK_E, EDIF_TOK_DISPLAY};
+static short f_OffPageConnector[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				     -EDIF_TOK_UNUSED, EDIF_TOK_PROPERTY,
+				     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_OffsetEvent[] = {EDIF_TOK_EVENT, EDIF_TOK_E};
+static short f_OpenShape[] = {EDIF_TOK_CURVE, EDIF_TOK_PROPERTY};
+static short f_Origin[] = {EDIF_TOK_PT};
+static short f_OverhangDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				     EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				     EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				     EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				     EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_OverlapDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				    EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				    EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				    EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				    EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				    EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Oversize[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			     EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			     EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE,
+			     EDIF_TOK_CORNERTYPE};
+static short f_Page[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			 EDIF_TOK_INSTANCE, EDIF_TOK_NET, EDIF_TOK_NETBUNDLE,
+			 EDIF_TOK_COMMENTGRAPHICS, EDIF_TOK_PORTIMPLEMENTATION,
+			 -EDIF_TOK_PAGESIZE, -EDIF_TOK_BOUNDINGBOX,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PageSize[] = {EDIF_TOK_RECTANGLE};
+static short f_Parameter[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			      EDIF_TOK_BOOLEAN, EDIF_TOK_INTEGER,
+			      EDIF_TOK_MINOMAX, EDIF_TOK_NUMBER,
+			      EDIF_TOK_POINT, EDIF_TOK_STRING};
+static short f_ParameterAssign[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				    EDIF_TOK_BOOLEAN, EDIF_TOK_INTEGER,
+				    EDIF_TOK_MINOMAX, EDIF_TOK_NUMBER, EDIF_TOK_POINT,
+				    EDIF_TOK_STRING};
+static short f_ParameterDisplay[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				     EDIF_TOK_DISPLAY};
+static short f_Path[] = {EDIF_TOK_POINTLIST, EDIF_TOK_PROPERTY};
+static short f_PathDelay[] = {EDIF_TOK_DELAY, EDIF_TOK_EVENT};
+static short f_Permutable[] = {EDIF_TOK_PORTREF, EDIF_TOK_PERMUTABLE,
+			       EDIF_TOK_NONPERMUTABLE};
+static short f_PhysicalDesignRule[] = {EDIF_TOK_FIGUREWIDTH,
+				       EDIF_TOK_FIGUREAREA,
+				       EDIF_TOK_RECTANGLESIZE,
+				       EDIF_TOK_FIGUREPERIMETER,
+				       EDIF_TOK_OVERLAPDISTANCE,
+				       EDIF_TOK_OVERHANGDISTANCE,
+				       EDIF_TOK_ENCLOSUREDISTANCE,
+				       EDIF_TOK_INTERFIGUREGROUPSPACING,
+				       EDIF_TOK_NOTCHSPACING,
+				       EDIF_TOK_INTRAFIGUREGROUPSPACING,
+				       EDIF_TOK_NOTALLOWED,
+				       EDIF_TOK_FIGUREGROUP, EDIF_TOK_COMMENT,
+				       EDIF_TOK_USERDATA};
+static short f_Plug[] = {EDIF_TOK_SOCKETSET};
+static short f_Point[] = {EDIF_TOK_PT, EDIF_TOK_POINTDISPLAY,
+			  EDIF_TOK_POINT};
+static short f_PointDisplay[] = {EDIF_TOK_PT, EDIF_TOK_DISPLAY};
+static short f_PointList[] = {EDIF_TOK_PT};
+static short f_Polygon[] = {EDIF_TOK_POINTLIST, EDIF_TOK_PROPERTY};
+static short f_Port[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			 -EDIF_TOK_DIRECTION, -EDIF_TOK_UNUSED,
+			 EDIF_TOK_PORTDELAY, -EDIF_TOK_DESIGNATOR,
+			 -EDIF_TOK_DCFANINLOAD, -EDIF_TOK_DCFANOUTLOAD,
+			 -EDIF_TOK_DCMAXFANIN, -EDIF_TOK_DCMAXFANOUT,
+			 -EDIF_TOK_ACLOAD, EDIF_TOK_PROPERTY,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortBackAnnotate[] = {EDIF_TOK_PORTREF, -EDIF_TOK_DESIGNATOR,
+				     EDIF_TOK_PORTDELAY, -EDIF_TOK_DCFANINLOAD,
+				     -EDIF_TOK_DCFANOUTLOAD,
+				     -EDIF_TOK_DCMAXFANIN,
+				     -EDIF_TOK_DCMAXFANOUT, -EDIF_TOK_ACLOAD,
+				     EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_PortBundle[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			       EDIF_TOK_LISTOFPORTS, EDIF_TOK_PROPERTY,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortDelay[] = {EDIF_TOK_DERIVATION, EDIF_TOK_DELAY,
+			      EDIF_TOK_LOADDELAY, EDIF_TOK_TRANSITION,
+			      EDIF_TOK_BECOMES};
+static short f_PortGroup[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+			      EDIF_TOK_PORTREF};
+static short f_PortImplementation[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				       -EDIF_TOK_CONNECTLOCATION,
+				       EDIF_TOK_FIGURE, EDIF_TOK_INSTANCE,
+				       EDIF_TOK_COMMENTGRAPHICS,
+				       EDIF_TOK_PROPERTYDISPLAY,
+				       EDIF_TOK_KEYWORDDISPLAY,
+				       EDIF_TOK_PROPERTY,
+				       EDIF_TOK_USERDATA, EDIF_TOK_COMMENT};
+static short f_PortInstance[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME,
+				 EDIF_TOK_MEMBER, -EDIF_TOK_UNUSED,
+				 EDIF_TOK_PORTDELAY, -EDIF_TOK_DESIGNATOR,
+				 -EDIF_TOK_DCFANINLOAD,
+				 -EDIF_TOK_DCFANOUTLOAD, -EDIF_TOK_DCMAXFANIN,
+				 -EDIF_TOK_DCMAXFANOUT, -EDIF_TOK_ACLOAD,
+				 EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				 EDIF_TOK_USERDATA};
+static short f_PortList[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME,
+			     EDIF_TOK_MEMBER};
+static short f_PortListAlias[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				  EDIF_TOK_ARRAY, EDIF_TOK_PORTLIST};
+static short f_PortMap[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTGROUP,
+			    EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+			    EDIF_TOK_PORTREF, EDIF_TOK_INSTANCEREF,
+			    EDIF_TOK_VIEWREF};
+static short f_Program[] = {EDIF_TOK_VERSION};
+static short f_Property[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_BOOLEAN,
+			     EDIF_TOK_INTEGER, EDIF_TOK_MINOMAX,
+			     EDIF_TOK_NUMBER, EDIF_TOK_POINT, EDIF_TOK_STRING,
+			     -EDIF_TOK_OWNER, -EDIF_TOK_UNIT,
+			     EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_PropertyDisplay[] = {EDIF_TOK_NAME, EDIF_TOK_DISPLAY};
+static short f_ProtectionFrame[] = {EDIF_TOK_PORTIMPLEMENTATION,
+				    EDIF_TOK_FIGURE, EDIF_TOK_INSTANCE,
+				    EDIF_TOK_COMMENTGRAPHICS,
+				    -EDIF_TOK_BOUNDINGBOX,
+				    EDIF_TOK_PROPERTYDISPLAY,
+				    EDIF_TOK_KEYWORDDISPLAY,
+				    EDIF_TOK_PARAMETERDISPLAY,
+				    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_RangeVector[] = {EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				EDIF_TOK_SINGLEVALUESET};
+static short f_Rectangle[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_RectangleSize[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				  EDIF_TOK_FIGUREGROUPOBJECT,
+				  EDIF_TOK_RANGEVECTOR,
+				  EDIF_TOK_MULTIPLEVALUESET,EDIF_TOK_COMMENT,
+				  EDIF_TOK_USERDATA};
+static short f_Rename[] = {EDIF_TOK_NAME, EDIF_TOK_STRINGDISPLAY};
+static short f_Resolves[] = {EDIF_TOK_NAME};
+static short f_Scale[] = {EDIF_TOK_E, EDIF_TOK_UNIT};
+static short f_Section[] = {EDIF_TOK_SECTION, EDIF_TOK_INSTANCE};
+static short f_Shape[] = {EDIF_TOK_CURVE, EDIF_TOK_PROPERTY};
+static short f_Simulate[] = {EDIF_TOK_NAME, EDIF_TOK_PORTLISTALIAS,
+			     EDIF_TOK_WAVEVALUE, EDIF_TOK_APPLY,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_SimulationInfo[] = {EDIF_TOK_LOGICVALUE, EDIF_TOK_COMMENT,
+				   EDIF_TOK_USERDATA};
+static short f_SingleValueSet[] = {EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				   EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				   EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN};
+static short f_Site[] = {EDIF_TOK_VIEWREF, EDIF_TOK_TRANSFORM};
+static short f_Socket[] = {EDIF_TOK_SYMMETRY};
+static short f_SocketSet[] = {EDIF_TOK_SYMMETRY, EDIF_TOK_SITE};
+static short f_Status[] = {EDIF_TOK_WRITTEN, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Steady[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_PORTREF,
+			   EDIF_TOK_PORTLIST, EDIF_TOK_DURATION,
+			   EDIF_TOK_TRANSITION, EDIF_TOK_BECOMES};
+static short f_String[] = {EDIF_TOK_STRINGDISPLAY, EDIF_TOK_STRING};
+static short f_StringDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_Strong[] = {EDIF_TOK_NAME};
+static short f_Symbol[] = {EDIF_TOK_PORTIMPLEMENTATION, EDIF_TOK_FIGURE,
+			   EDIF_TOK_INSTANCE, EDIF_TOK_COMMENTGRAPHICS,
+			   EDIF_TOK_ANNOTATE, -EDIF_TOK_PAGESIZE,
+			   -EDIF_TOK_BOUNDINGBOX, EDIF_TOK_PROPERTYDISPLAY,
+			   EDIF_TOK_KEYWORDDISPLAY, EDIF_TOK_PARAMETERDISPLAY,
+			   EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Symmetry[] = {EDIF_TOK_TRANSFORM};
+static short f_Table[] = {EDIF_TOK_ENTRY, EDIF_TOK_TABLEDEFAULT};
+static short f_TableDefault[] = {EDIF_TOK_LOGICREF, EDIF_TOK_PORTREF,
+				 EDIF_TOK_NOCHANGE, EDIF_TOK_TABLE,
+				 EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_Technology[] = {EDIF_TOK_NUMBERDEFINITION, EDIF_TOK_FIGUREGROUP,
+			       EDIF_TOK_FABRICATE, -EDIF_TOK_SIMULATIONINFO,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA,
+			       -EDIF_TOK_PHYSICALDESIGNRULE};
+static short f_TimeInterval[] = {EDIF_TOK_EVENT, EDIF_TOK_OFFSETEVENT,
+				 EDIF_TOK_DURATION};
+static short f_Timing[] = {EDIF_TOK_DERIVATION, EDIF_TOK_PATHDELAY,
+			   EDIF_TOK_FORBIDDENEVENT, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Transform[] = {EDIF_TOK_SCALEX, EDIF_TOK_SCALEY, EDIF_TOK_DELTA,
+			      EDIF_TOK_ORIENTATION, EDIF_TOK_ORIGIN};
+static short f_Transition[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+			       EDIF_TOK_LOGICONEOF};
+static short f_Trigger[] = {EDIF_TOK_CHANGE, EDIF_TOK_STEADY,
+			    EDIF_TOK_INITIAL};
+static short f_Union[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			  EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			  EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_View[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_VIEWTYPE,
+			 EDIF_TOK_INTERFACE, -EDIF_TOK_STATUS,
+			 -EDIF_TOK_CONTENTS, EDIF_TOK_COMMENT,
+			 EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_ViewList[] = {EDIF_TOK_VIEWREF, EDIF_TOK_VIEWLIST};
+static short f_ViewMap[] = {EDIF_TOK_PORTMAP, EDIF_TOK_PORTBACKANNOTATE,
+			    EDIF_TOK_INSTANCEMAP,
+			    EDIF_TOK_INSTANCEBACKANNOTATE, EDIF_TOK_NETMAP,
+			    EDIF_TOK_NETBACKANNOTATE, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+static short f_ViewRef[] = {EDIF_TOK_NAME, EDIF_TOK_CELLREF};
+static short f_Visible[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE};
+static short f_VoltageMap[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_WaveValue[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_E,
+			      EDIF_TOK_LOGICWAVEFORM};
+static short f_Weak[] = {EDIF_TOK_NAME};
+static short f_WeakJoined[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			       EDIF_TOK_JOINED};
+static short f_When[] = {EDIF_TOK_TRIGGER, EDIF_TOK_AFTER,
+			 EDIF_TOK_FOLLOW, EDIF_TOK_MAINTAIN,
+			 EDIF_TOK_LOGICASSIGN, EDIF_TOK_COMMENT,
+			 EDIF_TOK_USERDATA};
+static short f_Written[] = {EDIF_TOK_TIMESTAMP, EDIF_TOK_AUTHOR,
+			    EDIF_TOK_PROGRAM, EDIF_TOK_DATAORIGIN,
+			    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+/*
+ *	Context binding table:
+ *
+ *	  This binds context follower arrays to their originating context.
+ */
+typedef struct Binder {
+  short *Follower;		/* pointer to follower array */
+  short Origin;			/* '%token' value of origin */
+  short FollowerSize;		/* size of follower array */
+} Binder;
+#define	BE(f,o)			{f,o,sizeof(f)/sizeof(short)}
+static Binder BinderDef[] = {
+  BE(f_NULL,			0),
+  BE(f_Edif,			EDIF_TOK_EDIF),
+  BE(f_AcLoad,			EDIF_TOK_ACLOAD),
+  BE(f_After,			EDIF_TOK_AFTER),
+  BE(f_Annotate,		EDIF_TOK_ANNOTATE),
+  BE(f_Apply,			EDIF_TOK_APPLY),
+  BE(f_Arc,			EDIF_TOK_ARC),
+  BE(f_Array,			EDIF_TOK_ARRAY),
+  BE(f_ArrayMacro,		EDIF_TOK_ARRAYMACRO),
+  BE(f_ArrayRelatedInfo,	EDIF_TOK_ARRAYRELATEDINFO),
+  BE(f_ArraySite,		EDIF_TOK_ARRAYSITE),
+  BE(f_AtLeast,			EDIF_TOK_ATLEAST),
+  BE(f_AtMost,			EDIF_TOK_ATMOST),
+  BE(f_Becomes,			EDIF_TOK_BECOMES),
+  BE(f_Boolean,			EDIF_TOK_BOOLEAN),
+  BE(f_BooleanDisplay,		EDIF_TOK_BOOLEANDISPLAY),
+  BE(f_BooleanMap,		EDIF_TOK_BOOLEANMAP),
+  BE(f_BorderPattern,		EDIF_TOK_BORDERPATTERN),
+  BE(f_BoundingBox,		EDIF_TOK_BOUNDINGBOX),
+  BE(f_Cell,			EDIF_TOK_CELL),
+  BE(f_CellRef,			EDIF_TOK_CELLREF),
+  BE(f_Change,			EDIF_TOK_CHANGE),
+  BE(f_Circle,			EDIF_TOK_CIRCLE),
+  BE(f_Color,			EDIF_TOK_COLOR),
+  BE(f_CommentGraphics,		EDIF_TOK_COMMENTGRAPHICS),
+  BE(f_Compound,		EDIF_TOK_COMPOUND),
+  BE(f_ConnectLocation,		EDIF_TOK_CONNECTLOCATION),
+  BE(f_Contents,		EDIF_TOK_CONTENTS),
+  BE(f_Criticality,		EDIF_TOK_CRITICALITY),
+  BE(f_CurrentMap,		EDIF_TOK_CURRENTMAP),
+  BE(f_Curve,			EDIF_TOK_CURVE),
+  BE(f_Cycle,			EDIF_TOK_CYCLE),
+  BE(f_DataOrigin,		EDIF_TOK_DATAORIGIN),
+  BE(f_DcFanInLoad,		EDIF_TOK_DCFANINLOAD),
+  BE(f_DcFanOutLoad,		EDIF_TOK_DCFANOUTLOAD),
+  BE(f_DcMaxFanIn,		EDIF_TOK_DCMAXFANIN),
+  BE(f_DcMaxFanOut,		EDIF_TOK_DCMAXFANOUT),
+  BE(f_Delay,			EDIF_TOK_DELAY),
+  BE(f_Delta,			EDIF_TOK_DELTA),
+  BE(f_Design,			EDIF_TOK_DESIGN),
+  BE(f_Designator,		EDIF_TOK_DESIGNATOR),
+  BE(f_Difference,		EDIF_TOK_DIFFERENCE),
+  BE(f_Display,			EDIF_TOK_DISPLAY),
+  BE(f_Dominates,		EDIF_TOK_DOMINATES),
+  BE(f_Dot,			EDIF_TOK_DOT),
+  BE(f_Duration,		EDIF_TOK_DURATION),
+  BE(f_EnclosureDistance,	EDIF_TOK_ENCLOSUREDISTANCE),
+  BE(f_Entry,			EDIF_TOK_ENTRY),
+  BE(f_Exactly,			EDIF_TOK_EXACTLY),
+  BE(f_External,		EDIF_TOK_EXTERNAL),
+  BE(f_Fabricate,		EDIF_TOK_FABRICATE),
+  BE(f_Figure,			EDIF_TOK_FIGURE),
+  BE(f_FigureArea,		EDIF_TOK_FIGUREAREA),
+  BE(f_FigureGroup,		EDIF_TOK_FIGUREGROUP),
+  BE(f_FigureGroupObject,	EDIF_TOK_FIGUREGROUPOBJECT),
+  BE(f_FigureGroupOverride,	EDIF_TOK_FIGUREGROUPOVERRIDE),
+  BE(f_FigureGroupRef,		EDIF_TOK_FIGUREGROUPREF),
+  BE(f_FigurePerimeter,		EDIF_TOK_FIGUREPERIMETER),
+  BE(f_FigureWidth,		EDIF_TOK_FIGUREWIDTH),
+  BE(f_FillPattern,		EDIF_TOK_FILLPATTERN),
+  BE(f_Follow,			EDIF_TOK_FOLLOW),
+  BE(f_ForbiddenEvent,		EDIF_TOK_FORBIDDENEVENT),
+  BE(f_GlobalPortRef,		EDIF_TOK_GLOBALPORTREF),
+  BE(f_GreaterThan,		EDIF_TOK_GREATERTHAN),
+  BE(f_GridMap,			EDIF_TOK_GRIDMAP),
+  BE(f_IncludeFigureGroup,	EDIF_TOK_INCLUDEFIGUREGROUP),
+  BE(f_Instance,		EDIF_TOK_INSTANCE),
+  BE(f_InstanceBackAnnotate,	EDIF_TOK_INSTANCEBACKANNOTATE),
+  BE(f_InstanceGroup,		EDIF_TOK_INSTANCEGROUP),
+  BE(f_InstanceMap,		EDIF_TOK_INSTANCEMAP),
+  BE(f_InstanceRef,		EDIF_TOK_INSTANCEREF),
+  BE(f_Integer,			EDIF_TOK_INTEGER),
+  BE(f_IntegerDisplay,		EDIF_TOK_INTEGERDISPLAY),
+  BE(f_InterFigureGroupSpacing,	EDIF_TOK_INTERFIGUREGROUPSPACING),
+  BE(f_Interface,		EDIF_TOK_INTERFACE),
+  BE(f_Intersection,		EDIF_TOK_INTERSECTION),
+  BE(f_IntraFigureGroupSpacing,	EDIF_TOK_INTRAFIGUREGROUPSPACING),
+  BE(f_Inverse,			EDIF_TOK_INVERSE),
+  BE(f_Joined,			EDIF_TOK_JOINED),
+  BE(f_KeywordDisplay,		EDIF_TOK_KEYWORDDISPLAY),
+  BE(f_KeywordMap,		EDIF_TOK_KEYWORDMAP),
+  BE(f_LessThan,		EDIF_TOK_LESSTHAN),
+  BE(f_Library,			EDIF_TOK_LIBRARY),
+  BE(f_LibraryRef,		EDIF_TOK_LIBRARYREF),
+  BE(f_ListOfNets,		EDIF_TOK_LISTOFNETS),
+  BE(f_ListOfPorts,		EDIF_TOK_LISTOFPORTS),
+  BE(f_LoadDelay,		EDIF_TOK_LOADDELAY),
+  BE(f_LogicAssign,		EDIF_TOK_LOGICASSIGN),
+  BE(f_LogicInput,		EDIF_TOK_LOGICINPUT),
+  BE(f_LogicList,		EDIF_TOK_LOGICLIST),
+  BE(f_LogicMapInput,		EDIF_TOK_LOGICMAPINPUT),
+  BE(f_LogicMapOutput,		EDIF_TOK_LOGICMAPOUTPUT),
+  BE(f_LogicOneOf,		EDIF_TOK_LOGICONEOF),
+  BE(f_LogicOutput,		EDIF_TOK_LOGICOUTPUT),
+  BE(f_LogicPort,		EDIF_TOK_LOGICPORT),
+  BE(f_LogicRef,		EDIF_TOK_LOGICREF),
+  BE(f_LogicValue,		EDIF_TOK_LOGICVALUE),
+  BE(f_LogicWaveform,		EDIF_TOK_LOGICWAVEFORM),
+  BE(f_Maintain,		EDIF_TOK_MAINTAIN),
+  BE(f_Match,			EDIF_TOK_MATCH),
+  BE(f_Member,			EDIF_TOK_MEMBER),
+  BE(f_MiNoMax,			EDIF_TOK_MINOMAX),
+  BE(f_MiNoMaxDisplay,		EDIF_TOK_MINOMAXDISPLAY),
+  BE(f_Mnm,			EDIF_TOK_MNM),
+  BE(f_MultipleValueSet,	EDIF_TOK_MULTIPLEVALUESET),
+  BE(f_MustJoin,		EDIF_TOK_MUSTJOIN),
+  BE(f_Name,			EDIF_TOK_NAME),
+  BE(f_Net,			EDIF_TOK_NET),
+  BE(f_NetBackAnnotate,		EDIF_TOK_NETBACKANNOTATE),
+  BE(f_NetBundle,		EDIF_TOK_NETBUNDLE),
+  BE(f_NetDelay,		EDIF_TOK_NETDELAY),
+  BE(f_NetGroup,		EDIF_TOK_NETGROUP),
+  BE(f_NetMap,			EDIF_TOK_NETMAP),
+  BE(f_NetRef,			EDIF_TOK_NETREF),
+  BE(f_NonPermutable,		EDIF_TOK_NONPERMUTABLE),
+  BE(f_NotAllowed,		EDIF_TOK_NOTALLOWED),
+  BE(f_NotchSpacing,		EDIF_TOK_NOTCHSPACING),
+  BE(f_Number,			EDIF_TOK_NUMBER),
+  BE(f_NumberDefinition,	EDIF_TOK_NUMBERDEFINITION),
+  BE(f_NumberDisplay,		EDIF_TOK_NUMBERDISPLAY),
+  BE(f_OffPageConnector,	EDIF_TOK_OFFPAGECONNECTOR),
+  BE(f_OffsetEvent,		EDIF_TOK_OFFSETEVENT),
+  BE(f_OpenShape,		EDIF_TOK_OPENSHAPE),
+  BE(f_Origin,			EDIF_TOK_ORIGIN),
+  BE(f_OverhangDistance,	EDIF_TOK_OVERHANGDISTANCE),
+  BE(f_OverlapDistance,		EDIF_TOK_OVERLAPDISTANCE),
+  BE(f_Oversize,		EDIF_TOK_OVERSIZE),
+  BE(f_Page,			EDIF_TOK_PAGE),
+  BE(f_PageSize,		EDIF_TOK_PAGESIZE),
+  BE(f_Parameter,		EDIF_TOK_PARAMETER),
+  BE(f_ParameterAssign,		EDIF_TOK_PARAMETERASSIGN),
+  BE(f_ParameterDisplay,	EDIF_TOK_PARAMETERDISPLAY),
+  BE(f_Path,			EDIF_TOK_PATH),
+  BE(f_PathDelay,		EDIF_TOK_PATHDELAY),
+  BE(f_Permutable,		EDIF_TOK_PERMUTABLE),
+  BE(f_PhysicalDesignRule,	EDIF_TOK_PHYSICALDESIGNRULE),
+  BE(f_Plug,			EDIF_TOK_PLUG),
+  BE(f_Point,			EDIF_TOK_POINT),
+  BE(f_PointDisplay,		EDIF_TOK_POINTDISPLAY),
+  BE(f_PointList,		EDIF_TOK_POINTLIST),
+  BE(f_Polygon,			EDIF_TOK_POLYGON),
+  BE(f_Port,			EDIF_TOK_PORT),
+  BE(f_PortBackAnnotate,	EDIF_TOK_PORTBACKANNOTATE),
+  BE(f_PortBundle,		EDIF_TOK_PORTBUNDLE),
+  BE(f_PortDelay,		EDIF_TOK_PORTDELAY),
+  BE(f_PortGroup,		EDIF_TOK_PORTGROUP),
+  BE(f_PortImplementation,	EDIF_TOK_PORTIMPLEMENTATION),
+  BE(f_PortInstance,		EDIF_TOK_PORTINSTANCE),
+  BE(f_PortList,		EDIF_TOK_PORTLIST),
+  BE(f_PortListAlias,		EDIF_TOK_PORTLISTALIAS),
+  BE(f_PortMap,			EDIF_TOK_PORTMAP),
+  BE(f_PortRef,			EDIF_TOK_PORTREF),
+  BE(f_Program,			EDIF_TOK_PROGRAM),
+  BE(f_Property,		EDIF_TOK_PROPERTY),
+  BE(f_PropertyDisplay,		EDIF_TOK_PROPERTYDISPLAY),
+  BE(f_ProtectionFrame,		EDIF_TOK_PROTECTIONFRAME),
+  BE(f_RangeVector,		EDIF_TOK_RANGEVECTOR),
+  BE(f_Rectangle,		EDIF_TOK_RECTANGLE),
+  BE(f_RectangleSize,		EDIF_TOK_RECTANGLESIZE),
+  BE(f_Rename,			EDIF_TOK_RENAME),
+  BE(f_Resolves,		EDIF_TOK_RESOLVES),
+  BE(f_Scale,			EDIF_TOK_SCALE),
+  BE(f_Section,			EDIF_TOK_SECTION),
+  BE(f_Shape,			EDIF_TOK_SHAPE),
+  BE(f_Simulate,		EDIF_TOK_SIMULATE),
+  BE(f_SimulationInfo,		EDIF_TOK_SIMULATIONINFO),
+  BE(f_SingleValueSet,		EDIF_TOK_SINGLEVALUESET),
+  BE(f_Site,			EDIF_TOK_SITE),
+  BE(f_Socket,			EDIF_TOK_SOCKET),
+  BE(f_SocketSet,		EDIF_TOK_SOCKETSET),
+  BE(f_Status,			EDIF_TOK_STATUS),
+  BE(f_Steady,			EDIF_TOK_STEADY),
+  BE(f_String,			EDIF_TOK_STRING),
+  BE(f_StringDisplay,		EDIF_TOK_STRINGDISPLAY),
+  BE(f_Strong,			EDIF_TOK_STRONG),
+  BE(f_Symbol,			EDIF_TOK_SYMBOL),
+  BE(f_Symmetry,		EDIF_TOK_SYMMETRY),
+  BE(f_Table,			EDIF_TOK_TABLE),
+  BE(f_TableDefault,		EDIF_TOK_TABLEDEFAULT),
+  BE(f_Technology,		EDIF_TOK_TECHNOLOGY),
+  BE(f_TimeInterval,		EDIF_TOK_TIMEINTERVAL),
+  BE(f_Timing,			EDIF_TOK_TIMING),
+  BE(f_Transform,		EDIF_TOK_TRANSFORM),
+  BE(f_Transition,		EDIF_TOK_TRANSITION),
+  BE(f_Trigger,			EDIF_TOK_TRIGGER),
+  BE(f_Union,			EDIF_TOK_UNION),
+  BE(f_View,			EDIF_TOK_VIEW),
+  BE(f_ViewList,		EDIF_TOK_VIEWLIST),
+  BE(f_ViewMap,			EDIF_TOK_VIEWMAP),
+  BE(f_ViewRef,			EDIF_TOK_VIEWREF),
+  BE(f_Visible,			EDIF_TOK_VISIBLE),
+  BE(f_VoltageMap,		EDIF_TOK_VOLTAGEMAP),
+  BE(f_WaveValue,		EDIF_TOK_WAVEVALUE),
+  BE(f_Weak,			EDIF_TOK_WEAK),
+  BE(f_WeakJoined,		EDIF_TOK_WEAKJOINED),
+  BE(f_When,			EDIF_TOK_WHEN),
+  BE(f_Written,			EDIF_TOK_WRITTEN)
+};
+static int BinderDefSize = sizeof(BinderDef) / sizeof(Binder);
+/*
+ *	Keyword table:
+ *
+ *	  This hash table holds all strings which may have to be matched
+ *	to. WARNING: it is assumed that there is no overlap of the 'token'
+ *	and 'context' strings.
+ */
+typedef struct Keyword {
+  struct Keyword *Next;	 	/* pointer to next entry */
+  const char *String;			/* pointer to associated string */
+} Keyword;
+#define	KEYWORD_HASH	127	/* hash table size */
+static Keyword *KeywordTable[KEYWORD_HASH];
+/*
+ *	Enter keyword:
+ *
+ *	  The passed string is entered into the keyword hash table.
+ */
+static void EnterKeyword(const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register Keyword *key;
+  register unsigned int hsh;
+  register const char *cp;
+  /*
+   *	Create the hash code, and add an entry to the table.
+   */
+  for (hsh = 0, cp = str; *cp; hsh += hsh + *cp++);
+  hsh %= KEYWORD_HASH;
+  key = (Keyword *) Malloc(sizeof(Keyword));
+  key->Next = KeywordTable[hsh];
+  (KeywordTable[hsh] = key)->String = str;
+}
+/*
+ *	Find keyword:
+ *
+ *	  The passed string is located within the keyword table. If an
+ *	entry exists, then the value of the keyword string is returned. This
+ *	is real useful for doing string comparisons by pointer value later.
+ *	If there is no match, a NULL is returned.
+ */
+static const char *FindKeyword(const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register Keyword *wlk,*owk;
+  register unsigned int hsh;
+  register char *cp;
+  char lower[IDENT_LENGTH + 1];
+  /*
+   *	Create a lower case copy of the string.
+   */
+  for (cp = lower; *str;)
+    if (isupper( (int) *str))
+      *cp++ = tolower( (int) *str++);
+    else
+      *cp++ = *str++;
+  *cp = '\0';
+  /*
+   *	Search the hash table for a match.
+   */
+  for (hsh = 0, cp = lower; *cp; hsh += hsh + *cp++);
+  hsh %= KEYWORD_HASH;
+  for (owk = NULL, wlk = KeywordTable[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (!strcmp(wlk->String,lower)){
+      /*
+       *	Readjust the LRU.
+       */
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = KeywordTable[hsh];
+      	KeywordTable[hsh] = wlk;
+      }
+      return (wlk->String);
+    }
+  return NULL;
+}
+/*
+ *	Token hash table.
+ */
+#define	TOKEN_HASH	51
+static Token *TokenHash[TOKEN_HASH];
+/*
+ *	Find token:
+ *
+ *	  A pointer to the token of the passed code is returned. If
+ *	no such beastie is present a NULL is returned instead.
+ */
+static Token *FindToken(register int cod)
+{
+  /*
+   *	Locals.
+   */
+  register Token *wlk,*owk;
+  register unsigned int hsh;
+  /*
+   *	Search the hash table for a matching token.
+   */
+  hsh = cod % TOKEN_HASH;
+  for (owk = NULL, wlk = TokenHash[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (cod == wlk->Code){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = TokenHash[hsh];
+      	TokenHash[hsh] = wlk;
+      }
+      break;
+    }
+  return wlk;
+}
+/*
+ *	Context hash table.
+ */
+#define	CONTEXT_HASH	127
+static Context *ContextHash[CONTEXT_HASH];
+/*
+ *	Find context:
+ *
+ *	  A pointer to the context of the passed code is returned. If
+ *	no such beastie is present a NULL is returned instead.
+ */
+static Context *FindContext(register int cod)
+{
+  /*
+   *	Locals.
+   */
+  register Context *wlk,*owk;
+  register unsigned int hsh;
+  /*
+   *	Search the hash table for a matching context.
+   */
+  hsh = cod % CONTEXT_HASH;
+  for (owk = NULL, wlk = ContextHash[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (cod == wlk->Code){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = ContextHash[hsh];
+      	ContextHash[hsh] = wlk;
+      }
+      break;
+    }
+  return wlk;
+}
+/*
+ *	Token stacking variables.
+ */
+#ifdef	DEBUG
+#define	TS_DEPTH	8
+#define	TS_MASK		(TS_DEPTH - 1)
+static unsigned int TSP = 0;		/* token stack pointer */
+static char *TokenStack[TS_DEPTH];	/* token name strings */
+static short TokenType[TS_DEPTH];	/* token types */
+/*
+ *	Stack:
+ *
+ *	  Add a token to the debug stack. The passed string and type are
+ *	what is to be pushed.
+ */
+static void Stack(char * str, int typ)
+{
+  /*
+   *	Free any previous string, then push.
+   */
+  if (TokenStack[TSP & TS_MASK])
+    Free(TokenStack[TSP & TS_MASK]);
+  TokenStack[TSP & TS_MASK] = strcpy((char *)Malloc(strlen(str) + 1),str);
+  TokenType[TSP & TS_MASK] = typ;
+  TSP += 1;
+}
+/*
+ *	Dump stack:
+ *
+ *	  This displays the last set of accumulated tokens.
+ */
+static void DumpStack()
+{
+  /*
+   *	Locals.
+   */
+  register int i;
+  register Context *cxt;
+  register Token *tok;
+  register char *nam;
+  FILE *Error = stderr;
+  /*
+   *	Run through the list displaying the oldest first.
+   */
+  fprintf(Error,"\n\n");
+  for (i = 0; i < TS_DEPTH; i += 1)
+    if (TokenStack[(TSP + i) & TS_MASK]){
+      /*
+       *	Get the type name string.
+       */
+      if ((cxt = FindContext(TokenType[(TSP + i) & TS_MASK])) != NULL)
+        nam = cxt->Name;
+      else if ((tok = FindToken(TokenType[(TSP + i) & TS_MASK])) != NULL)
+        nam = tok->Name;
+      else switch (TokenType[(TSP + i) & TS_MASK]){
+      	case EDIF_TOK_IDENT:	nam = "IDENT";		break;
+      	case EDIF_TOK_INT:	nam = "INT";		break;
+      	case EDIF_TOK_KEYWORD:	nam = "KEYWORD";	break;
+      	case EDIF_TOK_STR:	nam = "STR";		break;
+      	default:	nam = "?";		break;
+      }
+      /*
+       *	Now print the token state.
+       */
+      fprintf(Error,"%2d %-16.16s '%s'\n",TS_DEPTH - i,nam,
+        TokenStack[(TSP + i) & TS_MASK]);
+    }
+  fprintf(Error,"\n");
+}
+#else
+#define	Stack(s,t)
+#endif	/* DEBUG */
+/*
+ *	Parser state variables.
+ */
+static FILE *Input = NULL;		/* input stream */
+static FILE *Error = NULL;		/* error stream */
+static char *InFile;			/* file name on the input stream */
+static long LineNumber;			/* current input line number */
+static ContextCar *CSP = NULL;		/* top of context stack */
+static char yytext[IDENT_LENGTH + 1];	/* token buffer */
+static char CharBuf[IDENT_LENGTH + 1];	/* garbage buffer */
+/*
+ *	yyerror:
+ *
+ *	  Standard error reporter, it prints out the passed string
+ *	preceeded by the current filename and line number.
+ */
+static void yyerror(const char *ers)
+{
+#ifdef	DEBUG
+  DumpStack();
+#endif	/* DEBUG */
+  fprintf(Error,"%s, line %ld: %s\n",InFile,LineNumber,ers);
+}
+/*
+ *	String bucket definitions.
+ */
+#define	BUCKET_SIZE	64
+typedef struct Bucket {
+  struct Bucket *Next;			/* pointer to next bucket */
+  int Index;				/* pointer to next free slot */
+  char Data[BUCKET_SIZE];		/* string data */
+} Bucket;
+static Bucket *CurrentBucket = NULL;	/* string bucket list */
+static int StringSize = 0;		/* current string length */
+/*
+ *	Push string:
+ *
+ *	  This adds the passed charater to the current string bucket.
+ */
+static void PushString(char chr)
+{
+  /*
+   *	Locals.
+   */
+  register Bucket *bck;
+  /*
+   *	Make sure there is room for the push.
+   */
+  if ((bck = CurrentBucket)->Index >= BUCKET_SIZE){
+    bck = (Bucket *) Malloc(sizeof(Bucket));
+    bck->Next = CurrentBucket;
+    (CurrentBucket = bck)->Index = 0;
+  }
+  /*
+   *	Push the character.
+   */
+  bck->Data[bck->Index++] = chr;
+  StringSize += 1;
+}
+/*
+ *	Form string:
+ *
+ *	  This converts the current string bucket into a real live string,
+ *	whose pointer is returned.
+ */
+static char *FormString()
+{
+  /*
+   *	Locals.
+   */
+  register Bucket *bck;
+  register char *cp;
+  /*
+   *	Allocate space for the string, set the pointer at the end.
+   */
+  cp = (char *) Malloc(StringSize + 1);
+
+  cp += StringSize;
+  *cp-- = '\0';
+  /*
+   *	Yank characters out of the bucket.
+   */
+  for (bck = CurrentBucket; bck->Index || bck->Next;){
+    if (!bck->Index){
+      CurrentBucket = bck->Next;
+      Free(bck);
+      bck = CurrentBucket;
+    }
+    *cp-- = bck->Data[--bck->Index];
+  }
+  /* reset buffer size  to zero */
+  StringSize =0;
+  return (cp + 1);
+}
+/*
+ *	Parse EDIF:
+ *
+ *	  This builds the context tree and then calls the real parser.
+ *	It is passed two file streams, the first is where the input comes
+ *	from; the second is where error messages get printed.
+ */
+void ParseEDIF(char* filename,FILE* err)
+{
+  /*
+   *	Locals.
+   */
+  register int i;
+  static int ContextDefined = 1;
+  /*
+   *	Set up the file state to something useful.
+   */
+  InFile = filename;
+  Input = pcb_fopen(filename, "r");
+  Error = err;
+  LineNumber = 1;
+  /*
+   *	Define both the enabled token and context strings.
+   */
+  if (ContextDefined){
+    for (i = TokenDefSize; i--; EnterKeyword(TokenDef[i].Name)){
+      register unsigned int hsh;
+      hsh = TokenDef[i].Code % TOKEN_HASH;
+      TokenDef[i].Next = TokenHash[hsh];
+      TokenHash[hsh] = &TokenDef[i];
+    }
+    for (i = ContextDefSize; i--; EnterKeyword(ContextDef[i].Name)){
+      register unsigned int hsh;
+      hsh = ContextDef[i].Code % CONTEXT_HASH;
+      ContextDef[i].Next = ContextHash[hsh];
+      ContextHash[hsh] = &ContextDef[i];
+    }
+    /*
+     *	Build the context tree.
+     */
+    for (i = BinderDefSize; i--;){
+      register Context *cxt;
+      register int j;
+      /*
+       *	Define the current context to have carriers bound to it.
+       */
+      cxt = FindContext(BinderDef[i].Origin);
+      for (j = BinderDef[i].FollowerSize; j--;){
+        register ContextCar *cc;
+        /*
+         *	Add carriers to the current context.
+         */
+        cc = (ContextCar *) Malloc(sizeof(ContextCar));
+        cc->Next = cxt->Context;
+        (cxt->Context = cc)->Context =
+          FindContext(PCB_ABS(BinderDef[i].Follower[j]));
+        cc->u.Single = BinderDef[i].Follower[j] < 0;
+      }
+    }
+    /*
+     *	Build the token tree.
+     */
+    for (i = TieDefSize; i--;){
+      register Context *cxt;
+      register int j;
+      /*
+       *	Define the current context to have carriers bound to it.
+       */
+      cxt = FindContext(TieDef[i].Origin);
+      for (j = TieDef[i].EnableSize; j--;){
+        register TokenCar *tc;
+        /*
+         *	Add carriers to the current context.
+         */
+        tc = (TokenCar *) Malloc(sizeof(TokenCar));
+        tc->Next = cxt->Token;
+        (cxt->Token = tc)->Token = FindToken(TieDef[i].Enable[j]);
+      }
+    }
+    /*
+     *	Put a bogus context on the stack which has 'EDIF' as its
+     *	follower.
+     */
+    CSP = (ContextCar *) Malloc(sizeof(ContextCar));
+    CSP->Next = NULL;
+    CSP->Context = FindContext(0);
+    CSP->u.Used = NULL;
+    ContextDefined = 0;
+  }
+  /*
+   *	Create an initial, empty string bucket.
+   */
+  CurrentBucket = (Bucket *) Malloc(sizeof(Bucket));
+  CurrentBucket->Next = 0;
+  CurrentBucket->Index = 0;
+  /*
+   *	Fill the token stack with NULLs if debugging is enabled.
+   */
+#ifdef	DEBUG
+  for (i = TS_DEPTH; i--; TokenStack[i] = NULL)
+    if (TokenStack[i])
+      Free(TokenStack[i]);
+  TSP = 0;
+#endif	/* DEBUG */
+  /*
+   *	Go parse things!
+   */
+  edifparse();
+}
+/*
+ *	Match token:
+ *
+ *	  The passed string is looked up in the current context's token
+ *	list to see if it is enabled. If so the token value is returned,
+ *	if not then zero.
+ */
+static int MatchToken(register const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register TokenCar *wlk,*owk;
+  /*
+   *	Convert the string to the proper form, then search the token
+   *	carrier list for a match.
+   */
+  str = FindKeyword(str);
+  for (owk = NULL, wlk = CSP->Context->Token; wlk; wlk = (owk = wlk)->Next)
+    if (str == wlk->Token->Name){
+      if (owk){
+        owk->Next = wlk->Next;
+        wlk->Next = CSP->Context->Token;
+        CSP->Context->Token = wlk;
+      }
+      return (wlk->Token->Code);
+    }
+  return 0;
+}
+/*
+ *	Match context:
+ *
+ *	  If the passed keyword string is within the current context, the
+ *	new context is pushed and token value is returned. A zero otherwise.
+ */
+static int MatchContext(register const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register ContextCar *wlk,*owk;
+  /*
+   *	See if the context is present.
+   */
+  str = FindKeyword(str);
+  for (owk = NULL, wlk = CSP->Context->Context; wlk; wlk = (owk = wlk)->Next)
+    if (str == wlk->Context->Name){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = CSP->Context->Context;
+      	CSP->Context->Context = wlk;
+      }
+      /*
+       *	If a single context, make sure it isn't already used.
+       */
+      if (wlk->u.Single){
+      	register UsedCar *usc;
+      	for (usc = CSP->u.Used; usc; usc = usc->Next)
+      	  if (usc->Code == wlk->Context->Code)
+      	    break;
+      	if (usc){
+      	  sprintf(CharBuf,"'%s' is used more than once within '%s'",
+      	    str,CSP->Context->Name);
+      	  yyerror(CharBuf);
+      	} else {
+      	  usc = (UsedCar *) Malloc(sizeof(UsedCar));
+      	  usc->Next = CSP->u.Used;
+      	  (CSP->u.Used = usc)->Code = wlk->Context->Code;
+      	}
+      }
+      /*
+       *	Push the new context.
+       */
+      owk = (ContextCar *) Malloc(sizeof(ContextCar));
+      owk->Next = CSP;
+      (CSP = owk)->Context = wlk->Context;
+      owk->u.Used = NULL;
+      return (wlk->Context->Code);
+    }
+  return 0;
+}
+/*
+ *	PopC:
+ *
+ *	  This pops the current context.
+ */
+static void PopC()
+{
+  /*
+   *	Locals.
+   */
+  register UsedCar *usc;
+  register ContextCar *csp;
+  /*
+   *	Release single markers and pop context.
+   */
+  while ( (usc = CSP->u.Used) ){
+    CSP->u.Used = usc->Next;
+    Free(usc);
+  }
+  csp = CSP->Next;
+  Free(CSP);
+  CSP = csp;
+}
+/*
+ *	Lexical analyzer states.
+ */
+#define	L_START		0
+#define	L_INT		1
+#define	L_IDENT		2
+#define	L_KEYWORD	3
+#define	L_STRING	4
+#define	L_KEYWORD2	5
+#define	L_ASCIICHAR	6
+#define	L_ASCIICHAR2	7
+/*
+ *	yylex:
+ *
+ *	  This is the lexical analyzer called by the YACC/BISON parser.
+ *	It returns a pretty restricted set of token types and does the
+ *	context movement when acceptable keywords are found. The token
+ *	value returned is a NULL terminated string to allocated storage
+ *	(ie - it should get released some time) with some restrictions.
+ *	  The token value for integers is strips a leading '+' if present.
+ *	String token values have the leading and trailing '"'-s stripped.
+ *	'%' conversion characters in string values are passed converted.
+ *	The '(' and ')' characters do not have a token value.
+ */
+static int yylex()
+{
+  /*
+   *	Locals.
+   */
+  register int c,s,l;
+  /*
+   *	Keep on sucking up characters until we find something which
+   *	explicitly forces us out of this function.
+   */
+  for (s = L_START, l = 0; 1;){
+    yytext[l++] = c = Getc(Input);
+    switch (s){
+      /*
+       *	Starting state, look for something resembling a token.
+       */
+      case L_START:
+        if (isdigit(c) || c == '-')
+          s = L_INT;
+        else if (isalpha(c) || c == '&')
+          s = L_IDENT;
+        else if (isspace(c)){
+          if (c == '\n')
+            LineNumber += 1;
+          l = 0;
+        } else if (c == '('){
+          l = 0;
+          s = L_KEYWORD;
+        } else if (c == '"')
+          s = L_STRING;
+        else if (c == '+'){
+          l = 0;				/* strip '+' */
+          s = L_INT;
+        } else if (c == EOF)
+          return ('\0');
+        else {
+          yytext[1] = '\0';
+          Stack(yytext,c);
+          return c;
+        }
+        break;
+      /*
+       *	Suck up the integer digits.
+       */
+      case L_INT:
+        if (isdigit(c))
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext,EDIF_TOK_INT);
+        return EDIF_TOK_INT;
+      /*
+       *	Grab an identifier, see if the current context enables
+       *	it with a specific token value.
+       */
+      case L_IDENT:
+        if (isalpha(c) || isdigit(c) || c == '_')
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        if (CSP->Context->Token && (c = MatchToken(yytext))){
+          Stack(yytext,c);
+          return c;
+        }
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext, EDIF_TOK_IDENT);
+        return EDIF_TOK_IDENT;
+      /*
+       *	Scan until you find the start of an identifier, discard
+       *	any whitespace found. On no identifier, return a '('.
+       */
+      case L_KEYWORD:
+        if (isalpha(c) || c == '&'){
+          s = L_KEYWORD2;
+          break;
+        } else if (isspace(c)){
+          l = 0;
+          break;
+        }
+        Ungetc(c);
+        Stack("(",'(');
+        return ('(');
+      /*
+       *	Suck up the keyword identifier, if it matches the set of
+       *	allowable contexts then return its token value and push
+       *	the context, otherwise just return the identifier string.
+       */
+      case L_KEYWORD2:
+        if (isalpha(c) || isdigit(c) || c == '_')
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        if ( (c = MatchContext(yytext)) ){
+          Stack(yytext,c);
+          return c;
+        }
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext, EDIF_TOK_KEYWORD);
+        return EDIF_TOK_KEYWORD;
+      /*
+       *	Suck up string characters but once resolved they should
+       *	be deposited in the string bucket because they can be
+       *	arbitrarily long.
+       */
+      case L_STRING:
+        if (c == '\n')
+          LineNumber += 1;
+        else if (c == '\r')
+          ;
+        else if (c == '"' || c == EOF){
+          yylval.s = FormString();
+          Stack(yylval.s, EDIF_TOK_STR);
+          return EDIF_TOK_STR;
+        } else if (c == '%')
+          s = L_ASCIICHAR;
+        else
+          PushString(c);
+        l = 0;
+        break;
+      /*
+       *	Skip white space and look for integers to be pushed
+       *	as characters.
+       */
+      case L_ASCIICHAR:
+        if (isdigit(c)){
+          s = L_ASCIICHAR2;
+          break;
+        } else if (c == '%' || c == EOF)
+          s = L_STRING;
+        else if (c == '\n')
+          LineNumber += 1;
+        l = 0;
+        break;
+      /*
+       *	Convert the accumulated integer into a char and push.
+       */
+      case L_ASCIICHAR2:
+        if (isdigit(c))
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        PushString(atoi(yytext));
+        s = L_ASCIICHAR;
+        l = 0;
+        break;
+    }
+  }
+}
+
+int ReadEdifNetlist(char *filename)
+{
+	pcb_message(PCB_MSG_INFO, _("Importing edif netlist %s\n"), filename);
+	ParseEDIF(filename, NULL);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_edif/edif.h
===================================================================
--- tags/2.0.1/src_plugins/import_edif/edif.h	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/edif.h	(revision 18980)
@@ -0,0 +1,365 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_EDIF_EDIF_H_INCLUDED
+# define YY_EDIF_EDIF_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int edifdebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    EDIF_TOK_IDENT = 258,
+    EDIF_TOK_INT = 259,
+    EDIF_TOK_KEYWORD = 260,
+    EDIF_TOK_STR = 261,
+    EDIF_TOK_ANGLE = 262,
+    EDIF_TOK_BEHAVIOR = 263,
+    EDIF_TOK_CALCULATED = 264,
+    EDIF_TOK_CAPACITANCE = 265,
+    EDIF_TOK_CENTERCENTER = 266,
+    EDIF_TOK_CENTERLEFT = 267,
+    EDIF_TOK_CENTERRIGHT = 268,
+    EDIF_TOK_CHARGE = 269,
+    EDIF_TOK_CONDUCTANCE = 270,
+    EDIF_TOK_CURRENT = 271,
+    EDIF_TOK_DISTANCE = 272,
+    EDIF_TOK_DOCUMENT = 273,
+    EDIF_TOK_ENERGY = 274,
+    EDIF_TOK_EXTEND = 275,
+    EDIF_TOK_FLUX = 276,
+    EDIF_TOK_FREQUENCY = 277,
+    EDIF_TOK_GENERIC = 278,
+    EDIF_TOK_GRAPHIC = 279,
+    EDIF_TOK_INDUCTANCE = 280,
+    EDIF_TOK_INOUT = 281,
+    EDIF_TOK_INPUT = 282,
+    EDIF_TOK_LOGICMODEL = 283,
+    EDIF_TOK_LOWERCENTER = 284,
+    EDIF_TOK_LOWERLEFT = 285,
+    EDIF_TOK_LOWERRIGHT = 286,
+    EDIF_TOK_MASKLAYOUT = 287,
+    EDIF_TOK_MASS = 288,
+    EDIF_TOK_MEASURED = 289,
+    EDIF_TOK_MX = 290,
+    EDIF_TOK_MXR90 = 291,
+    EDIF_TOK_MY = 292,
+    EDIF_TOK_MYR90 = 293,
+    EDIF_TOK_NETLIST = 294,
+    EDIF_TOK_OUTPUT = 295,
+    EDIF_TOK_PCBLAYOUT = 296,
+    EDIF_TOK_POWER = 297,
+    EDIF_TOK_R0 = 298,
+    EDIF_TOK_R180 = 299,
+    EDIF_TOK_R270 = 300,
+    EDIF_TOK_R90 = 301,
+    EDIF_TOK_REQUIRED = 302,
+    EDIF_TOK_RESISTANCE = 303,
+    EDIF_TOK_RIPPER = 304,
+    EDIF_TOK_ROUND = 305,
+    EDIF_TOK_SCHEMATIC = 306,
+    EDIF_TOK_STRANGER = 307,
+    EDIF_TOK_SYMBOLIC = 308,
+    EDIF_TOK_TEMPERATURE = 309,
+    EDIF_TOK_TIE = 310,
+    EDIF_TOK_TIME = 311,
+    EDIF_TOK_TRUNCATE = 312,
+    EDIF_TOK_UPPERCENTER = 313,
+    EDIF_TOK_UPPERLEFT = 314,
+    EDIF_TOK_UPPERRIGHT = 315,
+    EDIF_TOK_VOLTAGE = 316,
+    EDIF_TOK_ACLOAD = 317,
+    EDIF_TOK_AFTER = 318,
+    EDIF_TOK_ANNOTATE = 319,
+    EDIF_TOK_APPLY = 320,
+    EDIF_TOK_ARC = 321,
+    EDIF_TOK_ARRAY = 322,
+    EDIF_TOK_ARRAYMACRO = 323,
+    EDIF_TOK_ARRAYRELATEDINFO = 324,
+    EDIF_TOK_ARRAYSITE = 325,
+    EDIF_TOK_ATLEAST = 326,
+    EDIF_TOK_ATMOST = 327,
+    EDIF_TOK_AUTHOR = 328,
+    EDIF_TOK_BASEARRAY = 329,
+    EDIF_TOK_BECOMES = 330,
+    EDIF_TOK_BETWEEN = 331,
+    EDIF_TOK_BOOLEAN = 332,
+    EDIF_TOK_BOOLEANDISPLAY = 333,
+    EDIF_TOK_BOOLEANMAP = 334,
+    EDIF_TOK_BORDERPATTERN = 335,
+    EDIF_TOK_BORDERWIDTH = 336,
+    EDIF_TOK_BOUNDINGBOX = 337,
+    EDIF_TOK_CELL = 338,
+    EDIF_TOK_CELLREF = 339,
+    EDIF_TOK_CELLTYPE = 340,
+    EDIF_TOK_CHANGE = 341,
+    EDIF_TOK_CIRCLE = 342,
+    EDIF_TOK_COLOR = 343,
+    EDIF_TOK_COMMENT = 344,
+    EDIF_TOK_COMMENTGRAPHICS = 345,
+    EDIF_TOK_COMPOUND = 346,
+    EDIF_TOK_CONNECTLOCATION = 347,
+    EDIF_TOK_CONTENTS = 348,
+    EDIF_TOK_CORNERTYPE = 349,
+    EDIF_TOK_CRITICALITY = 350,
+    EDIF_TOK_CURRENTMAP = 351,
+    EDIF_TOK_CURVE = 352,
+    EDIF_TOK_CYCLE = 353,
+    EDIF_TOK_DATAORIGIN = 354,
+    EDIF_TOK_DCFANINLOAD = 355,
+    EDIF_TOK_DCFANOUTLOAD = 356,
+    EDIF_TOK_DCMAXFANIN = 357,
+    EDIF_TOK_DCMAXFANOUT = 358,
+    EDIF_TOK_DELAY = 359,
+    EDIF_TOK_DELTA = 360,
+    EDIF_TOK_DERIVATION = 361,
+    EDIF_TOK_DESIGN = 362,
+    EDIF_TOK_DESIGNATOR = 363,
+    EDIF_TOK_DIFFERENCE = 364,
+    EDIF_TOK_DIRECTION = 365,
+    EDIF_TOK_DISPLAY = 366,
+    EDIF_TOK_DOMINATES = 367,
+    EDIF_TOK_DOT = 368,
+    EDIF_TOK_DURATION = 369,
+    EDIF_TOK_E = 370,
+    EDIF_TOK_EDIF = 371,
+    EDIF_TOK_EDIFLEVEL = 372,
+    EDIF_TOK_EDIFVERSION = 373,
+    EDIF_TOK_ENCLOSUREDISTANCE = 374,
+    EDIF_TOK_ENDTYPE = 375,
+    EDIF_TOK_ENTRY = 376,
+    EDIF_TOK_EVENT = 377,
+    EDIF_TOK_EXACTLY = 378,
+    EDIF_TOK_EXTERNAL = 379,
+    EDIF_TOK_FABRICATE = 380,
+    EDIF_TOK_FALSE = 381,
+    EDIF_TOK_FIGURE = 382,
+    EDIF_TOK_FIGUREAREA = 383,
+    EDIF_TOK_FIGUREGROUP = 384,
+    EDIF_TOK_FIGUREGROUPOBJECT = 385,
+    EDIF_TOK_FIGUREGROUPOVERRIDE = 386,
+    EDIF_TOK_FIGUREGROUPREF = 387,
+    EDIF_TOK_FIGUREPERIMETER = 388,
+    EDIF_TOK_FIGUREWIDTH = 389,
+    EDIF_TOK_FILLPATTERN = 390,
+    EDIF_TOK_FOLLOW = 391,
+    EDIF_TOK_FORBIDDENEVENT = 392,
+    EDIF_TOK_GLOBALPORTREF = 393,
+    EDIF_TOK_GREATERTHAN = 394,
+    EDIF_TOK_GRIDMAP = 395,
+    EDIF_TOK_IGNORE = 396,
+    EDIF_TOK_INCLUDEFIGUREGROUP = 397,
+    EDIF_TOK_INITIAL = 398,
+    EDIF_TOK_INSTANCE = 399,
+    EDIF_TOK_INSTANCEBACKANNOTATE = 400,
+    EDIF_TOK_INSTANCEGROUP = 401,
+    EDIF_TOK_INSTANCEMAP = 402,
+    EDIF_TOK_INSTANCEREF = 403,
+    EDIF_TOK_INTEGER = 404,
+    EDIF_TOK_INTEGERDISPLAY = 405,
+    EDIF_TOK_INTERFACE = 406,
+    EDIF_TOK_INTERFIGUREGROUPSPACING = 407,
+    EDIF_TOK_INTERSECTION = 408,
+    EDIF_TOK_INTRAFIGUREGROUPSPACING = 409,
+    EDIF_TOK_INVERSE = 410,
+    EDIF_TOK_ISOLATED = 411,
+    EDIF_TOK_JOINED = 412,
+    EDIF_TOK_JUSTIFY = 413,
+    EDIF_TOK_KEYWORDDISPLAY = 414,
+    EDIF_TOK_KEYWORDLEVEL = 415,
+    EDIF_TOK_KEYWORDMAP = 416,
+    EDIF_TOK_LESSTHAN = 417,
+    EDIF_TOK_LIBRARY = 418,
+    EDIF_TOK_LIBRARYREF = 419,
+    EDIF_TOK_LISTOFNETS = 420,
+    EDIF_TOK_LISTOFPORTS = 421,
+    EDIF_TOK_LOADDELAY = 422,
+    EDIF_TOK_LOGICASSIGN = 423,
+    EDIF_TOK_LOGICINPUT = 424,
+    EDIF_TOK_LOGICLIST = 425,
+    EDIF_TOK_LOGICMAPINPUT = 426,
+    EDIF_TOK_LOGICMAPOUTPUT = 427,
+    EDIF_TOK_LOGICONEOF = 428,
+    EDIF_TOK_LOGICOUTPUT = 429,
+    EDIF_TOK_LOGICPORT = 430,
+    EDIF_TOK_LOGICREF = 431,
+    EDIF_TOK_LOGICVALUE = 432,
+    EDIF_TOK_LOGICWAVEFORM = 433,
+    EDIF_TOK_MAINTAIN = 434,
+    EDIF_TOK_MATCH = 435,
+    EDIF_TOK_MEMBER = 436,
+    EDIF_TOK_MINOMAX = 437,
+    EDIF_TOK_MINOMAXDISPLAY = 438,
+    EDIF_TOK_MNM = 439,
+    EDIF_TOK_MULTIPLEVALUESET = 440,
+    EDIF_TOK_MUSTJOIN = 441,
+    EDIF_TOK_NAME = 442,
+    EDIF_TOK_NET = 443,
+    EDIF_TOK_NETBACKANNOTATE = 444,
+    EDIF_TOK_NETBUNDLE = 445,
+    EDIF_TOK_NETDELAY = 446,
+    EDIF_TOK_NETGROUP = 447,
+    EDIF_TOK_NETMAP = 448,
+    EDIF_TOK_NETREF = 449,
+    EDIF_TOK_NOCHANGE = 450,
+    EDIF_TOK_NONPERMUTABLE = 451,
+    EDIF_TOK_NOTALLOWED = 452,
+    EDIF_TOK_NOTCHSPACING = 453,
+    EDIF_TOK_NUMBER = 454,
+    EDIF_TOK_NUMBERDEFINITION = 455,
+    EDIF_TOK_NUMBERDISPLAY = 456,
+    EDIF_TOK_OFFPAGECONNECTOR = 457,
+    EDIF_TOK_OFFSETEVENT = 458,
+    EDIF_TOK_OPENSHAPE = 459,
+    EDIF_TOK_ORIENTATION = 460,
+    EDIF_TOK_ORIGIN = 461,
+    EDIF_TOK_OVERHANGDISTANCE = 462,
+    EDIF_TOK_OVERLAPDISTANCE = 463,
+    EDIF_TOK_OVERSIZE = 464,
+    EDIF_TOK_OWNER = 465,
+    EDIF_TOK_PAGE = 466,
+    EDIF_TOK_PAGESIZE = 467,
+    EDIF_TOK_PARAMETER = 468,
+    EDIF_TOK_PARAMETERASSIGN = 469,
+    EDIF_TOK_PARAMETERDISPLAY = 470,
+    EDIF_TOK_PATH = 471,
+    EDIF_TOK_PATHDELAY = 472,
+    EDIF_TOK_PATHWIDTH = 473,
+    EDIF_TOK_PERMUTABLE = 474,
+    EDIF_TOK_PHYSICALDESIGNRULE = 475,
+    EDIF_TOK_PLUG = 476,
+    EDIF_TOK_POINT = 477,
+    EDIF_TOK_POINTDISPLAY = 478,
+    EDIF_TOK_POINTLIST = 479,
+    EDIF_TOK_POLYGON = 480,
+    EDIF_TOK_PORT = 481,
+    EDIF_TOK_PORTBACKANNOTATE = 482,
+    EDIF_TOK_PORTBUNDLE = 483,
+    EDIF_TOK_PORTDELAY = 484,
+    EDIF_TOK_PORTGROUP = 485,
+    EDIF_TOK_PORTIMPLEMENTATION = 486,
+    EDIF_TOK_PORTINSTANCE = 487,
+    EDIF_TOK_PORTLIST = 488,
+    EDIF_TOK_PORTLISTALIAS = 489,
+    EDIF_TOK_PORTMAP = 490,
+    EDIF_TOK_PORTREF = 491,
+    EDIF_TOK_PROGRAM = 492,
+    EDIF_TOK_PROPERTY = 493,
+    EDIF_TOK_PROPERTYDISPLAY = 494,
+    EDIF_TOK_PROTECTIONFRAME = 495,
+    EDIF_TOK_PT = 496,
+    EDIF_TOK_RANGEVECTOR = 497,
+    EDIF_TOK_RECTANGLE = 498,
+    EDIF_TOK_RECTANGLESIZE = 499,
+    EDIF_TOK_RENAME = 500,
+    EDIF_TOK_RESOLVES = 501,
+    EDIF_TOK_SCALE = 502,
+    EDIF_TOK_SCALEX = 503,
+    EDIF_TOK_SCALEY = 504,
+    EDIF_TOK_SECTION = 505,
+    EDIF_TOK_SHAPE = 506,
+    EDIF_TOK_SIMULATE = 507,
+    EDIF_TOK_SIMULATIONINFO = 508,
+    EDIF_TOK_SINGLEVALUESET = 509,
+    EDIF_TOK_SITE = 510,
+    EDIF_TOK_SOCKET = 511,
+    EDIF_TOK_SOCKETSET = 512,
+    EDIF_TOK_STATUS = 513,
+    EDIF_TOK_STEADY = 514,
+    EDIF_TOK_STRING = 515,
+    EDIF_TOK_STRINGDISPLAY = 516,
+    EDIF_TOK_STRONG = 517,
+    EDIF_TOK_SYMBOL = 518,
+    EDIF_TOK_SYMMETRY = 519,
+    EDIF_TOK_TABLE = 520,
+    EDIF_TOK_TABLEDEFAULT = 521,
+    EDIF_TOK_TECHNOLOGY = 522,
+    EDIF_TOK_TEXTHEIGHT = 523,
+    EDIF_TOK_TIMEINTERVAL = 524,
+    EDIF_TOK_TIMESTAMP = 525,
+    EDIF_TOK_TIMING = 526,
+    EDIF_TOK_TRANSFORM = 527,
+    EDIF_TOK_TRANSITION = 528,
+    EDIF_TOK_TRIGGER = 529,
+    EDIF_TOK_TRUE = 530,
+    EDIF_TOK_UNCONSTRAINED = 531,
+    EDIF_TOK_UNDEFINED = 532,
+    EDIF_TOK_UNION = 533,
+    EDIF_TOK_UNIT = 534,
+    EDIF_TOK_UNUSED = 535,
+    EDIF_TOK_USERDATA = 536,
+    EDIF_TOK_VERSION = 537,
+    EDIF_TOK_VIEW = 538,
+    EDIF_TOK_VIEWLIST = 539,
+    EDIF_TOK_VIEWMAP = 540,
+    EDIF_TOK_VIEWREF = 541,
+    EDIF_TOK_VIEWTYPE = 542,
+    EDIF_TOK_VISIBLE = 543,
+    EDIF_TOK_VOLTAGEMAP = 544,
+    EDIF_TOK_WAVEVALUE = 545,
+    EDIF_TOK_WEAK = 546,
+    EDIF_TOK_WEAKJOINED = 547,
+    EDIF_TOK_WHEN = 548,
+    EDIF_TOK_WRITTEN = 549
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 202 "edif.y" /* yacc.c:1909  */
+
+    char* s;
+    pair_list* pl;
+    str_pair* ps;
+
+#line 355 "edif.h" /* yacc.c:1909  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE ediflval;
+
+int edifparse (void);
+
+#endif /* !YY_EDIF_EDIF_H_INCLUDED  */
Index: tags/2.0.1/src_plugins/import_edif/edif.y
===================================================================
--- tags/2.0.1/src_plugins/import_edif/edif.y	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/edif.y	(revision 18980)
@@ -0,0 +1,4459 @@
+%{
+/*
+ * PCB Edif parser based heavily on:
+ *
+ *	Header: edif.y,v 1.18 87/12/07 19:59:49 roger Locked
+ */
+/************************************************************************
+ *									*
+ *				edif.y					*
+ *									*
+ *			EDIF 2.0.0 parser, Level 0			*
+ *									*
+ *	You are free to copy, distribute, use it, abuse it, make it	*
+ *	write bad tracks all over the disk ... or anything else.	*
+ *									*
+ *	Your friendly neighborhood Rogue Monster - roger@mips.com	*
+ *									*
+ ************************************************************************/
+#include <stdio.h>
+
+/* for malloc, free, atoi */
+#include <stdlib.h>
+
+/* for strcpy */
+#include <string.h>
+
+#include <ctype.h>
+
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "library.h"
+#include "error.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "safe_fs.h"
+
+/* from mymem.h, not include because of the malloc junk */
+pcb_lib_menu_t *pcb_lib_menu_new(pcb_lib_t *, int *idx);
+pcb_lib_entry_t *pcb_lib_entry_new(pcb_lib_menu_t *);
+
+
+/*
+ *	Local definitions.
+ */
+#define	IDENT_LENGTH		255
+#define	Malloc(s)		malloc(s)
+#define	Free(p)			free(p)
+#define	Getc(s)			getc(s)
+#define	Ungetc(c)		ungetc(c,Input)
+
+ typedef struct _str_pair
+ {
+     char* str1;
+     char* str2;
+     struct _str_pair* next;
+ } str_pair;
+
+ typedef struct _pair_list
+ {
+     char* name;
+     str_pair* list;
+ } pair_list;
+
+ str_pair* new_str_pair(char* s1, char* s2)
+ {
+   str_pair* ps = (str_pair *)malloc(sizeof(str_pair));
+     ps->str1 = s1;
+     ps->str2 = s2;
+     ps->next = NULL;
+     return ps;
+ }
+
+ pair_list* new_pair_list(str_pair* ps)
+ {
+   pair_list* pl = (pair_list *)malloc(sizeof(pair_list));
+     pl->list = ps;
+     pl->name = NULL;
+     return pl;
+ }
+
+ void str_pair_free(str_pair* ps)
+ {
+     str_pair* node;
+     while ( ps )
+     {
+	 free(ps->str1);
+	 free(ps->str2);
+	 node = ps;
+	 ps = ps->next;
+	 free(node);
+     }
+ }
+
+ void pair_list_free(pair_list* pl)
+ {
+     str_pair_free(pl->list);
+     free(pl->name);
+     free(pl);
+ }
+
+ void define_pcb_net(str_pair* name, pair_list* nodes)
+ {
+     int tl;
+     str_pair* done_node;
+     str_pair* node;
+     char* buf;
+     char* p;
+     pcb_lib_entry_t *entry;
+     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
+
+     if ( !name->str1 )
+     {
+	 /* no net name given, stop now */
+	 /* if renamed str2 also exists and must be freed */
+	 if ( name->str2 )  free(name->str2);
+	 free(name);
+	 pair_list_free(nodes);
+	 return;
+     }
+     menu->Name = pcb_strdup (name->str1);
+     free(name->str1);
+     /* if renamed str2 also exists and must be freed */
+     if ( name->str2 )  free(name->str2);
+     free(name);
+     buf = (char *)malloc(256);
+     if ( !buf )
+     {
+	 /* no memory */
+	 pair_list_free(nodes);
+	 return;
+     }
+
+     node = nodes->list;
+     free(nodes->name);
+     free(nodes);
+     while ( node )
+     {
+	 /* check for node with no instance */
+	 if ( !node->str1 )
+	 {
+	     /* toss it and move on */
+	     free(node->str2);
+	     done_node = node;
+	     node = node->next;
+	     free(done_node);
+	     continue;
+	 }
+	 tl = strlen(node->str1) + strlen(node->str2);
+	 if ( tl + 3 > 256 )
+	 {
+	     free(buf);
+	     buf = (char *)malloc(tl+3);
+	     if ( !buf )
+	     {
+		 /* no memory */
+		 str_pair_free(node);
+		 return;
+	     }
+	 }
+	 strcpy(buf,node->str1);
+	 /* make all upper case, because of PCB funky behaviour */
+	 p=buf;
+	 while ( *p )
+	 {
+	     *p = toupper( (int) *p);
+	     p++;
+	 }
+	 /* add dash separating designator from node */
+	 *(buf+strlen(node->str1)) = '-';
+	 /* check for the edif number prefix */
+	 if ( node->str2[0] == '&' )
+	 {
+	     /* skip number prefix */
+	     strcpy(buf+strlen(node->str1)+1,node->str2 +1);
+	 }
+	 else
+	 {
+	     strcpy(buf+strlen(node->str1)+1,node->str2);
+	 }
+	 /* free the strings */
+	 free(node->str1);
+	 free(node->str2);
+	 entry = pcb_lib_entry_new(menu);
+	 entry->ListEntry = pcb_strdup(buf);
+	 done_node = node;
+	 node = node->next;
+	 free(done_node);
+     }
+ }
+
+
+/* forward function declarations */
+ static int yylex(void);
+ static void yyerror(const char *);
+ static void PopC(void);
+%}
+
+%name-prefix "edif"
+
+%union {
+    char* s;
+    pair_list* pl;
+    str_pair* ps;
+}
+
+%type <s> Int Ident Str Keyword Name _Name
+%type <ps>  PortRef _PortRef NetNameDef NameDef
+%type <ps> Rename _Joined
+%type <s>__Rename _Rename NameRef
+%type <s> InstanceRef InstNameRef Member PortNameRef
+%type <pl> Net _Net Joined
+
+%token	<s>	EDIF_TOK_IDENT
+%token	<s>	EDIF_TOK_INT
+%token	<s>	EDIF_TOK_KEYWORD
+%token	<s>	EDIF_TOK_STR
+
+%token		EDIF_TOK_ANGLE
+%token		EDIF_TOK_BEHAVIOR
+%token		EDIF_TOK_CALCULATED
+%token		EDIF_TOK_CAPACITANCE
+%token		EDIF_TOK_CENTERCENTER
+%token		EDIF_TOK_CENTERLEFT
+%token		EDIF_TOK_CENTERRIGHT
+%token		EDIF_TOK_CHARGE
+%token		EDIF_TOK_CONDUCTANCE
+%token		EDIF_TOK_CURRENT
+%token		EDIF_TOK_DISTANCE
+%token		EDIF_TOK_DOCUMENT
+%token		EDIF_TOK_ENERGY
+%token		EDIF_TOK_EXTEND
+%token		EDIF_TOK_FLUX
+%token		EDIF_TOK_FREQUENCY
+%token		EDIF_TOK_GENERIC
+%token		EDIF_TOK_GRAPHIC
+%token		EDIF_TOK_INDUCTANCE
+%token		EDIF_TOK_INOUT
+%token		EDIF_TOK_INPUT
+%token		EDIF_TOK_LOGICMODEL
+%token		EDIF_TOK_LOWERCENTER
+%token		EDIF_TOK_LOWERLEFT
+%token		EDIF_TOK_LOWERRIGHT
+%token		EDIF_TOK_MASKLAYOUT
+%token		EDIF_TOK_MASS
+%token		EDIF_TOK_MEASURED
+%token		EDIF_TOK_MX
+%token		EDIF_TOK_MXR90
+%token		EDIF_TOK_MY
+%token		EDIF_TOK_MYR90
+%token		EDIF_TOK_NETLIST
+%token		EDIF_TOK_OUTPUT
+%token		EDIF_TOK_PCBLAYOUT
+%token		EDIF_TOK_POWER
+%token		EDIF_TOK_R0
+%token		EDIF_TOK_R180
+%token		EDIF_TOK_R270
+%token		EDIF_TOK_R90
+%token		EDIF_TOK_REQUIRED
+%token		EDIF_TOK_RESISTANCE
+%token		EDIF_TOK_RIPPER
+%token		EDIF_TOK_ROUND
+%token		EDIF_TOK_SCHEMATIC
+%token		EDIF_TOK_STRANGER
+%token		EDIF_TOK_SYMBOLIC
+%token		EDIF_TOK_TEMPERATURE
+%token		EDIF_TOK_TIE
+%token		EDIF_TOK_TIME
+%token		EDIF_TOK_TRUNCATE
+%token		EDIF_TOK_UPPERCENTER
+%token		EDIF_TOK_UPPERLEFT
+%token		EDIF_TOK_UPPERRIGHT
+%token		EDIF_TOK_VOLTAGE
+
+%token		EDIF_TOK_ACLOAD
+%token		EDIF_TOK_AFTER
+%token		EDIF_TOK_ANNOTATE
+%token		EDIF_TOK_APPLY
+%token		EDIF_TOK_ARC
+%token		EDIF_TOK_ARRAY
+%token		EDIF_TOK_ARRAYMACRO
+%token		EDIF_TOK_ARRAYRELATEDINFO
+%token		EDIF_TOK_ARRAYSITE
+%token		EDIF_TOK_ATLEAST
+%token		EDIF_TOK_ATMOST
+%token		EDIF_TOK_AUTHOR
+%token		EDIF_TOK_BASEARRAY
+%token		EDIF_TOK_BECOMES
+%token		EDIF_TOK_BETWEEN
+%token		EDIF_TOK_BOOLEAN
+%token		EDIF_TOK_BOOLEANDISPLAY
+%token		EDIF_TOK_BOOLEANMAP
+%token		EDIF_TOK_BORDERPATTERN
+%token		EDIF_TOK_BORDERWIDTH
+%token		EDIF_TOK_BOUNDINGBOX
+%token		EDIF_TOK_CELL
+%token		EDIF_TOK_CELLREF
+%token		EDIF_TOK_CELLTYPE
+%token		EDIF_TOK_CHANGE
+%token		EDIF_TOK_CIRCLE
+%token		EDIF_TOK_COLOR
+%token		EDIF_TOK_COMMENT
+%token		EDIF_TOK_COMMENTGRAPHICS
+%token		EDIF_TOK_COMPOUND
+%token		EDIF_TOK_CONNECTLOCATION
+%token		EDIF_TOK_CONTENTS
+%token		EDIF_TOK_CORNERTYPE
+%token		EDIF_TOK_CRITICALITY
+%token		EDIF_TOK_CURRENTMAP
+%token		EDIF_TOK_CURVE
+%token		EDIF_TOK_CYCLE
+%token		EDIF_TOK_DATAORIGIN
+%token		EDIF_TOK_DCFANINLOAD
+%token		EDIF_TOK_DCFANOUTLOAD
+%token		EDIF_TOK_DCMAXFANIN
+%token		EDIF_TOK_DCMAXFANOUT
+%token		EDIF_TOK_DELAY
+%token		EDIF_TOK_DELTA
+%token		EDIF_TOK_DERIVATION
+%token		EDIF_TOK_DESIGN
+%token		EDIF_TOK_DESIGNATOR
+%token		EDIF_TOK_DIFFERENCE
+%token		EDIF_TOK_DIRECTION
+%token		EDIF_TOK_DISPLAY
+%token		EDIF_TOK_DOMINATES
+%token		EDIF_TOK_DOT
+%token		EDIF_TOK_DURATION
+%token		EDIF_TOK_E
+%token		EDIF_TOK_EDIF
+%token		EDIF_TOK_EDIFLEVEL
+%token		EDIF_TOK_EDIFVERSION
+%token		EDIF_TOK_ENCLOSUREDISTANCE
+%token		EDIF_TOK_ENDTYPE
+%token		EDIF_TOK_ENTRY
+%token		EDIF_TOK_EVENT
+%token		EDIF_TOK_EXACTLY
+%token		EDIF_TOK_EXTERNAL
+%token		EDIF_TOK_FABRICATE
+%token		EDIF_TOK_FALSE
+%token		EDIF_TOK_FIGURE
+%token		EDIF_TOK_FIGUREAREA
+%token		EDIF_TOK_FIGUREGROUP
+%token		EDIF_TOK_FIGUREGROUPOBJECT
+%token		EDIF_TOK_FIGUREGROUPOVERRIDE
+%token		EDIF_TOK_FIGUREGROUPREF
+%token		EDIF_TOK_FIGUREPERIMETER
+%token		EDIF_TOK_FIGUREWIDTH
+%token		EDIF_TOK_FILLPATTERN
+%token		EDIF_TOK_FOLLOW
+%token		EDIF_TOK_FORBIDDENEVENT
+%token		EDIF_TOK_GLOBALPORTREF
+%token		EDIF_TOK_GREATERTHAN
+%token		EDIF_TOK_GRIDMAP
+%token		EDIF_TOK_IGNORE
+%token		EDIF_TOK_INCLUDEFIGUREGROUP
+%token		EDIF_TOK_INITIAL
+%token		EDIF_TOK_INSTANCE
+%token		EDIF_TOK_INSTANCEBACKANNOTATE
+%token		EDIF_TOK_INSTANCEGROUP
+%token		EDIF_TOK_INSTANCEMAP
+%token		EDIF_TOK_INSTANCEREF
+%token		EDIF_TOK_INTEGER
+%token		EDIF_TOK_INTEGERDISPLAY
+%token		EDIF_TOK_INTERFACE
+%token		EDIF_TOK_INTERFIGUREGROUPSPACING
+%token		EDIF_TOK_INTERSECTION
+%token		EDIF_TOK_INTRAFIGUREGROUPSPACING
+%token		EDIF_TOK_INVERSE
+%token		EDIF_TOK_ISOLATED
+%token		EDIF_TOK_JOINED
+%token		EDIF_TOK_JUSTIFY
+%token		EDIF_TOK_KEYWORDDISPLAY
+%token		EDIF_TOK_KEYWORDLEVEL
+%token		EDIF_TOK_KEYWORDMAP
+%token		EDIF_TOK_LESSTHAN
+%token		EDIF_TOK_LIBRARY
+%token		EDIF_TOK_LIBRARYREF
+%token		EDIF_TOK_LISTOFNETS
+%token		EDIF_TOK_LISTOFPORTS
+%token		EDIF_TOK_LOADDELAY
+%token		EDIF_TOK_LOGICASSIGN
+%token		EDIF_TOK_LOGICINPUT
+%token		EDIF_TOK_LOGICLIST
+%token		EDIF_TOK_LOGICMAPINPUT
+%token		EDIF_TOK_LOGICMAPOUTPUT
+%token		EDIF_TOK_LOGICONEOF
+%token		EDIF_TOK_LOGICOUTPUT
+%token		EDIF_TOK_LOGICPORT
+%token		EDIF_TOK_LOGICREF
+%token		EDIF_TOK_LOGICVALUE
+%token		EDIF_TOK_LOGICWAVEFORM
+%token		EDIF_TOK_MAINTAIN
+%token		EDIF_TOK_MATCH
+%token		EDIF_TOK_MEMBER
+%token		EDIF_TOK_MINOMAX
+%token		EDIF_TOK_MINOMAXDISPLAY
+%token		EDIF_TOK_MNM
+%token		EDIF_TOK_MULTIPLEVALUESET
+%token		EDIF_TOK_MUSTJOIN
+%token		EDIF_TOK_NAME
+%token		EDIF_TOK_NET
+%token		EDIF_TOK_NETBACKANNOTATE
+%token		EDIF_TOK_NETBUNDLE
+%token		EDIF_TOK_NETDELAY
+%token		EDIF_TOK_NETGROUP
+%token		EDIF_TOK_NETMAP
+%token		EDIF_TOK_NETREF
+%token		EDIF_TOK_NOCHANGE
+%token		EDIF_TOK_NONPERMUTABLE
+%token		EDIF_TOK_NOTALLOWED
+%token		EDIF_TOK_NOTCHSPACING
+%token		EDIF_TOK_NUMBER
+%token		EDIF_TOK_NUMBERDEFINITION
+%token		EDIF_TOK_NUMBERDISPLAY
+%token		EDIF_TOK_OFFPAGECONNECTOR
+%token		EDIF_TOK_OFFSETEVENT
+%token		EDIF_TOK_OPENSHAPE
+%token		EDIF_TOK_ORIENTATION
+%token		EDIF_TOK_ORIGIN
+%token		EDIF_TOK_OVERHANGDISTANCE
+%token		EDIF_TOK_OVERLAPDISTANCE
+%token		EDIF_TOK_OVERSIZE
+%token		EDIF_TOK_OWNER
+%token		EDIF_TOK_PAGE
+%token		EDIF_TOK_PAGESIZE
+%token		EDIF_TOK_PARAMETER
+%token		EDIF_TOK_PARAMETERASSIGN
+%token		EDIF_TOK_PARAMETERDISPLAY
+%token		EDIF_TOK_PATH
+%token		EDIF_TOK_PATHDELAY
+%token		EDIF_TOK_PATHWIDTH
+%token		EDIF_TOK_PERMUTABLE
+%token		EDIF_TOK_PHYSICALDESIGNRULE
+%token		EDIF_TOK_PLUG
+%token		EDIF_TOK_POINT
+%token		EDIF_TOK_POINTDISPLAY
+%token		EDIF_TOK_POINTLIST
+%token		EDIF_TOK_POLYGON
+%token		EDIF_TOK_PORT
+%token		EDIF_TOK_PORTBACKANNOTATE
+%token		EDIF_TOK_PORTBUNDLE
+%token		EDIF_TOK_PORTDELAY
+%token		EDIF_TOK_PORTGROUP
+%token		EDIF_TOK_PORTIMPLEMENTATION
+%token		EDIF_TOK_PORTINSTANCE
+%token		EDIF_TOK_PORTLIST
+%token		EDIF_TOK_PORTLISTALIAS
+%token		EDIF_TOK_PORTMAP
+%token		EDIF_TOK_PORTREF
+%token		EDIF_TOK_PROGRAM
+%token		EDIF_TOK_PROPERTY
+%token		EDIF_TOK_PROPERTYDISPLAY
+%token		EDIF_TOK_PROTECTIONFRAME
+%token		EDIF_TOK_PT
+%token		EDIF_TOK_RANGEVECTOR
+%token		EDIF_TOK_RECTANGLE
+%token		EDIF_TOK_RECTANGLESIZE
+%token		EDIF_TOK_RENAME
+%token		EDIF_TOK_RESOLVES
+%token		EDIF_TOK_SCALE
+%token		EDIF_TOK_SCALEX
+%token		EDIF_TOK_SCALEY
+%token		EDIF_TOK_SECTION
+%token		EDIF_TOK_SHAPE
+%token		EDIF_TOK_SIMULATE
+%token		EDIF_TOK_SIMULATIONINFO
+%token		EDIF_TOK_SINGLEVALUESET
+%token		EDIF_TOK_SITE
+%token		EDIF_TOK_SOCKET
+%token		EDIF_TOK_SOCKETSET
+%token		EDIF_TOK_STATUS
+%token		EDIF_TOK_STEADY
+%token		EDIF_TOK_STRING
+%token		EDIF_TOK_STRINGDISPLAY
+%token		EDIF_TOK_STRONG
+%token		EDIF_TOK_SYMBOL
+%token		EDIF_TOK_SYMMETRY
+%token		EDIF_TOK_TABLE
+%token		EDIF_TOK_TABLEDEFAULT
+%token		EDIF_TOK_TECHNOLOGY
+%token		EDIF_TOK_TEXTHEIGHT
+%token		EDIF_TOK_TIMEINTERVAL
+%token		EDIF_TOK_TIMESTAMP
+%token		EDIF_TOK_TIMING
+%token		EDIF_TOK_TRANSFORM
+%token		EDIF_TOK_TRANSITION
+%token		EDIF_TOK_TRIGGER
+%token		EDIF_TOK_TRUE
+%token		EDIF_TOK_UNCONSTRAINED
+%token		EDIF_TOK_UNDEFINED
+%token		EDIF_TOK_UNION
+%token		EDIF_TOK_UNIT
+%token		EDIF_TOK_UNUSED
+%token		EDIF_TOK_USERDATA
+%token		EDIF_TOK_VERSION
+%token		EDIF_TOK_VIEW
+%token		EDIF_TOK_VIEWLIST
+%token		EDIF_TOK_VIEWMAP
+%token		EDIF_TOK_VIEWREF
+%token		EDIF_TOK_VIEWTYPE
+%token		EDIF_TOK_VISIBLE
+%token		EDIF_TOK_VOLTAGEMAP
+%token		EDIF_TOK_WAVEVALUE
+%token		EDIF_TOK_WEAK
+%token		EDIF_TOK_WEAKJOINED
+%token		EDIF_TOK_WHEN
+%token		EDIF_TOK_WRITTEN
+
+%start	Edif
+
+%%
+
+PopC :		')' { PopC(); }
+     ;
+
+Edif :		EDIF_TOK_EDIF EdifFileName EdifVersion EdifLevel KeywordMap _Edif PopC
+     ;
+
+_Edif :
+      |		_Edif Status
+      |		_Edif External
+      |		_Edif Library
+      |		_Edif Design
+      |		_Edif Comment
+      |		_Edif UserData
+      ;
+
+EdifFileName :	NameDef { str_pair_free($1); }
+	     ;
+
+EdifLevel :	EDIF_TOK_EDIFLEVEL Int PopC { free($2); }
+	  ;
+
+EdifVersion :	EDIF_TOK_EDIFVERSION Int Int Int PopC
+{ free($2); free($3); free($4); }
+	    ;
+
+AcLoad :	EDIF_TOK_ACLOAD _AcLoad PopC
+       ;
+
+_AcLoad :	MiNoMaValue
+	|	MiNoMaDisp
+	;
+
+After :		EDIF_TOK_AFTER _After PopC
+      ;
+
+_After :	MiNoMaValue
+       |	_After Follow
+       |	_After Maintain
+       |	_After LogicAssn
+       |	_After Comment
+       |	_After UserData
+       ;
+
+Annotate :	EDIF_TOK_ANNOTATE _Annotate PopC
+	 ;
+
+_Annotate :	Str { free($1); }
+	  |	StrDisplay
+	  ;
+
+Apply :		EDIF_TOK_APPLY _Apply PopC
+      ;
+
+_Apply :	Cycle
+       |	_Apply LogicIn
+       |	_Apply LogicOut
+       |	_Apply Comment
+       |	_Apply UserData
+       ;
+
+Arc :		EDIF_TOK_ARC PointValue PointValue PointValue PopC
+    ;
+
+Array :		EDIF_TOK_ARRAY NameDef Int _Array PopC { str_pair_free($2); free($3); }
+      ;
+
+_Array :
+       |	Int { free($1); }
+       ;
+
+ArrayMacro :	EDIF_TOK_ARRAYMACRO Plug PopC
+	   ;
+
+ArrayRelInfo :	EDIF_TOK_ARRAYRELATEDINFO _ArrayRelInfo PopC
+	     ;
+
+_ArrayRelInfo :	BaseArray
+	      |	ArraySite
+	      |	ArrayMacro
+	      |	_ArrayRelInfo Comment
+	      |	_ArrayRelInfo UserData
+	      ;
+
+ArraySite :	EDIF_TOK_ARRAYSITE Socket PopC
+	  ;
+
+AtLeast :	EDIF_TOK_ATLEAST ScaledInt PopC
+	;
+
+AtMost :	EDIF_TOK_ATMOST ScaledInt PopC
+       ;
+
+Author :	EDIF_TOK_AUTHOR Str PopC { free($2); }
+       ;
+
+BaseArray :	EDIF_TOK_BASEARRAY PopC
+	  ;
+
+Becomes :	EDIF_TOK_BECOMES _Becomes PopC
+	;
+
+_Becomes :	LogicNameRef
+	 |	LogicList
+	 |	LogicOneOf
+	 ;
+
+Between :	EDIF_TOK_BETWEEN __Between _Between PopC
+	;
+
+__Between :	AtLeast
+	  |	GreaterThan
+	  ;
+
+_Between :	AtMost
+	 |	LessThan
+	 ;
+
+Boolean :	EDIF_TOK_BOOLEAN _Boolean PopC
+	;
+
+_Boolean :
+	 |	_Boolean BooleanValue
+	 |	_Boolean BooleanDisp
+	 |	_Boolean Boolean
+	 ;
+
+BooleanDisp :	EDIF_TOK_BOOLEANDISPLAY _BooleanDisp PopC
+	    ;
+
+_BooleanDisp :	BooleanValue
+	     |	_BooleanDisp Display
+	     ;
+
+BooleanMap :	EDIF_TOK_BOOLEANMAP BooleanValue PopC
+	   ;
+
+BooleanValue :	True
+	     |	False
+	     ;
+
+BorderPat :	EDIF_TOK_BORDERPATTERN Int Int Boolean PopC { free($2); free($3); }
+	  ;
+
+BorderWidth :	EDIF_TOK_BORDERWIDTH Int PopC { free($2); }
+	    ;
+
+BoundBox :	EDIF_TOK_BOUNDINGBOX Rectangle PopC
+	 ;
+
+Cell :		EDIF_TOK_CELL CellNameDef _Cell PopC
+     ;
+
+_Cell :		CellType
+      |		_Cell Status
+      |		_Cell ViewMap
+      |		_Cell View
+      |		_Cell Comment
+      |		_Cell UserData
+      |		_Cell Property
+      ;
+
+CellNameDef :	NameDef { str_pair_free($1); }
+	    ;
+
+CellRef :	EDIF_TOK_CELLREF CellNameRef _CellRef PopC
+	;
+
+_CellRef :
+	 |	LibraryRef
+	 ;
+
+CellNameRef :	NameRef { free($1); }
+	    ;
+
+CellType :	EDIF_TOK_CELLTYPE _CellType PopC
+	 ;
+
+_CellType :	EDIF_TOK_TIE
+	  |	EDIF_TOK_RIPPER
+	  |	EDIF_TOK_GENERIC
+	  ;
+
+Change :	EDIF_TOK_CHANGE __Change _Change PopC
+       ;
+
+__Change :	PortNameRef
+	 |	PortRef { str_pair_free($1); }
+	 |	PortList
+	 ;
+
+_Change :
+	|	Becomes
+	|	Transition
+	;
+
+Circle :	EDIF_TOK_CIRCLE PointValue PointValue _Circle PopC
+       ;
+
+_Circle :
+	|	_Circle Property
+	;
+
+Color :		EDIF_TOK_COLOR ScaledInt ScaledInt ScaledInt PopC
+      ;
+
+Comment :	EDIF_TOK_COMMENT _Comment PopC
+	;
+
+_Comment :
+	 |	_Comment Str { free($2); }
+	 ;
+
+CommGraph :	EDIF_TOK_COMMENTGRAPHICS _CommGraph PopC
+          ;
+
+_CommGraph :
+	   |	_CommGraph Annotate
+	   |	_CommGraph Figure
+	   |	_CommGraph Instance
+	   |	_CommGraph BoundBox
+	   |	_CommGraph Property
+	   |	_CommGraph Comment
+	   |	_CommGraph UserData
+	   ;
+
+Compound :	EDIF_TOK_COMPOUND LogicNameRef PopC
+	 ;
+
+Contents :	EDIF_TOK_CONTENTS _Contents PopC
+	 ;
+
+_Contents :
+	  |	_Contents Instance
+	  |	_Contents OffPageConn
+	  |	_Contents Figure
+	  |	_Contents Section
+	  |	_Contents Net
+	  |	_Contents NetBundle
+	  |	_Contents Page
+	  |	_Contents CommGraph
+	  |	_Contents PortImpl
+	  |	_Contents Timing
+	  |	_Contents Simulate
+	  |	_Contents When
+	  |	_Contents Follow
+	  |	_Contents LogicPort
+	  |	_Contents BoundBox
+	  |	_Contents Comment
+	  |	_Contents UserData
+	  ;
+
+ConnectLoc :	EDIF_TOK_CONNECTLOCATION _ConnectLoc PopC
+	   ;
+
+_ConnectLoc :
+	    |	Figure
+	    ;
+
+CornerType :	EDIF_TOK_CORNERTYPE _CornerType PopC
+	   ;
+
+_CornerType :	EDIF_TOK_EXTEND
+	    |	EDIF_TOK_ROUND
+	    |	EDIF_TOK_TRUNCATE
+	    ;
+
+Criticality :	EDIF_TOK_CRITICALITY _Criticality PopC
+	    ;
+
+_Criticality :	Int { free($1); }
+	     |	IntDisplay
+	     ;
+
+CurrentMap :	EDIF_TOK_CURRENTMAP MiNoMaValue PopC
+	   ;
+
+Curve :		EDIF_TOK_CURVE _Curve PopC
+      ;
+
+_Curve :
+       |	_Curve Arc
+       |	_Curve PointValue
+       ;
+
+Cycle :		EDIF_TOK_CYCLE Int _Cycle PopC { free($2); }
+      ;
+
+_Cycle :
+       |	Duration
+       ;
+
+DataOrigin :	EDIF_TOK_DATAORIGIN Str _DataOrigin PopC { free($2); }
+	   ;
+
+_DataOrigin :
+	    |	Version
+	    ;
+
+DcFanInLoad :	EDIF_TOK_DCFANINLOAD _DcFanInLoad PopC
+	    ;
+
+_DcFanInLoad :	ScaledInt
+	     |	NumbDisplay
+	     ;
+
+DcFanOutLoad :	EDIF_TOK_DCFANOUTLOAD _DcFanOutLoad PopC
+	     ;
+
+_DcFanOutLoad :	ScaledInt
+	      |	NumbDisplay
+	      ;
+
+DcMaxFanIn :	EDIF_TOK_DCMAXFANIN _DcMaxFanIn PopC
+	   ;
+
+_DcMaxFanIn :	ScaledInt
+	    |	NumbDisplay
+	    ;
+
+DcMaxFanOut :	EDIF_TOK_DCMAXFANOUT _DcMaxFanOut PopC
+	    ;
+
+_DcMaxFanOut :	ScaledInt
+	     |	NumbDisplay
+	     ;
+
+Delay :		EDIF_TOK_DELAY _Delay PopC
+      ;
+
+_Delay :	MiNoMaValue
+       |	MiNoMaDisp
+       ;
+
+Delta :		EDIF_TOK_DELTA _Delta PopC
+      ;
+
+_Delta :
+       |	_Delta PointValue
+       ;
+
+Derivation :	EDIF_TOK_DERIVATION _Derivation PopC
+	   ;
+
+_Derivation :	EDIF_TOK_CALCULATED
+	    |	EDIF_TOK_MEASURED
+	    |	EDIF_TOK_REQUIRED
+	    ;
+
+Design :	EDIF_TOK_DESIGN DesignNameDef _Design PopC
+       ;
+
+_Design :	CellRef
+	|	_Design Status
+	|	_Design Comment
+	|	_Design Property
+	|	_Design UserData
+	;
+
+Designator :	EDIF_TOK_DESIGNATOR _Designator PopC
+	   ;
+
+_Designator :	Str { free($1); }
+	    |	StrDisplay
+	    ;
+
+DesignNameDef :	NameDef { str_pair_free($1); }
+	      ;
+
+DesignRule :	EDIF_TOK_PHYSICALDESIGNRULE _DesignRule PopC
+	   ;
+
+_DesignRule :
+	    |	_DesignRule FigureWidth
+	    |	_DesignRule FigureArea
+	    |	_DesignRule RectSize
+	    |	_DesignRule FigurePerim
+	    |	_DesignRule OverlapDist
+	    |	_DesignRule OverhngDist
+	    |	_DesignRule EncloseDist
+	    |	_DesignRule InterFigGrp
+	    |	_DesignRule IntraFigGrp
+	    |	_DesignRule NotchSpace
+	    |	_DesignRule NotAllowed
+	    |	_DesignRule FigGrp
+	    |	_DesignRule Comment
+	    |	_DesignRule UserData
+	    ;
+
+Difference :	EDIF_TOK_DIFFERENCE _Difference PopC
+	   ;
+
+_Difference :	FigGrpRef
+	    |	FigureOp
+	    |	_Difference FigGrpRef
+	    |	_Difference FigureOp
+	    ;
+
+Direction :	EDIF_TOK_DIRECTION _Direction PopC
+	  ;
+
+_Direction :	EDIF_TOK_INOUT
+	   |	EDIF_TOK_INPUT
+	   |	EDIF_TOK_OUTPUT
+	   ;
+
+Display :	EDIF_TOK_DISPLAY _Display _DisplayJust _DisplayOrien _DisplayOrg PopC
+	;
+
+_Display :	FigGrpNameRef
+	 |	FigGrpOver
+	 ;
+
+_DisplayJust :
+	     |	Justify
+	     ;
+
+_DisplayOrien :
+	      |	Orientation
+	      ;
+
+_DisplayOrg :
+	    |	Origin
+	    ;
+
+Dominates :	EDIF_TOK_DOMINATES _Dominates PopC
+	  ;
+
+_Dominates :
+	   |	_Dominates LogicNameRef
+	   ;
+
+Dot :		EDIF_TOK_DOT _Dot PopC
+    ;
+
+_Dot :		PointValue
+     |		_Dot Property
+     ;
+
+Duration :	EDIF_TOK_DURATION ScaledInt PopC
+	 ;
+
+EncloseDist :	EDIF_TOK_ENCLOSUREDISTANCE RuleNameDef FigGrpObj FigGrpObj _EncloseDist
+		PopC
+	    ;
+
+_EncloseDist :	Range
+	     |	SingleValSet
+	     |	_EncloseDist Comment
+	     |	_EncloseDist UserData
+	     ;
+
+EndType :	EDIF_TOK_ENDTYPE _EndType PopC
+	;
+
+_EndType :	EDIF_TOK_EXTEND
+	 |	EDIF_TOK_ROUND
+	 |	EDIF_TOK_TRUNCATE
+	 ;
+
+Entry :		EDIF_TOK_ENTRY ___Entry __Entry _Entry
+		PopC
+      ;
+
+___Entry :	Match
+	 |	Change
+	 |	Steady
+	 ;
+
+__Entry :	LogicRef
+	|	PortRef { str_pair_free($1); }
+	|	NoChange
+	|	Table
+	;
+
+_Entry :
+       |	Delay
+       |	LoadDelay
+       ;
+
+Event :		EDIF_TOK_EVENT _Event PopC
+      ;
+
+_Event :	PortRef { str_pair_free($1); }
+       |	PortList
+       |	PortGroup
+       |	NetRef
+       |	NetGroup
+       |	_Event Transition
+       |	_Event Becomes
+       ;
+
+Exactly :	EDIF_TOK_EXACTLY ScaledInt PopC
+	;
+
+External :	EDIF_TOK_EXTERNAL LibNameDef EdifLevel _External PopC
+	 ;
+
+_External :	Technology
+	  |	_External Status
+	  |	_External Cell
+	  |	_External Comment
+	  |	_External UserData
+	  ;
+
+Fabricate :	EDIF_TOK_FABRICATE LayerNameDef FigGrpNameRef PopC
+	  ;
+
+False :		EDIF_TOK_FALSE PopC
+      ;
+
+FigGrp :	EDIF_TOK_FIGUREGROUP _FigGrp PopC
+       ;
+
+_FigGrp :	FigGrpNameDef
+	|	_FigGrp CornerType
+	|	_FigGrp EndType
+	|	_FigGrp PathWidth
+	|	_FigGrp BorderWidth
+	|	_FigGrp Color
+	|	_FigGrp FillPattern
+	|	_FigGrp BorderPat
+	|	_FigGrp TextHeight
+	|	_FigGrp Visible
+	|	_FigGrp Comment
+	|	_FigGrp Property
+	|	_FigGrp UserData
+	|	_FigGrp IncFigGrp
+	;
+
+FigGrpNameDef :	NameDef { str_pair_free($1); }
+	      ;
+
+FigGrpNameRef :	NameRef { free($1); }
+	      ;
+
+FigGrpObj :	EDIF_TOK_FIGUREGROUPOBJECT _FigGrpObj PopC
+	  ;
+
+_FigGrpObj :	FigGrpNameRef
+	   |	FigGrpRef
+	   |	FigureOp
+	   ;
+
+FigGrpOver :	EDIF_TOK_FIGUREGROUPOVERRIDE _FigGrpOver PopC
+	   ;
+
+_FigGrpOver :	FigGrpNameRef
+	    |	_FigGrpOver CornerType
+	    |	_FigGrpOver EndType
+	    |	_FigGrpOver PathWidth
+	    |	_FigGrpOver BorderWidth
+	    |	_FigGrpOver Color
+	    |	_FigGrpOver FillPattern
+	    |	_FigGrpOver BorderPat
+	    |	_FigGrpOver TextHeight
+	    |	_FigGrpOver Visible
+	    |	_FigGrpOver Comment
+	    |	_FigGrpOver Property
+	    |	_FigGrpOver UserData
+	    ;
+
+FigGrpRef :	EDIF_TOK_FIGUREGROUPREF FigGrpNameRef _FigGrpRef PopC
+	  ;
+
+_FigGrpRef :
+	   |	LibraryRef
+	   ;
+
+Figure :	EDIF_TOK_FIGURE _Figure PopC
+       ;
+
+_Figure :	FigGrpNameDef
+	|	FigGrpOver
+	|	_Figure Circle
+	|	_Figure Dot
+	|	_Figure OpenShape
+	|	_Figure Path
+	|	_Figure Polygon
+	|	_Figure Rectangle
+	|	_Figure Shape
+	|	_Figure Comment
+	|	_Figure UserData
+	;
+
+FigureArea :	EDIF_TOK_FIGUREAREA RuleNameDef FigGrpObj _FigureArea PopC
+	   ;
+
+_FigureArea :	Range
+	    |	SingleValSet
+	    |	_FigureArea Comment
+	    |	_FigureArea UserData
+	    ;
+
+FigureOp :	Intersection
+	 |	Union
+	 |	Difference
+	 |	Inverse
+	 |	Oversize
+	 ;
+
+FigurePerim :	EDIF_TOK_FIGUREPERIMETER RuleNameDef FigGrpObj _FigurePerim PopC
+	    ;
+
+_FigurePerim :	Range
+	     |	SingleValSet
+	     |	_FigurePerim Comment
+	     |	_FigurePerim UserData
+	     ;
+
+FigureWidth :	EDIF_TOK_FIGUREWIDTH RuleNameDef FigGrpObj _FigureWidth PopC
+	    ;
+
+_FigureWidth :	Range
+	     |	SingleValSet
+	     |	_FigureWidth Comment
+	     |	_FigureWidth UserData
+	     ;
+
+FillPattern :	EDIF_TOK_FILLPATTERN Int Int Boolean PopC { free($2); free($3); }
+	    ;
+
+Follow :	EDIF_TOK_FOLLOW __Follow _Follow PopC
+       ;
+
+__Follow :	PortNameRef
+	 |	PortRef { str_pair_free($1); }
+	 ;
+
+_Follow :	PortRef { str_pair_free($1); }
+	|	Table
+	|	_Follow Delay
+	|	_Follow LoadDelay
+	;
+
+Forbidden :	EDIF_TOK_FORBIDDENEVENT _Forbidden PopC
+	  ;
+
+_Forbidden :	TimeIntval
+	   |	_Forbidden Event
+	   ;
+
+Form :		Keyword _Form ')' { free($1); }
+     ;
+
+_Form :
+      |		_Form Int { free($2); }
+      |		_Form Str { free($2); }
+      |		_Form Ident { free($2); }
+      |		_Form Form
+      ;
+
+GlobPortRef :	EDIF_TOK_GLOBALPORTREF PortNameRef PopC
+	    ;
+
+GreaterThan :	EDIF_TOK_GREATERTHAN ScaledInt PopC
+	    ;
+
+GridMap :	EDIF_TOK_GRIDMAP ScaledInt ScaledInt PopC
+	;
+
+Ignore :	EDIF_TOK_IGNORE PopC
+       ;
+
+IncFigGrp :	EDIF_TOK_INCLUDEFIGUREGROUP _IncFigGrp PopC
+	  ;
+
+_IncFigGrp :	FigGrpRef
+	   |	FigureOp
+	   ;
+
+Initial :	EDIF_TOK_INITIAL PopC
+	;
+
+Instance :	EDIF_TOK_INSTANCE InstNameDef _Instance PopC
+	 ;
+
+_Instance :	ViewRef
+	  |	ViewList
+	  |	_Instance Transform
+	  |	_Instance ParamAssign
+	  |	_Instance PortInst
+	  |	_Instance Timing
+	  |	_Instance Designator
+	  |	_Instance Property
+	  |	_Instance Comment
+	  |	_Instance UserData
+	  ;
+
+InstanceRef :	EDIF_TOK_INSTANCEREF InstNameRef _InstanceRef PopC { $$=$2; }
+	    ;
+
+_InstanceRef :
+|	InstanceRef { free($1); }
+	     |	ViewRef
+	     ;
+
+InstBackAn :	EDIF_TOK_INSTANCEBACKANNOTATE _InstBackAn PopC
+	   ;
+
+_InstBackAn :	InstanceRef { free($1); }
+	    |	_InstBackAn Designator
+	    |	_InstBackAn Timing
+	    |	_InstBackAn Property
+	    |	_InstBackAn Comment
+	    ;
+
+InstGroup :	EDIF_TOK_INSTANCEGROUP _InstGroup PopC
+	  ;
+
+_InstGroup :
+	   |	_InstGroup InstanceRef { free($2); }
+	   ;
+
+InstMap :	EDIF_TOK_INSTANCEMAP _InstMap PopC
+	;
+
+_InstMap :
+	 |	_InstMap InstanceRef { free($2); }
+	 |	_InstMap InstGroup
+	 |	_InstMap Comment
+	 |	_InstMap UserData
+	 ;
+
+InstNameDef :	NameDef { str_pair_free($1); }
+	    |	Array
+	    ;
+
+InstNameRef :	NameRef { $$=$1; }
+	    |	Member
+	    ;
+
+IntDisplay :	EDIF_TOK_INTEGERDISPLAY _IntDisplay PopC
+	   ;
+
+_IntDisplay :	Int { free($1); }
+	    |	_IntDisplay Display
+	    ;
+
+Integer :	EDIF_TOK_INTEGER _Integer PopC
+	;
+
+_Integer :
+	 |	_Integer Int { free($2); }
+	 |	_Integer IntDisplay
+	 |	_Integer Integer
+	 ;
+
+Interface :	EDIF_TOK_INTERFACE _Interface PopC
+	  ;
+
+_Interface :
+	   |	_Interface Port
+	   |	_Interface PortBundle
+	   |	_Interface Symbol
+	   |	_Interface ProtectFrame
+	   |	_Interface ArrayRelInfo
+	   |	_Interface Parameter
+	   |	_Interface Joined { pair_list_free($2); }
+	   |	_Interface MustJoin
+	   |	_Interface WeakJoined
+	   |	_Interface Permutable
+	   |	_Interface Timing
+	   |	_Interface Simulate
+	   |	_Interface Designator
+	   |	_Interface Property
+	   |	_Interface Comment
+	   |	_Interface UserData
+	   ;
+
+InterFigGrp :	EDIF_TOK_INTERFIGUREGROUPSPACING RuleNameDef FigGrpObj FigGrpObj
+		_InterFigGrp PopC
+	    ;
+
+_InterFigGrp :	Range
+	     |	SingleValSet
+	     |	_InterFigGrp Comment
+	     |	_InterFigGrp UserData
+	     ;
+
+Intersection :	EDIF_TOK_INTERSECTION _Intersection PopC
+	     ;
+
+_Intersection :	FigGrpRef
+	      |	FigureOp
+	      |	_Intersection FigGrpRef
+	      |	_Intersection FigureOp
+	      ;
+
+IntraFigGrp :	EDIF_TOK_INTRAFIGUREGROUPSPACING RuleNameDef FigGrpObj _IntraFigGrp PopC
+	    ;
+
+_IntraFigGrp :	Range
+	     |	SingleValSet
+	     |	_IntraFigGrp Comment
+	     |	_IntraFigGrp UserData
+	     ;
+
+Inverse :	EDIF_TOK_INVERSE _Inverse PopC
+	;
+
+_Inverse :	FigGrpRef
+	 |	FigureOp
+	 ;
+
+Isolated :	EDIF_TOK_ISOLATED PopC
+	 ;
+
+Joined :	EDIF_TOK_JOINED _Joined PopC { $$ = new_pair_list($2); }
+       ;
+
+_Joined : { $$=NULL; }
+|	_Joined PortRef { $2->next = $1; $$ = $2; }
+	|	_Joined PortList
+	|	_Joined GlobPortRef
+	;
+
+Justify :	EDIF_TOK_JUSTIFY _Justify PopC
+	;
+
+_Justify :	EDIF_TOK_CENTERCENTER
+	 |	EDIF_TOK_CENTERLEFT
+	 |	EDIF_TOK_CENTERRIGHT
+	 |	EDIF_TOK_LOWERCENTER
+	 |	EDIF_TOK_LOWERLEFT
+	 |	EDIF_TOK_LOWERRIGHT
+	 |	EDIF_TOK_UPPERCENTER
+	 |	EDIF_TOK_UPPERLEFT
+	 |	EDIF_TOK_UPPERRIGHT
+	 ;
+
+KeywordDisp :	EDIF_TOK_KEYWORDDISPLAY _KeywordDisp PopC
+	    ;
+
+_KeywordDisp :	KeywordName
+	     |	_KeywordDisp Display
+	     ;
+
+KeywordLevel :	EDIF_TOK_KEYWORDLEVEL Int PopC { free($2); }
+	     ;
+
+KeywordMap :	EDIF_TOK_KEYWORDMAP _KeywordMap PopC
+	   ;
+
+_KeywordMap :	KeywordLevel
+	    |	_KeywordMap Comment
+	    ;
+
+KeywordName :	Ident { free($1); }
+	    ;
+
+LayerNameDef :	NameDef { str_pair_free($1); }
+	     ;
+
+LessThan :	EDIF_TOK_LESSTHAN ScaledInt PopC
+	 ;
+
+LibNameDef :	NameDef { str_pair_free($1); }
+	   ;
+
+LibNameRef :	NameRef { free($1); }
+	   ;
+
+Library :	EDIF_TOK_LIBRARY LibNameDef EdifLevel _Library PopC
+	;
+
+_Library :	Technology
+	 |	_Library Status
+	 |	_Library Cell
+	 |	_Library Comment
+	 |	_Library UserData
+	 ;
+
+LibraryRef :	EDIF_TOK_LIBRARYREF LibNameRef PopC
+	   ;
+
+ListOfNets :	EDIF_TOK_LISTOFNETS _ListOfNets PopC
+	   ;
+
+_ListOfNets :
+	    |	_ListOfNets Net
+	    ;
+
+ListOfPorts :	EDIF_TOK_LISTOFPORTS _ListOfPorts PopC
+	    ;
+
+_ListOfPorts :
+	     |	_ListOfPorts Port
+	     |	_ListOfPorts PortBundle
+	     ;
+
+LoadDelay :	EDIF_TOK_LOADDELAY _LoadDelay _LoadDelay PopC
+	  ;
+
+_LoadDelay :	MiNoMaValue
+	   |	MiNoMaDisp
+	   ;
+
+LogicAssn :	EDIF_TOK_LOGICASSIGN ___LogicAssn __LogicAssn _LogicAssn PopC
+	  ;
+
+___LogicAssn :	PortNameRef
+	     |	PortRef { str_pair_free($1); }
+	     ;
+
+__LogicAssn :	PortRef { str_pair_free($1); }
+	    |	LogicRef
+	    |	Table
+	    ;
+
+_LogicAssn :
+	   |	Delay
+	   |	LoadDelay
+	   ;
+
+LogicIn :	EDIF_TOK_LOGICINPUT _LogicIn PopC
+	;
+
+_LogicIn :	PortList
+	 |	PortRef { str_pair_free($1); }
+	 |	PortNameRef
+	 |	_LogicIn LogicWave
+	 ;
+
+LogicList :	EDIF_TOK_LOGICLIST _LogicList PopC
+	  ;
+
+_LogicList :
+	   |	_LogicList LogicNameRef
+	   |	_LogicList LogicOneOf
+	   |	_LogicList Ignore
+	   ;
+
+LogicMapIn :	EDIF_TOK_LOGICMAPINPUT _LogicMapIn PopC
+	   ;
+
+_LogicMapIn :
+	    |	_LogicMapIn LogicNameRef
+	    ;
+
+LogicMapOut :	EDIF_TOK_LOGICMAPOUTPUT _LogicMapOut PopC
+	    ;
+
+_LogicMapOut :
+	     |	_LogicMapOut LogicNameRef
+	     ;
+
+LogicNameDef :	NameDef { str_pair_free($1); }
+	     ;
+
+LogicNameRef :	NameRef { free($1); }
+	     ;
+
+LogicOneOf :	EDIF_TOK_LOGICONEOF _LogicOneOf PopC
+	   ;
+
+_LogicOneOf :
+	    |	_LogicOneOf LogicNameRef
+	    |	_LogicOneOf LogicList
+	    ;
+
+LogicOut :	EDIF_TOK_LOGICOUTPUT _LogicOut PopC
+	 ;
+
+_LogicOut :	PortList
+	  |	PortRef { str_pair_free($1); }
+	  |	PortNameRef
+	  |	_LogicOut LogicWave
+	  ;
+
+LogicPort :	EDIF_TOK_LOGICPORT _LogicPort PopC
+	  ;
+
+_LogicPort :	PortNameDef
+	   |	_LogicPort Property
+	   |	_LogicPort Comment
+	   |	_LogicPort UserData
+	   ;
+
+LogicRef :	EDIF_TOK_LOGICREF LogicNameRef _LogicRef PopC
+	 ;
+
+_LogicRef :
+	  |	LibraryRef
+	  ;
+
+LogicValue :	EDIF_TOK_LOGICVALUE _LogicValue PopC
+	   ;
+
+_LogicValue :	LogicNameDef
+	    |	_LogicValue VoltageMap
+	    |	_LogicValue CurrentMap
+	    |	_LogicValue BooleanMap
+	    |	_LogicValue Compound
+	    |	_LogicValue Weak
+	    |	_LogicValue Strong
+	    |	_LogicValue Dominates
+	    |	_LogicValue LogicMapOut
+	    |	_LogicValue LogicMapIn
+	    |	_LogicValue Isolated
+	    |	_LogicValue Resolves
+	    |	_LogicValue Property
+	    |	_LogicValue Comment
+	    |	_LogicValue UserData
+	    ;
+
+LogicWave :	EDIF_TOK_LOGICWAVEFORM _LogicWave PopC
+	  ;
+
+_LogicWave :
+	   |	_LogicWave LogicNameRef
+	   |	_LogicWave LogicList
+	   |	_LogicWave LogicOneOf
+	   |	_LogicWave Ignore
+	   ;
+
+Maintain :	EDIF_TOK_MAINTAIN __Maintain _Maintain PopC
+	 ;
+
+__Maintain :	PortNameRef
+	   |	PortRef { str_pair_free($1); }
+	   ;
+
+_Maintain :
+	  |	Delay
+	  |	LoadDelay
+	  ;
+
+Match :		EDIF_TOK_MATCH __Match _Match PopC
+      ;
+
+__Match :	PortNameRef
+	|	PortRef { str_pair_free($1); }
+	|	PortList
+	;
+
+_Match :	LogicNameRef
+       |	LogicList
+       |	LogicOneOf
+       ;
+
+Member :	EDIF_TOK_MEMBER NameRef _Member PopC  { free($2); }
+       ;
+
+_Member :	Int { free($1); }
+	|	_Member Int { free($2); }
+	;
+
+MiNoMa :	EDIF_TOK_MINOMAX _MiNoMa PopC
+       ;
+
+_MiNoMa :
+	|	_MiNoMa MiNoMaValue
+	|	_MiNoMa MiNoMaDisp
+	|	_MiNoMa MiNoMa
+	;
+
+MiNoMaDisp :	EDIF_TOK_MINOMAXDISPLAY _MiNoMaDisp PopC
+	   ;
+
+_MiNoMaDisp :	MiNoMaValue
+	    |	_MiNoMaDisp Display
+	    ;
+
+MiNoMaValue :	Mnm
+	    |	ScaledInt
+	    ;
+
+Mnm :		EDIF_TOK_MNM _Mnm _Mnm _Mnm PopC
+    ;
+
+_Mnm :		ScaledInt
+     |		Undefined
+     |		Unconstrained
+     ;
+
+MultValSet :	EDIF_TOK_MULTIPLEVALUESET _MultValSet PopC
+	   ;
+
+_MultValSet :
+	    |	_MultValSet RangeVector
+	    ;
+
+MustJoin :	EDIF_TOK_MUSTJOIN _MustJoin PopC
+	 ;
+
+_MustJoin :
+	  |	_MustJoin PortRef { str_pair_free($2); }
+	  |	_MustJoin PortList
+	  |	_MustJoin WeakJoined
+	  |	_MustJoin Joined { pair_list_free($2); }
+	  ;
+
+Name :		EDIF_TOK_NAME _Name PopC { $$=$2; }
+     ;
+
+_Name :		Ident { $$=$1; }
+      |		_Name Display
+      ;
+
+NameDef :	Ident { $$ = new_str_pair($1,NULL); }
+	|	Name { $$ = new_str_pair($1,NULL); }
+|	Rename { $$=$1; }
+	;
+
+NameRef :	Ident { $$=$1; }
+	|	Name { $$=$1; }
+	;
+
+Net :		EDIF_TOK_NET NetNameDef _Net PopC { define_pcb_net($2, $3); }
+    ;
+
+_Net :		Joined { $$=$1; }
+     |		_Net Criticality
+     |		_Net NetDelay
+     |		_Net Figure
+     |		_Net Net
+     |		_Net Instance
+     |		_Net CommGraph
+     |		_Net Property
+     |		_Net Comment
+     |		_Net UserData
+     ;
+
+NetBackAn :	EDIF_TOK_NETBACKANNOTATE _NetBackAn PopC
+	  ;
+
+_NetBackAn :	NetRef
+	   |	_NetBackAn NetDelay
+	   |	_NetBackAn Criticality
+	   |	_NetBackAn Property
+	   |	_NetBackAn Comment
+	   ;
+
+NetBundle :	EDIF_TOK_NETBUNDLE NetNameDef _NetBundle PopC { str_pair_free($2); }
+	  ;
+
+_NetBundle :	ListOfNets
+	   |	_NetBundle Figure
+	   |	_NetBundle CommGraph
+	   |	_NetBundle Property
+	   |	_NetBundle Comment
+	   |	_NetBundle UserData
+	   ;
+
+NetDelay :	EDIF_TOK_NETDELAY Derivation _NetDelay PopC
+	 ;
+
+_NetDelay :	Delay
+	  |	_NetDelay Transition
+	  |	_NetDelay Becomes
+	  ;
+
+NetGroup :	EDIF_TOK_NETGROUP _NetGroup PopC
+	 ;
+
+_NetGroup :
+	  |	_NetGroup NetNameRef
+	  |	_NetGroup NetRef
+	  ;
+
+NetMap :	EDIF_TOK_NETMAP _NetMap PopC
+       ;
+
+_NetMap :
+	|	_NetMap NetRef
+	|	_NetMap NetGroup
+	|	_NetMap Comment
+	|	_NetMap UserData
+	;
+
+NetNameDef :	NameDef { $$=$1; }
+|	Array { $$=NULL; }
+
+	   ;
+
+NetNameRef :	NameRef { free($1); }
+	   |	Member
+	   ;
+
+NetRef :	EDIF_TOK_NETREF NetNameRef _NetRef PopC
+       ;
+
+_NetRef :
+	|	NetRef
+	|	InstanceRef { free($1); }
+	|	ViewRef
+	;
+
+NoChange :	EDIF_TOK_NOCHANGE PopC
+	 ;
+
+NonPermut :	EDIF_TOK_NONPERMUTABLE _NonPermut PopC
+	  ;
+
+_NonPermut :
+	   |	_NonPermut PortRef { str_pair_free($2); }
+	   |	_NonPermut Permutable
+	   ;
+
+NotAllowed :	EDIF_TOK_NOTALLOWED RuleNameDef _NotAllowed PopC
+	   ;
+
+_NotAllowed :	FigGrpObj
+	    |	_NotAllowed Comment
+	    |	_NotAllowed UserData
+	    ;
+
+NotchSpace :	EDIF_TOK_NOTCHSPACING RuleNameDef FigGrpObj _NotchSpace PopC
+	   ;
+
+_NotchSpace :	Range
+	    |	SingleValSet
+	    |	_NotchSpace Comment
+	    |	_NotchSpace UserData
+	    ;
+
+Number :	EDIF_TOK_NUMBER _Number PopC
+       ;
+
+_Number :
+	|	_Number ScaledInt
+	|	_Number NumbDisplay
+	|	_Number Number
+	;
+
+NumbDisplay :	EDIF_TOK_NUMBERDISPLAY _NumbDisplay PopC
+	    ;
+
+_NumbDisplay :	ScaledInt
+	     |	_NumbDisplay Display
+	     ;
+
+NumberDefn :	EDIF_TOK_NUMBERDEFINITION _NumberDefn PopC
+	   ;
+
+_NumberDefn :
+	    |	_NumberDefn Scale
+	    |	_NumberDefn GridMap
+	    |	_NumberDefn Comment
+	    ;
+
+OffPageConn :	EDIF_TOK_OFFPAGECONNECTOR _OffPageConn PopC
+	    ;
+
+_OffPageConn :	PortNameDef
+	     |	_OffPageConn Unused
+	     |	_OffPageConn Property
+	     |	_OffPageConn Comment
+	     |	_OffPageConn UserData
+	     ;
+
+OffsetEvent :	EDIF_TOK_OFFSETEVENT Event ScaledInt PopC
+	    ;
+
+OpenShape :	EDIF_TOK_OPENSHAPE _OpenShape PopC
+	  ;
+
+_OpenShape :	Curve
+	   |	_OpenShape Property
+	   ;
+
+Orientation :	EDIF_TOK_ORIENTATION _Orientation PopC
+	    ;
+
+_Orientation :	EDIF_TOK_R0
+	     |	EDIF_TOK_R90
+	     |	EDIF_TOK_R180
+	     |	EDIF_TOK_R270
+	     |	EDIF_TOK_MX
+	     |	EDIF_TOK_MY
+	     |	EDIF_TOK_MYR90
+	     |	EDIF_TOK_MXR90
+	     ;
+
+Origin :	EDIF_TOK_ORIGIN PointValue PopC
+       ;
+
+OverhngDist :	EDIF_TOK_OVERHANGDISTANCE RuleNameDef FigGrpObj FigGrpObj _OverhngDist
+		PopC
+	    ;
+
+_OverhngDist :	Range
+	     |	SingleValSet
+	     |	_OverhngDist Comment
+	     |	_OverhngDist UserData
+	     ;
+
+OverlapDist :	EDIF_TOK_OVERLAPDISTANCE RuleNameDef FigGrpObj FigGrpObj _OverlapDist
+		PopC
+	    ;
+
+_OverlapDist :	Range
+	     |	SingleValSet
+	     |	_OverlapDist Comment
+	     |	_OverlapDist UserData
+	     ;
+
+Oversize :	EDIF_TOK_OVERSIZE Int _Oversize CornerType PopC { free($2); }
+	 ;
+
+_Oversize :	FigGrpRef
+	  |	FigureOp
+	  ;
+
+Owner :		EDIF_TOK_OWNER Str PopC { free($2); }
+      ;
+
+Page :		EDIF_TOK_PAGE _Page PopC
+     ;
+
+_Page :		InstNameDef
+      |		_Page Instance
+      |		_Page Net
+      |		_Page NetBundle
+      |		_Page CommGraph
+      |		_Page PortImpl
+      |		_Page PageSize
+      |		_Page BoundBox
+      |		_Page Comment
+      |		_Page UserData
+      ;
+
+PageSize :	EDIF_TOK_PAGESIZE Rectangle PopC
+	 ;
+
+ParamDisp :	EDIF_TOK_PARAMETERDISPLAY _ParamDisp PopC
+	  ;
+
+_ParamDisp :	ValueNameRef
+	   |	_ParamDisp Display
+	   ;
+
+Parameter :	EDIF_TOK_PARAMETER ValueNameDef TypedValue _Parameter PopC
+	  ;
+
+_Parameter :
+	   |	Unit
+	   ;
+
+ParamAssign :	EDIF_TOK_PARAMETERASSIGN ValueNameRef TypedValue PopC
+	    ;
+
+Path :		EDIF_TOK_PATH _Path PopC
+     ;
+
+_Path :		PointList
+      |		_Path Property
+      ;
+
+PathDelay :	EDIF_TOK_PATHDELAY _PathDelay PopC
+	  ;
+
+_PathDelay :	Delay
+	   |	_PathDelay Event
+	   ;
+
+PathWidth :	EDIF_TOK_PATHWIDTH Int PopC { free($2); }
+	  ;
+
+Permutable :	EDIF_TOK_PERMUTABLE _Permutable PopC
+	   ;
+
+_Permutable :
+	    |	_Permutable PortRef { str_pair_free($2); }
+	    |	_Permutable Permutable
+	    |	_Permutable NonPermut
+	    ;
+
+Plug :		EDIF_TOK_PLUG _Plug PopC
+     ;
+
+_Plug :
+      |		_Plug SocketSet
+      ;
+
+Point :		EDIF_TOK_POINT _Point PopC
+      ;
+
+_Point :
+       |	_Point PointValue
+       |	_Point PointDisp
+       |	_Point Point
+       ;
+
+PointDisp :	EDIF_TOK_POINTDISPLAY _PointDisp PopC
+	  ;
+
+_PointDisp :	PointValue
+	   |	_PointDisp Display
+	   ;
+
+PointList :	EDIF_TOK_POINTLIST _PointList PopC
+	  ;
+
+_PointList :
+	   |	_PointList PointValue
+	   ;
+
+PointValue : 	EDIF_TOK_PT Int Int PopC { free($2); free($3); }
+	   ;
+
+Polygon :	EDIF_TOK_POLYGON _Polygon PopC
+	;
+
+_Polygon :	PointList
+	 |	_Polygon Property
+	 ;
+
+Port :		EDIF_TOK_PORT _Port PopC
+     ;
+
+_Port :		PortNameDef
+      |		_Port Direction
+      |		_Port Unused
+      |		_Port PortDelay
+      |		_Port Designator
+      |		_Port DcFanInLoad
+      |		_Port DcFanOutLoad
+      |		_Port DcMaxFanIn
+      |		_Port DcMaxFanOut
+      |		_Port AcLoad
+      |		_Port Property
+      |		_Port Comment
+      |		_Port UserData
+      ;
+
+PortBackAn :	EDIF_TOK_PORTBACKANNOTATE _PortBackAn PopC
+	   ;
+
+_PortBackAn :	PortRef { str_pair_free($1); }
+	    |	_PortBackAn Designator
+	    |	_PortBackAn PortDelay
+	    |	_PortBackAn DcFanInLoad
+	    |	_PortBackAn DcFanOutLoad
+	    |	_PortBackAn DcMaxFanIn
+	    |	_PortBackAn DcMaxFanOut
+	    |	_PortBackAn AcLoad
+	    |	_PortBackAn Property
+	    |	_PortBackAn Comment
+	    ;
+
+PortBundle :	EDIF_TOK_PORTBUNDLE PortNameDef _PortBundle PopC
+	   ;
+
+_PortBundle :	ListOfPorts
+	    |	_PortBundle Property
+	    |	_PortBundle Comment
+	    |	_PortBundle UserData
+	    ;
+
+PortDelay :	EDIF_TOK_PORTDELAY Derivation _PortDelay PopC
+	  ;
+
+_PortDelay :	Delay
+	   |	LoadDelay
+	   |	_PortDelay Transition
+	   |	_PortDelay Becomes
+	   ;
+
+PortGroup :	EDIF_TOK_PORTGROUP _PortGroup PopC
+	  ;
+
+_PortGroup :
+	   |	_PortGroup PortNameRef
+	   |	_PortGroup PortRef { str_pair_free($2); }
+	   ;
+
+PortImpl :	EDIF_TOK_PORTIMPLEMENTATION _PortImpl PopC
+	 ;
+
+_PortImpl :	PortRef { str_pair_free($1); }
+	  |	PortNameRef
+	  |	_PortImpl ConnectLoc
+	  |	_PortImpl Figure
+	  |	_PortImpl Instance
+	  |	_PortImpl CommGraph
+	  |	_PortImpl PropDisplay
+	  |	_PortImpl KeywordDisp
+	  |	_PortImpl Property
+	  |	_PortImpl UserData
+	  |	_PortImpl Comment
+	  ;
+
+PortInst :	EDIF_TOK_PORTINSTANCE _PortInst PopC
+	 ;
+
+_PortInst :	PortRef { str_pair_free($1); }
+	  |	PortNameRef
+	  |	_PortInst Unused
+	  |	_PortInst PortDelay
+	  |	_PortInst Designator
+	  |	_PortInst DcFanInLoad
+	  |	_PortInst DcFanOutLoad
+	  |	_PortInst DcMaxFanIn
+	  |	_PortInst DcMaxFanOut
+	  |	_PortInst AcLoad
+	  |	_PortInst Property
+	  |	_PortInst Comment
+	  |	_PortInst UserData
+	  ;
+
+PortList :	EDIF_TOK_PORTLIST _PortList PopC
+	 ;
+
+_PortList :
+	  |	_PortList PortRef { str_pair_free($2); }
+	  |	_PortList PortNameRef
+	  ;
+
+PortListAls :	EDIF_TOK_PORTLISTALIAS PortNameDef PortList PopC
+	    ;
+
+PortMap :	EDIF_TOK_PORTMAP _PortMap PopC
+	;
+
+_PortMap :
+	 |	_PortMap PortRef { str_pair_free($2); }
+	 |	_PortMap PortGroup
+	 |	_PortMap Comment
+	 |	_PortMap UserData
+	 ;
+
+PortNameDef :	NameDef { str_pair_free($1); }
+	    |	Array
+	    ;
+
+PortNameRef :	NameRef { $$=$1; }
+	    |	Member
+	    ;
+
+PortRef :	EDIF_TOK_PORTREF PortNameRef _PortRef PopC
+{
+    if ($3)
+    {
+	$$ = new_str_pair($3->str1,$2);
+	free($3);
+    }
+    else
+    {
+	/* handle port with no instance by passing up the chain */
+	$$ = new_str_pair(NULL,$2);
+    }
+}
+	;
+
+_PortRef : { $$=NULL; }
+	 |	PortRef { $$=$1; }
+	 |	InstanceRef { $$ = new_str_pair($1,NULL); }
+	 |	ViewRef { $$=NULL; }
+	 ;
+
+Program :	EDIF_TOK_PROGRAM Str _Program PopC
+	;
+
+_Program :
+	 |	Version
+	 ;
+
+PropDisplay :	EDIF_TOK_PROPERTYDISPLAY _PropDisplay PopC
+	    ;
+
+_PropDisplay :	PropNameRef
+	     |	_PropDisplay Display
+	     ;
+
+Property :	EDIF_TOK_PROPERTY PropNameDef _Property PopC
+	 ;
+
+_Property :	TypedValue
+	  |	_Property Owner
+	  |	_Property Unit
+	  |	_Property Property
+	  |	_Property Comment
+	  ;
+
+PropNameDef :	NameDef { str_pair_free($1); }
+	    ;
+
+PropNameRef :	NameRef { free($1); }
+	    ;
+
+ProtectFrame :	EDIF_TOK_PROTECTIONFRAME _ProtectFrame PopC
+	     ;
+
+_ProtectFrame :
+	      |	_ProtectFrame PortImpl
+	      |	_ProtectFrame Figure
+	      |	_ProtectFrame Instance
+	      |	_ProtectFrame CommGraph
+	      |	_ProtectFrame BoundBox
+	      |	_ProtectFrame PropDisplay
+	      |	_ProtectFrame KeywordDisp
+	      |	_ProtectFrame ParamDisp
+	      |	_ProtectFrame Property
+	      |	_ProtectFrame Comment
+	      |	_ProtectFrame UserData
+	      ;
+
+Range :		LessThan
+      |		GreaterThan
+      |		AtMost
+      |		AtLeast
+      |		Exactly
+      |		Between
+      ;
+
+RangeVector :	EDIF_TOK_RANGEVECTOR _RangeVector PopC
+	    ;
+
+_RangeVector :
+	     |	_RangeVector Range
+	     |	_RangeVector SingleValSet
+	     ;
+
+Rectangle :	EDIF_TOK_RECTANGLE PointValue _Rectangle PopC
+	  ;
+
+_Rectangle :	PointValue
+	   |	_Rectangle Property
+	   ;
+
+RectSize :	EDIF_TOK_RECTANGLESIZE RuleNameDef FigGrpObj _RectSize PopC
+	 ;
+
+_RectSize :	RangeVector
+	  |	MultValSet
+	  |	_RectSize Comment
+	  |	_RectSize UserData
+	  ;
+
+Rename :	EDIF_TOK_RENAME __Rename _Rename PopC
+{ $$ = new_str_pair($2,$3); }
+       ;
+
+__Rename :	Ident { $$=$1; }
+	 |	Name { $$=$1; }
+	 ;
+
+_Rename :	Str { $$=$1; }
+	|	StrDisplay { $$=NULL; }
+	;
+
+Resolves :	EDIF_TOK_RESOLVES _Resolves PopC
+	 ;
+
+_Resolves :
+	  |	_Resolves LogicNameRef
+	  ;
+
+RuleNameDef :	NameDef { str_pair_free($1); }
+	    ;
+
+Scale :		EDIF_TOK_SCALE ScaledInt ScaledInt Unit PopC
+      ;
+
+ScaledInt :	Int { free($1); }
+	  |	EDIF_TOK_E Int Int PopC { free($2); free($3); }
+	  ;
+
+ScaleX :	EDIF_TOK_SCALEX Int Int PopC { free($2); free($3); }
+       ;
+
+ScaleY :	EDIF_TOK_SCALEY Int Int PopC { free($2); free($3); }
+       ;
+
+Section :	EDIF_TOK_SECTION _Section PopC
+	;
+
+_Section :	Str { free($1); }
+	 |	_Section Section
+	 |	_Section Str { free($2); }
+	 |	_Section Instance
+	 ;
+
+Shape :		EDIF_TOK_SHAPE _Shape PopC
+      ;
+
+_Shape :	Curve
+       |	_Shape Property
+       ;
+
+SimNameDef :	NameDef { str_pair_free($1); }
+	   ;
+
+Simulate :	EDIF_TOK_SIMULATE _Simulate PopC
+	 ;
+
+_Simulate :	SimNameDef
+	  |	_Simulate PortListAls
+	  |	_Simulate WaveValue
+	  |	_Simulate Apply
+	  |	_Simulate Comment
+	  |	_Simulate UserData
+	  ;
+
+SimulInfo :	EDIF_TOK_SIMULATIONINFO _SimulInfo PopC
+	  ;
+
+_SimulInfo :
+	   |	_SimulInfo LogicValue
+	   |	_SimulInfo Comment
+	   |	_SimulInfo UserData
+	   ;
+
+SingleValSet :	EDIF_TOK_SINGLEVALUESET _SingleValSet PopC
+	     ;
+
+_SingleValSet :
+	      |	Range
+	      ;
+
+Site :		EDIF_TOK_SITE ViewRef _Site PopC
+     ;
+
+_Site :
+      |		Transform
+      ;
+
+Socket :	EDIF_TOK_SOCKET _Socket PopC
+       ;
+
+_Socket :
+	|	Symmetry
+	;
+
+SocketSet :	EDIF_TOK_SOCKETSET _SocketSet PopC
+	  ;
+
+_SocketSet :	Symmetry
+	   |	_SocketSet Site
+	   ;
+
+Status :	EDIF_TOK_STATUS _Status PopC
+       ;
+
+_Status :
+	|	_Status Written
+	|	_Status Comment
+	|	_Status UserData
+	;
+
+Steady :	EDIF_TOK_STEADY __Steady _Steady PopC
+       ;
+
+__Steady :	PortNameRef
+	 |	PortRef { str_pair_free($1); }
+	 |	PortList
+	 ;
+
+_Steady :	Duration
+	|	_Steady Transition
+	|	_Steady Becomes
+	;
+
+StrDisplay :	EDIF_TOK_STRINGDISPLAY _StrDisplay PopC
+	   ;
+
+String :	EDIF_TOK_STRING _String PopC
+       ;
+
+_String :
+	|	_String Str { free($2); }
+	|	_String StrDisplay
+	|	_String String
+	;
+
+_StrDisplay :	Str { free($1); }
+	    |	_StrDisplay Display
+	    ;
+
+Strong :	EDIF_TOK_STRONG LogicNameRef PopC
+       ;
+
+Symbol :	EDIF_TOK_SYMBOL _Symbol PopC
+       ;
+
+_Symbol :
+	|	_Symbol PortImpl
+	|	_Symbol Figure
+	|	_Symbol Instance
+	|	_Symbol CommGraph
+	|	_Symbol Annotate
+	|	_Symbol PageSize
+	|	_Symbol BoundBox
+	|	_Symbol PropDisplay
+	|	_Symbol KeywordDisp
+	|	_Symbol ParamDisp
+	|	_Symbol Property
+	|	_Symbol Comment
+	|	_Symbol UserData
+	;
+
+Symmetry :	EDIF_TOK_SYMMETRY _Symmetry PopC
+	 ;
+
+_Symmetry :
+	  |	_Symmetry Transform
+	  ;
+
+Table :		EDIF_TOK_TABLE _Table PopC
+      ;
+
+_Table :
+       |	_Table Entry
+       |	_Table TableDeflt
+       ;
+
+TableDeflt :	EDIF_TOK_TABLEDEFAULT __TableDeflt _TableDeflt PopC
+	   ;
+
+__TableDeflt :	LogicRef
+	     |	PortRef { str_pair_free($1); }
+	     |	NoChange
+	     |	Table
+	     ;
+
+_TableDeflt :
+	    |	Delay
+	    |	LoadDelay
+	    ;
+
+Technology :	EDIF_TOK_TECHNOLOGY _Technology PopC
+	   ;
+
+_Technology :	NumberDefn
+	    |	_Technology FigGrp
+	    |	_Technology Fabricate
+	    |	_Technology SimulInfo
+	    |	_Technology DesignRule
+	    |	_Technology Comment
+	    |	_Technology UserData
+	    ;
+
+TextHeight :	EDIF_TOK_TEXTHEIGHT Int PopC { free($2); }
+	   ;
+
+TimeIntval :	EDIF_TOK_TIMEINTERVAL __TimeIntval _TimeIntval PopC
+	   ;
+
+__TimeIntval :	Event
+	     |	OffsetEvent
+	     ;
+
+_TimeIntval :	Event
+	    |	OffsetEvent
+	    |	Duration
+	    ;
+
+TimeStamp :	EDIF_TOK_TIMESTAMP Int Int Int Int Int Int PopC
+{ free($2); free($3); free($4); free($5); free($6); free($7); }
+	  ;
+
+Timing :	EDIF_TOK_TIMING _Timing PopC
+       ;
+
+_Timing :	Derivation
+	|	_Timing PathDelay
+	|	_Timing Forbidden
+	|	_Timing Comment
+	|	_Timing UserData
+	;
+
+Transform :	EDIF_TOK_TRANSFORM _TransX _TransY _TransDelta _TransOrien _TransOrg
+		PopC
+	  ;
+
+_TransX :
+	|	ScaleX
+	;
+
+_TransY :
+	|	ScaleY
+	;
+
+_TransDelta :
+	    |	Delta
+	    ;
+
+_TransOrien :
+	    |	Orientation
+	    ;
+
+_TransOrg :
+	  |	Origin
+	  ;
+
+Transition :	EDIF_TOK_TRANSITION _Transition _Transition PopC
+	   ;
+
+_Transition :	LogicNameRef
+	    |	LogicList
+	    |	LogicOneOf
+	    ;
+
+Trigger :	EDIF_TOK_TRIGGER _Trigger PopC
+	;
+
+_Trigger :
+	 |	_Trigger Change
+	 |	_Trigger Steady
+	 |	_Trigger Initial
+	 ;
+
+True :		EDIF_TOK_TRUE PopC
+     ;
+
+TypedValue :	Boolean
+	   |	Integer
+	   |	MiNoMa
+	   |	Number
+	   |	Point
+	   |	String
+	   ;
+
+Unconstrained :	EDIF_TOK_UNCONSTRAINED PopC
+	      ;
+
+Undefined :	EDIF_TOK_UNDEFINED PopC
+	  ;
+
+Union :		EDIF_TOK_UNION _Union PopC
+      ;
+
+_Union :	FigGrpRef
+       |	FigureOp
+       |	_Union FigGrpRef
+       |	_Union FigureOp
+       ;
+
+Unit :		EDIF_TOK_UNIT _Unit PopC
+     ;
+
+_Unit :		EDIF_TOK_DISTANCE
+      |		EDIF_TOK_CAPACITANCE
+      |		EDIF_TOK_CURRENT
+      |		EDIF_TOK_RESISTANCE
+      |		EDIF_TOK_TEMPERATURE
+      |		EDIF_TOK_TIME
+      |		EDIF_TOK_VOLTAGE
+      |		EDIF_TOK_MASS
+      |		EDIF_TOK_FREQUENCY
+      |		EDIF_TOK_INDUCTANCE
+      |		EDIF_TOK_ENERGY
+      |		EDIF_TOK_POWER
+      |		EDIF_TOK_CHARGE
+      |		EDIF_TOK_CONDUCTANCE
+      |		EDIF_TOK_FLUX
+      |		EDIF_TOK_ANGLE
+      ;
+
+Unused :	EDIF_TOK_UNUSED PopC
+       ;
+
+UserData :	EDIF_TOK_USERDATA _UserData PopC
+	 ;
+
+_UserData :	Ident { free($1); }
+	  |	_UserData Int { free($2); }
+	  |	_UserData Str { free($2); }
+	  |	_UserData Ident { free($2); }
+	  |	_UserData Form
+	  ;
+
+ValueNameDef :	NameDef { str_pair_free($1); }
+	     |	Array
+	     ;
+
+ValueNameRef :	NameRef { free($1); }
+	     |	Member
+	     ;
+
+Version :	EDIF_TOK_VERSION Str PopC { free($2); }
+	;
+
+View :		EDIF_TOK_VIEW ViewNameDef ViewType _View PopC
+     ;
+
+_View :		Interface
+      |		_View Status
+      |		_View Contents
+      |		_View Comment
+      |		_View Property
+      |		_View UserData
+      ;
+
+ViewList :	EDIF_TOK_VIEWLIST _ViewList PopC
+	 ;
+
+_ViewList :
+	  |	_ViewList ViewRef
+	  |	_ViewList ViewList
+	  ;
+
+ViewMap :	EDIF_TOK_VIEWMAP _ViewMap PopC
+	;
+
+_ViewMap :
+	 |	_ViewMap PortMap
+	 |	_ViewMap PortBackAn
+	 |	_ViewMap InstMap
+	 |	_ViewMap InstBackAn
+	 |	_ViewMap NetMap
+	 |	_ViewMap NetBackAn
+	 |	_ViewMap Comment
+	 |	_ViewMap UserData
+	 ;
+
+ViewNameDef :	NameDef { str_pair_free($1); }
+	    ;
+
+ViewNameRef :	NameRef { free($1); }
+	    ;
+
+ViewRef :	EDIF_TOK_VIEWREF ViewNameRef _ViewRef PopC
+	;
+
+_ViewRef :
+	 |	CellRef
+	 ;
+
+ViewType :	EDIF_TOK_VIEWTYPE _ViewType PopC
+	 ;
+
+_ViewType :	EDIF_TOK_MASKLAYOUT
+	  |	EDIF_TOK_PCBLAYOUT
+	  |	EDIF_TOK_NETLIST
+	  |	EDIF_TOK_SCHEMATIC
+	  |	EDIF_TOK_SYMBOLIC
+	  |	EDIF_TOK_BEHAVIOR
+	  |	EDIF_TOK_LOGICMODEL
+	  |	EDIF_TOK_DOCUMENT
+	  |	EDIF_TOK_GRAPHIC
+	  |	EDIF_TOK_STRANGER
+	  ;
+
+Visible :	EDIF_TOK_VISIBLE BooleanValue PopC
+	;
+
+VoltageMap :	EDIF_TOK_VOLTAGEMAP MiNoMaValue PopC
+	   ;
+
+WaveValue :	EDIF_TOK_WAVEVALUE LogicNameDef ScaledInt LogicWave PopC
+	  ;
+
+Weak :		EDIF_TOK_WEAK LogicNameRef PopC
+     ;
+
+WeakJoined :	EDIF_TOK_WEAKJOINED _WeakJoined PopC
+	   ;
+
+_WeakJoined :
+	    |	_WeakJoined PortRef { str_pair_free($2); }
+	    |	_WeakJoined PortList
+	    |	_WeakJoined Joined { pair_list_free($2); }
+	    ;
+
+When :		EDIF_TOK_WHEN _When PopC
+     ;
+
+_When :		Trigger
+      |		_When After
+      |		_When Follow
+      |		_When Maintain
+      |		_When LogicAssn
+      |		_When Comment
+      |		_When UserData
+      ;
+
+Written :	EDIF_TOK_WRITTEN _Written PopC
+	;
+
+_Written :	TimeStamp
+	 |	_Written Author
+	 |	_Written Program
+	 |	_Written DataOrigin
+	 |	_Written Property
+	 |	_Written Comment
+	 |	_Written UserData
+	 ;
+
+Ident :		EDIF_TOK_IDENT { $$=$1; }
+      ;
+
+Str :		EDIF_TOK_STR { $$=$1; }
+    ;
+
+Int :		EDIF_TOK_INT { $$=$1; }
+    ;
+
+Keyword :	EDIF_TOK_KEYWORD	{ $$=$1; }
+	;
+
+%%
+/*
+ *	xmalloc:
+ *
+ *	  Garbage function for 'alloca()'.
+ */
+char *xmalloc(int siz)
+{
+  return ((char *)Malloc(siz));
+}
+/*
+ *	Token & context carriers:
+ *
+ *	  These are the linkage pointers for threading this context garbage
+ *	for converting identifiers into parser tokens.
+ */
+typedef struct TokenCar {
+  struct TokenCar *Next;	/* pointer to next carrier */
+  struct Token *Token;		/* associated token */
+} TokenCar;
+typedef struct UsedCar {
+  struct UsedCar *Next;		/* pointer to next carrier */
+  short Code;			/* used '%token' value */
+} UsedCar;
+typedef struct ContextCar {
+  struct ContextCar *Next;	/* pointer to next carrier */
+  struct Context *Context;	/* associated context */
+  union {
+    int Single;			/* single usage flag (context tree) */
+    struct UsedCar *Used;	/* single used list (context stack) */
+  } u;
+} ContextCar;
+/*
+ *	Token definitions:
+ *
+ *	  This associates the '%token' codings with strings which are to
+ *	be free standing tokens. Doesn't have to be in sorted order but the
+ *	strings must be in lower case.
+ */
+typedef struct Token {
+  const char *Name;			/* token name */
+  int Code;			/* '%token' value */
+  struct Token *Next;		/* hash table linkage */
+} Token;
+static Token TokenDef[] = {
+  {"angle",		EDIF_TOK_ANGLE},
+  {"behavior",		EDIF_TOK_BEHAVIOR},
+  {"calculated",	EDIF_TOK_CALCULATED},
+  {"capacitance",	EDIF_TOK_CAPACITANCE},
+  {"centercenter",	EDIF_TOK_CENTERCENTER},
+  {"centerleft",	EDIF_TOK_CENTERLEFT},
+  {"centerright",	EDIF_TOK_CENTERRIGHT},
+  {"charge",		EDIF_TOK_CHARGE},
+  {"conductance",	EDIF_TOK_CONDUCTANCE},
+  {"current",		EDIF_TOK_CURRENT},
+  {"distance",		EDIF_TOK_DISTANCE},
+  {"document",		EDIF_TOK_DOCUMENT},
+  {"energy",		EDIF_TOK_ENERGY},
+  {"extend",		EDIF_TOK_EXTEND},
+  {"flux",		EDIF_TOK_FLUX},
+  {"frequency",		EDIF_TOK_FREQUENCY},
+  {"generic",		EDIF_TOK_GENERIC},
+  {"graphic",		EDIF_TOK_GRAPHIC},
+  {"inductance",	EDIF_TOK_INDUCTANCE},
+  {"inout",		EDIF_TOK_INOUT},
+  {"input",		EDIF_TOK_INPUT},
+  {"logicmodel",	EDIF_TOK_LOGICMODEL},
+  {"lowercenter",	EDIF_TOK_LOWERCENTER},
+  {"lowerleft",		EDIF_TOK_LOWERLEFT},
+  {"lowerright",	EDIF_TOK_LOWERRIGHT},
+  {"masklayout",	EDIF_TOK_MASKLAYOUT},
+  {"mass",		EDIF_TOK_MASS},
+  {"measured",		EDIF_TOK_MEASURED},
+  {"mx",		EDIF_TOK_MX},
+  {"mxr90",		EDIF_TOK_MXR90},
+  {"my",		EDIF_TOK_MY},
+  {"myr90",		EDIF_TOK_MYR90},
+  {"netlist",		EDIF_TOK_NETLIST},
+  {"output",		EDIF_TOK_OUTPUT},
+  {"pcblayout",		EDIF_TOK_PCBLAYOUT},
+  {"power",		EDIF_TOK_POWER},
+  {"r0",		EDIF_TOK_R0},
+  {"r180",		EDIF_TOK_R180},
+  {"r270",		EDIF_TOK_R270},
+  {"r90",		EDIF_TOK_R90},
+  {"required",		EDIF_TOK_REQUIRED},
+  {"resistance",	EDIF_TOK_RESISTANCE},
+  {"ripper",		EDIF_TOK_RIPPER},
+  {"round",		EDIF_TOK_ROUND},
+  {"schematic",		EDIF_TOK_SCHEMATIC},
+  {"stranger",		EDIF_TOK_STRANGER},
+  {"symbolic",		EDIF_TOK_SYMBOLIC},
+  {"temperature",	EDIF_TOK_TEMPERATURE},
+  {"tie",		EDIF_TOK_TIE},
+  {"time",		EDIF_TOK_TIME},
+  {"truncate",		EDIF_TOK_TRUNCATE},
+  {"uppercenter",	EDIF_TOK_UPPERCENTER},
+  {"upperleft",		EDIF_TOK_UPPERLEFT},
+  {"upperright",	EDIF_TOK_UPPERRIGHT},
+  {"voltage",		EDIF_TOK_VOLTAGE}
+};
+static int TokenDefSize = sizeof(TokenDef) / sizeof(Token);
+/*
+ *	Token enable definitions:
+ *
+ *	  There is one array for each set of tokens enabled by a
+ *	particular context (barf). Another array is used to bind
+ *	these arrays to a context.
+ */
+static short e_CellType[] = {EDIF_TOK_TIE, EDIF_TOK_RIPPER, EDIF_TOK_GENERIC};
+static short e_CornerType[] = {EDIF_TOK_EXTEND, EDIF_TOK_TRUNCATE,
+			       EDIF_TOK_ROUND};
+static short e_Derivation[] = {EDIF_TOK_CALCULATED, EDIF_TOK_MEASURED,
+			       EDIF_TOK_REQUIRED};
+static short e_Direction[] = {EDIF_TOK_INPUT, EDIF_TOK_OUTPUT,
+			      EDIF_TOK_INOUT};
+static short e_EndType[] = {EDIF_TOK_EXTEND, EDIF_TOK_TRUNCATE,
+			    EDIF_TOK_ROUND};
+static short e_Justify[] = {EDIF_TOK_CENTERCENTER, EDIF_TOK_CENTERLEFT,
+			    EDIF_TOK_CENTERRIGHT, EDIF_TOK_LOWERCENTER,
+			    EDIF_TOK_LOWERLEFT, EDIF_TOK_LOWERRIGHT,
+			    EDIF_TOK_UPPERCENTER, EDIF_TOK_UPPERLEFT,
+			    EDIF_TOK_UPPERRIGHT};
+static short e_Orientation[] = {EDIF_TOK_R0, EDIF_TOK_R90, EDIF_TOK_R180,
+				EDIF_TOK_R270, EDIF_TOK_MX, EDIF_TOK_MY,
+				EDIF_TOK_MXR90, EDIF_TOK_MYR90};
+static short e_Unit[] = {EDIF_TOK_DISTANCE, EDIF_TOK_CAPACITANCE,
+			 EDIF_TOK_CURRENT, EDIF_TOK_RESISTANCE,
+			 EDIF_TOK_TEMPERATURE, EDIF_TOK_TIME,
+			 EDIF_TOK_VOLTAGE, EDIF_TOK_MASS, EDIF_TOK_FREQUENCY,
+			 EDIF_TOK_INDUCTANCE, EDIF_TOK_ENERGY,
+			 EDIF_TOK_POWER, EDIF_TOK_CHARGE,
+			 EDIF_TOK_CONDUCTANCE, EDIF_TOK_FLUX, EDIF_TOK_ANGLE};
+static short e_ViewType[] = {EDIF_TOK_MASKLAYOUT, EDIF_TOK_PCBLAYOUT,
+			     EDIF_TOK_NETLIST, EDIF_TOK_SCHEMATIC,
+			     EDIF_TOK_SYMBOLIC, EDIF_TOK_BEHAVIOR,
+			     EDIF_TOK_LOGICMODEL, EDIF_TOK_DOCUMENT,
+			     EDIF_TOK_GRAPHIC, EDIF_TOK_STRANGER};
+/*
+ *	Token tying table:
+ *
+ *	  This binds enabled tokens to a context.
+ */
+typedef struct Tie {
+  short *Enable;		/* pointer to enable array */
+  short Origin;			/* '%token' value of context */
+  short EnableSize;		/* size of enabled array */
+} Tie;
+#define	TE(e,o)			{e,o,sizeof(e)/sizeof(short)}
+static Tie TieDef[] = {
+  TE(e_CellType,	EDIF_TOK_CELLTYPE),
+  TE(e_CornerType,	EDIF_TOK_CORNERTYPE),
+  TE(e_Derivation,	EDIF_TOK_DERIVATION),
+  TE(e_Direction,	EDIF_TOK_DIRECTION),
+  TE(e_EndType,		EDIF_TOK_ENDTYPE),
+  TE(e_Justify,		EDIF_TOK_JUSTIFY),
+  TE(e_Orientation,	EDIF_TOK_ORIENTATION),
+  TE(e_Unit,		EDIF_TOK_UNIT),
+  TE(e_ViewType,	EDIF_TOK_VIEWTYPE)
+};
+static int TieDefSize = sizeof(TieDef) / sizeof(Tie);
+/*
+ *	Context definitions:
+ *
+ *	  This associates keyword strings with '%token' values. It
+ *	also creates a pretty much empty header for later building of
+ *	the context tree. Again they needn't be sorted, but strings
+ *	must be lower case.
+ */
+typedef struct Context {
+  const char *Name;			/* keyword name */
+  short Code;			/* '%token' value */
+  short Flags;			/* special operation flags */
+  struct ContextCar *Context;	/* contexts which can be moved to */
+  struct TokenCar *Token;	/* active tokens */
+  struct Context *Next;		/* hash table linkage */
+} Context;
+static Context ContextDef[] = {
+  {"",				0},		/* start context */
+  {"acload",			EDIF_TOK_ACLOAD},
+  {"after",			EDIF_TOK_AFTER},
+  {"annotate",			EDIF_TOK_ANNOTATE},
+  {"apply",			EDIF_TOK_APPLY},
+  {"arc",			EDIF_TOK_ARC},
+  {"array",			EDIF_TOK_ARRAY},
+  {"arraymacro",		EDIF_TOK_ARRAYMACRO},
+  {"arrayrelatedinfo",		EDIF_TOK_ARRAYRELATEDINFO},
+  {"arraysite",			EDIF_TOK_ARRAYSITE},
+  {"atleast",			EDIF_TOK_ATLEAST},
+  {"atmost",			EDIF_TOK_ATMOST},
+  {"author",			EDIF_TOK_AUTHOR},
+  {"basearray",			EDIF_TOK_BASEARRAY},
+  {"becomes",			EDIF_TOK_BECOMES},
+  {"between",			EDIF_TOK_BETWEEN},
+  {"boolean",			EDIF_TOK_BOOLEAN},
+  {"booleandisplay",		EDIF_TOK_BOOLEANDISPLAY},
+  {"booleanmap",		EDIF_TOK_BOOLEANMAP},
+  {"borderpattern",		EDIF_TOK_BORDERPATTERN},
+  {"borderwidth",		EDIF_TOK_BORDERWIDTH},
+  {"boundingbox",		EDIF_TOK_BOUNDINGBOX},
+  {"cell",			EDIF_TOK_CELL},
+  {"cellref",			EDIF_TOK_CELLREF},
+  {"celltype",			EDIF_TOK_CELLTYPE},
+  {"change",			EDIF_TOK_CHANGE},
+  {"circle",			EDIF_TOK_CIRCLE},
+  {"color",			EDIF_TOK_COLOR},
+  {"comment",			EDIF_TOK_COMMENT},
+  {"commentgraphics",		EDIF_TOK_COMMENTGRAPHICS},
+  {"compound",			EDIF_TOK_COMPOUND},
+  {"connectlocation",		EDIF_TOK_CONNECTLOCATION},
+  {"contents",			EDIF_TOK_CONTENTS},
+  {"cornertype",		EDIF_TOK_CORNERTYPE},
+  {"criticality",		EDIF_TOK_CRITICALITY},
+  {"currentmap",		EDIF_TOK_CURRENTMAP},
+  {"curve",			EDIF_TOK_CURVE},
+  {"cycle",			EDIF_TOK_CYCLE},
+  {"dataorigin",		EDIF_TOK_DATAORIGIN},
+  {"dcfaninload",		EDIF_TOK_DCFANINLOAD},
+  {"dcfanoutload",		EDIF_TOK_DCFANOUTLOAD},
+  {"dcmaxfanin",		EDIF_TOK_DCMAXFANIN},
+  {"dcmaxfanout",		EDIF_TOK_DCMAXFANOUT},
+  {"delay",			EDIF_TOK_DELAY},
+  {"delta",			EDIF_TOK_DELTA},
+  {"derivation",		EDIF_TOK_DERIVATION},
+  {"design",			EDIF_TOK_DESIGN},
+  {"designator",		EDIF_TOK_DESIGNATOR},
+  {"difference",		EDIF_TOK_DIFFERENCE},
+  {"direction",			EDIF_TOK_DIRECTION},
+  {"display",			EDIF_TOK_DISPLAY},
+  {"dominates",			EDIF_TOK_DOMINATES},
+  {"dot",			EDIF_TOK_DOT},
+  {"duration",			EDIF_TOK_DURATION},
+  {"e",				EDIF_TOK_E},
+  {"edif",			EDIF_TOK_EDIF},
+  {"ediflevel",			EDIF_TOK_EDIFLEVEL},
+  {"edifversion",		EDIF_TOK_EDIFVERSION},
+  {"enclosuredistance",		EDIF_TOK_ENCLOSUREDISTANCE},
+  {"endtype",			EDIF_TOK_ENDTYPE},
+  {"entry",			EDIF_TOK_ENTRY},
+  {"exactly",			EDIF_TOK_EXACTLY},
+  {"external",			EDIF_TOK_EXTERNAL},
+  {"fabricate",			EDIF_TOK_FABRICATE},
+  {"false",			EDIF_TOK_FALSE},
+  {"figure",			EDIF_TOK_FIGURE},
+  {"figurearea",		EDIF_TOK_FIGUREAREA},
+  {"figuregroup",		EDIF_TOK_FIGUREGROUP},
+  {"figuregroupobject",		EDIF_TOK_FIGUREGROUPOBJECT},
+  {"figuregroupoverride",	EDIF_TOK_FIGUREGROUPOVERRIDE},
+  {"figuregroupref",		EDIF_TOK_FIGUREGROUPREF},
+  {"figureperimeter",		EDIF_TOK_FIGUREPERIMETER},
+  {"figurewidth",		EDIF_TOK_FIGUREWIDTH},
+  {"fillpattern",		EDIF_TOK_FILLPATTERN},
+  {"follow",			EDIF_TOK_FOLLOW},
+  {"forbiddenevent",		EDIF_TOK_FORBIDDENEVENT},
+  {"globalportref",		EDIF_TOK_GLOBALPORTREF},
+  {"greaterthan",		EDIF_TOK_GREATERTHAN},
+  {"gridmap",			EDIF_TOK_GRIDMAP},
+  {"ignore",			EDIF_TOK_IGNORE},
+  {"includefiguregroup",	EDIF_TOK_INCLUDEFIGUREGROUP},
+  {"initial",			EDIF_TOK_INITIAL},
+  {"instance",			EDIF_TOK_INSTANCE},
+  {"instancebackannotate",	EDIF_TOK_INSTANCEBACKANNOTATE},
+  {"instancegroup",		EDIF_TOK_INSTANCEGROUP},
+  {"instancemap",		EDIF_TOK_INSTANCEMAP},
+  {"instanceref",		EDIF_TOK_INSTANCEREF},
+  {"integer",			EDIF_TOK_INTEGER},
+  {"integerdisplay",		EDIF_TOK_INTEGERDISPLAY},
+  {"interface",			EDIF_TOK_INTERFACE},
+  {"interfiguregroupspacing",	EDIF_TOK_INTERFIGUREGROUPSPACING},
+  {"intersection",		EDIF_TOK_INTERSECTION},
+  {"intrafiguregroupspacing",	EDIF_TOK_INTRAFIGUREGROUPSPACING},
+  {"inverse",			EDIF_TOK_INVERSE},
+  {"isolated",			EDIF_TOK_ISOLATED},
+  {"joined",			EDIF_TOK_JOINED},
+  {"justify",			EDIF_TOK_JUSTIFY},
+  {"keyworddisplay",		EDIF_TOK_KEYWORDDISPLAY},
+  {"keywordlevel",		EDIF_TOK_KEYWORDLEVEL},
+  {"keywordmap",		EDIF_TOK_KEYWORDMAP},
+  {"lessthan",			EDIF_TOK_LESSTHAN},
+  {"library",			EDIF_TOK_LIBRARY},
+  {"libraryref",		EDIF_TOK_LIBRARYREF},
+  {"listofnets",		EDIF_TOK_LISTOFNETS},
+  {"listofports",		EDIF_TOK_LISTOFPORTS},
+  {"loaddelay",			EDIF_TOK_LOADDELAY},
+  {"logicassign",		EDIF_TOK_LOGICASSIGN},
+  {"logicinput",		EDIF_TOK_LOGICINPUT},
+  {"logiclist",			EDIF_TOK_LOGICLIST},
+  {"logicmapinput",		EDIF_TOK_LOGICMAPINPUT},
+  {"logicmapoutput",		EDIF_TOK_LOGICMAPOUTPUT},
+  {"logiconeof",		EDIF_TOK_LOGICONEOF},
+  {"logicoutput",		EDIF_TOK_LOGICOUTPUT},
+  {"logicport",			EDIF_TOK_LOGICPORT},
+  {"logicref",			EDIF_TOK_LOGICREF},
+  {"logicvalue",		EDIF_TOK_LOGICVALUE},
+  {"logicwaveform",		EDIF_TOK_LOGICWAVEFORM},
+  {"maintain",			EDIF_TOK_MAINTAIN},
+  {"match",			EDIF_TOK_MATCH},
+  {"member",			EDIF_TOK_MEMBER},
+  {"minomax",			EDIF_TOK_MINOMAX},
+  {"minomaxdisplay",		EDIF_TOK_MINOMAXDISPLAY},
+  {"mnm",			EDIF_TOK_MNM},
+  {"multiplevalueset",		EDIF_TOK_MULTIPLEVALUESET},
+  {"mustjoin",			EDIF_TOK_MUSTJOIN},
+  {"name",			EDIF_TOK_NAME},
+  {"net",			EDIF_TOK_NET},
+  {"netbackannotate",		EDIF_TOK_NETBACKANNOTATE},
+  {"netbundle",			EDIF_TOK_NETBUNDLE},
+  {"netdelay",			EDIF_TOK_NETDELAY},
+  {"netgroup",			EDIF_TOK_NETGROUP},
+  {"netmap",			EDIF_TOK_NETMAP},
+  {"netref",			EDIF_TOK_NETREF},
+  {"nochange",			EDIF_TOK_NOCHANGE},
+  {"nonpermutable",		EDIF_TOK_NONPERMUTABLE},
+  {"notallowed",		EDIF_TOK_NOTALLOWED},
+  {"notchspacing",		EDIF_TOK_NOTCHSPACING},
+  {"number",			EDIF_TOK_NUMBER},
+  {"numberdefinition",		EDIF_TOK_NUMBERDEFINITION},
+  {"numberdisplay",		EDIF_TOK_NUMBERDISPLAY},
+  {"offpageconnector",		EDIF_TOK_OFFPAGECONNECTOR},
+  {"offsetevent",		EDIF_TOK_OFFSETEVENT},
+  {"openshape",			EDIF_TOK_OPENSHAPE},
+  {"orientation",		EDIF_TOK_ORIENTATION},
+  {"origin",			EDIF_TOK_ORIGIN},
+  {"overhangdistance",		EDIF_TOK_OVERHANGDISTANCE},
+  {"overlapdistance",		EDIF_TOK_OVERLAPDISTANCE},
+  {"oversize",			EDIF_TOK_OVERSIZE},
+  {"owner",			EDIF_TOK_OWNER},
+  {"page",			EDIF_TOK_PAGE},
+  {"pagesize",			EDIF_TOK_PAGESIZE},
+  {"parameter",			EDIF_TOK_PARAMETER},
+  {"parameterassign",		EDIF_TOK_PARAMETERASSIGN},
+  {"parameterdisplay",		EDIF_TOK_PARAMETERDISPLAY},
+  {"path",			EDIF_TOK_PATH},
+  {"pathdelay",			EDIF_TOK_PATHDELAY},
+  {"pathwidth",			EDIF_TOK_PATHWIDTH},
+  {"permutable",		EDIF_TOK_PERMUTABLE},
+  {"physicaldesignrule",	EDIF_TOK_PHYSICALDESIGNRULE},
+  {"plug",			EDIF_TOK_PLUG},
+  {"point",			EDIF_TOK_POINT},
+  {"pointdisplay",		EDIF_TOK_POINTDISPLAY},
+  {"pointlist",			EDIF_TOK_POINTLIST},
+  {"polygon",			EDIF_TOK_POLYGON},
+  {"port",			EDIF_TOK_PORT},
+  {"portbackannotate",		EDIF_TOK_PORTBACKANNOTATE},
+  {"portbundle",		EDIF_TOK_PORTBUNDLE},
+  {"portdelay",			EDIF_TOK_PORTDELAY},
+  {"portgroup",			EDIF_TOK_PORTGROUP},
+  {"portimplementation",	EDIF_TOK_PORTIMPLEMENTATION},
+  {"portinstance",		EDIF_TOK_PORTINSTANCE},
+  {"portlist",			EDIF_TOK_PORTLIST},
+  {"portlistalias",		EDIF_TOK_PORTLISTALIAS},
+  {"portmap",			EDIF_TOK_PORTMAP},
+  {"portref",			EDIF_TOK_PORTREF},
+  {"program",			EDIF_TOK_PROGRAM},
+  {"property",			EDIF_TOK_PROPERTY},
+  {"propertydisplay",		EDIF_TOK_PROPERTYDISPLAY},
+  {"protectionframe",		EDIF_TOK_PROTECTIONFRAME},
+  {"pt",			EDIF_TOK_PT},
+  {"rangevector",		EDIF_TOK_RANGEVECTOR},
+  {"rectangle",			EDIF_TOK_RECTANGLE},
+  {"rectanglesize",		EDIF_TOK_RECTANGLESIZE},
+  {"rename",			EDIF_TOK_RENAME},
+  {"resolves",			EDIF_TOK_RESOLVES},
+  {"scale",			EDIF_TOK_SCALE},
+  {"scalex",			EDIF_TOK_SCALEX},
+  {"scaley",			EDIF_TOK_SCALEY},
+  {"section",			EDIF_TOK_SECTION},
+  {"shape",			EDIF_TOK_SHAPE},
+  {"simulate",			EDIF_TOK_SIMULATE},
+  {"simulationinfo",		EDIF_TOK_SIMULATIONINFO},
+  {"singlevalueset",		EDIF_TOK_SINGLEVALUESET},
+  {"site",			EDIF_TOK_SITE},
+  {"socket",			EDIF_TOK_SOCKET},
+  {"socketset",			EDIF_TOK_SOCKETSET},
+  {"status",			EDIF_TOK_STATUS},
+  {"steady",			EDIF_TOK_STEADY},
+  {"string",			EDIF_TOK_STRING},
+  {"stringdisplay",		EDIF_TOK_STRINGDISPLAY},
+  {"strong",			EDIF_TOK_STRONG},
+  {"symbol",			EDIF_TOK_SYMBOL},
+  {"symmetry",			EDIF_TOK_SYMMETRY},
+  {"table",			EDIF_TOK_TABLE},
+  {"tabledefault",		EDIF_TOK_TABLEDEFAULT},
+  {"technology",		EDIF_TOK_TECHNOLOGY},
+  {"textheight",		EDIF_TOK_TEXTHEIGHT},
+  {"timeinterval",		EDIF_TOK_TIMEINTERVAL},
+  {"timestamp",			EDIF_TOK_TIMESTAMP},
+  {"timing",			EDIF_TOK_TIMING},
+  {"transform",			EDIF_TOK_TRANSFORM},
+  {"transition",		EDIF_TOK_TRANSITION},
+  {"trigger",			EDIF_TOK_TRIGGER},
+  {"true",			EDIF_TOK_TRUE},
+  {"unconstrained",		EDIF_TOK_UNCONSTRAINED},
+  {"undefined",			EDIF_TOK_UNDEFINED},
+  {"union",			EDIF_TOK_UNION},
+  {"unit",			EDIF_TOK_UNIT},
+  {"unused",			EDIF_TOK_UNUSED},
+  {"userdata",			EDIF_TOK_USERDATA},
+  {"version",			EDIF_TOK_VERSION},
+  {"view",			EDIF_TOK_VIEW},
+  {"viewlist",			EDIF_TOK_VIEWLIST},
+  {"viewmap",			EDIF_TOK_VIEWMAP},
+  {"viewref",			EDIF_TOK_VIEWREF},
+  {"viewtype",			EDIF_TOK_VIEWTYPE},
+  {"visible",			EDIF_TOK_VISIBLE},
+  {"voltagemap",		EDIF_TOK_VOLTAGEMAP},
+  {"wavevalue",			EDIF_TOK_WAVEVALUE},
+  {"weak",			EDIF_TOK_WEAK},
+  {"weakjoined",		EDIF_TOK_WEAKJOINED},
+  {"when",			EDIF_TOK_WHEN},
+  {"written",			EDIF_TOK_WRITTEN}
+};
+static int ContextDefSize = sizeof(ContextDef) / sizeof(Context);
+/*
+ *	Context follower tables:
+ *
+ *	  This is pretty ugly, an array is defined for each context
+ *	which has following context levels. Yet another table is used
+ *	to bind these arrays to the originating contexts.
+ *	  Arrays are declared as:
+ *
+ *		static short f_<Context name>[] = { ... };
+ *
+ *	The array entries are the '%token' values for all keywords which
+ *	can be reached from the <Context name> context. Like I said, ugly,
+ *	but it works.
+ *	  A negative entry means that the follow can only occur once within
+ *	the specified context.
+ */
+static short f_NULL[] = {EDIF_TOK_EDIF};
+static short f_Edif[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_EDIFVERSION,
+			 EDIF_TOK_EDIFLEVEL, EDIF_TOK_KEYWORDMAP,
+			 -EDIF_TOK_STATUS, EDIF_TOK_EXTERNAL,
+			 EDIF_TOK_LIBRARY, EDIF_TOK_DESIGN, EDIF_TOK_COMMENT,
+			 EDIF_TOK_USERDATA};
+static short f_AcLoad[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY};
+static short f_After[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_FOLLOW,
+			  EDIF_TOK_MAINTAIN, EDIF_TOK_LOGICASSIGN,
+			  EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Annotate[] = {EDIF_TOK_STRINGDISPLAY};
+static short f_Apply[] = {EDIF_TOK_CYCLE, EDIF_TOK_LOGICINPUT,
+			  EDIF_TOK_LOGICOUTPUT, EDIF_TOK_COMMENT,
+			  EDIF_TOK_USERDATA};
+static short f_Arc[] = {EDIF_TOK_PT};
+static short f_Array[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME};
+static short f_ArrayMacro[] = {EDIF_TOK_PLUG};
+static short f_ArrayRelatedInfo[] = {EDIF_TOK_BASEARRAY, EDIF_TOK_ARRAYSITE,
+				     EDIF_TOK_ARRAYMACRO, EDIF_TOK_COMMENT,
+				     EDIF_TOK_USERDATA};
+static short f_ArraySite[] = {EDIF_TOK_SOCKET};
+static short f_AtLeast[] = {EDIF_TOK_E};
+static short f_AtMost[] = {EDIF_TOK_E};
+static short f_Becomes[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+			    EDIF_TOK_LOGICONEOF};
+/*
+static short f_Between[] = {EDIF_TOK_ATLEAST, EDIF_TOK_GREATERTHAN,
+			    EDIF_TOK_ATMOST, EDIF_TOK_LESSTHAN};
+*/
+static short f_Boolean[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE,
+			    EDIF_TOK_BOOLEANDISPLAY, EDIF_TOK_BOOLEAN};
+static short f_BooleanDisplay[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE,
+				   EDIF_TOK_DISPLAY};
+static short f_BooleanMap[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE};
+static short f_BorderPattern[] = {EDIF_TOK_BOOLEAN};
+static short f_BoundingBox[] = {EDIF_TOK_RECTANGLE};
+static short f_Cell[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_CELLTYPE,
+			 -EDIF_TOK_STATUS, -EDIF_TOK_VIEWMAP, EDIF_TOK_VIEW,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA,
+			 EDIF_TOK_PROPERTY};
+static short f_CellRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_Change[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			   EDIF_TOK_BECOMES, EDIF_TOK_TRANSITION};
+static short f_Circle[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_Color[] = {EDIF_TOK_E};
+static short f_CommentGraphics[] = {EDIF_TOK_ANNOTATE, EDIF_TOK_FIGURE,
+				    EDIF_TOK_INSTANCE, -EDIF_TOK_BOUNDINGBOX,
+				    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_Compound[] = {EDIF_TOK_NAME};
+static short f_ConnectLocation[] = {EDIF_TOK_FIGURE};
+static short f_Contents[] = {EDIF_TOK_INSTANCE, EDIF_TOK_OFFPAGECONNECTOR,
+			     EDIF_TOK_FIGURE, EDIF_TOK_SECTION, EDIF_TOK_NET,
+			     EDIF_TOK_NETBUNDLE, EDIF_TOK_PAGE,
+			     EDIF_TOK_COMMENTGRAPHICS,
+			     EDIF_TOK_PORTIMPLEMENTATION,
+			     EDIF_TOK_TIMING, EDIF_TOK_SIMULATE,
+			     EDIF_TOK_WHEN, EDIF_TOK_FOLLOW,
+			     EDIF_TOK_LOGICPORT, -EDIF_TOK_BOUNDINGBOX,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Criticality[] = {EDIF_TOK_INTEGERDISPLAY};
+static short f_CurrentMap[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_Curve[] = {EDIF_TOK_ARC, EDIF_TOK_PT};
+static short f_Cycle[] = {EDIF_TOK_DURATION};
+static short f_DataOrigin[] = {EDIF_TOK_VERSION};
+static short f_DcFanInLoad[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcFanOutLoad[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcMaxFanIn[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_DcMaxFanOut[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY};
+static short f_Delay[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_Delta[] = {EDIF_TOK_PT};
+static short f_Design[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_CELLREF,
+			   EDIF_TOK_STATUS, EDIF_TOK_COMMENT,
+			   EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_Designator[] = {EDIF_TOK_STRINGDISPLAY};
+static short f_Difference[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			       EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			       EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_Display[] = {EDIF_TOK_NAME, EDIF_TOK_FIGUREGROUPOVERRIDE,
+			    EDIF_TOK_JUSTIFY, EDIF_TOK_ORIENTATION,
+			    EDIF_TOK_ORIGIN};
+static short f_Dominates[] = {EDIF_TOK_NAME};
+static short f_Dot[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_Duration[] = {EDIF_TOK_E};
+static short f_EnclosureDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				      EDIF_TOK_FIGUREGROUPOBJECT,
+				      EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				      EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				      EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				      EDIF_TOK_SINGLEVALUESET,
+				      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Entry[] = {EDIF_TOK_MATCH, EDIF_TOK_CHANGE, EDIF_TOK_STEADY,
+			  EDIF_TOK_LOGICREF, EDIF_TOK_PORTREF,
+			  EDIF_TOK_NOCHANGE, EDIF_TOK_TABLE,
+			  EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_Exactly[] = {EDIF_TOK_E};
+static short f_External[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			     EDIF_TOK_EDIFLEVEL, EDIF_TOK_TECHNOLOGY,
+			     -EDIF_TOK_STATUS, EDIF_TOK_CELL, EDIF_TOK_COMMENT,
+			     EDIF_TOK_USERDATA};
+static short f_Fabricate[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME};
+static short f_Figure[] = {EDIF_TOK_NAME, EDIF_TOK_FIGUREGROUPOVERRIDE,
+			   EDIF_TOK_CIRCLE, EDIF_TOK_DOT, EDIF_TOK_OPENSHAPE,
+			   EDIF_TOK_PATH, EDIF_TOK_POLYGON,
+			   EDIF_TOK_RECTANGLE, EDIF_TOK_SHAPE,
+			   EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FigureArea[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+			       EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+			       EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+			       EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FigureGroup[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				-EDIF_TOK_CORNERTYPE, -EDIF_TOK_ENDTYPE,
+				-EDIF_TOK_PATHWIDTH, -EDIF_TOK_BORDERWIDTH,
+				-EDIF_TOK_COLOR, -EDIF_TOK_FILLPATTERN,
+				-EDIF_TOK_BORDERPATTERN, -EDIF_TOK_TEXTHEIGHT,
+				-EDIF_TOK_VISIBLE, EDIF_TOK_INCLUDEFIGUREGROUP,
+				EDIF_TOK_COMMENT, EDIF_TOK_PROPERTY,
+				EDIF_TOK_USERDATA};
+static short f_FigureGroupObject[] = {EDIF_TOK_NAME,
+				      EDIF_TOK_FIGUREGROUPOBJECT,
+				      EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				      EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				      EDIF_TOK_OVERSIZE};
+static short f_FigureGroupOverride[] = {EDIF_TOK_NAME, -EDIF_TOK_CORNERTYPE,
+					-EDIF_TOK_ENDTYPE, -EDIF_TOK_PATHWIDTH,
+					-EDIF_TOK_BORDERWIDTH, -EDIF_TOK_COLOR,
+					-EDIF_TOK_FILLPATTERN,
+					-EDIF_TOK_TEXTHEIGHT,
+					-EDIF_TOK_BORDERPATTERN,
+					EDIF_TOK_VISIBLE, EDIF_TOK_COMMENT,
+					EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_FigureGroupRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_FigurePerimeter[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				    EDIF_TOK_FIGUREGROUPOBJECT,
+				    EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				    EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				    EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				    EDIF_TOK_SINGLEVALUESET, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_FigureWidth[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_FillPattern[] = {EDIF_TOK_BOOLEAN};
+static short f_Follow[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_TABLE,
+			   EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_ForbiddenEvent[] = {EDIF_TOK_TIMEINTERVAL, EDIF_TOK_EVENT};
+static short f_GlobalPortRef[] = {EDIF_TOK_NAME};
+static short f_GreaterThan[] = {EDIF_TOK_E};
+static short f_GridMap[] = {EDIF_TOK_E};
+static short f_IncludeFigureGroup[] = {EDIF_TOK_FIGUREGROUPREF,
+				       EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				       EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				       EDIF_TOK_OVERSIZE};
+static short f_Instance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			     EDIF_TOK_VIEWREF, EDIF_TOK_VIEWLIST,
+			     -EDIF_TOK_TRANSFORM, EDIF_TOK_PARAMETERASSIGN,
+			     EDIF_TOK_PORTINSTANCE, EDIF_TOK_TIMING,
+			     -EDIF_TOK_DESIGNATOR, EDIF_TOK_PROPERTY,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InstanceBackAnnotate[] = {EDIF_TOK_INSTANCEREF,
+					 -EDIF_TOK_DESIGNATOR, EDIF_TOK_TIMING,
+					 EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_InstanceGroup[] = {EDIF_TOK_INSTANCEREF};
+static short f_InstanceMap[] = {EDIF_TOK_INSTANCEREF, EDIF_TOK_INSTANCEGROUP,
+				EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InstanceRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				EDIF_TOK_INSTANCEREF, EDIF_TOK_VIEWREF};
+static short f_Integer[] = {EDIF_TOK_INTEGERDISPLAY, EDIF_TOK_INTEGER};
+static short f_IntegerDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_Interface[] = {EDIF_TOK_PORT, EDIF_TOK_PORTBUNDLE,
+			      -EDIF_TOK_SYMBOL, -EDIF_TOK_PROTECTIONFRAME,
+			      -EDIF_TOK_ARRAYRELATEDINFO, EDIF_TOK_PARAMETER,
+			      EDIF_TOK_JOINED, EDIF_TOK_MUSTJOIN,
+			      EDIF_TOK_WEAKJOINED, EDIF_TOK_PERMUTABLE,
+			      EDIF_TOK_TIMING, EDIF_TOK_SIMULATE,
+			      -EDIF_TOK_DESIGNATOR, EDIF_TOK_PROPERTY,
+			      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_InterFigureGroupSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+					    EDIF_TOK_FIGUREGROUPOBJECT,
+					    EDIF_TOK_LESSTHAN,
+					    EDIF_TOK_GREATERTHAN,
+					    EDIF_TOK_ATMOST,
+					    EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+					    EDIF_TOK_BETWEEN,
+					    EDIF_TOK_SINGLEVALUESET,
+					    EDIF_TOK_COMMENT,
+					    EDIF_TOK_USERDATA};
+static short f_Intersection[] = {EDIF_TOK_FIGUREGROUPREF,
+				 EDIF_TOK_INTERSECTION, EDIF_TOK_UNION,
+				 EDIF_TOK_DIFFERENCE, EDIF_TOK_INVERSE,
+				 EDIF_TOK_OVERSIZE};
+static short f_IntraFigureGroupSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+					    EDIF_TOK_FIGUREGROUPOBJECT,
+					    EDIF_TOK_LESSTHAN,
+					    EDIF_TOK_GREATERTHAN,
+					    EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+					    EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+					    EDIF_TOK_SINGLEVALUESET,
+					    EDIF_TOK_COMMENT,
+					    EDIF_TOK_USERDATA};
+static short f_Inverse[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			    EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			    EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_Joined[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			   EDIF_TOK_GLOBALPORTREF};
+static short f_KeywordDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_KeywordMap[] = {EDIF_TOK_KEYWORDLEVEL, EDIF_TOK_COMMENT};
+static short f_LessThan[] = {EDIF_TOK_E};
+static short f_Library[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_EDIFLEVEL,
+			    EDIF_TOK_TECHNOLOGY, -EDIF_TOK_STATUS,
+			    EDIF_TOK_CELL, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+static short f_LibraryRef[] = {EDIF_TOK_NAME};
+static short f_ListOfNets[] = {EDIF_TOK_NET};
+static short f_ListOfPorts[] = {EDIF_TOK_PORT, EDIF_TOK_PORTBUNDLE};
+static short f_LoadDelay[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY};
+static short f_LogicAssign[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF,
+				EDIF_TOK_LOGICREF, EDIF_TOK_TABLE,
+				EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_LogicInput[] = {EDIF_TOK_PORTLIST, EDIF_TOK_PORTREF,
+			       EDIF_TOK_NAME, EDIF_TOK_LOGICWAVEFORM};
+static short f_LogicList[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICONEOF,
+			      EDIF_TOK_IGNORE};
+static short f_LogicMapInput[] = {EDIF_TOK_LOGICREF};
+static short f_LogicMapOutput[] = {EDIF_TOK_LOGICREF};
+static short f_LogicOneOf[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST};
+static short f_LogicOutput[] = {EDIF_TOK_PORTLIST, EDIF_TOK_PORTREF,
+				EDIF_TOK_NAME, EDIF_TOK_LOGICWAVEFORM};
+static short f_LogicPort[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			      EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			      EDIF_TOK_USERDATA};
+static short f_LogicRef[] = {EDIF_TOK_NAME, EDIF_TOK_LIBRARYREF};
+static short f_LogicValue[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       -EDIF_TOK_VOLTAGEMAP, -EDIF_TOK_CURRENTMAP,
+			       -EDIF_TOK_BOOLEANMAP, -EDIF_TOK_COMPOUND,
+			       -EDIF_TOK_WEAK ,-EDIF_TOK_STRONG,
+			       -EDIF_TOK_DOMINATES, -EDIF_TOK_LOGICMAPOUTPUT,
+			       -EDIF_TOK_LOGICMAPINPUT,
+			       -EDIF_TOK_ISOLATED, EDIF_TOK_RESOLVES,
+			       EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			       EDIF_TOK_USERDATA};
+static short f_LogicWaveform[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+				  EDIF_TOK_LOGICONEOF, EDIF_TOK_IGNORE};
+static short f_Maintain[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_DELAY,
+			     EDIF_TOK_LOADDELAY};
+static short f_Match[] = {EDIF_TOK_NAME, EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			  EDIF_TOK_LOGICLIST, EDIF_TOK_LOGICONEOF};
+static short f_Member[] = {EDIF_TOK_NAME};
+static short f_MiNoMax[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_MINOMAXDISPLAY,
+			    EDIF_TOK_MINOMAX};
+static short f_MiNoMaxDisplay[] = {EDIF_TOK_MNM, EDIF_TOK_E, EDIF_TOK_DISPLAY};
+static short f_Mnm[] = {EDIF_TOK_E, EDIF_TOK_UNDEFINED,
+			EDIF_TOK_UNCONSTRAINED};
+static short f_MultipleValueSet[] = {EDIF_TOK_RANGEVECTOR};
+static short f_MustJoin[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			     EDIF_TOK_WEAKJOINED, EDIF_TOK_JOINED};
+static short f_Name[] = {EDIF_TOK_DISPLAY};
+static short f_Net[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, -EDIF_TOK_CRITICALITY,
+			EDIF_TOK_NETDELAY, EDIF_TOK_FIGURE, EDIF_TOK_NET,
+			EDIF_TOK_INSTANCE, EDIF_TOK_COMMENTGRAPHICS,
+			EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			EDIF_TOK_USERDATA, EDIF_TOK_JOINED, EDIF_TOK_ARRAY};
+static short f_NetBackAnnotate[] = {EDIF_TOK_NETREF, EDIF_TOK_NETDELAY,
+				    -EDIF_TOK_CRITICALITY, EDIF_TOK_PROPERTY,
+				    EDIF_TOK_COMMENT};
+static short f_NetBundle[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			      EDIF_TOK_LISTOFNETS, EDIF_TOK_FIGURE,
+			      EDIF_TOK_COMMENTGRAPHICS, EDIF_TOK_PROPERTY,
+			      EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_NetDelay[] = {EDIF_TOK_DERIVATION, EDIF_TOK_DELAY,
+			     EDIF_TOK_TRANSITION, EDIF_TOK_BECOMES};
+static short f_NetGroup[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_NETREF};
+static short f_NetMap[] = {EDIF_TOK_NETREF, EDIF_TOK_NETGROUP,
+			   EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_NetRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_NETREF,
+			   EDIF_TOK_INSTANCEREF, EDIF_TOK_VIEWREF};
+static short f_NonPermutable[] = {EDIF_TOK_PORTREF, EDIF_TOK_PERMUTABLE};
+static short f_NotAllowed[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+			       EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_COMMENT,
+			       EDIF_TOK_USERDATA};
+static short f_NotchSpacing[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				 EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				 EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				 EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				 EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Number[] = {EDIF_TOK_E, EDIF_TOK_NUMBERDISPLAY, EDIF_TOK_NUMBER};
+static short f_NumberDefinition[] = {EDIF_TOK_SCALE, -EDIF_TOK_GRIDMAP,
+				     EDIF_TOK_COMMENT};
+static short f_NumberDisplay[] = {EDIF_TOK_E, EDIF_TOK_DISPLAY};
+static short f_OffPageConnector[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				     -EDIF_TOK_UNUSED, EDIF_TOK_PROPERTY,
+				     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_OffsetEvent[] = {EDIF_TOK_EVENT, EDIF_TOK_E};
+static short f_OpenShape[] = {EDIF_TOK_CURVE, EDIF_TOK_PROPERTY};
+static short f_Origin[] = {EDIF_TOK_PT};
+static short f_OverhangDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				     EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				     EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				     EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				     EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_OverlapDistance[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				    EDIF_TOK_FIGUREGROUPOBJECT, EDIF_TOK_LESSTHAN,
+				    EDIF_TOK_GREATERTHAN, EDIF_TOK_ATMOST,
+				    EDIF_TOK_ATLEAST, EDIF_TOK_EXACTLY,
+				    EDIF_TOK_BETWEEN, EDIF_TOK_SINGLEVALUESET,
+				    EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_Oversize[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			     EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			     EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE,
+			     EDIF_TOK_CORNERTYPE};
+static short f_Page[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			 EDIF_TOK_INSTANCE, EDIF_TOK_NET, EDIF_TOK_NETBUNDLE,
+			 EDIF_TOK_COMMENTGRAPHICS, EDIF_TOK_PORTIMPLEMENTATION,
+			 -EDIF_TOK_PAGESIZE, -EDIF_TOK_BOUNDINGBOX,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PageSize[] = {EDIF_TOK_RECTANGLE};
+static short f_Parameter[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			      EDIF_TOK_BOOLEAN, EDIF_TOK_INTEGER,
+			      EDIF_TOK_MINOMAX, EDIF_TOK_NUMBER,
+			      EDIF_TOK_POINT, EDIF_TOK_STRING};
+static short f_ParameterAssign[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				    EDIF_TOK_BOOLEAN, EDIF_TOK_INTEGER,
+				    EDIF_TOK_MINOMAX, EDIF_TOK_NUMBER, EDIF_TOK_POINT,
+				    EDIF_TOK_STRING};
+static short f_ParameterDisplay[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				     EDIF_TOK_DISPLAY};
+static short f_Path[] = {EDIF_TOK_POINTLIST, EDIF_TOK_PROPERTY};
+static short f_PathDelay[] = {EDIF_TOK_DELAY, EDIF_TOK_EVENT};
+static short f_Permutable[] = {EDIF_TOK_PORTREF, EDIF_TOK_PERMUTABLE,
+			       EDIF_TOK_NONPERMUTABLE};
+static short f_PhysicalDesignRule[] = {EDIF_TOK_FIGUREWIDTH,
+				       EDIF_TOK_FIGUREAREA,
+				       EDIF_TOK_RECTANGLESIZE,
+				       EDIF_TOK_FIGUREPERIMETER,
+				       EDIF_TOK_OVERLAPDISTANCE,
+				       EDIF_TOK_OVERHANGDISTANCE,
+				       EDIF_TOK_ENCLOSUREDISTANCE,
+				       EDIF_TOK_INTERFIGUREGROUPSPACING,
+				       EDIF_TOK_NOTCHSPACING,
+				       EDIF_TOK_INTRAFIGUREGROUPSPACING,
+				       EDIF_TOK_NOTALLOWED,
+				       EDIF_TOK_FIGUREGROUP, EDIF_TOK_COMMENT,
+				       EDIF_TOK_USERDATA};
+static short f_Plug[] = {EDIF_TOK_SOCKETSET};
+static short f_Point[] = {EDIF_TOK_PT, EDIF_TOK_POINTDISPLAY,
+			  EDIF_TOK_POINT};
+static short f_PointDisplay[] = {EDIF_TOK_PT, EDIF_TOK_DISPLAY};
+static short f_PointList[] = {EDIF_TOK_PT};
+static short f_Polygon[] = {EDIF_TOK_POINTLIST, EDIF_TOK_PROPERTY};
+static short f_Port[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			 -EDIF_TOK_DIRECTION, -EDIF_TOK_UNUSED,
+			 EDIF_TOK_PORTDELAY, -EDIF_TOK_DESIGNATOR,
+			 -EDIF_TOK_DCFANINLOAD, -EDIF_TOK_DCFANOUTLOAD,
+			 -EDIF_TOK_DCMAXFANIN, -EDIF_TOK_DCMAXFANOUT,
+			 -EDIF_TOK_ACLOAD, EDIF_TOK_PROPERTY,
+			 EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortBackAnnotate[] = {EDIF_TOK_PORTREF, -EDIF_TOK_DESIGNATOR,
+				     EDIF_TOK_PORTDELAY, -EDIF_TOK_DCFANINLOAD,
+				     -EDIF_TOK_DCFANOUTLOAD,
+				     -EDIF_TOK_DCMAXFANIN,
+				     -EDIF_TOK_DCMAXFANOUT, -EDIF_TOK_ACLOAD,
+				     EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_PortBundle[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_ARRAY,
+			       EDIF_TOK_LISTOFPORTS, EDIF_TOK_PROPERTY,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortDelay[] = {EDIF_TOK_DERIVATION, EDIF_TOK_DELAY,
+			      EDIF_TOK_LOADDELAY, EDIF_TOK_TRANSITION,
+			      EDIF_TOK_BECOMES};
+static short f_PortGroup[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+			      EDIF_TOK_PORTREF};
+static short f_PortImplementation[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+				       -EDIF_TOK_CONNECTLOCATION,
+				       EDIF_TOK_FIGURE, EDIF_TOK_INSTANCE,
+				       EDIF_TOK_COMMENTGRAPHICS,
+				       EDIF_TOK_PROPERTYDISPLAY,
+				       EDIF_TOK_KEYWORDDISPLAY,
+				       EDIF_TOK_PROPERTY,
+				       EDIF_TOK_USERDATA, EDIF_TOK_COMMENT};
+static short f_PortInstance[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME,
+				 EDIF_TOK_MEMBER, -EDIF_TOK_UNUSED,
+				 EDIF_TOK_PORTDELAY, -EDIF_TOK_DESIGNATOR,
+				 -EDIF_TOK_DCFANINLOAD,
+				 -EDIF_TOK_DCFANOUTLOAD, -EDIF_TOK_DCMAXFANIN,
+				 -EDIF_TOK_DCMAXFANOUT, -EDIF_TOK_ACLOAD,
+				 EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				 EDIF_TOK_USERDATA};
+static short f_PortList[] = {EDIF_TOK_PORTREF, EDIF_TOK_NAME,
+			     EDIF_TOK_MEMBER};
+static short f_PortListAlias[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				  EDIF_TOK_ARRAY, EDIF_TOK_PORTLIST};
+static short f_PortMap[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTGROUP,
+			    EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_PortRef[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER,
+			    EDIF_TOK_PORTREF, EDIF_TOK_INSTANCEREF,
+			    EDIF_TOK_VIEWREF};
+static short f_Program[] = {EDIF_TOK_VERSION};
+static short f_Property[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_BOOLEAN,
+			     EDIF_TOK_INTEGER, EDIF_TOK_MINOMAX,
+			     EDIF_TOK_NUMBER, EDIF_TOK_POINT, EDIF_TOK_STRING,
+			     -EDIF_TOK_OWNER, -EDIF_TOK_UNIT,
+			     EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT};
+static short f_PropertyDisplay[] = {EDIF_TOK_NAME, EDIF_TOK_DISPLAY};
+static short f_ProtectionFrame[] = {EDIF_TOK_PORTIMPLEMENTATION,
+				    EDIF_TOK_FIGURE, EDIF_TOK_INSTANCE,
+				    EDIF_TOK_COMMENTGRAPHICS,
+				    -EDIF_TOK_BOUNDINGBOX,
+				    EDIF_TOK_PROPERTYDISPLAY,
+				    EDIF_TOK_KEYWORDDISPLAY,
+				    EDIF_TOK_PARAMETERDISPLAY,
+				    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+				    EDIF_TOK_USERDATA};
+static short f_RangeVector[] = {EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN,
+				EDIF_TOK_SINGLEVALUESET};
+static short f_Rectangle[] = {EDIF_TOK_PT, EDIF_TOK_PROPERTY};
+static short f_RectangleSize[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME,
+				  EDIF_TOK_FIGUREGROUPOBJECT,
+				  EDIF_TOK_RANGEVECTOR,
+				  EDIF_TOK_MULTIPLEVALUESET,EDIF_TOK_COMMENT,
+				  EDIF_TOK_USERDATA};
+static short f_Rename[] = {EDIF_TOK_NAME, EDIF_TOK_STRINGDISPLAY};
+static short f_Resolves[] = {EDIF_TOK_NAME};
+static short f_Scale[] = {EDIF_TOK_E, EDIF_TOK_UNIT};
+static short f_Section[] = {EDIF_TOK_SECTION, EDIF_TOK_INSTANCE};
+static short f_Shape[] = {EDIF_TOK_CURVE, EDIF_TOK_PROPERTY};
+static short f_Simulate[] = {EDIF_TOK_NAME, EDIF_TOK_PORTLISTALIAS,
+			     EDIF_TOK_WAVEVALUE, EDIF_TOK_APPLY,
+			     EDIF_TOK_COMMENT, EDIF_TOK_USERDATA};
+static short f_SimulationInfo[] = {EDIF_TOK_LOGICVALUE, EDIF_TOK_COMMENT,
+				   EDIF_TOK_USERDATA};
+static short f_SingleValueSet[] = {EDIF_TOK_LESSTHAN, EDIF_TOK_GREATERTHAN,
+				   EDIF_TOK_ATMOST, EDIF_TOK_ATLEAST,
+				   EDIF_TOK_EXACTLY, EDIF_TOK_BETWEEN};
+static short f_Site[] = {EDIF_TOK_VIEWREF, EDIF_TOK_TRANSFORM};
+static short f_Socket[] = {EDIF_TOK_SYMMETRY};
+static short f_SocketSet[] = {EDIF_TOK_SYMMETRY, EDIF_TOK_SITE};
+static short f_Status[] = {EDIF_TOK_WRITTEN, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Steady[] = {EDIF_TOK_NAME, EDIF_TOK_MEMBER, EDIF_TOK_PORTREF,
+			   EDIF_TOK_PORTLIST, EDIF_TOK_DURATION,
+			   EDIF_TOK_TRANSITION, EDIF_TOK_BECOMES};
+static short f_String[] = {EDIF_TOK_STRINGDISPLAY, EDIF_TOK_STRING};
+static short f_StringDisplay[] = {EDIF_TOK_DISPLAY};
+static short f_Strong[] = {EDIF_TOK_NAME};
+static short f_Symbol[] = {EDIF_TOK_PORTIMPLEMENTATION, EDIF_TOK_FIGURE,
+			   EDIF_TOK_INSTANCE, EDIF_TOK_COMMENTGRAPHICS,
+			   EDIF_TOK_ANNOTATE, -EDIF_TOK_PAGESIZE,
+			   -EDIF_TOK_BOUNDINGBOX, EDIF_TOK_PROPERTYDISPLAY,
+			   EDIF_TOK_KEYWORDDISPLAY, EDIF_TOK_PARAMETERDISPLAY,
+			   EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Symmetry[] = {EDIF_TOK_TRANSFORM};
+static short f_Table[] = {EDIF_TOK_ENTRY, EDIF_TOK_TABLEDEFAULT};
+static short f_TableDefault[] = {EDIF_TOK_LOGICREF, EDIF_TOK_PORTREF,
+				 EDIF_TOK_NOCHANGE, EDIF_TOK_TABLE,
+				 EDIF_TOK_DELAY, EDIF_TOK_LOADDELAY};
+static short f_Technology[] = {EDIF_TOK_NUMBERDEFINITION, EDIF_TOK_FIGUREGROUP,
+			       EDIF_TOK_FABRICATE, -EDIF_TOK_SIMULATIONINFO,
+			       EDIF_TOK_COMMENT, EDIF_TOK_USERDATA,
+			       -EDIF_TOK_PHYSICALDESIGNRULE};
+static short f_TimeInterval[] = {EDIF_TOK_EVENT, EDIF_TOK_OFFSETEVENT,
+				 EDIF_TOK_DURATION};
+static short f_Timing[] = {EDIF_TOK_DERIVATION, EDIF_TOK_PATHDELAY,
+			   EDIF_TOK_FORBIDDENEVENT, EDIF_TOK_COMMENT,
+			   EDIF_TOK_USERDATA};
+static short f_Transform[] = {EDIF_TOK_SCALEX, EDIF_TOK_SCALEY, EDIF_TOK_DELTA,
+			      EDIF_TOK_ORIENTATION, EDIF_TOK_ORIGIN};
+static short f_Transition[] = {EDIF_TOK_NAME, EDIF_TOK_LOGICLIST,
+			       EDIF_TOK_LOGICONEOF};
+static short f_Trigger[] = {EDIF_TOK_CHANGE, EDIF_TOK_STEADY,
+			    EDIF_TOK_INITIAL};
+static short f_Union[] = {EDIF_TOK_FIGUREGROUPREF, EDIF_TOK_INTERSECTION,
+			  EDIF_TOK_UNION, EDIF_TOK_DIFFERENCE,
+			  EDIF_TOK_INVERSE, EDIF_TOK_OVERSIZE};
+static short f_View[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_VIEWTYPE,
+			 EDIF_TOK_INTERFACE, -EDIF_TOK_STATUS,
+			 -EDIF_TOK_CONTENTS, EDIF_TOK_COMMENT,
+			 EDIF_TOK_PROPERTY, EDIF_TOK_USERDATA};
+static short f_ViewList[] = {EDIF_TOK_VIEWREF, EDIF_TOK_VIEWLIST};
+static short f_ViewMap[] = {EDIF_TOK_PORTMAP, EDIF_TOK_PORTBACKANNOTATE,
+			    EDIF_TOK_INSTANCEMAP,
+			    EDIF_TOK_INSTANCEBACKANNOTATE, EDIF_TOK_NETMAP,
+			    EDIF_TOK_NETBACKANNOTATE, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+static short f_ViewRef[] = {EDIF_TOK_NAME, EDIF_TOK_CELLREF};
+static short f_Visible[] = {EDIF_TOK_FALSE, EDIF_TOK_TRUE};
+static short f_VoltageMap[] = {EDIF_TOK_MNM, EDIF_TOK_E};
+static short f_WaveValue[] = {EDIF_TOK_NAME, EDIF_TOK_RENAME, EDIF_TOK_E,
+			      EDIF_TOK_LOGICWAVEFORM};
+static short f_Weak[] = {EDIF_TOK_NAME};
+static short f_WeakJoined[] = {EDIF_TOK_PORTREF, EDIF_TOK_PORTLIST,
+			       EDIF_TOK_JOINED};
+static short f_When[] = {EDIF_TOK_TRIGGER, EDIF_TOK_AFTER,
+			 EDIF_TOK_FOLLOW, EDIF_TOK_MAINTAIN,
+			 EDIF_TOK_LOGICASSIGN, EDIF_TOK_COMMENT,
+			 EDIF_TOK_USERDATA};
+static short f_Written[] = {EDIF_TOK_TIMESTAMP, EDIF_TOK_AUTHOR,
+			    EDIF_TOK_PROGRAM, EDIF_TOK_DATAORIGIN,
+			    EDIF_TOK_PROPERTY, EDIF_TOK_COMMENT,
+			    EDIF_TOK_USERDATA};
+/*
+ *	Context binding table:
+ *
+ *	  This binds context follower arrays to their originating context.
+ */
+typedef struct Binder {
+  short *Follower;		/* pointer to follower array */
+  short Origin;			/* '%token' value of origin */
+  short FollowerSize;		/* size of follower array */
+} Binder;
+#define	BE(f,o)			{f,o,sizeof(f)/sizeof(short)}
+static Binder BinderDef[] = {
+  BE(f_NULL,			0),
+  BE(f_Edif,			EDIF_TOK_EDIF),
+  BE(f_AcLoad,			EDIF_TOK_ACLOAD),
+  BE(f_After,			EDIF_TOK_AFTER),
+  BE(f_Annotate,		EDIF_TOK_ANNOTATE),
+  BE(f_Apply,			EDIF_TOK_APPLY),
+  BE(f_Arc,			EDIF_TOK_ARC),
+  BE(f_Array,			EDIF_TOK_ARRAY),
+  BE(f_ArrayMacro,		EDIF_TOK_ARRAYMACRO),
+  BE(f_ArrayRelatedInfo,	EDIF_TOK_ARRAYRELATEDINFO),
+  BE(f_ArraySite,		EDIF_TOK_ARRAYSITE),
+  BE(f_AtLeast,			EDIF_TOK_ATLEAST),
+  BE(f_AtMost,			EDIF_TOK_ATMOST),
+  BE(f_Becomes,			EDIF_TOK_BECOMES),
+  BE(f_Boolean,			EDIF_TOK_BOOLEAN),
+  BE(f_BooleanDisplay,		EDIF_TOK_BOOLEANDISPLAY),
+  BE(f_BooleanMap,		EDIF_TOK_BOOLEANMAP),
+  BE(f_BorderPattern,		EDIF_TOK_BORDERPATTERN),
+  BE(f_BoundingBox,		EDIF_TOK_BOUNDINGBOX),
+  BE(f_Cell,			EDIF_TOK_CELL),
+  BE(f_CellRef,			EDIF_TOK_CELLREF),
+  BE(f_Change,			EDIF_TOK_CHANGE),
+  BE(f_Circle,			EDIF_TOK_CIRCLE),
+  BE(f_Color,			EDIF_TOK_COLOR),
+  BE(f_CommentGraphics,		EDIF_TOK_COMMENTGRAPHICS),
+  BE(f_Compound,		EDIF_TOK_COMPOUND),
+  BE(f_ConnectLocation,		EDIF_TOK_CONNECTLOCATION),
+  BE(f_Contents,		EDIF_TOK_CONTENTS),
+  BE(f_Criticality,		EDIF_TOK_CRITICALITY),
+  BE(f_CurrentMap,		EDIF_TOK_CURRENTMAP),
+  BE(f_Curve,			EDIF_TOK_CURVE),
+  BE(f_Cycle,			EDIF_TOK_CYCLE),
+  BE(f_DataOrigin,		EDIF_TOK_DATAORIGIN),
+  BE(f_DcFanInLoad,		EDIF_TOK_DCFANINLOAD),
+  BE(f_DcFanOutLoad,		EDIF_TOK_DCFANOUTLOAD),
+  BE(f_DcMaxFanIn,		EDIF_TOK_DCMAXFANIN),
+  BE(f_DcMaxFanOut,		EDIF_TOK_DCMAXFANOUT),
+  BE(f_Delay,			EDIF_TOK_DELAY),
+  BE(f_Delta,			EDIF_TOK_DELTA),
+  BE(f_Design,			EDIF_TOK_DESIGN),
+  BE(f_Designator,		EDIF_TOK_DESIGNATOR),
+  BE(f_Difference,		EDIF_TOK_DIFFERENCE),
+  BE(f_Display,			EDIF_TOK_DISPLAY),
+  BE(f_Dominates,		EDIF_TOK_DOMINATES),
+  BE(f_Dot,			EDIF_TOK_DOT),
+  BE(f_Duration,		EDIF_TOK_DURATION),
+  BE(f_EnclosureDistance,	EDIF_TOK_ENCLOSUREDISTANCE),
+  BE(f_Entry,			EDIF_TOK_ENTRY),
+  BE(f_Exactly,			EDIF_TOK_EXACTLY),
+  BE(f_External,		EDIF_TOK_EXTERNAL),
+  BE(f_Fabricate,		EDIF_TOK_FABRICATE),
+  BE(f_Figure,			EDIF_TOK_FIGURE),
+  BE(f_FigureArea,		EDIF_TOK_FIGUREAREA),
+  BE(f_FigureGroup,		EDIF_TOK_FIGUREGROUP),
+  BE(f_FigureGroupObject,	EDIF_TOK_FIGUREGROUPOBJECT),
+  BE(f_FigureGroupOverride,	EDIF_TOK_FIGUREGROUPOVERRIDE),
+  BE(f_FigureGroupRef,		EDIF_TOK_FIGUREGROUPREF),
+  BE(f_FigurePerimeter,		EDIF_TOK_FIGUREPERIMETER),
+  BE(f_FigureWidth,		EDIF_TOK_FIGUREWIDTH),
+  BE(f_FillPattern,		EDIF_TOK_FILLPATTERN),
+  BE(f_Follow,			EDIF_TOK_FOLLOW),
+  BE(f_ForbiddenEvent,		EDIF_TOK_FORBIDDENEVENT),
+  BE(f_GlobalPortRef,		EDIF_TOK_GLOBALPORTREF),
+  BE(f_GreaterThan,		EDIF_TOK_GREATERTHAN),
+  BE(f_GridMap,			EDIF_TOK_GRIDMAP),
+  BE(f_IncludeFigureGroup,	EDIF_TOK_INCLUDEFIGUREGROUP),
+  BE(f_Instance,		EDIF_TOK_INSTANCE),
+  BE(f_InstanceBackAnnotate,	EDIF_TOK_INSTANCEBACKANNOTATE),
+  BE(f_InstanceGroup,		EDIF_TOK_INSTANCEGROUP),
+  BE(f_InstanceMap,		EDIF_TOK_INSTANCEMAP),
+  BE(f_InstanceRef,		EDIF_TOK_INSTANCEREF),
+  BE(f_Integer,			EDIF_TOK_INTEGER),
+  BE(f_IntegerDisplay,		EDIF_TOK_INTEGERDISPLAY),
+  BE(f_InterFigureGroupSpacing,	EDIF_TOK_INTERFIGUREGROUPSPACING),
+  BE(f_Interface,		EDIF_TOK_INTERFACE),
+  BE(f_Intersection,		EDIF_TOK_INTERSECTION),
+  BE(f_IntraFigureGroupSpacing,	EDIF_TOK_INTRAFIGUREGROUPSPACING),
+  BE(f_Inverse,			EDIF_TOK_INVERSE),
+  BE(f_Joined,			EDIF_TOK_JOINED),
+  BE(f_KeywordDisplay,		EDIF_TOK_KEYWORDDISPLAY),
+  BE(f_KeywordMap,		EDIF_TOK_KEYWORDMAP),
+  BE(f_LessThan,		EDIF_TOK_LESSTHAN),
+  BE(f_Library,			EDIF_TOK_LIBRARY),
+  BE(f_LibraryRef,		EDIF_TOK_LIBRARYREF),
+  BE(f_ListOfNets,		EDIF_TOK_LISTOFNETS),
+  BE(f_ListOfPorts,		EDIF_TOK_LISTOFPORTS),
+  BE(f_LoadDelay,		EDIF_TOK_LOADDELAY),
+  BE(f_LogicAssign,		EDIF_TOK_LOGICASSIGN),
+  BE(f_LogicInput,		EDIF_TOK_LOGICINPUT),
+  BE(f_LogicList,		EDIF_TOK_LOGICLIST),
+  BE(f_LogicMapInput,		EDIF_TOK_LOGICMAPINPUT),
+  BE(f_LogicMapOutput,		EDIF_TOK_LOGICMAPOUTPUT),
+  BE(f_LogicOneOf,		EDIF_TOK_LOGICONEOF),
+  BE(f_LogicOutput,		EDIF_TOK_LOGICOUTPUT),
+  BE(f_LogicPort,		EDIF_TOK_LOGICPORT),
+  BE(f_LogicRef,		EDIF_TOK_LOGICREF),
+  BE(f_LogicValue,		EDIF_TOK_LOGICVALUE),
+  BE(f_LogicWaveform,		EDIF_TOK_LOGICWAVEFORM),
+  BE(f_Maintain,		EDIF_TOK_MAINTAIN),
+  BE(f_Match,			EDIF_TOK_MATCH),
+  BE(f_Member,			EDIF_TOK_MEMBER),
+  BE(f_MiNoMax,			EDIF_TOK_MINOMAX),
+  BE(f_MiNoMaxDisplay,		EDIF_TOK_MINOMAXDISPLAY),
+  BE(f_Mnm,			EDIF_TOK_MNM),
+  BE(f_MultipleValueSet,	EDIF_TOK_MULTIPLEVALUESET),
+  BE(f_MustJoin,		EDIF_TOK_MUSTJOIN),
+  BE(f_Name,			EDIF_TOK_NAME),
+  BE(f_Net,			EDIF_TOK_NET),
+  BE(f_NetBackAnnotate,		EDIF_TOK_NETBACKANNOTATE),
+  BE(f_NetBundle,		EDIF_TOK_NETBUNDLE),
+  BE(f_NetDelay,		EDIF_TOK_NETDELAY),
+  BE(f_NetGroup,		EDIF_TOK_NETGROUP),
+  BE(f_NetMap,			EDIF_TOK_NETMAP),
+  BE(f_NetRef,			EDIF_TOK_NETREF),
+  BE(f_NonPermutable,		EDIF_TOK_NONPERMUTABLE),
+  BE(f_NotAllowed,		EDIF_TOK_NOTALLOWED),
+  BE(f_NotchSpacing,		EDIF_TOK_NOTCHSPACING),
+  BE(f_Number,			EDIF_TOK_NUMBER),
+  BE(f_NumberDefinition,	EDIF_TOK_NUMBERDEFINITION),
+  BE(f_NumberDisplay,		EDIF_TOK_NUMBERDISPLAY),
+  BE(f_OffPageConnector,	EDIF_TOK_OFFPAGECONNECTOR),
+  BE(f_OffsetEvent,		EDIF_TOK_OFFSETEVENT),
+  BE(f_OpenShape,		EDIF_TOK_OPENSHAPE),
+  BE(f_Origin,			EDIF_TOK_ORIGIN),
+  BE(f_OverhangDistance,	EDIF_TOK_OVERHANGDISTANCE),
+  BE(f_OverlapDistance,		EDIF_TOK_OVERLAPDISTANCE),
+  BE(f_Oversize,		EDIF_TOK_OVERSIZE),
+  BE(f_Page,			EDIF_TOK_PAGE),
+  BE(f_PageSize,		EDIF_TOK_PAGESIZE),
+  BE(f_Parameter,		EDIF_TOK_PARAMETER),
+  BE(f_ParameterAssign,		EDIF_TOK_PARAMETERASSIGN),
+  BE(f_ParameterDisplay,	EDIF_TOK_PARAMETERDISPLAY),
+  BE(f_Path,			EDIF_TOK_PATH),
+  BE(f_PathDelay,		EDIF_TOK_PATHDELAY),
+  BE(f_Permutable,		EDIF_TOK_PERMUTABLE),
+  BE(f_PhysicalDesignRule,	EDIF_TOK_PHYSICALDESIGNRULE),
+  BE(f_Plug,			EDIF_TOK_PLUG),
+  BE(f_Point,			EDIF_TOK_POINT),
+  BE(f_PointDisplay,		EDIF_TOK_POINTDISPLAY),
+  BE(f_PointList,		EDIF_TOK_POINTLIST),
+  BE(f_Polygon,			EDIF_TOK_POLYGON),
+  BE(f_Port,			EDIF_TOK_PORT),
+  BE(f_PortBackAnnotate,	EDIF_TOK_PORTBACKANNOTATE),
+  BE(f_PortBundle,		EDIF_TOK_PORTBUNDLE),
+  BE(f_PortDelay,		EDIF_TOK_PORTDELAY),
+  BE(f_PortGroup,		EDIF_TOK_PORTGROUP),
+  BE(f_PortImplementation,	EDIF_TOK_PORTIMPLEMENTATION),
+  BE(f_PortInstance,		EDIF_TOK_PORTINSTANCE),
+  BE(f_PortList,		EDIF_TOK_PORTLIST),
+  BE(f_PortListAlias,		EDIF_TOK_PORTLISTALIAS),
+  BE(f_PortMap,			EDIF_TOK_PORTMAP),
+  BE(f_PortRef,			EDIF_TOK_PORTREF),
+  BE(f_Program,			EDIF_TOK_PROGRAM),
+  BE(f_Property,		EDIF_TOK_PROPERTY),
+  BE(f_PropertyDisplay,		EDIF_TOK_PROPERTYDISPLAY),
+  BE(f_ProtectionFrame,		EDIF_TOK_PROTECTIONFRAME),
+  BE(f_RangeVector,		EDIF_TOK_RANGEVECTOR),
+  BE(f_Rectangle,		EDIF_TOK_RECTANGLE),
+  BE(f_RectangleSize,		EDIF_TOK_RECTANGLESIZE),
+  BE(f_Rename,			EDIF_TOK_RENAME),
+  BE(f_Resolves,		EDIF_TOK_RESOLVES),
+  BE(f_Scale,			EDIF_TOK_SCALE),
+  BE(f_Section,			EDIF_TOK_SECTION),
+  BE(f_Shape,			EDIF_TOK_SHAPE),
+  BE(f_Simulate,		EDIF_TOK_SIMULATE),
+  BE(f_SimulationInfo,		EDIF_TOK_SIMULATIONINFO),
+  BE(f_SingleValueSet,		EDIF_TOK_SINGLEVALUESET),
+  BE(f_Site,			EDIF_TOK_SITE),
+  BE(f_Socket,			EDIF_TOK_SOCKET),
+  BE(f_SocketSet,		EDIF_TOK_SOCKETSET),
+  BE(f_Status,			EDIF_TOK_STATUS),
+  BE(f_Steady,			EDIF_TOK_STEADY),
+  BE(f_String,			EDIF_TOK_STRING),
+  BE(f_StringDisplay,		EDIF_TOK_STRINGDISPLAY),
+  BE(f_Strong,			EDIF_TOK_STRONG),
+  BE(f_Symbol,			EDIF_TOK_SYMBOL),
+  BE(f_Symmetry,		EDIF_TOK_SYMMETRY),
+  BE(f_Table,			EDIF_TOK_TABLE),
+  BE(f_TableDefault,		EDIF_TOK_TABLEDEFAULT),
+  BE(f_Technology,		EDIF_TOK_TECHNOLOGY),
+  BE(f_TimeInterval,		EDIF_TOK_TIMEINTERVAL),
+  BE(f_Timing,			EDIF_TOK_TIMING),
+  BE(f_Transform,		EDIF_TOK_TRANSFORM),
+  BE(f_Transition,		EDIF_TOK_TRANSITION),
+  BE(f_Trigger,			EDIF_TOK_TRIGGER),
+  BE(f_Union,			EDIF_TOK_UNION),
+  BE(f_View,			EDIF_TOK_VIEW),
+  BE(f_ViewList,		EDIF_TOK_VIEWLIST),
+  BE(f_ViewMap,			EDIF_TOK_VIEWMAP),
+  BE(f_ViewRef,			EDIF_TOK_VIEWREF),
+  BE(f_Visible,			EDIF_TOK_VISIBLE),
+  BE(f_VoltageMap,		EDIF_TOK_VOLTAGEMAP),
+  BE(f_WaveValue,		EDIF_TOK_WAVEVALUE),
+  BE(f_Weak,			EDIF_TOK_WEAK),
+  BE(f_WeakJoined,		EDIF_TOK_WEAKJOINED),
+  BE(f_When,			EDIF_TOK_WHEN),
+  BE(f_Written,			EDIF_TOK_WRITTEN)
+};
+static int BinderDefSize = sizeof(BinderDef) / sizeof(Binder);
+/*
+ *	Keyword table:
+ *
+ *	  This hash table holds all strings which may have to be matched
+ *	to. WARNING: it is assumed that there is no overlap of the 'token'
+ *	and 'context' strings.
+ */
+typedef struct Keyword {
+  struct Keyword *Next;	 	/* pointer to next entry */
+  const char *String;			/* pointer to associated string */
+} Keyword;
+#define	KEYWORD_HASH	127	/* hash table size */
+static Keyword *KeywordTable[KEYWORD_HASH];
+/*
+ *	Enter keyword:
+ *
+ *	  The passed string is entered into the keyword hash table.
+ */
+static void EnterKeyword(const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register Keyword *key;
+  register unsigned int hsh;
+  register const char *cp;
+  /*
+   *	Create the hash code, and add an entry to the table.
+   */
+  for (hsh = 0, cp = str; *cp; hsh += hsh + *cp++);
+  hsh %= KEYWORD_HASH;
+  key = (Keyword *) Malloc(sizeof(Keyword));
+  key->Next = KeywordTable[hsh];
+  (KeywordTable[hsh] = key)->String = str;
+}
+/*
+ *	Find keyword:
+ *
+ *	  The passed string is located within the keyword table. If an
+ *	entry exists, then the value of the keyword string is returned. This
+ *	is real useful for doing string comparisons by pointer value later.
+ *	If there is no match, a NULL is returned.
+ */
+static const char *FindKeyword(const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register Keyword *wlk,*owk;
+  register unsigned int hsh;
+  register char *cp;
+  char lower[IDENT_LENGTH + 1];
+  /*
+   *	Create a lower case copy of the string.
+   */
+  for (cp = lower; *str;)
+    if (isupper( (int) *str))
+      *cp++ = tolower( (int) *str++);
+    else
+      *cp++ = *str++;
+  *cp = '\0';
+  /*
+   *	Search the hash table for a match.
+   */
+  for (hsh = 0, cp = lower; *cp; hsh += hsh + *cp++);
+  hsh %= KEYWORD_HASH;
+  for (owk = NULL, wlk = KeywordTable[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (!strcmp(wlk->String,lower)){
+      /*
+       *	Readjust the LRU.
+       */
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = KeywordTable[hsh];
+      	KeywordTable[hsh] = wlk;
+      }
+      return (wlk->String);
+    }
+  return NULL;
+}
+/*
+ *	Token hash table.
+ */
+#define	TOKEN_HASH	51
+static Token *TokenHash[TOKEN_HASH];
+/*
+ *	Find token:
+ *
+ *	  A pointer to the token of the passed code is returned. If
+ *	no such beastie is present a NULL is returned instead.
+ */
+static Token *FindToken(register int cod)
+{
+  /*
+   *	Locals.
+   */
+  register Token *wlk,*owk;
+  register unsigned int hsh;
+  /*
+   *	Search the hash table for a matching token.
+   */
+  hsh = cod % TOKEN_HASH;
+  for (owk = NULL, wlk = TokenHash[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (cod == wlk->Code){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = TokenHash[hsh];
+      	TokenHash[hsh] = wlk;
+      }
+      break;
+    }
+  return wlk;
+}
+/*
+ *	Context hash table.
+ */
+#define	CONTEXT_HASH	127
+static Context *ContextHash[CONTEXT_HASH];
+/*
+ *	Find context:
+ *
+ *	  A pointer to the context of the passed code is returned. If
+ *	no such beastie is present a NULL is returned instead.
+ */
+static Context *FindContext(register int cod)
+{
+  /*
+   *	Locals.
+   */
+  register Context *wlk,*owk;
+  register unsigned int hsh;
+  /*
+   *	Search the hash table for a matching context.
+   */
+  hsh = cod % CONTEXT_HASH;
+  for (owk = NULL, wlk = ContextHash[hsh]; wlk; wlk = (owk = wlk)->Next)
+    if (cod == wlk->Code){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = ContextHash[hsh];
+      	ContextHash[hsh] = wlk;
+      }
+      break;
+    }
+  return wlk;
+}
+/*
+ *	Token stacking variables.
+ */
+#ifdef	DEBUG
+#define	TS_DEPTH	8
+#define	TS_MASK		(TS_DEPTH - 1)
+static unsigned int TSP = 0;		/* token stack pointer */
+static char *TokenStack[TS_DEPTH];	/* token name strings */
+static short TokenType[TS_DEPTH];	/* token types */
+/*
+ *	Stack:
+ *
+ *	  Add a token to the debug stack. The passed string and type are
+ *	what is to be pushed.
+ */
+static void Stack(char * str, int typ)
+{
+  /*
+   *	Free any previous string, then push.
+   */
+  if (TokenStack[TSP & TS_MASK])
+    Free(TokenStack[TSP & TS_MASK]);
+  TokenStack[TSP & TS_MASK] = strcpy((char *)Malloc(strlen(str) + 1),str);
+  TokenType[TSP & TS_MASK] = typ;
+  TSP += 1;
+}
+/*
+ *	Dump stack:
+ *
+ *	  This displays the last set of accumulated tokens.
+ */
+static void DumpStack()
+{
+  /*
+   *	Locals.
+   */
+  register int i;
+  register Context *cxt;
+  register Token *tok;
+  register char *nam;
+  FILE *Error = stderr;
+  /*
+   *	Run through the list displaying the oldest first.
+   */
+  fprintf(Error,"\n\n");
+  for (i = 0; i < TS_DEPTH; i += 1)
+    if (TokenStack[(TSP + i) & TS_MASK]){
+      /*
+       *	Get the type name string.
+       */
+      if ((cxt = FindContext(TokenType[(TSP + i) & TS_MASK])) != NULL)
+        nam = cxt->Name;
+      else if ((tok = FindToken(TokenType[(TSP + i) & TS_MASK])) != NULL)
+        nam = tok->Name;
+      else switch (TokenType[(TSP + i) & TS_MASK]){
+      	case EDIF_TOK_IDENT:	nam = "IDENT";		break;
+      	case EDIF_TOK_INT:	nam = "INT";		break;
+      	case EDIF_TOK_KEYWORD:	nam = "KEYWORD";	break;
+      	case EDIF_TOK_STR:	nam = "STR";		break;
+      	default:	nam = "?";		break;
+      }
+      /*
+       *	Now print the token state.
+       */
+      fprintf(Error,"%2d %-16.16s '%s'\n",TS_DEPTH - i,nam,
+        TokenStack[(TSP + i) & TS_MASK]);
+    }
+  fprintf(Error,"\n");
+}
+#else
+#define	Stack(s,t)
+#endif	/* DEBUG */
+/*
+ *	Parser state variables.
+ */
+static FILE *Input = NULL;		/* input stream */
+static FILE *Error = NULL;		/* error stream */
+static char *InFile;			/* file name on the input stream */
+static long LineNumber;			/* current input line number */
+static ContextCar *CSP = NULL;		/* top of context stack */
+static char yytext[IDENT_LENGTH + 1];	/* token buffer */
+static char CharBuf[IDENT_LENGTH + 1];	/* garbage buffer */
+/*
+ *	yyerror:
+ *
+ *	  Standard error reporter, it prints out the passed string
+ *	preceeded by the current filename and line number.
+ */
+static void yyerror(const char *ers)
+{
+#ifdef	DEBUG
+  DumpStack();
+#endif	/* DEBUG */
+  fprintf(Error,"%s, line %ld: %s\n",InFile,LineNumber,ers);
+}
+/*
+ *	String bucket definitions.
+ */
+#define	BUCKET_SIZE	64
+typedef struct Bucket {
+  struct Bucket *Next;			/* pointer to next bucket */
+  int Index;				/* pointer to next free slot */
+  char Data[BUCKET_SIZE];		/* string data */
+} Bucket;
+static Bucket *CurrentBucket = NULL;	/* string bucket list */
+static int StringSize = 0;		/* current string length */
+/*
+ *	Push string:
+ *
+ *	  This adds the passed charater to the current string bucket.
+ */
+static void PushString(char chr)
+{
+  /*
+   *	Locals.
+   */
+  register Bucket *bck;
+  /*
+   *	Make sure there is room for the push.
+   */
+  if ((bck = CurrentBucket)->Index >= BUCKET_SIZE){
+    bck = (Bucket *) Malloc(sizeof(Bucket));
+    bck->Next = CurrentBucket;
+    (CurrentBucket = bck)->Index = 0;
+  }
+  /*
+   *	Push the character.
+   */
+  bck->Data[bck->Index++] = chr;
+  StringSize += 1;
+}
+/*
+ *	Form string:
+ *
+ *	  This converts the current string bucket into a real live string,
+ *	whose pointer is returned.
+ */
+static char *FormString()
+{
+  /*
+   *	Locals.
+   */
+  register Bucket *bck;
+  register char *cp;
+  /*
+   *	Allocate space for the string, set the pointer at the end.
+   */
+  cp = (char *) Malloc(StringSize + 1);
+
+  cp += StringSize;
+  *cp-- = '\0';
+  /*
+   *	Yank characters out of the bucket.
+   */
+  for (bck = CurrentBucket; bck->Index || bck->Next;){
+    if (!bck->Index){
+      CurrentBucket = bck->Next;
+      Free(bck);
+      bck = CurrentBucket;
+    }
+    *cp-- = bck->Data[--bck->Index];
+  }
+  /* reset buffer size  to zero */
+  StringSize =0;
+  return (cp + 1);
+}
+/*
+ *	Parse EDIF:
+ *
+ *	  This builds the context tree and then calls the real parser.
+ *	It is passed two file streams, the first is where the input comes
+ *	from; the second is where error messages get printed.
+ */
+void ParseEDIF(char* filename,FILE* err)
+{
+  /*
+   *	Locals.
+   */
+  register int i;
+  static int ContextDefined = 1;
+  /*
+   *	Set up the file state to something useful.
+   */
+  InFile = filename;
+  Input = pcb_fopen(filename, "r");
+  Error = err;
+  LineNumber = 1;
+  /*
+   *	Define both the enabled token and context strings.
+   */
+  if (ContextDefined){
+    for (i = TokenDefSize; i--; EnterKeyword(TokenDef[i].Name)){
+      register unsigned int hsh;
+      hsh = TokenDef[i].Code % TOKEN_HASH;
+      TokenDef[i].Next = TokenHash[hsh];
+      TokenHash[hsh] = &TokenDef[i];
+    }
+    for (i = ContextDefSize; i--; EnterKeyword(ContextDef[i].Name)){
+      register unsigned int hsh;
+      hsh = ContextDef[i].Code % CONTEXT_HASH;
+      ContextDef[i].Next = ContextHash[hsh];
+      ContextHash[hsh] = &ContextDef[i];
+    }
+    /*
+     *	Build the context tree.
+     */
+    for (i = BinderDefSize; i--;){
+      register Context *cxt;
+      register int j;
+      /*
+       *	Define the current context to have carriers bound to it.
+       */
+      cxt = FindContext(BinderDef[i].Origin);
+      for (j = BinderDef[i].FollowerSize; j--;){
+        register ContextCar *cc;
+        /*
+         *	Add carriers to the current context.
+         */
+        cc = (ContextCar *) Malloc(sizeof(ContextCar));
+        cc->Next = cxt->Context;
+        (cxt->Context = cc)->Context =
+          FindContext(PCB_ABS(BinderDef[i].Follower[j]));
+        cc->u.Single = BinderDef[i].Follower[j] < 0;
+      }
+    }
+    /*
+     *	Build the token tree.
+     */
+    for (i = TieDefSize; i--;){
+      register Context *cxt;
+      register int j;
+      /*
+       *	Define the current context to have carriers bound to it.
+       */
+      cxt = FindContext(TieDef[i].Origin);
+      for (j = TieDef[i].EnableSize; j--;){
+        register TokenCar *tc;
+        /*
+         *	Add carriers to the current context.
+         */
+        tc = (TokenCar *) Malloc(sizeof(TokenCar));
+        tc->Next = cxt->Token;
+        (cxt->Token = tc)->Token = FindToken(TieDef[i].Enable[j]);
+      }
+    }
+    /*
+     *	Put a bogus context on the stack which has 'EDIF' as its
+     *	follower.
+     */
+    CSP = (ContextCar *) Malloc(sizeof(ContextCar));
+    CSP->Next = NULL;
+    CSP->Context = FindContext(0);
+    CSP->u.Used = NULL;
+    ContextDefined = 0;
+  }
+  /*
+   *	Create an initial, empty string bucket.
+   */
+  CurrentBucket = (Bucket *) Malloc(sizeof(Bucket));
+  CurrentBucket->Next = 0;
+  CurrentBucket->Index = 0;
+  /*
+   *	Fill the token stack with NULLs if debugging is enabled.
+   */
+#ifdef	DEBUG
+  for (i = TS_DEPTH; i--; TokenStack[i] = NULL)
+    if (TokenStack[i])
+      Free(TokenStack[i]);
+  TSP = 0;
+#endif	/* DEBUG */
+  /*
+   *	Go parse things!
+   */
+  edifparse();
+}
+/*
+ *	Match token:
+ *
+ *	  The passed string is looked up in the current context's token
+ *	list to see if it is enabled. If so the token value is returned,
+ *	if not then zero.
+ */
+static int MatchToken(register const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register TokenCar *wlk,*owk;
+  /*
+   *	Convert the string to the proper form, then search the token
+   *	carrier list for a match.
+   */
+  str = FindKeyword(str);
+  for (owk = NULL, wlk = CSP->Context->Token; wlk; wlk = (owk = wlk)->Next)
+    if (str == wlk->Token->Name){
+      if (owk){
+        owk->Next = wlk->Next;
+        wlk->Next = CSP->Context->Token;
+        CSP->Context->Token = wlk;
+      }
+      return (wlk->Token->Code);
+    }
+  return 0;
+}
+/*
+ *	Match context:
+ *
+ *	  If the passed keyword string is within the current context, the
+ *	new context is pushed and token value is returned. A zero otherwise.
+ */
+static int MatchContext(register const char * str)
+{
+  /*
+   *	Locals.
+   */
+  register ContextCar *wlk,*owk;
+  /*
+   *	See if the context is present.
+   */
+  str = FindKeyword(str);
+  for (owk = NULL, wlk = CSP->Context->Context; wlk; wlk = (owk = wlk)->Next)
+    if (str == wlk->Context->Name){
+      if (owk){
+      	owk->Next = wlk->Next;
+      	wlk->Next = CSP->Context->Context;
+      	CSP->Context->Context = wlk;
+      }
+      /*
+       *	If a single context, make sure it isn't already used.
+       */
+      if (wlk->u.Single){
+      	register UsedCar *usc;
+      	for (usc = CSP->u.Used; usc; usc = usc->Next)
+      	  if (usc->Code == wlk->Context->Code)
+      	    break;
+      	if (usc){
+      	  sprintf(CharBuf,"'%s' is used more than once within '%s'",
+      	    str,CSP->Context->Name);
+      	  yyerror(CharBuf);
+      	} else {
+      	  usc = (UsedCar *) Malloc(sizeof(UsedCar));
+      	  usc->Next = CSP->u.Used;
+      	  (CSP->u.Used = usc)->Code = wlk->Context->Code;
+      	}
+      }
+      /*
+       *	Push the new context.
+       */
+      owk = (ContextCar *) Malloc(sizeof(ContextCar));
+      owk->Next = CSP;
+      (CSP = owk)->Context = wlk->Context;
+      owk->u.Used = NULL;
+      return (wlk->Context->Code);
+    }
+  return 0;
+}
+/*
+ *	PopC:
+ *
+ *	  This pops the current context.
+ */
+static void PopC()
+{
+  /*
+   *	Locals.
+   */
+  register UsedCar *usc;
+  register ContextCar *csp;
+  /*
+   *	Release single markers and pop context.
+   */
+  while ( (usc = CSP->u.Used) ){
+    CSP->u.Used = usc->Next;
+    Free(usc);
+  }
+  csp = CSP->Next;
+  Free(CSP);
+  CSP = csp;
+}
+/*
+ *	Lexical analyzer states.
+ */
+#define	L_START		0
+#define	L_INT		1
+#define	L_IDENT		2
+#define	L_KEYWORD	3
+#define	L_STRING	4
+#define	L_KEYWORD2	5
+#define	L_ASCIICHAR	6
+#define	L_ASCIICHAR2	7
+/*
+ *	yylex:
+ *
+ *	  This is the lexical analyzer called by the YACC/BISON parser.
+ *	It returns a pretty restricted set of token types and does the
+ *	context movement when acceptable keywords are found. The token
+ *	value returned is a NULL terminated string to allocated storage
+ *	(ie - it should get released some time) with some restrictions.
+ *	  The token value for integers is strips a leading '+' if present.
+ *	String token values have the leading and trailing '"'-s stripped.
+ *	'%' conversion characters in string values are passed converted.
+ *	The '(' and ')' characters do not have a token value.
+ */
+static int yylex()
+{
+  /*
+   *	Locals.
+   */
+  register int c,s,l;
+  /*
+   *	Keep on sucking up characters until we find something which
+   *	explicitly forces us out of this function.
+   */
+  for (s = L_START, l = 0; 1;){
+    yytext[l++] = c = Getc(Input);
+    switch (s){
+      /*
+       *	Starting state, look for something resembling a token.
+       */
+      case L_START:
+        if (isdigit(c) || c == '-')
+          s = L_INT;
+        else if (isalpha(c) || c == '&')
+          s = L_IDENT;
+        else if (isspace(c)){
+          if (c == '\n')
+            LineNumber += 1;
+          l = 0;
+        } else if (c == '('){
+          l = 0;
+          s = L_KEYWORD;
+        } else if (c == '"')
+          s = L_STRING;
+        else if (c == '+'){
+          l = 0;				/* strip '+' */
+          s = L_INT;
+        } else if (c == EOF)
+          return ('\0');
+        else {
+          yytext[1] = '\0';
+          Stack(yytext,c);
+          return c;
+        }
+        break;
+      /*
+       *	Suck up the integer digits.
+       */
+      case L_INT:
+        if (isdigit(c))
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext,EDIF_TOK_INT);
+        return EDIF_TOK_INT;
+      /*
+       *	Grab an identifier, see if the current context enables
+       *	it with a specific token value.
+       */
+      case L_IDENT:
+        if (isalpha(c) || isdigit(c) || c == '_')
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        if (CSP->Context->Token && (c = MatchToken(yytext))){
+          Stack(yytext,c);
+          return c;
+        }
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext, EDIF_TOK_IDENT);
+        return EDIF_TOK_IDENT;
+      /*
+       *	Scan until you find the start of an identifier, discard
+       *	any whitespace found. On no identifier, return a '('.
+       */
+      case L_KEYWORD:
+        if (isalpha(c) || c == '&'){
+          s = L_KEYWORD2;
+          break;
+        } else if (isspace(c)){
+          l = 0;
+          break;
+        }
+        Ungetc(c);
+        Stack("(",'(');
+        return ('(');
+      /*
+       *	Suck up the keyword identifier, if it matches the set of
+       *	allowable contexts then return its token value and push
+       *	the context, otherwise just return the identifier string.
+       */
+      case L_KEYWORD2:
+        if (isalpha(c) || isdigit(c) || c == '_')
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        if ( (c = MatchContext(yytext)) ){
+          Stack(yytext,c);
+          return c;
+        }
+        yylval.s = strcpy((char *)Malloc(l + 1),yytext);
+        Stack(yytext, EDIF_TOK_KEYWORD);
+        return EDIF_TOK_KEYWORD;
+      /*
+       *	Suck up string characters but once resolved they should
+       *	be deposited in the string bucket because they can be
+       *	arbitrarily long.
+       */
+      case L_STRING:
+        if (c == '\n')
+          LineNumber += 1;
+        else if (c == '\r')
+          ;
+        else if (c == '"' || c == EOF){
+          yylval.s = FormString();
+          Stack(yylval.s, EDIF_TOK_STR);
+          return EDIF_TOK_STR;
+        } else if (c == '%')
+          s = L_ASCIICHAR;
+        else
+          PushString(c);
+        l = 0;
+        break;
+      /*
+       *	Skip white space and look for integers to be pushed
+       *	as characters.
+       */
+      case L_ASCIICHAR:
+        if (isdigit(c)){
+          s = L_ASCIICHAR2;
+          break;
+        } else if (c == '%' || c == EOF)
+          s = L_STRING;
+        else if (c == '\n')
+          LineNumber += 1;
+        l = 0;
+        break;
+      /*
+       *	Convert the accumulated integer into a char and push.
+       */
+      case L_ASCIICHAR2:
+        if (isdigit(c))
+          break;
+        Ungetc(c);
+        yytext[--l] = '\0';
+        PushString(atoi(yytext));
+        s = L_ASCIICHAR;
+        l = 0;
+        break;
+    }
+  }
+}
+
+int ReadEdifNetlist(char *filename)
+{
+	pcb_message(PCB_MSG_INFO, _("Importing edif netlist %s\n"), filename);
+	ParseEDIF(filename, NULL);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_edif/edif_parse.h
===================================================================
--- tags/2.0.1/src_plugins/import_edif/edif_parse.h	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/edif_parse.h	(revision 18980)
@@ -0,0 +1,33 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  Copyright (C) 2006 Jeffry C Bailey
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+#ifndef	PCB_EDIF_PARSE_H
+#define	PCB_EDIF_PARSE_H
+
+void ParseEDIF(char *filename, FILE * err);
+
+
+#endif /* PCB_EDIF_PARSE_H */
Index: tags/2.0.1/src_plugins/import_edif/import_edif.c
===================================================================
--- tags/2.0.1/src_plugins/import_edif/import_edif.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/import_edif.c	(revision 18980)
@@ -0,0 +1,101 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, io_kicad_legacy, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "plugins.h"
+#include "plug_import.h"
+#include "netlist.h"
+#include "rats_patch.h"
+
+/* for pcb_sort_library only */
+#include "plug_io.h"
+
+
+static pcb_plug_import_t import_edif;
+
+int edif_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
+{
+	char buf[65];
+	int len;
+	char *p;
+
+	if (aspects != IMPORT_ASPECT_NETLIST)
+		return 0; /* only pure netlist import is supported */
+
+	if (fp == NULL)
+		return 0; /* only importing from a file is supported */
+
+	/* If the header contains "edif", it is supported */
+	len = fread(buf, 1, sizeof(buf) - 1, fp);
+	buf[len] = '\0';
+	for(p = buf; *p != '\0'; p++)
+		*p = tolower((int) *p);
+	if (strstr(buf, "edif") != NULL)
+		return 100;
+
+	/* Else don't even attempt to load it */
+	return 0;
+}
+
+
+extern int ReadEdifNetlist(char *filename);
+static int edif_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn)
+{
+	int ret = ReadEdifNetlist((char *)fn);
+	if (ret == 0) {
+		pcb_sort_netlist();
+		pcb_ratspatch_make_edited(PCB);
+	}
+	return ret;
+}
+
+int pplg_check_ver_import_edif(int ver_needed) { return 0; }
+
+void pplg_uninit_import_edif(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_edif);
+}
+
+int pplg_init_import_edif(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	import_edif.plugin_data = NULL;
+
+	import_edif.fmt_support_prio = edif_support_prio;
+	import_edif.import           = edif_import;
+
+	PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_edif);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/import_edif/import_edif.pup
===================================================================
--- tags/2.0.1/src_plugins/import_edif/import_edif.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_edif/import_edif.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import edif
+$long Import plugin for netlists in the EDIF format.
+$state works
+$fmt-native no
+$fmt-feature-r flat netlist from EDIF
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_fpcb_nl/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_fpcb_nl/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_fpcb_nl/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_fpcb_nl
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_fpcb_nl/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_fpcb_nl/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_fpcb_nl/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_fpcb_nl}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_fpcb_nl/fpcb_nl.o @]
+
+switch /local/pcb/import_fpcb_nl/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_fpcb_nl/fpcb_nl.c
===================================================================
--- tags/2.0.1/src_plugins/import_fpcb_nl/fpcb_nl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_fpcb_nl/fpcb_nl.c	(revision 18980)
@@ -0,0 +1,207 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  Freepcb netlist import
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <qparse/qparse.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+
+static const char *fpcb_nl_cookie = "fpcb_nl importer";
+
+/* remove leading whitespace */
+#define ltrim(s) while(isspace(*s)) s++
+
+/* remove trailing newline */
+#define rtrim(s) \
+	do { \
+		char *end; \
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \
+			*end = '\0'; \
+	} while(0)
+
+static int fpcb_nl_load(const char *fn)
+{
+	FILE *f;
+	char *line, *curr, *next, *fp, *tn, buff[8192], signame[512];
+	enum { MODE_NONE, MODE_PART, MODE_NET, MODE_SIGNAL } mode = MODE_NONE;
+	int anon = 0;
+
+	f = pcb_fopen(fn, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open %s for read\n", fn);
+		return -1;
+	}
+
+	pcb_actionl("ElementList", "start", NULL);
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	while((line = fgets(buff, sizeof(buff), f)) != NULL) {
+		rtrim(line);
+
+		/* parse directive */
+		if (*line == '*') {
+			if (pcb_strcasecmp(line, "*END*") == 0)
+				break;
+			else if (pcb_strcasecmp(line, "*PART*") == 0)
+				mode = MODE_PART;
+			else if (pcb_strcasecmp(line, "*NET*") == 0)
+				mode = MODE_NET;
+			else if (pcb_strncasecmp(line, "*SIGNAL*", 8) == 0) {
+				*signame = '\0';
+				if ((mode == MODE_NET) || (mode == MODE_SIGNAL)) {
+					int len;
+					mode = MODE_SIGNAL;
+					line += 9;
+					ltrim(line);
+					len = strlen(line);
+					if (len == 0) {
+						pcb_message(PCB_MSG_ERROR, "Empty/missing net name in *SINGAL*\n");
+						sprintf(signame, "pcbrndanonymous%d", anon++);
+					}
+					else {
+						if (len > sizeof(signame)-1) {
+							len = sizeof(signame)-1;
+							pcb_message(PCB_MSG_ERROR, "Net name %s is too long, truncating.\nThis may result in broken netlist, please use shorter names \n", line);
+						}
+						memcpy(signame, line, len);
+						signame[len] = '\0';
+					}
+				}
+				else
+					mode = MODE_NONE;
+			}
+			continue;
+		}
+
+		switch(mode) {
+			case MODE_PART:
+				if (*line == '\0')
+					continue;
+				fp = strpbrk(line, " \t");
+				if (fp != NULL) {
+					*fp = '\0';
+					fp++;
+					ltrim(fp);
+				}
+				if ((fp != NULL) && (*fp != '\0')) {
+					pcb_actionl("ElementList", "Need", line, fp, "", NULL);
+				}
+				else
+					pcb_message(PCB_MSG_ERROR, "No footprint specified for %s\n", line);
+				break;
+			case MODE_SIGNAL:
+				ltrim(line);
+				for(curr = line; curr != NULL; curr = next) {
+					next = strpbrk(curr, " \t");
+					if (next != NULL) {
+						*next = '\0';
+						next++;
+						ltrim(next);
+					}
+					if (*curr == '\0')
+						continue;
+					tn = strchr(curr, '.');
+					if (tn == NULL) {
+						pcb_message(PCB_MSG_ERROR, "Syntax error in netlist: '%s' in net '%s' should be refdes.termid\n", curr, signame);
+						continue;
+					}
+					*tn = '-';
+					pcb_actionl("Netlist", "Add",  signame, curr, NULL);
+				}
+				break;
+			default: break; /* ignore line */
+		}
+	}
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+	pcb_actionl("ElementList", "Done", NULL);
+
+	fclose(f);
+	return -1;
+}
+
+static const char pcb_acts_LoadFpcbnlFrom[] = "LoadFpcbnlFrom(filename)";
+static const char pcb_acth_LoadFpcbnlFrom[] = "Loads the specified freepcb netlist.";
+fgw_error_t pcb_act_LoadFpcbnlFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadFpcbnlFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load freepcb netlist...",
+																"Picks a freepcb netlist file to load.\n",
+																default_file, ".net", "freepcb", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	PCB_ACT_IRES(fpcb_nl_load(fname));
+	return 0;
+}
+
+pcb_action_t fpcb_nl_action_list[] = {
+	{"LoadFpcbnlFrom", pcb_act_LoadFpcbnlFrom, pcb_acth_LoadFpcbnlFrom, pcb_acts_LoadFpcbnlFrom}
+};
+
+PCB_REGISTER_ACTIONS(fpcb_nl_action_list, fpcb_nl_cookie)
+
+int pplg_check_ver_import_fpcb_nl(int ver_needed) { return 0; }
+
+void pplg_uninit_import_fpcb_nl(void)
+{
+	pcb_remove_actions_by_cookie(fpcb_nl_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_fpcb_nl(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(fpcb_nl_action_list, fpcb_nl_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_fpcb_nl/import_fpcb_nl.pup
===================================================================
--- tags/2.0.1/src_plugins/import_fpcb_nl/import_fpcb_nl.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_fpcb_nl/import_fpcb_nl.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import freepcb netlist
+$long Import the netlist and footprints from freepcb format (exported by e.g. easyeda)
+$state works
+$fmt-native no
+$fmt-feature-r import netlist and footprint names from freepcb netlist
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_hpgl/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_hpgl/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_hpgl/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_hpgl
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_hpgl/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_hpgl/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_hpgl/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {import_hpgl}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/import_hpgl/hpgl.o
+	$(SRC_3RD_DIR)/libuhpgl/parse.o
+@]
+
+switch /local/pcb/import_hpgl/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_hpgl/hpgl.c
===================================================================
--- tags/2.0.1/src_plugins/import_hpgl/hpgl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_hpgl/hpgl.c	(revision 18980)
@@ -0,0 +1,193 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  HP-GL import HID
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libuhpgl/libuhpgl.h>
+#include <libuhpgl/parse.h>
+
+#include "board.h"
+#include "conf_core.h"
+#include "data.h"
+#include "buffer.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+
+static const char *hpgl_cookie = "hpgl importer";
+
+#define HPGL2CRD_D(crd)   (PCB_MM_TO_COORD((double)crd*0.025))
+#define HPGL2CRD_X(crd)   (PCB_MM_TO_COORD((double)crd*0.025))
+#define HPGL2CRD_Y(crd)   (PCB_MM_TO_COORD((double)crd*(-0.025)))
+
+static pcb_layer_t *get_pen_layer(pcb_data_t *data, int pen)
+{
+	int n, old_len;
+	pen = pen % PCB_MAX_LAYER;
+
+	if (pen >= data->LayerN) {
+		old_len = data->LayerN;
+		data->LayerN = pen+1;
+/*		data->Layer = realloc(data->Layer, sizeof(pcb_layer_t) * data->LayerN);*/
+		for(n = old_len; n < data->LayerN; n++) {
+			memset(&data->Layer[n], 0, sizeof(pcb_layer_t));
+			pcb_layer_real2bound(&data->Layer[n], &PCB->Data->Layer[n], 0);
+			free((char *)data->Layer[n].name);
+			data->Layer[n].name = pcb_strdup_printf("hpgl_pen_%d", n);
+			data->Layer[n].parent.data = data;
+			data->Layer[n].parent_type = PCB_PARENT_DATA;
+			data->Layer[n].type = PCB_OBJ_LAYER;
+		}
+	}
+
+	return &data->Layer[pen];
+}
+
+static int load_line(uhpgl_ctx_t *ctx, uhpgl_line_t *line)
+{
+	pcb_data_t *data = (pcb_data_t *)ctx->user_data;
+	pcb_layer_t *layer = get_pen_layer(data, line->pen);
+	pcb_line_new(layer,
+		HPGL2CRD_X(line->p1.x), HPGL2CRD_Y(line->p1.y), HPGL2CRD_X(line->p2.x), HPGL2CRD_Y(line->p2.y), 
+		conf_core.design.line_thickness, 2 * conf_core.design.clearance,
+		pcb_flag_make((conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)));
+	return 0;
+}
+
+static int load_arc(uhpgl_ctx_t *ctx, uhpgl_arc_t *arc)
+{
+	pcb_data_t *data = (pcb_data_t *)ctx->user_data;
+	pcb_layer_t *layer = get_pen_layer(data, arc->pen);
+
+	pcb_arc_new(layer,
+		HPGL2CRD_X(arc->center.x), HPGL2CRD_Y(arc->center.y),
+		HPGL2CRD_D(arc->r), HPGL2CRD_D(arc->r),
+		arc->starta+180, arc->deltaa,
+		conf_core.design.line_thickness, 2 * conf_core.design.clearance,
+		pcb_flag_make((conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)), pcb_true);
+
+	return 0;
+}
+
+static int load_poly(uhpgl_ctx_t *ctx, uhpgl_poly_t *poly)
+{
+/*	pcb_data_t *data = (pcb_data_t *)ctx->user_data;*/
+	pcb_message(PCB_MSG_ERROR, "HPGL: polygons are not yet supported\n");
+	return 0;
+}
+
+static int hpgl_load(const char *fname)
+{
+	FILE *f;
+	uhpgl_ctx_t ctx;
+
+	memset(&ctx, 0, sizeof(ctx));
+
+	ctx.conf.line  = load_line;
+	ctx.conf.arc   = load_arc;
+	ctx.conf.poly  = load_poly;
+
+	f = pcb_fopen(fname, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error opening HP-GL %s for read\n", fname);
+		return 1;
+	}
+
+	pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+	ctx.user_data = PCB_PASTEBUFFER->Data;
+	PCB_PASTEBUFFER->Data->LayerN = 0;
+
+	if ((uhpgl_parse_open(&ctx) == 0) && (uhpgl_parse_file(&ctx, f) == 0) && (uhpgl_parse_close(&ctx) == 0)) {
+		fclose(f);
+		if (PCB_PASTEBUFFER->Data->LayerN == 0) {
+			pcb_message(PCB_MSG_ERROR, "Error loading HP-GL: could not load any object from %s\n", fname);
+			return 0;
+		}
+		pcb_actionl("mode", "pastebuffer", NULL);
+		return 0;
+	}
+
+	fclose(f);
+	pcb_message(PCB_MSG_ERROR, "Error loading HP-GL at %s:%d.%d: %s\n", fname, ctx.error.line, ctx.error.col, ctx.error.msg);
+
+	return 1;
+}
+
+static const char pcb_acts_LoadHpglFrom[] = "LoadHpglFrom(filename)";
+static const char pcb_acth_LoadHpglFrom[] = "Loads the specified hpgl plot file to the current buffer";
+fgw_error_t pcb_act_LoadHpglFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadHpglFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load HP-GL file...",
+																"Picks a HP-GL plot file to load.\n",
+																default_file, ".hpgl", "hpgl", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 0; /* cancel */
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return hpgl_load(fname);
+}
+
+pcb_action_t hpgl_action_list[] = {
+	{"LoadHpglFrom", pcb_act_LoadHpglFrom, pcb_acth_LoadHpglFrom, pcb_acts_LoadHpglFrom}
+};
+
+PCB_REGISTER_ACTIONS(hpgl_action_list, hpgl_cookie)
+
+int pplg_check_ver_import_hpgl(int ver_needed) { return 0; }
+
+void pplg_uninit_import_hpgl(void)
+{
+	pcb_remove_actions_by_cookie(hpgl_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_hpgl(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(hpgl_action_list, hpgl_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_hpgl/import_hpgl.pup
===================================================================
--- tags/2.0.1/src_plugins/import_hpgl/import_hpgl.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_hpgl/import_hpgl.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import HP-GL plot files
+$long Emulate a plotter and import the plot as lines, arcs and polygons.
+$state works
+$fmt-native no
+$fmt-feature-r import lines, arcs and polygons from HPGL plot files
+$package import-geo
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_ipcd356/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_ipcd356/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ipcd356/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_ipcd356
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_ipcd356/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_ipcd356/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ipcd356/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_ipcd356}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_ipcd356/ipcd356.o @]
+
+switch /local/pcb/import_ipcd356/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_ipcd356/import_ipcd356.pup
===================================================================
--- tags/2.0.1/src_plugins/import_ipcd356/import_ipcd356.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ipcd356/import_ipcd356.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class import
+$short import IPC-D-356 Netlist
+$long IPC-D-356 Netlist and pad centroid import
+$state works
+$fmt-native no
+$fmt-feature-w import IPC-D-356 Netlist (from automated testing)
+$package import-net
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_ipcd356/ipcd356.c
===================================================================
--- tags/2.0.1/src_plugins/import_ipcd356/ipcd356.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ipcd356/ipcd356.c	(revision 18980)
@@ -0,0 +1,454 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  ipc-d-356 import plugin
+ *  pcb-rnd Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <genht/htsp.h>
+#include <genht/hash.h>
+
+#include "board.h"
+#include "data.h"
+#include "safe_fs.h"
+
+#include "conf_core.h"
+#include "hid.h"
+#include "compat_misc.h"
+#include "actions.h"
+#include "plugins.h"
+#include "rtree.h"
+
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+
+static const char *ipcd356_cookie = "ipcd356 importer";
+
+static void set_src(pcb_attribute_list_t *a, const char *fn, long lineno)
+{
+	char src[8192];
+	pcb_snprintf(src, sizeof(src), "ipcd356::%s:%ld", fn, lineno);
+	pcb_attribute_put(a, "source", src);
+}
+
+static int netname_valid(const char *netname)
+{
+	if (*netname == '\0') return 0;
+	if (strcmp(netname, "N/C") == 0) return 0;
+	return 1;
+}
+
+static void extract_field(char *dst, const char *line, int start, int end)
+{
+	int n;
+	line += start;
+	for(n = end-start; n >= 0; n--) {
+		if (*line == ' ')
+			break;
+		*dst++ = *line++;
+	}
+	*dst = '\0';
+}
+
+static int extract_dim(pcb_coord_t *dst, const char *line, int start, int end, int has_sign, int is_mil)
+{
+	char tmp[16];
+	const char *sign = line + start;
+	double d;
+	pcb_bool succ;
+
+	if (has_sign) {
+		if ((*sign != '+') && (*sign != '-') && (*sign != ' ')) {
+			pcb_message(PCB_MSG_WARNING, "Invalid coordinate sign: '%c':\n", *line);
+			return -1;
+		}
+	}
+	extract_field(tmp, line, start, end);
+	d = pcb_get_value(tmp, is_mil ? "mil" : "mm", NULL, &succ);
+	if (!succ)
+		return -1;
+	if (is_mil)
+		d = d / 10.0;
+	else
+		d = d / 1000.0;
+	*dst = pcb_round(d);
+	return 0;
+}
+
+static int extract_int(int *dst, const char *line, int start, int end)
+{
+	char tmp[16], *ends;
+
+	extract_field(tmp, line, start, end);
+	*dst = strtol(tmp, &ends, 10);
+	if (*ends != '\0')
+		return -1;
+	return 0;
+}
+
+typedef struct {
+	int is_via, is_middle, is_plated, side, rot, is_tooling, mask;
+	pcb_coord_t hole, width, height, cx, cy;
+} test_feature_t;
+
+static int parse_feature(char *line, test_feature_t *tf, const char *fn, long lineno, int is_mil, int is_rad, char *netname, char *refdes, char *term)
+{
+	if (line[2] != '7') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld' - does not end in 7\n", line[1], line[2], fn, lineno);
+		return -1;
+	}
+	if (line[26] != '-') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing dash between refdes and pin number\n", fn, lineno);
+		return -1;
+	}
+	extract_field(netname, line, 3, 16);
+	extract_field(refdes,  line, 20, 25);
+	extract_field(term,    line, 27, 30);
+	tf->is_via = (strcmp(refdes, "VIA") == 0);
+	tf->is_middle = (line[31] == 'M');
+	if (line[32] == 'D') {
+		if (extract_dim(&tf->hole, line, 33, 36, 0, is_mil)) {
+			pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid hole dimension\n", fn, lineno);
+			return -1;
+		}
+		if (line[37] == 'P')
+			tf->is_plated = 1;
+		else if (line[37] == 'U')
+			tf->is_plated = 0;
+		else {
+			pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - hole is neither plated nor unplated\n", fn, lineno);
+			return -1;
+		}
+	}
+	else {
+		tf->hole = 0;
+		tf->is_plated = 0;
+	}
+	if (line[38] != 'A') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'A' for access\n", fn, lineno);
+		return -1;
+	}
+	if (extract_int(&tf->side, line, 39, 40)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid access side\n", fn, lineno);
+		return -1;
+	}
+	if (line[41] != 'X') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'X'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_dim(&tf->cx, line, 42, 48, 1, is_mil)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid X dimension\n", fn, lineno);
+		return -1;
+	}
+	if (line[49] != 'Y') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'Y'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_dim(&tf->cy, line, 50, 56, 1, is_mil)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid Y dimension\n", fn, lineno);
+		return -1;
+	}
+	if (line[57] != 'X') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing width 'X'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_dim(&tf->width, line, 58, 61, 0, is_mil)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid width dimension\n", fn, lineno);
+		return -1;
+	}
+	if (line[62] != 'Y') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing height 'Y'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_dim(&tf->height, line, 63, 66, 0, is_mil)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		return -1;
+	}
+	if (line[67] != 'R') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing rotation 'R'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_int(&tf->rot, line, 68, 70)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		return -1;
+	}
+	if (line[72] != 'S') {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - solder mask marker 'S'\n", fn, lineno);
+		return -1;
+	}
+	if (extract_int(&tf->mask, line, 73, 73)) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		return -1;
+	}
+	tf->is_tooling = 0;
+
+	switch(line[1]) {
+		case '3': /* tooling feature/hole */
+		case '4': /* tooling hole only */
+			tf->is_tooling = 1;
+		case '1': /* through hole */
+			if (tf->hole == 0) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - thru-hole feature without hole dia\n", fn, lineno);
+				return -1;
+			}
+			break;
+		case '2': /* SMT feature */
+			if (tf->hole > 0) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - SMD feature with hole dia\n", fn, lineno);
+				break;
+			}
+			break;
+		default:
+			pcb_message(PCB_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld - unknown second digit'\n", line[1], line[2], fn, lineno);
+	}
+	return 0;
+}
+
+static void create_feature(pcb_board_t *pcb, pcb_data_t *data, test_feature_t *tf, const char *fn, long lineno, const char *term)
+{
+	pcb_pstk_t *ps;
+	pcb_pstk_shape_t sh[6];
+	pcb_coord_t msk = PCB_MIL_TO_COORD(4), y;
+	int i = 0, thru = (tf->hole > 0) && (tf->is_plated);
+
+	memset(sh, 0, sizeof(sh));
+	if (tf->height == 0) {
+		if ((tf->side == 0) || (tf->side == 1) || thru) {
+			sh[i].layer_mask = PCB_LYT_TOP | PCB_LYT_COPPER; pcb_shape_oval(&sh[i], tf->width, tf->width); i++;
+		}
+		if ((tf->side == 0) || (tf->side == 2) || thru) {
+			sh[i].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER; pcb_shape_oval(&sh[i], tf->width, tf->width); i++;
+		}
+		if (thru) {
+			sh[i].layer_mask = PCB_LYT_INTERN | PCB_LYT_COPPER; pcb_shape_oval(&sh[i], tf->width, tf->width); i++;
+		}
+		if ((tf->mask == 0) || (tf->mask == 1)) {
+			sh[i].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_MASK; sh[i].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_oval(&sh[i], tf->width + msk, tf->width + msk); i++;
+		}
+		if ((tf->mask == 0) || (tf->mask == 2)) {
+			sh[i].layer_mask = PCB_LYT_TOP | PCB_LYT_MASK; sh[i].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_oval(&sh[i], tf->width + msk, tf->width + msk); i++;
+		}
+	}
+	else {
+		if ((tf->side == 0) || (tf->side == 1) || thru) {
+			sh[i].layer_mask = PCB_LYT_TOP | PCB_LYT_COPPER; pcb_shape_rect(&sh[i], tf->width, tf->height); i++;
+		}
+		if ((tf->side == 0) || (tf->side == 2) || thru) {
+			sh[i].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER; pcb_shape_rect(&sh[i], tf->width, tf->height); i++;
+		}
+		if (thru) {
+			sh[i].layer_mask = PCB_LYT_INTERN | PCB_LYT_COPPER; pcb_shape_rect(&sh[i], tf->width, tf->height); i++;
+		}
+		if ((tf->mask == 0) || (tf->mask == 1)) {
+			sh[i].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_MASK; sh[i].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[i], tf->width + msk, tf->height + msk); i++;
+		}
+		if ((tf->mask == 0) || (tf->mask == 2)) {
+			sh[i].layer_mask = PCB_LYT_TOP | PCB_LYT_MASK; sh[i].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[i], tf->width + msk, tf->height + msk); i++;
+		}
+	}
+
+	y = pcb->MaxHeight - tf->cy;
+	if ((y < 0) || (y > pcb->MaxHeight) || (tf->cx < 0) || (tf->cx > pcb->MaxWidth))
+		pcb_message(PCB_MSG_WARNING, "Test feature ended up out of the board extents in %s:%ld - board too small please use autocrop()\n", fn, lineno);
+	ps = pcb_pstk_new_from_shape(data, tf->cx, y, tf->hole, tf->is_plated, conf_core.design.bloat, sh);
+
+	if (tf->is_middle)
+		pcb_attribute_put(&ps->Attributes, "ipcd356::mid", "yes");
+	if (tf->is_tooling)
+		pcb_attribute_put(&ps->Attributes, "ipcd356::tooling", "yes");
+	if (term)
+		pcb_attribute_put(&ps->Attributes, "term", term);
+}
+
+static int ipc356_parse(pcb_board_t *pcb, FILE *f, const char *fn, htsp_t *subcs, int want_net, int want_pads)
+{
+	char line_[128], *line, netname[16], refdes[8], term[8];
+	long lineno = 0;
+	int is_mil = 1, is_rad = 0;
+	test_feature_t tf;
+	pcb_subc_t *sc;
+	pcb_data_t *data = pcb->Data;
+
+	while((line = fgets(line_, sizeof(line_), f)) != NULL) {
+		lineno++;
+		switch(*line) {
+			case '\r':
+			case '\n':
+			case 'C': /* comment */
+				break;
+			case 'P': /* parameter */
+				if (strncmp(line+3, "UNITS CUST", 10) == 0) {
+					switch(line[14]) {
+						case '0': is_mil = 1; is_rad = 0; break;
+						case '1': is_mil = 0; is_rad = 0; break;
+						case '2': is_mil = 1; is_rad = 1; break;
+					}
+					if (is_rad) {
+						pcb_message(PCB_MSG_ERROR, "Unimplemented unit in %s:%ld - requested radians in rotation, the code doesn't handle that\n", fn, lineno);
+						return 1;
+					}
+				}
+				break;
+			case '3': /* test feature */
+				if (parse_feature(line, &tf, fn, lineno, is_mil, is_rad, netname, refdes, term) != 0)
+					return 1;
+
+				if (subcs != NULL) {
+					sc = htsp_get(subcs, refdes);
+
+					if (sc == NULL) {
+						const char *nr;
+						sc = pcb_subc_alloc();
+						pcb_attribute_put(&sc->Attributes, "refdes", refdes);
+						set_src(&sc->Attributes, fn, lineno);
+						nr = pcb_attribute_get(&sc->Attributes, "refdes");
+						htsp_set(subcs, (char *)nr, sc);
+						pcb_add_subc_to_data(pcb->Data, sc);
+						pcb_subc_bind_globals(pcb, sc);
+					}
+					data = sc->data;
+				}
+
+				if (want_pads)
+					create_feature(pcb, data, &tf, fn, lineno, term);
+	
+				if (want_net && (netname_valid(netname))) {
+					char tn[36];
+					sprintf(tn, "%s-%s", refdes, term);
+					pcb_actionl("Netlist", "Add",  netname, tn, NULL);
+				}
+				break;
+			case '9': /* EOF */
+				if ((line[1] == '9') && (line[2] == '9'))
+					return 0;
+				pcb_message(PCB_MSG_ERROR, "Invalid end-of-file marker in %s:%ld - expected '999'\n", fn, lineno);
+				return 1;
+		}
+	}
+
+	pcb_message(PCB_MSG_ERROR, "Unexpected end of file - expected '999'\n");
+	return 1;
+}
+
+static const char pcb_acts_LoadIpc356From[] = "LoadIpc356From(filename, [nonet], [nopad], [nosubc])";
+static const char pcb_acth_LoadIpc356From[] = "Loads the specified IPC356-D netlist";
+fgw_error_t pcb_act_LoadIpc356From(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	FILE *f;
+	static char *default_file = NULL;
+	const char *fname = NULL;
+	int rs, n, want_subc = 1, want_net = 1, want_pads = 1;
+	htsp_t subcs, *scs = NULL;
+	htsp_entry_t *e;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadIpc356From, fname = argv[1].val.str);
+
+	if ((fname == NULL) || (*fname == '\0')) {
+		fname = pcb_gui->fileselect("Load IPC-D-356 netlist...",
+			"Pick an IPC-D-356 netlist file.\n",
+			default_file, ".net", "ipcd356", HID_FILESELECT_READ);
+		if (fname == NULL) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	f = pcb_fopen(fname, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can't open %s for read\n", fname);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	for(n = 2; n < argc; n++) {
+		const char *s;
+		PCB_ACT_MAY_CONVARG(n, FGW_STR, LoadIpc356From, s = argv[n].val.str);
+		if (strcmp(s, "nonet") == 0) want_net = 0;
+		if (strcmp(s, "nopad") == 0) want_pads = 0;
+		if (strcmp(s, "nosubc") == 0) want_subc = 0;
+	}
+
+	if (!want_pads)
+		want_subc = 0; /* can't load subcircuits if there are no padstacks - they would be all empty */
+
+	if (want_subc) {
+		htsp_init(&subcs, strhash, strkeyeq);
+		scs = &subcs;
+	}
+
+	if (want_net) {
+		pcb_actionl("Netlist", "Freeze", NULL);
+		pcb_actionl("Netlist", "Clear", NULL);
+	}
+
+	rs = ipc356_parse(PCB, f, fname, scs, want_net, want_pads);
+
+	if (want_net) {
+		pcb_actionl("Netlist", "Sort", NULL);
+		pcb_actionl("Netlist", "Thaw", NULL);
+	}
+
+	fclose(f);
+
+	if (want_subc) {
+		for (e = htsp_first(&subcs); e; e = htsp_next(&subcs, e)) {
+			pcb_subc_t *sc = (pcb_subc_t *)e->value;
+			pcb_add_subc_to_data(PCB->Data, sc);
+			pcb_subc_bbox(sc);
+			if (PCB->Data->subc_tree == NULL)
+				PCB->Data->subc_tree = pcb_r_create_tree();
+			pcb_r_insert_entry(PCB->Data->subc_tree, (pcb_box_t *)sc);
+			pcb_subc_rebind(PCB, sc);
+		}
+		htsp_uninit(&subcs);
+	}
+
+	PCB_ACT_IRES(rs);
+	return 0;
+}
+
+pcb_action_t import_ipcd356_action_list[] = {
+	{"LoadIpc356From", pcb_act_LoadIpc356From, pcb_acth_LoadIpc356From, pcb_acts_LoadIpc356From}
+};
+PCB_REGISTER_ACTIONS(import_ipcd356_action_list, ipcd356_cookie)
+
+int pplg_check_ver_import_ipcd356(int ver_needed) { return 0; }
+
+void pplg_uninit_import_ipcd356(void)
+{
+	pcb_remove_actions_by_cookie(ipcd356_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_ipcd356(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(import_ipcd356_action_list, ipcd356_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_ltspice/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_ltspice/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ltspice/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_ltspice
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_ltspice/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_ltspice/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ltspice/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_ltspice}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_ltspice/ltspice.o @]
+
+switch /local/pcb/import_ltspice/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_ltspice/import_ltspice.pup
===================================================================
--- tags/2.0.1/src_plugins/import_ltspice/import_ltspice.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ltspice/import_ltspice.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import ltspice .net+.asc
+$long Import the netlist and footprints from an ltspice .asc and .net pair of files
+$state works
+$fmt-native no
+$fmt-feature-r import netlist and footprint names from ltspice .net and .asc file pairs
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_ltspice/ltspice.c
===================================================================
--- tags/2.0.1/src_plugins/import_ltspice/ltspice.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_ltspice/ltspice.c	(revision 18980)
@@ -0,0 +1,331 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  LTSpice import HID
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2017 Erich Heinzle (non passive footprint parsing)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <qparse/qparse.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+
+static const char *ltspice_cookie = "ltspice importer";
+
+static int ltspice_hdr_asc(FILE *f)
+{
+	char s[1024];
+	while(fgets(s, sizeof(s), f) != NULL)
+		if (strncmp(s, "Version 4", 9) == 0)
+			return 0;
+	return -1;
+}
+
+/* remove leading whitespace */
+#define ltrim(s) while(isspace(*s)) s++
+
+/* remove trailing newline */
+#define rtrim(s) \
+	do { \
+		char *end; \
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \
+			*end = '\0'; \
+	} while(0)
+
+typedef struct {
+	char *refdes;
+	char *value;
+	char *footprint;
+} symattr_t;
+
+
+#define null_empty(s) ((s) == NULL ? "" : (s))
+
+static void sym_flush(symattr_t *sattr)
+{
+/*	pcb_trace("ltspice sym: refdes=%s val=%s fp=%s\n", sattr->refdes, sattr->value, sattr->footprint);*/
+
+	if (sattr->refdes != NULL) {
+		if (sattr->footprint == NULL)
+			pcb_message(PCB_MSG_ERROR, "ltspice: not importing refdes=%s: no footprint specified\n", sattr->refdes);
+		else
+			pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);
+	}
+	free(sattr->refdes); sattr->refdes = NULL;
+	free(sattr->value); sattr->value = NULL;
+	free(sattr->footprint); sattr->footprint = NULL;
+}
+
+static int ltspice_parse_asc(FILE *fa)
+{
+	symattr_t sattr;
+	char line[1024];
+
+	memset(&sattr, 0, sizeof(sattr));
+
+	pcb_actionl("ElementList", "start", NULL);
+
+	while(fgets(line, sizeof(line), fa) != NULL) {
+		char *s;
+		int isPassive = 0;
+		s = line;
+		rtrim(s);
+
+		if (strncmp(s, "SYMBOL", 6) == 0)
+			sym_flush(&sattr);
+		else if (strncmp(s, "SYMATTR", 7) == 0) {
+			s+=8;
+			ltrim(s);
+			if (strncmp(s, "InstName", 8) == 0) {
+				s+=9;
+				ltrim(s);
+				free(sattr.refdes);
+				sattr.refdes = pcb_strdup(s);
+				/* figure out if device is passive or not, as this affects
+				   subsequent parsing of the "SYMATTR VALUE .... " line */
+				if (strncmp(s, "R", 1) != 0 && strncmp(s, "L", 1) != 0 &&
+					strncmp(s, "C", 1) != 0) {
+					isPassive = 0;
+				}
+				else {
+					isPassive = 1;
+				}
+			}
+			else {
+				if (strncmp(s, "Value", 5) == 0) {
+					/* we get around non passives having a device quoted with no 
+					mfg= field in the .net file by parsing the device name for
+					an appended .pcb-rnd-TO92 etc...
+					i.e. parse the following: SYMATTR Value 2N2222.pcb-rnd-TO92 */
+					s+=6;
+					ltrim(s);
+					free(sattr.value);
+					if (isPassive) {
+						sattr.value = pcb_strdup(s);
+					}
+					else {
+						char *fp;
+						/*s+=6;*/
+						fp = strstr(s, ".pcb-rnd-");
+						if (fp != NULL) {
+							sattr.value = pcb_strdup(fp);
+							s = fp;							
+							fp += 9;
+							if (*fp == '"') {
+								char *end;
+								fp++;
+								end = strchr(fp, '"');
+								if (end != NULL)
+									*end = '\0';
+							}
+							free(sattr.footprint);
+							sattr.footprint = pcb_strdup(fp);
+						}
+					}
+				}
+				if (strncmp(s, "SpiceLine", 9) == 0) {
+					/* for passives, the SpiceLine include the "mfg=" field */
+					char *fp;
+					s+=6;
+					fp = strstr(s, "mfg=");
+					if (fp != NULL) {
+						fp += 4;
+						if (*fp == '"') {
+							char *end;
+							fp++;
+							end = strchr(fp, '"');
+							if (end != NULL)
+								*end = '\0';
+						}
+						if (strncmp(fp, ".pcb-rnd-", 9) == 0)
+							fp += 9;
+						if (strncmp(fp, "pcb-rnd-", 8) == 0)
+							fp += 8;
+						free(sattr.footprint);
+						sattr.footprint = pcb_strdup(fp);
+					}
+				}
+				/* nothing stops a user inserting 
+				   "SYMATTR Footprint TO92" if keen in the .asc file */
+				if (strncmp(s, "Footprint", 9) == 0) {
+					s+=10;
+					ltrim(s);
+					free(sattr.footprint);
+					sattr.footprint = pcb_strdup(s);
+				}
+			}
+		}
+	}
+	sym_flush(&sattr);
+	pcb_actionl("ElementList", "Done", NULL);
+	return 0;
+}
+
+static int ltspice_parse_net(FILE *fn)
+{
+	char line[1024];
+
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	while(fgets(line, sizeof(line), fn) != NULL) {
+		int argc;
+		char **argv, *s;
+
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, QPARSE_DOUBLE_QUOTE | QPARSE_SINGLE_QUOTE);
+		if ((argc > 1) && (strcmp(argv[0], "NET") == 0)) {
+			int n;
+			for(n = 2; n < argc; n++) {
+/*				pcb_trace("net-add '%s' '%s'\n", argv[1], argv[n]);*/
+				pcb_actionl("Netlist", "Add",  argv[1], argv[n], NULL);
+			}
+		}
+	}
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+
+	return 0;
+}
+
+
+static int ltspice_load(const char *fname_net, const char *fname_asc)
+{
+	FILE *fn, *fa;
+	int ret = 0;
+
+	fn = pcb_fopen(fname_net, "r");
+	if (fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		return -1;
+	}
+	fa = pcb_fopen(fname_asc, "r");
+	if (fa == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_asc);
+		fclose(fn);
+		return -1;
+	}
+
+	if (ltspice_hdr_asc(fa)) {
+		pcb_message(PCB_MSG_ERROR, "file '%s' doesn't look like a verison 4 asc file\n", fname_asc);
+		goto error;
+	}
+
+
+	if (ltspice_parse_asc(fa) != 0) goto error;
+	if (ltspice_parse_net(fn) != 0) goto error;
+
+	quit:;
+	fclose(fa);
+	fclose(fn);
+	return ret;
+
+	error:
+	ret = -1;
+	goto quit;
+}
+
+static const char pcb_acts_LoadLtspiceFrom[] = "LoadLtspiceFrom(filename)";
+static const char pcb_acth_LoadLtspiceFrom[] = "Loads the specified ltspice .net and .asc file - the netlist must be mentor netlist.";
+fgw_error_t pcb_act_LoadLtspiceFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL, *end;
+	char *fname_asc, *fname_net, *fname_base;
+	static char *default_file = NULL;
+	int rs;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadLtspiceFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load ltspice net+asc file pair...",
+																"Picks a ltspice mentor net or asc file to load.\n",
+																default_file, ".asc", "ltspice", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	end = strrchr(fname, '.');
+	if (end != NULL) {
+		if (strcmp(end, ".net") == 0)
+			fname_base = pcb_strndup(fname, end - fname);
+		else if (strcmp(end, ".asc") == 0)
+			fname_base = pcb_strndup(fname, end - fname);
+	}
+	else
+		fname_base = pcb_strdup(fname);
+
+	fname_net = pcb_strdup_printf("%s.net", fname_base);
+	fname_asc = pcb_strdup_printf("%s.asc", fname_base);
+	free(fname_base);
+
+	rs = ltspice_load(fname_net, fname_asc);
+
+	free(fname_asc);
+	free(fname_net);
+
+	PCB_ACT_IRES(rs);
+	return 0;
+}
+
+pcb_action_t ltspice_action_list[] = {
+	{"LoadLtspiceFrom", pcb_act_LoadLtspiceFrom, pcb_acth_LoadLtspiceFrom, pcb_acts_LoadLtspiceFrom}
+};
+
+PCB_REGISTER_ACTIONS(ltspice_action_list, ltspice_cookie)
+
+int pplg_check_ver_import_ltspice(int ver_needed) { return 0; }
+
+void pplg_uninit_import_ltspice(void)
+{
+	pcb_remove_actions_by_cookie(ltspice_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_ltspice(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(ltspice_action_list, ltspice_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_mentor_sch/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_mentor_sch
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_mentor_sch/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,13 @@
+put /local/pcb/mod {import_mentor_sch}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/import_mentor_sch/netlist_helper.o
+	$(PLUGDIR)/import_mentor_sch/mentor_sch.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/import_mentor_sch/mentor_sch_conf.h}
+
+
+switch /local/pcb/import_mentor_sch/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_mentor_sch/import_mentor_sch.pup
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/import_mentor_sch.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/import_mentor_sch.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class import
+$short import mentor graphics sch
+$long Import Mentor Graphics Design Capture from flattened .edf netlist, using a parts conversion table.
+$state works
+$fmt-native no
+$fmt-feature-r import netlist and footprint names from a flat .edf produced by Mentor Graphics Design Capture
+$package import-net
+default buildin
+dep lib_gensexpr
+autoload 1
Index: tags/2.0.1/src_plugins/import_mentor_sch/mentor_parts.map
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/mentor_parts.map	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/mentor_parts.map	(revision 18980)
@@ -0,0 +1,19 @@
+# Format:
+# - one rulr per line
+# - field separator is |
+# - fields:
+#    1: priority: if multiple rules match for a givem part attrib, pick the highest prio only
+#                 * means "ignore priority, always execute"
+#    2: part attribute name regex - consider the rule only if the part has a matching attribute name
+#    3: part attribute value regex - consider the rule only if value matches; back referenced from add-value
+#    4: add attribute name: add or overwrite attribute on rule match
+#    5: add attribute value: use value for the new attribute; built with back references to part attribute regex
+
+# plain headers
+100|Part Name|Dummy_HDR \([0-9]+\)x\([0-9]+\) P:\([0-9.]+mm\)|footprint|connector(\1, \2, \3)
+
+# last hope...
+10|Part Name|_0402$|footprint|0402
+10|Part Name|_0603$|footprint|0603
+10|Part Name|_1206$|footprint|1206
+10|Part Name|_1210$|footprint|1210
Index: tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch.c
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch.c	(revision 18980)
@@ -0,0 +1,307 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  mentor graphics schematics import plugin
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include <gensexpr/gsxl.h>
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+#include "mentor_sch_conf.h"
+#include "paths.h"
+#include "safe_fs.h"
+
+#include "netlist_helper.h"
+
+conf_mentor_sch_t conf_mentor;
+
+
+static const char *mentor_sch_cookie = "mentor_sch importer";
+
+/* Return the nth child's string of the subtree called subtree_name under node */
+static const char *get_by_name(gsxl_node_t *node, const char *subtree_name, int child_idx)
+{
+	gsxl_node_t *n;
+	for(n = node->children; n != NULL; n = n->next) {
+		if (strcmp(n->str, subtree_name) == 0) {
+			for(n = n->children; (n != NULL) && (child_idx > 0); n = n->next, child_idx--) ;
+			if (n == NULL)
+				return NULL;
+			return n->str;
+		}
+	}
+	return NULL;
+}
+
+static int parse_netlist_instance(nethlp_ctx_t *nhctx, gsxl_node_t *inst)
+{
+	gsxl_node_t *n;
+	const char *refdes = NULL;
+	nethlp_elem_ctx_t ectx;
+
+/*	printf("inst %s\n", inst->children->str); */
+
+	nethlp_elem_new(nhctx, &ectx, inst->children->str);
+
+	for(n = inst->children; n != NULL; n = n->next) {
+		if (strcmp(n->str, "designator") == 0) {
+			refdes = n->children->str;
+/*			printf(" refdes=%s\n", refdes); */
+			nethlp_elem_refdes(&ectx, refdes);
+		}
+		else if (strcmp(n->str, "property") == 0) {
+			const char *key, *val;
+			key = get_by_name(n, "rename", 1);
+			val = get_by_name(n, "string", 0);
+/*			printf(" property '%s'='%s'\n", key, val); */
+			if ((key != NULL) && (val != NULL))
+				nethlp_elem_attr(&ectx, key, val);
+		}
+	}
+
+	nethlp_elem_done(&ectx);
+/*	pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);*/
+	return 0;
+}
+
+static int parse_netlist_net(nethlp_ctx_t *nhctx, gsxl_node_t *net)
+{
+	gsxl_node_t *n, *p;
+	const char *netname = get_by_name(net, "rename", 1);
+	nethlp_net_ctx_t nctx;
+
+	nethlp_net_new(nhctx, &nctx, netname);
+
+	for(n = net->children; n != NULL; n = n->next) {
+		if (strcmp(n->str, "joined") == 0) {
+			for(p = n->children; p != NULL; p = p->next) {
+				if (strcmp(p->str, "portRef") == 0) {
+					const char *part, *pin;
+					pin = p->children->str;
+					part = get_by_name(p, "instanceRef", 0);
+					if ((part != NULL) && (pin != NULL)) {
+						if (*pin == '&')
+							pin++;
+						nethlp_net_add_term(&nctx, part, pin);
+					}
+				}
+			}
+		}
+	}
+	
+	nethlp_net_destroy(&nctx);
+	return 0;
+}
+
+
+static int parse_netlist_view(gsxl_node_t *view)
+{
+	gsxl_node_t *contents, *n;
+	nethlp_ctx_t nhctx;
+	int idx, res = 0, cnt = 0;
+	conf_listitem_t *item;
+	const char *item_str;
+
+	nethlp_new(&nhctx);
+
+	conf_loop_list_str(&conf_mentor.plugins.import_mentor_sch.map_search_paths, item, item_str, idx) {
+		char *p; 
+		pcb_path_resolve(item_str, &p, 0);
+		if (p != NULL) {
+			cnt += nethlp_load_part_map(&nhctx, p);
+			free(p);
+		}
+	}
+	if (cnt == 0)
+		pcb_message(PCB_MSG_WARNING, "Couldn't find any part map rules - check your map_search_paths and rule files\n");
+
+	for(contents = view->children; contents != NULL; contents = contents->next) {
+		if (strcmp(contents->str, "contents") == 0) {
+			printf("--- view\n");
+			for(n = contents->children; n != NULL; n = n->next) {
+				if (strcmp(n->str, "instance") == 0)
+					res |= parse_netlist_instance(&nhctx, n);
+				if (strcmp(n->str, "net") == 0)
+					res |= parse_netlist_net(&nhctx, n);
+			}
+		}
+	}
+
+	nethlp_destroy(&nhctx);
+	return res;
+}
+
+static int mentor_parse_tree(gsxl_dom_t *dom)
+{
+	gsxl_node_t *view, *cell, *library, *vtype;
+
+	/* check the header */
+	if (strcmp(dom->root->str, "edif") != 0) {
+		pcb_message(PCB_MSG_ERROR, "Invalid mentor edf header: not an EDIF file\n");
+		return -1;
+	}
+
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+	pcb_actionl("ElementList", "start", NULL);
+
+	for(library = dom->root->children; library != NULL; library = library->next) {
+		if (strcmp(library->str, "library") == 0) {
+			if (strcmp(library->children->str, "hierarchical") == 0) {
+				for(cell = library->children; cell != NULL; cell = cell->next) {
+					if (strcmp(cell->str, "cell") == 0) {
+						for(view = cell->children; view != NULL; view = view->next) {
+							if (strcmp(view->children->str, "v1") == 0) {
+								vtype = view->children->next;
+								if ((strcmp(vtype->str, "viewType") == 0) && (strcmp(vtype->children->str, "netlist") == 0))
+									parse_netlist_view(view);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	pcb_actionl("ElementList", "Done", NULL);
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+
+/*	for(n = library->children; n != NULL; n = n->next) {
+		printf("n=%s\n", n->str);
+		if (strcmp(n->str, "cell") == 0) { 
+			printf("cell\n");
+		}
+	}*/
+
+
+	return -1;
+}
+
+
+static int mentor_sch_load(const char *fname_net)
+{
+	FILE *fn;
+	gsxl_dom_t dom;
+	int c, ret = 0;
+	gsx_parse_res_t res;
+
+	fn = pcb_fopen(fname_net, "r");
+	if (fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		return -1;
+	}
+
+	gsxl_init(&dom, gsxl_node_t);
+
+	dom.parse.line_comment_char = '#';
+	do {
+		c = fgetc(fn);
+	} while((res = gsxl_parse_char(&dom, c)) == GSX_RES_NEXT);
+	fclose(fn);
+
+	if (res == GSX_RES_EOE) {
+		/* compact and simplify the tree */
+		gsxl_compact_tree(&dom);
+
+		/* recursively parse the dom */
+		ret = mentor_parse_tree(&dom);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Invalid mentor edf: not a valid s-expression file near %d:%d\n", dom.parse.line, dom.parse.col);
+		ret = -1;
+	}
+
+	/* clean up */
+	gsxl_uninit(&dom);
+
+	return ret;
+
+}
+
+static const char pcb_acts_Loadmentor_schFrom[] = "LoadMentorFrom(filename)";
+static const char pcb_acth_Loadmentor_schFrom[] = "Loads the specified Mentor Graphics Design Capture schematics flat .edf file.";
+fgw_error_t pcb_act_LoadMentorFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Loadmentor_schFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load mentor edf netlist file...",
+																"Picks a mentor edf file to load.\n",
+																default_file, ".edf", "mentor_sch", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return mentor_sch_load(fname);
+}
+
+pcb_action_t mentor_sch_action_list[] = {
+	{"LoadMentorFrom", pcb_act_LoadMentorFrom, pcb_acth_Loadmentor_schFrom, pcb_acts_Loadmentor_schFrom}
+};
+
+PCB_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie)
+
+int pplg_check_ver_import_mentor_sch(int ver_needed) { return 0; }
+
+void pplg_uninit_import_mentor_sch(void)
+{
+	pcb_remove_actions_by_cookie(mentor_sch_cookie);
+	conf_unreg_fields("plugins/import_mentor_sch/");
+}
+
+#include "dolists.h"
+int pplg_init_import_mentor_sch(void)
+{
+	PCB_API_CHK_VER;
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_mentor, field,isarray,type_name,cpath,cname,desc,flags);
+#include "mentor_sch_conf_fields.h"
+
+	PCB_REGISTER_ACTIONS(mentor_sch_action_list, mentor_sch_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch_conf.h
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/mentor_sch_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_MENTOR_SCH_CONF_H
+#define PCB_MENTOR_SCH_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct import_mentor_sch {
+			CFT_LIST map_search_paths; /* parts map file search paths */
+		} import_mentor_sch;
+	} plugins;
+} conf_mentor_sch_t;
+
+#endif
Index: tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.c
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.c	(revision 18980)
@@ -0,0 +1,308 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  netlist build helper
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <genht/hash.h>
+
+#include "netlist_helper.h"
+#include "compat_misc.h"
+#include "pcb-printf.h"
+#include "error.h"
+#include "actions.h"
+#include "safe_fs.h"
+
+
+nethlp_ctx_t *nethlp_new(nethlp_ctx_t *prealloc)
+{
+	if (prealloc == NULL) {
+		prealloc = malloc(sizeof(nethlp_ctx_t));
+		prealloc->alloced = 1;
+	}
+	else
+		prealloc->alloced = 0;
+
+	prealloc->part_rules = NULL;
+	htsp_init(&prealloc->id2refdes, strhash, strkeyeq);
+	return prealloc;
+}
+
+void nethlp_destroy(nethlp_ctx_t *nhctx)
+{
+	htsp_entry_t *e;
+	nethlp_rule_t *r, *next;
+
+	for(r = nhctx->part_rules; r != NULL; r = next) {
+		next = r->next;
+		re_se_free(r->key);
+		re_se_free(r->val);
+		free(r->new_key);
+		free(r->new_val);
+		free(r);
+	}
+
+	for (e = htsp_first(&nhctx->id2refdes); e; e = htsp_next(&nhctx->id2refdes, e)) {
+		free(e->key);
+		free(e->value);
+	}
+	htsp_uninit(&nhctx->id2refdes);
+	if (nhctx->alloced)
+		free(nhctx);
+}
+
+#define ltrim(str) while(isspace(*str)) str++;
+#define rtrim(str) \
+do { \
+	char *__s__; \
+	for(__s__ = str + strlen(str) - 1; __s__ >= str; __s__--) { \
+		if ((*__s__ != '\r') && (*__s__ != '\n')) \
+			break; \
+		*__s__ = '\0'; \
+	} \
+} while(0)
+
+static int part_map_split(char *s, char *argv[], int maxargs)
+{
+	int argc;
+	int n;
+
+	ltrim(s);
+	if ((*s == '#') || (*s == '\0'))
+		return 0;
+	rtrim(s);
+
+	for(argc = n = 0; n < maxargs; n++) {
+		argv[argc] = s;
+		if (s != NULL) {
+			argc++;
+			s = strchr(s, '|');
+			if (s != NULL) {
+				*s = '\0';
+				s++;
+			}
+		}
+	}
+	return argc;
+}
+
+static int part_map_parse(nethlp_ctx_t *nhctx, int argc, char *argv[], const char *fn, int lineno)
+{
+	char *end;
+	nethlp_rule_t *r;
+	re_se_t *kr, *vr;
+	int prio;
+
+	if (argc != 5) {
+		pcb_message(PCB_MSG_ERROR, "Loading part map: wrong number of fields %d in %s:%d - expected 5 - ignoring this rule\n", argc, fn, lineno);
+		return -1;
+	}
+	if (*argv[0] != '*') {
+		prio = strtol(argv[0], &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "Loading part map: invaid priority '%s' in %s:%d - ignoring this rule\n", argv[0], fn, lineno);
+			return -1;
+		}
+	}
+	else
+		prio = nethlp_prio_always;
+	kr = re_se_comp(argv[1]);
+	if (kr == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute name regex in %s:%d - ignoring this rule\n", fn, lineno);
+		return -1;
+	}
+	vr = re_se_comp(argv[2]);
+	if (vr == NULL) {
+		re_se_free(kr);
+		pcb_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute value regex in %s:%d - ignoring this rule\n", fn, lineno);
+		return -1;
+	}
+
+	r = malloc(sizeof(nethlp_rule_t));
+	r->prio = prio;
+	r->key = kr;
+	r->val = vr;
+	r->new_key = pcb_strdup(argv[3]);
+	r->new_val = pcb_strdup(argv[4]);
+	r->next = nhctx->part_rules;
+	nhctx->part_rules = r;
+
+	return 0;
+}
+
+int nethlp_load_part_map(nethlp_ctx_t *nhctx, const char *fn)
+{
+	FILE *f;
+	int cnt, argc, lineno;
+	char line[1024], *argv[8];
+
+	f = pcb_fopen(fn, "r");
+	if (f == NULL)
+		return -1;
+
+	lineno = 0;
+	while(fgets(line, sizeof(line), f) != NULL) {
+		lineno++;
+		argc = part_map_split(line, argv, 6);
+		if ((argc > 0) && (part_map_parse(nhctx, argc, argv, fn, lineno) == 0)) {
+/*			printf("MAP %d '%s' '%s' '%s' '%s' '%s'\n", argc, argv[0], argv[1], argv[2], argv[3], argv[4]);*/
+			cnt++;
+		}
+	}
+
+	fclose(f);
+	return cnt;
+}
+
+
+nethlp_elem_ctx_t *nethlp_elem_new(nethlp_ctx_t *nhctx, nethlp_elem_ctx_t *prealloc, const char *id)
+{
+	if (prealloc == NULL) {
+		prealloc = malloc(sizeof(nethlp_elem_ctx_t));
+		prealloc->alloced = 1;
+	}
+	else
+		prealloc->alloced = 0;
+	prealloc->nhctx = nhctx;
+	prealloc->id = pcb_strdup(id);
+	htsp_init(&prealloc->attr, strhash, strkeyeq);
+	return prealloc;
+}
+
+void nethlp_elem_refdes(nethlp_elem_ctx_t *ectx, const char *refdes)
+{
+	htsp_set(&ectx->nhctx->id2refdes, pcb_strdup(ectx->id), pcb_strdup(refdes));
+}
+
+void nethlp_elem_attr(nethlp_elem_ctx_t *ectx, const char *key, const char *val)
+{
+	htsp_set(&ectx->attr, pcb_strdup(key), pcb_strdup(val));
+}
+
+static void elem_map_apply(nethlp_elem_ctx_t *ectx, nethlp_rule_t *r)
+{
+	char *dst;
+	re_se_backref(r->val, &dst, r->new_val);
+/*	printf("Map add: '%s' -> '%s'\n", r->new_key, dst);*/
+	htsp_set(&ectx->attr, pcb_strdup(r->new_key), pcb_strdup(dst));
+}
+
+void nethlp_elem_done(nethlp_elem_ctx_t *ectx)
+{
+	htsp_entry_t *e;
+	char *refdes, *footprint, *value;
+
+	/* apply part map */
+	for (e = htsp_first(&ectx->attr); e; e = htsp_next(&ectx->attr, e)) {
+		nethlp_rule_t *r, *best_rule = NULL;
+		int best_prio = 0;
+
+		for(r = ectx->nhctx->part_rules; r != NULL; r = r->next) {
+			if (r->prio == nethlp_prio_always) {
+				if (re_se_exec(r->key, e->key) && re_se_exec(r->val, e->value)) {
+					/* always apply - backref is already set up for val */
+					elem_map_apply(ectx, r);
+				}
+			}
+			else if ((r->prio >= best_prio) && re_se_exec(r->key, e->key) && re_se_exec(r->val, e->value)) {
+				best_prio = r->prio;
+				best_rule = r;
+			}
+		}
+		if (best_rule != NULL) {
+			re_se_exec(best_rule->val, e->value); /* acquire the back refs again */
+			elem_map_apply(ectx, best_rule);
+		}
+	}
+
+	refdes = htsp_get(&ectx->nhctx->id2refdes, ectx->id);
+	if (refdes != NULL) {
+		/* look up hardwired attributes */
+		footprint = htsp_get(&ectx->attr, "pcb-rnd-footprint");
+		if (footprint == NULL) footprint = htsp_get(&ectx->attr, "footprint");
+		if (footprint == NULL) footprint = htsp_get(&ectx->attr, "Footprint");
+		if (footprint == NULL) footprint = "";
+
+		value = htsp_get(&ectx->attr, "pcb-rnd-value");
+		if (value == NULL) value = htsp_get(&ectx->attr, "value");
+		if (value == NULL) value = htsp_get(&ectx->attr, "Value");
+		if (value == NULL) value = "";
+
+		/* create elemet */
+		pcb_actionl("ElementList", "Need", refdes, footprint, value, NULL);
+/*		printf("Elem '%s' -> %s:%s:%s\n", ectx->id, refdes, footprint, value);*/
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Ignoring part %s: no refdes\n", ectx->id);
+
+	/* free */
+	for (e = htsp_first(&ectx->attr); e; e = htsp_next(&ectx->attr, e)) {
+		free(e->key);
+		free(e->value);
+	}
+	htsp_uninit(&ectx->attr);
+	free(ectx->id);
+	if (ectx->alloced)
+		free(ectx);
+}
+
+
+nethlp_net_ctx_t *nethlp_net_new(nethlp_ctx_t *nhctx, nethlp_net_ctx_t *prealloc, const char *netname)
+{
+	if (prealloc == NULL) {
+		prealloc = malloc(sizeof(nethlp_net_ctx_t));
+		prealloc->alloced = 1;
+	}
+	else
+		prealloc->alloced = 0;
+	prealloc->nhctx = nhctx;
+
+	prealloc->netname = pcb_strdup(netname);
+	return prealloc;
+}
+
+void nethlp_net_add_term(nethlp_net_ctx_t *nctx, const char *part, const char *pin)
+{
+	char *refdes = htsp_get(&nctx->nhctx->id2refdes, part);
+	char term[256];
+	if (refdes == NULL) {
+		pcb_message(PCB_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part);
+	}
+	pcb_snprintf(term, sizeof(term), "%s-%s", refdes, pin);
+	pcb_actionl("Netlist", "Add",  nctx->netname, term, NULL);
+}
+
+void nethlp_net_destroy(nethlp_net_ctx_t *nctx)
+{
+	free(nctx->netname);
+	if (nctx->alloced)
+		free(nctx);
+}
+
Index: tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.h
===================================================================
--- tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.h	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mentor_sch/netlist_helper.h	(revision 18980)
@@ -0,0 +1,50 @@
+#include <genht/htsp.h>
+#include <genregex/regex_se.h>
+
+typedef struct nethlp_rule_s nethlp_rule_t;
+
+#define nethlp_prio_always -1
+
+struct nethlp_rule_s {
+	int prio;
+	re_se_t *key;
+	re_se_t *val;
+	char *new_key;
+	char *new_val;
+	nethlp_rule_t *next;
+};
+
+typedef struct {
+	htsp_t id2refdes; /* element ID -> refdes */
+	nethlp_rule_t *part_rules;
+	int alloced;
+} nethlp_ctx_t;
+
+typedef struct {
+	htsp_t attr;
+	char *id;
+	nethlp_ctx_t *nhctx;
+	int alloced;
+} nethlp_elem_ctx_t;
+
+typedef struct {
+	char *netname;
+	nethlp_ctx_t *nhctx;
+	int alloced;
+} nethlp_net_ctx_t;
+
+
+nethlp_ctx_t *nethlp_new(nethlp_ctx_t *prealloc);
+void nethlp_destroy(nethlp_ctx_t *nhctx);
+
+int nethlp_load_part_map(nethlp_ctx_t *nhctx, const char *fn);
+
+nethlp_elem_ctx_t *nethlp_elem_new(nethlp_ctx_t *nhctx, nethlp_elem_ctx_t *prealloc, const char *id);
+void nethlp_elem_refdes(nethlp_elem_ctx_t *ectx, const char *refdes);
+void nethlp_elem_attr(nethlp_elem_ctx_t *ectx, const char *key, const char *val);
+void nethlp_elem_done(nethlp_elem_ctx_t *ectx);
+
+
+nethlp_net_ctx_t *nethlp_net_new(nethlp_ctx_t *nhctx, nethlp_net_ctx_t *prealloc, const char *netname);
+void nethlp_net_add_term(nethlp_net_ctx_t *nctx, const char *part, const char *pin);
+void nethlp_net_destroy(nethlp_net_ctx_t *nctx);
Index: tags/2.0.1/src_plugins/import_mucs/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_mucs/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mucs/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_mucs
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_mucs/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_mucs/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mucs/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_mucs}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_mucs/mucs.o @]
+
+switch /local/pcb/import_mucs/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_mucs/import_mucs.pup
===================================================================
--- tags/2.0.1/src_plugins/import_mucs/import_mucs.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mucs/import_mucs.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class import
+$short import mucs routing
+$long Import lines and vias from MUCS unixplot .pl files
+$state works
+$fmt-native no
+$fmt-feature-r import lines and vias from MUCS unixplot .pl files
+$package auto
+default buildin
+dep lib_compat_help
+autoload 1
Index: tags/2.0.1/src_plugins/import_mucs/mucs.c
===================================================================
--- tags/2.0.1/src_plugins/import_mucs/mucs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_mucs/mucs.c	(revision 18980)
@@ -0,0 +1,176 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  MUCS unixplot import HID
+ *  pcb-rnd Copyright (C) 2017 Erich Heinzle
+ *  Based on up2pcb.cc, a simple unixplot file to pcb syntax converter
+ *  Copyright (C) 2001 Luis Claudio Gamboa Lopes
+ *  And loosely based on dsn.c
+ *  Copyright (C) 2008, 2011 Josh Jordan, Dan McMahill, and Jared Casper
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This plugin imports unixplot format line and via data into pcb-rnd */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "layer.h"
+#include "conf_core.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+static const char *mucs_cookie = "mucs importer";
+
+static const char pcb_acts_LoadMucsFrom[] = "LoadMucsFrom(filename)";
+static const char pcb_acth_LoadMucsFrom[] = "Loads the specified mucs routing file.";
+fgw_error_t pcb_act_LoadMucsFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+	FILE *fi;
+	int c, c2;
+	pcb_coord_t x1, y1, x2, y2, r;
+	pcb_pstk_t *ps;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str);
+
+	if (!(pcb_layer_flags(PCB, INDEXOFCURRENT) & PCB_LYT_COPPER)) {
+		pcb_message(PCB_MSG_ERROR, "The currently active layer is not a copper layer.\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load mucs routing session Resource File...",
+																"Picks a mucs session resource file to load.\n"
+																	"This file could be generated by mucs-pcb\n",
+																default_file, ".l1", "unixplot", HID_FILESELECT_READ);
+		if (fname == NULL) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+
+		if (fname && *fname)
+			default_file = pcb_strdup(fname);
+	}
+
+	fi = pcb_fopen(fname, "r");
+	if (!fi) {
+		pcb_message(PCB_MSG_ERROR, "Can't load mucs unixplot file %s for read\n", fname);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	while ((c = getc(fi)) != EOF) {
+/*		pcb_trace("Char: %d \n", c); */
+		switch (c) {
+			case 's':
+				x1 = 100 * (getc(fi) + (getc(fi) * 256));
+				y1 = 100 * (getc(fi) + (getc(fi) * 256));
+				x2 = 100 * (getc(fi) + (getc(fi) * 256));
+				y2 = 100 * (getc(fi) + (getc(fi) * 256));
+				pcb_trace("s--%i %i %i %i ???\n", x1, y1, x2, y2);
+				break;
+			case 'l':
+				x1 = (getc(fi) + (getc(fi) * 256));
+				y1 = (getc(fi) + (getc(fi) * 256));
+				x2 = (getc(fi) + (getc(fi) * 256));
+				y2 = (getc(fi) + (getc(fi) * 256));
+				pcb_trace("Line(%d %d %d %d 20 \" \")\n", x1, y1, x2, y2);
+				/* consider a bounds checking function to censor absurd coord sizes */
+				pcb_line_new(CURRENT, PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), PCB_MIL_TO_COORD(x2), PCB_MIL_TO_COORD(y2), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO));
+				break;
+			case 'c':
+				x1 = (getc(fi) + (getc(fi) * 256));
+				y1 = (getc(fi) + (getc(fi) * 256));
+				r = (getc(fi) + (getc(fi) * 256));
+				pcb_trace("Via(%d %d 60 25 \"\" \" \")\n", x1, y1);
+				ps = pcb_pstk_new_compat_via(PCB->Data, PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance, 0, PCB_PSTK_COMPAT_ROUND, 1);
+				PCB_FLAG_SET(PCB_FLAG_AUTO, ps);
+				break;
+			case 'n':
+				x1 = (getc(fi) + (getc(fi) * 256));
+				y1 = (getc(fi) + (getc(fi) * 256));
+				pcb_trace("Line(%d %d %d %d 20 \" \")\n", x1, y1, x2, y2);
+				pcb_line_new(CURRENT, PCB_MIL_TO_COORD(x1), PCB_MIL_TO_COORD(y1), PCB_MIL_TO_COORD(x2), PCB_MIL_TO_COORD(y2), PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10), pcb_flag_make(PCB_FLAG_AUTO));
+				x2 = x1;
+				y2 = y1;
+				break;
+			case 'a':
+				x1 = 100 * ((getc(fi) * 256) + getc(fi));
+				y1 = 100 * ((getc(fi) * 256) + getc(fi));
+				x2 = 100 * ((getc(fi) * 256) + getc(fi));
+				y2 = 100 * ((getc(fi) * 256) + getc(fi));
+				r = 100 * ((getc(fi) * 256) + getc(fi));
+				pcb_trace("a--stroke newpath\n%d %d %d %d %d arc\n", x1, y1, x2, y2, r);
+				break;
+			case 'e':
+				break;
+			case 't':
+				do {
+					c2 = getc(fi);
+				} while (c2 != '\0' && c2 != EOF);
+				break;
+		}
+	}
+	fclose(fi);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t mucs_action_list[] = {
+	{"LoadMucsFrom", pcb_act_LoadMucsFrom, pcb_acth_LoadMucsFrom, pcb_acts_LoadMucsFrom}
+};
+
+PCB_REGISTER_ACTIONS(mucs_action_list, mucs_cookie)
+
+int pplg_check_ver_import_mucs(int ver_needed) { return 0; }
+
+void pplg_uninit_import_mucs(void)
+{
+	pcb_remove_actions_by_cookie(mucs_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_mucs(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(mucs_action_list, mucs_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_netlist/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_netlist/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_netlist/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_import_netlist
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/import_netlist/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_netlist/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_netlist/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {import_netlist}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_netlist/import_netlist.o @]
+append /local/pcb/mod/YACC {$(PLUGDIR)/import_netlist/netlist}
+
+switch /local/pcb/import_netlist/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_netlist/import_netlist.c
===================================================================
--- tags/2.0.1/src_plugins/import_netlist/import_netlist.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_netlist/import_netlist.c	(revision 18980)
@@ -0,0 +1,203 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2015,2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "board.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "plug_import.h"
+#include "conf_core.h"
+#include "error.h"
+#include "data.h"
+#include "rats_patch.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "paths.h"
+#include "safe_fs.h"
+#include "macro.h"
+
+static pcb_plug_import_t import_netlist;
+
+
+#define BLANK(x) ((x) == ' ' || (x) == '\t' || (x) == '\n' \
+		|| (x) == '\0')
+
+/* ---------------------------------------------------------------------------
+ * Read in a netlist and store it in the netlist menu 
+ */
+static int ReadNetlist(const char *filename)
+{
+	char *command = NULL;
+	char inputline[PCB_MAX_NETLIST_LINE_LENGTH + 1];
+	char temp[PCB_MAX_NETLIST_LINE_LENGTH + 1];
+	FILE *fp;
+	pcb_lib_menu_t *menu = NULL;
+	pcb_lib_entry_t *entry;
+	int i, j, lines, kind;
+	pcb_bool continued;
+	int used_popen = 0;
+	const char *ratcmd;
+
+	if (!filename)
+		return 1;									/* nothing to do */
+
+	pcb_message(PCB_MSG_INFO, _("Importing PCB netlist %s\n"), filename);
+
+	pcb_conf_cmd_is_safe(rc.rat_command, &ratcmd, 1);
+
+	if (PCB_EMPTY_STRING_P(ratcmd)) {
+		fp = pcb_fopen(filename, "r");
+		if (!fp) {
+			pcb_message(PCB_MSG_ERROR, "Cannot open %s for reading", filename);
+			return 1;
+		}
+	}
+	else {
+		pcb_build_argfn_t p;
+		used_popen = 1;
+		memset(&p, 0, sizeof(p));
+		p.params['p'-'a'] = conf_core.rc.rat_path;
+		p.params['f'-'a'] = filename;
+		command = pcb_build_argfn(conf_core.rc.rat_command, &p);
+
+		/* open pipe to stdout of command */
+		if (*command == '\0' || (fp = pcb_popen(command, "r")) == NULL) {
+			pcb_popen_error_message(command);
+			free(command);
+			return 1;
+		}
+		free(command);
+	}
+	lines = 0;
+	/* kind = 0  is net name
+	 * kind = 1  is route style name
+	 * kind = 2  is connection
+	 */
+	kind = 0;
+	while (fgets(inputline, PCB_MAX_NETLIST_LINE_LENGTH, fp)) {
+		size_t len = strlen(inputline);
+		/* check for maximum length line */
+		if (len) {
+			if (inputline[--len] != '\n')
+				pcb_message(PCB_MSG_ERROR, _("Line length (%i) exceeded in netlist file.\n"
+									"additional characters will be ignored.\n"), PCB_MAX_NETLIST_LINE_LENGTH);
+			else
+				inputline[len] = '\0';
+		}
+		continued = (inputline[len - 1] == '\\') ? pcb_true : pcb_false;
+		if (continued)
+			inputline[len - 1] = '\0';
+		lines++;
+		i = 0;
+		while (inputline[i] != '\0') {
+			j = 0;
+			/* skip leading blanks */
+			while (inputline[i] != '\0' && BLANK(inputline[i]))
+				i++;
+			if (kind == 0) {
+				/* add two spaces for included/unincluded */
+				temp[j++] = ' ';
+				temp[j++] = ' ';
+			}
+			while (!BLANK(inputline[i]))
+				temp[j++] = inputline[i++];
+			temp[j] = '\0';
+			while (inputline[i] != '\0' && BLANK(inputline[i]))
+				i++;
+			if (kind == 0) {
+				menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
+				menu->Name = pcb_strdup(temp);
+				menu->flag = 1;
+				kind++;
+			}
+			else {
+				if (kind == 1 && strchr(temp, '-') == NULL) {
+					kind++;
+					menu->Style = pcb_strdup(temp);
+				}
+				else {
+					entry = pcb_lib_entry_new(menu);
+					entry->ListEntry = pcb_strdup(temp);
+					entry->ListEntry_dontfree = 0;
+				}
+			}
+		}
+		if (!continued)
+			kind = 0;
+	}
+	if (!lines) {
+		pcb_message(PCB_MSG_ERROR, _("Empty netlist file!\n"));
+		pcb_pclose(fp);
+		return 1;
+	}
+	if (used_popen)
+		pcb_pclose(fp);
+	else
+		fclose(fp);
+	pcb_sort_netlist();
+	pcb_ratspatch_make_edited(PCB);
+	return 0;
+}
+
+int netlist_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
+{
+	if (aspects != IMPORT_ASPECT_NETLIST)
+		return 0; /* only pure netlist import is supported */
+
+	/* we are sort of a low prio fallback without any chance to check the file format in advance */
+	return 10;
+}
+
+
+static int netlist_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn)
+{
+	return ReadNetlist(fn);
+}
+
+int pplg_check_ver_import_netlist(int ver_needed) { return 0; }
+
+void pplg_uninit_import_netlist(void)
+{
+	PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_netlist);
+}
+
+int pplg_init_import_netlist(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	import_netlist.plugin_data = NULL;
+
+	import_netlist.fmt_support_prio = netlist_support_prio;
+	import_netlist.import           = netlist_import;
+
+	PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_netlist);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/import_netlist/import_netlist.pup
===================================================================
--- tags/2.0.1/src_plugins/import_netlist/import_netlist.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_netlist/import_netlist.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import netlist
+$long Import plugin for netlists in the classic pcb netlist format.
+$state works
+$fmt-native no
+$fmt-feature-r import plain text gEDA netlist files
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_sch/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_sch/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_sch/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_autoplace
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_sch/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_sch/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_sch/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {import_sch}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_sch/import_sch.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/import_sch/import_sch_conf.h}
+
+switch /local/pcb/import_sch/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_sch/import_sch.c
===================================================================
--- tags/2.0.1/src_plugins/import_sch/import_sch.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_sch/import_sch.c	(revision 18980)
@@ -0,0 +1,526 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "paths.h"
+
+#include "compat_fs.h"
+#include "pcb-printf.h"
+#include "remove.h"
+#include "rats.h"
+#include "actions.h"
+#include "import_sch_conf.h"
+#include "misc_util.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "obj_rat.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+conf_import_sch_t conf_import_sch;
+
+extern fgw_error_t pcb_act_ExecuteFile(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+/* ---------------------------------------------------------------- */
+static const char pcb_acts_Import[] =
+	"Import()\n"
+	"Import([gnetlist|make[,source,source,...]])\n" "Import(setnewpoint[,(mark|center|X,Y)])\n" "Import(setdisperse,D,units)\n";
+
+static const char pcb_acth_Import[] = "Import schematics.";
+
+/* %start-doc actions Import
+
+Imports subcircuits and netlist data from the schematics (or some other
+source).  The first parameter, which is optional, is the mode.  If not
+specified, the @code{import::mode} attribute in the PCB is used.
+@code{gnetlist} means gnetlist is used to obtain the information from
+the schematics.  @code{make} invokes @code{make}, assuming the user
+has a @code{Makefile} in the current directory.  The @code{Makefile}
+will be invoked with the following variables set:
+
+@table @code
+
+@item PCB
+The name of the .pcb file
+
+@item SRCLIST
+A space-separated list of source files
+
+@item OUT
+The name of the file in which to put the command script, which may
+contain any @pcb{} actions.  By default, this is a temporary file
+selected by @pcb{}, but if you specify an @code{import::outfile}
+attribute, that file name is used instead (and not automatically
+deleted afterwards).
+
+@end table
+
+The target specified to be built is the first of these that apply:
+
+@itemize @bullet
+
+@item
+The target specified by an @code{import::target} attribute.
+
+@item
+The output file specified by an @code{import::outfile} attribute.
+
+@item
+If nothing else is specified, the target is @code{pcb_import}.
+
+@end itemize
+
+If you specify an @code{import::makefile} attribute, then "-f <that
+file>" will be added to the command line.
+
+If you specify the mode, you may also specify the source files
+(schematics).  If you do not specify any, the list of schematics is
+obtained by reading the @code{import::src@var{N}} attributes (like
+@code{import::src0}, @code{import::src1}, etc).
+
+For compatibility with future extensions to the import file format,
+the generated file @emph{must not} start with the two characters
+@code{#%}.
+
+If a temporary file is needed the @code{TMPDIR} environment variable
+is used to select its location.
+*/
+
+/*
+Note that the programs @code{gnetlist} and @code{make} must be
+configured.
+
+If @pcb{} cannot determine which schematic(s) to import from, the GUI
+is called to let user choose (see @code{ImportGUI()}).
+
+Note that Import() doesn't delete anything - after an Import, subcircuits
+which shouldn't be on the board are selected and may be removed once
+it's determined that the deletion is appropriate.
+
+If @code{Import()} is called with @code{setnewpoint}, then the location
+of new components can be specified.  This is where parts show up when
+they're added to the board.  The default is the center of the board.
+
+@table @code
+
+@item Import(setnewpoint)
+
+Prompts the user to click on the board somewhere, uses that point.  If
+called by a hotkey, uses the current location of the crosshair.
+
+@item Import(setnewpoint,mark)
+
+Uses the location of the mark.  If no mark is present, the point is
+not changed.
+
+@item Import(setnewpoint,center)
+
+Resets the point to the center of the board.
+
+@item Import(setnewpoint,X,Y,units)
+
+Sets the point to the specific coordinates given.  Example:
+@code{Import(setnewpoint,50,25,mm)}
+
+@end table
+
+Note that the X and Y locations are stored in attributes named
+@code{import::newX} and @code{import::newY} so you could change them
+manually if you wished.
+
+Calling @code{Import(setdisperse,D,units)} sets how much the newly
+placed subcircuits are dispersed relative to the set point.  For example,
+@code{Import(setdisperse,10,mm)} will offset each part randomly up to
+10mm away from the point.  The default dispersion is 1/10th of the
+smallest board dimension.  Dispersion is saved in the
+@code{import::disperse} attribute.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Import(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *mode = NULL;
+	const char **sources = NULL;
+	int nsources = 0;
+	fgw_arg_t rs;
+
+	if (conf_import_sch.plugins.import_sch.verbose)
+		pcb_message(PCB_MSG_DEBUG, "pcb_act_Import:  ===  Entering pcb_act_Import  ===\n");
+
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Import, mode = argv[1].val.str);
+
+	if (mode && pcb_strcasecmp(mode, "setdisperse") == 0) {
+		const char *ds = NULL, *units = NULL;
+		char buf[50];
+		int ds_alloced = 0;
+
+		PCB_ACT_MAY_CONVARG(2, FGW_STR, Import, ds = argv[2].val.str);
+		PCB_ACT_MAY_CONVARG(3, FGW_STR, Import, units = argv[3].val.str);
+
+		if (!ds) {
+			const char *as = pcb_attrib_get(PCB, "import::disperse");
+			ds = pcb_gui->prompt_for(_("Enter dispersion:"), as ? as : "0");
+			ds_alloced = 1;
+		}
+		if (units) {
+			sprintf(buf, "%s%s", ds, units);
+			pcb_attrib_put(PCB, "import::disperse", buf);
+		}
+		else
+			pcb_attrib_put(PCB, "import::disperse", ds);
+		if (ds_alloced)
+			free((char*)ds);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	if (mode && pcb_strcasecmp(mode, "setnewpoint") == 0) {
+		const char *xs = NULL, *ys = NULL, *units = NULL;
+		pcb_coord_t x, y;
+		char buf[50];
+
+		PCB_ACT_MAY_CONVARG(2, FGW_STR, Import, xs = argv[2].val.str);
+		PCB_ACT_MAY_CONVARG(3, FGW_STR, Import, ys = argv[3].val.str);
+		PCB_ACT_MAY_CONVARG(4, FGW_STR, Import, units = argv[4].val.str);
+
+		if (!xs) {
+			pcb_hid_get_coords(_("Click on a location"), &x, &y, 0);
+		}
+		else if (pcb_strcasecmp(xs, "center") == 0) {
+			pcb_attrib_remove(PCB, "import::newX");
+			pcb_attrib_remove(PCB, "import::newY");
+			PCB_ACT_IRES(0);
+			return 0;
+		}
+		else if (pcb_strcasecmp(xs, "mark") == 0) {
+			if (pcb_marked.status) {
+				x = pcb_marked.X;
+				y = pcb_marked.Y;
+			}
+		}
+		else if (ys) {
+			x = pcb_get_value(xs, units, NULL, NULL);
+			y = pcb_get_value(ys, units, NULL, NULL);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, _("Bad syntax for Import(setnewpoint)"));
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		pcb_sprintf(buf, "%$ms", x);
+		pcb_attrib_put(PCB, "import::newX", buf);
+		pcb_sprintf(buf, "%$ms", y);
+		pcb_attrib_put(PCB, "import::newY", buf);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Import, mode = argv[1].val.str);
+
+	if (!mode)
+		mode = pcb_attrib_get(PCB, "import::mode");
+	if (!mode)
+		mode = "gnetlist";
+
+	if (argc > 2) {
+		int n;
+		nsources = 0;
+		sources = (const char **)malloc((argc-1) * sizeof(char *));
+		for(n = 2; n < argc; n++) {
+			PCB_ACT_CONVARG(n, FGW_STR, Import, sources[nsources] = argv[n].val.str);
+			nsources++;
+		}
+	}
+
+	if (sources == NULL) {
+		char sname[40];
+		char *src;
+		int n;
+
+		nsources = -1;
+		n = 0;
+		do {
+			nsources++;
+			sprintf(sname, "import::src%d", nsources);
+			src = pcb_attrib_get(PCB, sname);
+			n++;
+		} while (src);
+
+		if (nsources > 0) {
+			sources = (const char **) malloc((nsources + 1) * sizeof(char *));
+			nsources = -1;
+			n = 0;
+			do {
+				nsources++;
+				sprintf(sname, "import::src%d", nsources);
+				src = pcb_attrib_get(PCB, sname);
+				n++;
+				sources[nsources] = src;
+			} while (src);
+		}
+	}
+
+	if (sources == NULL) {
+		/* Replace .pcb with .sch and hope for the best.  */
+		char *pcbname = PCB->Filename;
+		char *schname;
+		char *dot, *slash, *bslash;
+
+		if (!pcbname) {
+			PCB_ACT_IRES(pcb_action("ImportGUI"));
+			return 0;
+		}
+
+		schname = (char *) malloc(strlen(pcbname) + 5);
+		strcpy(schname, pcbname);
+		dot = strchr(schname, '.');
+		slash = strchr(schname, '/');
+		bslash = strchr(schname, '\\');
+		if (dot && slash && dot < slash)
+			dot = NULL;
+		if (dot && bslash && dot < bslash)
+			dot = NULL;
+		if (dot)
+			*dot = 0;
+		strcat(schname, ".sch");
+
+		if (access(schname, F_OK)) {
+			PCB_ACT_IRES(pcb_action("ImportGUI"));
+			return 0;
+		}
+
+		sources = (const char **) malloc(2 * sizeof(char *));
+		sources[0] = schname;
+		sources[1] = NULL;
+		nsources = 1;
+	}
+
+	if (pcb_strcasecmp(mode, "gnetlist") == 0) {
+		char *tmpfile = pcb_tempfile_name_new("gnetlist_output");
+		const char **cmd;
+		int i;
+
+		if (tmpfile == NULL) {
+			pcb_message(PCB_MSG_ERROR, _("Could not create temp file"));
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		if ((conf_import_sch.plugins.import_sch.gnetlist_program == NULL) || (*conf_import_sch.plugins.import_sch.gnetlist_program == '\0')) {
+			pcb_message(PCB_MSG_ERROR, _("No gnetlist program configured, can not import. Please fill in configuration setting plugins/import_sch/gnetlist_program\n"));
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		cmd = (const char **) malloc((9 + nsources) * sizeof(char *));
+		cmd[0] = conf_import_sch.plugins.import_sch.gnetlist_program;
+		cmd[1] = "-L";
+		cmd[2] = PCBLIBDIR;
+		cmd[3] = "-g";
+		cmd[4] = "pcbrndfwd";
+		cmd[5] = "-o";
+		cmd[6] = tmpfile;
+		cmd[7] = "--";
+		for (i = 0; i < nsources; i++)
+			cmd[8 + i] = pcb_build_fn(sources[i]);
+		cmd[8 + nsources] = NULL;
+
+		if (conf_import_sch.plugins.import_sch.verbose) {
+			pcb_message(PCB_MSG_DEBUG, "pcb_act_Import:  running gnetlist:\n");
+			for (i = 0; i < 8+nsources; i++)
+				pcb_message(PCB_MSG_DEBUG, " %s", cmd[i]);
+			pcb_message(PCB_MSG_DEBUG, "\n");
+		}
+
+		if (pcb_spawnvp(cmd)) {
+			for(i = 0; i < nsources; i++)
+				free((char *) cmd[8 + i]);
+			unlink(tmpfile);
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		if (conf_import_sch.plugins.import_sch.verbose)
+			pcb_message(PCB_MSG_DEBUG, "pcb_act_Import:  about to run pcb_act_ExecuteFile, file = %s\n", tmpfile);
+
+		fgw_vcall(&pcb_fgw, &rs, "executefile", FGW_STR, tmpfile, 0);
+
+		for(i = 0; i < nsources; i++)
+			free((char *) cmd[8 + i]);
+		free(cmd);
+		pcb_tempfile_unlink(tmpfile);
+	}
+	else if (pcb_strcasecmp(mode, "make") == 0) {
+		int must_free_tmpfile = 0;
+		char *tmpfile;
+		const char *cmd[10];
+		int i;
+		char *srclist;
+		int srclen;
+		char *user_outfile = NULL;
+		char *user_makefile = NULL;
+		char *user_target = NULL;
+
+
+		user_outfile = pcb_attrib_get(PCB, "import::outfile");
+		user_makefile = pcb_attrib_get(PCB, "import::makefile");
+		user_target = pcb_attrib_get(PCB, "import::target");
+		if (user_outfile && !user_target)
+			user_target = user_outfile;
+
+		if ((conf_import_sch.plugins.import_sch.make_program == NULL) || (*conf_import_sch.plugins.import_sch.make_program == '\0')) {
+			pcb_message(PCB_MSG_ERROR, _("No make program configured, can not import. Please fill in configuration setting plugins/import_sch/make_program\n"));
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		if (user_outfile)
+			tmpfile = user_outfile;
+		else {
+			tmpfile = pcb_tempfile_name_new("gnetlist_output");
+			if (tmpfile == NULL) {
+				pcb_message(PCB_MSG_ERROR, _("Could not create temp file"));
+				PCB_ACT_IRES(1);
+				return 0;
+			}
+			must_free_tmpfile = 1;
+		}
+
+		srclen = sizeof("SRCLIST=") + 2;
+		for (i = 0; i < nsources; i++)
+			srclen += strlen(sources[i]) + 2;
+		srclist = (char *) malloc(srclen);
+		strcpy(srclist, "SRCLIST=");
+		for (i = 0; i < nsources; i++) {
+			if (i)
+				strcat(srclist, " ");
+			strcat(srclist, sources[i]);
+		}
+
+		cmd[0] = conf_import_sch.plugins.import_sch.make_program;
+		cmd[1] = "-s";
+		cmd[2] = pcb_concat("PCB=", PCB->Filename, NULL);
+		cmd[3] = srclist;
+		cmd[4] = pcb_concat("OUT=", tmpfile, NULL);
+		i = 5;
+		if (user_makefile) {
+			cmd[i++] = "-f";
+			cmd[i++] = user_makefile;
+		}
+		cmd[i++] = user_target ? user_target : (char *) "pcb_import";
+		cmd[i++] = NULL;
+
+		if (pcb_spawnvp(cmd)) {
+			if (must_free_tmpfile)
+				unlink(tmpfile);
+			free((char*)cmd[2]);
+			free((char*)cmd[3]);
+			free((char*)cmd[4]);
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		fgw_vcall(&pcb_fgw, &rs, "executefile", FGW_STR, tmpfile, 0);
+
+		free((char*)cmd[2]);
+		free((char*)cmd[3]);
+		free((char*)cmd[4]);
+		if (must_free_tmpfile)
+			pcb_tempfile_unlink(tmpfile);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, _("Unknown import mode: %s\n"), mode);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	pcb_rats_destroy(pcb_false);
+	pcb_rat_add_all(pcb_false, NULL);
+
+	if (conf_import_sch.plugins.import_sch.verbose)
+		pcb_message(PCB_MSG_DEBUG, "pcb_act_Import:  ===  Leaving pcb_act_Import  ===\n");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char *import_sch_cookie = "import_sch plugin";
+
+pcb_action_t import_sch_action_list[] = {
+	{"Import", pcb_act_Import, pcb_acth_Import, pcb_acts_Import}
+};
+
+PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
+
+int pplg_check_ver_import_sch(int ver_needed) { return 0; }
+
+void pplg_uninit_import_sch(void)
+{
+	pcb_remove_actions_by_cookie(import_sch_cookie);
+	conf_unreg_fields("plugins/import_sch/");
+}
+
+#include "dolists.h"
+int pplg_init_import_sch(void)
+{
+	char *tmp;
+
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(import_sch_action_list, import_sch_cookie)
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_import_sch, field,isarray,type_name,cpath,cname,desc,flags);
+#include "import_sch_conf_fields.h"
+
+	/* Compatibility: get some settings from the env */
+	tmp = getenv ("PCB_MAKE_PROGRAM");
+	if (tmp != NULL)
+		conf_set(CFR_ENV, "plugins/import_sch/make_program", -1, tmp, POL_OVERWRITE);
+
+	tmp = getenv ("PCB_GNETLIST");
+	if (tmp != NULL)
+		conf_set(CFR_ENV, "plugins/import_sch/gnetlist_program", -1, tmp, POL_OVERWRITE);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/import_sch/import_sch.pup
===================================================================
--- tags/2.0.1/src_plugins/import_sch/import_sch.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_sch/import_sch.pup	(revision 18980)
@@ -0,0 +1,10 @@
+$class import
+$short import sch
+$long Imports footprints and netlist data from the schematics (or some other source).
+$state works
+$fmt-native no
+$fmt-feature-r import netlist and footprint info from gEDA schematics using gnetlist
+$fmt-feature-r import netlist and footprint produced by an external command
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_sch/import_sch_conf.h
===================================================================
--- tags/2.0.1/src_plugins/import_sch/import_sch_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/import_sch/import_sch_conf.h	(revision 18980)
@@ -0,0 +1,16 @@
+#ifndef PCB_IMPORT_SCH_CONF_H
+#define PCB_IMPORT_SCH_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct import_sch {
+			CFT_STRING gnetlist_program;       /* gnetlist program name */
+			CFT_STRING make_program;           /* make program name */
+			CFT_BOOLEAN verbose;                  /* verbose logging of the import code */
+		} import_sch;
+	} plugins;
+} conf_import_sch_t;
+
+#endif
Index: tags/2.0.1/src_plugins/import_tinycad/Makefile
===================================================================
--- tags/2.0.1/src_plugins/import_tinycad/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/import_tinycad/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_import_tinycad
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/import_tinycad/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/import_tinycad/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/import_tinycad/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {import_tinycad}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_tinycad/tinycad.o @]
+
+switch /local/pcb/import_tinycad/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/import_tinycad/import_tinycad.pup
===================================================================
--- tags/2.0.1/src_plugins/import_tinycad/import_tinycad.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/import_tinycad/import_tinycad.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class import
+$short import tinycad .net
+$long Import the netlist and footprints from a tinycad netlist.
+$state works
+$fmt-native no
+$fmt-feature-r import netlist and footprint info from tinycad .net netlists
+$package import-net
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/import_tinycad/tinycad.c
===================================================================
--- tags/2.0.1/src_plugins/import_tinycad/tinycad.c	(nonexistent)
+++ tags/2.0.1/src_plugins/import_tinycad/tinycad.c	(revision 18980)
@@ -0,0 +1,216 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  tinycad import HID
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <qparse/qparse.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+
+static const char *tinycad_cookie = "tinycad importer";
+
+/* remove leading whitespace */
+#define ltrim(s) while(isspace(*s)) s++
+
+/* remove trailing newline */
+#define rtrim(s) \
+	do { \
+		char *end; \
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \
+			*end = '\0'; \
+	} while(0)
+
+typedef struct {
+	char *refdes;
+	char *value;
+	char *footprint;
+} symattr_t;
+
+#define null_empty(s) ((s) == NULL ? "" : (s))
+
+static void sym_flush(symattr_t *sattr)
+{
+	if (sattr->refdes != NULL) {
+/*		pcb_trace("tinycad sym: refdes=%s val=%s fp=%s\n", sattr->refdes, sattr->value, sattr->footprint);*/
+		if (sattr->footprint == NULL)
+			pcb_message(PCB_MSG_ERROR, "tinycad: not importing refdes=%s: no footprint specified\n", sattr->refdes);
+		else
+			pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);
+	}
+	free(sattr->refdes); sattr->refdes = NULL;
+	free(sattr->value); sattr->value = NULL;
+	free(sattr->footprint); sattr->footprint = NULL;
+}
+
+
+static int tinycad_parse_net(FILE *fn)
+{
+	char line[1024];
+	symattr_t sattr;
+
+	memset(&sattr, 0, sizeof(sattr));
+
+	pcb_actionl("ElementList", "start", NULL);
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	while(fgets(line, sizeof(line), fn) != NULL) {
+		int argc;
+		char **argv, *s;
+
+		s = line;
+		ltrim(s);
+		if (*s == ';') /* comment */
+			continue;
+		rtrim(s);
+		argc = qparse2(s, &argv, QPARSE_DOUBLE_QUOTE | QPARSE_SINGLE_QUOTE);
+		if ((argc > 1) && (strcmp(argv[0], "NET") == 0)) {
+			char *curr, *next, *sep;
+
+			for(curr = argv[5]; (curr != NULL) && (*curr != '\0'); curr = next) {
+				next = strchr(curr, ')');
+				if (next != NULL) {
+					*next = '\0';
+					next++;
+					if (*next == ',')
+						next++;
+				}
+				if (*curr == '(')
+					curr++;
+				sep = strchr(curr, ',');
+				if (sep != NULL) {
+					*sep = '-';
+/*					pcb_trace("net-add '%s' '%s'\n", argv[2], curr);*/
+					pcb_actionl("Netlist", "Add",  argv[2], curr, NULL);
+				}
+			}
+		}
+		else if ((argc > 1) && (strcmp(argv[0], "COMPONENT") == 0)) {
+			sym_flush(&sattr);
+			free(sattr.refdes);
+			sattr.refdes = pcb_strdup(argv[1]);
+		}
+		else if ((argc > 3) && (strcmp(argv[0], "OPTION") == 0)) {
+			if (strcmp(argv[3], "..") != 0) {
+				if (strcmp(argv[1], "Package") == 0) {
+					free(sattr.footprint);
+					sattr.footprint = pcb_strdup(argv[3]);
+				}
+				else if (strcmp(argv[1], "Value") == 0) {
+					free(sattr.value);
+					sattr.value = pcb_strdup(argv[3]);
+				}
+			}
+		}
+		qparse_free(argc, &argv);
+	}
+
+	sym_flush(&sattr);
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+	pcb_actionl("ElementList", "Done", NULL);
+
+	return 0;
+}
+
+
+static int tinycad_load(const char *fname_net)
+{
+	FILE *fn;
+	int ret = 0;
+
+	fn = pcb_fopen(fname_net, "r");
+	if (fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		return -1;
+	}
+
+	ret = tinycad_parse_net(fn);
+
+	fclose(fn);
+	return ret;
+}
+
+static const char pcb_acts_LoadtinycadFrom[] = "LoadTinycadFrom(filename)";
+static const char pcb_acth_LoadtinycadFrom[] = "Loads the specified tinycad .net file - the netlist must be tinycad netlist output.";
+fgw_error_t pcb_act_LoadtinycadFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadtinycadFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load tinycad netlist file...",
+																"Picks a tinycad netlist file to load.\n",
+																default_file, ".net", "tinycad", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return tinycad_load(fname);
+}
+
+pcb_action_t tinycad_action_list[] = {
+	{"LoadTinycadFrom", pcb_act_LoadtinycadFrom, pcb_acth_LoadtinycadFrom, pcb_acts_LoadtinycadFrom}
+};
+
+PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie)
+
+int pplg_check_ver_import_tinycad(int ver_needed) { return 0; }
+
+void pplg_uninit_import_tinycad(void)
+{
+	pcb_remove_actions_by_cookie(tinycad_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_import_tinycad(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(tinycad_action_list, tinycad_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_autotrax/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_autotrax
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_autotrax/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {io_autotrax}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/io_autotrax/io_autotrax.o
+	$(PLUGDIR)/io_autotrax/write.o
+	$(PLUGDIR)/io_autotrax/read.o
+@]
+
+switch /local/pcb/io_autotrax/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_autotrax/io_autotrax.c
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/io_autotrax.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/io_autotrax.c	(revision 18980)
@@ -0,0 +1,96 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  autotrax IO plugin - plugin coordination
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "plugins.h"
+#include "plug_io.h"
+#include "write.h"
+#include "read.h"
+#include "actions.h"
+
+#include "board.h"
+#include "netlist.h"
+#include "conf_core.h"
+#include "buffer.h"
+#include "hid.h"
+#include "compat_misc.h"
+
+static pcb_plug_io_t io_autotrax;
+static const char *autotrax_cookie = "autotrax IO";
+
+
+int io_autotrax_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "Protel autotrax") != 0) ||
+		((typ & (~(PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER | PCB_IOT_PCB))) != 0))
+		return 0;
+
+	return 100;
+}
+
+int pplg_check_ver_io_autotrax(int ver_needed) { return 0; }
+
+void pplg_uninit_io_autotrax(void)
+{
+	pcb_remove_actions_by_cookie(autotrax_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_autotrax);
+}
+
+int pplg_init_io_autotrax(void)
+{
+	PCB_API_CHK_VER;
+
+	io_autotrax.plugin_data = NULL;
+	io_autotrax.fmt_support_prio = io_autotrax_fmt;
+	io_autotrax.test_parse = io_autotrax_test_parse;
+	io_autotrax.parse_pcb = io_autotrax_read_pcb;
+	io_autotrax.parse_footprint = NULL;
+	io_autotrax.parse_font = NULL;
+	io_autotrax.write_buffer = NULL;
+	io_autotrax.write_footprint = NULL;
+	io_autotrax.write_pcb = io_autotrax_write_pcb;
+	io_autotrax.default_fmt = "Protel autotrax";
+	io_autotrax.description = "Protel autotrax and easytrax";
+	io_autotrax.save_preference_prio = 80;
+	io_autotrax.default_extension = ".PCB";
+	io_autotrax.fp_extension = ".PCB";
+	io_autotrax.mime_type = "application/x-autotrax-pcb";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_autotrax);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_autotrax/io_autotrax.pup
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/io_autotrax.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/io_autotrax.pup	(revision 18980)
@@ -0,0 +1,13 @@
+$class io
+$short autotrax (freeware PCB CAD)
+$long Import and export autotrax layouts and footprints.
+$state works
+$fmt-native no
+$fmt-feature-r autotrax PCB, version 4
+$fmt-feature-r autotrax PCB, version 5
+$fmt-feature-w autotrax PCB, version 4
+$package io-alien
+default buildin
+dep boardflip
+dep lib_polyhelp
+autoload 1
Index: tags/2.0.1/src_plugins/io_autotrax/read.c
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/read.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/read.c	(revision 18980)
@@ -0,0 +1,1204 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016, 2017 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <math.h>
+#include <qparse/qparse.h>
+#include "compat_misc.h"
+#include "board.h"
+#include "plug_io.h"
+#include "error.h"
+#include "data.h"
+#include "read.h"
+#include "layer.h"
+#include "netlist.h"
+#include "polygon.h"
+#include "misc_util.h" /* for distance calculations */
+#include "conf_core.h"
+#include "move.h"
+#include "macro.h"
+#include "safe_fs.h"
+#include "rotate.h"
+#include "../src_plugins/boardflip/boardflip.h"
+#include "actions.h"
+
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+#include "../src_plugins/lib_compat_help/subc_help.h"
+
+#define PCB REPLACE_THIS
+
+#define MAXREAD 255
+
+/* remove leading whitespace */
+#define ltrim(s) while(isspace(*s)) s++
+
+/* remove trailing newline */
+#define rtrim(s) \
+	do { \
+		char *end; \
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \
+			*end = '\0'; \
+	} while(0)
+
+/* read the next line, increasing the line number lineno */
+#define fgetline(s, size, stream, lineno) \
+	((lineno)++,fgets((s), (size), (stream)))
+
+/* the following sym_attr_t struct, #define... and sym_flush() routine could go in a shared lib */
+
+typedef struct {
+	char *refdes;
+	char *value;
+	char *footprint;
+} symattr_t;
+
+#define null_empty(s) ((s) == NULL ? "" : (s))
+
+static void sym_flush(symattr_t *sattr)
+{
+	if (sattr->refdes != NULL) {
+		if (sattr->footprint == NULL)
+			pcb_message(PCB_MSG_ERROR, "protel autotrax: not importing refdes=%s: no footprint specified\n", sattr->refdes);
+		else
+			pcb_actionl("ElementList", "Need", null_empty(sattr->refdes), null_empty(sattr->footprint), null_empty(sattr->value), NULL);
+	}
+	free(sattr->refdes);
+	sattr->refdes = NULL;
+	free(sattr->value);
+	sattr->value = NULL;
+	free(sattr->footprint);
+	sattr->footprint = NULL;
+}
+
+
+/* the followinf read_state_t struct could go in a shared lib for parsers doing layer mapping */
+
+typedef struct {
+	pcb_board_t *pcb;
+	const char *Filename;
+	conf_role_t settings_dest;
+	pcb_layer_id_t protel_to_stackup[13];
+	int lineno;
+	pcb_coord_t mask_clearance;
+	pcb_coord_t copper_clearance;
+	pcb_coord_t minimum_comp_pin_drill;
+	int trax_version;
+	int ignored_keepout_element;
+	int ignored_layer_zero_element;
+} read_state_t;
+
+static int rdax_net(read_state_t *st, FILE *FP); /* describes netlists for the layout */
+
+/* Look up (or even alloc) a layer on the board or in a subc, by autotrax layer number */
+static pcb_layer_t *autotrax_get_layer(read_state_t *st, pcb_subc_t *subc, int autotrax_layer, const char *otyp)
+{
+	int lid, comb;
+	pcb_layer_type_t lyt;
+
+	if (autotrax_layer == 12) {
+		st->ignored_keepout_element++;
+		return NULL;
+	}
+	if (autotrax_layer == 0) {
+		pcb_message(PCB_MSG_ERROR, "Ignored '%s' on easy/autotrax layer zero, %s:%d\n", otyp, st->Filename, st->lineno);
+		st->ignored_layer_zero_element++;
+		return NULL;
+	}
+
+	lid = st->protel_to_stackup[autotrax_layer];
+	if (lid < 0) {
+		pcb_message(PCB_MSG_ERROR, "Ignored '%s' on easy/autotrax unknown layer %d, %s:%d\n", otyp, autotrax_layer, st->Filename, st->lineno);
+		return NULL;
+	}
+
+	if (subc == NULL)
+		return &st->pcb->Data->Layer[lid];
+
+	lyt = pcb_layer_flags(st->pcb, lid);
+	comb = 0;
+	return pcb_subc_get_layer(subc, lyt, comb, 1, st->pcb->Data->Layer[lid].name, pcb_true);
+}
+
+/* autotrax_free_text/component_text */
+static int rdax_text(read_state_t *st, FILE *FP, pcb_subc_t *subc)
+{
+	int height_mil;
+	int autotrax_layer = 0;
+	char line[MAXREAD], *t;
+	int success;
+	int valid = 1;
+	pcb_coord_t X, Y, linewidth;
+	int scaling = 100;
+	unsigned direction = 0; /* default is horizontal */
+	pcb_flag_t Flags;
+	pcb_layer_t *ly;
+	pcb_layer_type_t lyt;
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc > 5) {
+			X = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			height_mil = pcb_get_value_ex(argv[2], NULL, NULL, NULL, NULL, &success);
+			valid &= success;
+			scaling = (100 * height_mil) / 60;
+			direction = pcb_get_value_ex(argv[3], NULL, NULL, NULL, NULL, &success);
+			direction = direction % 4; /* ignore mirroring */
+			valid &= success;
+			linewidth = pcb_get_value_ex(argv[4], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			autotrax_layer = pcb_get_value_ex(argv[5], NULL, NULL, NULL, NULL, &success);
+			valid &= (success && (autotrax_layer > 0) && (autotrax_layer < 14));
+			/* we ignore the user routed flag */
+			qparse_free(argc, &argv);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Insufficient free string attribute fields, %s:%d\n", st->Filename, st->lineno);
+			qparse_free(argc, &argv);
+			return -1;
+		}
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Failed to parse text attribute fields, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Empty free string text field, %s:%d\n", st->Filename, st->lineno);
+		strcpy(line, "(empty text field)");
+	} /* this helps the parser fail more gracefully if excessive newlines, or empty text field */
+
+	t = line;
+	ltrim(t);
+	rtrim(t); /*need to remove trailing '\r' to avoid rendering oddities */
+
+	/* # TODO - ABOUT HERE, CAN DO ROTATION/DIRECTION CONVERSION */
+
+	ly = autotrax_get_layer(st, subc, autotrax_layer, "text");
+	if (ly == NULL)
+		return 0;
+
+	lyt = pcb_layer_flags_(ly);
+	if (lyt & PCB_LYT_BOTTOM) Flags = pcb_flag_make(PCB_FLAG_ONSOLDER);
+	else Flags = pcb_flag_make(0);
+
+	if (pcb_text_new(ly, pcb_font(st->pcb, 0, 1), X, Y, direction, scaling, t, Flags) != 0)
+		return 1;
+	return -1;
+
+#warning TODO: do not use strlen() for this, decide where to move this code
+/*
+		if (strlen(t) == 0) {
+			pcb_message(PCB_MSG_ERROR, "Empty free string not placed on layout, %s:%d\n", st->Filename, st->lineno);
+			return 0;
+		}
+*/
+}
+
+/* autotrax_pcb free_track/component_track */
+static int rdax_track(read_state_t *st, FILE *FP, pcb_subc_t *subc)
+{
+	char line[MAXREAD];
+	pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance;
+	pcb_flag_t Flags = pcb_flag_make(0);
+	int autotrax_layer = 0;
+	int success;
+	int valid = 1;
+	pcb_layer_t *ly;
+
+	Thickness = 0;
+	Clearance = st->copper_clearance; /* start with sane default */
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc > 5) {
+			X1 = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y1 = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			X2 = pcb_get_value_ex(argv[2], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y2 = pcb_get_value_ex(argv[3], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Thickness = pcb_get_value_ex(argv[4], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			autotrax_layer = pcb_get_value_ex(argv[5], NULL, NULL, NULL, NULL, &success);
+			valid &= (success && (autotrax_layer > 0) && (autotrax_layer < 14));
+			/* we ignore the user routed flag */
+			qparse_free(argc, &argv);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Insufficient track attribute fields, %s:%d\n", st->Filename, st->lineno);
+			qparse_free(argc, &argv);
+			return -1;
+		}
+	}
+
+	ly = autotrax_get_layer(st, subc, autotrax_layer, "line");
+	if (ly == NULL)
+		return 0;
+
+	if (pcb_line_new(ly, X1, Y1, X2, Y2, Thickness, Clearance, Flags) != NULL)
+		return 1;
+	return -1;
+}
+
+/* autotrax_pcb free arc and component arc parser */
+static int rdax_arc(read_state_t *st, FILE *FP, pcb_subc_t *subc)
+{
+	char line[MAXREAD];
+	int segments = 15; /* full circle by default */
+	int success;
+	int valid = 1;
+	int autotrax_layer = 0;
+	pcb_layer_t *ly;
+
+	pcb_coord_t centreX, centreY, width, height, Thickness, Clearance, radius;
+	pcb_angle_t start_angle = 0.0;
+	pcb_angle_t delta = 360.0;
+
+	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
+	pcb_layer_id_t PCB_layer;
+
+	Thickness = 0;
+	Clearance = st->copper_clearance; /* start with sane default */
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc > 5) {
+			centreX = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			centreY = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			radius = pcb_get_value_ex(argv[2], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			segments = pcb_get_value_ex(argv[3], NULL, NULL, NULL, NULL, &success);
+			valid &= success;
+			Thickness = pcb_get_value_ex(argv[4], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			autotrax_layer = pcb_get_value_ex(argv[5], NULL, NULL, NULL, NULL, &success);
+			PCB_layer = st->protel_to_stackup[(int)autotrax_layer];
+			valid &= (success && (autotrax_layer > 0) && (autotrax_layer < 14));
+			/* we ignore the user routed flag */
+			qparse_free(argc, &argv);
+		}
+		else {
+			qparse_free(argc, &argv);
+			pcb_message(PCB_MSG_ERROR, "Insufficient arc attribute fields, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Unable to parse arc attribute fields, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+
+	width = height = radius;
+
+/* we now need to decrypt the segments value. Some definitions will represent two arcs.
+Bit 0 : RU quadrant
+Bit 1 : LU quadrant
+Bit 2 : LL quadrant
+Bit 3 : LR quadrant
+
+Since the board will be flipped, we should swap upper and lower quadrants
+
+TODO: This needs further testing to ensure the refererence
+document used reflects actual outputs from protel autotrax
+*/
+	if (segments == 10) { /* LU + RL quadrants */
+		start_angle = 180.0;
+		delta = 90.0;
+		pcb_arc_new(&st->pcb->Data->Layer[PCB_layer], centreX, centreY, width, height, start_angle, delta, Thickness, Clearance, Flags, pcb_true);
+		start_angle = 0.0;
+	}
+	else if (segments == 5) { /* RU + LL quadrants */
+		start_angle = 270.0;
+		delta = 90.0;
+		pcb_arc_new(&st->pcb->Data->Layer[PCB_layer], centreX, centreY, width, height, start_angle, delta, Thickness, Clearance, Flags, pcb_true);
+		start_angle = 90.0;
+	}
+	else if (segments >= 15) { /* whole circle */
+		start_angle = 0.0;
+		delta = 360.0;
+	}
+	else if (segments == 1) { /* RU quadrant */
+		start_angle = 90.0;
+		delta = 90.0;
+	}
+	else if (segments == 2) { /* LU quadrant */
+		start_angle = 0.0;
+		delta = 90.0;
+	}
+	else if (segments == 4) { /* LL quadrant */
+		start_angle = 270.0;
+		delta = 90.0;
+	}
+	else if (segments == 8) { /* RL quadrant */
+		start_angle = 180.0;
+		delta = 90.0;
+	}
+	else if (segments == 3) { /* Upper half */
+		start_angle = 0.0;
+		delta = 180.0;
+	}
+	else if (segments == 6) { /* Left half */
+		start_angle = 270.0;
+		delta = 180.0;
+	}
+	else if (segments == 12) { /* Lower half */
+		start_angle = 180.0;
+		delta = 180.0;
+	}
+	else if (segments == 9) { /* Right half */
+		start_angle = 90.0;
+		delta = 180.0;
+	}
+	else if (segments == 14) { /* not RUQ */
+		start_angle = 180.0;
+		delta = 270.0;
+	}
+	else if (segments == 13) { /* not LUQ */
+		start_angle = 90.0;
+		delta = 270.0;
+	}
+	else if (segments == 11) { /* not LLQ */
+		start_angle = 0.0;
+		delta = 270.0;
+	}
+	else if (segments == 7) { /* not RLQ */
+		start_angle = 270.0;
+		delta = 270.0;
+	}
+
+	ly = autotrax_get_layer(st, subc, autotrax_layer, "arc");
+	if (ly == NULL)
+		return 0;
+
+	if (pcb_arc_new(ly, centreX, centreY, width, height, start_angle, delta, Thickness, Clearance, Flags, pcb_true) != 0)
+		return 1;
+	return -1;
+}
+
+/* autotrax_pcb via parser */
+static int rdax_via(read_state_t *st, FILE *FP, pcb_subc_t *subc)
+{
+	char line[MAXREAD];
+	char *name;
+	int success;
+	int valid = 1;
+	pcb_data_t *data = (subc == NULL) ? st->pcb->Data : subc->data;
+	pcb_pstk_t *ps;
+	pcb_coord_t X, Y, Thickness, Clearance, Mask, Drill; /* not sure what to do with mask */
+
+	Thickness = 0;
+	Clearance = st->copper_clearance; /* start with sane default */
+
+	Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */
+
+	name = pcb_strdup("unnamed");
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc >= 4) {
+			X = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Thickness = pcb_get_value_ex(argv[2], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Drill = pcb_get_value_ex(argv[3], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			qparse_free(argc, &argv);
+		}
+		else {
+			qparse_free(argc, &argv);
+			pcb_message(PCB_MSG_ERROR, "Insufficient via attribute fields, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Unable to parse via attribute fields, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+	Mask = Thickness + st->mask_clearance;
+
+	ps = pcb_pstk_new_compat_via(data, X, Y, Drill, Thickness, Clearance, Mask, PCB_PSTK_COMPAT_ROUND, 1);
+	return ps != NULL;
+}
+
+/* autotrax_pcb free or component pad
+x y X_size Y_size shape holesize pwr/gnd layer
+padname
+may need to think about hybrid outputs, like pad + hole, to match possible features in protel autotrax
+*/
+static int rdax_pad(read_state_t *st, FILE *FP, pcb_subc_t *subc, int component)
+{
+	char line[MAXREAD], *s;
+	int Connects = 0;
+	int Shape = 0;
+	int autotrax_layer = 0;
+	int valid = 1;
+	int success;
+	pcb_coord_t X, Y, X_size, Y_size, Thickness, Clearance, Mask, Drill;
+	pcb_data_t *data = (subc == NULL) ? st->pcb->Data : subc->data;
+	pcb_pstk_t *ps;
+
+	Thickness = 0;
+	Clearance = st->copper_clearance; /* start with sane default */
+
+	Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *end;
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc <= 6) {
+			qparse_free(argc, &argv);
+			pcb_message(PCB_MSG_ERROR, "Insufficient pad attribute fields, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+		X = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+		valid &= success;
+		Y = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+		valid &= success;
+		X_size = pcb_get_value_ex(argv[2], NULL, NULL, NULL, "mil", &success);
+		valid &= success;
+		Y_size = pcb_get_value_ex(argv[3], NULL, NULL, NULL, "mil", &success);
+		valid &= success;
+		Shape = strtol(argv[4], &end, 10);
+		if (*end != '\0') valid = 0;
+		Drill = pcb_get_value_ex(argv[5], NULL, NULL, NULL, "mil", &success);
+		valid &= success;
+		Connects = strtol(argv[6], &end, 10);
+		if (*end != '\0') valid = 0;
+		/* which specifies GND or Power connection for pin/pad/via */
+		autotrax_layer = strtol(argv[7], &end, 10);
+		if (*end != '\0') valid = 0;
+		valid &= (success && (autotrax_layer > 0) && (autotrax_layer < 14));
+		qparse_free(argc, &argv);
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Insufficient pad attribute fields, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+/* now find name as string on next line and copy it */
+#warning TODO: can not exit above if we need to read this line
+	if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error parsing pad text field line, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+	s = line;
+	rtrim(s); /* avoid rendering oddities on layout, and netlist matching confusion */
+
+	if (autotrax_layer == 11) return 1; /* layer 11: "board" layer - looks like an ignore */
+
+	/* these features can have connections to GND and PWR
+	   planes specified in protel autotrax (seems rare though)
+	   so we warn the user is this is the case */
+	switch (Connects) {
+		case 1:
+			pcb_message(PCB_MSG_ERROR, "pin clears PWR/GND, %s:%d.\n", st->Filename, st->lineno);
+			break;
+		case 2:
+			pcb_message(PCB_MSG_ERROR, "pin requires relief to GND plane, %s:%d.\n", st->Filename, st->lineno);
+			break;
+		case 4:
+			pcb_message(PCB_MSG_ERROR, "pin requires relief to PWR plane, %s:%d.\n", st->Filename, st->lineno);
+			break;
+		case 3:
+			pcb_message(PCB_MSG_ERROR, "pin should connect to PWR plane, %s:%d.\n", st->Filename, st->lineno);
+			break;
+		case 5:
+			pcb_message(PCB_MSG_ERROR, "pin should connect to GND plane, %s:%d.\n", st->Filename, st->lineno);
+			break;
+	}
+
+	Thickness = MIN(X_size, Y_size);
+	Mask = Thickness + st->mask_clearance;
+
+	if (autotrax_layer == 0) {
+		pcb_message(PCB_MSG_ERROR, "Ignored pad on easy/autotrax layer zero, %s:%d\n", st->Filename, st->lineno);
+		st->ignored_layer_zero_element++;
+		return 0;
+	}
+
+	/* Easytrax seems to specify zero drill for some component pins, and round free pins/pads */
+	if (((st->trax_version == 5) && (X_size == Y_size) && component && (Drill == 0))
+			|| ((st->trax_version == 5) && (X_size == Y_size) && (Shape == 1) && (Drill == 0))) {
+		Drill = st->minimum_comp_pin_drill; /* ?may be better off using half the thickness for drill */
+	}
+
+/* currently ignore:
+   shape:
+    5 Cross Hair Target
+    6 Moiro Target */
+	if ((Shape == 5) || (Shape == 6)) {
+		pcb_message(PCB_MSG_ERROR, "Unsupported FP target shape %d, %s:%d.\n", Shape, st->Filename, st->lineno);
+		return 0;
+	}
+
+	{ /* pad not within element, i.e. a free pad/pin/via */
+		pcb_pstk_shape_t sh[8];
+		int n;
+
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = PCB_LYT_PASTE; sh[0].comb = PCB_LYC_AUTO;
+		sh[1].layer_mask = PCB_LYT_MASK; sh[1].comb = PCB_LYC_SUB | PCB_LYC_AUTO;
+		sh[2].layer_mask = PCB_LYT_COPPER;
+		sh[3].layer_mask = PCB_LYT_COPPER;
+		sh[4].layer_mask = PCB_LYT_COPPER;
+		sh[5].layer_mask = PCB_LYT_MASK; sh[5].comb = PCB_LYC_SUB | PCB_LYC_AUTO;
+		sh[6].layer_mask = PCB_LYT_PASTE; sh[6].comb = PCB_LYC_AUTO;
+
+		switch(autotrax_layer) {
+			case 1:
+				for(n = 0; n < 3; n++)
+					sh[n].layer_mask |= PCB_LYT_TOP;
+				sh[3].layer_mask = 0;
+				break;
+			case 6:
+				for(n = 0; n < 3; n++)
+					sh[n].layer_mask |= PCB_LYT_BOTTOM;
+				sh[3].layer_mask = 0;
+				break;
+			case 13:
+				for(n = 0; n < 3; n++)
+					sh[n].layer_mask |= PCB_LYT_TOP;
+				sh[3].layer_mask |= PCB_LYT_INTERN;
+				for(n = 4; n < 7; n++)
+					sh[n].layer_mask |= PCB_LYT_BOTTOM;
+				break;
+			default:
+				pcb_message(PCB_MSG_ERROR, "Unsupported FP layer: %d, %s:%d.\n", autotrax_layer, st->Filename, st->lineno);
+				return 0;
+		}
+
+		switch(Shape) {
+			case 1: /* round */
+				for(n = 0; n < 7; n++) {
+					pcb_coord_t clr = (sh[n].layer_mask & PCB_LYT_MASK) ? Clearance : 0;
+					if (sh[n].layer_mask == 0) break;
+					pcb_shape_oval(&sh[n], X_size+clr, Y_size+clr);
+				}
+				break;
+			case 2: /* rect */
+			case 4: /* round-rect - for now */
+#warning TODO: generate round-rect
+				for(n = 0; n < 7; n++) {
+					pcb_coord_t clr = (sh[n].layer_mask & PCB_LYT_MASK) ? Clearance : 0;
+					if (sh[n].layer_mask == 0) break;
+					pcb_shape_rect(&sh[n], X_size+clr, Y_size+clr);
+				}
+				break;
+			case 3: /* octa */
+#warning TODO: generate octa
+			default:
+				pcb_message(PCB_MSG_ERROR, "Unsupported FP shape: %d, %s:%d.\n", Shape, st->Filename, st->lineno);
+				return 0;
+		}
+		ps = pcb_pstk_new_from_shape(data, X, Y, Drill, 1, Clearance, sh);
+		if (ps == NULL)
+			pcb_message(PCB_MSG_ERROR, "Failed to convert FP to padstack, %s:%d.\n", st->Filename, st->lineno);
+
+		return (ps != NULL);
+	}
+}
+
+/* protel autorax free fill (rectangular pour) parser - the closest thing protel autotrax has to a polygon */
+static int rdax_fill(read_state_t *st, FILE *FP, pcb_subc_t *subc)
+{
+	int success;
+	int valid = 1;
+	int autotrax_layer = 0;
+	char line[MAXREAD];
+	pcb_poly_t *polygon = NULL;
+	pcb_flag_t flags = pcb_flag_make(PCB_FLAG_CLEARPOLY);
+	pcb_coord_t X1, Y1, X2, Y2, Clearance;
+	pcb_layer_t *ly;
+
+	Clearance = st->copper_clearance; /* start with sane default */
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc >= 5) {
+			X1 = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y1 = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			X2 = pcb_get_value_ex(argv[2], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			Y2 = pcb_get_value_ex(argv[3], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+#warning TODO: do not use get_value_ex for plain integers (revise the whole file for this)
+			autotrax_layer = pcb_get_value_ex(argv[4], NULL, NULL, NULL, NULL, &success);
+			valid &= (success && (autotrax_layer > 0) && (autotrax_layer < 14));
+			qparse_free(argc, &argv);
+		}
+		else {
+			qparse_free(argc, &argv);
+			pcb_message(PCB_MSG_ERROR, "Insufficient fill attribute fields, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Fill attribute fields unable to be parsed, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+#warning TODO: figure if autotrax really converts layer 1 and 6 polygons to pads
+	if ((subc == NULL) || ((autotrax_layer != 1) && (autotrax_layer != 6))) {
+		ly = autotrax_get_layer(st, subc, autotrax_layer, "polygon");
+		if (ly == NULL)
+			return 0;
+
+		polygon = pcb_poly_new(ly, 0, flags);
+		if (polygon == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Failed to allocate polygon, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+
+		pcb_poly_point_new(polygon, X1, Y1);
+		pcb_poly_point_new(polygon, X2, Y1);
+		pcb_poly_point_new(polygon, X2, Y2);
+		pcb_poly_point_new(polygon, X1, Y2);
+		pcb_add_poly_on_layer(ly, polygon);
+		if (subc == NULL)
+			pcb_poly_init_clip(st->pcb->Data, ly, polygon);
+		return 1;
+	}
+	else {
+		pcb_coord_t w = X2-X1, h = Y2-Y1;
+		pcb_pstk_shape_t sh[4];
+		pcb_layer_type_t side;
+		int n;
+
+		switch(autotrax_layer) {
+			case 1: side = PCB_LYT_TOP; break;
+			case 6: side = PCB_LYT_BOTTOM; break;
+		}
+
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = side | PCB_LYT_PASTE; sh[0].comb = PCB_LYC_AUTO;
+		sh[1].layer_mask = side | PCB_LYT_MASK; sh[1].comb = PCB_LYC_SUB | PCB_LYC_AUTO;
+		sh[2].layer_mask = side | PCB_LYT_COPPER;
+		pcb_shape_rect(&sh[0], w, h);
+		pcb_shape_rect(&sh[1], w+Clearance, h+Clearance);
+		pcb_shape_rect(&sh[2], w, h);
+		if (pcb_pstk_new_from_shape(subc->data, (X1+X2)/2, (Y1+Y2)/2, 0, 0, Clearance, sh) != NULL)
+			return 1;
+		pcb_message(PCB_MSG_ERROR, "SMD pad: filed to convert from polygon, %s:%d\n", st->Filename, st->lineno);
+	}
+
+	return -1;
+}
+
+static pcb_layer_id_t autotrax_reg_layer(read_state_t *st, const char *autotrax_layer, unsigned int mask)
+{
+	pcb_layer_id_t id;
+	if (pcb_layer_list(st->pcb, mask, &id, 1) != 1) {
+		pcb_layergrp_id_t gid;
+		pcb_layergrp_list(st->pcb, mask, &gid, 1);
+		id = pcb_layer_create(st->pcb, gid, autotrax_layer);
+	}
+	return id;
+}
+
+/* create a set of default layers, since protel has a static stackup */
+static int autotrax_create_layers(read_state_t *st)
+{
+
+	pcb_layergrp_t *g;
+	pcb_layer_id_t id;
+
+	pcb_layer_group_setup_default(st->pcb);
+
+	st->protel_to_stackup[7] = autotrax_reg_layer(st, "top silk", PCB_LYT_SILK | PCB_LYT_TOP);
+	st->protel_to_stackup[8] = autotrax_reg_layer(st, "bottom silk", PCB_LYT_SILK | PCB_LYT_BOTTOM);
+
+	st->protel_to_stackup[1] = autotrax_reg_layer(st, "top copper", PCB_LYT_COPPER | PCB_LYT_TOP);
+	st->protel_to_stackup[6] = autotrax_reg_layer(st, "bottom copper", PCB_LYT_COPPER | PCB_LYT_BOTTOM);
+
+	if (pcb_layer_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &id, 1) == 1) {
+		pcb_layergrp_id_t gid;
+		pcb_layergrp_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1);
+		st->protel_to_stackup[11] = pcb_layer_create(st->pcb, gid, "Board"); /* != outline, cutouts */
+		pcb_layergrp_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1);
+		st->protel_to_stackup[13] = pcb_layer_create(st->pcb, gid, "Multi");
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Unable to create Keepout, Multi layers in default top silk group\n");
+	}
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[2] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Mid1");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[3] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Mid2");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[4] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Mid3");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[5] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Mid4");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[9] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "GND");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	st->protel_to_stackup[10] = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, "Power");
+
+	g = pcb_get_grp_new_intern(st->pcb, -1);
+	g->name = pcb_strdup("outline"); /* equivalent to keepout = layer 12 in autotrax */
+	g->ltype = PCB_LYT_OUTLINE; /* and includes cutouts */
+	st->protel_to_stackup[12] = autotrax_reg_layer(st, "outline", PCB_LYT_OUTLINE);
+
+	pcb_layergrp_inhibit_dec();
+
+	return 0;
+}
+
+/* autotrax_pcb  rdax_net ;   used to read net descriptions for the entire layout */
+static int rdax_net(read_state_t *st, FILE *FP)
+{
+	symattr_t sattr;
+
+	char line[MAXREAD];
+	char *netname, *s;
+	int length = 0;
+	int in_comp = 0;
+	int in_net = 1;
+	int in_node_table = 0;
+	int endpcb = 0;
+
+	netname = NULL;
+
+	memset(&sattr, 0, sizeof(sattr));
+
+	/* next line is the netlist name */
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		s = line;
+		rtrim(s);
+		netname = pcb_strdup(line);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Empty netlist name found, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+	fgetline(line, sizeof(line), FP, st->lineno);
+	s = line;
+	rtrim(s);
+	while(!feof(FP) && !endpcb && in_net) {
+		fgetline(line, sizeof(line), FP, st->lineno);
+		if (strncmp(line, "[", 1) == 0) {
+			in_comp = 1;
+			while(in_comp) {
+				if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Empty line in netlist COMP, %s:%d\n", st->Filename, st->lineno);
+				}
+				else {
+					if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+						pcb_message(PCB_MSG_ERROR, "Empty netlist REFDES, %s:%d\n", st->Filename, st->lineno);
+					}
+					else {
+						s = line;
+						rtrim(s);
+						sym_flush(&sattr);
+						free(sattr.refdes);
+						sattr.refdes = pcb_strdup(line);
+					}
+					if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+						pcb_message(PCB_MSG_ERROR, "Empty NETDEF package, %s:%d\n", st->Filename, st->lineno);
+						free(sattr.footprint);
+						sattr.footprint = pcb_strdup("unknown");
+					}
+					else {
+						s = line;
+						rtrim(s);
+						free(sattr.footprint);
+						sattr.footprint = pcb_strdup(line);
+					}
+					if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+						free(sattr.value);
+						sattr.value = pcb_strdup("value");
+					}
+					else {
+						s = line;
+						rtrim(s);
+						free(sattr.value);
+						sattr.value = pcb_strdup(line);
+					}
+				}
+				while(fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+					/* clear empty lines in COMP definition */
+				}
+				if (strncmp(line, "]", 1) == 0) {
+					in_comp = 0;
+				}
+			}
+		}
+		else if (strncmp(line, "(", 1) == 0) {
+			in_net = 1;
+			while(in_net || in_node_table) {
+				while(fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+					/* skip empty lines */
+				}
+				if (strncmp(line, ")", 1) == 0) {
+					in_net = 0;
+				}
+				else if (strncmp(line, "{", 1) == 0) {
+					in_node_table = 1;
+					in_net = 0;
+				}
+				else if (strncmp(line, "}", 1) == 0) {
+					in_node_table = 0;
+				}
+				else if (!in_node_table) {
+					s = line;
+					rtrim(s);
+					if (line != NULL && netname != NULL) {
+						pcb_actionl("Netlist", "Add", netname, line, NULL);
+					}
+				}
+			}
+		}
+		else if (length >= 6 && strncmp(line, "ENDPCB", 6) == 0) {
+			pcb_message(PCB_MSG_ERROR, "End of protel Autotrax file found in netlist section?!, %s:%d\n", st->Filename, st->lineno);
+			endpcb = 1; /* if we get here, something went wrong */
+		}
+	}
+	sym_flush(&sattr);
+
+	return 0;
+}
+
+/* protel autotrax component definition parser */
+/* no mark() or location as such it seems */
+static int rdax_component(read_state_t *st, FILE *FP)
+{
+	int success;
+	int valid = 1;
+	int refdes_scaling = 100;
+	pcb_coord_t module_X, module_Y;
+	unsigned direction = 0; /* default is horizontal */
+	char module_name[MAXREAD], module_refdes[MAXREAD], module_value[MAXREAD];
+	pcb_subc_t *new_module;
+
+	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
+	pcb_flag_t text_flags = pcb_flag_make(0); /* start with something bland here */
+
+	char *s, line[MAXREAD];
+	int nonempty = 0;
+	int length = 0;
+
+	if (fgetline(module_refdes, sizeof(module_refdes), FP, st->lineno) == NULL) {
+		strcpy(module_refdes, "unknown");
+	}
+	s = module_refdes;
+	rtrim(s); /* avoid rendering oddities on layout */
+	if (fgetline(module_name, sizeof(module_name), FP, st->lineno) == NULL) {
+		strcpy(module_name, "unknown");
+	}
+	s = module_name;
+	rtrim(s); /* avoid rendering oddities on layout */
+	if (fgetline(module_value, sizeof(module_value), FP, st->lineno) == NULL) {
+		strcpy(module_value, "unknown");
+	}
+	s = module_value;
+	rtrim(s); /* avoid rendering oddities on layout */
+
+/* with the header read, we now ignore the locations for the text fields in the next two lines... */
+/* we also allow up to two empty lines in case of extra newlines */
+	if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+		fgetline(line, sizeof(line), FP, st->lineno);
+	}
+	if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+		fgetline(line, sizeof(line), FP, st->lineno);
+	}
+
+	if (fgetline(line, sizeof(line), FP, st->lineno) != NULL) {
+		int argc;
+		char **argv, *s;
+		s = line;
+		ltrim(s);
+		rtrim(s);
+		argc = qparse2(s, &argv, 0);
+		if (argc >= 2) {
+			module_X = pcb_get_value_ex(argv[0], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+			module_Y = pcb_get_value_ex(argv[1], NULL, NULL, NULL, "mil", &success);
+			valid &= success;
+#warning TODO: load placement status and apply PCB_FLAG_LOCK if needed
+			qparse_free(argc, &argv);
+		}
+		else {
+			qparse_free(argc, &argv);
+			pcb_message(PCB_MSG_ERROR, "Insufficient COMP attribute fields, %s:%d\n", st->Filename, st->lineno);
+			return -1;
+		}
+	}
+
+	if (!valid) {
+		pcb_message(PCB_MSG_ERROR, "Unable to parse COMP attributes, %s:%d\n", st->Filename, st->lineno);
+		return -1;
+	}
+
+	new_module = pcb_subc_alloc();
+	pcb_subc_create_aux(new_module, module_X, module_Y, 0.0, 0);
+	pcb_attribute_put(&new_module->Attributes, "refdes", "A1");
+	pcb_add_subc_to_data(st->pcb->Data, new_module);
+	pcb_subc_bind_globals(st->pcb, new_module);
+
+	nonempty = 0;
+	while(!feof(FP)) {
+		if (fgetline(line, sizeof(line), FP, st->lineno) == NULL) {
+			fgetline(line, sizeof(line), FP, st->lineno);
+		}
+		s = line;
+		length = strlen(line);
+		if (length >= 7) {
+			if (strncmp(line, "ENDCOMP", 7) == 0) {
+				if (nonempty) { /* could try and use module empty function here */
+					pcb_subc_bbox(new_module);
+					break;
+				}
+				else {
+					pcb_message(PCB_MSG_ERROR, "Empty module/COMP found, not added to layout, %s:%d\n", st->Filename, st->lineno);
+#warning TODO safely free new_module
+					return 0;
+				}
+			}
+		}
+		else if (length >= 2) {
+#warning TODO: this does not handle return -1
+			if (strncmp(s, "CT", 2) == 0) {
+				nonempty |= rdax_track(st, FP, new_module);
+			}
+			else if (strncmp(s, "CA", 2) == 0) {
+				nonempty |= rdax_arc(st, FP, new_module);
+			}
+			else if (strncmp(s, "CV", 2) == 0) {
+				nonempty |= rdax_via(st, FP, new_module);
+			}
+			else if (strncmp(s, "CF", 2) == 0) {
+				nonempty |= rdax_fill(st, FP, new_module);
+			}
+			else if (strncmp(s, "CP", 2) == 0) {
+				nonempty |= rdax_pad(st, FP, new_module, 1); /* flag in COMP */
+			}
+			else if (strncmp(s, "CS", 2) == 0) {
+				nonempty |= rdax_text(st, FP, new_module);
+			}
+		}
+	}
+	pcb_subc_bbox(new_module);
+	if (st->pcb->Data->subc_tree == NULL)
+		st->pcb->Data->subc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(st->pcb->Data->subc_tree, (pcb_box_t *)new_module);
+	pcb_subc_rebind(st->pcb, new_module);
+
+	return 0;
+}
+
+
+int io_autotrax_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int readres = 0;
+	pcb_box_t board_size, *box;
+	read_state_t st;
+	FILE *FP;
+	pcb_subc_t *subc = NULL;
+	int length = 0;
+	int finished = 0;
+	int netdefs = 0;
+	char line[1024];
+	char *s;
+
+	FP = pcb_fopen(Filename, "r");
+	if (FP == NULL)
+		return -1;
+
+	/* set up the parse context */
+	memset(&st, 0, sizeof(st));
+	st.pcb = Ptr;
+	st.Filename = Filename;
+	st.settings_dest = settings_dest;
+	st.lineno = 0;
+	st.mask_clearance = st.copper_clearance = PCB_MIL_TO_COORD(10); /* sensible default values */
+	st.minimum_comp_pin_drill = PCB_MIL_TO_COORD(30); /* Easytrax PCB FILE 5 uses zero in COMP pins */
+	st.trax_version = 4; /* assume autotrax, not easytrax */
+	st.ignored_keepout_element = 0;
+	st.ignored_layer_zero_element = 0;
+
+	while(!feof(FP) && !finished) {
+		if (fgetline(line, sizeof(line), FP, st.lineno) == NULL) {
+			fgetline(line, sizeof(line), FP, st.lineno);
+		}
+		s = line;
+		rtrim(s);
+		length = strlen(line);
+		if (length >= 10) {
+			if (strncmp(line, "PCB FILE 4", 10) == 0) {
+				st.trax_version = 4;
+				autotrax_create_layers(&st);
+			}
+			else if (strncmp(line, "PCB FILE 5", 10) == 0) {
+				st.trax_version = 5;
+				autotrax_create_layers(&st);
+			}
+		}
+		else if (length >= 6) {
+			if (strncmp(s, "ENDPCB", 6) == 0) {
+				finished = 1;
+			}
+			else if (strncmp(s, "NETDEF", 6) == 0) {
+				if (netdefs == 0) {
+					pcb_actionl("ElementList", "start", NULL);
+					pcb_actionl("Netlist", "Freeze", NULL);
+					pcb_actionl("Netlist", "Clear", NULL);
+				}
+				netdefs |= 1;
+				rdax_net(&st, FP);
+			}
+		}
+		else if (length >= 4) {
+			if (strncmp(line, "COMP", 4) == 0) {
+				rdax_component(&st, FP);
+			}
+		}
+		else if (length >= 2) {
+			if (strncmp(s, "FT", 2) == 0)      rdax_track(&st, FP, subc);
+			else if (strncmp(s, "FA", 2) == 0) rdax_arc(&st, FP, subc);
+			else if (strncmp(s, "FV", 2) == 0) rdax_via(&st, FP, subc);
+			else if (strncmp(s, "FF", 2) == 0) rdax_fill(&st, FP, subc);
+			else if (strncmp(s, "FP", 2) == 0) rdax_pad(&st, FP, subc, 0); /* flag not in a component */
+			else if (strncmp(s, "FS", 2) == 0) rdax_text(&st, FP, subc);
+		}
+	}
+	if (netdefs) {
+		pcb_actionl("Netlist", "Sort", NULL);
+		pcb_actionl("Netlist", "Thaw", NULL);
+		pcb_actionl("ElementList", "Done", NULL);
+	}
+	fclose(FP);
+	box = pcb_data_bbox(&board_size, Ptr->Data, pcb_false);
+	if (st.ignored_keepout_element) {
+		pcb_message(PCB_MSG_ERROR, "Ignored %d keepout track(s) on auto/easytrax layer 12\n", st.ignored_keepout_element);
+	}
+	if (st.ignored_layer_zero_element) {
+		pcb_message(PCB_MSG_ERROR, "Ignored %d auto/easytrax layer zero feature(s)\n", st.ignored_layer_zero_element);
+	}
+
+	if (box != NULL) {
+		Ptr->MaxWidth = box->X2;
+		Ptr->MaxHeight = box->Y2;
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Can not determine board extents - empty board?\n");
+
+	/* we now flip the board about the X-axis, to invert the Y coords used by autotrax */
+	pcb_flip_data(Ptr->Data, 0, 1, 0, Ptr->MaxHeight, 0);
+
+	/* still not sure if this is required: */
+	pcb_layer_auto_fixup(Ptr);
+
+	pcb_board_normalize(Ptr);
+	pcb_layer_colors_from_conf(Ptr, 1);
+
+	return readres;
+}
+
+int io_autotrax_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[1024], *s;
+
+	if (typ != PCB_IOT_PCB)
+		return 0; /* support only boards for now */
+
+	while(!(feof(f))) {
+		if (fgets(line, sizeof(line), f) != NULL) {
+			s = line;
+			while(isspace(*s))
+				s++; /* strip leading whitespace */
+			if (strncmp(s, "PCB FILE 4", 10) == 0 || strncmp(s, "PCB FILE 5", 10) == 0)
+				return 1;
+			if ((*s == '\r') || (*s == '\n') || (*s == '#') || (*s == '\0'))
+				/* ignore empty lines and comments */
+				continue;
+			return 0;
+		}
+	}
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_autotrax/read.h
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/read.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/read.h	(revision 18980)
@@ -0,0 +1,34 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include "data.h"
+
+int io_autotrax_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_autotrax_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
Index: tags/2.0.1/src_plugins/io_autotrax/write.c
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/write.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/write.c	(revision 18980)
@@ -0,0 +1,689 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016, 2017 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include <math.h>
+#include "config.h"
+#include "compat_misc.h"
+#include "board.h"
+#include "plug_io.h"
+#include "error.h"
+#include "data.h"
+#include "write.h"
+#include "layer.h"
+#include "polygon_offs.h"
+#include "../lib_polyhelp/polyhelp.h"
+
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+
+
+typedef struct {
+	pcb_layer_type_t lyt;
+	pcb_bool plane;
+} layer_map_t;
+
+/* The hardwired layer map of autotrax */
+#define LAYER_MAP_LEN 14
+static layer_map_t layer_map[LAYER_MAP_LEN] = {
+	/*  0 */ { 0,                               0}, /* unused */
+	/*  1 */ { PCB_LYT_TOP    | PCB_LYT_COPPER, 0}, /* "top" */
+	/*  2 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 0},
+	/*  3 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 0},
+	/*  4 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 0},
+	/*  5 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 0},
+	/*  6 */ { PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0}, /* "bottom" */
+	/*  7 */ { PCB_LYT_TOP    | PCB_LYT_SILK,   0}, /* "top overlay" */
+	/*  8 */ { PCB_LYT_BOTTOM | PCB_LYT_SILK,   0}, /* "bottom overlay" */
+	/*  9 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 1}, /* "ground plane" */
+	/* 10 */ { PCB_LYT_INTERN | PCB_LYT_COPPER, 1}, /* "power plane" */
+	/* 11 */ { PCB_LYT_OUTLINE,                 0}, /* "board layer" */
+	/* 12 */ { 0,                               0}, /* "keepout" */
+	/* 13 */ { 0,                               0}, /* "multi layer" - used to indicate padstacks are on all layers */
+};
+
+typedef struct {
+	FILE *f;
+	pcb_board_t *pcb;
+	pcb_layergrp_t *id2grp[LAYER_MAP_LEN];
+	int grp2id[PCB_MAX_LAYERGRP];
+} wctx_t;
+
+static int wrax_layer2id(wctx_t *ctx, pcb_layer_t *ly)
+{
+	pcb_layergrp_id_t gid = pcb_layer_get_group_(ly);
+	if ((gid >= 0) && (gid < PCB_MAX_LAYERGRP))
+		return ctx->grp2id[gid];
+	return 0;
+}
+
+static pcb_layergrp_t *wrax_id2grp(wctx_t *ctx, int alayer_id)
+{
+	if ((alayer_id <= 0) || (alayer_id >= LAYER_MAP_LEN))
+		return NULL;
+	return ctx->id2grp[alayer_id];
+}
+
+static int wrax_lyt2id(wctx_t *ctx, pcb_layer_type_t lyt)
+{
+	int n;
+	for(n = 1; n < LAYER_MAP_LEN; n++)
+		if (layer_map[n].lyt == lyt)
+			return n;
+	return 0;
+}
+
+static void wrax_map_layer_error(wctx_t *ctx, pcb_layergrp_t *grp, const char *msg, const char *hint)
+{
+	char tmp[256];
+	pcb_snprintf(tmp, sizeof(tmp), "%s (omitting layer group): %s", msg, grp->name);
+	pcb_io_incompat_save(ctx->pcb->Data, NULL, tmp, hint);
+}
+
+static int wrax_map_layers(wctx_t *ctx)
+{
+	int n, intcnt = 0;
+
+	for(n = 0; n < ctx->pcb->LayerGroups.len; n++) {
+		pcb_layergrp_t *grp = &ctx->pcb->LayerGroups.grp[n];
+		int al;
+
+		if ((grp->ltype & PCB_LYT_SUBSTRATE) || (grp->ltype & PCB_LYT_VIRTUAL) || (grp->ltype & PCB_LYT_PASTE) || (grp->ltype & PCB_LYT_MASK))
+			continue;
+
+		al = wrax_lyt2id(ctx, grp->ltype);
+		if (al == 0) {
+			wrax_map_layer_error(ctx, grp, "Unable to map pcb-rnd layer group to autotrax layer", "change layer type");
+			continue;
+		}
+
+		if (grp->ltype & PCB_LYT_INTERN) {
+			/* intern copper: find the first free slot */
+			while((layer_map[al+intcnt].lyt & PCB_LYT_INTERN) && (ctx->id2grp[al+intcnt] != NULL)) intcnt++;
+			al += intcnt;
+			if (!(layer_map[al+intcnt].lyt & PCB_LYT_INTERN)) {
+				wrax_map_layer_error(ctx, grp, "Ran out of internal layer groups while mapping pcb-rnd layer group to autotrax layer", "autotrax supports only 4 internal signal layers - use less internal layers");
+				continue;
+			}
+		}
+
+		if (ctx->id2grp[al] != NULL) {
+			wrax_map_layer_error(ctx, grp, "Attempt to map multiple layer groups to the same autotrax layer", "use only one layer group per layer group type");
+			continue;
+		}
+
+		ctx->id2grp[al] = grp;
+		ctx->grp2id[grp - ctx->pcb->LayerGroups.grp] = al;
+	}
+	return 0;
+}
+
+
+#define PCB_PSTK_COMPAT_RRECT 250
+static int wrax_padstack(wctx_t *ctx, pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	const char *name;
+	pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask, x1, y1, x2, y2, thickness, w, h;
+	pcb_pstk_compshape_t cshape;
+	pcb_bool plated, square, nopaste;
+	int ashape, alayer;
+
+	if (ps->term != NULL) {
+		const char *s;
+		int len;
+
+		name = ps->term;
+		for(s = name, len = 0; *s != '\0'; s++,len++) {
+			if (!isalnum(*s)) {
+				pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "autotrax pad name (terminal name) must consists of alphanumeric characters only - omitting padstack", "rename the terminal to something simpler");
+				return 0;
+			}
+			if (len >= 4) {
+				pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "autotrax pad name (terminal name) must consists of alphanumeric characters only - omitting padstack", "rename the terminal to something simpler");
+				return 0;
+			}
+		}
+	}
+	else
+		name = "none";
+
+	if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+		w = h = pad_dia;
+		alayer = 13;
+	}
+	else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) {
+		if ((x1 != x2) && (y1 != y2)) {
+			pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "can not export rotated rectangular/line pin/pad/via", "shape must be axis-aligned");
+			return 0;
+		}
+		/* convert to the same format as via */
+		cshape = square ? PCB_PSTK_COMPAT_SQUARE : PCB_PSTK_COMPAT_RRECT;
+
+		/* calculate center and disable hole */
+		x = (x1+x2)/2;
+		y = (y1+y2)/2;
+		w = x2 - x1;
+		h = y2 - y1;
+		drill_dia = 0;
+
+#warning TODO: need to figure which side the padstack is on!
+		alayer = 1;
+	}
+	else {
+		pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "can not export complex pin/pad/via", "use uniform shaped pins/vias and simpler pads, with simple shapes (no generic polygons)");
+		return 0;
+	}
+
+	if ((cshape != PCB_PSTK_COMPAT_ROUND) && (ps->rot != 0)) {
+		pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "can not export rotated pin/pad/via", "remove rotation, shapes must be axis-aligned");
+		return 0;
+	}
+
+	switch((int)cshape) {
+		case PCB_PSTK_COMPAT_ROUND:   ashape = 1; break;
+		case PCB_PSTK_COMPAT_SQUARE:  ashape = 2; break;
+		case PCB_PSTK_COMPAT_OCTAGON: ashape = 3; break;
+		case PCB_PSTK_COMPAT_RRECT:   ashape = 4; break;
+		default:
+			pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "can not export: invalid pad shape", "use circle, octagon, rectangle or round rectangle");
+			return 0;
+	}
+
+	if (in_subc)
+		fputs("CP ", ctx->f);
+	else
+		fputs("FP ", ctx->f);
+
+#warning TODO: figure which is the gnd and which is the power plane
+#warning TODO: add checks for thermals: only gnd/pwr can have them, warn for others
+
+	pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %d %.0ml 1 %d\r\n",
+		x+dx, PCB->MaxHeight - (y+dy), w, h,
+		ashape, drill_dia, alayer);
+
+	fputs(name, ctx->f);
+	fputs("\r\n", ctx->f);
+	return 0;
+}
+
+int wrax_data(wctx_t *ctx, pcb_data_t *data, pcb_coord_t dx, pcb_coord_t dy);
+
+static int wrax_vias(wctx_t *ctx, pcb_data_t *Data, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	gdl_iterator_t it;
+	pcb_pstk_t *ps;
+	int res = 0;
+
+	padstacklist_foreach(&Data->padstack, &it, ps)
+		res |= wrax_padstack(ctx, ps, dx, dy, in_subc);
+
+	return res;
+}
+
+/* writes generic autotrax track descriptor line for components and layouts  */
+static int wrax_line(wctx_t *ctx, pcb_line_t *line, pcb_cardinal_t layer, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int user_routed = 1;
+	pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", line->Point1.X+dx, PCB->MaxHeight - (line->Point1.Y+dy), line->Point2.X+dx, PCB->MaxHeight - (line->Point2.Y+dy), line->Thickness, layer, user_routed);
+	return 0;
+}
+
+/* writes autotrax track descriptor for a pair of polyline vertices */
+static int wrax_pline_segment(wctx_t *ctx, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t Thickness, pcb_cardinal_t layer)
+{
+	int user_routed = 1;
+	pcb_fprintf(ctx->f, "FT\r\n%.0ml %.0ml %.0ml %.0ml %.0ml %d %d\r\n", x1, PCB->MaxHeight - y1, x2, PCB->MaxHeight - y2, Thickness, layer, user_routed);
+	return 0;
+}
+
+typedef struct {
+	wctx_t *wctx;
+	pcb_cardinal_t layer;
+	pcb_coord_t dx, dy;
+	pcb_coord_t thickness;
+} autotrax_hatch_ctx_t;
+
+
+static void autotrax_hatch_cb(void *ctx_, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	autotrax_hatch_ctx_t *hctx = (autotrax_hatch_ctx_t *) ctx_;
+	wrax_pline_segment(
+		hctx->wctx,
+		x1+hctx->dx, y1+hctx->dy, x2+hctx->dx, y2+hctx->dy,
+		hctx->thickness, hctx->layer);
+}
+
+/* generates autotrax tracks to cross hatch a complex polygon being exported */
+static void autotrax_cpoly_hatch_lines(wctx_t *ctx, const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, pcb_coord_t period, pcb_coord_t thickness, pcb_cardinal_t layer, pcb_coord_t dx, pcb_coord_t dy)
+{
+	autotrax_hatch_ctx_t hctx;
+
+	hctx.wctx = ctx;
+	hctx.layer = layer;
+	hctx.thickness = thickness;
+	hctx.dx = dx;
+	hctx.dy = dy;
+	pcb_cpoly_hatch(src, dir, (thickness / 2) + 1, period, &hctx, autotrax_hatch_cb);
+}
+
+/* generates an autotrax arc "segments" value to approximate an arc being exported   */
+static int pcb_rnd_arc_to_autotrax_segments(pcb_angle_t arc_start, pcb_angle_t arc_delta)
+{
+	int arc_segments = 0; /* start with no arc segments */
+	/* 15 = circle, bit 1 = LUQ, bit 2 = LLQ, bit 3 = LRQ, bit 4 = URQ */
+	if (arc_delta == -360) /* it's a circle */
+		arc_delta = 360;
+	if (arc_delta < 0) {
+		arc_delta = -arc_delta;
+		arc_start -= arc_delta;
+	}
+
+#warning TODO arc segments less than 90 degrees do not convert well.
+
+	while(arc_start < 0)
+		arc_start += 360;
+	while(arc_start > 360)
+		arc_start -= 360;
+
+	if (arc_delta >= 360) { /* it's a circle */
+		arc_segments |= 0x0F;
+	}
+	else {
+		if (arc_start <= 0.0 && (arc_start + arc_delta) >= 90.0)
+			arc_segments |= 0x04; /* LLQ */
+		if (arc_start <= 90.0 && (arc_start + arc_delta) >= 180.0)
+			arc_segments |= 0x08; /* LRQ */
+		if (arc_start <= 180.0 && (arc_start + arc_delta) >= 270.0)
+			arc_segments |= 0x01; /* URQ */
+		if (arc_start <= 270.0 && (arc_start + arc_delta) >= 360.0)
+			arc_segments |= 0x02; /* ULQ */
+		if (arc_start <= 360.0 && (arc_start + arc_delta) >= 450.0)
+			arc_segments |= 0x04; /* LLQ */
+		if (arc_start <= 360.0 && (arc_start + arc_delta) >= 540.0)
+			arc_segments |= 0x08; /* LRQ */
+		if (arc_start <= 360.0 && (arc_start + arc_delta) >= 630.0)
+			arc_segments |= 0x01; /* URQ */
+	}
+	return arc_segments;
+}
+
+/* writes generic autotrax arc descriptor line for components and layouts */
+static int wrax_arc(wctx_t *ctx, pcb_arc_t *arc, int current_layer, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_coord_t radius;
+	if (arc->Width > arc->Height) {
+		radius = arc->Height;
+	}
+	else {
+		radius = arc->Width;
+	}
+	pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", arc->X+dx, PCB->MaxHeight - (arc->Y+dy), radius, pcb_rnd_arc_to_autotrax_segments(arc->StartAngle, arc->Delta), arc->Thickness, current_layer);
+	return 0;
+}
+
+/* writes netlist data in autotrax format */
+static int wrax_equipotential_netlists(wctx_t *ctx)
+{
+	int show_status = 0;
+	/* show status can be 0 or 1 for a net:
+	   0 hide rats nest
+	   1 show rats nest */
+	/* now we step through any available netlists and generate descriptors */
+
+	if (PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN) {
+		int n, p;
+
+		for(n = 0; n < PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN; n++) {
+			pcb_lib_menu_t *menu = &PCB->NetlistLib[PCB_NETLIST_INPUT].Menu[n];
+			fprintf(ctx->f, "NETDEF\r\n");
+			pcb_fprintf(ctx->f, "%s\r\n", &menu->Name[2]);
+			pcb_fprintf(ctx->f, "%d\r\n", show_status);
+			fprintf(ctx->f, "(\r\n");
+			for(p = 0; p < menu->EntryN; p++) {
+				pcb_lib_entry_t *entry = &menu->Entry[p];
+				pcb_fprintf(ctx->f, "%s\r\n", entry->ListEntry);
+			}
+			fprintf(ctx->f, ")\r\n");
+		}
+	}
+	return 0;
+}
+
+
+static int wrax_lines(wctx_t *ctx, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	gdl_iterator_t it;
+	pcb_line_t *line;
+	pcb_cardinal_t current_layer = number;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		int local_flag = 0;
+		linelist_foreach(&layer->Line, &it, line) {
+			if (in_subc)
+				pcb_fprintf(ctx->f, "CT\r\n");
+			else
+				pcb_fprintf(ctx->f, "FT\r\n");
+			wrax_line(ctx, line, current_layer, dx, dy);
+			local_flag |= 1;
+		}
+		return local_flag;
+	}
+
+	return 0;
+}
+
+/* writes autotrax arcs for layouts */
+static int wrax_arcs(wctx_t *ctx, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	gdl_iterator_t it;
+	pcb_arc_t *arc;
+	pcb_cardinal_t current_layer = number;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer)) { /*|| (layer->name && *layer->name)) { */
+		int local_flag = 0;
+		arclist_foreach(&layer->Arc, &it, arc) {
+			if (in_subc)
+				pcb_fprintf(ctx->f, "CA\r\n");
+			else
+				pcb_fprintf(ctx->f, "FA\r\n");
+			wrax_arc(ctx, arc, current_layer, dx, dy);
+			local_flag |= 1;
+		}
+		return local_flag;
+	}
+
+	return 0;
+}
+
+/* writes generic autotrax text descriptor line layouts onl, since no text in .fp */
+static int wrax_text(wctx_t *ctx, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	pcb_font_t *myfont = pcb_font(PCB, 0, 1);
+	pcb_coord_t mHeight = myfont->MaxHeight; /* autotrax needs the width of the widest letter */
+	int autotrax_mirrored = 0; /* 0 is not mirrored, +16  is mirrored */
+
+	pcb_coord_t default_stroke_thickness, strokeThickness, textHeight;
+	int rotation;
+	int local_flag;
+
+	gdl_iterator_t it;
+	pcb_text_t *text;
+	pcb_cardinal_t current_layer = number;
+
+	int index = 0;
+
+#warning TODO: why do we hardwire this here?
+	default_stroke_thickness = 200000;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer)) { /*|| (layer->name && *layer->name)) { */
+		local_flag = 0;
+		textlist_foreach(&layer->Text, &it, text) {
+			if (current_layer < 9) { /* copper or silk layer text */
+				if (in_subc)
+					fputs("CS\r\n", ctx->f);
+				else
+					fputs("FS\r\n", ctx->f);
+				strokeThickness = PCB_SCALE_TEXT(default_stroke_thickness, text->Scale / 2);
+				textHeight = PCB_SCALE_TEXT(mHeight, text->Scale);
+				rotation = 0;
+				if (current_layer == 6 || current_layer == 8) /* back copper or silk */
+					autotrax_mirrored = 16; /* mirrored */
+				if (text->Direction == 3) /*vertical down */
+					rotation = 3;
+				else if (text->Direction == 2) /*upside down */
+					rotation = 2;
+				else if (text->Direction == 1) /*vertical up */
+					rotation = 1;
+				else if (text->Direction == 0) /*normal text */
+					rotation = 0;
+
+				pcb_fprintf(ctx->f, "%.0ml %.0ml %.0ml %d %.0ml %d\r\n", text->X+dx, PCB->MaxHeight - (text->Y+dy), textHeight, rotation + autotrax_mirrored, strokeThickness, current_layer);
+				for(index = 0; index < 32; index++) {
+					if (text->TextString[index] == '\0')
+						index = 32;
+					else if (text->TextString[index] < 32 || text->TextString[index] > 126)
+						fputc(' ', ctx->f); /* replace non alphanum with space */
+					else /* need to truncate to 32 alphanumeric chars */
+						fputc(text->TextString[index], ctx->f);
+				}
+				pcb_fprintf(ctx->f, "\r\n");
+			}
+			local_flag |= 1;
+		}
+		return local_flag;
+	}
+
+	return 0;
+}
+
+static const char *or_empty(const char *s)
+{
+	if (s == NULL) return "";
+	return s;
+}
+
+static int wrax_subc(wctx_t *ctx, pcb_subc_t *subc)
+{
+	int res, on_bottom = 0, silk_layer;
+	pcb_box_t *box = &subc->BoundingBox;
+	pcb_coord_t xPos, yPos, yPos2, yPos3;
+
+#warning TODO: do not hardcode things like this, especially when actual data is available
+	pcb_coord_t text_offset = PCB_MIL_TO_COORD(400); /* this gives good placement of refdes relative to element */
+
+#warning TODO: rename these variables to something more expressive
+#warning TODO: instead of hardwiring coords, just read existing dyntex coords
+	xPos = (box->X1 + box->X2) / 2;
+	yPos = PCB->MaxHeight - (box->Y1 - text_offset);
+	yPos2 = yPos - PCB_MIL_TO_COORD(200);
+	yPos3 = yPos2 - PCB_MIL_TO_COORD(200);
+
+	pcb_subc_get_side(subc, &on_bottom);
+
+#warning TODO: do not hardwire these layers, even if the autotrax format hardwires them - look them up from the static table, let the hardwiring happen only at one place
+	if (on_bottom)
+		silk_layer = 8;
+	else
+		silk_layer = 7;
+
+	fprintf(ctx->f, "COMP\r\n%s\r\n", or_empty(subc->refdes));
+	fprintf(ctx->f, "%s\r\n", or_empty(pcb_attribute_get(&subc->Attributes, "footprint")));
+	fprintf(ctx->f, "%s\r\n", or_empty(pcb_attribute_get(&subc->Attributes, "value")));
+	pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos, silk_layer); /* designator */
+	pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos2, silk_layer); /* pattern */
+	pcb_fprintf(ctx->f, "%.0ml %.0ml 100 0 10 %d\r\n", xPos, yPos3, silk_layer); /* comment field */
+
+	res = wrax_data(ctx, subc->data, 0, 0);
+
+	fprintf(ctx->f, "ENDCOMP\r\n");
+	return res;
+}
+
+static int wrax_subcs(wctx_t *ctx, pcb_data_t *data)
+{
+	gdl_iterator_t sit;
+	pcb_subc_t *subc;
+	int res = 0;
+
+	subclist_foreach(&data->subc, &sit, subc)
+		res |= wrax_subc(ctx, subc);
+
+	return res;
+}
+
+/* writes polygon data in autotrax fill (rectangle) format for use in a layout .PCB file */
+static int wrax_polygons(wctx_t *ctx, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t dx, pcb_coord_t dy, pcb_bool in_subc)
+{
+	int i;
+	gdl_iterator_t it;
+	pcb_poly_t *polygon;
+	pcb_cardinal_t current_layer = number;
+
+	pcb_poly_it_t poly_it;
+	pcb_polyarea_t *pa;
+
+	pcb_coord_t minx, miny, maxx, maxy;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer)) { /*|| (layer->name && *layer->name)) { */
+		int local_flag = 0;
+
+		polylist_foreach(&layer->Polygon, &it, polygon) {
+			if (pcb_cpoly_is_simple_rect(polygon)) {
+				pcb_trace(" simple rectangular polyogon\n");
+
+#warning TODO: why do we recalculate the bounding box here?
+				minx = maxx = polygon->Points[0].X;
+				miny = maxy = polygon->Points[0].Y;
+
+				/* now the fill zone outline is defined by a rectangle enclosing the poly */
+				/* hmm. or, could use a bounding box... */
+				for(i = 0; i < polygon->PointN; i++) {
+					if (minx > polygon->Points[i].X)
+						minx = polygon->Points[i].X;
+					if (maxx < polygon->Points[i].X)
+						maxx = polygon->Points[i].X;
+					if (miny > polygon->Points[i].Y)
+						miny = polygon->Points[i].Y;
+					if (maxy < polygon->Points[i].Y)
+						maxy = polygon->Points[i].Y;
+				}
+				pcb_fprintf(ctx->f, "%cF\r\n%.0ml %.0ml %.0ml %.0ml %d\r\n", (in_subc ? 'C' : 'F'), minx+dx, PCB->MaxHeight - (miny+dy), maxx+dx, PCB->MaxHeight - (maxy+dy), current_layer);
+
+				local_flag |= 1;
+/* here we need to test for non rectangular polygons to flag imperfect export to easy/autotrax
+
+			if (helper_clipped_polygon_type_function(clipped_thing)) {
+				pcb_message(PCB_MSG_ERROR, "Polygon exported as a bounding box only.\n");
+			}*/
+			}
+			else {
+				pcb_coord_t Thickness;
+				Thickness = PCB_MIL_TO_COORD(10);
+				autotrax_cpoly_hatch_lines(ctx, polygon, PCB_CPOLY_HATCH_HORIZONTAL | PCB_CPOLY_HATCH_VERTICAL, Thickness * 3, Thickness, current_layer, dx, dy);
+#warning TODO: do we really need to reimplement this, can not cpoly_hatch_lines handle it?
+				for(pa = pcb_poly_island_first(polygon, &poly_it); pa != NULL; pa = pcb_poly_island_next(&poly_it)) {
+					/* now generate cross hatch lines for polygon island export */
+					pcb_pline_t *pl, *track;
+					/* check if we have a contour for the given island */
+					pl = pcb_poly_contour(&poly_it);
+					if (pl != NULL) {
+						const pcb_vnode_t *v, *n;
+						track = pcb_pline_dup_offset(pl, -((Thickness / 2) + 1));
+						v = &track->head;
+						do {
+							n = v->next;
+							wrax_pline_segment(ctx, v->point[0]+dx, v->point[1]+dy, n->point[0]+dx, n->point[1]+dy, Thickness, current_layer);
+						} while((v = v->next) != &track->head);
+						pcb_poly_contour_del(&track);
+
+						/* iterate over all holes within this island */
+						for(pl = pcb_poly_hole_first(&poly_it); pl != NULL; pl = pcb_poly_hole_next(&poly_it)) {
+							const pcb_vnode_t *v, *n;
+							track = pcb_pline_dup_offset(pl, -((Thickness / 2) + 1));
+							v = &track->head;
+							do {
+								n = v->next;
+								wrax_pline_segment(ctx, v->point[0]+dx, v->point[1]+dy, n->point[0]+dx, n->point[1]+dy, Thickness, current_layer);
+							} while((v = v->next) != &track->head);
+							pcb_poly_contour_del(&track);
+						}
+					}
+				}
+			}
+		}
+		return local_flag;
+	}
+
+	return 0;
+}
+
+int wrax_data(wctx_t *ctx, pcb_data_t *data, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int n;
+	pcb_bool in_subc = (data->parent_type == PCB_PARENT_SUBC);
+
+	for(n = 0; n < data->LayerN; n++) {
+		pcb_layer_t *ly = &data->Layer[n];
+		int alid = wrax_layer2id(ctx, ly); /* autotrax layer ID */
+		if (alid == 0) {
+			char tmp[256];
+			pcb_snprintf(tmp, sizeof(tmp), "Ignoring unmapped layer: %s", ly->name);
+			pcb_io_incompat_save(data, NULL, tmp, NULL);
+			continue;
+		}
+		wrax_lines(ctx, alid, ly, dx, dy, in_subc);
+		wrax_arcs(ctx, alid, ly, dx, dy, in_subc);
+		wrax_text(ctx, alid, ly, dx, dy, in_subc);
+		wrax_polygons(ctx, alid, ly, dx, dy, in_subc);
+	}
+
+	wrax_subcs(ctx, data);
+	wrax_vias(ctx, data, dx, dy, in_subc);
+	return 0;
+}
+
+/* writes autotrax PCB to file */
+int io_autotrax_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	wctx_t wctx;
+
+	/* autotrax expects layout dimensions to be specified in mils */
+	int max_width_mil = 32000;
+	int max_height_mil = 32000;
+
+	memset(&wctx, 0, sizeof(wctx));
+	wctx.f = FP;
+	wctx.pcb = PCB;
+
+#warning TODO: this is a bug - exporting to a file shall not change the content we are exporting
+	if (pcb_board_normalize(PCB) < 0) {
+		pcb_message(PCB_MSG_ERROR, "Unable to normalise layout prior to attempting export.\n");
+		return -1;
+	}
+
+	if (wrax_map_layers(&wctx) != 0)
+		return -1;
+
+	fputs("PCB FILE 4\r\n", FP); /*autotrax header */
+
+	/* we sort out if the layout dimensions exceed the autotrax maxima */
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > max_width_mil || PCB_COORD_TO_MIL(PCB->MaxHeight) > max_height_mil) {
+		pcb_message(PCB_MSG_ERROR, "Layout size exceeds protel autotrax 32000 mil x 32000 mil maximum.");
+		return -1;
+	}
+
+	wrax_data(&wctx, PCB->Data, 0, 0);
+
+	/* last are the autotrax netlist descriptors */
+	wrax_equipotential_netlists(&wctx);
+
+	fputs("ENDPCB\r\n", FP); /*autotrax footer */
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_autotrax/write.h
===================================================================
--- tags/2.0.1/src_plugins/io_autotrax/write.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_autotrax/write.h	(revision 18980)
@@ -0,0 +1,35 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include "data.h"
+
+int io_autotrax_write_element(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data);
+int io_autotrax_write_buffer(pcb_plug_io_t *ctx, FILE *FP, pcb_buffer_t *buff);
+int io_autotrax_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
Index: tags/2.0.1/src_plugins/io_eagle/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_eagle
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_eagle/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,26 @@
+put /local/pcb/mod {io_eagle}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/io_eagle/io_eagle.o
+ $(PLUGDIR)/io_eagle/read.o
+ $(PLUGDIR)/io_eagle/read_dru.o
+ $(PLUGDIR)/io_eagle/egb_tree.o
+ $(PLUGDIR)/io_eagle/eagle_bin.o
+ $(PLUGDIR)/io_eagle/trparse_xml.o
+ $(PLUGDIR)/io_eagle/trparse_bin.o
+@]
+
+switch /local/pcb/io_eagle/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/sul/libxml2/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/sul/libxml2/ldflags
+	end
+end
+
+
+switch /local/pcb/io_eagle/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
Index: tags/2.0.1/src_plugins/io_eagle/dru-contents-summary.txt
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/dru-contents-summary.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/dru-contents-summary.txt	(revision 18980)
@@ -0,0 +1,67 @@
+layerSetup = (1*16)   -> defines a layer stackup composed of layer 1 and layer 16, and the '*' denotes a core between them, whereas '+' would denote "prepreg" , i.e.  a commercial 4 layer given by: layerSetup = (1+2*15+16), and a commercial 6 layer given by layerSetup = (1+2*3+14*15+16)"
+mtCopper = 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm  ->minimum thickness of each copper layer, quoted in order of layers
+mtIsolate = 1.6mm 1.2mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm  -> minimum thickness of dielectric between copper layers, quoted in order of layers
+mdWireWire = 6mil -> minimum distance between signal layer wires
+mdWirePad = 6mil -> minimum distance between signal layer wire and pad
+mdWireVia = 6mil  -> minimum distance between signal layer wire and via
+mdPadPad = 6mil  -> minimum distance between signal layer pads
+mdPadVia = 6mil  -> minimum distance between signal layer pads  and vias
+mdViaVia = 8mil  -> minimum distance between signal layer vias
+mdSmdPad = 0mil   -> minimum distance for same signal SMD-Pad, zero disables checks
+mdSmdVia = 0mil   -> minimum distance for same signal SMD-Via, zero disables checks
+mdSmdSmd = 0mil   -> minimum distance for same signal SMD-SMD, zero disables checks
+mdViaViaSameLayer = 8mil   ->minimum distance between vias in same layer 
+mnLayersViaInSmd = 2
+mdCopperDimension = 20mil    -> minimum distance between any copper object in signal layers and the board dimensions or holes , setting to zero disables check
+mdDrill = 10mil   -> minimum distance between drill holes, setting to zero disables check	
+mdSmdStop = 0mil   -> minimum distance between SMD slder mask apertures 
+msWidth = 6mil  -> minimum feature size
+msDrill = 12mil   -> minimum drill size
+msMicroVia = 12mil -> minimum micro via size, applies to blind vias one layer deep. If set to value greater than minimum drill, there are no micro vias
+msBlindViaRatio = 0.500000 -> aspect ratio required for drill diameter d given layer thickness t 
+rvPadTop = 0.250000  -> percent of drill diameter that gives the width of the annulus ring for a top layer pad
+rvPadInner = 0.250000  -> percent of drill diameter that gives the width of the annulus ring for an inner layer pad
+rvPadBottom = 0.250000  -> percent of drill diameter that gives the width of the annulus ring for a bottom layer pad
+rvViaOuter = 0.250000  -> percent of drill diameter that gives the width of the annulus ring for an outer layer via
+rvViaInner = 0.250000  -> percent of drill diameter that gives the width of the annulus ring for an inner layer via
+rvMicroViaOuter = 0.250000  -> percent of drill diameter that gives the width of the annulus ring an outer layer microvia
+rvMicroViaInner = 0.250000  -> percent of drill diameter that gives the width of the annulus ring an inner layer microvia
+rlMinPadTop = 6mil    -> gives minimum restring size for top layer pad
+rlMaxPadTop = 20mil  - > as above, but max
+rlMinPadInner = 6mil    -> gives minimum restring size for inner layer pad
+rlMaxPadInner = 20mil  - > as above, but max
+rlMinPadBottom = 6mil    -> gives minimum restring size for bottom layer
+rlMaxPadBottom = 20mil  - > as above, but max
+rlMinViaOuter = 6mil    -> gives minimum restring size for outer layer via
+rlMaxViaOuter = 20mil  - > as above, but max
+rlMinViaInner = 6mil    -> gives minimum restring size for inner layer via
+rlMaxViaInner = 20mil  - > as above, but max
+rlMinMicroViaOuter = 4mil    -> gives minimum restring size for outer  layer microvia
+rlMaxMicroViaOuter = 20mil  - > as above, but max
+rlMinMicroViaInner = 4mil    -> gives minimum restring size for inner layer microvia
+rlMaxMicroViaInner = 20mil  - > as above, but max
+psTop = -1  -> pad shape on the top, -1 == as defined by library, 1 == round, 0 == square
+psBottom = -1   -> pad shape on the top, as defined by library
+psFirst = 0    -> pad shape on the top, not special, i.e. square
+psElongationLong = 100  -> pad elongation, in percent
+psElongationOffset = 100  -> offset pad, percentage of diameter, "right side"
+mvStopFrame = 1.000000   -> percent of minimum size of smds, pad, vias, limited by min and max 
+mvCreamFrame = 0.000000   ->   percent of minimum size of smds or paste aperture, limited by min and max
+mlMinStopFrame = 0mil  -> solder mask aperture clearance from copper min 
+mlMaxStopFrame = 0mil  -> solder mask aperture clearance from copper max
+mlMinCreamFrame = 0mil     -> SMD paste aperture clearance from copper min 
+mlMaxCreamFrame = 0mil   -> SMD paste aperture clearance from copper max
+mlViaStopLimit = 100mil   -> via size above which aperture is made in solder mask for vias
+srRoundness = 0.000000   -> SMD corner roundness as percent
+srMinRoundness = 0mil   -> SMD minimum corner roundness
+srMaxRoundness = 0mil   -> SMD maximum corner roundness
+slThermalIsolate = 10mil  -> defines width of copper bridges between non copper annular zones around an SMD/pad
+slThermalsForVias = 0   -> if not zero, vias are connected to surrounding polygons with thermals, 
+dpMaxLengthDifference = 10mm  ->  max differenc in length for differential pairs
+dpGapFactor = 2.500000    ->  gap factor for meandering differential pairs
+checkGrid = 0     -> check all features are on grid
+checkAngle = 0   -> check if al angles multiple of 45 degrees
+checkFont = 1
+checkRestrict = 0
+useDiameter = 13
+maxErrors = 50
Index: tags/2.0.1/src_plugins/io_eagle/eagle_bin.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/eagle_bin.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/eagle_bin.c	(revision 18980)
@@ -0,0 +1,2252 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2017 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Eagle binary tree parser */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <stdarg.h>
+
+#include "eagle_bin.h"
+#include "egb_tree.h"
+#include "error.h"
+#include "math_helper.h"
+#include "misc_util.h"
+
+/* Describe a bitfield: width of the field that hosts the bitfield, first
+and last bit offsets, inclusive. Bit offsets are starting from 0 at LSB. */
+#define BITFIELD(field_width_bytes, first_bit, last_bit) \
+	(((unsigned long)(field_width_bytes)) << 16 | ((unsigned long)(first_bit)) << 8 | ((unsigned long)(last_bit)))
+
+typedef enum {
+	T_BMB, /* bit-mask-bool: apply the bitmask in 'len' to the the byte at offs and use the result as a boolean */
+	T_UBF, /* unsigned bitfield; offset is the first byte in block[], len is a BITFIELD() */
+	T_INT,
+	T_DBL,
+	T_STR
+} pcb_eagle_type_t;
+
+typedef enum {
+	SS_DIRECT,	    	/* it specifies the number of direct children */
+	SS_RECURSIVE,	 	/* it specifies the number of all children, recursively */
+	SS_RECURSIVE_MINUS_1	/* same as SS_RECURSIVE, but decrease the children count first */
+} pcb_eagle_ss_type_t;
+
+
+typedef struct {
+	int offs; /* 0 is the terminator (no more offsets) */
+	unsigned long len;
+	int val;
+} fmatch_t;
+
+typedef struct {
+	int offs; /* 0 is the terminator (no more offsets) */
+	int len;
+	pcb_eagle_ss_type_t ss_type;
+	char *tree_name; /* if not NULL, create a subtree using this name and no attributes */
+} subsect_t;
+
+typedef struct {
+	char *name; /* NULL is the terminator (no more attributes) */
+	pcb_eagle_type_t type;
+	int offs;
+	unsigned len;
+} attrs_t;
+
+typedef struct {
+	unsigned int cmd, cmd_mask;/* rule matches only if block[0] == cmd */
+	char *name;
+	fmatch_t fmatch[4];  /* rule matches only if all fmatch integer fields match their val */
+	subsect_t subs[8];/* how to extract number of subsections (direct children) */
+	attrs_t attrs[32];/* how to extract node attributes */
+} pcb_eagle_script_t;
+
+typedef struct
+{
+	egb_node_t *root, *layers, *drawing, *libraries, *elements, *firstel, *signals, *board, *drc;
+	long mdWireWire, wire2pad, wire2via, pad2pad, pad2via, via2via, pad2smd, via2smd,
+	smd2smd, copper2dimension, drill2hole, msWidth, minDrill, psTop, psBottom, psFirst;
+	/* DRC values for spacing and width */ 
+	double rvPadTop, rvPadInner, rvPadBottom; /* DRC values for via sizes */
+	double rvViaOuter, rvViaInner, rvMicroViaOuter, rvMicroViaInner;
+	/* the following design rule values don't map obviously to XML parameters */
+	long restring_limit1_mil, restring_limit2_mil, restring_limit3_mil,
+	restring_limit4_mil, restring_limit5_mil, restring_limit6_mil,
+	restring_limit7_mil, restring_limit8_mil, restring_limit9_mil,
+	restring_limit10_mil, restring_limit11_mil, restring_limit12_mil,
+	restring_limit13_mil, restring_limit14_mil, mask_limit1_mil,
+	mask_limit2_mil, mask_limit3_mil, mask_limit4_mil;
+	double mask_percentages1_ratio, mask_percentages2_ratio;
+	char *free_text;
+	char *free_text_cursor;
+	size_t free_text_len;
+} egb_ctx_t;
+
+#define TERM {0}
+
+static const pcb_eagle_script_t pcb_eagle_script[] = {
+	{ PCB_EGKW_SECT_START, 0xFF7F, "drawing",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+/*			{2, 2, SS_DIRECT, NULL},*/
+			{4, 4, SS_RECURSIVE_MINUS_1, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"subsecs", T_INT, 2, 2},
+			{"numsecs", T_INT, 4, 4},
+			{"subsecsMSB", T_INT, 3, 1},
+			{"subsecsLSB", T_INT, 2, 1},
+			{"numsecsMSB2", T_INT, 7, 1},
+			{"numsecsMSB1", T_INT, 6, 1},
+			{"numsecsMSB0", T_INT, 5, 1},
+			{"numsecsLSB", T_INT, 4, 1},
+			{"v1", T_INT, 8, 1},
+			{"v2", T_INT, 9, 1},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_UNKNOWN11, 0xFFFF, "unknown11" },
+	{ PCB_EGKW_SECT_GRID, 0xFFFF, "grid",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"display", T_BMB, 2, 0x01},
+			{"visible", T_BMB, 2, 0x02},
+			{"unit", T_UBF, 3, BITFIELD(1, 0, 3)},
+			{"altunit", T_UBF, 3, BITFIELD(1, 4, 7)},
+			{"multiple",T_INT, 4, 3},
+			{"size", T_DBL, 8, 8},
+			{"altsize", T_DBL, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_LAYER, 0xFF7F, "layer",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"side", T_BMB, 2, 0x10},
+			{"visible", T_UBF, 2, BITFIELD(1, 2, 3)},
+			{"active", T_BMB, 2, 0x02},
+			{"number",T_INT, 3, 1},
+			{"other",T_INT, 4, 1},
+			{"fill", T_UBF, 5, BITFIELD(1, 0, 3)},
+			{"color",T_UBF, 6, BITFIELD(1, 0, 5)},
+			{"name", T_STR, 15, 9},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SCHEMA, 0xFFFF, "schema",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{4, 4, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"shtsubsecs", T_INT, 8, 4},
+			{"atrsubsecs", T_INT, 12, 4}, /* 0 if v4 */
+			{"xref_format",  T_STR, 19, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_LIBRARY, 0xFF7F, "library",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{4, 4, SS_RECURSIVE, NULL},
+			{8, 4, SS_RECURSIVE, NULL},
+			{12, 4, SS_RECURSIVE, NULL},
+			/*{4, 4, SS_DIRECT, NULL},*/
+			TERM
+		},
+		{ /* attributes */
+			{"devsubsecs", T_INT, 4, 4},
+			{"symsubsecs", T_INT, 8, 4},
+			{"pacsubsecs", T_INT, 12, 4},
+			{"children", T_INT, 8, 4},
+			{"name",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_DEVICES, 0xFF7F, "devices",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{4, 4, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"children", T_INT, 8, 4},
+			{"library",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SYMBOLS, 0xFF7F, "symbols",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{4, 4, SS_RECURSIVE, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"children", T_INT, 8, 4},
+			{"library",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PACKAGES, 0xFF5F, "packages",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{4, 4, SS_RECURSIVE, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"subsects", T_INT, 4, 4},
+			{"children", T_INT, 8, 2},
+			{"desc",  T_STR, 10, 6},
+			{"library",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SCHEMASHEET, 0xFFFF, "schemasheet",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"partsubsecs",  T_INT, 12, 4},
+			{"bussubsecs",  T_INT, 16, 4},
+			{"netsubsecs",  T_INT, 20, 4},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_BOARD, 0xFF37, "board",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{12, 4, SS_RECURSIVE, "libraries"}, /* lib */
+			{2,  2, SS_DIRECT, "plain"}, /* globals */
+			{16, 4, SS_RECURSIVE, "elements"}, /* package refs */
+			{20, 4, SS_RECURSIVE, "signals"}, /* nets */
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"defsubsecs",  T_INT, 12, 4},
+			{"pacsubsecs",  T_INT, 16, 4},
+			{"netsubsecs",  T_INT, 20, 4},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SIGNAL, 0xFFB3, "signal",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"airwires",  T_BMB, 12, 0x02},
+			{"netclass",  T_UBF, 13, BITFIELD(1, 0, 3)},
+			{"name",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SYMBOL, 0xFFFF, "symbol",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"name",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PACKAGE, 0xFFDF, "package",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_RECURSIVE, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"desc",  T_STR, 13, 5},
+			{"name",  T_STR, 18, 6},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SCHEMANET, 0xFFFF, "schemanet",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"netclass",  T_UBF, 13, BITFIELD(1, 0, 3)},
+			{"name",  T_STR, 18, 6},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PATH, 0xFFFF, "path",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_POLYGON, 0xFFF7, "polygon",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"minx",  T_INT, 4, 2},
+			{"miny",  T_INT, 6, 2},
+			{"maxx",  T_INT, 8, 2},
+			{"maxy",  T_INT, 10, 2},
+			{"width",  T_INT, 12, 2},
+			{"spacing",  T_INT, 14, 2},
+			{"isolate",  T_INT, 16, 2},
+			{"layer",  T_INT, 18, 1},
+			{"pour",  T_BMB, 19, 0x01},
+			{"rank",  T_BMB, 19, BITFIELD(1, 1, 3)},
+			{"thermals",  T_BMB, 19, 0x80},
+			{"orphans",  T_BMB, 19, 0x40},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_LINE, 0xFF43, "wire",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer",  T_INT, 3, 1},
+			{"half_width",  T_INT, 20, 2},
+			{"stflags",  T_BMB, 22, 0x33},
+			/*{"bin_style",  T_BMB, 22, 0x03},*/
+			/*{"bin_cap",  T_BMB, 22, 0x10},*/
+			/*{"bin_clockwise_wire",  T_BMB, 22, 0x20},*/
+			{"linetype",  T_INT, 23, 1},
+			{"linetype_0_x1",  T_INT, 4, 4},
+			{"linetype_0_y1",  T_INT, 8, 4},
+			{"linetype_0_x2",  T_INT, 12, 4},
+			{"linetype_0_y2",  T_INT, 16, 4},
+			{"arc_negflags", T_BMB, 19, 0x1f},
+			/*{"c_negflag", T_BMB, 19, 0x01},*/
+			{"arc_c1",  T_INT, 7, 1},
+			{"arc_c2",  T_INT, 11, 1},
+			{"arc_c3",  T_INT, 15, 1},
+			{"arc_x1",  T_INT, 4, 3},
+			{"arc_y1",  T_INT, 8, 3},
+			{"arc_x2",  T_INT, 12, 3},
+			{"arc_y2",  T_INT, 16, 3},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_ARC, 0xFFFF, "arc",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer",  T_INT, 3, 1},
+			{"half_width",  T_INT, 20, 2},
+			{"clockwise",  T_BMB, 22, 0x20},
+			{"arctype",  T_INT, 23, 1},
+			{"arc_negflags", T_BMB, 19, 0x1f},
+			/*{"c_negflag", T_BMB, 19, 0x01},*/
+			{"arc_c1",  T_INT, 7, 1},
+			{"arc_c2",  T_INT, 11, 1},
+			{"arc_c3",  T_INT, 15, 1},
+			{"arc_x1",  T_INT, 4, 3},
+			{"arc_y1",  T_INT, 8, 3},
+			{"arc_x2",  T_INT, 12, 3},
+			{"arc_y2",  T_INT, 16, 3},
+			{"arctype_other_x1",  T_INT, 4, 4},
+			{"arctype_other_y1",  T_INT, 8, 4},
+			{"arctype_other_x2",  T_INT, 12, 4},
+			{"arctype_other_y2",  T_INT, 16, 4},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_CIRCLE, 0xFF53, "circle",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"radius",  T_INT, 12, 4},
+			{"half_width", T_INT, 20, 4},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_RECTANGLE, 0xFF5F, "rectangle",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x1",  T_INT, 4, 4},
+			{"y1",  T_INT, 8, 4},
+			{"x2",  T_INT, 12, 4},
+			{"y2",  T_INT, 16, 4},
+			{"bin_rot",  T_INT, 20, 2}, /* ? should it be T_UBF, 16, BITFIELD(2, 0, 11)},*/
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_JUNCTION, 0xFFFF, "junction",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"width_2",  T_INT, 12, 2},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_HOLE, 0xFF53, "hole",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"x", T_INT, 4, 4},
+			{"y", T_INT, 8, 4},
+			{"half_diameter", T_UBF, 12, BITFIELD(2, 0, 15)},
+			{"half_drill", T_UBF, 12, BITFIELD(2, 0, 15)}, /* try duplicating field */
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_VIA, 0xFF7F, "via",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"shape", T_INT, 2, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"half_drill", T_UBF, 12, BITFIELD(2, 0, 15)},
+			{"half_diameter", T_UBF, 14, BITFIELD(2, 0, 15)},
+			{"layers",  T_INT, 16, 1}, /*not 1:1 mapping */
+			{"stop",  T_BMB, 17, 0x01},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PAD, 0xFF5F, "pad",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"shape", T_INT, 2, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"half_drill",  T_UBF, 12, BITFIELD(2, 0, 15)},
+			{"half_diameter",  T_UBF, 14, BITFIELD(2, 0, 15)},
+			{"bin_rot" , T_INT, 16, 2}, /* ? maybe T_UBF, 16, BITFIELD(2, 0, 11)}, */
+			{"stop",  T_BMB, 18, 0x01},
+			{"thermals",  T_BMB, 18, 0x04},
+			{"first",  T_BMB, 18, 0x08},
+			{"name",  T_STR, 19, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMD, 0xFF7F, "smd",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"roundness", T_INT, 2, 1},
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"half_dx",  T_UBF, 12, BITFIELD(2, 0, 15)},
+			{"half_dy",  T_UBF, 14, BITFIELD(2, 0, 15)},
+			{"bin_rot",  T_UBF, 16, BITFIELD(2, 0, 11)},
+			{"stop",  T_BMB, 18, 0x01},
+			{"cream",  T_BMB, 18, 0x02},
+			{"thermals",  T_BMB, 18, 0x04},
+			{"first",  T_BMB, 18, 0x08},
+			{"name",  T_STR, 19, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PIN, 0xFF7F, "pin",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"function", T_UBF, 2, BITFIELD(1, 0, 1)},
+			{"visible", T_UBF, 2, BITFIELD(1, 6, 7)},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"direction",  T_UBF, 12, BITFIELD(1, 0, 3)},
+			{"length",  T_UBF, 12, BITFIELD(1, 4, 5)},
+			{"bin_rot",  T_UBF, 12, BITFIELD(1, 6, 7)},
+			{"direction",  T_UBF, 12, BITFIELD(1, 0, 3)},
+			{"swaplevel",  T_INT, 13, 1},
+			{"name",  T_STR, 14, 10},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_GATE, 0xFF7F, "gate",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"addlevel",  T_INT, 12, 1},
+			{"swap",  T_INT, 13, 1},
+			{"symno",  T_INT, 14, 2},
+			{"name",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_ELEMENT, 0xFF53, "element",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"library",  T_INT, 12, 2},
+			{"package",  T_INT, 14, 2},
+			{"bin_rot",  T_UBF, 16, BITFIELD(2, 0, 11)}, /* result is n*1024 */
+			{"mirrored", T_BMB, 17, 0x10},
+			{"spin", T_BMB, 17, 0x40},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_ELEMENT2, 0xFF5F, "element2",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"name",  T_STR, 2, 8},
+			{"value",  T_STR, 10, 14},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_INSTANCE, 0xFFFF, "instance",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"placed", T_INT, 12, 2}, /* == True for v4 */
+			{"gateno", T_INT, 14, 2},
+			{"bin_rot",  T_UBF, 16, BITFIELD(2, 10, 11)}, /* was 0, 11}, */
+			/* _get_uint16_mask(16, 0x0c00) */
+			{"mirrored",  T_UBF, 16, BITFIELD(2, 12, 12)},
+			/* _get_uint16_mask(16, 0x1000) */
+			{"smashed",  T_BMB, 18, 0x01},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_TEXT, 0xFF53, "text",  /* basic text block */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"half_size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_NETBUSLABEL, 0xFFFF, "netbuslabel",  /* text base section equiv. */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMASHEDNAME, 0xFF73, "name", /* text base section equiv. */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMASHEDVALUE, 0xFF73, "value",  /* text base section equiv. */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PACKAGEVARIANT, 0xFF7F, "packagevariant",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"package", T_INT, 4, 2},
+			{"table",  T_STR, 6, 13},
+			{"name",  T_STR, 19, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_DEVICE, 0xFF7F, "device",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_RECURSIVE, "gates"}, /* gates */
+			{4, 2, SS_RECURSIVE, "variants"}, /* variants */
+			/* ? {2, 2, SS_DIRECT, NULL},*/
+			TERM			
+		},
+		{ /* attributes */
+			{"gates", T_INT, 2, 2},
+			{"variants", T_INT, 4, 2},
+			{"prefix",  T_STR, 8, 5},
+			{"desc",  T_STR, 13, 5},
+			{"name",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_PART, 0xFFFF, "part",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			{2, 2, SS_DIRECT, NULL},
+			TERM
+		},
+		{ /* attributes */
+			{"lib",  T_INT, 4, 2},
+			{"device",  T_INT, 6, 2},
+			{"variant",  T_INT, 8, 1},
+			{"technology",  T_INT, 9, 2},
+			{"name",  T_STR, 11, 5},
+			{"value",  T_STR, 16, 8},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SCHEMABUS, 0xFFFF },
+	{ PCB_EGKW_SECT_VARIANTCONNECTIONS, 0xFF7F, "variantconnections",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			/* a sequence of 22 bytes or 11 H?, in format (x1,y1), (x2,y2), ... */
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SCHEMACONNECTION, 0xFFFF },
+	{ PCB_EGKW_SECT_CONTACTREF, 0xFFF57, "contactref",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"partnumber",  T_INT, 4, 2},
+			{"pin",  T_INT, 6, 2},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMASHEDPART, 0xFFFF, "smashedpart", /* same as text basesection */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMASHEDGATE, 0xFFFF, "smashedgate", /* same as text basesection */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_ATTRIBUTE, 0xFF7F, "attribute", /* same as text basesection */
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_ATTRIBUTEVALUE, 0xFFFF, "attribute-value",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"symbol",  T_STR, 2, 5},
+			{"attribute",  T_STR, 7, 17},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_FRAME, 0xFFFF, "frame",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			/*{"drawables-subsec", T_INT, 2, 2},*/
+			TERM
+		},
+		{ /* attributes */
+			{"layer",  T_INT, 3, 1},
+			{"x1",  T_INT, 4, 4},
+			{"y1",  T_INT, 8, 4},
+			{"x2",  T_INT, 12, 4},
+			{"y2",  T_INT, 16, 4},
+			{"cols",  T_INT, 20, 1},
+			{"rows",  T_INT, 21, 1},
+			{"borders",  T_INT, 22, 1},
+			TERM
+		},
+	},
+	{ PCB_EGKW_SECT_SMASHEDXREF, 0xFFFF, "smashedxref",
+		{ /* field match */
+			TERM
+		},
+		{ /* subsection sizes */
+			TERM
+		},
+		{ /* attributes */
+			{"layer", T_INT, 3, 1},
+			{"x",  T_INT, 4, 4},
+			{"y",  T_INT, 8, 4},
+			{"size",  T_INT, 12, 2},
+			{"ratio", T_UBF, 14, BITFIELD(2, 2, 6)},
+			/*self._get_uint8_mask(14, 0x7c) >> 2 },*/
+			{"bin_rot" , T_UBF, 16, BITFIELD(2, 0, 11)},
+			/*self._get_uint16_mask(16, 0x0fff)*/
+			{"mirrored" , T_UBF, 16, BITFIELD(2, 12, 12)},
+			/*bool(self._get_uint16_mask(16, 0x1000))*/
+			{"spin" , T_UBF, 16, BITFIELD(2, 14, 14)},
+			/*bool(self._get_uint16_mask(16, 0x4000))*/
+			{"textfield",  T_STR, 18, 5},
+			TERM
+		},
+	},
+
+	/* unknown leaves */
+	{ 0x5300, 0xFFFF },
+
+	/* end of table */
+	{ 0 }
+};
+
+static unsigned long load_ulong_se(unsigned char *src, int offs, unsigned long len, int sign_extend)
+{
+	int n;
+	unsigned long l = 0;
+
+	if ((sign_extend) && (src[offs+len-1] & 0x80))
+		l = -1;
+
+	for(n = 0; n < len; n++) {
+		l <<= 8;
+		l |= src[offs+len-n-1];
+	}
+	return l;
+}
+
+static unsigned long load_ulong(unsigned char *src, int offs, unsigned long len)
+{
+	return load_ulong_se(src, offs, len, 0);
+}
+
+static long load_long(unsigned char *src, int offs, unsigned long len)
+{
+	return (long)load_ulong_se(src, offs, len, 1);
+}
+
+static int load_bmb(unsigned char *src, int offs, unsigned long len)
+{
+	return !!(src[offs] & len);
+}
+
+static unsigned long load_ubf(unsigned char *src, int offs, unsigned long field)
+{
+	unsigned long val;
+	int len, first, last, mask;
+
+	len = (field >> 16) & 0xff;
+	first = (field >> 8) & 0xff;
+	last = field & 0xff;
+	mask = (1 << (first - last + 1)) - 1;
+
+	val = load_ulong(src, offs, len);
+	val >>= first;
+	return val & mask;
+}
+
+static char *load_str(unsigned char *src, char *dst, int offs, unsigned long len)
+{
+	memcpy(dst, src+offs, len);
+	dst[len] = '\0';
+	return dst;
+}
+
+static double load_double(unsigned char *src, int offs, unsigned long len)
+{
+	double d;
+	assert(len == sizeof(double));
+	memcpy(&d, src+offs, sizeof(double));
+	return d;
+}
+
+/* a function to convert binary format rotations into XML compatible RXXX format */
+int bin_rot2degrees(const char *rot, char *tmp, int mirrored)
+{
+	long deg;
+	char *end;
+	if (rot == NULL) {
+		return -1;
+	} else {
+		tmp[0] = 'M';
+		tmp[mirrored] = 'R';
+		tmp[mirrored + 1] = '0';
+		tmp[mirrored + 2] = '\0'; /* default "R0" for v3,4,5 where bin_rot == 0*/
+		deg = strtol(rot, &end, 10);
+		/*printf("Calculated deg == %ld pre bin_rot2degree conversion\n", deg);*/
+		if (*end != '\0') {
+#warning TODO: convert this to proper error reporting
+			printf("unexpected binary field 'rot' value suffix\n");
+			return -1;
+		}
+		if (deg >= 1024) {
+			deg = (360*deg)/4096; /* v4, v5 do n*1024 */
+			sprintf(&tmp[mirrored + 1], "%ld", deg);
+			/*printf("Did deg == %ld bin_rot2degree conversion\n", deg);*/
+			return 0;
+		} else if (deg > 0) { /* v3 */
+			deg = deg && 0x00f0; /* only need bottom 4 bits for v3, it seems*/
+			deg = deg*90;
+			/*printf("About to do deg < 1024 bin_rot2degree conversion\n");*/
+			sprintf(&tmp[mirrored + 1], "%ld", deg);
+			return 0;
+		} else {
+			/*printf("Default deg == 0 bin_rot2degree conversion\n");*/
+			return 0;
+		}
+	}
+	return -1; /* should not get here */
+}
+
+int read_notes(void *ctx, FILE *f, const char *fn, egb_ctx_t *egb_ctx)
+{
+	unsigned char block[8];
+	unsigned char free_text[400];
+	int text_remaining = 0;
+	egb_ctx->free_text_len = 0;
+	egb_ctx->free_text = NULL;
+	egb_ctx->free_text_cursor = NULL;
+
+	if (fread(block, 1, 8, f) != 8) {
+		pcb_message(PCB_MSG_ERROR, "Short attempted free text section read. Text section not found.\n");
+		return -1;
+	}
+
+	if (load_long(block, 0, 1) == 0x13 && load_long(block, 1, 1) == 0x12) {
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "Failed to find 0x1312 start of pre-DRC free text section.\n");
+		return -1;
+	}
+
+	text_remaining = egb_ctx->free_text_len = (int)load_long(block, 4, 2);
+	text_remaining += 4; /* there seems to be a 4 byte checksum or something at the end */
+
+#warning TODO instead of skipping the text, we need to load it completely with drc_ctx->free_text pointing to it
+	while (text_remaining > 400) {
+		if (fread(free_text, 1, 400, f) != 400) {
+			pcb_message(PCB_MSG_ERROR, "Short attempted free text block read. Truncated file?\n");
+			return -1;
+		}
+		text_remaining -= 400;
+	}
+	if (fread(free_text, 1, text_remaining, f) != text_remaining) {
+		pcb_message(PCB_MSG_ERROR, "Short attempted free text block read. Truncated file?\n");
+		return -1;
+	}
+	return 0;
+}
+
+int read_drc(void *ctx, FILE *f, const char *fn, egb_ctx_t *drc_ctx)
+{
+	unsigned char block[4];
+	int DRC_length_used = 244;
+	unsigned char DRC_block[244];
+	unsigned char c;
+	int DRC_preamble_end_found = 0;
+
+	/* these are sane, default values for DRC in case not present, i.e. in v3 no DRC section */
+	drc_ctx->mdWireWire = 12;
+	drc_ctx->msWidth = 10;
+	drc_ctx->rvPadTop = 0.25;
+	drc_ctx->rvPadInner = 0.25;
+	drc_ctx->rvPadBottom = 0.25;
+
+	if (fread(block, 1, 4, f) != 4) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("E: short attempted DRC preamble read; preamble not found. Truncated file?\n");
+		return -1;
+	}
+
+	/* look for DRC start sentinel */
+	if (!(load_long(block, 0, 1) == 0x10
+		&& load_long(block, 1, 1) == 0x04
+		&& load_long(block, 2, 1) == 0x00
+		&& load_long(block, 3, 1) == 0x20)) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("E: start of DRC preamble not found where it was expected.\n");
+		pcb_trace("E: drc byte 0 : %d\n", (int)load_long(block, 0, 1) );
+		pcb_trace("E: drc byte 1 : %d\n", (int)load_long(block, 1, 1) );
+		pcb_trace("E: drc byte 2 : %d\n", (int)load_long(block, 2, 1) );
+		pcb_trace("E: drc byte 3 : %d\n", (int)load_long(block, 3, 1) );
+		return -1;
+	}
+
+	while (!DRC_preamble_end_found) {
+		if (fread(&c, 1, 1, f) != 1) { /* the text preamble is not necessarily n * 4 bytes */
+#warning TODO: convert this to proper error reporting
+			pcb_trace("E: short attempted DRC preamble read. Truncated file?\n");
+			return -1;
+		} else {
+			if (c == '\0') { /* so we step through, looking for each 0x00 */
+				if (fread(block, 1, 4, f) != 4) { /* the text preamble seems to n * 24 bytes */
+#warning TODO: convert this to proper error reporting
+					pcb_trace("E: short attempted DRC preamble read. Truncated file?\n");
+					return -1;
+				}
+				if (load_long(block, 0, 1) == 0x78
+					&& load_long(block, 1, 1) == 0x56
+					&& load_long(block, 2, 1) == 0x34
+					&& load_long(block, 3, 1) == 0x12) {
+						DRC_preamble_end_found = 1;
+				}
+			}
+		}
+	}
+
+	if (fread(DRC_block, 1, DRC_length_used, f) != DRC_length_used) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("E: short DRC value block read. DRC section incomplete. Truncated file?\n");
+		return -1;
+	}
+
+	/* first ~134 bytes contain the most useful DRC stuff, such as
+	wire2wire wire2pad wire2via pad2pad pad2via via2via pad2smd via2smd smd2smd
+	also, restring order: padtop padinner padbottom viaouter viainner
+	(microviaouter microviainner) */
+
+	drc_ctx->mdWireWire = (long)(load_long(DRC_block, 0, 4)/2.54/100);
+	drc_ctx->wire2pad = (long)(load_long(DRC_block, 4, 4)/2.54/100);
+	drc_ctx->wire2via = (long)(load_long(DRC_block, 8, 4)/2.54/100);
+	drc_ctx->pad2pad = (long)(load_long(DRC_block, 12, 4)/2.54/100);
+	drc_ctx->pad2via = (long)(load_long(DRC_block, 16, 4)/2.54/100);
+	drc_ctx->via2via = (long)(load_long(DRC_block, 20, 4)/2.54/100);
+	drc_ctx->pad2smd = (long)(load_long(DRC_block, 24, 4)/2.54/100);
+	drc_ctx->via2smd = (long)(load_long(DRC_block, 28, 4)/2.54/100);
+	drc_ctx->smd2smd = (long)(load_long(DRC_block, 32, 4)/2.54/100);
+	drc_ctx->copper2dimension = (long)(load_long(DRC_block, 44, 4)/2.54/100);
+	drc_ctx->drill2hole = (long)(load_long(DRC_block, 52, 4)/2.54/100);
+
+	drc_ctx->msWidth = (long)(load_long(DRC_block, 64, 4)/2.54/100);
+	drc_ctx->minDrill = (long)(load_long(DRC_block, 68, 4)/2.54/100);
+
+	/*in version 5, this is wedged inbetween drill and pad ratios:
+	  min_micro_via, blind_via_ratio, int, float, 12 bytes*/
+
+	drc_ctx->rvPadTop = load_double(DRC_block, 84, 8);
+	drc_ctx->rvPadInner = load_double(DRC_block, 92, 8);
+	drc_ctx->rvPadBottom = load_double(DRC_block, 100, 8);
+
+	drc_ctx->rvViaOuter = load_double(DRC_block, 108, 8);
+	drc_ctx->rvViaInner = load_double(DRC_block, 116, 8);
+	drc_ctx->rvMicroViaOuter = load_double(DRC_block, 124, 8);
+	drc_ctx->rvMicroViaInner = load_double(DRC_block, 132, 8);
+
+	/* not entirely sure what these do as they don't map obviously to XML */
+	drc_ctx->restring_limit1_mil = (long)load_long(DRC_block, 140, 4)/2.54/100;
+	drc_ctx->restring_limit2_mil = (long)load_long(DRC_block, 144, 4)/2.54/100;
+	drc_ctx->restring_limit3_mil = (long)load_long(DRC_block, 148, 4)/2.54/100;
+	drc_ctx->restring_limit4_mil = (long)load_long(DRC_block, 152, 4)/2.54/100;
+	drc_ctx->restring_limit5_mil = (long)load_long(DRC_block, 156, 4)/2.54/100;
+	drc_ctx->restring_limit6_mil = (long)load_long(DRC_block, 160, 4)/2.54/100;
+	drc_ctx->restring_limit7_mil = (long)load_long(DRC_block, 164, 4)/2.54/100;
+	drc_ctx->restring_limit8_mil = (long)load_long(DRC_block, 168, 4)/2.54/100;
+	drc_ctx->restring_limit9_mil = (long)load_long(DRC_block, 172, 4)/2.54/100;
+	drc_ctx->restring_limit10_mil = (long)load_long(DRC_block, 176, 4)/2.54/100;
+	drc_ctx->restring_limit11_mil = (long)load_long(DRC_block, 180, 4)/2.54/100;
+	drc_ctx->restring_limit12_mil = (long)load_long(DRC_block, 184, 4)/2.54/100;
+	drc_ctx->restring_limit13_mil = (long)load_long(DRC_block, 188, 4)/2.54/100;
+	drc_ctx->restring_limit14_mil = (long)load_long(DRC_block, 192, 4)/2.54/100;
+
+	/* pad shapes */
+	drc_ctx->psTop = load_long(DRC_block, 196, 4);
+	drc_ctx->psBottom = load_long(DRC_block, 200, 4);
+	drc_ctx->psFirst = load_long(DRC_block, 204, 4);
+
+	/* not sure how these map to XML design rules parameters*/
+	drc_ctx->mask_percentages1_ratio = load_double(DRC_block, 208, 8);
+	drc_ctx->mask_percentages2_ratio = load_double(DRC_block, 216, 8);
+	drc_ctx->mask_limit1_mil = (long)load_long(DRC_block, 224, 4)/2.54/100;
+	drc_ctx->mask_limit2_mil = (long)load_long(DRC_block, 228, 4)/2.54/100;
+	drc_ctx->mask_limit3_mil = (long)load_long(DRC_block, 232, 4)/2.54/100;
+	drc_ctx->mask_limit4_mil = (long)load_long(DRC_block, 236, 4)/2.54/100;
+
+	/* populate the drc_ctx struct to return the result of the DRC block read attempt */
+
+	return 0;
+}
+
+
+int read_block(long *numblocks, int level, void *ctx, FILE *f, const char *fn, egb_node_t *parent)
+{
+	unsigned char block[24];
+	const pcb_eagle_script_t *sc;
+	const subsect_t *ss;
+	const attrs_t *at;
+	const fmatch_t *fm;
+	char ind[256];
+	int processed = 0;
+	egb_node_t *lpar;
+
+	memset(ind, ' ', level);
+	ind[level] = '\0';
+
+	/* load the current block */
+	if (fread(block, 1, 24, f) != 24) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("E: short read\n");
+		return -1;
+	}
+	processed++;
+
+	if (*numblocks < 0 && load_long(block, 0, 1) == 0x10) {
+		*numblocks = load_long(block, 4, 4);
+	}
+
+	for(sc = pcb_eagle_script; sc->cmd != 0; sc++) {
+		int match = 1;
+		unsigned int cmdh = (sc->cmd >> 8) & 0xFF, cmdl = sc->cmd & 0xFF;
+		unsigned int mskh = (sc->cmd_mask >> 8) & 0xFF, mskl = sc->cmd_mask & 0xFF;
+
+		assert((cmdh & mskh) == cmdh);
+		assert((cmdl & mskl) == cmdl);
+
+		if ((cmdh != (block[0] & mskh)) || (cmdl != (block[1] & mskl)))
+			continue;
+
+		for(fm = sc->fmatch; fm->offs != 0; fm++) {
+			if (load_long(block, fm->offs, fm->len) != fm->val) {
+				match = 0;
+				break;
+			}
+		}
+		if (match)
+			goto found;
+	}
+
+#warning TODO: convert this to proper error reporting
+	pcb_trace("E: unknown block ID 0x%02x%02x at offset %ld\n", block[0], block[1], ftell(f));
+	return -1;
+
+	found:;
+
+	if (sc->name != NULL)
+		parent = egb_node_append(parent, egb_node_alloc(sc->cmd, sc->name));
+	else
+		parent = egb_node_append(parent, egb_node_alloc(sc->cmd, "UNKNOWN"));
+
+	for(at = sc->attrs; at->name != NULL; at++) {
+		char buff[128];
+		*buff = '\0';
+		switch(at->type) {
+			case T_BMB:
+				sprintf(buff, "%d", load_bmb(block, at->offs, at->len));
+				break;
+			case T_UBF:
+				sprintf(buff, "%ld", load_ubf(block, at->offs, at->len));
+				break;
+			case T_INT:
+				sprintf(buff, "%ld", load_long(block, at->offs, at->len));
+				break;
+			case T_DBL:
+				sprintf(buff, "%f", load_double(block, at->offs, at->len));
+				break;
+			case T_STR:
+				load_str(block, buff, at->offs, at->len);
+				break;
+		}
+		egb_node_prop_set(parent, at->name, buff);
+	}
+
+	*numblocks = *numblocks - 1;
+
+	for(ss = sc->subs; ss->offs != 0; ss++) {
+		unsigned long int n, numch = load_ulong(block, ss->offs, ss->len);
+
+		if (ss->ss_type == SS_DIRECT) {
+			long lp = 0;
+			if (ss->tree_name != NULL)
+				lpar = egb_node_append(parent, egb_node_alloc(0, ss->tree_name));
+			else
+				lpar = parent;
+			for(n = 0; n < numch && *numblocks > 0; n++) {
+				int res = read_block(numblocks, level+1, ctx, f, fn, lpar);
+				if (res < 0)
+					return res;
+				processed += res;
+				lp += res;
+			}
+		}
+		else {
+			long rem, lp = 0;
+			if (ss->tree_name != NULL)
+				lpar = egb_node_append(parent, egb_node_alloc(0, ss->tree_name));
+			else
+				lpar = parent;
+			if (ss->ss_type == SS_RECURSIVE_MINUS_1)
+				numch--;
+			rem = numch;
+			for(n = 0; n < numch && rem > 0; n++) {
+				int res = read_block(&rem, level+1, ctx, f, fn, lpar);
+				if (res < 0)
+					return res;
+				*numblocks -= res;
+				processed += res;
+				lp += res;
+			}
+		}
+	}
+
+	return processed;
+}
+
+static egb_node_t *find_node(egb_node_t *first, int id)
+{
+	egb_node_t *n;
+
+	for(n = first; n != NULL; n = n->next)
+		if (n->id == id)
+			return n;
+
+	return NULL;
+}
+
+static egb_node_t *find_node_name(egb_node_t *first, const char *id_name)
+{
+	egb_node_t *n;
+
+	for(n = first; n != NULL; n = n->next)
+		if (strcmp(n->id_name, id_name) == 0)
+			return n;
+
+	return NULL;
+}
+
+static int arc_decode(void *ctx, egb_node_t *elem, int arctype, int linetype)
+{
+	htss_entry_t *e;
+
+	char itoa_buffer[64];
+	long c, cx, cy, x1, x2, y1, y2, x3, y3, radius;
+	double theta_1, theta_2, delta_theta;
+	double delta_x, delta_y;
+	int arc_flags = 0;
+	int clockwise = 1;
+	c = 0;
+
+	if (linetype == 0x81 || linetype == -127 || arctype == 0) {
+
+		for (e = htss_first(&elem->props); e; e = htss_next(&elem->props, e)) {
+			if (strcmp(e->key, "arc_x1") == 0) {
+				x1 = atoi(e->value);
+				egb_node_prop_set(elem, "x1", e->value);
+			} else if (strcmp(e->key, "arc_y1") == 0) {
+				y1 = atoi(e->value);
+				egb_node_prop_set(elem, "y1", e->value);
+			} else if (strcmp(e->key, "arc_x2") == 0) {
+				x2 = atoi(e->value);
+				egb_node_prop_set(elem, "x2", e->value);
+			} else if (strcmp(e->key, "arc_y2") == 0) {
+				y2 = atoi(e->value);
+				egb_node_prop_set(elem, "y2", e->value);
+			} else if (strcmp(e->key, "arc_c1") == 0) {
+				c += atoi(e->value);
+			} else if (strcmp(e->key, "arc_c2") == 0) {
+				c += 256*atoi(e->value);
+			} else if (strcmp(e->key, "arc_c3") == 0) {
+				c += 256*256*atoi(e->value);
+			} else if (strcmp(e->key, "arc_negflags") == 0) {
+				arc_flags = atoi(e->value);
+			} else if (strcmp(e->key, "clockwise") == 0) {
+				clockwise = atoi(e->value);
+			}
+			/* add width doubling routine here */
+		}
+		x3 = (x1+x2)/2;
+		y3 = (y1+y2)/2;
+
+		if (PCB_ABS(x2-x1) < PCB_ABS(y2-y1)) {
+			cx = c;
+			cy = (long)((x3-cx)*(x2-x1)/(double)((y2-y1)) + y3);
+		} else {
+			cy = c;
+			cx = (long)((y3-cy)*(y2-y1)/(double)((x2-x1)) + x3);
+		}
+		radius = (long)pcb_distance((double)cx, (double)cy, (double)x2, (double)y2);
+		sprintf(itoa_buffer, "%ld", radius);
+		egb_node_prop_set(elem, "radius", itoa_buffer);
+
+		sprintf(itoa_buffer, "%ld", cx);
+		egb_node_prop_set(elem, "x", itoa_buffer);
+		sprintf(itoa_buffer, "%ld", cy);
+		egb_node_prop_set(elem, "y", itoa_buffer);
+
+		if (cx == x2 && cy == y1 && x2 < x1 && y2 > y1) { /* RUQ */
+			egb_node_prop_set(elem, "StartAngle", "90");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (cx == x1 && cy == y2 && x2 < x1 && y1 > y2) { /* LUQ */
+			egb_node_prop_set(elem, "StartAngle", "0");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (cx == x2 && cy == y1 && x2 > x1 && y1 > y2) { /* LLQ */
+			egb_node_prop_set(elem, "StartAngle", "270");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (cx == x1 && cy == y2 && x2 > x1 && y2 > y1) { /* RLQ */
+			egb_node_prop_set(elem, "StartAngle", "180");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else {
+#warning TODO need negative flags checked for c, x1, x2, y1, y2 > ~=838mm
+			delta_x = (double)(x1 - cx);
+			delta_y = (double)(y1 - cy);
+			theta_1 = PCB_RAD_TO_DEG*atan2(-delta_y, delta_x);
+			theta_2 = PCB_RAD_TO_DEG*atan2(-(y2 - cy), (x2 - cx));
+
+			theta_1 = 180 - theta_1; /* eagle coord system */
+			theta_2 = 180 - theta_2; /* eagle coord system */
+
+			delta_theta = (theta_2 - theta_1);
+
+			if (!clockwise) {
+				delta_theta = -delta_theta; 
+			}
+
+			while (theta_1 > 360) {
+				theta_1 -= 360;
+			}
+			while (delta_theta < -180) { /* this seems to fix pathological cases */
+				delta_theta += 360;
+			}
+			while (delta_theta > 180) {
+				delta_theta -= 360;
+			}
+			sprintf(itoa_buffer, "%ld", (long)(theta_1));
+			egb_node_prop_set(elem, "StartAngle", itoa_buffer);
+
+			sprintf(itoa_buffer, "%ld", (long)(delta_theta));
+			egb_node_prop_set(elem, "Delta", itoa_buffer);
+		}
+#warning TODO still need to fine tune non-trivial non 90 degree arcs start and delta for 0x81, 0x00
+	} else if ((linetype > 0 && linetype != 0x81) || arctype > 0) {
+		int x1_ok, x2_ok, y1_ok, y2_ok, cxy_ok;
+		x1_ok = x2_ok = y1_ok = y2_ok = cxy_ok = 0;
+		for (e = htss_first(&elem->props); e; e = htss_next(&elem->props, e)) {
+			if (strcmp(e->key, "arctype_other_x1") == 0) {
+				x1 = atoi(e->value);
+				x1_ok = 1;
+			} else if (strcmp(e->key, "arctype_other_y1") == 0) {
+				y1 = atoi(e->value);
+				y1_ok = 1;
+			} else if (strcmp(e->key, "arctype_other_x2") == 0) {
+				x2 = atoi(e->value);
+				x2_ok = 1;
+			} else if (strcmp(e->key, "arctype_other_y2") == 0) {
+				y2 = atoi(e->value);
+				y2_ok = 1;
+			} else if (strcmp(e->key, "linetype_0_x1") == 0) {
+				x1 = atoi(e->value);
+				x1_ok = 1;
+			} else if (strcmp(e->key, "linetype_0_y1") == 0) {
+				y1 = atoi(e->value);
+				y1_ok = 1;
+			} else if (strcmp(e->key, "linetype_0_x2") == 0) {
+				x2 = atoi(e->value);
+				x2_ok = 1;
+			} else if (strcmp(e->key, "linetype_0_y2") == 0) {
+				y2 = atoi(e->value);
+				y2_ok = 1;
+			}
+			
+		}
+		if (linetype == 0x78 || arctype == 0x01) {
+			cx = MIN(x1, x2);
+			cy = MIN(y1, y2);
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "180");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (linetype == 0x79 || arctype == 0x02) {
+			cx = MAX(x1, x2);
+			cy = MIN(y1, y2);
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "270");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (linetype == 0x7a || arctype == 0x03) {
+			cx = MAX(x1, x2);
+			cy = MAX(y1, y2);
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "0");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (linetype == 0x7b || arctype == 0x04) {
+			cx = MIN(x1, x2);
+			cy = MAX(y1, y2);
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "90");
+			egb_node_prop_set(elem, "Delta", "90");
+		} else if (linetype == 0x7c || arctype == 0x05) { /* 124 */
+			cx = (x1 + x2)/2;
+			cy = (y1 + y2)/2;
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "90");
+			egb_node_prop_set(elem, "Delta", "180");
+		} else if (linetype == 0x7d || arctype == 0x06) { /* 125 */
+			cx = (x1 + x2)/2;
+			cy = (y1 + y2)/2;
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "270");
+			egb_node_prop_set(elem, "Delta", "180");
+		} else if (linetype == 0x7e || arctype == 0x07) {
+			cx = (x1 + x2)/2;
+			cy = (y1 + y2)/2;
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "180");
+			egb_node_prop_set(elem, "Delta", "180");
+		} else if (linetype == 0x7f || arctype == 0x08) {
+			cx = (x1 + x2)/2;
+			cy = (y1 + y2)/2;
+			cxy_ok = 1;
+			egb_node_prop_set(elem, "StartAngle", "0");
+			egb_node_prop_set(elem, "Delta", "180");
+		}
+
+		if (!cxy_ok) {
+			pcb_message(PCB_MSG_ERROR, "cx and cy not set in arc/linetype: %d/%d\n", linetype, arctype);
+			cx = cy = 0;
+		} else if (!(x1_ok && x2_ok && y1_ok && y2_ok)) {
+			pcb_message(PCB_MSG_ERROR, "x1/2 or y1/2 not set in binary arc\n");
+		}
+		radius = (long)(pcb_distance((double)cx, (double)cy, (double)x2, (double)y2));
+		sprintf(itoa_buffer, "%ld", radius);
+		egb_node_prop_set(elem, "radius", itoa_buffer);
+
+		sprintf(itoa_buffer, "%ld", cx);
+		egb_node_prop_set(elem, "x", itoa_buffer);
+		sprintf(itoa_buffer, "%ld", cy);
+		egb_node_prop_set(elem, "y", itoa_buffer);
+
+	}
+	return 0;
+}
+
+/* Return the idxth library from the libraries subtree, or NULL if not found */
+static egb_node_t *library_ref_by_idx(egb_node_t *libraries, long idx)
+{
+	egb_node_t *n;
+
+	/* count children of libraries */
+	for(n = libraries->first_child; (n != NULL) && (idx > 1); n = n->next, idx--) ;
+	if (n == NULL)
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_library_ref_by_idx() can't find library index %ld\n", idx);
+	return n;
+}
+
+/* Return the idxth package from the library subtree, or NULL if not found */
+static egb_node_t *package_ref_by_idx(egb_node_t *library, long idx)
+{
+	egb_node_t *n, *pkgs;
+
+	/* find library/0x1500->packages/0x1900 node */
+	for(pkgs = library->first_child; (pkgs != NULL) && ((pkgs->id & 0xFF00) != 0x1900); pkgs = pkgs->next);
+	if (pkgs == NULL)
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_pkg_ref_by_idx() can't find packages node in library tree\n", idx);
+	/* count children of library */
+	for(n = pkgs->first_child; (n != NULL) && (idx > 1); n = n->next, idx--);
+	if (n == NULL)
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_pkg_ref_by_idx() can't find package index %ld\n", idx);
+	return n;
+}
+
+/* Return the idxth element instance from the elements subtree, or NULL if not found */
+static egb_node_t *elem_ref_by_idx(egb_node_t *elements, long idx)
+{
+	egb_node_t *n;
+
+	/* count children of elelements */
+	for(n = elements->first_child; (n != NULL) && (idx > 1); n = n->next, idx--) ;
+	if (n == NULL)
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_elem_ref_by_idx() can't find element placement index %ld\n", idx);
+	return n;
+}
+
+/* allocate the pin name of the j-th pin of a given element in the elements subtree to contactref node cr; allocate default of pin_number if name text not found for pin */
+static int cr_pin_name_by_elem_idx(egb_node_t *cr, egb_ctx_t *egb_ctx, long elem_idx)
+{
+	int pin_idx = (int)(atoi(egb_node_prop_get(cr, "pin")));
+	int pin_num;
+	egb_node_t *p, *lib, *pkg;
+	egb_node_t *elements = egb_ctx->elements;
+	egb_node_t *libraries = egb_ctx->libraries;
+	egb_node_t *e = elem_ref_by_idx(elements, elem_idx);
+
+	pin_num = pin_idx;
+	if (e == NULL)
+		return 1;
+
+	lib = library_ref_by_idx(libraries, atoi(egb_node_prop_get(e, "library")));
+	if (lib == NULL)
+		return 1;
+
+	pkg = package_ref_by_idx(lib, atoi(egb_node_prop_get(e, "package")));
+	if (pkg == NULL)
+		return 1;
+
+	for (p = pkg->first_child; (p != NULL) && (pin_num > 1) ; p = p->next) {
+		if ((p->id & 0xFF00) == 0x2a00 || (p->id & 0xFF00) == 0x2b00 || (p->id & 0xFF00) == 0x2c00 ) { /* we found a pad _or_ pin _or_ SMD */
+			pin_num--;
+		}
+	}
+
+	if (p == NULL || pin_num > 1) {
+		egb_node_prop_set(cr, "pad", "PIN_NOT_FOUND");
+		return 0;
+	}
+	
+	if (egb_node_prop_get(p, "name")) {
+		egb_node_prop_set(cr, "pad", egb_node_prop_get(p, "name"));
+		return 0;
+	} else {
+		egb_node_prop_set(cr, "pad", egb_node_prop_get(cr, "pin"));
+		return 0;
+	}
+}
+
+
+/* Return the refdes of the idxth element instance from the elements subtree, or NULL if not found */
+static const char *elem_refdes_by_idx(egb_node_t *elements, long idx)
+{
+	egb_node_t *e = elem_ref_by_idx(elements, idx);
+	if (e == NULL)
+		return NULL;
+	return egb_node_prop_get(e, "name");
+}
+
+/* bin path walk; the ... is a 0 terminated list of pcb_eagle_binkw_t IDs */
+static egb_node_t *tree_id_path(egb_node_t *subtree, ...)
+{
+	egb_node_t *nd = subtree;
+	pcb_eagle_binkw_t target;
+	va_list ap;
+
+	va_start(ap, subtree);
+
+	/* get next path element */
+	while((target = va_arg(ap, pcb_eagle_binkw_t)) != 0) {
+		/* look for target on this level */
+		for(nd = nd->first_child;;nd = nd->next) {
+			if (nd == NULL) {/* target not found on this level */
+				va_end(ap);
+				return NULL;
+			}
+			if (nd->id == target) /* found, skip to next level */
+				break;
+		}
+	}
+
+	va_end(ap);
+	return nd;
+}
+
+
+static int postprocess_wires(void *ctx, egb_node_t *root)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	int line_type = -1;
+	long half_width = 0; 
+	char tmp[32];
+
+	if (root->id == PCB_EGKW_SECT_LINE) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e))
+			if (strcmp(e->key, "linetype") == 0 && strcmp(e->value, "0") == 0) {
+				line_type = 0;
+			} else if (strcmp(e->key, "linetype") == 0) {
+				line_type = atoi(e->value);
+			}
+	}
+
+	switch(line_type) {
+		case 0:
+				for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+					if (strcmp(e->key, "linetype_0_x1") == 0) {
+						egb_node_prop_set(root, "x1", e->value);
+					} else if (strcmp(e->key, "linetype_0_y1") == 0) {
+						egb_node_prop_set(root, "y1", e->value);
+					} else if (strcmp(e->key, "linetype_0_x2") == 0) {
+						egb_node_prop_set(root, "x2", e->value);
+					} else if (strcmp(e->key, "linetype_0_y2") == 0) {
+						egb_node_prop_set(root, "y2", e->value);
+					} else if (strcmp(e->key, "half_width") == 0) {
+						half_width = atoi(e->value);
+						sprintf(tmp, "%ld", half_width*2);
+						egb_node_prop_set(root, "width", tmp);
+					} /* <- added width doubling routine here */
+				}
+				break;
+		case 129:
+#warning TODO: convert this to proper error reporting
+				pcb_trace("Process linetype 129\n");
+				break;
+	}
+
+	if (line_type > 0 || line_type == -127)
+		arc_decode(ctx, root, -1, line_type);
+
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_wires(ctx, n);
+	return 0;
+}
+
+static int postprocess_arcs(void *ctx, egb_node_t *root)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	int arc_type = -1;
+	long half_width= 0;
+	char tmp[32];
+
+	if (root->id == PCB_EGKW_SECT_ARC) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e))
+			if (strcmp(e->key, "arctype") == 0 && strcmp(e->value, "0") == 0) {
+				arc_type = 0;
+			} else if (strcmp(e->key, "arctype") == 0) { /* found types 5, 3, 2 so far */
+				arc_type = atoi(e->value);
+			}
+	}
+
+	switch(arc_type) {
+		case 0:
+				for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+					if (strcmp(e->key, "arctype_0_x1") == 0) {
+						egb_node_prop_set(root, "x1", e->value);
+					} else if (strcmp(e->key, "arctype_0_y1") == 0) {
+						egb_node_prop_set(root, "y1", e->value);
+					} else if (strcmp(e->key, "arctype_0_x2") == 0) {
+						egb_node_prop_set(root, "x2", e->value);
+					} else if (strcmp(e->key, "arctype_0_y2") == 0) {
+						egb_node_prop_set(root, "y2", e->value);
+					} else if (strcmp(e->key, "half_width") == 0) {
+						half_width = atoi(e->value);
+						sprintf(tmp, "%ld", half_width*2);
+						egb_node_prop_set(root, "width", tmp);
+					} /* <- added width doubling routine here */
+				}
+				break;
+/*		case -1:	break;*/
+		default:
+				for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+					if (strcmp(e->key, "arctype_other_x1") == 0) {
+						egb_node_prop_set(root, "x1", e->value);
+					} else if (strcmp(e->key, "arctype_other_y1") == 0) {
+						egb_node_prop_set(root, "y1", e->value);
+					} else if (strcmp(e->key, "arctype_other_x2") == 0) {
+						egb_node_prop_set(root, "x2", e->value);
+					} else if (strcmp(e->key, "arctype_other_y2") == 0) {
+						egb_node_prop_set(root, "y2", e->value);
+					} else if (strcmp(e->key, "half_width") == 0) {
+						half_width = atoi(e->value);
+						sprintf(tmp, "%ld", half_width*2);
+						egb_node_prop_set(root, "width", tmp);
+					} /* <- added width doubling routine here */
+				}
+	}
+	if (arc_type >= 0)
+		arc_decode(ctx, root, arc_type, -1);
+
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_arcs(ctx, n);
+	return 0;
+}
+
+/* post process circles to double their width */ 
+static int postprocess_circles(void *ctx, egb_node_t *root)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	long half_width= 0;
+	char tmp[32];
+
+	if (root->id == PCB_EGKW_SECT_CIRCLE) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+			if (strcmp(e->key, "half_width") == 0) {
+				half_width = atoi(e->value);
+				sprintf(tmp, "%ld", half_width*2);
+				egb_node_prop_set(root, "width", tmp);
+				break;
+			} /* <- added width doubling routine here */
+		}
+	}
+
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_circles(ctx, n);
+	return 0;
+}
+
+/* post process rotation to make the rotation values xml format 'RXXX' compliant */
+static int postprocess_rotation(void *ctx, egb_node_t *root, int node_type)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	char tmp[32];
+	int mirrored = 0; /* default not mirrored */
+
+	if (root != NULL && root->id == node_type) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+			if (e->key != NULL &&  strcmp(e->key, "mirrored") == 0) {
+				if (e->value != NULL)
+					mirrored = (*e->value != '0');
+				break; 
+			}
+		}
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+			if (e->key != NULL &&  strcmp(e->key, "bin_rot") == 0) {
+				bin_rot2degrees(e->value, tmp, mirrored);
+				egb_node_prop_set(root, "rot", tmp);
+				break; /* NB if no break here, htss_next(&root->props, e) fails */
+			}
+		}
+	}
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_rotation(ctx, n, node_type);
+	return 0;
+}
+
+/* we post process the PCB_EGKW_SECT_SMD nodes to double the dx and dy dimensions pre XML parsing */
+static int postprocess_smd(void *ctx, egb_node_t *root)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	long half_dx = 0;
+	long half_dy = 0;
+	char tmp[32];
+
+	if (root != NULL && root->id == PCB_EGKW_SECT_SMD) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+			if (strcmp(e->key, "half_dx") == 0) {
+				half_dx = atoi(e->value);
+				sprintf(tmp, "%ld", half_dx*2);
+				egb_node_prop_set(root, "dx", tmp);
+			} else if (strcmp(e->key, "half_dy") == 0) {
+				half_dy = atoi(e->value);
+				sprintf(tmp, "%ld", half_dy*2);
+				egb_node_prop_set(root, "dy", tmp);
+			}
+		}
+	}
+
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_smd(ctx, n);
+	return 0;
+}
+
+/* we post process the
+PCB_EGKW_SECT_PAD and PCB_EGKW_SECT_HOLE and PCB_EGKW_SECT_VIA and PCB_EGKW_SECT_TEXT
+nodes to double the drill, diameter, text height dimensions pre XML parsing */
+static int postprocess_dimensions(void *ctx, egb_node_t *root)
+{
+	htss_entry_t *e;
+	egb_node_t *n;
+	long half_drill = 0;
+	long half_diameter = 0;
+	long half_size = 0;
+	char tmp[32];
+#warning TODO padstacks - need to convert obround pins to appropriate padstack types
+	if (root != NULL && (root->id == PCB_EGKW_SECT_PAD
+		|| root->id == PCB_EGKW_SECT_HOLE || root->id == PCB_EGKW_SECT_VIA
+		|| root->id == PCB_EGKW_SECT_TEXT)) {
+		for (e = htss_first(&root->props); e; e = htss_next(&root->props, e)) {
+			if (strcmp(e->key, "half_drill") == 0) {
+				half_drill = atoi(e->value);
+				sprintf(tmp, "%ld", half_drill*2);
+				egb_node_prop_set(root, "drill", tmp);
+			} else if (strcmp(e->key, "half_diameter") == 0) {
+				half_diameter = atoi(e->value);
+				sprintf(tmp, "%ld", half_diameter*2);
+				egb_node_prop_set(root, "diameter", tmp);
+			} else if (strcmp(e->key, "half_size") == 0) {
+				half_size = atoi(e->value);
+				sprintf(tmp, "%ld", half_size*2);
+				egb_node_prop_set(root, "size", tmp);
+			}
+		}
+	}
+
+	for(n = root->first_child; n != NULL; n = n->next)
+		postprocess_dimensions(ctx, n);
+	return 0;
+}
+
+/* look for contactrefs, and  1) append "name"="refdes" fields to contactref nodes as "element" "refdes" and 2) append "pad" = (pin_name(if present) or default pin_num) for netlist loading */
+static int postproc_contactrefs(void *ctx, egb_ctx_t *egb_ctx)
+{
+	htss_entry_t *e;
+	egb_node_t *cr, *n, *next, *next2;
+
+	if (egb_ctx->signals == NULL)
+		return 0; /* probably a library file */
+
+	for(n = egb_ctx->signals->first_child; n != NULL; n = next) {
+		next = n->next;
+		if (n->first_child != NULL && n->first_child->id == PCB_EGKW_SECT_CONTACTREF) {
+			for (cr = n->first_child; cr != NULL; cr = next2) {
+				next2 = cr->next;
+				for (e = htss_first(&cr->props); e; e = htss_next(&cr->props, e)) {
+					if (strcmp(e->key, "partnumber") == 0) {
+						int element_num = atoi(e->value);
+						egb_node_prop_set(cr, "element", elem_refdes_by_idx(egb_ctx->elements, (long) element_num));
+						cr_pin_name_by_elem_idx(cr, egb_ctx, (long) element_num);
+					}
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+
+/* look for elements, and subsequent element2 blocks, and copy name/value fields to element */
+static int postproc_elements(void *ctx, egb_ctx_t *egb_ctx)
+{
+	htss_entry_t *e;
+	egb_node_t *el2, *n, *q, *next, *next2;
+
+	if (egb_ctx->elements == NULL) 
+		return 0; /* probably a library file */
+
+	for(n = egb_ctx->firstel; n != NULL; n = next) {
+		next = n->next;
+		if (n->first_child && n->first_child->id == PCB_EGKW_SECT_ELEMENT2) {
+			el2 = n;
+			for(q = el2->first_child; q != NULL; q = next2) {
+				next2 = q->next;
+				for (e = htss_first(&q->props); e; e = htss_next(&q->props, e)) {
+					if (strcmp(e->key, "name") == 0) {
+						if (e->value != NULL && e->value[0] == '-' && e->value[1] == '\0') {
+							egb_node_prop_set(n, "name", "HYPHEN");
+							pcb_message(PCB_MSG_WARNING, "Substituted invalid name %s in PCB_EKGW_SECT_ELEMENT with 'HYPHEN'\n", e->value);
+						} else {
+							egb_node_prop_set(n, "name", e->value);
+						}
+					}
+					else if (strcmp(e->key, "value") == 0) {
+						egb_node_prop_set(n, "value", e->value);
+					}
+				}
+			}
+		}
+		/* we now add element x,y fields to refdes/value element2 node */
+		for (e = htss_first(&n->props); e; e = htss_next(&n->props, e)) {
+			if (strcmp(e->key, "x") == 0) {
+				egb_node_prop_set(el2, "x", e->value);
+			}
+			else if (strcmp(e->key, "y") == 0) {
+				egb_node_prop_set(el2, "y", e->value);
+			}
+		}
+		/* could potentially add default size, rot to text somewhere around here
+		   or look harder for other optional nodes defining these parameters here */
+	}
+	return 0;
+}
+
+#warning TODO netlist - this code flattens the signals so the XML parser finds everything, but connectivity info for nested nets is not preserved in the process #
+#warning TODO netlist labels - eagle bin often has invalid net labels, i.e.'-', '+' so may need to filter#
+/* take any sub level signal /signals/signal1/signal2 and move it up a level to /signals/signal2 */
+static int postproc_signal(void *ctx, egb_ctx_t *egb_ctx)
+{
+	egb_node_t *n, *p, *prev2, *next, *next2;
+
+	egb_node_t *signal;
+
+	if (egb_ctx->signals == NULL)
+		return  0; /* probably a library */
+
+	signal = egb_ctx->signals->first_child;
+
+	for(n = signal; n != NULL; n = next) {
+		next = n->next;
+		if (n->id == PCB_EGKW_SECT_SIGNAL) {
+			for(p = n->first_child, prev2 = NULL; p != NULL; p = next2) {
+				next2 = p->next;
+				if (p->id == PCB_EGKW_SECT_SIGNAL) {
+					egb_node_unlink(n, prev2, p);
+					egb_node_append(egb_ctx->signals, p);
+				}
+				else
+					prev2 = p;
+			}
+		}
+	}
+	return 0;
+}
+
+/* populate the newly created drc node in the binary tree before XML parsing, if board present */
+static int postproc_drc(void *ctx, egb_ctx_t *egb_ctx)
+{
+	char tmp[32];
+	egb_node_t *current;
+
+	if (egb_ctx->drc == NULL)
+		return 0; /* probably a library with no board node */
+
+	current = egb_node_append(egb_ctx->drc, egb_node_alloc(PCB_EGKW_SECT_DRC, "param"));
+	sprintf(tmp, "%ldmil", egb_ctx->mdWireWire);
+	egb_node_prop_set(current, "name", "mdWireWire");
+	egb_node_prop_set(current, "value", tmp);
+
+	current = egb_node_append(egb_ctx->drc, egb_node_alloc(PCB_EGKW_SECT_DRC, "param"));
+	sprintf(tmp, "%ldmil", egb_ctx->msWidth);
+	egb_node_prop_set(current, "name", "msWidth");
+	egb_node_prop_set(current, "value", tmp);
+
+	current = egb_node_append(egb_ctx->drc, egb_node_alloc(PCB_EGKW_SECT_DRC, "param"));
+	sprintf(tmp, "%f", egb_ctx->rvPadTop);
+	egb_node_prop_set(current, "name", "rvPadTop");
+	egb_node_prop_set(current, "value", tmp);
+
+	current = egb_node_append(egb_ctx->drc, egb_node_alloc(PCB_EGKW_SECT_DRC, "param"));
+	sprintf(tmp, "%f", egb_ctx->rvPadInner);
+	egb_node_prop_set(current, "name", "rvPadInner");
+	egb_node_prop_set(current, "value", tmp);
+
+	current = egb_node_append(egb_ctx->drc, egb_node_alloc(PCB_EGKW_SECT_DRC, "param"));
+	sprintf(tmp, "%f", egb_ctx->rvPadBottom);
+	egb_node_prop_set(current, "name", "rvPadBottom");
+	egb_node_prop_set(current, "value", tmp);
+
+	return 0;
+}
+
+/* take each /drawing/layer and move them into a newly created /drawing/layers/ */
+static int postproc_layers(void *ctx, egb_ctx_t *egb_ctx)
+{
+	egb_node_t *n, *prev, *next;
+
+	for(n = egb_ctx->drawing->first_child, prev = NULL; n != NULL; n = next) {
+		next = n->next; /* need to save this because unlink() will ruin it */
+		if (n->id == PCB_EGKW_SECT_LAYER) {
+			egb_node_unlink(egb_ctx->drawing, prev, n);
+			egb_node_append(egb_ctx->layers, n);
+		}
+		else
+			prev = n;
+	}
+
+	return 0;
+}
+
+/* insert a library node above each packages node to match the xml */
+static int postproc_libs(void *ctx, egb_ctx_t *egb_ctx)
+{
+	egb_node_t *n, *lib;
+
+	if (egb_ctx->libraries == NULL) /* a library .lbr has a sole library in it, unlike a board */
+		return 0;
+
+	for(n = egb_ctx->libraries->first_child; n != NULL; n = egb_ctx->libraries->first_child) {
+		if (n->id == PCB_EGKW_SECT_LIBRARY)
+			break;
+
+		if (n->id != PCB_EGKW_SECT_PACKAGES) {
+			pcb_message(PCB_MSG_ERROR, "postproc_libs(): unexpected node under libraries (must be packages)\n");
+			return -1;
+		}
+
+		egb_node_unlink(egb_ctx->libraries, NULL, n);
+		lib = egb_node_append(egb_ctx->libraries, egb_node_alloc(PCB_EGKW_SECT_LIBRARY, "library"));
+		egb_node_append(lib, n);
+	}
+
+	return 0;
+}
+
+static int postproc(void *ctx, egb_node_t *root, egb_ctx_t *drc_ctx)
+{
+
+	egb_node_t *n, *signal;
+	egb_ctx_t eagle_bin_ctx;
+	egb_ctx_t *egb_ctx_p;
+	egb_ctx_p = &eagle_bin_ctx;
+
+	/* this preliminary code does not assume a board node is present, i.e. could be library .lbr */
+	eagle_bin_ctx.root = root;
+	eagle_bin_ctx.drawing = root->first_child;
+	eagle_bin_ctx.layers = egb_node_append(root, egb_node_alloc(PCB_EGKW_SECT_LAYERS, "layers"));
+	eagle_bin_ctx.drc = NULL;      /* this will be looked for if board node present */
+	eagle_bin_ctx.signals = NULL;  /* this will be looked for if board node present */
+	eagle_bin_ctx.elements = NULL; /* this will be looked for if board node present */
+	eagle_bin_ctx.libraries = NULL;/* this will be looked for if board node present */
+
+	/* populate context with default DRC settings, since DRC is not present in binary v3 */
+	eagle_bin_ctx.mdWireWire = drc_ctx->mdWireWire;
+	eagle_bin_ctx.msWidth = drc_ctx->msWidth;
+	eagle_bin_ctx.rvPadTop = drc_ctx->rvPadTop;
+	eagle_bin_ctx.rvPadInner = drc_ctx->rvPadInner;
+	eagle_bin_ctx.rvPadBottom = drc_ctx->rvPadBottom;
+
+	eagle_bin_ctx.board = find_node(eagle_bin_ctx.drawing->first_child, PCB_EGKW_SECT_BOARD);
+	if (eagle_bin_ctx.board == NULL) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("No board node found, this may be a library file.\n");
+	} else {
+		/* the following code relies on the board node being present, i.e. a layout */
+		/* create a drc node, since DRC block if present in binary file comes after the tree */
+		eagle_bin_ctx.drc = egb_node_append(eagle_bin_ctx.board, egb_node_alloc(PCB_EGKW_SECT_DRC, "designrules"));
+		eagle_bin_ctx.libraries = find_node_name(eagle_bin_ctx.board->first_child, "libraries");
+		if (eagle_bin_ctx.libraries == NULL) { /* layouts have a libraries node it seems */
+#warning TODO: convert this to proper error reporting
+			pcb_trace("Eagle binary layout is missing a board/libraries node.\n");
+			return -1;
+		}
+
+		for(n = eagle_bin_ctx.board->first_child, signal = NULL; signal == NULL && n != NULL; n = n->next) {
+			if (n->first_child && n->first_child->id == PCB_EGKW_SECT_SIGNAL) {
+				signal = n->first_child;
+				eagle_bin_ctx.signals = signal->parent;
+			}
+		}
+
+		for(n = eagle_bin_ctx.board->first_child, eagle_bin_ctx.firstel = NULL;
+				eagle_bin_ctx.firstel == NULL && n != NULL; n = n->next) {
+			if (n->first_child && n->first_child->id == PCB_EGKW_SECT_ELEMENT) {
+				eagle_bin_ctx.firstel = n->first_child;
+				eagle_bin_ctx.elements = eagle_bin_ctx.firstel->parent;
+			}
+		}
+	}
+
+	/* after post processing layers, we populate the DRC node first, if present... */
+
+	return postproc_layers(ctx, egb_ctx_p) || postproc_drc(ctx, egb_ctx_p)
+		|| postproc_libs(ctx, egb_ctx_p) || postproc_elements(ctx, egb_ctx_p)
+		|| postproc_signal(ctx, egb_ctx_p) || postproc_contactrefs(ctx, egb_ctx_p)
+		|| postprocess_wires(ctx, root) || postprocess_arcs(ctx, root)
+		|| postprocess_circles(ctx, root) || postprocess_smd(ctx, root)
+		|| postprocess_dimensions(ctx, root)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMD)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_PIN)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_RECTANGLE)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_PAD)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_TEXT)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMASHEDVALUE)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMASHEDNAME)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_NETBUSLABEL)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMASHEDXREF)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_ATTRIBUTE)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMASHEDGATE)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_SMASHEDPART)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_INSTANCE)
+		|| postprocess_rotation(ctx, root, PCB_EGKW_SECT_ELEMENT);
+}
+
+int pcb_egle_bin_load(void *ctx, FILE *f, const char *fn, egb_node_t **root)
+{
+	long test = -1;
+	long *numblocks = &test;
+	int res = 0;
+
+	egb_ctx_t eagle_bin_ctx;
+
+/*	pcb_trace("blocks remaining prior to function call = %ld\n", *numblocks);*/
+
+	*root = egb_node_alloc(0, "eagle");
+
+	res = read_block(numblocks, 1, ctx, f, fn, *root);
+	if (res < 0) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("Problem with remaining blocks... is this a library file?\n");
+		return res;
+	}
+/*	pcb_trace("blocks remaining after outer function call = %ld (after reading %d blocks)\n\n", *numblocks, res);*/
+
+	/* could test if < v4 as v3.xx seems to have no DRC or Netclass or Free Text end blocks */
+	read_notes(ctx, f, fn, &eagle_bin_ctx);
+	/* read_drc will determine sane defaults if no DRC block found */
+	if (read_drc(ctx, f, fn, &eagle_bin_ctx) != 0) {
+#warning TODO: convert this to proper error reporting
+		pcb_trace("No DRC section found, either a v3 binary file or a binary library file.\n");
+	} /* we now use the eagle_bin_ctx results for post_proc */
+
+	return postproc(ctx, *root, &eagle_bin_ctx);
+}
+
Index: tags/2.0.1/src_plugins/io_eagle/eagle_bin.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/eagle_bin.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/eagle_bin.h	(revision 18980)
@@ -0,0 +1,91 @@
+/*				COPYRIGHT
+ *
+ *	pcb-rnd, interactive printed circuit board design
+ *	Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *	Copyright (C) 2017 Erich S. Heinzle
+ *
+ *	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 2 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, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Eagle binary tree parser */
+
+#include <stdio.h>
+#include "egb_tree.h"
+
+typedef enum pcb_eagle_binkw_s {
+	PCB_EGKW_SECT_START = 0x1000, /*0x1080*/
+	PCB_EGKW_SECT_UNKNOWN11 = 0x1100,
+	PCB_EGKW_SECT_GRID = 0x1200,
+	PCB_EGKW_SECT_LAYER = 0x1300, /*0x1380 */
+	PCB_EGKW_SECT_SCHEMA = 0x1400,
+	PCB_EGKW_SECT_LIBRARY = 0x1500, /*0x1580 */
+	PCB_EGKW_SECT_DEVICES = 0x1700, /*0x1780 */
+	PCB_EGKW_SECT_SYMBOLS = 0x1800, /*0x1880 */
+	PCB_EGKW_SECT_PACKAGES = 0x1900, /*0x1980, 0x19a0 */
+	PCB_EGKW_SECT_SCHEMASHEET = 0x1a00,
+	PCB_EGKW_SECT_BOARD = 0x1b00, /*0x1b40, 0x1b80, 0x1b08 */
+	PCB_EGKW_SECT_SIGNAL = 0x1c00, /*0x1c04, 0x1c40,0x1c48,0x1c08 */
+	PCB_EGKW_SECT_SYMBOL = 0x1d00,
+	PCB_EGKW_SECT_PACKAGE = 0x1e00, /*0x1e20*/
+	PCB_EGKW_SECT_SCHEMANET = 0x1f00,
+	PCB_EGKW_SECT_PATH = 0x2000,
+	PCB_EGKW_SECT_POLYGON = 0x2100, /*0x2108 */
+	PCB_EGKW_SECT_LINE = 0x2200, /*0x2280,0x228c,0x2288,0x2290,0x229c,0x22a0,0x22a8 */
+	PCB_EGKW_SECT_ARC = 0x2400,
+	PCB_EGKW_SECT_CIRCLE = 0x2500, /*0x2580, 0x25a0, 0x258c */
+	PCB_EGKW_SECT_RECTANGLE = 0x2600,/*0x2680,0x26a0 */
+	PCB_EGKW_SECT_JUNCTION = 0x2700,
+	PCB_EGKW_SECT_HOLE = 0x2800, /*0x2880,0x28a0,0x288c */
+	PCB_EGKW_SECT_VIA = 0x2900, /*0x2980 */
+	PCB_EGKW_SECT_PAD = 0x2a00, /*0x2a80,0x2aa0 */
+	PCB_EGKW_SECT_SMD = 0x2b00, /*0x2b80 */
+	PCB_EGKW_SECT_PIN = 0x2c00, /*0x2c80 */
+	PCB_EGKW_SECT_GATE = 0x2d00, /*0x2d80 */
+	PCB_EGKW_SECT_ELEMENT = 0x2e00,/*0x2e20,0x2e80,0x2e0c,0x2e28 */
+	PCB_EGKW_SECT_ELEMENT2 = 0x2f00,/*0x2f80,0x2fa0 */
+	PCB_EGKW_SECT_INSTANCE = 0x3000,
+	PCB_EGKW_SECT_TEXT = 0x3100,/*0x3180,0x31a0,0x318c */
+	PCB_EGKW_SECT_NETBUSLABEL = 0x3300,
+	PCB_EGKW_SECT_SMASHEDNAME = 0x3400, /*0x3480,0x348c,0x3488 */
+	PCB_EGKW_SECT_SMASHEDVALUE = 0x3500,/*0x3580,0x3588,0x358c */
+	PCB_EGKW_SECT_PACKAGEVARIANT = 0x3600, /*0x3680 */
+	PCB_EGKW_SECT_DEVICE = 0x3700, /*0x3780 */
+	PCB_EGKW_SECT_PART = 0x3800,
+	PCB_EGKW_SECT_SCHEMABUS = 0x3a00,
+	PCB_EGKW_SECT_VARIANTCONNECTIONS = 0x3c00, /*0x3c80 */
+	PCB_EGKW_SECT_SCHEMACONNECTION = 0x3d00,
+	PCB_EGKW_SECT_CONTACTREF = 0x3e00, /*0x3e80,0x3ea8,0x3ea0,0x3e20 */	
+	PCB_EGKW_SECT_SMASHEDPART = 0x3f00,
+	PCB_EGKW_SECT_SMASHEDGATE = 0x4000,
+	PCB_EGKW_SECT_ATTRIBUTE = 0x4100, /*0x4180 */
+	PCB_EGKW_SECT_ATTRIBUTEVALUE = 0x4200,
+	PCB_EGKW_SECT_FRAME = 0x4300,
+	PCB_EGKW_SECT_SMASHEDXREF = 0x4400,
+	PCB_EGKW_SECT_FREETEXT = 0x1312,
+
+	/* virtual nodes added in postprocessing */
+	PCB_EGKW_SECT_LAYERS = 0x11300,
+	PCB_EGKW_SECT_DRC = 0x11100
+} pcb_eagle_binkw_t;
+
+int pcb_egle_bin_load(void *ctx, FILE *f, const char *fn, egb_node_t **root);
+
+
Index: tags/2.0.1/src_plugins/io_eagle/egb_tree.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/egb_tree.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/egb_tree.c	(revision 18980)
@@ -0,0 +1,142 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Eagle binary tree store */
+
+#include "config.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <genht/hash.h>
+#include "egb_tree.h"
+#include "compat_misc.h"
+
+egb_node_t *egb_node_alloc(int id, const char *id_name)
+{
+	egb_node_t *nd = calloc(sizeof(egb_node_t), 1);
+	nd->id = id;
+	nd->id_name = id_name;
+	return nd;
+}
+
+egb_node_t *egb_node_append(egb_node_t *parent, egb_node_t *node)
+{
+	node->parent = parent;
+	node->next = NULL;
+
+	if (parent->last_child == NULL) {
+		parent->last_child = node;
+		parent->first_child = node;
+	}
+	else {
+		parent->last_child->next = node;
+		parent->last_child = node;
+	}
+	return node;
+}
+
+
+void egb_node_prop_set(egb_node_t *node, const char *key, const char *val)
+{
+	if (node->props.table == NULL)
+		htss_init(&node->props, strhash, strkeyeq);
+	htss_set(&node->props, pcb_strdup(key), pcb_strdup(val));
+}
+
+char *egb_node_prop_get(egb_node_t *node, const char *key)
+{
+	if (node->props.table == NULL)
+		return NULL;
+	return htss_get(&node->props, key);
+}
+
+void egb_node_free(egb_node_t *node)
+{
+	egb_node_t *n;
+
+	for(n = node->first_child; n != NULL; n = n->next)
+		egb_node_free(n);
+
+	if (node->props.table != NULL) {
+		htss_entry_t *e;
+		for (e = htss_first(&node->props); e; e = htss_next(&node->props, e)) {
+			free(e->key);
+			free(e->value);
+		}
+		htss_uninit(&node->props);
+	}
+	free(node);
+}
+
+egb_node_t *egb_node_unlink(egb_node_t *parent, egb_node_t *prev, egb_node_t *node)
+{
+	if (parent->first_child == node) {
+		assert(prev == NULL);
+		parent->first_child = node->next;
+	}
+	else {
+		assert(prev != NULL);
+		assert(prev->next == node);
+	}
+
+	if (parent->last_child == node)
+		parent->last_child = prev;
+
+	if (prev != NULL)
+		prev->next = node->next;
+
+	node->parent = NULL;
+	node->next = NULL;
+	return node;
+}
+
+
+static char inds[] = "                                                               ";
+static void egb_dump_(FILE *f, int ind, egb_node_t *node)
+{
+	htss_entry_t *e;
+	int i;
+	egb_node_t *n;
+
+	if (ind >= sizeof(inds)-1)
+		ind = sizeof(inds)-1;
+	inds[ind] = '\0';
+	fprintf(f, "%s%s/%04x [", inds, node->id_name, node->id);
+	inds[ind] = ' ';
+
+	for (e = htss_first(&node->props), i = 0; e; e = htss_next(&node->props, e), i++)
+		fprintf(f, "%s%s=\"%s\"", (i > 0 ? " " : ""), e->key, e->value);
+	fprintf(f, "]\n");
+
+	for(n = node->first_child; n != NULL; n = n->next)
+		egb_dump_(f, ind+1, n);
+}
+
+void egb_dump(FILE *f, egb_node_t *node)
+{
+	egb_dump_(f, 0, node);
+}
+
Index: tags/2.0.1/src_plugins/io_eagle/egb_tree.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/egb_tree.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/egb_tree.h	(revision 18980)
@@ -0,0 +1,71 @@
+/*
+ *														COPYRIGHT
+ *
+ *	pcb-rnd, interactive printed circuit board design
+ *	Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *	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 2 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, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Eagle binary tree store */
+
+#ifndef PCB_EGB_TREE_H
+#define PCB_EGB_TREE_H
+#include <stdio.h>
+#include <genht/htss.h>
+
+typedef struct egb_node_s egb_node_t;
+
+struct egb_node_s {
+	int id;
+	const char *id_name;
+	htss_t props;
+	egb_node_t *parent;
+	egb_node_t *next;
+	egb_node_t *first_child, *last_child;
+	void *user_data;
+};
+
+
+/* Allocate a new floating node */
+egb_node_t *egb_node_alloc(int id, const char *id_name);
+
+/* Link a floating node into the tree, appending it as the last
+   child of parent. Returns the node. */
+egb_node_t *egb_node_append(egb_node_t *parent, egb_node_t *node);
+
+/* Unlink a node from its parent, making the node a floating node.
+   Returns the node */
+egb_node_t *egb_node_unlink(egb_node_t *parent, egb_node_t *prev, egb_node_t *node);
+
+/* Free a subtree (without unlinking) */
+void egb_node_free(egb_node_t *node);
+
+/* Set a named property of a node to val */
+void egb_node_prop_set(egb_node_t *node, const char *key, const char *val);
+
+/* Return the value of a named property of a node */
+char *egb_node_prop_get(egb_node_t *node, const char *key);
+
+/* Print the indented tree in text to f */
+void egb_dump(FILE *f, egb_node_t *node);
+
+#endif
Index: tags/2.0.1/src_plugins/io_eagle/format_tree.txt
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/format_tree.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/format_tree.txt	(revision 18980)
@@ -0,0 +1,77 @@
+XML:
+
+eagle
+ drawing
+  settings
+  grid
+  layers
+   layer [name, color, fill, visible, active, number]
+  board
+   plain
+   libraries
+    library
+     description
+     packages
+      package [name]
+       description
+       wire [x1, y1, x2, y2, width, layer]
+       hole [name, x, y, drill, diameter, shape]
+       pad  [name, x, y, drill, diameter, shape]x
+       circle [x, y, radius, width, layer]
+       smd [x, y, dx, dy, rot, layer]     (smd pad)
+       text [x, y, size, rot, layer]
+       rectangle [x1, y1, x2, y2, layer]
+   attributes
+   variantdefs
+   classes
+   description
+   designrules
+   autorouter
+   elements
+    element [name, library, package, value, x, y, rot]
+   signals
+    signal [name]
+     contactref [element, pad]
+     wire [x1, y1, x2, y2, width, layer]
+     polygon [layer]
+      vertex [x, y]
+     via [name, x, y, drill, diameter, shape]
+ compatibility
+  @text
+
+
+bin:
+
+0x1000/start (->drawing?)
+ 0x1100/settings?
+ 0x1200/grid
+ 0x1300/layer !!!
+ 0x1b00/board
+  <plain (globals)>
+   0x2200/line
+   0x2600/rectangle
+  <libraries>
+   0x1900/packages (->library?)
+    0x1e00/package
+     0x2100/polygon
+      0x2200/line (->vertex?)
+     0x2600/rectangle
+     0x2200/line (->wire?)
+     0x2d00/smd
+     0x2a00/pad
+     0x2500/circle
+     0x3100/text?
+     0x2800/hole
+  <elements>
+   0x2e00/boardpackage?
+    0x2f00/boarkpackage2???
+    0x3400/smashedname?? -> description?
+    0x3500/smashedvalue?? -> description?
+  <signals>
+   0x1c00/boardnet -> signal
+    0x3e00/boardconnection -> contactref
+    0x2100/polygon
+     0x2200/line (->vertex?)
+    0x2200/line
+    0x2900/via
+
Index: tags/2.0.1/src_plugins/io_eagle/io_eagle.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/io_eagle.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/io_eagle.c	(revision 18980)
@@ -0,0 +1,129 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  This module, io_eagle, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "hid.h"
+#include "plug_io.h"
+#include "read.h"
+#include "read_dru.h"
+#include "actions.h"
+
+static pcb_plug_io_t io_eagle_xml, io_eagle_bin, io_eagle_dru;
+static const char *eagle_cookie = "eagle plugin";
+
+int io_eagle_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "eagle") != 0) ||
+		((typ & (~(PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER | PCB_IOT_PCB))) != 0))
+		return 0;
+
+	return 100;
+}
+
+int pplg_check_ver_io_eagle(int ver_needed) { return 0; }
+
+void pplg_uninit_io_eagle(void)
+{
+	/* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */
+	pcb_remove_actions_by_cookie(eagle_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_xml);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_bin);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_dru);
+}
+
+#include "dolists.h"
+
+int pplg_init_io_eagle(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_eagle_xml.plugin_data = NULL;
+	io_eagle_xml.fmt_support_prio = io_eagle_fmt;
+	io_eagle_xml.test_parse = io_eagle_test_parse_xml;
+	io_eagle_xml.parse_pcb = io_eagle_read_pcb_xml;
+/*	io_eagle_xml.parse_footprint = NULL;
+	io_eagle_xml.parse_font = NULL;
+	io_eagle_xml.write_buffer = io_eagle_write_buffer;
+	io_eagle_xml.write_footprint = io_eagle_write_element;
+	io_eagle_xml.write_pcb = io_eagle_write_pcb;*/
+	io_eagle_xml.default_fmt = "eagle";
+	io_eagle_xml.description = "eagle xml";
+	io_eagle_xml.save_preference_prio = 40;
+	io_eagle_xml.default_extension = ".eagle_pcb";
+	io_eagle_xml.fp_extension = ".eagle_mod";
+	io_eagle_xml.mime_type = "application/x-eagle-pcb";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_xml);
+
+	/* register the IO hook */
+	io_eagle_bin.plugin_data = NULL;
+	io_eagle_bin.fmt_support_prio = io_eagle_fmt;
+	io_eagle_bin.test_parse = io_eagle_test_parse_bin;
+	io_eagle_bin.parse_pcb = io_eagle_read_pcb_bin;
+/*	io_eagle_bin.parse_footprint = NULL;
+	io_eagle_bin.parse_font = NULL;
+	io_eagle_bin.write_buffer = io_eagle_write_buffer;
+	io_eagle_bin.write_footprint = io_eagle_write_element;
+	io_eagle_bin.write_pcb = io_eagle_write_pcb;*/
+	io_eagle_bin.default_fmt = "eagle";
+	io_eagle_bin.description = "eagle bin";
+	io_eagle_bin.save_preference_prio = 30;
+	io_eagle_bin.default_extension = ".brd";
+	io_eagle_bin.fp_extension = ".???";
+	io_eagle_bin.mime_type = "application/x-eagle-pcb";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_bin);
+
+	/* register the IO hook */
+	io_eagle_dru.plugin_data = NULL;
+	io_eagle_dru.fmt_support_prio = io_eagle_fmt;
+	io_eagle_dru.test_parse = io_eagle_test_parse_dru;
+	io_eagle_dru.parse_pcb = io_eagle_read_pcb_dru;
+	io_eagle_dru.parse_footprint = NULL;
+	io_eagle_dru.parse_font = NULL;
+	io_eagle_dru.write_buffer = NULL;
+	io_eagle_dru.write_footprint = NULL;
+	io_eagle_dru.write_pcb = /*io_eagle_write_pcb_dru*/ NULL;
+	io_eagle_dru.default_fmt = "eagle";
+	io_eagle_dru.description = "eagle dru";
+	io_eagle_dru.save_preference_prio = 0;
+	io_eagle_dru.default_extension = ".dru";
+	io_eagle_dru.fp_extension = ".dru";
+	io_eagle_dru.mime_type = "application/x-eagle-dru";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_eagle_dru);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_eagle/io_eagle.pup
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/io_eagle.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/io_eagle.pup	(revision 18980)
@@ -0,0 +1,14 @@
+$class io
+$short Eagle's xml and binary formats
+$long Load the design from eagle's xml and binary formats.
+$state works
+$fmt-native no
+$fmt-feature-r eagle xml board version 6, 7 and 8
+$fmt-feature-r eagle xml library
+$fmt-feature-r eagle binary board version 3, 4 and 5
+$fmt-feature-r eagle binary library
+$fmt-feature-r eagle DRU (design rules)
+$package io-alien
+default buildin
+dep boardflip
+autoload 1
Index: tags/2.0.1/src_plugins/io_eagle/read.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/read.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/read.c	(revision 18980)
@@ -0,0 +1,1613 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2017 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <math.h>
+
+#include "board.h"
+#include "read.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "error.h"
+#include "polygon.h"
+#include "rtree.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "trparse.h"
+#include "trparse_xml.h"
+#include "trparse_bin.h"
+#include "obj_subc.h"
+
+#include "../src_plugins/boardflip/boardflip.h"
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+#include "../src_plugins/lib_compat_help/subc_help.h"
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+
+/* coordinates that corresponds to pcb-rnd 100% text size in height */
+#define EAGLE_TEXT_SIZE_100 PCB_MIL_TO_COORD(50)
+
+#define PARENT(node)   st->parser.calls->parent(&st->parser, node)
+#define CHILDREN(node) st->parser.calls->children(&st->parser, node)
+#define NEXT(node)     st->parser.calls->next(&st->parser, node)
+#define NODENAME(node) st->parser.calls->nodename(node)
+
+#define GET_PROP(node, key) st->parser.calls->prop(&st->parser, node, key)
+#define GET_PROP_(st, node, key) (st)->parser.calls->prop(&((st)->parser), node, key)
+#define GET_TEXT(node)      st->parser.calls->text(&st->parser, node)
+
+#define STRCMP(s1, s2) st->parser.calls->str_cmp(s1,s2)
+#define IS_TEXT(node)  st->parser.calls->is_text(&st->parser, node)
+
+typedef struct eagle_layer_s {
+	const char *name;
+	int color;
+	int fill;
+	int visible;
+	int active;
+
+	pcb_layer_id_t lid;
+} eagle_layer_t;
+
+typedef struct eagle_library_s {
+	const char *desc;
+	htsp_t elems; /* -> pcb_elemement_t */
+} eagle_library_t;
+
+
+typedef struct read_state_s {
+	trparse_t parser;
+	pcb_board_t *pcb;
+
+	htip_t layers;
+	htsp_t libs;
+
+	/* design rules */
+	pcb_coord_t md_wire_wire; /* minimal distance between wire and wire (clearance) */
+	pcb_coord_t ms_width; /* minimal trace width */
+	double rv_pad_top, rv_pad_inner, rv_pad_bottom; /* pad size-to-drill ration on different layers */
+
+	const char *default_unit; /* assumed unit for unitless coord values */
+	unsigned elem_by_name:1; /* whether elements are addressed by name (or by index in the lib) */
+} read_state_t;
+
+typedef struct {
+	const char *node_name;
+	int (*parser)(read_state_t *st, trnode_t *subtree, void *obj, int type);
+} dispatch_t;
+
+typedef enum {
+	IN_SUBC = 1,
+	ON_BOARD
+} eagle_loc_t;
+
+/* Xml path walk that's much simpler than xpath; the ... is a NULL
+   terminated list of node names */
+static trnode_t *eagle_trpath(read_state_t *st, trnode_t *subtree, ...)
+{
+	trnode_t *nd = subtree;
+	const char *target;
+	va_list ap;
+
+	va_start(ap, subtree);
+
+	/* get next path element */
+	while((target = va_arg(ap, const char *)) != NULL) {
+		/* look for target on this level */
+		for(nd = CHILDREN(nd);;nd = NEXT(nd)) {
+			if (nd == NULL) {/* target not found on this level */
+				va_end(ap);
+				return NULL;
+			}
+			if (STRCMP(NODENAME(nd), target) == 0) /* found, skip to next level */
+				break;
+		}
+	}
+
+	va_end(ap);
+	return nd;
+}
+
+/* Search the dispatcher table for subtree->str, execute the parser on match
+   with the children ("parameters") of the subtree */
+static int eagle_dispatch(read_state_t *st, trnode_t *subtree, const dispatch_t *disp_table, void *obj, int type)
+{
+	const dispatch_t *d;
+	const char *name;
+
+	/* do not tolerate empty/NIL node */
+	if (NODENAME(subtree) == NULL)
+		return -1;
+
+	if (IS_TEXT(subtree))
+		name = "@text";
+	else
+		name = NODENAME(subtree);
+
+	for(d = disp_table; d->node_name != NULL; d++)
+		if (STRCMP(d->node_name, name) == 0)
+			return d->parser(st, subtree, obj, type);
+
+	pcb_message(PCB_MSG_ERROR, "eagle: unknown node: '%s'\n", name);
+	/* node name not found in the dispatcher table */
+	return -1;
+}
+
+/* Take each children of tree and execute them using eagle_dispatch
+   Useful for procssing nodes that may host various subtrees of different
+   nodes ina  flexible way. Return non-zero if any subtree processor failed. */
+static int eagle_foreach_dispatch(read_state_t *st, trnode_t *tree, const dispatch_t *disp_table, void *obj, int type)
+{
+	trnode_t *n;
+
+	for(n = tree; n != NULL; n = NEXT(n))
+		if (eagle_dispatch(st, n, disp_table, obj, type) != 0)
+			return -1;
+
+	return 0; /* success */
+}
+
+/* No-op: ignore the subtree */
+static int eagle_read_nop(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	return 0;
+}
+
+
+
+int io_eagle_test_parse_xml(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[1024];
+	int found = 0, lineno = 0;
+
+	/* look for <!DOCTYPE.*eagle.dtd in the first 32 lines, not assuming it is in a single line */
+	while(fgets(line, sizeof(line), f) != NULL) {
+		if ((found == 0) && (strstr(line, "<!DOCTYPE")))
+			found = 1;
+		if ((found == 1) && (strstr(line, "eagle.dtd")))
+			return 1;
+		lineno++;
+		if (lineno > 32)
+			break;
+	}
+	return 0;
+}
+
+int io_eagle_test_parse_bin(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	unsigned char buff[2];
+	int read_length = fread(buff, 1, 2, f);
+	if ((read_length == 2) && (buff[0] == 0x10) && (buff[1] == 0x00)) {
+		return 1; /* Eagle v4, v5 */
+	} else if ((read_length == 2) && (buff[0] == 0x10) && (buff[1] == 0x80)) {
+		return 1; /* Eagle v3 */
+	}
+	return 0;
+}
+
+/* Return a node attribute value converted to long, or return invalid_val
+   for synatx error or if the attribute doesn't exist */
+static long eagle_get_attrl(read_state_t *st, trnode_t *nd, const char *name, long invalid_val)
+{
+	const char *p = GET_PROP(nd, name);
+	char *end;
+	long res;
+
+	if (p == NULL)
+		return invalid_val;
+	res = strtol(p, &end, 10);
+	if (*end != '\0')
+		return invalid_val;
+	return res;
+}
+
+/* Return a node attribute value converted to double, or return invalid_val
+   for synatx error or if the attribute doesn't exist */
+static double eagle_get_attrd(read_state_t *st, trnode_t *nd, const char *name, double invalid_val)
+{
+	const char *p = GET_PROP(nd, name);
+	char *end;
+	double res;
+
+	if (p == NULL)
+		return invalid_val;
+	res = strtod(p, &end);
+	if (*end != '\0')
+		return invalid_val;
+	return res;
+}
+
+/* Return a node attribute value converted to char *, or return invalid_val
+   if the attribute doesn't exist */
+static const char *eagle_get_attrs(read_state_t *st, trnode_t *nd, const char *name, const char *invalid_val)
+{
+	const char *p = GET_PROP(nd, name);
+	if (p == NULL)
+		return invalid_val;
+	return p;
+}
+
+/* Return a node attribute value converted to coord, or return invalid_val
+   if the attribute doesn't exist */
+static pcb_coord_t eagle_get_attrc(read_state_t *st, trnode_t *nd, const char *name, pcb_coord_t invalid_val)
+{
+	const char *p = GET_PROP(nd, name);
+	pcb_coord_t c;
+	pcb_bool succ;
+
+	if (p == NULL)
+		return invalid_val;
+
+	c = pcb_get_value(p, st->default_unit, NULL, &succ);
+	if (!succ)
+		return invalid_val;
+	return c;
+}
+
+/* same as eagle_get_attrc() but assume the input has units */
+static pcb_coord_t eagle_get_attrcu(read_state_t *st, trnode_t *nd, const char *name, pcb_coord_t invalid_val)
+{
+	const char *p = GET_PROP(nd, name);
+	pcb_coord_t c;
+	pcb_bool succ;
+
+	if (p == NULL)
+		return invalid_val;
+
+	c = pcb_get_value(p, NULL, NULL, &succ);
+	if (!succ)
+		return invalid_val;
+	return c;
+}
+
+static int eagle_read_layers(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n;
+
+	pcb_layergrp_inhibit_inc();
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "layer") == 0) {
+			eagle_layer_t *ly = calloc(sizeof(eagle_layer_t), 1);
+			int id, reuse = 0;
+			unsigned long typ;
+			pcb_layergrp_id_t gid;
+			pcb_layergrp_t *grp;
+
+			ly->name    = eagle_get_attrs(st, n, "name", NULL);
+			ly->color   = eagle_get_attrl(st, n, "color", -1);
+			ly->fill    = eagle_get_attrl(st, n, "fill", -1);
+			ly->visible = eagle_get_attrl(st, n, "visible", -1);
+			ly->active  = eagle_get_attrl(st, n, "active", -1);
+			ly->lid     = -1;
+#warning TODO we are reading uint as signed int when getting layer, and ignoring half of them
+			id = eagle_get_attrl(st, n, "number", -1);
+			if (id >= 0) {
+				htip_set(&st->layers, id, ly); /* all listed layers get a hash */
+			} else if (id < -1) {
+				htip_set(&st->layers, id, ly);
+			}
+			typ = 0;
+			switch(id) {
+				case 1: typ = PCB_LYT_COPPER | PCB_LYT_TOP; break;
+				case 16: typ = PCB_LYT_COPPER | PCB_LYT_BOTTOM; break;
+				case 121:
+				case 21: /* tplace element silk */
+				/*case 51: tDocu, second layer in top silk group */ 
+				case 25: /* names */
+				case 27: /* values */
+				case 39: /* keepout */
+					reuse = 1;
+					typ = PCB_LYT_SILK | PCB_LYT_TOP;
+					break;
+				case 122:
+				case 22: /* bplace element silk */
+				/* case 52: bDocu, second layer in bottom silk group */
+				case 26: /* names */
+				case 28: /* values */
+				case 40: /* keepout */
+					reuse = 1;
+					typ = PCB_LYT_SILK | PCB_LYT_BOTTOM;
+					break;
+				case 20: /*199:   20 is dimension, 199 is contour */
+					grp = pcb_get_grp_new_intern(st->pcb, -1);
+					ly->lid = pcb_layer_create(st->pcb, grp - st->pcb->LayerGroups.grp, ly->name);
+					pcb_layergrp_fix_turn_to_outline(grp);
+					break;
+
+				default:
+					if ((id > 1) && (id < 16)) {
+						/* new internal layer */
+						grp = pcb_get_grp_new_intern(st->pcb, -1);
+						ly->lid = pcb_layer_create(st->pcb, grp - st->pcb->LayerGroups.grp, ly->name);
+					}
+			}
+			if (typ != 0) {
+				if (reuse)
+					pcb_layer_list(st->pcb, typ, &ly->lid, 1);
+				if ((ly->lid < 0) && (pcb_layergrp_list(st->pcb, typ, &gid, 1) > 0))
+					ly->lid = pcb_layer_create(st->pcb, gid, ly->name);
+			}
+		}
+	}
+	pcb_layer_group_setup_silks(st->pcb);
+	pcb_layer_auto_fixup(st->pcb);
+	pcb_layergrp_inhibit_dec();
+	return 0;
+}
+
+static pcb_layer_t *eagle_layer_get(read_state_t *st, int id, eagle_loc_t loc, void *obj)
+{
+	/* tDocu & bDocu are used for info used when designing, but not necessarily for
+	   exporting to Gerber i.e. package outlines that cross pads, or instructions.
+	   These layers within the silk groups will be needed when subc replaces elements
+	   since most Eagle packages use tDocu, bDocu for some of their artwork */
+
+	eagle_layer_t *ly = htip_get(&st->layers, id);
+	pcb_layer_id_t lid;
+	pcb_subc_t *subc = obj;
+	pcb_layer_type_t lyt;
+	pcb_layer_combining_t comb;
+
+	/* if more than 51 or 52 are considered useful, we could relax the test here: */
+	if ((ly == NULL) || (ly->lid < 0)) {
+#warning TODO: move this out to a separate function
+		if (id == 51 || id == 52) {
+			/* create docu on the first reference */
+		pcb_layer_type_t typ;
+		pcb_layergrp_id_t gid;
+		switch (id) {
+			case 51: /* = tDocu */
+				typ        = PCB_LYT_SILK | PCB_LYT_TOP;
+				ly->name   = "tDocu";
+				ly->color  = 14;
+				break;
+			default: /* i.e. 52 = bDocu: */
+				typ        = PCB_LYT_SILK | PCB_LYT_BOTTOM;
+				ly->name   = "bDocu";
+				ly->color  = 7;
+				break;
+		}
+
+		ly->fill    = 1;
+		ly->visible = 0;
+		ly->active  = 1;
+		pcb_layergrp_list(st->pcb, typ, &gid, 1);
+		ly->lid = pcb_layer_create(st->pcb, gid, ly->name);	
+		}
+		else
+			return NULL; /* not found and not supported */
+	}
+
+	switch(loc) {
+		case ON_BOARD:
+			return &st->pcb->Data->Layer[ly->lid];
+		case IN_SUBC:
+			/* check if the layer already exists (by name) */
+			lid = pcb_layer_by_name(subc->data, ly->name);
+			if (lid >= 0)
+				return &subc->data->Layer[lid];
+
+			if (ly->lid < 0) {
+				pcb_message(PCB_MSG_ERROR, "\tfp_* layer '%s' not found for module object, using unbound subc layer instead.\n", ly->name);
+				lyt = PCB_LYT_VIRTUAL;
+				comb = 0;
+				return pcb_subc_get_layer(subc, lyt, comb, 1, ly->name, pcb_true);
+			}
+			lyt = pcb_layer_flags(st->pcb, ly->lid);
+			comb = 0;
+			return pcb_subc_get_layer(subc, lyt, comb, 1, ly->name, pcb_true);
+	}
+	return NULL;
+}
+
+static pcb_subc_t *eagle_libelem_by_name(read_state_t *st, const char *lib, const char *elem)
+{
+	eagle_library_t *l;
+	l = htsp_get(&st->libs, lib);
+	if (l == NULL)
+		return NULL;
+	return htsp_get(&l->elems, elem);
+}
+
+static pcb_subc_t *eagle_libelem_by_idx(read_state_t *st, trnode_t *libs, long libi, long pkgi)
+{
+	trnode_t *n;
+	pcb_subc_t *res;
+
+	/* count children of libs so n ends up at the libith library */
+	for(n = CHILDREN(libs); (n != NULL) && (libi > 1); n = NEXT(n), libi--) ;
+	if (n == NULL) {
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_libelem_by_idx() can't find lib by idx:\n");
+		return NULL;
+	}
+
+	if (STRCMP(NODENAME(n), "library") != 0) {
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_libelem_by_idx() expected library node:\n");
+		return NULL;
+	}
+	n = CHILDREN(n);
+
+	if (STRCMP(NODENAME(n), "packages") != 0) {
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_libelem_by_idx() expected packages node:\n");
+		return NULL;
+	}
+
+	/* count children of that library so n ends up at the pkgth package */
+	for(n = CHILDREN(n); (n != NULL) && (pkgi > 1); n = NEXT(n), pkgi--) ;
+	if (n == NULL) {
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_libelem_by_idx() can't find pkg by idx:\n");
+		return NULL;
+	}
+
+	res = st->parser.calls->get_user_data(n);
+	if (res == NULL)
+		pcb_message(PCB_MSG_ERROR, "io_eagle bin: eagle_libelem_by_idx() found the element node in the tree but there's no element instance associated with it:\n");
+	return res;
+}
+
+static void size_bump(read_state_t *st, pcb_coord_t x, pcb_coord_t y)
+{
+	if (x > st->pcb->MaxWidth)
+		st->pcb->MaxWidth = x;
+	if (y > st->pcb->MaxHeight)
+		st->pcb->MaxHeight = y;
+}
+
+/* Convert eagle Rxxx to degrees. Binary n*1024 string converted to Rxxx in eagle_bin.c */
+static int eagle_rot2degrees(const char *rot)
+{
+	long deg;
+	char *end;
+
+	if (rot == NULL) {
+		return -1;
+	} else {
+		deg = strtol(rot+1, &end, 10);
+		if (*end != '\0')
+			return -1;
+	}
+	while (deg >= 360) {
+		deg -= 360;
+	}
+	return (int) deg;
+}
+
+/* Convert eagle Rxxx string to pcb-rnd 90-deg rotation steps */
+static int eagle_rot2steps(const char *rot)
+{
+	int deg = eagle_rot2degrees(rot);
+
+	switch(deg) {
+		case 0: return 0;
+		case 90: return 3;
+		case 180: return 2;
+		case 270: return 1;
+	}
+	pcb_message(PCB_MSG_WARNING, "Unexpected non n*90 degree rotation value '%s' ignored\n", rot);
+	return -1;
+}
+
+/****************** drawing primitives ******************/
+
+
+static int eagle_read_text(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	pcb_coord_t X, Y, height;
+	const char *rot, *text_val;
+	unsigned int text_direction = 0, text_scaling = 100;
+	pcb_flag_t text_flags = pcb_flag_make(0);
+	pcb_layer_t *ly;
+	ly = eagle_layer_get(st, ln, type, obj);
+	if (ly == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to allocate text layer 'ly' via eagle_layer_get(st, ln)\n");
+		return 0;
+	}
+#warning TODO text - need better filtering/exclusion of unsupported text layers +/- correct flags
+#warning TODO: remove this hack - if there is a bug, fix it, do not work it around like this
+	if (ln == 51) {
+		ln = 21; /* we seem to trigger a segfault if we create text with ln = 51 */
+		pcb_message(PCB_MSG_WARNING, "Moved text on tDocu layer: 51 to top silk\n", ln);
+	} else if (!(ln == 21 || ln == 16 )) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring text on non top copper/silk Eagle layer: %ld\n", ln);
+		return 0;
+	}
+	if (!(text_val = eagle_get_attrs(st, subtree, "textfield", NULL)) && CHILDREN(subtree) == NULL) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring empty text field\n");
+		return 0;
+	}
+	if (text_val == NULL && !IS_TEXT(CHILDREN(subtree))) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring text field (invalid child node)\n");
+		return 0;
+	}
+
+#warning TODO: need to convert
+	if (text_val == NULL) {
+		text_val = (const char *)GET_TEXT(CHILDREN(subtree));
+	}
+	X = eagle_get_attrc(st, subtree, "x", -1);
+	Y = eagle_get_attrc(st, subtree, "y", -1);
+	height = eagle_get_attrc(st, subtree, "size", -1);
+	text_scaling = (int)((double)height/(double)EAGLE_TEXT_SIZE_100 * 100);
+	rot = eagle_get_attrs(st, subtree, "rot", NULL);
+	if (rot == NULL) {
+		rot = "R0";
+	}
+
+	if (rot[0] == 'R') {
+		int deg = atoi(rot+1);
+		if (deg < 45 || deg >= 315) {
+			text_direction = 0;
+		}
+		else if (deg < 135 && deg >= 45) {
+			text_direction = 1;
+		}
+		else if (deg < 225 && deg >= 135) {
+			text_direction = 2;
+		}
+		else {
+			text_direction = 3;
+		}
+	}
+
+	pcb_text_new(ly, pcb_font(st->pcb, 0, 1), X, Y, text_direction, text_scaling, text_val, text_flags);
+	return 0;
+}
+
+static long eagle_degrees_to_pcb_degrees(long const eagle_degrees) {
+	long e_degrees = eagle_degrees;
+	while (e_degrees < 0) {
+		e_degrees += 360;
+	}
+	while (e_degrees > 360) {
+		e_degrees -= 360;
+	}
+	return (360 - e_degrees);
+}
+
+static int eagle_read_circle(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	eagle_loc_t loc = type;
+	pcb_arc_t *circ;
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	pcb_layer_t *ly;
+
+	ly = eagle_layer_get(st, ln, loc, obj);
+	if (ly == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to allocate circle layer 'ly' via eagle_layer_get(st, ln)\n");
+		return 0;
+	}
+
+	circ = pcb_arc_alloc(ly);
+	circ->X = eagle_get_attrc(st, subtree, "x", -1);
+	circ->Y = eagle_get_attrc(st, subtree, "y", -1);
+	circ->Width = eagle_get_attrc(st, subtree, "radius", -1);
+	circ->Height = circ->Width; /* no ellipse support */
+	circ->StartAngle = eagle_degrees_to_pcb_degrees(eagle_get_attrl(st, subtree, "StartAngle", 0));
+	circ->Delta = -eagle_get_attrl(st, subtree, "Delta", -360);
+	circ->Thickness = eagle_get_attrc(st, subtree, "width", -1);
+	circ->Clearance = st->md_wire_wire*2;
+	circ->Flags = pcb_flag_make(PCB_FLAG_CLEARLINE);
+
+
+	switch(loc) {
+		case IN_SUBC: break;
+		case ON_BOARD:
+			size_bump(st, circ->X + circ->Width + circ->Thickness, circ->Y + circ->Width + circ->Thickness);
+			pcb_add_arc_on_layer(ly, circ);
+			break;
+	}
+
+	return 0;
+}
+
+static int eagle_read_rect(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	eagle_loc_t loc = type;
+	pcb_line_t *lin1, *lin2, *lin3, *lin4;
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	pcb_layer_t *ly;
+
+	ly = eagle_layer_get(st, ln, loc, obj);
+	if (ly == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to allocate rect layer 'ly' via eagle_layer_get(st, ln)\n");
+		return 0;
+	}
+
+#warning TODO: rewrite this with only one lin
+	lin1 = pcb_line_alloc(ly);
+	lin2 = pcb_line_alloc(ly);
+	lin3 = pcb_line_alloc(ly);
+	lin4 = pcb_line_alloc(ly);
+
+	lin1->Point1.X = eagle_get_attrc(st, subtree, "x1", -1);
+	lin1->Point1.Y = eagle_get_attrc(st, subtree, "y1", -1);
+	lin1->Point2.X = eagle_get_attrc(st, subtree, "x2", -1);
+	lin1->Point2.Y = lin1->Point1.Y;
+
+	lin2->Point1.X = lin1->Point2.X;
+	lin2->Point1.Y = lin1->Point2.Y;
+	lin2->Point2.X = lin1->Point2.X;
+	lin2->Point2.Y = eagle_get_attrc(st, subtree, "y2", -1);
+
+	lin3->Point1.X = lin2->Point2.X;
+	lin3->Point1.Y = lin2->Point2.Y;
+	lin3->Point2.X = lin1->Point1.X;
+	lin3->Point2.Y = lin2->Point2.Y;
+
+	lin4->Point1.X = lin3->Point2.X;
+	lin4->Point1.Y = lin3->Point2.Y;
+	lin4->Point2.X = lin1->Point1.X;
+	lin4->Point2.Y = lin1->Point1.Y;
+
+	lin1->Thickness = st->ms_width;
+	lin2->Thickness = lin1->Thickness;
+	lin3->Thickness = lin1->Thickness;
+	lin4->Thickness = lin1->Thickness;
+
+	switch(loc) {
+		case IN_SUBC:
+			break;
+
+		case ON_BOARD:
+			size_bump(st, lin1->Point1.X + lin1->Thickness, lin1->Point1.Y + lin1->Thickness);
+			size_bump(st, lin3->Point1.X + lin3->Thickness, lin3->Point1.Y + lin3->Thickness);
+			pcb_add_line_on_layer(ly, lin1);
+			pcb_add_line_on_layer(ly, lin2);
+			pcb_add_line_on_layer(ly, lin3);
+			pcb_add_line_on_layer(ly, lin4);
+
+			break;
+	}
+
+	return 0;
+}
+
+static int eagle_read_wire(read_state_t * st, trnode_t * subtree, void *obj, int type)
+{
+	eagle_loc_t loc = type;
+	pcb_line_t *lin;
+	pcb_layer_t *ly;
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	long lt = eagle_get_attrl(st, subtree, "linetype", -1); /* present if bin file */
+	double curve = eagle_get_attrd(st, subtree, "curve", 0); /*present if a wire "arc" */
+
+#warning TODO: need to process curve value if present to draw an arc, not a line
+	if (curve) {
+		pcb_message(PCB_MSG_ERROR, "Curved wire not yet handled in eagle_read_wire()\n");
+	}
+	if (lt > 0 || lt == -127) {
+		/* using circle routine to process wire type */
+		return eagle_read_circle(st, subtree, obj, type);
+	}
+
+	ly = eagle_layer_get(st, ln, loc, obj);
+	if (ly == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to allocate wire layer 'ly' via eagle_layer_get(st, ln)\n");
+		return 0;
+	}
+
+	lin = pcb_line_alloc(ly);
+	lin->Point1.X = eagle_get_attrc(st, subtree, "x1", -1);
+	lin->Point1.Y = eagle_get_attrc(st, subtree, "y1", -1);
+	lin->Point2.X = eagle_get_attrc(st, subtree, "x2", -1);
+	lin->Point2.Y = eagle_get_attrc(st, subtree, "y2", -1);
+	lin->Thickness = eagle_get_attrc(st, subtree, "width", -1); 
+	lin->Clearance = st->md_wire_wire*2;
+	lin->Flags = pcb_flag_make(PCB_FLAG_CLEARLINE);
+	lin->ID = pcb_create_ID_get();
+
+	switch (loc) {
+		case IN_SUBC:
+			break;
+		case ON_BOARD:
+			size_bump(st, lin->Point1.X + lin->Thickness, lin->Point1.Y + lin->Thickness);
+			size_bump(st, lin->Point2.X + lin->Thickness, lin->Point2.Y + lin->Thickness);
+			pcb_add_line_on_layer(ly, lin);
+			break;
+	}
+
+	return 0;
+}
+
+static int eagle_read_smd(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	pcb_coord_t x, y, dx, dy;
+	pcb_pstk_t *ps;
+	pcb_subc_t *subc = obj;
+	const char *name;
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	long roundness = 0;
+	pcb_pstk_shape_t sh[4];
+	pcb_coord_t clr;
+	int rot;
+
+	assert(type == IN_SUBC);
+
+	name = eagle_get_attrs(st, subtree, "name", NULL);
+	x = eagle_get_attrc(st, subtree, "x", 0);
+	y = eagle_get_attrc(st, subtree, "y", 0);
+	dx = eagle_get_attrc(st, subtree, "dx", 0);
+	dy = eagle_get_attrc(st, subtree, "dy", 0);
+	rot = eagle_rot2degrees(eagle_get_attrs(st, subtree, "rot", 0));
+	roundness = eagle_get_attrl(st, subtree, "roundness", 0);
+
+#warning TODO need to load thermals flags to set clearance; may in fact be more contactref related.
+
+#warning TODO: this should be coming from the eagle file
+	clr = conf_core.design.clearance;
+
+#warning TODO padstacks - consider roundrect, oval etc shapes when padstacks available
+#if 0
+	if (roundness >= 65) /* round smd pads found in fiducials, some discretes, it seems */
+		PCB_FLAG_CLEAR(PCB_FLAG_SQUARE, pad);
+#endif
+
+	memset(sh, 0, sizeof(sh));
+	sh[0].layer_mask = PCB_LYT_TOP | PCB_LYT_MASK; sh[0].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[0], dx+clr, dy+clr);
+	sh[1].layer_mask = PCB_LYT_TOP | PCB_LYT_PASTE; sh[1].comb = PCB_LYC_AUTO; pcb_shape_rect(&sh[1], dx, dy);
+	sh[2].layer_mask = PCB_LYT_TOP | PCB_LYT_COPPER; pcb_shape_rect(&sh[2], dx, dy);
+	sh[3].layer_mask = 0;
+
+	if (rot != 0) {
+		double sina = sin(rot / PCB_RAD_TO_DEG), cosa = cos(rot / PCB_RAD_TO_DEG);
+		pcb_pstk_shape_rot(&sh[0], sina, cosa, rot);
+		pcb_pstk_shape_rot(&sh[1], sina, cosa, rot);
+		pcb_pstk_shape_rot(&sh[2], sina, cosa, rot);
+	}
+
+	ps = pcb_pstk_new_from_shape(subc->data, x, y, 0, 0, clr, sh);
+	if (ps == NULL)
+		pcb_message(PCB_MSG_ERROR, "Failed to load smd pad\n");
+
+	if (name != NULL)
+		pcb_attribute_put(&ps->Attributes, "term", name);
+
+	return 0;
+}
+
+static int eagle_read_pad_or_hole(read_state_t *st, trnode_t *subtree, void *obj, int type, int hole)
+{
+	eagle_loc_t loc = type;
+	pcb_coord_t x, y, drill, dia, clr, mask;
+	pcb_pstk_t *ps;
+	const char *name, *shape;
+	pcb_pstk_compshape_t cshp = PCB_PSTK_COMPAT_INVALID;
+	pcb_data_t *data;
+
+	switch(loc) {
+		case IN_SUBC:
+			data = ((pcb_subc_t *)obj)->data;
+			break;
+		case ON_BOARD:
+			data = st->pcb->Data;
+			break;
+	}
+
+	name = eagle_get_attrs(st, subtree, "name", NULL);
+	x = eagle_get_attrc(st, subtree, "x", 0);
+	y = eagle_get_attrc(st, subtree, "y", 0);
+	drill = eagle_get_attrc(st, subtree, "drill", 0);
+	dia = eagle_get_attrc(st, subtree, "diameter", drill * (1.0+st->rv_pad_top*2.0));
+	shape = eagle_get_attrs(st, subtree, "shape", 0);
+
+	clr = conf_core.design.clearance; /* eagle doesn't seem to support per via clearance */
+	mask = (loc == IN_SUBC) ? conf_core.design.clearance : 0; /* board vias don't have mask */
+
+	if ((dia - drill) / 2.0 < st->ms_width)
+		dia = drill + 2*st->ms_width;
+
+#warning padstack TODO: process the extent attribute for bbvia
+#warning padstack TODO: revise this for numeric values ?
+	/* shape = {square, round, octagon, long, offset} binary */
+	
+	if (shape != NULL) {
+		if ((strcmp(shape, "octagon") == 0) || (strcmp(shape, "2") == 0))
+			cshp = PCB_PSTK_COMPAT_OCTAGON;
+		else if ((strcmp(shape, "square") == 0) || (strcmp(shape, "0") == 0))
+			cshp = PCB_PSTK_COMPAT_SQUARE;
+		else if ((strcmp(shape, "round") == 0) || (strcmp(shape, "1") == 0))
+			cshp = PCB_PSTK_COMPAT_ROUND;
+	}
+
+	if (cshp == PCB_PSTK_COMPAT_INVALID) {
+		cshp = PCB_PSTK_COMPAT_OCTAGON;
+		pcb_message(PCB_MSG_ERROR, "Invalid padstack shape: '%s' - using octagon instead\n", shape);
+	}
+
+	ps = pcb_pstk_new_compat_via(data, x, y, drill, dia, clr, mask,  cshp, !hole);
+
+	if (name != NULL)
+		pcb_attribute_put(&ps->Attributes, "term", name);
+
+	switch(loc) {
+		case IN_SUBC: break;
+		case ON_BOARD:
+			size_bump(st, x + dia, y + dia);
+			break;
+	}
+
+	return 0;
+}
+
+static int eagle_read_hole(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	return eagle_read_pad_or_hole(st, subtree, obj, type, 1);
+}
+
+static int eagle_read_pad(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	return eagle_read_pad_or_hole(st, subtree, obj, type, 0);
+}
+
+static int eagle_read_via(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	return eagle_read_pad_or_hole(st, subtree, obj, ON_BOARD, 0);
+}
+
+
+/****************** composite objects ******************/
+
+/* Save the relative coords and size of the each relevant text fields */
+static int eagle_read_pkg_txt(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	pcb_coord_t size;
+	trnode_t *n;
+	const char *cont;
+	pcb_coord_t x, y;
+	int dir = 0, scale, layer;
+	const char *pattern;
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n))
+		if (IS_TEXT(n))
+			break;
+
+	if ((n == NULL) || ((cont = GET_TEXT(n)) == NULL))
+		return 0;
+
+	/* create dyntext for name and value only (the core could handle any attribute, but we can't pick them up on the element ref) */
+	if (STRCMP(cont, ">NAME") == 0)
+		pattern = "%a.parent.refdes%";
+	else if (STRCMP(cont, ">VALUE") == 0)
+		pattern = "%a.parent.value%";
+	else
+		return 0;
+
+	layer = eagle_get_attrl(st, subtree, "layer", 0);
+	size = eagle_get_attrc(st, subtree, "size", EAGLE_TEXT_SIZE_100);
+	x = eagle_get_attrc(st, subtree, "x", 0);
+	y = eagle_get_attrc(st, subtree, "y", 0);
+	y += size; /* different text object origin in eagle */
+	scale = (int)(((double)size/(double)EAGLE_TEXT_SIZE_100) * 100.0);
+
+	pcb_subc_add_dyntex((pcb_subc_t *)obj, x, y, dir, scale, (layer == 27), pattern);
+
+	return 0;
+}
+
+#warning TODO: eliminate this fwd declaration by reorder
+static int eagle_read_poly(read_state_t *st, trnode_t *subtree, void *obj, int type);
+
+static int eagle_read_pkg(read_state_t *st, trnode_t *subtree, pcb_subc_t *subc)
+{
+	static const dispatch_t disp[] = { /* possible children of package */
+		{"description", eagle_read_nop},
+		{"wire",        eagle_read_wire},
+		{"hole",        eagle_read_hole},
+		{"circle",      eagle_read_circle},
+		{"arc",         eagle_read_circle},
+		{"smd",         eagle_read_smd},
+		{"pad",         eagle_read_pad},
+		{"text",        eagle_read_pkg_txt},
+		{"polygon",     eagle_read_poly}, /* TODO: check this to handle subc */
+		{"rectangle",   eagle_read_rect},
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	return eagle_foreach_dispatch(st, CHILDREN(subtree), disp, subc, IN_SUBC);
+}
+
+static int eagle_read_library_file_pkgs(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n;
+	pcb_text_t *t;
+	int direction = 0;
+	pcb_flag_t TextFlags = pcb_no_flags();
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		pcb_trace("looking at child %s of packages node\n", NODENAME(n)); 
+		if (STRCMP(NODENAME(n), "package") == 0) {
+			pcb_subc_t *subc;
+			pcb_coord_t x, y;
+
+			subc = pcb_subc_alloc();
+			pcb_attribute_put(&subc->Attributes, "refdes", "K1");
+			pcb_add_subc_to_data(st->pcb->Data, subc);
+			pcb_subc_bind_globals(st->pcb, subc);
+			eagle_read_pkg(st, n, subc);
+			if (pcb_data_is_empty(subc->data)) {
+				pcb_subc_free(subc);
+				pcb_message(PCB_MSG_WARNING, "Ignoring empty package in library\n");
+				continue;
+			}
+
+			pcb_attribute_put(&subc->Attributes, "refdes", eagle_get_attrs(st, n, "name", NULL));
+			pcb_attribute_put(&subc->Attributes, "value", eagle_get_attrs(st, n, "value", NULL));
+			pcb_attribute_put(&subc->Attributes, "footprint", eagle_get_attrs(st, n, "package", NULL));
+
+			pcb_subc_bbox(subc);
+#warning subc TODO: revise this: are we loading an instance here? do we need to place it? do not even bump if not!
+			if (st->pcb->Data->subc_tree == NULL)
+				st->pcb->Data->subc_tree = pcb_r_create_tree();
+			pcb_r_insert_entry(st->pcb->Data->subc_tree, (pcb_box_t *)subc);
+			pcb_subc_rebind(st->pcb, subc);
+
+#warning TODO: revise rotation and flip
+#if 0
+			if ((moduleRotation == 90) || (moduleRotation == 180) || (moduleRotation == 270)) {
+				/* lossles module rotation for round steps */
+				moduleRotation = moduleRotation / 90;
+				pcb_subc_rotate90(subc, moduleX, moduleY, moduleRotation);
+			}
+			else if (moduleRotation != 0) {
+				double rot = moduleRotation;
+				pcb_subc_rotate(subc, moduleX, moduleY, cos(rot/PCB_RAD_TO_DEG), sin(rot/PCB_RAD_TO_DEG), rot);
+			}
+#endif
+
+			size_bump(st, subc->BoundingBox.X2, subc->BoundingBox.Y2);
+		}
+	}
+	return 0;
+}
+
+static int eagle_read_lib_pkgs(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n;
+	eagle_library_t *lib = obj;
+	pcb_text_t *t;
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "package") == 0) {
+			pcb_subc_t *subc;
+			const char *name = eagle_get_attrs(st, n, "name", NULL);
+
+			if ((st->elem_by_name) && (name == NULL)) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring package with no name\n");
+				continue;
+			}
+
+			subc = pcb_subc_alloc();
+			eagle_read_pkg(st, n, subc);
+			if (pcb_subc_is_empty(subc)) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring empty package %s\n", name);
+				free(subc);
+				continue;
+			}
+
+			if (st->elem_by_name)
+				htsp_set(&lib->elems, (char *)name, subc);
+			st->parser.calls->set_user_data(n, subc);
+		}
+	}
+	return 0;
+}
+
+static int eagle_read_library(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	static const dispatch_t disp[] = { /* possible children of <library> */
+		{"description", eagle_read_nop},
+		{"devices",     eagle_read_nop},
+		{"symbols",     eagle_read_nop},
+		{"devicesets",  eagle_read_nop},
+		{"packages",    eagle_read_library_file_pkgs},/* read & place element(s) in library */
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+	return eagle_foreach_dispatch(st, CHILDREN(subtree), disp, subtree, 0);
+}
+
+static int eagle_read_libs(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n;
+	static const dispatch_t disp[] = { /* possible children of <library> */
+		{"description", eagle_read_nop},
+		{"packages",    eagle_read_lib_pkgs},
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "library") == 0) {
+			const char *name = eagle_get_attrs(st, n, "name", NULL);
+			eagle_library_t *lib;
+			if ((st->elem_by_name) && (name == NULL)) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring library with no name\n");
+				continue;
+			}
+			lib = calloc(sizeof(eagle_library_t), 1);
+
+			if (st->elem_by_name)
+				htsp_init(&lib->elems, strhash, strkeyeq);
+
+			eagle_foreach_dispatch(st, CHILDREN(n), disp, lib, 0);
+
+			if (st->elem_by_name)
+				htsp_set(&st->libs, (char *)name, lib);
+		}
+	}
+	return 0;
+}
+
+static int eagle_read_contactref(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	const char *elem, *pad, *net;
+	char conn[256];
+
+	elem = eagle_get_attrs(st, subtree, "element", NULL);
+	pad = eagle_get_attrs(st, subtree, "pad", NULL);
+
+
+	if ((elem == NULL) || (pad == NULL)) {
+		pcb_message(PCB_MSG_WARNING, "Failed to parse contactref node: missing \"element\" or \"pad\" netlist attributes\n");
+		return -1;
+	}
+
+	if (elem != NULL && elem[0] == '-' && elem[1] == '\0') {
+		pcb_snprintf(conn, sizeof(conn), "%s-%s", "HYPHEN", pad);
+		pcb_message(PCB_MSG_WARNING, "Substituted invalid element name '-' with 'HYPHEN'\n");
+	} else {
+		pcb_snprintf(conn, sizeof(conn), "%s-%s", elem, pad);
+	}
+
+	net = eagle_get_attrs(st, PARENT(subtree), "name", NULL);
+
+	if (net != NULL && net[0] == '-' && net[1] == '\0') { /* pcb-rnd doesn't like it when Eagle uses '-' for GND*/
+		pcb_actionl("Netlist", "Add", "GND", conn, NULL);
+		pcb_message(PCB_MSG_WARNING, "Substituted contactref net \"GND\" instead of original invalid '-'\n");
+	} else {
+		pcb_actionl("Netlist", "Add",  net, conn, NULL);
+	}
+	return 0;
+}
+
+
+static int eagle_read_poly(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	eagle_loc_t loc = type;
+	pcb_layer_t *ly;
+	long ln = eagle_get_attrl(st, subtree, "layer", -1);
+	pcb_poly_t *poly;
+	trnode_t *n;
+
+	ly = eagle_layer_get(st, ln, loc, obj);
+	if (ly == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to allocate polygon layer 'ly' via eagle_layer_get(st, ln)\n");
+		return 0;
+	}
+
+	poly = pcb_poly_new(ly, 0, pcb_flag_make(PCB_FLAG_CLEARPOLY));
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "vertex") == 0) {
+			pcb_coord_t x, y;
+			x = eagle_get_attrc(st, n, "x", 0);
+			y = eagle_get_attrc(st, n, "y", 0);
+			pcb_poly_point_new(poly, x, y);
+			switch (loc) {
+				case IN_SUBC:
+					break;
+				case ON_BOARD:
+					size_bump(st, x, y);
+					break;
+			}
+#warning TODO can remove the following if dealt with in post processor for binary tree
+		} else if (STRCMP(NODENAME(n), "wire") == 0) { /* binary format vertices it seems */
+			pcb_coord_t x, y;
+			x = eagle_get_attrc(st, n, "linetype_0_x1", 0);
+			y = eagle_get_attrc(st, n, "linetype_0_y1", 0);
+			pcb_poly_point_new(poly, x, y);
+			x = eagle_get_attrc(st, n, "linetype_0_x2", 0);
+			y = eagle_get_attrc(st, n, "linetype_0_y2", 0);
+			pcb_poly_point_new(poly, x, y);
+			switch (loc) {
+				case IN_SUBC:
+					break;
+				case ON_BOARD:
+					size_bump(st, x, y);
+					break;
+			}
+		}
+	}
+
+	pcb_add_poly_on_layer(ly, poly);
+	pcb_poly_init_clip(st->pcb->Data, ly, poly);
+
+	return 0;
+}
+
+
+static int eagle_read_signals(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n;
+	static const dispatch_t disp[] = { /* possible children of <library> */
+		{"contactref",  eagle_read_contactref}, /* if this fails, rest of disp acts up */
+		{"wire",        eagle_read_wire},
+		{"arc",         eagle_read_circle}, /*binary format */
+		{"polygon",     eagle_read_poly},
+		{"via",         eagle_read_via},
+		{"text",        eagle_read_text},
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "signal") == 0) {
+			const char *name = eagle_get_attrs(st, n, "name", NULL);
+			if (name == NULL) {
+				pcb_message(PCB_MSG_WARNING, "Ignoring signal with no name\n");
+				continue;
+			}
+			eagle_foreach_dispatch(st, CHILDREN(n), disp, (char *)name, ON_BOARD);
+		}
+	}
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+
+	return 0;
+}
+
+static void eagle_read_subc_attrs(read_state_t *st, trnode_t *nd, pcb_subc_t *subc, pcb_coord_t x, pcb_coord_t y, const char *attname, const char *subc_attr, const char *str, pcb_bool add_text)
+{
+	int direction = 0;
+	pcb_coord_t size;
+
+	pcb_attribute_put(&subc->Attributes, subc_attr, str);
+	if (!add_text)
+		return;
+
+#warning TODO: text objects should be already created in the library; we should probably set the attributes here only
+#if 0
+	y += EAGLE_TEXT_SIZE_100;
+
+	for(nd = CHILDREN(nd); nd != NULL; nd = NEXT(nd)) {
+		const char *this_attr = eagle_get_attrs(st, nd, "name", "");
+		if (((STRCMP(NODENAME(nd), "attribute") == 0) ||
+				(STRCMP(NODENAME(nd), "element2") == 0) )
+				&& (strcmp(attname, this_attr) == 0)) {
+			direction = eagle_rot2steps(eagle_get_attrs(st, nd, "rot", NULL));
+			if (direction < 0)
+				direction = 0;
+			size = eagle_get_attrc(st, nd, "size", EAGLE_TEXT_SIZE_100);
+			break;
+		}
+	}
+#endif
+}
+
+static int eagle_read_elements(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	trnode_t *n, *nlib;
+	if (st->elem_by_name)
+		nlib = NULL;
+	else
+		nlib = eagle_trpath(st, st->parser.root, "drawing", "board", "libraries", NULL);
+
+	for(n = CHILDREN(subtree); n != NULL; n = NEXT(n)) {
+		if (STRCMP(NODENAME(n), "element") == 0) {
+			pcb_coord_t x, y;
+			const char *name, *val, *lib, *pkg, *rot, *mirrored;
+			pcb_subc_t *subc, *new_subc;
+			int back = 0;
+
+			name = eagle_get_attrs(st, n, "name", NULL);
+			val = eagle_get_attrs(st, n, "value", NULL);
+
+			if (name == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Element name not found in tree\n");
+				name = "refdes_not_found";
+				val = "parse_error";
+			}
+
+			/* need to get these as string because error messages will use them */
+			lib = eagle_get_attrs(st, n, "library", NULL);
+			pkg = eagle_get_attrs(st, n, "package", NULL);
+
+			if (st->elem_by_name) { /* xml: library and package are named */
+				if ((lib == NULL) || (pkg == NULL)) {
+					pcb_message(PCB_MSG_WARNING, "Ignoring element with incomplete library reference\n");
+					continue;
+				}
+				subc = eagle_libelem_by_name(st, lib, pkg);
+			}
+			else {
+				long libi = eagle_get_attrl(st, n, "library", -1);
+				long pkgi = eagle_get_attrl(st, n, "package", -1);
+				if ((libi < 0) || (pkgi < 0)) {
+					pcb_message(PCB_MSG_WARNING, "Ignoring element with broken library reference: %s/%s\n", lib, pkg);
+					continue;
+				}
+				subc = eagle_libelem_by_idx(st, nlib, libi, pkgi);
+			}
+
+			/* sanity checks: the element exists and is non-empty */
+			if (subc == NULL) {
+				pcb_message(PCB_MSG_ERROR, "Library element not found: %s/%s\n", lib, pkg);
+				continue;
+			}
+			if (pcb_subc_is_empty(subc)) {
+				pcb_message(PCB_MSG_ERROR, "Not placing empty element: %s/%s\n", lib, pkg);
+				continue;
+			}
+
+			x = eagle_get_attrc(st, n, "x", -1);
+			y = eagle_get_attrc(st, n, "y", -1);
+			rot = eagle_get_attrs(st, n, "rot", NULL);
+			mirrored = eagle_get_attrs(st, n, "mirrored", NULL);
+			if ((rot != NULL) && (*rot == 'M')) {
+				rot++;
+				back = 1;
+			} else if ((mirrored != NULL) && (*mirrored == '1')) {
+				back = 1;
+			}
+
+			new_subc = pcb_subc_dup_at(st->pcb, st->pcb->Data, subc, x, y, pcb_false);
+			new_subc->Flags = pcb_no_flags();
+			new_subc->ID = pcb_create_ID_get();
+
+			eagle_read_subc_attrs(st, n, new_subc, x, y, "PROD_ID", "footprint", pkg,  0);
+			eagle_read_subc_attrs(st, n, new_subc, x, y, "NAME",    "refdes",    name, 1);
+			eagle_read_subc_attrs(st, n, new_subc, x, y, "VALUE",   "value",     val,  0);
+
+			pcb_subc_bbox(new_subc);
+			pcb_subc_rebind(st->pcb, new_subc);
+
+#warning subc TODO: why not use the arbtirary angle rot?
+			if (rot != NULL) {
+				char *end;
+				double ang = strtod(rot+1, &end);
+				if (*end == '\0') {
+					if (fmod(ang, 90) == 0) {
+						int steps = eagle_rot2steps(rot);
+						if (back)
+							steps = (steps + 2)%4;
+						if (steps > 0)
+							pcb_subc_rotate90(new_subc, x, y, steps);
+						else
+							pcb_message(PCB_MSG_WARNING, "0 degree element rotation/steps used for '%s'/'%d': %s/%s/%s\n", rot, steps, name, pkg, lib);
+					}
+					else {
+						double sina, cosa;
+						ang = -ang;
+						sina = sin(ang / PCB_RAD_TO_DEG);
+						cosa = cos(ang / PCB_RAD_TO_DEG);
+						pcb_subc_rotate(new_subc, x, y, cosa, sina, ang);
+					}
+				}
+				else
+					pcb_message(PCB_MSG_ERROR, "syntax error in element rotation '%s': %s/%s/%s\n", rot, name, pkg, lib);
+			}
+
+			if (back)
+				pcb_subc_change_side(&new_subc, 2 * y - st->pcb->MaxHeight);
+
+			size_bump(st, new_subc->BoundingBox.X2, new_subc->BoundingBox.Y2);
+		}
+	}
+	return 0;
+}
+
+static int eagle_read_plain(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	static const dispatch_t disp[] = { /* possible children of <library> */
+		{"contactref",  eagle_read_contactref},
+		{"wire",        eagle_read_wire},
+		{"arc",         eagle_read_circle}, /* binary format */
+		{"polygon",     eagle_read_poly},
+		{"rectangle",   eagle_read_rect},
+		{"via",         eagle_read_via},
+		{"circle",      eagle_read_circle},
+		{"text",        eagle_read_text},
+		{"hole",        eagle_read_hole},
+		{"dimension",   eagle_read_nop},
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+
+#warning TODO: test (should process these probably no-net-no-signal objects)
+	return eagle_foreach_dispatch(st, CHILDREN(subtree), disp, NULL, ON_BOARD);
+}
+
+static int eagle_read_board(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	static const dispatch_t disp[] = { /* possible children of <board> */
+		{"plain",       eagle_read_plain},
+		{"libraries",   eagle_read_libs},
+		{"attributes",  eagle_read_nop},
+		{"variantdefs", eagle_read_nop},
+		{"classes",     eagle_read_nop},
+		{"description", eagle_read_nop},
+		{"designrules", eagle_read_nop},
+		{"autorouter",  eagle_read_nop},
+		{"elements",    eagle_read_elements},
+		{"signals",     eagle_read_signals},
+		{"errors",      eagle_read_nop},
+		{"@text",       eagle_read_nop},
+		{NULL, NULL}
+	};
+	return eagle_foreach_dispatch(st, CHILDREN(subtree), disp, NULL, 0);
+}
+
+
+static int eagle_read_drawing(read_state_t *st, trnode_t *subtree, void *obj, int type)
+{
+	int res;
+
+	static const dispatch_t disp_1[] = { /* possible children of <drawing> */
+		{"settings",  eagle_read_nop},
+		{"layers",    eagle_read_layers},
+		{"grid",      eagle_read_nop},
+		{"board",     eagle_read_nop},
+		{"library",   eagle_read_nop}, 
+		{"unknown11", eagle_read_nop}, /* TODO: temporary; from the binary tree */
+		{"@text",     eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	static const dispatch_t disp_2[] = { /* possible children of <drawing> */
+		{"settings",  eagle_read_nop},
+		{"layers",    eagle_read_nop},
+		{"grid",      eagle_read_nop},
+		{"board",     eagle_read_board},
+		{"library",   eagle_read_library},
+		{"unknown11", eagle_read_nop}, /* TODO: temporary; from the binary tree */
+		{"@text",     eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	res = eagle_foreach_dispatch(st, CHILDREN(subtree), disp_1, NULL, 0);
+	res |= eagle_foreach_dispatch(st, CHILDREN(subtree), disp_2, NULL, 0);
+	return res;
+}
+
+static int eagle_read_design_rules(read_state_t *st)
+{
+	trnode_t *dr, *n;
+	const char *name;
+
+	/* st->ms_width the default minimum feature width, already defined  */
+	st->rv_pad_top = 0.25;
+	st->rv_pad_inner = 0.25;
+	st->rv_pad_bottom = 0.25;
+	st->md_wire_wire = PCB_MIL_TO_COORD(10); /* default minimum wire to wire spacing */
+
+	dr = eagle_trpath(st, st->parser.root, "drawing", "board", "designrules", NULL);
+	if (dr == NULL) {
+		pcb_message(PCB_MSG_WARNING, "can't find design rules, using sane defaults\n");
+	} else {
+		for(n = CHILDREN(dr); n != NULL; n = NEXT(n)) {
+			if (STRCMP(NODENAME(n), "param") != 0)
+				continue;
+			name = eagle_get_attrs(st, n, "name", NULL);
+			if (strcmp(name, "mdWireWire") == 0) st->md_wire_wire = eagle_get_attrcu(st, n, "value", 0);
+			else if (strcmp(name, "msWidth") == 0) st->ms_width = eagle_get_attrcu(st, n, "value", 0);
+			else if (strcmp(name, "rvPadTop") == 0) st->rv_pad_top = eagle_get_attrd(st, n, "value", 0);
+			else if (strcmp(name, "rvPadInner") == 0) st->rv_pad_inner = eagle_get_attrd(st, n, "value", 0);
+			else if (strcmp(name, "rvPadBottom") == 0) st->rv_pad_bottom = eagle_get_attrd(st, n, "value", 0);
+		}
+		if ((st->rv_pad_top != st->rv_pad_inner) || (st->rv_pad_top != st->rv_pad_inner))
+			pcb_message(PCB_MSG_WARNING, "top/inner/bottom default pad sizes differ - using top size only\n");
+	}
+	return 0;
+}
+
+static int eagle_read_ver(const char *ver)
+{
+	int v1, v2, v3;
+	char *end;
+
+	v3 = 0;
+
+	if (ver == NULL) {
+		pcb_message(PCB_MSG_ERROR, "no version attribute in <eagle>\n");
+		return -1;
+	}
+	v1 = strtol(ver, &end, 10);
+	if (*end != '.') {
+		pcb_message(PCB_MSG_ERROR, "malformed version string [1] in <eagle>\n");
+		return -1;
+	}
+	v2 = strtol(end+1, &end, 10);
+	if (*end != '.' && *end != '\0') {
+		pcb_message(PCB_MSG_ERROR, "malformed version string [2] in <eagle>\n");
+		return -1;
+	} else if (*end == '.') {
+		v3 = strtol(end+1, &end, 10);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "malformed version string [3] in <eagle>\n");
+			return -1;
+		}
+	}
+
+	/* version check */
+	if (v1 < 6) {
+		pcb_message(PCB_MSG_ERROR, "file version too old\n");
+		return -1;
+	}
+	if (v1 > 8) {
+		pcb_message(PCB_MSG_ERROR, "file version too new\n");
+		return -1;
+	}
+	pcb_message(PCB_MSG_DEBUG, "Loading eagle board version %d.%d.%d\n", v1, v2, v3);
+	return 0;
+}
+
+static void st_init(read_state_t *st)
+{
+	htip_init(&st->layers, longhash, longkeyeq);
+	htsp_init(&st->libs, strhash, strkeyeq);
+	pcb_layer_group_setup_default(st->pcb);
+}
+
+static void st_uninit(read_state_t *st)
+{
+	htip_entry_t *ei;
+	htsp_entry_t *es;
+
+	pcb_layergrp_fix_old_outline(st->pcb);
+
+	for (ei = htip_first(&st->layers); ei; ei = htip_next(&st->layers, ei))
+		free(ei->value);
+	htip_uninit(&st->layers);
+
+	for (es = htsp_first(&st->libs); es; es = htsp_next(&st->libs, es)) {
+		htsp_entry_t *e;
+		eagle_library_t *l = es->value;
+		for (e = htsp_first(&l->elems); e; e = htsp_next(&l->elems, e))
+			free(e->value);
+		htsp_uninit(&l->elems);
+		free(l);
+	}
+	htsp_uninit(&st->libs);
+	st->parser.calls->unload(&st->parser);
+}
+
+static int post_process_thermals(read_state_t *st)
+{
+#warning TODO: process thermals
+	PCB_PADSTACK_LOOP(st->pcb->Data);
+	{
+	}
+	PCB_END_LOOP;
+	return 0;
+}
+
+int io_eagle_read_pcb_xml(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, conf_role_t settings_dest)
+{
+	int pp_res, res, old_leni;
+	read_state_t st;
+
+	static const dispatch_t disp[] = { /* possible children of root */
+		{"drawing",        eagle_read_drawing},
+		{"compatibility",  eagle_read_nop},
+		{"@text",          eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	/* have not read design rules section yet but need this for rectangle parsing */
+	st.ms_width = PCB_MIL_TO_COORD(10); /* default minimum feature width */
+
+	st.parser.calls = &trparse_xml_calls;
+
+	if (st.parser.calls->load(&st.parser, Filename) != 0)
+		return -1;
+
+	st.pcb = pcb;
+	st.elem_by_name = 1;
+	st.default_unit = "mm";
+	st_init(&st);
+
+	if (eagle_read_ver(GET_PROP_(&st, st.parser.root, "version")) < 0) {
+		pcb_message(PCB_MSG_ERROR, "Eagle XML version parse error\n");
+		goto err;
+	}
+
+	eagle_read_design_rules(&st);
+	old_leni = pcb_create_being_lenient;
+	pcb_create_being_lenient = 1;
+	res = eagle_foreach_dispatch(&st, st.parser.calls->children(&st.parser, st.parser.root), disp, NULL, 0);
+	if (res == 0)
+		pcb_flip_data(pcb->Data, 0, 1, 0, pcb->MaxHeight, 0);
+	pcb_create_being_lenient = old_leni;
+	pcb_board_normalize(pcb);
+	pcb_layer_colors_from_conf(pcb, 1);
+
+	pp_res = post_process_thermals(&st);
+	st_uninit(&st);
+	return pp_res;
+
+err:;
+	st_uninit(&st);
+	pcb_message(PCB_MSG_ERROR, "Eagle XML parsing error.\n");
+	return -1;
+}
+
+int io_eagle_read_pcb_bin(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, conf_role_t settings_dest)
+{
+	int pp_res, res, old_leni;
+	read_state_t st;
+
+	static const dispatch_t disp_1[] = { /* possible children of root */
+		{"drawing",        eagle_read_nop},
+		{"layers",         eagle_read_layers}, /* trying this */
+		{NULL, NULL}
+	};
+
+
+	static const dispatch_t disp_2[] = { /* possible children of root */
+		{"drawing",        eagle_read_drawing},
+		{"layers",         eagle_read_nop},
+		{NULL, NULL}
+	};
+
+	st.parser.calls = &trparse_bin_calls;
+
+	if (st.parser.calls->load(&st.parser, Filename) != 0) {
+		printf("parser error\n");
+		return -1;
+	}
+
+	st.pcb = pcb;
+	st.elem_by_name = 0;
+	st.default_unit = "du"; /* du = decimicron = 0.1 micron unit for eagle bin format */
+	st_init(&st);
+
+	eagle_read_design_rules(&st);
+
+	old_leni = pcb_create_being_lenient;
+	pcb_create_being_lenient = 1;
+	res = eagle_foreach_dispatch(&st, st.parser.calls->children(&st.parser, st.parser.root), disp_1, NULL, 0);
+	res |= eagle_foreach_dispatch(&st, st.parser.calls->children(&st.parser, st.parser.root), disp_2, NULL, 0);
+	if (res == 0)
+		pcb_flip_data(pcb->Data, 0, 1, 0, pcb->MaxHeight, 0);
+	pcb_create_being_lenient = old_leni;
+	pcb_board_normalize(pcb);
+	pcb_layer_colors_from_conf(pcb, 1);
+
+	pp_res = post_process_thermals(&st);
+	st_uninit(&st);
+	return pp_res;
+}
+
Index: tags/2.0.1/src_plugins/io_eagle/read.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/read.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/read.h	(revision 18980)
@@ -0,0 +1,10 @@
+#include "board.h"
+#include "conf.h"
+#include "plug_io.h"
+
+int io_eagle_test_parse_xml(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_eagle_read_pcb_xml(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+
+int io_eagle_test_parse_bin(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_eagle_read_pcb_bin(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, conf_role_t settings_dest);
+
Index: tags/2.0.1/src_plugins/io_eagle/read_dru.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/read_dru.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/read_dru.c	(revision 18980)
@@ -0,0 +1,235 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <genvector/gds_char.h>
+
+#include "read_dru.h"
+#include "conf_core.h"
+
+int pcb_eagle_dru_test_parse(FILE *f)
+{
+	char buff[256], *s;
+	rewind(f);
+	s = fgets(buff, sizeof(buff)-1, f);
+	rewind(f);
+	buff[sizeof(buff)-1] = '\0';
+
+	if (s == NULL)
+		return 0;
+
+	/* first line is a description */
+	if (strncmp(s, "description", 11) != 0)
+		return 0;
+	s += 11;
+
+	/* it may contain a [lang] suffix */
+	if (*s == '[') {
+		s = strchr(s, ']');
+		if (s == NULL)
+			return 0;
+		s++;
+	}
+
+	/* there may be whitespace */
+	while(isspace(*s)) s++;
+
+	/* and the key/value separator is an '=' */
+	if (*s != '=')
+		return 0;
+
+	return 1;
+}
+
+/* eat up whitespace after the '=' */
+static void eat_up_ws(FILE *f)
+{
+	for(;;) {
+		int c = fgetc(f);
+		if (c == EOF)
+			return;
+		if (!isspace(c)) {
+			ungetc(c, f);
+			return;
+		}
+	}
+}
+
+void pcb_eagle_dru_parse_line(FILE *f, gds_t *buff, char **key, char **value)
+{
+	long n, keyo = -1, valo = -1;
+	gds_truncate(buff, 0);
+	*key = NULL;
+	*value = NULL;
+	for(;;) {
+		int c = fgetc(f);
+		if (c == EOF)
+			break;
+		if ((c == '\r') || (c == '\n')) {
+			if (buff->used == 0) /* ignore leading newlines */
+				continue;
+			break;
+		}
+		if (isspace(c) && (keyo < 0)) /* ignore leading spaces */
+			continue;
+
+		/* have key, don't have val, found sep */
+		if ((keyo >= 0) && (valo < 0) && (c == '=')) {
+			for(n = buff->used-1; n >= 0; n--) {
+				if (!isspace(buff->array[n]))
+					break;
+				buff->array[n] = '\0';
+			}
+			gds_append(buff, '\0');
+			valo = buff->used;
+			eat_up_ws(f);
+		}
+		else
+			gds_append(buff, c);
+
+		/* set key offset */
+		if (keyo < 0)
+			keyo = 0;
+	}
+
+	gds_append(buff, '\0');
+
+	if (keyo >= 0)
+		*key = buff->array + keyo;
+	if (valo >= 0)
+		*value = buff->array + valo;
+}
+
+
+#ifndef PCB_EAGLE_DRU_PARSER_TEST
+
+#include "safe_fs.h"
+#include "board.h"
+#include "layer_grp.h"
+#include "error.h"
+
+int io_eagle_test_parse_dru(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	if (typ != PCB_IOT_PCB)
+		return 0; /* support only boards because DRU can be loaded onto a board only */
+	return pcb_eagle_dru_test_parse(f);
+}
+
+static void bump_up_str(const char *key, const char *val, const char *cpath, pcb_coord_t curr_val)
+{
+	pcb_bool succ;
+	double d;
+
+	d = pcb_get_value(val, NULL, NULL, &succ);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "Invalid coord value for key %s: '%s'\n", key, val);
+		return;
+	}
+	if (d > curr_val)
+		conf_set(CFR_DESIGN, "design/min_drill", -1, val, POL_OVERWRITE);
+}
+
+int io_eagle_read_pcb_dru(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, conf_role_t settings_dest)
+{
+	FILE *f;
+	char *efn;
+	gds_t buff;
+	pcb_layergrp_id_t gid;
+	int n, num_layers = 0;
+	static const char prefix[] = "io_eagle::dru::";
+	char tmp[256];
+
+	f = pcb_fopen_fn(Filename, "r", &efn);
+	if (f == NULL)
+		return -1;
+
+	conf_set(CFR_DESIGN, "design/bloat", -1, "0", POL_OVERWRITE);
+	conf_set(CFR_DESIGN, "design/min_wid", -1, "0", POL_OVERWRITE);
+	conf_set(CFR_DESIGN, "design/min_drill", -1, "0", POL_OVERWRITE);
+
+	memcpy(tmp, prefix, sizeof(prefix));
+
+	gds_init(&buff);
+	while(!(feof(f))) {
+		char *k, *v;
+		pcb_eagle_dru_parse_line(f, &buff, &k, &v);
+		if (k == NULL)
+			continue;
+		if (strcmp(k, "layerSetup") == 0) {
+			v = strchr(v, '*');
+			if (v != NULL) {
+				v++;
+				num_layers = atoi(v);
+			}
+		}
+		else if (strcmp(k, "mdWireWire") == 0)
+			bump_up_str(k, v, "design/bloat", conf_core.design.bloat);
+		else if (strcmp(k, "mdWirePad") == 0)
+			bump_up_str(k, v, "design/bloat", conf_core.design.bloat);
+		else if (strcmp(k, "mdWireVia") == 0)
+			bump_up_str(k, v, "design/bloat", conf_core.design.bloat);
+		else if (strcmp(k, "mdPadPad") == 0)
+			bump_up_str(k, v, "design/bloat", conf_core.design.bloat);
+		else if (strcmp(k, "mdPadVia") == 0)
+			bump_up_str(k, v, "design/bloat", conf_core.design.bloat);
+		else if (strcmp(k, "msWidth") == 0)
+			bump_up_str(k, v, "design/min_wid", conf_core.design.min_wid);
+		else if (strcmp(k, "msDrill") == 0)
+			bump_up_str(k, v, "design/min_drill", conf_core.design.min_drill);
+		else {
+			int len = strlen(k);
+			if (len < sizeof(tmp) - sizeof(prefix)) {
+				memcpy(tmp + sizeof(prefix) - 1, k, len+1);
+				pcb_attribute_put(&pcb->Attributes, tmp, v);
+			}
+		}
+	}
+
+	/* set up layers */
+	pcb_layer_group_setup_default(pcb);
+	if (pcb_layergrp_list(pcb, PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1))
+		pcb_layer_create(pcb, gid, "top_copper");
+	if (pcb_layergrp_list(pcb, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1))
+		pcb_layer_create(pcb, gid, "bottom_copper");
+	num_layers--;
+	for(n = 0; n < num_layers; n++) {
+		pcb_layergrp_t *grp = pcb_get_grp_new_intern(pcb, -1);
+		sprintf(tmp, "signal_%d", n);
+		pcb_layer_create(pcb, grp - pcb->LayerGroups.grp, tmp);
+	}
+	pcb_layer_group_setup_silks(pcb);
+
+	fclose(f);
+	return 0;
+}
+
+
+#endif
Index: tags/2.0.1/src_plugins/io_eagle/read_dru.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/read_dru.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/read_dru.h	(revision 18980)
@@ -0,0 +1,23 @@
+#ifndef PCB_IO_EAGLE_READ_DRU_H
+#define PCB_IO_EAGLE_READ_DRU_H
+
+#include <genvector/gds_char.h>
+#include <stdio.h>
+
+#ifndef PCB_EAGLE_DRU_PARSER_TEST
+#include "plug_io.h"
+int io_eagle_test_parse_dru(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_eagle_read_pcb_dru(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *Filename, conf_role_t settings_dest);
+#endif
+
+/*** low level ***/
+
+/* Read the first bytes of a file (and rewind) to determine if the file is
+   an eagle dru file; returns 1 if it is, 0 if not. */
+int pcb_eagle_dru_test_parse(FILE *f);
+
+/* Load the next item from the dru and set key and value to point to the
+   corresponding fields within the buff (or NULL if not present). */
+void pcb_eagle_dru_parse_line(FILE *f, gds_t *buff, char **key, char **value);
+
+#endif
Index: tags/2.0.1/src_plugins/io_eagle/trparse.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/trparse.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/trparse.h	(revision 18980)
@@ -0,0 +1,33 @@
+#ifndef PCB_TRPARSE_H
+#define PCB_TRPARSE_H
+
+typedef void trnode_t;
+typedef struct trparse_s trparse_t;
+
+typedef struct trparse_calls_s {
+	int (*load)(trparse_t *pst, const char *fn);
+	int (*unload)(trparse_t *pst);
+
+	trnode_t *(*parent)(trparse_t *pst, trnode_t *node);
+	trnode_t *(*children)(trparse_t *pst, trnode_t *node);
+	trnode_t *(*next)(trparse_t *pst, trnode_t *node);
+
+	const char *(*nodename)(trnode_t *node);
+	const char *(*prop)(trparse_t *pst, trnode_t *node, const char *key);
+	const char *(*text)(trparse_t *pst, trnode_t *node);
+
+	int (*str_cmp)(const char *s1, const char *s2);
+	int (*is_text)(trparse_t *pst, trnode_t *node);
+
+	void *(*get_user_data)(trnode_t *node);
+	void (*set_user_data)(trnode_t *node, void *data);
+} trparse_calls_t;
+
+
+struct trparse_s {
+	void *doc;
+	trnode_t *root;
+	const trparse_calls_t *calls;
+};
+
+#endif
Index: tags/2.0.1/src_plugins/io_eagle/trparse_bin.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/trparse_bin.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/trparse_bin.c	(revision 18980)
@@ -0,0 +1,147 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "error.h"
+#include "safe_fs.h"
+#include "egb_tree.h"
+#include "eagle_bin.h"
+
+#include "trparse.h"
+#include "trparse_bin.h"
+
+static int eagle_bin_load(trparse_t *pst, const char *fn)
+{
+	egb_node_t *root;
+	FILE *f;
+	int res;
+
+	f = pcb_fopen(fn, "rb");
+	if (f == NULL)
+		return -1;
+
+	res = pcb_egle_bin_load(NULL, f, fn, &root);
+
+	fclose(f);
+
+/*
+	printf("@@@ eagle_bin_tree @@@\n");
+	egb_dump(stdout, root);
+*/
+
+	if (res != 0) {
+		printf("FAILED TO LOAD: %d\n", res);
+		return -1;
+	}
+
+	pst->doc = NULL;
+	pst->root = root;
+
+	return 0;
+}
+
+static int eagle_bin_unload(trparse_t *pst)
+{
+	egb_node_free(pst->root);
+	return 0;
+}
+
+static trnode_t *eagle_bin_parent(trparse_t *pst, trnode_t *node)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return (trnode_t *)nd->parent;
+}
+
+static trnode_t *eagle_bin_children(trparse_t *pst, trnode_t *node)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return (trnode_t *)nd->first_child;
+}
+
+static trnode_t *eagle_bin_next(trparse_t *pst, trnode_t *node)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return (trnode_t *)nd->next;
+}
+
+const char *eagle_bin_nodename(trnode_t *node)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return (const char *)nd->id_name;
+}
+
+static const char *eagle_bin_prop(trparse_t *pst, trnode_t *node, const char *key)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return egb_node_prop_get(nd, key);
+}
+
+static const char *eagle_bin_text(trparse_t *pst, trnode_t *node)
+{
+	/*egb_node_t *nd = (egb_node_t *)node;*/
+#warning TODO
+	return NULL;
+}
+
+static int eagle_bin_is_text(trparse_t *pst, trnode_t *node)
+{
+#warning TODO
+	return 0;
+}
+
+static void *eagle_bin_get_user_data(trnode_t *node)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	return nd->user_data;
+}
+
+static void eagle_bin_set_user_data(trnode_t *node, void *data)
+{
+	egb_node_t *nd = (egb_node_t *)node;
+	nd->user_data = data;
+}
+
+
+trparse_calls_t trparse_bin_calls = {
+	eagle_bin_load,
+	eagle_bin_unload,
+	eagle_bin_parent,
+	eagle_bin_children,
+	eagle_bin_next,
+	eagle_bin_nodename,
+	eagle_bin_prop,
+	eagle_bin_text,
+	strcmp,
+	eagle_bin_is_text,
+	eagle_bin_get_user_data,
+	eagle_bin_set_user_data
+};
Index: tags/2.0.1/src_plugins/io_eagle/trparse_bin.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/trparse_bin.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/trparse_bin.h	(revision 18980)
@@ -0,0 +1,7 @@
+#ifndef PCB_TRPARSE_BIN_H
+#define PCB_TRPARSE_BIN_H
+
+#include "trparse.h"
+extern trparse_calls_t trparse_bin_calls;
+
+#endif
Index: tags/2.0.1/src_plugins/io_eagle/trparse_xml.c
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/trparse_xml.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/trparse_xml.c	(revision 18980)
@@ -0,0 +1,153 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <assert.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+
+#include "error.h"
+#include "safe_fs.h"
+
+#include "trparse.h"
+#include "trparse_xml.h"
+
+static int eagle_xml_load(trparse_t *pst, const char *fn)
+{
+	xmlDoc *doc;
+	xmlNode *root;
+	FILE *f;
+	char *efn;
+
+	f = pcb_fopen_fn(fn, "r", &efn);
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open '%s'\n", fn);
+		return -1;
+	}
+
+	doc = xmlReadFile(efn, NULL, 0);
+	if (doc == NULL) {
+		pcb_message(PCB_MSG_ERROR, "xml parsing error on file %s (%s)\n", fn, efn);
+		free(efn);
+		return -1;
+	}
+	free(efn);
+
+	root = xmlDocGetRootElement(doc);
+	if (xmlStrcmp(root->name, (xmlChar *)"eagle") != 0) {
+		pcb_message(PCB_MSG_ERROR, "xml error: root is not <eagle>\n");
+		xmlFreeDoc(doc);
+		return -1;
+	}
+
+	pst->doc = doc;
+	pst->root = root;
+
+	return 0;
+}
+
+static int eagle_xml_unload(trparse_t *pst)
+{
+	xmlFreeDoc((xmlDoc *)pst->doc);
+	return 0;
+}
+
+static trnode_t *eagle_xml_children(trparse_t *pst, trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (trnode_t *)nd->children;
+}
+
+static trnode_t *eagle_xml_parent(trparse_t *pst, trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (trnode_t *)nd->parent;
+}
+
+static trnode_t *eagle_xml_next(trparse_t *pst, trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (trnode_t *)nd->next;
+}
+
+const char *eagle_xml_nodename(trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (const char *)nd->name;
+}
+
+static const char *eagle_xml_prop(trparse_t *pst, trnode_t *node, const char *key)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (const char *)xmlGetProp(nd, (const xmlChar *)key);
+}
+
+static const char *eagle_xml_text(trparse_t *pst, trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return (const char *)nd->content;
+}
+
+static int eagle_xml_strcmp(const char *s1, const char *s2)
+{
+	return xmlStrcmp((const xmlChar *)s1, (const xmlChar *)s2);
+}
+
+static int eagle_xml_is_text(trparse_t *pst, trnode_t *node)
+{
+	return ((xmlNode *)node)->type == XML_TEXT_NODE;
+}
+
+static void *eagle_xml_get_user_data(trnode_t *node)
+{
+	xmlNode *nd = (xmlNode *)node;
+	return nd->_private;
+}
+
+static void eagle_xml_set_user_data(trnode_t *node, void *data)
+{
+	xmlNode *nd = (xmlNode *)node;
+	nd->_private = data;
+}
+
+
+trparse_calls_t trparse_xml_calls = {
+	eagle_xml_load,
+	eagle_xml_unload,
+	eagle_xml_parent,
+	eagle_xml_children,
+	eagle_xml_next,
+	eagle_xml_nodename,
+	eagle_xml_prop,
+	eagle_xml_text,
+	eagle_xml_strcmp,
+	eagle_xml_is_text,
+	eagle_xml_get_user_data,
+	eagle_xml_set_user_data
+};
Index: tags/2.0.1/src_plugins/io_eagle/trparse_xml.h
===================================================================
--- tags/2.0.1/src_plugins/io_eagle/trparse_xml.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_eagle/trparse_xml.h	(revision 18980)
@@ -0,0 +1,7 @@
+#ifndef PCB_TRPARSE_XML_H
+#define PCB_TRPARSE_XML_H
+
+#include "trparse.h"
+extern trparse_calls_t trparse_xml_calls;
+
+#endif
Index: tags/2.0.1/src_plugins/io_hyp/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/Makefile	(revision 18980)
@@ -0,0 +1,10 @@
+all:
+	cd ../../src && $(MAKE) mod_io_hyp
+
+hyp_l.o: hyp_y.h
+
+parser.o: hyp_l.h hyp_y.h
+
+clean:
+	rm *.o *.so hyp_l.c hyp_l.h hyp_y.c hyp_y.h 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/io_hyp/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+put /local/pcb/mod {io_hyp}
+
+append /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/io_hyp/io_hyp.o
+	$(PLUGDIR)/io_hyp/hyp_l.o
+	$(PLUGDIR)/io_hyp/hyp_y.o
+	$(PLUGDIR)/io_hyp/parser.o
+	$(PLUGDIR)/io_hyp/write.o
+@]
+
+put /local/pcb/mod/YACC {$(PLUGDIR)/io_hyp/hyp_y}
+put /local/pcb/mod/LEX  {$(PLUGDIR)/io_hyp/hyp_l}
+
+
+switch /local/pcb/io_hyp/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_hyp/hacking.txt
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hacking.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hacking.txt	(revision 18980)
@@ -0,0 +1,21 @@
+The hyperlynx file is read using a bison/flex scanner. The flex scanner
+is in hyp_l, the bison parser in hyp_y.y.  For each hyperlynx construct
+the parser calls the corresponding exec_* routine in parser.c. Example:
+if the parser encounters an arc segment, the symbol in the scanner/parser
+is H_ARC, and the routine in parser.c is called exec_arc().
+
+If you need a rough description of the hyperlynx format, download
+"bird33" from http://www.ibis.org/birds/bird33.txt . Substitute ".IBP
+file format" with ".HYP file format" and "SUBSTRATE_OUTLINE" with "BOARD"
+and you have an (old) description of the hyperlynx format.
+
+Not all CAD programs create compliant .hyp files. The most common
+omission is not putting quotes around a string. This causes problems if
+the string contains blank space or commas.
+
+If you change scanner or parser you need to revalidate. Try loading a
+collection of hyperlynx files generated by diverse CAD programs.
+
+The python script "gensamp" creates a sample hyperlynx file which
+contains line, arc and unrouted segments, polygons with and without
+holes, polylines, etc.
Index: tags/2.0.1/src_plugins/io_hyp/hyp_l.c
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_l.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_l.c	(revision 18980)
@@ -0,0 +1,4529 @@
+#line 2 "hyp_l.c"
+
+#line 4 "hyp_l.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+/* %not-for-header */
+
+/* %if-c-only */
+/* %if-not-reentrant */
+#define yy_create_buffer hyy_create_buffer
+#define yy_delete_buffer hyy_delete_buffer
+#define yy_flex_debug hyy_flex_debug
+#define yy_init_buffer hyy_init_buffer
+#define yy_flush_buffer hyy_flush_buffer
+#define yy_load_buffer_state hyy_load_buffer_state
+#define yy_switch_to_buffer hyy_switch_to_buffer
+#define yyin hyyin
+#define yyleng hyyleng
+#define yylex hyylex
+#define yylineno hyylineno
+#define yyout hyyout
+#define yyrestart hyyrestart
+#define yytext hyytext
+#define yywrap hyywrap
+#define yyalloc hyyalloc
+#define yyrealloc hyyrealloc
+#define yyfree hyyfree
+
+/* %endif */
+/* %endif */
+/* %ok-for-header */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* %if-c++-only */
+/* %endif */
+
+/* %if-c-only */
+    
+/* %endif */
+
+/* %if-c-only */
+
+/* %endif */
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+/* %if-c-only */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+/* %endif */
+
+/* %if-tables-serialization */
+/* %endif */
+/* end standard C headers. */
+
+/* %if-c-or-c++ */
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* %not-for-header */
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+/* %ok-for-header */
+
+/* %not-for-header */
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+/* %ok-for-header */
+
+/* %if-reentrant */
+/* %endif */
+
+/* %if-not-reentrant */
+
+/* %endif */
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE hyyrestart(hyyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+/* %if-not-reentrant */
+extern int hyyleng;
+/* %endif */
+
+/* %if-c-only */
+/* %if-not-reentrant */
+extern FILE *hyyin, *hyyout;
+/* %endif */
+/* %endif */
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE hyylex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-hyylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < hyyleng; ++yyl )\
+                    if ( hyytext[yyl] == '\n' )\
+                        --hyylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up hyytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up hyytext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+/* %if-c-only */
+	FILE *yy_input_file;
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via hyyrestart()), so that the user can continue scanning by
+	 * just pointing hyyin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+/* %if-not-reentrant */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+/* %endif */
+/* %ok-for-header */
+
+/* %endif */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* %if-c-only Standard (non-C++) definition */
+
+/* %if-not-reentrant */
+/* %not-for-header */
+
+/* yy_hold_char holds the character lost when hyytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int hyyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow hyywrap()'s to do buffer switches
+ * instead of setting up a fresh hyyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+/* %ok-for-header */
+
+/* %endif */
+
+void hyyrestart (FILE *input_file  );
+void hyy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE hyy_create_buffer (FILE *file,int size  );
+void hyy_delete_buffer (YY_BUFFER_STATE b  );
+void hyy_flush_buffer (YY_BUFFER_STATE b  );
+void hyypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void hyypop_buffer_state (void );
+
+static void hyyensure_buffer_stack (void );
+static void hyy_load_buffer_state (void );
+static void hyy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER hyy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE hyy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE hyy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,int len  );
+
+/* %endif */
+
+void *hyyalloc (yy_size_t  );
+void *hyyrealloc (void *,yy_size_t  );
+void hyyfree (void *  );
+
+#define yy_new_buffer hyy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        hyyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            hyy_create_buffer(hyyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        hyyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            hyy_create_buffer(hyyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* %% [1.0] hyytext/hyyin/hyyout/yy_state_type/hyylineno etc. def's & init go here */
+/* Begin user sect3 */
+
+#define hyywrap(n) 1
+#define YY_SKIP_YYWRAP
+
+#define FLEX_DEBUG
+
+typedef unsigned char YY_CHAR;
+
+FILE *hyyin = (FILE *) 0, *hyyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int hyylineno;
+
+int hyylineno = 1;
+
+extern char *hyytext;
+#define yytext_ptr hyytext
+
+/* %if-c-only Standard (non-C++) definition */
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* %endif */
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up hyytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+/* %% [2.0] code to fiddle hyytext and hyyleng for yymore() goes here \ */\
+	hyyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+/* %% [3.0] code to copy yytext_ptr to hyytext[] goes here, if %array \ */\
+	(yy_c_buf_p) = yy_cp;
+
+/* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
+#define YY_NUM_RULES 138
+#define YY_END_OF_BUFFER 139
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_acclist[861] =
+    {   0,
+        1,    1,  139,  135,  137,  138,    4,  137,  138,    5,
+      138,    5,  137,  138,  137,  138,  131,  137,  138,  132,
+      137,  138,  135,  137,  138,  133,  135,  137,  138,  135,
+      137,  138,  108,  135,  137,  138,  134,  137,  138,   20,
+      135,  137,  138,  135,  137,  138,  135,  137,  138,  135,
+      137,  138,  135,  137,  138,  135,  137,  138,  135,  137,
+      138,  135,  137,  138,  135,  137,  138,   30,  135,  137,
+      138,   31,  135,  137,  138,  135,  137,  138,  135,  137,
+      138,  135,  137,  138,   42,  135,  137,  138,   43,  135,
+      137,  138,  135,  137,  138,  135,  137,  138,  135,  137,
+
+      138,  135,  137,  138,  135,  137,  138,  135,  137,  138,
+      135,  137,  138,  135,  137,  138,  129,  137,  138,  130,
+      137,  138,  135,  137,  138,  128,  135,  137,  138,    4,
+      137,  138,    4,  128,  137,  138,  127,  132,  137,  138,
+      128,  133,  135,  137,  138,  127,  130,  137,  138,  128,
+      135,  137,  138,  126,  135,  137,  138,  135,  137,  138,
+      135,  137,  138,  125,  135,  137,  138,    1,  135,  137,
+      138,    1,    4,  137,  138,    1,    5,  138,    1,    5,
+      137,  138,    1,  137,  138,    1,  131,  137,  138,    1,
+      132,  137,  138,    1,  133,  135,  137,  138,    1,  134,
+
+      137,  138,    1,  129,  137,  138,    1,  135,  137,  138,
+      135,  137,  138,    4,  137,  138,    2,    5,  138,    2,
+        5,  137,  138,  137,  138,  131,  137,  138,  132,  137,
+      138,  133,  135,  137,  138,  134,  137,  138,  129,  137,
+      138,  130,  137,  138,  135,  137,  138,  135,    4,    5,
+      136,  135,  108,  135,  108,  135,  108,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,   53,  135,  135,
+      135,   57,  135,  135,  135,   60,  135,  135,  135,  135,
+      135,   62,  135,  135,  135,  135,   64,  135,  135,  135,
+
+      135,   69,  135,   70,  135,  135,  107,  135,  135,   72,
+      135,  135,  135,  135,  135,  135,  135,  135,   76,  135,
+      135,  135,   78,  135,  135,  135,  135,  135,  135,   87,
+      135,  135,  135,   90,  135,  135,  135,  135,   93,  135,
+      135,  135,   94,  135,  135,  135,   98,  135,  135,  102,
+      135,  135,  135,  135,    3,  128,  135,  128,  128,    4,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  135,
+      128,  126,  135,  135,  125,  135,  125,  135,  125,  135,
+      135,    1,  135,    1,    1,    4,    1,    5,    1,    1,
+
+      136,    1,    1,  135,    1,    1,    3,  135,    2,    4,
+        2,    5,    2,  136,  135,    2,    3,  135,  108,  135,
+      111,  135,  108,  135,  135,  121,  135,  114,  135,  116,
+      135,  115,  135,  119,  135,  112,  120,  135,  113,  135,
+      118,  135,  109,  135,  110,  135,  122,  135,  117,  135,
+      120,  135,  124,  135,  123,  135,   54,   55,   21,  135,
+      135,   56,   58,  135,  135,  135,  135,  135,  135,  135,
+       18,  135,  135,   61,   63,   19,  135,   65,   66,  135,
+      135,  135,   68,  135,  135,   16,  135,  135,   33,  135,
+      135,   36,  135,  135,  135,  135,  135,  135,   75,  135,
+
+       81,  135,  135,   84,  135,  135,   44,  135,  135,  135,
+      135,  135,   79,   80,   88,  135,  135,   91,  135,  135,
+       51,  135,  135,   95,   96,   97,   99,  100,  101,  106,
+      135,  103,  135,  105,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  127,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  125,  135,  135,  125,  135,    1,  135,  135,  135,
+      135,   59,  135,  135,  135,  135,  135,  135,  135,  135,
+
+       28,  135,   67,  135,  135,  135,  135,  135,  135,   73,
+      135,  135,   41,  135,   74,   77,   82,   83,   85,   86,
+      135,  135,  135,  135,  135,  135,   50,  135,  135,   92,
+      135,  135,  135,  128,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+       11,  135,  135,   23,  135,  135,  135,  135,  135,  135,
+      135,  135,   71,  135,  135,  135,  135,   37,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,    9,
+      135,  135,  135,  135,  104,  128,  128,  128,  128,  128,
+
+      128,  128,  135,   22,  135,  135,  135,  135,  135,  135,
+       27,  135,   29,  135,  135,  135,  135,  135,  135,  135,
+      135,  135,   45,  135,  135,  135,   48,  135,  135,  135,
+      135,  135,  135,   52,  135,  128,  128,  128,  135,  135,
+      135,   13,  135,  135,   26,  135,  135,   32,  135,  135,
+      135,  135,   38,  135,  135,  135,  135,  135,   49,  135,
+       12,  135,  135,  135,    7,  135,  128,  128,  128,  135,
+      135,   24,  135,  135,  135,   15,  135,  135,  135,   39,
+      135,   40,  135,  135,   47,  135,   14,  135,  135,  128,
+      128,  128,  135,    8,  135,  135,   17,  135,  135,   10,
+
+      135,  135,  135,  128,  128,  128,    6,  135,   25,  135,
+      135,   46,  135,  135,  128,  128,  128,  135,  135,  135,
+      128,  128,  128,  135,  135,  135,  128,  128,  128,   34,
+      135,  135,  135,  128,  128,  128,  135,  135,  128,  128,
+      128,  135,  135,  128,  128,  128,  135,  135,  128,  128,
+      128,   35,  135,  135,  128,  128,  128,   89,  128,  128
+    } ;
+
+static yyconst flex_int16_t yy_accept[771] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        3,    3,    3,    4,    7,   10,   12,   15,   17,   20,
+       23,   26,   30,   33,   37,   40,   44,   47,   50,   53,
+       56,   59,   62,   65,   68,   72,   76,   79,   82,   85,
+       89,   93,   96,   99,  102,  105,  108,  111,  114,  117,
+      120,  123,  126,  130,  133,  137,  141,  146,  150,  154,
+      158,  161,  164,  168,  172,  176,  179,  183,  186,  190,
+      194,  199,  203,  207,  211,  214,  217,  220,  224,  226,
+      229,  232,  236,  239,  242,  245,  248,  249,  250,  251,
+      251,  252,  252,  253,  255,  257,  257,  259,  260,  261,
+
+      262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+      272,  273,  274,  275,  276,  276,  277,  278,  279,  280,
+      281,  282,  282,  283,  284,  285,  286,  286,  287,  288,
+      289,  290,  291,  292,  292,  293,  294,  295,  295,  296,
+      297,  298,  299,  300,  301,  302,  302,  303,  304,  304,
+      305,  306,  307,  309,  310,  310,  311,  312,  313,  314,
+      315,  316,  317,  318,  319,  319,  320,  321,  321,  322,
+      323,  324,  325,  326,  327,  328,  329,  330,  330,  331,
+      332,  333,  334,  334,  335,  336,  337,  338,  339,  339,
+      340,  341,  341,  342,  343,  344,  345,  345,  346,  347,
+
+      348,  349,  350,  350,  351,  352,  353,  354,  355,  355,
+      356,  358,  359,  359,  359,  359,  359,  359,  359,  359,
+      359,  359,  359,  359,  359,  359,  359,  359,  359,  359,
+      360,  362,  363,  364,  365,  366,  367,  368,  369,  370,
+      371,  372,  373,  374,  375,  376,  377,  378,  379,  381,
+      382,  384,  385,  387,  389,  391,  392,  394,  395,  397,
+      399,  400,  402,  403,  405,  406,  408,  409,  409,  410,
+      411,  413,  413,  414,  415,  415,  416,  416,  418,  419,
+      419,  419,  419,  419,  419,  419,  419,  419,  419,  419,
+      419,  419,  419,  419,  419,  419,  421,  422,  423,  425,
+
+      426,  427,  428,  429,  430,  431,  432,  433,  434,  435,
+      436,  438,  439,  440,  441,  442,  443,  444,  445,  446,
+      447,  448,  449,  450,  451,  452,  453,  454,  455,  456,
+      457,  457,  458,  458,  459,  461,  462,  462,  463,  463,
+      464,  465,  466,  467,  468,  469,  470,  471,  473,  474,
+      474,  475,  475,  476,  478,  478,  479,  479,  480,  481,
+      482,  483,  483,  484,  485,  486,  488,  489,  491,  492,
+      494,  495,  496,  497,  498,  499,  499,  500,  501,  501,
+      502,  503,  504,  504,  505,  506,  507,  509,  510,  511,
+      512,  513,  513,  514,  514,  515,  515,  516,  517,  518,
+
+      518,  519,  520,  521,  523,  524,  524,  525,  525,  526,
+      526,  527,  527,  528,  528,  529,  529,  530,  532,  532,
+      533,  534,  534,  535,  536,  537,  538,  539,  540,  541,
+      542,  543,  544,  545,  546,  547,  548,  549,  550,  551,
+      552,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  554,  555,  556,  557,  558,  559,  560,
+      561,  562,  563,  564,  565,  566,  567,  568,  569,  570,
+      571,  572,  573,  574,  575,  576,  577,  578,  579,  580,
+      581,  582,  584,  585,  587,  589,  590,  590,  590,  590,
+      590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
+
+      590,  590,  590,  591,  592,  592,  593,  594,  595,  596,
+      597,  598,  599,  600,  601,  603,  603,  604,  605,  606,
+      607,  608,  609,  610,  610,  611,  612,  613,  615,  615,
+      616,  616,  617,  617,  618,  618,  619,  619,  620,  620,
+      621,  622,  623,  624,  625,  626,  627,  629,  630,  630,
+      631,  632,  633,  634,  635,  636,  637,  638,  639,  640,
+      641,  642,  643,  644,  645,  646,  646,  646,  646,  647,
+      648,  649,  650,  651,  652,  653,  654,  655,  656,  657,
+      658,  659,  660,  661,  663,  664,  666,  667,  668,  669,
+      670,  671,  672,  673,  673,  674,  675,  676,  677,  678,
+
+      680,  681,  682,  683,  684,  685,  686,  687,  688,  689,
+      690,  692,  693,  694,  695,  695,  696,  697,  698,  699,
+      699,  700,  701,  702,  703,  704,  706,  707,  708,  709,
+      710,  711,  713,  715,  716,  717,  718,  719,  720,  721,
+      722,  723,  725,  726,  727,  729,  730,  731,  732,  733,
+      734,  736,  737,  737,  738,  739,  740,  741,  742,  744,
+      745,  747,  748,  750,  751,  752,  753,  755,  756,  757,
+      758,  759,  761,  763,  764,  765,  767,  768,  768,  769,
+      770,  771,  772,  774,  775,  776,  778,  779,  780,  782,
+      784,  785,  787,  789,  790,  791,  791,  792,  793,  794,
+
+      796,  797,  799,  800,  802,  803,  804,  805,  805,  806,
+      807,  809,  811,  812,  814,  815,  816,  816,  817,  818,
+      819,  820,  821,  822,  822,  823,  824,  825,  826,  827,
+      828,  828,  829,  830,  832,  833,  834,  835,  835,  836,
+      837,  838,  839,  840,  840,  841,  842,  843,  844,  845,
+      845,  846,  847,  848,  849,  850,  850,  851,  852,  854,
+      855,  856,  856,  857,  858,  858,  859,  860,  861,  861
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        2,    2,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    5,    1,    6,    1,    1,    1,    1,    1,    7,
+        8,    9,   10,   11,   10,   12,    1,   13,   14,   15,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
+       16,    1,   17,    1,   18,   19,   20,   21,   22,   23,
+       24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
+       27,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+        1,    1,    1,    1,   43,    1,   44,   27,   27,   27,
+
+       45,   46,   27,   27,   27,   27,   47,   27,   48,   49,
+       50,   51,   27,   27,   52,   27,   53,   27,   27,   27,
+       54,   55,   56,    1,   57,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[58] =
+    {   0,
+        1,    2,    3,    4,    5,    4,    4,    4,    1,    1,
+        1,    1,    6,    6,    6,    7,    1,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    1,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    4,    9
+    } ;
+
+static yyconst flex_int16_t yy_base[876] =
+    {   0,
+        0, 1927,   56,  112,  168,  224,   56,   63,  280,  336,
+      392,  448, 1935,    0,   77,   77,   80, 1928,    0, 4391,
+       73,    0,   76,  505, 4391,   90,   62,  120,  124,   66,
+      125, 1912, 1910,  559,  129,  175, 1898,  594,  133,  628,
+      142,   67,  183,  190,  239,  246,  218, 1880, 1884, 4391,
+     4391,  668, 1923,  724,  766, 4391, 1922, 4391,  820,   94,
+      151,  146,  257,  876,  151,  107,  129,  207,  932,    0,
+      987,    0,    0, 1042, 1098,  212,  183,  186,  215, 1155,
+      199, 1211,  239,  242,  246, 1267,    0,  206,  270, 1920,
+     1919, 1916,  262,    0,  280, 1323,  285, 1378, 1421, 1464,
+
+     1507, 1550, 1593, 1636, 1679, 1722, 1765, 1808, 1851,  291,
+     1894, 1937, 1980, 2023,  305,  306,  307, 4391, 1903, 1904,
+      311,  312, 4391,  313,  161, 1887,  330, 4391, 1884,   63,
+     1897,  309,  346,  348, 4391,  352, 1877,  353,  354,  358,
+     4391, 1886, 1885, 1880,  370,  371, 4391, 1878,  375, 4391,
+     1883, 1876,    0, 1874,  399, 4391, 1881, 1867, 1869, 1874,
+     1879,  167, 1876,  400,  404, 4391, 1869,  405,  420,  422,
+     4391, 1867,  124, 1872, 1856,  412,  421,  427, 4391,  428,
+     1862, 1865,  429, 4391,  463, 1857, 1851, 1866,  464, 4391,
+     1857,  465,  469,  470, 4391,  471,  486,  487,  492, 4391,
+
+      493, 1847,  560, 4391,  561,  566, 1829, 2065,  286,  316,
+     1875, 2122,  310, 1845,  349, 1862, 1843, 1855,  564,  240,
+      355,  345,  573,  123, 1840,  395,  426,  587,  461, 2160,
+      329,  468, 1840,  574, 1857, 1838, 1850,  603,  247,  570,
+      362,  637,  419, 1835,  495,  641,  665,  592, 2201, 2258,
+      632,  645,  674,  677,  687,  693, 2314,    0,  377,  415,
+      660, 1863, 2370, 2425,  637,  566, 2481,  590,  621,  708,
+      631,  712,  717,  724, 2538, 2594,  634,  645, 4391,  383,
+      491,  693,  729,  731,  733,  735,  746,  747,  767,  768,
+      827,  828,  829,  833,  835, 2651,  837,  830,  840, 2706,
+
+      844, 2749,  845, 2792,  846, 2835,  854, 2878,  855, 2921,
+      856, 2964,  861, 3007,  862, 3050,  863, 3093,  867, 3136,
+      868, 3179,  869, 3222,  884, 3265,  885, 3308,  886, 3351,
+      891, 4391,  892, 4391,    0, 1833,  893, 4391,  897, 4391,
+      898, 1826, 1820, 1839, 1837, 1828, 1821,    0, 1820,  899,
+     4391,  914, 4391,    0,  915, 4391,  945, 4391, 1824, 1825,
+      949,  950, 4391, 1812, 1823, 1801, 1817, 1807, 1815,    0,
+      951, 1809, 1798, 1804,  955,  957, 4391,  967,  980, 4391,
+      982,  995,  997, 4391,  999, 1003,    0, 1806,   60, 1816,
+     1802, 1004, 4391, 1005, 4391, 1012, 4391, 1798,  881, 1020,
+
+     4391, 1021, 1798,    0, 1808, 1022, 4391, 1037, 4391, 1049,
+     4391, 1050, 4391, 1054, 4391, 1055, 4391,    0, 1059, 4391,
+     1800, 1067, 4391,  907, 1057, 1062,  262, 1058,  958, 1102,
+     1013, 1092, 1071, 1107,  677, 1080, 1072, 1114, 1126, 1163,
+     4391, 1813, 1794, 1798, 1803, 1809, 1801, 1000, 1070, 1794,
+     1786,  593, 1108, 1134, 1079, 1127, 1128, 1165, 1168, 1180,
+     1171, 1170, 1173, 3393, 3449,  911, 1190,  690, 1209, 1214,
+      944, 1176, 1217,  896, 1219, 1186, 1222, 1232, 1794, 1792,
+     1225, 1263, 1019, 1067,    0,  925,  976, 1147, 1172, 1178,
+     1239, 1251, 1253, 1260, 1261, 1277, 1279, 1284, 1285, 1286,
+
+     1290, 1291, 3506, 1790, 1295, 4391, 1785, 1784, 1762, 1778,
+     1783, 1780, 1775, 1763,    0, 1296, 4391, 1772, 1297, 1777,
+     1764, 1759, 1764, 1301, 4391, 1771, 1280,    0, 1305, 4391,
+     1314, 4391, 1324, 4391, 1332, 4391, 1333, 4391, 1334, 4391,
+     1774, 1762, 1301, 1762, 1760, 1753,    0, 1762, 1339, 4391,
+     1755, 1748, 1380, 4391, 1326, 1368, 1370, 1389, 1392, 1394,
+     1399, 1402, 1432, 1352, 1436, 1742, 1720, 1731, 1439, 1289,
+     1396, 1133, 1468, 1435, 1472, 1475, 1478, 1482, 1405, 1486,
+     1514, 1517, 1300, 1716, 1718,    0, 1696, 1689, 1681, 1682,
+     1665, 1660, 1658, 1409, 4391, 1644, 1641, 1652, 1646, 1609,
+
+     1610, 1614, 1603, 1605, 1607, 1595, 1594, 1582, 1581, 1575,
+        0, 1570, 1560, 1530, 1451, 4391, 1518, 1498, 1537, 1526,
+     1533, 1555, 1529, 1542, 1516,    0, 1503, 1491, 1476, 1474,
+     1481,    0,    0, 1462, 1437, 1448, 1427, 1427, 1428, 1416,
+     1403,    0, 1405, 1388,    0, 1380, 1373, 1380, 1376, 1335,
+        0, 1569, 1337, 1499, 1565, 1336, 1340, 1337,    0, 1318,
+        0, 1245,    0, 1233, 1226, 1220,    0, 1204, 1189, 1177,
+     1172,    0,    0, 1147, 1110,    0, 1571, 1046, 1595, 1598,
+     1006, 1008,    0,  986,  951,    0,  942,  937,    0,    0,
+      946,    0,    0,  941, 1604,  915, 1532, 1607,  924,    0,
+
+      886,    0,  832,    0,  831,  809, 1573,  759, 1638, 1616,
+        0,    0,  549,    0,  740, 1639,  724, 1583, 1568,  707,
+      717,  671, 1651,  649, 1623, 1650,  647,  638,  602, 1653,
+      584, 1655, 1661,    0,  581,  550, 1658,  491, 1681, 1698,
+      479,  463, 1699,  327, 1694, 1691,  272,  234, 1703,  200,
+      442, 1728,  186,  169, 1704,  149, 1712, 1732,    0, 1455,
+     1733,   45, 1740, 1739, 1756, 4391, 1755, 1771, 4391, 3549,
+     3558, 3567, 3576, 3585, 3593, 3597, 3605, 3614, 3622, 3631,
+     3639, 3647, 3656, 3664, 3673, 3682, 3691, 3700, 3709, 3718,
+     3726, 3734, 3742, 3750, 3758, 3766, 3774, 3782, 3790, 3798,
+
+     3806, 3814, 3822, 3830, 3838, 3846, 3855, 3864, 3873, 3881,
+     3889, 3898, 3906, 3915, 3924, 3933, 3942, 3951, 3960, 3969,
+     3978, 3986, 3993, 4000, 4007, 4014, 4021, 4028, 4035, 4042,
+     4049, 4056, 4063, 4070, 4077, 4084, 4091, 4099, 4107, 4115,
+     4123, 4131, 4139, 4147, 4155, 4163, 4171, 4179, 4187, 4195,
+     4203, 4211, 4219, 4227, 4235, 4244, 4252, 4260, 4267, 4274,
+     4281, 4288, 4295, 4302, 4309, 4316, 4323, 4330, 4337, 4344,
+     4351, 4358, 4365, 4373, 4381
+    } ;
+
+static yyconst flex_int16_t yy_def[876] =
+    {   0,
+      769,    1,  770,  770,  771,  771,    6,    6,  772,  772,
+      773,  773,  769,  774,  769,  769,  769,  775,  776,  769,
+      774,  774,  774,  769,  769,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  769,
+      769,  777,  778,  769,  769,  769,  778,  769,  779,  774,
+      774,  774,  774,  780,  781,  781,  781,  782,  783,  781,
+      780,  781,  781,  784,  785,  786,  769,  769,  787,  788,
+      786,  785,  786,  786,  786,  789,  774,  769,  769,  775,
+      769,  776,  774,   24,   24,  769,   24,  790,  791,  792,
+
+      793,  794,  795,  796,  797,  798,  799,  800,  801,  774,
+      802,  803,  804,  805,  769,  774,  774,  769,  774,  774,
+      774,  769,  769,  774,  774,  774,  769,  769,  774,  774,
+      774,  774,  774,  769,  769,  774,  774,  769,  774,  774,
+      769,  774,  774,  774,  774,  769,  769,  774,  769,  769,
+      774,  774,  774,  774,  769,  769,  774,  774,  774,  774,
+      774,  774,  774,  774,  769,  769,  774,  769,  774,  774,
+      769,  774,  774,  774,  774,  774,  774,  769,  769,  774,
+      774,  774,  769,  769,  774,  774,  774,  774,  769,  769,
+      774,  769,  774,  774,  769,  774,  769,  774,  774,  769,
+
+      774,  774,  769,  769,  774,  774,  774,  806,  807,  769,
+      778,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  212,
+      212,  230,  230,  230,  230,  230,  230,  230,  230,  230,
+      230,  230,  230,  230,  230,  230,  230,  230,  808,  769,
+      774,  774,  774,  774,  774,  774,  809,  810,  810,  810,
+      811,  810,  812,  813,  814,  810,  815,  816,  769,  816,
+      769,  817,  818,  816,  819,  820,  821,  769,  769,  822,
+      823,  824,  825,  826,  827,  828,  829,  830,  831,  832,
+      833,  834,  835,  836,  837,  769,  769,  774,  296,  838,
+
+      769,  839,  769,  840,  769,  841,  769,  842,  769,  843,
+      769,  844,  769,  845,  769,  846,  769,  847,  769,  848,
+      769,  849,  769,  850,  769,  851,  769,  852,  769,  853,
+      769,  769,  769,  769,  774,  774,  769,  769,  769,  769,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  769,
+      769,  769,  769,  774,  769,  769,  769,  769,  774,  774,
+      774,  769,  769,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  769,  769,  774,  769,  769,
+      774,  774,  769,  769,  774,  774,  774,  774,  774,  774,
+      774,  769,  769,  769,  769,  769,  769,  774,  774,  769,
+
+      769,  774,  774,  774,  774,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  774,  769,  769,
+      774,  769,  769,  854,  854,  854,  854,  854,  854,  854,
+      854,  854,  854,  854,  854,  854,  854,  854,  854,  854,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  854,  854,  854,  854,  854,  854,  854,  854,
+      854,  854,  854,  855,  855,  465,  465,  465,  465,  465,
+      465,  465,  465,  465,  465,  465,  465,  465,  465,  465,
+      465,  774,  774,  774,  856,  857,  858,  859,  860,  861,
+      862,  863,  864,  865,  866,  867,  868,  869,  870,  871,
+
+      872,  873,  874,  774,  769,  769,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  769,  769,  774,  774,  774,
+      774,  774,  774,  769,  769,  774,  774,  774,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      774,  774,  774,  774,  774,  774,  774,  774,  769,  769,
+      774,  774,  774,  769,  854,  854,  854,  854,  854,  854,
+      854,  854,  854,  854,  854,  769,  769,  769,  854,  854,
+      854,  875,  465,  465,  465,  465,  465,  465,  465,  465,
+      465,  465,  465,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  769,  769,  774,  774,  774,  774,  774,
+
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  769,  769,  854,  854,  854,  769,
+      854,  465,  465,  465,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  854,  769,  854,  465,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  774,  774,  854,  769,  854,  465,
+      774,  774,  774,  774,  774,  774,  774,  774,  774,  774,
+      774,  774,  774,  774,  854,  769,  854,  465,  774,  774,
+
+      774,  774,  774,  774,  774,  774,  854,  769,  854,  465,
+      774,  774,  774,  774,  774,  854,  769,  854,  465,  774,
+      774,  774,  854,  769,  854,  465,  774,  774,  774,  854,
+      769,  854,  465,  774,  774,  774,  854,  769,  854,  465,
+      774,  774,  854,  769,  854,  465,  774,  774,  854,  769,
+      854,  465,  774,  774,  854,  769,  854,  465,  774,  774,
+      854,  769,  854,  465,  769,  769,  854,  465,    0,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769
+    } ;
+
+static yyconst flex_int16_t yy_nxt[4449] =
+    {   0,
+       14,   15,   16,   17,   15,   18,   19,   20,   14,   21,
+       22,   23,   24,   24,   24,   25,   14,   26,   27,   28,
+       29,   30,   31,   14,   14,   32,   14,   33,   34,   35,
+       36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
+       46,   47,   14,   14,   14,   14,   14,   14,   48,   14,
+       14,   14,   14,   49,   14,   50,   51,   54,   16,   17,
+       55,   18,   19,   56,   14,   61,   57,   62,   63,   63,
+       63,   25,   61,  216,   62,   63,   63,   63,   88,   89,
+       89,   88,   89,   89,   93,   94,   94,   94,   95,   95,
+       95,  115,  542,  120,  115,  121,  132,  181,  345,  133,
+
+      346,  182,  543,  116,  117,  118,  251,  251,  251,  260,
+      260,   50,   58,   54,   16,   17,   55,   18,   19,   56,
+       59,  122,   57,  119,  122,  127,  134,   25,  127,  134,
+      146,  260,  260,  146,  165,  123,  124,  165,  441,  128,
+      135,  129,  216,  178,  147,  130,  178,  388,  166,  131,
+      148,  125,  259,  389,  167,  259,  126,  179,  254,  254,
+      254,  180,  252,  253,  253,  253,  762,   50,   58,   15,
+       16,   17,   15,   18,   19,   20,  149,  341,   22,  149,
+       60,   60,   60,   25,  183,  271,  271,  183,  271,  271,
+      150,  189,  151,  342,  189,  373,  152,  760,  184,  185,
+
+      186,  269,  269,  374,  187,  190,  153,   88,  188,  258,
+       88,  191,  262,  270,  269,  269,  270,  269,  273,  203,
+      274,  759,  203,   50,   51,   15,   16,   17,   15,   18,
+       19,   20,   52,  204,   22,  756,   60,   60,   60,   25,
+      192,  269,  269,  192,  269,  269,  205,  197,  269,  269,
+      197,  754,  193,  194,  195,  441,  206,  444,  196,  198,
+      199,  200,  441,   90,  455,  201,  212,  202,  255,  253,
+      253,  253,   89,   89,   95,   95,   95,  554,  256,   50,
+       51,   65,   66,   67,   65,   68,   69,   70,  210,  210,
+       71,   87,   95,   95,   95,   72,   87,  296,  296,  296,
+
+      298,  256,  753,  299,  299,  299,  115,  331,  333,  115,
+      331,  333,  337,  122,  339,  337,  122,  339,  210,  210,
+      118,  332,  334,  216,  216,  441,  338,  123,  340,  348,
+       88,  127,  349,  231,  127,   73,   51,   65,   66,   67,
+       65,   68,   69,   70,   74,  128,   71,  350,  750,  134,
+      350,   72,  134,  352,  138,  355,  352,  138,  355,  357,
+      441,  351,  357,  135,  441,  216,  447,  353,  141,  356,
+      441,  362,  146,  358,  362,  146,  149,  441,  259,  149,
+      442,  259,  445,  458,  297,  363,  147,  297,  446,  216,
+      150,   73,   51,   76,   77,   78,   76,   79,   80,   81,
+
+      155,  376,   82,  155,  376,  165,  168,   83,  165,  168,
+      441,  216,  451,  392,  156,  377,  392,  260,  260,  166,
+      171,  379,  394,  383,  379,  394,  383,  393,  178,  396,
+      183,  178,  396,  183,  441,  380,  395,  384,  235,  216,
+      216,  441,  179,  397,  184,  216,  212,   84,   85,   76,
+       77,   78,   76,   79,   80,   81,   86,  769,   82,  381,
+      382,  385,  386,   83,  400,  189,  192,  400,  189,  192,
+      406,  408,  410,  406,  408,  410,  441,  757,  401,  190,
+      195,  235,  235,  441,  407,  409,  411,  197,  412,  452,
+      197,  412,  301,  414,  416,  301,  414,  416,  748,  216,
+
+      747,  200,  413,   84,   85,   87,   96,  415,  417,   96,
+      441,  235,  462,   87,   87,   87,   97,   94,   94,   94,
+      744,   87,   87,   87,   87,   87,   98,   99,  100,   87,
+       87,   87,  101,   87,  102,  103,   87,  104,   87,   87,
+      105,  106,   87,   87,   87,  107,  108,   87,  109,  110,
+       99,  101,  111,  103,   87,  112,   87,  106,  113,  114,
+      138,  203,  419,  138,  203,  419,  720,  422,  266,  266,
+      422,  742,  139,  140,  141,  204,  420,  216,  216,  441,
+      142,  423,  421,  721,  143,  441,  448,  449,  441,  441,
+      235,  144,  269,  269,  145,  155,  443,  456,  155,  216,
+
+      216,  216,  441,  457,  235,  453,  216,  441,  441,  156,
+      741,  157,  216,  216,  568,  158,  235,  235,  441,  159,
+      463,  160,  161,  269,  269,  162,  738,  163,  164,  168,
+      235,  736,  168,  271,  271,  454,  278,  278,  235,  266,
+      266,  169,  170,  171,  251,  251,  251,  278,  278,  172,
+      459,  460,  441,  173,  235,  235,  441,  254,  254,  254,
+      235,  735,  258,  174,  175,  262,  734,  176,  177,  209,
+      210,  210,  209,  209,  209,  209,  235,  235,  235,  235,
+      441,  212,  731,  209,  235,  255,  253,  253,  253,  254,
+      254,  254,  554,  209,  303,  256,  427,  303,  256,  482,
+
+      482,  482,  483,  464,  464,  484,  484,  484,  256,  270,
+      269,  269,  270,  729,  269,  273,   90,  274,  256,  269,
+      273,  256,   91,  209,  209,   88,  269,  269,   88,  272,
+      305,  256,  307,  305,  309,  307,  311,  309,  728,  311,
+      727,  213,  214,  215,  216,  217,  216,  313,  315,  218,
+      313,  315,  219,  216,  220,  724,  221,  222,  223,  224,
+      225,  226,  216,  227,  228,  229,  230,   88,  317,  319,
+      231,  317,  319,  722,  230,  230,  230,  230,  230,  230,
+      230,  717,  230,  232,  233,  234,  235,  236,  235,  230,
+      230,  237,  230,  230,  238,  235,  239,  230,  240,  241,
+
+      242,  243,  244,  245,  235,  246,  247,  248,  230,  230,
+      230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
+      230,  209,  210,  210,  250,  209,  209,  209,  321,  323,
+      325,  321,  323,  325,  327,  209,  329,  327,  297,  329,
+      715,  297,  299,  299,  299,  301,  303,  305,  301,  303,
+      305,  714,  299,  299,  299,  307,  309,  311,  307,  309,
+      311,  503,  313,  315,  317,  313,  315,  317,  319,  321,
+      323,  319,  321,  323,  713,  209,  209,  258,  258,  258,
+      258,  258,  258,  258,   87,  325,  327,  329,  325,  327,
+      329,  258,  331,  333,  337,  331,  333,  337,  339,  505,
+
+      350,  339,  505,  350,  547,  712,  332,  334,  338,  464,
+      464,  212,  340,  506,  351,  352,  355,  578,  352,  355,
+      427,  427,  554,  548,  464,  464,  209,  269,  269,  353,
+      356,  258,  258,  258,  258,  258,  258,  258,  258,  258,
+      258,  258,  258,  258,  468,  711,  357,  258,  258,  357,
+      516,  362,  524,  516,  362,  524,  529,  708,  376,  529,
+      358,  376,  212,  706,  517,  363,  525,  705,  531,  704,
+      530,  531,  377,  769,  258,  703,  574,  297,  427,  468,
+      297,  379,  532,  533,  379,  702,  533,  258,  258,  258,
+      258,  258,  258,  258,  258,  380,  535,  534,  383,  535,
+
+      537,  383,  258,  537,  539,  392,  394,  539,  392,  394,
+      536,  701,  384,  396,  538,  441,  396,  212,  540,  393,
+      395,  400,  549,  406,  400,  549,  406,  397,  554,  700,
+      557,  484,  484,  484,  699,  401,  550,  407,  408,  216,
+      216,  408,  258,  265,  266,  266,  265,  265,  265,  265,
+      410,  412,  409,  410,  412,  414,  416,  265,  414,  416,
+      419,  212,  212,  419,  411,  413,  212,  696,  422,  415,
+      417,  422,  769,  769,  420,  212,  212,  554,  427,  484,
+      484,  484,  423,  212,  212,  441,  554,  554,  427,  564,
+      427,  427,  560,  555,  769,  769,  212,  265,  209,  268,
+
+      269,  269,  268,  268,  268,  268,  212,  554,  569,  216,
+      216,  212,  212,  268,  563,  427,  427,  554,  212,  558,
+      561,  562,  554,  769,  235,  559,  427,  427,  427,  554,
+      212,  212,  212,  427,  556,  210,  210,  427,  212,  427,
+      427,  554,  769,  769,  235,  427,  427,  427,  301,  769,
+      235,  301,  694,  268,  268,  268,  268,  269,  269,  268,
+      268,  268,  268,  268,  268,  268,  268,  212,  235,  212,
+      268,  268,  212,  303,  212,  212,  303,  212,  554,  305,
+      769,  693,  305,  441,  212,  769,  769,  235,  441,  464,
+      464,  565,  570,  575,  571,  441,  692,  268,  235,  464,
+
+      464,  427,  691,  464,  464,  468,  468,  235,  235,  690,
+      268,  268,  268,  269,  269,  268,  268,  268,  268,  235,
+      235,  573,  464,  464,  209,  689,  268,  464,  464,  209,
+      464,  464,  579,  580,  468,  464,  464,  209,  464,  464,
+      307,  688,  468,  307,  576,  464,  464,  687,  468,  582,
+      577,  468,  309,  583,  311,  309,  581,  311,  468,  468,
+      686,  313,  315,  468,  313,  315,  268,  268,  277,  278,
+      278,  277,  277,  277,  277,  482,  482,  482,  317,  685,
+      319,  317,  277,  319,  256,  321,  323,  325,  321,  323,
+      325,  327,  329,  212,  327,  329,  505,  516,  594,  505,
+
+      516,  594,  524,  601,  769,  524,  529,  256,  602,  529,
+      506,  517,  595,  464,  464,  531,  525,  603,  531,  606,
+      530,  624,  277,  277,   96,  533,  607,   96,  533,  532,
+      212,  621,  608,  535,  537,  539,  535,  537,  539,  534,
+      549,  769,  427,  549,  280,  281,  282,  536,  538,  540,
+      283,  684,  284,  285,  550,  286,  212,  683,  287,  288,
+      682,  681,  678,  289,  290,  676,  291,  769,  281,  283,
+      292,  285,  212,  293,  212,  288,  294,  295,   87,  297,
+      427,  615,  297,  769,  615,  769,   87,  298,   87,   87,
+      299,  299,  299,  212,   87,  616,  212,  675,  212,  617,
+
+      212,  674,  427,  212,  769,  673,  212,  769,  427,  769,
+      594,  769,  427,  594,  554,  672,  427,  554,  464,  464,
+       87,   87,  301,  671,  595,  301,  235,  670,  669,   87,
+       87,   87,   87,   87,   87,   87,  212,   87,  427,  427,
+      212,  427,  427,  212,  468,  468,  668,  769,  464,  464,
+      209,  554,  615,  618,  769,  615,  765,  619,  667,  765,
+      235,  666,  665,   87,   87,  303,  616,  664,  303,  468,
+      766,  663,   87,   87,   87,   87,   87,   87,   87,  662,
+       87,  464,  464,  209,  468,  464,  464,  209,  464,  464,
+      209,  464,  464,  209,  468,  464,  464,  209,  468,  464,
+
+      464,  622,  212,  212,  468,  661,   87,   87,  305,  660,
+      659,  305,  658,  769,  769,   87,   87,   87,   87,   87,
+       87,   87,  212,   87,  679,  468,  468,  464,  464,  209,
+      464,  464,  209,  769,  657,  623,  212,  212,  656,  427,
+      652,  212,  464,  464,  209,  468,  653,  769,  769,   87,
+       87,  307,  769,  654,  307,  464,  464,  209,   87,   87,
+       87,   87,   87,   87,   87,  651,   87,  427,  464,  464,
+      209,  655,  468,  212,  709,  212,  468,  212,  464,  464,
+      209,  464,  464,  209,  769,  680,  769,  212,  769,  677,
+      726,  650,   87,   87,  309,  649,  695,  309,  769,  212,
+
+      648,   87,   87,   87,   87,   87,   87,   87,  212,   87,
+      769,  464,  464,  209,  725,  716,  697,  647,  646,  769,
+      464,  464,  209,  698,  645,  707,  644,  212,  710,  464,
+      464,  209,  643,  642,  641,   87,   87,  311,  769,  640,
+      311,  639,  212,  212,   87,   87,   87,   87,   87,   87,
+       87,  638,   87,  769,  769,  212,  732,  212,  719,  212,
+      718,  723,  212,  464,  464,  209,  769,  637,  769,  636,
+      769,  635,  634,  769,  464,  464,  209,  633,   87,   87,
+      313,  733,  730,  313,  632,  212,  737,   87,   87,   87,
+       87,   87,   87,   87,  740,   87,  769,  739,  212,  631,
+
+      743,  630,  629,  212,  464,  464,  209,  212,  212,  769,
+      745,  464,  464,  209,  769,  751,  212,  628,  769,  769,
+      752,   87,   87,  315,  755,  627,  315,  769,  749,  763,
+       87,   87,   87,   87,   87,   87,   87,  212,   87,  761,
+      746,  464,  464,  209,  212,  464,  464,  209,  769,  758,
+      767,  626,  464,  464,  209,  769,  768,  765,  625,  212,
+      765,  216,  620,  216,   87,   87,  317,  764,  235,  317,
+      769,  766,  614,   87,   87,   87,   87,   87,   87,   87,
+      613,   87,  612,  427,  464,  464,  209,  611,  610,  609,
+      605,  604,  600,  599,  598,  597,  596,  593,  592,  468,
+
+      591,  590,  589,  588,  587,  586,  585,   87,   87,  319,
+      584,  468,  319,  468,  216,  567,   87,   87,   87,   87,
+       87,   87,   87,  216,   87,  216,  216,  566,  216,  216,
+      553,  552,  551,  546,  545,  544,  541,  528,  527,  526,
+      523,  522,  521,  520,  519,  518,  515,  514,  513,  512,
+       87,   87,  321,  511,  510,  321,  509,  508,  507,   87,
+       87,   87,   87,   87,   87,   87,  504,   87,  261,  461,
+      235,  235,  441,  235,  450,  216,  216,  441,  216,  212,
+      418,  418,  405,  404,  403,  402,  399,  398,  391,  390,
+      387,  378,  375,   87,   87,  323,  372,  371,  323,  370,
+
+      369,  368,   87,   87,   87,   87,   87,   87,   87,  367,
+       87,  366,  365,  364,  361,  360,  359,  354,  347,  344,
+      343,  336,  335,  279,   90,   91,  212,  212,  207,  153,
+      154,  137,  136,   91,  769,   52,   87,   87,  325,  769,
+      769,  325,  769,  769,  769,   87,   87,   87,   87,   87,
+       87,   87,  769,   87,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,   87,
+       87,  327,  769,  769,  327,  769,  769,  769,   87,   87,
+       87,   87,   87,   87,   87,  769,   87,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,   87,   87,  329,  769,  769,  329,  769,  769,
+      769,   87,   87,   87,   87,   87,   87,   87,  769,   87,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,   87,  209,  210,  210,  209,
+      209,  209,  209,  769,  769,  769,  769,  769,  769,  769,
+      209,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      209,  209,  230,  769,  769,  769,  212,  769,  769,  769,
+      230,  230,  230,  230,  230,  230,  230,  769,  230,  424,
+      425,  426,  427,  428,  427,  230,  230,  429,  230,  230,
+      430,  427,  431,  230,  432,  433,  434,  435,  436,  437,
+      427,  438,  439,  440,  230,  230,  230,  230,  230,  230,
+      230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
+      230,  230,  230,  769,  769,  230,  769,  769,  230,  230,
+      230,  769,  230,  230,  230,  230,  230,  230,  230,  230,
+
+      230,  230,  209,  210,  210,  250,  209,  209,  209,  769,
+      769,  769,  769,  769,  769,  769,  209,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  209,  209,  464,  209,
+      210,  210,  250,  209,  209,  209,  464,  464,  464,  464,
+      464,  464,  464,  209,  464,  465,  466,  467,  468,  469,
+      468,  464,  464,  470,  464,  464,  471,  468,  472,  464,
+      473,  474,  475,  476,  477,  478,  468,  479,  480,  481,
+
+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
+      464,  464,  464,  209,  209,  258,  258,  258,  258,  258,
+      258,  258,  769,  769,  769,  769,  769,  769,  769,  258,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  258,
+      258,  258,  258,  258,  258,  258,  258,  485,  258,  258,
+      258,  258,  769,  769,  769,  258,  258,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  258,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  258,  265,  266,  266,  265,
+      265,  265,  265,  769,  769,  769,  769,  769,  769,  769,
+      265,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      265,  209,  268,  269,  269,  268,  268,  268,  268,  769,
+      769,  769,  769,  769,  769,  769,  268,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  268,  268,  268,  268,
+      269,  269,  268,  268,  268,  486,  268,  268,  268,  268,
+      769,  769,  769,  268,  268,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      268,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  268,  268,  277,  278,  278,  277,  277,
+
+      277,  277,  769,  769,  769,  769,  769,  769,  769,  277,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  277,
+      277,   87,   96,  769,  769,   96,  769,  769,  769,   87,
+       87,   87,   87,  296,  296,  296,  769,   87,   87,   87,
+       87,   87,   98,   99,  100,   87,   87,   87,  101,   87,
+      102,  103,   87,  104,   87,   87,  105,  106,   87,   87,
+       87,  107,  108,   87,  109,  110,   99,  101,  111,  103,
+
+       87,  112,   87,  106,  113,  114,   87,  297,  769,  769,
+      297,  769,  769,  769,   87,   87,   87,   87,   87,   87,
+       87,  769,   87,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,   87,   87,
+      301,  769,  769,  301,  769,  769,  769,   87,   87,   87,
+       87,   87,   87,   87,  769,   87,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,   87,   87,  303,  769,  769,  303,  769,  769,  769,
+
+       87,   87,   87,   87,   87,   87,   87,  769,   87,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,   87,   87,  305,  769,  769,  305,
+      769,  769,  769,   87,   87,   87,   87,   87,   87,   87,
+      769,   87,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,   87,   87,  307,
+      769,  769,  307,  769,  769,  769,   87,   87,   87,   87,
+       87,   87,   87,  769,   87,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+       87,   87,  309,  769,  769,  309,  769,  769,  769,   87,
+       87,   87,   87,   87,   87,   87,  769,   87,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,   87,   87,  311,  769,  769,  311,  769,
+      769,  769,   87,   87,   87,   87,   87,   87,   87,  769,
+       87,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,   87,   87,  313,  769,
+      769,  313,  769,  769,  769,   87,   87,   87,   87,   87,
+       87,   87,  769,   87,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,   87,
+       87,  315,  769,  769,  315,  769,  769,  769,   87,   87,
+       87,   87,   87,   87,   87,  769,   87,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,   87,   87,  317,  769,  769,  317,  769,  769,
+
+      769,   87,   87,   87,   87,   87,   87,   87,  769,   87,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,   87,   87,  319,  769,  769,
+      319,  769,  769,  769,   87,   87,   87,   87,   87,   87,
+       87,  769,   87,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,   87,   87,
+      321,  769,  769,  321,  769,  769,  769,   87,   87,   87,
+       87,   87,   87,   87,  769,   87,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,   87,   87,  323,  769,  769,  323,  769,  769,  769,
+       87,   87,   87,   87,   87,   87,   87,  769,   87,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,   87,   87,  325,  769,  769,  325,
+      769,  769,  769,   87,   87,   87,   87,   87,   87,   87,
+      769,   87,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,   87,   87,  327,
+      769,  769,  327,  769,  769,  769,   87,   87,   87,   87,
+       87,   87,   87,  769,   87,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+       87,   87,  329,  769,  769,  329,  769,  769,  769,   87,
+       87,   87,   87,   87,   87,   87,  769,   87,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,   87,  209,  210,  210,  250,  209,  209,
+
+      209,  769,  769,  769,  769,  769,  769,  769,  209,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  209,  209,
+      209,  210,  210,  250,  209,  209,  209,  769,  769,  769,
+      769,  769,  468,  468,  572,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  209,  209,   87,  297,  769,  769,
+      297,  769,  769,  769,   87,   87,   87,   87,   87,   87,
+       87,  769,   87,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,   87,   53,
+       53,   53,   53,   53,   53,   53,   53,   53,   14,   14,
+       14,   14,   14,   14,   14,   14,   14,   64,   64,   64,
+       64,   64,   64,   64,   64,   64,   75,   75,   75,   75,
+       75,   75,   75,   75,   75,   87,  769,  769,  769,  769,
+       87,  769,   87,   90,   90,  769,   90,   90,   90,   90,
+
+       90,   90,   92,  769,   92,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  211,  769,  769,  769,  211,  211,
+      769,  211,  249,  249,  249,  249,  249,  249,  249,  249,
+      249,  257,  257,  257,  257,  257,  257,  257,  257,  258,
+      258,  258,  258,  258,  258,  258,  258,  261,  261,  261,
+      261,  261,  261,  261,  261,  261,  263,  263,  263,  263,
+      263,  263,  263,  263,  264,  264,  264,  264,  264,  264,
+      264,  264,  264,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  272,  272,  272,  272,  272,  272,  272,  272,  272,
+
+      275,  275,  275,  275,  275,  275,  275,  275,  275,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  300,  300,
+      769,  769,  300,  300,  769,  300,  302,  302,  769,  769,
+      302,  302,  769,  302,  304,  304,  769,  769,  304,  304,
+      769,  304,  306,  306,  769,  769,  306,  306,  769,  306,
+      308,  308,  769,  769,  308,  308,  769,  308,  310,  310,
+      769,  769,  310,  310,  769,  310,  312,  312,  769,  769,
+      312,  312,  769,  312,  314,  314,  769,  769,  314,  314,
+      769,  314,  316,  316,  769,  769,  316,  316,  769,  316,
+      318,  318,  769,  769,  318,  318,  769,  318,  320,  320,
+
+      769,  769,  320,  320,  769,  320,  322,  322,  769,  769,
+      322,  322,  769,  322,  324,  324,  769,  769,  324,  324,
+      769,  324,  326,  326,  769,  769,  326,  326,  769,  326,
+      328,  328,  769,  769,  328,  328,  769,  328,  330,  330,
+      769,  769,  330,  330,  769,  330,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  209,  209,  209,  209,  209,
+      209,  209,  209,  209,  249,  249,  249,  249,  249,  249,
+      249,  249,  249,  257,  257,  257,  257,  257,  257,  257,
+      257,  258,  258,  258,  258,  258,  258,  258,  258,  261,
+      261,  261,  261,  261,  261,  261,  261,  261,  263,  263,
+
+      263,  263,  263,  263,  263,  263,  264,  264,  264,  264,
+      264,  264,  264,  264,  264,  265,  265,  265,  265,  265,
+      265,  265,  265,  265,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  268,  268,  268,  268,  268,  268,  268,
+      268,  268,  272,  272,  272,  272,  272,  272,  272,  272,
+      272,   90,   90,   90,   90,   90,   90,   90,   90,   90,
+      275,  275,  275,  275,  275,  275,  275,  275,  275,  276,
+      276,  276,  276,  276,  276,  276,  276,  276,  277,  277,
+      277,  277,  277,  277,  277,  277,  277,  487,  769,  769,
+      487,  769,  769,  487,  488,  769,  769,  488,  769,  769,
+
+      488,  489,  769,  769,  489,  769,  769,  489,  490,  769,
+      769,  490,  769,  769,  490,  491,  769,  769,  491,  769,
+      769,  491,  492,  769,  769,  492,  769,  769,  492,  493,
+      769,  769,  493,  769,  769,  493,  494,  769,  769,  494,
+      769,  769,  494,  495,  769,  769,  495,  769,  769,  495,
+      496,  769,  769,  496,  769,  769,  496,  497,  769,  769,
+      497,  769,  769,  497,  498,  769,  769,  498,  769,  769,
+      498,  499,  769,  769,  499,  769,  769,  499,  500,  769,
+      769,  500,  769,  769,  500,  501,  769,  769,  501,  769,
+      769,  501,  502,  769,  769,  502,  769,  769,  502,  300,
+
+      300,  769,  769,  300,  300,  769,  300,  302,  302,  769,
+      769,  302,  302,  769,  302,  304,  304,  769,  769,  304,
+      304,  769,  304,  306,  306,  769,  769,  306,  306,  769,
+      306,  308,  308,  769,  769,  308,  308,  769,  308,  310,
+      310,  769,  769,  310,  310,  769,  310,  312,  312,  769,
+      769,  312,  312,  769,  312,  314,  314,  769,  769,  314,
+      314,  769,  314,  316,  316,  769,  769,  316,  316,  769,
+      316,  318,  318,  769,  769,  318,  318,  769,  318,  320,
+      320,  769,  769,  320,  320,  769,  320,  322,  322,  769,
+      769,  322,  322,  769,  322,  324,  324,  769,  769,  324,
+
+      324,  769,  324,  326,  326,  769,  769,  326,  326,  769,
+      326,  328,  328,  769,  769,  328,  328,  769,  328,  330,
+      330,  769,  769,  330,  330,  769,  330,  230,  769,  769,
+      769,  230,  230,  230,  230,  464,  464,  464,  464,  464,
+      464,  464,  464,  464,  258,  258,  258,  258,  258,  258,
+      258,  258,  268,  268,  268,  268,  268,  268,  268,  268,
+      268,  487,  769,  769,  487,  769,  769,  487,  488,  769,
+      769,  488,  769,  769,  488,  489,  769,  769,  489,  769,
+      769,  489,  490,  769,  769,  490,  769,  769,  490,  491,
+      769,  769,  491,  769,  769,  491,  492,  769,  769,  492,
+
+      769,  769,  492,  493,  769,  769,  493,  769,  769,  493,
+      494,  769,  769,  494,  769,  769,  494,  495,  769,  769,
+      495,  769,  769,  495,  496,  769,  769,  496,  769,  769,
+      496,  497,  769,  769,  497,  769,  769,  497,  498,  769,
+      769,  498,  769,  769,  498,  499,  769,  769,  499,  769,
+      769,  499,  500,  769,  769,  500,  769,  769,  500,  501,
+      769,  769,  501,  769,  769,  501,  502,  769,  769,  502,
+      769,  769,  502,  300,  300,  769,  769,  300,  300,  769,
+      300,  209,  209,  209,  209,  209,  209,  209,  209,  209,
+       13,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769
+    } ;
+
+static yyconst flex_int16_t yy_chk[4449] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
+        3,    3,    3,    3,    7,    7,    3,    7,    7,    7,
+        7,    3,    8,  762,    8,    8,    8,    8,   15,   16,
+       16,   15,   17,   17,   21,   21,   21,   21,   23,   23,
+       23,   26,  389,   27,   26,   27,   30,   42,  130,   30,
+
+      130,   42,  389,   26,   26,   26,   60,   60,   60,   66,
+       66,    3,    3,    4,    4,    4,    4,    4,    4,    4,
+        4,   28,    4,   26,   28,   29,   31,    4,   29,   31,
+       35,   67,   67,   35,   39,   28,   28,   39,  224,   29,
+       31,   29,  224,   41,   35,   29,   41,  173,   39,   29,
+       35,   28,   65,  173,   39,   65,   28,   41,   62,   62,
+       62,   41,   61,   61,   61,   61,  756,    4,    4,    5,
+        5,    5,    5,    5,    5,    5,   36,  125,    5,   36,
+        5,    5,    5,    5,   43,   77,   77,   43,   78,   78,
+       36,   44,   36,  125,   44,  162,   36,  754,   43,   43,
+
+       43,   81,   81,  162,   43,   44,   36,   88,   43,   68,
+       88,   44,   68,   76,   76,   76,   76,   79,   79,   47,
+       79,  753,   47,    5,    5,    6,    6,    6,    6,    6,
+        6,    6,    6,   47,    6,  750,    6,    6,    6,    6,
+       45,   83,   83,   45,   84,   84,   47,   46,   85,   85,
+       46,  748,   45,   45,   45,  220,   47,  220,   45,   46,
+       46,   46,  239,   68,  239,   46,  427,   46,   63,   63,
+       63,   63,   89,   89,   93,   93,   93,  427,   63,    6,
+        6,    9,    9,    9,    9,    9,    9,    9,  209,  209,
+        9,   95,   95,   95,   95,    9,   97,   97,   97,   97,
+
+      110,   63,  747,  110,  110,  110,  115,  116,  117,  115,
+      116,  117,  121,  122,  124,  121,  122,  124,  210,  210,
+      115,  116,  117,  213,  213,  213,  121,  122,  124,  132,
+      231,  127,  132,  231,  127,    9,    9,   10,   10,   10,
+       10,   10,   10,   10,   10,  127,   10,  133,  744,  134,
+      133,   10,  134,  136,  138,  139,  136,  138,  139,  140,
+      222,  133,  140,  134,  215,  215,  222,  136,  138,  139,
+      221,  145,  146,  140,  145,  146,  149,  241,  259,  149,
+      215,  259,  221,  241,  280,  145,  146,  280,  221,  221,
+      149,   10,   10,   11,   11,   11,   11,   11,   11,   11,
+
+      155,  164,   11,  155,  164,  165,  168,   11,  165,  168,
+      226,  226,  226,  176,  155,  164,  176,  260,  260,  165,
+      168,  169,  177,  170,  169,  177,  170,  176,  178,  180,
+      183,  178,  180,  183,  243,  169,  177,  170,  243,  227,
+      227,  227,  178,  180,  183,  227,  751,   11,   11,   12,
+       12,   12,   12,   12,   12,   12,   12,  751,   12,  169,
+      169,  170,  170,   12,  185,  189,  192,  185,  189,  192,
+      193,  194,  196,  193,  194,  196,  229,  751,  185,  189,
+      192,  232,  232,  232,  193,  194,  196,  197,  198,  229,
+      197,  198,  281,  199,  201,  281,  199,  201,  742,  229,
+
+      741,  197,  198,   12,   12,   24,   24,  199,  201,   24,
+      245,  245,  245,   24,   24,   24,   24,   24,   24,   24,
+      738,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       34,  203,  205,   34,  203,  205,  713,  206,  266,  266,
+      206,  736,   34,   34,   34,  203,  205,  219,  219,  219,
+       34,  206,  205,  713,   34,  240,  223,  223,  223,  234,
+      234,   34,  268,  268,   34,   38,  219,  240,   38,  219,
+
+      228,  228,  228,  240,  240,  234,  228,  248,  452,   38,
+      735,   38,  223,  223,  452,   38,  238,  238,  238,   38,
+      248,   38,   38,  269,  269,   38,  731,   38,   38,   40,
+      248,  729,   40,  271,  271,  238,  277,  277,  238,  265,
+      265,   40,   40,   40,  251,  251,  251,  278,  278,   40,
+      242,  242,  242,   40,  246,  246,  246,  252,  252,  252,
+      246,  728,  261,   40,   40,  261,  727,   40,   40,   52,
+       52,   52,   52,   52,   52,   52,  242,  242,  247,  247,
+      247,  435,  724,   52,  247,  253,  253,  253,  253,  254,
+      254,  254,  435,  265,  282,  253,  435,  282,  254,  255,
+
+      255,  255,  256,  468,  468,  256,  256,  256,  255,  270,
+      270,  270,  270,  722,  272,  272,  261,  272,  253,  273,
+      273,  254,  273,   52,   52,   54,  274,  274,   54,  274,
+      283,  255,  284,  283,  285,  284,  286,  285,  721,  286,
+      720,   54,   54,   54,   54,   54,   54,  287,  288,   54,
+      287,  288,   54,   54,   54,  717,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   55,   55,  289,  290,
+       55,  289,  290,  715,   55,   55,   55,   55,   55,   55,
+       55,  708,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   59,   59,   59,   59,   59,   59,   59,  291,  292,
+      293,  291,  292,  293,  294,   59,  295,  294,  297,  295,
+      706,  297,  298,  298,  298,  301,  303,  305,  301,  303,
+      305,  705,  299,  299,  299,  307,  309,  311,  307,  309,
+      311,  299,  313,  315,  317,  313,  315,  317,  319,  321,
+      323,  319,  321,  323,  703,   59,   59,   64,   64,   64,
+       64,   64,   64,   64,  299,  325,  327,  329,  325,  327,
+      329,   64,  331,  333,  337,  331,  333,  337,  339,  341,
+
+      350,  339,  341,  350,  399,  701,  331,  333,  337,  474,
+      474,  424,  339,  341,  350,  352,  355,  474,  352,  355,
+      424,  424,  424,  399,  466,  466,  466,  486,  486,  352,
+      355,   64,   69,   69,   69,   69,   69,   69,   69,   69,
+       69,   69,   69,   69,  466,  699,  357,   69,   69,  357,
+      361,  362,  371,  361,  362,  371,  375,  696,  376,  375,
+      357,  376,  429,  694,  361,  362,  371,  691,  378,  688,
+      375,  378,  376,  429,   69,  687,  471,  487,  429,  471,
+      487,  379,  378,  381,  379,  685,  381,   69,   71,   71,
+       71,   71,   71,   71,   71,  379,  382,  381,  383,  382,
+
+      385,  383,   71,  385,  386,  392,  394,  386,  392,  394,
+      382,  684,  383,  396,  385,  448,  396,  431,  386,  392,
+      394,  400,  402,  406,  400,  402,  406,  396,  431,  682,
+      431,  483,  483,  483,  681,  400,  402,  406,  408,  448,
+      448,  408,   71,   74,   74,   74,   74,   74,   74,   74,
+      410,  412,  408,  410,  412,  414,  416,   74,  414,  416,
+      419,  425,  428,  419,  410,  412,  426,  678,  422,  414,
+      416,  422,  425,  428,  419,  433,  437,  426,  426,  484,
+      484,  484,  422,  455,  436,  449,  433,  437,  437,  437,
+      425,  428,  433,  426,  455,  436,  432,   74,   74,   75,
+
+       75,   75,   75,   75,   75,   75,  430,  432,  455,  449,
+      449,  434,  453,   75,  436,  430,  430,  430,  438,  432,
+      434,  434,  434,  453,  453,  432,  432,  438,  438,  438,
+      439,  456,  457,  438,  430,  572,  572,  430,  454,  439,
+      439,  439,  456,  457,  457,  439,  434,  434,  488,  454,
+      456,  488,  675,   75,   75,   80,   80,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,  440,  454,  458,
+       80,   80,  459,  489,  462,  461,  489,  463,  440,  490,
+      458,  674,  490,  459,  460,  462,  461,  458,  463,  472,
+      472,  440,  461,  472,  463,  460,  671,   80,  462,  476,
+
+      476,  440,  670,  467,  467,  476,  467,  459,  459,  669,
+       80,   80,   82,   82,   82,   82,   82,   82,   82,  460,
+      460,  467,  469,  469,  469,  668,   82,  470,  470,  470,
+      473,  473,  475,  475,  470,  477,  477,  477,  481,  481,
+      491,  666,  469,  491,  473,  478,  478,  665,  478,  478,
+      473,  473,  492,  481,  493,  492,  477,  493,  475,  475,
+      664,  494,  495,  481,  494,  495,   82,   82,   86,   86,
+       86,   86,   86,   86,   86,  482,  482,  482,  496,  662,
+      497,  496,   86,  497,  482,  498,  499,  500,  498,  499,
+      500,  501,  502,  570,  501,  502,  505,  516,  519,  505,
+
+      516,  519,  524,  527,  570,  524,  529,  482,  527,  529,
+      505,  516,  519,  583,  583,  531,  524,  527,  531,  543,
+      529,  583,   86,   86,   96,  533,  543,   96,  533,  531,
+      555,  570,  543,  535,  537,  539,  535,  537,  539,  533,
+      549,  555,  555,  549,   96,   96,   96,  535,  537,  539,
+       96,  660,   96,   96,  549,   96,  564,  658,   96,   96,
+      657,  656,  653,   96,   96,  650,   96,  564,   96,   96,
+       96,   96,  556,   96,  557,   96,   96,   96,   98,   98,
+      564,  553,   98,  556,  553,  557,   98,   98,   98,   98,
+       98,   98,   98,  558,   98,  553,  559,  649,  560,  557,
+
+      571,  648,  556,  561,  558,  647,  562,  559,  559,  560,
+      594,  571,  558,  594,  561,  646,  560,  562,  579,  579,
+       98,   99,   99,  644,  594,   99,  571,  643,  641,   99,
+       99,   99,   99,   99,   99,   99,  563,   99,  561,  561,
+      565,  562,  562,  569,  579,  579,  640,  563,  574,  574,
+      574,  565,  615,  563,  569,  615,  760,  565,  639,  760,
+      569,  638,  637,   99,  100,  100,  615,  636,  100,  574,
+      760,  635,  100,  100,  100,  100,  100,  100,  100,  634,
+      100,  573,  573,  573,  573,  575,  575,  575,  576,  576,
+      576,  577,  577,  577,  577,  578,  578,  578,  576,  580,
+
+      580,  575,  618,  654,  578,  631,  100,  101,  101,  630,
+      629,  101,  628,  618,  654,  101,  101,  101,  101,  101,
+      101,  101,  617,  101,  654,  580,  580,  581,  581,  581,
+      582,  582,  582,  617,  627,  581,  697,  621,  625,  617,
+      618,  619,  623,  623,  623,  582,  620,  697,  621,  101,
+      102,  102,  619,  621,  102,  624,  624,  624,  102,  102,
+      102,  102,  102,  102,  102,  614,  102,  619,  622,  622,
+      622,  623,  624,  652,  697,  677,  622,  707,  655,  655,
+      655,  719,  719,  719,  652,  655,  677,  718,  707,  652,
+      719,  613,  102,  103,  103,  612,  677,  103,  718,  679,
+
+      610,  103,  103,  103,  103,  103,  103,  103,  695,  103,
+      679,  680,  680,  680,  718,  707,  679,  609,  608,  695,
+      698,  698,  698,  680,  607,  695,  606,  725,  698,  710,
+      710,  710,  605,  604,  603,  103,  104,  104,  725,  602,
+      104,  601,  709,  716,  104,  104,  104,  104,  104,  104,
+      104,  600,  104,  709,  716,  723,  725,  730,  710,  732,
+      709,  716,  737,  726,  726,  726,  723,  599,  730,  598,
+      732,  597,  596,  737,  733,  733,  733,  593,  104,  105,
+      105,  726,  723,  105,  592,  739,  730,  105,  105,  105,
+      105,  105,  105,  105,  733,  105,  739,  732,  745,  591,
+
+      737,  590,  589,  743,  746,  746,  746,  749,  755,  745,
+      739,  740,  740,  740,  743,  745,  757,  588,  749,  755,
+      746,  105,  106,  106,  749,  587,  106,  757,  743,  757,
+      106,  106,  106,  106,  106,  106,  106,  761,  106,  755,
+      740,  752,  752,  752,  763,  758,  758,  758,  761,  752,
+      761,  585,  764,  764,  764,  763,  764,  765,  584,  767,
+      765,  568,  567,  566,  106,  107,  107,  758,  763,  107,
+      767,  765,  552,  107,  107,  107,  107,  107,  107,  107,
+      551,  107,  548,  767,  768,  768,  768,  546,  545,  544,
+      542,  541,  526,  523,  522,  521,  520,  518,  514,  768,
+
+      513,  512,  511,  510,  509,  508,  507,  107,  108,  108,
+      504,  480,  108,  479,  451,  450,  108,  108,  108,  108,
+      108,  108,  108,  447,  108,  446,  445,  444,  443,  442,
+      421,  405,  403,  398,  391,  390,  388,  374,  373,  372,
+      369,  368,  367,  366,  365,  364,  360,  359,  349,  347,
+      108,  109,  109,  346,  345,  109,  344,  343,  342,  109,
+      109,  109,  109,  109,  109,  109,  336,  109,  262,  244,
+      237,  236,  235,  233,  225,  218,  217,  216,  214,  211,
+      207,  202,  191,  188,  187,  186,  182,  181,  175,  174,
+      172,  167,  163,  109,  111,  111,  161,  160,  111,  159,
+
+      158,  157,  111,  111,  111,  111,  111,  111,  111,  154,
+      111,  152,  151,  148,  144,  143,  142,  137,  131,  129,
+      126,  120,  119,   92,   91,   90,   57,   53,   49,   48,
+       37,   33,   32,   18,   13,    2,  111,  112,  112,    0,
+        0,  112,    0,    0,    0,  112,  112,  112,  112,  112,
+      112,  112,    0,  112,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  112,
+      113,  113,    0,    0,  113,    0,    0,    0,  113,  113,
+      113,  113,  113,  113,  113,    0,  113,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  113,  114,  114,    0,    0,  114,    0,    0,
+        0,  114,  114,  114,  114,  114,  114,  114,    0,  114,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  114,  208,  208,  208,  208,
+      208,  208,  208,    0,    0,    0,    0,    0,    0,    0,
+      208,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      208,  208,  212,    0,    0,    0,  212,    0,    0,    0,
+      212,  212,  212,  212,  212,  212,  212,    0,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+      212,  212,  212,  212,  212,  212,  212,  230,  230,  230,
+      230,  230,  230,    0,    0,  230,    0,    0,  230,  230,
+      230,    0,  230,  230,  230,  230,  230,  230,  230,  230,
+
+      230,  230,  249,  249,  249,  249,  249,  249,  249,    0,
+        0,    0,    0,    0,    0,    0,  249,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  249,  249,  250,  250,
+      250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+      250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+      250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+      250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+
+      250,  250,  250,  250,  250,  250,  250,  250,  250,  250,
+      250,  250,  250,  250,  250,  257,  257,  257,  257,  257,
+      257,  257,    0,    0,    0,    0,    0,    0,    0,  257,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  257,
+      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
+      263,  263,    0,    0,    0,  263,  263,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  263,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  263,  264,  264,  264,  264,
+      264,  264,  264,    0,    0,    0,    0,    0,    0,    0,
+      264,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      264,  264,  267,  267,  267,  267,  267,  267,  267,    0,
+        0,    0,    0,    0,    0,    0,  267,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  267,  267,  275,  275,
+      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
+        0,    0,    0,  275,  275,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      275,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  275,  275,  276,  276,  276,  276,  276,
+
+      276,  276,    0,    0,    0,    0,    0,    0,    0,  276,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  276,
+      276,  296,  296,    0,    0,  296,    0,    0,    0,  296,
+      296,  296,  296,  296,  296,  296,    0,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+
+      296,  296,  296,  296,  296,  296,  300,  300,    0,    0,
+      300,    0,    0,    0,  300,  300,  300,  300,  300,  300,
+      300,    0,  300,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  300,  302,
+      302,    0,    0,  302,    0,    0,    0,  302,  302,  302,
+      302,  302,  302,  302,    0,  302,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  302,  304,  304,    0,    0,  304,    0,    0,    0,
+
+      304,  304,  304,  304,  304,  304,  304,    0,  304,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  304,  306,  306,    0,    0,  306,
+        0,    0,    0,  306,  306,  306,  306,  306,  306,  306,
+        0,  306,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  306,  308,  308,
+        0,    0,  308,    0,    0,    0,  308,  308,  308,  308,
+      308,  308,  308,    0,  308,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      308,  310,  310,    0,    0,  310,    0,    0,    0,  310,
+      310,  310,  310,  310,  310,  310,    0,  310,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  310,  312,  312,    0,    0,  312,    0,
+        0,    0,  312,  312,  312,  312,  312,  312,  312,    0,
+      312,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,  312,  314,  314,    0,
+        0,  314,    0,    0,    0,  314,  314,  314,  314,  314,
+      314,  314,    0,  314,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  314,
+      316,  316,    0,    0,  316,    0,    0,    0,  316,  316,
+      316,  316,  316,  316,  316,    0,  316,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  316,  318,  318,    0,    0,  318,    0,    0,
+
+        0,  318,  318,  318,  318,  318,  318,  318,    0,  318,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  318,  320,  320,    0,    0,
+      320,    0,    0,    0,  320,  320,  320,  320,  320,  320,
+      320,    0,  320,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  320,  322,
+      322,    0,    0,  322,    0,    0,    0,  322,  322,  322,
+      322,  322,  322,  322,    0,  322,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  322,  324,  324,    0,    0,  324,    0,    0,    0,
+      324,  324,  324,  324,  324,  324,  324,    0,  324,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  324,  326,  326,    0,    0,  326,
+        0,    0,    0,  326,  326,  326,  326,  326,  326,  326,
+        0,  326,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,  326,  328,  328,
+        0,    0,  328,    0,    0,    0,  328,  328,  328,  328,
+      328,  328,  328,    0,  328,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      328,  330,  330,    0,    0,  330,    0,    0,    0,  330,
+      330,  330,  330,  330,  330,  330,    0,  330,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  330,  464,  464,  464,  464,  464,  464,
+
+      464,    0,    0,    0,    0,    0,    0,    0,  464,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  464,  464,
+      465,  465,  465,  465,  465,  465,  465,    0,    0,    0,
+        0,    0,  465,  465,  465,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,  465,  465,  503,  503,    0,    0,
+      503,    0,    0,    0,  503,  503,  503,  503,  503,  503,
+      503,    0,  503,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  503,  770,
+      770,  770,  770,  770,  770,  770,  770,  770,  771,  771,
+      771,  771,  771,  771,  771,  771,  771,  772,  772,  772,
+      772,  772,  772,  772,  772,  772,  773,  773,  773,  773,
+      773,  773,  773,  773,  773,  774,    0,    0,    0,    0,
+      774,    0,  774,  775,  775,    0,  775,  775,  775,  775,
+
+      775,  775,  776,    0,  776,  777,  777,  777,  777,  777,
+      777,  777,  777,  777,  778,    0,    0,    0,  778,  778,
+        0,  778,  779,  779,  779,  779,  779,  779,  779,  779,
+      779,  780,  780,  780,  780,  780,  780,  780,  780,  781,
+      781,  781,  781,  781,  781,  781,  781,  782,  782,  782,
+      782,  782,  782,  782,  782,  782,  783,  783,  783,  783,
+      783,  783,  783,  783,  784,  784,  784,  784,  784,  784,
+      784,  784,  784,  785,  785,  785,  785,  785,  785,  785,
+      785,  785,  786,  786,  786,  786,  786,  786,  786,  786,
+      786,  787,  787,  787,  787,  787,  787,  787,  787,  787,
+
+      788,  788,  788,  788,  788,  788,  788,  788,  788,  789,
+      789,  789,  789,  789,  789,  789,  789,  789,  790,  790,
+        0,    0,  790,  790,    0,  790,  791,  791,    0,    0,
+      791,  791,    0,  791,  792,  792,    0,    0,  792,  792,
+        0,  792,  793,  793,    0,    0,  793,  793,    0,  793,
+      794,  794,    0,    0,  794,  794,    0,  794,  795,  795,
+        0,    0,  795,  795,    0,  795,  796,  796,    0,    0,
+      796,  796,    0,  796,  797,  797,    0,    0,  797,  797,
+        0,  797,  798,  798,    0,    0,  798,  798,    0,  798,
+      799,  799,    0,    0,  799,  799,    0,  799,  800,  800,
+
+        0,    0,  800,  800,    0,  800,  801,  801,    0,    0,
+      801,  801,    0,  801,  802,  802,    0,    0,  802,  802,
+        0,  802,  803,  803,    0,    0,  803,  803,    0,  803,
+      804,  804,    0,    0,  804,  804,    0,  804,  805,  805,
+        0,    0,  805,  805,    0,  805,  806,  806,  806,  806,
+      806,  806,  806,  806,  806,  807,  807,  807,  807,  807,
+      807,  807,  807,  807,  808,  808,  808,  808,  808,  808,
+      808,  808,  808,  809,  809,  809,  809,  809,  809,  809,
+      809,  810,  810,  810,  810,  810,  810,  810,  810,  811,
+      811,  811,  811,  811,  811,  811,  811,  811,  812,  812,
+
+      812,  812,  812,  812,  812,  812,  813,  813,  813,  813,
+      813,  813,  813,  813,  813,  814,  814,  814,  814,  814,
+      814,  814,  814,  814,  815,  815,  815,  815,  815,  815,
+      815,  815,  815,  816,  816,  816,  816,  816,  816,  816,
+      816,  816,  817,  817,  817,  817,  817,  817,  817,  817,
+      817,  818,  818,  818,  818,  818,  818,  818,  818,  818,
+      819,  819,  819,  819,  819,  819,  819,  819,  819,  820,
+      820,  820,  820,  820,  820,  820,  820,  820,  821,  821,
+      821,  821,  821,  821,  821,  821,  821,  822,    0,    0,
+      822,    0,    0,  822,  823,    0,    0,  823,    0,    0,
+
+      823,  824,    0,    0,  824,    0,    0,  824,  825,    0,
+        0,  825,    0,    0,  825,  826,    0,    0,  826,    0,
+        0,  826,  827,    0,    0,  827,    0,    0,  827,  828,
+        0,    0,  828,    0,    0,  828,  829,    0,    0,  829,
+        0,    0,  829,  830,    0,    0,  830,    0,    0,  830,
+      831,    0,    0,  831,    0,    0,  831,  832,    0,    0,
+      832,    0,    0,  832,  833,    0,    0,  833,    0,    0,
+      833,  834,    0,    0,  834,    0,    0,  834,  835,    0,
+        0,  835,    0,    0,  835,  836,    0,    0,  836,    0,
+        0,  836,  837,    0,    0,  837,    0,    0,  837,  838,
+
+      838,    0,    0,  838,  838,    0,  838,  839,  839,    0,
+        0,  839,  839,    0,  839,  840,  840,    0,    0,  840,
+      840,    0,  840,  841,  841,    0,    0,  841,  841,    0,
+      841,  842,  842,    0,    0,  842,  842,    0,  842,  843,
+      843,    0,    0,  843,  843,    0,  843,  844,  844,    0,
+        0,  844,  844,    0,  844,  845,  845,    0,    0,  845,
+      845,    0,  845,  846,  846,    0,    0,  846,  846,    0,
+      846,  847,  847,    0,    0,  847,  847,    0,  847,  848,
+      848,    0,    0,  848,  848,    0,  848,  849,  849,    0,
+        0,  849,  849,    0,  849,  850,  850,    0,    0,  850,
+
+      850,    0,  850,  851,  851,    0,    0,  851,  851,    0,
+      851,  852,  852,    0,    0,  852,  852,    0,  852,  853,
+      853,    0,    0,  853,  853,    0,  853,  854,    0,    0,
+        0,  854,  854,  854,  854,  855,  855,  855,  855,  855,
+      855,  855,  855,  855,  856,  856,  856,  856,  856,  856,
+      856,  856,  857,  857,  857,  857,  857,  857,  857,  857,
+      857,  858,    0,    0,  858,    0,    0,  858,  859,    0,
+        0,  859,    0,    0,  859,  860,    0,    0,  860,    0,
+        0,  860,  861,    0,    0,  861,    0,    0,  861,  862,
+        0,    0,  862,    0,    0,  862,  863,    0,    0,  863,
+
+        0,    0,  863,  864,    0,    0,  864,    0,    0,  864,
+      865,    0,    0,  865,    0,    0,  865,  866,    0,    0,
+      866,    0,    0,  866,  867,    0,    0,  867,    0,    0,
+      867,  868,    0,    0,  868,    0,    0,  868,  869,    0,
+        0,  869,    0,    0,  869,  870,    0,    0,  870,    0,
+        0,  870,  871,    0,    0,  871,    0,    0,  871,  872,
+        0,    0,  872,    0,    0,  872,  873,    0,    0,  873,
+        0,    0,  873,  874,  874,    0,    0,  874,  874,    0,
+      874,  875,  875,  875,  875,  875,  875,  875,  875,  875,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769,  769,  769,
+      769,  769,  769,  769,  769,  769,  769,  769
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[139] =
+    {   0,
+1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,     };
+
+extern int hyy_flex_debug;
+int hyy_flex_debug = 1;
+
+static yyconst flex_int16_t yy_rule_linenum[138] =
+    {   0,
+      143,  148,  155,  157,  159,  169,  170,  171,  172,  173,
+      174,  175,  176,  177,  178,  179,  180,  181,  182,  186,
+      187,  188,  189,  190,  191,  192,  193,  194,  195,  196,
+      197,  198,  199,  200,  201,  202,  203,  204,  205,  206,
+      207,  208,  209,  210,  211,  212,  213,  214,  215,  216,
+      217,  218,  222,  223,  224,  225,  226,  227,  228,  229,
+      230,  231,  232,  233,  234,  235,  236,  237,  238,  239,
+      240,  242,  243,  244,  245,  246,  247,  248,  249,  250,
+      251,  252,  253,  254,  255,  256,  257,  258,  259,  260,
+      261,  262,  263,  264,  265,  266,  267,  268,  269,  270,
+
+      271,  272,  273,  274,  275,  279,  280,  285,  288,  289,
+      290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
+      300,  301,  302,  303,  307,  312,  327,  329,  361,  363,
+      365,  368,  370,  372,  375,  391,  396
+    } ;
+
+static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
+static char *yy_full_match;
+static int yy_lp;
+#define REJECT \
+{ \
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */ \
+yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
+++(yy_lp); \
+goto find_rule; \
+}
+
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *hyytext;
+#line 1 "hyp_l.l"
+/*
+ * read hyperlynx files
+ * Copyright 2012, 2016 Koen De Vleeschauwer.
+ *
+ * This file is part of pcb-rnd.
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+/* avoid collision with other scanners */
+#line 28 "hyp_l.l"
+#include <stdlib.h>
+
+char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */
+
+#include "hyp_y.h"
+
+/* copy a string between quotes */
+char *strunquote(const char *);
+
+/* print error message */
+void hyyerror(const char *);
+
+/* remember hyperlynx file section we're in */
+int section = -1;
+
+/*
+* The scanner knows five states: INITIAL, STATE_STRING, STATE_POSINT, STATE_FLOAT and STATE_COMMENT
+*
+* In state INITIAL the scanner recognizes:
+* - punctuation (such as {}()=, )
+* - keywords (such as VERSION, BOARD, NET), 
+* - strings (both between double quotes " and unquoted),
+* - and floating point numbers (with optional suffix, eg. 10 uF), 
+*
+* In STATE_STRING the scanner recognizes punctuation and strings only.
+* This avoids unquoted strings being interpreted as numbers, or keywords.
+*
+* In STATE_POSINT the scanner recognizes a positive integer.
+*
+* In STATE_FLOAT the scanner recognizes a floating point number (without suffix).
+*
+* In STATE_COMMENT the scanner discards all text up to the next 
+* right brace } , and then continues in state INITIAL.
+*
+*/
+
+/* whitespace: space, tab, vertical tab, form feed */
+/* accept windows and unix newlines */
+/* 
+* lines with an asterisk in the first column are comments 
+*/
+/* Left-hand side of an assignment: check whether next token is equals sign */
+/*
+* Positive integer
+*/
+/*
+* Floating point numbers
+*/
+/* ordinary floating point numbers */
+/* floating point numbers with suffix, e,g. pF, nH */
+/* 
+* Strings
+*/
+/* an unquoted string */
+/* a sequence of characters, excluding whitespace and reserved characters.
+* also allow strings such as "(Net0)" .
+*/
+/* a string enclosed in double quotes " */
+/* an unquoted string with spaces */
+/* all variables used in assignments */
+/* an unquoted string with spaces is terminated by the next assignment or the end of line */
+/* an empty string is terminated by the next assignment, a ')' or a '}' */
+#line 2045 "hyp_l.c"
+
+#define INITIAL 0
+#define STATE_STRING 1
+#define STATE_POSINT 2
+#define STATE_FLOAT 3
+#define STATE_COMMENT 4
+#define STATE_COMMENT_EOL 5
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+/* %if-c-only */
+#include <unistd.h>
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* %if-c-only Reentrant structure and macros (non-C++). */
+/* %if-reentrant */
+/* %if-c-only */
+
+static int yy_init_globals (void );
+
+/* %endif */
+/* %if-reentrant */
+/* %endif */
+/* %endif End reentrant structures and macros. */
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int hyylex_destroy (void );
+
+int hyyget_debug (void );
+
+void hyyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE hyyget_extra (void );
+
+void hyyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *hyyget_in (void );
+
+void hyyset_in  (FILE * in_str  );
+
+FILE *hyyget_out (void );
+
+void hyyset_out  (FILE * out_str  );
+
+int hyyget_leng (void );
+
+char *hyyget_text (void );
+
+int hyyget_lineno (void );
+
+void hyyset_lineno (int line_number  );
+
+/* %if-bison-bridge */
+/* %endif */
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int hyywrap (void );
+#else
+extern int hyywrap (void );
+#endif
+#endif
+
+/* %not-for-header */
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+/* %ok-for-header */
+
+/* %endif */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+/* %ok-for-header */
+
+/* %endif */
+#endif
+
+/* %if-c-only */
+
+/* %endif */
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* %if-c-only Standard (non-C++) definition */
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( hyytext, hyyleng, 1, hyyout )) {} } while (0)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+/* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( hyyin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( hyyin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, hyyin))==0 && ferror(hyyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(hyyin); \
+			} \
+		}\
+\
+/* %if-c++-only C++ definition \ */\
+/* %endif */
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+/* %if-c-only */
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+#endif
+
+/* %if-tables-serialization structures and prototypes */
+/* %not-for-header */
+
+/* %ok-for-header */
+
+/* %not-for-header */
+
+/* %tables-yydmap generated elements */
+/* %endif */
+/* end tables serialization structures and prototypes */
+
+/* %ok-for-header */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+/* %if-c-only Standard (non-C++) definition */
+
+extern int hyylex (void);
+
+#define YY_DECL int hyylex (void)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after hyytext and hyyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+/* %% [6.0] YY_RULE_SETUP definition goes here */
+#define YY_RULE_SETUP \
+	if ( hyyleng > 0 ) \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+				(hyytext[hyyleng - 1] == '\n'); \
+	YY_USER_ACTION
+
+/* %not-for-header */
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+/* %% [7.0] user's declarations go here */
+#line 139 "hyp_l.l"
+
+
+ /* When in STATE_COMMENT skip all comment until next right brace */
+#line 2304 "hyp_l.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+        /* Create the reject buffer large enough to save one state per allowed character. */
+        if ( ! (yy_state_buf) )
+            (yy_state_buf) = (yy_state_type *)hyyalloc(YY_STATE_BUF_SIZE  );
+            if ( ! (yy_state_buf) )
+                YY_FATAL_ERROR( "out of dynamic memory in hyylex()" );
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! hyyin )
+/* %if-c-only */
+			hyyin = stdin;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+		if ( ! hyyout )
+/* %if-c-only */
+			hyyout = stdout;
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			hyyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				hyy_create_buffer(hyyin,YY_BUF_SIZE );
+		}
+
+		hyy_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+/* %% [8.0] yymore()-related code goes here */
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of hyytext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+/* %% [9.0] code to set up and find next match goes here */
+		yy_current_state = (yy_start);
+		yy_current_state += YY_AT_BOL();
+
+		(yy_state_ptr) = (yy_state_buf);
+		*(yy_state_ptr)++ = yy_current_state;
+
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 770 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			*(yy_state_ptr)++ = yy_current_state;
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 4391 );
+
+yy_find_action:
+/* %% [10.0] code to find the action number goes here */
+		yy_current_state = *--(yy_state_ptr);
+		(yy_lp) = yy_accept[yy_current_state];
+find_rule: /* we branch to this label when backing up */
+		for ( ; ; ) /* until we find what rule we matched */
+			{
+			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
+				{
+				yy_act = yy_acclist[(yy_lp)];
+					{
+					(yy_full_match) = yy_cp;
+					break;
+					}
+				}
+			--yy_cp;
+			yy_current_state = *--(yy_state_ptr);
+			(yy_lp) = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+/* %% [11.0] code for hyylineno update goes here */
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+			{
+			int yyl;
+			for ( yyl = 0; yyl < hyyleng; ++yyl )
+				if ( hyytext[yyl] == '\n' )
+					   
+    hyylineno++;
+;
+			}
+
+do_action:	/* This label is used only to access EOF actions. */
+
+/* %% [12.0] debug code goes here */
+		if ( hyy_flex_debug )
+			{
+			if ( yy_act == 0 )
+				fprintf( stderr, "--scanner backing up\n" );
+			else if ( yy_act < 138 )
+				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
+				         (long)yy_rule_linenum[yy_act], hyytext );
+			else if ( yy_act == 138 )
+				fprintf( stderr, "--accepting default rule (\"%s\")\n",
+				         hyytext );
+			else if ( yy_act == 139 )
+				fprintf( stderr, "--(end of buffer or a NUL)\n" );
+			else
+				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
+			}
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+/* %% [13.0] actions go here */
+
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 143 "hyp_l.l"
+{ BEGIN INITIAL; /* skip all comment until next right brace */ }
+	YY_BREAK
+
+/* When in STATE_COMMENT_EOL skip all comment until end-of-line */
+
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 148 "hyp_l.l"
+{ BEGIN INITIAL; /* skip all comment until next end-of-line */ }
+	YY_BREAK
+
+/* skip comments and whitespace */
+
+case 3:
+/* rule 3 can match eol */
+YY_RULE_SETUP
+#line 155 "hyp_l.l"
+{ /* skip comments */ }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 157 "hyp_l.l"
+{ /* skip whitespace */ }
+	YY_BREAK
+case 5:
+/* rule 5 can match eol */
+YY_RULE_SETUP
+#line 159 "hyp_l.l"
+{ /* skip newlines */ }
+	YY_BREAK
+
+/*
+  * Hyperlynx keywords 
+  */
+/* Sections */
+case 6:
+YY_RULE_SETUP
+#line 169 "hyp_l.l"
+{section = H_BOARD_FILE; return H_BOARD_FILE;}
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 170 "hyp_l.l"
+{section = H_VERSION; return H_VERSION;}
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 171 "hyp_l.l"
+{section = H_DATA_MODE; return H_DATA_MODE;}
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 172 "hyp_l.l"
+{section = H_UNITS; return H_UNITS;}
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 173 "hyp_l.l"
+{section = H_PLANE_SEP; return H_PLANE_SEP;}
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 174 "hyp_l.l"
+{section = H_BOARD; BEGIN STATE_COMMENT_EOL; return H_BOARD;}
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 175 "hyp_l.l"
+{section = H_STACKUP; BEGIN STATE_COMMENT_EOL; return H_STACKUP;}
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 176 "hyp_l.l"
+{section = H_DEVICES; BEGIN STATE_COMMENT_EOL; return H_DEVICES;}
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 177 "hyp_l.l"
+{section = H_SUPPLIES; BEGIN STATE_COMMENT_EOL; return H_SUPPLIES;}
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 178 "hyp_l.l"
+{section = H_PADSTACK; BEGIN STATE_STRING; return H_PADSTACK;}
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 179 "hyp_l.l"
+{section = H_NET; BEGIN STATE_STRING; return H_NET;}
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 180 "hyp_l.l"
+{section = H_NET_CLASS; return H_NET_CLASS;}
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 181 "hyp_l.l"
+{section = H_END; return H_END;}
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 182 "hyp_l.l"
+{section = H_KEY; return H_KEY;}
+	YY_BREAK
+/* Keywords */
+case 20:
+YY_RULE_SETUP
+#line 186 "hyp_l.l"
+{return H_A;}
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 187 "hyp_l.l"
+{return H_ARC;}
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 188 "hyp_l.l"
+{return H_COPPER;}
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 189 "hyp_l.l"
+{return H_CURVE;}
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 190 "hyp_l.l"
+{if (section == H_DATA_MODE) BEGIN STATE_COMMENT; return H_DETAILED;}
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 191 "hyp_l.l"
+{return H_DIELECTRIC;}
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 192 "hyp_l.l"
+{return H_ENGLISH;}
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 193 "hyp_l.l"
+{if (section == H_UNITS) BEGIN STATE_COMMENT; return H_LENGTH;}
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 194 "hyp_l.l"
+{return H_LINE;}
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 195 "hyp_l.l"
+{return H_METRIC;}
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 196 "hyp_l.l"
+{return H_M;}
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 197 "hyp_l.l"
+{return H_N;}
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 198 "hyp_l.l"
+{return H_OPTIONS;}
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 199 "hyp_l.l"
+{return H_PAD;}
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 200 "hyp_l.l"
+{return H_PERIMETER_ARC;}
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 201 "hyp_l.l"
+{return H_PERIMETER_SEGMENT;}
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 202 "hyp_l.l"
+{return H_PIN;}
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 203 "hyp_l.l"
+{return H_PLANE;}
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 204 "hyp_l.l"
+{return H_POLYGON;}
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 205 "hyp_l.l"
+{return H_POLYLINE;}
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 206 "hyp_l.l"
+{return H_POLYVOID;}
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 207 "hyp_l.l"
+{return H_POUR;}
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 208 "hyp_l.l"
+{return H_S;}
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 209 "hyp_l.l"
+{return H_T;}
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 210 "hyp_l.l"
+{return H_SEG;}
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 211 "hyp_l.l"
+{return H_SIGNAL;}
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 212 "hyp_l.l"
+{if (section == H_DATA_MODE) BEGIN STATE_COMMENT; return H_SIMPLIFIED; }
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 213 "hyp_l.l"
+{return H_SIM_BOTH;}
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 214 "hyp_l.l"
+{return H_SIM_IN;}
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 215 "hyp_l.l"
+{return H_SIM_OUT;}
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 216 "hyp_l.l"
+{return H_USEG;}
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 217 "hyp_l.l"
+{return H_VIA;}
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 218 "hyp_l.l"
+{if (section == H_UNITS) BEGIN STATE_COMMENT; return H_WEIGHT;}
+	YY_BREAK
+/* Assignments */
+case 53:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 222 "hyp_l.l"
+{return H_A;}
+	YY_BREAK
+case 54:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 223 "hyp_l.l"
+{return H_A1;}
+	YY_BREAK
+case 55:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 224 "hyp_l.l"
+{return H_A2;}
+	YY_BREAK
+case 56:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 225 "hyp_l.l"
+{return H_BR;}
+	YY_BREAK
+case 57:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 226 "hyp_l.l"
+{return H_C;}
+	YY_BREAK
+case 58:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 227 "hyp_l.l"
+{return H_C_QM;}
+	YY_BREAK
+case 59:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 228 "hyp_l.l"
+{return H_CO_QM;}
+	YY_BREAK
+case 60:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 229 "hyp_l.l"
+{return H_D;}
+	YY_BREAK
+case 61:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 230 "hyp_l.l"
+{return H_ER;}
+	YY_BREAK
+case 62:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 231 "hyp_l.l"
+{return H_F;}
+	YY_BREAK
+case 63:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 232 "hyp_l.l"
+{BEGIN STATE_POSINT; return H_ID;}
+	YY_BREAK
+case 64:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 233 "hyp_l.l"
+{BEGIN STATE_STRING; return H_L;}
+	YY_BREAK
+case 65:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 234 "hyp_l.l"
+{BEGIN STATE_STRING; return H_L1;}
+	YY_BREAK
+case 66:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 235 "hyp_l.l"
+{BEGIN STATE_STRING; return H_L2;}
+	YY_BREAK
+case 67:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 236 "hyp_l.l"
+{return H_LPS;}
+	YY_BREAK
+case 68:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 237 "hyp_l.l"
+{return H_LT;}
+	YY_BREAK
+case 69:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 238 "hyp_l.l"
+{BEGIN STATE_STRING; return H_M;}
+	YY_BREAK
+case 70:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 239 "hyp_l.l"
+{BEGIN STATE_STRING; return H_N;}
+	YY_BREAK
+case 71:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 4;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 240 "hyp_l.l"
+{BEGIN STATE_STRING; return H_NAME;}
+	YY_BREAK
+/* P is used as "plating thickness" in "stackup/signal" and as "padstack" in "net/via" */
+case 72:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 242 "hyp_l.l"
+{if (section == H_NET) BEGIN STATE_STRING; return H_P;}
+	YY_BREAK
+case 73:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 243 "hyp_l.l"
+{BEGIN STATE_STRING; return H_PKG;}
+	YY_BREAK
+case 74:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 244 "hyp_l.l"
+{return H_PR_QM;}
+	YY_BREAK
+case 75:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 245 "hyp_l.l"
+{return H_PS;}
+	YY_BREAK
+case 76:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 246 "hyp_l.l"
+{return H_R;}
+	YY_BREAK
+case 77:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 247 "hyp_l.l"
+{BEGIN STATE_STRING; return H_REF;}
+	YY_BREAK
+case 78:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 248 "hyp_l.l"
+{BEGIN STATE_STRING; return H_S;}
+	YY_BREAK
+case 79:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 249 "hyp_l.l"
+{return H_SX;}
+	YY_BREAK
+case 80:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 250 "hyp_l.l"
+{return H_SY;}
+	YY_BREAK
+case 81:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 251 "hyp_l.l"
+{BEGIN STATE_STRING; return H_S1;}
+	YY_BREAK
+case 82:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 252 "hyp_l.l"
+{return H_S1X;}
+	YY_BREAK
+case 83:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 253 "hyp_l.l"
+{return H_S1Y;}
+	YY_BREAK
+case 84:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 254 "hyp_l.l"
+{BEGIN STATE_STRING; return H_S2;}
+	YY_BREAK
+case 85:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 255 "hyp_l.l"
+{return H_S2X;}
+	YY_BREAK
+case 86:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 256 "hyp_l.l"
+{return H_S2Y;}
+	YY_BREAK
+case 87:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 257 "hyp_l.l"
+{return H_T;}
+	YY_BREAK
+case 88:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 258 "hyp_l.l"
+{return H_TC;}
+	YY_BREAK
+case 89:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 17;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 259 "hyp_l.l"
+{return H_USE_DIE_FOR_METAL;}
+	YY_BREAK
+case 90:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 260 "hyp_l.l"
+{BEGIN STATE_STRING; return H_V;}
+	YY_BREAK
+case 91:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 261 "hyp_l.l"
+{return H_V_QM;}
+	YY_BREAK
+case 92:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 3;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 262 "hyp_l.l"
+{if (section == H_DEVICES) BEGIN STATE_STRING; return H_VAL;}
+	YY_BREAK
+case 93:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 263 "hyp_l.l"
+{return H_W;}
+	YY_BREAK
+case 94:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 264 "hyp_l.l"
+{return H_X;}
+	YY_BREAK
+case 95:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 265 "hyp_l.l"
+{return H_X1;}
+	YY_BREAK
+case 96:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 266 "hyp_l.l"
+{return H_X2;}
+	YY_BREAK
+case 97:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 267 "hyp_l.l"
+{return H_XC;}
+	YY_BREAK
+case 98:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 268 "hyp_l.l"
+{return H_Y;}
+	YY_BREAK
+case 99:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 269 "hyp_l.l"
+{return H_Y1;}
+	YY_BREAK
+case 100:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 270 "hyp_l.l"
+{return H_Y2;}
+	YY_BREAK
+case 101:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 271 "hyp_l.l"
+{return H_YC;}
+	YY_BREAK
+case 102:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 1;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 272 "hyp_l.l"
+{return H_Z;}
+	YY_BREAK
+case 103:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 273 "hyp_l.l"
+{BEGIN STATE_STRING; return H_ZL;}
+	YY_BREAK
+case 104:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 4;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 274 "hyp_l.l"
+{return H_ZLEN;}
+	YY_BREAK
+case 105:
+*yy_cp = (yy_hold_char); /* undo effects of setting up hyytext */
+(yy_c_buf_p) = yy_cp = yy_bp + 2;
+YY_DO_BEFORE_ACTION; /* set up hyytext again */
+YY_RULE_SETUP
+#line 275 "hyp_l.l"
+{return H_ZW;}
+	YY_BREAK
+/* Booleans */
+case 106:
+YY_RULE_SETUP
+#line 279 "hyp_l.l"
+{hyylval.boolval = 1; return H_BOOL; }
+	YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 280 "hyp_l.l"
+{hyylval.boolval = 0; return H_BOOL; }
+	YY_BREAK
+/* Floats */
+/* ordinary floating point numbers */
+case 108:
+YY_RULE_SETUP
+#line 285 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL); return H_FLOAT;}
+	YY_BREAK
+/* floating point numbers with suffix, e,g. pF, nH */
+case 109:
+YY_RULE_SETUP
+#line 288 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e24; return H_FLOAT;}
+	YY_BREAK
+case 110:
+YY_RULE_SETUP
+#line 289 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e21; return H_FLOAT;}
+	YY_BREAK
+case 111:
+YY_RULE_SETUP
+#line 290 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e18; return H_FLOAT;}
+	YY_BREAK
+case 112:
+YY_RULE_SETUP
+#line 291 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e15; return H_FLOAT;}
+	YY_BREAK
+case 113:
+YY_RULE_SETUP
+#line 292 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e12; return H_FLOAT;}
+	YY_BREAK
+case 114:
+YY_RULE_SETUP
+#line 293 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e9; return H_FLOAT;}
+	YY_BREAK
+case 115:
+YY_RULE_SETUP
+#line 294 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e6; return H_FLOAT;}
+	YY_BREAK
+case 116:
+YY_RULE_SETUP
+#line 295 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e3; return H_FLOAT;}
+	YY_BREAK
+case 117:
+YY_RULE_SETUP
+#line 296 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-3; return H_FLOAT;}
+	YY_BREAK
+case 118:
+YY_RULE_SETUP
+#line 297 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-6; return H_FLOAT;}
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 298 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-9; return H_FLOAT;}
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 299 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-12; return H_FLOAT;}
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 300 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-15; return H_FLOAT;}
+	YY_BREAK
+case 122:
+YY_RULE_SETUP
+#line 301 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-18; return H_FLOAT;}
+	YY_BREAK
+case 123:
+YY_RULE_SETUP
+#line 302 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-21; return H_FLOAT;}
+	YY_BREAK
+case 124:
+YY_RULE_SETUP
+#line 303 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL) * 1e-24; return H_FLOAT;}
+	YY_BREAK
+/* floating point numbers in VERSION and PLANE_SEP have no suffix and are followed by optional comments */
+
+case 125:
+YY_RULE_SETUP
+#line 307 "hyp_l.l"
+{hyylval.floatval = strtod(hyytext, NULL); BEGIN STATE_COMMENT; return H_FLOAT;}
+	YY_BREAK
+
+/* A positive integer is used only in polygon/polyline/polyvoid "ID = posint" */
+
+case 126:
+YY_RULE_SETUP
+#line 312 "hyp_l.l"
+{ BEGIN INITIAL; hyylval.intval = atoi(hyytext); return H_POSINT; }
+	YY_BREAK
+
+/* 
+                     * This is a workaround for syntactically incorrect .hyp files.
+                     * We accept the following constructs as representing an empty string:
+                     * NAME= L1=somelayer
+                     * NAME= )
+                     * NAME= }
+                     * and we accept the following constructs as representing "a string with spaces"
+                     * NAME=a string with spaces L1=somelayer
+                     */
+
+case 127:
+YY_RULE_SETUP
+#line 327 "hyp_l.l"
+{ yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */
+	YY_BREAK
+case 128:
+YY_RULE_SETUP
+#line 329 "hyp_l.l"
+{
+                      /*
+                       * Commas are not allowed in strings in the padstack section unless the string is enclosed in double quotes (").
+                       */
+
+                      if ((section == H_PADSTACK) && strchr(hyytext, ','))
+                        REJECT 
+                      else 
+                      { 
+                        char *s = pcb_strdup(hyytext);
+  
+                        BEGIN INITIAL; 
+  
+                        /* strip final ' VAR=' */
+                        if ((strlen(s) != 0) && (s[strlen(s)-1] == '=')) {
+                          char* space = strrchr(s, ' ');
+                          /* strip trailing spaces */
+                          if (space != NULL)
+                            while ((space >= s) && (*space == ' ')) *space-- = '\0';
+                          yyless(strlen(s));
+                          if (strchr(s, ' ') != NULL) hyyerror("warning: unquoted string contains space");
+                          }
+  
+                        hyylval.strval = s;
+  
+                        return H_STRING;
+                      }
+                    }
+	YY_BREAK
+
+
+case 129:
+YY_RULE_SETUP
+#line 361 "hyp_l.l"
+{return '{';}
+	YY_BREAK
+case 130:
+YY_RULE_SETUP
+#line 363 "hyp_l.l"
+{BEGIN STATE_COMMENT_EOL; return '}';}
+	YY_BREAK
+case 131:
+YY_RULE_SETUP
+#line 365 "hyp_l.l"
+{if (section == H_PADSTACK) BEGIN STATE_STRING; return '(';}
+	YY_BREAK
+/* allow for comment after the closing bracket ) */
+case 132:
+YY_RULE_SETUP
+#line 368 "hyp_l.l"
+{BEGIN STATE_COMMENT_EOL; return ')';}
+	YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 370 "hyp_l.l"
+{return ',';}
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 372 "hyp_l.l"
+{if ((section == H_VERSION) || (section == H_PLANE_SEP)) BEGIN STATE_FLOAT; return '=';}
+	YY_BREAK
+/* string */
+case 135:
+YY_RULE_SETUP
+#line 375 "hyp_l.l"
+{ 
+                        /*
+                         * Commas are not allowed in strings in the padstack section unless the string is enclosed in double quotes (").
+                         */
+
+                        if ((section == H_PADSTACK) && strchr(hyytext, ','))
+                          REJECT 
+                        else 
+                        { 
+                          BEGIN INITIAL; 
+                          hyylval.strval = pcb_strdup(hyytext); 
+                          return H_STRING;
+                        }
+                      }
+	YY_BREAK
+/* string in double quotes */
+case 136:
+YY_RULE_SETUP
+#line 391 "hyp_l.l"
+{BEGIN INITIAL; hyylval.strval = strunquote(hyytext); return H_STRING;}
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(STATE_STRING):
+case YY_STATE_EOF(STATE_POSINT):
+case YY_STATE_EOF(STATE_FLOAT):
+case YY_STATE_EOF(STATE_COMMENT):
+case YY_STATE_EOF(STATE_COMMENT_EOL):
+#line 393 "hyp_l.l"
+{yyterminate();}
+	YY_BREAK
+/* have bison catch all unrecognized characters with parse errors */
+case 137:
+YY_RULE_SETUP
+#line 396 "hyp_l.l"
+{return hyytext[0];}
+	YY_BREAK
+
+case 138:
+YY_RULE_SETUP
+#line 400 "hyp_l.l"
+YY_FATAL_ERROR( "flex scanner jammed" );
+	YY_BREAK
+#line 3382 "hyp_l.c"
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed hyyin at a new source and called
+			 * hyylex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = hyyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+/* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( hyywrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * hyytext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of hyylex */
+/* %ok-for-header */
+
+/* %if-c++-only */
+/* %not-for-header */
+
+/* %ok-for-header */
+
+/* %endif */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+/* %if-c-only */
+static int yy_get_next_buffer (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			YY_FATAL_ERROR(
+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), (size_t) num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			hyyrestart(hyyin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) hyyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+/* %if-c-only */
+/* %not-for-header */
+
+    static yy_state_type yy_get_previous_state (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+/* %% [15.0] code to get the start state into yy_current_state goes here */
+	yy_current_state = (yy_start);
+	yy_current_state += YY_AT_BOL();
+
+	(yy_state_ptr) = (yy_state_buf);
+	*(yy_state_ptr)++ = yy_current_state;
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+/* %% [16.0] code to find the next state goes here */
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 770 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		*(yy_state_ptr)++ = yy_current_state;
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+/* %if-c-only */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register int yy_is_jam;
+    /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
+
+	register YY_CHAR yy_c = 1;
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 770 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 769);
+	if ( ! yy_is_jam )
+		*(yy_state_ptr)++ = yy_current_state;
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+/* %if-c-only */
+
+    static void yyunput (int c, register char * yy_bp )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up hyytext */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+/* %% [18.0] update hyylineno here */
+
+    if ( c == '\n' ){
+        --hyylineno;
+    }
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+/* %if-c-only */
+
+/* %endif */
+
+/* %if-c-only */
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					hyyrestart(hyyin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( hyywrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve hyytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+/* %% [19.0] update BOL and hyylineno */
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol )
+		   
+    hyylineno++;
+;
+
+	return c;
+}
+/* %if-c-only */
+#endif	/* ifndef YY_NO_INPUT */
+/* %endif */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+/* %if-c-only */
+    void hyyrestart  (FILE * input_file )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        hyyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            hyy_create_buffer(hyyin,YY_BUF_SIZE );
+	}
+
+	hyy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	hyy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+/* %if-c-only */
+    void hyy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		hyypop_buffer_state();
+	 *		hyypush_buffer_state(new_buffer);
+     */
+	hyyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	hyy_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (hyywrap()) processing, but the only time this flag
+	 * is looked at is after hyywrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/* %if-c-only */
+static void hyy_load_buffer_state  (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	hyyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+/* %if-c-only */
+    YY_BUFFER_STATE hyy_create_buffer  (FILE * file, int  size )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) hyyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in hyy_create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) hyyalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in hyy_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	hyy_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with hyy_create_buffer()
+ * 
+ */
+/* %if-c-only */
+    void hyy_delete_buffer (YY_BUFFER_STATE  b )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		hyyfree((void *) b->yy_ch_buf  );
+
+	hyyfree((void *) b  );
+}
+
+/* %if-c-only */
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a hyyrestart() or at EOF.
+ */
+/* %if-c-only */
+    static void hyy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+{
+	int oerrno = errno;
+    
+	hyy_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then hyy_init_buffer was _probably_
+     * called from hyyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+/* %if-c-only */
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+/* %if-c-only */
+    void hyy_flush_buffer (YY_BUFFER_STATE  b )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		hyy_load_buffer_state( );
+}
+
+/* %if-c-or-c++ */
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+/* %if-c-only */
+void hyypush_buffer_state (YY_BUFFER_STATE new_buffer )
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	if (new_buffer == NULL)
+		return;
+
+	hyyensure_buffer_stack();
+
+	/* This block is copied from hyy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from hyy_switch_to_buffer. */
+	hyy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+/* %endif */
+
+/* %if-c-or-c++ */
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+/* %if-c-only */
+void hyypop_buffer_state (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	hyy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		hyy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+/* %endif */
+
+/* %if-c-or-c++ */
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+/* %if-c-only */
+static void hyyensure_buffer_stack (void)
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)hyyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in hyyensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)hyyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in hyyensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE hyy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) hyyalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in hyy_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	hyy_switch_to_buffer(b  );
+
+	return b;
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan a string. The next call to hyylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       hyy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE hyy_scan_string (yyconst char * yystr )
+{
+    
+	return hyy_scan_bytes(yystr,strlen(yystr) );
+}
+/* %endif */
+
+/* %if-c-only */
+/** Setup the input buffer state to scan the given bytes. The next call to hyylex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE hyy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) hyyalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in hyy_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = hyy_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in hyy_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+/* %endif */
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+/* %if-c-only */
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up hyytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		hyytext[hyyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = hyytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		hyyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/* %if-c-only */
+/* %if-reentrant */
+/* %endif */
+
+/** Get the current line number.
+ * 
+ */
+int hyyget_lineno  (void)
+{
+        
+    return hyylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *hyyget_in  (void)
+{
+        return hyyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *hyyget_out  (void)
+{
+        return hyyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int hyyget_leng  (void)
+{
+        return hyyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *hyyget_text  (void)
+{
+        return hyytext;
+}
+
+/* %if-reentrant */
+/* %endif */
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void hyyset_lineno (int  line_number )
+{
+    
+    hyylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see hyy_switch_to_buffer
+ */
+void hyyset_in (FILE *  in_str )
+{
+        hyyin = in_str ;
+}
+
+void hyyset_out (FILE *  out_str )
+{
+        hyyout = out_str ;
+}
+
+int hyyget_debug  (void)
+{
+        return hyy_flex_debug;
+}
+
+void hyyset_debug (int  bdebug )
+{
+        hyy_flex_debug = bdebug ;
+}
+
+/* %endif */
+
+/* %if-reentrant */
+/* %if-bison-bridge */
+/* %endif */
+/* %endif if-c-only */
+
+/* %if-c-only */
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from hyylex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch hyylineno unless the option is enabled. */
+    hyylineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+    (yy_state_buf) = 0;
+    (yy_state_ptr) = 0;
+    (yy_full_match) = 0;
+    (yy_lp) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    hyyin = stdin;
+    hyyout = stdout;
+#else
+    hyyin = (FILE *) 0;
+    hyyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * hyylex_init()
+     */
+    return 0;
+}
+/* %endif */
+
+/* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
+/* hyylex_destroy is for both reentrant and non-reentrant scanners. */
+int hyylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		hyy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		hyypop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	hyyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    hyyfree ( (yy_state_buf) );
+    (yy_state_buf)  = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * hyylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+/* %if-reentrant */
+/* %endif */
+    return 0;
+}
+/* %endif */
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *hyyalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *hyyrealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void hyyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see hyyrealloc() for (char *) cast */
+}
+
+/* %if-tables-serialization definitions */
+/* %define-yytables   The name for this specific scanner's tables. */
+#define YYTABLES_NAME "yytables"
+/* %endif */
+
+/* %ok-for-header */
+
+#line 400 "hyp_l.l"
+
+
+
+ /* 
+  * copy a quoted string.
+  * e.g. "data 0" -> data 0
+  * a double quote inside the string can be escaped by writing two consecutive double quotes
+  * e.g. "net ""hi""" -> net "hi"
+  */
+
+ char *strunquote(const char *src) 
+ {
+   char* dst;
+   size_t len = strlen(src) + 1;
+   dst = (char *)malloc(len);
+   if (dst != NULL) 
+   {
+     char* p = (char *)src + 1; /* first char after initial quote */
+     char* q = dst;
+     do 
+       if (*p == '"') p++;
+     while ((*q++ = *p++) != '\0');
+   }
+   return dst;
+ }
+
+ /* not truncated */
+
Index: tags/2.0.1/src_plugins/io_hyp/hyp_l.h
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_l.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_l.h	(revision 18980)
@@ -0,0 +1,452 @@
+#ifndef hyyHEADER_H
+#define hyyHEADER_H 1
+#define hyyIN_HEADER 1
+
+#line 6 "hyp_l.h"
+
+#line 8 "hyp_l.h"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+/* %not-for-header */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* %if-c++-only */
+/* %endif */
+
+/* %if-c-only */
+    
+/* %endif */
+
+/* %if-c-only */
+
+/* %endif */
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+/* %if-c-only */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+/* %endif */
+
+/* %if-tables-serialization */
+/* %endif */
+/* end standard C headers. */
+
+/* %if-c-or-c++ */
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* %not-for-header */
+
+/* %not-for-header */
+
+/* %if-reentrant */
+/* %endif */
+
+/* %if-not-reentrant */
+
+/* %endif */
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+/* %if-not-reentrant */
+extern int hyyleng;
+/* %endif */
+
+/* %if-c-only */
+/* %if-not-reentrant */
+extern FILE *hyyin, *hyyout;
+/* %endif */
+/* %endif */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+/* %if-c-only */
+	FILE *yy_input_file;
+/* %endif */
+
+/* %if-c++-only */
+/* %endif */
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+/* %endif */
+
+/* %if-c-only Standard (non-C++) definition */
+
+/* %if-not-reentrant */
+/* %not-for-header */
+
+/* %endif */
+
+void hyyrestart (FILE *input_file  );
+void hyy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE hyy_create_buffer (FILE *file,int size  );
+void hyy_delete_buffer (YY_BUFFER_STATE b  );
+void hyy_flush_buffer (YY_BUFFER_STATE b  );
+void hyypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void hyypop_buffer_state (void );
+
+YY_BUFFER_STATE hyy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE hyy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE hyy_scan_bytes (yyconst char *bytes,int len  );
+
+/* %endif */
+
+void *hyyalloc (yy_size_t  );
+void *hyyrealloc (void *,yy_size_t  );
+void hyyfree (void *  );
+
+/* %% [1.0] hyytext/hyyin/hyyout/yy_state_type/hyylineno etc. def's & init go here */
+/* Begin user sect3 */
+
+#define hyywrap(n) 1
+#define YY_SKIP_YYWRAP
+
+#define FLEX_DEBUG
+
+extern int hyylineno;
+
+extern char *hyytext;
+#define yytext_ptr hyytext
+
+/* %if-c-only Standard (non-C++) definition */
+
+/* %endif */
+
+#ifdef YY_HEADER_EXPORT_START_CONDITIONS
+#define INITIAL 0
+#define STATE_STRING 1
+#define STATE_POSINT 2
+#define STATE_FLOAT 3
+#define STATE_COMMENT 4
+#define STATE_COMMENT_EOL 5
+
+#endif
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+/* %if-c-only */
+#include <unistd.h>
+/* %endif */
+/* %if-c++-only */
+/* %endif */
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* %if-c-only Reentrant structure and macros (non-C++). */
+/* %if-reentrant */
+/* %if-c-only */
+
+/* %endif */
+/* %if-reentrant */
+/* %endif */
+/* %endif End reentrant structures and macros. */
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int hyylex_destroy (void );
+
+int hyyget_debug (void );
+
+void hyyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE hyyget_extra (void );
+
+void hyyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *hyyget_in (void );
+
+void hyyset_in  (FILE * in_str  );
+
+FILE *hyyget_out (void );
+
+void hyyset_out  (FILE * out_str  );
+
+int hyyget_leng (void );
+
+char *hyyget_text (void );
+
+int hyyget_lineno (void );
+
+void hyyset_lineno (int line_number  );
+
+/* %if-bison-bridge */
+/* %endif */
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int hyywrap (void );
+#else
+extern int hyywrap (void );
+#endif
+#endif
+
+/* %not-for-header */
+
+/* %endif */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+/* %if-c-only Standard (non-C++) definition */
+/* %not-for-header */
+
+/* %endif */
+#endif
+
+/* %if-c-only */
+
+/* %endif */
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* %if-tables-serialization structures and prototypes */
+/* %not-for-header */
+
+/* %not-for-header */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+/* %if-c-only Standard (non-C++) definition */
+
+extern int hyylex (void);
+
+#define YY_DECL int hyylex (void)
+/* %endif */
+/* %if-c++-only C++ definition */
+/* %endif */
+#endif /* !YY_DECL */
+
+/* %not-for-header */
+
+/* %if-c++-only */
+/* %not-for-header */
+
+/* %endif */
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+/* %if-c-only */
+/* %not-for-header */
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+
+#line 400 "hyp_l.l"
+
+
+#line 451 "hyp_l.h"
+#undef hyyIN_HEADER
+#endif /* hyyHEADER_H */
Index: tags/2.0.1/src_plugins/io_hyp/hyp_l.l
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_l.l	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_l.l	(revision 18980)
@@ -0,0 +1,425 @@
+
+/*
+ * read hyperlynx files
+ * Copyright 2012, 2016 Koen De Vleeschauwer.
+ *
+ * This file is part of pcb-rnd.
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+%option noyywrap nodefault yylineno debug
+
+/* avoid collision with other scanners */
+%option prefix="hyy"
+
+%{
+#include <stdlib.h>
+
+char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */
+
+#include "hyp_y.h"
+
+/* copy a string between quotes */
+char *strunquote(const char *);
+
+/* print error message */
+void hyyerror(const char *);
+
+/* remember hyperlynx file section we're in */
+int section = -1;
+
+%}
+
+ /*
+  * The scanner knows five states: INITIAL, STATE_STRING, STATE_POSINT, STATE_FLOAT and STATE_COMMENT
+  *
+  * In state INITIAL the scanner recognizes:
+  * - punctuation (such as {}()=, )
+  * - keywords (such as VERSION, BOARD, NET), 
+  * - strings (both between double quotes " and unquoted),
+  * - and floating point numbers (with optional suffix, eg. 10 uF), 
+  *
+  * In STATE_STRING the scanner recognizes punctuation and strings only.
+  * This avoids unquoted strings being interpreted as numbers, or keywords.
+  *
+  * In STATE_POSINT the scanner recognizes a positive integer.
+  *
+  * In STATE_FLOAT the scanner recognizes a floating point number (without suffix).
+  *
+  * In STATE_COMMENT the scanner discards all text up to the next 
+  * right brace } , and then continues in state INITIAL.
+  *
+  */
+
+%x STATE_STRING STATE_POSINT STATE_FLOAT STATE_COMMENT STATE_COMMENT_EOL
+
+ /* whitespace: space, tab, vertical tab, form feed */
+WS                  [ \t\v\f]
+
+ /* accept windows and unix newlines */
+NEWLINE             [\r\n]+
+
+ /* 
+  * lines with an asterisk in the first column are comments 
+  */
+COMMENT             ^\*[^\n\r]*[\n\r]+
+
+ /* Left-hand side of an assignment: check whether next token is equals sign */
+LHS                 [ \t\v\f]*"="
+
+ /*
+  * Positive integer
+  */
+
+POSINT              [0-9]+
+
+ /*
+  * Floating point numbers
+  */
+
+ /* ordinary floating point numbers */
+SIMPLE_FLOAT        [-+]?([0-9]+"."[0-9]*|"."?[0-9]+)([Ee][-+]?[0-9]+)?
+
+ /* floating point numbers with suffix, e,g. pF, nH */
+FLOAT_SUFFIX        [A-Za-z]*{WS}+
+FLOAT_YOTTA         {SIMPLE_FLOAT}{WS}*"Y"{FLOAT_SUFFIX}
+FLOAT_ZETA          {SIMPLE_FLOAT}{WS}*"Z"{FLOAT_SUFFIX}
+FLOAT_EXA           {SIMPLE_FLOAT}{WS}*"E"{FLOAT_SUFFIX}
+FLOAT_PETA          {SIMPLE_FLOAT}{WS}*"P"{FLOAT_SUFFIX}
+FLOAT_TERA          {SIMPLE_FLOAT}{WS}*"T"{FLOAT_SUFFIX}
+FLOAT_GIGA          {SIMPLE_FLOAT}{WS}*"G"{FLOAT_SUFFIX}
+FLOAT_MEGA          {SIMPLE_FLOAT}{WS}*"M"{FLOAT_SUFFIX}
+FLOAT_KILO          {SIMPLE_FLOAT}{WS}*[Kk]{FLOAT_SUFFIX}
+FLOAT_MILLI         {SIMPLE_FLOAT}{WS}*"m"{FLOAT_SUFFIX}
+FLOAT_MICRO         {SIMPLE_FLOAT}{WS}*[uU]{FLOAT_SUFFIX}
+FLOAT_NANO          {SIMPLE_FLOAT}{WS}*[nN]{FLOAT_SUFFIX}
+FLOAT_PICO          {SIMPLE_FLOAT}{WS}*[pP]{FLOAT_SUFFIX}
+FLOAT_FEMTO         {SIMPLE_FLOAT}{WS}*[fF]{FLOAT_SUFFIX}
+FLOAT_ATTO          {SIMPLE_FLOAT}{WS}*"a"{FLOAT_SUFFIX}
+FLOAT_ZEPTO         {SIMPLE_FLOAT}{WS}*"z"{FLOAT_SUFFIX}
+FLOAT_YOCTO         {SIMPLE_FLOAT}{WS}*"y"{FLOAT_SUFFIX}
+  
+ /* 
+  * Strings
+  */
+
+ /* an unquoted string */
+ /* a sequence of characters, excluding whitespace and reserved characters.
+  * also allow strings such as "(Net0)" .
+  */
+STRING              [^ \t\v\f\r\n\{\}\(\)=\"]+|"("[[:alnum:]]+")"
+
+ /* a string enclosed in double quotes " */
+QUOTED_STRING       \"([^\"\n]|\"\")*\"
+
+/* an unquoted string with spaces */
+CHARS_AND_SPACES       [^\t\v\f\r\n\{\}\(\)=\"]+
+
+/* all variables used in assignments */
+VARIABLE            ("A"|"A1"|"A2"|"BR"|"C"|"C\?"|"CO\?"|"D"|"ER"|"F"|"ID"|"L"|"L1"|"L2"|"LPS"|"LT"|"M"|"N"|"NAME"|"P"|"PKG"|"PR\?"|"PS"|"R"|"REF"|"S"|"SX"|"SY"|"S1"|"S1X"|"S1Y"|"S2"|"S2X"|"S2Y"|"T"|"TC"|"USE_DIE_FOR_METAL"|"V"|"V\?"|"VAL"|"W"|"X"|"X1"|"X2"|"XC"|"Y"|"Y1"|"Y2"|"YC"|"Z"|"ZL"|"ZLEN"|"ZW")
+
+/* an unquoted string with spaces is terminated by the next assignment or the end of line */
+STRING_W_SPACES     {CHARS_AND_SPACES}(" "{VARIABLE}"=")?
+
+/* an empty string is terminated by the next assignment, a ')' or a '}' */
+EMPTY_STRING        ({WS}{VARIABLE}"="|")"|"}")
+
+%%
+
+ /* When in STATE_COMMENT skip all comment until next right brace */
+<STATE_COMMENT>{
+[^\}]*              { BEGIN INITIAL; /* skip all comment until next right brace */ }
+}
+
+ /* When in STATE_COMMENT_EOL skip all comment until end-of-line */
+<STATE_COMMENT_EOL>{
+[^\r\n]*{NEWLINE}+ { BEGIN INITIAL; /* skip all comment until next end-of-line */ }
+}
+
+
+ /* skip comments and whitespace */
+<*>{
+
+  {COMMENT}           { /* skip comments */ }
+
+  {WS}+               { /* skip whitespace */ }
+
+  {NEWLINE}+          { /* skip newlines */ }
+
+}
+
+ /*
+  * Hyperlynx keywords 
+  */
+
+ /* Sections */
+
+"BOARD_FILE"        {section = H_BOARD_FILE; return H_BOARD_FILE;}
+"VERSION"           {section = H_VERSION; return H_VERSION;}
+"DATA_MODE"         {section = H_DATA_MODE; return H_DATA_MODE;}
+"UNITS"             {section = H_UNITS; return H_UNITS;}
+"PLANE_SEP"         {section = H_PLANE_SEP; return H_PLANE_SEP;}
+"BOARD"             {section = H_BOARD; BEGIN STATE_COMMENT_EOL; return H_BOARD;}
+"STACKUP"           {section = H_STACKUP; BEGIN STATE_COMMENT_EOL; return H_STACKUP;}
+"DEVICES"           {section = H_DEVICES; BEGIN STATE_COMMENT_EOL; return H_DEVICES;}
+"SUPPLIES"          {section = H_SUPPLIES; BEGIN STATE_COMMENT_EOL; return H_SUPPLIES;}
+"PADSTACK"          {section = H_PADSTACK; BEGIN STATE_STRING; return H_PADSTACK;}
+"NET"               {section = H_NET; BEGIN STATE_STRING; return H_NET;}
+"NET_CLASS"         {section = H_NET_CLASS; return H_NET_CLASS;}
+"END"               {section = H_END; return H_END;}
+"KEY"               {section = H_KEY; return H_KEY;}
+
+ /* Keywords */
+
+"A"                 {return H_A;}
+"ARC"               {return H_ARC;}
+"COPPER"            {return H_COPPER;}
+"CURVE"             {return H_CURVE;}
+"DETAILED"          {if (section == H_DATA_MODE) BEGIN STATE_COMMENT; return H_DETAILED;}
+"DIELECTRIC"        {return H_DIELECTRIC;}
+"ENGLISH"           {return H_ENGLISH;}
+"LENGTH"            {if (section == H_UNITS) BEGIN STATE_COMMENT; return H_LENGTH;}
+"LINE"              {return H_LINE;}
+"METRIC"            {return H_METRIC;}
+"M"                 {return H_M;}
+"N"                 {return H_N;}
+"OPTIONS"           {return H_OPTIONS;}
+"PAD"               {return H_PAD;}
+"PERIMETER_ARC"     {return H_PERIMETER_ARC;}
+"PERIMETER_SEGMENT" {return H_PERIMETER_SEGMENT;}
+"PIN"               {return H_PIN;}
+"PLANE"             {return H_PLANE;}
+"POLYGON"           {return H_POLYGON;}
+"POLYLINE"          {return H_POLYLINE;}
+"POLYVOID"          {return H_POLYVOID;}
+"POUR"              {return H_POUR;}
+"S"                 {return H_S;}
+"T"                 {return H_T;}
+"SEG"               {return H_SEG;}
+"SIGNAL"            {return H_SIGNAL;}
+"SIMPLIFIED"        {if (section == H_DATA_MODE) BEGIN STATE_COMMENT; return H_SIMPLIFIED; }
+"SIM_BOTH"          {return H_SIM_BOTH;}
+"SIM_IN"            {return H_SIM_IN;}
+"SIM_OUT"           {return H_SIM_OUT;}
+"USEG"              {return H_USEG;}
+"VIA"               {return H_VIA;}
+"WEIGHT"            {if (section == H_UNITS) BEGIN STATE_COMMENT; return H_WEIGHT;}
+
+ /* Assignments */
+
+"A"/{LHS}           {return H_A;}
+"A1"/{LHS}          {return H_A1;}
+"A2"/{LHS}          {return H_A2;}
+"BR"/{LHS}          {return H_BR;}
+"C"/{LHS}           {return H_C;}
+"C?"/{LHS}          {return H_C_QM;}
+"CO?"/{LHS}         {return H_CO_QM;}
+"D"/{LHS}           {return H_D;}
+"ER"/{LHS}          {return H_ER;}
+"F"/{LHS}           {return H_F;}
+"ID"/{LHS}          {BEGIN STATE_POSINT; return H_ID;}
+"L"/{LHS}           {BEGIN STATE_STRING; return H_L;}
+"L1"/{LHS}          {BEGIN STATE_STRING; return H_L1;}
+"L2"/{LHS}          {BEGIN STATE_STRING; return H_L2;}
+"LPS"/{LHS}         {return H_LPS;}
+"LT"/{LHS}          {return H_LT;}
+"M"/{LHS}           {BEGIN STATE_STRING; return H_M;}
+"N"/{LHS}           {BEGIN STATE_STRING; return H_N;}
+"NAME"/{LHS}        {BEGIN STATE_STRING; return H_NAME;}
+ /* P is used as "plating thickness" in "stackup/signal" and as "padstack" in "net/via" */
+"P"/{LHS}           {if (section == H_NET) BEGIN STATE_STRING; return H_P;}
+"PKG"/{LHS}         {BEGIN STATE_STRING; return H_PKG;}
+"PR?"/{LHS}         {return H_PR_QM;}
+"PS"/{LHS}          {return H_PS;}
+"R"/{LHS}           {return H_R;}
+"REF"/{LHS}         {BEGIN STATE_STRING; return H_REF;}
+"S"/{LHS}           {BEGIN STATE_STRING; return H_S;}
+"SX"/{LHS}          {return H_SX;}
+"SY"/{LHS}          {return H_SY;}
+"S1"/{LHS}          {BEGIN STATE_STRING; return H_S1;}
+"S1X"/{LHS}         {return H_S1X;}
+"S1Y"/{LHS}         {return H_S1Y;}
+"S2"/{LHS}          {BEGIN STATE_STRING; return H_S2;}
+"S2X"/{LHS}         {return H_S2X;}
+"S2Y"/{LHS}         {return H_S2Y;}
+"T"/{LHS}           {return H_T;}
+"TC"/{LHS}          {return H_TC;}
+"USE_DIE_FOR_METAL"/{LHS}           {return H_USE_DIE_FOR_METAL;}
+"V"/{LHS}           {BEGIN STATE_STRING; return H_V;}
+"V?"/{LHS}          {return H_V_QM;}
+"VAL"/{LHS}         {if (section == H_DEVICES) BEGIN STATE_STRING; return H_VAL;}
+"W"/{LHS}           {return H_W;}
+"X"/{LHS}           {return H_X;}
+"X1"/{LHS}          {return H_X1;}
+"X2"/{LHS}          {return H_X2;}
+"XC"/{LHS}          {return H_XC;}
+"Y"/{LHS}           {return H_Y;}
+"Y1"/{LHS}          {return H_Y1;}
+"Y2"/{LHS}          {return H_Y2;}
+"YC"/{LHS}          {return H_YC;}
+"Z"/{LHS}           {return H_Z;}
+"ZL"/{LHS}          {BEGIN STATE_STRING; return H_ZL;}
+"ZLEN"/{LHS}        {return H_ZLEN;}
+"ZW"/{LHS}          {return H_ZW;}
+ 
+ /* Booleans */
+
+"YES"|"yes"         {hyylval.boolval = 1; return H_BOOL; }
+"NO"|"no"           {hyylval.boolval = 0; return H_BOOL; }
+
+ /* Floats */
+
+                    /* ordinary floating point numbers */
+{SIMPLE_FLOAT}      {hyylval.floatval = strtod(hyytext, NULL); return H_FLOAT;}
+
+                    /* floating point numbers with suffix, e,g. pF, nH */
+{FLOAT_YOTTA}       {hyylval.floatval = strtod(hyytext, NULL) * 1e24; return H_FLOAT;}
+{FLOAT_ZETA}        {hyylval.floatval = strtod(hyytext, NULL) * 1e21; return H_FLOAT;}
+{FLOAT_EXA}         {hyylval.floatval = strtod(hyytext, NULL) * 1e18; return H_FLOAT;}
+{FLOAT_PETA}        {hyylval.floatval = strtod(hyytext, NULL) * 1e15; return H_FLOAT;}
+{FLOAT_TERA}        {hyylval.floatval = strtod(hyytext, NULL) * 1e12; return H_FLOAT;}
+{FLOAT_GIGA}        {hyylval.floatval = strtod(hyytext, NULL) * 1e9; return H_FLOAT;}
+{FLOAT_MEGA}        {hyylval.floatval = strtod(hyytext, NULL) * 1e6; return H_FLOAT;}
+{FLOAT_KILO}        {hyylval.floatval = strtod(hyytext, NULL) * 1e3; return H_FLOAT;}
+{FLOAT_MILLI}       {hyylval.floatval = strtod(hyytext, NULL) * 1e-3; return H_FLOAT;}
+{FLOAT_MICRO}       {hyylval.floatval = strtod(hyytext, NULL) * 1e-6; return H_FLOAT;}
+{FLOAT_NANO}        {hyylval.floatval = strtod(hyytext, NULL) * 1e-9; return H_FLOAT;}
+{FLOAT_PICO}        {hyylval.floatval = strtod(hyytext, NULL) * 1e-12; return H_FLOAT;}
+{FLOAT_FEMTO}       {hyylval.floatval = strtod(hyytext, NULL) * 1e-15; return H_FLOAT;}
+{FLOAT_ATTO}        {hyylval.floatval = strtod(hyytext, NULL) * 1e-18; return H_FLOAT;}
+{FLOAT_ZEPTO}       {hyylval.floatval = strtod(hyytext, NULL) * 1e-21; return H_FLOAT;}
+{FLOAT_YOCTO}       {hyylval.floatval = strtod(hyytext, NULL) * 1e-24; return H_FLOAT;}
+
+                    /* floating point numbers in VERSION and PLANE_SEP have no suffix and are followed by optional comments */
+<STATE_FLOAT>{
+{SIMPLE_FLOAT}      {hyylval.floatval = strtod(hyytext, NULL); BEGIN STATE_COMMENT; return H_FLOAT;}
+}
+
+                    /* A positive integer is used only in polygon/polyline/polyvoid "ID = posint" */
+<STATE_POSINT>{
+{POSINT}            { BEGIN INITIAL; hyylval.intval = atoi(hyytext); return H_POSINT; }
+}
+
+ 
+                    /* 
+                     * This is a workaround for syntactically incorrect .hyp files.
+                     * We accept the following constructs as representing an empty string:
+                     * NAME= L1=somelayer
+                     * NAME= )
+                     * NAME= }
+                     * and we accept the following constructs as representing "a string with spaces"
+                     * NAME=a string with spaces L1=somelayer
+                     */
+<STATE_STRING>{
+
+{EMPTY_STRING}      { yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */
+
+{STRING_W_SPACES}   {
+                      /*
+                       * Commas are not allowed in strings in the padstack section unless the string is enclosed in double quotes (").
+                       */
+
+                      if ((section == H_PADSTACK) && strchr(hyytext, ','))
+                        REJECT 
+                      else 
+                      { 
+                        char *s = pcb_strdup(hyytext);
+  
+                        BEGIN INITIAL; 
+  
+                        /* strip final ' VAR=' */
+                        if ((strlen(s) != 0) && (s[strlen(s)-1] == '=')) {
+                          char* space = strrchr(s, ' ');
+                          /* strip trailing spaces */
+                          if (space != NULL)
+                            while ((space >= s) && (*space == ' ')) *space-- = '\0';
+                          yyless(strlen(s));
+                          if (strchr(s, ' ') != NULL) hyyerror("warning: unquoted string contains space");
+                          }
+  
+                        hyylval.strval = s;
+  
+                        return H_STRING;
+                      }
+                    }
+}
+
+<*>{
+
+  "{"                 {return '{';}
+
+  "}"                 {BEGIN STATE_COMMENT_EOL; return '}';}
+
+  "("                 {if (section == H_PADSTACK) BEGIN STATE_STRING; return '(';}
+
+                      /* allow for comment after the closing bracket ) */
+  ")"                 {BEGIN STATE_COMMENT_EOL; return ')';}
+
+  ","                 {return ',';}
+
+  "="                 {if ((section == H_VERSION) || (section == H_PLANE_SEP)) BEGIN STATE_FLOAT; return '=';}
+
+                      /* string */
+  {STRING}            { 
+                        /*
+                         * Commas are not allowed in strings in the padstack section unless the string is enclosed in double quotes (").
+                         */
+
+                        if ((section == H_PADSTACK) && strchr(hyytext, ','))
+                          REJECT 
+                        else 
+                        { 
+                          BEGIN INITIAL; 
+                          hyylval.strval = pcb_strdup(hyytext); 
+                          return H_STRING;
+                        }
+                      }
+
+                      /* string in double quotes */
+  {QUOTED_STRING}     {BEGIN INITIAL; hyylval.strval = strunquote(hyytext); return H_STRING;}
+
+  <<EOF>>             {yyterminate();}
+
+                      /* have bison catch all unrecognized characters with parse errors */
+  .                   {return hyytext[0];}
+
+}
+
+%%
+
+ /* 
+  * copy a quoted string.
+  * e.g. "data 0" -> data 0
+  * a double quote inside the string can be escaped by writing two consecutive double quotes
+  * e.g. "net ""hi""" -> net "hi"
+  */
+
+ char *strunquote(const char *src) 
+ {
+   char* dst;
+   size_t len = strlen(src) + 1;
+   dst = (char *)malloc(len);
+   if (dst != NULL) 
+   {
+     char* p = (char *)src + 1; /* first char after initial quote */
+     char* q = dst;
+     do 
+       if (*p == '"') p++;
+     while ((*q++ = *p++) != '\0');
+   }
+   return dst;
+ }
+
+ /* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/hyp_y.c
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_y.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_y.c	(revision 18980)
@@ -0,0 +1,3187 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.2"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+/* Substitute the type names.  */
+#define YYSTYPE         HYYSTYPE
+/* Substitute the variable and function names.  */
+#define yyparse         hyyparse
+#define yylex           hyylex
+#define yyerror         hyyerror
+#define yydebug         hyydebug
+#define yynerrs         hyynerrs
+
+#define yylval          hyylval
+#define yychar          hyychar
+
+/* Copy the first part of user declarations.  */
+
+#line 76 "hyp_y.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 1
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "hyp_y.h".  */
+#ifndef YY_HYY_HYP_Y_H_INCLUDED
+# define YY_HYY_HYP_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef HYYDEBUG
+# if defined YYDEBUG
+#if YYDEBUG
+#   define HYYDEBUG 1
+#  else
+#   define HYYDEBUG 0
+#  endif
+# else /* ! defined YYDEBUG */
+#  define HYYDEBUG 1
+# endif /* ! defined YYDEBUG */
+#endif  /* ! defined HYYDEBUG */
+#if HYYDEBUG
+extern int hyydebug;
+#endif
+/* "%code requires" blocks.  */
+#line 21 "hyp_y.y" /* yacc.c:355  */
+
+#include "parser.h"
+
+#line 118 "hyp_y.c" /* yacc.c:355  */
+
+/* Token type.  */
+#ifndef HYYTOKENTYPE
+# define HYYTOKENTYPE
+  enum hyytokentype
+  {
+    H_BOARD_FILE = 258,
+    H_VERSION = 259,
+    H_DATA_MODE = 260,
+    H_UNITS = 261,
+    H_PLANE_SEP = 262,
+    H_BOARD = 263,
+    H_STACKUP = 264,
+    H_DEVICES = 265,
+    H_SUPPLIES = 266,
+    H_PAD = 267,
+    H_PADSTACK = 268,
+    H_NET = 269,
+    H_NET_CLASS = 270,
+    H_END = 271,
+    H_KEY = 272,
+    H_A = 273,
+    H_ARC = 274,
+    H_COPPER = 275,
+    H_CURVE = 276,
+    H_DETAILED = 277,
+    H_DIELECTRIC = 278,
+    H_ENGLISH = 279,
+    H_LENGTH = 280,
+    H_LINE = 281,
+    H_METRIC = 282,
+    H_N = 283,
+    H_OPTIONS = 284,
+    H_PERIMETER_ARC = 285,
+    H_PERIMETER_SEGMENT = 286,
+    H_PIN = 287,
+    H_PLANE = 288,
+    H_POLYGON = 289,
+    H_POLYLINE = 290,
+    H_POLYVOID = 291,
+    H_POUR = 292,
+    H_S = 293,
+    H_SEG = 294,
+    H_SIGNAL = 295,
+    H_SIMPLIFIED = 296,
+    H_SIM_BOTH = 297,
+    H_SIM_IN = 298,
+    H_SIM_OUT = 299,
+    H_USEG = 300,
+    H_VIA = 301,
+    H_WEIGHT = 302,
+    H_A1 = 303,
+    H_A2 = 304,
+    H_BR = 305,
+    H_C = 306,
+    H_C_QM = 307,
+    H_CO_QM = 308,
+    H_D = 309,
+    H_ER = 310,
+    H_F = 311,
+    H_ID = 312,
+    H_L = 313,
+    H_L1 = 314,
+    H_L2 = 315,
+    H_LPS = 316,
+    H_LT = 317,
+    H_M = 318,
+    H_NAME = 319,
+    H_P = 320,
+    H_PKG = 321,
+    H_PR_QM = 322,
+    H_PS = 323,
+    H_R = 324,
+    H_REF = 325,
+    H_SX = 326,
+    H_SY = 327,
+    H_S1 = 328,
+    H_S1X = 329,
+    H_S1Y = 330,
+    H_S2 = 331,
+    H_S2X = 332,
+    H_S2Y = 333,
+    H_T = 334,
+    H_TC = 335,
+    H_USE_DIE_FOR_METAL = 336,
+    H_V = 337,
+    H_V_QM = 338,
+    H_VAL = 339,
+    H_W = 340,
+    H_X = 341,
+    H_X1 = 342,
+    H_X2 = 343,
+    H_XC = 344,
+    H_Y = 345,
+    H_Y1 = 346,
+    H_Y2 = 347,
+    H_YC = 348,
+    H_Z = 349,
+    H_ZL = 350,
+    H_ZLEN = 351,
+    H_ZW = 352,
+    H_YES = 353,
+    H_NO = 354,
+    H_BOOL = 355,
+    H_POSINT = 356,
+    H_FLOAT = 357,
+    H_STRING = 358
+  };
+#endif
+
+/* Value type.  */
+#if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED
+typedef union HYYSTYPE HYYSTYPE;
+union HYYSTYPE
+{
+#line 30 "hyp_y.y" /* yacc.c:355  */
+
+    int boolval;
+    int intval;
+    double floatval;
+    char* strval;
+
+#line 241 "hyp_y.c" /* yacc.c:355  */
+};
+# define HYYSTYPE_IS_TRIVIAL 1
+# define HYYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern HYYSTYPE hyylval;
+
+int hyyparse (void);
+
+#endif /* !YY_HYY_HYP_Y_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+#line 37 "hyp_y.y" /* yacc.c:358  */
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "hyp_l.h"
+
+void hyyerror(const char *);
+
+/* HYYPRINT and hyyprint print values of the tokens when debugging is switched on */
+void hyyprint(FILE *, int, HYYSTYPE);
+#define HYYPRINT(file, type, value) hyyprint (file, type, value)
+
+/* clear parse_param struct at beginning of new record */
+static void new_record();
+
+/* struct to pass to calling class */
+static parse_param h;
+
+
+#line 276 "hyp_y.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined HYYSTYPE_IS_TRIVIAL && HYYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  34
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   769
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  110
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  179
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  311
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  620
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   358
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     107,   108,     2,     2,   109,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   106,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   105,     2,   104,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103
+};
+
+#if HYYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   128,   128,   129,   132,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   151,
+     151,   156,   156,   161,   164,   165,   170,   173,   174,   177,
+     178,   182,   182,   187,   188,   191,   192,   195,   196,   197,
+     201,   202,   203,   206,   209,   212,   212,   212,   217,   220,
+     221,   224,   225,   226,   227,   228,   231,   234,   234,   235,
+     239,   239,   242,   243,   246,   247,   248,   249,   250,   251,
+     252,   253,   254,   255,   258,   258,   261,   262,   265,   266,
+     267,   268,   269,   270,   271,   272,   276,   276,   279,   280,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   294,
+     297,   300,   303,   306,   309,   312,   315,   318,   321,   324,
+     329,   330,   333,   334,   337,   337,   337,   337,   338,   341,
+     342,   346,   347,   351,   352,   356,   359,   360,   364,   367,
+     370,   375,   378,   379,   382,   383,   386,   389,   394,   394,
+     394,   397,   397,   398,   399,   402,   403,   406,   406,   407,
+     410,   410,   411,   415,   415,   415,   418,   419,   420,   421,
+     422,   423,   424,   421,   431,   431,   434,   434,   435,   439,
+     440,   440,   444,   445,   448,   449,   450,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   463,   463,   466,   466,
+     469,   470,   474,   475,   479,   482,   485,   485,   489,   490,
+     494,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   510,   514,   517,   520,   523,
+     523,   526,   527,   531,   532,   536,   539,   540,   541,   542,
+     546,   546,   549,   550,   554,   555,   556,   557,   558,   562,
+     562,   565,   566,   570,   571,   572,   570,   577,   578,   577,
+     582,   582,   584,   588,   588,   588,   592,   593,   597,   598,
+     599,   600,   604,   608,   609,   610,   614,   614,   614,   618,
+     618,   618,   622,   623,   627,   628,   629,   630,   634,   634,
+     637,   637,   640,   640,   640,   645,   645,   648,   649,   653,
+     654,   658,   659,   660,   664,   664,   667,   667,   667,   672,
+     677,   677,   682,   682,   685,   685,   688,   688,   691,   694,
+     694,   694
+};
+#endif
+
+#if HYYDEBUG || YYERROR_VERBOSE || 1
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "H_BOARD_FILE", "H_VERSION",
+  "H_DATA_MODE", "H_UNITS", "H_PLANE_SEP", "H_BOARD", "H_STACKUP",
+  "H_DEVICES", "H_SUPPLIES", "H_PAD", "H_PADSTACK", "H_NET", "H_NET_CLASS",
+  "H_END", "H_KEY", "H_A", "H_ARC", "H_COPPER", "H_CURVE", "H_DETAILED",
+  "H_DIELECTRIC", "H_ENGLISH", "H_LENGTH", "H_LINE", "H_METRIC", "H_N",
+  "H_OPTIONS", "H_PERIMETER_ARC", "H_PERIMETER_SEGMENT", "H_PIN",
+  "H_PLANE", "H_POLYGON", "H_POLYLINE", "H_POLYVOID", "H_POUR", "H_S",
+  "H_SEG", "H_SIGNAL", "H_SIMPLIFIED", "H_SIM_BOTH", "H_SIM_IN",
+  "H_SIM_OUT", "H_USEG", "H_VIA", "H_WEIGHT", "H_A1", "H_A2", "H_BR",
+  "H_C", "H_C_QM", "H_CO_QM", "H_D", "H_ER", "H_F", "H_ID", "H_L", "H_L1",
+  "H_L2", "H_LPS", "H_LT", "H_M", "H_NAME", "H_P", "H_PKG", "H_PR_QM",
+  "H_PS", "H_R", "H_REF", "H_SX", "H_SY", "H_S1", "H_S1X", "H_S1Y", "H_S2",
+  "H_S2X", "H_S2Y", "H_T", "H_TC", "H_USE_DIE_FOR_METAL", "H_V", "H_V_QM",
+  "H_VAL", "H_W", "H_X", "H_X1", "H_X2", "H_XC", "H_Y", "H_Y1", "H_Y2",
+  "H_YC", "H_Z", "H_ZL", "H_ZLEN", "H_ZW", "H_YES", "H_NO", "H_BOOL",
+  "H_POSINT", "H_FLOAT", "H_STRING", "'}'", "'{'", "'='", "'('", "')'",
+  "','", "$accept", "hyp_file", "hyp_section", "board_file", "$@1",
+  "version", "$@2", "data_mode", "mode", "units", "unit_system",
+  "metal_thickness_unit", "plane_sep", "$@3", "board", "board_param_list",
+  "board_param_list_item", "board_param", "perimeter_segment",
+  "perimeter_arc", "board_attribute", "$@4", "$@5", "stackup",
+  "stackup_paramlist", "stackup_param", "options", "options_params", "$@6",
+  "signal", "$@7", "signal_paramlist", "signal_param", "dielectric", "$@8",
+  "dielectric_paramlist", "dielectric_param", "plane", "$@9",
+  "plane_paramlist", "plane_param", "thickness", "plating_thickness",
+  "bulk_resistivity", "temperature_coefficient", "epsilon_r",
+  "loss_tangent", "layer_name", "material_name", "plane_separation",
+  "conformal", "prepreg", "devices", "device_list", "device", "$@10",
+  "$@11", "$@12", "device_paramlist", "device_value", "device_layer",
+  "name", "value", "value_float", "value_string", "package", "supplies",
+  "supply_list", "supply", "voltage_spec", "conversion", "padstack",
+  "$@13", "$@14", "drill_size", "$@15", "padstack_list", "padstack_def",
+  "$@16", "pad_shape", "$@17", "pad_coord", "$@18", "$@19", "pad_type",
+  "$@20", "$@21", "$@22", "$@23", "net", "$@24", "net_separation", "$@25",
+  "net_copper", "$@26", "net_subrecord_list", "net_subrecord", "seg",
+  "$@27", "arc", "$@28", "ps_lps_param", "lps_param", "width",
+  "left_plane_separation", "via", "$@29", "via_param_list", "via_param",
+  "padstack_name", "layer1_name", "layer2_name", "pin", "$@30",
+  "pin_param", "pin_function_param", "pin_reference", "pin_function",
+  "pad", "$@31", "pad_param_list", "pad_param", "useg", "$@32",
+  "useg_param", "useg_stackup", "$@33", "$@34", "$@35", "useg_impedance",
+  "$@36", "$@37", "useg_resistance", "$@38", "polygon", "$@39", "$@40",
+  "polygon_param_list", "polygon_param", "polygon_id", "polygon_type",
+  "polyvoid", "$@41", "$@42", "polyline", "$@43", "$@44",
+  "lines_and_curves", "line_or_curve", "line", "$@45", "curve", "$@46",
+  "net_attribute", "$@47", "$@48", "netclass", "$@49",
+  "netclass_subrecords", "netclass_paramlist", "netclass_param",
+  "net_name", "$@50", "netclass_attribute", "$@51", "$@52", "end", "key",
+  "$@53", "coord_point", "$@54", "coord_point1", "$@55", "coord_point2",
+  "$@56", "coord_line", "coord_arc", "$@57", "$@58", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   125,   123,    61,    40,    41,    44
+};
+# endif
+
+#define YYPACT_NINF -454
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-454)))
+
+#define YYTABLE_NINF -115
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+       9,   -75,   295,    15,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,   -65,   -31,   -20,     5,     8,    30,   120,    74,  -454,
+      97,   113,    -2,   117,  -454,  -454,    22,   127,   161,   207,
+     144,   152,  -454,   179,    12,  -454,   167,   140,  -454,  -454,
+    -454,  -454,  -454,  -454,    18,   181,  -454,    47,   188,  -454,
+     158,   168,   204,  -454,   225,  -454,  -454,  -454,  -454,   182,
+    -454,  -454,   115,  -454,  -454,   286,   242,   242,   208,  -454,
+    -454,  -454,  -454,  -454,   222,  -454,    28,  -454,  -454,  -454,
+    -454,   223,   230,  -454,  -454,   224,   270,  -454,  -454,   232,
+    -454,  -454,  -454,   233,  -454,  -454,  -454,   234,   235,   236,
+     237,   248,   251,  -454,  -454,  -454,  -454,   210,   238,  -454,
+    -454,   190,   170,  -454,  -454,  -454,   239,   257,  -454,   -41,
+     213,   243,  -454,  -454,  -454,   245,   244,   246,  -454,   247,
+     249,   250,   252,   253,   254,   255,   256,   258,   122,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,   263,   259,   260,
+     261,   262,   108,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,   264,   265,    26,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,   279,   266,   267,   268,    58,
+      89,   160,  -454,  -454,  -454,   271,   174,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,   146,
+    -454,   218,  -454,  -454,  -454,  -454,  -454,  -454,   272,   274,
+     275,   278,   277,   269,   280,   281,   283,   284,  -454,  -454,
+    -454,   285,   287,   288,   289,  -454,  -454,   290,   291,  -454,
+    -454,   282,  -454,   292,   293,   298,    19,   110,   276,   294,
+    -454,   296,  -454,  -454,  -454,   273,  -454,   326,  -454,  -454,
+    -454,  -454,  -454,    88,  -454,  -454,  -454,   297,   329,   357,
+    -454,  -454,   313,   305,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,   299,  -454,  -454,  -454,  -454,  -454,
+    -454,   300,  -454,   302,   303,   304,   306,  -454,  -454,   294,
+    -454,  -454,  -454,   197,   197,   340,  -454,   312,   307,   242,
+     312,   242,   242,   312,  -454,  -454,   309,   310,   311,   314,
+     316,   317,  -454,  -454,  -454,   318,  -454,  -454,   315,   294,
+     319,   320,   321,  -454,  -454,   157,  -454,  -454,  -454,   157,
+     312,   322,    60,   301,   334,   337,   334,   352,    79,   327,
+     328,   330,   332,   323,   331,    85,  -454,   -62,   294,   335,
+     171,   333,  -454,  -454,  -454,  -454,   336,   338,   339,   341,
+     342,  -454,    21,  -454,  -454,   363,   343,    -5,   363,   344,
+     248,   345,   346,   347,   348,   349,   350,   351,   353,   354,
+     355,   356,   358,   359,   360,   361,    -4,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,   366,   367,   364,   373,   324,
+    -454,  -454,   -22,   363,  -454,  -454,  -454,  -454,   369,  -454,
+    -454,  -454,  -454,  -454,   159,   159,   159,  -454,   370,   371,
+     374,   375,  -454,  -454,   376,   -43,   372,   377,  -454,   -28,
+    -454,  -454,   365,   -43,   378,   362,   380,   381,   383,   384,
+     385,   386,   387,   389,   390,   391,   393,   394,   395,   397,
+     398,  -454,  -454,   396,   399,  -454,  -454,  -454,   172,   382,
+    -454,  -454,  -454,  -454,   388,  -454,   185,   109,  -454,   176,
+    -454,  -454,  -454,   183,   211,   403,  -454,  -454,  -454,  -454,
+     400,   402,  -454,    -8,  -454,  -454,   401,  -454,   -21,  -454,
+    -454,  -454,  -454,   229,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,   404,
+    -454,   410,  -454,   408,  -454,   392,  -454,    -6,  -454,   405,
+    -454,  -454,  -454,  -454,  -454,  -454,   406,   411,   413,  -454,
+    -454,  -454,  -454,  -454,  -454,   412,   414,  -454,  -454,  -454,
+     416,   415,  -454,   420,   409,   417,  -454,  -454,   242,   312,
+     421,  -454,  -454,   422,   423,  -454,   425,  -454,  -454,  -454,
+     407,   424,   426,  -454,   427,  -454,  -454,   428,  -454,   419,
+     429,  -454,  -454,  -454,   448,   432,  -454,   431,  -454,   433,
+     434,  -454,   435,   436,   439,   440,  -454,  -454,  -454,   -45,
+     441,   437,   442,  -454,  -454,   443,   445,   449,   450,  -454,
+    -454,  -454,   444,   446,   447,   451,  -454,  -454,   452,  -454
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       0,     0,     0,     0,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,     0,     0,     0,     0,     0,     0,     0,     0,   138,
+       0,     0,     0,     0,     1,     2,     0,     0,     0,     0,
+       0,     0,    34,     0,     0,    36,     0,     0,    50,    51,
+      52,    53,    54,   111,     0,     0,   113,     0,     0,   133,
+       0,     0,     0,   299,     0,    20,    21,    25,    24,     0,
+      27,    28,     0,    31,    39,     0,     0,     0,    38,    40,
+      41,    42,    33,    35,     0,    74,     0,    86,    60,    48,
+      49,     0,     0,   110,   112,     0,     0,   131,   132,     0,
+     164,   285,   300,     0,    23,    30,    29,     0,     0,     0,
+       0,     0,     0,    44,    43,    37,    55,     0,     0,    59,
+      56,     0,     0,   118,   115,   135,     0,     0,   139,   170,
+       0,     0,    22,    26,    32,     0,     0,     0,   308,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    77,
+      78,    80,    81,    84,    85,    82,    83,     0,     0,     0,
+       0,     0,     0,    89,    90,    92,    93,    94,    95,    96,
+      97,    98,     0,     0,     0,    63,    64,    65,    67,    68,
+      69,    70,    71,    72,    73,     0,     0,     0,     0,     0,
+       0,     0,   166,   165,   168,     0,     0,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   288,     0,
+     286,     0,   290,   292,   291,   301,    45,   304,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+      57,     0,     0,     0,     0,    87,    88,     0,     0,    61,
+      62,     0,   125,     0,     0,     0,     0,     0,     0,   144,
+     146,     0,   253,   269,   266,     0,   230,     0,   188,   219,
+     186,   239,   196,   170,   171,   169,   172,     0,     0,     0,
+     287,   289,     0,     0,   306,   309,    79,   108,   103,   105,
+     104,   106,   109,    99,     0,   101,    91,   107,   102,    66,
+     100,     0,   128,     0,     0,     0,     0,   147,   141,   143,
+     140,   145,   185,     0,     0,     0,   184,     0,     0,     0,
+       0,     0,     0,     0,   167,   293,     0,     0,     0,     0,
+       0,     0,    58,   116,   136,     0,   134,   149,     0,     0,
+       0,     0,     0,   258,   259,     0,   257,   261,   260,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   137,     0,   142,     0,
+       0,     0,   256,   254,   270,   267,     0,     0,     0,     0,
+       0,   234,     0,   233,   282,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   199,   200,   202,
+     203,   296,   294,    46,   305,     0,     0,     0,   124,     0,
+     120,   122,     0,     0,   126,   127,   150,   152,     0,   262,
+     265,   264,   263,   194,     0,     0,     0,   302,     0,     0,
+       0,     0,   231,   232,     0,     0,     0,     0,   224,     0,
+     220,   222,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   197,   198,     0,     0,    47,   307,   310,     0,     0,
+     123,   117,   119,   121,     0,   153,     0,     0,   276,     0,
+     273,   274,   275,     0,     0,     0,   238,   235,   236,   237,
+       0,     0,   193,     0,   189,   191,     0,   225,     0,   221,
+     223,   187,   217,     0,   207,   204,   211,   215,   201,   218,
+     216,   205,   206,   208,   209,   210,   212,   213,   214,     0,
+     295,     0,   129,     0,   151,     0,   156,     0,   148,     0,
+     280,   278,   255,   272,   271,   268,     0,     0,     0,   190,
+     192,   228,   227,   226,   229,     0,     0,   240,   241,   242,
+       0,     0,   130,     0,     0,     0,   159,   277,     0,     0,
+       0,   283,   195,     0,     0,   297,     0,   154,   158,   157,
+       0,     0,     0,   303,     0,   247,   243,     0,   311,     0,
+       0,   281,   279,   284,     0,     0,   298,     0,   160,     0,
+       0,   155,     0,     0,     0,     0,   248,   244,   161,     0,
+       0,     0,     0,   252,   249,     0,     0,     0,     0,   162,
+     250,   245,     0,     0,     0,     0,   251,   246,     0,   163
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -454,  -454,   438,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,   379,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,   456,  -454,  -454,  -454,  -454,
+    -454,  -454,   418,  -454,  -454,  -454,   430,  -454,  -454,  -454,
+     453,   -79,  -454,   -87,   -73,   -14,    20,  -116,    24,  -122,
+    -454,  -454,  -454,  -454,   488,  -454,  -454,  -454,  -454,    31,
+      27,    87,  -454,   454,  -454,  -454,  -454,  -454,   487,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -230,  -245,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,   200,  -454,  -454,   308,  -454,  -454,  -454,
+    -454,     3,   -13,  -133,  -454,  -454,  -454,  -454,   154,   128,
+     209,   112,  -454,  -454,  -454,   119,  -454,  -454,  -454,  -454,
+    -454,   187,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,   325,  -117,   368,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,   -99,  -453,  -454,
+    -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,
+     455,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -454,  -302,
+    -454,   457,  -454,   184,  -454,   -74,  -307,  -454,  -454
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     3,     4,     5,    36,     6,   103,     7,    69,     8,
+      72,   107,     9,   108,    10,    44,    45,    78,    79,    80,
+      81,   272,   465,    11,    47,    48,    49,   120,   284,    50,
+     122,   174,   175,    51,   117,   148,   149,    52,   121,   162,
+     163,   150,   177,   165,   166,   151,   152,   333,   154,   171,
+     155,   156,    12,    55,    56,    92,   185,   355,   409,   410,
+     411,   127,   413,   414,   415,   470,    13,    58,    59,   245,
+     295,    14,    60,   189,   248,   329,   249,   250,   328,   418,
+     474,   476,   525,   579,   528,   570,   592,   601,   612,    15,
+     129,   193,   263,   194,   195,   196,   197,   198,   311,   199,
+     309,   494,   495,   334,   496,   200,   313,   396,   397,   398,
+     399,   400,   201,   310,   440,   441,   377,   442,   202,   307,
+     372,   373,   203,   312,   547,   548,   585,   600,   614,   549,
+     584,   599,   604,   613,   204,   303,   424,   335,   336,   337,
+     338,   205,   305,   426,   206,   304,   425,   479,   480,   481,
+     559,   482,   558,   207,   434,   574,    16,   130,   210,   211,
+     212,   213,   464,   214,   463,   577,    17,    18,   131,   342,
+     485,   111,   273,   138,   320,   112,   113,   321,   521
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int16 yytable[] =
+{
+     184,   153,   344,   114,   301,   169,   182,   192,   345,    41,
+       1,   348,   554,    41,   381,    34,     1,   299,   491,    91,
+     296,   541,   542,   543,   602,   160,   533,   160,   437,    19,
+     533,   533,   153,   363,   382,   178,   143,   364,   365,   367,
+     416,    37,   164,   176,   383,   384,   169,   417,    95,   179,
+     385,   437,   184,   491,   301,   379,   386,   555,   182,   368,
+     387,   387,   407,   603,   190,   492,   191,   388,   389,   390,
+     391,   392,   393,   394,   395,    38,   158,   172,   367,   143,
+     438,   142,   544,   164,   143,    96,    39,   178,   144,   145,
+     251,   173,   369,   370,   160,   176,   556,   381,   368,   358,
+     492,   179,    63,   438,   461,   147,   161,   167,   180,   118,
+     529,    40,    42,   301,     2,    43,    82,   382,   143,    43,
+       2,  -114,   297,   252,   253,   254,    65,   383,   384,   432,
+     530,   369,   370,   385,   239,   531,   119,    46,   379,   386,
+     105,   168,   181,   143,   387,   170,   183,   267,   167,   126,
+     388,   389,   390,   391,   392,   393,   394,   395,   158,   159,
+     180,   255,   106,   142,   268,   246,   143,   247,    84,   407,
+     144,   145,   256,   140,   269,   141,   160,   142,   257,   258,
+     143,    57,   168,    67,   144,   145,   170,   147,   161,   146,
+      85,   420,   259,   190,   181,   191,    86,    75,   183,   260,
+      87,   147,    68,    61,   421,   261,   262,    88,   422,    76,
+      77,   375,   298,   378,   330,   143,   235,   246,   362,    62,
+     158,   172,   362,    64,    53,   142,   371,    54,   143,    66,
+     228,    70,   144,   145,    71,   173,   331,   346,   160,   408,
+     158,   159,   332,   341,    89,   142,    73,    46,   143,   147,
+     161,   571,   144,   145,   330,   143,   371,   572,   160,   435,
+      74,   140,   443,   141,    99,   142,   477,   478,   143,   147,
+     161,   100,   144,   145,   292,   522,   331,   146,   265,   190,
+     532,   191,   332,   477,   478,    93,   104,   534,    54,   147,
+     477,   478,    97,   526,   527,    57,   408,   408,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,   101,    29,    30,
+      31,    32,    33,   493,   109,   535,   115,   208,   477,   478,
+     209,   493,   270,   545,   546,   209,   483,   484,   102,   110,
+     116,   123,   125,   124,   126,   128,   137,   132,   133,   134,
+     139,   187,   135,   136,   157,   186,   217,   215,   216,   241,
+     294,   244,   218,   219,   308,   220,   221,   316,   222,   223,
+     224,   225,   226,   230,   227,   231,   232,   233,   234,   242,
+     237,   238,   279,   243,   274,   264,   275,   276,   277,   278,
+     300,   306,   280,   282,   281,   317,   283,   285,   291,   286,
+     287,   288,   289,   290,   292,   318,   319,   330,   341,   293,
+     302,   246,   324,   323,   374,   315,   376,   322,   353,   325,
+     354,   379,   326,   343,   327,   349,   350,   351,   356,   332,
+     352,   143,   386,    83,   357,   359,   360,   361,   366,   405,
+     401,   402,   471,   403,   404,   423,   419,   406,   427,   469,
+     473,    35,   412,   472,   428,   429,   501,   430,   431,   436,
+     444,   446,   447,   448,   449,   450,   451,   452,   490,   453,
+     454,   455,   456,   314,   457,   458,   459,   460,   466,   467,
+     468,   475,   486,   500,   487,   497,   488,   489,   519,   551,
+     539,   502,   504,   498,   505,   506,   507,   508,   523,   509,
+     510,   511,   512,   536,   513,   514,   515,   524,   516,   517,
+     518,   553,   589,    90,   266,   439,   537,   520,   538,   540,
+     550,   552,   560,   557,   561,   562,   580,   568,   563,   565,
+     564,   566,   567,   573,   575,   569,   576,   578,   587,   590,
+     618,   588,   581,   591,   582,   583,   586,   605,   596,   593,
+     594,   597,   598,    94,   595,    98,   606,   609,   607,   608,
+     462,   610,   611,   615,   616,   617,   380,   503,   499,   433,
+     619,     0,     0,     0,   445,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   229,     0,
+       0,   188,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   240,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   236,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   339,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   271,     0,     0,     0,
+       0,     0,     0,   340,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   347
+};
+
+static const yytype_int16 yycheck[] =
+{
+     122,   117,   309,    77,   249,   121,   122,   129,   310,     1,
+       1,   313,    18,     1,    18,     0,     1,   247,    61,     1,
+       1,    42,    43,    44,    69,    68,   479,    68,    56,   104,
+     483,   484,   148,   335,    38,   122,    58,   339,   340,    18,
+     102,   106,   121,   122,    48,    49,   162,   109,     1,   122,
+      54,    56,   174,    61,   299,    59,    60,    63,   174,    38,
+      65,    65,    84,   108,   105,   108,   107,    71,    72,    73,
+      74,    75,    76,    77,    78,   106,    50,    51,    18,    58,
+     108,    55,   103,   162,    58,    38,   106,   174,    62,    63,
+       1,    65,    71,    72,    68,   174,   102,    18,    38,   329,
+     108,   174,   104,   108,   108,    79,    80,   121,   122,    81,
+       1,   106,   104,   358,   105,   107,   104,    38,    58,   107,
+     105,   103,   103,    34,    35,    36,   104,    48,    49,   108,
+      21,    71,    72,    54,   108,    26,   108,   107,    59,    60,
+      25,   121,   122,    58,    65,   121,   122,     1,   162,    64,
+      71,    72,    73,    74,    75,    76,    77,    78,    50,    51,
+     174,     1,    47,    55,    18,   107,    58,   109,     1,    84,
+      62,    63,    12,    51,    28,    53,    68,    55,    18,    19,
+      58,   107,   162,    22,    62,    63,   162,    79,    80,    67,
+      23,    20,    32,   105,   174,   107,    29,    18,   174,    39,
+      33,    79,    41,   106,    33,    45,    46,    40,    37,    30,
+      31,   344,   102,   346,    57,    58,   108,   107,   335,   106,
+      50,    51,   339,   106,   104,    55,   342,   107,    58,   102,
+     108,    24,    62,    63,    27,    65,    79,   311,    68,   355,
+      50,    51,    85,    86,   104,    55,   102,   107,    58,    79,
+      80,   558,    62,    63,    57,    58,   372,   559,    68,   375,
+     108,    51,   378,    53,   106,    55,   107,   108,    58,    79,
+      80,   103,    62,    63,   102,   103,    79,    67,   104,   105,
+     104,   107,    85,   107,   108,   104,   104,   104,   107,    79,
+     107,   108,   104,   108,   109,   107,   412,   413,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,   103,    13,    14,
+      15,    16,    17,   435,    28,   104,   108,   104,   107,   108,
+     107,   443,   104,    94,    95,   107,   425,   426,   103,    87,
+     108,   108,   108,   103,    64,   103,    88,   104,   104,   104,
+      89,    84,   106,   106,   106,   106,   102,   104,   103,    70,
+      52,    83,   106,   106,    28,   106,   106,    28,   106,   106,
+     106,   106,   106,   100,   106,   106,   106,   106,   106,   103,
+     106,   106,   103,   106,   102,   104,   102,   102,   100,   102,
+     104,   108,   102,   100,   103,    28,   102,   102,   106,   102,
+     102,   102,   102,   102,   102,    82,    91,    57,    86,   106,
+     104,   107,   100,   103,   103,   108,    69,   108,    92,   106,
+      93,    59,   108,   106,   108,   106,   106,   106,   100,    85,
+     106,    58,    60,    44,   109,   106,   106,   106,   106,   106,
+     103,   103,   108,   103,   102,   102,   101,   106,   102,    66,
+     413,     3,   355,   412,   106,   106,   443,   106,   106,   106,
+     106,   106,   106,   106,   106,   106,   106,   106,    82,   106,
+     106,   106,   106,   263,   106,   106,   106,   106,   102,   102,
+     106,   102,   102,   108,   103,   103,   102,   102,    82,    69,
+     493,   103,   102,   106,   103,   102,   102,   102,   106,   103,
+     103,   102,   102,    90,   103,   102,   102,   109,   103,   102,
+     102,   109,    54,    47,   196,   377,   106,   108,   106,   108,
+     106,   103,   106,   108,   103,   102,   109,   108,   106,   103,
+     106,   106,   102,   102,   102,   108,   103,   102,   109,    97,
+      79,   102,   108,   102,   108,   108,   108,    96,   102,   106,
+     106,   102,   102,    55,   109,    58,   109,   102,   106,   106,
+     396,   102,   102,   109,   108,   108,   347,   445,   439,   372,
+     108,    -1,    -1,    -1,   380,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   148,    -1,
+      -1,   127,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   174,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   162,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   304,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   211,    -1,    -1,    -1,
+      -1,    -1,    -1,   305,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   312
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint16 yystos[] =
+{
+       0,     1,   105,   111,   112,   113,   115,   117,   119,   122,
+     124,   133,   162,   176,   181,   199,   266,   276,   277,   104,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    13,
+      14,    15,    16,    17,     0,   112,   114,   106,   106,   106,
+     106,     1,   104,   107,   125,   126,   107,   134,   135,   136,
+     139,   143,   147,   104,   107,   163,   164,   107,   177,   178,
+     182,   106,   106,   104,   106,   104,   102,    22,    41,   118,
+      24,    27,   120,   102,   108,    18,    30,    31,   127,   128,
+     129,   130,   104,   126,     1,    23,    29,    33,    40,   104,
+     135,     1,   165,   104,   164,     1,    38,   104,   178,   106,
+     103,   103,   103,   116,   104,    25,    47,   121,   123,    28,
+      87,   281,   285,   286,   285,   108,   108,   144,    81,   108,
+     137,   148,   140,   108,   103,   108,    64,   171,   103,   200,
+     267,   278,   104,   104,   104,   106,   106,    88,   283,    89,
+      51,    53,    55,    58,    62,    63,    67,    79,   145,   146,
+     151,   155,   156,   157,   158,   160,   161,   106,    50,    51,
+      68,    80,   149,   150,   151,   153,   154,   155,   156,   157,
+     158,   159,    51,    65,   141,   142,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   166,   106,    84,   173,   183,
+     105,   107,   159,   201,   203,   204,   205,   206,   207,   209,
+     215,   222,   228,   232,   244,   251,   254,   263,   104,   107,
+     268,   269,   270,   271,   273,   104,   103,   102,   106,   106,
+     106,   106,   106,   106,   106,   106,   106,   106,   108,   146,
+     100,   106,   106,   106,   106,   108,   150,   106,   106,   108,
+     142,    70,   103,   106,    83,   179,   107,   109,   184,   186,
+     187,     1,    34,    35,    36,     1,    12,    18,    19,    32,
+      39,    45,    46,   202,   104,   104,   206,     1,    18,    28,
+     104,   270,   131,   282,   102,   102,   102,   100,   102,   103,
+     102,   103,   100,   102,   138,   102,   102,   102,   102,   102,
+     102,   106,   102,   106,    52,   180,     1,   103,   102,   186,
+     104,   187,   104,   245,   255,   252,   108,   229,    28,   210,
+     223,   208,   233,   216,   203,   108,    28,    28,    82,    91,
+     284,   287,   108,   103,   100,   106,   108,   108,   188,   185,
+      57,    79,    85,   157,   213,   247,   248,   249,   250,   247,
+     249,    86,   279,   106,   286,   279,   285,   281,   279,   106,
+     106,   106,   106,    92,    93,   167,   100,   109,   186,   106,
+     106,   106,   248,   279,   279,   279,   106,    18,    38,    71,
+      72,   157,   230,   231,   103,   213,    69,   226,   213,    59,
+     220,    18,    38,    48,    49,    54,    60,    65,    71,    72,
+      73,    74,    75,    76,    77,    78,   217,   218,   219,   220,
+     221,   103,   103,   103,   102,   106,   106,    84,   157,   168,
+     169,   170,   171,   172,   173,   174,   102,   109,   189,   101,
+      20,    33,    37,   102,   246,   256,   253,   102,   106,   106,
+     106,   106,   108,   231,   264,   157,   106,    56,   108,   219,
+     224,   225,   227,   157,   106,   283,   106,   106,   106,   106,
+     106,   106,   106,   106,   106,   106,   106,   106,   106,   106,
+     106,   108,   218,   274,   272,   132,   102,   102,   106,    66,
+     175,   108,   169,   170,   190,   102,   191,   107,   108,   257,
+     258,   259,   261,   257,   257,   280,   102,   103,   102,   102,
+      82,    61,   108,   159,   211,   212,   214,   103,   106,   225,
+     108,   211,   103,   221,   102,   103,   102,   102,   102,   103,
+     103,   102,   102,   103,   102,   102,   103,   102,   102,    82,
+     108,   288,   103,   106,   109,   192,   108,   109,   194,     1,
+      21,    26,   104,   258,   104,   104,    90,   106,   106,   212,
+     108,    42,    43,    44,   103,    94,    95,   234,   235,   239,
+     106,    69,   103,   109,    18,    63,   102,   108,   262,   260,
+     106,   103,   102,   106,   106,   103,   106,   102,   108,   108,
+     195,   286,   279,   102,   265,   102,   103,   275,   102,   193,
+     109,   108,   108,   108,   240,   236,   108,   109,   102,    54,
+      97,   102,   196,   106,   106,   109,   102,   102,   102,   241,
+     237,   197,    69,   108,   242,    96,   109,   106,   106,   102,
+     102,   102,   198,   243,   238,   109,   108,   108,    79,   108
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   110,   111,   111,   112,   112,   112,   112,   112,   112,
+     112,   112,   112,   112,   112,   112,   112,   112,   112,   114,
+     113,   116,   115,   117,   118,   118,   119,   120,   120,   121,
+     121,   123,   122,   124,   124,   125,   125,   126,   126,   126,
+     127,   127,   127,   128,   129,   131,   132,   130,   133,   134,
+     134,   135,   135,   135,   135,   135,   136,   138,   137,   137,
+     140,   139,   141,   141,   142,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   144,   143,   145,   145,   146,   146,
+     146,   146,   146,   146,   146,   146,   148,   147,   149,   149,
+     150,   150,   150,   150,   150,   150,   150,   150,   150,   151,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   162,   163,   163,   165,   166,   167,   164,   164,   168,
+     168,   169,   169,   170,   170,   171,   172,   172,   173,   174,
+     175,   176,   177,   177,   178,   178,   179,   180,   182,   183,
+     181,   185,   184,   184,   184,   186,   186,   188,   187,   187,
+     190,   189,   189,   192,   193,   191,   194,   194,   194,   195,
+     196,   197,   198,   194,   200,   199,   202,   201,   201,   203,
+     204,   203,   205,   205,   206,   206,   206,   206,   206,   206,
+     206,   206,   206,   206,   206,   206,   208,   207,   210,   209,
+     211,   211,   212,   212,   213,   214,   216,   215,   217,   217,
+     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
+     218,   218,   218,   218,   218,   218,   219,   220,   221,   223,
+     222,   224,   224,   225,   225,   226,   227,   227,   227,   227,
+     229,   228,   230,   230,   231,   231,   231,   231,   231,   233,
+     232,   234,   234,   236,   237,   238,   235,   240,   241,   239,
+     243,   242,   242,   245,   246,   244,   247,   247,   248,   248,
+     248,   248,   249,   250,   250,   250,   252,   253,   251,   255,
+     256,   254,   257,   257,   258,   258,   258,   258,   260,   259,
+     262,   261,   264,   265,   263,   267,   266,   268,   268,   269,
+     269,   270,   270,   270,   272,   271,   274,   275,   273,   276,
+     278,   277,   280,   279,   282,   281,   284,   283,   285,   287,
+     288,   286
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
+       4,     0,     6,     5,     1,     1,     6,     1,     1,     1,
+       1,     0,     6,     4,     3,     2,     1,     3,     2,     2,
+       1,     1,     1,     2,     2,     0,     0,     9,     4,     2,
+       1,     1,     1,     1,     1,     3,     3,     0,     5,     1,
+       0,     5,     2,     1,     1,     1,     3,     1,     1,     1,
+       1,     1,     1,     1,     0,     5,     2,     1,     1,     3,
+       1,     1,     1,     1,     1,     1,     0,     5,     2,     1,
+       1,     3,     1,     1,     1,     1,     1,     1,     1,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       4,     3,     2,     1,     0,     0,     0,    10,     3,     2,
+       1,     2,     1,     2,     1,     3,     1,     1,     3,     3,
+       3,     4,     2,     1,     7,     3,     3,     3,     0,     0,
+       8,     0,     4,     2,     1,     2,     1,     0,     7,     3,
+       0,     3,     1,     0,     0,     7,     1,     3,     3,     0,
+       0,     0,     0,    15,     0,     6,     0,     3,     1,     2,
+       0,     2,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     3,     3,     0,     7,     0,     7,
+       2,     1,     2,     1,     3,     3,     0,     6,     2,     1,
+       1,     3,     1,     1,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     0,
+       6,     2,     1,     2,     1,     3,     3,     3,     3,     3,
+       0,     6,     2,     1,     1,     3,     3,     3,     3,     0,
+       8,     1,     1,     0,     0,     0,    13,     0,     0,     9,
+       0,     5,     1,     0,     0,     8,     2,     1,     1,     1,
+       1,     1,     3,     3,     3,     3,     0,     0,     8,     0,
+       0,     8,     2,     1,     1,     1,     1,     3,     0,     5,
+       0,     5,     0,     0,    11,     0,     6,     2,     1,     2,
+       1,     1,     1,     3,     0,     7,     0,     0,    11,     3,
+       0,     6,     0,     7,     0,     7,     0,     7,     2,     0,
+       0,    12
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if HYYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !HYYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !HYYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (void)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 19:
+#line 151 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_board_file(&h)) YYERROR; }
+#line 1871 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 21:
+#line 156 "hyp_y.y" /* yacc.c:1646  */
+    { h.vers = yylval.floatval; }
+#line 1877 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 22:
+#line 156 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_version(&h)) YYERROR; }
+#line 1883 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 23:
+#line 161 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_data_mode(&h)) YYERROR; }
+#line 1889 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 24:
+#line 164 "hyp_y.y" /* yacc.c:1646  */
+    { h.detailed = pcb_false; }
+#line 1895 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 25:
+#line 165 "hyp_y.y" /* yacc.c:1646  */
+    { h.detailed = pcb_true; }
+#line 1901 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 26:
+#line 170 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_units(&h)) YYERROR; }
+#line 1907 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 27:
+#line 173 "hyp_y.y" /* yacc.c:1646  */
+    { h.unit_system_english = pcb_true; }
+#line 1913 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 28:
+#line 174 "hyp_y.y" /* yacc.c:1646  */
+    { h.unit_system_english = pcb_false; }
+#line 1919 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 29:
+#line 177 "hyp_y.y" /* yacc.c:1646  */
+    { h.metal_thickness_weight = pcb_true; }
+#line 1925 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 30:
+#line 178 "hyp_y.y" /* yacc.c:1646  */
+    { h.metal_thickness_weight = pcb_false; }
+#line 1931 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 31:
+#line 182 "hyp_y.y" /* yacc.c:1646  */
+    { h.default_plane_separation = yylval.floatval; }
+#line 1937 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 32:
+#line 182 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_plane_sep(&h)) YYERROR; }
+#line 1943 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 38:
+#line 196 "hyp_y.y" /* yacc.c:1646  */
+    { hyyerror("warning: missing ')'"); }
+#line 1949 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 43:
+#line 206 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_perimeter_segment(&h)) YYERROR; }
+#line 1955 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 44:
+#line 209 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_perimeter_arc(&h)) YYERROR; }
+#line 1961 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 45:
+#line 212 "hyp_y.y" /* yacc.c:1646  */
+    { h.name = yylval.strval; }
+#line 1967 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 46:
+#line 212 "hyp_y.y" /* yacc.c:1646  */
+    { h.value = yylval.strval; }
+#line 1973 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 212 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_board_attribute(&h)) YYERROR; }
+#line 1979 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 56:
+#line 231 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_options(&h)) YYERROR; }
+#line 1985 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 57:
+#line 234 "hyp_y.y" /* yacc.c:1646  */
+    { h.use_die_for_metal = yylval.boolval; }
+#line 1991 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 60:
+#line 239 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 1997 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 61:
+#line 239 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_signal(&h)) YYERROR; }
+#line 2003 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 66:
+#line 248 "hyp_y.y" /* yacc.c:1646  */
+    { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+#line 2009 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 74:
+#line 258 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2015 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 75:
+#line 258 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_dielectric(&h)) YYERROR; }
+#line 2021 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 79:
+#line 266 "hyp_y.y" /* yacc.c:1646  */
+    { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; }
+#line 2027 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 86:
+#line 276 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2033 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 87:
+#line 276 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_plane(&h)) YYERROR; }
+#line 2039 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 91:
+#line 284 "hyp_y.y" /* yacc.c:1646  */
+    { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+#line 2045 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 99:
+#line 294 "hyp_y.y" /* yacc.c:1646  */
+    { h.thickness = yylval.floatval; h.thickness_set = pcb_true; }
+#line 2051 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 100:
+#line 297 "hyp_y.y" /* yacc.c:1646  */
+    { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; }
+#line 2057 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 101:
+#line 300 "hyp_y.y" /* yacc.c:1646  */
+    { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+#line 2063 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 102:
+#line 303 "hyp_y.y" /* yacc.c:1646  */
+    { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; }
+#line 2069 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 103:
+#line 306 "hyp_y.y" /* yacc.c:1646  */
+    { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; }
+#line 2075 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 104:
+#line 309 "hyp_y.y" /* yacc.c:1646  */
+    { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; }
+#line 2081 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 105:
+#line 312 "hyp_y.y" /* yacc.c:1646  */
+    { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; }
+#line 2087 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 106:
+#line 315 "hyp_y.y" /* yacc.c:1646  */
+    { h.material_name = yylval.strval; h.material_name_set = pcb_true; }
+#line 2093 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 107:
+#line 318 "hyp_y.y" /* yacc.c:1646  */
+    { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; }
+#line 2099 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 108:
+#line 321 "hyp_y.y" /* yacc.c:1646  */
+    { h.conformal = yylval.boolval; h.conformal_set = pcb_true; }
+#line 2105 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 109:
+#line 324 "hyp_y.y" /* yacc.c:1646  */
+    { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; }
+#line 2111 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 114:
+#line 337 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2117 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 115:
+#line 337 "hyp_y.y" /* yacc.c:1646  */
+    { h.device_type = yylval.strval; }
+#line 2123 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 116:
+#line 337 "hyp_y.y" /* yacc.c:1646  */
+    { h.ref = yylval.strval; }
+#line 2129 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 117:
+#line 337 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_devices(&h)) YYERROR; }
+#line 2135 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 125:
+#line 356 "hyp_y.y" /* yacc.c:1646  */
+    { h.name = yylval.strval; h.name_set = pcb_true; }
+#line 2141 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 128:
+#line 364 "hyp_y.y" /* yacc.c:1646  */
+    { h.value_float = yylval.floatval; h.value_float_set = pcb_true; }
+#line 2147 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 129:
+#line 367 "hyp_y.y" /* yacc.c:1646  */
+    { h.value_string = yylval.strval; h.value_string_set = pcb_true; }
+#line 2153 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 130:
+#line 370 "hyp_y.y" /* yacc.c:1646  */
+    { h.package = yylval.strval; h.package_set = pcb_true; }
+#line 2159 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 134:
+#line 382 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_supplies(&h)) YYERROR; }
+#line 2165 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 136:
+#line 386 "hyp_y.y" /* yacc.c:1646  */
+    { h.voltage_specified = yylval.boolval; }
+#line 2171 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 137:
+#line 389 "hyp_y.y" /* yacc.c:1646  */
+    { h.conversion = yylval.boolval; }
+#line 2177 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 138:
+#line 394 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2183 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 139:
+#line 394 "hyp_y.y" /* yacc.c:1646  */
+    { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; }
+#line 2189 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 140:
+#line 394 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_pstk_end(&h)) YYERROR; }
+#line 2195 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 141:
+#line 397 "hyp_y.y" /* yacc.c:1646  */
+    { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; }
+#line 2201 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 147:
+#line 406 "hyp_y.y" /* yacc.c:1646  */
+    { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; }
+#line 2207 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 148:
+#line 406 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_pstk_element(&h)) YYERROR; new_record(); }
+#line 2213 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 150:
+#line 410 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_shape = yylval.floatval; }
+#line 2219 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 152:
+#line 411 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_shape = -1; }
+#line 2225 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 153:
+#line 415 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_sx = yylval.floatval; }
+#line 2231 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 154:
+#line 415 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_sy = yylval.floatval; }
+#line 2237 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 155:
+#line 415 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_angle = yylval.floatval; }
+#line 2243 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 157:
+#line 419 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; }
+#line 2249 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 158:
+#line 420 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; }
+#line 2255 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 159:
+#line 421 "hyp_y.y" /* yacc.c:1646  */
+    { h.thermal_clear_shape = yylval.floatval; }
+#line 2261 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 160:
+#line 422 "hyp_y.y" /* yacc.c:1646  */
+    { h.thermal_clear_sx = yylval.floatval; }
+#line 2267 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 161:
+#line 423 "hyp_y.y" /* yacc.c:1646  */
+    { h.thermal_clear_sy = yylval.floatval; }
+#line 2273 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 162:
+#line 424 "hyp_y.y" /* yacc.c:1646  */
+    { h.thermal_clear_angle = yylval.floatval; }
+#line 2279 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 163:
+#line 425 "hyp_y.y" /* yacc.c:1646  */
+    { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; }
+#line 2285 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 164:
+#line 431 "hyp_y.y" /* yacc.c:1646  */
+    { h.net_name = yylval.strval; if (exec_net(&h)) YYERROR; }
+#line 2291 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 166:
+#line 434 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_net_plane_separation(&h)) YYERROR; }
+#line 2297 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 170:
+#line 440 "hyp_y.y" /* yacc.c:1646  */
+    { hyyerror("warning: empty net"); }
+#line 2303 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 186:
+#line 463 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2309 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 187:
+#line 463 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_seg(&h)) YYERROR; }
+#line 2315 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 188:
+#line 466 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2321 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 189:
+#line 466 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_arc(&h)) YYERROR; }
+#line 2327 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 194:
+#line 479 "hyp_y.y" /* yacc.c:1646  */
+    { h.width = yylval.floatval; h.width_set = pcb_true; }
+#line 2333 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 195:
+#line 482 "hyp_y.y" /* yacc.c:1646  */
+    { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; }
+#line 2339 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 196:
+#line 485 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2345 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 197:
+#line 485 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_via(&h)) YYERROR; }
+#line 2351 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 201:
+#line 496 "hyp_y.y" /* yacc.c:1646  */
+    { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; }
+#line 2357 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 204:
+#line 499 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; }
+#line 2363 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 205:
+#line 500 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; }
+#line 2369 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 206:
+#line 501 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; }
+#line 2375 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 207:
+#line 502 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; }
+#line 2381 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 208:
+#line 503 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; }
+#line 2387 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 209:
+#line 504 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; }
+#line 2393 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 210:
+#line 505 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; }
+#line 2399 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 211:
+#line 506 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; }
+#line 2405 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 212:
+#line 507 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; }
+#line 2411 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 213:
+#line 508 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; }
+#line 2417 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 214:
+#line 509 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; }
+#line 2423 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 215:
+#line 510 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad2_angle  = yylval.floatval; h.via_pad2_angle_set = pcb_true; }
+#line 2429 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 216:
+#line 514 "hyp_y.y" /* yacc.c:1646  */
+    { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; }
+#line 2435 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 217:
+#line 517 "hyp_y.y" /* yacc.c:1646  */
+    { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; }
+#line 2441 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 218:
+#line 520 "hyp_y.y" /* yacc.c:1646  */
+    { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; }
+#line 2447 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 219:
+#line 523 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2453 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 220:
+#line 523 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_pin(&h)) YYERROR; }
+#line 2459 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 225:
+#line 536 "hyp_y.y" /* yacc.c:1646  */
+    { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; }
+#line 2465 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 226:
+#line 539 "hyp_y.y" /* yacc.c:1646  */
+    { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; }
+#line 2471 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 227:
+#line 540 "hyp_y.y" /* yacc.c:1646  */
+    { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; }
+#line 2477 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 228:
+#line 541 "hyp_y.y" /* yacc.c:1646  */
+    { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; }
+#line 2483 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 229:
+#line 542 "hyp_y.y" /* yacc.c:1646  */
+    { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); }
+#line 2489 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 230:
+#line 546 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2495 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 231:
+#line 546 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_pad(&h)) YYERROR; }
+#line 2501 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 235:
+#line 555 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; }
+#line 2507 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 236:
+#line 556 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; }
+#line 2513 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 237:
+#line 557 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; }
+#line 2519 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 238:
+#line 558 "hyp_y.y" /* yacc.c:1646  */
+    { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; }
+#line 2525 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 239:
+#line 562 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2531 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 240:
+#line 562 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_useg(&h)) YYERROR; }
+#line 2537 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 243:
+#line 570 "hyp_y.y" /* yacc.c:1646  */
+    { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; }
+#line 2543 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 244:
+#line 571 "hyp_y.y" /* yacc.c:1646  */
+    { h.width = yylval.floatval; }
+#line 2549 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 245:
+#line 572 "hyp_y.y" /* yacc.c:1646  */
+    { h.length = yylval.floatval; }
+#line 2555 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 247:
+#line 577 "hyp_y.y" /* yacc.c:1646  */
+    { h.impedance = yylval.floatval; h.impedance_set = pcb_true; }
+#line 2561 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 248:
+#line 578 "hyp_y.y" /* yacc.c:1646  */
+    { h.delay = yylval.floatval; }
+#line 2567 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 250:
+#line 582 "hyp_y.y" /* yacc.c:1646  */
+    { h.resistance = yylval.floatval; h.resistance_set = pcb_true;}
+#line 2573 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 253:
+#line 588 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2579 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 254:
+#line 588 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polygon_begin(&h)) YYERROR; }
+#line 2585 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 255:
+#line 589 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polygon_end(&h)) YYERROR; }
+#line 2591 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 262:
+#line 604 "hyp_y.y" /* yacc.c:1646  */
+    { h.id = yylval.intval; h.id_set = pcb_true; }
+#line 2597 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 263:
+#line 608 "hyp_y.y" /* yacc.c:1646  */
+    { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; }
+#line 2603 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 264:
+#line 609 "hyp_y.y" /* yacc.c:1646  */
+    { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; }
+#line 2609 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 265:
+#line 610 "hyp_y.y" /* yacc.c:1646  */
+    { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; }
+#line 2615 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 266:
+#line 614 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2621 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 267:
+#line 614 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polyvoid_begin(&h)) YYERROR; }
+#line 2627 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 268:
+#line 615 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polyvoid_end(&h)) YYERROR; }
+#line 2633 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 269:
+#line 618 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2639 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 270:
+#line 618 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polyline_begin(&h)) YYERROR; }
+#line 2645 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 271:
+#line 619 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_polyline_end(&h)) YYERROR; }
+#line 2651 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 276:
+#line 629 "hyp_y.y" /* yacc.c:1646  */
+    { hyyerror("warning: unexpected ')'"); }
+#line 2657 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 278:
+#line 634 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2663 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 279:
+#line 634 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_line(&h)) YYERROR; }
+#line 2669 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 280:
+#line 637 "hyp_y.y" /* yacc.c:1646  */
+    { new_record(); }
+#line 2675 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 281:
+#line 637 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_curve(&h)) YYERROR; }
+#line 2681 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 282:
+#line 640 "hyp_y.y" /* yacc.c:1646  */
+    { h.name = yylval.strval; }
+#line 2687 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 283:
+#line 640 "hyp_y.y" /* yacc.c:1646  */
+    { h.value = yylval.strval; }
+#line 2693 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 284:
+#line 640 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_net_attribute(&h)) YYERROR; }
+#line 2699 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 285:
+#line 645 "hyp_y.y" /* yacc.c:1646  */
+    { h.net_class_name = yylval.strval; if (exec_net_class(&h)) YYERROR; }
+#line 2705 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 294:
+#line 664 "hyp_y.y" /* yacc.c:1646  */
+    { h.net_name = yylval.strval; }
+#line 2711 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 295:
+#line 664 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_net_class_element(&h)) YYERROR; }
+#line 2717 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 296:
+#line 667 "hyp_y.y" /* yacc.c:1646  */
+    { h.name = yylval.strval; }
+#line 2723 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 297:
+#line 667 "hyp_y.y" /* yacc.c:1646  */
+    { h.value = yylval.strval; }
+#line 2729 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 298:
+#line 667 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_net_class_attribute(&h)) YYERROR; }
+#line 2735 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 299:
+#line 672 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_end(&h)) YYERROR; }
+#line 2741 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 300:
+#line 677 "hyp_y.y" /* yacc.c:1646  */
+    { h.key = yylval.strval; }
+#line 2747 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 301:
+#line 677 "hyp_y.y" /* yacc.c:1646  */
+    { if (exec_key(&h)) YYERROR; }
+#line 2753 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 302:
+#line 682 "hyp_y.y" /* yacc.c:1646  */
+    { h.x = yylval.floatval; }
+#line 2759 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 303:
+#line 682 "hyp_y.y" /* yacc.c:1646  */
+    { h.y = yylval.floatval; }
+#line 2765 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 304:
+#line 685 "hyp_y.y" /* yacc.c:1646  */
+    { h.x1 = yylval.floatval; }
+#line 2771 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 305:
+#line 685 "hyp_y.y" /* yacc.c:1646  */
+    { h.y1 = yylval.floatval; }
+#line 2777 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 306:
+#line 688 "hyp_y.y" /* yacc.c:1646  */
+    { h.x2 = yylval.floatval; }
+#line 2783 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 307:
+#line 688 "hyp_y.y" /* yacc.c:1646  */
+    { h.y2 = yylval.floatval; }
+#line 2789 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 309:
+#line 694 "hyp_y.y" /* yacc.c:1646  */
+    { h.xc = yylval.floatval; }
+#line 2795 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 310:
+#line 694 "hyp_y.y" /* yacc.c:1646  */
+    { h.yc = yylval.floatval; }
+#line 2801 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+  case 311:
+#line 694 "hyp_y.y" /* yacc.c:1646  */
+    { h.r = yylval.floatval; }
+#line 2807 "hyp_y.c" /* yacc.c:1646  */
+    break;
+
+
+#line 2811 "hyp_y.c" /* yacc.c:1646  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 696 "hyp_y.y" /* yacc.c:1906  */
+
+
+/*
+ * Supporting C routines
+ */
+
+void hyyerror(const char *msg)
+{
+  /* log pcb-rnd message */
+  hyp_error(msg);
+}
+
+void hyyprint(FILE *file, int type, YYSTYPE value)
+{
+  if (type == H_STRING)
+    fprintf (file, "%s", value.strval);
+   else if (type == H_FLOAT)
+    fprintf (file, "%g", value.floatval);
+   else if (type == H_BOOL)
+    fprintf (file, "%i", value.boolval);
+  return;
+}
+
+/*
+ * reset parse_param struct at beginning of record
+ */
+
+static void new_record()
+{
+  h.vers = 0;
+  h.detailed = pcb_false;
+  h.unit_system_english = pcb_false;
+  h.metal_thickness_weight = pcb_false;
+  h.default_plane_separation = 0;
+  h.use_die_for_metal = pcb_false;
+  h.bulk_resistivity = 0;
+  h.conformal = pcb_false;
+  h.epsilon_r = 0;
+  h.layer_name = NULL;
+  h.loss_tangent = 0;
+  h.material_name = NULL;
+  h.plane_separation = 0;
+  h.plating_thickness = 0;
+  h.prepreg = pcb_false;
+  h.temperature_coefficient = 0;
+  h.thickness = 0;
+  h.bulk_resistivity_set = pcb_false;
+  h.conformal_set = pcb_false;
+  h.epsilon_r_set = pcb_false;
+  h.layer_name_set = pcb_false;
+  h.loss_tangent_set = pcb_false;
+  h.material_name_set = pcb_false;
+  h.plane_separation_set = pcb_false;
+  h.plating_thickness_set = pcb_false;
+  h.prepreg_set = pcb_false;
+  h.temperature_coefficient_set = pcb_false;
+  h.thickness_set = pcb_false;
+  h.device_type = NULL;
+  h.ref = NULL;
+  h.value_float = 0;
+  h.value_string = NULL;
+  h.package = NULL;
+  h.name_set = pcb_false;
+  h.value_float_set = pcb_false;
+  h.value_string_set = pcb_false;
+  h.package_set = pcb_false;
+  h.voltage_specified = pcb_false;
+  h.conversion = pcb_false;
+  h.padstack_name = NULL;
+  h.drill_size = 0;
+  h.pad_shape = 0;
+  h.pad_sx = 0;
+  h.pad_sy = 0;
+  h.pad_angle = 0;
+  h.thermal_clear_shape = 0;
+  h.thermal_clear_sx = 0;
+  h.thermal_clear_sy = 0;
+  h.thermal_clear_angle = 0;
+  h.pad_type = PAD_TYPE_METAL;
+  h.padstack_name_set = pcb_false;
+  h.drill_size_set = pcb_false;
+  h.pad_type_set = pcb_false;
+  h.width = 0;
+  h.left_plane_separation = 0;
+  h.width_set = pcb_false;
+  h.left_plane_separation_set = pcb_false;
+  h.layer1_name = NULL;
+  h.layer1_name_set = pcb_false;
+  h.layer2_name = NULL;
+  h.layer2_name_set = pcb_false;
+  h.via_pad_shape = NULL;
+  h.via_pad_shape_set = pcb_false;
+  h.via_pad_sx = 0;
+  h.via_pad_sx_set = pcb_false;
+  h.via_pad_sy = 0;
+  h.via_pad_sy_set = pcb_false;
+  h.via_pad_angle = 0;
+  h.via_pad_angle_set = pcb_false;
+  h.via_pad1_shape = NULL;
+  h.via_pad1_shape_set = pcb_false;
+  h.via_pad1_sx = 0;
+  h.via_pad1_sx_set = pcb_false;
+  h.via_pad1_sy = 0;
+  h.via_pad1_sy_set = pcb_false;
+  h.via_pad1_angle = 0;
+  h.via_pad1_angle_set = pcb_false;
+  h.via_pad2_shape = NULL;
+  h.via_pad2_shape_set = pcb_false;
+  h.via_pad2_sx = 0;
+  h.via_pad2_sx_set = pcb_false;
+  h.via_pad2_sy = 0;
+  h.via_pad2_sy_set = pcb_false;
+  h.via_pad2_angle = 0;
+  h.via_pad2_angle_set = pcb_false;
+  h.pin_reference = NULL;
+  h.pin_reference_set = pcb_false;
+  h.pin_function = PIN_SIM_BOTH;
+  h.pin_function_set = pcb_false;
+  h.zlayer_name = NULL;
+  h.zlayer_name_set = pcb_false;
+  h.length = 0;
+  h.impedance = 0;
+  h.impedance_set = pcb_false;
+  h.delay = 0;
+  h.resistance = 0;
+  h.resistance_set = pcb_false;
+  h.id = -1;
+  h.id_set = pcb_false;
+  h.polygon_type = POLYGON_TYPE_PLANE;
+  h.polygon_type_set = pcb_false;
+  h.net_class_name = NULL;
+  h.net_name = NULL;
+  h.key = NULL;
+  h.name = NULL;
+  h.value = NULL;
+  h.x = 0;
+  h.y = 0;
+  h.x1 = 0;
+  h.y1 = 0;
+  h.x2 = 0;
+  h.y2 = 0;
+  h.xc = 0;
+  h.yc = 0;
+  h.r = 0;
+
+  return;
+}
+
+/* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/hyp_y.h
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_y.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_y.h	(revision 18980)
@@ -0,0 +1,189 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_HYY_HYP_Y_H_INCLUDED
+# define YY_HYY_HYP_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef HYYDEBUG
+# if defined YYDEBUG
+#if YYDEBUG
+#   define HYYDEBUG 1
+#  else
+#   define HYYDEBUG 0
+#  endif
+# else /* ! defined YYDEBUG */
+#  define HYYDEBUG 1
+# endif /* ! defined YYDEBUG */
+#endif  /* ! defined HYYDEBUG */
+#if HYYDEBUG
+extern int hyydebug;
+#endif
+/* "%code requires" blocks.  */
+#line 21 "hyp_y.y" /* yacc.c:1909  */
+
+#include "parser.h"
+
+#line 56 "hyp_y.h" /* yacc.c:1909  */
+
+/* Token type.  */
+#ifndef HYYTOKENTYPE
+# define HYYTOKENTYPE
+  enum hyytokentype
+  {
+    H_BOARD_FILE = 258,
+    H_VERSION = 259,
+    H_DATA_MODE = 260,
+    H_UNITS = 261,
+    H_PLANE_SEP = 262,
+    H_BOARD = 263,
+    H_STACKUP = 264,
+    H_DEVICES = 265,
+    H_SUPPLIES = 266,
+    H_PAD = 267,
+    H_PADSTACK = 268,
+    H_NET = 269,
+    H_NET_CLASS = 270,
+    H_END = 271,
+    H_KEY = 272,
+    H_A = 273,
+    H_ARC = 274,
+    H_COPPER = 275,
+    H_CURVE = 276,
+    H_DETAILED = 277,
+    H_DIELECTRIC = 278,
+    H_ENGLISH = 279,
+    H_LENGTH = 280,
+    H_LINE = 281,
+    H_METRIC = 282,
+    H_N = 283,
+    H_OPTIONS = 284,
+    H_PERIMETER_ARC = 285,
+    H_PERIMETER_SEGMENT = 286,
+    H_PIN = 287,
+    H_PLANE = 288,
+    H_POLYGON = 289,
+    H_POLYLINE = 290,
+    H_POLYVOID = 291,
+    H_POUR = 292,
+    H_S = 293,
+    H_SEG = 294,
+    H_SIGNAL = 295,
+    H_SIMPLIFIED = 296,
+    H_SIM_BOTH = 297,
+    H_SIM_IN = 298,
+    H_SIM_OUT = 299,
+    H_USEG = 300,
+    H_VIA = 301,
+    H_WEIGHT = 302,
+    H_A1 = 303,
+    H_A2 = 304,
+    H_BR = 305,
+    H_C = 306,
+    H_C_QM = 307,
+    H_CO_QM = 308,
+    H_D = 309,
+    H_ER = 310,
+    H_F = 311,
+    H_ID = 312,
+    H_L = 313,
+    H_L1 = 314,
+    H_L2 = 315,
+    H_LPS = 316,
+    H_LT = 317,
+    H_M = 318,
+    H_NAME = 319,
+    H_P = 320,
+    H_PKG = 321,
+    H_PR_QM = 322,
+    H_PS = 323,
+    H_R = 324,
+    H_REF = 325,
+    H_SX = 326,
+    H_SY = 327,
+    H_S1 = 328,
+    H_S1X = 329,
+    H_S1Y = 330,
+    H_S2 = 331,
+    H_S2X = 332,
+    H_S2Y = 333,
+    H_T = 334,
+    H_TC = 335,
+    H_USE_DIE_FOR_METAL = 336,
+    H_V = 337,
+    H_V_QM = 338,
+    H_VAL = 339,
+    H_W = 340,
+    H_X = 341,
+    H_X1 = 342,
+    H_X2 = 343,
+    H_XC = 344,
+    H_Y = 345,
+    H_Y1 = 346,
+    H_Y2 = 347,
+    H_YC = 348,
+    H_Z = 349,
+    H_ZL = 350,
+    H_ZLEN = 351,
+    H_ZW = 352,
+    H_YES = 353,
+    H_NO = 354,
+    H_BOOL = 355,
+    H_POSINT = 356,
+    H_FLOAT = 357,
+    H_STRING = 358
+  };
+#endif
+
+/* Value type.  */
+#if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED
+typedef union HYYSTYPE HYYSTYPE;
+union HYYSTYPE
+{
+#line 30 "hyp_y.y" /* yacc.c:1909  */
+
+    int boolval;
+    int intval;
+    double floatval;
+    char* strval;
+
+#line 179 "hyp_y.h" /* yacc.c:1909  */
+};
+# define HYYSTYPE_IS_TRIVIAL 1
+# define HYYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern HYYSTYPE hyylval;
+
+int hyyparse (void);
+
+#endif /* !YY_HYY_HYP_Y_H_INCLUDED  */
Index: tags/2.0.1/src_plugins/io_hyp/hyp_y.y
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/hyp_y.y	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/hyp_y.y	(revision 18980)
@@ -0,0 +1,844 @@
+/*
+ * read hyperlynx files
+ * Copyright 2012-2017 Koen De Vleeschauwer.
+ *
+ * This file is part of pcb-rnd.
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+%code requires {
+#include "parser.h"
+}
+
+%error-verbose
+%debug
+%defines "hyp_y.h"
+%define api.prefix {hyy}
+
+%union {
+    int boolval;
+    int intval;
+    double floatval;
+    char* strval;
+}
+
+%{
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "hyp_l.h"
+
+void hyyerror(const char *);
+
+/* HYYPRINT and hyyprint print values of the tokens when debugging is switched on */
+void hyyprint(FILE *, int, HYYSTYPE);
+#define HYYPRINT(file, type, value) hyyprint (file, type, value)
+
+/* clear parse_param struct at beginning of new record */
+static void new_record();
+
+/* struct to pass to calling class */
+static parse_param h;
+
+%}
+
+/*
+ * Hyperlynx keywords
+ */
+
+ /* Punctuation: { } ( ) = , */
+
+ /* Sections */
+
+%token H_BOARD_FILE H_VERSION H_DATA_MODE H_UNITS H_PLANE_SEP
+%token H_BOARD H_STACKUP H_DEVICES H_SUPPLIES
+%token H_PAD H_PADSTACK H_NET H_NET_CLASS H_END H_KEY
+
+ /* Keywords */
+
+%token H_A H_ARC H_COPPER H_CURVE H_DETAILED H_DIELECTRIC H_ENGLISH H_LENGTH
+%token H_LINE H_METRIC H_N H_OPTIONS H_PERIMETER_ARC H_PERIMETER_SEGMENT H_PIN
+%token H_PLANE H_POLYGON H_POLYLINE H_POLYVOID H_POUR H_S H_SEG H_SIGNAL
+%token H_SIMPLIFIED H_SIM_BOTH H_SIM_IN H_SIM_OUT H_USEG H_VIA H_WEIGHT
+
+ /* Assignments */
+
+%token H_A1 H_A2 H_BR H_C H_C_QM H_CO_QM H_D H_ER H_F H_ID
+%token H_L H_L1 H_L2 H_LPS H_LT H_M H_NAME
+%token H_P H_PKG H_PR_QM H_PS H_R H_REF H_SX H_SY H_S1 H_S1X H_S1Y H_S2 H_S2X H_S2Y H_T H_TC
+%token H_USE_DIE_FOR_METAL H_V H_V_QM H_VAL H_W H_X H_X1 H_X2
+%token H_XC H_Y H_Y1 H_Y2 H_YC H_Z H_ZL H_ZLEN H_ZW
+ 
+ /* Booleans */
+
+%token H_YES H_NO
+
+%token <boolval> H_BOOL
+%token <intval> H_POSINT
+%token <floatval> H_FLOAT
+%token <strval> H_STRING
+
+%start hyp_file
+
+%%
+
+/*
+ * Note:
+ * Use left recursion when parsing board perimeter and nets. 
+ * When using left recursion cpu time is linear with board size. 
+ * When using right recursion we run out of memory on large boards. 
+ * (Typical error message: line xxx: memory exhausted at 'yyy' )
+ */
+
+ /* 
+    hyperlynx file sections: 
+
+    board_file
+    version 
+    data_mode* 
+    units 
+    plane_sep* 
+    board* 
+    stackup* 
+    devices 
+    supplies* 
+    padstack* 
+    net 
+    net_class* 
+    end
+
+    * = optional section
+
+  */
+
+hyp_file
+  : hyp_file hyp_section
+  | hyp_section ;
+
+hyp_section
+  : board_file
+  | version 
+  | data_mode 
+  | units
+  | plane_sep 
+  | board 
+  | stackup 
+  | devices 
+  | supplies 
+  | padstack 
+  | net 
+  | netclass 
+  | end 
+  | key 
+  | error '}' ;
+
+  /* board_file */
+
+board_file
+  : '{' H_BOARD_FILE { if (exec_board_file(&h)) YYERROR; } '}' ;
+
+  /* version */
+
+version
+  : '{' H_VERSION '=' H_FLOAT { h.vers = yylval.floatval; } '}' { if (exec_version(&h)) YYERROR; } ;
+
+  /* data_mode */
+
+data_mode
+  : '{' H_DATA_MODE '=' mode '}' { if (exec_data_mode(&h)) YYERROR; };
+
+mode
+  : H_SIMPLIFIED { h.detailed = pcb_false; }
+  | H_DETAILED   { h.detailed = pcb_true; } ;
+
+  /* units */
+
+units
+  : '{' H_UNITS '=' unit_system metal_thickness_unit '}' { if (exec_units(&h)) YYERROR; } ;
+
+unit_system
+  : H_ENGLISH { h.unit_system_english = pcb_true; }
+  | H_METRIC  { h.unit_system_english = pcb_false; };
+
+metal_thickness_unit
+  : H_WEIGHT  { h.metal_thickness_weight = pcb_true; }
+  | H_LENGTH  { h.metal_thickness_weight = pcb_false; } ;
+
+  /* plane_sep */
+plane_sep
+  : '{' H_PLANE_SEP '=' H_FLOAT { h.default_plane_separation = yylval.floatval; } '}' { if (exec_plane_sep(&h)) YYERROR; } ;
+
+  /* board */
+
+board
+  : '{' H_BOARD board_param_list '}'
+  | '{' H_BOARD '}' ;
+ 
+board_param_list
+  : board_param_list board_param_list_item
+  | board_param_list_item ;
+
+board_param_list_item
+  : '(' board_param ')'
+  | '(' board_param { hyyerror("warning: missing ')'"); }
+  | error ')' ;
+  ;
+
+board_param
+  : perimeter_segment
+  | perimeter_arc
+  | board_attribute ;
+
+perimeter_segment
+  : H_PERIMETER_SEGMENT coord_line { if (exec_perimeter_segment(&h)) YYERROR; } ;
+
+perimeter_arc
+  : H_PERIMETER_ARC coord_arc { if (exec_perimeter_arc(&h)) YYERROR; } ;
+
+board_attribute
+  : H_A H_N '=' H_STRING { h.name = yylval.strval; } H_V '=' H_STRING { h.value = yylval.strval; } { if (exec_board_attribute(&h)) YYERROR; } ;
+
+  /* stackup */
+
+stackup
+  : '{' H_STACKUP stackup_paramlist '}' ;
+
+stackup_paramlist
+  : stackup_paramlist stackup_param
+  | stackup_param ;
+
+stackup_param
+  : options
+  | signal
+  | dielectric
+  | plane
+  | '(' error ')' ;
+
+options
+  : '(' H_OPTIONS options_params { if (exec_options(&h)) YYERROR; } ;
+
+options_params
+  : H_USE_DIE_FOR_METAL '=' H_BOOL { h.use_die_for_metal = yylval.boolval; } ')'
+  | ')'
+  ;
+
+signal
+  : '(' H_SIGNAL { new_record(); } signal_paramlist ')' { if (exec_signal(&h)) YYERROR; } ;
+
+signal_paramlist
+  : signal_paramlist signal_param
+  | signal_param ;
+
+signal_param
+  : thickness
+  | plating_thickness
+  | H_C  '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+  | bulk_resistivity
+  | temperature_coefficient
+  | epsilon_r
+  | loss_tangent
+  | layer_name
+  | material_name
+  | plane_separation ;
+
+dielectric
+  : '(' H_DIELECTRIC { new_record(); } dielectric_paramlist ')' { if (exec_dielectric(&h)) YYERROR; } ;
+
+dielectric_paramlist
+  : dielectric_paramlist dielectric_param
+  | dielectric_param ;
+
+dielectric_param
+  : thickness
+  | H_C '=' H_FLOAT { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; }
+  | epsilon_r
+  | loss_tangent
+  | conformal
+  | prepreg
+  | layer_name
+  | material_name
+  ;
+
+plane
+  : '(' H_PLANE { new_record(); } plane_paramlist ')' { if (exec_plane(&h)) YYERROR; } ;
+
+plane_paramlist
+  : plane_paramlist plane_param
+  | plane_param ;
+
+plane_param
+  : thickness
+  | H_C  '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+  | bulk_resistivity
+  | temperature_coefficient
+  | epsilon_r
+  | loss_tangent
+  | layer_name
+  | material_name
+  | plane_separation ;
+
+thickness
+  : H_T  '=' H_FLOAT  { h.thickness = yylval.floatval; h.thickness_set = pcb_true; }
+
+plating_thickness
+  : H_P  '=' H_FLOAT  { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; }
+
+bulk_resistivity
+  : H_BR '=' H_FLOAT  { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; }
+
+temperature_coefficient
+  : H_TC '=' H_FLOAT  { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; }
+
+epsilon_r
+  : H_ER '=' H_FLOAT  { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; }
+
+loss_tangent
+  : H_LT '=' H_FLOAT  { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; }
+
+layer_name
+  : H_L '=' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; }
+
+material_name
+  : H_M  '=' H_STRING { h.material_name = yylval.strval; h.material_name_set = pcb_true; }
+
+plane_separation
+  : H_PS '=' H_FLOAT  { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; }
+
+conformal
+  : H_CO_QM '=' H_BOOL { h.conformal = yylval.boolval; h.conformal_set = pcb_true; }
+
+prepreg
+  : H_PR_QM '=' H_BOOL { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; }
+
+  /* devices */
+
+devices
+  : '{' H_DEVICES device_list '}'
+  | '{' H_DEVICES '}' ;
+
+device_list
+  : device_list device 
+  | device ;
+
+device
+  : '(' { new_record(); } H_STRING { h.device_type = yylval.strval; } H_REF '=' H_STRING  { h.ref = yylval.strval; } device_paramlist ')' { if (exec_devices(&h)) YYERROR; } 
+  | '(' error ')' ;
+
+device_paramlist
+  : name device_value
+  | device_value 
+  ;
+ 
+device_value
+  : value device_layer
+  | device_layer 
+  ;
+
+device_layer
+  : layer_name package 
+  | layer_name
+  ;
+
+name
+  : H_NAME '=' H_STRING { h.name = yylval.strval; h.name_set = pcb_true; } ;
+
+value
+  : value_float
+  | value_string
+  ;
+
+value_float
+  : H_VAL '=' H_FLOAT   { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } ;
+
+value_string
+  : H_VAL '=' H_STRING  { h.value_string = yylval.strval; h.value_string_set = pcb_true; } ;
+
+package
+  : H_PKG '=' H_STRING  { h.package = yylval.strval; h.package_set = pcb_true; } ;
+
+  /* supplies */
+
+supplies
+  : '{' H_SUPPLIES supply_list '}' ;
+
+supply_list
+  : supply_list supply
+  | supply ;
+
+supply
+  : '(' H_S name value_float voltage_spec conversion ')'  { if (exec_supplies(&h)) YYERROR; } 
+  | '(' error ')' ;
+
+voltage_spec
+  : H_V_QM '=' H_BOOL { h.voltage_specified = yylval.boolval; } ;
+
+conversion
+  : H_C_QM '=' H_BOOL { h.conversion = yylval.boolval; }
+
+  /* padstack */
+
+padstack
+  : '{' H_PADSTACK { new_record(); } '=' H_STRING { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } drill_size '}' { if (exec_pstk_end(&h)) YYERROR; } ;
+
+drill_size 
+  : ',' H_FLOAT { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } padstack_list
+  | ',' padstack_list ;
+  | padstack_list ;
+
+padstack_list
+  : padstack_list padstack_def 
+  | padstack_def ;
+
+padstack_def
+  : '(' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } ',' pad_shape pad_coord pad_type { if (exec_pstk_element(&h)) YYERROR; new_record(); }
+  | '(' error ')' ;
+
+pad_shape
+  : H_FLOAT { h.pad_shape = yylval.floatval; } ','
+  | ',' { h.pad_shape = -1; } /* Workaround: Altium sometimes prints an empty pad shape */
+  ;
+
+pad_coord
+  : H_FLOAT { h.pad_sx = yylval.floatval; } ',' H_FLOAT { h.pad_sy = yylval.floatval; } ',' H_FLOAT { h.pad_angle = yylval.floatval; } 
+
+pad_type
+  : ')' 
+  | ',' H_M ')' { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } 
+  | ',' H_A ')' { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } 
+  | ',' H_FLOAT { h.thermal_clear_shape = yylval.floatval; } 
+    ',' H_FLOAT { h.thermal_clear_sx = yylval.floatval; } 
+    ',' H_FLOAT { h.thermal_clear_sy = yylval.floatval; } 
+    ',' H_FLOAT { h.thermal_clear_angle = yylval.floatval; } 
+    ',' H_T ')' { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } 
+  ;
+
+  /* net */
+
+net
+  : '{' H_NET '=' H_STRING { h.net_name = yylval.strval; if (exec_net(&h)) YYERROR; } net_separation ;
+
+net_separation
+  : plane_separation { if (exec_net_plane_separation(&h)) YYERROR; } net_copper
+  | net_copper
+  ;
+
+net_copper
+  : net_subrecord_list '}'
+  | { hyyerror("warning: empty net"); } '}'
+  ;
+
+net_subrecord_list
+  : net_subrecord_list net_subrecord
+  | net_subrecord ;
+
+net_subrecord
+  : seg 
+  | arc
+  | via 
+  | pin 
+  | pad 
+  | useg 
+  | polygon 
+  | polyvoid 
+  | polyline 
+  | net_attribute 
+  | '(' error ')'
+  | '{' error '}'
+  ;
+
+seg
+  : '(' H_SEG { new_record(); } coord_line width layer_name ps_lps_param { if (exec_seg(&h)) YYERROR; } ;
+
+arc
+  : '(' H_ARC { new_record(); } coord_arc width layer_name ps_lps_param { if (exec_arc(&h)) YYERROR; } ;
+
+ps_lps_param
+  : plane_separation lps_param
+  | lps_param
+  ;
+
+lps_param
+  : left_plane_separation ')'
+  | ')'
+  ;
+
+width
+  : H_W '=' H_FLOAT    { h.width = yylval.floatval; h.width_set = pcb_true; } ;
+  
+left_plane_separation
+  : H_LPS '=' H_FLOAT { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } ;
+
+via
+  : '(' H_VIA { new_record(); } coord_point via_param_list ')' { if (exec_via(&h)) YYERROR; } ; 
+  ;
+
+via_param_list
+  : via_param_list via_param
+  | via_param
+  ;
+
+via_param
+  : padstack_name
+  /* parameters below are for deprecated v1.0 via format */
+  | H_D '=' H_FLOAT   { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } 
+  | layer1_name
+  | layer2_name
+  | H_S '=' H_STRING  { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; }
+  | H_SX '=' H_FLOAT  { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; }
+  | H_SY '=' H_FLOAT  { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; }
+  | H_A '=' H_FLOAT   { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; }
+  | H_S1 '=' H_STRING { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } 
+  | H_S1X '=' H_FLOAT { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; }
+  | H_S1Y '=' H_FLOAT { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; }
+  | H_A1 '=' H_FLOAT  { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; }
+  | H_S2 '=' H_STRING { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } 
+  | H_S2X '=' H_FLOAT { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; }
+  | H_S2Y '=' H_FLOAT { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; }
+  | H_A2 '=' H_FLOAT  { h.via_pad2_angle  = yylval.floatval; h.via_pad2_angle_set = pcb_true; }
+  ;
+
+padstack_name
+  : H_P '=' H_STRING  { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } ;
+
+layer1_name
+  : H_L1 '=' H_STRING { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } ;
+
+layer2_name
+  : H_L2 '=' H_STRING { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } ;
+
+pin
+  : '(' H_PIN { new_record(); } coord_point pin_reference pin_param { if (exec_pin(&h)) YYERROR; } ;
+
+pin_param
+  : padstack_name pin_function_param
+  | pin_function_param
+  ;
+
+pin_function_param
+  : pin_function ')'
+  | ')'
+  ;
+
+pin_reference
+  : H_R '=' H_STRING  { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } ;
+
+pin_function
+  : H_F '=' H_SIM_OUT  { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; }
+  | H_F '=' H_SIM_IN   { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; }
+  | H_F '=' H_SIM_BOTH { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; }
+  | H_F '=' H_STRING   { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); }
+  ;
+
+pad /* deprecated hyperlynx v1.x only */
+  : '(' H_PAD { new_record(); } coord_point pad_param_list ')' { if (exec_pad(&h)) YYERROR; } ;
+
+pad_param_list
+  : pad_param_list pad_param
+  | pad_param
+  ;
+
+pad_param
+  : layer_name
+  | H_S '=' H_STRING  { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; }
+  | H_SX '=' H_FLOAT  { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; }
+  | H_SY '=' H_FLOAT  { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; }
+  | H_A '=' H_FLOAT   { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; }
+  ;
+
+useg
+  : '(' H_USEG { new_record(); } coord_point1 layer1_name coord_point2 layer2_name useg_param { if (exec_useg(&h)) YYERROR; } ; 
+
+useg_param
+  : useg_stackup
+  | useg_impedance
+  ;
+
+useg_stackup
+  : H_ZL '=' H_STRING  { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } 
+    H_ZW '=' H_FLOAT   { h.width = yylval.floatval; }
+    H_ZLEN '=' H_FLOAT { h.length = yylval.floatval; }
+    ')'
+  ;
+
+useg_impedance
+  : H_Z '=' H_FLOAT    { h.impedance = yylval.floatval; h.impedance_set = pcb_true; }
+    H_D '=' H_FLOAT    { h.delay = yylval.floatval; }
+    useg_resistance;
+
+useg_resistance 
+  : H_R '=' H_FLOAT    { h.resistance = yylval.floatval; h.resistance_set = pcb_true;}
+    ')'
+  | ')'
+  ;
+
+polygon
+  : '{' H_POLYGON { new_record(); } polygon_param_list coord_point { if (exec_polygon_begin(&h)) YYERROR; }
+    lines_and_curves '}' { if (exec_polygon_end(&h)) YYERROR; } ;
+
+polygon_param_list
+  : polygon_param_list polygon_param
+  | polygon_param
+  ;
+
+polygon_param
+  : layer_name
+  | width
+  | polygon_type
+  | polygon_id
+  ;
+
+polygon_id
+  : H_ID '=' H_POSINT { h.id = yylval.intval; h.id_set = pcb_true; } /* polygon id is a non-negative integer */
+  ;
+
+polygon_type
+  : H_T '=' H_POUR    { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; }
+  | H_T '=' H_PLANE   { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; }
+  | H_T '=' H_COPPER  { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; }
+  ;
+
+polyvoid
+  : '{' H_POLYVOID { new_record(); } polygon_id coord_point { if (exec_polyvoid_begin(&h)) YYERROR; }
+    lines_and_curves '}' { if (exec_polyvoid_end(&h)) YYERROR; } ;
+
+polyline
+  : '{' H_POLYLINE { new_record(); } polygon_param_list coord_point { if (exec_polyline_begin(&h)) YYERROR; }
+    lines_and_curves '}' { if (exec_polyline_end(&h)) YYERROR; } ;
+
+lines_and_curves
+  : lines_and_curves line_or_curve
+  | line_or_curve
+  ;
+
+line_or_curve
+  : line
+  | curve
+  | ')' { hyyerror("warning: unexpected ')'"); }
+  | '(' error ')'
+  ;
+
+line
+  : '(' H_LINE { new_record(); } coord_point ')' { if (exec_line(&h)) YYERROR; } ;
+
+curve
+  : '(' H_CURVE { new_record(); } coord_arc ')' { if (exec_curve(&h)) YYERROR; } ;
+
+net_attribute
+  : '(' H_A H_N '=' H_STRING { h.name = yylval.strval; } H_V '=' H_STRING { h.value = yylval.strval; } ')' { if (exec_net_attribute(&h)) YYERROR; } ;
+
+  /* net class */
+
+netclass
+  : '{' H_NET_CLASS '=' H_STRING { h.net_class_name = yylval.strval; if (exec_net_class(&h)) YYERROR; } netclass_subrecords ;
+
+netclass_subrecords
+  : netclass_paramlist '}'
+  | '}' 
+  ;
+
+netclass_paramlist
+  : netclass_paramlist netclass_param
+  | netclass_param 
+  ;
+
+netclass_param
+  : netclass_attribute 
+  | net_name 
+  | '(' error ')'
+  ;
+
+net_name
+  : '(' H_N H_N '=' H_STRING { h.net_name = yylval.strval; } ')' { if (exec_net_class_element(&h)) YYERROR; } ;
+
+netclass_attribute
+  : '(' H_A H_N '=' H_STRING { h.name = yylval.strval; } H_V '=' H_STRING { h.value = yylval.strval; } ')' { if (exec_net_class_attribute(&h)) YYERROR; } ;
+
+  /* end */
+
+end
+  : '{' H_END '}' { if (exec_end(&h)) YYERROR; } ;
+
+  /* key */
+
+key
+  : '{' H_KEY '=' H_STRING { h.key = yylval.strval; } '}' { if (exec_key(&h)) YYERROR; } ;
+
+  /* coordinates */
+
+coord_point
+  : H_X '=' H_FLOAT { h.x = yylval.floatval; } H_Y '=' H_FLOAT { h.y = yylval.floatval; } ;
+
+coord_point1
+  : H_X1 '=' H_FLOAT { h.x1 = yylval.floatval; } H_Y1 '=' H_FLOAT { h.y1 = yylval.floatval; } ;
+
+coord_point2
+  : H_X2 '=' H_FLOAT { h.x2 = yylval.floatval; } H_Y2 '=' H_FLOAT { h.y2 = yylval.floatval; } ;
+
+coord_line
+  : coord_point1 coord_point2 ;
+
+coord_arc
+  : coord_line H_XC '=' H_FLOAT { h.xc = yylval.floatval; } H_YC '=' H_FLOAT { h.yc = yylval.floatval; } H_R '=' H_FLOAT { h.r = yylval.floatval; } ;
+
+%%
+
+/*
+ * Supporting C routines
+ */
+
+void hyyerror(const char *msg)
+{
+  /* log pcb-rnd message */
+  hyp_error(msg);
+}
+
+void hyyprint(FILE *file, int type, YYSTYPE value)
+{
+  if (type == H_STRING)
+    fprintf (file, "%s", value.strval);
+   else if (type == H_FLOAT)
+    fprintf (file, "%g", value.floatval);
+   else if (type == H_BOOL)
+    fprintf (file, "%i", value.boolval);
+  return;
+}
+
+/*
+ * reset parse_param struct at beginning of record
+ */
+
+static void new_record()
+{
+  h.vers = 0;
+  h.detailed = pcb_false;
+  h.unit_system_english = pcb_false;
+  h.metal_thickness_weight = pcb_false;
+  h.default_plane_separation = 0;
+  h.use_die_for_metal = pcb_false;
+  h.bulk_resistivity = 0;
+  h.conformal = pcb_false;
+  h.epsilon_r = 0;
+  h.layer_name = NULL;
+  h.loss_tangent = 0;
+  h.material_name = NULL;
+  h.plane_separation = 0;
+  h.plating_thickness = 0;
+  h.prepreg = pcb_false;
+  h.temperature_coefficient = 0;
+  h.thickness = 0;
+  h.bulk_resistivity_set = pcb_false;
+  h.conformal_set = pcb_false;
+  h.epsilon_r_set = pcb_false;
+  h.layer_name_set = pcb_false;
+  h.loss_tangent_set = pcb_false;
+  h.material_name_set = pcb_false;
+  h.plane_separation_set = pcb_false;
+  h.plating_thickness_set = pcb_false;
+  h.prepreg_set = pcb_false;
+  h.temperature_coefficient_set = pcb_false;
+  h.thickness_set = pcb_false;
+  h.device_type = NULL;
+  h.ref = NULL;
+  h.value_float = 0;
+  h.value_string = NULL;
+  h.package = NULL;
+  h.name_set = pcb_false;
+  h.value_float_set = pcb_false;
+  h.value_string_set = pcb_false;
+  h.package_set = pcb_false;
+  h.voltage_specified = pcb_false;
+  h.conversion = pcb_false;
+  h.padstack_name = NULL;
+  h.drill_size = 0;
+  h.pad_shape = 0;
+  h.pad_sx = 0;
+  h.pad_sy = 0;
+  h.pad_angle = 0;
+  h.thermal_clear_shape = 0;
+  h.thermal_clear_sx = 0;
+  h.thermal_clear_sy = 0;
+  h.thermal_clear_angle = 0;
+  h.pad_type = PAD_TYPE_METAL;
+  h.padstack_name_set = pcb_false;
+  h.drill_size_set = pcb_false;
+  h.pad_type_set = pcb_false;
+  h.width = 0;
+  h.left_plane_separation = 0;
+  h.width_set = pcb_false;
+  h.left_plane_separation_set = pcb_false;
+  h.layer1_name = NULL;
+  h.layer1_name_set = pcb_false;
+  h.layer2_name = NULL;
+  h.layer2_name_set = pcb_false;
+  h.via_pad_shape = NULL;
+  h.via_pad_shape_set = pcb_false;
+  h.via_pad_sx = 0;
+  h.via_pad_sx_set = pcb_false;
+  h.via_pad_sy = 0;
+  h.via_pad_sy_set = pcb_false;
+  h.via_pad_angle = 0;
+  h.via_pad_angle_set = pcb_false;
+  h.via_pad1_shape = NULL;
+  h.via_pad1_shape_set = pcb_false;
+  h.via_pad1_sx = 0;
+  h.via_pad1_sx_set = pcb_false;
+  h.via_pad1_sy = 0;
+  h.via_pad1_sy_set = pcb_false;
+  h.via_pad1_angle = 0;
+  h.via_pad1_angle_set = pcb_false;
+  h.via_pad2_shape = NULL;
+  h.via_pad2_shape_set = pcb_false;
+  h.via_pad2_sx = 0;
+  h.via_pad2_sx_set = pcb_false;
+  h.via_pad2_sy = 0;
+  h.via_pad2_sy_set = pcb_false;
+  h.via_pad2_angle = 0;
+  h.via_pad2_angle_set = pcb_false;
+  h.pin_reference = NULL;
+  h.pin_reference_set = pcb_false;
+  h.pin_function = PIN_SIM_BOTH;
+  h.pin_function_set = pcb_false;
+  h.zlayer_name = NULL;
+  h.zlayer_name_set = pcb_false;
+  h.length = 0;
+  h.impedance = 0;
+  h.impedance_set = pcb_false;
+  h.delay = 0;
+  h.resistance = 0;
+  h.resistance_set = pcb_false;
+  h.id = -1;
+  h.id_set = pcb_false;
+  h.polygon_type = POLYGON_TYPE_PLANE;
+  h.polygon_type_set = pcb_false;
+  h.net_class_name = NULL;
+  h.net_name = NULL;
+  h.key = NULL;
+  h.name = NULL;
+  h.value = NULL;
+  h.x = 0;
+  h.y = 0;
+  h.x1 = 0;
+  h.y1 = 0;
+  h.x2 = 0;
+  h.y2 = 0;
+  h.xc = 0;
+  h.yc = 0;
+  h.r = 0;
+
+  return;
+}
+
+/* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/io_hyp.c
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/io_hyp.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/io_hyp.c	(revision 18980)
@@ -0,0 +1,196 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  hyperlynx .hyp importer, plugin entry
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "compat_nls.h"
+#include "hid.h"
+#include "hid_draw_helpers.h"
+#include "hid_nogui.h"
+#include "actions.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "plugins.h"
+#include "event.h"
+#include "plug_io.h"
+#include "parser.h"
+#include "board.h"
+#include "write.h"
+
+static const char *hyp_cookie = "hyp importer";
+
+
+static pcb_plug_io_t io_hyp;
+
+int io_hyp_fmt(pcb_plug_io_t * ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "hyp") != 0) || ((typ & (~(PCB_IOT_PCB))) != 0))
+		return 0;
+
+	return 70;
+}
+
+
+
+static const char pcb_acts_LoadhypFrom[] = "LoadhypFrom(filename[, \"debug\"]...)";
+
+static const char pcb_acth_LoadhypFrom[] = "Loads the specified Hyperlynx file.";
+
+fgw_error_t pcb_act_LoadhypFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	int debug = 0;
+	pcb_bool_t retval;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str);
+
+	if ((fname == NULL) || (*fname == '\0')) {
+		fname = pcb_gui->fileselect(_("Load .hyp file..."),
+																_("Picks a hyperlynx file to load.\n"), "default.hyp", ".hyp", "hyp", HID_FILESELECT_READ);
+	}
+
+	if (fname == NULL) {
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+#warning TODO: rewrite this - this is very unpcb-rnd
+#if 0
+	int i = 0;
+	/* 
+	 * debug level.
+	 * one "debug" argument: hyperlynx logging.
+	 * two "debug" arguments: hyperlynx and bison logging.
+	 * three "debug" arguments: hyperlynx, bison and flex logging.
+	 */
+
+	for (i = 0; i < argc; i++)
+		debug += (strcmp(argv[i], "debug") == 0);
+#endif
+
+	if (debug > 0)
+		pcb_message(PCB_MSG_INFO, _("Importing Hyperlynx file '%s', debug level %d\n"), fname, debug);
+
+	pcb_event(PCB_EVENT_BUSY, NULL);
+
+	retval = hyp_parse(PCB->Data, fname, debug);
+
+	/* notify GUI */
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+	pcb_event(PCB_EVENT_BOARD_CHANGED, NULL);
+
+	PCB_ACT_IRES(retval);
+	return 0;
+}
+
+pcb_action_t hyp_action_list[] = {
+	{"LoadhypFrom", pcb_act_LoadhypFrom, pcb_acth_LoadhypFrom, pcb_acts_LoadhypFrom}
+};
+
+PCB_REGISTER_ACTIONS(hyp_action_list, hyp_cookie)
+
+/* cheap, partial read of the file to determine if it is worth running the real parser */
+int io_hyp_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE * f)
+{
+	char line[1024];
+	int found = 0, lineno = 0;
+
+	if (typ != PCB_IOT_PCB)
+		return 0; /* support only boards for now */
+
+	/* look for {VERSION and {BOARD in the first 32 lines, not assuming indentation */
+	while (fgets(line, sizeof(line), f) != NULL) {
+		if ((found == 0) && (strstr(line, "{VERSION=")))
+			found = 1;
+		if ((found == 1) && (strstr(line, "{BOARD")))
+			return 1;
+		lineno++;
+		if (lineno > 32)
+			break;
+	}
+	return 0;
+}
+
+int io_hyp_read_pcb(pcb_plug_io_t * ctx, pcb_board_t * pcb, const char *Filename, conf_role_t settings_dest)
+{
+	int res = hyp_parse(pcb->Data, Filename, 0);
+	pcb_layer_auto_fixup(pcb);
+	pcb_layer_colors_from_conf(pcb, 1);
+	return res;
+}
+
+int pplg_check_ver_io_hyp(int ver_needed)
+{
+	return 0;
+}
+
+void pplg_uninit_io_hyp(void)
+{
+	pcb_remove_actions_by_cookie(hyp_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_hyp);
+
+}
+
+#include "dolists.h"
+int pplg_init_io_hyp(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_hyp.plugin_data = NULL;
+	io_hyp.fmt_support_prio = io_hyp_fmt;
+	io_hyp.test_parse = io_hyp_test_parse;
+	io_hyp.parse_pcb = io_hyp_read_pcb;
+/*	io_hyp.parse_footprint = NULL;
+	io_hyp.parse_font = NULL;
+	io_hyp.write_buffer = io_hyp_write_buffer;
+	io_hyp.write_footprint = io_hyp_write_element;*/
+	io_hyp.write_pcb = io_hyp_write_pcb;
+	io_hyp.default_fmt = "hyp";
+	io_hyp.description = "hyperlynx";
+	io_hyp.save_preference_prio = 30;
+	io_hyp.default_extension = ".hyp";
+#warning TODO: look these up
+	io_hyp.fp_extension = ".hyp_mod";
+	io_hyp.mime_type = "application/x-hyp-pcb";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_hyp);
+
+
+	PCB_REGISTER_ACTIONS(hyp_action_list, hyp_cookie)
+		return 0;
+}
+
+/* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/io_hyp.pup
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/io_hyp.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/io_hyp.pup	(revision 18980)
@@ -0,0 +1,12 @@
+$class io
+$short hyperlynx .hyp loader
+$long Import plugin for hyperlynx geometry (no polygons yet).
+$state works
+$fmt-native no
+$fmt-feature-r hyperlynx board, version 2 and above
+$fmt-feature-w hyperlynx board, version 2.0
+$package io-alien
+default buildin
+autoload 1
+dep lib_netmap
+
Index: tags/2.0.1/src_plugins/io_hyp/parser.c
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/parser.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/parser.c	(revision 18980)
@@ -0,0 +1,2726 @@
+/*
+ * read hyperlynx files
+ * Copyright 2016 Koen De Vleeschauwer.
+ * Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ * This file is part of pcb-rnd.
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#define MAX_STRING 256
+
+#include "parser.h"
+#include "hyp_l.h"
+#include "hyp_y.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "flag_str.h"
+#include "polygon.h"
+#include "board.h"
+#include "layer.h"
+#include "data.h"
+#include "search.h"
+#include "rotate.h"
+#include "actions.h"
+#include "plug_io.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+#include "../src_plugins/lib_compat_help/subc_help.h"
+#include <string.h>
+
+#define MASK_OFFS  +PCB_MIL_TO_COORD(10)
+#define PASTE_OFFS -PCB_MIL_TO_COORD(10)
+
+
+#undef min
+#undef max
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define max(x, y) ((x) > (y) ? (x) : (y))
+
+/*
+ * the board is shared between all routines.
+ */
+
+pcb_data_t *hyp_dest;
+
+/*
+ * board outline is a linked list of arcs and line segments.
+ */
+
+typedef struct outline_s {
+	pcb_coord_t x1;
+	pcb_coord_t y1;
+	pcb_coord_t x2;
+	pcb_coord_t y2;
+	pcb_coord_t xc;
+	pcb_coord_t yc;
+	pcb_coord_t r;
+	pcb_bool_t is_arc;						/* arc or line */
+	pcb_bool_t used;							/* already included in outline */
+	struct outline_s *next;
+} outline_t;
+
+outline_t *outline_head;
+outline_t *outline_tail;
+
+void hyp_set_origin();					/* set origin so all coordinates are positive */
+void hyp_perimeter();						/* add board outline to pcb */
+void hyp_draw_polygons();				/* add all hyperlynx polygons to pcb */
+static void hyp_subcs_fin(void);
+void hyp_resize_board();				/* resize board to fit outline */
+pcb_bool_t hyp_is_bottom_layer(char *);	/* true if bottom layer */
+
+/* layer creation */
+int layer_count;
+pcb_layer_id_t top_layer_id, bottom_layer_id;
+void hyp_reset_layers();				/* reset layer stack to minimun */
+pcb_layer_id_t hyp_create_layer(char *lname);	/* create new copper layer at bottom of stack */
+
+int hyp_debug;									/* logging on/off switch */
+
+/* Physical constants */
+double inches;									/* inches to m */
+double copper_imperial_weight;	/* metal thickness in ounces/ft2 */
+double copper_metric_weight;		/* metal thickness in grams/cm2 */
+double copper_bulk_resistivity;	/* metal resistivity in ohm meter */
+double copper_temperature_coefficient;	/* temperature coefficient of bulk resistivity */
+double fr4_epsilon_r;						/* dielectric constant of substrate */
+double fr4_loss_tangent;				/* loss tangent of substrate */
+double conformal_epsilon_r;			/* dielectric constant of conformal coating */
+
+/* Hyperlynx UNIT and OPTIONS */
+double unit;										/* conversion factor: pcb length units to meters */
+double metal_thickness_unit;		/* conversion factor: metal thickness to meters */
+
+pcb_bool use_die_for_metal;			/* use dielectric constant and loss tangent of dielectric for metal layers */
+
+pcb_coord_t board_clearance;		/* distance between PLANE polygon and copper of different nets; -1 if not set */
+
+/* stackup */
+pcb_bool layer_is_plane[PCB_MAX_LAYER];	/* whether layer is signal or plane layer */
+pcb_coord_t layer_clearance[PCB_MAX_LAYER];	/* separation between fill copper and signals on layer */
+
+/* net */
+char *net_name;									/* name of current copper */
+pcb_coord_t net_clearance;			/* distance between PLANE polygon and net copper */
+
+/* netlist */
+void hyp_netlist_begin();
+void hyp_netlist_add(char *device_name, char *pin_name);
+void hyp_netlist_end();
+
+/* devices */
+
+typedef struct device_s {
+	char *ref;
+	char *name;										/* optional */
+	char *value;									/* optional */
+	char *layer_name;
+	pcb_subc_t *subc;
+	struct device_s *next;
+} device_t;
+
+device_t *device_head;
+int unknown_device_number;
+int unknown_pin_number;
+
+/* padstack */
+
+typedef struct padstack_element_s {
+	char *layer_name;
+	int pad_shape;
+	pcb_coord_t pad_sx;
+	pcb_coord_t pad_sy;
+	double pad_angle;
+	pcb_coord_t thermal_clear_sx;
+	pcb_coord_t thermal_clear_sy;
+	double thermal_clear_angle;
+	pad_type_enum pad_type;
+	struct padstack_element_s *next;
+} padstack_element_t;
+
+padstack_element_t *current_pstk_element;
+
+typedef struct padstack_s {
+	char *name;
+	pcb_coord_t drill_size;
+	struct padstack_element_s *padstack;
+	struct padstack_s *next;
+} padstack_t;
+
+padstack_t *padstack_head;
+padstack_t *current_pstk;
+
+/* polygons */
+
+/* 
+ * a hyperlynx polygon is a sequence of line and arc segments.
+ *
+ * if is_arc is false, draw a line to (x1, y1).
+ * if is_arc is true, draw an arc from (x1, y1) to (x2, y2) with center (xc, yc).
+ *
+ * is_first marks the first vertex of a contour. 
+ * The first contour is the outer edge of the polygon; the following contours are holes.
+ */
+
+typedef struct hyp_vertex_s {
+	pcb_coord_t x1;
+	pcb_coord_t y1;
+	pcb_coord_t x2;
+	pcb_coord_t y2;
+	pcb_coord_t xc;
+	pcb_coord_t yc;
+	pcb_coord_t r;
+	pcb_bool_t is_first;					/* true if first vertex of contour */
+	pcb_bool_t is_arc;						/* true if arc */
+	struct hyp_vertex_s *next;
+} hyp_vertex_t;
+
+	/* linked list to store correspondence between hyperlynx polygon id's and pcb polygons. */
+typedef struct hyp_polygon_s {
+	int hyp_poly_id;							/* hyperlynx polygon/polyline id */
+	polygon_type_enum hyp_poly_type;	/* pour, copper, ... */
+	pcb_bool_t is_polygon;				/* true if polygon, false if polyline */
+	char *layer_name;							/* layer of polygon */
+	pcb_coord_t line_width;				/* line width of edge */
+	pcb_coord_t clearance;				/* clearance with other copper */
+	hyp_vertex_t *vertex;					/* polygon contours as linked list of vertices */
+	struct hyp_polygon_s *next;
+} hyp_polygon_t;
+
+hyp_polygon_t *polygon_head = NULL;	/* linked list of all polygons */
+hyp_vertex_t *current_vertex = NULL;	/* keeps track where to add next polygon segment when parsing polygons */
+
+/* origin. Chosen so all coordinates are positive. */
+pcb_coord_t origin_x;
+pcb_coord_t origin_y;
+
+/*
+ * Conversion from hyperlynx to pcb_coord_t
+ */
+
+/* meter to pcb_coord_t */
+
+static pcb_coord_t m2coord(double m)
+{
+	return ((pcb_coord_t) PCB_MM_TO_COORD(1000.0 * m));
+}
+
+/* xy coordinates to pcb_coord_t, without offset */
+
+static pcb_coord_t xy2coord(double f)
+{
+	return (m2coord(unit * f));
+}
+
+
+/* x coordinates to pcb_coord_t, with offset */
+
+static pcb_coord_t x2coord(double f)
+{
+	return (m2coord(unit * f) - origin_x);
+}
+
+/* y coordinates to pcb_coord_t, with offset */
+
+static pcb_coord_t y2coord(double f)
+{
+	return (origin_y - m2coord(unit * f));
+}
+
+/* z coordinates to pcb_coord_t. No offset needed. */
+
+static pcb_coord_t z2coord(double f)
+{
+	return (m2coord(metal_thickness_unit * f));
+}
+
+/*
+ * initialize physical constants 
+ */
+
+void hyp_init(void)
+{
+	int n;
+
+	unit = 1;
+	metal_thickness_unit = 1;
+	use_die_for_metal = pcb_false;
+
+	inches = 0.0254;							/* inches to m */
+	copper_imperial_weight = 1.341;	/* metal thickness in ounces/ft2. 1 oz/ft2 copper = 1.341 mil */
+	copper_metric_weight = 0.1116;	/* metal thickness in grams/cm2. 1 gr/cm2 copper = 0.1116 cm */
+	copper_bulk_resistivity = 1.724e-8;
+	copper_temperature_coefficient = 0.00393;
+	fr4_epsilon_r = 4.3;
+	fr4_loss_tangent = 0.020;
+	conformal_epsilon_r = 3.3;		/* dielectric constant of conformal layer */
+	board_clearance = -1;					/* distance between PLANE polygon and copper of different nets; -1 if not set */
+
+	/* empty board outline */
+	outline_head = NULL;
+	outline_tail = NULL;
+
+	/* clear layer info */
+	for (n = 1; n < PCB_MAX_LAYER; n++) {
+		layer_is_plane[n] = pcb_false;	/* signal layer */
+		layer_clearance[n] = -1;		/* no separation between fill copper and signals on layer */
+	}
+	layer_count = 0;
+	top_layer_id = -1;
+	bottom_layer_id = -1;
+
+	/* clear padstack */
+	padstack_head = NULL;
+	current_pstk = NULL;
+	current_pstk_element = NULL;
+
+	/* clear devices */
+	device_head = NULL;
+	unknown_device_number = 0;
+	unknown_pin_number = 0;
+
+	/* clear polygon data */
+	polygon_head = NULL;
+	current_vertex = NULL;
+
+	/* set origin */
+	origin_x = 0;
+	origin_y = 0;
+
+	return;
+}
+
+/* 
+ * called by pcb-rnd to load hyperlynx file 
+ */
+
+int hyp_parse(pcb_data_t * dest, const char *fname, int debug)
+{
+	int retval;
+
+	/* set debug levels */
+	hyyset_debug(debug > 2);			/* switch flex logging on */
+	hyydebug = (debug > 1);				/* switch bison logging on */
+	hyp_debug = (debug > 0);			/* switch hyperlynx logging on */
+
+	hyp_init();
+
+	hyp_netlist_begin();
+
+	hyp_reset_layers();
+
+	/* set shared board */
+	hyp_dest = dest;
+
+	/* reset line number to first line */
+	hyyset_lineno(1);
+
+	/* parse hyperlynx file */
+	hyyin = pcb_fopen(fname, "r");
+	if (hyyin == NULL)
+		return 1;
+	retval = hyyparse();
+	fclose(hyyin);
+
+	/* set up polygons */
+	hyp_draw_polygons();
+
+	/* postprocess/finalize subcircuits */
+	hyp_subcs_fin();
+
+	/* add board outline last */
+	hyp_perimeter();
+
+	/* clear */
+	hyp_dest = NULL;
+
+	hyp_netlist_end();
+
+	return retval;
+}
+
+/* print error message */
+void hyp_error(const char *msg)
+{
+	enum pcb_message_level level;
+
+	if (strstr(msg, "warning"))
+		level = PCB_MSG_WARNING;
+	else
+		level = PCB_MSG_ERROR;
+
+	pcb_message(level, "line %d: %s at '%s'\n", hyylineno, msg, hyytext);
+}
+
+/*
+ * find padstack by name 
+ */
+#warning TODO: use a hash instead
+padstack_t *hyp_pstk_by_name(char *padstack_name)
+{
+	padstack_t *i;
+	for (i = padstack_head; i != NULL; i = i->next)
+		if (strcmp(i->name, padstack_name) == 0)
+			return i;
+	return NULL;
+}
+
+/*
+ * netlist - assign pin or pad to net
+ */
+
+void hyp_netlist_begin()
+{
+	/* clear netlist */
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+	return;
+}
+
+/* add pin to net */
+void hyp_netlist_add(char *device_name, char *pin_name)
+{
+	char conn[MAX_STRING];
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "netlist net: '%s' device: '%s' pin: '%s'\n", net_name, device_name, pin_name);
+
+	if ((net_name != NULL) && (device_name != NULL) && (pin_name != NULL)) {
+		pcb_snprintf(conn, sizeof(conn), "%s-%s", device_name, pin_name);
+		pcb_actionl("Netlist", "Add", net_name, conn, NULL);
+	}
+	return;
+}
+
+void hyp_netlist_end()
+{
+	/* sort netlist */
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+	return;
+}
+
+/*
+ * find hyperlynx device by name 
+ */
+#warning TODO: convert this into a hash
+device_t *hyp_device_by_name(char *device_name)
+{
+	device_t *i;
+	for (i = device_head; i != NULL; i = i->next)
+		if (strcmp(i->ref, device_name) == 0)
+			return i;
+	return NULL;
+}
+
+pcb_subc_t *hyp_create_subc_by_name(char *refdes, pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_subc_t *subc;
+	pcb_uint8_t text_direction = 0;
+	int text_scale = 100;
+	device_t *dev;
+	int on_bottom;
+
+	/* does the device already exist? */
+	subc = pcb_subc_by_refdes(hyp_dest, refdes);
+	if (subc != NULL)
+		return subc;
+
+	/* device needs to be created. Search in DEVICE records. */
+	dev = hyp_device_by_name(refdes);
+	if (dev == NULL) {
+		/* no device with this name exists, and no such device has been listed in a DEVICE record. Let's create the device anyhow so we can continue. Assume device is on component side. */
+		pcb_message(PCB_MSG_WARNING, "device \"%s\" not specified in DEVICE record. Assuming device is on component side.\n", refdes);
+
+		dev = calloc(sizeof(device_t), 1);
+		dev->next = device_head;
+		device_head = dev;
+	}
+
+	/* device on component or solder side? */
+	if (dev->layer_name != NULL)
+		on_bottom = hyp_is_bottom_layer(dev->layer_name);
+	if (on_bottom)
+		text_direction = 2;
+
+	/* create */
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "creating device \"%s\".\n", dev->ref);
+
+	subc = pcb_subc_alloc();
+	pcb_subc_create_aux(subc, x, y, 0.0, on_bottom);
+	pcb_attribute_put(&subc->Attributes, "refdes", refdes);
+	pcb_subc_add_refdes_text(subc, x, y, text_direction, text_scale, on_bottom);
+	pcb_add_subc_to_data(hyp_dest, subc);
+	pcb_subc_bind_globals(hyp_dest->parent.board, subc);
+
+	dev->subc = subc;
+
+	return subc;
+}
+
+static void hyp_subc_fin(pcb_subc_t *subc)
+{
+	pcb_subc_bbox(subc);
+	if (hyp_dest->subc_tree == NULL)
+		hyp_dest->subc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(hyp_dest->subc_tree, (pcb_box_t *)subc);
+	pcb_subc_rebind(hyp_dest->parent.board, subc);
+}
+
+static void hyp_subcs_fin(void)
+{
+	device_t *d;
+	for(d = device_head; d != NULL; d = d->next)
+		if (d->subc != NULL)
+			hyp_subc_fin(d->subc);
+}
+
+/*
+ * add segment to board outline
+ */
+
+void hyp_perimeter_segment_add(outline_t * s, pcb_bool_t forward)
+{
+	pcb_layer_id_t outline_id;
+	pcb_layer_t *outline_layer;
+
+	/* get outline layer */
+	outline_id = pcb_layer_by_name(PCB->Data, "outline");
+	if (outline_id < 0) {
+		pcb_message(PCB_MSG_ERROR, "no outline layer.\n");
+		return;
+	}
+	outline_layer = pcb_get_layer(PCB->Data, outline_id);
+	if (outline_layer == NULL) {
+		pcb_message(PCB_MSG_ERROR, "get outline layer failed.\n");
+		return;
+	}
+
+	/* mark segment as used, so we don't use it twice */
+	s->used = pcb_true;
+
+	/* debugging */
+	if (hyp_debug) {
+		if (forward)
+			pcb_message(PCB_MSG_DEBUG, "outline: fwd %s from (%ml, %ml) to (%ml, %ml)\n", s->is_arc ? "arc" : "line", s->x1, s->y1,
+									s->x2, s->y2);
+		else
+			pcb_message(PCB_MSG_DEBUG, "outline: bwd %s from (%ml, %ml) to (%ml, %ml)\n", s->is_arc ? "arc" : "line", s->x2, s->y2, s->x1, s->y1);	/* add segment back to front */
+	}
+
+	if (s->is_arc) {
+		/* counterclockwise arc from (x1, y1) to (x2, y2) */
+		hyp_arc_new(outline_layer, s->x1, s->y1, s->x2, s->y2, s->xc, s->yc, s->r, s->r, pcb_false, 1, 0, pcb_no_flags());
+	}
+	else
+		/* line from (x1, y1) to (x2, y2) */
+		pcb_line_new(outline_layer, s->x1, s->y1, s->x2, s->y2, 1, 0, pcb_no_flags());
+
+	return;
+}
+
+/* 
+ * Check whether point (end_x, end_y) is connected to point (begin_x, begin_y) via un-used segment s and other un-used segments.
+ */
+
+pcb_bool_t hyp_segment_connected(pcb_coord_t begin_x, pcb_coord_t begin_y, pcb_coord_t end_x, pcb_coord_t end_y, outline_t * s)
+{
+	outline_t *i;
+	pcb_bool_t connected;
+
+	connected = (begin_x == end_x) && (begin_y == end_y);	/* trivial case */
+
+	if (!connected) {
+		/* recursive descent */
+		s->used = pcb_true;
+
+		for (i = outline_head; i != NULL; i = i->next) {
+			if (i->used)
+				continue;
+			if ((i->x1 == begin_x) && (i->y1 == begin_y)) {
+				connected = ((i->x2 == end_x) && (i->y2 == end_y)) || hyp_segment_connected(i->x2, i->y2, end_x, end_y, i);
+				if (connected)
+					break;
+			}
+			/* try back-to-front */
+			if ((i->x2 == begin_x) && (i->y2 == begin_y)) {
+				connected = ((i->x1 == end_x) && (i->y1 == end_y)) || hyp_segment_connected(i->x1, i->y1, end_x, end_y, i);
+				if (connected)
+					break;
+			}
+		}
+
+		s->used = pcb_false;
+	}
+
+	return connected;
+}
+
+/* 
+ * Sets (origin_x, origin_y)
+ * Choose origin so that all coordinates are posive. 
+ */
+
+void hyp_set_origin()
+{
+	outline_t *i;
+
+	/* safe initial value */
+	if (outline_head != NULL) {
+		origin_x = outline_head->x1;
+		origin_y = outline_head->y1;
+	}
+	else {
+		origin_x = 0;
+		origin_y = 0;
+	}
+
+	/* choose upper left corner of outline */
+	for (i = outline_head; i != NULL; i = i->next) {
+		/* set origin so all coordinates are positive */
+		if (i->x1 < origin_x)
+			origin_x = i->x1;
+		if (i->x2 < origin_x)
+			origin_x = i->x2;
+		if (i->y1 > origin_y)
+			origin_y = i->y1;
+		if (i->y2 > origin_y)
+			origin_y = i->y2;
+		if (i->is_arc) {
+			if (i->xc - i->r < origin_x)
+				origin_x = i->xc - i->r;
+			if (i->yc + i->r > origin_y)
+				origin_y = i->yc + i->r;
+		}
+	}
+}
+
+/* 
+ * resize board to fit pcb outline.
+ */
+
+void hyp_resize_board()
+{
+	pcb_coord_t x_max, x_min, y_max, y_min;
+	pcb_coord_t width, height;
+	pcb_coord_t slack = PCB_MM_TO_COORD(1);
+	outline_t *i;
+
+	if (PCB == NULL)
+		return;
+	if (outline_head == NULL)
+		return;
+
+	x_min = x_max = outline_head->x1;
+	y_min = y_max = outline_head->y1;
+
+	for (i = outline_head; i != NULL; i = i->next) {
+
+		x_max = max(x_max, i->x1);
+		x_max = max(x_max, i->x2);
+		y_max = max(y_max, i->y1);
+		y_max = max(y_max, i->y2);
+
+		x_min = min(x_min, i->x1);
+		x_min = min(x_min, i->x2);
+		y_min = min(y_min, i->y1);
+		y_min = min(y_min, i->y2);
+
+		if (i->is_arc) {
+			x_max = max(x_max, i->xc + i->r);
+			y_max = max(y_max, i->yc + i->r);
+
+			x_min = min(x_min, i->xc - i->r);
+			y_min = min(y_min, i->yc - i->r);
+		}
+	}
+
+	width = max(PCB->MaxWidth, x_max - x_min + slack);
+	height = max(PCB->MaxHeight, y_max - y_min + slack);
+
+	/* resize if board too small */
+	if ((width > PCB->MaxWidth) || (height > PCB->MaxHeight))
+		pcb_board_resize(width, height);
+
+	return;
+
+}
+
+/* 
+ * Draw board perimeter.
+ * The first segment is part of the first polygon.
+ * The first polygon of the board perimeter is positive, the rest are holes.
+ * Segments do not necessarily occur in order.
+ */
+
+void hyp_perimeter()
+{
+	pcb_bool_t warn_not_closed;
+	pcb_bool_t segment_found;
+	pcb_bool_t polygon_closed;
+	pcb_coord_t begin_x, begin_y, last_x, last_y;
+	outline_t *i;
+	outline_t *j;
+
+	warn_not_closed = pcb_false;
+
+	/* iterate over perimeter segments and adjust origin */
+	for (i = outline_head; i != NULL; i = i->next) {
+		/* set origin so all coordinates are positive */
+		i->x1 = i->x1 - origin_x;
+		i->y1 = origin_y - i->y1;
+		i->x2 = i->x2 - origin_x;
+		i->y2 = origin_y - i->y2;
+		if (i->is_arc) {
+			i->xc = i->xc - origin_x;
+			i->yc = origin_y - i->yc;
+		}
+	}
+
+	/* iterate over perimeter polygons */
+	while (pcb_true) {
+
+		/* find first free segment */
+		for (i = outline_head; i != NULL; i = i->next)
+			if (i->used == pcb_false)
+				break;
+
+		/* exit if no segments found */
+		if (i == NULL)
+			break;
+
+		/* first point of polygon (begin_x, begin_y) */
+		begin_x = i->x1;
+		begin_y = i->y1;
+
+		/* last point of polygon (last_x, last_y) */
+		last_x = i->x2;
+		last_y = i->y2;
+
+		/* add segment */
+		hyp_perimeter_segment_add(i, pcb_true);
+
+		/* add polygon segments until the polygon is closed */
+		polygon_closed = pcb_false;
+		while (!polygon_closed) {
+
+#undef XXX
+#ifdef XXX
+			pcb_message(PCB_MSG_DEBUG, "perimeter: last_x = %ml last_y = %ml\n", last_x, last_y);
+			for (i = outline_head; i != NULL; i = i->next)
+				if (!i->used)
+					pcb_message(PCB_MSG_DEBUG, "perimeter segments available: %s from (%ml, %ml) to (%ml, %ml)\n",
+											i->is_arc ? "arc " : "line", i->x1, i->y1, i->x2, i->y2);
+#endif
+
+			/* find segment to add to current polygon */
+			segment_found = pcb_false;
+
+			/* XXX prefer closed polygon over open polyline */
+
+			for (i = outline_head; i != NULL; i = i->next) {
+				if (i->used)
+					continue;
+
+				if ((last_x == i->x1) && (last_y == i->y1)) {
+					if (!hyp_segment_connected(i->x2, i->y2, begin_x, begin_y, i))
+						continue;
+					/* first point of segment is last point of current edge: add segment to edge */
+					segment_found = pcb_true;
+					hyp_perimeter_segment_add(i, pcb_true);
+					last_x = i->x2;
+					last_y = i->y2;
+				}
+				else if ((last_x == i->x2) && (last_y == i->y2)) {
+					if (!hyp_segment_connected(i->x1, i->y1, begin_x, begin_y, i))
+						continue;
+					/* last point of segment is last point of current edge: add segment to edge back to front */
+					segment_found = pcb_true;
+					/* add segment back to front */
+					hyp_perimeter_segment_add(i, pcb_false);
+					last_x = i->x1;
+					last_y = i->y1;
+				}
+				if (segment_found)
+					break;
+			}
+			polygon_closed = (begin_x == last_x) && (begin_y == last_y);
+			if (!polygon_closed && !segment_found)
+				break;									/* can't find anything suitable */
+		}
+		if (polygon_closed) {
+			if (hyp_debug)
+				pcb_message(PCB_MSG_DEBUG, "outline: closed\n");
+		}
+		else {
+			if (hyp_debug)
+				pcb_message(PCB_MSG_DEBUG, "outline: open\n");
+			warn_not_closed = pcb_true;
+		}
+	}
+
+	/* free segment memory */
+	for (i = outline_head; i != NULL; i = j) {
+		j = i->next;
+		free(i);
+	}
+	outline_head = outline_tail = NULL;
+
+	if (warn_not_closed)
+		pcb_message(PCB_MSG_WARNING, "warning: board outline not closed\n");
+
+	return;
+}
+
+/* 
+ * reset pcb layer stack 
+ */
+void hyp_reset_layers()
+{
+
+	pcb_layer_id_t id = -1;
+	pcb_layergrp_id_t gid = -1;
+	pcb_layergrp_t *grp = NULL;
+
+	pcb_layergrp_inhibit_inc();
+
+	pcb_layers_reset(PCB);
+
+	pcb_layer_group_setup_default(PCB);
+
+	/* set up dual layer board: top and bottom copper and silk */
+
+	id = -1;
+	if (pcb_layergrp_list(PCB, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1) == 1)
+		id = pcb_layer_create(PCB, gid, "top silk");
+	if (id < 0)
+		pcb_message(PCB_MSG_ERROR, "failed to create top silk\n");
+
+	id = -1;
+	if (pcb_layergrp_list(PCB, PCB_LYT_SILK | PCB_LYT_BOTTOM, &gid, 1) == 1)
+		id = pcb_layer_create(PCB, gid, "bottom silk");
+	if (id < 0)
+		pcb_message(PCB_MSG_ERROR, "failed to create bottom silk\n");
+
+	top_layer_id = -1;
+	if (pcb_layergrp_list(PCB, PCB_LYT_COPPER | PCB_LYT_TOP, &gid, 1) == 1)
+		top_layer_id = pcb_layer_create(PCB, gid, "");
+	if (top_layer_id < 0)
+		pcb_message(PCB_MSG_ERROR, "failed to create top copper\n");
+
+	bottom_layer_id = -1;
+	if (pcb_layergrp_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1) == 1)
+		bottom_layer_id = pcb_layer_create(PCB, gid, "");
+	if (bottom_layer_id < 0)
+		pcb_message(PCB_MSG_ERROR, "failed to create bottom copper\n");
+
+	/* create outline layer */
+
+	id = -1;
+	grp = pcb_get_grp_new_intern(PCB, -1);
+	if (grp != NULL) {
+		id = pcb_layer_create(PCB, grp - PCB->LayerGroups.grp, "outline");
+		pcb_layergrp_fix_turn_to_outline(grp);
+	}
+	if (id < 0)
+		pcb_message(PCB_MSG_ERROR, "failed to create outline\n");
+
+	pcb_layergrp_inhibit_dec();
+
+	return;
+}
+
+/*
+ * Returns the pcb_layer_id of layer "lname". 
+ * If layer lname does not exist, a new copper layer with name "lname" is created.
+ * If the layer name is NULL, a new copper layer with a new, unused layer name is created.
+ */
+
+pcb_layer_id_t hyp_create_layer(char *lname)
+{
+	pcb_layer_id_t layer_id;
+	pcb_layergrp_id_t gid;
+	pcb_layergrp_t *grp;
+	char new_layer_name[MAX_STRING];
+	int n;
+
+	layer_id = -1;
+	if (lname != NULL) {
+		/* we have a layer name. check whether layer already exists */
+		layer_id = pcb_layer_by_name(PCB->Data, lname);
+		if (layer_id >= 0)
+			return layer_id;					/* found. return existing layer. */
+	}
+	else {
+		/* no layer name given. find unused layer name in range 1..PCB_MAX_LAYER */
+		for (n = 1; n < PCB_MAX_LAYER; n++) {
+			pcb_sprintf(new_layer_name, "%i", n);
+			if (pcb_layer_by_name(PCB->Data, new_layer_name) < 0) {
+				lname = new_layer_name;
+				break;
+			}
+		}
+		if (lname == NULL)
+			return bottom_layer_id;		/* no unused layer name available */
+	}
+
+	/* new layer */
+
+	layer_count++;
+	switch (layer_count) {
+	case 1:
+		/* rename top copper and return */
+		pcb_layer_rename(PCB->Data, top_layer_id, lname);
+		return top_layer_id;
+		break;
+
+	case 2:
+		/* rename bottom copper and return */
+		pcb_layer_rename(PCB->Data, bottom_layer_id, lname);
+		return bottom_layer_id;
+		break;
+
+	default:
+
+		/* create new bottom layer */
+		pcb_layergrp_list(PCB, PCB_LYT_COPPER | PCB_LYT_BOTTOM, &gid, 1);
+		layer_id = pcb_layer_create(PCB, gid, lname);
+
+		/* check if new bottom layer valid */
+		if (layer_id < 0) {
+			/* layer creation failed. return old bottom layer. */
+			if (hyp_debug)
+				pcb_message(PCB_MSG_DEBUG, "running out of layers\n");
+			return bottom_layer_id;
+		}
+
+		/* move old bottom layer to internal */
+		grp = pcb_get_grp_new_intern(PCB, -1);
+		pcb_layer_move_to_group(PCB, bottom_layer_id, grp - PCB->LayerGroups.grp);
+
+		/* created layer becomes new bottom layer */
+		bottom_layer_id = layer_id;
+		return bottom_layer_id;
+	}
+
+	return bottom_layer_id;
+}
+
+/*
+ * convert hyperlynx layer name to pcb layer
+ */
+
+pcb_layer_t *hyp_get_layer(parse_param * h)
+{
+	return pcb_get_layer(PCB->Data, hyp_create_layer(h->layer_name));
+}
+
+/*
+ * True if solder side 
+ */
+
+pcb_bool_t hyp_is_bottom_layer(char *layer_name)
+{
+	return ((layer_name != NULL) && (pcb_layer_flags(PCB, pcb_layer_by_name(PCB->Data, layer_name)) & PCB_LYT_BOTTOM));
+}
+
+/*
+ * Draw arc from (x1, y1) to (x2, y2) with center (xc, yc) and radius r. 
+ * Direction of arc is clockwise or counter-clockwise, depending upon value of pcb_bool_t Clockwise.
+ */
+
+pcb_arc_t *hyp_arc_new(pcb_layer_t * Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t XC,
+											 pcb_coord_t YC, pcb_coord_t Width, pcb_coord_t Height, pcb_bool_t Clockwise, pcb_coord_t Thickness,
+											 pcb_coord_t Clearance, pcb_flag_t Flags)
+{
+	pcb_angle_t start_angle;
+	pcb_angle_t end_angle;
+	pcb_angle_t delta;
+	pcb_arc_t *new_arc;
+
+	if (Width < 1) {
+		start_angle = 0.0;
+		end_angle = 360.0;
+	}
+	else {
+		/* note: y-axis points down */
+		start_angle = 180 + 180 * atan2(YC - Y1, X1 - XC) / M_PI;
+		end_angle = 180 + 180 * atan2(YC - Y2, X2 - XC) / M_PI;
+	}
+	start_angle = pcb_normalize_angle(start_angle);
+	end_angle = pcb_normalize_angle(end_angle);
+
+	if (Clockwise)
+		while (start_angle < end_angle)
+			start_angle += 360;
+	else
+		while (end_angle <= start_angle)
+			end_angle += 360;
+
+	delta = end_angle - start_angle;
+
+	new_arc = pcb_arc_new(Layer, XC, YC, Width, Height, start_angle, delta, Thickness, Clearance, Flags, pcb_true);
+
+	return new_arc;
+}
+
+/*
+ * Draw an arc from (x1, y1) to (x2, y2) with center (xc, yc) and radius r using a polygonal approximation.
+ * Arc may be clockwise or counterclockwise. Note pcb-rnd y-axis points downward.
+ */
+void hyp_arc2contour(pcb_pline_t * contour, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t xc,
+										 pcb_coord_t yc, pcb_coord_t r, pcb_bool_t clockwise)
+{
+	pcb_coord_t arc_precision = PCB_MM_TO_COORD(0.254);	/* mm */
+	int min_circle_segments = 8;	/* 8 seems minimal, 16 seems more than sufficient. */
+	int segments;
+	int poly_points = 0;
+	int i;
+	pcb_vector_t v;
+
+	double alpha = atan2(y1 - yc, x1 - xc);
+	double beta = atan2(y2 - yc, x2 - xc);
+
+	if (contour == NULL)
+		return;
+
+	if (clockwise) {
+		/* draw arc clockwise from (x1,y1) to (x2,y2) */
+		if (beta < alpha)
+			beta = beta + 2 * M_PI;
+	}
+	else {
+		/* draw arc counterclockwise from (x1,y1) to (x2,y2) */
+		if (alpha < beta)
+			alpha = alpha + 2 * M_PI;
+		/* draw a circle if starting and end points are the same */
+		if ((x1 == x2) && (y1 == y2))
+			beta = alpha + 2 * M_PI;
+	}
+
+	/* Calculate number of segments needed for a full circle. */
+	segments = min_circle_segments;
+	if (arc_precision > 0) {
+		/* Increase number of segments until difference between circular arc and polygonal approximation is less than max_arc_error */
+		double arc_error;
+		do {
+			arc_error = r * (1 - cos(M_PI / segments));
+			if (arc_error > arc_precision)
+				segments += 4;
+		}
+		while (arc_error > arc_precision);
+	}
+	else if (arc_precision < 0)
+		pcb_message(PCB_MSG_ERROR, "error: negative arc precision\n");
+
+	/* A full circle is drawn using 'segments' segments; a 90 degree arc using segments/4. */
+	poly_points = pcb_round(segments * abs(beta - alpha) / (2 * M_PI));
+
+	/* Sanity checks */
+	if (poly_points < 1)
+		poly_points = 1;
+
+	/* add first point to contour */
+	v[0] = x1;
+	v[1] = y1;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+
+	/* intermediate points */
+	for (i = 1; i < poly_points; i++) {
+		double angle = alpha + (beta - alpha) * i / poly_points;
+		v[0] = xc + r * cos(angle);
+		v[1] = yc + r * sin(angle);
+		pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+	}
+
+	/* last point */
+	v[0] = x2;
+	v[1] = y2;
+	pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+
+	return;
+}
+
+/*
+ * dump polygon structure for debugging.
+ */
+void hyp_dump_polygons()
+{
+	hyp_polygon_t *i;
+	hyp_vertex_t *v;
+
+	/* loop over all created polygons and draw them */
+	for (i = polygon_head; i != NULL; i = i->next) {
+		pcb_message(PCB_MSG_DEBUG, "%s id=%i.\n", (i->is_polygon ? "polygon" : "polyline"), i->hyp_poly_id);
+		for (v = i->vertex; v != NULL; v = v->next) {
+			if (v->is_first)
+				pcb_message(PCB_MSG_DEBUG, "  contour\n");
+			if (v->is_arc)
+				pcb_message(PCB_MSG_DEBUG, "    arc  x1 = %ml y1 = %ml x2 = %ml y2 = %ml xc = %ml yc = %ml r = %ml\n", v->x1, v->y1,
+										v->x2, v->y2, v->xc, v->yc, v->r);
+			else
+				pcb_message(PCB_MSG_DEBUG, "    line x1 = %ml y1 = %ml\n", v->x1, v->y1);
+		}
+	}
+}
+
+/* 
+ * draw a single polyline 
+ */
+
+void hyp_draw_polyline(hyp_polygon_t * polyline)
+{
+	pcb_layer_t *layer;
+	pcb_coord_t xpos;
+	pcb_coord_t ypos;
+	hyp_vertex_t *vrtx;
+
+	if ((polyline == NULL) || (polyline->vertex == NULL))
+		return;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "draw polyline:  drawing poly id=%i.\n", polyline->hyp_poly_id);
+
+	layer = pcb_get_layer(PCB->Data, hyp_create_layer(polyline->layer_name));
+
+	xpos = polyline->vertex->x1;
+	ypos = polyline->vertex->y1;
+
+	for (vrtx = polyline->vertex->next; vrtx != NULL; vrtx = vrtx->next) {
+		if (vrtx->is_first)
+			break;										/* polyvoids in polyline not implemented */
+		if (!vrtx->is_arc) {
+			/* draw line */
+			pcb_line_new(layer, xpos, ypos, vrtx->x1, vrtx->y1, polyline->line_width, polyline->clearance, pcb_no_flags());
+			/* move on */
+			xpos = vrtx->x1;
+			ypos = vrtx->y1;
+		}
+		else {
+			/* draw clockwise arc from (x1, y2) to (x2, y2) */
+			hyp_arc_new(layer, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, vrtx->r, pcb_false,
+									polyline->line_width, polyline->clearance, pcb_no_flags());
+			/* move on */
+			if ((xpos == vrtx->x1) && (ypos == vrtx->y1)) {
+				xpos = vrtx->x2;
+				ypos = vrtx->y2;
+			}
+			else if ((xpos == vrtx->x2) && (ypos == vrtx->y2)) {
+				xpos = vrtx->x1;
+				ypos = vrtx->y1;
+			}
+		}
+	}
+	return;
+}
+
+/* 
+ * draw a single polygon 
+ */
+
+void hyp_draw_polygon(hyp_polygon_t * polygon)
+{
+	pcb_layer_t *layer;
+	pcb_bool_t outer_contour;
+	hyp_vertex_t *vrtx;
+
+	pcb_polyarea_t *polyarea = NULL;
+	pcb_pline_t *contour = NULL;
+
+	polyarea = pcb_polyarea_create();
+	if (polyarea == NULL)
+		return;
+
+	if ((polygon == NULL) || (polygon->vertex == NULL))
+		return;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "draw polygon:   drawing poly id=%i.\n", polygon->hyp_poly_id);
+
+	layer = pcb_get_layer(PCB->Data, hyp_create_layer(polygon->layer_name));
+
+	outer_contour = pcb_true;
+
+	for (vrtx = polygon->vertex; vrtx != NULL; vrtx = vrtx->next) {
+		pcb_vector_t v;
+		v[0] = vrtx->x1;
+		v[1] = vrtx->y1;
+		if ((vrtx->is_first) || (vrtx->next == NULL)) {
+			if (contour != NULL) {
+				/* add contour to polyarea */
+				pcb_poly_contour_pre(contour, pcb_false);
+
+				/* check contour valid */
+				if (pcb_polyarea_contour_check(contour) && hyp_debug)
+					pcb_message(PCB_MSG_WARNING, "draw polygon: bad contour? continuing.\n");
+
+				/* set orientation for outer contour, negative for holes */
+				if (contour->Flags.orient != (outer_contour ? PCB_PLF_DIR : PCB_PLF_INV))
+					pcb_poly_contour_inv(contour);
+
+				/* add contour to polyarea */
+				pcb_polyarea_contour_include(polyarea, contour);
+
+				/* first contour is outer contour, remainder are holes */
+				outer_contour = pcb_false;
+			}
+			/* create new contour */
+			contour = pcb_poly_contour_new(v);
+			if (contour == NULL)
+				return;
+		}
+		else {
+			if (!vrtx->is_arc)
+				/* line. add vertex to contour */
+				pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+			else
+				/* arc. pcb polyarea contains line segments, not arc segments. convert arc segment to line segments. */
+				hyp_arc2contour(contour, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, pcb_false);
+		}
+	}
+
+	/* add polyarea to pcb */
+	if (pcb_poly_valid(polyarea))
+		pcb_poly_to_polygons_on_layer(hyp_dest, layer, polyarea, pcb_no_flags());
+	else if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "draw polygon: self-intersecting polygon id=%i dropped.\n", polygon->hyp_poly_id);
+
+	return;
+}
+
+/*
+ * create all polygons 
+ */
+
+void hyp_draw_polygons()
+{
+	hyp_polygon_t *i;
+	int l, layer_count = 0;
+	pcb_layer_id_t *layer_array = NULL;
+
+#ifdef XXX
+	hyp_dump_polygons();					/* more debugging */
+#endif
+
+	/* get list of copper layer id's */
+	layer_count = pcb_layer_list(PCB, PCB_LYT_COPPER, NULL, 0);
+	if (layer_count <= 0)
+		return;
+	layer_array = malloc(sizeof(pcb_layer_id_t) * layer_count);
+	if (layer_array == NULL)
+		return;
+	layer_count = pcb_layer_list(PCB, PCB_LYT_COPPER, layer_array, layer_count);
+
+	/* loop over all layers */
+	for (l = 0; l < layer_count; l++) {
+		pcb_layer_id_t layer_id = layer_array[l];
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "draw polygons: layer %lx \"%s\"\n", layer_id, pcb_layer_name(PCB->Data, layer_id));
+
+		/* loop over all polygons of the layer and draw them */
+		for (i = polygon_head; i != NULL; i = i->next) {
+			/* check polygon is on layer */
+			if (layer_id != hyp_create_layer(i->layer_name))
+				continue;
+			/* polygon or polyline? */
+			if (i->is_polygon)
+				hyp_draw_polygon(i);
+			else
+				hyp_draw_polyline(i);
+		}
+	}
+
+	return;
+}
+
+/*
+ * calculate hyperlynx-style clearance
+ * 
+ * use plane_separation of, in order:
+ * - this copper
+ * - the net this copper belongs to
+ * - the layer this copper is on
+ * - the board
+ * if neither copper, net, layer nor board have plane_separation set, do not set clearance.
+ */
+
+pcb_coord_t hyp_clearance(parse_param * h)
+{
+	pcb_coord_t clearance;
+	pcb_layer_id_t layr_id;
+
+	if (h->layer_name_set)
+		layr_id = hyp_create_layer(h->layer_name);
+	clearance = -1;
+
+	if (h->plane_separation_set)
+		clearance = xy2coord(h->plane_separation);
+	else if (net_clearance >= 0)
+		clearance = net_clearance;
+	else if (h->layer_name_set && (layer_clearance[layr_id] >= 0))
+		clearance = layer_clearance[layr_id];
+	else if (board_clearance >= 0)
+		clearance = board_clearance;
+	else
+		clearance = 0;
+
+	return clearance;
+}
+
+/* exec_* routines are called by parser to interpret hyperlynx file */
+
+/*
+ * 'BOARD_FILE' record.
+ */
+
+pcb_bool exec_board_file(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "board:\n");
+
+	return 0;
+}
+
+/*
+ * 'VERSION' record.
+ * Specifies version number.
+ */
+
+pcb_bool exec_version(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "version: vers = %f\n", h->vers);
+
+	if (h->vers < 1.0)
+		pcb_message(PCB_MSG_DEBUG, "info: version 1.x deprecated\n");
+
+	return 0;
+}
+
+/*
+ * 'DATA_MODE' record.
+ * If DATA_MODE is DETAILED, model can be used for power and signal simulation.
+ * If DATA_MODE is SIMPLIFIED, model can be used for signal simulation only.
+ */
+
+pcb_bool exec_data_mode(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "data_mode: detailed = %i\n", h->detailed);
+
+	return 0;
+}
+
+/*
+ * 'UNITS' record.
+ * Specifies measurement system (english/metric) for the rest of the file.
+ */
+
+pcb_bool exec_units(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "units: unit_system_english = %d metal_thickness_weight = %d\n", h->unit_system_english,
+								h->metal_thickness_weight);
+
+	/* convert everything to meter */
+
+	if (h->unit_system_english) {
+		unit = inches;							/* lengths in inches. 1 in = 2.54 cm = 0.0254 m */
+		if (h->metal_thickness_weight)
+			metal_thickness_unit = copper_imperial_weight * unit;	/* metal thickness in ounces/ft2. 1 oz/ft2 copper = 1.341 mil */
+		else
+			metal_thickness_unit = unit;	/* metal thickness in inches */
+	}
+	else {
+		unit = 0.01;								/* lengths in centimeters. 1 cm = 0.01 m */
+		if (h->metal_thickness_weight)
+			metal_thickness_unit = copper_metric_weight * unit;	/* metal thickness in grams/cm2. 1 gr/cm2 copper = 0.1116 cm */
+		else
+			metal_thickness_unit = unit;	/* metal thickness in centimeters */
+	}
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "units: unit = %f metal_thickness_unit = %f\n", unit, metal_thickness_unit);
+
+	return 0;
+}
+
+/*
+ * 'PLANE_SEP' record.
+ * Defines default trace to plane clearance.
+ */
+
+pcb_bool exec_plane_sep(parse_param * h)
+{
+	board_clearance = xy2coord(h->default_plane_separation);
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "plane_sep: default_plane_separation = %ml\n", board_clearance);
+
+	return 0;
+}
+
+/*
+ * 'PERIMETER_SEGMENT' subrecord of 'BOARD' record.
+ * Draws linear board outline segment from (x1, y1) to (x2, y2).
+ */
+
+pcb_bool exec_perimeter_segment(parse_param * h)
+{
+	outline_t *peri_seg;
+
+	peri_seg = malloc(sizeof(outline_t));
+
+	/* convert coordinates */
+	peri_seg->x1 = xy2coord(h->x1);
+	peri_seg->y1 = xy2coord(h->y1);
+	peri_seg->x2 = xy2coord(h->x2);
+	peri_seg->y2 = xy2coord(h->y2);
+	peri_seg->xc = 0;
+	peri_seg->yc = 0;
+	peri_seg->r = 0;
+	peri_seg->is_arc = pcb_false;
+	peri_seg->used = pcb_false;
+	peri_seg->next = NULL;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "perimeter_segment: x1 = %ml y1 = %ml x2 = %ml y2 = %ml\n", peri_seg->x1, peri_seg->y1,
+								peri_seg->x2, peri_seg->y2);
+
+	/* append at end of doubly linked list */
+	if (outline_tail == NULL) {
+		outline_head = peri_seg;
+		outline_tail = peri_seg;
+	}
+	else {
+		outline_tail->next = peri_seg;
+		outline_tail = peri_seg;
+	}
+
+	/* set origin so all coordinates are positive */
+	hyp_set_origin();
+
+	/* resize board if too small to draw outline */
+	hyp_resize_board();
+
+	return 0;
+}
+
+/*
+ * 'PERIMETER_ARC' subrecord of 'BOARD' record.
+ * Draws arc segment of board outline. 
+ * Arc drawn counterclockwise from (x1, y1) to (x2, y2) with center (xc, yc) and radius r.
+ */
+
+pcb_bool exec_perimeter_arc(parse_param * h)
+{
+	outline_t *peri_arc;
+
+	peri_arc = malloc(sizeof(outline_t));
+
+	peri_arc->x1 = xy2coord(h->x1);
+	peri_arc->y1 = xy2coord(h->y1);
+	peri_arc->x2 = xy2coord(h->x2);
+	peri_arc->y2 = xy2coord(h->y2);
+	peri_arc->xc = xy2coord(h->xc);
+	peri_arc->yc = xy2coord(h->yc);
+	peri_arc->r = xy2coord(h->r);
+	peri_arc->is_arc = pcb_true;
+	peri_arc->used = pcb_false;
+	peri_arc->next = NULL;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "perimeter_arc: x1 = %ml y1 = %ml x2 = %ml y2 = %ml xc = %ml yc = %ml r = %ml\n", peri_arc->x1,
+								peri_arc->y1, peri_arc->x2, peri_arc->y2, peri_arc->xc, peri_arc->yc, peri_arc->r);
+
+	/* append at end of doubly linked list */
+	if (outline_tail == NULL) {
+		outline_head = peri_arc;
+		outline_tail = peri_arc;
+	}
+	else {
+		outline_tail->next = peri_arc;
+		outline_tail = peri_arc;
+	}
+
+	/* set origin so all coordinates are positive */
+	hyp_set_origin();
+
+	return 0;
+}
+
+/*
+ * 'A' attribute subrecord of 'BOARD' record.
+ * Defines board attributes as name/value pairs.
+ */
+
+pcb_bool exec_board_attribute(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "board_attribute: name = \"%s\" value = \"%s\"\n", h->name, h->value);
+
+	return 0;
+}
+
+/*
+ * STACKUP section 
+ */
+
+/*
+ * Debug output for layers
+ */
+
+void hyp_debug_layer(parse_param * h)
+{
+	if (hyp_debug) {
+		if (h->thickness_set)
+			pcb_message(PCB_MSG_DEBUG, " thickness = %ml", z2coord(h->thickness));
+		if (h->plating_thickness_set)
+			pcb_message(PCB_MSG_DEBUG, " plating_thickness = %ml", z2coord(h->plating_thickness));
+		if (h->bulk_resistivity_set)
+			pcb_message(PCB_MSG_DEBUG, " bulk_resistivity = %f", h->bulk_resistivity);
+		if (h->temperature_coefficient_set)
+			pcb_message(PCB_MSG_DEBUG, " temperature_coefficient = %f", h->temperature_coefficient);
+		if (h->epsilon_r_set)
+			pcb_message(PCB_MSG_DEBUG, " epsilon_r = %f", h->epsilon_r);
+		if (h->loss_tangent_set)
+			pcb_message(PCB_MSG_DEBUG, " loss_tangent = %f", h->loss_tangent);
+		if (h->conformal_set)
+			pcb_message(PCB_MSG_DEBUG, " conformal = %i", h->conformal);
+		if (h->prepreg_set)
+			pcb_message(PCB_MSG_DEBUG, " prepreg = %i", h->prepreg);
+		if (h->layer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		if (h->material_name_set)
+			pcb_message(PCB_MSG_DEBUG, " material_name = \"%s\"", h->material_name);
+		if (h->plane_separation_set)
+			pcb_message(PCB_MSG_DEBUG, " plane_separation = %ml", xy2coord(h->plane_separation));
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	return;
+}
+
+/*
+ * 'OPTIONS' subrecord of 'STACKUP' record.
+ * Defines dielectric constant and loss tangent of metal layers.
+ */
+
+pcb_bool exec_options(parse_param * h)
+{
+	/* Use dielectric for metal? */
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "options: use_die_for_metal = %f\n", h->use_die_for_metal);
+	if (h->use_die_for_metal)
+		use_die_for_metal = pcb_true;
+	return 0;
+}
+
+/*
+ * SIGNAL subrecord of STACKUP record.
+ * signal layer.
+ */
+
+pcb_bool exec_signal(parse_param * h)
+{
+	pcb_layer_id_t signal_layer_id;
+
+	if ((h->layer_name != NULL) && (pcb_layer_by_name(PCB->Data, h->layer_name) >= 0))
+		pcb_message(PCB_MSG_WARNING, "duplicate SIGNAL layer name \"%s\"\n", h->layer_name);
+
+	signal_layer_id = hyp_create_layer(h->layer_name);
+
+	layer_is_plane[signal_layer_id] = pcb_false;
+	if (h->plane_separation_set)
+		layer_clearance[signal_layer_id] = xy2coord(h->plane_separation);
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "signal layer: \"%s\"", pcb_layer_name(PCB->Data, signal_layer_id));
+	hyp_debug_layer(h);
+
+	return 0;
+}
+
+/*
+ * DIELECTRIC subrecord of STACKUP record.
+ * dielectric layer 
+ */
+
+pcb_bool exec_dielectric(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "dielectric layer: ");
+	hyp_debug_layer(h);
+
+	return 0;
+}
+
+/*
+ * PLANE subrecord of STACKUP record.
+ * plane layer - a layer which is flooded with copper.
+ */
+
+pcb_bool exec_plane(parse_param * h)
+{
+	pcb_layer_id_t plane_layer_id;
+
+	if ((h->layer_name != NULL) && (pcb_layer_by_name(PCB->Data, h->layer_name) >= 0))
+		pcb_message(PCB_MSG_WARNING, "duplicate PLANE layer name \"%s\"\n", h->layer_name);
+
+	plane_layer_id = hyp_create_layer(h->layer_name);
+
+	layer_is_plane[plane_layer_id] = pcb_true;
+	if (h->plane_separation_set)
+		layer_clearance[plane_layer_id] = xy2coord(h->plane_separation);
+
+	/* XXX need to flood layer with copper */
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "plane layer: \"%s\"", pcb_layer_name(PCB->Data, plane_layer_id));
+	hyp_debug_layer(h);
+
+	return 0;
+}
+
+/* DEVICE record. */
+pcb_bool exec_devices(parse_param * h)
+{
+	device_t *new_device;
+	char value[128];
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "device: device_type = \"%s\" ref = \"%s\"", h->device_type, h->ref);
+		if (h->name_set)
+			pcb_message(PCB_MSG_DEBUG, " name = \"%s\"", h->name);
+		if (h->value_float_set)
+			pcb_message(PCB_MSG_DEBUG, " value_float = %f", h->value_float);
+		if (h->value_string_set)
+			pcb_message(PCB_MSG_DEBUG, " value_string = \"%s\"", h->value_string);
+		if (h->layer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		if (h->package_set)
+			pcb_message(PCB_MSG_DEBUG, " package = \"%s\"", h->package);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	/* add device to list  */
+	new_device = calloc(sizeof(device_t), 1);
+
+	new_device->ref = pcb_strdup(h->ref);
+
+	new_device->name = NULL;
+	if (h->name_set)
+		new_device->name = pcb_strdup(h->name);
+
+
+	new_device->value = NULL;
+	if (h->value_string_set)
+		new_device->value = pcb_strdup(h->value_string);
+	else if (h->value_float_set) {
+		/* convert double to string */
+		pcb_snprintf(value, sizeof(value), "%f", h->value_float);
+		new_device->value = pcb_strdup(value);
+	}
+
+	new_device->layer_name = NULL;
+	if (h->layer_name_set)
+		new_device->layer_name = pcb_strdup(h->layer_name);
+
+	new_device->next = device_head;
+	device_head = new_device;
+
+	return 0;
+}
+
+/*
+ * SUPPLY record.
+ * marks nets as power supply.
+ */
+
+pcb_bool exec_supplies(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "supplies: name = \"%s\" value_float = %f voltage_specified = %i conversion = %i\n", h->name,
+								h->value_float, h->voltage_specified, h->conversion);
+
+	return 0;
+}
+
+/* 
+ * PADSTACK record
+ */
+
+pcb_bool exec_pstk_element(parse_param * h)
+{
+	/*
+	 * Layer names with special meaning, used in padstack definition:
+	 * MDEF: defines copper pad on all metal layers
+	 * ADEF: defines anti-pad (clearance) on all power planes.
+	 */
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "padstack_element:");
+		if (h->padstack_name_set)
+			pcb_message(PCB_MSG_DEBUG, " padstack_name = \"%s\"", h->padstack_name);
+		if (h->drill_size_set)
+			pcb_message(PCB_MSG_DEBUG, " drill_size = %ml", xy2coord(h->drill_size));
+		pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		pcb_message(PCB_MSG_DEBUG, " pad_shape = %f", h->pad_shape);
+		if (h->pad_shape == 0)
+			pcb_message(PCB_MSG_DEBUG, " oval");
+		else if (h->pad_shape == 1)
+			pcb_message(PCB_MSG_DEBUG, " rectangular");
+		else if (h->pad_shape == 2)
+			pcb_message(PCB_MSG_DEBUG, " oblong");
+		else
+			pcb_message(PCB_MSG_DEBUG, " ?");
+		pcb_message(PCB_MSG_DEBUG, " pad_sx = %ml", xy2coord(h->pad_sx));
+		pcb_message(PCB_MSG_DEBUG, " pad_sy = %ml", xy2coord(h->pad_sy));
+		pcb_message(PCB_MSG_DEBUG, " pad_angle = %f", h->pad_angle);
+		if (h->pad_type_set & (h->pad_type == PAD_TYPE_THERMAL_RELIEF)) {
+			pcb_message(PCB_MSG_DEBUG, " thermal_clear_shape = %f", h->thermal_clear_shape);
+			if (h->thermal_clear_shape == 0)
+				pcb_message(PCB_MSG_DEBUG, " oval");
+			else if (h->thermal_clear_shape == 1)
+				pcb_message(PCB_MSG_DEBUG, " rectangular");
+			else if (h->thermal_clear_shape == 2)
+				pcb_message(PCB_MSG_DEBUG, " oblong");
+			else
+				pcb_message(PCB_MSG_DEBUG, " ?");
+			pcb_message(PCB_MSG_DEBUG, " thermal_clear_sx = %ml", xy2coord(h->thermal_clear_sx));
+			pcb_message(PCB_MSG_DEBUG, " thermal_clear_sy = %ml", xy2coord(h->thermal_clear_sy));
+			pcb_message(PCB_MSG_DEBUG, " thermal_clear_angle = %f", h->thermal_clear_angle);
+		}
+		if (h->pad_type_set) {
+			pcb_message(PCB_MSG_DEBUG, " pad_type = ");
+			switch (h->pad_type) {
+			case PAD_TYPE_METAL:
+				pcb_message(PCB_MSG_DEBUG, "metal");
+				break;
+			case PAD_TYPE_ANTIPAD:
+				pcb_message(PCB_MSG_DEBUG, "antipad");
+				break;
+			case PAD_TYPE_THERMAL_RELIEF:
+				pcb_message(PCB_MSG_DEBUG, "thermal_relief");
+				break;
+			default:
+				pcb_message(PCB_MSG_DEBUG, "error");
+			}
+		}
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	if (h->padstack_name_set) {
+		/* add new padstack */
+		current_pstk = malloc(sizeof(padstack_t));
+		if (current_pstk == NULL)
+			return 1;									/*malloc failed */
+		current_pstk->name = pcb_strdup(h->padstack_name);
+		current_pstk->drill_size = xy2coord(h->drill_size);
+		current_pstk_element = malloc(sizeof(padstack_element_t));
+		current_pstk->padstack = current_pstk_element;
+	}
+	else {
+		/* add new padstack element */
+		current_pstk_element->next = malloc(sizeof(padstack_element_t));
+		current_pstk_element = current_pstk_element->next;
+		if (current_pstk_element == NULL)
+			return 1;									/*malloc failed */
+	}
+
+	/* fill in values */
+
+	current_pstk_element->layer_name = pcb_strdup(h->layer_name);
+	current_pstk_element->pad_shape = h->pad_shape;
+	current_pstk_element->pad_sx = xy2coord(h->pad_sx);
+	current_pstk_element->pad_sy = xy2coord(h->pad_sy);
+	current_pstk_element->pad_angle = h->pad_angle;
+	current_pstk_element->thermal_clear_sx = xy2coord(h->thermal_clear_sx);
+	current_pstk_element->thermal_clear_sy = xy2coord(h->thermal_clear_sy);
+	current_pstk_element->thermal_clear_angle = h->thermal_clear_angle;
+	if (h->pad_type_set)
+		current_pstk_element->pad_type = h->pad_type;
+	else
+		current_pstk_element->pad_type = PAD_TYPE_METAL;
+	current_pstk_element->next = NULL;
+
+	return 0;
+}
+
+
+pcb_bool exec_pstk_end(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "padstack_end\n");
+
+	/* add current padstack to list of padstacks */
+	if (current_pstk != NULL) {
+		current_pstk->next = padstack_head;
+		padstack_head = current_pstk;
+		current_pstk = NULL;
+	}
+
+	current_pstk_element = NULL;
+
+	return 0;
+}
+
+static int hyp_pstk_add_shp(pcb_pstk_shape_t *sh, int *used, int max, padstack_element_t *i, pcb_layer_type_t lyt, pcb_layer_combining_t comb, pcb_coord_t offs)
+{
+	if (*used >= max)
+		return -1;
+	sh[*used].layer_mask = lyt;
+	sh[*used].comb = comb;
+	switch(i->pad_shape) {
+		case 0: /* round */
+		case 2: /* oblong, rounded rectangle - emulate by line */
+			pcb_shape_oval(&sh[*used], i->pad_sx+offs, i->pad_sy+offs);
+			break;
+		case 1: /* rectangle */
+			pcb_shape_rect(&sh[*used], i->pad_sx+offs, i->pad_sy+offs);
+			break;
+		default:
+			return -1;
+	}
+	(*used)++;
+	return 0;
+}
+
+static pcb_pstk_t *hyp_new_pstk(padstack_t *padstk, pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_bool with_paste, pcb_bool with_mask)
+{
+	pcb_pstk_t *ps;
+	padstack_element_t *i;
+	pcb_pstk_shape_t sh[8];
+	int sh_max = sizeof(sh) / sizeof(sh[0]) - 1; /* leave one entry for terminating */
+	int sh_used = 0, have_top = 0, have_bottom = 0, have_inner = 0;
+	const char *ln_top, *ln_bot;
+
+	memset(sh, 0, sizeof(sh));
+
+	ln_top = pcb_layer_name(PCB->Data, top_layer_id);
+	ln_bot = pcb_layer_name(PCB->Data, bottom_layer_id);
+
+	/* loop over all layers of the padstack and create shapes in sh[] */
+	for (i = padstk->padstack; i != NULL; i = i->next) {
+		int mdef, top_or_bottom;
+		if (i->layer_name == NULL)
+			continue;
+		if (i->pad_type != PAD_TYPE_METAL)
+			continue;
+
+		if (i->pad_angle != 0)
+			pcb_message(PCB_MSG_ERROR, "ignoring pad rotation of padstack at %$mm;%$mm.\n", x, y);
+
+		mdef = strcmp(i->layer_name, "MDEF") == 0;
+		top_or_bottom = 0;
+#warning TODO: check if mask/paste layers can be acquired explicitly as non-metal layers
+		if (mdef || (strcmp(i->layer_name, ln_top) == 0)) {
+			if (!have_top) {
+				hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_TOP | PCB_LYT_COPPER, 0, 0);
+				if (with_mask) hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_TOP | PCB_LYT_MASK, PCB_LYC_SUB | PCB_LYC_AUTO, MASK_OFFS);
+				if (with_paste) hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_TOP | PCB_LYT_PASTE, PCB_LYC_AUTO, PASTE_OFFS);
+			}
+			top_or_bottom = 1;
+			have_top = 1;
+		}
+		if (mdef || (strcmp(i->layer_name, ln_bot) == 0)) {
+			if (!have_bottom) {
+				hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_BOTTOM | PCB_LYT_COPPER, 0, 0);
+				if (with_mask) hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_BOTTOM | PCB_LYT_MASK, PCB_LYC_SUB | PCB_LYC_AUTO, MASK_OFFS);
+				if (with_paste) hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_BOTTOM | PCB_LYT_PASTE, PCB_LYC_AUTO, PASTE_OFFS);
+			}
+			top_or_bottom = 1;
+			have_bottom = 0;
+		}
+		if (!have_inner && (mdef || !top_or_bottom)) {
+			hyp_pstk_add_shp(sh, &sh_used, sh_max, i, PCB_LYT_INTERN | PCB_LYT_COPPER, 0, 0);
+			have_inner = 1;
+		}
+	}
+
+	ps = pcb_pstk_new_from_shape(data, x, y, padstk->drill_size, 1, 0, sh);
+	if (ps == NULL)
+		pcb_message(PCB_MSG_ERROR, "Failed to convert padstack at %$mm;%$mm.\n", x, y);
+	return ps;
+}
+
+/* draw padstack. Used when drawing vias, pins and pads.
+ * ref is an optional string which gives pin reference as device.pin, eg. U1.VCC */
+void hyp_draw_pstk(padstack_t *padstk, pcb_coord_t x, pcb_coord_t y, char *ref)
+{
+/* 
+ * We try to map a hyperlynx padstack to its closest pcb-rnd primitive.
+ * Choose between pcb_via_new(), pcb_element_pin_new(), pcb_element_pad_new() to draw a padstack.
+ * if there is a drill hole but no pin reference, it's a via. Use pcb_via_new().
+ * if there is a drill hole and a pin reference, it's a pin. Use pcb_element_pin_new().
+ * if there is no drill hole, it's a pad. Use pcb_element_pad_new().
+ */
+	pcb_subc_t *subc = NULL;
+	char *name = NULL;
+	char *number = NULL;
+	char *device_name = NULL;
+	char *pin_name = NULL;
+	pcb_pstk_t *pstk;
+	pcb_data_t *data;
+
+	if (padstk == NULL) {
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "draw padstack: padstack not found.\n");
+		return;
+	}
+
+
+	/* device and pin name, if any */
+	device_name = NULL;
+	pin_name = NULL;
+	data = hyp_dest;
+
+	if (ref != NULL) {
+		char *dot;
+		/* reference has format 'device_name.pin_name' */
+		device_name = pcb_strdup(ref);
+		dot = strrchr(device_name, '.');
+		if (dot != NULL) {
+			*dot = '\0';
+			pin_name = pcb_strdup(dot + 1);
+		}
+
+		/* make sure device and pin name have valid values, even if reference has wrong format */
+		if ((device_name == NULL) || (strcmp(device_name, "") == 0)) {
+			device_name = malloc(MAX_STRING);
+			pcb_sprintf(device_name, "NONAME%0d", unknown_device_number++);
+		}
+
+		if ((pin_name == NULL) || (strcmp(pin_name, "") == 0)) {
+			pin_name = malloc(MAX_STRING);
+			pcb_sprintf(pin_name, "NONUMBER%0d", unknown_pin_number++);
+		}
+
+		/* find device by name */
+		subc = hyp_create_subc_by_name(device_name, x, y);
+		data = subc->data;
+	}
+
+	/* name and number NULL if no reference given */
+	name = device_name;
+	number = pin_name;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "draw padstack: device_name = \"%s\" pin_name = \"%s\"\n", name, number);
+
+	pstk = hyp_new_pstk(padstk, data, x, y, (subc != NULL), (subc != NULL));
+	if (pin_name != NULL)
+		pcb_attribute_put(&pstk->Attributes, "term", pin_name);
+
+	if (subc != NULL) /* add pin to current net */
+		hyp_netlist_add(name, number);
+
+	return;
+}
+
+
+/*
+ * NET record.
+ */
+
+pcb_bool exec_net(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "net: net_name = \"%s\"\n", h->net_name);
+
+	net_name = pcb_strdup(h->net_name);
+	net_clearance = -1;
+
+	return 0;
+}
+
+/*
+ * PS subrecord of NET record. Plane separation.
+ */
+
+pcb_bool exec_net_plane_separation(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "net_plane_separation: plane_separation = %ml\n", xy2coord(h->plane_separation));
+
+	net_clearance = xy2coord(h->plane_separation);
+
+	return 0;
+}
+
+/*
+ * A subrecord of NET record. Attribute.
+ */
+
+pcb_bool exec_net_attribute(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "net_attribute: name = \"%s\" value = \"%s\"\n", h->name, h->value);
+
+	return 0;
+}
+
+/*
+ * SEG subrecord of NET record. line segment.
+ */
+
+pcb_bool exec_seg(parse_param * h)
+{
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "seg: x1 = %ml y1 = %ml x2 = %ml y2 = %ml ", x2coord(h->x1), y2coord(h->y1), x2coord(h->x2),
+								y2coord(h->y2));
+		pcb_message(PCB_MSG_DEBUG, " width = %ml layer_name = \"%s\"", xy2coord(h->width), h->layer_name);
+		if (h->plane_separation_set)
+			pcb_message(PCB_MSG_DEBUG, " plane_separation = %ml ", xy2coord(h->plane_separation));
+		if (h->left_plane_separation_set)
+			pcb_message(PCB_MSG_DEBUG, " left_plane_separation = %ml ", xy2coord(h->left_plane_separation));
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	pcb_line_new(hyp_get_layer(h), x2coord(h->x1), y2coord(h->y1), x2coord(h->x2), y2coord(h->y2), xy2coord(h->width),
+							 hyp_clearance(h), pcb_no_flags());
+
+	return 0;
+}
+
+/*
+ * ARC subrecord of NET record. arc segment, drawn clockwise.
+ */
+
+pcb_bool exec_arc(parse_param * h)
+{
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "arc: x1 = %ml y1 = %ml x2 = %ml y2 = %ml", x2coord(h->x1), y2coord(h->y1), x2coord(h->x2),
+								y2coord(h->y2));
+		pcb_message(PCB_MSG_DEBUG, " xc = %ml yc = %ml r = %ml", x2coord(h->xc), y2coord(h->yc), xy2coord(h->r));
+		pcb_message(PCB_MSG_DEBUG, " width = %ml layer_name = \"%s\"", xy2coord(h->width), h->layer_name);
+		if (h->plane_separation_set)
+			pcb_message(PCB_MSG_DEBUG, " plane_separation = %ml", xy2coord(h->plane_separation));
+		if (h->left_plane_separation_set)
+			pcb_message(PCB_MSG_DEBUG, " left_plane_separation = %ml", xy2coord(h->left_plane_separation));
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	hyp_arc_new(hyp_get_layer(h), x2coord(h->x1), y2coord(h->y1), x2coord(h->x2), y2coord(h->y2), x2coord(h->xc),
+							y2coord(h->yc), xy2coord(h->r), xy2coord(h->r), pcb_true, xy2coord(h->width), hyp_clearance(h), pcb_no_flags());
+
+	return 0;
+}
+
+/* 
+ * Convert string-type pad shapes to numeric ones.
+ */
+
+int str2pad_shape(char *pad_shape)
+{
+	if (pad_shape == NULL)
+		return 0;
+	else if (strcmp(pad_shape, "OVAL") == 0)
+		return 0;
+	else if (strcmp(pad_shape, "RECT") == 0)
+		return 1;
+	else if (strcmp(pad_shape, "OBLONG") == 0)
+		return 2;
+	else
+		return 0;
+}
+
+/*
+ * VIA subrecord of NET record. 
+ * Draws via using padstack definition.
+ */
+
+pcb_bool exec_via(parse_param * h)
+{
+	/* detect old-style v1.0 via */
+	if (!h->padstack_name_set)
+		return exec_via_v1(h);
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "via: x = %ml y = %ml", x2coord(h->x), y2coord(h->y));
+		if (h->padstack_name_set)
+			pcb_message(PCB_MSG_DEBUG, " padstack_name = \"%s\"", h->padstack_name);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	if (!h->padstack_name_set) {
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "pin: padstack not set. skipping pin \"%s\"\n", h->pin_reference);
+		return 0;
+	}
+
+	hyp_draw_pstk(hyp_pstk_by_name(h->padstack_name), x2coord(h->x), y2coord(h->y), NULL);
+
+	return 0;
+}
+
+/*
+ * VIA subrecord of NET record. 
+ * Draws deprecated v1.x via.
+ */
+
+pcb_bool exec_via_v1(parse_param * h)
+{
+	padstack_t *padstk;
+	padstack_element_t *pad1;
+	padstack_element_t *pad2;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "old_via: x = %ml y = %ml", x2coord(h->x), y2coord(h->y));
+		if (h->drill_size_set)
+			pcb_message(PCB_MSG_DEBUG, " drill_size = %ml", xy2coord(h->drill_size));
+		if (h->layer1_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer1_name = \"%s\"", h->layer1_name);
+		if (h->layer2_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer2_name = \"%s\"", h->layer2_name);
+		if (h->via_pad_shape_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_shape = \"%s\"", h->via_pad_shape);
+		if (h->via_pad_sx_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_sx = \"%ml\"", xy2coord(h->via_pad_sx));
+		if (h->via_pad_sy_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_sy = \"%ml\"", xy2coord(h->via_pad_sy));
+		if (h->via_pad_angle_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_angle = \"%f\"", h->via_pad_angle);
+		if (h->via_pad1_shape_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad1_shape = \"%s\"", h->via_pad1_shape);
+		if (h->via_pad1_sx_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad1_sx = \"%ml\"", xy2coord(h->via_pad1_sx));
+		if (h->via_pad1_sy_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad1_sy = \"%ml\"", xy2coord(h->via_pad1_sy));
+		if (h->via_pad1_angle_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad1_angle = \"%f\"", h->via_pad1_angle);
+		if (h->via_pad2_shape_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad2_shape = \"%s\"", h->via_pad2_shape);
+		if (h->via_pad2_sx_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad2_sx = \"%ml\"", xy2coord(h->via_pad2_sx));
+		if (h->via_pad2_sy_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad2_sy = \"%ml\"", xy2coord(h->via_pad2_sy));
+		if (h->via_pad2_angle_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad2_angle = \"%f\"", h->via_pad2_angle);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	/* create padstack for this via */
+	padstk = malloc(sizeof(padstack_t));
+	if (padstk == NULL)
+		return 1;
+	pad1 = malloc(sizeof(padstack_element_t));
+	if (pad1 == NULL)
+		return 1;
+	pad2 = malloc(sizeof(padstack_element_t));
+	if (pad2 == NULL)
+		return 1;
+
+	padstk->name = "*** VIA ***";
+	padstk->drill_size = xy2coord(h->drill_size);
+	padstk->padstack = pad1;
+	padstk->next = NULL;
+
+	pad1->layer_name = h->layer1_name;
+	pad1->pad_shape = str2pad_shape(h->via_pad1_shape);
+	pad1->pad_sx = xy2coord(h->via_pad1_sx);
+	pad1->pad_sy = xy2coord(h->via_pad1_sy);
+	pad1->pad_angle = h->via_pad1_angle;
+	pad1->thermal_clear_sx = 0;
+	pad1->thermal_clear_sy = 0;
+	pad1->thermal_clear_angle = 0.0;
+	pad1->pad_type = PAD_TYPE_METAL;
+
+	if (h->layer2_name_set && h->via_pad2_sx_set && h->via_pad2_sy_set) {
+		pad1->next = pad2;
+		pad2->layer_name = h->layer2_name;
+		pad2->pad_shape = str2pad_shape(h->via_pad2_shape);
+		pad2->pad_sx = xy2coord(h->via_pad2_sx);
+		pad2->pad_sy = xy2coord(h->via_pad2_sy);
+		pad2->pad_angle = h->via_pad2_angle;
+		pad2->thermal_clear_sx = 0;
+		pad2->thermal_clear_sy = 0;
+		pad2->thermal_clear_angle = 0.0;
+		pad2->pad_type = PAD_TYPE_METAL;
+		pad2->next = NULL;
+	}
+	else
+		pad1->next = NULL;
+
+	/* draw padstack */
+	hyp_draw_pstk(padstk, x2coord(h->x), y2coord(h->y), NULL);
+
+	/* free padstack for this via */
+	free(pad2);
+	free(pad1);
+	free(padstk);
+
+	return 0;
+}
+
+/*
+ * PIN subrecord of NET record. 
+ * Draws PIN using padstack definiton.
+ */
+
+pcb_bool exec_pin(parse_param * h)
+{
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "pin: x = %ml y = %ml", x2coord(h->x), y2coord(h->y));
+		pcb_message(PCB_MSG_DEBUG, " pin_reference = \"%s\"", h->pin_reference);
+		if (h->padstack_name_set)
+			pcb_message(PCB_MSG_DEBUG, " padstack_name = \"%s\"", h->padstack_name);
+		if (h->pin_function_set)
+			pcb_message(PCB_MSG_DEBUG, " pin_function = %i", h->pin_function);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	if (!h->padstack_name_set) {
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "pin: padstack not set. skipping pin \"%s\"\n", h->pin_reference);
+		return 0;
+	}
+
+	hyp_draw_pstk(hyp_pstk_by_name(h->padstack_name), x2coord(h->x), y2coord(h->y), h->pin_reference);
+
+	return 0;
+}
+
+/*
+ * PAD subrecord of NET record. 
+ * Draws deprecated v1.x pad.
+ */
+
+pcb_bool exec_pad(parse_param * h)
+{
+	padstack_t *padstk;
+	padstack_element_t *pad;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "pad: x = %ml y = %ml", x2coord(h->x), y2coord(h->y));
+		if (h->layer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		if (h->via_pad_shape_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_shape = \"%s\"", h->via_pad_shape);
+		if (h->via_pad_sx_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_sx = \"%ml\"", xy2coord(h->via_pad_sx));
+		if (h->via_pad_sy_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_sy = \"%ml\"", xy2coord(h->via_pad_sy));
+		if (h->via_pad_angle_set)
+			pcb_message(PCB_MSG_DEBUG, " via_pad_angle = \"%f\"", h->via_pad_angle);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	if (!h->layer_name_set) {
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "pad: layer name not set. skipping pad\n.");
+		return 0;
+	}
+
+	/* create padstack for this pad */
+	padstk = malloc(sizeof(padstack_t));
+	if (padstk == NULL)
+		return 1;
+	pad = malloc(sizeof(padstack_element_t));
+	if (pad == NULL)
+		return 1;
+
+	padstk->name = "*** PAD ***";
+	padstk->drill_size = 0.0;
+	padstk->padstack = pad;
+	padstk->next = NULL;
+
+	pad->layer_name = h->layer_name;
+	pad->pad_shape = str2pad_shape(h->via_pad_shape);
+	pad->pad_sx = xy2coord(h->via_pad_sx);
+	pad->pad_sy = xy2coord(h->via_pad_sy);
+	pad->pad_angle = h->via_pad_angle;
+	pad->thermal_clear_sx = 0;
+	pad->thermal_clear_sy = 0;
+	pad->thermal_clear_angle = 0;
+	pad->pad_type = PAD_TYPE_METAL;
+	pad->next = NULL;
+
+	/* draw padstack */
+	hyp_draw_pstk(padstk, x2coord(h->x), y2coord(h->y), NULL);
+
+	/* free padstack for this pad */
+	free(pad);
+	free(padstk);
+
+	return 0;
+}
+
+/*
+ * USEG subrecord of NET record.
+ * unrouted segment.
+ */
+
+pcb_bool exec_useg(parse_param * h)
+{
+	pcb_layergrp_id_t layer1_grp_id, layer2_grp_id;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "useg: x1 = %ml y1 = %ml layer1_name = \"%s\"", x2coord(h->x1), y2coord(h->y1), h->layer1_name);
+		pcb_message(PCB_MSG_DEBUG, " x2 = %ml y2 = %ml layer2_name = \"%s\"", x2coord(h->x2), y2coord(h->y2), h->layer2_name);
+		if (h->zlayer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " zlayer_name = \"%s\" width = %ml length = %ml", h->zlayer_name, xy2coord(h->width),
+									xy2coord(h->length));
+		if (h->impedance_set)
+			pcb_message(PCB_MSG_DEBUG, " impedance = %f delay = %f ", h->impedance, h->delay);
+		if (h->resistance_set)
+			pcb_message(PCB_MSG_DEBUG, " resistance = %f ", h->resistance);
+		pcb_message(PCB_MSG_DEBUG, "\n");
+	}
+
+	/* lookup layer group begin and end layer are on */
+	layer1_grp_id = pcb_layer_get_group(PCB, hyp_create_layer(h->layer1_name));
+	layer2_grp_id = pcb_layer_get_group(PCB, hyp_create_layer(h->layer2_name));
+
+	if ((layer1_grp_id == -1) || (layer2_grp_id == -1)) {
+		if (hyp_debug)
+			pcb_message(PCB_MSG_DEBUG, "useg: skipping unrouted segment\n");
+		return 0;
+	}
+
+	pcb_rat_new(hyp_dest, x2coord(h->x1), y2coord(h->y1), x2coord(h->x2), y2coord(h->y2), layer1_grp_id, layer2_grp_id,
+							xy2coord(h->width), pcb_no_flags());
+
+	return 0;
+}
+
+/*
+ * POLYGON subrecord of NET record.
+ * draws copper polygon.
+ */
+
+pcb_bool exec_polygon_begin(parse_param * h)
+{
+	hyp_polygon_t *new_poly;
+	hyp_vertex_t *new_vertex;
+	hyp_polygon_t *i;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "polygon begin:");
+		if (h->layer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		if (h->width_set)
+			pcb_message(PCB_MSG_DEBUG, " width = %ml", xy2coord(h->width));
+		if (h->polygon_type_set) {
+			pcb_message(PCB_MSG_DEBUG, " polygon_type = ", h->polygon_type, " ");
+			switch (h->polygon_type) {
+			case POLYGON_TYPE_PLANE:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_PLANE");
+				break;
+			case POLYGON_TYPE_POUR:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_POUR");
+				break;
+			case POLYGON_TYPE_COPPER:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_COPPER");
+				break;
+			default:
+				pcb_message(PCB_MSG_DEBUG, "Error");
+				break;
+			}
+		}
+		if (h->id_set)
+			pcb_message(PCB_MSG_DEBUG, " id = %i", h->id);
+		pcb_message(PCB_MSG_DEBUG, " x = %ml y = %ml\n", x2coord(h->x), y2coord(h->y));
+	}
+
+	if (!h->layer_name_set) {
+		hyp_error("expected polygon layer L = ");
+		return pcb_true;
+	}
+
+	if (!h->id_set) {
+		hyp_error("expected polygon id ID = ");
+		return pcb_true;
+	}
+
+	/* make sure layer exists */
+	hyp_create_layer(h->layer_name);
+
+	/* check for other polygons with this id */
+	if (hyp_debug)
+		for (i = polygon_head; i != NULL; i = i->next)
+			if (h->id == i->hyp_poly_id) {
+				pcb_message(PCB_MSG_INFO, "info: duplicate polygon id %i.\n", h->id);
+				break;
+			}
+
+	/* create first vertex */
+	new_vertex = malloc(sizeof(hyp_vertex_t));
+	new_vertex->x1 = x2coord(h->x);
+	new_vertex->y1 = y2coord(h->y);
+	new_vertex->x2 = 0;
+	new_vertex->y2 = 0;
+	new_vertex->xc = 0;
+	new_vertex->yc = 0;
+	new_vertex->r = 0;
+	new_vertex->is_arc = pcb_false;
+	new_vertex->is_first = pcb_true;
+	new_vertex->next = NULL;
+
+	/* create new polygon */
+	new_poly = malloc(sizeof(hyp_polygon_t));
+	new_poly->hyp_poly_id = h->id;	/* hyperlynx polygon/polyline id */
+	new_poly->hyp_poly_type = h->polygon_type;
+	new_poly->is_polygon = pcb_true;
+	new_poly->layer_name = h->layer_name;
+	new_poly->line_width = xy2coord(h->width);
+	new_poly->clearance = hyp_clearance(h);
+	new_poly->vertex = new_vertex;
+
+	new_poly->next = polygon_head;
+	polygon_head = new_poly;
+
+	/* bookkeeping */
+	current_vertex = new_vertex;
+
+	return 0;
+}
+
+pcb_bool exec_polygon_end(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "polygon end:\n");
+
+	/* bookkeeping */
+	if ((current_vertex == NULL) && hyp_debug)
+		pcb_message(PCB_MSG_WARNING, "polygon: unexpected polygon end. continuing.\n");
+	current_vertex = NULL;
+
+	return 0;
+}
+
+/*
+ * POLYVOID subrecord of NET record.
+ * same as POLYGON, but instead of creating copper, creates a hole in copper.
+ */
+
+pcb_bool exec_polyvoid_begin(parse_param * h)
+{
+	hyp_polygon_t *i;
+	hyp_vertex_t *new_vertex;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "polyvoid begin:");
+		if (h->id_set)
+			pcb_message(PCB_MSG_DEBUG, " id = %i", h->id);
+		pcb_message(PCB_MSG_DEBUG, " x = %ml y = %ml\n", x2coord(h->x), y2coord(h->y));
+	}
+
+	if (!h->id_set) {
+		hyp_error("expected polygon id ID = ");
+		return pcb_true;
+	}
+
+	/* look up polygon with this id */
+	for (i = polygon_head; i != NULL; i = i->next)
+		if (h->id == i->hyp_poly_id)
+			break;
+
+	if (i == NULL) {
+		current_vertex = NULL;
+		pcb_message(PCB_MSG_WARNING, "polyvoid: polygon id %i not found\n", h->id);
+		return 0;
+	}
+
+	/* find last vertex of polygon */
+	for (current_vertex = i->vertex; current_vertex != NULL; current_vertex = current_vertex->next)
+		if (current_vertex->next == NULL)
+			break;
+
+	assert(current_vertex != NULL);	/* at least one vertex in polygon */
+
+	/* add new vertex at end of list of vertices */
+	new_vertex = malloc(sizeof(hyp_vertex_t));
+	new_vertex->x1 = x2coord(h->x);
+	new_vertex->y1 = y2coord(h->y);
+	new_vertex->x2 = 0;
+	new_vertex->y2 = 0;
+	new_vertex->xc = 0;
+	new_vertex->yc = 0;
+	new_vertex->r = 0;
+	new_vertex->is_arc = pcb_false;
+	new_vertex->is_first = pcb_true;
+	new_vertex->next = NULL;
+
+	/* bookkeeping */
+	if (current_vertex != NULL) {
+		current_vertex->next = new_vertex;
+		current_vertex = new_vertex;
+	}
+
+	return 0;
+}
+
+pcb_bool exec_polyvoid_end(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "polyvoid end:\n");
+
+	/* bookkeeping */
+	if ((current_vertex == NULL) && hyp_debug)
+		pcb_message(PCB_MSG_WARNING, "polyvoid: unexpected polyvoid end. continuing.\n");
+	current_vertex = NULL;
+
+	return 0;
+}
+
+/*
+ * POLYLINE subrecord of NET record.
+ */
+
+pcb_bool exec_polyline_begin(parse_param * h)
+{
+	hyp_polygon_t *new_poly;
+	hyp_vertex_t *new_vertex;
+	hyp_polygon_t *i;
+
+	if (hyp_debug) {
+		pcb_message(PCB_MSG_DEBUG, "polyline begin:");
+		if (h->layer_name_set)
+			pcb_message(PCB_MSG_DEBUG, " layer_name = \"%s\"", h->layer_name);
+		if (h->width_set)
+			pcb_message(PCB_MSG_DEBUG, " width = %ml", xy2coord(h->width));
+		if (h->polygon_type_set) {
+			pcb_message(PCB_MSG_DEBUG, " polygon_type = ", h->polygon_type, " ");
+			switch (h->polygon_type) {
+			case POLYGON_TYPE_PLANE:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_PLANE");
+				break;
+			case POLYGON_TYPE_POUR:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_POUR");
+				break;
+			case POLYGON_TYPE_COPPER:
+				pcb_message(PCB_MSG_DEBUG, "POLYGON_TYPE_COPPER");
+				break;
+			default:
+				pcb_message(PCB_MSG_DEBUG, "Error");
+				break;
+			}
+		}
+		if (h->id_set)
+			pcb_message(PCB_MSG_DEBUG, " id = %i", h->id);
+		pcb_message(PCB_MSG_DEBUG, " x = %ml y = %ml\n", x2coord(h->x), y2coord(h->y));
+	}
+
+	if (!h->layer_name_set) {
+		hyp_error("expected polygon layer L = ");
+		return pcb_true;
+	}
+
+	if (!h->width_set) {
+		hyp_error("expected polygon width W = ");
+		return pcb_true;
+	}
+
+	if (!h->id_set) {
+		hyp_error("expected polygon id ID = ");
+		return pcb_true;
+	}
+
+	/* make sure layer exists */
+	hyp_create_layer(h->layer_name);
+
+	/* check for other polygons with this id */
+	if (hyp_debug)
+		for (i = polygon_head; i != NULL; i = i->next)
+			if (h->id == i->hyp_poly_id) {
+				pcb_message(PCB_MSG_DEBUG, "info: duplicate polygon id %i.\n", h->id);
+				break;
+			}
+
+	/* create first vertex */
+	new_vertex = malloc(sizeof(hyp_vertex_t));
+	new_vertex->x1 = x2coord(h->x);
+	new_vertex->y1 = y2coord(h->y);
+	new_vertex->x2 = 0;
+	new_vertex->y2 = 0;
+	new_vertex->xc = 0;
+	new_vertex->yc = 0;
+	new_vertex->r = 0;
+	new_vertex->is_arc = pcb_false;
+	new_vertex->is_first = pcb_true;
+	new_vertex->next = NULL;
+
+	/* create new polyline */
+	new_poly = malloc(sizeof(hyp_polygon_t));
+	new_poly->hyp_poly_id = h->id;	/* hyperlynx polygon/polyline id */
+	new_poly->hyp_poly_type = h->polygon_type;
+	new_poly->is_polygon = pcb_false;
+	new_poly->layer_name = h->layer_name;
+	new_poly->line_width = xy2coord(h->width);
+	new_poly->clearance = hyp_clearance(h);
+	new_poly->vertex = new_vertex;
+
+	new_poly->next = polygon_head;
+	polygon_head = new_poly;
+
+	/* bookkeeping */
+	current_vertex = new_vertex;
+
+	return 0;
+}
+
+pcb_bool exec_polyline_end(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "polyline end:\n");
+
+	/* bookkeeping */
+	if ((current_vertex == NULL) && hyp_debug)
+		pcb_message(PCB_MSG_WARNING, "polyline: unexpected polyline end. continuing.\n");
+	current_vertex = NULL;
+
+	return 0;
+}
+
+/*
+ * LINE subrecord of NET record.
+ */
+
+pcb_bool exec_line(parse_param * h)
+{
+	hyp_vertex_t *new_vertex;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "line: x = %ml y = %ml\n", x2coord(h->x), y2coord(h->y));
+
+	if (current_vertex == NULL) {
+		pcb_message(PCB_MSG_DEBUG, "line: skipping.");
+		return 0;
+	}
+
+	/* add new vertex at end of list of vertices */
+	new_vertex = malloc(sizeof(hyp_vertex_t));
+	new_vertex->x1 = x2coord(h->x);
+	new_vertex->y1 = y2coord(h->y);
+	new_vertex->x2 = 0;
+	new_vertex->y2 = 0;
+	new_vertex->xc = 0;
+	new_vertex->yc = 0;
+	new_vertex->r = 0;
+	new_vertex->is_arc = pcb_false;
+	new_vertex->is_first = pcb_false;
+	new_vertex->next = NULL;
+
+	/* bookkeeping */
+	current_vertex->next = new_vertex;
+	current_vertex = new_vertex;
+
+	return 0;
+}
+
+/*
+ * CURVE subrecord of NET record. 
+ * Clockwise from (x1, y1) to (x2, y2).
+ */
+
+pcb_bool exec_curve(parse_param * h)
+{
+	hyp_vertex_t *new_vertex;
+
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "curve: x1 = %ml y1 = %ml x2 = %ml y2 = %ml xc = %ml yc = %ml r = %ml\n", x2coord(h->x1),
+								y2coord(h->y1), x2coord(h->x2), y2coord(h->y2), x2coord(h->xc), y2coord(h->yc), xy2coord(h->r));
+
+	if (current_vertex == NULL) {
+		pcb_message(PCB_MSG_DEBUG, "curve: skipping.");
+		return 0;
+	}
+
+	/* add new vertex at end of list of vertices */
+	new_vertex = malloc(sizeof(hyp_vertex_t));
+	new_vertex->x1 = x2coord(h->x1);
+	new_vertex->y1 = y2coord(h->y1);
+	new_vertex->x2 = x2coord(h->x2);
+	new_vertex->y2 = y2coord(h->y2);
+	new_vertex->xc = x2coord(h->xc);
+	new_vertex->yc = y2coord(h->yc);
+	new_vertex->r = xy2coord(h->r);
+	new_vertex->is_arc = pcb_true;
+	new_vertex->is_first = pcb_false;
+	new_vertex->next = NULL;
+
+	/* bookkeeping */
+	current_vertex->next = new_vertex;
+	current_vertex = new_vertex;
+
+	return 0;
+}
+
+/*
+ * NET_CLASS record
+ */
+
+pcb_bool exec_net_class(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "net_class: net_class_name = \"%s\"\n", h->net_class_name);
+
+	return 0;
+}
+
+/*
+ * N net membership subrecord of NET_CLASS record
+ */
+
+pcb_bool exec_net_class_element(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "net_class_element: net_name = \"%s\"\n", h->net_name);
+
+	return 0;
+}
+
+/*
+ * A attribute subrecord of NET_CLASS record
+ */
+
+
+pcb_bool exec_net_class_attribute(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "netclass_attribute: name = \"%s\" value = \"%s\"\n", h->name, h->value);
+
+	return 0;
+}
+
+/* 
+ * KEY record
+ */
+
+pcb_bool exec_key(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "key: key = \"%s\"\n", h->key);
+
+	return 0;
+}
+
+/* 
+ * END record
+ */
+
+pcb_bool exec_end(parse_param * h)
+{
+	if (hyp_debug)
+		pcb_message(PCB_MSG_DEBUG, "end:\n");
+	return 0;
+}
+
+/* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/parser.h
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/parser.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/parser.h	(revision 18980)
@@ -0,0 +1,251 @@
+/*
+ * read hyperlynx files
+ * Copyright 2012 Koen De Vleeschauwer.
+ *
+ * This file is part of pcb-rnd.
+ *
+ * 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 2 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PCB_IO_HYP_PARSER_H
+#define PCB_IO_HYP_PARSER_H
+
+#include <stdio.h>
+#include "pcb_bool.h"
+#include "board.h"
+
+	/* 
+	 * Parameters passed on by the parser.
+	 * All variables added here are initialized in new_record().
+	 */
+
+typedef enum { PAD_TYPE_METAL, PAD_TYPE_ANTIPAD, PAD_TYPE_THERMAL_RELIEF } pad_type_enum;
+
+typedef enum { PIN_SIM_IN, PIN_SIM_OUT, PIN_SIM_BOTH } pin_function_enum;
+
+typedef enum { POLYGON_TYPE_POUR, POLYGON_TYPE_PLANE, POLYGON_TYPE_COPPER, POLYGON_TYPE_PAD,
+	POLYGON_TYPE_ANTIPAD
+} polygon_type_enum;
+
+typedef struct {
+	double vers;									/* version of the hyp file format */
+	pcb_bool detailed;						/* data detailed enough for power integrity */
+	pcb_bool unit_system_english;	/* english or metric units */
+	pcb_bool metal_thickness_weight;	/* copper by weight or by length */
+	double default_plane_separation;	/* trace to plane separation */
+
+	/* stackup record */
+	pcb_bool use_die_for_metal;		/* dielectric constant and loss tangent of dielectric for metal layers */
+	double bulk_resistivity;
+	pcb_bool conformal;
+	double epsilon_r;
+	char *layer_name;
+	double loss_tangent;
+	char *material_name;
+	double plane_separation;
+	double plating_thickness;
+	pcb_bool prepreg;
+	double temperature_coefficient;	/* temperature coefficient of resistivity */
+	double thickness;							/* layer thickness */
+
+	/* stackup record flags */
+	pcb_bool bulk_resistivity_set;
+	pcb_bool conformal_set;
+	pcb_bool epsilon_r_set;
+	pcb_bool layer_name_set;
+	pcb_bool loss_tangent_set;
+	pcb_bool material_name_set;
+	pcb_bool plane_separation_set;
+	pcb_bool plating_thickness_set;
+	pcb_bool prepreg_set;
+	pcb_bool temperature_coefficient_set;
+	pcb_bool thickness_set;
+
+	/* device record */
+	char *device_type;
+	char *ref;
+	double value_float;
+	char *value_string;
+	char *package;
+
+	/* device record flags */
+	pcb_bool name_set;
+	pcb_bool value_float_set;
+	pcb_bool value_string_set;
+	pcb_bool package_set;
+
+	/* supplies record */
+	pcb_bool voltage_specified;
+	pcb_bool conversion;
+
+	/* padstack record */
+	char *padstack_name;
+	double drill_size;
+	double pad_shape;
+	double pad_sx;
+	double pad_sy;
+	double pad_angle;
+	double thermal_clear_shape;
+	double thermal_clear_sx;
+	double thermal_clear_sy;
+	double thermal_clear_angle;
+	pad_type_enum pad_type;
+
+	/* padstack record flags */
+	pcb_bool padstack_name_set;
+	pcb_bool drill_size_set;
+	pcb_bool pad_type_set;
+
+	/* net record */
+	double width;
+	double left_plane_separation;
+	pcb_bool width_set;
+	pcb_bool left_plane_separation_set;
+
+	/* via subrecord of net */
+	char *layer1_name;
+	pcb_bool layer1_name_set;
+	char *layer2_name;
+	pcb_bool layer2_name_set;
+	char *via_pad_shape;
+	pcb_bool via_pad_shape_set;
+	double via_pad_sx;
+	pcb_bool via_pad_sx_set;
+	double via_pad_sy;
+	pcb_bool via_pad_sy_set;
+	double via_pad_angle;
+	pcb_bool via_pad_angle_set;
+	char *via_pad1_shape;
+	pcb_bool via_pad1_shape_set;
+	double via_pad1_sx;
+	pcb_bool via_pad1_sx_set;
+	double via_pad1_sy;
+	pcb_bool via_pad1_sy_set;
+	double via_pad1_angle;
+	pcb_bool via_pad1_angle_set;
+	char *via_pad2_shape;
+	pcb_bool via_pad2_shape_set;
+	double via_pad2_sx;
+	pcb_bool via_pad2_sx_set;
+	double via_pad2_sy;
+	pcb_bool via_pad2_sy_set;
+	double via_pad2_angle;
+	pcb_bool via_pad2_angle_set;
+
+	/* pin subrecord of net */
+	char *pin_reference;
+	pcb_bool pin_reference_set;
+	pin_function_enum pin_function;
+	pcb_bool pin_function_set;
+
+	/* useg subrecord of net */
+	char *zlayer_name;
+	pcb_bool zlayer_name_set;
+	double length;
+	double impedance;
+	pcb_bool impedance_set;
+	double delay;
+	double resistance;
+	pcb_bool resistance_set;
+
+	/* polygon subrecord of net */
+	int id;
+	pcb_bool id_set;
+	polygon_type_enum polygon_type;
+	pcb_bool polygon_type_set;
+
+	/* net class record */
+	char *net_class_name;
+	char *net_name;
+
+	/* key record */
+	char *key;
+
+	/* Attributes */
+	char *name;										/* attribute name */
+	char *value;									/* attribute value */
+
+	/* point, line and arc coordinates */
+	double x;											/* coordinates point */
+	double y;											/* coordinates point */
+	double x1;										/* coordinates point 1 */
+	double y1;										/* coordinates point 1 */
+	double x2;										/* coordinates point 2 */
+	double y2;										/* coordinates point 2 */
+	double xc;										/* coordinates arc */
+	double yc;										/* coordinates arc */
+	double r;											/* coordinates arc */
+} parse_param;
+
+	/* exec_* routines are called by parser to interpret hyperlynx file */
+pcb_bool exec_board_file(parse_param * h);
+pcb_bool exec_version(parse_param * h);
+pcb_bool exec_data_mode(parse_param * h);
+pcb_bool exec_units(parse_param * h);
+pcb_bool exec_plane_sep(parse_param * h);
+pcb_bool exec_perimeter_segment(parse_param * h);
+pcb_bool exec_perimeter_arc(parse_param * h);
+pcb_bool exec_board_attribute(parse_param * h);
+
+pcb_bool exec_options(parse_param * h);
+pcb_bool exec_signal(parse_param * h);
+pcb_bool exec_dielectric(parse_param * h);
+pcb_bool exec_plane(parse_param * h);
+
+pcb_bool exec_devices(parse_param * h);
+
+pcb_bool exec_supplies(parse_param * h);
+
+pcb_bool exec_pstk_element(parse_param * h);
+pcb_bool exec_pstk_end(parse_param * h);
+
+pcb_bool exec_net(parse_param * h);
+pcb_bool exec_net_plane_separation(parse_param * h);
+pcb_bool exec_net_attribute(parse_param * h);
+pcb_bool exec_seg(parse_param * h);
+pcb_bool exec_arc(parse_param * h);
+pcb_bool exec_via(parse_param * h);
+pcb_bool exec_via_v1(parse_param * h);	/* Old style via format */
+pcb_bool exec_pin(parse_param * h);
+pcb_bool exec_pad(parse_param * h);
+pcb_bool exec_useg(parse_param * h);
+
+pcb_bool exec_polygon_begin(parse_param * h);
+pcb_bool exec_polygon_end(parse_param * h);
+pcb_bool exec_polyvoid_begin(parse_param * h);
+pcb_bool exec_polyvoid_end(parse_param * h);
+pcb_bool exec_polyline_begin(parse_param * h);
+pcb_bool exec_polyline_end(parse_param * h);
+pcb_bool exec_line(parse_param * h);
+pcb_bool exec_curve(parse_param * h);
+
+pcb_bool exec_net_class(parse_param * h);
+pcb_bool exec_net_class_element(parse_param * h);
+pcb_bool exec_net_class_attribute(parse_param * h);
+
+pcb_bool exec_end(parse_param * h);
+pcb_bool exec_key(parse_param * h);
+
+	/* called by pcb-rnd to load hyperlynx file */
+pcb_bool hyp_parse(pcb_data_t * dest, const char *fname, int debug);
+void hyp_error(const char *msg);
+
+	/* create arc, hyperlynx-style */
+pcb_arc_t *hyp_arc_new(pcb_layer_t * Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t XC,
+											 pcb_coord_t YC, pcb_coord_t Width, pcb_coord_t Height, pcb_bool_t Clockwise, pcb_coord_t Thickness,
+											 pcb_coord_t Clearance, pcb_flag_t Flags);
+
+#endif
+
+	/* not truncated */
Index: tags/2.0.1/src_plugins/io_hyp/tests/test00/README.txt
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test00/README.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test00/README.txt	(revision 18980)
@@ -0,0 +1,3 @@
+Source: handwritten
+GPL: Yes
+Remark: contains every imported feature
Index: tags/2.0.1/src_plugins/io_hyp/tests/test00/gen_test00.py
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test00/gen_test00.py	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test00/gen_test00.py	(revision 18980)
@@ -0,0 +1,328 @@
+#!/usr/bin/python
+"""
+  Generate sample hyperlynx file 
+  Copyright 2017 Koen De Vleeschauwer.
+ 
+  This file is part of pcb-rnd.
+ 
+  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 2 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 <http://www.gnu.org/licenses/>.
+"""
+
+from math import pi, sin, cos
+
+print "{VERSION=2.0}"
+print "{UNITS=METRIC LENGTH}"
+print "{BOARD"
+print "  (PERIMETER_SEGMENT X1=1.0 Y1=0.0 X2=19.0 Y2=0.0)"
+print "  (PERIMETER_SEGMENT X1=20.0 Y1=1.0 X2=20.0 Y2=9.0)"
+print "  (PERIMETER_SEGMENT X1=19.0 Y1=10.0 X2=1.0 Y2=10.0)"
+print "  (PERIMETER_SEGMENT X1=0.0 Y1=9.0 X2=0.0 Y2=1.0)"
+print "  (PERIMETER_ARC X1=0.0 Y1=1.0 X2=1.0 Y2=0.0 XC=1.0 YC=1.0 R=1.0)"
+print "  (PERIMETER_ARC X1=1.0 Y1=10.0 X2=0.0 Y2=9.0 XC=1.0 YC=9.0 R=1.0)"
+print "  (PERIMETER_ARC X1=20.0 Y1=9.0 X2=19.0 Y2=10.0 XC=19.0 YC=9.0 R=1.0)"
+print "  (PERIMETER_ARC X1=19.0 Y1=0.0 X2=20.0 Y2=1.0 XC=19.0 YC=1.0 R=1.0)"
+print ""
+print "  (PERIMETER_SEGMENT X1=2.0 Y1=1.0 X2=3.0 Y2=1.0)"
+print "  (PERIMETER_SEGMENT X1=3.0 Y1=9.0 X2=2.0 Y2=9.0)"
+print "  (PERIMETER_ARC X1=2.0 Y1=9.0 X2=1.0 Y2=8.0 XC=2.0 YC=8.0 R=1.0)"
+print "  (PERIMETER_SEGMENT X1=1.0 Y1=8.0 X2=1.0 Y2=2.0)"
+print "  (PERIMETER_ARC X1=1.0 Y1=2.0 X2=2.0 Y2=1.0 XC=2.0 YC=2.0 R=1.0)"
+print "  (PERIMETER_SEGMENT X1=4.0 Y1=2.0 X2=4.0 Y2=8.0)"
+print "  (PERIMETER_ARC X1=3.0 Y1=1.0 X2=4.0 Y2=2.0 XC=3.0 YC=2.0 R=1.0)"
+print "  (PERIMETER_ARC X1=4.0 Y1=8.0 X2=3.0 Y2=9.0 XC=3.0 YC=8.0 R=1.0)"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=5.0 X2=5.5 Y2=5.0 XC=5.0 YC=5.0 R=0.5)"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=6.0 X2=4.5 Y2=6.0 XC=5.0 YC=6.0 R=0.5)"
+print "  (PERIMETER_SEGMENT X1=4.5 Y1=6.0 X2=5.5 Y2=6.0)"
+
+print "  (PERIMETER_ARC X1=4.5 Y1=7.5 X2=5.5 Y2=7.5 XC=5.0 YC=7.5 R=0.5)"
+print "  (PERIMETER_SEGMENT X1=4.5 Y1=7.5 X2=5.5 Y2=7.5)"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=8.5 X2=5.0 Y2=8.0 XC=5.0 YC=8.5 R=0.5)"
+print "  (PERIMETER_SEGMENT X1=5.0 Y1=8.0 X2=5.5 Y2=8.5)"
+
+print "}"
+
+print "{PLANE_SEP=0.05}"
+
+print "{STACKUP"
+print "  (SIGNAL T=0.000700 L=component)"
+print "  (DIELECTRIC T=0.002000 C=4.000000)"
+print "  (PLANE  T=0.000700 L=solder PS=0.508)"
+print "}"
+print "{DEVICES"
+print "  (? REF=U1 NAME=BC548 L=component)"
+print "}"
+
+#
+# PADSTACK. MDEF is shorthand for "all copper layers"
+#
+
+print "{PADSTACK=roundpad, 0.2"
+print "  (MDEF, 0, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=squarepad, 0.2"
+print "  (MDEF, 1, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=oblongpad, 0.2"
+print "  (MDEF, 2, 0.75, 0.5, 0)"
+print "}"
+print "{PADSTACK=nodrill,"
+print "  (MDEF, 0, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=0802pad,"
+print "  (component, 1, 0.2, 0.12, 0)"
+print "}"
+
+#
+# SEG line segments
+#
+
+x0 = 6
+y0 = 3
+r1 = 0.5
+r2 = 2
+max = 12
+
+print "{NET=segtst"
+
+for x in range (0, max):
+  alpha = x * 2 * pi / max
+  x1 = x0 + r1 * cos (alpha)
+  y1 = y0 + r1 * sin (alpha)
+  r = r1 + (r2 - r1) * (x + 1) / max
+  x2 = x0 + r * cos (alpha)
+  y2 = y0 + r * sin (alpha)
+  w = (x + 1) * 0.1 / max
+  print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=%f L=component)" % ( x1, y1, x2, y2, w)
+  
+print "}"
+
+#
+# ARC arc segments
+#
+
+max = 8
+x0 = 9
+y0 = 1
+r = 0.1
+w = r / 4
+
+print "{NET=arctst"
+
+for a in range (0, max):
+  for b in range (0, max):
+    alpha = 2 * pi * a / max
+    beta = 2 * pi * b / max
+    xc = x0 + 4  * r * a 
+    yc = y0 + 4  * r * b
+    x1 = xc + r * cos (alpha)
+    y1 = yc + r * sin (alpha)
+    x2 = xc + r * cos (beta)
+    y2 = yc + r * sin (beta)
+    print "  (ARC X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f W=%f L=component)" % ( x1, y1, x2, y2, xc, yc, r, w)
+  
+print "}"
+
+#
+# VIA
+#
+
+print "{NET=viatst"
+print "  (VIA X=13 Y=1 P=roundpad)"
+print "  (VIA X=13 Y=2 P=squarepad)"
+print "  (VIA X=13 Y=3 P=oblongpad)"
+print "  (VIA X=13 Y=4 P=nodrill)"
+print "  (SEG X1=13 Y1=1 X2=13 Y2=2 W=0.1 L=component)"
+print "  (SEG X1=13 Y1=2 X2=13 Y2=3 W=0.1 L=component)"
+print "  (SEG X1=13 Y1=3 X2=13 Y2=4 W=0.1 L=component)"
+print "}"
+
+#
+# old-style VIA, compatibility only.
+#
+
+print "{NET=oldviatst"
+print "  (VIA X=14 Y=1 D=0.2 L1=component S1=ROUND S1X=0.5 S1Y=0.5)"
+print "  (VIA X=14 Y=2 D=0.2 L1=component L2=solder S1=RECT S1X=0.5 S1Y=0.5)"
+print "  (VIA X=14 Y=3 D=0.2 L1=component L2=solder S1=OBLONG S1X=0.75 S1Y=0.5)"
+print "  (VIA X=14 Y=4 D=0.0 L1=component L2=solder S1=ROUND S1X=0.5 S1Y=0.5)"
+print "  (SEG X1=14 Y1=1 X2=14 Y2=2 W=0.1 L=component)"
+print "  (SEG X1=14 Y1=2 X2=14 Y2=3 W=0.1 L=component)"
+print "  (SEG X1=14 Y1=3 X2=14 Y2=4 W=0.1 L=component)"
+print "}"
+
+print "{NET=pintst"
+# a through-hole transistor
+print "  (PIN X=15 Y=1 R=U1.1 P=roundpad)"
+print "  (PIN X=15 Y=2 R=U1.2 P=squarepad)"
+print "  (PIN X=15 Y=3 R=U1.3 P=oblongpad)"
+print "}"
+
+print "{NET=padtst"
+print "  (PAD X=16 Y=1 L=component S=ROUND SX=0.5 SY=0.5)"
+print "  (PAD X=16 Y=2 L=component S=RECT SX=0.5 SY=0.5)"
+print "  (PAD X=16 Y=3 L=component S=OBLONG SX=0.75 SY=0.5)"
+print "  (PAD X=17 Y=1 L=solder S=ROUND SX=0.5 SY=0.5)"
+print "  (PAD X=17 Y=2 L=solder S=RECT SX=0.5 SY=0.5)"
+print "  (PAD X=17 Y=3 L=solder S=OBLONG SX=0.75 SY=0.5)"
+print "}"
+
+print "{NET=usegtst"
+print "  (USEG X1=18 Y1=1 L1=component X2=19 Y2=1 L2=component ZL=component ZW=0.1 ZLEN=2 )"
+print "  (USEG X1=18 Y1=2 L1=component X2=19 Y2=2 L2=component Z=50 D=1e-12 R=5 )"
+print "  (USEG X1=18 Y1=3 L1=component X2=19 Y2=3 L2=solder ZL=component ZW=0.1 ZLEN=2 )"
+print "  (USEG X1=18 Y1=4 L1=component X2=19 Y2=4 L2=solder Z=50 D=1e-12 R=5 )"
+print "}"
+
+x0 = 6.0
+y0 = 5.0
+l = 2.0
+h = 0.5
+r = h/2.0
+w = h/4.0
+
+print "{NET=polylinetst"
+print "  {POLYGON L=component W=0.05 ID=1 X=%f Y=%f" % (x0-w, y0-w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0-w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0-w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0-w, y0-w)
+print "  }"
+print "  {POLYLINE L=component W=0.1 ID=1 X=%f Y=%f" % (x0, y0)
+for a in range (0, 8, 2):
+  print "    (LINE X=%f Y=%f)" % ( x0+l, y0+a*h)
+  print "    (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f)" % ( x0+l, y0+a*h, x0+l, y0+(a+1)*h, x0+l, y0+(a+0.5)*h, r)
+  print "    (LINE X=%f Y=%f)" % ( x0, y0+(a+1)*h)
+  print "    (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f)" % ( x0, y0+(a+2)*h, x0, y0+(a+1)*h, x0, y0+(a+1.5)*h, r)
+
+print "  }"
+print "}"
+
+x0 = 9.5
+y0 = 5.5
+r = 0.5
+
+print "{NET=curvetst"
+print "  {POLYGON L=component W=0.05 ID=2 X=%f Y=%f" % (x0+r, y0)
+print "     (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f )" % (x0+r, y0, x0+r, y0, x0, y0, r)
+print "  }"
+print "  {POLYVOID ID=2 X=%f Y=%f" % (x0-r/2, y0)
+print "     (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f )" % (x0-r/2, y0, x0+r/2, y0, x0, y0, r/2)
+print "     (LINE X=%f Y=%f)" % (x0-r/2, y0)
+print "  }"
+print "}"
+
+x0 = 9.0
+y0 = 6.5
+w = 0.5
+
+print "{NET=linetst"
+print "  {POLYGON L=component W=0.05 ID=3 X=%f Y=%f" % (x0, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0)
+print "  }"
+
+x0 = 9.125
+y0 = 6.625
+w = 0.25
+
+print "  {POLYVOID ID=3 X=%f Y=%f" % (x0, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0)
+print "  }"
+
+print "}"
+
+x0 = 11.5
+y0 = 5.0
+w = 1.0
+h = 0.5
+s = 1.0
+
+def mkpolygon (typ, linewdth, id, x0, y0, w, h):
+  print "  {POLYGON L=component T=%s W=%f ID=%i X=%f Y=%f" % (typ, linewdth, id, x0, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0)
+  print "  }"
+  return
+
+def mkpolyvoid (id, x0, y0, w, h):
+  print "  {POLYVOID ID=%i X=%f Y=%f" % (id, x0, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0)
+  print "  }"
+  return
+
+x1 = 11.0
+x2 = x0 + w / 4.0
+print "{NET=poly_clearance_tst PS=0.05"
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+s)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0, x2, y0+h/2.0)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+s, x2, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+2*s, x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0, x1, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+s, x1, y0+h/2.0+2*s)
+
+mkpolygon("POUR", 0.1, 4, x0, y0, w, h)
+mkpolygon("COPPER", 0.1, 5, x0, y0 + s, w, h)
+mkpolygon("PLANE", 0.1, 6, x0, y0 + 2 * s, w, h)
+
+print "}"
+
+x1 = 13.0
+x2 = x0 + w * 3.0 / 4.0
+print "{NET=poly_clearance_tst2 PS=0.05"
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+s)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0, x2, y0+h/2.0)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+s, x2, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+2*s, x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0, x1, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=component)" % (x1, y0+h/2.0+s, x1, y0+h/2.0+2*s)
+print "}"
+
+# test nesting of polygons
+
+x0 = 14.0
+y0 = 5.0
+s = 0.25
+print "{NET=nesting_poly_1 PS=0"
+mkpolygon("POUR", 0, 7, x0, y0, 8*s, 8*s)
+mkpolyvoid(7, x0+1*s, y0+1*s, 6*s, 6*s)
+print "}"
+print "{NET=nesting_poly_2 PS=0"
+mkpolygon("POUR", 0, 8, x0+2*s, y0+2*s, 4*s, 4*s)
+mkpolyvoid(8, x0+3*s, y0+3*s, 2*s, 2*s)
+print "}"
+
+print "{END}"
+
+# not truncated

Property changes on: tags/2.0.1/src_plugins/io_hyp/tests/test00/gen_test00.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/src_plugins/io_hyp/tests/test00/test00.hyp
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test00/test00.hyp	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test00/test00.hyp	(revision 18980)
@@ -0,0 +1,289 @@
+{VERSION=2.0}
+{UNITS=METRIC LENGTH}
+{BOARD
+  (PERIMETER_SEGMENT X1=1.0 Y1=0.0 X2=19.0 Y2=0.0)
+  (PERIMETER_SEGMENT X1=20.0 Y1=1.0 X2=20.0 Y2=9.0)
+  (PERIMETER_SEGMENT X1=19.0 Y1=10.0 X2=1.0 Y2=10.0)
+  (PERIMETER_SEGMENT X1=0.0 Y1=9.0 X2=0.0 Y2=1.0)
+  (PERIMETER_ARC X1=0.0 Y1=1.0 X2=1.0 Y2=0.0 XC=1.0 YC=1.0 R=1.0)
+  (PERIMETER_ARC X1=1.0 Y1=10.0 X2=0.0 Y2=9.0 XC=1.0 YC=9.0 R=1.0)
+  (PERIMETER_ARC X1=20.0 Y1=9.0 X2=19.0 Y2=10.0 XC=19.0 YC=9.0 R=1.0)
+  (PERIMETER_ARC X1=19.0 Y1=0.0 X2=20.0 Y2=1.0 XC=19.0 YC=1.0 R=1.0)
+
+  (PERIMETER_SEGMENT X1=2.0 Y1=1.0 X2=3.0 Y2=1.0)
+  (PERIMETER_SEGMENT X1=3.0 Y1=9.0 X2=2.0 Y2=9.0)
+  (PERIMETER_ARC X1=2.0 Y1=9.0 X2=1.0 Y2=8.0 XC=2.0 YC=8.0 R=1.0)
+  (PERIMETER_SEGMENT X1=1.0 Y1=8.0 X2=1.0 Y2=2.0)
+  (PERIMETER_ARC X1=1.0 Y1=2.0 X2=2.0 Y2=1.0 XC=2.0 YC=2.0 R=1.0)
+  (PERIMETER_SEGMENT X1=4.0 Y1=2.0 X2=4.0 Y2=8.0)
+  (PERIMETER_ARC X1=3.0 Y1=1.0 X2=4.0 Y2=2.0 XC=3.0 YC=2.0 R=1.0)
+  (PERIMETER_ARC X1=4.0 Y1=8.0 X2=3.0 Y2=9.0 XC=3.0 YC=8.0 R=1.0)
+  (PERIMETER_ARC X1=5.5 Y1=5.0 X2=5.5 Y2=5.0 XC=5.0 YC=5.0 R=0.5)
+  (PERIMETER_ARC X1=5.5 Y1=6.0 X2=4.5 Y2=6.0 XC=5.0 YC=6.0 R=0.5)
+  (PERIMETER_SEGMENT X1=4.5 Y1=6.0 X2=5.5 Y2=6.0)
+  (PERIMETER_ARC X1=4.5 Y1=7.5 X2=5.5 Y2=7.5 XC=5.0 YC=7.5 R=0.5)
+  (PERIMETER_SEGMENT X1=4.5 Y1=7.5 X2=5.5 Y2=7.5)
+  (PERIMETER_ARC X1=5.5 Y1=8.5 X2=5.0 Y2=8.0 XC=5.0 YC=8.5 R=0.5)
+  (PERIMETER_SEGMENT X1=5.0 Y1=8.0 X2=5.5 Y2=8.5)
+}
+{PLANE_SEP=0.05}
+{STACKUP
+  (SIGNAL T=0.000700 L=component)
+  (DIELECTRIC T=0.002000 C=4.000000)
+  (PLANE  T=0.000700 L=solder PS=0.508)
+}
+{DEVICES
+  (? REF=U1 NAME=BC548 L=component)
+}
+{PADSTACK=roundpad, 0.2
+  (MDEF, 0, 0.5, 0.5, 0)
+}
+{PADSTACK=squarepad, 0.2
+  (MDEF, 1, 0.5, 0.5, 0)
+}
+{PADSTACK=oblongpad, 0.2
+  (MDEF, 2, 0.75, 0.5, 0)
+}
+{PADSTACK=nodrill,
+  (MDEF, 0, 0.5, 0.5, 0)
+}
+{PADSTACK=0802pad,
+  (component, 1, 0.2, 0.12, 0)
+}
+{NET=segtst
+  (SEG X1=6.500000 Y1=3.000000 X2=6.625000 Y2=3.000000 W=0.008333 L=component)
+  (SEG X1=6.433013 Y1=3.250000 X2=6.649519 Y2=3.375000 W=0.016667 L=component)
+  (SEG X1=6.250000 Y1=3.433013 X2=6.437500 Y2=3.757772 W=0.025000 L=component)
+  (SEG X1=6.000000 Y1=3.500000 X2=6.000000 Y2=4.000000 W=0.033333 L=component)
+  (SEG X1=5.750000 Y1=3.433013 X2=5.437500 Y2=3.974279 W=0.041667 L=component)
+  (SEG X1=5.566987 Y1=3.250000 X2=4.917468 Y2=3.625000 W=0.050000 L=component)
+  (SEG X1=5.500000 Y1=3.000000 X2=4.625000 Y2=3.000000 W=0.058333 L=component)
+  (SEG X1=5.566987 Y1=2.750000 X2=4.700962 Y2=2.250000 W=0.066667 L=component)
+  (SEG X1=5.750000 Y1=2.566987 X2=5.187500 Y2=1.592709 W=0.075000 L=component)
+  (SEG X1=6.000000 Y1=2.500000 X2=6.000000 Y2=1.250000 W=0.083333 L=component)
+  (SEG X1=6.250000 Y1=2.566987 X2=6.937500 Y2=1.376202 W=0.091667 L=component)
+  (SEG X1=6.433013 Y1=2.750000 X2=7.732051 Y2=2.000000 W=0.100000 L=component)
+}
+{NET=arctst
+  (ARC X1=9.100000 Y1=1.000000 X2=9.100000 Y2=1.000000 XC=9.000000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=1.400000 X2=9.070711 Y2=1.470711 XC=9.000000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=1.800000 X2=9.000000 Y2=1.900000 XC=9.000000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=2.200000 X2=8.929289 Y2=2.270711 XC=9.000000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=2.600000 X2=8.900000 Y2=2.600000 XC=9.000000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=3.000000 X2=8.929289 Y2=2.929289 XC=9.000000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=3.400000 X2=9.000000 Y2=3.300000 XC=9.000000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.100000 Y1=3.800000 X2=9.070711 Y2=3.729289 XC=9.000000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=1.070711 X2=9.500000 Y2=1.000000 XC=9.400000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=1.470711 X2=9.470711 Y2=1.470711 XC=9.400000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=1.870711 X2=9.400000 Y2=1.900000 XC=9.400000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=2.270711 X2=9.329289 Y2=2.270711 XC=9.400000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=2.670711 X2=9.300000 Y2=2.600000 XC=9.400000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=3.070711 X2=9.329289 Y2=2.929289 XC=9.400000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=3.470711 X2=9.400000 Y2=3.300000 XC=9.400000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.470711 Y1=3.870711 X2=9.470711 Y2=3.729289 XC=9.400000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=1.100000 X2=9.900000 Y2=1.000000 XC=9.800000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=1.500000 X2=9.870711 Y2=1.470711 XC=9.800000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=1.900000 X2=9.800000 Y2=1.900000 XC=9.800000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=2.300000 X2=9.729289 Y2=2.270711 XC=9.800000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=2.700000 X2=9.700000 Y2=2.600000 XC=9.800000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=3.100000 X2=9.729289 Y2=2.929289 XC=9.800000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=3.500000 X2=9.800000 Y2=3.300000 XC=9.800000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=9.800000 Y1=3.900000 X2=9.870711 Y2=3.729289 XC=9.800000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=1.070711 X2=10.300000 Y2=1.000000 XC=10.200000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=1.470711 X2=10.270711 Y2=1.470711 XC=10.200000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=1.870711 X2=10.200000 Y2=1.900000 XC=10.200000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=2.270711 X2=10.129289 Y2=2.270711 XC=10.200000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=2.670711 X2=10.100000 Y2=2.600000 XC=10.200000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=3.070711 X2=10.129289 Y2=2.929289 XC=10.200000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=3.470711 X2=10.200000 Y2=3.300000 XC=10.200000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.129289 Y1=3.870711 X2=10.270711 Y2=3.729289 XC=10.200000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=1.000000 X2=10.700000 Y2=1.000000 XC=10.600000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=1.400000 X2=10.670711 Y2=1.470711 XC=10.600000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=1.800000 X2=10.600000 Y2=1.900000 XC=10.600000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=2.200000 X2=10.529289 Y2=2.270711 XC=10.600000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=2.600000 X2=10.500000 Y2=2.600000 XC=10.600000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=3.000000 X2=10.529289 Y2=2.929289 XC=10.600000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=3.400000 X2=10.600000 Y2=3.300000 XC=10.600000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.500000 Y1=3.800000 X2=10.670711 Y2=3.729289 XC=10.600000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=0.929289 X2=11.100000 Y2=1.000000 XC=11.000000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=1.329289 X2=11.070711 Y2=1.470711 XC=11.000000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=1.729289 X2=11.000000 Y2=1.900000 XC=11.000000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=2.129289 X2=10.929289 Y2=2.270711 XC=11.000000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=2.529289 X2=10.900000 Y2=2.600000 XC=11.000000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=2.929289 X2=10.929289 Y2=2.929289 XC=11.000000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=3.329289 X2=11.000000 Y2=3.300000 XC=11.000000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=10.929289 Y1=3.729289 X2=11.070711 Y2=3.729289 XC=11.000000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=0.900000 X2=11.500000 Y2=1.000000 XC=11.400000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=1.300000 X2=11.470711 Y2=1.470711 XC=11.400000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=1.700000 X2=11.400000 Y2=1.900000 XC=11.400000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=2.100000 X2=11.329289 Y2=2.270711 XC=11.400000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=2.500000 X2=11.300000 Y2=2.600000 XC=11.400000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=2.900000 X2=11.329289 Y2=2.929289 XC=11.400000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=3.300000 X2=11.400000 Y2=3.300000 XC=11.400000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.400000 Y1=3.700000 X2=11.470711 Y2=3.729289 XC=11.400000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=0.929289 X2=11.900000 Y2=1.000000 XC=11.800000 YC=1.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=1.329289 X2=11.870711 Y2=1.470711 XC=11.800000 YC=1.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=1.729289 X2=11.800000 Y2=1.900000 XC=11.800000 YC=1.800000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=2.129289 X2=11.729289 Y2=2.270711 XC=11.800000 YC=2.200000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=2.529289 X2=11.700000 Y2=2.600000 XC=11.800000 YC=2.600000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=2.929289 X2=11.729289 Y2=2.929289 XC=11.800000 YC=3.000000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=3.329289 X2=11.800000 Y2=3.300000 XC=11.800000 YC=3.400000 R=0.100000 W=0.025000 L=component)
+  (ARC X1=11.870711 Y1=3.729289 X2=11.870711 Y2=3.729289 XC=11.800000 YC=3.800000 R=0.100000 W=0.025000 L=component)
+}
+{NET=viatst
+  (VIA X=13 Y=1 P=roundpad)
+  (VIA X=13 Y=2 P=squarepad)
+  (VIA X=13 Y=3 P=oblongpad)
+  (VIA X=13 Y=4 P=nodrill)
+  (SEG X1=13 Y1=1 X2=13 Y2=2 W=0.1 L=component)
+  (SEG X1=13 Y1=2 X2=13 Y2=3 W=0.1 L=component)
+  (SEG X1=13 Y1=3 X2=13 Y2=4 W=0.1 L=component)
+}
+{NET=oldviatst
+  (VIA X=14 Y=1 D=0.2 L1=component S1=ROUND S1X=0.5 S1Y=0.5)
+  (VIA X=14 Y=2 D=0.2 L1=component L2=solder S1=RECT S1X=0.5 S1Y=0.5)
+  (VIA X=14 Y=3 D=0.2 L1=component L2=solder S1=OBLONG S1X=0.75 S1Y=0.5)
+  (VIA X=14 Y=4 D=0.0 L1=component L2=solder S1=ROUND S1X=0.5 S1Y=0.5)
+  (SEG X1=14 Y1=1 X2=14 Y2=2 W=0.1 L=component)
+  (SEG X1=14 Y1=2 X2=14 Y2=3 W=0.1 L=component)
+  (SEG X1=14 Y1=3 X2=14 Y2=4 W=0.1 L=component)
+}
+{NET=pintst
+  (PIN X=15 Y=1 R=U1.1 P=roundpad)
+  (PIN X=15 Y=2 R=U1.2 P=squarepad)
+  (PIN X=15 Y=3 R=U1.3 P=oblongpad)
+}
+{NET=padtst
+  (PAD X=16 Y=1 L=component S=ROUND SX=0.5 SY=0.5)
+  (PAD X=16 Y=2 L=component S=RECT SX=0.5 SY=0.5)
+  (PAD X=16 Y=3 L=component S=OBLONG SX=0.75 SY=0.5)
+  (PAD X=17 Y=1 L=solder S=ROUND SX=0.5 SY=0.5)
+  (PAD X=17 Y=2 L=solder S=RECT SX=0.5 SY=0.5)
+  (PAD X=17 Y=3 L=solder S=OBLONG SX=0.75 SY=0.5)
+}
+{NET=usegtst
+  (USEG X1=18 Y1=1 L1=component X2=19 Y2=1 L2=component ZL=component ZW=0.1 ZLEN=2 )
+  (USEG X1=18 Y1=2 L1=component X2=19 Y2=2 L2=component Z=50 D=1e-12 R=5 )
+  (USEG X1=18 Y1=3 L1=component X2=19 Y2=3 L2=solder ZL=component ZW=0.1 ZLEN=2 )
+  (USEG X1=18 Y1=4 L1=component X2=19 Y2=4 L2=solder Z=50 D=1e-12 R=5 )
+}
+{NET=polylinetst
+  {POLYGON L=component W=0.05 ID=1 X=5.875000 Y=4.875000
+     (LINE X=6.125000 Y=4.875000)
+     (LINE X=6.125000 Y=5.125000)
+     (LINE X=5.875000 Y=5.125000)
+     (LINE X=5.875000 Y=4.875000)
+  }
+  {POLYLINE L=component W=0.1 ID=1 X=6.000000 Y=5.000000
+    (LINE X=8.000000 Y=5.000000)
+    (CURVE X1=8.000000 Y1=5.000000 X2=8.000000 Y2=5.500000 XC=8.000000 YC=5.250000 R=0.250000)
+    (LINE X=6.000000 Y=5.500000)
+    (CURVE X1=6.000000 Y1=6.000000 X2=6.000000 Y2=5.500000 XC=6.000000 YC=5.750000 R=0.250000)
+    (LINE X=8.000000 Y=6.000000)
+    (CURVE X1=8.000000 Y1=6.000000 X2=8.000000 Y2=6.500000 XC=8.000000 YC=6.250000 R=0.250000)
+    (LINE X=6.000000 Y=6.500000)
+    (CURVE X1=6.000000 Y1=7.000000 X2=6.000000 Y2=6.500000 XC=6.000000 YC=6.750000 R=0.250000)
+    (LINE X=8.000000 Y=7.000000)
+    (CURVE X1=8.000000 Y1=7.000000 X2=8.000000 Y2=7.500000 XC=8.000000 YC=7.250000 R=0.250000)
+    (LINE X=6.000000 Y=7.500000)
+    (CURVE X1=6.000000 Y1=8.000000 X2=6.000000 Y2=7.500000 XC=6.000000 YC=7.750000 R=0.250000)
+    (LINE X=8.000000 Y=8.000000)
+    (CURVE X1=8.000000 Y1=8.000000 X2=8.000000 Y2=8.500000 XC=8.000000 YC=8.250000 R=0.250000)
+    (LINE X=6.000000 Y=8.500000)
+    (CURVE X1=6.000000 Y1=9.000000 X2=6.000000 Y2=8.500000 XC=6.000000 YC=8.750000 R=0.250000)
+  }
+}
+{NET=curvetst
+  {POLYGON L=component W=0.05 ID=2 X=10.000000 Y=5.500000
+     (CURVE X1=10.000000 Y1=5.500000 X2=10.000000 Y2=5.500000 XC=9.500000 YC=5.500000 R=0.500000 )
+  }
+  {POLYVOID ID=2 X=9.250000 Y=5.500000
+     (CURVE X1=9.250000 Y1=5.500000 X2=9.750000 Y2=5.500000 XC=9.500000 YC=5.500000 R=0.250000 )
+     (LINE X=9.250000 Y=5.500000)
+  }
+}
+{NET=linetst
+  {POLYGON L=component W=0.05 ID=3 X=9.000000 Y=6.500000
+     (LINE X=10.000000 Y=6.500000)
+     (LINE X=10.000000 Y=7.000000)
+     (LINE X=9.500000 Y=7.000000)
+     (LINE X=9.500000 Y=7.500000)
+     (LINE X=9.000000 Y=7.500000)
+     (LINE X=9.000000 Y=6.500000)
+  }
+  {POLYVOID ID=3 X=9.125000 Y=6.625000
+     (LINE X=9.625000 Y=6.625000)
+     (LINE X=9.625000 Y=6.875000)
+     (LINE X=9.375000 Y=6.875000)
+     (LINE X=9.375000 Y=7.125000)
+     (LINE X=9.125000 Y=7.125000)
+     (LINE X=9.125000 Y=6.625000)
+  }
+}
+{NET=poly_clearance_tst PS=0.05
+  (VIA X=11.750000 Y=5.250000 P=0802pad)
+  (VIA X=11.750000 Y=6.250000 P=0802pad)
+  (VIA X=11.750000 Y=7.250000 P=0802pad)
+  (SEG X1=11.000000 Y1=5.250000 X2=11.750000 Y2=5.250000 W=0.04 L=component)
+  (SEG X1=11.000000 Y1=6.250000 X2=11.750000 Y2=6.250000 W=0.04 L=component)
+  (SEG X1=11.000000 Y1=7.250000 X2=11.750000 Y2=7.250000 W=0.04 L=component)
+  (SEG X1=11.000000 Y1=5.250000 X2=11.000000 Y2=6.250000 W=0.04 L=component)
+  (SEG X1=11.000000 Y1=6.250000 X2=11.000000 Y2=7.250000 W=0.04 L=component)
+  {POLYGON L=component T=POUR W=0.100000 ID=4 X=11.500000 Y=5.000000
+     (LINE X=12.500000 Y=5.000000)
+     (LINE X=12.500000 Y=5.500000)
+     (LINE X=11.500000 Y=5.500000)
+     (LINE X=11.500000 Y=5.000000)
+  }
+  {POLYGON L=component T=COPPER W=0.100000 ID=5 X=11.500000 Y=6.000000
+     (LINE X=12.500000 Y=6.000000)
+     (LINE X=12.500000 Y=6.500000)
+     (LINE X=11.500000 Y=6.500000)
+     (LINE X=11.500000 Y=6.000000)
+  }
+  {POLYGON L=component T=PLANE W=0.100000 ID=6 X=11.500000 Y=7.000000
+     (LINE X=12.500000 Y=7.000000)
+     (LINE X=12.500000 Y=7.500000)
+     (LINE X=11.500000 Y=7.500000)
+     (LINE X=11.500000 Y=7.000000)
+  }
+}
+{NET=poly_clearance_tst2 PS=0.05
+  (VIA X=12.250000 Y=5.250000 P=0802pad)
+  (VIA X=12.250000 Y=6.250000 P=0802pad)
+  (VIA X=12.250000 Y=7.250000 P=0802pad)
+  (SEG X1=13.000000 Y1=5.250000 X2=12.250000 Y2=5.250000 W=0.04 L=component)
+  (SEG X1=13.000000 Y1=6.250000 X2=12.250000 Y2=6.250000 W=0.04 L=component)
+  (SEG X1=13.000000 Y1=7.250000 X2=12.250000 Y2=7.250000 W=0.04 L=component)
+  (SEG X1=13.000000 Y1=5.250000 X2=13.000000 Y2=6.250000 W=0.04 L=component)
+  (SEG X1=13.000000 Y1=6.250000 X2=13.000000 Y2=7.250000 W=0.04 L=component)
+}
+{NET=nesting_poly_1 PS=0
+  {POLYGON L=component T=POUR W=0.000000 ID=7 X=14.000000 Y=5.000000
+     (LINE X=16.000000 Y=5.000000)
+     (LINE X=16.000000 Y=7.000000)
+     (LINE X=14.000000 Y=7.000000)
+     (LINE X=14.000000 Y=5.000000)
+  }
+  {POLYVOID ID=7 X=14.250000 Y=5.250000
+     (LINE X=15.750000 Y=5.250000)
+     (LINE X=15.750000 Y=6.750000)
+     (LINE X=14.250000 Y=6.750000)
+     (LINE X=14.250000 Y=5.250000)
+  }
+}
+{NET=nesting_poly_2 PS=0
+  {POLYGON L=component T=POUR W=0.000000 ID=8 X=14.500000 Y=5.500000
+     (LINE X=15.500000 Y=5.500000)
+     (LINE X=15.500000 Y=6.500000)
+     (LINE X=14.500000 Y=6.500000)
+     (LINE X=14.500000 Y=5.500000)
+  }
+  {POLYVOID ID=8 X=14.750000 Y=5.750000
+     (LINE X=15.250000 Y=5.750000)
+     (LINE X=15.250000 Y=6.250000)
+     (LINE X=14.750000 Y=6.250000)
+     (LINE X=14.750000 Y=5.750000)
+  }
+}
+{END}
Index: tags/2.0.1/src_plugins/io_hyp/tests/test01/README.txt
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test01/README.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test01/README.txt	(revision 18980)
@@ -0,0 +1,3 @@
+Source: handwritten
+GPL: Yes
+Remark: contains common syntax errors
Index: tags/2.0.1/src_plugins/io_hyp/tests/test01/gen_test01.py
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test01/gen_test01.py	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test01/gen_test01.py	(revision 18980)
@@ -0,0 +1,329 @@
+#!/usr/bin/python
+"""
+  Generate sample hyperlynx file 
+  Copyright 2017 Koen De Vleeschauwer.
+ 
+  This file is part of pcb-rnd.
+ 
+  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 2 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 <http://www.gnu.org/licenses/>.
+"""
+
+from math import pi, sin, cos
+print "* Job: Comment"
+print ""
+print "{VERSION=2.01}"
+print "{UNITS=METRIC LENGTH}"
+print "{BOARD"
+print "  (PERIMETER_SEGMENT X1=1.0 Y1=0.0 X2=19.0 Y2=0.0"
+print "  (PERIMETER_SEGMENT X1=20.0 Y1=1.0 X2=20.0 Y2=9.0"
+print "  (PERIMETER_SEGMENT X1=19.0 Y1=10.0 X2=1.0 Y2=10.0"
+print "  (PERIMETER_SEGMENT X1=0.0 Y1=9.0 X2=0.0 Y2=1.0"
+print "  (PERIMETER_ARC X1=0.0 Y1=1.0 X2=1.0 Y2=0.0 XC=1.0 YC=1.0 R=1.0"
+print "  (PERIMETER_ARC X1=1.0 Y1=10.0 X2=0.0 Y2=9.0 XC=1.0 YC=9.0 R=1.0"
+print "  (PERIMETER_ARC X1=20.0 Y1=9.0 X2=19.0 Y2=10.0 XC=19.0 YC=9.0 R=1.0"
+print "  (PERIMETER_ARC X1=19.0 Y1=0.0 X2=20.0 Y2=1.0 XC=19.0 YC=1.0 R=1.0"
+print ""
+print "  (PERIMETER_SEGMENT X1=2.0 Y1=1.0 X2=3.0 Y2=1.0"
+print "  (PERIMETER_SEGMENT X1=3.0 Y1=9.0 X2=2.0 Y2=9.0"
+print "  (PERIMETER_ARC X1=2.0 Y1=9.0 X2=1.0 Y2=8.0 XC=2.0 YC=8.0 R=1.0"
+print "  (PERIMETER_SEGMENT X1=1.0 Y1=8.0 X2=1.0 Y2=2.0"
+print "  (PERIMETER_ARC X1=1.0 Y1=2.0 X2=2.0 Y2=1.0 XC=2.0 YC=2.0 R=1.0"
+print "  (PERIMETER_SEGMENT X1=4.0 Y1=2.0 X2=4.0 Y2=8.0"
+print "  (PERIMETER_ARC X1=3.0 Y1=1.0 X2=4.0 Y2=2.0 XC=3.0 YC=2.0 R=1.0"
+print "  (PERIMETER_ARC X1=4.0 Y1=8.0 X2=3.0 Y2=9.0 XC=3.0 YC=8.0 R=1.0"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=5.0 X2=5.5 Y2=5.0 XC=5.0 YC=5.0 R=0.5"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=6.0 X2=4.5 Y2=6.0 XC=5.0 YC=6.0 R=0.5"
+print "  (PERIMETER_SEGMENT X1=4.5 Y1=6.0 X2=5.5 Y2=6.0"
+
+print "  (PERIMETER_ARC X1=4.5 Y1=7.5 X2=5.5 Y2=7.5 XC=5.0 YC=7.5 R=0.5"
+print "  (PERIMETER_SEGMENT X1=4.5 Y1=7.5 X2=5.5 Y2=7.5"
+
+print "  (PERIMETER_ARC X1=5.5 Y1=8.5 X2=5.0 Y2=8.0 XC=5.0 YC=8.5 R=0.5"
+print "  (PERIMETER_SEGMENT X1=5.0 Y1=8.0 X2=5.5 Y2=8.5"
+
+print "}"
+
+print "{PLANE_SEP=0.05}"
+
+print "{STACKUP"
+print "  (SIGNAL T=0.001778 L=1 C=1.67e-008)"
+print "  (DIELECTRIC T=0.149900 C=4.700000)"
+print "  (PLANE  T=0.001778 L=2 C=1.67e-008)"
+print "}"
+print "{DEVICES"
+print "  (? REF=U1 NAME=BC848 NPN 1x1 L=1)"
+print "}"
+
+#
+# PADSTACK. MDEF is shorthand for "all copper layers"
+#
+
+print "{PADSTACK=roundpad, 0.2"
+print "  (MDEF, 0, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=squarepad, 0.2"
+print "  (MDEF, 1, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=oblongpad, 0.2"
+print "  (MDEF, 2, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=nodrill,"
+print "  (MDEF, 0, 0.5, 0.5, 0)"
+print "}"
+print "{PADSTACK=0802pad,"
+print "  (1, 1, 0.2, 0.12, 0)"
+print "}"
+
+#
+# SEG line segments
+#
+
+x0 = 6
+y0 = 3
+r1 = 0.5
+r2 = 2
+max = 12
+
+print "{NET=segtst"
+
+for x in range (0, max):
+  alpha = x * 2 * pi / max
+  x1 = x0 + r1 * cos (alpha)
+  y1 = y0 + r1 * sin (alpha)
+  r = r1 + (r2 - r1) * (x + 1) / max
+  x2 = x0 + r * cos (alpha)
+  y2 = y0 + r * sin (alpha)
+  w = (x + 1) * 0.1 / max
+  print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=%f L=1)" % ( x1, y1, x2, y2, w)
+  
+print "}"
+
+#
+# ARC arc segments
+#
+
+max = 8
+x0 = 9
+y0 = 1
+r = 0.1
+w = r / 4
+
+print "{NET=arctst"
+
+for a in range (0, max):
+  for b in range (0, max):
+    alpha = 2 * pi * a / max
+    beta = 2 * pi * b / max
+    xc = x0 + 4  * r * a 
+    yc = y0 + 4  * r * b
+    x1 = xc + r * cos (alpha)
+    y1 = yc + r * sin (alpha)
+    x2 = xc + r * cos (beta)
+    y2 = yc + r * sin (beta)
+    print "  (ARC X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f W=%f L=1)" % ( x1, y1, x2, y2, xc, yc, r, w)
+  
+print "}"
+
+#
+# VIA
+#
+
+print "{NET=viatst"
+print "  (VIA X=13 Y=1 P=roundpad)"
+print "  (VIA X=13 Y=2 P=squarepad)"
+print "  (VIA X=13 Y=3 P=oblongpad)"
+print "  (VIA X=13 Y=4 P=nodrill)"
+print "  (SEG X1=13 Y1=1 X2=13 Y2=2 W=0.1 L=1)"
+print "  (SEG X1=13 Y1=2 X2=13 Y2=3 W=0.1 L=1)"
+print "  (SEG X1=13 Y1=3 X2=13 Y2=4 W=0.1 L=1)"
+print "}"
+
+#
+# old-style VIA, compatibility only.
+#
+
+print "{NET=oldviatst"
+print "  (VIA X=14 Y=1 D=0.2 L1=1 S1=ROUND S1X=0.5 S1Y=0.5)"
+print "  (VIA X=14 Y=2 D=0.2 L1=1 L2=2 S1=RECT S1X=0.5 S1Y=0.5)"
+print "  (VIA X=14 Y=3 D=0.2 L1=1 L2=2 S1=OBLONG S1X=0.5 S1Y=0.5)"
+print "  (VIA X=14 Y=4 D=0.0 L1=1 L2=2 S1=ROUND S1X=0.5 S1Y=0.5)"
+print "  (SEG X1=14 Y1=1 X2=14 Y2=2 W=0.1 L=1)"
+print "  (SEG X1=14 Y1=2 X2=14 Y2=3 W=0.1 L=1)"
+print "  (SEG X1=14 Y1=3 X2=14 Y2=4 W=0.1 L=1)"
+print "}"
+
+print "{NET=(pintst)"
+# a through-hole transistor
+print "  (PIN X=15 Y=1 R=U1.1 P=roundpad)"
+print "  (PIN X=15 Y=2 R=U1.2 P=squarepad)"
+print "  (PIN X=15 Y=3 R=U1.3 P=oblongpad)"
+print "}"
+
+print "{NET=(padtst)"
+print "  (PAD X=16 Y=1 L=1 S=ROUND SX=0.5 SY=0.5)"
+print "  (PAD X=16 Y=2 L=1 S=RECT SX=0.5 SY=0.5)"
+print "  (PAD X=16 Y=3 L=1 S=OBLONG SX=0.5 SY=0.5)"
+print "  (PAD X=17 Y=1 L=2 S=ROUND SX=0.5 SY=0.5)"
+print "  (PAD X=17 Y=2 L=2 S=RECT SX=0.5 SY=0.5)"
+print "  (PAD X=17 Y=3 L=2 S=OBLONG SX=0.5 SY=0.5)"
+print "}"
+
+print "{NET=(usegtst)"
+print "  (USEG X1=18 Y1=1 L1=1 X2=19 Y2=1 L2=1 ZL=1 ZW=0.1 ZLEN=2 )"
+print "  (USEG X1=18 Y1=2 L1=1 X2=19 Y2=2 L2=1 Z=50 D=1e-12 R=5 )"
+print "  (USEG X1=18 Y1=3 L1=1 X2=19 Y2=3 L2=2 ZL=1 ZW=0.1 ZLEN=2 )"
+print "  (USEG X1=18 Y1=4 L1=1 X2=19 Y2=4 L2=2 Z=50 D=1e-12 R=5 )"
+print "}"
+
+x0 = 6.0
+y0 = 5.0
+l = 2.0
+h = 0.5
+r = h/2.0
+w = h/4.0
+
+print "{NET=polylinetst"
+print "  {POLYGON L=1 W=0.05 ID=1 X=%f Y=%f)" % (x0-w, y0-w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0-w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0-w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0-w, y0-w)
+print "  }"
+print "  {POLYLINE L=1 W=0.1 ID=1 X=%f Y=%f" % (x0, y0)
+for a in range (0, 8, 2):
+  print "    (LINE X=%f Y=%f)" % ( x0+l, y0+a*h)
+  print "    (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f)" % ( x0+l, y0+a*h, x0+l, y0+(a+1)*h, x0+l, y0+(a+0.5)*h, r)
+  print "    (LINE X=%f Y=%f)" % ( x0, y0+(a+1)*h)
+  print "    (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f)" % ( x0, y0+(a+2)*h, x0, y0+(a+1)*h, x0, y0+(a+1.5)*h, r)
+
+print "  }"
+print "}"
+
+x0 = 9.5
+y0 = 5.5
+r = 0.5
+
+print "{NET=curvetst"
+print "  {POLYGON L=1 W=0.05 ID=2 X=%f Y=%f)" % (x0+r, y0)
+print "     (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f )" % (x0+r, y0, x0+r, y0, x0, y0, r)
+print "  }"
+print "  {POLYVOID ID=2 X=%f Y=%f" % (x0-r/2, y0)
+print "     (CURVE X1=%f Y1=%f X2=%f Y2=%f XC=%f YC=%f R=%f )" % (x0-r/2, y0, x0+r/2, y0, x0, y0, r/2)
+print "     (LINE X=%f Y=%f)" % (x0-r/2, y0)
+print "  }"
+print "}"
+
+x0 = 9.0
+y0 = 6.5
+w = 0.5
+
+print "{NET=linetst"
+print "  {POLYGON L=1 W=0.05 ID=3 X=%f Y=%f)" % (x0, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0)
+print "  }"
+
+x0 = 9.125
+y0 = 6.625
+w = 0.25
+
+print "  {POLYVOID ID=3 X=%f Y=%f" % (x0, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0)
+print "     (LINE X=%f Y=%f)" % (x0+2*w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+w)
+print "     (LINE X=%f Y=%f)" % (x0+w, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0+2*w)
+print "     (LINE X=%f Y=%f)" % (x0, y0)
+print "  }"
+
+print "}"
+
+x0 = 11.5
+y0 = 5.0
+w = 1.0
+h = 0.5
+s = 1.0
+
+def mkpolygon (typ, linewdth, id, x0, y0, w, h):
+  print "  {POLYGON L=1 T=%s W=%f ID=%i X=%f Y=%f)" % (typ, linewdth, id, x0, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0)
+  print "  }"
+  return
+
+def mkpolyvoid (id, x0, y0, w, h):
+  print "  {POLYVOID ID=%i X=%f Y=%f" % (id, x0, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0)
+  print "     (LINE X=%f Y=%f)" % (x0+w, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0+h)
+  print "     (LINE X=%f Y=%f)" % (x0, y0)
+  print "  }"
+  return
+
+x1 = 11.0
+x2 = x0 + w / 4.0
+print "{NET=poly_clearance_tst PS=0.05"
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+s)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0, x2, y0+h/2.0)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+s, x2, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+2*s, x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0, x1, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+s, x1, y0+h/2.0+2*s)
+
+mkpolygon("POUR", 0.1, 4, x0, y0, w, h)
+mkpolygon("COPPER", 0.1, 5, x0, y0 + s, w, h)
+mkpolygon("PLANE", 0.1, 6, x0, y0 + 2 * s, w, h)
+
+print "}"
+
+x1 = 13.0
+x2 = x0 + w * 3.0 / 4.0
+print "{NET=poly_clearance_tst2 PS=0.05"
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+s)
+print "  (VIA X=%f Y=%f P=0802pad)" % (x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0, x2, y0+h/2.0)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+s, x2, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+2*s, x2, y0+h/2.0+2*s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0, x1, y0+h/2.0+s)
+print "  (SEG X1=%f Y1=%f X2=%f Y2=%f W=0.04 L=1)" % (x1, y0+h/2.0+s, x1, y0+h/2.0+2*s)
+print "}"
+
+# test nesting of polygons
+
+x0 = 14.0
+y0 = 5.0
+s = 0.25
+print "{NET=nesting_poly_1 PS=0"
+mkpolygon("POUR", 0, 7, x0, y0, 8*s, 8*s)
+mkpolyvoid(7, x0+1*s, y0+1*s, 6*s, 6*s)
+print "}"
+print "{NET=nesting_poly_2 PS=0"
+mkpolygon("POUR", 0, 8, x0+2*s, y0+2*s, 4*s, 4*s)
+mkpolyvoid(8, x0+3*s, y0+3*s, 2*s, 2*s)
+print "}"
+
+print "{END}"
+
+# not truncated
\ No newline at end of file
Index: tags/2.0.1/src_plugins/io_hyp/tests/test01/test01.hyp
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test01/test01.hyp	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test01/test01.hyp	(revision 18980)
@@ -0,0 +1,291 @@
+* Job: Comment
+
+{VERSION=2.01}
+{UNITS=METRIC LENGTH}
+{BOARD
+  (PERIMETER_SEGMENT X1=1.0 Y1=0.0 X2=19.0 Y2=0.0
+  (PERIMETER_SEGMENT X1=20.0 Y1=1.0 X2=20.0 Y2=9.0
+  (PERIMETER_SEGMENT X1=19.0 Y1=10.0 X2=1.0 Y2=10.0
+  (PERIMETER_SEGMENT X1=0.0 Y1=9.0 X2=0.0 Y2=1.0
+  (PERIMETER_ARC X1=0.0 Y1=1.0 X2=1.0 Y2=0.0 XC=1.0 YC=1.0 R=1.0
+  (PERIMETER_ARC X1=1.0 Y1=10.0 X2=0.0 Y2=9.0 XC=1.0 YC=9.0 R=1.0
+  (PERIMETER_ARC X1=20.0 Y1=9.0 X2=19.0 Y2=10.0 XC=19.0 YC=9.0 R=1.0
+  (PERIMETER_ARC X1=19.0 Y1=0.0 X2=20.0 Y2=1.0 XC=19.0 YC=1.0 R=1.0
+
+  (PERIMETER_SEGMENT X1=2.0 Y1=1.0 X2=3.0 Y2=1.0
+  (PERIMETER_SEGMENT X1=3.0 Y1=9.0 X2=2.0 Y2=9.0
+  (PERIMETER_ARC X1=2.0 Y1=9.0 X2=1.0 Y2=8.0 XC=2.0 YC=8.0 R=1.0
+  (PERIMETER_SEGMENT X1=1.0 Y1=8.0 X2=1.0 Y2=2.0
+  (PERIMETER_ARC X1=1.0 Y1=2.0 X2=2.0 Y2=1.0 XC=2.0 YC=2.0 R=1.0
+  (PERIMETER_SEGMENT X1=4.0 Y1=2.0 X2=4.0 Y2=8.0
+  (PERIMETER_ARC X1=3.0 Y1=1.0 X2=4.0 Y2=2.0 XC=3.0 YC=2.0 R=1.0
+  (PERIMETER_ARC X1=4.0 Y1=8.0 X2=3.0 Y2=9.0 XC=3.0 YC=8.0 R=1.0
+  (PERIMETER_ARC X1=5.5 Y1=5.0 X2=5.5 Y2=5.0 XC=5.0 YC=5.0 R=0.5
+  (PERIMETER_ARC X1=5.5 Y1=6.0 X2=4.5 Y2=6.0 XC=5.0 YC=6.0 R=0.5
+  (PERIMETER_SEGMENT X1=4.5 Y1=6.0 X2=5.5 Y2=6.0
+  (PERIMETER_ARC X1=4.5 Y1=7.5 X2=5.5 Y2=7.5 XC=5.0 YC=7.5 R=0.5
+  (PERIMETER_SEGMENT X1=4.5 Y1=7.5 X2=5.5 Y2=7.5
+  (PERIMETER_ARC X1=5.5 Y1=8.5 X2=5.0 Y2=8.0 XC=5.0 YC=8.5 R=0.5
+  (PERIMETER_SEGMENT X1=5.0 Y1=8.0 X2=5.5 Y2=8.5
+}
+{PLANE_SEP=0.05}
+{STACKUP
+  (SIGNAL T=0.001778 L=1 C=1.67e-008)
+  (DIELECTRIC T=0.149900 C=4.700000)
+  (PLANE  T=0.001778 L=2 C=1.67e-008)
+}
+{DEVICES
+  (? REF=U1 NAME=BC848 NPN 1x1 L=1)
+}
+{PADSTACK=roundpad, 0.2
+  (MDEF, 0, 0.5, 0.5, 0)
+}
+{PADSTACK=squarepad, 0.2
+  (MDEF, 1, 0.5, 0.5, 0)
+}
+{PADSTACK=oblongpad, 0.2
+  (MDEF, 2, 0.5, 0.5, 0)
+}
+{PADSTACK=nodrill,
+  (MDEF, 0, 0.5, 0.5, 0)
+}
+{PADSTACK=0802pad,
+  (1, 1, 0.2, 0.12, 0)
+}
+{NET=segtst
+  (SEG X1=6.500000 Y1=3.000000 X2=6.625000 Y2=3.000000 W=0.008333 L=1)
+  (SEG X1=6.433013 Y1=3.250000 X2=6.649519 Y2=3.375000 W=0.016667 L=1)
+  (SEG X1=6.250000 Y1=3.433013 X2=6.437500 Y2=3.757772 W=0.025000 L=1)
+  (SEG X1=6.000000 Y1=3.500000 X2=6.000000 Y2=4.000000 W=0.033333 L=1)
+  (SEG X1=5.750000 Y1=3.433013 X2=5.437500 Y2=3.974279 W=0.041667 L=1)
+  (SEG X1=5.566987 Y1=3.250000 X2=4.917468 Y2=3.625000 W=0.050000 L=1)
+  (SEG X1=5.500000 Y1=3.000000 X2=4.625000 Y2=3.000000 W=0.058333 L=1)
+  (SEG X1=5.566987 Y1=2.750000 X2=4.700962 Y2=2.250000 W=0.066667 L=1)
+  (SEG X1=5.750000 Y1=2.566987 X2=5.187500 Y2=1.592709 W=0.075000 L=1)
+  (SEG X1=6.000000 Y1=2.500000 X2=6.000000 Y2=1.250000 W=0.083333 L=1)
+  (SEG X1=6.250000 Y1=2.566987 X2=6.937500 Y2=1.376202 W=0.091667 L=1)
+  (SEG X1=6.433013 Y1=2.750000 X2=7.732051 Y2=2.000000 W=0.100000 L=1)
+}
+{NET=arctst
+  (ARC X1=9.100000 Y1=1.000000 X2=9.100000 Y2=1.000000 XC=9.000000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=1.400000 X2=9.070711 Y2=1.470711 XC=9.000000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=1.800000 X2=9.000000 Y2=1.900000 XC=9.000000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=2.200000 X2=8.929289 Y2=2.270711 XC=9.000000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=2.600000 X2=8.900000 Y2=2.600000 XC=9.000000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=3.000000 X2=8.929289 Y2=2.929289 XC=9.000000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=3.400000 X2=9.000000 Y2=3.300000 XC=9.000000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.100000 Y1=3.800000 X2=9.070711 Y2=3.729289 XC=9.000000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=1.070711 X2=9.500000 Y2=1.000000 XC=9.400000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=1.470711 X2=9.470711 Y2=1.470711 XC=9.400000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=1.870711 X2=9.400000 Y2=1.900000 XC=9.400000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=2.270711 X2=9.329289 Y2=2.270711 XC=9.400000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=2.670711 X2=9.300000 Y2=2.600000 XC=9.400000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=3.070711 X2=9.329289 Y2=2.929289 XC=9.400000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=3.470711 X2=9.400000 Y2=3.300000 XC=9.400000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.470711 Y1=3.870711 X2=9.470711 Y2=3.729289 XC=9.400000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=1.100000 X2=9.900000 Y2=1.000000 XC=9.800000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=1.500000 X2=9.870711 Y2=1.470711 XC=9.800000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=1.900000 X2=9.800000 Y2=1.900000 XC=9.800000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=2.300000 X2=9.729289 Y2=2.270711 XC=9.800000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=2.700000 X2=9.700000 Y2=2.600000 XC=9.800000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=3.100000 X2=9.729289 Y2=2.929289 XC=9.800000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=3.500000 X2=9.800000 Y2=3.300000 XC=9.800000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=9.800000 Y1=3.900000 X2=9.870711 Y2=3.729289 XC=9.800000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=1.070711 X2=10.300000 Y2=1.000000 XC=10.200000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=1.470711 X2=10.270711 Y2=1.470711 XC=10.200000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=1.870711 X2=10.200000 Y2=1.900000 XC=10.200000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=2.270711 X2=10.129289 Y2=2.270711 XC=10.200000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=2.670711 X2=10.100000 Y2=2.600000 XC=10.200000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=3.070711 X2=10.129289 Y2=2.929289 XC=10.200000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=3.470711 X2=10.200000 Y2=3.300000 XC=10.200000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.129289 Y1=3.870711 X2=10.270711 Y2=3.729289 XC=10.200000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=1.000000 X2=10.700000 Y2=1.000000 XC=10.600000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=1.400000 X2=10.670711 Y2=1.470711 XC=10.600000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=1.800000 X2=10.600000 Y2=1.900000 XC=10.600000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=2.200000 X2=10.529289 Y2=2.270711 XC=10.600000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=2.600000 X2=10.500000 Y2=2.600000 XC=10.600000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=3.000000 X2=10.529289 Y2=2.929289 XC=10.600000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=3.400000 X2=10.600000 Y2=3.300000 XC=10.600000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.500000 Y1=3.800000 X2=10.670711 Y2=3.729289 XC=10.600000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=0.929289 X2=11.100000 Y2=1.000000 XC=11.000000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=1.329289 X2=11.070711 Y2=1.470711 XC=11.000000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=1.729289 X2=11.000000 Y2=1.900000 XC=11.000000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=2.129289 X2=10.929289 Y2=2.270711 XC=11.000000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=2.529289 X2=10.900000 Y2=2.600000 XC=11.000000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=2.929289 X2=10.929289 Y2=2.929289 XC=11.000000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=3.329289 X2=11.000000 Y2=3.300000 XC=11.000000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=10.929289 Y1=3.729289 X2=11.070711 Y2=3.729289 XC=11.000000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=0.900000 X2=11.500000 Y2=1.000000 XC=11.400000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=1.300000 X2=11.470711 Y2=1.470711 XC=11.400000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=1.700000 X2=11.400000 Y2=1.900000 XC=11.400000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=2.100000 X2=11.329289 Y2=2.270711 XC=11.400000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=2.500000 X2=11.300000 Y2=2.600000 XC=11.400000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=2.900000 X2=11.329289 Y2=2.929289 XC=11.400000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=3.300000 X2=11.400000 Y2=3.300000 XC=11.400000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.400000 Y1=3.700000 X2=11.470711 Y2=3.729289 XC=11.400000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=0.929289 X2=11.900000 Y2=1.000000 XC=11.800000 YC=1.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=1.329289 X2=11.870711 Y2=1.470711 XC=11.800000 YC=1.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=1.729289 X2=11.800000 Y2=1.900000 XC=11.800000 YC=1.800000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=2.129289 X2=11.729289 Y2=2.270711 XC=11.800000 YC=2.200000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=2.529289 X2=11.700000 Y2=2.600000 XC=11.800000 YC=2.600000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=2.929289 X2=11.729289 Y2=2.929289 XC=11.800000 YC=3.000000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=3.329289 X2=11.800000 Y2=3.300000 XC=11.800000 YC=3.400000 R=0.100000 W=0.025000 L=1)
+  (ARC X1=11.870711 Y1=3.729289 X2=11.870711 Y2=3.729289 XC=11.800000 YC=3.800000 R=0.100000 W=0.025000 L=1)
+}
+{NET=viatst
+  (VIA X=13 Y=1 P=roundpad)
+  (VIA X=13 Y=2 P=squarepad)
+  (VIA X=13 Y=3 P=oblongpad)
+  (VIA X=13 Y=4 P=nodrill)
+  (SEG X1=13 Y1=1 X2=13 Y2=2 W=0.1 L=1)
+  (SEG X1=13 Y1=2 X2=13 Y2=3 W=0.1 L=1)
+  (SEG X1=13 Y1=3 X2=13 Y2=4 W=0.1 L=1)
+}
+{NET=oldviatst
+  (VIA X=14 Y=1 D=0.2 L1=1 S1=ROUND S1X=0.5 S1Y=0.5)
+  (VIA X=14 Y=2 D=0.2 L1=1 L2=2 S1=RECT S1X=0.5 S1Y=0.5)
+  (VIA X=14 Y=3 D=0.2 L1=1 L2=2 S1=OBLONG S1X=0.5 S1Y=0.5)
+  (VIA X=14 Y=4 D=0.0 L1=1 L2=2 S1=ROUND S1X=0.5 S1Y=0.5)
+  (SEG X1=14 Y1=1 X2=14 Y2=2 W=0.1 L=1)
+  (SEG X1=14 Y1=2 X2=14 Y2=3 W=0.1 L=1)
+  (SEG X1=14 Y1=3 X2=14 Y2=4 W=0.1 L=1)
+}
+{NET=(pintst)
+  (PIN X=15 Y=1 R=U1.1 P=roundpad)
+  (PIN X=15 Y=2 R=U1.2 P=squarepad)
+  (PIN X=15 Y=3 R=U1.3 P=oblongpad)
+}
+{NET=(padtst)
+  (PAD X=16 Y=1 L=1 S=ROUND SX=0.5 SY=0.5)
+  (PAD X=16 Y=2 L=1 S=RECT SX=0.5 SY=0.5)
+  (PAD X=16 Y=3 L=1 S=OBLONG SX=0.5 SY=0.5)
+  (PAD X=17 Y=1 L=2 S=ROUND SX=0.5 SY=0.5)
+  (PAD X=17 Y=2 L=2 S=RECT SX=0.5 SY=0.5)
+  (PAD X=17 Y=3 L=2 S=OBLONG SX=0.5 SY=0.5)
+}
+{NET=(usegtst)
+  (USEG X1=18 Y1=1 L1=1 X2=19 Y2=1 L2=1 ZL=1 ZW=0.1 ZLEN=2 )
+  (USEG X1=18 Y1=2 L1=1 X2=19 Y2=2 L2=1 Z=50 D=1e-12 R=5 )
+  (USEG X1=18 Y1=3 L1=1 X2=19 Y2=3 L2=2 ZL=1 ZW=0.1 ZLEN=2 )
+  (USEG X1=18 Y1=4 L1=1 X2=19 Y2=4 L2=2 Z=50 D=1e-12 R=5 )
+}
+{NET=polylinetst
+  {POLYGON L=1 W=0.05 ID=1 X=5.875000 Y=4.875000)
+     (LINE X=6.125000 Y=4.875000)
+     (LINE X=6.125000 Y=5.125000)
+     (LINE X=5.875000 Y=5.125000)
+     (LINE X=5.875000 Y=4.875000)
+  }
+  {POLYLINE L=1 W=0.1 ID=1 X=6.000000 Y=5.000000
+    (LINE X=8.000000 Y=5.000000)
+    (CURVE X1=8.000000 Y1=5.000000 X2=8.000000 Y2=5.500000 XC=8.000000 YC=5.250000 R=0.250000)
+    (LINE X=6.000000 Y=5.500000)
+    (CURVE X1=6.000000 Y1=6.000000 X2=6.000000 Y2=5.500000 XC=6.000000 YC=5.750000 R=0.250000)
+    (LINE X=8.000000 Y=6.000000)
+    (CURVE X1=8.000000 Y1=6.000000 X2=8.000000 Y2=6.500000 XC=8.000000 YC=6.250000 R=0.250000)
+    (LINE X=6.000000 Y=6.500000)
+    (CURVE X1=6.000000 Y1=7.000000 X2=6.000000 Y2=6.500000 XC=6.000000 YC=6.750000 R=0.250000)
+    (LINE X=8.000000 Y=7.000000)
+    (CURVE X1=8.000000 Y1=7.000000 X2=8.000000 Y2=7.500000 XC=8.000000 YC=7.250000 R=0.250000)
+    (LINE X=6.000000 Y=7.500000)
+    (CURVE X1=6.000000 Y1=8.000000 X2=6.000000 Y2=7.500000 XC=6.000000 YC=7.750000 R=0.250000)
+    (LINE X=8.000000 Y=8.000000)
+    (CURVE X1=8.000000 Y1=8.000000 X2=8.000000 Y2=8.500000 XC=8.000000 YC=8.250000 R=0.250000)
+    (LINE X=6.000000 Y=8.500000)
+    (CURVE X1=6.000000 Y1=9.000000 X2=6.000000 Y2=8.500000 XC=6.000000 YC=8.750000 R=0.250000)
+  }
+}
+{NET=curvetst
+  {POLYGON L=1 W=0.05 ID=2 X=10.000000 Y=5.500000)
+     (CURVE X1=10.000000 Y1=5.500000 X2=10.000000 Y2=5.500000 XC=9.500000 YC=5.500000 R=0.500000 )
+  }
+  {POLYVOID ID=2 X=9.250000 Y=5.500000
+     (CURVE X1=9.250000 Y1=5.500000 X2=9.750000 Y2=5.500000 XC=9.500000 YC=5.500000 R=0.250000 )
+     (LINE X=9.250000 Y=5.500000)
+  }
+}
+{NET=linetst
+  {POLYGON L=1 W=0.05 ID=3 X=9.000000 Y=6.500000)
+     (LINE X=10.000000 Y=6.500000)
+     (LINE X=10.000000 Y=7.000000)
+     (LINE X=9.500000 Y=7.000000)
+     (LINE X=9.500000 Y=7.500000)
+     (LINE X=9.000000 Y=7.500000)
+     (LINE X=9.000000 Y=6.500000)
+  }
+  {POLYVOID ID=3 X=9.125000 Y=6.625000
+     (LINE X=9.625000 Y=6.625000)
+     (LINE X=9.625000 Y=6.875000)
+     (LINE X=9.375000 Y=6.875000)
+     (LINE X=9.375000 Y=7.125000)
+     (LINE X=9.125000 Y=7.125000)
+     (LINE X=9.125000 Y=6.625000)
+  }
+}
+{NET=poly_clearance_tst PS=0.05
+  (VIA X=11.750000 Y=5.250000 P=0802pad)
+  (VIA X=11.750000 Y=6.250000 P=0802pad)
+  (VIA X=11.750000 Y=7.250000 P=0802pad)
+  (SEG X1=11.000000 Y1=5.250000 X2=11.750000 Y2=5.250000 W=0.04 L=1)
+  (SEG X1=11.000000 Y1=6.250000 X2=11.750000 Y2=6.250000 W=0.04 L=1)
+  (SEG X1=11.000000 Y1=7.250000 X2=11.750000 Y2=7.250000 W=0.04 L=1)
+  (SEG X1=11.000000 Y1=5.250000 X2=11.000000 Y2=6.250000 W=0.04 L=1)
+  (SEG X1=11.000000 Y1=6.250000 X2=11.000000 Y2=7.250000 W=0.04 L=1)
+  {POLYGON L=1 T=POUR W=0.100000 ID=4 X=11.500000 Y=5.000000)
+     (LINE X=12.500000 Y=5.000000)
+     (LINE X=12.500000 Y=5.500000)
+     (LINE X=11.500000 Y=5.500000)
+     (LINE X=11.500000 Y=5.000000)
+  }
+  {POLYGON L=1 T=COPPER W=0.100000 ID=5 X=11.500000 Y=6.000000)
+     (LINE X=12.500000 Y=6.000000)
+     (LINE X=12.500000 Y=6.500000)
+     (LINE X=11.500000 Y=6.500000)
+     (LINE X=11.500000 Y=6.000000)
+  }
+  {POLYGON L=1 T=PLANE W=0.100000 ID=6 X=11.500000 Y=7.000000)
+     (LINE X=12.500000 Y=7.000000)
+     (LINE X=12.500000 Y=7.500000)
+     (LINE X=11.500000 Y=7.500000)
+     (LINE X=11.500000 Y=7.000000)
+  }
+}
+{NET=poly_clearance_tst2 PS=0.05
+  (VIA X=12.250000 Y=5.250000 P=0802pad)
+  (VIA X=12.250000 Y=6.250000 P=0802pad)
+  (VIA X=12.250000 Y=7.250000 P=0802pad)
+  (SEG X1=13.000000 Y1=5.250000 X2=12.250000 Y2=5.250000 W=0.04 L=1)
+  (SEG X1=13.000000 Y1=6.250000 X2=12.250000 Y2=6.250000 W=0.04 L=1)
+  (SEG X1=13.000000 Y1=7.250000 X2=12.250000 Y2=7.250000 W=0.04 L=1)
+  (SEG X1=13.000000 Y1=5.250000 X2=13.000000 Y2=6.250000 W=0.04 L=1)
+  (SEG X1=13.000000 Y1=6.250000 X2=13.000000 Y2=7.250000 W=0.04 L=1)
+}
+{NET=nesting_poly_1 PS=0
+  {POLYGON L=1 T=POUR W=0.000000 ID=7 X=14.000000 Y=5.000000)
+     (LINE X=16.000000 Y=5.000000)
+     (LINE X=16.000000 Y=7.000000)
+     (LINE X=14.000000 Y=7.000000)
+     (LINE X=14.000000 Y=5.000000)
+  }
+  {POLYVOID ID=7 X=14.250000 Y=5.250000
+     (LINE X=15.750000 Y=5.250000)
+     (LINE X=15.750000 Y=6.750000)
+     (LINE X=14.250000 Y=6.750000)
+     (LINE X=14.250000 Y=5.250000)
+  }
+}
+{NET=nesting_poly_2 PS=0
+  {POLYGON L=1 T=POUR W=0.000000 ID=8 X=14.500000 Y=5.500000)
+     (LINE X=15.500000 Y=5.500000)
+     (LINE X=15.500000 Y=6.500000)
+     (LINE X=14.500000 Y=6.500000)
+     (LINE X=14.500000 Y=5.500000)
+  }
+  {POLYVOID ID=8 X=14.750000 Y=5.750000
+     (LINE X=15.250000 Y=5.750000)
+     (LINE X=15.250000 Y=6.250000)
+     (LINE X=14.750000 Y=6.250000)
+     (LINE X=14.750000 Y=5.750000)
+  }
+}
+{END}
Index: tags/2.0.1/src_plugins/io_hyp/tests/test_read
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test_read	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test_read	(revision 18980)
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Read all hyperlynx test files and export as png.
+# Run from this directory. 
+# ./test_read
+#
+OUTDIR=/tmp
+for INFILE in test*/*.hyp
+do
+  LOGFILE=${OUTDIR}/`basename ${INFILE} .hyp`.log
+  PNGFILE=${OUTDIR}/`basename ${INFILE} .hyp`.png
+
+  ../../../src/pcb-rnd --gui batch  <<[EOD] > ${LOGFILE} 2>&1
+LoadhypFrom(${INFILE}, debug)
+Export(png, --outfile, ${PNGFILE}, --dpi, 300)
+[EOD]
+  ls -l ${LOGFILE} ${PNGFILE}
+done
+#not truncated

Property changes on: tags/2.0.1/src_plugins/io_hyp/tests/test_read
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/src_plugins/io_hyp/tests/test_write
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/tests/test_write	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/tests/test_write	(revision 18980)
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Read, write and readback hyperlynx file.
+# Run from io_hyp/tests directory. 
+# ./test_write
+#
+OUTDIR=/tmp
+INFILE=test00/test00.hyp
+OUTFILE=${OUTDIR}/`basename ${INFILE} .hyp`_2.hyp
+PNG1FILE=${OUTDIR}/`basename ${INFILE} .hyp`_1.png
+PNG2FILE=${OUTDIR}/`basename ${INFILE} .hyp`_2.png
+
+../../../src/pcb-rnd --gui batch  <<[EOD] >/dev/null 2>&1
+LoadhypFrom(${INFILE})
+Export(png, --outfile, ${PNG1FILE}, --dpi, 300)
+SaveTo(LayoutAs, ${OUTFILE}, hyperlynx)
+[EOD]
+../../../src/pcb-rnd --gui batch  <<[EOD] >/dev/null 2>&1
+LoadhypFrom(${OUTFILE})
+Export(png, --outfile, ${PNG2FILE}, --dpi, 300)
+[EOD]
+ls -l ${PNG1FILE} ${PNG2FILE}
+#not truncated

Property changes on: tags/2.0.1/src_plugins/io_hyp/tests/test_write
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/src_plugins/io_hyp/write.c
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/write.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/write.c	(revision 18980)
@@ -0,0 +1,562 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "write.h"
+
+#include "board.h"
+#include "data.h"
+#include "compat_misc.h"
+#include "polygon.h"
+#include "obj_subc_parent.h"
+#include "obj_pstk_inlines.h"
+#include "src_plugins/lib_netmap/netmap.h"
+#include <genht/htpi.h>
+#include <genht/hash.h>
+
+typedef struct hyp_wr_s {
+	pcb_board_t *pcb;
+	FILE *f;
+	const char *fn;
+
+	const char *ln_top, *ln_bottom;	/* "layer name" for top and bottom groups */
+	char *elem_name;
+	size_t elem_name_len;
+	pcb_cardinal_t poly_id;
+	htpi_t pstk_cache;
+	htpp_t grp_names;
+	long pstk_cache_next;
+	struct {
+		unsigned elliptic:1;
+	} warn;
+} hyp_wr_t;
+
+/* pcb-rnd y-axis points down; hyperlynx y-axis points up */
+static pcb_coord_t flip(pcb_coord_t y)
+{
+	return (PCB->MaxHeight - y);
+}
+
+static void hyp_grp_init(hyp_wr_t *wr)
+{
+	htpp_init(&wr->grp_names, ptrhash, ptrkeyeq);
+}
+
+static void hyp_grp_uninit(hyp_wr_t *wr)
+{
+	htpp_entry_t *e;
+	for (e = htpp_first(&wr->grp_names); e; e = htpp_next(&wr->grp_names, e))
+		free(e->value);
+	htpp_uninit(&wr->grp_names);
+}
+
+static const char *hyp_grp_name(hyp_wr_t *wr, pcb_layergrp_t *grp, const char *sugg_name)
+{
+	const char *name;
+	name = htpp_get(&wr->grp_names, grp);
+	if (name == NULL) {
+		int n, dup = 0;
+		name = sugg_name;
+		if (name == NULL)
+			name = grp->name;
+		for(n = 0; n < wr->pcb->LayerGroups.len; n++) {
+			pcb_layergrp_t *g = &wr->pcb->LayerGroups.grp[n];
+			if ((g != grp) && (strcmp(g->name, name) == 0)) {
+				dup = 1;
+				break;
+			}
+		}
+		if (dup)
+			name = pcb_strdup_printf("%s___%d", name, n);
+		else
+			name = pcb_strdup(name);
+		htpp_set(&wr->grp_names, grp, (char *)name);
+	}
+	return name;
+}
+
+static const char *safe_subc_name(hyp_wr_t *wr, pcb_subc_t *subc)
+{
+	const char *orig = subc->refdes;
+	char *s;
+	int len;
+
+	if (orig == NULL)
+		return orig;
+
+	if (strchr(orig, '.') == NULL)
+		return orig;
+
+	len = strlen(orig);
+	if (wr->elem_name_len < len) {
+		wr->elem_name = realloc(wr->elem_name, len + 1);
+		wr->elem_name_len = len;
+	}
+	memcpy(wr->elem_name, orig, len + 1);
+	for (s = wr->elem_name; *s != '\0'; s++)
+		if (*s == '.')
+			*s = '_';
+
+	return wr->elem_name;
+}
+
+static int write_hdr(hyp_wr_t * wr)
+{
+	char dt[128];
+
+	pcb_print_utc(dt, sizeof(dt), 0);
+
+	fprintf(wr->f, "* %s exported by pcb-rnd " PCB_VERSION " (" PCB_REVISION ") on %s\n", wr->pcb->Filename, dt);
+	fprintf(wr->f, "* Board: %s\n", wr->pcb->Name);
+	fprintf(wr->f, "{VERSION=2.0}\n");
+	fprintf(wr->f, "{DATA_MODE=DETAILED}\n");
+	fprintf(wr->f, "{UNITS=METRIC LENGTH}\n");
+	return 0;
+}
+
+static int write_foot(hyp_wr_t * wr)
+{
+	fprintf(wr->f, "{END}\n");
+	return 0;
+}
+
+static const char *get_layer_name(hyp_wr_t * wr, pcb_parenttype_t pt, pcb_layer_t * l)
+{
+	pcb_layergrp_id_t gid;
+	pcb_layergrp_t *g;
+
+	if (pt != PCB_PARENT_LAYER)
+		return NULL;
+
+	gid = pcb_layer_get_group_(l);
+	if (gid < 0)
+		return NULL;
+
+	g = pcb_get_layergrp(wr->pcb, gid);
+	return g->name;
+}
+
+static void write_pr_line(hyp_wr_t * wr, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_fprintf(wr->f, "  (PERIMETER_SEGMENT X1=%me Y1=%me X2=%me Y2=%me)\n", x1, flip(y1), x2, flip(y2));
+}
+
+static void hyp_pstk_init(hyp_wr_t *wr)
+{
+	htpi_init(&wr->pstk_cache, ptrhash, ptrkeyeq);
+	wr->pstk_cache_next = 1;
+}
+
+static void hyp_pstk_uninit(hyp_wr_t *wr)
+{
+	htpi_uninit(&wr->pstk_cache);
+}
+
+void hyp_pstk_shape(hyp_wr_t *wr, const char *lynam, const pcb_pstk_shape_t *shp)
+{
+	pcb_coord_t sx, sy, minx, miny, maxx, maxy;
+	int shnum = 0, n;
+#warning TODO: this ignores rotation
+	switch(shp->shape) {
+		case PCB_PSSH_CIRC:
+			sx = sy = shp->data.circ.dia;
+			shnum = 0;
+			break;
+		case PCB_PSSH_POLY:
+#warning TODO: check if it is a rectangle
+			minx = maxx = shp->data.poly.x[0];
+			miny = maxy = shp->data.poly.y[0];
+			for(n = 1; n < shp->data.poly.len; n++) {
+				if (shp->data.poly.x[n] < minx) minx = shp->data.poly.x[n];
+				if (shp->data.poly.y[n] < miny) miny = shp->data.poly.y[n];
+				if (shp->data.poly.x[n] > maxx) maxx = shp->data.poly.x[n];
+				if (shp->data.poly.y[n] > maxy) maxy = shp->data.poly.y[n];
+			}
+			sx = maxx - minx;
+			sy = maxy - miny;
+			shnum = 1;
+			break;
+		case PCB_PSSH_LINE:
+			sx = shp->data.line.x2 - shp->data.line.x1;
+			sy = shp->data.line.y2 - shp->data.line.y1;
+			if (sx < 0) sx = -sx;
+			if (sy < 0) sy = -sy;
+			if (shp->data.line.square)
+				shnum = 1;
+			else
+				shnum = 2;
+			break;
+	}
+	pcb_fprintf(wr->f, "	(%s, %d, %me, %me, 0)\n", lynam, shnum, sx, sy);
+}
+
+/* WARNING: not reentrant! */
+static const char *hyp_pstk_cache(hyp_wr_t *wr, pcb_pstk_proto_t *proto, int print)
+{
+	static char name[16];
+	long id;
+
+	id = htpi_get(&wr->pstk_cache, proto);
+	if (id == 0) { /* not found */
+		if (print) { /* auto-allocate */
+			id = wr->pstk_cache_next++;
+			htpi_set(&wr->pstk_cache, proto, id);
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "Internal error: unknown padstack prototype\n");
+	}
+
+	sprintf(name, "proto_%ld", id);
+	if (print) {
+		pcb_pstk_tshape_t *tshp = &proto->tr.array[0];
+		int n;
+
+		if (proto->hdia > 0)
+			pcb_fprintf(wr->f, "{PADSTACK=%s,%me\n", name, proto->hdia);
+		else
+			fprintf(wr->f, "{PADSTACK=%s\n", name);
+
+		for(n = 0; n < tshp->len; n++) {
+			pcb_pstk_shape_t *shp = &tshp->shape[n];
+			pcb_layer_type_t loc;
+			pcb_layer_id_t l;
+
+			if (!(shp->layer_mask & PCB_LYT_COPPER))
+				continue; /* hyp suppports copper only */
+
+			loc = (shp->layer_mask & PCB_LYT_ANYWHERE);
+			for(l = 0; l < wr->pcb->LayerGroups.len; l++) {
+				pcb_layergrp_t *lg = &wr->pcb->LayerGroups.grp[l];
+				pcb_layer_type_t lyt = lg->ltype;
+				if ((lyt & PCB_LYT_COPPER) && (lyt & loc))
+					hyp_pstk_shape(wr, hyp_grp_name(wr, lg, NULL), shp);
+			}
+		}
+
+		fprintf(wr->f, "}\n");
+	}
+	return name;
+}
+
+static void write_pstk(hyp_wr_t *wr, pcb_pstk_t *ps)
+{
+	pcb_subc_t *subc = pcb_gobj_parent_subc(ps->parent_type, &ps->parent);
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+
+	if ((subc != NULL) && (ps->term != NULL))
+		pcb_fprintf(wr->f, "  (PIN X=%me Y=%me R=\"%s.%s\" P=%[4])\n", ps->x, flip(ps->y), safe_subc_name(wr, subc), ps->term, hyp_pstk_cache(wr, proto, 0));
+	else
+		pcb_fprintf(wr->f, "  (VIA X=%me Y=%me P=%[4])\n", ps->x, flip(ps->y), hyp_pstk_cache(wr, proto, 0));
+}
+
+static void write_poly(hyp_wr_t * wr, pcb_poly_t * poly)
+{
+	pcb_pline_t *pl;
+	pcb_vnode_t *v;
+
+	if (poly->Clipped == NULL) {
+		pcb_layer_t *l = poly->parent.layer;
+		pcb_poly_init_clip(l->parent.data, l, poly);
+	}
+
+	if (poly->Clipped == NULL)
+		return;
+
+	pl = poly->Clipped->contours;
+	do {
+		v = pl->head.next;
+
+		if (pl == poly->Clipped->contours)
+			pcb_fprintf(wr->f, "  {POLYGON L=%[4] T=POUR W=0.0 ID=%d X=%me Y=%me\n",
+									get_layer_name(wr, poly->parent_type, poly->parent.layer), ++wr->poly_id, v->point[0], flip(v->point[1]));
+		else
+			/* hole. Use same ID as polygon. */
+			pcb_fprintf(wr->f, "  {POLYVOID ID=%d X=%me Y=%me\n", wr->poly_id, v->point[0], flip(v->point[1]));
+
+		for (v = v->next; v != pl->head.next; v = v->next)
+			pcb_fprintf(wr->f, "    (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1]));
+
+		v = pl->head.next;					/* repeat first point */
+		pcb_fprintf(wr->f, "    (LINE X=%me Y=%me)\n", v->point[0], flip(v->point[1]));
+
+		fprintf(wr->f, "  }\n");
+	} while ((pl = pl->next) != NULL);
+}
+
+
+static void write_line(hyp_wr_t * wr, pcb_line_t * line)
+{
+	pcb_fprintf(wr->f, "  (SEG X1=%me Y1=%me X2=%me Y2=%me W=%me L=%[4])\n",
+							line->Point1.X, flip(line->Point1.Y), line->Point2.X, flip(line->Point2.Y),
+							line->Thickness, get_layer_name(wr, line->parent_type, line->parent.layer));
+}
+
+static void write_arc_(hyp_wr_t * wr, const char *cmd, pcb_arc_t * arc, const char *layer)
+{
+	pcb_coord_t x1, y1, x2, y2;
+
+	if (arc->Width != arc->Height) {
+		if (!wr->warn.elliptic) {
+			pcb_message(PCB_MSG_WARNING, "Elliptic arcs are not supported - omitting all elliptic arcs\n");
+			wr->warn.elliptic = 1;
+		}
+		return;
+	}
+
+	if ((arc->Delta >= 0) == (layer == NULL)) {
+		pcb_arc_get_end(arc, 0, &x1, &y1);
+		pcb_arc_get_end(arc, 1, &x2, &y2);
+	}
+	else {
+		pcb_arc_get_end(arc, 1, &x1, &y1);
+		pcb_arc_get_end(arc, 0, &x2, &y2);
+	}
+
+	pcb_fprintf(wr->f, "(%s X1=%me Y1=%me X2=%me Y2=%me XC=%me YC=%me R=%me", cmd, x1, flip(y1), x2, flip(y2), arc->X,
+							flip(arc->Y), arc->Width);
+	if (layer != NULL)
+		pcb_fprintf(wr->f, " W=%me L=%[4]", arc->Thickness, layer);
+	fprintf(wr->f, ")\n");
+}
+
+static void write_pr_arc(hyp_wr_t * wr, pcb_arc_t * arc)
+{
+	fprintf(wr->f, "  ");
+	write_arc_(wr, "PERIMETER_ARC", arc, NULL);
+}
+
+static void write_arc(hyp_wr_t * wr, pcb_arc_t * arc)
+{
+	fprintf(wr->f, "  ");
+	write_arc_(wr, "ARC", arc, get_layer_name(wr, arc->parent_type, arc->parent.layer));
+}
+
+static int write_board(hyp_wr_t * wr)
+{
+	pcb_layer_id_t lid;
+
+	fprintf(wr->f, "{BOARD\n");
+
+	if ((pcb_layer_list(PCB, PCB_LYT_OUTLINE, &lid, 1) != 1) || (pcb_layer_is_pure_empty(&wr->pcb->Data->Layer[lid]))) {
+		/* implicit outline */
+		fprintf(wr->f, "* implicit outline derived from board width and height\n");
+		write_pr_line(wr, 0, 0, PCB->MaxWidth, 0);
+		write_pr_line(wr, 0, 0, 0, PCB->MaxHeight);
+		write_pr_line(wr, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);
+		write_pr_line(wr, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight);
+	}
+	else {
+		/* explicit outline */
+		pcb_layer_t *l = pcb_get_layer(PCB->Data, lid);
+		gdl_iterator_t it;
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+
+		linelist_foreach(&l->Line, &it, line) {
+			write_pr_line(wr, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+		}
+		arclist_foreach(&l->Arc, &it, arc) {
+			write_pr_arc(wr, arc);
+		}
+	}
+	fprintf(wr->f, "}\n");
+	return 0;
+}
+
+static int write_lstack(hyp_wr_t * wr)
+{
+	int n;
+
+	fprintf(wr->f, "{STACKUP\n");
+	for (n = 0; n < wr->pcb->LayerGroups.len; n++) {
+		pcb_layergrp_t *grp = &wr->pcb->LayerGroups.grp[n];
+		const char *name = grp->name;
+
+		if (grp->ltype & PCB_LYT_COPPER) {
+			pcb_fprintf(wr->f, "  (SIGNAL T=0.003500 L=%[4])\n", hyp_grp_name(wr, grp, name));
+			if (grp->ltype & PCB_LYT_TOP)
+				wr->ln_top = name;
+			else if (grp->ltype & PCB_LYT_BOTTOM)
+				wr->ln_bottom = name;
+		}
+		else if (grp->ltype & PCB_LYT_SUBSTRATE) {
+			char tmp[128];
+			if (name == NULL) {
+				sprintf(tmp, "dielectric layer %d", n);
+				name = tmp;
+			}
+			pcb_fprintf(wr->f, "  (DIELECTRIC T=0.160000 L=%[4])\n", hyp_grp_name(wr, grp, name));
+		}
+	}
+
+	fprintf(wr->f, "}\n");
+	return 0;
+}
+
+static int write_devices(hyp_wr_t * wr)
+{
+	gdl_iterator_t it;
+	pcb_subc_t *subc;
+	int cnt;
+
+	fprintf(wr->f, "{DEVICES\n");
+
+	cnt = 0;
+	subclist_foreach(&wr->pcb->Data->subc, &it, subc) {
+		const char *layer, *descr;
+		int on_bottom = 0;
+
+		pcb_subc_get_side(subc, &on_bottom);
+
+		if (on_bottom)
+			layer = wr->ln_bottom;
+		else
+			layer = wr->ln_top;
+		descr = subc->refdes;
+		if (descr == NULL)
+			descr = "?";
+
+		pcb_fprintf(wr->f, "  (? REF=%[4] NAME=%[4] L=%[4])\n", safe_subc_name(wr, subc), descr, layer);
+		cnt++;
+	}
+
+	if (cnt == 0)
+		pcb_message(PCB_MSG_WARNING,
+								"There is no element on the board - this limites the use of the resulting .hyp file, as it won't be able to connect to a simulation\n");
+
+	fprintf(wr->f, "}\n");
+	return 0;
+}
+
+static int write_pstk_protos(hyp_wr_t *wr, pcb_data_t *data)
+{
+	gdl_iterator_t it;
+	pcb_subc_t *subc;
+	pcb_cardinal_t n, end;
+
+	/* print the protos */
+	end = pcb_vtpadstack_proto_len(&data->ps_protos);
+	for(n = 0; n < end; n++)
+		hyp_pstk_cache(wr, &data->ps_protos.array[n], 1);
+
+	/* recurse on subcircuits */
+	subclist_foreach(&data->subc, &it, subc)
+		write_pstk_protos(wr, subc->data);
+
+	return 0;
+}
+
+static int write_nets(hyp_wr_t * wr)
+{
+	htpp_entry_t *e;
+	pcb_netmap_t map;
+
+	pcb_netmap_init(&map, wr->pcb);
+	for (e = htpp_first(&map.n2o); e != NULL; e = htpp_next(&map.n2o, e)) {
+		dyn_obj_t *o;
+		pcb_lib_menu_t *net = e->key;
+		pcb_fprintf(wr->f, "{NET=%[4]\n", net->Name + 2);
+		for (o = e->value; o != NULL; o = o->next) {
+			switch (o->obj->type) {
+			case PCB_OBJ_LINE:
+				write_line(wr, (pcb_line_t *) o->obj);
+				break;
+			case PCB_OBJ_ARC:
+				write_arc(wr, (pcb_arc_t *) o->obj);
+				break;
+			case PCB_OBJ_PSTK:
+				write_pstk(wr, (pcb_pstk_t *) o->obj);
+
+			case PCB_OBJ_POLY:
+				write_poly(wr, (pcb_poly_t *) o->obj);
+				break;
+
+			case PCB_OBJ_RAT:
+				break;									/* not yet done */
+
+			case PCB_OBJ_TEXT:
+			case PCB_OBJ_SUBC:
+			case PCB_OBJ_NET:
+			case PCB_OBJ_LAYER:
+			case PCB_OBJ_LAYERGRP:
+			case PCB_OBJ_VOID:
+				break;									/* silently ignore these */
+			}
+		}
+		fprintf(wr->f, "}\n");
+	}
+
+	pcb_netmap_uninit(&map);
+	return 0;
+}
+
+int io_hyp_write_pcb(pcb_plug_io_t * ctx, FILE * f, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	hyp_wr_t wr;
+
+	memset(&wr, 0, sizeof(wr));
+	wr.pcb = PCB;
+	wr.f = f;
+	wr.fn = new_filename;
+
+	hyp_pstk_init(&wr);
+	hyp_grp_init(&wr);
+
+	pcb_printf_slot[4] = "%{{\\}\\()\t\r\n \"=}mq";
+
+	if (write_hdr(&wr) != 0)
+		goto err;
+
+	if (write_board(&wr) != 0)
+		goto err;
+
+	if (write_lstack(&wr) != 0)
+		goto err;
+
+	if (write_devices(&wr) != 0)
+		goto err;
+
+	if (write_pstk_protos(&wr, wr.pcb->Data) != 0)
+		goto err;
+
+	if (write_nets(&wr) != 0)
+		goto err;
+
+	if (write_foot(&wr) != 0)
+		goto err;
+
+	hyp_pstk_uninit(&wr);
+	hyp_grp_uninit(&wr);
+	free(wr.elem_name);
+	return 0;
+
+err:;
+	hyp_pstk_uninit(&wr);
+	hyp_grp_uninit(&wr);
+	free(wr.elem_name);
+	return -1;
+}
Index: tags/2.0.1/src_plugins/io_hyp/write.h
===================================================================
--- tags/2.0.1/src_plugins/io_hyp/write.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_hyp/write.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include "pcb_bool.h"
+#include "plug_io.h"
+
+int io_hyp_write_pcb(pcb_plug_io_t * ctx, FILE * f, const char *old_filename, const char *new_filename, pcb_bool emergency);
Index: tags/2.0.1/src_plugins/io_kicad/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_kicad
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_kicad/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,16 @@
+put /local/pcb/mod {io_kicad}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/io_kicad/io_kicad.o
+ $(PLUGDIR)/io_kicad/write.o
+ $(PLUGDIR)/io_kicad/read.o
+ $(PLUGDIR)/io_kicad/read_net.o
+ $(PLUGDIR)/io_kicad/uniq_name.o
+@]
+#put /local/pcb/mod/YACC {$(PLUGDIR)/io_kicad/parse_y}
+#put /local/pcb/mod/LEX  {$(PLUGDIR)/io_kicad/parse_l}
+
+switch /local/pcb/io_kicad/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_kicad/TODO
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/TODO	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/TODO	(revision 18980)
@@ -0,0 +1,12 @@
+Must fix:
+- kicad_error() should always get the node that causes the error, not just copy&paste "subtree" which is some nth parent
+- no function shall be longer than 500 lines, but even 300 lines longs should be suspicious -> use functions
+- if you are more than 10 levels deep in indentation, you are doing it wrong -> use functions
+- No Code Duplication ever -> use functions
+- no camelCase, the only naming convention pcb-rnd accepts is lowercase_with_underscores
+- no commented out dead code liek /* return -1 */; the code must be readable; decide what the code should do and make it do that, and only that
+- do not silenlty accept input that could not be handled; the goal is not to open huge complex boards and load only 30% of them but to open boards that we can load almost 100% of
+- remove pcb_trace() after fixing a bug - all the old trace messages commented out will not help next time you need to debug something because you will need different messages, but they do make the code less readable
+
+Tips:
+- use context structures and pointers ("objects") and write functions that operate on them to help splitting up the code
Index: tags/2.0.1/src_plugins/io_kicad/hacking.txt
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/hacking.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/hacking.txt	(revision 18980)
@@ -0,0 +1,87 @@
+Parser
+~~~~~~
+io_kicad_read_pcb() is the main entry point for parsing a board. It loads
+the s-expression from the file and using gensexpr it parses it into a
+DOM (Document Object Model). Each node of the DOM is a gsxl_node_t, which
+has an ->str field for the text data of the node, a ->parent field pointing
+to the parent node, a ->children field pointing to the first child node and
+a ->next field pointing to the next sibling node (with the same parent).
+
+An expression like this:
+  (general
+    (links 0)
+    (no_connects 0)
+    (area 1 2 3 4)
+  ...
+  )
+
+becomes a subtree like this (levels of the tree is represented by
+indentation):
+
+ general
+  links
+   0
+  no_connects
+   0
+  area
+   1
+   2
+   3
+   4
+  ...
+
+So that general's ->children is links; links' ->next is no_connects;
+no_connects' ->next is area; area's ->next is NULL. In the kicad
+parser the terminology is that the root of a subtree is the _command_
+and its children are its _arguments_. E.g. when processing the
+area node, the command is "area" it's arguments are "1", "2", "3" and "4";
+when processing the "general" subtree, "area" is the 2nd argument (arguments
+are counted from 0).
+
+Once the tree is built in memory, a recursive tree walk is started by
+calling kicad_parse_pcb() on the root of the tree. This function should
+evaluate the children of the root node and call the corresponding subtree
+processor on each. All parser function should be passed the context:
+read_state_t *st. The context holds all relevant information about the
+session so we can avoid global variables (or static local variables) and
+can keep the code reentrant.
+
+Subtree processors have unified prototype: they get the context and the
+node pointer to the  0th argument of the command:
+
+static int kicad_parse_something(read_state_t *st, gsxl_node_t *args)
+
+If a subtree processor returns non-zero, the parsing shall stop and the
+caller function shall return non-zero immediately. This way we can undo
+the recursion and cancel parsing.
+
+There are two kind of subtree processors: static and dynamic. A static
+subtree processor expects a specific subtree of arguments. This means both
+the number and the exact order(!) of the subtrees are fixed. The processor
+for the "links" node in the above example has a static subtree processor
+because "links" will always have only one argument. Since there is a
+fixed amount of arguments, a static subtree processor uses the args->next
+or args->next->next or args->next->next->next, etc for accessing the 0th,
+1st or 2nd, etc arguments, respectively.
+
+A dynamic subtree processor has an unknown amount of arguments but the
+set of possible arguments are known - just their order and number are
+not. For example a "module" is a dynamic subtree because it may have 0 or
+more fp_line, pad, etc. children. A dynamic subtree processor needs to
+iterate through all its arguments using a loop; for each argument it needs
+to look at the ->str field of the argument to decide how to process
+that subtree (e.g. if it's an "fp_line" or a "pad").
+
+To ease this, function kicad_foreach_dispatch() is provided. It iterates
+over all the ->next fields of its "tree" argument and calls a function
+for them according to a dispatcher table passed. The dispatcher table has
+2 columns, node-name and function-to-call. kicad_parse_pcb() demonstrates
+how to set up a table. If the node "general" in the above example
+is to be processed this way, general's ->children is passed as tree to
+the kicad_foreach_dispatch, with a table that has a function for at least
+links, no_connects and area. Those functions will get links' ->children,
+no_connects' ->children and area's ->children as args respectively.
+
+
+How to batch-test the loader:
+echo 'LoadFrom(Layout, foo.kicad_pcb, kicad)'  | ./pcb-rnd --gui batch
Index: tags/2.0.1/src_plugins/io_kicad/io_kicad.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/io_kicad.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/io_kicad.c	(revision 18980)
@@ -0,0 +1,101 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  This module, io_kicad, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "write.h"
+#include "read.h"
+#include "read_net.h"
+#include "actions.h"
+
+static pcb_plug_io_t io_kicad;
+static const char *kicad_cookie = "kicad plugin";
+
+int io_kicad_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "kicad") != 0) ||
+		((typ & (~(PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER | PCB_IOT_PCB))) != 0))
+		return 0;
+
+	return 100;
+}
+
+pcb_action_t eeschema_action_list[] = {
+	{"LoadEeschemaFrom", pcb_act_LoadeeschemaFrom, pcb_acth_LoadeeschemaFrom, pcb_acts_LoadeeschemaFrom}
+};
+
+PCB_REGISTER_ACTIONS(eeschema_action_list, kicad_cookie)
+
+
+int pplg_check_ver_io_kicad(int ver_needed) { return 0; }
+
+void pplg_uninit_io_kicad(void)
+{
+	/* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */
+	pcb_remove_actions_by_cookie(kicad_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
+}
+
+#include "dolists.h"
+
+int pplg_init_io_kicad(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_kicad.plugin_data = NULL;
+	io_kicad.fmt_support_prio = io_kicad_fmt;
+	io_kicad.test_parse = io_kicad_test_parse;
+	io_kicad.parse_pcb = io_kicad_read_pcb;
+	io_kicad.parse_footprint = io_kicad_parse_element;
+	io_kicad.parse_font = NULL;
+	io_kicad.write_buffer = io_kicad_write_buffer;
+	io_kicad.write_footprint = io_kicad_write_element;
+	io_kicad.write_pcb = io_kicad_write_pcb;
+	io_kicad.default_fmt = "kicad";
+	io_kicad.description = "Kicad, s-expression";
+	io_kicad.save_preference_prio = 80;
+	io_kicad.default_extension = ".kicad_pcb";
+	io_kicad.fp_extension = ".kicad_mod";
+	io_kicad.mime_type = "application/x-kicad-pcb";
+
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
+
+	PCB_REGISTER_ACTIONS(eeschema_action_list, kicad_cookie);
+
+	/* TODO: Alloc plugin-globals here. */
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_kicad/io_kicad.pup
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/io_kicad.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/io_kicad.pup	(revision 18980)
@@ -0,0 +1,16 @@
+$class io
+$short Kicad's s-expr format
+$long Load and save the design and footprints in Kicad's s-expression format - this is the new, currently preferred format in Kicad.
+$state works
+$fmt-native no
+$fmt-feature-r kicad board, version 3, 4 and 20170123 (s-expr)
+$fmt-feature-w kicad board, version 3 (s-expr)
+$fmt-feature-w kicad module (s-expr, according to version 3)
+$fmt-feature-r eeschema netlist and footprint info
+$package io-alien
+default buildin
+
+# for the uniq name lib:
+dep lib_gensexpr
+
+autoload 1
Index: tags/2.0.1/src_plugins/io_kicad/read.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/read.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/read.c	(revision 18980)
@@ -0,0 +1,2769 @@
+/*
+ *			COPYRIGHT
+ *
+ *	pcb-rnd, interactive printed circuit board design
+ *	Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *	Copyright (C) 2016, 2017 Erich S. Heinzle
+ *	Copyright (C) 2017 Miloh
+ *
+ *	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 2 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, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include <assert.h>
+#include <math.h>
+#include <gensexpr/gsxl.h>
+#include <genht/htsi.h>
+#include "compat_misc.h"
+#include "config.h"
+#include "board.h"
+#include "plug_io.h"
+#include "error.h"
+#include "data.h"
+#include "read.h"
+#include "layer.h"
+#include "netlist.h"
+#include "polygon.h"
+#include "plug_footprint.h"
+#include "misc_util.h" /* for distance calculations */
+#include "conf_core.h"
+#include "move.h"
+#include "macro.h"
+#include "rotate.h"
+#include "safe_fs.h"
+#include "attrib.h"
+
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+#include "../src_plugins/lib_compat_help/subc_help.h"
+
+typedef struct {
+	pcb_board_t *pcb;
+	pcb_data_t *fp_data;
+	const char *Filename;
+	conf_role_t settings_dest;
+	gsxl_dom_t dom;
+	unsigned auto_layers:1;
+	htsi_t layer_k2i; /* layer name-to-index hash; name is the kicad name, index is the pcb-rnd layer index */
+} read_state_t;
+
+typedef struct {
+	const char *node_name;
+	int (*parser) (read_state_t *st, gsxl_node_t *subtree);
+} dispatch_t;
+
+static int kicad_error(gsxl_node_t *subtree, char *fmt, ...)
+{
+	gds_t str;
+	va_list ap;
+
+
+	gds_init(&str);
+	pcb_append_printf(&str, "io_kicad parse error at %d.%d: ", subtree->line, subtree->col);
+
+	va_start(ap, fmt);
+	pcb_append_vprintf(&str, fmt, ap);
+	va_end(ap);
+
+	gds_append(&str, '\n');
+
+	pcb_message(PCB_MSG_ERROR, "%s", str.array);
+
+	gds_uninit(&str);
+	return -1;
+}
+
+static int kicad_warning(gsxl_node_t *subtree, char *fmt, ...)
+{
+	gds_t str;
+	va_list ap;
+
+	gds_init(&str);
+	pcb_append_printf(&str, "io_kicad warning at %d.%d: ", subtree->line, subtree->col);
+
+	va_start(ap, fmt);
+	pcb_append_vprintf(&str, fmt, ap);
+	va_end(ap);
+
+	gds_append(&str, '\n');
+
+	pcb_message(PCB_MSG_WARNING, "%s", str.array);
+
+	gds_uninit(&str);
+	return 0;
+}
+
+
+
+/* Search the dispatcher table for subtree->str, execute the parser on match
+   with the children ("parameters") of the subtree */
+static int kicad_dispatch(read_state_t *st, gsxl_node_t *subtree, const dispatch_t *disp_table)
+{
+	const dispatch_t *d;
+
+	/* do not tolerate empty/NIL node */
+	if (subtree->str == NULL)
+		return kicad_error(subtree, "unexpected empty/NIL subtree");
+
+	for(d = disp_table; d->node_name != NULL; d++)
+		if (strcmp(d->node_name, subtree->str) == 0)
+			return d->parser(st, subtree->children);
+
+	/* node name not found in the dispatcher table */
+	return kicad_error(subtree, "Unknown node: '%s'", subtree->str);
+}
+
+/* Take each children of tree and execute them using kicad_dispatch
+   Useful for procssing nodes that may host various subtrees of different
+   nodes ina  flexible way. Return non-zero if any subtree processor failed. */
+static int kicad_foreach_dispatch(read_state_t *st, gsxl_node_t *tree, const dispatch_t *disp_table)
+{
+	gsxl_node_t *n;
+
+	for(n = tree; n != NULL; n = n->next)
+		if (kicad_dispatch(st, n, disp_table) != 0)
+			return -1;
+
+	return 0; /* success */
+}
+
+/* No-op: ignore the subtree */
+static int kicad_parse_nop(read_state_t *st, gsxl_node_t *subtree)
+{
+	return 0;
+}
+
+/* kicad_pcb/version */
+static int kicad_parse_version(read_state_t *st, gsxl_node_t *subtree)
+{
+	if (subtree->str != NULL) {
+		int ver = atoi(subtree->str);
+		printf("kicad version: '%s' == %d\n", subtree->str, ver);
+		if (ver == 3 || ver == 4 || ver == 20170123)
+			return 0;
+	}
+	return kicad_error(subtree, "unexpected layout version");
+}
+
+static int kicad_parse_layer_definitions(read_state_t *st, gsxl_node_t *subtree); /* for layout layer definitions */
+static int kicad_parse_net(read_state_t *st, gsxl_node_t *subtree); /* describes netlists for the layout */
+static int kicad_get_layeridx(read_state_t *st, const char *kicad_name);
+
+#define SEEN_NO_DUP(bucket, bit) \
+do { \
+	int __mask__ = (1<<(bit)); \
+	if ((bucket) & __mask__) \
+		return -1; \
+	bucket |= __mask__; \
+} while(0)
+
+#define SEEN(bucket, bit) \
+do { \
+	int __mask__ = (1<<(bit)); \
+	bucket |= __mask__; \
+} while(0)
+
+#define BV(bit) (1<<(bit))
+
+
+/* kicad_pcb/parse_page */
+static int kicad_parse_page_size(read_state_t *st, gsxl_node_t *subtree)
+{
+#warning TODO: size can be determined by kicad_pcb/general/area - when that is present, prefer that over the page size (see via1.kicad_pcb)
+	if (subtree != NULL && subtree->str != NULL) {
+		if (strcmp("A4", subtree->str) == 0) {
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(297.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(210.0);
+		}
+		else if (strcmp("A3", subtree->str) == 0) {
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(420.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(297.0);
+		}
+		else if (strcmp("A2", subtree->str) == 0) {
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(594.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(420.0);
+		}
+		else if (strcmp("A1", subtree->str) == 0) {
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(841.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(594.0);
+		}
+		else if (strcmp("A0", subtree->str) == 0) {
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(1189.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(841.0);
+		}
+		else { /* default to A0 */
+			st->pcb->MaxWidth = PCB_MM_TO_COORD(1189.0);
+			st->pcb->MaxHeight = PCB_MM_TO_COORD(841.0);
+			pcb_message(PCB_MSG_ERROR, "\tUnable to determine layout size. Defaulting to A0 layout size.\n");
+		}
+		return 0;
+	}
+	return kicad_error(subtree, "error parsing KiCad layout size.");
+}
+
+/* kicad_pcb/parse_title_block */
+static int kicad_parse_title_block(read_state_t *st, gsxl_node_t *subtree)
+{
+
+	gsxl_node_t *n;
+	const char *prefix = "kicad_titleblock_";
+	char *name;
+	if (subtree->str != NULL) {
+		name = pcb_concat(prefix, subtree->str, NULL);
+		pcb_attrib_put(st->pcb, name, subtree->children->str);
+		free(name);
+		for(n = subtree->next; n != NULL; n = n->next) {
+			if (n->str != NULL && strcmp("comment", n->str) != 0) {
+				name = pcb_concat(prefix, n->str, NULL);
+				pcb_attrib_put(st->pcb, name, n->children->str);
+				free(name);
+			}
+			else { /* if comment field has extra children args */
+				name = pcb_concat(prefix, n->str, "_", n->children->str, NULL);
+				pcb_attrib_put(st->pcb, name, n->children->next->str);
+				free(name);
+			}
+		}
+		return 0;
+	}
+	return kicad_error(subtree, "error parsing KiCad titleblock.");
+}
+
+/* kicad_pcb/gr_text */
+static int kicad_parse_gr_text(read_state_t *st, gsxl_node_t *subtree)
+{
+
+	gsxl_node_t *l, *n, *m;
+	int i;
+	unsigned long tally = 0, required;
+
+	char *end, *text;
+	double val;
+	pcb_coord_t X, Y;
+	int scaling = 100;
+	int textLength = 0;
+	int mirrored = 0;
+	double glyphWidth = 1.27; /* a reasonable approximation of pcb glyph width, ~=  5000 centimils */
+	unsigned direction = 0; /* default is horizontal */
+	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
+	int PCBLayer = 0; /* sane default value */
+
+	if (subtree->str != NULL) {
+		text = subtree->str;
+		for(i = 0; text[i] != 0; i++) {
+			textLength++;
+		}
+		for(n = subtree, i = 0; n != NULL; n = n->next, i++) {
+			if (n->str != NULL && strcmp("at", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_text X1");
+					}
+					else {
+						X = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_text X1 node");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_text Y1");
+					}
+					else {
+						Y = PCB_MM_TO_COORD(val);
+					}
+					if (n->children->next->next != NULL && n->children->next->next->str != NULL) {
+						val = strtod(n->children->next->next->str, &end);
+						if (*end != 0) {
+							return kicad_error(subtree, "error parsing gr_text rotation");
+						}
+						else {
+							direction = 0; /* default */
+							if (val > 45.0 && val <= 135.0) {
+								direction = 1;
+							}
+							else if (val > 135.0 && val <= 225.0) {
+								direction = 2;
+							}
+							else if (val > 225.0 && val <= 315.0) {
+								direction = 3;
+							}
+						}
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_text Y1 node");
+				}
+			}
+			else if (n->str != NULL && strcmp("layer", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					if (PCBLayer < 0) {
+						return kicad_error(subtree, "unexpected gr_text layer def < 0");
+					}
+					else if (pcb_layer_flags(PCB, PCBLayer) & PCB_LYT_BOTTOM) {
+						Flags = pcb_flag_make(PCB_FLAG_ONSOLDER);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_text layer node");
+				}
+			}
+			else if (n->str != NULL && strcmp("hide", n->str) == 0) {
+#warning TODO
+			}
+			else if (n->str != NULL && strcmp("effects", n->str) == 0) {
+				for(m = n->children; m != NULL; m = m->next) {
+					if (m->str != NULL && strcmp("font", m->str) == 0) {
+						for(l = m->children; l != NULL; l = l->next) {
+							if (m->str != NULL && strcmp("size", l->str) == 0) {
+								SEEN_NO_DUP(tally, 2);
+								if (l->children != NULL && l->children->str != NULL) {
+									val = strtod(l->children->str, &end);
+									if (*end != 0) {
+										return kicad_error(subtree, "error parsing gr_text size X");
+									}
+									else {
+										scaling = (int)(100 * val / 1.27); /* standard glyph width ~= 1.27mm */
+									}
+								}
+								else {
+									return kicad_error(subtree, "unexpected empty/NULL gr_text font size X node");
+								}
+								if (l->children->next != NULL && l->children->next->str != NULL) {
+									/*pcb_trace("\tfont sizeY: '%s'\n", (l->children->next->str)); */
+								}
+								else {
+									return kicad_error(subtree, "unexpected empty/NULL gr_text font size Y node");
+								}
+							}
+							else if (strcmp("thickness", l->str) == 0) {
+								SEEN_NO_DUP(tally, 3);
+								if (l->children != NULL && l->children->str != NULL) {
+									/*pcb_trace("\tfont thickness: '%s'\n", (l->children->str)); */
+								}
+								else {
+									return kicad_error(subtree, "unexpected empty/NULL gr_text font thickness node");
+								}
+							}
+						}
+					}
+					else if (m->str != NULL && strcmp("justify", m->str) == 0) {
+						/* SEEN_NO_DUP(tally, 4); */
+						if (m->children != NULL && m->children->str != NULL) {
+							if (strcmp("mirror", m->children->str) == 0) {
+								mirrored = 1;
+								SEEN_NO_DUP(tally, 4);
+							}
+							/* ignore right or left justification for now */
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL gr_text justify node");
+						}
+					}
+					else {
+						if (m->str != NULL) {
+							/*pcb_trace("Unknown effects argument %s:", m->str); */
+						}
+						return kicad_error(subtree, "unexpected empty/NULL gr_text effects node");
+					}
+				}
+			}
+		}
+	}
+	required = BV(0) | BV(1) | BV(2) | BV(3);
+	if ((tally & required) == required) { /* has location, layer, size and stroke thickness at a minimum */
+#warning TODO: this will never be NULL; what are we trying to check here?
+		if (&st->pcb->fontkit.dflt == NULL) {
+			pcb_font_create_default(st->pcb);
+		}
+
+		if (mirrored != 0) {
+			if (direction % 2 == 0) {
+				direction += 2;
+				direction = direction % 4;
+			}
+			if (direction == 0) {
+				X -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				Y += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 1) {
+				Y -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				X -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 2) {
+				X += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				Y -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 3) {
+				Y += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				X += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+		}
+		else { /* not back of board text */
+			if (direction == 0) {
+				X -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				Y -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 1) {
+				Y += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				X -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 2) {
+				X += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				Y += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+			else if (direction == 3) {
+				Y -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+				X += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+			}
+		}
+
+		pcb_text_new(&st->pcb->Data->Layer[PCBLayer], pcb_font(st->pcb, 0, 1), X, Y, direction, scaling, text, Flags);
+		return 0; /* create new font */
+	}
+	return kicad_error(subtree, "failed to create gr_text element");
+}
+
+/* kicad_pcb/gr_line */
+static int kicad_parse_gr_line(read_state_t *st, gsxl_node_t *subtree)
+{
+	gsxl_node_t *n;
+	unsigned long tally = 0, required;
+
+	char *end;
+	double val;
+	pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance; /* not sure what to do with mask */
+	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
+	int PCBLayer = 0; /* sane default value */
+
+	Clearance = Thickness = 1; /* start with sane default of one nanometre */
+
+	if (subtree->str != NULL) {
+		for(n = subtree; n != NULL; n = n->next) {
+			if (n->str != NULL && strcmp("start", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_line X1");
+					}
+					else {
+						X1 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "null/missing node gr_line X1 coord");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_line Y1");
+					}
+					else {
+						Y1 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "null/missing node gr_line Y1 coord");
+				}
+			}
+			else if (n->str != NULL && strcmp("end", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_line X2");
+					}
+					else {
+						X2 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "null/missing node gr_line X2 coord");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_line Y2");
+					}
+					else {
+						Y2 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "null/missing node gr_line Y2 coord");
+				}
+			}
+			else if (n->str != NULL && strcmp("layer", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					if (PCBLayer < 0) {
+						/*pcb_trace("unsupported gr_line layer ignored.\n"); */
+						return 0;
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_line layer.");
+				}
+			}
+			else if (n->str != NULL && strcmp("width", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tgr_line width: '%s'\n", (n->children->str)); */
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing gr_line width");
+					}
+					else {
+						Thickness = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_line width.");
+				}
+			}
+			else if (n->str != NULL && strcmp("angle", n->str) == 0) { /* unlikely to be used or seen */
+				SEEN_NO_DUP(tally, 4);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tgr_line angle: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_line angle.");
+				}
+			}
+			else if (n->str != NULL && strcmp("net", n->str) == 0) { /* unlikely to be used or seen */
+				SEEN_NO_DUP(tally, 5);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tgr_line net: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_line net.");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) {
+				/*pcb_trace("\tgr_line tstamp: '%s'\n", (n->children->str)); */
+				/* ignore */
+			}
+			else {
+				if (n->str != NULL) {
+					/*pcb_trace("Unknown gr_line argument %s:", n->str); */
+				}
+				return kicad_error(subtree, "unexpected empty/NULL gr_line node.");
+			}
+		}
+	}
+	required = BV(0) | BV(1) | BV(2); /* | BV(3); now have 1nm default width, i.e. for edge cut */
+	if ((tally & required) == required) { /* need start, end, layer, thickness at a minimum */
+		pcb_line_new(&st->pcb->Data->Layer[PCBLayer], X1, Y1, X2, Y2, Thickness, Clearance, Flags);
+		/*pcb_trace("\tnew gr_line on layer created\n"); */
+		return 0;
+	}
+	else {
+		/*pcb_trace("\tignoring malformed gr_line definition \n"); */
+		return 0;
+	}
+}
+
+/* kicad_pcb/gr_arc     can also parse gr_cicle*/
+static int kicad_parse_gr_arc(read_state_t *st, gsxl_node_t *subtree)
+{
+	gsxl_node_t *n;
+	unsigned long tally = 0, required;
+
+	char *end;
+	double val;
+	pcb_coord_t centreX, centreY, endX, endY, width, height, Thickness, Clearance, deltaX, deltaY;
+	pcb_angle_t startAngle = 0.0;
+	pcb_angle_t endAngle = 0.0;
+	pcb_angle_t delta = 360.0; /* these defaults allow a gr_circle to be parsed, which does not specify (angle XXX) */
+	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
+	int PCBLayer = 0; /* sane default value */
+
+	Clearance = Thickness = PCB_MM_TO_COORD(0.250); /* start with sane defaults */
+
+	if (subtree->str != NULL) {
+		for(n = subtree; n != NULL; n = n->next) {
+			if (n->str != NULL && strcmp("start", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc X1 parse error.");
+					}
+					else {
+						centreX = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc X1.");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc Y1 parse error.");
+					}
+					else {
+						centreY = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc Y1.");
+				}
+			}
+			else if (n->str != NULL && strcmp("center", n->str) == 0) { /* this lets us parse a circle too */
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc centre X parse error.");
+					}
+					else {
+						centreX = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc centre X.");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc centre Y parse error.");
+					}
+					else {
+						centreY = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc centre Y.");
+				}
+			}
+			else if (n->str != NULL && strcmp("end", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc end X parse error.");
+					}
+					else {
+						endX = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc end X.");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc end Y parse error.");
+					}
+					else {
+						endY = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc end Y.");
+				}
+			}
+			else if (n->str != NULL && strcmp("layer", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					if (PCBLayer < 0) {
+						return kicad_warning(subtree, "gr_arc: \"%s\" not found", n->children->str);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc layer.");
+				}
+			}
+			else if (n->str != NULL && strcmp("width", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc width parse error.");
+					}
+					else {
+						Thickness = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc width.");
+				}
+			}
+			else if (n->str != NULL && strcmp("angle", n->str) == 0) {
+				if (n->children != NULL && n->children->str != NULL) {
+					SEEN_NO_DUP(tally, 4);
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "gr_arc angle parse error.");
+					}
+					else {
+						delta = val;
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc angle.");
+				}
+			}
+			else if (n->str != NULL && strcmp("net", n->str) == 0) { /* unlikely to be used or seen */
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tgr_arc net: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL gr_arc net.");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) {
+				/*pcb_trace("\tgr_arc tstamp: '%s'\n", (n->children->str)); */
+				/* ignore */
+			}
+			else {
+				if (n->str != NULL) {
+					/*pcb_trace("Unknown gr_arc argument %s:", n->str); */
+				}
+				return kicad_error(subtree, "unexpected empty/NULL gr_arc node.");
+			}
+		}
+	}
+	required = BV(0) | BV(1) | BV(2) | BV(3); /* | BV(4); not needed for circles */
+	if ((tally & required) == required) { /* need start, end, layer, thickness at a minimum */
+		width = height = pcb_distance(centreX, centreY, endX, endY); /* calculate radius of arc */
+		deltaX = endX - centreX;
+		deltaY = endY - centreY;
+		if (width < 1) { /* degenerate case */
+			startAngle = 0;
+		}
+		else {
+			endAngle = 180 + 180 * atan2(-deltaY, deltaX) / M_PI;
+			/* avoid using atan2 with zero parameters */
+
+			if (endAngle < 0.0) {
+				endAngle += 360.0; /*make it 0...360 */
+			}
+			startAngle = (endAngle - delta); /* geda is 180 degrees out of phase with kicad, and opposite direction rotation */
+			if (startAngle > 360.0) {
+				startAngle -= 360.0;
+			}
+			if (startAngle < 0.0) {
+				startAngle += 360.0;
+			}
+		}
+		pcb_arc_new(&st->pcb->Data->Layer[PCBLayer], centreX, centreY, width, height, startAngle, delta, Thickness, Clearance, Flags, pcb_true);
+		return 0;
+	}
+	return kicad_error(subtree, "unexpected empty/NULL node in gr_arc.");
+}
+
+/* kicad_pcb/via */
+static int kicad_parse_via(read_state_t *st, gsxl_node_t *subtree)
+{
+	gsxl_node_t *m, *n;
+	unsigned long tally = 0, required;
+
+	char *end, *name; /* not using via name for now */
+	double val;
+	pcb_coord_t X, Y, Thickness, Clearance, Mask, Drill; /* not sure what to do with mask */
+/*	int PCBLayer = 0;   not used for now; no blind or buried vias currently in pcb-rnd */
+
+	Clearance = Mask = PCB_MM_TO_COORD(0.250); /* start with something bland here */
+	Drill = PCB_MM_TO_COORD(0.300); /* start with something sane */
+	name = "";
+
+	if (subtree->str != NULL) {
+		for(n = subtree; n != NULL; n = n->next) {
+			if (n->str != NULL && strcmp("at", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing via X");
+					}
+					else {
+						X = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via X node");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing via Y");
+					}
+					else {
+						Y = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via Y node");
+				}
+			}
+			else if (n->str != NULL && strcmp("size", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing via size");
+					}
+					else {
+						Thickness = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via size node");
+				}
+			}
+			else if (n->str != NULL && strcmp("layers", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				for(m = n->children; m != NULL; m = m->next) {
+					if (m->str != NULL) {
+/*							PCBLayer = kicad_get_layeridx(st, m->str);
+ *							if (PCBLayer < 0) {
+ *								return -1;
+ *							}   via layers not currently used... padstacks
+ */
+					}
+					else {
+						return kicad_error(subtree, "unexpected empty/NULL via layer node");
+					}
+				}
+			}
+			else if (n->str != NULL && strcmp("net", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tvia segment net: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via net node");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) {
+				SEEN_NO_DUP(tally, 4);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tvia tstamp: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via tstamp node");
+				}
+			}
+			else if (n->str != NULL && strcmp("drill", n->str) == 0) {
+				SEEN_NO_DUP(tally, 5);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing via drill");
+					}
+					else {
+						Drill = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL via drill node");
+				}
+			}
+			else {
+				if (n->str != NULL) {
+					/*pcb_trace("Unknown via argument %s:", n->str); */
+				}
+				return kicad_error(subtree, "unexpected empty/NULL via argument node");
+			}
+		}
+	}
+	required = BV(0) | BV(1);
+	if ((tally & required) == required) { /* need start, end, layer, thickness at a minimum */
+		if (pcb_pstk_new_compat_via(st->pcb->Data, X, Y, Drill, Thickness, Clearance, Mask, PCB_PSTK_COMPAT_ROUND, pcb_true) == NULL)
+			return kicad_error(subtree, "failed to create via-padstack");
+		return 0;
+	}
+	return -1;
+}
+
+/* kicad_pcb/segment */
+static int kicad_parse_segment(read_state_t *st, gsxl_node_t *subtree)
+{
+
+	gsxl_node_t *n;
+	unsigned long tally = 0, required;
+
+	char *end;
+	double val;
+	pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance;
+	pcb_flag_t Flags = pcb_flag_make(PCB_FLAG_CLEARLINE); /* we try clearline flag here */
+	int PCBLayer = 0; /* sane default value */
+
+	Clearance = PCB_MM_TO_COORD(0.250); /* start with something bland here */
+
+	if (subtree->str != NULL) {
+		for(n = subtree; n != NULL; n = n->next) {
+#warning TODO: it is enough to test n->str == NULL only once, and do a "continue"
+#warning TODO: none of the kicad_errors() here should refer to subtree - they should use n or even n->children
+			if (n->str != NULL && strcmp("start", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing segment X1");
+					}
+					else {
+						X1 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment X1 node");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing segment Y1");
+					}
+					else {
+						Y1 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment Y1 node");
+				}
+			}
+			else if (n->str != NULL && strcmp("end", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing segment X2");
+					}
+					else {
+						X2 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment X2 node");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing segment Y2");
+					}
+					else {
+						Y2 = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment Y2 node");
+				}
+			}
+			else if (n->str != NULL && strcmp("layer", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					if (PCBLayer < 0) {
+						return kicad_warning(subtree, "error parsing segment layer");
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment layer node");
+				}
+			}
+			else if (n->str != NULL && strcmp("width", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing segment width");
+					}
+					else {
+						Thickness = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment width node");
+				}
+			}
+			else if (n->str != NULL && strcmp("net", n->str) == 0) {
+				SEEN_NO_DUP(tally, 4);
+				if (n->children != NULL && n->children->str != NULL) {
+					SEEN_NO_DUP(tally, 11);
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment net node");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) { /* not likely to be used */
+				SEEN_NO_DUP(tally, 5);
+				if (n->children != NULL && n->children->str != NULL) {
+					SEEN_NO_DUP(tally, 13);
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL segment tstamp node");
+				}
+			}
+			else if (n->str != NULL && strcmp("status", n->str) == 0) {
+#warning TODO: process this
+			}
+			else
+				return kicad_error(n, "unexpected empty/NULL segment argument node: '%s'", n->str);
+		}
+	}
+	required = BV(0) | BV(1) | BV(2) | BV(3);
+	if ((tally & required) == required) { /* need start, end, layer, thickness at a minimum */
+		pcb_line_new(&st->pcb->Data->Layer[PCBLayer], X1, Y1, X2, Y2, Thickness, Clearance, Flags);
+		return 0;
+	}
+	return kicad_error(subtree, "failed to create segment on layout");
+}
+
+/* Parse a layer definition and do all the administration needed for the layer */
+static int kicad_create_layer(read_state_t *st, int lnum, const char *lname, const char *ltype, gsxl_node_t *subtree)
+{
+	pcb_layer_id_t id = -1;
+	pcb_layergrp_id_t gid = -1;
+#warning TODO: we should not depend on layer IDs other than 0
+	switch (lnum) {
+		case 0:
+		case 15:
+		case 31:
+			if (strcmp(lname+1, ".Cu") != 0)
+				return kicad_error(subtree, "layer 0 and 15/31 must be F.Cu and B.Cu (.Cu mismatch)");
+			if ((lname[0] != 'F') && (lname[0] != 'B'))
+				return kicad_error(subtree, "layer 0 and 15/31 must be F.Cu and B.Cu (F or B mismatch)");
+			pcb_layergrp_list(st->pcb, PCB_LYT_COPPER | ((lname[0] == 'B') ? PCB_LYT_BOTTOM : PCB_LYT_TOP), &gid, 1);
+			id = pcb_layer_create(st->pcb, gid, lname);
+/*printf("------------------------------ layer=%s\n", lname);
+pcb_actionl("dumpcsect", NULL);*/
+			break;
+		default:
+			if (strcmp(lname, "Edge.Cuts") == 0) {
+				/* Edge must be the outline */
+				pcb_layergrp_t *g = pcb_get_grp_new_intern(PCB, -1);
+				pcb_layergrp_fix_turn_to_outline(g);
+				id = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, lname);
+			}
+			else if ((strcmp(ltype, "signal") == 0) || (strcmp(ltype, "power") == 0) || (strncmp(lname, "Dwgs.", 4) == 0) || (strncmp(lname, "Cmts.", 4) == 0) || (strncmp(lname, "Eco", 3) == 0)) {
+				/* Create a new inner layer for signals and for emulating misc layers */
+				pcb_layergrp_t *g = pcb_get_grp_new_intern(PCB, -1);
+				id = pcb_layer_create(st->pcb, g - st->pcb->LayerGroups.grp, lname);
+			}
+			else if ((lname[1] == '.') && ((lname[0] == 'F') || (lname[0] == 'B'))) {
+				/* F. or B. layers */
+#warning TODO: update this: we have explicit silk, paste and mask now
+				if (strcmp(lname + 2, "SilkS") == 0)
+					return 0; /* silk layers are implicit */
+#if 0
+				if (strcmp(lname + 2, "Adhes") == 0)
+					return 0; /* pcb-rnd has no adhesive support */
+				if (strcmp(lname + 2, "Paste") == 0)
+					return 0; /* pcb-rnd has no custom paste support */
+				if (strcmp(lname + 2, "Mask") == 0)
+					return 0; /* pcb-rnd has no custom mask support */
+				return kicad_error(subtree, "unknown F. or B. layer error"); /* unknown F. or B. layer -> error */
+#endif
+				goto hack1;
+			}
+			else if (lnum > 15) {
+			hack1:;
+				/* HACK/WORKAROUND: remember kicad layers for those that are unsupported */
+				htsi_set(&st->layer_k2i, pcb_strdup(lname), -lnum);
+				return 0;
+			}
+			else
+				return -1; /* unknown field */
+	}
+
+/* valid layer, save it in the hash */
+	if (id >= 0) {
+		htsi_set(&st->layer_k2i, pcb_strdup(lname), id);
+	}
+	else {
+		assert(id < -1);
+	}
+	return 0;
+}
+
+/* Register a kicad layer in the layer hash after looking up the pcb-rnd equivalent */
+static unsigned int kicad_reg_layer(read_state_t *st, const char *kicad_name, unsigned int mask)
+{
+	pcb_layer_id_t id;
+	if (st->pcb != NULL) {
+		if (pcb_layer_list(st->pcb, mask, &id, 1) != 1) {
+			pcb_layergrp_id_t gid;
+			pcb_layergrp_list(PCB, mask, &gid, 1);
+			id = pcb_layer_create(st->pcb, gid, kicad_name);
+		}
+	}
+	else {
+		/* registering a new layer in buffer */
+		pcb_layer_t *ly = pcb_layer_new_bound(st->fp_data, mask, kicad_name);
+		id = ly - st->fp_data->Layer;
+	}
+	htsi_set(&st->layer_k2i, pcb_strdup(kicad_name), id);
+	return 0;
+}
+
+static int kicad_get_layeridx_auto(read_state_t *st, const char *kicad_name)
+{
+	pcb_layer_type_t lyt = 0;
+
+
+	if ((kicad_name[0] == 'F') && (kicad_name[1] == '.')) lyt |= PCB_LYT_TOP;
+	else if ((kicad_name[0] == 'B') && (kicad_name[1] == '.')) lyt |= PCB_LYT_BOTTOM;
+	else if ((kicad_name[0] == 'I') && (kicad_name[1] == 'n')) lyt |= PCB_LYT_INTERN;
+
+	if (pcb_strcasecmp(kicad_name, "Edge.Cuts") == 0) lyt |= PCB_LYT_OUTLINE;
+	else if (kicad_name[1] == '.') {
+		const char *ln = kicad_name + 2;
+		if (pcb_strcasecmp(ln, "SilkS") == 0) lyt |= PCB_LYT_SILK;
+		else if (pcb_strcasecmp(ln, "Mask") == 0) lyt |= PCB_LYT_MASK;
+		else if (pcb_strcasecmp(ln, "Paste") == 0) lyt |= PCB_LYT_PASTE;
+		else if (pcb_strcasecmp(ln, "Cu") == 0) lyt |= PCB_LYT_COPPER;
+		else lyt |= PCB_LYT_VIRTUAL;
+	}
+	else lyt |= PCB_LYT_VIRTUAL;
+
+	if (kicad_reg_layer(st, kicad_name, lyt) == 0)
+		return kicad_get_layeridx(st, kicad_name);
+	return -1;
+}
+
+/* Returns the pcb-rnd layer index for a kicad_name, or -1 if not found */
+static int kicad_get_layeridx(read_state_t *st, const char *kicad_name)
+{
+	htsi_entry_t *e;
+	e = htsi_getentry(&st->layer_k2i, kicad_name);
+	if (e == NULL) {
+		if ((kicad_name[0] == 'I') && (kicad_name[1] == 'n')) {
+			/* Workaround: specal case InX.Cu, where X is an integer */
+			char *end;
+			long id = strtol(kicad_name + 2, &end, 10);
+			if ((pcb_strcasecmp(end, ".Cu") == 0) && (id >= 1) && (id <= 30)) {
+				if (kicad_reg_layer(st, kicad_name, PCB_LYT_COPPER | PCB_LYT_INTERN) == 0) {
+					/*pcb_trace("Created implicit copper layer %s as %d\n", kicad_name, id); */
+					return kicad_get_layeridx(st, kicad_name);
+				}
+				/*pcb_trace("Failed to create implicit copper layer %s as %d\n", kicad_name, id); */
+			}
+		}
+		if (st->auto_layers)
+			return kicad_get_layeridx_auto(st, kicad_name);
+		return -1;
+	}
+	return e->value;
+}
+
+/* kicad_pcb  parse (layers  )  - either board layer defintions, or module pad/via layer defs */
+static int kicad_parse_layer_definitions(read_state_t *st, gsxl_node_t *subtree)
+{
+	gsxl_node_t *n;
+	int i;
+	unsigned int res;
+
+	if (strcmp(subtree->parent->parent->str, "kicad_pcb") != 0) { /* test if deeper in tree than layer definitions for entire board */
+		return kicad_error(subtree, "layer definition found in unexpected location in KiCad layout");
+	}
+	else { /* we are just below the top level or root of the tree, so this must be a layer definitions section */
+		pcb_layergrp_inhibit_inc();
+		pcb_layer_group_setup_default(st->pcb);
+
+		/* set up the hash for implicit layers */
+		res = 0;
+		res |= kicad_reg_layer(st, "F.SilkS", PCB_LYT_SILK | PCB_LYT_TOP);
+		res |= kicad_reg_layer(st, "B.SilkS", PCB_LYT_SILK | PCB_LYT_BOTTOM);
+
+		/* for modules */
+		res |= kicad_reg_layer(st, "Top", PCB_LYT_COPPER | PCB_LYT_TOP);
+		res |= kicad_reg_layer(st, "Bottom", PCB_LYT_COPPER | PCB_LYT_BOTTOM);
+
+		/*
+		   We don't have custom mask layers yet
+		   res |= kicad_reg_layer(st, "F.Mask",  PCB_LYT_MASK | PCB_LYT_TOP);
+		   res |= kicad_reg_layer(st, "B.Mask",  PCB_LYT_MASK | PCB_LYT_BOTTOM);
+		 */
+
+		if (res != 0) {
+			pcb_message(PCB_MSG_ERROR, "Internal error: can't find a silk or mask layer\n");
+			pcb_layergrp_inhibit_dec();
+			return kicad_error(subtree, "Internal error: can't find a silk or mask layer while parsing KiCad layout");
+		}
+
+		for(n = subtree, i = 0; n != NULL; n = n->next, i++) {
+			if ((n->str != NULL) && (n->children->str != NULL) && (n->children->next != NULL) && (n->children->next->str != NULL)) {
+				int lnum = atoi(n->str);
+				const char *lname = n->children->str, *ltype = n->children->next->str;
+				/*pcb_trace("\tlayer #%d LAYERNUM found:\t%s\n", i, n->str); */
+				/*pcb_trace("\tlayer #%d layer label found:\t%s\n", i, lname); */
+				/*pcb_trace("\tlayer #%d layer description/type found:\t%s\n", i, ltype); */
+				if (kicad_create_layer(st, lnum, lname, ltype, n) < 0) {
+					pcb_message(PCB_MSG_ERROR, "Unrecognized layer: %d, %s, %s\n", lnum, lname, ltype);
+					pcb_layergrp_inhibit_dec();
+					return -1;
+				}
+			}
+			else {
+				pcb_message(PCB_MSG_ERROR, "unexpected board layer definition(s) encountered.\n");
+				pcb_layergrp_inhibit_dec();
+				return -1;
+			}
+		}
+
+		pcb_layergrp_fix_old_outline(PCB);
+
+		pcb_layergrp_inhibit_dec();
+		return 0;
+	}
+}
+
+/* kicad_pcb  parse (net  ) ;   used for net descriptions for the entire layout */
+static int kicad_parse_net(read_state_t *st, gsxl_node_t *subtree)
+{
+	if (subtree != NULL && subtree->str != NULL) {
+		/*pcb_trace("net number: '%s'\n", subtree->str); */
+	}
+	else {
+		return kicad_error(subtree, "missing net number in net descriptors.");
+	}
+	if (subtree->next != NULL && subtree->next->str != NULL) {
+		/*pcb_trace("\tcorresponding net label: '%s'\n", (subtree->next->str)); */
+	}
+	else {
+		return kicad_error(subtree, "missing net label in net descriptors.");
+	}
+	return 0;
+}
+
+static pcb_pstk_t *kicad_make_pad_thr(read_state_t *st, gsxl_node_t *subtree, pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t padXsize, pcb_coord_t padYsize, pcb_coord_t Clearance, pcb_coord_t drill, const char *pad_shape)
+{
+	if (pad_shape == NULL) {
+		kicad_error(subtree, "pin with no shape");
+		return NULL;
+	}
+
+	if (strcmp(pad_shape, "rect") == 0) {
+		pcb_pstk_shape_t sh[6];
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = PCB_LYT_TOP    | PCB_LYT_MASK; sh[0].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[0], padXsize+Clearance, padYsize+Clearance);
+		sh[1].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_MASK; sh[1].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[1], padXsize+Clearance, padYsize+Clearance);
+		sh[2].layer_mask = PCB_LYT_TOP    | PCB_LYT_COPPER; pcb_shape_rect(&sh[2], padXsize, padYsize);
+		sh[3].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER; pcb_shape_rect(&sh[3], padXsize, padYsize);
+		sh[4].layer_mask = PCB_LYT_INTERN | PCB_LYT_COPPER; pcb_shape_rect(&sh[4], padXsize, padYsize);
+		sh[5].layer_mask = 0;
+		return pcb_pstk_new_from_shape(subc->data, X, Y, drill, pcb_true, Clearance, sh);
+	}
+	else if ((strcmp(pad_shape, "oval") == 0) || (strcmp(pad_shape, "circle") == 0)) {
+		pcb_pstk_shape_t sh[6];
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = PCB_LYT_TOP    | PCB_LYT_MASK; sh[0].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_oval(&sh[0], padXsize+Clearance, padYsize+Clearance);
+		sh[1].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_MASK; sh[1].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_oval(&sh[1], padXsize+Clearance, padYsize+Clearance);
+		sh[2].layer_mask = PCB_LYT_TOP    | PCB_LYT_COPPER; pcb_shape_oval(&sh[2], padXsize, padYsize);
+		sh[3].layer_mask = PCB_LYT_BOTTOM | PCB_LYT_COPPER; pcb_shape_oval(&sh[3], padXsize, padYsize);
+		sh[4].layer_mask = PCB_LYT_INTERN | PCB_LYT_COPPER; pcb_shape_oval(&sh[4], padXsize, padYsize);
+		sh[5].layer_mask = 0;
+		return pcb_pstk_new_from_shape(subc->data, X, Y, drill, pcb_true, Clearance, sh);
+	}
+
+	kicad_error(subtree, "unsupported pad shape '%s'.", pad_shape);
+	return NULL;
+}
+
+static pcb_pstk_t *kicad_make_pad_smd(read_state_t *st, gsxl_node_t *subtree, pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t padXsize, pcb_coord_t padYsize, pcb_coord_t Clearance, pcb_coord_t drill, const char *pad_shape, pcb_layer_type_t side)
+{
+	if ((side & PCB_LYT_TOP) && (side & PCB_LYT_BOTTOM)) {
+		kicad_error(subtree, "can't place the same smd pad on both sides");
+		return NULL;
+	}
+
+	if (!(side & PCB_LYT_TOP) && !(side & PCB_LYT_BOTTOM)) {
+		kicad_error(subtree, "can't place smd pad on no side");
+		return NULL;
+	}
+
+	if (strcmp(pad_shape, "rect") == 0) {
+		pcb_pstk_shape_t sh[4];
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = side | PCB_LYT_MASK;   sh[0].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_rect(&sh[0], padXsize+Clearance, padYsize+Clearance);
+		sh[1].layer_mask = side | PCB_LYT_PASTE;  sh[1].comb = PCB_LYC_AUTO; pcb_shape_rect(&sh[1], padXsize, padYsize);
+		sh[2].layer_mask = side | PCB_LYT_COPPER; pcb_shape_rect(&sh[2], padXsize, padYsize);
+		sh[3].layer_mask = 0;
+		return pcb_pstk_new_from_shape(subc->data, X, Y, 0, pcb_false, Clearance, sh);
+	}
+	else if ((strcmp(pad_shape, "oval") == 0) || (strcmp(pad_shape, "circle") == 0)) {
+		pcb_pstk_shape_t sh[4];
+		memset(sh, 0, sizeof(sh));
+		sh[0].layer_mask = side | PCB_LYT_MASK; sh[0].comb = PCB_LYC_SUB | PCB_LYC_AUTO; pcb_shape_oval(&sh[0], padXsize+Clearance, padYsize+Clearance);
+		sh[1].layer_mask = side | PCB_LYT_PASTE; pcb_shape_oval(&sh[1], padXsize, padYsize);
+		sh[2].layer_mask = side | PCB_LYT_COPPER; pcb_shape_oval(&sh[2], padXsize, padYsize);
+		sh[3].layer_mask = 0;
+		return pcb_pstk_new_from_shape(subc->data, X, Y, 0, pcb_false, Clearance, sh);
+	}
+
+	kicad_error(subtree, "unsupported pad shape '%s'.", pad_shape);
+	return NULL;
+}
+
+static int kicad_make_pad(read_state_t *st, gsxl_node_t *subtree, pcb_subc_t *subc, int throughHole, pcb_coord_t moduleX, pcb_coord_t moduleY, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t padXsize, pcb_coord_t padYsize, unsigned int padRotation, unsigned int moduleRotation, pcb_coord_t Clearance, pcb_coord_t drill, const char *pinName, const char *pad_shape, unsigned long *featureTally, int *moduleEmpty, pcb_layer_type_t smd_side)
+{
+	pcb_pstk_t *ps;
+	unsigned long required;
+
+	if (subc == NULL)
+		return kicad_error(subtree, "error - unable to create incomplete module definition.");
+
+	X += moduleX;
+	Y += moduleY;
+
+	if (throughHole) {
+		required = BV(0) | BV(1) | BV(3) | BV(5);
+		if ((*featureTally & required) != required)
+			return kicad_error(subtree, "malformed module pad/pin definition.");
+		ps = kicad_make_pad_thr(st, subtree, subc, X, Y, padXsize, padYsize, Clearance, drill, pad_shape);
+	}
+	else {
+		required = BV(0) | BV(1) | BV(2) | BV(5);
+		if ((*featureTally & required) != required)
+			return kicad_error(subtree, "error parsing incomplete module definition.");
+		ps = kicad_make_pad_smd(st, subtree, subc, X, Y, padXsize, padYsize, Clearance, drill, pad_shape, smd_side);
+	}
+
+	if (ps == NULL)
+		return kicad_error(subtree, "failed to created padstack");
+	else
+		*moduleEmpty = 0;
+
+	if (pinName != NULL)
+		pcb_attribute_put(&ps->Attributes, "term", pinName);
+
+#warning TODO: pad rotation?
+#if 0
+		/* the rotation value describes rotation to the pad
+		   versus the original pad orientation, _NOT_ rotation
+		   that now needs to be applied, it seems */
+		if (padRotation != 0 && padRotation != moduleRotation) {
+			padRotation = padRotation / 90; /*ignore rotation != n*90 */
+			PCB_COORD_ROTATE90(X1, Y1, X, Y, padRotation);
+			PCB_COORD_ROTATE90(X2, Y2, X, Y, padRotation);
+		}
+#endif
+
+	return 0;
+}
+
+pcb_layer_t *kicad_get_subc_layer(read_state_t *st, pcb_subc_t *subc, const char *layer_name, const char *default_layer_name)
+{
+	int pcb_idx = -1;
+	pcb_layer_id_t lid;
+	pcb_layer_type_t lyt;
+	pcb_layer_combining_t comb;
+	const char *lnm;
+
+
+
+	if (layer_name != NULL) {
+		/* check if the layer already exists (by name) */
+		lid = pcb_layer_by_name(subc->data, layer_name);
+		if (lid >= 0)
+			return &subc->data->Layer[lid];
+
+		pcb_idx = kicad_get_layeridx(st, layer_name);
+		lnm = layer_name;
+		if (pcb_idx < 0) {
+			pcb_message(PCB_MSG_ERROR, "\tfp_* layer '%s' not found for module object, using unbound subc layer instead.\n", layer_name);
+			lyt = PCB_LYT_VIRTUAL;
+			comb = 0;
+			return pcb_subc_get_layer(subc, lyt, comb, 1, lnm, pcb_true);
+		}
+	}
+	else {
+		/* check if the layer already exists (by name) */
+		lid = pcb_layer_by_name(subc->data, default_layer_name);
+		if (lid >= 0)
+			return &subc->data->Layer[lid];
+
+		pcb_message(PCB_MSG_ERROR, "\tfp_* layer '%s' not found for module object, using module layer '%s' instead.\n", layer_name, default_layer_name);
+		pcb_idx = kicad_get_layeridx(st, default_layer_name);
+		if (pcb_idx < 0)
+			return NULL;
+		lnm = default_layer_name;
+	}
+
+	if (st->pcb == NULL)
+		lyt = st->fp_data->Layer[pcb_idx].meta.bound.type;
+	else
+		lyt = pcb_layer_flags(st->pcb, pcb_idx);
+	comb = 0;
+	return pcb_subc_get_layer(subc, lyt, comb, 1, lnm, pcb_true);
+}
+
+
+static int kicad_parse_module(read_state_t *st, gsxl_node_t *subtree)
+{
+	gsxl_node_t *l, *n, *m, *p;
+	int i;
+	int scaling = 100;
+	int textLength = 0;
+	int mirrored = 0;
+	int moduleDefined = 0;
+	int PCBLayer = 0;
+	int on_bottom = 0;
+	int padLayerDefCount = 0;
+	int SMD = 0;
+	int throughHole = 0;
+	int foundRefdes = 0;
+	int refdesScaling = 100;
+	int moduleEmpty = 1;
+	unsigned int moduleRotation = 0; /* for rotating modules */
+	unsigned int padRotation = 0; /* for rotating pads */
+	unsigned long tally = 0, featureTally = 0, required;
+	pcb_coord_t moduleX = 0, moduleY = 0, X, Y, X1, Y1, X2, Y2, centreX, centreY, endX, endY, width, height, Thickness, Clearance, padXsize, padYsize, drill, refdesX, refdesY;
+	pcb_angle_t startAngle = 0.0;
+	pcb_angle_t endAngle = 0.0;
+	pcb_angle_t delta = 360.0; /* these defaults allow a fp_circle to be parsed, which does not specify (angle XXX) */
+	double val;
+	double glyphWidth = 1.27; /* a reasonable approximation of pcb glyph width, ~=  5000 centimils */
+	unsigned direction = 0; /* default is horizontal */
+	char *end, *textLabel, *text;
+	char *pinName, *moduleName;
+	const char *subc_layer_str;
+	pcb_subc_t *subc = NULL;
+	pcb_layer_t *subc_layer;
+	pcb_layer_type_t smd_side;
+
+#warning TODO: this should be coming from the s-expr file preferences part
+	Clearance = PCB_MM_TO_COORD(0.250); /* start with something bland here */
+
+	if (st->pcb == NULL) {
+		/* loading a module as a footprint - always create the subc in advance */
+		subc = pcb_subc_new();
+		pcb_subc_create_aux(subc, 0, 0, 0.0, 0);
+		pcb_attribute_put(&subc->Attributes, "refdes", "K1");
+	}
+
+	if (subtree->str != NULL) {
+		/*pcb_trace("Name of module element being parsed: '%s'\n", subtree->str); */
+		moduleName = subtree->str;
+		p = subtree->next;
+		if ((p != NULL) && (p->str != NULL) && (strcmp("locked", p->str) == 0)) {
+			p = p->next;
+			/*pcb_trace("The module is locked, which is being ignored.\n"); */
+		}
+		SEEN_NO_DUP(tally, 0);
+		for(n = p, i = 0; n != NULL; n = n->next, i++) {
+			if (n->str != NULL && strcmp("layer", n->str) == 0) { /* need this to sort out ONSOLDER flags etc... */
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					subc_layer_str = n->children->str;
+					if (PCBLayer < 0)
+						return kicad_error(subtree, "module layer error - layer < 0.");
+					else if (pcb_layer_flags(PCB, PCBLayer) & PCB_LYT_BOTTOM)
+						on_bottom = 1;
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module layer node");
+				}
+			}
+			else if (n->str != NULL && strcmp("tedit", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\ttedit: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module tedit node");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\ttstamp: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module tstamp node");
+				}
+			}
+			else if (n->str != NULL && strcmp("attr", n->str) == 0) {
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tmodule attribute \"attr\": '%s' (not used)\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module attr node");
+				}
+			}
+			else if (n->str != NULL && strcmp("at", n->str) == 0) {
+				SEEN_NO_DUP(tally, 4);
+				if (n->children != NULL && n->children->str != NULL) {
+					SEEN_NO_DUP(tally, 5); /* same as ^= 1 was */
+					val = strtod(n->children->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing module X.");
+					}
+					else {
+						moduleX = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module X node");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					SEEN_NO_DUP(tally, 6);
+					val = strtod(n->children->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing module Y.");
+					}
+					else {
+						moduleY = PCB_MM_TO_COORD(val);
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module Y node");
+				}
+				if (n->children->next->next != NULL && n->children->next->next->str != NULL) {
+					val = strtod(n->children->next->next->str, &end);
+					if (*end != 0) {
+						return kicad_error(subtree, "error parsing module rotation.");
+					}
+					else {
+						moduleRotation = (int)val;
+					}
+				}
+				else {
+					/*pcb_trace("\tno module (at) \"rotation\" value found'\n"); */
+				}
+				/* if we have been provided with a Module Name and location, create a new Element with default "" and "" for refdes and value fields */
+				if (moduleName != NULL && moduleDefined == 0) {
+					moduleDefined = 1; /* but might be empty, wait and see */
+					/*pcb_trace("Have new module name and location, defining module/element %s\n", moduleName); */
+					if (subc == NULL) {
+						subc = pcb_subc_new();
+						pcb_subc_create_aux(subc, moduleX, moduleY, 0.0, on_bottom);
+						pcb_attribute_put(&subc->Attributes, "refdes", "K1");
+					}
+					if (st->pcb != NULL) {
+						pcb_add_subc_to_data(st->pcb->Data, subc);
+						pcb_subc_bind_globals(st->pcb, subc);
+					}
+					
+				}
+			}
+			else if (n->str != NULL && strcmp("model", n->str) == 0) {
+				/*pcb_trace("module 3D model found and ignored\n"); */
+			}
+			else if (n->str != NULL && strcmp("fp_text", n->str) == 0) {
+				/*pcb_trace("fp_text found\n"); */
+				featureTally = 0;
+
+/* ********************************************************** */
+
+				if (n->children != NULL && n->children->str != NULL) {
+					textLabel = n->children->str;
+					if (n->children->next != NULL && n->children->next->str != NULL) {
+						text = n->children->next->str;
+						if (strcmp("reference", textLabel) == 0) {
+							SEEN_NO_DUP(tally, 7);
+							pcb_attribute_put(&subc->Attributes, "refdes", text);
+							foundRefdes = 1;
+							textLength = strlen(text);
+							/*pcb_trace("\tmoduleRefdes now: '%s'\n", moduleRefdes); */
+						}
+						else if (strcmp("value", textLabel) == 0) {
+							SEEN_NO_DUP(tally, 8);
+							pcb_attribute_put(&subc->Attributes, "value", text);
+							/*pcb_trace("\tmoduleValue now: '%s'\n", moduleValue); */
+						}
+						else if (strcmp("descr", textLabel) == 0) {
+							SEEN_NO_DUP(tally, 12);
+							pcb_attribute_put(&subc->Attributes, "footprint", text);
+							/*pcb_trace("\tmoduleValue now: '%s'\n", moduleValue); */
+						}
+						else if (strcmp("hide", textLabel) == 0) {
+							/*pcb_trace("\tignoring fp_text \"hide\" flag\n"); */
+						}
+					}
+					else {
+						text = textLabel; /* just a single string, no reference or value */
+					}
+
+					for(l = n->children->next->next, i = 0; l != NULL; l = l->next, i++) { /*fixed this */
+						if (l->str != NULL && strcmp("at", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 0);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 1);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing module fp_text X.");
+								}
+								else {
+									X = PCB_MM_TO_COORD(val);
+									if (foundRefdes) {
+										refdesX = X;
+									}
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module fp_text X node");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 2);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing module fp_text Y.");
+								}
+								else {
+									Y = PCB_MM_TO_COORD(val);
+									if (foundRefdes) {
+										refdesY = Y;
+									}
+								}
+								if (l->children->next->next != NULL && l->children->next->next->str != NULL) {
+									val = strtod(l->children->next->next->str, &end);
+									if (*end != 0) {
+										return kicad_error(subtree, "error parsing module fp_text rotation.");
+									}
+									else {
+										direction = 0; /* default */
+										if (val > 45.0 && val <= 135.0) {
+											direction = 1;
+										}
+										else if (val > 135.0 && val <= 225.0) {
+											direction = 2;
+										}
+										else if (val > 225.0 && val <= 315.0) {
+											direction = 3;
+										}
+									}
+									SEEN_NO_DUP(featureTally, 3);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module fp_text Y node");
+							}
+						}
+						else if (l->str != NULL && strcmp("layer", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 4);
+							if (l->children != NULL && l->children->str != NULL) {
+								PCBLayer = kicad_get_layeridx(st, l->children->str);
+								if (PCBLayer < 0) {
+									/*pcb_trace("\ttext layer not defined for module text, default being used.\n"); */
+/*									Flags = pcb_flag_make(0);*/
+								}
+								else if (pcb_layer_flags(PCB, PCBLayer) & PCB_LYT_BOTTOM) {
+/*									Flags = pcb_flag_make(PCB_FLAG_ONSOLDER);*/
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module fp_text layer node");
+							}
+						}
+						else if (l->str != NULL && strcmp("hide", l->str) == 0) {
+							/*pcb_trace("\tfp_text hidden flag \"hide\" found and ignored.\n"); */
+						}
+						else if (l->str != NULL && strcmp("justify", l->str) == 0) { /*this may be unnecessary here */
+							/*pcb_trace("\tfp_text justify flag found and ignored.\n"); */
+						}
+						else if (l->str != NULL && strcmp("effects", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 5);
+							for(m = l->children; m != NULL; m = m->next) {
+								if (m->str != NULL && strcmp("font", m->str) == 0) {
+									SEEN_NO_DUP(featureTally, 6);
+									for(p = m->children; p != NULL; p = p->next) {
+										if (m->str != NULL && strcmp("size", p->str) == 0) {
+											SEEN_NO_DUP(featureTally, 7);
+											if (p->children != NULL && p->children->str != NULL) {
+												val = strtod(p->children->str, &end);
+												if (*end != 0) {
+													return kicad_error(subtree, "error parsing module fp_text font size X.");
+												}
+												else {
+													scaling = (int)(100 * val / 1.27); /* standard glyph width ~= 1.27mm */
+													if (foundRefdes) {
+														refdesScaling = scaling;
+													}
+												}
+											}
+											else {
+												return kicad_error(subtree, "unexpected empty/NULL module fp_text X size node");
+											}
+											if (p->children->next != NULL && p->children->next->str != NULL) {
+												/*pcb_trace("\tfont sizeY: '%s'\n", (p->children->next->str)); */
+											}
+											else {
+												return kicad_error(subtree, "unexpected empty/NULL module fp_text Y size node");
+											}
+										}
+										else if (strcmp("thickness", p->str) == 0) {
+											SEEN_NO_DUP(featureTally, 8);
+											if (p->children != NULL && p->children->str != NULL) {
+												/*pcb_trace("\tfont thickness: '%s'\n", (p->children->str)); */
+											}
+											else {
+												return kicad_error(subtree, "unexpected empty/NULL module fp_text thickness node");
+											}
+										}
+									}
+								}
+								else if (m->str != NULL && strcmp("justify", m->str) == 0) {
+									SEEN_NO_DUP(featureTally, 9);
+									if (m->children != NULL && m->children->str != NULL) {
+										/*pcb_trace("\ttext justification: '%s'\n", (m->children->str)); */
+										if (strcmp("mirror", m->children->str) == 0) {
+											mirrored = 1;
+										}
+									}
+									else {
+										return kicad_error(subtree, "unexpected empty/NULL module fp_text justify node");
+									}
+								}
+								else {
+									if (m->str != NULL) {
+										/*pcb_trace("Unknown text effects argument %s:", m->str); */
+									}
+									return kicad_error(subtree, "unknown fp_text text effects argument null node");
+								}
+							}
+						}
+					}
+				}
+				required = BV(0) | BV(1) | BV(4) | BV(7) | BV(8);
+				if ((tally & required) == required) { /* has location, layer, size and stroke thickness at a minimum */
+#warning TODO: this will never be NULL; what are we trying to check here?
+					if (&st->pcb->fontkit.dflt == NULL) {
+						pcb_font_create_default(st->pcb);
+					}
+
+					X = refdesX;
+					Y = refdesY;
+					glyphWidth = 1.27;
+					glyphWidth = glyphWidth * refdesScaling / 100.0;
+
+					if (mirrored != 0) {
+						if (direction % 2 == 0) {
+							direction += 2;
+							direction = direction % 4;
+						}
+						if (direction == 0) {
+							X -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							Y += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 1) {
+							Y -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							X -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 2) {
+							X += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							Y -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 3) {
+							Y += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							X += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+					}
+					else { /* not back of board text */
+						if (direction == 0) {
+							X -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							Y -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 1) {
+							Y += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							X -= PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 2) {
+							X += PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							Y += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+						else if (direction == 3) {
+							Y -= PCB_MM_TO_COORD((glyphWidth * textLength) / 2.0);
+							X += PCB_MM_TO_COORD(glyphWidth / 2.0); /* centre it vertically */
+						}
+					}
+
+					/* if we  update X, Y for text fields (refdes, value), we would do it here */
+				}
+
+
+/* ********************************************************** */
+
+			}
+			else if (n->str != NULL && strcmp("descr", n->str) == 0) {
+				SEEN_NO_DUP(tally, 9);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tmodule descr: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module descr node");
+				}
+			}
+			else if (n->str != NULL && strcmp("tags", n->str) == 0) {
+				SEEN_NO_DUP(tally, 10);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tmodule tags: '%s'\n", (n->children->str)); may be more than one? */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module tags node");
+				}
+			}
+			else if (n->str != NULL && strcmp("path", n->str) == 0) {
+				SEEN_NO_DUP(tally, 11);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tmodule path: '%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module model node");
+				}
+				/* pads next  - have thru_hole, circle, rect, roundrect, to think about */
+			}
+			else if (n->str != NULL && strcmp("pad", n->str) == 0) {
+				char *pad_shape = NULL;
+				featureTally = 0;
+				padLayerDefCount = 0;
+				padRotation = 0;
+				if (n->children != 0 && n->children->str != NULL) {
+					pinName = n->children->str;
+					SEEN_NO_DUP(featureTally, 0);
+					if (n->children->next != NULL && n->children->next->str != NULL) {
+						if (strcmp("thru_hole", n->children->next->str) == 0) {
+							SMD = 0;
+							throughHole = 1;
+						}
+						else {
+							SMD = 1;
+							throughHole = 0;
+						}
+						if (n->children->next->next != NULL && n->children->next->next->str != NULL) {
+							pad_shape = n->children->next->next->str;
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL module pad shape node");
+						}
+					}
+					else {
+						return kicad_error(subtree, "unexpected empty/NULL module pad type node");
+					}
+				}
+				else {
+					return kicad_error(subtree, "unexpected empty/NULL module pad name  node");
+				}
+				if (n->children->next->next->next == NULL || n->children->next->next->next->str == NULL) {
+					return kicad_error(subtree, "unexpected empty/NULL module node");
+				}
+				for(m = n->children->next->next->next; m != NULL; m = m->next) {
+					if (m != NULL) {
+						/*pcb_trace("\tstepping through module pad defs, looking at: %s\n", m->str); */
+					}
+					else {
+						/*pcb_trace("error in pad def\n"); */
+					}
+					if (m->str != NULL && strcmp("at", m->str) == 0) {
+						SEEN_NO_DUP(featureTally, 1);
+						if (m->children != NULL && m->children->str != NULL) {
+							val = strtod(m->children->str, &end);
+							if (*end != 0) {
+								return kicad_error(subtree, "error parsing module pad X.");
+							}
+							else {
+								X = PCB_MM_TO_COORD(val);
+							}
+							if (m->children->next != NULL && m->children->next->str != NULL) {
+								val = strtod(m->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing module pad Y.");
+								}
+								else {
+									Y = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module X node");
+							}
+							if (m->children->next->next != NULL && m->children->next->next->str != NULL) {
+								val = strtod(m->children->next->next->str, &end);
+								if (*end != 0) {
+									/*pcb_trace("Odd pad rotation def ignored."); */
+								}
+								else {
+									padRotation = (int)val;
+								}
+							}
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL module Y node");
+						}
+					}
+					else if (m->str != NULL && strcmp("layers", m->str) == 0) {
+#warning TODO: rather pass this subtree directly to the shape generator code so it does not need to guess the layers
+						if (SMD) { /* skip testing for pins */
+							SEEN_NO_DUP(featureTally, 2);
+							smd_side = 0;
+							for(l = m->children; l != NULL; l = l->next) {
+								if (l->str != NULL) {
+									if ((l->str[0] == 'F') || (l->str[0] == '*'))
+										smd_side |= PCB_LYT_TOP;
+									if ((l->str[0] == 'B') || (l->str[0] == '*'))
+										smd_side |= PCB_LYT_BOTTOM;
+									
+									PCBLayer = kicad_get_layeridx(st, l->str);
+									if (PCBLayer < 0) {
+										/* we ignore *.mask, *.paste, etc., if valid layer def already found */
+										/*pcb_trace("Unknown layer definition: %s\n", l->str); */
+										if (!padLayerDefCount) {
+											/*pcb_trace("Default placement of pad is the copper layer defined for module as a whole\n"); */
+											/*return -1; */
+										}
+									}
+									else if (PCBLayer < -1) {
+										/*pcb_trace("\tUnimplemented layer definition: %s\n", l->str); */
+									}
+									else if (pcb_layer_flags(PCB, PCBLayer) & PCB_LYT_BOTTOM) {
+										padLayerDefCount++;
+									}
+									else if (padLayerDefCount) {
+										/*pcb_trace("More than one valid pad layer found, only using the first one found for layer.\n"); */
+										padLayerDefCount++;
+									}
+									else {
+										padLayerDefCount++;
+										/*pcb_trace("Valid layer defs found for current pad: %d\n", padLayerDefCount); */
+									}
+									/*pcb_trace("\tpad layer: '%s',  PCB layer number %d\n", (l->str), kicad_get_layeridx(st, l->str)); */
+								}
+								else {
+									return kicad_error(subtree, "unexpected empty/NULL module layer node");
+								}
+							}
+						}
+						else {
+							/*pcb_trace("\tIgnoring layer definitions for through hole pin\n"); */
+						}
+					}
+					else if (m->str != NULL && strcmp("drill", m->str) == 0) {
+						SEEN_NO_DUP(featureTally, 3);
+						if (m->children != NULL && m->children->str != NULL) {
+							val = strtod(m->children->str, &end);
+							if (*end != 0) {
+								return kicad_error(subtree, "error parsing module pad drill.");
+							}
+							else {
+								drill = PCB_MM_TO_COORD(val);
+							}
+
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL module pad drill node");
+						}
+					}
+					else if (m->str != NULL && strcmp("net", m->str) == 0) {
+						SEEN_NO_DUP(featureTally, 4);
+						if (m->children != NULL && m->children->str != NULL) {
+							if (m->children->next != NULL && m->children->next->str != NULL) {
+								/*pcb_trace("\tpad's net name:\t'%s'\n", (m->children->next->str)); */
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module pad net name node");
+							}
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL module pad net node");
+						}
+					}
+					else if (m->str != NULL && strcmp("size", m->str) == 0) {
+						SEEN_NO_DUP(featureTally, 5);
+						if (m->children != NULL && m->children->str != NULL) {
+							val = strtod(m->children->str, &end);
+							if (*end != 0) {
+								return kicad_error(subtree, "error parsing module pad size X.");
+							}
+							else {
+								padXsize = PCB_MM_TO_COORD(val);
+							}
+							if (m->children->next != NULL && m->children->next->str != NULL) {
+								val = strtod(m->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing module pad size Y.");
+								}
+								else {
+									padYsize = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected empty/NULL module pad Y size node");
+							}
+						}
+						else {
+							return kicad_error(subtree, "unexpected empty/NULL module pad X size node");
+						}
+					}
+					else {
+						if (m->str != NULL) {
+							/*pcb_trace("Unknown pad argument %s:", m->str); */
+						}
+					}
+				}
+				if (subc != NULL)
+					if (kicad_make_pad(st, subtree, subc, throughHole, moduleX, moduleY, X, Y, padXsize, padYsize, padRotation, moduleRotation, Clearance, drill, pinName, pad_shape, &featureTally, &moduleEmpty, smd_side) != 0)
+						return -1;
+				pad_shape = NULL;
+			}
+			else if (n->str != NULL && strcmp("fp_line", n->str) == 0) {
+				/*pcb_trace("fp_line found\n"); */
+				featureTally = 0;
+
+/* ********************************************************** */
+
+				if (n->children->str != NULL) {
+					for(l = n->children; l != NULL; l = l->next) {
+						if (l->str != NULL && strcmp("start", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 0);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 1);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_line start X.");
+								}
+								else {
+									X1 = PCB_MM_TO_COORD(val) + moduleX;
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line start X null node.");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 2);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_line start Y.");
+								}
+								else {
+									Y1 = PCB_MM_TO_COORD(val) + moduleY;
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line start Y null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("end", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 3);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 4);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_line end X.");
+								}
+								else {
+									X2 = PCB_MM_TO_COORD(val) + moduleX;
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line end X null node.");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 5);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_line end Y.");
+								}
+								else {
+									Y2 = PCB_MM_TO_COORD(val) + moduleY;
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line end Y null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("layer", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 6);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 7);
+								subc_layer = kicad_get_subc_layer(st, subc, l->children->str, subc_layer_str);
+								if (subc_layer == NULL)
+									return kicad_error(l, "unable to set subcircuit layer");
+							}
+							else {
+								pcb_message(PCB_MSG_ERROR, "\tusing default module layer for gr_line element\n");
+								subc_layer = kicad_get_subc_layer(st, subc, NULL, subc_layer_str); /* default to module layer */
+								/* return -1; */
+							}
+							if (subc_layer == NULL)
+								return kicad_error(l, "unable to set subcircuit layer");
+						}
+						else if (l->str != NULL && strcmp("width", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 8);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 9);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_line width.");
+								}
+								else {
+									Thickness = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line width null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("angle", l->str) == 0) { /* unlikely to be used or seen */
+							SEEN_NO_DUP(featureTally, 10);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 11);
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line angle null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("net", l->str) == 0) { /* unlikely to be used or seen */
+							SEEN_NO_DUP(featureTally, 12);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 13);
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_line net null node.");
+							}
+						}
+						else {
+							if (l->str != NULL) {
+								/*pcb_trace("Unknown fp_line argument %s:", l->str); */
+							}
+							return kicad_error(subtree, "unexpected fp_line null node.");
+						}
+					}
+				}
+				required = BV(0) | BV(3) | BV(6) | BV(8);
+				if (((featureTally & required) == required) && subc_layer != NULL) { /* need start, end, layer, thickness at a minimum */
+					moduleEmpty = 0;
+					pcb_line_new(subc_layer, X1, Y1, X2, Y2, Thickness, 0, pcb_no_flags());
+				}
+
+/* ********************************************************** */
+
+			}
+			else if ((n->str != NULL && strcmp("fp_arc", n->str) == 0) || (n->str != NULL && strcmp("fp_circle", n->str) == 0)) {
+				/*pcb_trace("fp_arc or fp_circle found\n"); */
+				featureTally = 0;
+
+/* ********************************************************** */
+
+				if (subtree->str != NULL) {
+					for(l = n->children; l != NULL; l = l->next) {
+						if (l->str != NULL && strcmp("start", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 0);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 1);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc X.");
+								}
+								else {
+									centreX = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc start X null node.");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 2);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc Y.");
+								}
+								else {
+									centreY = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc start Y null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("center", l->str) == 0) { /* this lets us parse a circle too */
+							SEEN_NO_DUP(featureTally, 0);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 1);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc centre X.");
+								}
+								else {
+									centreX = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc centre X null node.");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 2);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc centre Y.");
+								}
+								else {
+									centreY = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc centre Y null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("end", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 3);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 4);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc end X.");
+								}
+								else {
+									endX = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc end X null node.");
+							}
+							if (l->children->next != NULL && l->children->next->str != NULL) {
+								SEEN_NO_DUP(featureTally, 5);
+								val = strtod(l->children->next->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc end Y.");
+								}
+								else {
+									endY = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc end Y null node.");
+							}
+						}
+#warning TODO: this is just code duplication of fp_line code
+						else if (l->str != NULL && strcmp("layer", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 6);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 7);
+								subc_layer = kicad_get_subc_layer(st, subc, l->children->str, subc_layer_str);
+								if (subc_layer == NULL)
+									return kicad_error(l, "unable to set subcircuit layer");
+							}
+							else {
+								pcb_message(PCB_MSG_ERROR, "\tusing default module layer for gr_line element\n");
+								subc_layer = kicad_get_subc_layer(st, subc, NULL, subc_layer_str); /* default to module layer */
+								/* return -1; */
+							}
+							if (subc_layer == NULL)
+								return kicad_error(l, "unable to set subcircuit layer");
+						}
+						else if (l->str != NULL && strcmp("width", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 8);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 9);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc width.");
+								}
+								else {
+									Thickness = PCB_MM_TO_COORD(val);
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc width null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("angle", l->str) == 0) {
+							SEEN_NO_DUP(featureTally, 10);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 11);
+								val = strtod(l->children->str, &end);
+								if (*end != 0) {
+									return kicad_error(subtree, "error parsing fp_arc angle.");
+								}
+								else {
+									delta = val;
+								}
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc angle null node.");
+							}
+						}
+						else if (l->str != NULL && strcmp("net", l->str) == 0) { /* unlikely to be used or seen */
+							SEEN_NO_DUP(featureTally, 12);
+							if (l->children != NULL && l->children->str != NULL) {
+								SEEN_NO_DUP(featureTally, 13);
+							}
+							else {
+								return kicad_error(subtree, "unexpected fp_arc net null node.");
+							}
+						}
+						else {
+							if (n->str != NULL) {
+								/*pcb_trace("Unknown gr_arc argument %s:", l->str); */
+							}
+							return kicad_error(subtree, "unexpected fp_arc null node.");
+						}
+					}
+				}
+				required = BV(0) | BV(6) | BV(8);
+				if (((featureTally & required) == required) && subc != NULL) {
+					moduleEmpty = 0;
+					/* need start, layer, thickness at a minimum */
+					/* same code used above for gr_arc parsing */
+					width = height = pcb_distance(centreX, centreY, endX, endY); /* calculate radius of arc */
+					if (width < 1) { /* degenerate case */
+						startAngle = 0;
+					}
+					else {
+						endAngle = 180 + 180 * atan2(-(endY - centreY), endX - centreX) / M_PI; /* avoid using atan2 with zero parameters */
+						if (endAngle < 0.0) {
+							endAngle += 360.0; /*make it 0...360 */
+						}
+						startAngle = (endAngle - delta); /* geda is 180 degrees out of phase with kicad, and opposite direction rotation */
+						if (startAngle > 360.0) {
+							startAngle -= 360.0;
+						}
+						if (startAngle < 0.0) {
+							startAngle += 360.0;
+						}
+					}
+					pcb_arc_new(subc_layer, moduleX + centreX, moduleY + centreY, width, height, startAngle, delta, Thickness, 0, pcb_no_flags(), pcb_true);
+				}
+
+/* ********************************************************** */
+
+
+			}
+			else {
+				if (n->str != NULL) {
+					/*pcb_trace("Unknown pad argument : %s\n", n->str); */
+				}
+			}
+		}
+
+
+		if (subc != NULL) {
+			if (moduleEmpty) { /* should try and use module empty function here */
+#warning TODO: why do we try to do this? an error is an error
+				Thickness = PCB_MM_TO_COORD(0.200);
+			}
+
+			pcb_subc_bbox(subc);
+			if (st->pcb != NULL) {
+				if (st->pcb->Data->subc_tree == NULL)
+					st->pcb->Data->subc_tree = pcb_r_create_tree();
+				pcb_r_insert_entry(st->pcb->Data->subc_tree, (pcb_box_t *)subc);
+				pcb_subc_rebind(st->pcb, subc);
+			}
+			else
+				pcb_add_subc_to_data(st->fp_data, subc);
+
+			if ((moduleRotation == 90) || (moduleRotation == 180) || (moduleRotation == 270)) {
+				/* lossles module rotation for round steps */
+				moduleRotation = moduleRotation / 90;
+				pcb_subc_rotate90(subc, moduleX, moduleY, moduleRotation);
+			}
+			else if (moduleRotation != 0) {
+				double rot = moduleRotation;
+				pcb_subc_rotate(subc, moduleX, moduleY, cos(rot/PCB_RAD_TO_DEG), sin(rot/PCB_RAD_TO_DEG), rot);
+			}
+			return 0;
+		}
+		else {
+			return kicad_error(subtree, "unable to create incomplete module.");
+		}
+	}
+	else {
+		return kicad_error(subtree, "module parsing failure.");
+	}
+	return kicad_error(subtree, "Internal error #4");
+}
+
+static int kicad_parse_zone(read_state_t *st, gsxl_node_t *subtree)
+{
+
+	gsxl_node_t *n, *m;
+	int i;
+	int polycount = 0;
+	long j = 0;
+	unsigned long tally = 0;
+	unsigned long required;
+
+	pcb_poly_t *polygon = NULL;
+	pcb_flag_t flags = pcb_flag_make(PCB_FLAG_CLEARPOLY);
+	char *end;
+	double val;
+	pcb_coord_t X, Y;
+	int PCBLayer = 0;
+
+	if (subtree->str != NULL) {
+		/*pcb_trace("Zone element found:\t'%s'\n", subtree->str); */
+		for(n = subtree, i = 0; n != NULL; n = n->next, i++) {
+			if (n->str != NULL && strcmp("net", n->str) == 0) {
+				SEEN_NO_DUP(tally, 0);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tzone net number:\t'%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone net null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("net_name", n->str) == 0) {
+				SEEN_NO_DUP(tally, 1);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tzone net_name:\t'%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone net_name null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("tstamp", n->str) == 0) {
+				SEEN_NO_DUP(tally, 2);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tzone tstamp:\t'%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone tstamp null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("hatch", n->str) == 0) {
+				SEEN_NO_DUP(tally, 3);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tzone hatch_edge:\t'%s'\n", (n->children->str)); */
+					SEEN_NO_DUP(tally, 4); /* same as ^= 1 was */
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone hatch null node.");
+				}
+				if (n->children->next != NULL && n->children->next->str != NULL) {
+					/*pcb_trace("\tzone hatching size:\t'%s'\n", (n->children->next->str)); */
+					SEEN_NO_DUP(tally, 5);
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone hatching null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("connect_pads", n->str) == 0) {
+				SEEN_NO_DUP(tally, 6);
+				if (n->children != NULL && n->children->str != NULL && (strcmp("clearance", n->children->str) == 0) && (n->children->children->str != NULL)) {
+					/*pcb_trace("\tzone clearance:\t'%s'\n", (n->children->children->str));  this is if yes/no flag for connected pads is absent */
+					SEEN_NO_DUP(tally, 7); /* same as ^= 1 was */
+				}
+				else if (n->children != NULL && n->children->str != NULL && n->children->next->str != NULL) {
+					/*pcb_trace("\tzone connect_pads:\t'%s'\n", (n->children->str)); this is if the optional(!) yes or no flag for connected pads is present */
+					SEEN_NO_DUP(tally, 8); /* same as ^= 1 was */
+					if (n->children->next != NULL && n->children->next->str != NULL && n->children->next->children != NULL && n->children->next->children->str != NULL) {
+						if (strcmp("clearance", n->children->next->str) == 0) {
+							SEEN_NO_DUP(tally, 9);
+							/*pcb_trace("\tzone connect_pads clearance: '%s'\n", (n->children->next->children->str)); */
+						}
+						else {
+							/*pcb_trace("Unrecognised zone connect_pads option %s\n", n->children->next->str); */
+						}
+					}
+				}
+			}
+			else if (n->str != NULL && strcmp("layer", n->str) == 0) {
+				SEEN_NO_DUP(tally, 10);
+				if (n->children != NULL && n->children->str != NULL) {
+					PCBLayer = kicad_get_layeridx(st, n->children->str);
+					if (PCBLayer < 0) {
+						return kicad_warning(subtree, "parse error: zone layer <0.");
+					}
+					polygon = pcb_poly_new(&st->pcb->Data->Layer[PCBLayer], 0, flags);
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone layer null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("polygon", n->str) == 0) {
+				polycount++; /*keep track of number of polygons in zone */
+				if (n->children != NULL && n->children->str != NULL) {
+					if (strcmp("pts", n->children->str) == 0) {
+						for(m = n->children->children, j = 0; m != NULL; m = m->next, j++) {
+							if (m->str != NULL && strcmp("xy", m->str) == 0) {
+								if (m->children != NULL && m->children->str != NULL) {
+									/*pcb_trace("\tvertex X[%d]:\t'%s'\n", j, (m->children->str)); */
+									val = strtod(m->children->str, &end);
+									if (*end != 0) {
+										return kicad_error(subtree, "error parsing zone vertex X.");
+									}
+									else {
+										X = PCB_MM_TO_COORD(val);
+									}
+									if (m->children->next != NULL && m->children->next->str != NULL) {
+										/*pcb_trace("\tvertex Y[%d]:\t'%s'\n", j, (m->children->next->str)); */
+										val = strtod(m->children->next->str, &end);
+										if (*end != 0) {
+											return kicad_error(subtree, "error parsing zone vertex Y.");
+										}
+										else {
+											Y = PCB_MM_TO_COORD(val);
+										}
+										if (polygon != NULL) {
+											pcb_poly_point_new(polygon, X, Y);
+										}
+									}
+									else {
+										return kicad_error(subtree, "unexpected zone vertex coord null node.");
+									}
+								}
+								else {
+									return kicad_error(subtree, "unexpected zone vertex null node.");
+								}
+							}
+						}
+					}
+					else {
+						return kicad_error(subtree, "pts section vertices not found in zone polygon.");
+					}
+				}
+				else {
+					return kicad_error(subtree, "error parsing empty polygon.");
+				}
+			}
+			else if (n->str != NULL && strcmp("fill", n->str) == 0) {
+				SEEN_NO_DUP(tally, 11);
+				for(m = n->children; m != NULL; m = m->next) {
+					if (m->str != NULL && strcmp("arc_segments", m->str) == 0) {
+						if (m->children != NULL && m->children->str != NULL) {
+							/*pcb_trace("\tzone arc_segments:\t'%s'\n", (m->children->str)); */
+						}
+						else {
+							return kicad_error(subtree, "unexpected zone arc_segment null node.");
+						}
+					}
+					else if (m->str != NULL && strcmp("thermal_gap", m->str) == 0) {
+						if (m->children != NULL && m->children->str != NULL) {
+							/*pcb_trace("\tzone thermal_gap:\t'%s'\n", (m->children->str)); */
+						}
+						else {
+							return kicad_error(subtree, "unexpected zone thermal_gap null node.");
+						}
+					}
+					else if (m->str != NULL && strcmp("thermal_bridge_width", m->str) == 0) {
+						if (m->children != NULL && m->children->str != NULL) {
+							/*pcb_trace("\tzone thermal_bridge_width:\t'%s'\n", (m->children->str)); */
+						}
+						else {
+							return kicad_error(subtree, "unexpected zone thermal_bridge_width null node.");
+						}
+					}
+					else if (m->str != NULL) {
+						/*pcb_trace("Unknown zone fill argument:\t%s\n", m->str); */
+					}
+				}
+			}
+			else if (n->str != NULL && strcmp("min_thickness", n->str) == 0) {
+				SEEN_NO_DUP(tally, 12);
+				if (n->children != NULL && n->children->str != NULL) {
+					/*pcb_trace("\tzone min_thickness:\t'%s'\n", (n->children->str)); */
+				}
+				else {
+					return kicad_error(subtree, "unexpected zone min_thickness null node.");
+				}
+			}
+			else if (n->str != NULL && strcmp("filled_polygon", n->str) == 0) {
+				/*pcb_trace("\tIgnoring filled_polygon definition.\n"); */
+			}
+			else {
+				if (n->str != NULL) {
+					/*pcb_trace("Unknown polygon argument:\t%s\n", n->str); */
+				}
+			}
+		}
+	}
+
+	required = BV(10);
+	if ((tally & required) == required) { /* has location, layer, size and stroke thickness at a minimum */
+		if (polygon != NULL) {
+			pcb_add_poly_on_layer(&st->pcb->Data->Layer[PCBLayer], polygon);
+			pcb_poly_init_clip(st->pcb->Data, &st->pcb->Data->Layer[PCBLayer], polygon);
+		}
+		return 0;
+	}
+	return -1;
+}
+
+
+/* Parse a board from &st->dom into st->pcb */
+static int kicad_parse_pcb(read_state_t *st)
+{
+	/* gsxl_node_t *n;  not used */
+	static const dispatch_t disp[] = { /* possible children of root */
+		{"version", kicad_parse_version},
+		{"host", kicad_parse_nop},
+		{"general", kicad_parse_nop},
+		{"page", kicad_parse_page_size},
+		{"title_block", kicad_parse_title_block},
+		{"layers", kicad_parse_layer_definitions}, /* board layer defs */
+		{"setup", kicad_parse_nop},
+		{"net", kicad_parse_net}, /* net labels if child of root, otherwise net attribute of element */
+		{"net_class", kicad_parse_nop},
+		{"module", kicad_parse_module}, /* for footprints */
+		{"dimension", kicad_parse_nop}, /* for dimensioning features */
+		{"gr_line", kicad_parse_gr_line},
+		{"gr_arc", kicad_parse_gr_arc},
+		{"gr_circle", kicad_parse_gr_arc},
+		{"gr_text", kicad_parse_gr_text},
+		{"via", kicad_parse_via},
+		{"segment", kicad_parse_segment},
+		{"zone", kicad_parse_zone}, /* polygonal zones */
+		{NULL, NULL}
+	};
+
+	/* require the root node to be kicad_pcb */
+	if ((st->dom.root->str == NULL) || (strcmp(st->dom.root->str, "kicad_pcb") != 0))
+		return -1;
+
+	/* Call the corresponding subtree parser for each child node of the root
+	   node; if any of them fail, parse fails */
+	return kicad_foreach_dispatch(st, st->dom.root->children, disp);
+}
+
+static gsx_parse_res_t kicad_parse_file(FILE *FP, gsxl_dom_t *dom)
+{
+	int c;
+	gsx_parse_res_t res;
+
+	gsxl_init(dom, gsxl_node_t);
+	dom->parse.line_comment_char = '#';
+	do {
+		c = fgetc(FP);
+	} while((res = gsxl_parse_char(dom, c)) == GSX_RES_NEXT);
+
+	if (res == GSX_RES_EOE) {
+		/* compact and simplify the tree */
+		gsxl_compact_tree(dom);
+	}
+
+	return res;
+}
+
+int io_kicad_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int readres = 0;
+	read_state_t st;
+	gsx_parse_res_t res;
+	FILE *FP;
+
+	FP = pcb_fopen(Filename, "r");
+	if (FP == NULL)
+		return -1;
+
+	/* set up the parse context */
+	memset(&st, 0, sizeof(st));
+	st.pcb = Ptr;
+	st.Filename = Filename;
+	st.settings_dest = settings_dest;
+	htsi_init(&st.layer_k2i, strhash, strkeyeq);
+
+	/* load the file into the dom */
+	res = kicad_parse_file(FP, &st.dom);
+	fclose(FP);
+
+	if (res == GSX_RES_EOE) {
+		/* recursively parse the dom */
+		readres = kicad_parse_pcb(&st);
+	}
+	else
+		readres = -1;
+
+	/* clean up */
+	gsxl_uninit(&st.dom);
+
+	pcb_layer_auto_fixup(Ptr);
+
+	if (pcb_board_normalize(Ptr) > 0)
+		pcb_message(PCB_MSG_WARNING, "Had to make changes to the coords so that the design fits the board.\n");
+	pcb_layer_colors_from_conf(Ptr, 1);
+
+#warning TODO: free the layer hash
+
+	return readres;
+}
+
+int io_kicad_parse_element(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+{
+	int mres;
+	pcb_fp_fopen_ctx_t fpst;
+	FILE *f;
+	read_state_t st;
+	gsx_parse_res_t res;
+
+	f = pcb_fp_fopen(pcb_fp_default_search_path(), name, &fpst);
+
+	if (f == NULL) {
+		return -1;
+	}
+
+	/* set up the parse context */
+	memset(&st, 0, sizeof(st));
+	st.pcb = NULL;
+	st.fp_data = Ptr;
+	st.Filename = name;
+	st.settings_dest = CFR_invalid;
+	st.auto_layers = 1;
+
+	res = kicad_parse_file(f, &st.dom);
+	pcb_fp_fclose(f, &fpst);
+
+	if (res != GSX_RES_EOE) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "Error parsing s-expression '%s'\n", name);
+		gsxl_uninit(&st.dom);
+		return -1;
+	}
+
+	if ((st.dom.root->str == NULL) || (strcmp(st.dom.root->str, "module") != 0)) {
+		pcb_message(PCB_MSG_ERROR, "Wrong root node '%s', expected 'module'\n", st.dom.root->str);
+		gsxl_uninit(&st.dom);
+		return -1;
+	}
+
+	htsi_init(&st.layer_k2i, strhash, strkeyeq);
+
+	mres = kicad_parse_module(&st, st.dom.root->children);
+/*	if (mres == 0)
+		pcb_data_clip_polys(sc->data);*/
+
+	gsxl_uninit(&st.dom);
+	return mres;
+}
+
+int io_kicad_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[1024], *s;
+
+	if ((typ != PCB_IOT_PCB) && (typ != PCB_IOT_FOOTPRINT))
+		return 0; /* support only boards for now - kicad footprints are in the legacy format */
+
+	while(!(feof(f))) {
+		if (fgets(line, sizeof(line), f) != NULL) {
+			s = line;
+			while(isspace(*s))
+				s++; /* strip leading whitespace */
+			if ((strncmp(s, "(kicad_pcb", 10) == 0) && (typ == PCB_IOT_PCB)) /* valid root */
+				return 1;
+			if (strncmp(s, "(module", 7) == 0) /* valid root */
+				return 1;
+			if ((*s == '\r') || (*s == '\n') || (*s == '#') || (*s == '\0')) /* ignore empty lines and comments */
+				continue;
+			/* non-comment, non-empty line - and we don't have our root -> it's not an s-expression */
+			return 0;
+		}
+	}
+
+	/* hit eof before seeing a valid root -> bad */
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_kicad/read.h
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/read.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/read.h	(revision 18980)
@@ -0,0 +1,36 @@
+/*
+ *			    COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include "data.h"
+
+int io_kicad_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_kicad_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_kicad_parse_element(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
+
Index: tags/2.0.1/src_plugins/io_kicad/read_net.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/read_net.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/read_net.c	(revision 18980)
@@ -0,0 +1,240 @@
+/*
+ *				COPYRIGHT
+ *
+ *	pcb-rnd, interactive printed circuit board design
+ *	Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *	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 2 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, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Schematics/netlist import action for KiCad's eeschema */
+
+#include "config.h"
+
+#include <assert.h>
+#include <gensexpr/gsxl.h>
+
+#include "read_net.h"
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "actions.h"
+#include "plugins.h"
+#include "hid.h"
+
+#define if_strval(node, name) \
+	if (strcmp(node->str, #name) == 0) { \
+		if (name != NULL) { \
+			pcb_message(PCB_MSG_ERROR, "Invalid eechema: multiple %s subtrees\n", #name); \
+			return -1; \
+		} \
+		if (node->children != NULL) \
+			name = node->children->str; \
+	}
+
+#define if_subtree(node, name) \
+	if (strcmp(node->str, #name) == 0) { \
+		if (name != NULL) { \
+			pcb_message(PCB_MSG_ERROR, "Invalid eechema: multiple %s subtrees\n", #name); \
+			return -1; \
+		} \
+		name = node; \
+	}
+
+#define req_subtree(name) \
+	if (name == NULL) { \
+		pcb_message(PCB_MSG_ERROR, "Invalid eechema: missing %s subtree\n", #name); \
+		return -1; \
+	} \
+
+
+static int eeschema_parse_net(gsxl_dom_t *dom)
+{
+	gsxl_node_t *i, *net, *c, *n, *version = NULL, *components = NULL, *nets = NULL;
+
+	/* check the header */
+	if (strcmp(dom->root->str, "export") != 0) {
+		pcb_message(PCB_MSG_ERROR, "Invalid eechema netlist header: not an export\n");
+		return -1;
+	}
+
+	for(n = dom->root->children; n != NULL; n = n->next) {
+		if_subtree(n, version)
+		else if_subtree(n, components)
+		else if_subtree(n, nets)
+	}
+
+	req_subtree(version);
+	req_subtree(components);
+	req_subtree(nets);
+
+	if ((version->children == NULL) || (strcmp(version->children->str, "D") != 0)) {
+		pcb_message(PCB_MSG_ERROR, "Invalid eechema version: expected 'D', got '%s'\n", version->children->str);
+		return -1;
+	}
+
+	/* Load the elements */
+	pcb_actionl("ElementList", "start", NULL);
+
+	for(c = components->children; c != NULL; c = c->next) {
+		const char *ref = NULL, *value = NULL, *footprint = NULL;
+		if (strcmp(c->str, "comp") != 0)
+			continue;
+		for(n = c->children; n != NULL; n = n->next) {
+			if_strval(n, ref)
+			else if_strval(n, value)
+			else if_strval(n, footprint)
+		}
+		if (ref == NULL) {
+			pcb_message(PCB_MSG_WARNING, "eechema: ignoring component with no refdes\n");
+			continue;
+		}
+		if (footprint == NULL) {
+			pcb_message(PCB_MSG_WARNING, "eechema: ignoring component %s with no footprint\n", ref);
+			continue;
+		}
+		pcb_actionl("ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL);
+	}
+
+	pcb_actionl("ElementList", "Done", NULL);
+
+	/* Load the netlist */
+
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	for(net = nets->children; net != NULL; net = net->next) {
+		const char *netname = NULL, *code = NULL, *name = NULL, *footprint = NULL;
+		char refpin[256];
+
+		if (strcmp(net->str, "net") != 0)
+			continue;
+
+		for(n = net->children; n != NULL; n = n->next) {
+			if_strval(n, code)
+			else if_strval(n, name)
+			else if (strcmp(n->str, "node") == 0) {
+				const char *ref = NULL, *pin = NULL;
+
+				/* load node params */
+				for(i = n->children; i != NULL; i = i->next) {
+					if_strval(i, ref)
+					else if_strval(i, pin)
+				}
+
+				/* find out the net name */
+				if (netname == NULL) {
+					if ((name != NULL) && (*name != '\0'))
+						netname = name;
+					else
+						netname = code;
+				}
+				if (netname == NULL) {
+					pcb_message(PCB_MSG_WARNING, "eechema: ignoring pins of incomplete net\n");
+					continue;
+				}
+
+				/* do the binding */
+				if ((ref == NULL) || (pin == NULL)) {
+					pcb_message(PCB_MSG_WARNING, "eechema: ignoring incomplete connection to net %s: refdes=%s pin=%s \n", netname, ref, pin);
+					continue;
+				}
+				pcb_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin);
+				pcb_actionl("Netlist", "Add",  netname, refpin, NULL);
+			}
+		}
+	}
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+
+	return 0;
+}
+
+
+
+static int eeschema_load(const char *fname_net)
+{
+	FILE *fn;
+	gsxl_dom_t dom;
+	int c, ret = 0;
+	gsx_parse_res_t res;
+
+	fn = pcb_fopen(fname_net, "r");
+	if (fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		return -1;
+	}
+
+	gsxl_init(&dom, gsxl_node_t);
+
+	dom.parse.line_comment_char = '#';
+	do {
+		c = fgetc(fn);
+	} while((res = gsxl_parse_char(&dom, c)) == GSX_RES_NEXT);
+	fclose(fn);
+
+	if (res == GSX_RES_EOE) {
+		/* compact and simplify the tree */
+		gsxl_compact_tree(&dom);
+
+		/* recursively parse the dom */
+		ret = eeschema_parse_net(&dom);
+	}
+	else
+		ret = -1;
+
+	/* clean up */
+	gsxl_uninit(&dom);
+
+	return ret;
+}
+
+const char pcb_acts_LoadeeschemaFrom[] = "LoadEeschemaFrom(filename)";
+const char pcb_acth_LoadeeschemaFrom[] = "Loads the specified eeschema .net file - the netlist must be an s-expression.";
+fgw_error_t pcb_act_LoadeeschemaFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadeeschemaFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect("Load eeschema netlist file...",
+					"Picks a eeschema netlist file to load.\n",
+					default_file, ".net", "eeschema", HID_FILESELECT_READ);
+		if (fname == NULL)
+			return 1;
+		if (default_file != NULL) {
+			free(default_file);
+			default_file = NULL;
+		}
+	}
+
+	PCB_ACT_IRES(eeschema_load(fname));
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_kicad/read_net.h
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/read_net.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/read_net.h	(revision 18980)
@@ -0,0 +1,7 @@
+#include "unit.h"
+#include <libfungw/fungw.h>
+
+extern const char pcb_acts_LoadeeschemaFrom[];
+extern const char pcb_acth_LoadeeschemaFrom[];
+fgw_error_t pcb_act_LoadeeschemaFrom(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
Index: tags/2.0.1/src_plugins/io_kicad/uniq_name.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/uniq_name.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/uniq_name.c	(revision 18980)
@@ -0,0 +1,77 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <genht/hash.h>
+#include "config.h"
+#include "uniq_name.h"
+#include "compat_misc.h"
+
+static const char *unm_default_unnamed = "unnamed";
+static const char *unm_default_suffix_sep = "_dup";
+
+void unm_init(unm_t *state)
+{
+	state->unnamed    = unm_default_unnamed;
+	state->suffix_sep = unm_default_suffix_sep;
+	htsp_init(&state->seen, strhash, strkeyeq);
+	state->ctr = 0;
+}
+
+
+void unm_uninit(unm_t *state)
+{
+	htsp_entry_t *e;
+	for (e = htsp_first(&state->seen); e; e = htsp_next(&state->seen, e)) {
+		free(e->key);
+		htsp_delentry(&state->seen, e);
+	}
+	htsp_uninit(&state->seen);
+}
+
+const char *unm_name(unm_t *state, const char *orig_name, void *user_data)
+{
+	int l1, l2;
+	char *name, *end;
+	const char *head;
+
+	if ((orig_name == NULL) || (*orig_name == '\0')) {
+		if (!htsp_has(&state->seen, (char *)state->unnamed)) {
+			name = pcb_strdup(state->unnamed);
+			htsp_set(&state->seen, name, user_data);
+			return name;
+		}
+		head = state->unnamed;
+		l1 = strlen(state->unnamed);
+		l2 = strlen(state->suffix_sep);
+	}
+	else {
+		if (!htsp_has(&state->seen, (char *)orig_name)) {
+			name = pcb_strdup(orig_name);
+			htsp_set(&state->seen, name, user_data);
+			return name;
+		}
+		else {
+			head = orig_name;
+			l1 = strlen(orig_name);
+			l2 = strlen(state->suffix_sep);
+		}
+	}
+
+	/* have to generate a new name, allocate memory and print the static part
+	   leave end to point where the integer part goes
+	   21 is large enough to store the widest 64 bit integer decimal, and a \0 */
+		end = name = malloc(l1+l2+21);
+		memcpy(end, head, l1); end += l1;
+		memcpy(end, state->suffix_sep, l2); end += l2;
+
+	/* look for the first unused entry with this suffix. Note: the entries
+	   this function creates won't collide as ctr is a state of the group, but
+	   it is possible that a new name collides with a past unsuffixed orig_name;
+	   all in all, this loop should exit in the first iteration */
+	do {
+		sprintf(end, "%lu", state->ctr++);
+	} while(htsp_has(&state->seen, name));
+
+	htsp_set(&state->seen, name, user_data);
+	return name;
+}
Index: tags/2.0.1/src_plugins/io_kicad/uniq_name.h
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/uniq_name.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/uniq_name.h	(revision 18980)
@@ -0,0 +1,32 @@
+#ifndef PCB_UNIQ_NAME_H
+#define PCB_UNIQ_NAME_H
+
+#include <genht/htsp.h>
+
+typedef struct unm_s {
+	const char *unnamed;     /* name to use when orig_name is NULL */
+	const char *suffix_sep;  /* separator for the suffix appended to generate unique names */
+	htsp_t seen;             /* hash for storing names already handed out */
+	unsigned long int ctr;   /* duplication counter - this will become the suffix for duplicated items */
+} unm_t;
+
+/* Initialize a new group of unique names */
+void unm_init(unm_t *state);
+
+/* Free all memory claimed by the group */
+void unm_uninit(unm_t *state);
+
+/* Generate and return a unique name:
+    - if orig_name is NULL, generate an unnamed item
+    - if orig_name is not-NULL and is unseen so far, return a copy of orig_name
+    - if orig_name is not-NULL and has been already seen, return a modified version
+
+   Corners:
+    - an empty, non-NULL orig_name handled as if it was NULL
+    - the first "unnamed" entry is returned without suffix
+
+   Strings returned are newly allocated and can be used until unm_uninit()
+   is called on state. */
+const char *unm_name(unm_t *state, const char *orig_name, void *user_data);
+
+#endif
Index: tags/2.0.1/src_plugins/io_kicad/write.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/write.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/write.c	(revision 18980)
@@ -0,0 +1,971 @@
+/*
+ *														COPYRIGHT
+ *
+ *	pcb-rnd, interactive printed circuit board design
+ *	Copyright (C) 2016,2018 Tibor 'Igor2' Palinkas
+ *	Copyright (C) 2016 Erich S. Heinzle
+ *
+ *	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 2 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, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include <math.h>
+#include "config.h"
+#include "compat_misc.h"
+#include "board.h"
+#include "plug_io.h"
+#include "error.h"
+#include "uniq_name.h"
+#include "data.h"
+#include "write.h"
+#include "layer.h"
+#include "netlist.h"
+#include "obj_pstk_inlines.h"
+
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+
+/* When non-zero, introduce an offset to move the whole board to the center of the page */
+static int force_center = 0;
+
+/* writes the buffer to file */
+int io_kicad_write_buffer(pcb_plug_io_t *ctx, FILE *FP, pcb_buffer_t *buff, pcb_bool elem_only)
+{
+	pcb_message(PCB_MSG_ERROR, "can't save buffer in s-expr yet, please use kicad legacy for this\n");
+	return -1;
+}
+
+/* if implicit outline needs to be drawn, use lines of this thickness */
+#define KICAD_OUTLINE_THICK (PCB_MIL_TO_COORD(10))
+
+#define KICAD_MAX_LAYERS 64
+typedef struct {
+	FILE *f;                     /* output file */
+	pcb_board_t *pcb;            /* board being exported */
+	pcb_coord_t ox, oy;          /* move every object by this origin */
+	struct {
+		pcb_layergrp_t *grp;
+		char name[32];             /* kicad layer name */
+		const char *param;
+		int is_sig;
+	} layer[KICAD_MAX_LAYERS];   /* pcb-rnd layer groups indexed by kicad's stackup */
+	int num_layers;              /* number of groups in use */
+} wctx_t;
+
+typedef enum {
+	FLP_COP_FIRST,
+	FLP_COP_INT,
+	FLP_COP_LAST,
+	FLP_FIXED,        /* fixed, static, hand-assigned number - AVOID USING THIS */
+	FLP_MISC          /* auto-number from the last known layer */
+} fixed_layer_place_t;
+
+typedef struct {
+	int fixed_layernum;
+	char *name;
+	char *param;
+	int is_sig;
+	pcb_layer_type_t type;
+	fixed_layer_place_t place;
+} fixed_layer_t;
+
+static fixed_layer_t fixed_layers[] = {
+	{0,  "F.Cu",       "signal", 1, PCB_LYT_COPPER | PCB_LYT_TOP,    FLP_COP_FIRST },
+	{0,  "Inner%d.Cu", "signal", 1, PCB_LYT_COPPER | PCB_LYT_INTERN, FLP_COP_INT },
+	{0,  "B.Cu",       "signal", 1, PCB_LYT_COPPER | PCB_LYT_BOTTOM, FLP_COP_LAST },
+/*	{16, "B.Adhes",    "user",   0, PCB_LYT_ADHES | PCB_LYT_BOTTOM,  FLP_FIXED },
+	{17, "F.Adhes",    "user",   0, PCB_LYT_ADHES | PCB_LYT_TOP,     FLP_FIXED },*/
+	{18, "B.Paste",    "user",   0, PCB_LYT_PASTE | PCB_LYT_BOTTOM,  FLP_FIXED },
+	{19, "F.Paste",    "user",   0, PCB_LYT_PASTE | PCB_LYT_TOP,     FLP_FIXED },
+	{20, "B.SilkS",    "user",   0, PCB_LYT_SILK | PCB_LYT_BOTTOM,   FLP_FIXED },
+	{21, "F.SilkS",    "user",   0, PCB_LYT_SILK | PCB_LYT_TOP,      FLP_FIXED },
+	{22, "B.Mask",     "user",   0, PCB_LYT_MASK | PCB_LYT_BOTTOM,   FLP_FIXED },
+	{23, "F.Mask",     "user",   0, PCB_LYT_MASK | PCB_LYT_TOP,      FLP_FIXED },
+	{28, "Edge.Cuts",  "user",   0, PCB_LYT_OUTLINE,                 FLP_FIXED },
+	{0, NULL, NULL, 0}
+};
+
+/* number of copper layers, where to start inners, how to increment iners */
+#define KICAD_COPPERS       16
+#define KICAD_FIRST_INNER   1
+#define KICAD_NEXT_INNER   +1
+#define KICAD_FIRST_MISC    KICAD_COPPERS
+
+#define grp_idx(grp) ((grp) - ctx->pcb->LayerGroups->grp)
+
+/* Make the mapping between pcb-rnd layer groups and kicad layer stackup
+   Assumption: the first KICAD_COPPERS layers are the copper layers */
+static int kicad_map_layers(wctx_t *ctx)
+{
+	fixed_layer_t *fl;
+	int n;
+	int inner = KICAD_FIRST_INNER;
+	int misc = KICAD_FIRST_MISC;
+	char *mapped;
+
+	mapped = calloc(ctx->pcb->LayerGroups.len, 1);
+	ctx->num_layers = -1;
+
+	for(fl = fixed_layers; fl->name != NULL; fl++) {
+		pcb_layergrp_id_t gid[KICAD_COPPERS];
+		int idx, ngrp;
+
+		gid[0] = -1;
+		ngrp = pcb_layergrp_list(ctx->pcb, fl->type, gid, KICAD_COPPERS);
+		if ((fl->place != FLP_COP_INT) && (ngrp > 1))
+			pcb_io_incompat_save(ctx->pcb->Data, NULL, "Multiple layer groups of the same type - exporting only the first", "Merge the groups");
+
+		switch(fl->place) {
+			case FLP_COP_FIRST:
+				idx = 0;
+				break;
+			case FLP_COP_INT:
+				/* iterate over all internal groups */
+				for(n = 0; n < ngrp; n++) {
+					idx = inner;
+					if (inner >= KICAD_COPPERS-1) {
+						pcb_io_incompat_save(ctx->pcb->Data, NULL, "Too many internal layer groups, omitting some", "Use fewer groups");
+						continue;
+					}
+					sprintf(ctx->layer[idx].name, fl->name, idx);
+					if (gid[n] >= 0) {
+						inner += KICAD_NEXT_INNER;
+						ctx->layer[idx].grp = &ctx->pcb->LayerGroups.grp[gid[n]];
+						ctx->layer[idx].param = fl->param;
+						ctx->layer[idx].is_sig = fl->is_sig;
+						mapped[gid[n]]++;
+						if (idx > ctx->num_layers)
+							ctx->num_layers = idx;
+					}
+				}
+				continue; /* the normal layer insertion does only a single group, skip it */
+			case FLP_COP_LAST:
+				idx = KICAD_COPPERS - 1;
+				break;
+
+			case FLP_FIXED:
+				idx = fl->fixed_layernum;
+				break;
+
+			case FLP_MISC:
+				idx = misc;
+				if (gid[0] >= 0)
+					misc++;
+				if (misc >= KICAD_MAX_LAYERS-1) {
+					pcb_io_incompat_save(ctx->pcb->Data, NULL, "Too many internal layer groups, omitting some", "Use fewer groups");
+					continue;
+				}
+				break;
+		}
+
+		/* normal, single group mapping */
+		if (gid[0] >= 0) {
+			strcpy(ctx->layer[idx].name, fl->name);
+			ctx->layer[idx].grp = &ctx->pcb->LayerGroups.grp[gid[0]];
+			ctx->layer[idx].param = fl->param;
+			ctx->layer[idx].is_sig = fl->is_sig;
+			mapped[gid[0]]++;
+			if (idx > ctx->num_layers)
+				ctx->num_layers = idx;
+		}
+	}
+
+	for(n = 0; n < ctx->pcb->LayerGroups.len; n++) {
+		pcb_layergrp_t *grp = &ctx->pcb->LayerGroups.grp[n];
+		if ((mapped[n] == 0) && !(grp->ltype & PCB_LYT_SUBSTRATE))
+			pcb_io_incompat_save(ctx->pcb->Data, NULL, "Failed to map layer for export - layer omitted", grp->name);
+		else if (mapped[n] > 1)
+			pcb_io_incompat_save(ctx->pcb->Data, NULL, "Mapped layer for export multiple times", grp->name);
+	}
+
+	free(mapped);
+	ctx->num_layers++;
+
+	if (ctx->num_layers < 3)
+		pcb_io_incompat_save(ctx->pcb->Data, NULL, "Warning: low output layer count", NULL);
+	return 0;
+}
+
+static const char *kicad_sexpr_layer_to_text(wctx_t *ctx, int layer)
+{
+	if ((layer < 0) || (layer >= ctx->num_layers)) {
+		assert(!"invalid layer");
+		return "";
+	}
+	return ctx->layer[layer].name;
+}
+
+static void kicad_print_layers(wctx_t *ctx, int ind)
+{
+	int n;
+
+	fprintf(ctx->f, "\n%*s(layers\n", ind, "");
+	for(n = 0; n < ctx->num_layers; n++)
+		if (ctx->layer[n].param != NULL)
+			fprintf(ctx->f, "%*s(%d %s %s)\n", ind+2, "", n, ctx->layer[n].name, ctx->layer[n].param);
+	fprintf(ctx->f, "%*s)\n", ind, "");
+}
+
+typedef struct {
+	int klayer;       /* kicad layer ID, index of wctx->layer */
+	const char *name; /* kicad layer name (cached from wctx) */
+	pcb_layer_t *ly;
+	pcb_layer_type_t lyt;
+	enum {
+		KLYT_COPPER,    /* board: copper/signal/trace objects */
+		KLYT_GR,        /* board: "grpahical" objects: silk and misc */
+		KLYT_FP         /* module: any */
+	} type;
+	int skip_term;    /* do not print terminals on this layer */
+} klayer_t;
+
+static void kicad_print_line(const wctx_t *ctx, const klayer_t *kly, pcb_line_t *line, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	const char *cmd[] = {"segment", "gr_line", "fp_line"};
+
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f,
+		"(%s (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n",
+		cmd[kly->type],
+		line->Point1.X + dx, line->Point1.Y + dy,
+		line->Point2.X + dx, line->Point2.Y + dy,
+		kly->name, line->Thickness);
+		/* neglect (net ___ ) for now */
+}
+
+static void kicad_print_arc(const wctx_t *ctx, const klayer_t *kly, pcb_arc_t *arc, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_arc_t localArc = *arc; /* for converting ellipses to circular arcs */
+/*	int kicadArcShape;  3 = circle, and 2 = arc, 1= rectangle used in eeschema only */
+	pcb_coord_t copperStartX, copperStartY; /* used for mapping geda copper arcs onto kicad copper lines */
+	pcb_coord_t radius, xStart, yStart, xEnd, yEnd;
+
+	if (arc->Width > arc->Height) {
+		radius = arc->Height;
+		localArc.Width = radius;
+	}
+	else {
+		radius = arc->Width;
+		localArc.Height = radius;
+	}
+
+#warning TODO: what do we need this for?
+#if 0
+	/* Return the x;y coordinate of the endpoint of an arc; if which is 0, return
+	   the endpoint that corresponds to StartAngle, else return the end angle's. */
+	if ((arc->Delta == 360.0) || (arc->Delta == -360.0))
+		kicadArcShape = 3; /* it's a circle */
+	else
+		kicadArcShape = 2;  /* it's an arc */
+#endif
+
+	xStart = localArc.X + dx;
+	yStart = localArc.Y + dy;
+	pcb_arc_get_end(&localArc, 1, &xEnd, &yEnd);
+	xEnd += dx;
+	yEnd += dy;
+	pcb_arc_get_end(&localArc, 0, &copperStartX, &copperStartY);
+	copperStartX += dx;
+	copperStartY += dy;
+
+	fprintf(ctx->f, "%*s", ind, "");
+
+	switch(kly->type) {
+		case KLYT_COPPER:
+#warning TODO: this should be a proper line approximation using a helper (to be written)
+			pcb_fprintf(ctx->f, "(segment (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n", copperStartX, copperStartY, xEnd, yEnd, kly->name, arc->Thickness); /* neglect (net ___ ) for now */
+			pcb_io_incompat_save(ctx->pcb->Data, (pcb_any_obj_t *)arc, "Kicad does not support copper arcs; using line approximation", NULL);
+			break;
+		case KLYT_GR:
+			pcb_fprintf(ctx->f, "(gr_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness);
+			break;
+		case KLYT_FP:
+			pcb_fprintf(ctx->f, "(fp_arc (start %.3mm %.3mm) (end %.3mm %.3mm) (angle %ma) (layer %s) (width %.3mm))\n", xStart, yStart, xEnd, yEnd, arc->Delta, kly->name, arc->Thickness);
+			break;
+	}
+}
+
+static void kicad_print_text(const wctx_t *ctx, const klayer_t *kly, pcb_text_t *text, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_font_t *myfont = pcb_font(PCB, 0, 1);
+	pcb_coord_t mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */
+	pcb_coord_t defaultStrokeThickness = 100 * 2540; /* use 100 mil as default 100% stroked font line thickness */
+	int kicadMirrored = 1; /* 1 is not mirrored, 0  is mirrored */
+	pcb_coord_t defaultXSize;
+	pcb_coord_t defaultYSize;
+	pcb_coord_t strokeThickness;
+	int rotation;
+	pcb_coord_t textOffsetX;
+	pcb_coord_t textOffsetY;
+	pcb_coord_t halfStringWidth;
+	pcb_coord_t halfStringHeight;
+
+	if (!(kly->lyt & PCB_LYT_COPPER) && !(kly->lyt & PCB_LYT_SILK)) {
+		pcb_io_incompat_save(ctx->pcb->Data, (pcb_any_obj_t *)text, "Kicad supports text only on copper or silk - omitting text object on misc layer", NULL);
+		return;
+	}
+
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f, "(gr_text %[4] ", text->TextString);
+	defaultXSize = 5 * PCB_SCALE_TEXT(mWidth, text->Scale) / 6; /* IIRC kicad treats this as kerned width of upper case m */
+	defaultYSize = defaultXSize;
+	strokeThickness = PCB_SCALE_TEXT(defaultStrokeThickness, text->Scale / 2);
+	rotation = 0;
+	textOffsetX = 0;
+	textOffsetY = 0;
+	halfStringWidth = (text->BoundingBox.X2 - text->BoundingBox.X1) / 2;
+	if (halfStringWidth < 0) {
+		halfStringWidth = -halfStringWidth;
+	}
+	halfStringHeight = (text->BoundingBox.Y2 - text->BoundingBox.Y1) / 2;
+	if (halfStringHeight < 0) {
+		halfStringHeight = -halfStringHeight;
+	}
+	if (text->Direction == 3) { /*vertical down */
+		if (kly->lyt & PCB_LYT_BOTTOM) { /* back copper or silk */
+			rotation = 2700;
+			kicadMirrored = 0; /* mirrored */
+			textOffsetY -= halfStringHeight;
+			textOffsetX -= 2 * halfStringWidth; /* was 1*hsw */
+		}
+		else { /* front copper or silk */
+			rotation = 2700;
+			kicadMirrored = 1; /* not mirrored */
+			textOffsetY = halfStringHeight;
+			textOffsetX -= halfStringWidth;
+		}
+	}
+	else if (text->Direction == 2) { /*upside down */
+		if (kly->lyt & PCB_LYT_BOTTOM) { /* back copper or silk */
+			rotation = 0;
+			kicadMirrored = 0; /* mirrored */
+			textOffsetY += halfStringHeight;
+		}
+		else { /* front copper or silk */
+			rotation = 1800;
+			kicadMirrored = 1; /* not mirrored */
+			textOffsetY -= halfStringHeight;
+		}
+		textOffsetX = -halfStringWidth;
+	}
+	else if (text->Direction == 1) { /*vertical up */
+		if (kly->lyt & PCB_LYT_BOTTOM) { /* back copper or silk */
+			rotation = 900;
+			kicadMirrored = 0; /* mirrored */
+			textOffsetY = halfStringHeight;
+			textOffsetX += halfStringWidth;
+		}
+		else { /* front copper or silk */
+			rotation = 900;
+			kicadMirrored = 1; /* not mirrored */
+			textOffsetY = -halfStringHeight;
+			textOffsetX = 0; /* += halfStringWidth; */
+		}
+	}
+	else if (text->Direction == 0) { /*normal text */
+		if (kly->lyt & PCB_LYT_BOTTOM) { /* back copper or silk */
+			rotation = 1800;
+			kicadMirrored = 0; /* mirrored */
+			textOffsetY -= halfStringHeight;
+		}
+		else { /* front copper or silk */
+			rotation = 0;
+			kicadMirrored = 1; /* not mirrored */
+			textOffsetY += halfStringHeight;
+		}
+		textOffsetX = halfStringWidth;
+	}
+	pcb_fprintf(ctx->f, "(at %.3mm %.3mm", text->X + dx + textOffsetX, text->Y + dy + textOffsetY);
+	if (rotation != 0) {
+		fprintf(ctx->f, " %d", rotation / 10); /* convert decidegrees to degrees */
+	}
+	pcb_fprintf(ctx->f, ") (layer %s)\n", kly->name);
+	fprintf(ctx->f, "%*s", ind + 2, "");
+	pcb_fprintf(ctx->f, "(effects (font (size %.3mm %.3mm) (thickness %.3mm))", defaultXSize, defaultYSize, strokeThickness); /* , rotation */
+	if (kicadMirrored == 0) {
+		fprintf(ctx->f, " (justify mirror)");
+	}
+	fprintf(ctx->f, ")\n%*s)\n", ind, "");
+}
+
+static void kicad_print_poly(const wctx_t *ctx, const klayer_t *kly, pcb_poly_t *polygon, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i, j;
+
+	if (polygon->HoleIndexN != 0) {
+#warning TODO: does kicad suppor holes? of so, use them; else (and only else) there is a polygon.h call that can split up a holed poly into a set of hole-free polygons
+		pcb_io_incompat_save(ctx->pcb->Data, (pcb_any_obj_t *)polygon, "can't export polygon with holes", NULL);
+		return;
+	}
+
+	/* preliminaries for zone settings */
+#warning TODO: never hardwire tstamp
+#warning TODO: do not hardwire thicknesses and gaps and hatch values!
+	fprintf(ctx->f, "%*s(zone (net 0) (net_name \"\") (layer %s) (tstamp 478E3FC8) (hatch edge 0.508)\n", ind, "", kly->name);
+	fprintf(ctx->f, "%*s(connect_pads no (clearance 0.508))\n", ind + 2, "");
+	fprintf(ctx->f, "%*s(min_thickness 0.4826)\n", ind + 2, "");
+	fprintf(ctx->f, "%*s(fill (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))\n", ind + 2, "");
+	fprintf(ctx->f, "%*s(polygon\n", ind + 2, "");
+	fprintf(ctx->f, "%*s(pts\n", ind + 4, "");
+
+	/* now the zone outline is defined */
+	for(i = 0; i < polygon->PointN; i = i + 5) { /* kicad exports five coords per line in s-expr files */
+		fprintf(ctx->f, "%*s", ind + 6, ""); /* pcb_fprintf does not support %*s   */
+		for(j = 0; (j < polygon->PointN) && (j < 5); j++) {
+			pcb_fprintf(ctx->f, "(xy %.3mm %.3mm)", polygon->Points[i + j].X + dx, polygon->Points[i + j].Y + dy);
+			if ((j < 4) && ((i + j) < (polygon->PointN - 1))) {
+				fputs(" ", ctx->f);
+			}
+		}
+		fputs("\n", ctx->f);
+	}
+	fprintf(ctx->f, "%*s)\n", ind + 4, "");
+	fprintf(ctx->f, "%*s)\n", ind + 2, "");
+	fprintf(ctx->f, "%*s)\n", ind, "");
+}
+
+/* Print all objects of a kicad layer; if skip_term is true, ignore the objects
+   with term ID set */
+static void kicad_print_layer(wctx_t *ctx, pcb_layer_t *ly, const klayer_t *kly, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	gdl_iterator_t it;
+	pcb_line_t *line;
+	pcb_text_t *text;
+	pcb_poly_t *poly;
+	pcb_arc_t *arc;
+
+	linelist_foreach(&ly->Line, &it, line)
+		if ((line->term == NULL) || !kly->skip_term)
+			kicad_print_line(ctx, kly, line, ind, dx, dy);
+
+	arclist_foreach(&ly->Arc, &it, arc)
+		if ((arc->term == NULL) || !kly->skip_term)
+			kicad_print_arc(ctx, kly, arc, ind, dx, dy);
+
+	textlist_foreach(&ly->Text, &it, text) {
+		if (kly->type == KLYT_FP) {
+			if (!PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text)) {
+				pcb_io_incompat_save(ctx->pcb->Data, (pcb_any_obj_t *)text, "can't export custom text in footprint", NULL);
+				break;
+			}
+			else
+				continue;
+		}
+		if ((text->term == NULL) || !kly->skip_term)
+			kicad_print_text(ctx, kly, text, ind, dx, dy);
+	}
+
+	polylist_foreach(&ly->Polygon, &it, poly)
+		if ((poly->term == NULL) || !kly->skip_term)
+			kicad_print_poly(ctx, kly, poly, ind, dx, dy);
+}
+
+/* writes kicad format via data
+   For a track segment: Position shape Xstart Ystart Xend Yend width
+   Description layer 0 netcode timestamp status; Shape parameter is set to 0 (reserved for future) */
+static void kicad_print_pstks(wctx_t *ctx, pcb_data_t *Data, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	gdl_iterator_t it;
+	pcb_pstk_t *ps;
+	int is_subc = Data->parent_type == PCB_PARENT_SUBC;
+
+	padstacklist_foreach(&Data->padstack, &it, ps) {
+		int klayer_from = 0, klayer_to = 15;
+		pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask, x1, y1, x2, y2, thickness;
+		pcb_pstk_compshape_t cshape;
+		pcb_bool plated, square, nopaste;
+		double psrot;
+
+		if (is_subc && (ps->term == NULL)) {
+			pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "can't export non-terminal padstack in subcircuit, omitting the object", NULL);
+			continue;
+		}
+		if (!is_subc && (ps->term != NULL)) {
+			pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "can't export terminal info for a padstack outside of a subcircuit (omitting terminal info)", NULL);
+			continue;
+		}
+
+		psrot = ps->rot;
+		if (ps->smirror)
+			psrot = -psrot;
+
+		if (is_subc) {
+			if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+				fprintf(ctx->f, "%*s", ind, "");
+#warning TODO: handle all cshapes (throw warnings)
+				pcb_fprintf(ctx->f, "(pad %s thru_hole %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (drill %.3mm) (layers %s %s))\n",
+					ps->term, ((cshape == PCB_PSTK_COMPAT_SQUARE) ? "rect" : "oval"),
+					x + dx, y + dy, psrot,
+					pad_dia, pad_dia,
+					drill_dia,
+					kicad_sexpr_layer_to_text(ctx, 0), kicad_sexpr_layer_to_text(ctx, 15)); /* skip (net 0) for now */
+			}
+			else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) {
+				/* the above check only makes sure this is a plain padstack, get the geometry from the copper layer shape */
+				const char *shape_str, *side_str;
+				int n, has_mask = 0, on_bottom;
+				pcb_pstk_proto_t *proto = pcb_pstk_get_proto_(Data, ps->proto);
+				pcb_pstk_tshape_t *tshp = &proto->tr.array[0];
+				pcb_coord_t w, h;
+
+				for(n = 0; n < tshp->len; n++) {
+					if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
+						int i;
+						pcb_line_t line;
+						pcb_box_t bx;
+						pcb_pstk_shape_t *shape = &tshp->shape[n];
+						
+						on_bottom = tshp->shape[n].layer_mask & PCB_LYT_BOTTOM;
+						if (ps->smirror) on_bottom = !on_bottom;
+						side_str = (on_bottom ? "B." : "F.");
+
+						switch(shape->shape) {
+							case PCB_PSSH_POLY:
+								bx.X1 = bx.X2 = shape->data.poly.x[0];
+								bx.Y1 = bx.Y2 = shape->data.poly.y[0];
+								for(i = 1; i < shape->data.poly.len; i++)
+									pcb_box_bump_point(&bx, shape->data.poly.x[i], shape->data.poly.y[i]);
+								w = (bx.X2 - bx.X1);
+								h = (bx.Y2 - bx.Y1);
+								shape_str = "rect";
+								break;
+							case PCB_PSSH_LINE:
+								line.Point1.X = shape->data.line.x1;
+								line.Point1.Y = shape->data.line.y1;
+								line.Point2.X = shape->data.line.x2;
+								line.Point2.Y = shape->data.line.y2;
+								line.Thickness = shape->data.line.thickness;
+								line.Clearance = 0;
+								line.Flags = pcb_flag_make(shape->data.line.square ? PCB_FLAG_SQUARE : 0);
+								pcb_line_bbox(&line);
+								w = (line.BoundingBox.X2 - line.BoundingBox.X1);
+								h = (line.BoundingBox.Y2 - line.BoundingBox.Y1);
+								shape_str = shape->data.line.square ? "rect" : "oval";
+								break;
+							case PCB_PSSH_CIRC:
+								w = h = shape->data.circ.dia;
+								shape_str = "oval";
+								break;
+						}
+					}
+					if (tshp->shape[n].layer_mask & PCB_LYT_MASK)
+						has_mask = 1;
+				}
+
+				fprintf(ctx->f, "%*s", ind, "");
+				pcb_fprintf(ctx->f, "(pad %s smd %s (at %.3mm %.3mm %f) (size %.3mm %.3mm) (layers",
+					ps->term, shape_str,
+					ps->x + dx, ps->y + dy, psrot,
+					w, h,
+					kicad_sexpr_layer_to_text(ctx, 0), kicad_sexpr_layer_to_text(ctx, 15)); /* skip (net 0) for now */
+				
+				fprintf(ctx->f, " %sCu", side_str); /* always has copper */
+				if (has_mask)
+					fprintf(ctx->f, " %sMask", side_str);
+				if (!nopaste)
+					fprintf(ctx->f, " %sPaste", side_str);
+				fprintf(ctx->f, "))\n");
+			}
+			else
+				pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "Can't convert padstack to pin or pad", "use a simpler, uniform shape");
+		}
+		else { /* global via */
+			if (!pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+				pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "Can not convert padstack to old-style via", "Use round, uniform-shaped vias only");
+				continue;
+			}
+
+			if (cshape != PCB_PSTK_COMPAT_ROUND) {
+				pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "Can not convert padstack to via", "only round vias are supported");
+				continue;
+			}
+#warning TODO: set klayer_from and klayer_to using bb span of ps
+
+			fprintf(ctx->f, "%*s", ind, "");
+			pcb_fprintf(ctx->f, "(via (at %.3mm %.3mm) (size %.3mm) (layers %s %s))\n",
+				x + dx, y + dy, pad_dia,
+				kicad_sexpr_layer_to_text(ctx, klayer_from), kicad_sexpr_layer_to_text(ctx, klayer_to)
+				); /* skip (net 0) for now */
+		}
+	}
+}
+
+void kicad_print_data(wctx_t *ctx, pcb_data_t *data, int ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int n, klayer;
+
+	for(n = 0; n < data->LayerN; n++) {
+		pcb_layer_t *ly = &data->Layer[n];
+		pcb_layergrp_id_t gid = pcb_layer_get_group_(ly);
+		pcb_layergrp_t *grp;
+		int found = 0;
+		klayer_t kly;
+
+
+		if (gid < 0)
+			continue; /* unbound, should not be exported */
+
+		grp = &ctx->pcb->LayerGroups.grp[gid];
+
+		for(klayer = 0; klayer < ctx->num_layers; klayer++) {
+			if (ctx->layer[klayer].grp == grp) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (!found) {
+			pcb_io_incompat_save(data, NULL, "unmapped layer on data export", NULL);
+			continue;
+		}
+
+#warning TODO: this should be a safe lookup, merged with kicad_sexpr_layer_to_text()
+		kly.name = kicad_sexpr_layer_to_text(ctx, klayer);
+		kly.ly = ly;
+		kly.lyt = pcb_layer_flags_(ly);
+		if (data->parent_type != PCB_PARENT_SUBC) {
+			kly.type = ctx->layer[klayer].is_sig ? KLYT_COPPER : KLYT_GR;
+			kly.skip_term = pcb_false;
+		}
+		else {
+			kly.type = KLYT_FP;
+			kly.skip_term = pcb_true;
+		}
+
+		kicad_print_layer(ctx, ly, &kly, ind, dx, dy);
+	}
+
+	kicad_print_pstks(ctx, data, ind, dx, dy);
+}
+
+static int kicad_print_subcs(wctx_t *ctx, pcb_data_t *Data, pcb_cardinal_t ind, pcb_coord_t dx, pcb_coord_t dy)
+{
+	gdl_iterator_t sit;
+	pcb_subc_t *subc;
+	unm_t group1; /* group used to deal with missing names and provide unique ones if needed */
+	const char *currentElementName;
+	const char *currentElementRef;
+	const char *currentElementVal;
+
+#warning TODO: revise this for subc
+/*	elementlist_dedup_initializer(ededup);*/
+
+	/* Now initialize the group with defaults */
+	unm_init(&group1);
+
+	subclist_foreach(&Data->subc, &sit, subc) {
+		pcb_coord_t xPos, yPos, sox, soy;
+		int on_bottom;
+
+#warning TODO: get this from data table (see also #1)
+		int silkLayer = 21; /* hard coded default, 20 is bottom silk */
+		int copperLayer = 15; /* hard coded default, 0 is bottom copper */
+
+		/* elementlist_dedup_skip(ededup, element);  */
+#warning TODO: why?
+		/* let's not skip duplicate elements for layout export */
+
+		if (pcb_subc_get_origin(subc, &sox, &soy) != 0) {
+			pcb_io_incompat_save(Data, (pcb_any_obj_t *)subc, "Failed to get origin of subcircuit", "fix the missing subc-aux layer");
+			continue;
+		}
+		if (pcb_subc_get_side(subc, &on_bottom) != 0) {
+			pcb_io_incompat_save(Data, (pcb_any_obj_t *)subc, "Failed to get placement side of subcircuit", "fix the missing subc-aux layer");
+			continue;
+		}
+
+		xPos = sox + dx;
+		yPos = soy + dy;
+
+		if (on_bottom) {
+			silkLayer = 20;
+			copperLayer = 0;
+		}
+
+#warning TODO: we should probably do unm_name() on the refdes, not on footprint-name?
+#warning TODO: the unique name makes no sense if we override it with unknown - if the unique name is NULL, it is more likely a save-incompatibility error
+		currentElementName = unm_name(&group1, pcb_attribute_get(&subc->Attributes, "footprint"), subc);
+		if (currentElementName == NULL) {
+			currentElementName = "unknown";
+		}
+		currentElementRef = pcb_attribute_get(&subc->Attributes, "refdes");
+		if (currentElementRef == NULL) {
+			currentElementRef = "unknown";
+		}
+		currentElementVal = pcb_attribute_get(&subc->Attributes, "value");
+		if (currentElementVal == NULL) {
+			currentElementVal = "unknown";
+		}
+
+#warning TODO: why the heck do we hardwire timestamps?!!?!?!
+		fprintf(ctx->f, "%*s", ind, "");
+		pcb_fprintf(ctx->f, "(module %[4] (layer %s) (tedit 4E4C0E65) (tstamp 5127A136)\n", currentElementName, kicad_sexpr_layer_to_text(ctx, copperLayer));
+		fprintf(ctx->f, "%*s", ind + 2, "");
+		pcb_fprintf(ctx->f, "(at %.3mm %.3mm)\n", xPos, yPos);
+
+		fprintf(ctx->f, "%*s", ind + 2, "");
+		pcb_fprintf(ctx->f, "(descr %[4])\n", currentElementName);
+
+		fprintf(ctx->f, "%*s", ind + 2, "");
+
+#warning TODO: do not hardwire these coords, look up the first silk dyntext coords instead
+		pcb_fprintf(ctx->f, "(fp_text reference %[4] (at 0.0 -2.56) ", currentElementRef);
+		pcb_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer));
+
+#warning TODO: do not hardwire font sizes here, look up the first silk dyntext sizes instead
+		fprintf(ctx->f, "%*s", ind + 4, "");
+		fprintf(ctx->f, "(effects (font (size 1.397 1.27) (thickness 0.2032)))\n");
+		fprintf(ctx->f, "%*s)\n", ind + 2, "");
+
+#warning TODO: do not hardwire these coords, look up the first silk dyntext coords instead
+		fprintf(ctx->f, "%*s", ind + 2, "");
+		pcb_fprintf(ctx->f, "(fp_text value %[4] (at 0.0 -1.27) ", currentElementVal);
+		pcb_fprintf(ctx->f, "(layer %s)\n", kicad_sexpr_layer_to_text(ctx, silkLayer));
+
+#warning TODO: do not hardwire font sizes here, look up the first silk dyntext sizes instead
+		fprintf(ctx->f, "%*s", ind + 4, "");
+		fprintf(ctx->f, "(effects (font (size 1.397 1.27) (thickness 0.2032)))\n");
+		fprintf(ctx->f, "%*s)\n", ind + 2, "");
+
+		kicad_print_data(ctx, subc->data, ind+2, -sox, -soy);
+
+#warning TODO: export padstacks
+#warning TODO: warn for vias
+#warning TODO: warn for heavy terminals
+
+		fprintf(ctx->f, "%*s)\n\n", ind, ""); /*  finish off module */
+	}
+	/* Release unique name utility memory */
+	unm_uninit(&group1);
+
+#warning TODO: revise this for subc
+	/* free the state used for deduplication */
+/*	elementlist_dedup_free(ededup);*/
+
+	return 0;
+}
+
+static int write_kicad_layout_via_drill_size(FILE *FP, pcb_cardinal_t indentation)
+{
+#warning TODO: do not hardwire the drill size here - does kicad support only one size, or what?
+	fprintf(FP, "%*s", indentation, "");
+	pcb_fprintf(FP, "(via_drill 0.635)\n"); /* mm format, default for now, ~= 0.635mm */
+	return 0;
+}
+
+/* writes element data in kicad legacy format for use in a .mod library */
+int io_kicad_write_element(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data)
+{
+	wctx_t wctx;
+
+	if (pcb_subclist_length(&Data->subc) > 1) {
+		pcb_message(PCB_MSG_ERROR, "Can't save multiple modules (footprints) in a single s-experssion mod file\n");
+		return -1;
+	}
+
+#warning TODO: make this initialization a common function with write_kicad_layout()
+	pcb_printf_slot[4] = "%{\\()\t\r\n \"}mq";
+
+	wctx.f = FP;
+	wctx.pcb = PCB;
+	wctx.ox = 0;
+	wctx.oy = 0;
+
+	if (kicad_map_layers(&wctx) != 0)
+		return -1;
+
+	return kicad_print_subcs(&wctx, Data, 0, 0, 0);
+}
+
+/* writes netlist data in kicad legacy format for use in a layout .brd file */
+int write_kicad_equipotential_netlists(FILE *FP, pcb_board_t *Layout, pcb_cardinal_t indentation)
+{
+	int n; /* code mostly lifted from netlist.c */
+	int netNumber;
+	pcb_lib_menu_t *menu;
+	pcb_lib_entry_t *netlist;
+
+	/* first we write a default netlist for the 0 net, which is for unconnected pads in pcbnew */
+	fprintf(FP, "\n%*s(net 0 \"\")\n", indentation, "");
+
+	/* now we step through any available netlists and generate descriptors */
+	for(n = 0, netNumber = 1; n < Layout->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++, netNumber++) {
+		menu = &Layout->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
+		netlist = &menu->Entry[0];
+		if (netlist != NULL) {
+			fprintf(FP, "%*s(net %d ", indentation, "", netNumber); /* netlist 0 was used for unconnected pads  */
+			pcb_fprintf(FP, "%[4])\n", pcb_netlist_name(menu));
+		}
+	}
+	return 0;
+}
+
+static void kicad_paper(wctx_t *ctx, int ind)
+{
+
+	/* Kicad expects a layout "sheet" size to be specified in mils, and A4, A3 etc... */
+	int A4HeightMil = 8267;
+	int A4WidthMil = 11700;
+	int sheetHeight = A4HeightMil;
+	int sheetWidth = A4WidthMil;
+	int paperSize = 4; /* default paper size is A4 */
+
+#warning TODO: rewrite this: rather have a table and a loop that hardwired calculations in code
+	/* we sort out the needed kicad sheet size here, using A4, A3, A2, A1 or A0 size as needed */
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > A4WidthMil || PCB_COORD_TO_MIL(PCB->MaxHeight) > A4HeightMil) {
+		sheetHeight = A4WidthMil; /* 11.7" */
+		sheetWidth = 2 * A4HeightMil; /* 16.5" */
+		paperSize = 3; /* this is A3 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 2 * A4HeightMil; /* 16.5" */
+		sheetWidth = 2 * A4WidthMil; /* 23.4" */
+		paperSize = 2; /* this is A2 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 2 * A4WidthMil; /* 23.4" */
+		sheetWidth = 4 * A4HeightMil; /* 33.1" */
+		paperSize = 1; /* this is A1 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 4 * A4HeightMil; /* 33.1" */
+		sheetWidth = 4 * A4WidthMil; /* 46.8"  */
+		paperSize = 0; /* this is A0 size; where would you get it made ?!?! */
+	}
+	fprintf(ctx->f, "\n%*s(page A%d)\n", ind, "", paperSize);
+
+	if (force_center) {
+		pcb_coord_t LayoutXOffset;
+		pcb_coord_t LayoutYOffset;
+
+		/* we now sort out the offsets for centring the layout in the chosen sheet size here */
+		if (sheetWidth > PCB_COORD_TO_MIL(PCB->MaxWidth)) { /* usually A4, bigger if needed */
+			/* fprintf(ctx->f, "%d ", sheetWidth);  legacy kicad: elements decimils, sheet size mils */
+			LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->MaxWidth / 2;
+		}
+		else { /* the layout is bigger than A0; most unlikely, but... */
+			/* pcb_fprintf(ctx->f, "%.0ml ", PCB->MaxWidth); */
+			LayoutXOffset = 0;
+		}
+		if (sheetHeight > PCB_COORD_TO_MIL(PCB->MaxHeight)) {
+			/* fprintf(ctx->f, "%d", sheetHeight); */
+			LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->MaxHeight / 2;
+		}
+		else { /* the layout is bigger than A0; most unlikely, but... */
+			/* pcb_fprintf(ctx->f, "%.0ml", PCB->MaxHeight); */
+			LayoutYOffset = 0;
+	}
+
+	ctx->ox = LayoutXOffset;
+	ctx->oy = LayoutYOffset;
+	}
+	else
+		ctx->ox = ctx->oy = 0;
+}
+
+static void kicad_print_implicit_outline(wctx_t *ctx, const char *lynam, pcb_coord_t thick, int ind)
+{
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n",
+		ctx->ox, ctx->oy,
+		ctx->pcb->MaxWidth + ctx->ox, ctx->oy,
+		lynam, thick);
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n",
+		ctx->pcb->MaxWidth + ctx->ox, ctx->oy,
+		ctx->pcb->MaxWidth + ctx->ox, ctx->pcb->MaxHeight + ctx->oy,
+		lynam, thick);
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n",
+		ctx->pcb->MaxWidth + ctx->ox, ctx->pcb->MaxHeight + ctx->oy,
+		ctx->ox, ctx->pcb->MaxHeight + ctx->oy,
+		lynam, thick);
+	fprintf(ctx->f, "%*s", ind, "");
+	pcb_fprintf(ctx->f, "(gr_line (start %.3mm %.3mm) (end %.3mm %.3mm) (layer %s) (width %.3mm))\n",
+		ctx->ox, ctx->pcb->MaxHeight + ctx->oy,
+		ctx->ox, ctx->oy,
+		lynam, thick);
+}
+
+static void kicad_fixup_outline(wctx_t *ctx, int ind)
+{
+	int n;
+	fixed_layer_t *l;
+
+	/* if any outline layer is non-empty, don't draw the implicit outline */
+	for(n = 0; n < ctx->pcb->Data->LayerN; n++) {
+		if (!(pcb_layer_flags(ctx->pcb, n) & PCB_LYT_OUTLINE))
+			continue;
+		if (!pcb_layer_is_pure_empty(&ctx->pcb->Data->Layer[n]))
+			return;
+	}
+
+	/* find the first kicad outline layer */
+	for(l = fixed_layers; l->name != NULL; l++) {
+		if (l->type & PCB_LYT_OUTLINE) {
+			kicad_print_implicit_outline(ctx, l->name, KICAD_OUTLINE_THICK, ind);
+			return;
+		}
+	}
+
+	pcb_message(PCB_MSG_ERROR, "io_kicad: internal error: can not find output outline layer for drawing the implicit outline\n");
+}
+
+/* writes PCB to file in s-expression format */
+int io_kicad_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	wctx_t wctx;
+	int baseSExprIndent = 2;
+
+	memset(&wctx, 0, sizeof(wctx));
+	wctx.pcb = PCB;
+	wctx.f = FP;
+
+	/* Kicad string quoting pattern: protect parenthesis, whitespace, quote and backslash */
+	pcb_printf_slot[4] = "%{\\()\t\r\n \"}mq";
+
+	fprintf(FP, "(kicad_pcb (version 3) (host pcb-rnd \"(%s %s)\")", PCB_VERSION, PCB_REVISION);
+
+	fprintf(FP, "\n%*s(general\n", baseSExprIndent, "");
+	fprintf(FP, "%*s)\n", baseSExprIndent, "");
+
+	kicad_paper(&wctx, baseSExprIndent);
+	kicad_map_layers(&wctx);
+	kicad_print_layers(&wctx, baseSExprIndent);
+
+	/* setup section */
+	fprintf(FP, "\n%*s(setup\n", baseSExprIndent, "");
+	write_kicad_layout_via_drill_size(FP, baseSExprIndent + 2);
+	fprintf(FP, "%*s)\n", baseSExprIndent, "");
+
+	/* now come the netlist "equipotential" descriptors */
+
+	write_kicad_equipotential_netlists(FP, PCB, baseSExprIndent);
+
+	/* module descriptions come next */
+	fputs("\n", FP);
+
+	kicad_print_subcs(&wctx, PCB->Data, baseSExprIndent, wctx.ox, wctx.oy);
+	kicad_print_data(&wctx, PCB->Data, baseSExprIndent, wctx.ox, wctx.oy);
+
+	kicad_fixup_outline(&wctx, baseSExprIndent);
+
+	fputs(")\n", FP); /* finish off the board */
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_kicad/write.h
===================================================================
--- tags/2.0.1/src_plugins/io_kicad/write.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad/write.h	(revision 18980)
@@ -0,0 +1,37 @@
+/*
+ *			    COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include "data.h"
+
+int io_kicad_write_element(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data);
+int io_kicad_write_buffer(pcb_plug_io_t *ctx, FILE *FP, pcb_buffer_t *buff, pcb_bool elem_only);
+int io_kicad_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+
+
Index: tags/2.0.1/src_plugins/io_kicad_legacy/HACKING
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/HACKING	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/HACKING	(revision 18980)
@@ -0,0 +1,36 @@
+The plugin is disabled by default for now. This lets you work on it without
+having to worry whether you break other people's compilation. You need to
+enable it in your compilation, tho, when running configure:
+
+./configure --buildin-io_kicad_legacy
+
+Then run make (maybe only in src/)
+
+After making modifications to the plugin code, it's enough to run make in
+the plugin dir - as the module is a buildin, it will recompile pcb-rnd.
+
+Run pcb-rnd from the src/ directory (cd there, it won't find its
+files otherwise).
+
+How to run the plugin (GUI version):
+1. run pcb-rnd (from src/)
+2. load a pcb 
+3. open the command prompt (press ':')
+4. type: SaveTo(PasteBuffer, foobar.mod, kicadl)
+
+Now, the gtk dialog "Buffer: save buffer elements to file" allows kicad legacy format to be selected.
+
+Arc and Circle support has been implemented but not fully tested.
+
+This will save the current PasteBuffer contents to foobar.mod using io_kicad_legacy format.
+
+Once layout export has been implemented, the following will be possible:
+ 
+How to run the plugin (CLI version):
+
+echo "SaveTo(LayoutAs, foobar.brd, kicadl)" | ./pcb-rnd  --gui batch my.pcb
+
+(This loads my.pcb and saves it to foobar.brd and then exits)
+
+SVN: when commiting, please prefix all your commit message lines with string
+[io_kicad_legacy] to make my job easier when generating Changelog.
Index: tags/2.0.1/src_plugins/io_kicad_legacy/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_kicad_legacy
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_kicad_legacy/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {io_kicad_legacy}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/io_kicad_legacy/io_kicad_legacy.o
+ $(PLUGDIR)/io_kicad_legacy/write.o
+@]
+
+switch /local/pcb/io_kicad_legacy/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 18980)
@@ -0,0 +1,85 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ * 
+ *  This module, io_kicad_legacy, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "write.h"
+
+static pcb_plug_io_t io_kicad_legacy;
+
+int io_kicad_legacy_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "kicadl") != 0) ||
+		((typ & (~(PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER | PCB_IOT_PCB))) != 0))
+		return 0;
+	if (wr)
+		return 100;
+	return 0; /* no read support yet */
+}
+
+int pplg_check_ver_io_kicad_legacy(int ver_needed) { return 0; }
+
+void pplg_uninit_io_kicad_legacy(void)
+{
+	/* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad_legacy);
+}
+
+int pplg_init_io_kicad_legacy(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_kicad_legacy.plugin_data = NULL;
+	io_kicad_legacy.fmt_support_prio = io_kicad_legacy_fmt;
+	io_kicad_legacy.parse_pcb = NULL;
+	io_kicad_legacy.parse_footprint = NULL;
+	io_kicad_legacy.parse_font = NULL;
+	io_kicad_legacy.write_buffer = io_kicad_legacy_write_buffer;
+	io_kicad_legacy.write_footprint = io_kicad_legacy_write_element;
+	io_kicad_legacy.write_pcb = io_kicad_legacy_write_pcb;
+	io_kicad_legacy.default_fmt = "kicadl";
+	io_kicad_legacy.description = "Kicad, legacy format";
+	io_kicad_legacy.save_preference_prio = 70;
+	io_kicad_legacy.default_extension = ".brd";
+	io_kicad_legacy.fp_extension = ".mod";
+	io_kicad_legacy.mime_type = "application/x-kicad-pcbnew";
+
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad_legacy);
+
+	/* TODO: Alloc plugin-globals here. */
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.pup
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/io_kicad_legacy.pup	(revision 18980)
@@ -0,0 +1,11 @@
+$class io
+$short Kicad's legacy format
+$long Export the design and footprints in Kicad's legacy format.
+$state works
+$fmt-native no
+$fmt-feature-w kicad pcbnew-board, version 1 (legacy plain text format)
+$fmt-feature-w kicad pcbnew-module (legacy plain text format)
+$package io-alien
+default buildin
+dep io_kicad
+autoload 1
Index: tags/2.0.1/src_plugins/io_kicad_legacy/write.c
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/write.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/write.c	(revision 18980)
@@ -0,0 +1,1040 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016,2018 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include <math.h>
+#include "config.h"
+#include "compat_misc.h"
+#include "board.h"
+#include "plug_io.h"
+#include "error.h"
+#include "data.h"
+#include "write.h"
+#include "layer.h"
+#include "netlist.h"
+#include "macro.h"
+#include "obj_pstk_inlines.h"
+
+#include "../io_kicad/uniq_name.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+
+/* layer "0" is first copper layer = "0. Back - Solder"
+ * and layer "15" is "15. Front - Component"
+ * and layer "20" SilkScreen Back
+ * and layer "21" SilkScreen Front
+ */
+
+static const char *or_empty(const char *s)
+{
+	if (s == NULL) return "";
+	return s;
+}
+
+/* writes (eventually) de-duplicated list of element names in kicad legacy format module $INDEX */
+static int io_kicad_legacy_write_subc_index(FILE *FP, pcb_data_t *Data)
+{
+	gdl_iterator_t eit;
+	pcb_subc_t *subc;
+	unm_t group1;
+
+	unm_init(&group1);
+
+	subclist_foreach(&Data->subc, &eit, subc) {
+		if (pcb_data_is_empty(subc->data))
+			continue;
+
+#warning TODO: need a subc dedup
+/*		elementlist_dedup_skip(ededup, element);*/
+
+		fprintf(FP, "%s\n", unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc));
+	}
+
+	unm_uninit(&group1);
+	return 0;
+}
+
+/* via is: Position shape Xstart Ystart Xend Yend width
+   Description layer 0 netcode timestamp status
+   Shape parameter is set to 0 (reserved for future) */
+static int write_kicad_legacy_layout_vias(FILE *FP, pcb_data_t *Data, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	gdl_iterator_t it;
+	pcb_pstk_t *ps;
+	pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask;
+	pcb_pstk_compshape_t cshape;
+	pcb_bool plated;
+
+	padstacklist_foreach(&Data->padstack, &it, ps) {
+		if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+			if (cshape != PCB_PSTK_COMPAT_ROUND) {
+				pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "Failed to export via: only round shaped vias, with copper ring, are supported", NULL);
+				continue;
+			}
+
+			pcb_fprintf(FP, "Po 3 %.0mk %.0mk %.0mk %.0mk %.0mk\n", /* testing kicad printf */
+				x + xOffset, y + yOffset, x + xOffset, y + yOffset, pad_dia);
+#warning TODO: check if drill_dia can be applied
+#warning TODO: bbvia
+			pcb_fprintf(FP, "De 15 1 0 0 0\n"); /* this is equivalent to 0F, via from 15 -> 0 */
+		}
+	}
+	return 0;
+}
+
+/* generates a default via drill size for the layout */
+static int write_kicad_legacy_layout_via_drill_size(FILE *FP)
+{
+#warning TODO: do not hardwire this
+	pcb_fprintf(FP, "ViaDrill 250\n"); /* decimil format, default for now, ~= 0.635mm */
+	return 0;
+}
+
+static int write_kicad_legacy_layout_tracks(FILE *FP, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	gdl_iterator_t it;
+	pcb_line_t *line;
+	pcb_cardinal_t currentLayer = number;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		int localFlag = 0;
+		linelist_foreach(&layer->Line, &it, line) {
+			if (currentLayer < 16) { /* a copper line i.e. track */
+				pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness);
+				pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */
+			}
+			else if ((currentLayer == 20) || (currentLayer == 21) || (currentLayer == 28)) { /* a silk line or outline */
+				fputs("$DRAWSEGMENT\n", FP);
+				pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", line->Point1.X + xOffset, line->Point1.Y + yOffset, line->Point2.X + xOffset, line->Point2.Y + yOffset, line->Thickness);
+				pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* omitting net info */
+				fputs("$EndDRAWSEGMENT\n", FP);
+			}
+			localFlag |= 1;
+		}
+		return localFlag;
+	}
+	else {
+		return 0;
+	}
+}
+
+static int write_kicad_legacy_layout_arcs(FILE *FP, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	gdl_iterator_t it;
+	pcb_arc_t *arc;
+	pcb_arc_t localArc; /* for converting ellipses to circular arcs */
+	pcb_cardinal_t currentLayer = number;
+	pcb_coord_t radius, xStart, yStart, xEnd, yEnd;
+	int copperStartX; /* used for mapping geda copper arcs onto kicad copper lines */
+	int copperStartY; /* used for mapping geda copper arcs onto kicad copper lines */
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		int localFlag = 0;
+		int kicadArcShape = 2; /* 3 = circle, and 2 = arc, 1= rectangle used in eeschema only */
+		arclist_foreach(&layer->Arc, &it, arc) {
+			localArc = *arc;
+			if (arc->Width > arc->Height) {
+				radius = arc->Height;
+				localArc.Width = radius;
+			}
+			else {
+				radius = arc->Width;
+				localArc.Height = radius;
+			}
+			if (arc->Delta == 360.0 || arc->Delta == -360.0) { /* it's a circle */
+				kicadArcShape = 3;
+			}
+			else { /* it's an arc */
+				kicadArcShape = 2;
+			}
+
+			xStart = localArc.X + xOffset;
+			yStart = localArc.Y + yOffset;
+			pcb_arc_get_end(&localArc, 1, &xEnd, &yEnd);
+			xEnd += xOffset;
+			yEnd += yOffset;
+			pcb_arc_get_end(&localArc, 0, &copperStartX, &copperStartY);
+			copperStartX += xOffset;
+			copperStartY += yOffset;
+
+			if (currentLayer < 16) { /* a copper arc, i.e. track, is unsupported by kicad, and will be exported as a line */
+				kicadArcShape = 0; /* make it a line for copper layers - kicad doesn't do arcs on copper */
+				pcb_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, copperStartX, copperStartY, xEnd, yEnd, arc->Thickness);
+				pcb_fprintf(FP, "De %d 0 0 0 0\n", currentLayer); /* in theory, copper arcs unsupported by kicad, make angle = 0 */
+			}
+			else if ((currentLayer == 20) || (currentLayer == 21) || (currentLayer == 28)) { /* a silk arc or outline */
+				fputs("$DRAWSEGMENT\n", FP);
+				pcb_fprintf(FP, "Po %d %.0mk %.0mk %.0mk %.0mk %.0mk\n", kicadArcShape, xStart, yStart, xEnd, yEnd, arc->Thickness);
+				pcb_fprintf(FP, "De %d 0 %mA 0 0\n", currentLayer, arc->Delta); /* in theory, decidegrees != 900 unsupported by older kicad */
+				fputs("$EndDRAWSEGMENT\n", FP);
+			}
+			localFlag |= 1;
+		}
+		return localFlag;
+	}
+	else {
+		return 0;
+	}
+}
+
+static int write_kicad_legacy_layout_text(FILE *FP, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	pcb_font_t *myfont = pcb_font(PCB, 0, 1);
+	pcb_coord_t mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */
+	pcb_coord_t defaultStrokeThickness = 100 * 2540; /* use 100 mil as default 100% stroked font line thickness */
+	int kicadMirrored = 1; /* 1 is not mirrored, 0  is mirrored */
+
+	pcb_coord_t defaultXSize;
+	pcb_coord_t defaultYSize;
+	pcb_coord_t strokeThickness;
+	int rotation;
+	pcb_coord_t textOffsetX;
+	pcb_coord_t textOffsetY;
+	pcb_coord_t halfStringWidth;
+	pcb_coord_t halfStringHeight;
+	int localFlag;
+
+	gdl_iterator_t it;
+	pcb_text_t *text;
+	pcb_cardinal_t currentLayer = number;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		localFlag = 0;
+		textlist_foreach(&layer->Text, &it, text) {
+			if ((currentLayer < 16) || (currentLayer == 20) || (currentLayer == 21)) { /* copper or silk layer text */
+				fputs("$TEXTPCB\nTe \"", FP);
+				fputs(text->TextString, FP);
+				fputs("\"\n", FP);
+				defaultXSize = 5 * PCB_SCALE_TEXT(mWidth, text->Scale) / 6; /* IIRC kicad treats this as kerned width of upper case m */
+				defaultYSize = defaultXSize;
+				strokeThickness = PCB_SCALE_TEXT(defaultStrokeThickness, text->Scale / 2);
+				rotation = 0;
+				textOffsetX = 0;
+				textOffsetY = 0;
+				halfStringWidth = (text->BoundingBox.X2 - text->BoundingBox.X1) / 2;
+				if (halfStringWidth < 0) {
+					halfStringWidth = -halfStringWidth;
+				}
+				halfStringHeight = (text->BoundingBox.Y2 - text->BoundingBox.Y1) / 2;
+				if (halfStringHeight < 0) {
+					halfStringHeight = -halfStringHeight;
+				}
+				if (text->Direction == 3) { /*vertical down */
+					if (currentLayer == 0 || currentLayer == 20) { /* back copper or silk */
+						rotation = 2700;
+						kicadMirrored = 0; /* mirrored */
+						textOffsetY -= halfStringHeight;
+						textOffsetX -= 2 * halfStringWidth; /* was 1*hsw */
+					}
+					else { /* front copper or silk */
+						rotation = 2700;
+						kicadMirrored = 1; /* not mirrored */
+						textOffsetY = halfStringHeight;
+						textOffsetX -= halfStringWidth;
+					}
+				}
+				else if (text->Direction == 2) { /*upside down */
+					if (currentLayer == 0 || currentLayer == 20) { /* back copper or silk */
+						rotation = 0;
+						kicadMirrored = 0; /* mirrored */
+						textOffsetY += halfStringHeight;
+					}
+					else { /* front copper or silk */
+						rotation = 1800;
+						kicadMirrored = 1; /* not mirrored */
+						textOffsetY -= halfStringHeight;
+					}
+					textOffsetX = -halfStringWidth;
+				}
+				else if (text->Direction == 1) { /*vertical up */
+					if (currentLayer == 0 || currentLayer == 20) { /* back copper or silk */
+						rotation = 900;
+						kicadMirrored = 0; /* mirrored */
+						textOffsetY = halfStringHeight;
+						textOffsetX += halfStringWidth;
+					}
+					else { /* front copper or silk */
+						rotation = 900;
+						kicadMirrored = 1; /* not mirrored */
+						textOffsetY = -halfStringHeight;
+						textOffsetX = 0; /* += halfStringWidth; */
+					}
+				}
+				else if (text->Direction == 0) { /*normal text */
+					if (currentLayer == 0 || currentLayer == 20) { /* back copper or silk */
+						rotation = 1800;
+						kicadMirrored = 0; /* mirrored */
+						textOffsetY -= halfStringHeight;
+					}
+					else { /* front copper or silk */
+						rotation = 0;
+						kicadMirrored = 1; /* not mirrored */
+						textOffsetY += halfStringHeight;
+					}
+					textOffsetX = halfStringWidth;
+				}
+				pcb_fprintf(FP, "Po %.0mk %.0mk %.0mk %.0mk %.0mk %d\n", text->X + xOffset + textOffsetX, text->Y + yOffset + textOffsetY, defaultXSize, defaultYSize, strokeThickness, rotation);
+				pcb_fprintf(FP, "De %d %d B98C Normal\n", currentLayer, kicadMirrored); /* timestamp made up B98C  */
+				fputs("$EndTEXTPCB\n", FP);
+			}
+			localFlag |= 1;
+		}
+		return localFlag;
+	}
+	else {
+		return 0;
+	}
+}
+
+
+static int write_kicad_legacy_equipotential_netlists(FILE *FP, pcb_board_t *Layout)
+{
+	int n; /* code mostly lifted from netlist.c */
+	int netNumber;
+	pcb_lib_menu_t *menu;
+	pcb_lib_entry_t *netlist;
+
+	/* first we write a default netlist for the 0 net, which is for unconnected pads in pcbnew */
+	fputs("$EQUIPOT\n", FP);
+	fputs("Na 0 \"\"\n", FP);
+	fputs("St ~\n", FP);
+	fputs("$EndEQUIPOT\n", FP);
+
+	/* now we step through any available netlists and generate descriptors */
+	for(n = 0, netNumber = 1; n < Layout->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++, netNumber++) {
+		menu = &Layout->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
+		netlist = &menu->Entry[0];
+		if (netlist != NULL) {
+			fputs("$EQUIPOT\n", FP);
+			fprintf(FP, "Na %d \"%s\"\n", netNumber, pcb_netlist_name(menu)); /* netlist 0 was used for unconnected pads  */
+			fputs("St ~\n", FP);
+			fputs("$EndEQUIPOT\n", FP);
+		}
+	}
+	return 0;
+}
+
+static void print_pstk_net(FILE *FP, pcb_board_t *Layout, pcb_pstk_t *ps)
+{
+	pcb_lib_menu_t *current_pin_menu = NULL;
+
+	if (Layout != NULL)
+		current_pin_menu = pcb_netlist_find_net4term(Layout, (pcb_any_obj_t *)ps);
+	if ((current_pin_menu != NULL) && (pcb_netlist_net_idx(Layout, current_pin_menu) != PCB_NETLIST_INVALID_INDEX))
+		fprintf(FP, "Ne %d \"%s\"\n", (1 + pcb_netlist_net_idx(Layout, current_pin_menu)), pcb_netlist_name(current_pin_menu)); /* library parts have empty net descriptors, in a .brd they don't */
+	else
+		fprintf(FP, "Ne 0 \"\"\n"); /* unconnected pads have zero for net */
+}
+
+static int io_kicad_legacy_write_subc(FILE *FP, pcb_board_t *pcb, pcb_subc_t *subc, pcb_coord_t xOffset, pcb_coord_t yOffset, const char *uname)
+{
+	pcb_pstk_t *ps;
+	pcb_coord_t ox, oy, sox, soy;
+	int on_bottom;
+	int copperLayer; /* hard coded default, 0 is bottom copper */
+	gdl_iterator_t it;
+	int n, silkLayer;
+
+	if (pcb_subc_get_origin(subc, &sox, &soy) != 0) {
+		pcb_io_incompat_save(subc->parent.data, (pcb_any_obj_t *)subc, "Failed to get origin of subcircuit", "fix the missing subc-aux layer");
+		return -1;
+	}
+	if (pcb_subc_get_side(subc, &on_bottom) != 0) {
+		pcb_io_incompat_save(subc->parent.data, (pcb_any_obj_t *)subc, "Failed to get placement side of subcircuit", "fix the missing subc-aux layer");
+		return -1;
+	}
+
+	ox = sox + xOffset;
+	oy = soy + yOffset;
+
+	if (on_bottom) {
+		copperLayer = 0;
+		silkLayer = 20;
+	}
+	else {
+		copperLayer = 15;
+		silkLayer = 21;
+	}
+
+	fprintf(FP, "$MODULE %s\n", uname);
+#warning TODO: do not hardwire time stamps
+	pcb_fprintf(FP, "Po %.0mk %.0mk 0 %d 51534DFF 00000000 ~~\n", ox, oy, copperLayer);
+	fprintf(FP, "Li %s\n", uname); /* This needs to be unique */
+	fprintf(FP, "Cd %s\n", uname);
+	fputs("Sc 0\n", FP);
+	fputs("AR\n", FP);
+#warning TODO: is this the origin point? if so, it should be sox and soy
+	fputs("Op 0 0 0\n", FP);
+
+#warning TODO: do not hardwire coords
+#warning TODO: figure how to turn off displaying these
+	fprintf(FP, "T0 0 -4000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "refdes")));
+	fprintf(FP, "T1 0 -5000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "value")));
+	fprintf(FP, "T2 0 -6000 600 600 0 120 N V %d N \"%s\"\n", silkLayer, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")));
+
+	/* export padstacks */
+	padstacklist_foreach(&subc->data->padstack, &it, ps) {
+		pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask, x1, y1, x2, y2, thickness;
+		pcb_pstk_compshape_t cshape;
+		pcb_bool plated, square, nopaste;
+		double psrot;
+
+		if (ps->term == NULL) {
+			pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)ps, "can't export non-terminal padstack in subcircuit, omitting the object", NULL);
+			continue;
+		}
+
+		psrot = ps->rot;
+		if (ps->smirror)
+			psrot = -psrot;
+
+		if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+			fputs("$PAD\n", FP);
+			pcb_fprintf(FP, "Po %.0mk %.0mk\n", x - sox, y - soy);  /* positions of pad */
+			fputs("Sh ", FP); /* pin shape descriptor */
+			pcb_print_quoted_string(FP, (char *)PCB_EMPTY(ps->term));
+
+			if (cshape == PCB_PSTK_COMPAT_SQUARE) fputs(" R ", FP);
+			else if (cshape == PCB_PSTK_COMPAT_ROUND) fputs(" C ", FP);
+			else {
+				pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)ps, "can't export shaped pin; needs to be square or circular - using circular instead", NULL);
+				fputs(" C ", FP);
+			}
+			pcb_fprintf(FP, "%.0mk %.0mk ", pad_dia, pad_dia); /* height = width */
+			fprintf(FP, "0 0 %f\n", psrot * 10); /* deltaX deltaY Orientation as float in decidegrees */
+
+			/* drill details; size and x,y pos relative to pad location */
+			pcb_fprintf(FP, "Dr %.0mk 0 0\n", drill_dia);
+
+			fputs("At STD N 00E0FFFF\n", FP); /* through hole STD pin, all copper layers */
+
+			print_pstk_net(FP, pcb, ps);
+			fputs("$EndPAD\n", FP);
+		}
+		else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) {
+			/* the above check only makes sure this is a plain padstack, get the geometry from the copper layer shape */
+			char shape_chr;
+			int n, has_mask = 0, on_bottom;
+			pcb_pstk_proto_t *proto = pcb_pstk_get_proto_(subc->data, ps->proto);
+			pcb_pstk_tshape_t *tshp = &proto->tr.array[0];
+			pcb_coord_t w, h, cx, cy;
+			int found = 0;
+
+			fputs("$PAD\n", FP); /* start pad descriptor for an smd pad */
+
+#warning TODO: remove this code dup with io_kicad
+			for(n = 0; n < tshp->len; n++) {
+				if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
+					int i;
+					pcb_line_t line;
+					pcb_box_t bx;
+					pcb_pstk_shape_t *shape = &tshp->shape[n];
+					
+					if (found)
+						continue;
+					found = 1;
+
+					on_bottom = tshp->shape[n].layer_mask & PCB_LYT_BOTTOM;
+					if (ps->smirror) on_bottom = !on_bottom;
+
+					switch(shape->shape) {
+						case PCB_PSSH_POLY:
+							bx.X1 = bx.X2 = shape->data.poly.x[0];
+							bx.Y1 = bx.Y2 = shape->data.poly.y[0];
+							for(i = 1; i < shape->data.poly.len; i++)
+								pcb_box_bump_point(&bx, shape->data.poly.x[i], shape->data.poly.y[i]);
+							w = (bx.X2 - bx.X1);
+							h = (bx.Y2 - bx.Y1);
+							cx = (bx.X1 + bx.X2)/2;
+							cy = (bx.Y1 + bx.Y2)/2;
+							shape_chr = 'R';
+							break;
+						case PCB_PSSH_LINE:
+							line.Point1.X = shape->data.line.x1;
+							line.Point1.Y = shape->data.line.y1;
+							line.Point2.X = shape->data.line.x2;
+							line.Point2.Y = shape->data.line.y2;
+							line.Thickness = shape->data.line.thickness;
+							line.Clearance = 0;
+							line.Flags = pcb_flag_make(shape->data.line.square ? PCB_FLAG_SQUARE : 0);
+							pcb_line_bbox(&line);
+							w = (line.BoundingBox.X2 - line.BoundingBox.X1);
+							h = (line.BoundingBox.Y2 - line.BoundingBox.Y1);
+							cx = (shape->data.line.x1 + shape->data.line.x2)/2;
+							cy = (shape->data.line.y1 + shape->data.line.y2)/2;
+							shape_chr = shape->data.line.square ? 'R' : 'C';
+							break;
+						case PCB_PSSH_CIRC:
+							w = h = shape->data.circ.dia;
+							cx = shape->data.circ.x;
+							cy = shape->data.circ.y;
+							shape_chr = 'C';
+							break;
+					}
+				}
+				if (tshp->shape[n].layer_mask & PCB_LYT_MASK)
+					has_mask = 1;
+			}
+			pcb_fprintf(FP, "Po %.0mk %.0mk\n", ps->x + cx - sox, ps->y + cy - soy);  /* positions of pad */
+
+			fputs("Sh ", FP); /* pin shape descriptor */
+			pcb_print_quoted_string(FP, (char *)PCB_EMPTY(ps->term));
+			pcb_fprintf(FP, " %c %.0mk %.0mk ", shape_chr, w, h);
+
+			pcb_fprintf(FP, "0 0 %10f\n", psrot*10.0); /* deltaX deltaY Orientation as float in decidegrees */
+
+			fputs("Dr 0 0 0\n", FP); /* drill details; zero size; x,y pos vs pad location */
+
+			 /* SMD pin, need to use right layer mask */
+			if (on_bottom)
+				fputs("At SMD N 00440001\n", FP);
+			else
+				fputs("At SMD N 00888000\n", FP);
+
+			print_pstk_net(FP, pcb, ps);
+			fputs("$EndPAD\n", FP);
+		}
+		else
+			pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)ps, "Can't convert padstack to pin or pad", "use a simpler, uniform shape");
+
+	}
+
+	/* export layer objects */
+	for(n = 0; n < subc->data->LayerN; n++) {
+		pcb_layer_t *ly = &subc->data->Layer[n];
+		pcb_layer_type_t lyt = pcb_layer_flags_(ly);
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+		pcb_poly_t *poly;
+		pcb_text_t *text;
+		pcb_coord_t arcStartX, arcStartY, arcEndX, arcEndY;
+		int silkLayer;
+
+		if (!(lyt & PCB_LYT_SILK)) {
+			linelist_foreach(&ly->Line, &it, line)
+				pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)line, "can't save non-silk lines in subcircuits", "convert terminals to padstacks, remove the rest");
+			arclist_foreach(&ly->Arc, &it, arc)
+				pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)arc, "can't save non-silk arc in subcircuits", "remove this arc");
+		}
+
+		polylist_foreach(&ly->Polygon, &it, poly)
+			pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)poly, "can't save polygons in subcircuits", "convert square terminals to padstacks, remove the rest");
+
+		textlist_foreach(&ly->Text, &it, text)
+			if (!PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text))
+				pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)text, "can't save text in subcircuits", "remove the text object");
+
+		silkLayer = (lyt & PCB_LYT_BOTTOM) ? 20 : 21;
+
+		linelist_foreach(&ly->Line, &it, line) {
+			pcb_fprintf(FP, "DS %.0mk %.0mk %.0mk %.0mk %.0mk ",
+				line->Point1.X - sox, line->Point1.Y - soy,
+				line->Point2.X - sox, line->Point2.Y - soy,
+				line->Thickness);
+			fprintf(FP, "%d\n", silkLayer);
+		}
+
+		arclist_foreach(&ly->Arc, &it, arc) {
+			pcb_arc_get_end(arc, 0, &arcStartX, &arcStartY);
+			pcb_arc_get_end(arc, 1, &arcEndX, &arcEndY);
+
+			if ((arc->Delta == 360.0) || (arc->Delta == -360.0)) { /* it's a circle */
+				pcb_fprintf(FP, "DC %.0mk %.0mk %.0mk %.0mk %.0mk ",
+					arc->X - sox, arc->Y - soy, /* centre */
+					arcStartX - sox, arcStartY - soy, /* on circle */
+					arc->Thickness);
+			}
+			else {
+				pcb_fprintf(FP, "DA %.0mk %.0mk %.0mk %.0mk %mA %.0mk ",
+					arc->X - sox, arc->Y - soy, /* centre */
+					arcEndX - sox, arcEndY - soy,
+					arc->Delta, /* CW delta angle in decidegrees */
+					arc->Thickness);
+			}
+			fprintf(FP, "%d\n", silkLayer); /* and now append a suitable Kicad layer, front silk = 21, back silk 20 */
+		}
+	}
+
+	fprintf(FP, "$EndMODULE %s\n", uname);
+
+	return 0;
+}
+
+static int write_kicad_legacy_layout_subcs(FILE *FP, pcb_board_t *Layout, pcb_data_t *Data, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	gdl_iterator_t sit;
+	pcb_subc_t *subc;
+	unm_t group1;
+
+	unm_init(&group1);
+
+	subclist_foreach(&Data->subc, &sit, subc) {
+		const char *uname = unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc);
+#warning TODO: what did we need this for?
+/*		elementlist_dedup_skip(ededup, element); /* skip duplicate elements */
+		io_kicad_legacy_write_subc(FP, PCB, subc, xOffset, yOffset, uname);
+	}
+
+	unm_uninit(&group1);
+	return 0;
+}
+
+static int write_kicad_legacy_layout_polygons(FILE *FP, pcb_cardinal_t number, pcb_layer_t *layer, pcb_coord_t xOffset, pcb_coord_t yOffset)
+{
+	int i, j;
+	gdl_iterator_t it;
+	pcb_poly_t *polygon;
+	pcb_cardinal_t currentLayer = number;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		int localFlag = 0;
+		polylist_foreach(&layer->Polygon, &it, polygon) {
+			if (polygon->HoleIndexN == 0) { /* no holes defined within polygon, which we implement support for first */
+
+				/* preliminaries for zone settings */
+				fputs("$CZONE_OUTLINE\n", FP);
+				fputs("ZInfo 478E3FC8 0 \"\"\n", FP); /* use default empty netname, net 0, not connected */
+				fprintf(FP, "ZLayer %d\n", currentLayer);
+				fprintf(FP, "ZAux %d E\n", polygon->PointN); /* corner count, use edge hatching for displaying the zone in pcbnew */
+				fputs("ZClearance 200 X\n", FP); /* set pads/pins to not be connected to pours in the zone by default */
+				fputs("ZMinThickness 190\n", FP); /* minimum copper thickness in zone, default setting */
+				fputs("ZOptions 0 32 F 200 200\n", FP); /* solid fill, 32 segments per arc, antipad thickness, thermal stubs width(s) */
+
+				/* now the zone outline is defined */
+
+				for(i = 0, j = 0; i < polygon->PointN; i++) {
+					if (i == (polygon->PointN - 1)) {
+						j = 1; /* flags that this is the last vertex of the outline */
+					}
+					pcb_fprintf(FP, "ZCorner %.0mk %.0mk %d\n", polygon->Points[i].X + xOffset, polygon->Points[i].Y + yOffset, j);
+				}
+
+				/* in here could go additional plolygon descriptors for holes removed from  the previously defined outer polygon */
+				fputs("$endCZONE_OUTLINE\n", FP);
+			}
+			localFlag |= 1;
+		}
+		return localFlag;
+	}
+	else {
+		return 0;
+	}
+}
+
+int io_kicad_legacy_write_buffer(pcb_plug_io_t *ctx, FILE *FP, pcb_buffer_t *buff, pcb_bool elem_only)
+{
+	if (pcb_subclist_length(&buff->Data->subc) == 0) {
+		pcb_message(PCB_MSG_ERROR, "Buffer has no subcircuits!\n");
+		return -1;
+	}
+
+#warning TODO: no hardwiring of dates
+	fputs("PCBNEW-LibModule-V1	jan 01 jan 2016 00:00:01 CET\n", FP);
+	fputs("Units mm\n", FP);
+	fputs("$INDEX\n", FP);
+	io_kicad_legacy_write_subc_index(FP, buff->Data);
+	fputs("$EndINDEX\n", FP);
+
+	pcb_write_footprint_data(FP, buff->Data, "kicadl");
+
+	return 0;
+}
+
+int io_kicad_legacy_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	pcb_cardinal_t i;
+	int kicadLayerCount = 0;
+	int physicalLayerCount = 0;
+	int layer = 0;
+	int currentKicadLayer = 0;
+	int currentGroup = 0;
+	pcb_coord_t outlineThickness = PCB_MIL_TO_COORD(10);
+
+	int bottomCount;
+	pcb_layer_id_t *bottomLayers;
+	int innerCount;
+	pcb_layer_id_t *innerLayers;
+	int topCount;
+	pcb_layer_id_t *topLayers;
+	int bottomSilkCount;
+	pcb_layer_id_t *bottomSilk;
+	int topSilkCount;
+	pcb_layer_id_t *topSilk;
+	int outlineCount;
+	pcb_layer_id_t *outlineLayers;
+
+	pcb_coord_t LayoutXOffset;
+	pcb_coord_t LayoutYOffset;
+
+	/* Kicad expects a layout "sheet" size to be specified in mils, and A4, A3 etc... */
+	int A4HeightMil = 8267;
+	int A4WidthMil = 11700;
+	int sheetHeight = A4HeightMil;
+	int sheetWidth = A4WidthMil;
+	int paperSize = 4; /* default paper size is A4 */
+
+	fputs("PCBNEW-BOARD Version 1 jan 01 jan 2016 00:00:01 CET\n", FP);
+
+	fputs("$GENERAL\n", FP);
+	fputs("Ly 1FFF8001\n", FP); /* obsolete, needed for old pcbnew */
+	/*puts("Units mm\n",FP); *//*decimils most universal legacy format */
+	fputs("$EndGENERAL\n", FP);
+
+	fputs("$SHEETDESCR\n", FP);
+
+#warning TODO: se this from io_kicad, do not duplicate the code here
+	/* we sort out the needed kicad sheet size here, using A4, A3, A2, A1 or A0 size as needed */
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > A4WidthMil || PCB_COORD_TO_MIL(PCB->MaxHeight) > A4HeightMil) {
+		sheetHeight = A4WidthMil; /* 11.7" */
+		sheetWidth = 2 * A4HeightMil; /* 16.5" */
+		paperSize = 3; /* this is A3 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 2 * A4HeightMil; /* 16.5" */
+		sheetWidth = 2 * A4WidthMil; /* 23.4" */
+		paperSize = 2; /* this is A2 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 2 * A4WidthMil; /* 23.4" */
+		sheetWidth = 4 * A4HeightMil; /* 33.1" */
+		paperSize = 1; /* this is A1 size */
+	}
+	if (PCB_COORD_TO_MIL(PCB->MaxWidth) > sheetWidth || PCB_COORD_TO_MIL(PCB->MaxHeight) > sheetHeight) {
+		sheetHeight = 4 * A4HeightMil; /* 33.1" */
+		sheetWidth = 4 * A4WidthMil; /* 46.8"  */
+		paperSize = 0; /* this is A0 size; where would you get it made ?!?! */
+	}
+
+	fprintf(FP, "Sheet A%d ", paperSize);
+	/* we now sort out the offsets for centring the layout in the chosen sheet size here */
+	if (sheetWidth > PCB_COORD_TO_MIL(PCB->MaxWidth)) { /* usually A4, bigger if needed */
+		fprintf(FP, "%d ", sheetWidth); /* legacy kicad: elements decimils, sheet size mils */
+		LayoutXOffset = PCB_MIL_TO_COORD(sheetWidth) / 2 - PCB->MaxWidth / 2;
+	}
+	else { /* the layout is bigger than A0; most unlikely, but... */
+		pcb_fprintf(FP, "%.0ml ", PCB->MaxWidth);
+		LayoutXOffset = 0;
+	}
+	if (sheetHeight > PCB_COORD_TO_MIL(PCB->MaxHeight)) {
+		fprintf(FP, "%d", sheetHeight);
+		LayoutYOffset = PCB_MIL_TO_COORD(sheetHeight) / 2 - PCB->MaxHeight / 2;
+	}
+	else { /* the layout is bigger than A0; most unlikely, but... */
+		pcb_fprintf(FP, "%.0ml", PCB->MaxHeight);
+		LayoutYOffset = 0;
+	}
+	fputs("\n", FP);
+	fputs("$EndSHEETDESCR\n", FP);
+
+	fputs("$SETUP\n", FP);
+	fputs("InternalUnit 0.000100 INCH\n", FP); /* decimil is the default v1 kicad legacy unit */
+
+	/* here we define the copper layers in the exported kicad file */
+	physicalLayerCount = pcb_layergrp_list(PCB, PCB_LYT_COPPER, NULL, 0);
+
+	fputs("Layers ", FP);
+	kicadLayerCount = physicalLayerCount;
+	if (kicadLayerCount % 2 == 1) {
+		kicadLayerCount++; /* kicad doesn't like odd numbers of layers, has been deprecated for some time apparently */
+	}
+
+	fprintf(FP, "%d\n", kicadLayerCount);
+	layer = 0;
+	if (physicalLayerCount >= 1) {
+		fprintf(FP, "Layer[%d] COPPER_LAYER_0 signal\n", layer);
+	}
+	if (physicalLayerCount > 1) { /* seems we need to ignore layers > 16 due to kicad limitation */
+		for(layer = 1; (layer < (kicadLayerCount - 1)) && (layer < 15); layer++) {
+			fprintf(FP, "Layer[%d] Inner%d.Cu signal\n", layer, layer);
+		}
+		fputs("Layer[15] COPPER_LAYER_15 signal\n", FP);
+	}
+
+	write_kicad_legacy_layout_via_drill_size(FP);
+
+	fputs("$EndSETUP\n", FP);
+
+	write_kicad_legacy_equipotential_netlists(FP, PCB);
+	write_kicad_legacy_layout_subcs(FP, PCB, PCB->Data, LayoutXOffset, LayoutYOffset);
+
+	/* we now need to map pcb's layer groups onto the kicad layer numbers */
+	currentKicadLayer = 0;
+	currentGroup = 0;
+
+	/* figure out which pcb layers are bottom copper and make a list */
+	bottomCount = pcb_layer_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, NULL, 0);
+	if (bottomCount > 0) {
+		bottomLayers = malloc(sizeof(pcb_layer_id_t) * bottomCount);
+		pcb_layer_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, bottomLayers, bottomCount);
+	}
+	else {
+		bottomLayers = NULL;
+	}
+
+	/* figure out which pcb layers are internal copper layers and make a list */
+	innerCount = pcb_layer_list(PCB, PCB_LYT_INTERN | PCB_LYT_COPPER, NULL, 0);
+	if (innerCount > 0) {
+		innerLayers = malloc(sizeof(pcb_layer_id_t) * innerCount);
+		pcb_layer_list(PCB, PCB_LYT_INTERN | PCB_LYT_COPPER, innerLayers, innerCount);
+	}
+	else {
+		innerLayers = NULL;
+	}
+
+	/* figure out which pcb layers are top copper and make a list */
+	topCount = pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, NULL, 0);
+	if (topCount > 0) {
+		topLayers = malloc(sizeof(pcb_layer_id_t) * topCount);
+		pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, topLayers, topCount);
+	}
+	else {
+		topLayers = NULL;
+	}
+
+	/* figure out which pcb layers are bottom silk and make a list */
+	bottomSilkCount = pcb_layer_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, NULL, 0);
+	if (bottomSilkCount > 0) {
+		bottomSilk = malloc(sizeof(pcb_layer_id_t) * bottomSilkCount);
+		pcb_layer_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, bottomSilk, bottomSilkCount);
+	}
+	else {
+		bottomSilk = NULL;
+	}
+
+	/* figure out which pcb layers are top silk and make a list */
+	topSilkCount = pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, NULL, 0);
+	if (topSilkCount > 0) {
+		topSilk = malloc(sizeof(pcb_layer_id_t) * topSilkCount);
+		pcb_layer_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, topSilk, topSilkCount);
+	}
+	else {
+		topSilk = NULL;
+	}
+
+	/* figure out which pcb layers are outlines and make a list */
+	outlineCount = pcb_layer_list(PCB, PCB_LYT_OUTLINE, NULL, 0);
+	if (outlineCount > 0) {
+		outlineLayers = malloc(sizeof(pcb_layer_id_t) * outlineCount);
+		pcb_layer_list(PCB, PCB_LYT_OUTLINE, outlineLayers, outlineCount);
+	}
+	else {
+		outlineLayers = NULL;
+	}
+
+	/* we now proceed to write the outline tracks to the kicad file, layer by layer */
+	currentKicadLayer = 28; /* 28 is the edge cuts layer in kicad */
+	if (outlineCount > 0) {
+		for(i = 0; i < outlineCount; i++) { /* write top copper tracks, if any */
+			write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[outlineLayers[i]]), LayoutXOffset, LayoutYOffset);
+			write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[outlineLayers[i]]), LayoutXOffset, LayoutYOffset);
+		}
+	}
+	else { /* no outline layer per se, export the board margins instead  - obviously some scope to reduce redundant code... */
+		fputs("$DRAWSEGMENT\n", FP);
+		pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->MaxWidth / 2 - LayoutXOffset, PCB->MaxHeight / 2 - LayoutYOffset, PCB->MaxWidth / 2 + LayoutXOffset, PCB->MaxHeight / 2 - LayoutYOffset, outlineThickness);
+		pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer);
+		fputs("$EndDRAWSEGMENT\n", FP);
+		fputs("$DRAWSEGMENT\n", FP);
+		pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->MaxWidth / 2 + LayoutXOffset, PCB->MaxHeight / 2 - LayoutYOffset, PCB->MaxWidth / 2 + LayoutXOffset, PCB->MaxHeight / 2 + LayoutYOffset, outlineThickness);
+		pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer);
+		fputs("$EndDRAWSEGMENT\n", FP);
+		fputs("$DRAWSEGMENT\n", FP);
+		pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->MaxWidth / 2 + LayoutXOffset, PCB->MaxHeight / 2 + LayoutYOffset, PCB->MaxWidth / 2 - LayoutXOffset, PCB->MaxHeight / 2 + LayoutYOffset, outlineThickness);
+		pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer);
+		fputs("$EndDRAWSEGMENT\n", FP);
+		fputs("$DRAWSEGMENT\n", FP);
+		pcb_fprintf(FP, "Po 0 %.0mk %.0mk %.0mk %.0mk %.0mk\n", PCB->MaxWidth / 2 - LayoutXOffset, PCB->MaxHeight / 2 + LayoutYOffset, PCB->MaxWidth / 2 - LayoutXOffset, PCB->MaxHeight / 2 - LayoutYOffset, outlineThickness);
+		pcb_fprintf(FP, "De %d 0 0 0 0\n", currentKicadLayer);
+		fputs("$EndDRAWSEGMENT\n", FP);
+	}
+
+
+	/* we now proceed to write the bottom silk lines, arcs, text to the kicad legacy file, using layer 20 */
+	currentKicadLayer = 20; /* 20 is the bottom silk layer in kicad */
+	for(i = 0; i < bottomSilkCount; i++) { /* write bottom silk lines, if any */
+		write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[bottomSilk[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[bottomSilk[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_text(FP, currentKicadLayer, &(PCB->Data->Layer[bottomSilk[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the bottom copper text to the kicad legacy file, layer by layer */
+	currentKicadLayer = 0; /* 0 is the bottom copper layer in kicad */
+	for(i = 0; i < bottomCount; i++) { /* write bottom copper tracks, if any */
+		write_kicad_legacy_layout_text(FP, currentKicadLayer, &(PCB->Data->Layer[bottomLayers[i]]), LayoutXOffset, LayoutYOffset);
+	} /* 0 is the bottom most track in kicad */
+
+	/* we now proceed to write the internal copper text to the kicad file, layer by layer */
+	if (innerCount > 0) {
+		currentGroup = pcb_layer_get_group(PCB, innerLayers[0]);
+	}
+	for(i = 0, currentKicadLayer = 1; i < innerCount; i++) { /* write inner copper text, group by group */
+		if (currentGroup != pcb_layer_get_group(PCB, innerLayers[i])) {
+			currentGroup = pcb_layer_get_group(PCB, innerLayers[i]);
+			currentKicadLayer++;
+			if (currentKicadLayer > 14) {
+				currentKicadLayer = 14; /* kicad 16 layers in total, 0...15 */
+			}
+		}
+		write_kicad_legacy_layout_text(FP, currentKicadLayer, &(PCB->Data->Layer[innerLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the top copper text to the kicad legacy file, layer by layer */
+	currentKicadLayer = 15; /* 15 is the top most copper layer in kicad */
+	for(i = 0; i < topCount; i++) { /* write top copper tracks, if any */
+		write_kicad_legacy_layout_text(FP, currentKicadLayer, &(PCB->Data->Layer[topLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the top silk lines, arcs, text to the kicad legacy file, using layer 21 */
+	currentKicadLayer = 21; /* 21 is the top silk layer in kicad */
+	for(i = 0; i < topSilkCount; i++) { /* write top silk lines, if any */
+		write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[topSilk[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[topSilk[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_text(FP, currentKicadLayer, &(PCB->Data->Layer[topSilk[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* having done the graphical elements, we move onto tracks and vias */
+	fputs("$TRACK\n", FP);
+	write_kicad_legacy_layout_vias(FP, PCB->Data, LayoutXOffset, LayoutYOffset);
+
+	/* we now proceed to write the bottom copper tracks to the kicad legacy file, layer by layer */
+	currentKicadLayer = 0; /* 0 is the bottom copper layer in kicad */
+	for(i = 0; i < bottomCount; i++) { /* write bottom copper tracks, if any */
+		write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[bottomLayers[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[bottomLayers[i]]), LayoutXOffset, LayoutYOffset);
+	} /* 0 is the bottom most track in kicad */
+
+	/* we now proceed to write the internal copper tracks to the kicad file, layer by layer */
+	if (innerCount > 0) {
+		currentGroup = pcb_layer_get_group(PCB, innerLayers[0]);
+	}
+	for(i = 0, currentKicadLayer = 1; i < innerCount; i++) { /* write inner copper tracks, group by group */
+		if (currentGroup != pcb_layer_get_group(PCB, innerLayers[i])) {
+			currentGroup = pcb_layer_get_group(PCB, innerLayers[i]);
+			currentKicadLayer++;
+			if (currentKicadLayer > 14) {
+				currentKicadLayer = 14; /* kicad 16 layers in total, 0...15 */
+			}
+		}
+		write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[innerLayers[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[innerLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the top copper tracks to the kicad legacy file, layer by layer */
+	currentKicadLayer = 15; /* 15 is the top most copper layer in kicad */
+	for(i = 0; i < topCount; i++) { /* write top copper tracks, if any */
+		write_kicad_legacy_layout_tracks(FP, currentKicadLayer, &(PCB->Data->Layer[topLayers[i]]), LayoutXOffset, LayoutYOffset);
+		write_kicad_legacy_layout_arcs(FP, currentKicadLayer, &(PCB->Data->Layer[topLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+	fputs("$EndTRACK\n", FP);
+
+	/*
+	 * now we proceed to write polygons for each layer, and iterate much like we did for tracks
+	 */
+
+	/* we now proceed to write the bottom silk polygons  to the kicad legacy file, using layer 20 */
+	currentKicadLayer = 20; /* 20 is the bottom silk layer in kicad */
+	for(i = 0; i < bottomSilkCount; i++) { /* write bottom silk polygons, if any */
+		write_kicad_legacy_layout_polygons(FP, currentKicadLayer, &(PCB->Data->Layer[bottomSilk[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the bottom copper polygons to the kicad legacy file, layer by layer */
+	currentKicadLayer = 0; /* 0 is the bottom copper layer in kicad */
+	for(i = 0; i < bottomCount; i++) { /* write bottom copper polygons, if any */
+		write_kicad_legacy_layout_polygons(FP, currentKicadLayer, &(PCB->Data->Layer[bottomLayers[i]]), LayoutXOffset, LayoutYOffset);
+	} /* 0 is the bottom most track in kicad */
+
+	/* we now proceed to write the internal copper polygons to the kicad file, layer by layer */
+	if (innerCount > 0) {
+		currentGroup = pcb_layer_get_group(PCB, innerLayers[0]);
+	}
+	for(i = 0, currentKicadLayer = 1; i < innerCount; i++) { /* write inner copper polygons, group by group */
+		if (currentGroup != pcb_layer_get_group(PCB, innerLayers[i])) {
+			currentGroup = pcb_layer_get_group(PCB, innerLayers[i]);
+			currentKicadLayer++;
+			if (currentKicadLayer > 14) {
+				currentKicadLayer = 14; /* kicad 16 layers in total, 0...15 */
+			}
+		}
+		write_kicad_legacy_layout_polygons(FP, currentKicadLayer, &(PCB->Data->Layer[innerLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the top copper polygons to the kicad legacy file, layer by layer */
+	currentKicadLayer = 15; /* 15 is the top most copper layer in kicad */
+	for(i = 0; i < topCount; i++) { /* write top copper polygons, if any */
+		write_kicad_legacy_layout_polygons(FP, currentKicadLayer, &(PCB->Data->Layer[topLayers[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+	/* we now proceed to write the top silk polygons to the kicad legacy file, using layer 21 */
+	currentKicadLayer = 21; /* 21 is the top silk layer in kicad */
+	for(i = 0; i < topSilkCount; i++) { /* write top silk polygons, if any */
+		write_kicad_legacy_layout_polygons(FP, currentKicadLayer, &(PCB->Data->Layer[topSilk[i]]), LayoutXOffset, LayoutYOffset);
+	}
+
+
+	fputs("$EndBOARD\n", FP);
+
+	/* now free memory from arrays that were used */
+	if (bottomCount > 0) {
+		free(bottomLayers);
+	}
+	if (innerCount > 0) {
+		free(innerLayers);
+	}
+	if (topCount > 0) {
+		free(topLayers);
+	}
+	if (topSilkCount > 0) {
+		free(topSilk);
+	}
+	if (bottomSilkCount > 0) {
+		free(bottomSilk);
+	}
+	if (outlineCount > 0) {
+		free(outlineLayers);
+	}
+	return 0;
+}
+
+int io_kicad_legacy_write_element(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data)
+{
+	gdl_iterator_t sit;
+	pcb_subc_t *subc;
+	unm_t group1;
+	int res = 0;
+
+	unm_init(&group1);
+	subclist_foreach(&Data->subc, &sit, subc) {
+		const char *uname = unm_name(&group1, or_empty(pcb_attribute_get(&subc->Attributes, "footprint")), subc);
+		res |= io_kicad_legacy_write_subc(FP, PCB, subc, 0, 0, uname);
+	}
+	unm_uninit(&group1);
+
+	return res;
+}
Index: tags/2.0.1/src_plugins/io_kicad_legacy/write.h
===================================================================
--- tags/2.0.1/src_plugins/io_kicad_legacy/write.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_kicad_legacy/write.h	(revision 18980)
@@ -0,0 +1,35 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2016 Erich S. Heinzle
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include "data.h"
+
+int io_kicad_legacy_write_element(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data);
+int io_kicad_legacy_write_buffer(pcb_plug_io_t *ctx, FILE *FP, pcb_buffer_t *buff, pcb_bool elem_only);
+int io_kicad_legacy_write_pcb(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
Index: tags/2.0.1/src_plugins/io_lihata/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_lihata
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_lihata/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,16 @@
+put /local/pcb/mod {io_lihata}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/io_lihata/io_lihata.o
+ $(PLUGDIR)/io_lihata/write.o
+ $(PLUGDIR)/io_lihata/write_style.o
+ $(PLUGDIR)/io_lihata/read.o
+ $(PLUGDIR)/io_lihata/common.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/io_lihata/lht_conf.h}
+
+
+switch /local/pcb/io_lihata/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_lihata/TODO.check
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/TODO.check	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/TODO.check	(revision 18980)
@@ -0,0 +1,4 @@
+- poly/pin shapes
+- flags on any object type
+- name on any object type
+- line ->Number?
\ No newline at end of file
Index: tags/2.0.1/src_plugins/io_lihata/common.c
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/common.c	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Build an in-memory lihata document that represents the board then save it.
+   A document is built for the merge-save. */
+
+#include <stdio.h>
+#include "config.h"
+#include "data.h"
+#include "macro.h"
+#include "common.h"
+#include "thermal.h"
+
+static const char *thermal_style[] = {
+	NULL,
+	"diagonal-sharp",
+	"horver-sharp",
+	"solid",
+	"diagonal-round",
+	"horver-round"
+};
+
+static const int thermal_style_bits[] = {
+	0,
+	PCB_THERMAL_ON | PCB_THERMAL_DIAGONAL | PCB_THERMAL_SHARP,
+	PCB_THERMAL_ON | PCB_THERMAL_SHARP,
+	PCB_THERMAL_ON | PCB_THERMAL_SOLID,
+	PCB_THERMAL_ON | PCB_THERMAL_DIAGONAL | PCB_THERMAL_ROUND,
+	PCB_THERMAL_ON | PCB_THERMAL_ROUND
+};
+
+int io_lihata_resolve_thermal_style_old(const char *name)
+{
+	int n;
+	char *end;
+
+	if (name == NULL)
+		return 0;
+
+	for(n = 1; n < PCB_ENTRIES(thermal_style); n++)
+		if (strcmp(name, thermal_style[n]) == 0)
+			return thermal_style_bits[n];
+
+	n = strtol(name, &end, 10);
+	if (*end == '\0') {
+		if ((n >= 0) && (n < sizeof(thermal_style_bits) / sizeof(thermal_style_bits[0])))
+			return thermal_style_bits[n];
+	}
+
+	return 0;
+}
+
+const char *io_lihata_thermal_style_old(int idx)
+{
+	if ((idx > 0) && (idx < PCB_ENTRIES(thermal_style)))
+		return thermal_style[idx];
+	return NULL;
+}
Index: tags/2.0.1/src_plugins/io_lihata/common.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/common.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/common.h	(revision 18980)
@@ -0,0 +1,8 @@
+/* Because all the macros expect it, that's why.  */
+typedef struct {
+	pcb_flag_t Flags;
+} io_lihata_flag_holder;
+
+/* Convert between thermal style index and flag's textual representation */
+const char *io_lihata_thermal_style_old(int idx);
+int io_lihata_resolve_thermal_style_old(const char *name);
Index: tags/2.0.1/src_plugins/io_lihata/io_lihata.c
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/io_lihata.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/io_lihata.c	(revision 18980)
@@ -0,0 +1,173 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "read.h"
+#include "write.h"
+#include "io_lihata.h"
+
+pcb_plug_io_t plug_io_lihata_v1, plug_io_lihata_v2, plug_io_lihata_v3, plug_io_lihata_v4, plug_io_lihata_v5;
+conf_io_lihata_t conf_io_lihata;
+
+int io_lihata_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	int lih = (strcmp(fmt, "lihata") == 0);
+
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((lih) && (typ & PCB_IOT_BUFFER) && (ctx->write_buffer != NULL))
+		return 40;
+
+	if (!lih || ((typ & (~(PCB_IOT_PCB | PCB_IOT_FONT | PCB_IOT_FOOTPRINT))) != 0))
+		return 0;
+
+	if (wr)
+		return ctx->save_preference_prio;
+	return 100;
+}
+
+int pplg_check_ver_io_lihata(int ver_needed) { return 0; }
+
+void pplg_uninit_io_lihata(void)
+{
+	conf_unreg_fields("plugins/io_lihata/");
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v5);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v4);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v3);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v2);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v1);
+}
+
+int pplg_init_io_lihata(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	plug_io_lihata_v5.plugin_data = NULL;
+	plug_io_lihata_v5.fmt_support_prio = io_lihata_fmt;
+	plug_io_lihata_v5.test_parse = io_lihata_test_parse;
+	plug_io_lihata_v5.parse_pcb = io_lihata_parse_pcb;
+	plug_io_lihata_v5.parse_footprint = io_lihata_parse_element;
+	plug_io_lihata_v5.parse_font = io_lihata_parse_font;
+	plug_io_lihata_v5.write_font = io_lihata_write_font;
+	plug_io_lihata_v5.write_buffer = io_lihata_write_buffer;
+	plug_io_lihata_v5.write_footprint = io_lihata_write_element;
+	plug_io_lihata_v5.write_pcb = io_lihata_write_pcb_v5;
+	plug_io_lihata_v5.default_fmt = "lihata";
+	plug_io_lihata_v5.description = "lihata board v5";
+	plug_io_lihata_v5.save_preference_prio = 199;
+	plug_io_lihata_v5.default_extension = ".lht";
+	plug_io_lihata_v5.fp_extension = ".lht";
+	plug_io_lihata_v5.mime_type = "application/x-pcbrnd-board";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v5);
+
+	plug_io_lihata_v4.plugin_data = NULL;
+	plug_io_lihata_v4.fmt_support_prio = io_lihata_fmt;
+	plug_io_lihata_v4.test_parse = io_lihata_test_parse;
+	plug_io_lihata_v4.parse_pcb = io_lihata_parse_pcb;
+	plug_io_lihata_v4.parse_footprint = io_lihata_parse_element;
+	plug_io_lihata_v4.parse_font = io_lihata_parse_font;
+	plug_io_lihata_v4.write_font = io_lihata_write_font;
+	plug_io_lihata_v4.write_buffer = io_lihata_write_buffer;
+	plug_io_lihata_v4.write_footprint = io_lihata_write_element;
+	plug_io_lihata_v4.write_pcb = io_lihata_write_pcb_v4;
+	plug_io_lihata_v4.default_fmt = "lihata";
+	plug_io_lihata_v4.description = "lihata board v4";
+	plug_io_lihata_v4.save_preference_prio = 100;
+	plug_io_lihata_v4.default_extension = ".lht";
+	plug_io_lihata_v4.fp_extension = ".lht";
+	plug_io_lihata_v4.mime_type = "application/x-pcbrnd-board";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v4);
+
+	plug_io_lihata_v3.plugin_data = NULL;
+	plug_io_lihata_v3.fmt_support_prio = io_lihata_fmt;
+	plug_io_lihata_v3.test_parse = io_lihata_test_parse;
+	plug_io_lihata_v3.parse_pcb = io_lihata_parse_pcb;
+	plug_io_lihata_v3.parse_footprint = io_lihata_parse_element;
+	plug_io_lihata_v3.parse_font = io_lihata_parse_font;
+	plug_io_lihata_v3.write_font = io_lihata_write_font;
+	plug_io_lihata_v3.write_buffer = io_lihata_write_buffer;
+	plug_io_lihata_v3.write_footprint = io_lihata_write_element;
+	plug_io_lihata_v3.write_pcb = io_lihata_write_pcb_v3;
+	plug_io_lihata_v3.default_fmt = "lihata";
+	plug_io_lihata_v3.description = "lihata board v3";
+	plug_io_lihata_v3.save_preference_prio = 100;
+	plug_io_lihata_v3.default_extension = ".lht";
+	plug_io_lihata_v3.fp_extension = ".lht";
+	plug_io_lihata_v3.mime_type = "application/x-pcbrnd-board";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v3);
+
+	plug_io_lihata_v2.plugin_data = NULL;
+	plug_io_lihata_v2.fmt_support_prio = io_lihata_fmt;
+	plug_io_lihata_v2.test_parse = io_lihata_test_parse;
+	plug_io_lihata_v2.parse_pcb = io_lihata_parse_pcb;
+	plug_io_lihata_v2.parse_footprint = NULL;
+	plug_io_lihata_v2.parse_font = io_lihata_parse_font;
+	plug_io_lihata_v2.write_font = io_lihata_write_font;
+	plug_io_lihata_v2.write_buffer = NULL;
+	plug_io_lihata_v2.write_footprint = NULL;
+	plug_io_lihata_v2.write_pcb = io_lihata_write_pcb_v2;
+	plug_io_lihata_v2.default_fmt = "lihata";
+	plug_io_lihata_v2.description = "lihata board v2";
+	plug_io_lihata_v2.save_preference_prio = 100;
+	plug_io_lihata_v2.default_extension = ".lht";
+	plug_io_lihata_v2.fp_extension = ".lht";
+	plug_io_lihata_v2.mime_type = "application/x-pcbrnd-board";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v2);
+
+	plug_io_lihata_v1.plugin_data = NULL;
+	plug_io_lihata_v1.fmt_support_prio = io_lihata_fmt;
+	plug_io_lihata_v1.test_parse = io_lihata_test_parse;
+	plug_io_lihata_v1.parse_pcb = io_lihata_parse_pcb;
+	plug_io_lihata_v1.parse_footprint = NULL;
+	plug_io_lihata_v1.parse_font = io_lihata_parse_font;
+	plug_io_lihata_v1.write_font = io_lihata_write_font;
+	plug_io_lihata_v1.write_buffer = NULL;
+	plug_io_lihata_v1.write_footprint = NULL;
+	plug_io_lihata_v1.write_pcb = io_lihata_write_pcb_v1;
+	plug_io_lihata_v1.default_fmt = "lihata";
+	plug_io_lihata_v1.description = "lihata board v1";
+	plug_io_lihata_v1.save_preference_prio = 100;
+	plug_io_lihata_v1.default_extension = ".lht";
+	plug_io_lihata_v1.fp_extension = ".lht";
+	plug_io_lihata_v1.mime_type = "application/x-pcbrnd-board";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &plug_io_lihata_v1);
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags);
+#include "lht_conf_fields.h"
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_lihata/io_lihata.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/io_lihata.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/io_lihata.h	(revision 18980)
@@ -0,0 +1,32 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "conf.h"
+#include "lht_conf.h"
+
+extern conf_io_lihata_t conf_io_lihata;
+extern pcb_plug_io_t plug_io_lihata_v1, plug_io_lihata_v2, plug_io_lihata_v3, plug_io_lihata_v4, plug_io_lihata_v5;
+
Index: tags/2.0.1/src_plugins/io_lihata/io_lihata.pup
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/io_lihata.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/io_lihata.pup	(revision 18980)
@@ -0,0 +1,15 @@
+$class io
+$short lihata board format
+$long Load and save the design and footprints in the lihata board format.
+$state works
+$fmt-native yes
+$fmt-feature-r lihata pcb-rnd board (any version)
+$fmt-feature-w lihata pcb-rnd board (any version)
+$fmt-feature-r lihata pcb-rnd footprint (any version)
+$fmt-feature-w lihata pcb-rnd footprint (any version)
+$fmt-feature-r lihata pcb-rnd font (any version)
+$fmt-feature-w lihata pcb-rnd font (any version)
+$package (core)
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/io_lihata/lht_conf.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/lht_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/lht_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_IO_LIHATA_CONF_H
+#define PCB_IO_LIHATA_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct io_lihata {
+			CFT_STRING aux_pcb_pattern;  /* [obsolete] file name pattern to use when generating the .pcb backup */
+		} io_lihata;
+	} plugins;
+} conf_io_lihata_t;
+
+#endif
Index: tags/2.0.1/src_plugins/io_lihata/read.c
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/read.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/read.c	(revision 18980)
@@ -0,0 +1,2311 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Load a lihata document in-memory and walk the tree and build pcb native
+   structs. A full dom load is used instead of the event parser so that
+   symlinks and tree merges can be supported later. */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <liblihata/tree.h>
+#include <libminuid/libminuid.h>
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "flag_str.h"
+#include "compat_misc.h"
+#include "macro.h"
+#include "error.h"
+#include "misc_util.h"
+#include "layer.h"
+#include <genvector/vtp0.h>
+#include "common.h"
+#include "polygon.h"
+#include "conf_core.h"
+#include "obj_subc.h"
+#include "pcb_minuid.h"
+#include "thermal.h"
+#include "io_lihata.h"
+#include "safe_fs.h"
+#include "plug_footprint.h"
+#include "vtpadstack.h"
+#include "obj_pstk_inlines.h"
+
+#include "../src_plugins/lib_compat_help/subc_help.h"
+#include "../src_plugins/lib_compat_help/pstk_compat.h"
+#include "../src_plugins/lib_compat_help/elem_rot.h"
+
+#warning cleanup TODO: put these in a gloal load-context-struct
+vtp0_t post_ids, post_thermal_old, post_thermal_heavy;
+static int rdver;
+unsigned long warned, old_model_warned;
+
+/* Note: this works because of using str_flag compat_types */
+#define PCB_OBJ_VIA PCB_OBJ_PSTK
+#define PCB_OBJ_PIN PCB_OBJ_PSTK
+#define PCB_OBJ_PAD PCB_OBJ_PSTK
+#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC
+
+static pcb_data_t *parse_data(pcb_board_t *pcb, pcb_data_t *dst, lht_node_t *nd, pcb_data_t *subc_parent);
+
+static int iolht_error(lht_node_t *nd, char *fmt, ...)
+{
+	gds_t str;
+	va_list ap;
+
+	gds_init(&str);
+	gds_append_str(&str, "io_lihata parse error");
+	if (nd != NULL)
+		pcb_append_printf(&str, " at %s:%d.%d: ", nd->file_name, nd->line, nd->col);
+	else
+		gds_append_str(&str, ": ");
+
+	va_start(ap, fmt);
+	pcb_append_vprintf(&str, fmt, ap);
+	va_end(ap);
+
+	pcb_message(PCB_MSG_ERROR, "%s", str.array);
+
+	gds_uninit(&str);
+	return -1;
+}
+
+static void iolht_warn(lht_node_t *nd, int wbit, char *fmt, ...)
+{
+	gds_t str;
+	va_list ap;
+
+	if (wbit >= 0) {
+		unsigned long bv = 1ul << wbit;
+		if (warned & bv)
+			return;
+		warned |= bv;
+	}
+
+	gds_init(&str);
+	gds_append_str(&str, "io_lihata parse warning");
+	if (nd != NULL)
+		pcb_append_printf(&str, "at %s:%d.%d: ", nd->file_name, nd->line, nd->col);
+	else
+		gds_append_str(&str, ": ");
+
+	va_start(ap, fmt);
+	pcb_append_vprintf(&str, fmt, ap);
+	va_end(ap);
+
+	pcb_message(PCB_MSG_WARNING, "%s", str.array);
+
+	gds_uninit(&str);
+}
+
+/* Collect objects that has unknown ID on a list. Once all objects with
+   known-IDs are allocated, the unknonw-ID objects are allocated a fresh
+   ID. This makes sure they don't occupy IDs that would be used by known-ID
+   objects during the load. */
+#define post_id_req(obj) vtp0_append(&post_ids, &((obj)->ID))
+
+static lht_node_t missing_ok;
+
+static int parse_attributes(pcb_attribute_list_t *list, lht_node_t *nd)
+{
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return 0;
+
+	if (nd->type != LHT_HASH)
+		return -1;
+
+	for(n = lht_dom_first(&it, nd); n != NULL; n = lht_dom_next(&it)) {
+		if (n->type == LHT_TEXT)
+			pcb_attribute_put(list, n->name, n->data.text.value);
+	}
+
+	return 0;
+}
+
+/* Load the (duplicated) string value of a text node into res. Return 0 on success */
+static int parse_text(char **res, lht_node_t *nd)
+{
+	if (nd == &missing_ok)
+		return 0;
+	if (nd == NULL)
+		return -1;
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "expected a text node\n");
+	*res = pcb_strdup(nd->data.text.value);
+	return 0;
+}
+
+/* Load a minuid from a text node into res. Return 0 on success */
+static int parse_minuid(minuid_bin_t res, lht_node_t *nd)
+{
+	if (nd == &missing_ok)
+		return 0;
+	if ((nd == NULL) || (nd->type != LHT_TEXT))
+		return iolht_error(nd, "expected a text node for minuid\n");
+	if (strlen(nd->data.text.value) != sizeof(minuid_str_t)-1)
+		return iolht_error(nd, "invalid minuid: '%s'\n", nd->data.text.value);
+	minuid_str2bin(res, (char *)nd->data.text.value);
+	return 0;
+}
+
+/* Load the pcb_coord_t value of a text node into res. Return 0 on success */
+static int parse_coord(pcb_coord_t *res, lht_node_t *nd)
+{
+	double tmp;
+	pcb_bool success;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing coord value\n");
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid coord type: '%d'\n", nd->type);
+
+	tmp = pcb_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
+	if (!success)
+		return iolht_error(nd, "Invalid coord value: '%s'\n", nd->data.text.value);
+
+	*res = tmp;
+	return 0;
+}
+
+/* Load the Angle value of a text node into res. Return 0 on success */
+static int parse_angle(pcb_angle_t *res, lht_node_t *nd)
+{
+	double tmp;
+	pcb_bool success;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing angle\n");
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid angle type: '%d'\n", nd->type);
+
+	tmp = pcb_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
+	if (!success)
+		return iolht_error(nd, "Invalid angle value: '%s'\n", nd->data.text.value);
+
+	*res = tmp;
+	return 0;
+}
+
+/* Load the integer value of a text node into res. Return 0 on success */
+static int parse_int(int *res, lht_node_t *nd)
+{
+	long int tmp;
+	int base = 10;
+	char *end;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return -1;
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid integer node type (int): '%d'\n", nd->type);
+
+	if ((nd->data.text.value[0] == '0') && (nd->data.text.value[1] == 'x'))
+		base = 16;
+	tmp = strtol(nd->data.text.value, &end, base);
+	if (*end != '\0')
+		return iolht_error(nd, "Invalid integer value (not an integer number): '%s'\n", nd->data.text.value);
+
+	*res = tmp;
+	return 0;
+}
+
+
+/* Load the unsigned long value of a text node into res. Return 0 on success */
+static int parse_ulong(unsigned long *res, lht_node_t *nd)
+{
+	unsigned long int tmp;
+	int base = 10;
+	char *end;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing unsigned long field\n");
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid integer node type (ulong): '%d'\n", nd->type);
+
+	if ((nd->data.text.value[0] == '0') && (nd->data.text.value[1] == 'x'))
+		base = 16;
+	tmp = strtoul(nd->data.text.value, &end, base);
+	if (*end != '\0')
+		return iolht_error(nd, "Invalid integer value (not an unsigned long integer): '%s'\n", nd->data.text.value);
+
+	*res = tmp;
+	return 0;
+}
+
+/* Load the duble value of a text node into res. Return 0 on success */
+static int parse_double(double *res, lht_node_t *nd)
+{
+	double tmp;
+	char *end;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing floating point number\n");
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid floating point number type: '%d'\n", nd->type);
+
+	tmp = strtod(nd->data.text.value, &end);
+
+	if (*end != '\0')
+		return iolht_error(nd, "Invalid floating point value: '%s'\n", nd->data.text.value);
+
+	*res = tmp;
+	return 0;
+}
+
+/* Load the id name of a text node (with a prefixed name) into res.
+   Return 0 on success */
+static int parse_id(long int *res, lht_node_t *nd, int prefix_len)
+{
+	long int tmp;
+	char *end;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing ID node\n");
+
+	tmp = strtol(nd->name + prefix_len, &end, 10);
+	if (*end != '\0')
+		return iolht_error(nd, "Invalid id value (must be a positive integer): '%s'\n", nd->data.text.value);
+
+	pcb_create_ID_bump(tmp+1);
+
+	*res = tmp;
+	return 0;
+}
+
+/* Load the boolean value of a text node into res.
+   Return 0 on success */
+static int parse_bool(pcb_bool *res, lht_node_t *nd)
+{
+	char val[8], *end;
+
+	if (nd == &missing_ok)
+		return 0;
+
+	if (nd == NULL)
+		return iolht_error(nd, "Missing bool\n");
+
+	if (nd->type != LHT_TEXT)
+		return iolht_error(nd, "Invalid bool type: '%d'\n", nd->type);
+
+	strncpy(val, nd->data.text.value, sizeof(val)-1);
+	val[sizeof(val)-1] = '\0';
+	end = strpbrk(val, " \t\r\n");
+	if (end != NULL)
+		*end = '\0';
+
+
+	if ((strcmp(val, "1") == 0) || (pcb_strcasecmp(val, "on") == 0) ||
+	    (pcb_strcasecmp(val, "true") == 0) || (pcb_strcasecmp(val, "yes") == 0)) {
+		*res = 1;
+		return 0;
+	}
+
+	if ((strcmp(val, "0") == 0) || (pcb_strcasecmp(val, "off") == 0) ||
+	    (pcb_strcasecmp(val, "false") == 0) || (pcb_strcasecmp(val, "no") == 0)) {
+		*res = 0;
+		return 0;
+	}
+
+	return iolht_error(nd, "Invalid bool value: '%s'\n", nd->data.text.value);
+}
+
+static int parse_coord_conf(const char *path, lht_node_t *nd)
+{
+	pcb_coord_t tmp;
+
+	if (nd == &missing_ok)
+		return 0;
+	if (nd == NULL)
+		return 0;
+	if (parse_coord(&tmp, nd) != 0)
+		return -1;
+
+	conf_set(CFR_DESIGN, path, -1, nd->data.text.value, POL_OVERWRITE);
+	return 0;
+}
+
+static lht_node_t *hash_get(lht_node_t *hash, const char *name, int optional)
+{
+	lht_node_t *nd = lht_dom_hash_get(hash, name);
+	if (nd != NULL)
+		return nd;
+	if (optional)
+		return &missing_ok;
+	iolht_error(hash, "Missing hash field: '%s'\n", name);
+	return NULL;
+}
+
+static int parse_meta(pcb_board_t *pcb, lht_node_t *nd)
+{
+	lht_node_t *grp;
+	int err = 0;
+
+	if (nd->type != LHT_HASH)
+		return iolht_error(nd, "board meta must be a hash\n");
+
+	parse_text(&pcb->Name, lht_dom_hash_get(nd, "meta"));
+
+	parse_text(&pcb->Name, lht_dom_hash_get(nd, "board_name"));
+
+	grp = lht_dom_hash_get(nd, "grid");
+	if ((grp != NULL) && (grp->type == LHT_HASH)) {
+		err |= parse_coord(&pcb->GridOffsetX, hash_get(grp, "offs_x", 1));
+		err |= parse_coord(&pcb->GridOffsetY, hash_get(grp, "offs_y", 1));
+		err |= parse_coord(&pcb->Grid, hash_get(grp, "spacing", 1));
+		if (err != 0)
+			return -1;
+	}
+
+	grp = lht_dom_hash_get(nd, "size");
+	if ((grp != NULL) && (grp->type == LHT_HASH)) {
+		err |= parse_coord(&pcb->MaxWidth, hash_get(grp, "x", 0));
+		err |= parse_coord(&pcb->MaxHeight, hash_get(grp, "y", 0));
+		err |= parse_coord_conf("design/poly_isle_area", hash_get(grp, "isle_area_nm2", 1));
+		err |= parse_double(&pcb->ThermScale, hash_get(grp, "thermal_scale", 1));
+		if (err != 0)
+			return -1;
+	}
+
+	grp = lht_dom_hash_get(nd, "drc");
+	if ((grp != NULL) && (grp->type == LHT_HASH)) {
+		if (rdver >= 5)
+			iolht_warn(grp, 5, "Lihata board v5+ should not have drc metadata saved in board header (use the config)\n");
+		err |= parse_coord_conf("design/bloat", hash_get(grp, "bloat", 1));
+		err |= parse_coord_conf("design/shrink", hash_get(grp, "shrink", 1));
+		err |= parse_coord_conf("design/min_wid", hash_get(grp, "min_width", 1));
+		err |= parse_coord_conf("design/min_slk", hash_get(grp, "min_silk", 1));
+		err |= parse_coord_conf("design/min_drill", hash_get(grp, "min_drill", 1));
+		err |= parse_coord_conf("design/min_ring", hash_get(grp, "min_ring", 1));
+		if (err != 0)
+			return 1;
+	}
+
+	grp = lht_dom_hash_get(nd, "cursor");
+	if ((grp != NULL) && (grp->type == LHT_HASH)) {
+		double zoom = 0.0;
+		if (rdver >= 5)
+			iolht_warn(grp, 0, "Lihata board v5+ should not have cursor metadata saved\n");
+		err |= parse_coord(&pcb->CursorX, hash_get(grp, "x", 1));
+		err |= parse_coord(&pcb->CursorY, hash_get(grp, "y", 1));
+		err |= parse_double(&zoom, hash_get(grp, "zoom", 1));
+		pcb->Zoom = (pcb_coord_t)pcb_round(zoom);
+		if (err != 0)
+			return -1;
+	}
+
+	return 0;
+}
+
+static int parse_thermal(unsigned char *dst, lht_node_t *src)
+{
+	if (src == NULL)
+		return 0;
+
+	if (src->type != LHT_LIST)
+		return iolht_error(src, "thermals must be a list\n");
+
+	*dst = 0;
+	for(src = src->data.list.first; src != NULL; src = src->next)
+		if (src->type == LHT_TEXT)
+			*dst |= pcb_thermal_str2bits(src->data.text.value);
+
+	return 0;
+}
+
+/* pt is a list of lihata node pointers to thermal nodes; each has user
+   data set to the object. Look up layer info and build the thermal. This
+   needs to be done in a separate pass at the end of parsing because
+   vias may precede layers in the lihata input file. */
+static int post_thermal_assign(pcb_board_t *pcb, vtp0_t *old, vtp0_t *heavy)
+{
+	int i;
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	/* pin/via before lihata v4: thermal is part of the object flag*/
+	for(i = 0; i < vtp0_len(old); i++) {
+		lht_node_t *thr = old->array[i];
+		pcb_pstk_t *ps = thr->user_data;
+
+		assert(ps->type == PCB_OBJ_PSTK);
+
+		ps->thermals.used = 0;
+
+		for(n = lht_dom_first(&it, thr); n != NULL; n = lht_dom_next(&it)) {
+			if (n->type == LHT_TEXT) {
+				int layer = pcb_layer_by_name(pcb->Data, n->name) + 1;
+				if (layer > ps->thermals.used)
+					ps->thermals.used = layer;
+			}
+		}
+
+		if (ps->thermals.used > 0) {
+			ps->thermals.shape = calloc(sizeof(ps->thermals.shape[0]), ps->thermals.used);
+			for(n = lht_dom_first(&it, thr); n != NULL; n = lht_dom_next(&it)) {
+				if (n->type == LHT_TEXT) {
+					int layer = pcb_layer_by_name(pcb->Data, n->name);
+					if (layer < 0)
+						return iolht_error(n, "Invalid layer name in thermal: '%s'\n", n->name);
+					ps->thermals.shape[layer] = io_lihata_resolve_thermal_style_old(n->data.text.value);
+				}
+			}
+		}
+		else
+			ps->thermals.shape = NULL;
+	}
+	vtp0_uninit(old);
+
+	/* from lihata v4 up: thermal is an object property (on heavy terminal layer objects) */
+	for(i = 0; i < vtp0_len(heavy); i++) {
+		lht_node_t *thr = heavy->array[i];
+		pcb_any_obj_t *obj = thr->user_data;
+
+		/* single character thermal: only on the layer the object is on */
+		parse_thermal(&obj->thermal, thr);
+	}
+	vtp0_uninit(heavy);
+
+	return 0;
+}
+
+static int parse_flags(pcb_flag_t *f, lht_node_t *fn, int object_type, unsigned char *intconn, int can_have_thermal)
+{
+	io_lihata_flag_holder fh;
+
+	memset(&fh, 0, sizeof(fh));
+
+	if (fn != NULL) {
+		int n;
+		for (n = 0; n < pcb_object_flagbits_len; n++) {
+			long my_types = pcb_object_flagbits[n].object_types | ((rdver <= 4) ? pcb_object_flagbits[n].compat_types : 0);
+			if (my_types & object_type) {
+				pcb_bool b = 0;
+				if ((parse_bool(&b, hash_get(fn, pcb_object_flagbits[n].name, 1)) == 0) && b)
+					PCB_FLAG_SET(pcb_object_flagbits[n].mask, &fh);
+			}
+		}
+
+		if ((!can_have_thermal) && (lht_dom_hash_get(fn, "thermal") != NULL))
+			iolht_error(fn, "Invalid flag thermal: object type can not have a thermal (ignored)\n");
+
+
+		if (parse_int(&n, lht_dom_hash_get(fn, "shape")) == 0)
+			fh.Flags.q = n;
+
+		if ((intconn != NULL) && (rdver < 3))
+			if (parse_int(&n, lht_dom_hash_get(fn, "intconn")) == 0)
+				*intconn = n;
+	}
+
+	*f = fh.Flags;
+	return 0;
+}
+
+static void parse_thermal_old(pcb_any_obj_t *obj, lht_node_t *fn)
+{
+	lht_node_t *thr;
+
+	if (fn == NULL)
+		return;
+
+	thr = lht_dom_hash_get(fn, "thermal");
+	if (thr == NULL)
+		return;
+
+	thr->user_data = obj;
+	vtp0_append(&post_thermal_old, thr);
+}
+
+/* heavy terminal thermal: save for later processing */
+static int parse_thermal_heavy(pcb_any_obj_t *obj, lht_node_t *src)
+{
+	if (src == NULL)
+		return 0;
+
+	if (src->type != LHT_LIST)
+		return iolht_error(src, "heavy thermal must be a list\n");
+
+	src->user_data = obj;
+	vtp0_append(&post_thermal_heavy, src);
+
+	return 0;
+}
+
+static int parse_line(pcb_layer_t *ly, lht_node_t *obj, int no_id, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_line_t *line;
+	unsigned char intconn = 0;
+	int err = 0;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "line.ID must be a hash\n");
+
+	if (ly != NULL)
+		line = pcb_line_alloc(ly);
+	else
+		return iolht_error(obj, "failed to allocate line object\n");
+
+	if (no_id)
+		line->ID = 0;
+	else
+		parse_id(&line->ID, obj, 5);
+	parse_flags(&line->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_LINE, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&line->Attributes, intconn);
+	parse_attributes(&line->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	if (rdver >= 4)
+		parse_thermal_heavy((pcb_any_obj_t *)line, lht_dom_hash_get(obj, "thermal"));
+
+	err |= parse_coord(&line->Thickness, hash_get(obj, "thickness", 0));
+	err |= parse_coord(&line->Clearance, hash_get(obj, "clearance", 0));
+	err |= parse_coord(&line->Point1.X, hash_get(obj, "x1", 0));
+	err |= parse_coord(&line->Point1.Y, hash_get(obj, "y1", 0));
+	err |= parse_coord(&line->Point2.X, hash_get(obj, "x2", 0));
+	err |= parse_coord(&line->Point2.Y, hash_get(obj, "y2", 0));
+
+	line->Point1.X += dx;
+	line->Point2.X += dx;
+	line->Point1.Y += dy;
+	line->Point2.Y += dy;
+
+	if (!no_id) {
+		post_id_req(&line->Point1);
+		post_id_req(&line->Point2);
+	}
+
+	if (ly != NULL)
+		pcb_add_line_on_layer(ly, line);
+
+	return err;
+}
+
+static int parse_rat(pcb_data_t *dt, lht_node_t *obj)
+{
+	pcb_rat_t rat, *new_rat;
+	int tmp, err = 0;
+
+	parse_id(&rat.ID, obj, 4);
+	parse_flags(&rat.Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_LINE, NULL, 0);
+
+	err |= parse_coord(&rat.Point1.X, hash_get(obj, "x1", 0));
+	err |= parse_coord(&rat.Point1.Y, hash_get(obj, "y1", 0));
+	err |= parse_coord(&rat.Point2.X, hash_get(obj, "x2", 0));
+	err |= parse_coord(&rat.Point2.Y, hash_get(obj, "y2", 0));
+
+	err |= parse_int(&tmp, hash_get(obj, "lgrp1", 0));
+	rat.group1 = tmp;
+	err |= parse_int(&tmp, hash_get(obj, "lgrp2", 0));
+	rat.group2 = tmp;
+
+
+	new_rat = pcb_rat_new(dt, rat.Point1.X, rat.Point1.Y, rat.Point2.X, rat.Point2.Y, rat.group1, rat.group2,
+		conf_core.appearance.rat_thickness, rat.Flags);
+
+	parse_attributes(&new_rat->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	post_id_req(&new_rat->Point1);
+	post_id_req(&new_rat->Point2);
+
+	new_rat->ID = rat.ID;
+
+	return err;
+}
+
+static int parse_arc(pcb_layer_t *ly, lht_node_t *obj, pcb_coord_t dx, pcb_coord_t dy)
+{
+	pcb_arc_t *arc;
+	unsigned char intconn = 0;
+	int err = 0;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "arc.ID must be a hash\n");
+
+	if (ly != NULL)
+		arc = pcb_arc_alloc(ly);
+	else
+		return iolht_error(obj, "failed to allocate arc object\n");
+
+	parse_id(&arc->ID, obj, 4);
+	parse_flags(&arc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ARC, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&arc->Attributes, intconn);
+	parse_attributes(&arc->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	if (rdver >= 4)
+		parse_thermal_heavy((pcb_any_obj_t *)arc, lht_dom_hash_get(obj, "thermal"));
+
+	err |= parse_coord(&arc->Thickness,  hash_get(obj, "thickness", 0));
+	err |= parse_coord(&arc->Clearance,  hash_get(obj, "clearance", 0));
+	err |= parse_coord(&arc->X,          hash_get(obj, "x", 0));
+	err |= parse_coord(&arc->Y,          hash_get(obj, "y", 0));
+	err |= parse_coord(&arc->Width,      hash_get(obj, "width", 0));
+	err |= parse_coord(&arc->Height,     hash_get(obj, "height", 0));
+	err |= parse_angle(&arc->StartAngle, hash_get(obj, "astart", 0));
+	err |= parse_angle(&arc->Delta,      hash_get(obj, "adelta", 0));
+
+	arc->X += dx;
+	arc->Y += dy;
+
+	if (ly != NULL)
+		pcb_add_arc_on_layer(ly, arc);
+
+	return err;
+}
+
+static int parse_polygon(pcb_layer_t *ly, lht_node_t *obj)
+{
+	pcb_poly_t *poly = pcb_poly_alloc(ly);
+	lht_node_t *geo;
+	pcb_cardinal_t n = 0, c;
+	unsigned char intconn = 0;
+	int err = 0;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "polygon.ID must be a hash\n");
+
+	parse_id(&poly->ID, obj, 8);
+	parse_flags(&poly->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_POLY, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&poly->Attributes, intconn);
+	parse_attributes(&poly->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	if (rdver >= 3)
+		err |= parse_coord(&poly->Clearance, hash_get(obj, "clearance", 1));
+
+	if (rdver >= 4)
+		parse_thermal_heavy((pcb_any_obj_t *)poly, lht_dom_hash_get(obj, "thermal"));
+
+	geo = lht_dom_hash_get(obj, "geometry");
+	if ((geo != NULL) && (geo->type == LHT_LIST)) {
+		lht_node_t *cnt;
+		lht_dom_iterator_t it;
+
+		/* count points and holes */
+		poly->PointN = 0;
+		for(c = 0, cnt = lht_dom_first(&it, geo); cnt != NULL; c++, cnt = lht_dom_next(&it)) {
+			if (cnt->type != LHT_TABLE)
+				continue;
+			poly->PointN += cnt->data.table.rows;
+		}
+		poly->PointMax = poly->PointN;
+		poly->Points = malloc(sizeof(pcb_point_t) * poly->PointMax);
+		poly->HoleIndexMax = poly->HoleIndexN = c-1;
+		if (poly->HoleIndexN > 0)
+			poly->HoleIndex = malloc(sizeof(pcb_cardinal_t) * poly->HoleIndexMax);
+		else
+			poly->HoleIndex = NULL;
+
+		/* convert points and build hole index */
+		for(c = 0, cnt = lht_dom_first(&it, geo); cnt != NULL; c++, cnt = lht_dom_next(&it)) {
+			pcb_cardinal_t r;
+			if (cnt->type != LHT_TABLE)
+				continue;
+			if (c > 0)
+				poly->HoleIndex[c-1] = n;
+			for(r = 0; r < cnt->data.table.rows; r++) {
+				err |= parse_coord(&poly->Points[n].X, cnt->data.table.r[r][0]);
+				err |= parse_coord(&poly->Points[n].Y, cnt->data.table.r[r][1]);
+				/* a point also needs to be a box on paper, but the poly code sets X2 and Y2 to 0 in reality... */
+				poly->Points[n].X2 = poly->Points[n].Y2 = 0;
+				post_id_req(&poly->Points[n]);
+				n++;
+			}
+		}
+	}
+	else
+		return iolht_error(obj, "invalid polygon: empty geometry\n");
+
+	if (err != 0) {
+		pcb_poly_free(poly);
+		return -1;
+	}
+
+	pcb_add_poly_on_layer(ly, poly);
+	pcb_poly_init_clip(ly->parent.data, ly, poly);
+
+	return 0;
+}
+
+static int parse_pcb_text(pcb_layer_t *ly, lht_node_t *obj)
+{
+	pcb_text_t *text;
+	lht_node_t *role;
+	int tmp, err = 0;
+	unsigned char intconn = 0;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "text.ID must be a hash\n");
+
+	role = lht_dom_hash_get(obj, "role");
+
+	if (ly != NULL) {
+		if (role != NULL)
+			return iolht_error(obj, "invalid role: text on layer shall not have a role\n");
+		text = pcb_text_alloc(ly);
+		if (text == NULL)
+			return iolht_error(obj, "failed to allocate yrcy object\n");
+	}
+
+	parse_id(&text->ID, obj, 5);
+
+	parse_flags(&text->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_TEXT, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&text->Attributes, intconn);
+	parse_attributes(&text->Attributes, lht_dom_hash_get(obj, "attributes"));
+	err |= parse_int(&text->Scale, hash_get(obj, "scale", 0));
+	err |= parse_int(&tmp, hash_get(obj, "fid", 0));
+	text->fid = tmp;
+	err |= parse_int(&tmp, hash_get(obj, "direction", 0));
+	text->Direction = tmp;
+	err |= parse_coord(&text->X, hash_get(obj, "x", 0));
+	err |= parse_coord(&text->Y, hash_get(obj, "y", 0));
+	err |= parse_text(&text->TextString, hash_get(obj, "string", 0));
+
+#warning TODO: get the font
+	if (ly != NULL)
+		pcb_add_text_on_layer(ly, text, pcb_font(PCB, text->fid, 1));
+
+	return err;
+}
+
+static int parse_layer_type(pcb_layer_type_t *dst, lht_node_t *nd, const char *loc)
+{
+	lht_node_t *flg;
+	lht_dom_iterator_t itt;
+
+	if (nd == NULL)
+		return -1;
+
+	for(flg = lht_dom_first(&itt, nd); flg != NULL; flg = lht_dom_next(&itt)) {
+		pcb_layer_type_t val = pcb_layer_type_str2bit(flg->name);
+		if (val == 0)
+			iolht_error(flg, "Invalid type name: '%s' in %s (ignoring the type flag)\n", flg->name, loc);
+		*dst |= val;
+	}
+
+	return 0;
+}
+
+static pcb_layer_combining_t parse_comb(pcb_board_t *pcb, lht_node_t *ncmb)
+{
+	lht_node_t *n;
+	pcb_layer_combining_t comb = 0;
+	lht_dom_iterator_t it;
+
+	for(n = lht_dom_first(&it, ncmb); n != NULL; n = lht_dom_next(&it)) {
+		pcb_layer_combining_t cval;
+		if (n->type != LHT_TEXT) {
+			iolht_error(n, "Ignoring non-text combining flag\n");
+			continue;
+		}
+		cval = pcb_layer_comb_str2bit(n->name);
+		if (cval == 0)
+			iolht_error(n, "Ignoring unknown combining flag: '%s'\n", n->name);
+		comb |= cval;
+	}
+
+	return comb;
+}
+
+static int parse_data_layer(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *grp, int layer_id, pcb_data_t *subc_parent)
+{
+	lht_node_t *n, *lst, *ncmb;
+	lht_dom_iterator_t it;
+	int bound = (subc_parent != NULL);
+	pcb_layer_t *ly = &dt->Layer[layer_id];
+
+	if (layer_id >= PCB_MAX_LAYER)
+		return iolht_error(grp, "Board has more layers than supported by this compilation of pcb-rnd (%d)\nIf this is a valid board, please increase PCB_MAX_LAYER and recompile.\n", PCB_MAX_LAYER);
+	if (layer_id >= dt->LayerN)
+		dt->LayerN = layer_id+1;
+
+	ly->parent.data = dt;
+	ly->parent_type = PCB_PARENT_DATA;
+	ly->type = PCB_OBJ_LAYER;
+
+	parse_attributes(&ly->Attributes, lht_dom_hash_get(grp, "attributes"));
+
+	ncmb = lht_dom_hash_get(grp, "combining");
+	if (ncmb != NULL) {
+		if (rdver < 2)
+			iolht_warn(ncmb, 1, "Version 1 lihata board should not have combining subtree for layers\n");
+		ly->comb = parse_comb(pcb, ncmb);
+	}
+
+	if (bound) {
+		ly->is_bound = 1;
+		ly->name = pcb_strdup(grp->name);
+		parse_int(&dt->Layer[layer_id].meta.bound.stack_offs, lht_dom_hash_get(grp, "stack_offs"));
+		parse_layer_type(&dt->Layer[layer_id].meta.bound.type, lht_dom_hash_get(grp, "type"), "bound layer");
+		if (pcb != NULL) {
+			dt->Layer[layer_id].meta.bound.real = pcb_layer_resolve_binding(pcb, &dt->Layer[layer_id]);
+			if (dt->Layer[layer_id].meta.bound.real != NULL)
+				pcb_layer_link_trees(&dt->Layer[layer_id], dt->Layer[layer_id].meta.bound.real);
+			else if (!(dt->Layer[layer_id].meta.bound.type & PCB_LYT_VIRTUAL))
+				iolht_warn(ncmb, 2, "Can't bind subcircuit layer %s: can't find anything similar on the current board\n", dt->Layer[layer_id].name);
+			dt->padstack_tree = subc_parent->padstack_tree;
+		}
+	}
+	else {
+		/* real */
+		lht_node_t *nclr;
+		ly->name = pcb_strdup(grp->name);
+		nclr = hash_get(grp, "color", 1);
+		if ((nclr != NULL) && (nclr->type != LHT_INVALID_TYPE)) {
+			if (rdver < 5)
+				iolht_warn(nclr, 1, "layer color was not supprted before lihata board v5 (reading from v%d)\n", rdver);
+			if (nclr->type == LHT_TEXT)
+				ly->meta.real.color = pcb_strdup(nclr->data.text.value);
+			else
+				iolht_warn(nclr, 1, "Ignoring color: text node required\n");
+		}
+		parse_bool(&ly->meta.real.vis, hash_get(grp, "visible", 1));
+		if (pcb != NULL) {
+			int grp_id;
+			parse_int(&grp_id, hash_get(grp, "group", 0));
+			dt->Layer[layer_id].meta.real.grp = grp_id;
+	/*		pcb_trace("parse_data_layer name: %d,%d '%s' grp=%d\n", layer_id, dt->LayerN-1, ly->name, grp_id);*/
+		}
+	}
+
+	lst = lht_dom_hash_get(grp, "objects");
+	if (lst != NULL) {
+		if (lst->type != LHT_LIST)
+			return iolht_error(lst, "objects must be in a list\n");
+
+		for(n = lht_dom_first(&it, lst); n != NULL; n = lht_dom_next(&it)) {
+			if (strncmp(n->name, "line.", 5) == 0)
+				parse_line(ly, n, 0, 0, 0);
+			if (strncmp(n->name, "arc.", 4) == 0)
+				parse_arc(ly, n, 0, 0);
+			if (strncmp(n->name, "polygon.", 8) == 0)
+				parse_polygon(ly, n);
+			if (strncmp(n->name, "text.", 5) == 0)
+				parse_pcb_text(ly, n);
+		}
+	}
+
+	return 0;
+}
+
+static int parse_data_layers(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *grp, pcb_data_t *subc_parent)
+{
+	int id;
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	for(id = 0, n = lht_dom_first(&it, grp); n != NULL; id++, n = lht_dom_next(&it))
+		if (n->type == LHT_HASH)
+			if (parse_data_layer(pcb, dt, n, id, subc_parent) < 0)
+				return -1;
+
+	return 0;
+}
+
+static int parse_pstk(pcb_data_t *dt, lht_node_t *obj)
+{
+	pcb_pstk_t *ps;
+	lht_node_t *thl, *t;
+	unsigned char intconn = 0;
+	unsigned long int pid;
+	int tmp, err = 0;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "pstk.ID must be a hash\n");
+
+	parse_ulong(&pid, lht_dom_hash_get(obj, "proto"));
+	if (pcb_pstk_get_proto_(dt, pid) == NULL)
+		return iolht_error(obj, "Padstack references to non-existent prototype\n");
+
+	ps = pcb_pstk_alloc(dt);
+
+	parse_id(&ps->ID, obj, 13);
+	parse_flags(&ps->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_PSTK, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&ps->Attributes, intconn);
+	parse_attributes(&ps->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	err |= parse_coord(&ps->x,    hash_get(obj, "x", 0));
+	err |= parse_coord(&ps->y,    hash_get(obj, "y", 0));
+	err |= parse_double(&ps->rot, hash_get(obj, "rot", 0));
+	tmp = 0;
+	err |= parse_int(&tmp,        hash_get(obj, "xmirror", 1));
+	ps->xmirror = tmp;
+	tmp = 0;
+	err |= parse_int(&tmp,        hash_get(obj, "smirror", 1));
+	ps->smirror = tmp;
+	ps->Clearance = 0;
+	parse_coord(&ps->Clearance,   hash_get(obj, "clearance", 1));
+	ps->proto = pid;
+	if (err != 0)
+		return -1;
+
+	thl = lht_dom_hash_get(obj, "thermal");
+	if ((thl != NULL) && (thl->type == LHT_LIST)) {
+		int max, n;
+		max = 0;
+		for(t = thl->data.list.first, n = 0; t != NULL; t = t->next,n++)
+		{
+			if (t->type == LHT_LIST) {
+				char *end;
+				int ly = strtol(t->name, &end, 10);
+				if ((*end == '\0') && (ly > max))
+					max = ly;
+			}
+		}
+		if (n > max)
+			max = n;
+
+		ps->thermals.used = max+1;
+		ps->thermals.shape = calloc(sizeof(ps->thermals.shape[0]), ps->thermals.used);
+		for(t = thl->data.list.first, n = 0; t != NULL; t = t->next, n++) {
+			int i;
+			if (t->type == LHT_TEXT) {
+				parse_int(&i, t);
+				ps->thermals.shape[n] = i;
+			}
+			else if (t->type == LHT_LIST) {
+				unsigned char dst;
+				char *end;
+				int ly = strtol(t->name, &end, 10);
+				if ((*end == '\0') && (ly < ps->thermals.used)) {
+					parse_thermal(&dst, t);
+					ps->thermals.shape[ly] = dst;
+				}
+			}
+		}
+	}
+
+	pcb_pstk_add(dt, ps);
+
+	return 0;
+}
+
+static void warn_old_model(lht_node_t *obj, char *type, int warnid)
+{
+	unsigned long warnbit = 1ul << warnid;
+	if ((rdver < 5) || (old_model_warned & warnbit))
+		return;
+
+	old_model_warned |= warnbit;
+	iolht_warn(obj, -1, "Lihata from v5 does not support the old data model (elements, pins, pads and vias);\nyour file contains %s that will be converted to the new model\n", type);
+}
+
+static int parse_via(pcb_data_t *dt, lht_node_t *obj, pcb_coord_t dx, pcb_coord_t dy, int subc_on_bottom)
+{
+	pcb_pstk_t *ps;
+	unsigned char intconn = 0;
+	pcb_coord_t Thickness, Clearance, Mask = 0, DrillingHole, X, Y;
+	char *Name = NULL, *Number = NULL;
+	pcb_flag_t flg;
+	lht_node_t *fln;
+	int err = 0;
+
+	if (dt == NULL)
+		return -1;
+
+	warn_old_model(obj, "via", 1);
+
+	parse_flags(&flg, fln=lht_dom_hash_get(obj, "flags"), PCB_OBJ_VIA, &intconn, 1);
+	err |= parse_coord(&Thickness,    hash_get(obj, "thickness", 0));
+	err |= parse_coord(&Clearance,    hash_get(obj, "clearance", 0));
+	err |= parse_coord(&Mask,         hash_get(obj, "mask", 1));
+	err |= parse_coord(&DrillingHole, hash_get(obj, "hole", 0));
+	err |= parse_coord(&X,            hash_get(obj, "x", 0));
+	err |= parse_coord(&Y,            hash_get(obj, "y", 0));
+	err |= parse_text(&Name,          hash_get(obj, "name", 1));
+	err |= parse_text(&Number,        hash_get(obj, "number", 1));
+	if (err != 0)
+		return -1;
+
+	ps = pcb_old_via_new(dt, X+dx, Y+dy, Thickness, Clearance, Mask, DrillingHole, Name, flg);
+	if (ps == NULL) {
+		iolht_error(obj, "Failed to convert old via to padstack (this via is LOST)\n");
+		return 0;
+	}
+
+	parse_id(&ps->ID, obj, 4);
+	pcb_attrib_compat_set_intconn(&ps->Attributes, intconn);
+	parse_attributes(&ps->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	parse_thermal_old((pcb_any_obj_t *)ps, fln);
+
+	if (Number != NULL)
+		pcb_attribute_put(&ps->Attributes, "term", Number);
+	if (Name != NULL)
+		pcb_attribute_put(&ps->Attributes, "name", Name);
+
+	if (subc_on_bottom)
+		pcb_pstk_mirror(ps, PCB_PSTK_DONT_MIRROR_COORDS, 1, 0);
+
+	return err;
+}
+
+static int parse_pad(pcb_subc_t *subc, lht_node_t *obj, pcb_coord_t dx, pcb_coord_t dy, int subc_on_bottom)
+{
+	pcb_pstk_t *p;
+	unsigned char intconn = 0;
+	pcb_flag_t flg;
+	pcb_coord_t X1, Y1, X2, Y2, Thickness, Clearance, Mask = 0;
+	char *Name = NULL, *Number = NULL;
+	int err = 0;
+
+	warn_old_model(obj, "pad", 2);
+
+	parse_flags(&flg, lht_dom_hash_get(obj, "flags"), PCB_OBJ_PAD, &intconn, 0);
+
+	err |= parse_coord(&Thickness, hash_get(obj, "thickness", 0));
+	err |= parse_coord(&Clearance, hash_get(obj, "clearance", 0));
+	err |= parse_coord(&Mask,      hash_get(obj, "mask", 1));
+	err |= parse_coord(&X1,        hash_get(obj, "x1", 0));
+	err |= parse_coord(&Y1,        hash_get(obj, "y1", 0));
+	err |= parse_coord(&X2,        hash_get(obj, "x2", 0));
+	err |= parse_coord(&Y2,        hash_get(obj, "y2", 0));
+	err |= parse_text(&Name,       hash_get(obj, "name", 1));
+	err |= parse_text(&Number,     hash_get(obj, "number", 1));
+
+	if (err != 0)
+		return -1;
+
+	p = pcb_pstk_new_compat_pad(subc->data, X1+dx, Y1+dy, X2+dx, Y2+dy, Thickness, Clearance, Mask, flg.f & PCB_FLAG_SQUARE, flg.f & PCB_FLAG_NOPASTE, (!!(flg.f & PCB_FLAG_ONSOLDER)));
+	if (Number != NULL)
+		pcb_attribute_put(&p->Attributes, "term", Number);
+	if (Name != NULL)
+		pcb_attribute_put(&p->Attributes, "name", Name);
+
+	if (subc_on_bottom)
+		pcb_pstk_mirror(p, PCB_PSTK_DONT_MIRROR_COORDS, 1, 0);
+
+	parse_id(&p->ID, obj, 4);
+	pcb_attrib_compat_set_intconn(&p->Attributes, intconn);
+	parse_attributes(&p->Attributes, lht_dom_hash_get(obj, "attributes"));
+
+	return 0;
+}
+
+
+static int parse_element(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *obj)
+{
+	pcb_subc_t *subc = pcb_subc_alloc();
+	pcb_layer_t *silk = NULL;
+	lht_node_t *lst, *n;
+	lht_dom_iterator_t it;
+	int onsld, tdir = 0, tscale = 100;
+	pcb_coord_t ox = 0, oy = 0, tx, ty;
+	pcb_text_t *txt;
+	int err = 0;
+
+	warn_old_model(obj, "element", 3);
+
+	pcb_add_subc_to_data(dt, subc);
+
+	parse_id(&subc->ID, obj, 8);
+	parse_flags(&subc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ELEMENT, NULL, 0);
+	parse_attributes(&subc->Attributes, lht_dom_hash_get(obj, "attributes"));
+	err |= parse_coord(&ox, hash_get(obj, "x", 0));
+	err |= parse_coord(&oy, hash_get(obj, "y", 0));
+	tx = ox;
+	ty = oy;
+
+	onsld = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, subc);
+	subc->Flags.f &= ~PCB_FLAG_ONSOLDER;
+
+	/* bind the via rtree so that vias added in this subc show up on the board */
+	if (pcb != NULL)
+		pcb_subc_bind_globals(pcb, subc);
+
+	/* the only layer objects are put on from and old element is the primary silk layer */
+	{
+		pcb_layer_type_t silk_side = onsld ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+		const char *name = onsld ? "bottom-silk" : "top-silk";
+		silk = pcb_subc_get_layer(subc, PCB_LYT_SILK | silk_side, /*PCB_LYC_AUTO*/0, pcb_true, name, pcb_false);
+	}
+
+	lst = lht_dom_hash_get(obj, "objects");
+	if (lst == NULL)
+		return iolht_error(obj, "Invalid element: no objects\n");
+	if (lst->type == LHT_LIST) {
+		for(n = lht_dom_first(&it, lst); n != NULL; n = lht_dom_next(&it)) {
+			if (strncmp(n->name, "line.", 5) == 0)
+				parse_line(silk, n, 0, ox, oy);
+			if (strncmp(n->name, "arc.", 4) == 0)
+				parse_arc(silk, n, ox, oy);
+			if (strncmp(n->name, "text.", 5) == 0) {
+				lht_node_t *role   = lht_dom_hash_get(n, "role");
+				lht_node_t *string = lht_dom_hash_get(n, "string");
+				if ((role != NULL) && (role->type == LHT_TEXT) && (string != NULL) && (string->type == LHT_TEXT)) {
+					const char *key = role->data.text.value;
+					const char *val = string->data.text.value;
+					if (strcmp(key, "desc") == 0)   pcb_attribute_put(&subc->Attributes, "footprint", val);
+					if (strcmp(key, "value") == 0)  pcb_attribute_put(&subc->Attributes, "value", val);
+					if (strcmp(key, "name") == 0)   pcb_attribute_put(&subc->Attributes, "refdes", val);
+					err |= parse_coord(&tx,     hash_get(n, "x", 0));
+					err |= parse_coord(&ty,     hash_get(n, "y", 0));
+					err |= parse_coord(&tdir,   hash_get(n, "direction", 1));
+					err |= parse_coord(&tscale, hash_get(n, "scale", 1));
+				}
+			}
+			if (strncmp(n->name, "pin.", 4) == 0)
+				parse_via(subc->data, n, ox, oy, onsld);
+			if (strncmp(n->name, "pad.", 4) == 0)
+				parse_pad(subc, n, ox, oy, onsld);
+		}
+	}
+	else
+		return iolht_error(obj, "invalid element: objects is not a list\n");
+
+#warning subc TODO: TextFlags
+	txt = pcb_subc_add_refdes_text(subc, tx, ty, tdir, tscale, onsld);
+
+	pcb_subc_xy_rot_pnp(subc, ox, oy, onsld);
+
+	pcb_subc_bbox(subc);
+
+	if (dt->subc_tree == NULL)
+		dt->subc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dt->subc_tree, (pcb_box_t *)subc);
+
+	pcb_subc_rebind(pcb, subc);
+
+	return err;
+}
+
+static int parse_subc(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *obj, pcb_subc_t **subc_out)
+{
+	pcb_subc_t *sc = pcb_subc_alloc();
+	unsigned char intconn = 0;
+	int n;
+
+	if (obj->type != LHT_HASH)
+		return iolht_error(obj, "subc.ID must be a hash\n");
+
+	parse_id(&sc->ID, obj, 5);
+	parse_flags(&sc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ELEMENT, &intconn, 0);
+	pcb_attrib_compat_set_intconn(&sc->Attributes, intconn);
+	parse_attributes(&sc->Attributes, lht_dom_hash_get(obj, "attributes"));
+	parse_minuid(sc->uid, lht_dom_hash_get(obj, "uid"));
+
+	if (!dt->padstack_tree)
+		dt->padstack_tree = pcb_r_create_tree();
+	sc->data->padstack_tree = dt->padstack_tree;
+
+	pcb_add_subc_to_data(dt, sc);
+
+	if (parse_data(pcb, sc->data, lht_dom_hash_get(obj, "data"), dt) == 0)
+		return iolht_error(obj, "Invalid subc: no data\n");
+
+	for(n = 0; n < sc->data->LayerN; n++)
+		sc->data->Layer[n].is_bound = 1;
+
+	pcb_data_bbox(&sc->BoundingBox, sc->data, pcb_true);
+	pcb_data_bbox_naked(&sc->bbox_naked, sc->data, pcb_true);
+
+	if (!dt->subc_tree)
+		dt->subc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(dt->subc_tree, (pcb_box_t *)sc);
+
+	if (subc_out != NULL)
+		*subc_out = sc;
+
+	return 0;
+}
+
+
+static int parse_data_objects(pcb_board_t *pcb_for_font, pcb_data_t *dt, lht_node_t *grp)
+{
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	if (grp->type != LHT_LIST)
+		return iolht_error(grp, "groups must be a list\n");
+
+	for(n = lht_dom_first(&it, grp); n != NULL; n = lht_dom_next(&it)) {
+		if (strncmp(n->name, "padstack_ref.", 13) == 0)
+			parse_pstk(dt, n);
+		if (strncmp(n->name, "via.", 4) == 0)
+			parse_via(dt, n, 0, 0, 0);
+		if (strncmp(n->name, "rat.", 4) == 0)
+			parse_rat(dt, n);
+		else if (strncmp(n->name, "element.", 8) == 0)
+			parse_element(pcb_for_font, dt, n);
+		else if (strncmp(n->name, "subc.", 5) == 0)
+			if (parse_subc(pcb_for_font, dt, n, NULL) != 0)
+				return iolht_error(n, "failed to parse subcircuit\n");
+	}
+
+	return 0;
+}
+
+static void layer_fixup(pcb_board_t *pcb)
+{
+	int n;
+	pcb_layergrp_id_t top_silk, bottom_silk;
+	pcb_layergrp_t *g;
+
+	pcb_layergrp_inhibit_inc();
+
+	pcb_layer_group_setup_default(pcb);
+
+	/* old silk assumption: last two layers are silk, bottom and top */
+	bottom_silk = pcb->Data->Layer[pcb->Data->LayerN-2].meta.real.grp;
+	top_silk = pcb->Data->Layer[pcb->Data->LayerN-1].meta.real.grp;
+	pcb->Data->Layer[pcb->Data->LayerN-2].meta.real.grp = -1;
+	pcb->Data->Layer[pcb->Data->LayerN-1].meta.real.grp = -1;
+
+/*	pcb_trace("NAME: '%s' '%s'\n", pcb->Data->Layer[pcb->Data->LayerN-1].Name,pcb->Data->Layer[pcb->Data->LayerN-2].Name);*/
+
+	for(n = 0; n < pcb->Data->LayerN - 2; n++) {
+		pcb_layer_t *l = &pcb->Data->Layer[n];
+		pcb_layergrp_id_t grp = l->meta.real.grp;
+		/*pcb_trace("********* l=%d %s g=%ld (top=%ld bottom=%ld)\n", n, l->name, grp, top_silk, bottom_silk);*/
+		l->meta.real.grp = -1;
+
+		if (grp == bottom_silk)
+			g = pcb_get_grp(&pcb->LayerGroups, PCB_LYT_BOTTOM, PCB_LYT_COPPER);
+		else if (grp == top_silk)
+			g = pcb_get_grp(&pcb->LayerGroups, PCB_LYT_TOP, PCB_LYT_COPPER);
+		else
+			g = pcb_get_grp_new_intern(pcb, grp);
+/*			pcb_trace(" add %ld\n", g - pcb->LayerGroups.meta.real.grp);*/
+		if (g != NULL) {
+			pcb_layer_add_in_group_(pcb, g, g - pcb->LayerGroups.grp, n);
+			if (strcmp(l->name, "outline") == 0)
+				pcb_layergrp_fix_turn_to_outline(g);
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "failed to create layer %s\n", l->name);
+	}
+
+	pcb_layergrp_fix_old_outline(pcb);
+
+	/* link in the 2 hardwired silks and mark them auto */
+	g = pcb_get_grp(&pcb->LayerGroups, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+	pcb_layer_add_in_group_(pcb, g, g - pcb->LayerGroups.grp, pcb->Data->LayerN-2);
+	pcb->Data->Layer[pcb->Data->LayerN-2].comb |= PCB_LYC_AUTO;
+	
+	g = pcb_get_grp(&pcb->LayerGroups, PCB_LYT_TOP, PCB_LYT_SILK);
+	pcb_layer_add_in_group_(pcb, g, g - pcb->LayerGroups.grp, pcb->Data->LayerN-1);
+	pcb->Data->Layer[pcb->Data->LayerN-1].comb |= PCB_LYC_AUTO;
+
+	pcb_layergrp_inhibit_dec();
+}
+
+static int validate_layer_stack_lyr(pcb_board_t *pcb, lht_node_t *loc)
+{
+	pcb_layer_id_t tmp[2], lid;
+	pcb_layergrp_id_t gid;
+		int n, found;
+
+	/* check layer->group cross-links */
+	for(lid = 0; lid < pcb->Data->LayerN; lid++) {
+		pcb_layergrp_t *grp;
+		gid = pcb->Data->Layer[lid].meta.real.grp;
+		grp = pcb_get_layergrp(pcb, gid);
+		if (grp == NULL)
+			return iolht_error(loc, "Broken layer stackup: missing valid group for layer %ld\n", lid);
+
+		for(found = n = 0; n < grp->len; n++) {
+			if (grp->lid[n] == lid) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (!found)
+			return iolht_error(loc, "Broken layer stackup: group->layer backlink for layer %ld\n", lid);
+	}
+
+	/* check group->layer cross-links */
+	for(gid = 0; gid < pcb->LayerGroups.len; gid++) {
+		pcb_layergrp_t *grp = &pcb->LayerGroups.grp[gid];
+		for(n = 0; n < grp->len; n++) {
+			pcb_layer_t *ly;
+			lid = grp->lid[n];
+			ly = pcb_get_layer(pcb->Data, lid);
+			if (ly == NULL)
+				return iolht_error(loc, "Broken layer stackup: group %ld links to non-existent layer %ld\n", gid, lid);
+			if (ly->meta.real.grp != gid)
+				return iolht_error(loc, "Broken layer stackup: group %ld links to layer %ld which then links back to group %ld instead\n", gid, lid, ly->meta.real.grp);
+		}
+	}
+
+#warning layer TODO: #tbs do not require top and bottom silk to present
+	/* for now, require top and bottom silk */
+	if (pcb_layer_list(pcb, PCB_LYT_TOP | PCB_LYT_SILK, tmp, 2) < 1)
+		return iolht_error(loc, "Unsupported layer stackup: top silk layer missing\n");
+	if (pcb_layer_list(pcb, PCB_LYT_BOTTOM | PCB_LYT_SILK, tmp, 2) < 1)
+		return iolht_error(loc, "Unsupported layer stackup: bottom silk layer missing\n");
+	if (pcb_layer_list(pcb, PCB_LYT_OUTLINE, tmp, 2) > 1)
+		return iolht_error(loc, "Unsupported layer stackup: multiple outline layers\n");
+	return 0;
+}
+
+static int validate_layer_stack_grp(pcb_board_t *pcb, lht_node_t *loc)
+{
+	pcb_layergrp_id_t tmp[2];
+
+#warning layer TODO: #tbs do not require top and bottom silk to present
+	/* for now, require top and bottom silk */
+	if (pcb_layergrp_list(pcb, PCB_LYT_TOP | PCB_LYT_SILK, tmp, 2) < 1)
+		return iolht_error(loc, "Unsupported layer stackup: top silk layer group missing\n");
+	if (pcb_layergrp_list(pcb, PCB_LYT_BOTTOM | PCB_LYT_SILK, tmp, 2) < 1)
+		return iolht_error(loc, "Unsupported layer stackup: bottom silk layer group missing\n");
+	if (pcb_layergrp_list(pcb, PCB_LYT_OUTLINE, tmp, 2) > 1)
+		return iolht_error(loc, "Unsupported layer stackup: multiple outline layer groups\n");
+	return 0;
+}
+
+static int parse_layer_stack(pcb_board_t *pcb, lht_node_t *nd)
+{
+	lht_node_t *grps, *grp, *name, *layers, *lyr, *nattr;
+	lht_dom_iterator_t it, itt;
+	long int n;
+
+	for(n = 0; n < PCB_MAX_LAYERGRP; n++)
+		pcb_layergrp_free(pcb, n);
+	pcb->LayerGroups.len = 0;
+
+	grps = lht_dom_hash_get(nd, "groups");
+	for(grp = lht_dom_first(&it, grps); grp != NULL; grp = lht_dom_next(&it)) {
+		pcb_layergrp_id_t gid;
+		pcb_layergrp_t *g;
+		char *end;
+
+		if (grp->type != LHT_HASH) {
+			iolht_error(grp, "Invalid group in layer stack: '%s' (not a hash; ignoring the group)\n", grp->name);
+			continue;
+		}
+
+		gid = strtol(grp->name, &end, 10);
+		if ((*end != '\0') || (gid < 0)) {
+			iolht_error(grp, "Invalid group id in layer stack: '%s' (not an int or negative; ignoring the group)\n", grp->name);
+			continue;
+		}
+		if (gid >= PCB_MAX_LAYERGRP) {
+			iolht_error(grp, "Invalid group id in layer stack: '%s' (too many layers; ignoring the group)\n", grp->name);
+			continue;
+		}
+
+		pcb_layergrp_free(pcb, n); /* just in case of double initialization of the same layer id */
+
+		g = &pcb->LayerGroups.grp[gid];
+		if (pcb->LayerGroups.len <= gid)
+			pcb->LayerGroups.len = gid+1;
+		g->parent.board = pcb;
+		g->parent_type = PCB_PARENT_BOARD;
+		g->type = PCB_OBJ_LAYERGRP;
+		g->valid = 1;
+
+		/* set name and type*/
+		name = lht_dom_hash_get(grp, "name");
+		if ((name == NULL) || (name->type != LHT_TEXT) || (name->data.text.value == NULL)) {
+			g->name = malloc(32);
+			sprintf(g->name, "grp_%ld", gid);
+		}
+		else
+			g->name = pcb_strdup(name->data.text.value);
+		parse_layer_type(&g->ltype, lht_dom_hash_get(grp, "type"), g->name);
+
+		/* load attributes */
+		nattr= lht_dom_hash_get(grp, "attributes");
+		if (nattr != NULL) {
+			if (rdver < 5)
+				iolht_warn(nattr, 3, "Layer groups could not have attributes before lihata v5 - still loading these attributes,\nbut they will be ignored by older versions of pcb-rnd.");
+			if (parse_attributes(&g->Attributes, nattr) < 0)
+				return iolht_error(nattr, "failed to load attributes\n");
+		}
+
+		/* load layers */
+		layers = lht_dom_hash_get(grp, "layers");
+		if (layers != NULL) {
+			for(lyr = lht_dom_first(&itt, layers); lyr != NULL; lyr = lht_dom_next(&itt)) {
+				pcb_layer_id_t lid;
+				if (lyr->type != LHT_TEXT) {
+					iolht_error(lyr, "Invalid layer node type in group '%s' (ignoring the layer)\n", g->name);
+					continue;
+				}
+				lid = strtol(lyr->data.text.value, &end, 10);
+				if ((*end != '\0') || (lid < 0)) {
+					iolht_error(lyr, "Invalid layer id '%s' in group '%s' (not an int or negative; ignoring the layer)\n", lyr->data.text.value, g->name);
+					continue;
+				}
+				if (g->len >= PCB_MAX_LAYER) {
+					iolht_error(lyr, "Too many layers  in group '%s' (ignoring the layer)\n", g->name);
+					continue;
+				}
+				g->lid[g->len] = lid;
+				g->len++;
+			}
+		}
+	}
+	return validate_layer_stack_grp(pcb, nd);
+}
+
+static int parse_data_pstk_shape_poly(pcb_board_t *pcb, pcb_pstk_shape_t *dst, lht_node_t *nshape, pcb_data_t *subc_parent)
+{
+	lht_node_t *n;
+	pcb_cardinal_t i;
+
+	dst->shape = PCB_PSSH_POLY;
+	dst->data.poly.x = NULL; /* if we return before the allocation... */
+	dst->data.poly.len = 0;
+	for(n = nshape->data.list.first; n != NULL; n = n->next)
+		dst->data.poly.len++;
+
+	if ((dst->data.poly.len % 2) != 0)
+		return iolht_error(n, "odd number of padstack shape polygon points\n");
+
+	dst->data.poly.len /= 2;
+
+	pcb_pstk_shape_alloc_poly(&dst->data.poly, dst->data.poly.len);
+	for(n = nshape->data.list.first, i = 0; n != NULL; i++) {
+		if (parse_coord(&dst->data.poly.x[i], n) != 0) return -1;
+		n = n->next;
+		if (parse_coord(&dst->data.poly.y[i], n) != 0) return -1;
+		n = n->next;
+	}
+	return 0;
+}
+
+static int parse_data_pstk_shape_line(pcb_board_t *pcb, pcb_pstk_shape_t *dst, lht_node_t *nshape, pcb_data_t *subc_parent)
+{
+	int sq;
+	int err = 0;
+
+	dst->shape = PCB_PSSH_LINE;
+
+	err |= parse_coord(&dst->data.line.x1,        hash_get(nshape, "x1", 0));
+	err |= parse_coord(&dst->data.line.y1,        hash_get(nshape, "y1", 0));
+	err |= parse_coord(&dst->data.line.x2,        hash_get(nshape, "x2", 0));
+	err |= parse_coord(&dst->data.line.y2,        hash_get(nshape, "y2", 0));
+	err |= parse_coord(&dst->data.line.thickness, hash_get(nshape, "thickness", 0));
+	err |= parse_int(&sq,                         hash_get(nshape, "square", 0));
+	dst->data.line.square = sq;
+	return err;
+}
+
+static int parse_data_pstk_shape_circ(pcb_board_t *pcb, pcb_pstk_shape_t *dst, lht_node_t *nshape, pcb_data_t *subc_parent)
+{
+	int err = 0;
+	dst->shape = PCB_PSSH_CIRC;
+
+	err |= parse_coord(&dst->data.circ.x,   hash_get(nshape, "x", 0));
+	err |= parse_coord(&dst->data.circ.y,   hash_get(nshape, "y", 0));
+	err |= parse_coord(&dst->data.circ.dia, hash_get(nshape, "dia", 0));
+	return err;
+}
+
+static int parse_data_pstk_shape_v4(pcb_board_t *pcb, pcb_pstk_shape_t *dst, lht_node_t *nshape, pcb_data_t *subc_parent)
+{
+	lht_node_t *ncmb, *nlyt, *ns;
+	int res = -1;
+
+	nlyt = lht_dom_hash_get(nshape, "layer_mask");
+	if ((nlyt != NULL) && (nlyt->type == LHT_HASH))
+		res = parse_layer_type(&dst->layer_mask, nlyt, "padstack shape");
+
+	if (res != 0)
+		return iolht_error(nlyt != NULL ? nlyt : nshape, "Failed to parse pad stack shape (layer mask)\n");
+
+	ncmb = lht_dom_hash_get(nshape, "combining");
+	if ((ncmb != NULL) && (ncmb->type == LHT_HASH))
+		dst->comb = parse_comb(pcb, ncmb);
+
+	if (parse_coord(&dst->clearance, lht_dom_hash_get(nshape, "clearance")) != 0) return -1;
+
+	ns = lht_dom_hash_get(nshape, "ps_poly");
+	if ((ns != NULL) && (ns->type == LHT_LIST)) return parse_data_pstk_shape_poly(pcb, dst, ns, subc_parent);
+
+	ns = lht_dom_hash_get(nshape, "ps_line");
+	if ((ns != NULL) && (ns->type == LHT_HASH)) return parse_data_pstk_shape_line(pcb, dst, ns, subc_parent);
+
+	ns = lht_dom_hash_get(nshape, "ps_circ");
+	if ((ns != NULL) && (ns->type == LHT_HASH)) return parse_data_pstk_shape_circ(pcb, dst, ns, subc_parent);
+
+	return iolht_error(nshape, "Failed to parse pad stack: missing shape\n");
+}
+
+
+static int parse_data_pstk_proto(pcb_board_t *pcb, pcb_pstk_proto_t *dst, lht_node_t *nproto, pcb_data_t *subc_parent)
+{
+	int itmp, i;
+	lht_node_t *nshape, *n;
+	pcb_pstk_tshape_t *ts;
+
+	n = lht_dom_hash_get(nproto, "name");
+	if (n != NULL) {
+		dst->name = pcb_strdup(n->data.text.value);
+		if (rdver < 5)
+			iolht_warn(n, 6, "lihata board before v5 did not support padstack prototype names");
+	}
+	else
+		dst->name = NULL;
+
+	/* read the hole */
+	if (parse_coord(&dst->hdia, lht_dom_hash_get(nproto, "hdia")) != 0) return -1;
+	if (parse_int(&dst->htop, lht_dom_hash_get(nproto, "htop")) != 0) return -1;
+	if (parse_int(&dst->hbottom, lht_dom_hash_get(nproto, "hbottom")) != 0) return -1;
+	if (parse_int(&itmp, lht_dom_hash_get(nproto, "hplated")) != 0) return -1;
+	dst->hplated = itmp;
+	dst->in_use = 1;
+	if (subc_parent != NULL)
+		dst->parent = subc_parent;
+	else
+		dst->parent = pcb->Data;
+
+	/* read shapes */
+	nshape = lht_dom_hash_get(nproto, "shape");
+	if ((nshape == NULL) || (nshape->type != LHT_LIST))
+		return iolht_error(nshape, "shape must be an existing list\n");
+
+	ts = pcb_vtpadstack_tshape_get(&dst->tr, 0, 1);
+
+	for(n = nshape->data.list.first, ts->len = 0; n != NULL; n = n->next) ts->len++;
+	ts->shape = calloc(sizeof(pcb_pstk_shape_t), ts->len);
+
+	for(n = nshape->data.list.first, i = 0; n != NULL; n = n->next, i++)
+		if ((n->type == LHT_HASH) && (strcmp(n->name, "ps_shape_v4") == 0))
+			if (parse_data_pstk_shape_v4(pcb, ts->shape+i, n, subc_parent) != 0)
+				goto error;
+
+	return 0;
+	error:;
+	free(ts->shape);
+	ts->shape = NULL;
+	ts->len = 0;
+	return iolht_error(n, "failed to parse padstack due to bad shape\n");
+}
+
+static int parse_data_pstk_protos(pcb_board_t *pcb, pcb_data_t *dst, lht_node_t *pp, pcb_data_t *subc_parent)
+{
+	pcb_cardinal_t pid, len;
+	lht_node_t *pr;
+	int res = 0;
+
+	for(len = 0, pr = pp->data.list.first; pr != NULL; pr = pr->next) len++;
+
+	if (len == 0)
+		return 0; /* there are no prototypes to load */
+
+	pcb_vtpadstack_proto_enlarge(&dst->ps_protos, len-1);
+	for(pid = 0, pr = pp->data.list.first; ((pr != NULL) && (res == 0)); pr = pr->next, pid++) {
+		if ((pr->type == LHT_TEXT) && (strcmp(pr->name, "unused") == 0))
+			continue;
+		else if ((pr->type == LHT_HASH) && (strncmp(pr->name, "ps_proto_v4", 11) == 0)) {
+			char *sid = pr->name+11, *end;
+			long int pid_in_file;
+			if (*sid == '.') {
+				sid++;
+				pid_in_file = strtol(sid, &end, 0);
+				if (*end != '\0')
+					return iolht_error(pr, "Invalid padstack proto ID '%s' (not an integer)\n", sid);
+				else if (pid_in_file < pid)
+					return iolht_error(pr, "Invalid padstack proto ID '%s' (can't rewind)\n", sid);
+				pid = pid_in_file;
+			}
+			else if (*sid != '\0')
+				return iolht_error(pr, "Invalid padstack proto ID '%s' (syntax)\n", sid);
+			if (pid >= dst->ps_protos.used)
+				pcb_vtpadstack_proto_enlarge(&dst->ps_protos, pid);
+			res = parse_data_pstk_proto(pcb, dst->ps_protos.array + pid, pr, subc_parent);
+			if (res != 0)
+				return iolht_error(pr, "Invalid padstack proto definition\n");
+		}
+		else
+			return iolht_error(pr, "Invalid padstack proto definition\n", pp->name);
+	}
+
+	return res;
+}
+
+static pcb_data_t *parse_data(pcb_board_t *pcb, pcb_data_t *dst, lht_node_t *nd, pcb_data_t *subc_parent)
+{
+	pcb_data_t *dt;
+	lht_node_t *grp;
+	int bound_layers = (subc_parent != NULL);
+
+	if ((nd == NULL) || (nd->type != LHT_HASH))
+		return NULL;
+
+	if (dst == NULL)
+		dt = pcb_buffer_new(pcb);
+	else
+		dt = dst;
+
+	if (!bound_layers)
+		pcb->Data = dt;
+
+	grp = lht_dom_hash_get(nd, "layers");
+	if ((grp != NULL) && (grp->type == LHT_LIST))
+		parse_data_layers(pcb, dt, grp, subc_parent);
+
+	if (rdver == 1)
+		layer_fixup(pcb);
+
+	if (rdver >= 4) {
+		grp = lht_dom_hash_get(nd, "padstack_prototypes");
+		if ((grp != NULL) && (grp->type == LHT_LIST))
+			parse_data_pstk_protos(pcb, dt, grp, subc_parent);
+	}
+
+	grp = lht_dom_hash_get(nd, "objects");
+	if (grp != NULL)
+		if (parse_data_objects(pcb, dt, grp) != 0)
+			return NULL;
+
+	return dt;
+}
+
+static int parse_symbol(pcb_symbol_t *sym, lht_node_t *nd)
+{
+	lht_node_t *grp, *obj, *n;
+	lht_dom_iterator_t it;
+	int err = 0;
+
+	err |= parse_coord(&sym->Width,  hash_get(nd, "width", 0));
+	err |= parse_coord(&sym->Height, hash_get(nd, "height", 0));
+	err |= parse_coord(&sym->Delta,  hash_get(nd, "delta", 0));
+
+	grp = lht_dom_hash_get(nd, "objects");
+	for(obj = lht_dom_first(&it, grp); obj != NULL; obj = lht_dom_next(&it)) {
+		pcb_coord_t x1, y1, x2, y2, th, r;
+		double sa, da;
+
+		if (strncmp(obj->name, "line.", 5) == 0) {
+			err |= parse_coord(&x1, hash_get(obj, "x1", 0));
+			err |= parse_coord(&y1, hash_get(obj, "y1", 0));
+			err |= parse_coord(&x2, hash_get(obj, "x2", 0));
+			err |= parse_coord(&y2, hash_get(obj, "y2", 0));
+			err |= parse_coord(&th, hash_get(obj, "thickness", 0));
+			if (err != 0)
+				return -1;
+			pcb_font_new_line_in_sym(sym, x1, y1, x2, y2, th);
+		}
+		else if (strncmp(obj->name, "simplearc.", 10) == 0) {
+			err |= parse_coord(&x1,  hash_get(obj, "x", 0));
+			err |= parse_coord(&y1,  hash_get(obj, "y", 0));
+			err |= parse_coord(&r,   hash_get(obj, "r", 0));
+			err |= parse_coord(&th,  hash_get(obj, "thickness", 0));
+			err |= parse_double(&sa, hash_get(obj, "astart", 0));
+			err |= parse_double(&da, hash_get(obj, "adelta", 0));
+			if (err != 0)
+				return -1;
+			pcb_font_new_arc_in_sym(sym, x1, y1, r, sa, da, th);
+		}
+		else if (strncmp(obj->name, "simplepoly.", 11) == 0) {
+			int len;
+			pcb_poly_t *sp;
+			if (obj->type != LHT_LIST) {
+				iolht_error(obj, "Symbol error: simplepoly is not a list! (ignoring this poly)\n");
+				continue;
+			}
+			for(len = 0, n = obj->data.list.first; n != NULL; len++, n = n->next) ;
+			if ((len % 2 != 0) || (len < 6)) {
+				iolht_error(obj, "Symbol error: sumplepoly has wrong number of points (%d, expected an even integer >= 6)! (ignoring this poly)\n", len);
+				continue;
+			}
+			sp = pcb_font_new_poly_in_sym(sym, len/2);
+			for(len = 0, n = obj->data.list.first; n != NULL; len++, n = n->next) {
+				parse_coord(&x1, n);
+				n = n->next;
+				parse_coord(&y1, n);
+				sp->Points[len].X = x1;
+				sp->Points[len].Y = y1;
+			}
+		}
+	}
+
+	sym->Valid = 1;
+	return 0;
+}
+
+static int parse_font(pcb_font_t *font, lht_node_t *nd)
+{
+	lht_node_t *grp, *sym;
+	lht_dom_iterator_t it;
+	int err = 0;
+
+	if (nd->type != LHT_HASH)
+		return iolht_error(nd, "font must be a hash\n");
+
+	err |= parse_coord(&font->MaxHeight, hash_get(nd, "cell_height", 0));
+	err |= parse_coord(&font->MaxWidth,  hash_get(nd, "cell_width", 0));
+
+	grp = lht_dom_hash_get(nd, "symbols");
+
+	for(sym = lht_dom_first(&it, grp); sym != NULL; sym = lht_dom_next(&it)) {
+		int chr;
+		if (sym->type != LHT_HASH)
+			continue;
+		if (*sym->name == '&') {
+			char *end;
+			chr = strtol(sym->name+1, &end, 16);
+			if (*end != '\0') {
+				iolht_error(sym, "Ignoring symbol with invalid symbol name '%s'.\n", sym->name);
+				continue;
+			}
+		}
+		else
+			chr = *sym->name;
+		if ((chr >= 0) && (chr < sizeof(font->Symbol) / sizeof(font->Symbol[0]))) {
+			parse_symbol(font->Symbol+chr, sym);
+		}
+	}
+
+	return err;
+}
+
+static int parse_fontkit(pcb_fontkit_t *fk, lht_node_t *nd)
+{
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+
+	if (nd->type != LHT_HASH)
+		return iolht_error(nd, "fontkit must be a hash\n");
+
+	pcb_fontkit_reset (fk);
+
+	for(n = lht_dom_first(&it, nd); n != NULL; n = lht_dom_next(&it)) {
+		pcb_font_t *f;
+
+		if (strcmp(n->name, "geda_pcb") != 0) {
+			char *end;
+			int id = strtol(n->name, &end, 10);
+			if (*end != '\0')
+				continue; /* ingore fonts with invalid name for now - maybe it'd be safer to read the ID field */
+			f = pcb_new_font(fk, id, NULL);
+			if (f == NULL)
+				return iolht_error(nd, "Failed to allocate font id %d (name '%s').\n", id, n->name);
+		}
+		else {
+			pcb_font_free (&fk->dflt);
+			fk->dflt.id = 0; /* restore default font's ID */
+			f = &fk->dflt;
+		}
+
+#warning TODO: check return val
+		parse_font(f, n);
+	}
+
+	return 0;
+}
+
+
+static void post_ids_assign(vtp0_t *ids)
+{
+	int n;
+	for(n = 0; n < vtp0_len(ids); n++) {
+		long int *id = ids->array[n];
+		*id = pcb_create_ID_get();
+	}
+	vtp0_uninit(ids);
+}
+
+static int parse_styles(pcb_data_t *dt, vtroutestyle_t *styles, lht_node_t *nd)
+{
+	lht_node_t *stn;
+	lht_dom_iterator_t it;
+	int err = 0;
+
+	if (nd->type != LHT_LIST)
+		return iolht_error(nd, "route styles must be a list\n");
+
+	for(stn = lht_dom_first(&it, nd); stn != NULL; stn = lht_dom_next(&it)) {
+		pcb_route_style_t *s = vtroutestyle_alloc_append(styles, 1);
+		int name_len = strlen(stn->name);
+
+		if (stn->type != LHT_HASH)
+			return iolht_error(stn, "route style entry must be a hash\n");
+		
+		/* safe copy the name */
+		if (name_len > sizeof(s->name)-1) {
+			iolht_warn(stn, -1, "Route style name too long: '%s' (should be less than %d characters); name will be truncated\n", stn->name, sizeof(s->name)-1);
+			memcpy(s->name, stn->name, sizeof(s->name)-2);
+			s->name[sizeof(s->name)-1] = '\0';
+		}
+		else
+			memcpy(s->name, stn->name, name_len+1);
+
+		s->via_proto = 0;
+		s->via_proto_set = 0;
+		s->Hole = 0;
+		s->Diameter = 0;
+		err |= parse_coord(&s->Thick,     hash_get(stn, "thickness", 0));
+		err |= parse_coord(&s->Diameter,  hash_get(stn, "diameter", 1));
+		err |= parse_coord(&s->Hole,      hash_get(stn, "hole", 1));
+		err |= parse_coord(&s->Clearance, hash_get(stn, "clearance", 0));
+		parse_attributes(&s->attr, lht_dom_hash_get(stn, "attributes"));
+
+		if (rdver >= 5) {
+			lht_node_t *vp = lht_dom_hash_get(stn, "via_proto");
+			if (vp != NULL) {
+				unsigned long pid;
+				if (parse_ulong(&pid, vp) != 0)
+					return iolht_error(stn, "Invalid route style prototype ID\n");
+				s->via_proto = pid;
+				s->via_proto_set = 1;
+				if (pcb_pstk_get_proto_(dt, pid) == NULL)
+					iolht_warn(vp, -1, "Route style %s references to non-existent prototype %ld\n", s->via_proto);
+			}
+		}
+	}
+	return 0;
+}
+
+static int parse_netlist_input(pcb_lib_t *lib, lht_node_t *netlist)
+{
+	lht_node_t *nnet;
+	if (netlist->type != LHT_LIST)
+		return iolht_error(netlist, "netlist (parent) must be a list\n");
+
+	for(nnet = netlist->data.list.first; nnet != NULL; nnet = nnet->next) {
+		lht_node_t *nconn, *nstyle, *nt, *nattr;
+		pcb_lib_menu_t *net;
+		const char *style = NULL;
+
+		if (nnet->type != LHT_HASH)
+			return iolht_error(nnet, "netlist must be a hash\n");
+		nconn  = lht_dom_hash_get(nnet, "conn");
+		nstyle = lht_dom_hash_get(nnet, "style");
+		nattr = lht_dom_hash_get(nnet, "attributes");
+
+		if ((nconn != NULL) && (nconn->type != LHT_LIST))
+			return iolht_error(nconn, "conn must be a list\n");
+
+		if (nstyle != NULL) {
+			if (nstyle->type != LHT_TEXT)
+				return iolht_error(nstyle, "style must be text\n");
+			style = nstyle->data.text.value;
+		}
+
+		net = pcb_lib_net_new(lib, nnet->name, style);
+		if (nconn != NULL) {
+			for(nt = nconn->data.list.first; nt != NULL; nt = nt->next) {
+				if ((nt->type != LHT_TEXT) || (*nt->data.text.value == '\0'))
+					return iolht_error(nt, "terminal id must be a non-empty text\n");
+				pcb_lib_conn_new(net, nt->data.text.value);
+			}
+		}
+
+		if (nattr != NULL) {
+			if (rdver < 5)
+				iolht_warn(nattr, 4, "Netlist could not have attributes before lihata v5 - still loading these attributes,\nbut they will be ignored by older versions of pcb-rnd.");
+			if (parse_attributes(&net->Attributes, nattr) < 0)
+				return iolht_error(nattr, "failed to load attributes\n");
+		}
+	}
+	return 0;
+}
+
+static int parse_netlist_patch(pcb_board_t *pcb, lht_node_t *patches)
+{
+	lht_node_t *np;
+
+	if (patches->type != LHT_LIST)
+		return iolht_error(patches, "netlist patches must be a list\n");
+
+	for(np = patches->data.list.first; np != NULL; np = np->next) {
+		lht_node_t *nnet, *nkey, *nval;
+		if (np->type != LHT_HASH)
+			return iolht_error(np, "each netlist patch must be a hash\n");
+		nnet = lht_dom_hash_get(np, "net");
+		if ((nnet == NULL) || (nnet->type != LHT_TEXT) || (*nnet->data.text.value == '\0'))
+			return iolht_error(nnet, "netlist patch net name must be a non-empty text\n");
+
+		if (strcmp(np->name, "del_conn") == 0) {
+			nval = lht_dom_hash_get(np, "term");
+			if ((nval == NULL) || (nval->type != LHT_TEXT) || (*nval->data.text.value == '\0'))
+				return iolht_error(nval, "netlist patch terminal ID must be a non-empty string (del_conn)\n");
+			pcb_ratspatch_append(pcb, RATP_ADD_CONN, nval->data.text.value, nnet->data.text.value, NULL);
+		}
+		else if (strcmp(np->name, "add_conn") == 0) {
+			nval = lht_dom_hash_get(np, "term");
+			if ((nval == NULL) || (nval->type != LHT_TEXT) || (*nval->data.text.value == '\0'))
+				return iolht_error(nval, "netlist patch terminal ID must be a non-empty string (add_conn)\n");
+			pcb_ratspatch_append(pcb, RATP_DEL_CONN, nval->data.text.value, nnet->data.text.value, NULL);
+		}
+		else if (strcmp(np->name, "change_attrib") == 0) {
+			nkey = lht_dom_hash_get(np, "key");
+			if ((nkey == NULL) || (nkey->type != LHT_TEXT) || (*nkey->data.text.value == '\0'))
+				return iolht_error(nval, "netlist patch attrib key must be a non-empty string (change_attrib)\n");
+			nval = lht_dom_hash_get(np, "term");
+			if ((nval == NULL) || (nval->type != LHT_TEXT))
+				return iolht_error(nval, "netlist patch attrib value must be a non-empty string (change_attrib)\n");
+			pcb_ratspatch_append(pcb, RATP_CHANGE_ATTRIB, nnet->data.text.value, nkey->data.text.value, nval->data.text.value);
+		}
+	}
+	return 0;
+}
+
+static int parse_netlists(pcb_board_t *pcb, lht_node_t *netlists)
+{
+	lht_node_t *sub;
+
+	if (netlists->type != LHT_HASH)
+		return iolht_error(netlists, "netlists must be a hash\n");
+
+	sub = lht_dom_hash_get(netlists, "input");
+	if ((sub != NULL) && (parse_netlist_input(pcb->NetlistLib+PCB_NETLIST_INPUT, sub) != 0))
+		return iolht_error(sub, "failed to parse the input netlist\n");
+
+	sub = lht_dom_hash_get(netlists, "netlist_patch");
+	if ((sub != NULL) && (parse_netlist_patch(pcb, sub) != 0))
+		return iolht_error(sub, "failed to parse the netlist patch\n");
+
+	return 0;
+}
+
+static void parse_conf(pcb_board_t *pcb, lht_node_t *sub)
+{
+	if (conf_insert_tree_as(CFR_DESIGN, sub) != 0)
+		pcb_message(PCB_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->Filename);
+	else
+		conf_update(NULL, -1);
+}
+
+
+static int parse_board(pcb_board_t *pcb, lht_node_t *nd)
+{
+	lht_node_t *sub;
+	pcb_plug_io_t *loader;
+
+	warned = 0;
+	old_model_warned = 0;
+	rdver = atoi(nd->name+15);
+	switch(rdver) {
+		case 1: loader = &plug_io_lihata_v1; break;
+		case 2: loader = &plug_io_lihata_v2; break;
+		case 3: loader = &plug_io_lihata_v3; break;
+		case 4: loader = &plug_io_lihata_v4; break;
+		case 5: loader = &plug_io_lihata_v5; break;
+		default:
+			return iolht_error(nd, "Lihata board version %d not supported;\n"
+				"must be 1, 2, 3, 4 or 5.\n", rdver);
+	}
+
+	vtp0_init(&post_ids);
+	vtp0_init(&post_thermal_old);
+	vtp0_init(&post_thermal_heavy);
+
+	memset(&pcb->LayerGroups, 0, sizeof(pcb->LayerGroups));
+
+	if (parse_attributes(&pcb->Attributes, lht_dom_hash_get(nd, "attributes")) != 0)
+		return -1;
+
+	sub = lht_dom_hash_get(nd, "meta");
+	if ((sub != NULL) && (parse_meta(pcb, sub) != 0))
+		return -1;
+
+	sub = lht_dom_hash_get(nd, "font");
+	if ((sub != NULL) && (parse_fontkit(&PCB->fontkit, sub) != 0))
+		return -1;
+	PCB->fontkit.valid = 1;
+
+	if (rdver >= 2) {
+		sub = lht_dom_hash_get(nd, "layer_stack");
+		if (sub != NULL) {
+			if (parse_layer_stack(pcb, sub) != 0)
+				return -1;
+		}
+		else if (validate_layer_stack_grp(pcb, nd) != 0)
+			return -1;
+	}
+
+	pcb_data_clip_inhibit_inc(pcb->Data);
+
+	sub = lht_dom_hash_get(nd, "data");
+	if (sub == NULL) {
+		pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+		return iolht_error(nd, "Lihata board without data\n");
+	}
+	if (parse_data(pcb, pcb->Data, sub, NULL) == NULL) {
+		pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+		return -1;
+	}
+
+	if (validate_layer_stack_lyr(pcb, sub) != 0)
+		return -1;
+
+	sub = lht_dom_hash_get(nd, "styles");
+	if ((sub != NULL) && (parse_styles(pcb->Data, &pcb->RouteStyle, sub) != 0)) {
+		pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+		return -1;
+	}
+
+	sub = lht_dom_hash_get(nd, "netlists");
+	if ((sub != NULL) && (parse_netlists(pcb, sub) != 0)) {
+		pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+		return -1;
+	}
+
+	post_ids_assign(&post_ids);
+	if (post_thermal_assign(pcb, &post_thermal_old, &post_thermal_heavy) != 0) {
+		pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+		return -1;
+	}
+
+	/* Run poly clipping at the end so we have all IDs and we can
+	   announce the clipping (it's slow, we may need a progress bar) */
+	{
+		pcb_rtree_it_t it;
+		pcb_box_t *b;
+		int l;
+		for(l = 0; l < pcb->Data->LayerN; l++) {
+			pcb_layer_t *layer = pcb->Data->Layer + l;
+			for(b = pcb_r_first(layer->polygon_tree, &it); b != NULL; b = pcb_r_next(&it)) {
+				pcb_poly_t *p = (pcb_poly_t *)b;
+				pcb_poly_init_clip(pcb->Data, layer, p);
+			}
+			pcb_r_end(&it);
+		}
+	}
+
+	sub = lht_dom_hash_get(nd, "pcb-rnd-conf-v1");
+	if (sub != NULL)
+		parse_conf(pcb, sub);
+
+	if (rdver < 5) {
+		/* have to parse meta again to get config values overwritten */
+		sub = lht_dom_hash_get(nd, "meta");
+		if (sub != NULL)
+			parse_meta(pcb, sub);
+	}
+
+	pcb_data_clip_inhibit_dec(pcb->Data, pcb_true);
+
+	pcb->Data->loader = loader; /* set this manually so the version is remembered */
+	return 0;
+}
+
+int io_lihata_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int res;
+	char *errmsg = NULL, *realfn;
+	lht_doc_t *doc = NULL;
+
+	realfn = pcb_fopen_check(Filename, "r");
+	if (realfn != NULL)
+		doc = lht_dom_load(realfn, &errmsg);
+	free(realfn);
+
+	if (doc == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error loading '%s': %s\n", Filename, errmsg);
+		free(errmsg);
+		return -1;
+	}
+
+	if ((doc->root->type == LHT_HASH) && (strncmp(doc->root->name, "pcb-rnd-board-v", 15) == 0)) {
+		res = parse_board(Ptr, doc->root);
+	}
+	else if ((doc->root->type == LHT_LIST) && (strncmp(doc->root->name, "pcb-rnd-subcircuit-v", 20) == 0)) {
+		pcb_subc_t *sc;
+
+		warned = 0;
+		old_model_warned = 0;
+		rdver = atoi(doc->root->name+20);
+		Ptr->is_footprint = 1;
+		res = parse_subc(NULL, Ptr->Data, doc->root->data.list.first, &sc);
+
+		if (res == 0) {
+			pcb_layergrp_upgrade_to_pstk(Ptr);
+			pcb_layer_create_all_for_recipe(Ptr, sc->data->Layer, sc->data->LayerN);
+			pcb_subc_rebind(Ptr, sc);
+			pcb_data_clip_polys(sc->data);
+		}
+	}
+	else {
+		iolht_error(doc->root, "Error loading '%s': neither a board nor a subcircuit\n", Filename);
+		res = -1;
+	}
+
+	lht_dom_uninit(doc);
+	free(errmsg);
+	return res;
+}
+
+
+
+typedef enum {
+	TPS_UNDECIDED,
+	TPS_GOOD,
+	TPS_BAD
+} test_parse_t;
+
+/* expect root to be a ha:pcb-rnd-board-v* */
+void test_parse_ev(lht_parse_t *ctx, lht_event_t ev, lht_node_type_t nt, const char *name, const char *value)
+{
+	test_parse_t *state = ctx->user_data;
+	if (ev == LHT_OPEN) {
+		if ((nt == LHT_HASH) && (strncmp(name, "pcb-rnd-board-v", 15) == 0))
+			*state = TPS_GOOD;
+		else if ((nt == LHT_LIST) && (strncmp(name, "pcb-rnd-subcircuit-v", 20) == 0))
+			*state = TPS_GOOD;
+		else
+			*state = TPS_BAD;
+	}
+}
+
+
+/* run an event parser for the first 32k of the file; accept the file if it
+   has a valid looking root; refuse if:
+    - no root in the first 32k (or till eof)
+    - not a valid lihata doc (parser error)
+    - lihata, but the wrong root
+*/
+int io_lihata_test_parse(pcb_plug_io_t *plug_ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	lht_parse_t ctx;
+	int count;
+	test_parse_t state = TPS_UNDECIDED;
+
+	lht_parser_init(&ctx);
+	ctx.event = test_parse_ev;
+	ctx.user_data = &state;
+
+	for(count = 0; count < 32768; count++) {
+		int c = fgetc(f);
+		if (lht_parser_char(&ctx, c) != LHTE_SUCCESS) {
+			/* parse error or end */
+			state = TPS_BAD;
+			break;
+		}
+		if (state != TPS_UNDECIDED)
+			break;
+	}
+	lht_parser_uninit(&ctx);
+	return (state == TPS_GOOD);
+}
+
+int io_lihata_parse_font(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+{
+	int res;
+	char *errmsg = NULL, *realfn;
+	lht_doc_t *doc = NULL;
+
+	realfn = pcb_fopen_check(Filename, "r");
+	if (realfn != NULL)
+		doc = lht_dom_load(realfn, &errmsg);
+	free(realfn);
+
+	if (doc == NULL) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "Error loading '%s': %s\n", Filename, errmsg);
+		free(errmsg);
+		return -1;
+	}
+
+	if ((doc->root->type != LHT_LIST) || (strcmp(doc->root->name, "pcb-rnd-font-v1"))) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "Not a font lihata.\n");
+		res = -1;
+	}
+	else
+		res = parse_font(Ptr, doc->root->data.list.first);
+
+	free(errmsg);
+	lht_dom_uninit(doc);
+	return res;
+}
+
+
+int io_lihata_parse_element(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+{
+	int res;
+	char *errmsg = NULL;
+	lht_doc_t *doc = NULL;
+	pcb_fp_fopen_ctx_t st;
+	FILE *f;
+	pcb_subc_t *sc;
+
+	f = pcb_fp_fopen(pcb_fp_default_search_path(), name, &st);
+
+	if (f != NULL) {
+		doc = lht_dom_load_stream(f, name, &errmsg);
+		pcb_fp_fclose(f, &st);
+	}
+
+	if (doc == NULL) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "Error loading '%s': %s\n", name, errmsg);
+		free(errmsg);
+		return -1;
+	}
+
+	if ((doc->root->type != LHT_LIST) || (strncmp(doc->root->name, "pcb-rnd-subcircuit-v", 20))) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "Not a subcircuit lihata.\n");
+		free(errmsg);
+		lht_dom_uninit(doc);
+		return -1;
+	}
+
+	warned = 0;
+	old_model_warned = 0;
+	rdver = atoi(doc->root->name+20);
+	if (rdver < 3) {
+		if (!pcb_io_err_inhibit)
+			pcb_message(PCB_MSG_ERROR, "io_lihata: invalid subc file version: %s (expected 3 or higher)\n", doc->root->name+20);
+		free(errmsg);
+		lht_dom_uninit(doc);
+		return -1;
+	}
+
+	res = parse_subc(NULL, Ptr, doc->root->data.list.first, &sc);
+	if (res == 0)
+		pcb_data_clip_polys(sc->data);
+
+	lht_dom_uninit(doc);
+	free(errmsg);
+	return res;
+}
+
Index: tags/2.0.1/src_plugins/io_lihata/read.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/read.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/read.h	(revision 18980)
@@ -0,0 +1,35 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "plug_io.h"
+
+int io_lihata_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+int io_lihata_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_lihata_parse_font(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename);
+int io_lihata_parse_element(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
+
+
+
Index: tags/2.0.1/src_plugins/io_lihata/write.c
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/write.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/write.c	(revision 18980)
@@ -0,0 +1,1572 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016, 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Build an in-memory lihata document that represents the board then save it.
+   A document is built for the merge-save. */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <liblihata/tree.h>
+#include <libminuid/libminuid.h>
+#include "config.h"
+#include "board.h"
+#include "conf_core.h"
+#include "data.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "flag_str.h"
+#include "compat_misc.h"
+#include "rats_patch.h"
+#include "actions.h"
+#include "misc_util.h"
+#include "macro.h"
+#include "layer.h"
+#include "common.h"
+#include "write_style.h"
+#include "io_lihata.h"
+#include "paths.h"
+#include "obj_subc_list.h"
+#include "pcb_minuid.h"
+#include "safe_fs.h"
+#include "thermal.h"
+
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+/*#define CFMT "%[9]"*/
+#define CFMT "%.08$$mH"
+/*#define CFMT "%$$mn"*/
+
+/* Note: this works because of using str_flag compat_types */
+#define PCB_OBJ_VIA PCB_OBJ_PSTK
+#define PCB_OBJ_PIN PCB_OBJ_PSTK
+#define PCB_OBJ_PAD PCB_OBJ_PSTK
+#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC
+
+static int io_lihata_full_tree = 0;
+static int wrver;
+
+static lht_node_t *build_data(pcb_data_t *data);
+
+#define lht_dom_list_append_safe(lst, item) \
+do { \
+	lht_node_t *__append_safe__ = item; \
+	if (__append_safe__ != NULL) \
+		lht_dom_list_append(lst, __append_safe__); \
+} while(0)
+
+/* An invalid node will kill any existing node on an overwrite-save-merge */
+static lht_node_t *dummy_node(const char *name)
+{
+	lht_node_t *n;
+	n = lht_dom_node_alloc(LHT_TEXT, name);
+	n->type = LHT_INVALID_TYPE;
+	return n;
+}
+
+static lht_node_t *dummy_text_node(const char *name)
+{
+	if (io_lihata_full_tree) {
+		lht_node_t *n = lht_dom_node_alloc(LHT_TEXT, name);
+		n->data.text.value = pcb_strdup("");
+		return n;
+	}
+	return dummy_node(name);
+}
+
+static lht_node_t *build_text(const char *key, const char *value)
+{
+	lht_node_t *field;
+
+	if (value == NULL)
+		return dummy_text_node(key);
+
+	field = lht_dom_node_alloc(LHT_TEXT, key);
+	if (value != NULL)
+		field->data.text.value = pcb_strdup(value);
+	return field;
+}
+
+static lht_node_t *build_textf(const char *key, const char *fmt, ...)
+{
+	lht_node_t *field;
+	va_list ap;
+
+	field = lht_dom_node_alloc(LHT_TEXT, key);
+	va_start(ap, fmt);
+	field->data.text.value = pcb_strdup_vprintf(fmt, ap);
+	va_end(ap);
+	return field;
+}
+
+static lht_node_t *build_minuid(const char *key, minuid_bin_t val)
+{
+	minuid_str_t tmp;
+	minuid_bin2str(tmp, val);
+	return build_text(key, tmp);
+}
+
+static lht_node_t *build_board_meta(pcb_board_t *pcb)
+{
+	lht_node_t *meta, *grp;
+
+	meta = lht_dom_node_alloc(LHT_HASH, "meta");
+	lht_dom_hash_put(meta, build_text("board_name", pcb->Name));
+
+	grp = lht_dom_node_alloc(LHT_HASH, "grid");
+	lht_dom_hash_put(meta, grp);
+	lht_dom_hash_put(grp, build_textf("offs_x", CFMT, pcb->GridOffsetX));
+	lht_dom_hash_put(grp, build_textf("offs_y", CFMT, pcb->GridOffsetY));
+	lht_dom_hash_put(grp, build_textf("spacing", CFMT, pcb->Grid));
+
+	grp = lht_dom_node_alloc(LHT_HASH, "size");
+	lht_dom_hash_put(meta, grp);
+	lht_dom_hash_put(grp, build_textf("x", CFMT, pcb->MaxWidth));
+	lht_dom_hash_put(grp, build_textf("y", CFMT, pcb->MaxHeight));
+	if (wrver < 5) {
+		lht_dom_hash_put(grp, build_textf("isle_area_nm2", "%f", conf_core.design.poly_isle_area));
+	}
+	lht_dom_hash_put(grp, build_textf("thermal_scale", "%f", pcb->ThermScale));
+
+	if (wrver < 5) {
+		grp = lht_dom_node_alloc(LHT_HASH, "drc");
+		lht_dom_hash_put(meta, grp);
+		lht_dom_hash_put(grp, build_textf("bloat",     CFMT, conf_core.design.bloat));
+		lht_dom_hash_put(grp, build_textf("shrink",    CFMT, conf_core.design.shrink));
+		lht_dom_hash_put(grp, build_textf("min_width", CFMT, conf_core.design.min_wid));
+		lht_dom_hash_put(grp, build_textf("min_silk",  CFMT, conf_core.design.min_slk));
+		lht_dom_hash_put(grp, build_textf("min_drill", CFMT, conf_core.design.min_drill));
+		lht_dom_hash_put(grp, build_textf("min_ring",  CFMT, conf_core.design.min_ring));
+	}
+
+	if (wrver < 5) {
+		grp = lht_dom_node_alloc(LHT_HASH, "cursor");
+		lht_dom_hash_put(meta, grp);
+		lht_dom_hash_put(grp, build_textf("x", CFMT, pcb->CursorX));
+		lht_dom_hash_put(grp, build_textf("y", CFMT, pcb->CursorY));
+		lht_dom_hash_put(grp, build_textf("zoom", "%.6f", pcb->Zoom));
+	}
+
+	return meta;
+}
+
+static lht_node_t *build_attributes(pcb_attribute_list_t *lst)
+{
+	int n;
+	lht_node_t *ln;
+
+	if ((lst->Number == 0) && (!io_lihata_full_tree))
+		return dummy_node("attributes");
+	ln = lht_dom_node_alloc(LHT_HASH, "attributes");
+
+	for (n = 0; n < lst->Number; n++) {
+		if ((wrver < 3) && (strcmp(lst->List[n].name, "intconn") == 0))
+			continue; /* do not write intconn as attribute for v1 and v2, we used a flag for those */
+		lht_dom_hash_put(ln, build_text(lst->List[n].name, lst->List[n].value));
+	}
+
+	return ln;
+}
+
+static lht_node_t *build_flags(pcb_flag_t *f, int object_type, int intconn)
+{
+	int n, layer, added = 0, thrm = 0;
+	lht_node_t *hsh, *txt, *lst;
+	io_lihata_flag_holder fh;
+
+
+	fh.Flags = *f;
+
+	hsh = lht_dom_node_alloc(LHT_HASH, "flags");
+
+	/* create normal flag nodes */
+	for (n = 0; n < pcb_object_flagbits_len; n++) {
+		long my_types = pcb_object_flagbits[n].object_types | ((wrver <= 4) ? pcb_object_flagbits[n].compat_types : 0);
+		if ((my_types & object_type) && (PCB_FLAG_TEST(pcb_object_flagbits[n].mask, &fh))) {
+			lht_dom_hash_put(hsh, build_text(pcb_object_flagbits[n].name, "1"));
+			PCB_FLAG_CLEAR(pcb_object_flagbits[n].mask, &fh);
+			added++;
+		}
+	}
+
+	/* thermal flags per layer */
+	lst = lht_dom_node_alloc(LHT_HASH, "thermal");
+
+	for(layer = 0; layer < pcb_max_layer; layer++) {
+		if (PCB_FLAG_THERM_TEST_ANY(&fh)) {
+			int t = PCB_FLAG_THERM_GET(layer, &fh);
+			if (t != 0) {
+				const char *name;
+				txt = lht_dom_node_alloc(LHT_TEXT, PCB->Data->Layer[layer].name);
+				name = io_lihata_thermal_style_old(t);
+				if (name != NULL)
+					txt->data.text.value = pcb_strdup(name);
+				else
+					txt->data.text.value = pcb_strdup_printf("%d", t);
+				lht_dom_hash_put(lst, txt);
+				added++;
+				thrm++;
+			}
+		}
+	}
+
+	if (thrm > 0)
+		lht_dom_hash_put(hsh, lst);
+	else
+		lht_dom_node_free(lst);
+
+	if (f->q > 0) {
+		lht_dom_hash_put(hsh, build_textf("shape", "%d", f->q));
+		added++;
+	}
+
+	if ((intconn > 0) && (wrver < 3)) {
+		lht_dom_hash_put(hsh, build_textf("intconn", "%d", intconn));
+		added++;
+	}
+
+	if ((added == 0) && (!io_lihata_full_tree)) {
+		lht_dom_node_free(hsh);
+		return dummy_node("flags");
+	}
+
+	return hsh;
+}
+
+static void obj_attr_flag_warn(pcb_any_obj_t *obj)
+{
+	int warned = 0;
+
+	if (wrver < 5) {
+		if (pcb_attribute_get(&obj->Attributes, "intnoconn") != NULL) {
+			warned = 1;
+			pcb_message(PCB_MSG_WARNING, "pcb-rnd versions only reading file older than lihata v5 may ignore the intnoconn flag\n");
+		}
+	}
+	if (wrver < 3) {
+		if (pcb_attribute_get(&obj->Attributes, "intconn") != NULL) {
+			warned = 1;
+			pcb_message(PCB_MSG_WARNING, "pcb-rnd versions only reading file older than lihata v3 may ignore the intconn flag\n");
+		}
+	}
+
+	if (warned)
+		pcb_message(PCB_MSG_WARNING, "^^^ in %s #%ld\n", pcb_obj_type_name(obj->type), obj->ID);
+}
+
+/* Write the thermal list of heavy terminals; put the resulting "thermal"
+   node in ha:dst */
+void build_thermal_heavy(lht_node_t *dst, pcb_any_obj_t *o)
+{
+	lht_node_t *th;
+	pcb_thermal_t tin = o->thermal;
+	const char *bit;
+
+	assert(dst->type == LHT_HASH);
+
+	if (o->thermal == 0) {
+		lht_dom_hash_put(dst, dummy_node("thermal"));
+		return;
+	}
+
+	if (wrver < 4)
+		pcb_io_incompat_save(NULL, o, "lihata boards before version v4 did not support heavy terminal vias\n", "Either save in lihata v4+ or do not use heavy terminal thermals");
+
+	th = lht_dom_node_alloc(LHT_LIST, "thermal");
+	lht_dom_hash_put(dst, th);
+	while((bit = pcb_thermal_bits2str(&tin)) != NULL)
+		lht_dom_list_append(th, build_textf(NULL, bit));
+}
+
+
+static lht_node_t *build_line(pcb_line_t *line, int local_id, pcb_coord_t dx, pcb_coord_t dy, int simple)
+{
+	char buff[128];
+	lht_node_t *obj;
+
+	sprintf(buff, "line.%ld", (local_id >= 0 ? local_id : line->ID));
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	if (!simple) {
+		obj_attr_flag_warn((pcb_any_obj_t *)line);
+		lht_dom_hash_put(obj, build_attributes(&line->Attributes));
+		lht_dom_hash_put(obj, build_flags(&line->Flags, PCB_OBJ_LINE, line->intconn));
+		lht_dom_hash_put(obj, build_textf("clearance", CFMT, line->Clearance));
+	}
+
+	lht_dom_hash_put(obj, build_textf("thickness", CFMT, line->Thickness));
+	lht_dom_hash_put(obj, build_textf("x1", CFMT, line->Point1.X+dx));
+	lht_dom_hash_put(obj, build_textf("y1", CFMT, line->Point1.Y+dy));
+	lht_dom_hash_put(obj, build_textf("x2", CFMT, line->Point2.X+dx));
+	lht_dom_hash_put(obj, build_textf("y2", CFMT, line->Point2.Y+dy));
+
+	build_thermal_heavy(obj, (pcb_any_obj_t*)line);
+
+	return obj;
+}
+
+static lht_node_t *build_simplearc(pcb_arc_t *arc, int local_id)
+{
+	char buff[128];
+	lht_node_t *obj;
+
+	sprintf(buff, "simplearc.%ld", (local_id >= 0 ? local_id : arc->ID));
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+	lht_dom_hash_put(obj, build_textf("x", CFMT, arc->X));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, arc->Y));
+	lht_dom_hash_put(obj, build_textf("r", CFMT, arc->Height));
+	lht_dom_hash_put(obj, build_textf("astart", "%f", arc->StartAngle));
+	lht_dom_hash_put(obj, build_textf("adelta", "%f", arc->Delta));
+	lht_dom_hash_put(obj, build_textf("thickness", CFMT, arc->Thickness));
+
+	return obj;
+}
+
+
+static lht_node_t *build_simplepoly(pcb_poly_t *poly, int local_id)
+{
+	char buff[128];
+	lht_node_t *obj;
+	pcb_point_t *pnt;
+	int n;
+
+	sprintf(buff, "simplepoly.%ld", (local_id >= 0 ? local_id : poly->ID));
+	obj = lht_dom_node_alloc(LHT_LIST, buff);
+
+	for(n = 0, pnt = poly->Points; n < poly->PointN; n++,pnt++) {
+		lht_dom_list_append(obj, build_textf(NULL, CFMT, pnt->X));
+		lht_dom_list_append(obj, build_textf(NULL, CFMT, pnt->Y));
+	}
+	return obj;
+}
+
+
+static lht_node_t *build_rat(pcb_rat_t *rat)
+{
+	char buff[128];
+	lht_node_t *obj;
+	sprintf(buff, "rat.%ld", rat->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)rat);
+
+	lht_dom_hash_put(obj, build_attributes(&rat->Attributes));
+	lht_dom_hash_put(obj, build_flags(&rat->Flags, PCB_OBJ_LINE, rat->intconn));
+	lht_dom_hash_put(obj, build_textf("x1", CFMT, rat->Point1.X));
+	lht_dom_hash_put(obj, build_textf("y1", CFMT, rat->Point1.Y));
+	lht_dom_hash_put(obj, build_textf("x2", CFMT, rat->Point2.X));
+	lht_dom_hash_put(obj, build_textf("y2", CFMT, rat->Point2.Y));
+	lht_dom_hash_put(obj, build_textf("lgrp1", "%d", rat->group1));
+	lht_dom_hash_put(obj, build_textf("lgrp2", "%d", rat->group2));
+
+	return obj;
+}
+
+static lht_node_t *build_arc(pcb_arc_t *arc, pcb_coord_t dx, pcb_coord_t dy)
+{
+	char buff[128];
+	lht_node_t *obj;
+
+	sprintf(buff, "arc.%ld", arc->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)arc);
+
+	lht_dom_hash_put(obj, build_attributes(&arc->Attributes));
+	lht_dom_hash_put(obj, build_flags(&arc->Flags, PCB_OBJ_ARC, arc->intconn));
+	lht_dom_hash_put(obj, build_textf("thickness", CFMT, arc->Thickness));
+	lht_dom_hash_put(obj, build_textf("clearance", CFMT, arc->Clearance));
+	lht_dom_hash_put(obj, build_textf("x", CFMT, arc->X+dx));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, arc->Y+dy));
+	lht_dom_hash_put(obj, build_textf("width", CFMT, arc->Width));
+	lht_dom_hash_put(obj, build_textf("height", CFMT, arc->Height));
+	lht_dom_hash_put(obj, build_textf("astart", "%ma", arc->StartAngle));
+	lht_dom_hash_put(obj, build_textf("adelta", "%ma", arc->Delta));
+
+	build_thermal_heavy(obj, (pcb_any_obj_t*)arc);
+
+	return obj;
+}
+
+/* attempt to convert a padstack to an old-style via for v1, v2 and v3 */
+static lht_node_t *build_pstk_pinvia(pcb_data_t *data, pcb_pstk_t *ps, pcb_bool is_via, pcb_coord_t dx, pcb_coord_t dy)
+{
+	char buff[128];
+	lht_node_t *obj;
+	pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask;
+	pcb_pstk_compshape_t cshape;
+	pcb_bool plated;
+	pcb_flag_t flg;
+	char *name = pcb_attribute_get(&ps->Attributes, "name");
+
+
+	if (!pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+		pcb_io_incompat_save(data, (pcb_any_obj_t *)ps, "Failed to convert to old-style via", "Old via format is very much restricted; try to use a simpler, uniform shape padstack");
+		return NULL;
+	}
+
+	sprintf(buff, "%s.%ld", is_via ? "via" : "pin", ps->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	flg = pcb_pstk_compat_pinvia_flag(ps, cshape);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)ps);
+
+	lht_dom_hash_put(obj, build_attributes(&ps->Attributes));
+	lht_dom_hash_put(obj, build_flags(&flg, PCB_OBJ_VIA, ps->intconn));
+	lht_dom_hash_put(obj, build_textf("thickness", CFMT, pad_dia));
+	lht_dom_hash_put(obj, build_textf("clearance", CFMT, clearance));
+	lht_dom_hash_put(obj, build_textf("mask", CFMT, mask));
+	lht_dom_hash_put(obj, build_textf("hole", CFMT, drill_dia));
+	lht_dom_hash_put(obj, build_textf("x", CFMT, x + dx));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, y + dy));
+	lht_dom_hash_put(obj, build_text("name", name));
+	lht_dom_hash_put(obj, build_text("number", ps->term));
+	return obj;
+}
+
+/* attempt to convert a padstack to an old-style pad for v1, v2 and v3 */
+static lht_node_t *build_pstk_pad(pcb_data_t *data, pcb_pstk_t *ps, pcb_coord_t dx, pcb_coord_t dy)
+{
+	char buff[128];
+	lht_node_t *obj;
+	pcb_coord_t x1, y1, x2, y2, thickness, clearance, mask;
+	pcb_bool square, nopaste;
+	char *name = pcb_attribute_get(&ps->Attributes, "name");
+	pcb_flag_t flg;
+
+	if (!pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) {
+		pcb_io_incompat_save(data, (pcb_any_obj_t *)ps, "Failed to convert to old-style pad", "Old pad format is very much restricted; try to use a simpler, uniform shape padstack, square or round-cap line based");
+		return NULL;
+	}
+
+	sprintf(buff, "pad.%ld", ps->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	flg = ps->Flags;
+	if (square)
+		flg.f |= PCB_FLAG_SQUARE;
+	if (nopaste)
+		flg.f |= PCB_FLAG_NOPASTE;
+
+	obj_attr_flag_warn((pcb_any_obj_t *)ps);
+
+	lht_dom_hash_put(obj, build_attributes(&ps->Attributes));
+	lht_dom_hash_put(obj, build_flags(&flg, PCB_OBJ_PAD, ps->intconn));
+	lht_dom_hash_put(obj, build_textf("thickness", CFMT, thickness));
+	lht_dom_hash_put(obj, build_textf("clearance", CFMT, clearance));
+	lht_dom_hash_put(obj, build_textf("mask", CFMT, mask));
+	lht_dom_hash_put(obj, build_textf("x1", CFMT, x1+dx));
+	lht_dom_hash_put(obj, build_textf("y1", CFMT, y1+dy));
+	lht_dom_hash_put(obj, build_textf("x2", CFMT, x2+dx));
+	lht_dom_hash_put(obj, build_textf("y2", CFMT, y2+dy));
+	lht_dom_hash_put(obj, build_text("name", name));
+	lht_dom_hash_put(obj, build_text("number", ps->term));
+	return obj;
+}
+
+static lht_node_t *build_polygon(pcb_poly_t *poly)
+{
+	char buff[128];
+	lht_node_t *obj, *tbl, *geo;
+	pcb_cardinal_t n, hole = 0;
+
+	sprintf(buff, "polygon.%ld", poly->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)poly);
+
+	lht_dom_hash_put(obj, build_attributes(&poly->Attributes));
+	lht_dom_hash_put(obj, build_flags(&poly->Flags, PCB_OBJ_POLY, poly->intconn));
+
+	if ((wrver >= 3) && (poly->Clearance > 0))
+		lht_dom_hash_put(obj, build_textf("clearance", CFMT, poly->Clearance));
+	else
+		lht_dom_hash_put(obj, dummy_node("clearance"));
+
+	geo = lht_dom_node_alloc(LHT_LIST, "geometry");
+	lht_dom_hash_put(obj, geo);
+
+	tbl = lht_dom_node_alloc(LHT_TABLE, "contour");
+	tbl->data.table.cols = 2;
+	lht_dom_list_append(geo, tbl);
+
+	for(n = 0; n < poly->PointN; n++) {
+		int row;
+		if ((hole < poly->HoleIndexN) && (n == poly->HoleIndex[hole])) {
+			tbl = lht_dom_node_alloc(LHT_TABLE, "hole");
+			tbl->data.table.cols = 2;
+			lht_dom_list_append(geo, tbl);
+			hole++;
+		}
+
+		row = tbl->data.table.rows;
+		lht_tree_table_ins_row(tbl, row);
+
+		lht_dom_node_free(tbl->data.table.r[row][0]);
+		lht_dom_node_free(tbl->data.table.r[row][1]);
+		tbl->data.table.r[row][0] = build_textf(NULL, CFMT, poly->Points[n].X);
+		tbl->data.table.r[row][1] = build_textf(NULL, CFMT, poly->Points[n].Y);
+	}
+
+	build_thermal_heavy(obj, (pcb_any_obj_t*)poly);
+
+	return obj;
+}
+
+static lht_node_t *build_pcb_text(const char *role, pcb_text_t *text)
+{
+	char buff[128];
+	lht_node_t *obj;
+
+	sprintf(buff, "text.%ld", text->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)text);
+
+	lht_dom_hash_put(obj, build_attributes(&text->Attributes));
+	lht_dom_hash_put(obj, build_flags(&text->Flags, PCB_OBJ_TEXT, text->intconn));
+	lht_dom_hash_put(obj, build_text("string", text->TextString));
+	lht_dom_hash_put(obj, build_textf("fid", "%ld", text->fid));
+	lht_dom_hash_put(obj, build_textf("scale", "%d", text->Scale));
+	lht_dom_hash_put(obj, build_textf("direction", "%d", text->Direction));
+	lht_dom_hash_put(obj, build_textf("x", CFMT, text->X));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, text->Y));
+
+	if (role != NULL)
+		lht_dom_hash_put(obj, build_text("role", role));
+
+	return obj;
+}
+
+static lht_node_t *build_subc_element(pcb_subc_t *subc)
+{
+	char buff[128];
+	lht_node_t *obj, *lst;
+	pcb_coord_t ox, oy;
+	gdl_iterator_t it;
+	int l, seen_refdes = 0;
+	pcb_pstk_t *ps;
+
+	if (pcb_subc_get_origin(subc, &ox, &oy) != 0) {
+		assert(subc->parent_type == PCB_PARENT_DATA);
+		pcb_io_incompat_save(subc->parent.data, (pcb_any_obj_t *)subc, "Failed to convert subc to old-style element: missing origin", "make sure the subcircuit has the vectors on its subc-aux layer");
+		return NULL;
+	}
+
+	sprintf(buff, "element.%ld", subc->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)subc);
+
+	lht_dom_hash_put(obj, build_attributes(&subc->Attributes));
+	lht_dom_hash_put(obj, build_flags(&subc->Flags, PCB_OBJ_ELEMENT, 0));
+
+	/* build drawing primitives */
+	lst = lht_dom_node_alloc(LHT_LIST, "objects");
+	lht_dom_hash_put(obj, lst);
+
+
+	lht_dom_hash_put(obj, build_textf("x", CFMT, ox));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, oy));
+
+	/* export layer objects: silk lines and arcs */
+	for(l = 0; l < subc->data->LayerN; l++) {
+		pcb_layer_t *ly = &subc->data->Layer[l];
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+		pcb_text_t *text;
+
+		if ((ly->meta.bound.type & PCB_LYT_SILK) && (ly->meta.bound.type & PCB_LYT_TOP)) {
+			linelist_foreach(&ly->Line, &it, line)
+				lht_dom_list_append(lst, build_line(line, -1, -ox, -oy, 0));
+			arclist_foreach(&ly->Arc, &it, arc) 
+				lht_dom_list_append(lst, build_arc(arc, -ox, -oy));
+			textlist_foreach(&ly->Text, &it, text) {
+				if (PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text)) {
+					if (!seen_refdes) {
+						pcb_text_t tmp;
+						memcpy(&tmp, text, sizeof(tmp));
+						tmp.TextString = pcb_attribute_get(&subc->Attributes, "footprint");
+						lht_dom_list_append(lst, build_pcb_text("desc", &tmp));
+						tmp.TextString = pcb_attribute_get(&subc->Attributes, "refdes");
+						lht_dom_list_append(lst, build_pcb_text("name", &tmp));
+						tmp.TextString = pcb_attribute_get(&subc->Attributes, "value");
+						lht_dom_list_append(lst, build_pcb_text("value", &tmp));
+						seen_refdes = 1;
+					}
+				}
+				else {
+					pcb_io_incompat_save(subc->parent.data, (pcb_any_obj_t *)text, "can't export custom silk text object", "the only text old pcb elements support is the refdes/value/description text");
+				}
+			}
+			if (polylist_length(&ly->Polygon) > 0) {
+				char *desc = pcb_strdup_printf("Polygons on layer %s can not be exported in an element", ly->name);
+				pcb_io_incompat_save(subc->data, NULL, desc, "only lines and arcs are exported");
+				free(desc);
+			}
+			if (textlist_length(&ly->Text) > 1) {
+				char *desc = pcb_strdup_printf("Text on layer %s can not be exported in an element", ly->name);
+				pcb_io_incompat_save(subc->data, NULL, desc, "only lines and arcs are exported");
+				free(desc);
+			}
+			continue;
+		}
+
+		if (!(ly->meta.bound.type & PCB_LYT_VIRTUAL) && (!pcb_layer_is_pure_empty(ly))) {
+			char *desc = pcb_strdup_printf("Objects on layer %s can not be exported in an element", ly->name);
+			pcb_io_incompat_save(subc->data, NULL, desc, "only top silk lines and arcs are exported; heavy terminals are not supported, use padstacks only");
+			free(desc);
+		}
+	}
+
+	for(ps = padstacklist_first(&subc->data->padstack); ps != NULL; ps = padstacklist_next(ps)) {
+		lht_node_t *nps;
+
+		nps = build_pstk_pinvia(subc->data, ps, pcb_false, -ox, -oy);
+		if (nps == NULL)
+			nps = build_pstk_pad(subc->data, ps, -ox, -oy);
+		if (nps != NULL)
+			lht_dom_list_append(lst, nps);
+		else
+			pcb_io_incompat_save(subc->data, (pcb_any_obj_t *)ps, "Padstack can not be exported as pin or pad", "use simpler padstack; for pins, all copper layers must have the same shape and there must be no paste; for pads, use a line or a rectangle; paste and mask must match the copper shape");
+	}
+
+	if (!seen_refdes)
+		pcb_io_incompat_save(subc->parent.data, (pcb_any_obj_t *)subc, "can't export subcircuit without refdes text on silk", "old pcb elements require refdes text on silk");
+
+	return obj;
+}
+
+static lht_node_t *build_subc(pcb_subc_t *sc)
+{
+	char buff[128];
+	lht_node_t *obj;
+
+	if (wrver < 3)
+		return build_subc_element(sc);
+
+	sprintf(buff, "subc.%ld", sc->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	obj_attr_flag_warn((pcb_any_obj_t *)sc);
+
+	lht_dom_hash_put(obj, build_attributes(&sc->Attributes));
+	lht_dom_hash_put(obj, build_flags(&sc->Flags, PCB_OBJ_SUBC, 0));
+	lht_dom_hash_put(obj, build_data(sc->data));
+	lht_dom_hash_put(obj, build_minuid("uid", sc->uid));
+
+	return obj;
+}
+
+static void build_layer_stack_flag(void *ctx, pcb_layer_type_t bit, const char *name, int class, const char *class_name)
+{
+	lht_node_t *dst = ctx;
+	lht_dom_hash_put(dst, build_text(name, "1"));
+}
+
+static void build_data_layer_comb(void *ctx, pcb_layer_combining_t bit, const char *name)
+{
+	lht_node_t *comb = ctx;
+	lht_dom_hash_put(comb, build_text(name, "1"));
+}
+
+
+static lht_node_t *build_pstk_protos(pcb_vtpadstack_proto_t *pp)
+{
+	lht_node_t *lst, *nproto, *nmask, *nshape, *nshapelst, *ncomb, *nshapeo;
+	pcb_cardinal_t n, sn, pn;
+	pcb_pstk_tshape_t *ts;
+	char tmp[64];
+
+	lst = lht_dom_node_alloc(LHT_LIST, "padstack_prototypes");
+	for(n = 0; n < pcb_vtpadstack_proto_len(pp); n++) {
+		pcb_pstk_proto_t *proto = pp->array+n;
+
+		if (!proto->in_use) {
+			lht_dom_list_append(lst, build_text("unused", "1"));
+			continue;
+		}
+
+		sprintf(tmp, "ps_proto_v4.%ld", (long)n);
+		lht_dom_list_append(lst, nproto = lht_dom_node_alloc(LHT_HASH, tmp));
+
+		lht_dom_hash_put(nproto, build_textf("hdia", CFMT, proto->hdia));
+		lht_dom_hash_put(nproto, build_textf("htop", "%d", proto->htop));
+		lht_dom_hash_put(nproto, build_textf("hbottom", "%d", proto->hbottom));
+		lht_dom_hash_put(nproto, build_textf("hplated", "%d", proto->hplated));
+		if (proto->name != NULL) {
+			if (wrver >= 5)
+				lht_dom_hash_put(nproto, build_text("name", proto->name));
+			else
+				pcb_io_incompat_save(NULL, NULL, "versions below lihata board v5 do not support padstack prototype names\n", "Be aware that padstack proto names are lost in save or use lihata board v5 or higher");
+		}
+		else
+			lht_dom_hash_put(nproto, dummy_node("name"));
+
+		/* save each shape */
+		lht_dom_hash_put(nproto, nshapelst = lht_dom_node_alloc(LHT_LIST, "shape"));
+		ts = &proto->tr.array[0]; /* save the canonical shape only, the transformation cache is generated runtime */
+		if (ts != NULL)
+		for(sn = 0; sn < ts->len; sn++) {
+			pcb_pstk_shape_t *shape = ts->shape + sn;
+
+			lht_dom_list_append(nshapelst, nshape = lht_dom_node_alloc(LHT_HASH, "ps_shape_v4"));
+
+			lht_dom_hash_put(nshape, nmask = lht_dom_node_alloc(LHT_HASH, "layer_mask"));
+			pcb_layer_type_map(shape->layer_mask, nmask, build_layer_stack_flag);
+
+			lht_dom_hash_put(nshape, ncomb = lht_dom_node_alloc(LHT_HASH, "combining"));
+			pcb_layer_comb_map(shape->comb, ncomb, build_data_layer_comb);
+
+			lht_dom_hash_put(nshape, build_textf("clearance", CFMT, shape->clearance));
+
+			switch(shape->shape) {
+				case PCB_PSSH_POLY:
+					nshapeo = lht_dom_node_alloc(LHT_LIST, "ps_poly");
+					for(pn = 0; pn < shape->data.poly.len; pn++) {
+						lht_dom_list_append(nshapeo, build_textf(NULL, CFMT, shape->data.poly.x[pn]));
+						lht_dom_list_append(nshapeo, build_textf(NULL, CFMT, shape->data.poly.y[pn]));
+					}
+					break;
+				case PCB_PSSH_LINE:
+					nshapeo = lht_dom_node_alloc(LHT_HASH, "ps_line");
+					lht_dom_hash_put(nshapeo, build_textf("x1", CFMT, shape->data.line.x1));
+					lht_dom_hash_put(nshapeo, build_textf("y1", CFMT, shape->data.line.y1));
+					lht_dom_hash_put(nshapeo, build_textf("x2", CFMT, shape->data.line.x2));
+					lht_dom_hash_put(nshapeo, build_textf("y2", CFMT, shape->data.line.y2));
+					lht_dom_hash_put(nshapeo, build_textf("thickness", CFMT, shape->data.line.thickness));
+					lht_dom_hash_put(nshapeo, build_textf("square", "%d", shape->data.line.square));
+					break;
+				case PCB_PSSH_CIRC:
+					nshapeo = lht_dom_node_alloc(LHT_HASH, "ps_circ");
+					lht_dom_hash_put(nshapeo, build_textf("x", CFMT, shape->data.circ.x));
+					lht_dom_hash_put(nshapeo, build_textf("y", CFMT, shape->data.circ.y));
+					lht_dom_hash_put(nshapeo, build_textf("dia", CFMT, shape->data.circ.dia));
+					break;
+				default:
+					pcb_message(PCB_MSG_ERROR, "Internal error: unimplemented pad stack shape %d\n", shape->shape);
+					abort();
+			}
+			lht_dom_hash_put(nshape, nshapeo);
+		}
+	}
+
+	return lst;
+}
+
+static lht_node_t *build_pstk(pcb_pstk_t *ps)
+{
+	char buff[128];
+	lht_node_t *obj, *thr, *thr_lst;
+	unsigned long n;
+
+	sprintf(buff, "padstack_ref.%ld", ps->ID);
+	obj = lht_dom_node_alloc(LHT_HASH, buff);
+
+	lht_dom_hash_put(obj, build_attributes(&ps->Attributes));
+	lht_dom_hash_put(obj, build_flags(&ps->Flags, PCB_OBJ_PSTK, ps->intconn));
+
+	lht_dom_hash_put(obj, build_textf("proto", "%ld", (long int)ps->proto));
+	lht_dom_hash_put(obj, build_textf("x", CFMT, ps->x));
+	lht_dom_hash_put(obj, build_textf("y", CFMT, ps->y));
+	lht_dom_hash_put(obj, build_textf("clearance", CFMT, ps->Clearance));
+	lht_dom_hash_put(obj, build_textf("rot", "%f", ps->rot));
+	lht_dom_hash_put(obj, build_textf("xmirror", "%d", ps->xmirror));
+	lht_dom_hash_put(obj, build_textf("smirror", "%d", ps->smirror));
+
+	lht_dom_hash_put(obj, thr = lht_dom_node_alloc(LHT_LIST, "thermal"));
+	for(n = 0; n < ps->thermals.used; n++) {
+		pcb_thermal_t ts = ps->thermals.shape[n];
+		if (ts != 0) {
+			char tmp[64];
+			const char *b;
+			sprintf(tmp, "%ld", n);
+			thr_lst = lht_dom_node_alloc(LHT_LIST, tmp);
+			while((b = pcb_thermal_bits2str(&ts)) != NULL)
+				lht_dom_list_append(thr_lst, build_text(NULL, b));
+			lht_dom_list_append(thr, thr_lst);
+		}
+
+	}
+
+	return obj;
+}
+
+static lht_node_t *build_layer_stack(pcb_board_t *pcb)
+{
+	lht_node_t *lstk, *grps, *grp, *layers, *flags;
+	int n, i;
+
+	lstk = lht_dom_node_alloc(LHT_HASH, "layer_stack");
+	lht_dom_hash_put(lstk, grps = lht_dom_node_alloc(LHT_LIST, "groups"));
+
+	for(n = 0; n < pcb->LayerGroups.len; n++) {
+		pcb_layergrp_t *g = &pcb->LayerGroups.grp[n];
+		char tmp[32];
+		sprintf(tmp, "%d", n);
+		lht_dom_list_append(grps, grp = lht_dom_node_alloc(LHT_HASH, tmp));
+
+		if (wrver >= 5)
+			lht_dom_hash_put(grp, build_attributes(&g->Attributes));
+		else if (g->Attributes.Number > 0)
+			pcb_io_incompat_save(pcb->Data, (pcb_any_obj_t *)g, "Can not save layer group attributes in lihata formats below version 5.", "Either save in lihata v5 - or accept that attributes are not saved");
+
+		lht_dom_hash_put(grp, build_text("name", g->name));
+		lht_dom_hash_put(grp, layers = lht_dom_node_alloc(LHT_LIST, "layers"));
+		for(i = 0; i < g->len; i++)
+			lht_dom_list_append(layers, build_textf("", "%ld", g->lid[i]));
+
+		lht_dom_hash_put(grp, flags = lht_dom_node_alloc(LHT_HASH, "type"));
+		pcb_layer_type_map(g->ltype, flags, build_layer_stack_flag);
+	}
+
+	return lstk;
+}
+
+
+static lht_node_t *build_data_layer(pcb_data_t *data, pcb_layer_t *layer, pcb_layergrp_id_t layer_group, pcb_layer_id_t lid)
+{
+	lht_node_t *obj, *grp, *comb;
+	pcb_line_t *li;
+	pcb_arc_t *ar;
+	pcb_poly_t *po;
+	pcb_text_t *tx;
+	int added = 0;
+
+	obj = lht_dom_node_alloc(LHT_HASH, layer->name);
+
+	if (!layer->is_bound) {
+		lht_dom_hash_put(obj, build_text("visible", layer->meta.real.vis ? "1" : "0"));
+		lht_dom_hash_put(obj, build_textf("group", "%ld", layer_group));
+		if (wrver >= 5)
+			lht_dom_hash_put(obj, build_text("color", layer->meta.real.color));
+	}
+	else {
+		if (wrver >= 3) {
+			lht_node_t *type;
+
+			if (layer->meta.bound.stack_offs != 0)
+				lht_dom_hash_put(obj, build_textf("stack_offs", "%d", layer->meta.bound.stack_offs));
+
+			lht_dom_hash_put(obj, type = lht_dom_node_alloc(LHT_HASH, "type"));
+			pcb_layer_type_map(layer->meta.bound.type, type, build_layer_stack_flag);
+		}
+		else
+			pcb_message(PCB_MSG_WARNING, "io_lihata: attempting to save bound layers in lihata version lower than 3; feature not supported by the format.\n");
+	}
+
+	if (!layer->is_bound)
+		lht_dom_hash_put(obj, build_attributes(&layer->Attributes));
+
+	if (wrver >= 2) {
+		lht_dom_hash_put(obj, build_textf("lid", "%ld", lid));
+		lht_dom_hash_put(obj, comb = lht_dom_node_alloc(LHT_HASH, "combining"));
+		pcb_layer_comb_map(layer->comb, comb, build_data_layer_comb);
+	}
+
+	grp = lht_dom_node_alloc(LHT_LIST, "objects");
+
+	for(li = linelist_first(&layer->Line); li != NULL; li = linelist_next(li)) {
+		lht_dom_list_append(grp, build_line(li, -1, 0, 0, 0));
+		added++;
+	}
+
+	for(ar = arclist_first(&layer->Arc); ar != NULL; ar = arclist_next(ar)) {
+		lht_dom_list_append(grp, build_arc(ar, 0, 0));
+		added++;
+	}
+
+	for(po = polylist_first(&layer->Polygon); po != NULL; po = polylist_next(po)) {
+		lht_dom_list_append(grp, build_polygon(po));
+		added++;
+	}
+
+	for(tx = textlist_first(&layer->Text); tx != NULL; tx = textlist_next(tx)) {
+		lht_dom_list_append(grp, build_pcb_text(NULL, tx));
+		added++;
+	}
+
+	lht_dom_hash_put(obj, grp);
+
+	return obj;
+}
+
+#define LAYER_GID_FIX_V1() \
+	do { \
+		if (wrver == 1) { \
+			if (gid >= 0) { \
+				if (gid < sizeof(grp) / sizeof(grp[0])) \
+					gid = grp[gid]; \
+				else \
+					gid = -1; \
+			} \
+		} \
+	} while(0)
+
+
+static lht_node_t *build_data_layers(pcb_data_t *data)
+{
+	long int n;
+	lht_node_t *layers;
+	pcb_layergrp_id_t gm, grp[PCB_MAX_LAYERGRP], gtop = -1, gbottom = -1;
+	pcb_layergrp_t *g;
+
+	layers = lht_dom_node_alloc(LHT_LIST, "layers");
+
+	{ /* produce an old layer group assignment from top to bottom (needed for v1, good for other versions too) */
+		gm = 0;
+		for(n = 0; n < pcb_max_group(PCB); n++) {
+			unsigned int gflg = pcb_layergrp_flags(PCB, n);
+			if (gflg & PCB_LYT_COPPER) {
+				if (gflg & PCB_LYT_TOP)
+					gtop = gm;
+				if (gflg & PCB_LYT_BOTTOM)
+					gbottom = gm;
+				grp[n] = gm;
+/*				pcb_trace("build data layers: %d -> %ld {%ld %ld}\n", n, gm, gtop, gbottom); */
+				gm++;
+			}
+			else
+				grp[n] = -1;
+		}
+
+		g = pcb_get_grp(&PCB->LayerGroups, PCB_LYT_BOTTOM, PCB_LYT_SILK);
+		grp[g - PCB->LayerGroups.grp] = gbottom;
+
+		g = pcb_get_grp(&PCB->LayerGroups, PCB_LYT_TOP, PCB_LYT_SILK);
+		grp[g - PCB->LayerGroups.grp] = gtop;
+	}
+
+	if (wrver == 1) {
+		/* v1 needs to have silk at the end of the list */
+		for(n = 0; n < pcb_max_layer; n++) {
+			if ((pcb_layer_flags(PCB, n) & PCB_LYT_SILK) == 0) {
+				pcb_layergrp_id_t gid = pcb_layer_get_group(PCB, n);
+				LAYER_GID_FIX_V1();
+				lht_dom_list_append(layers, build_data_layer(data, data->Layer+n, gid, n));
+			}
+		}
+		for(n = 0; n < pcb_max_layer; n++) {
+			if (pcb_layer_flags(PCB, n) & PCB_LYT_SILK) {
+				pcb_layer_id_t gid = pcb_layer_get_group(PCB, n);
+				LAYER_GID_FIX_V1();
+				lht_dom_list_append(layers, build_data_layer(data, data->Layer+n, gid, n));
+			}
+		}
+	}
+	else {
+		/* keep the original order from v2, to minimize diffs */
+		for(n = 0; n < data->LayerN; n++) {
+			pcb_layergrp_id_t gid = pcb_layer_get_group(PCB, n);
+			lht_dom_list_append(layers, build_data_layer(data, data->Layer+n, gid, n));
+		}
+	}
+
+	return layers;
+}
+
+
+static lht_node_t *build_data(pcb_data_t *data)
+{
+	lht_node_t *grp, *ndt;
+	pcb_pstk_t *ps;
+	pcb_subc_t *sc;
+	gdl_iterator_t it;
+	pcb_rat_t *line;
+
+	ndt = lht_dom_node_alloc(LHT_HASH, "data");
+
+	/* build layers */
+	lht_dom_hash_put(ndt, build_data_layers(data));
+
+	/* build a list of all global objects */
+	grp = lht_dom_node_alloc(LHT_LIST, "objects");
+	lht_dom_hash_put(ndt, grp);
+
+	if (wrver >= 4) {
+		lht_dom_hash_put(ndt, build_pstk_protos(&data->ps_protos));
+		for(ps = padstacklist_first(&data->padstack); ps != NULL; ps = padstacklist_next(ps))
+			lht_dom_list_append(grp, build_pstk(ps));
+	}
+	else {
+		for(ps = padstacklist_first(&data->padstack); ps != NULL; ps = padstacklist_next(ps)) {
+			lht_node_t *p = build_pstk_pinvia(data, ps, pcb_true, 0, 0);
+			if (p != NULL)
+				lht_dom_list_append(grp, p);
+		}
+	}
+
+	for(sc = pcb_subclist_first(&data->subc); sc != NULL; sc = pcb_subclist_next(sc))
+		lht_dom_list_append_safe(grp, build_subc(sc));
+
+	ratlist_foreach(&data->Rat, &it, line)
+		lht_dom_list_append(grp, build_rat(line));
+
+	return ndt;
+}
+
+static lht_node_t *build_symbol(pcb_symbol_t *sym, const char *name)
+{
+	lht_node_t *lst, *ndt;
+	pcb_line_t *li;
+	pcb_poly_t *poly;
+	pcb_arc_t *arc;
+	int n;
+
+	ndt = lht_dom_node_alloc(LHT_HASH, name);
+	lht_dom_hash_put(ndt, build_textf("width", CFMT, sym->Width));
+	lht_dom_hash_put(ndt, build_textf("height", CFMT, sym->Height));
+	lht_dom_hash_put(ndt, build_textf("delta", CFMT, sym->Delta));
+
+	lst = lht_dom_node_alloc(LHT_LIST, "objects");
+	lht_dom_hash_put(ndt, lst);
+	for(n = 0, li = sym->Line; n < sym->LineN; n++, li++)
+		lht_dom_list_append(lst, build_line(li, n, 0, 0, 1));
+
+	for(arc = arclist_first(&sym->arcs); arc != NULL; arc = arclist_next(arc), n++)
+		lht_dom_list_append(lst, build_simplearc(arc, n));
+
+	for(poly = polylist_first(&sym->polys); poly != NULL; poly = polylist_next(poly), n++)
+		lht_dom_list_append(lst, build_simplepoly(poly, n));
+
+	return ndt;
+}
+
+static lht_node_t *build_font(pcb_font_t *font)
+{
+	lht_node_t *syms, *ndt;
+	char *sid, sidbuff[64];
+	int n;
+
+	if (font->id > 0) {
+		sprintf(sidbuff, "%ld", font->id);
+		sid = sidbuff;
+	}
+	else
+		sid = "geda_pcb"; /* special case for comaptibility: font 0 is the geda_pcb font */
+
+	ndt = lht_dom_node_alloc(LHT_HASH, sid);
+
+	lht_dom_hash_put(ndt, build_textf("cell_height", CFMT, font->MaxHeight));
+	lht_dom_hash_put(ndt, build_textf("cell_width", CFMT, font->MaxWidth));
+	lht_dom_hash_put(ndt, build_textf("id", "%ld", font->id));
+	if (font->name != NULL)
+		lht_dom_hash_put(ndt, build_text("name", font->name));
+/*	lht_dom_hash_put(ndt, build_symbol(&font->DefaultSymbol)); */
+
+
+	syms = lht_dom_node_alloc(LHT_HASH, "symbols");
+	lht_dom_hash_put(ndt, syms);
+	for(n = 0; n < PCB_MAX_FONTPOSITION + 1; n++) {
+		char sname[32];
+		if (!font->Symbol[n].Valid)
+			continue;
+		if ((n <= 32) || (n > 126) || (n == '&') || (n == '#') || (n == '{') || (n == '}') || (n == '/') || (n == ':') || (n == ';') || (n == '=') || (n == '\\') || (n == ':')) {
+			sprintf(sname, "&%02x", n);
+		}
+		else {
+			sname[0] = n;
+			sname[1] = '\0';
+		}
+		lht_dom_hash_put(syms, build_symbol(&font->Symbol[n], sname));
+	}
+	return ndt;
+}
+
+static lht_node_t *build_fontkit(pcb_fontkit_t *fk)
+{
+	lht_node_t *ndt, *frt;
+
+	frt = lht_dom_node_alloc(LHT_HASH, "font");
+
+	/* write the default font first - it's always there */
+	ndt = build_font(&fk->dflt);
+	lht_dom_hash_put(frt, ndt);
+
+	/* write extra fonts, if there are */
+	if (fk->hash_inited) {
+		htip_entry_t *e;
+		for(e = htip_first(&fk->fonts); e; e = htip_next(&fk->fonts, e)) {
+			ndt = build_font(e->value);
+			lht_dom_hash_put(frt, ndt);
+		}
+	}
+
+
+	return frt;
+}
+
+
+static lht_node_t *build_styles(vtroutestyle_t *styles)
+{
+	lht_node_t *stl, *sn;
+	int n;
+
+	stl = lht_dom_node_alloc(LHT_LIST, "styles");
+	for(n = 0; n < vtroutestyle_len(styles); n++) {
+		pcb_route_style_t *s = styles->array + n;
+		sn = lht_dom_node_alloc(LHT_HASH, s->name);
+		lht_dom_list_append(stl, sn);
+		lht_dom_hash_put(sn, build_textf("thickness", CFMT, s->Thick));
+		lht_dom_hash_put(sn, build_textf("diameter", CFMT, s->Diameter));
+		lht_dom_hash_put(sn, build_textf("hole", CFMT, s->Hole));
+		lht_dom_hash_put(sn, build_textf("clearance", CFMT, s->Clearance));
+		if (wrver >= 5) {
+			if (s->via_proto_set)
+				lht_dom_hash_put(sn, build_textf("via_proto", "%ld", (long int)s->via_proto));
+			else
+			lht_dom_hash_put(sn, dummy_text_node("via_proto"));
+		}
+		else
+			pcb_io_incompat_save(NULL, NULL, "lihata boards before version v5 did not support padstack prototype in route style\n", "Either save in lihata v5+ or be aware of losing this information");
+		lht_dom_hash_put(sn, build_attributes(&s->attr));
+	}
+	return stl;
+}
+
+/* Build a plain old netlist */
+static lht_node_t *build_netlist(pcb_lib_t *netlist, const char *name, int *nonempty)
+{
+	lht_node_t *nl, *pl, *pn, *nnet;
+	pcb_cardinal_t n, p;
+
+	if (netlist->MenuN < 0)
+		return dummy_node(name);
+
+	(*nonempty)++;
+
+	nl = lht_dom_node_alloc(LHT_LIST, name);
+	for (n = 0; n < netlist->MenuN; n++) {
+		pcb_lib_menu_t *menu = &netlist->Menu[n];
+		const char *netname = &menu->Name[2];
+		const char *style = menu->Style;
+
+		/* create the net hash */
+		nnet = lht_dom_node_alloc(LHT_HASH, netname);
+
+		if (wrver >= 5)
+			lht_dom_hash_put(nnet, build_attributes(&menu->Attributes));
+		else if (menu->Attributes.Number > 0)
+			pcb_io_incompat_save(NULL, (pcb_any_obj_t *)menu, "Can not save netlist attributes in lihata formats below version 5.", "Either save in lihata v5 - or accept that attributes are not saved");
+
+		pl = lht_dom_node_alloc(LHT_LIST, "conn");
+		lht_dom_hash_put(nnet, pl);
+		if ((style != NULL) && (*style == '\0')) style = NULL;
+		lht_dom_hash_put(nnet, build_text("style", style));
+
+		/* grow the connection list */
+		for (p = 0; p < menu->EntryN; p++) {
+			pcb_lib_entry_t *entry = &menu->Entry[p];
+			const char *pin = entry->ListEntry;
+			pn = lht_dom_node_alloc(LHT_TEXT, "");
+			pn->data.text.value = pcb_strdup(pin);
+			lht_dom_list_append(pl, pn);
+		}
+		lht_dom_list_append(nl, nnet);
+	}
+	return nl;
+}
+
+typedef struct {
+	lht_node_t *patch, *info;
+} build_net_patch_t;
+
+static void build_net_patch_cb(void *ctx_, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val)
+{
+	build_net_patch_t *ctx = ctx_;
+	lht_node_t *n;
+	switch(ev) {
+		case PCB_RPE_INFO_BEGIN:
+			ctx->info = lht_dom_node_alloc(LHT_LIST, "net_info");
+			lht_dom_list_append(ctx->info, build_text("net", netn));
+			break;
+		case PCB_RPE_INFO_TERMINAL:
+			lht_dom_list_append(ctx->info, build_text("term", val));
+			break;
+		case PCB_RPE_INFO_END:
+			lht_dom_list_append(ctx->patch, ctx->info);
+			ctx->info = NULL;
+			break;
+		case PCB_RPE_CONN_ADD:
+			n = lht_dom_node_alloc(LHT_HASH, "add_conn");
+			goto append_term;
+
+		case PCB_RPE_CONN_DEL:
+			n = lht_dom_node_alloc(LHT_HASH, "del_conn");
+			append_term:;
+			lht_dom_hash_put(n, build_text("net", netn));
+			lht_dom_hash_put(n, build_text("term", val));
+			lht_dom_list_append(ctx->patch, n);
+			break;
+
+		case PCB_RPE_ATTR_CHG:
+			n = lht_dom_node_alloc(LHT_HASH, "change_attrib");
+			lht_dom_hash_put(n, build_text("net", netn));
+			lht_dom_hash_put(n, build_text("key", key));
+			lht_dom_hash_put(n, build_text("val", val));
+			lht_dom_list_append(ctx->patch, n);
+			break;
+	}
+}
+
+/* Build a netlist patch so that we don't need to export a complete new set of "as built" netlist */
+static lht_node_t *build_net_patch(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, int *nonempty)
+{
+	lht_node_t *pn;
+	build_net_patch_t ctx;
+
+	pn = lht_dom_node_alloc(LHT_LIST, "netlist_patch");
+
+	ctx.patch = pn;
+	pcb_rats_patch_export(pcb, pat, pcb_false, build_net_patch_cb, &ctx);
+
+	if (pn->data.list.first == NULL) {
+		lht_dom_node_free(pn);
+		return dummy_node("netlist_patch");
+	}
+
+	(*nonempty)++;
+	return pn;
+}
+
+
+static lht_node_t *build_netlists(pcb_board_t *pcb, pcb_lib_t *netlists, pcb_ratspatch_line_t *pat, int num_netlists)
+{
+	lht_node_t *nls;
+	int n, nonempty = 0;
+
+	if (num_netlists > PCB_NUM_NETLISTS)
+		return dummy_node("netlists");
+
+	nls = lht_dom_node_alloc(LHT_HASH, "netlists");
+
+	for(n = 0; n < num_netlists; n++) {
+		lht_node_t *nl;
+		if (n == PCB_NETLIST_EDITED)
+			nl = build_net_patch(pcb, pat, &nonempty);
+		else
+			nl = build_netlist(netlists+n, pcb_netlist_names[n], &nonempty);
+		lht_dom_hash_put(nls, nl);
+	}
+
+	if (!nonempty) {
+		lht_dom_node_free(nls);
+		return dummy_node("netlists");
+	}
+
+	return nls;
+}
+
+extern lht_doc_t *conf_main_root[CFR_max_alloc];
+static lht_node_t *build_conf()
+{
+	const char **s, *del_paths[] = { "editor/mode", NULL };
+	lht_node_t *root, *n;
+	if ((conf_main_root[CFR_DESIGN] == NULL) || (conf_main_root[CFR_DESIGN]->root == NULL) || (conf_main_root[CFR_DESIGN]->root->type != LHT_LIST))
+		return lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
+
+	root = conf_main_root[CFR_DESIGN]->root;
+	for(n = root->data.list.first; n != NULL; n = n->next) {
+		for(s = del_paths; *s != NULL; s++) {
+			lht_node_t *sub = lht_tree_path_(n->doc, n, *s, 0, 0, NULL);
+			if (sub != NULL) {
+				lht_tree_del(sub);
+			}
+		}
+	}
+
+	return lht_dom_duptree(root);
+}
+
+static lht_doc_t *build_board(pcb_board_t *pcb)
+{
+	char vers[32];
+	lht_doc_t *brd = lht_dom_init();
+
+	sprintf(vers, "pcb-rnd-board-v%d", wrver);
+	brd->root = lht_dom_node_alloc(LHT_HASH, vers);
+	lht_dom_hash_put(brd->root, build_board_meta(pcb));
+	if (wrver >= 2)
+		lht_dom_hash_put(brd->root, build_layer_stack(pcb));
+	lht_dom_hash_put(brd->root, build_data(pcb->Data));
+	lht_dom_hash_put(brd->root, build_attributes(&pcb->Attributes));
+	lht_dom_hash_put(brd->root, build_fontkit(&pcb->fontkit));
+	lht_dom_hash_put(brd->root, build_styles(&pcb->RouteStyle));
+	lht_dom_hash_put(brd->root, build_netlists(pcb, pcb->NetlistLib, pcb->NetlistPatches, PCB_NUM_NETLISTS));
+	lht_dom_hash_put(brd->root, build_conf());
+	return brd;
+}
+
+static lhtpers_ev_res_t check_text(void *ev_ctx, lht_perstyle_t *style, lht_node_t *inmem_node, const char *ondisk_value)
+{
+	/* for coords, preserve formatting as long as values match */
+	if (lhtpers_rule_find(io_lihata_out_coords, inmem_node) != NULL) {
+		pcb_coord_t v1, v2;
+		pcb_bool success1, success2;
+
+/*		fprintf(stderr, "SMART d='%s' m='%s'\n", ondisk_value, inmem_node->data.text.value);*/
+
+		v1 = pcb_get_value_ex(ondisk_value, NULL, NULL, NULL, NULL, &success1);
+		v2 = pcb_get_value_ex(inmem_node->data.text.value, NULL, NULL, NULL, NULL, &success2);
+/*		pcb_fprintf(stderr, " %d %d | %mm %mm\n", success1, success2, v1, v2);*/
+		if (success1 && success2) {
+			/* smart: if values are the same, keep the on-disk version */
+			if (v1 == v2)
+				return LHTPERS_DISK;
+			else
+				return LHTPERS_MEM;
+		}
+		/* else fall back to the string compare below */
+	}
+
+	if (inmem_node->data.text.value == NULL)
+		return LHTPERS_INHIBIT;
+
+	/* classic method: string mismatch => overwrite from mem */
+	if (strcmp(inmem_node->data.text.value, ondisk_value) != 0)
+		return LHTPERS_MEM;
+
+	return LHTPERS_DISK;
+}
+
+static void clean_invalid(lht_node_t *node)
+{
+	lht_node_t *n;
+	lht_dom_iterator_t it;
+	for(n = lht_dom_first(&it, node); n != NULL; n = lht_dom_next(&it)) {
+		if (n->type == LHT_INVALID_TYPE)
+			lht_tree_del(n);
+		else
+			clean_invalid(n);
+	}
+}
+
+static int io_lihata_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency, int ver)
+{
+	int res;
+	lht_doc_t *brd;
+
+	wrver = ver;
+	brd = build_board(PCB);
+
+#if IO_LIHATA_SAVE_BACKUP_IN_PCB
+	{
+		const char *fnpat = conf_io_lihata.plugins.io_lihata.aux_pcb_pattern;
+
+		/* Backup in .pcb before saving in .lht so if the save code crashes,
+		   the board is preserved. WARNING: since .pcb can't represent a lot
+		   of details, it may degrade the board _before_ we save it in lht.
+		   Thus this feature should be disabled */
+		if ((fnpat != NULL) && (*fnpat != '\0')) {
+			char *orig_fn, *end;
+			char *pcb_fn = pcb_strdup_subst(fnpat, pcb_build_fn_cb, NULL, PCB_SUBST_ALL);
+			
+			orig_fn = PCB->Filename;
+			PCB->Filename = NULL;
+
+			/* avoid .lht.lht.pcb */
+			end = pcb_fn + strlen(pcb_fn) - 1;
+			if ((end-11 > pcb_fn) && (strcmp(end-11, ".lht.lht.pcb") == 0))
+				strcpy(end-11, ".lht.pcb");
+
+			fprintf(stderr, "NOTE: io_lihata_write_pcb will save to '%s' but first saves in '%s': res=%d (expected: 0)\n", new_filename, pcb_fn, pcb_save_pcb(pcb_fn, "pcb"));
+			free(pcb_fn);
+			
+			/* restore these because SaveTo() has changed them */
+			free(PCB->Filename);
+			PCB->Filename = orig_fn;
+			PCB->Data->loader = ctx;
+		}
+	}
+#endif
+
+	if ((emergency) || ((old_filename == NULL) && (new_filename == NULL))) {
+		/* emergency or pipe save: use the canonical form */
+		clean_invalid(brd->root); /* remove invalid nodes placed for persistency */
+		res = lht_dom_export(brd->root, FP, "");
+	}
+	else {
+		FILE *inf = NULL;
+		char *errmsg;
+		lhtpers_ev_t events;
+
+		if (old_filename != NULL)
+			inf = pcb_fopen(old_filename, "r");
+
+		memset(&events, 0, sizeof(events));
+		events.text = check_text;
+/*		events.list_empty = check_list_empty;
+		events.list_elem_removed = check_list_elem_removed;*/
+		events.output_rules = io_lihata_out_rules;
+
+		res = lhtpers_fsave_as(&events, brd, inf, FP, old_filename, &errmsg);
+		if ((res == LHTPERS_ERR_ROOT_MISMATCH) || (res == LHTPERS_ERR_ROOT_MISSING)) {
+			/* target is a different lht file or not even an lht file; the user requested the save, including overwrite, so do that */
+			rewind(FP);
+			res = lhtpers_fsave_as(&events, brd, NULL, FP, old_filename, &errmsg);
+		}
+		if (res != 0) {
+			FILE *fe;
+			char *fe_name = pcb_concat(old_filename, ".mem.lht", NULL);
+			fe = pcb_fopen(fe_name, "w");
+			if (fe != NULL) {
+				clean_invalid(brd->root); /* remove invalid nodes placed for persistency */
+				res = lht_dom_export(brd->root, fe, "");
+				fclose(fe);
+			}
+			pcb_message(PCB_MSG_ERROR, "lhtpers_fsave_as() failed. Please include files %s and %s and %s in your bugreport\n", inf, old_filename, fe_name);
+			pcb_message(PCB_MSG_ERROR, "in case this broke your file %s, please use the emergency save %s instead.\n", old_filename, fe_name);
+		}
+		fflush(FP);
+		if (inf != NULL)
+			fclose(inf);
+	}
+
+	lht_dom_uninit(brd);
+	return res;
+}
+
+int io_lihata_write_pcb_v1(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 1);
+}
+
+int io_lihata_write_pcb_v2(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 2);
+}
+
+int io_lihata_write_pcb_v3(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 3);
+}
+
+int io_lihata_write_pcb_v4(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 4);
+}
+
+int io_lihata_write_pcb_v5(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 5);
+}
+
+int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename)
+{
+	FILE *f;
+	int res;
+	lht_doc_t *doc;
+
+
+	f = pcb_fopen(Filename, "w");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to open font file %s for write\n", Filename);
+		return -1;
+	}
+
+	/* create the doc */
+	io_lihata_full_tree = 1;
+	doc = lht_dom_init();
+	doc->root = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-font-v1");
+	lht_dom_list_append(doc->root, build_font(font));
+
+	clean_invalid(doc->root);
+	res = lht_dom_export(doc->root, f, "");
+
+	fclose(f);
+	lht_dom_uninit(doc);
+	io_lihata_full_tree = 0;
+	return res;
+}
+
+static int io_lihata_dump_1st_subc(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *data, int enforce1)
+{
+	int res;
+	lht_doc_t *doc;
+	pcb_subc_t *sc;
+
+	if ((enforce1) && (pcb_subclist_length(&data->subc)) > 1) {
+		pcb_message(PCB_MSG_ERROR, "Can't save more than one subcircuit from a buffer\n");
+		return -1;
+	}
+	if (pcb_subclist_length(&data->subc) < 1) {
+		pcb_message(PCB_MSG_ERROR, "there's no subcircuit in the buffer\n");
+		return -1;
+	}
+
+	/* create the doc */
+	io_lihata_full_tree = 1;
+	doc = lht_dom_init();
+
+	/* determine version */
+	if (ctx == &plug_io_lihata_v3)
+		wrver = 3;
+	else
+		wrver = 4;
+
+	/* bump version if features require */
+	sc = pcb_subclist_first(&data->subc);
+#warning subc TODO: for subc-in-subc this should be recursive
+	if (padstacklist_first(&sc->data->padstack) != NULL) {
+		if (wrver < 4) {
+			pcb_message(PCB_MSG_WARNING, "Had to bump lihata subc version to 4 because the subcircuit contains padstacks.\n");
+			wrver = 4;
+		}
+	}
+
+	if (wrver == 3)
+		doc->root = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-subcircuit-v3");
+	else if (wrver >= 4)
+		doc->root = lht_dom_node_alloc(LHT_LIST, "pcb-rnd-subcircuit-v4");
+	else {
+		pcb_message(PCB_MSG_ERROR, "Invalid lihata subc version to write: %d\n", wrver);
+		return -1;
+	}
+
+	lht_dom_list_append(doc->root, build_subc(sc));
+
+	clean_invalid(doc->root); /* remove invalid nodes placed for persistency */
+	res = lht_dom_export(doc->root, f, "");
+
+	lht_dom_uninit(doc);
+	io_lihata_full_tree = 0;
+	return res;
+}
+
+int io_lihata_write_buffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only)
+{
+	if (!elem_only) {
+		pcb_message(PCB_MSG_ERROR, "Can't save full buffer (yet), only a single subcircuits from a buffer\n");
+		return -1;
+	}
+
+	return io_lihata_dump_1st_subc(ctx, f, buff->Data, 1);
+}
+
+int io_lihata_write_element(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *dt)
+{
+	return io_lihata_dump_1st_subc(ctx, f, dt, 1);
+}
Index: tags/2.0.1/src_plugins/io_lihata/write.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/write.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/write.h	(revision 18980)
@@ -0,0 +1,35 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+int io_lihata_write_pcb_v1(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_lihata_write_pcb_v2(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_lihata_write_pcb_v3(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_lihata_write_pcb_v4(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_lihata_write_pcb_v5(pcb_plug_io_t *ctx, FILE *FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename);
+int io_lihata_write_buffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only);
+int io_lihata_write_element(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *dt);
+
Index: tags/2.0.1/src_plugins/io_lihata/write_style.c
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/write_style.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/write_style.c	(revision 18980)
@@ -0,0 +1,684 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Specify default output formatting style to be more compact than 
+   the canonical lihata export style */
+
+#include "config.h"
+#include "write_style.h"
+
+#define PB_BEGIN     {"*", 2, 2}
+#define PB_BEGINSP   {" *", 3, 3}
+#define PB_BEGINNL   {"\n *", 4, 4}
+#define PB_EMPTY     {"", 1, 1}
+#define PB_SEMICOLON {";", 2, 2}
+#define PB_SPACE     {" ", 2, 2}
+#define PB_LBRACE    {"{", 2, 2}
+#define PB_LBRACENL  {"{\n", 3, 3}
+#define PB_LBRACENLI {"{\n*", 4, 4}
+#define PB_RBRACE    {"}", 2, 2}
+#define PB_RBRACENL  {"}\n", 3, 3}
+#define PB_RBRACENLI {"}\n*", 4, 4}
+#define PB_RBRACESC  {"};", 3, 3}
+#define PB_NEWLINE   {"\n", 2, 2}
+#define PB_DEFAULT   {NULL, 0, 0}
+
+/* Space spearated key=val; pairs */
+static lht_perstyle_t style_inline = {
+	/* buff */        {PB_SPACE, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_SEMICOLON},
+	/* has_eq */      1,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_inlinesp = {
+	/* buff */        {PB_BEGINSP, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_SEMICOLON},
+	/* has_eq */      1,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+/* tightly packed key=val; pairs */
+static lht_perstyle_t style_inline_tight = {
+	/* buff */        {PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_SEMICOLON},
+	/* has_eq */      1,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_newline = {
+	/* buff */        {PB_BEGIN, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_NEWLINE},
+	/* has_eq */      1,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_newline_sp = {
+	/* buff */        {PB_BEGINSP, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_NEWLINE},
+	/* has_eq */      1,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_istruct = {
+	/* buff */        {PB_SPACE, PB_SPACE, PB_LBRACE, PB_EMPTY, PB_EMPTY, PB_RBRACESC},
+	/* has_eq */      1,
+	/* val_brace */   1,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_struct = {
+	/* buff */        {PB_BEGIN, PB_SPACE, PB_LBRACENL, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_struct_thermal = {
+	/* buff */        {PB_BEGIN, PB_SPACE, PB_LBRACE, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_structi = {
+	/* buff */        {PB_BEGIN, PB_SPACE, PB_LBRACENLI, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_structs = {
+	/* buff */        {PB_BEGIN, PB_SPACE, PB_LBRACE, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_structsp = {
+	/* buff */        {PB_BEGINSP, PB_SPACE, PB_LBRACE, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_structnp = {
+	/* buff */        {PB_BEGINSP, PB_SPACE, PB_LBRACENL, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t style_nlstruct = {
+	/* buff */        {PB_BEGINNL, PB_SPACE, PB_LBRACENL, PB_EMPTY, PB_EMPTY, PB_RBRACENL},
+	/* has_eq */      0,
+	/* val_brace */   0,
+	/* etype */       0,
+	/* ename */       1,
+	/* name_braced */ 0
+};
+
+static lht_perstyle_t early_nl = {
+	/* buff */        {PB_NEWLINE, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY, PB_EMPTY},
+};
+
+
+static const char *pat_te_flags[]      = {"te:*", "ha:flags", "*", NULL};
+static const char *pat_te_attr[]       = {"te:*", "ha:attributes", "*", NULL};
+static lhtpers_rule_t r_ilists[]   = {
+	{pat_te_flags,  &style_inline_tight, NULL},
+	{pat_te_attr,   &style_newline_sp, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_thermal[] = {"ha:thermal", "ha:flags", "*", NULL};
+static lhtpers_rule_t r_thermal[]   = {
+	{pat_thermal,  &style_struct_thermal, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ha_flags[] = {"ha:flags", "*", NULL};
+static lhtpers_rule_t r_flags[]   = {
+	{pat_ha_flags,  &style_istruct, r_thermal},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_x1_line[]    = {"te:x1", "*", NULL};
+static const char *pat_y1_line[]    = {"te:y1", "*", NULL};
+static const char *pat_x2_line[]    = {"te:x2", "*", NULL};
+static const char *pat_y2_line[]    = {"te:y2", "*", NULL};
+static const char *pat_thickness[]  = {"te:thickness", "*", NULL};
+static const char *pat_clearance[]  = {"te:clearance", "*", NULL};
+static const char *pat_flags[]      = {"ha:flags", "*", NULL};
+static const char *pat_attributes[] = {"ha:attributes", "*", NULL};
+static const char *pat_square[]     = {"te:square", "*", NULL};
+static lhtpers_rule_t r_line[] = {
+	{pat_x1_line,    &style_inline, NULL},
+	{pat_y1_line,    &style_inline, NULL},
+	{pat_x2_line,    &style_inline, NULL},
+	{pat_y2_line,    &style_inline, NULL},
+	{pat_thickness,  &style_inline, NULL},
+	{pat_clearance,  &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_lgrp1_line[] = {"te:lgrp1", "*", NULL};
+static const char *pat_lgrp2_line[] = {"te:lgrp2", "*", NULL};
+static lhtpers_rule_t r_rat[] = {
+	{pat_x1_line,    &style_inline, NULL},
+	{pat_y1_line,    &style_inline, NULL},
+	{pat_lgrp1_line, &style_inline, NULL},
+	{pat_x2_line,    &style_inline, NULL},
+	{pat_y2_line,    &style_inline, NULL},
+	{pat_lgrp2_line, &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_x[]             = {"te:x", "*", NULL};
+static const char *pat_y[]             = {"te:y", "*", NULL};
+static const char *pat_width_arc[]     = {"te:width", "*", NULL};
+static const char *pat_height_arc[]    = {"te:height", "*", NULL};
+static const char *pat_astart_arc[]    = {"te:astart", "*", NULL};
+static const char *pat_adelta_arc[]    = {"te:adelta", "*", NULL};
+static lhtpers_rule_t r_arc[] = {
+	{pat_x,          &style_inline, NULL},
+	{pat_y,          &style_inline, NULL},
+	{pat_width_arc,  &style_inline, NULL},
+	{pat_height_arc, &style_inline, NULL},
+	{pat_astart_arc, &style_inline, NULL},
+	{pat_adelta_arc, &style_inline, NULL},
+	{pat_thickness,  &style_inline, NULL},
+	{pat_clearance,  &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_name[] = {"te:name", "*", NULL};
+static const char *pat_numb[] = {"te:number", "*", NULL};
+static const char *pat_hole[] = {"te:hole", "*", NULL};
+static const char *pat_mask[] = {"te:mask", "*", NULL};
+static lhtpers_rule_t r_pinvia[] = {
+	{pat_name,       &style_inline, NULL},
+	{pat_numb,       &style_inline, NULL},
+	{pat_x,          &style_inline, NULL},
+	{pat_y,          &style_inline, NULL},
+	{pat_hole,       &style_inline, NULL},
+	{pat_mask,       &style_inline, NULL},
+	{pat_thickness,  &style_inline, NULL},
+	{pat_clearance,  &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_xmirror[] = {"te:xmirror", "*", NULL};
+static const char *pat_smirror[] = {"te:smirror", "*", NULL};
+static const char *pat_rot[]     = {"te:rot", "*", NULL};
+static const char *pat_proto[]   = {"te:proto", "*", NULL};
+static lhtpers_rule_t r_psref[] = {
+	{pat_proto,      &style_inline, NULL},
+	{pat_x,          &style_inline, NULL},
+	{pat_y,          &style_inline, NULL},
+	{pat_rot,        &style_inline, NULL},
+	{pat_xmirror,    &style_inline, NULL},
+	{pat_smirror,    &style_inline, NULL},
+	{pat_clearance,  &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_thermal,    &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+
+static lhtpers_rule_t r_pad[] = {
+	{pat_name,       &style_inline, NULL},
+	{pat_numb,       &style_inline, NULL},
+	{pat_x1_line,    &style_inline, NULL},
+	{pat_y1_line,    &style_inline, NULL},
+	{pat_x2_line,    &style_inline, NULL},
+	{pat_y2_line,    &style_inline, NULL},
+	{pat_mask,       &style_inline, NULL},
+	{pat_thickness,  &style_inline, NULL},
+	{pat_clearance,  &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ta_contour[] = {"ta:contour", "*", NULL};
+static const char *pat_ta_hole[]    = {"ta:hole", "*", NULL};
+static lhtpers_rule_t r_geometry[] = {
+	{pat_ta_contour,       &style_istruct, NULL},
+	{pat_ta_hole,          &style_istruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_geometry[] = {"li:geometry", "*", NULL};
+static lhtpers_rule_t r_polygon[] = {
+	{pat_clearance,  &style_inline, NULL},
+	{pat_geometry,   &style_nlstruct, r_geometry},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_string[] = {"te:string", "*", NULL};
+static const char *pat_role[]   = {"te:role", "*", NULL};
+static const char *pat_scale[]  = {"te:scale", "*", NULL};
+static const char *pat_fid[]    = {"te:fid", "*", NULL};
+static const char *pat_direct[] = {"te:direction", "*", NULL};
+static lhtpers_rule_t r_text[] = {
+	{pat_string,     &style_inline, NULL},
+	{pat_x,          &style_inline, NULL},
+	{pat_y,          &style_inline, NULL},
+	{pat_scale,      &style_inline, NULL},
+	{pat_fid,        &style_inline, NULL},
+	{pat_direct,     &style_inline, NULL},
+	{pat_role,       &style_inline, NULL},
+	{lhtpers_early_end, &early_nl, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+
+static const char *pat_objects[] = {"li:objects", "*", NULL};
+static lhtpers_rule_t r_element[] = {
+	{pat_x,          &style_inline, NULL},
+	{pat_y,          &style_inline, NULL},
+	{pat_flags,      &style_nlstruct, r_thermal},
+	{pat_attributes, &style_nlstruct, NULL},
+	{pat_objects,    &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_visible[] = {"te:visible", "*", NULL};
+static const char *pat_group[]   = {"te:group", "*", NULL};
+static const char *pat_lid[]     = {"te:lid", "*", NULL};
+static const char *pat_combin[]  = {"ha:combining", "*", NULL};
+static lhtpers_rule_t r_layer[] = {
+	{pat_lid,              &style_newline, NULL},
+	{pat_group,            &style_newline, NULL},
+	{pat_combin,           &style_structs, NULL},
+	{pat_visible,          &style_newline, NULL},
+	{pat_attributes,       &style_nlstruct, NULL},
+	{pat_objects,          &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ps_line[] = {"ha:ps_line", "*", NULL};
+static lhtpers_rule_t r_ps_line[] = {
+	{pat_x1_line,    &style_inline, NULL},
+	{pat_y1_line,    &style_inline, NULL},
+	{pat_x2_line,    &style_inline, NULL},
+	{pat_y2_line,    &style_inline, NULL},
+	{pat_thickness,  &style_inline, NULL},
+	{pat_square,     &style_inline, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ps_circ[] = {"ha:ps_circ", "*", NULL};
+static const char *pat_dia[]     = {"te:dia", "*", NULL};
+static lhtpers_rule_t r_ps_circ[] = {
+	{pat_x,    &style_inline, NULL},
+	{pat_y,    &style_inline, NULL},
+	{pat_dia,  &style_inline, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ps_shape_v4[] = {"ha:ps_shape_v4", "*", NULL};
+static const char *pat_layer_mask[]  = {"ha:layer_mask", "*", NULL};
+static lhtpers_rule_t r_ps_shape_v4[] = {
+	{pat_ps_line,          &style_struct_thermal,  r_ps_line},
+	{pat_ps_circ,          &style_struct_thermal,  r_ps_circ},
+	{pat_combin,           &style_structs, NULL},
+	{pat_layer_mask,       &style_struct, NULL},
+	{pat_clearance,        &style_newline,  NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_li_shape[] = {"li:shape", "*", NULL};
+static lhtpers_rule_t r_li_shape[] = {
+	{pat_ps_shape_v4, &style_structi,  r_ps_shape_v4},
+	{NULL, NULL, NULL}
+};
+
+
+static const char *pat_ps_htop[] = {"te:htop", "*", NULL};
+static const char *pat_ps_hdia[] = {"te:hdia", "*", NULL};
+static const char *pat_ps_hbottom[] = {"te:hbottom", "*", NULL};
+static const char *pat_ps_hplated[] = {"te:hplated", "*", NULL};
+
+static const char *pat_ps_proto[] = {"ha:ps_proto_v*", "*", NULL};
+static lhtpers_rule_t r_ps_proto[] = {
+	{pat_ps_hdia,     &style_inlinesp, NULL},
+	{pat_ps_hplated,  &style_inline, NULL},
+	{pat_ps_htop,     &style_inline, NULL},
+	{pat_ps_hbottom,  &style_inline, NULL},
+	{pat_li_shape,    &style_nlstruct, r_li_shape},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_ps_protos[] = {"li:padstack_prototypes", "*", NULL};
+static lhtpers_rule_t r_ps_protos[] = {
+	{pat_ps_proto,  &style_struct, r_ps_proto},
+	{NULL, NULL, NULL}
+};
+
+
+static lhtpers_rule_t r_data[] = {
+	{pat_ps_protos,        &style_struct,   r_ps_protos},
+	{pat_objects,          &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_width[]   = {"te:width", "*", NULL};
+static const char *pat_height[]  = {"te:height", "*", NULL};
+static const char *pat_delta[]   = {"te:delta", "*", NULL};
+static lhtpers_rule_t r_symbol[] = {
+	{pat_width,      &style_inline, NULL},
+	{pat_height,     &style_inline, NULL},
+	{pat_delta,      &style_inline, NULL},
+	{pat_objects,    &style_nlstruct, NULL},
+	{pat_attributes,       &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+
+static const char *pat_cell_width[]   = {"te:cell_width", "*", NULL};
+static const char *pat_cell_height[]  = {"te:cell_height", "*", NULL};
+static const char *pat_ha_symbols[]   = {"ha:symbols", "*", NULL};
+static lhtpers_rule_t r_font1[] = {
+	{pat_cell_width,      &style_inline, NULL},
+	{pat_cell_height,     &style_inline, NULL},
+	{pat_attributes,      &style_nlstruct, NULL},
+	{pat_ha_symbols,      &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_li_styles[]   = {"li:styles", "*", NULL};
+static const char *pat_ha_meta[]     = {"ha:meta", "*", NULL};
+static const char *pat_ha_data[]     = {"ha:data", "*", NULL};
+static const char *pat_ha_font[]     = {"ha:font", "*", NULL};
+static const char *pat_ha_netlists[] = {"ha:netlists", "*", NULL};
+static lhtpers_rule_t r_root[] = {
+	{pat_attributes,      &style_nlstruct, NULL},
+	{pat_li_styles,       &style_nlstruct, NULL},
+	{pat_ha_meta,         &style_nlstruct, NULL},
+	{pat_ha_data,         &style_nlstruct, NULL},
+	{pat_ha_font,         &style_nlstruct, NULL},
+	{pat_ha_netlists,     &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+static const char *pat_net_input[] = {"ha:input", "*", NULL};
+static const char *pat_net_patch[] = {"ha:netlist_patch", "*", NULL};
+static lhtpers_rule_t r_netlists[] = {
+	{pat_net_input,         &style_nlstruct, NULL},
+	{pat_net_patch,         &style_nlstruct, NULL},
+	{NULL, NULL, NULL}
+};
+
+
+static const char *pat_ls_type1[] = {"te:*", "ha:type", "ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_ls_type2[] = {"ha:type", "ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_ls_lyr1[] = {"te:*", "li:layers", "ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_ls_lyr2[] = {"li:layers", "ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_ls_name[] = {"te:name", "ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_ls_grps[] = {"li:groups", "ha:layer_stack", "*", NULL};
+
+static lhtpers_rule_t r_layergrp[] = {
+	{pat_ls_name,  NULL, NULL},
+	{pat_ls_type2, &style_structsp, NULL},
+	{pat_ls_lyr2,  &style_structsp, NULL},
+	{NULL, NULL, NULL}
+};
+
+
+static const char *pat_line[] = {"ha:line.*", "*", NULL};
+static const char *pat_spoly[]= {"li:simplepoly.*", "*", NULL};
+static const char *pat_rat[]  = {"ha:rat.*", "*", NULL};
+static const char *pat_arc[]  = {"ha:arc.*", "*", NULL};
+static const char *pat_via[]  = {"ha:via.*", "*", NULL};
+static const char *pat_psref[]= {"ha:padstack_ref.*", "*", NULL};
+static const char *pat_pin[]  = {"ha:pin.*", "*", NULL};
+static const char *pat_pad[]  = {"ha:pad.*", "*", NULL};
+static const char *pat_poly[] = {"ha:polygon.*", "*", NULL};
+static const char *pat_elem[] = {"ha:element.*", "*", NULL};
+static const char *pat_text[] = {"ha:text.*", "*", NULL};
+static const char *pat_data[] = {"ha:data", "*", NULL};
+static const char *pat_netlists[] = {"ha:netlists", "*", NULL};
+static const char *pat_font1[] = {"ha:geda_pcb", "ha:font", "*", NULL};
+static const char *pat_layer[] = {"ha:*", "li:layers", "*", NULL};
+static const char *pat_symbol[] = {"ha:*", "ha:symbols", "*", NULL};
+static const char *pat_thermt[] = {"te:*", "ha:thermal", "*", NULL};
+static const char *pat_flag[] = {"te:*", "ha:flags", "*", NULL};
+static const char *pat_cell[] = {"te:*", "ta:*", "*", NULL};
+static const char *pat_netinft[] = {"te:*", "li:net_info", "li:netlist_patch", "*", NULL};
+static const char *pat_nettxt[] = {"te:*", "ha:*", "li:netlist_patch", "*", NULL};
+static const char *pat_del_add[] = {"ha:*", "li:netlist_patch", "*", NULL};
+static const char *pat_netinfo[] = {"li:net_info", "li:netlist_patch", "*", NULL};
+static const char *pat_tconn[] = {"te:*", "li:conn", "ha:*", "li:*", "ha:netlists", "*", NULL};
+static const char *pat_lconn[] = {"li:conn", "ha:*", "li:*", "ha:netlists", "*", NULL};
+static const char *pat_layergrp[] = {"ha:*", "li:groups", "ha:layer_stack", "*", NULL};
+static const char *pat_combs[]  = {"te:*", "ha:combining", "*", NULL};
+static const char *pat_root[] = {"^", NULL};
+
+static lhtpers_rule_t r_istructs[] = {
+	{pat_root,    &style_struct, r_root},
+
+	{pat_layer,   &style_nlstruct, r_layer},
+	{pat_symbol,  &style_structi,  r_symbol},
+
+	{pat_line,    &style_structi,  r_line},
+	{pat_spoly,   &style_structi,  NULL},
+	{pat_rat,     &style_structi,  r_rat},
+	{pat_arc,     &style_structi,  r_arc},
+	{pat_via,     &style_structi,  r_pinvia},
+	{pat_psref,   &style_structi,  r_psref},
+	{pat_pin,     &style_structi,  r_pinvia},
+	{pat_pad,     &style_structi,  r_pad},
+	{pat_poly,    &style_structs,  r_polygon},
+	{pat_elem,    &style_structi,  r_element},
+	{pat_text,    &style_structi,  r_text},
+	{pat_data,    &style_structi,  r_data},
+	{pat_font1,   &style_structi,  r_font1},
+	{pat_netlists,&style_struct,   r_netlists},
+	{pat_ps_protos,&style_struct,  r_ps_protos},
+	{pat_ps_proto,&style_nlstruct, r_ps_proto},
+	{pat_ps_shape_v4,&style_nlstruct,r_ps_shape_v4},
+	{pat_objects, &style_nlstruct, NULL},
+	{pat_flag,    &style_newline,  NULL},
+
+	{pat_layergrp,&style_structnp, r_layergrp},
+	{pat_ls_grps, &style_structnp, NULL},
+
+
+	{pat_cell,    &style_inline,   NULL},
+	{pat_thermt,  &style_inline,   NULL},
+	{pat_del_add, &style_struct_thermal, NULL},
+	{pat_netinfo, &style_struct_thermal, NULL},
+	{pat_netinft, &style_inline,   NULL},
+	{pat_nettxt,  &style_inline,   NULL},
+	{pat_tconn,   &style_inline,   NULL},
+	{pat_lconn,   &style_struct_thermal, NULL},
+
+	{pat_ls_type1, &style_inline,   NULL},
+	{pat_ls_lyr1,  &style_inline,   NULL},
+	{pat_combs,    &style_inline,   NULL},
+
+	{NULL, NULL, NULL}
+};
+
+lhtpers_rule_t *io_lihata_out_rules[] = {
+	r_istructs, r_ilists, r_ilists, r_flags, NULL
+};
+
+
+/*****************************************************************************/
+static const char *cpat_rat_x1[]   = {"te:x1", "ha:rat.*", "*", NULL};
+static const char *cpat_rat_y1[]   = {"te:y1", "ha:rat.*", "*", NULL};
+static const char *cpat_rat_x2[]   = {"te:x2", "ha:rat.*", "*", NULL};
+static const char *cpat_rat_y2[]   = {"te:y2", "ha:rat.*", "*", NULL};
+static const char *cpat_line_x1[]  = {"te:x1", "ha:line.*", "*", NULL};
+static const char *cpat_line_y1[]  = {"te:y1", "ha:line.*", "*", NULL};
+static const char *cpat_line_x2[]  = {"te:x2", "ha:line.*", "*", NULL};
+static const char *cpat_line_y2[]  = {"te:y2", "ha:line.*", "*", NULL};
+static const char *cpat_line_th[]  = {"te:thickness", "ha:line.*", "*", NULL};
+static const char *cpat_line_cl[]  = {"te:clearance", "ha:line.*", "*", NULL};
+static const char *cpat_size_x[]   = {"te:x", "ha:size", "ha:meta", "*", NULL};
+static const char *cpat_size_y[]   = {"te:y", "ha:size", "ha:meta", "*", NULL};
+static const char *cpat_curs_x[]   = {"te:x", "ha:cursor", "ha:meta", "*", NULL};
+static const char *cpat_curs_y[]   = {"te:y", "ha:cursor", "ha:meta", "*", NULL};
+static const char *cpat_curs_z[]   = {"te:zoom", "ha:cursor", "ha:meta", "*", NULL};
+static const char *cpat_drc_min[]  = {"te:min_*", "ha:drc", "ha:meta", "*", NULL};
+static const char *cpat_drc_blt[]  = {"te:bloat", "ha:drc", "ha:meta", "*", NULL};
+static const char *cpat_drc_shr[]  = {"te:shrink", "ha:drc", "ha:meta", "*", NULL};
+static const char *cpat_grido[]    = {"te:offs_*", "ha:grid", "ha:meta", "*", NULL};
+static const char *cpat_grids[]    = {"te:spacing", "ha:grid", "ha:meta", "*", NULL};
+
+static const char *cpat_arc_x[]    = {"te:x", "ha:arc.*", "*", NULL};
+static const char *cpat_arc_y[]    = {"te:y", "ha:arc.*", "*", NULL};
+static const char *cpat_arc_w[]    = {"te:width", "ha:arc.*", "*", NULL};
+static const char *cpat_arc_h[]    = {"te:height", "ha:arc.*", "*", NULL};
+static const char *cpat_arc_th[]   = {"te:thickness", "ha:arc.*", "*", NULL};
+static const char *cpat_arc_cl[]   = {"te:clearance", "ha:arc.*", "*", NULL};
+static const char *cpat_geo_ta[]   = {"te:*", "ta:*", "li:geometry", "*", NULL};
+static const char *cpat_text_x[]   = {"te:x", "ha:text.*", "*", NULL};
+static const char *cpat_text_y[]   = {"te:y", "ha:text.*", "*", NULL};
+static const char *cpat_pin_x[]    = {"te:x", "ha:pin.*", "*", NULL};
+static const char *cpat_pin_y[]    = {"te:y", "ha:pin.*", "*", NULL};
+static const char *cpat_pin_hole[] = {"te:hole", "ha:pin.*", "*", NULL};
+static const char *cpat_pin_mask[] = {"te:mask", "ha:pin.*", "*", NULL};
+static const char *cpat_pad_x1[]   = {"te:x1", "ha:pad.*", "*", NULL};
+static const char *cpat_pad_y1[]   = {"te:y1", "ha:pad.*", "*", NULL};
+static const char *cpat_pad_x2[]   = {"te:x2", "ha:pad.*", "*", NULL};
+static const char *cpat_pad_y2[]   = {"te:y2", "ha:pad.*", "*", NULL};
+static const char *cpat_pad_hole[] = {"te:hole", "ha:pad.*", "*", NULL};
+static const char *cpat_pad_mask[] = {"te:mask", "ha:pad.*", "*", NULL};
+static const char *cpat_elem_x[]   = {"te:x", "ha:element.*", "*", NULL};
+static const char *cpat_elem_y[]   = {"te:y", "ha:element.*", "*", NULL};
+
+static const char *cpat_sym_w[]   = {"te:width", "ha:*", "ha:symbols", "*", NULL};
+static const char *cpat_sym_h[]   = {"te:height", "ha:*", "ha:symbols", "*", NULL};
+static const char *cpat_sym_d[]   = {"te:delta", "ha:*", "ha:symbols", "*", NULL};
+static const char *cpat_font_w[]  = {"te:cell_width", "ha:*", "ha:font", "*", NULL};
+static const char *cpat_font_h[]  = {"te:cell_height", "ha:*", "ha:font", "*", NULL};
+static const char *cpat_styl_th[] = {"te:thickness", "ha:*", "li:styles", "*", NULL};
+static const char *cpat_styl_cl[] = {"te:clearance", "ha:*", "li:styles", "*", NULL};
+static const char *cpat_styl_hl[] = {"te:hole", "ha:*", "li:styles", "*", NULL};
+static const char *cpat_styl_da[] = {"te:diameter", "ha:*", "li:styles", "*", NULL};
+
+
+lhtpers_rule_t io_lihata_out_coords[] = {
+	{cpat_rat_x1,   NULL, NULL},
+	{cpat_rat_y1,   NULL, NULL},
+	{cpat_rat_x2,   NULL, NULL},
+	{cpat_rat_y2,   NULL, NULL},
+	{cpat_line_x1,  NULL, NULL},
+	{cpat_line_y1,  NULL, NULL},
+	{cpat_line_x2,  NULL, NULL},
+	{cpat_line_y2,  NULL, NULL},
+	{cpat_line_th,  NULL, NULL},
+	{cpat_line_cl,  NULL, NULL},
+	{cpat_size_x,   NULL, NULL},
+	{cpat_size_y,   NULL, NULL},
+	{cpat_curs_x,   NULL, NULL},
+	{cpat_curs_y,   NULL, NULL},
+	{cpat_curs_z,   NULL, NULL},
+	{cpat_drc_min,  NULL, NULL},
+	{cpat_drc_blt,  NULL, NULL},
+	{cpat_drc_shr,  NULL, NULL},
+	{cpat_grido,    NULL, NULL},
+	{cpat_grids,    NULL, NULL},
+	{cpat_arc_x,    NULL, NULL},
+	{cpat_arc_y,    NULL, NULL},
+	{cpat_arc_w,    NULL, NULL},
+	{cpat_arc_h,    NULL, NULL},
+	{cpat_arc_th,   NULL, NULL},
+	{cpat_arc_cl,   NULL, NULL},
+	{cpat_geo_ta,   NULL, NULL},
+	{cpat_text_x,   NULL, NULL},
+	{cpat_text_y,   NULL, NULL},
+	{cpat_pin_x,    NULL, NULL},
+	{cpat_pin_y,    NULL, NULL},
+	{cpat_pin_hole, NULL, NULL},
+	{cpat_pin_mask, NULL, NULL},
+	{cpat_pad_x1,   NULL, NULL},
+	{cpat_pad_y1,   NULL, NULL},
+	{cpat_pad_x2,   NULL, NULL},
+	{cpat_pad_y2,   NULL, NULL},
+	{cpat_pad_hole, NULL, NULL},
+	{cpat_pad_mask, NULL, NULL},
+	{cpat_elem_x,   NULL, NULL},
+	{cpat_elem_y,   NULL, NULL},
+	{cpat_sym_w,    NULL, NULL},
+	{cpat_sym_h,    NULL, NULL},
+	{cpat_sym_d,    NULL, NULL},
+	{cpat_font_w,   NULL, NULL},
+	{cpat_font_h,   NULL, NULL},
+	{cpat_styl_th,  NULL, NULL},
+	{cpat_styl_cl,  NULL, NULL},
+	{cpat_styl_hl,  NULL, NULL},
+	{cpat_styl_da,  NULL, NULL},
+	{NULL, NULL, NULL}
+};
+
Index: tags/2.0.1/src_plugins/io_lihata/write_style.h
===================================================================
--- tags/2.0.1/src_plugins/io_lihata/write_style.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_lihata/write_style.h	(revision 18980)
@@ -0,0 +1,33 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Specify default output formatting style to be more compact than 
+   the canonical lihata export style */
+
+#include <liblhtpers/lhtpers.h>
+
+extern lhtpers_rule_t *io_lihata_out_rules[];
+extern lhtpers_rule_t io_lihata_out_coords[];
Index: tags/2.0.1/src_plugins/io_mentor_cell/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_mentor_cell
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_mentor_cell/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {io_mentor_cell}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/io_mentor_cell/io_mentor_cell.o
+ $(PLUGDIR)/io_mentor_cell/read.o
+@]
+
+switch /local/pcb/io_mentor_cell/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.c
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.c	(revision 18980)
@@ -0,0 +1,87 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, io_mentor_cell, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "plug_io.h"
+#include "read.h"
+#include "actions.h"
+
+static pcb_plug_io_t io_mentor_cell;
+static const char *mentor_cell_cookie = "mentor_cell plugin";
+
+int io_mentor_cell_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((strcmp(fmt, "mentor_cell") != 0) ||
+		((typ & (~(PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER | PCB_IOT_PCB))) != 0))
+		return 0;
+
+	return 100;
+}
+
+int pplg_check_ver_io_mentor_cell(int ver_needed) { return 0; }
+
+void pplg_uninit_io_mentor_cell(void)
+{
+	pcb_remove_actions_by_cookie(mentor_cell_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_mentor_cell);
+}
+
+#include "dolists.h"
+
+int pplg_init_io_mentor_cell(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_mentor_cell.plugin_data = NULL;
+	io_mentor_cell.fmt_support_prio = io_mentor_cell_fmt;
+	io_mentor_cell.test_parse = io_mentor_cell_test_parse;
+	io_mentor_cell.parse_pcb = io_mentor_cell_read_pcb;
+	io_mentor_cell.parse_footprint = NULL;
+	io_mentor_cell.parse_font = NULL;
+	io_mentor_cell.write_buffer = NULL;
+	io_mentor_cell.write_footprint = NULL;
+	io_mentor_cell.write_pcb = NULL;
+	io_mentor_cell.default_fmt = "mentor_cell";
+	io_mentor_cell.description = "Mentor graphics cell footprint lib";
+	io_mentor_cell.save_preference_prio = 60;
+	io_mentor_cell.default_extension = ".hkp";
+	io_mentor_cell.fp_extension = ".hkp";
+	io_mentor_cell.mime_type = "application/x-mentor_cell";
+
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_mentor_cell);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.pup
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/io_mentor_cell.pup	(revision 18980)
@@ -0,0 +1,9 @@
+$class io
+$short Mentor Graphics cell footprints
+$long Load Mentor Graphics cell footprint library and make footprints available (e.g. for fp_board)
+$state WIP
+$fmt-native no
+$fmt-feature-r Mentor Graphics cell footprints
+default disable
+
+autoload 1
Index: tags/2.0.1/src_plugins/io_mentor_cell/read.c
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/read.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/read.c	(revision 18980)
@@ -0,0 +1,460 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, io_mentor_cell, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <qparse/qparse.h>
+#include <genvector/gds_char.h>
+
+#include "board.h"
+#include "conf_core.h"
+#include "plug_io.h"
+#include "error.h"
+#include "safe_fs.h"
+
+#define ltrim(s) while(isspace(*s)) (s)++
+
+typedef struct node_s node_t;
+
+struct node_s {
+	char **argv;
+	int argc;
+	int level;
+	node_t *parent, *next;
+	node_t *first_child, *last_child;
+};
+
+typedef struct {
+	pcb_board_t *pcb;
+	char *unit;
+	node_t *root, *curr;
+} hkp_ctx_t;
+
+/*** High level parser ***/
+
+/* Return the idxth sibling with matching name */
+static node_t *find_nth(node_t *nd, char *name, int idx)
+{
+	for(; nd != NULL; nd = nd->next) {
+		if (strcmp(nd->argv[0], name) == 0) {
+			if (idx == 0)
+				return nd;
+			idx--;
+		}
+	}
+	return NULL;
+}
+
+/* split s and parse  it into (x,y) - modifies s */
+static int parse_xy(hkp_ctx_t *ctx, char *s, pcb_coord_t *x, pcb_coord_t *y)
+{
+	char *sy;
+	pcb_bool suc1, suc2;
+
+	sy = strchr(s, ',');
+	if (sy == NULL)
+		return -1;
+
+	*sy = '\0';
+	sy++;
+
+	*x = pcb_get_value(s, ctx->unit, NULL, &suc1);
+	*y = pcb_get_value(sy, ctx->unit, NULL, &suc2);
+
+	return !(suc1 && suc2);
+}
+
+static void parse_pstk(hkp_ctx_t *ctx, pcb_subc_t *subc, const char *ps, pcb_coord_t px, pcb_coord_t py, char *name)
+{
+	pcb_flag_t flags = pcb_no_flags();
+	pcb_coord_t thickness, hole, ms, cl;
+	char *curr, *next;
+	int sqpad_pending = 0;
+
+	thickness = 0;
+	hole = 0;
+	cl = PCB_MM_TO_COORD(1);
+	ms = 0;
+
+	for(curr = ps; curr != NULL; curr = next) {
+		next = strchr(curr, ',');
+		if (next != NULL) {
+			*next = '\0';
+			next++;
+		}
+		ltrim(curr);
+		if (strncmp(curr, "Pad", 3) == 0) {
+			curr += 4;
+			ltrim(curr);
+			if (strncmp(curr, "Square", 6) == 0) {
+				curr += 6;
+				ltrim(curr);
+				flags = pcb_flag_add(flags, PCB_FLAG_SQUARE);
+				thickness = pcb_get_value(curr, ctx->unit, NULL, NULL);
+				sqpad_pending = 1;
+			}
+			if (strncmp(curr, "Rectangle", 9) == 0) {
+				char *hs;
+				pcb_coord_t w, h;
+				curr += 9;
+				ltrim(curr);
+				thickness = pcb_get_value(curr, ctx->unit, NULL, NULL);
+				hs = strchr(curr, 'x');
+				if (hs == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Broken Rectangle pad: no 'x' in size\n");
+					return;
+				}
+				*hs = '\0';
+				hs++;
+				w = pcb_get_value(curr, ctx->unit, NULL, NULL);
+				h = pcb_get_value(hs, ctx->unit, NULL, NULL);
+#warning padstack TODO: rewrite
+#if 0
+				pcb_element_pad_new_rect(elem, px+w/2, py+h/2, px-w/2, py-h/2, cl, ms, name, name, flags);
+#endif
+			}
+			else if (strncmp(curr, "Round", 5) == 0) {
+				curr += 5;
+				ltrim(curr);
+				thickness = pcb_get_value(curr, ctx->unit, NULL, NULL);
+			}
+			else if (strncmp(curr, "Oblong", 6) == 0) {
+				pcb_message(PCB_MSG_ERROR, "Ignoring oblong pin - not yet supported\n");
+				return;
+			}
+			else {
+				pcb_message(PCB_MSG_ERROR, "Ignoring unknown pad shape: %s\n", curr);
+				return;
+			}
+		}
+		else if (strncmp(curr, "Hole Rnd", 8) == 0) {
+			curr += 8;
+			ltrim(curr);
+			hole = pcb_get_value(curr, ctx->unit, NULL, NULL);
+		}
+	}
+
+#warning padstack TODO: rewrite
+#if 0
+	if (hole > 0) {
+		pcb_element_pin_new(elem, px, py, thickness, cl, ms, hole, name, name, flags);
+		sqpad_pending = 0;
+	}
+
+	if (sqpad_pending)
+		pcb_element_pad_new_rect(elem, px, py, px+thickness, py+thickness, cl, ms, name, name, flags);
+#endif
+}
+
+static void parse_pin(hkp_ctx_t *ctx, pcb_subc_t *subc, node_t *nd)
+{
+	node_t *tmp;
+	pcb_coord_t px, py, ms, cl;
+
+	tmp = find_nth(nd->first_child, "XY", 0);
+	if (tmp == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Ignoring pin with no coords\n");
+		return;
+	}
+	parse_xy(ctx, tmp->argv[1], &px, &py);
+
+	tmp = find_nth(nd->first_child, "PADSTACK", 0);
+	if (tmp != NULL)
+		parse_pstk(ctx, subc, tmp->argv[1], px, py, nd->argv[1]);
+}
+
+static void parse_silk(hkp_ctx_t *ctx, pcb_subc_t *subc, node_t *nd)
+{
+	node_t *tmp, *pp;
+
+	tmp = find_nth(nd->first_child, "SIDE", 0);
+	if (tmp != NULL) {
+		if (strcmp(tmp->argv[1], "MNT_SIDE") != 0) {
+			pcb_message(PCB_MSG_ERROR, "Ignoring subcircuit silk line not on mount-side\n");
+			return;
+		}
+	}
+	pp = find_nth(nd->first_child, "POLYLINE_PATH", 0);
+	if (pp != NULL) {
+		pcb_coord_t th, px, py, x, y;
+		int n;
+		th = PCB_MM_TO_COORD(0.5);
+		tmp = find_nth(pp->first_child, "WIDTH", 0);
+		if (tmp != NULL)
+			pcb_get_value(tmp->argv[1], ctx->unit, NULL, NULL);
+		tmp = find_nth(pp->first_child, "XY", 0);
+		parse_xy(ctx, tmp->argv[1], &px, &py);
+		for(n = 2; n < tmp->argc; n++) {
+			parse_xy(ctx, tmp->argv[n], &x, &y);
+#warning subc TODO: rewrite this for subcircuits
+#if 0
+			pcb_element_line_new(elem, px, py, x, y, th);
+#endif
+			px = x;
+			py = y;
+		}
+	}
+}
+
+static void parse_package(hkp_ctx_t *ctx, node_t *nd)
+{
+#if 0
+	static const char *tagnames[] = { "PACKAGE_GROUP", "MOUNT_TYPE", "NUMBER_LAYERS", "TIMESTAMP", NULL };
+	const char **t;
+#endif
+	pcb_subc_t *subc;
+	pcb_flag_t flags = pcb_no_flags();
+	char *desc = "", *refdes = "", *value = "";
+	node_t *n, *tt, *attr, *tmp;
+	pcb_coord_t tx = 0, ty = 0;
+	int dir = 0;
+
+	/* extract global */
+	for(n = nd->first_child; n != NULL; n = n->next) {
+		if (strcmp(n->argv[0], "DESCRIPTION") == 0) desc = n->argv[1];
+		else if (strcmp(n->argv[0], "TEXT") == 0) {
+			tt = find_nth(n, "TEXT_TYPE", 0);
+			if ((tt != NULL) && (strcmp(tt->argv[2], "REF_DES") == 0)) {
+				attr = find_nth(tt, "DISPLAY_ATTR", 0);
+				if (attr != NULL) {
+					tmp = find_nth(attr, "XY", 0);
+					if (tmp != NULL)
+						parse_xy(ctx, tmp->argv[1], &tx, &ty);
+				}
+			}
+		}
+	}
+
+#warning subc TODO: rewrite for subc
+#if 0
+	elem = pcb_element_new(ctx->pcb->Data, NULL, pcb_font(ctx->pcb, 0, 1),
+		flags, desc, refdes, value, tx, ty, dir, 100, flags, 0);
+
+	/* extract pins and silk lines */
+	for(n = nd->first_child; n != NULL; n = n->next) {
+		if (strcmp(n->argv[0], "PIN") == 0)
+			parse_pin(ctx, elem, n);
+		else if (strcmp(n->argv[0], "SILKSCREEN_OUTLINE") == 0)
+			parse_silk(ctx, elem, n);
+	}
+#endif
+
+#if 0
+	/* extract tags */
+	for(n = nd->first_child; n != NULL; n = n->next) {
+		for(t = tagnames; *t != NULL; t++) {
+			if (strcmp(n->argv[0], *t) == 0) {
+/*				printf("TAG %s=%s\n", *t, n->argv[1]); */
+			}
+		}
+	}
+#endif
+}
+
+static int parse_root(hkp_ctx_t *ctx)
+{
+	node_t *n;
+
+	/* extract globals */
+	for(n = ctx->root->first_child; n != NULL; n = n->next) {
+		if (strcmp(n->argv[0], "UNITS") == 0) {
+			if (strcmp(n->argv[1], "MIL") == 0) ctx->unit = "mil";
+			else if (strcmp(n->argv[1], "MM") == 0) ctx->unit = "mm";
+			else {
+				pcb_message(PCB_MSG_ERROR, "Unkown unit '%s'\n", n->argv[1]);
+				return -1;
+			}
+		}
+	}
+
+	/* build packages */
+	for(n = ctx->root->first_child; n != NULL; n = n->next)
+		if (strcmp(n->argv[0], "PACKAGE_CELL") == 0)
+			parse_package(ctx, n);
+
+	return 0;
+}
+
+
+/*** Low level parser ***/
+
+static void dump(node_t *nd)
+{
+	int n;
+	for(n = 0; n < nd->level; n++)
+		printf(" ");
+	if (nd->argc > 0) {
+		printf("%s", nd->argv[0]);
+		for(n = 1; n < nd->argc; n++)
+			printf("|%s", nd->argv[n]);
+	}
+	else
+		printf("<empty>");
+	printf("\n");
+	for(nd = nd->first_child; nd != NULL; nd = nd->next)
+		dump(nd);
+}
+
+static void destroy(node_t *nd)
+{
+	node_t *n, *next;
+
+	qparse_free(nd->argc, &nd->argv);
+
+	for(n = nd->first_child; n != NULL; n = next) {
+		next = n->next;
+		destroy(n);
+	}
+
+	free(nd);
+}
+
+/* Split up a virtual line and save it in the tree */
+void save_vline(hkp_ctx_t *ctx, char *vline, int level)
+{
+	node_t *nd;
+
+	nd = calloc(sizeof(node_t), 1);
+	nd->argc = qparse2(vline, &nd->argv, QPARSE_DOUBLE_QUOTE | QPARSE_PAREN | QPARSE_MULTISEP);
+	nd->level = level;
+
+	if (level == ctx->curr->level) { /* sibling */
+		sibling:;
+		nd->parent = ctx->curr->parent;
+		ctx->curr->next = nd;
+		nd->parent->last_child = nd;
+	}
+	else if (level == ctx->curr->level+1) { /* first child */
+		ctx->curr->first_child = ctx->curr->last_child = nd;
+		nd->parent = ctx->curr;
+	}
+	else if (level < ctx->curr->level) { /* step back to a previous level */
+		while(level < ctx->curr->level) ctx->curr = ctx->curr->parent;
+		goto sibling;
+	}
+	ctx->curr = nd;
+}
+
+static void rtrim(gds_t *s)
+{
+	int n;
+	for(n = gds_len(s)-1; (n >= 0) && isspace(s->array[n]); n--)
+		s->array[n] = '\0';
+}
+
+int io_mentor_cell_read_pcb(pcb_plug_io_t *pctx, pcb_board_t *pcb, const char *fn, conf_role_t settings_dest)
+{
+	hkp_ctx_t ctx;
+	char *s, **argv;
+	int argc, res = -1;
+	FILE *f;
+	gds_t vline;
+	char line[1024];
+	int level;
+
+
+	f = pcb_fopen(fn, "r");
+	if (f == NULL)
+		goto err;
+
+	ctx.pcb = pcb;
+	ctx.unit = "mm";
+	ctx.curr = ctx.root = calloc(sizeof(node_t), 1);
+	gds_init(&vline);
+
+	/* read physical lines, build virtual lines and save them in the tree*/
+	while(fgets(line, sizeof(line), f) != NULL) {
+		s = line;
+		while(isspace(*s)) s++;
+
+		/* first char is '.' means it's a new virtual line */
+		if (*s == '.') {
+			if (gds_len(&vline) > 0) {
+				rtrim(&vline);
+				save_vline(&ctx, vline.array, level);
+				gds_truncate(&vline, 0);
+			}
+			level = 0;
+			while(*s == '.') { s++; level++; };
+		}
+
+		if (gds_len(&vline) > 0)
+			gds_append(&vline, ' ');
+		gds_append_str(&vline, s);
+	}
+
+	/* the last virtual line before eof */
+	if (gds_len(&vline) > 0) {
+		rtrim(&vline);
+		save_vline(&ctx, vline.array, level);
+	}
+	gds_uninit(&vline);
+
+	/* we are loading the cells into a board, make a default layer stack for that */
+	pcb_layergrp_inhibit_inc();
+	pcb_layers_reset(pcb);
+	pcb_layer_group_setup_default(pcb);
+	pcb_layer_group_setup_silks(pcb);
+	pcb_layer_auto_fixup(pcb);
+	pcb_layergrp_inhibit_dec();
+
+	/* parse the root */
+	res = parse_root(&ctx);
+
+	pcb_layer_colors_from_conf(pcb, 1);
+
+	err:;
+	dump(ctx.root);
+	destroy(ctx.root);
+	fclose(f);
+	return res;
+}
+
+int io_mentor_cell_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[1024], *s;
+
+	while(!(feof(f))) {
+		if (fgets(line, sizeof(line), f) != NULL) {
+			s = line;
+			while(isspace(*s)) s++; /* strip leading whitespace */
+			if (strncmp(s, ".FILETYPE CELL_LIBRARY", 22) == 0) /* valid root */
+				return 1;
+			if ((*s == '\r') || (*s == '\n') || (*s == '\0')) /* ignore empty lines and comments */
+				continue;
+			/* non-comment, non-empty line - and we don't have our root -> it's not an s-expression */
+			return 0;
+		}
+	}
+
+	/* hit eof before seeing a valid root -> bad */
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_mentor_cell/read.h
===================================================================
--- tags/2.0.1/src_plugins/io_mentor_cell/read.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_mentor_cell/read.h	(revision 18980)
@@ -0,0 +1,2 @@
+int io_mentor_cell_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *fn, conf_role_t settings_dest);
+int io_mentor_cell_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
Index: tags/2.0.1/src_plugins/io_pcb/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_pcb
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_pcb/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,17 @@
+put /local/pcb/mod {io_pcb}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/io_pcb/io_pcb.o
+	$(PLUGDIR)/io_pcb/file.o
+	$(PLUGDIR)/io_pcb/parse_y.o
+	$(PLUGDIR)/io_pcb/parse_l.o
+	$(PLUGDIR)/io_pcb/attribs.o
+@]
+put /local/pcb/mod/YACC {$(PLUGDIR)/io_pcb/parse_y}
+put /local/pcb/mod/LEX  {$(PLUGDIR)/io_pcb/parse_l}
+
+switch /local/pcb/io_pcb/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
Index: tags/2.0.1/src_plugins/io_pcb/attribs.c
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/attribs.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/attribs.c	(revision 18980)
@@ -0,0 +1,134 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf.h"
+#include "board.h"
+#include "compat_misc.h"
+
+#define LISTSEP " [[pcb-rnd]] "
+
+/* Save and load pcb conf attributes, but do not save ::design:: (because they have flags) */
+static const char *conf_attr_prefix = "PCB::conf::";
+static const char *conf_attr_prefix_inhibit = "design::";
+/* The optimizer will fix this */
+#define conf_attr_prefix_len strlen(conf_attr_prefix)
+#define conf_attr_prefix_inhibit_len strlen(conf_attr_prefix_inhibit)
+
+static int path_ok(const char *path)
+{
+	if (strncmp(path, conf_attr_prefix, conf_attr_prefix_len) != 0)
+		return 0;
+	if (strncmp(path + conf_attr_prefix_len, conf_attr_prefix_inhibit, conf_attr_prefix_inhibit_len) == 0)
+		return 0;
+	return 1;
+}
+
+static void c2a(pcb_board_t *pcb, lht_node_t *tree, const char *path1)
+{
+	lht_dom_iterator_t it;
+	lht_node_t *n;
+	char apath[512], *path, *pe;
+	int path1l = strlen(path1);
+
+	memcpy(apath, conf_attr_prefix, conf_attr_prefix_len);
+	path = apath + conf_attr_prefix_len;
+
+	if (path1l != 0) {
+		memcpy(path, path1, path1l);
+		path[path1l] = '/';
+		pe = path+path1l+1;
+	}
+	else
+		pe = path;
+
+	/* a depth-first-search and save config items from the tree */
+	for(n = lht_dom_first(&it, tree); n != NULL; n = lht_dom_next(&it)) {
+		strcpy(pe, n->name);
+		if (n->type == LHT_HASH)
+			c2a(pcb, n, path);
+		if (strncmp(path, "design/",7) == 0) {
+			continue;
+		}
+		if (n->type == LHT_TEXT) {
+			conf_native_t *nv = conf_get_field(path);
+			if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib))
+				pcb_attribute_put(&pcb->Attributes, apath, n->data.text.value);
+		}
+		else if (n->type == LHT_LIST) {
+			lht_node_t *i;
+			conf_native_t *nv = conf_get_field(path);
+			if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib)) {
+				gds_t conc;
+				gds_init(&conc);
+				for(i = n->data.list.first; i != NULL; i = i->next) {
+					if (i->data.text.value == NULL)
+						continue;
+					if (i != n->data.list.first)
+						gds_append_str(&conc, LISTSEP);
+					gds_append_str(&conc, i->data.text.value);
+				}
+				pcb_attribute_put(&pcb->Attributes, apath,  conc.array);
+				gds_uninit(&conc);
+			}
+		}
+	}
+}
+
+void io_pcb_attrib_c2a(pcb_board_t *pcb)
+{
+	lht_node_t *nmain = conf_lht_get_first(CFR_DESIGN, 0);
+
+	c2a(pcb, nmain, "");
+}
+
+void io_pcb_attrib_a2c(pcb_board_t *pcb)
+{
+	int n;
+
+	for (n = 0; n < pcb->Attributes.Number; n++) {
+		if (path_ok(pcb->Attributes.List[n].name)) {
+			conf_native_t *nv = conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len);
+			if (nv == NULL)
+				continue;
+			if (nv->type == CFN_LIST) {
+				char *tmp = pcb_strdup(pcb->Attributes.List[n].value);
+				char *next, *curr;
+				for(curr = tmp; curr != NULL; curr = next) {
+					next = strstr(curr, LISTSEP);
+					if (next != NULL) {
+						*next = '\0';
+						next += strlen(LISTSEP);
+					}
+					conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, POL_APPEND);
+				}
+				free(tmp);
+			}
+			else /* assume plain string */
+				conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, POL_OVERWRITE);
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/io_pcb/attribs.h
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/attribs.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/attribs.h	(revision 18980)
@@ -0,0 +1,2 @@
+void io_pcb_attrib_c2a(pcb_board_t *pcb);
+void io_pcb_attrib_a2c(pcb_board_t *pcb);
Index: tags/2.0.1/src_plugins/io_pcb/file.c
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/file.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/file.c	(revision 18980)
@@ -0,0 +1,1104 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,2005,2006 Thomas Nau
+ *  Copyright (C) 2015, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* file save, load, merge ... routines */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <locale.h>
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "buffer.h"
+#include "change.h"
+#include "crosshair.h"
+#include "data.h"
+#include "error.h"
+#include "file.h"
+#include "plug_io.h"
+#include "hid.h"
+#include "layer.h"
+#include "move.h"
+#include "parse_common.h"
+#include "pcb-printf.h"
+#include "polygon.h"
+#include "rats.h"
+#include "remove.h"
+#include "flag_str.h"
+#include "compat_fs.h"
+#include "compat_misc.h"
+#include "paths.h"
+#include "rats_patch.h"
+#include "actions.h"
+#include "hid_flags.h"
+#include "flag_str.h"
+#include "attribs.h"
+#include "route_style.h"
+#include "obj_poly.h"
+#include "thermal.h"
+#include "event.h"
+#include "macro.h"
+
+#include "src_plugins/lib_compat_help/layer_compat.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+#include "src_plugins/lib_compat_help/subc_help.h"
+#include "src_plugins/lib_compat_help/elem_rot.h"
+
+/* Note: this works because of using str_flag compat_types */
+#define PCB_OBJ_VIA PCB_OBJ_PSTK
+#define PCB_OBJ_PIN PCB_OBJ_PSTK
+#define PCB_OBJ_PAD PCB_OBJ_PSTK
+#define PCB_OBJ_ELEMENT PCB_OBJ_SUBC
+#define PCB_OBJ_ELEMENT_NAME PCB_OBJ_TEXT
+
+pcb_unit_style_t pcb_io_pcb_usty_seen;
+
+static void WritePCBInfoHeader(FILE *);
+static void WritePCBDataHeader(FILE *);
+static void WritePCBFontData(FILE *);
+static void WriteViaData(FILE *, pcb_data_t *);
+static void WritePCBRatData(FILE *);
+static void WriteLayerData(FILE *, pcb_cardinal_t, pcb_layer_t *);
+
+#define IGNORE_FLAGS (PCB_FLAG_FLOATER | PCB_FLAG_DRC_INTCONN | PCB_FLAG_CLEARPOLYPOLY | PCB_FLAG_DYNTEXT)
+
+static char *pcb_strflg_f2s_compat(pcb_flag_t flags, int object_type, unsigned char *intconn)
+{
+	flags.f &= ~IGNORE_FLAGS;
+	return pcb_strflg_f2s(flags, object_type, intconn, 1);
+}
+
+
+#define F2S(OBJ, TYPE) (pcb_strflg_f2s_compat(((OBJ)->Flags), TYPE, &((OBJ)->intconn)))
+
+/* The idea here is to avoid gratuitously breaking backwards
+   compatibility due to a new but rarely used feature.  The first such
+   case, for example, was the polygon Hole - if your design included
+   polygon holes, you needed a newer PCB to read it, but if your
+   design didn't include holes, PCB would produce a file that older
+   PCBs could read, if only it had the correct version number in it.
+
+   If, however, you have to add or change a feature that really does
+   require a new PCB version all the time, it's time to remove all the
+   tests below and just always output the new version.
+
+   Note: Best practices here is to add support for a feature *first*
+   (and bump PCB_FILE_VERSION in file.h), and note the version that
+   added that support below, and *later* update the file format to
+   need that version (which may then be older than PCB_FILE_VERSION).
+   Hopefully, that allows for one release between adding support and
+   needing it, which should minimize breakage.  Of course, that's not
+   *always* possible, practical, or desirable.
+
+*/
+
+/* Hole[] in Polygon.  */
+#define PCB_FILE_VERSION_HOLES 20100606
+/* First version ever saved.  */
+#define PCB_FILE_VERSION_BASELINE 20070407
+
+int PCBFileVersionNeeded(void)
+{
+	PCB_POLY_ALL_LOOP(PCB->Data);
+	{
+		if (polygon->HoleIndexN > 0)
+			return PCB_FILE_VERSION_HOLES;
+	}
+	PCB_ENDALL_LOOP;
+
+	return PCB_FILE_VERSION_BASELINE;
+}
+
+/* In future all use of this should be supplanted by
+ * pcb-printf and %mr/%m# spec */
+static const char *c_dtostr(double d)
+{
+	static char buf[100];
+	int i, f;
+	char *bufp = buf;
+
+	if (d < 0) {
+		*bufp++ = '-';
+		d = -d;
+	}
+	d += 0.0000005;								/* rounding */
+	i = floor(d);
+	d -= i;
+	sprintf(bufp, "%d", i);
+	bufp += strlen(bufp);
+	*bufp++ = '.';
+
+	f = floor(d * 1000000.0);
+	sprintf(bufp, "%06d", f);
+	return buf;
+}
+
+/* Returns pointer to private buffer */
+static char *LayerGroupsToString(pcb_layer_stack_t *lg)
+{
+#if PCB_MAX_LAYER < 9998
+	/* Allows for layer numbers 0..9999 */
+	static char buf[(PCB_MAX_LAYER + 2) * 5 + 1];
+#endif
+	char *cp = buf;
+	char sep = 0;
+	int group, entry;
+#warning layer TODO: revise this loop to save only what the original code saved
+	for (group = 0; group < pcb_max_group(PCB); group++)
+		if (PCB->LayerGroups.grp[group].len) {
+			unsigned int gflg = pcb_layergrp_flags(PCB, group);
+
+			if (gflg & PCB_LYT_SILK) /* silk is hacked in asusming there's a top and bottom copper */
+				continue;
+
+			if (sep)
+				*cp++ = ':';
+			sep = 1;
+			for (entry = 0; entry < PCB->LayerGroups.grp[group].len; entry++) {
+				pcb_layer_id_t layer = PCB->LayerGroups.grp[group].lid[entry];
+
+				sprintf(cp, "%ld", layer + 1);
+				while (*++cp);
+
+				if (entry != PCB->LayerGroups.grp[group].len - 1)
+					*cp++ = ',';
+			}
+
+			if ((gflg & PCB_LYT_COPPER) && (gflg & PCB_LYT_TOP)) {
+				*cp++ = ',';
+				*cp++ = 'c';
+			}
+			else if ((gflg & PCB_LYT_COPPER) && (gflg & PCB_LYT_BOTTOM)) {
+				*cp++ = ',';
+				*cp++ = 's';
+			}
+		}
+	*cp++ = 0;
+	return buf;
+}
+
+
+static void WriteAttributeList(FILE * FP, pcb_attribute_list_t *list, const char *prefix)
+{
+	int i;
+
+	for (i = 0; i < list->Number; i++)
+		fprintf(FP, "%sAttribute(\"%s\" \"%s\")\n", prefix, list->List[i].name, list->List[i].value);
+}
+
+static void WritePCBInfoHeader(FILE * FP)
+{
+	/* write some useful comments */
+	fprintf(FP, "# release: pcb-rnd " PCB_VERSION "\n");
+
+	/* avoid writing things like user name or date, as these cause merge
+	 * conflicts in collaborative environments using version control systems
+	 */
+}
+
+static void conf_update_pcb_flag(pcb_flag_t *dest, const char *hash_path, int binflag)
+{
+	conf_native_t *n = conf_get_field(hash_path);
+	struct {
+		pcb_flag_t Flags;
+	} *tmp = (void *)dest;
+
+	if ((n == NULL) || (n->type != CFN_BOOLEAN) || (n->used < 0) || (!n->val.boolean[0]))
+		PCB_FLAG_CLEAR(binflag, tmp);
+	else
+		PCB_FLAG_SET(binflag, tmp);
+}
+
+/* data header: the name of the PCB, cursor location, zoom and grid
+ * layergroups and some flags */
+static void WritePCBDataHeader(FILE * FP)
+{
+	int group;
+	pcb_flag_t pcb_flags;
+
+	memset(&pcb_flags, 0, sizeof(pcb_flags));
+
+	/*
+	 * ************************** README *******************
+	 * ************************** README *******************
+	 *
+	 * If the file format is modified in any way, update
+	 * PCB_FILE_VERSION in file.h as well as PCBFileVersionNeeded()
+	 * at the top of this file.
+	 *
+	 * ************************** README *******************
+	 * ************************** README *******************
+	 */
+
+	io_pcb_attrib_c2a(PCB);
+
+	/* set binary flags from conf hash; these flags used to be checked
+	   with PCB_FLAG_TEST() but got moved to the conf system */
+	conf_update_pcb_flag(&pcb_flags, "plugins/mincut/enable", PCB_ENABLEPCB_FLAG_MINCUT);
+	conf_update_pcb_flag(&pcb_flags, "editor/show_number", PCB_SHOWNUMBERFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/show_drc", PCB_SHOWPCB_FLAG_DRC);
+	conf_update_pcb_flag(&pcb_flags, "editor/rubber_band_mode", PCB_RUBBERBANDFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/auto_drc", PCB_AUTOPCB_FLAG_DRC);
+	conf_update_pcb_flag(&pcb_flags, "editor/all_direction_lines", PCB_ALLDIRECTIONFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/swap_start_direction", PCB_SWAPSTARTDIRFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/unique_names", PCB_UNIQUENAMEFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/clear_line", PCB_CLEARNEWFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/full_poly", PCB_NEWPCB_FLAG_FULLPOLY);
+	conf_update_pcb_flag(&pcb_flags, "editor/snap_pin", PCB_SNAPPCB_FLAG_PIN);
+	conf_update_pcb_flag(&pcb_flags, "editor/orthogonal_moves", PCB_ORTHOMOVEFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/live_routing", PCB_LIVEROUTEFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/lock_names", PCB_LOCKNAMESFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/only_names", PCB_ONLYNAMESFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/hide_names", PCB_HIDENAMESFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/thin_draw", PCB_THINDRAWFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/thin_draw_poly", PCB_THINDRAWPOLYFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/local_ref", PCB_LOCALREFFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/check_planes",PCB_CHECKPLANESFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/description", PCB_DESCRIPTIONFLAG);
+	conf_update_pcb_flag(&pcb_flags, "editor/name_on_pcb", PCB_NAMEONPCBFLAG);
+
+	fprintf(FP, "\n# To read pcb files, the pcb version (or the git source date) must be >= the file version\n");
+	fprintf(FP, "FileVersion[%i]\n", PCBFileVersionNeeded());
+
+	fputs("\nPCB[", FP);
+	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB->Name));
+	pcb_fprintf(FP, " %[0] %[0]]\n\n", PCB->MaxWidth, PCB->MaxHeight);
+	pcb_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->Grid, PCB->GridOffsetX, PCB->GridOffsetY, conf_core.editor.draw_grid);
+	pcb_fprintf(FP, "Cursor[%[0] %[0] %s]\n", pcb_crosshair.X, pcb_crosshair.Y, c_dtostr(PCB->Zoom));
+	/* PolyArea should be output in square cmils, no suffix */
+	fprintf(FP, "PolyArea[%s]\n", c_dtostr(PCB_COORD_TO_MIL(PCB_COORD_TO_MIL(conf_core.design.poly_isle_area) * 100) * 100));
+	pcb_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale));
+	pcb_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", conf_core.design.bloat, conf_core.design.shrink,
+							conf_core.design.min_wid, conf_core.design.min_slk, conf_core.design.min_drill, conf_core.design.min_ring);
+	fprintf(FP, "Flags(%s)\n", pcb_strflg_board_f2s(pcb_flags));
+	fprintf(FP, "Groups(\"%s\")\n", LayerGroupsToString(&PCB->LayerGroups));
+	fputs("Styles[\"", FP);
+
+	if (vtroutestyle_len(&PCB->RouteStyle) > 0) {
+		for (group = 0; group < vtroutestyle_len(&PCB->RouteStyle) - 1; group++)
+			pcb_fprintf(FP, "%s,%[0],%[0],%[0],%[0]:", PCB->RouteStyle.array[group].name,
+									PCB->RouteStyle.array[group].Thick,
+									PCB->RouteStyle.array[group].Diameter, PCB->RouteStyle.array[group].Hole, PCB->RouteStyle.array[group].Clearance);
+		pcb_fprintf(FP, "%s,%[0],%[0],%[0],%[0]\"]\n\n", PCB->RouteStyle.array[group].name,
+								PCB->RouteStyle.array[group].Thick,
+								PCB->RouteStyle.array[group].Diameter, PCB->RouteStyle.array[group].Hole, PCB->RouteStyle.array[group].Clearance);
+	}
+	else {
+		pcb_io_incompat_save(PCB->Data, NULL, "There are no routing styles - many versions of gEDA/PCB will segfault on loading the file", "Create exactly 4 routing styles.");
+		fprintf(FP, "\"]\n\n");
+	}
+}
+
+/* writes font data of non empty symbols */
+static void WritePCBFontData(FILE * FP)
+{
+	pcb_cardinal_t i, j;
+	pcb_line_t *line;
+	pcb_font_t *font;
+
+	for (font = pcb_font(PCB, 0, 1), i = 0; i <= PCB_MAX_FONTPOSITION; i++) {
+		if (!font->Symbol[i].Valid)
+			continue;
+
+		if (isprint(i))
+			pcb_fprintf(FP, "Symbol['%c' %[0]]\n(\n", i, font->Symbol[i].Delta);
+		else
+			pcb_fprintf(FP, "Symbol[%i %[0]]\n(\n", i, font->Symbol[i].Delta);
+
+		line = font->Symbol[i].Line;
+		for (j = font->Symbol[i].LineN; j; j--, line++)
+			pcb_fprintf(FP, "\tSymbolLine[%[0] %[0] %[0] %[0] %[0]]\n",
+									line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness);
+		fputs(")\n", FP);
+	}
+}
+
+static void WriteViaData(FILE * FP, pcb_data_t *Data)
+{
+	gdl_iterator_t it;
+	pcb_pstk_t *ps;
+
+	/* write information about vias */
+	padstacklist_foreach(&Data->padstack, &it, ps) {
+		pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask;
+		pcb_pstk_compshape_t cshape;
+		pcb_bool plated;
+		char *name = pcb_attribute_get(&ps->Attributes, "name");
+
+		if (!pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+			pcb_io_incompat_save(Data, (pcb_any_obj_t *)ps, "Failed to convert to old-style via", "Old via format is very much restricted; try to use a simpler, uniform shape padstack");
+			continue;
+		}
+
+		pcb_fprintf(FP, "Via[%[0] %[0] %[0] %[0] %[0] %[0] ", x, y,
+			pad_dia, clearance*2, mask, drill_dia);
+		pcb_print_quoted_string(FP, (char *) PCB_EMPTY(name));
+		fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_OBJ_VIA, NULL, 1));
+	}
+}
+
+static void WritePCBRatData(FILE * FP)
+{
+	gdl_iterator_t it;
+	pcb_rat_t *line;
+
+	/* write information about rats */
+	ratlist_foreach(&PCB->Data->Rat, &it, line) {
+		pcb_fprintf(FP, "Rat[%[0] %[0] %d %[0] %[0] %d ",
+								line->Point1.X, line->Point1.Y, line->group1, line->Point2.X, line->Point2.Y, line->group2);
+		fprintf(FP, " %s]\n", F2S(line, PCB_OBJ_RAT));
+	}
+}
+
+static void WritePCBNetlistData(FILE * FP)
+{
+	/* write out the netlist if it exists */
+	if (PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN) {
+		int n, p;
+		fprintf(FP, "NetList()\n(\n");
+
+		for (n = 0; n < PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN; n++) {
+			pcb_lib_menu_t *menu = &PCB->NetlistLib[PCB_NETLIST_INPUT].Menu[n];
+			fprintf(FP, "\tNet(");
+			pcb_print_quoted_string(FP, &menu->Name[2]);
+			fprintf(FP, " ");
+			pcb_print_quoted_string(FP, (char *) PCB_UNKNOWN(menu->Style));
+			fprintf(FP, ")\n\t(\n");
+			for (p = 0; p < menu->EntryN; p++) {
+				pcb_lib_entry_t *entry = &menu->Entry[p];
+				fprintf(FP, "\t\tConnect(");
+				pcb_print_quoted_string(FP, entry->ListEntry);
+				fprintf(FP, ")\n");
+			}
+			fprintf(FP, "\t)\n");
+		}
+		fprintf(FP, ")\n");
+	}
+}
+
+static void WritePCBNetlistPatchData(FILE * FP)
+{
+	if (PCB->NetlistPatches != NULL) {
+		fprintf(FP, "NetListPatch()\n(\n");
+		pcb_ratspatch_fexport(PCB, FP, 1);
+		fprintf(FP, ")\n");
+	}
+}
+
+int io_pcb_WriteSubcData(pcb_plug_io_t *ctx, FILE *FP, pcb_data_t *Data)
+{
+	gdl_iterator_t sit, it;
+	pcb_subc_t *sc;
+	int l;
+
+	pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt;
+
+	subclist_foreach(&Data->subc, &sit, sc) {
+		pcb_coord_t ox, oy, rx = 0, ry = 0;
+		int rdir = 0, rscale = 100;
+		pcb_text_t *trefdes;
+		pcb_pstk_t *ps;
+		pcb_any_obj_t fobj;
+
+		pcb_subc_get_origin(sc, &ox, &oy);
+		trefdes = pcb_subc_get_refdes_text(sc);
+
+		if (trefdes != NULL) {
+			rx = trefdes->X - ox;
+			ry = trefdes->Y - oy;
+			rdir = trefdes->Direction;
+			rscale = trefdes->Scale;
+		}
+		else {
+			const char *tmp;
+			tmp = pcb_attribute_get(&sc->Attributes, "io_pcb::hidename_x");
+			if (tmp != NULL)
+				rx = pcb_get_value(tmp, NULL, NULL, NULL) - ox;
+			tmp = pcb_attribute_get(&sc->Attributes, "io_pcb::hidename_y");
+			if (tmp != NULL)
+				ry = pcb_get_value(tmp, NULL, NULL, NULL) - oy;
+			tmp = pcb_attribute_get(&sc->Attributes, "io_pcb::hidename_direction");
+			if (tmp != NULL)
+				rdir = atoi(tmp);
+			tmp = pcb_attribute_get(&sc->Attributes, "io_pcb::hidename_scale");
+			if (tmp != NULL)
+				rscale = atoi(tmp);
+		}
+
+		memset(&fobj, 0, sizeof(fobj));
+		fobj.Flags = sc->Flags;
+		if (trefdes == NULL)
+			fobj.Flags.f |= PCB_FLAG_HIDENAME;
+		fprintf(FP, "\nElement[%s ", F2S(&fobj, PCB_OBJ_ELEMENT));
+		pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "footprint")));
+		fputc(' ', FP);
+		pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "refdes")));
+		fputc(' ', FP);
+		pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&sc->Attributes, "value")));
+		pcb_fprintf(FP, " %[0] %[0] %[0] %[0] %d %d %s]\n(\n", ox, oy, rx, ry, rdir, rscale, trefdes != NULL ? F2S(trefdes, PCB_OBJ_ELEMENT_NAME) : "\"\"");
+		WriteAttributeList(FP, &sc->Attributes, "\t");
+
+		padstacklist_foreach(&sc->data->padstack, &it, ps) {
+			pcb_coord_t x, y, drill_dia, pad_dia, clearance, mask, x1, y1, x2, y2, thickness;
+			pcb_pstk_compshape_t cshape;
+			pcb_bool plated, square, nopaste;
+			unsigned char ic = ps->intconn;
+			if (pcb_pstk_export_compat_via(ps, &x, &y, &drill_dia, &pad_dia, &clearance, &mask, &cshape, &plated)) {
+				pcb_fprintf(FP, "\tPin[%[0] %[0] %[0] %[0] %[0] %[0] ", x - ox, y - oy, pad_dia, clearance*2, mask, drill_dia);
+				pcb_print_quoted_string(FP, (char *)PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "name")));
+				fprintf(FP, " ");
+				pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "term")));
+				fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_pstk_compat_pinvia_flag(ps, cshape), PCB_OBJ_PIN, &ic, 1));
+			}
+			else if (pcb_pstk_export_compat_pad(ps, &x1, &y1, &x2, &y2, &thickness, &clearance, &mask, &square, &nopaste)) {
+				unsigned long fl = (square ? PCB_FLAG_SQUARE : 0) | (nopaste ? PCB_FLAG_NOPASTE : 0);
+				pcb_fprintf(FP, "\tPad[%[0] %[0] %[0] %[0] %[0] %[0] %[0] ",
+					x1 - ox, y1 - oy, x2 - ox, y2 - oy, thickness, clearance, mask);
+					pcb_print_quoted_string(FP, (char *)PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "name")));
+					fprintf(FP, " ");
+					pcb_print_quoted_string(FP, (char *) PCB_EMPTY(pcb_attribute_get(&ps->Attributes, "term")));
+					fprintf(FP, " %s]\n", pcb_strflg_f2s(pcb_flag_make(fl), PCB_OBJ_PAD, &ic, 1));
+			}
+			else
+				pcb_io_incompat_save(sc->data, (pcb_any_obj_t *)ps, "Padstack can not be exported as pin or pad", "use simpler padstack; for pins, all copper layers must have the same shape and there must be no paste; for pads, use a line or a rectangle; paste and mask must match the copper shape");
+		}
+
+		for(l = 0; l < sc->data->LayerN; l++) {
+			pcb_layer_t *ly = &sc->data->Layer[l];
+			pcb_line_t *line;
+			pcb_arc_t *arc;
+
+			if ((ly->meta.bound.type & PCB_LYT_SILK) && (ly->meta.bound.type & PCB_LYT_TOP)) {
+				linelist_foreach(&ly->Line, &it, line) {
+					pcb_fprintf(FP, "\tElementLine [%[0] %[0] %[0] %[0] %[0]]\n",
+						line->Point1.X - ox, line->Point1.Y - oy,
+						line->Point2.X - ox, line->Point2.Y - oy,
+						line->Thickness);
+				}
+				arclist_foreach(&ly->Arc, &it, arc) {
+					pcb_fprintf(FP, "\tElementArc [%[0] %[0] %[0] %[0] %ma %ma %[0]]\n",
+						arc->X - ox, arc->Y - oy, arc->Width, arc->Height,
+						arc->StartAngle, arc->Delta, arc->Thickness);
+				}
+				if (polylist_length(&ly->Polygon) > 0) {
+					char *desc = pcb_strdup_printf("Polygons on layer %s can not be exported in an element\n", ly->name);
+					pcb_io_incompat_save(sc->data, NULL, desc, "only lines and arcs are exported");
+					free(desc);
+				}
+				if (textlist_length(&ly->Text) > 1) {
+					char *desc = pcb_strdup_printf("Text on layer %s can not be exported in an element\n", ly->name);
+					pcb_io_incompat_save(sc->data, NULL, desc, "only lines and arcs are exported");
+					free(desc);
+				}
+				continue;
+			}
+
+			if (!(ly->meta.bound.type & PCB_LYT_VIRTUAL) && (!pcb_layer_is_pure_empty(ly))) {
+				char *desc = pcb_strdup_printf("Objects on layer %s can not be exported in an element\n", ly->name);
+				pcb_io_incompat_save(sc->data, NULL, desc, "only top silk lines and arcs are exported; heavy terminals are not supported, use padstacks only");
+				free(desc);
+			}
+		}
+		fputs("\n)\n", FP);
+	}
+	return 0;
+}
+
+static const char *layer_name_hack(pcb_layer_t *layer, const char *name)
+{
+	unsigned long lflg = pcb_layer_flags_(layer);
+	/* The old PCB format encodes some properties in layer names - have to
+	   alter the real layer name before save to get the same effect */
+	if (lflg & PCB_LYT_OUTLINE) {
+		if (pcb_strcasecmp(name, "outline") == 0)
+			return name;
+		return "Outline";
+	}
+	if (lflg & PCB_LYT_SILK) {
+		if (pcb_strcasecmp(name, "silk") == 0)
+			return name;
+		return "silk";
+	}
+
+	/* plain layer */
+	return name;
+}
+
+static void WriteLayerData(FILE * FP, pcb_cardinal_t Number, pcb_layer_t *layer)
+{
+	gdl_iterator_t it;
+	pcb_line_t *line;
+	pcb_arc_t *arc;
+	pcb_text_t *text;
+	pcb_poly_t *polygon;
+
+	/* write information about non empty layers */
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
+		fprintf(FP, "Layer(%i ", (int) Number + 1);
+		pcb_print_quoted_string(FP, layer_name_hack(layer, PCB_EMPTY(layer->name)));
+		fputs(")\n(\n", FP);
+		WriteAttributeList(FP, &layer->Attributes, "\t");
+
+		linelist_foreach(&layer->Line, &it, line) {
+			pcb_fprintf(FP, "\tLine[%[0] %[0] %[0] %[0] %[0] %[0] %s]\n",
+									line->Point1.X, line->Point1.Y,
+									line->Point2.X, line->Point2.Y, line->Thickness, line->Clearance, F2S(line, PCB_OBJ_LINE));
+		}
+		arclist_foreach(&layer->Arc, &it, arc) {
+			pcb_fprintf(FP, "\tArc[%[0] %[0] %[0] %[0] %[0] %[0] %ma %ma %s]\n",
+									arc->X, arc->Y, arc->Width,
+									arc->Height, arc->Thickness, arc->Clearance, arc->StartAngle, arc->Delta, F2S(arc, PCB_OBJ_ARC));
+		}
+		textlist_foreach(&layer->Text, &it, text) {
+			pcb_fprintf(FP, "\tText[%[0] %[0] %d %d ", text->X, text->Y, text->Direction, text->Scale);
+			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(text->TextString));
+			fprintf(FP, " %s]\n", F2S(text, PCB_OBJ_TEXT));
+		}
+		textlist_foreach(&layer->Polygon, &it, polygon) {
+			int p, i = 0;
+			pcb_cardinal_t hole = 0;
+			fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_OBJ_POLY));
+			for (p = 0; p < polygon->PointN; p++) {
+				pcb_point_t *point = &polygon->Points[p];
+
+				if (hole < polygon->HoleIndexN && p == polygon->HoleIndex[hole]) {
+					if (hole > 0)
+						fputs("\n\t\t)", FP);
+					fputs("\n\t\tHole (", FP);
+					hole++;
+					i = 0;
+				}
+
+				if (i++ % 5 == 0) {
+					fputs("\n\t\t", FP);
+					if (hole)
+						fputs("\t", FP);
+				}
+				pcb_fprintf(FP, "[%[0] %[0]] ", point->X, point->Y);
+			}
+			if (hole > 0)
+				fputs("\n\t\t)", FP);
+			fputs("\n\t)\n", FP);
+		}
+		fputs(")\n", FP);
+	}
+}
+
+static void LayersFixup(void)
+{
+	pcb_layer_id_t bs, ts;
+	int chg = 0;
+
+	/* the PCB format requires 2 silk layers to be the last; swap layers to make that so */
+	bs = pcb_layer_get_bottom_silk();
+	ts = pcb_layer_get_top_silk();
+	if (bs != pcb_max_layer - 2) {
+		pcb_layer_swap(PCB, bs, pcb_max_layer - 2);
+		chg = 1;
+	}
+
+	bs = pcb_layer_get_bottom_silk();
+	ts = pcb_layer_get_top_silk();
+
+	if (ts != pcb_max_layer - 1) {
+		pcb_layer_swap(PCB, ts, pcb_max_layer - 1);
+		chg = 1;
+	}
+
+	if (chg)
+		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+}
+
+static void WriteLayers(FILE *FP, pcb_data_t *data)
+{
+	int i;
+	for (i = 0; i < data->LayerN; i++) {
+		pcb_layer_t *ly = &(data->Layer[i]);
+		pcb_layer_type_t lyt = pcb_layer_flags_(ly);
+		if (!(lyt & (PCB_LYT_COPPER | PCB_LYT_SILK | PCB_LYT_OUTLINE))) {
+			if (!pcb_layer_is_pure_empty(ly)) {
+				char *desc = pcb_strdup_printf("Layer %s can be exported only as a copper layer\n", ly->name);
+				pcb_io_incompat_save(data, NULL, desc, NULL);
+				free(desc);
+			}
+		}
+		WriteLayerData(FP, i, ly);
+	}
+}
+
+int io_pcb_WriteBuffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff, pcb_bool elem_only)
+{
+	pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt;
+
+	if (elem_only) {
+		if (pcb_subclist_length(&buff->Data->subc) == 0) {
+			pcb_message(PCB_MSG_ERROR, "Buffer has no subcircuits!\n");
+			return -1;
+		}
+	}
+	else {
+		LayersFixup();
+		WriteViaData(FP, buff->Data);
+	}
+
+	io_pcb_WriteSubcData(ctx, FP, buff->Data);
+
+	if (!elem_only)
+		WriteLayers(FP, buff->Data);
+
+	return 0;
+}
+
+int io_pcb_WritePCB(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+{
+	pcb_attribute_put(&PCB->Attributes, "PCB::loader", ctx->description);
+
+	LayersFixup();
+
+	pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt;
+	WritePCBInfoHeader(FP);
+	WritePCBDataHeader(FP);
+	WritePCBFontData(FP);
+	WriteAttributeList(FP, &PCB->Attributes, "");
+	WriteViaData(FP, PCB->Data);
+	io_pcb_WriteSubcData(ctx, FP, PCB->Data);
+	WritePCBRatData(FP);
+	WriteLayers(FP, PCB->Data);
+	WritePCBNetlistData(FP);
+	WritePCBNetlistPatchData(FP);
+
+	return 0;
+}
+
+/*** functions for loading elements-as-pcb ***/
+extern pcb_board_t *yyPCB;
+extern pcb_data_t *yyData;
+extern pcb_font_t *yyFont;
+
+void PreLoadElementPCB()
+{
+
+	if (!yyPCB)
+		return;
+
+	yyFont = &yyPCB->fontkit.dflt;
+	yyData = yyPCB->Data;
+	PCB_SET_PARENT(yyData, board, yyPCB);
+	yyData->LayerN = 0;
+}
+
+void PostLoadElementPCB()
+{
+	pcb_board_t *pcb_save = PCB;
+	pcb_box_t dbb;
+	pcb_subc_t *sc;
+
+	if (!yyPCB)
+		return;
+
+	pcb_board_new_postproc(yyPCB, 0);
+	pcb_layer_group_setup_default(yyPCB);
+	PCB = yyPCB;
+	pcb_layer_group_setup_silks(yyPCB);
+	pcb_data_bbox(&dbb, yyPCB->Data, pcb_false);
+	pcb_data_normalize_(yyPCB->Data, &dbb);
+	PCB = pcb_save;
+	yyPCB->MaxWidth = dbb.X2*2;
+	yyPCB->MaxHeight = dbb.Y2*2;
+	yyPCB->is_footprint = 1;
+
+	/* opening a footprint: we don't have a layer stack; make sure top and bottom copper exist */
+	{
+		pcb_layergrp_id_t gid;
+		int res;
+		
+		res = pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1);
+		assert(res == 1);
+		pcb_layer_create(PCB, gid, "top copper");
+		res = pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1);
+		assert(res == 1);
+		pcb_layer_create(PCB, gid, "bottom copper");
+	}
+
+	pcb_layergrp_upgrade_to_pstk(yyPCB);
+
+	sc = pcb_subclist_first(&yyPCB->Data->subc);
+	if (sc != NULL) {
+		pcb_layer_create_all_for_recipe(yyPCB, sc->data->Layer, sc->data->LayerN);
+		pcb_subc_rebind(yyPCB, sc);
+		pcb_data_clip_polys(sc->data);
+	}
+}
+
+
+int io_pcb_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[1024];
+	int bad = 0;
+
+/*
+	Look for any of these in the top few lines of the file:
+	# release: pcb-bin 20050609
+	PCB["name" 600000 500000]
+
+	or
+	PCB("name" 600000 500000]
+*/
+
+	while(!(feof(f))) {
+		if (fgets(line, sizeof(line), f) != NULL) {
+			char *s = line;
+			while(isspace(*s)) s++;
+			if ((strncmp(s, "# release: pcb", 14) == 0) )
+				return 1;
+			if (strncmp(s, "PCB", 3) == 0) {
+				char *b = s+3;
+				while(isspace(*b)) b++;
+				if ((*b == '(') || (*b == '['))
+					return 1;
+			}
+			if (strncmp(s, "Element", 7) == 0) {
+				char *b = s+7;
+				while(isspace(*b)) b++;
+				if ((*b == '(') || (*b == '['))
+					return 1;
+			}
+			if ((*s == '\r') || (*s == '\n') || (*s == '#') || (*s == '\0')) /* ignore empty lines and comments */
+				continue;
+			/* non-comment, non-empty line: tolerate at most 16 of these before giving up */
+			bad++;
+			if (bad > 16)
+				return 0;
+		}
+	}
+
+	/* hit eof before finding anything familiar or too many bad lines: the file
+	is surely not a .pcb */
+	return 0;
+}
+
+
+pcb_layer_id_t static new_ly_end(pcb_board_t *pcb, const char *name)
+{
+	pcb_layer_id_t lid;
+	if (pcb->Data->LayerN >= PCB_MAX_LAYER)
+		return -1;
+	lid = pcb->Data->LayerN;
+	pcb->Data->Layer[lid].name = pcb_strdup(name);
+	pcb->Data->Layer[lid].parent.data = pcb->Data;
+	pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA;
+	pcb->Data->Layer[lid].type = PCB_OBJ_LAYER;
+	pcb->Data->LayerN++;
+	return lid;
+}
+
+pcb_layer_id_t static existing_or_new_ly_end(pcb_board_t *pcb, const char *name)
+{
+	pcb_layer_id_t lid = pcb_layer_by_name(pcb->Data, name);
+	if (lid >= 0) {
+		if (pcb->Data->Layer[lid].meta.real.grp >= 0) {
+			pcb_layergrp_id_t gid = pcb->Data->Layer[lid].meta.real.grp;
+			pcb_layergrp_t *grp = &pcb->LayerGroups.grp[gid];
+			grp->len = 0;
+
+			pcb->Data->Layer[lid].meta.real.grp = -1;
+		}
+		return lid;
+	}
+	return new_ly_end(pcb, name);
+}
+
+pcb_layer_id_t static new_ly_old(pcb_board_t *pcb, const char *name)
+{
+	pcb_layer_id_t lid;
+	for(lid = 0; lid < PCB_MAX_LAYER; lid++) {
+		if (pcb->Data->Layer[lid].meta.real.grp == 0) {
+			free((char *)pcb->Data->Layer[lid].name);
+			pcb->Data->Layer[lid].name = pcb_strdup(name);
+			pcb->Data->Layer[lid].parent.data = pcb->Data;
+			pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA;
+			pcb->Data->Layer[lid].type = PCB_OBJ_LAYER;
+			return lid;
+		}
+	}
+	return -1;
+}
+
+int pcb_layer_improvise(pcb_board_t *pcb, pcb_bool setup)
+{
+	pcb_layergrp_id_t gid;
+	pcb_layer_id_t lid, silk = -1;
+
+	if (setup) {
+		pcb_layer_group_setup_default(pcb);
+
+		/* make sure every layer has a name */
+		for(lid = 0; lid < pcb->Data->LayerN; lid++)
+			if (pcb->Data->Layer[lid].name == NULL)
+				pcb->Data->Layer[lid].name = pcb_strdup_printf("anon_%d", lid);
+
+		for(lid = 0; lid < pcb->Data->LayerN; lid++) {
+			if (strcmp(pcb->Data->Layer[lid].name, "silk") == 0) {
+				if (silk < 0)
+					pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1);
+				else
+					pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1);
+				pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+				silk = lid;
+			}
+			else {
+				if (*pcb->Data->Layer[lid].name == '\0') {
+					free((char *)pcb->Data->Layer[lid].name);
+					pcb->Data->Layer[lid].name = pcb_strdup("anonymous");
+				}
+				if (lid == 0)
+					pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1);
+				else
+					pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1);
+				pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+			}
+		}
+
+		pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_SILK, &gid, 1);
+		if (pcb->LayerGroups.grp[gid].len < 1) {
+			lid = new_ly_end(pcb, "silk");
+			if (lid < 0)
+				return -1;
+			pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+		}
+
+		pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_SILK, &gid, 1);
+		if (pcb->LayerGroups.grp[gid].len < 1) {
+			lid = new_ly_end(pcb, "silk");
+			if (lid < 0)
+				return -1;
+			pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+		}
+
+		pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1);
+		if (pcb->LayerGroups.grp[gid].len < 1) {
+			lid = new_ly_old(pcb, "top_copper");
+			if (lid < 0)
+				return -1;
+			pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+		}
+
+		pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &gid, 1);
+		if (pcb->LayerGroups.grp[gid].len < 1) {
+			lid = new_ly_old(pcb, "bottom_copper");
+			if (lid < 0)
+				return -1;
+			pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+		}
+	}
+
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_MASK, &gid, 1);
+	if (pcb->LayerGroups.grp[gid].len < 1) {
+		lid = existing_or_new_ly_end(pcb, "top-mask");
+		if (lid < 0)
+			return -1;
+		pcb->Data->Layer[lid].comb = PCB_LYC_AUTO | PCB_LYC_SUB;
+		pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+	}
+
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_MASK, &gid, 1);
+	if (pcb->LayerGroups.grp[gid].len < 1) {
+		lid = existing_or_new_ly_end(pcb, "bottom-mask");
+		if (lid < 0)
+			return -1;
+		pcb->Data->Layer[lid].comb = PCB_LYC_AUTO | PCB_LYC_SUB;
+		pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+	}
+
+	pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_PASTE, &gid, 1);
+	if (pcb->LayerGroups.grp[gid].len < 1) {
+		lid = existing_or_new_ly_end(pcb, "top-paste");
+		if (lid < 0)
+			return -1;
+		pcb->Data->Layer[lid].comb = PCB_LYC_AUTO;
+		pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+	}
+
+	pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_PASTE, &gid, 1);
+	if (pcb->LayerGroups.grp[gid].len < 1) {
+		lid = existing_or_new_ly_end(pcb, "bottom-paste");
+		if (lid < 0)
+			return -1;
+		pcb->Data->Layer[lid].comb = PCB_LYC_AUTO;
+		pcb_layer_add_in_group_(pcb, &pcb->LayerGroups.grp[gid], gid, lid);
+	}
+
+/*	pcb_action("dumplayers");*/
+
+	return 0;
+}
+
+/*** Compatibility wrappers: create padstack and subc as if they were vias and elements ***/
+
+static int yysubc_bottom;
+extern	pcb_subc_t *yysubc;
+extern	pcb_coord_t yysubc_ox, yysubc_oy;
+
+pcb_subc_t *io_pcb_element_new(pcb_data_t *Data, pcb_subc_t *subc,
+	pcb_font_t *PCBFont, pcb_flag_t Flags, char *Description, char *NameOnPCB,
+	char *Value, pcb_coord_t TextX, pcb_coord_t TextY, pcb_uint8_t Direction,
+	int TextScale, pcb_flag_t TextFlags, pcb_bool uniqueName)
+{
+	pcb_subc_t *sc = pcb_subc_new();
+	pcb_text_t *txt;
+	pcb_add_subc_to_data(Data, sc);
+	if (Data->padstack_tree == NULL)
+		Data->padstack_tree = pcb_r_create_tree();
+	sc->data->padstack_tree = Data->padstack_tree;
+
+	yysubc_ox = 0;
+	yysubc_oy = 0;
+	yysubc_bottom = !!(Flags.f & PCB_FLAG_ONSOLDER);
+	Flags.f &= ~PCB_FLAG_ONSOLDER;
+
+	PCB_FLAG_SET(Flags.f, sc);
+
+	if (Description != NULL)
+		pcb_attribute_put(&sc->Attributes, "footprint", Description);
+	if (NameOnPCB != NULL)
+		pcb_attribute_put(&sc->Attributes, "refdes", NameOnPCB);
+	if (Value != NULL)
+		pcb_attribute_put(&sc->Attributes, "value", Value);
+
+#warning subc TODO: TextFlags
+	if (!(Flags.f & PCB_FLAG_HIDENAME))
+		txt = pcb_subc_add_refdes_text(sc, TextX, TextY, Direction, TextScale, yysubc_bottom);
+
+	if (Flags.f & PCB_FLAG_HIDENAME) {
+		char tmp[128];
+		pcb_sprintf(tmp, "%$mm", TextX);
+		pcb_attribute_put(&sc->Attributes, "io_pcb::hidename_x", tmp);
+		pcb_sprintf(tmp, "%$mm", TextY);
+		pcb_attribute_put(&sc->Attributes, "io_pcb::hidename_y", tmp);
+		sprintf(tmp, "%d", Direction);
+		pcb_attribute_put(&sc->Attributes, "io_pcb::hidename_direction", tmp);
+		sprintf(tmp, "%d", TextScale);
+		pcb_attribute_put(&sc->Attributes, "io_pcb::hidename_scale", tmp);
+	}
+
+	return sc;
+}
+
+void io_pcb_element_fin(pcb_data_t *Data)
+{
+	const char *cent;
+
+	pcb_subc_xy_rot_pnp(yysubc, yysubc_ox, yysubc_oy, yysubc_bottom);
+
+	pcb_subc_bbox(yysubc);
+	if (Data->subc_tree == NULL)
+		Data->subc_tree = pcb_r_create_tree();
+	pcb_r_insert_entry(Data->subc_tree, (pcb_box_t *)yysubc);
+}
+
+static pcb_layer_t *subc_silk_layer(pcb_subc_t *subc)
+{
+	pcb_layer_type_t side = yysubc_bottom ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+	const char *name = yysubc_bottom ? "bottom-silk" : "top-silk";
+	return pcb_subc_get_layer(subc, PCB_LYT_SILK | side, /*PCB_LYC_AUTO*/0, pcb_true, name, pcb_false);
+}
+
+pcb_line_t *io_pcb_element_line_new(pcb_subc_t *subc, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness)
+{
+	pcb_layer_t *ly = subc_silk_layer(subc);
+	return pcb_line_new(ly, X1, Y1, X2, Y2, Thickness, 0, pcb_no_flags());
+}
+
+pcb_arc_t *io_pcb_element_arc_new(pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y,
+	pcb_coord_t Width, pcb_coord_t Height, pcb_angle_t angle, pcb_angle_t delta, pcb_coord_t Thickness)
+{
+	pcb_layer_t *ly = subc_silk_layer(subc);
+	return pcb_arc_new(ly, X, Y, Width, Height, angle, delta, Thickness, 0, pcb_no_flags(), pcb_true);
+}
+
+pcb_pstk_t *io_pcb_element_pin_new(pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, const char *Number, pcb_flag_t Flags)
+{
+	pcb_pstk_t *p;
+	p = pcb_old_via_new(subc->data, X, Y, Thickness, Clearance, Mask, DrillingHole, Name, Flags);
+	if (Number != NULL)
+		pcb_attribute_put(&p->Attributes, "term", Number);
+	if (Name != NULL)
+		pcb_attribute_put(&p->Attributes, "name", Name);
+
+	if (yysubc_bottom)
+		pcb_pstk_mirror(p, PCB_PSTK_DONT_MIRROR_COORDS, 1, 0);
+	return p;
+}
+
+pcb_pstk_t *io_pcb_element_pad_new(pcb_subc_t *subc, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, const char *Name, const char *Number, pcb_flag_t Flags)
+{
+	pcb_pstk_t *p;
+
+	p = pcb_pstk_new_compat_pad(subc->data, X1, Y1, X2, Y2, Thickness, Clearance, Mask, Flags.f & PCB_FLAG_SQUARE, Flags.f & PCB_FLAG_NOPASTE, (!!(Flags.f & PCB_FLAG_ONSOLDER)) != yysubc_bottom);
+	if (Number != NULL)
+		pcb_attribute_put(&p->Attributes, "term", Number);
+	if (Name != NULL)
+		pcb_attribute_put(&p->Attributes, "name", Name);
+
+	if (yysubc_bottom) {
+		pcb_data_t *old_hack = pcb_pstk_data_hack;
+		pcb_pstk_data_hack = subc->parent.data;
+		pcb_pstk_mirror(p, PCB_PSTK_DONT_MIRROR_COORDS, 1, 1);
+		pcb_pstk_data_hack = old_hack;
+	}
+
+	return p;
+}
+
+void io_pcb_postproc_board(pcb_board_t *pcb)
+{
+	gdl_iterator_t it;
+	pcb_subc_t *sc;
+	int n;
+
+	/* remove empty layer groups */
+	for(n = 0; n < pcb->LayerGroups.len; n++) {
+		if (pcb->LayerGroups.grp[n].len == 0) {
+			pcb_layergrp_del(pcb, n, 0);
+			n--;
+		}
+	}
+
+	pcb_layergrp_create_missing_substrate(pcb);
+
+	/* have to rebind all subcircuits because the layer stack was not ready
+	   when they got loaded */
+	subclist_foreach(&pcb->Data->subc, &it, sc)
+		pcb_subc_rebind(pcb, sc);
+
+	pcb_layer_colors_from_conf(pcb, 1);
+}
Index: tags/2.0.1/src_plugins/io_pcb/file.h
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/file.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/file.h	(revision 18980)
@@ -0,0 +1,94 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_FILE_H
+#define	PCB_FILE_H
+
+#include <stdio.h>							/* needed to define 'FILE *' */
+#include "config.h"
+#include "board.h"
+#include "plug_io.h"
+
+/* This is used by the lexer/parser */
+typedef struct {
+	int ival;
+	pcb_coord_t bval;
+	double dval;
+	char has_units;
+} PLMeasure;
+
+typedef enum {
+	PCB_USTY_CMIL = 1,       /* unitless centimil */
+	PCB_USTY_NANOMETER = 2,
+	PCB_USTY_UNITS = 4       /* using various units */
+} pcb_unit_style_t;
+
+extern pcb_unit_style_t pcb_io_pcb_usty_seen;
+
+typedef struct {
+	const char *write_coord_fmt;
+} io_pcb_ctx_t;
+
+extern pcb_plug_io_t *pcb_preferred_io_pcb, *pcb_nanometer_io_pcb, *pcb_centimil_io_pcb;
+
+
+int io_pcb_WriteBuffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only);
+int io_pcb_WriteSubcData(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *);
+int io_pcb_WritePCB(pcb_plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
+
+void PreLoadElementPCB(void);
+void PostLoadElementPCB(void);
+
+int io_pcb_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f);
+
+/*
+ * Whenever the pcb file format is modified, this version number
+ * should be updated to the date when the new code is committed.
+ * It will be written out to the file and also used by pcb to give
+ * guidance to the user as to what the minimum version of pcb required
+ * is.
+ */
+
+/* This is the version needed by the file we're saving.  */
+int PCBFileVersionNeeded(void);
+
+/* Improvise layers and groups for a partial input file that lacks layer groups (and maybe even some layers) */
+int pcb_layer_improvise(pcb_board_t *pcb, pcb_bool setup);
+
+pcb_subc_t *io_pcb_element_new(pcb_data_t *Data, pcb_subc_t *Element, pcb_font_t *PCBFont, pcb_flag_t Flags, char *Description, char *NameOnPCB, char *Value, pcb_coord_t TextX, pcb_coord_t TextY, pcb_uint8_t Direction, int TextScale, pcb_flag_t TextFlags, pcb_bool uniqueName);
+void io_pcb_element_fin(pcb_data_t *Data);
+pcb_line_t *io_pcb_element_line_new(pcb_subc_t *subc, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness);
+pcb_arc_t *io_pcb_element_arc_new(pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Width, pcb_coord_t Height, pcb_angle_t angle, pcb_angle_t delta, pcb_coord_t Thickness);
+pcb_pstk_t *io_pcb_element_pin_new(pcb_subc_t *subc, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, const char *Number, pcb_flag_t Flags);
+pcb_pstk_t *io_pcb_element_pad_new(pcb_subc_t *subc, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, const char *Name, const char *Number, pcb_flag_t Flags);
+void io_pcb_postproc_board(pcb_board_t *pcb);
+
+/* This is the version we support.  */
+#define PCB_FILE_VERSION 20110603
+
+#endif
Index: tags/2.0.1/src_plugins/io_pcb/io_pcb.c
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/io_pcb.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/io_pcb.c	(revision 18980)
@@ -0,0 +1,121 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  This module, io_pcb, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "parse_common.h"
+#include "file.h"
+
+static pcb_plug_io_t io_pcb[3];
+static io_pcb_ctx_t ctx[3];
+
+pcb_plug_io_t *pcb_preferred_io_pcb, *pcb_nanometer_io_pcb, *pcb_centimil_io_pcb;
+
+int io_pcb_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	/* All types are supported. */
+	if (strcmp(fmt, "pcb") != 0)
+		return 0;
+	return 100; /* read-write */
+}
+
+extern void pcb_lex_destroy(void);
+int pplg_check_ver_io_pcb(int ver_needed) { return 0; }
+
+void pplg_uninit_io_pcb(void)
+{
+	int n;
+	pcb_lex_destroy();
+
+	for(n = 0; n < 3; n++)
+		PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[n]));
+}
+
+int pplg_init_io_pcb(void)
+{
+	PCB_API_CHK_VER;
+
+	memset(&io_pcb, 0, sizeof(io_pcb));
+
+	/* register the IO hook */
+	ctx[0].write_coord_fmt = pcb_printf_slot[8];
+	io_pcb[0].plugin_data = &ctx[0];
+	io_pcb[0].fmt_support_prio = io_pcb_fmt;
+	io_pcb[0].test_parse = io_pcb_test_parse;
+	io_pcb[0].parse_pcb = io_pcb_ParsePCB;
+	io_pcb[0].parse_footprint = io_pcb_ParseElement;
+	io_pcb[0].parse_font = io_pcb_ParseFont;
+	io_pcb[0].write_buffer = io_pcb_WriteBuffer;
+	io_pcb[0].write_footprint = io_pcb_WriteSubcData;
+	io_pcb[0].write_pcb = io_pcb_WritePCB;
+	io_pcb[0].default_fmt = "pcb";
+	io_pcb[0].description = "geda/pcb - mainline (centimils)";
+	io_pcb[0].save_preference_prio = 89;
+	io_pcb[0].default_extension = ".pcb";
+	io_pcb[0].fp_extension = ".fp";
+	io_pcb[0].mime_type = "application/x-pcb-layout";
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[0]));
+	pcb_centimil_io_pcb = &io_pcb[0];
+
+	ctx[1].write_coord_fmt = pcb_printf_slot[9];
+	io_pcb[1].plugin_data = &ctx[1];
+	io_pcb[1].fmt_support_prio = io_pcb_fmt;
+	io_pcb[1].write_buffer = io_pcb_WriteBuffer;
+	io_pcb[1].write_footprint = io_pcb_WriteSubcData;
+	io_pcb[1].write_pcb = io_pcb_WritePCB;
+	io_pcb[1].default_fmt = "pcb";
+	io_pcb[1].description = "geda/pcb - readable units";
+	io_pcb[1].save_preference_prio = 90;
+	io_pcb[1].default_extension = ".pcb";
+	io_pcb[1].fp_extension = ".fp";
+	io_pcb[1].mime_type = "application/x-pcb-layout";
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[1]));
+	pcb_preferred_io_pcb = &io_pcb[1];
+
+	ctx[2].write_coord_fmt = "%$$mn";
+	io_pcb[2].plugin_data = &ctx[2];
+	io_pcb[2].fmt_support_prio = io_pcb_fmt;
+	io_pcb[2].write_buffer = io_pcb_WriteBuffer;
+	io_pcb[2].write_footprint = io_pcb_WriteSubcData;
+	io_pcb[2].write_pcb = io_pcb_WritePCB;
+	io_pcb[2].default_fmt = "pcb";
+	io_pcb[2].description = "geda/pcb - nanometer";
+	io_pcb[2].save_preference_prio = 88;
+	io_pcb[2].default_extension = ".pcb";
+	io_pcb[2].fp_extension = ".fp";
+	io_pcb[2].mime_type = "application/x-pcb-layout";
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[2]));
+	pcb_nanometer_io_pcb = &io_pcb[2];
+
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_pcb/io_pcb.pup
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/io_pcb.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/io_pcb.pup	(revision 18980)
@@ -0,0 +1,14 @@
+$class io
+$short the original pcb format
+$long Load and save the design and footprints in the original gEDA/PCB text format.
+$state works
+$fmt-native no
+$fmt-feature-r gEDA/PCB .pcb board (any version up to 2017)
+$fmt-feature-w gEDA/PCB .pcb board (various version up to 2017 )
+$fmt-feature-r gEDA/PCB .fp footprints
+$fmt-feature-w gEDA/PCB .fp footprints
+$fmt-feature-r gEDA/PCB font
+$package io-standard
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/io_pcb/parse_common.h
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_common.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_common.h	(revision 18980)
@@ -0,0 +1,43 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *  RCS: $Id$
+ */
+
+/* just defines common parser identifiers
+ */
+
+#ifndef	PCB_LEX_H
+#define	PCB_LEX_H
+
+#include "config.h"
+#include "plug_io.h"
+
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *, const char *);
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *, const char *);
+
+#endif
Index: tags/2.0.1/src_plugins/io_pcb/parse_l.c
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_l.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_l.c	(revision 18980)
@@ -0,0 +1,2664 @@
+#line 2 "parse_l.c"
+
+#line 4 "parse_l.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer pcb__create_buffer
+#define yy_delete_buffer pcb__delete_buffer
+#define yy_flex_debug pcb__flex_debug
+#define yy_init_buffer pcb__init_buffer
+#define yy_flush_buffer pcb__flush_buffer
+#define yy_load_buffer_state pcb__load_buffer_state
+#define yy_switch_to_buffer pcb__switch_to_buffer
+#define yyin pcb_in
+#define yyleng pcb_leng
+#define yylex pcb_lex
+#define yylineno pcb_lineno
+#define yyout pcb_out
+#define yyrestart pcb_restart
+#define yytext pcb_text
+#define yywrap pcb_wrap
+#define yyalloc pcb_alloc
+#define yyrealloc pcb_realloc
+#define yyfree pcb_free
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE pcb_restart(pcb_in  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int pcb_leng;
+
+extern FILE *pcb_in, *pcb_out;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE pcb_lex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-pcb_lineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < pcb_leng; ++yyl )\
+                    if ( pcb_text[yyl] == '\n' )\
+                        --pcb_lineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pcb_text. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up pcb_text again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via pcb_restart()), so that the user can continue scanning by
+	 * just pointing pcb_in at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when pcb_text is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int pcb_leng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow pcb_wrap()'s to do buffer switches
+ * instead of setting up a fresh pcb_in.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void pcb_restart (FILE *input_file  );
+void pcb__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE pcb__create_buffer (FILE *file,int size  );
+void pcb__delete_buffer (YY_BUFFER_STATE b  );
+void pcb__flush_buffer (YY_BUFFER_STATE b  );
+void pcb_push_buffer_state (YY_BUFFER_STATE new_buffer  );
+void pcb_pop_buffer_state (void );
+
+static void pcb_ensure_buffer_stack (void );
+static void pcb__load_buffer_state (void );
+static void pcb__init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER pcb__flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE pcb__scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE pcb__scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE pcb__scan_bytes (yyconst char *bytes,int len  );
+
+void *pcb_alloc (yy_size_t  );
+void *pcb_realloc (void *,yy_size_t  );
+void pcb_free (void *  );
+
+#define yy_new_buffer pcb__create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        pcb_ensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pcb__create_buffer(pcb_in,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        pcb_ensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            pcb__create_buffer(pcb_in,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *pcb_in = (FILE *) 0, *pcb_out = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int pcb_lineno;
+
+int pcb_lineno = 1;
+
+extern char *pcb_text;
+#define yytext_ptr pcb_text
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up pcb_text.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	pcb_leng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 56
+#define YY_END_OF_BUFFER 57
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[224] =
+    {   0,
+        0,    0,   57,   55,   52,   53,   54,   55,   51,   55,
+       55,   47,   47,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
+       55,   55,   55,   39,   55,   55,   52,    0,   49,    0,
+       51,   50,    0,   47,   47,   46,    0,   47,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   44,   40,    0,
+       38,   36,   37,   50,   45,   46,   48,   27,    0,    0,
+        0,    7,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,   29,    2,   11,   10,    0,   14,    0,    0,    0,
+        0,    0,   12,    0,    0,    0,    0,   43,    0,    0,
+        0,    0,    0,    0,    0,    3,    0,   26,    0,   13,
+       22,    0,    0,    0,    0,    0,   16,    0,    0,    0,
+       42,    0,   41,    0,    0,    0,    0,    0,    8,    0,
+        9,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    4,    0,    0,   23,    0,    0,    0,
+        0,   24,   21,    0,    0,    0,    0,    0,   30,   19,
+        0,   28,    0,   25,    0,    0,    5,    0,    0,    0,
+        0,    0,    0,    0,    0,    6,    0,    0,   32,    0,
+
+       33,   35,    0,    0,    0,    0,   15,    0,    0,   18,
+        0,    0,    0,   20,    0,   17,    1,    0,    0,   31,
+        0,   34,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    5,    6,    1,    1,    1,    7,    1,
+        1,    1,    8,    1,    8,    9,    1,   10,   11,   11,
+       11,   11,   11,   11,   11,   11,   11,    1,    1,    1,
+        1,    1,    1,    1,   12,   13,   14,   15,   16,   17,
+       18,   19,    1,    1,    1,   20,   21,   22,    1,   23,
+        1,   24,   25,   26,    1,   27,    1,    1,    1,    1,
+        1,   28,    1,    1,   29,    1,   30,   31,   32,   33,
+
+       34,   35,   36,   37,   38,    1,   39,   40,   41,   42,
+       43,   44,    1,   45,   46,   47,   48,    1,    1,   49,
+       50,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[51] =
+    {   0,
+        1,    1,    2,    3,    1,    1,    1,    1,    1,    4,
+        4,    4,    4,    4,    4,    4,    4,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    4,
+        4,    4,    4,    4,    4,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[229] =
+    {   0,
+        0,    0,  260,  261,  257,  261,  261,   46,  252,    0,
+       42,   45,   46,   13,   16,  233,  216,   23,  210,  211,
+       32,  223,  218,   52,   35,   21,   38,  213,  217,   36,
+      215,  206,  206,   38,  205,  204,  242,   73,  261,  239,
+        0,    0,  235,  232,   74,   70,    0,   77,  208,  192,
+      196,  192,  222,  201,  194,  203,   53,  192,  181,  188,
+      184,  181,  214,  193,  183,  184,  176,  190,  171,  179,
+      170,  184,  187,  183,  185,  176,  173,  261,  261,  172,
+      261,  261,  173,    0,  261,   82,    0,  261,  165,  167,
+      162,  261,  166,  172,  169,  171,  155,  168,  167,  166,
+
+      160,  178,  261,  261,  261,  147,  261,  149,  155,  163,
+      146,  147,  261,  162,  148,  149,  159,  261,  147,  148,
+      151,  141,  149,  155,  135,  261,  136,  261,  134,  261,
+      261,  140,   77,  147,  142,  132,  261,  133,  141,  136,
+      261,  139,  261,  139,  137,  123,  125,  132,  261,  119,
+      261,  118,  118,  119,  119,  114,  119,  128,  114,  122,
+      112,  106,  106,  261,  105,  106,  261,  103,  115,  106,
+      111,  261,  126,  105,  102,  114,  100,   94,  261,   85,
+       94,  116,  108,  261,   97,   98,  261,   93,  104,   91,
+       98,   86,   92,   89,   93,  261,   85,   74,  261,   68,
+
+      261,  261,   80,   69,   67,   62,  261,   74,   60,  261,
+       72,   62,   71,  261,   57,  261,  261,   63,   61,  261,
+       67,  261,  261,  113,  117,  121,  125,   63
+    } ;
+
+static yyconst flex_int16_t yy_def[229] =
+    {   0,
+      223,    1,  223,  223,  223,  223,  223,  224,  225,  226,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  224,  223,  224,
+      225,  227,  223,  223,  223,  223,  228,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  227,  223,  223,  228,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,    0,  223,  223,  223,  223,  223
+    } ;
+
+static yyconst flex_int16_t yy_nxt[312] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   11,    4,   12,
+       13,   14,    4,   15,   16,   17,   18,   19,   20,   21,
+       22,   23,   24,   25,   26,   27,   28,    4,    4,   29,
+        4,   30,   31,    4,    4,    4,    4,   32,   33,    4,
+       34,   35,    4,    4,    4,    4,    4,   36,    4,    4,
+       39,   44,   45,   46,   46,   48,   48,   49,   51,   50,
+       55,   59,   56,   52,   67,   63,   87,   69,   68,   60,
+       70,   71,   75,   40,   72,   80,   76,   39,   81,   86,
+       86,   64,   46,   48,   48,   46,   48,   48,  153,   65,
+       96,   86,   86,   47,   66,   97,  192,  222,  221,  220,
+
+       40,  219,  218,  217,  193,  216,  215,  214,  213,  212,
+      211,  210,  154,   38,  209,  208,   38,   41,  207,   41,
+       41,   43,  206,   43,   43,   84,  205,   84,   84,  204,
+      203,  202,  201,  200,  199,  198,  197,  196,  195,  194,
+      191,  190,  189,  188,  187,  186,  185,  184,  183,  182,
+      181,  180,  179,  178,  177,  176,  175,  174,  173,  172,
+      171,  170,  169,  168,  167,  166,  165,  164,  163,  162,
+      161,  160,  159,  158,  157,  156,  155,  152,  151,  150,
+      149,  148,  147,  146,  145,  144,  143,  142,  141,  140,
+      139,  138,  137,  136,  135,  134,  133,  132,  131,  130,
+
+      129,  128,  127,  126,  125,  124,  123,  122,  121,  120,
+      119,  118,  117,  116,  115,  114,  113,  112,  111,  110,
+      109,  108,  107,  106,  105,  104,  103,  102,  101,  100,
+       99,   98,   95,   94,   93,   92,   91,   90,   89,   88,
+       46,   85,   38,   37,   83,   82,   79,   78,   77,   74,
+       73,   62,   61,   58,   57,   54,   53,   42,   37,  223,
+        3,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223
+    } ;
+
+static yyconst flex_int16_t yy_chk[312] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        8,   11,   11,   12,   13,   13,   13,   14,   15,   14,
+       18,   21,   18,   15,   25,   24,  228,   26,   25,   21,
+       26,   27,   30,    8,   27,   34,   30,   38,   34,   46,
+       46,   24,   45,   45,   45,   48,   48,   48,  133,   24,
+       57,   86,   86,   12,   24,   57,  180,  221,  219,  218,
+
+       38,  215,  213,  212,  180,  211,  209,  208,  206,  205,
+      204,  203,  133,  224,  200,  198,  224,  225,  197,  225,
+      225,  226,  195,  226,  226,  227,  194,  227,  227,  193,
+      192,  191,  190,  189,  188,  186,  185,  183,  182,  181,
+      178,  177,  176,  175,  174,  173,  171,  170,  169,  168,
+      166,  165,  163,  162,  161,  160,  159,  158,  157,  156,
+      155,  154,  153,  152,  150,  148,  147,  146,  145,  144,
+      142,  140,  139,  138,  136,  135,  134,  132,  129,  127,
+      125,  124,  123,  122,  121,  120,  119,  117,  116,  115,
+      114,  112,  111,  110,  109,  108,  106,  102,  101,  100,
+
+       99,   98,   97,   96,   95,   94,   93,   91,   90,   89,
+       83,   80,   77,   76,   75,   74,   73,   72,   71,   70,
+       69,   68,   67,   66,   65,   64,   63,   62,   61,   60,
+       59,   58,   56,   55,   54,   53,   52,   51,   50,   49,
+       44,   43,   40,   37,   36,   35,   33,   32,   31,   29,
+       28,   23,   22,   20,   19,   17,   16,    9,    5,    3,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+
+      223,  223,  223,  223,  223,  223,  223,  223,  223,  223,
+      223
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[57] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int pcb__flex_debug;
+int pcb__flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *pcb_text;
+#line 1 "parse_l.l"
+#line 4 "parse_l.l"
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* lexical definitions to parse ASCII input of PCB and Element description
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <locale.h>
+
+#if defined(_POSIX_SOURCE) || defined(_HPUX_SOURCE)
+#include <unistd.h>
+#endif
+
+#include "flag_str.h"
+
+#include "crosshair.h"
+#include "data.h"
+#include "error.h"
+#include "file.h"
+#include "flag_str.h"
+#include "parse_common.h"
+#include "parse_y.h"
+#include "plug_footprint.h"
+#include "attribs.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "compat_cc.h"
+#include "obj_common.h"
+#include "paths.h"
+#include "safe_fs.h"
+#include "macro.h"
+
+#define YY_NO_INPUT
+
+/* ---------------------------------------------------------------------------
+ * some shared parser identifiers
+ */
+#ifdef FLEX_SCANNER
+
+#define yyunput PCB_ATTRIBUTE_UNUSED yyunput
+#endif
+
+const char			*yyfilename;	/* in this file */
+pcb_board_t *	yyPCB;			/* used by parser */
+pcb_data_t *	yyData;
+pcb_subc_t *yysubc;
+pcb_coord_t yysubc_ox, yysubc_oy;
+pcb_font_t *	yyFont;
+conf_role_t yy_settings_dest;
+pcb_flag_t yy_pcb_flags;
+int *yyFontkitValid;
+int yy_parse_tags;
+pcb_bool yyFontReset;
+
+static int parse_number (void);
+static void add_tag(char *line);
+
+/* ---------------------------------------------------------------------------
+ * an external prototypes
+ */
+int	yyparse(void);
+
+static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename);
+
+#line 737 "parse_l.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int pcb_lex_destroy (void );
+
+int pcb_get_debug (void );
+
+void pcb_set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE pcb_get_extra (void );
+
+void pcb_set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *pcb_get_in (void );
+
+void pcb_set_in  (FILE * in_str  );
+
+FILE *pcb_get_out (void );
+
+void pcb_set_out  (FILE * out_str  );
+
+int pcb_get_leng (void );
+
+char *pcb_get_text (void );
+
+int pcb_get_lineno (void );
+
+void pcb_set_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int pcb_wrap (void );
+#else
+extern int pcb_wrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( pcb_text, pcb_leng, 1, pcb_out )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( pcb_in )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( pcb_in ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, pcb_in))==0 && ferror(pcb_in)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(pcb_in); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int pcb_lex (void);
+
+#define YY_DECL int pcb_lex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after pcb_text and pcb_leng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 110 "parse_l.l"
+
+
+#line 927 "parse_l.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! pcb_in )
+			pcb_in = stdin;
+
+		if ( ! pcb_out )
+			pcb_out = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			pcb_ensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				pcb__create_buffer(pcb_in,YY_BUF_SIZE );
+		}
+
+		pcb__load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of pcb_text. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 224 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 261 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+			{
+			int yyl;
+			for ( yyl = 0; yyl < pcb_leng; ++yyl )
+				if ( pcb_text[yyl] == '\n' )
+					   
+    pcb_lineno++;
+;
+			}
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 112 "parse_l.l"
+{ return(T_FILEVERSION); }
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 113 "parse_l.l"
+{ return(T_PCB); }
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 114 "parse_l.l"
+{ return(T_GRID); }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 115 "parse_l.l"
+{ return(T_CURSOR); }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 116 "parse_l.l"
+{ return(T_THERMAL); }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 117 "parse_l.l"
+{ return(T_AREA); }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 118 "parse_l.l"
+{ return(T_DRC); }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 119 "parse_l.l"
+{ return(T_FLAGS); }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 120 "parse_l.l"
+{ return(T_LAYER); }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 121 "parse_l.l"
+{ return(T_PIN); }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 122 "parse_l.l"
+{ return(T_PAD); }
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 123 "parse_l.l"
+{ return(T_VIA); }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 124 "parse_l.l"
+{ return(T_LINE); }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 125 "parse_l.l"
+{ return(T_RAT); }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 126 "parse_l.l"
+{ return(T_RECTANGLE); }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 127 "parse_l.l"
+{ return(T_TEXT); }
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 128 "parse_l.l"
+{ return(T_ELEMENTLINE); }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 129 "parse_l.l"
+{ return(T_ELEMENTARC); }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 130 "parse_l.l"
+{ return(T_ELEMENT); }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 131 "parse_l.l"
+{ return(T_SYMBOLLINE); }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 132 "parse_l.l"
+{ return(T_SYMBOL); }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 133 "parse_l.l"
+{ return(T_MARK); }
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 134 "parse_l.l"
+{ return(T_GROUPS); }
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 135 "parse_l.l"
+{ return(T_STYLES); }
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 136 "parse_l.l"
+{ return(T_POLYGON); }
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 137 "parse_l.l"
+{ return(T_POLYGON_HOLE); }
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 138 "parse_l.l"
+{ return(T_ARC); }
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 139 "parse_l.l"
+{ return(T_NETLIST); }
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 140 "parse_l.l"
+{ return(T_NET); }
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 141 "parse_l.l"
+{ return(T_CONN); }
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 142 "parse_l.l"
+{ return(T_NETLISTPATCH); }
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 143 "parse_l.l"
+{ return(T_ADD_CONN); }
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 144 "parse_l.l"
+{ return(T_DEL_CONN); }
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 145 "parse_l.l"
+{ return(T_CHANGE_ATTRIB); }
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 146 "parse_l.l"
+{ return(T_ATTRIBUTE); }
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 148 "parse_l.l"
+{ return T_NM; }
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 149 "parse_l.l"
+{ return T_UM; }
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 150 "parse_l.l"
+{ return T_MM; }
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 151 "parse_l.l"
+{ return T_M; }
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 152 "parse_l.l"
+{ return T_KM; }
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 153 "parse_l.l"
+{ return T_UMIL; }
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 154 "parse_l.l"
+{ return T_CMIL; }
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 155 "parse_l.l"
+{ return T_MIL; }
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 156 "parse_l.l"
+{ return T_IN; }
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 158 "parse_l.l"
+{
+						pcb_lval.integer = (unsigned) *(pcb_text+1);
+						return(CHAR_CONST);
+					}
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 162 "parse_l.l"
+{	return parse_number(); }
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 163 "parse_l.l"
+{	pcb_lval.integer = pcb_round (strtod (pcb_text, NULL)); return INTEGER; }
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 165 "parse_l.l"
+{	unsigned n;
+				sscanf((char *) pcb_text, "%x", &n);
+				pcb_lval.integer = n;
+				return INTEGER;
+					}
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 170 "parse_l.l"
+{
+						char	*p1, *p2;
+
+							/* return NULL on empty string */
+						if (pcb_leng == 2)
+						{
+							pcb_lval.string = NULL;
+							return(STRING);
+						}
+
+							/* allocate memory and copy string;
+							 * stringlength is counted and copied without
+							 * leading and trailing '"'
+							 */
+						pcb_leng -= 2;
+						pcb_lval.string = (char *)calloc (pcb_leng+1, sizeof (char));
+						p1 = (char *) (pcb_text +1);
+						p2 = pcb_lval.string;
+						while(pcb_leng--)
+						{
+								/* check for special character */
+							if (*p1 == '\\')
+							{
+								pcb_leng--;
+								p1++;
+
+							}
+							*p2++ = *p1++;
+						}
+						*p2 = '\0';
+						return(STRING);
+					}
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 202 "parse_l.l"
+{ if (yy_parse_tags) { add_tag(pcb_text); }}
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 203 "parse_l.l"
+{}
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 204 "parse_l.l"
+{}
+	YY_BREAK
+case 53:
+/* rule 53 can match eol */
+YY_RULE_SETUP
+#line 205 "parse_l.l"
+{
+#ifndef FLEX_SCANNER
+						pcb_lineno++;
+#endif
+					}
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 210 "parse_l.l"
+{}
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 211 "parse_l.l"
+{ return(*pcb_text); }
+	YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 213 "parse_l.l"
+ECHO;
+	YY_BREAK
+#line 1343 "parse_l.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed pcb_in at a new source and called
+			 * pcb_lex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = pcb_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( pcb_wrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * pcb_text, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of pcb_lex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					pcb_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), (size_t) num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			pcb_restart(pcb_in  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) pcb_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 224 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 224 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 223);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up pcb_text */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+    if ( c == '\n' ){
+        --pcb_lineno;
+    }
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					pcb_restart(pcb_in );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( pcb_wrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve pcb_text */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	if ( c == '\n' )
+		   
+    pcb_lineno++;
+;
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void pcb_restart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        pcb_ensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            pcb__create_buffer(pcb_in,YY_BUF_SIZE );
+	}
+
+	pcb__init_buffer(YY_CURRENT_BUFFER,input_file );
+	pcb__load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void pcb__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		pcb_pop_buffer_state();
+	 *		pcb_push_buffer_state(new_buffer);
+     */
+	pcb_ensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	pcb__load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (pcb_wrap()) processing, but the only time this flag
+	 * is looked at is after pcb_wrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void pcb__load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	pcb_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE pcb__create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) pcb_alloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pcb__create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) pcb_alloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pcb__create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	pcb__init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with pcb__create_buffer()
+ * 
+ */
+    void pcb__delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		pcb_free((void *) b->yy_ch_buf  );
+
+	pcb_free((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a pcb_restart() or at EOF.
+ */
+    static void pcb__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	pcb__flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then pcb__init_buffer was _probably_
+     * called from pcb_restart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void pcb__flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		pcb__load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void pcb_push_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	pcb_ensure_buffer_stack();
+
+	/* This block is copied from pcb__switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from pcb__switch_to_buffer. */
+	pcb__load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void pcb_pop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	pcb__delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		pcb__load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void pcb_ensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pcb_alloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pcb_ensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)pcb_realloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in pcb_ensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE pcb__scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) pcb_alloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in pcb__scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	pcb__switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to pcb_lex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       pcb__scan_bytes() instead.
+ */
+YY_BUFFER_STATE pcb__scan_string (yyconst char * yystr )
+{
+    
+	return pcb__scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to pcb_lex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE pcb__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) pcb_alloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in pcb__scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = pcb__scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in pcb__scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up pcb_text. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		pcb_text[pcb_leng] = (yy_hold_char); \
+		(yy_c_buf_p) = pcb_text + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		pcb_leng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int pcb_get_lineno  (void)
+{
+        
+    return pcb_lineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *pcb_get_in  (void)
+{
+        return pcb_in;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *pcb_get_out  (void)
+{
+        return pcb_out;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int pcb_get_leng  (void)
+{
+        return pcb_leng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *pcb_get_text  (void)
+{
+        return pcb_text;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void pcb_set_lineno (int  line_number )
+{
+    
+    pcb_lineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see pcb__switch_to_buffer
+ */
+void pcb_set_in (FILE *  in_str )
+{
+        pcb_in = in_str ;
+}
+
+void pcb_set_out (FILE *  out_str )
+{
+        pcb_out = out_str ;
+}
+
+int pcb_get_debug  (void)
+{
+        return pcb__flex_debug;
+}
+
+void pcb_set_debug (int  bdebug )
+{
+        pcb__flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from pcb_lex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch pcb_lineno unless the option is enabled. */
+    pcb_lineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    pcb_in = stdin;
+    pcb_out = stdout;
+#else
+    pcb_in = (FILE *) 0;
+    pcb_out = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * pcb_lex_init()
+     */
+    return 0;
+}
+
+/* pcb_lex_destroy is for both reentrant and non-reentrant scanners. */
+int pcb_lex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		pcb__delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		pcb_pop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	pcb_free((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * pcb_lex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *pcb_alloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *pcb_realloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void pcb_free (void * ptr )
+{
+	free( (char *) ptr );	/* see pcb_realloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 213 "parse_l.l"
+
+
+
+/* sets up the preprocessor command */
+static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename)
+{
+	static char *command = NULL;
+	int returncode;
+	int used_popen = 0;
+	char *tmps;
+	size_t l;
+#ifdef FLEX_SCANNER
+	static pcb_bool firsttime = pcb_true;
+#endif
+	pcb_io_pcb_usty_seen = 0;
+	if (Pipe == NULL) {
+		if (PCB_EMPTY_STRING_P(Executable)) {
+			l = 2;
+			if (Path != NULL)
+				l += strlen(Path);
+
+			l += strlen(Filename);
+
+			if ((tmps = (char *)malloc(l * sizeof(char))) == NULL) {
+				fprintf(stderr, "Parse():  malloc failed\n");
+				exit(1);
+			}
+
+			if (Path != NULL && *Path != '\0')
+				sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename);
+			else
+				sprintf(tmps, "%s", Filename);
+
+			pcb_in = pcb_fopen(tmps, "r");
+			if (!pcb_in) {
+				free(tmps);
+				return (1);
+			}
+			free(tmps);
+		}
+		else {
+			pcb_build_argfn_t p;
+			used_popen = 1;
+			memset(&p, 0, sizeof(p));
+			p.params['p' - 'a'] = Path;
+			p.params['f' - 'a'] = Filename;
+			command = pcb_build_argfn(Executable, &p);
+			/* open pipe to stdout of command */
+			if (*command == '\0' || (pcb_in = pcb_popen(command, "r")) == NULL) {
+				pcb_popen_error_message(command);
+				free(command);
+				return (1);
+			}
+			free(command);
+		}
+	}
+	else {
+		pcb_in = Pipe;
+	}
+
+#ifdef FLEX_SCANNER
+	/* reset parser if not called the first time */
+	if (!firsttime)
+		pcb_restart(pcb_in);
+	firsttime = pcb_false;
+#endif
+
+	/* init linenumber and filename for yyerror() */
+	pcb_lineno = 1;
+	yyfilename = Filename;
+
+	/* We need to save the data temporarily because lex-yacc are able
+	 * to break the application if the input file has an illegal format.
+	 * It's not necessary if the system supports the call of functions
+	 * on termination.
+	 */
+
+	pcb_create_be_lenient(pcb_true);
+
+#if !defined(HAS_ATEXIT)
+	if (PCB && PCB->Data)
+		pcb_tmp_data_save();
+	returncode = pcb_parse();
+	pcb_tmp_data_remove();
+#else
+	returncode = pcb_parse();
+#endif
+	/* clean up parse buffer */
+	pcb__delete_buffer(YY_CURRENT_BUFFER);
+
+	pcb_create_be_lenient(pcb_false);
+
+	if (Pipe != NULL)
+		return returncode;
+
+	if (used_popen)
+		return (pcb_pclose(pcb_in) ? 1 : returncode);
+	return (fclose(pcb_in) ? 1 : returncode);
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a single element file
+ */
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+{
+	FILE *f;
+	int ret;
+	pcb_fp_fopen_ctx_t st;
+
+	f = pcb_fp_fopen(pcb_fp_default_search_path(), name, &st);
+
+	/* set up the yy globals only after the pcb_fp_fopen() because it can
+	   also call Parse */
+	yy_parse_tags = 0;
+	yy_settings_dest = CFR_invalid;
+	yyPCB = NULL;
+	yyData = Ptr;
+	pcb_data_set_layer_parents(Ptr);
+	yyFont = pcb_font(PCB, 0, 1);
+	yyFontReset = pcb_false;
+	yyFontkitValid = NULL;
+	yysubc = NULL;
+
+
+	if (f == NULL)
+		return -1;
+
+	ret = Parse(f, NULL,NULL,NULL);
+
+	pcb_fp_fclose(f, &st);
+
+	return(ret);
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a complete board
+ */
+#define	TEST_FLAG_LOCAL(F,FLG)		(((FLG) & (F)) ? 1 : 0)
+#define CONF_BOOL_FLAG(F,FLG)	(TEST_FLAG_LOCAL(F,FLG.f) ? "true" : "false")
+
+/* Hack: set a no-save-attribute flag while loading some fields from the file;
+   because we have all these flags set we won't need to list the paths that
+   have hardwired flags again in a "don't save these in attributes" list. */
+#define CONF_NO_ATTRIB(path) \
+do { \
+	conf_native_t *n = conf_get_field(path); \
+	if (n != NULL) \
+		n->random_flags.io_pcb_no_attrib = 1; \
+} while(0) \
+
+#define CONF_SET(target, path, arr_idx, new_val, pol) \
+do { \
+	CONF_NO_ATTRIB(path); \
+	conf_set(target, path, arr_idx, new_val, pol); \
+} while(0) \
+
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int retval;
+	const char *fcmd;
+	yy_parse_tags = 0;
+	yyPCB = Ptr;
+	yyData = NULL;
+	yyFont = NULL;
+	yyFontReset = pcb_true;
+	yyFontkitValid = NULL;
+	yysubc = NULL;
+	yy_settings_dest = settings_dest;
+
+	if (!pcb_conf_cmd_is_safe(rc.file_command, &fcmd, 1))
+		return -1;
+
+	if (settings_dest != CFR_invalid)
+		conf_reset(settings_dest, Filename);
+	pcb_setlocale(LC_ALL, "C"); /* make sure numerics are read predictably */
+
+	retval = Parse(NULL, fcmd, conf_core.rc.file_path, Filename);
+	pcb_setlocale(LC_ALL, "");
+	if ((settings_dest != CFR_invalid) && (retval == 0)) {
+		/* overwrite settings from the flags, mark them not-to-save */
+		CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(PCB_RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(PCB_AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(PCB_ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(PCB_SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(PCB_UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(PCB_CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(PCB_NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(PCB_SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(PCB_ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(PCB_LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(PCB_LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(PCB_ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(PCB_HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(PCB_THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(PCB_THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(PCB_LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(PCB_CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(PCB_DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(PCB_NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE);
+
+		/* don't save this because it is saved manually as PCB::grid::unit */
+		CONF_NO_ATTRIB("editor/grid_unit");
+
+		/* don't save these to reduce noise - they are reset by the GUI anyway */
+		CONF_NO_ATTRIB("editor/mode");
+
+		/* it's saved in [styles] */
+		CONF_NO_ATTRIB("design/routes");
+
+		/* load config nodes not disabled above, from optional attributes */
+		io_pcb_attrib_a2c(Ptr);
+
+		conf_update(NULL, -1);
+	}
+	if (retval == 0) {
+		/* restore loader so the next save will use the same units */
+		const char *loader = pcb_attribute_get(&PCB->Attributes, "PCB::loader");
+		if (loader != NULL) {
+			pcb_find_io_t f;
+			int len;
+
+			len = pcb_find_io(&f, 1, PCB_IOT_PCB, 1, loader);
+/*			printf("PCB::loader: %s -> %d\n", loader, len);*/
+			if (len > 0) {
+/*				printf("   ::loader: '%s'\n", f.plug->description);*/
+				PCB->Data->loader = f.plug;
+			}
+		}
+		else {
+			/* Loaded a file that did not have any information about preferred format */
+			switch((int)pcb_io_pcb_usty_seen) {
+				case PCB_USTY_CMIL:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
+					PCB->Data->loader = pcb_centimil_io_pcb;
+					break;
+				case PCB_USTY_NANOMETER:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
+					PCB->Data->loader = pcb_nanometer_io_pcb;
+					break;
+				case PCB_USTY_UNITS:
+				case PCB_USTY_UNITS | PCB_USTY_NANOMETER:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
+					PCB->Data->loader = pcb_preferred_io_pcb;
+					break;
+				default:
+					pcb_message(PCB_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
+					PCB->Data->loader = pcb_preferred_io_pcb;
+			}
+		}
+	}
+	pcb_layer_auto_fixup(PCB);
+	io_pcb_postproc_board(PCB);
+	return retval;
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a font
+ */
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+{
+	int r = 0, valid;
+	const char *fcmd;
+	yy_parse_tags = 1;
+	yyPCB = NULL;
+	yyFont = Ptr;
+	yyFontkitValid = &valid;
+	yysubc = NULL;
+	yyFontReset = pcb_false;
+
+	if (!pcb_conf_cmd_is_safe(rc.font_command, &fcmd, 1))
+		return -1;
+
+	yy_settings_dest = CFR_invalid;
+	r = Parse(NULL, fcmd, NULL, Filename);
+	if (r == 0) {
+#ifdef DEBUG
+		pcb_message(PCB_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
+#endif
+	}
+	return r;
+}
+
+static int
+parse_number ()
+{
+  pcb_lval.number = strtod ((char *) pcb_text, NULL);
+  return FLOATING;
+}
+
+static void add_tag(char *line)
+{
+	char *key, *val;
+	while((*line == '#') || isspace(*line)) line++;
+	key = line;
+	val = strchr(line, ':');
+	if (val != NULL) {
+		*val = '\0';
+		val++;
+	}
+	if (yyFont != NULL) {
+/*		printf("tag:%s=%s:\n", key,val); */
+		if (strcmp(key, "name") == 0) {
+			free(yyFont->name);
+			yyFont->name = pcb_strdup(val);
+		}
+	}
+}
+
+
Index: tags/2.0.1/src_plugins/io_pcb/parse_l.h
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_l.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_l.h	(revision 18980)
@@ -0,0 +1,332 @@
+#ifndef pcb_HEADER_H
+#define pcb_HEADER_H 1
+#define pcb_IN_HEADER 1
+
+#line 6 "parse_l.h"
+
+#line 8 "parse_l.h"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int pcb_leng;
+
+extern FILE *pcb_in, *pcb_out;
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+void pcb_restart (FILE *input_file  );
+void pcb__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE pcb__create_buffer (FILE *file,int size  );
+void pcb__delete_buffer (YY_BUFFER_STATE b  );
+void pcb__flush_buffer (YY_BUFFER_STATE b  );
+void pcb_push_buffer_state (YY_BUFFER_STATE new_buffer  );
+void pcb_pop_buffer_state (void );
+
+YY_BUFFER_STATE pcb__scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE pcb__scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE pcb__scan_bytes (yyconst char *bytes,int len  );
+
+void *pcb_alloc (yy_size_t  );
+void *pcb_realloc (void *,yy_size_t  );
+void pcb_free (void *  );
+
+/* Begin user sect3 */
+
+extern int pcb_lineno;
+
+extern char *pcb_text;
+#define yytext_ptr pcb_text
+
+#ifdef YY_HEADER_EXPORT_START_CONDITIONS
+#define INITIAL 0
+
+#endif
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int pcb_lex_destroy (void );
+
+int pcb_get_debug (void );
+
+void pcb_set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE pcb_get_extra (void );
+
+void pcb_set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *pcb_get_in (void );
+
+void pcb_set_in  (FILE * in_str  );
+
+FILE *pcb_get_out (void );
+
+void pcb_set_out  (FILE * out_str  );
+
+int pcb_get_leng (void );
+
+char *pcb_get_text (void );
+
+int pcb_get_lineno (void );
+
+void pcb_set_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int pcb_wrap (void );
+#else
+extern int pcb_wrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int pcb_lex (void);
+
+#define YY_DECL int pcb_lex (void)
+#endif /* !YY_DECL */
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+
+#line 213 "parse_l.l"
+
+
+#line 331 "parse_l.h"
+#undef pcb_IN_HEADER
+#endif /* pcb_HEADER_H */
Index: tags/2.0.1/src_plugins/io_pcb/parse_l.l
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_l.l	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_l.l	(revision 18980)
@@ -0,0 +1,522 @@
+
+
+%{
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2006 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* lexical definitions to parse ASCII input of PCB and Element description
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <locale.h>
+
+#if defined(_POSIX_SOURCE) || defined(_HPUX_SOURCE)
+#include <unistd.h>
+#endif
+
+#include "flag_str.h"
+
+#include "crosshair.h"
+#include "data.h"
+#include "error.h"
+#include "file.h"
+#include "flag_str.h"
+#include "parse_common.h"
+#include "parse_y.h"
+#include "plug_footprint.h"
+#include "attribs.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "compat_cc.h"
+#include "obj_common.h"
+#include "paths.h"
+#include "safe_fs.h"
+#include "macro.h"
+
+#define YY_NO_INPUT
+
+/* ---------------------------------------------------------------------------
+ * some shared parser identifiers
+ */
+#ifdef FLEX_SCANNER
+
+#define yyunput PCB_ATTRIBUTE_UNUSED yyunput
+#endif
+
+const char			*yyfilename;	/* in this file */
+pcb_board_t *	yyPCB;			/* used by parser */
+pcb_data_t *	yyData;
+pcb_subc_t *yysubc;
+pcb_coord_t yysubc_ox, yysubc_oy;
+pcb_font_t *	yyFont;
+conf_role_t yy_settings_dest;
+pcb_flag_t yy_pcb_flags;
+int *yyFontkitValid;
+int yy_parse_tags;
+pcb_bool yyFontReset;
+
+static int parse_number (void);
+static void add_tag(char *line);
+
+/* ---------------------------------------------------------------------------
+ * an external prototypes
+ */
+int	yyparse(void);
+
+static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename);
+
+%}
+
+%option prefix="pcb_"
+
+
+HEX				0x[0-9a-fA-F]+
+INTEGER                 [+-]?([1-9][0-9]*|0)
+FLOATING                {INTEGER}"."[0-9]*
+STRINGCHAR		([^"\n\r\\]|\\.)
+
+%option yylineno
+
+%%
+
+FileVersion	{ return(T_FILEVERSION); }
+PCB			{ return(T_PCB); }
+Grid		{ return(T_GRID); }
+Cursor		{ return(T_CURSOR); }
+Thermal		{ return(T_THERMAL); }
+PolyArea	{ return(T_AREA); }
+DRC		{ return(T_DRC); }
+Flags		{ return(T_FLAGS); }
+Layer		{ return(T_LAYER); }
+Pin			{ return(T_PIN); }
+Pad			{ return(T_PAD); }
+Via			{ return(T_VIA); }
+Line		{ return(T_LINE); }
+Rat		{ return(T_RAT); }
+Rectangle	{ return(T_RECTANGLE); }
+Text		{ return(T_TEXT); }
+ElementLine	{ return(T_ELEMENTLINE); }
+ElementArc	{ return(T_ELEMENTARC); }
+Element		{ return(T_ELEMENT); }
+SymbolLine	{ return(T_SYMBOLLINE); }
+Symbol		{ return(T_SYMBOL); }
+Mark		{ return(T_MARK); }
+Groups		{ return(T_GROUPS); }
+Styles		{ return(T_STYLES); }
+Polygon		{ return(T_POLYGON); }
+Hole		{ return(T_POLYGON_HOLE); }
+Arc		{ return(T_ARC); }
+NetList		{ return(T_NETLIST); }
+Net		{ return(T_NET); }
+Connect		{ return(T_CONN); }
+NetListPatch		{ return(T_NETLISTPATCH); }
+add_conn		{ return(T_ADD_CONN); }
+del_conn		{ return(T_DEL_CONN); }
+change_attrib		{ return(T_CHANGE_ATTRIB); }
+Attribute	{ return(T_ATTRIBUTE); }
+
+nm	{ return T_NM; }
+um	{ return T_UM; }
+mm	{ return T_MM; }
+m	{ return T_M; }
+km	{ return T_KM; }
+umil	{ return T_UMIL; }
+cmil	{ return T_CMIL; }
+mil	{ return T_MIL; }
+in	{ return T_IN; }
+
+\'.\'				{
+						pcb_lval.integer = (unsigned) *(yytext+1);
+						return(CHAR_CONST);
+					}
+{FLOATING}		{	return parse_number(); }
+{INTEGER}		{	pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; }
+
+{HEX}			{	unsigned n;
+				sscanf((char *) yytext, "%x", &n);
+				pcb_lval.integer = n;
+				return INTEGER;
+					}
+\"{STRINGCHAR}*\"	{
+						char	*p1, *p2;
+
+							/* return NULL on empty string */
+						if (yyleng == 2)
+						{
+							pcb_lval.string = NULL;
+							return(STRING);
+						}
+
+							/* allocate memory and copy string;
+							 * stringlength is counted and copied without
+							 * leading and trailing '"'
+							 */
+						yyleng -= 2;
+						pcb_lval.string = (char *)calloc (yyleng+1, sizeof (char));
+						p1 = (char *) (yytext +1);
+						p2 = pcb_lval.string;
+						while(yyleng--)
+						{
+								/* check for special character */
+							if (*p1 == '\\')
+							{
+								yyleng--;
+								p1++;
+
+							}
+							*p2++ = *p1++;
+						}
+						*p2 = '\0';
+						return(STRING);
+					}
+##.*				{ if (yy_parse_tags) { add_tag(yytext); }}
+#.*					{}
+[ \t]+				{}
+[\n]				{
+#ifndef FLEX_SCANNER
+						yylineno++;
+#endif
+					}
+[\r]				{}
+.					{ return(*yytext); }
+
+%%
+
+/* sets up the preprocessor command */
+static int Parse(FILE *Pipe, const char *Executable, const char *Path, const char *Filename)
+{
+	static char *command = NULL;
+	int returncode;
+	int used_popen = 0;
+	char *tmps;
+	size_t l;
+#ifdef FLEX_SCANNER
+	static pcb_bool firsttime = pcb_true;
+#endif
+	pcb_io_pcb_usty_seen = 0;
+	if (Pipe == NULL) {
+		if (PCB_EMPTY_STRING_P(Executable)) {
+			l = 2;
+			if (Path != NULL)
+				l += strlen(Path);
+
+			l += strlen(Filename);
+
+			if ((tmps = (char *)malloc(l * sizeof(char))) == NULL) {
+				fprintf(stderr, "Parse():  malloc failed\n");
+				exit(1);
+			}
+
+			if (Path != NULL && *Path != '\0')
+				sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename);
+			else
+				sprintf(tmps, "%s", Filename);
+
+			yyin = pcb_fopen(tmps, "r");
+			if (!yyin) {
+				free(tmps);
+				return (1);
+			}
+			free(tmps);
+		}
+		else {
+			pcb_build_argfn_t p;
+			used_popen = 1;
+			memset(&p, 0, sizeof(p));
+			p.params['p' - 'a'] = Path;
+			p.params['f' - 'a'] = Filename;
+			command = pcb_build_argfn(Executable, &p);
+			/* open pipe to stdout of command */
+			if (*command == '\0' || (yyin = pcb_popen(command, "r")) == NULL) {
+				pcb_popen_error_message(command);
+				free(command);
+				return (1);
+			}
+			free(command);
+		}
+	}
+	else {
+		yyin = Pipe;
+	}
+
+#ifdef FLEX_SCANNER
+	/* reset parser if not called the first time */
+	if (!firsttime)
+		yyrestart(yyin);
+	firsttime = pcb_false;
+#endif
+
+	/* init linenumber and filename for yyerror() */
+	yylineno = 1;
+	yyfilename = Filename;
+
+	/* We need to save the data temporarily because lex-yacc are able
+	 * to break the application if the input file has an illegal format.
+	 * It's not necessary if the system supports the call of functions
+	 * on termination.
+	 */
+
+	pcb_create_be_lenient(pcb_true);
+
+#if !defined(HAS_ATEXIT)
+	if (PCB && PCB->Data)
+		pcb_tmp_data_save();
+	returncode = pcb_parse();
+	pcb_tmp_data_remove();
+#else
+	returncode = pcb_parse();
+#endif
+	/* clean up parse buffer */
+	yy_delete_buffer(YY_CURRENT_BUFFER);
+
+	pcb_create_be_lenient(pcb_false);
+
+	if (Pipe != NULL)
+		return returncode;
+
+	if (used_popen)
+		return (pcb_pclose(yyin) ? 1 : returncode);
+	return (fclose(yyin) ? 1 : returncode);
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a single element file
+ */
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+{
+	FILE *f;
+	int ret;
+	pcb_fp_fopen_ctx_t st;
+
+	f = pcb_fp_fopen(pcb_fp_default_search_path(), name, &st);
+
+	/* set up the yy globals only after the pcb_fp_fopen() because it can
+	   also call Parse */
+	yy_parse_tags = 0;
+	yy_settings_dest = CFR_invalid;
+	yyPCB = NULL;
+	yyData = Ptr;
+	pcb_data_set_layer_parents(Ptr);
+	yyFont = pcb_font(PCB, 0, 1);
+	yyFontReset = pcb_false;
+	yyFontkitValid = NULL;
+	yysubc = NULL;
+
+
+	if (f == NULL)
+		return -1;
+
+	ret = Parse(f, NULL,NULL,NULL);
+
+	pcb_fp_fclose(f, &st);
+
+	return(ret);
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a complete board
+ */
+#define	TEST_FLAG_LOCAL(F,FLG)		(((FLG) & (F)) ? 1 : 0)
+#define CONF_BOOL_FLAG(F,FLG)	(TEST_FLAG_LOCAL(F,FLG.f) ? "true" : "false")
+
+/* Hack: set a no-save-attribute flag while loading some fields from the file;
+   because we have all these flags set we won't need to list the paths that
+   have hardwired flags again in a "don't save these in attributes" list. */
+#define CONF_NO_ATTRIB(path) \
+do { \
+	conf_native_t *n = conf_get_field(path); \
+	if (n != NULL) \
+		n->random_flags.io_pcb_no_attrib = 1; \
+} while(0) \
+
+#define CONF_SET(target, path, arr_idx, new_val, pol) \
+do { \
+	CONF_NO_ATTRIB(path); \
+	conf_set(target, path, arr_idx, new_val, pol); \
+} while(0) \
+
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int retval;
+	const char *fcmd;
+	yy_parse_tags = 0;
+	yyPCB = Ptr;
+	yyData = NULL;
+	yyFont = NULL;
+	yyFontReset = pcb_true;
+	yyFontkitValid = NULL;
+	yysubc = NULL;
+	yy_settings_dest = settings_dest;
+
+	if (!pcb_conf_cmd_is_safe(rc.file_command, &fcmd, 1))
+		return -1;
+
+	if (settings_dest != CFR_invalid)
+		conf_reset(settings_dest, Filename);
+	pcb_setlocale(LC_ALL, "C"); /* make sure numerics are read predictably */
+
+	retval = Parse(NULL, fcmd, conf_core.rc.file_path, Filename);
+	pcb_setlocale(LC_ALL, "");
+	if ((settings_dest != CFR_invalid) && (retval == 0)) {
+		/* overwrite settings from the flags, mark them not-to-save */
+		CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/rubber_band_mode", -1, CONF_BOOL_FLAG(PCB_RUBBERBANDFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/auto_drc", -1, CONF_BOOL_FLAG(PCB_AUTOPCB_FLAG_DRC, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/all_direction_lines", -1, CONF_BOOL_FLAG(PCB_ALLDIRECTIONFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/swap_start_direction", -1, CONF_BOOL_FLAG(PCB_SWAPSTARTDIRFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/unique_names", -1, CONF_BOOL_FLAG(PCB_UNIQUENAMEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/clear_line", -1, CONF_BOOL_FLAG(PCB_CLEARNEWFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/full_poly", -1, CONF_BOOL_FLAG(PCB_NEWPCB_FLAG_FULLPOLY, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/snap_pin", -1, CONF_BOOL_FLAG(PCB_SNAPPCB_FLAG_PIN, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/orthogonal_moves", -1, CONF_BOOL_FLAG(PCB_ORTHOMOVEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/live_routing", -1, CONF_BOOL_FLAG(PCB_LIVEROUTEFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/lock_names", -1, CONF_BOOL_FLAG(PCB_LOCKNAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/only_names", -1, CONF_BOOL_FLAG(PCB_ONLYNAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/hide_names", -1, CONF_BOOL_FLAG(PCB_HIDENAMESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/thin_draw", -1, CONF_BOOL_FLAG(PCB_THINDRAWFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/thin_draw_poly", -1, CONF_BOOL_FLAG(PCB_THINDRAWPOLYFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/local_ref", -1, CONF_BOOL_FLAG(PCB_LOCALREFFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/check_planes", -1, CONF_BOOL_FLAG(PCB_CHECKPLANESFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/description", -1, CONF_BOOL_FLAG(PCB_DESCRIPTIONFLAG, yy_pcb_flags), POL_OVERWRITE);
+		CONF_SET(settings_dest, "editor/name_on_pcb", -1, CONF_BOOL_FLAG(PCB_NAMEONPCBFLAG, yy_pcb_flags), POL_OVERWRITE);
+
+		/* don't save this because it is saved manually as PCB::grid::unit */
+		CONF_NO_ATTRIB("editor/grid_unit");
+
+		/* don't save these to reduce noise - they are reset by the GUI anyway */
+		CONF_NO_ATTRIB("editor/mode");
+
+		/* it's saved in [styles] */
+		CONF_NO_ATTRIB("design/routes");
+
+		/* load config nodes not disabled above, from optional attributes */
+		io_pcb_attrib_a2c(Ptr);
+
+		conf_update(NULL, -1);
+	}
+	if (retval == 0) {
+		/* restore loader so the next save will use the same units */
+		const char *loader = pcb_attribute_get(&PCB->Attributes, "PCB::loader");
+		if (loader != NULL) {
+			pcb_find_io_t f;
+			int len;
+
+			len = pcb_find_io(&f, 1, PCB_IOT_PCB, 1, loader);
+/*			printf("PCB::loader: %s -> %d\n", loader, len);*/
+			if (len > 0) {
+/*				printf("   ::loader: '%s'\n", f.plug->description);*/
+				PCB->Data->loader = f.plug;
+			}
+		}
+		else {
+			/* Loaded a file that did not have any information about preferred format */
+			switch((int)pcb_io_pcb_usty_seen) {
+				case PCB_USTY_CMIL:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
+					PCB->Data->loader = pcb_centimil_io_pcb;
+					break;
+				case PCB_USTY_NANOMETER:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
+					PCB->Data->loader = pcb_nanometer_io_pcb;
+					break;
+				case PCB_USTY_UNITS:
+				case PCB_USTY_UNITS | PCB_USTY_NANOMETER:
+					pcb_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
+					PCB->Data->loader = pcb_preferred_io_pcb;
+					break;
+				default:
+					pcb_message(PCB_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
+					PCB->Data->loader = pcb_preferred_io_pcb;
+			}
+		}
+	}
+	pcb_layer_auto_fixup(PCB);
+	io_pcb_postproc_board(PCB);
+	return retval;
+}
+
+/* ---------------------------------------------------------------------------
+ * initializes LEX and calls parser for a font
+ */
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+{
+	int r = 0, valid;
+	const char *fcmd;
+	yy_parse_tags = 1;
+	yyPCB = NULL;
+	yyFont = Ptr;
+	yyFontkitValid = &valid;
+	yysubc = NULL;
+	yyFontReset = pcb_false;
+
+	if (!pcb_conf_cmd_is_safe(rc.font_command, &fcmd, 1))
+		return -1;
+
+	yy_settings_dest = CFR_invalid;
+	r = Parse(NULL, fcmd, NULL, Filename);
+	if (r == 0) {
+#ifdef DEBUG
+		pcb_message(PCB_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
+#endif
+	}
+	return r;
+}
+
+static int
+parse_number ()
+{
+  pcb_lval.number = strtod ((char *) yytext, NULL);
+  return FLOATING;
+}
+
+static void add_tag(char *line)
+{
+	char *key, *val;
+	while((*line == '#') || isspace(*line)) line++;
+	key = line;
+	val = strchr(line, ':');
+	if (val != NULL) {
+		*val = '\0';
+		val++;
+	}
+	if (yyFont != NULL) {
+/*		printf("tag:%s=%s:\n", key,val); */
+		if (strcmp(key, "name") == 0) {
+			free(yyFont->name);
+			yyFont->name = pcb_strdup(val);
+		}
+	}
+}
+
Index: tags/2.0.1/src_plugins/io_pcb/parse_y.c
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_y.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_y.c	(revision 18980)
@@ -0,0 +1,3335 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.2"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         pcb_parse
+#define yylex           pcb_lex
+#define yyerror         pcb_error
+#define yydebug         pcb_debug
+#define yynerrs         pcb_nerrs
+
+#define yylval          pcb_lval
+#define yychar          pcb_char
+
+/* Copy the first part of user declarations.  */
+#line 11 "parse_y.y" /* yacc.c:339  */
+
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* grammar to parse ASCII input of PCB description
+ */
+
+#include "config.h"
+#include "flag.h"
+#include "board.h"
+#include "conf_core.h"
+#include "layer.h"
+#include "data.h"
+#include "error.h"
+#include "file.h"
+#include "parse_l.h"
+#include "polygon.h"
+#include "remove.h"
+#include "rtree.h"
+#include "flag_str.h"
+#include "obj_pinvia_therm.h"
+#include "rats_patch.h"
+#include "route_style.h"
+#include "compat_misc.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+static	pcb_layer_t *Layer;
+static	pcb_poly_t *Polygon;
+static	pcb_symbol_t *Symbol;
+static	int		pin_num;
+static	pcb_lib_menu_t *Menu;
+static	pcb_bool			LayerFlag[PCB_MAX_LAYER + 2];
+static	int	old_fmt; /* 1 if we are reading a PCB(), 0 if PCB[] */
+static	unsigned char yy_intconn;
+
+extern	char			*yytext;		/* defined by LEX */
+extern	pcb_board_t *	yyPCB;
+extern	pcb_data_t *	yyData;
+extern	pcb_subc_t *yysubc;
+extern	pcb_coord_t yysubc_ox, yysubc_oy;
+extern	pcb_font_t *	yyFont;
+extern	pcb_bool	yyFontReset;
+extern	int				pcb_lineno;		/* linenumber */
+extern	char			*yyfilename;	/* in this file */
+extern	conf_role_t yy_settings_dest;
+extern pcb_flag_t yy_pcb_flags;
+extern int *yyFontkitValid;
+
+static char *layer_group_string;
+
+static pcb_attribute_list_t *attr_list;
+
+int yyerror(const char *s);
+int yylex();
+static int check_file_version (int);
+
+static void do_measure (PLMeasure *m, pcb_coord_t i, double d, int u);
+#define M(r,f,d) do_measure (&(r), f, d, 1)
+
+/* Macros for interpreting what "measure" means - integer value only,
+   old units (mil), or new units (cmil).  */
+#define IV(m) integer_value (m)
+#define OU(m) old_units (m)
+#define NU(m) new_units (m)
+
+static int integer_value (PLMeasure m);
+static pcb_coord_t old_units (PLMeasure m);
+static pcb_coord_t new_units (PLMeasure m);
+static pcb_flag_t pcb_flag_old(unsigned int flags);
+static void load_meta_coord(const char *path, pcb_coord_t crd);
+static void load_meta_float(const char *path, double val);
+
+#define YYDEBUG 1
+#define YYERROR_VERBOSE 1
+
+#include "parse_y.h"
+
+
+#line 179 "parse_y.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "parse_y.h".  */
+#ifndef YY_PCB_PARSE_Y_H_INCLUDED
+# define YY_PCB_PARSE_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int pcb_debug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    FLOATING = 258,
+    INTEGER = 259,
+    CHAR_CONST = 260,
+    STRING = 261,
+    T_FILEVERSION = 262,
+    T_PCB = 263,
+    T_LAYER = 264,
+    T_VIA = 265,
+    T_RAT = 266,
+    T_LINE = 267,
+    T_ARC = 268,
+    T_RECTANGLE = 269,
+    T_TEXT = 270,
+    T_ELEMENTLINE = 271,
+    T_ELEMENT = 272,
+    T_PIN = 273,
+    T_PAD = 274,
+    T_GRID = 275,
+    T_FLAGS = 276,
+    T_SYMBOL = 277,
+    T_SYMBOLLINE = 278,
+    T_CURSOR = 279,
+    T_ELEMENTARC = 280,
+    T_MARK = 281,
+    T_GROUPS = 282,
+    T_STYLES = 283,
+    T_POLYGON = 284,
+    T_POLYGON_HOLE = 285,
+    T_NETLIST = 286,
+    T_NET = 287,
+    T_CONN = 288,
+    T_NETLISTPATCH = 289,
+    T_ADD_CONN = 290,
+    T_DEL_CONN = 291,
+    T_CHANGE_ATTRIB = 292,
+    T_AREA = 293,
+    T_THERMAL = 294,
+    T_DRC = 295,
+    T_ATTRIBUTE = 296,
+    T_UMIL = 297,
+    T_CMIL = 298,
+    T_MIL = 299,
+    T_IN = 300,
+    T_NM = 301,
+    T_UM = 302,
+    T_MM = 303,
+    T_M = 304,
+    T_KM = 305
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 121 "parse_y.y" /* yacc.c:355  */
+
+	int		integer;
+	double		number;
+	char		*string;
+	pcb_flag_t	flagtype;
+	PLMeasure	measure;
+
+#line 278 "parse_y.c" /* yacc.c:355  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE pcb_lval;
+
+int pcb_parse (void);
+
+#endif /* !YY_PCB_PARSE_Y_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 293 "parse_y.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  10
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   608
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  55
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  112
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  214
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  643
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   305
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      53,    54,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    51,     2,    52,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   148,   148,   149,   150,   151,   175,   175,   249,   249,
+     260,   260,   279,   280,   285,   285,   326,   328,   358,   365,
+     372,   402,   403,   404,   407,   415,   430,   464,   470,   476,
+     492,   494,   519,   521,   552,   554,   555,   556,   560,   570,
+     581,   608,   612,   617,   645,   649,   693,   702,   711,   715,
+     716,   720,   721,   725,   726,   726,   727,   728,   730,   730,
+     737,   741,   742,   743,   744,   745,   781,   791,   802,   812,
+     822,   858,   863,   895,   894,   925,   926,   930,   931,   935,
+     936,   937,   938,   939,   940,   942,   947,   948,   949,   950,
+     950,   951,   981,   990,   999,  1047,  1056,  1065,  1102,  1112,
+    1130,  1180,  1179,  1218,  1220,  1225,  1224,  1231,  1233,  1238,
+    1242,  1302,  1303,  1304,  1305,  1306,  1314,  1313,  1332,  1331,
+    1350,  1349,  1370,  1368,  1392,  1390,  1477,  1478,  1482,  1483,
+    1484,  1485,  1486,  1488,  1493,  1498,  1503,  1508,  1513,  1518,
+    1518,  1522,  1523,  1527,  1528,  1529,  1530,  1532,  1538,  1545,
+    1550,  1555,  1555,  1596,  1609,  1621,  1632,  1648,  1702,  1717,
+    1730,  1741,  1752,  1753,  1757,  1758,  1780,  1782,  1798,  1817,
+    1818,  1821,  1823,  1824,  1845,  1852,  1868,  1869,  1873,  1878,
+    1879,  1883,  1884,  1908,  1907,  1917,  1918,  1922,  1923,  1942,
+    1959,  1960,  1964,  1969,  1970,  1974,  1975,  1990,  1991,  1992,
+    2019,  2032,  2033,  2037,  2038,  2043,  2044,  2045,  2046,  2047,
+    2048,  2049,  2050,  2051,  2052
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "FLOATING", "INTEGER", "CHAR_CONST",
+  "STRING", "T_FILEVERSION", "T_PCB", "T_LAYER", "T_VIA", "T_RAT",
+  "T_LINE", "T_ARC", "T_RECTANGLE", "T_TEXT", "T_ELEMENTLINE", "T_ELEMENT",
+  "T_PIN", "T_PAD", "T_GRID", "T_FLAGS", "T_SYMBOL", "T_SYMBOLLINE",
+  "T_CURSOR", "T_ELEMENTARC", "T_MARK", "T_GROUPS", "T_STYLES",
+  "T_POLYGON", "T_POLYGON_HOLE", "T_NETLIST", "T_NET", "T_CONN",
+  "T_NETLISTPATCH", "T_ADD_CONN", "T_DEL_CONN", "T_CHANGE_ATTRIB",
+  "T_AREA", "T_THERMAL", "T_DRC", "T_ATTRIBUTE", "T_UMIL", "T_CMIL",
+  "T_MIL", "T_IN", "T_NM", "T_UM", "T_MM", "T_M", "T_KM", "'['", "']'",
+  "'('", "')'", "$accept", "parse", "parsepcb", "$@1", "$@2", "parsedata",
+  "$@3", "pcbfont", "parsefont", "$@4", "pcbfileversion", "pcbname",
+  "pcbgrid", "pcbgridold", "pcbgridnew", "pcbhigrid", "pcbcursor",
+  "polyarea", "pcbthermal", "pcbdrc", "pcbdrc1", "pcbdrc2", "pcbdrc3",
+  "pcbflags", "pcbgroups", "pcbstyles", "pcbdata", "pcbdefinitions",
+  "pcbdefinition", "$@5", "$@6", "via", "via_hi_format", "via_2.0_format",
+  "via_1.7_format", "via_newformat", "via_oldformat", "rats", "layer",
+  "$@7", "layerdata", "layerdefinitions", "layerdefinition", "$@8",
+  "line_hi_format", "line_1.7_format", "line_oldformat", "arc_hi_format",
+  "arc_1.7_format", "arc_oldformat", "text_oldformat", "text_newformat",
+  "text_hi_format", "polygon_format", "$@9", "polygonholes", "polygonhole",
+  "$@10", "polygonpoints", "polygonpoint", "element", "element_oldformat",
+  "$@11", "element_1.3.4_format", "$@12", "element_newformat", "$@13",
+  "element_1.7_format", "$@14", "element_hi_format", "$@15",
+  "elementdefinitions", "elementdefinition", "$@16", "relementdefs",
+  "relementdef", "$@17", "pin_hi_format", "pin_1.7_format",
+  "pin_1.6.3_format", "pin_newformat", "pin_oldformat", "pad_hi_format",
+  "pad_1.7_format", "pad_newformat", "pad", "flags", "symbols", "symbol",
+  "symbolhead", "symbolid", "symboldata", "symboldefinition",
+  "hiressymbol", "pcbnetlist", "pcbnetdef", "nets", "netdefs", "net",
+  "$@18", "connections", "conndefs", "conn", "pcbnetlistpatch",
+  "pcbnetpatchdef", "netpatches", "netpatchdefs", "netpatch", "attribute",
+  "opt_string", "number", "measure", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,    91,    93,    40,    41
+};
+# endif
+
+#define YYPACT_NINF -449
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-449)))
+
+#define YYTABLE_NINF -90
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+     151,  -449,    39,  -449,     4,    30,  -449,    23,  -449,    56,
+    -449,    32,    97,   -31,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,    73,    -5,    26,  -449,   169,  -449,    88,    30,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,    48,    56,  -449,
+    -449,   129,    55,   116,    49,   113,   140,    63,    63,    63,
+      63,  -449,    95,  -449,  -449,    84,    84,  -449,   -16,   105,
+     143,   157,    92,   147,  -449,  -449,  -449,  -449,  -449,   158,
+     161,   168,   176,  -449,  -449,   305,    63,    63,    63,    63,
+     187,  -449,  -449,    63,    63,   134,  -449,  -449,  -449,  -449,
+      63,     6,    63,    63,   160,   156,   191,   192,    63,   210,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,    63,
+      63,   224,   229,   233,   196,   197,    63,    63,    63,  -449,
+      63,    63,    63,    63,    63,   218,   257,   272,   185,    63,
+    -449,   236,    63,   221,    63,    63,   245,   255,   270,    63,
+      63,   274,   287,    63,    63,    63,    63,    63,   283,   302,
+      63,    63,    63,   353,   312,    63,   362,   239,    63,    63,
+    -449,  -449,  -449,    63,    63,  -449,  -449,   378,     0,    63,
+      63,   334,    63,   341,   372,  -449,  -449,  -449,    63,    63,
+      63,   342,  -449,    63,   343,   394,   251,   397,   398,    63,
+      63,   351,   350,  -449,   354,   355,  -449,   356,    63,   357,
+     380,    63,    63,    63,   358,   260,   399,  -449,   359,   408,
+     409,    49,   410,    63,    63,  -449,  -449,  -449,  -449,  -449,
+      63,   228,   363,   389,    63,    63,   414,  -449,   205,   226,
+     366,   253,   367,   368,   260,  -449,    88,  -449,  -449,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,    49,  -449,   369,
+     417,   373,   370,   376,   375,    63,   379,   381,   424,   256,
+     412,    63,    90,   384,    33,    63,    63,    63,    63,    63,
+      63,    63,    49,  -449,  -449,  -449,   385,  -449,   386,  -449,
+    -449,  -449,  -449,    11,  -449,  -449,   387,   433,   436,   195,
+    -449,    63,   390,    63,   393,   276,   403,   404,   279,   280,
+     102,  -449,    88,  -449,  -449,  -449,  -449,  -449,    63,    63,
+      63,    63,    63,    63,    63,   405,  -449,  -449,  -449,    13,
+    -449,   391,   406,   416,    49,   411,   454,  -449,    63,    63,
+      63,    63,    63,    63,    63,    63,  -449,  -449,  -449,    63,
+      63,    63,    63,    63,    63,    63,   415,  -449,    63,  -449,
+    -449,   418,   427,  -449,   413,  -449,   419,    33,    63,    63,
+      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,
+      63,    63,   264,  -449,   420,   421,   423,  -449,  -449,   425,
+      33,   426,   121,    63,    63,    63,    63,    63,    63,   422,
+     437,    63,    63,    63,    63,   458,   457,   465,   464,   320,
+    -449,   428,   438,  -449,   183,  -449,  -449,    63,    63,   299,
+      63,    63,    63,  -449,  -449,    63,    63,    63,    63,   439,
+      49,   440,   473,    63,    63,  -449,   320,   448,   442,   165,
+    -449,   165,    63,    63,   486,   490,    63,    63,    63,    49,
+       2,    63,    63,  -449,   445,  -449,   444,    63,    63,   -17,
+    -449,   446,   447,   448,  -449,   -10,   321,   326,   327,   330,
+     222,  -449,    88,  -449,  -449,  -449,  -449,   234,   450,   449,
+     459,   352,   494,    63,    63,   460,   461,  -449,    63,   110,
+    -449,  -449,   462,   463,   466,  -449,  -449,   510,  -449,  -449,
+     467,   468,   469,   478,   -10,  -449,    63,    63,    63,    63,
+      63,    63,    63,    63,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,   479,   514,   383,    63,    63,  -449,  -449,    49,   480,
+     519,  -449,  -449,  -449,   529,   530,   531,   538,  -449,  -449,
+      63,    63,    63,    63,    63,    63,    63,    63,  -449,   493,
+     495,   544,   502,   503,   506,  -449,   505,   320,   507,   554,
+     556,   557,    63,    63,    63,    63,    63,    63,    63,    63,
+    -449,  -449,   515,  -449,  -449,  -449,  -449,   516,   518,   520,
+     521,   562,    63,    63,    63,    63,    63,    63,    63,    63,
+    -449,  -449,  -449,  -449,  -449,   522,    63,    63,    63,    63,
+      63,    63,    63,    63,   539,  -449,   525,   524,    63,    63,
+      63,    63,    63,    63,   526,   527,   539,  -449,  -449,  -449,
+     567,   574,    63,    63,    63,    63,   576,  -449,  -449,   577,
+     578,   579,   580,   535,   534,   536,    49,   585,   586,   587,
+    -449,  -449,  -449,   542,   537,    49,   591,  -449,  -449,   545,
+     546,  -449,  -449
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     5,     0,     2,    16,     0,     3,     0,     4,     0,
+       1,     0,     0,     0,     9,   111,   112,   113,   114,   115,
+      60,     0,     0,     0,    11,     0,    51,     0,     0,    53,
+      61,    62,    63,    64,    65,    56,    57,     0,    15,   164,
+     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    52,     0,    55,    59,     0,     0,   165,     0,     0,
+       0,     0,     0,    29,    21,    22,    23,   162,   163,     0,
+       0,     0,     0,   203,   204,   205,     0,     0,     0,     0,
+       0,   169,   170,     0,     0,     0,   166,   172,   173,    17,
+       0,     0,     0,     0,     0,    30,     0,     0,     0,   202,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    18,
+       0,     0,     0,     0,     0,     0,    32,     0,     0,     0,
+     201,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     200,   167,   168,     0,     0,    20,    19,     0,     0,     0,
+       0,     0,     0,     0,    43,    35,    36,    37,     0,     0,
+       0,     0,    73,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    24,     0,     0,    31,     0,     0,     0,
+      45,     0,     0,     0,     0,    76,     0,    70,     0,     0,
+       0,     0,     0,     0,     0,    26,    25,    28,    27,    33,
+       0,     0,     0,    48,     0,     0,     0,   116,     0,     0,
+       0,     0,     0,     0,    75,    77,     0,    79,    80,    81,
+      82,    83,    84,    88,    87,    86,    91,     0,    69,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      13,     0,     0,     0,   139,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,    78,    90,     0,    68,     0,    71,
+      72,   175,   174,     0,    41,    42,     0,     0,     0,     0,
+      12,     0,   204,     0,     0,     0,     0,     0,     0,     0,
+     139,   126,     0,   128,   129,   130,   131,   132,     0,     0,
+       0,     0,     0,     0,     0,     0,    66,    67,    38,     0,
+      44,     0,     0,   177,     0,     0,     0,   118,     0,     0,
+       0,     0,     0,     0,     0,     0,   117,   127,   140,     0,
+       0,     0,     0,     0,     0,     0,     0,    39,     0,    47,
+      46,     0,   191,   176,     0,   120,     0,   139,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   101,     0,     0,     0,     7,   190,     0,
+     139,     0,   139,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   107,
+      40,     0,     0,   124,   139,   122,   119,     0,     0,     0,
+       0,     0,     0,   137,   138,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   103,   107,   180,     0,   151,
+     121,   151,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    85,     0,    98,     0,     0,     0,     0,
+     108,     0,     0,   179,   181,   194,     0,     0,     0,     0,
+     151,   141,     0,   144,   143,   146,   145,   151,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    94,     0,     0,
+     100,    99,     0,     0,     0,   102,   104,     0,   178,   182,
+       0,     0,     0,     0,   193,   195,     0,     0,     0,     0,
+       0,     0,     0,     0,   125,   142,   152,   123,   133,   134,
+     157,     0,     0,     0,     0,     0,    92,    93,     0,   204,
+       0,   110,   109,   105,     0,     0,     0,     0,   192,   196,
+       0,     0,     0,     0,     0,     0,     0,     0,   156,     0,
+       0,     0,     0,     0,     0,    97,     0,   107,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     155,   161,     0,   135,   136,    95,    96,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     160,   106,   183,   197,   198,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   186,   199,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   185,   187,   147,   148,
+       0,     0,     0,     0,     0,     0,     0,   184,   188,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     149,   150,   189,     0,     0,     0,     0,   153,   154,     0,
+       0,   158,   159
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,   336,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,   309,  -449,   581,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,  -449,   365,  -449,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -423,  -449,
+     573,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,  -449,
+    -449,  -339,  -292,  -449,   171,  -448,  -449,  -449,  -449,  -449,
+    -449,  -449,  -449,  -449,  -449,  -449,  -190,  -449,   565,  -449,
+     548,  -449,  -449,  -449,  -449,  -449,  -449,  -449,   152,  -449,
+    -449,  -449,     1,  -449,  -449,  -449,  -449,   114,  -231,  -449,
+     -47,   -48
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     2,     3,     4,     5,     6,     7,   289,     8,     9,
+      12,    43,    63,    64,    65,    66,    95,   126,   149,   174,
+     175,   176,   177,   200,   223,   260,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,   205,
+     233,   234,   235,   236,   237,   238,   239,   240,   241,   242,
+     243,   244,   245,   246,   399,   449,   486,   547,   425,   426,
+      14,    15,   264,    16,   357,    17,   380,    18,   431,    19,
+     429,   300,   301,   302,   460,   461,   462,   463,   464,   303,
+     304,   305,   465,   466,   306,   307,    69,    38,    39,    40,
+      83,    58,    87,    88,   352,   353,   452,   453,   454,   594,
+     605,   606,   607,   377,   378,   493,   494,   495,    53,   131,
+      75,    76
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int16 yytable[] =
+{
+      77,    78,    79,   450,   192,   275,   476,    85,   337,    73,
+      74,    11,   505,   484,    73,    74,    73,    74,   382,   505,
+      44,   251,    45,   -50,    20,   490,   491,   492,   109,   110,
+     111,   112,    21,    22,    23,   114,   115,   485,    86,    10,
+     -58,   404,   118,   120,   121,   122,    47,    13,    48,   295,
+     129,   296,   297,    67,   193,    68,   477,   276,   298,   299,
+     119,   132,   133,   318,   -54,   347,    73,    74,   139,   140,
+     141,   338,   142,   143,   144,   145,   146,    49,    37,    50,
+     152,   153,   315,    41,   155,   157,   158,   159,    81,    82,
+     337,   163,   164,    73,   292,   167,   168,   169,   170,    55,
+     171,    56,   178,   179,   180,    42,    60,   183,    61,   186,
+     187,   188,   337,    73,   519,   189,   190,    70,   295,    71,
+     296,   297,   194,   195,   567,   197,    46,   298,   299,    52,
+     201,   202,   203,    59,   354,   206,    62,   295,   210,   296,
+     297,   213,   214,    92,    72,    93,   298,   299,    80,    90,
+     220,   -10,     1,   224,   225,   226,   336,    89,    -6,    -6,
+     -10,   -10,   -10,    91,    96,   253,   254,    97,    -8,   -49,
+      20,    94,   255,   -14,    98,   406,   261,   262,    21,    22,
+      23,   456,    99,   457,   458,   116,   -58,   117,    73,    74,
+     459,   151,   -10,   113,   125,   -50,    20,   127,   128,   295,
+     -49,   296,   297,   -49,    21,    22,    23,   283,   298,   299,
+     -54,   123,   -58,   124,   291,   293,   130,   308,   309,   310,
+     311,   312,   313,   314,    73,    74,   -50,   156,   134,   -50,
+     444,   506,   256,   135,   257,   319,   -54,   430,   456,   136,
+     457,   458,    73,    74,   324,   185,   326,   459,   137,   475,
+     456,   138,   457,   458,    73,    74,   265,   209,   266,   459,
+     339,   340,   341,   342,   343,   344,   345,    73,    74,   147,
+     397,   348,   228,   229,   230,   231,   504,   267,   150,   268,
+     358,   359,   360,   361,   362,   363,   364,   365,   507,   232,
+     154,   366,   367,   368,   369,   370,   148,   371,   372,   160,
+     374,   -89,    73,    74,   270,   434,   271,   287,   161,   288,
+     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
+     393,   394,   395,   162,   396,   398,   165,   328,   544,   329,
+     332,   334,   333,   335,   172,   407,   408,   409,   410,   411,
+     412,   166,   173,   415,   416,   417,   418,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   511,   181,   512,   432,
+     433,   435,   436,   437,   438,   182,   184,   439,   440,   441,
+     442,   423,   496,   424,   497,   447,   448,   498,   500,   499,
+     501,   502,   191,   503,   468,   469,   196,   540,   472,   541,
+     473,   474,   198,   199,   478,   479,   204,   207,   208,   482,
+     483,   211,   212,   215,   216,   247,   217,   222,   219,   218,
+     221,   227,   249,   248,   252,   250,   258,   259,   263,   269,
+     272,   278,   273,   277,   280,   279,   514,   515,   281,   282,
+     286,   518,   520,   284,   -14,   285,   633,   316,   294,   321,
+     317,   320,   322,   349,   325,   639,   327,   351,   530,   531,
+     532,   533,   534,   535,   536,   537,   330,   331,   356,   346,
+     350,   376,   419,   420,   355,   379,   542,   543,   373,   421,
+     422,   375,   400,   381,   413,   401,   402,   446,   403,   405,
+     451,   427,   552,   553,   554,   555,   556,   557,   558,   559,
+     470,   414,   428,   443,   445,   455,   471,   480,   481,   487,
+     513,   488,   508,   509,   572,   573,   574,   575,   576,   577,
+     578,   579,   516,   510,   521,   517,   524,   522,   539,   523,
+     525,   526,   527,   546,   586,   587,   588,   589,   590,   591,
+     592,   593,   528,   538,   545,   548,   549,   550,   596,   597,
+     598,   599,   600,   601,   551,   602,   603,   560,   562,   561,
+     610,   611,   612,   613,   563,   614,   615,   564,   565,   566,
+     569,   568,   570,   571,   621,   622,   623,   624,   585,   580,
+     581,   582,   604,   619,   583,   584,   595,   608,   609,   616,
+     620,   617,   625,   626,   627,   628,   629,   630,   631,   634,
+     632,   638,   635,   636,   637,   640,   290,   641,   323,   274,
+     642,    54,   467,    57,    84,   489,    51,   618,   529
+};
+
+static const yytype_uint16 yycheck[] =
+{
+      48,    49,    50,   426,     4,   236,     4,    23,   300,     3,
+       4,     7,   460,    30,     3,     4,     3,     4,   357,   467,
+      51,   211,    53,     0,     1,    35,    36,    37,    76,    77,
+      78,    79,     9,    10,    11,    83,    84,    54,    54,     0,
+      17,   380,    90,    91,    92,    93,    51,    17,    53,    16,
+      98,    18,    19,     4,    54,     6,    54,   247,    25,    26,
+      54,   109,   110,    52,    41,    52,     3,     4,   116,   117,
+     118,   302,   120,   121,   122,   123,   124,    51,    22,    53,
+     128,   129,   272,    51,   132,   133,   134,   135,     4,     5,
+     382,   139,   140,     3,     4,   143,   144,   145,   146,    51,
+     147,    53,   150,   151,   152,     8,    51,   155,    53,   157,
+     158,   159,   404,     3,     4,   163,   164,     4,    16,     6,
+      18,    19,   169,   170,   547,   172,    53,    25,    26,    41,
+     178,   179,   180,     4,   324,   183,    20,    16,   186,    18,
+      19,   189,   190,    51,     4,    53,    25,    26,    53,     6,
+     198,     0,     1,   201,   202,   203,    54,    52,     7,     8,
+       9,    10,    11,     6,     6,   213,   214,     6,    17,     0,
+       1,    24,   220,    22,     6,    54,   224,   225,     9,    10,
+      11,    16,     6,    18,    19,    51,    17,    53,     3,     4,
+      25,     6,    41,     6,    38,     0,     1,     6,     6,    16,
+      31,    18,    19,    34,     9,    10,    11,   255,    25,    26,
+      41,    51,    17,    53,   261,   262,     6,   265,   266,   267,
+     268,   269,   270,   271,     3,     4,    31,     6,     4,    34,
+     420,   462,     4,     4,     6,   283,    41,    54,    16,     6,
+      18,    19,     3,     4,   291,     6,   293,    25,    52,   439,
+      16,    54,    18,    19,     3,     4,    51,     6,    53,    25,
+     308,   309,   310,   311,   312,   313,   314,     3,     4,    51,
+       6,   319,    12,    13,    14,    15,    54,    51,     6,    53,
+     328,   329,   330,   331,   332,   333,   334,   335,    54,    29,
+      54,   339,   340,   341,   342,   343,    39,   344,   345,    54,
+     348,    41,     3,     4,    51,     6,    53,    51,    53,    53,
+     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
+     368,   369,   370,    53,   371,   372,    52,    51,   518,    53,
+      51,    51,    53,    53,    51,   383,   384,   385,   386,   387,
+     388,    54,    40,   391,   392,   393,   394,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,     4,     4,     6,   407,
+     408,   409,   410,   411,   412,    53,     4,   415,   416,   417,
+     418,    51,    51,    53,    53,   423,   424,    51,    51,    53,
+      53,    51,     4,    53,   432,   433,    52,     4,   436,     6,
+     437,   438,    51,    21,   441,   442,    54,    54,     4,   447,
+     448,     4,     4,    52,    54,     6,    52,    27,    52,    54,
+      53,    53,     4,    54,     4,     6,    53,    28,     4,    53,
+      53,     4,    54,    54,    54,    52,   473,   474,    52,    54,
+       6,   478,   479,    54,    22,    54,   626,    52,    54,     6,
+      54,    54,     6,    52,    54,   635,    53,    31,   496,   497,
+     498,   499,   500,   501,   502,   503,    53,    53,     4,    54,
+      54,    34,     4,     6,    53,    52,   514,   515,    53,     4,
+       6,    53,    52,    54,    52,    54,    53,     4,    53,    53,
+      32,    53,   530,   531,   532,   533,   534,   535,   536,   537,
+       4,    54,    54,    54,    54,    53,     6,    52,    54,    53,
+       6,    54,    52,    54,   552,   553,   554,   555,   556,   557,
+     558,   559,    52,    54,    52,    54,     6,    54,     4,    53,
+      53,    53,    53,     4,   572,   573,   574,   575,   576,   577,
+     578,   579,    54,    54,    54,     6,     6,     6,   586,   587,
+     588,   589,   590,   591,     6,   592,   593,    54,     4,    54,
+     598,   599,   600,   601,    52,   602,   603,    54,    52,    54,
+       6,    54,     6,     6,   612,   613,   614,   615,     6,    54,
+      54,    53,    33,     6,    54,    54,    54,    52,    54,    53,
+       6,    54,     6,     6,     6,     6,     6,    52,    54,     4,
+      54,    54,     6,     6,    52,     4,   260,    52,   289,   234,
+      54,    28,   431,    38,    56,   453,    25,   606,   494
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     1,    56,    57,    58,    59,    60,    61,    63,    64,
+       0,     7,    65,    17,   115,   116,   118,   120,   122,   124,
+       1,     9,    10,    11,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    22,   142,   143,
+     144,    51,     8,    66,    51,    53,    53,    51,    53,    51,
+      53,    83,    41,   163,   115,    51,    53,   143,   146,     4,
+      51,    53,    20,    67,    68,    69,    70,     4,     6,   141,
+       4,     6,     4,     3,     4,   165,   166,   166,   166,   166,
+      53,     4,     5,   145,   145,    23,    54,   147,   148,    52,
+       6,     6,    51,    53,    24,    71,     6,     6,     6,     6,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,   166,
+     166,   166,   166,     6,   166,   166,    51,    53,   166,    54,
+     166,   166,   166,    51,    53,    38,    72,     6,     6,   166,
+       6,   164,   166,   166,     4,     4,     6,    52,    54,   166,
+     166,   166,   166,   166,   166,   166,   166,    51,    39,    73,
+       6,     6,   166,   166,    54,   166,     6,   166,   166,   166,
+      54,    53,    53,   166,   166,    52,    54,   166,   166,   166,
+     166,   165,    51,    40,    74,    75,    76,    77,   166,   166,
+     166,     4,    53,   166,     4,     6,   166,   166,   166,   166,
+     166,     4,     4,    54,   165,   165,    52,   165,    51,    21,
+      78,   166,   166,   166,    54,    94,   166,    54,     4,     6,
+     166,     4,     4,   166,   166,    52,    54,    52,    54,    52,
+     166,    53,    27,    79,   166,   166,   166,    53,    12,    13,
+      14,    15,    29,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,     6,    54,     4,
+       6,   141,     4,   166,   166,   166,     4,     6,    53,    28,
+      80,   166,   166,     4,   117,    51,    53,    51,    53,    53,
+      51,    53,    53,    54,    97,   163,   141,    54,     4,    52,
+      54,    52,    54,   166,    54,    54,     6,    51,    53,    62,
+      63,   165,     4,   165,    54,    16,    18,    19,    25,    26,
+     126,   127,   128,   134,   135,   136,   139,   140,   166,   166,
+     166,   166,   166,   166,   166,   141,    52,    54,    52,   166,
+      54,     6,     6,    81,   165,    54,   165,    53,    51,    53,
+      53,    53,    51,    53,    51,    53,    54,   127,   163,   166,
+     166,   166,   166,   166,   166,   166,    54,    52,   166,    52,
+      54,    31,   149,   150,   141,    53,     4,   119,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
+     166,   165,   165,    53,   166,    53,    34,   158,   159,    52,
+     121,    54,   126,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   166,   166,   166,   166,   165,     6,   165,   109,
+      52,    54,    53,    53,   126,    53,    54,   166,   166,   166,
+     166,   166,   166,    52,    54,   166,   166,   166,   166,     4,
+       6,     4,     6,    51,    53,   113,   114,    53,    54,   125,
+      54,   123,   166,   166,     6,   166,   166,   166,   166,   166,
+     166,   166,   166,    54,   141,    54,     4,   166,   166,   110,
+     113,    32,   151,   152,   153,    53,    16,    18,    19,    25,
+     129,   130,   131,   132,   133,   137,   138,   129,   166,   166,
+       4,     6,   166,   165,   165,   141,     4,    54,   165,   165,
+      52,    54,   166,   166,    30,    54,   111,    53,    54,   153,
+      35,    36,    37,   160,   161,   162,    51,    53,    51,    53,
+      51,    53,    51,    53,    54,   130,   163,    54,    52,    54,
+      54,     4,     6,     6,   165,   165,    52,    54,   165,     4,
+     165,    52,    54,    53,     6,    53,    53,    53,    54,   162,
+     166,   166,   166,   166,   166,   166,   166,   166,    54,     4,
+       4,     6,   166,   166,   141,    54,     4,   112,     6,     6,
+       6,     6,   166,   166,   166,   166,   166,   166,   166,   166,
+      54,    54,     4,    52,    54,    52,    54,   113,    54,     6,
+       6,     6,   166,   166,   166,   166,   166,   166,   166,   166,
+      54,    54,    53,    54,    54,     6,   166,   166,   166,   166,
+     166,   166,   166,   166,   154,    54,   166,   166,   166,   166,
+     166,   166,   165,   165,    33,   155,   156,   157,    52,    54,
+     166,   166,   166,   166,   165,   165,    53,    54,   157,     6,
+       6,   166,   166,   166,   166,     6,     6,     6,     6,     6,
+      52,    54,    54,   141,     4,     6,     6,    52,    54,   141,
+       4,    52,    54
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    55,    56,    56,    56,    56,    58,    57,    59,    57,
+      61,    60,    62,    62,    64,    63,    65,    65,    66,    66,
+      66,    67,    67,    67,    68,    69,    70,    71,    71,    71,
+      72,    72,    73,    73,    74,    74,    74,    74,    75,    76,
+      77,    78,    78,    78,    79,    79,    80,    80,    80,    81,
+      81,    82,    82,    83,    84,    83,    83,    83,    85,    83,
+      83,    86,    86,    86,    86,    86,    87,    88,    89,    90,
+      91,    92,    92,    94,    93,    95,    95,    96,    96,    97,
+      97,    97,    97,    97,    97,    97,    97,    97,    97,    98,
+      97,    97,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   109,   108,   110,   110,   112,   111,   113,   113,   114,
+     114,   115,   115,   115,   115,   115,   117,   116,   119,   118,
+     121,   120,   123,   122,   125,   124,   126,   126,   127,   127,
+     127,   127,   127,   127,   127,   127,   127,   127,   127,   128,
+     127,   129,   129,   130,   130,   130,   130,   130,   130,   130,
+     130,   131,   130,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,   141,   141,   142,   142,   143,   144,   144,   145,
+     145,   146,   146,   146,   147,   148,   149,   149,   150,   151,
+     151,   152,   152,   154,   153,   155,   155,   156,   156,   157,
+     158,   158,   159,   160,   160,   161,   161,   162,   162,   162,
+     163,   164,   164,   165,   165,   166,   166,   166,   166,   166,
+     166,   166,   166,   166,   166
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     1,     1,     0,    15,     0,     2,
+       0,     2,     1,     0,     0,     2,     0,     4,     4,     6,
+       6,     1,     1,     1,     6,     7,     7,     6,     6,     0,
+       0,     4,     0,     4,     0,     1,     1,     1,     6,     7,
+       9,     4,     4,     0,     4,     0,     4,     4,     0,     1,
+       0,     1,     2,     1,     0,     2,     1,     1,     0,     2,
+       1,     1,     1,     1,     1,     1,    11,    11,    10,     9,
+       8,    10,    10,     0,    10,     1,     0,     1,     2,     1,
+       1,     1,     1,     1,     1,     8,     1,     1,     1,     0,
+       2,     1,    10,    10,     9,    12,    12,    11,     8,     9,
+       9,     0,     9,     0,     2,     0,     5,     0,     2,     4,
+       4,     1,     1,     1,     1,     1,     0,    12,     0,    15,
+       0,    16,     0,    18,     0,    18,     1,     2,     1,     1,
+       1,     1,     1,     8,     8,    10,    10,     5,     5,     0,
+       2,     1,     2,     1,     1,     1,     1,     8,     8,    10,
+      10,     0,     2,    12,    12,    10,     9,     8,    13,    13,
+      11,    10,     1,     1,     1,     2,     3,     6,     6,     1,
+       1,     0,     2,     2,     8,     8,     1,     0,     6,     1,
+       0,     1,     2,     0,     9,     1,     0,     1,     2,     4,
+       1,     0,     6,     1,     0,     1,     2,     5,     5,     6,
+       5,     1,     0,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (void)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 5:
+#line 151 "parse_y.y" /* yacc.c:1646  */
+    { YYABORT; }
+#line 1795 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 6:
+#line 175 "parse_y.y" /* yacc.c:1646  */
+    {
+					/* reset flags for 'used layers';
+					 * init font and data pointers
+					 */
+				int	i;
+
+				if (!yyPCB)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
+					LayerFlag[i] = pcb_false;
+				yyFont = &yyPCB->fontkit.dflt;
+				yyFontkitValid = &yyPCB->fontkit.valid;
+				yyData = yyPCB->Data;
+				PCB_SET_PARENT(yyData, board, yyPCB);
+				yyData->LayerN = 0;
+				yyPCB->NetlistPatches = yyPCB->NetlistPatchLast = NULL;
+				layer_group_string = NULL;
+				old_fmt = 0;
+			}
+#line 1822 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 7:
+#line 211 "parse_y.y" /* yacc.c:1646  */
+    {
+			  pcb_board_t *pcb_save = PCB;
+			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
+					conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
+			  pcb_board_new_postproc(yyPCB, 0);
+			  if (layer_group_string == NULL) {
+			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
+			        pcb_message(PCB_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
+			        YYABORT;
+			     }
+			     pcb_message(PCB_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
+			  }
+			  else {
+			    if (pcb_layer_parse_group_string(yyPCB, layer_group_string, yyData->LayerN, old_fmt))
+			    {
+			      pcb_message(PCB_MSG_ERROR, "illegal layer-group string\n");
+			      YYABORT;
+			    }
+			    else {
+			     if (pcb_layer_improvise(yyPCB, pcb_false) != 0) {
+			        pcb_message(PCB_MSG_ERROR, "failed to extend-improvise the groups\n");
+			        YYABORT;
+			     }
+			    }
+			  }
+			/* initialize the polygon clipping now since
+			 * we didn't know the layer grouping before.
+			 */
+			free(layer_group_string);
+			PCB = yyPCB;
+			PCB_POLY_ALL_LOOP(yyData);
+			{
+			  pcb_poly_init_clip(yyData, layer, polygon);
+			}
+			PCB_ENDALL_LOOP;
+			PCB = pcb_save;
+			}
+#line 1864 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 8:
+#line 249 "parse_y.y" /* yacc.c:1646  */
+    { PreLoadElementPCB ();
+		    layer_group_string = NULL; }
+#line 1871 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 9:
+#line 252 "parse_y.y" /* yacc.c:1646  */
+    { LayerFlag[0] = pcb_true;
+		    LayerFlag[1] = pcb_true;
+		    yyData->LayerN = 2;
+		    PostLoadElementPCB ();
+		  }
+#line 1881 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 10:
+#line 260 "parse_y.y" /* yacc.c:1646  */
+    {
+					/* reset flags for 'used layers';
+					 * init font and data pointers
+					 */
+				int	i;
+
+				if (!yyData || !yyFont)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
+					LayerFlag[i] = pcb_false;
+				yyData->LayerN = 0;
+			}
+#line 1901 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 14:
+#line 285 "parse_y.y" /* yacc.c:1646  */
+    {
+					/* mark all symbols invalid */
+				int	i;
+
+				if (!yyFont)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				if (yyFontReset) {
+					pcb_font_free (yyFont);
+					yyFont->id = 0;
+				}
+				*yyFontkitValid = pcb_false;
+			}
+#line 1921 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 15:
+#line 301 "parse_y.y" /* yacc.c:1646  */
+    {
+				*yyFontkitValid = pcb_true;
+		  		pcb_font_set_info(yyFont);
+			}
+#line 1930 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 17:
+#line 329 "parse_y.y" /* yacc.c:1646  */
+    {
+  if (check_file_version ((yyvsp[-1].integer)) != 0)
+    {
+      YYABORT;
+    }
+}
+#line 1941 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 18:
+#line 359 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Name = (yyvsp[-1].string);
+				yyPCB->MaxWidth = PCB_MAX_COORD;
+				yyPCB->MaxHeight = PCB_MAX_COORD;
+				old_fmt = 1;
+			}
+#line 1952 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 19:
+#line 366 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Name = (yyvsp[-3].string);
+				yyPCB->MaxWidth = OU ((yyvsp[-2].measure));
+				yyPCB->MaxHeight = OU ((yyvsp[-1].measure));
+				old_fmt = 1;
+			}
+#line 1963 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 20:
+#line 373 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Name = (yyvsp[-3].string);
+				yyPCB->MaxWidth = NU ((yyvsp[-2].measure));
+				yyPCB->MaxHeight = NU ((yyvsp[-1].measure));
+				old_fmt = 0;
+			}
+#line 1974 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 24:
+#line 408 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Grid = OU ((yyvsp[-3].measure));
+				yyPCB->GridOffsetX = OU ((yyvsp[-2].measure));
+				yyPCB->GridOffsetY = OU ((yyvsp[-1].measure));
+			}
+#line 1984 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 25:
+#line 416 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Grid = OU ((yyvsp[-4].measure));
+				yyPCB->GridOffsetX = OU ((yyvsp[-3].measure));
+				yyPCB->GridOffsetY = OU ((yyvsp[-2].measure));
+				if (yy_settings_dest != CFR_invalid) {
+					if ((yyvsp[-1].integer))
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+					else
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+				}
+			}
+#line 2000 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 26:
+#line 431 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->Grid = NU ((yyvsp[-4].measure));
+				yyPCB->GridOffsetX = NU ((yyvsp[-3].measure));
+				yyPCB->GridOffsetY = NU ((yyvsp[-2].measure));
+				if (yy_settings_dest != CFR_invalid) {
+					if ((yyvsp[-1].integer))
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+					else
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+				}
+			}
+#line 2016 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 27:
+#line 465 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->CursorX = OU ((yyvsp[-3].measure));
+				yyPCB->CursorY = OU ((yyvsp[-2].measure));
+				yyPCB->Zoom = (yyvsp[-1].number)*2;
+			}
+#line 2026 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 28:
+#line 471 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->CursorX = NU ((yyvsp[-3].measure));
+				yyPCB->CursorY = NU ((yyvsp[-2].measure));
+				yyPCB->Zoom = (yyvsp[-1].number);
+			}
+#line 2036 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 31:
+#line 495 "parse_y.y" /* yacc.c:1646  */
+    {
+				/* Read in cmil^2 for now; in future this should be a noop. */
+				load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0);
+			}
+#line 2045 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 33:
+#line 522 "parse_y.y" /* yacc.c:1646  */
+    {
+				yyPCB->ThermScale = (yyvsp[-1].number);
+			}
+#line 2053 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 38:
+#line 561 "parse_y.y" /* yacc.c:1646  */
+    {
+				load_meta_coord("design/bloat", NU((yyvsp[-3].measure)));
+				load_meta_coord("design/shrink", NU((yyvsp[-2].measure)));
+				load_meta_coord("design/min_wid", NU((yyvsp[-1].measure)));
+				load_meta_coord("design/min_ring", NU((yyvsp[-1].measure)));
+			}
+#line 2064 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 39:
+#line 571 "parse_y.y" /* yacc.c:1646  */
+    {
+				load_meta_coord("design/bloat", NU((yyvsp[-4].measure)));
+				load_meta_coord("design/shrink", NU((yyvsp[-3].measure)));
+				load_meta_coord("design/min_wid", NU((yyvsp[-2].measure)));
+				load_meta_coord("design/min_slk", NU((yyvsp[-1].measure)));
+				load_meta_coord("design/min_ring", NU((yyvsp[-2].measure)));
+			}
+#line 2076 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 40:
+#line 582 "parse_y.y" /* yacc.c:1646  */
+    {
+				load_meta_coord("design/bloat", NU((yyvsp[-6].measure)));
+				load_meta_coord("design/shrink", NU((yyvsp[-5].measure)));
+				load_meta_coord("design/min_wid", NU((yyvsp[-4].measure)));
+				load_meta_coord("design/min_slk", NU((yyvsp[-3].measure)));
+				load_meta_coord("design/min_drill", NU((yyvsp[-2].measure)));
+				load_meta_coord("design/min_ring", NU((yyvsp[-1].measure)));
+			}
+#line 2089 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 41:
+#line 609 "parse_y.y" /* yacc.c:1646  */
+    {
+				yy_pcb_flags = pcb_flag_make((yyvsp[-1].integer) & PCB_FLAGS);
+			}
+#line 2097 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 42:
+#line 613 "parse_y.y" /* yacc.c:1646  */
+    {
+			  yy_pcb_flags = pcb_strflg_board_s2f((yyvsp[-1].string), yyerror);
+			  free((yyvsp[-1].string));
+			}
+#line 2106 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 44:
+#line 646 "parse_y.y" /* yacc.c:1646  */
+    {
+			  layer_group_string = (yyvsp[-1].string);
+			}
+#line 2114 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 46:
+#line 694 "parse_y.y" /* yacc.c:1646  */
+    {
+				if (pcb_route_string_parse((yyvsp[-1].string), &yyPCB->RouteStyle, "mil"))
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					YYABORT;
+				}
+				free((yyvsp[-1].string));
+			}
+#line 2127 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 703 "parse_y.y" /* yacc.c:1646  */
+    {
+				if (pcb_route_string_parse(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil"))
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					YYABORT;
+				}
+				free((yyvsp[-1].string));
+			}
+#line 2140 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 54:
+#line 726 "parse_y.y" /* yacc.c:1646  */
+    { attr_list = & yyPCB->Attributes; }
+#line 2146 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 58:
+#line 730 "parse_y.y" /* yacc.c:1646  */
+    {
+					/* clear pointer to force memory allocation by
+					 * the appropriate subroutine
+					 */
+				yysubc = NULL;
+			}
+#line 2157 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 60:
+#line 737 "parse_y.y" /* yacc.c:1646  */
+    { YYABORT; }
+#line 2163 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 66:
+#line 782 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_old_via_new(yyData, NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)),
+				                     NU ((yyvsp[-3].measure)), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+				free ((yyvsp[-2].string));
+			}
+#line 2173 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 67:
+#line 792 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_old_via_new(yyData, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string),
+					pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2183 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 68:
+#line 803 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_old_via_new(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)),
+					     OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2193 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 69:
+#line 813 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_old_via_new(yyData, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU((yyvsp[-4].measure)) + 2*PCB_MASKFRAME,  OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2203 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 70:
+#line 823 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_coord_t	hole = (OU((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE);
+
+					/* make sure that there's enough copper left */
+				if (OU((yyvsp[-3].measure)) - hole < PCB_MIN_PINORVIACOPPER &&
+					OU((yyvsp[-3].measure)) > PCB_MIN_PINORVIACOPPER)
+					hole = OU((yyvsp[-3].measure)) - PCB_MIN_PINORVIACOPPER;
+
+				pcb_old_via_new(yyData, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2220 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 71:
+#line 859 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_rat_new(yyData, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer),
+					conf_core.appearance.rat_thickness, (yyvsp[-1].flagtype));
+			}
+#line 2229 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 72:
+#line 864 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_rat_new(yyData, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer),
+					conf_core.appearance.rat_thickness, pcb_flag_old((yyvsp[-1].integer)));
+			}
+#line 2238 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 73:
+#line 895 "parse_y.y" /* yacc.c:1646  */
+    {
+				if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > PCB_MAX_LAYER)
+				{
+					yyerror("Layernumber out of range");
+					YYABORT;
+				}
+				if (LayerFlag[(yyvsp[-4].integer)-1])
+				{
+					yyerror("Layernumber used twice");
+					YYABORT;
+				}
+				Layer = &yyData->Layer[(yyvsp[-4].integer)-1];
+				Layer->parent.data = yyData;
+				Layer->parent_type = PCB_PARENT_DATA;
+				Layer->type = PCB_OBJ_LAYER;
+
+					/* memory for name is already allocated */
+				if (Layer->name != NULL)
+					free((char*)Layer->name);
+				Layer->name = (yyvsp[-3].string);   /* shouldn't this be strdup()'ed ? */
+				LayerFlag[(yyvsp[-4].integer)-1] = pcb_true;
+				if (yyData->LayerN < (yyvsp[-4].integer))
+				  yyData->LayerN = (yyvsp[-4].integer);
+				if ((yyvsp[-2].string) != NULL)
+					free((yyvsp[-2].string));
+			}
+#line 2269 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 85:
+#line 943 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_poly_new_from_rectangle(Layer,
+					OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), 0, pcb_flag_old((yyvsp[-1].integer)));
+			}
+#line 2278 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 89:
+#line 950 "parse_y.y" /* yacc.c:1646  */
+    { attr_list = & Layer->Attributes; }
+#line 2284 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 92:
+#line 982 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_line_new(Layer, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)),
+				                            NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), (yyvsp[-1].flagtype));
+			}
+#line 2293 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 93:
+#line 991 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_line_new(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)),
+						     OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer)));
+			}
+#line 2302 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 94:
+#line 1000 "parse_y.y" /* yacc.c:1646  */
+    {
+				/* eliminate old-style rat-lines */
+			if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0)
+				pcb_line_new(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)),
+					200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure))));
+			}
+#line 2313 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 95:
+#line 1048 "parse_y.y" /* yacc.c:1646  */
+    {
+			  pcb_arc_new(Layer, NU ((yyvsp[-9].measure)), NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number),
+			                             NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype), pcb_true);
+			}
+#line 2322 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 96:
+#line 1057 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_arc_new(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number),
+						    OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), pcb_flag_old((yyvsp[-1].integer)), pcb_true);
+			}
+#line 2331 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 97:
+#line 1066 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_arc_new(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number),
+					OU ((yyvsp[-4].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer)), pcb_true);
+			}
+#line 2340 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 98:
+#line 1103 "parse_y.y" /* yacc.c:1646  */
+    {
+					/* use a default scale of 100% */
+				pcb_text_new(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2350 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 99:
+#line 1113 "parse_y.y" /* yacc.c:1646  */
+    {
+				if ((yyvsp[-1].integer) & PCB_FLAG_ONSILK)
+				{
+					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
+						(((yyvsp[-1].integer) & PCB_FLAG_ONSOLDER) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE) - 2];
+
+					pcb_text_new(lay ,yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
+						      pcb_flag_old((yyvsp[-1].integer)));
+				}
+				else
+					pcb_text_new(Layer, yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
+						      pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2369 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 100:
+#line 1131 "parse_y.y" /* yacc.c:1646  */
+    {
+				/* FIXME: shouldn't know about .f */
+				/* I don't think this matters because anything with hi_format
+				 * will have the silk on its own layer in the file rather
+				 * than using the PCB_FLAG_ONSILK and having it in a copper layer.
+				 * Thus there is no need for anything besides the 'else'
+				 * part of this code.
+				 */
+				if ((yyvsp[-1].flagtype).f & PCB_FLAG_ONSILK)
+				{
+					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
+						(((yyvsp[-1].flagtype).f & PCB_FLAG_ONSOLDER) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE) - 2];
+
+					pcb_text_new(lay, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+				}
+				else
+					pcb_text_new(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+				free ((yyvsp[-2].string));
+			}
+#line 2393 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 101:
+#line 1180 "parse_y.y" /* yacc.c:1646  */
+    {
+				Polygon = pcb_poly_new(Layer, 0, (yyvsp[-2].flagtype));
+			}
+#line 2401 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 102:
+#line 1185 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_cardinal_t contour, contour_start, contour_end;
+				pcb_bool bad_contour_found = pcb_false;
+				/* ignore junk */
+				for (contour = 0; contour <= Polygon->HoleIndexN; contour++)
+				  {
+				    contour_start = (contour == 0) ?
+						      0 : Polygon->HoleIndex[contour - 1];
+				    contour_end = (contour == Polygon->HoleIndexN) ?
+						 Polygon->PointN :
+						 Polygon->HoleIndex[contour];
+				    if (contour_end - contour_start < 3)
+				      bad_contour_found = pcb_true;
+				  }
+
+				if (bad_contour_found)
+				  {
+				    pcb_message(PCB_MSG_WARNING, "WARNING parsing file '%s'\n"
+					    "    line:        %i\n"
+					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
+					    yyfilename, pcb_lineno);
+				    pcb_destroy_object(yyData, PCB_OBJ_POLY, Layer, Polygon, Polygon);
+				  }
+				else
+				  {
+				    pcb_poly_bbox(Polygon);
+				    if (!Layer->polygon_tree)
+				      Layer->polygon_tree = pcb_r_create_tree();
+				    pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+				  }
+			}
+#line 2437 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 105:
+#line 1225 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_poly_hole_new(Polygon);
+			}
+#line 2445 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 109:
+#line 1239 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_poly_point_new(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
+			}
+#line 2453 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 110:
+#line 1243 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_poly_point_new(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
+			}
+#line 2461 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 116:
+#line 1314 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(),
+					(yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), pcb_false);
+				free ((yyvsp[-6].string));
+				free ((yyvsp[-5].string));
+				pin_num = 1;
+			}
+#line 2473 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 117:
+#line 1322 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_fin(yyData);
+			}
+#line 2481 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 118:
+#line 1332 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-9].integer)),
+					(yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false);
+				free ((yyvsp[-8].string));
+				free ((yyvsp[-7].string));
+				pin_num = 1;
+			}
+#line 2493 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 119:
+#line 1340 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_fin(yyData);
+			}
+#line 2501 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 120:
+#line 1350 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-10].integer)),
+					(yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false);
+				free ((yyvsp[-9].string));
+				free ((yyvsp[-8].string));
+				free ((yyvsp[-7].string));
+				pin_num = 1;
+			}
+#line 2514 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 121:
+#line 1359 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_fin(yyData);
+			}
+#line 2522 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 122:
+#line 1370 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-12].integer)),
+					(yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)),
+					(yyvsp[-4].number), (yyvsp[-3].number), pcb_flag_old((yyvsp[-2].integer)), pcb_false);
+				yysubc_ox = OU ((yyvsp[-8].measure));
+				yysubc_oy = OU ((yyvsp[-7].measure));
+				free ((yyvsp[-11].string));
+				free ((yyvsp[-10].string));
+				free ((yyvsp[-9].string));
+			}
+#line 2537 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 123:
+#line 1381 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_fin(yyData);
+			}
+#line 2545 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 124:
+#line 1392 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, (yyvsp[-12].flagtype),
+					(yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)),
+					(yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].flagtype), pcb_false);
+				yysubc_ox = NU ((yyvsp[-8].measure));
+				yysubc_oy = NU ((yyvsp[-7].measure));
+				free ((yyvsp[-11].string));
+				free ((yyvsp[-10].string));
+				free ((yyvsp[-9].string));
+			}
+#line 2560 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 125:
+#line 1403 "parse_y.y" /* yacc.c:1646  */
+    {
+				if (pcb_subc_is_empty(yysubc)) {
+					pcb_subc_free(yysubc);
+					yysubc = NULL;
+				}
+				else {
+					io_pcb_element_fin(yyData);
+				}
+			}
+#line 2574 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 133:
+#line 1489 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
+			}
+#line 2582 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 134:
+#line 1494 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
+			}
+#line 2590 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 135:
+#line 1499 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure)));
+			}
+#line 2598 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 136:
+#line 1504 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure)));
+			}
+#line 2606 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 137:
+#line 1509 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc_ox = NU ((yyvsp[-2].measure));
+				yysubc_oy = NU ((yyvsp[-1].measure));
+			}
+#line 2615 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 138:
+#line 1514 "parse_y.y" /* yacc.c:1646  */
+    {
+				yysubc_ox = OU ((yyvsp[-2].measure));
+				yysubc_oy = OU ((yyvsp[-1].measure));
+			}
+#line 2624 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 139:
+#line 1518 "parse_y.y" /* yacc.c:1646  */
+    { attr_list = & yysubc->Attributes; }
+#line 2630 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 147:
+#line 1533 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)) + yysubc_ox,
+					NU ((yyvsp[-4].measure)) + yysubc_oy, NU ((yyvsp[-3].measure)) + yysubc_ox,
+					NU ((yyvsp[-2].measure)) + yysubc_oy, NU ((yyvsp[-1].measure)));
+			}
+#line 2640 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 148:
+#line 1539 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)) + yysubc_ox,
+					OU ((yyvsp[-4].measure)) + yysubc_oy, OU ((yyvsp[-3].measure)) + yysubc_ox,
+					OU ((yyvsp[-2].measure)) + yysubc_oy, OU ((yyvsp[-1].measure)));
+			}
+#line 2650 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 149:
+#line 1546 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)) + yysubc_ox,
+					NU ((yyvsp[-6].measure)) + yysubc_oy, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure)));
+			}
+#line 2659 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 150:
+#line 1551 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)) + yysubc_ox,
+					OU ((yyvsp[-6].measure)) + yysubc_oy, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure)));
+			}
+#line 2668 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 151:
+#line 1555 "parse_y.y" /* yacc.c:1646  */
+    { attr_list = & yysubc->Attributes; }
+#line 2674 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 153:
+#line 1597 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_pstk_t *pin = io_pcb_element_pin_new(yysubc, NU ((yyvsp[-9].measure)) + yysubc_ox,
+					NU ((yyvsp[-8].measure)) + yysubc_oy, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].string),
+					(yyvsp[-2].string), (yyvsp[-1].flagtype));
+				pcb_attrib_compat_set_intconn(&pin->Attributes, yy_intconn);
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2687 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 154:
+#line 1610 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-9].measure)) + yysubc_ox,
+					OU ((yyvsp[-8].measure)) + yysubc_oy, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string),
+					(yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2699 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 155:
+#line 1622 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU ((yyvsp[-5].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2710 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 156:
+#line 1633 "parse_y.y" /* yacc.c:1646  */
+    {
+				char	p_number[8];
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer)));
+
+				free ((yyvsp[-2].string));
+			}
+#line 2724 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 157:
+#line 1649 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_coord_t	hole = OU ((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE;
+				char	p_number[8];
+
+					/* make sure that there's enough copper left */
+				if (OU ((yyvsp[-3].measure)) - hole < PCB_MIN_PINORVIACOPPER &&
+					OU ((yyvsp[-3].measure)) > PCB_MIN_PINORVIACOPPER)
+					hole = OU ((yyvsp[-3].measure)) - PCB_MIN_PINORVIACOPPER;
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pin_new(yysubc, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2743 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 158:
+#line 1703 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_pstk_t *pad = io_pcb_element_pad_new(yysubc, NU ((yyvsp[-10].measure)) + yysubc_ox,
+					NU ((yyvsp[-9].measure)) + yysubc_oy,
+					NU ((yyvsp[-8].measure)) + yysubc_ox,
+					NU ((yyvsp[-7].measure)) + yysubc_oy, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)),
+					(yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+				pcb_attrib_compat_set_intconn(&pad->Attributes, yy_intconn);
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2758 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 159:
+#line 1718 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_pad_new(yysubc,OU ((yyvsp[-10].measure)) + yysubc_ox,
+					OU ((yyvsp[-9].measure)) + yysubc_oy, OU ((yyvsp[-8].measure)) + yysubc_ox,
+					OU ((yyvsp[-7].measure)) + yysubc_oy, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)),
+					(yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2771 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 160:
+#line 1731 "parse_y.y" /* yacc.c:1646  */
+    {
+				io_pcb_element_pad_new(yysubc,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2782 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 161:
+#line 1742 "parse_y.y" /* yacc.c:1646  */
+    {
+				char		p_number[8];
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pad_new(yysubc,OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)),OU ((yyvsp[-3].measure)), 2*PCB_GROUNDPLANEFRAME,
+					OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer)));
+				free ((yyvsp[-2].string));
+			}
+#line 2795 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 162:
+#line 1752 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.flagtype) = pcb_flag_old((yyvsp[0].integer)); }
+#line 2801 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 163:
+#line 1753 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.flagtype) = pcb_strflg_s2f((yyvsp[0].string), yyerror, &yy_intconn, 1); free((yyvsp[0].string)); }
+#line 2807 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 167:
+#line 1783 "parse_y.y" /* yacc.c:1646  */
+    {
+				if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION)
+				{
+					yyerror("fontposition out of range");
+					YYABORT;
+				}
+				Symbol = &yyFont->Symbol[(yyvsp[-3].integer)];
+				if (Symbol->Valid)
+				{
+					yyerror("symbol ID used twice");
+					YYABORT;
+				}
+				Symbol->Valid = pcb_true;
+				Symbol->Delta = NU ((yyvsp[-2].measure));
+			}
+#line 2827 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 168:
+#line 1799 "parse_y.y" /* yacc.c:1646  */
+    {
+				if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION)
+				{
+					yyerror("fontposition out of range");
+					YYABORT;
+				}
+				Symbol = &yyFont->Symbol[(yyvsp[-3].integer)];
+				if (Symbol->Valid)
+				{
+					yyerror("symbol ID used twice");
+					YYABORT;
+				}
+				Symbol->Valid = pcb_true;
+				Symbol->Delta = OU ((yyvsp[-2].measure));
+			}
+#line 2847 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 174:
+#line 1846 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_font_new_line_in_sym(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure)));
+			}
+#line 2855 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 175:
+#line 1853 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_font_new_line_in_sym(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure)));
+			}
+#line 2863 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 183:
+#line 1908 "parse_y.y" /* yacc.c:1646  */
+    {
+				Menu = pcb_lib_net_new((pcb_lib_t *)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string));
+				free ((yyvsp[-3].string));
+				free ((yyvsp[-2].string));
+			}
+#line 2873 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 189:
+#line 1943 "parse_y.y" /* yacc.c:1646  */
+    {
+				pcb_lib_conn_new(Menu, (yyvsp[-1].string));
+				free ((yyvsp[-1].string));
+			}
+#line 2882 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 197:
+#line 1990 "parse_y.y" /* yacc.c:1646  */
+    { pcb_ratspatch_append(yyPCB, RATP_ADD_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
+#line 2888 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 198:
+#line 1991 "parse_y.y" /* yacc.c:1646  */
+    { pcb_ratspatch_append(yyPCB, RATP_DEL_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
+#line 2894 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 199:
+#line 1992 "parse_y.y" /* yacc.c:1646  */
+    { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string)); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); }
+#line 2900 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 200:
+#line 2020 "parse_y.y" /* yacc.c:1646  */
+    {
+				char *old_val, *key = (yyvsp[-2].string), *val = (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)"";
+				old_val = pcb_attribute_get(attr_list, key);
+				if (old_val != NULL)
+					pcb_message(PCB_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
+				else
+					pcb_attribute_put(attr_list, key, val);
+				free(key);
+				free(val);
+			}
+#line 2915 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 201:
+#line 2032 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.string) = (yyvsp[0].string); }
+#line 2921 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 202:
+#line 2033 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.string) = 0; }
+#line 2927 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 203:
+#line 2037 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.number) = (yyvsp[0].number); }
+#line 2933 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 204:
+#line 2038 "parse_y.y" /* yacc.c:1646  */
+    { (yyval.number) = (yyvsp[0].integer); }
+#line 2939 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 205:
+#line 2043 "parse_y.y" /* yacc.c:1646  */
+    { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); }
+#line 2945 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 206:
+#line 2044 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2951 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 207:
+#line 2045 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2957 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 208:
+#line 2046 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2963 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 209:
+#line 2047 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2969 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 210:
+#line 2048 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
+#line 2975 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 211:
+#line 2049 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2981 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 212:
+#line 2050 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2987 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 213:
+#line 2051 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2993 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+  case 214:
+#line 2052 "parse_y.y" /* yacc.c:1646  */
+    { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+#line 2999 "parse_y.c" /* yacc.c:1646  */
+    break;
+
+
+#line 3003 "parse_y.c" /* yacc.c:1646  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
+#line 2055 "parse_y.y" /* yacc.c:1906  */
+
+
+/* ---------------------------------------------------------------------------
+ * error routine called by parser library
+ */
+int yyerror(const char * s)
+{
+	pcb_message(PCB_MSG_ERROR, "ERROR parsing file '%s'\n"
+		"    line:        %i\n"
+		"    description: '%s'\n",
+		yyfilename, pcb_lineno, s);
+	return(0);
+}
+
+int pcb_wrap()
+{
+  return 1;
+}
+
+static int
+check_file_version (int ver)
+{
+  if ( ver > PCB_FILE_VERSION ) {
+    pcb_message(PCB_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
+	     "which is too new for this version of pcb.  To load this file\n"
+	     "you need a version of pcb which is >= %d.  If you are\n"
+	     "using a version built from git source, the source date\n"
+	     "must be >= %d.  This copy of pcb can only read files\n"
+	     "up to file version %d.\n", ver, ver, PCB_FILE_VERSION);
+    return 1;
+  }
+
+  return 0;
+}
+
+static void
+do_measure (PLMeasure *m, pcb_coord_t i, double d, int u)
+{
+  m->ival = i;
+  m->bval = pcb_round (d);
+  m->dval = d;
+  m->has_units = u;
+}
+
+static int
+integer_value (PLMeasure m)
+{
+  if (m.has_units)
+    yyerror("units ignored here");
+  return m.ival;
+}
+
+static pcb_coord_t
+old_units (PLMeasure m)
+{
+  if (m.has_units)
+    return m.bval;
+  if (m.ival != 0)
+    pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
+  return pcb_round (PCB_MIL_TO_COORD (m.ival));
+}
+
+static pcb_coord_t
+new_units (PLMeasure m)
+{
+  if (m.has_units)
+    return m.bval;
+  if (m.dval != 0)
+    pcb_io_pcb_usty_seen |= PCB_USTY_CMIL;
+  /* if there's no unit m.dval already contains the converted value */
+  return pcb_round (m.dval);
+}
+
+/* This converts old flag bits (from saved PCB files) to new format.  */
+static pcb_flag_t pcb_flag_old(unsigned int flags)
+{
+	pcb_flag_t rv;
+	int i, f;
+	memset(&rv, 0, sizeof(rv));
+	/* If we move flag bits around, this is where we map old bits to them.  */
+	rv.f = flags & 0xffff;
+	f = 0x10000;
+	for (i = 0; i < 8; i++) {
+		/* use the closest thing to the old thermal style */
+		if (flags & f)
+			rv.t[i / 2] |= (1 << (4 * (i % 2)));
+		f <<= 1;
+	}
+	return rv;
+}
+
+/* load a board metadata into conf_core */
+static void load_meta_coord(const char *path, pcb_coord_t crd)
+{
+	char tmp[128];
+	pcb_sprintf(tmp, "%$mm", crd);
+	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+}
+
+static void load_meta_float(const char *path, double val)
+{
+	char tmp[128];
+	pcb_sprintf(tmp, "%f", val);
+	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+}
Index: tags/2.0.1/src_plugins/io_pcb/parse_y.h
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_y.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_y.h	(revision 18980)
@@ -0,0 +1,123 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_PCB_PARSE_Y_H_INCLUDED
+# define YY_PCB_PARSE_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int pcb_debug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    FLOATING = 258,
+    INTEGER = 259,
+    CHAR_CONST = 260,
+    STRING = 261,
+    T_FILEVERSION = 262,
+    T_PCB = 263,
+    T_LAYER = 264,
+    T_VIA = 265,
+    T_RAT = 266,
+    T_LINE = 267,
+    T_ARC = 268,
+    T_RECTANGLE = 269,
+    T_TEXT = 270,
+    T_ELEMENTLINE = 271,
+    T_ELEMENT = 272,
+    T_PIN = 273,
+    T_PAD = 274,
+    T_GRID = 275,
+    T_FLAGS = 276,
+    T_SYMBOL = 277,
+    T_SYMBOLLINE = 278,
+    T_CURSOR = 279,
+    T_ELEMENTARC = 280,
+    T_MARK = 281,
+    T_GROUPS = 282,
+    T_STYLES = 283,
+    T_POLYGON = 284,
+    T_POLYGON_HOLE = 285,
+    T_NETLIST = 286,
+    T_NET = 287,
+    T_CONN = 288,
+    T_NETLISTPATCH = 289,
+    T_ADD_CONN = 290,
+    T_DEL_CONN = 291,
+    T_CHANGE_ATTRIB = 292,
+    T_AREA = 293,
+    T_THERMAL = 294,
+    T_DRC = 295,
+    T_ATTRIBUTE = 296,
+    T_UMIL = 297,
+    T_CMIL = 298,
+    T_MIL = 299,
+    T_IN = 300,
+    T_NM = 301,
+    T_UM = 302,
+    T_MM = 303,
+    T_M = 304,
+    T_KM = 305
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 121 "parse_y.y" /* yacc.c:1909  */
+
+	int		integer;
+	double		number;
+	char		*string;
+	pcb_flag_t	flagtype;
+	PLMeasure	measure;
+
+#line 113 "parse_y.h" /* yacc.c:1909  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE pcb_lval;
+
+int pcb_parse (void);
+
+#endif /* !YY_PCB_PARSE_Y_H_INCLUDED  */
Index: tags/2.0.1/src_plugins/io_pcb/parse_y.y
===================================================================
--- tags/2.0.1/src_plugins/io_pcb/parse_y.y	(nonexistent)
+++ tags/2.0.1/src_plugins/io_pcb/parse_y.y	(revision 18980)
@@ -0,0 +1,2159 @@
+
+/*
+ * ************************** README *******************
+ *
+ * If the file format is modified in any way, update
+ * PCB_FILE_VERSION in file.h
+ *
+ * ************************** README *******************
+ */
+
+%{
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* grammar to parse ASCII input of PCB description
+ */
+
+#include "config.h"
+#include "flag.h"
+#include "board.h"
+#include "conf_core.h"
+#include "layer.h"
+#include "data.h"
+#include "error.h"
+#include "file.h"
+#include "parse_l.h"
+#include "polygon.h"
+#include "remove.h"
+#include "rtree.h"
+#include "flag_str.h"
+#include "obj_pinvia_therm.h"
+#include "rats_patch.h"
+#include "route_style.h"
+#include "compat_misc.h"
+#include "src_plugins/lib_compat_help/pstk_compat.h"
+
+static	pcb_layer_t *Layer;
+static	pcb_poly_t *Polygon;
+static	pcb_symbol_t *Symbol;
+static	int		pin_num;
+static	pcb_lib_menu_t *Menu;
+static	pcb_bool			LayerFlag[PCB_MAX_LAYER + 2];
+static	int	old_fmt; /* 1 if we are reading a PCB(), 0 if PCB[] */
+static	unsigned char yy_intconn;
+
+extern	char			*yytext;		/* defined by LEX */
+extern	pcb_board_t *	yyPCB;
+extern	pcb_data_t *	yyData;
+extern	pcb_subc_t *yysubc;
+extern	pcb_coord_t yysubc_ox, yysubc_oy;
+extern	pcb_font_t *	yyFont;
+extern	pcb_bool	yyFontReset;
+extern	int				pcb_lineno;		/* linenumber */
+extern	char			*yyfilename;	/* in this file */
+extern	conf_role_t yy_settings_dest;
+extern pcb_flag_t yy_pcb_flags;
+extern int *yyFontkitValid;
+
+static char *layer_group_string;
+
+static pcb_attribute_list_t *attr_list;
+
+int yyerror(const char *s);
+int yylex();
+static int check_file_version (int);
+
+static void do_measure (PLMeasure *m, pcb_coord_t i, double d, int u);
+#define M(r,f,d) do_measure (&(r), f, d, 1)
+
+/* Macros for interpreting what "measure" means - integer value only,
+   old units (mil), or new units (cmil).  */
+#define IV(m) integer_value (m)
+#define OU(m) old_units (m)
+#define NU(m) new_units (m)
+
+static int integer_value (PLMeasure m);
+static pcb_coord_t old_units (PLMeasure m);
+static pcb_coord_t new_units (PLMeasure m);
+static pcb_flag_t pcb_flag_old(unsigned int flags);
+static void load_meta_coord(const char *path, pcb_coord_t crd);
+static void load_meta_float(const char *path, double val);
+
+#define YYDEBUG 1
+#define YYERROR_VERBOSE 1
+
+#include "parse_y.h"
+
+%}
+
+%name-prefix "pcb_"
+
+%verbose
+
+%union									/* define YYSTACK type */
+{
+	int		integer;
+	double		number;
+	char		*string;
+	pcb_flag_t	flagtype;
+	PLMeasure	measure;
+}
+
+%token	<number>	FLOATING		/* line thickness, coordinates ... */
+%token	<integer>	INTEGER	CHAR_CONST	/* flags ... */
+%token	<string>	STRING			/* element names ... */
+
+%token	T_FILEVERSION T_PCB T_LAYER T_VIA T_RAT T_LINE T_ARC T_RECTANGLE T_TEXT T_ELEMENTLINE
+%token	T_ELEMENT T_PIN T_PAD T_GRID T_FLAGS T_SYMBOL T_SYMBOLLINE T_CURSOR
+%token	T_ELEMENTARC T_MARK T_GROUPS T_STYLES T_POLYGON T_POLYGON_HOLE T_NETLIST T_NET T_CONN
+%token	T_NETLISTPATCH T_ADD_CONN T_DEL_CONN T_CHANGE_ATTRIB
+%token	T_AREA T_THERMAL T_DRC T_ATTRIBUTE
+%token	T_UMIL T_CMIL T_MIL T_IN T_NM T_UM T_MM T_M T_KM
+%type	<integer>	symbolid
+%type	<string>	opt_string
+%type	<flagtype>	flags
+%type	<number>	number
+%type	<measure>	measure
+
+%%
+
+parse
+		: parsepcb
+		| parsedata
+		| parsefont
+		| error { YYABORT; }
+		;
+
+/* %start-doc pcbfile 00pcb
+@nodetype subsection
+@nodename %s syntax
+
+A special note about units: Older versions of @code{pcb} used mils
+(1/1000 inch) as the base unit; a value of 500 in the file meant
+half an inch.  Newer versions uses a "high resolution" syntax,
+where the base unit is 1/100 of a mil (0.000010 inch); a value of 500 in
+the file means 5 mils.  As a general rule, the variants of each entry
+listed below which use square brackets are the high resolution formats
+and use the 1/100 mil units, and the ones with parentheses are the older
+variants and use 1 mil units.  Note that when multiple variants
+are listed, the most recent (and most preferred) format is the first
+listed.
+
+Symbolic and numeric flags (SFlags and NFlags) are described in
+@ref{Object Flags}.
+
+%end-doc */
+
+parsepcb
+		:	{
+					/* reset flags for 'used layers';
+					 * init font and data pointers
+					 */
+				int	i;
+
+				if (!yyPCB)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
+					LayerFlag[i] = pcb_false;
+				yyFont = &yyPCB->fontkit.dflt;
+				yyFontkitValid = &yyPCB->fontkit.valid;
+				yyData = yyPCB->Data;
+				PCB_SET_PARENT(yyData, board, yyPCB);
+				yyData->LayerN = 0;
+				yyPCB->NetlistPatches = yyPCB->NetlistPatchLast = NULL;
+				layer_group_string = NULL;
+				old_fmt = 0;
+			}
+		  pcbfileversion
+		  pcbname
+		  pcbgrid
+		  pcbcursor
+		  polyarea
+		  pcbthermal
+		  pcbdrc
+		  pcbflags
+		  pcbgroups
+		  pcbstyles
+		  pcbfont
+		  pcbdata
+		  pcbnetlist
+		  pcbnetlistpatch
+			{
+			  pcb_board_t *pcb_save = PCB;
+			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
+					conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
+			  pcb_board_new_postproc(yyPCB, 0);
+			  if (layer_group_string == NULL) {
+			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
+			        pcb_message(PCB_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
+			        YYABORT;
+			     }
+			     pcb_message(PCB_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
+			  }
+			  else {
+			    if (pcb_layer_parse_group_string(yyPCB, layer_group_string, yyData->LayerN, old_fmt))
+			    {
+			      pcb_message(PCB_MSG_ERROR, "illegal layer-group string\n");
+			      YYABORT;
+			    }
+			    else {
+			     if (pcb_layer_improvise(yyPCB, pcb_false) != 0) {
+			        pcb_message(PCB_MSG_ERROR, "failed to extend-improvise the groups\n");
+			        YYABORT;
+			     }
+			    }
+			  }
+			/* initialize the polygon clipping now since
+			 * we didn't know the layer grouping before.
+			 */
+			free(layer_group_string);
+			PCB = yyPCB;
+			PCB_POLY_ALL_LOOP(yyData);
+			{
+			  pcb_poly_init_clip(yyData, layer, polygon);
+			}
+			PCB_ENDALL_LOOP;
+			PCB = pcb_save;
+			}
+
+		| { PreLoadElementPCB ();
+		    layer_group_string = NULL; }
+		  element
+		  { LayerFlag[0] = pcb_true;
+		    LayerFlag[1] = pcb_true;
+		    yyData->LayerN = 2;
+		    PostLoadElementPCB ();
+		  }
+		;
+
+parsedata
+		:	{
+					/* reset flags for 'used layers';
+					 * init font and data pointers
+					 */
+				int	i;
+
+				if (!yyData || !yyFont)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
+					LayerFlag[i] = pcb_false;
+				yyData->LayerN = 0;
+			}
+		 pcbdata
+		;
+
+pcbfont
+		: parsefont
+		|
+		;
+
+parsefont
+		:
+			{
+					/* mark all symbols invalid */
+				int	i;
+
+				if (!yyFont)
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					YYABORT;
+				}
+				if (yyFontReset) {
+					pcb_font_free (yyFont);
+					yyFont->id = 0;
+				}
+				*yyFontkitValid = pcb_false;
+			}
+		  symbols
+			{
+				*yyFontkitValid = pcb_true;
+		  		pcb_font_set_info(yyFont);
+			}
+		;
+
+/* %start-doc pcbfile FileVersion
+
+@syntax
+FileVersion[Version]
+@end syntax
+
+@table @var
+@item Version
+File format version.  This version number represents the date when the pcb file
+format was last changed.
+@end table
+
+Any version of pcb build from sources equal to or newer
+than this number should be able to read the file.  If this line is not present
+in the input file then file format compatibility is not checked.
+
+
+%end-doc */
+
+pcbfileversion
+: |
+T_FILEVERSION '[' INTEGER ']'
+{
+  if (check_file_version ($3) != 0)
+    {
+      YYABORT;
+    }
+}
+;
+
+/* %start-doc pcbfile PCB
+
+@syntax
+PCB ["Name" Width Height]
+PCB ("Name" Width Height]
+PCB ("Name")
+@end syntax
+
+@table @var
+@item Name
+Name of the PCB project
+@item Width Height
+Size of the board
+@end table
+
+If you don't specify the size of the board, a very large default is
+chosen.
+
+%end-doc */
+
+pcbname
+		: T_PCB '(' STRING ')'
+			{
+				yyPCB->Name = $3;
+				yyPCB->MaxWidth = PCB_MAX_COORD;
+				yyPCB->MaxHeight = PCB_MAX_COORD;
+				old_fmt = 1;
+			}
+		| T_PCB '(' STRING measure measure ')'
+			{
+				yyPCB->Name = $3;
+				yyPCB->MaxWidth = OU ($4);
+				yyPCB->MaxHeight = OU ($5);
+				old_fmt = 1;
+			}
+		| T_PCB '[' STRING measure measure ']'
+			{
+				yyPCB->Name = $3;
+				yyPCB->MaxWidth = NU ($4);
+				yyPCB->MaxHeight = NU ($5);
+				old_fmt = 0;
+			}
+		;
+
+/* %start-doc pcbfile Grid
+
+@syntax
+Grid [Step OffsetX OffsetY Visible]
+Grid (Step OffsetX OffsetY Visible)
+Grid (Step OffsetX OffsetY)
+@end syntax
+
+@table @var
+@item Step
+Distance from one grid point to adjacent points.  This value may be a
+floating point number for the first two variants.
+@item OffsetX OffsetY
+The "origin" of the grid.  Normally zero.
+@item Visible
+If non-zero, the grid will be visible on the screen.
+@end table
+
+%end-doc */
+
+pcbgrid
+		: pcbgridold
+		| pcbgridnew
+		| pcbhigrid
+		;
+pcbgridold
+		: T_GRID '(' measure measure measure ')'
+			{
+				yyPCB->Grid = OU ($3);
+				yyPCB->GridOffsetX = OU ($4);
+				yyPCB->GridOffsetY = OU ($5);
+			}
+		;
+pcbgridnew
+		: T_GRID '(' measure measure measure INTEGER ')'
+			{
+				yyPCB->Grid = OU ($3);
+				yyPCB->GridOffsetX = OU ($4);
+				yyPCB->GridOffsetY = OU ($5);
+				if (yy_settings_dest != CFR_invalid) {
+					if ($6)
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+					else
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+				}
+			}
+		;
+
+pcbhigrid
+		: T_GRID '[' measure measure measure INTEGER ']'
+			{
+				yyPCB->Grid = NU ($3);
+				yyPCB->GridOffsetX = NU ($4);
+				yyPCB->GridOffsetY = NU ($5);
+				if (yy_settings_dest != CFR_invalid) {
+					if ($6)
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+					else
+						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+				}
+			}
+		;
+
+/* %start-doc pcbfile Cursor
+
+@syntax
+Cursor [X Y Zoom]
+Cursor (X Y Zoom)
+@end syntax
+
+@table @var
+@item X Y
+Location of the cursor when the board was saved.
+@item Zoom
+The current zoom factor.  Note that a zoom factor of "0" means 1 mil
+per screen pixel, N means @math{2^N} mils per screen pixel, etc.  The
+first variant accepts floating point numbers.  The special value
+"1000" means "zoom to fit"
+@end table
+
+%end-doc */
+
+pcbcursor
+		: T_CURSOR '(' measure measure number ')'
+			{
+				yyPCB->CursorX = OU ($3);
+				yyPCB->CursorY = OU ($4);
+				yyPCB->Zoom = $5*2;
+			}
+		| T_CURSOR '[' measure measure number ']'
+			{
+				yyPCB->CursorX = NU ($3);
+				yyPCB->CursorY = NU ($4);
+				yyPCB->Zoom = $5;
+			}
+		|
+		;
+
+/* %start-doc pcbfile PolyArea
+
+@syntax
+PolyArea [Area]
+@end syntax
+
+@table @var
+@item Area
+Minimum area of polygon island to retain. If a polygon has clearances that cause an isolated island to be created, then will only be retained if the area exceeds this minimum area.
+@end table
+
+%end-doc */
+
+polyarea
+		:
+		| T_AREA '[' number ']'
+			{
+				/* Read in cmil^2 for now; in future this should be a noop. */
+				load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ($3) / 100.0) / 100.0);
+			}
+		;
+
+
+/* %start-doc pcbfile Thermal
+
+@syntax
+Thermal [Scale]
+@end syntax
+
+@table @var
+@item Scale
+Relative size of thermal fingers.  A value of 1.0 makes the finger
+width twice the clearance gap width (measured across the gap, not
+diameter).  The normal value is 0.5, which results in a finger width
+the same as the clearance gap width.
+@end table
+
+%end-doc */
+
+
+pcbthermal
+		:
+		| T_THERMAL '[' number ']'
+			{
+				yyPCB->ThermScale = $3;
+			}
+		;
+
+/* %start-doc pcbfile DRC
+
+@syntax
+DRC [Bloat Shrink Line Silk Drill Ring]
+DRC [Bloat Shrink Line Silk]
+DRC [Bloat Shrink Line]
+@end syntax
+
+@table @var
+@item Bloat
+Minimum spacing between copper.
+@item Shrink
+Minimum copper overlap to guarantee connectivity.
+@item Line
+Minimum line thickness.
+@item Silk
+Minimum silk thickness.
+@item Drill
+Minimum drill size.
+@item Ring
+Minimum width of the annular ring around pins and vias.
+@end table
+
+%end-doc */
+
+pcbdrc
+		:
+		| pcbdrc1
+		| pcbdrc2
+		| pcbdrc3
+		;
+
+pcbdrc1
+                : T_DRC '[' measure measure measure ']'
+		        {
+				load_meta_coord("design/bloat", NU($3));
+				load_meta_coord("design/shrink", NU($4));
+				load_meta_coord("design/min_wid", NU($5));
+				load_meta_coord("design/min_ring", NU($5));
+			}
+		;
+
+pcbdrc2
+                : T_DRC '[' measure measure measure measure ']'
+		        {
+				load_meta_coord("design/bloat", NU($3));
+				load_meta_coord("design/shrink", NU($4));
+				load_meta_coord("design/min_wid", NU($5));
+				load_meta_coord("design/min_slk", NU($6));
+				load_meta_coord("design/min_ring", NU($5));
+			}
+		;
+
+pcbdrc3
+                : T_DRC '[' measure measure measure measure measure measure ']'
+		        {
+				load_meta_coord("design/bloat", NU($3));
+				load_meta_coord("design/shrink", NU($4));
+				load_meta_coord("design/min_wid", NU($5));
+				load_meta_coord("design/min_slk", NU($6));
+				load_meta_coord("design/min_drill", NU($7));
+				load_meta_coord("design/min_ring", NU($8));
+			}
+		;
+
+/* %start-doc pcbfile Flags
+
+@syntax
+Flags(Number)
+@end syntax
+
+@table @var
+@item Number
+A number, whose value is normally given in hex, individual bits of which
+represent pcb-wide flags as defined in @ref{PCBFlags}.
+
+@end table
+
+%end-doc */
+
+pcbflags
+		: T_FLAGS '(' INTEGER ')'
+			{
+				yy_pcb_flags = pcb_flag_make($3 & PCB_FLAGS);
+			}
+		| T_FLAGS '(' STRING ')'
+			{
+			  yy_pcb_flags = pcb_strflg_board_s2f($3, yyerror);
+			  free($3);
+			}
+		|
+		;
+
+/* %start-doc pcbfile Groups
+
+@syntax
+Groups("String")
+@end syntax
+
+@table @var
+@item String
+
+Encodes the layer grouping information.  Each group is separated by a
+colon, each member of each group is separated by a comma.  Group
+members are either numbers from @code{1}..@var{N} for each layer, and
+the letters @code{c} or @code{s} representing the component side and
+solder side of the board.  Including @code{c} or @code{s} marks that
+group as being the top or bottom side of the board.
+
+@example
+Groups("1,2,c:3:4:5,6,s:7,8")
+@end example
+
+@end table
+
+%end-doc */
+
+pcbgroups
+		: T_GROUPS '(' STRING ')'
+			{
+			  layer_group_string = $3;
+			}
+		|
+		;
+
+/* %start-doc pcbfile Styles
+
+@syntax
+Styles("String")
+@end syntax
+
+@table @var
+@item String
+
+Encodes the four routing styles @code{pcb} knows about.  The four styles
+are separated by colons.  Each style consists of five parameters as follows:
+
+@table @var
+@item Name
+The name of the style.
+@item Thickness
+Width of lines and arcs.
+@item Diameter
+Copper diameter of pins and vias.
+@item Drill
+Drill diameter of pins and vias.
+@item Keepaway
+Minimum spacing to other nets.  If omitted, 10 mils is the default.
+
+@end table
+
+@end table
+
+@example
+Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+Styles["Logic,1000,3600,2000,1000:Power,2500,6000,3500,1000:
+@ @ @ Line,4000,6000,3500,1000:Breakout,600,2402,1181,600"]
+@end example
+
+@noindent
+Note that strings in actual files cannot span lines; the above example
+is split across lines only to make it readable.
+
+%end-doc */
+
+pcbstyles
+		: T_STYLES '(' STRING ')'
+			{
+				if (pcb_route_string_parse($3, &yyPCB->RouteStyle, "mil"))
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					YYABORT;
+				}
+				free($3);
+			}
+		| T_STYLES '[' STRING ']'
+			{
+				if (pcb_route_string_parse(($3 == NULL ? "" : $3), &yyPCB->RouteStyle, "cmil"))
+				{
+					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					YYABORT;
+				}
+				free($3);
+			}
+		|
+		;
+
+pcbdata
+		: pcbdefinitions
+		|
+		;
+
+pcbdefinitions
+		: pcbdefinition
+		| pcbdefinitions pcbdefinition
+		;
+
+pcbdefinition
+		: via
+		| { attr_list = & yyPCB->Attributes; } attribute
+		| rats
+		| layer
+		|
+			{
+					/* clear pointer to force memory allocation by
+					 * the appropriate subroutine
+					 */
+				yysubc = NULL;
+			}
+		  element
+		| error { YYABORT; }
+		;
+
+via
+		: via_hi_format
+		| via_2.0_format
+		| via_1.7_format
+		| via_newformat
+		| via_oldformat
+		;
+
+/* %start-doc pcbfile Via
+
+@syntax
+Via [X Y Thickness Clearance Mask Drill "Name" SFlags]
+Via (X Y Thickness Clearance Mask Drill "Name" NFlags)
+Via (X Y Thickness Clearance Drill "Name" NFlags)
+Via (X Y Thickness Drill "Name" NFlags)
+Via (X Y Thickness "Name" NFlags)
+@end syntax
+
+@table @var
+@item X Y
+coordinates of center
+@item Thickness
+outer diameter of copper annulus
+@item Clearance
+add to thickness to get clearance diameter
+@item Mask
+diameter of solder mask opening
+@item Drill
+diameter of drill
+@item Name
+string, name of via (vias have names?)
+@item SFlags
+symbolic or numerical flags
+@item NFlags
+numerical flags only
+@end table
+
+%end-doc */
+
+via_hi_format
+			/* x, y, thickness, clearance, mask, drilling-hole, name, flags */
+		: T_VIA '[' measure measure measure measure measure measure STRING flags ']'
+			{
+				pcb_old_via_new(yyData, NU ($3), NU ($4), NU ($5), NU ($6), NU ($7),
+				                     NU ($8), $9, $10);
+				free ($9);
+			}
+		;
+
+via_2.0_format
+			/* x, y, thickness, clearance, mask, drilling-hole, name, flags */
+		: T_VIA '(' measure measure measure measure measure measure STRING INTEGER ')'
+			{
+				pcb_old_via_new(yyData, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7), OU ($8), $9,
+					pcb_flag_old($10));
+				free ($9);
+			}
+		;
+
+
+via_1.7_format
+			/* x, y, thickness, clearance, drilling-hole, name, flags */
+		: T_VIA '(' measure measure measure measure measure STRING INTEGER ')'
+			{
+				pcb_old_via_new(yyData, OU ($3), OU ($4), OU ($5), OU ($6),
+					     OU ($5) + OU($6), OU ($7), $8, pcb_flag_old($9));
+				free ($8);
+			}
+		;
+
+via_newformat
+			/* x, y, thickness, drilling-hole, name, flags */
+		: T_VIA '(' measure measure measure measure STRING INTEGER ')'
+			{
+				pcb_old_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME,
+					OU($5) + 2*PCB_MASKFRAME,  OU ($6), $7, pcb_flag_old($8));
+				free ($7);
+			}
+		;
+
+via_oldformat
+			/* old format: x, y, thickness, name, flags */
+		: T_VIA '(' measure measure measure STRING INTEGER ')'
+			{
+				pcb_coord_t	hole = (OU($5) * PCB_DEFAULT_DRILLINGHOLE);
+
+					/* make sure that there's enough copper left */
+				if (OU($5) - hole < PCB_MIN_PINORVIACOPPER &&
+					OU($5) > PCB_MIN_PINORVIACOPPER)
+					hole = OU($5) - PCB_MIN_PINORVIACOPPER;
+
+				pcb_old_via_new(yyData, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME,
+					OU($5) + 2*PCB_MASKFRAME, hole, $6, pcb_flag_old($7));
+				free ($6);
+			}
+		;
+
+/* %start-doc pcbfile Rat
+
+@syntax
+Rat [X1 Y1 Group1 X2 Y2 Group2 SFlags]
+Rat (X1 Y1 Group1 X2 Y2 Group2 NFlags)
+@end syntax
+
+@table @var
+@item X1 Y1 X2 Y2
+The endpoints of the rat line.
+@item Group1 Group2
+The layer group each end is connected on.
+@item SFlags
+Symbolic or numeric flags.
+@item NFlags
+Numeric flags.
+@end table
+
+%end-doc */
+
+rats
+		: T_RAT '[' measure measure INTEGER measure measure INTEGER flags ']'
+			{
+				pcb_rat_new(yyData, NU ($3), NU ($4), NU ($6), NU ($7), $5, $8,
+					conf_core.appearance.rat_thickness, $9);
+			}
+		| T_RAT '(' measure measure INTEGER measure measure INTEGER INTEGER ')'
+			{
+				pcb_rat_new(yyData, OU ($3), OU ($4), OU ($6), OU ($7), $5, $8,
+					conf_core.appearance.rat_thickness, pcb_flag_old($9));
+			}
+		;
+
+/* %start-doc pcbfile Layer
+
+@syntax
+Layer (LayerNum "Name") (
+@ @ @ @dots{} contents @dots{}
+)
+@end syntax
+
+@table @var
+@item LayerNum
+The layer number.  Layers are numbered sequentially, starting with 1.
+The last two layers (9 and 10 by default) are solder-side silk and
+component-side silk, in that order.
+@item Name
+The layer name.
+@item contents
+The contents of the layer, which may include attributes, lines, arcs, rectangles,
+text, and polygons.
+@end table
+
+%end-doc */
+
+layer
+			/* name */
+		: T_LAYER '(' INTEGER STRING opt_string ')' '('
+			{
+				if ($3 <= 0 || $3 > PCB_MAX_LAYER)
+				{
+					yyerror("Layernumber out of range");
+					YYABORT;
+				}
+				if (LayerFlag[$3-1])
+				{
+					yyerror("Layernumber used twice");
+					YYABORT;
+				}
+				Layer = &yyData->Layer[$3-1];
+				Layer->parent.data = yyData;
+				Layer->parent_type = PCB_PARENT_DATA;
+				Layer->type = PCB_OBJ_LAYER;
+
+					/* memory for name is already allocated */
+				if (Layer->name != NULL)
+					free((char*)Layer->name);
+				Layer->name = $4;   /* shouldn't this be strdup()'ed ? */
+				LayerFlag[$3-1] = pcb_true;
+				if (yyData->LayerN < $3)
+				  yyData->LayerN = $3;
+				if ($5 != NULL)
+					free($5);
+			}
+		  layerdata ')'
+		;
+
+layerdata
+		: layerdefinitions
+		|
+		;
+
+layerdefinitions
+		: layerdefinition
+		| layerdefinitions layerdefinition
+		;
+
+layerdefinition
+		: line_hi_format
+		| line_1.7_format
+		| line_oldformat
+		| arc_hi_format
+		| arc_1.7_format
+		| arc_oldformat
+			/* x1, y1, x2, y2, flags */
+		| T_RECTANGLE '(' measure measure measure measure INTEGER ')'
+			{
+				pcb_poly_new_from_rectangle(Layer,
+					OU ($3), OU ($4), OU ($3) + OU ($5), OU ($4) + OU ($6), 0, pcb_flag_old($7));
+			}
+		| text_hi_format
+		| text_newformat
+		| text_oldformat
+		| { attr_list = & Layer->Attributes; } attribute
+		| polygon_format
+
+/* %start-doc pcbfile Line
+
+@syntax
+Line [X1 Y1 X2 Y2 Thickness Clearance SFlags]
+Line (X1 Y1 X2 Y2 Thickness Clearance NFlags)
+Line (X1 Y1 X2 Y2 Thickness NFlags)
+@end syntax
+
+@table @var
+@item X1 Y1 X2 Y2
+The end points of the line
+@item Thickness
+The width of the line
+@item Clearance
+The amount of space cleared around the line when the line passes
+through a polygon.  The clearance is added to the thickness to get the
+thickness of the clear; thus the space between the line and the
+polygon is @math{Clearance/2} wide.
+@item SFlags
+Symbolic or numeric flags
+@item NFlags
+Numeric flags.
+@end table
+
+%end-doc */
+
+line_hi_format
+			/* x1, y1, x2, y2, thickness, clearance, flags */
+		: T_LINE '[' measure measure measure measure measure measure flags ']'
+			{
+				pcb_line_new(Layer, NU ($3), NU ($4), NU ($5), NU ($6),
+				                            NU ($7), NU ($8), $9);
+			}
+		;
+
+line_1.7_format
+			/* x1, y1, x2, y2, thickness, clearance, flags */
+		: T_LINE '(' measure measure measure measure measure measure INTEGER ')'
+			{
+				pcb_line_new(Layer, OU ($3), OU ($4), OU ($5), OU ($6),
+						     OU ($7), OU ($8), pcb_flag_old($9));
+			}
+		;
+
+line_oldformat
+			/* x1, y1, x2, y2, thickness, flags */
+		: T_LINE '(' measure measure measure measure measure measure ')'
+			{
+				/* eliminate old-style rat-lines */
+			if ((IV ($8) & PCB_FLAG_RAT) == 0)
+				pcb_line_new(Layer, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7),
+					200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ($8)));
+			}
+		;
+
+/* %start-doc pcbfile Arc
+
+@syntax
+Arc [X Y Width Height Thickness Clearance StartAngle DeltaAngle SFlags]
+Arc (X Y Width Height Thickness Clearance StartAngle DeltaAngle NFlags)
+Arc (X Y Width Height Thickness StartAngle DeltaAngle NFlags)
+@end syntax
+
+@table @var
+@item X Y
+Coordinates of the center of the arc.
+@item Width Height
+The width and height, from the center to the edge.  The bounds of the
+circle of which this arc is a segment, is thus @math{2*Width} by
+@math{2*Height}.
+@item Thickness
+The width of the copper trace which forms the arc.
+@item Clearance
+The amount of space cleared around the arc when the line passes
+through a polygon.  The clearance is added to the thickness to get the
+thickness of the clear; thus the space between the arc and the polygon
+is @math{Clearance/2} wide.
+@item StartAngle
+The angle of one end of the arc, in degrees.  In PCB, an angle of zero
+points left (negative X direction), and 90 degrees points down
+(positive Y direction).
+@item DeltaAngle
+The sweep of the arc.  This may be negative.  Positive angles sweep
+counterclockwise.
+@item SFlags
+Symbolic or numeric flags.
+@item NFlags
+Numeric flags.
+@end table
+
+%end-doc */
+
+arc_hi_format
+			/* x, y, width, height, thickness, clearance, startangle, delta, flags */
+		: T_ARC '[' measure measure measure measure measure measure number number flags ']'
+			{
+			  pcb_arc_new(Layer, NU ($3), NU ($4), NU ($5), NU ($6), $9, $10,
+			                             NU ($7), NU ($8), $11, pcb_true);
+			}
+		;
+
+arc_1.7_format
+			/* x, y, width, height, thickness, clearance, startangle, delta, flags */
+		: T_ARC '(' measure measure measure measure measure measure number number INTEGER ')'
+			{
+				pcb_arc_new(Layer, OU ($3), OU ($4), OU ($5), OU ($6), $9, $10,
+						    OU ($7), OU ($8), pcb_flag_old($11), pcb_true);
+			}
+		;
+
+arc_oldformat
+			/* x, y, width, height, thickness, startangle, delta, flags */
+		: T_ARC '(' measure measure measure measure measure measure number INTEGER ')'
+			{
+				pcb_arc_new(Layer, OU ($3), OU ($4), OU ($5), OU ($5), IV ($8), $9,
+					OU ($7), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old($10), pcb_true);
+			}
+		;
+
+/* %start-doc pcbfile Text
+
+@syntax
+Text [X Y Direction Scale "String" SFlags]
+Text (X Y Direction Scale "String" NFlags)
+Text (X Y Direction "String" NFlags)
+@end syntax
+
+@table @var
+@item X Y
+The location of the upper left corner of the text.
+@item Direction
+0 means text is drawn left to right, 1 means up, 2 means right to left
+(i.e. upside down), and 3 means down.
+@item Scale
+Size of the text, as a percentage of the ``default'' size of of the
+font (the default font is about 40 mils high).  Default is 100 (40
+mils).
+@item String
+The string to draw.
+@item SFlags
+Symbolic or numeric flags.
+@item NFlags
+Numeric flags.
+@end table
+
+%end-doc */
+
+text_oldformat
+			/* x, y, direction, text, flags */
+		: T_TEXT '(' measure measure number STRING INTEGER ')'
+			{
+					/* use a default scale of 100% */
+				pcb_text_new(Layer,yyFont,OU ($3), OU ($4), $5, 100, $6, pcb_flag_old($7));
+				free ($6);
+			}
+		;
+
+text_newformat
+			/* x, y, direction, scale, text, flags */
+		: T_TEXT '(' measure measure number number STRING INTEGER ')'
+			{
+				if ($8 & PCB_FLAG_ONSILK)
+				{
+					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
+						(($8 & PCB_FLAG_ONSOLDER) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE) - 2];
+
+					pcb_text_new(lay ,yyFont, OU ($3), OU ($4), $5, $6, $7,
+						      pcb_flag_old($8));
+				}
+				else
+					pcb_text_new(Layer, yyFont, OU ($3), OU ($4), $5, $6, $7,
+						      pcb_flag_old($8));
+				free ($7);
+			}
+		;
+text_hi_format
+			/* x, y, direction, scale, text, flags */
+		: T_TEXT '[' measure measure number number STRING flags ']'
+			{
+				/* FIXME: shouldn't know about .f */
+				/* I don't think this matters because anything with hi_format
+				 * will have the silk on its own layer in the file rather
+				 * than using the PCB_FLAG_ONSILK and having it in a copper layer.
+				 * Thus there is no need for anything besides the 'else'
+				 * part of this code.
+				 */
+				if ($8.f & PCB_FLAG_ONSILK)
+				{
+					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
+						(($8.f & PCB_FLAG_ONSOLDER) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE) - 2];
+
+					pcb_text_new(lay, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
+				}
+				else
+					pcb_text_new(Layer, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
+				free ($7);
+			}
+		;
+
+/* %start-doc pcbfile Polygon
+
+@syntax
+Polygon (SFlags) (
+@ @ @ @dots{} (X Y) @dots{}
+@ @ @ @dots{} [X Y] @dots{}
+@ @ @ Hole (
+@ @ @ @ @ @ @dots{} (X Y) @dots{}
+@ @ @ @ @ @ @dots{} [X Y] @dots{}
+@ @ @ )
+@ @ @ @dots{}
+)
+@end syntax
+
+@table @var
+@item SFlags
+Symbolic or numeric flags.
+@item X Y
+Coordinates of each vertex.  You must list at least three coordinates.
+@item Hole (...)
+Defines a hole within the polygon's outer contour. There may be zero or more such sections.
+@end table
+
+%end-doc */
+
+polygon_format
+		: /* flags are passed in */
+		T_POLYGON '(' flags ')' '('
+			{
+				Polygon = pcb_poly_new(Layer, 0, $3);
+			}
+		  polygonpoints
+		  polygonholes ')'
+			{
+				pcb_cardinal_t contour, contour_start, contour_end;
+				pcb_bool bad_contour_found = pcb_false;
+				/* ignore junk */
+				for (contour = 0; contour <= Polygon->HoleIndexN; contour++)
+				  {
+				    contour_start = (contour == 0) ?
+						      0 : Polygon->HoleIndex[contour - 1];
+				    contour_end = (contour == Polygon->HoleIndexN) ?
+						 Polygon->PointN :
+						 Polygon->HoleIndex[contour];
+				    if (contour_end - contour_start < 3)
+				      bad_contour_found = pcb_true;
+				  }
+
+				if (bad_contour_found)
+				  {
+				    pcb_message(PCB_MSG_WARNING, "WARNING parsing file '%s'\n"
+					    "    line:        %i\n"
+					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
+					    yyfilename, pcb_lineno);
+				    pcb_destroy_object(yyData, PCB_OBJ_POLY, Layer, Polygon, Polygon);
+				  }
+				else
+				  {
+				    pcb_poly_bbox(Polygon);
+				    if (!Layer->polygon_tree)
+				      Layer->polygon_tree = pcb_r_create_tree();
+				    pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+				  }
+			}
+		;
+
+polygonholes
+		: /* empty */
+		| polygonholes polygonhole
+		;
+
+polygonhole
+		: T_POLYGON_HOLE '('
+			{
+				pcb_poly_hole_new(Polygon);
+			}
+		  polygonpoints ')'
+		;
+
+polygonpoints
+		: /* empty */
+		| polygonpoint polygonpoints
+		;
+
+polygonpoint
+			/* xcoord ycoord */
+		: '(' measure measure ')'
+			{
+				pcb_poly_point_new(Polygon, OU ($2), OU ($3));
+			}
+		| '[' measure measure ']'
+			{
+				pcb_poly_point_new(Polygon, NU ($2), NU ($3));
+			}
+		;
+
+/* %start-doc pcbfile Element
+
+@syntax
+Element [SFlags "Desc" "Name" "Value" MX MY TX TY TDir TScale TSFlags] (
+Element (NFlags "Desc" "Name" "Value" MX MY TX TY TDir TScale TNFlags) (
+Element (NFlags "Desc" "Name" "Value" TX TY TDir TScale TNFlags) (
+Element (NFlags "Desc" "Name" TX TY TDir TScale TNFlags) (
+Element ("Desc" "Name" TX TY TDir TScale TNFlags) (
+@ @ @ @dots{} contents @dots{}
+)
+@end syntax
+
+@table @var
+@item SFlags
+Symbolic or numeric flags, for the element as a whole.
+@item NFlags
+Numeric flags, for the element as a whole.
+@item Desc
+The description of the element.  This is one of the three strings
+which can be displayed on the screen.
+@item Name
+The name of the element, usually the reference designator.
+@item Value
+The value of the element.
+@item MX MY
+The location of the element's mark.  This is the reference point
+for placing the element and its pins and pads.
+@item TX TY
+The upper left corner of the text (one of the three strings).
+@item TDir
+The relative direction of the text.  0 means left to right for
+an unrotated element, 1 means up, 2 left, 3 down.
+@item TScale
+Size of the text, as a percentage of the ``default'' size of of the
+font (the default font is about 40 mils high).  Default is 100 (40
+mils).
+@item TSFlags
+Symbolic or numeric flags, for the text.
+@item TNFlags
+Numeric flags, for the text.
+@end table
+
+Elements may contain pins, pads, element lines, element arcs,
+attributes, and (for older elements) an optional mark.  Note that
+element definitions that have the mark coordinates in the element
+line, only support pins and pads which use relative coordinates.  The
+pin and pad coordinates are relative to the mark.  Element definitions
+which do not include the mark coordinates in the element line, may
+have a Mark definition in their contents, and only use pin and pad
+definitions which use absolute coordinates.
+
+%end-doc */
+
+element
+		: element_oldformat
+		| element_1.3.4_format
+		| element_newformat
+		| element_1.7_format
+		| element_hi_format
+		;
+
+element_oldformat
+			/* element_flags, description, pcb-name,
+			 * text_x, text_y, text_direction, text_scale, text_flags
+			 */
+		: T_ELEMENT '(' STRING STRING measure measure INTEGER ')' '('
+			{
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(),
+					$3, $4, NULL, OU ($5), OU ($6), $7, 100, pcb_no_flags(), pcb_false);
+				free ($3);
+				free ($4);
+				pin_num = 1;
+			}
+		  elementdefinitions ')'
+			{
+				io_pcb_element_fin(yyData);
+			}
+		;
+
+element_1.3.4_format
+			/* element_flags, description, pcb-name,
+			 * text_x, text_y, text_direction, text_scale, text_flags
+			 */
+		: T_ELEMENT '(' INTEGER STRING STRING measure measure measure measure INTEGER ')' '('
+			{
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3),
+					$4, $5, NULL, OU ($6), OU ($7), IV ($8), IV ($9), pcb_flag_old($10), pcb_false);
+				free ($4);
+				free ($5);
+				pin_num = 1;
+			}
+		  elementdefinitions ')'
+			{
+				io_pcb_element_fin(yyData);
+			}
+		;
+
+element_newformat
+			/* element_flags, description, pcb-name, value,
+			 * text_x, text_y, text_direction, text_scale, text_flags
+			 */
+		: T_ELEMENT '(' INTEGER STRING STRING STRING measure measure measure measure INTEGER ')' '('
+			{
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3),
+					$4, $5, $6, OU ($7), OU ($8), IV ($9), IV ($10), pcb_flag_old($11), pcb_false);
+				free ($4);
+				free ($5);
+				free ($6);
+				pin_num = 1;
+			}
+		  elementdefinitions ')'
+			{
+				io_pcb_element_fin(yyData);
+			}
+		;
+
+element_1.7_format
+			/* element_flags, description, pcb-name, value, mark_x, mark_y,
+			 * text_x, text_y, text_direction, text_scale, text_flags
+			 */
+		: T_ELEMENT '(' INTEGER STRING STRING STRING measure measure
+			measure measure number number INTEGER ')' '('
+			{
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old($3),
+					$4, $5, $6, OU ($7) + OU ($9), OU ($8) + OU ($10),
+					$11, $12, pcb_flag_old($13), pcb_false);
+				yysubc_ox = OU ($7);
+				yysubc_oy = OU ($8);
+				free ($4);
+				free ($5);
+				free ($6);
+			}
+		  relementdefs ')'
+			{
+				io_pcb_element_fin(yyData);
+			}
+		;
+
+element_hi_format
+			/* element_flags, description, pcb-name, value, mark_x, mark_y,
+			 * text_x, text_y, text_direction, text_scale, text_flags
+			 */
+		: T_ELEMENT '[' flags STRING STRING STRING measure measure
+			measure measure number number flags ']' '('
+			{
+				yysubc = io_pcb_element_new(yyData, yysubc, yyFont, $3,
+					$4, $5, $6, NU ($7) + NU ($9), NU ($8) + NU ($10),
+					$11, $12, $13, pcb_false);
+				yysubc_ox = NU ($7);
+				yysubc_oy = NU ($8);
+				free ($4);
+				free ($5);
+				free ($6);
+			}
+		  relementdefs ')'
+			{
+				if (pcb_subc_is_empty(yysubc)) {
+					pcb_subc_free(yysubc);
+					yysubc = NULL;
+				}
+				else {
+					io_pcb_element_fin(yyData);
+				}
+			}
+		;
+
+/* %start-doc pcbfile ElementLine
+
+@syntax
+ElementLine [X1 Y1 X2 Y2 Thickness]
+ElementLine (X1 Y1 X2 Y2 Thickness)
+@end syntax
+
+@table @var
+@item X1 Y1 X2 Y2
+Coordinates of the endpoints of the line.  These are relative to the
+Element's mark point for new element formats, or absolute for older
+formats.
+@item Thickness
+The width of the silk for this line.
+@end table
+
+%end-doc */
+
+/* %start-doc pcbfile ElementArc
+
+@syntax
+ElementArc [X Y Width Height StartAngle DeltaAngle Thickness]
+ElementArc (X Y Width Height StartAngle DeltaAngle Thickness)
+@end syntax
+
+@table @var
+@item X Y
+Coordinates of the center of the arc.  These are relative to the
+Element's mark point for new element formats, or absolute for older
+formats.
+@item Width Height
+The width and height, from the center to the edge.  The bounds of the
+circle of which this arc is a segment, is thus @math{2*Width} by
+@math{2*Height}.
+@item StartAngle
+The angle of one end of the arc, in degrees.  In PCB, an angle of zero
+points left (negative X direction), and 90 degrees points down
+(positive Y direction).
+@item DeltaAngle
+The sweep of the arc.  This may be negative.  Positive angles sweep
+counterclockwise.
+@item Thickness
+The width of the silk line which forms the arc.
+@end table
+
+%end-doc */
+
+/* %start-doc pcbfile Mark
+
+@syntax
+Mark [X Y]
+Mark (X Y)
+@end syntax
+
+@table @var
+@item X Y
+Coordinates of the Mark, for older element formats that don't have
+the mark as part of the Element line.
+@end table
+
+%end-doc */
+
+elementdefinitions
+		: elementdefinition
+		| elementdefinitions elementdefinition
+		;
+
+elementdefinition
+		: pin_1.6.3_format
+		| pin_newformat
+		| pin_oldformat
+		| pad_newformat
+		| pad
+			/* x1, y1, x2, y2, thickness */
+		| T_ELEMENTLINE '[' measure measure measure measure measure ']'
+			{
+				io_pcb_element_line_new(yysubc, NU ($3), NU ($4), NU ($5), NU ($6), NU ($7));
+			}
+			/* x1, y1, x2, y2, thickness */
+		| T_ELEMENTLINE '(' measure measure measure measure measure ')'
+			{
+				io_pcb_element_line_new(yysubc, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7));
+			}
+			/* x, y, width, height, startangle, anglediff, thickness */
+		| T_ELEMENTARC '[' measure measure measure measure number number measure ']'
+			{
+				io_pcb_element_arc_new(yysubc, NU ($3), NU ($4), NU ($5), NU ($6), $7, $8, NU ($9));
+			}
+			/* x, y, width, height, startangle, anglediff, thickness */
+		| T_ELEMENTARC '(' measure measure measure measure number number measure ')'
+			{
+				io_pcb_element_arc_new(yysubc, OU ($3), OU ($4), OU ($5), OU ($6), $7, $8, OU ($9));
+			}
+			/* x, y position */
+		| T_MARK '[' measure measure ']'
+			{
+				yysubc_ox = NU ($3);
+				yysubc_oy = NU ($4);
+			}
+		| T_MARK '(' measure measure ')'
+			{
+				yysubc_ox = OU ($3);
+				yysubc_oy = OU ($4);
+			}
+		| { attr_list = & yysubc->Attributes; } attribute
+		;
+
+relementdefs
+		: relementdef
+		| relementdefs relementdef
+		;
+
+relementdef
+		: pin_1.7_format
+		| pin_hi_format
+		| pad_1.7_format
+		| pad_hi_format
+			/* x1, y1, x2, y2, thickness */
+		| T_ELEMENTLINE '[' measure measure measure measure measure ']'
+			{
+				io_pcb_element_line_new(yysubc, NU ($3) + yysubc_ox,
+					NU ($4) + yysubc_oy, NU ($5) + yysubc_ox,
+					NU ($6) + yysubc_oy, NU ($7));
+			}
+		| T_ELEMENTLINE '(' measure measure measure measure measure ')'
+			{
+				io_pcb_element_line_new(yysubc, OU ($3) + yysubc_ox,
+					OU ($4) + yysubc_oy, OU ($5) + yysubc_ox,
+					OU ($6) + yysubc_oy, OU ($7));
+			}
+			/* x, y, width, height, startangle, anglediff, thickness */
+		| T_ELEMENTARC '[' measure measure measure measure number number measure ']'
+			{
+				io_pcb_element_arc_new(yysubc, NU ($3) + yysubc_ox,
+					NU ($4) + yysubc_oy, NU ($5), NU ($6), $7, $8, NU ($9));
+			}
+		| T_ELEMENTARC '(' measure measure measure measure number number measure ')'
+			{
+				io_pcb_element_arc_new(yysubc, OU ($3) + yysubc_ox,
+					OU ($4) + yysubc_oy, OU ($5), OU ($6), $7, $8, OU ($9));
+			}
+		| { attr_list = & yysubc->Attributes; } attribute
+		;
+
+/* %start-doc pcbfile Pin
+
+@syntax
+Pin [rX rY Thickness Clearance Mask Drill "Name" "Number" SFlags]
+Pin (rX rY Thickness Clearance Mask Drill "Name" "Number" NFlags)
+Pin (aX aY Thickness Drill "Name" "Number" NFlags)
+Pin (aX aY Thickness Drill "Name" NFlags)
+Pin (aX aY Thickness "Name" NFlags)
+@end syntax
+
+@table @var
+@item rX rY
+coordinates of center, relative to the element's mark
+@item aX aY
+absolute coordinates of center.
+@item Thickness
+outer diameter of copper annulus
+@item Clearance
+add to thickness to get clearance diameter
+@item Mask
+diameter of solder mask opening
+@item Drill
+diameter of drill
+@item Name
+name of pin
+@item Number
+number of pin
+@item SFlags
+symbolic or numerical flags
+@item NFlags
+numerical flags only
+@end table
+
+%end-doc */
+
+pin_hi_format
+			/* x, y, thickness, clearance, mask, drilling hole, name,
+			   number, flags */
+		: T_PIN '[' measure measure measure measure measure measure STRING STRING flags ']'
+			{
+				pcb_pstk_t *pin = io_pcb_element_pin_new(yysubc, NU ($3) + yysubc_ox,
+					NU ($4) + yysubc_oy, NU ($5), NU ($6), NU ($7), NU ($8), $9,
+					$10, $11);
+				pcb_attrib_compat_set_intconn(&pin->Attributes, yy_intconn);
+				free ($9);
+				free ($10);
+			}
+		;
+pin_1.7_format
+			/* x, y, thickness, clearance, mask, drilling hole, name,
+			   number, flags */
+		: T_PIN '(' measure measure measure measure measure measure STRING STRING INTEGER ')'
+			{
+				io_pcb_element_pin_new(yysubc, OU ($3) + yysubc_ox,
+					OU ($4) + yysubc_oy, OU ($5), OU ($6), OU ($7), OU ($8), $9,
+					$10, pcb_flag_old($11));
+				free ($9);
+				free ($10);
+			}
+		;
+
+pin_1.6.3_format
+			/* x, y, thickness, drilling hole, name, number, flags */
+		: T_PIN '(' measure measure measure measure STRING STRING INTEGER ')'
+			{
+				io_pcb_element_pin_new(yysubc, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME,
+					OU ($5) + 2*PCB_MASKFRAME, OU ($6), $7, $8, pcb_flag_old($9));
+				free ($7);
+				free ($8);
+			}
+		;
+
+pin_newformat
+			/* x, y, thickness, drilling hole, name, flags */
+		: T_PIN '(' measure measure measure measure STRING INTEGER ')'
+			{
+				char	p_number[8];
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pin_new(yysubc, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME,
+					OU ($5) + 2*PCB_MASKFRAME, OU ($6), $7, p_number, pcb_flag_old($8));
+
+				free ($7);
+			}
+		;
+
+pin_oldformat
+			/* old format: x, y, thickness, name, flags
+			 * drilling hole is 40% of the diameter
+			 */
+		: T_PIN '(' measure measure measure STRING INTEGER ')'
+			{
+				pcb_coord_t	hole = OU ($5) * PCB_DEFAULT_DRILLINGHOLE;
+				char	p_number[8];
+
+					/* make sure that there's enough copper left */
+				if (OU ($5) - hole < PCB_MIN_PINORVIACOPPER &&
+					OU ($5) > PCB_MIN_PINORVIACOPPER)
+					hole = OU ($5) - PCB_MIN_PINORVIACOPPER;
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pin_new(yysubc, OU ($3), OU ($4), OU ($5), 2*PCB_GROUNDPLANEFRAME,
+					OU ($5) + 2*PCB_MASKFRAME, hole, $6, p_number, pcb_flag_old($7));
+				free ($6);
+			}
+		;
+
+/* %start-doc pcbfile Pad
+
+@syntax
+Pad [rX1 rY1 rX2 rY2 Thickness Clearance Mask "Name" "Number" SFlags]
+Pad (rX1 rY1 rX2 rY2 Thickness Clearance Mask "Name" "Number" NFlags)
+Pad (aX1 aY1 aX2 aY2 Thickness "Name" "Number" NFlags)
+Pad (aX1 aY1 aX2 aY2 Thickness "Name" NFlags)
+@end syntax
+
+@table @var
+@item rX1 rY1 rX2 rY2
+Coordinates of the endpoints of the pad, relative to the element's
+mark.  Note that the copper extends beyond these coordinates by half
+the thickness.  To make a square or round pad, specify the same
+coordinate twice.
+@item aX1 aY1 aX2 aY2
+Same, but absolute coordinates of the endpoints of the pad.
+@item Thickness
+width of the pad.
+@item Clearance
+add to thickness to get clearance width.
+@item Mask
+width of solder mask opening.
+@item Name
+name of pin
+@item Number
+number of pin
+@item SFlags
+symbolic or numerical flags
+@item NFlags
+numerical flags only
+@end table
+
+%end-doc */
+
+pad_hi_format
+			/* x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags */
+		: T_PAD '[' measure measure measure measure measure measure measure STRING STRING flags ']'
+			{
+				pcb_pstk_t *pad = io_pcb_element_pad_new(yysubc, NU ($3) + yysubc_ox,
+					NU ($4) + yysubc_oy,
+					NU ($5) + yysubc_ox,
+					NU ($6) + yysubc_oy, NU ($7), NU ($8), NU ($9),
+					$10, $11, $12);
+				pcb_attrib_compat_set_intconn(&pad->Attributes, yy_intconn);
+				free ($10);
+				free ($11);
+			}
+		;
+
+pad_1.7_format
+			/* x1, y1, x2, y2, thickness, clearance, mask, name , pad number, flags */
+		: T_PAD '(' measure measure measure measure measure measure measure STRING STRING INTEGER ')'
+			{
+				io_pcb_element_pad_new(yysubc,OU ($3) + yysubc_ox,
+					OU ($4) + yysubc_oy, OU ($5) + yysubc_ox,
+					OU ($6) + yysubc_oy, OU ($7), OU ($8), OU ($9),
+					$10, $11, pcb_flag_old($12));
+				free ($10);
+				free ($11);
+			}
+		;
+
+pad_newformat
+			/* x1, y1, x2, y2, thickness, name , pad number, flags */
+		: T_PAD '(' measure measure measure measure measure STRING STRING INTEGER ')'
+			{
+				io_pcb_element_pad_new(yysubc,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*PCB_GROUNDPLANEFRAME,
+					OU ($7) + 2*PCB_MASKFRAME, $8, $9, pcb_flag_old($10));
+				free ($8);
+				free ($9);
+			}
+		;
+
+pad
+			/* x1, y1, x2, y2, thickness, name and flags */
+		: T_PAD '(' measure measure measure measure measure STRING INTEGER ')'
+			{
+				char		p_number[8];
+
+				sprintf(p_number, "%d", pin_num++);
+				io_pcb_element_pad_new(yysubc,OU ($3),OU ($4),OU ($5),OU ($6),OU ($7), 2*PCB_GROUNDPLANEFRAME,
+					OU ($7) + 2*PCB_MASKFRAME, $8,p_number, pcb_flag_old($9));
+				free ($8);
+			}
+		;
+
+flags		: INTEGER	{ $$ = pcb_flag_old($1); }
+		| STRING	{ $$ = pcb_strflg_s2f($1, yyerror, &yy_intconn, 1); free($1); }
+		;
+
+symbols
+		: symbol
+		| symbols symbol
+		;
+
+/* %start-doc pcbfile Symbol
+
+@syntax
+Symbol [Char Delta] (
+Symbol (Char Delta) (
+@ @ @ @dots{} symbol lines @dots{}
+)
+@end syntax
+
+@table @var
+@item Char
+The character or numerical character value this symbol represents.
+Characters must be in single quotes.
+@item Delta
+Additional space to allow after this character.
+@end table
+
+%end-doc */
+
+symbol : symbolhead symboldata ')'
+
+symbolhead	: T_SYMBOL '[' symbolid measure ']' '('
+			{
+				if ($3 <= 0 || $3 > PCB_MAX_FONTPOSITION)
+				{
+					yyerror("fontposition out of range");
+					YYABORT;
+				}
+				Symbol = &yyFont->Symbol[$3];
+				if (Symbol->Valid)
+				{
+					yyerror("symbol ID used twice");
+					YYABORT;
+				}
+				Symbol->Valid = pcb_true;
+				Symbol->Delta = NU ($4);
+			}
+		| T_SYMBOL '(' symbolid measure ')' '('
+			{
+				if ($3 <= 0 || $3 > PCB_MAX_FONTPOSITION)
+				{
+					yyerror("fontposition out of range");
+					YYABORT;
+				}
+				Symbol = &yyFont->Symbol[$3];
+				if (Symbol->Valid)
+				{
+					yyerror("symbol ID used twice");
+					YYABORT;
+				}
+				Symbol->Valid = pcb_true;
+				Symbol->Delta = OU ($4);
+			}
+		;
+
+symbolid
+		: INTEGER
+		| CHAR_CONST
+		;
+
+symboldata
+		: /* empty */
+		| symboldata symboldefinition
+		| symboldata hiressymbol
+		;
+
+/* %start-doc pcbfile SymbolLine
+
+@syntax
+SymbolLine [X1 Y1 X2 Y1 Thickness]
+SymbolLine (X1 Y1 X2 Y1 Thickness)
+@end syntax
+
+@table @var
+@item X1 Y1 X2 Y2
+The endpoints of this line.
+@item Thickness
+The width of this line.
+@end table
+
+%end-doc */
+
+symboldefinition
+			/* x1, y1, x2, y2, thickness */
+		: T_SYMBOLLINE '(' measure measure measure measure measure ')'
+			{
+				pcb_font_new_line_in_sym(Symbol, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7));
+			}
+		;
+hiressymbol
+			/* x1, y1, x2, y2, thickness */
+		: T_SYMBOLLINE '[' measure measure measure measure measure ']'
+			{
+				pcb_font_new_line_in_sym(Symbol, NU ($3), NU ($4), NU ($5), NU ($6), NU ($7));
+			}
+		;
+
+/* %start-doc pcbfile Netlist
+
+@syntax
+Netlist ( ) (
+@ @ @ @dots{} nets @dots{}
+)
+@end syntax
+
+%end-doc */
+
+pcbnetlist	: pcbnetdef
+		|
+		;
+pcbnetdef
+			/* net(...) net(...) ... */
+		: T_NETLIST '(' ')' '('
+		  nets ')'
+		;
+
+nets
+		: netdefs
+		|
+		;
+
+netdefs
+		: net
+		| netdefs net
+		;
+
+
+/* %start-doc pcbfile Net
+
+@syntax
+Net ("Name" "Style") (
+@ @ @ @dots{} connects @dots{}
+)
+@end syntax
+
+@table @var
+@item Name
+The name of this net.
+@item Style
+The routing style that should be used when autorouting this net.
+@end table
+
+%end-doc */
+
+net
+			/* name style pin pin ... */
+		: T_NET '(' STRING STRING ')' '('
+			{
+				Menu = pcb_lib_net_new((pcb_lib_t *)&yyPCB->NetlistLib, $3, $4);
+				free ($3);
+				free ($4);
+			}
+		 connections ')'
+		;
+
+connections
+		: conndefs
+		|
+		;
+
+conndefs
+		: conn
+		| conndefs conn
+		;
+
+/* %start-doc pcbfile Connect
+
+@syntax
+Connect ("PinPad")
+@end syntax
+
+@table @var
+@item PinPad
+The name of a pin or pad which is included in this net.  Pin and Pad
+names are named by the refdes and pin name, like @code{"U14-7"} for
+pin 7 of U14, or @code{"T4-E"} for pin E of T4.
+@end table
+
+%end-doc */
+
+conn
+		: T_CONN '(' STRING ')'
+			{
+				pcb_lib_conn_new(Menu, $3);
+				free ($3);
+			}
+		;
+
+/* %start-doc pcbfile Netlistpatch
+
+@syntax
+NetListPatch ( ) (
+@ @ @ @dots{} netpatch @dots{}
+)
+@end syntax
+
+%end-doc */
+
+pcbnetlistpatch	: pcbnetpatchdef
+		|
+		;
+pcbnetpatchdef
+			/* net(...) net(...) ... */
+		: T_NETLISTPATCH '(' ')' '('
+		  netpatches ')'
+		;
+
+netpatches
+		: netpatchdefs
+		|
+		;
+
+netpatchdefs
+		: netpatch
+		| netpatchdefs netpatch
+		;
+
+/* %start-doc pcbfile NetPatch
+
+@syntax
+op (arg1 arg2 ...) (
+@ @ @ @dots{} netlist patch directive @dots{}
+)
+@end syntax
+
+%end-doc */
+
+netpatch
+			/* name style pin pin ... */
+		: T_ADD_CONN      '(' STRING STRING ')'         { pcb_ratspatch_append(yyPCB, RATP_ADD_CONN, $3, $4, NULL); free($3); free($4); }
+		| T_DEL_CONN      '(' STRING STRING ')'         { pcb_ratspatch_append(yyPCB, RATP_DEL_CONN, $3, $4, NULL); free($3); free($4); }
+		| T_CHANGE_ATTRIB '(' STRING STRING STRING ')'  { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, $3, $4, $5); free($3); free($4); free($5); }
+		;
+
+
+/* %start-doc pcbfile Attribute
+
+@syntax
+Attribute ("Name" "Value")
+@end syntax
+
+Attributes allow boards and elements to have arbitrary data attached
+to them, which is not directly used by PCB itself but may be of use by
+other programs or users.
+
+@table @var
+@item Name
+The name of the attribute
+
+@item Value
+The value of the attribute.  Values are always stored as strings, even
+if the value is interpreted as, for example, a number.
+
+@end table
+
+%end-doc */
+
+attribute
+		: T_ATTRIBUTE '(' STRING STRING ')'
+			{
+				char *old_val, *key = $3, *val = $4 ? $4 : (char *)"";
+				old_val = pcb_attribute_get(attr_list, key);
+				if (old_val != NULL)
+					pcb_message(PCB_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
+				else
+					pcb_attribute_put(attr_list, key, val);
+				free(key);
+				free(val);
+			}
+		;
+
+opt_string	: STRING { $$ = $1; }
+		| /* empty */ { $$ = 0; }
+		;
+
+number
+		: FLOATING	{ $$ = $1; }
+		| INTEGER	{ $$ = $1; }
+		;
+
+measure
+		/* Default unit (no suffix) is cmil */
+		: number	{ do_measure(&$$, $1, PCB_MIL_TO_COORD ($1) / 100.0, 0); }
+		| number T_UMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_CMIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_MIL	{ M ($$, $1, PCB_MIL_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_IN	{ M ($$, $1, PCB_INCH_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_NM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; }
+		| number T_UM	{ M ($$, $1, PCB_MM_TO_COORD ($1) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_MM	{ M ($$, $1, PCB_MM_TO_COORD ($1)); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_M	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		| number T_KM	{ M ($$, $1, PCB_MM_TO_COORD ($1) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; }
+		;
+
+%%
+
+/* ---------------------------------------------------------------------------
+ * error routine called by parser library
+ */
+int yyerror(const char * s)
+{
+	pcb_message(PCB_MSG_ERROR, "ERROR parsing file '%s'\n"
+		"    line:        %i\n"
+		"    description: '%s'\n",
+		yyfilename, pcb_lineno, s);
+	return(0);
+}
+
+int pcb_wrap()
+{
+  return 1;
+}
+
+static int
+check_file_version (int ver)
+{
+  if ( ver > PCB_FILE_VERSION ) {
+    pcb_message(PCB_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
+	     "which is too new for this version of pcb.  To load this file\n"
+	     "you need a version of pcb which is >= %d.  If you are\n"
+	     "using a version built from git source, the source date\n"
+	     "must be >= %d.  This copy of pcb can only read files\n"
+	     "up to file version %d.\n", ver, ver, PCB_FILE_VERSION);
+    return 1;
+  }
+
+  return 0;
+}
+
+static void
+do_measure (PLMeasure *m, pcb_coord_t i, double d, int u)
+{
+  m->ival = i;
+  m->bval = pcb_round (d);
+  m->dval = d;
+  m->has_units = u;
+}
+
+static int
+integer_value (PLMeasure m)
+{
+  if (m.has_units)
+    yyerror("units ignored here");
+  return m.ival;
+}
+
+static pcb_coord_t
+old_units (PLMeasure m)
+{
+  if (m.has_units)
+    return m.bval;
+  if (m.ival != 0)
+    pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
+  return pcb_round (PCB_MIL_TO_COORD (m.ival));
+}
+
+static pcb_coord_t
+new_units (PLMeasure m)
+{
+  if (m.has_units)
+    return m.bval;
+  if (m.dval != 0)
+    pcb_io_pcb_usty_seen |= PCB_USTY_CMIL;
+  /* if there's no unit m.dval already contains the converted value */
+  return pcb_round (m.dval);
+}
+
+/* This converts old flag bits (from saved PCB files) to new format.  */
+static pcb_flag_t pcb_flag_old(unsigned int flags)
+{
+	pcb_flag_t rv;
+	int i, f;
+	memset(&rv, 0, sizeof(rv));
+	/* If we move flag bits around, this is where we map old bits to them.  */
+	rv.f = flags & 0xffff;
+	f = 0x10000;
+	for (i = 0; i < 8; i++) {
+		/* use the closest thing to the old thermal style */
+		if (flags & f)
+			rv.t[i / 2] |= (1 << (4 * (i % 2)));
+		f <<= 1;
+	}
+	return rv;
+}
+
+/* load a board metadata into conf_core */
+static void load_meta_coord(const char *path, pcb_coord_t crd)
+{
+	char tmp[128];
+	pcb_sprintf(tmp, "%$mm", crd);
+	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+}
+
+static void load_meta_float(const char *path, double val)
+{
+	char tmp[128];
+	pcb_sprintf(tmp, "%f", val);
+	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+}
Index: tags/2.0.1/src_plugins/io_tedax/Makefile
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_io_tedax
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/io_tedax/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,13 @@
+put /local/pcb/mod {io_tedax}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/io_tedax/io_tedax.o
+	$(PLUGDIR)/io_tedax/netlist.o
+	$(PLUGDIR)/io_tedax/footprint.o
+	$(PLUGDIR)/io_tedax/parse.o
+@]
+
+switch /local/pcb/io_tedax/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/io_tedax/footprint.c
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/footprint.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/footprint.c	(revision 18980)
@@ -0,0 +1,629 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  tedax IO plugin - footprint import/export
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <math.h>
+#include <genht/htsp.h>
+#include <genht/htip.h>
+#include <genht/hash.h>
+
+#include "footprint.h"
+#include "parse.h"
+
+#include "unit.h"
+#include "attrib.h"
+#include "error.h"
+#include "data.h"
+#include "board.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+#include "obj_line.h"
+#include "obj_arc.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "../src_plugins/lib_compat_help/subc_help.h"
+#include "../src_plugins/lib_compat_help/pstk_help.h"
+
+static void print_sqpad_coords(FILE *f, pcb_any_line_t *Pad, pcb_coord_t cx, pcb_coord_t cy)
+{
+	pcb_coord_t x[4], y[4];
+
+	pcb_sqline_to_rect((pcb_line_t *)Pad, x, y);
+	pcb_fprintf(f, " %.9mm %.9mm", x[0] - cx, y[0] - cy);
+	pcb_fprintf(f, " %.9mm %.9mm", x[1] - cx, y[1] - cy);
+	pcb_fprintf(f, " %.9mm %.9mm", x[2] - cx, y[2] - cy);
+	pcb_fprintf(f, " %.9mm %.9mm", x[3] - cx, y[3] - cy);
+}
+
+#define elem_layer(elem, obj) \
+	((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (elem)) == PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (obj))) ? "primary" : "secondary")
+
+#define safe_term_num(out, obj, buff) \
+do { \
+	out = obj->Number; \
+	if ((out == NULL) || (*out == '\0')) { \
+		sprintf(buff, "%p", (void *)obj); \
+		out = buff; \
+		if (out[1] == 'x') \
+			out+=2; \
+	} \
+} while(0)
+
+#define print_term(pnum, obj) \
+do { \
+	if (htsp_get(&terms, pnum) == NULL) { \
+		htsp_set(&terms, pcb_strdup(pnum), obj); \
+		fprintf(f, "	term %s %s - %s\n", pnum, pnum, obj->Name); \
+	} \
+} while(0)
+
+#define print_terma(pnum, obj) \
+do { \
+	if (htsp_get(&terms, pnum) == NULL) { \
+		htsp_set(&terms, pcb_strdup(pnum), obj); \
+		fprintf(f, "	term %s %s - %s\n", pnum, pnum, pnum); \
+	} \
+} while(0)
+
+#define TERM_NAME(term) ((term == NULL) ? "-" : term)
+
+#define PIN_PLATED(obj) (PCB_FLAG_TEST(PCB_FLAG_HOLE, (obj)) ? "unplated" : "-")
+
+#define get_layer_props(lyt, lloc, ltyp, invalid) \
+	ltyp = lloc = NULL; \
+	if (lyt & PCB_LYT_LOGICAL) { invalid; } \
+	else if (lyt & PCB_LYT_TOP) lloc = "primary"; \
+	else if (lyt & PCB_LYT_BOTTOM) lloc = "secondary"; \
+	else if (lyt & PCB_LYT_INTERN) lloc = "inner"; \
+	else if ((lyt & PCB_LYT_ANYWHERE) == 0) lloc = "all"; \
+	if (lyt & PCB_LYT_COPPER) ltyp = "copper"; \
+	else if (lyt & PCB_LYT_SILK) ltyp = "silk"; \
+	else if (lyt & PCB_LYT_MASK) ltyp = "mask"; \
+	else if (lyt & PCB_LYT_PASTE) ltyp = "paste"; \
+	else { invalid; }
+
+
+int tedax_fp_fsave(pcb_data_t *data, FILE *f)
+{
+	char buff[64];
+	htsp_t terms;
+	htsp_entry_t *e;
+
+	htsp_init(&terms, strhash, strkeyeq);
+
+	fprintf(f, "tEDAx v1\n");
+
+	PCB_SUBC_LOOP(data)
+	{
+		pcb_coord_t ox = 0, oy = 0;
+		const char *fpname = NULL;
+		int l;
+
+		fpname = pcb_attribute_get(&subc->Attributes, "tedax::footprint");
+		if (fpname == NULL)
+			fpname = pcb_attribute_get(&subc->Attributes, "visible_footprint");
+		if (fpname == NULL)
+			fpname = pcb_attribute_get(&subc->Attributes, "footprint");
+		if ((fpname == NULL) && (subc->refdes != NULL))
+			fpname = subc->refdes;
+		if (fpname == NULL)
+			fpname = "-";
+
+		pcb_subc_get_origin(subc, &ox, &oy);
+
+		fprintf(f, "\nbegin footprint v1 %s\n", fpname);
+
+		for(l = 0; l < subc->data->LayerN; l++) {
+			pcb_layer_t *ly = &subc->data->Layer[l];
+			pcb_layer_type_t lyt = pcb_layer_flags_(ly);
+			const char *lloc, *ltyp;
+
+			get_layer_props(lyt, lloc, ltyp, continue);
+
+			PCB_LINE_LOOP(ly)
+			{
+				if (line->term != NULL) print_terma(line->term, line);
+				pcb_fprintf(f, "	line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(line->term),
+					line->Point1.X - ox, line->Point1.Y - oy, line->Point2.X - ox, line->Point2.Y - oy,
+					line->Thickness, line->Clearance);
+			}
+			PCB_END_LOOP;
+
+			PCB_ARC_LOOP(ly)
+			{
+				if (arc->term != NULL) print_terma(arc->term, arc);
+				pcb_fprintf(f, "	arc %s %s %s %mm %mm %mm %f %f %mm %mm\n", lloc, ltyp, TERM_NAME(arc->term),
+					arc->X - ox, arc->Y - oy, (arc->Width + arc->Height)/2, arc->StartAngle, arc->Delta,
+					arc->Thickness, arc->Clearance);
+			}
+			PCB_END_LOOP;
+
+
+			PCB_POLY_LOOP(ly)
+			{
+				int go;
+				long numpt = 0;
+				pcb_coord_t x, y;
+				pcb_poly_it_t it;
+
+				pcb_poly_iterate_polyarea(polygon->Clipped, &it);
+				if (pcb_poly_contour(&it) == NULL) {
+					pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no clipped contour\n");
+					continue;
+				}
+
+				/* iterate over the vectors of the contour */
+				for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y))
+					numpt++;
+
+				if (pcb_poly_hole_first(&it) != NULL)
+					pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon holes\n");
+
+				if (numpt == 0) {
+					pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc polygon with no points\n");
+					continue;
+				}
+
+				if (polygon->term != NULL) print_terma(polygon->term, polygon);
+				pcb_fprintf(f, "	polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(polygon->term),
+					(PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, polygon) ? 0 : polygon->Clearance),
+					numpt);
+
+				/* rewind the iterator*/
+				pcb_poly_iterate_polyarea(polygon->Clipped, &it);
+				pcb_poly_contour(&it);
+				for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y))
+					pcb_fprintf(f, " %.06mm %.06mm", x - ox, y - oy);
+				pcb_fprintf(f, "\n");
+			}
+			PCB_END_LOOP;
+		}
+
+		PCB_PADSTACK_LOOP(subc->data)
+		{
+			pcb_pstk_proto_t *proto = pcb_pstk_get_proto(padstack);
+			pcb_pstk_tshape_t *tshp;
+			pcb_pstk_shape_t *shp;
+			int n, i;
+
+			if (proto == NULL) {
+				pcb_message(PCB_MSG_ERROR, "tEDAx footprint export: omitting subc padstack with invalid prototype\n");
+				continue;
+			}
+			if (padstack->term != NULL) print_terma(padstack->term, padstack);
+			if (proto->hdia > 0)
+				pcb_fprintf(f, "	hole %s %mm %mm %mm %s\n", TERM_NAME(padstack->term), padstack->x - ox, padstack->y - oy, proto->hdia, proto->hplated ? "-" : "unplated");
+
+			tshp = pcb_pstk_get_tshape(padstack);
+			for(n = 0, shp = tshp->shape; n < tshp->len; n++,shp++) {
+				const char *lloc, *ltyp;
+				pcb_coord_t clr;
+				
+				get_layer_props(shp->layer_mask, lloc, ltyp, continue);
+				clr = padstack->Clearance > 0 ? padstack->Clearance : shp->clearance;
+				switch(shp->shape) {
+					case PCB_PSSH_CIRC:
+						pcb_fprintf(f, "	fillcircle %s %s %s %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term),
+							padstack->x + shp->data.circ.x - ox, padstack->y + shp->data.circ.y - oy,
+							shp->data.circ.dia/2, clr);
+						break;
+					case PCB_PSSH_LINE:
+						if (shp->data.line.square) {
+							pcb_any_line_t tmp;
+							tmp.Point1.X = shp->data.line.x1 + padstack->x;
+							tmp.Point1.Y = shp->data.line.y1 + padstack->y;
+							tmp.Point2.X = shp->data.line.x2 + padstack->x;
+							tmp.Point2.Y = shp->data.line.y2 + padstack->y;
+							tmp.Thickness = shp->data.line.thickness;
+							pcb_fprintf(f, "	polygon %s %s %s %mm 4", lloc, ltyp, TERM_NAME(padstack->term), clr);
+							print_sqpad_coords(f, &tmp, ox, oy);
+							pcb_fprintf(f, "\n");
+						}
+						else {
+							pcb_fprintf(f, "	line %s %s %s %mm %mm %mm %mm %mm %mm\n", lloc, ltyp, TERM_NAME(padstack->term),
+								shp->data.line.x1 + padstack->x - ox, shp->data.line.y1 + padstack->y - oy,
+								shp->data.line.x2 + padstack->x - ox, shp->data.line.y2 + padstack->y - oy,
+								shp->data.line.thickness, clr);
+						}
+						break;
+					case PCB_PSSH_POLY:
+						pcb_fprintf(f, "	polygon %s %s %s %.06mm %ld", lloc, ltyp, TERM_NAME(padstack->term),
+							clr, shp->data.poly.len);
+						for(i = 0; i < shp->data.poly.len; i++)
+							pcb_fprintf(f, " %.06mm %.06mm",
+								shp->data.poly.x[i] + padstack->x - ox,
+								shp->data.poly.y[i] + padstack->y - oy);
+						pcb_fprintf(f, "\n");
+						break;
+				}
+			}
+		}
+		PCB_END_LOOP;
+
+		fprintf(f, "end footprint\n");
+
+		for (e = htsp_first(&terms); e; e = htsp_next(&terms, e)) {
+			free(e->key);
+			htsp_delentry(&terms, e);
+		}
+
+	}
+	PCB_END_LOOP;
+
+	htsp_uninit(&terms);
+
+	return 0;
+}
+
+int tedax_fp_save(pcb_data_t *data, const char *fn)
+{
+	int res;
+	FILE *f;
+
+	f = pcb_fopen(fn, "w");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "tedax_fp_save(): can't open %s for writing\n", fn);
+		return -1;
+	}
+	res = tedax_fp_fsave(data, f);
+	fclose(f);
+	return res;
+}
+
+
+/*******************************/
+
+typedef struct {
+	char *pinid;
+	/* type can be ignored in pcb-rnd */
+	char *name;
+
+	/* put all objects on this per terminal list so the padstack converter can pick them up */
+	vtp0_t objs;
+} term_t;
+
+static term_t *term_new(const char *pinid, const char *name)
+{
+	term_t *t = calloc(sizeof(term_t), 1);
+	t->pinid = pcb_strdup(pinid);
+	t->name = pcb_strdup(name);
+	return t;
+}
+
+static void term_destroy(term_t *t)
+{
+	free(t->pinid);
+	free(t->name);
+	vtp0_uninit(&t->objs);
+	free(t);
+}
+
+#define load_int(dst, src, msg) \
+do { \
+	char *end; \
+	dst = strtol(src, &end, 10); \
+	if (*end != '\0') { \
+		pcb_message(PCB_MSG_ERROR, msg, src); \
+		return -1; \
+	} \
+} while(0)
+
+#define load_dbl(dst, src, msg) \
+do { \
+	char *end; \
+	dst = strtod(src, &end); \
+	if (*end != '\0') { \
+		pcb_message(PCB_MSG_ERROR, msg, src); \
+		return -1; \
+	} \
+} while(0)
+
+#define load_val(dst, src, msg) \
+do { \
+	pcb_bool succ; \
+	dst = pcb_get_value_ex(src, NULL, NULL, NULL, "mm", &succ); \
+	if (!succ) { \
+		pcb_message(PCB_MSG_ERROR, msg, src); \
+		return -1; \
+	} \
+} while(0)
+
+#define load_term(obj, src, msg) \
+do { \
+	int termid; \
+	term_t *term; \
+	if ((src[0] == '-') && (src[1] == '\0')) break; \
+	load_int(termid, src, msg); \
+	term = htip_get(&terms, termid); \
+	if (term == NULL) { \
+		pcb_message(PCB_MSG_ERROR, "undefined terminal %s - skipping footprint\n", src); \
+		return -1; \
+	} \
+	pcb_attribute_put(&obj->Attributes, "term", term->name); \
+	vtp0_append(&term->objs, obj); \
+} while(0)
+
+#define load_lloc(dst, src, msg) \
+do { \
+	if (strcmp(src, "secondary") == 0) \
+		dst = 1; \
+	else if (strcmp(src, "primary") == 0) \
+		dst = 0; \
+	else { \
+		pcb_message(PCB_MSG_ERROR, msg, lloc); \
+		return -1; \
+	} \
+} while(0)
+
+
+static int load_poly(pcb_coord_t *px, pcb_coord_t *py, int maxpt, int argc, char *argv[])
+{
+	int max, n;
+	load_int(max, argv[0], "invalid number of points '%s' in poly, skipping footprint\n");
+	argc--;
+	argv++;
+	if (max*2 != argc) {
+		pcb_message(PCB_MSG_ERROR, "invalid number of polygon points: expected %d coords got %d skipping footprint\n", max*2, argc);
+		return -1;
+	}
+	for(n = 0; n < max; n++) {
+		load_val(px[n], argv[n*2+0], "invalid X '%s' in poly, skipping footprint\n");
+		load_val(py[n], argv[n*2+1], "invalid Y '%s' in poly, skipping footprint\n");
+	}
+	return max;
+}
+
+/* Returns a NULL terminated list of layers to operate on or NULL on error;
+   not reentrant! */
+static pcb_layer_t **subc_get_layer(pcb_subc_t *subc, const char *lloc, const char *ltyp)
+{
+	pcb_layer_type_t lyt = 0;
+	static pcb_layer_t *layers[4];
+	char name[128];
+
+	memset(layers, 0, sizeof(layers));
+
+	if (strcmp(ltyp, "copper") == 0) lyt |= PCB_LYT_COPPER;
+	else if (strcmp(ltyp, "silk") == 0) lyt |= PCB_LYT_SILK;
+	else if (strcmp(ltyp, "mask") == 0) lyt |= PCB_LYT_MASK;
+	else if (strcmp(ltyp, "paste") == 0) lyt |= PCB_LYT_PASTE;
+	else {
+		pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer type %s\n", ltyp);
+		return NULL;
+	}
+
+	if (strcmp(lloc, "all") == 0) {
+		sprintf(name, "top_%s", ltyp);
+		layers[0] = pcb_subc_get_layer(subc, lyt | PCB_LYT_TOP, -1, pcb_true, name, pcb_false);
+		sprintf(name, "bottom_%s", ltyp);
+		layers[1] = pcb_subc_get_layer(subc, lyt | PCB_LYT_BOTTOM, -1, pcb_true, name, pcb_false);
+		if (lyt == PCB_LYT_COPPER) {
+			sprintf(name, "intern_%s", ltyp);
+			layers[2] = pcb_subc_get_layer(subc, lyt | PCB_LYT_INTERN, -1, pcb_true, name, pcb_false);
+		}
+		return layers;
+	}
+
+	if (strcmp(lloc, "primary") == 0) lyt |= PCB_LYT_TOP;
+	else if (strcmp(lloc, "secondary") == 0) lyt |= PCB_LYT_BOTTOM;
+	else if (strcmp(lloc, "inner") == 0) lyt |= PCB_LYT_INTERN;
+	else {
+		pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: invalid layer location %s\n", lloc);
+		return NULL;
+	}
+
+	sprintf(name, "%s_%s", lloc, ltyp);
+	layers[0] = pcb_subc_get_layer(subc, lyt, -1, pcb_true, name, pcb_false);
+	return layers;
+}
+
+/* Parse one footprint block */
+static int tedax_parse_1fp_(pcb_subc_t *subc, FILE *fn, char *buff, int buff_size, char *argv[], int argv_size)
+{
+	int argc, termid, numpt, res = -1;
+	htip_entry_t *ei;
+	htip_t terms;
+	term_t *term;
+	pcb_coord_t px[256], py[256], clr;
+	pcb_layer_t **ly;
+
+	htip_init(&terms, longhash, longkeyeq);
+	while((argc = tedax_getline(fn, buff, buff_size, argv, argv_size)) >= 0) {
+		if ((argc == 5) && (strcmp(argv[0], "term") == 0)) {
+			load_int(termid, argv[1], "invalid term ID '%s', skipping footprint\n");
+			term = term_new(argv[2], argv[4]);
+			htip_set(&terms, termid, term);
+		}
+		else if ((argc > 12) && (strcmp(argv[0], "polygon") == 0)) {
+			pcb_poly_t *p;
+			ly = subc_get_layer(subc, argv[1], argv[2]);
+			if (ly == NULL) return -1;
+
+			numpt = load_poly(px, py, (sizeof(px) / sizeof(px[0])), argc-5, argv+5);
+			if (numpt < 0) {
+				pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to load polygon\n");
+				return -1;
+			}
+			load_val(clr, argv[4], "invalid clearance");
+
+			for(; *ly != NULL; ly++) {
+				int n;
+				p = pcb_poly_new(*ly, clr, pcb_no_flags());
+				if (p == NULL) {
+					pcb_message(PCB_MSG_ERROR, "tEDAx footprint load: failed to create poly, skipping footprint\n");
+					return -1;
+				}
+				for(n = 0; n < numpt; n++)
+					pcb_poly_point_new(p, px[n], py[n]);
+
+				load_term(p, argv[3], "invalid term ID for polygon: '%s', skipping footprint\n");
+
+				pcb_add_poly_on_layer(*ly, p);
+			}
+		}
+		else if ((argc == 10) && (strcmp(argv[0], "line") == 0)) {
+			pcb_coord_t x1, y1, x2, y2, w, clr;
+			pcb_line_t *l;
+
+			ly = subc_get_layer(subc, argv[1], argv[2]);
+
+			load_val(x1, argv[4], "invalid line x1");
+			load_val(y1, argv[5], "invalid line y1");
+			load_val(x2, argv[6], "invalid line x2");
+			load_val(y2, argv[7], "invalid line y2");
+			load_val(w, argv[8], "invalid line width");
+			load_val(clr, argv[9], "invalid line clearance");
+
+			for(; *ly != NULL; ly++) {
+				l = pcb_line_new(*ly, x1, y1, x2, y2, w, clr, pcb_flag_make(PCB_FLAG_CLEARLINE));
+				load_term(l, argv[3], "invalid term ID for line: '%s', skipping footprint\n");
+			}
+		}
+		else if ((argc == 11) && (strcmp(argv[0], "arc") == 0)) {
+			pcb_coord_t cx, cy, r, w;
+			double sa, da;
+			pcb_arc_t *a;
+
+			ly = subc_get_layer(subc, argv[1], argv[2]);
+
+			load_val(cx, argv[4], "invalid arc cx");
+			load_val(cy, argv[5], "invalid arc cy");
+			load_val(r, argv[6], "invalid arc radius");
+			load_dbl(sa, argv[7], "invalid arc start angle");
+			load_dbl(da, argv[8], "invalid arc delta angle");
+			load_val(w, argv[9], "invalid arc width");
+
+			for(; *ly != NULL; ly++) {
+				a = pcb_arc_new(*ly, cx, cy, r, r, sa, da, w, clr, pcb_flag_make(PCB_FLAG_CLEARLINE), pcb_true);
+				load_term(a, argv[3], "invalid term ID for arc: '%s', skipping footprint\n");
+			}
+		}
+		else if ((argc == 6) && (strcmp(argv[0], "hole") == 0)) {
+			pcb_coord_t cx, cy, d;
+			int plated;
+			pcb_pstk_t *ps;
+
+			load_val(cx, argv[2], "invalid hole cx");
+			load_val(cy, argv[3], "invalid hole cy");
+			load_val(d, argv[4], "invalid hole radius");
+			plated = !(strcmp(argv[5], "unplated") == 0);
+
+			ps = pcb_pstk_new_hole(subc->data, cx, cy, d, plated);
+			load_term(ps, argv[1], "invalid term ID for hole: '%s', skipping footprint\n");
+		}
+		else if ((argc == 8) && (strcmp(argv[0], "fillcircle") == 0)) {
+			pcb_coord_t cx, cy, r, clr;
+			pcb_line_t *l;
+
+			ly = subc_get_layer(subc, argv[1], argv[2]);
+			load_val(cx, argv[4], "invalid fillcircle cx");
+			load_val(cy, argv[5], "invalid fillcircle cy");
+			load_val(r, argv[6], "invalid fillcircle radius");
+			load_val(clr, argv[7], "invalid fillcircle clearance");
+
+			for(; *ly != NULL; ly++) {
+				l = pcb_line_new(*ly, cx, cy, cx, cy, r*2, clr, pcb_flag_make(PCB_FLAG_CLEARLINE));
+				load_term(l, argv[3], "invalid term ID for fillcircle: '%s', skipping footprint\n");
+			}
+		}
+		else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "footprint") == 0)) {
+			res = 0;
+			break;
+		}
+	}
+
+	/* By now we have heavy terminals and a list of object for each terminal in
+	   the terms hash. Iterate over the terminals and try to convert the objects
+	   into one or more padstacks */
+	for (ei = htip_first(&terms); ei; ei = htip_next(&terms, ei)) {
+		term = ei->value;
+		pcb_pstk_vect2pstk(subc->data, &term->objs, pcb_true);
+		term_destroy(term);
+	}
+	htip_uninit(&terms);
+
+	pcb_attribute_put(&subc->Attributes, "refdes", "X1");
+	pcb_subc_add_refdes_text(subc, 0, 0, 0, 100, pcb_false);
+	pcb_subc_create_aux(subc, 0, 0, 0.0, pcb_false);
+
+	return res;
+}
+
+static int tedax_parse_1fp(pcb_data_t *data, FILE *fn, char *buff, int buff_size, char *argv[], int argv_size)
+{
+	pcb_subc_t *sc = pcb_subc_alloc();
+	pcb_add_subc_to_data(data, sc);
+
+	if (tedax_parse_1fp_(sc, fn, buff, buff_size, argv, argv_size) != 0) {
+		pcb_subc_free(sc);
+		return -1;
+	}
+
+	return 0;
+}
+
+
+/* parse one or more footprint blocks */
+static int tedax_parse_fp(pcb_data_t *data, FILE *fn, int multi)
+{
+	char line[520];
+	char *argv[16];
+	int found = 0;
+
+	if (tedax_seek_hdr(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0)
+		return -1;
+
+	do {
+		if (tedax_seek_block(fn, "footprint", "v1", (found > 0), line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0)
+			break;
+
+		if (tedax_parse_1fp(data, fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0)
+			return -1;
+		found++;
+	} while(multi);
+	return 0;
+}
+
+int tedax_fp_load(pcb_data_t *data, const char *fn, int multi)
+{
+	FILE *f;
+	int ret = 0;
+
+	f = pcb_fopen(fn, "r");
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fn);
+		return -1;
+	}
+
+	ret = tedax_parse_fp(data, f, multi);
+
+	fclose(f);
+	return ret;
+}
Index: tags/2.0.1/src_plugins/io_tedax/footprint.h
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/footprint.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/footprint.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "data.h"
+
+int tedax_fp_save(pcb_data_t *data, const char *fn);
+int tedax_fp_fsave(pcb_data_t *data, FILE *f);
+int tedax_fp_load(pcb_data_t *data, const char *fn, int multi);
Index: tags/2.0.1/src_plugins/io_tedax/io_tedax.c
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/io_tedax.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/io_tedax.c	(revision 18980)
@@ -0,0 +1,217 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  tedax IO plugin - plugin coordination
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "footprint.h"
+
+#include "board.h"
+#include "netlist.h"
+#include "conf_core.h"
+#include "buffer.h"
+#include "plugins.h"
+#include "hid.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "plug_io.h"
+
+
+static const char *tedax_cookie = "tEDAx IO";
+static pcb_plug_io_t io_tedax;
+
+int io_tedax_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
+{
+	if (strcmp(ctx->description, fmt) == 0)
+		return 200;
+
+	if ((pcb_strcasecmp(fmt, "tedax") != 0) ||
+		((typ & (~(PCB_IOT_PCB | PCB_IOT_FOOTPRINT | PCB_IOT_BUFFER))) != 0))
+		return 0;
+
+	return 100;
+}
+
+
+static const char pcb_acts_Savetedax[] = "SaveTedax(board-footprints, filename)";
+static const char pcb_acth_Savetedax[] = "Saves the specific type of data in a tEDAx file. Type can be: board-footprints";
+static fgw_error_t pcb_act_Savetedax(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL, *type;
+
+	PCB_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str);
+
+	if (pcb_strcasecmp(type, "board-footprints") == 0) {
+		PCB_ACT_IRES(tedax_fp_save(PCB->Data, fname));
+		return 0;
+	}
+
+	PCB_ACT_FAIL(Savetedax);
+	PCB_ACT_IRES(1);
+	return 0;
+}
+
+#define gen_load(type, fname) \
+do { \
+	static char *default_file = NULL; \
+	if ((fname == NULL) || (*fname == '\0')) { \
+		fname = pcb_gui->fileselect("Load tedax " #type " file...", \
+																"Picks a tedax " #type " file to load.\n", \
+																default_file, ".tdx", "tedax-" #type, HID_FILESELECT_READ); \
+		if (fname == NULL) \
+			return 1; \
+		if (default_file != NULL) { \
+			free(default_file); \
+			default_file = NULL; \
+		} \
+	} \
+} while(0)
+
+static const char pcb_acts_LoadtedaxFrom[] = "LoadTedaxFrom(netlist|footprint, filename)";
+static const char pcb_acth_LoadtedaxFrom[] = "Loads the specified block from a tedax file. Type can be: netlist or footprint.";
+static fgw_error_t pcb_act_LoadtedaxFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL, *type;
+
+	PCB_ACT_CONVARG(1, FGW_STR, Savetedax, type = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Savetedax, fname = argv[2].val.str);
+
+	if (pcb_strcasecmp(type, "netlist") == 0) {
+		gen_load(netlist, fname);
+		PCB_ACT_IRES(tedax_net_load(fname));
+		return 0;
+	}
+	if (pcb_strcasecmp(type, "footprint") == 0) {
+		gen_load(footprint, fname);
+		PCB_ACT_IRES(tedax_fp_load(PCB_PASTEBUFFER->Data, fname, 0));
+		return 0;
+	}
+	PCB_ACT_FAIL(Savetedax);
+}
+
+pcb_action_t tedax_action_list[] = {
+	{"LoadTedaxFrom", pcb_act_LoadtedaxFrom, pcb_acth_LoadtedaxFrom, pcb_acts_LoadtedaxFrom},
+	{"SaveTedax", pcb_act_Savetedax, pcb_acth_Savetedax, pcb_acts_Savetedax}
+};
+
+PCB_REGISTER_ACTIONS(tedax_action_list, tedax_cookie)
+
+static int io_tedax_parse_element(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+{
+	return tedax_fp_load(Ptr, name, 0);
+}
+
+static int io_tedax_write_element(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *dt)
+{
+	return tedax_fp_fsave(dt, f);
+}
+
+static int io_tedax_write_buffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff, pcb_bool elem_only)
+{
+	return tedax_fp_fsave(buff->Data, f);
+}
+
+static int io_tedax_test_parse(pcb_plug_io_t *plug_ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f)
+{
+	char line[515], *s;
+	int n;
+	for(n = 0; n < 32; n++) {
+		s = fgets(line, sizeof(line), f);
+		if (s == NULL)
+			return 0;
+		while(isspace(*s)) s++;
+		if (*s == '#')
+			continue;
+		if (strncmp(s, "tEDAx", 5) == 0) {
+			s += 5;
+			while(isspace(*s)) s++;
+			if ((s[0] == 'v') && (s[1] == '1'))
+				return 1; /* support version 1 only */
+		}
+	}
+	return 0;
+}
+
+int io_tedax_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+{
+	int res;
+
+	Ptr->is_footprint = 1;
+
+	res = tedax_fp_load(Ptr->Data, Filename, 0);
+	if (res == 0) {
+		pcb_subc_t *sc = Ptr->Data->subc.lst.first;
+
+		pcb_layergrp_upgrade_to_pstk(Ptr);
+		pcb_layer_create_all_for_recipe(Ptr, sc->data->Layer, sc->data->LayerN);
+		pcb_subc_rebind(Ptr, sc);
+		pcb_data_clip_polys(sc->data);
+	}
+	return res;
+}
+
+
+int pplg_check_ver_io_tedax(int ver_needed) { return 0; }
+
+void pplg_uninit_io_tedax(void)
+{
+	pcb_remove_actions_by_cookie(tedax_cookie);
+	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_tedax);
+}
+
+#include "dolists.h"
+int pplg_init_io_tedax(void)
+{
+	PCB_API_CHK_VER;
+
+	/* register the IO hook */
+	io_tedax.plugin_data = NULL;
+	io_tedax.fmt_support_prio = io_tedax_fmt;
+	io_tedax.test_parse = io_tedax_test_parse;
+	io_tedax.parse_pcb = io_tedax_parse_pcb;
+	io_tedax.parse_footprint = io_tedax_parse_element;
+	io_tedax.parse_font = NULL;
+	io_tedax.write_buffer = io_tedax_write_buffer;
+	io_tedax.write_footprint = io_tedax_write_element;
+	io_tedax.write_pcb = NULL;
+	io_tedax.default_fmt = "tEDAx";
+	io_tedax.description = "Trivial EDA eXchange format";
+	io_tedax.save_preference_prio = 95;
+	io_tedax.default_extension = ".tdx";
+	io_tedax.fp_extension = ".tdx";
+	io_tedax.mime_type = "application/tEDAx";
+
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_tedax);
+
+	PCB_REGISTER_ACTIONS(tedax_action_list, tedax_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/io_tedax/io_tedax.pup
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/io_tedax.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/io_tedax.pup	(revision 18980)
@@ -0,0 +1,12 @@
+$class import
+$short tEDAx (Trivial EDA eXchange)
+$long Import and export tEDAx netlists and footprints.
+$state works
+$fmt-native no
+$fmt-feature-r tEDAx netlist (any version)
+$fmt-feature-r tEDAx footprint (any version)
+$fmt-feature-w tEDAx footprint (any version)
+$package io-standard
+dep lib_compat_help
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/io_tedax/netlist.c
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/netlist.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/netlist.c	(revision 18980)
@@ -0,0 +1,139 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  tedax IO plugin - netlist import
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <genht/htsp.h>
+#include <genht/hash.h>
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "compat_misc.h"
+#include "actions.h"
+#include "safe_fs.h"
+
+#include "parse.h"
+
+typedef struct {
+	char *value;
+	char *footprint;
+} fp_t;
+
+static void *htsp_get2(htsp_t *ht, const char *key, size_t size)
+{
+	void *res = htsp_get(ht, key);
+	if (res == NULL) {
+		res = calloc(size, 1);
+		htsp_set(ht, pcb_strdup(key), res);
+	}
+	return res;
+}
+
+static int tedax_parse_net(FILE *fn)
+{
+	char line[520];
+	char *argv[16];
+	int argc;
+	htsp_t fps;
+	htsp_entry_t *e;
+
+	if (tedax_seek_hdr(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0)
+		return -1;
+
+	if (tedax_seek_block(fn, "netlist", "v1", 0, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0])) < 0)
+		return -1;
+
+	htsp_init(&fps, strhash, strkeyeq);
+
+	pcb_actionl("Netlist", "Freeze", NULL);
+	pcb_actionl("Netlist", "Clear", NULL);
+
+	while((argc = tedax_getline(fn, line, sizeof(line), argv, sizeof(argv)/sizeof(argv[0]))) >= 0) {
+		if ((argc == 3) && (strcmp(argv[0], "footprint") == 0)) {
+			fp_t *fp = htsp_get2(&fps, argv[1], sizeof(fp_t));
+			fp->footprint = pcb_strdup(argv[2]);
+		}
+		else if ((argc == 3) && (strcmp(argv[0], "value") == 0)) {
+			fp_t *fp = htsp_get2(&fps, argv[1], sizeof(fp_t));
+			fp->value = pcb_strdup(argv[2]);
+		}
+		else if ((argc == 4) && (strcmp(argv[0], "conn") == 0)) {
+			char id[512];
+			sprintf(id, "%s-%s", argv[2], argv[3]);
+			pcb_actionl("Netlist", "Add",  argv[1], id, NULL);
+		}
+		else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "netlist") == 0))
+			break;
+	}
+
+	pcb_actionl("Netlist", "Sort", NULL);
+	pcb_actionl("Netlist", "Thaw", NULL);
+
+	pcb_actionl("ElementList", "start", NULL);
+	for (e = htsp_first(&fps); e; e = htsp_next(&fps, e)) {
+		fp_t *fp = e->value;
+
+/*		pcb_trace("tedax fp: refdes=%s val=%s fp=%s\n", e->key, fp->value, fp->footprint);*/
+		if (fp->footprint == NULL)
+			pcb_message(PCB_MSG_ERROR, "tedax: not importing refdes=%s: no footprint specified\n", e->key);
+		else
+			pcb_actionl("ElementList", "Need", null_empty(e->key), null_empty(fp->footprint), null_empty(fp->value), NULL);
+
+		free(e->key);
+		free(fp->value);
+		free(fp->footprint);
+		free(fp);
+	}
+
+	pcb_actionl("ElementList", "Done", NULL);
+
+	htsp_uninit(&fps);
+
+	return 0;
+}
+
+
+int tedax_net_load(const char *fname_net)
+{
+	FILE *fn;
+	int ret = 0;
+
+	fn = pcb_fopen(fname_net, "r");
+	if (fn == NULL) {
+		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		return -1;
+	}
+
+	ret = tedax_parse_net(fn);
+
+	fclose(fn);
+	return ret;
+}
+
Index: tags/2.0.1/src_plugins/io_tedax/netlist.h
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/netlist.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/netlist.h	(revision 18980)
@@ -0,0 +1 @@
+int tedax_net_load(const char *fname_net);
Index: tags/2.0.1/src_plugins/io_tedax/parse.c
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/parse.c	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/parse.c	(revision 18980)
@@ -0,0 +1,122 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *
+ *  tedax IO plugin - low level parser, similar to the reference implementation
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "parse.h"
+#include "error.h"
+#include "compat_misc.h"
+
+int tedax_getline(FILE *f, char *buff, int buff_size, char *argv[], int argv_size)
+{
+	int argc;
+
+	for(;;) {
+		char *s, *o;
+
+		if (fgets(buff, buff_size, f) == NULL)
+			return -1;
+
+		s = buff;
+		if (*s == '#') /* comment */
+			continue;
+		ltrim(s);
+		rtrim(s);
+		if (*s == '\0') /* empty line */
+			continue;
+
+		/* argv split */
+		for(argc = 0, o = argv[0] = s; *s != '\0';) {
+			if (*s == '\\') {
+				s++;
+				switch(*s) {
+					case 'r': *o = '\r'; break;
+					case 'n': *o = '\n'; break;
+					case 't': *o = '\t'; break;
+					default: *o = *s;
+				}
+				o++;
+				s++;
+				continue;
+			}
+			if ((argc+1 < argv_size) && ((*s == ' ') || (*s == '\t'))) {
+				*s = '\0';
+				s++;
+				o++;
+				while((*s == ' ') || (*s == '\t'))
+					s++;
+				argc++;
+				argv[argc] = o;
+			}
+			else {
+				*o = *s;
+				s++;
+				o++;
+			}
+		}
+		return argc+1; /* valid line, split up */
+	}
+
+	return -1; /* can't get here */
+}
+
+int tedax_seek_hdr(FILE *f, char *buff, int buff_size, char *argv[], int argv_size)
+{
+	int argc;
+
+	/* look for the header */
+	if ((argc = tedax_getline(f, buff, buff_size, argv, argv_size)) < 2) {
+		pcb_message(PCB_MSG_ERROR, "Can't find tEDAx header (no line)\n");
+		return -1;
+	}
+
+	if ((argv[1] == NULL) || (pcb_strcasecmp(argv[0], "tEDAx") != 0) || (pcb_strcasecmp(argv[1], "v1") != 0)) {
+		pcb_message(PCB_MSG_ERROR, "Can't find tEDAx header (wrong line)\n");
+		return -1;
+	}
+
+	return argc;
+}
+
+
+int tedax_seek_block(FILE *f, const char *blk_name, const char *blk_ver, int silent, char *buff, int buff_size, char *argv[], int argv_size)
+{
+	int argc;
+
+	/* seek block begin */
+	while((argc = tedax_getline(f, buff, buff_size, argv, argv_size)) >= 0)
+		if ((argc > 2) && (strcmp(argv[0], "begin") == 0) && (strcmp(argv[1], blk_name) == 0) && (strcmp(argv[2], blk_ver) == 0))
+			break;
+
+	if (argc < 2) {
+		if (!silent)
+			pcb_message(PCB_MSG_ERROR, "Can't find %s %s block in tEDAx\n", blk_ver, blk_name);
+		return -1;
+	}
+
+	return argc;
+}
Index: tags/2.0.1/src_plugins/io_tedax/parse.h
===================================================================
--- tags/2.0.1/src_plugins/io_tedax/parse.h	(nonexistent)
+++ tags/2.0.1/src_plugins/io_tedax/parse.h	(revision 18980)
@@ -0,0 +1,24 @@
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+/* remove leading whitespace */
+#define ltrim(s) while(isspace(*s)) s++
+
+/* remove trailing newline;; trailing backslash is an error */
+#define rtrim(s) \
+	do { \
+		char *end; \
+		for(end = s + strlen(s) - 1; (end >= s) && ((*end == '\r') || (*end == '\n')); end--) \
+			*end = '\0'; \
+		if (*end == '\\') \
+			return -1; \
+	} while(0)
+
+#define null_empty(s) ((s) == NULL ? "" : (s))
+
+int tedax_getline(FILE *f, char *buff, int buff_size, char *argv[], int argv_size);
+
+int tedax_seek_hdr(FILE *f, char *buff, int buff_size, char *argv[], int argv_size);
+int tedax_seek_block(FILE *f, const char *blk_name, const char *blk_ver, int silent, char *buff, int buff_size, char *argv[], int argv_size);
+
Index: tags/2.0.1/src_plugins/jostle/Makefile
===================================================================
--- tags/2.0.1/src_plugins/jostle/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/jostle/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_jostle
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/jostle/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/jostle/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/jostle/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {jostle}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/jostle/jostle.o @]
+
+switch /local/pcb/jostle/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/jostle/jostle.c
===================================================================
--- tags/2.0.1/src_plugins/jostle/jostle.c	(nonexistent)
+++ tags/2.0.1/src_plugins/jostle/jostle.c	(revision 18980)
@@ -0,0 +1,535 @@
+/*
+ * jostle plug-in for PCB.
+ *
+ * Copyright (C) 2007 Ben Jackson <ben@ben.com>
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ *
+ *
+ * Pushes lines out of the way.
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <float.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "rats.h"
+#include "polygon.h"
+#include "remove.h"
+#include "error.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "actions.h"
+#include "layer.h"
+#include "conf_core.h"
+#include "misc_util.h"
+#include "obj_line.h"
+#include "event.h"
+
+/*#define DEBUG_pcb_polyarea_t*/
+
+double pcb_vect_dist2(pcb_vector_t v1, pcb_vector_t v2);
+#define Vcpy2(r,a)              {(r)[0] = (a)[0]; (r)[1] = (a)[1];}
+#define Vswp2(a,b) { long t; \
+        t = (a)[0], (a)[0] = (b)[0], (b)[0] = t; \
+        t = (a)[1], (a)[1] = (b)[1], (b)[1] = t; \
+}
+
+/*{if (!pcb_marked.status && side==NORTHWEST) { pcb_draw_mark(pcb_true); pcb_marked.status = True; pcb_marked.X = p[0]; pcb_marked.Y = p[1]; pcb_draw_mark(False);} }*/
+
+enum {
+	JNORTH,
+	JNORTHEAST,
+	JEAST,
+	JSOUTHEAST,
+	JSOUTH,
+	JSOUTHWEST,
+	JWEST,
+	JNORTHWEST
+};
+
+const char *dirnames[] = {
+	"JNORTH",
+	"JNORTHEAST",
+	"JEAST",
+	"JSOUTHEAST",
+	"JSOUTH",
+	"JSOUTHWEST",
+	"JWEST",
+	"JNORTHWEST"
+};
+
+#define ARG(n) (argc > (n) ? argv[n] : 0)
+
+/* DEBUG */
+static void Debugpcb_polyarea_t(pcb_polyarea_t * s, char *color)
+{
+	int *x, *y, n, i = 0;
+	pcb_pline_t *pl;
+	pcb_vnode_t *v;
+	pcb_polyarea_t *p;
+
+#ifndef DEBUG_pcb_polyarea_t
+	return;
+#endif
+
+/* TODO: rewrite this to UI layers if needed
+	ddraw = pcb_gui->request_debug_draw();
+	ddgc = ddraw->make_gc();
+*/
+
+	p = s;
+	do {
+		for (pl = p->contours; pl; pl = pl->next) {
+			n = pl->Count;
+			x = (int *) malloc(n * sizeof(int));
+			y = (int *) malloc(n * sizeof(int));
+			for (v = &pl->head; i < n; v = v->next) {
+				x[i] = v->point[0];
+				y[i++] = v->point[1];
+			}
+/*			if (1) {
+				pcb_gui->set_color(ddgc, color ? color : conf_core.appearance.color.connected);
+				pcb_hid_set_line_width(ddgc, 1);
+				for (i = 0; i < n - 1; i++) {
+					pcb_gui->draw_line(ddgc, x[i], y[i], x[i + 1], y[i + 1]);
+					pcb_gui->fill_circle (ddgc, x[i], y[i], 30);
+				}
+				pcb_gui->draw_line(ddgc, x[n - 1], y[n - 1], x[0], y[0]);
+			}*/
+			free(x);
+			free(y);
+		}
+	} while ((p = p->f) != s);
+/*	ddraw->flush_debug_draw();*/
+	pcb_event(PCB_EVENT_BUSY, NULL);
+/*	sleep(3);
+	ddraw->finish_debug_draw();*/
+}
+
+/* Find the bounding box of a pcb_polyarea_t.
+ *
+ * pcb_polyarea_ts linked by ->f/b are outlines.\n
+ * n->contours->next would be the start of the inner holes (irrelevant
+ * for bounding box). */
+static pcb_box_t pcb_polyarea_t_boundingBox(pcb_polyarea_t * a)
+{
+	pcb_polyarea_t *n;
+	pcb_pline_t *pa;
+	pcb_box_t box;
+	int first = 1;
+
+	n = a;
+	do {
+		pa = n->contours;
+		if (first) {
+			box.X1 = pa->xmin;
+			box.X2 = pa->xmax + 1;
+			box.Y1 = pa->ymin;
+			box.Y2 = pa->ymax + 1;
+			first = 0;
+		}
+		else {
+			PCB_MAKE_MIN(box.X1, pa->xmin);
+			PCB_MAKE_MAX(box.X2, pa->xmax + 1);
+			PCB_MAKE_MIN(box.Y1, pa->ymin);
+			PCB_MAKE_MAX(box.Y2, pa->ymax + 1);
+		}
+	} while ((n = n->f) != a);
+	return box;
+}
+
+/* Given a polygon and a side of it (a direction north/northeast/etc), find a
+   line tangent to that side, offset by clearance, and return it as a pair of
+   vectors PQ. Make it long so it will intersect everything in the area. */
+static void pcb_polyarea_t_findXmostLine(pcb_polyarea_t * a, int side, pcb_vector_t p, pcb_vector_t q, int clearance)
+{
+	int extra;
+	p[0] = p[1] = 0;
+	q[0] = q[1] = 0;
+	extra = a->contours->xmax - a->contours->xmin + a->contours->ymax - a->contours->ymin;
+	switch (side) {
+	case JNORTH:
+		p[1] = q[1] = a->contours->ymin - clearance;
+		p[0] = a->contours->xmin - extra;
+		q[0] = a->contours->xmax + extra;
+		break;
+	case JSOUTH:
+		p[1] = q[1] = a->contours->ymax + clearance;
+		p[0] = a->contours->xmin - extra;
+		q[0] = a->contours->xmax + extra;
+		break;
+	case JEAST:
+		p[0] = q[0] = a->contours->xmax + clearance;
+		p[1] = a->contours->ymin - extra;
+		q[1] = a->contours->ymax + extra;
+		break;
+	case JWEST:
+		p[0] = q[0] = a->contours->xmin - clearance;
+		p[1] = a->contours->ymin - extra;
+		q[1] = a->contours->ymax + extra;
+		break;
+	default:											/* diagonal case */
+		{
+			int kx, ky, minmax, dq, ckx, cky;
+			pcb_coord_t mm[2] = { PCB_MAX_COORD, -PCB_MAX_COORD };
+			pcb_vector_t mmp[2];
+			pcb_vnode_t *v;
+
+			switch (side) {
+			case JNORTHWEST:
+				kx = 1;									/* new_x = kx * x + ky * y */
+				ky = 1;
+				dq = -1;								/* extend line in +x, dq*y */
+				ckx = cky = -1;					/* clear line in ckx*clear, cky*clear */
+				minmax = 0;							/* min or max */
+				break;
+			case JSOUTHWEST:
+				kx = 1;
+				ky = -1;
+				dq = 1;
+				ckx = -1;
+				cky = 1;
+				minmax = 0;
+				break;
+			case JNORTHEAST:
+				kx = 1;
+				ky = -1;
+				dq = 1;
+				ckx = 1;
+				cky = -1;
+				minmax = 1;
+				break;
+			case JSOUTHEAST:
+				kx = ky = 1;
+				dq = -1;
+				ckx = cky = 1;
+				minmax = 1;
+				break;
+			default:
+				pcb_message(PCB_MSG_ERROR, "jostle: aiee, what side?");
+				return;
+			}
+			v = &a->contours->head;
+			do {
+				int test = kx * v->point[0] + ky * v->point[1];
+				if (test < mm[0]) {
+					mm[0] = test;
+					mmp[0][0] = v->point[0];
+					mmp[0][1] = v->point[1];
+				}
+				if (test > mm[1]) {
+					mm[1] = test;
+					mmp[1][0] = v->point[0];
+					mmp[1][1] = v->point[1];
+				}
+			} while ((v = v->next) != &a->contours->head);
+			Vcpy2(p, mmp[minmax]);
+			/* add clearance in the right direction */
+			clearance *= 0.707123;		/* = cos(45) = sqrt(2)/2 */
+			p[0] += ckx * clearance;
+			p[1] += cky * clearance;
+			/* now create a tangent line to that point */
+			Vcpy2(q, p);
+			p[0] += -extra;
+			p[1] += -extra * dq;
+			q[0] += extra;
+			q[1] += extra * dq;
+		}
+	}
+}
+
+/* Given a 'side' from the JNORTH/JSOUTH/etc enum, rotate it by n. */
+static int rotateSide(int side, int n)
+{
+	return (side + n + 8) % 8;
+}
+
+/* Wrapper for CreateNewLineOnLayer that takes vectors and deals with Undo */
+static pcb_line_t *Createpcb_vector_tLineOnLayer(pcb_layer_t * layer, pcb_vector_t a, pcb_vector_t b, int thickness, int clearance, pcb_flag_t flags)
+{
+	pcb_line_t *line;
+
+	line = pcb_line_new(layer, a[0], a[1], b[0], b[1], thickness, clearance, flags);
+	if (line) {
+		pcb_undo_add_obj_to_create(PCB_OBJ_LINE, layer, line, line);
+	}
+	return line;
+}
+
+static pcb_line_t *MakeBypassLine(pcb_layer_t * layer, pcb_vector_t a, pcb_vector_t b, pcb_line_t * orig, pcb_polyarea_t ** expandp)
+{
+	pcb_line_t *line;
+
+	line = Createpcb_vector_tLineOnLayer(layer, a, b, orig->Thickness, orig->Clearance, orig->Flags);
+	if (line && expandp) {
+		pcb_polyarea_t *p = pcb_poly_from_line(line, line->Thickness + line->Clearance);
+		pcb_polyarea_boolean_free(*expandp, p, expandp, PCB_PBO_UNITE);
+	}
+	return line;
+}
+
+/* Given a 'brush' that's pushing things out of the way (possibly already
+ * cut down to just the part relevant to our line) and a line that
+ * intersects it on some layer, find the 45/90 lines required to go around
+ * the brush on the named side.  Create them and remove the original.
+ *
+ * Imagine side = north:
+                 /      \
+            ----b##FLAT##c----
+               Q          P
+   lA-ORIG####a            d####ORIG-lB
+             /              \
+ * First find the extended three lines that go around the brush.
+ * Then intersect them with each other and the original to find
+ * points a, b, c, d.  Finally connect the dots and remove the
+ * old straight line. */
+static int MakeBypassingLines(pcb_polyarea_t * brush, pcb_layer_t * layer, pcb_line_t * line, int side, pcb_polyarea_t ** expandp)
+{
+	pcb_vector_t pA, pB, flatA, flatB, qA, qB;
+	pcb_vector_t lA, lB;
+	pcb_vector_t a, b, c, d, junk;
+	int hits;
+
+	PCB_FLAG_SET(PCB_FLAG_DRC, line);			/* will cause sublines to inherit */
+	lA[0] = line->Point1.X;
+	lA[1] = line->Point1.Y;
+	lB[0] = line->Point2.X;
+	lB[1] = line->Point2.Y;
+
+	pcb_polyarea_t_findXmostLine(brush, side, flatA, flatB, line->Thickness / 2);
+	pcb_polyarea_t_findXmostLine(brush, rotateSide(side, 1), pA, pB, line->Thickness / 2);
+	pcb_polyarea_t_findXmostLine(brush, rotateSide(side, -1), qA, qB, line->Thickness / 2);
+	hits = pcb_vect_inters2(lA, lB, qA, qB, a, junk) +
+		pcb_vect_inters2(qA, qB, flatA, flatB, b, junk) +
+		pcb_vect_inters2(pA, pB, flatA, flatB, c, junk) + pcb_vect_inters2(lA, lB, pA, pB, d, junk);
+	if (hits != 4) {
+		return 0;
+	}
+	/* flip the line endpoints to match up with a/b */
+	if (pcb_vect_dist2(lA, d) < pcb_vect_dist2(lA, a)) {
+		Vswp2(lA, lB);
+	}
+	MakeBypassLine(layer, lA, a, line, NULL);
+	MakeBypassLine(layer, a, b, line, expandp);
+	MakeBypassLine(layer, b, c, line, expandp);
+	MakeBypassLine(layer, c, d, line, expandp);
+	MakeBypassLine(layer, d, lB, line, NULL);
+	pcb_line_destroy(layer, line);
+	return 1;
+}
+
+struct info {
+	pcb_box_t box;
+	pcb_polyarea_t *brush;
+	pcb_layer_t *layer;
+	pcb_polyarea_t *smallest; /* after cutting brush with line, the smallest chunk, which we will go around on 'side'. */
+	pcb_line_t *line;
+	int side;
+	double centroid; /* smallest difference between slices of brush after cutting with line, trying to find the line closest to the centroid to process first */
+};
+
+/* Process lines that intersect our 'brush'. */
+static pcb_r_dir_t jostle_callback(const pcb_box_t * targ, void *private)
+{
+	pcb_line_t *line = (pcb_line_t *) targ;
+	struct info *info = private;
+	pcb_polyarea_t *lp, *copy, *tmp, *n, *smallest = NULL;
+	pcb_vector_t p;
+	int inside = 0, side, r;
+	double small, big;
+	int nocentroid = 0;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) {
+		return 0;
+	}
+	fprintf(stderr, "hit! %p\n", (void *)line);
+	p[0] = line->Point1.X;
+	p[1] = line->Point1.Y;
+	if (pcb_poly_contour_inside(info->brush->contours, p)) {
+		pcb_fprintf(stderr, "\tinside1 %ms,%ms\n", p[0], p[1]);
+		inside++;
+	}
+	p[0] = line->Point2.X;
+	p[1] = line->Point2.Y;
+	if (pcb_poly_contour_inside(info->brush->contours, p)) {
+		pcb_fprintf(stderr, "\tinside2 %ms,%ms\n", p[0], p[1]);
+		inside++;
+	}
+	lp = pcb_poly_from_line(line, line->Thickness);
+	if (!pcb_polyarea_touching(lp, info->brush)) {
+		/* not a factor */
+		return 0;
+	}
+	pcb_polyarea_free(&lp);
+	if (inside) {
+		/* XXX not done!
+		   XXX if this is part of a series of lines passing
+		   XXX through, need to process as a group.
+		   XXX if it just ends in here, shorten it?? */
+		return 0;
+	}
+	/*
+	 * Cut the brush with the line to figure out which side to go
+	 * around.  Use a very fine line.  XXX can still graze.
+	 */
+	lp = pcb_poly_from_line(line, 1);
+	if (!pcb_polyarea_m_copy0(&copy, info->brush))
+		return 0;
+	r = pcb_polyarea_boolean_free(copy, lp, &tmp, PCB_PBO_SUB);
+	if (r != pcb_err_ok) {
+		pcb_fprintf(stderr, "Error while jostling PCB_PBO_SUB: %d\n", r);
+		return 0;
+	}
+	if (tmp == tmp->f) {
+		/* it didn't slice, must have glanced. intersect instead
+		 * to get the glancing sliver??
+		 */
+		pcb_fprintf(stderr, "try isect??\n");
+		lp = pcb_poly_from_line(line, line->Thickness);
+		r = pcb_polyarea_boolean_free(tmp, lp, &tmp, PCB_PBO_ISECT);
+		if (r != pcb_err_ok) {
+			fprintf(stderr, "Error while jostling PCB_PBO_ISECT: %d\n", r);
+			return 0;
+		}
+		nocentroid = 1;
+	}
+	/* XXX if this operation did not create two chunks, bad things are about to happen */
+	if (!tmp)
+		return 0;
+	n = tmp;
+	small = big = tmp->contours->area;
+	do {
+		pcb_fprintf(stderr, "\t\tarea %g, %ms,%ms %ms,%ms\n", n->contours->area, n->contours->xmin, n->contours->ymin,
+								n->contours->xmax, n->contours->ymax);
+		if (n->contours->area <= small) {
+			smallest = n;
+			small = n->contours->area;
+		}
+		if (n->contours->area >= big) {
+			big = n->contours->area;
+		}
+	} while ((n = n->f) != tmp);
+	if (line->Point1.X == line->Point2.X) {	/* | */
+		if (info->box.X2 - smallest->contours->xmax > smallest->contours->xmin - info->box.X1) {
+			side = JWEST;
+		}
+		else {
+			side = JEAST;
+		}
+	}
+	else if (line->Point1.Y == line->Point2.Y) {	/* - */
+		if (info->box.Y2 - smallest->contours->ymax > smallest->contours->ymin - info->box.Y1) {
+			side = JNORTH;
+		}
+		else {
+			side = JSOUTH;
+		}
+	}
+	else if ((line->Point1.X > line->Point2.X) == (line->Point1.Y > line->Point2.Y)) {	/* \ */
+		if (info->box.X2 - smallest->contours->xmax > smallest->contours->xmin - info->box.X1) {
+			side = JSOUTHWEST;
+		}
+		else {
+			side = JNORTHEAST;
+		}
+	}
+	else {												/* / */
+		if (info->box.X2 - smallest->contours->xmax > smallest->contours->xmin - info->box.X1) {
+			side = JNORTHWEST;
+		}
+		else {
+			side = JSOUTHEAST;
+		}
+	}
+	pcb_fprintf(stderr, "\t%s\n", dirnames[side]);
+	if (info->line == NULL || (!nocentroid && (big - small) < info->centroid)) {
+		pcb_fprintf(stderr, "\tkeep it!\n");
+		if (info->smallest) {
+			pcb_polyarea_free(&info->smallest);
+		}
+		info->centroid = nocentroid ? DBL_MAX : (big - small);
+		info->side = side;
+		info->line = line;
+		info->smallest = smallest;
+		return 1;
+	}
+	return 0;
+}
+
+static const char pcb_acts_jostle[] = "Jostle(diameter)";
+static const char pcb_acth_jostle[] = "Make room by moving wires away.";
+static fgw_error_t pcb_act_jostle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	pcb_polyarea_t *expand;
+	float value = conf_core.design.via_thickness + (conf_core.design.bloat + 1) * 2 + 50;
+	struct info info;
+	int found;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, jostle, value = fgw_keyword(&argv[1]));
+
+	x = pcb_crosshair.X;
+	y = pcb_crosshair.Y;
+	fprintf(stderr, "%d, %d, %f\n", (int) x, (int) y, value);
+	info.brush = pcb_poly_from_circle(x, y, value / 2);
+	info.layer = CURRENT;
+	PCB_LINE_LOOP(info.layer);
+	{
+		PCB_FLAG_CLEAR(PCB_FLAG_DRC, line);
+	}
+	PCB_END_LOOP;
+	do {
+		info.box = pcb_polyarea_t_boundingBox(info.brush);
+		Debugpcb_polyarea_t(info.brush, NULL);
+		pcb_fprintf(stderr, "search (%ms,%ms)->(%ms,%ms):\n", info.box.X1, info.box.Y1, info.box.X2, info.box.Y2);
+		info.line = NULL;
+		info.smallest = NULL;
+		pcb_r_search(info.layer->line_tree, &info.box, NULL, jostle_callback, &info, &found);
+		if (found) {
+			expand = NULL;
+			MakeBypassingLines(info.smallest, info.layer, info.line, info.side, &expand);
+			pcb_polyarea_free(&info.smallest);
+			pcb_polyarea_boolean_free(info.brush, expand, &info.brush, PCB_PBO_UNITE);
+		}
+	} while (found);
+	pcb_board_set_changed_flag(pcb_true);
+	pcb_undo_inc_serial();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t jostle_action_list[] = {
+	{"jostle", pcb_act_jostle, pcb_acth_jostle, pcb_acts_jostle}
+};
+
+char *jostle_cookie = "jostle plugin";
+
+PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie)
+
+int pplg_check_ver_jostle(int ver_needed) { return 0; }
+
+void pplg_uninit_jostle(void)
+{
+	pcb_remove_actions_by_cookie(jostle_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_jostle(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(jostle_action_list, jostle_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/jostle/jostle.pup
===================================================================
--- tags/2.0.1/src_plugins/jostle/jostle.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/jostle/jostle.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short push lines out of the way
+$long Pushes lines out of the way.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/lib_compat_help/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_compat_help
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/lib_compat_help/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {lib_compat_help}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/lib_compat_help/lib_compat_help.o
+@]
+
+switch /local/pcb/lib_compat_help/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_compat_help/elem_rot.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/elem_rot.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/elem_rot.c	(revision 18980)
@@ -0,0 +1,251 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *
+ *  (This file was part of the original PCB source on the import, as bom.c,
+ *  but did not have a copyright banner. The names of the original authors
+ *  potentially can be found in the old CVS.)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "elem_rot.h"
+#include "conf_core.h"
+#include "data_it.h"
+#include "macro.h"
+
+static const int verbose_rot = 0;
+
+/* In order of preference.
+ * Includes numbered and BGA pins.
+ * Possibly BGA pins can be missing, so we add a few to try. */
+#define MAXREFPINS 32 /* max length of following list */
+static char *reference_pin_names[] = {"1", "2", "A1", "A2", "B1", "B2", 0};
+
+static double xyToAngle(double x, double y, pcb_bool morethan2pins)
+{
+	double d = atan2(-y, x) * 180.0 / M_PI;
+
+		if (verbose_rot)
+			pcb_trace(" xyToAngle: %f %f %d ->%f\n", x, y, morethan2pins, d);
+
+	/* IPC 7351 defines different rules for 2 pin elements */
+	if (morethan2pins) {
+		/* Multi pin case:
+		 * Output 0 degrees if pin1 in is top left or top, i.e. between angles of
+		 * 80 to 170 degrees.
+		 * Pin #1 can be at dead top (e.g. certain PLCCs) or anywhere in the top
+		 * left.
+		 */
+		if (d < -100)
+			return 90;								/* -180 to -100 */
+		else if (d < -10)
+			return 180;								/* -100 to -10 */
+		else if (d < 80)
+			return 270;								/* -10 to 80 */
+		else if (d < 170)
+			return 0;									/* 80 to 170 */
+		else
+			return 90;								/* 170 to 180 */
+	}
+	else {
+		/* 2 pin element:
+		 * Output 0 degrees if pin #1 is in top left or left, i.e. in sector
+		 * between angles of 95 and 185 degrees.
+		 */
+		if (d < -175)
+			return 0;									/* -180 to -175 */
+		else if (d < -85)
+			return 90;								/* -175 to -85 */
+		else if (d < 5)
+			return 180;								/* -85 to 5 */
+		else if (d < 95)
+			return 270;								/* 5 to 95 */
+		else
+			return 0;									/* 95 to 180 */
+	}
+}
+
+void pcb_subc_xy_rot(pcb_subc_t *subc, pcb_coord_t *cx, pcb_coord_t *cy, double *theta, double *xray_theta, pcb_bool autodetect)
+{
+	double centroidx, centroidy;
+	int found_any_not_at_centroid, found_any, rpindex;
+	double sumx, sumy;
+	double pin1x = 0.0, pin1y = 0.0;
+	int pin_cnt, bott = 0;
+	int pinfound[MAXREFPINS];
+	double pinx[MAXREFPINS];
+	double piny[MAXREFPINS];
+	const char *fixed_rotation;
+	pcb_coord_t ox = 0, oy = 0;
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+
+	memset(pinfound, 0, sizeof(pinfound));
+
+	if (!autodetect) {
+		if (pcb_subc_get_origin(subc, &ox, &oy) != 0)
+			pcb_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc origin for %s\n", subc->refdes);
+
+		if (pcb_subc_get_side(subc, &bott) != 0)
+			pcb_message(PCB_MSG_ERROR, "pcb_subc_xy_rot(): can't get subc side for %s\n", subc->refdes);
+	}
+
+	/* initialize our pin count and our totals for finding the
+	   centriod */
+	pin_cnt = 0;
+	sumx = 0.0;
+	sumy = 0.0;
+
+	/*
+	 * iterate over the pins and pads keeping a running count of how
+	 * many pins/pads total and the sum of x and y coordinates
+	 *
+	 * While we're at it, store the location of pin/pad #1 and #2 if
+	 * we can find them
+	 */
+	for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		pcb_coord_t px, py;
+
+		if (o->term == NULL)
+			continue;
+
+		if (o->type == PCB_OBJ_PSTK) {
+			px = ((pcb_pstk_t *)o)->x;
+			py = ((pcb_pstk_t *)o)->y;
+		}
+		else {
+			px = (o->BoundingBox.X1 + o->BoundingBox.X2) / 2;
+			py = (o->BoundingBox.Y1 + o->BoundingBox.Y2) / 2;
+		}
+
+		sumx += (double)px;
+		sumy += (double)py;
+		pin_cnt++;
+
+		for (rpindex = 0; reference_pin_names[rpindex]; rpindex++) {
+			if (PCB_NSTRCMP(o->term, reference_pin_names[rpindex]) == 0) {
+				pinx[rpindex] = (double)px;
+				piny[rpindex] = (double)py;
+				pinfound[rpindex] = 1;
+			}
+		}
+	}
+
+	if (pin_cnt > 0) {
+		centroidx = sumx / (double) pin_cnt;
+		centroidy = sumy / (double) pin_cnt;
+
+		if (!autodetect && (PCB_NSTRCMP(pcb_attribute_get(&subc->Attributes, "xy-centre"), "origin") == 0)) {
+			*cx = ox;
+			*cy = oy;
+		}
+		else {
+			*cx = centroidx;
+			*cy = centroidy;
+		}
+
+		fixed_rotation = pcb_attribute_get(&subc->Attributes, "xy-fixed-rotation");
+		if (fixed_rotation != NULL) {
+			/* The user specified a fixed rotation */
+			*theta = atof(fixed_rotation);
+			found_any_not_at_centroid = 1;
+			found_any = 1;
+		}
+		else {
+			/* Find first reference pin not at the  centroid  */
+			found_any_not_at_centroid = 0;
+			found_any = 0;
+			*theta = 0.0;
+			for (rpindex = 0; reference_pin_names[rpindex] && !found_any_not_at_centroid; rpindex++) {
+				if (pinfound[rpindex]) {
+					found_any = 1;
+
+					/* Recenter pin "#1" onto the axis which cross at the part
+					   centroid */
+					pin1x = pinx[rpindex] - *cx;
+					pin1y = piny[rpindex] - *cy;
+
+					if (verbose_rot)
+						pcb_trace("\npcb_subc_xy_rot: %s pin_cnt=%d pin1x=%d pin1y=%d\n", PCB_UNKNOWN(subc->refdes), pin_cnt, pin1x, pin1y);
+
+					/* if only 1 pin, we are doomed */
+					if (pin_cnt == 1) {
+						*theta = 0;
+						found_any_not_at_centroid = 1;
+					}
+					else {
+						if ((pin1x != 0.0) || (pin1y != 0.0))
+							*xray_theta = xyToAngle(pin1x, pin1y, pin_cnt > 2);
+
+						/* flip x, to reverse rotation for elements on back */
+						if (bott)
+							pin1x = -pin1x;
+
+						if ((pin1x != 0.0) || (pin1y != 0.0)) {
+							*theta = xyToAngle(pin1x, pin1y, pin_cnt > 2);
+							found_any_not_at_centroid = 1;
+						}
+					}
+					if (verbose_rot)
+						pcb_trace(" ->theta=%f\n", *theta);
+				}
+			}
+
+			if (!found_any) {
+				pcb_message
+					(PCB_MSG_WARNING, "pcb_subc_xy_rot: unable to figure out angle because I could\n"
+					 "     not find a suitable reference pin of element %s\n"
+					 "     Setting to %g degrees\n", PCB_UNKNOWN(subc->refdes), *theta);
+			}
+			else if (!found_any_not_at_centroid) {
+				pcb_message
+					(PCB_MSG_WARNING, "pcb_subc_xy_rot: unable to figure out angle of element\n"
+					 "     %s because the reference pin(s) are at the centroid of the part.\n"
+					 "     Setting to %g degrees\n", PCB_UNKNOWN(subc->refdes), *theta);
+			}
+		}
+	}
+}
+
+void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, pcb_coord_t subc_ox, pcb_coord_t subc_oy, pcb_bool on_bottom)
+{
+	pcb_coord_t cx = subc_ox, cy = subc_oy;
+	double rot = 0.0, tmp;
+	const char *cent;
+
+	pcb_subc_xy_rot(subc, &cx, &cy, &rot, &tmp, 1);
+
+	/* unless xy-centre or pnp-centre is set to origin, place a pnp origin mark */
+	cent = pcb_attribute_get(&subc->Attributes, "xy-centre");
+	if (cent == NULL)
+		cent = pcb_attribute_get(&subc->Attributes, "pnp-centre");
+	if ((cent == NULL) || (strcmp(cent, "origin") != 0))
+		pcb_subc_create_aux_point(subc, cx, cy, "pnp-origin");
+
+	/* add the base vector at the origin imported, but with the rotation
+	   reverse engineered: the original element format does have an explicit
+	   origin but no rotation info */
+	pcb_subc_create_aux(subc, subc_ox, subc_oy, rot, on_bottom);
+}
+
Index: tags/2.0.1/src_plugins/lib_compat_help/elem_rot.h
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/elem_rot.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/elem_rot.h	(revision 18980)
@@ -0,0 +1,5 @@
+void pcb_subc_xy_rot(pcb_subc_t *subc, pcb_coord_t *cx, pcb_coord_t *cy, double *theta, double *xray_theta, pcb_bool autodetect);
+
+/* Automatic version of pcb_subc_xy_rot: inserts all the p&p attributes and creates the aux layer */
+void pcb_subc_xy_rot_pnp(pcb_subc_t *subc, pcb_coord_t subc_ox, pcb_coord_t subc_oy, pcb_bool on_bottom);
+
Index: tags/2.0.1/src_plugins/lib_compat_help/layer_compat.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/layer_compat.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/layer_compat.c	(revision 18980)
@@ -0,0 +1,87 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "layer_compat.h"
+#include "pstk_compat.h"
+
+#include "board.h"
+#include "data.h"
+
+#warning padstack TODO: rewrite this for padstack, if needed
+#if 0
+static void swap_one_thermal(int lid1, int lid2, pcb_pin_t * pin)
+{
+	int was_on_l1 = !!PCB_FLAG_THERM_GET(lid1, pin);
+	int was_on_l2 = !!PCB_FLAG_THERM_GET(lid2, pin);
+
+	PCB_FLAG_THERM_ASSIGN(lid2, was_on_l1, pin);
+	PCB_FLAG_THERM_ASSIGN(lid1, was_on_l2, pin);
+}
+#endif
+
+int pcb_layer_swap(pcb_board_t *pcb, pcb_layer_id_t lid1, pcb_layer_id_t lid2)
+{
+	pcb_layer_t l1tmp, l2tmp;
+	pcb_layergrp_id_t gid;
+
+	if (lid1 == lid2)
+		return 0;
+
+	pcb_layer_move_(&l1tmp, &pcb->Data->Layer[lid1]);
+	pcb_layer_move_(&l2tmp, &pcb->Data->Layer[lid2]);
+
+	pcb_layer_move_(&pcb->Data->Layer[lid1], &l2tmp);
+	pcb_layer_move_(&pcb->Data->Layer[lid2], &l1tmp);
+
+#warning padstack TODO: rewrite this for padstack, if needed
+#if 0
+	PCB_VIA_LOOP(pcb->Data);
+	{
+		swap_one_thermal(lid1, lid2, via);
+	}
+	PCB_END_LOOP;
+#endif
+
+	for(gid = 0; gid < pcb_max_group(pcb); gid++) {
+		pcb_layergrp_t *g = &pcb->LayerGroups.grp[gid];
+		int n;
+
+		for(n = 0; n < g->len; n++) {
+			if (g->lid[n] == lid1)
+				g->lid[n] = lid2;
+			else if (g->lid[n] == lid2)
+				g->lid[n] = lid1;
+		}
+	}
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_compat_help/layer_compat.h
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/layer_compat.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/layer_compat.h	(revision 18980)
@@ -0,0 +1,39 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,2004,2006 Thomas Nau
+ *  Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas (pcb-rnd extensions)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_LAYER_COMPAT_H
+#define PCB_LAYER_COMPAT_H
+
+#include "layer.h"
+
+
+/* Swap two layers in pcb; useful only in writing the old .pcb format,
+   because silk layers must be the last 2 layers there */
+int pcb_layer_swap(pcb_board_t *pcb, pcb_layer_id_t lid1, pcb_layer_id_t lid2);
+#endif
Index: tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.c	(revision 18980)
@@ -0,0 +1,20 @@
+#include <stdlib.h>
+#include "plugins.h"
+
+#include "layer_compat.c"
+#include "pstk_compat.c"
+#include "pstk_help.c"
+#include "subc_help.c"
+#include "elem_rot.c"
+
+int pplg_check_ver_lib_compat_help(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_compat_help(void)
+{
+}
+
+int pplg_init_lib_compat_help(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/lib_compat_help.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class lib
+$short #compatibility helper functions
+$long a library of functions providing a simplified API compatibility layer, mainly for I/O plugins
+$state works
+$package (core)
+#default disable-all
+default buildin
Index: tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.c	(revision 18980)
@@ -0,0 +1,762 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include "pstk_compat.h"
+#include "obj_pstk_inlines.h"
+#include "compat_misc.h"
+
+#include "plug_io.h"
+
+#define sqr(o) ((double)(o)*(double)(o))
+
+/* set up x and y multiplier for an octa poly, depending on square pin style */
+void pcb_poly_square_pin_factors(int style, double *xm, double *ym)
+{
+	int i;
+	const double factor = 2.0;
+
+	/* reset multipliers */
+	for (i = 0; i < 8; i++) {
+		xm[i] = 1;
+		ym[i] = 1;
+	}
+
+	style--;
+	if (style & 1)
+		xm[0] = xm[1] = xm[6] = xm[7] = factor;
+	if (style & 2)
+		xm[2] = xm[3] = xm[4] = xm[5] = factor;
+	if (style & 4)
+		ym[4] = ym[5] = ym[6] = ym[7] = factor;
+	if (style & 8)
+		ym[0] = ym[1] = ym[2] = ym[3] = factor;
+}
+
+
+
+/* emulate old pcb-rnd "pin shape" feature */
+static void octa_shape(pcb_pstk_poly_t *dst, pcb_coord_t x0, pcb_coord_t y0, pcb_coord_t radius, int style)
+{
+	double xm[8], ym[8];
+
+	pcb_pstk_shape_alloc_poly(dst, 8);
+
+	pcb_poly_square_pin_factors(style, xm, ym);
+
+	dst->x[7] = x0 + pcb_round(radius * 0.5) * xm[7];
+	dst->y[7] = y0 + pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * ym[7];
+	dst->x[6] = x0 + pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * xm[6];
+	dst->y[6] = y0 + pcb_round(radius * 0.5) * ym[6];
+	dst->x[5] = x0 - pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * xm[5];
+	dst->y[5] = y0 + pcb_round(radius * 0.5) * ym[5];
+	dst->x[4] = x0 - pcb_round(radius * 0.5) * xm[4];
+	dst->y[4] = y0 + pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * ym[4];
+	dst->x[3] = x0 - pcb_round(radius * 0.5) * xm[3];
+	dst->y[3] = y0 - pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * ym[3];
+	dst->x[2] = x0 - pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * xm[2];
+	dst->y[2] = y0 - pcb_round(radius * 0.5) * ym[2];
+	dst->x[1] = x0 + pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * xm[1];
+	dst->y[1] = y0 - pcb_round(radius * 0.5) * ym[1];
+	dst->x[0] = x0 + pcb_round(radius * 0.5) * xm[0];
+	dst->y[0] = y0 - pcb_round(radius * PCB_TAN_22_5_DEGREE_2) * ym[0];
+}
+
+/* emulate the old 'square flag' feature */
+static void square_shape(pcb_pstk_poly_t *dst, pcb_coord_t x0, pcb_coord_t y0, pcb_coord_t radius, int style)
+{
+	pcb_coord_t r2 = pcb_round(radius * 0.5);
+
+	pcb_pstk_shape_alloc_poly(dst, 4);
+
+	dst->x[0] = x0 - r2; dst->y[0] = y0 - r2;
+	dst->x[1] = x0 + r2; dst->y[1] = y0 - r2;
+	dst->x[2] = x0 + r2; dst->y[2] = y0 + r2;
+	dst->x[3] = x0 - r2; dst->y[3] = y0 + r2;
+}
+
+
+static int compat_via_shape_gen(pcb_pstk_shape_t *dst, pcb_pstk_compshape_t cshape, pcb_coord_t pad_dia)
+{
+	if ((cshape >= PCB_PSTK_COMPAT_SHAPED) && (cshape <= PCB_PSTK_COMPAT_SHAPED_END)) {
+		dst->shape = PCB_PSSH_POLY;
+		octa_shape(&dst->data.poly, 0, 0, pad_dia, cshape);
+		return 0;
+	}
+
+	switch(cshape) {
+		case PCB_PSTK_COMPAT_ROUND:
+			dst->shape = PCB_PSSH_CIRC;
+			dst->data.circ.x = dst->data.circ.y = 0;
+			dst->data.circ.dia = pad_dia;
+			break;
+		case PCB_PSTK_COMPAT_SQUARE:
+			/* using a zero-length line is not a good idea here as rotation wouldn't affect it */
+			dst->shape = PCB_PSSH_POLY;
+			square_shape(&dst->data.poly, 0, 0, pad_dia, 1);
+			break;
+		case PCB_PSTK_COMPAT_OCTAGON:
+			dst->shape = PCB_PSSH_POLY;
+			octa_shape(&dst->data.poly, 0, 0, pad_dia, 1);
+			break;
+		default:
+			return -1;
+	}
+	return 0;
+}
+
+static void compat_shape_free(pcb_pstk_shape_t *shp)
+{
+	if (shp->shape == PCB_PSSH_POLY)
+		free(shp->data.poly.x);
+}
+
+pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_coord_t pad_dia, pcb_coord_t clearance, pcb_coord_t mask, pcb_pstk_compshape_t cshape, pcb_bool plated)
+{
+	pcb_pstk_proto_t proto;
+	pcb_pstk_shape_t shape[5]; /* max number of shapes: 3 coppers, 2 masks */
+	pcb_cardinal_t pid;
+	pcb_pstk_shape_t copper_master, mask_master;
+	pcb_pstk_tshape_t tshp;
+	int n;
+
+	/* for plated vias, positive pad is required */
+	if (plated)
+		assert(pad_dia > drill_dia);
+
+	assert(drill_dia > 0);
+	assert(clearance >= 0);
+	assert(mask >= 0);
+
+	memset(&proto, 0, sizeof(proto));
+	memset(&tshp, 0, sizeof(tshp));
+	memset(&copper_master, 0, sizeof(copper_master));
+	memset(&mask_master, 0, sizeof(mask_master));
+
+	tshp.shape = shape;
+	proto.tr.alloced = proto.tr.used = 1; /* has the canonical form only */
+	proto.tr.array = &tshp;
+
+	if (plated) {
+		tshp.len = 3 + (mask > 0 ? 2 : 0);
+
+		/* we need to generate the shape only once as it's the same on all */
+		if (compat_via_shape_gen(&copper_master, cshape, pad_dia) != 0)
+			return NULL;
+
+		for(n = 0; n < 3; n++)
+			memcpy(&shape[n], &copper_master, sizeof(copper_master));
+		shape[0].layer_mask = PCB_LYT_COPPER | PCB_LYT_TOP;    shape[0].comb = 0;
+		shape[1].layer_mask = PCB_LYT_COPPER | PCB_LYT_BOTTOM; shape[1].comb = 0;
+		shape[2].layer_mask = PCB_LYT_COPPER | PCB_LYT_INTERN; shape[2].comb = 0;
+		tshp.len = 3;
+	}
+	else
+		tshp.len = 0;
+
+	if (mask > 0) {
+		if (compat_via_shape_gen(&mask_master, cshape, mask) != 0)
+			return NULL;
+	
+		memcpy(&shape[tshp.len+0], &mask_master, sizeof(mask_master));
+		memcpy(&shape[tshp.len+1], &mask_master, sizeof(mask_master));
+		shape[tshp.len+0].layer_mask = PCB_LYT_MASK | PCB_LYT_TOP;      shape[tshp.len+0].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
+		shape[tshp.len+1].layer_mask = PCB_LYT_MASK | PCB_LYT_BOTTOM;   shape[tshp.len+1].comb = PCB_LYC_SUB + PCB_LYC_AUTO;
+		tshp.len += 2;
+	}
+
+	proto.hdia = drill_dia;
+	proto.hplated = plated;
+
+	pid = pcb_pstk_proto_insert_dup(data, &proto, 1);
+	if (pid == PCB_PADSTACK_INVALID) {
+		compat_shape_free(&copper_master);
+		return NULL;
+	}
+
+	compat_shape_free(&copper_master);
+
+	if (mask > 0)
+		compat_shape_free(&mask_master);
+
+	return pcb_pstk_new(data, pid, x, y, clearance, pcb_flag_make(PCB_FLAG_CLEARLINE));
+}
+
+static pcb_pstk_compshape_t get_old_shape_square(pcb_coord_t *dia, const pcb_pstk_shape_t *shp)
+{
+	double sq, len2, l, a;
+	int n;
+
+	sq = sqr(shp->data.poly.x[0] - shp->data.poly.x[2]) + sqr(shp->data.poly.y[0] - shp->data.poly.y[2]);
+	/* cross-bars must be of equal length */
+	if (sq != sqr(shp->data.poly.x[1] - shp->data.poly.x[3]) + sqr(shp->data.poly.y[1] - shp->data.poly.y[3]))
+		return PCB_PSTK_COMPAT_INVALID;
+
+	/* all sides must be of equal length */
+	len2 = fabs(sqr(shp->data.poly.x[3] - shp->data.poly.x[0]) + sqr(shp->data.poly.y[3] - shp->data.poly.y[0]));
+	for(n = 0; n < 3; n++) {
+		l = fabs(sqr(shp->data.poly.x[n+1] - shp->data.poly.x[n]) + sqr(shp->data.poly.y[n+1] - shp->data.poly.y[n]));
+		if (fabs(l - len2) > 10)
+			return PCB_PSTK_COMPAT_INVALID;
+	}
+
+	/* must be axis aligned */
+	a = atan2(shp->data.poly.y[3] - shp->data.poly.y[0], shp->data.poly.x[3] - shp->data.poly.x[0]) * PCB_RAD_TO_DEG;
+	if (fmod(a, 90.0) > 0.1)
+		return PCB_PSTK_COMPAT_INVALID;
+
+	/* found a valid square */
+	*dia = pcb_round(sqrt(sq / 2.0));
+
+	return PCB_PSTK_COMPAT_SQUARE;
+}
+
+
+static pcb_pstk_compshape_t get_old_shape_octa(pcb_coord_t *dia, const pcb_pstk_shape_t *shp)
+{
+	double x[8], y[8], xm[8], ym[8], minx = 0.0, miny = 0.0, tmp;
+	int shi, n, found;
+
+	/* collect offsets */
+	for(n = 0; n < 8; n++) {
+		x[n] = shp->data.poly.x[n];
+		y[n] = shp->data.poly.y[n];
+	}
+
+	/* compensate for the octagon shape */
+	x[7] /= 0.5;
+	y[7] /= PCB_TAN_22_5_DEGREE_2;
+	x[6] /= PCB_TAN_22_5_DEGREE_2;
+	y[6] /= 0.5;
+	x[5] /= PCB_TAN_22_5_DEGREE_2;
+	y[5] /= 0.5;
+	x[4] /= 0.5;
+	y[4] /= PCB_TAN_22_5_DEGREE_2;
+	x[3] /= 0.5;
+	y[3] /= PCB_TAN_22_5_DEGREE_2;
+	x[2] /= PCB_TAN_22_5_DEGREE_2;
+	y[2] /= 0.5;
+	x[1] /= PCB_TAN_22_5_DEGREE_2;
+	y[1] /= 0.5;
+	x[0] /= 0.5;
+	y[0] /= PCB_TAN_22_5_DEGREE_2;
+
+	/* check min distances */
+	for(n = 0; n < 8; n++) {
+		tmp = fabs(x[n]);
+		if ((minx == 0.0) || (tmp < minx))
+			minx = tmp;
+		tmp = fabs(y[n]);
+		if ((miny == 0.0) || (tmp < miny))
+			miny = tmp;
+	}
+
+	if ((minx == 0.0) || (miny == 0.0))
+		return PCB_PSTK_COMPAT_INVALID;
+
+	if (minx < miny)
+		miny = minx;
+	else
+		minx = miny;
+
+	/* normalize the factors */
+	for(n = 0; n < 8; n++) {
+		x[n] = fabs(x[n] / minx);
+		y[n] = fabs(y[n] / miny);
+		if (fabs(x[n] - 1.0) < 0.01)
+			x[n] = 1.0;
+		else if (fabs(x[n] - 2.0) < 0.01)
+			x[n] = 2.0;
+		else
+			return PCB_PSTK_COMPAT_INVALID;
+		if (fabs(y[n] - 1.0) < 0.01)
+			y[n] = 1.0;
+		else if (fabs(y[n] - 2.0) < 0.01)
+			y[n] = 2.0;
+		else
+			return PCB_PSTK_COMPAT_INVALID;
+	}
+
+	/* compare to all known shape factors */
+	for(shi = PCB_PSTK_COMPAT_SHAPED; shi <= PCB_PSTK_COMPAT_SHAPED_END; shi++) {
+		pcb_poly_square_pin_factors(shi - PCB_PSTK_COMPAT_SHAPED, xm, ym);
+		found = 1;
+		for(n = 0; n < 8; n++) {
+			if ((xm[n] != x[n]) || (ym[n] != y[n])) {
+				found = 0;
+				break;
+			}
+		}
+		if (found) {
+			*dia = pcb_round(sqrt((sqr(minx) + sqr(miny)) / 2.0));
+			return shi;
+		}
+	}
+
+	return PCB_PSTK_COMPAT_INVALID;
+}
+
+static pcb_pstk_compshape_t get_old_shape(pcb_coord_t *dia, const pcb_pstk_shape_t *shp)
+{
+	switch(shp->shape) {
+		case PCB_PSSH_LINE:
+			return PCB_PSTK_COMPAT_INVALID;
+		case PCB_PSSH_CIRC:
+			if ((shp->data.circ.x != 0) || (shp->data.circ.x != 0))
+				return PCB_PSTK_COMPAT_INVALID;
+			*dia = shp->data.circ.dia;
+			return PCB_PSTK_COMPAT_ROUND;
+		case PCB_PSSH_POLY:
+			if (shp->data.poly.len == 4)
+				return get_old_shape_square(dia, shp);
+			if (shp->data.poly.len == 8)
+				return get_old_shape_octa(dia, shp);
+			break;
+	}
+	return PCB_PSTK_COMPAT_INVALID;
+}
+
+pcb_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t *drill_dia, pcb_coord_t *pad_dia, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_pstk_compshape_t *cshape, pcb_bool *plated)
+{
+	pcb_pstk_proto_t *proto;
+	pcb_pstk_tshape_t *tshp;
+	int n, coppern = -1, maskn = -1;
+	pcb_pstk_compshape_t old_shape[5];
+	pcb_coord_t old_dia[5];
+
+	proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto);
+	if ((proto == NULL) || (proto->tr.used < 1))
+		return pcb_false;
+
+	tshp = &proto->tr.array[0];
+
+	if ((tshp->len != 3) && (tshp->len != 5))
+		return pcb_false; /* allow only 3 coppers + optionally 2 masks */
+
+	for(n = 0; n < tshp->len; n++) {
+		if (tshp->shape[n].shape != tshp->shape[0].shape)
+			return pcb_false; /* all shapes must be the same */
+		if ((tshp->shape[n].layer_mask & PCB_LYT_ANYWHERE) == 0)
+			return pcb_false;
+		if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
+			coppern = n;
+			continue;
+		}
+		if (tshp->shape[n].layer_mask & PCB_LYT_INTERN)
+			return pcb_false; /* accept only copper as intern */
+		if (tshp->shape[n].layer_mask & PCB_LYT_MASK) {
+			maskn = n;
+			continue;
+		}
+		return pcb_false; /* refuse anything else */
+	}
+
+	/* we must have copper shapes */
+	if (coppern < 0)
+		return pcb_false;
+
+	if (tshp->shape[0].shape == PCB_PSSH_POLY)
+		for(n = 1; n < tshp->len; n++)
+			if (tshp->shape[n].data.poly.len != tshp->shape[0].data.poly.len)
+				return pcb_false; /* all polygons must have the same number of corners */
+
+	for(n = 0; n < tshp->len; n++) {
+		old_shape[n] = get_old_shape(&old_dia[n], &tshp->shape[n]);
+		if (old_shape[n] == PCB_PSTK_COMPAT_INVALID)
+			return pcb_false;
+		if (old_shape[n] != old_shape[0])
+			return pcb_false;
+	}
+
+	/* all copper sizes must be the same, all mask sizes must be the same */
+	for(n = 0; n < tshp->len; n++) {
+		if ((tshp->shape[n].layer_mask & PCB_LYT_COPPER) && (fabs(old_dia[n] - old_dia[coppern]) > 10))
+			return pcb_false;
+		if (maskn >= 0)
+			if ((tshp->shape[n].layer_mask & PCB_LYT_MASK) && (fabs(old_dia[n] - old_dia[maskn]) > 10))
+				return pcb_false;
+	}
+
+	/* all went fine, collect and return data */
+	*x = ps->x;
+	*y = ps->y;
+	*drill_dia = proto->hdia;
+	*pad_dia = old_dia[coppern];
+	*clearance = ps->Clearance;
+	*mask = maskn >= 0 ? old_dia[maskn] : 0;
+	*cshape = old_shape[0];
+	*plated = proto->hplated;
+
+	return pcb_true;
+}
+
+/* emulate the old 'square flag' pad */
+static void pad_shape(pcb_pstk_poly_t *dst, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness)
+{
+	double d, dx, dy;
+	pcb_coord_t nx, ny;
+	pcb_coord_t halfthick = (thickness + 1) / 2;
+
+	dx = x2 - x1;
+	dy = y2 - y1;
+
+	d = sqrt((double)sqr(dx) + (double)sqr(dy));
+	if (d != 0) {
+		double v = (double)halfthick / d;
+		nx = (double)(y1 - y2) * v;
+		ny = (double)(x2 - x1) * v;
+
+		x1 -= ny;
+		y1 += nx;
+		x2 += ny;
+		y2 -= nx;
+	}
+	else {
+		nx = halfthick;
+		ny = 0;
+
+		y1 += nx;
+		y2 -= nx;
+	}
+
+	pcb_pstk_shape_alloc_poly(dst, 4);
+	dst->x[0] = x1 - nx; dst->y[0] = y1 - ny;
+	dst->x[1] = x1 + nx; dst->y[1] = y1 + ny;
+	dst->x[2] = x2 + nx; dst->y[2] = y2 + ny;
+	dst->x[3] = x2 - nx; dst->y[3] = y2 - ny;
+}
+
+/* Generate a square or round pad of a given thickness - typically mask or copper */
+static void gen_pad(pcb_pstk_shape_t *dst, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_bool square)
+{
+	if (square) {
+		dst->shape = PCB_PSSH_POLY;
+		pad_shape(&dst->data.poly, x1, y1, x2, y2, thickness);
+	}
+	else if (x1 == x2 && y1 == y2) {
+		dst->shape = PCB_PSSH_CIRC;
+		dst->data.circ.x = x1;
+		dst->data.circ.y = y1;
+		dst->data.circ.dia = thickness;
+	}
+	else {
+		dst->shape = PCB_PSSH_LINE;
+		dst->data.line.x1 = x1;
+		dst->data.line.y1 = y1;
+		dst->data.line.x2 = x2;
+		dst->data.line.y2 = y2;
+		dst->data.line.thickness = thickness;
+		dst->data.line.square = 0;
+	}
+}
+
+pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_coord_t clearance, pcb_coord_t mask, pcb_bool square, pcb_bool nopaste, pcb_bool onotherside)
+{
+	pcb_layer_type_t side;
+	pcb_pstk_proto_t proto;
+	pcb_pstk_shape_t shape[3]; /* max number of shapes: 1 copper, 1 mask, 1 paste */
+	pcb_cardinal_t pid;
+	pcb_pstk_tshape_t tshp;
+	int n;
+	pcb_coord_t cx, cy;
+
+	assert(thickness >= 0);
+	assert(clearance >= 0);
+	assert(mask >= 0);
+
+	cx = (x1 + x2) / 2;
+	cy = (y1 + y2) / 2;
+
+	memset(&proto, 0, sizeof(proto));
+	memset(&tshp, 0, sizeof(tshp));
+	memset(&shape, 0, sizeof(shape));
+
+	tshp.len = nopaste ? 2 : 3;
+	tshp.shape = shape;
+	proto.tr.alloced = proto.tr.used = 1; /* has the canonical form only */
+	proto.tr.array = &tshp;
+
+	gen_pad(&shape[0], x1 - cx, y1 - cy, x2 - cx, y2 - cy, thickness, square); /* copper */
+	gen_pad(&shape[1], x1 - cx, y1 - cy, x2 - cx, y2 - cy, mask, square);      /* mask */
+	if (!nopaste)
+		pcb_pstk_shape_copy(&shape[2], &shape[0]); /* paste is the same */
+
+	side = onotherside ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+	shape[0].layer_mask = side | PCB_LYT_COPPER; shape[0].comb = 0;
+	shape[1].layer_mask = side | PCB_LYT_MASK;   shape[1].comb = PCB_LYC_AUTO | PCB_LYC_SUB;
+	if (!nopaste) {
+		shape[2].layer_mask = side | PCB_LYT_PASTE;
+		shape[2].comb = PCB_LYC_AUTO;
+	}
+
+	pid = pcb_pstk_proto_insert_dup(data, &proto, 1);
+
+	for(n = 0; n < tshp.len; n++)
+		compat_shape_free(&shape[n]);
+
+	if (pid == PCB_PADSTACK_INVALID)
+		return NULL;
+
+	return pcb_pstk_new(data, pid, cx, cy, clearance/2, pcb_flag_make(PCB_FLAG_CLEARLINE));
+}
+
+
+pcb_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, pcb_coord_t *x1, pcb_coord_t *y1, pcb_coord_t *x2, pcb_coord_t *y2, pcb_coord_t *thickness, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_bool *square, pcb_bool *nopaste)
+{
+	pcb_pstk_proto_t *proto;
+	pcb_pstk_tshape_t *tshp;
+	int n, coppern = -1, maskn = -1, pasten = -1;
+	pcb_layer_type_t side;
+	pcb_coord_t lx1[3], ly1[3], lx2[3], ly2[3], lt[3]; /* poly->line conversion cache */
+
+	proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto);
+	if ((proto == NULL) || (proto->tr.used < 1))
+		return pcb_false;
+
+	tshp = &proto->tr.array[0];
+
+	if ((tshp->len < 2) || (tshp->len > 3))
+		return pcb_false; /* allow at most a copper, a mask and a paste */
+
+	/* determine whether we are on top or bottom */
+	side = tshp->shape[0].layer_mask & (PCB_LYT_TOP | PCB_LYT_BOTTOM);
+	if ((side == 0) || (side == (PCB_LYT_TOP | PCB_LYT_BOTTOM)))
+		return pcb_false;
+
+	for(n = 0; n < tshp->len; n++) {
+		if (tshp->shape[n].shape != tshp->shape[0].shape)
+			return pcb_false; /* all shapes must be the same */
+		if ((tshp->shape[n].layer_mask & PCB_LYT_ANYWHERE) != side)
+			return pcb_false; /* all shapes must be the same side */
+		if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
+			coppern = n;
+			continue;
+		}
+		if (tshp->shape[n].layer_mask & PCB_LYT_INTERN)
+			return pcb_false; /* accept only copper as intern */
+		if (tshp->shape[n].layer_mask & PCB_LYT_MASK) {
+			maskn = n;
+			continue;
+		}
+		if (tshp->shape[n].layer_mask & PCB_LYT_PASTE) {
+			pasten = n;
+			continue;
+		}
+		return pcb_false; /* refuse anything else */
+	}
+
+	/* require copper and mask shapes */
+	if ((coppern < 0) || (maskn < 0))
+		return pcb_false;
+
+	/* if the shape is poly, convert to line to make the rest of the code simpler */
+	if (tshp->shape[0].shape == PCB_PSSH_POLY) {
+		for(n = 0; n < tshp->len; n++) {
+			pcb_coord_t w, h, x1, x2, y1, y2;
+
+			if (tshp->shape[n].shape != PCB_PSSH_POLY)
+				continue;
+
+			if (tshp->shape[n].data.poly.len != 4)
+				return pcb_false;
+
+			x1 = tshp->shape[n].data.poly.x[0];
+			x2 = tshp->shape[n].data.poly.x[2];
+			if (x1 < x2) {
+				x2 = tshp->shape[n].data.poly.x[0];
+				x1 = tshp->shape[n].data.poly.x[2];
+			}
+			y1 = tshp->shape[n].data.poly.y[0];
+			y2 = tshp->shape[n].data.poly.y[2];
+			if (y1 < y2) {
+				y2 = tshp->shape[n].data.poly.y[0];
+				y1 = tshp->shape[n].data.poly.y[2];
+			}
+			w = x1 - x2;
+			h = y1 - y2;
+			lt[n] = (w < h) ? w : h;
+			lx1[n] = x2 + lt[n] / 2;
+			ly1[n] = y2 + lt[n] / 2;
+			lx2[n] = lx1[n] + (w - lt[n]);
+			ly2[n] = ly1[n] + (h - lt[n]);
+		}
+	}
+
+	/* require all shapes to be concentric */
+	for(n = 1; n < tshp->len; n++) {
+		switch(tshp->shape[0].shape) {
+			case PCB_PSSH_LINE:
+				if (tshp->shape[0].data.line.x1 != tshp->shape[n].data.line.x1)
+					return pcb_false;
+				if (tshp->shape[0].data.line.y1 != tshp->shape[n].data.line.y1)
+					return pcb_false;
+				if (tshp->shape[0].data.line.x2 != tshp->shape[n].data.line.x2)
+					return pcb_false;
+				if (tshp->shape[0].data.line.y2 != tshp->shape[n].data.line.y2)
+					return pcb_false;
+				break;
+			case PCB_PSSH_CIRC:
+				if (tshp->shape[0].data.circ.x != tshp->shape[n].data.circ.x)
+					return pcb_false;
+				if (tshp->shape[0].data.circ.y != tshp->shape[n].data.circ.y)
+					return pcb_false;
+				break;
+			case PCB_PSSH_POLY:
+				if (lx1[0] != lx1[n])
+					return pcb_false;
+				if (ly1[0] != ly1[n])
+					return pcb_false;
+				if (lx2[0] != lx2[n])
+					return pcb_false;
+				if (ly2[0] != ly2[n])
+					return pcb_false;
+				break;
+		}
+	}
+
+	/* generate the return pad (line-like) */
+	switch(tshp->shape[0].shape) {
+		case PCB_PSSH_LINE:
+			*x1 = tshp->shape[coppern].data.line.x1 + ps->x;
+			*y1 = tshp->shape[coppern].data.line.y1 + ps->y;
+			*x2 = tshp->shape[coppern].data.line.x2 + ps->x;
+			*y2 = tshp->shape[coppern].data.line.y2 + ps->y;
+			*thickness = tshp->shape[coppern].data.line.thickness;
+			*mask = tshp->shape[maskn].data.line.thickness;
+			*square = tshp->shape[coppern].data.line.square;
+			break;
+		case PCB_PSSH_CIRC:
+			*x1 = *x2 = tshp->shape[coppern].data.circ.x + ps->x;
+			*y1 = *y2 = tshp->shape[coppern].data.circ.y + ps->y;
+			*thickness = tshp->shape[coppern].data.circ.dia;
+			*mask = tshp->shape[maskn].data.circ.dia;
+			*square = 0;
+			break;
+		case PCB_PSSH_POLY:
+			*square = 1;
+			*x1 = lx1[0] + ps->x;
+			*y1 = ly1[0] + ps->y;
+			*x2 = lx2[0] + ps->x;
+			*y2 = ly2[0] + ps->y;
+			*thickness = lt[coppern];
+			*mask = lt[maskn];
+			break;
+	}
+
+	*clearance = (ps->Clearance > 0 ? ps->Clearance : tshp->shape[0].clearance) * 2;
+	*nopaste = pasten < 0;
+
+	return pcb_true;
+}
+
+pcb_flag_t pcb_pstk_compat_pinvia_flag(pcb_pstk_t *ps, pcb_pstk_compshape_t cshape)
+{
+	pcb_flag_t flg;
+	int n;
+
+	memset(&flg, 0, sizeof(flg));
+	flg.f = ps->Flags.f & PCB_PSTK_VIA_COMPAT_FLAGS;
+	switch(cshape) {
+		case PCB_PSTK_COMPAT_ROUND:
+			break;
+		case PCB_PSTK_COMPAT_OCTAGON:
+			flg.f |= PCB_FLAG_OCTAGON;
+			break;
+		case PCB_PSTK_COMPAT_SQUARE:
+			flg.f |= PCB_FLAG_SQUARE;
+			flg.q = 1;
+			break;
+		default:
+			if ((cshape >= PCB_PSTK_COMPAT_SHAPED) && (cshape <= PCB_PSTK_COMPAT_SHAPED_END)) {
+				flg.f |= PCB_FLAG_SQUARE;
+				cshape -= PCB_PSTK_COMPAT_SHAPED;
+				if (cshape == 1)
+					cshape = 17;
+				flg.q = cshape;
+			}
+			else
+				pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "Failed to convert shape to old-style pin/via", "Old pin/via format is very much restricted; try to use a simpler shape (e.g. circle)");
+	}
+
+	for(n = 0; n < sizeof(flg.t) / sizeof(flg.t[0]); n++) {
+		unsigned char *ot = pcb_pstk_get_thermal(ps, n, 0);
+		int nt;
+		if ((ot == NULL) || (*ot == 0) || !((*ot) & PCB_THERMAL_ON))
+			continue;
+		switch(((*ot) & ~PCB_THERMAL_ON)) {
+			case PCB_THERMAL_SHARP | PCB_THERMAL_DIAGONAL: nt = 1; break;
+			case PCB_THERMAL_SHARP: nt = 2; break;
+			case PCB_THERMAL_SOLID: nt = 3; break;
+			case PCB_THERMAL_ROUND | PCB_THERMAL_DIAGONAL: nt = 4; break;
+			case PCB_THERMAL_ROUND: nt = 5; break;
+			default: nt = 0; pcb_io_incompat_save(ps->parent.data, (pcb_any_obj_t *)ps, "Failed to convert thermal to old-style via", "Old via format is very much restricted; try to use a simpler thermal shape");
+		}
+		PCB_FLAG_THERM_ASSIGN_(n, nt, flg);
+	}
+	return flg;
+}
+
+
+pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, pcb_flag_t Flags)
+{
+	pcb_pstk_t *p;
+	pcb_pstk_compshape_t shp;
+	int n;
+
+	if (Flags.f & PCB_FLAG_SQUARE) {
+		shp = Flags.q /*+ PCB_PSTK_COMPAT_SHAPED*/;
+		if (shp == 0)
+			shp = PCB_PSTK_COMPAT_SQUARE;
+	}
+	else if (Flags.f & PCB_FLAG_OCTAGON)
+		shp = PCB_PSTK_COMPAT_OCTAGON;
+	else
+		shp = PCB_PSTK_COMPAT_ROUND;
+
+	p = pcb_pstk_new_compat_via(data, X, Y, DrillingHole, Thickness, Clearance/2, Mask, shp, !(Flags.f & PCB_FLAG_HOLE));
+	p->Flags.f |= Flags.f & PCB_PSTK_VIA_COMPAT_FLAGS;
+	for(n = 0; n < sizeof(Flags.t) / sizeof(Flags.t[0]); n++) {
+		int nt = PCB_THERMAL_ON, t = ((Flags.t[n/2] >> (4 * (n % 2))) & 0xf);
+		if (t != 0) {
+			switch(t) {
+				case 1: nt |= PCB_THERMAL_SHARP | PCB_THERMAL_DIAGONAL; break;
+				case 2: nt |= PCB_THERMAL_SHARP; break;
+				case 3: nt |= PCB_THERMAL_SOLID; break;
+				case 4: nt |= PCB_THERMAL_ROUND | PCB_THERMAL_DIAGONAL; break;
+				case 5: nt |= PCB_THERMAL_ROUND; break;
+			}
+			pcb_pstk_set_thermal(p, n, nt);
+		}
+	}
+
+	if (Name != NULL)
+		pcb_attribute_put(&p->Attributes, "name", Name);
+
+	return p;
+}
Index: tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.h
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/pstk_compat.h	(revision 18980)
@@ -0,0 +1,37 @@
+#ifndef PCB_PSTK_COMPAT_H
+#define PCB_PSTK_COMPAT_H
+
+#include "obj_pstk.h"
+
+typedef enum {
+	PCB_PSTK_COMPAT_ROUND = 0,
+	PCB_PSTK_COMPAT_SQUARE = 1,
+	PCB_PSTK_COMPAT_SHAPED = 2, /* old pcb-rnd pin shapes */
+	PCB_PSTK_COMPAT_SHAPED_END = 16, /* old pcb-rnd pin shapes */
+	PCB_PSTK_COMPAT_OCTAGON,
+	PCB_PSTK_COMPAT_INVALID
+} pcb_pstk_compshape_t;
+
+/* Create a padstack that emulates an old-style via - register proto as needed */
+pcb_pstk_t *pcb_pstk_new_compat_via(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_coord_t pad_dia, pcb_coord_t clearance, pcb_coord_t mask, pcb_pstk_compshape_t shp, pcb_bool plated);
+
+/* Convert an existing padstack to old-style via and return broken down parameters */
+pcb_bool pcb_pstk_export_compat_via(pcb_pstk_t *ps, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t *drill_dia, pcb_coord_t *pad_dia, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_pstk_compshape_t *cshape, pcb_bool *plated);
+
+/* Create a padstack that emulates an old-style pad - register proto as needed */
+pcb_pstk_t *pcb_pstk_new_compat_pad(pcb_data_t *data, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, pcb_coord_t thickness, pcb_coord_t clearance, pcb_coord_t mask, pcb_bool square, pcb_bool nopaste, pcb_bool onotherside);
+
+/* Convert an existing padstack to old-style pad and return broken down parameters */
+pcb_bool pcb_pstk_export_compat_pad(pcb_pstk_t *ps, pcb_coord_t *x1, pcb_coord_t *y1, pcb_coord_t *x2, pcb_coord_t *y2, pcb_coord_t *thickness, pcb_coord_t *clearance, pcb_coord_t *mask, pcb_bool *square, pcb_bool *nopaste);
+
+/* Convert padstack flags to old pin/via flag. Use only in gEDA/PCB
+   compatibility code: io_pcb and io_lihata. */
+pcb_flag_t pcb_pstk_compat_pinvia_flag(pcb_pstk_t *ps, pcb_pstk_compshape_t cshape);
+
+#define PCB_PSTK_VIA_COMPAT_FLAGS (PCB_FLAG_CLEARLINE | PCB_FLAG_SELECTED | PCB_FLAG_WARN | PCB_FLAG_USETHERMAL | PCB_FLAG_LOCK)
+
+/* Create a padstack that mimics the old gEDA/PCB via (or pin). Should not
+   be used anywhere but io_pcb and io_lihata. */
+pcb_pstk_t *pcb_old_via_new(pcb_data_t *data, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_coord_t Mask, pcb_coord_t DrillingHole, const char *Name, pcb_flag_t Flags);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_compat_help/pstk_help.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/pstk_help.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/pstk_help.c	(revision 18980)
@@ -0,0 +1,351 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "pstk_help.h"
+#include "obj_pstk_inlines.h"
+#include "compat_misc.h"
+#include "search.h"
+#include "remove.h"
+#include "find.h"
+
+
+#warning TODO: remove this once the operations are free of ptrs
+extern unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
+
+
+pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated)
+{
+	pcb_pstk_proto_t proto;
+	pcb_cardinal_t pid;
+
+	memset(&proto, 0, sizeof(proto));
+	proto.hdia = drill_dia;
+	proto.hplated = plated;
+
+	pid = pcb_pstk_proto_insert_dup(data, &proto, 1);
+
+	return pcb_pstk_new(data, pid, x, y, 0, pcb_flag_make(PCB_FLAG_CLEARLINE));
+}
+
+pcb_layer_type_t lyts[] = {
+	/* primary for thru-hole */
+	PCB_LYT_TOP    | PCB_LYT_COPPER,
+	PCB_LYT_BOTTOM | PCB_LYT_COPPER,
+
+	/* secondary */
+	PCB_LYT_INTERN | PCB_LYT_COPPER,
+	PCB_LYT_TOP    | PCB_LYT_PASTE,
+	PCB_LYT_TOP    | PCB_LYT_SILK,
+	PCB_LYT_TOP    | PCB_LYT_MASK,
+	PCB_LYT_BOTTOM | PCB_LYT_MASK,
+	PCB_LYT_BOTTOM | PCB_LYT_SILK,
+	PCB_LYT_BOTTOM | PCB_LYT_PASTE
+};
+
+#define NUM_LYTS (sizeof(lyts) / sizeof(lyts[0]))
+
+
+static int vect2pstk_conv_cand(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet, pcb_any_obj_t **cand, int *num_cand, pcb_coord_t cx, pcb_coord_t cy, int plated, pcb_any_obj_t *extrao)
+{
+	pcb_pstk_proto_t proto;
+	int l, ci, res = -1;
+	vtp0_t tmp;
+	char *term = NULL;
+
+	vtp0_init(&tmp);
+	if (extrao != NULL)
+		vtp0_append(&tmp, extrao);
+	for(l = 0; l < NUM_LYTS; l++) {
+		if (num_cand[l] == 1) {
+			vtp0_append(&tmp, cand[l]);
+			if (term == NULL)
+				term = pcb_attribute_get(&cand[l]->Attributes, "term");
+		}
+	}
+
+	pcb_trace("Converting %d objects into a pstk\n", tmp.used);
+
+	memset(&proto, 0, sizeof(proto));
+	if (pcb_pstk_proto_conv(data, &proto, quiet, &tmp, cx, cy) == 0) {
+		pcb_cardinal_t pid;
+		if (plated != -1)
+			proto.hplated = plated;
+		pid = pcb_pstk_proto_insert_or_free(data, &proto, quiet);
+		if (pid != PCB_PADSTACK_INVALID) {
+			pcb_pstk_t *ps = pcb_pstk_new(data, pid, 0, 0, 0, pcb_flag_make(PCB_FLAG_CLEARLINE | PCB_FLAG_FOUND));
+			vtp0_append(objs, ps);
+			if (term != NULL)
+				pcb_attribute_put(&ps->Attributes, "term", term);
+			/* got our new proto - remove the objects we used */
+			for(ci = 0; ci < tmp.used; ci++) {
+				int i;
+				pcb_any_obj_t *o = tmp.array[ci];
+				for(i = 0; i < objs->used; i++) {
+					if (objs->array[i] == o) {
+						vtp0_remove(objs, i, 1);
+						pcb_destroy_object(data, pcb_obj_type2oldtype(o->type), o->parent.any, o, o);
+						break;
+					}
+				}
+			}
+		}
+		res = 0;
+	}
+	vtp0_uninit(&tmp);
+	return res;
+}
+
+int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+{
+	int l, n, plated, done = 0, ci;
+	pcb_pstk_proto_t *p;
+	pcb_coord_t cx, cy, d, r, valid;
+	pcb_any_obj_t *cand[NUM_LYTS];
+	int num_cand[NUM_LYTS];
+
+	/* output padstacks are going to be marked with the FOUND flag */
+	for(n = 0; n < objs->used; n++) PCB_FLAG_CLEAR(PCB_FLAG_FOUND, (pcb_any_obj_t *)(objs->array[n]));
+
+	for(n = 0; n < objs->used; n++) {
+		pcb_any_obj_t *h = objs->array[n];
+
+		/* find holes */
+		switch(h->type) {
+			case PCB_OBJ_PSTK:
+				p = pcb_pstk_get_proto((pcb_pstk_t *)h);
+				if ((p == NULL) || (p->hdia <= 0))
+					continue;
+				cx = ((pcb_pstk_t *)h)->x;
+				cy = ((pcb_pstk_t *)h)->y;
+				d = p->hdia;
+				plated = p->hplated;
+				break;
+			default:
+				continue;
+		}
+		r = d/2;
+
+		/* we have a hole center and dia - look for objects that could be pads for this hole */
+		memset(cand, 0, sizeof(cand));
+		memset(num_cand, 0, sizeof(num_cand));
+		for(ci = 0; ci < objs->used; ci++) {
+			pcb_layer_type_t lyt;
+			pcb_any_obj_t *c = objs->array[ci]; /* candidate */
+			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, c)) continue; /* already used */
+			switch(c->type) {
+				case PCB_OBJ_LINE:
+					if (!pcb_is_point_in_line(cx, cy, r, (pcb_any_line_t *)c)) continue;
+					break;
+				case PCB_OBJ_POLY:
+					if (!pcb_poly_is_point_in_p(cx, cy, r, (pcb_poly_t *)c)) continue;
+					break;
+				default: continue; /* this type can not be used */
+			}
+
+			/* candidate is around the hole - figure the indexing from lyt */
+			assert(c->parent_type == PCB_PARENT_LAYER);
+			lyt = pcb_layer_flags_(c->parent.layer);
+			for(l = 0; l < NUM_LYTS; l++) {
+				if (lyts[l] == lyt) {
+					cand[l] = c;
+					num_cand[l]++;
+					break;
+				}
+			}
+		}
+
+
+		/* all candidates are in cand[] and num_cand[]; check if there's any
+		   usable candidate (layer type with only one candidate); allow multiple
+		   intern coppers for now */
+		valid = 0;
+		for(l = 0; l < NUM_LYTS; l++) {
+			if ((num_cand[l] == 1) || ((num_cand[l] > 1) && (lyts[l] & PCB_LYT_INTERN))) {
+				num_cand[l] = 1;
+				valid = 1;
+				break;
+			}
+		}
+
+		if (!valid) continue; /* this hole can not be converted */
+
+		if (vect2pstk_conv_cand(data, objs, quiet, cand, num_cand, cx, cy, plated, h) == 0) {
+			/* we have deleted from objs, need to start over the main loop */
+			n = 0;
+		}
+	}
+
+	/* output padstacks are going to be marked with the FOUND flag */
+	for(n = 0; n < objs->used; n++) PCB_FLAG_CLEAR(PCB_FLAG_FOUND, (pcb_any_obj_t *)(objs->array[n]));
+
+	return done;
+}
+
+int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+{
+	int l, n, done = 0, ci;
+	pcb_coord_t cx, cy;
+	pcb_any_obj_t *cand[NUM_LYTS];
+	int num_cand[NUM_LYTS];
+
+	/* output padstacks are going to be marked with the FOUND flag */
+	for(n = 0; n < objs->used; n++) PCB_FLAG_CLEAR(PCB_FLAG_FOUND, (pcb_any_obj_t *)(objs->array[n]));
+
+	for(n = 0; n < objs->used; n++) {
+		pcb_any_obj_t *o = objs->array[n];
+
+		if ((o->type == PCB_OBJ_LINE) || (o->type == PCB_OBJ_ARC) || (o->type == PCB_OBJ_POLY)) {
+			pcb_layer_type_t olyt;
+
+			assert(o->parent_type == PCB_PARENT_LAYER);
+			olyt = pcb_layer_flags_(o->parent.layer);
+			if ((!(olyt & PCB_LYT_COPPER)) || (olyt & PCB_LYT_INTERN))
+				continue; /* deal with outer copper objects only */
+
+			/* assume padstack origin is middle of the object, which is approximated here */
+			cx = (o->BoundingBox.X1 + o->BoundingBox.X2) / 2;
+			cy = (o->BoundingBox.Y1 + o->BoundingBox.Y2) / 2;
+
+			memset(cand, 0, sizeof(cand));
+			memset(num_cand, 0, sizeof(num_cand));
+			for(l = 0; l < NUM_LYTS; l++) {
+				if (lyts[l] == olyt) {
+					cand[l] = o;
+					num_cand[l]++;
+					break;
+				}
+			}
+
+			for(ci = 0; ci < objs->used; ci++) {
+				pcb_layer_type_t lyt;
+				pcb_any_obj_t *c = objs->array[ci]; /* candidate */
+
+				lyt = pcb_layer_flags_(c->parent.layer);
+
+				if ((lyt & PCB_LYT_ANYWHERE) != (olyt & PCB_LYT_ANYWHERE))
+					continue; /* care for the same side only */
+
+				if (!((lyt & (PCB_LYT_MASK | PCB_LYT_PASTE))))
+					continue; /* care for mask and paste objects */
+
+				if (!pcb_intersect_obj_obj(o, c))
+					continue; /* only if intersects with the original copper pad */
+
+				for(l = 0; l < NUM_LYTS; l++) {
+					if (lyts[l] == lyt) {
+						cand[l] = c;
+						num_cand[l]++;
+						break;
+					}
+				}
+			}
+			if (vect2pstk_conv_cand(data, objs, quiet, cand, num_cand, cx, cy, -1, NULL) == 0) {
+				/* we have deleted from objs, need to start over the main loop */
+				n = 0;
+			}
+		}
+	}
+
+	return done;
+}
+
+int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+{
+	int t = pcb_pstk_vect2pstk_thr(data, objs, quiet);
+	int s = pcb_pstk_vect2pstk_smd(data, objs, quiet);
+	if ((t < 0) && (s < 0))
+		return -1;
+	if (t < 0) t = 0;
+	if (s < 0) s = 0;
+	return t+s;
+}
+
+
+pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated, pcb_coord_t glob_clearance, pcb_pstk_shape_t *shape)
+{
+	pcb_pstk_proto_t proto;
+	pcb_cardinal_t pid;
+	pcb_pstk_tshape_t tshp;
+	pcb_pstk_shape_t *s;
+
+	memset(&proto, 0, sizeof(proto));
+	memset(&tshp, 0, sizeof(tshp));
+
+	tshp.len = 0;
+	for(s = shape; s->layer_mask != 0; s++,tshp.len++) ;
+	tshp.shape = shape;
+	proto.tr.alloced = proto.tr.used = 1; /* has the canonical form only */
+	proto.tr.array = &tshp;
+
+	proto.hdia = drill_dia;
+	proto.hplated = plated;
+
+	pid = pcb_pstk_proto_insert_dup(data, &proto, 1);
+	if (pid == PCB_PADSTACK_INVALID)
+		return NULL;
+
+	return pcb_pstk_new(data, pid, x, y, glob_clearance, pcb_flag_make(PCB_FLAG_CLEARLINE));
+}
+
+void pcb_shape_rect(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height)
+{
+	pcb_pstk_poly_t *dst = &shape->data.poly;
+
+	pcb_pstk_shape_alloc_poly(dst, 4);
+	shape->shape = PCB_PSSH_POLY;
+
+	width/=2;
+	height/=2;
+
+	dst->x[0] = -width; dst->y[0] = -height;
+	dst->x[1] = +width; dst->y[1] = -height;
+	dst->x[2] = +width; dst->y[2] = +height;
+	dst->x[3] = -width; dst->y[3] = +height;
+}
+
+void pcb_shape_oval(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height)
+{
+	shape->shape = PCB_PSSH_LINE;
+
+	if (width == height) {
+		shape->shape = PCB_PSSH_CIRC;
+
+		shape->data.circ.x = shape->data.circ.y = 0;
+		shape->data.circ.dia = height;
+	}
+	else if (width > height) {
+		shape->data.line.x1 = -width/2 + height/2; shape->data.line.y1 = 0;
+		shape->data.line.x2 = +width/2 - height/2; shape->data.line.y2 = 0;
+		shape->data.line.thickness = height;
+	}
+	else {
+		shape->data.line.x1 = 0; shape->data.line.y1 = -height/2 + width/2;
+		shape->data.line.x2 = 0; shape->data.line.y2 = +height/2 - width/2;
+		shape->data.line.thickness = width;
+	}
+}
Index: tags/2.0.1/src_plugins/lib_compat_help/pstk_help.h
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/pstk_help.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/pstk_help.h	(revision 18980)
@@ -0,0 +1,30 @@
+#ifndef PCB_PSTK_HELP_H
+#define PCB_PSTK_HELP_H
+
+#include "obj_pstk.h"
+#include <genvector/vtp0.h>
+
+/* create a new adstack that contains only a hole, but no shapes */
+pcb_pstk_t *pcb_pstk_new_hole(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated);
+
+/* Convert an array of shapes, terminated by a shape with layer_mask=0, into
+   a padstack. */
+pcb_pstk_t *pcb_pstk_new_from_shape(pcb_data_t *data, pcb_coord_t x, pcb_coord_t y, pcb_coord_t drill_dia, pcb_bool plated, pcb_coord_t glob_clearance, pcb_pstk_shape_t *shape);
+
+/* Convert a vector of (pcb_any_obj_t *) into zero or more padstacks. Remove
+   objects that are converted  from both data and objs. New padstacks are
+   placed back in objs. Quiet controls log messages. Return the number
+   of padstacks created. Return -1 on error.
+   WARNING: O(n^2) loops, assuming there are only a dozen of objects passed. */
+int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet); /* thru-hole pins only */
+int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet); /* smd pads only */
+
+/* Same as above, but convert both; returns -1 only if both failed */
+int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet);
+
+/*** shape generators ***/
+void pcb_shape_rect(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height);
+void pcb_shape_oval(pcb_pstk_shape_t *shape, pcb_coord_t width, pcb_coord_t height);
+
+
+#endif
Index: tags/2.0.1/src_plugins/lib_compat_help/subc_help.c
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/subc_help.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/subc_help.c	(revision 18980)
@@ -0,0 +1,68 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "subc_help.h"
+
+pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom, const char *pattern)
+{
+	pcb_layer_type_t side = bottom ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
+	pcb_layer_t *ly = pcb_subc_get_layer(sc, side | PCB_LYT_SILK, 0, pcb_true, "top-silk", pcb_false);
+	if (ly != NULL)
+		return pcb_text_new(ly, pcb_font(PCB, 0, 0), x, y, direction, scale, pattern, pcb_flag_make(PCB_FLAG_DYNTEXT | PCB_FLAG_FLOATER | (bottom ? PCB_FLAG_ONSOLDER : 0)));
+	return 0;
+}
+
+pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom)
+{
+	return pcb_subc_add_dyntex(sc, x, y, direction, scale, bottom, "%a.parent.refdes%");
+}
+
+pcb_text_t *pcb_subc_get_refdes_text(pcb_subc_t *sc)
+{
+	int l, score, best_score = 0;
+	pcb_text_t *best = NULL;
+	for(l = 0; l < sc->data->LayerN; l++) {
+		pcb_layer_t *ly = &sc->data->Layer[l];
+		pcb_text_t *text;
+		gdl_iterator_t it;
+		textlist_foreach(&ly->Text, &it, text) {
+			if (!PCB_FLAG_TEST(PCB_FLAG_DYNTEXT, text))
+				continue;
+			if (!strstr(text->TextString, "%a.parent.refdes%"))
+				continue;
+			score = 1;
+			if (ly->meta.bound.type & PCB_LYT_SILK) score += 5;
+			if (ly->meta.bound.type & PCB_LYT_TOP)  score += 2;
+			if (score > best_score) {
+				best = text;
+				best_score = score;
+			}
+		}
+	}
+
+	return best;
+}
+
Index: tags/2.0.1/src_plugins/lib_compat_help/subc_help.h
===================================================================
--- tags/2.0.1/src_plugins/lib_compat_help/subc_help.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_compat_help/subc_help.h	(revision 18980)
@@ -0,0 +1,18 @@
+#ifndef PCB_SUBC_HELP_H
+#define PCB_SUBC_HELP_H
+
+#include "obj_subc.h"
+#include "layer.h"
+
+/* Create dynamic text on the top silk layer (creates the layer if needed).
+   Returns the text object, or NULL on error. Does not set any subc
+   attribute. The refdes version is just a shorthand for the pattern. */
+pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom, const char *pattern);
+pcb_text_t *pcb_subc_add_refdes_text(pcb_subc_t *sc, pcb_coord_t x, pcb_coord_t y, unsigned direction, int scale, pcb_bool bottom);
+
+/* Returns the refdes text objects; must be DYNTEXT and must contain the
+   refdes attribute printing. If there's are multiple objects, silk is
+   preferred. */
+pcb_text_t *pcb_subc_get_refdes_text(pcb_subc_t *sc);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gensexpr/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_gensexpr/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gensexpr/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_gensexpr
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/lib_gensexpr/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_gensexpr/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gensexpr/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {lib_gensexpr}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/lib_gensexpr/lib_gensexpr.o
+	$(SRC_3RD_DIR)/gensexpr/gsxl.o
+	$(SRC_3RD_DIR)/gensexpr/gsx_parse.o
+@]
+
+switch /local/pcb/lib_gensexpr/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.c	(revision 18980)
@@ -0,0 +1,17 @@
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "plugins.h"
+
+int pplg_check_ver_lib_gensexpr(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_gensexpr(void)
+{
+}
+
+int pplg_init_lib_gensexpr(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gensexpr/lib_gensexpr.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short #s-expression library
+$long S-expression parser lib
+$state works
+$package lib-io
+default disable-all
Index: tags/2.0.1/src_plugins/lib_gtk_common/HACKING
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/HACKING	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/HACKING	(revision 18980)
@@ -0,0 +1,10 @@
+act_*: actions
+util_*: generic, non-UI related utilities
+ui_*: ui logic related, but gtk-free utilities
+wt_*: custom widgets, cell renderers for gtk - must work in both gtk2 and gtk3
+dlg_*: dialog boxes, preferably one per file
+bu_*: builders, building a part of a bigger gui portion
+in_*: input handling (gtk-specific)
+win_*: windowing related utils
+
+Any of these may depend on glib.
Index: tags/2.0.1/src_plugins/lib_gtk_common/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_gtk_common
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_gtk_common/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,82 @@
+put /local/pcb/mod {lib_gtk_common}
+put /local/pcb/mod/OBJS [@
+  $(PLUGDIR)/lib_gtk_common/lib_gtk_common.o
+@]
+
+put /local/pcb/mod/OBJS_C99 [@
+  $(PLUGDIR)/lib_gtk_common/act_fileio.o
+  $(PLUGDIR)/lib_gtk_common/act_print.o
+  $(PLUGDIR)/lib_gtk_common/bu_box.o
+  $(PLUGDIR)/lib_gtk_common/bu_check_button.o
+  $(PLUGDIR)/lib_gtk_common/bu_cursor_pos.o
+  $(PLUGDIR)/lib_gtk_common/bu_dwg_tooltip.o
+  $(PLUGDIR)/lib_gtk_common/bu_entry.o
+  $(PLUGDIR)/lib_gtk_common/bu_info_bar.o
+  $(PLUGDIR)/lib_gtk_common/bu_icons.o
+  $(PLUGDIR)/lib_gtk_common/bu_menu.o
+  $(PLUGDIR)/lib_gtk_common/bu_mode_btn.o
+  $(PLUGDIR)/lib_gtk_common/bu_notebook.o
+  $(PLUGDIR)/lib_gtk_common/bu_spin_button.o
+  $(PLUGDIR)/lib_gtk_common/bu_status_line.o
+  $(PLUGDIR)/lib_gtk_common/bu_text_view.o
+  $(PLUGDIR)/lib_gtk_common/dlg_attribute.o
+  $(PLUGDIR)/lib_gtk_common/dlg_attributes.o
+  $(PLUGDIR)/lib_gtk_common/dlg_command.o
+  $(PLUGDIR)/lib_gtk_common/dlg_confirm.o
+  $(PLUGDIR)/lib_gtk_common/dlg_drc.o
+  $(PLUGDIR)/lib_gtk_common/dlg_file_chooser.o
+  $(PLUGDIR)/lib_gtk_common/dlg_fontsel.o
+  $(PLUGDIR)/lib_gtk_common/dlg_input.o
+  $(PLUGDIR)/lib_gtk_common/dlg_library.o
+  $(PLUGDIR)/lib_gtk_common/dlg_library_param.o
+  $(PLUGDIR)/lib_gtk_common/dlg_log.o
+  $(PLUGDIR)/lib_gtk_common/dlg_message.o
+  $(PLUGDIR)/lib_gtk_common/dlg_netlist.o
+  $(PLUGDIR)/lib_gtk_common/dlg_pinout.o
+  $(PLUGDIR)/lib_gtk_common/dlg_print.o
+  $(PLUGDIR)/lib_gtk_common/dlg_progress.o
+  $(PLUGDIR)/lib_gtk_common/dlg_propedit.o
+  $(PLUGDIR)/lib_gtk_common/dlg_report.o
+  $(PLUGDIR)/lib_gtk_common/dlg_route_style.o
+  $(PLUGDIR)/lib_gtk_common/dlg_search.o
+  $(PLUGDIR)/lib_gtk_common/dlg_topwin.o
+  $(PLUGDIR)/lib_gtk_common/in_keyboard.o
+  $(PLUGDIR)/lib_gtk_common/in_mouse.o
+  $(PLUGDIR)/lib_gtk_common/ui_crosshair.o
+  $(PLUGDIR)/lib_gtk_common/ui_zoompan.o
+  $(PLUGDIR)/lib_gtk_common/util_block_hook.o
+  $(PLUGDIR)/lib_gtk_common/util_ext_chg.o
+  $(PLUGDIR)/lib_gtk_common/util_listener.o
+  $(PLUGDIR)/lib_gtk_common/util_str.o
+  $(PLUGDIR)/lib_gtk_common/util_timer.o
+  $(PLUGDIR)/lib_gtk_common/util_watch.o
+  $(PLUGDIR)/lib_gtk_common/win_place.o
+  $(PLUGDIR)/lib_gtk_common/wt_accel_label.o
+  $(PLUGDIR)/lib_gtk_common/wt_coord_entry.o
+  $(PLUGDIR)/lib_gtk_common/wt_layersel.o
+  $(PLUGDIR)/lib_gtk_common/wt_preview.o
+  $(PLUGDIR)/lib_gtk_common/wt_route_style.o
+@]
+
+switch /local/pcb/hid_gtk3_cairo/controls
+	case {disable} end;
+	default
+		append /local/pcb/mod/OBJS_C99 [@
+		  $(PLUGDIR)/lib_gtk_common/wt_trunc_text.o
+		@]
+	end
+end
+
+switch /local/pcb/lib_gtk_common/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtkx/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtkx/ldflags
+	end
+end
+
+switch /local/pcb/lib_gtk_common/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.c	(revision 18980)
@@ -0,0 +1,302 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <glib.h>
+#include <unistd.h>
+
+#include "act_fileio.h"
+
+#include "actions.h"
+#include "conf_core.h"
+#include "plug_footprint.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+#include "board.h"
+#include "data.h"
+
+#include "dlg_file_chooser.h"
+
+
+
+
+static char *dup_cwd()
+{
+#if defined (PATH_MAX)
+	char tmp[PATH_MAX + 1];
+#else
+	char tmp[8193];
+#endif
+	return pcb_strdup(getcwd(tmp, sizeof(tmp)));
+}
+
+static const char pcb_acts_load[] = "TODO";
+static const char pcb_acth_load[] = "TODO";
+extern fgw_error_t pcb_act_LoadFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+fgw_error_t pcb_gtk_act_load(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function = "Layout";
+	char *name = NULL;
+
+	static gchar *current_element_dir = NULL;
+	static gchar *current_layout_dir = NULL;
+	static gchar *current_netlist_dir = NULL;
+
+	if (!current_element_dir)
+		current_element_dir = dup_cwd();
+	if (!current_layout_dir)
+		current_layout_dir = dup_cwd();
+	if (!current_netlist_dir)
+		current_netlist_dir = dup_cwd();
+
+	/* we've been given the file name */
+	if (argc > 2)
+		return PCB_ACT_CALL_C(pcb_act_LoadFrom, res, argc, argv);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, load, function = argv[1].val.str);
+
+	if (pcb_strcasecmp(function, "Netlist") == 0) {
+		name = ghid_dialog_file_select_open(top_window, "Load netlist file", &current_netlist_dir, conf_core.rc.file_path);
+	}
+	else if (pcb_strcasecmp(function, "ElementToBuffer") == 0) {
+		gchar *path = (gchar *) pcb_fp_default_search_path();
+		name = ghid_dialog_file_select_open(top_window, "Load element to buffer", &current_element_dir, path);
+	}
+	else if (pcb_strcasecmp(function, "LayoutToBuffer") == 0) {
+		name = ghid_dialog_file_select_open(top_window, "Load layout file to buffer", &current_layout_dir, conf_core.rc.file_path);
+	}
+	else if (pcb_strcasecmp(function, "Layout") == 0) {
+		name = ghid_dialog_file_select_open(top_window, "Load layout file", &current_layout_dir, conf_core.rc.file_path);
+	}
+
+	if (name) {
+		if (conf_core.rc.verbose)
+			fprintf(stderr, "Load:  Calling LoadFrom(%s, %s)\n", function, name);
+		pcb_actionl("LoadFrom", function, name, NULL);
+		g_free(name);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+#warning TODO: this should be more or less common with lesstif
+const char pcb_gtk_acts_save[] = "Save()\n" "Save(Layout|LayoutAs)\n" "Save(AllConnections|AllUnusedPins|ElementConnections)\n" "Save(PasteBuffer)";
+const char pcb_gtk_acth_save[] = "Save layout and/or element data to a user-selected file.";
+
+/* %start-doc actions Save
+
+This action is a GUI front-end to the core's @code{SaveTo} action
+(@pxref{SaveTo Action}).  If you happen to pass a filename, like
+@code{SaveTo}, then @code{SaveTo} is called directly.  Else, the
+user is prompted for a filename to save, and then @code{SaveTo} is
+called with that filename.
+
+%end-doc */
+extern fgw_error_t pcb_act_SaveTo(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+fgw_error_t pcb_gtk_act_save(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *function = "Layout";
+	char *name, *name_in = NULL;
+	const char *prompt;
+	pcb_io_formats_t avail;
+	const char **formats_param = NULL, **extensions_param = NULL;
+	int fmt, *fmt_param = NULL;
+	const char *pcb_acts_save = pcb_gtk_acts_save;
+
+	static gchar *current_dir = NULL;
+
+	if (!current_dir)
+		current_dir = dup_cwd();
+
+	if (argc > 2)
+		return PCB_ACT_CALL_C(pcb_act_SaveTo, res, argc, argv);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, save, function = argv[1].val.str);
+
+	if (pcb_strcasecmp(function, "Layout") == 0)
+		if (PCB->Filename)
+			return pcb_actionl("SaveTo", "Layout", NULL);
+
+	if (pcb_strcasecmp(function, "PasteBuffer") == 0) {
+		int num_fmts, n;
+		prompt = "Save element as";
+		num_fmts = pcb_io_list(&avail, PCB_IOT_BUFFER, 1, 1, PCB_IOL_EXT_FP);
+		if (num_fmts > 0) {
+			const char *default_pattern = conf_core.rc.save_fp_fmt;
+			formats_param = (const char **) avail.digest;
+			extensions_param = (const char **) avail.extension;
+			fmt_param = &fmt;
+			fmt = -1;
+
+			if (default_pattern != NULL) {
+				/* look for exact match, case sensitive */
+				for (n = 0; n < num_fmts; n++)
+					if (strcmp(avail.plug[n]->description, default_pattern) == 0)
+						fmt = n;
+
+				/* look for exact match, case insensitive */
+				if (fmt < 0)
+					for (n = 0; n < num_fmts; n++)
+						if (pcb_strcasecmp(avail.plug[n]->description, default_pattern) == 0)
+							fmt = n;
+
+				/* look for partial match */
+				if (fmt < 0) {
+					for (n = 0; n < num_fmts; n++) {
+						if (strstr(avail.plug[n]->description, default_pattern) != NULL) {
+							fmt = n;
+							break; /* pick the first one, that has the highest prio */
+						}
+					}
+				}
+
+				if (fmt < 0) {
+					static int warned = 0;
+					if (!warned)
+						pcb_message(PCB_MSG_WARNING, "Could not find an io_ plugin for the preferred footprint save format (configured in rc/save_fp_fmt): '%s'\n", default_pattern);
+					warned = 1;
+				}
+			}
+
+			if (fmt < 0) /* fallback: choose the frist format */
+				fmt = 0;
+
+			name_in = pcb_concat("unnamed", avail.plug[fmt]->fp_extension, NULL);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Error: no IO plugin avaialble for saving a buffer.");
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+	}
+	else {
+		int num_fmts, n;
+		prompt = "Save layout as";
+		num_fmts = pcb_io_list(&avail, PCB_IOT_PCB, 1, 1, PCB_IOL_EXT_BOARD);
+		if (num_fmts > 0) {
+			formats_param = (const char **) avail.digest;
+			extensions_param = (const char **) avail.extension;
+			fmt_param = &fmt;
+			fmt = 0;
+			if (PCB->Data->loader != NULL) {
+				for (n = 0; n < num_fmts; n++) {
+					if (avail.plug[n] == PCB->Data->loader) {
+						fmt = n;
+						break;
+					}
+				}
+			}
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Error: no IO plugin avaialble for saving a buffer.");
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+	}
+
+	{															/* invent an input file name if needed and run the save dialog to get an output file name */
+		if (name_in == NULL) {
+			if (PCB->Filename == NULL)
+				name_in = pcb_concat("unnamed", extensions_param[fmt], NULL);
+			else
+				name_in = pcb_strdup(PCB->Filename);
+		}
+		name = ghid_dialog_file_select_save(top_window, prompt, &current_dir, name_in, conf_core.rc.file_path, formats_param, extensions_param, fmt_param);
+		free(name_in);
+	}
+
+	if (name) {
+		if (conf_core.rc.verbose)
+			fprintf(stderr, "Save:  Calling SaveTo(%s, %s)\n", function, name);
+
+		if (pcb_strcasecmp(function, "PasteBuffer") == 0) {
+			pcb_actionl("PasteBuffer", "Save", name, avail.plug[fmt]->description, "1", NULL);
+
+		}
+		else {
+			const char *sfmt = NULL;
+			/*
+			 * if we got this far and the function is Layout, then
+			 * we really needed it to be a LayoutAs.  Otherwise
+			 * ActionSaveTo() will ignore the new file name we
+			 * just obtained.
+			 */
+			if (fmt_param != NULL)
+				sfmt = avail.plug[fmt]->description;
+			if (pcb_strcasecmp(function, "Layout") == 0)
+				pcb_actionl("SaveTo", "LayoutAs", name, sfmt, NULL);
+			else
+				pcb_actionl("SaveTo", function, name, sfmt, NULL);
+		}
+		g_free(name);
+		pcb_io_list_free(&avail);
+	}
+	else {
+		pcb_io_list_free(&avail);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+const char pcb_gtk_acts_importgui[] = "ImportGUI()";
+const char pcb_gtk_acth_importgui[] = "Asks user which schematics to import into PCB.\n";
+fgw_error_t pcb_gtk_act_importgui(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char *name = NULL;
+	static gchar *current_layout_dir = NULL;
+	static int I_am_recursing = 0;
+	int rv;
+
+	if (!current_layout_dir)
+		current_layout_dir = dup_cwd();
+
+	if (I_am_recursing)
+		return 1;
+
+
+	name = ghid_dialog_file_select_open(top_window, "Load schematics", &current_layout_dir, conf_core.rc.file_path);
+
+#ifdef DEBUG
+	printf("File selected = %s\n", name);
+#endif
+
+	pcb_attrib_put(PCB, "import::src0", name);
+	free(name);
+
+	I_am_recursing = 1;
+	rv = pcb_action("Import");
+	I_am_recursing = 0;
+
+	return rv;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/act_fileio.h	(revision 18980)
@@ -0,0 +1,13 @@
+#include <gtk/gtk.h>
+#include <libfungw/fungw.h>
+#include "unit.h"
+
+fgw_error_t pcb_gtk_act_load(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_gtk_acts_save[];
+extern const char pcb_gtk_acth_save[];
+fgw_error_t pcb_gtk_act_save(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_gtk_acts_importgui[];
+extern const char pcb_gtk_acth_importgui[];
+fgw_error_t pcb_gtk_act_importgui(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv);
Index: tags/2.0.1/src_plugins/lib_gtk_common/act_print.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/act_print.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/act_print.c	(revision 18980)
@@ -0,0 +1,74 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include "act_print.h"
+
+#include "board.h"
+#include "actions.h"
+#include "hid.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "data.h"
+#include "compat_nls.h"
+
+#include "dlg_print.h"
+
+const char pcb_gtk_acts_print[] = "Print()";
+const char pcb_gtk_acth_print[] = "Print the layout.";
+fgw_error_t pcb_gtk_act_print(GtkWidget *top_window, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_hid_t **hids;
+	int i;
+	pcb_hid_t *printer = NULL;
+
+	hids = pcb_hid_enumerate();
+	for (i = 0; hids[i]; i++) {
+		if (hids[i]->printer)
+			printer = hids[i];
+	}
+
+	if (printer == NULL) {
+		pcb_gui->log("Can't find a suitable printer HID");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	/* check if layout is empty */
+	if (!pcb_data_is_empty(PCB->Data)) {
+		ghid_dialog_print(printer, NULL, top_window);
+	}
+	else
+		pcb_gui->log("Can't print empty layout");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/act_print.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/act_print.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/act_print.h	(revision 18980)
@@ -0,0 +1,11 @@
+#include <gtk/gtk.h>
+#include <libfungw/fungw.h>
+
+extern const char pcb_gtk_acts_print[];
+extern const char pcb_gtk_acth_print[];
+fgw_error_t pcb_gtk_act_print(GtkWidget *top_window, fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+extern const char pcb_gtk_acts_printcalibrate[];
+extern const char pcb_gtk_acth_printcalibrate[];
+fgw_error_t pcb_gtk_act_printcalibrate(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_box.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_box.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_box.c	(revision 18980)
@@ -0,0 +1,142 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Originally from gui-utils.c, was written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  Those functions were utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ */
+
+#include "config.h"
+
+#include "bu_box.h"
+#include "compat.h"
+
+/*TODO: The 2 following functions could be merged if an additional 
+ *  gboolean pack_start   parameter is added */
+GtkWidget *ghid_framed_vbox(GtkWidget * box, gchar * label, gint frame_border_width,
+														gboolean frame_expand, gint vbox_pad, gint vbox_border_width)
+{
+	GtkWidget *frame;
+	GtkWidget *vbox;
+
+	frame = gtk_frame_new(label);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), frame_border_width);
+	gtk_box_pack_start(GTK_BOX(box), frame, frame_expand, frame_expand, 0);
+	vbox = gtkc_vbox_new(FALSE, vbox_pad);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), vbox_border_width);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	return vbox;
+}
+
+GtkWidget *ghid_framed_vbox_end(GtkWidget * box, gchar * label, gint frame_border_width,
+																gboolean frame_expand, gint vbox_pad, gint vbox_border_width)
+{
+	GtkWidget *frame;
+	GtkWidget *vbox;
+
+	frame = gtk_frame_new(label);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), frame_border_width);
+	gtk_box_pack_end(GTK_BOX(box), frame, frame_expand, frame_expand, 0);
+	vbox = gtkc_vbox_new(FALSE, vbox_pad);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), vbox_border_width);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	return vbox;
+}
+
+GtkWidget *ghid_category_vbox(GtkWidget * box, const gchar * category_header,
+															gint header_pad, gint box_pad, gboolean pack_start, gboolean bottom_pad)
+{
+	GtkWidget *vbox, *vbox1, *hbox, *label;
+	gchar *s;
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	if (pack_start)
+		gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, FALSE, 0);
+	else
+		gtk_box_pack_end(GTK_BOX(box), vbox, FALSE, FALSE, 0);
+
+	if (category_header) {
+		label = gtk_label_new(NULL);
+		s = g_strconcat("<span weight=\"bold\">", category_header, "</span>", NULL);
+		gtk_label_set_markup(GTK_LABEL(label), s);
+		/*TODO: Deprecated in GTK3. Use gtk_widget_set_[h|v]align () functions ? */
+		gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, header_pad);
+		g_free(s);
+	}
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	label = gtk_label_new("     ");
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	vbox1 = gtkc_vbox_new(FALSE, box_pad);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox1, TRUE, TRUE, 0);
+
+	if (bottom_pad) {
+		label = gtk_label_new("");
+		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+	}
+	return vbox1;
+}
+
+GtkWidget *ghid_scrolled_vbox(GtkWidget * box, GtkWidget ** scr, GtkPolicyType h_policy, GtkPolicyType v_policy)
+{
+	GtkWidget *scrolled, *vbox;
+
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), h_policy, v_policy);
+	gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtkc_scrolled_window_add_with_viewport(scrolled, vbox);
+	if (scr)
+		*scr = scrolled;
+	return vbox;
+}
+
+GtkTreeSelection *ghid_scrolled_selection(GtkTreeView * treeview, GtkWidget * box,
+																					GtkSelectionMode s_mode,
+																					GtkPolicyType h_policy, GtkPolicyType v_policy,
+																					void (*func_cb) (GtkTreeSelection *, gpointer), gpointer data)
+{
+	GtkTreeSelection *selection;
+	GtkWidget *scrolled;
+
+	if (!box || !treeview)
+		return NULL;
+
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
+	gtk_container_add(GTK_CONTAINER(scrolled), GTK_WIDGET(treeview));
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), h_policy, v_policy);
+	selection = gtk_tree_view_get_selection(treeview);
+	gtk_tree_selection_set_mode(selection, s_mode);
+	if (func_cb)
+		g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(func_cb), data);
+	return selection;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_box.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_box.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_box.h	(revision 18980)
@@ -0,0 +1,22 @@
+#include <gtk/gtk.h>
+
+/* Builds a vertical box, surrounded by a labeled frame
+    frame_border_width: border around outside of frame.
+    vbox_pad: pad between widgets to be packed in returned vbox.
+    vbox_border_width: border between returned vbox and frame. */
+GtkWidget *ghid_framed_vbox(GtkWidget * box, gchar * label, gint frame_border_width,
+														gboolean frame_expand, gint vbox_pad, gint vbox_border_width);
+
+/* Same as ghid_framed_vbox(), but packing at the end */
+GtkWidget *ghid_framed_vbox_end(GtkWidget * box, gchar * label, gint frame_border_width,
+																gboolean frame_expand, gint vbox_pad, gint vbox_border_width);
+
+GtkWidget *ghid_category_vbox(GtkWidget * box, const gchar * category_header,
+															gint header_pad, gint box_pad, gboolean pack_start, gboolean bottom_pad);
+
+GtkWidget *ghid_scrolled_vbox(GtkWidget * box, GtkWidget ** scr, GtkPolicyType h_policy, GtkPolicyType v_policy);
+
+GtkTreeSelection *ghid_scrolled_selection(GtkTreeView * treeview, GtkWidget * box,
+																					GtkSelectionMode s_mode,
+																					GtkPolicyType h_policy, GtkPolicyType v_policy,
+																					void (*func_cb) (GtkTreeSelection *, gpointer), gpointer data);
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.c	(revision 18980)
@@ -0,0 +1,60 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+
+#include "bu_check_button.h"
+
+void pcb_gtk_check_button_connected(GtkWidget * box,
+																		GtkWidget ** button,
+																		gboolean active,
+																		gboolean pack_start,
+																		gboolean expand,
+																		gboolean fill,
+																		gint pad,
+																		void (*cb_func) (GtkToggleButton *, gpointer), gpointer data, const gchar * string)
+{
+	GtkWidget *b;
+
+	if (string != NULL)
+		b = gtk_check_button_new_with_label(string);
+	else
+		b = gtk_check_button_new();
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), active);
+	if (box && pack_start)
+		gtk_box_pack_start(GTK_BOX(box), b, expand, fill, pad);
+	else if (box && !pack_start)
+		gtk_box_pack_end(GTK_BOX(box), b, expand, fill, pad);
+
+	if (cb_func)
+		g_signal_connect(b, "clicked", G_CALLBACK(cb_func), data);
+	if (button)
+		*button = b;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_check_button.h	(revision 18980)
@@ -0,0 +1,10 @@
+#include <gtk/gtk.h>
+
+void pcb_gtk_check_button_connected(GtkWidget * box,
+																		GtkWidget ** button,
+																		gboolean active,
+																		gboolean pack_start,
+																		gboolean expand,
+																		gboolean fill,
+																		gint pad,
+																		void (*cb_func) (GtkToggleButton *, gpointer), gpointer data, const gchar * string);
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.c	(revision 18980)
@@ -0,0 +1,153 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "bu_cursor_pos.h"
+#include "conf_core.h"
+#include "actions.h"
+#include "crosshair.h"
+#include "misc_util.h"
+#include "compat_nls.h"
+#include "math_helper.h"
+
+static void grid_units_button_cb(GtkWidget * widget, gpointer data)
+{
+	/* Button only toggles between mm and mil */
+	if (conf_core.editor.grid_unit == get_unit_struct("mm"))
+		pcb_actionl("SetUnits", "mil", NULL);
+	else
+		pcb_actionl("SetUnits", "mm", NULL);
+}
+
+/*
+ * The two following callbacks are used to keep the absolute
+ * and relative cursor labels from growing and shrinking as you
+ * move the cursor around.
+ */
+static void absolute_label_size_req_cb(GtkWidget * widget, GdkRectangle * req, gpointer data)
+{
+
+	static gint w = 0;
+	if (req->width > w)
+		w = req->width;
+	else
+		req->width = w;
+}
+
+static void relative_label_size_req_cb(GtkWidget * widget, GdkRectangle * req, gpointer data)
+{
+
+	static gint w = 0;
+	if (req->width > w)
+		w = req->width;
+	else
+		req->width = w;
+}
+
+
+void make_cursor_position_labels(GtkWidget *hbox, pcb_gtk_cursor_pos_t *cps)
+{
+	GtkWidget *frame, *label;
+
+	/* The grid units button next to the cursor position labels.
+	 */
+	cps->grid_units_button = gtk_button_new();
+	label = gtk_label_new("");
+	gtk_label_set_markup(GTK_LABEL(label), conf_core.editor.grid_unit->in_suffix);
+	cps->grid_units_label = label;
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_container_add(GTK_CONTAINER(cps->grid_units_button), label);
+	gtk_box_pack_end(GTK_BOX(hbox), cps->grid_units_button, FALSE, TRUE, 0);
+	g_signal_connect(cps->grid_units_button, "clicked", G_CALLBACK(grid_units_button_cb), NULL);
+
+	/* The absolute cursor position label
+	 */
+	frame = gtk_frame_new(NULL);
+	gtk_box_pack_end(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 0);
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_OUT);
+
+	/* Using a text will reserve a default width to the widget : */
+	label = gtk_label_new(" ___.__ ");
+	gtk_container_add(GTK_CONTAINER(frame), label);
+	cps->cursor_position_absolute_label = label;
+	g_signal_connect(G_OBJECT(label), "size-allocate", G_CALLBACK(absolute_label_size_req_cb), NULL);
+
+
+	/* The relative cursor position label
+	 */
+	frame = gtk_frame_new(NULL);
+	gtk_box_pack_end(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 0);
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_OUT);
+	label = gtk_label_new(" __.__  __.__ ");
+	gtk_container_add(GTK_CONTAINER(frame), label);
+	cps->cursor_position_relative_label = label;
+	g_signal_connect(G_OBJECT(label), "size-allocate", G_CALLBACK(relative_label_size_req_cb), NULL);
+}
+
+void ghid_cursor_position_label_set_text(pcb_gtk_cursor_pos_t *cps, gchar * text)
+{
+	if (cps->cursor_position_absolute_label != NULL)
+		gtk_label_set_markup(GTK_LABEL(cps->cursor_position_absolute_label), text ? text : "");
+}
+
+void ghid_cursor_position_relative_label_set_text(pcb_gtk_cursor_pos_t *cps, gchar * text)
+{
+	if (cps->cursor_position_relative_label != NULL)
+		gtk_label_set_markup(GTK_LABEL(cps->cursor_position_relative_label), text ? text : "");
+}
+
+void ghid_set_cursor_position_labels(pcb_gtk_cursor_pos_t *cps, int compact_vertical)
+{
+	char *text, sep = ' ';
+	if (compact_vertical)
+		sep = '\n';
+
+	if (pcb_marked.status) {
+		pcb_coord_t dx = pcb_crosshair.X - pcb_marked.X;
+		pcb_coord_t dy = pcb_crosshair.Y - pcb_marked.Y;
+		pcb_coord_t r = pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, pcb_marked.X, pcb_marked.Y);
+		double a = atan2(dy, dx) * PCB_RAD_TO_DEG;
+
+
+		text = pcb_strdup_printf(_("%m+r %-mS;%cphi %-.1f;%c%-mS %-mS"), conf_core.editor.grid_unit->allow, r, sep, a, sep, dx, dy);
+		ghid_cursor_position_relative_label_set_text(cps, text);
+		free(text);
+	}
+	else {
+		char text[64];
+		sprintf(text, _("r __.__;%cphi __._;%c__.__ __.__"), sep, sep);
+		ghid_cursor_position_relative_label_set_text(cps, text);
+	}
+
+	text = pcb_strdup_printf("%m+%-mS%c%-mS", conf_core.editor.grid_unit->allow, pcb_crosshair.X, sep, pcb_crosshair.Y);
+	ghid_cursor_position_label_set_text(cps, text);
+	free(text);
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_cursor_pos.h	(revision 18980)
@@ -0,0 +1,19 @@
+#ifndef PCB_GTK_BU_CURSOR_POS_H
+#define PCB_GTK_BU_CURSOR_POS_H
+
+#include <gtk/gtk.h>
+
+typedef struct pcb_gtk_cursor_pos_s {
+	GtkWidget *cursor_position_relative_label;
+	GtkWidget *cursor_position_absolute_label;
+	GtkWidget *grid_units_label;
+	GtkWidget *grid_units_button;
+} pcb_gtk_cursor_pos_t;
+
+/* Create cps's widgets in the hbox */
+void make_cursor_position_labels(GtkWidget *hbox, pcb_gtk_cursor_pos_t *cps);
+
+/* update the content of the cursor pos labels */
+void ghid_set_cursor_position_labels(pcb_gtk_cursor_pos_t *cps, int compact_vertical);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.c	(revision 18980)
@@ -0,0 +1,155 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,1999 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file was originally written by Bill Wilson for the PCB Gtk port
+   and refactored by Tibor 'Igor2' Palinkas for pcb-rnd */
+
+/* Drawing area tooltips */
+
+#include "config.h"
+#include "bu_dwg_tooltip.h"
+
+#include "layer.h"
+#include "library.h"
+#include "search.h"
+#include "find.h"
+#include "board.h"
+#include "obj_subc.h"
+#include "obj_subc_parent.h"
+
+#define TOOLTIP_UPDATE_DELAY 200
+
+static char *describe_location(pcb_coord_t X, pcb_coord_t Y)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type;
+	int Range = 0;
+	const char *elename = "";
+	char *pinname;
+	char *netname = NULL;
+	char *description;
+
+	/* check if there are any pins or pads at that position */
+
+	type = pcb_search_obj_by_location(PCB_OBJ_CLASS_TERM, &ptr1, &ptr2, &ptr3, X, Y, Range);
+	if (type == PCB_OBJ_VOID)
+		return NULL;
+
+	/* don't mess with silk objects! */
+	if ((type & PCB_SILK_TYPE) && (pcb_layer_flags_((pcb_layer_t *)ptr1) & PCB_LYT_SILK))
+		return NULL;
+
+	if (((pcb_any_obj_t *)ptr2)->term != NULL) {
+		pcb_subc_t *subc = pcb_obj_parent_subc(ptr2);
+		if (subc != NULL)
+			elename = subc->refdes;
+	}
+
+	pinname = pcb_connection_name(ptr2);
+
+	if (pinname == NULL)
+		return NULL;
+
+	/* Find netlist entry */
+	PCB_MENU_LOOP(&PCB->NetlistLib[PCB_NETLIST_EDITED]);
+	{
+		if (!menu->Name)
+			continue;
+
+		PCB_ENTRY_LOOP(menu);
+		{
+			if (!entry->ListEntry)
+				continue;
+
+			if (strcmp(entry->ListEntry, pinname) == 0) {
+				netname = g_strdup(menu->Name);
+				/* For some reason, the netname has spaces in front of it, strip them */
+				g_strstrip(netname);
+				break;
+			}
+		}
+		PCB_END_LOOP;
+
+		if (netname != NULL)
+			break;
+	}
+	PCB_END_LOOP;
+
+	description = g_strdup_printf("Element name: %s\n"
+																"Pinname : %s\n"
+																"Netname : %s",
+																elename, (pinname != NULL) ? pinname : "--", (netname != NULL) ? netname : "--");
+
+	g_free(netname);
+
+	return description;
+}
+
+static int tooltip_update_timeout_id = 0;
+gboolean pcb_gtk_dwg_tooltip_check_object(GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy)
+{
+	char *description;
+
+	/* Make sure the timer is not removed - we are called by the timer and it is
+	   automatically removed because we are returning false */
+	tooltip_update_timeout_id = 0;
+
+	/* check if there are any pins or pads at that position */
+	description = describe_location(crosshairx, crosshairy);
+
+	if (description == NULL)
+		return FALSE;
+
+	gtk_widget_set_tooltip_text(drawing_area, description);
+	g_free(description);
+
+	return FALSE;
+}
+
+void pcb_gtk_dwg_tooltip_cancel_update(void)
+{
+	if (tooltip_update_timeout_id)
+		g_source_remove(tooltip_update_timeout_id);
+	tooltip_update_timeout_id = 0;
+}
+
+/* FIXME: If the GHidPort is ever destroyed, we must call
+ * pcb_gtk_dwg_tooltip_cancel_update()
+ * fire after the data it utilises has been free'd.
+ */
+void pcb_gtk_dwg_tooltip_queue(GtkWidget *drawing_area, GSourceFunc cb, void *ctx)
+{
+	/* Zap the old tool-tip text and force it to be removed from the screen */
+	gtk_widget_set_tooltip_text(drawing_area, NULL);
+	gtk_widget_trigger_tooltip_query(drawing_area);
+
+	pcb_gtk_dwg_tooltip_cancel_update();
+
+	tooltip_update_timeout_id = g_timeout_add(TOOLTIP_UPDATE_DELAY, cb, ctx);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_dwg_tooltip.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <gtk/gtk.h>
+gboolean pcb_gtk_dwg_tooltip_check_object(GtkWidget *drawing_area, pcb_coord_t crosshairx, pcb_coord_t crosshairy);
+void pcb_gtk_dwg_tooltip_cancel_update(void);
+void pcb_gtk_dwg_tooltip_queue(GtkWidget *drawing_area, GSourceFunc cb, void *ctx);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.c	(revision 18980)
@@ -0,0 +1,119 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+
+#include "bu_entry.h"
+#include "conf_core.h"
+
+#include "compat.h"
+
+void ghid_coord_entry(GtkWidget * box, GtkWidget ** coord_entry, pcb_coord_t value,
+											pcb_coord_t low, pcb_coord_t high, enum ce_step_size step_size,
+											const pcb_unit_t * u, gint width,
+											void (*cb_func) (pcb_gtk_coord_entry_t *, gpointer),
+											gpointer data, const gchar * string_pre, const gchar * string_post)
+{
+	GtkWidget *hbox = NULL, *label, *entry_widget;
+	pcb_gtk_coord_entry_t *entry;
+
+	if (u == NULL)
+		u = conf_core.editor.grid_unit;
+
+	if ((string_pre || string_post) && box) {
+		hbox = gtkc_hbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 2);
+		box = hbox;
+	}
+
+	entry_widget = pcb_gtk_coord_entry_new(low, high, value, u, step_size);
+	if (coord_entry)
+		*coord_entry = entry_widget;
+	if (width > 0)
+		gtk_widget_set_size_request(entry_widget, width, -1);
+	entry = GHID_COORD_ENTRY(entry_widget);
+	if (data == NULL)
+		data = (gpointer) entry;
+	if (cb_func)
+		g_signal_connect(G_OBJECT(entry_widget), "value_changed", G_CALLBACK(cb_func), data);
+	if (box) {
+		if (string_pre) {
+			label = gtk_label_new(string_pre);
+			gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 2);
+		}
+		gtk_box_pack_start(GTK_BOX(box), entry_widget, FALSE, FALSE, 2);
+		if (string_post) {
+			label = gtk_label_new(string_post);
+			gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+			gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 2);
+		}
+	}
+}
+
+void ghid_table_coord_entry(GtkWidget * table, gint row, gint column,
+														GtkWidget ** coord_entry, pcb_coord_t value,
+														pcb_coord_t low, pcb_coord_t high, enum ce_step_size step_size,
+														gint width, void (*cb_func) (pcb_gtk_coord_entry_t *, gpointer),
+														gpointer data, gboolean right_align, const gchar * string)
+{
+	GtkWidget *label, *entry_widget;
+	pcb_gtk_coord_entry_t *entry;
+
+	if (!table)
+		return;
+
+	entry_widget = pcb_gtk_coord_entry_new(low, high, value, conf_core.editor.grid_unit, step_size);
+	if (coord_entry)
+		*coord_entry = entry_widget;
+	if (width > 0)
+		gtk_widget_set_size_request(entry_widget, width, -1);
+	entry = GHID_COORD_ENTRY(entry_widget);
+	if (data == NULL)
+		data = (gpointer) entry;
+	if (cb_func)
+		g_signal_connect(G_OBJECT(entry), "value_changed", G_CALLBACK(cb_func), data);
+
+	if (right_align) {
+		gtk_table_attach_defaults(GTK_TABLE(table), entry_widget, column + 1, column + 2, row, row + 1);
+		if (string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+			gtk_table_attach_defaults(GTK_TABLE(table), label, column, column + 1, row, row + 1);
+		}
+	}
+	else {
+		gtk_table_attach_defaults(GTK_TABLE(table), entry_widget, column, column + 1, row, row + 1);
+		if (string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+			gtk_table_attach_defaults(GTK_TABLE(table), label, column + 1, column + 2, row, row + 1);
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_entry.h	(revision 18980)
@@ -0,0 +1,15 @@
+#include <gtk/gtk.h>
+
+#include "wt_coord_entry.h"
+
+void ghid_coord_entry(GtkWidget * box, GtkWidget ** coord_entry, pcb_coord_t value,
+											pcb_coord_t low, pcb_coord_t high, enum ce_step_size step_size,
+											const pcb_unit_t * u, gint width,
+											void (*cb_func) (pcb_gtk_coord_entry_t *, gpointer),
+											gpointer data, const gchar * string_pre, const gchar * string_post);
+
+void ghid_table_coord_entry(GtkWidget * table, gint row, gint column,
+														GtkWidget ** coord_entry, pcb_coord_t value,
+														pcb_coord_t low, pcb_coord_t high, enum ce_step_size step_size,
+														gint width, void (*cb_func) (pcb_gtk_coord_entry_t *, gpointer),
+														gpointer data, gboolean right_align, const gchar * string);
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.c	(revision 18980)
@@ -0,0 +1,112 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "bu_icons.h"
+#include "bu_icons.data"
+
+/* It's enough to load these once, globally - shared data among all callers */
+static int inited = 0;
+
+GdkPixbuf *XC_clock_source, *XC_hand_source, *XC_lock_source;
+
+/* Allocates (with refco=1) an RGBA 24x24 GdkPixbuf from data, using mask;
+   width and height should be smaller than 24. Use g_object_unref() to free
+   the structure. */
+static GdkPixbuf *pcb_gtk_cursor_from_xbm_data(unsigned char *data, unsigned char *mask,
+																							 unsigned int width, unsigned int height)
+{
+	GdkPixbuf *dest;
+	unsigned char *src_data, *mask_data, *dest_data;
+	int dest_stride;
+	unsigned char reg, reg_m;
+	unsigned char data_b, mask_b;
+	int bits;
+	int x, y;
+
+	g_return_val_if_fail((width < 25 && height < 25), NULL);
+
+	/* Creates a new suitable GdkPixbuf structure for cursor. */
+	dest = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 24, 24);
+	dest_data = gdk_pixbuf_get_pixels(dest);
+	dest_stride = gdk_pixbuf_get_rowstride(dest);
+
+	src_data = data;
+	mask_data = mask;
+
+	/* Copy data + mask into GdkPixbuf RGBA pixels. */
+	for (y = 0; y < height; y++) {
+		bits = 0;
+		for (x = 0; x < width; x++) {
+			if (bits == 0) {
+				reg = *src_data++;
+				reg_m = *mask_data++;
+				bits = 8;
+			}
+			data_b = (reg & 0x01) ? 255 : 0;
+			reg >>= 1;
+			mask_b = (reg_m & 0x01) ? 255 : 0;
+			reg_m >>= 1;
+			bits--;
+
+			dest_data[x * 4 + 0] = data_b;
+			dest_data[x * 4 + 1] = data_b;
+			dest_data[x * 4 + 2] = data_b;
+			dest_data[x * 4 + 3] = mask_b;
+		}
+
+		dest_data += dest_stride;
+	}
+
+	return dest;
+}
+
+void pcb_gtk_icons_init(GtkWindow * top_window)
+{
+	GdkPixbuf *icon;
+
+	if (inited)
+		return;
+
+	icon = gdk_pixbuf_new_from_xpm_data((const gchar **) icon_bits);
+	gtk_window_set_default_icon(icon);
+	gtk_window_set_icon(top_window, icon);
+
+	XC_clock_source = pcb_gtk_cursor_from_xbm_data(rotateIcon_bits, rotateMask_bits, rotateIcon_width, rotateIcon_height);
+
+	XC_hand_source = pcb_gtk_cursor_from_xbm_data(handIcon_bits, handMask_bits, handIcon_width, handIcon_height);
+
+	XC_lock_source = pcb_gtk_cursor_from_xbm_data(lockIcon_bits, lockMask_bits, lockIcon_width, lockIcon_height);
+
+	inited = 1;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.data
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.data	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.data	(revision 18980)
@@ -0,0 +1,117 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+/* XPM */
+static const char *icon_bits[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 11 1",
+" 	c None",
+".	c #030703",
+"+	c #2C3133",
+"@	c #254E29",
+"#	c #395C3D",
+"$	c #4B734E",
+"%	c #626B6B",
+"&	c #6C9174",
+"*	c #8C959C",
+"=	c #A0B0A8",
+"-	c #DDDEDC",
+/* pixels */
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&$#@@@@#$&&&&&&&&&&&&",
+"&&&&&&&&&&&@@@@@@@@@@&&&&&&&&&&&",
+"&&&&&&&&&&$@@@@@@@@@@$&&&&&&&&&&",
+"&&&&&&&&&&&@@@#%%#@@@&&&&&&&&&&&",
+"&&&&&&&&&&&&%******%&&&&&&&&&&&&",
+"&&&&&&&&&&&**********&&&&&&&&&&&",
+"&&&&&&@@#&************&#@@&&&&&&",
+"&&&&&$@@@**************@@@$&&&&&",
+"&&&&&#@@#*****%++%*****#@@@&&&&&",
+"&&&&&@@@%****%....%****%@@@&&&&&",
+"&&&&&@@@%****......****%@@@$&&&&",
+"&&&&&@@@%****......****%@@@$&&&&",
+"&&&&&@@@%****+....+****%@@@&&&&&",
+"&&&&&@@@%*****+...*****%@@@&&&&&",
+"&&&&&#@@@**************#@@@&&&&&",
+"&&&&&$@@@**************@@@$&&&&&",
+"&&&&&&$$$&************=&$$&&&&&&",
+"&&&&&&&&&&&**********&==&&&&&&&&",
+"&&&&&&&&&&&##%%**%%##&==&&&&&&&&",
+"&&&&&&&&&&&$#@##%@@@#&-=&&&&&&&&",
+"&&&&&&&&---=&$---=@&-=-=&&&&&&&&",
+"&&&&&&&&&-&#@@==@-@-$&==&&&&&&&&",
+"&&&&&&&&&-&&&$=&$-$-&&==&&&&&&&&",
+"&&&&&&&&&-&&&&==&-&=---=&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
+};
+
+#define rotateIcon_width 16
+#define rotateIcon_height 16
+static unsigned char rotateIcon_bits[] = {
+   0xf0, 0x03, 0xf8, 0x87, 0x0c, 0xcc, 0x06, 0xf8, 0x03, 0xb0, 0x01, 0x98,
+   0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x19, 0x80, 0x0d, 0xc0,
+   0x1f, 0x60, 0x3b, 0x30, 0xe1, 0x3f, 0xc0, 0x0f};
+
+#define rotateMask_width 16
+#define rotateMask_height 16
+static unsigned char rotateMask_bits[] = {
+   0xf0, 0x03, 0xf8, 0x87, 0x0c, 0xcc, 0x06, 0xf8, 0x03, 0xf0, 0x01, 0xf8,
+   0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x1f, 0x80, 0x0f, 0xc0,
+   0x1f, 0x60, 0x3b, 0x30, 0xe1, 0x3f, 0xc0, 0x0f};
+
+#define handIcon_width 16
+#define handIcon_height 16
+static unsigned char handIcon_bits[] = {
+   0x80, 0x00, 0x48, 0x09, 0x54, 0x15, 0x54, 0x15, 0x54, 0x15, 0x64, 0xcb,
+   0x68, 0xab, 0x2b, 0x5b, 0x05, 0x58, 0x05, 0x20, 0x01, 0x20, 0x02, 0x20,
+   0x02, 0x30, 0x04, 0x10, 0x08, 0x08, 0xf0, 0x0f};
+#define handMask_width 16
+#define handMask_height 16
+static unsigned char handMask_bits[] = {
+   0x80, 0x00, 0xc8, 0x09, 0xdc, 0x1d, 0xdc, 0x1d, 0xdc, 0x1d, 0xfc, 0xcf,
+   0x38, 0xee, 0x1f, 0x78, 0x0f, 0x78, 0x07, 0x30, 0x07, 0x30, 0x0e, 0x38,
+   0x1e, 0x3c, 0x3c, 0x1e, 0xf8, 0x0f, 0xf0, 0x0f};
+#define lockIcon_width 16
+#define lockIcon_height 16
+static unsigned char lockIcon_bits[] = {
+   0x00, 0x00, 0xe0, 0x07, 0x30, 0x0c, 0x10, 0x08, 0x18, 0x18, 0x08, 0x10,
+   0x08, 0x00, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f,
+   0x04, 0x20, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f};
+#define lockMask_width 16
+#define lockMask_height 16
+static unsigned char lockMask_bits[] = {
+   0xf0, 0x0f, 0xf0, 0x0f, 0xf8, 0x1f, 0x38, 0x1c, 0x1c, 0x3c, 0x1c, 0x38,
+   0x1c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
+   0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f};
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_icons.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include <gtk/gtk.h>
+
+/* Initializes icon pixbufs (cursor bits, pcb-rnd logo). */
+void pcb_gtk_icons_init(GtkWindow *top_window);
+
+extern GdkPixbuf *XC_clock_source, *XC_hand_source, *XC_lock_source;
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.c	(revision 18980)
@@ -0,0 +1,105 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "bu_info_bar.h"
+
+#include "board.h"
+#include "plug_io.h"
+#include "compat_nls.h"
+
+static void info_bar_response_cb(GtkInfoBar * info_bar, gint response_id, pcb_gtk_info_bar_t *ibar)
+{
+	gtk_widget_destroy(ibar->info_bar);
+	ibar->info_bar = NULL;
+
+	if (response_id == GTK_RESPONSE_ACCEPT)
+		pcb_revert_pcb();
+}
+
+void pcb_gtk_close_info_bar(pcb_gtk_info_bar_t *ibar)
+{
+	if (ibar->info_bar != NULL)
+		gtk_widget_destroy(ibar->info_bar);
+	ibar->info_bar = NULL;
+}
+
+void pcb_gtk_info_bar_file_extmod_prompt(pcb_gtk_info_bar_t *ibar, GtkWidget *vbox_middle)
+{
+	GtkWidget *button;
+	GtkWidget *button_image;
+	GtkWidget *icon;
+	GtkWidget *label;
+	GtkWidget *content_area;
+	char *file_path_utf8;
+	const char *secondary_text;
+	char *markup;
+
+	pcb_gtk_close_info_bar(ibar);
+
+	ibar->info_bar = gtk_info_bar_new();
+
+	button = gtk_info_bar_add_button(GTK_INFO_BAR(ibar->info_bar), _("Reload"), GTK_RESPONSE_ACCEPT);
+	button_image = gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image(GTK_BUTTON(button), button_image);
+
+	gtk_info_bar_add_button(GTK_INFO_BAR(ibar->info_bar), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_info_bar_set_message_type(GTK_INFO_BAR(ibar->info_bar), GTK_MESSAGE_WARNING);
+	gtk_box_pack_start(GTK_BOX(vbox_middle), ibar->info_bar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(vbox_middle), ibar->info_bar, 0);
+
+
+	g_signal_connect(ibar->info_bar, "response", G_CALLBACK(info_bar_response_cb), ibar);
+
+	file_path_utf8 = g_filename_to_utf8(PCB->Filename, -1, NULL, NULL, NULL);
+
+	secondary_text = PCB->Changed ? "Do you want to drop your changes and reload the file?" : "Do you want to reload the file?";
+
+	markup = g_markup_printf_escaped(_("<b>The file %s has changed on disk</b>\n\n%s"), file_path_utf8, secondary_text);
+	g_free(file_path_utf8);
+
+	content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(ibar->info_bar));
+
+	icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+	gtk_box_pack_start(GTK_BOX(content_area), icon, FALSE, FALSE, 0);
+
+	label = gtk_label_new("");
+	gtk_box_pack_start(GTK_BOX(content_area), label, TRUE, TRUE, 6);
+
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(label), markup);
+	g_free(markup);
+
+	gtk_misc_set_alignment(GTK_MISC(label), 0., 0.5);
+
+	gtk_widget_show_all(ibar->info_bar);
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_info_bar.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_GTK_BU_INFO_BAR_H
+#define PCB_GTK_BU_INFO_BAR_H
+
+#include <gtk/gtk.h>
+
+typedef struct {
+	GtkWidget *info_bar;
+} pcb_gtk_info_bar_t;
+
+void pcb_gtk_close_info_bar(pcb_gtk_info_bar_t *ibar);
+
+void pcb_gtk_info_bar_file_extmod_prompt(pcb_gtk_info_bar_t *ibar, GtkWidget *vbox_middle);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.c	(revision 18980)
@@ -0,0 +1,479 @@
+#include "config.h"
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <liblihata/tree.h>
+
+#include "board.h"
+#include "pcb-printf.h"
+#include "misc_util.h"
+#include "error.h"
+#include "conf.h"
+#include "hid_flags.h"
+#include "hid_cfg.h"
+#include "hid_cfg_action.h"
+#include "event.h"
+
+#include "bu_menu.h"
+#include "wt_route_style.h"
+#include "in_keyboard.h"
+#include "wt_accel_label.h"
+
+
+static int action_counter;
+
+typedef struct {
+	GtkWidget *widget;						/* for most uses */
+	GtkWidget *destroy;						/* destroy this */
+	GtkAction *action;    /* for removing from the central lists */
+} menu_handle_t;
+
+static menu_handle_t *handle_alloc(GtkWidget *widget, GtkWidget *destroy, GtkAction *action)
+{
+	menu_handle_t *m = malloc(sizeof(menu_handle_t));
+	m->widget = widget;
+	m->destroy = destroy;
+	m->action = action;
+	return m;
+}
+
+GtkWidget *pcb_gtk_menu_widget(lht_node_t *node)
+{
+	menu_handle_t *m;
+
+	if (node == NULL) return NULL;
+	if (node->user_data == NULL) return NULL;
+
+	m = node->user_data;
+	return m->widget;
+}
+
+struct _GHidMainMenu {
+	GtkMenuBar parent;
+	GtkAccelGroup *accel_group;
+	GList *actions;
+	GCallback action_cb;
+};
+
+struct _GHidMainMenuClass {
+	GtkMenuBarClass parent_class;
+};
+
+/* TODO: write finalize function */
+
+/* SIGNAL HANDLERS */
+
+/* LHT HANDLER */
+
+void ghid_main_menu_real_add_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, GtkMenuShell *shell, lht_node_t *ins_after, lht_node_t *base);
+
+static void ins_menu(GtkWidget *item, GtkMenuShell *shell, lht_node_t *ins_after)
+{
+	int pos;
+	lht_dom_iterator_t it;
+	lht_node_t *n;
+
+	/* append at the end of the shell */
+	if (ins_after == NULL) {
+		gtk_menu_shell_append(shell, item);
+		return;
+	}
+
+	/* insert after ins_after or append at the end */
+	for(n = lht_dom_first(&it, ins_after->parent), pos = 1; n != NULL; n = lht_dom_next(&it),pos++)
+		if (n == ins_after)
+			break;
+
+	gtk_menu_shell_insert(shell, item, pos);
+}
+
+static GtkAction *ghid_add_menu(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, GtkMenuShell *shell, lht_node_t *ins_after, lht_node_t *sub_res)
+{
+	const char *tmp_val;
+	GtkAction *action = NULL;
+	char *accel = NULL;
+	char *menu_label;
+	lht_node_t *n_action = pcb_hid_cfg_menu_field(sub_res, PCB_MF_ACTION, NULL);
+	lht_node_t *n_keydesc = pcb_hid_cfg_menu_field(sub_res, PCB_MF_ACCELERATOR, NULL);
+
+	/* Resolve accelerator and save it */
+	if (n_keydesc != NULL) {
+		if (n_action != NULL) {
+			pcb_hid_cfg_keys_add_by_desc(&ghid_keymap, n_keydesc, n_action);
+			accel = pcb_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, 1, NULL);
+		}
+		else
+			pcb_hid_cfg_error(sub_res, "No action specified for key accel\n");
+	}
+
+	/* Resolve menu name */
+	tmp_val = sub_res->name;
+
+
+	menu_label = g_strdup(tmp_val);
+
+	if (pcb_hid_cfg_has_submenus(sub_res)) {
+		/* SUBMENU */
+		GtkWidget *submenu = gtk_menu_new();
+		GtkWidget *item = gtk_menu_item_new_with_mnemonic(menu_label);
+		GtkWidget *tearoff = gtk_tearoff_menu_item_new();
+		lht_node_t *n;
+
+		sub_res->user_data = handle_alloc(submenu, item, NULL);
+		ins_menu(item, shell, ins_after);
+
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
+
+		/* add tearoff to menu */
+		gtk_menu_shell_append(GTK_MENU_SHELL(submenu), tearoff);
+
+		/* recurse on the newly-added submenu; pcb_hid_cfg_has_submenus() makes sure
+		   the node format is correct; iterate over the list of submenus and create
+		   them recursively. */
+		n = pcb_hid_cfg_menu_field(sub_res, PCB_MF_SUBMENU, NULL);
+		for (n = n->data.list.first; n != NULL; n = n->next)
+			ghid_main_menu_real_add_node(ctx, menu, GTK_MENU_SHELL(submenu), NULL, n);
+	}
+	else {
+		/* NON-SUBMENU: MENU ITEM */
+		const char *checked = pcb_hid_cfg_menu_field_str(sub_res, PCB_MF_CHECKED);
+		const char *update_on = pcb_hid_cfg_menu_field_str(sub_res, PCB_MF_UPDATE_ON);
+		const char *label = pcb_hid_cfg_menu_field_str(sub_res, PCB_MF_SENSITIVE);
+		const char *tip = pcb_hid_cfg_menu_field_str(sub_res, PCB_MF_TIP);
+		if (checked) {
+			/* TOGGLE ITEM */
+			conf_native_t *nat = NULL;
+			gchar *name = g_strdup_printf("MainMenuAction%d", action_counter++);
+			action = GTK_ACTION(gtk_toggle_action_new(name, menu_label, tip, NULL));
+			/* checked=foo       is a binary flag (checkbox)
+			 * checked=foo=bar   is a flag compared to a value (radio) */
+			gtk_toggle_action_set_draw_as_radio(GTK_TOGGLE_ACTION(action), ! !strchr(checked, '='));
+
+			if (update_on != NULL)
+				nat = conf_get_field(update_on);
+			else
+				nat = conf_get_field(checked);
+
+			if (nat != NULL) {
+				static conf_hid_callbacks_t cbs;
+				static int cbs_inited = 0;
+				if (!cbs_inited) {
+					memset(&cbs, 0, sizeof(conf_hid_callbacks_t));
+					cbs.val_change_post = ctx->confchg_checkbox;
+					cbs_inited = 1;
+				}
+				conf_hid_set_cb(nat, ctx->ghid_menuconf_id, &cbs);
+			}
+			else {
+				if ((update_on == NULL) || (*update_on != '\0'))
+					pcb_message(PCB_MSG_WARNING, "Checkbox menu item %s not updated on any conf change - try to use the update_on field\n", checked);
+			}
+		}
+		else if (label && strcmp(label, "false") == 0) {
+			/* INSENSITIVE ITEM */
+			GtkWidget *item = gtk_menu_item_new_with_label(menu_label);
+			gtk_widget_set_sensitive(item, FALSE);
+			gtk_menu_shell_append(shell, item);
+			sub_res->user_data = handle_alloc(item, item, NULL);
+		}
+		else {
+			/* NORMAL ITEM */
+			GtkWidget *item = pcb_gtk_menu_item_new(menu_label, accel);
+			accel = NULL;
+			ins_menu(item, shell, ins_after);
+			sub_res->user_data = handle_alloc(item, item, NULL);
+			g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(menu->action_cb), (gpointer) n_action);
+			if ((tip != NULL) || (n_keydesc != NULL)) {
+				char *acc = NULL, *s;
+				if (n_keydesc != NULL)
+					acc = pcb_hid_cfg_keys_gen_accel(&ghid_keymap, n_keydesc, -1, "\nhotkey: ");
+				s = pcb_concat((tip == NULL ? "" : tip), "\nhotkey: ", (acc == NULL ? "" : acc), NULL);
+				gtk_widget_set_tooltip_text(item, s);
+				free(s);
+			}
+		}
+
+	}
+
+	/* By now this runs only for toggle items. */
+	if (action) {
+		GtkWidget *item = pcb_gtk_checkmenu_item_new(menu_label, accel);
+
+		g_signal_connect(G_OBJECT(action), "activate", menu->action_cb, (gpointer) n_action);
+		g_object_set_data(G_OBJECT(action), "resource", (gpointer) sub_res);
+		gtk_activatable_set_use_action_appearance(GTK_ACTIVATABLE (item), FALSE);
+		gtk_activatable_set_related_action(GTK_ACTIVATABLE (item), action);
+		ins_menu(item, shell, ins_after);
+		menu->actions = g_list_append(menu->actions, action);
+		sub_res->user_data = handle_alloc(item, item, action);
+	}
+
+	/* unused accel key - generated, but never stored, time to free it */
+	if (accel != NULL)
+		free(accel);
+
+	return action;
+}
+
+/* Translate a resource tree into a menu structure; shell is the base menu
+   shell (a menu bar or popup menu) */
+void ghid_main_menu_real_add_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, GtkMenuShell *shell, lht_node_t *ins_after, lht_node_t *base)
+{
+	switch (base->type) {
+	case LHT_HASH:								/* leaf submenu */
+		{
+			GtkAction *action = NULL;
+			action = ghid_add_menu(ctx, menu, shell, ins_after, base);
+			if (action) {
+				const char *val;
+
+				val = pcb_hid_cfg_menu_field_str(base, PCB_MF_CHECKED);
+				if (val != NULL)
+					g_object_set_data(G_OBJECT(action), "checked-flag", (gpointer *) val);
+
+				val = pcb_hid_cfg_menu_field_str(base, PCB_MF_ACTIVE);
+				if (val != NULL)
+					g_object_set_data(G_OBJECT(action), "active-flag", (gpointer *) val);
+			}
+		}
+		break;
+	case LHT_TEXT:								/* separator */
+		{
+			GList *children;
+
+			children = gtk_container_get_children(GTK_CONTAINER(shell));
+			g_list_free(children);
+
+			if ((strcmp(base->data.text.value, "sep") == 0) || (strcmp(base->data.text.value, "-") == 0)) {
+				GtkWidget *item = gtk_separator_menu_item_new();
+				ins_menu(item, shell, ins_after);
+				base->user_data = handle_alloc(item, item, NULL);
+			}
+			else if (base->data.text.value[0] == '@') {
+				/* anchor; ignore */
+			}
+			else
+				pcb_hid_cfg_error(base, "Unexpected text node; the only text accepted here is sep, -, or @");
+		}
+		break;
+	default:
+		pcb_hid_cfg_error(base, "Unexpected node type; should be hash (submenu) or text (separator or @special)");
+	}
+}
+
+/* CONSTRUCTOR */
+static void ghid_main_menu_init(GHidMainMenu * mm)
+{
+	/* Hookup signal handlers */
+}
+
+static void ghid_main_menu_class_init(GHidMainMenuClass * klass)
+{
+}
+
+/* PUBLIC FUNCTIONS */
+GType ghid_main_menu_get_type(void)
+{
+	static GType mm_type = 0;
+
+	if (!mm_type) {
+		const GTypeInfo mm_info = {
+			sizeof(GHidMainMenuClass),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) ghid_main_menu_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(GHidMainMenu),
+			0,												/* n_preallocs */
+			(GInstanceInitFunc) ghid_main_menu_init,
+		};
+
+		mm_type = g_type_register_static(GTK_TYPE_MENU_BAR, "GHidMainMenu", &mm_info, 0);
+	}
+
+	return mm_type;
+}
+
+GtkWidget *ghid_main_menu_new(GCallback action_cb)
+{
+	GHidMainMenu *mm = g_object_new(GHID_MAIN_MENU_TYPE, NULL);
+
+	mm->accel_group = gtk_accel_group_new();
+
+	mm->action_cb = action_cb;
+	mm->actions = NULL;
+
+	return GTK_WIDGET(mm);
+}
+
+void ghid_main_menu_add_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, const lht_node_t *base)
+{
+	lht_node_t *n;
+	if (base->type != LHT_LIST) {
+		pcb_hid_cfg_error(base, "Menu description shall be a list (li)\n");
+		abort();
+	}
+	for (n = base->data.list.first; n != NULL; n = n->next) {
+		ghid_main_menu_real_add_node(ctx, menu, GTK_MENU_SHELL(menu), NULL, n);
+	}
+}
+
+void ghid_main_menu_add_popup_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, lht_node_t *base)
+{
+	lht_node_t *submenu, *i;
+	GtkWidget *new_menu;
+
+	submenu = pcb_hid_cfg_menu_field_path(base, "submenu");
+	if (submenu == NULL) {
+		pcb_hid_cfg_error(base, "can not create popup without submenu list");
+		return;
+	}
+
+	new_menu = gtk_menu_new();
+	g_object_ref_sink(new_menu);
+	base->user_data = handle_alloc(new_menu, new_menu, NULL);
+
+	for (i = submenu->data.list.first; i != NULL; i = i->next)
+		ghid_main_menu_real_add_node(ctx, menu, GTK_MENU_SHELL(new_menu), NULL, i);
+
+	gtk_widget_show_all(new_menu);
+}
+
+/* Updates the toggle/active state of all items:
+ * Loops through all actions, passing the action, its toggle
+ * flag (maybe NULL), and its active flag (maybe NULL), to a
+ * callback function. It is the responsibility of the function
+ * to actually change the state of the action. */
+void ghid_main_menu_update_toggle_state(GHidMainMenu *menu, void (*cb)(GtkAction *, const char *toggle_flag, const char *active_flag))
+{
+	GList *list;
+	for (list = menu->actions; list; list = list->next) {
+		lht_node_t *res = g_object_get_data(G_OBJECT(list->data), "resource");
+		lht_node_t *act = pcb_hid_cfg_menu_field(res, PCB_MF_ACTION, NULL);
+		const char *tf = g_object_get_data(G_OBJECT(list->data), "checked-flag");
+		const char *af = g_object_get_data(G_OBJECT(list->data), "active-flag");
+		g_signal_handlers_block_by_func(G_OBJECT(list->data), menu->action_cb, act);
+		cb(GTK_ACTION(list->data), tf, af);
+		g_signal_handlers_unblock_by_func(G_OBJECT(list->data), menu->action_cb, act);
+	}
+}
+
+GtkAccelGroup *ghid_main_menu_get_accel_group(GHidMainMenu * menu)
+{
+	if (menu == NULL) {
+		pcb_message(PCB_MSG_ERROR, "ghid: can't initialize the menu - is your menu .lht valid?\n");
+		exit(1);
+	}
+	return menu->accel_group;
+}
+
+/* Create a new popup window */
+static GtkWidget *new_popup(lht_node_t * menu_item)
+{
+	GtkWidget *new_menu = gtk_menu_new();
+/*	GHidMainMenu *menu  = GHID_MAIN_MENU(ctx->menu_bar);*/
+
+	g_object_ref_sink(new_menu);
+	menu_item->user_data = handle_alloc(new_menu, new_menu, NULL);
+
+	return new_menu;
+}
+
+/* Menu widget create callback: create a main menu, popup or submenu as descending the path */
+int ghid_create_menu_widget(void *ctx_, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item)
+{
+	pcb_gtk_menu_ctx_t *ctx = ctx_;
+	int is_popup = (strncmp(path, "/popups", 7) == 0);
+	menu_handle_t *ph = parent->user_data;
+	GtkWidget *w = (is_main) ? (is_popup ? new_popup(menu_item) : ctx->menu_bar) : ph->widget;
+
+	ghid_main_menu_real_add_node(ctx, GHID_MAIN_MENU(ctx->menu_bar), GTK_MENU_SHELL(w), ins_after, menu_item);
+
+/* make sure new menu items appear on screen */
+	gtk_widget_show_all(w);
+	return 0;
+}
+
+int ghid_remove_menu_widget(void *ctx, lht_node_t * nd)
+{
+	menu_handle_t *h = nd->user_data;
+	if (h != NULL) {
+		GHidMainMenu *menu = (GHidMainMenu *)ctx;
+		menu->actions = g_list_remove(menu->actions, h->action);
+		gtk_widget_destroy(h->destroy);
+		free(h);
+		nd->user_data = NULL;
+	}
+	return 0;
+}
+
+/* callback for ghid_main_menu_update_toggle_state() */
+void menu_toggle_update_cb(GtkAction * act, const char *tflag, const char *aflag)
+{
+	if (tflag != NULL) {
+		int v = pcb_hid_get_flag(tflag);
+		if (v < 0) {
+			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), 0);
+			gtk_action_set_sensitive(act, 0);
+		}
+		else
+			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act), ! !v);
+	}
+	if (aflag != NULL) {
+		int v = pcb_hid_get_flag(aflag);
+		gtk_action_set_sensitive(act, ! !v);
+	}
+}
+
+/* Menu action callback function
+ * This is the main menu callback function.  The callback receives
+ * the original lihata action node pointer HID actions to be
+ * executed. */
+static void ghid_menu_cb(GtkAction * action, const lht_node_t * node)
+{
+	if (action == NULL || node == NULL)
+		return;
+
+	pcb_hid_cfg_action(node);
+
+	pcb_event(PCB_EVENT_GUI_SYNC, NULL);
+}
+
+
+GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, pcb_hid_cfg_t **cfg_out)
+{
+	const lht_node_t *mr;
+	GtkWidget *menu_bar = NULL;
+	extern const char *pcb_menu_default;
+
+	*cfg_out = pcb_hid_cfg_load("gtk", 0, pcb_menu_default);
+	if (*cfg_out == NULL) {
+		pcb_message(PCB_MSG_ERROR, "FATAL: can't load the gtk menu res either from file or from hardwired default.");
+		abort();
+	}
+
+	mr = pcb_hid_cfg_get_menu(*cfg_out, "/main_menu");
+	if (mr != NULL) {
+		menu_bar = ghid_main_menu_new(G_CALLBACK(ghid_menu_cb));
+		ghid_main_menu_add_node(menu, GHID_MAIN_MENU(menu_bar), mr);
+	}
+
+	mr = pcb_hid_cfg_get_menu(*cfg_out, "/popups");
+	if (mr != NULL) {
+		if (mr->type == LHT_LIST) {
+			lht_node_t *n;
+			for (n = mr->data.list.first; n != NULL; n = n->next)
+				ghid_main_menu_add_popup_node(menu, GHID_MAIN_MENU(menu_bar), n);
+		}
+		else
+			pcb_hid_cfg_error(mr, "/popups should be a list");
+	}
+
+	mr = pcb_hid_cfg_get_menu(*cfg_out, "/mouse");
+	if (hid_cfg_mouse_init(*cfg_out, &ghid_mouse) != 0)
+		pcb_message(PCB_MSG_ERROR, "Error: failed to load mouse actions from the hid config lihata - mouse input will not work.");
+
+	return menu_bar;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_menu.h	(revision 18980)
@@ -0,0 +1,45 @@
+#ifndef GHID_MAIN_MENU_H__
+#define GHID_MAIN_MENU_H__
+
+#include <gtk/gtk.h>
+
+#include "wt_route_style.h"
+
+#include "conf.h"
+#include "hid_cfg.h"
+#include "hid_cfg_input.h"
+#include "conf_hid.h"
+
+#define GHID_MAIN_MENU_TYPE            (ghid_main_menu_get_type ())
+#define GHID_MAIN_MENU(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_MAIN_MENU_TYPE, GHidMainMenu))
+#define GHID_MAIN_MENU_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GHID_MAIN_MENU_TYPE, GHidMainMenuClass))
+#define IS_GHID_MAIN_MENU(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHID_MAIN_MENU_TYPE))
+#define IS_GHID_MAIN_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GHID_MAIN_MENU_TYPE))
+typedef struct _GHidMainMenu GHidMainMenu;
+typedef struct _GHidMainMenuClass GHidMainMenuClass;
+
+typedef struct pcb_gtk_menu_ctx_s {
+	GtkWidget *menu_bar;
+	conf_hid_id_t ghid_menuconf_id;
+	void (*confchg_checkbox)(conf_native_t *cfg, int arr_idx);
+} pcb_gtk_menu_ctx_t;
+
+GType ghid_main_menu_get_type(void);
+GtkWidget *ghid_main_menu_new(GCallback action_cb);
+void ghid_main_menu_add_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu * menu, const lht_node_t * base);
+GtkAccelGroup *ghid_main_menu_get_accel_group(GHidMainMenu * menu);
+void ghid_main_menu_update_toggle_state(GHidMainMenu * menu,
+																				void (*cb) (GtkAction *, const char *toggle_flag, const char *active_flag));
+
+void ghid_main_menu_add_popup_node(pcb_gtk_menu_ctx_t *ctx, GHidMainMenu *menu, lht_node_t *base);
+
+int ghid_remove_menu_widget(void *ctx, lht_node_t *nd);
+int ghid_create_menu_widget(void *ctx_, const char *path, const char *name, int is_main, lht_node_t *parent, lht_node_t *ins_after, lht_node_t *menu_item);
+
+void menu_toggle_update_cb(GtkAction * act, const char *tflag, const char *aflag);
+
+GtkWidget *ghid_load_menus(pcb_gtk_menu_ctx_t *menu, pcb_hid_cfg_t **cfg_out);
+
+GtkWidget *pcb_gtk_menu_widget(lht_node_t *node);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.c	(revision 18980)
@@ -0,0 +1,226 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "bu_mode_btn.h"
+#include "bu_mode_btn.data"
+
+#include "crosshair.h"
+#include "conf_core.h"
+#include "tool.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "compat.h"
+
+typedef struct {
+	GtkWidget *button;
+	GtkWidget *toolbar_button;
+	guint button_cb_id;
+	guint toolbar_button_cb_id;
+	const gchar *name;
+	gint mode;
+	const gchar **xpm;
+	const char *tooltip;
+	pcb_gtk_mode_btn_t *mbb;
+} ModeButton;
+
+
+static ModeButton mode_buttons[] = {
+	{NULL, NULL, 0, 0, "via", PCB_MODE_VIA, via, "place a via on the board"},
+	{NULL, NULL, 0, 0, "line", PCB_MODE_LINE, line, "draw a line segment (trace) on the board"},
+	{NULL, NULL, 0, 0, "arc", PCB_MODE_ARC, arc, "draw an arc segment (trace) on the board"},
+	{NULL, NULL, 0, 0, "text", PCB_MODE_TEXT, text, "draw text on the board"},
+	{NULL, NULL, 0, 0, "rectangle", PCB_MODE_RECTANGLE, rect, "draw a rectangular polygon on the board"},
+	{NULL, NULL, 0, 0, "polygon", PCB_MODE_POLYGON, poly, "draw a polygon on the board"},
+	{NULL, NULL, 0, 0, "polygonhole", PCB_MODE_POLYGON_HOLE, polyhole, "cut out a hole from existing polygons on the board"},
+	{NULL, NULL, 0, 0, "buffer", PCB_MODE_PASTE_BUFFER, buf, "paste the current buffer on the board"},
+	{NULL, NULL, 0, 0, "remove", PCB_MODE_REMOVE, del, "remove an object from the board"},
+	{NULL, NULL, 0, 0, "rotate", PCB_MODE_ROTATE, rot, "rotate an object on the board"},
+	{NULL, NULL, 0, 0, "insertPoint", PCB_MODE_INSERT_POINT, ins, "insert a point in a trace or polygon contour"},
+	{NULL, NULL, 0, 0, "thermal", PCB_MODE_THERMAL, thrm, "change thermal connectivity of a pin or via"},
+	{NULL, NULL, 0, 0, "arrow", PCB_MODE_ARROW, arr, "switch to arrow mode"},
+	{NULL, NULL, 0, 0, "lock", PCB_MODE_LOCK, lock, "lock or unlock objects on the board"}
+};
+
+static gint n_mode_buttons = G_N_ELEMENTS(mode_buttons);
+
+static void do_set_mode(pcb_gtk_mode_btn_t *mbb, int mode)
+{
+	pcb_tool_select_by_id(mode);
+	mbb->com->mode_cursor_main(mode);
+	mbb->settings_mode = mode;
+}
+
+static void mode_toolbar_button_toggled_cb(GtkToggleButton * button, ModeButton * mb)
+{
+	gboolean active = gtk_toggle_button_get_active(button);
+
+	if (mb->button != NULL) {
+		g_signal_handler_block(mb->button, mb->button_cb_id);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->button), active);
+		g_signal_handler_unblock(mb->button, mb->button_cb_id);
+	}
+
+	if (active)
+		do_set_mode(mb->mbb, mb->mode);
+}
+
+static void mode_button_toggled_cb(GtkWidget * widget, ModeButton * mb)
+{
+	gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
+	if (mb->toolbar_button != NULL) {
+		g_signal_handler_block(mb->toolbar_button, mb->toolbar_button_cb_id);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->toolbar_button), active);
+		g_signal_handler_unblock(mb->toolbar_button, mb->toolbar_button_cb_id);
+	}
+
+	if (active)
+		do_set_mode(mb->mbb, mb->mode);
+}
+
+void ghid_mode_buttons_update(void)
+{
+	ModeButton *mb;
+	gint i;
+
+	for (i = 0; i < n_mode_buttons; ++i) {
+		mb = &mode_buttons[i];
+		if (conf_core.editor.mode == mb->mode) {
+			g_signal_handler_block(mb->button, mb->button_cb_id);
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->button), TRUE);
+			g_signal_handler_unblock(mb->button, mb->button_cb_id);
+
+			g_signal_handler_block(mb->toolbar_button, mb->toolbar_button_cb_id);
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mb->toolbar_button), TRUE);
+			g_signal_handler_unblock(mb->toolbar_button, mb->toolbar_button_cb_id);
+			break;
+		}
+	}
+}
+
+void pcb_gtk_pack_mode_buttons(pcb_gtk_mode_btn_t *mb)
+{
+	if (conf_hid_gtk.plugins.hid_gtk.compact_vertical) {
+		gtk_widget_hide(mb->mode_buttons_frame);
+		gtk_widget_show_all(mb->mode_toolbar);
+	}
+	else {
+		gtk_widget_hide(mb->mode_toolbar);
+		gtk_widget_show_all(mb->mode_buttons_frame);
+	}
+}
+
+void pcb_gtk_make_mode_buttons_and_toolbar(pcb_gtk_common_t *com, pcb_gtk_mode_btn_t *mb)
+{
+	GtkToolItem *tool_item;
+	GtkWidget *vbox, *hbox = NULL;
+	GtkWidget *pad_hbox, *pad_vbox;
+	GtkWidget *image;
+	GtkRequisition requisition;
+	GdkPixbuf *pixbuf;
+	GSList *group = NULL;
+	GSList *toolbar_group = NULL;
+	ModeButton *MB;
+	int n_mb, i, tb_width = 0;
+
+	mb->com = com;
+	mb->mode_toolbar = gtk_toolbar_new();
+
+	mb->mode_buttons_frame = gtk_frame_new(NULL);
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(mb->mode_buttons_frame), vbox);
+
+	for (i = 0; i < n_mode_buttons; ++i) {
+		MB = &mode_buttons[i];
+		MB->mbb = mb;
+
+		/* Create tool button for mode frame */
+		MB->button = gtk_radio_button_new(group);
+		group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(MB->button));
+		gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(MB->button), FALSE);
+
+		/* Create tool button for toolbar */
+		MB->toolbar_button = gtk_radio_button_new(toolbar_group);
+		toolbar_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(MB->toolbar_button));
+		gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(MB->toolbar_button), FALSE);
+		gtk_widget_set_tooltip_text(MB->toolbar_button, MB->tooltip);
+
+		/* Pack mode-frame button into the frame */
+		n_mb = conf_hid_gtk.plugins.hid_gtk.n_mode_button_columns;
+		if ((n_mb < 1) || (n_mb > 10))
+			n_mb = 3;
+		if ((i % n_mb) == 0) {
+			hbox = gtkc_hbox_new(FALSE, 0);
+			gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+		}
+		gtk_box_pack_start(GTK_BOX(hbox), MB->button, FALSE, FALSE, 0);
+
+		/* Create a container for the toolbar button and add that */
+		tool_item = gtk_tool_item_new();
+		gtk_container_add(GTK_CONTAINER(tool_item), MB->toolbar_button);
+		gtk_toolbar_insert(GTK_TOOLBAR(mb->mode_toolbar), tool_item, -1);
+
+		/* Load the image for the button, create GtkImage widgets for both
+		 * the grid button and the toolbar button, then pack into the buttons
+		 */
+		pixbuf = gdk_pixbuf_new_from_xpm_data((const char **) MB->xpm);
+		image = gtk_image_new_from_pixbuf(pixbuf);
+		gtk_container_add(GTK_CONTAINER(MB->button), image);
+		image = gtk_image_new_from_pixbuf(pixbuf);
+		gtk_container_add(GTK_CONTAINER(MB->toolbar_button), image);
+		g_object_unref(pixbuf);
+		gtk_widget_get_requisition(image, &requisition);
+		tb_width += requisition.width;
+
+		if (strcmp(MB->name, "arrow") == 0) {
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MB->button), TRUE);
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(MB->toolbar_button), TRUE);
+		}
+
+		MB->button_cb_id = g_signal_connect(MB->button, "toggled", G_CALLBACK(mode_button_toggled_cb), MB);
+		MB->toolbar_button_cb_id = g_signal_connect(MB->toolbar_button, "toggled", G_CALLBACK(mode_toolbar_button_toggled_cb), MB);
+	}
+
+	mb->mode_toolbar_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(mb->mode_toolbar_vbox), mb->mode_toolbar, FALSE, FALSE, 0);
+
+	/* Pack an empty, wide hbox right below the toolbar and make it as wide
+	   as the calculated width of the toolbar with some tuning. Toolbar icons
+	   disappear if the container hbox is not wide enough. Without this hack
+	   the width would be determined by the menu bar, and that could be short
+	   if the user changes the menu layout. */
+	pad_hbox = gtkc_hbox_new(FALSE, 0);
+	pad_vbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(pad_hbox), pad_vbox, FALSE, FALSE, tb_width * 3 / 4);
+	gtk_box_pack_start(GTK_BOX(mb->mode_toolbar_vbox), pad_hbox, FALSE, FALSE, 0);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.data
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.data	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.data	(revision 18980)
@@ -0,0 +1,510 @@
+/* $Id$ */
+
+/*
+ *                            COPYRIGHT
+ *
+ *  PCB, interactive printed circuit board design
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/* XPM */
+static const char *arc[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #4E85b7",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooo.ooooooooooooooo",
+"ooooo.ooooooooooooooo",
+"ooooo.ooooooooooooooo",
+"ooooo.ooooooooooooooo",
+"oooooo.oooooooooooooo",
+"oooooo.oooooooooooooo",
+"ooooooo.ooooooooooooo",
+"ooooooo..oooooooooooo",
+"oooooooo..ooooooooooo",
+"oooooooooo..ooooooooo",
+"oooooooooooo....ooooo",
+"ooooooooooooooooooooo",
+"ooo oooo    oooo   oo",
+"oo o ooo ooo oo ooo o",
+"oo o ooo ooo oo ooo o",
+"o ooo oo    ooo ooooo",
+"o     oo  ooooo ooooo",
+"o ooo oo o oooo ooooo",
+"o ooo oo oo ooo ooo o",
+"o ooo oo ooo ooo   oo",
+"ooooooooooooooooooooo"
+};
+
+
+/* XPM */
+static const char *buf[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #D0C7AD",
+"X c gray100",
+"o c None",
+/* pixels */
+"oooooooo  oo  ooooooo",
+"oooooo.. o  o ..ooooo",
+"oooooooo oooo ooooooo",
+"oooooo.. oooo ..ooooo",
+"oooooooo oooo ooooooo",
+"oooooo.. oooo ..ooooo",
+"oooooooo oooo ooooooo",
+"oooooo.. oooo ..ooooo",
+"oooooooo oooo ooooooo",
+"oooooo.. oooo ..ooooo",
+"oooooooo      ooooooo",
+"ooooooooooooooooooooo",
+"oo     oo ooo o     o",
+"ooo ooo o ooo o ooooo",
+"ooo ooo o ooo o ooooo",
+"ooo ooo o ooo o    oo",
+"ooo    oo ooo o ooooo",
+"ooo ooo o ooo o ooooo",
+"ooo ooo o ooo o ooooo",
+"oo     ooo   oo ooooo",
+"ooooooooooooooooooooo"
+};
+
+
+/* XPM */
+static const char *del[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 3 1",
+"  c black",
+". c gray100",
+"X c None",
+/* pixels */
+"XXX XXXXXXXXXXXX XXXX",
+"XXXX XXX    XXX XXXXX",
+"XXXXX X      X XXXXXX",
+"XXXXXX XX  XX XXXXXXX",
+"XXXXX  XX  XX  XXXXXX",
+"XXXXX          XXXXXX",
+"XXXXXX        XXXXXXX",
+"XXXXXXX  XX  XXXXXXXX",
+"XXXXXXX  XX XXXXXXXXX",
+"XXXXXX X XX  XXXXXXXX",
+"XXXX  XX    X  XXXXXX",
+"XX  XXXXX  XXXX  XXXX",
+"XXXXXXXXXXXXXXXXXXXXX",
+"XX     XX     X XXXXX",
+"XXX XXX X XXXXX XXXXX",
+"XXX XXX X XXXXX XXXXX",
+"XXX XXX X XXXXX XXXXX",
+"XXX XXX X    XX XXXXX",
+"XXX XXX X XXXXX XXXXX",
+"XXX XXX X XXXXX XXXXX",
+"XX     XX     X     X"
+};
+
+
+/* XPM */
+static const char *ins[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #7A8584",
+"X c gray100",
+"o c None",
+/* pixels */
+"oooooo...oooooooooooo",
+"ooooo.ooo.ooooooooooo",
+"ooooo.o.o.ooooooooooo",
+"oooooo....ooooooooooo",
+"ooooooooooooooooooooo",
+"oooo  ooooo  oooooooo",
+"ooooooooooooooooooooo",
+"oo...ooooooooooo...oo",
+"o.oo..ooooooooo.ooo.o",
+"o.o o...........o o.o",
+"o.ooo.ooooooooo.ooo.o",
+"oo...ooooooooooo...oo",
+"ooooooooooooooooooooo",
+"ooo   o ooo oo    ooo",
+"oooo oo ooo o ooooooo",
+"oooo oo  oo o ooooooo",
+"oooo oo o o oo   oooo",
+"oooo oo oo  ooooo ooo",
+"oooo oo ooo ooooo ooo",
+"oooo oo ooo ooooo ooo",
+"ooo   o ooo o    oooo"
+};
+
+
+/* XPM */
+static const char *line[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 5 1",
+"  c black",
+". c #7A8584",
+"X c #4E85b7",
+"o c gray100",
+"O c None",
+/* pixels */
+"OOOOOOOOOOOOOOOOOOOOO",
+"OO...OOOOOOOOOOOOOOOO",
+"O.OOO.OOOOOOOOOOOOOOO",
+"O.OXXXOOOOOOOOOOOOOOO",
+"O.OOO.XXXOOOOOOOOOOOO",
+"OO...OOOOXXXOOOO...OO",
+"OOOOOOOOOOOOXXX.OOO.O",
+"OOOOOOOOOOOOOOOXXXO.O",
+"OOOOOOOOOOOOOOO.OOO.O",
+"OOOOOOOOOOOOOOOO...OO",
+"OOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOO",
+" OOOO   O OOOO O    O",
+" OOOOO OO  OOO O OOOO",
+" OOOOO OO O OO O OOOO",
+" OOOOO OO O OO O OOOO",
+" OOOOO OO OO O O   OO",
+" OOOOO OO OO O O OOOO",
+" OOOOO OO OOO  O OOOO",
+"    O   O OOOO O    O",
+"OOOOOOOOOOOOOOOOOOOOO"
+};
+
+
+/* XPM */
+static const char *lock[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 3 1",
+"  c black",
+". c gray100",
+"X c None",
+/* pixels */
+"XXXXXXXX     XXXXXXXX",
+"XXXXXXX  XXX  XXXXXXX",
+"XXXXXXX XXXXX XXXXXXX",
+"XXXXXX  XXXXX  XXXXXX",
+"XXXXXX XXXXXXX XXXXXX",
+"XXXXXX XXXXXXX XXXXXX",
+"XXXX             XXXX",
+"XXXX XXXXXXXXXXX XXXX",
+"XXXX             XXXX",
+"XXXX XXXXXXXXXXX XXXX",
+"XXXX             XXXX",
+"XXXX XXXXXXXXXXX XXXX",
+"XXXX             XXXX",
+"XXXXXXXXXXXXXXXXXXXXX",
+"XX XXXX  XXX  X XX XX",
+"XX XXX XX X XXX XX XX",
+"XX XXX XX X XXX X XXX",
+"XX XXX XX X XXX  XXXX",
+"XX XXX XX X XXX X XXX",
+"XX XXX XX X XXX XX XX",
+"XX   XX  XXX  X XX XX"
+};
+
+#if 0
+/* XPM */
+static const char *pan[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 3 1",
+"  c black",
+". c #E7E3E7",
+"X c None",
+/* pixels */
+"XXXXXXXXXX XXXXXXXXXX",
+"XXXXXX XX X XX XXXXXX",
+"XXXXX X X X X X XX XX",
+"XXXXX X X X X X X X X",
+"XXXXX X X X X X X X X",
+"X  XX X  XX X X  X  X",
+"X X X XX XXX XX XX XX",
+"X XX  XXXXXXXXX X XXX",
+"XX XX XXXXXXXXXXX XXX",
+"XXX XXXXXXXXXXXX XXXX",
+"XXXX XXXXXXXXXXX XXXX",
+"XXXXX XXXXXXXXXX XXXX",
+"XXXXXX          XXXXX",
+"XXXXXXXXXXXXXXXXXXXXX",
+"XXXX   XXX  XX XXX XX",
+"XXXX XX X XX X  XX XX",
+"XXXX XX X XX X   X XX",
+"XXXX   XX    X X X XX",
+"XXXX XXXX XX X X   XX",
+"XXXX XXXX XX X XX  XX",
+"XXXX XXXX XX X XXX XX"
+};
+
+#endif
+/* XPM */
+static const char *poly[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #6EA5D7",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooo.ooooooooo",
+"oooooooooo..ooooooooo",
+"ooooooooo...ooooooooo",
+"oooooooo....ooooooooo",
+"ooooooo.....ooooooooo",
+"oooooo.......oooooooo",
+"ooooo.........ooooooo",
+"oooo...........oooooo",
+"oooo............ooooo",
+"oooo.............oooo",
+"oooo..............ooo",
+"ooooooooooooooooooooo",
+"o    ooo   oo oo ooo ",
+"o ooo o ooo o oo ooo ",
+"o ooo o ooo o ooo o o",
+"o    oo ooo o oooo oo",
+"o ooooo ooo o oooo oo",
+"o ooooo ooo o oooo oo",
+"o ooooo ooo o oooo oo",
+"o oooooo   oo    o oo",
+"ooooooooooooooooooooo"
+};
+
+/* XPM */
+static const char * polyhole[] = {
+"21 21 3 1",
+" 	c None",
+".	c #6EA5D7",
+"+	c #000000",
+"        ..           ",
+"       ...           ",
+"      .....          ",
+"     .......         ",
+"    .........        ",
+"  ....+++++...       ",
+"  ....+   +....      ",
+"  ...+    +.....     ",
+"  ...++++++......    ",
+"  ................   ",
+"  .................  ",
+"                     ",
+"  +  +  ++  +   +++  ",
+"  +  + +  + +   +    ",
+"  +  + +  + +   +    ",
+"  ++++ +  + +   +++  ",
+"  +  + +  + +   +    ",
+"  +  + +  + +   +    ",
+"  +  + +  + +   +    ",
+"  +  +  ++  +++ +++  ",
+"                     "
+};
+
+/* XPM */
+static const char *rect[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #6EA5D7",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooooooooooooo",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"oo..................o",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"o   oo    oo  oo     ",
+"o oo o oooo oo ooo oo",
+"o oo o oooo oooooo oo",
+"o   oo oooo oooooo oo",
+"o o oo   oo oooooo oo",
+"o oo o oooo oooooo oo",
+"o oo o oooo oo ooo oo",
+"o oo o    oo  oooo oo",
+"ooooooooooooooooooooo"
+};
+
+
+/* XPM */
+static const char *rot[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #4E85b7",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooo.ooooooooo",
+"oooooooooo..ooooooooo",
+"ooooooooo....oooooooo",
+"oooooooooo..o.ooooooo",
+"ooooooooooo.oo.oooooo",
+"oooooooooooooo.oooooo",
+"oooooooooooooo.oooooo",
+"oooooooooooooo.oooooo",
+"oooooooooooooo.oooooo",
+"ooooooooooooo.ooooooo",
+"oooooooooooo.oooooooo",
+"oooooooooo..ooooooooo",
+"ooooooooooooooooooooo",
+"ooo    ooo   oo     o",
+"ooo ooo o ooo ooo ooo",
+"ooo ooo o ooo ooo ooo",
+"ooo    oo ooo ooo ooo",
+"ooo   ooo ooo ooo ooo",
+"ooo o  oo ooo ooo ooo",
+"ooo oo  o ooo ooo ooo",
+"ooo ooo oo   oooo ooo"
+};
+
+
+/* XPM */
+static const char *arr[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #6EA5D7",
+"X c gray100",
+"o c None",
+/* pixels */
+"oo .. ooooooooooooooo",
+"oo .... ooooooooooooo",
+"ooo ...... oooooooooo",
+"ooo ........ oooooooo",
+"ooo ....... ooooooooo",
+"oooo ..... oooooooooo",
+"oooo ...... ooooooooo",
+"ooooo .. ... oooooooo",
+"ooooo . o ... ooooooo",
+"oooooooooo ... oooooo",
+"ooooooooooo .. oooooo",
+"oooooooooooo  ooooooo",
+"ooooooooooooooooooooo",
+"ooo ooo    ooo    ooo",
+"oo o oo ooo oo ooo oo",
+"oo o oo ooo oo ooo oo",
+"o ooo o    ooo    ooo",
+"o ooo o ooo oo ooo oo",
+"o     o ooo oo ooo oo",
+"o ooo o ooo oo ooo oo",
+"o ooo o ooo oo ooo oo"
+};
+
+
+/* XPM */
+static const char *text[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #4E85b7",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"oo.ooo.ooo.ooo.ooo.oo",
+"o.o.o.o.o.o.o.o.o.o.o",
+"oo.ooo.ooo.ooo.ooo.oo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"     o   o ooo o     ",
+"oo ooo ooo ooo ooo oo",
+"oo ooo oooo o oooo oo",
+"oo ooo ooooo ooooo oo",
+"oo ooo  ooo o oooo oo",
+"oo ooo ooo ooo ooo oo",
+"oo ooo ooo ooo ooo oo",
+"oo ooo   o ooo ooo oo",
+"ooooooooooooooooooooo"
+};
+
+
+/* XPM */
+static const char *thrm[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #69E1B0",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooooooooooooo",
+"oooo ooooooooo oooooo",
+"ooooo ooooooo ooooooo",
+"oooooo o...o oooooooo",
+"ooooooo ooo ooooooooo",
+"oooooo.ooooo.oooooooo",
+"oooooo.ooooo.oooooooo",
+"oooooo.ooooo.oooooooo",
+"ooooooo ooo ooooooooo",
+"oooooo o...o oooooooo",
+"ooooo ooooooo ooooooo",
+"oooo ooooooooo oooooo",
+"ooooooooooooooooooooo",
+"     o oo o   oo ooo ",
+"oo ooo oo o oo o  o  ",
+"oo ooo oo o oo o o o ",
+"oo ooo oo o   oo o o ",
+"oo ooo    o o oo ooo ",
+"oo ooo oo o oo o ooo ",
+"oo ooo oo o oo o ooo ",
+"oo ooo oo o oo o ooo "
+};
+
+
+/* XPM */
+static const char *via[] = {
+/* columns rows colors chars-per-pixel */
+"21 21 4 1",
+"  c black",
+". c #7A8584",
+"X c gray100",
+"o c None",
+/* pixels */
+"ooooooooooooooooooooo",
+"ooooooooo...ooooooooo",
+"oooooooo.....oooooooo",
+"ooooooo..ooo..ooooooo",
+"oooooo..ooooo..oooooo",
+"oooooo..ooooo..oooooo",
+"oooooo..ooooo..oooooo",
+"ooooooo..ooo..ooooooo",
+"oooooooo.....oooooooo",
+"ooooooooo...ooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooooooooooooooooooooo",
+"ooo ooo o   ooo ooooo",
+"ooo ooo oo ooo o oooo",
+"ooo ooo oo oo ooo ooo",
+"oooo o ooo oo ooo ooo",
+"oooo o ooo oo     ooo",
+"oooo o ooo oo ooo ooo",
+"ooooo ooo   o ooo ooo",
+"ooooooooooooooooooooo"
+};
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_mode_btn.h	(revision 18980)
@@ -0,0 +1,21 @@
+#ifndef PCB_GTK_BU_MODE_BTN_H
+#define PCB_GTK_BU_MODE_BTN_H
+
+#include <gtk/gtk.h>
+#include "glue.h"
+
+typedef struct {
+	int settings_mode;
+	GtkWidget *mode_buttons_frame;
+	GtkWidget *mode_toolbar;
+	GtkWidget *mode_toolbar_vbox;
+
+	pcb_gtk_common_t *com;
+} pcb_gtk_mode_btn_t;
+
+void pcb_gtk_make_mode_buttons_and_toolbar(pcb_gtk_common_t *com, pcb_gtk_mode_btn_t *mb);
+void ghid_mode_buttons_update(void);
+void pcb_gtk_pack_mode_buttons(pcb_gtk_mode_btn_t *mb);
+
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.c	(revision 18980)
@@ -0,0 +1,60 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+
+#include "bu_notebook.h"
+#include "bu_box.h"
+
+#include "compat.h"
+
+GtkWidget *ghid_notebook_page(GtkWidget * tabs, const char *name, gint pad, gint border)
+{
+	GtkWidget *label;
+	GtkWidget *vbox;
+
+	vbox = gtkc_vbox_new(FALSE, pad);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), border);
+
+	label = gtk_label_new(name);
+	gtk_notebook_append_page(GTK_NOTEBOOK(tabs), vbox, label);
+
+	return vbox;
+}
+
+GtkWidget *ghid_framed_notebook_page(GtkWidget * tabs, const char *name, gint border,
+																		 gint frame_border, gint vbox_pad, gint vbox_border)
+{
+	GtkWidget *vbox;
+
+	vbox = ghid_notebook_page(tabs, name, 0, border);
+	vbox = ghid_framed_vbox(vbox, NULL, frame_border, TRUE, vbox_pad, vbox_border);
+	return vbox;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_notebook.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include <gtk/gtk.h>
+
+GtkWidget *ghid_notebook_page(GtkWidget * tabs, const char *name, gint pad, gint border);
+
+GtkWidget *ghid_framed_notebook_page(GtkWidget * tabs, const char *name, gint border,
+																		 gint frame_border, gint vbox_pad, gint vbox_border);
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.c	(revision 18980)
@@ -0,0 +1,126 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Originally from gui-utils.c, was written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  Those functions were utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ */
+
+#include "config.h"
+
+#include "bu_spin_button.h"
+#include "compat.h"
+
+void
+ghid_spin_button(GtkWidget * box, GtkWidget ** spin_button, gfloat value,
+								 gfloat low, gfloat high, gfloat step0, gfloat step1,
+								 gint digits, gint width,
+								 void (*cb_func) (GtkSpinButton *, gpointer), gpointer data, gboolean right_align, const gchar * string)
+{
+	GtkWidget *hbox = NULL, *label, *spin_but;
+	GtkSpinButton *spin;
+	GtkAdjustment *adj;
+
+	if (string && box) {
+		hbox = gtkc_hbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 2);
+		box = hbox;
+	}
+	adj = (GtkAdjustment *) gtk_adjustment_new(value, low, high, step0, step1, 0.0);
+	spin_but = gtk_spin_button_new(adj, 0.5, digits);
+	if (spin_button)
+		*spin_button = spin_but;
+	if (width > 0)
+		gtk_widget_set_size_request(spin_but, width, -1);
+	spin = GTK_SPIN_BUTTON(spin_but);
+	gtk_spin_button_set_numeric(spin, TRUE);
+	if (data == NULL)
+		data = (gpointer) spin;
+	if (cb_func)
+		g_signal_connect(G_OBJECT(spin_but), "value_changed", G_CALLBACK(cb_func), data);
+	if (box) {
+		if (right_align && string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+			gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 2);
+		}
+		gtk_box_pack_start(GTK_BOX(box), spin_but, FALSE, FALSE, 2);
+		if (!right_align && string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+			gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 2);
+		}
+	}
+}
+
+void
+ghid_table_spin_button(GtkWidget * table, gint row, gint column,
+											 GtkWidget ** spin_button, gfloat value,
+											 gfloat low, gfloat high, gfloat step0, gfloat step1,
+											 gint digits, gint width,
+											 void (*cb_func) (GtkSpinButton *, gpointer), gpointer data, gboolean right_align, const gchar * string)
+{
+	GtkWidget *label, *spin_but;
+	GtkSpinButton *spin;
+	GtkAdjustment *adj;
+
+	if (!table)
+		return;
+
+	adj = (GtkAdjustment *) gtk_adjustment_new(value, low, high, step0, step1, 0.0);
+	spin_but = gtk_spin_button_new(adj, 0.5, digits);
+
+	if (spin_button)
+		*spin_button = spin_but;
+	if (width > 0)
+		gtk_widget_set_size_request(spin_but, width, -1);
+	spin = GTK_SPIN_BUTTON(spin_but);
+	gtk_spin_button_set_numeric(spin, TRUE);
+	if (data == NULL)
+		data = (gpointer) spin;
+	if (cb_func)
+		g_signal_connect(G_OBJECT(spin_but), "value_changed", G_CALLBACK(cb_func), data);
+
+	if (right_align) {
+		gtk_table_attach_defaults(GTK_TABLE(table), spin_but, column + 1, column + 2, row, row + 1);
+		if (string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+			gtk_table_attach_defaults(GTK_TABLE(table), label, column, column + 1, row, row + 1);
+		}
+	}
+	else {
+		gtk_table_attach_defaults(GTK_TABLE(table), spin_but, column, column + 1, row, row + 1);
+		if (string) {
+			label = gtk_label_new(string);
+			gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+			gtk_table_attach_defaults(GTK_TABLE(table), label, column + 1, column + 2, row, row + 1);
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_spin_button.h	(revision 18980)
@@ -0,0 +1,14 @@
+#include <gtk/gtk.h>
+
+void
+ghid_spin_button(GtkWidget * box, GtkWidget ** spin_button, gfloat value,
+								 gfloat low, gfloat high, gfloat step0, gfloat step1,
+								 gint digits, gint width,
+								 void (*cb_func) (GtkSpinButton *, gpointer), gpointer data, gboolean right_align, const gchar * string);
+
+void
+ghid_table_spin_button(GtkWidget * table, gint row, gint column,
+											 GtkWidget ** spin_button, gfloat value,
+											 gfloat low, gfloat high, gfloat step0, gfloat step1,
+											 gint digits, gint width,
+											 void (*cb_func) (GtkSpinButton *, gpointer), gpointer data, gboolean right_align, const gchar * string);
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.c	(revision 18980)
@@ -0,0 +1,127 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "bu_status_line.h"
+#include "in_keyboard.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "board.h"
+
+GtkWidget *pcb_gtk_status_line_label_new(void)
+{
+	GtkWidget *label = gtk_label_new("\n");
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+
+	return label;
+}
+
+void pcb_gtk_status_line_set_text(GtkWidget *status_line_label, const gchar * text)
+{
+	if (status_line_label != NULL)
+		gtk_label_set_markup(GTK_LABEL(status_line_label), text ? text : "");
+}
+
+static inline void gen_status_long(char *text, size_t text_size, int compat_horiz, const pcb_unit_t *unit)
+{
+	char kbd[128];
+	const gchar *flag = conf_core.editor.all_direction_lines
+		? "*" : (conf_core.editor.line_refraction == 0 ? "X" : (conf_core.editor.line_refraction == 1 ? "_/" : "\\_"));
+
+	if (ghid_keymap.seq_len_action > 0) {
+		int len;
+		memcpy(kbd, "(last: ", 7);
+		len = pcb_hid_cfg_keys_seq(&ghid_keymap, kbd+7, sizeof(kbd)-9);
+		memcpy(kbd+len+7, ")", 2);
+	}
+	else
+		pcb_hid_cfg_keys_seq(&ghid_keymap, kbd, sizeof(kbd));
+
+	pcb_snprintf(text, text_size, _(
+		"%m+<b>view</b>=%s  "
+		"<b>grid</b>=%$mS  "
+		"<b>line</b>=%mS (%s%s) "
+		"<b>kbd</b>=%s"
+		"%s" /* line break */
+		"<b>via</b>=%mS (%mS)  "
+		"<b>clearance</b>=%mS  "
+		"<b>text</b>=%i%%  "
+		"<b>buffer</b>=#%i"),
+		unit->allow, conf_core.editor.show_solder_side ? _("bottom") : _("top"),
+		PCB->Grid,
+		conf_core.design.line_thickness, flag, conf_core.editor.rubber_band_mode ? ",R" : "",
+		kbd,
+		compat_horiz ? "\n" : "", /* line break */
+		conf_core.design.via_thickness, conf_core.design.via_drilling_hole, 
+		conf_core.design.clearance,
+		conf_core.design.text_scale,
+		conf_core.editor.buffer_number + 1);
+}
+
+static inline void gen_status_short(char *text, size_t text_size, int compat_horiz, const pcb_unit_t *unit)
+{
+	pcb_snprintf(text, text_size, _(
+		"%m+"
+		"grid=%$mS  "
+		"line=%mS "
+		"via=%mS (%mS) "
+		"clearance=%mS"),
+		unit->allow,
+		PCB->Grid,
+		conf_core.design.line_thickness,
+		conf_core.design.via_thickness, conf_core.design.via_drilling_hole, 
+		conf_core.design.clearance);
+}
+
+void pcb_gtk_status_line_update(GtkWidget *status_line_label, int compat_horiz)
+{
+	char text[1024];
+	static const pcb_unit_t *unit_mm = NULL, *unit_mil;
+	const pcb_unit_t *unit_inv;
+
+	if (status_line_label == NULL)
+		return;
+
+	if (unit_mm == NULL) { /* cache mm and mil units to save on the lookups */
+		unit_mm  = get_unit_struct("mm");
+		unit_mil = get_unit_struct("mil");
+	}
+
+	gen_status_long(text, sizeof(text), compat_horiz, conf_core.editor.grid_unit);
+	pcb_gtk_status_line_set_text(status_line_label, text);
+
+	if (conf_core.editor.grid_unit == unit_mm)
+		unit_inv = unit_mil;
+	else
+		unit_inv = unit_mm;
+
+	gen_status_short(text, sizeof(text), compat_horiz, unit_inv);
+	gtk_widget_set_tooltip_text(GTK_WIDGET(status_line_label), text);
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_status_line.h	(revision 18980)
@@ -0,0 +1,9 @@
+#include <gtk/gtk.h>
+
+/* Returns a new empty label able to use markup language. */
+GtkWidget *pcb_gtk_status_line_label_new(void);
+
+void pcb_gtk_status_line_set_text(GtkWidget *status_line_label, const gchar * text);
+
+void pcb_gtk_status_line_update(GtkWidget *status_line_label, int compat_horiz);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.c	(revision 18980)
@@ -0,0 +1,123 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Originally from gui-utils.c, was written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  Those functions were utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include "bu_text_view.h"
+//#include "compat.h"
+
+GtkWidget *ghid_scrolled_text_view(GtkWidget * box, GtkWidget ** scr, GtkPolicyType h_policy, GtkPolicyType v_policy)
+{
+	GtkWidget *scrolled, *view;
+	GtkTextBuffer *buffer;
+
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), h_policy, v_policy);
+	gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
+
+	view = gtk_text_view_new();
+	gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+	gtk_text_buffer_create_tag(buffer, "heading", "weight", PANGO_WEIGHT_BOLD, "size", 14 * PANGO_SCALE, NULL);
+	gtk_text_buffer_create_tag(buffer, "italic", "style", PANGO_STYLE_ITALIC, NULL);
+	gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD, NULL);
+	gtk_text_buffer_create_tag(buffer, "center", "justification", GTK_JUSTIFY_CENTER, NULL);
+	gtk_text_buffer_create_tag(buffer, "underline", "underline", PANGO_UNDERLINE_SINGLE, NULL);
+	gtk_text_buffer_create_tag(buffer, "red", "foreground", "#aa0000", NULL);
+	gtk_text_buffer_create_tag(buffer, "green", "foreground", "#00aa00", NULL);
+	gtk_text_buffer_create_tag(buffer, "blue", "foreground", "#0000aa", NULL);
+
+	gtk_container_add(GTK_CONTAINER(scrolled), view);
+	if (scr)
+		*scr = scrolled;
+	return view;
+}
+
+static void text_view_append(GtkWidget * view, const gchar * s)
+{
+	GtkTextIter iter;
+	GtkTextBuffer *buffer;
+	GtkTextMark *mark;
+
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+	gtk_text_buffer_get_end_iter(buffer, &iter);
+	/* gtk_text_iter_forward_to_end(&iter); */
+
+	if (strncmp(s, "<b>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "bold", NULL);
+	else if (strncmp(s, "<i>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "italic", NULL);
+	else if (strncmp(s, "<h>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "heading", NULL);
+	else if (strncmp(s, "<c>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "center", NULL);
+	else if (strncmp(s, "<R>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "red", NULL);
+	else if (strncmp(s, "<G>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "green", NULL);
+	else if (strncmp(s, "<B>", 3) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 3, -1, "blue", NULL);
+	else if (strncmp(s, "<ul>", 4) == 0)
+		gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, s + 4, -1, "underline", NULL);
+	else
+		gtk_text_buffer_insert(buffer, &iter, s, -1);
+
+	mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
+	gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(view), mark, 0, TRUE, 0.0, 1.0);
+	gtk_text_buffer_delete_mark(buffer, mark);
+}
+
+void ghid_text_view_append(GtkWidget * view, const gchar * string)
+{
+	static gchar *tag;
+	const gchar *s;
+
+	s = string;
+	if (*s == '<' && ((*(s + 2) == '>' && !*(s + 3)) || (*(s + 3) == '>' && !*(s + 4)))) {
+		tag = g_strdup(s);
+		return;
+	}
+
+	if (tag) {
+		char *concatenation;
+		concatenation = g_strconcat(tag, string, NULL);
+		text_view_append(view, concatenation);
+		g_free(concatenation);
+		g_free(tag);
+		tag = NULL;
+	}
+	else
+		text_view_append(view, string);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/bu_text_view.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <gtk/gtk.h>
+
+GtkWidget *ghid_scrolled_text_view(GtkWidget * box, GtkWidget ** scr, GtkPolicyType h_policy, GtkPolicyType v_policy);
+
+void ghid_text_view_append(GtkWidget * view, const gchar * string);
Index: tags/2.0.1/src_plugins/lib_gtk_common/compat.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/compat.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/compat.h	(revision 18980)
@@ -0,0 +1,332 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor Palinkas
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#ifndef PCB_GTK_COMPAT_H
+#define PCB_GTK_COMPAT_H
+
+#ifdef PCB_GTK3
+/* Need GTK3 >= 3.20 due to GdkSeat. */
+
+typedef GdkRGBA pcb_gtk_color_t;
+
+static inline GtkWidget *gtkc_hbox_new(gboolean homogenous, gint spacing)
+{
+	GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing);
+	gtk_box_set_homogeneous(GTK_BOX(box), homogenous);
+	return box;
+}
+
+static inline GtkWidget *gtkc_vbox_new(gboolean homogenous, gint spacing)
+{
+	GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing);
+	gtk_box_set_homogeneous(GTK_BOX(box), homogenous);
+	return box;
+}
+
+static inline GtkWidget *gtkc_hpaned_new()
+{
+	return gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+}
+
+static inline GtkWidget *gtkc_vpaned_new()
+{
+	return gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+}
+
+/* color button */
+
+static inline GtkWidget *gtkc_color_button_new_with_color(pcb_gtk_color_t *color)
+{
+	return gtk_color_button_new_with_rgba(color);
+}
+
+static inline void gtkc_color_button_set_color(GtkWidget *button, pcb_gtk_color_t *color)
+{
+	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(button), color);
+}
+
+static inline void gtkc_color_button_get_color(GtkWidget *button, pcb_gtk_color_t *color)
+{
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), color);
+}
+
+/* combo box text API, GTK3, GTK2.24 compatible. */
+
+static inline GtkWidget *gtkc_combo_box_text_new(void)
+{
+	return gtk_combo_box_text_new();
+}
+
+static inline void gtkc_combo_box_text_append_text(GtkWidget *combo, const gchar *text)
+{
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), text);
+}
+
+static inline void gtkc_combo_box_text_prepend_text(GtkWidget *combo, const gchar *text)
+{
+	gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(combo), text);
+}
+
+static inline void gtkc_combo_box_text_remove(GtkWidget *combo, gint position)
+{
+	gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(combo), position);
+}
+
+static inline gchar *gtkc_combo_box_text_get_active_text(GtkWidget *combo)
+{
+	return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
+}
+
+void *gtk_trunctext_new(const gchar *str);
+static inline GtkWidget *gtkc_trunctext_new(const gchar *str)
+{
+	return gtk_trunctext_new(str);
+}
+
+#define PCB_GTK_EXPOSE_EVENT_SET(obj, val) obj->draw = (gboolean (*)(GtkWidget *, cairo_t *))val
+typedef cairo_t pcb_gtk_expose_t;
+
+static inline void gtkc_scrolled_window_add_with_viewport(GtkWidget *scrolled, GtkWidget *child)
+{
+	gtk_container_add(GTK_CONTAINER(scrolled), child);
+}
+
+static inline GdkWindow * gdkc_window_get_pointer(GtkWidget *w, gint *x, gint *y, GdkModifierType *mask)
+{
+	GdkWindow *window = gtk_widget_get_window(w);
+	GdkSeat *seat = gdk_display_get_default_seat(gdk_window_get_display(window));
+	GdkDevice *device = gdk_seat_get_pointer(seat);
+
+	return gdk_window_get_device_position(window, device, x, y, mask);
+}
+
+/* Retrieves a widget's initial minimum and natural height. */
+static inline void gtkc_widget_get_preferred_height(GtkWidget *w, gint *min_size, gint *natural_size)
+{
+	gtk_widget_get_preferred_height(w, min_size, natural_size);
+}
+
+/* Adds a CSS class to the widget, applying CSS properties from css_descr */
+static inline void gtkc_widget_add_class_style(GtkWidget *w, const char *css_class, char *css_descr)
+{
+	GtkStyleContext *style_ctxt;
+	GtkCssProvider *provider;
+
+	style_ctxt = gtk_widget_get_style_context(w);
+	gtk_style_context_add_class(style_ctxt, css_class);
+	provider = gtk_css_provider_new();
+	gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), css_descr, -1, NULL);
+	gtk_style_context_add_provider(style_ctxt, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	g_object_unref(provider);
+}
+
+static inline void pcb_gtk_set_selected(GtkWidget *widget, int set)
+{
+	GtkStyleContext *sc = gtk_widget_get_style_context(widget);
+	GtkStateFlags sf = gtk_widget_get_state_flags(widget);
+
+	if (set)
+		gtk_style_context_set_state(sc, sf | GTK_STATE_FLAG_SELECTED);
+	else
+		gtk_style_context_set_state(sc, sf & (~GTK_STATE_FLAG_NORMAL));
+  gtk_widget_queue_draw(widget);
+}
+
+/* Make a widget selectable (via recoloring) */
+#define gtkc_widget_selectable(widget, name_space) \
+	do { \
+		GtkStyleContext *context; \
+		GtkCssProvider *provider; \
+\
+		context = gtk_widget_get_style_context(widget); \
+		provider = gtk_css_provider_new(); \
+		gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider), \
+																		"*." name_space ":selected {\n" \
+																		"   background-color: @theme_selected_bg_color;\n" \
+																		"   color: @theme_selected_fg_color;\n" "}\n", -1, NULL); \
+		gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); \
+		gtk_style_context_add_class(context, name_space); \
+		g_object_unref(provider); \
+	} while(0)
+
+static inline void pcb_gtk_dlg_about_add_button(GtkDialog *about, GtkWidget *button)
+{
+	GtkWidget *action_area = gtk_dialog_get_header_bar(about);
+	gtk_container_add (GTK_CONTAINER (action_area), button);
+}
+
+#else
+/* GTK2 */
+
+typedef GdkColor pcb_gtk_color_t;
+
+static inline GtkWidget *gtkc_hbox_new(gboolean homogenous, gint spacing)
+{
+	return gtk_hbox_new(homogenous, spacing);
+}
+
+static inline GtkWidget *gtkc_vbox_new(gboolean homogenous, gint spacing)
+{
+	return gtk_vbox_new(homogenous, spacing);
+}
+
+static inline GtkWidget *gtkc_hpaned_new()
+{
+	return gtk_hpaned_new();
+}
+
+static inline GtkWidget *gtkc_vpaned_new()
+{
+	return gtk_vpaned_new();
+}
+
+/* color button */
+
+static inline GtkWidget *gtkc_color_button_new_with_color(pcb_gtk_color_t *color)
+{
+	return gtk_color_button_new_with_color(color);
+}
+
+static inline void gtkc_color_button_set_color(GtkWidget *button, pcb_gtk_color_t *color)
+{
+	gtk_color_button_set_color(GTK_COLOR_BUTTON(button), color);
+}
+
+static inline void gtkc_color_button_get_color(GtkWidget *button, pcb_gtk_color_t *color)
+{
+	gtk_color_button_get_color(GTK_COLOR_BUTTON(button), color);
+}
+
+/* combo box text API, GTK2.4 compatible, GTK3 incompatible. */
+
+static inline GtkWidget *gtkc_combo_box_text_new(void)
+{
+	return gtk_combo_box_new_text();
+}
+
+static inline void gtkc_combo_box_text_append_text(GtkWidget *combo, const gchar *text)
+{
+	gtk_combo_box_append_text(GTK_COMBO_BOX(combo), text);
+}
+
+static inline void gtkc_combo_box_text_prepend_text(GtkWidget *combo, const gchar *text)
+{
+	gtk_combo_box_prepend_text(GTK_COMBO_BOX(combo), text);
+}
+
+static inline void gtkc_combo_box_text_remove(GtkWidget *combo, gint position)
+{
+	gtk_combo_box_remove_text(GTK_COMBO_BOX(combo), position);
+}
+
+static inline gchar *gtkc_combo_box_text_get_active_text(GtkWidget *combo)
+{
+	return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
+}
+
+static inline GtkWidget *gtkc_trunctext_new(const gchar *str)
+{
+	GtkWidget *w = gtk_label_new(str);
+	gtk_widget_set_size_request(w, 1, 1);
+
+	return w;
+}
+
+#define PCB_GTK_EXPOSE_EVENT_SET(obj, val) obj->expose_event = (gboolean (*)(GtkWidget *, GdkEventExpose *))val
+typedef GdkEventExpose pcb_gtk_expose_t;
+
+static inline void gtkc_scrolled_window_add_with_viewport(GtkWidget *scrolled, GtkWidget *child)
+{
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), child);
+}
+
+static inline GdkWindow * gdkc_window_get_pointer(GtkWidget *w, gint *x, gint *y, GdkModifierType *mask)
+{
+	return gdk_window_get_pointer(gtk_widget_get_window(w), x, y, mask);
+}
+
+static inline void gtkc_widget_get_preferred_height(GtkWidget *w, gint *min_size, gint *natural_size)
+{
+}
+
+static inline void gtkc_widget_add_class_style(GtkWidget *w, const char *css_class, char *css_descr)
+{
+}
+
+static inline void pcb_gtk_set_selected(GtkWidget *widget, int set)
+{
+	GtkStateType st = gtk_widget_get_state(widget);
+	/* race condition... */
+	if (set)
+		gtk_widget_set_state(widget, st | GTK_STATE_SELECTED);
+	else
+		gtk_widget_set_state(widget, st & (~GTK_STATE_SELECTED));
+}
+
+#define gtkc_widget_selectable(widget, name_space)
+
+static inline void pcb_gtk_dlg_about_add_button(GtkDialog *about, GtkWidget *button)
+{
+#warning TODO: remove gtk_dialog_get_action_area() - not present in old gtk2 versions
+	GtkWidget *action_area = gtk_dialog_get_action_area(about);
+	gtk_box_pack_end(GTK_BOX(action_area), button, FALSE, TRUE, 0);
+	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(action_area), button, TRUE);
+}
+
+#endif
+
+/*** common for now ***/
+
+/* gtk deprecated gtk_widget_hide_all() for some reason; this naive
+   implementation seems to work. */
+static inline void pcb_gtk_widget_hide_all(GtkWidget *widget)
+{
+	if(GTK_IS_CONTAINER(widget)) {
+		GList *children = gtk_container_get_children(GTK_CONTAINER(widget));
+		while ((children = g_list_next(children)) != NULL)
+			pcb_gtk_widget_hide_all(GTK_WIDGET(children->data));
+	}
+	gtk_widget_hide(widget);
+}
+
+/* gtk_table() is depreaceted in gtk3 for gtk_grid, but there's no grid between
+   3.0 and 3.2 so we should stay with table as long as it is not actually
+   removed */
+
+/* create a table with known size (all rows and cols created empty) */
+static inline GtkWidget *gtkc_table_static(int rows, int cols, gboolean homog)
+{
+	return gtk_table_new(rows, cols, homog);
+}
+
+
+/* Attach child in a single cell of the table */
+static inline void gtkc_table_attach1(GtkWidget *table, GtkWidget *child, int row, int col)
+{
+	gtk_table_attach(GTK_TABLE(table), child, col, col+1, row, row+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 4, 4);
+}
+
+#endif  /* PCB_GTK_COMPAT_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.c	(revision 18980)
@@ -0,0 +1,789 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+#include "conf_core.h"
+#include "dlg_attribute.h"
+#include <stdlib.h>
+
+#include "pcb-printf.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+#include "compat.h"
+#include "bu_box.h"
+#include "bu_check_button.h"
+#include "bu_spin_button.h"
+#include "wt_coord_entry.h"
+
+#define PCB_OBJ_PROP "pcb-rnd_context"
+
+typedef struct {
+	pcb_hid_attribute_t *attrs;
+	pcb_hid_attr_val_t *results;
+	GtkWidget **wl;
+	int n_attrs;
+	void *caller_data;
+	GtkWidget *dialog;
+	int rc;
+	pcb_hid_attr_val_t property[PCB_HATP_max];
+	unsigned inhibit_valchg:1;
+} attr_dlg_t;
+
+#define change_cb(ctx, dst) \
+	do { \
+		if (ctx->property[PCB_HATP_GLOBAL_CALLBACK].func != NULL) \
+			ctx->property[PCB_HATP_GLOBAL_CALLBACK].func(ctx, ctx->caller_data, dst); \
+		if (dst->change_cb != NULL) \
+			dst->change_cb(ctx, ctx->caller_data, dst); \
+	} while(0) \
+
+static void set_flag_cb(GtkToggleButton *button, gpointer user_data)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(button), PCB_OBJ_PROP);
+	pcb_hid_attribute_t *dst = user_data;
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	dst->default_val.int_value = gtk_toggle_button_get_active(button);
+	change_cb(ctx, dst);
+}
+
+static void intspinner_changed_cb(GtkSpinButton *spin_button, gpointer user_data)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(spin_button), PCB_OBJ_PROP);
+	pcb_hid_attribute_t *dst = user_data;
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+	dst->default_val.int_value = gtk_spin_button_get_value(spin_button);
+	change_cb(ctx, dst);
+}
+
+static void coordentry_changed_cb(GtkEntry *entry, pcb_hid_attribute_t *dst)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(entry), PCB_OBJ_PROP);
+	const char *s;
+	pcb_coord_t crd;
+	double crdd;
+	const pcb_unit_t *u;
+	pcb_bool succ;
+
+	s = gtk_entry_get_text(entry);
+	succ = pcb_get_value_unit(s, NULL, 1, &crdd, &u);
+
+	if (!succ)
+		return;
+
+	dst->changed = 1;
+
+	if (ctx->inhibit_valchg)
+		return;
+
+	crd = crdd;
+	pcb_gtk_coord_entry_set_unit(GHID_COORD_ENTRY(entry), u);
+
+	if ((dst->default_val.coord_value != crd) && (crd >= dst->min_val) && (crd <= dst->max_val)) {
+		dst->default_val.coord_value = crd;
+		change_cb(ctx, dst);
+	}
+}
+
+static void dblspinner_changed_cb(GtkSpinButton *spin_button, gpointer user_data)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(spin_button), PCB_OBJ_PROP);
+	pcb_hid_attribute_t *dst = user_data;
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	dst->default_val.real_value = gtk_spin_button_get_value(spin_button);
+	change_cb(ctx, dst);
+}
+
+static void entry_changed_cb(GtkEntry *entry, pcb_hid_attribute_t *dst)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(entry), PCB_OBJ_PROP);
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	free((char *)dst->default_val.str_value);
+	dst->default_val.str_value = pcb_strdup(gtk_entry_get_text(entry));
+	change_cb(ctx, dst);
+}
+
+static void enum_changed_cb(GtkComboBox *combo_box, pcb_hid_attribute_t *dst)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(combo_box), PCB_OBJ_PROP);
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	dst->default_val.int_value = gtk_combo_box_get_active(combo_box);
+	change_cb(ctx, dst);
+}
+
+static void notebook_changed_cb(GtkNotebook *nb, GtkWidget *page, guint page_num, pcb_hid_attribute_t *dst)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(nb), PCB_OBJ_PROP);
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	/* Gets the index (starting from 0) of the current page in the notebook. If
+	   the notebook has no pages, then -1 will be returned and no call-back occur. */
+	if (gtk_notebook_get_current_page(nb) >= 0) {
+		dst->default_val.int_value = page_num;
+		change_cb(ctx, dst);
+	}
+}
+
+static void button_changed_cb(GtkButton *button, pcb_hid_attribute_t *dst)
+{
+	attr_dlg_t *ctx = g_object_get_data(G_OBJECT(button), PCB_OBJ_PROP);
+
+	dst->changed = 1;
+	if (ctx->inhibit_valchg)
+		return;
+
+	change_cb(ctx, dst);
+}
+
+typedef struct {
+	void (*cb)(void *ctx, pcb_hid_attr_ev_t ev);
+	void *ctx;
+} resp_ctx_t;
+
+static void ghid_attr_dlg_response_cb(GtkDialog *dialog, gint response_id, gpointer user_data)
+{
+	resp_ctx_t *ctx = (resp_ctx_t *)user_data;
+
+	if ((ctx != NULL) && (ctx->cb != NULL)) {
+		switch (response_id) {
+		case GTK_RESPONSE_OK:
+			ctx->cb(ctx->ctx, PCB_HID_ATTR_EV_OK);
+			break;
+		case GTK_RESPONSE_CANCEL:
+			ctx->cb(ctx->ctx, PCB_HID_ATTR_EV_CANCEL);
+			break;
+		case GTK_RESPONSE_CLOSE:
+		case GTK_RESPONSE_DELETE_EVENT:
+			ctx->cb(ctx->ctx, PCB_HID_ATTR_EV_WINCLOSE);
+			break;
+		}
+	}
+	free(ctx);
+}
+
+
+static GtkWidget *frame_scroll(GtkWidget *parent, pcb_hatt_compflags_t flags)
+{
+	GtkWidget *fr;
+
+	if (flags & PCB_HATF_FRAME) {
+		fr = gtk_frame_new(NULL);
+		gtk_box_pack_start(GTK_BOX(parent), fr, FALSE, FALSE, 0);
+
+		parent = gtkc_hbox_new(FALSE, 0);
+		gtk_container_add(GTK_CONTAINER(fr), parent);
+	}
+	if (flags & PCB_HATF_SCROLL) {
+		fr = gtk_scrolled_window_new(NULL, NULL);
+		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fr), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+		gtk_box_pack_start(GTK_BOX(parent), fr, TRUE, TRUE, 0);
+		parent = gtkc_hbox_new(FALSE, 0);
+		gtkc_scrolled_window_add_with_viewport(fr, parent);
+	}
+	return parent;
+}
+
+typedef struct {
+	enum {
+		TB_TABLE,
+		TB_TABBED
+	} type;
+	union {
+		struct {
+			int cols, rows;
+			int col, row;
+		} table;
+		struct {
+			const char **tablab;
+		} tabbed;
+	} val;
+} ghid_attr_tb_t;
+
+static int ghid_attr_dlg_add(attr_dlg_t *ctx, GtkWidget *real_parent, ghid_attr_tb_t *tb_st, int start_from, int add_labels)
+{
+	int j, i, n;
+	GtkWidget *combo, *widget, *entry, *vbox1, *hbox, *bparent, *parent, *tbl;
+
+	for (j = start_from; j < ctx->n_attrs; j++) {
+		const pcb_unit_t *unit_list;
+		if (ctx->attrs[j].help_text == ATTR_UNDOCUMENTED)
+			continue;
+		if (ctx->attrs[j].type == PCB_HATT_END)
+			break;
+
+		/* if we are filling a table, allocate parent boxes in row-major */
+		if (tb_st != NULL) {
+			switch(tb_st->type) {
+				case TB_TABLE:
+					parent = gtkc_vbox_new(FALSE, 0);
+					gtkc_table_attach1(real_parent, parent, tb_st->val.table.row, tb_st->val.table.col);
+					tb_st->val.table.col++;
+					if (tb_st->val.table.col >= tb_st->val.table.cols) {
+						tb_st->val.table.col = 0;
+						tb_st->val.table.row++;
+					}
+					break;
+				case TB_TABBED:
+					/* Add a new notebook page with an empty vbox, using tab label present in enumerations. */
+					parent = gtkc_vbox_new(FALSE, 4);
+					if (*tb_st->val.tabbed.tablab) {
+						widget = gtk_label_new(*tb_st->val.tabbed.tablab);
+						tb_st->val.tabbed.tablab++;
+					}
+					else
+						widget = NULL;
+					gtk_notebook_append_page(GTK_NOTEBOOK(real_parent), parent, widget);
+					break;
+			}
+		}
+		else
+			parent = real_parent;
+
+		/* create the actual widget from attrs */
+		switch (ctx->attrs[j].type) {
+			case PCB_HATT_BEGIN_HBOX:
+				bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags);
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(bparent), hbox, FALSE, FALSE, 0);
+				ctx->wl[j] = hbox;
+				j = ghid_attr_dlg_add(ctx, hbox, NULL, j+1, (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_LABEL));
+				break;
+
+			case PCB_HATT_BEGIN_VBOX:
+				bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags);
+				vbox1 = gtkc_vbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(bparent), vbox1, FALSE, FALSE, 0);
+				ctx->wl[j] = vbox1;
+				j = ghid_attr_dlg_add(ctx, vbox1, NULL, j+1, (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_LABEL));
+				break;
+
+			case PCB_HATT_BEGIN_TABLE:
+				{
+					ghid_attr_tb_t ts;
+					bparent = frame_scroll(parent, ctx->attrs[j].pcb_hatt_flags);
+					ts.type = TB_TABLE;
+					ts.val.table.cols = ctx->attrs[j].pcb_hatt_table_cols;
+					ts.val.table.rows = pcb_hid_attrdlg_num_children(ctx->attrs, j+1, ctx->n_attrs) / ts.val.table.cols;
+					ts.val.table.col = 0;
+					ts.val.table.row = 0;
+					tbl = gtkc_table_static(ts.val.table.rows, ts.val.table.cols, 1);
+					gtk_box_pack_start(GTK_BOX(bparent), tbl, FALSE, FALSE, 0);
+					ctx->wl[j] = tbl;
+					j = ghid_attr_dlg_add(ctx, tbl, &ts, j+1, (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_LABEL));
+				}
+				break;
+
+			case PCB_HATT_BEGIN_TABBED:
+				{
+					ghid_attr_tb_t ts;
+					ts.type = TB_TABBED;
+					ts.val.tabbed.tablab = ctx->attrs[j].enumerations;
+					ctx->wl[j] = widget = gtk_notebook_new();
+					if (ctx->attrs[j].pcb_hatt_flags & PCB_HATF_LEFT_TAB)
+						gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widget), GTK_POS_LEFT);
+					else
+						gtk_notebook_set_tab_pos(GTK_NOTEBOOK(widget), GTK_POS_TOP);
+					gtk_box_pack_start(GTK_BOX(parent), widget, FALSE, FALSE, 0);
+					g_signal_connect(G_OBJECT(widget), "switch-page", G_CALLBACK(notebook_changed_cb), &(ctx->attrs[j]));
+					g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx);
+					j = ghid_attr_dlg_add(ctx, widget, &ts, j+1, 0);
+				}
+				break;
+
+			case PCB_HATT_LABEL:
+				ctx->wl[j] = widget = gtk_label_new(ctx->attrs[j].name);
+				g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx);
+
+				gtk_box_pack_start(GTK_BOX(parent), widget, FALSE, FALSE, 0);
+				gtk_misc_set_alignment(GTK_MISC(widget), 0., 0.5);
+				gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text);
+				break;
+
+			case PCB_HATT_INTEGER:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				/*
+				 * FIXME
+				 * need to pick the "digits" argument based on min/max
+				 * values
+				 */
+				ghid_spin_button(hbox, &widget, ctx->attrs[j].default_val.int_value,
+												 ctx->attrs[j].min_val, ctx->attrs[j].max_val, 1.0, 1.0, 0, 0,
+												 intspinner_changed_cb, &(ctx->attrs[j]), FALSE, NULL);
+				gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text);
+				g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = widget;
+
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+
+			case PCB_HATT_COORD:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				entry = pcb_gtk_coord_entry_new(ctx->attrs[j].min_val, ctx->attrs[j].max_val,
+																				ctx->attrs[j].default_val.coord_value, conf_core.editor.grid_unit, CE_SMALL);
+				gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+				g_object_set_data(G_OBJECT(entry), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = entry;
+
+				if (ctx->attrs[j].default_val.str_value != NULL)
+					gtk_entry_set_text(GTK_ENTRY(entry), ctx->attrs[j].default_val.str_value);
+				gtk_widget_set_tooltip_text(entry, ctx->attrs[j].help_text);
+				g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(coordentry_changed_cb), &(ctx->attrs[j]));
+
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+
+			case PCB_HATT_REAL:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				/*
+				 * FIXME
+				 * need to pick the "digits" and step size argument more
+				 * intelligently
+				 */
+				ghid_spin_button(hbox, &widget, ctx->attrs[j].default_val.real_value,
+												 ctx->attrs[j].min_val, ctx->attrs[j].max_val, 0.01, 0.01, 3,
+												 0, dblspinner_changed_cb, &(ctx->attrs[j]), FALSE, NULL);
+
+				gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text);
+				g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = widget;
+
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+
+			case PCB_HATT_STRING:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				entry = gtk_entry_new();
+				gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+				g_object_set_data(G_OBJECT(entry), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = entry;
+
+				if (ctx->attrs[j].default_val.str_value != NULL)
+					gtk_entry_set_text(GTK_ENTRY(entry), ctx->attrs[j].default_val.str_value);
+				gtk_widget_set_tooltip_text(entry, ctx->attrs[j].help_text);
+				g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(entry_changed_cb), &(ctx->attrs[j]));
+
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+
+			case PCB_HATT_BOOL:
+				/* put this in a check button */
+				pcb_gtk_check_button_connected(parent, &widget,
+                                       ctx->attrs[j].default_val.int_value,
+                                       TRUE, FALSE, FALSE, 0, set_flag_cb, &(ctx->attrs[j]), (add_labels ? ctx->attrs[j].name : NULL));
+				gtk_widget_set_tooltip_text(widget, ctx->attrs[j].help_text);
+				g_object_set_data(G_OBJECT(widget), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = widget;
+				break;
+
+			case PCB_HATT_ENUM:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				combo = gtkc_combo_box_text_new();
+				gtk_widget_set_tooltip_text(combo, ctx->attrs[j].help_text);
+				gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
+				g_object_set_data(G_OBJECT(combo), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = combo;
+
+				/*
+				 * Iterate through each value and add them to the
+				 * combo box
+				 */
+				i = 0;
+				while (ctx->attrs[j].enumerations[i]) {
+					gtkc_combo_box_text_append_text(combo, ctx->attrs[j].enumerations[i]);
+					i++;
+				}
+				gtk_combo_box_set_active(GTK_COMBO_BOX(combo), ctx->attrs[j].default_val.int_value);
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(enum_changed_cb), &(ctx->attrs[j]));
+				break;
+
+			case PCB_HATT_PATH:
+				vbox1 = ghid_category_vbox(parent, (add_labels ? ctx->attrs[j].name : NULL), 4, 2, TRUE, TRUE);
+				entry = gtk_entry_new();
+				g_object_set_data(G_OBJECT(entry), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = entry;
+
+				gtk_box_pack_start(GTK_BOX(vbox1), entry, FALSE, FALSE, 0);
+				gtk_entry_set_text(GTK_ENTRY(entry), ctx->attrs[j].default_val.str_value);
+				g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(entry_changed_cb), &(ctx->attrs[j]));
+
+				gtk_widget_set_tooltip_text(entry, ctx->attrs[j].help_text);
+				break;
+
+			case PCB_HATT_UNIT:
+				unit_list = pcb_units;
+				n = pcb_get_n_units();
+
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				combo = gtkc_combo_box_text_new();
+				gtk_widget_set_tooltip_text(combo, ctx->attrs[j].help_text);
+				gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
+				g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(enum_changed_cb), &(ctx->attrs[j]));
+				g_object_set_data(G_OBJECT(combo), PCB_OBJ_PROP, ctx);
+				ctx->wl[j] = combo;
+
+				/*
+				 * Iterate through each value and add them to the
+				 * combo box
+				 */
+				for (i = 0; i < n; ++i)
+					gtkc_combo_box_text_append_text(combo, unit_list[i].in_suffix);
+				gtk_combo_box_set_active(GTK_COMBO_BOX(combo), ctx->attrs[j].default_val.int_value);
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+			case PCB_HATT_BUTTON:
+				hbox = gtkc_hbox_new(FALSE, 4);
+				gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+				ctx->wl[j] = gtk_button_new_with_label(ctx->attrs[j].default_val.str_value);
+				gtk_box_pack_start(GTK_BOX(hbox), ctx->wl[j], FALSE, FALSE, 0);
+
+				gtk_widget_set_tooltip_text(ctx->wl[j], ctx->attrs[j].help_text);
+				g_signal_connect(G_OBJECT(ctx->wl[j]), "clicked", G_CALLBACK(button_changed_cb), &(ctx->attrs[j]));
+				g_object_set_data(G_OBJECT(ctx->wl[j]), PCB_OBJ_PROP, ctx);
+
+				if (add_labels) {
+					widget = gtk_label_new(ctx->attrs[j].name);
+					gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
+				}
+				break;
+
+			default:
+				printf("ghid_attribute_dialog: unknown type of HID attribute\n");
+				break;
+		}
+	}
+	return j;
+}
+
+static int ghid_attr_dlg_set(attr_dlg_t *ctx, int idx, const pcb_hid_attr_val_t *val)
+{
+	int save;
+	save = ctx->inhibit_valchg;
+	ctx->inhibit_valchg = 1;
+
+	/* create the actual widget from attrs */
+	switch (ctx->attrs[idx].type) {
+		case PCB_HATT_BEGIN_HBOX:
+		case PCB_HATT_BEGIN_VBOX:
+		case PCB_HATT_BEGIN_TABLE:
+		case PCB_HATT_END:
+			goto error;
+
+		case PCB_HATT_LABEL:
+			{
+				const char *txt = gtk_label_get_text(GTK_LABEL(ctx->wl[idx]));
+				if (strcmp(txt, val->str_value) == 0)
+					goto nochg;
+				gtk_label_set_text(GTK_LABEL(ctx->wl[idx]), val->str_value);
+			}
+			break;
+
+		case PCB_HATT_INTEGER:
+			{
+				double d = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ctx->wl[idx]));
+				if (val->int_value == (int)d)
+					goto nochg;
+				gtk_spin_button_set_value(GTK_SPIN_BUTTON(ctx->wl[idx]), val->int_value);
+			}
+			break;
+
+		case PCB_HATT_COORD:
+			{
+				pcb_coord_t crd = pcb_gtk_coord_entry_get_value(GHID_COORD_ENTRY(ctx->wl[idx]));
+				if (crd == val->coord_value)
+					goto nochg;
+				pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(ctx->wl[idx]), val->coord_value);
+			}
+			break;
+
+		case PCB_HATT_REAL:
+			{
+				double d = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ctx->wl[idx]));
+				if (val->real_value == d)
+					goto nochg;
+				gtk_spin_button_set_value(GTK_SPIN_BUTTON(ctx->wl[idx]), val->real_value);
+			}
+			break;
+
+		case PCB_HATT_STRING:
+		case PCB_HATT_PATH:
+			{
+				const char *s = gtk_entry_get_text(GTK_ENTRY(ctx->wl[idx]));
+				if (strcmp(s, val->str_value) == 0)
+					goto nochg;
+				gtk_entry_set_text(GTK_ENTRY(ctx->wl[idx]), val->str_value);
+			}
+			break;
+
+		case PCB_HATT_BOOL:
+			{
+				int chk = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ctx->wl[idx]));
+				if (chk == val->int_value)
+					goto nochg;
+				gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ctx->wl[idx]), val->int_value);
+			}
+			break;
+
+		case PCB_HATT_ENUM:
+			{
+				int en = gtk_combo_box_get_active(GTK_COMBO_BOX(ctx->wl[idx]));
+				if (en == val->int_value)
+					goto nochg;
+				gtk_combo_box_set_active(GTK_COMBO_BOX(ctx->wl[idx]), val->int_value);
+			}
+			break;
+
+		case PCB_HATT_UNIT:
+			abort();
+			break;
+
+		case PCB_HATT_BUTTON:
+			{
+				const char *s = gtk_button_get_label(GTK_BUTTON(ctx->wl[idx]));
+				if (strcmp(s, val->str_value) == 0)
+					goto nochg;
+				gtk_button_set_label(GTK_BUTTON(ctx->wl[idx]), val->str_value);
+			}
+			break;
+
+		case PCB_HATT_BEGIN_TABBED:
+			gtk_notebook_set_current_page(GTK_NOTEBOOK(ctx->wl[idx]), val->int_value);
+			break;
+	}
+
+	ctx->inhibit_valchg = save;
+	return 0;
+
+	error:;
+	ctx->inhibit_valchg = save;
+	return -1;
+
+	nochg:;
+	ctx->inhibit_valchg = save;
+	return 1;
+}
+
+void *ghid_attr_dlg_new(GtkWidget *top_window, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+{
+	GtkWidget *content_area;
+	GtkWidget *main_vbox, *vbox;
+	attr_dlg_t *ctx;
+	resp_ctx_t *resp_ctx = NULL;
+
+	if (button_cb != NULL) {
+		resp_ctx = malloc(sizeof(resp_ctx_t));
+		resp_ctx->cb = button_cb;
+		resp_ctx->ctx = caller_data;
+	}
+
+	ctx = calloc(sizeof(attr_dlg_t), 1);
+	ctx->attrs = attrs;
+	ctx->results = results;
+	ctx->n_attrs = n_attrs;
+	ctx->wl = calloc(sizeof(GtkWidget *), n_attrs);
+	ctx->caller_data = caller_data;
+
+	ctx->dialog = gtk_dialog_new_with_buttons(_(title),
+																			 GTK_WINDOW(top_window),
+																			 (GtkDialogFlags) ((modal?GTK_DIALOG_MODAL:0)
+																												 | GTK_DIALOG_DESTROY_WITH_PARENT),
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+	gtk_window_set_role(GTK_WINDOW(ctx->dialog), "PCB_attribute_editor");
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(ctx->dialog));
+	g_signal_connect(ctx->dialog, "response", G_CALLBACK(ghid_attr_dlg_response_cb), resp_ctx);
+
+	main_vbox = gtkc_vbox_new(FALSE, 6);
+	gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 6);
+	gtk_container_add_with_properties(GTK_CONTAINER(content_area), main_vbox, "expand", TRUE, "fill", TRUE, NULL);
+
+	if (!PCB_HATT_IS_COMPOSITE(attrs[0].type)) {
+		vbox = ghid_category_vbox(main_vbox, descr != NULL ? descr : "", 4, 2, TRUE, TRUE);
+		ghid_attr_dlg_add(ctx, vbox, NULL, 0, 1);
+	}
+	else
+		ghid_attr_dlg_add(ctx, main_vbox, NULL, 0, (attrs[0].pcb_hatt_flags & PCB_HATF_LABEL));
+
+	gtk_widget_show_all(ctx->dialog);
+
+	return ctx;
+}
+
+int ghid_attr_dlg_run(void *hid_ctx)
+{
+	attr_dlg_t *ctx = hid_ctx;
+	if (gtk_dialog_run(GTK_DIALOG(ctx->dialog)) == GTK_RESPONSE_OK)
+		ctx->rc = 0;
+	else
+		ctx->rc = 1;
+	return ctx->rc;
+}
+
+void ghid_attr_dlg_free(void *hid_ctx)
+{
+	attr_dlg_t *ctx = hid_ctx;
+
+	if (ctx->rc == 0) { /* copy over the results */
+		int i;
+		for (i = 0; i < ctx->n_attrs; i++) {
+			ctx->results[i] = ctx->attrs[i].default_val;
+			if (PCB_HAT_IS_STR(ctx->attrs[i].type) && (ctx->results[i].str_value))
+				ctx->results[i].str_value = pcb_strdup(ctx->results[i].str_value);
+			else
+				ctx->results[i].str_value = NULL;
+		}
+	}
+
+	gtk_widget_destroy(ctx->dialog);
+	free(ctx->wl);
+}
+
+void ghid_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val)
+{
+	attr_dlg_t *ctx = hid_ctx;
+
+	if ((prop >= 0) && (prop < PCB_HATP_max))
+		ctx->property[prop] = *val;
+}
+
+
+int ghid_attribute_dialog(GtkWidget * top_window, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+{
+	void *hid_ctx;
+	int rc;
+
+	hid_ctx = ghid_attr_dlg_new(top_window, attrs, n_attrs, results, title, descr, caller_data, pcb_true, NULL);
+	rc = ghid_attr_dlg_run(hid_ctx);
+	ghid_attr_dlg_free(hid_ctx);
+
+	return rc;
+}
+
+
+int ghid_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled)
+{
+	attr_dlg_t *ctx = hid_ctx;
+	if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL))
+		return -1;
+
+	gtk_widget_set_sensitive(ctx->wl[idx], enabled);
+
+	return 0;
+}
+
+int ghid_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide)
+{
+	attr_dlg_t *ctx = hid_ctx;
+	if ((idx < 0) || (idx >= ctx->n_attrs) || (ctx->wl[idx] == NULL))
+		return -1;
+
+	if (hide)
+		gtk_widget_hide(ctx->wl[idx]);
+	else
+		gtk_widget_show(ctx->wl[idx]);
+
+	return 0;
+}
+
+int ghid_attr_dlg_set_value(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val)
+{
+	attr_dlg_t *ctx = hid_ctx;
+	int res;
+
+	if ((idx < 0) || (idx >= ctx->n_attrs))
+		return -1;
+
+	res = ghid_attr_dlg_set(ctx, idx, val);
+
+	if (res == 0) {
+		ctx->attrs[idx].default_val = *val;
+		return 0;
+	}
+	else if (res == 1)
+		return 0; /* no change */
+
+	return -1;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_attribute.h	(revision 18980)
@@ -0,0 +1,16 @@
+#include <gtk/gtk.h>
+#include "hid.h"
+
+void *ghid_attr_dlg_new(GtkWidget *top_window, pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev));
+int ghid_attr_dlg_run(void *hid_ctx);
+void ghid_attr_dlg_free(void *hid_ctx);
+void ghid_attr_dlg_property(void *hid_ctx, pcb_hat_property_t prop, const pcb_hid_attr_val_t *val);
+
+int ghid_attribute_dialog(GtkWidget *top_window, pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data);
+
+int ghid_attr_dlg_widget_state(void *hid_ctx, int idx, pcb_bool enabled);
+int ghid_attr_dlg_widget_hide(void *hid_ctx, int idx, pcb_bool hide);
+
+int ghid_attr_dlg_set_value(void *hid_ctx, int idx, const pcb_hid_attr_val_t *val);
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.c	(revision 18980)
@@ -0,0 +1,207 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+#include "conf_core.h"
+#include "dlg_attributes.h"
+#include <stdlib.h>
+
+#include "pcb-printf.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+
+#include "compat.h"
+#include "wt_coord_entry.h"
+
+typedef struct {
+	GtkWidget *del;
+	GtkWidget *w_name;
+	GtkWidget *w_value;
+} AttrRow;
+
+static AttrRow *attr_row = 0;
+static int attr_num_rows = 0;
+static int attr_max_rows = 0;
+static pcb_attribute_list_t *attributes_list;
+static GtkWidget *attributes_dialog, *attr_table;
+
+static void attributes_delete_callback(GtkWidget * w, void *v);
+
+#define GA_RESPONSE_REVERT	1
+#define GA_RESPONSE_NEW		2
+
+static void ghid_attr_set_table_size()
+{
+	gtk_table_resize(GTK_TABLE(attr_table), attr_num_rows > 0 ? attr_num_rows : 1, 3);
+}
+
+static void ghid_attributes_need_rows(int new_max)
+{
+	if (attr_max_rows < new_max) {
+		if (attr_row)
+			attr_row = (AttrRow *) realloc(attr_row, new_max * sizeof(AttrRow));
+		else
+			attr_row = (AttrRow *) malloc(new_max * sizeof(AttrRow));
+	}
+	while (attr_max_rows < new_max) {
+		/* add [attr_max_rows] */
+		attr_row[attr_max_rows].del = gtk_button_new_with_label("del");
+		gtk_table_attach(GTK_TABLE(attr_table), attr_row[attr_max_rows].del,
+										 0, 1, attr_max_rows, attr_max_rows + 1, (GtkAttachOptions) (GTK_FILL | GTK_EXPAND), GTK_FILL, 0, 0);
+		g_signal_connect(G_OBJECT(attr_row[attr_max_rows].del), "clicked",
+										 G_CALLBACK(attributes_delete_callback), GINT_TO_POINTER(attr_max_rows));
+
+		attr_row[attr_max_rows].w_name = gtk_entry_new();
+		gtk_table_attach(GTK_TABLE(attr_table), attr_row[attr_max_rows].w_name,
+										 1, 2, attr_max_rows, attr_max_rows + 1, (GtkAttachOptions) (GTK_FILL | GTK_EXPAND), GTK_FILL, 0, 0);
+
+		attr_row[attr_max_rows].w_value = gtk_entry_new();
+		gtk_table_attach(GTK_TABLE(attr_table), attr_row[attr_max_rows].w_value,
+										 2, 3, attr_max_rows, attr_max_rows + 1, (GtkAttachOptions) (GTK_FILL | GTK_EXPAND), GTK_FILL, 0, 0);
+
+		attr_max_rows++;
+	}
+
+	/* Manage any previously unused rows we now need to show.  */
+	while (attr_num_rows < new_max) {
+		/* manage attr_num_rows */
+		gtk_widget_show(attr_row[attr_num_rows].del);
+		gtk_widget_show(attr_row[attr_num_rows].w_name);
+		gtk_widget_show(attr_row[attr_num_rows].w_value);
+		attr_num_rows++;
+	}
+}
+
+static void ghid_attributes_revert()
+{
+	int i;
+
+	ghid_attributes_need_rows(attributes_list->Number);
+
+	/* Unmanage any previously used rows we don't need.  */
+	while (attr_num_rows > attributes_list->Number) {
+		attr_num_rows--;
+		gtk_widget_hide(attr_row[attr_num_rows].del);
+		gtk_widget_hide(attr_row[attr_num_rows].w_name);
+		gtk_widget_hide(attr_row[attr_num_rows].w_value);
+	}
+
+	/* Fill in values */
+	for (i = 0; i < attributes_list->Number; i++) {
+		/* create row [i] */
+		gtk_entry_set_text(GTK_ENTRY(attr_row[i].w_name), attributes_list->List[i].name);
+		gtk_entry_set_text(GTK_ENTRY(attr_row[i].w_value), attributes_list->List[i].value);
+	}
+	ghid_attr_set_table_size();
+}
+
+static void attributes_delete_callback(GtkWidget * w, void *v)
+{
+	int i, n;
+
+	n = GPOINTER_TO_INT(v);
+
+	for (i = n; i < attr_num_rows - 1; i++) {
+		gtk_entry_set_text(GTK_ENTRY(attr_row[i].w_name), gtk_entry_get_text(GTK_ENTRY(attr_row[i + 1].w_name)));
+		gtk_entry_set_text(GTK_ENTRY(attr_row[i].w_value), gtk_entry_get_text(GTK_ENTRY(attr_row[i + 1].w_value)));
+	}
+	attr_num_rows--;
+
+	gtk_widget_hide(attr_row[attr_num_rows].del);
+	gtk_widget_hide(attr_row[attr_num_rows].w_name);
+	gtk_widget_hide(attr_row[attr_num_rows].w_value);
+
+	ghid_attr_set_table_size();
+}
+
+void pcb_gtk_dlg_attributes(GtkWidget *top_window, const char *owner, pcb_attribute_list_t * attrs)
+{
+	GtkWidget *content_area;
+	int response;
+
+	attributes_list = attrs;
+
+	attr_max_rows = 0;
+	attr_num_rows = 0;
+
+	attributes_dialog = gtk_dialog_new_with_buttons(owner,
+																									GTK_WINDOW(top_window),
+																									GTK_DIALOG_MODAL,
+																									GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+																									"Revert", GA_RESPONSE_REVERT,
+																									"New", GA_RESPONSE_NEW, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	attr_table = gtk_table_new(attrs->Number, 3, 0);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(attributes_dialog));
+	gtk_box_pack_start(GTK_BOX(content_area), attr_table, FALSE, FALSE, 0);
+
+	gtk_widget_show(attr_table);
+
+	ghid_attributes_revert();
+
+	while (1) {
+		response = gtk_dialog_run(GTK_DIALOG(attributes_dialog));
+
+		if (response == GTK_RESPONSE_CANCEL)
+			break;
+
+		if (response == GTK_RESPONSE_OK) {
+			int i;
+			/* Copy the values back */
+			pcb_attribute_copyback_begin(attributes_list);
+			for (i = 0; i < attr_num_rows; i++)
+				pcb_attribute_copyback(attributes_list, gtk_entry_get_text(GTK_ENTRY(attr_row[i].w_name)), gtk_entry_get_text(GTK_ENTRY(attr_row[i].w_value)));
+			pcb_attribute_copyback_end(attributes_list);
+			break;
+		}
+
+		if (response == GA_RESPONSE_REVERT) {
+			/* Revert */
+			ghid_attributes_revert();
+		}
+
+		if (response == GA_RESPONSE_NEW) {
+			ghid_attributes_need_rows(attr_num_rows + 1);	/* also bumps attr_num_rows */
+
+			gtk_entry_set_text(GTK_ENTRY(attr_row[attr_num_rows - 1].w_name), "");
+			gtk_entry_set_text(GTK_ENTRY(attr_row[attr_num_rows - 1].w_value), "");
+
+			ghid_attr_set_table_size();
+		}
+	}
+
+	gtk_widget_destroy(attributes_dialog);
+	free(attr_row);
+	attr_row = NULL;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_attributes.h	(revision 18980)
@@ -0,0 +1,8 @@
+#include <gtk/gtk.h>
+#include "hid.h"
+
+void pcb_gtk_dlg_attributes(GtkWidget *top_window, const char *owner, pcb_attribute_list_t * attrs);
+
+
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.c	(revision 18980)
@@ -0,0 +1,476 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port */
+
+#include "config.h"
+#include "dlg_command.h"
+#include "conf_core.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#include "board.h"
+#include "crosshair.h"
+#include "actions.h"
+#include "compat_nls.h"
+
+#include "bu_text_view.h"
+#include "bu_status_line.h"
+#include "util_str.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#include "compat.h"
+
+
+static GtkWidget *command_window;
+static GtkWidget *combo_vbox;
+static GList *history_list;
+static gchar *command_entered;
+GMainLoop *ghid_entry_loop;
+
+
+/* gui-command-window.c provides two interfaces for getting user input
+|  for executing a command.
+|
+|  As the Xt PCB was ported to Gtk, the traditional user entry in the
+|  status line window presented some focus problems which require that
+|  there can be no menu key shortcuts that might be a key the user would
+|  type in.  It also requires a coordinating flag so the drawing area
+|  won't grab focus while the command entry is up.
+|
+|  I thought the interface should be cleaner, so I made an alternate
+|  command window interface which works better I think as a GUI interface.
+|  The user must focus onto the command window, but since it's a separate
+|  window, there's no confusion.  It has the restriction that objects to
+|  be operated on must be selected, but that actually seems a better user
+|  interface than one where typing into one location requires the user to
+|  be careful about which object might be under the cursor somewhere else.
+|
+|  In any event, both interfaces are here to work with.
+*/
+
+
+	/* When using a command window for command entry, provide a quick and
+	   |  abbreviated reference to available commands.
+	   |  This is currently just a start and can be expanded if it proves useful.
+	 */
+static const gchar *command_ref_text[] = {
+	N_("Common commands easily accessible via the gui may not be included here.\n"),
+	"\n",
+	N_("In user commands below, 'size' values may be absolute or relative\n"
+		 "if preceded by a '+' or '-'.  Where 'units' are indicated, use \n"
+		 "'mil' or 'mm' otherwise PCB internal units will be used.\n"),
+	"\n",
+	"<b>changesize(target, size, units)\n",
+	"\ttarget = {selectedlines | selectedpins | selectedvias | selectedpads \n"
+		"\t\t\t| selectedtexts | selectednames | selectedelements | selected}\n",
+	"\n",
+	"<b>changedrillsize(target, size, units)\n",
+	"\ttarget = {selectedpins | selectedvias | selectedobjects | selected}\n",
+	"\n",
+	"<b>changeclearsize(target, size, units)\n",
+	"\ttarget = {selectedpins | selectedpads | selectedvias | selectedlines\n"
+		"\t\t\t| selectedarcs | selectedobjects | selected}\n",
+	N_("\tChanges the clearance of objects.\n"),
+	"\n",
+	"<b>setvalue(target, size, units)\n",
+	"\ttarget = {grid | zoom | line | textscale | viadrillinghole\n" "\t\t\t| viadrillinghole | via}\n",
+	N_("\tChanges values.  Omit 'units' for 'grid' and 'zoom'.\n"),
+	"\n",
+	"<b>changejoin(target)\n",
+	"\ttarget = {object | selectedlines | selectedarcs | selected}\n",
+	N_("\tChanges the join (clearance through polygons) of objects.\n"),
+	"\n",
+	"<b>changesquare(target)\n",
+	"<b>setsquare(target)\n",
+	"<b>clearsquare(target)\n",
+	"\ttarget = {object | selectedelements | selectedpins | selected}\n",
+	N_("\tToggles, sets, or clears the square flag of objects.\n"),
+	"\n",
+	"<b>changeoctagon(target)\n",
+	"<b>setoctagon(target)\n",
+	"<b>clearoctagon(target)\n",
+	"\ttarget = {object | selectedelements | selectedpins selectedvias | selected}\n",
+	N_("\tToggles, sets, or clears the octagon flag of objects.\n"),
+	"\n",
+	"<b>changehole(target)\n",
+	"\ttarget = {object | selectedvias | selected}\n",
+	N_("\tChanges the hole flag of objects.\n"),
+	"\n",
+	"<b>flip(target)\n",
+	"\ttarget = {object | selectedelements | selected}\n",
+	N_("\tFlip elements to the opposite side of the board.\n"),
+	"\n",
+	"<b>togglethermal(target)\n",
+	"<b>setthermal(target)\n",
+	"<b>clearthermal(target)\n",
+	"\ttarget = {object | selectedpins | selectedvias | selected}\n",
+	N_("\tToggle, set or clear a thermal (on the current layer) to pins or vias.\n"),
+	"\n",
+	"<b>loadvendor(target)\n",
+	"\ttarget = [filename]\n",
+	N_("\tLoad a vendor file.  If 'filename' omitted, pop up file select dialog.\n"),
+};
+
+
+	/* Put an allocated string on the history list and combo text list
+	   |  if it is not a duplicate.  The history_list is just a shadow of the
+	   |  combo list, but I think is needed because I don't see an API for reading
+	   |  the combo strings.  The combo box strings take "const gchar *", so the
+	   |  same allocated string can go in both the history list and the combo list.
+	   |  If removed from both lists, a string can be freed.
+	 */
+static void command_history_add(pcb_gtk_command_t *ctx, gchar *cmd)
+{
+	GList *list;
+	gchar *s;
+	gint i;
+
+	if (!cmd || !*cmd)
+		return;
+
+	/* Check for a duplicate command.  If found, move it to the
+	   |  top of the list and similarly modify the combo box strings.
+	 */
+	for (i = 0, list = history_list; list; list = list->next, ++i) {
+		s = (gchar *) list->data;
+		if (!strcmp(cmd, s)) {
+			history_list = g_list_remove(history_list, s);
+			history_list = g_list_append(history_list, s);
+			gtkc_combo_box_text_remove(ctx->command_combo_box, i);
+			gtkc_combo_box_text_append_text(ctx->command_combo_box, s);
+			return;
+		}
+	}
+
+	/* Not a duplicate, so put first in history list and combo box text list.
+	 */
+	s = g_strdup(cmd);
+	history_list = g_list_append(history_list, s);
+	gtkc_combo_box_text_append_text(ctx->command_combo_box, s);
+
+	/* And keep the lists trimmed!
+	 */
+	if (g_list_length(history_list) > conf_hid_gtk.plugins.hid_gtk.history_size) {
+		s = (gchar *) g_list_nth_data(history_list, 0);
+		history_list = g_list_remove(history_list, s);
+		gtkc_combo_box_text_remove(ctx->command_combo_box, 0);
+		g_free(s);
+	}
+}
+
+
+	/* Called when user hits "Enter" key in command entry.  The action to take
+	   |  depends on where the combo box is.  If it's in the command window, we can
+	   |  immediately execute the command and carry on.  If it's in the status
+	   |  line hbox, then we need stop the command entry g_main_loop from running
+	   |  and save the allocated string so it can be returned from
+	   |  ghid_command_entry_get()
+	 */
+static void command_entry_activate_cb(GtkWidget * widget, gpointer data)
+{
+	pcb_gtk_command_t *ctx = data;
+	gchar *command;
+
+	/*command = g_strdup(ghid_entry_get_text(GTK_WIDGET(ctx->command_entry))); */
+	command = g_strdup(pcb_str_strip_left(gtk_entry_get_text(GTK_ENTRY(ctx->command_entry))));
+	gtk_entry_set_text(ctx->command_entry, "");
+
+	if (*command)
+		command_history_add(ctx, command);
+
+	if (conf_hid_gtk.plugins.hid_gtk.use_command_window) {
+		pcb_parse_command(command, pcb_false);
+		g_free(command);
+	}
+	else {
+		if (ghid_entry_loop && g_main_loop_is_running(ghid_entry_loop))	/* should always be */
+			g_main_loop_quit(ghid_entry_loop);
+		command_entered = command;	/* Caller will free it */
+	}
+}
+
+	/* Create the command_combo_box.  Called once, either by
+	   |  ghid_command_window_show() or ghid_command_entry_get().  Then as long as
+	   |  conf_hid_gtk.plugins.hid_gtk.use_command_window is TRUE, the command_combo_box will live
+	   |  in a command window vbox or float if the command window is not up.
+	   |  But if conf_hid_gtk.plugins.hid_gtk.use_command_window is FALSE, the command_combo_box
+	   |  will live in the status_line_hbox either shown or hidden.
+	   |  Since it's never destroyed, the combo history strings never need
+	   |  rebuilding and history is maintained if the combo box location is moved.
+	 */
+static void command_combo_box_entry_create(pcb_gtk_command_t *ctx)
+{
+	ctx->command_combo_box = gtk_combo_box_text_new_with_entry();
+	ctx->command_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ctx->command_combo_box)));
+
+	gtk_entry_set_width_chars(ctx->command_entry, 40);
+	gtk_entry_set_activates_default(ctx->command_entry, TRUE);
+
+	g_signal_connect(G_OBJECT(ctx->command_entry), "activate", G_CALLBACK(command_entry_activate_cb), ctx);
+
+	g_object_ref(G_OBJECT(ctx->command_combo_box)); /* so can move it */
+}
+
+/* CB function related to Command Window destruction */
+static void command_destroy_cb(GtkWidget *dlg, pcb_gtk_command_t *ctx)
+{
+	if (command_window) {
+		gtk_container_remove(GTK_CONTAINER(combo_vbox), /* Float it */
+			ctx->command_combo_box);
+		gtk_widget_hide(command_window);
+	}
+	ctx->prompt_label = NULL;
+	combo_vbox = NULL;
+	/* Command Window is hidden/destroyed, so expected future value for command_window is NULL. */
+	command_window = NULL;
+}
+
+static pcb_bool command_keypress_cb(GtkWidget * widget, GdkEventKey * kev, pcb_gtk_command_t *ctx)
+{
+	gint ksym = kev->keyval;
+
+	if (ksym == GDK_KEY_Tab) {
+		pcb_cli_tab();
+		return TRUE;
+	}
+
+	/* escape key handling */
+	if (ksym != GDK_KEY_Escape)
+		return FALSE;
+
+	if (command_window) {
+		command_window_close_cb(ctx);
+		return TRUE;
+	}
+
+	if (ghid_entry_loop && g_main_loop_is_running(ghid_entry_loop))	/* should always be */
+		g_main_loop_quit(ghid_entry_loop);
+	command_entered = NULL;				/* We are aborting */
+	/* Hidding the widgets */
+	if (conf_core.editor.fullscreen) {
+		gtk_widget_hide(gtk_widget_get_parent(ctx->command_combo_box));
+	}
+
+	return TRUE;
+}
+
+static pcb_bool command_keyrelease_cb(GtkWidget *widget, GdkEventKey *kev, pcb_gtk_command_t *ctx)
+{
+	if (ctx->com->command_entry_is_active())
+		pcb_cli_edit();
+}
+
+
+	/* If conf_hid_gtk.plugins.hid_gtk.use_command_window is TRUE this will get called from
+	   |  Action Command() to show the command window.
+	 */
+void ghid_command_window_show(pcb_gtk_command_t *ctx, pcb_bool raise)
+{
+	GtkWidget *vbox, *vbox1, *hbox, *button, *expander, *text, *warn;
+	gint i;
+
+	if (command_window != NULL) {
+		if (raise)
+			gtk_window_present(GTK_WINDOW(command_window));
+		return;
+	}
+
+	command_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	g_signal_connect(G_OBJECT(command_window), "destroy", G_CALLBACK(command_destroy_cb), ctx);
+	gtk_window_set_title(GTK_WINDOW(command_window), _("pcb-rnd Command Entry"));
+	gtk_window_set_role(GTK_WINDOW(command_window), "PCB_Command");
+	gtk_window_set_resizable(GTK_WINDOW(command_window), FALSE);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+	gtk_container_add(GTK_CONTAINER(command_window), vbox);
+
+	warn = gtk_label_new("WARNING: separate command window is deprecated.\nPlease consider turning it off in the preferences.\n\n");
+	gtk_box_pack_start(GTK_BOX(vbox), warn, FALSE, FALSE, 0);
+
+	ctx->prompt_label = gtk_label_new(pcb_cli_prompt(":"));
+	gtk_box_pack_start(GTK_BOX(vbox), ctx->prompt_label, FALSE, FALSE, 0);
+
+	if (!ctx->command_combo_box) {
+		command_combo_box_entry_create(ctx);
+		g_signal_connect(G_OBJECT(ctx->command_entry), "key_press_event", G_CALLBACK(command_keypress_cb), ctx);
+		g_signal_connect(G_OBJECT(ctx->command_entry), "key_release_event", G_CALLBACK(command_keyrelease_cb), ctx);
+	}
+
+	gtk_box_pack_start(GTK_BOX(vbox), ctx->command_combo_box, FALSE, FALSE, 0);
+	combo_vbox = vbox;
+
+	/* Make the command reference scrolled text view.  Use high level
+	   |  utility functions in gui-utils.c
+	 */
+	expander = gtk_expander_new(_("Command Reference"));
+	gtk_box_pack_start(GTK_BOX(vbox), expander, TRUE, TRUE, 2);
+	vbox1 = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(expander), vbox1);
+	gtk_widget_set_size_request(vbox1, -1, 350);
+
+	text = ghid_scrolled_text_view(vbox1, NULL, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	for (i = 0; i < sizeof(command_ref_text) / sizeof(gchar *); ++i)
+		ghid_text_view_append(text, _(command_ref_text[i]));
+
+	/* The command window close button.
+	 */
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(command_destroy_cb), ctx);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	gtk_widget_show_all(command_window);
+}
+
+void ghid_command_update_prompt(pcb_gtk_command_t *ctx)
+{
+	if (ctx->prompt_label != NULL)
+		gtk_label_set_text(GTK_LABEL(ctx->prompt_label), pcb_cli_prompt(":"));
+}
+
+
+	/* This is the command entry function called from Action Command() when
+	   |  conf_hid_gtk.plugins.hid_gtk.use_command_window is FALSE.  The command_combo_box is already
+	   |  packed into the status line label hbox in this case.
+	 */
+char *ghid_command_entry_get(pcb_gtk_command_t *ctx, const char *prompt, const char *command)
+{
+	gchar *s;
+	gint escape_sig_id, escape_sig2_id;
+
+	/* If this is the first user command entry, we have to create the
+	   |  command_combo_box and pack it into the status_line_hbox.
+	 */
+	if (!ctx->command_combo_box) {
+		command_combo_box_entry_create(ctx);
+		g_signal_connect(G_OBJECT(ctx->command_entry), "key_press_event", G_CALLBACK(command_keypress_cb), ctx);
+		g_signal_connect(G_OBJECT(ctx->command_entry), "key_release_event", G_CALLBACK(command_keyrelease_cb), ctx);
+		ctx->pack_in_status_line();
+	}
+
+	/* Make the prompt bold and set the label before showing the combo to
+	   |  avoid window resizing wider.
+	 */
+	s = g_strdup_printf("<b>%s</b>", prompt ? prompt : "");
+	ctx->com->status_line_set_text(s);
+	g_free(s);
+
+	/* Flag so output drawing area won't try to get focus away from us and
+	   |  so resetting the status line label can be blocked when resize
+	   |  callbacks are invokded from the resize caused by showing the combo box.
+	 */
+	ctx->command_entry_status_line_active = TRUE;
+
+	gtk_entry_set_text(ctx->command_entry, command ? command : "");
+	gtk_widget_show_all(gtk_widget_get_parent(ctx->command_combo_box));
+
+	/* Remove the top window accel group so keys intended for the entry
+	   |  don't get intercepted by the menu system.  Set the interface
+	   |  insensitive so all the user can do is enter a command, grab focus
+	   |  and connect a handler to look for the escape key.
+	 */
+	ctx->pre_entry();
+
+	gtk_widget_grab_focus(GTK_WIDGET(ctx->command_entry));
+	escape_sig_id = g_signal_connect(G_OBJECT(ctx->command_entry), "key_press_event", G_CALLBACK(command_keypress_cb), ctx);
+	escape_sig2_id = g_signal_connect(G_OBJECT(ctx->command_entry), "key_release_event", G_CALLBACK(command_keyrelease_cb), ctx);
+
+	ghid_entry_loop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(ghid_entry_loop);
+
+	g_main_loop_unref(ghid_entry_loop);
+	ghid_entry_loop = NULL;
+
+	ctx->command_entry_status_line_active = FALSE;
+
+	/* Restore the damage we did before entering the loop.
+	 */
+	g_signal_handler_disconnect(ctx->command_entry, escape_sig_id);
+	g_signal_handler_disconnect(ctx->command_entry, escape_sig2_id);
+
+	/* Hide the widgets */
+	if (conf_core.editor.fullscreen) {
+		gtk_widget_hide(gtk_widget_get_parent(ctx->command_combo_box));
+	}
+
+	/* Restore the status line label and give focus back to the drawing area
+	 */
+	gtk_widget_hide(ctx->command_combo_box);
+	ctx->post_entry();
+
+	return command_entered;
+}
+
+
+void ghid_handle_user_command(pcb_gtk_command_t *ctx, pcb_bool raise)
+{
+	char *command;
+	static char *previous = NULL;
+
+	if (conf_hid_gtk.plugins.hid_gtk.use_command_window)
+		ghid_command_window_show(ctx, raise);
+	else {
+		command = ghid_command_entry_get(ctx, pcb_cli_prompt(":"), (conf_core.editor.save_last_command && previous) ? previous : (gchar *)"");
+		if (command != NULL) {
+			/* copy new command line to save buffer */
+			g_free(previous);
+			previous = g_strdup(command);
+			pcb_parse_command(command, pcb_false);
+			g_free(command);
+		}
+	}
+	ctx->com->window_set_name_label(PCB->Name);
+	ctx->com->set_status_line_label();
+}
+
+void command_window_close_cb(pcb_gtk_command_t *ctx)
+{
+	if (command_window)
+		gtk_widget_destroy(command_window);
+}
+
+const char *pcb_gtk_cmd_command_entry(pcb_gtk_command_t *ctx, const char *ovr, int *cursor)
+{
+	if (!ctx->com->command_entry_is_active()) {
+		if (cursor != NULL)
+			*cursor = -1;
+		return NULL;
+	}
+	if (ovr != NULL) {
+		gtk_entry_set_text(ctx->command_entry, ovr);
+		if (cursor != NULL)
+			gtk_editable_set_position(GTK_EDITABLE(ctx->command_entry), *cursor);
+	}
+	if (cursor != NULL)
+		*cursor = gtk_editable_get_position(GTK_EDITABLE(ctx->command_entry));
+	return gtk_entry_get_text(ctx->command_entry);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_command.h	(revision 18980)
@@ -0,0 +1,32 @@
+#ifndef PCB_GTK_DLG_COMMAND_H
+#define PCB_GTK_DLG_COMMAND_H
+
+#include <gtk/gtk.h>
+#include <glib.h>
+#include "pcb_bool.h"
+#include "glue.h"
+
+typedef struct pcb_gtk_command_s {
+	GtkWidget *command_combo_box, *prompt_label;
+	GtkEntry *command_entry;
+	gboolean command_entry_status_line_active;
+
+	void (*pack_in_status_line)(void); /* embed the command combo box in top window's status line */
+	void (*post_entry)(void);
+	void (*pre_entry)(void);
+
+	pcb_gtk_common_t *com;
+} pcb_gtk_command_t;
+
+void ghid_handle_user_command(pcb_gtk_command_t *ctx, pcb_bool raise);
+void ghid_command_window_show(pcb_gtk_command_t *ctx, pcb_bool raise);
+char *ghid_command_entry_get(pcb_gtk_command_t *ctx, const char *prompt, const char *command);
+void command_window_close_cb(pcb_gtk_command_t *ctx);
+
+/* Update the prompt text before the command entry - call it when any of conf_core.rc.cli_* change */
+void ghid_command_update_prompt(pcb_gtk_command_t *ctx);
+
+const char *pcb_gtk_cmd_command_entry(pcb_gtk_command_t *ctx, const char *ovr, int *cursor);
+
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.c	(revision 18980)
@@ -0,0 +1,114 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "dlg_confirm.h"
+#include "compat_nls.h"
+#include "board.h"
+#include "actions.h"
+
+#include "compat.h"
+
+#include "dlg_message.h"
+
+int pcb_gtk_dlg_confirm_open(GtkWidget *top_window, const char *msg, va_list ap)
+{
+	int rv = 0;
+	const char *cancelmsg = NULL, *okmsg = NULL;
+	static gint x = -1, y = -1;
+	GtkWidget *dialog;
+
+	cancelmsg = va_arg(ap, char *);
+	okmsg = va_arg(ap, char *);
+
+	if (!cancelmsg) {
+		cancelmsg = _("_Cancel");
+		okmsg = _("_OK");
+	}
+
+	dialog = gtk_message_dialog_new(GTK_WINDOW(top_window),
+																	(GtkDialogFlags) (GTK_DIALOG_MODAL |
+																										GTK_DIALOG_DESTROY_WITH_PARENT),
+																	GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg);
+	gtk_dialog_add_button(GTK_DIALOG(dialog), cancelmsg, GTK_RESPONSE_CANCEL);
+	if (okmsg) {
+		gtk_dialog_add_button(GTK_DIALOG(dialog), okmsg, GTK_RESPONSE_OK);
+	}
+
+	if (x != -1) {
+		gtk_window_move(GTK_WINDOW(dialog), x, y);
+	}
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
+		rv = 1;
+
+	gtk_window_get_position(GTK_WINDOW(dialog), &x, &y);
+
+	gtk_widget_destroy(dialog);
+	return rv;
+}
+
+int pcb_gtk_dlg_confirm_close(GtkWidget *top_window)
+{
+	gchar *bold_text;
+	gchar *str;
+	const char *msg;
+
+	if (PCB->Filename == NULL) {
+		bold_text = g_strdup_printf(_("Save the changes to layout before closing?"));
+	}
+	else {
+		bold_text = g_strdup_printf(_("Save the changes to layout \"%s\" before closing?"), PCB->Filename);
+	}
+	str = g_strconcat("<big><b>", bold_text, "</b></big>", NULL);
+	g_free(bold_text);
+	msg = _("If you don't save, all your changes will be permanently lost.");
+	str = g_strconcat(str, "\n\n", msg, NULL);
+
+	switch (pcb_gtk_dlg_message(str, GTK_WINDOW(top_window))) {
+		case GTK_RESPONSE_YES:
+		{
+			if (pcb_actionl("Save", NULL)) {	/* Save failed */
+				return 0;								/* Cancel */
+			}
+			else {
+				return 1;								/* Close */
+			}
+		}
+		case GTK_RESPONSE_NO:
+		{
+			return 1;									/* Close */
+		}
+		case GTK_RESPONSE_CANCEL:
+		default:
+		{
+			return 0;									/* Cancel */
+		}
+	}
+	g_free(str);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_confirm.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include <stdarg.h>
+#include <gtk/gtk.h>
+
+int pcb_gtk_dlg_confirm_open(GtkWidget *top_window, const char *msg, va_list ap);
+int pcb_gtk_dlg_confirm_close(GtkWidget *top_window);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.c	(revision 18980)
@@ -0,0 +1,568 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "data.h"
+#include "error.h"
+#include "search.h"
+#include "draw.h"
+#include "layer.h"
+#include "pcb-printf.h"
+#include "undo.h"
+#include "dlg_drc.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "obj_pstk_draw.h"
+#include "obj_rat_draw.h"
+#include "obj_line_draw.h"
+#include "obj_arc_draw.h"
+#include "obj_poly_draw.h"
+#include "layer_vis.h"
+#include "wt_preview.h"
+
+#include "compat.h"
+#include "util_str.h"
+#include "win_place.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#define VIOLATION_PIXMAP_PIXEL_SIZE   100
+#define VIOLATION_PIXMAP_PIXEL_BORDER 5
+#define VIOLATION_PIXMAP_PCB_SIZE     PCB_MIL_TO_COORD (100)
+
+/* Remember user window resizes. */
+static gint drc_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, gpointer data)
+{
+	wplc_config_event(widget, ev, &hid_gtk_wgeo.drc_x, &hid_gtk_wgeo.drc_y, &hid_gtk_wgeo.drc_width, &hid_gtk_wgeo.drc_height);
+	return FALSE;
+}
+
+static void drc_close_cb(GtkButton *button, gpointer data)
+{
+	pcb_gtk_drcwin_t *p = data;
+
+	gtk_widget_hide(p->drc_window);
+}
+
+static void destroy_widget(GtkWidget * widget, gpointer data)
+{
+	gtk_widget_destroy(widget);
+}
+
+static void drc_refresh_cb(GtkButton *button, gpointer data)
+{
+	pcb_gtk_drcwin_t *p = data;
+
+	p->num_violations = 0;
+	gtk_container_foreach(GTK_CONTAINER(p->drc_vbox), destroy_widget, NULL);
+	pcb_actionl("DRC", NULL);
+}
+
+static void drc_destroy_cb(GtkWidget * widget, gpointer data)
+{
+	pcb_gtk_drcwin_t *p = data;
+
+	p->drc_window = NULL;
+}
+
+static void unset_found_flags(int AndDraw)
+{
+	int flag = PCB_FLAG_FOUND;
+	int change = 0;
+
+#warning subc TODO: use data.h for this
+#if 0
+	PCB_VIA_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, via)) {
+			pcb_undo_add_obj_to_flag(via);
+			PCB_FLAG_CLEAR(flag, via);
+			pcb_via_invalidate_draw(via);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+	PCB_ELEMENT_LOOP(PCB->Data);
+	{
+		PCB_PIN_LOOP(element);
+		{
+			if (PCB_FLAG_TEST(flag, pin)) {
+				pcb_undo_add_obj_to_flag(pin);
+				PCB_FLAG_CLEAR(flag, pin);
+				pcb_pin_invalidate_draw(pin);
+				change = pcb_true;
+			}
+		}
+		PCB_END_LOOP;
+		PCB_PAD_LOOP(element);
+		{
+			if (PCB_FLAG_TEST(flag, pad)) {
+				pcb_undo_add_obj_to_flag(pad);
+				PCB_FLAG_CLEAR(flag, pad);
+				pcb_pad_invalidate_draw(pad);
+				change = pcb_true;
+			}
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+#endif
+	PCB_RAT_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, line)) {
+			pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(flag, line);
+			pcb_rat_invalidate_draw(line);
+			change = pcb_true;
+		}
+	}
+	PCB_END_LOOP;
+	PCB_LINE_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, line)) {
+			pcb_undo_add_obj_to_flag(line);
+			PCB_FLAG_CLEAR(flag, line);
+			pcb_line_invalidate_draw(layer, line);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_ARC_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, arc)) {
+			pcb_undo_add_obj_to_flag(arc);
+			PCB_FLAG_CLEAR(flag, arc);
+			pcb_arc_invalidate_draw(layer, arc);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	PCB_POLY_COPPER_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(flag, polygon)) {
+			pcb_undo_add_obj_to_flag(polygon);
+			PCB_FLAG_CLEAR(flag, polygon);
+			pcb_poly_invalidate_draw(layer, polygon);
+			change = pcb_true;
+		}
+	}
+	PCB_ENDALL_LOOP;
+	if (change) {
+		pcb_board_set_changed_flag(pcb_true);
+		if (AndDraw) {
+			pcb_undo_inc_serial();
+			pcb_draw();
+		}
+	}
+}
+
+static void unselect_widget(GtkWidget * widget, gpointer data)
+{
+	gtk_widget_set_state(widget, GTK_STATE_NORMAL);
+}
+
+void row_clicked_cb(GtkWidget * widget, GdkEvent * event, GhidDrcViolation * violation)
+{
+	int i;
+	GtkWidget *parent;
+
+	if (violation == NULL)
+		return;
+
+	/* Marks DRC error violation as selected line. De-select previous line. */
+	parent = gtk_widget_get_parent(widget);
+	gtk_container_foreach(GTK_CONTAINER(parent), unselect_widget, NULL);
+	gtk_widget_set_state(widget, GTK_STATE_SELECTED);
+	gtk_widget_queue_draw(parent);
+
+	if (event->type == GDK_2BUTTON_PRESS) {
+		unset_found_flags(pcb_false);
+
+		/* Flag the objects listed against this DRC violation */
+		for (i = 0; i < violation->object_count; i++) {
+			int object_id = violation->object_id_list[i];
+			int object_type = violation->object_type_list[i];
+			int found_type;
+			void *ptr1, *ptr2, *ptr3;
+
+			found_type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, object_id, object_type);
+			if (found_type == PCB_OBJ_VOID) {
+				pcb_message(PCB_MSG_WARNING, _("Object ID %i identified during DRC was not found. Stale DRC window?\n"), object_id);
+				continue;
+			}
+			pcb_undo_add_obj_to_flag(ptr2);
+			PCB_FLAG_SET(PCB_FLAG_FOUND, (pcb_any_obj_t *) ptr2);
+			switch (violation->object_type_list[i]) {
+			case PCB_OBJ_LINE:
+			case PCB_OBJ_ARC:
+			case PCB_OBJ_POLY:
+				pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true);
+			}
+			pcb_draw_obj((pcb_any_obj_t *)ptr2);
+		}
+		pcb_board_set_changed_flag(pcb_true);
+		pcb_undo_inc_serial();
+		pcb_draw();
+
+		pcb_center_display(violation->x_coord, violation->y_coord);
+	}
+}
+
+
+enum {
+	PROP_TITLE = 1,
+	PROP_EXPLANATION,
+	PROP_X_COORD,
+	PROP_Y_COORD,
+	PROP_ANGLE,
+	PROP_HAVE_MEASURED,
+	PROP_MEASURED_VALUE,
+	PROP_REQUIRED_VALUE,
+	PROP_OBJECT_LIST,
+};
+
+
+static GObjectClass *ghid_drc_violation_parent_class = NULL;
+
+
+/* Just before the GhidDrcViolation GObject is finalized, free our
+   allocated data, and then chain up to the parent's finalize handler. */
+static void ghid_drc_violation_finalize(GObject * object)
+{
+	GhidDrcViolation *violation = GHID_DRC_VIOLATION(object);
+
+	g_free(violation->title);
+	g_free(violation->explanation);
+	g_free(violation->object_id_list);
+	g_free(violation->object_type_list);
+
+	G_OBJECT_CLASS(ghid_drc_violation_parent_class)->finalize(object);
+}
+
+typedef struct object_list {
+	int count;
+	long int *id_list;
+	int *type_list;
+} object_list;
+
+static void ghid_drc_violation_set_property(GObject * object, guint property_id, const GValue * value, GParamSpec * pspec)
+{
+	GhidDrcViolation *violation = GHID_DRC_VIOLATION(object);
+	object_list *obj_list;
+
+	switch (property_id) {
+	case PROP_TITLE:
+		g_free(violation->title);
+		violation->title = g_value_dup_string(value);
+		break;
+	case PROP_EXPLANATION:
+		g_free(violation->explanation);
+		violation->explanation = g_value_dup_string(value);
+		break;
+	case PROP_X_COORD:
+		violation->x_coord = g_value_get_int(value);
+		break;
+	case PROP_Y_COORD:
+		violation->y_coord = g_value_get_int(value);
+		break;
+	case PROP_ANGLE:
+		violation->angle = g_value_get_double(value);
+		break;
+	case PROP_HAVE_MEASURED:
+		violation->have_measured = g_value_get_boolean(value);
+		break;
+	case PROP_MEASURED_VALUE:
+		violation->measured_value = g_value_get_int(value);
+		break;
+	case PROP_REQUIRED_VALUE:
+		violation->required_value = g_value_get_int(value);
+		break;
+	case PROP_OBJECT_LIST:
+		/* Copy the passed data to make new lists */
+		g_free(violation->object_id_list);
+		g_free(violation->object_type_list);
+		obj_list = (object_list *) g_value_get_pointer(value);
+		violation->object_count = obj_list->count;
+		violation->object_id_list = g_new(long int, obj_list->count);
+		violation->object_type_list = g_new(int, obj_list->count);
+		memcpy(violation->object_id_list, obj_list->id_list, sizeof(long int) * obj_list->count);
+		memcpy(violation->object_type_list, obj_list->type_list, sizeof(int) * obj_list->count);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+		return;
+	}
+}
+
+static void ghid_drc_violation_get_property(GObject * object, guint property_id, GValue * value, GParamSpec * pspec)
+{
+	switch (property_id) {
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+	}
+
+}
+
+static void ghid_drc_violation_class_init(GhidViolationRendererClass * klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+
+	gobject_class->finalize = ghid_drc_violation_finalize;
+	gobject_class->set_property = ghid_drc_violation_set_property;
+	gobject_class->get_property = ghid_drc_violation_get_property;
+
+	ghid_drc_violation_parent_class = (GObjectClass *) g_type_class_peek_parent(klass);
+
+	g_object_class_install_property(gobject_class, PROP_TITLE, g_param_spec_string("title", "", "", "", G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_EXPLANATION,
+																	g_param_spec_string("explanation", "", "", "", G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_X_COORD,
+																	g_param_spec_int("x-coord", "", "", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_Y_COORD,
+																	g_param_spec_int("y-coord", "", "", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_ANGLE,
+																	g_param_spec_double("angle", "", "", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_HAVE_MEASURED,
+																	g_param_spec_boolean("have-measured", "", "", 0, G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_MEASURED_VALUE,
+																	g_param_spec_int("measured-value", "", "", G_MININT, G_MAXINT, 0., G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_REQUIRED_VALUE,
+																	g_param_spec_int("required-value", "", "", G_MININT, G_MAXINT, 0., G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_OBJECT_LIST,
+																	g_param_spec_pointer("object-list", "", "", G_PARAM_WRITABLE));
+}
+
+/* Upon first call, register the GhidViolationRenderer in the GType system
+ * and cache. Subsequently return the cached value. */
+GType ghid_drc_violation_get_type()
+{
+	static GType ghid_drc_violation_type = 0;
+
+	if (!ghid_drc_violation_type) {
+		static const GTypeInfo ghid_drc_violation_info = {
+			sizeof(GhidDrcViolationClass),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) ghid_drc_violation_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(GhidDrcViolation),
+			0,												/* n_preallocs */
+			NULL,											/* instance_init */
+		};
+
+		ghid_drc_violation_type =
+			g_type_register_static(G_TYPE_OBJECT, "GhidDrcViolation", &ghid_drc_violation_info, (GTypeFlags) 0);
+	}
+
+	return ghid_drc_violation_type;
+}
+
+/* API */
+
+GhidDrcViolation *ghid_drc_violation_new(pcb_drc_violation_t * violation)
+{
+	object_list obj_list;
+
+	obj_list.count = violation->object_count;
+	obj_list.id_list = violation->object_id_list;
+	obj_list.type_list = violation->object_type_list;
+
+	return (GhidDrcViolation *) g_object_new(GHID_TYPE_DRC_VIOLATION,
+																					 "title", violation->title,
+																					 "explanation", violation->explanation,
+																					 "x-coord", violation->x,
+																					 "y-coord", violation->y,
+																					 "angle", violation->angle,
+																					 "have-measured", violation->have_measured,
+																					 "measured-value", violation->measured_value,
+																					 "required-value", violation->required_value,
+																					 "object-list", &obj_list, NULL);
+}
+
+/* Returns the DRC text string using markup feature. Should be freed with free() */
+static char *get_drc_violation_markup(GhidDrcViolation * violation)
+{
+	char *markup;
+
+	if (violation->have_measured) {
+		markup = pcb_strdup_printf("%m+<b>%s (%$mS)</b>\n"
+															 "<span size='1024'> </span>\n"
+															 "<small>"
+															 "<i>%s</i>\n"
+															 "<span size='5120'> </span>\n"
+															 "Required: %$mS"
+															 "</small>",
+															 conf_core.editor.grid_unit->allow,
+															 violation->title, violation->measured_value, violation->explanation, violation->required_value);
+	}
+	else {
+		markup = pcb_strdup_printf("%m+<b>%s</b>\n"
+															 "<span size='1024'> </span>\n"
+															 "<small>"
+															 "<i>%s</i>\n"
+															 "<span size='5120'> </span>\n"
+															 "Required: %$mS"
+															 "</small>",
+															 conf_core.editor.grid_unit->allow,
+															 violation->title, violation->explanation, violation->required_value);
+	}
+
+	return markup;
+}
+
+void ghid_drc_window_show(pcb_gtk_drcwin_t *drcwin, gboolean raise)
+{
+	GtkWidget *vbox, *hbox, *button, *scrolled_window, *label;
+	GtkWidget *drc_window;
+
+	if (drcwin->drc_window) {
+		if (raise)
+			gtk_window_present(GTK_WINDOW(drcwin->drc_window));
+		return;
+	}
+
+	drc_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	drcwin->drc_window = drc_window;
+	g_signal_connect(G_OBJECT(drc_window), "destroy", G_CALLBACK(drc_destroy_cb), drcwin);
+	g_signal_connect(G_OBJECT(drc_window), "configure_event", G_CALLBACK(drc_window_configure_event_cb), NULL);
+	gtk_window_set_title(GTK_WINDOW(drc_window), _("pcb-rnd DRC"));
+	gtk_window_set_role(GTK_WINDOW(drc_window), "PCB_DRC");
+	gtk_window_set_default_size(GTK_WINDOW(drc_window), hid_gtk_wgeo.drc_width, hid_gtk_wgeo.drc_height);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(drc_window), vbox);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+	gtk_box_set_spacing(GTK_BOX(vbox), 6);
+
+	/* V/Hbox mechanism */
+	hbox = gtkc_hbox_new(FALSE, 0);
+	label = gtk_label_new("No.   Violation details");
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), gtkc_hbox_new(FALSE, 0), TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+	gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE /* EXPAND */ , TRUE /* FILL */ , 0 /* PADDING */ );
+
+	drcwin->drc_vbox = gtkc_vbox_new(FALSE, 0);
+
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtkc_scrolled_window_add_with_viewport(scrolled_window, drcwin->drc_vbox);
+
+	/* Dialog buttons */
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	gtk_box_set_spacing(GTK_BOX(hbox), 6);
+
+	button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(drc_refresh_cb), drcwin);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(drc_close_cb), drcwin);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	wplc_place(WPLC_DRC, drc_window);
+
+	gtk_widget_realize(drc_window);
+	gtk_widget_show_all(drc_window);
+}
+
+void ghid_drc_window_append_violation(pcb_gtk_drcwin_t *drcwin, pcb_gtk_common_t *common, pcb_drc_violation_t * violation)
+{
+	GhidDrcViolation *violation_obj;
+	GtkWidget *hbox, *label;
+	GtkWidget *event_box;
+	char number[8];								/* if there is more than a million DRC errors ... change this ! */
+	char *markup;
+	GtkWidget *preview;
+	int preview_size = VIOLATION_PIXMAP_PIXEL_SIZE - 2 * VIOLATION_PIXMAP_PIXEL_BORDER;
+
+	/* Ensure the required structures are setup */
+	ghid_drc_window_show(drcwin, FALSE);
+
+	drcwin->num_violations += 1;
+
+	violation_obj = ghid_drc_violation_new(violation);
+
+	/* Pack texts and preview in an horizontal box (within an event box) */
+	hbox = gtkc_hbox_new(FALSE, 0);
+	event_box = gtk_event_box_new();
+	gtk_container_add(GTK_CONTAINER(event_box), hbox);
+	g_signal_connect(event_box, "button-press-event", G_CALLBACK(row_clicked_cb), violation_obj);
+	gtk_box_pack_start(GTK_BOX(drcwin->drc_vbox), event_box, TRUE, TRUE, VIOLATION_PIXMAP_PIXEL_BORDER);
+
+	/*FIXME: Do we need to keep the DRC number for this violation ? What for ? */
+	pcb_sprintf(number, " %d ", drcwin->num_violations);
+	label = gtk_label_new(number);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	label = gtk_label_new(NULL);
+	markup = get_drc_violation_markup(violation_obj);
+	gtk_label_set_markup(GTK_LABEL(label), markup);
+	free(markup);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), gtkc_hbox_new(FALSE, 0), TRUE, TRUE, 0);
+
+	preview = pcb_gtk_preview_board_new(common, common->init_drawing_widget, common->preview_expose);
+	gtk_widget_set_size_request(preview, preview_size, preview_size);
+	gtk_widget_set_events(preview, GDK_EXPOSURE_MASK);
+	pcb_gtk_preview_board_zoomto(PCB_GTK_PREVIEW(preview),
+															 violation_obj->x_coord - VIOLATION_PIXMAP_PCB_SIZE,
+															 violation_obj->y_coord - VIOLATION_PIXMAP_PCB_SIZE,
+															 violation_obj->x_coord + VIOLATION_PIXMAP_PCB_SIZE,
+															 violation_obj->y_coord + VIOLATION_PIXMAP_PCB_SIZE, preview_size, preview_size);
+	gtk_box_pack_start(GTK_BOX(hbox), preview, FALSE, FALSE, VIOLATION_PIXMAP_PIXEL_BORDER);
+
+	gtk_widget_show_all(event_box);
+}
+
+void ghid_drc_window_reset_message(pcb_gtk_drcwin_t *drcwin)
+{
+	drcwin->num_violations = 0;
+	gtk_container_foreach(GTK_CONTAINER(drcwin->drc_vbox), destroy_widget, NULL);
+}
+
+int ghid_drc_window_throw_dialog(pcb_gtk_drcwin_t *drcwin)
+{
+	ghid_drc_window_show(drcwin, TRUE);
+	return 1;
+}
+
+void pcb_gtk_drcwin_init(pcb_gtk_drcwin_t *drcwin)
+{
+	drcwin->drc_window = NULL;
+	drcwin->drc_vbox = NULL;
+	drcwin->num_violations = 0;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_drc.h	(revision 18980)
@@ -0,0 +1,107 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_GTK_DLG_DRC_H
+#define PCB_GTK_DLG_DRC_H
+
+#include <gtk/gtk.h>
+#include "glue.h"
+
+#define GHID_TYPE_DRC_VIOLATION           (ghid_drc_violation_get_type())
+#define GHID_DRC_VIOLATION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_TYPE_DRC_VIOLATION, GhidDrcViolation))
+#define GHID_DRC_VIOLATION_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass),  GHID_TYPE_DRC_VIOLATION, GhidDrcViolationClass))
+#define GHID_IS_DRC_VIOLATION(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHID_TYPE_DRC_VIOLATION))
+#define GHID_DRC_VIOLATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),  GHID_TYPE_DRC_VIOLATION, GhidDrcViolationClass))
+
+typedef struct _GhidDrcViolationClass GhidDrcViolationClass;
+typedef struct _GhidDrcViolation GhidDrcViolation;
+
+struct _GhidDrcViolationClass {
+	GObjectClass parent_class;
+};
+
+struct _GhidDrcViolation {
+	GObject parent_instance;
+
+	char *title;
+	char *explanation;
+	pcb_coord_t x_coord;
+	pcb_coord_t y_coord;
+	pcb_angle_t angle;
+	pcb_bool have_measured;
+	pcb_coord_t measured_value;
+	pcb_coord_t required_value;
+	int object_count;
+	long int *object_id_list;
+	int *object_type_list;
+};
+
+typedef struct pcb_gtk_drcwin_s {
+	GtkWidget *drc_window;
+	GtkWidget *drc_vbox;
+	int num_violations;
+	
+} pcb_gtk_drcwin_t;
+
+GType ghid_drc_violation_get_type(void);
+
+GhidDrcViolation *ghid_drc_violation_new(pcb_drc_violation_t * violation);
+
+/*TODO: split in dlg_drc_cr.h */
+#define GHID_TYPE_VIOLATION_RENDERER           (ghid_violation_renderer_get_type())
+#define GHID_VIOLATION_RENDERER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_TYPE_VIOLATION_RENDERER, GhidViolationRenderer))
+#define GHID_VIOLATION_RENDERER_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass),  GHID_TYPE_VIOLATION_RENDERER, GhidViolationRendererClass))
+#define GHID_IS_VIOLATION_RENDERER(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHID_TYPE_VIOLATION_RENDERER))
+#define GHID_VIOLATION_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),  GHID_TYPE_VIOLATION_RENDERER, GhidViolationRendererClass))
+
+typedef struct _GhidViolationRendererClass GhidViolationRendererClass;
+typedef struct _GhidViolationRenderer GhidViolationRenderer;
+
+struct _GhidViolationRendererClass {
+	GtkCellRendererTextClass parent_class;
+};
+
+struct _GhidViolationRenderer {
+	GtkCellRendererText parent_instance;
+
+	GhidDrcViolation *violation;
+	pcb_gtk_common_t *common;
+};
+
+GType ghid_violation_renderer_get_type(void);
+
+GtkCellRenderer *ghid_violation_renderer_new(pcb_gtk_common_t *common);
+
+void pcb_gtk_drcwin_init(pcb_gtk_drcwin_t *drcwin);
+void ghid_drc_window_show(pcb_gtk_drcwin_t *drcwin, gboolean raise);
+void ghid_drc_window_reset_message(pcb_gtk_drcwin_t *drcwin);
+void ghid_drc_window_append_violation(pcb_gtk_drcwin_t *drcwin, pcb_gtk_common_t *common, pcb_drc_violation_t * violation);
+void ghid_drc_window_append_messagev(const char *fmt, va_list va);
+int ghid_drc_window_throw_dialog(pcb_gtk_drcwin_t *drcwin);
+
+#endif /* PCB_GTK_DLG_DRC_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.c	(revision 18980)
@@ -0,0 +1,456 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+
+#include "board.h"
+#include "hid.h"
+#include "compat_misc.h"
+
+#include "dlg_file_chooser.h"
+#include "compat.h"
+
+/* ---------------------------------------------- */
+/* Caller must g_free() the returned filename.*/
+gchar *ghid_dialog_file_select_open(GtkWidget *top_window, const gchar *title, gchar **path, const gchar *shortcuts)
+{
+	GtkWidget *dialog;
+	gchar *result = NULL, *folder, *seed;
+	GtkFileFilter *no_filter, *any_filter;
+
+	dialog = gtk_file_chooser_dialog_new(title,
+																			 GTK_WINDOW(top_window),
+																			 GTK_FILE_CHOOSER_ACTION_OPEN,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+	/* add a default filter for not filtering files */
+	no_filter = gtk_file_filter_new();
+	gtk_file_filter_set_name(no_filter, "all");
+	gtk_file_filter_add_pattern(no_filter, "*.*");
+	gtk_file_filter_add_pattern(no_filter, "*");
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), no_filter);
+
+	any_filter = gtk_file_filter_new();
+	gtk_file_filter_set_name(any_filter, "any known format");
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), any_filter);
+
+
+	/* in case we have a dialog for loading a footprint file */
+	if (strcmp(title, _("Load element to buffer")) == 0) {
+		/* add a filter for footprint files */
+		GtkFileFilter *fp_filter;
+		fp_filter = gtk_file_filter_new();
+		gtk_file_filter_set_name(fp_filter, "fp");
+		gtk_file_filter_add_mime_type(fp_filter, "application/x-pcb-footprint");
+		gtk_file_filter_add_pattern(fp_filter, "*.fp");
+		gtk_file_filter_add_pattern(fp_filter, "*.FP");
+		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), fp_filter);
+	}
+
+	/* in case we have a dialog for loading a layout file */
+	if ((strcmp(title, _("Load layout file")) == 0)
+			|| (strcmp(title, _("Load layout file to buffer")) == 0)) {
+		/* add a filter for layout files */
+		pcb_io_formats_t fmts;
+		int n, num_fmts = pcb_io_list(&fmts, PCB_IOT_PCB, 0, 0, PCB_IOL_EXT_BOARD);
+		for (n = 0; n < num_fmts; n++) {
+			int i;
+			char *ext;
+			GtkFileFilter *filter;
+
+			/* register each short name only once - slow O(N^2), but we don't have too many formats anyway */
+			for (i = 0; i < n; i++)
+				if (strcmp(fmts.plug[n]->default_fmt, fmts.plug[i]->default_fmt) == 0)
+					goto next_fmt;
+
+			filter = gtk_file_filter_new();
+			gtk_file_filter_set_name(filter, fmts.plug[n]->default_fmt);
+			if (fmts.plug[n]->mime_type != NULL) {
+				gtk_file_filter_add_mime_type(filter, fmts.plug[n]->mime_type);
+				gtk_file_filter_add_mime_type(any_filter, fmts.plug[n]->mime_type);
+			}
+			if (fmts.plug[n]->default_extension != NULL) {
+				char *s;
+				ext = pcb_concat("*", fmts.plug[n]->default_extension, NULL);
+				gtk_file_filter_add_pattern(filter, ext);
+				gtk_file_filter_add_pattern(any_filter, ext);
+				for (s = ext; *s != '\0'; s++)
+					*s = toupper(*s);
+				gtk_file_filter_add_pattern(filter, ext);
+				gtk_file_filter_add_pattern(any_filter, ext);
+				free(ext);
+			}
+			gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter);
+		next_fmt:;
+		}
+		pcb_io_list_free(&fmts);
+	}
+
+	/* in case we have a dialog for loading a netlist file */
+	if (strcmp(title, _("Load netlist file")) == 0) {
+		/* add a filter for netlist files */
+		GtkFileFilter *net_filter;
+		net_filter = gtk_file_filter_new();
+		gtk_file_filter_set_name(net_filter, "netlist");
+		gtk_file_filter_add_mime_type(net_filter, "application/x-pcb-netlist");
+		gtk_file_filter_add_pattern(net_filter, "*.net");
+		gtk_file_filter_add_pattern(net_filter, "*.NET");
+		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), net_filter);
+	}
+
+	if (path && *path)
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), *path);
+
+	if (shortcuts && *shortcuts) {
+		folder = g_strdup(shortcuts);
+		seed = folder;
+		while ((folder = strtok(seed, ":")) != NULL) {
+			gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), folder, NULL);
+			seed = NULL;
+		}
+		g_free(folder);
+	}
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+		result = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+		if (folder && path) {
+			pcb_gtk_g_strdup(path, folder);
+			g_free(folder);
+		}
+	}
+	gtk_widget_destroy(dialog);
+
+
+	return result;
+}
+
+
+/* Callback to change the file name in the "save as" dialog according to
+   format selection */
+typedef struct {
+	GtkWidget *dialog;
+	const char **formats, **extensions;
+} ghid_save_ctx_t;
+
+static void fmt_changed_cb(GtkWidget * combo_box, ghid_save_ctx_t * ctx)
+{
+	char *fn, *s, *bn;
+	const char *ext;
+	gint active;
+
+	if (ctx->extensions == NULL)
+		return;
+
+	active = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
+	if (active < 0)
+		return;
+
+	fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(ctx->dialog));
+	if (fn == NULL)
+		return;
+
+	/* find and truncate extension */
+	for (s = fn + strlen(fn) - 1; *s != '.'; s--) {
+		if ((s <= fn) || (*s == '/') || (*s == '\\')) {
+			g_free(fn);
+			return;
+		}
+	}
+	*s = '\0';
+
+	/* calculate basename in bn */
+	bn = strrchr(fn, '/');
+	if (bn == NULL) {
+		bn = strrchr(fn, '\\');
+		if (bn == NULL)
+			bn = fn;
+		else
+			bn++;
+	}
+	else
+		bn++;
+
+	/* fetch the desired extension */
+	ext = ctx->extensions[active];
+	if (ext == NULL)
+		ext = ".";
+
+	/* build a new file name with the right extension */
+	s = pcb_concat(bn, ext, NULL);
+	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(ctx->dialog), s);
+
+	free(s);
+	g_free(fn);
+}
+
+/* ---------------------------------------------- */
+/* Caller must g_free() the returned filename. */
+gchar *ghid_dialog_file_select_save(GtkWidget *top_window, const gchar *title, gchar **path, const gchar *file, const gchar *shortcuts, const char **formats, const char **extensions, int *format)
+{
+	GtkWidget *fmt, *tmp, *fmt_combo;
+	gchar *result = NULL, *folder, *seed;
+	ghid_save_ctx_t ctx;
+
+	ctx.formats = formats;
+	ctx.extensions = extensions;
+	ctx.dialog = gtk_file_chooser_dialog_new(title,
+																					 GTK_WINDOW(top_window),
+																					 GTK_FILE_CHOOSER_ACTION_SAVE,
+																					 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(ctx.dialog), TRUE);
+	gtk_dialog_set_default_response(GTK_DIALOG(ctx.dialog), GTK_RESPONSE_OK);
+
+	/* Create and add the file format widget */
+	if (format != NULL) {
+		const char **s;
+		fmt = gtkc_hbox_new(FALSE, 0);
+
+		tmp = gtkc_vbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(fmt), tmp, TRUE, TRUE, 0);
+
+		tmp = gtk_label_new("File format: ");
+		gtk_box_pack_start(GTK_BOX(fmt), tmp, FALSE, FALSE, 0);
+
+		fmt_combo = gtkc_combo_box_text_new();
+		gtk_box_pack_start(GTK_BOX(fmt), fmt_combo, FALSE, FALSE, 0);
+
+		for (s = formats; *s != NULL; s++)
+			gtkc_combo_box_text_append_text(fmt_combo, *s);
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX(fmt_combo), *format);
+		g_signal_connect(G_OBJECT(fmt_combo), "changed", G_CALLBACK(fmt_changed_cb), &ctx);
+
+		gtk_widget_show_all(fmt);
+		gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ctx.dialog), fmt);
+	}
+
+	if (path && *path && **path)
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(ctx.dialog), *path);
+
+	if (file && *file) {
+		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(ctx.dialog), g_path_get_basename(file));
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(ctx.dialog), g_path_get_dirname(file));
+	}
+
+	if (shortcuts && *shortcuts) {
+		folder = g_strdup(shortcuts);
+		seed = folder;
+		while ((folder = strtok(seed, ":")) != NULL) {
+			gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(ctx.dialog), folder, NULL);
+			seed = NULL;
+		}
+		g_free(folder);
+	}
+	if (gtk_dialog_run(GTK_DIALOG(ctx.dialog)) == GTK_RESPONSE_OK) {
+		result = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(ctx.dialog));
+		folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(ctx.dialog));
+		if (folder && path) {
+			pcb_gtk_g_strdup(path, folder);
+			g_free(folder);
+		}
+	}
+
+	if (format != NULL)
+		*format = gtk_combo_box_get_active(GTK_COMBO_BOX(fmt_combo));
+
+	gtk_widget_destroy(ctx.dialog);
+
+	return result;
+}
+
+
+/* ---------------------------------------------- */
+/* how many files and directories to keep for the shortcuts */
+#define NHIST 8
+typedef struct ghid_file_history_struct {
+	/*
+	 * an identifier as to which recent files pool this is.  For example
+	 * "boards", "eco", "netlists", etc.
+	 */
+	char *id;
+
+	/*
+	 * the array of files or directories
+	 */
+	char *history[NHIST];
+} ghid_file_history;
+
+static int n_recent_dirs = 0;
+static ghid_file_history *recent_dirs = NULL;
+
+/* ---------------------------------------------- */
+/* Caller must g_free() the returned filename. */
+gchar *pcb_gtk_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags)
+{
+	GtkWidget *dialog;
+	gchar *result = NULL;
+	gchar *path = NULL, *base = NULL;
+	int history_pool = -1;
+	int i;
+
+	if (history_tag && *history_tag) {
+		/*
+		 * I used a simple linear search here because the number of
+		 * entries in the array is likely to be quite small (5, maybe 10 at
+		 * the absolute most) and this function is used when pulling up
+		 * a file dialog box instead of something called over and over
+		 * again as part of moving elements or autorouting.  So, keep it
+		 * simple....
+		 */
+		history_pool = 0;
+		while (history_pool < n_recent_dirs && strcmp(recent_dirs[history_pool].id, history_tag) != 0) {
+			history_pool++;
+		}
+
+		/*
+		 * If we counted all the way to n_recent_dirs, that means we
+		 * didn't find our entry
+		 */
+		if (history_pool >= n_recent_dirs) {
+			n_recent_dirs++;
+
+			recent_dirs = (ghid_file_history *) realloc(recent_dirs, n_recent_dirs * sizeof(ghid_file_history));
+
+			if (recent_dirs == NULL) {
+				fprintf(stderr, "ghid_fileselect():  realloc failed\n");
+				exit(1);
+			}
+
+			recent_dirs[history_pool].id = pcb_strdup(history_tag);
+
+			/* Initialize the entries in our history list to all be NULL */
+			for (i = 0; i < NHIST; i++) {
+				recent_dirs[history_pool].history[i] = NULL;
+			}
+		}
+	}
+
+	if (default_file && *default_file) {
+		path = g_path_get_dirname(default_file);
+		base = g_path_get_basename(default_file);
+	}
+
+	dialog = gtk_file_chooser_dialog_new(title,
+																			 GTK_WINDOW(top_window),
+																			 (flags & HID_FILESELECT_READ) ?
+																			 GTK_FILE_CHOOSER_ACTION_OPEN :
+																			 GTK_FILE_CHOOSER_ACTION_SAVE,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+	if (path && *path) {
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), path);
+		g_free(path);
+	}
+
+	if (base && *base) {
+		/* default file is only supposed to be for writing, not reading */
+		if (!(flags & HID_FILESELECT_READ)) {
+			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), base);
+		}
+		g_free(base);
+	}
+
+	for (i = 0; i < NHIST && recent_dirs[history_pool].history[i] != NULL; i++) {
+		gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), recent_dirs[history_pool].history[i], NULL);
+	}
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+		result = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		if (result != NULL)
+			path = g_path_get_dirname(result);
+		else
+			path = NULL;
+
+		/* update the history list */
+		if (path != NULL) {
+			char *tmps, *tmps2;
+			int k = 0;
+
+			/*
+			 * Put this at the top of the list and bump everything else
+			 * down but skip any old entry of this directory
+			 *
+			 */
+			while (k < NHIST &&
+						 recent_dirs[history_pool].history[k] != NULL && strcmp(recent_dirs[history_pool].history[k], path) == 0) {
+				k++;
+			}
+			tmps = recent_dirs[history_pool].history[k];
+			recent_dirs[history_pool].history[0] = path;
+			for (i = 1; i < NHIST; i++) {
+				/* store our current entry, but skip duplicates */
+				while (i + k < NHIST &&
+							 recent_dirs[history_pool].history[i + k] != NULL &&
+							 strcmp(recent_dirs[history_pool].history[i + k], path) == 0) {
+					k++;
+				}
+
+				if (i + k < NHIST)
+					tmps2 = recent_dirs[history_pool].history[i + k];
+				else
+					tmps2 = NULL;
+
+				/* move down the one we stored last time */
+				recent_dirs[history_pool].history[i] = tmps;
+
+				/* and remember the displace entry */
+				tmps = tmps2;
+			}
+
+			/*
+			 * the last one has fallen off the end of the history list
+			 * so we need to free() it.
+			 */
+			if (tmps) {
+				free(tmps);
+			}
+		}
+
+#ifdef DEBUG
+		printf("\n\n-----\n\n");
+		for (i = 0; i < NHIST; i++) {
+			printf("After update recent_dirs[%d].history[%d] = \"%s\"\n",
+						 history_pool, i, recent_dirs[history_pool].history[i] != NULL ? recent_dirs[history_pool].history[i] : "NULL");
+		}
+#endif
+
+	}
+	gtk_widget_destroy(dialog);
+
+
+	return result;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_file_chooser.h	(revision 18980)
@@ -0,0 +1,12 @@
+#include <gtk/gtk.h>
+
+#include "compat_nls.h"
+#include "plug_io.h"
+
+#include "util_str.h"
+
+gchar *ghid_dialog_file_select_open(GtkWidget *top_window, const gchar *title, gchar **path, const gchar *shortcuts);
+
+gchar *ghid_dialog_file_select_save(GtkWidget *top_window, const gchar *title, gchar **path, const gchar *file, const gchar *shortcuts, const char **formats, const char **extensions, int *format);
+
+gchar *pcb_gtk_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.c	(revision 18980)
@@ -0,0 +1,122 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "dlg_fontsel.h"
+#include "compat.h"
+#include "bu_box.h"
+#include "layer.h"
+#include "wt_preview.h"
+#include "stub_draw.h"
+
+typedef struct {
+	GtkDialog *dialog;
+	pcb_text_t *txt, *old_txt;
+	pcb_layer_t *layer, *old_layer;
+	int old_type;
+} pcb_gtk_dlg_fontsel_t;
+
+static int dlg_fontsel_global_latch = 0;
+
+static void fontsel_close_cb(gpointer ctx_)
+{
+	pcb_gtk_dlg_fontsel_t *ctx = ctx_;
+	gtk_widget_destroy(GTK_WIDGET(ctx->dialog));
+	if (ctx->txt == NULL)
+		dlg_fontsel_global_latch = 0;
+	*pcb_stub_draw_fontsel_text_obj = ctx->old_txt;
+	*pcb_stub_draw_fontsel_layer_obj = ctx->old_layer;
+	*pcb_stub_draw_fontsel_text_type = ctx->old_type;
+	free(ctx);
+}
+
+
+void pcb_gtk_dlg_fontsel(pcb_gtk_common_t *com, pcb_layer_t *txtly, pcb_text_t *txt, int type, int modal)
+{
+	GtkWidget *w;
+	GtkDialog *dialog;
+	GtkWidget *content_area, *prv;
+	GtkWidget *vbox;
+	pcb_gtk_dlg_fontsel_t *ctx;
+
+	if (txt == NULL) {
+		if (dlg_fontsel_global_latch) /* do not open the global font selector twice */
+			return;
+		dlg_fontsel_global_latch = 1;
+	}
+	else {
+		if (type != PCB_OBJ_TEXT)
+			return;
+		if (!modal) {
+			pcb_message(PCB_MSG_ERROR, "text-targeted fontsel dialogs must be modal because of the global-var API on the txt object.\n");
+			return;
+		}
+	}
+
+
+	ctx = malloc(sizeof(pcb_gtk_dlg_fontsel_t));
+	ctx->txt = txt;
+
+	ctx->old_txt = *pcb_stub_draw_fontsel_text_obj;
+	ctx->old_layer = *pcb_stub_draw_fontsel_layer_obj;
+	ctx->old_type = *pcb_stub_draw_fontsel_text_type;
+	*pcb_stub_draw_fontsel_text_obj = txt;
+	*pcb_stub_draw_fontsel_layer_obj = txtly;
+	*pcb_stub_draw_fontsel_text_type = type;
+
+	w = gtk_dialog_new_with_buttons("PCB - font selector",
+																	GTK_WINDOW(com->top_window),
+																	GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_NONE, NULL);
+	ctx->dialog = dialog = GTK_DIALOG(w);
+	gtk_dialog_set_default_response(dialog, GTK_RESPONSE_CLOSE);
+
+	gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
+
+	g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(fontsel_close_cb), ctx);
+	gtk_window_set_role(GTK_WINDOW(w), "PCB_Dialog");
+
+	content_area = gtk_dialog_get_content_area(dialog);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
+
+	/* create the preview render */
+	{
+		pcb_gtk_preview_t *p;
+		prv = pcb_gtk_preview_dialog_new(com, com->init_drawing_widget, com->preview_expose, pcb_stub_draw_fontsel);
+		gtk_box_pack_start(GTK_BOX(vbox), prv, TRUE, TRUE, 0);
+		p = (pcb_gtk_preview_t *) prv;
+		p->mouse_cb = pcb_stub_draw_fontsel_mouse_ev;
+/*		p->overlay_draw_cb = pcb_stub_draw_csect_overlay;*/
+		gtk_widget_set_size_request(prv, 200, 200);
+	}
+
+
+	gtk_widget_show_all(w);
+	gtk_window_set_modal(GTK_WINDOW(dialog), modal);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_fontsel.h	(revision 18980)
@@ -0,0 +1,8 @@
+#include <gtk/gtk.h>
+#include "global_typedefs.h"
+#include "hid.h"
+#include "glue.h"
+
+/* type is PCB_OBJ_TEXT or PCB_OBJ_ELEMENT_NAME */
+void pcb_gtk_dlg_fontsel(pcb_gtk_common_t *com, pcb_layer_t *txtly, pcb_text_t *txt, int type, int modal);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.c	(revision 18980)
@@ -0,0 +1,81 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+
+#include "dlg_input.h"
+#include "compat.h"
+
+gchar *pcb_gtk_dlg_input(const char *prompt, const char *initial, GtkWindow * parent)
+{
+	GtkWidget *dialog;
+	GtkWidget *content_area;
+	GtkWidget *vbox, *label, *entry;
+	gchar *string;
+	gboolean response;
+	/*GHidPort *out = &ghid_port; */
+
+	dialog = gtk_dialog_new_with_buttons("PCB User Input",
+																			 /*GTK_WINDOW(out->top_window), */
+																			 parent,
+																			 GTK_DIALOG_MODAL,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+	/* Change to gtkc_vbox_new here */
+	vbox = gtkc_vbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+	label = gtk_label_new("");
+	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(label), prompt ? prompt : "Enter something");
+
+	entry = gtk_entry_new();
+	if (initial)
+		gtk_entry_set_text(GTK_ENTRY(entry), initial);
+
+	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_container_add(GTK_CONTAINER(content_area), vbox);
+	gtk_widget_show_all(dialog);
+
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (response != GTK_RESPONSE_OK)
+		string = NULL;
+	else
+		string = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+
+	gtk_widget_destroy(dialog);
+	return string;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_input.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <gtk/gtk.h>
+
+/* Query the user for a string. Fill in initial on start.
+   Returns a string on which g_free() should be ran, or NULL on cancel. */
+gchar *pcb_gtk_dlg_input(const char *prompt, const char *initial, GtkWindow *parent);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.c	(revision 18980)
@@ -0,0 +1,954 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file originally from the PCB Gtk port by Bill Wilson. It has
+ * since been combined with modified code from the gEDA project:
+ *
+ * gschem/src/ghid_library_window.c, checked out by Peter Clifton
+ * from gEDA/gaf commit 72581a91da08c9d69593c24756144fc18940992e
+ * on 3rd Jan, 2008.
+ *
+ * gEDA - GPL Electronic Design Automation
+ * gschem - gEDA Schematic Capture
+ * Copyright (C) 1998-2007 Ales Hvezda
+ * Copyright (C) 1998-2007 gEDA Contributors (see ChangeLog for details)
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+ */
+
+#include "config.h"
+#include <ctype.h>
+#include <assert.h>
+#include "dlg_library.h"
+#include "conf_core.h"
+
+#include "buffer.h"
+#include "data.h"
+#include "plug_footprint.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+#include "actions.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#include "bu_box.h"
+#include "compat.h"
+#include "wt_preview.h"
+#include "win_place.h"
+#include "tool.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "dlg_library_param.h"
+
+/* how often should the parametric footprint redrawn while the parameters are
+   changing - in millisec */
+#define PARAM_REFRESH_RATE_MS 500
+
+static GtkWidget *library_window;
+
+/* Lag between user modifications in the filter entry and the
+   actual evaluation/GUI update in ms. Helps reducing the frequency of
+   updates while the user is typing. */
+#define LIBRARY_FILTER_INTERVAL 200
+
+/* GtkWidget "configure_event" signal emitted when the size, position or stacking of the widget's window has changed. */
+static gint library_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, gpointer data)
+{
+	wplc_config_event(widget, ev, &hid_gtk_wgeo.library_x, &hid_gtk_wgeo.library_y, &hid_gtk_wgeo.library_width,
+										&hid_gtk_wgeo.library_height);
+	return FALSE;
+}
+
+enum {
+	MENU_NAME_COLUMN,  /* Text to display in the tree */
+	MENU_ENTRY_COLUMN, /* Pointer to the library_t */
+	N_MENU_COLUMNS
+};
+
+static void library_window_callback_response(GtkDialog * dialog, gint response_id, gpointer user_data)
+{
+	switch (response_id) {
+	case GTK_RESPONSE_CLOSE:
+	case GTK_RESPONSE_DELETE_EVENT:
+		gtk_widget_destroy(GTK_WIDGET(library_window));
+		library_window = NULL;
+		break;
+
+	default:
+		/* Do nothing, in case there's another handler function which
+		   can handle the response ID received. */
+		break;
+	}
+}
+
+static GObjectClass *library_window_parent_class = NULL;
+
+/* Return whether a treeview item should be visible.
+   This is the function applies the filter on footprint names. */
+static gboolean lib_model_filter_visible_func(GtkTreeModel * model, GtkTreeIter * iter, gpointer data)
+{
+	pcb_gtk_library_t *lib_window = (pcb_gtk_library_t *) data;
+	const gchar *compname;
+	gchar *compname_upper, *text_upper, *pattern;
+	const gchar *text_;
+	char text[1024];
+	gboolean ret;
+	char *p, *tags;
+	int len, is_para = 0;
+
+	g_assert(GHID_IS_LIBRARY_WINDOW(data));
+
+	text_ = gtk_entry_get_text(lib_window->entry_filter);
+	if (strcmp(text_, "") == 0) {
+		return TRUE;
+	}
+
+/* TODO: do these only once.... */
+	p = strchr(text_, '(');
+	if (p != NULL) {
+		len = p - text_;
+		is_para = 1;
+	}
+	else
+		len = sizeof(text) - 1;
+
+	strncpy(text, text_, len);
+	text[len] = '\0';
+
+	/* apply tags on non-parametrics */
+	if (!is_para) {
+		tags = strchr(text, ' ');
+		if (tags != NULL) {
+			*tags = '\0';
+			tags++;
+			while (isspace(*tags))
+				tags++;
+			if (*tags == '\0')
+				tags = NULL;
+		}
+	}
+	else
+		tags = NULL;
+
+	/* If this is a source, only display it if it has children that
+	 * match */
+	if (gtk_tree_model_iter_has_child(model, iter)) {
+		GtkTreeIter iter2;
+
+		gtk_tree_model_iter_children(model, &iter2, iter);
+		ret = FALSE;
+		do {
+			if (lib_model_filter_visible_func(model, &iter2, data)) {
+				ret = TRUE;
+				break;
+			}
+		}
+		while (gtk_tree_model_iter_next(model, &iter2));
+	}
+	else {
+		gtk_tree_model_get(model, iter, MENU_NAME_COLUMN, &compname, -1);
+		/* Do a case insensitive comparison, converting the strings
+		   to uppercase */
+		compname_upper = g_ascii_strup(compname, -1);
+		text_upper = g_ascii_strup(text, -1);
+		if (is_para)
+			pattern = g_strconcat("*", text_upper, "(*", NULL);
+		else
+			pattern = g_strconcat("*", text_upper, "*", NULL);
+
+		ret = g_pattern_match_simple(pattern, compname_upper);
+
+		if ((tags != NULL) && ret) {
+			pcb_fplibrary_t *entry = NULL;
+			gtk_tree_model_get(model, iter, MENU_ENTRY_COLUMN, &entry, -1);
+			if ((entry != NULL) && (entry->type == LIB_FOOTPRINT) && (entry->data.fp.tags != NULL)) {
+				char *next, *tag;
+				int found;
+				void **t;
+				const void *need;
+
+				for (tag = tags; tag != NULL; tag = next) {
+					next = strpbrk(tag, " \t\r\n");
+					if (next != NULL) {
+						*next = '\0';
+						next++;
+						while (isspace(*next))
+							next++;
+					}
+					need = pcb_fp_tag(tag, 0);
+/*					pcb_trace("TAG: '%s' %p\n", tag, (void *) need);*/
+					if (need == NULL) {
+						ret = FALSE;
+						break;
+					}
+					found = 0;
+					for (t = entry->data.fp.tags; *t != NULL; t++) {
+						if (*t == need) {
+							found = 1;
+							break;
+						}
+					}
+					if (!found) {
+						ret = FALSE;
+						break;
+					}
+				}
+			}
+			else
+				ret = FALSE;
+		}
+
+		g_free(compname_upper);
+		g_free(text_upper);
+		g_free(pattern);
+	}
+
+	return ret;
+}
+
+static void library_window_preview_refresh(pcb_gtk_library_t * library_window, const char *name, pcb_fplibrary_t * entry)
+{
+	GString *pt;
+	char *fullp;
+
+	/*  -1 flags this is an element file part and the file path is in
+	   entry->AllocateMemory.
+	 */
+	if (name == NULL) {
+		if ((entry == NULL) || (entry->type != LIB_FOOTPRINT))
+			return;
+		fullp = entry->data.fp.loc_info;
+	}
+	pcb_tool_select_by_id(PCB_MODE_ARROW);
+	if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, name == NULL ? fullp : name, NULL))
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+
+	/* update the preview with new symbol data */
+	if (PCB_PASTEBUFFER->Data != NULL) {
+		if (pcb_subclist_length(&PCB_PASTEBUFFER->Data->subc) != 0)
+			g_object_set(library_window->preview, "element-data", pcb_subclist_first(&PCB_PASTEBUFFER->Data->subc), NULL);
+		else
+			g_object_set(library_window->preview, "element-data", NULL, NULL);
+	}
+	else
+		g_object_set(library_window->preview, "element-data", NULL, NULL);
+
+	/* update the text */
+	pt = g_string_new("Tags:");
+	if ((entry != NULL) && (entry->type == LIB_FOOTPRINT) && (entry->data.fp.tags != NULL)) {
+		void **t;
+
+		for (t = entry->data.fp.tags; *t != NULL; t++) {
+			const char *name = pcb_fp_tagname(*t);
+			if (name != NULL) {
+				g_string_append(pt, "\n  ");
+				g_string_append(pt, name);
+			}
+		}
+		g_string_append(pt, "\nLocation:\n ");
+		g_string_append(pt, entry->data.fp.loc_info);
+		g_string_append(pt, "\n");
+	}
+	gtk_label_set_text(GTK_LABEL(library_window->preview_text), g_string_free(pt, FALSE));
+}
+
+/* Update the preview and filter text from the parametric attribute dialog */
+static gboolean lib_param_chg_delayed(pcb_gtk_library_param_cb_ctx_t *ctx)
+{
+	char *cmd = pcb_gtk_library_param_snapshot(ctx);
+
+	gtk_entry_set_text(ctx->library_window->entry_filter, cmd);
+	library_window_preview_refresh(ctx->library_window, cmd, ctx->entry);
+	free(cmd);
+	ctx->library_window->param_timer = 0;
+	return FALSE; /* Turns timer off */
+}
+
+static void lib_param_del_timer(pcb_gtk_library_t *library_window)
+{
+	if (library_window->param_timer != 0)
+		g_source_remove(library_window->param_timer);
+	library_window->param_timer = 0;
+}
+
+static void lib_param_chg(pcb_gtk_library_param_cb_ctx_t *ctx)
+{
+	if (ctx->library_window->param_timer == 0)
+		ctx->library_window->param_timer = g_timeout_add(PARAM_REFRESH_RATE_MS, (GSourceFunc)lib_param_chg_delayed, ctx);
+}
+
+/* Called when a tree view row is selected. If the selection is a footprint,
+   update the preview. */
+static void library_window_callback_tree_selection_changed(GtkTreeSelection * selection, gpointer user_data)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	pcb_gtk_library_t *library_window = (pcb_gtk_library_t *) user_data;
+	char *name = NULL;
+	pcb_fplibrary_t *entry = NULL;
+	int norefresh = 0;
+
+	lib_param_del_timer(library_window);
+
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+		return;
+
+	gtk_tree_model_get(model, &iter, MENU_ENTRY_COLUMN, &entry, -1);
+
+	if (entry == NULL)
+		return;
+
+	if ((entry->type == LIB_FOOTPRINT) && (entry->data.fp.type == PCB_FP_PARAMETRIC)) {
+		const char *in_para = gtk_entry_get_text(library_window->entry_filter);
+		char *orig = pcb_strdup(in_para);
+		name = pcb_gtk_library_param_ui(library_window, entry, in_para, lib_param_chg);
+		lib_param_del_timer(library_window);
+		if (name == NULL) {
+			gtk_entry_set_text(library_window->entry_filter, orig);
+			if (library_window->filter_timeout != 0)
+				g_source_remove(library_window->filter_timeout); /* block the above edit from collapsing the tree */
+			library_window->filter_timeout = 0;
+			gtk_tree_model_filter_refilter((GtkTreeModelFilter *) model);
+
+			/* cancel means we should skip refreshing the preview with the invalid
+			   text we may have in the filter; also dismiss the preview and clear
+			   the buffer: we may have a valid parametric footprint output in there
+			   that happened before the cancel */
+			norefresh = 1;
+			g_object_set(library_window->preview, "element-data", NULL, NULL);
+			pcb_actionl("PasteBuffer", "clear", NULL);
+		}
+		else
+			gtk_entry_set_text(library_window->entry_filter, name);
+		free(orig);
+	}
+	if (!norefresh)
+		library_window_preview_refresh(library_window, name, entry);
+	free(name);
+}
+
+static void library_window_callback_edit_button_clicked(GtkButton *button, void *library_window)
+{
+	pcb_gtk_library_t *lw = library_window;
+	library_window_callback_tree_selection_changed(lw->selection, lw);
+}
+
+
+/* Requests re-evaluation of the filter. The timeout this callback is
+   attached to is removed after the function. */
+static gboolean library_window_filter_timeout(gpointer data)
+{
+	pcb_gtk_library_t *library_window = GHID_LIBRARY_WINDOW(data);
+	GtkTreeModel *model;
+
+	/* resets the source id in library_window */
+	library_window->filter_timeout = 0;
+
+	model = gtk_tree_view_get_model(library_window->libtreeview);
+
+	if (model != NULL) {
+		const gchar *text = gtk_entry_get_text(library_window->entry_filter);
+		gtk_tree_model_filter_refilter((GtkTreeModelFilter *) model);
+		if (strcmp(text, "") != 0) {
+			/* filter text not-empty */
+			gtk_tree_view_expand_all(library_window->libtreeview);
+
+			/* parametric footprints need to be refreshed on edit */
+			if (strchr(text, ')') != NULL)
+				library_window_preview_refresh(library_window, text, NULL);
+
+		}
+		else {
+			/* filter text is empty, collapse expanded tree */
+			gtk_tree_view_collapse_all(library_window->libtreeview);
+		}
+	}
+
+	/* return FALSE to remove the source */
+	return FALSE;
+}
+
+/* Manage the sensitivity of the clear button, request an update of the
+   footprint list by re-evaluating filter at every changes. */
+static void library_window_callback_filter_entry_changed(GtkEditable * editable, gpointer lib_win)
+{
+	pcb_gtk_library_t *library_window = GHID_LIBRARY_WINDOW(lib_win);
+	GtkWidget *button;
+	gboolean sensitive;
+
+	/* turns button off if filter entry is empty; turns it on otherwise */
+	button = GTK_WIDGET(library_window->button_clear);
+	sensitive = (strcmp(gtk_entry_get_text(library_window->entry_filter), "") != 0);
+	gtk_widget_set_sensitive(button, sensitive);
+
+	/* Cancel any pending update of the footprint list filter */
+	if (library_window->filter_timeout != 0)
+		g_source_remove(library_window->filter_timeout);
+
+	/* Schedule an update of the footprint list filter in LIBRARY_FILTER_INTERVAL milliseconds */
+	library_window->filter_timeout = g_timeout_add(LIBRARY_FILTER_INTERVAL, library_window_filter_timeout, library_window);
+
+}
+
+/* Click on the [filter] clear button. Resets the filter entry,
+   indirectly causing re-evaluation/GUI update. */
+static void library_window_callback_filter_button_clicked(GtkButton * button, gpointer lib_win)
+{
+	pcb_gtk_library_t *library_window = GHID_LIBRARY_WINDOW(lib_win);
+
+	/* clears text in text entry for filter */
+	gtk_entry_set_text(library_window->entry_filter, "");
+
+}
+
+/* Creates a tree model from the library tree starting at parent. */
+static GtkTreeModel *create_lib_tree_model_recurse(GtkTreeStore * tree, pcb_gtk_library_t * library_window,
+																									 pcb_fplibrary_t * parent, GtkTreeIter * iter_parent)
+{
+	GtkTreeIter p_iter;
+	pcb_fplibrary_t *menu;
+	int n;
+
+	for (menu = parent->data.dir.children.array, n = 0; n < parent->data.dir.children.used; n++, menu++) {
+		gtk_tree_store_append(tree, &p_iter, iter_parent);
+		gtk_tree_store_set(tree, &p_iter, MENU_NAME_COLUMN, menu->name, MENU_ENTRY_COLUMN, menu, -1);
+		if (menu->type == LIB_DIR)
+			create_lib_tree_model_recurse(tree, library_window, menu, &p_iter);
+	}
+
+	return (GtkTreeModel *) tree;
+}
+
+static GtkTreeModel *create_lib_tree_model(pcb_gtk_library_t * library_window)
+{
+	GtkTreeStore *tree = gtk_tree_store_new(N_MENU_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
+	return create_lib_tree_model_recurse(tree, library_window, &pcb_library, NULL);
+}
+
+/* User requested refresh of the tree content */
+static void library_window_callback_refresh_library(GtkButton * button, gpointer lib_win)
+{
+	pcb_gtk_library_t *library_window = GHID_LIBRARY_WINDOW(lib_win);
+	GtkTreeModel *model;
+	pcb_fplibrary_t *entry = NULL;
+	GtkTreeIter iter;
+
+	lib_param_del_timer(library_window);
+
+	if (gtk_tree_selection_get_selected(library_window->selection, &model, &iter)) {
+		gtk_tree_model_get(model, &iter, MENU_ENTRY_COLUMN, &entry, -1);
+
+		if (entry == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Invalid selection\n");
+			return;
+		}
+
+		if (entry->type != LIB_DIR) {
+			pcb_message(PCB_MSG_ERROR, "Library path is not a directory\n");
+			return;
+		}
+
+		if (entry->data.dir.backend == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Library path is not a top level directory of a fp_ plugin\n");
+			return;
+		}
+	}
+
+	if (pcb_fp_rehash(entry) != 0) {
+		pcb_message(PCB_MSG_ERROR, "Failed to rehash library\n");
+		return;
+	}
+
+	/* Refresh the "Library" view */
+	model = (GtkTreeModel *)
+		g_object_new(GTK_TYPE_TREE_MODEL_FILTER, "child-model", create_lib_tree_model(library_window), "virtual-root", NULL, NULL);
+
+	gtk_tree_model_filter_set_visible_func((GtkTreeModelFilter *) model, lib_model_filter_visible_func, library_window, NULL);
+
+	gtk_tree_view_set_model(library_window->libtreeview, model);
+}
+
+/* Activation (e.g. double-clicking) of a footprint row. As a convenience
+to the user, GTK provides Shift-Arrow Left, Right to expand or
+contract any node with children. */
+static void tree_row_activated(GtkTreeView * tree_view, GtkTreePath * path, GtkTreeViewColumn * column, gpointer lib_win)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+
+	model = gtk_tree_view_get_model(tree_view);
+	gtk_tree_model_get_iter(model, &iter, path);
+
+	if (!gtk_tree_model_iter_has_child(model, &iter)) {
+		library_window_callback_tree_selection_changed(gtk_tree_view_get_selection(tree_view), lib_win);
+		return;
+	}
+
+	if (gtk_tree_view_row_expanded(tree_view, path))
+		gtk_tree_view_collapse_row(tree_view, path);
+	else
+		gtk_tree_view_expand_row(tree_view, path, FALSE);
+}
+
+/* Key pressed activation handler: CTRL-C -> copy footprint name to clipboard;
+   Enter -> row-activate. */
+static gboolean treeview_key_press_cb(GtkTreeView * tree_view, GdkEventKey * event, gpointer user_data)
+{
+	GtkTreeSelection *selection;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GtkTreePath *path;
+	pcb_bool key_handled, arrow_key, enter_key, force_activate = pcb_false;
+	GtkClipboard *clipboard;
+	const gchar *compname;
+	guint default_mod_mask = gtk_accelerator_get_default_mod_mask();
+
+	arrow_key = ((event->keyval == GDK_KEY_Up) || (event->keyval == GDK_KEY_KP_Up)
+		|| (event->keyval == GDK_KEY_Down) || (event->keyval == GDK_KEY_KP_Down)
+		|| (event->keyval == GDK_KEY_KP_Page_Down) || (event->keyval == GDK_KEY_KP_Page_Up)
+		|| (event->keyval == GDK_KEY_Page_Down) || (event->keyval == GDK_KEY_Page_Up)
+		|| (event->keyval == GDK_KEY_KP_Home) || (event->keyval == GDK_KEY_KP_End)
+		|| (event->keyval == GDK_KEY_Home) || (event->keyval == GDK_KEY_End));
+	enter_key = (event->keyval == GDK_KEY_Return) || (event->keyval == GDK_KEY_KP_Enter);
+	key_handled = (enter_key || arrow_key);
+
+	/* Handle ctrl+c and ctrl+C: copy current name to clipboard */
+	if (((event->state & default_mod_mask) == GDK_CONTROL_MASK) && ((event->keyval == GDK_KEY_c) || (event->keyval == GDK_KEY_C))) {
+		selection = gtk_tree_view_get_selection(tree_view);
+		g_return_val_if_fail(selection != NULL, TRUE);
+
+		if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+			return TRUE;
+
+		gtk_tree_model_get(model, &iter, MENU_NAME_COLUMN, &compname, -1);
+
+		clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+		g_return_val_if_fail(clipboard != NULL, TRUE);
+
+		gtk_clipboard_set_text(clipboard, compname, -1);
+
+		return FALSE;
+	}
+
+	if (!key_handled)
+		return FALSE;
+
+	/* If arrows (up or down), let GTK process the selection change. Then activate the new selected row. */
+	if (arrow_key) {
+		GtkWidgetClass *class = GTK_WIDGET_GET_CLASS(tree_view);
+
+		class->key_press_event(GTK_WIDGET(tree_view), event);
+	}
+
+	selection = gtk_tree_view_get_selection(tree_view);
+	g_return_val_if_fail(selection != NULL, TRUE);
+
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+		return TRUE;
+
+	/* arrow key should activate the row only if it's a leaf (real footprint), for
+	   display, but shouldn't open/close levels visited or pop up the parametric
+	   footprint dialog */
+	if (arrow_key) {
+		pcb_fplibrary_t *entry = NULL;
+
+		gtk_tree_model_get(model, &iter, MENU_ENTRY_COLUMN, &entry, -1);
+
+		if ((entry != NULL) && (entry->type == LIB_FOOTPRINT) && (entry->data.fp.type != PCB_FP_PARAMETRIC))
+			force_activate = pcb_true;
+	}
+
+	/* Handle 'Enter' key and arrow keys as "activate" on plain footprints */
+	if (enter_key || force_activate) {
+		path = gtk_tree_model_get_path(model, &iter);
+		if (path != NULL) {
+			tree_row_activated(tree_view, path, NULL, user_data);
+		}
+		gtk_tree_path_free(path);
+	}
+
+	return TRUE;
+}
+
+/* Just handle the double-click to be equivalent to "row-activated" signal */
+static gboolean treeview_button_press_cb(GtkWidget  * widget, GdkEvent * ev, gpointer user_data)
+{
+	GtkTreeView *tv = GTK_TREE_VIEW(widget);
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GtkTreePath *path;
+
+	if (ev->button.type == GDK_2BUTTON_PRESS) {
+		model = gtk_tree_view_get_model(tv);
+		gtk_tree_view_get_path_at_pos(tv, ev->button.x, ev->button.y, &path, NULL, NULL, NULL);
+		if (path != NULL) {
+			gtk_tree_model_get_iter(model, &iter, path);
+			tree_row_activated(tv, path, NULL, user_data);
+		}
+	}
+
+	return FALSE;
+}
+
+static gboolean treeview_button_release_cb(GtkWidget  * widget, GdkEvent * ev, gpointer user_data)
+{
+	GtkTreeView *tv = GTK_TREE_VIEW(widget);
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GtkTreePath *path;
+
+	model = gtk_tree_view_get_model(tv);
+	gtk_tree_view_get_path_at_pos(tv, ev->button.x, ev->button.y, &path, NULL, NULL, NULL);
+	if (path != NULL) {
+		gtk_tree_model_get_iter(model, &iter, path);
+		/* Do not activate the row if LEFT-click on a "parent category" row. */
+		if (ev->button.button != 1 || !gtk_tree_model_iter_has_child(model, &iter))
+			tree_row_activated(tv, path, NULL, user_data);
+	}
+
+	return FALSE;
+}
+
+
+static GtkWidget *create_lib_treeview(pcb_gtk_library_t * library_window)
+{
+	GtkWidget *libtreeview, *vbox, *scrolled_win, *label, *hbox, *entry, *button;
+	GtkTreeModel *child_model, *model;
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+
+	/* -- library selection view -- */
+
+	/* vertical box for footprint selection and search entry */
+	vbox = gtkc_vbox_new(FALSE, 5);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
+
+	child_model = create_lib_tree_model(library_window);
+	model = (GtkTreeModel *) g_object_new(GTK_TYPE_TREE_MODEL_FILTER, "child-model", child_model, "virtual-root", NULL, NULL);
+
+	scrolled_win = GTK_WIDGET(g_object_new(GTK_TYPE_SCROLLED_WINDOW,
+																				 /* GtkScrolledWindow */
+																				 "hscrollbar-policy",
+																				 GTK_POLICY_AUTOMATIC,
+																				 "vscrollbar-policy", GTK_POLICY_ALWAYS, "shadow-type", GTK_SHADOW_ETCHED_IN, NULL));
+	/* create the treeview */
+	libtreeview = GTK_WIDGET(g_object_new(GTK_TYPE_TREE_VIEW,
+																				/* GtkTreeView */
+																				"model", model, "rules-hint", TRUE, "headers-visible", FALSE, NULL));
+
+	g_signal_connect(libtreeview, "button-press-event", G_CALLBACK(treeview_button_press_cb), library_window);
+	g_signal_connect(libtreeview, "button-release-event", G_CALLBACK(treeview_button_release_cb), library_window);
+
+	g_signal_connect(libtreeview, "key-press-event", G_CALLBACK(treeview_key_press_cb), library_window);
+
+	library_window->selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(libtreeview));
+	gtk_tree_selection_set_mode(library_window->selection, GTK_SELECTION_SINGLE);
+
+	/* insert a column to treeview for library/symbol name */
+	renderer = GTK_CELL_RENDERER(g_object_new(GTK_TYPE_CELL_RENDERER_TEXT,
+																						/* GtkCellRendererText */
+																						"editable", FALSE, NULL));
+	column = GTK_TREE_VIEW_COLUMN(g_object_new(GTK_TYPE_TREE_VIEW_COLUMN,
+																						 /* GtkTreeViewColumn */
+																						 "title", _("Components"), NULL));
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_set_attributes(column, renderer, "text", MENU_NAME_COLUMN, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(libtreeview), column);
+
+	/* add the treeview to the scrolled window */
+	gtk_container_add(GTK_CONTAINER(scrolled_win), libtreeview);
+	/* set directory/footprint treeview of library_window */
+	library_window->libtreeview = GTK_TREE_VIEW(libtreeview);
+
+	/* add the scrolled window for directories to the vertical box */
+	gtk_box_pack_start(GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 0);
+
+
+	/* -- filter area -- */
+	hbox = gtkc_hbox_new(FALSE, 3);
+
+	/* create the entry label */
+	label = GTK_WIDGET(g_object_new(GTK_TYPE_LABEL,
+																	/* GtkMisc */
+																	"xalign", 0.0,
+																	/* GtkLabel */
+																	"label", _("Filter:"), NULL));
+	/* add the search label to the filter area */
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+
+	/* create the text entry for filter in footprints */
+	entry = GTK_WIDGET(g_object_new(GTK_TYPE_ENTRY,
+																	/* GtkEntry */
+																	"text", "", NULL));
+	g_signal_connect(entry, "changed", G_CALLBACK(library_window_callback_filter_entry_changed), library_window);
+
+	/* now that that we have an entry, set the filter func of model */
+	gtk_tree_model_filter_set_visible_func((GtkTreeModelFilter *) model, lib_model_filter_visible_func, library_window, NULL);
+
+	/* add the filter entry to the filter area */
+	gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+	/* set filter entry of library_window */
+	library_window->entry_filter = GTK_ENTRY(entry);
+	/* and init the event source for footprint filter */
+	library_window->filter_timeout = 0;
+
+	/* EDIT */
+	button = GTK_WIDGET(g_object_new(GTK_TYPE_BUTTON,
+																	 /* GtkWidget */
+																	 "sensitive", TRUE,
+																	 /* GtkButton */
+																	 "relief", GTK_RELIEF_NONE, NULL));
+	gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_icon_name(GTK_STOCK_EDIT, GTK_ICON_SIZE_SMALL_TOOLBAR));
+	g_signal_connect(button, "clicked", G_CALLBACK(library_window_callback_edit_button_clicked), library_window);
+	/* add the clear button to the filter area */
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	/* set clear button of library_window */
+	library_window->button_edit = GTK_BUTTON(button);
+	gtk_widget_set_tooltip_text(button, "Edit parameters of a\nparametric footprint");
+
+	/* CLEAR */
+	button = GTK_WIDGET(g_object_new(GTK_TYPE_BUTTON,
+																	 /* GtkWidget */
+																	 "sensitive", FALSE,
+																	 /* GtkButton */
+																	 "relief", GTK_RELIEF_NONE, NULL));
+	gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_icon_name("edit-clear", GTK_ICON_SIZE_SMALL_TOOLBAR));
+	g_signal_connect(button, "clicked", G_CALLBACK(library_window_callback_filter_button_clicked), library_window);
+	/* add the clear button to the filter area */
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	/* set clear button of library_window */
+	library_window->button_clear = GTK_BUTTON(button);
+	gtk_widget_set_tooltip_text(button, "Clear the filter entry");
+
+	/* create the refresh button */
+	button = GTK_WIDGET(g_object_new(GTK_TYPE_BUTTON,
+																	 /* GtkWidget */
+																	 "sensitive", TRUE,
+																	 /* GtkButton */
+																	 "relief", GTK_RELIEF_NONE, NULL));
+	gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_SMALL_TOOLBAR));
+	/* add the refresh button to the filter area */
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(button, "clicked", G_CALLBACK(library_window_callback_refresh_library), library_window);
+	gtk_widget_set_tooltip_text(button, "Refresh the library window tree\n(GUI-only refresh)");
+
+	/* add the filter area to the vertical box */
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+	library_window->libtreeview = GTK_TREE_VIEW(libtreeview);
+
+	return vbox;
+}
+
+#warning TODO: figure how this can be passed to the constructor without a global var
+static pcb_gtk_common_t *lwcom;
+
+static GObject *library_window_constructor(GType type, guint n_construct_properties, GObjectConstructParam * construct_params)
+{
+	GObject *object;
+	pcb_gtk_library_t *lib_window;
+	GtkWidget *content_area;
+	GtkWidget *hpaned, *notebook;
+	GtkWidget *libview;
+	GtkWidget *preview, *preview_text;
+	GtkWidget *frame;
+
+	/* chain up to constructor of parent class */
+	object = G_OBJECT_CLASS(library_window_parent_class)->constructor(type, n_construct_properties, construct_params);
+	lib_window = GHID_LIBRARY_WINDOW(object);
+	lib_window->param_timer = 0;
+
+	/* dialog initialization */
+	g_object_set(object,
+							 /* GtkWindow */
+							 "type", GTK_WINDOW_TOPLEVEL,
+							 "title", _("Select Footprint..."),
+							 "default-height", 300, "default-width", 400, "modal", FALSE, "window-position", GTK_WIN_POS_NONE,
+							 /* GtkDialog */
+							 NULL);
+	g_object_set(gtk_dialog_get_content_area(GTK_DIALOG(lib_window)), "homogeneous", FALSE, NULL);
+
+	/* horizontal pane containing selection and preview */
+	hpaned = gtkc_hpaned_new();
+	gtk_container_set_border_width(GTK_CONTAINER(hpaned), 5);
+	lib_window->hpaned = hpaned;
+
+	/* notebook for library views */
+	notebook = GTK_WIDGET(g_object_new(GTK_TYPE_NOTEBOOK, "show-tabs", FALSE, NULL));
+	lib_window->viewtabs = GTK_NOTEBOOK(notebook);
+
+	libview = create_lib_treeview(lib_window);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), libview, gtk_label_new(_("Libraries")));
+
+	/* include the vertical box in horizontal box */
+	gtk_paned_pack1(GTK_PANED(hpaned), notebook, TRUE, FALSE);
+
+
+	/* -- preview area -- */
+	frame = GTK_WIDGET(g_object_new(GTK_TYPE_FRAME,
+																	/* GtkFrame */
+																	"label", _("Preview"), NULL));
+
+	preview = pcb_gtk_preview_pinout_new(lwcom, lwcom->init_drawing_widget, lwcom->preview_expose, NULL);
+	gtk_widget_set_size_request(preview, 150, 150);
+
+	preview_text = gtk_label_new("");
+
+	{
+		GtkWidget *vbox = gtkc_vbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(vbox), preview, TRUE, TRUE, 0);
+		gtk_box_pack_end(GTK_BOX(vbox), preview_text, FALSE, FALSE, 0);
+
+		gtk_container_add(GTK_CONTAINER(frame), vbox);
+	}
+
+	/* set preview of library window */
+	lib_window->preview = preview;
+	lib_window->preview_text = preview_text;
+
+	gtk_paned_pack2(GTK_PANED(hpaned), frame, FALSE, FALSE);
+
+	/* add the hpaned to the dialog content area */
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(lib_window));
+	gtk_box_pack_start(GTK_BOX(content_area), hpaned, TRUE, TRUE, 0);
+	gtk_widget_show_all(hpaned);
+
+	/* now add buttons in the action area */
+	gtk_dialog_add_buttons(GTK_DIALOG(lib_window),
+												 /*  - close button */
+												 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+
+	return object;
+}
+
+static void library_window_finalize(GObject * object)
+{
+	pcb_gtk_library_t *library_window = GHID_LIBRARY_WINDOW(object);
+
+	if (library_window->filter_timeout != 0) {
+		g_source_remove(library_window->filter_timeout);
+		library_window->filter_timeout = 0;
+	}
+
+	lib_param_del_timer(library_window);
+
+	G_OBJECT_CLASS(library_window_parent_class)->finalize(object);
+}
+
+static void library_window_class_init(pcb_gtk_library_class_t * klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+
+	gobject_class->constructor = library_window_constructor;
+	gobject_class->finalize = library_window_finalize;
+
+	library_window_parent_class = (GObjectClass *) g_type_class_peek_parent(klass);
+}
+
+/* API */
+
+GType pcb_gtk_library_get_type()
+{
+	static GType library_window_type = 0;
+
+	if (!library_window_type) {
+		static const GTypeInfo library_window_info = {
+			sizeof(pcb_gtk_library_class_t),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) library_window_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(pcb_gtk_library_t),
+			0,												/* n_preallocs */
+			NULL											/* instance_init */
+		};
+
+		library_window_type = g_type_register_static(GTK_TYPE_DIALOG, "GhidLibraryWindow", &library_window_info, (GTypeFlags) 0);
+	}
+
+	return library_window_type;
+}
+
+void pcb_gtk_library_create(pcb_gtk_common_t *com)
+{
+	GtkWidget *current_tab, *entry_filter;
+	GtkNotebook *notebook;
+
+	if (library_window)
+		return;
+
+	lwcom = com;
+	library_window = (GtkWidget *) g_object_new(GHID_TYPE_LIBRARY_WINDOW, NULL);
+
+	g_signal_connect(GTK_DIALOG(library_window), "response", G_CALLBACK(library_window_callback_response), NULL);
+	g_signal_connect(library_window, "configure_event", G_CALLBACK(library_window_configure_event_cb), NULL);
+	gtk_window_set_default_size(GTK_WINDOW(library_window), hid_gtk_wgeo.library_width, hid_gtk_wgeo.library_height);
+
+	gtk_window_set_title(GTK_WINDOW(library_window), _("pcb-rnd Library"));
+	gtk_window_set_role(GTK_WINDOW(library_window), "PCB_Library");
+	gtk_window_set_transient_for(GTK_WINDOW(library_window), GTK_WINDOW(com->top_window));
+
+	wplc_place(WPLC_LIBRARY, library_window);
+
+	gtk_widget_realize(library_window);
+
+	gtk_editable_select_region(GTK_EDITABLE(GHID_LIBRARY_WINDOW(library_window)->entry_filter), 0, -1);
+
+	/* Set the focus to the filter entry only if it is in the current
+	   displayed tab */
+	notebook = GTK_NOTEBOOK(GHID_LIBRARY_WINDOW(library_window)->viewtabs);
+	current_tab = gtk_notebook_get_nth_page(notebook, gtk_notebook_get_current_page(notebook));
+	entry_filter = GTK_WIDGET(GHID_LIBRARY_WINDOW(library_window)->entry_filter);
+	if (gtk_widget_is_ancestor(entry_filter, current_tab)) {
+		gtk_widget_grab_focus(entry_filter);
+	}
+	lwcom = NULL;
+}
+
+void pcb_gtk_library_show(pcb_gtk_common_t *com, gboolean raise)
+{
+	pcb_gtk_library_create(com);
+	gtk_widget_show_all(library_window);
+	if (raise)
+		gtk_window_present(GTK_WINDOW(library_window));
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_library.h	(revision 18980)
@@ -0,0 +1,67 @@
+/* gEDA - GPL Electronic Design Automation
+ * gschem - gEDA Schematic Capture
+ * Copyright (C) 1998-2004 Ales V. Hvezda
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+#ifndef PCB_GTK_LIBRARY_WINDOW_H
+#define PCB_GTK_LIBRARY_WINDOW_H
+
+#include <gtk/gtk.h>
+#include "hid.h"
+#include "glue.h"
+
+#define GHID_TYPE_LIBRARY_WINDOW           (pcb_gtk_library_get_type())
+#define GHID_LIBRARY_WINDOW(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_TYPE_LIBRARY_WINDOW, pcb_gtk_library_t))
+#define GHID_LIBRARY_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass),  GHID_TYPE_LIBRARY_WINDOW, pcb_gtk_library_class_t))
+#define GHID_IS_LIBRARY_WINDOW(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHID_TYPE_LIBRARY_WINDOW))
+#define GHID_GET_LIBRARY_WINDOW_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),  GHID_TYPE_LIBRARY, pcb_gtk_library_class_t))
+
+typedef struct pcb_gtk_library_class_s pcb_gtk_library_class_t; /* A subclass of GtkDialogClass. */
+typedef struct pcb_gtk_library_s pcb_gtk_library_t;
+
+struct pcb_gtk_library_class_s {
+	GtkDialogClass parent_class;
+};
+
+struct pcb_gtk_library_s {
+	GtkDialog parent_instance;
+
+	GtkWidget *hpaned;
+	GtkTreeView *libtreeview;
+	GtkNotebook *viewtabs;
+	GtkWidget *preview;
+	GtkWidget *preview_text;
+	GtkEntry *entry_filter;
+	GtkButton *button_clear, *button_edit;
+	GtkTreeSelection *selection;
+	guint filter_timeout, param_timer;
+
+	void *gport;
+};
+
+GType pcb_gtk_library_get_type(void);
+
+/* Creates the _library_ dialog if it is not already created. It does not
+   show the dialog; use pcb_gtk_library_show() for that.*/
+void pcb_gtk_library_create(pcb_gtk_common_t *com);
+
+/* Shows the _library_ dialog, creating it if not already created, and
+   presents it to the user if raise is true. */
+void pcb_gtk_library_show(pcb_gtk_common_t *com, gboolean raise);
+
+#endif /* PCB_GTK_LIBRARY_WINDOW_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.c	(revision 18980)
@@ -0,0 +1,470 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* GUI for parametric footprints parameter exploration */
+#include "config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "hid_attrib.h"
+#include "compat_misc.h"
+#include "safe_fs.h"
+
+#include "dlg_library_param.h"
+#include "dlg_attribute.h"
+
+#define MAX_PARAMS 128
+
+static pcb_hid_attribute_t *attr_append(const char *name, pcb_hid_attribute_t *attrs, int *numattr)
+{
+	pcb_hid_attribute_t *a;
+
+	if (*numattr >= MAX_PARAMS)
+		return NULL;
+
+	a = &attrs[*numattr];
+	memset(a, 0, sizeof(pcb_hid_attribute_t));
+	a->name = name;
+	a->type = PCB_HATT_STRING;
+
+	(*numattr)++;
+	return a;
+}
+
+#define used min_val
+#define alloced max_val
+static void append_enum(pcb_hid_attribute_t *a, const char *val)
+{
+	if (a->used+1 >= a->alloced) {
+		a->alloced += 16;
+		a->enumerations = realloc(a->enumerations, sizeof(char *) * a->alloced);
+	}
+	a->enumerations[a->used] = val;
+	a->used++;
+	a->enumerations[a->used] = NULL;
+}
+#undef used
+#undef alloced
+
+#define append(name) attr_append(pcb_strdup(name), attrs, &numattr);
+
+#define colsplit() \
+do { \
+	col = strchr(col, ':'); \
+	if (col != NULL) { \
+		*col = '\0'; \
+		col++; \
+	} \
+} while(0)
+
+#define append_strdup(dst, src, seps) \
+do { \
+	if (src != NULL) { \
+		char *__old__ = dst; \
+		if (dst != NULL) { \
+			dst = pcb_strdup_printf("%s%s%s", __old__, seps, src); \
+			free(__old__); \
+		} \
+		else \
+			dst = pcb_strdup(src); \
+	} \
+} while(0)
+
+static void free_attr(pcb_hid_attribute_t *a)
+{
+	free((char *)a->name);
+	free((char *)a->help_text);
+	if (a->enumerations != NULL) {
+		const char **s;
+		for(s = a->enumerations; *s != NULL; s++)
+			free((char *)*s);
+		free(a->enumerations);
+	}
+}
+
+static pcb_hid_attribute_t *find_attr(pcb_hid_attribute_t *attrs, int numattr, const char *name)
+{
+	int n;
+	for(n = 0; n < numattr; n++)
+		if (strcmp(attrs[n].name, name) == 0)
+			return &attrs[n];
+	return NULL;
+}
+
+
+static char *gen_cmd(char *fpname, pcb_hid_attribute_t *attrs, pcb_hid_attr_val_t *res, int numattr, int first_optional)
+{
+	int n, pushed = 0;
+	gds_t sres;
+	char *tmp;
+
+	memset(&sres, 0, sizeof(sres));
+
+	gds_append_str(&sres, fpname);
+
+	/* cut original name at "(" */
+	tmp = strchr(sres.array, '(');
+	if (tmp != NULL)
+		gds_truncate(&sres, tmp - sres.array);
+
+	gds_append_str(&sres, "(");
+
+	for(n = 0; n < numattr; n++) {
+		char *desc, buff[128];
+		const char *val;
+
+		if (!attrs[n].changed)
+			continue;
+
+		switch(attrs[n].type) {
+			case PCB_HATT_ENUM:
+				val = attrs[n].enumerations[res[n].int_value];
+				if (val != NULL) {
+					desc = strstr((char *)val, " (");
+					if (desc != NULL)
+						*desc = '\0';
+				}
+				break;
+			case PCB_HATT_STRING:
+				val = res[n].str_value;
+				break;
+			case PCB_HATT_COORD:
+				val = buff;
+				pcb_snprintf(buff, sizeof(buff), "%$$mh", res[n].coord_value);
+				break;
+			default:;
+		}
+
+		if (val == NULL)
+			continue;
+
+		if (pushed)
+			gds_append_str(&sres, ", ");
+
+		if ((n == pushed) && (n < first_optional))
+			gds_append_str(&sres, val); /* positional */
+		else
+			pcb_append_printf(&sres, "%s=%s", attrs[n].name, val);
+		pushed++;
+	}
+
+	gds_append_str(&sres, ")");
+	return sres.array;
+}
+
+static void set_attr(pcb_hid_attribute_t *a, char *val)
+{
+	const char **s;
+	char *desc;
+	int vlen, len, n;
+
+	switch(a->type) {
+		case PCB_HATT_ENUM:
+			vlen = strlen(val);
+			for(n = 0, s = a->enumerations; *s != NULL; s++,n++) {
+				desc = strstr(*s, " (");
+				if (desc != NULL)
+					len = desc - *s;
+				else
+					len = strlen(*s);
+				if ((len == vlen) && (strncmp(*s, val, len) == 0)) {
+					a->default_val.int_value = n;
+					break;
+				}
+			}
+			break;
+		case PCB_HATT_STRING:
+			free((char *)a->default_val.str_value);
+			a->default_val.str_value = pcb_strdup(val);
+			break;
+		case PCB_HATT_COORD:
+			a->default_val.coord_value = pcb_get_value_ex(val, NULL, NULL, NULL, "mil", NULL);
+			break;
+		default:;
+	}
+}
+
+static int param_split(char *buf, char *argv[], int amax)
+{
+	int n;
+	char *next, *bump;
+
+	for(n=0; ;n++) {
+		if (n >= amax)
+			return n+1;
+
+		/* ltrim */
+		while(isspace(*buf)) buf++;
+		argv[n] = buf;
+
+		/* find next param */
+		bump = buf;
+		next = strchr(buf, ',');
+		if (next == NULL)
+			return n+1;
+		buf = next+1;
+
+		/* rtrim */
+		*next = '\0';
+		next--;
+		while((next >= bump) && (isspace(*next))) {
+			*next = '\0';
+			next--;
+		}
+	}
+	return -1;
+}
+
+
+static void load_params(char *user_params, char *help_params, pcb_hid_attribute_t *attrs, int numattr)
+{
+	char *parain;
+	char *parahlp;
+	int argc_in, argc_help, posi, n;
+	char *end, *argv_in[MAX_PARAMS], *argv_help[MAX_PARAMS];
+
+	if (user_params == NULL)
+		user_params = "";
+	if (help_params == NULL)
+		help_params = "";
+
+
+	parain = pcb_strdup(user_params);
+	parahlp = pcb_strdup(help_params);
+
+	/* truncate trailing ")" */
+	if (*parain != '\0') {
+		end = parain + strlen(parain) - 1;
+		if (*end == ')')
+			*end = '\0';
+	}
+
+	argc_in = param_split(parain, argv_in, MAX_PARAMS);
+	argc_help = param_split(parahlp, argv_help, MAX_PARAMS);
+
+	/* iterate and assign default values and mark them changed to get them back */
+	for(posi = n = 0; n < argc_in; n++) {
+		char *key, *val, *sep;
+		pcb_hid_attribute_t *a;
+
+		sep = strchr(argv_in[n], '=');
+		if (sep != NULL) {
+			key = argv_in[n];
+			*sep = '\0';
+			val = sep+1;
+
+			/* rtrim key */
+			sep--;
+			while((sep >= key) && (isspace(*sep))) {
+				*sep = '\0';
+				sep--;
+			}
+
+			/* ltrim val */
+			while(isspace(*val)) val++;
+		}
+		else {
+			if (posi >= argc_help) {
+				pcb_message(PCB_MSG_ERROR, "More positional parameters than expected - ignoring %s", argv_in[n]);
+				continue;
+			}
+			key = argv_help[posi];
+			val = argv_in[n];
+			posi++;
+		}
+
+		a = find_attr(attrs, numattr, key);
+		if (a == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Unknown parameter %s - ignoring value %s", key, val);
+			continue;
+		}
+		set_attr(a, val);
+		a->changed = 1; /* make sure the value is kept on the outpute */
+	}
+
+	/* clean up */
+	free(parain);
+	free(parahlp);
+}
+
+void attr_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	int idx;
+	pcb_gtk_library_param_cb_ctx_t *ctx = attr->user_data;
+
+	/* copy the relevant value to res[] so that gen_cmd sees it */
+	idx = attr - ctx->attrs;
+	ctx->res[idx] = attr->default_val;
+
+	ctx->cb(ctx);
+}
+
+char *pcb_gtk_library_param_snapshot(pcb_gtk_library_param_cb_ctx_t *ctx)
+{
+	return gen_cmd(ctx->entry->name, ctx->attrs, ctx->res, *ctx->numattr, ctx->first_optional);
+}
+
+char *pcb_gtk_library_param_ui(pcb_gtk_library_t *library_window, pcb_fplibrary_t *entry, const char *filter_txt, pcb_gtk_library_param_cb_t cb)
+{
+	FILE *f;
+	char *sres, *cmd, line[1024];
+	pcb_hid_attribute_t *curr, attrs[MAX_PARAMS];
+	pcb_hid_attr_val_t res[MAX_PARAMS];
+	int n, numattr = 0, dirty = 0;
+	char *params = NULL, *descr = NULL, *example = NULL;
+	pcb_gtk_library_param_cb_ctx_t ctx;
+
+	ctx.library_window = library_window;
+	ctx.entry = entry;
+	ctx.cb = cb;
+	ctx.attrs = attrs;
+	ctx.res = res;
+	ctx.numattr = &numattr;
+	ctx.first_optional = -1;
+
+	cmd = pcb_strdup_printf("%s --help", entry->data.fp.loc_info);
+	f = pcb_popen(cmd, "r");
+	free(cmd);
+	if (f == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can not execute parametric footprint %s\n", entry->data.fp.loc_info);
+		return NULL;
+	}
+
+	while(fgets(line, sizeof(line), f) > 0) {
+		char *end, *col, *arg, *cmd = line;
+
+		/* rtrim */
+		end = line + strlen(line) - 1;
+		while((end >= line) && ((*end == '\r') || (*end == '\n'))) {
+			*end = '\0';
+			end--;
+		}
+
+		/* ltrim */
+		cmd = strchr(cmd, '@');
+		if ((cmd == NULL) || (cmd[1] != '@'))
+			continue;
+		cmd+=2;
+		arg = strpbrk(cmd, " \t\r\n");
+		if (arg != NULL) {
+			*arg = '\0';
+			arg++;
+			while(isspace(*arg)) arg++;
+		}
+		col = cmd;
+
+		/* parse */
+		if (strcmp(cmd, "desc") == 0) {
+			append_strdup(descr, arg, "\n");
+		}
+		else if (strcmp(cmd, "params") == 0) {
+			params = pcb_strdup(arg);
+		}
+		else if (strcmp(cmd, "example") == 0) {
+			example = pcb_strdup(arg);
+		}
+		else if (strncmp(cmd, "optional:", 9) == 0) {
+			if (ctx.first_optional < 0)
+				ctx.first_optional = numattr-1;
+		}
+		else if (strncmp(cmd, "param:", 6) == 0) {
+			colsplit();
+			curr = append(col);
+			curr->help_text = pcb_strdup(arg);
+			if (cb != NULL) {
+				curr->user_data = &ctx;
+				curr->change_cb = attr_change_cb;
+			}
+		}
+		else if (strncmp(cmd, "default:", 6) == 0) {
+			char *nstr;
+			nstr = pcb_strdup_printf("%s\n(default: %s)", curr->help_text, arg);
+			free((char *)curr->help_text);
+			curr->help_text = nstr;
+		}
+		else if (strncmp(cmd, "dim:", 4) == 0) {
+			curr->type = PCB_HATT_COORD;
+			curr->min_val = 0;
+			curr->max_val = PCB_MM_TO_COORD(512);
+		}
+		else if (strncmp(cmd, "enum:", 5) == 0) {
+			char *evl;
+			curr->type = PCB_HATT_ENUM;
+			colsplit(); colsplit();
+			if (arg != NULL)
+				evl = pcb_strdup_printf("%s (%s)", col, arg);
+			else
+				evl = pcb_strdup(col);
+			append_enum(curr, evl);
+		}
+	}
+	pcb_pclose(f);
+
+	if (filter_txt == NULL) {
+		filter_txt = example;
+		dirty = 1;
+	}
+
+	if (filter_txt != NULL) {
+		char *prm = strchr(filter_txt, '(');
+
+		/* if filter text doesn't have parameters, try the example */
+		if ((prm == NULL) || (prm[1] == ')')) {
+			if (example != NULL) {
+				filter_txt = example;
+				prm = strchr(filter_txt, '(');
+				dirty = 1;
+			}
+		}
+
+		if (prm != NULL)
+			load_params(prm+1, params, attrs, numattr);
+	}
+
+	/* make a snapshot to res so that callback gen_cmd() works from live data */
+	for(n = 0; n < numattr; n++)
+		res[n] = attrs[n].default_val;
+
+	if (dirty) /* had to replace the filter text, make it effective */
+		attr_change_cb(NULL, NULL, &attrs[0]);
+
+	if (ghid_attribute_dialog(GTK_WINDOW_TOPLEVEL, attrs, numattr, res, "Parametric footprint edition", descr, NULL) == 0)
+		sres = gen_cmd(entry->name, attrs, res, numattr, ctx.first_optional);
+	else
+		sres = NULL; /* cancel */
+
+	/* clean up */
+	for(n = 0; n < numattr; n++)
+		free_attr(&attrs[n]);
+	free(descr);
+	free(params);
+	free(example);
+
+	return sres;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_library_param.h	(revision 18980)
@@ -0,0 +1,28 @@
+#include "plug_footprint.h"
+#include "dlg_library.h"
+
+typedef struct pcb_gtk_library_param_cb_ctx_s pcb_gtk_library_param_cb_ctx_t;
+
+typedef void (*pcb_gtk_library_param_cb_t)(pcb_gtk_library_param_cb_ctx_t *param_ctx);
+
+struct pcb_gtk_library_param_cb_ctx_s {
+	pcb_gtk_library_t *library_window;
+	pcb_fplibrary_t *entry;
+	pcb_gtk_library_param_cb_t cb;
+
+	/* private */
+	pcb_hid_attribute_t *attrs;
+	pcb_hid_attr_val_t *res;
+	int *numattr;
+	int first_optional;
+};
+
+/* Parse the "--help" of a parametric footprint, offer GUI to change parameters.
+   If filter_txt is non-NULL, it contains initial parameters from the user.
+   Returns a dynamically allocated parametric footprint command */
+char *pcb_gtk_library_param_ui(pcb_gtk_library_t *library_window, pcb_fplibrary_t *entry, const char *filter_txt, pcb_gtk_library_param_cb_t cb);
+
+
+/* Called from a library_param_cb to return the current command line (built from
+   the dialog box fields) */
+char *pcb_gtk_library_param_snapshot(pcb_gtk_library_param_cb_ctx_t *param_ctx);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.c	(revision 18980)
@@ -0,0 +1,203 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port */
+
+#include "config.h"
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "dlg_log.h"
+
+#include "conf_core.h"
+#include "conf_hid.h"
+
+#include "pcb-printf.h"
+#include "actions.h"
+#include "compat_nls.h"
+
+#include "win_place.h"
+#include "bu_text_view.h"
+#include "compat.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+static GtkWidget *log_window, *log_text;
+static pcb_bool log_show_on_append = FALSE;
+
+typedef struct log_pending_s log_pending_t;
+struct log_pending_s {
+	log_pending_t *next;
+	enum pcb_message_level level;
+	char msg[1];
+};
+
+log_pending_t *log_pending_first = NULL, *log_pending_last = NULL;
+
+static gint log_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, gpointer data)
+{
+	wplc_config_event(widget, ev, &hid_gtk_wgeo.log_x, &hid_gtk_wgeo.log_y, &hid_gtk_wgeo.log_width, &hid_gtk_wgeo.log_height);
+	return FALSE;
+}
+
+static void log_close_cb(gpointer data)
+{
+	gtk_widget_destroy(log_window);
+	log_window = NULL;
+}
+
+static void log_destroy_cb(GtkWidget * widget, gpointer data)
+{
+	log_window = NULL;
+}
+
+static gboolean log_key_release_cb(GtkWidget *preview, GdkEventKey *kev, gpointer data)
+{
+	if (kev->keyval == GDK_KEY_Escape)
+		log_close_cb(data);
+	return FALSE;
+}
+
+static void ghid_log_window_create()
+{
+	GtkWidget *vbox, *hbox, *button;
+
+	if (log_window)
+		return;
+
+	log_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	g_signal_connect(G_OBJECT(log_window), "destroy", G_CALLBACK(log_destroy_cb), NULL);
+	g_signal_connect(G_OBJECT(log_window), "configure_event", G_CALLBACK(log_window_configure_event_cb), NULL);
+	gtk_window_set_title(GTK_WINDOW(log_window), _("pcb-rnd Log"));
+	gtk_window_set_role(GTK_WINDOW(log_window), "PCB_Log");
+	gtk_window_set_default_size(GTK_WINDOW(log_window), hid_gtk_wgeo.log_width, hid_gtk_wgeo.log_height);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+	gtk_container_add(GTK_CONTAINER(log_window), vbox);
+
+	log_text = ghid_scrolled_text_view(vbox, NULL, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(log_close_cb), NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	g_signal_connect(G_OBJECT(log_window), "key_release_event", G_CALLBACK(log_key_release_cb), NULL);
+
+	wplc_place(WPLC_LOG, log_window);
+
+	gtk_widget_realize(log_window);
+}
+
+static void ghid_log_append_string_(enum pcb_message_level level, gchar * msg)
+{
+	const char *tag;
+	int popup;
+
+	conf_loglevel_props(level, &tag, &popup);
+	if (tag != NULL)
+		ghid_text_view_append(log_text, (gchar *) tag);
+
+	ghid_text_view_append(log_text, msg);
+
+	if (popup)
+		pcb_actionl("DoWindows", "Log", "false", NULL);
+}
+
+static void ghid_log_append_string(enum pcb_message_level level, gchar *s, int hid_active)
+{
+	log_pending_t *m, *next;
+
+	if (!hid_active) {
+		/* GUI not initialized yet - save these messages for later
+		   NOTE: no need to free this at quit: the GUI will be inited and then it'll be freed */
+		m = malloc(sizeof(log_pending_t) + strlen(s));
+		strcpy(m->msg, s);
+		m->level = level;
+		m->next = NULL;
+		if (log_pending_last != NULL)
+			log_pending_last->next = m;
+		log_pending_last = m;
+		if (log_pending_first == NULL)
+			log_pending_first = m;
+		return;
+	}
+
+	if (!log_show_on_append) {
+		ghid_log_window_create();
+		/* display and free pending messages */
+		for (m = log_pending_first; m != NULL; m = next) {
+			next = m->next;
+			ghid_log_append_string_(m->level, m->msg);
+			free(m);
+		}
+		log_pending_last = log_pending_first = NULL;
+	}
+	else
+		pcb_gtk_dlg_log_show(FALSE);
+
+	ghid_log_append_string_(level, s);
+}
+
+const char pcb_gtk_acts_logshowonappend[] = "LogShowOnAppend(true|false)";
+const char pcb_gtk_acth_logshowonappend[] = "If true, the log window will be shown whenever something is appended to it. If false, the log will still be updated, but the window won't be shown.";
+fgw_error_t pcb_gtk_act_logshowonappend(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a = "";
+	const char *pcb_acts_logshowonappend = pcb_gtk_acts_logshowonappend;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, logshowonappend, a = argv[1].val.str);
+
+	if (tolower(*a) == 't')
+		log_show_on_append = TRUE;
+	else if (tolower(*a) == 'f')
+		log_show_on_append = FALSE;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+void pcb_gtk_dlg_log_show(pcb_bool raise)
+{
+	ghid_log_window_create();
+	gtk_widget_show_all(log_window);
+	if (raise)
+		gtk_window_present(GTK_WINDOW(log_window));
+}
+
+void pcb_gtk_logv(int hid_active, enum pcb_message_level level, const char *fmt, va_list args)
+{
+	char *msg = pcb_strdup_vprintf(fmt, args);
+	ghid_log_append_string(level, msg, hid_active);
+	free(msg);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_log.h	(revision 18980)
@@ -0,0 +1,20 @@
+#ifndef PCB_GTK_DLG_LOG_H
+#define PCB_GTK_DLG_LOG_H
+
+#include "pcb_bool.h"
+#include "error.h"
+#include <libfungw/fungw.h>
+
+/* Creates or raises the _log_ window dialog. */
+void pcb_gtk_dlg_log_show(pcb_bool raise);
+
+/* Logs a new message. */
+void pcb_gtk_logv(int hid_active, enum pcb_message_level level, const char *fmt, va_list args);
+
+
+/* Actions */
+extern const char pcb_gtk_acts_logshowonappend[];
+extern const char pcb_gtk_acth_logshowonappend[];
+fgw_error_t pcb_gtk_act_logshowonappend(fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+#endif /* PCB_GTK_DLG_LOG_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.c	(revision 18980)
@@ -0,0 +1,55 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include "dlg_message.h"
+#include "compat_nls.h"
+
+gint pcb_gtk_dlg_message(const char *message, GtkWindow * parent)
+{
+	GtkWidget *dialog;
+	gint rv;
+
+	dialog = gtk_message_dialog_new(parent,
+																	(GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
+																	GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, NULL);
+	gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), message);
+	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+												 _("Close _without saving"), GTK_RESPONSE_NO,
+												 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_YES, NULL);
+
+	/* Set the alternative button order (ok, cancel, help) for other systems */
+	gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), GTK_RESPONSE_YES, GTK_RESPONSE_NO, GTK_RESPONSE_CANCEL, -1);
+
+	rv = gtk_dialog_run(GTK_DIALOG(dialog));
+
+	gtk_widget_destroy(dialog);
+	return rv;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_message.h	(revision 18980)
@@ -0,0 +1,3 @@
+#include <gtk/gtk.h>
+
+gint pcb_gtk_dlg_message(const char *message, GtkWindow * parent);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.c	(revision 18980)
@@ -0,0 +1,938 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*
+ * This file written by Bill Wilson for the PCB Gtk port
+ */
+
+#include "config.h"
+#include "dlg_netlist.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "event.h"
+#include "error.h"
+#include "macro.h"
+#include "find.h"
+#include "rats.h"
+#include "remove.h"
+#include "search.h"
+#include "select.h"
+#include "undo.h"
+#include "actions.h"
+#include "compat_nls.h"
+
+#include "util_str.h"
+#include "win_place.h"
+#include "bu_text_view.h"
+#include "bu_box.h"
+#include "bu_check_button.h"
+
+#include "compat.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+#define NET_HIERARCHY_SEPARATOR "/"
+
+static GtkWidget *netlist_window;
+static GtkWidget *disable_all_button;
+
+static GtkTreeModel *node_model;
+static GtkTreeView *node_treeview;
+static GtkTreeSelection *node_selection;
+
+static pcb_bool selection_holdoff;
+
+static pcb_lib_menu_t *selected_net;
+static pcb_lib_menu_t *node_selected_net;
+
+
+/*  The Netlist window displays all the layout nets in a left treeview.
+    When one of the nets is selected, all of its nodes (or connections)
+    will be displayed in a right treeview.  If a "Select on layout" button
+    is pressed, the net that is selected in the left treeview will be
+    drawn selected on the layout.
+
+    Gtk separates the data model from the view in its treeview widgets so
+    here we maintain two data models.  The net data model has pointers to
+    all the nets in the layout and the node data model keeps pointers to all
+    the nodes for the currently selected net.  By updating the data models
+    the net and node gtk treeviews handle displaying the results.
+
+    The netlist window code has a public interface providing hooks so PCB
+    code can control the net and node treeviews:
+
+    ghid_get_net_from_node_name gchar *node_name, pcb_bool enabled_only)
+      Given a node name (eg C101-1), walk through the nets in the net
+      data model and search each net for the given node_name.  If found
+      and enabled_only is true, make the net treeview scroll to and
+      highlight (select) the found net.  Return the found net.
+
+    ghid_netlist_highlight_node()
+      Given some PCB internal pointers (not really a good gui api here)
+      look up a node name determined by the pointers and highlight the node
+      in the node treeview.  By using ghid_get_net_from_node_name() to
+      look up the node, the net the node belongs to will also be
+      highlighted in the net treeview.
+
+    pcb_gtk_dlg_netlist_update(pcb_bool init_nodes)
+      PCB calls this to tell the gui netlist code the layout net has
+      changed and the gui data structures (net and optionally node data
+      models) should be rebuilt.
+*/
+
+
+/*  -------- The netlist nodes (pcb_lib_entry_t) data model ----------
+    Each time a net is selected in the left treeview, this node model
+    is recreated containing all the nodes (pins/pads) that are connected
+    to the net.  Loading the new model will update the right treeview with
+    all the new node names (C100-1, R100-1, etc).
+
+    The terminology is a bit confusing because the PCB netlist data
+    structures are generic structures used for library elements, netlist
+    data, and possibly other things also.  The mapping is that
+    the layout netlist data structure is a pcb_lib_t which
+    contains an allocated array of pcb_lib_menu_t structs.  Each of these
+    structs represents a net in the netlist and contains an array
+    of pcb_lib_entry_t structs which represent the nodes connecting to
+    the net.  So we have:
+
+   |                      Nets              Nodes
+   |       pcb_lib_t    pcb_lib_menu_t   pcb_lib_entry_t
+   | -------------------------------------------------------
+   |  PCB->NetlistLib------Menu[0]-----------Entry[0]
+   |                     |                   Entry[1]
+   |                     |                     ...
+   |                     |
+   |                     --Menu[1]-----------Entry[0]
+   |                     |                   Entry[1]
+   |                     |                     ...
+   |                     |
+   |                     -- ...
+   |
+   | Where for example Menu[] names would be nets GND, Vcc, etc and Entry[]
+   | names would be nodes C101-1, R101-2, etc
+*/
+
+static pcb_lib_entry_t *node_get_node_from_name(pcb_gtk_common_t *com, gchar *node_name, pcb_lib_menu_t **node_net);
+
+enum {
+	NODE_NAME_COLUMN,							/* Name to show in the treeview         */
+	NODE_LIBRARY_COLUMN,					/* Pointer to this node (pcb_lib_entry_t)      */
+	N_NODE_COLUMNS
+};
+
+/* Given a net in the netlist (a pcb_lib_menu_t) put all the Entry[]
+   names (the nodes) into a newly created node tree model. */
+static GtkTreeModel *node_model_create(pcb_lib_menu_t * menu)
+{
+	GtkListStore *store;
+	GtkTreeIter iter;
+
+	store = gtk_list_store_new(N_NODE_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
+
+	if (menu == NULL)
+		return GTK_TREE_MODEL(store);
+
+	PCB_ENTRY_LOOP(menu);
+	{
+		if (!entry->ListEntry)
+			continue;
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter, NODE_NAME_COLUMN, entry->ListEntry, NODE_LIBRARY_COLUMN, entry, -1);
+	}
+	PCB_END_LOOP;
+
+	return GTK_TREE_MODEL(store);
+}
+
+/* When there's a new node to display in the node treeview, call this.
+   Create a new model containing the nodes of the given net, insert
+   the model into the treeview and unref the old model. */
+static void node_model_update(pcb_lib_menu_t * menu)
+{
+	GtkTreeModel *model;
+
+	if (menu == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error: can't update netlist window: there is no netlist loaded.\n");
+		return;
+	}
+
+	model = node_model;
+	node_model = node_model_create(menu);
+	gtk_tree_view_set_model(node_treeview, node_model);
+
+	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(node_model), NODE_NAME_COLUMN, GTK_SORT_ASCENDING);
+
+	/*  We could be using gtk_list_store_clear() on the same model, but it's
+	   just as easy that we've created a new one and here unref the old one.
+	 */
+	if (model)
+		g_object_unref(G_OBJECT(model));
+}
+
+static void toggle_pin_selected(pcb_lib_entry_t * entry)
+{
+	pcb_connection_t conn;
+
+	if (!pcb_rat_seek_pad(entry, &conn, pcb_false))
+		return;
+
+	pcb_undo_add_obj_to_flag(conn.obj);
+	PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, conn.obj);
+	pcb_draw_obj((pcb_any_obj_t *)conn.obj);
+}
+
+/* Callback when the user clicks on a PCB node in the right node treeview. */
+static void node_selection_changed_cb(GtkTreeSelection * selection, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	pcb_lib_menu_t *node_net;
+	pcb_lib_entry_t *node;
+	pcb_connection_t conn;
+	pcb_coord_t x = -1, y;
+	static gchar *node_name;
+	pcb_gtk_common_t *com = data;
+
+	if (selection_holdoff)				/* PCB is highlighting, user is not selecting */
+		return;
+
+	/*  Toggle off the previous selection.  Look up node_name to make sure
+	   it still exists.  This toggling can get out of sync if a node is
+	   toggled selected, then the net that includes the node is selected
+	   then unselected.
+	 */
+	if ((node = node_get_node_from_name(com, node_name, &node_net)) != NULL) {
+		/*  If net node belongs to has been highlighted/unhighighed, toggling
+		   if off here will get our on/off toggling out of sync.
+		 */
+		if (node_net == node_selected_net) {
+			toggle_pin_selected(node);
+			com->cancel_lead_user();
+		}
+		g_free(node_name);
+		node_name = NULL;
+	}
+
+	/* Get the selected treeview row.
+	 */
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		if (node)
+			com->invalidate_all();
+		return;
+	}
+
+	/*  From the treeview row, extract the node pointer stored there and
+	   we've got a pointer to the pcb_lib_entry_t (node) the row
+	   represents.
+	 */
+	gtk_tree_model_get(model, &iter, NODE_LIBRARY_COLUMN, &node, -1);
+
+	pcb_gtk_g_strdup(&node_name, node->ListEntry);
+	node_selected_net = selected_net;
+
+	/* Now just toggle a select of the node on the layout     */
+	toggle_pin_selected(node);
+	pcb_undo_inc_serial();
+
+	/* And lead the user to the location */
+	if (pcb_rat_seek_pad(node, &conn, pcb_false))
+		pcb_obj_center(conn.obj, &x, &y);
+	
+	if (x >= 0) {
+		pcb_gui->set_crosshair(x, y, 0);
+		com->lead_user_to_location(x, y);
+	}
+}
+
+/* -------- The net (pcb_lib_menu_t) data model ----------
+ */
+/* TODO: the enable and disable all nets.  Can't seem to get how that's
+   |  supposed to work, but it'll take updating the NET_ENABLED_COLUMN in
+   |  the net_model.  Probably it should be made into a gpointer and make
+   |  a text renderer for it and just write a '*' or a ' ' similar to the
+   |  the Xt PCB scheme.  Or better, since it's an "all nets" function, just
+   |  have a "Disable all nets" toggle button and don't mess with the
+   |  model/treeview at all.
+*/
+enum {
+	NET_ENABLED_COLUMN,						/* If enabled will be ' ', if disable '*'       */
+	NET_NAME_COLUMN,							/* Name to show in the treeview */
+	NET_LIBRARY_COLUMN,						/* Pointer to this net (pcb_lib_menu_t)        */
+	N_NET_COLUMNS
+};
+
+static GtkTreeModel *net_model = NULL;
+static GtkTreeView *net_treeview;
+
+static pcb_bool loading_new_netlist;
+
+static GtkTreeModel *net_model_create(void)
+{
+	GtkTreeModel *model;
+	GtkTreeStore *store;
+	GtkTreeIter new_iter;
+	GtkTreeIter parent_iter;
+	GtkTreeIter *parent_ptr;
+	GtkTreePath *path;
+	GtkTreeRowReference *row_ref;
+	GHashTable *prefix_hash;
+	char *display_name;
+	char *hash_string;
+	char **join_array;
+	char **path_segments;
+	int path_depth;
+	int try_depth;
+
+	store = gtk_tree_store_new(N_NET_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+
+	model = GTK_TREE_MODEL(store);
+
+	/* Hash table stores GtkTreeRowReference for given path prefixes */
+	prefix_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)
+																			gtk_tree_row_reference_free);
+
+	PCB_MENU_LOOP(&PCB->NetlistLib[PCB_NETLIST_EDITED]);
+	{
+		if (!menu->Name)
+			continue;
+
+		if (loading_new_netlist)
+			menu->flag = TRUE;
+
+		parent_ptr = NULL;
+
+		path_segments = g_strsplit(menu->Name, NET_HIERARCHY_SEPARATOR, 0);
+		path_depth = g_strv_length(path_segments);
+
+		for (try_depth = path_depth - 1; try_depth > 0; try_depth--) {
+			join_array = g_new0(char *, try_depth + 1);
+			memcpy(join_array, path_segments, sizeof(char *) * try_depth);
+
+			/* See if this net's parent node is in the hash table */
+			hash_string = g_strjoinv(NET_HIERARCHY_SEPARATOR, join_array);
+			g_free(join_array);
+
+			row_ref = (GtkTreeRowReference *) g_hash_table_lookup(prefix_hash, hash_string);
+			g_free(hash_string);
+
+			/* If we didn't find the path at this level, keep looping */
+			if (row_ref == NULL)
+				continue;
+
+			path = gtk_tree_row_reference_get_path(row_ref);
+			gtk_tree_model_get_iter(model, &parent_iter, path);
+			parent_ptr = &parent_iter;
+			break;
+		}
+
+		/* NB: parent_ptr may still be NULL if we reached the toplevel */
+
+		/* Now walk up the desired path, adding the nodes */
+
+		for (; try_depth < path_depth - 1; try_depth++) {
+			display_name = g_strconcat(path_segments[try_depth], NET_HIERARCHY_SEPARATOR, NULL);
+			gtk_tree_store_append(store, &new_iter, parent_ptr);
+			gtk_tree_store_set(store, &new_iter, NET_ENABLED_COLUMN, "", NET_NAME_COLUMN, display_name, NET_LIBRARY_COLUMN, NULL, -1);
+			g_free(display_name);
+
+			path = gtk_tree_model_get_path(model, &new_iter);
+			row_ref = gtk_tree_row_reference_new(model, path);
+			parent_iter = new_iter;
+			parent_ptr = &parent_iter;
+
+			join_array = g_new0(char *, try_depth + 2);
+			memcpy(join_array, path_segments, sizeof(char *) * (try_depth + 1));
+
+			hash_string = g_strjoinv(NET_HIERARCHY_SEPARATOR, join_array);
+			g_free(join_array);
+
+			/* Insert those node in the hash table */
+			g_hash_table_insert(prefix_hash, hash_string, row_ref);
+			/* Don't free hash_string, it is now oened by the hash table */
+		}
+
+		gtk_tree_store_append(store, &new_iter, parent_ptr);
+		gtk_tree_store_set(store, &new_iter,
+											 NET_ENABLED_COLUMN, menu->flag ? "" : "*",
+											 NET_NAME_COLUMN, path_segments[path_depth - 1], NET_LIBRARY_COLUMN, menu, -1);
+		g_strfreev(path_segments);
+	}
+	PCB_END_LOOP;
+
+	g_hash_table_destroy(prefix_hash);
+
+	return model;
+}
+
+/* Called when the user double clicks on a net in the left treeview. */
+static void net_selection_double_click_cb(GtkTreeView * treeview, GtkTreePath * path, GtkTreeViewColumn * col, gpointer data)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	gchar *str;
+	pcb_lib_menu_t *menu;
+
+	model = gtk_tree_view_get_model(treeview);
+	if (gtk_tree_model_get_iter(model, &iter, path)) {
+
+		/* Expand / contract nodes with children */
+		if (gtk_tree_model_iter_has_child(model, &iter)) {
+			if (gtk_tree_view_row_expanded(treeview, path))
+				gtk_tree_view_collapse_row(treeview, path);
+			else
+				gtk_tree_view_expand_row(treeview, path, FALSE);
+			return;
+		}
+
+		/* Get the current enabled string and toggle it between "" and "*"
+		 */
+		gtk_tree_model_get(model, &iter, NET_ENABLED_COLUMN, &str, -1);
+		gtk_tree_store_set(GTK_TREE_STORE(model), &iter, NET_ENABLED_COLUMN, !strcmp(str, "*") ? "" : "*", -1);
+		/* set/clear the flag which says the net is enabled or disabled */
+		gtk_tree_model_get(model, &iter, NET_LIBRARY_COLUMN, &menu, -1);
+		menu->flag = strcmp(str, "*") == 0 ? 1 : 0;
+		g_free(str);
+	}
+}
+
+/* Called when the user clicks on a net in the left treeview. */
+static void net_selection_changed_cb(GtkTreeSelection * selection, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	pcb_lib_menu_t *net;
+
+	if (selection_holdoff)				/* PCB is highlighting, user is not selecting */
+		return;
+
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		selected_net = NULL;
+
+		return;
+	}
+
+	/*  Get a pointer, net, to the pcb_lib_menu_t of the newly selected
+	   netlist row, and create a new node model from the net entries
+	   and insert that model into the node view.  Delete old entry model.
+	 */
+	gtk_tree_model_get(model, &iter, NET_LIBRARY_COLUMN, &net, -1);
+	node_model_update(net);
+
+	selected_net = net;
+}
+
+static void netlist_disable_all_cb(GtkToggleButton * button, gpointer data)
+{
+	GtkTreeIter iter;
+	pcb_bool active = gtk_toggle_button_get_active(button);
+	pcb_lib_menu_t *menu;
+
+	/*  Get each net iter and change the NET_ENABLED_COLUMN to a "*" or ""
+	   to flag it as disabled or enabled based on toggle button state.
+	 */
+	if (gtk_tree_model_get_iter_first(net_model, &iter))
+		do {
+			gtk_tree_store_set(GTK_TREE_STORE(net_model), &iter, NET_ENABLED_COLUMN, active ? "*" : "", -1);
+			/* set/clear the flag which says the net is enabled or disabled */
+			gtk_tree_model_get(net_model, &iter, NET_LIBRARY_COLUMN, &menu, -1);
+			menu->flag = active ? 0 : 1;
+		}
+		while (gtk_tree_model_iter_next(net_model, &iter));
+}
+
+/* Select on the layout the current net treeview selection */
+static void netlist_select_cb(GtkWidget * widget, gpointer data)
+{
+	pcb_lib_entry_t *entry;
+	pcb_connection_t conn;
+	gint i;
+	pcb_bool select_flag = GPOINTER_TO_INT(data);
+
+	if (!selected_net)
+		return;
+	if (selected_net == node_selected_net)
+		node_selected_net = NULL;
+
+	pcb_conn_lookup_init();
+	pcb_reset_conns(pcb_true);
+
+	for (i = selected_net->EntryN, entry = selected_net->Entry; i; i--, entry++)
+		if (pcb_rat_seek_pad(entry, &conn, pcb_false))
+			pcb_rat_find_hook(conn.obj, pcb_true, pcb_true);
+
+	pcb_select_connection(PCB, select_flag);
+	pcb_reset_conns(pcb_false);
+	pcb_conn_lookup_uninit();
+	pcb_undo_inc_serial();
+	pcb_draw();
+}
+
+static void netlist_find_cb(GtkWidget * widget, gpointer data)
+{
+	char *name = NULL;
+
+	if (!selected_net)
+		return;
+
+	name = selected_net->Name + 2;
+	pcb_actionl("connection", "reset", NULL);
+	pcb_actionl("netlist", "find", name, NULL);
+}
+
+#warning padstack TODO: this seems to be duplicate in lesstif
+static void netlist_rip_up_cb(GtkWidget * widget, gpointer data)
+{
+
+	if (!selected_net)
+		return;
+	netlist_find_cb(widget, data);
+
+	PCB_LINE_VISIBLE_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+			pcb_remove_object(PCB_OBJ_LINE, layer, line, line);
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_ARC_VISIBLE_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, arc))
+			pcb_remove_object(PCB_OBJ_ARC, layer, arc, arc);
+	}
+	PCB_ENDALL_LOOP;
+
+	if (PCB->pstk_on)
+		PCB_PADSTACK_LOOP(PCB->Data);
+		{
+			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, padstack) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack))
+				pcb_remove_object(PCB_OBJ_PSTK, padstack, padstack, padstack);
+		}
+		PCB_END_LOOP;
+}
+
+typedef struct {
+	pcb_lib_entry_t *ret_val;
+	pcb_lib_menu_t *node_net;
+	const gchar *node_name;
+	pcb_bool found;
+} node_get_node_from_name_state;
+
+static pcb_bool node_get_node_from_name_helper(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data)
+{
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *node;
+	node_get_node_from_name_state *state = data;
+
+	gtk_tree_model_get(net_model, iter, NET_LIBRARY_COLUMN, &net, -1);
+	/* Ignore non-nets (category headers) */
+	if (net == NULL)
+		return FALSE;
+
+	/* Look for the node name in this net. */
+	for (node = net->Entry; node - net->Entry < net->EntryN; node++)
+		if (node->ListEntry && !strcmp(state->node_name, node->ListEntry)) {
+			state->node_net = net;
+			state->ret_val = node;
+			/* stop iterating */
+			state->found = TRUE;
+			return TRUE;
+		}
+	return FALSE;
+}
+
+/* ---------- Manage the GUI treeview of the data models ----------- */
+static gint netlist_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, gpointer data)
+{
+	wplc_config_event(widget, ev, &hid_gtk_wgeo.netlist_x, &hid_gtk_wgeo.netlist_y, &hid_gtk_wgeo.netlist_width,
+										&hid_gtk_wgeo.netlist_height);
+	return FALSE;
+}
+
+static void netlist_close_cb(GtkWidget * widget, gpointer data)
+{
+	pcb_gtk_common_t *com = data;
+
+	gtk_widget_destroy(netlist_window);
+	selected_net = NULL;
+	netlist_window = NULL;
+
+	/* For now, we are the only consumer of this API, so we can just do this */
+	com->cancel_lead_user();
+}
+
+static void netlist_destroy_cb(GtkWidget * widget, void *data)
+{
+	selected_net = NULL;
+	netlist_window = NULL;
+}
+
+static void ghid_netlist_window_create(pcb_gtk_common_t *com)
+{
+	GtkWidget *vbox, *hbox, *button, *label, *sep;
+	GtkTreeView *treeview;
+	GtkTreeModel *model;
+	GtkTreeSelection *selection;
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+
+	/* No point in putting up the window if no netlist is loaded.
+	 */
+	if (!PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN)
+		return;
+
+	if (netlist_window)
+		return;
+
+	netlist_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	g_signal_connect(G_OBJECT(netlist_window), "destroy", G_CALLBACK(netlist_destroy_cb), NULL);
+	gtk_window_set_title(GTK_WINDOW(netlist_window), _("pcb-rnd Netlist"));
+	gtk_window_set_role(GTK_WINDOW(netlist_window), "PCB_Netlist");
+	g_signal_connect(G_OBJECT(netlist_window), "configure_event", G_CALLBACK(netlist_window_configure_event_cb), NULL);
+	gtk_window_set_default_size(GTK_WINDOW(netlist_window), -1, hid_gtk_wgeo.netlist_height);
+
+	gtk_container_set_border_width(GTK_CONTAINER(netlist_window), 2);
+
+	vbox = gtkc_vbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+	gtk_container_add(GTK_CONTAINER(netlist_window), vbox);
+	hbox = gtkc_hbox_new(FALSE, 8);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 4);
+
+
+	model = net_model_create();
+	treeview = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+	net_model = model;
+	net_treeview = treeview;
+	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(net_model), NET_NAME_COLUMN, GTK_SORT_ASCENDING);
+
+	gtk_tree_view_set_rules_hint(treeview, FALSE);
+	g_object_set(treeview, "enable-tree-lines", TRUE, NULL);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(treeview, -1, _(" "), renderer, "text", NET_ENABLED_COLUMN, NULL);
+
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Net Name"), renderer, "text", NET_NAME_COLUMN, NULL);
+	gtk_tree_view_insert_column(treeview, column, -1);
+	gtk_tree_view_set_expander_column(treeview, column);
+
+	/* TODO: dont expand all, but record expanded states when window is
+	   |  destroyed and restore state here.
+	 */
+	gtk_tree_view_expand_all(treeview);
+
+	selection = ghid_scrolled_selection(treeview, hbox,
+																			GTK_SELECTION_SINGLE,
+																			GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, net_selection_changed_cb, NULL);
+
+	/* Connect to the double click event.
+	 */
+	g_signal_connect(G_OBJECT(treeview), "row-activated", G_CALLBACK(net_selection_double_click_cb), NULL);
+
+
+
+	/* Create the elements treeview and wait for a callback to populate it.
+	 */
+	treeview = GTK_TREE_VIEW(gtk_tree_view_new());
+	node_treeview = treeview;
+
+	gtk_tree_view_set_rules_hint(treeview, FALSE);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(treeview, -1, _("Nodes"), renderer, "text", NODE_NAME_COLUMN, NULL);
+
+	selection = ghid_scrolled_selection(treeview, hbox,
+																			GTK_SELECTION_SINGLE,
+																			GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, node_selection_changed_cb, com);
+	node_selection = selection;
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	label = gtk_label_new(_("Operations on selected 'Net Name':"));
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
+
+	button = gtk_button_new_with_label(_("Select"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(netlist_select_cb), GINT_TO_POINTER(1));
+
+	button = gtk_button_new_with_label(_("Unselect"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(netlist_select_cb), GINT_TO_POINTER(0));
+
+	button = gtk_button_new_with_label(_("Find"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(netlist_find_cb), GINT_TO_POINTER(0));
+
+	button = gtk_button_new_with_label(_("Rip Up"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(netlist_rip_up_cb), GINT_TO_POINTER(0));
+
+	pcb_gtk_check_button_connected(vbox, &disable_all_button, FALSE, TRUE, FALSE,
+																 FALSE, 0, netlist_disable_all_cb, NULL, _("Disable all nets for adding rats"));
+
+	sep = gtk_hseparator_new();
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 3);
+
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(netlist_close_cb), com);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	wplc_place(WPLC_NETLIST, netlist_window);
+
+	gtk_widget_realize(netlist_window);
+}
+
+/* A forward declaration is needed here... Could it be avoided ? */
+static pcb_lib_entry_t *node_get_node_from_name(pcb_gtk_common_t *com, gchar *node_name, pcb_lib_menu_t **node_net)
+{
+	node_get_node_from_name_state state;
+
+	if (!node_name)
+		return NULL;
+
+	/*  Have to force the netlist window created because we need the treeview
+	   models constructed to do the search.
+	 */
+	ghid_netlist_window_create(com);
+
+	/*  Now walk through node entries of each net in the net model looking for
+	   the node_name.
+	 */
+	state.found = 0;
+	state.node_name = node_name;
+	gtk_tree_model_foreach(net_model, node_get_node_from_name_helper, &state);
+	if (state.found) {
+		if (node_net)
+			*node_net = state.node_net;
+		return state.ret_val;
+	}
+	return NULL;
+}
+
+void pcb_gtk_dlg_netlist_show(pcb_gtk_common_t *com, pcb_bool raise)
+{
+	ghid_netlist_window_create(com);
+	gtk_widget_show_all(netlist_window);
+	pcb_gtk_dlg_netlist_update(com, TRUE);
+	if (raise)
+		gtk_window_present(GTK_WINDOW(netlist_window));
+}
+
+struct ggnfnn_task {
+	pcb_bool enabled_only;
+	const gchar *node_name;
+	pcb_lib_menu_t *found_net;
+	GtkTreeIter iter;
+};
+
+static pcb_bool hunt_named_node(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data)
+{
+	struct ggnfnn_task *task = (struct ggnfnn_task *) data;
+	pcb_lib_menu_t *net;
+	pcb_lib_entry_t *node;
+	gchar *str;
+	gint j;
+	pcb_bool is_disabled;
+
+	/* We only want to inspect leaf nodes in the tree */
+	if (gtk_tree_model_iter_has_child(model, iter))
+		return FALSE;
+
+	gtk_tree_model_get(model, iter, NET_LIBRARY_COLUMN, &net, -1);
+	gtk_tree_model_get(model, iter, NET_ENABLED_COLUMN, &str, -1);
+	is_disabled = !strcmp(str, "*");
+	g_free(str);
+
+	/* Don't check net nodes of disabled nets. */
+	if (task->enabled_only && is_disabled)
+		return FALSE;
+
+	/* Look for the node name in this net. */
+	for (j = net->EntryN, node = net->Entry; j; j--, node++)
+		if (node->ListEntry && !strcmp(task->node_name, node->ListEntry)) {
+			task->found_net = net;
+			task->iter = *iter;
+			return TRUE;
+		}
+
+	return FALSE;
+}
+
+/* API */
+
+pcb_lib_menu_t *ghid_get_net_from_node_name(pcb_gtk_common_t *com, const gchar * node_name, pcb_bool enabled_only)
+{
+	GtkTreePath *path;
+	struct ggnfnn_task task;
+
+	if (!node_name)
+		return NULL;
+
+	/*  Have to force the netlist window created because we need the treeview
+	   models constructed so we can find the pcb_lib_menu_t pointer the
+	   caller wants.
+	 */
+	ghid_netlist_window_create(com);
+
+	/* If no netlist is loaded the window doesn't appear. */
+	if (netlist_window == NULL)
+		return NULL;
+
+	task.enabled_only = enabled_only;
+	task.node_name = node_name;
+	task.found_net = NULL;
+
+	/*  Now walk through node entries of each net in the net model looking for
+	   the node_name.
+	 */
+	gtk_tree_model_foreach(net_model, hunt_named_node, &task);
+
+	/*  We are asked to highlight the found net if enabled_only is TRUE.
+	   Set holdoff TRUE since this is just a highlight and user is not
+	   expecting normal select action to happen?  Or should the node
+	   treeview also get updated?  Original PCB code just tries to highlight.
+	 */
+	if (task.found_net && enabled_only) {
+		selection_holdoff = TRUE;
+		path = gtk_tree_model_get_path(net_model, &task.iter);
+		gtk_tree_view_scroll_to_cell(net_treeview, path, NULL, TRUE, 0.5, 0.5);
+		gtk_tree_selection_select_path(gtk_tree_view_get_selection(net_treeview), path);
+		selection_holdoff = FALSE;
+	}
+	return task.found_net;
+}
+
+/* PCB LookupConnection code in find.c calls this if it wants a node
+   and its net highlighted. */
+void ghid_netlist_highlight_node(pcb_gtk_common_t *com, const gchar *node_name)
+{
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	pcb_lib_menu_t *net;
+	gchar *name;
+
+	if (!node_name)
+		return;
+
+	if ((net = ghid_get_net_from_node_name(com, node_name, TRUE)) == NULL)
+		return;
+
+	/*  We've found the net containing the node, so update the node treeview
+	   to contain the nodes from the net.  Then we have to find the node
+	   in the new node model so we can highlight it.
+	 */
+	node_model_update(net);
+
+	if (gtk_tree_model_get_iter_first(node_model, &iter))
+		do {
+			gtk_tree_model_get(node_model, &iter, NODE_NAME_COLUMN, &name, -1);
+
+			if (!strcmp(node_name, name)) {	/* found it, so highlight it */
+				selection_holdoff = TRUE;
+				selected_net = net;
+				path = gtk_tree_model_get_path(node_model, &iter);
+				gtk_tree_view_scroll_to_cell(node_treeview, path, NULL, TRUE, 0.5, 0.5);
+				gtk_tree_selection_select_path(gtk_tree_view_get_selection(node_treeview), path);
+				selection_holdoff = FALSE;
+			}
+			g_free(name);
+		}
+		while (gtk_tree_model_iter_next(node_model, &iter));
+}
+
+void pcb_gtk_dlg_netlist_update(pcb_gtk_common_t *com, pcb_bool init_nodes)
+{
+	GtkTreeModel *model;
+
+	/* Make sure there is something to update */
+	ghid_netlist_window_create(com);
+
+	model = net_model;
+	net_model = net_model_create();
+	gtk_tree_view_set_model(net_treeview, net_model);
+	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(net_model), NET_NAME_COLUMN, GTK_SORT_ASCENDING);
+	if (model) {
+		gtk_tree_store_clear(GTK_TREE_STORE(model));
+		g_object_unref(model);
+	}
+
+	selected_net = NULL;
+
+	/* XXX Check if the select callback does this for us */
+	if (init_nodes)
+		node_model_update((&PCB->NetlistLib[PCB_NETLIST_EDITED])->Menu);
+}
+
+/* Actions ? */
+
+void pcb_gtk_netlist_changed(pcb_gtk_common_t *com, void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	loading_new_netlist = TRUE;
+	pcb_gtk_dlg_netlist_update(com, TRUE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_all_button), FALSE);
+	loading_new_netlist = FALSE;
+}
+
+const char pcb_gtk_acts_netlistshow[] = "NetlistShow(pinname|netname)";
+const char pcb_gtk_acth_netlistshow[] = "Selects the given pinname or netname in the netlist window. Does not show the window if it isn't already shown.";
+fgw_error_t pcb_gtk_act_netlistshow(pcb_gtk_common_t *com, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op;
+	const char *pcb_acts_netlistshow = pcb_gtk_acts_netlistshow;
+
+	PCB_ACT_CONVARG(1, FGW_STR, netlistshow, op = argv[1].val.str);
+	ghid_netlist_window_create(com);
+	if (op != NULL)
+		ghid_netlist_highlight_node(com, op);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+const char pcb_gtk_acts_netlistpresent[] = "NetlistPresent()";
+const char pcb_gtk_acth_netlistpresent[] = "Presents the netlist window.";
+fgw_error_t pcb_gtk_act_netlistpresent(pcb_gtk_common_t *com, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_gtk_dlg_netlist_show(com, TRUE);
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_netlist.h	(revision 18980)
@@ -0,0 +1,28 @@
+#ifndef PCB_GTK_DLG_NETLIST_H
+#define PCB_GTK_DLG_NETLIST_H
+
+#include <libfungw/fungw.h>
+#include "pcb_bool.h"
+#include "unit.h"
+#include "event.h"
+#include "glue.h"
+
+/* Creates or raises the _Netlist_ window dialog. */
+void pcb_gtk_dlg_netlist_show(pcb_gtk_common_t *com, pcb_bool raise);
+
+/* Called on netlist changes to keep the gui in sync */
+void pcb_gtk_dlg_netlist_update(pcb_gtk_common_t *com, pcb_bool init_nodes);
+
+void pcb_gtk_netlist_changed(pcb_gtk_common_t *com, void *user_data, int argc, pcb_event_arg_t argv[]);
+
+
+/* Actions */
+extern const char pcb_gtk_acts_netlistshow[];
+extern const char pcb_gtk_acth_netlistshow[];
+fgw_error_t pcb_gtk_act_netlistshow(pcb_gtk_common_t *com, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_gtk_acts_netlistpresent[];
+extern const char pcb_gtk_acth_netlistpresent[];
+fgw_error_t pcb_gtk_act_netlistpresent(pcb_gtk_common_t *com, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+#endif /* PCB_GTK_DLG_NETLIST_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.c	(revision 18980)
@@ -0,0 +1,96 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port */
+
+#include "config.h"
+#include "dlg_pinout.h"
+
+#include "conf_core.h"
+#include "copy.h"
+#include "data.h"
+#include "draw.h"
+#include "move.h"
+#include "rotate.h"
+#include "macro.h"
+
+#include "wt_preview.h"
+#include "win_place.h"
+
+#include "compat.h"
+
+static void pinout_close_cb(GtkWidget * widget, GtkWidget * top_window)
+{
+	gtk_widget_destroy(top_window);
+}
+
+void ghid_pinout_window_show(pcb_gtk_common_t *com, pcb_subc_t *subc)
+{
+	GtkWidget *button, *vbox, *hbox, *preview, *top_window;
+	gchar *title;
+	int width, height;
+
+	if (!subc)
+		return;
+
+	title = g_strdup_printf("%s [%s,%s]",
+		PCB_UNKNOWN(pcb_attribute_get(&subc->Attributes, "value")), PCB_UNKNOWN(subc->refdes), PCB_UNKNOWN(pcb_attribute_get(&subc->Attributes, "value")));
+
+	top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title(GTK_WINDOW(top_window), title);
+	g_free(title);
+	gtk_window_set_role(GTK_WINDOW(top_window), "PCB_Pinout");
+	gtk_container_set_border_width(GTK_CONTAINER(top_window), 4);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(top_window), vbox);
+
+
+	preview = pcb_gtk_preview_pinout_new(com, com->init_drawing_widget, com->preview_expose, (pcb_any_obj_t *)subc);
+
+	gtk_box_pack_start(GTK_BOX(vbox), preview, TRUE, TRUE, 0);
+
+	pcb_gtk_preview_get_natsize(PCB_GTK_PREVIEW(preview), &width, &height);
+
+	/* do not force window size too large */
+	if (width > 200) width = 200;
+	if (height > 200) height = 200;
+
+	gtk_widget_set_size_request(top_window, width, height);
+
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pinout_close_cb), top_window);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+
+	gtk_widget_realize(top_window);
+	wplc_place(WPLC_PINOUT, top_window);
+	gtk_widget_show_all(top_window);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_pinout.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include <gtk/gtk.h>
+#include "hid.h"
+#include "glue.h"
+
+void ghid_pinout_window_show(pcb_gtk_common_t *com, pcb_subc_t *subc);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.c	(revision 18980)
@@ -0,0 +1,83 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+#include "conf_core.h"
+#include "dlg_print.h"
+#include <stdlib.h>
+
+#include "pcb-printf.h"
+#include "hid_attrib.h"
+#include "hid_init.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "dlg_attribute.h"
+
+void ghid_dialog_print(pcb_hid_t * hid, GtkWidget *export_dialog, GtkWidget *top_window)
+{
+	pcb_hid_attribute_t *attr;
+	int n = 0;
+	int i;
+	pcb_hid_attr_val_t *results = NULL;
+
+	/* signal the initial export select dialog that it should close */
+	if (export_dialog)
+		gtk_dialog_response(GTK_DIALOG(export_dialog), GTK_RESPONSE_CANCEL);
+
+	pcb_exporter = hid;
+
+	attr = pcb_exporter->get_export_options(&n);
+	if (n > 0) {
+		results = (pcb_hid_attr_val_t *) malloc(n * sizeof(pcb_hid_attr_val_t));
+		if (results == NULL) {
+			fprintf(stderr, "ghid_dialog_print() -- malloc failed\n");
+			exit(1);
+		}
+
+		/* non-zero means cancel was picked */
+		if (ghid_attribute_dialog(top_window, attr, n, results, _("PCB Print Layout"), pcb_exporter->description, NULL))
+			return;
+
+	}
+
+	pcb_exporter->do_export(results);
+
+	for (i = 0; i < n; i++) {
+		if (results[i].str_value)
+			free((void *) results[i].str_value);
+	}
+
+	if (results)
+		free(results);
+
+	pcb_exporter = NULL;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_print.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <gtk/gtk.h>
+#include "hid.h"
+
+void ghid_dialog_print(pcb_hid_t * hid, GtkWidget *export_dialog, GtkWidget *top_window);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.c	(revision 18980)
@@ -0,0 +1,193 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "dlg_progress.h"
+
+#include "pcb_bool.h"
+#include "compat_nls.h"
+#include "compat.h"
+
+struct progress_dialog {
+	GtkWidget *dialog;
+	GtkWidget *message;
+	GtkWidget *progress;
+	gint response_id;
+	GMainLoop *loop;
+	gboolean destroyed;
+	gboolean started;
+	GTimer *timer;
+
+	gulong response_handler;
+	gulong destroy_handler;
+	gulong delete_handler;
+};
+
+static void run_response_handler(GtkDialog * dialog, gint response_id, gpointer data)
+{
+	struct progress_dialog *pd = data;
+
+	pd->response_id = response_id;
+}
+
+static gint run_delete_handler(GtkDialog * dialog, GdkEventAny * event, gpointer data)
+{
+	struct progress_dialog *pd = data;
+
+	pd->response_id = GTK_RESPONSE_DELETE_EVENT;
+
+	return TRUE;									/* Do not destroy */
+}
+
+static void run_destroy_handler(GtkDialog * dialog, gpointer data)
+{
+	struct progress_dialog *pd = data;
+
+	pd->destroyed = TRUE;
+}
+
+static struct progress_dialog *make_progress_dialog(GtkWidget *top_window)
+{
+	struct progress_dialog *pd;
+	GtkWidget *content_area;
+	GtkWidget *alignment;
+	GtkWidget *vbox;
+
+	pd = g_new0(struct progress_dialog, 1);
+	pd->response_id = GTK_RESPONSE_NONE;
+
+	pd->dialog = gtk_dialog_new_with_buttons(_("Progress"), GTK_WINDOW(top_window),
+																					 /* Modal so nothing else can get events whilst
+																					    the main mainloop isn't running */
+																					 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+																					 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+
+	gtk_window_set_deletable(GTK_WINDOW(pd->dialog), FALSE);
+	gtk_window_set_skip_pager_hint(GTK_WINDOW(pd->dialog), TRUE);
+	gtk_window_set_skip_taskbar_hint(GTK_WINDOW(pd->dialog), TRUE);
+	gtk_widget_set_size_request(pd->dialog, 300, -1);
+
+	pd->message = gtk_label_new(NULL);
+	gtk_misc_set_alignment(GTK_MISC(pd->message), 0., 0.);
+
+	pd->progress = gtk_progress_bar_new();
+	gtk_widget_set_size_request(pd->progress, -1, 26);
+
+	vbox = gtkc_vbox_new(pcb_false, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), pd->message, pcb_true, pcb_true, 8);
+	gtk_box_pack_start(GTK_BOX(vbox), pd->progress, pcb_false, pcb_true, 8);
+
+	alignment = gtk_alignment_new(0., 0., 1., 1.);
+	gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 8, 8, 8, 8);
+	gtk_container_add(GTK_CONTAINER(alignment), vbox);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(pd->dialog));
+	gtk_box_pack_start(GTK_BOX(content_area), alignment, pcb_true, pcb_true, 0);
+
+	gtk_widget_show_all(alignment);
+
+	g_object_ref(pd->dialog);
+	gtk_window_present(GTK_WINDOW(pd->dialog));
+
+	pd->response_handler = g_signal_connect(pd->dialog, "response", G_CALLBACK(run_response_handler), pd);
+	pd->delete_handler = g_signal_connect(pd->dialog, "delete-event", G_CALLBACK(run_delete_handler), pd);
+	pd->destroy_handler = g_signal_connect(pd->dialog, "destroy", G_CALLBACK(run_destroy_handler), pd);
+
+	pd->loop = g_main_loop_new(NULL, FALSE);
+	pd->timer = g_timer_new();
+
+	return pd;
+}
+
+static void destroy_progress_dialog(struct progress_dialog *pd)
+{
+	if (pd == NULL)
+		return;
+
+	if (!pd->destroyed) {
+		g_signal_handler_disconnect(pd->dialog, pd->response_handler);
+		g_signal_handler_disconnect(pd->dialog, pd->delete_handler);
+		g_signal_handler_disconnect(pd->dialog, pd->destroy_handler);
+	}
+
+	g_timer_destroy(pd->timer);
+	g_object_unref(pd->dialog);
+	g_main_loop_unref(pd->loop);
+
+	gtk_widget_destroy(pd->dialog);
+
+	pd->loop = NULL;
+	g_free(pd);
+}
+
+static void handle_progress_dialog_events(struct progress_dialog *pd)
+{
+	GMainContext *context = g_main_loop_get_context(pd->loop);
+
+	/* Process events */
+	while (g_main_context_pending(context)) {
+		g_main_context_iteration(context, FALSE);
+	}
+}
+
+#define MIN_TIME_SEPARATION (50./1000.)	/* 50ms */
+int pcb_gtk_dlg_progress(GtkWidget *top_window, int so_far, int total, const char *message)
+{
+	static struct progress_dialog *pd = NULL;
+
+	/* If we are finished, destroy any dialog */
+	if (so_far == 0 && total == 0 && message == NULL) {
+		destroy_progress_dialog(pd);
+		pd = NULL;
+		return 0;
+	}
+
+	if (pd == NULL)
+		pd = make_progress_dialog(top_window);
+
+	/* We don't want to keep the underlying process too busy whilst we
+	 * process events. If we get called quickly after the last progress
+	 * update, wait a little bit before we respond - perhaps the next
+	 * time progress is reported.
+
+	 * The exception here is that we always want to process the first
+	 * batch of events after having shown the dialog for the first time
+	 */
+	if (pd->started && g_timer_elapsed(pd->timer, NULL) < MIN_TIME_SEPARATION)
+		return 0;
+
+	gtk_label_set_text(GTK_LABEL(pd->message), message);
+	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->progress), (double) so_far / (double) total);
+
+	handle_progress_dialog_events(pd);
+	g_timer_start(pd->timer);
+
+	pd->started = TRUE;
+
+	return (pd->response_id == GTK_RESPONSE_CANCEL || pd->response_id == GTK_RESPONSE_DELETE_EVENT) ? 1 : 0;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_progress.h	(revision 18980)
@@ -0,0 +1,3 @@
+#include <gtk/gtk.h>
+
+int pcb_gtk_dlg_progress(GtkWidget *top_window, int so_far, int total, const char *message);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.c	(revision 18980)
@@ -0,0 +1,570 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* object property edit dialog */
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "config.h"
+
+#include "dlg_propedit.h"
+
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "polygon.h"
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "buffer.h"
+#include "draw.h"
+
+#include "bu_box.h"
+#include "wt_preview.h"
+#include "compat.h"
+
+static char *str_sub(const char *val, char sepi, char sepo)
+{
+	char *tmp, *sep;
+	tmp = pcb_strdup(val);
+	sep = strchr(tmp, sepi);
+	if (sep != NULL)
+		*sep = sepo;
+	return tmp;
+}
+
+static void val_combo_changed_cb(GtkComboBox * combo, pcb_gtk_dlg_propedit_t * dlg)
+{
+	char *cval, *tmp;
+	GtkTreeIter iter;
+	if (gtk_combo_box_get_active_iter(combo, &iter)) {
+		gtk_tree_model_get(GTK_TREE_MODEL(dlg->vals), &iter, 0, &cval, -1);
+		dlg->stock_val = 1;
+		tmp = str_sub(cval, '=', '\0');
+		gtk_entry_set_text(GTK_ENTRY(dlg->entry_val), tmp);
+		free(tmp);
+	}
+}
+
+static void val_entry_changed_cb(GtkWidget * entry, pcb_gtk_dlg_propedit_t * dlg)
+{
+	if (dlg->stock_val == 0)
+		gtk_combo_box_set_active(GTK_COMBO_BOX(dlg->val_box), -1);
+	else
+		dlg->stock_val = 0;
+}
+
+static void val_combo_reset(pcb_gtk_dlg_propedit_t * dlg)
+{
+	gtk_list_store_clear(dlg->vals);
+}
+
+static void val_combo_add(pcb_gtk_dlg_propedit_t * dlg, const char *val)
+{
+	gtk_list_store_insert_with_values(dlg->vals, NULL, -1, 0, val, -1);
+}
+
+#define NO0(s) pcb_strdup((s) == NULL ? "" : (s))
+void pcb_gtk_dlg_propedit_prop_add(pcb_gtk_dlg_propedit_t * dlg, const char *name, const char *common,
+																	 const char *min, const char *max, const char *avg)
+{
+	gtk_list_store_insert_with_values(dlg->props, &dlg->last_add_iter, -1, 0,
+																		pcb_strdup(name), 1, NO0(common), 2, NO0(min), 3, NO0(max), 4, NO0(avg), -1);
+	dlg->last_add_iter_valid = 1;
+}
+
+static void hdr_add(pcb_gtk_dlg_propedit_t * dlg, const char *name, int col)
+{
+	GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(dlg->tree), -1, name, renderer, "text", col, NULL);
+}
+
+static void list_cursor_changed_cb(GtkWidget * tree, pcb_gtk_dlg_propedit_t * dlg)
+{
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreeIter iter;
+	const char *prop, *comm, *val;
+	char *tmp;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->tree));
+	if (tsel == NULL)
+		return;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return;
+
+	gtk_tree_model_get(tm, &iter, 0, &prop, 1, &comm, -1);
+
+	val_combo_reset(dlg);
+
+	val = dlg->propedit_query(dlg->propedit_pe, "v1st", prop, NULL, 0);
+	while (val != NULL) {
+		tmp = str_sub(val, '\n', '=');
+		val_combo_add(dlg, tmp);
+		free(tmp);
+		val = dlg->propedit_query(dlg->propedit_pe, "vnxt", prop, NULL, 0);
+	}
+
+	tmp = str_sub(comm, '\n', '\0');
+	gtk_entry_set_text(GTK_ENTRY(dlg->entry_val), tmp);
+	free(tmp);
+}
+
+static void do_remove_cb(GtkWidget * tree, pcb_gtk_dlg_propedit_t * dlg)
+{
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreeIter iter;
+	char *prop;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->tree));
+	if (tsel == NULL)
+		return;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return;
+
+	gtk_tree_model_get(tm, &iter, 0, &prop, -1);
+
+	if (dlg->propedit_query(dlg->propedit_pe, "vdel", prop, NULL, 0) != NULL)
+		gtk_list_store_remove(GTK_LIST_STORE(tm), &iter);
+
+	free(prop);
+}
+
+static int keyval_input(char **key, char **val, pcb_gtk_dlg_propedit_t * dlg)
+{
+	GtkWidget *dialog;
+	GtkWidget *content_area;
+	GtkWidget *vbox, *label, *kentry, *ventry;
+	gboolean response;
+
+	dialog = gtk_dialog_new_with_buttons("New attribute",
+																			 GTK_WINDOW(dlg->com->top_window),
+																			 GTK_DIALOG_MODAL,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+	vbox = gtkc_vbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+
+	label = gtk_label_new("");
+	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(label), "Attribute key:");
+
+	kentry = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(kentry), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), kentry, TRUE, TRUE, 0);
+
+	label = gtk_label_new("");
+	gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(label), "Attribute value:");
+
+	ventry = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(ventry), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), ventry, TRUE, TRUE, 0);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_container_add(GTK_CONTAINER(content_area), vbox);
+	gtk_widget_show_all(dialog);
+
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (response == GTK_RESPONSE_OK) {
+		*key = gtk_editable_get_chars(GTK_EDITABLE(kentry), 0, -1);
+		*val = gtk_editable_get_chars(GTK_EDITABLE(ventry), 0, -1);
+		gtk_widget_destroy(dialog);
+		return 1;
+	}
+
+	gtk_widget_destroy(dialog);
+	return 0;
+}
+
+static void do_addattr_cb(GtkWidget * tree, pcb_gtk_dlg_propedit_t * dlg)
+{
+	char *name, *value;
+
+	if (keyval_input(&name, &value, dlg)) {
+		char *path;
+		if ((name[0] == 'a') && (name[1] == '/')) {
+			path = name;
+			name = NULL;
+		}
+		else {
+			int len = strlen(name);
+			path = malloc(len + 3);
+			path[0] = 'a';
+			path[1] = '/';
+			strcpy(path + 2, name);
+		}
+		dlg->propedit_query(dlg->propedit_pe, "vset", path, value, 0);
+		free(path);
+		free(name);
+	}
+}
+
+static void do_apply_cb(GtkWidget * tree, pcb_gtk_dlg_propedit_t * dlg)
+{
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreeIter iter;
+	char *prop, *val;
+	const char *typ;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->tree));
+	if (tsel == NULL)
+		return;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return;
+
+	gtk_tree_model_get(tm, &iter, 0, &prop, -1);
+
+	val = pcb_strdup(gtk_entry_get_text(GTK_ENTRY(dlg->entry_val)));
+
+	typ = dlg->propedit_query(dlg->propedit_pe, "type", prop, NULL, 0);
+	if (typ != NULL) {
+		if (*typ == 'c') {					/* if type of the field if coords, we may need to fix missing units */
+			char *end;
+			strtod(val, &end);
+			while (isspace(*end))
+				end++;
+			if (*end == '\0') {				/* no unit - automatically append current default */
+				int len = strlen(val);
+				char *new_val;
+				new_val = malloc(len + 32);
+				strcpy(new_val, val);
+				sprintf(new_val + len, " %s", conf_core.editor.grid_unit->suffix);
+				free(val);
+				val = new_val;
+			}
+		}
+
+		if (dlg->propedit_query(dlg->propedit_pe, "vset", prop, val, 0) != NULL) {
+			/* could change values update the table - the new row is already added, remove the old */
+			gtk_list_store_remove(GTK_LIST_STORE(tm), &iter);
+			if (dlg->last_add_iter_valid) {
+				gtk_tree_selection_select_iter(tsel, &dlg->last_add_iter);
+				dlg->last_add_iter_valid = 0;
+			}
+			/* get the combo box updated */
+			list_cursor_changed_cb(dlg->tree, dlg);
+			if ((*val == '+') || (*val == '-') || (*val == '#'))
+				gtk_entry_set_text(GTK_ENTRY(dlg->entry_val), val);	/* keep relative and forced absolute values intact for a reapply */
+			pcb_gui->invalidate_all();
+		}
+		else
+			pcb_message(PCB_MSG_WARNING, "Failed to change any object - %s is possibly invalid value for %s\n", val, prop);
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Internal error: no type for proeprty %s\n", prop);
+
+	free(val);
+	g_free(prop);
+}
+
+static pcb_board_t preview_pcb;
+
+static void prop_preview_init(void)
+{
+	pcb_poly_t *v;
+	pcb_layer_id_t n;
+	pcb_board_t *old_pcb;
+	old_pcb = PCB;
+	PCB = &preview_pcb;
+
+	memset(&preview_pcb, 0, sizeof(preview_pcb));
+	preview_pcb.Data = pcb_buffer_new(&preview_pcb);
+	preview_pcb.MaxWidth = preview_pcb.MaxHeight = PCB_MIL_TO_COORD(1000);
+	pcb_font_create_default(&preview_pcb);
+	preview_pcb.pstk_on = 1;
+
+	for (n = 0; n < 2; n++) {
+		preview_pcb.Data->Layer[n].is_bound = 0;
+		preview_pcb.Data->Layer[n].meta.real.vis = 1;
+		preview_pcb.Data->Layer[n].meta.real.color = pcb_strdup(old_pcb->Data->Layer[n].meta.real.color);
+		preview_pcb.Data->Layer[n].name = pcb_strdup("preview dummy");
+		
+	}
+
+	memcpy(&preview_pcb.LayerGroups, &old_pcb->LayerGroups, sizeof(old_pcb->LayerGroups));
+	preview_pcb.Data->LayerN = 1;
+	preview_pcb.Data->Layer[0].meta.real.grp = 0;
+	preview_pcb.LayerGroups.grp[0].ltype = PCB_LYT_COPPER | PCB_LYT_TOP;
+	preview_pcb.LayerGroups.grp[0].lid[0] = 0;
+	preview_pcb.LayerGroups.grp[0].len = 1;
+	preview_pcb.LayerGroups.grp[0].parent.any = NULL;
+	preview_pcb.LayerGroups.grp[0].parent_type = PCB_PARENT_INVALID;
+	preview_pcb.LayerGroups.grp[0].type = PCB_OBJ_LAYERGRP;
+	preview_pcb.LayerGroups.len = 1;
+	PCB_SET_PARENT(preview_pcb.Data, board, &preview_pcb);
+	preview_pcb.Data->Layer[0].parent.data = preview_pcb.Data;
+	preview_pcb.Data->Layer[0].parent_type = PCB_PARENT_DATA;
+	preview_pcb.Data->Layer[0].type = PCB_OBJ_LAYER;
+
+#warning TODO: preview_pcb is never freed
+
+#warning padstack TODO: create a padstack
+#if 0
+	pcb_via_new(preview_pcb.Data,
+							PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000),
+							PCB_MIL_TO_COORD(50), PCB_MIL_TO_COORD(40), 0, PCB_MIL_TO_COORD(20), "", pcb_no_flags());
+#endif
+
+	pcb_line_new(preview_pcb.Data->Layer + 0,
+							 PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000),
+							 PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1300),
+							 PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(40), pcb_flag_make(PCB_FLAG_CLEARLINE));
+
+	pcb_arc_new(preview_pcb.Data->Layer + 0,
+							PCB_MIL_TO_COORD(1000), PCB_MIL_TO_COORD(1000),
+							PCB_MIL_TO_COORD(100), PCB_MIL_TO_COORD(100),
+							0.0, 90.0, PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(40), pcb_flag_make(PCB_FLAG_CLEARLINE), pcb_false);
+
+	pcb_text_new(preview_pcb.Data->Layer + 0, pcb_font(PCB, 0, 1),
+							 PCB_MIL_TO_COORD(850), PCB_MIL_TO_COORD(1150), 0, 100, "Text", pcb_flag_make(PCB_FLAG_CLEARLINE));
+
+	v = pcb_poly_new_from_rectangle(preview_pcb.Data->Layer + 0,
+																									 PCB_MIL_TO_COORD(10), PCB_MIL_TO_COORD(10),
+																									 PCB_MIL_TO_COORD(1200), PCB_MIL_TO_COORD(1200),
+																									 0, pcb_flag_make(PCB_FLAG_CLEARPOLY));
+	pcb_poly_init_clip(preview_pcb.Data, preview_pcb.Data->Layer + 0, v);
+	PCB = old_pcb;
+
+/*
+	{
+		GdkGC *gc = gdk_gc_new(GDK_DRAWABLE(gport->top_window->window));
+		GdkColor clr = {0, 0, 0, 0};
+		int x, y;
+		double zm = 40000 * zoom1;
+
+		gdk_gc_set_rgb_fg_color(gc, &clr);
+
+		x = (PCB_MIL_TO_COORD(1000) - cx) / zm + 0.5 + 200;
+		y = (PCB_MIL_TO_COORD(1000) - cy) / zm + 0.5 + 150;
+		gdk_draw_line(pm, gc, x, y, 0, 0);
+		gdk_draw_line(pm, gc, x+1, y+1, 1, 1);
+		gdk_draw_line(pm, gc, x-1, y-1, -1, -1);
+	}
+*/
+}
+
+static void prop_preview_draw(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
+{
+	pcb_board_t *old_pcb;
+	old_pcb = PCB;
+	PCB = &preview_pcb;
+	pcb_draw_layer(&(PCB->Data->Layer[0]), &e->view);
+	pcb_draw_ppv(0, &e->view);
+	PCB = old_pcb;
+}
+
+
+/*static void sort_by_name(GtkTreeModel *liststore)
+{
+	GtkTreeSortable *sortable = GTK_TREE_SORTABLE(liststore);
+	gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
+}*/
+
+static gint sort_name_cmp(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer userdata)
+{
+	gint sortcol = GPOINTER_TO_INT(userdata);
+	gint ret = 0;
+	gchar *name1, *name2;
+
+	if (sortcol != 0)
+		return 0;
+
+	gtk_tree_model_get(model, a, 0, &name1, -1);
+	gtk_tree_model_get(model, b, 0, &name2, -1);
+
+	if ((name1 == NULL) && (name2 == NULL))
+		return 0;
+
+	if (name1 == NULL)
+		ret = -1;
+	else if (name2 == NULL)
+		ret = 1;
+	else if ((*name1 == 'a') && (*name2 == 'p'))	/* force attributes to the bottom */
+		return 1;
+	else if ((*name1 == 'p') && (*name2 == 'a'))
+		return -1;
+	else
+		ret = strcmp(name1, name2);
+
+	g_free(name1);
+	g_free(name2);
+
+	return ret;
+}
+
+static void make_sortable(GtkTreeModel * liststore)
+{
+	GtkTreeSortable *sortable;
+
+	sortable = GTK_TREE_SORTABLE(liststore);
+	gtk_tree_sortable_set_sort_func(sortable, 0, sort_name_cmp, GINT_TO_POINTER(0), NULL);
+
+	gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
+}
+
+GtkWidget *pcb_gtk_dlg_propedit_create(pcb_gtk_dlg_propedit_t *dlg, pcb_gtk_common_t *com)
+{
+	GtkWidget *window, *vbox_tree, *vbox_edit, *hbox_win, *label, *scrolled_win;
+	GtkWidget *hbx, *dummy, *box_val_edit, *prv;
+	GtkCellRenderer *renderer;
+	GtkWidget *content_area;
+	pcb_gtk_preview_t *p;
+
+
+	dlg->last_add_iter_valid = 0;
+	dlg->com = com;
+
+	window = gtk_dialog_new_with_buttons(_("Edit Properties"),
+																			 GTK_WINDOW(com->top_window),
+																			 GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(window));
+
+	hbox_win = gtkc_hbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(content_area), hbox_win);
+
+	vbox_tree = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox_win), vbox_tree, TRUE, TRUE, 4);
+	vbox_edit = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox_win), vbox_edit, FALSE, FALSE, 4);
+
+/***** LEFT *****/
+
+	label = gtk_label_new("Properties");
+	gtk_box_pack_start(GTK_BOX(vbox_tree), label, FALSE, FALSE, 4);
+
+	scrolled_win = GTK_WIDGET(g_object_new(GTK_TYPE_SCROLLED_WINDOW,
+		"hscrollbar-policy", GTK_POLICY_AUTOMATIC,
+		"vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+		"shadow-type", GTK_SHADOW_ETCHED_IN,
+		NULL));
+	gtk_box_pack_start(GTK_BOX(vbox_tree), scrolled_win, TRUE, TRUE, 0);
+	gtk_widget_set_size_request(scrolled_win, 500, 150); /* enlarge the window initially */
+
+	dlg->tree = gtk_tree_view_new();
+	gtk_container_add(GTK_CONTAINER(scrolled_win), dlg->tree);
+
+	GType ty[5];
+
+	int n;
+	for (n = 0; n < 5; n++)
+		ty[n] = G_TYPE_STRING;
+	dlg->props = gtk_list_store_newv(5, ty);
+	make_sortable((GtkTreeModel *) dlg->props);
+	gtk_tree_view_set_model(GTK_TREE_VIEW(dlg->tree), GTK_TREE_MODEL(dlg->props));
+
+	hdr_add(dlg, "property", 0);
+	hdr_add(dlg, "common", 1);
+	hdr_add(dlg, "min", 2);
+	hdr_add(dlg, "max", 3);
+	hdr_add(dlg, "avg", 4);
+
+	/* list manipulation */
+	hbx = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox_tree), hbx, FALSE, FALSE, 4);
+
+	dlg->remove = gtk_button_new_with_label("Remove attribute");
+	gtk_box_pack_start(GTK_BOX(hbx), dlg->remove, FALSE, TRUE, 4);
+	g_signal_connect(G_OBJECT(dlg->remove), "clicked", G_CALLBACK(do_remove_cb), dlg);
+
+	dlg->addattr = gtk_button_new_with_label("Add attribute");
+	gtk_box_pack_start(GTK_BOX(hbx), dlg->addattr, FALSE, TRUE, 4);
+	g_signal_connect(G_OBJECT(dlg->addattr), "clicked", G_CALLBACK(do_addattr_cb), dlg);
+
+
+/***** RIGHT *****/
+/* preview */
+	prop_preview_init();
+	prv = pcb_gtk_preview_dialog_new(com, com->init_drawing_widget, com->preview_expose, prop_preview_draw);
+
+	p = (pcb_gtk_preview_t *) prv;
+	p->view.x0 = PCB_MIL_TO_COORD(800);
+	p->view.y0 = PCB_MIL_TO_COORD(800);
+	p->view.coord_per_px = PCB_MIL_TO_COORD(2.5);
+	pcb_gtk_zoom_post(&p->view);
+
+	gtk_widget_set_size_request(prv, 150, 150);
+
+	gtk_box_pack_start(GTK_BOX(vbox_edit), prv, TRUE, TRUE, 4);
+
+	label = gtk_label_new("Change property\nof all objects");
+	gtk_box_pack_start(GTK_BOX(vbox_edit), label, FALSE, TRUE, 4);
+
+	g_signal_connect(G_OBJECT(dlg->tree), "cursor-changed", G_CALLBACK(list_cursor_changed_cb), dlg);
+
+	/* value edit */
+	renderer = gtk_cell_renderer_text_new();
+
+	dlg->stock_val = 0;
+	dlg->vals = gtk_list_store_new(1, G_TYPE_STRING);
+	box_val_edit = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox_edit), box_val_edit, FALSE, TRUE, 4);
+
+	/* combo */
+	dlg->val_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(dlg->vals));
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dlg->val_box), renderer, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dlg->val_box), renderer, "text", 0, NULL);
+	gtk_box_pack_start(GTK_BOX(box_val_edit), dlg->val_box, FALSE, TRUE, 0);
+
+	g_signal_connect(G_OBJECT(dlg->val_box), "changed", G_CALLBACK(val_combo_changed_cb), dlg);
+
+	/* entry */
+	dlg->entry_val = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(box_val_edit), dlg->entry_val, TRUE, TRUE, 0);
+
+	g_signal_connect(G_OBJECT(dlg->entry_val), "changed", G_CALLBACK(val_entry_changed_cb), dlg);
+
+	/* Apply button */
+	hbx = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox_edit), hbx, FALSE, TRUE, 4);
+
+	dummy = gtkc_vbox_new(FALSE, 0);	/* dummy box to eat up free space on the left */
+	gtk_box_pack_start(GTK_BOX(hbx), dummy, TRUE, TRUE, 4);
+
+	dlg->apply = gtk_button_new_with_label("Apply");
+	gtk_box_pack_start(GTK_BOX(hbx), dlg->apply, FALSE, TRUE, 4);
+	g_signal_connect(G_OBJECT(dlg->apply), "clicked", G_CALLBACK(do_apply_cb), dlg);
+
+	/* Runs the dialog */
+	gtk_widget_show_all(window);
+
+	gtk_widget_set_size_request(scrolled_win, 100, 100); /* allow resizing to smaller */
+
+	return window;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_propedit.h	(revision 18980)
@@ -0,0 +1,59 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <gtk/gtk.h>
+#include "glue.h"
+
+/* object property edit dialog */
+
+typedef struct {
+	/* property list */
+	GtkWidget *tree;							/* property list widget               */
+	GtkListStore *props;					/* list model of properties           */
+
+	/* value entry */
+	GtkWidget *entry_val;					/* text entry                         */
+	GtkWidget *val_box;						/* combo box                          */
+	GtkListStore *vals;						/* model of the combo box             */
+	int stock_val;								/* 1 if the value in the entry box is being edited from the combo             */
+	GtkTreeIter last_add_iter;		/* the iterator of the last added row (sometimes it needs to be selected)     */
+	int last_add_iter_valid;
+
+	/* buttons */
+	GtkWidget *apply, *remove, *addattr;
+
+	/* glue to hid_gtk* */
+	const char *(*propedit_query)(void *pe, const char *cmd, const char *key, const char *val, int idx);
+	void *propedit_pe;
+
+	pcb_gtk_common_t *com;
+} pcb_gtk_dlg_propedit_t;
+
+/* Creates and runs a dialog to edit selected object properties */
+GtkWidget *pcb_gtk_dlg_propedit_create(pcb_gtk_dlg_propedit_t *dlg, pcb_gtk_common_t *com);
+
+void pcb_gtk_dlg_propedit_prop_add(pcb_gtk_dlg_propedit_t * dlg, const char *name, const char *common,
+																	 const char *min, const char *max, const char *avg);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.c	(revision 18980)
@@ -0,0 +1,95 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Originally from gui-utils.c, was written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  Those functions were utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ */
+
+#include "config.h"
+
+#include "dlg_report.h"
+#include "compat.h"
+#include "bu_box.h"
+
+void pcb_gtk_dlg_report(GtkWidget * top_window, const gchar * title, const gchar * message, gboolean modal)
+{
+	GtkWidget *w;
+	GtkDialog *dialog;
+	GtkWidget *content_area;
+	GtkWidget *scrolled;
+	GtkWidget *vbox, *vbox1;
+	GtkWidget *label;
+	GtkTextView *text_view;
+	GtkTextBuffer *buffer;
+	const gchar *s;
+	gint nlines;
+
+	if (!message)
+		return;
+	w = gtk_dialog_new_with_buttons(title ? title : "PCB",
+																	GTK_WINDOW(top_window),
+																	GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_NONE, NULL);
+	dialog = GTK_DIALOG(w);
+	gtk_dialog_set_default_response(dialog, GTK_RESPONSE_CLOSE);
+
+	gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
+
+	g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), G_OBJECT(dialog));
+	gtk_window_set_role(GTK_WINDOW(w), "PCB_Dialog");
+
+	content_area = gtk_dialog_get_content_area(dialog);
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
+
+	label = gtk_text_view_new();
+	text_view = GTK_TEXT_VIEW(label);
+	buffer = gtk_text_view_get_buffer(text_view);
+	gtk_text_view_set_cursor_visible(text_view, FALSE);
+	gtk_text_view_set_editable(text_view, FALSE);
+	gtk_text_view_set_wrap_mode(text_view, GTK_WRAP_NONE);
+	/* The message should be NULL terminated */
+	gtk_text_buffer_set_text(buffer, message, -1);
+
+	for (nlines = 0, s = message; *s; ++s)
+		if (*s == '\n')
+			++nlines;
+	if (nlines > 20) {
+		vbox1 = ghid_scrolled_vbox(vbox, &scrolled, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+		gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+		gtk_widget_set_size_request(scrolled, -1, 300);
+		gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, FALSE, 0);
+	}
+	else
+		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	gtk_widget_show_all(w);
+	gtk_window_set_modal(GTK_WINDOW(dialog), modal);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_report.h	(revision 18980)
@@ -0,0 +1,3 @@
+#include <gtk/gtk.h>
+
+void pcb_gtk_dlg_report(GtkWidget * top_window, const gchar * title, const gchar * message, gboolean modal);
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.c	(revision 18980)
@@ -0,0 +1,459 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* route style edit dialog */
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "config.h"
+
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "polygon.h"
+
+#include "bu_box.h"
+#include "compat.h"
+#include "board.h"
+#include "conf_core.h"
+#include "error.h"
+
+#include "dlg_route_style.h"
+#include "wt_coord_entry.h"
+
+/* SIGNAL HANDLERS */
+
+/* Rebuild the gtk table for attribute list from style */
+static void update_attrib(pcb_gtk_dlg_route_style_t *dialog, pcb_gtk_obj_route_style_t *style)
+{
+	GtkTreeIter iter;
+	int i;
+
+	gtk_list_store_clear(dialog->attr_model);
+
+	for (i = 0; i < style->rst->attr.Number; i++) {
+		gtk_list_store_append(dialog->attr_model, &iter);
+		gtk_list_store_set(dialog->attr_model, &iter, 0, style->rst->attr.List[i].name, -1);
+		gtk_list_store_set(dialog->attr_model, &iter, 1, style->rst->attr.List[i].value, -1);
+	}
+
+	gtk_list_store_append(dialog->attr_model, &iter);
+	gtk_list_store_set(dialog->attr_model, &iter, 0, "<new>", -1);
+	gtk_list_store_set(dialog->attr_model, &iter, 1, "<new>", -1);
+}
+
+static int get_sel(pcb_gtk_dlg_route_style_t *dlg)
+{
+	GtkTreeIter iter;
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreePath *path;
+	int *i;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(dlg->attr_table));
+	if (tsel == NULL)
+		return -1;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return -1;
+
+	path = gtk_tree_model_get_path(tm, &iter);
+	if (path != NULL) {
+		i = gtk_tree_path_get_indices(path);
+		if (i != NULL) {
+/*			gtk_tree_model_get(GTK_TREE_MODEL(dlg->attr_model), &iter, 0, nkey, 1, nval, -1);*/
+			return i[0];
+		}
+	}
+	return -1;
+}
+
+/* When a different style is selected, load that style's data into the dialog. */
+static void dialog_style_changed_cb(GtkComboBox *combo, pcb_gtk_dlg_route_style_t *dialog)
+{
+	pcb_gtk_route_style_t *rss;
+	pcb_gtk_obj_route_style_t *style;
+	GtkTreeIter iter;
+	GtkTreeModel *tree_model;
+
+	if (dialog->inhibit_style_change)
+		return;
+
+	rss = dialog->rss;
+	tree_model = GTK_TREE_MODEL(rss->model);
+	gtk_combo_box_get_active_iter(combo, &iter);
+	gtk_tree_model_get(tree_model, &iter, STYLE_DATA_COL, &style, -1);
+
+	if (style == NULL) {
+		gtk_entry_set_text(GTK_ENTRY(dialog->name_entry), _("New Style"));
+		rss->selected = -1;
+		return;
+	}
+
+	gtk_entry_set_text(GTK_ENTRY(dialog->name_entry), style->rst->name);
+	pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(dialog->line_entry), style->rst->Thick);
+	pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(dialog->via_hole_entry), style->rst->Hole);
+	pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(dialog->via_size_entry), style->rst->Diameter);
+	pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(dialog->clearance_entry), style->rst->Clearance);
+
+	if (style->hidden)
+		rss->selected = -1;
+	else
+		rss->selected = style->rst - PCB->RouteStyle.array;
+
+	update_attrib(dialog, style);
+}
+
+static void attr_edited(int col, GtkCellRendererText *cell, gchar *path, gchar *new_text, pcb_gtk_dlg_route_style_t *dlg)
+{
+	GtkTreeIter iter;
+	pcb_gtk_obj_route_style_t *style;
+	int idx = get_sel(dlg);
+
+	dlg->attr_editing = 0;
+
+	gtk_combo_box_get_active_iter(GTK_COMBO_BOX(dlg->select_box), &iter);
+	gtk_tree_model_get(GTK_TREE_MODEL(dlg->rss->model), &iter, STYLE_DATA_COL, &style, -1);
+
+	if (style == NULL)
+		return;
+
+	if (idx >= style->rst->attr.Number) { /* add new */
+		if (col == 0)
+			pcb_attribute_put(&style->rst->attr, new_text, "n/a");
+		else
+			pcb_attribute_put(&style->rst->attr, "n/a", new_text);
+	}
+	else {  /* overwrite existing */
+		char **dest;
+		if (col == 0)
+			dest = &style->rst->attr.List[idx].name;
+		else
+			dest = &style->rst->attr.List[idx].value;
+		if (*dest != NULL)
+			free(*dest);
+		*dest = pcb_strdup(new_text);
+	}
+
+	/* rebuild the table to keep it in sync - expensive, but it happens rarely */
+	update_attrib(dlg, style);
+}
+
+static void attr_edited_key_cb(GtkCellRendererText *cell, gchar *path, gchar *new_text, pcb_gtk_dlg_route_style_t *dlg)
+{
+	attr_edited(0, cell, path, new_text, dlg);
+}
+
+static void attr_edited_val_cb(GtkCellRendererText *cell, gchar *path, gchar *new_text, pcb_gtk_dlg_route_style_t *dlg)
+{
+	attr_edited(1, cell, path, new_text, dlg);
+}
+
+static void attr_edit_started_cb(GtkCellRendererText *cell, GtkCellEditable *e, gchar *path, pcb_gtk_dlg_route_style_t *dlg)
+{
+	dlg->attr_editing = 1;
+}
+
+static void attr_edit_canceled_cb(GtkCellRendererText *cell, pcb_gtk_dlg_route_style_t *dlg)
+{
+	dlg->attr_editing = 0;
+}
+
+static gboolean attr_key_release_cb(GtkWidget *widget, GdkEventKey *event, pcb_gtk_dlg_route_style_t *dlg)
+{
+	unsigned short int kv = event->keyval;
+
+	if (dlg->attr_editing)
+		return FALSE;
+
+	switch (kv) {
+#ifdef GDK_KEY_KP_Delete
+	case GDK_KEY_KP_Delete:
+#endif
+#ifdef GDK_KEY_Delete
+	case GDK_KEY_Delete:
+#endif
+	case 'd':
+		{
+			int idx = get_sel(dlg);
+			GtkTreeIter iter;
+			pcb_gtk_obj_route_style_t *style;
+			gtk_combo_box_get_active_iter(GTK_COMBO_BOX(dlg->select_box), &iter);
+			gtk_tree_model_get(GTK_TREE_MODEL(dlg->rss->model), &iter, STYLE_DATA_COL, &style, -1);
+			if (style == NULL)
+				return FALSE;
+			if ((idx >= 0) && (idx < style->rst->attr.Number)) {
+				pcb_attribute_remove_idx(&style->rst->attr, idx);
+				update_attrib(dlg, style);
+			}
+		}
+		break;
+	}
+	return FALSE;
+}
+
+static void add_new_iter(pcb_gtk_route_style_t *rss)
+{
+	/* Add "new style" option to list */
+	gtk_list_store_append(rss->model, &rss->new_iter);
+	gtk_list_store_set(rss->model, &rss->new_iter, STYLE_TEXT_COL, _("<New>"), STYLE_DATA_COL, NULL, -1);
+}
+
+/*  Callback for Delete route style button */
+static void delete_button_cb(GtkButton *button, pcb_gtk_dlg_route_style_t *dialog)
+{
+	if (dialog->rss->selected < 0)
+		return;
+
+	dialog->inhibit_style_change = 1;
+	pcb_gtk_route_style_empty(dialog->rss);
+
+#warning TODO: some of these should be in core
+	pcb_gtk_route_style_copy(dialog->rss->selected);
+
+	vtroutestyle_remove(&PCB->RouteStyle, dialog->rss->selected, 1);
+	dialog->rss->active_style = NULL;
+	make_route_style_buttons(GHID_ROUTE_STYLE(dialog->rss));
+	pcb_trace("Style: %d deleted\n", dialog->rss->selected);
+	pcb_board_set_changed_flag(pcb_true);
+	dialog->rss->com->window_set_name_label(PCB->Name);
+	add_new_iter(dialog->rss);
+	dialog->inhibit_style_change = 0;
+	pcb_gtk_route_style_select_style(dialog->rss, &pcb_custom_route_style);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->select_box), 0);
+}
+
+static void _table_attach_(GtkWidget *table, gint row, const gchar *label, GtkWidget *entry)
+{
+	GtkWidget *label_w = gtk_label_new(label);
+	gtk_misc_set_alignment(GTK_MISC(label_w), 1.0, 0.5);
+	gtk_table_attach(GTK_TABLE(table), label_w, 0, 1, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+	gtk_table_attach(GTK_TABLE(table), entry, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+}
+
+static void _table_attach(GtkWidget *table, gint row, const gchar *label, GtkWidget **entry, pcb_coord_t min, pcb_coord_t max)
+{
+	*entry = pcb_gtk_coord_entry_new(min, max, 0, conf_core.editor.grid_unit, CE_SMALL);
+	_table_attach_(table, row, label, *entry);
+}
+
+void pcb_gtk_route_style_edit_dialog(pcb_gtk_common_t *com, pcb_gtk_route_style_t *rss)
+{
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	pcb_gtk_dlg_route_style_t dialog_data;
+	GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+	GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(rss));
+	GtkWidget *dialog;
+	GtkWidget *content_area;
+	GtkWidget *vbox, *hbox, *sub_vbox, *table;
+	GtkWidget *label, *select_box, *check_box;
+	GtkWidget *button;
+	const char *new_name;
+
+	memset(&dialog_data, 0, sizeof(dialog_data));  /* make sure all flags are cleared */
+
+	/* Build dialog */
+	dialog = gtk_dialog_new_with_buttons(_("Edit Route Styles"),
+																			 GTK_WINDOW(window),
+																			 GTK_DIALOG_DESTROY_WITH_PARENT,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_NONE, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+	label = gtk_label_new(_("Edit Style:"));
+	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+
+	select_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(rss->model));
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(select_box), renderer, TRUE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(select_box), renderer, "text", STYLE_TEXT_COL, NULL);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+
+	hbox = gtkc_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 4);
+	vbox = gtkc_vbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 4);
+
+	hbox = gtkc_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), select_box, TRUE, TRUE, 0);
+
+	sub_vbox = ghid_category_vbox(vbox, _("Route Style Data"), 4, 2, TRUE, TRUE);
+	table = gtk_table_new(5, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(sub_vbox), table, TRUE, TRUE, 4);
+	label = gtk_label_new(_("Name:"));
+	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+	dialog_data.name_entry = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+	gtk_table_attach(GTK_TABLE(table), dialog_data.name_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
+
+	_table_attach(table, 1, _("Line width:"), &dialog_data.line_entry, PCB_MIN_LINESIZE, PCB_MAX_LINESIZE);
+	_table_attach(table, 2, _("Via hole size:"),
+								&dialog_data.via_hole_entry, PCB_MIN_PINORVIAHOLE, PCB_MAX_PINORVIASIZE - PCB_MIN_PINORVIACOPPER);
+	_table_attach(table, 3, _("Via ring size:"),
+								&dialog_data.via_size_entry, PCB_MIN_PINORVIAHOLE + PCB_MIN_PINORVIACOPPER, PCB_MAX_PINORVIASIZE);
+	_table_attach(table, 4, _("Clearance:"), &dialog_data.clearance_entry, 0, PCB_MAX_LINESIZE);
+
+	_table_attach_(table, 5, "", gtk_label_new(""));
+
+	/* create attrib table */
+	{
+		GType *ty;
+		GtkCellRenderer *renderer;
+
+		dialog_data.attr_table = gtk_tree_view_new();
+
+		ty = malloc(sizeof(GType) * 2);
+		ty[0] = G_TYPE_STRING;
+		ty[1] = G_TYPE_STRING;
+		dialog_data.attr_model = gtk_list_store_newv(2, ty);
+		free(ty);
+
+		renderer = gtk_cell_renderer_text_new();
+		g_object_set(renderer, "editable", TRUE, NULL);
+		g_signal_connect(renderer, "edited", G_CALLBACK(attr_edited_key_cb), &dialog_data);
+		g_signal_connect(renderer, "editing-started", G_CALLBACK(attr_edit_started_cb), &dialog_data);
+		g_signal_connect(renderer, "editing-canceled", G_CALLBACK(attr_edit_canceled_cb), &dialog_data);
+		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(dialog_data.attr_table), -1, "key", renderer, "text", 0, NULL);
+
+
+		renderer = gtk_cell_renderer_text_new();
+		g_object_set(renderer, "editable", TRUE, NULL);
+		g_signal_connect(renderer, "edited", G_CALLBACK(attr_edited_val_cb), &dialog_data);
+		g_signal_connect(renderer, "editing-started", G_CALLBACK(attr_edit_started_cb), &dialog_data);
+		g_signal_connect(renderer, "editing-canceled", G_CALLBACK(attr_edit_canceled_cb), &dialog_data);
+		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(dialog_data.attr_table), -1, "value", renderer, "text", 1, NULL);
+
+		gtk_tree_view_set_model(GTK_TREE_VIEW(dialog_data.attr_table), GTK_TREE_MODEL(dialog_data.attr_model));
+		g_signal_connect(G_OBJECT(dialog_data.attr_table), "key-release-event", G_CALLBACK(attr_key_release_cb), &dialog_data);
+
+	}
+	_table_attach_(table, 6, _("Attributes:"), dialog_data.attr_table);
+
+
+	/* create delete button */
+	button = gtk_button_new_with_label(_("Delete Style"));
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(delete_button_cb), &dialog_data);
+	gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, FALSE, 0);
+
+	sub_vbox = ghid_category_vbox(vbox, _("Set as Default"), 4, 2, TRUE, TRUE);
+	check_box = gtk_check_button_new_with_label(_("Save route style settings as default"));
+	gtk_box_pack_start(GTK_BOX(sub_vbox), check_box, TRUE, TRUE, 0);
+
+	add_new_iter(rss);
+
+	/* Display dialog */
+	dialog_data.rss = rss;
+	dialog_data.select_box = select_box;
+	if (rss->active_style != NULL) {
+		path = gtk_tree_row_reference_get_path(rss->active_style->rref);
+		gtk_tree_model_get_iter(GTK_TREE_MODEL(rss->model), &iter, path);
+		g_signal_connect(G_OBJECT(select_box), "changed", G_CALLBACK(dialog_style_changed_cb), &dialog_data);
+		gtk_combo_box_set_active_iter(GTK_COMBO_BOX(select_box), &iter);
+	}
+	gtk_widget_show_all(dialog);
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+		int changed = 0, need_rebuild = 0;
+		pcb_route_style_t *rst;
+		pcb_gtk_obj_route_style_t *style;
+		gboolean save;
+
+		if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(select_box), &iter))
+			goto cancel;
+		gtk_tree_model_get(GTK_TREE_MODEL(rss->model), &iter, STYLE_DATA_COL, &style, -1);
+		if (style == NULL) {
+			int n = vtroutestyle_len(&PCB->RouteStyle);
+			rst = vtroutestyle_get(&PCB->RouteStyle, n, 1);
+			need_rebuild = 1;
+			changed = 1;
+		}
+		else {
+			rst = style->rst;
+			*rst->name = '\0';
+		}
+
+		new_name = gtk_entry_get_text(GTK_ENTRY(dialog_data.name_entry));
+
+		while (isspace(*new_name))
+			new_name++;
+		if (strcmp(rst->name, new_name) != 0) {
+			strncpy(rst->name, new_name, sizeof(rst->name) - 1);
+			rst->name[sizeof(rst->name) - 1] = '0';
+			changed = 1;
+		}
+
+/* Modify the route style only if there's significant difference (beyond rouding errors) */
+#define rst_modify(changed, dst, src) \
+	do { \
+		pcb_coord_t __tmp__ = src; \
+		if (abs(dst - __tmp__) > 10) { \
+			changed = 1; \
+			dst = __tmp__; \
+		} \
+	} while(0)
+		rst_modify(changed, rst->Thick, pcb_gtk_coord_entry_get_value(GHID_COORD_ENTRY(dialog_data.line_entry)));
+		rst_modify(changed, rst->Hole, pcb_gtk_coord_entry_get_value(GHID_COORD_ENTRY(dialog_data.via_hole_entry)));
+		rst_modify(changed, rst->Diameter, pcb_gtk_coord_entry_get_value(GHID_COORD_ENTRY(dialog_data.via_size_entry)));
+		rst_modify(changed, rst->Clearance, pcb_gtk_coord_entry_get_value(GHID_COORD_ENTRY(dialog_data.clearance_entry)));
+#undef rst_modify
+		save = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check_box));
+		if (style == NULL) {
+			style = pcb_gtk_route_style_add_route_style(rss, rst, 0);
+		}
+		else {
+			gtk_action_set_label(GTK_ACTION(style->action), rst->name);
+			gtk_list_store_set(rss->model, &iter, STYLE_TEXT_COL, rst->name, -1);
+		}
+
+		/* Cleanup */
+		gtk_widget_destroy(dialog);
+		gtk_list_store_remove(rss->model, &rss->new_iter);
+
+		/* if the style array in core might have been reallocated, we need to update
+		   all our pointers in the rss "cache" */
+		if (need_rebuild) {
+			pcb_gtk_route_style_empty(rss);
+			make_route_style_buttons(GHID_ROUTE_STYLE(rss));
+		}
+
+		/* Emit change signals */
+		pcb_gtk_route_style_select_style(rss, rst);
+		g_signal_emit(rss, pcb_gtk_route_style_signals_id[STYLE_EDITED_SIGNAL], 0, save);
+
+		if (changed) {
+			pcb_board_set_changed_flag(pcb_true);
+			com->window_set_name_label(PCB->Name);
+		}
+	}
+	else {
+	cancel:;
+		gtk_widget_destroy(dialog);
+		gtk_list_store_remove(rss->model, &rss->new_iter);
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_route_style.h	(revision 18980)
@@ -0,0 +1,24 @@
+/* Very linked to the widget ! */
+#include "wt_route_style.h"
+#include "glue.h"
+
+struct pcb_gtk_dlg_route_style_s {
+	pcb_gtk_route_style_t *rss;
+	GtkWidget *name_entry;
+	GtkWidget *line_entry;
+	GtkWidget *via_hole_entry;
+	GtkWidget *via_size_entry;
+	GtkWidget *clearance_entry;
+
+	GtkWidget *select_box;
+
+	GtkWidget *attr_table;				/* Attributes gtk_tree_view                     */
+	GtkListStore *attr_model;			/* Attributes gtk_tree_model                    */
+
+	int inhibit_style_change;			/* when 1, do not do anything when style changes                  */
+	int attr_editing;							/* set to 1 when an attribute key or value text is being edited   */
+};
+
+/* Builds and runs the "edit route style" dialog. */
+void pcb_gtk_route_style_edit_dialog(pcb_gtk_common_t *com, pcb_gtk_route_style_t *rss);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.c	(revision 18980)
@@ -0,0 +1,908 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* advanced search dialog */
+
+#include "config.h"
+#include "dlg_search.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <genlist/gendlist.h>
+#include <genvector/gds_char.h>
+#include "compat_misc.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "misc_util.h"
+#include "pcb-printf.h"
+#include "conf_core.h"
+
+#include "win_place.h"
+#include "wt_coord_entry.h"
+#include "bu_box.h"
+
+#include "compat.h"
+
+typedef struct expr1_s expr1_t;
+
+struct expr1_s {
+	GtkWidget *and;								/* only if not the first row */
+
+	GtkWidget *hbox;							/* only if first in row */
+	GtkWidget *remove_row;				/* only if first in row */
+	GtkWidget *append_col;				/* only if first in row */
+	GtkWidget *spc;								/* only if first in row */
+
+	GtkWidget *remove, *remove_button;
+	GtkWidget *content;						/* the actual expression */
+	GtkWidget *or;								/* only if not the first in the row */
+
+	gdl_elem_t next_or;						/* --> */
+	gdl_elem_t next_and;					/* v */
+	gdl_list_t ors;								/* only in the first; the row-first is not on this list, so it collects the subseqent siblings only */
+
+	expr1_t *row;									/* only if not the first */
+
+	gulong sig_remove_row;
+	gulong sig_append_col;
+
+	char *code;										/* ... to use in the query script */
+
+	GtkWidget *top_window;
+};
+
+typedef struct {
+	GtkWidget *window;
+	GtkWidget *expr;							/* manual expression entry */
+	GtkWidget *action;						/* what-to-do combo box */
+	GtkWidget *wizard_enable;			/* checkbox */
+	GtkWidget *wizard_vbox;
+	GtkWidget *new_row;
+
+	gdl_list_t wizard;						/* of expr1_t */
+} ghid_search_dialog_t;
+
+static ghid_search_dialog_t sdlg;
+
+static void new_col_cb(GtkWidget * button, void *data);
+static void remove_row_cb(GtkWidget * button, void *data);
+static void remove_expr_cb(GtkWidget * button, void *data);
+static void edit_expr_cb(GtkWidget * button, void *data);
+static void expr_wizard_dialog(GtkWidget *top_window, expr1_t * e);
+
+static void build_expr1(expr1_t * e, GtkWidget * parent_box)
+{
+	e->content = gtk_button_new_with_label("<expr>");
+	gtk_button_set_image(GTK_BUTTON(e->content), gtk_image_new_from_icon_name("gtk-new", GTK_ICON_SIZE_MENU));
+	gtk_box_pack_start(GTK_BOX(parent_box), e->content, FALSE, FALSE, 0);
+	gtk_widget_set_tooltip_text(e->content, "Edit search expression");
+	g_signal_connect(e->content, "clicked", G_CALLBACK(edit_expr_cb), e);
+
+	e->remove = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(parent_box), e->remove, FALSE, FALSE, 0);
+
+	e->remove_button = gtk_button_new_with_label("");
+	gtk_button_set_image(GTK_BUTTON(e->remove_button), gtk_image_new_from_icon_name("gtk-delete", GTK_ICON_SIZE_MENU));
+	gtk_box_pack_start(GTK_BOX(e->remove), e->remove_button, FALSE, FALSE, 0);
+	gtk_widget_set_tooltip_text(e->remove_button, "Remove this expression");
+	g_signal_connect(e->remove_button, "clicked", G_CALLBACK(remove_expr_cb), e);
+}
+
+/* e is not part of any list by the time of the call */
+static void destroy_expr1(expr1_t * e)
+{
+#	define destroy(w) if (w != NULL) gtk_widget_destroy(w)
+	destroy(e->and);
+	destroy(e->spc);
+	destroy(e->remove_row);
+	destroy(e->append_col);
+	destroy(e->remove);
+	destroy(e->content);
+	destroy(e->or);
+	destroy(e->hbox);
+	free(e);
+#	undef destroy
+}
+
+static expr1_t *append_row(GtkWidget *top_window)
+{
+	expr1_t *e = calloc(sizeof(expr1_t), 1);
+
+	e->top_window = top_window;
+
+	if (gdl_first(&sdlg.wizard) != NULL) {
+		e->and = gtk_label_new("AND");
+		gtk_misc_set_alignment(GTK_MISC(e->and), -1, 0.);
+		gtk_box_pack_start(GTK_BOX(sdlg.wizard_vbox), e->and, FALSE, FALSE, 0);
+	}
+
+	e->hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(sdlg.wizard_vbox), e->hbox, FALSE, FALSE, 0);
+
+	e->remove_row = gtk_button_new_with_label("");
+	gtk_button_set_image(GTK_BUTTON(e->remove_row), gtk_image_new_from_icon_name("gtk-delete", GTK_ICON_SIZE_SMALL_TOOLBAR));
+	gtk_box_pack_start(GTK_BOX(e->hbox), e->remove_row, FALSE, FALSE, 0);
+	e->sig_remove_row = g_signal_connect(e->remove_row, "clicked", G_CALLBACK(remove_row_cb), e);
+	gtk_widget_set_tooltip_text(e->remove_row, "Remove this row of expressions");
+
+
+	e->append_col = gtk_button_new_with_label("");
+	gtk_button_set_image(GTK_BUTTON(e->append_col), gtk_image_new_from_icon_name("gtk-add", GTK_ICON_SIZE_SMALL_TOOLBAR));
+	gtk_box_pack_start(GTK_BOX(e->hbox), e->append_col, FALSE, FALSE, 0);
+	e->sig_append_col = g_signal_connect(e->append_col, "clicked", G_CALLBACK(new_col_cb), e);
+	gtk_widget_set_tooltip_text(e->append_col, "Append an expression to this row with OR");
+
+	e->spc = gtkc_vbox_new(FALSE, 10);
+	gtk_box_pack_start(GTK_BOX(e->hbox), e->spc, FALSE, FALSE, 10);
+
+	build_expr1(e, e->hbox);
+
+	gdl_append(&sdlg.wizard, e, next_and);
+	return e;
+}
+
+static expr1_t *append_col(expr1_t * row)
+{
+	expr1_t *e = calloc(sizeof(expr1_t), 1);
+
+	e->top_window = row->top_window;
+
+	e->or = gtk_label_new(" OR ");
+	gtk_misc_set_alignment(GTK_MISC(e->or), -1, 1);
+	gtk_box_pack_start(GTK_BOX(row->hbox), e->or, FALSE, FALSE, 0);
+
+	build_expr1(e, row->hbox);
+
+	gdl_append(&row->ors, e, next_or);
+	e->row = row;
+	return e;
+}
+
+static void remove_row(expr1_t * row)
+{
+	expr1_t *o;
+	gdl_remove(&sdlg.wizard, row, next_and);
+	for (o = gdl_first(&row->ors); o != NULL; o = gdl_next(&row->ors, o))
+		destroy_expr1(o);
+	destroy_expr1(row);
+
+	/* the new first widget must not have an AND "preface" */
+	o = gdl_first(&sdlg.wizard);
+	if ((o != NULL) && (o->and != NULL)) {
+		gtk_widget_destroy(o->and);
+		o->and = NULL;
+	}
+}
+
+static void remove_expr(expr1_t * e)
+{
+	if (e->row == NULL) {
+		/* first item in a row */
+		expr1_t *o, *o2 = gdl_first(&e->ors);
+		if (o2 != NULL) {
+			/* there are subsequent items in the row - have to make the first of them the new head */
+			gdl_remove(&e->ors, o2, next_or);
+			gdl_insert_before(&sdlg.wizard, e, o2, next_and);
+			gdl_remove(&sdlg.wizard, e, next_and);
+#			define inherit(dst, src, fld)  dst->fld = src->fld; src->fld = NULL;
+			inherit(o2, e, and);
+			inherit(o2, e, hbox);
+			inherit(o2, e, remove_row);
+			inherit(o2, e, append_col);
+			inherit(o2, e, spc);
+#			undef inherit
+			/* move the list, reparenting it */
+			memcpy(&o2->ors, &e->ors, sizeof(e->ors));
+			for (o = gdl_first(&o2->ors); o != NULL; o = gdl_next(&o2->ors, o))
+				o->next_or.parent = &o2->ors;
+
+			o2->row = NULL;
+			memset(&e->ors, 0, sizeof(e->ors));
+			if (o2->or != NULL) {
+				gtk_widget_destroy(o2->or);
+				o2->or = NULL;
+			}
+
+			/* reconnect row signals to the new head */
+			g_signal_handler_disconnect(o2->remove_row, e->sig_remove_row);
+			g_signal_handler_disconnect(o2->append_col, e->sig_append_col);
+
+			o2->sig_remove_row = g_signal_connect(o2->remove_row, "clicked", G_CALLBACK(remove_row_cb), o2);
+			o2->sig_append_col = g_signal_connect(o2->append_col, "clicked", G_CALLBACK(new_col_cb), o2);
+		}
+		else {
+			/* only item of the row */
+			remove_row(e);
+			return;
+		}
+	}
+	else
+		gdl_remove(&e->row->ors, e, next_or);
+	destroy_expr1(e);
+}
+
+static int num_ors(expr1_t * head)
+{
+	int count = 0;
+	expr1_t *o;
+	if (head->code != NULL)
+		count++;
+	for (o = gdl_first(&head->ors); o != NULL; o = gdl_next(&head->ors, o))
+		if (o->code != NULL)
+			count++;
+	return count;
+}
+
+static void rebuild(void)
+{
+	int and_first = 1;
+	gds_t s;
+	expr1_t *a, *o;
+	gds_init(&s);
+
+	for (a = gdl_first(&sdlg.wizard); a != NULL; a = gdl_next(&sdlg.wizard, a)) {
+		int or_first = 1;
+		int ors = num_ors(a);
+		if (ors == 0)
+			continue;
+
+		/* add the && if needed */
+		if (!and_first)
+			gds_append_str(&s, " && ");
+		and_first = 0;
+
+		if (ors > 1)
+			gds_append_str(&s, "(");
+
+		if (a->code != NULL) {
+			gds_append_str(&s, a->code);
+			or_first = 0;
+		}
+
+		for (o = gdl_first(&a->ors); o != NULL; o = gdl_next(&a->ors, o)) {
+			if (o->code != NULL) {
+				if (!or_first)
+					gds_append_str(&s, " || ");
+				or_first = 0;
+				gds_append_str(&s, o->code);
+			}
+		}
+
+		if (ors > 1)
+			gds_append_str(&s, ")");
+	}
+	gtk_entry_set_text(GTK_ENTRY(sdlg.expr), s.array);
+	gds_uninit(&s);
+}
+
+/* button callbacks */
+static void new_row_cb(GtkWidget * button, void *data)
+{
+	append_row(data);
+	gtk_widget_show_all(sdlg.window);
+}
+
+static void remove_row_cb(GtkWidget * button, void *data)
+{
+	expr1_t *row = (expr1_t *) data;
+	remove_row(row);
+	rebuild();
+	gtk_widget_show_all(sdlg.window);
+}
+
+static void remove_expr_cb(GtkWidget * button, void *data)
+{
+	remove_expr((expr1_t *) data);
+	rebuild();
+	gtk_widget_show_all(sdlg.window);
+}
+
+static void edit_expr_cb(GtkWidget * button, void *data)
+{
+	expr1_t *e = (expr1_t *)data;
+	expr_wizard_dialog(e->top_window, e);
+}
+
+static void new_col_cb(GtkWidget * button, void *data)
+{
+	expr1_t *row = (expr1_t *) data;
+	append_col(row);
+	gtk_widget_show_all(sdlg.window);
+}
+
+static void wizard_toggle_cb(GtkCheckButton * button, void *data)
+{
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+		gtk_widget_show(sdlg.wizard_vbox);
+		gtk_widget_set_sensitive(sdlg.new_row, 1);
+		gtk_widget_set_sensitive(sdlg.expr, 0);
+
+	}
+	else {
+		gtk_widget_hide(sdlg.wizard_vbox);
+		gtk_widget_set_sensitive(sdlg.new_row, 0);
+		gtk_widget_set_sensitive(sdlg.expr, 1);
+	}
+}
+
+
+/* Run the expression wizard dialog box */
+#include "dlg_search_tab.h"
+
+static void expr_wizard_init_model()
+{
+	const expr_wizard_t *w;
+	expr_wizard_op_t *o;
+	const char **s;
+
+	if (expr_wizard_dlg.md_left != NULL)
+		return;
+
+	/* render operator models */
+	for (o = op_tab; o->ops != NULL; o++) {
+		o->model = gtk_list_store_newv(1, model_op);
+		for (s = o->ops; *s != NULL; s++)
+			gtk_list_store_insert_with_values(o->model, NULL, -1, 0, *s, -1);
+	}
+
+	/* render right constant models */
+	for (o = right_const_tab; o->ops != NULL; o++) {
+		o->model = gtk_list_store_newv(1, model_op);
+		for (s = o->ops; *s != NULL; s++)
+			gtk_list_store_insert_with_values(o->model, NULL, -1, 0, *s, -1);
+	}
+
+	{															/* create the left tree model */
+		GtkTreeIter *parent = NULL, iter, iparent;
+		expr_wizard_dlg.md_left = gtk_tree_store_newv(2, model_op);
+		for (w = expr_tab; w->left_desc != NULL; w++) {
+			if (w->left_var == NULL)
+				parent = NULL;
+			gtk_tree_store_append(expr_wizard_dlg.md_left, &iter, parent);
+			gtk_tree_store_set(expr_wizard_dlg.md_left, &iter, 0, w->left_desc, 1, w, -1);
+			if (w->left_var == NULL) {
+				/* new section */
+				iparent = iter;
+				parent = &iparent;
+			}
+		}
+	}
+}
+
+static void right_hide(void)
+{
+	gtk_widget_hide(expr_wizard_dlg.right_str);
+	gtk_widget_hide(expr_wizard_dlg.right_int);
+	gtk_widget_hide(expr_wizard_dlg.right_double);
+	gtk_widget_hide(expr_wizard_dlg.right_coord);
+	gtk_widget_hide(expr_wizard_dlg.tr_right);
+}
+
+static const expr_wizard_t *left_get_wiz(void)
+{
+	const expr_wizard_t *w;
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreeIter iter;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(expr_wizard_dlg.tr_left));
+	if (tsel == NULL)
+		return NULL;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return NULL;
+
+	gtk_tree_model_get(tm, &iter, 1, &w, -1);
+	return w;
+}
+
+/* Returns the string current value of a single-column-string-tree */
+static const char *wiz_get_tree_str(GtkWidget * tr)
+{
+	const char *s;
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreeIter iter;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tr));
+	if (tsel == NULL)
+		return NULL;
+
+	gtk_tree_selection_get_selected(tsel, &tm, &iter);
+	if (iter.stamp == 0)
+		return NULL;
+
+	gtk_tree_model_get(tm, &iter, 0, &s, -1);
+	return s;
+}
+
+static void left_chg_cb(GtkTreeView * t, gpointer * data)
+{
+	const expr_wizard_t *w = left_get_wiz();
+
+	right_hide();
+
+	if ((w == NULL) || (w->left_var == NULL))
+		return;
+
+	gtk_tree_view_set_model(GTK_TREE_VIEW(expr_wizard_dlg.tr_op), GTK_TREE_MODEL(w->ops->model));
+
+	switch (w->rtype) {
+	case RIGHT_INT:
+		gtk_widget_show(expr_wizard_dlg.right_int);
+		break;
+	case RIGHT_DOUBLE:
+		gtk_widget_show(expr_wizard_dlg.right_double);
+		break;
+	case RIGHT_STR:
+		gtk_widget_show(expr_wizard_dlg.right_str);
+		break;
+	case RIGHT_COORD:
+		gtk_widget_show(expr_wizard_dlg.right_coord);
+		break;
+	case RIGHT_CONST:
+		gtk_tree_view_set_model(GTK_TREE_VIEW(expr_wizard_dlg.tr_right), GTK_TREE_MODEL(w->right_const->model));
+		gtk_widget_show(expr_wizard_dlg.tr_right);
+		break;
+	}
+}
+
+static char *expr_wizard_result(int desc)
+{
+	gds_t s;
+	char tmp[128];
+	const char *cs;
+	const expr_wizard_t *parent, *w = left_get_wiz();
+
+	if ((w == NULL) || (w->left_var == NULL))
+		return NULL;
+
+
+	gds_init(&s);
+	if (desc) {
+		/* search the parent */
+		for (parent = w; parent >= expr_tab; parent--)
+			if (parent->left_var == NULL)
+				break;
+
+		if (parent->left_desc != NULL)
+			pcb_append_printf(&s, "%s\t%s", parent->left_desc, w->left_desc);
+		else
+			pcb_append_printf(&s, "%s", w->left_desc);
+	}
+	else
+		pcb_append_printf(&s, "(%s", w->left_var);
+
+	cs = wiz_get_tree_str(expr_wizard_dlg.tr_op);
+	if (cs == NULL)
+		goto err;
+
+	if (desc)
+		pcb_append_printf(&s, "\n%s\n", cs);
+	else
+		pcb_append_printf(&s, " %s ", cs);
+
+	switch (w->rtype) {
+	case RIGHT_INT:
+		pcb_append_printf(&s, "%.0f", gtk_adjustment_get_value(expr_wizard_dlg.right_adj));
+		break;
+	case RIGHT_DOUBLE:
+		pcb_append_printf(&s, "%.0f", gtk_adjustment_get_value(expr_wizard_dlg.right_adj2));
+		break;
+	case RIGHT_STR:
+		if (!desc)
+			gds_append_str(&s, "\"");
+		pcb_append_printf(&s, "%s", gtk_entry_get_text(GTK_ENTRY(expr_wizard_dlg.right_str)));
+		if (!desc)
+			gds_append_str(&s, "\"");
+		break;
+	case RIGHT_COORD:
+		pcb_gtk_coord_entry_get_value_str(GHID_COORD_ENTRY(expr_wizard_dlg.right_coord), tmp, sizeof(tmp));
+		pcb_append_printf(&s, "%s", tmp);
+		break;
+	case RIGHT_CONST:
+		cs = wiz_get_tree_str(expr_wizard_dlg.tr_right);
+		if (cs == NULL)
+			goto err;
+		pcb_append_printf(&s, "%s", cs);
+		break;
+	}
+
+	if (!desc)
+		gds_append_str(&s, ")");
+
+	return s.array;
+
+err:;
+	free(s.array);
+	return NULL;
+}
+
+/* look up a tab entry with a slow linear search */
+static const expr_wizard_t *find_tab_entry(const expr_wizard_t * start_at, const char *desc, int need_hdr, int *idx)
+{
+	const expr_wizard_t *w;
+	int i = 0, initial = 1;
+
+	for (w = start_at; w->left_desc != NULL; w++) {
+		if (need_hdr) {
+			if (w->left_var != NULL) {
+				if (initial)
+					i++;
+				continue;
+			}
+			else
+				initial = 0;
+		}
+		else {
+			if (w->left_var == NULL)
+				return NULL;
+		}
+		if (strcmp(w->left_desc, desc) == 0) {
+			*idx = i;
+			return w;
+		}
+		i++;
+	}
+
+	return NULL;
+}
+
+/* Set enum-like tree cursor from a string; returns 0 if not found, 1 if found. */
+static int set_tree_from_enum(GtkWidget * tree, const char **vals, const char *target)
+{
+	int n, found;
+	const char **s;
+	for (n = 0, found = 0, s = vals; *s != NULL; s++, n++) {
+		if (strcmp(*s, target) == 0) {
+			found = 1;
+			break;
+		}
+	}
+	if (found) {
+		GtkTreePath *path = gtk_tree_path_new_from_indices(n, -1);
+		gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree), path, NULL, FALSE);
+		gtk_tree_path_free(path);
+	}
+	return found;
+}
+
+/* Set the value of expr wizard widgets to match the button text from the previous set */
+void expr_wizard_import(const char *desc_)
+{
+	char *desc, *left, *left_parent, *left_desc, *op, *right, *sep;
+	const expr_wizard_t *w;
+	int l1idx = -1, l2idx = -1;
+
+	if (desc_ == NULL)
+		return;
+
+	/* split the string into left, op and right */
+	desc = pcb_strdup(desc_);
+	left = desc;
+
+	op = strchr(left, '\n');
+	if (op == NULL)
+		goto fail;
+	*op = '\0';
+	op++;
+
+	right = strchr(op, '\n');
+	if (right == NULL)
+		goto fail;
+	*right = '\0';
+	right++;
+
+	/* split left */
+	sep = strchr(left, '\t');
+	if (sep != NULL) {
+		*sep = '\0';
+		sep++;
+		left_parent = left;
+		left_desc = sep;
+	}
+	else {
+		left_parent = NULL;
+		left_desc = left;
+	}
+
+/*	printf("lp='%s' ld='%s' op='%s' r='%s'\n", left_parent, left_desc, op, right);*/
+	/* Find the tab entry */
+
+	if (left_parent != NULL) {
+		w = find_tab_entry(expr_tab, left_parent, 1, &l1idx);
+		if (w == NULL)
+			goto fail;
+		w++;
+	}
+	else
+		w = expr_tab;
+	w = find_tab_entry(w, left_desc, 0, &l2idx);
+	if (w == NULL)
+		goto fail;
+
+	/* set left tree widget cursor */
+	{
+		GtkTreePath *path;
+		if (left_parent != NULL)
+			path = gtk_tree_path_new_from_indices(l1idx, l2idx, -1);
+		else
+			path = gtk_tree_path_new_from_indices(l2idx, -1);
+
+		gtk_tree_view_expand_to_path(GTK_TREE_VIEW(expr_wizard_dlg.tr_left), path);
+		gtk_tree_view_set_cursor(GTK_TREE_VIEW(expr_wizard_dlg.tr_left), path, NULL, FALSE);
+		gtk_tree_path_free(path);
+	}
+
+	/* set op cursor */
+	set_tree_from_enum(expr_wizard_dlg.tr_op, w->ops->ops, op);
+
+	/* set value field */
+	{
+		switch (w->rtype) {
+		case RIGHT_STR:
+			gtk_entry_set_text(GTK_ENTRY(expr_wizard_dlg.right_str), right);
+			break;
+		case RIGHT_INT:
+			{
+				char *end;
+				double d = strtod(right, &end);
+				if (*end == '\0')
+					gtk_spin_button_set_value(GTK_SPIN_BUTTON(expr_wizard_dlg.right_int), d);
+				break;
+			}
+		case RIGHT_DOUBLE:
+			{
+				char *end;
+				double d = strtod(right, &end);
+				if (*end == '\0')
+					gtk_spin_button_set_value(GTK_SPIN_BUTTON(expr_wizard_dlg.right_double), d);
+				break;
+			}
+		case RIGHT_COORD:
+			{
+				pcb_bool succ;
+				double d = pcb_get_value_ex(right, NULL, NULL, NULL, "mm", &succ);
+				if (succ)
+					pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(expr_wizard_dlg.right_coord), d);
+				break;
+			}
+		case RIGHT_CONST:
+			set_tree_from_enum(expr_wizard_dlg.tr_right, w->right_const->ops, right);
+			break;
+		}
+	}
+
+fail:;
+	free(desc);
+}
+
+static void expr_wizard_dialog(GtkWidget *top_window, expr1_t * e)
+{
+	GtkWidget *dialog, *vbox, *hbox;
+	GtkCellRenderer *renderer;
+	gboolean response;
+
+	expr_wizard_init_model();
+
+	/* Create the dialog */
+	dialog = gtk_dialog_new_with_buttons("Expression wizard",
+																			 GTK_WINDOW(top_window),
+																			 GTK_DIALOG_MODAL,
+																			 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+	hbox = gtkc_hbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
+
+	/* left */
+	vbox = gtkc_vbox_new(FALSE, 4);
+	expr_wizard_dlg.tr_left = gtk_tree_view_new();
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(expr_wizard_dlg.tr_left), -1, "variable", renderer, "text", 0,
+																							NULL);
+	gtk_tree_view_set_model(GTK_TREE_VIEW(expr_wizard_dlg.tr_left), GTK_TREE_MODEL(expr_wizard_dlg.md_left));
+	g_signal_connect(G_OBJECT(expr_wizard_dlg.tr_left), "cursor-changed", G_CALLBACK(left_chg_cb), NULL);
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.tr_left, FALSE, TRUE, 4);
+
+
+	expr_wizard_dlg.entry_left = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.entry_left, FALSE, TRUE, 4);
+
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, TRUE, 4);
+
+	/* operator */
+	vbox = gtkc_vbox_new(FALSE, 4);
+
+	expr_wizard_dlg.tr_op = gtk_tree_view_new();
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(expr_wizard_dlg.tr_op), -1, "op", renderer, "text", 0, NULL);
+	gtk_tree_view_set_model(GTK_TREE_VIEW(expr_wizard_dlg.tr_op), GTK_TREE_MODEL(op_tab[OPS_ANY].model));
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.tr_op, FALSE, FALSE, 4);
+
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 4);
+
+	/* right */
+	vbox = gtkc_vbox_new(FALSE, 4);
+
+	expr_wizard_dlg.tr_right = gtk_tree_view_new();
+	renderer = gtk_cell_renderer_text_new();
+	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(expr_wizard_dlg.tr_right), -1, "constant", renderer, "text", 0,
+																							NULL);
+/*	gtk_tree_view_set_model(GTK_TREE_VIEW(expr_wizard_dlg.tr_right), GTK_TREE_MODEL(expr_wizard_dlg.md_objtype));*/
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.tr_right, FALSE, TRUE, 4);
+
+	expr_wizard_dlg.right_str = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.right_str, FALSE, TRUE, 4);
+
+	expr_wizard_dlg.right_adj = GTK_ADJUSTMENT(gtk_adjustment_new(10, 0,	/* min */
+																																1000, 1, 1,	/* steps */
+																																0.0));
+	expr_wizard_dlg.right_adj2 = GTK_ADJUSTMENT(gtk_adjustment_new(10, 0,	/* min */
+																																1000, 0.01, 1,	/* steps */
+																																0.0));
+/*	g_signal_connect(G_OBJECT(expr_wizard_dlg.right_adj), "value-changed", G_CALLBACK(config_auto_idx_changed_cb), NULL); */
+	expr_wizard_dlg.right_int = gtk_spin_button_new(expr_wizard_dlg.right_adj, 1, 8);
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.right_int, FALSE, TRUE, 4);
+
+	expr_wizard_dlg.right_double = gtk_spin_button_new(expr_wizard_dlg.right_adj2, 1, 8);
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.right_double, FALSE, TRUE, 4);
+
+	expr_wizard_dlg.right_coord = pcb_gtk_coord_entry_new(0, PCB_MM_TO_COORD(2100), 0, conf_core.editor.grid_unit, CE_MEDIUM);
+	gtk_box_pack_start(GTK_BOX(vbox), expr_wizard_dlg.right_coord, FALSE, TRUE, 4);
+
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, TRUE, 4);
+
+	/* pack content */
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox);
+	gtk_widget_show_all(dialog);
+	right_hide();
+
+	/* Run the dialog */
+	expr_wizard_import(gtk_button_get_label(GTK_BUTTON(e->content)));
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	if (response == GTK_RESPONSE_OK) {
+		char *res = expr_wizard_result(1);
+		if (res != NULL) {
+			gtk_button_set_label(GTK_BUTTON(e->content), res);
+			free(res);
+		}
+		if (e->code != NULL)
+			free(e->code);
+		e->code = expr_wizard_result(0);
+		gtk_button_set_image(GTK_BUTTON(e->content), gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_MENU));
+		rebuild();
+	}
+	gtk_widget_destroy(dialog);
+}
+
+
+/******** Advanced search window creation and administration ********/
+static void dialog_cb(GtkDialog * dlg, gint response_id, gpointer * data)
+{
+	const char *act, *script;
+
+	switch (response_id) {
+	case GTK_RESPONSE_APPLY:
+		script = gtk_entry_get_text(GTK_ENTRY(sdlg.expr));
+		act = gtkc_combo_box_text_get_active_text(sdlg.action);
+		pcb_actionl("query", act, script, NULL);
+		break;
+	case GTK_RESPONSE_CLOSE:
+		gtk_widget_destroy(GTK_WIDGET(dlg));
+		break;
+	}
+}
+
+static void ghid_search_window_create(GtkWidget *top_window)
+{
+	GtkWidget *vbox_win, *lab, *vbox;
+	GtkWidget *content_area;
+	const char *actions[] = { "select", "unselect", NULL };
+	const char **s;
+	int ver;
+
+	ver = pcb_actionl("query", "version", NULL);
+	if (ver < 0100) {
+		sdlg.window = NULL;
+		pcb_message(PCB_MSG_ERROR, "The query plugin is not avaialble, can not do advanced search.\n");
+		return;
+	}
+
+	/* make sure the list is empty */
+	memset(&sdlg.wizard, 0, sizeof(sdlg.wizard));
+
+	sdlg.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	sdlg.window = gtk_dialog_new_with_buttons(_("Advanced search"),
+																						GTK_WINDOW(top_window),
+																						GTK_DIALOG_DESTROY_WITH_PARENT,
+																						GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, NULL);
+
+	g_signal_connect(sdlg.window, "response", G_CALLBACK(dialog_cb), NULL);
+
+	content_area = gtk_dialog_get_content_area(GTK_DIALOG(sdlg.window));
+
+	vbox_win = gtkc_vbox_new(FALSE, 4);
+	gtk_container_add(GTK_CONTAINER(content_area), vbox_win);
+
+	lab = gtk_label_new("Query expression:");
+	gtk_box_pack_start(GTK_BOX(vbox_win), lab, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(lab), -1, 0.);
+
+/* expr entry */
+	sdlg.expr = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox_win), sdlg.expr, FALSE, FALSE, 0);
+
+	{
+		GtkWidget *hbox = gtkc_hbox_new(FALSE, 4);
+
+		sdlg.action = gtkc_combo_box_text_new();
+		gtk_widget_set_tooltip_text(sdlg.action, "Do this with any object matching the query expression");
+		for (s = actions; *s != NULL; s++)
+			gtkc_combo_box_text_append_text(sdlg.action, *s);
+		gtk_box_pack_start(GTK_BOX(hbox), sdlg.action, FALSE, FALSE, 0);
+		gtk_combo_box_set_active(GTK_COMBO_BOX(sdlg.action), 0);
+
+		gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new("matching items"), FALSE, FALSE, 0);
+
+		gtk_box_pack_start(GTK_BOX(vbox_win), hbox, FALSE, FALSE, 0);
+	}
+
+	sdlg.wizard_enable = gtk_check_button_new_with_label("Enable wizard");
+	g_signal_connect(sdlg.wizard_enable, "toggled", G_CALLBACK(wizard_toggle_cb), NULL);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sdlg.wizard_enable), 1);
+	gtk_box_pack_start(GTK_BOX(vbox_win), sdlg.wizard_enable, FALSE, FALSE, 0);
+
+/* */
+	vbox = ghid_framed_vbox(vbox_win, "wizard", 1, TRUE, 4, 10);
+
+	sdlg.wizard_vbox = gtkc_vbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(vbox), sdlg.wizard_vbox, TRUE, TRUE, 4);
+
+	sdlg.new_row = gtk_button_new_with_label("Add new row");
+	g_signal_connect(sdlg.new_row, "clicked", G_CALLBACK(new_row_cb), top_window);
+	gtk_box_pack_start(GTK_BOX(vbox), sdlg.new_row, FALSE, FALSE, 0);
+	gtk_button_set_image(GTK_BUTTON(sdlg.new_row), gtk_image_new_from_icon_name("gtk-new", GTK_ICON_SIZE_MENU));
+	gtk_widget_set_tooltip_text(sdlg.new_row, "Append a row of expressions to the query with AND");
+
+
+/* Add one row of wizard to save a click in the most common case */
+	append_row(top_window);
+
+	gtk_widget_realize(sdlg.window);
+}
+
+void ghid_search_window_show(GtkWidget *top_window, gboolean raise)
+{
+	ghid_search_window_create(top_window);
+	if (sdlg.window == NULL)
+		return;
+	gtk_widget_show_all(sdlg.window);
+	wplc_place(WPLC_SEARCH, sdlg.window);
+	if (raise)
+		gtk_window_present(GTK_WINDOW(sdlg.window));
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_search.h	(revision 18980)
@@ -0,0 +1,32 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <gtk/gtk.h>
+
+/* advanced search dialog */
+void ghid_search_window_show(GtkWidget *top_window, gboolean raise);
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_search_tab.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_search_tab.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_search_tab.h	(revision 18980)
@@ -0,0 +1,202 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* advanced search dialog - expressioin wizard tables; intended to be
+   included from ghid-search.c only */
+
+static struct {
+	GtkWidget *entry_left;
+	GtkWidget *tr_left, *tr_op;
+	GtkWidget *right_str, *right_coord, *tr_right, *right_int, *right_double;
+	GtkTreeStore *md_left;
+	GtkAdjustment *right_adj, *right_adj2;
+} expr_wizard_dlg;
+
+static GType model_op[2] = { G_TYPE_STRING, G_TYPE_POINTER };
+
+typedef struct expr_wizard_op_s expr_wizard_op_t;
+struct expr_wizard_op_s {
+	const char **ops;
+	GtkListStore *model;
+};
+
+typedef enum {
+	RIGHT_STR,
+	RIGHT_INT,
+	RIGHT_DOUBLE,
+	RIGHT_COORD,
+	RIGHT_CONST
+} right_type;
+
+typedef struct expr_wizard_s expr_wizard_t;
+struct expr_wizard_s {
+	const char *left_var;
+	const char *left_desc;
+	const expr_wizard_op_t *ops;
+	right_type rtype;
+	const expr_wizard_op_t *right_const;
+};
+
+enum {
+	OPS_ANY,
+	OPS_EQ,
+	OPS_STR
+};
+
+static const char *ops_any[] = {"==", "!=", ">=", "<=", ">", "<", NULL};
+static const char *ops_eq[]  = {"==", "!=", NULL};
+static const char *ops_str[] = {"==", "!=", "~", NULL};
+
+static expr_wizard_op_t op_tab[] = {
+	{ops_any, NULL},
+	{ops_eq, NULL},
+	{ops_str, NULL},
+	{NULL, NULL}
+};
+
+static const char *right_const_objtype[] = { "POINT", "LINE", "TEXT", "POLYGON", "ARC", "RAT", "NET", "LAYER", NULL };
+static const char *right_const_yesno[] = {"YES", "NO", NULL};
+static const char *right_const_10[] = {"1", "0", NULL};
+static const char *right_const_layerpos[] = {"TOP", "BOTTOM", "INTERNAL", NULL};
+static const char *right_const_layertype[] = {"COPPER", "SILK", "MASK", "PASTE", "OUTLINE" , NULL};
+static const char *right_const_side[] = {"TOP", "BOTTOM", NULL};
+
+enum {
+	RC_OBJTYPE,
+	RC_YESNO,
+	RC_10,
+	RC_LAYERPOS,
+	RC_LAYERTYPE,
+	RC_SIDE
+};
+
+static expr_wizard_op_t right_const_tab[] = {
+	{right_const_objtype, NULL},
+	{right_const_yesno, NULL},
+	{right_const_10, NULL},
+	{right_const_layerpos, NULL},
+	{right_const_layertype, NULL},
+	{right_const_side, NULL},
+	{NULL, NULL}
+};
+
+static const expr_wizard_t expr_tab[] = {
+	{"@.id",              "object ID",        &op_tab[OPS_ANY], RIGHT_INT, NULL},
+	{"@.type",            "object type",      &op_tab[OPS_EQ],  RIGHT_CONST, &right_const_tab[RC_OBJTYPE]},
+
+	{NULL,                "bounding box",     NULL,             0, NULL},
+	{"@.bbox.x1",         "X1",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.bbox.y1",         "Y1",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.bbox.x2",         "X2",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.bbox.y2",         "Y2",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.bbox.w",          "width",            &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.bbox.h",          "height",           &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+
+
+	{NULL,                "trace object's",   NULL,             0, NULL},
+	{"@.thickness",       "thickness",        &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.clearance",       "clearance",        &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.length",          "length",           &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+
+	{NULL,                "line",             NULL,             0, NULL},
+	{"@.x1",              "X1",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y1",              "Y1",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.x2",              "X2",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y2",              "Y2",               &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+
+	{NULL,                "arc",              NULL,             0, NULL},
+	{"@.x",               "center X",         &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y",               "center Y",         &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.angle.start",     "start angle",      &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+	{"@.angle.delta",     "delta angle",      &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+
+	{NULL,                "text",             NULL,             0, NULL},
+	{"@.x",               "X",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y",               "Y",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.scale",           "scale",            &op_tab[OPS_ANY], RIGHT_INT, NULL},
+	{"@.string",          "string",           &op_tab[OPS_ANY], RIGHT_STR, NULL},
+	{"@.rotation",        "rotation",         &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+
+	{NULL,                "polygon",          NULL,             0, NULL},
+	{"@.points",          "points",           &op_tab[OPS_ANY], RIGHT_INT, NULL},
+
+	{NULL,                "padstack",         NULL,             0, NULL},
+	{"@.x",               "X",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y",               "Y",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.clearance",       "global clearance", &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.rotation",        "rotation",         &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+	{"@.xmirror",         "x coords mirrored",&op_tab[OPS_ANY], RIGHT_INT, NULL},
+	{"@.smirror",         "stackup mirrored", &op_tab[OPS_ANY], RIGHT_INT, NULL},
+	{"@.name",            "name",             &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.number",          "number",           &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.hole",            "proto: hole dia",  &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.plated",          "proto: is plated?",&op_tab[OPS_ANY], RIGHT_INT, NULL},
+
+	{NULL,                "subcircuit",       NULL,             0, NULL},
+	{"@.x",               "X",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.y",               "Y",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.rotation",        "rotation",         &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+	{"@.side",            "side",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_SIDE]},
+	{"@.a.refdes",        "refdes",           &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.a.footprint",     "footprint",        &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.a.value",         "value",            &op_tab[OPS_STR], RIGHT_STR, NULL},
+
+	{NULL,                "host layer's",     NULL,             0, NULL},
+	{"@.layer.name",      "name",             &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.layer.visible",   "visible",          &op_tab[OPS_EQ],  RIGHT_CONST, &right_const_tab[RC_YESNO]},
+	{"@.layer.position",  "stack position",   &op_tab[OPS_EQ],  RIGHT_CONST, &right_const_tab[RC_LAYERPOS]},
+	{"@.layer.type",      "type",             &op_tab[OPS_EQ],  RIGHT_CONST, &right_const_tab[RC_LAYERTYPE]},
+
+	{NULL,                "host subcircuit's",NULL,             0, NULL},
+	{"@.subc.x",          "X",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.subc.y",          "Y",                &op_tab[OPS_ANY], RIGHT_COORD, NULL},
+	{"@.subc.rotation",   "rotation",         &op_tab[OPS_ANY], RIGHT_DOUBLE, NULL},
+	{"@.subc.side",       "side",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_SIDE]},
+	{"@.subc.refdes",     "refdes",           &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.subc.footprint",  "a.footprint",      &op_tab[OPS_STR], RIGHT_STR, NULL},
+	{"@.subc.value",      "a.value",          &op_tab[OPS_STR], RIGHT_STR, NULL},
+
+	{NULL,                "flag",             NULL,             0, NULL},
+	{"@.p.flag.found",    "found",            &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.hole",     "hole",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.clearpoly","clearpoly",        &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.clearline","clearline",        &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.selected", "selected",         &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.onsolder", "onsolder",         &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.auto",     "auto",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.warn",     "warn",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.drc",      "drc",              &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.lock",     "lock",             &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.fullpoly", "fullpoly",         &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.nonetlist","nonetlist",        &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.termname", "termname",         &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.clearpolypoly","clearpolypoly",&op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.p.dyntext","dyntext",          &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+	{"@.p.flag.p.floater","floater",          &op_tab[OPS_ANY], RIGHT_CONST, &right_const_tab[RC_10]},
+
+	{NULL, NULL, NULL, 0, NULL}
+};
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.c	(revision 18980)
@@ -0,0 +1,591 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This file was originally written by Bill Wilson for the PCB Gtk
+ * port.  It was later heavily modified by Dan McMahill to provide
+ * user customized menus.
+*/
+/* gui-top-window.c
+|  This handles creation of the top level window and all its widgets.
+|  events for the Output.drawing_area widget are handled in a separate
+|  file gui-output-events.c
+|
+|  Some caveats with menu shorcut keys:  Some keys are trapped out by Gtk
+|  and can't be used as shortcuts (eg. '|', TAB, etc).  For these cases
+|  we have our own shortcut table and capture the keys and send the events
+|  there in ghid_port_key_press_cb().
+*/
+#define _POSIX_SOURCE
+#include "config.h"
+#include "dlg_topwin.h"
+#include "conf_core.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "pcb-printf.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+
+#include "compat.h"
+#include "bu_box.h"
+#include "bu_status_line.h"
+#include "bu_menu.h"
+#include "bu_icons.h"
+#include "bu_info_bar.h"
+#include "dlg_route_style.h"
+#include "dlg_fontsel.h"
+#include "util_str.h"
+#include "util_listener.h"
+#include "in_mouse.h"
+#include "in_keyboard.h"
+#include "wt_layersel.h"
+#include "tool.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "win_place.h"
+
+/* sync the menu checkboxes with actual pcb state */
+void ghid_update_toggle_flags(pcb_gtk_topwin_t *tw, const char *cookie)
+{
+	ghid_main_menu_update_toggle_state(GHID_MAIN_MENU(tw->menu.menu_bar), menu_toggle_update_cb);
+}
+
+static void h_adjustment_changed_cb(GtkAdjustment *adj, pcb_gtk_topwin_t *tw)
+{
+	if (tw->adjustment_changed_holdoff)
+		return;
+
+	tw->com->port_ranges_changed();
+}
+
+static void v_adjustment_changed_cb(GtkAdjustment *adj, pcb_gtk_topwin_t *tw)
+{
+	if (tw->adjustment_changed_holdoff)
+		return;
+
+	tw->com->port_ranges_changed();
+}
+
+	/* Save size of top window changes so PCB can restart at its size at exit.
+	 */
+static gint top_window_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, void *gport)
+{
+	wplc_config_event(widget, ev, &hid_gtk_wgeo.top_x, &hid_gtk_wgeo.top_y, &hid_gtk_wgeo.top_width, &hid_gtk_wgeo.top_height);
+
+	return FALSE;
+}
+
+static gboolean top_window_enter_cb(GtkWidget * widget, GdkEvent * event, pcb_gtk_topwin_t *tw)
+{
+	if (check_externally_modified(&tw->ext_chg))
+		pcb_gtk_info_bar_file_extmod_prompt(&tw->ibar, tw->vbox_middle);
+
+	return FALSE;
+}
+
+
+void ghid_handle_units_changed(pcb_gtk_topwin_t *tw)
+{
+	char *text = pcb_strdup_printf("<b>%s</b>", conf_core.editor.grid_unit->in_suffix);
+	ghid_set_cursor_position_labels(&tw->cps, conf_hid_gtk.plugins.hid_gtk.compact_vertical);
+	gtk_label_set_markup(GTK_LABEL(tw->cps.grid_units_label), text);
+	free(text);
+	ghid_config_handle_units_changed(tw->com);
+}
+
+gboolean ghid_idle_cb(void *topwin)
+{
+	pcb_gtk_topwin_t *tw = topwin;
+	if (conf_core.editor.mode == PCB_MODE_NO)
+		pcb_tool_select_by_id(PCB_MODE_ARROW);
+	tw->com->mode_cursor_main(conf_core.editor.mode);
+	if (tw->mode_btn.settings_mode != conf_core.editor.mode) {
+		ghid_mode_buttons_update();
+	}
+	tw->mode_btn.settings_mode = conf_core.editor.mode;
+	return FALSE;
+}
+
+gboolean ghid_port_key_release_cb(GtkWidget * drawing_area, GdkEventKey * kev, pcb_gtk_topwin_t *tw)
+{
+	gint ksym = kev->keyval;
+
+	if (ghid_is_modifier_key_sym(ksym))
+		tw->com->note_event_location(NULL);
+
+	pcb_tool_adjust_attached_objects();
+	tw->com->invalidate_all();
+	g_idle_add(ghid_idle_cb, tw);
+	return FALSE;
+}
+
+
+	/* Sync toggle states that were saved with the layout and notify the
+	   |  config code to update Settings values it manages.
+	 */
+void ghid_sync_with_new_layout(pcb_gtk_topwin_t *tw)
+{
+	if (vtroutestyle_len(&PCB->RouteStyle) > 0) {
+		pcb_use_route_style(&PCB->RouteStyle.array[0]);
+		pcb_gtk_route_style_select_style(GHID_ROUTE_STYLE(tw->route_style_selector), &PCB->RouteStyle.array[0]);
+	}
+
+	ghid_handle_units_changed(tw);
+
+	tw->com->window_set_name_label(PCB->Name);
+	tw->com->set_status_line_label();
+	pcb_gtk_close_info_bar(&tw->ibar);
+	update_board_mtime_from_disk(&tw->ext_chg);
+}
+
+void pcb_gtk_tw_notify_save_pcb(pcb_gtk_topwin_t *tw, const char *filename, pcb_bool done)
+{
+	/* Do nothing if it is not the active PCB file that is being saved.
+	 */
+	if (PCB->Filename == NULL || strcmp(filename, PCB->Filename) != 0)
+		return;
+
+	if (done)
+		update_board_mtime_from_disk(&tw->ext_chg);
+}
+
+void pcb_gtk_tw_notify_filename_changed(pcb_gtk_topwin_t *tw)
+{
+	/* Pick up the mtime of the new PCB file */
+	update_board_mtime_from_disk(&tw->ext_chg);
+	tw->com->window_set_name_label(PCB->Name);
+}
+
+void ghid_install_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw)
+{
+	gtk_window_add_accel_group(window, ghid_main_menu_get_accel_group(GHID_MAIN_MENU(tw->menu.menu_bar)));
+	gtk_window_add_accel_group(window, pcb_gtk_route_style_get_accel_group(GHID_ROUTE_STYLE(tw->route_style_selector)));
+}
+
+void ghid_remove_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw)
+{
+	gtk_window_remove_accel_group(window, ghid_main_menu_get_accel_group(GHID_MAIN_MENU(tw->menu.menu_bar)));
+	gtk_window_remove_accel_group(window, pcb_gtk_route_style_get_accel_group(GHID_ROUTE_STYLE(tw->route_style_selector)));
+}
+
+/* Refreshes the window title bar and sets the PCB name to the
+ * window title bar or to a seperate label
+ */
+void pcb_gtk_tw_window_set_name_label(pcb_gtk_topwin_t *tw, gchar *name)
+{
+	gchar *str;
+	gchar *filename;
+
+	/* This happens if we're calling an exporter from the command line */
+	if (!tw->active)
+		return;
+
+#warning TODO: use some gds here to speed things up
+
+	pcb_gtk_g_strdup(&(tw->name_label_string), name);
+	if (!tw->name_label_string || !*tw->name_label_string)
+		tw->name_label_string = g_strdup(_("Unnamed"));
+
+	if (!PCB->Filename || !*PCB->Filename)
+		filename = g_strdup(_("<board with no file name or format>"));
+	else
+		filename = g_strdup(PCB->Filename);
+
+	str = g_strdup_printf("%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", tw->name_label_string, filename, PCB->is_footprint ? "footprint" : "board");
+	gtk_window_set_title(GTK_WINDOW(tw->com->top_window), str);
+	g_free(str);
+	g_free(filename);
+}
+
+void pcb_gtk_tw_layer_buttons_update(pcb_gtk_topwin_t *tw)
+{
+	pcb_gtk_layersel_update(tw->com, &tw->layersel);
+}
+
+void pcb_gtk_tw_layer_vis_update(pcb_gtk_topwin_t *tw)
+{
+	pcb_gtk_layersel_vis_update(&tw->layersel);
+}
+
+/* Called when user clicks OK on route style dialog */
+void pcb_gtk_tw_route_styles_edited_cb(pcb_gtk_topwin_t *tw)
+{
+#warning TODO: generate a route styles changed event
+}
+
+/*
+ * ---------------------------------------------------------------
+ * Top window
+ * ---------------------------------------------------------------
+ */
+static gint delete_chart_cb(GtkWidget *widget, GdkEvent *event, void *data)
+{
+	pcb_action("Quit");
+
+	/*
+	 * Return TRUE to keep our app running.  A FALSE here would let the
+	 * delete signal continue on and kill our program.
+	 */
+	return TRUE;
+}
+
+static void destroy_chart_cb(GtkWidget * widget, pcb_gtk_topwin_t *tw)
+{
+	tw->com->main_destroy(tw->com->gport);
+}
+
+static void get_widget_styles(pcb_gtk_topwin_t *tw, GtkStyle ** menu_bar_style, GtkStyle ** tool_button_style, GtkStyle ** tool_button_label_style)
+{
+	GtkWidget *tool_button;
+	GtkWidget *tool_button_label;
+	GtkToolItem *tool_item;
+
+	/* Build a tool item to extract the theme's styling for a toolbar button with text */
+	tool_item = gtk_tool_item_new();
+	gtk_toolbar_insert(GTK_TOOLBAR(tw->mode_btn.mode_toolbar), tool_item, 0);
+	tool_button = gtk_button_new();
+	gtk_container_add(GTK_CONTAINER(tool_item), tool_button);
+	tool_button_label = gtk_label_new("");
+	gtk_container_add(GTK_CONTAINER(tool_button), tool_button_label);
+
+	/* Grab the various styles we need */
+	gtk_widget_ensure_style(tw->menu.menu_bar);
+	*menu_bar_style = gtk_widget_get_style(tw->menu.menu_bar);
+
+	gtk_widget_ensure_style(tool_button);
+	*tool_button_style = gtk_widget_get_style(tool_button);
+
+	gtk_widget_ensure_style(tool_button_label);
+	*tool_button_label_style = gtk_widget_get_style(tool_button_label);
+
+	gtk_widget_destroy(GTK_WIDGET(tool_item));
+}
+
+static void do_fix_topbar_theming(pcb_gtk_topwin_t *tw)
+{
+	GtkWidget *rel_pos_frame;
+	GtkWidget *abs_pos_frame;
+	GtkStyle *menu_bar_style;
+	GtkStyle *tool_button_style;
+	GtkStyle *tool_button_label_style;
+
+	get_widget_styles(tw, &menu_bar_style, &tool_button_style, &tool_button_label_style);
+
+	/* Style the top bar background as if it were all a menu bar */
+	gtk_widget_set_style(tw->top_bar_background, menu_bar_style);
+
+	/* Style the cursor position labels using the menu bar style as well.
+	 * If this turns out to cause problems with certain gtk themes, we may
+	 * need to grab the GtkStyle associated with an actual menu item to
+	 * get a text color to render with.
+	 */
+	gtk_widget_set_style(tw->cps.cursor_position_relative_label, menu_bar_style);
+	gtk_widget_set_style(tw->cps.cursor_position_absolute_label, menu_bar_style);
+
+	/* Style the units button as if it were a toolbar button - hopefully
+	 * this isn't too ugly sitting on a background themed as a menu bar.
+	 * It is unlikely any theme defines colours for a GtkButton sitting on
+	 * a menu bar.
+	 */
+	rel_pos_frame = gtk_widget_get_parent(tw->cps.cursor_position_relative_label);
+	abs_pos_frame = gtk_widget_get_parent(tw->cps.cursor_position_absolute_label);
+	gtk_widget_set_style(rel_pos_frame, menu_bar_style);
+	gtk_widget_set_style(abs_pos_frame, menu_bar_style);
+	gtk_widget_set_style(tw->cps.grid_units_button, tool_button_style);
+	gtk_widget_set_style(tw->cps.grid_units_label, tool_button_label_style);
+}
+
+/* Attempt to produce a conststent style for our extra menu-bar items by
+ * copying aspects from the menu bar style set by the user's GTK theme.
+ * Setup signal handlers to update our efforts if the user changes their
+ * theme whilst we are running.
+ */
+static void fix_topbar_theming(pcb_gtk_topwin_t *tw)
+{
+	GtkSettings *settings;
+
+	do_fix_topbar_theming(tw);
+
+	settings = gtk_widget_get_settings(tw->top_bar_background);
+	g_signal_connect(settings, "notify::gtk-theme-name", G_CALLBACK(do_fix_topbar_theming), NULL);
+	g_signal_connect(settings, "notify::gtk-font-name", G_CALLBACK(do_fix_topbar_theming), NULL);
+}
+
+static void fullscreen_cb(GtkButton * btn, void *data)
+{
+	conf_setf(CFR_DESIGN, "editor/fullscreen", -1, "%d", !conf_core.editor.fullscreen, POL_OVERWRITE);
+}
+
+/* XPM */
+static const char * FullScreen_xpm[] = {
+"8 8 2 1",
+" 	c None",
+".	c #729FCF",
+"        ",
+" ...... ",
+" .      ",
+" . ...  ",
+" . .    ",
+" . .    ",
+" .      ",
+"        "};
+
+/* Embed an XPM image in a button, and make it display as small as possible 
+ *   Returns: a new image button. When freeing the object, the image needs to be freed 
+ *            as well, using :
+ *            g_object_unref(gtk_button_get_image(GTK_BUTTON(button)); g_object_unref(button);
+ */
+static GtkWidget *create_image_button_from_xpm_data(const char **xpm_data)
+{
+	GtkWidget *button;
+	GdkPixbuf *pixbuf;
+	GtkWidget *image;
+	const char *css_class = "minimum_size_button";
+	char *css_descr;
+
+	button = gtk_button_new();
+	pixbuf = gdk_pixbuf_new_from_xpm_data(xpm_data);
+	image = gtk_image_new_from_pixbuf(pixbuf);
+	g_object_unref(pixbuf);
+
+	gtk_button_set_image(GTK_BUTTON(button), image);
+
+	css_descr = pcb_strdup_printf(".%s {min-width:0; min-height:0;}\n", css_class);
+	gtkc_widget_add_class_style(button, css_class, css_descr);
+	free(css_descr);
+
+	return button;
+}
+
+/* Just calls the scroll bars preferred size, when drawing area is resized */
+static void drawing_area_size_allocate_cb(GtkWidget *widget, GdkRectangle *allocation, gpointer user_data)
+{
+	gint min;
+	pcb_gtk_topwin_t *tw = user_data;
+
+	gtkc_widget_get_preferred_height(GTK_WIDGET(tw->v_range), &min, NULL);
+	gtkc_widget_get_preferred_height(GTK_WIDGET(gtk_widget_get_parent(tw->h_range)), &min, NULL);
+	gtkc_widget_get_preferred_height(GTK_WIDGET(tw->status_line_hbox), &min, NULL);
+}
+
+static gboolean drawing_area_enter_cb(GtkWidget *w, pcb_gtk_expose_t *p, void *user_data)
+{
+	pcb_gtk_topwin_t *tw = user_data;
+	tw->com->invalidate_all();
+	return FALSE;
+}
+
+/*
+ * Create the top_window contents.  The config settings should be loaded
+ * before this is called.
+ */
+static void ghid_build_pcb_top_window(pcb_gtk_topwin_t *tw)
+{
+	GtkWidget *vbox_main, *hbox_middle, *hbox;
+	GtkWidget *vbox, *frame, *hbox_scroll, *fullscreen_btn;
+	GtkWidget *label;
+
+	vbox_main = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(tw->com->top_window), vbox_main);
+
+	/* -- Top control bar */
+	tw->top_bar_background = gtk_event_box_new();
+	gtk_box_pack_start(GTK_BOX(vbox_main), tw->top_bar_background, FALSE, FALSE, 0);
+
+	tw->top_hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(tw->top_bar_background), tw->top_hbox);
+
+	/*
+	 * menu_hbox will be made insensitive when the gui needs
+	 * a modal button GetLocation button press.
+	 */
+	tw->menu_hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tw->top_hbox), tw->menu_hbox, FALSE, FALSE, 0);
+
+	tw->menubar_toolbar_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tw->menu_hbox), tw->menubar_toolbar_vbox, FALSE, FALSE, 0);
+
+	/* Build layer menus */
+	tw->layer_selector = pcb_gtk_layersel_build(tw->com, &tw->layersel);
+
+	/* Build main menu */
+	tw->menu.menu_bar = ghid_load_menus(&tw->menu, &tw->ghid_cfg);
+	gtk_box_pack_start(GTK_BOX(tw->menubar_toolbar_vbox), tw->menu.menu_bar, FALSE, FALSE, 0);
+
+	pcb_gtk_make_mode_buttons_and_toolbar(tw->com, &tw->mode_btn);
+	gtk_box_pack_start(GTK_BOX(tw->menubar_toolbar_vbox), tw->mode_btn.mode_toolbar_vbox, FALSE, FALSE, 0);
+
+	tw->position_hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(tw->top_hbox), tw->position_hbox, FALSE, FALSE, 0);
+
+	make_cursor_position_labels(tw->position_hbox, &tw->cps);
+
+	hbox_middle = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox_main), hbox_middle, TRUE, TRUE, 0);
+
+	fix_topbar_theming(tw); /* Must be called after toolbar is created */
+
+	/* -- Left control bar */
+	/*
+	 * This box will be made insensitive when the gui needs
+	 * a modal button GetLocation button press.
+	 */
+	tw->left_toolbar = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox_middle), tw->left_toolbar, FALSE, FALSE, 0);
+
+	gtk_box_pack_start(GTK_BOX(tw->left_toolbar), tw->layer_selector, TRUE, TRUE, 0);
+
+	/* tw->mode_btn.mode_buttons_frame was created above in the call to
+	 * make_mode_buttons_and_toolbar (...);
+	 */
+	gtk_box_pack_start(GTK_BOX(tw->left_toolbar), tw->mode_btn.mode_buttons_frame, FALSE, FALSE, 0);
+
+	frame = gtk_frame_new(NULL);
+	gtk_box_pack_end(GTK_BOX(tw->left_toolbar), frame, FALSE, FALSE, 0);
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1);
+	tw->route_style_selector = pcb_gtk_route_style_new(tw->com);
+	make_route_style_buttons(GHID_ROUTE_STYLE(tw->route_style_selector));
+	gtk_box_pack_start(GTK_BOX(hbox), tw->route_style_selector, FALSE, FALSE, 0);
+
+	tw->vbox_middle = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox_middle), tw->vbox_middle, TRUE, TRUE, 0);
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tw->vbox_middle), hbox, TRUE, TRUE, 0);
+
+	/* -- The PCB layout output drawing area */
+
+	tw->drawing_area = tw->com->new_drawing_widget(tw->com);
+	g_signal_connect(G_OBJECT(tw->drawing_area), "realize", G_CALLBACK(tw->com->drawing_realize), tw->com->gport);
+	tw->com->init_drawing_widget(tw->drawing_area, tw->com->gport);
+
+	gtk_widget_add_events(tw->drawing_area, GDK_EXPOSURE_MASK
+												| GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK
+												| GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK
+												| GDK_KEY_RELEASE_MASK | GDK_KEY_PRESS_MASK
+												| GDK_SCROLL_MASK
+												| GDK_FOCUS_CHANGE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+	/*
+	 * This is required to get the drawing_area key-press-event.  Also the
+	 * enter and button press callbacks grab focus to be sure we have it
+	 * when in the drawing_area.
+	 */
+	gtk_widget_set_can_focus(tw->drawing_area, TRUE);
+
+	gtk_box_pack_start(GTK_BOX(hbox), tw->drawing_area, TRUE, TRUE, 0);
+
+	tw->v_adjustment = G_OBJECT(gtk_adjustment_new(0.0, 0.0, 100.0, 10.0, 10.0, 10.0));
+	tw->v_range = gtk_vscrollbar_new(GTK_ADJUSTMENT(tw->v_adjustment));
+
+	gtk_box_pack_start(GTK_BOX(hbox), tw->v_range, FALSE, FALSE, 0);
+
+
+	g_signal_connect(G_OBJECT(tw->v_adjustment), "value_changed", G_CALLBACK(v_adjustment_changed_cb), tw);
+
+	tw->h_adjustment = G_OBJECT(gtk_adjustment_new(0.0, 0.0, 100.0, 10.0, 10.0, 10.0));
+
+	hbox_scroll = gtkc_hbox_new(FALSE, 0);
+	tw->h_range = gtk_hscrollbar_new(GTK_ADJUSTMENT(tw->h_adjustment));
+	fullscreen_btn = create_image_button_from_xpm_data(FullScreen_xpm);
+	g_signal_connect(G_OBJECT(fullscreen_btn), "clicked", G_CALLBACK(fullscreen_cb), NULL);
+	gtk_box_pack_start(GTK_BOX(hbox_scroll), tw->h_range, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox_scroll), fullscreen_btn, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tw->vbox_middle), hbox_scroll, FALSE, FALSE, 0);
+
+
+	g_signal_connect(G_OBJECT(tw->h_adjustment), "value_changed", G_CALLBACK(h_adjustment_changed_cb), tw);
+
+	/* -- The bottom status line label */
+	tw->status_line_hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tw->vbox_middle), tw->status_line_hbox, FALSE, FALSE, 0);
+
+	label = pcb_gtk_status_line_label_new();
+
+	tw->status_line_label = label;
+	gtk_box_pack_start(GTK_BOX(tw->status_line_hbox), label, FALSE, FALSE, 0);
+
+	/* Depending on user setting, the command_combo_box may get packed into
+	   |  the status_line_hbox, but it will happen on demand the first time
+	   |  the user does a command entry.
+	 */
+
+	g_signal_connect(G_OBJECT(tw->drawing_area), "size-allocate", G_CALLBACK(drawing_area_size_allocate_cb), tw);
+	g_signal_connect(G_OBJECT(tw->drawing_area), "enter-notify-event", G_CALLBACK(drawing_area_enter_cb), tw);
+	g_signal_connect(G_OBJECT(tw->com->top_window), "configure_event", G_CALLBACK(top_window_configure_event_cb), tw->com->gport);
+	g_signal_connect(tw->com->top_window, "enter-notify-event", G_CALLBACK(top_window_enter_cb), tw);
+
+	g_signal_connect(G_OBJECT(tw->com->top_window), "delete_event", G_CALLBACK(delete_chart_cb), tw->com->gport);
+	g_signal_connect(G_OBJECT(tw->com->top_window), "destroy", G_CALLBACK(destroy_chart_cb), tw);
+
+	gtk_widget_show_all(tw->com->top_window);
+	tw->com->pack_mode_buttons();
+
+	ghid_fullscreen_apply(tw);
+	tw->active = 1;
+}
+
+	/* We'll set the interface insensitive when a g_main_loop is running so the
+	   |  Gtk menus and buttons don't respond and interfere with the special entry
+	   |  the user needs to be doing.
+	 */
+void pcb_gtk_tw_interface_set_sensitive(pcb_gtk_topwin_t *tw, gboolean sensitive)
+{
+	gtk_widget_set_sensitive(tw->left_toolbar, sensitive);
+	gtk_widget_set_sensitive(tw->menu_hbox, sensitive);
+}
+
+void ghid_create_pcb_widgets(pcb_gtk_topwin_t *tw, GtkWidget *in_top_window)
+{
+	tw->com->load_bg_image();
+
+	ghid_build_pcb_top_window(tw);
+	ghid_install_accel_groups(GTK_WINDOW(tw->com->top_window), tw);
+	ghid_update_toggle_flags(tw, NULL);
+
+	pcb_gtk_icons_init(GTK_WINDOW(tw->com->top_window));
+	pcb_tool_select_by_id(PCB_MODE_ARROW);
+	ghid_mode_buttons_update();
+}
+
+void ghid_fullscreen_apply(pcb_gtk_topwin_t *tw)
+{
+	if (conf_core.editor.fullscreen) {
+		gtk_widget_hide(tw->left_toolbar);
+		gtk_widget_hide(tw->top_hbox);
+		gtk_widget_hide(tw->status_line_hbox);
+	}
+	else {
+		gtk_widget_show(tw->left_toolbar);
+		gtk_widget_show(tw->top_hbox);
+		gtk_widget_show(tw->status_line_hbox);
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/dlg_topwin.h	(revision 18980)
@@ -0,0 +1,70 @@
+#ifndef PCB_GTK_TOPWIN_H
+#define PCB_GTK_TOPWIN_H
+
+/* OPTIONAL top window implementation */
+
+#include <gtk/gtk.h>
+
+#include "hid_cfg.h"
+
+#include "util_ext_chg.h"
+#include "bu_info_bar.h"
+#include "bu_menu.h"
+#include "bu_mode_btn.h"
+#include "bu_cursor_pos.h"
+#include "glue.h"
+#include "dlg_command.h"
+#include "wt_layersel.h"
+
+typedef struct {
+	/* util/builder states */
+	pcb_gtk_common_t *com;
+	pcb_gtk_ext_chg_t ext_chg;
+	pcb_gtk_info_bar_t ibar;
+	pcb_gtk_menu_ctx_t menu;
+	pcb_hid_cfg_t *ghid_cfg;
+	pcb_gtk_mode_btn_t mode_btn;
+	pcb_gtk_cursor_pos_t cps;
+	pcb_gtk_command_t cmd;
+
+	/* own widgets */
+	GtkWidget *drawing_area;
+	GtkWidget *status_line_label, *status_line_hbox;
+
+	GtkWidget *top_hbox, *top_bar_background, *menu_hbox, *position_hbox, *menubar_toolbar_vbox;
+	GtkWidget *left_toolbar;
+	GtkWidget *layer_selector, *route_style_selector;
+	GtkWidget *vbox_middle;
+
+	GtkWidget *h_range, *v_range;
+	GObject *h_adjustment, *v_adjustment;
+
+	/* own internal states */
+	gchar *name_label_string;
+	gboolean adjustment_changed_holdoff, in_popup;
+	gboolean small_label_markup;
+	int active; /* 0 before init finishes */
+	pcb_gtk_layersel_t layersel;
+} pcb_gtk_topwin_t;
+
+void ghid_update_toggle_flags(pcb_gtk_topwin_t *tw, const char *cookie);
+void ghid_install_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw);
+void ghid_remove_accel_groups(GtkWindow *window, pcb_gtk_topwin_t *tw);
+void ghid_create_pcb_widgets(pcb_gtk_topwin_t *tw, GtkWidget *in_top_window);
+void ghid_sync_with_new_layout(pcb_gtk_topwin_t *tw);
+void ghid_fullscreen_apply(pcb_gtk_topwin_t *tw);
+void pcb_gtk_tw_layer_buttons_update(pcb_gtk_topwin_t *tw);
+void pcb_gtk_tw_layer_vis_update(pcb_gtk_topwin_t *tw);
+void ghid_handle_units_changed(pcb_gtk_topwin_t *tw);
+
+void pcb_gtk_tw_route_styles_edited_cb(pcb_gtk_topwin_t *tw);
+void pcb_gtk_tw_notify_save_pcb(pcb_gtk_topwin_t *tw, const char *filename, pcb_bool done);
+void pcb_gtk_tw_notify_filename_changed(pcb_gtk_topwin_t *tw);
+void pcb_gtk_tw_interface_set_sensitive(pcb_gtk_topwin_t *tw, gboolean sensitive);
+void pcb_gtk_tw_window_set_name_label(pcb_gtk_topwin_t *tw, gchar *name);
+
+gboolean ghid_idle_cb(void *topwin);
+gboolean ghid_port_key_release_cb(GtkWidget * drawing_area, GdkEventKey * kev, pcb_gtk_topwin_t *tw);
+
+#endif
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/glue.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/glue.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/glue.h	(revision 18980)
@@ -0,0 +1,73 @@
+#ifndef PCB_GTK_COMMON_GLUE_H
+#define PCB_GTK_COMMON_GLUE_H
+
+#include <gtk/gtk.h>
+#include "hid.h"
+#include "conf.h"
+
+#include "compat.h"
+
+/* The HID using pcb_gtk_common needs to fill in this struct and pass it
+   on to most of the calls. This is the only legal way pcb_gtk_common can
+   back reference to the HID. This lets multiple HIDs use gtk_common code
+   without linker errors. */
+typedef struct pcb_gtk_common_s {
+	void *gport;      /* Opaque pointer back to the HID's internal struct - used when common calls a HID function */
+	GtkWidget *top_window;
+
+	/* rendering */
+	void (*drawing_realize)(GtkWidget *w, void *gport);
+	gboolean (*drawing_area_expose)(GtkWidget *w, pcb_gtk_expose_t *p, void *gport);
+	void (*drawing_area_configure_hook)(void *);
+
+	GtkWidget *(*new_drawing_widget)(struct pcb_gtk_common_s *common);
+	void (*init_drawing_widget)(GtkWidget *widget, void *gport);
+	gboolean (*preview_expose)(GtkWidget *widget, pcb_gtk_expose_t *p, pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t *ctx);
+	void (*load_bg_image)(void);
+	void (*init_renderer)(int *argc, char ***argv, void *port);
+	void (*draw_grid_local)(pcb_coord_t cx, pcb_coord_t cy);
+
+	/* main window */
+	void (*window_set_name_label)(gchar *name);
+	void (*set_status_line_label)(void);
+	void (*status_line_set_text)(const gchar *text);
+
+	/* UI */
+	void (*note_event_location)(GdkEventButton *ev);
+	int (*shift_is_pressed)();
+	void (*interface_input_signals_disconnect)(void);
+	void (*interface_input_signals_connect)(void);
+	void (*interface_set_sensitive)(gboolean sensitive);
+	void (*port_button_press_main)(void);
+	void (*port_button_release_main)(void);
+	void (*port_ranges_changed)(void);
+
+	/* screen */
+	void (*mode_cursor_main)(int mode);
+	void (*invalidate_all)();
+	void (*cancel_lead_user)(void);
+	void (*lead_user_to_location)(pcb_coord_t x, pcb_coord_t y);
+	void (*pan_common)(void);
+	void (*port_ranges_scale)(void);
+	void (*pack_mode_buttons)(void);
+	void (*screen_update)(void);
+	void (*shutdown_renderer)(void *port);
+
+	/* execute events */
+	void (*LayersChanged)(void);
+	void (*route_styles_edited_cb)(void);
+
+	void (*main_destroy)(void *gport);
+
+	/* only for config: */
+	const gchar *(*get_color_name)(pcb_gtk_color_t * color);
+	pcb_bool (*map_color_string)(const char *color_string, pcb_gtk_color_t * color);
+	void (*set_special_colors)(conf_native_t *cfg);
+	void (*layer_buttons_update)(void);
+
+	int (*command_entry_is_active)(void);
+	void (*command_use_command_window_sync)(void);
+
+} pcb_gtk_common_t;
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.c	(revision 18980)
@@ -0,0 +1,158 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This code was originally written by Bill Wilson for the PCB Gtk port. */
+
+#include "config.h"
+#include "in_keyboard.h"
+#include <gdk/gdkkeysyms.h>
+#include <ctype.h>
+#include <string.h>
+
+#include "event.h"
+#include "compat_misc.h"
+
+pcb_hid_cfg_keys_t ghid_keymap;
+GdkModifierType pcb_gtk_glob_mask;
+
+gboolean ghid_is_modifier_key_sym(gint ksym)
+{
+	if (ksym == GDK_KEY_Shift_R || ksym == GDK_KEY_Shift_L || ksym == GDK_KEY_Control_R || ksym == GDK_KEY_Control_L)
+		return TRUE;
+	return FALSE;
+}
+
+ModifierKeysState ghid_modifier_keys_state(GtkWidget *drawing_area, GdkModifierType *state)
+{
+	GdkModifierType mask;
+	ModifierKeysState mk;
+	gboolean shift, control, mod1;
+
+	if (!state)
+		gdkc_window_get_pointer(drawing_area, NULL, NULL, &mask);
+	else
+		mask = *state;
+
+	shift = (mask & GDK_SHIFT_MASK);
+	control = (mask & GDK_CONTROL_MASK);
+	mod1 = (mask & GDK_MOD1_MASK);
+
+	if (shift && !control && !mod1)
+		mk = SHIFT_PRESSED;
+	else if (!shift && control && !mod1)
+		mk = CONTROL_PRESSED;
+	else if (!shift && !control && mod1)
+		mk = MOD1_PRESSED;
+	else if (shift && control && !mod1)
+		mk = SHIFT_CONTROL_PRESSED;
+	else if (shift && !control && mod1)
+		mk = SHIFT_MOD1_PRESSED;
+	else if (!shift && control && mod1)
+		mk = CONTROL_MOD1_PRESSED;
+	else if (shift && control && mod1)
+		mk = SHIFT_CONTROL_MOD1_PRESSED;
+	else
+		mk = NONE_PRESSED;
+
+	return mk;
+}
+
+gboolean ghid_port_key_press_cb(GtkWidget *drawing_area, GdkEventKey *kev, gpointer data)
+{
+	pcb_gtk_view_t *view = data;
+
+	if (ghid_is_modifier_key_sym(kev->keyval))
+		return FALSE;
+
+	if (kev->keyval <= 0xffff) {
+		GdkModifierType state = (GdkModifierType) (kev->state);
+		int slen, mods = 0;
+		unsigned short int key_raw = 0;
+		unsigned short int kv = kev->keyval;
+		guint *keyvals;
+		GdkKeymapKey *keys;
+		gint n_entries;
+
+		view->com->note_event_location(NULL);
+
+		pcb_gtk_glob_mask = state;
+
+		if (state & GDK_MOD1_MASK)    mods |= PCB_M_Alt;
+		if (state & GDK_CONTROL_MASK) mods |= PCB_M_Ctrl;
+		if (state & GDK_SHIFT_MASK)   mods |= PCB_M_Shift;
+
+		/* Retrieve the basic character (level 0) corresponding to physical key stroked. */
+		if (gdk_keymap_get_entries_for_keycode(gdk_keymap_get_default(), kev->hardware_keycode, &keys, &keyvals, &n_entries)) {
+			key_raw = keyvals[0];
+			g_free(keys);
+			g_free(keyvals);
+		}
+
+		if (kv == GDK_KEY_ISO_Left_Tab) kv = GDK_KEY_Tab;
+		if (kv == GDK_KEY_KP_Add) key_raw = kv = '+';
+		if (kv == GDK_KEY_KP_Subtract) key_raw = kv = '-';
+		if (kv == GDK_KEY_KP_Multiply) key_raw = kv = '*';
+		if (kv == GDK_KEY_KP_Divide) key_raw = kv = '/';
+		if (kv == GDK_KEY_KP_Enter) key_raw = kv = GDK_KEY_Return;
+
+		slen = pcb_hid_cfg_keys_input(&ghid_keymap, mods, key_raw, kv);
+		pcb_event(PCB_EVENT_GUI_SYNC_STATUS, 0, NULL);
+		if (slen > 0) {
+			view->has_entered  = 1;
+			pcb_hid_cfg_keys_action(&ghid_keymap);
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+unsigned short int ghid_translate_key(const char *desc, int len)
+{
+	guint key;
+
+	if (pcb_strcasecmp(desc, "enter") == 0)
+		desc = "Return";
+
+	key = gdk_keyval_from_name(desc);
+	if (key > 0xffff) {
+		pcb_message(PCB_MSG_WARNING, "Ignoring invalid/exotic key sym: '%s'\n", desc);
+		return 0;
+	}
+	return key;
+}
+
+int ghid_key_name(unsigned short int key_char, char *out, int out_len)
+{
+	char *name = gdk_keyval_name(key_char);
+	if (name == NULL)
+		return -1;
+	strncpy(out, name, out_len);
+	out[out_len - 1] = '\0';
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/in_keyboard.h	(revision 18980)
@@ -0,0 +1,41 @@
+#ifndef PCB_GTK_IN_KEYBOARD_H
+#define PCB_GTK_IN_KEYBOARD_H
+
+#include <gtk/gtk.h>
+#include <gdk/gdkevents.h>
+
+#include "hid_cfg_input.h"
+#include "ui_zoompan.h"
+
+typedef enum {
+	NONE_PRESSED = 0,
+	SHIFT_PRESSED = PCB_M_Shift,
+	CONTROL_PRESSED = PCB_M_Ctrl,
+	MOD1_PRESSED = PCB_M_Mod1,
+	SHIFT_CONTROL_PRESSED = PCB_M_Shift | PCB_M_Ctrl,
+	SHIFT_MOD1_PRESSED = PCB_M_Shift | PCB_M_Mod1,
+	CONTROL_MOD1_PRESSED = PCB_M_Ctrl | PCB_M_Mod1,
+	SHIFT_CONTROL_MOD1_PRESSED = PCB_M_Shift | PCB_M_Ctrl | PCB_M_Mod1
+} ModifierKeysState;
+
+/* return TRUE ksym is SHIFT or CTRL modifier key. */
+gboolean ghid_is_modifier_key_sym(gint ksym);
+
+/* key modifier state of drawing_area if state is NULL, otherwise, corresponding state key modifier. */
+ModifierKeysState ghid_modifier_keys_state(GtkWidget *drawing_area, GdkModifierType *state);
+
+/* Handle user key events of the output drawing area. */
+gboolean ghid_port_key_press_cb(GtkWidget *drawing_area, GdkEventKey *kev, gpointer data);
+
+extern pcb_hid_cfg_keys_t ghid_keymap;
+
+extern GdkModifierType pcb_gtk_glob_mask;
+
+/* return the keyval corresponding to desc key name. len is not used. */
+unsigned short int ghid_translate_key(const char *desc, int len);
+
+/* Load out/put_len with the GDK name corresponding to key_char key value.
+   Return 0 upon success. */
+int ghid_key_name(unsigned short int key_char, char *out, int out_len);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.c	(revision 18980)
@@ -0,0 +1,431 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,1999 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017, Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file was originally written by Bill Wilson for the PCB Gtk port;
+   refactored for pcb-rnd by Tibor 'Igor2' Palinkas */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include "in_mouse.h"
+
+#include "board.h"
+#include "crosshair.h"
+#include "conf_core.h"
+#include "undo.h"
+#include "tool.h"
+
+#include "in_keyboard.h"
+#include "bu_status_line.h"
+#include "bu_icons.h"
+
+pcb_hid_cfg_mouse_t ghid_mouse;
+int ghid_wheel_zoom = 0;
+
+pcb_hid_cfg_mod_t ghid_mouse_button(int ev_button)
+{
+	/* GDK numbers buttons from 1..5, there seems to be no symbolic names */
+	return (PCB_MB_LEFT << (ev_button - 1));
+}
+
+static GdkCursorType old_cursor, cursor_override;
+
+#define CUSTOM_CURSOR_CLOCKWISE		(GDK_LAST_CURSOR + 10)
+#define CUSTOM_CURSOR_DRAG			  (GDK_LAST_CURSOR + 11)
+#define CUSTOM_CURSOR_LOCK			  (GDK_LAST_CURSOR + 12)
+
+#define ICON_X_HOT 8
+#define ICON_Y_HOT 8
+
+
+static GdkCursorType gport_set_cursor(pcb_gtk_mouse_t *ctx, GdkCursorType shape)
+{
+	GdkWindow *window;
+	GdkCursorType old_shape = ctx->X_cursor_shape;
+
+	if (ctx->drawing_area == NULL)
+		return GDK_X_CURSOR;
+
+	window = gtk_widget_get_window(ctx->drawing_area);
+
+	if (ctx->X_cursor_shape == shape)
+		return shape;
+
+	/* check if window exists to prevent from fatal errors */
+	if (window == NULL)
+		return GDK_X_CURSOR;
+
+	ctx->X_cursor_shape = shape;
+	if (shape > GDK_LAST_CURSOR) {
+		if (shape == CUSTOM_CURSOR_CLOCKWISE)
+			ctx->X_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(ctx->drawing_area), XC_clock_source, ICON_X_HOT, ICON_Y_HOT);
+		else if (shape == CUSTOM_CURSOR_DRAG)
+			ctx->X_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(ctx->drawing_area), XC_hand_source, ICON_X_HOT, ICON_Y_HOT);
+		else if (shape == CUSTOM_CURSOR_LOCK)
+			ctx->X_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(ctx->drawing_area), XC_lock_source, ICON_X_HOT, ICON_Y_HOT);
+	}
+	else
+		ctx->X_cursor = gdk_cursor_new(shape);
+
+	gdk_window_set_cursor(window, ctx->X_cursor);
+	gdk_cursor_unref(ctx->X_cursor);
+
+	return old_shape;
+}
+
+void ghid_point_cursor(pcb_gtk_mouse_t *ctx, pcb_bool grabbed)
+{
+	if (grabbed) {
+		old_cursor = gport_set_cursor(ctx, GDK_DRAPED_BOX);
+		cursor_override = GDK_DRAPED_BOX;
+	}
+	else {
+		cursor_override = 0;
+		ghid_mode_cursor(ctx, -1);
+	}
+}
+
+void ghid_hand_cursor(pcb_gtk_mouse_t *ctx)
+{
+	old_cursor = gport_set_cursor(ctx, GDK_HAND2);
+	cursor_override = GDK_HAND2;
+}
+
+void ghid_watch_cursor(pcb_gtk_mouse_t *ctx)
+{
+	GdkCursorType tmp;
+
+	tmp = gport_set_cursor(ctx, GDK_WATCH);
+	if (tmp != GDK_WATCH)
+		old_cursor = tmp;
+}
+
+void ghid_mode_cursor(pcb_gtk_mouse_t *ctx, int mode)
+{
+	if (cursor_override != 0) {
+		gport_set_cursor(ctx, cursor_override);
+		return;
+	}
+
+	if (mode < 0) /* automatic */
+		mode = conf_core.editor.mode;
+
+	switch (mode) {
+	case PCB_MODE_NO:
+		gport_set_cursor(ctx, (GdkCursorType) CUSTOM_CURSOR_DRAG);
+		break;
+
+	case PCB_MODE_VIA:
+		gport_set_cursor(ctx, GDK_ARROW);
+		break;
+
+	case PCB_MODE_LINE:
+		gport_set_cursor(ctx, GDK_PENCIL);
+		break;
+
+	case PCB_MODE_ARC:
+		gport_set_cursor(ctx, GDK_QUESTION_ARROW);
+		break;
+
+	case PCB_MODE_ARROW:
+		gport_set_cursor(ctx, GDK_LEFT_PTR);
+		break;
+
+	case PCB_MODE_POLYGON:
+	case PCB_MODE_POLYGON_HOLE:
+		gport_set_cursor(ctx, GDK_SB_UP_ARROW);
+		break;
+
+	case PCB_MODE_PASTE_BUFFER:
+		gport_set_cursor(ctx, GDK_HAND1);
+		break;
+
+	case PCB_MODE_TEXT:
+		gport_set_cursor(ctx, GDK_XTERM);
+		break;
+
+	case PCB_MODE_RECTANGLE:
+		gport_set_cursor(ctx, GDK_UL_ANGLE);
+		break;
+
+	case PCB_MODE_THERMAL:
+		gport_set_cursor(ctx, GDK_IRON_CROSS);
+		break;
+
+	case PCB_MODE_REMOVE:
+		gport_set_cursor(ctx, GDK_PIRATE);
+		break;
+
+	case PCB_MODE_ROTATE:
+		if (ctx->com->shift_is_pressed())
+			gport_set_cursor(ctx, (GdkCursorType) CUSTOM_CURSOR_CLOCKWISE);
+		else
+			gport_set_cursor(ctx, GDK_EXCHANGE);
+		break;
+
+	case PCB_MODE_COPY:
+	case PCB_MODE_MOVE:
+		gport_set_cursor(ctx, GDK_CROSSHAIR);
+		break;
+
+	case PCB_MODE_INSERT_POINT:
+		gport_set_cursor(ctx, GDK_DOTBOX);
+		break;
+
+	case PCB_MODE_LOCK:
+		gport_set_cursor(ctx, (GdkCursorType) CUSTOM_CURSOR_LOCK);
+	}
+}
+
+void ghid_corner_cursor(pcb_gtk_mouse_t *ctx)
+{
+	GdkCursorType shape;
+
+	if (pcb_crosshair.Y <= pcb_crosshair.AttachedBox.Point1.Y)
+		shape = (pcb_crosshair.X >= pcb_crosshair.AttachedBox.Point1.X) ? GDK_UR_ANGLE : GDK_UL_ANGLE;
+	else
+		shape = (pcb_crosshair.X >= pcb_crosshair.AttachedBox.Point1.X) ? GDK_LR_ANGLE : GDK_LL_ANGLE;
+	if (ctx->X_cursor_shape != shape)
+		gport_set_cursor(ctx, shape);
+}
+
+void ghid_restore_cursor(pcb_gtk_mouse_t *ctx)
+{
+	cursor_override = 0;
+	gport_set_cursor(ctx, old_cursor);
+}
+
+	/* =============================================================== */
+typedef struct {
+	GMainLoop *loop;
+	pcb_gtk_common_t *com;
+	gboolean got_location;
+	gint last_press;
+} loop_ctx_t;
+
+static gboolean loop_key_press_cb(GtkWidget *drawing_area, GdkEventKey *kev, loop_ctx_t *lctx)
+{
+	lctx->last_press = kev->keyval;
+	return TRUE;
+}
+
+
+/*  If user hits a key instead of the mouse button, we'll abort unless
+    it's the enter key (which accepts the current crosshair location).
+ */
+static gboolean loop_key_release_cb(GtkWidget *drawing_area, GdkEventKey *kev, loop_ctx_t *lctx)
+{
+	gint ksym = kev->keyval;
+
+	if (ghid_is_modifier_key_sym(ksym))
+		return TRUE;
+
+	/* accept a key only after a press _and_ release to avoid interfering with
+	   dialog boxes before and after the loop */
+	if (ksym != lctx->last_press)
+		return TRUE;
+
+	switch (ksym) {
+	case GDK_KEY_Return:					/* Accept cursor location */
+		if (g_main_loop_is_running(lctx->loop))
+			g_main_loop_quit(lctx->loop);
+		break;
+
+	default:											/* Abort */
+		lctx->got_location = FALSE;
+		if (g_main_loop_is_running(lctx->loop))
+			g_main_loop_quit(lctx->loop);
+		break;
+	}
+	return TRUE;
+}
+
+/*  User hit a mouse button in the Output drawing area, so quit the loop
+    and the cursor values when the button was pressed will be used.
+ */
+static gboolean loop_button_press_cb(GtkWidget *drawing_area, GdkEventButton *ev, loop_ctx_t *lctx)
+{
+	if (g_main_loop_is_running(lctx->loop))
+		g_main_loop_quit(lctx->loop);
+	lctx->com->note_event_location(ev);
+	return TRUE;
+}
+
+/*  Run a glib GMainLoop which intercepts key and mouse button events from
+    the top level loop.  When a mouse or key is hit in the Output drawing
+    area, quit the loop so the top level loop can continue and use the
+    the mouse pointer coordinates at the time of the mouse button event.
+ */
+static gboolean run_get_location_loop(pcb_gtk_mouse_t *ctx, const gchar * message)
+{
+	static int getting_loc = 0;
+	loop_ctx_t lctx;
+	gulong button_handler, key_handler1, key_handler2;
+	gint oldObjState, oldLineState, oldBoxState;
+
+	/* Do not enter the loop recursively (ask for coord only once); also don't
+	   ask for coord if the scrollwheel triggered the event, it may cause strange
+	   GUI lockups when done outside of the drawing area
+	 */
+	if ((getting_loc) || (ghid_wheel_zoom))
+		return pcb_false;
+
+	getting_loc = 1;
+	ctx->com->status_line_set_text(message);
+
+	oldObjState = pcb_crosshair.AttachedObject.State;
+	oldLineState = pcb_crosshair.AttachedLine.State;
+	oldBoxState = pcb_crosshair.AttachedBox.State;
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
+	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
+	ghid_hand_cursor(ctx);
+	pcb_notify_crosshair_change(pcb_true);
+
+	/*  Stop the top level GMainLoop from getting user input from keyboard
+	   and mouse so we can install our own handlers here.  Also set the
+	   control interface insensitive so all the user can do is hit a key
+	   or mouse button in the Output drawing area.
+	 */
+	ctx->com->interface_input_signals_disconnect();
+	ctx->com->interface_set_sensitive(FALSE);
+
+	lctx.got_location = TRUE;   /* Will be unset by hitting most keys */
+	button_handler =
+		g_signal_connect(G_OBJECT(ctx->drawing_area), "button_press_event", G_CALLBACK(loop_button_press_cb), &lctx);
+	key_handler1 = g_signal_connect(G_OBJECT(ctx->top_window), "key_press_event", G_CALLBACK(loop_key_press_cb), &lctx);
+	key_handler2 = g_signal_connect(G_OBJECT(ctx->top_window), "key_release_event", G_CALLBACK(loop_key_release_cb), &lctx);
+
+	lctx.loop = g_main_loop_new(NULL, FALSE);
+	lctx.com = ctx->com;
+	g_main_loop_run(lctx.loop);
+
+	g_main_loop_unref(lctx.loop);
+
+	g_signal_handler_disconnect(ctx->drawing_area, button_handler);
+	g_signal_handler_disconnect(ctx->top_window, key_handler1);
+	g_signal_handler_disconnect(ctx->top_window, key_handler2);
+
+	ctx->com->interface_input_signals_connect();	/* return to normal */
+	ctx->com->interface_set_sensitive(TRUE);
+
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_crosshair.AttachedObject.State = oldObjState;
+	pcb_crosshair.AttachedLine.State = oldLineState;
+	pcb_crosshair.AttachedBox.State = oldBoxState;
+	pcb_notify_crosshair_change(pcb_true);
+	ghid_restore_cursor(ctx);
+
+	ctx->com->set_status_line_label();
+
+	getting_loc = 0;
+	return lctx.got_location;
+}
+
+gboolean ghid_get_user_xy(pcb_gtk_mouse_t *ctx, const char *msg)
+{
+	pcb_undo_save_serial(); /* will be restored on button release in action helper in core */
+	return run_get_location_loop(ctx, msg);
+}
+
+/* Mouse scroll wheel events */
+gint ghid_port_window_mouse_scroll_cb(GtkWidget *widget, GdkEventScroll *ev, void *data)
+{
+	pcb_gtk_mouse_t *ctx = data;
+	ModifierKeysState mk;
+	GdkModifierType state;
+	int button;
+
+	state = (GdkModifierType) (ev->state);
+	mk = ghid_modifier_keys_state(widget, &state);
+
+	/* X11 gtk hard codes buttons 4, 5, 6, 7 as below in
+	 * gtk+/gdk/x11/gdkevents-x11.c:1121, but quartz and windows have
+	 * special mouse scroll events, so this may conflict with a mouse
+	 * who has buttons 4 - 7 that aren't the scroll wheel?
+	 */
+	switch (ev->direction) {
+		case GDK_SCROLL_UP:    button = PCB_MB_SCROLL_UP; break;
+		case GDK_SCROLL_DOWN:  button = PCB_MB_SCROLL_DOWN; break;
+		case GDK_SCROLL_LEFT:  button = PCB_MB_SCROLL_LEFT; break;
+		case GDK_SCROLL_RIGHT: button = PCB_MB_SCROLL_RIGHT; break;
+		default: return FALSE;
+	}
+
+	ghid_wheel_zoom = 1;
+	hid_cfg_mouse_action(&ghid_mouse, button | mk, ctx->com->command_entry_is_active());
+	ghid_wheel_zoom = 0;
+
+	return TRUE;
+}
+
+gboolean ghid_port_button_press_cb(GtkWidget *drawing_area, GdkEventButton *ev, gpointer data)
+{
+	ModifierKeysState mk;
+	GdkModifierType state;
+	GdkModifierType mask;
+	pcb_gtk_mouse_t *ctx = data;
+
+	/* Reject double and triple click events */
+	if (ev->type != GDK_BUTTON_PRESS)
+		return TRUE;
+
+	ctx->com->note_event_location(ev);
+	state = (GdkModifierType) (ev->state);
+	mk = ghid_modifier_keys_state(drawing_area, &state);
+
+	pcb_gtk_glob_mask = state;
+
+	gdkc_window_get_pointer(drawing_area, NULL, NULL, &mask);
+
+	hid_cfg_mouse_action(&ghid_mouse, ghid_mouse_button(ev->button) | mk, ctx->com->command_entry_is_active());
+
+	ctx->com->port_button_press_main();
+
+	return TRUE;
+}
+
+gboolean ghid_port_button_release_cb(GtkWidget *drawing_area, GdkEventButton *ev, gpointer data)
+{
+	ModifierKeysState mk;
+	GdkModifierType state;
+	pcb_gtk_mouse_t *ctx = data;
+
+	ctx->com->note_event_location(ev);
+	state = (GdkModifierType) (ev->state);
+	mk = ghid_modifier_keys_state(drawing_area, &state);
+
+	hid_cfg_mouse_action(&ghid_mouse, ghid_mouse_button(ev->button) | mk | PCB_M_Release, ctx->com->command_entry_is_active());
+
+	ctx->com->port_button_release_main();
+	return TRUE;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/in_mouse.h	(revision 18980)
@@ -0,0 +1,41 @@
+#ifndef PCB_GTK_IN_MOUSE_H
+#define PCB_GTK_IN_MOUSE_H
+
+#include "hid_cfg_input.h"
+#include "glue.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkevents.h>
+
+typedef struct pcb_gtk_mouse_s {
+	GtkWidget *drawing_area, *top_window;
+	GdkCursor *X_cursor;          /* used X cursor */
+	GdkCursorType X_cursor_shape; /* and its shape */
+	pcb_gtk_common_t *com;
+} pcb_gtk_mouse_t;
+
+extern pcb_hid_cfg_mouse_t ghid_mouse;
+extern int ghid_wheel_zoom;
+
+pcb_hid_cfg_mod_t ghid_mouse_button(int ev_button);
+
+void ghid_hand_cursor(pcb_gtk_mouse_t *ctx);
+void ghid_point_cursor(pcb_gtk_mouse_t *ctx, pcb_bool grabbed);
+
+/* Changes the cursor appearance to signifies a wait state */
+void ghid_watch_cursor(pcb_gtk_mouse_t *ctx);
+
+/* Changes the cursor appearance according to mode */
+void ghid_mode_cursor(pcb_gtk_mouse_t *ctx, gint mode);
+
+void ghid_corner_cursor(pcb_gtk_mouse_t *ctx);
+void ghid_restore_cursor(pcb_gtk_mouse_t *ctx);
+
+gboolean ghid_get_user_xy(pcb_gtk_mouse_t *ctx, const char *msg);
+
+gint ghid_port_window_mouse_scroll_cb(GtkWidget *widget, GdkEventScroll *ev, void *out);
+
+gboolean ghid_port_button_press_cb(GtkWidget * drawing_area, GdkEventButton * ev, gpointer data);
+gboolean ghid_port_button_release_cb(GtkWidget * drawing_area, GdkEventButton * ev, gpointer data);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.c	(revision 18980)
@@ -0,0 +1,49 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "plugins.h"
+
+int pplg_check_ver_lib_gtk_common(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_gtk_common(void)
+{
+}
+
+int pplg_init_lib_gtk_common(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/lib_gtk_common.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class lib
+$short all-hid_gtk common code
+$long hid_gtk* common code (regardless of gtk version or drawing mechanism: for both gtk2 and gtk3 and for both sw rendering and gl)
+$state works
+$package lib-gtk
+default disable-all
+dep lib_gtk_config
Index: tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.c	(revision 18980)
@@ -0,0 +1,102 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "ui_crosshair.h"
+
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "ui_zoompan.h"
+#include "bu_cursor_pos.h"
+
+void pcb_gtk_crosshair_set(pcb_coord_t x, pcb_coord_t y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view)
+{
+	GdkDisplay *display;
+	GdkScreen *screen;
+	int widget_x, widget_y;
+	int pointer_x, pointer_y;
+	pcb_coord_t pcb_x, pcb_y;
+
+	if (view->crosshair_x != x || view->crosshair_y != y) {
+		ghid_set_cursor_position_labels(cps, conf_hid_gtk.plugins.hid_gtk.compact_vertical);
+		view->crosshair_x = x;
+		view->crosshair_y = y;
+
+		/* FIXME - does this trigger the idle_proc stuff?  It is in the
+		 * lesstif HID.  Maybe something is needed here?
+		 *
+		 * need_idle_proc ();
+		 */
+	}
+
+	if (action != HID_SC_PAN_VIEWPORT && action != HID_SC_WARP_POINTER)
+		return;
+
+	/* Find out where the drawing area is on the screen. gdk_display_get_pointer
+	 * and gdk_display_warp_pointer work relative to the whole display, whilst
+	 * our coordinates are relative to the drawing area origin.
+	 */
+	display = gdk_display_get_default();
+
+	switch (action) {
+	case HID_SC_PAN_VIEWPORT:
+		/* Pan the board in the viewport so that the crosshair (who's location
+		 * relative on the board was set above) lands where the pointer is.
+		 * We pass the request to pan a particular point on the board to a
+		 * given widget coordinate of the viewport into the rendering code
+		 */
+
+		/* Find out where the pointer is relative to the display */
+		gdk_display_get_pointer(display, NULL, &pointer_x, &pointer_y, NULL);
+
+		widget_x = pointer_x - offset_x;
+		widget_y = pointer_y - offset_y;
+
+		pcb_gtk_coords_event2pcb(view, widget_x, widget_y, &pcb_x, &pcb_y);
+		pcb_gtk_pan_view_abs(view, pcb_x, pcb_y, widget_x, widget_y);
+
+		/* Just in case we couldn't pan the board the whole way,
+		 * we warp the pointer to where the crosshair DID land.
+		 */
+		/* Fall through */
+
+	case HID_SC_WARP_POINTER:
+		screen = gdk_display_get_default_screen(display);
+
+		pcb_gtk_coords_pcb2event(view, x, y, &widget_x, &widget_y);
+
+		pointer_x = offset_x + widget_x;
+		pointer_y = offset_y + widget_y;
+
+		gdk_display_warp_pointer(display, screen, pointer_x, pointer_y);
+
+		break;
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/ui_crosshair.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include <gtk/gtk.h>
+#include "ui_zoompan.h"
+#include "bu_cursor_pos.h"
+
+void pcb_gtk_crosshair_set(pcb_coord_t x, pcb_coord_t y, int action, int offset_x, int offset_y, pcb_gtk_cursor_pos_t *cps, pcb_gtk_view_t *view);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.c	(revision 18980)
@@ -0,0 +1,600 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "ui_zoompan.h"
+
+#include "unit.h"
+#include "actions.h"
+#include "error.h"
+#include "conf_core.h"
+#include "board.h"
+#include "compat_misc.h"
+#include "draw.h"
+#include "data.h"
+#include "layer_vis.h"
+#include "bu_status_line.h"
+
+#include "../src_plugins/lib_hid_common/util.h"
+
+double pcb_gtk_clamp_zoom(const pcb_gtk_view_t *vw, double coord_per_px)
+{
+	double min_zoom, max_zoom, max_zoom_w, max_zoom_h, out_zoom;
+
+	min_zoom = 200;
+
+	/* max zoom is calculated so that zoom * canvas_size * 2 doesn't overflow pcb_coord_t */
+	max_zoom_w = (double)COORD_MAX / (double)vw->canvas_width;
+	max_zoom_h = (double)COORD_MAX / (double)vw->canvas_height;
+	max_zoom = MIN(max_zoom_w, max_zoom_h) / 2.0;
+
+	out_zoom = coord_per_px;
+	if (out_zoom < min_zoom)
+		out_zoom = min_zoom;
+	if (out_zoom > max_zoom)
+		out_zoom = max_zoom;
+
+	return out_zoom;
+}
+
+
+static void pcb_gtk_pan_common(pcb_gtk_view_t *v)
+{
+	int event_x, event_y;
+
+	/* We need to fix up the PCB coordinates corresponding to the last
+	 * event so convert it back to event coordinates temporarily. */
+	pcb_gtk_coords_pcb2event(v, v->pcb_x, v->pcb_y, &event_x, &event_y);
+
+	/* Don't pan so far the board is completely off the screen */
+	v->x0 = MAX(-v->width, v->x0);
+	v->y0 = MAX(-v->height, v->y0);
+	v->x0 = MIN(v->x0, PCB->MaxWidth);
+	v->y0 = MIN(v->y0, PCB->MaxHeight);
+
+	/* Fix up noted event coordinates to match where we clamped. Alternatively
+	 * we could call ghid_note_event_location (NULL); to get a new pointer
+	 * location, but this costs us an xserver round-trip (on X11 platforms)
+	 */
+	pcb_gtk_coords_event2pcb(v, event_x, event_y, &v->pcb_x, &v->pcb_y);
+
+	v->com->pan_common();
+}
+
+pcb_bool pcb_gtk_coords_pcb2event(const pcb_gtk_view_t *v, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int *event_x, int *event_y)
+{
+	*event_x = DRAW_X(v, pcb_x);
+	*event_y = DRAW_Y(v, pcb_y);
+
+	return pcb_true;
+}
+
+pcb_bool pcb_gtk_coords_event2pcb(const pcb_gtk_view_t *v, int event_x, int event_y, pcb_coord_t * pcb_x, pcb_coord_t * pcb_y)
+{
+	*pcb_x = pcb_round(EVENT_TO_PCB_X(v, event_x));
+	*pcb_y = pcb_round(EVENT_TO_PCB_Y(v, event_y));
+
+	return pcb_true;
+}
+
+void pcb_gtk_zoom_post(pcb_gtk_view_t *v)
+{
+	v->coord_per_px = pcb_gtk_clamp_zoom(v, v->coord_per_px);
+	v->width = v->canvas_width * v->coord_per_px;
+	v->height = v->canvas_height * v->coord_per_px;
+}
+
+/* gport->view.coord_per_px:
+ * zoom value is PCB units per screen pixel.  Larger numbers mean zooming
+ * out - the largest value means you are looking at the whole board.
+ *
+ * gport->view_width and gport->view_height are in PCB coordinates
+ */
+static void ghid_zoom_view_abs(pcb_gtk_view_t *v, pcb_coord_t center_x, pcb_coord_t center_y, double new_zoom)
+{
+	double clamped_zoom;
+	double xtmp, ytmp;
+	pcb_coord_t cmaxx, cmaxy;
+
+	clamped_zoom = pcb_gtk_clamp_zoom(v, new_zoom);
+	if (clamped_zoom != new_zoom)
+		return;
+
+	if (v->coord_per_px == new_zoom)
+		return;
+
+	/* Do not allow zoom level that'd overflow the coord type */
+	cmaxx = v->canvas_width  * (new_zoom / 2.0);
+	cmaxy = v->canvas_height * (new_zoom / 2.0);
+	if ((cmaxx >= COORD_MAX/2) || (cmaxy >= COORD_MAX/2)) {
+		return;
+	}
+
+	xtmp = (SIDE_X(center_x) - v->x0) / (double) v->width;
+	ytmp = (SIDE_Y(center_y) - v->y0) / (double) v->height;
+
+	v->coord_per_px = new_zoom;
+	pcb_pixel_slop = new_zoom;
+	v->com->port_ranges_scale();
+
+	v->x0 = SIDE_X(center_x) - xtmp * v->width;
+	v->y0 = SIDE_Y(center_y) - ytmp * v->height;
+
+	pcb_gtk_pan_common(v);
+	v->com->set_status_line_label();
+}
+
+
+
+void pcb_gtk_zoom_view_rel(pcb_gtk_view_t *v, pcb_coord_t center_x, pcb_coord_t center_y, double factor)
+{
+	ghid_zoom_view_abs(v, center_x, center_y, v->coord_per_px * factor);
+}
+
+#warning TODO: remove this and make the side-correct version the default (rename that to this short name); check when looking from the bottom: library window, drc window
+void pcb_gtk_zoom_view_win(pcb_gtk_view_t *v, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double xf, yf;
+
+	if ((v->canvas_width < 1) || (v->canvas_height < 1))
+		return;
+
+	xf = (x2 - x1) / v->canvas_width;
+	yf = (y2 - y1) / v->canvas_height;
+	v->coord_per_px = (xf > yf ? xf : yf);
+
+	v->x0 = x1;
+	v->y0 = y1;
+
+	pcb_gtk_pan_common(v);
+}
+
+/* Side-correct version - long term this will be kept and the other is removed */
+static void pcb_gtk_zoom_view_win_side(pcb_gtk_view_t *v, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int setch)
+{
+	double xf, yf;
+
+	if ((v->canvas_width < 1) || (v->canvas_height < 1))
+		return;
+
+	xf = (x2 - x1) / v->canvas_width;
+	yf = (y2 - y1) / v->canvas_height;
+	v->coord_per_px = (xf > yf ? xf : yf);
+
+	v->x0 = SIDE_X(conf_core.editor.view.flip_x ? x2 : x1);
+	v->y0 = SIDE_Y(conf_core.editor.view.flip_y ? y2 : y1);
+
+	pcb_gtk_pan_common(v);
+	if (setch) {
+		v->pcb_x = (x1+x2)/2;
+		v->pcb_y = (y1+y2)/2;
+		pcb_crosshair_move_absolute(v->pcb_x, v->pcb_y);
+		pcb_notify_crosshair_change(pcb_true);
+	}
+}
+
+void pcb_gtk_zoom_view_fit(pcb_gtk_view_t *v)
+{
+	pcb_gtk_pan_view_abs(v, SIDE_X(0), SIDE_Y(0), 0, 0);
+	ghid_zoom_view_abs(v, SIDE_X(0), SIDE_Y(0), MAX(PCB->MaxWidth / v->canvas_width, PCB->MaxHeight / v->canvas_height));
+}
+
+static void pcb_gtk_flip_view(pcb_gtk_view_t *v, pcb_coord_t center_x, pcb_coord_t center_y, pcb_bool flip_x, pcb_bool flip_y)
+{
+	int widget_x, widget_y;
+
+	pcb_draw_inhibit_inc();
+
+	/* Work out where on the screen the flip point is */
+	pcb_gtk_coords_pcb2event(v, center_x, center_y, &widget_x, &widget_y);
+
+	conf_set_design("editor/view/flip_x", "%d", conf_core.editor.view.flip_x != flip_x);
+	conf_set_design("editor/view/flip_y", "%d", conf_core.editor.view.flip_y != flip_y);
+
+	/* Pan the board so the center location remains in the same place */
+	pcb_gtk_pan_view_abs(v, center_x, center_y, widget_x, widget_y);
+
+	pcb_draw_inhibit_dec();
+
+	v->com->invalidate_all();
+}
+
+void pcb_gtk_pan_view_abs(pcb_gtk_view_t *v, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int widget_x, int widget_y)
+{
+	v->x0 = SIDE_X(pcb_x) - widget_x * v->coord_per_px;
+	v->y0 = SIDE_Y(pcb_y) - widget_y * v->coord_per_px;
+
+	pcb_gtk_pan_common(v);
+}
+
+void pcb_gtk_pan_view_rel(pcb_gtk_view_t *v, pcb_coord_t dx, pcb_coord_t dy)
+{
+	v->x0 += dx;
+	v->y0 += dy;
+
+	pcb_gtk_pan_common(v);
+}
+
+
+/* ------------------------------------------------------------ */
+
+const char pcb_acts_zoom[] = "Zoom()\n" "Zoom(factor)\n" "Zoom(x1, y1, x2, y2)\n";
+
+const char pcb_acth_zoom[] = "Various zoom factor changes.";
+
+/* %start-doc actions Zoom
+Changes the zoom (magnification) of the view of the board.  If no
+arguments are passed, the view is scaled such that the board just fits
+inside the visible window (i.e. ``view all'').  Otherwise,
+@var{factor} specifies a change in zoom factor.  It may be prefixed by
+@code{+}, @code{-}, or @code{=} to change how the zoom factor is
+modified.  The @var{factor} is a floating point number, such as
+@code{1.5} or @code{0.75}.
+
+@table @code
+
+@item +@var{factor}
+Values greater than 1.0 cause the board to be drawn smaller; more of
+the board will be visible.  Values between 0.0 and 1.0 cause the board
+to be drawn bigger; less of the board will be visible.
+
+@item -@var{factor}
+Values greater than 1.0 cause the board to be drawn bigger; less of
+the board will be visible.  Values between 0.0 and 1.0 cause the board
+to be drawn smaller; more of the board will be visible.
+
+@item =@var{factor}
+
+The @var{factor} is an absolute zoom factor; the unit for this value
+is "PCB units per screen pixel".  Since PCB units are 0.01 mil, a
+@var{factor} of 1000 means 10 mils (0.01 in) per pixel, or 100 DPI,
+about the actual resolution of most screens - resulting in an "actual
+size" board.  Similarly, a @var{factor} of 100 gives you a 10x actual
+size.
+
+@item @var{x1}, @var{y1}, @var{x2}, @var{y2}
+
+Zoom and pan to the box specified by the coords.
+
+@item ?
+
+Print the current zoom level in the message log (as an info line)
+
+@end table
+
+Note that zoom factors of zero are silently ignored.
+
+%end-doc */
+
+fgw_error_t pcb_gtk_act_zoom(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *vp, *ovp;
+	double v;
+	pcb_coord_t x, y;
+
+	if (argc < 2) {
+		pcb_gtk_zoom_view_fit(vw);
+		return 0;
+	}
+
+	if (argc == 5) {
+		pcb_coord_t x1, y1, x2, y2;
+
+		PCB_ACT_CONVARG(1, FGW_COORD, zoom, x1 = fgw_coord(&argv[1]));
+		PCB_ACT_CONVARG(2, FGW_COORD, zoom, y1 = fgw_coord(&argv[2]));
+		PCB_ACT_CONVARG(3, FGW_COORD, zoom, x2 = fgw_coord(&argv[3]));
+		PCB_ACT_CONVARG(4, FGW_COORD, zoom, y2 = fgw_coord(&argv[4]));
+
+		pcb_gtk_zoom_view_win_side(vw, x1, y1, x2, y2, 1);
+		return 0;
+	}
+
+	if (argc > 2)
+		PCB_ACT_FAIL(zoom);
+
+	PCB_ACT_CONVARG(1, FGW_STR, zoom, ovp = vp = argv[1].val.str);
+
+	if (pcb_strcasecmp(vp, "selected") == 0) {
+		pcb_box_t sb;
+		if (pcb_get_selection_bbox(&sb, PCB->Data) > 0)
+			pcb_gtk_zoom_view_win_side(vw, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+		else
+			pcb_message(PCB_MSG_ERROR, "Can't zoom to selection: nothing selected\n");
+		return 0;
+	}
+
+	if (pcb_strcasecmp(vp, "found") == 0) {
+		pcb_box_t sb;
+		if (pcb_get_found_bbox(&sb, PCB->Data) > 0)
+			pcb_gtk_zoom_view_win_side(vw, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
+		else
+			pcb_message(PCB_MSG_ERROR, "Can't zoom to 'found': nothing found\n");
+		return 0;
+	}
+
+	if (*vp == '?') {
+		pcb_message(PCB_MSG_INFO, "Current gtk zoom level: %f\n", vw->coord_per_px);
+		return 0;
+	}
+
+	if (*vp == '+' || *vp == '-' || *vp == '=')
+		vp++;
+	v = g_ascii_strtod(vp, 0);
+	if (v <= 0)
+		return 1;
+
+	pcb_hid_get_coords("Select zoom center", &x, &y, 0);
+	switch (ovp[0]) {
+	case '-':
+		pcb_gtk_zoom_view_rel(vw, x, y, 1 / v);
+		break;
+	default:
+	case '+':
+		pcb_gtk_zoom_view_rel(vw, x, y, v);
+		break;
+	case '=':
+		ghid_zoom_view_abs(vw, x, y, v);
+		break;
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+const char pcb_acts_center[] = "Center()\n";
+const char pcb_acth_center[] = "Moves the pointer to the center of the window.";
+
+/* %start-doc actions Center
+
+Move the pointer to the center of the window, but only if it's
+currently within the window already.
+
+%end-doc */
+
+fgw_error_t pcb_gtk_act_center(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int offset_x, int offset_y, int *out_pointer_x, int *out_pointer_y)
+{
+	int widget_x, widget_y;
+
+	if (argc != 1)
+		PCB_ACT_FAIL(center);
+
+	/* Aim to put the given x, y PCB coordinates in the center of the widget */
+	widget_x = vw->canvas_width / 2;
+	widget_y = vw->canvas_height / 2;
+
+	pcb_gtk_pan_view_abs(vw, pcb_x, pcb_y, widget_x, widget_y);
+
+	/* Now move the mouse pointer to the place where the board location
+	 * actually ended up.
+	 *
+	 * XXX: Should only do this if we confirm we are inside our window?
+	 */
+
+	pcb_gtk_coords_pcb2event(vw, pcb_x, pcb_y, &widget_x, &widget_y);
+
+	*out_pointer_x = offset_x + widget_x;
+	*out_pointer_y = offset_y + widget_y;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+const char pcb_acts_swapsides[] = "SwapSides(|v|h|r, [S])";
+const char pcb_acth_swapsides[] = "Swaps the side of the board you're looking at.";
+
+/* %start-doc actions SwapSides
+
+This action changes the way you view the board.
+
+@table @code
+
+@item v
+Flips the board over vertically (up/down).
+
+@item h
+Flips the board over horizontally (left/right), like flipping pages in
+a book.
+
+@item r
+Rotates the board 180 degrees without changing sides.
+
+@end table
+
+If no argument is given, the board isn't moved but the opposite side
+is shown.
+
+Normally, this action changes which pads and silk layer are drawn as
+pcb_true silk, and which are drawn as the "invisible" layer.  It also
+determines which solder mask you see.
+
+As a special case, if the layer group for the side you're looking at
+is visible and currently active, and the layer group for the opposite
+is not visible (i.e. disabled), then this action will also swap which
+layer group is visible and active, effectively swapping the ``working
+side'' of the board.
+
+%end-doc */
+
+
+fgw_error_t pcb_gtk_swap_sides(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
+	pcb_layergrp_id_t comp_group = -1, solder_group = -1;
+	pcb_bool comp_on = pcb_false, solder_on = pcb_false;
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0)
+		solder_on = LAYER_PTR(PCB->LayerGroups.grp[solder_group].lid[0])->meta.real.vis;
+
+	if (pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &comp_group, 1) > 0)
+		comp_on = LAYER_PTR(PCB->LayerGroups.grp[comp_group].lid[0])->meta.real.vis;
+
+	pcb_draw_inhibit_inc();
+	if (argc > 1) {
+		const char *a, *b = "";
+		pcb_layer_id_t lid;
+		pcb_layer_type_t lyt;
+
+		PCB_ACT_CONVARG(1, FGW_STR, swapsides, a = argv[1].val.str);
+		PCB_ACT_MAY_CONVARG(2, FGW_STR, swapsides, b = argv[2].val.str);
+		switch (a[0]) {
+		case 'h':
+		case 'H':
+			pcb_gtk_flip_view(vw, vw->pcb_x, vw->pcb_y, pcb_true, pcb_false);
+			break;
+		case 'v':
+		case 'V':
+			pcb_gtk_flip_view(vw, vw->pcb_x, vw->pcb_y, pcb_false, pcb_true);
+			break;
+		case 'r':
+		case 'R':
+			pcb_gtk_flip_view(vw, vw->pcb_x, vw->pcb_y, pcb_true, pcb_true);
+			conf_toggle_editor(show_solder_side); /* Swapped back below */
+			break;
+		default:
+			pcb_draw_inhibit_dec();
+			return 1;
+		}
+		switch (b[0]) {
+			case 'S':
+			case 's':
+				lyt = (pcb_layer_flags_(CURRENT) & PCB_LYT_ANYTHING) | (!conf_core.editor.show_solder_side ?  PCB_LYT_BOTTOM : PCB_LYT_TOP);
+				lid = pcb_layer_vis_last_lyt(lyt);
+				if (lid >= 0)
+					pcb_layervis_change_group_vis(lid, 1, 1);
+		}
+	}
+
+	conf_toggle_editor(show_solder_side);
+
+	if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) {
+		pcb_bool new_solder_vis = conf_core.editor.show_solder_side;
+
+		if (comp_group >= 0)
+			pcb_layervis_change_group_vis(PCB->LayerGroups.grp[comp_group].lid[0], !new_solder_vis, !new_solder_vis);
+		if (solder_group >= 0)
+			pcb_layervis_change_group_vis(PCB->LayerGroups.grp[solder_group].lid[0], new_solder_vis, new_solder_vis);
+	}
+
+	pcb_draw_inhibit_dec();
+
+	vw->com->invalidate_all();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+const char pcb_acts_scroll[] = "Scroll(up|down|left|right, [div])";
+const char pcb_acth_scroll[] = "Scroll the viewport.";
+
+/* % start-doc actions Scroll
+
+@item up|down|left|right
+Specifies the direction to scroll
+
+@item div
+Optional.  Specifies how much to scroll by.  The viewport is scrolled
+by 1/div of what is visible, so div = 1 scrolls a whole page. If not
+default is given, div=40.
+
+%end-doc */
+
+fgw_error_t pcb_gtk_act_scroll(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op;
+	gdouble dx = 0.0, dy = 0.0;
+	int div = 40;
+
+	PCB_ACT_CONVARG(1, FGW_STR, scroll, op = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_INT, scroll, div = argv[2].val.nat_int);
+
+	if (pcb_strcasecmp(op, "up") == 0)
+		dy = -vw->height / div;
+	else if (pcb_strcasecmp(op, "down") == 0)
+		dy = vw->height / div;
+	else if (pcb_strcasecmp(op, "right") == 0)
+		dx = vw->width / div;
+	else if (pcb_strcasecmp(op, "left") == 0)
+		dx = -vw->width / div;
+	else
+		PCB_ACT_FAIL(scroll);
+
+	pcb_gtk_pan_view_rel(vw, dx, dy);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+const char pcb_acts_pan[] = "Pan([thumb], Mode)";
+const char pcb_acth_pan[] = "Start or stop panning (Mode = 1 to start, 0 to stop)\n" "Optional thumb argument is ignored for now in gtk hid.\n";
+
+/* %start-doc actions Pan
+
+Start or stop panning.  To start call with Mode = 1, to stop call with
+Mode = 0.
+
+%end-doc */
+
+fgw_error_t pcb_gtk_act_pan(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int mode;
+
+	switch(argc) {
+		case 2:
+			PCB_ACT_CONVARG(1, FGW_INT, pan, mode = argv[1].val.nat_int);
+			break;
+		case 3:
+			PCB_ACT_CONVARG(2, FGW_INT, pan, mode = argv[2].val.nat_int);
+			pcb_message(PCB_MSG_WARNING, "The gtk gui currently ignores the optional first argument to the Pan action.\nFeel free to provide patches.\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		default:
+			PCB_ACT_FAIL(pan);
+	}
+
+	vw->panning = mode;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+void pcb_gtk_get_coords(pcb_gtk_mouse_t *mouse, pcb_gtk_view_t *vw, const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+	if ((force || !vw->has_entered) && msg)
+		if (!ghid_get_user_xy(mouse, msg))
+			return;
+	if (vw->has_entered) {
+		*x = vw->pcb_x;
+		*y = vw->pcb_y;
+	}
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/ui_zoompan.h	(revision 18980)
@@ -0,0 +1,130 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+
+#ifndef PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H
+#define PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H
+
+#include <glib.h>
+#include <libfungw/fungw.h>
+#include "unit.h"
+#include "pcb_bool.h"
+#include "in_mouse.h"
+#include "glue.h"
+
+	/* Go from from the grid units in use (millimeters or mils) to PCB units
+	   |  and back again.
+	   |  PCB keeps values internally higher precision, but gui
+	   |  widgets (spin buttons, labels, etc) need mils or millimeters.
+	 */
+#define	FROM_PCB_UNITS(v)	pcb_coord_to_unit(conf_core.editor.grid_unit, v)
+#define	TO_PCB_UNITS(v)		pcb_unit_to_coord(conf_core.editor.grid_unit, v)
+
+#define SIDE_X(x)         ((conf_core.editor.view.flip_x ? PCB->MaxWidth - (x) : (x)))
+#define SIDE_Y(y)         ((conf_core.editor.view.flip_y ? PCB->MaxHeight - (y) : (y)))
+
+#define	DRAW_X(view, x)         (gint)((SIDE_X(x) - (view)->x0) / (view)->coord_per_px)
+#define	DRAW_Y(view, y)         (gint)((SIDE_Y(y) - (view)->y0) / (view)->coord_per_px)
+
+#define	EVENT_TO_PCB_X(view, x) SIDE_X((pcb_coord_t)((x) * (view)->coord_per_px + (view)->x0))
+#define	EVENT_TO_PCB_Y(view, y) SIDE_Y((pcb_coord_t)((y) * (view)->coord_per_px + (view)->y0))
+
+
+typedef struct {
+	double coord_per_px;					/* Zoom level described as PCB units per screen pixel */
+
+	pcb_coord_t x0;
+	pcb_coord_t y0;
+	pcb_coord_t width;
+	pcb_coord_t height;
+
+	gint canvas_width, canvas_height;
+
+	gboolean has_entered;
+	gboolean panning;
+	pcb_coord_t pcb_x, pcb_y;						/* PCB coordinates of the mouse pointer */
+	pcb_coord_t crosshair_x, crosshair_y;	/* PCB coordinates of the crosshair     */
+
+	pcb_gtk_common_t *com;
+} pcb_gtk_view_t;
+
+/* take coord_per_px and validate it against other view parameters. Return
+    coord_per_px or the clamped value if it was too small or too large. */
+double pcb_gtk_clamp_zoom(const pcb_gtk_view_t *vw, double coord_per_px);
+
+void pcb_gtk_pan_view_abs(pcb_gtk_view_t *v, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int widget_x, int widget_y);
+void pcb_gtk_pan_view_rel(pcb_gtk_view_t *v, pcb_coord_t dx, pcb_coord_t dy);
+void pcb_gtk_zoom_view_fit(pcb_gtk_view_t *v);
+void pcb_gtk_zoom_view_rel(pcb_gtk_view_t *v, pcb_coord_t center_x, pcb_coord_t center_y, double factor);
+void pcb_gtk_zoom_view_win(pcb_gtk_view_t *v, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+
+/* Updates width and heigth using the new zoom level; call after a call
+   to pcb_gtk_zoom_*() */
+void pcb_gtk_zoom_post(pcb_gtk_view_t *v);
+
+pcb_bool pcb_gtk_coords_pcb2event(const pcb_gtk_view_t *v, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int *event_x, int *event_y);
+pcb_bool pcb_gtk_coords_event2pcb(const pcb_gtk_view_t *v, int event_x, int event_y, pcb_coord_t * pcb_x, pcb_coord_t * pcb_y);
+
+
+extern const char pcb_acts_zoom[];
+extern const char pcb_acth_zoom[];
+fgw_error_t pcb_gtk_act_zoom(pcb_gtk_view_t *v, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_acts_center[];
+extern const char pcb_acth_center[];
+fgw_error_t pcb_gtk_act_center(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv, pcb_coord_t pcb_x, pcb_coord_t pcb_y, int offset_x, int offset_y, int *out_pointer_x, int *out_pointer_y);
+
+extern const char pcb_acts_swapsides[];
+extern const char pcb_acth_swapsides[];
+fgw_error_t pcb_gtk_swap_sides(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_acts_scroll[];
+extern const char pcb_acth_scroll[];
+fgw_error_t pcb_gtk_act_scroll(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+extern const char pcb_acts_pan[];
+extern const char pcb_acth_pan[];
+fgw_error_t pcb_gtk_act_pan(pcb_gtk_view_t *vw, fgw_arg_t *res, int argc, fgw_arg_t *argv);
+
+void pcb_gtk_get_coords(pcb_gtk_mouse_t *mouse, pcb_gtk_view_t *vw, const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force);
+
+/* Update adj limits to match the current zoom level */
+static inline void pcb_gtk_zoom_adjustment(GtkAdjustment *adj, pcb_coord_t view_size, pcb_coord_t board_size)
+{
+	gdouble page_size;
+
+	page_size = MIN(view_size, board_size);
+	gtk_adjustment_configure(adj, gtk_adjustment_get_value(adj), /* value */
+													 -view_size,              /* lower */
+													 board_size + page_size,  /* upper */
+													 page_size / 100.0,       /* step_increment */
+													 page_size / 10.0,        /* page_increment */
+													 page_size);              /* page_size */
+}
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.c	(revision 18980)
@@ -0,0 +1,83 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include <glib.h>
+#include "util_block_hook.h"
+
+typedef struct {
+	GSource source;
+	void (*func) (pcb_hidval_t user_data);
+	pcb_hidval_t user_data;
+} BlockHookSource;
+
+static GSourceFuncs ghid_block_hook_funcs = {
+	ghid_block_hook_prepare,
+	ghid_block_hook_check,
+	ghid_block_hook_dispatch,
+	NULL													/* No destroy notification */
+};
+
+gboolean ghid_block_hook_prepare(GSource * source, gint * timeout)
+{
+	pcb_hidval_t data = ((BlockHookSource *) source)->user_data;
+	((BlockHookSource *) source)->func(data);
+	return FALSE;
+}
+
+gboolean ghid_block_hook_check(GSource * source)
+{
+	return FALSE;
+}
+
+gboolean ghid_block_hook_dispatch(GSource * source, GSourceFunc callback, gpointer user_data)
+{
+	return FALSE;
+}
+
+pcb_hidval_t ghid_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t user_data)
+{
+	pcb_hidval_t ret;
+	BlockHookSource *source;
+
+	source = (BlockHookSource *) g_source_new(&ghid_block_hook_funcs, sizeof(BlockHookSource));
+
+	source->func = func;
+	source->user_data = user_data;
+
+	g_source_attach((GSource *) source, NULL);
+
+	ret.ptr = (void *) source;
+	return ret;
+}
+
+void ghid_stop_block_hook(pcb_hidval_t mlpoll)
+{
+	GSource *source = (GSource *) mlpoll.ptr;
+	g_source_destroy(source);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_block_hook.h	(revision 18980)
@@ -0,0 +1,9 @@
+#include <glib.h>
+#include "hid.h"
+
+pcb_hidval_t ghid_add_block_hook(void (*func) (pcb_hidval_t data), pcb_hidval_t user_data);
+void ghid_stop_block_hook(pcb_hidval_t mlpoll);
+
+gboolean ghid_block_hook_prepare(GSource * source, gint * timeout);
+gboolean ghid_block_hook_check(GSource * source);
+gboolean ghid_block_hook_dispatch(GSource * source, GSourceFunc callback, gpointer user_data);
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.c	(revision 18980)
@@ -0,0 +1,93 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "util_ext_chg.h"
+
+#include "board.h"
+#include "pcb_bool.h"
+
+pcb_bool check_externally_modified(pcb_gtk_ext_chg_t *ec)
+{
+	GFile *file;
+	GFileInfo *info;
+	GTimeVal timeval;
+
+	/* Treat zero time as a flag to indicate we've not got an mtime yet */
+	if (PCB->Filename == NULL || (ec->our_mtime.tv_sec == 0 && ec->our_mtime.tv_usec == 0))
+		return pcb_false;
+
+	file = g_file_new_for_path(PCB->Filename);
+	info = g_file_query_info(file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NONE, NULL, NULL);
+	g_object_unref(file);
+
+	if (info == NULL || !g_file_info_has_attribute(info, G_FILE_ATTRIBUTE_TIME_MODIFIED))
+		return pcb_false;
+
+	g_file_info_get_modification_time(info, &timeval);	/*&ec->last_seen_mtime); */
+	g_object_unref(info);
+
+	/* Ignore when the file on disk is the same age as when we last looked */
+	if (timeval.tv_sec == ec->last_seen_mtime.tv_sec && timeval.tv_usec == ec->last_seen_mtime.tv_usec)
+		return pcb_false;
+
+	ec->last_seen_mtime = timeval;
+
+	return (ec->last_seen_mtime.tv_sec > ec->our_mtime.tv_sec) ||
+		(ec->last_seen_mtime.tv_sec == ec->our_mtime.tv_sec &&
+		 ec->last_seen_mtime.tv_usec > ec->our_mtime.tv_usec);
+}
+
+void update_board_mtime_from_disk(pcb_gtk_ext_chg_t *ec)
+{
+	GFile *file;
+	GFileInfo *info;
+
+	ec->our_mtime.tv_sec = 0;
+	ec->our_mtime.tv_usec = 0;
+	ec->last_seen_mtime = ec->our_mtime;
+
+	if (PCB->Filename == NULL)
+		return;
+
+	file = g_file_new_for_path(PCB->Filename);
+	info = g_file_query_info(file, G_FILE_ATTRIBUTE_TIME_MODIFIED, G_FILE_QUERY_INFO_NONE, NULL, NULL);
+	g_object_unref(file);
+
+	if (info == NULL || !g_file_info_has_attribute(info, G_FILE_ATTRIBUTE_TIME_MODIFIED))
+		return;
+
+	g_file_info_get_modification_time(info, &ec->our_mtime);
+	g_object_unref(info);
+
+	ec->last_seen_mtime = ec->our_mtime;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_ext_chg.h	(revision 18980)
@@ -0,0 +1,16 @@
+#ifndef PCB_GTK_UTIL_EXT_CHG_H
+#define PCB_GTK_UTIL_EXT_CHG_H
+
+#include <glib.h>
+#include "pcb_bool.h"
+
+typedef struct {
+	GTimeVal our_mtime;
+	GTimeVal last_seen_mtime;
+} pcb_gtk_ext_chg_t;
+
+pcb_bool check_externally_modified(pcb_gtk_ext_chg_t *ec);
+void update_board_mtime_from_disk(pcb_gtk_ext_chg_t *ec);
+
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_gtk_debug.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_gtk_debug.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_gtk_debug.h	(revision 18980)
@@ -0,0 +1,26 @@
+/* #include this file to get widget print functions */
+
+#include <stdio.h>
+#include <glib.h>
+
+static void print_widget(GtkWidget * w)
+{
+	fprintf(stderr, " %p %d;%d %d;%d %d;%d\n", (void *)w, w->allocation.x, w->allocation.y, w->allocation.width, w->allocation.height,
+					w->requisition.width, w->requisition.height);
+	fprintf(stderr, "  flags=%x typ=%d realized=%d vis=%d\n", GTK_WIDGET_FLAGS(w), GTK_WIDGET_TYPE(w), GTK_WIDGET_REALIZED(w),
+					GTK_WIDGET_VISIBLE(w));
+}
+
+
+static void print_menu_shell_cb(void *obj, void *ud)
+{
+	GtkWidget *w = obj;
+	print_widget(w);
+}
+
+static void print_menu_shell(GtkMenuShell * sh)
+{
+	GList *children;
+	children = gtk_container_get_children(GTK_CONTAINER(sh));
+	g_list_foreach(children, print_menu_shell_cb, NULL);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_listener.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_listener.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_listener.c	(revision 18980)
@@ -0,0 +1,98 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#define _POSIX_SOURCE
+#include "config.h"
+
+#include <stdio.h>
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "hid.h"
+#include "actions.h"
+#include "compat_misc.h"
+
+static gboolean ghid_listener_cb(GIOChannel * source, GIOCondition condition, gpointer data)
+{
+	GIOStatus status;
+	gchar *str;
+	gsize len;
+	gsize term;
+	GError *err = NULL;
+
+
+	if (condition & G_IO_HUP) {
+		pcb_gui->log("Read end of pipe died!\n");
+		return FALSE;
+	}
+
+	if (condition == G_IO_IN) {
+		status = g_io_channel_read_line(source, &str, &len, &term, &err);
+		switch (status) {
+		case G_IO_STATUS_NORMAL:
+			pcb_parse_actions(str);
+			g_free(str);
+			break;
+
+		case G_IO_STATUS_ERROR:
+			pcb_gui->log("ERROR status from g_io_channel_read_line\n");
+			return FALSE;
+			break;
+
+		case G_IO_STATUS_EOF:
+			pcb_gui->log("Input pipe returned EOF.  The --listen option is \n" "probably not running anymore in this session.\n");
+			return FALSE;
+			break;
+
+		case G_IO_STATUS_AGAIN:
+			pcb_gui->log("AGAIN status from g_io_channel_read_line\n");
+			return FALSE;
+			break;
+
+		default:
+			fprintf(stderr, "ERROR:  unhandled case in ghid_listener_cb\n");
+			return FALSE;
+			break;
+		}
+
+	}
+	else
+		fprintf(stderr, "Unknown condition in ghid_listener_cb\n");
+
+	return TRUE;
+}
+
+void pcb_gtk_create_listener(void)
+{
+	GIOChannel *channel;
+	int fd = pcb_fileno(stdin);
+
+	channel = g_io_channel_unix_new(fd);
+	g_io_add_watch(channel, G_IO_IN, ghid_listener_cb, NULL);
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_listener.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_listener.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_listener.h	(revision 18980)
@@ -0,0 +1 @@
+void pcb_gtk_create_listener(void);
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_str.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_str.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_str.c	(revision 18980)
@@ -0,0 +1,60 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This module, was originally written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  These functions are utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ *
+ * pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ */
+
+#include "config.h"
+#include <string.h>
+#include "util_str.h"
+
+gboolean pcb_gtk_g_strdup(gchar ** dst, const gchar * src)
+{
+	if ((dst == NULL) || ((*dst == NULL) && (src == NULL)))
+		return FALSE;
+	if (*dst) {
+		if (src && !strcmp(*dst, src))
+			return FALSE;
+		g_free(*dst);
+	}
+	*dst = g_strdup(src);
+	return TRUE;
+}
+
+const gchar *pcb_str_strip_left(const gchar * s)
+{
+	if (s != NULL) {
+		while ((*s == ' ') || (*s == '\t'))
+			s++;
+	}
+	return s;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_str.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_str.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_str.h	(revision 18980)
@@ -0,0 +1,45 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This module, was originally written by Bill Wilson and the functions
+ * here are Copyright (C) 2004 by Bill Wilson.  These functions are utility
+ * functions which are taken from my other GPL'd projects gkrellm and
+ * gstocks and are copied here for the Gtk PCB port.
+ *
+ * pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ */
+
+#ifndef PCB_LIB_GTK_COMMON_UTIL_STR_H
+#define PCB_LIB_GTK_COMMON_UTIL_STR_H
+
+#include <glib.h>
+
+gboolean pcb_gtk_g_strdup(gchar ** dst, const gchar * src);
+
+/* Returns a pointer to the first non-space character in s */
+const gchar *pcb_str_strip_left(const gchar * s);
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_timer.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_timer.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_timer.c	(revision 18980)
@@ -0,0 +1,70 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include <glib.h>
+#include "util_timer.h"
+#include "conf_core.h"
+
+typedef struct {
+	void (*func) (pcb_hidval_t);
+	guint id;
+	pcb_hidval_t user_data;
+	pcb_gtk_common_t *com;
+} GuiTimer;
+
+	/* We need a wrapper around the hid timer because a gtk timer needs
+	   |  to return FALSE else the timer will be restarted.
+	 */
+static gboolean ghid_timer(GuiTimer * timer)
+{
+	(*timer->func) (timer->user_data);
+	timer->com->mode_cursor_main(-1);
+	return FALSE;									/* Turns timer off */
+}
+
+pcb_hidval_t pcb_gtk_add_timer(pcb_gtk_common_t *com, void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	GuiTimer *timer = g_new0(GuiTimer, 1);
+	pcb_hidval_t ret;
+
+	timer->func = func;
+	timer->user_data = user_data;
+	timer->com = com;
+	timer->id = g_timeout_add(milliseconds, (GSourceFunc) ghid_timer, timer);
+	ret.ptr = (void *) timer;
+	return ret;
+}
+
+void ghid_stop_timer(pcb_hidval_t timer)
+{
+	void *ptr = timer.ptr;
+
+	g_source_remove(((GuiTimer *) ptr)->id);
+	g_free(ptr);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_timer.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_timer.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_timer.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "hid.h"
+#include "glue.h"
+
+pcb_hidval_t pcb_gtk_add_timer(pcb_gtk_common_t *com, void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data);
+void ghid_stop_timer(pcb_hidval_t timer);
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_watch.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_watch.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_watch.c	(revision 18980)
@@ -0,0 +1,104 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "util_watch.h"
+#include "in_mouse.h"
+#include "conf_core.h"
+
+typedef struct {
+	pcb_bool (*func) (pcb_hidval_t, int, unsigned int, pcb_hidval_t);
+	pcb_hidval_t user_data;
+	int fd;
+	GIOChannel *channel;
+	gint id;
+	pcb_gtk_common_t *com;
+} GuiWatch;
+
+	/* We need a wrapper around the hid file watch to pass the correct flags
+	 */
+static gboolean ghid_watch(GIOChannel * source, GIOCondition condition, gpointer data)
+{
+	unsigned int pcb_condition = 0;
+	pcb_hidval_t x;
+	GuiWatch *watch = (GuiWatch *) data;
+	pcb_bool res;
+
+	if (condition & G_IO_IN)
+		pcb_condition |= PCB_WATCH_READABLE;
+	if (condition & G_IO_OUT)
+		pcb_condition |= PCB_WATCH_WRITABLE;
+	if (condition & G_IO_ERR)
+		pcb_condition |= PCB_WATCH_ERROR;
+	if (condition & G_IO_HUP)
+		pcb_condition |= PCB_WATCH_HANGUP;
+
+	x.ptr = (void *) watch;
+	res = watch->func(x, watch->fd, pcb_condition, watch->user_data);
+
+	watch->com->mode_cursor_main(-1);
+
+	return res;
+}
+
+pcb_hidval_t pcb_gtk_watch_file(pcb_gtk_common_t *com, int fd, unsigned int condition,
+								pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data),
+								pcb_hidval_t user_data)
+{
+	GuiWatch *watch = g_new0(GuiWatch, 1);
+	pcb_hidval_t ret;
+	unsigned int glib_condition = 0;
+
+	if (condition & PCB_WATCH_READABLE)
+		glib_condition |= G_IO_IN;
+	if (condition & PCB_WATCH_WRITABLE)
+		glib_condition |= G_IO_OUT;
+	if (condition & PCB_WATCH_ERROR)
+		glib_condition |= G_IO_ERR;
+	if (condition & PCB_WATCH_HANGUP)
+		glib_condition |= G_IO_HUP;
+
+	watch->func = func;
+	watch->user_data = user_data;
+	watch->fd = fd;
+	watch->channel = g_io_channel_unix_new(fd);
+	watch->id = g_io_add_watch(watch->channel, (GIOCondition) glib_condition, ghid_watch, watch);
+	watch->com = com;
+
+	ret.ptr = (void *) watch;
+	return ret;
+}
+
+void pcb_gtk_unwatch_file(pcb_hidval_t data)
+{
+	GuiWatch *watch = (GuiWatch *) data.ptr;
+
+	g_io_channel_shutdown(watch->channel, TRUE, NULL);
+	g_io_channel_unref(watch->channel);
+	g_free(watch);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/util_watch.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/util_watch.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/util_watch.h	(revision 18980)
@@ -0,0 +1,9 @@
+#include "hid.h"
+#include "glue.h"
+
+pcb_hidval_t pcb_gtk_watch_file(pcb_gtk_common_t *com, int fd, unsigned int condition,
+								pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data),
+								pcb_hidval_t user_data);
+
+void pcb_gtk_unwatch_file(pcb_hidval_t data);
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/win_place.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/win_place.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/win_place.c	(revision 18980)
@@ -0,0 +1,114 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "win_place.h"
+#include "conf_core.h"
+
+#define CONF_PREFIX "plugins/hid_gtk/window_geometry/"
+static const char *conf_prefix[WPLC_max] = { /* order DOES matter */
+	"top_",
+	"log_",
+	"drc_",
+	"library_",
+	"netlist_",
+	"keyref_",
+	"pinout_",
+	"search_"
+};
+
+static GtkWidget *wplc_windows[WPLC_max];
+
+/* true if the given configuration item has exactly one integer value */
+#define HAVE(native) ((native != NULL) && ((native)->used == 1) && ((native)->type == CFN_INTEGER))
+#define HAVE_NZ(native) ((HAVE(native)) && ((native)->val.integer[0] != 0))
+
+void wplc_place(wplc_win_t id, GtkWidget *new_win)
+{
+	char path[128], *pe;
+	conf_native_t *nx, *ny, *nw, *nh;
+	GtkWidget *win;
+
+	if ((id < 0) || (id >= WPLC_max))
+		return; /* invalid window */
+
+	if (!conf_core.editor.auto_place) {
+		if (new_win != NULL) /* remember window widgets in case editor.auto_place gets enabled later */
+			wplc_windows[id] = new_win;
+		return; /* feature disabled */
+	}
+
+	/* build base path for the specific window */
+	pe = path;
+	strcpy(pe, CONF_PREFIX);      pe += strlen(CONF_PREFIX);
+	strcpy(pe, conf_prefix[id]);  pe += strlen(conf_prefix[id]);
+
+	/* query each parameter */
+	strcpy(pe, "height"); nh = conf_get_field(path);
+	strcpy(pe, "width");  nw = conf_get_field(path);
+	strcpy(pe, "x");      nx = conf_get_field(path);
+	strcpy(pe, "y");      ny = conf_get_field(path);
+
+	if (new_win != NULL) {
+		wplc_windows[id] = new_win;
+		win = new_win;
+		/* for new windows set hint */
+		if (HAVE(nw) && HAVE(nh))
+			gtk_window_set_default_size(GTK_WINDOW(win), nw->val.integer[0], nh->val.integer[0]);
+		if (HAVE(nx) && HAVE(ny))
+			gtk_window_move(GTK_WINDOW(win), nx->val.integer[0], ny->val.integer[0]);
+		else
+			gtk_window_move(GTK_WINDOW(win), 10, 10); /* original behaviour */
+	}
+	else {
+		win = wplc_windows[id];
+		if (win != NULL) {
+			if (HAVE_NZ(nw) && HAVE_NZ(nh))
+				gtk_window_resize(GTK_WINDOW(win), nw->val.integer[0], nh->val.integer[0]);
+			if (HAVE(nx) && HAVE(ny))
+				gtk_window_move(GTK_WINDOW(win), nx->val.integer[0], ny->val.integer[0]);
+		}
+	}
+}
+#undef HAVE
+
+void wplc_config_event(GtkWidget *win, GdkEventConfigure *ev, long *cx, long *cy, long *cw, long *ch)
+{
+	gboolean new_x, new_y, new_w, new_h;
+
+	new_x = (*cx != ev->x);
+	new_y = (*cy != ev->y);
+	new_w = (*cw != ev->width);
+	new_h = (*ch != ev->height);
+
+	*cx = ev->x;
+	*cy = ev->y;
+	*cw = ev->width;
+	*ch = ev->height;
+
+	if (new_x || new_y || new_w || new_h)
+		hid_gtk_wgeo_update();
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/win_place.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/win_place.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/win_place.h	(revision 18980)
@@ -0,0 +1,26 @@
+#ifndef GHID_WIN_PLACE
+#define GHID_WIN_PLACE
+
+#include <gtk/gtk.h>
+
+typedef enum {
+	WPLC_TOP,
+	WPLC_LOG,
+	WPLC_DRC,
+	WPLC_LIBRARY,
+	WPLC_NETLIST,
+	WPLC_KEYREF,
+	WPLC_PINOUT,
+	WPLC_SEARCH,
+	WPLC_max
+} wplc_win_t;
+
+/* Called when geometry changes - should save new geo in the config */
+extern void hid_gtk_wgeo_update(void);
+
+/* Place the window if it's enabled and there are coords in the config. */
+void wplc_place(wplc_win_t id, GtkWidget *win);
+
+/* query window current window sizes and update wgeo cache */
+void wplc_config_event(GtkWidget *win, GdkEventConfigure *ev, long *cx, long *cy, long *cw, long *ch);
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.c	(revision 18980)
@@ -0,0 +1,67 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "config.h"
+#include "wt_accel_label.h"
+#include "compat_nls.h"
+#include "compat.h"
+
+static GtkWidget *gtk_menu_or_checkmenu_item_new(int check, const char *label, const char *accel_label)
+{
+	GtkWidget *w;
+	GtkWidget *hbox = gtkc_hbox_new(FALSE, 0);
+	GtkWidget *spring = gtkc_hbox_new(FALSE, 0);
+	GtkWidget *l = gtk_label_new(label);
+	GtkWidget *accel = gtk_label_new(accel_label);
+
+	if (check)
+		w = gtk_check_menu_item_new();
+	else
+		w = gtk_menu_item_new();
+	gtk_box_pack_start(GTK_BOX(hbox), l, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), spring, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), accel, FALSE, FALSE, 0);
+
+	gtk_container_add(GTK_CONTAINER(w), GTK_WIDGET(hbox));
+
+	return w;
+}
+
+GtkWidget *pcb_gtk_menu_item_new(const char *label, const char *accel_label)
+{
+	return gtk_menu_or_checkmenu_item_new(FALSE, label, accel_label);
+}
+
+GtkWidget *pcb_gtk_checkmenu_item_new(const char *label, const char *accel_label)
+{
+	return gtk_menu_or_checkmenu_item_new(TRUE, label, accel_label);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_accel_label.h	(revision 18980)
@@ -0,0 +1,10 @@
+#ifndef WT_ACCEL_LABEL_H
+#define WT_ACCEL_LABEL_H
+
+/* Helper: creates a new menu item with label and accel label set up. */
+GtkWidget *pcb_gtk_menu_item_new(const char *label, const char *accel_label);
+
+/* Helper: creates a new check menu item with label and accel label set up. */
+GtkWidget *pcb_gtk_checkmenu_item_new(const char *label, const char *accel_label);
+
+#endif /* WT_ACCEL_LABEL_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.c	(revision 18980)
@@ -0,0 +1,318 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/*  This widget is a modified spinbox for the user to enter
+ *  pcb coords. It is assigned a default unit (for display),
+ *  but this can be changed by the user by typing a new one
+ *  or right-clicking on the box.
+ *
+ *  Internally, it keeps track of its value in pcb coords.
+ *  From the user's perspective, it uses natural human units.
+ */
+
+#include "config.h"
+
+#include "wt_coord_entry.h"
+
+#include "pcb-printf.h"
+#include "compat_nls.h"
+
+
+enum {
+	UNIT_CHANGE_SIGNAL,
+	LAST_SIGNAL
+};
+
+static guint ghid_coord_entry_signals[LAST_SIGNAL] = { 0 };
+
+struct pcb_gtk_coord_entry_s {
+	GtkSpinButton parent;
+
+	pcb_coord_t min_value;
+	pcb_coord_t max_value;
+	pcb_coord_t value;
+
+	enum ce_step_size step_size;
+	const pcb_unit_t *unit;
+};
+
+struct pcb_gtk_coord_entry_class_s {
+	GtkSpinButtonClass parent_class;
+
+	void (*change_unit) (pcb_gtk_coord_entry_t *, const pcb_unit_t *);
+};
+
+/* SIGNAL HANDLERS */
+/* Callback for "Change Unit" menu click */
+static void menu_item_activate_cb(GtkMenuItem * item, pcb_gtk_coord_entry_t * ce)
+{
+	const char *text = gtk_menu_item_get_label(item);
+	const pcb_unit_t *unit = get_unit_struct(text);
+
+	g_signal_emit(ce, ghid_coord_entry_signals[UNIT_CHANGE_SIGNAL], 0, unit);
+}
+
+/* Callback for context menu creation */
+static void ghid_coord_entry_popup_cb(pcb_gtk_coord_entry_t * ce, GtkMenu * menu, gpointer data)
+{
+	int i, n;
+	const pcb_unit_t *unit_list;
+	GtkWidget *menu_item, *submenu;
+
+	/* Build submenu */
+	n = pcb_get_n_units();
+	unit_list = pcb_units;
+
+	submenu = gtk_menu_new();
+	for (i = 0; i < n; ++i) {
+		menu_item = gtk_menu_item_new_with_label(unit_list[i].suffix);
+		g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(menu_item_activate_cb), ce);
+		gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menu_item);
+		gtk_widget_show(menu_item);
+	}
+
+	/* Add submenu to menu */
+	menu_item = gtk_separator_menu_item_new();
+	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menu_item);
+	gtk_widget_show(menu_item);
+
+	menu_item = gtk_menu_item_new_with_label(_("Change Units"));
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
+	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menu_item);
+	gtk_widget_show(menu_item);
+}
+
+/* Callback for user output */
+static gboolean ghid_coord_entry_output_cb(pcb_gtk_coord_entry_t * ce, gpointer data)
+{
+	GtkAdjustment *adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(ce));
+	double value = gtk_adjustment_get_value(adj);
+	const char *orig;
+	char text[128], *suffix = NULL;
+	const pcb_unit_t *orig_unit;
+
+	orig = gtk_entry_get_text(GTK_ENTRY(ce));
+	strtod(orig, &suffix);
+	orig_unit = get_unit_struct(suffix);
+
+	if ((suffix != NULL) && (*suffix != '\0') && (orig_unit != NULL) && (ce->unit != orig_unit))
+		pcb_gtk_coord_entry_set_unit(ce, orig_unit);
+
+	pcb_snprintf(text, sizeof(text), "%.*f %s", ce->unit->default_prec, value, ce->unit->suffix);
+	gtk_entry_set_text(GTK_ENTRY(ce), text);
+
+	return TRUE;
+}
+
+/* Callback for user input */
+static gboolean ghid_coord_text_changed_cb(pcb_gtk_coord_entry_t * entry, gpointer data)
+{
+	const char *text;
+	char *suffix;
+	const pcb_unit_t *new_unit;
+	double value;
+
+	/* Check if units have changed */
+	text = gtk_entry_get_text(GTK_ENTRY(entry));
+	value = strtod(text, &suffix);
+	new_unit = get_unit_struct(suffix);
+	if (new_unit && new_unit != entry->unit) {
+		entry->value = pcb_unit_to_coord(new_unit, value);
+		g_signal_emit(entry, ghid_coord_entry_signals[UNIT_CHANGE_SIGNAL], 0, new_unit);
+	}
+
+	return FALSE;
+}
+
+/* Callback for change in value (input or ^v clicks) */
+static gboolean ghid_coord_value_changed_cb(pcb_gtk_coord_entry_t * ce, gpointer data)
+{
+	GtkAdjustment *adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(ce));
+
+	/* Re-calculate internal value */
+	double value = gtk_adjustment_get_value(adj);
+	ce->value = pcb_unit_to_coord(ce->unit, value);
+	/* Handle potential unit changes */
+	ghid_coord_text_changed_cb(ce, data);
+
+	return FALSE;
+}
+
+static void ghid_coord_entry_change_unit(pcb_gtk_coord_entry_t * ce, const pcb_unit_t * new_unit)
+{
+	double climb_rate = 0.0;
+	GtkAdjustment *adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(ce));
+
+	ce->unit = new_unit;
+	/* Re-calculate min/max values for spinbox */
+	gtk_adjustment_configure(adj, pcb_coord_to_unit(new_unit, ce->value),
+													 pcb_coord_to_unit(new_unit, ce->min_value),
+													 pcb_coord_to_unit(new_unit, ce->max_value), ce->unit->step_small, ce->unit->step_medium, 0.0);
+
+	switch (ce->step_size) {
+	case CE_TINY:
+		climb_rate = new_unit->step_tiny;
+		break;
+	case CE_SMALL:
+		climb_rate = new_unit->step_small;
+		break;
+	case CE_MEDIUM:
+		climb_rate = new_unit->step_medium;
+		break;
+	case CE_LARGE:
+		climb_rate = new_unit->step_large;
+		break;
+	}
+	gtk_spin_button_configure(GTK_SPIN_BUTTON(ce), adj, climb_rate, new_unit->default_prec + strlen(new_unit->suffix));
+}
+
+/* CONSTRUCTOR */
+static void ghid_coord_entry_init(pcb_gtk_coord_entry_t * ce)
+{
+	/* Hookup signal handlers */
+	g_signal_connect(G_OBJECT(ce), "focus_out_event", G_CALLBACK(ghid_coord_text_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(ce), "value_changed", G_CALLBACK(ghid_coord_value_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(ce), "populate_popup", G_CALLBACK(ghid_coord_entry_popup_cb), NULL);
+	g_signal_connect(G_OBJECT(ce), "output", G_CALLBACK(ghid_coord_entry_output_cb), NULL);
+}
+
+static void ghid_coord_entry_class_init(pcb_gtk_coord_entry_class_t * klass)
+{
+	klass->change_unit = ghid_coord_entry_change_unit;
+
+	/* GtkAutoComplete *ce : the object acted on */
+	/* const pcb_unit_t *new_unit: the new unit that was set */
+	ghid_coord_entry_signals[UNIT_CHANGE_SIGNAL] =
+		g_signal_new("change-unit",
+								 G_TYPE_FROM_CLASS(klass),
+								 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+								 G_STRUCT_OFFSET(pcb_gtk_coord_entry_class_t, change_unit),
+								 NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+}
+
+/* PUBLIC FUNCTIONS */
+GType pcb_gtk_coord_entry_get_type(void)
+{
+	static GType ce_type = 0;
+
+	if (!ce_type) {
+		const GTypeInfo ce_info = {
+			sizeof(pcb_gtk_coord_entry_class_t),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) ghid_coord_entry_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(pcb_gtk_coord_entry_t),
+			0,												/* n_preallocs */
+			(GInstanceInitFunc) ghid_coord_entry_init,
+		};
+
+		ce_type = g_type_register_static(GTK_TYPE_SPIN_BUTTON, "pcb_gtk_coord_entry_t", &ce_info, 0);
+	}
+
+	return ce_type;
+}
+
+static void coord_cfg(pcb_gtk_coord_entry_t *ce)
+{
+	/* Setup spinbox min/max values */
+	double small_step, big_step;
+	GtkAdjustment *adj;
+
+	switch (ce->step_size) {
+	case CE_TINY:
+		small_step = ce->unit->step_tiny;
+		big_step = ce->unit->step_small;
+		break;
+	case CE_SMALL:
+		small_step = ce->unit->step_small;
+		big_step = ce->unit->step_medium;
+		break;
+	case CE_MEDIUM:
+		small_step = ce->unit->step_medium;
+		big_step = ce->unit->step_large;
+		break;
+	case CE_LARGE:
+		small_step = ce->unit->step_large;
+		big_step = ce->unit->step_huge;
+		break;
+	default:
+		small_step = big_step = 0;
+		break;
+	}
+
+	adj = GTK_ADJUSTMENT(gtk_adjustment_new(pcb_coord_to_unit(ce->unit, ce->value),
+																					pcb_coord_to_unit(ce->unit, ce->min_value),
+																					pcb_coord_to_unit(ce->unit, ce->max_value), small_step, big_step, 0.0));
+	gtk_spin_button_configure(GTK_SPIN_BUTTON(ce), adj, small_step, ce->unit->default_prec + strlen(ce->unit->suffix));
+	gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ce), FALSE);
+}
+
+GtkWidget *pcb_gtk_coord_entry_new(pcb_coord_t min_val, pcb_coord_t max_val, pcb_coord_t value, const pcb_unit_t * unit,
+																	 enum ce_step_size step_size)
+{
+	pcb_gtk_coord_entry_t *ce = g_object_new(GHID_COORD_ENTRY_TYPE, NULL);
+
+	ce->unit = unit;
+	ce->min_value = min_val;
+	ce->max_value = max_val;
+	ce->value = value;
+	ce->step_size = step_size;
+
+	coord_cfg(ce);
+
+	return GTK_WIDGET(ce);
+}
+
+pcb_coord_t pcb_gtk_coord_entry_get_value(pcb_gtk_coord_entry_t * ce)
+{
+	return ce->value;
+}
+
+int pcb_gtk_coord_entry_get_value_str(pcb_gtk_coord_entry_t * ce, char *out, int out_len)
+{
+	GtkAdjustment *adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(ce));
+	double value = gtk_adjustment_get_value(adj);
+	return pcb_snprintf(out, out_len, "%.*f %s", ce->unit->default_prec, value, ce->unit->suffix);
+}
+
+void pcb_gtk_coord_entry_set_value(pcb_gtk_coord_entry_t * ce, pcb_coord_t val)
+{
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(ce), pcb_coord_to_unit(ce->unit, val));
+}
+
+int pcb_gtk_coord_entry_set_unit(pcb_gtk_coord_entry_t *ce, const pcb_unit_t *unit)
+{
+	if (ce->unit == unit)
+		return 0;
+	ce->unit = unit;
+	coord_cfg(ce);
+	return 1;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_coord_entry.h	(revision 18980)
@@ -0,0 +1,31 @@
+/* This is the modified GtkSpinbox used for entering Coords.
+ * Hopefully it can be used as a template whenever we migrate the
+ * rest of the Gtk HID to use GObjects and GtkWidget subclassing. */
+#ifndef GHID_COORD_ENTRY_H__
+#define GHID_COORD_ENTRY_H__
+
+#include <gtk/gtk.h>
+
+#include "unit.h"
+
+#define GHID_COORD_ENTRY_TYPE            (pcb_gtk_coord_entry_get_type ())
+#define GHID_COORD_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_COORD_ENTRY_TYPE, pcb_gtk_coord_entry_t))
+#define GHID_COORD_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GHID_COORD_ENTRY_TYPE, pcb_gtk_coord_entry_class_t))
+#define IS_GHID_COORD_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GHID_COORD_ENTRY_TYPE))
+#define IS_GHID_COORD_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GHID_COORD_ENTRY_TYPE))
+typedef struct pcb_gtk_coord_entry_s pcb_gtk_coord_entry_t;
+typedef struct pcb_gtk_coord_entry_class_s pcb_gtk_coord_entry_class_t;
+
+enum ce_step_size { CE_TINY, CE_SMALL, CE_MEDIUM, CE_LARGE };
+
+GType pcb_gtk_coord_entry_get_type(void);
+
+GtkWidget *pcb_gtk_coord_entry_new(pcb_coord_t min_val, pcb_coord_t max_val, pcb_coord_t default_value, const pcb_unit_t *default_unit, enum ce_step_size default_step_size);
+pcb_coord_t pcb_gtk_coord_entry_get_value(pcb_gtk_coord_entry_t * ce);
+int pcb_gtk_coord_entry_get_value_str(pcb_gtk_coord_entry_t * ce, char *out, int out_len);
+void pcb_gtk_coord_entry_set_value(pcb_gtk_coord_entry_t * ce, pcb_coord_t val);
+
+/* Change the unit only if it differs from what's set currently; returns whether changed */
+int pcb_gtk_coord_entry_set_unit(pcb_gtk_coord_entry_t *ce, const pcb_unit_t *unit);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.c	(revision 18980)
@@ -0,0 +1,685 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  This module is subject to the GNU GPL as described below.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "layer.h"
+#include "layer_grp.h"
+#include "layer_ui.h"
+#include "layer_vis.h"
+#include "board.h"
+#include "data.h"
+#include "event.h"
+#include "conf_core.h"
+#include "actions.h"
+#include "math_helper.h"
+
+#include "wt_layersel.h"
+#include "compat.h"
+
+extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
+
+/*** Layer visibility widget rendering ***/
+
+#define set_pixel(dst, r, g, b, a) \
+	do { p[0] = r; p[1] = g; p[2] = b; p[3] = a; } while(0)
+
+static guint hex2bin_(char c)
+{
+	if ((c >= '0') && (c <= '9')) return c - '0';
+	if ((c >= 'a') && (c <= 'z')) return c - 'a' + 10;
+	if ((c >= 'A') && (c <= 'Z')) return c - 'A' + 10;
+	return 0; /* syntax error... */
+}
+
+#define hex2bin(str) ((hex2bin_((str)[0])) << 4 | hex2bin_((str)[1]))
+
+/* draw a visibility box: filled or partially filled with layer color */
+static GtkWidget *layer_vis_box(int filled, const char *rgb, int brd, int hatch)
+{
+	GdkPixbuf *pixbuf;
+	GtkWidget *image;
+	gint width, height, max_height;
+	guchar *pixels, *p;
+	guint w, r, g, b;
+
+	pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 16, 16);
+	width = gdk_pixbuf_get_width(pixbuf);	/* 16 here, obviously */
+	max_height = height = gdk_pixbuf_get_height(pixbuf);
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+	/* Fill the whole rectangle with color */
+	r = hex2bin(rgb+1);
+	g = hex2bin(rgb+3);
+	b = hex2bin(rgb+5);
+
+	while (height--) {
+		w = width;
+		p = pixels;
+		while (w--) {
+			if ((height < brd) || (height >= max_height-brd) || (w < brd) || (w >= width-brd))
+				set_pixel(p, 0, 0, 0, 0xff); /* frame */
+			else if ((hatch) && (((w - height) % 4) == 0))
+				set_pixel(p, 0x0, 0x0, 0x0, 0x0);
+			else if ((width-w+5 < height) || (filled))
+				set_pixel(p, r, g, b, 0xff); /* layer color fill (full or up-left triangle) */
+			else
+				set_pixel(p, 0xff, 0xff, 0xff, 0x0); /* the unfilled part when triangle should be transparent */
+			p += 4;
+		}
+		pixels += gdk_pixbuf_get_rowstride(pixbuf);
+	}
+
+	image = gtk_image_new_from_pixbuf(pixbuf);
+	g_object_unref(pixbuf);
+
+	return image;
+}
+
+/*** Sync: make the GUI look like internal states ***/
+
+static void layersel_lyr_vis_sync(pcb_gtk_ls_lyr_t *lsl)
+{
+	int is_on = 0;
+
+	if (lsl->ev_vis == NULL) {
+		pcb_layer_t *l = pcb_get_layer(PCB->Data, lsl->lid);
+		if (l != NULL)
+			is_on = l->meta.real.vis;
+	}
+	else
+		lsl->ev_vis(lsl, 0, &is_on);
+
+	if (is_on) {
+		gtk_widget_show(lsl->vis_on);
+		gtk_widget_hide(lsl->vis_off);
+	}
+	else {
+		gtk_widget_show(lsl->vis_off);
+		gtk_widget_hide(lsl->vis_on);
+	}
+
+	if ((lsl->lid < 0) ?
+		((lsl->ev_selected != NULL) && (lsl->ev_selected(lsl, 0) == 1)) :
+		((!lsl->lsg->ls->no_copper_sel) && (lsl->lid == pcb_layer_id(PCB->Data, LAYER_ON_STACK(0)))))
+		pcb_gtk_set_selected(lsl->name_box, 1);
+	else
+		pcb_gtk_set_selected(lsl->name_box, 0);
+}
+
+static void group_vis_sync(pcb_gtk_ls_grp_t *lsg)
+{
+	if (lsg->grp->open) {
+		int n;
+		pcb_gtk_widget_hide_all(lsg->grp_closed);
+		gtk_widget_set_no_show_all(lsg->grp_open, 0);
+		gtk_widget_show_all(lsg->grp_open);
+		gtk_widget_set_no_show_all(lsg->grp_open, 1);
+		for(n = 0; n < lsg->grp->len; n++)
+			layersel_lyr_vis_sync(&lsg->layer[n]);
+	}
+	else {
+		gtk_widget_set_no_show_all(lsg->grp_closed, 0);
+		gtk_widget_show_all(lsg->grp_closed);
+		gtk_widget_set_no_show_all(lsg->grp_closed, 1);
+		pcb_gtk_widget_hide_all(lsg->grp_open);
+
+		/* a closed group has visibility boxes displayed, pick one to show */
+		if (lsg->vis_on != NULL) {
+			if (lsg->grp->vis) {
+				gtk_widget_show(lsg->vis_on);
+				gtk_widget_hide(lsg->vis_off);
+			}
+			else {
+				gtk_widget_show(lsg->vis_off);
+				gtk_widget_hide(lsg->vis_on);
+			}
+		}
+	}
+}
+
+/* Select the first visible layer (physically) below the one turned off or
+   reenable the original if all are off; this how we ensure the CURRENT layer
+   is visible and avoid drawing on inivisible layers */
+static void ensure_visible_current(pcb_gtk_layersel_t *ls)
+{
+	pcb_layergrp_id_t gid;
+	pcb_layer_t *l;
+
+	if (CURRENT->meta.real.vis)
+		return;
+
+	/* At the moment the layer selector displays only board layers which are always real */
+	assert(!CURRENT->is_bound);
+
+	/* look for the next one to enable, group-vise */
+	for(gid = CURRENT->meta.real.grp + 1; gid != CURRENT->meta.real.grp; gid++) {
+		pcb_layergrp_t *g;
+		if (gid >= pcb_max_group(PCB))
+			gid = 0;
+		g = &PCB->LayerGroups.grp[gid];
+		if (g->len < 1)
+			continue;
+		l = PCB->Data->Layer + g->lid[0];
+		if (l->meta.real.vis)
+			goto change_selection;
+	}
+
+	/* fallback: all off; turn the current one back on */
+	l = CURRENT;
+
+	change_selection:;
+		pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, l), 1, 1);
+		ls->com->invalidate_all();
+		pcb_gtk_layersel_vis_update(ls);
+}
+
+/*** Event handling ***/
+
+/* Toggle a virtual layer: flip the bool */
+static int vis_virt(pcb_gtk_ls_lyr_t *lsl, int toggle, int *is_on)
+{
+	const pcb_menu_layers_t *ml = &pcb_menu_layers[lsl->virt_idx];
+	pcb_bool *b = (pcb_bool *)((char *)PCB + ml->vis_offs);
+	if (toggle)
+		*b = !*b;
+	*is_on = *b;
+	return 0;
+}
+
+static int vis_ui(pcb_gtk_ls_lyr_t *lsl, int toggle, int *is_on)
+{
+	pcb_layer_t *l = pcb_uilayers.array[lsl->vis_ui_idx];
+	if (toggle)
+		l->meta.real.vis = !l->meta.real.vis;
+	*is_on = l->meta.real.vis;
+	return 0;
+}
+
+/* Toggle a implicit layer: toggle the parent group's */
+static int vis_impl(pcb_gtk_ls_lyr_t *lsl, int toggle, int *is_on)
+{
+	if (toggle)
+		lsl->lsg->grp->vis = !lsl->lsg->grp->vis;
+	*is_on = lsl->lsg->grp->vis;
+	return 0;
+}
+
+static int ev_lyr_no_select(pcb_gtk_ls_lyr_t *lsl, int do_select)
+{
+	return -1; /* layer can not be selected ever */
+}
+
+static int ev_lyr_select_virt(pcb_gtk_ls_lyr_t *lsl, int do_select)
+{
+	const pcb_menu_layers_t *ml = &pcb_menu_layers[lsl->virt_idx];
+	pcb_bool *b;
+
+	if ((ml->select_name == NULL) || (ml->sel_offs == 0))
+		return -1; /* can not be selected */
+
+	if (do_select)
+		pcb_actionl("SelectLayer", ml->select_name, NULL);
+
+	b = (pcb_bool *)((char *)PCB + ml->sel_offs);
+	return *b;
+}
+
+static gboolean group_vis_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg)
+{
+	pcb_gtk_layersel_t *ls = lsg->ls;
+	int n;
+
+	ls->running = 1;
+	switch(event->button.button) {
+		case 1:
+			lsg->grp->vis = !lsg->grp->vis;
+			if (lsg->grp->len > 0)
+				pcb_layervis_change_group_vis(lsg->layer[0].lid, lsg->grp->vis, 1);
+			ensure_visible_current(ls);
+			for(n = 0; n < lsg->grp->len; n++)
+				layersel_lyr_vis_sync(&lsg->layer[n]);
+			group_vis_sync(lsg);
+			ls->com->invalidate_all();
+			pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+			break;
+		case 3:
+			if (lsg->grp != &lsg->ls->grp_virt) {
+				pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, lsg->grp);
+				pcb_actionl("Popup", "group", NULL);
+			}
+			break;
+	}
+	ls->running = 0;
+	return TRUE;
+}
+
+static void layer_popup(pcb_gtk_layersel_t *ls, int button, pcb_layer_id_t lid, pcb_layergrp_t *g)
+{
+	if (button != 3)
+		return;
+	if (lid < 0) {
+		if ((g != NULL) && (g != &ls->grp_virt)) {
+			pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, g);
+			pcb_actionl("Popup", "group", NULL);
+		}
+	}
+	else
+		pcb_actionl("Popup", "layer", NULL);
+}
+
+static gboolean layer_vis_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_lyr_t *lsl)
+{
+	pcb_gtk_layersel_t *ls = lsl->lsg->ls;
+	int is_on, normal = 1;
+
+	if (event->type != GDK_BUTTON_PRESS) /* ignore excess events on double or triple buttons */
+		return TRUE;
+
+	ls->running = 1;
+	switch(event->button.button) {
+		case 1:
+		case 3:
+			if (lsl->ev_vis != NULL) {
+				if (lsl->ev_vis(lsl, 1, &is_on) == 0) {
+					normal = 0;
+					layersel_lyr_vis_sync(lsl);
+				}
+			}
+			else {
+				pcb_layer_t *l = pcb_get_layer(PCB->Data, lsl->lid);
+				if (l != NULL)
+					is_on = !l->meta.real.vis;
+				else
+					normal = 0;
+			}
+
+			if (normal) {
+				pcb_layervis_change_group_vis(lsl->lid, is_on, 1);
+				ensure_visible_current(ls);
+				pcb_gtk_layersel_vis_update(ls); /* rather do a full redraw because the selection may have changed */
+			}
+
+			ls->com->invalidate_all();
+			pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+			layer_popup(ls, event->button.button, lsl->lid, lsl->lsg->grp);
+			break;
+	}
+	ls->running = 0;
+	return TRUE;
+}
+
+static gboolean layer_select_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_lyr_t *lsl)
+{
+	pcb_gtk_layersel_t *ls = lsl->lsg->ls;
+
+	ls->running = 1;
+	switch(event->button.button) {
+		case 1:
+			ls->no_copper_sel = PCB->RatDraw = 0;
+		case 3:
+			if ((lsl->ev_selected == NULL) || (lsl->ev_selected(lsl, 1) >= 0)) {
+				pcb_layervis_change_group_vis(lsl->lid, 1, 1);
+				ls->com->invalidate_all();
+				pcb_gtk_layersel_vis_update(ls); /* need to do a full redraw because of side effects of special layer selections (e.g. Rats') */
+			}
+			pcb_event(PCB_EVENT_LAYERVIS_CHANGED, NULL);
+			layer_popup(ls, event->button.button, lsl->lid, lsl->lsg->grp);
+			break;
+	}
+	ls->running = 0;
+	return TRUE;
+}
+
+static gboolean group_any_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg, int openval)
+{
+	switch(event->button.button) {
+		case 1:
+			lsg->grp->open = openval;
+			group_vis_sync(lsg);
+			break;
+		case 3:
+			if (lsg->grp != &lsg->ls->grp_virt) {
+				pcb_actd_EditGroup_gid = pcb_layergrp_id(PCB, lsg->grp);
+				pcb_actionl("Popup", "group", NULL);
+			}
+			break;
+	}
+	return TRUE;
+}
+
+static gboolean group_close_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg)
+{
+	return group_any_press_cb(widget, event, lsg, 0);
+}
+
+static gboolean group_open_press_cb(GtkWidget *widget, GdkEvent *event, pcb_gtk_ls_grp_t *lsg)
+{
+	return group_any_press_cb(widget, event, lsg, 1);
+}
+
+/* Wrap w so that clicks on it are triggering a callback */
+static GtkWidget *wrap_bind_click(GtkWidget *w, GCallback cb, void *cb_data)
+{
+	GtkWidget *event_box = gtk_event_box_new();
+	gtk_container_add(GTK_CONTAINER(event_box), w);
+	g_signal_connect(event_box, "button-press-event", G_CALLBACK(cb), cb_data);
+
+	return event_box;
+}
+
+/*** Row builder ***/
+static const char *lyr_color(pcb_layer_id_t lid)
+{
+	const char *clr = "#aaaa00";
+	pcb_layer_t *ly = pcb_get_layer(PCB->Data, lid);
+
+	if (ly != NULL)
+		clr = ly->meta.real.color;
+
+	return clr;
+}
+
+static const char * const grp_color(pcb_layergrp_t *g)
+{
+	/* normal mechanism: first layer's color or default by type */
+	return pcb_layer_default_color(g->len > 0 ? g->lid[0] : 0, g->ltype);
+}
+
+/* Create a hbox with on/off visibility boxes packed in, pointers returned in *on, *off */
+static GtkWidget *build_visbox(const char *color, GtkWidget **on, GtkWidget **off, int brd, int hatch)
+{
+	GtkWidget *vis_box = gtkc_hbox_new(0, 0);
+	*on = layer_vis_box(1, color, brd, hatch);
+	gtk_box_pack_start(GTK_BOX(vis_box), *on, FALSE, FALSE, 0);
+	*off = layer_vis_box(0, color, brd, hatch);
+	gtk_box_pack_start(GTK_BOX(vis_box), *off, FALSE, FALSE, 0);
+	return vis_box;
+}
+
+/* Create a hbox of a layer within an expanded group */
+static GtkWidget *build_layer(pcb_gtk_ls_grp_t *lsg, pcb_gtk_ls_lyr_t *lsl, const char *name, pcb_layer_id_t lid,  char * const*force_color)
+{
+	GtkWidget *vis_box, *vis_ebox, *ly_name_bx, *lab;
+	pcb_layer_t *ly;
+	const char *color;
+
+	lsl->lsg = lsg;
+	lsl->force_color = force_color;
+	lsl->box = gtkc_hbox_new(0, 0);
+
+	if (force_color == NULL)
+		color = lyr_color(lid);
+	else
+		color = *force_color;
+
+	ly = pcb_get_layer(PCB->Data, lid);
+
+	/* sensitive layer visibility widgets */
+	vis_box = build_visbox(color, &lsl->vis_on, &lsl->vis_off, (((ly != NULL) && (ly->comb & PCB_LYC_SUB)) ? 2 : 1), (((ly != NULL) && (ly->comb & PCB_LYC_AUTO)) ? 1 : 0));
+	vis_ebox = wrap_bind_click(vis_box, G_CALLBACK(layer_vis_press_cb), lsl);
+	gtk_box_pack_start(GTK_BOX(lsl->box), vis_ebox, FALSE, FALSE, 0);
+
+	/* selectable layer name*/
+	ly_name_bx = gtkc_hbox_new(0, 0);
+	lsl->name_box = wrap_bind_click(ly_name_bx, G_CALLBACK(layer_select_press_cb), lsl);
+	gtkc_widget_selectable(lsl->name_box, "layersel");
+	lab = gtk_label_new(name);
+	gtk_box_pack_start(GTK_BOX(ly_name_bx), lab, TRUE, TRUE, 2);
+	gtk_box_pack_start(GTK_BOX(lsl->box), lsl->name_box, TRUE, TRUE, 10);
+	gtk_misc_set_alignment(GTK_MISC(lab), 0, 0.5);
+
+	layersel_lyr_vis_sync(lsl);
+
+	return lsl->box;
+}
+
+/* Creating a group enrty (both open and closed state); after layers are added, finish() needs to be called */
+static GtkWidget *build_group_start(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, const char *gname, int has_group_vis, pcb_layergrp_t *grp)
+{
+	GtkWidget *gn_vert, *vlabel, *opn, *cld;
+
+/* Layout:
+  +--------------------------+<- grp_row
+  | grp_closed               |
+  +--------------------------+
+  |+-----------------------+<--- grp_open
+  || gn | layer1           | |
+  || _v | layer2           | |
+  || er | layer3           | |
+  || t  | layer4           | |
+  |+-----------------------+ |
+  +--------------------------+
+*/
+	lsg->ls = ls;
+	lsg->grp = grp;
+	lsg->grp_row = gtkc_vbox_new(0, 0);
+	lsg->grp_closed = gtkc_hbox_new(0, 0);
+	lsg->grp_open = gtkc_hbox_new(0, 0);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_row), lsg->grp_closed, FALSE, FALSE, 1);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_row), lsg->grp_open, FALSE, FALSE, 5);
+
+	gn_vert = gtkc_vbox_new(0, 0);
+	lsg->layers = gtkc_vbox_new(0, 0);
+	opn = wrap_bind_click(gn_vert, G_CALLBACK(group_close_press_cb), lsg);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_open), opn, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_open), gtk_vseparator_new(), FALSE, FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_open), lsg->layers, TRUE, TRUE, 0);
+
+	/* install group name - vertical (for when the group is open) */
+	vlabel = gtkc_trunctext_new(gname);
+	gtk_label_set_angle(GTK_LABEL(vlabel), 90);
+	gtk_box_pack_start(GTK_BOX(gn_vert), vlabel, TRUE, TRUE, 0);
+	gtk_misc_set_alignment(GTK_MISC(vlabel), 0, 1);
+	gtk_widget_set_size_request(vlabel, 16, 1);
+	gtk_widget_set_tooltip_text(gn_vert, gname);
+
+
+	/* install group name - horizontal (for when the group is closed) */
+	if (has_group_vis) {
+		GtkWidget *vis;
+		vis = wrap_bind_click(build_visbox(grp_color(grp), &lsg->vis_on, &lsg->vis_off, 1, 0), G_CALLBACK(group_vis_press_cb), lsg);
+		gtk_box_pack_start(GTK_BOX(lsg->grp_closed), vis, FALSE, FALSE, 0);
+	}
+	cld = wrap_bind_click(gtk_label_new(gname), G_CALLBACK(group_open_press_cb), lsg);
+	gtk_box_pack_start(GTK_BOX(lsg->grp_closed), cld, FALSE, FALSE, 2);
+
+	return lsg->grp_row;
+}
+
+/* finish creating a group - call after layers are added */
+static void build_group_finish(pcb_gtk_ls_grp_t *lsg)
+{
+	/* Make sure gtk_show_all() won't mess with our hardwired hide/show */
+	group_vis_sync(lsg);
+	gtk_widget_set_no_show_all(lsg->grp_closed, 1);
+	gtk_widget_set_no_show_all(lsg->grp_open, 1);
+}
+
+/* Create a group that has a real layer group in core, add all layers */
+static GtkWidget *build_group_real(pcb_gtk_layersel_t *ls, pcb_gtk_ls_grp_t *lsg, pcb_layergrp_t *grp)
+{
+	int n;
+	GtkWidget *wg = build_group_start(ls, lsg, grp->name, 1, grp);
+
+	lsg->layer = calloc(sizeof(pcb_gtk_ls_lyr_t), (grp->len == 0 ? 1 : grp->len));
+
+	/* install layers */
+	if (grp->len == 0) {
+		const char * const clr = grp_color(grp);
+		char *name = pcb_strdup_printf("<%s>", lsg->grp->name);
+		GtkWidget *wl = build_layer(lsg, &lsg->layer[0], name, -1, (char *const *)&clr);
+		gtk_box_pack_start(GTK_BOX(lsg->layers), wl, TRUE, TRUE, 1);
+		lsg->layer[0].lid = -1;
+		lsg->layer[0].ev_selected = ev_lyr_no_select;
+		lsg->layer[0].ev_vis = vis_impl;
+		free(name);
+		gtk_widget_set_tooltip_text(wl, "This is an empty layer group with a\nvirtual auto layer implied.\nTo start editing, create a real layer\nin it using the right click menu.");
+	}
+	else {
+		for(n = 0; n < grp->len; n++) {
+			pcb_layer_t *l = pcb_get_layer(PCB->Data, grp->lid[n]);
+			if (l != NULL) {
+				GtkWidget *wl = build_layer(lsg, &lsg->layer[n], l->name, grp->lid[n], NULL);
+				gtk_box_pack_start(GTK_BOX(lsg->layers), wl, TRUE, TRUE, 1);
+				lsg->layer[n].lid = grp->lid[n];
+			}
+		}
+	}
+
+	build_group_finish(lsg);
+
+	return wg;
+}
+
+/*** Layer selector widget building function ***/
+static void layersel_populate(pcb_gtk_layersel_t *ls)
+{
+	GtkWidget *spring;
+	pcb_layergrp_id_t gid;
+	int n;
+
+	for(gid = 0; gid < pcb_max_group(PCB); gid++) {
+		pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid];
+		if (g->ltype & PCB_LYT_SUBSTRATE)
+			continue;
+		gtk_box_pack_start(GTK_BOX(ls->grp_box), build_group_real(ls, &ls->grp[gid], g), FALSE, FALSE, 0);
+	}
+
+	gtk_box_pack_start(GTK_BOX(ls->grp_box), gtk_hseparator_new(), FALSE, FALSE, 0);
+
+	{ /* build hardwired virtual layers */
+		pcb_gtk_ls_grp_t *lsg = &ls->lsg_virt;
+		const pcb_menu_layers_t *ml;
+
+		for(ml = pcb_menu_layers, ls->grp_virt.len = 0; ml->name != NULL; ml++) ls->grp_virt.len++;
+		lsg->layer = calloc(sizeof(pcb_gtk_ls_lyr_t), ls->grp_virt.len);
+		gtk_box_pack_start(GTK_BOX(ls->grp_box), build_group_start(ls, lsg, "Virtual", 0, &ls->grp_virt), FALSE, FALSE, 0);
+
+		for(n = 0; n < ls->grp_virt.len; n++) {
+			gtk_box_pack_start(GTK_BOX(lsg->layers), build_layer(lsg, &lsg->layer[n], pcb_menu_layers[n].name, -1, pcb_menu_layers[n].force_color), FALSE, FALSE, 1);
+			lsg->layer[n].ev_selected = ev_lyr_select_virt;
+			lsg->layer[n].ev_vis = vis_virt;
+			lsg->layer[n].virt_idx = n;
+			lsg->layer[n].lid = ls->grp_virt.lid[n] = -1;
+		}
+
+		build_group_finish(lsg);
+	}
+
+	if (vtp0_len(&pcb_uilayers) > 0) { /* UI layers */
+		pcb_gtk_ls_grp_t *lsg = &ls->lsg_ui;
+		int g;
+
+		ls->grp_ui.len = vtp0_len(&pcb_uilayers);
+		lsg->layer = calloc(sizeof(pcb_gtk_ls_lyr_t), ls->grp_ui.len);
+		gtk_box_pack_start(GTK_BOX(ls->grp_box), build_group_start(ls, lsg, "UI", 0, &ls->grp_ui), FALSE, FALSE, 0);
+
+		for(g = n = 0; n < vtp0_len(&pcb_uilayers); n++) {
+			pcb_layer_t *ly = pcb_uilayers.array[n];
+			if ((ly == NULL) || (ly->name == NULL))
+				continue;
+			gtk_box_pack_start(GTK_BOX(lsg->layers), build_layer(lsg, &lsg->layer[n], ly->name, -1, &ly->meta.real.color), FALSE, FALSE, 1);
+			lsg->layer[g].ev_selected = ev_lyr_no_select;
+			lsg->layer[g].ev_vis = vis_ui;
+			lsg->layer[g].vis_ui_idx = n;
+			lsg->layer[g].lid = -1;
+			g++;
+		}
+		ls->grp_ui.len = g;
+		build_group_finish(lsg);
+	}
+	else
+		ls->grp_ui.len = 0;
+
+
+	spring = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(ls->grp_box), spring, TRUE, TRUE, 0);
+}
+
+GtkWidget *pcb_gtk_layersel_build(pcb_gtk_common_t *com, pcb_gtk_layersel_t *ls)
+{
+	GtkWidget *scrolled;
+
+	ls->grp_box_outer = gtkc_vbox_new(FALSE, 0);
+	ls->grp_virt.open = 1;
+	ls->grp_ui.open = 1;
+	ls->com = com;
+
+	ls->grp_box = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(ls->grp_box_outer), ls->grp_box, FALSE, FALSE, 0);
+	layersel_populate(ls);
+
+	/* get the whole box vertically scrolled, if needed */
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtkc_scrolled_window_add_with_viewport(scrolled, ls->grp_box_outer);
+
+	return scrolled;
+}
+
+static void layersel_destroy(pcb_gtk_common_t *com, pcb_gtk_layersel_t *ls)
+{
+	pcb_layergrp_id_t gid;
+
+	for(gid = 0; gid < pcb_max_group(PCB); gid++)
+		free(ls->grp[gid].layer);
+
+	free(ls->lsg_virt.layer);
+
+	memset(&ls->grp, 0, sizeof(ls->grp));
+	memset(&ls->lsg_virt, 0, sizeof(ls->lsg_virt));
+
+	gtk_widget_destroy(ls->grp_box);
+	ls->grp_box = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(ls->grp_box_outer), ls->grp_box, FALSE, FALSE, 0);
+}
+
+void pcb_gtk_layersel_update(pcb_gtk_common_t *com, pcb_gtk_layersel_t *ls)
+{
+	layersel_destroy(com, ls);
+	layersel_populate(ls);
+	gtk_widget_show_all(ls->grp_box);
+}
+
+void pcb_gtk_layersel_vis_update(pcb_gtk_layersel_t *ls)
+{
+	pcb_layergrp_id_t gid;
+
+	ls->no_copper_sel = PCB->RatDraw; /* someone may have turned RatDraw on - turn off selecting copper */
+
+	for(gid = 0; gid < pcb_max_group(PCB); gid++)
+		if (ls->grp[gid].grp != NULL)
+			group_vis_sync(&ls->grp[gid]);
+
+	group_vis_sync(&ls->lsg_virt);
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_layersel.h	(revision 18980)
@@ -0,0 +1,53 @@
+#ifndef PCB_GTK_LAYERSEL_H
+#define PCB_GTK_LAYERSEL_H
+
+#include <gtk/gtk.h>
+#include "layer.h"
+#include "layer_grp.h"
+#include "glue.h"
+
+typedef struct pcb_gtk_layersel_s pcb_gtk_layersel_t;
+typedef struct pcb_gtk_ls_grp_s pcb_gtk_ls_grp_t;
+typedef struct pcb_gtk_ls_lyr_s pcb_gtk_ls_lyr_t;
+
+struct pcb_gtk_ls_lyr_s {
+	GtkWidget *box, *vis_on, *vis_off, *name_box;
+
+	int (*ev_vis)(pcb_gtk_ls_lyr_t *lsl, int toggle, int *is_on); /* called first in click handler with toggle=1, if returns non-zero, normal visibility update is supressed; also called from layer draw, with toggle=0 */
+	int (*ev_selected)(pcb_gtk_ls_lyr_t *lsl, int do_select);     /* called first in click handler with do_select=1, if returns -1, layer can not be selected; when called with do_select=0, return current selection */
+
+	pcb_layer_id_t lid;
+	char * const*force_color;
+
+	int vis_ui_idx, virt_idx;
+
+	/* for callbacks */
+	pcb_gtk_ls_grp_t *lsg;  /* points to parent */
+};
+
+struct pcb_gtk_ls_grp_s {
+	GtkWidget *grp_row, *grp_closed, *grp_open, *layers, *vis_on, *vis_off;
+
+	pcb_layergrp_t *grp;
+	pcb_gtk_ls_lyr_t *layer;
+
+	/* for callbacks */
+	pcb_gtk_layersel_t *ls;  /* points to parent */
+};
+
+
+struct pcb_gtk_layersel_s {
+	pcb_gtk_common_t *com;
+	GtkWidget *grp_box, *grp_box_outer;
+	pcb_gtk_ls_grp_t grp[PCB_MAX_LAYERGRP];
+	pcb_gtk_ls_grp_t lsg_virt, lsg_ui;
+	pcb_layergrp_t grp_virt, grp_ui;
+	unsigned running:1;
+	unsigned no_copper_sel:1;
+};
+
+GtkWidget *pcb_gtk_layersel_build(pcb_gtk_common_t *com, pcb_gtk_layersel_t *ls);
+void pcb_gtk_layersel_update(pcb_gtk_common_t *com, pcb_gtk_layersel_t *ls);
+void pcb_gtk_layersel_vis_update(pcb_gtk_layersel_t *ls);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.c	(revision 18980)
@@ -0,0 +1,552 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file copied and modified by Peter Clifton, starting from
+ * gui-pinout-window.c, written by Bill Wilson for the PCB Gtk port
+ * then got a major refactoring by Tibor 'Igor2' Palinkas and Alain in pcb-rnd
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include "in_mouse.h"
+#include "compat.h"
+#include "wt_preview.h"
+
+#include "copy.h"
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "move.h"
+#include "rotate.h"
+#include "macro.h"
+
+static void get_ptr(pcb_gtk_preview_t *preview, pcb_coord_t *cx, pcb_coord_t *cy, gint *xp, gint *yp);
+
+static void preview_set_view(pcb_gtk_preview_t * preview)
+{
+	float scale = 100.0 / PCB_MIL_TO_COORD (150.); /* arbitrary zoom factor: 100 pixel per 150 mil */
+	double bigger;
+	int max_pixels = 1024;
+
+#warning switch for .kind here and do a zoom-to-extend on layer
+
+	preview->x_min = preview->obj->BoundingBox.X1;
+	preview->y_min = preview->obj->BoundingBox.Y1;
+	preview->x_max = preview->obj->BoundingBox.X2 + conf_core.appearance.pinout.offset_x;
+	preview->y_max = preview->obj->BoundingBox.Y2 + conf_core.appearance.pinout.offset_y;
+	preview->w_pixels = scale * (double)(preview->x_max - preview->x_min);
+	preview->h_pixels = scale * (double)(preview->y_max - preview->y_min);
+
+	bigger = preview->w_pixels > preview->h_pixels ? preview->w_pixels : preview->h_pixels;
+	if (bigger > max_pixels) {
+		double fix = bigger / max_pixels;
+		preview->w_pixels /= fix;
+		preview->h_pixels /= fix;
+	}
+}
+
+static void preview_set_data(pcb_gtk_preview_t *preview, pcb_any_obj_t *obj)
+{
+	preview->obj = obj;
+	if (obj == NULL) {
+		preview->w_pixels = 0;
+		preview->h_pixels = 0;
+		return;
+	}
+
+	preview_set_view(preview);
+}
+
+enum {
+	PROP_ELEMENT_DATA = 1,
+	PROP_GPORT = 2,
+	PROP_INIT_WIDGET = 3,
+	PROP_EXPOSE = 4,
+	PROP_KIND = 5,
+	PROP_LAYER = 6,
+	PROP_COM = 7,
+	PROP_DIALOG_DRAW = 8  /* for PCB_LYT_DIALOG */
+};
+
+static GObjectClass *ghid_preview_parent_class = NULL;
+
+/* Initialises the preview object once it is constructed. Chains up in case
+   the parent class wants to do anything too. object is the preview object. */
+static void ghid_preview_constructed(GObject * object)
+{
+	if (G_OBJECT_CLASS(ghid_preview_parent_class)->constructed != NULL)
+		G_OBJECT_CLASS(ghid_preview_parent_class)->constructed(object);
+}
+
+/* Just before the pcb_gtk_preview_t GObject is finalized, free our
+   allocated data, and then chain up to the parent's finalize handler. */
+static void ghid_preview_finalize(GObject * object)
+{
+	pcb_gtk_preview_t *preview = PCB_GTK_PREVIEW(object);
+
+	/* Passing NULL for subcircuit data will clear the preview */
+	preview_set_data(preview, NULL);
+
+	G_OBJECT_CLASS(ghid_preview_parent_class)->finalize(object);
+}
+
+static void ghid_preview_set_property(GObject * object, guint property_id, const GValue * value, GParamSpec * pspec)
+{
+	pcb_gtk_preview_t *preview = PCB_GTK_PREVIEW(object);
+	GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(preview));
+
+	switch (property_id) {
+	case PROP_ELEMENT_DATA:
+		preview->kind = PCB_GTK_PREVIEW_PINOUT;
+		preview_set_data(preview, (pcb_any_obj_t *)g_value_get_pointer(value));
+		preview->expose_data.content.obj = preview->obj;
+		if (window != NULL)
+			gdk_window_invalidate_rect(window, NULL, FALSE);
+		break;
+	case PROP_GPORT:
+		preview->gport = (void *) g_value_get_pointer(value);
+		break;
+	case PROP_COM:
+		preview->com = (void *) g_value_get_pointer(value);
+		break;
+	case PROP_INIT_WIDGET:
+		preview->init_drawing_widget = (void *) g_value_get_pointer(value);
+		break;
+	case PROP_EXPOSE:
+		preview->expose = (void *) g_value_get_pointer(value);
+		break;
+	case PROP_KIND:
+		preview->kind = g_value_get_int(value);
+		break;
+	case PROP_LAYER:
+		preview->kind = PCB_GTK_PREVIEW_LAYER;
+		preview->expose_data.content.layer_id = g_value_get_long(value);
+		if (window != NULL)
+			gdk_window_invalidate_rect(window, NULL, FALSE);
+		break;
+	case PROP_DIALOG_DRAW:
+		preview->expose_data.dialog_draw = (void *) g_value_get_pointer(value);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+	}
+}
+
+static void ghid_preview_get_property(GObject * object, guint property_id, GValue * value, GParamSpec * pspec)
+{
+	switch (property_id) {
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+	}
+}
+
+/* Converter: set up a pinout expose and use the generic preview expose call */
+static gboolean ghid_preview_expose(GtkWidget * widget, pcb_gtk_expose_t * ev)
+{
+	pcb_gtk_preview_t *preview = PCB_GTK_PREVIEW(widget);
+
+	switch (preview->kind) {
+	case PCB_GTK_PREVIEW_PINOUT:
+		preview->expose_data.view.X1 = preview->x_min;
+		preview->expose_data.view.Y1 = preview->y_min;
+		preview->expose_data.view.X2 = preview->x_max;
+		preview->expose_data.view.Y2 = preview->y_max;
+		return preview->expose(widget, ev, pcb_hid_expose_pinout, &preview->expose_data);
+
+	case PCB_GTK_PREVIEW_LAYER:
+		return preview->expose(widget, ev, pcb_hid_expose_layer, &preview->expose_data);
+
+	case PCB_GTK_PREVIEW_BOARD:
+		return preview->expose(widget, ev, pcb_hid_expose_all, &preview->expose_data);
+
+	case PCB_GTK_PREVIEW_INVALID:
+	case PCB_GTK_PREVIEW_kind_max:
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+/* Override parent virtual class methods as needed and register GObject properties. */
+static void ghid_preview_class_init(pcb_gtk_preview_class_t * klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+	GtkWidgetClass *gtk_widget_class = GTK_WIDGET_CLASS(klass);
+
+	gobject_class->finalize = ghid_preview_finalize;
+	gobject_class->set_property = ghid_preview_set_property;
+	gobject_class->get_property = ghid_preview_get_property;
+	gobject_class->constructed = ghid_preview_constructed;
+
+	PCB_GTK_EXPOSE_EVENT_SET(gtk_widget_class, ghid_preview_expose);
+
+	ghid_preview_parent_class = (GObjectClass *) g_type_class_peek_parent(klass);
+
+	g_object_class_install_property(gobject_class, PROP_ELEMENT_DATA,
+																	g_param_spec_pointer("element-data", "", "", G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_GPORT, g_param_spec_pointer("gport", "", "", G_PARAM_WRITABLE));
+	g_object_class_install_property(gobject_class, PROP_COM, g_param_spec_pointer("com", "", "", G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_INIT_WIDGET,
+																	g_param_spec_pointer("init-widget", "", "", G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_EXPOSE, g_param_spec_pointer("expose", "", "", G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_KIND,
+																	g_param_spec_int("kind", "", "", 0, PCB_GTK_PREVIEW_kind_max - 1, 0, G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_LAYER,
+																	g_param_spec_long("layer", "", "", -(1UL << 31), (1UL << 31) - 1, -1, G_PARAM_WRITABLE));
+
+	g_object_class_install_property(gobject_class, PROP_DIALOG_DRAW, g_param_spec_pointer("dialog_draw", "", "", G_PARAM_WRITABLE));
+}
+
+static void update_expose_data(pcb_gtk_preview_t * prv)
+{
+	pcb_gtk_zoom_post(&prv->view);
+	prv->expose_data.view.X1 = prv->view.x0;
+	prv->expose_data.view.Y1 = prv->view.y0;
+	prv->expose_data.view.X2 = prv->view.x0 + prv->view.width;
+	prv->expose_data.view.Y2 = prv->view.y0 + prv->view.height;
+
+/*	pcb_printf("EXPOSE_DATA: %$mm %$mm - %$mm %$mm (%f %$mm)\n",
+		prv->expose_data.view.X1, prv->expose_data.view.Y1,
+		prv->expose_data.view.X2, prv->expose_data.view.Y2,
+		prv->view.coord_per_px, prv->view.x0);*/
+}
+
+static gboolean preview_configure_event_cb(GtkWidget * w, GdkEventConfigure * ev, void *tmp)
+{
+	pcb_gtk_preview_t *preview = (pcb_gtk_preview_t *) w;
+	preview->win_w = ev->width;
+	preview->win_h = ev->height;
+
+	preview->view.canvas_width = ev->width;
+	preview->view.canvas_height = ev->height;
+
+	update_expose_data(preview);
+	return TRUE;
+}
+
+
+static gboolean button_press(GtkWidget * w, pcb_hid_cfg_mod_t btn)
+{
+	pcb_gtk_preview_t *preview = (pcb_gtk_preview_t *) w;
+	pcb_coord_t cx, cy;
+	gint wx, wy;
+	get_ptr(preview, &cx, &cy, &wx, &wy);
+
+	switch (btn) {
+	case PCB_MB_LEFT:
+		if (preview->mouse_cb != NULL) {
+/*				pcb_printf("bp %mm %mm\n", cx, cy); */
+			if (preview->mouse_cb(w, PCB_HID_MOUSE_PRESS, cx, cy))
+				gtk_widget_queue_draw(w);
+		}
+		break;
+	case PCB_MB_MIDDLE:
+		preview->view.panning = 1;
+		preview->grabx = cx;
+		preview->graby = cy;
+		preview->grabt = time(NULL);
+		preview->grabmot = 0;
+		break;
+	case PCB_MB_SCROLL_UP:
+		pcb_gtk_zoom_view_rel(&preview->view, 0, 0, 0.8);
+		goto do_zoom;
+	case PCB_MB_SCROLL_DOWN:
+		pcb_gtk_zoom_view_rel(&preview->view, 0, 0, 1.25);
+		goto do_zoom;
+	default:
+		return FALSE;
+	}
+	return FALSE;
+
+do_zoom:;
+	preview->view.x0 = cx - (preview->view.canvas_width / 2) * preview->view.coord_per_px;
+	preview->view.y0 = cy - (preview->view.canvas_height / 2) * preview->view.coord_per_px;
+	update_expose_data(preview);
+	gtk_widget_queue_draw(w);
+
+	return FALSE;
+}
+
+static gboolean preview_button_press_cb(GtkWidget * w, GdkEventButton * ev, gpointer data)
+{
+	return button_press(w, ghid_mouse_button(ev->button));
+}
+
+static gboolean preview_scroll_cb(GtkWidget * w, GdkEventScroll * ev, gpointer data)
+{
+	switch (ev->direction) {
+	case GDK_SCROLL_UP:
+		return button_press(w, PCB_MB_SCROLL_UP);
+	case GDK_SCROLL_DOWN:
+		return button_press(w, PCB_MB_SCROLL_DOWN);
+	default:;
+	}
+	return FALSE;
+}
+
+static gboolean preview_button_release_cb(GtkWidget * w, GdkEventButton * ev, gpointer data)
+{
+	pcb_gtk_preview_t *preview = (pcb_gtk_preview_t *) w;
+	gint wx, wy;
+	pcb_coord_t cx, cy;
+
+	get_ptr(preview, &cx, &cy, &wx, &wy);
+
+	switch (ghid_mouse_button(ev->button)) {
+	case PCB_MB_MIDDLE:
+		preview->view.panning = 0;
+		if (((time(NULL) - preview->grabt) < 2) && (preview->grabmot < 4))
+			if ((preview->mouse_cb != NULL) && (preview->mouse_cb(w, PCB_HID_MOUSE_POPUP, cx, cy)))
+				gtk_widget_queue_draw(w);
+		break;
+	case PCB_MB_LEFT:
+		if (preview->mouse_cb != NULL) {
+/*				pcb_printf("br %mm %mm\n", cx, cy); */
+			if (preview->mouse_cb(w, PCB_HID_MOUSE_RELEASE, cx, cy))
+				gtk_widget_queue_draw(w);
+		}
+		break;
+	default:;
+	}
+	return FALSE;
+}
+
+static gboolean preview_motion_cb(GtkWidget * w, GdkEventMotion * ev, gpointer data)
+{
+	pcb_gtk_preview_t *preview = (pcb_gtk_preview_t *) w;
+	pcb_coord_t cx, cy;
+	gint wx, wy;
+	get_ptr(preview, &cx, &cy, &wx, &wy);
+
+	if (preview->view.panning) {
+		preview->grabmot++;
+		preview->view.x0 = preview->grabx - wx * preview->view.coord_per_px;
+		preview->view.y0 = preview->graby - wy * preview->view.coord_per_px;
+		update_expose_data(preview);
+		gtk_widget_queue_draw(w);
+		return FALSE;
+	}
+
+	if (preview->mouse_cb != NULL) {
+		preview->mouse_cb(w, PCB_HID_MOUSE_MOTION, cx, cy);
+		gtk_widget_queue_draw(w);
+	}
+	return FALSE;
+}
+
+/*
+static gboolean preview_key_press_cb(GtkWidget *preview, GdkEventKey * kev, gpointer data)
+{
+	printf("kp\n");
+}
+
+static gboolean preview_key_release_cb(GtkWidget *preview, GdkEventKey * kev, gpointer data)
+{
+	printf("kr\n");
+}
+*/
+
+/* API */
+
+GType pcb_gtk_preview_get_type()
+{
+	static GType ghid_preview_type = 0;
+
+	if (!ghid_preview_type) {
+		static const GTypeInfo ghid_preview_info = {
+			sizeof(pcb_gtk_preview_class_t),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) ghid_preview_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(pcb_gtk_preview_t),
+			0,												/* n_preallocs */
+			NULL,											/* instance_init */
+		};
+
+		ghid_preview_type =
+			g_type_register_static(GTK_TYPE_DRAWING_AREA, "pcb_gtk_preview_t", &ghid_preview_info, (GTypeFlags) 0);
+	}
+
+	return ghid_preview_type;
+}
+
+GtkWidget *pcb_gtk_preview_new(pcb_gtk_common_t * com, pcb_gtk_init_drawing_widget_t init_widget,
+															 pcb_gtk_preview_expose_t expose, pcb_hid_dialog_draw_t dialog_draw)
+{
+	pcb_gtk_preview_t *preview;
+
+	preview = (pcb_gtk_preview_t *) g_object_new(PCB_GTK_TYPE_PREVIEW,
+																							 "com", com,
+																							 "gport", com->gport,
+																							 "init-widget", init_widget,
+																							 "kind", PCB_GTK_PREVIEW_PINOUT,	/* May change in the future */
+																							 "expose", expose,
+																							 "dialog_draw", dialog_draw,
+																							 NULL);
+
+	preview->init_drawing_widget(GTK_WIDGET(preview), preview->gport);
+
+	return GTK_WIDGET(preview);
+}
+
+GtkWidget *pcb_gtk_preview_pinout_new(pcb_gtk_common_t * com, pcb_gtk_init_drawing_widget_t init_widget,
+																			pcb_gtk_preview_expose_t expose, pcb_any_obj_t *obj)
+{
+	pcb_gtk_preview_t *preview;
+
+	preview = (pcb_gtk_preview_t *) pcb_gtk_preview_new(com, init_widget, expose, NULL);
+	g_object_set(G_OBJECT(preview), "element-data", obj, NULL);
+
+	return GTK_WIDGET(preview);
+}
+
+static GtkWidget *pcb_gtk_preview_generic_new(pcb_gtk_common_t * com, pcb_gtk_init_drawing_widget_t init_widget,
+																		 pcb_gtk_preview_expose_t expose, pcb_layer_id_t layer, pcb_hid_dialog_draw_t dialog_draw)
+{
+	pcb_gtk_preview_t *prv;
+
+	prv = (pcb_gtk_preview_t *) pcb_gtk_preview_new(com, init_widget, expose, dialog_draw);
+	g_object_set(G_OBJECT(prv), "layer", layer, "width-request", 50, "height-request", 50, NULL);
+
+#warning TODO: maybe expose these through the object API so the caller can set it up?
+	memset(&prv->view, 0, sizeof(prv->view));
+	prv->view.width = PCB_MM_TO_COORD(110);
+	prv->view.height = PCB_MM_TO_COORD(110);
+	prv->view.coord_per_px = PCB_MM_TO_COORD(0.25);
+	prv->view.com = com;
+
+	update_expose_data(prv);
+
+	prv->expose_data.force = 1;
+	prv->init_drawing_widget(GTK_WIDGET(prv), prv->gport);
+
+	gtk_widget_add_events(GTK_WIDGET(prv), GDK_EXPOSURE_MASK | GDK_SCROLL_MASK
+												| GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_BUTTON_RELEASE_MASK
+												| GDK_BUTTON_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_KEY_PRESS_MASK
+												| GDK_FOCUS_CHANGE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+
+	g_signal_connect(G_OBJECT(prv), "button_press_event", G_CALLBACK(preview_button_press_cb), NULL);
+	g_signal_connect(G_OBJECT(prv), "button_release_event", G_CALLBACK(preview_button_release_cb), NULL);
+	g_signal_connect(G_OBJECT(prv), "scroll_event", G_CALLBACK(preview_scroll_cb), NULL);
+	g_signal_connect(G_OBJECT(prv), "configure_event", G_CALLBACK(preview_configure_event_cb), NULL);
+	g_signal_connect(G_OBJECT(prv), "motion_notify_event", G_CALLBACK(preview_motion_cb), NULL);
+
+/*
+	g_signal_connect(G_OBJECT(prv), "key_press_event", G_CALLBACK(preview_key_press_cb), NULL);
+	g_signal_connect(G_OBJECT(prv), "key_release_event", G_CALLBACK(preview_key_release_cb), NULL);
+*/
+
+	return GTK_WIDGET(prv);
+}
+
+GtkWidget *pcb_gtk_preview_layer_new(pcb_gtk_common_t *com, pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose, pcb_layer_id_t layer)
+{
+	return pcb_gtk_preview_generic_new(com, init_widget, expose, layer, NULL);
+}
+
+GtkWidget *pcb_gtk_preview_board_new(pcb_gtk_common_t *com, pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose)
+{
+	GtkWidget *w = pcb_gtk_preview_generic_new(com, init_widget, expose, -1, NULL);
+	pcb_gtk_preview_t *p = (pcb_gtk_preview_t *)w;
+	g_object_set(G_OBJECT(w), "kind", PCB_GTK_PREVIEW_BOARD, NULL);
+	p->view.height = PCB->MaxHeight;
+	p->view.width = PCB->MaxWidth;
+	return w;
+}
+
+void pcb_gtk_preview_board_zoomto(pcb_gtk_preview_t *p, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int canvas_width, int canvas_height)
+{
+	pcb_coord_t tmp;
+
+	/* just in case the size has changed meanwhile */
+	p->view.height = PCB->MaxHeight;
+	p->view.width = PCB->MaxWidth;
+	p->view.canvas_width = canvas_width;
+	p->view.canvas_height = canvas_height;
+
+	x1 = SIDE_X(x1);
+	y1 = SIDE_Y(y1);
+	x2 = SIDE_X(x2);
+	y2 = SIDE_Y(y2);
+
+	if (x1 > x2) {
+		tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+
+	if (y1 > y2) {
+		tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+
+	pcb_gtk_zoom_view_win(&p->view, x1, y1, x2, y2);
+}
+
+
+GtkWidget *pcb_gtk_preview_dialog_new(pcb_gtk_common_t *com, pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose, pcb_hid_dialog_draw_t dialog_draw)
+{
+	pcb_layer_id_t lid;
+	if (pcb_layer_list(PCB, PCB_LYT_DIALOG, &lid, 1) > 0)
+		return pcb_gtk_preview_generic_new(com, init_widget, expose, lid, dialog_draw);
+	else
+		return NULL;
+}
+
+void pcb_gtk_preview_get_natsize(pcb_gtk_preview_t * preview, int *width, int *height)
+{
+	*width = preview->w_pixels;
+	*height = preview->h_pixels;
+}
+
+/* Has to be at the end since it undef's SIDE_X */
+static void get_ptr(pcb_gtk_preview_t *preview, pcb_coord_t *cx, pcb_coord_t *cy, gint *xp, gint *yp)
+{
+	gdkc_window_get_pointer(GTK_WIDGET(preview), xp, yp, NULL);
+#undef SIDE_X
+#undef SIDE_Y
+#define SIDE_X(x) x
+#define SIDE_Y(y) y
+	*cx = EVENT_TO_PCB_X(&preview->view, *xp);
+	*cy = EVENT_TO_PCB_Y(&preview->view, *yp);
+#undef SIDE_X
+#undef SIDE_Y
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_preview.h	(revision 18980)
@@ -0,0 +1,120 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *  pcb-rnd Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* This file was originally written by Peter Clifton
+   then got a major refactoring by Tibor 'Igor2' Palinkas and Alain in pcb-rnd
+*/
+
+#ifndef PCB_GTK_WT_REVIEW_H
+#define PCB_GTK_WT_REVIEW_H
+
+#include <gtk/gtk.h>
+#include "hid.h"
+#include "layer.h"
+#include "ui_zoompan.h"
+#include "glue.h"
+#include "compat.h"
+
+#define PCB_GTK_TYPE_PREVIEW           (pcb_gtk_preview_get_type())
+#define PCB_GTK_PREVIEW(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), PCB_GTK_TYPE_PREVIEW, pcb_gtk_preview_t))
+#define PCB_GTK_PREVIEW_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass),  PCB_GTK_TYPE_PREVIEW, pcb_gtk_preview_class_t))
+#define PCB_GTK_IS_PREVIEW(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PCB_GTK_TYPE_PREVIEW))
+#define PCB_GTK_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),  PCB_GTK_TYPE_PREVIEW, pcb_gtk_preview_class_t))
+
+typedef struct pcb_gtk_preview_class_s pcb_gtk_preview_class_t;
+typedef struct pcb_gtk_preview_s pcb_gtk_preview_t;
+
+struct pcb_gtk_preview_class_s {
+	GtkDrawingAreaClass parent_class;
+};
+
+typedef void (*pcb_gtk_init_drawing_widget_t)(GtkWidget * widget, void *port);
+typedef gboolean(*pcb_gtk_preview_expose_t)(GtkWidget * widget, pcb_gtk_expose_t * ev, pcb_hid_expose_t expcall, pcb_hid_expose_ctx_t * ctx);
+typedef pcb_bool(*pcb_gtk_preview_mouse_ev_t)(void *widget, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y);
+
+typedef enum pcb_gtk_preview_kind_e {
+	PCB_GTK_PREVIEW_INVALID,
+	PCB_GTK_PREVIEW_PINOUT, /* single subcircuit */
+	PCB_GTK_PREVIEW_LAYER,  /* specific (oftne virtual) layer */
+	PCB_GTK_PREVIEW_BOARD,  /* render the board (whole layer stack) */
+
+	PCB_GTK_PREVIEW_kind_max
+} pcb_gtk_preview_kind_t;
+
+struct pcb_gtk_preview_s {
+	GtkDrawingArea parent_instance;
+
+	pcb_hid_expose_ctx_t expose_data;
+	pcb_gtk_view_t view;
+
+	pcb_coord_t x_min, y_min, x_max, y_max;   /* for the obj preview: bounding box */
+	gint w_pixels, h_pixels;                  /* natural size of object preview */
+	gint win_w, win_h;
+
+	void *gport;
+	pcb_gtk_init_drawing_widget_t init_drawing_widget;
+	pcb_gtk_preview_expose_t expose;
+	pcb_gtk_preview_kind_t kind;
+	pcb_gtk_preview_mouse_ev_t mouse_cb;
+	pcb_hid_expose_t overlay_draw_cb;
+	pcb_coord_t grabx, graby;
+	time_t grabt;
+	long grabmot;
+
+	pcb_any_obj_t *obj; /* object being displayed in the preview */
+
+	pcb_gtk_common_t *com;
+};
+
+GType pcb_gtk_preview_get_type(void);
+
+/* Queries the natural size of a preview widget */
+void pcb_gtk_preview_get_natsize(pcb_gtk_preview_t * preview, int *width, int *height);
+
+/* Generic, callback based API */
+GtkWidget *pcb_gtk_preview_new(pcb_gtk_common_t * com,
+															 pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose, pcb_hid_dialog_draw_t dialog_draw);
+
+/* Application-specific shorthands */
+GtkWidget *pcb_gtk_preview_pinout_new(pcb_gtk_common_t * com,
+																			pcb_gtk_init_drawing_widget_t init_widget,
+																			pcb_gtk_preview_expose_t expose, pcb_any_obj_t *obj);
+
+GtkWidget *pcb_gtk_preview_layer_new(pcb_gtk_common_t * com,
+																		 pcb_gtk_init_drawing_widget_t init_widget,
+																		 pcb_gtk_preview_expose_t expose, pcb_layer_id_t layer);
+
+GtkWidget *pcb_gtk_preview_board_new(pcb_gtk_common_t *com, pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose);
+
+void pcb_gtk_preview_board_zoomto(pcb_gtk_preview_t *p, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, int canvas_width, int canvas_height);
+
+GtkWidget *pcb_gtk_preview_dialog_new(pcb_gtk_common_t *com, pcb_gtk_init_drawing_widget_t init_widget, pcb_gtk_preview_expose_t expose, pcb_hid_dialog_draw_t dialog_draw);
+
+#endif /* PCB_GTK_WT_REVIEW_H */
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.c	(revision 18980)
@@ -0,0 +1,366 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Alain Vigne
+ *
+ *  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 2 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 <http://www.gnu.org/licenses/>.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Implementation of pcb_gtk_route_style_t widget. Opens a dialog upon "Edit" */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#include "dlg_route_style.h"
+
+#include "pcb-printf.h"
+#include "board.h"
+#include "compat_nls.h"
+
+#include "bu_status_line.h"
+
+
+static gint action_count;
+
+static GtkVBox *pcb_gtk_route_style_parent_class;
+guint pcb_gtk_route_style_signals_id[STYLE_LAST_SIGNAL] = { 0 };
+
+
+#warning TODO: this should be in core
+void pcb_gtk_route_style_copy(int idx)
+{
+	pcb_route_style_t *drst;
+
+	if ((idx < 0) || (idx >= vtroutestyle_len(&PCB->RouteStyle)))
+		return;
+	drst = PCB->RouteStyle.array + idx;
+	pcb_custom_route_style.Thick = drst->Thick;
+	pcb_custom_route_style.Clearance = drst->Clearance;
+	pcb_custom_route_style.Diameter = drst->Diameter;
+	pcb_custom_route_style.Hole = drst->Hole;
+}
+
+/* Opens the Edit dialog */
+static void edit_button_cb(GtkButton * btn, gpointer rss_)
+{
+	pcb_gtk_route_style_t *rss = rss_;
+	pcb_gtk_route_style_edit_dialog(rss->com, rss);
+}
+
+/* user selection of a route style */
+static void radio_select_cb(GtkToggleAction * action, gpointer data)
+{
+	pcb_gtk_route_style_t *rss = (pcb_gtk_route_style_t *) data;
+
+	rss->active_style = g_object_get_data(G_OBJECT(action), "route-style");
+	if (gtk_toggle_action_get_active(action))
+		g_signal_emit(rss, pcb_gtk_route_style_signals_id[SELECT_STYLE_SIGNAL], 0, rss->active_style->rst);
+}
+
+/* CONSTRUCTOR */
+static void ghid_route_style_init(pcb_gtk_route_style_t * rss)
+{
+}
+
+/* Clean up object before garbage collection */
+static void ghid_route_style_finalize(GObject * object)
+{
+	pcb_gtk_route_style_t *rss = (pcb_gtk_route_style_t *) object;
+
+	pcb_gtk_route_style_empty(rss);
+
+	g_object_unref(rss->accel_group);
+	g_object_unref(rss->action_group);
+
+	G_OBJECT_CLASS(pcb_gtk_route_style_parent_class)->finalize(object);
+}
+
+static void ghid_route_style_class_init(pcb_gtk_route_style_class_t * klass)
+{
+	GObjectClass *object_class = (GObjectClass *) klass;
+
+	pcb_gtk_route_style_parent_class = g_type_class_peek_parent(klass);
+
+	pcb_gtk_route_style_signals_id[SELECT_STYLE_SIGNAL] =
+		g_signal_new("select-style",
+								 G_TYPE_FROM_CLASS(klass),
+								 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+								 G_STRUCT_OFFSET(pcb_gtk_route_style_class_t, select_style),
+								 NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+	pcb_gtk_route_style_signals_id[STYLE_EDITED_SIGNAL] =
+		g_signal_new("style-edited",
+								 G_TYPE_FROM_CLASS(klass),
+								 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+								 G_STRUCT_OFFSET(pcb_gtk_route_style_class_t, style_edited),
+								 NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+	object_class->finalize = ghid_route_style_finalize;
+}
+
+
+/* PUBLIC FUNCTIONS */
+
+GType pcb_gtk_route_style_get_type(void)
+{
+	static GType rss_type = 0;
+
+	if (!rss_type) {
+		const GTypeInfo rss_info = {
+			sizeof(pcb_gtk_route_style_class_t),
+			NULL,											/* base_init */
+			NULL,											/* base_finalize */
+			(GClassInitFunc) ghid_route_style_class_init,
+			NULL,											/* class_finalize */
+			NULL,											/* class_data */
+			sizeof(pcb_gtk_route_style_t),
+			0,												/* n_preallocs */
+			(GInstanceInitFunc) ghid_route_style_init,
+		};
+
+		rss_type = g_type_register_static(GTK_TYPE_VBOX, "pcb_gtk_route_style_t", &rss_info, 0);
+	}
+
+	return rss_type;
+}
+
+GtkWidget *pcb_gtk_route_style_new(pcb_gtk_common_t *com)
+{
+	pcb_gtk_route_style_t *rss = g_object_new(GHID_ROUTE_STYLE_TYPE, NULL);
+
+	rss->com = com;
+	rss->active_style = NULL;
+	rss->action_radio_group = NULL;
+	rss->button_radio_group = NULL;
+	rss->model = gtk_list_store_new(STYLE_N_COLS, G_TYPE_STRING, G_TYPE_POINTER);
+
+	rss->accel_group = gtk_accel_group_new();
+	rss->action_group = gtk_action_group_new("RouteStyleSelector");
+
+	/* Create edit button */
+	rss->edit_button = gtk_button_new_with_label(_("Route Styles"));
+	g_signal_connect(G_OBJECT(rss->edit_button), "clicked", G_CALLBACK(edit_button_cb), rss);
+	gtk_box_pack_start(GTK_BOX(rss), rss->edit_button, FALSE, FALSE, 0);
+
+	return GTK_WIDGET(rss);
+}
+
+pcb_gtk_obj_route_style_t *pcb_gtk_route_style_add_route_style(pcb_gtk_route_style_t * rss, pcb_route_style_t * data, int hide)
+{
+	GtkTreeIter iter;
+	GtkTreePath *path;
+	gchar *action_name = g_strdup_printf("RouteStyle%d", action_count);
+	pcb_gtk_obj_route_style_t *new_style = g_malloc(sizeof(*new_style));
+
+	/* Key the route style data with the pcb_route_style_t it controls */
+	new_style->hidden = hide;
+	new_style->rst = data;
+	new_style->action = gtk_radio_action_new(action_name, data->name, NULL, NULL, action_count);
+	gtk_radio_action_set_group(new_style->action, rss->action_radio_group);
+	rss->action_radio_group = gtk_radio_action_get_group(new_style->action);
+	new_style->button = gtk_radio_button_new(rss->button_radio_group);
+	rss->button_radio_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(new_style->button));
+	gtk_activatable_set_related_action(GTK_ACTIVATABLE(new_style->button), GTK_ACTION(new_style->action));
+
+	gtk_list_store_append(rss->model, &iter);
+	gtk_list_store_set(rss->model, &iter, STYLE_TEXT_COL, data->name, STYLE_DATA_COL, new_style, -1);
+	path = gtk_tree_model_get_path(GTK_TREE_MODEL(rss->model), &iter);
+	new_style->rref = gtk_tree_row_reference_new(GTK_TREE_MODEL(rss->model), path);
+	gtk_tree_path_free(path);
+
+	/* Setup accelerator */
+	if (action_count < 12) {
+		gchar *accel = g_strdup_printf("<Ctrl>F%d", action_count + 1);
+		gtk_action_set_accel_group(GTK_ACTION(new_style->action), rss->accel_group);
+		gtk_action_group_add_action_with_accel(rss->action_group, GTK_ACTION(new_style->action), accel);
+		g_free(accel);
+	}
+
+	/* Hookup and install radio button */
+	g_object_set_data(G_OBJECT(new_style->action), "route-style", new_style);
+	new_style->sig_id = g_signal_connect(G_OBJECT(new_style->action), "activate", G_CALLBACK(radio_select_cb), rss);
+	gtk_box_pack_start(GTK_BOX(rss), new_style->button, FALSE, FALSE, 0);
+
+	g_free(action_name);
+	++action_count;
+
+	if (hide)
+		gtk_widget_hide(new_style->button);
+
+	return new_style;
+}
+
+/* Adds a PCB route style to the widget. The route style object passed
+   will be updated directly. */
+static void add_route_style_with_hidden_check(pcb_gtk_route_style_t * rss, pcb_route_style_t * data)
+{
+	if (!rss->hidden_button) {
+		if (*pcb_custom_route_style.name == '\0') {
+			memset(&pcb_custom_route_style, 0, sizeof(pcb_custom_route_style));
+			strcpy(pcb_custom_route_style.name, "<custom>");
+			pcb_gtk_route_style_copy(0);
+		}
+		pcb_gtk_route_style_add_route_style(rss, &pcb_custom_route_style, 1);
+		rss->hidden_button = 1;
+	}
+	if (data != NULL)
+		pcb_gtk_route_style_add_route_style(rss, data, 0);
+}
+
+gboolean pcb_gtk_route_style_select_style(pcb_gtk_route_style_t * rss, pcb_route_style_t * rst)
+{
+	GtkTreeIter iter;
+	gtk_tree_model_get_iter_first(GTK_TREE_MODEL(rss->model), &iter);
+
+	do {
+		pcb_gtk_obj_route_style_t *style;
+
+		gtk_tree_model_get(GTK_TREE_MODEL(rss->model), &iter, STYLE_DATA_COL, &style, -1);
+		if ((style != NULL) && (style->rst == rst)) {
+			g_signal_handler_block(G_OBJECT(style->action), style->sig_id);
+			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(style->action), TRUE);
+			g_signal_handler_unblock(G_OBJECT(style->action), style->sig_id);
+			rss->active_style = style;
+			g_signal_emit(rss, pcb_gtk_route_style_signals_id[SELECT_STYLE_SIGNAL], 0, rss->active_style->rst);
+			return TRUE;
+		}
+	}
+	while (gtk_tree_model_iter_next(GTK_TREE_MODEL(rss->model), &iter));
+
+	return FALSE;
+}
+
+GtkAccelGroup *pcb_gtk_route_style_get_accel_group(pcb_gtk_route_style_t * rss)
+{
+	return rss->accel_group;
+}
+
+void pcb_gtk_route_style_sync(pcb_gtk_route_style_t * rss,
+															pcb_coord_t Thick, pcb_coord_t Hole, pcb_coord_t Diameter, pcb_coord_t Clearance)
+{
+	GtkTreeIter iter;
+	int target, n;
+
+	/* Always update the label - even if there's no style, the current settings need to show */
+	rss->com->set_status_line_label();
+
+	if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(rss->model), &iter))
+		return;
+
+	target = pcb_route_style_lookup(&PCB->RouteStyle, Thick, Diameter, Hole, Clearance, NULL);
+	if (target == -1) {
+		pcb_gtk_obj_route_style_t *style;
+
+		/* None of the styles matched: select the hidden custom button */
+		if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(rss->model), &iter))
+			return;
+
+		gtk_tree_model_get(GTK_TREE_MODEL(rss->model), &iter, STYLE_DATA_COL, &style, -1);
+		g_signal_handler_block(G_OBJECT(style->action), style->sig_id);
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(style->action), TRUE);
+		g_signal_handler_unblock(G_OBJECT(style->action), style->sig_id);
+		rss->active_style = style;
+
+		return;
+	}
+
+	/* need to select the style with index stored in target */
+	n = -1;
+	do {
+		pcb_gtk_obj_route_style_t *style;
+		gtk_tree_model_get(GTK_TREE_MODEL(rss->model), &iter, STYLE_DATA_COL, &style, -1);
+		if (n == target) {
+			g_signal_handler_block(G_OBJECT(style->action), style->sig_id);
+			gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(style->action), TRUE);
+			g_signal_handler_unblock(G_OBJECT(style->action), style->sig_id);
+			rss->active_style = style;
+			break;
+		}
+		n++;
+	} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(rss->model), &iter));
+}
+
+void pcb_gtk_route_style_empty(pcb_gtk_route_style_t * rss)
+{
+	GtkTreeIter iter;
+	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(rss->model), &iter)) {
+		do {
+			pcb_gtk_obj_route_style_t *rsdata;
+			gtk_tree_model_get(GTK_TREE_MODEL(rss->model), &iter, STYLE_DATA_COL, &rsdata, -1);
+			if (rsdata != NULL) {
+				if (rsdata->action) {
+					gtk_action_disconnect_accelerator(GTK_ACTION(rsdata->action));
+					gtk_action_group_remove_action(rss->action_group, GTK_ACTION(rsdata->action));
+					g_object_unref(G_OBJECT(rsdata->action));
+				}
+				if (rsdata->button)
+					gtk_widget_destroy(GTK_WIDGET(rsdata->button));;
+				gtk_tree_row_reference_free(rsdata->rref);
+				free(rsdata);
+			}
+		} while (gtk_list_store_remove(rss->model, &iter));
+	}
+
+	/* ugly hack: get the menu updated */
+	rss->com->route_styles_edited_cb();
+
+	rss->action_radio_group = NULL;
+	rss->button_radio_group = NULL;
+	rss->hidden_button = 0;
+}
+
+/* Called when a route style is selected. */
+static void route_style_changed_cb(pcb_gtk_route_style_t * rss, pcb_route_style_t * rst, gpointer data)
+{
+	pcb_use_route_style(rst);
+	rss->com->set_status_line_label();
+}
+
+
+static void route_styles_edited_cb(pcb_gtk_route_style_t *rss, gboolean save, gpointer data)
+{
+	pcb_gtk_common_t *com = data;
+
+	conf_setf(CFR_DESIGN, "design/routes", -1, "%s", pcb_route_string_make(&PCB->RouteStyle));
+	if (save)
+		conf_setf(CFR_USER, "design/routes", -1, "%s", pcb_route_string_make(&PCB->RouteStyle));
+
+	com->route_styles_edited_cb();
+}
+
+void make_route_style_buttons(pcb_gtk_route_style_t * rss)
+{
+	int i;
+
+	/* Make sure the <custom> item is added */
+	add_route_style_with_hidden_check(rss, NULL);
+
+	for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); ++i)
+		add_route_style_with_hidden_check(rss, &PCB->RouteStyle.array[i]);
+	g_signal_connect(G_OBJECT(rss), "select_style", G_CALLBACK(route_style_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(rss), "style_edited", G_CALLBACK(route_styles_edited_cb), rss->com);
+
+	/* ugly hack: get the menu updated */
+	rss->com->route_styles_edited_cb();
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_route_style.h	(revision 18980)
@@ -0,0 +1,110 @@
+#ifndef GHID_ROUTE_STYLE_H__
+#define GHID_ROUTE_STYLE_H__
+
+#include <gtk/gtk.h>
+
+#include "route_style.h"
+#include "glue.h"
+
+#define GHID_ROUTE_STYLE_TYPE            (pcb_gtk_route_style_get_type ())
+#define GHID_ROUTE_STYLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GHID_ROUTE_STYLE_TYPE, pcb_gtk_route_style_t))
+#define GHID_ROUTE_STYLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GHID_ROUTE_STYLE_TYPE, pcb_gtk_route_style_class_t))
+#define IS_GHID_ROUTE_STYLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GHID_ROUTE_STYLE_TYPE))
+#define IS_GHID_ROUTE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),   GHID_ROUTE_STYLE_TYPE))
+
+typedef struct pcb_gtk_dlg_route_style_s pcb_gtk_dlg_route_style_t;
+
+struct pcb_gtk_route_style_s {
+	/*  GTK3 incompatibility : GTK3 prefers a GtkGrid with "orientation" property
+	   set to GTK_ORIENTATION_VERTICAL, and packed children from
+	   the start, using gtk_container_add(GTK_CONTAINER(grid), w);
+	 */
+	GtkVBox parent;
+
+	GSList *button_radio_group;
+	GSList *action_radio_group;
+	GtkWidget *edit_button;
+
+	/*  GTK3 deprecated since version 3.10 Use GAction instead, and associate actions
+	   with GtkActionable widgets. Use GMenuModel for creating menus with gtk_menu_new_from_model().
+	 */
+	GtkActionGroup *action_group;
+	GtkAccelGroup *accel_group;
+
+	int hidden_button;						/* whether the hidden button is created         */
+	int selected;									/* index of the currently selected route style  */
+
+	GtkListStore *model;					/* All the route styles                         */
+	struct pcb_gtk_obj_route_style_s *active_style;	/* The current route style    */
+
+	GtkTreeIter new_iter;					/* iter for the <new> item */
+
+	pcb_gtk_common_t *com;
+};
+
+typedef struct pcb_gtk_route_style_s pcb_gtk_route_style_t;
+
+struct pcb_gtk_route_style_class_s {
+	GtkVBoxClass parent_class;
+
+	void (*select_style) (pcb_gtk_route_style_t *, pcb_route_style_t *);
+	void (*style_edited) (pcb_gtk_route_style_t *, gboolean);
+};
+
+typedef struct pcb_gtk_route_style_class_s pcb_gtk_route_style_class_t;
+
+enum {
+	SELECT_STYLE_SIGNAL,
+	STYLE_EDITED_SIGNAL,
+	STYLE_LAST_SIGNAL
+};
+
+extern guint pcb_gtk_route_style_signals_id[STYLE_LAST_SIGNAL];
+
+enum {
+	STYLE_TEXT_COL,
+	STYLE_DATA_COL,
+	STYLE_N_COLS
+};
+
+struct pcb_gtk_obj_route_style_s {
+	GtkRadioAction *action;
+	GtkWidget *button;
+	GtkWidget *menu_item;
+	GtkTreeRowReference *rref;
+	pcb_route_style_t *rst;
+	gulong sig_id;
+	int hidden;
+};
+
+typedef struct pcb_gtk_obj_route_style_s pcb_gtk_obj_route_style_t;
+
+/* API */
+
+GType pcb_gtk_route_style_get_type(void);
+
+GtkWidget *pcb_gtk_route_style_new(pcb_gtk_common_t *com);
+
+/* Adds a PCB route style. The route style object passed to this function
+   will be updated directly. */
+pcb_gtk_obj_route_style_t *pcb_gtk_route_style_add_route_style(pcb_gtk_route_style_t * rss, pcb_route_style_t * data, int hide);
+
+/* Selects a route style and emits a select-style signal. Returns succesful selection */
+gboolean pcb_gtk_route_style_select_style(pcb_gtk_route_style_t * rss, pcb_route_style_t * rst);
+
+GtkAccelGroup *pcb_gtk_route_style_get_accel_group(pcb_gtk_route_style_t * rss);
+
+/* Given the line thickness, via size and clearance values of a route
+   style, select a matching route style. On no match, nothing is changed.
+   This function does not emit any signals. */
+void pcb_gtk_route_style_sync(pcb_gtk_route_style_t * rss, pcb_coord_t Thick, pcb_coord_t Hole, pcb_coord_t Diameter,
+															pcb_coord_t Clearance);
+
+void pcb_gtk_route_style_copy(int idx);
+
+/* Removes all styles from a route style widget. */
+void pcb_gtk_route_style_empty(pcb_gtk_route_style_t * rss);
+
+void make_route_style_buttons(pcb_gtk_route_style_t * rss);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.c	(revision 18980)
@@ -0,0 +1,101 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Alain Vigne
+ *
+ *  This module is subject to the GNU GPL as described below.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "wt_trunc_text.h"
+
+static gpointer gtk_trunctext_parent_class = NULL;
+
+GtkTrunctext *gtk_trunctext_construct(GType object_type, const gchar *str)
+{
+	GtkTrunctext *self = NULL;
+	self = (GtkTrunctext *)g_object_new(object_type, NULL);
+
+	if (str && *str)
+		gtk_label_set_text(GTK_LABEL(self), str);
+
+	return self;
+}
+
+GtkTrunctext *gtk_trunctext_new(const gchar *str)
+{
+	return gtk_trunctext_construct(TYPE_GTK_TRUNCTEXT, str);
+}
+
+static void gtk_trunctext_get_preferred_width(GtkWidget *widget, gint *minimum_size, gint *natural_size)
+{
+	*minimum_size = 1;
+	*natural_size = 1;
+}
+
+static void gtk_trunctext_get_preferred_width_for_height(GtkWidget *widget, gint height, gint *minimum_width, gint *natural_width)
+{
+	*minimum_width = 1;
+	*natural_width = 1;
+}
+
+static void gtk_trunctext_get_preferred_height_and_baseline_for_width(GtkWidget *widget, gint width, gint *minimum_height, gint *natural_height, gint *minimum_baseline, gint *natural_baseline)
+{
+	*minimum_height = 1;
+	*natural_height = 1;
+	*minimum_baseline = 0;
+	*natural_baseline = 0;
+}
+
+static void gtk_trunctext_class_init(GtkTrunctextClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+
+	widget_class->get_preferred_width = gtk_trunctext_get_preferred_width;
+	widget_class->get_preferred_height = gtk_trunctext_get_preferred_width;
+	widget_class->get_preferred_width_for_height = gtk_trunctext_get_preferred_width_for_height;
+	widget_class->get_preferred_height_for_width = gtk_trunctext_get_preferred_width_for_height;
+	widget_class->get_preferred_height_and_baseline_for_width = gtk_trunctext_get_preferred_height_and_baseline_for_width;
+
+	gtk_trunctext_parent_class = g_type_class_peek_parent(klass);
+}
+
+static void gtk_trunctext_instance_init(GtkTrunctext *self)
+{
+}
+
+GType gtk_trunctext_get_type(void)
+{
+	static volatile gsize gtk_trunctext_type_id__volatile = 0;
+
+	if (g_once_init_enter(&gtk_trunctext_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info =
+			{ sizeof(GtkTrunctextClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gtk_trunctext_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof(GtkTrunctext), 0, (GInstanceInitFunc) gtk_trunctext_instance_init, NULL };
+		GType gtk_trunctext_type_id;
+
+		gtk_trunctext_type_id = g_type_register_static(gtk_label_get_type(), "GtkTrunctext", &g_define_type_info, 0);
+		g_once_init_leave(&gtk_trunctext_type_id__volatile, gtk_trunctext_type_id);
+	}
+
+	return gtk_trunctext_type_id__volatile;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_common/wt_trunc_text.h	(revision 18980)
@@ -0,0 +1,63 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Alain Vigne
+ *
+ *  This module is subject to the GNU GPL as described below.
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_GTK_TRUNC_TEXT_H
+#define PCB_GTK_TRUNC_TEXT_H
+
+#include <gtk/gtk.h>
+typedef struct _GtkTrunctext GtkTrunctext;
+typedef struct _GtkTrunctextClass GtkTrunctextClass;
+GtkTrunctext *gtk_trunctext_new(const gchar *str);
+
+/* GtkTrunctext is a subclass of GtkLabel */
+#define TYPE_GTK_TRUNCTEXT (gtk_trunctext_get_type ())
+#define GTK_TRUNCTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_TRUNCTEXT, GtkTrunctext))
+#define GTK_TRUNCTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_TRUNCTEXT, GtkTrunctextClass))
+#define IS_GTK_TRUNCTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_TRUNCTEXT))
+#define IS_GTK_TRUNCTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_TRUNCTEXT))
+#define GTK_TRUNCTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_TRUNCTEXT, GtkTrunctextClass))
+
+GType gtk_trunctext_get_type(void) G_GNUC_CONST;
+
+GtkTrunctext *gtk_trunctext_construct(GType object_type, const gchar *str);
+
+enum {
+	GTK_TRUNCTEXT_0_PROPERTY,
+	GTK_TRUNCTEXT_NUM_PROPERTIES
+};
+static GParamSpec *gtk_trunctext_properties[GTK_TRUNCTEXT_NUM_PROPERTIES];
+
+struct _GtkTrunctext {
+	GtkLabel parent_instance;
+};
+
+struct _GtkTrunctextClass {
+	GtkLabelClass parent_class;
+};
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_config/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_gtk_config
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_gtk_config/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,26 @@
+put /local/pcb/mod {lib_gtk_config}
+put /local/pcb/mod/OBJS [@
+@]
+
+put /local/pcb/mod/OBJS_C99 [@
+  $(PLUGDIR)/lib_gtk_config/lib_gtk_config.o
+	$(PLUGDIR)/lib_gtk_config/gui-config.o
+	$(PLUGDIR)/lib_gtk_config/gtk_conf_list.o
+@]
+
+put /local/pcb/mod/CONF {$(PLUGDIR)/lib_gtk_config/hid_gtk_conf.h}
+
+switch /local/pcb/lib_gtk_common/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtkx/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtkx/ldflags
+	end
+end
+
+switch /local/pcb/lib_gtk_config/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
Index: tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.c	(revision 18980)
@@ -0,0 +1,322 @@
+#include <stdlib.h>
+#include <string.h>
+#include <gdk/gdkkeysyms.h>
+#include "config.h"
+#include "gtk_conf_list.h"
+#include "compat_misc.h"
+
+#include "../lib_gtk_common/compat.h"
+
+static void fill_misc_cols(gtk_conf_list_t *cl, int row_idx, GtkTreeIter *iter, lht_node_t *nd)
+{
+	int col;
+	if (cl->get_misc_col_data != NULL) {
+		for(col = 0; col < cl->num_cols; col++) {
+			if ((col == cl->col_data) || (col == cl->col_src))
+				continue;
+			char *s = cl->get_misc_col_data(row_idx, col, nd);
+			if (s != NULL) {
+				gtk_list_store_set(cl->l, iter, col, s, -1);
+				free(s);
+			}
+		}
+	}
+}
+
+/* Rebuild the list from the GUI. There would be a cheaper alternative for most
+   operations, but our lists are short (less than 10 items usually) and
+   edited rarely - optimize for code size instead of speed. This also solves
+   a higher level problem: sometimes the input list is a composite from multiple
+   sources whereas the output list must be all in CFR_DESIGN. */
+static void rebuild(gtk_conf_list_t *cl)
+{
+	GtkTreeModel *tm = gtk_tree_view_get_model(GTK_TREE_VIEW(cl->t));
+	GtkTreeIter it;
+	gboolean valid;
+	int n;
+
+	if (cl->inhibit_rebuild)
+		return;
+
+	if (cl->pre_rebuild != NULL)
+		cl->pre_rebuild(cl);
+
+/*	printf("rebuild\n");*/
+
+	for(valid = gtk_tree_model_get_iter_first(tm, &it), n = 0; valid; valid = gtk_tree_model_iter_next(tm, &it), n++) {
+		gchar *s;
+		lht_node_t *nd;
+
+		gtk_tree_model_get(tm, &it, cl->col_data, &s, -1);
+/*		printf(" -> %s\n", s);*/
+		if (cl->col_src > 0)
+			gtk_list_store_set(cl->l, &it, cl->col_src, "<not saved yet>", -1);
+
+		nd = lht_dom_node_alloc(LHT_TEXT, "");
+		nd->data.text.value = pcb_strdup(s == NULL ? "" : s);
+		nd->doc = cl->lst->doc;
+		lht_dom_list_append(cl->lst, nd);
+
+		fill_misc_cols(cl, n, &it, nd);
+		g_free(s);
+	}
+
+	if (cl->post_rebuild != NULL)
+		cl->post_rebuild(cl);
+}
+
+static int get_sel(gtk_conf_list_t *cl, GtkTreeIter *iter)
+{
+	GtkTreeSelection *tsel;
+	GtkTreeModel *tm;
+	GtkTreePath *path;
+	int *i;
+
+	tsel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cl->t));
+	if (tsel == NULL)
+		return -1;
+
+	gtk_tree_selection_get_selected(tsel, &tm, iter);
+	if (iter->stamp == 0)
+		return -1;
+	path = gtk_tree_model_get_path(tm, iter);
+	if (path != NULL) {
+		i = gtk_tree_path_get_indices(path);
+		if (i != NULL)
+			return i[0];
+	}
+	return -1;
+}
+
+static void row_insert_cb(GtkTreeModel *m, GtkTreePath *p, GtkTreeIter *iter, gtk_conf_list_t *cl)
+{
+	rebuild(cl);
+}
+
+static void row_delete_cb(GtkTreeModel *m, GtkTreePath *p, gtk_conf_list_t *cl)
+{
+	rebuild(cl);
+}
+
+static void button_ins_cb(GtkButton * button, gtk_conf_list_t *cl)
+{
+	GtkTreeIter *sibl, sibl_, iter;
+	lht_node_t *nd;
+	int idx = get_sel(cl, &sibl_);
+	if (idx < 0) {
+		idx = gtk_tree_model_iter_n_children(gtk_tree_view_get_model(GTK_TREE_VIEW(cl->t)), NULL);
+		sibl = NULL;
+	}
+	else
+		sibl = &sibl_;
+
+	gtk_list_store_insert_before(cl->l, &iter, sibl);
+
+	rebuild(cl);
+#warning TODO: insert new item at idx
+	nd = NULL;
+
+	fill_misc_cols(cl, idx, &iter, nd);
+}
+
+static void button_del_cb(GtkButton * button, gtk_conf_list_t *cl)
+{
+	GtkTreeIter iter;
+	int max, idx = get_sel(cl, &iter);
+
+	if (idx < 0)
+		return;
+
+	gtk_list_store_remove(cl->l, &iter);
+	rebuild(cl);
+#warning TODO: remove list item idx
+	
+	/* set cursor to where the user may expect it */
+	max = gtk_tree_model_iter_n_children(gtk_tree_view_get_model(GTK_TREE_VIEW(cl->t)), NULL) - 1;
+	if (idx > max)
+		idx = max;
+	if (idx >= 0) {
+		GtkTreePath *path;
+		path = gtk_tree_path_new_from_indices(idx, -1);
+		gtk_tree_view_set_cursor(GTK_TREE_VIEW(cl->t), path, NULL, 0);
+	}
+}
+
+static void button_sel_cb(GtkButton * button, gtk_conf_list_t *cl)
+{
+	GtkWidget *fcd;
+	GtkTreeIter iter;
+	int idx = get_sel(cl, &iter);
+	if (idx < 0)
+		return;
+	fcd = gtk_file_chooser_dialog_new(cl->file_chooser_title, NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+	gtk_file_chooser_set_action(GTK_FILE_CHOOSER(fcd), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+	if (gtk_dialog_run(GTK_DIALOG(fcd)) == GTK_RESPONSE_ACCEPT) {
+		char *fno = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fcd));
+		const char *fn = fno;
+		
+		if (cl->file_chooser_postproc != NULL)
+			fn = cl->file_chooser_postproc(fno);
+
+		gtk_list_store_set(cl->l, &iter, cl->col_data, fn, -1);
+#warning TODO: replace list item idx
+		rebuild(cl);
+		g_free(fno);
+	}
+	gtk_widget_destroy(fcd);
+}
+
+
+static void cell_edited_cb(GtkCellRendererText *cell, gchar *path, gchar *new_text, gtk_conf_list_t *cl)
+{
+	GtkTreeIter iter;
+	int idx = get_sel(cl, &iter);
+
+	cl->editing = 0;
+
+	gtk_list_store_set(cl->l, &iter, cl->col_data, new_text, -1);
+#warning TODO: replace list item idx
+	rebuild(cl);
+}
+
+static void cell_edit_started_cb(GtkCellRendererText *cell, GtkCellEditable *e,gchar *path, gtk_conf_list_t *cl)
+{
+	cl->editing = 1;
+}
+
+static void cell_edit_canceled_cb(GtkCellRendererText *cell, gtk_conf_list_t *cl)
+{
+	cl->editing = 0;
+}
+
+/* bind a few intuitive keys so that the list can be used without mouse */
+static gboolean key_release_cb(GtkWidget *widget, GdkEventKey *event, gtk_conf_list_t *cl)
+{
+	unsigned short int kv = event->keyval;
+	if (cl->editing)
+		return FALSE;
+/*	printf("REL! %d %d\n", cl->editing, kv);*/
+	switch(kv) {
+#ifdef GDK_KEY_KP_Insert
+		case GDK_KEY_KP_Insert:
+#endif
+#ifdef GDK_KEY_Insert
+		case GDK_KEY_Insert:
+#endif
+		case 'i':
+			button_ins_cb(NULL, cl);
+			break;
+#ifdef GDK_KEY_KP_Delete
+		case GDK_KEY_KP_Delete:
+#endif
+#ifdef GDK_KEY_Delete
+		case GDK_KEY_Delete:
+#endif
+		case 'd':
+			button_del_cb(NULL, cl);
+			break;
+		case 'c':
+		case 's':
+			if (cl->file_chooser_title != NULL)
+				button_sel_cb(NULL, cl);
+			break;
+	}
+	return 0;
+}
+
+int gtk_conf_list_set_list(gtk_conf_list_t *cl, lht_node_t *lst)
+{
+	GtkTreeIter iter;
+	lht_node_t *nd;
+
+	if ((lst == NULL) || (lst->type != LHT_LIST))
+		return -1;
+
+	cl->lst = lst;
+	cl->inhibit_rebuild = 1;
+
+	gtk_list_store_clear(cl->l);
+
+	/* fill in the list with initial data */
+	for(nd = cl->lst->data.list.first; nd != NULL; nd = nd->next) {
+		if (nd->type != LHT_TEXT)
+			continue;
+
+		gtk_list_store_append(cl->l, &iter);
+		gtk_list_store_set(cl->l, &iter, cl->col_data, nd->data.text.value, -1);
+		if (nd->file_name != NULL)
+			gtk_list_store_set(cl->l, &iter, cl->col_src, nd->file_name, -1);
+		fill_misc_cols(cl, cl->num_cols, &iter, nd);
+	}
+
+	cl->inhibit_rebuild = 0;
+
+	return 0;
+}
+
+GtkWidget *gtk_conf_list_widget(gtk_conf_list_t *cl)
+{
+	GtkWidget *vbox, *hbox, *bins, *bdel, *bsel;
+	int n;
+	GType *ty;
+
+	cl->editing = 0;
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	cl->t = gtk_tree_view_new();
+
+	/* create the list model */
+	ty = malloc(sizeof(GType) * cl->num_cols);
+	for(n = 0; n < cl->num_cols; n++)
+		ty[n] = G_TYPE_STRING;
+	cl->l = gtk_list_store_newv(cl->num_cols, ty);
+	free(ty);
+
+	if (cl->lst != NULL) {
+		lht_node_t *lst = cl->lst;
+		cl->lst = NULL;
+		gtk_conf_list_set_list(cl, lst);
+	}
+
+	/* add all columns */
+	for(n = 0; n < cl->num_cols; n++) {
+		GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+		gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(cl->t), -1, cl->col_names[n], renderer, "text", n, NULL);
+		if (n == cl->col_data) {
+			g_object_set(renderer, "editable", TRUE, NULL);
+			g_signal_connect(renderer, "edited", G_CALLBACK(cell_edited_cb), cl);
+			g_signal_connect(renderer, "editing-started", G_CALLBACK(cell_edit_started_cb), cl);
+			g_signal_connect(renderer, "editing-canceled", G_CALLBACK(cell_edit_canceled_cb), cl);
+		}
+	}
+
+	gtk_tree_view_set_reorderable(GTK_TREE_VIEW(cl->t), cl->reorder);
+
+	g_signal_connect(G_OBJECT(cl->l), "row_deleted", G_CALLBACK(row_delete_cb), cl);
+	g_signal_connect(G_OBJECT(cl->l), "row_inserted", G_CALLBACK(row_insert_cb), cl);
+	g_signal_connect(G_OBJECT(cl->t), "key-release-event", G_CALLBACK(key_release_cb), cl);
+
+	gtk_tree_view_set_model(GTK_TREE_VIEW(cl->t), GTK_TREE_MODEL(cl->l));
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+	bins = gtk_button_new_with_label("insert new");
+	bdel = gtk_button_new_with_label("remove");
+
+	gtk_box_pack_start(GTK_BOX(hbox), bins, FALSE, FALSE, 2);
+	gtk_box_pack_start(GTK_BOX(hbox), bdel, FALSE, FALSE, 2);
+
+	g_signal_connect(G_OBJECT(bins), "clicked", G_CALLBACK(button_ins_cb), cl);
+	g_signal_connect(G_OBJECT(bdel), "clicked", G_CALLBACK(button_del_cb), cl);
+
+	if (cl->file_chooser_title != NULL) {
+		bsel = gtk_button_new_with_label("change path");
+		gtk_box_pack_start(GTK_BOX(hbox), bsel, FALSE, FALSE, 2);
+		g_signal_connect(G_OBJECT(bsel), "clicked", G_CALLBACK(button_sel_cb), cl);
+	}
+
+	gtk_box_pack_start(GTK_BOX(vbox), cl->t, TRUE, TRUE, 2);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
+
+	return vbox;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/gtk_conf_list.h	(revision 18980)
@@ -0,0 +1,35 @@
+#include <gtk/gtk.h>
+#include "conf.h"
+
+typedef struct gtk_conf_list_s  gtk_conf_list_t;
+
+struct gtk_conf_list_s {
+	int num_cols;               /* number of visible columns */
+	const char **col_names;     /* header for each visible column */
+	int col_data, col_src;      /* column index where list data and list source (lihata path) should be automatically added (-1 means off) */
+	int reorder;                /* 0 to disable reordering */
+
+	lht_node_t *lst;            /* the list (of text nodes!) to build the initial GUI list from */
+/*	lht_node_t *lst_out;*/        /* the list to overwrite */
+/*	char *lst_update_path;*/      /* path to conf_update after an overwrite */
+	void (*pre_rebuild)(gtk_conf_list_t *cl); /* called before rebuilding lst */
+	void (*post_rebuild)(gtk_conf_list_t *cl); /* called after rebuilding lst */
+
+	/* callback to fill in non-data, non-src cells */
+	char *(*get_misc_col_data)(int row, int col, lht_node_t *nd); /* free()'d after the call; NULL=empty */
+
+	/* if not NULL, allow the file chooser to be invoked on the data cells */
+	const char *file_chooser_title; 
+
+	/* if the file chooser ran, filter the name through this function before inserting in the table */
+	const char *(*file_chooser_postproc)(char *path);
+
+	/* -- internal -- */
+	GtkListStore *l;
+	GtkWidget *t;
+	int editing;
+	int inhibit_rebuild;
+};
+
+GtkWidget *gtk_conf_list_widget(gtk_conf_list_t *cl);
+int gtk_conf_list_set_list(gtk_conf_list_t *cl, lht_node_t *lst);
Index: tags/2.0.1/src_plugins/lib_gtk_config/gui-config.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/gui-config.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/gui-config.c	(revision 18980)
@@ -0,0 +1,2504 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This file written by Bill Wilson for the PCB Gtk port.
+*/
+
+#include "config.h"
+#include "conf_core.h"
+#include "lib_gtk_config.h"
+
+#include <stdlib.h>
+#include <genht/hash.h>
+
+#include "board.h"
+#include "data.h"
+#include "event.h"
+#include "layer.h"
+
+#include "hid.h"
+
+#include "change.h"
+#include "plug_io.h"
+#include "error.h"
+#include "draw.h"
+#include "pcb-printf.h"
+#include "hid_attrib.h"
+#include "conf.h"
+#include "conf_hid.h"
+#include "misc_util.h"
+#include "paths.h"
+#include "plug_footprint.h"
+#include "stub_draw.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "fptr_cast.h"
+#include "safe_fs.h"
+#include "tool.h"
+#include <liblihata/tree.h>
+
+#include "gtk_conf_list.h"
+#include "hid_gtk_conf.h"
+
+#include "../src_plugins/lib_gtk_common/compat.h"
+#include "../src_plugins/lib_gtk_common/util_str.h"
+#include "../src_plugins/lib_gtk_common/wt_preview.h"
+#include "../src_plugins/lib_gtk_common/bu_box.h"
+#include "../src_plugins/lib_gtk_common/bu_entry.h"
+#include "../src_plugins/lib_gtk_common/bu_notebook.h"
+#include "../src_plugins/lib_gtk_common/bu_text_view.h"
+#include "../src_plugins/lib_gtk_common/bu_check_button.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
+#include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_common/bu_spin_button.h"
+
+/* Ugly hack: save a copy of gport on window construct in case we need to
+   reconstruct */
+static pcb_gtk_common_t *priv_copy_com;
+
+conf_hid_gtk_t conf_hid_gtk;
+window_geometry_t hid_gtk_wgeo, hid_gtk_wgeo_old;
+
+#define hid_gtk_wgeo_save_(field, dest_role) \
+	conf_setf(dest_role, "plugins/hid_gtk/window_geometry/" #field, -1, "%d", hid_gtk_wgeo.field); \
+
+#define hid_gtk_wgeo_update_(field, dest_role) \
+	if (hid_gtk_wgeo.field != hid_gtk_wgeo_old.field) { \
+		hid_gtk_wgeo_old.field = hid_gtk_wgeo.field; \
+		hid_gtk_wgeo_save_(field, dest_role); \
+	}
+
+void hid_gtk_wgeo_update(void)
+{
+	if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_design)
+		GHID_WGEO_ALL(hid_gtk_wgeo_update_, CFR_DESIGN);
+	if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_project)
+		GHID_WGEO_ALL(hid_gtk_wgeo_update_, CFR_PROJECT);
+	if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_user)
+		GHID_WGEO_ALL(hid_gtk_wgeo_update_, CFR_USER);
+}
+
+
+void ghid_wgeo_save(int save_to_file, int skip_user)
+{
+	if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_design) {
+		GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_DESIGN);
+		if (save_to_file)
+			conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_DESIGN, NULL);
+	}
+
+	if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_project) {
+		GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_PROJECT);
+		if (save_to_file) {
+			if (conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_PROJECT, NULL) != 0)
+				pcb_message(PCB_MSG_ERROR, "... while trying to save window geometry in project file, as you requested ('save on exit')\n");
+		}
+	}
+
+	if (!skip_user) {
+		if (conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_user) {
+			GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_USER);
+			if (save_to_file)
+				if (conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_USER, NULL) != 0)
+					pcb_message(PCB_MSG_ERROR, "... while trying to save window geometry in user config file, as you requested ('save on exit')\n");
+		}
+	}
+}
+
+static void wgeo_save_direct(GtkButton * widget, const char *ctx)
+{
+	if (ctx == NULL) {
+		GtkWidget *fcd =
+			gtk_file_chooser_dialog_new("Save window geometry to...", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
+																	GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+		if (gtk_dialog_run(GTK_DIALOG(fcd)) == GTK_RESPONSE_ACCEPT) {
+			char *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fcd));
+			conf_reset(CFR_file, "<wgeo_save_direct>");
+			GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_file);
+			conf_export_to_file(fn, CFR_file, "/");
+			gtk_widget_destroy(fcd);
+			g_free(fn);
+			conf_reset(CFR_file, "<internal>");
+		}
+	}
+	else if (*ctx == '*') {
+		switch (ctx[1]) {
+		case 'd':
+			GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_DESIGN);
+			conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_DESIGN, NULL);
+			break;
+		case 'p':
+			GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_PROJECT);
+			conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_PROJECT, NULL);
+			break;
+		case 'u':
+			GHID_WGEO_ALL(hid_gtk_wgeo_save_, CFR_USER);
+			conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), CFR_USER, NULL);
+			break;
+		}
+	}
+}
+
+#undef hid_gtk_wgeo_update_
+#undef hid_gtk_wgeo_save_
+
+/* event handler that runs before the current pcb is saved - save win geo
+   in the corresponding lihata trees if the checkbox is selected. */
+void ghid_conf_save_pre_wgeo(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	ghid_wgeo_save(1, 1);
+}
+
+
+static int just_loaded(const char *path)
+{
+	conf_native_t *n = conf_get_field(path);
+	conf_role_t r;
+	if ((n == NULL) || (n->used == 0))
+		return 0;
+	r = conf_lookup_role(n->prop[0].src);
+	return (r == CFR_DESIGN) || (r == CFR_PROJECT);
+}
+
+#define path_prefix "plugins/hid_gtk/window_geometry/"
+#define did_just_load_geo(win, id) \
+	if (just_loaded(path_prefix #win "_width") || just_loaded(path_prefix #win "_height") \
+	 || just_loaded(path_prefix #win "_x") || just_loaded(path_prefix #win "_y")) { \
+		hid_gtk_wgeo.win ## _width  = conf_hid_gtk.plugins.hid_gtk.window_geometry.win ## _width; \
+		hid_gtk_wgeo.win ## _height = conf_hid_gtk.plugins.hid_gtk.window_geometry.win ## _height; \
+		hid_gtk_wgeo.win ## _x      = conf_hid_gtk.plugins.hid_gtk.window_geometry.win ## _x; \
+		hid_gtk_wgeo.win ## _y      = conf_hid_gtk.plugins.hid_gtk.window_geometry.win ## _y; \
+		wplc_place(id, NULL); \
+	}
+
+void ghid_conf_load_post_wgeo(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	did_just_load_geo(top, WPLC_TOP);
+	did_just_load_geo(log, WPLC_LOG);
+	did_just_load_geo(drc, WPLC_DRC);
+	did_just_load_geo(library, WPLC_LIBRARY);
+	did_just_load_geo(netlist, WPLC_NETLIST);
+	did_just_load_geo(keyref, WPLC_KEYREF);
+	did_just_load_geo(pinout, WPLC_PINOUT);
+	did_just_load_geo(pinout, WPLC_SEARCH);
+}
+
+#undef path_prefix
+
+
+#undef just_loaded_geo
+
+enum ConfigType {
+	CONFIG_Boolean,
+	CONFIG_Integer,
+	CONFIG_Coord,
+	CONFIG_Real,
+	CONFIG_String,
+	CONFIG_Unused
+};
+
+typedef struct {
+	gchar *name;
+	enum ConfigType type;
+	void *value;
+} ConfigAttribute;
+
+void ghid_config_init(void)
+{
+	hid_gtk_wgeo_old = hid_gtk_wgeo = conf_hid_gtk.plugins.hid_gtk.window_geometry;
+#warning CONF TODO: inject the internal part here?
+}
+
+typedef struct {
+	conf_role_t dst_role;
+	conf_role_t src_role;
+	pcb_gtk_common_t *com;
+} save_ctx_t;
+
+static void ghid_config_window_close(void);
+
+static GtkTreeView *gui_config_treeview;
+static GtkNotebook *config_notebook;
+
+typedef struct tvmap_s tvmap_t;
+
+struct tvmap_s {
+	GtkTreePath *path;
+	tvmap_t *next;
+};
+
+static void tvmap(GtkTreeView * tree, GtkTreePath * path, gpointer user_data)
+{
+	tvmap_t **first = user_data, *m = malloc(sizeof(tvmap_t));
+	m->path = gtk_tree_path_copy(path);
+	m->next = *first;
+	*first = m;
+/*	printf("exp1 %s\n", gtk_tree_path_to_string(m->path));*/
+}
+
+/* Replace a list of paths in dst with src; each path must be either:
+   - a path to a config filed that presents in the hash (not a ha:subtree)
+   - a subtree or multiple subtrees matching a prefix (e.g. "*appearance/color")
+*/
+void config_any_replace(save_ctx_t * ctx, const char **paths)
+{
+	const char **p;
+	int need_update = 0;
+
+	for (p = paths; *p != NULL; p++) {
+		/* wildcards - match subtree */
+		if (**p == '*') {
+			const char *wildp = (*p) + 1;
+			int pl = strlen(wildp);
+			htsp_entry_t *e;
+			conf_fields_foreach(e) {
+				if (strncmp(e->key, wildp, pl) == 0) {
+					if (conf_replace_subtree(ctx->dst_role, e->key, ctx->src_role, e->key) != 0)
+						pcb_message(PCB_MSG_ERROR, "Error: failed to save config item %s\n", *p);
+					if (ctx->dst_role < CFR_max_real) {
+						conf_update(e->key, -1);
+						need_update++;
+					}
+				}
+			}
+		}
+		else {
+			/* plain node */
+			if (conf_replace_subtree(ctx->dst_role, *p, ctx->src_role, *p) != 0)
+				pcb_message(PCB_MSG_ERROR, "Error: failed to save config item %s\n", *p);
+			if (ctx->dst_role < CFR_max_real) {
+				conf_update(*p, -1);
+				need_update++;
+			}
+		}
+	}
+
+	/* present a file choose dialog box on save to custom file */
+	if (ctx->dst_role == CFR_file) {
+		GtkWidget *fcd =
+			gtk_file_chooser_dialog_new("Save config settings to...", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL,
+																	GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+		if (gtk_dialog_run(GTK_DIALOG(fcd)) == GTK_RESPONSE_ACCEPT) {
+			char *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fcd));
+			conf_export_to_file(fn, CFR_file, "/");
+			conf_reset(CFR_file, "<internal>");
+			g_free(fn);
+		}
+		gtk_widget_destroy(fcd);
+	}
+
+	if (need_update) {
+		/* do all the gui updates */
+		ctx->com->set_status_line_label();
+		ctx->com->pack_mode_buttons();
+
+	}
+
+	if ((ctx->dst_role == CFR_USER) || (ctx->dst_role == CFR_PROJECT))
+		conf_save_file(NULL, (PCB == NULL ? NULL : PCB->Filename), ctx->dst_role, NULL);
+
+	if (need_update) {						/* need to reopen the preferences dialog to show the new settings */
+		tvmap_t *first = NULL, *next;
+		GtkTreePath *current_path;
+
+		/* save expansions and cursor selection */
+		gtk_tree_view_map_expanded_rows(gui_config_treeview, tvmap, &first);
+		gtk_tree_view_get_cursor(gui_config_treeview, &current_path, NULL);
+
+		ghid_config_window_close();
+		pcb_gtk_config_window_show(priv_copy_com, TRUE);
+
+		/* restore expansions and cursor position. That will trigger correct notebook display */
+		for (; first != NULL; first = next) {
+/*			printf("exp2 %s\n", gtk_tree_path_to_string(first->path));*/
+			next = first->next;
+			gtk_tree_view_expand_to_path(gui_config_treeview, first->path);
+			gtk_tree_path_free(first->path);
+			free(first);
+		}
+		gtk_tree_view_set_cursor(gui_config_treeview, current_path, NULL, FALSE);
+		gtk_tree_path_free(current_path);
+	}
+}
+
+/* =================== OK, now the gui stuff ======================
+*/
+static GtkWidget *config_window;
+
+static void config_user_role_section(pcb_gtk_common_t *com, GtkWidget * vbox, void (*save_cb) (GtkButton * widget, save_ctx_t * sctx), int disable_factory)
+{
+	GtkWidget *config_color_warn_label, *button, *hbox, *vbox2;
+	const char *tooltip_text;
+	static save_ctx_t ctx_all2project = { CFR_PROJECT, CFR_binary, NULL };
+	static save_ctx_t ctx_all2user = { CFR_USER, CFR_binary, NULL };
+	static save_ctx_t ctx_all2file = { CFR_file, CFR_binary, NULL };
+	static save_ctx_t ctx_int2design = { CFR_DESIGN, CFR_INTERNAL, NULL };
+
+	ctx_all2project.com = ctx_all2user.com = ctx_all2file.com = ctx_int2design.com = com;
+
+	hbox = gtkc_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 4);
+
+	config_color_warn_label = gtk_label_new("");
+	gtk_label_set_use_markup(GTK_LABEL(config_color_warn_label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(config_color_warn_label),
+											 _
+											 ("<small>The above are <i>design-level</i>\nconfiguration, <u>saved</u> with the\npcb file. Use these buttons\nto save all the above settings:</small>"));
+	gtk_box_pack_start(GTK_BOX(hbox), config_color_warn_label, FALSE, FALSE, 4);
+
+	vbox2 = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
+
+	button = gtk_button_new_with_label("Save in project config");
+	conf_get_project_conf_name(NULL, (PCB == NULL ? NULL : PCB->Filename), &tooltip_text);
+	gtk_widget_set_tooltip_text(GTK_WIDGET(button), tooltip_text);
+	gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_cb), &ctx_all2project);
+
+	button = gtk_button_new_with_label("Save in user config");
+	tooltip_text = conf_get_user_conf_name();
+	gtk_widget_set_tooltip_text(GTK_WIDGET(button), tooltip_text);
+	gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_cb), &ctx_all2user);
+
+	vbox2 = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
+
+	button = gtk_button_new_with_label("Save to file...");
+	gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_cb), &ctx_all2file);
+
+	if (!disable_factory) {
+		button = gtk_button_new_with_label("Restore factory defaults");
+		gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_cb), &ctx_int2design);
+	}
+}
+
+	/* -------------- The General config page ----------------
+	 */
+
+static void config_command_window_toggle_cb(GtkToggleButton * button, gpointer data)
+{
+	pcb_gtk_common_t *com = data;
+	gboolean active = gtk_toggle_button_get_active(button);
+	static gboolean holdoff;
+
+	if (holdoff)
+		return;
+
+	/* Can't toggle into command window mode if the status line command
+	   |  entry is active.
+	 */
+	if (com->command_entry_is_active()) {
+		holdoff = TRUE;
+		gtk_toggle_button_set_active(button, FALSE);
+		holdoff = FALSE;
+		return;
+	}
+	conf_setf(CFR_DESIGN, "plugins/hid_gtk/use_command_window", -1, "%d", active);
+	com->command_use_command_window_sync();
+}
+
+static void config_compact_horizontal_toggle_cb(GtkToggleButton * button, gpointer data)
+{
+	pcb_gtk_common_t *com = data;
+	gboolean active = gtk_toggle_button_get_active(button);
+
+	conf_setf(CFR_DESIGN, "plugins/hid_gtk/compact_horizontal", -1, "%d", active);
+	com->set_status_line_label();
+}
+
+static void config_compact_vertical_toggle_cb(GtkToggleButton * button, gpointer data)
+{
+	pcb_gtk_common_t *com = data;
+	gboolean active = gtk_toggle_button_get_active(button);
+
+	conf_setf(CFR_DESIGN, "plugins/hid_gtk/compact_vertical", -1, "%d", active);
+	com->pack_mode_buttons();
+}
+
+static GtkWidget *pref_auto_place_lab;
+static void pref_auto_place_update(void)
+{
+	const char *warn;
+	if (conf_core.editor.auto_place)
+		warn =
+			"Restoring window geometry is <b>enabled</b>:\npcb-rnd will attempt to move and resize windows.\nIt can be disabled in General/";
+	else
+		warn =
+			"Restoring window geometry is <b>disabled</b>:\npcb-rnd will <b>not</b> attempt to move and resize windows.\nConsider changing it in General/";
+	gtk_label_set_markup(GTK_LABEL(pref_auto_place_lab), _(warn));
+}
+
+static void config_auto_place_toggle_cb(GtkToggleButton * button, gpointer data)
+{
+	gboolean active = gtk_toggle_button_get_active(button);
+
+	conf_setf(CFR_DESIGN, "editor/auto_place", -1, "%d", active);
+	pref_auto_place_update();
+}
+
+static void config_general_toggle_cb(GtkToggleButton * button, void *setting)
+{
+	*(gint *) setting = gtk_toggle_button_get_active(button);
+}
+
+static void config_backup_spin_button_cb(GtkSpinButton * spin_button, gpointer data)
+{
+	int i;
+	char s[32];
+	i = gtk_spin_button_get_value_as_int(spin_button);
+	sprintf(s, "%d", i);
+	conf_set(CFR_DESIGN, "rc/backup_interval", -1, s, POL_OVERWRITE);
+	pcb_enable_autosave();
+}
+
+static void config_history_spin_button_cb(GtkSpinButton * spin_button, gpointer data)
+{
+	conf_setf(CFR_DESIGN, "plugins/hid_gtk/history_size", -1, "%d", gtk_spin_button_get_value_as_int(spin_button));
+}
+
+void config_general_save(GtkButton * widget, save_ctx_t * ctx)
+{
+	const char *paths[] = {
+		"plugins/hid_gtk/use_command_window",
+		"plugins/hid_gtk/compact_horizontal",
+		"plugins/hid_gtk/compact_vertical",
+		"plugins/hid_gtk/history_size",
+		"rc/backup_interval",
+		"editor/auto_place",
+		"editor/save_in_tmp",
+		NULL
+	};
+
+	config_any_replace(ctx, paths);
+}
+
+static void config_general_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *vbox, *content_vbox;
+
+	content_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), content_vbox, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(content_vbox), 6);
+
+	vbox = ghid_category_vbox(content_vbox, _("Enables"), 4, 2, TRUE, TRUE);
+
+	pcb_gtk_check_button_connected(vbox, NULL, conf_hid_gtk.plugins.hid_gtk.use_command_window,
+																 TRUE, FALSE, FALSE, 2,
+																 config_command_window_toggle_cb, com, _("Use separate window for command entry (DEPRECATED)"));
+
+	pcb_gtk_check_button_connected(vbox, NULL, conf_hid_gtk.plugins.hid_gtk.compact_horizontal,
+																 TRUE, FALSE, FALSE, 2,
+																 config_compact_horizontal_toggle_cb, com,
+																 _("Alternate window layout to allow smaller horizontal size"));
+
+	pcb_gtk_check_button_connected(vbox, NULL, conf_hid_gtk.plugins.hid_gtk.compact_vertical,
+																 TRUE, FALSE, FALSE, 2,
+																 config_compact_vertical_toggle_cb, com,
+																 _("Alternate window layout to allow smaller vertical size"));
+
+	pcb_gtk_check_button_connected(vbox, NULL, conf_core.editor.auto_place,
+																 TRUE, FALSE, FALSE, 2,
+																 config_auto_place_toggle_cb, NULL,
+																 _("Restore window geometry (when saved geometry is available)"));
+
+	vbox = ghid_category_vbox(content_vbox, _("Backups"), 4, 2, TRUE, TRUE);
+	pcb_gtk_check_button_connected(vbox, NULL, conf_core.editor.save_in_tmp,
+																 TRUE, FALSE, FALSE, 2,
+																 config_general_toggle_cb, (void *) &conf_core.editor.save_in_tmp,
+																 _("If layout is modified at exit, save into PCB.%i.save"));
+	ghid_spin_button(vbox, NULL, conf_core.rc.backup_interval, 0.0, 60 * 60, 60.0,
+									 600.0, 0, 0, config_backup_spin_button_cb, NULL, FALSE,
+									 _("Seconds between auto backups\n" "(set to zero to disable auto backups)"));
+
+	vbox = ghid_category_vbox(content_vbox, _("Misc"), 4, 2, TRUE, TRUE);
+	ghid_spin_button(vbox, NULL, conf_hid_gtk.plugins.hid_gtk.history_size,
+									 5.0, 25.0, 1.0, 1.0, 0, 0,
+									 config_history_spin_button_cb, NULL, FALSE, _("Number of commands to remember in the history list"));
+
+
+	vbox = gtkc_vbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), vbox, TRUE, TRUE, 0);
+	config_user_role_section(com, tab_vbox, config_general_save, 0);
+}
+
+	/* -------------- The Sizes config page ----------------
+	 */
+static GtkWidget *config_sizes_vbox, *config_sizes_tab_vbox, *config_text_spin_button;
+
+static pcb_coord_t new_board_width, new_board_height;
+static pcb_coord_t new_Bloat, new_Shrink, new_minWid, new_minSlk, new_minDrill, new_minRing;
+
+static void config_sizes_apply(void)
+{
+	conf_set_design("design/bloat", "%$mS", new_Bloat);
+	conf_set_design("design/shrink", "%$mS", new_Shrink);
+	conf_set_design("design/min_wid", "%$mS", new_minWid);
+	conf_set_design("design/min_slk", "%$mS", new_minSlk);
+	conf_set_design("design/min_drill", "%$mS", new_minDrill);
+	conf_set_design("design/min_ring", "%$mS", new_minRing);
+
+	if ((PCB->MaxWidth != new_board_width) || (PCB->MaxWidth != new_board_height))
+		pcb_board_resize(new_board_width, new_board_height);
+}
+
+static void text_spin_button_cb(GtkSpinButton * spin, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	conf_setf(CFR_DESIGN, "design/text_scale", -1, "%d", gtk_spin_button_get_value_as_int(spin));
+	com->set_status_line_label();
+}
+
+static void coord_entry_cb(pcb_gtk_coord_entry_t * ce, void *dst)
+{
+	*(pcb_coord_t *) dst = pcb_gtk_coord_entry_get_value(ce);
+}
+
+void config_sizes_save(GtkButton * widget, save_ctx_t * ctx)
+{
+	const char *paths[] = {
+		"design/bloat",
+		"design/shrink",
+		"design/min_wid",
+		"design/min_slk",
+		"design/poly_isle_area",
+		"design/min_drill",
+		"design/min_ring",
+		"design/text_scale",
+		NULL
+	};
+
+	config_sizes_apply();
+	config_any_replace(ctx, paths);
+}
+
+
+static void config_sizes_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *table, *vbox, *hbox, *content_vbox;
+
+	if (config_sizes_tab_vbox == NULL) {
+		content_vbox = gtkc_vbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(tab_vbox), content_vbox, TRUE, TRUE, 0);
+		gtk_container_set_border_width(GTK_CONTAINER(content_vbox), 6);
+	}
+	else
+		content_vbox = config_sizes_tab_vbox;
+
+	/* Need a vbox we can destroy if user changes grid units.
+	 */
+	if (!config_sizes_vbox) {
+		vbox = gtkc_vbox_new(FALSE, 0);
+		gtk_box_pack_start(GTK_BOX(content_vbox), vbox, FALSE, FALSE, 0);
+		gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+		config_sizes_vbox = vbox;
+		config_sizes_tab_vbox = content_vbox;
+	}
+
+	/* ---- Board Size ---- */
+	vbox = ghid_category_vbox(config_sizes_vbox, _("Board Size"), 4, 2, TRUE, FALSE);
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	table = gtk_table_new(4, 1, FALSE);
+	gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 3);
+
+	new_board_width = PCB->MaxWidth;
+	new_board_height = PCB->MaxHeight;
+	ghid_table_coord_entry(table, 0, 0, NULL,
+												 PCB->MaxWidth, PCB_MIN_SIZE, PCB_MAX_COORD, CE_LARGE, 0, coord_entry_cb, &new_board_width, FALSE,
+												 _("Width"));
+
+	ghid_table_coord_entry(table, 0, 2, NULL,
+												 PCB->MaxHeight, PCB_MIN_SIZE, PCB_MAX_COORD,
+												 CE_LARGE, 0, coord_entry_cb, &new_board_height, FALSE, _("Height"));
+
+	/* ---- Text Scale ---- */
+	vbox = ghid_category_vbox(config_sizes_vbox, _("Text Scale"), 4, 2, TRUE, FALSE);
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	table = gtk_table_new(4, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 3);
+	ghid_table_spin_button(table, 0, 0, &config_text_spin_button,
+												 conf_core.design.text_scale,
+												 PCB_MIN_TEXTSCALE, PCB_MAX_TEXTSCALE, 10.0, 10.0, 0, 0, text_spin_button_cb, com, FALSE, "%");
+
+
+	/* ---- DRC Sizes ---- */
+	vbox = ghid_category_vbox(config_sizes_vbox, _("Design Rule Checking"), 4, 2, TRUE, FALSE);
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	table = gtk_table_new(4, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 3);
+
+	new_Bloat    = conf_core.design.bloat;
+	new_Shrink   = conf_core.design.shrink;
+	new_minWid   = conf_core.design.min_wid;
+	new_minSlk   = conf_core.design.min_slk;
+	new_minDrill = conf_core.design.min_drill;
+	new_minRing  = conf_core.design.min_ring;
+
+	ghid_table_coord_entry(table, 0, 0, NULL,
+												 conf_core.design.bloat, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_Bloat, FALSE, _("Minimum copper spacing"));
+
+	ghid_table_coord_entry(table, 1, 0, NULL,
+												 conf_core.design.min_wid, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_minWid, FALSE, _("Minimum copper width"));
+
+	ghid_table_coord_entry(table, 2, 0, NULL,
+												 conf_core.design.shrink, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_Shrink, FALSE, _("Minimum touching copper overlap"));
+
+	ghid_table_coord_entry(table, 3, 0, NULL,
+												 conf_core.design.min_slk, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_minSlk, FALSE, _("Minimum silk width"));
+
+	ghid_table_coord_entry(table, 4, 0, NULL,
+												 conf_core.design.min_drill, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_minDrill, FALSE, _("Minimum drill diameter"));
+
+	ghid_table_coord_entry(table, 5, 0, NULL,
+												 conf_core.design.min_ring, PCB_MIN_DRC_VALUE, PCB_MAX_DRC_VALUE,
+												 CE_SMALL, 0, coord_entry_cb, &new_minRing, FALSE, _("Minimum annular ring"));
+
+	vbox = gtkc_vbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), vbox, TRUE, TRUE, 0);
+	config_user_role_section(com, tab_vbox, config_sizes_save, 0);
+
+	gtk_widget_show_all(config_sizes_vbox);
+}
+
+
+	/* -------------- The window config page ----------------
+	 */
+static GtkWidget *config_window_vbox;
+
+static void config_window_toggle_cb(GtkToggleButton * button, gpointer data)
+{
+	gboolean active = gtk_toggle_button_get_active(button);
+	const char *path = NULL, *ctx = data;
+
+	if (ctx == NULL)
+		return;
+
+	if (*ctx == '*') {
+		switch (ctx[1]) {
+		case 'd':
+			path = "plugins/hid_gtk/auto_save_window_geometry/to_design";
+			break;
+		case 'p':
+			path = "plugins/hid_gtk/auto_save_window_geometry/to_project";
+			break;
+		case 'u':
+			path = "plugins/hid_gtk/auto_save_window_geometry/to_user";
+			break;
+		}
+		if (path != NULL)
+			conf_set(CFR_USER, path, -1, (active ? "1" : "0"), POL_OVERWRITE);
+	}
+}
+
+
+static void config_window_row(GtkWidget * parent, const char *desc, int load, const char *wgeo_save_str, CFT_BOOLEAN chk)
+{
+	GtkWidget *hbox, *lab, *button;
+	hbox = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(parent), hbox, FALSE, FALSE, 0);
+
+	lab = gtkc_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), lab, TRUE, FALSE, 0);
+
+	lab = gtk_label_new(desc);
+	gtk_box_pack_start(GTK_BOX(hbox), lab, FALSE, FALSE, 4);
+
+	button = gtk_button_new_with_label(_("now"));
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(wgeo_save_direct), (void *) wgeo_save_str);
+
+	if (load) {
+		button = gtk_button_new_with_label(_("Load from file"));
+		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	}
+	else {
+		GtkWidget *btn;
+		pcb_gtk_check_button_connected(hbox, &btn, chk,
+																	 TRUE, FALSE, FALSE, 2,
+																	 config_window_toggle_cb, (void *) wgeo_save_str, 
+																	 _("every time pcb-rnd exits"));
+		if (wgeo_save_str == NULL)
+			gtk_widget_set_sensitive(btn, FALSE);
+	}
+}
+
+static void config_window_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *lab;
+
+	config_window_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), config_window_vbox, FALSE, FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(config_window_vbox), 6);
+
+	lab = gtk_label_new("");
+	gtk_label_set_use_markup(GTK_LABEL(lab), TRUE);
+	gtk_label_set_markup(GTK_LABEL(lab), _("<b>Save window geometry...</b>"));
+	gtk_box_pack_start(GTK_BOX(config_window_vbox), lab, FALSE, FALSE, 4);
+	gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.5);
+
+	config_window_row(config_window_vbox, "... in the design (.pcb) file", 0, "*d",
+										conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_design);
+	config_window_row(config_window_vbox, "... in the project file", 0, "*p",
+										conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_project);
+	config_window_row(config_window_vbox, "... in the central user configuration", 0, "*u",
+										conf_hid_gtk.plugins.hid_gtk.auto_save_window_geometry.to_user);
+	config_window_row(config_window_vbox, "... in a custom file", 0, NULL, 0);
+
+
+
+
+	lab = gtk_label_new("");
+	gtk_label_set_use_markup(GTK_LABEL(lab), TRUE);
+	gtk_label_set_markup(GTK_LABEL(lab), _("<small>Note: the above checkbox values are saved in the user config</small>"));
+	gtk_box_pack_start(GTK_BOX(config_window_vbox), lab, FALSE, FALSE, 4);
+	gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.5);
+
+	lab = gtk_label_new("");
+	gtk_label_set_use_markup(GTK_LABEL(lab), TRUE);
+	pref_auto_place_lab = lab;
+	pref_auto_place_update();
+	gtk_box_pack_start(GTK_BOX(config_window_vbox), lab, FALSE, FALSE, 4);
+	gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.5);
+
+	gtk_widget_show_all(config_window_vbox);
+}
+
+	/* -------------- The Library config page ----------------
+	 */
+static gtk_conf_list_t library_cl;
+
+static void config_library_apply(void)
+{
+	pcb_fp_rehash(NULL);
+}
+
+static char *get_misc_col_data(int row, int col, lht_node_t * nd)
+{
+	if ((nd != NULL) && (col == 1)) {
+		char *out;
+		pcb_path_resolve(nd->data.text.value, &out, 0);
+		return out;
+	}
+	return NULL;
+}
+
+#warning TODO: leak: this is never free()d
+lht_doc_t *config_library_lst_doc;
+lht_node_t *config_library_lst;
+
+static void lht_clean_list(lht_node_t * lst)
+{
+	lht_node_t *n;
+	while (lst->data.list.first != NULL) {
+		n = lst->data.list.first;
+		if (n->doc == NULL) {
+			if (lst->data.list.last == n)
+				lst->data.list.last = NULL;
+			lst->data.list.first = n->next;
+		}
+		else
+			lht_tree_unlink(n);
+		lht_dom_node_free(n);
+	}
+	lst->data.list.last = NULL;
+}
+
+/* Create a lihata list of the current library paths - to be tuned into CFR design upon the first modification */
+static lht_node_t *config_library_list()
+{
+	conf_listitem_t *i;
+	int idx;
+	const char *s;
+
+	if (config_library_lst_doc == NULL) {
+		/* create a new list */
+		config_library_lst_doc = lht_dom_init();
+		config_library_lst = lht_dom_node_alloc(LHT_LIST, "library_search_paths");
+		config_library_lst_doc->root = config_library_lst;
+		config_library_lst->doc = config_library_lst_doc;
+	}
+	else {
+		/* clean the old list */
+		lht_clean_list(config_library_lst);
+	}
+
+	conf_loop_list_str(&conf_core.rc.library_search_paths, i, s, idx) {
+		lht_node_t *txt;
+		const char *sfn;
+		if (i->prop.src->file_name != NULL) {
+			lht_dom_loc_newfile(config_library_lst_doc, i->prop.src->file_name);
+			lht_dom_loc_active(config_library_lst_doc, &sfn, NULL, NULL);
+		}
+		else
+			sfn = NULL;
+
+		txt = lht_dom_node_alloc(LHT_TEXT, "");
+		txt->data.text.value = pcb_strdup(i->payload);
+		txt->file_name = sfn;
+		txt->doc = config_library_lst_doc;
+		printf("append: '%s' '%s'\n", txt->data.text.value, sfn);
+		lht_dom_list_append(config_library_lst, txt);
+	}
+	return config_library_lst;
+}
+
+static void pre_rebuild(gtk_conf_list_t * cl)
+{
+	lht_node_t *m;
+	lht_clean_list(config_library_lst);
+
+	m = conf_lht_get_first(CFR_DESIGN, 0);
+
+	cl->lst = lht_tree_path_(m->doc, m, "rc/library_search_paths", 1, 0, NULL);
+	if (cl->lst == NULL) {
+		conf_set(CFR_DESIGN, "rc/library_search_paths", 0, "", POL_OVERWRITE);
+	}
+	cl->lst = lht_tree_path_(m->doc, m, "rc/library_search_paths", 1, 0, NULL);
+	assert(cl->lst != NULL);
+
+	lht_clean_list(cl->lst);
+}
+
+static void post_rebuild(gtk_conf_list_t * cl)
+{
+	conf_update("rc/library_search_paths", -1);
+}
+
+
+static GtkWidget *config_library_append_paths(int post_sep)
+{
+	GtkWidget *hbox, *vbox_key, *vbox_val, *vbox_sep, *label;
+	htsp_entry_t *e;
+
+	hbox = gtkc_hbox_new(FALSE, 0);
+
+	vbox_key = gtkc_vbox_new(FALSE, 0);
+	vbox_sep = gtkc_vbox_new(FALSE, 0);
+	vbox_val = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox_key, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox_sep, FALSE, FALSE, 16);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox_val, FALSE, FALSE, 0);
+
+	conf_fields_foreach(e) {
+		if (strncmp(e->key, "rc/path/", 8) == 0) {
+			conf_native_t *nat = e->value;
+			char tmp[256];
+
+			sprintf(tmp, "  $(rc.path.%s)", e->key + 8);
+			label = gtk_label_new(tmp);
+			gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+			gtk_box_pack_start(GTK_BOX(vbox_key), label, FALSE, FALSE, 0);
+
+			label = gtk_label_new(nat->val.string[0]);
+			gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+			gtk_box_pack_start(GTK_BOX(vbox_val), label, FALSE, FALSE, 0);
+		}
+	}
+	if (post_sep) {
+		label = gtk_label_new("\n\n");
+		gtk_box_pack_start(GTK_BOX(vbox_val), label, FALSE, FALSE, 0);
+	}
+
+	return hbox;
+}
+
+void config_library_save(GtkButton * widget, save_ctx_t * ctx)
+{
+	const char *paths[] = {
+		"rc/library_search_paths",
+		NULL
+	};
+
+	config_any_replace(ctx, paths);
+}
+
+static void config_library_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *vbox, *label, *entry, *content_vbox, *paths_box;
+	const char *cnames[] = { "configured path", "actual path on the filesystem", "config source" };
+
+	library_cl.num_cols = 3;
+	library_cl.col_names = cnames;
+	library_cl.col_data = 0;
+	library_cl.col_src = 2;
+	library_cl.reorder = 1;
+	library_cl.get_misc_col_data = NULL;
+	library_cl.file_chooser_title = "Select footprint library directory";
+	library_cl.file_chooser_postproc = NULL;
+	library_cl.get_misc_col_data = get_misc_col_data;
+	library_cl.lst = config_library_list();
+	library_cl.pre_rebuild = pre_rebuild;
+	library_cl.post_rebuild = post_rebuild;
+
+	content_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), content_vbox, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(content_vbox), 6);
+
+	gtk_container_set_border_width(GTK_CONTAINER(content_vbox), 6);
+	vbox = ghid_category_vbox(content_vbox, _("Element Directories"), 4, 2, TRUE, FALSE);
+
+	label =
+		gtk_label_new(_
+									("Ordered list of footprint library search directories; use drag&drop to reorder.\nThe following $(variables) can be used in the path:\n\n"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+	paths_box = config_library_append_paths(1);
+	gtk_box_pack_start(GTK_BOX(vbox), paths_box, FALSE, FALSE, 0);
+
+	entry = gtk_conf_list_widget(&library_cl);
+	gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 4);
+
+	config_user_role_section(com, tab_vbox, config_library_save, 0);
+}
+
+
+	/* -------------- The Layers Group config page ----------------
+	 */
+static GtkWidget *config_groups_table, *config_groups_vbox, *config_groups_window;
+
+static GtkWidget *layer_entry[PCB_MAX_LAYER];
+
+static gboolean layers_applying;
+
+static const gchar *layer_info_text[] = {
+	N_("<h>Terminology\n"),
+	N_("A layer group is a physical layer of the board. A layer is a logical\n"
+		 "layer that is always part of exactly one layer group. A layer group may\n"
+		 "host zero or more layers. A logical layer is a canvas on which objects\n"
+		 "are drawn. Physical layer groups are listed on the left - group names\n"
+		 "are printed in the cross-section. Logical layers are listed on the right.\n"),
+	"\n",
+	N_("<h>Moving layers between groups\n"),
+	N_("Drag and drop a framed layer name. Potential target group is marked with\n"
+		 "horizontal line framing. Currently only copper groups can host layers.\n"),
+	"\n",
+	N_("<h>Moving layer groups\n"),
+	N_("Drag & drop the group by its name. Currently only copper groups can be moved.\n"
+	"\n"),
+	"\n",
+	N_("<h>Creating a new group\n"),
+	N_("Drag the 'Add copper group' button and drop it in the layer stack.\n"
+	"\n"),
+	"\n",
+	N_("<h>Removing a group\n"),
+	N_("Drag the 'Del copper group' button and drop it on the group to be removed.\n"
+		 "Layers in that group are removed too.\n"
+	"\n"),
+	"\n",
+	N_("<h>Changing the display order of logical layers\n"),
+	N_("Select the layer in the main window, press the up/down arrow buttons\n"
+		 "on the Logical layers tab. The display order of layers does not affect\n"
+		 "the physical location of the layer, that is determined by the grouping.\n"
+	"\n"),
+	"\n",
+	N_("<h>Remove a logical layer\n"),
+	N_("Drag the \"Del logical layer\" button over a logical layer button.\n"),
+	"\n",
+	N_("<h>Change the name of a logical layer\n"),
+	N_("TODO\n"
+	"\n"),
+	"\n",
+	N_("<h>Create a new logical layer\n"),
+	N_("Drag the \"Add logical layer\" button over layer group.\n"),
+	"\n",
+	N_("<h>Layer button styles\n"),
+	N_("A normal, user editable layer has a thin frame and no fill.\n"
+		 "When the button is drawn with \\\\\\ fill, the layer is not user\n"
+		 "editable but automatically generated. When the frame is thick,\n"
+		 "the layer is subtracted, not added during the render.\n"
+	"\n")
+};
+
+	/* Construct a layer group string.  Follow logic in WritePCBDataHeader(),
+	   |  but use g_string functions.
+	 */
+#warning layer TODO: kill this func, have a centralized C89 implementation and use g_strdup for glib
+static gchar *make_layer_group_string(pcb_layer_stack_t * lg)
+{
+	GString *string;
+	pcb_layergrp_id_t group;
+	pcb_layer_id_t layer;
+	gint entry;
+
+	string = g_string_new("");
+
+	for (group = 0; group < pcb_max_group(PCB); group++) {
+		if (lg->grp[group].len == 0)
+			continue;
+		for (entry = 0; entry < lg->grp[group].len; entry++) {
+			layer = lg->grp[group].lid[entry];
+			if ((pcb_layer_flags(PCB, layer) & PCB_LYT_TOP) && (pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+				string = g_string_append(string, "c");
+			else if ((pcb_layer_flags(PCB, layer) & PCB_LYT_BOTTOM) && (pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+				string = g_string_append(string, "s");
+			else
+				g_string_append_printf(string, "%ld", layer + 1);
+
+			if (entry != lg->grp[group].len - 1)
+				string = g_string_append(string, ",");
+		}
+		if (group != pcb_max_group(PCB) - 1)
+			string = g_string_append(string, ":");
+	}
+	return g_string_free(string, FALSE);	/* Don't free string->str */
+}
+
+static void config_layers_apply(void)
+{
+	/* Nothing to do, changes got carried out right away */
+}
+
+void config_layers_save(GtkButton * widget, save_ctx_t * ctx)
+{
+	gchar *s;
+	const char *paths[] = {
+		"design/groups",
+		NULL
+	};
+
+	config_layers_apply();
+	s = make_layer_group_string(&PCB->LayerGroups);
+
+	conf_set(CFR_DESIGN, "design/groups", -1, s, POL_OVERWRITE);
+	g_free(s);
+	config_any_replace(ctx, paths);
+}
+
+static void config_layers_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *tabs, *vbox, *text, *content_vbox, *prv;
+	pcb_layer_id_t lid;
+	gint i;
+
+	content_vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), content_vbox, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(content_vbox), 6);
+
+	tabs = gtk_notebook_new();
+	gtk_box_pack_start(GTK_BOX(content_vbox), tabs, TRUE, TRUE, 0);
+
+/* -- Layer stack tab */
+	vbox = ghid_notebook_page(tabs, _("Physical layer stack"), 0, 6);
+	if (pcb_layer_list(PCB, PCB_LYT_CSECT, &lid, 1) > 0) {
+		pcb_gtk_preview_t *p;
+		prv = pcb_gtk_preview_layer_new(com, com->init_drawing_widget, com->preview_expose, lid);
+		gtk_box_pack_start(GTK_BOX(vbox), prv, TRUE, TRUE, 0);
+		p = (pcb_gtk_preview_t *) prv;
+		p->mouse_cb = pcb_stub_draw_csect_mouse_ev;
+	}
+
+/* -- Info tab */
+	vbox = ghid_notebook_page(tabs, _("Info"), 0, 6);
+
+	text = ghid_scrolled_text_view(vbox, NULL, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	for (i = 0; i < sizeof(layer_info_text) / sizeof(gchar *); ++i)
+		ghid_text_view_append(text, _(layer_info_text[i]));
+
+/* -- common */
+	vbox = gtkc_vbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), vbox, FALSE, TRUE, 0);
+	config_user_role_section(com, tab_vbox, config_layers_save, 1);
+}
+
+void ghid_config_layer_name_update(gchar * name, gint layer)
+{
+	if (!config_window || layers_applying || !name)
+		return;
+	gtk_entry_set_text(GTK_ENTRY(layer_entry[layer]), name);
+}
+
+	/* -------------- The Colors config page ----------------
+	 */
+static GtkWidget *config_colors_vbox, *config_colors_tab_vbox;
+
+static void config_colors_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com);
+
+typedef struct {
+	conf_native_t *cfg;
+	int idx;
+	pcb_gtk_color_t *color;
+	GtkWidget *button;
+	pcb_gtk_common_t *com;
+} cfg_color_idx_t;
+
+static void config_color_set_cb(GtkWidget * button, cfg_color_idx_t * ci)
+{
+	pcb_gtk_color_t new_color;
+	const char *str, *lcpath = "appearance/color/layer";
+
+	gtkc_color_button_get_color(button, &new_color);
+	str = ci->com->get_color_name(&new_color);
+
+	if (strcmp(ci->cfg->hash_path, lcpath) == 0) {
+		/* if the design color list is empty, we should create it and copy
+		   all current colors. If we don't, and conf_set() does it for items
+		   lower than ci->idx, it will create all colors with empty string value,
+		   ruining the color table. */
+		if (conf_lht_get_at(CFR_DESIGN, ci->cfg->hash_path, 0) == NULL) {
+			int n;
+			conf_native_t *nat = conf_get_field(ci->cfg->hash_path);
+			if (nat != NULL)
+				for(n = 0; (n < PCB_MAX_LAYER) && (n < nat->array_size); n++)
+					conf_set(CFR_DESIGN, ci->cfg->hash_path, n,  nat->val.color[n], POL_OVERWRITE);
+		}
+	}
+
+	if (conf_set(CFR_DESIGN, ci->cfg->hash_path, ci->idx, str, POL_OVERWRITE) == 0) {
+		ci->com->set_special_colors(ci->cfg);
+		ci->com->layer_buttons_update();
+		ci->com->invalidate_all();
+	}
+}
+
+static void config_color_button_create(pcb_gtk_common_t *com, GtkWidget *box, conf_native_t *cfg, int idx)
+{
+	GtkWidget *hbox, *label;
+	gchar *title;
+	cfg_color_idx_t *ci = conf_hid_get_data(cfg, ghid_conf_id);
+
+	hbox = gtkc_hbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
+
+	if ((ci == NULL) || (idx > 0)) {
+#warning LEAK: this is never free()d
+		ci = malloc(sizeof(cfg_color_idx_t));
+		ci->cfg = cfg;
+		ci->idx = idx;
+		ci->color = calloc(sizeof(pcb_gtk_color_t), cfg->array_size);
+		if (idx == 0)
+			conf_hid_set_data(cfg, ghid_conf_id, ci);
+	}
+
+	com->map_color_string(cfg->val.color[idx], &(ci->color[idx]));
+
+	title = g_strdup_printf(_("pcb-rnd %s Color"), cfg->description);
+	ci->button = gtkc_color_button_new_with_color(&(ci->color[idx]));
+	gtk_color_button_set_title(GTK_COLOR_BUTTON(ci->button), title);
+	g_free(title);
+
+	gtk_box_pack_start(GTK_BOX(hbox), ci->button, FALSE, FALSE, 0);
+	label = gtk_label_new(cfg->description);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+	ci->com = com;
+	g_signal_connect(G_OBJECT(ci->button), "color-set", G_CALLBACK(config_color_set_cb), ci);
+}
+
+void config_color_button_update(pcb_gtk_common_t *com, conf_native_t *cfg, int idx)
+{
+	if (idx < 0) {
+		for (idx = 0; idx < cfg->array_size; idx++)
+			config_color_button_update(com, cfg, idx);
+	}
+	else {
+		cfg_color_idx_t *ci = conf_hid_get_data(cfg, ghid_conf_id);
+
+		com->map_color_string(cfg->val.color[idx], &(ci->color[idx]));
+		gtkc_color_button_set_color(ci->button, &(ci->color[idx]));
+	}
+}
+
+void config_colors_tab_create_scalar(pcb_gtk_common_t *com, GtkWidget *parent_vbox, const char *path_prefix)
+{
+	htsp_entry_t *e;
+	int pl = strlen(path_prefix);
+
+	conf_fields_foreach(e) {
+		conf_native_t *cfg = e->value;
+		if ((strncmp(e->key, path_prefix, pl) == 0) && (cfg->type == CFN_COLOR) && (cfg->array_size == 1))
+			config_color_button_create(com, parent_vbox, cfg, 0);
+	}
+}
+
+void config_colors_tab_create_array(pcb_gtk_common_t *com, GtkWidget * parent_vbox, const char *path)
+{
+	conf_native_t *cfg = conf_get_field(path);
+	int n;
+	if (cfg->type != CFN_COLOR)
+		return;
+
+	for (n = 0; n < cfg->used; n++)
+		config_color_button_create(com, parent_vbox, cfg, n);
+}
+
+void config_colors_save(GtkButton * widget, save_ctx_t * ctx)
+{
+	const char *paths[] = {
+		"*appearance/color/",
+		NULL
+	};
+
+	config_any_replace(ctx, paths);
+}
+
+static void config_colors_tab_create(GtkWidget * tab_vbox, pcb_gtk_common_t *com)
+{
+	GtkWidget *scrolled_vbox, *vbox, *expander;
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(tab_vbox), vbox, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+
+	config_colors_vbox = vbox;		/* can be destroyed if color file loaded */
+	config_colors_tab_vbox = tab_vbox;
+
+	scrolled_vbox = ghid_scrolled_vbox(config_colors_vbox, NULL, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+	/* ---- Main colors ---- */
+	expander = gtk_expander_new(_("Main colors"));
+	gtk_box_pack_start(GTK_BOX(scrolled_vbox), expander, FALSE, FALSE, 2);
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(expander), vbox);
+	vbox = ghid_category_vbox(vbox, NULL, 0, 2, TRUE, FALSE);
+
+	config_colors_tab_create_scalar(com, vbox, "appearance/color");
+
+	/* ---- Layer colors ---- */
+	expander = gtk_expander_new(_("Layer colors"));
+	gtk_box_pack_start(GTK_BOX(scrolled_vbox), expander, FALSE, FALSE, 2);
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(expander), vbox);
+	vbox = ghid_category_vbox(vbox, NULL, 0, 2, TRUE, FALSE);
+
+	config_colors_tab_create_array(com, vbox, "appearance/color/layer");
+
+	config_user_role_section(com, config_colors_vbox, config_colors_save, 0);
+
+	gtk_widget_show_all(config_colors_vbox);
+}
+
+
+	/* --------------- The main config page -----------------
+	 */
+enum {
+	CONFIG_NAME_COLUMN,
+	CONFIG_PAGE_COLUMN,
+	CONFIG_PAGE_UPDATE_CB,
+	CONFIG_PAGE_DATA,
+	N_CONFIG_COLUMNS
+};
+
+
+static GtkWidget *config_page_create(GtkTreeStore * tree, GtkTreeIter * iter, GtkNotebook * notebook)
+{
+	GtkWidget *vbox;
+	gint page;
+
+	vbox = gtkc_vbox_new(FALSE, 0);
+	gtk_notebook_append_page(notebook, vbox, NULL);
+	page = gtk_notebook_get_n_pages(notebook) - 1;
+	gtk_tree_store_set(tree, iter, CONFIG_PAGE_COLUMN, page, CONFIG_PAGE_UPDATE_CB, NULL, CONFIG_PAGE_DATA, NULL, -1);
+	return vbox;
+}
+
+void ghid_config_handle_units_changed(pcb_gtk_common_t *com)
+{
+	if (config_sizes_vbox) {
+		gtk_widget_destroy(config_sizes_vbox);
+		config_sizes_vbox = NULL;
+		config_sizes_tab_create(config_sizes_tab_vbox, com);
+		gtk_widget_show(config_sizes_tab_vbox);
+	}
+}
+
+void ghid_config_text_scale_update(void)
+{
+	if (config_window)
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(config_text_spin_button), (gdouble) conf_core.design.text_scale);
+}
+
+static void config_do_close(int apply)
+{
+	if (config_window == NULL) /* may get the event from multiple sources */
+		return;
+
+	/* Config pages may need to check for modified entries, use as default
+	   |  options, etc when the config window is closed.
+	 */
+	if (apply) {
+		config_sizes_apply();
+		config_layers_apply();
+		config_library_apply();
+	}
+
+	config_sizes_vbox = NULL;
+	config_sizes_tab_vbox = NULL;
+
+	config_groups_vbox = config_groups_table = NULL;
+	config_groups_window = NULL;
+
+	gtk_widget_destroy(config_window);
+	config_window = NULL;
+}
+
+static void config_close_cb(gpointer data)
+{
+	config_do_close(1);
+}
+
+static void config_destroy_cb(gpointer data)
+{
+	config_do_close(0);
+}
+
+static void config_selection_changed_cb(GtkTreeSelection * selection, gpointer data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	gint page;
+	void *cb, *page_data;
+
+	if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+		return;
+	gtk_tree_model_get(model, &iter, CONFIG_PAGE_COLUMN, &page, CONFIG_PAGE_UPDATE_CB, &cb, CONFIG_PAGE_DATA, &page_data, -1);
+	if (cb != NULL) {
+		void (*fnc) (void *data) = pcb_cast_d2f(cb);
+		fnc(page_data);
+	}
+	gtk_notebook_set_current_page(config_notebook, page);
+}
+
+/* Create a root (e.g. Config PoV) top level in the preference tree; iter is output and acts as a parent for further nodes */
+static void config_tree_sect(GtkTreeStore * model, GtkTreeIter * parent, GtkTreeIter * iter, const char *name, const char *desc)
+{
+	GtkWidget *vbox, *label;
+	gtk_tree_store_append(model, iter, parent);
+	gtk_tree_store_set(model, iter, CONFIG_NAME_COLUMN, name, -1);
+	vbox = config_page_create(model, iter, config_notebook);
+	label = gtk_label_new("");
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_label_set_markup(GTK_LABEL(label), desc);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+}
+
+/* Create a leaf node with a custom tab */
+static GtkWidget *config_tree_leaf_(GtkTreeStore * model, GtkTreeIter * parent, const char *name,
+																		void (*tab_create) (GtkWidget * tab_vbox, pcb_gtk_common_t *com), GtkTreeIter * iter, pcb_gtk_common_t *com)
+{
+	GtkWidget *vbox = NULL;
+
+	gtk_tree_store_append(model, iter, parent);
+	gtk_tree_store_set(model, iter, CONFIG_NAME_COLUMN, name, -1);
+	if (tab_create != NULL) {
+		vbox = config_page_create(model, iter, config_notebook);
+		tab_create(vbox, com);
+	}
+	return vbox;
+}
+
+static GtkWidget *config_tree_leaf(GtkTreeStore * model, GtkTreeIter * parent, const char *name,
+																	 void (*tab_create) (GtkWidget * tab_vbox, pcb_gtk_common_t *com), pcb_gtk_common_t *com)
+{
+	GtkTreeIter iter;
+	return config_tree_leaf_(model, parent, name, tab_create, &iter, com);
+}
+
+/***** auto *****/
+static struct {
+	GtkWidget *name, *desc, *src;
+
+	GtkWidget *edit_idx_box;
+	GtkWidget *edit_idx;
+
+	GtkWidget *edit_idx_new;
+
+	GtkWidget *edit_string;
+	GtkWidget *edit_coord;
+	GtkWidget *edit_int;
+	GtkWidget *edit_real;
+	GtkWidget *edit_boolean;
+	GtkWidget *edit_color;
+	GtkWidget *edit_unit;
+	GtkWidget *edit_list;
+
+	GtkWidget *result;
+	GtkWidget *finalize;					/* finalzie hbox */
+
+	GtkWidget *btn_apply;
+	GtkWidget *btn_reset;
+	GtkWidget *btn_remove;
+	GtkWidget *txt_apply;
+
+	GtkWidget *btn_create;
+
+	GtkAdjustment *edit_idx_adj;
+	GtkAdjustment *edit_int_adj;
+	GtkAdjustment *edit_real_adj;
+	pcb_gtk_color_t color;
+	gtk_conf_list_t cl;
+
+	GtkListStore *src_l, *res_l;
+	GtkWidget *src_t, *res_t;
+	conf_native_t *nat;
+} auto_tab_widgets;
+
+static void config_auto_src_changed_cb(GtkTreeView * tree, void *data);
+static void config_auto_idx_changed_cb(GtkTreeView * tree, void *data);
+static void config_auto_idx_create_cb(GtkButton * btn, void *data);
+static void config_auto_idx_remove_cb(GtkButton * btn, void *data);
+static void config_auto_apply_cb(GtkButton * btn, void *data);
+static void config_auto_reset_cb(GtkButton * btn, void *data);
+static void config_auto_remove_cb(GtkButton * btn, void *data);
+static void config_auto_create_cb(GtkButton * btn, void *data);
+static void config_page_update_auto(void *data);
+
+/* Let the widget resize itself. */
+static void widget_set_size_automatic_cb(GtkWidget *w, void *data)
+{
+	gtk_widget_set_size_request(w, -1, -1);
+}
+
+/* Wraps the child in a "packed" scrolled window. */
+static GtkWidget *bu_scrolled_window_packed(GtkWidget * child, GtkOrientation orientation)
+{
+	GtkWidget *scrolled, *viewport, *b1, *b2;
+
+	if (orientation == GTK_ORIENTATION_VERTICAL) {
+		b1 = gtkc_vbox_new(FALSE, 0);
+		b2 = gtkc_vbox_new(FALSE, 0);
+	}
+	else {
+		b1 = gtkc_hbox_new(FALSE, 0);
+		b2 = gtkc_hbox_new(FALSE, 0);
+	}
+	gtk_box_pack_start(GTK_BOX(b1), child, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(b1), b2, TRUE, TRUE, 0);
+
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtkc_scrolled_window_add_with_viewport(scrolled, b1);
+	viewport = gtk_bin_get_child(GTK_BIN(scrolled));
+	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
+	gtk_widget_set_size_request(viewport, 100, 200);
+	g_signal_connect(G_OBJECT(viewport), "realize", G_CALLBACK(widget_set_size_automatic_cb), NULL);
+
+	return scrolled;
+}
+
+/* Evaluates to 1 if the user canedit the config for this role */
+#define EDITABLE_ROLE(role) ((role == CFR_USER)  || (role == CFR_DESIGN) || (role == CFR_CLI) || ((role == CFR_PROJECT) && (PCB != NULL) && (PCB->Filename != NULL)))
+
+static void config_auto_tab_create(pcb_gtk_common_t *com, GtkWidget *tab_vbox, const char *basename)
+{
+	GtkWidget *vbox, *src, *src_right, *w;
+
+	gtk_container_set_border_width(GTK_CONTAINER(tab_vbox), 6);
+	vbox = ghid_category_vbox(tab_vbox, "Configuration node", 4, 2, TRUE, FALSE);
+
+	/* header */
+	auto_tab_widgets.name = gtk_label_new("setting name");
+	gtk_label_set_use_markup(GTK_LABEL(auto_tab_widgets.name), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), auto_tab_widgets.name, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(auto_tab_widgets.name), 0., 0.);
+
+	auto_tab_widgets.desc = gtk_label_new("setting desc");
+	gtk_box_pack_start(GTK_BOX(vbox), auto_tab_widgets.desc, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(auto_tab_widgets.desc), 0., 0.);
+
+
+	/* upper hbox */
+	gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 4);
+	src = gtkc_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(vbox), src, FALSE, FALSE, 4);
+
+
+	/* upper-left: sources */
+	{
+		static const char *col_names[] = { "role", "prio", "policy", "value" };
+		static GType ty[] = { G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING };
+		const char **s;
+		int n, num_cols = sizeof(col_names) / sizeof(col_names[0]);
+		auto_tab_widgets.src_t = gtk_tree_view_new();
+		auto_tab_widgets.src_l = gtk_list_store_newv(num_cols, ty);
+		for (n = 0, s = col_names; n < num_cols; n++, s++) {
+			GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+			gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(auto_tab_widgets.src_t), -1, *s, renderer, "text", n, NULL);
+		}
+		gtk_tree_view_set_model(GTK_TREE_VIEW(auto_tab_widgets.src_t), GTK_TREE_MODEL(auto_tab_widgets.src_l));
+		g_signal_connect(G_OBJECT(auto_tab_widgets.src_t), "cursor-changed", G_CALLBACK(config_auto_src_changed_cb), com);
+	}
+	w = bu_scrolled_window_packed(auto_tab_widgets.src_t, GTK_ORIENTATION_HORIZONTAL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+	gtk_box_pack_start(GTK_BOX(src), w, TRUE, TRUE, 4);
+
+	src_right = gtkc_vbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(src), src_right, FALSE, FALSE, 4);
+
+
+	/* upper-right: edit data */
+	gtk_box_pack_start(GTK_BOX(src_right), gtk_label_new("Edit value of the selected source"), FALSE, FALSE, 0);
+
+	auto_tab_widgets.src = gtk_label_new("source");
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.src, FALSE, FALSE, 0);
+	gtk_label_set_line_wrap(GTK_LABEL(auto_tab_widgets.src), TRUE);
+
+	{															/* array index bar */
+		auto_tab_widgets.edit_idx_box = gtkc_hbox_new(FALSE, 4);
+		gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_idx_box, FALSE, FALSE, 4);
+
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.edit_idx_box), gtk_label_new("Array index:"), FALSE, FALSE, 4);
+
+		auto_tab_widgets.edit_idx_adj = GTK_ADJUSTMENT(gtk_adjustment_new(10, 0,	/* min */
+																																			4, 1, 1,	/* steps */
+																																			0.0));
+		g_signal_connect(G_OBJECT(auto_tab_widgets.edit_idx_adj), "value-changed", G_CALLBACK(config_auto_idx_changed_cb), com);
+		auto_tab_widgets.edit_idx = gtk_spin_button_new(auto_tab_widgets.edit_idx_adj, 1, 4);
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.edit_idx_box), auto_tab_widgets.edit_idx, FALSE, FALSE, 4);
+
+
+		w = gtk_button_new_with_label("Append item");
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.edit_idx_box), w, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_idx_create_cb), com);
+
+		w = gtk_button_new_with_label("Remove item");
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.edit_idx_box), w, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_idx_remove_cb), com);
+
+	}
+
+
+	auto_tab_widgets.edit_string = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_string, FALSE, FALSE, 4);
+
+	auto_tab_widgets.edit_coord = pcb_gtk_coord_entry_new(PCB_MM_TO_COORD(-1000), PCB_MM_TO_COORD(1000), 0, conf_core.editor.grid_unit, CE_TINY);
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_coord, FALSE, FALSE, 4);
+
+	auto_tab_widgets.edit_int_adj = GTK_ADJUSTMENT(gtk_adjustment_new(10, -20000,	/* min */
+																																		20000, 1, 10,	/* steps */
+																																		0.0));
+	auto_tab_widgets.edit_int = gtk_spin_button_new(auto_tab_widgets.edit_int_adj, 1, 4);
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_int, FALSE, FALSE, 4);
+
+	auto_tab_widgets.edit_real_adj = GTK_ADJUSTMENT(gtk_adjustment_new(10, 0,	/* min */
+																																		 20000, 1, 10,	/* steps */
+																																		 0.0));
+	auto_tab_widgets.edit_real = gtk_spin_button_new(auto_tab_widgets.edit_real_adj, 1, 4);
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_real, FALSE, FALSE, 4);
+
+	pcb_gtk_check_button_connected(src_right, &auto_tab_widgets.edit_boolean, 0, TRUE, FALSE, FALSE, 2, NULL, NULL, NULL);
+
+	auto_tab_widgets.edit_color = gtk_color_button_new();
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_color, FALSE, FALSE, 4);
+
+	auto_tab_widgets.edit_unit = gtkc_combo_box_text_new();
+	gtkc_combo_box_text_append_text(auto_tab_widgets.edit_unit, "mm");
+	gtkc_combo_box_text_append_text(auto_tab_widgets.edit_unit, "mil");
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_unit, FALSE, FALSE, 4);
+
+	{															/* list */
+		static const char *col_names[] = { "list items" };
+		auto_tab_widgets.cl.num_cols = 1;
+		auto_tab_widgets.cl.col_names = col_names;
+		auto_tab_widgets.cl.col_data = 0;
+		auto_tab_widgets.cl.col_src = -1;
+		auto_tab_widgets.cl.reorder = 1;
+		auto_tab_widgets.cl.inhibit_rebuild = 1;
+		auto_tab_widgets.cl.lst = NULL;
+		auto_tab_widgets.cl.pre_rebuild = auto_tab_widgets.cl.post_rebuild = NULL;
+		auto_tab_widgets.cl.get_misc_col_data = NULL;
+		auto_tab_widgets.cl.file_chooser_title = NULL;
+		auto_tab_widgets.edit_list = gtk_conf_list_widget(&auto_tab_widgets.cl);
+		gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.edit_list, FALSE, FALSE, 4);
+	}
+
+	/* Apply/cancel buttons */
+	{
+		auto_tab_widgets.finalize = gtkc_hbox_new(FALSE, 0);
+
+		auto_tab_widgets.btn_apply = w = gtk_button_new_with_label("Apply");
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.finalize), w, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_apply_cb), com);
+
+		auto_tab_widgets.btn_reset = w = gtk_button_new_with_label("Reset");
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.finalize), w, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_reset_cb), com);
+
+		auto_tab_widgets.btn_remove = w = gtk_button_new_with_label("Remove");
+		gtk_box_pack_start(GTK_BOX(auto_tab_widgets.finalize), w, FALSE, FALSE, 0);
+		g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_remove_cb), NULL);
+
+		gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.finalize, FALSE, FALSE, 0);
+	}
+
+	auto_tab_widgets.txt_apply = gtk_label_new("");
+	gtk_box_pack_start(GTK_BOX(src_right), auto_tab_widgets.txt_apply, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(auto_tab_widgets.txt_apply), 0., 0.);
+
+	auto_tab_widgets.btn_create = w = gtk_button_new_with_label("Create item in selected source");
+	gtk_box_pack_start(GTK_BOX(src_right), w, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(config_auto_create_cb), NULL);
+
+
+	/* lower hbox for displaying the rendered value */
+	gtk_box_pack_start(GTK_BOX(tab_vbox), gtk_hseparator_new(), FALSE, FALSE, 4);
+
+	w = gtk_label_new("Resulting native configuration value, after merging all sources above:");
+	gtk_box_pack_start(GTK_BOX(tab_vbox), w, FALSE, FALSE, 0);
+	gtk_misc_set_alignment(GTK_MISC(w), 0., 0.);
+
+	{
+		static const char *col_names[] = { "index", "role & prio", "value" };
+		static GType ty[] = { G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING };
+		const char **s;
+		GtkWidget *scrolled;
+
+		int n, num_cols = sizeof(col_names) / sizeof(col_names[0]);
+		auto_tab_widgets.res_t = gtk_tree_view_new();
+		auto_tab_widgets.res_l = gtk_list_store_newv(num_cols, ty);
+
+		for (n = 0, s = col_names; n < num_cols; n++, s++) {
+			GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+			gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(auto_tab_widgets.res_t), -1, *s, renderer, "text", n, NULL);
+		}
+		gtk_tree_view_set_model(GTK_TREE_VIEW(auto_tab_widgets.res_t), GTK_TREE_MODEL(auto_tab_widgets.res_l));
+		scrolled = bu_scrolled_window_packed(auto_tab_widgets.res_t, GTK_ORIENTATION_VERTICAL);
+		gtk_box_pack_start(GTK_BOX(tab_vbox), scrolled, TRUE, TRUE, 4);
+	}
+	gtk_widget_set_size_request(tab_vbox, -1, -1); /* Recompute the window size */
+}
+
+/* hide all source edit widgets */
+static void config_auto_src_hide(void)
+{
+	gtk_widget_hide(auto_tab_widgets.edit_string);
+	gtk_widget_hide(auto_tab_widgets.edit_coord);
+	gtk_widget_hide(auto_tab_widgets.edit_int);
+	gtk_widget_hide(auto_tab_widgets.edit_real);
+	gtk_widget_hide(auto_tab_widgets.edit_boolean);
+	gtk_widget_hide(auto_tab_widgets.edit_color);
+	gtk_widget_hide(auto_tab_widgets.edit_unit);
+	gtk_widget_hide(auto_tab_widgets.edit_list);
+	gtk_widget_hide(auto_tab_widgets.src);
+	gtk_widget_hide(auto_tab_widgets.finalize);
+
+}
+
+/* Return the nth child of a list - only if it's really a list; if idx < 0,
+   use the index adjustment value */
+static lht_node_t *config_auto_get_nth(const lht_node_t * list, int idx)
+{
+	const lht_node_t *nd;
+
+	if (list->type != LHT_LIST)
+		return NULL;
+
+	if (idx < 0)
+		idx = gtk_adjustment_get_value(auto_tab_widgets.edit_idx_adj);
+
+	for (nd = list->data.list.first; (idx > 0) && (nd != NULL); nd = nd->next, idx--);
+
+	return (lht_node_t *) nd;
+}
+
+/* set up all source edit widgets for a lihata source node */
+static void config_auto_src_show(pcb_gtk_common_t *com, lht_node_t *nd)
+{
+	conf_native_t *nat = auto_tab_widgets.nat;
+	char *tmp;
+	int l;
+	confitem_t citem;
+
+	if (nd != NULL) {
+		tmp = pcb_strdup_printf("%s:%d.%d", nd->file_name, nd->line, nd->col);
+		gtk_label_set_text(GTK_LABEL(auto_tab_widgets.src), tmp);
+		free(tmp);
+		gtk_widget_show(auto_tab_widgets.src);
+	}
+	else
+		gtk_widget_hide(auto_tab_widgets.src);
+
+	/* don't allow arrays of lists atm */
+	if (nat->type == CFN_LIST) {
+		if (nd->type != LHT_LIST)
+			return;
+	}
+	if (nat->array_size > 1) {
+		nd = config_auto_get_nth(nd, -1);
+		if (nd == NULL)
+			return;
+		if (nd->type != LHT_TEXT)
+			return;
+	}
+	else {
+		if (nd->type != LHT_TEXT)
+			return;
+	}
+
+	memset(&citem, 0, sizeof(citem));
+
+	switch (nat->type) {
+	case CFN_STRING:
+		gtk_entry_set_text(GTK_ENTRY(auto_tab_widgets.edit_string), nd->data.text.value);
+		gtk_widget_show(auto_tab_widgets.edit_string);
+		break;
+	case CFN_COORD:
+		{
+			pcb_coord_t coord = 0;
+			citem.coord = &coord;
+			conf_parse_text(&citem, 0, nat->type, nd->data.text.value, nd);
+			pcb_gtk_coord_entry_set_value(GHID_COORD_ENTRY(auto_tab_widgets.edit_coord), coord);
+			gtk_widget_show(auto_tab_widgets.edit_coord);
+		}
+		break;
+	case CFN_INTEGER:
+		{
+			long i = 0;
+			citem.integer = &i;
+			conf_parse_text(&citem, 0, nat->type, nd->data.text.value, nd);
+			gtk_adjustment_set_value(GTK_ADJUSTMENT(auto_tab_widgets.edit_int_adj), i);
+			gtk_widget_show(auto_tab_widgets.edit_int);
+		}
+		break;
+	case CFN_REAL:
+		{
+			double d = 0;
+			citem.real = &d;
+			conf_parse_text(&citem, 0, nat->type, nd->data.text.value, nd);
+			gtk_adjustment_set_value(GTK_ADJUSTMENT(auto_tab_widgets.edit_real_adj), d);
+			gtk_widget_show(auto_tab_widgets.edit_real);
+		}
+		break;
+	case CFN_BOOLEAN:
+		{
+			int b = 0;
+			citem.boolean = &b;
+			conf_parse_text(&citem, 0, nat->type, nd->data.text.value, nd);
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_tab_widgets.edit_boolean), b);
+			gtk_widget_show(auto_tab_widgets.edit_boolean);
+		}
+		break;
+	case CFN_COLOR:
+		com->map_color_string(nd->data.text.value, &auto_tab_widgets.color);
+		gtkc_color_button_set_color(auto_tab_widgets.edit_color, &auto_tab_widgets.color);
+		gtk_widget_show(auto_tab_widgets.edit_color);
+		break;
+	case CFN_UNIT:
+		{
+			const pcb_unit_t *u = NULL;
+			citem.unit = &u;
+			conf_parse_text(&citem, 0, nat->type, nd->data.text.value, nd);
+			if (citem.unit[0] == NULL)
+				l = -1;
+			else if (strcmp(citem.unit[0]->suffix, "mm") == 0)
+				l = 0;
+			else if (strcmp(citem.unit[0]->suffix, "mil") == 0)
+				l = 1;
+			else
+				l = -1;
+			gtk_combo_box_set_active(GTK_COMBO_BOX(auto_tab_widgets.edit_unit), l);
+			gtk_widget_show(auto_tab_widgets.edit_unit);
+		}
+		break;
+	case CFN_LIST:
+		gtk_conf_list_set_list(&auto_tab_widgets.cl, nd);
+		gtk_widget_show(auto_tab_widgets.edit_list);
+		break;
+	}
+	gtk_widget_show(auto_tab_widgets.finalize);
+}
+
+static void config_auto_res_show_add(const char *s_idx, const confprop_t * prop, const char *val)
+{
+	GtkTreeIter iter;
+	char s_pol_prio[256];
+
+	if (prop->src != NULL)
+		sprintf(s_pol_prio, "%s-%d", conf_role_name(conf_lookup_role(prop->src)), prop->prio);
+	else
+		sprintf(s_pol_prio, "%d", prop->prio);
+
+	gtk_list_store_append(auto_tab_widgets.res_l, &iter);
+	gtk_list_store_set(auto_tab_widgets.res_l, &iter, 0, s_idx, 1, s_pol_prio, 2, val, -1);
+}
+
+/* Fill in the result table on the bottom using the native value */
+static void config_auto_res_show(void)
+{
+	char s_idx[16];
+	conf_native_t *nat = auto_tab_widgets.nat;
+	gds_t buff;
+
+	gtk_list_store_clear(auto_tab_widgets.res_l);
+
+	/* This code addmitedly does not handle array of lists - for now; once the
+	   list-loop below is moved to config_auto_res_show_add, it will work */
+	if (nat->type == CFN_LIST) {
+		conf_listitem_t *n;
+		for (n = conflist_first(nat->val.list); n != NULL; n = conflist_next(n)) {
+			gds_init(&buff);
+			conf_print_native_field((conf_pfn) pcb_append_printf, &buff, 0, &n->val, n->type, &n->prop, 0);
+			config_auto_res_show_add("0", &n->prop, buff.array);
+			gds_uninit(&buff);
+		}
+	}
+	else {
+		pcb_cardinal_t n;
+		for (n = 0; n < nat->used; n++) {
+			if (nat->array_size >= 2)
+				sprintf(s_idx, "%d", n);
+			else
+				*s_idx = '\0';
+			gds_init(&buff);
+			conf_print_native_field((conf_pfn) pcb_append_printf, &buff, 0, &nat->val, nat->type, nat->prop, n);
+			config_auto_res_show_add(s_idx, &nat->prop[n], buff.array);
+			gds_uninit(&buff);
+		}
+	}
+}
+
+/* return the role we are currently editing */
+static conf_role_t config_auto_get_edited_role(void)
+{
+	GtkTreePath *p;
+	gint *i;
+	int role = CFR_invalid;
+
+	gtk_tree_view_get_cursor(GTK_TREE_VIEW(auto_tab_widgets.src_t), &p, NULL);
+	if (p == NULL)
+		return CFR_invalid;
+	i = gtk_tree_path_get_indices(p);
+	if (i != NULL)
+		role = i[0];
+	gtk_tree_path_free(p);
+	return role;
+}
+
+static void conf_auto_set_edited_role(conf_role_t r)
+{
+	GtkTreePath *p = gtk_tree_path_new_from_indices(r, -1);
+	gtk_tree_view_set_cursor(GTK_TREE_VIEW(auto_tab_widgets.src_t), p, NULL, 0);
+	gtk_tree_path_free(p);
+}
+
+
+/* Update the conf item edit section; called when a source is clicked */
+static void config_auto_src_changed_cb(GtkTreeView * tree, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	int role = config_auto_get_edited_role(), idx, len = 0;
+	lht_node_t *nd;
+	int allow_idx = 0;
+
+	gtk_widget_hide(auto_tab_widgets.edit_idx_box);
+
+	if (role != CFR_invalid) {
+		nd = conf_lht_get_at(role, auto_tab_widgets.nat->hash_path, 0);
+		if (nd != NULL) {
+			config_auto_src_show(com, nd);
+			gtk_widget_hide(auto_tab_widgets.btn_create);
+			allow_idx = 0;
+			if (nd->type == LHT_LIST) {
+				lht_node_t *n;
+				for (n = nd->data.list.first; n != NULL; n = n->next)
+					len++;
+			}
+		}
+		else {
+			config_auto_src_hide();
+			if (EDITABLE_ROLE(role))
+				gtk_widget_show(auto_tab_widgets.btn_create);
+			else
+				gtk_widget_hide(auto_tab_widgets.btn_create);
+		}
+	}
+
+	if (EDITABLE_ROLE(role)) {
+		gtk_widget_set_sensitive(auto_tab_widgets.btn_apply, 1);
+		gtk_widget_set_sensitive(auto_tab_widgets.btn_reset, 1);
+		gtk_label_set_text(GTK_LABEL(auto_tab_widgets.txt_apply), "");
+		if (conf_lht_get_at(role, auto_tab_widgets.nat->hash_path, 0) != NULL)
+			allow_idx = 1;
+	}
+	else {
+		gtk_widget_set_sensitive(auto_tab_widgets.btn_apply, 0);
+		gtk_widget_set_sensitive(auto_tab_widgets.btn_reset, 0);
+		gtk_label_set_text(GTK_LABEL(auto_tab_widgets.txt_apply), "(Can't write config source)");
+	}
+
+	/* adjust array index widget state and max according to our actual array size */
+	idx = gtk_adjustment_get_value(auto_tab_widgets.edit_idx_adj);
+	if (idx >= len)
+		gtk_adjustment_set_value(auto_tab_widgets.edit_idx_adj, len - 1);
+
+	gtk_adjustment_set_upper(auto_tab_widgets.edit_idx_adj, len - 1);
+
+	if ((allow_idx) && (auto_tab_widgets.nat->array_size > 1))
+		gtk_widget_show(auto_tab_widgets.edit_idx_box);
+}
+
+static void config_auto_idx_changed_cb(GtkTreeView * tree, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	int role = config_auto_get_edited_role();
+	if (role != CFR_invalid) {
+		lht_node_t *nd = conf_lht_get_at(role, auto_tab_widgets.nat->hash_path, 0);
+		if (nd != NULL)
+			config_auto_src_show(com, nd);
+	}
+}
+
+static void config_auto_idx_deladd_cb(pcb_gtk_common_t *com, int del)
+{
+	int role = config_auto_get_edited_role();
+	if (role != CFR_invalid) {
+		if (del) {
+			int idx = gtk_adjustment_get_value(auto_tab_widgets.edit_idx_adj);
+			conf_set(role, auto_tab_widgets.nat->hash_path, idx, NULL, POL_OVERWRITE);
+		}
+		else
+			conf_set(role, auto_tab_widgets.nat->hash_path, -1, "", POL_APPEND);
+		config_auto_src_changed_cb(GTK_TREE_VIEW(auto_tab_widgets.src_t), com);
+		config_auto_res_show();
+	}
+}
+
+static void config_auto_idx_create_cb(GtkButton * btn, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	config_auto_idx_deladd_cb(com, 0);
+}
+
+static void config_auto_idx_remove_cb(GtkButton * btn, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	config_auto_idx_deladd_cb(com, 1);
+}
+
+static void config_auto_save(conf_role_t role)
+{
+	const char *pcbfn = (PCB == NULL ? NULL : PCB->Filename);
+	/* Can't save the CLI */
+	if (role == CFR_CLI)
+		return;
+
+	if (role == CFR_PROJECT) {
+		const char *try;
+		const char *fn = conf_get_project_conf_name(NULL, pcbfn, &try);
+		if (fn == NULL) {
+			FILE *f;
+			f = pcb_fopen(try, "w");
+			if (f == NULL) {
+				pcb_message(PCB_MSG_ERROR, "can not create config to project file: %s\n", try);
+				return;
+			}
+			fclose(f);
+		}
+	}
+
+	conf_save_file(NULL, pcbfn, role, NULL);
+}
+
+static void config_auto_apply_cb(GtkButton * btn, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	conf_native_t *nat = auto_tab_widgets.nat;
+	conf_role_t role = config_auto_get_edited_role();
+	char buff[128];
+	const char *new_val = NULL;
+	int arr_idx = -1;
+	int update_clr = 0;
+
+	switch (nat->type) {
+	case CFN_STRING:
+		new_val = gtk_entry_get_text(GTK_ENTRY(auto_tab_widgets.edit_string));
+		break;
+	case CFN_COORD:
+		pcb_gtk_coord_entry_get_value_str(GHID_COORD_ENTRY(auto_tab_widgets.edit_coord), buff, sizeof(buff));
+		new_val = buff;
+		break;
+	case CFN_INTEGER:
+		sprintf(buff, "%.0f", gtk_adjustment_get_value(GTK_ADJUSTMENT(auto_tab_widgets.edit_int_adj)));
+		new_val = buff;
+		break;
+	case CFN_REAL:
+		pcb_sprintf(buff, "%.08mf", gtk_adjustment_get_value(GTK_ADJUSTMENT(auto_tab_widgets.edit_real_adj)));
+		new_val = buff;
+		break;
+	case CFN_BOOLEAN:
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_tab_widgets.edit_boolean)))
+			new_val = "1";
+		else
+			new_val = "0";
+		break;
+	case CFN_COLOR:
+		{
+			pcb_gtk_color_t clr;
+			gtkc_color_button_get_color(auto_tab_widgets.edit_color, &clr);
+			new_val = com->get_color_name(&clr);
+			update_clr = 1;
+		}
+		break;
+	case CFN_UNIT:
+		{
+			char *s = gtkc_combo_box_text_get_active_text(auto_tab_widgets.edit_unit);
+			strcpy(buff, s);
+			new_val = buff;
+			g_free(s);
+		}
+		break;
+	case CFN_LIST:
+		{
+			GtkTreeModel *tm = gtk_tree_view_get_model(GTK_TREE_VIEW(auto_tab_widgets.cl.t));
+			GtkTreeIter it;
+			gboolean valid;
+			int n;
+
+			for (valid = gtk_tree_model_get_iter_first(tm, &it), n = 0; valid; valid = gtk_tree_model_iter_next(tm, &it), n++) {
+				gchar *s;
+				gtk_tree_model_get(tm, &it, auto_tab_widgets.cl.col_data, &s, -1);
+				conf_set_dry(role, nat->hash_path, -1, pcb_strdup(s), (n == 0) ? POL_OVERWRITE : POL_APPEND, 0);
+				g_free(s);
+			}
+			conf_update(nat->hash_path, -1);
+			config_auto_save(role);
+		}
+		new_val = NULL;							/* do not run conf_set, but run the rest of the updates */
+		break;
+	}
+
+	if (nat->array_size > 1)
+		arr_idx = gtk_adjustment_get_value(auto_tab_widgets.edit_idx_adj);
+
+	if (new_val != NULL) {
+		conf_set(role, nat->hash_path, arr_idx, new_val, POL_OVERWRITE);
+		config_auto_save(role);
+	}
+
+	config_page_update_auto(nat);
+	if (update_clr) {
+#warning TODO: conf hooks should solve these
+		com->set_special_colors(nat);
+		com->layer_buttons_update();
+		com->invalidate_all();
+	}
+}
+
+static void config_auto_reset_cb(GtkButton * btn, void *data)
+{
+	pcb_gtk_common_t *com = data;
+	config_auto_src_changed_cb(GTK_TREE_VIEW(auto_tab_widgets.src_t), com);
+}
+
+static void config_auto_remove_cb(GtkButton * btn, void *data)
+{
+	conf_native_t *nat = auto_tab_widgets.nat;
+	conf_role_t role = config_auto_get_edited_role();
+
+	if (nat->array_size > 1) {
+		pcb_message(PCB_MSG_ERROR, "Can't create remove array %s\n", nat->hash_path);
+		return;
+	}
+
+	conf_del(role, nat->hash_path, -1);
+
+	config_page_update_auto(nat);
+	config_auto_save(role);
+	conf_auto_set_edited_role(role);
+}
+
+static void config_auto_create_cb(GtkButton * btn, void *data)
+{
+	gds_t s;
+	char *val;
+	conf_native_t *nat = auto_tab_widgets.nat;
+	conf_role_t role = config_auto_get_edited_role();
+
+	/* create the config node in the source lht */
+	gds_init(&s);
+	conf_print_native_field((conf_pfn) pcb_append_printf, &s, 0, &nat->val, nat->type, &nat->prop[0], 0);
+	val = s.array;
+
+	/* strip {} from arrays */
+	if (nat->array_size > 1) {
+		int end;
+		while (*val == '{')
+			val++;
+		end = gds_len(&s) - (val - s.array);
+		if (end > 0)
+			s.array[end] = '\0';
+	}
+
+	conf_set(role, nat->hash_path, -1, val, POL_OVERWRITE);
+	gds_uninit(&s);
+
+	config_page_update_auto(nat);
+	config_auto_save(role);
+	conf_auto_set_edited_role(role);
+}
+
+
+/* Update the config tab for a given entry - called when a new config item is clicked/selected from the tree */
+static void config_page_update_auto(void *data)
+{
+	char *tmp, *so;
+	const char *si;
+	int l, n;
+	conf_native_t *nat = data;
+	lht_node_t *nd;
+
+	/* set name */
+	gtk_label_set_text(GTK_LABEL(auto_tab_widgets.name), nat->hash_path);
+
+	auto_tab_widgets.nat = data;
+
+	/* split long description strings at whitepsace to make the preferences window narrower */
+	tmp = malloc(strlen(nat->description) * 2);
+	for (si = nat->description, so = tmp, l = 0; *si != '\0'; si++, so++, l++) {
+		if (isspace(*si) && (l > 64))
+			*so = '\n';
+		else
+			*so = *si;
+
+		if (*so == '\n')
+			l = 0;
+	}
+	*so = '\0';
+	gtk_label_set_text(GTK_LABEL(auto_tab_widgets.desc), tmp);
+	free(tmp);
+
+	config_auto_src_hide();
+
+	/* build the source table */
+	gtk_list_store_clear(auto_tab_widgets.src_l);
+	for (n = 0; n < CFR_max_real; n++) {
+		GtkTreeIter iter;
+		long prio = conf_default_prio[n];
+		conf_policy_t pol = POL_OVERWRITE;
+
+		nd = conf_lht_get_at(n, nat->hash_path, 0);
+		if (nd != NULL)
+			conf_get_policy_prio(nd, &pol, &prio);
+
+		gtk_list_store_append(auto_tab_widgets.src_l, &iter);
+		if (nd != NULL) {
+			char sprio[32];
+			const char *val;
+
+			switch (nd->type) {
+			case LHT_TEXT:
+				val = nd->data.text.value;
+				break;
+			case LHT_LIST:
+				val = "<list>";
+				break;
+			case LHT_HASH:
+				val = "<hash>";
+				break;
+			case LHT_TABLE:
+				val = "<table>";
+				break;
+			case LHT_SYMLINK:
+				val = "<symlink>";
+				break;
+			case LHT_INVALID_TYPE:
+				val = "<invalid>";
+				break;
+			}
+			sprintf(sprio, "%ld", prio);
+			gtk_list_store_set(auto_tab_widgets.src_l, &iter, 0, conf_role_name(n), 1, sprio, 2, conf_policy_name(pol), 3, val, -1);
+		}
+		else {
+			gtk_list_store_set(auto_tab_widgets.src_l, &iter, 0, conf_role_name(n), -1);
+		}
+	}
+	gtk_widget_hide(auto_tab_widgets.edit_idx_box);
+	gtk_label_set_text(GTK_LABEL(auto_tab_widgets.txt_apply), "");
+	gtk_widget_hide(auto_tab_widgets.btn_create);
+	config_auto_res_show();
+	gtk_tree_view_columns_autosize(GTK_TREE_VIEW(auto_tab_widgets.src_t));
+	gtk_tree_view_columns_autosize(GTK_TREE_VIEW(auto_tab_widgets.res_t));
+}
+
+static GtkTreeIter *config_tree_auto_mkdirp(GtkTreeStore * model, GtkTreeIter * main_parent, htsp_t * dirs, char *path)
+{
+	char *basename;
+	GtkTreeIter *parent, *cwd;
+
+	cwd = htsp_get(dirs, path);
+	if (cwd != NULL)
+		return cwd;
+
+	cwd = malloc(sizeof(GtkTreeIter));
+	htsp_set(dirs, path, cwd);
+
+	basename = strrchr(path, '/');
+	if (basename == NULL) {
+		parent = main_parent;
+		basename = path;
+	}
+	else {
+		*basename = '\0';
+		basename++;
+		parent = config_tree_auto_mkdirp(model, main_parent, dirs, path);
+	}
+
+	config_tree_sect(model, parent, cwd, basename, "");
+	return cwd;
+}
+
+static int config_tree_auto_cmp(const void *v1, const void *v2)
+{
+	const htsp_entry_t **e1 = (const htsp_entry_t **) v1, **e2 = (const htsp_entry_t **) v2;
+	return strcmp((*e1)->key, (*e2)->key);
+}
+
+
+/* Automatically create a subtree using the central config field hash */
+static void config_tree_auto(GtkTreeStore * model, GtkTreeIter * main_parent, pcb_gtk_common_t *com)
+{
+	htsp_t *dirs;
+	htsp_entry_t *e;
+	char path[1024];
+	GtkTreeIter *parent;
+	htsp_entry_t **sorted;
+	int num_paths, n;
+	gint auto_page;
+
+	{
+		GtkWidget *vbox;
+		vbox = gtkc_vbox_new(FALSE, 0);
+		gtk_notebook_append_page(config_notebook, vbox, NULL);
+		auto_page = gtk_notebook_get_n_pages(config_notebook) - 1;
+		config_auto_tab_create(com, vbox, "auto");
+	}
+
+	/* remember the parent for each dir */
+	dirs = htsp_alloc(strhash, strkeyeq);
+
+	/* alpha sort keys for the more consistend UI */
+	for (e = htsp_first(conf_fields), num_paths = 0; e; e = htsp_next(conf_fields, e))
+		num_paths++;
+	sorted = malloc(sizeof(htsp_entry_t *) * num_paths);
+	for (e = htsp_first(conf_fields), n = 0; e; e = htsp_next(conf_fields, e), n++)
+		sorted[n] = e;
+	qsort(sorted, num_paths, sizeof(htsp_entry_t *), config_tree_auto_cmp);
+
+	for (n = 0; n < num_paths; n++) {
+		GtkTreeIter iter;
+		char *basename;
+		e = sorted[n];
+		if (strlen(e->key) > sizeof(path) - 1) {
+			pcb_message(PCB_MSG_WARNING, "Warning: can't create config item for %s: path too long\n", e->key);
+			continue;
+		}
+		strcpy(path, e->key);
+		basename = strrchr(path, '/');
+		if ((basename == NULL) || (basename == path)) {
+			pcb_message(PCB_MSG_WARNING, "Warning: can't create config item for %s: invalid path\n", e->key);
+			continue;
+		}
+		*basename = '\0';
+		basename++;
+		parent = config_tree_auto_mkdirp(model, main_parent, dirs, path);
+		config_tree_leaf_(model, parent, basename, NULL, &iter, com);
+		gtk_tree_store_set(model, &iter, CONFIG_PAGE_COLUMN, auto_page, CONFIG_PAGE_UPDATE_CB, config_page_update_auto,
+											 CONFIG_PAGE_DATA, e->value, -1);
+	}
+	htsp_free(dirs);
+	free(sorted);
+}
+
+void pcb_gtk_config_window_show(pcb_gtk_common_t *com, gboolean raise)
+{
+	GtkWidget *widget, *main_vbox, *config_hbox, *hbox;
+	GtkWidget *scrolled;
+	GtkWidget *button;
+	GtkTreeStore *model;
+	GtkTreeView *treeview;
+	GtkTreeIter user_pov, config_pov;
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+	GtkTreeSelection *select;
+
+	if (config_window) {
+		if (raise) {
+			gtk_window_present(GTK_WINDOW(config_window));
+		}
+		return;
+	}
+
+	priv_copy_com = com;
+
+	config_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	g_signal_connect(G_OBJECT(config_window), "delete_event", G_CALLBACK(config_destroy_cb), NULL);
+
+	gtk_window_set_title(GTK_WINDOW(config_window), _("pcb-rnd Preferences"));
+	gtk_window_set_role(GTK_WINDOW(config_window), "Pcb_Conf");
+	gtk_container_set_border_width(GTK_CONTAINER(config_window), 2);
+
+	config_hbox = gtk_hpaned_new();
+	gtk_container_add(GTK_CONTAINER(config_window), config_hbox);
+
+	scrolled = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
+	gtk_widget_set_size_request(scrolled, 150, 0);
+	gtk_paned_pack1(GTK_PANED(config_hbox), scrolled, TRUE, FALSE);
+
+	main_vbox = gtkc_vbox_new(FALSE, 4);
+	gtk_paned_pack2(GTK_PANED(config_hbox), main_vbox, TRUE, FALSE);
+
+	widget = gtk_notebook_new();
+	gtk_box_pack_start(GTK_BOX(main_vbox), widget, TRUE, TRUE, 0);
+	config_notebook = GTK_NOTEBOOK(widget);
+	gtk_notebook_set_show_tabs(config_notebook, FALSE);
+
+	/* build the tree */
+	model = gtk_tree_store_new(N_CONFIG_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER);
+
+	config_tree_sect(model, NULL, &user_pov, "User PoV",
+									 _
+									 ("\n<b>User PoV</b>\nA subset of configuration settings regrouped,\npresented in the User's Point of View."));
+	config_tree_sect(model, NULL, &config_pov, "Config PoV",
+									 _
+									 ("\n<b>Config PoV</b>\nAccess all configuration fields presented in\na tree that matches the configuration\nfile (lht) structure."));
+
+	config_tree_leaf(model, &user_pov, "General", config_general_tab_create, com);
+	config_tree_leaf(model, &user_pov, "Window", config_window_tab_create, com);
+	config_tree_leaf(model, &user_pov, "Sizes", config_sizes_tab_create, com);
+	config_tree_leaf(model, &user_pov, "Library", config_library_tab_create, com);
+	config_tree_leaf(model, &user_pov, "Layers", config_layers_tab_create, com);
+	config_tree_leaf(model, &user_pov, "Colors", config_colors_tab_create, com);
+
+	config_tree_auto(model, &config_pov, com);
+
+	/* Create the tree view */
+	gui_config_treeview = treeview = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)));
+	gtk_tree_view_set_headers_visible(treeview, FALSE);
+	g_object_unref(G_OBJECT(model));	/* Don't need the model anymore */
+
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(NULL, renderer, "text", CONFIG_NAME_COLUMN, NULL);
+	gtk_tree_view_append_column(treeview, column);
+	gtk_container_add(GTK_CONTAINER(scrolled), GTK_WIDGET(treeview));
+
+
+	select = gtk_tree_view_get_selection(treeview);
+	gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+	g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(config_selection_changed_cb), NULL);
+
+
+	hbox = gtk_hbutton_box_new();
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+	gtk_box_set_spacing(GTK_BOX(hbox), 5);
+	gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
+
+	button = gtk_button_new_from_stock(GTK_STOCK_OK);
+	gtk_widget_set_can_default(button, TRUE);
+	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(config_close_cb), NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+	gtk_widget_grab_default(button);
+
+	gtk_widget_show_all(config_window);
+	config_auto_src_hide();
+	gtk_window_resize(GTK_WINDOW(config_window), 780, 550);
+
+	if (!raise)
+		gtk_widget_hide(config_window);
+}
+
+static void ghid_config_window_close(void)
+{
+	gtk_widget_destroy(config_window);
+
+	config_sizes_tab_vbox = NULL;
+	config_sizes_vbox = NULL;
+	config_groups_vbox = config_groups_table = NULL;
+	config_groups_window = NULL;
+	config_window = NULL;
+	gui_config_treeview = NULL;
+}
+
+void pcb_gtk_config_set_cursor(const char *string_path)
+{
+	gchar **split;
+	gchar *p;
+	int i = 0;
+	gboolean found, valid = TRUE;
+	GtkTreeModel *model;
+	GtkTreeIter parent, *iter = NULL;
+	GtkTreePath *tree_path = NULL;
+
+	model = gtk_tree_view_get_model(gui_config_treeview);
+	gtk_tree_model_get_iter_first(model, &parent);
+	iter = gtk_tree_iter_copy(&parent);   /* Allocates a new structure  */
+
+	/* Split the path, then search for matched column name    */
+	split = g_strsplit(string_path, "/", 0);
+	while (valid && split[i] != NULL) {
+		found = FALSE;
+		/* iter browses the `parent` 's children, except for root level, where it browses siblings */
+		if (i > 0)
+			valid = gtk_tree_model_iter_children(model, iter, &parent);
+
+		while (valid && !found && iter != NULL) {	/* Explore all siblings */
+			gtk_tree_model_get(model, iter, CONFIG_NAME_COLUMN, &p, -1);
+			found = (pcb_strcasecmp(split[i], p) == 0) ? TRUE : FALSE;
+
+			if (found) {
+				/* Update the parent and path to newly found item   */
+				if (tree_path != NULL)
+					gtk_tree_path_free(tree_path);
+				tree_path = gtk_tree_model_get_path(model, iter);
+				gtk_tree_model_get_iter(model, &parent, tree_path);
+			}
+			else
+				valid = gtk_tree_model_iter_next(model, iter);
+		}
+		i++;
+	}
+
+	/* Free the iterator structure and char array : */
+	if (iter != NULL)
+		gtk_tree_iter_free(iter);
+	g_strfreev(split);
+
+	if (valid) {
+		gtk_tree_view_expand_to_path(gui_config_treeview, tree_path);
+		gtk_tree_view_set_cursor(gui_config_treeview, tree_path, NULL, FALSE);
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Error: %s  not found\n", string_path);
+
+	if (tree_path != NULL)
+		gtk_tree_path_free(tree_path);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_config/hid_gtk_conf.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/hid_gtk_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/hid_gtk_conf.h	(revision 18980)
@@ -0,0 +1,96 @@
+#ifndef PCB_HID_GTK_CONF_H
+#define PCB_HID_GTK_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct hid_gtk {
+			CFT_BOOLEAN listen;                          /* @usage Listen for actions on stdin. */
+			CFT_STRING  bg_image;                        /* @usage File name of an image to put into the background of the GUI canvas. The image is read via GdkPixbuf library. It can be any size, and will be automatically scaled to fit the canvas. */
+
+			CFT_BOOLEAN compact_horizontal;
+			CFT_BOOLEAN compact_vertical;
+			CFT_BOOLEAN use_command_window;
+			CFT_INTEGER history_size;
+			CFT_INTEGER n_mode_button_columns;
+
+			const struct local_grid {
+				CFT_BOOLEAN enable;                       /* enable local grid to draw grid points only in a small radius around the crosshair - speeds up software rendering on large screens */
+				CFT_INTEGER radius;                       /* radius, in number of grid points, around the local grid */
+			} local_grid;
+
+			const struct global_grid {
+				CFT_INTEGER min_dist_px;                  /* never try to draw a grid so dense that the distance between grid points is smaller than this */
+				CFT_BOOLEAN sparse;                       /* enable drawing sparse grid: when zoomed out beyond min_dist_px draw every 2nd, 4th, 8th, etc. grid point; if disabled the grid is turned off when it'd get too dense */
+			} global_grid;
+
+			const struct auto_save_window_geometry {
+				CFT_BOOLEAN to_design;
+				CFT_BOOLEAN to_project;
+				CFT_BOOLEAN to_user;
+			} auto_save_window_geometry;
+
+			const struct window_geometry {
+				CFT_INTEGER top_x;
+				CFT_INTEGER top_y;
+				CFT_INTEGER top_width;
+				CFT_INTEGER top_height;
+
+				CFT_INTEGER log_x;
+				CFT_INTEGER log_y;
+				CFT_INTEGER log_width;
+				CFT_INTEGER log_height;
+
+				CFT_INTEGER drc_x;
+				CFT_INTEGER drc_y;
+				CFT_INTEGER drc_width;
+				CFT_INTEGER drc_height;
+
+				CFT_INTEGER library_x;
+				CFT_INTEGER library_y;
+				CFT_INTEGER library_width;
+				CFT_INTEGER library_height;
+
+				CFT_INTEGER keyref_x;
+				CFT_INTEGER keyref_y;
+				CFT_INTEGER keyref_width;
+				CFT_INTEGER keyref_height;
+
+				CFT_INTEGER netlist_x;
+				CFT_INTEGER netlist_y;
+				CFT_INTEGER netlist_height;
+				CFT_INTEGER netlist_width;
+
+				CFT_INTEGER pinout_x;
+				CFT_INTEGER pinout_y;
+				CFT_INTEGER pinout_height;
+				CFT_INTEGER pinout_width;
+			} window_geometry;
+		} hid_gtk;
+	} plugins;
+} conf_hid_gtk_t;
+
+#define GHID_WGEO1(win, op, arg) \
+	op(win ## _x, arg); \
+	op(win ## _y, arg); \
+	op(win ## _width, arg); \
+	op(win ## _height, arg);
+
+/* Call macro op(field_name, arg) for each window geometry field */
+#define GHID_WGEO_ALL(op, arg) \
+do { \
+	GHID_WGEO1(top, op, arg); \
+	GHID_WGEO1(log, op, arg); \
+	GHID_WGEO1(drc, op, arg); \
+	GHID_WGEO1(library, op, arg); \
+	GHID_WGEO1(keyref, op, arg); \
+	GHID_WGEO1(netlist, op, arg); \
+	GHID_WGEO1(pinout, op, arg); \
+} while(0)
+
+typedef struct window_geometry window_geometry_t;
+extern window_geometry_t hid_gtk_wgeo;
+extern conf_hid_gtk_t conf_hid_gtk;
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.c	(revision 18980)
@@ -0,0 +1,63 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include "lib_gtk_config.h"
+#include "hid_gtk_conf.h"
+#include "plugins.h"
+
+static const char *lib_gtk_config_cookie = "lib_gtk_config";
+
+conf_hid_id_t ghid_conf_id = -1;
+
+void pcb_gtk_conf_init(void)
+{
+	ghid_conf_id = conf_hid_reg(lib_gtk_config_cookie, NULL);
+}
+
+int pplg_check_ver_lib_gtk_config(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_gtk_config(void)
+{
+	conf_hid_unreg(lib_gtk_config_cookie);
+	conf_unreg_fields("plugins/hid_gtk/");
+}
+
+int pplg_init_lib_gtk_config(void)
+{
+	PCB_API_CHK_VER;
+	pcb_gtk_conf_init();
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags);
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf_fields.h"
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.h	(revision 18980)
@@ -0,0 +1,26 @@
+#include <gtk/gtk.h>
+#include "hid.h"
+#include "event.h"
+#include "conf_hid.h"
+#include "../src_plugins/lib_gtk_common/glue.h"
+
+extern conf_hid_id_t ghid_conf_id;
+
+/* called before the first conf access, from hid_gtk* */
+void pcb_gtk_conf_init(void);
+
+void pcb_gtk_config_window_show(pcb_gtk_common_t *com, gboolean raise);
+
+void ghid_config_handle_units_changed(pcb_gtk_common_t *com);
+
+/* Parses string_path to expand and select the corresponding path in tree view. */
+void pcb_gtk_config_set_cursor(const char *string_path);
+
+void config_color_button_update(pcb_gtk_common_t *com, conf_native_t *cfg, int idx);
+
+void ghid_wgeo_save(int save_to_file, int skip_user);
+void ghid_conf_save_pre_wgeo(void *user_data, int argc, pcb_event_arg_t argv[]);
+void ghid_conf_load_post_wgeo(void *user_data, int argc, pcb_event_arg_t argv[]);
+
+void ghid_config_init(void);
+
Index: tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_config/lib_gtk_config.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short hid_gtk preferences dialog
+$long hid_gtk* preferences dialog common code (regardless of gtk version)
+$state works
+$package lib-gtk
+default disable-all
Index: tags/2.0.1/src_plugins/lib_gtk_hid/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_gtk_hid
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_gtk_hid/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,31 @@
+put /local/pcb/mod {lib_gtk_hid}
+
+put /local/pcb/mod/OBJS [@
+  $(PLUGDIR)/lib_gtk_hid/lib_gtk_hid.o
+@]
+
+put /local/pcb/mod/OBJS_C99 [@
+	$(PLUGDIR)/lib_gtk_hid/glue_common.o
+	$(PLUGDIR)/lib_gtk_hid/glue_conf.o
+	$(PLUGDIR)/lib_gtk_hid/glue_hid.o
+	$(PLUGDIR)/lib_gtk_hid/glue_event.o
+	$(PLUGDIR)/lib_gtk_hid/glue_win32.o
+	$(PLUGDIR)/lib_gtk_hid/common.o
+	$(PLUGDIR)/lib_gtk_hid/actions.o
+	$(PLUGDIR)/lib_gtk_hid/render.o
+@]
+
+switch /local/pcb/lib_gtk_hid/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/CFLAGS   /target/libs/gui/gtkx/cflags
+		put /local/pcb/mod/LDFLAGS  /target/libs/gui/gtkx/ldflags
+	end
+end
+
+switch /local/pcb/lib_gtk_hid/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/actions.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/actions.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/actions.c	(revision 18980)
@@ -0,0 +1,490 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "gui.h"
+
+#include "board.h"
+#include "actions.h"
+#include "data.h"
+#include "search.h"
+#include "change.h"
+#include "hid_attrib.h"
+#include "../src/actions.h"
+#include "compat_nls.h"
+#include "compat_misc.h"
+
+#include "../src_plugins/lib_gtk_common/act_print.h"
+#include "../src_plugins/lib_gtk_common/act_fileio.h"
+#include "../src_plugins/lib_gtk_common/wt_layersel.h"
+#include "../src_plugins/lib_gtk_common/dlg_route_style.h"
+#include "../src_plugins/lib_gtk_common/dlg_library.h"
+#include "../src_plugins/lib_gtk_common/dlg_log.h"
+#include "../src_plugins/lib_gtk_common/dlg_drc.h"
+#include "../src_plugins/lib_gtk_common/dlg_netlist.h"
+#include "../src_plugins/lib_gtk_common/dlg_search.h"
+#include "../src_plugins/lib_gtk_common/dlg_fontsel.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+#include "actions.h"
+
+static const char *ghid_act_cookie = "gtk HID actions";
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_AdjustStyle[] = "AdjustStyle()\n";
+
+static const char pcb_acth_AdjustStyle[] = "Open the window which allows editing of the route styles.";
+
+/* %start-doc actions AdjustStyle
+
+Opens the window which allows editing of the route styles.
+
+%end-doc */
+
+static fgw_error_t pcb_act_AdjustStyle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (argc > 2)
+		PCB_ACT_FAIL(AdjustStyle);
+
+	pcb_gtk_route_style_edit_dialog(&ghidgui->common, GHID_ROUTE_STYLE(ghidgui->topwin.route_style_selector));
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_fontsel[] = "FontSel()\n";
+static const char pcb_acth_fontsel[] = "Select the font to draw new text with.";
+static fgw_error_t pcb_act_fontsel(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op = NULL;
+	if (argc > 2)
+		PCB_ACT_FAIL(fontsel);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, fontsel, op = argv[1].val.str);
+
+	if (op != NULL) {
+		if (pcb_strcasecmp(op, "Object") == 0) {
+			pcb_coord_t x, y;
+			int type;
+			void *ptr1, *ptr2, *ptr3;
+			pcb_hid_get_coords(_("Select an Object"), &x, &y, 0);
+			if ((type = pcb_search_screen(x, y, PCB_CHANGENAME_TYPES, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
+/*				pcb_undo_save_serial();*/
+				pcb_gtk_dlg_fontsel(&ghidgui->common, ptr1, ptr2, type, 1);
+			}
+		}
+		else
+			PCB_ACT_FAIL(fontsel);
+	}
+	else
+		pcb_gtk_dlg_fontsel(&ghidgui->common, NULL, NULL, 0, 0);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+
+static fgw_error_t pcb_act_Command(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	ghid_handle_user_command(&ghidgui->topwin.cmd, TRUE);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+fgw_error_t pcb_gtk_act_print_(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_print(gport->top_window, res, argc, argv);
+}
+
+/* ------------------------------------------------------------ */
+
+static fgw_error_t pcb_act_Benchmark(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int i = 0;
+	time_t start, end;
+	GdkDisplay *display;
+	GdkWindow *window;
+
+	window = gtk_widget_get_window(gport->drawing_area);
+	display = gtk_widget_get_display(gport->drawing_area);
+
+	gdk_display_sync(display);
+	time(&start);
+	do {
+		ghid_invalidate_all();
+		gdk_window_process_updates(window, FALSE);
+		time(&end);
+		i++;
+	}
+	while (end - start < 10);
+
+	printf(_("%g redraws per second\n"), i / 10.0);
+
+	PCB_ACT_DRES(i/10.0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+
+static const char pcb_acts_DoWindows[] =
+	"DoWindows(1|2|3|4|5|6|7 [,false])\n"
+	"DoWindows(Layout|Library|Log|Netlist|Preferences|DRC|Search [,false])";
+
+static const char pcb_acth_DoWindows[] = N_("Open various GUI windows. With false, do not raise the window (no focus stealing).");
+
+/* %start-doc actions DoWindows
+
+@table @code
+
+@item 1
+@itemx Layout
+Open the layout window.  Since the layout window is always shown
+anyway, this has no effect.
+
+@item 2
+@itemx Library
+Open the library window.
+
+@item 3
+@itemx Log
+Open the log window.
+
+@item 4
+@itemx Netlist
+Open the netlist window.
+
+@item 5
+@itemx Preferences
+Open the preferences window.
+
+@item 6
+@itemx DRC
+Open the DRC violations window.
+
+@item 7
+@itemx Search
+Open the advanced search window.
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_DoWindows(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *a = "", *b = NULL, *c = NULL;
+	gboolean raise = TRUE;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, DoWindows, a = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, DoWindows, b = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, DoWindows, c = argv[3].val.str);
+
+	if (b != NULL) {
+		char c = tolower(b[0]);
+		if ((c == 'n') || (c == 'f') || (c == '0'))
+			raise = FALSE;
+	}
+
+	if (strcmp(a, "1") == 0 || pcb_strcasecmp(a, "Layout") == 0) {
+	}
+	else if (strcmp(a, "2") == 0 || pcb_strcasecmp(a, "Library") == 0) {
+		pcb_gtk_library_show(&ghidgui->common, raise);
+	}
+	else if (strcmp(a, "3") == 0 || pcb_strcasecmp(a, "Log") == 0) {
+		pcb_gtk_dlg_log_show(raise);
+	}
+	else if (strcmp(a, "4") == 0 || pcb_strcasecmp(a, "Netlist") == 0) {
+		pcb_gtk_dlg_netlist_show(&ghidgui->common, raise);
+	}
+	else if (strcmp(a, "5") == 0 || pcb_strcasecmp(a, "Preferences") == 0) {
+		pcb_gtk_config_window_show(&ghidgui->common, raise);
+		/* The 3rd argument will be the path (as a text string, not numbers) to select, once dialog is opened */
+		if (c != NULL) {
+			pcb_gtk_config_set_cursor(c);
+		}
+	}
+	else if (strcmp(a, "6") == 0 || pcb_strcasecmp(a, "DRC") == 0) {
+		ghid_drc_window_show(&ghidgui->drcwin, raise);
+	}
+	else if (strcmp(a, "7") == 0 || pcb_strcasecmp(a, "Search") == 0) {
+		ghid_search_window_show(gport->top_window, raise);
+	}
+	else {
+		PCB_ACT_FAIL(DoWindows);
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+static const char pcb_acts_Popup[] = "Popup(MenuName, [Button])";
+
+static const char pcb_acth_Popup[] =
+N_("Bring up the popup menu specified by @code{MenuName}.\n"
+	 "If called by a mouse event then the mouse button number\n" "must be specified as the optional second argument.");
+
+/* %start-doc actions Popup
+
+This just pops up the specified menu.  The menu must have been defined
+in the popups subtree in the menu lht file.
+
+%end-doc */
+static fgw_error_t pcb_act_Popup(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	GtkWidget *menu = NULL;
+	char name[256];
+	const char *tn = NULL, *a0, *a1 = NULL;
+	enum {
+		CTX_NONE,
+		CTX_OBJ_TYPE
+	} ctx_sens = CTX_NONE;
+
+	if (argc != 2 && argc != 3)
+		PCB_ACT_FAIL(Popup);
+
+	PCB_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str);
+
+	if (argc == 3) {
+		if (strcmp(a1, "obj-type") == 0) ctx_sens = CTX_OBJ_TYPE;
+	}
+
+	if (strlen(a0) < sizeof(name) - 32) {
+		lht_node_t *menu_node;
+		switch(ctx_sens) {
+			case CTX_OBJ_TYPE:
+				{
+					pcb_coord_t x, y;;
+					pcb_objtype_t type;
+					void *o1, *o2, *o3;
+					pcb_hid_get_coords("context sensitive popup: select object", &x, &y, 0);
+					type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &o1, &o2, &o3);
+					if (type == 0)
+						type = pcb_search_screen(x, y, PCB_OBJ_CLASS_REAL, &o1, &o2, &o3);
+
+					if (type == 0)
+						tn = "none";
+					else
+						tn = pcb_obj_type_name(type);
+
+					sprintf(name, "/popups/%s-%s", a0, tn);
+					menu_node = pcb_hid_cfg_get_menu(ghidgui->topwin.ghid_cfg, name);
+
+					if (menu_node == NULL) {
+						sprintf(name, "/popups/%s-misc", a0);
+						menu_node = pcb_hid_cfg_get_menu(ghidgui->topwin.ghid_cfg, name);
+					}
+				}
+				break;
+			case CTX_NONE:
+				sprintf(name, "/popups/%s", a0);
+				menu_node = pcb_hid_cfg_get_menu(ghidgui->topwin.ghid_cfg, name);
+				break;
+				
+		}
+		if (menu_node != NULL)
+			menu = pcb_gtk_menu_widget(menu_node);
+	}
+
+	if (!GTK_IS_MENU(menu)) {
+		pcb_message(PCB_MSG_ERROR, _("The specified popup menu \"%s\" (context: '%s') has not been defined.\n"), a0, (tn == NULL ? "" : tn));
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	else {
+		ghidgui->topwin.in_popup = TRUE;
+		gtk_widget_grab_focus(ghid_port.drawing_area);
+		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ------------------------------------------------------------ */
+static const char pcb_acts_SaveWinGeo[] = "SaveWindowGeometry()";
+static const char pcb_acth_SaveWinGeo[] = N_("Saves window geometry in the config.\n");
+
+static fgw_error_t pcb_act_SaveWinGeo(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	ghid_wgeo_save(1, 0);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+/* ------------------------------------------------------------ */
+static fgw_error_t pcb_act_Zoom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_ACT_IRES(pcb_gtk_act_zoom(&gport->view, res, argc, argv));
+	return 0;
+}
+
+static fgw_error_t pcb_act_Center(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	fgw_error_t e;
+	pcb_coord_t x, y;
+	int offset_x, offset_y, pointer_x, pointer_y;
+	GdkDisplay *display = gdk_display_get_default();
+	GdkScreen *screen = gdk_display_get_default_screen(display);
+
+	pcb_hid_get_coords("Click to center", &x, &y, 0);
+
+	gdk_window_get_origin(gtk_widget_get_window(gport->drawing_area), &offset_x, &offset_y);
+	e = pcb_gtk_act_center(&gport->view, res, argc, argv, x, y, offset_x, offset_y, &pointer_x, &pointer_y);
+	gdk_display_warp_pointer(display, screen, pointer_x, pointer_y);
+	return e;
+}
+
+static fgw_error_t pcb_act_SwapSides(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int rv, oa;
+
+	/* ugly workaround: turn off gui refreshes until the swap finishes to avoid triggering more events that may lead to infinite loop */
+	oa = ghidgui->hid_active;
+	ghidgui->hid_active = 0;
+
+	rv = pcb_gtk_swap_sides(&gport->view, res, argc, argv);
+
+	ghidgui->hid_active = oa;
+	return rv;
+}
+
+static fgw_error_t pcb_act_Scroll(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (ghidgui == NULL)
+		return 0;
+
+	return pcb_gtk_act_scroll(&gport->view, res, argc, argv);
+}
+
+static fgw_error_t pcb_act_Pan(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (ghidgui == NULL)
+		return 0;
+
+	return pcb_gtk_act_pan(&gport->view, res, argc, argv);
+}
+
+static fgw_error_t pcb_act_NetlistShow(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_netlistshow(&ghidgui->common, res, argc, argv);
+}
+
+static fgw_error_t pcb_act_NetlistPresent(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_netlistpresent(&ghidgui->common, res, argc, argv);
+}
+
+
+static fgw_error_t pcb_act_load(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_load(ghid_port.top_window, res, argc, argv);
+}
+
+static fgw_error_t pcb_act_save(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_save(ghid_port.top_window, res, argc, argv);
+}
+
+static fgw_error_t pcb_act_importgui(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return pcb_gtk_act_importgui(ghid_port.top_window, res, argc, argv);
+}
+
+/* ------------------------------------------------------------
+ *
+ * Actions specific to the GTK HID follow from here
+ *
+ */
+
+/* ------------------------------------------------------------ */
+static const char pcb_acts_EditLayerGroups[] = "EditLayerGroups()";
+static const char pcb_acth_EditLayerGroups[] = N_("Pop up the gui that edits the layer groups (layer stackup).");
+
+/* %start-doc actions About
+
+Pop up the gui that edits the layer groups (layer stackup).
+
+%end-doc */
+
+static fgw_error_t pcb_act_EditLayerGroups(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	return fgw_vcall(&pcb_fgw, res, "dowindows", FGW_STR, "Preferences", FGW_STR, "1", FGW_STR, "User PoV/Layers", 0);
+}
+
+/* ------------------------------------------------------------ */
+
+pcb_action_t ghid_menu_action_list[] = {
+	{"AdjustStyle", pcb_act_AdjustStyle, pcb_acth_AdjustStyle, pcb_acts_AdjustStyle},
+	{"fontsel", pcb_act_fontsel, pcb_acth_fontsel, pcb_acts_fontsel}
+};
+
+PCB_REGISTER_ACTIONS(ghid_menu_action_list, ghid_act_cookie)
+
+pcb_action_t ghid_main_action_list[] = {
+	{"Benchmark", pcb_act_Benchmark},
+	{"Center", pcb_act_Center, pcb_acth_center, pcb_acts_center},
+	{"Command", pcb_act_Command},
+	{"DoWindows", pcb_act_DoWindows, pcb_acth_DoWindows, pcb_acts_DoWindows},
+	{"EditLayerGroups", pcb_act_EditLayerGroups, pcb_acth_EditLayerGroups, pcb_acts_EditLayerGroups},
+	{"ImportGUI", pcb_act_importgui, pcb_gtk_acth_importgui, pcb_gtk_acts_importgui},
+	{"Load", pcb_act_load },
+	{"LogShowOnAppend", pcb_gtk_act_logshowonappend, pcb_gtk_acth_logshowonappend, pcb_gtk_acts_logshowonappend},
+	{"NetlistShow", pcb_act_NetlistShow, pcb_gtk_acth_netlistshow, pcb_gtk_acts_netlistshow},
+	{"NetlistPresent", pcb_act_NetlistPresent, pcb_gtk_acth_netlistpresent, pcb_gtk_acts_netlistpresent},
+	{"Pan", pcb_act_Pan, pcb_acth_pan, pcb_acts_pan},
+	{"Popup", pcb_act_Popup, pcb_acth_Popup, pcb_acts_Popup},
+	{"Print", pcb_gtk_act_print_, pcb_gtk_acth_print, pcb_gtk_acts_print},
+	{"Save", pcb_act_save, pcb_gtk_acth_save, pcb_gtk_acts_save},
+	{"SaveWindowGeometry", pcb_act_SaveWinGeo, pcb_acth_SaveWinGeo, pcb_acts_SaveWinGeo},
+	{"Scroll", pcb_act_Scroll, pcb_acth_scroll, pcb_acts_scroll},
+	{"SwapSides", pcb_act_SwapSides, pcb_acth_swapsides, pcb_acts_swapsides},
+	{"Zoom", pcb_act_Zoom, pcb_acth_zoom, pcb_acts_zoom},
+	{"ZoomTo", pcb_act_Zoom, pcb_acth_zoom, pcb_acts_zoom}
+};
+
+PCB_REGISTER_ACTIONS(ghid_main_action_list, ghid_act_cookie)
+#include "dolists.h"
+
+void pcb_gtk_action_reg(void)
+{
+	PCB_REGISTER_ACTIONS(ghid_main_action_list, ghid_act_cookie)
+	PCB_REGISTER_ACTIONS(ghid_menu_action_list, ghid_act_cookie)
+}
+
+void pcb_gtk_action_unreg(void)
+{
+	pcb_remove_actions_by_cookie(ghid_act_cookie);
+	pcb_hid_remove_attributes_by_cookie(ghid_act_cookie);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/actions.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/actions.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/actions.h	(revision 18980)
@@ -0,0 +1,4 @@
+void pcb_gtk_action_reg(void);
+void pcb_gtk_action_unreg(void);
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/common.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/common.c	(revision 18980)
@@ -0,0 +1,173 @@
+#include "config.h"
+
+#include "crosshair.h"
+
+#include "gui.h"
+#include "common.h"
+
+#include "../src_plugins/lib_gtk_common/wt_layersel.h"
+#include "../src_plugins/lib_gtk_common/dlg_topwin.h"
+#include "../src_plugins/lib_gtk_common/in_keyboard.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+GhidGui _ghidgui, *ghidgui = &_ghidgui;
+GHidPort ghid_port, *gport;
+
+/* Do scrollbar scaling based on current port drawing area size and
+   |  overall PCB board size.
+ */
+void pcb_gtk_tw_ranges_scale(pcb_gtk_topwin_t *tw)
+{
+	/* Update the scrollbars with PCB units.  So Scale the current
+	   |  drawing area size in pixels to PCB units and that will be
+	   |  the page size for the Gtk adjustment.
+	 */
+	pcb_gtk_zoom_post(&gport->view);
+
+	pcb_gtk_zoom_adjustment(gtk_range_get_adjustment(GTK_RANGE(tw->h_range)), gport->view.width, PCB->MaxWidth);
+	pcb_gtk_zoom_adjustment(gtk_range_get_adjustment(GTK_RANGE(tw->v_range)), gport->view.height, PCB->MaxHeight);
+}
+
+void ghid_note_event_location(GdkEventButton *ev)
+{
+	gint event_x, event_y;
+
+	if (!ev) {
+		gdkc_window_get_pointer(ghid_port.drawing_area, &event_x, &event_y, NULL);
+	}
+	else {
+		event_x = ev->x;
+		event_y = ev->y;
+	}
+
+	pcb_gtk_coords_event2pcb(&gport->view, event_x, event_y, &gport->view.pcb_x, &gport->view.pcb_y);
+
+	pcb_event_move_crosshair(gport->view.pcb_x, gport->view.pcb_y);
+	ghid_set_cursor_position_labels(&ghidgui->topwin.cps, conf_hid_gtk.plugins.hid_gtk.compact_vertical);
+}
+
+static void kbd_input_signals_connect(int idx, void *obj)
+{
+	ghidgui->key_press_handler[idx] = g_signal_connect(G_OBJECT(obj), "key_press_event", G_CALLBACK(ghid_port_key_press_cb), &ghid_port.view);
+	ghidgui->key_release_handler[idx] = g_signal_connect(G_OBJECT(obj), "key_release_event", G_CALLBACK(ghid_port_key_release_cb), &ghidgui->topwin);
+}
+
+static void kbd_input_signals_disconnect(int idx, void *obj)
+{
+	if (ghidgui->key_press_handler[idx] != 0) {
+		g_signal_handler_disconnect(G_OBJECT(obj), ghidgui->key_press_handler[idx]);
+		ghidgui->key_press_handler[idx] = 0;
+	}
+	if (ghidgui->key_release_handler[idx] != 0) {
+		g_signal_handler_disconnect(G_OBJECT(obj), ghidgui->key_release_handler[idx]);
+		ghidgui->key_release_handler[idx] = 0;
+	}
+}
+
+	/* Connect and disconnect just the signals a g_main_loop() will need.
+	   |  Cursor and motion events still need to be handled by the top level
+	   |  loop, so don't connect/reconnect these.
+	   |  A g_main_loop will be running when PCB wants the user to select a
+	   |  location or if command entry is needed in the status line hbox.
+	   |  During these times normal button/key presses are intercepted, either
+	   |  by new signal handlers or the command_combo_box entry.
+	 */
+
+void ghid_interface_input_signals_connect(void)
+{
+	ghidgui->button_press_handler = g_signal_connect(G_OBJECT(gport->drawing_area), "button_press_event", G_CALLBACK(ghid_port_button_press_cb), &gport->mouse);
+	ghidgui->button_release_handler = g_signal_connect(G_OBJECT(gport->drawing_area), "button_release_event", G_CALLBACK(ghid_port_button_release_cb), &gport->mouse);
+	kbd_input_signals_connect(0, gport->drawing_area);
+	kbd_input_signals_connect(1, ghidgui->topwin.layer_selector);
+	kbd_input_signals_connect(2, ghidgui->topwin.route_style_selector);
+	kbd_input_signals_connect(3, ghidgui->topwin.left_toolbar);
+	kbd_input_signals_connect(4, ghidgui->topwin.cps.grid_units_button);
+}
+
+void ghid_interface_input_signals_disconnect(void)
+{
+	kbd_input_signals_disconnect(0, gport->drawing_area);
+	kbd_input_signals_disconnect(1, ghidgui->topwin.layer_selector);
+	kbd_input_signals_disconnect(2, ghidgui->topwin.route_style_selector);
+	kbd_input_signals_disconnect(3, ghidgui->topwin.left_toolbar);
+	kbd_input_signals_disconnect(4, ghidgui->topwin.cps.grid_units_button);
+
+	if (ghidgui->button_press_handler != 0)
+		g_signal_handler_disconnect(G_OBJECT(gport->drawing_area), ghidgui->button_press_handler);
+
+	if (ghidgui->button_release_handler != 0)
+		g_signal_handler_disconnect(gport->drawing_area, ghidgui->button_release_handler);
+
+	ghidgui->button_press_handler = ghidgui->button_release_handler = 0;
+}
+
+int ghid_shift_is_pressed()
+{
+	GdkModifierType mask;
+	GHidPort *out = &ghid_port;
+
+	if (!ghidgui->gui_is_up)
+		return 0;
+
+	gdkc_window_get_pointer(out->drawing_area, NULL, NULL, &mask);
+
+#ifdef PCB_WORKAROUND_GTK_SHIFT
+	/* On some systems the above query fails and we need to return the last known state instead */
+	return pcb_gtk_glob_mask & GDK_SHIFT_MASK;
+#else
+	return (mask & GDK_SHIFT_MASK) ? TRUE : FALSE;
+#endif
+}
+
+int ghid_control_is_pressed()
+{
+	GdkModifierType mask;
+	GHidPort *out = &ghid_port;
+
+	if (!ghidgui->gui_is_up)
+		return 0;
+
+	gdkc_window_get_pointer(out->drawing_area, NULL, NULL, &mask);
+
+#ifdef PCB_WORKAROUND_GTK_CTRL
+	/* On some systems the above query fails and we need to return the last known state instead */
+	return pcb_gtk_glob_mask & GDK_CONTROL_MASK;
+#else
+	return (mask & GDK_CONTROL_MASK) ? TRUE : FALSE;
+#endif
+}
+
+int ghid_mod1_is_pressed()
+{
+	GdkModifierType mask;
+	GHidPort *out = &ghid_port;
+
+	if (!ghidgui->gui_is_up)
+		return 0;
+
+	gdkc_window_get_pointer(out->drawing_area, NULL, NULL, &mask);
+#ifdef __APPLE__
+	return (mask & (1 << 13)) ? TRUE : FALSE;	/* The option key is not MOD1, although it should be... */
+#else
+	return (mask & GDK_MOD1_MASK) ? TRUE : FALSE;
+#endif
+}
+
+void ghid_LayersChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (!ghidgui || !ghidgui->topwin.active || PCB == NULL || ghidgui->topwin.layersel.running)
+		return;
+
+	pcb_gtk_tw_layer_buttons_update(&ghidgui->topwin);
+
+	return;
+}
+
+void ghid_LayervisChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (!ghidgui || !ghidgui->topwin.active || PCB == NULL || ghidgui->topwin.layersel.running)
+		return;
+
+	pcb_gtk_tw_layer_vis_update(&ghidgui->topwin);
+	return;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/common.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/common.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/common.h	(revision 18980)
@@ -0,0 +1,18 @@
+#include "event.h"
+
+#include "../src_plugins/lib_gtk_common/dlg_topwin.h"
+
+/* code used by multiple different glue layers */
+void pcb_gtk_tw_ranges_scale(pcb_gtk_topwin_t *tw);
+void ghid_note_event_location(GdkEventButton *ev);
+
+void ghid_interface_input_signals_connect(void);
+void ghid_interface_input_signals_disconnect(void);
+
+int ghid_shift_is_pressed();
+int ghid_control_is_pressed();
+int ghid_mod1_is_pressed();
+
+void ghid_LayersChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+void ghid_LayervisChanged(void *user_data, int argc, pcb_event_arg_t argv[]);
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/coord_conv.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/coord_conv.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/coord_conv.h	(revision 18980)
@@ -0,0 +1,91 @@
+/* Coordinate conversions */
+#include "compat_misc.h"
+#include "conf_core.h"
+
+/* Px converts view->pcb, Vx converts pcb->view */
+static inline int Vx(pcb_coord_t x)
+{
+	double rv;
+	if (conf_core.editor.view.flip_x)
+		rv = (PCB->MaxWidth - x - gport->view.x0) / gport->view.coord_per_px + 0.5;
+	else
+		rv = (x - gport->view.x0) / gport->view.coord_per_px + 0.5;
+	return pcb_round(rv);
+}
+
+static inline int Vy(pcb_coord_t y)
+{
+	double rv;
+	if (conf_core.editor.view.flip_y)
+		rv = (PCB->MaxHeight - y - gport->view.y0) / gport->view.coord_per_px + 0.5;
+	else
+		rv = (y - gport->view.y0) / gport->view.coord_per_px + 0.5;
+	return pcb_round(rv);
+}
+
+static inline int Vz(pcb_coord_t z)
+{
+	return pcb_round((double)z / gport->view.coord_per_px + 0.5);
+}
+
+static inline double Vxd(pcb_coord_t x)
+{
+	double rv;
+	if (conf_core.editor.view.flip_x)
+		rv = (PCB->MaxWidth - x - gport->view.x0) / gport->view.coord_per_px;
+	else
+		rv = (x - gport->view.x0) / gport->view.coord_per_px;
+	return rv;
+}
+
+static inline double Vyd(pcb_coord_t y)
+{
+	double rv;
+	if (conf_core.editor.view.flip_y)
+		rv = (PCB->MaxHeight - y - gport->view.y0) / gport->view.coord_per_px;
+	else
+		rv = (y - gport->view.y0) / gport->view.coord_per_px;
+	return rv;
+}
+
+static inline double Vzd(pcb_coord_t z)
+{
+	return (double)z / gport->view.coord_per_px;
+}
+
+static inline pcb_coord_t Px(int x)
+{
+	pcb_coord_t rv = x * gport->view.coord_per_px + gport->view.x0;
+	if (conf_core.editor.view.flip_x)
+		rv = PCB->MaxWidth - (x * gport->view.coord_per_px + gport->view.x0);
+	return rv;
+}
+
+static inline pcb_coord_t Py(int y)
+{
+	pcb_coord_t rv = y * gport->view.coord_per_px + gport->view.y0;
+	if (conf_core.editor.view.flip_y)
+		rv = PCB->MaxHeight - (y * gport->view.coord_per_px + gport->view.y0);
+	return rv;
+}
+
+static inline pcb_coord_t Pz(int z)
+{
+	return (z * gport->view.coord_per_px);
+}
+
+/* Return non-zero if box would be rendered into a single dot */
+static inline int pcb_gtk_1dot(pcb_coord_t penwidth, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	double minw = gport->view.coord_per_px;
+	double dx = PCB_ABS(x1-x2) + penwidth, dy = PCB_ABS(y1-y2) + penwidth;
+	return ((dx < minw) && (dy < minw));
+}
+
+/* Return non-zero if dot coords are within canvas extents */
+static inline int pcb_gtk_dot_in_canvas(pcb_coord_t penwidth, double dx1, double dy1)
+{
+	penwidth/=2;
+	return ((dx1+penwidth >= 0) && (dx1-penwidth <= gport->view.canvas_width) && (dy1+penwidth >= 0) && (dy1-penwidth <= gport->view.canvas_height));
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.c	(revision 18980)
@@ -0,0 +1,295 @@
+#include "config.h"
+
+#include "glue_common.h"
+
+#include "tool.h"
+
+#include "gui.h"
+#include "render.h"
+#include "common.h"
+#include "../src_plugins/lib_gtk_common/bu_status_line.h"
+#include "../src_plugins/lib_gtk_common/dlg_topwin.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+
+static void ghid_interface_set_sensitive(gboolean sensitive);
+
+
+/*** drawing widget - output ***/
+
+static void ghid_window_set_name_label(gchar *name)
+{
+	pcb_gtk_tw_window_set_name_label(&ghidgui->topwin, name);
+}
+
+static void ghid_set_status_line_label(void)
+{
+	if (!ghidgui->topwin.cmd.command_entry_status_line_active)
+		pcb_gtk_status_line_update(ghidgui->topwin.status_line_label, conf_hid_gtk.plugins.hid_gtk.compact_horizontal);
+}
+
+void ghid_status_line_set_text(const gchar *text)
+{
+	if (!ghidgui->topwin.cmd.command_entry_status_line_active)
+		pcb_gtk_status_line_set_text(ghidgui->topwin.status_line_label, text);
+}
+
+static void ghid_port_ranges_scale(void)
+{
+	pcb_gtk_tw_ranges_scale(&ghidgui->topwin);
+}
+
+static void ghid_layer_buttons_update(void)
+{
+	pcb_gtk_tw_layer_buttons_update(&ghidgui->topwin);
+}
+
+static void ghid_route_styles_edited_cb()
+{
+	pcb_gtk_tw_route_styles_edited_cb(&ghidgui->topwin);
+}
+
+static void ghid_port_ranges_changed(void)
+{
+	GtkAdjustment *h_adj, *v_adj;
+
+	h_adj = gtk_range_get_adjustment(GTK_RANGE(ghidgui->topwin.h_range));
+	v_adj = gtk_range_get_adjustment(GTK_RANGE(ghidgui->topwin.v_range));
+	gport->view.x0 = gtk_adjustment_get_value(h_adj);
+	gport->view.y0 = gtk_adjustment_get_value(v_adj);
+
+	ghid_invalidate_all();
+}
+
+static void ghid_pan_common(void)
+{
+	ghidgui->topwin.adjustment_changed_holdoff = TRUE;
+	gtk_range_set_value(GTK_RANGE(ghidgui->topwin.h_range), gport->view.x0);
+	gtk_range_set_value(GTK_RANGE(ghidgui->topwin.v_range), gport->view.y0);
+	ghidgui->topwin.adjustment_changed_holdoff = FALSE;
+
+	ghid_port_ranges_changed();
+}
+
+void ghid_pack_mode_buttons(void)
+{
+	pcb_gtk_pack_mode_buttons(&ghidgui->topwin.mode_btn);
+}
+
+int ghid_command_entry_is_active(void)
+{
+	return ghidgui->topwin.cmd.command_entry_status_line_active;
+}
+
+static void command_pack_in_status_line(void)
+{
+	gtk_box_pack_start(GTK_BOX(ghidgui->topwin.status_line_hbox), ghidgui->topwin.cmd.command_combo_box, FALSE, FALSE, 0);
+}
+
+static void command_post_entry(void)
+{
+#if PCB_GTK_DISABLE_MOUSE_DURING_CMD_ENTRY
+	ghid_interface_input_signals_connect();
+#endif
+	ghid_interface_set_sensitive(TRUE);
+	ghid_install_accel_groups(GTK_WINDOW(gport->top_window), &ghidgui->topwin);
+	gtk_widget_grab_focus(gport->drawing_area);
+}
+
+static void command_pre_entry(void)
+{
+	ghid_remove_accel_groups(GTK_WINDOW(gport->top_window), &ghidgui->topwin);
+#if PCB_GTK_DISABLE_MOUSE_DURING_CMD_ENTRY
+	ghid_interface_input_signals_disconnect();
+#endif
+	ghid_interface_set_sensitive(FALSE);
+}
+
+	/* If conf_hid_gtk.plugins.hid_gtk.use_command_window toggles, the config code calls
+	   |  this to ensure the command_combo_box is set up for living in the
+	   |  right place.
+	 */
+static void command_use_command_window_sync(pcb_gtk_command_t *ctx)
+{
+	/* The combo box will be NULL and not living anywhere until the
+	   |  first command entry.
+	 */
+	if (!ctx->command_combo_box)
+		return;
+
+	if (conf_hid_gtk.plugins.hid_gtk.use_command_window)
+		gtk_container_remove(GTK_CONTAINER(ghidgui->topwin.status_line_hbox), ctx->command_combo_box);
+	else {
+		/* Destroy the window (if it's up) which floats the command_combo_box
+		   |  so we can pack it back into the status line hbox.  If the window
+		   |  wasn't up, the command_combo_box was already floating.
+		 */
+		command_window_close_cb(ctx);
+		gtk_widget_hide(ctx->command_combo_box);
+		command_pack_in_status_line();
+	}
+}
+
+static void ghid_command_use_command_window_sync(void)
+{
+	command_use_command_window_sync(&ghidgui->topwin.cmd);
+}
+
+/*** input ***/
+
+void ghid_status_update(void)
+{
+	ghidgui->common.set_status_line_label();
+}
+
+static void ghid_interface_set_sensitive(gboolean sensitive)
+{
+	pcb_gtk_tw_interface_set_sensitive(&ghidgui->topwin, sensitive);
+}
+
+static void ghid_port_button_press_main(void)
+{
+	ghid_invalidate_all();
+	ghid_window_set_name_label(PCB->Name);
+	ghid_set_status_line_label();
+	if (!gport->view.panning)
+		g_idle_add(ghid_idle_cb, &ghidgui->topwin);
+}
+
+static void ghid_port_button_release_main(void)
+{
+	pcb_tool_adjust_attached_objects();
+	ghid_invalidate_all();
+
+	ghid_window_set_name_label(PCB->Name);
+	ghid_set_status_line_label();
+	g_idle_add(ghid_idle_cb, &ghidgui->topwin);
+}
+
+static void ghid_mode_cursor_main(int mode)
+{
+	if (mode >= 0)
+		ghid_point_cursor(&gport->mouse, 0); /* undo any override (e.g. left over from arrow cursor poitning to the end of a line) first */
+	ghid_mode_cursor(&gport->mouse, mode);
+}
+
+/*** misc ***/
+static void LayersChanged_cb(void)
+{
+	ghid_LayersChanged(0, 0, 0);
+}
+
+static void ghid_load_bg_image(void)
+{
+	GError *err = NULL;
+
+	if (conf_hid_gtk.plugins.hid_gtk.bg_image)
+		ghidgui->bg_pixbuf = gdk_pixbuf_new_from_file(conf_hid_gtk.plugins.hid_gtk.bg_image, &err);
+
+	if (err) {
+		g_error("%s", err->message);
+		g_error_free(err);
+	}
+}
+
+static gboolean lead_user_cb(gpointer data)
+{
+	pcb_lead_user_t *lead_user = data;
+	pcb_coord_t step;
+	double elapsed_time;
+
+	/* Queue a redraw */
+	ghid_invalidate_all();
+
+	/* Update radius */
+	elapsed_time = g_timer_elapsed(lead_user->timer, NULL);
+	g_timer_start(lead_user->timer);
+
+	step = PCB_MM_TO_COORD(LEAD_USER_VELOCITY * elapsed_time);
+	if (lead_user->radius > step)
+		lead_user->radius -= step;
+	else
+		lead_user->radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+
+	return TRUE;
+}
+
+
+void ghid_lead_user_to_location(pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_lead_user_t *lead_user = &gport->lead_user;
+
+	ghid_cancel_lead_user();
+
+	lead_user->lead_user = pcb_true;
+	lead_user->x = x;
+	lead_user->y = y;
+	lead_user->radius = PCB_MM_TO_COORD(LEAD_USER_INITIAL_RADIUS);
+	lead_user->timeout = g_timeout_add(LEAD_USER_PERIOD, lead_user_cb, lead_user);
+	lead_user->timer = g_timer_new();
+}
+
+void ghid_cancel_lead_user(void)
+{
+	pcb_lead_user_t *lead_user = &gport->lead_user;
+
+	if (lead_user->timeout)
+		g_source_remove(lead_user->timeout);
+
+	if (lead_user->timer)
+		g_timer_destroy(lead_user->timer);
+
+	if (lead_user->lead_user)
+		ghid_invalidate_all();
+
+	lead_user->timeout = 0;
+	lead_user->timer = NULL;
+	lead_user->lead_user = pcb_false;
+}
+
+static void ghid_main_destroy(void *port)
+{
+	ghid_cancel_lead_user();
+	ghidgui->common.shutdown_renderer(port);
+	gtk_main_quit();
+}
+
+/*** init ***/
+
+void ghid_glue_common_init(void)
+{
+	/* Set up the glue struct to lib_gtk_common */
+	ghidgui->common.gport = &ghid_port;
+	ghidgui->common.window_set_name_label = ghid_window_set_name_label;
+	ghidgui->common.set_status_line_label = ghid_set_status_line_label;
+	ghidgui->common.note_event_location = ghid_note_event_location;
+	ghidgui->common.shift_is_pressed = ghid_shift_is_pressed;
+	ghidgui->common.interface_input_signals_disconnect = ghid_interface_input_signals_disconnect;
+	ghidgui->common.interface_input_signals_connect = ghid_interface_input_signals_connect;
+	ghidgui->common.interface_set_sensitive = ghid_interface_set_sensitive;
+	ghidgui->common.port_button_press_main = ghid_port_button_press_main;
+	ghidgui->common.port_button_release_main = ghid_port_button_release_main;
+	ghidgui->common.status_line_set_text = ghid_status_line_set_text;
+	ghidgui->common.route_styles_edited_cb = ghid_route_styles_edited_cb;
+	ghidgui->common.mode_cursor_main = ghid_mode_cursor_main;
+	ghidgui->common.cancel_lead_user = ghid_cancel_lead_user;
+	ghidgui->common.lead_user_to_location = ghid_lead_user_to_location;
+	ghidgui->common.pan_common = ghid_pan_common;
+	ghidgui->common.port_ranges_scale = ghid_port_ranges_scale;
+	ghidgui->common.pack_mode_buttons = ghid_pack_mode_buttons;
+
+	ghidgui->common.layer_buttons_update = ghid_layer_buttons_update;
+	ghidgui->common.LayersChanged = LayersChanged_cb;
+	ghidgui->common.command_entry_is_active = ghid_command_entry_is_active;
+	ghidgui->common.command_use_command_window_sync = ghid_command_use_command_window_sync;
+	ghidgui->common.load_bg_image = ghid_load_bg_image;
+	ghidgui->common.main_destroy = ghid_main_destroy;
+	ghidgui->common.port_ranges_changed = ghid_port_ranges_changed;
+
+	ghidgui->topwin.cmd.com = &ghidgui->common;
+	ghidgui->topwin.cmd.pack_in_status_line = command_pack_in_status_line;
+	ghidgui->topwin.cmd.post_entry = command_post_entry;
+	ghidgui->topwin.cmd.pre_entry = command_pre_entry;
+
+	ghid_port.view.com = &ghidgui->common;
+	ghid_port.mouse.com = &ghidgui->common;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_common.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include "hid.h"
+void ghid_glue_common_init(void);
+void ghid_lead_user_to_location(pcb_coord_t x, pcb_coord_t y);
+void ghid_cancel_lead_user(void);
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.c	(revision 18980)
@@ -0,0 +1,116 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,1999 Thomas Nau
+ *  pcb-rnd Copyright (C) 2016, 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+#include "glue_conf.h"
+#include "glue_event.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "gui.h"
+
+static void ghid_confchg_rst(conf_native_t *cfg, int arr_idx)
+{
+	pcb_ghid_rst_chg();
+}
+
+/* Update the status line - should be bound to any config value displayed there */
+static void ghid_confchg_status_line(conf_native_t *cfg, int arr_idx)
+{
+	/* test if PCB struct doesn't exist at startup */
+	if ((PCB == NULL) || (ghidgui->common.set_status_line_label == NULL))
+		return;
+	ghidgui->common.set_status_line_label();
+}
+
+static void ghid_confchg_fullscreen(conf_native_t *cfg, int arr_idx)
+{
+	if (ghidgui->hid_active)
+		ghid_fullscreen_apply(&ghidgui->topwin);
+}
+
+
+void ghid_confchg_checkbox(conf_native_t *cfg, int arr_idx)
+{
+	if (ghidgui->hid_active)
+		ghid_update_toggle_flags(&ghidgui->topwin, NULL);
+}
+
+static void ghid_confchg_grid_unit(conf_native_t *cfg, int arr_idx)
+{
+	/* test if PCB struct doesn't exist at startup */
+	if ((PCB == NULL) || !ghidgui->hid_active)
+		return;
+
+	ghid_handle_units_changed(&ghidgui->topwin);
+	ghidgui->common.set_status_line_label();
+}
+
+static void ghid_confchg_cli(conf_native_t *cfg, int arr_idx)
+{
+	ghid_command_update_prompt(&ghidgui->topwin.cmd);
+}
+
+
+static void init_conf_watch(conf_hid_callbacks_t *cbs, const char *path, void (*func)(conf_native_t *, int))
+{
+	conf_native_t *n = conf_get_field(path);
+	if (n != NULL) {
+		memset(cbs, 0, sizeof(conf_hid_callbacks_t));
+		cbs->val_change_post = func;
+		conf_hid_set_cb(n, ghidgui->conf_id, cbs);
+	}
+}
+
+void ghid_conf_regs(const char *cookie)
+{
+	static conf_hid_callbacks_t 
+		cbs_refraction, cbs_direction, cbs_fullscreen, cbs_show_sside, cbs_grid,
+		cbs_text_scale, cbs_grid_unit, cbs_rst[4], cbs_cli[2];
+
+	ghidgui->conf_id = conf_hid_reg(cookie, NULL);
+
+	init_conf_watch(&cbs_direction, "editor/all_direction_lines", ghid_confchg_status_line);
+	init_conf_watch(&cbs_refraction, "editor/line_refraction", ghid_confchg_status_line);
+	init_conf_watch(&cbs_show_sside, "editor/show_solder_side", ghid_confchg_status_line);
+	init_conf_watch(&cbs_grid, "editor/grid", ghid_confchg_status_line);
+	init_conf_watch(&cbs_text_scale, "design/text_scale", ghid_confchg_status_line);
+
+	init_conf_watch(&cbs_fullscreen, "editor/fullscreen", ghid_confchg_fullscreen);
+	init_conf_watch(&cbs_grid_unit, "editor/grid_unit", ghid_confchg_grid_unit);
+
+	init_conf_watch(&cbs_rst[0], "design/line_thickness", ghid_confchg_rst);
+	init_conf_watch(&cbs_rst[1], "design/clearance", ghid_confchg_rst);
+#warning padstack TODO: remove some paths when route style has proto
+	init_conf_watch(&cbs_rst[2], "design/via_thickness", ghid_confchg_rst);
+	init_conf_watch(&cbs_rst[3], "design/via_drilling_hole", ghid_confchg_rst);
+
+	init_conf_watch(&cbs_cli[0], "rc/cli_prompt", ghid_confchg_cli);
+	init_conf_watch(&cbs_cli[1], "rc/cli_backend", ghid_confchg_cli);
+
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_conf.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "conf.h"
+
+void ghid_confchg_checkbox(conf_native_t *cfg, int arr_idx);
+
+void ghid_conf_regs(const char *cookie);
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.c	(revision 18980)
@@ -0,0 +1,104 @@
+#include "common.h"
+#include "event.h"
+#include "gui.h"
+#include "conf_core.h"
+#include "tool.h"
+#include "../src_plugins/lib_gtk_common/dlg_netlist.h"
+#include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+void pcb_ghid_rst_chg(void)
+{
+	if (!ghidgui || !ghidgui->topwin.route_style_selector)
+		return;
+
+	pcb_gtk_route_style_sync (GHID_ROUTE_STYLE(ghidgui->topwin.route_style_selector), conf_core.design.line_thickness, conf_core.design.via_drilling_hole, conf_core.design.via_thickness, conf_core.design.clearance);
+
+	return;
+}
+
+static void RouteStylesChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	pcb_ghid_rst_chg();
+}
+
+
+static void ev_pcb_changed(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if ((!ghidgui) || (!ghidgui->hid_active))
+		return;
+
+	if (PCB != NULL)
+		ghidgui->common.window_set_name_label(PCB->Name);
+
+	if (!gport->drawing_allowed)
+		return;
+
+	if (ghidgui->topwin.route_style_selector) {
+		pcb_gtk_route_style_empty(GHID_ROUTE_STYLE(ghidgui->topwin.route_style_selector));
+		make_route_style_buttons(GHID_ROUTE_STYLE(ghidgui->topwin.route_style_selector));
+	}
+	RouteStylesChanged(0, 0, NULL);
+
+	pcb_gtk_tw_ranges_scale(&ghidgui->topwin);
+	pcb_gtk_zoom_view_fit(&gport->view);
+	ghid_sync_with_new_layout(&ghidgui->topwin);
+}
+
+static void ev_pcb_meta_changed(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if ((!ghidgui) || (!ghidgui->hid_active))
+		return;
+
+	if (PCB != NULL)
+		ghidgui->common.window_set_name_label(PCB->Name);
+}
+
+
+static void GhidNetlistChanged(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (!ghidgui->hid_active)
+		return;
+
+	pcb_gtk_netlist_changed(&ghidgui->common, user_data, argc, argv);
+}
+
+static void ghid_gui_sync(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	/* Sync gui widgets with pcb state */
+	ghid_mode_buttons_update();
+
+	/* Sync gui status display with pcb state */
+	pcb_tool_adjust_attached_objects();
+	ghid_invalidate_all();
+	ghidgui->common.window_set_name_label(PCB->Name);
+	ghidgui->common.set_status_line_label();
+}
+
+static void ghid_gui_sync_status(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	ghidgui->common.window_set_name_label(PCB->Name);
+	ghidgui->common.set_status_line_label();
+}
+
+static void ghid_Busy(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (gport != NULL)
+		ghid_watch_cursor(&gport->mouse);
+}
+
+void glue_event_init(const char *cookie)
+{
+	pcb_event_bind(PCB_EVENT_SAVE_PRE, ghid_conf_save_pre_wgeo, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_LOAD_POST, ghid_conf_load_post_wgeo, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, ev_pcb_changed, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_BOARD_META_CHANGED, ev_pcb_meta_changed, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_NETLIST_CHANGED, GhidNetlistChanged, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_ROUTE_STYLES_CHANGED, RouteStylesChanged, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_LAYERS_CHANGED, ghid_LayersChanged, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_LAYERVIS_CHANGED, ghid_LayervisChanged, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_BUSY, ghid_Busy, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_GUI_SYNC, ghid_gui_sync, NULL, cookie);
+	pcb_event_bind(PCB_EVENT_GUI_SYNC_STATUS, ghid_gui_sync_status, NULL, cookie);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_event.h	(revision 18980)
@@ -0,0 +1,4 @@
+void glue_event_init(const char *cookie);
+void pcb_ghid_rst_chg(void);
+
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.c	(revision 18980)
@@ -0,0 +1,583 @@
+#include "config.h"
+#include "glue_hid.h"
+
+#include "gui.h"
+#include "actions.h"
+#include "glue_hid.h"
+#include "render.h"
+#include "common.h"
+#include "hid_nogui.h"
+#include "hid_attrib.h"
+#include "hid_draw_helpers.h"
+#include "coord_conv.h"
+
+#include "../src_plugins/lib_gtk_common/in_keyboard.h"
+#include "../src_plugins/lib_gtk_common/bu_dwg_tooltip.h"
+#include "../src_plugins/lib_gtk_common/ui_crosshair.h"
+#include "../src_plugins/lib_gtk_common/dlg_confirm.h"
+#include "../src_plugins/lib_gtk_common/dlg_input.h"
+#include "../src_plugins/lib_gtk_common/dlg_log.h"
+#include "../src_plugins/lib_gtk_common/dlg_file_chooser.h"
+#include "../src_plugins/lib_gtk_common/dlg_pinout.h"
+#include "../src_plugins/lib_gtk_common/dlg_report.h"
+#include "../src_plugins/lib_gtk_common/dlg_progress.h"
+#include "../src_plugins/lib_gtk_common/dlg_attribute.h"
+#include "../src_plugins/lib_gtk_common/dlg_attributes.h"
+#include "../src_plugins/lib_gtk_common/dlg_drc.h"
+#include "../src_plugins/lib_gtk_common/util_listener.h"
+#include "../src_plugins/lib_gtk_common/util_timer.h"
+#include "../src_plugins/lib_gtk_common/util_watch.h"
+#include "../src_plugins/lib_gtk_common/util_block_hook.h"
+#include "../src_plugins/lib_gtk_common/win_place.h"
+#include "../src_plugins/lib_gtk_config/hid_gtk_conf.h"
+#include "../src_plugins/lib_gtk_config/lib_gtk_config.h"
+
+void gtkhid_begin(void)
+{
+	pcb_gtk_action_reg();
+	ghidgui->hid_active = 1;
+}
+
+void gtkhid_end(void)
+{
+	pcb_gtk_action_unreg();
+	ghidgui->hid_active = 0;
+}
+
+static inline void ghid_screen_update(void) { ghidgui->common.screen_update(); }
+
+static gint ghid_port_window_enter_cb(GtkWidget * widget, GdkEventCrossing * ev, void * out_)
+{
+	GHidPort *out = out_;
+
+	/* printf("enter: mode: %d detail: %d\n", ev->mode, ev->detail); */
+
+	/* See comment in ghid_port_window_leave_cb() */
+
+	if (ev->mode != GDK_CROSSING_NORMAL && ev->detail != GDK_NOTIFY_NONLINEAR) {
+		return FALSE;
+	}
+
+	if (!ghidgui->topwin.cmd.command_entry_status_line_active) {
+		out->view.has_entered = TRUE;
+		/* Make sure drawing area has keyboard focus when we are in it.
+		 */
+		gtk_widget_grab_focus(out->drawing_area);
+	}
+	ghidgui->topwin.in_popup = FALSE;
+
+	/* Following expression is true if a you open a menu from the menu bar,
+	 * move the mouse to the viewport and click on it. This closes the menu
+	 * and moves the pointer to the viewport without the pointer going over
+	 * the edge of the viewport */
+	if (ev->mode == GDK_CROSSING_UNGRAB && ev->detail == GDK_NOTIFY_NONLINEAR) {
+		ghid_screen_update();
+	}
+	return FALSE;
+}
+
+static gint ghid_port_window_leave_cb(GtkWidget * widget, GdkEventCrossing * ev, void * out_)
+{
+	GHidPort *out = out_;
+
+	/* printf("leave mode: %d detail: %d\n", ev->mode, ev->detail); */
+
+	/* Window leave events can also be triggered because of focus grabs. Some
+	 * X applications occasionally grab the focus and so trigger this function.
+	 * At least GNOME's window manager is known to do this on every mouse click.
+	 *
+	 * See http://bugzilla.gnome.org/show_bug.cgi?id=102209
+	 */
+
+	if (ev->mode != GDK_CROSSING_NORMAL) {
+		return FALSE;
+	}
+
+	out->view.has_entered = FALSE;
+
+	ghid_screen_update();
+
+	return FALSE;
+}
+
+static gboolean check_object_tooltips(GHidPort *out)
+{
+	return pcb_gtk_dwg_tooltip_check_object(out->drawing_area, out->view.crosshair_x, out->view.crosshair_y);
+}
+
+static gint ghid_port_window_motion_cb(GtkWidget * widget, GdkEventMotion * ev, void * out_)
+{
+	GHidPort *out = out_;
+	gdouble dx, dy;
+	static gint x_prev = -1, y_prev = -1;
+
+	gdk_event_request_motions(ev);
+
+	if (out->view.panning) {
+		dx = gport->view.coord_per_px * (x_prev - ev->x);
+		dy = gport->view.coord_per_px * (y_prev - ev->y);
+		if (x_prev > 0)
+			pcb_gtk_pan_view_rel(&gport->view, dx, dy);
+		x_prev = ev->x;
+		y_prev = ev->y;
+		return FALSE;
+	}
+	x_prev = y_prev = -1;
+	ghid_note_event_location((GdkEventButton *) ev);
+
+	pcb_gtk_dwg_tooltip_queue(out->drawing_area, (GSourceFunc)check_object_tooltips, out);
+
+	return FALSE;
+}
+
+static gboolean ghid_port_drawing_area_configure_event_cb(GtkWidget * widget, GdkEventConfigure * ev, void * out)
+{
+	static gboolean first_time_done;
+
+	gport->view.canvas_width = ev->width;
+	gport->view.canvas_height = ev->height;
+
+	ghid_drawing_area_configure_hook(out);
+	if (!first_time_done) {
+		first_time_done = TRUE;
+		pcb_board_changed(0);
+	}
+
+	pcb_gtk_tw_ranges_scale(&ghidgui->topwin);
+	ghid_invalidate_all();
+	return 0;
+}
+
+
+void gtkhid_do_export(pcb_hid_attr_val_t *options)
+{
+	gtkhid_begin();
+
+	pcb_hid_cfg_keys_init(&ghid_keymap);
+	ghid_keymap.translate_key = ghid_translate_key;
+	ghid_keymap.key_name = ghid_key_name;
+	ghid_keymap.auto_chr = 1;
+	ghid_keymap.auto_tr = hid_cfg_key_default_trans;
+
+	ghid_create_pcb_widgets(&ghidgui->topwin, gport->top_window);
+	pcb_gtk_drcwin_init(&ghidgui->drcwin);     /* DRC window is not built, yet    */
+
+	/* assume pcb_gui is us */
+	pcb_gui->hid_cfg = ghidgui->topwin.ghid_cfg;
+
+	gport->mouse.drawing_area = ghidgui->topwin.drawing_area;
+	gport->drawing_area = ghidgui->topwin.drawing_area;
+	gport->mouse.top_window = ghidgui->common.top_window;
+
+#warning TODO: move this to render init
+	/* Mouse and key events will need to be intercepted when PCB needs a
+	   |  location from the user.
+	 */
+	g_signal_connect(G_OBJECT(gport->drawing_area), "scroll_event", G_CALLBACK(ghid_port_window_mouse_scroll_cb), &gport->mouse);
+	g_signal_connect(G_OBJECT(gport->drawing_area), "motion_notify_event", G_CALLBACK(ghid_port_window_motion_cb), gport);
+	g_signal_connect(G_OBJECT(gport->drawing_area), "configure_event", G_CALLBACK(ghid_port_drawing_area_configure_event_cb), gport);
+	g_signal_connect(G_OBJECT(gport->drawing_area), "enter_notify_event", G_CALLBACK(ghid_port_window_enter_cb), gport);
+	g_signal_connect(G_OBJECT(gport->drawing_area), "leave_notify_event", G_CALLBACK(ghid_port_window_leave_cb), gport);
+
+	ghid_interface_input_signals_connect();
+
+	pcb_gtk_tw_layer_buttons_update(&ghidgui->topwin);
+
+	if (conf_hid_gtk.plugins.hid_gtk.listen)
+		pcb_gtk_create_listener();
+
+	ghidgui->gui_is_up = 1;
+
+	pcb_event(PCB_EVENT_GUI_INIT, NULL);
+
+	/* Make sure drawing area has keyboard focus so that keys are handled
+	   while the mouse cursor is over the top window or children widgets,
+	   before first entering the drawing area */
+	gtk_widget_grab_focus(gport->drawing_area);
+
+	gtk_main();
+	pcb_hid_cfg_keys_uninit(&ghid_keymap);
+	gtkhid_end();
+
+	ghidgui->gui_is_up = 0;
+	pcb_gui->hid_cfg = NULL;
+}
+
+static void ghid_do_exit(pcb_hid_t * hid)
+{
+	gtk_main_quit();
+}
+
+	/* Create top level window for routines that will need top_window
+	   |  before ghid_create_pcb_widgets() is called.
+	 */
+int gtkhid_parse_arguments(int *argc, char ***argv)
+{
+	GtkWidget *window;
+
+	ghid_config_init();
+
+	/* on windows we need to figure out the installation directory */
+#ifdef WIN32
+	char *tmps;
+	char *libdir;
+	tmps = g_win32_get_package_installation_directory(PCB_PACKAGE "-" PCB_VERSION, NULL);
+#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PCB_PACKAGE  G_DIR_SEPARATOR_S "pcblib"
+	libdir = (char *) malloc(strlen(tmps) + strlen(REST_OF_PATH) + 1);
+	sprintf(libdir, "%s%s", tmps, REST_OF_PATH);
+	free(tmps);
+
+#undef REST_OF_PATH
+
+#endif
+
+#if defined (DEBUG)
+	{
+		int i;
+		for (i = 0; i < *argc; i++)
+			printf("ghid_parse_arguments():  *argv[%d] = \"%s\"\n", i, (*argv)[i]);
+	}
+#endif
+
+	/* Threads aren't used in PCB, but this call would go here.
+	 */
+	/* g_thread_init (NULL); */
+
+#if defined (ENABLE_NLS)
+	/* Do our own setlocale() stufff since we want to override LC_NUMERIC
+	 */
+	gtk_set_locale();
+	pcb_setlocale(LC_NUMERIC, "C");		/* use decimal point instead of comma */
+#endif
+
+	conf_parse_arguments("plugins/hid_gtk/", argc, argv);
+
+	/*
+	 * Prevent gtk_init() and gtk_init_check() from automatically
+	 * calling setlocale (LC_ALL, "") which would undo LC_NUMERIC if ENABLE_NLS
+	 * We also don't want locale set if no ENABLE_NLS to keep "C" LC_NUMERIC.
+	 */
+	gtk_disable_setlocale();
+
+	if (!gtk_init_check(argc, argv)) {
+		fprintf(stderr, "gtk_init_check() fail - maybe $DISPLAY not set or X/GUI not accessible?\n");
+		return 1; /* recoverable error - try another HID */
+	}
+
+
+	gport = &ghid_port;
+	gport->view.coord_per_px = 300.0;
+	pcb_pixel_slop = 300;
+
+	ghidgui->common.init_renderer(argc, argv, gport);
+
+#ifdef ENABLE_NLS
+#ifdef LOCALEDIR
+	bindtextdomain(PCB_PACKAGE, LOCALEDIR);
+#endif
+	textdomain(PCB_PACKAGE);
+	bind_textdomain_codeset(PCB_PACKAGE, "UTF-8");
+#endif /* ENABLE_NLS */
+
+	ghidgui->topwin.com = &ghidgui->common;
+	ghidgui->common.top_window = window = gport->top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+	gtk_window_set_title(GTK_WINDOW(window), "pcb-rnd");
+
+	wplc_place(WPLC_TOP, window);
+
+	gtk_widget_show_all(gport->top_window);
+	return 0;
+}
+
+static void ghid_calibrate(double xval, double yval)
+{
+	printf(_("ghid_calibrate() -- not implemented\n"));
+}
+
+static void ghid_set_crosshair(pcb_coord_t x, pcb_coord_t y, int action)
+{
+	int offset_x, offset_y;
+
+	if (gport->drawing_area == NULL)
+		return;
+
+	ghidgui->common.draw_grid_local(x, y);
+	gdk_window_get_origin(gtk_widget_get_window(gport->drawing_area), &offset_x, &offset_y);
+	pcb_gtk_crosshair_set(x, y, action, offset_x, offset_y, &ghidgui->topwin.cps, &gport->view);
+}
+
+static void ghid_get_coords(const char *msg, pcb_coord_t *x, pcb_coord_t *y, int force)
+{
+	pcb_gtk_get_coords(&gport->mouse, &gport->view, msg, x, y, force);
+}
+
+static void ghid_get_view_size(pcb_coord_t * width, pcb_coord_t * height)
+{
+	*width = gport->view.width;
+	*height = gport->view.height;
+}
+
+pcb_hidval_t ghid_add_timer(void (*func) (pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data)
+{
+	return pcb_gtk_add_timer(&ghidgui->common, func, milliseconds, user_data);
+}
+
+static pcb_hidval_t ghid_watch_file(int fd, unsigned int condition,
+								pcb_bool (*func)(pcb_hidval_t watch, int fd, unsigned int condition, pcb_hidval_t user_data),
+								pcb_hidval_t user_data)
+{
+	return pcb_gtk_watch_file(&ghidgui->common, fd, condition, func, user_data);
+}
+
+static void ghid_log(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	pcb_gtk_logv(ghidgui->hid_active, PCB_MSG_INFO, fmt, ap);
+	va_end(ap);
+}
+
+static void ghid_logv(enum pcb_message_level level, const char *fmt, va_list args)
+{
+	pcb_gtk_logv(ghidgui->hid_active, level, fmt, args);
+}
+
+static int ghid_confirm_dialog(const char *msg, ...)
+{
+	int res;
+	va_list ap;
+	va_start(ap, msg);
+	res = pcb_gtk_dlg_confirm_open(ghid_port.top_window, msg, ap);
+	va_end(ap);
+	return res;
+}
+
+static int ghid_close_confirm_dialog(void)
+{
+	return pcb_gtk_dlg_confirm_close(ghid_port.top_window);
+}
+
+static void ghid_report_dialog(const char *title, const char *msg)
+{
+	pcb_gtk_dlg_report(ghid_port.top_window, title, msg, FALSE);
+}
+
+static char *ghid_prompt_for(const char *msg, const char *default_string)
+{
+	char *grv, *rv;
+
+	grv = pcb_gtk_dlg_input(msg, default_string, GTK_WINDOW(ghid_port.top_window));
+
+	if (grv == NULL)
+		return NULL;
+
+	/* can't assume the caller will do g_free() on it */
+	rv = pcb_strdup(grv);
+	g_free(grv);
+	return rv;
+}
+
+static char *ghid_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags)
+{
+	return pcb_gtk_fileselect(ghid_port.top_window, title, descr, default_file, default_ext, history_tag, flags);
+}
+
+static int ghid_attribute_dialog_(pcb_hid_attribute_t * attrs, int n_attrs, pcb_hid_attr_val_t * results, const char *title, const char *descr, void *caller_data)
+{
+	return ghid_attribute_dialog(ghid_port.top_window, attrs, n_attrs, results, title, descr, caller_data);
+}
+
+static void *ghid_attr_dlg_new_(pcb_hid_attribute_t *attrs, int n_attrs, pcb_hid_attr_val_t *results, const char *title, const char *descr, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev))
+{
+	return ghid_attr_dlg_new(ghid_port.top_window, attrs, n_attrs, results, title, descr, caller_data, modal, button_cb);
+}
+
+static void ghid_show_item(void *item)
+{
+	ghid_pinout_window_show(&ghidgui->common, (pcb_subc_t *)item);
+}
+
+static void ghid_beep()
+{
+	gdk_beep();
+}
+
+static int ghid_progress(int so_far, int total, const char *message)
+{
+	return pcb_gtk_dlg_progress(ghid_port.top_window, so_far, total, message);
+}
+
+static void ghid_attributes(const char *owner, pcb_attribute_list_t * attrs)
+{
+	pcb_gtk_dlg_attributes(ghid_port.top_window, owner, attrs);
+}
+
+static void PointCursor(pcb_bool grabbed)
+{
+	if (!ghidgui)
+		return;
+
+	ghid_point_cursor(&gport->mouse, grabbed);
+}
+
+static void ghid_notify_save_pcb(const char *filename, pcb_bool done)
+{
+	pcb_gtk_tw_notify_save_pcb(&ghidgui->topwin, filename, done);
+}
+
+static void ghid_notify_filename_changed()
+{
+	pcb_gtk_tw_notify_filename_changed(&ghidgui->topwin);
+}
+
+static int ghid_propedit_start(void *pe, int num_props, const char *(*query) (void *pe, const char *cmd, const char *key, const char *val, int idx))
+{
+	ghidgui->propedit_widget = pcb_gtk_dlg_propedit_create(&ghidgui->propedit_dlg, &ghidgui->common);
+	ghidgui->propedit_dlg.propedit_query = query;
+	ghidgui->propedit_dlg.propedit_pe = pe;
+	return 0;
+}
+
+static void ghid_propedit_end(void *pe)
+{
+	if (gtk_dialog_run(GTK_DIALOG(ghidgui->propedit_widget)) == GTK_RESPONSE_OK) {
+	}
+	gtk_widget_destroy(ghidgui->propedit_widget);
+}
+
+static void ghid_propedit_add_stat(void *pe, const char *propname, void *propctx, const char *most_common, const char *min, const char *max, const char *avg)
+{
+	pcb_gtk_dlg_propedit_prop_add(&ghidgui->propedit_dlg, propname, most_common, min, max, avg);
+}
+
+/* Create a new menu by path */
+static int ghid_remove_menu(const char *menu_path)
+{
+	return pcb_hid_cfg_remove_menu(ghidgui->topwin.ghid_cfg, menu_path, ghid_remove_menu_widget, ghidgui->topwin.menu.menu_bar);
+}
+
+static int ghid_remove_menu_node(lht_node_t *node)
+{
+	return pcb_hid_cfg_remove_menu_node(ghidgui->topwin.ghid_cfg, node, ghid_remove_menu_widget, ghidgui->topwin.menu.menu_bar);
+}
+
+static void ghid_create_menu(const char *menu_path, const pcb_menu_prop_t *props)
+{
+	pcb_hid_cfg_create_menu(ghidgui->topwin.ghid_cfg, menu_path, props, ghid_create_menu_widget, &ghidgui->topwin.menu);
+}
+
+static void ghid_update_menu_checkbox(const char *cookie)
+{
+	if (ghidgui->hid_active)
+		ghid_update_toggle_flags(&ghidgui->topwin, cookie);
+}
+
+static int ghid_usage(const char *topic)
+{
+	fprintf(stderr, "\nGTK GUI command line arguments:\n\n");
+	conf_usage("plugins/hid_gtk", pcb_hid_usage_option);
+	fprintf(stderr, "\nInvocation:\n");
+	fprintf(stderr, "  pcb-rnd --gui gtk2_gdk [options]\n");
+	fprintf(stderr, "  pcb-rnd --gui gtk2_gl [options]\n");
+	fprintf(stderr, "  pcb-rnd --gui gtk3_cairo [options]\n");
+	fprintf(stderr, "  (depending on which gtk plugin(s) are compiled and installed)\n");
+	return 0;
+}
+
+static void ghid_drc_window_reset_message_glue()
+{
+	ghid_drc_window_reset_message(&ghidgui->drcwin);
+}
+
+static void ghid_drc_window_append_violation_glue(pcb_drc_violation_t *violation)
+{
+	ghid_drc_window_append_violation(&ghidgui->drcwin, &ghidgui->common, violation);
+}
+
+static int ghid_drc_window_throw_dialog_glue()
+{
+	return ghid_drc_window_throw_dialog(&ghidgui->drcwin);
+}
+
+pcb_hid_drc_gui_t ghid_drc_gui = {
+	1,  /* log_drc_overview */
+	0,  /* log_drc_details */
+	ghid_drc_window_reset_message_glue,
+	ghid_drc_window_append_violation_glue,
+	ghid_drc_window_throw_dialog_glue,
+};
+
+static const char *ghid_command_entry(const char *ovr, int *cursor)
+{
+	return pcb_gtk_cmd_command_entry(&ghidgui->topwin.cmd, ovr, cursor);
+}
+
+void ghid_glue_hid_init(pcb_hid_t *dst)
+{
+	memset(dst, 0, sizeof(pcb_hid_t));
+
+	pcb_hid_nogui_init(dst);
+	pcb_dhlp_draw_helpers_init(dst);
+
+	dst->struct_size = sizeof(pcb_hid_t);
+	dst->gui = 1;
+
+	dst->do_export = gtkhid_do_export;
+	dst->do_exit = ghid_do_exit;
+	dst->parse_arguments = gtkhid_parse_arguments;
+
+	dst->calibrate = ghid_calibrate;
+	dst->shift_is_pressed = ghid_shift_is_pressed;
+	dst->control_is_pressed = ghid_control_is_pressed;
+	dst->mod1_is_pressed = ghid_mod1_is_pressed;
+	dst->get_coords = ghid_get_coords;
+	dst->get_view_size = ghid_get_view_size;
+	dst->set_crosshair = ghid_set_crosshair;
+	dst->add_timer = ghid_add_timer;
+	dst->stop_timer = ghid_stop_timer;
+	dst->watch_file = ghid_watch_file;
+	dst->unwatch_file = pcb_gtk_unwatch_file;
+	dst->add_block_hook = ghid_add_block_hook;
+	dst->stop_block_hook = ghid_stop_block_hook;
+
+	dst->log = ghid_log;
+	dst->logv = ghid_logv;
+	dst->confirm_dialog = ghid_confirm_dialog;
+	dst->close_confirm_dialog = ghid_close_confirm_dialog;
+	dst->report_dialog = ghid_report_dialog;
+	dst->prompt_for = ghid_prompt_for;
+	dst->fileselect = ghid_fileselect;
+	dst->attribute_dialog = ghid_attribute_dialog_;
+	dst->attr_dlg_new = ghid_attr_dlg_new_;
+	dst->attr_dlg_run = ghid_attr_dlg_run;
+	dst->attr_dlg_free = ghid_attr_dlg_free;
+	dst->attr_dlg_property = ghid_attr_dlg_property;
+	dst->attr_dlg_widget_state = ghid_attr_dlg_widget_state;
+	dst->attr_dlg_widget_hide = ghid_attr_dlg_widget_hide;
+	dst->attr_dlg_set_value = ghid_attr_dlg_set_value;
+	dst->show_item = ghid_show_item;
+	dst->beep = ghid_beep;
+	dst->progress = ghid_progress;
+	dst->edit_attributes = ghid_attributes;
+	dst->point_cursor = PointCursor;
+
+	dst->notify_save_pcb = ghid_notify_save_pcb;
+	dst->notify_filename_changed = ghid_notify_filename_changed;
+
+	dst->propedit_start = ghid_propedit_start;
+	dst->propedit_end = ghid_propedit_end;
+	dst->propedit_add_stat = ghid_propedit_add_stat;
+/*	dst->propedit_add_prop = ghid_propedit_add_prop;*/
+/*	dst->propedit_add_value = ghid_propedit_add_value;*/
+	dst->command_entry = ghid_command_entry;
+
+	dst->drc_gui = &ghid_drc_gui;
+
+	dst->create_menu = ghid_create_menu;
+	dst->remove_menu = ghid_remove_menu;
+	dst->remove_menu_node = ghid_remove_menu_node;
+	dst->update_menu_checkbox = ghid_update_menu_checkbox;
+
+	dst->usage = ghid_usage;
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_hid.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include "hid.h"
+
+void ghid_glue_hid_init(pcb_hid_t *dst);
+void gtkhid_do_export(pcb_hid_attr_val_t *options);
+int gtkhid_parse_arguments(int *argc, char ***argv);
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.c	(revision 18980)
@@ -0,0 +1,31 @@
+#include <stdlib.h>
+#include "glue_win32.h"
+
+void ghid_win32_init(void)
+{
+#ifdef WIN32
+	char *tmps;
+	char *share_dir;
+	char *loader_cache;
+	FILE *loader_file;
+
+	tmps = g_win32_get_package_installation_directory(PCB_PACKAGE "-" PCB_VERSION, NULL);
+#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PCB_PACKAGE
+#define REST_OF_CACHE G_DIR_SEPARATOR_S "loaders.cache"
+	share_dir = (char *) malloc(strlen(tmps) + strlen(REST_OF_PATH) + 1);
+	sprintf(share_dir, "%s%s", tmps, REST_OF_PATH);
+
+	/* Point to our gdk-pixbuf loader cache.  */
+	loader_cache = (char *) malloc(strlen("bindir_todo12") + strlen(REST_OF_CACHE) + 1);
+	sprintf(loader_cache, "%s%s", "bindir_todo12", REST_OF_CACHE);
+	loader_file = fopen(loader_cache, "r");
+	if (loader_file) {
+		fclose(loader_file);
+		g_setenv("GDK_PIXBUF_MODULE_FILE", loader_cache, TRUE);
+	}
+
+	free(tmps);
+#undef REST_OF_PATH
+	printf("\"Share\" installation path is \"%s\"\n", "share_dir_todo12");
+#endif
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/glue_win32.h	(revision 18980)
@@ -0,0 +1,12 @@
+/*
+ * We will need these for finding the windows installation
+ * directory.  Without that we can't find our fonts and
+ * footprint libraries.
+ */
+#ifdef WIN32
+#include <windows.h>
+#include <winreg.h>
+#endif
+
+void ghid_win32_init(void);
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/gui.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/gui.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/gui.h	(revision 18980)
@@ -0,0 +1,90 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_HID_GTK_GHID_H
+#define PCB_HID_GTK_GHID_H
+
+#include "hid.h"
+
+typedef struct GHidPort_s  GHidPort;
+typedef struct GhidGui_s GhidGui;
+extern GhidGui _ghidgui, *ghidgui;
+
+#include <gtk/gtk.h>
+
+/* needed for a type in GhidGui - DO NOT ADD .h files that are not requred for the structs! */
+#include "../src_plugins/lib_gtk_common/ui_zoompan.h"
+#include "../src_plugins/lib_gtk_common/dlg_propedit.h"
+#include "../src_plugins/lib_gtk_common/dlg_topwin.h"
+#include "../src_plugins/lib_gtk_common/dlg_drc.h"
+#include "../src_plugins/lib_gtk_common/in_mouse.h"
+#include "../src_plugins/lib_gtk_common/glue.h"
+
+#include "board.h"
+#include "event.h"
+#include "conf_hid.h"
+#include "render.h"
+#include "pcb_bool.h"
+
+struct GhidGui_s {
+	GtkActionGroup *main_actions;
+
+	pcb_gtk_topwin_t topwin;
+	pcb_gtk_drcwin_t drcwin;
+	pcb_gtk_common_t common;
+	conf_hid_id_t conf_id;
+
+	GdkPixbuf *bg_pixbuf; /* -> renderer */
+
+	pcb_gtk_dlg_propedit_t propedit_dlg;
+	GtkWidget *propedit_widget;
+
+	int hid_active; /* 1 if the currently running hid (pcb_gui) is us */
+	int gui_is_up; /*1 if all parts of the gui is up and running */
+
+	gulong button_press_handler, button_release_handler, key_press_handler[5], key_release_handler[5];
+};
+
+/* The output viewport */
+struct GHidPort_s {
+	GtkWidget *top_window,				/* toplevel widget              */
+	 *drawing_area;								/* and its drawing area */
+
+	pcb_bool drawing_allowed;     /* track if a drawing area is available for rendering */
+
+	struct render_priv_s *render_priv;
+
+	pcb_gtk_mouse_t mouse;
+
+	pcb_gtk_view_t view;
+
+	pcb_lead_user_t lead_user;
+};
+
+extern GHidPort ghid_port, *gport;
+
+#endif /* PCB_HID_GTK_GHID_GUI_H */
Index: tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.c	(revision 18980)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "plugins.h"
+
+static const char *lib_gtk_hid_cookie = "lib_gtk_hid";
+
+int pplg_check_ver_lib_gtk_hid(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_gtk_hid(void)
+{
+}
+
+int pplg_init_lib_gtk_hid(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/lib_gtk_hid.pup	(revision 18980)
@@ -0,0 +1,8 @@
+$class lib
+$short hid_gtk generic part
+$long Generic gtk HID implementation, independent of GTK version (2 vs. 3) and rendering engine. Mostly a dispatcher that fills in all the glue to connect the parts. An actual gtk HID implementation may use this lib or replace parts of it or the whole with local implementation.
+$state works
+$package lib-gtk
+default disable-all
+dep lib_hid_common
+dep dialogs
Index: tags/2.0.1/src_plugins/lib_gtk_hid/preview_helper.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/preview_helper.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/preview_helper.h	(revision 18980)
@@ -0,0 +1,29 @@
+#ifndef PCB_GTK_PREVIEW_HELPER_H
+#define PCB_GTK_PREVIEW_HELPER_H
+
+/* make sure the context is set to draw the whole widget size, which might
+   be slightly larger than the original request */
+#define PCB_GTK_PREVIEW_TUNE_EXTENT(ctx, allocation) \
+do { \
+	pcb_coord_t nx1, ny1, nx2, ny2; \
+	nx1 = Px(0); nx2 = Px(allocation.width); \
+	ny1 = Py(0); ny2 = Py(allocation.height); \
+	if (nx1 < nx2) { \
+		ctx->view.X1 = nx1; \
+		ctx->view.X2 = nx2; \
+	} \
+	else { \
+		ctx->view.X1 = nx2; \
+		ctx->view.X2 = nx1; \
+	} \
+	if (ny1 < ny2) { \
+		ctx->view.Y1 = ny1; \
+		ctx->view.Y2 = ny2; \
+	} \
+	else { \
+		ctx->view.Y1 = ny2; \
+		ctx->view.Y2 = ny1; \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/lib_gtk_hid/render.c
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/render.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/render.c	(revision 18980)
@@ -0,0 +1,14 @@
+#include "config.h"
+#include <gtk/gtk.h>
+#include "gui.h"
+#include "render.h"
+
+void ghid_draw_area_update(GHidPort *port, GdkRectangle *rect)
+{
+	gdk_window_invalidate_rect(gtk_widget_get_window(port->drawing_area), rect, FALSE);
+}
+
+void ghid_drawing_area_configure_hook(void *out)
+{
+	ghidgui->common.drawing_area_configure_hook(out);
+}
Index: tags/2.0.1/src_plugins/lib_gtk_hid/render.h
===================================================================
--- tags/2.0.1/src_plugins/lib_gtk_hid/render.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_gtk_hid/render.h	(revision 18980)
@@ -0,0 +1,39 @@
+#ifndef PCB_GTK_RENDER_H
+#define PCB_GTK_RENDER_H
+
+#include <gtk/gtk.h>
+#include <glib.h>
+#include "gui.h"
+#include "conf.h"
+#include "pcb_bool.h"
+
+#define LEAD_USER_WIDTH           0.2	/* millimeters */
+#define LEAD_USER_PERIOD          (1000 / 5)	/* 5fps (in ms) */
+#define LEAD_USER_VELOCITY        3.	/* millimeters per second */
+#define LEAD_USER_ARC_COUNT       3
+#define LEAD_USER_ARC_SEPARATION  3.	/* millimeters */
+#define LEAD_USER_INITIAL_RADIUS  10.	/* millimetres */
+#define LEAD_USER_COLOR_R         1.
+#define LEAD_USER_COLOR_G         1.
+#define LEAD_USER_COLOR_B         0.
+
+typedef struct pcb_lead_user_s {
+	guint timeout;
+	GTimer *timer;
+	pcb_bool lead_user;
+	pcb_coord_t radius;
+	pcb_coord_t x;
+	pcb_coord_t y;
+} pcb_lead_user_t;
+
+/* the only entry points we should see from the actual renderers */
+void ghid_gdk_install(pcb_gtk_common_t *common, pcb_hid_t *hid);
+void ghid_gl_install(pcb_gtk_common_t *common, pcb_hid_t *hid);
+
+/* Utility functions for renderers to call ***/
+void ghid_draw_area_update(GHidPort *out, GdkRectangle *rect);
+
+static inline void ghid_invalidate_all(void) { pcb_gui->invalidate_all(); }
+void ghid_drawing_area_configure_hook(void *out);
+
+#endif
Index: tags/2.0.1/src_plugins/lib_hid_common/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_hid_common
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_hid_common/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,13 @@
+put /local/pcb/mod {lib_hid_common}
+put /local/pcb/mod/OBJS [@
+  $(PLUGDIR)/lib_hid_common/lib_hid_common.o
+  $(PLUGDIR)/lib_hid_common/layer_menu.o
+  $(PLUGDIR)/lib_hid_common/grid_menu.o
+  $(PLUGDIR)/lib_hid_common/routest_menu.o
+@]
+
+switch /local/pcb/lib_hid_common/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_hid_common/clip.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/clip.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/clip.h	(revision 18980)
@@ -0,0 +1,115 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2004 harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_CLIP_H
+#define PCB_CLIP_H
+
+
+#include "global_typedefs.h"
+
+/* Clip X,Y to the given bounding box, plus a margin.  Returns pcb_true if
+   there is something left to be drawn.  */
+PCB_INLINE pcb_bool pcb_line_clip(double minx, double miny, double maxx, double maxy, double *x1, double *y1, double *x2, double *y2, double margin)
+{
+	double d, r;
+
+	minx -= margin;
+	miny -= margin;
+	maxx += margin;
+	maxy += margin;
+
+	/* clip first point on left side */
+	if (*x1 < minx) {
+		if (*x2 < minx)
+			return pcb_false;
+		d = *x2 - *x1;
+		r = (minx - *x1) / d;
+		*x1 = minx;
+		*y1 += r * (*y2 - *y1);
+	}
+	/* clip second point on left side */
+	if (*x2 < minx) {
+		d = *x1 - *x2;
+		r = (minx - *x2) / d;
+		*x2 = minx;
+		*y2 += r * (*y1 - *y2);
+	}
+	/* clip first point on right side */
+	if (*x1 > maxx) {
+		if (*x2 > maxx)
+			return pcb_false;
+		d = *x2 - *x1;
+		r = (maxx - *x1) / d;
+		*x1 = maxx;
+		*y1 += r * (*y2 - *y1);
+	}
+	/* clip second point on right side */
+	if (*x2 > maxx) {
+		d = *x1 - *x2;
+		r = (maxx - *x2) / d;
+		*x2 = maxx;
+		*y2 += r * (*y1 - *y2);
+	}
+
+	/* clip first point on top */
+	if (*y1 < miny) {
+		if (*y2 < miny)
+			return pcb_false;
+		d = *y2 - *y1;
+		r = (miny - *y1) / d;
+		*y1 = miny;
+		*x1 += r * (*x2 - *x1);
+	}
+	/* clip second point on top */
+	if (*y2 < miny) {
+		d = *y1 - *y2;
+		r = (miny - *y2) / d;
+		*y2 = miny;
+		*x2 += r * (*x1 - *x2);
+	}
+	/* clip first point on bottom */
+	if (*y1 > maxy) {
+		if (*y2 > maxy)
+			return pcb_false;
+		d = *y2 - *y1;
+		r = (maxy - *y1) / d;
+		*y1 = maxy;
+		*x1 += r * (*x2 - *x1);
+	}
+	/* clip second point on top */
+	if (*y2 > maxy) {
+		d = *y1 - *y2;
+		r = (maxy - *y2) / d;
+		*y2 = maxy;
+		*x2 += r * (*x1 - *x2);
+	}
+	return pcb_true;
+}
+
+#endif
Index: tags/2.0.1/src_plugins/lib_hid_common/grid_menu.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/grid_menu.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/grid_menu.c	(revision 18980)
@@ -0,0 +1,99 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "conf.h"
+#include "conf_core.h"
+#include "grid.h"
+#include "event.h"
+#include "hid_cfg.h"
+#include "hid.h"
+
+#include "grid_menu.h"
+
+#define ANCH "@grid"
+
+static void grid_install_menu(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+{
+	conflist_t *lst = (conflist_t *)&conf_core.editor.grids;
+	conf_listitem_t *li;
+	char *end = path + strlen(path);
+	pcb_menu_prop_t props;
+	char act[256], chk[256];
+	int idx;
+
+	memset(&props, 0,sizeof(props));
+	props.action = act;
+	props.checked = chk;
+	props.update_on = "editor/grids_idx";
+	props.cookie = ANCH;
+
+	pcb_hid_cfg_del_anchor_menus(node, ANCH);
+
+	/* prepare for appending the strings at the end of the path, "under" the anchor */
+	*end = '/';
+	end++;
+
+	/* have to go reverse to keep order because this will insert items */
+	idx = conflist_length(lst)-1;
+	for(li = conflist_last(lst); li != NULL; li = conflist_prev(li),idx--) {
+		sprintf(act, "grid(#%d)", idx);
+		sprintf(chk, "conf(iseq, editor/grids_idx, %d)", idx);
+		strcpy(end, li->val.string[0]);
+		pcb_gui->create_menu(path, &props);
+	}
+
+}
+
+void pcb_grid_install_menu(void)
+{
+	pcb_hid_cfg_map_anchor_menus(ANCH, grid_install_menu, NULL);
+}
+
+static int grid_lock = 0;
+
+void pcb_grid_update_conf(conf_native_t *cfg, int arr_idx)
+{
+	if (grid_lock) return;
+	grid_lock++;
+	pcb_grid_install_menu();
+	grid_lock--;
+}
+
+void pcb_grid_update_ev(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if (grid_lock) return;
+	grid_lock++;
+	pcb_grid_install_menu();
+
+	/* to get the right menu checked */
+	if (conf_core.editor.grids_idx >= 0)
+		pcb_grid_list_step(0);
+	grid_lock--;
+}
+
+
Index: tags/2.0.1/src_plugins/lib_hid_common/grid_menu.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/grid_menu.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/grid_menu.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "conf.h"
+#include "event.h"
+
+void pcb_grid_update_conf(conf_native_t *cfg, int arr_idx);
+void pcb_grid_update_ev(void *user_data, int argc, pcb_event_arg_t argv[]);
Index: tags/2.0.1/src_plugins/lib_hid_common/layer_menu.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/layer_menu.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/layer_menu.c	(revision 18980)
@@ -0,0 +1,181 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "event.h"
+#include "layer.h"
+#include "layer_ui.h"
+#include "layer_grp.h"
+#include "pcb-printf.h"
+#include "hid_cfg.h"
+#include "hid.h"
+
+#include "layer_menu.h"
+
+typedef struct {
+	const char *anch;
+	int view;
+} ly_ctx_t;
+
+static void layer_install_menu1(void *ctx_, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+{
+	ly_ctx_t *ctx = ctx_;
+	int plen = strlen(path);
+	int len_avail = 125;
+	char *end = path + plen;
+	pcb_menu_prop_t props;
+	char act[256], chk[256];
+	int idx, max_ml;
+	pcb_layergrp_id_t gid;
+	const pcb_menu_layers_t *ml;
+
+	memset(&props, 0, sizeof(props));
+	props.action = act;
+	props.update_on = "";
+	props.cookie = ctx->anch;
+
+	pcb_hid_cfg_del_anchor_menus(node, ctx->anch);
+
+	/* prepare for appending the strings at the end of the path, "under" the anchor */
+	*end = '/';
+	end++;
+
+	/* ui layers; have to go reverse to keep order because this will insert items */
+	if ((ctx->view) && (vtp0_len(&pcb_uilayers) > 0)) {
+		for(idx = vtp0_len(&pcb_uilayers)-1; idx >= 0; idx--) {
+			pcb_layer_t *ly = pcb_uilayers.array[idx];
+			if ((ly == NULL) || (ly->name == NULL))
+				continue;
+
+			props.checked = chk;
+			sprintf(act, "ToggleView(ui:%d)", idx);
+			sprintf(chk, "ChkView(ui:%d)", idx);
+
+			pcb_snprintf(end, len_avail, "  %s", ly->name);
+			pcb_gui->create_menu(path, &props);
+		}
+
+		props.checked = NULL;
+		pcb_snprintf(end, len_avail, "[UI]");
+		pcb_gui->create_menu(path, &props);
+	}
+
+	/* menu-only virtual layers; have to go reverse to keep order because this will insert items */
+	for(ml = pcb_menu_layers, max_ml = 0; ml->name != NULL; ml++) max_ml++;
+	for(idx = max_ml-1; idx >= 0; idx--) {
+		ml = &pcb_menu_layers[idx];
+		props.checked = chk;
+		if (ctx->view) {
+			sprintf(act, "ToggleView(%s)", ml->abbrev);
+			sprintf(chk, "ChkView(%s)", ml->abbrev);
+		}
+		else {
+			if (ml->sel_offs == 0) /* do not list layers that can not be selected */
+				continue;
+			sprintf(act, "SelectLayer(%s)", ml->abbrev);
+			sprintf(chk, "ChkLayer(%s)", ml->abbrev);
+		}
+		pcb_snprintf(end, len_avail, "  %s", ml->name);
+		pcb_gui->create_menu(path, &props);
+	}
+
+	props.checked = NULL;
+	pcb_snprintf(end, len_avail, "[virtual]");
+	pcb_gui->create_menu(path, &props);
+
+
+	/* have to go reverse to keep order because this will insert items */
+	for(gid = pcb_max_group(PCB)-1; gid >= 0; gid--) {
+		pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid];
+		int n;
+
+		if (g->ltype & PCB_LYT_SUBSTRATE)
+			continue;
+
+		for(n = g->len-1; n >= 0; n--) {
+			pcb_layer_id_t lid = g->lid[n];
+			pcb_layer_t *l = pcb_get_layer(PCB->Data, lid);
+			pcb_layer_type_t lyt = pcb_layer_flags_(l);
+
+			props.background = l->meta.real.color;
+			props.foreground = conf_core.appearance.color.background;
+			props.checked = chk;
+			if (ctx->view) {
+				sprintf(act, "ToggleView(%ld)", lid+1);
+				sprintf(chk, "ChkView(%ld)", lid+1);
+			}
+			else {
+				sprintf(act, "SelectLayer(%ld)", lid+1);
+				sprintf(chk, "ChkLayer(%ld)", lid+1);
+			}
+			pcb_snprintf(end, len_avail, "  %s", l->name);
+			pcb_gui->create_menu(path, &props);
+		}
+
+		props.foreground = NULL;
+		props.background = NULL;
+		props.checked = NULL;
+		pcb_snprintf(end, len_avail, "[%s]", g->name);
+		pcb_gui->create_menu(path, &props);
+	}
+
+
+	/* restore the path */
+	end--;
+	*end = '\0';
+}
+
+
+static void layer_install_menu(void)
+{
+	ly_ctx_t ctx;
+
+	ctx.view = 1;
+	ctx.anch = "@layerview";
+	pcb_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
+
+	ctx.view = 0;
+	ctx.anch = "@layerpick";
+	pcb_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
+}
+
+void pcb_layer_menu_update_ev(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	layer_install_menu();
+	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
+		pcb_gui->update_menu_checkbox(NULL);
+}
+
+void pcb_layer_menu_vis_update_ev(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
+		pcb_gui->update_menu_checkbox(NULL);
+}
+
Index: tags/2.0.1/src_plugins/lib_hid_common/layer_menu.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/layer_menu.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/layer_menu.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "event.h"
+
+void pcb_layer_menu_update_ev(void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_vis_update_ev(void *user_data, int argc, pcb_event_arg_t argv[]);
+
Index: tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.c	(revision 18980)
@@ -0,0 +1,89 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017, 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include "plugins.h"
+#include "conf_hid.h"
+
+#include "grid_menu.h"
+#include "layer_menu.h"
+#include "routest_menu.h"
+#include "util.c"
+
+static const char *grid_cookie = "lib_hid_common/grid";
+static const char *layer_cookie = "lib_hid_common/layer";
+static const char *rst_cookie = "lib_hid_common/route_style";
+
+int pplg_check_ver_lib_hid_common(int ver_needed) { return 0; }
+
+static conf_hid_id_t conf_id;
+
+void pplg_uninit_lib_hid_common(void)
+{
+	pcb_event_unbind_allcookie(grid_cookie);
+	pcb_event_unbind_allcookie(layer_cookie);
+	pcb_event_unbind_allcookie(rst_cookie);
+	conf_hid_unreg(grid_cookie);
+	conf_hid_unreg(rst_cookie);
+}
+
+int pplg_init_lib_hid_common(void)
+{
+#warning padstack TODO: remove some paths when route style has proto
+	const char **rp, *rpaths[] = {"design/line_thickness", "design/via_thickness", "design/via_drilling_hole", "design/clearance", NULL};
+	static conf_hid_callbacks_t ccb, rcb[sizeof(rpaths)/sizeof(rpaths[0])];
+	conf_native_t *nat;
+	int n;
+
+	PCB_API_CHK_VER;
+
+	pcb_event_bind(PCB_EVENT_GUI_INIT, pcb_grid_update_ev, NULL, grid_cookie);
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, pcb_layer_menu_update_ev, NULL, layer_cookie);
+	pcb_event_bind(PCB_EVENT_LAYERS_CHANGED, pcb_layer_menu_update_ev, NULL, layer_cookie);
+	pcb_event_bind(PCB_EVENT_LAYERVIS_CHANGED, pcb_layer_menu_vis_update_ev, NULL, layer_cookie);
+	pcb_event_bind(PCB_EVENT_ROUTE_STYLES_CHANGED, pcb_rst_update_ev, NULL, rst_cookie);
+	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, pcb_rst_update_ev, NULL, rst_cookie);
+	pcb_event_bind(PCB_EVENT_GUI_INIT, pcb_rst_update_ev, NULL, rst_cookie);
+
+	conf_id = conf_hid_reg(grid_cookie, NULL);
+	memset(&ccb, 0, sizeof(ccb));
+	ccb.val_change_post = pcb_grid_update_conf;
+	nat = conf_get_field("editor/grids");
+
+	if (nat != NULL)
+		conf_hid_set_cb(nat, conf_id, &ccb);
+
+	conf_id = conf_hid_reg(rst_cookie, NULL);
+	for(rp = rpaths, n = 0; *rp != NULL; rp++, n++) {
+		memset(&rcb[n], 0, sizeof(rcb[0]));
+		rcb[n].val_change_post = pcb_rst_update_conf;
+		nat = conf_get_field(*rp);
+		if (nat != NULL)
+			conf_hid_set_cb(nat, conf_id, &rcb[n]);
+	}
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/lib_hid_common.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short all-hid common code
+$long hid_* common helper functions
+$state works
+$package lib-gui
+default disable-all
Index: tags/2.0.1/src_plugins/lib_hid_common/routest_menu.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/routest_menu.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/routest_menu.c	(revision 18980)
@@ -0,0 +1,87 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "board.h"
+#include "conf.h"
+#include "conf_core.h"
+#include "route_style.h"
+#include "event.h"
+#include "hid_cfg.h"
+#include "hid.h"
+
+#include "routest_menu.h"
+
+#define ANCH "@routestyles"
+
+static void rst_install_menu(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+{
+	pcb_menu_prop_t props;
+	char *end = path + strlen(path);
+	char act[256], chk[256];
+	int idx;
+
+	memset(&props, 0,sizeof(props));
+	props.action = act;
+	props.checked = chk;
+	props.update_on = "";
+	props.cookie = ANCH;
+
+	pcb_hid_cfg_del_anchor_menus(node, ANCH);
+
+	/* prepare for appending the strings at the end of the path, "under" the anchor */
+	*end = '/';
+	end++;
+
+	/* have to go reverse to keep order because this will insert items */
+	for(idx = vtroutestyle_len(&PCB->RouteStyle)-1; idx >= 0; idx--) {
+		sprintf(act, "RouteStyle(%d)", idx+1); /* for historical reasons this action counts from 1 */
+		sprintf(chk, "ChkRst(%d)", idx);
+		strcpy(end, PCB->RouteStyle.array[idx].name);
+		pcb_gui->create_menu(path, &props);
+	}
+}
+
+static int rst_lock = 0;
+static void rst_update(void)
+{
+	if (rst_lock) return;
+	rst_lock++;
+	pcb_hid_cfg_map_anchor_menus(ANCH, rst_install_menu, NULL);
+	rst_lock--;
+}
+
+void pcb_rst_update_ev(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rst_update();
+}
+
+void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx)
+{
+	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
+		pcb_gui->update_menu_checkbox(NULL);
+}
Index: tags/2.0.1/src_plugins/lib_hid_common/routest_menu.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/routest_menu.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/routest_menu.h	(revision 18980)
@@ -0,0 +1,6 @@
+#include "conf.h"
+#include "event.h"
+
+void pcb_rst_update_ev(void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx);
+
Index: tags/2.0.1/src_plugins/lib_hid_common/util.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/util.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/util.c	(revision 18980)
@@ -0,0 +1,59 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "util.h"
+#include "data_it.h"
+#include "flag.h"
+
+static pcb_cardinal_t pcb_get_bbox_by_flag(pcb_box_t *dst, const pcb_data_t *data, pcb_flag_values_t flg)
+{
+	pcb_any_obj_t *o;
+	pcb_data_it_t it;
+	pcb_cardinal_t cnt = 0;
+
+	dst->X1 = dst->Y1 = PCB_MAX_COORD;
+	dst->X2 = dst->Y2 = -PCB_MAX_COORD;
+
+	for(o = pcb_data_first(&it, (pcb_data_t *)data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+		if (!PCB_FLAG_TEST(flg, o))
+			continue;
+		cnt++;
+		pcb_box_bump_box(dst, &o->BoundingBox);
+	}
+	return cnt;
+}
+
+pcb_cardinal_t pcb_get_selection_bbox(pcb_box_t *dst, const pcb_data_t *data)
+{
+	return pcb_get_bbox_by_flag(dst, data, PCB_FLAG_SELECTED);
+}
+
+pcb_cardinal_t pcb_get_found_bbox(pcb_box_t *dst, const pcb_data_t *data)
+{
+	return pcb_get_bbox_by_flag(dst, data, PCB_FLAG_FOUND);
+}
Index: tags/2.0.1/src_plugins/lib_hid_common/util.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_common/util.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_common/util.h	(revision 18980)
@@ -0,0 +1,7 @@
+#include "data.h"
+
+/* calculate the bounding box of all selections/founds in data, return the number
+   of selected objects. When returns 0, the dst box is infinitely large. */
+pcb_cardinal_t pcb_get_selection_bbox(pcb_box_t *dst, const pcb_data_t *data);
+pcb_cardinal_t pcb_get_found_bbox(pcb_box_t *dst, const pcb_data_t *data);
+
Index: tags/2.0.1/src_plugins/lib_hid_gl/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_hid_gl
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_hid_gl/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {lib_hid_gl}
+put /local/pcb/mod/OBJS_C99 [@
+  $(PLUGDIR)/lib_hid_gl/hidgl.o
+  $(PLUGDIR)/lib_hid_gl/lib_hid_gl.o
+  $(PLUGDIR)/lib_hid_gl/stencil_gl.o
+@]
+
+switch /local/pcb/lib_hid_gl/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.c	(revision 18980)
@@ -0,0 +1,622 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2017 PCB Contributers (See ChangeLog for details)
+ *  Copyright (C) 2017 Adrian Purser
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
+#include "config.h"
+
+#include "stencil_gl.h"
+
+#define MARKER_STACK_SIZE				16
+#define RESERVE_VERTEX_EXTRA		1024
+#define RESERVE_PRIMITIVE_EXTRA	256
+
+enum
+{
+	PRIM_MASK_CREATE		= 1000,
+	PRIM_MASK_DESTROY,
+	PRIM_MASK_USE
+};
+
+
+/* Vertex Buffer Data
+ * The vertex buffer is a dynamic array of vertices. Each vertex contains 
+ * position and colour information.
+ */ 
+
+typedef struct
+{
+	GLfloat		x;
+	GLfloat		y;
+	GLfloat		r;
+	GLfloat		g;
+	GLfloat		b;
+	GLfloat		a;
+} vertex_t;
+
+
+typedef struct
+{
+	vertex_t * 		data;						/* A dynamic array of vertices. */
+	int						capacity;				/* The capacity of the buffer (by number of vertices) */
+	int 					size;						/* The number of vertices in the buffer. */
+	int 					marker;					/* An index that allows vertices after the marker to be removed. */
+} vertex_buffer_t;
+
+static vertex_buffer_t	vertex_buffer = {0};
+
+/* Primitive Buffer Data */
+
+typedef struct
+{
+	int				type;			/* The type of the primitive, eg. GL_LINES, GL_TRIANGLES, GL_TRIANGLE_FAN */
+	GLint			first;		/* The index of the first vertex in the vertex buffer. */
+	GLsizei		count;		/* The number of vertices */
+} primitive_t;
+
+typedef struct
+{
+	primitive_t * 	data;															/* A dynamic array of primitives */
+	int							capacity;													/* The number of primitives that can fit into the primitive_data */
+	int							size;															/* The actual number of primitives in the primitive buffer */
+	int 						marker;														/* An index that allows primitives after the marker to be removed. */
+	int 						dirty_index;											/* The index of the first primitive that hasn't been drawn yet. */
+} primitive_buffer_t;
+
+static primitive_buffer_t primitive_buffer = {0};
+
+static GLfloat red 		= 0.0f;
+static GLfloat green 	= 0.0f;
+static GLfloat blue 	= 0.0f;
+static GLfloat alpha 	= 0.75f;
+	
+static int mask_stencil = 0;
+
+static inline void
+vertex_buffer_clear()
+{
+	vertex_buffer.size = 0;
+	vertex_buffer.marker = 0;
+}
+
+static void
+vertex_buffer_destroy()
+{
+	vertex_buffer_clear();
+	if(vertex_buffer.data) {
+		free(vertex_buffer.data);
+		vertex_buffer.data = NULL;
+	}
+}
+
+/* Ensure that the total capacity of the vertex buffer is at least 'size' vertices.
+ * When the buffer is reallocated, extra vertices will be added to avoid many small 
+ * allocations beingi made.
+ */
+static int
+vertex_buffer_reserve(int size)
+{
+	int result = 0;
+	if(size > vertex_buffer.capacity)	{
+		vertex_t * p_data = realloc(vertex_buffer.data,(size + RESERVE_VERTEX_EXTRA) * sizeof(vertex_t));
+		if(p_data == NULL)
+			result = -1;
+		else {
+			vertex_buffer.data = p_data;
+			vertex_buffer.capacity = size + RESERVE_VERTEX_EXTRA;
+		}
+	}
+	return result;
+}
+
+/* Ensure that the capacity of the vertex buffer can accomodate an allocation
+ * of at least 'size' vertices.
+ */
+static inline int 
+vertex_buffer_reserve_extra(int size)
+{
+	return vertex_buffer_reserve(vertex_buffer.size + size);
+}
+
+/* Set the marker to the end of the active vertex data. This allows vertices 
+ * added after the marker has been set to be discarded. This is required when 
+ * temporary vertices are required to draw something that will not be required
+ * for the final render pass.
+ */
+static inline int
+vertex_buffer_set_marker()
+{
+	vertex_buffer.marker = vertex_buffer.size;
+	return vertex_buffer.marker;
+}
+
+/* Discard vertices added after the marker was set. The end of the buffer will then be
+ * the position of the marker.
+ */
+static inline void
+vertex_buffer_rewind()
+{
+	vertex_buffer.size = vertex_buffer.marker;
+}
+
+static inline vertex_t * 
+vertex_buffer_allocate(int size)
+{
+	vertex_t * p_vertex = NULL;			
+	if(vertex_buffer_reserve_extra(size) == 0) {
+		p_vertex = &vertex_buffer.data[vertex_buffer.size];
+		vertex_buffer.size += size;
+	}
+	
+	return p_vertex;
+}
+
+static inline void
+vertex_buffer_add(GLfloat x,GLfloat y)
+{
+	vertex_t * p_vert = vertex_buffer_allocate(1);
+	if(p_vert) {
+		p_vert->x = x;
+		p_vert->y = y;
+		p_vert->r = red;
+		p_vert->g = green;
+		p_vert->b = blue;
+		p_vert->a = alpha;
+	}
+}
+
+static inline void
+primitive_buffer_clear()
+{
+	primitive_buffer.size = 0;
+	primitive_buffer.dirty_index = 0;
+	primitive_buffer.marker = 0;
+}
+
+static void
+primitive_buffer_destroy()
+{
+	primitive_buffer_clear();
+	if(primitive_buffer.data)	{
+		free(primitive_buffer.data);
+		primitive_buffer.data = NULL;
+	}
+}
+
+/* Ensure that the total capacity of the primitive buffer is at least 'size' 
+ * primitives.  When reallocating the buffer, extra primitives will be added
+ * to avoid many small reallocations.
+ */
+static int
+primitive_buffer_reserve(int size)
+{
+	int result = 0;
+
+	if(size > primitive_buffer.capacity) {
+		primitive_t * p_data = realloc(primitive_buffer.data,(size + RESERVE_PRIMITIVE_EXTRA) * sizeof(primitive_t));
+		if(p_data == NULL)
+			result = -1;
+		else {
+			primitive_buffer.data = p_data;
+			primitive_buffer.capacity = size + RESERVE_PRIMITIVE_EXTRA;
+		}
+	}
+
+	return result;
+}
+
+/* Ensure that the capacity of the primitive buffer can accomodate an allocation
+ * of at least 'size' primitives.
+ */
+static inline int 
+primitive_buffer_reserve_extra(int size)
+{
+	return primitive_buffer_reserve(primitive_buffer.size + size);
+}
+
+/* Set the marker to the end of the active primitive data. This allows primitives 
+ * added after the marker to be discarded. This is required when temporary primitives 
+ * are required to draw something that will not be required for the final render pass.
+ */
+static inline int
+primitive_buffer_set_marker()
+{
+	primitive_buffer.marker = primitive_buffer.size;
+	return primitive_buffer.marker;
+}
+
+/* Discard primitives added after the marker was set. The end of the buffer will then be
+ * the position of the marker.
+ */
+static inline void
+primitive_buffer_rewind()
+{
+	primitive_buffer.size = primitive_buffer.marker;
+}
+
+static inline primitive_t *
+primitive_buffer_back()
+{
+	return (primitive_buffer.size > 0) && (primitive_buffer.data) ? &primitive_buffer.data[primitive_buffer.size-1] : NULL;
+}
+
+static inline int
+primitive_dirty_count()
+{
+		return primitive_buffer.size - primitive_buffer.dirty_index;
+}
+
+static void
+primitive_buffer_add(int type,GLint first,GLsizei count)
+{
+	primitive_t * last = primitive_buffer_back();
+
+	/* If the last primitive is the same type AND that type can be extended 
+	 * AND the last primitive is dirty AND 'first' follows the last vertex of
+	 * the previous primitive THEN we can simply append the new primitive to
+	 * the last one.
+	 */
+	if(	last && 
+			(primitive_dirty_count()>0) && 
+			(last->type == type) &&
+		 	((type == GL_LINES)	|| (type == GL_TRIANGLES) || (type == GL_POINTS)) &&
+			((last->first + last->count) == first) )
+		last->count += count;
+	else if(primitive_buffer_reserve_extra(1) == 0)	{
+		primitive_t * p_prim = &primitive_buffer.data[primitive_buffer.size++];
+		p_prim->type  = type;
+		p_prim->first = first;
+		p_prim->count = count;
+	}
+}
+
+static inline int 
+primitive_buffer_last_type()
+{
+	return primitive_buffer.size > 0 ? primitive_buffer.data[primitive_buffer.size-1].type : GL_ZERO;
+}
+
+void
+drawgl_set_colour(GLfloat r,GLfloat g,GLfloat b,GLfloat a)
+{
+	red		= r;
+	green	= g;
+	blue	= b;
+	alpha = a;
+}
+
+PCB_INLINE void
+drawgl_add_triangle(GLfloat x1,GLfloat y1,GLfloat x2,GLfloat y2,GLfloat x3,GLfloat y3)
+{
+	/* Debug Drawing 
+	primitive_buffer_add(GL_LINES,vertex_buffer.size,6);
+	vertex_buffer_reserve_extra(6);
+	vertex_buffer_add(x1,y1);	vertex_buffer_add(x2,y2);
+	vertex_buffer_add(x2,y2);	vertex_buffer_add(x3,y3);
+	vertex_buffer_add(x3,y3);	vertex_buffer_add(x1,y1);
+  */
+
+	primitive_buffer_add(GL_TRIANGLES,vertex_buffer.size,3);
+	vertex_buffer_reserve_extra(3);
+	vertex_buffer_add(x1,y1);
+	vertex_buffer_add(x2,y2);
+	vertex_buffer_add(x3,y3);
+
+}
+
+PCB_INLINE void
+drawgl_add_line(GLfloat x1,GLfloat y1,GLfloat x2,GLfloat y2)
+{
+	primitive_buffer_add(GL_LINES,vertex_buffer.size,2);
+	vertex_buffer_reserve_extra(2);
+	vertex_buffer_add(x1,y1);
+	vertex_buffer_add(x2,y2);
+}
+
+PCB_INLINE void
+drawgl_add_rectangle(GLfloat x1,GLfloat y1,GLfloat x2,GLfloat y2)
+{
+	primitive_buffer_add(GL_LINE_LOOP,vertex_buffer.size,4);
+	vertex_buffer_reserve_extra(4);
+	vertex_buffer_add(x1,y1);
+	vertex_buffer_add(x2,y1);
+	vertex_buffer_add(x2,y2);
+	vertex_buffer_add(x1,y2);
+}
+
+PCB_INLINE void
+drawgl_add_mask_create()
+{
+	primitive_buffer_add(PRIM_MASK_CREATE,0,0);
+}
+
+PCB_INLINE void
+drawgl_add_mask_destroy()
+{
+	primitive_buffer_add(PRIM_MASK_DESTROY,0,0);
+}
+
+PCB_INLINE void
+drawgl_add_mask_use()
+{
+	primitive_buffer_add(PRIM_MASK_USE,0,0);
+}
+
+PCB_INLINE void
+drawgl_direct_draw_rectangle(GLfloat x1,GLfloat y1,GLfloat x2,GLfloat y2)
+{
+	glBegin(GL_LINE_LOOP);
+		glColor4f(red,green,blue,alpha);
+		glVertex2f(x1,y1);
+		glVertex2f(x2,y1);
+		glVertex2f(x2,y2);
+		glVertex2f(x1,y2);
+	glEnd();
+}
+
+PCB_INLINE void
+drawgl_direct_draw_solid_rectangle(GLfloat x1,GLfloat y1,GLfloat x2,GLfloat y2)
+{
+	glBegin(GL_TRIANGLES);
+		glColor4f(red,green,blue,alpha);
+		glVertex2f(x1,y1);
+		glVertex2f(x2,y1);
+		glVertex2f(x1,y2);
+		glVertex2f(x2,y1);
+		glVertex2f(x2,y2);
+		glVertex2f(x1,y2);
+	glEnd();
+}
+
+PCB_INLINE void
+drawgl_reserve_triangles(int count)
+{
+	vertex_buffer_reserve_extra(count * 3);
+}
+		
+/* This function will draw the specified primitive but it may also modify the state of
+ * the stencil buffer when MASK primtives exist.
+ */
+static inline void
+drawgl_draw_primtive(primitive_t * prim)
+{
+	switch(prim->type) {
+		case PRIM_MASK_CREATE :
+			if(mask_stencil)
+				stencilgl_return_stencil_bit(mask_stencil);
+			mask_stencil = stencilgl_allocate_clear_stencil_bit();
+			if(mask_stencil != 0) {
+				glPushAttrib(GL_STENCIL_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+				glStencilMask(mask_stencil);
+				glStencilFunc(GL_ALWAYS,mask_stencil,mask_stencil);
+				glStencilOp(GL_KEEP,GL_KEEP,GL_REPLACE);
+				glColorMask(0,0,0,0);
+			}
+			break;			
+
+		case PRIM_MASK_USE :
+			{
+				GLint ref = 0;
+				glPopAttrib();
+				glPushAttrib(GL_STENCIL_BUFFER_BIT);
+				glGetIntegerv(GL_STENCIL_REF,&ref);
+				glStencilFunc(GL_GEQUAL,ref & ~mask_stencil,mask_stencil);
+			}
+			break;			
+
+		case PRIM_MASK_DESTROY :
+			glPopAttrib();
+			stencilgl_return_stencil_bit(mask_stencil);
+			mask_stencil = 0;
+			break;			
+
+		default :
+	  	glDrawArrays(prim->type, prim->first, prim->count);
+			break;
+	}
+}
+
+void
+drawgl_flush()
+{
+ 	int index = primitive_buffer.dirty_index;
+	int end = primitive_buffer.size;
+	primitive_t * prim = &primitive_buffer.data[index];
+
+	/* Setup the vertex buffer */
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+ 	glVertexPointer(2, GL_FLOAT, sizeof(vertex_t), &vertex_buffer.data[0].x);
+ 	glColorPointer(4, GL_FLOAT, sizeof(vertex_t), &vertex_buffer.data[0].r);
+
+	/* draw the primitives */
+	while(index < end) {
+		drawgl_draw_primtive(prim);
+		++prim;
+		++index;
+	}
+
+	/* disable the vertex buffer */
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+ 
+	primitive_buffer.dirty_index = end;
+}
+
+/* Draw all buffered primitives. The dirty index is ignored and will remain unchanged.
+ * This function accepts stencil bits that can be used to mask the drawing.
+ */
+PCB_INLINE void
+drawgl_draw_all(int stencil_bits)
+{
+	int index = primitive_buffer.size;
+	primitive_t * prim;
+	int mask = 0;
+
+	if((index == 0) || (primitive_buffer.data == NULL))
+		return;
+
+	--index;
+	prim = &primitive_buffer.data[index];
+
+	/* Setup the vertex buffer */
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_COLOR_ARRAY);
+ 	glVertexPointer(2, GL_FLOAT, sizeof(vertex_t), &vertex_buffer.data[0].x);
+ 	glColorPointer(4, GL_FLOAT, sizeof(vertex_t), &vertex_buffer.data[0].r);
+
+	/* draw the primitives */
+	while(index >= 0)	{
+		switch(prim->type) {
+			case PRIM_MASK_DESTROY :
+				/* The primitives are drawn in reverse order. The mask primitives are required
+				 * to be processed in forward order so we must search for the matching 'mask create'
+				 * primitive and then iterate through the primtives until we reach the 'mask destroy' 
+				 * primitive.
+				 */
+				{
+					primitive_t * next_prim = prim-1;;
+					primitive_t * mask_prim = prim;
+					int mask_index = index;
+					int next_index = index-1;
+
+					/* Find the 'mask create' primitive. */ 
+					while((mask_index>=0) && (mask_prim->type != PRIM_MASK_CREATE))	{
+						--mask_prim;
+						--mask_index;
+					}
+						
+					/* Process the primitives in forward order until we reach the 'mask destroy' primitive */
+					if(mask_prim->type == PRIM_MASK_CREATE)	{
+						next_index = mask_index;
+						next_prim = mask_prim;
+
+						while(mask_index <= index) {
+							switch(mask_prim->type)	{
+								case PRIM_MASK_CREATE :
+									if(mask)
+										stencilgl_return_stencil_bit(mask);
+									mask = stencilgl_allocate_clear_stencil_bit();
+
+									if(mask != 0)	{
+										glPushAttrib(GL_STENCIL_BUFFER_BIT);
+										
+										glEnable(GL_STENCIL_TEST);
+										stencilgl_mode_write_set(mask);
+									}
+									glPushAttrib(GL_COLOR_BUFFER_BIT);
+									glColorMask(0,0,0,0);
+									break;			
+
+								case PRIM_MASK_USE :
+									glPopAttrib();
+									if(mask != 0)	{
+										glEnable(GL_STENCIL_TEST);
+										glStencilOp(GL_KEEP,GL_KEEP,GL_ZERO);
+										glStencilFunc(GL_EQUAL,stencil_bits , stencil_bits | mask );
+										glStencilMask(stencil_bits);
+									}
+									break;			
+
+								case PRIM_MASK_DESTROY :
+									if(mask != 0)	{
+										glPopAttrib();
+										stencilgl_return_stencil_bit(mask);
+										mask = 0;
+									}
+									break;			
+
+								default :
+							  	glDrawArrays(mask_prim->type, mask_prim->first, mask_prim->count);
+									break;
+							}
+							++mask_prim;
+							++mask_index;
+						}
+
+						index = next_index;
+						prim = next_prim;
+					}
+					else {
+						index = mask_index;
+						prim = mask_prim;
+					}
+				}
+				break;
+
+			default :
+		  	glDrawArrays(prim->type, prim->first, prim->count);
+				break;
+		}
+
+		--prim;
+		--index;
+	}
+
+	if(mask)
+		stencilgl_return_stencil_bit(mask);
+
+	/* disable the vertex buffer */
+	glDisableClientState(GL_VERTEX_ARRAY);
+	glDisableClientState(GL_COLOR_ARRAY);
+
+}
+
+void
+drawgl_reset()
+{
+	vertex_buffer_clear();
+	primitive_buffer_clear();
+}
+
+PCB_INLINE void
+drawgl_set_marker()
+{
+	vertex_buffer_set_marker();
+	primitive_buffer_set_marker();
+}
+
+PCB_INLINE void
+drawgl_rewind_to_marker()
+{
+	vertex_buffer_rewind();
+	primitive_buffer_rewind();
+}
+
+void
+drawgl_uninit()
+{
+	vertex_buffer_destroy();
+	primitive_buffer_destroy();
+}
+
+
Index: tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/draw_gl.h	(revision 18980)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2017 PCB Contributers (See ChangeLog for details)
+ *  Copyright (C) 2017 Adrian Purser
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#ifndef HID_GL_DRAW_GL_H
+#define HID_GL_DRAW_GL_H
+
+#include "config.h"
+#include "opengl.h"
+
+typedef struct pcb_gl_color_s {
+	GLfloat red;
+	GLfloat green;
+	GLfloat blue;
+	GLfloat alpha;
+} pcb_gl_color_t;
+
+void drawgl_uninit();
+void drawgl_flush();
+void drawgl_set_colour(GLfloat r,GLfloat g,GLfloat b,GLfloat a);
+void drawgl_reset();
+
+
+#endif /* ! defined HID_GL_DRAW_GL_H */
+
Index: tags/2.0.1/src_plugins/lib_hid_gl/hidgl.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/hidgl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/hidgl.c	(revision 18980)
@@ -0,0 +1,782 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2011 PCB Contributers (See ChangeLog for details)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
+#include "crosshair.h"
+#include "data.h"
+#include "board.h"
+#include "grid.h"
+#include "hid.h"
+#include "hidgl.h"
+
+#include "draw_gl.c"
+
+#include "stencil_gl.h"
+
+void hidgl_init(void)
+{
+	stencilgl_init();
+}
+
+static pcb_composite_op_t composite_op = PCB_HID_COMP_RESET;
+static pcb_bool						direct_mode = pcb_true;
+static int								comp_stencil_bit = 0;
+
+static GLfloat * grid_points = NULL;
+static int grid_point_capacity = 0;
+
+
+static inline void
+mode_reset(pcb_bool direct,const pcb_box_t * screen)
+{
+			drawgl_flush();
+			drawgl_reset();
+			glColorMask(0, 0, 0, 0);	/* Disable colour drawing */
+			stencilgl_reset_stencil_usage();
+			comp_stencil_bit = 0;
+}
+
+static inline void
+mode_positive(pcb_bool direct,const pcb_box_t * screen)
+{
+	if(comp_stencil_bit == 0)
+		comp_stencil_bit = stencilgl_allocate_clear_stencil_bit();
+	else
+		drawgl_flush();		
+
+	glEnable(GL_STENCIL_TEST);
+	stencilgl_mode_write_set(comp_stencil_bit);
+}
+
+static inline void
+mode_negative(pcb_bool direct,const pcb_box_t * screen)
+{
+	glEnable(GL_STENCIL_TEST);
+
+	if(comp_stencil_bit == 0)	{
+		/* The stencil isn't valid yet which means that this is the first pos/neg mode
+		 * set since the reset. The compositing stencil bit will be allocated. Because 
+		 * this is a negative mode and it's the first mode to be set, the stencil buffer
+		 * will be set to all ones.
+		 */ 
+		comp_stencil_bit = stencilgl_allocate_clear_stencil_bit();
+		stencilgl_mode_write_set(comp_stencil_bit);
+		drawgl_direct_draw_solid_rectangle(screen->X1,screen->Y1,screen->X2,screen->Y2);
+	}
+	else
+		drawgl_flush();	
+
+	stencilgl_mode_write_clear(comp_stencil_bit);
+	drawgl_set_marker();
+}
+
+static inline void
+mode_flush(pcb_bool direct,pcb_bool xor_mode,const pcb_box_t * screen)
+{
+	drawgl_flush();
+	glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);	
+
+	if(comp_stencil_bit) {
+		glEnable(GL_STENCIL_TEST);
+
+		/* Setup the stencil to allow writes to the colour buffer if the 
+		 * comp_stencil_bit is set. After the operation, the comp_stencil_bit
+		 * will be cleared so that any further writes to this pixel are disabled.
+		 */
+		glStencilOp(GL_KEEP,GL_KEEP,GL_ZERO);
+		glStencilMask(comp_stencil_bit);
+		glStencilFunc(GL_EQUAL, comp_stencil_bit, comp_stencil_bit);
+			
+		if(xor_mode) {
+			glEnable(GL_COLOR_LOGIC_OP);
+			glLogicOp(GL_EQUIV);
+		}
+
+		/* Draw all primtives through the stencil to the colour buffer. */
+		drawgl_draw_all(comp_stencil_bit);    
+
+		glDisable(GL_COLOR_LOGIC_OP);
+	}
+
+	glDisable(GL_STENCIL_TEST);
+	stencilgl_reset_stencil_usage();
+	comp_stencil_bit = 0;
+}
+
+
+void 
+hidgl_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t * screen)
+{
+	pcb_bool xor_mode = (composite_op == PCB_HID_COMP_POSITIVE_XOR ? pcb_true : pcb_false);
+
+	/* If the previous mode was NEGATIVE then all of the primitives drawn
+	 * in that mode were used only for creating the stencil and will not be 
+	 * drawn directly to the colour buffer. Therefore these primitives can be 
+	 * discarded by rewinding the primitive buffer to the marker that was
+	 * set when entering NEGATIVE mode.
+	 */
+	if(composite_op == PCB_HID_COMP_NEGATIVE)	{
+		drawgl_flush();
+		drawgl_rewind_to_marker();
+	}
+
+	composite_op = op;
+	direct_mode = direct;
+
+	switch(op) {
+		case PCB_HID_COMP_RESET :				mode_reset(direct,screen);						break;
+		case PCB_HID_COMP_POSITIVE_XOR:	
+		case PCB_HID_COMP_POSITIVE : 		mode_positive(direct,screen);					break; 
+  	case PCB_HID_COMP_NEGATIVE :		mode_negative(direct,screen);					break; 
+  	case PCB_HID_COMP_FLUSH :  			mode_flush(direct,xor_mode,screen);		break; 
+		default : break;
+	}
+
+}
+
+
+void hidgl_fill_rect(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	drawgl_add_triangle(x1, y1, x1, y2, x2, y2);
+	drawgl_add_triangle(x2, y1, x2, y2, x1, y1);
+}
+
+	
+static inline void reserve_grid_points(int n)
+{
+	if (n > grid_point_capacity) {
+		grid_point_capacity = n + 10;
+		grid_points = realloc(grid_points, grid_point_capacity * 2 * sizeof(GLfloat));
+	}
+}
+
+void hidgl_draw_local_grid(pcb_coord_t cx,pcb_coord_t cy,int radius)
+{
+	int npoints = 0;
+	pcb_coord_t x,y;
+
+	/* PI is approximated with 3.25 here - allows a minimal overallocation, speeds up calculations */
+	const int r2 = radius * radius;
+	const int n = r2 * 3 + r2 / 4 + 1;
+
+	reserve_grid_points(n);
+
+	for(y = -radius; y <= radius; y++) {
+		int y2 = y*y;
+		for(x = -radius; x <= radius; x++) {
+			if (x*x + y2 < r2) {
+				grid_points[npoints*2] = x*PCB->Grid + cx;
+				grid_points[npoints*2+1] = y*PCB->Grid + cy;
+				npoints++;
+			}
+		}
+	}
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(2, GL_FLOAT, 0, grid_points);
+	glDrawArrays(GL_POINTS, 0, npoints);
+	glDisableClientState(GL_VERTEX_ARRAY);
+
+}
+
+void hidgl_draw_grid(pcb_box_t * drawn_area)
+{
+	pcb_coord_t x1, y1, x2, y2, n, i;
+	double x, y;
+
+	x1 = pcb_grid_fit(MAX(0, drawn_area->X1), PCB->Grid, PCB->GridOffsetX);
+	y1 = pcb_grid_fit(MAX(0, drawn_area->Y1), PCB->Grid, PCB->GridOffsetY);
+	x2 = pcb_grid_fit(MIN(PCB->MaxWidth, drawn_area->X2), PCB->Grid, PCB->GridOffsetX);
+	y2 = pcb_grid_fit(MIN(PCB->MaxHeight, drawn_area->Y2), PCB->Grid, PCB->GridOffsetY);
+
+	if (x1 > x2) {
+		pcb_coord_t tmp = x1;
+		x1 = x2;
+		x2 = tmp;
+	}
+
+	if (y1 > y2) {
+		pcb_coord_t tmp = y1;
+		y1 = y2;
+		y2 = tmp;
+	}
+
+	n = (int) ((x2 - x1) / PCB->Grid + 0.5) + 1;
+	reserve_grid_points(n);
+
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glVertexPointer(2, GL_FLOAT, 0, grid_points);
+
+	n = 0;
+	for (x = x1; x <= x2; x += PCB->Grid, ++n) 
+		grid_points[2 * n + 0] = x;
+
+	for (y = y1; y <= y2; y += PCB->Grid) {
+		for (i = 0; i < n; i++)
+			grid_points[2 * i + 1] = y;
+		glDrawArrays(GL_POINTS, 0, n);
+	}
+
+	glDisableClientState(GL_VERTEX_ARRAY);
+}
+
+#define MAX_PIXELS_ARC_TO_CHORD 0.5
+#define MIN_SLICES 6
+int calc_slices(float pix_radius, float sweep_angle)
+{
+	float slices;
+
+	if (pix_radius <= MAX_PIXELS_ARC_TO_CHORD)
+		return MIN_SLICES;
+
+	slices = sweep_angle / acosf(1 - MAX_PIXELS_ARC_TO_CHORD / pix_radius) / 2.;
+	return (int) ceilf(slices);
+}
+
+#define MIN_TRIANGLES_PER_CAP 3
+#define MAX_TRIANGLES_PER_CAP 90
+static void draw_cap(pcb_coord_t width, pcb_coord_t x, pcb_coord_t y, pcb_angle_t angle, double scale)
+{
+	float last_capx, last_capy;
+	float capx, capy;
+	float radius = width / 2.;
+	int slices = calc_slices(radius / scale, M_PI);
+	int i;
+
+	if (slices < MIN_TRIANGLES_PER_CAP)
+		slices = MIN_TRIANGLES_PER_CAP;
+
+	if (slices > MAX_TRIANGLES_PER_CAP)
+		slices = MAX_TRIANGLES_PER_CAP;
+
+	drawgl_reserve_triangles(slices);
+
+	last_capx = radius * cosf(angle * M_PI / 180.) + x;
+	last_capy = -radius * sinf(angle * M_PI / 180.) + y;
+	for (i = 0; i < slices; i++) {
+		capx = radius * cosf(angle * M_PI / 180. + ((float) (i + 1)) * M_PI / (float) slices) + x;
+		capy = -radius * sinf(angle * M_PI / 180. + ((float) (i + 1)) * M_PI / (float) slices) + y;
+		drawgl_add_triangle(last_capx,last_capy,capx,capy,x,y);
+		last_capx = capx;
+		last_capy = capy;
+	}
+}
+
+#define NEEDS_CAP(width, coord_per_pix) (width > coord_per_pix)
+
+void hidgl_draw_line(int cap, pcb_coord_t width, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, double scale)
+{
+	double angle;
+	float deltax, deltay, length;
+	float wdx, wdy;
+	int circular_caps = 0;
+	pcb_coord_t orig_width = width;
+
+	if ((width == 0) || (!NEEDS_CAP(orig_width, scale)))
+		drawgl_add_line(x1,y1,x2,y2);
+	else {
+		if (width < scale)
+			width = scale;
+
+		deltax = x2 - x1;
+		deltay = y2 - y1;
+
+		length = sqrt(deltax * deltax + deltay * deltay);
+
+		if (length == 0) {
+			/* Assume the orientation of the line is horizontal */
+			angle = 0;
+			wdx = 0;
+			wdy = width / 2.;
+			length = 1.;
+			deltax = 1.;
+			deltay = 0.;
+		}
+		else {
+			wdy = deltax * width / 2. / length;
+			wdx = -deltay * width / 2. / length;
+
+			if (deltay == 0.)
+				angle = (deltax < 0) ? 270. : 90.;
+			else
+				angle = 180. / M_PI * atanl(deltax / deltay);
+
+			if (deltay < 0)
+				angle += 180.;
+		}
+
+		switch (cap) {
+		case pcb_cap_round:
+			circular_caps = 1;
+			break;
+
+		case pcb_cap_square:
+			x1 -= deltax * width / 2. / length;
+			y1 -= deltay * width / 2. / length;
+			x2 += deltax * width / 2. / length;
+			y2 += deltay * width / 2. / length;
+			break;
+
+		default:
+			assert(!"unhandled cap");
+			circular_caps = 1;
+		}
+
+		drawgl_add_triangle(x1 - wdx, y1 - wdy, x2 - wdx, y2 - wdy, x2 + wdx, y2 + wdy);
+		drawgl_add_triangle(x1 - wdx, y1 - wdy, x2 + wdx, y2 + wdy, x1 + wdx, y1 + wdy);
+
+		if (circular_caps)  {
+			draw_cap(width, x1, y1, angle, scale);
+			draw_cap(width, x2, y2, angle + 180., scale);
+		}
+	}
+}
+
+#define MIN_SLICES_PER_ARC 6
+#define MAX_SLICES_PER_ARC 360
+void hidgl_draw_arc(pcb_coord_t width, pcb_coord_t x, pcb_coord_t y, pcb_coord_t rx, pcb_coord_t ry, pcb_angle_t start_angle, pcb_angle_t delta_angle, double scale)
+{
+	float last_inner_x, last_inner_y;
+	float last_outer_x, last_outer_y;
+	float inner_x, inner_y;
+	float outer_x, outer_y;
+	float inner_r;
+	float outer_r;
+	float cos_ang, sin_ang;
+	float start_angle_rad;
+	float delta_angle_rad;
+	float angle_incr_rad;
+	int slices;
+	int i;
+	int hairline = 0;
+	pcb_coord_t orig_width = width;
+
+	/* TODO: Draw hairlines as lines instead of triangles ? */
+
+	if (width == 0.0)
+		hairline = 1;
+
+	if (width < scale)
+		width = scale;
+
+	inner_r = rx - width / 2.;
+	outer_r = rx + width / 2.;
+
+	if (delta_angle < 0) {
+		start_angle += delta_angle;
+		delta_angle = -delta_angle;
+	}
+
+	start_angle_rad = start_angle * M_PI / 180.;
+	delta_angle_rad = delta_angle * M_PI / 180.;
+
+	slices = calc_slices((rx + width / 2.) / scale, delta_angle_rad);
+
+	if (slices < MIN_SLICES_PER_ARC)
+		slices = MIN_SLICES_PER_ARC;
+
+	if (slices > MAX_SLICES_PER_ARC)
+		slices = MAX_SLICES_PER_ARC;
+
+	drawgl_reserve_triangles(2 * slices);
+
+	angle_incr_rad = delta_angle_rad / (float) slices;
+
+	cos_ang = cosf(start_angle_rad);
+	sin_ang = sinf(start_angle_rad);
+	last_inner_x = -inner_r * cos_ang + x;
+	last_inner_y = inner_r * sin_ang + y;
+	last_outer_x = -outer_r * cos_ang + x;
+	last_outer_y = outer_r * sin_ang + y;
+	for (i = 1; i <= slices; i++) {
+		cos_ang = cosf(start_angle_rad + ((float) (i)) * angle_incr_rad);
+		sin_ang = sinf(start_angle_rad + ((float) (i)) * angle_incr_rad);
+		inner_x = -inner_r * cos_ang + x;
+		inner_y = inner_r * sin_ang + y;
+		outer_x = -outer_r * cos_ang + x;
+		outer_y = outer_r * sin_ang + y;
+
+		drawgl_add_triangle( last_inner_x, last_inner_y, last_outer_x, last_outer_y, outer_x, outer_y);
+		drawgl_add_triangle( last_inner_x, last_inner_y, inner_x, inner_y, outer_x, outer_y);
+
+		last_inner_x = inner_x;
+		last_inner_y = inner_y;
+		last_outer_x = outer_x;
+		last_outer_y = outer_y;
+	}
+
+	/* Don't bother capping hairlines */
+	if (hairline)
+		return;
+
+	if (NEEDS_CAP(orig_width, scale)) {
+		draw_cap(width, x + rx * -cosf(start_angle_rad), y + rx * sinf(start_angle_rad), start_angle, scale);
+		draw_cap(width, x + rx * -cosf(start_angle_rad + delta_angle_rad),
+			y + rx * sinf(start_angle_rad + delta_angle_rad), start_angle + delta_angle + 180., scale);
+	}
+}
+
+void hidgl_draw_rect(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	drawgl_add_rectangle(x1, y1, x2, y2);
+}
+
+void hidgl_fill_circle(pcb_coord_t vx, pcb_coord_t vy, pcb_coord_t vr, double scale)
+{
+#define MIN_TRIANGLES_PER_CIRCLE 6
+#define MAX_TRIANGLES_PER_CIRCLE 360
+			
+	float last_x, last_y;
+	float radius = vr;
+	int slices;
+	int i;
+
+	assert((composite_op == PCB_HID_COMP_POSITIVE) || (composite_op == PCB_HID_COMP_POSITIVE_XOR) || (composite_op == PCB_HID_COMP_NEGATIVE));
+
+	slices = calc_slices(vr / scale, 2 * M_PI);
+
+	if (slices < MIN_TRIANGLES_PER_CIRCLE)
+		slices = MIN_TRIANGLES_PER_CIRCLE;
+
+	if (slices > MAX_TRIANGLES_PER_CIRCLE)
+		slices = MAX_TRIANGLES_PER_CIRCLE;
+
+	drawgl_reserve_triangles(slices);
+
+	last_x = vx + vr;
+	last_y = vy;
+
+	for (i = 0; i < slices; i++) {
+		float x, y;
+		x = radius * cosf(((float) (i + 1)) * 2. * M_PI / (float) slices) + vx;
+		y = radius * sinf(((float) (i + 1)) * 2. * M_PI / (float) slices) + vy;
+		drawgl_add_triangle(vx, vy, last_x, last_y, x, y);
+		last_x = x;
+		last_y = y;
+	}
+}
+
+
+#define MAX_COMBINED_MALLOCS 2500
+static void *combined_to_free[MAX_COMBINED_MALLOCS];
+static int combined_num_to_free = 0;
+
+static GLenum tessVertexType;
+static int stashed_vertices;
+static int triangle_comp_idx;
+
+static void myError(GLenum errno)
+{
+	printf("gluTess error: %s\n", gluErrorString(errno));
+}
+
+static void myFreeCombined()
+{
+	while (combined_num_to_free)
+		free(combined_to_free[--combined_num_to_free]);
+}
+
+static void myCombine(GLdouble coords[3], void *vertex_data[4], GLfloat weight[4], void **dataOut)
+{
+#define MAX_COMBINED_VERTICES 2500
+	static GLdouble combined_vertices[3 * MAX_COMBINED_VERTICES];
+	static int num_combined_vertices = 0;
+
+	GLdouble *new_vertex;
+
+	if (num_combined_vertices < MAX_COMBINED_VERTICES) {
+		new_vertex = &combined_vertices[3 * num_combined_vertices];
+		num_combined_vertices++;
+	}
+	else {
+		new_vertex = malloc(3 * sizeof(GLdouble));
+
+		if (combined_num_to_free < MAX_COMBINED_MALLOCS)
+			combined_to_free[combined_num_to_free++] = new_vertex;
+		else
+			printf("myCombine leaking %lu bytes of memory\n", 3 * sizeof(GLdouble));
+	}
+
+	new_vertex[0] = coords[0];
+	new_vertex[1] = coords[1];
+	new_vertex[2] = coords[2];
+
+	*dataOut = new_vertex;
+}
+
+static void myBegin(GLenum type)
+{
+	tessVertexType = type;
+	stashed_vertices = 0;
+	triangle_comp_idx = 0;
+}
+
+static double global_scale;
+
+static void myVertex(GLdouble * vertex_data)
+{
+	static GLfloat triangle_vertices[2 * 3];
+
+	if (tessVertexType == GL_TRIANGLE_STRIP || tessVertexType == GL_TRIANGLE_FAN) {
+		if (stashed_vertices < 2) {
+			triangle_vertices[triangle_comp_idx++] = vertex_data[0];
+			triangle_vertices[triangle_comp_idx++] = vertex_data[1];
+			stashed_vertices++;
+		}
+		else {
+			drawgl_add_triangle(triangle_vertices[0], triangle_vertices[1],
+												 	triangle_vertices[2], triangle_vertices[3], vertex_data[0], vertex_data[1]);
+			if (tessVertexType == GL_TRIANGLE_STRIP) {
+				/* STRIP saves the last two vertices for re-use in the next triangle */
+				triangle_vertices[0] = triangle_vertices[2];
+				triangle_vertices[1] = triangle_vertices[3];
+			}
+			/* Both FAN and STRIP save the last vertex for re-use in the next triangle */
+			triangle_vertices[2] = vertex_data[0];
+			triangle_vertices[3] = vertex_data[1];
+		}
+	}
+	else if (tessVertexType == GL_TRIANGLES) {
+		triangle_vertices[triangle_comp_idx++] = vertex_data[0];
+		triangle_vertices[triangle_comp_idx++] = vertex_data[1];
+		stashed_vertices++;
+		if (stashed_vertices == 3) {
+			drawgl_add_triangle(triangle_vertices[0], triangle_vertices[1],
+												 	triangle_vertices[2], triangle_vertices[3], triangle_vertices[4], triangle_vertices[5]);
+			triangle_comp_idx = 0;
+			stashed_vertices = 0;
+		}
+	}
+	else
+		printf("Vertex received with unknown type\n");
+}
+
+/* Intentaional code duplication for performance */
+void hidgl_fill_polygon(int n_coords, pcb_coord_t * x, pcb_coord_t * y)
+{
+	int i;
+	GLUtesselator *tobj;
+	GLdouble *vertices;
+
+	assert(n_coords > 0);
+
+	vertices = malloc(sizeof(GLdouble) * n_coords * 3);
+
+	tobj = gluNewTess();
+	gluTessCallback(tobj, GLU_TESS_BEGIN, (_GLUfuncptr) myBegin);
+	gluTessCallback(tobj, GLU_TESS_VERTEX, (_GLUfuncptr) myVertex);
+	gluTessCallback(tobj, GLU_TESS_COMBINE, (_GLUfuncptr) myCombine);
+	gluTessCallback(tobj, GLU_TESS_ERROR, (_GLUfuncptr) myError);
+
+	gluTessBeginPolygon(tobj, NULL);
+	gluTessBeginContour(tobj);
+
+	for (i = 0; i < n_coords; i++) {
+		vertices[0 + i * 3] = x[i];
+		vertices[1 + i * 3] = y[i];
+		vertices[2 + i * 3] = 0.;
+		gluTessVertex(tobj, &vertices[i * 3], &vertices[i * 3]);
+	}
+
+	gluTessEndContour(tobj);
+	gluTessEndPolygon(tobj);
+	gluDeleteTess(tobj);
+
+	myFreeCombined();
+	free(vertices);
+}
+
+/* Intentaional code duplication for performance */
+void hidgl_fill_polygon_offs(int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	GLUtesselator *tobj;
+	GLdouble *vertices;
+
+	assert(n_coords > 0);
+
+	vertices = malloc(sizeof(GLdouble) * n_coords * 3);
+
+	tobj = gluNewTess();
+	gluTessCallback(tobj, GLU_TESS_BEGIN, (_GLUfuncptr) myBegin);
+	gluTessCallback(tobj, GLU_TESS_VERTEX, (_GLUfuncptr) myVertex);
+	gluTessCallback(tobj, GLU_TESS_COMBINE, (_GLUfuncptr) myCombine);
+	gluTessCallback(tobj, GLU_TESS_ERROR, (_GLUfuncptr) myError);
+
+	gluTessBeginPolygon(tobj, NULL);
+	gluTessBeginContour(tobj);
+
+	for (i = 0; i < n_coords; i++) {
+		vertices[0 + i * 3] = x[i] + dx;
+		vertices[1 + i * 3] = y[i] + dy;
+		vertices[2 + i * 3] = 0.;
+		gluTessVertex(tobj, &vertices[i * 3], &vertices[i * 3]);
+	}
+
+	gluTessEndContour(tobj);
+	gluTessEndPolygon(tobj);
+	gluDeleteTess(tobj);
+
+	myFreeCombined();
+	free(vertices);
+}
+
+void tesselate_contour(GLUtesselator * tobj, pcb_pline_t * contour, GLdouble * vertices, double scale)
+{
+	pcb_vnode_t *vn = &contour->head;
+	int offset = 0;
+	pcb_coord_t lastx = PCB_MAX_COORD, lasty = PCB_MAX_COORD, mindist = scale*2;
+
+	/* If the contour is round, and hidgl_fill_circle would use
+	 * less slices than we have vertices to draw it, then call
+	 * hidgl_fill_circle to draw this contour.
+	 */
+	if (contour->is_round) {
+		double slices = calc_slices(contour->radius / scale, 2 * M_PI);
+		if (slices < contour->Count) {
+			hidgl_fill_circle(contour->cx, contour->cy, contour->radius, scale);
+			return;
+		}
+	}
+
+	gluTessBeginPolygon(tobj, NULL);
+	gluTessBeginContour(tobj);
+	do {
+		if ((offset > 3) && (PCB_ABS(vn->point[0] - lastx) < mindist) && (PCB_ABS(vn->point[1] - lasty) < mindist))
+			continue;
+		vertices[0 + offset] = vn->point[0];
+		vertices[1 + offset] = vn->point[1];
+		vertices[2 + offset] = 0.;
+		lastx = vn->point[0];
+		lasty = vn->point[1];
+		gluTessVertex(tobj, &vertices[offset], &vertices[offset]);
+		offset += 3;
+	} while ((vn = vn->next) != &contour->head);
+	gluTessEndContour(tobj);
+	gluTessEndPolygon(tobj);
+}
+
+struct do_hole_info {
+	GLUtesselator *tobj;
+	GLdouble *vertices;
+	double scale;
+};
+
+static pcb_r_dir_t do_hole(const pcb_box_t * b, void *cl)
+{
+	struct do_hole_info *info = cl;
+	pcb_pline_t *curc = (pcb_pline_t *) b;
+
+	/* Ignore the outer contour - we draw it first explicitly */
+	if (curc->Flags.orient == PCB_PLF_DIR) {
+		return PCB_R_DIR_NOT_FOUND;
+	}
+
+	tesselate_contour(info->tobj, curc, info->vertices, info->scale);
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+
+void hidgl_fill_pcb_polygon(pcb_poly_t * poly, const pcb_box_t * clip_box, double scale)
+{
+	int vertex_count = 0;
+	pcb_pline_t *contour;
+	struct do_hole_info info;
+	pcb_polyarea_t * p_area;
+	const int fullpoly = PCB_FLAG_TEST(PCB_FLAG_FULLPOLY, poly);
+
+	info.scale = scale;
+	global_scale = scale;
+
+	if (poly->Clipped == NULL) {
+		fprintf(stderr, "hidgl_fill_pcb_polygon: poly->Clipped == NULL\n");
+		return;
+	}
+
+	drawgl_flush();
+
+	/* Walk the polygon structure, counting vertices */
+	/* This gives an upper bound on the amount of storage required */
+	p_area = poly->Clipped;
+	do {
+		for (contour = p_area->contours; contour != NULL; contour = contour->next)
+			vertex_count = MAX(vertex_count, contour->Count);
+		p_area = p_area->f;
+	} while (fullpoly && (p_area != poly->Clipped));
+
+	/* Allocate a vertex buffer */
+	info.vertices = malloc(sizeof(GLdouble) * vertex_count * 3);
+
+	/* Setup the tesselator */
+	info.tobj = gluNewTess();
+	gluTessCallback(info.tobj, GLU_TESS_BEGIN, (_GLUfuncptr) myBegin);
+	gluTessCallback(info.tobj, GLU_TESS_VERTEX, (_GLUfuncptr) myVertex);
+	gluTessCallback(info.tobj, GLU_TESS_COMBINE, (_GLUfuncptr) myCombine);
+	gluTessCallback(info.tobj, GLU_TESS_ERROR, (_GLUfuncptr) myError);
+
+	/* Walk the polygon structure. Each iteration draws an island. For each island, all 
+	 * of the island's cutouts are drawn to the stencil buffer as a '1'. Then the island
+	 * is drawn and areas where the stencil is set to a '1' are masked and not drawn.
+	 */
+	p_area = poly->Clipped;
+	do {
+
+		/* Create a MASK (stencil). All following drawing will affect the mask only */			
+		drawgl_add_mask_create();
+
+		/* Find and draw the cutouts */
+		pcb_r_search(p_area->contour_tree, clip_box, NULL, do_hole, &info, NULL);
+		drawgl_flush();
+
+		/* Use the mask while updating the colour buffer. All following drawing will update the 
+		 * colour buffer wherever the mask is not set
+		 */
+		drawgl_add_mask_use();
+
+		/* Draw the island to the colour buffer */
+		tesselate_contour(info.tobj, p_area->contours, info.vertices, scale);
+
+		/* destroy the current MASK */
+		drawgl_add_mask_destroy();
+		drawgl_flush();
+
+		p_area = p_area->f;
+	} while (fullpoly && (p_area != poly->Clipped));
+
+	gluDeleteTess(info.tobj);
+	myFreeCombined();
+	free(info.vertices);
+}
+
Index: tags/2.0.1/src_plugins/lib_hid_gl/hidgl.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/hidgl.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/hidgl.h	(revision 18980)
@@ -0,0 +1,48 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2011 PCB Contributors (See ChangeLog for details).
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_HID_COMMON_HIDGL_H
+#define PCB_HID_COMMON_HIDGL_H
+
+/*extern float global_depth;*/
+void hidgl_draw_local_grid(pcb_coord_t cx,pcb_coord_t cy,int radius);
+void hidgl_draw_grid(pcb_box_t * drawn_area);
+void hidgl_set_depth(float depth);
+void hidgl_draw_line(int cap, pcb_coord_t width, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2, double scale);
+void hidgl_draw_arc(pcb_coord_t width, pcb_coord_t vx, pcb_coord_t vy, pcb_coord_t vrx, pcb_coord_t vry, pcb_angle_t start_angle, pcb_angle_t delta_angle, double scale);
+void hidgl_draw_rect(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+void hidgl_fill_circle(pcb_coord_t vx, pcb_coord_t vy, pcb_coord_t vr, double scale);
+void hidgl_fill_polygon(int n_coords, pcb_coord_t * x, pcb_coord_t * y);
+void hidgl_fill_polygon_offs(int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy);
+void hidgl_fill_pcb_polygon(pcb_poly_t * poly, const pcb_box_t * clip_box, double scale);
+void hidgl_fill_rect(pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
+void hidgl_init(void);
+void hidgl_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t * screen);
+
+
+#endif /* PCB_HID_COMMON_HIDGL_H  */
+
Index: tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.c	(revision 18980)
@@ -0,0 +1,42 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "plugins.h"
+
+int pplg_check_ver_lib_hid_gl(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_hid_gl(void)
+{
+}
+
+int pplg_init_lib_hid_gl(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/lib_hid_gl.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short openGL rendering
+$long generic openGL renderer shared among GUI HIDs
+$state works
+$package lib-gl
+default disable-all
Index: tags/2.0.1/src_plugins/lib_hid_gl/opengl.h.in
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/opengl.h.in	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/opengl.h.in	(revision 18980)
@@ -0,0 +1,54 @@
+print [@/*
+ *                            COPYRIGHT
+ *
+ *  PCB, interactive printed circuit board design
+ *  Copyright (C) 2009-2011 PCB Contributers (See ChangeLog for details)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef HID_GTK2_GL_OPENGL_H
+#define HID_GTK2_GL_OPENGL_H
+@]
+
+if ?/local/pcb/has_glu
+then
+
+print [@
+/* The Linux OpenGL ABI 1.0 spec requires that we define
+ * GL_GLEXT_PROTOTYPES before including gl.h or glx.h for extensions
+ * in order to get prototypes:
+ *   http://www.opengl.org/registry/ABI/
+ */
+#define GL_GLEXT_PROTOTYPES 1
+#include <@libs/gui/gl/include_prefix@/gl.h>
+#include <@libs/gui/gl/include_prefix@/glu.h>
+@]
+
+else
+
+print [@
+/* if not calculating dependencies, including this header is an error when
+   opengl is not configured */
+#ifndef _PCB_DEP_
+#	error opengl is not configured.
+#endif
+@]
+
+end
+
+print [@
+#endif /* ! defined HID_GTK2_GL_OPENGL_H */
+@]
Index: tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.c
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.c	(revision 18980)
@@ -0,0 +1,116 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2011 PCB Contributers (See ChangeLog for details)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "stencil_gl.h"
+
+static GLint stencil_bits = 0;
+static int dirty_bits = 0;
+static int assigned_bits = 0;
+
+
+int stencilgl_bit_count()
+{
+	return stencil_bits;
+}
+
+void stencilgl_clear_stencil_bits(int bits)
+{
+	glPushAttrib(GL_STENCIL_BUFFER_BIT);
+	glStencilMask(bits);
+	glClearStencil(0);
+	glClear(GL_STENCIL_BUFFER_BIT);
+	glPopAttrib();
+
+	dirty_bits = (dirty_bits & ~bits) | assigned_bits;
+}
+
+void stencilgl_clear_unassigned_stencil()
+{
+	stencilgl_clear_stencil_bits(~assigned_bits);
+}
+
+int stencilgl_allocate_clear_stencil_bit(void)
+{
+	int stencil_bitmask = (1 << stencil_bits) - 1;
+	int test;
+	int first_dirty = 0;
+
+	if (assigned_bits == stencil_bitmask) {
+		printf("No more stencil bits available, total of %i already assigned\n", stencil_bits);
+		return 0;
+	}
+
+	/* Look for a bitplane we don't have to clear */
+	for (test = 1; test & stencil_bitmask; test <<= 1) {
+		if (!(test & dirty_bits)) {
+			assigned_bits |= test;
+			dirty_bits |= test;
+			return test;
+		}
+		else if (!first_dirty && !(test & assigned_bits)) {
+			first_dirty = test;
+		}
+	}
+
+	/* Didn't find any non dirty planes. Clear those dirty ones which aren't in use */
+	stencilgl_clear_unassigned_stencil();
+	assigned_bits |= first_dirty;
+	dirty_bits = assigned_bits;
+
+	return first_dirty;
+}
+
+void stencilgl_return_stencil_bit(int bit)
+{
+	assigned_bits &= ~bit;
+}
+
+void stencilgl_reset_stencil_usage()
+{
+	assigned_bits = 0;
+}
+
+void
+stencilgl_init()
+{
+	glGetIntegerv(GL_STENCIL_BITS, &stencil_bits);
+
+	if (stencil_bits == 0) {
+		printf("No stencil bits available.\n" "Cannot mask polygon holes or subcomposite layers\n");
+		/* TODO: Flag this to the HID so it can revert to the dicer? */
+	}
+	else if (stencil_bits == 1) {
+		printf("Only one stencil bitplane avilable\n" "Cannot use stencil buffer to sub-composite layers.\n");
+		/* Do we need to disable that somewhere? */
+	}
+
+	stencilgl_reset_stencil_usage();
+	stencilgl_clear_unassigned_stencil();
+}
Index: tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.h
===================================================================
--- tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_hid_gl/stencil_gl.h	(revision 18980)
@@ -0,0 +1,73 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2009-2017 PCB Contributers (See ChangeLog for details)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef STENCIL_GL_H
+#define STENCIL_GL_H
+/*
+#include "config.h"
+#include "conf_core.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+*/
+
+#include "opengl.h"
+
+void		stencilgl_init();
+int 		stencilgl_bit_count();
+void 		stencilgl_clear_stencil_bits(int bits);
+void 		stencilgl_clear_unassigned_stencil();
+int 		stencilgl_allocate_clear_stencil_bit();
+void 		stencilgl_return_stencil_bit(int bit);
+void 		stencilgl_reset_stencil_usage();
+
+/* stencilgl_mode_write_set
+ * Setup the stencil buffer so that writes will set stencil bits
+ */
+static inline void
+stencilgl_mode_write_set(int bits)
+{
+	glStencilOp(GL_KEEP,GL_KEEP,GL_REPLACE);
+	glStencilMask(bits);
+	glStencilFunc(GL_ALWAYS, bits, bits);
+}
+
+/* stencilgl_mode_write_clear
+ * Setup the stencil buffer so that writes will clear stencil bits
+ */
+static inline void
+stencilgl_mode_write_clear(int bits)
+{
+	glStencilOp(GL_KEEP,GL_KEEP,GL_ZERO);
+	glStencilMask(bits);
+	glStencilFunc(GL_ALWAYS, bits, bits);
+}
+
+#endif /* !defined STENCIL_GL_H */
+
Index: tags/2.0.1/src_plugins/lib_legacy_func/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_legacy_func/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_legacy_func/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_legacy_func
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/lib_legacy_func/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_legacy_func/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_legacy_func/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {lib_legacy_func}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/lib_legacy_func/lib_legacy_func.o @]
+
+switch /local/pcb/lib_legacy_func/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.c
===================================================================
--- tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.c	(revision 18980)
@@ -0,0 +1,149 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+#include <genvector/gds_char.h>
+#include <stdio.h>
+#include "config.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "safe_fs.h"
+
+char *ExpandFilename(char *Dirname, char *Filename)
+{
+	gds_t answer;
+	char *command;
+	FILE *pipe;
+	int c;
+
+	/* allocate memory for commandline and build it */
+	gds_init(&answer);
+	if (Dirname) {
+		command = (char *) calloc(strlen(Filename) + strlen(Dirname) + 7, sizeof(char));
+		sprintf(command, "echo %s/%s", Dirname, Filename);
+	}
+	else {
+		command = (char *) calloc(strlen(Filename) + 6, sizeof(char));
+		sprintf(command, "echo %s", Filename);
+	}
+
+	/* execute it with shell */
+	if ((pipe = pcb_popen(command, "r")) != NULL) {
+		/* discard all but the first returned line */
+		for (;;) {
+			if ((c = fgetc(pipe)) == EOF || c == '\n' || c == '\r')
+				break;
+			else
+				gds_append(&answer, c);
+		}
+
+		free(command);
+		if (pcb_pclose(pipe)) {
+			gds_uninit(&answer);
+			return NULL;
+		}
+		else
+			return answer.array;
+	}
+
+	/* couldn't be expanded by the shell */
+	pcb_popen_error_message(command);
+	free(command);
+	gds_uninit(&answer);
+	return NULL;
+}
+
+void CreateQuotedString(gds_t *DS, char *S)
+{
+	gds_truncate(DS, 0);
+	gds_append(DS, '"');
+	while (*S) {
+		if (*S == '"' || *S == '\\')
+			gds_append(DS, '\\');
+		gds_append(DS, *S++);
+	}
+	gds_append(DS, '"');
+}
+
+/* ---------------------------------------------------------------------------
+ * Convenience for plugins using the old {Hide,Restore}pcb_crosshair API.
+ * This links up to notify the GUI of the expected changes using the new APIs.
+ *
+ * Use of this old API is deprecated, as the names don't necessarily reflect
+ * what all GUIs may do in response to the notifications. Keeping these APIs
+ * is aimed at easing transition to the newer API, they will emit a harmless
+ * warning at the time of their first use.
+ *
+ */
+void pcb_crosshair_hide(void)
+{
+	static pcb_bool warned_old_api = pcb_false;
+	if (!warned_old_api) {
+		pcb_message(PCB_MSG_WARNING, "WARNING: A plugin is using the deprecated API pcb_crosshair_hide().\n"
+							"         This API may be removed in a future release of PCB.\n");
+		warned_old_api = pcb_true;
+	}
+
+	pcb_notify_crosshair_change(pcb_false);
+	pcb_notify_mark_change(pcb_false);
+}
+
+void pcb_crosshair_restore(void)
+{
+	static pcb_bool warned_old_api = pcb_false;
+	if (!warned_old_api) {
+		pcb_message(PCB_MSG_WARNING, "WARNING: A plugin is using the deprecated API pcb_crosshair_restore().\n"
+							"         This API may be removed in a future release of PCB.\n");
+		warned_old_api = pcb_true;
+	}
+
+	pcb_notify_crosshair_change(pcb_true);
+	pcb_notify_mark_change(pcb_true);
+}
+
+
+int pplg_check_ver_lib_legacy_func(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_legacy_func(void)
+{
+}
+
+int pplg_init_lib_legacy_func(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.h
===================================================================
--- tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.h	(revision 18980)
@@ -0,0 +1,47 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+
+/* concatenates directory and filename if directory != NULL,
+ * expands them with a shell and returns the found name(s) or NULL
+ */
+char *ExpandFilename(char *dirname, char *filename);
+
+/*
+ * writes a string to the passed file pointer
+ * some special characters are quoted
+ */
+void CreateQuotedString(gds_t *, char *);
+
+void pcb_crosshair_hide(void);
+void pcb_crosshair_restore(void);
Index: tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_legacy_func/lib_legacy_func.pup	(revision 18980)
@@ -0,0 +1,5 @@
+$class lib
+$short legacy functions
+$long Random collection of old/obsolete (legacy) functions. 3rd party plugins may depend on them. This module implements C functions and variables and does not register actions or flags.
+$state works
+default buildin
Index: tags/2.0.1/src_plugins/lib_netmap/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_netmap/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_netmap/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_netmap
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/lib_netmap/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_netmap/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_netmap/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {lib_netmap}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/lib_netmap/netmap.o
+@]
+
+switch /local/pcb/lib_netmap/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_netmap/lib_netmap.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_netmap/lib_netmap.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_netmap/lib_netmap.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short map nets and objects
+$long create disposable cross-reference maps between all objects and all nets
+$state works
+$package lib-io
+default disable-all
Index: tags/2.0.1/src_plugins/lib_netmap/netmap.c
===================================================================
--- tags/2.0.1/src_plugins/lib_netmap/netmap.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_netmap/netmap.c	(revision 18980)
@@ -0,0 +1,182 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <genht/htpp.h>
+
+#include "netmap.h"
+#include "data.h"
+#include "find.h"
+#include "netlist.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+
+static pcb_lib_menu_t *alloc_net(pcb_netmap_t *map)
+{
+	dyn_net_t *dn = calloc(sizeof(dyn_net_t), 1);
+	dn->next = map->dyn_nets;
+	map->dyn_nets = dn;
+	dn->net.Name = pcb_strdup_printf("  netmap_anon_%d", map->anon_cnt++);
+	return &dn->net;
+}
+
+static pcb_cardinal_t found(void *ctx, pcb_any_obj_t *obj)
+{
+	pcb_netmap_t *map = ctx;
+	dyn_obj_t *d, *dl;
+
+	if (map->curr_net == NULL)
+		map->curr_net = alloc_net(map);
+
+	htpp_set(&map->o2n, obj, map->curr_net);
+
+	dl = htpp_get(&map->n2o, map->curr_net);
+	d = malloc(sizeof(dyn_obj_t));
+	d->obj = obj;
+	d->next = dl;
+	htpp_set(&map->n2o, map->curr_net, d);
+
+	return 1;
+}
+
+static void list_obj(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_any_obj_t *obj)
+{
+	pcb_netmap_t *map = ctx;
+	map->curr_net = NULL;
+
+	if (htpp_get(&map->o2n, obj) != NULL)
+		return;
+
+	if ((layer != NULL) && (pcb_layer_flags_(layer) & PCB_LYT_COPPER) == 0)
+		return;
+
+	pcb_lookup_conn_by_obj(map, obj, 0, found);
+}
+
+static void list_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	list_obj(ctx, pcb, layer, (pcb_any_obj_t *)line);
+}
+
+static void list_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	list_obj(ctx, pcb, layer, (pcb_any_obj_t *)arc);
+}
+
+static void list_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	list_obj(ctx, pcb, layer, (pcb_any_obj_t *)poly);
+}
+
+static void list_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
+{
+	list_obj(ctx, pcb, NULL, (pcb_any_obj_t *)ps);
+}
+
+int list_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
+{
+	PCB_PADSTACK_LOOP(subc->data) {
+		list_pstk_cb(ctx, pcb, padstack);
+	} PCB_END_LOOP;
+#warning subc TODO: heavy terminals - test on io_hyp
+	return 0;
+}
+
+int pcb_netmap_init(pcb_netmap_t *map, pcb_board_t *pcb)
+{
+	htpp_init(&map->o2n, ptrhash, ptrkeyeq);
+	htpp_init(&map->n2o, ptrhash, ptrkeyeq);
+	map->anon_cnt = 0;
+	map->curr_net = NULL;
+	map->dyn_nets = 0;
+	map->pcb = pcb;
+
+/* step 1: find known nets (from terminals) */
+	pcb_loop_all(PCB, map,
+		NULL, /* layer */
+		NULL, /* line */
+		NULL, /* arc */
+		NULL, /* text */
+		NULL, /* poly */
+		list_subc_cb, /* subc */
+		NULL /* pstk */
+	);
+
+	/* step 2: find unknown nets and uniquely name them */
+	pcb_loop_all(PCB, map,
+		NULL, /* layer */
+		list_line_cb,
+		list_arc_cb,
+		NULL, /* text */
+		list_poly_cb,
+		NULL, /* subc */
+		list_pstk_cb
+	);
+	return 0;
+}
+
+int pcb_netmap_uninit(pcb_netmap_t *map)
+{
+
+	{
+		htpp_entry_t *e;
+		for(e = htpp_first(&map->n2o); e != NULL; e = htpp_next(&map->n2o, e)) {
+			dyn_obj_t *o, *next;
+			for(o = e->value; o != NULL; o = next) {
+				next = o->next;
+				free(o);
+			}
+		}
+	}
+
+	{
+		dyn_net_t *dn, *next;
+		for(dn = map->dyn_nets; dn != NULL; dn = next) {
+			next = dn->next;
+			free(dn->net.Name);
+			free(dn);
+		}
+	}
+
+	htpp_uninit(&map->o2n);
+	htpp_uninit(&map->n2o);
+	return 0;
+}
+
+
+int pplg_check_ver_lib_netmap(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_netmap(void)
+{
+}
+
+int pplg_init_lib_netmap(void)
+{
+	PCB_API_CHK_VER;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_netmap/netmap.h
===================================================================
--- tags/2.0.1/src_plugins/lib_netmap/netmap.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_netmap/netmap.h	(revision 18980)
@@ -0,0 +1,55 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <genht/htpp.h>
+#include "board.h"
+#include "library.h"
+
+typedef struct dyn_net_s dyn_net_t;
+typedef struct dyn_obj_s dyn_obj_t;
+
+struct dyn_net_s {
+	pcb_lib_menu_t net;
+	dyn_net_t *next;
+};
+
+struct dyn_obj_s {
+	pcb_any_obj_t *obj;
+	dyn_obj_t *next;
+};
+
+typedef struct pcb_netmap_s {
+	htpp_t o2n;   /* of (pcb_lib_menu_t *); tells the net for an object */
+	htpp_t n2o;   /* of (dyn_obj_t *); tells the object list for a net */
+	pcb_cardinal_t anon_cnt;
+	pcb_board_t *pcb;
+	pcb_lib_menu_t *curr_net;
+	dyn_net_t *dyn_nets;
+} pcb_netmap_t;
+
+int pcb_netmap_init(pcb_netmap_t *map, pcb_board_t *pcb);
+int pcb_netmap_uninit(pcb_netmap_t *map);
+
Index: tags/2.0.1/src_plugins/lib_polyhelp/Makefile
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_lib_polyhelp
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/lib_polyhelp/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {lib_polyhelp}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/lib_polyhelp/polyhelp.o
+	$(PLUGDIR)/lib_polyhelp/topoly.o
+@]
+
+switch /local/pcb/lib_polyhelp/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/lib_polyhelp/lib_polyhelp.pup
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/lib_polyhelp.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/lib_polyhelp.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class lib
+$short polygon helpers
+$long functions to help plugins processing polygons and PolyHatch() action
+$state works
+$package (core)
+default buildin
Index: tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.c
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.c	(revision 18980)
@@ -0,0 +1,520 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <math.h>
+
+#include "polyhelp.h"
+#include "polygon.h"
+#include "plugins.h"
+#include "pcb-printf.h"
+#include "obj_line.h"
+#include "box.h"
+#include "polygon_offs.h"
+
+#include "topoly.h"
+
+/* for the action: */
+static const char *polyhelp_cookie = "lib_polyhelp";
+#include <string.h>
+#include "board.h"
+#include "data.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "hid_attrib.h"
+#include "actions.h"
+
+void pcb_pline_fprint_anim(FILE *f, const pcb_pline_t *pl)
+{
+	const pcb_vnode_t *v, *n;
+	fprintf(f, "!pline start\n");
+	v = &pl->head;
+	do {
+		n = v->next;
+		pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", v->point[0], v->point[1], n->point[0], n->point[1]);
+	}
+	while((v = v->next) != &pl->head);
+	fprintf(f, "!pline end\n");
+}
+
+#if 0
+/* debug helper */
+static void cross(FILE *f, pcb_coord_t x, pcb_coord_t y)
+{
+	static pcb_coord_t cs = PCB_MM_TO_COORD(0.2);
+	pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x - cs, y, x + cs, y);
+	pcb_fprintf(f, "line %#mm %#mm %#mm %#mm\n", x, y - cs, x, y + cs);
+}
+#endif
+
+pcb_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const pcb_pline_t *src, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags)
+{
+	const pcb_vnode_t *v, *n;
+	pcb_pline_t *track = pcb_pline_dup_offset(src, -((thickness/2)+1));
+	pcb_cardinal_t cnt = 0;
+
+	v = &track->head;
+	do {
+		n = v->next;
+		pcb_line_new(dst, v->point[0], v->point[1], n->point[0], n->point[1], thickness, clearance, flags);
+		cnt++;
+	}
+	while((v = v->next) != &track->head);
+	pcb_poly_contour_del(&track);
+	return cnt;
+}
+
+pcb_bool pcb_pline_is_aligned(const pcb_pline_t *src)
+{
+	const pcb_vnode_t *v, *n;
+
+	v = &src->head;
+	do {
+		n = v->next;
+		if ((v->point[0] != n->point[0]) && (v->point[1] != n->point[1]))
+			return pcb_false;
+	}
+	while((v = v->next) != &src->head);
+	return pcb_true;
+}
+
+
+pcb_bool pcb_cpoly_is_simple_rect(const pcb_poly_t *p)
+{
+	if (p->Clipped->f != p->Clipped)
+		return pcb_false; /* more than one islands */
+	if (p->Clipped->contours->next != NULL)
+		return pcb_false; /* has holes */
+	return pcb_pline_is_rectangle(p->Clipped->contours);
+}
+
+pcb_cardinal_t pcb_cpoly_num_corners(const pcb_poly_t *src)
+{
+	pcb_cardinal_t res = 0;
+	pcb_poly_it_t it;
+	pcb_polyarea_t *pa;
+
+
+	for(pa = pcb_poly_island_first(src, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+		pcb_pline_t *pl;
+
+		pl = pcb_poly_contour(&it);
+		if (pl != NULL) { /* we have a contour */
+			res += pl->Count;
+			for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it))
+				res += pl->Count;
+		}
+	}
+
+	return res;
+}
+
+static void add_track_seg(pcb_cpoly_edgetree_t *dst, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_cpoly_edge_t *e = &dst->edges[dst->used++];
+	pcb_box_t *b = &e->bbox;
+
+	if (x1 <= x2) {
+		b->X1 = x1;
+		b->X2 = x2;
+	}
+	else {
+		b->X1 = x2;
+		b->X2 = x1;
+	}
+	if (y1 <= y2) {
+		b->Y1 = y1;
+		b->Y2 = y2;
+	}
+	else {
+		b->Y1 = y2;
+		b->Y2 = y1;
+	}
+
+	e->x1 = x1;
+	e->y1 = y1;
+	e->x2 = x2;
+	e->y2 = y2;
+
+	pcb_box_bump_box(&dst->bbox, b);
+	pcb_r_insert_entry(dst->edge_tree, (pcb_box_t *)e);
+}
+
+static void add_track(pcb_cpoly_edgetree_t *dst, pcb_pline_t *track)
+{
+	int go, first = 1;
+	pcb_coord_t x, y, px, py;
+	pcb_poly_it_t it;
+
+	it.cntr = track;
+	for(go = pcb_poly_vect_first(&it, &x, &y); go; go = pcb_poly_vect_next(&it, &x, &y)) {
+		if (!first)
+			add_track_seg(dst, px, py, x, y);
+		first = 0;
+		px = x;
+		py = y;
+	}
+
+	pcb_poly_vect_first(&it, &x, &y);
+	add_track_seg(dst, px, py, x, y);
+}
+
+
+/* collect all edge lines (contour and holes) in an rtree, calculate the bbox */
+pcb_cpoly_edgetree_t *pcb_cpoly_edgetree_create(const pcb_poly_t *src, pcb_coord_t offs)
+{
+	pcb_poly_it_t it;
+	pcb_polyarea_t *pa;
+	pcb_cpoly_edgetree_t *res;
+	pcb_cardinal_t alloced = pcb_cpoly_num_corners(src) * sizeof(pcb_cpoly_edge_t);
+
+	res = malloc(sizeof(pcb_cpoly_edgetree_t) + alloced);
+
+	res->alloced = alloced;
+	res->used = 0;
+	res->edge_tree = pcb_r_create_tree();
+	res->bbox.X1 = res->bbox.Y1 = PCB_MAX_COORD;
+	res->bbox.X2 = res->bbox.Y2 = -PCB_MAX_COORD;
+
+	for(pa = pcb_poly_island_first(src, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+		pcb_pline_t *pl, *track;
+
+		pl = pcb_poly_contour(&it);
+		if (pl != NULL) { /* we have a contour */
+			track = pcb_pline_dup_offset(pl, -offs);
+			add_track(res, track);
+			pcb_poly_contour_del(&track);
+
+			for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it)) {
+				track = pcb_pline_dup_offset(pl, -offs);
+				add_track(res, track);
+				pcb_poly_contour_del(&track);
+			}
+		}
+	}
+
+	return res;
+}
+
+void pcb_cpoly_edgetree_destroy(pcb_cpoly_edgetree_t *etr)
+{
+	pcb_r_destroy_tree(&etr->edge_tree);
+	free(etr);
+}
+
+typedef struct {
+	int used;
+	pcb_coord_t at;
+	pcb_coord_t coord[1];
+} intersect_t;
+
+static pcb_r_dir_t pcb_cploy_hatch_edge_hor(const pcb_box_t *region, void *cl)
+{
+	intersect_t *is = (intersect_t *)cl;
+	pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region;
+
+	if (e->y1 != e->y2) {
+		/* consider only non-horizontal edges */
+		if (e->x1 != e->x2) {
+			double y = ((double)e->x2 - (double)e->x1) / ((double)e->y2 - (double)e->y1) * ((double)is->at - (double)e->y1) + (double)e->x1;
+			is->coord[is->used] = y;
+		}
+		else
+			is->coord[is->used] = e->x1; /* faster method for vertical */
+		is->used++;
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t pcb_cploy_hatch_edge_ver(const pcb_box_t *region, void *cl)
+{
+	intersect_t *is = (intersect_t *)cl;
+	pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region;
+
+	if (e->x1 != e->x2) {
+		/* consider only non-vertical edges */
+		if (e->y1 != e->y2) {
+			double x = ((double)e->y2 - (double)e->y1) / ((double)e->x2 - (double)e->x1) * ((double)is->at - (double)e->x1) + (double)e->y1;
+			is->coord[is->used] = x;
+		}
+		else
+			is->coord[is->used] = e->y1; /* faster method for vertical */
+		is->used++;
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static int coord_cmp(const void *p1, const void *p2)
+{
+	const pcb_coord_t *c1 = p1, *c2 = p2;
+	if (*c1 < *c2)
+		return -1;
+	return 1;
+}
+
+
+void pcb_cpoly_hatch(const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, pcb_coord_t offs, pcb_coord_t period, void *ctx, void (*cb)(void *ctx, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2))
+{
+	pcb_cpoly_edgetree_t *etr;
+	pcb_box_t scan;
+	int n;
+	intersect_t *is;
+
+	if (dir == 0)
+		return;
+
+	etr = pcb_cpoly_edgetree_create(src, offs);
+
+	is = malloc(sizeof(intersect_t) + sizeof(pcb_coord_t) * etr->alloced);
+
+	if (dir & PCB_CPOLY_HATCH_HORIZONTAL) {
+		pcb_coord_t y;
+
+		for(y = etr->bbox.Y1; y <= etr->bbox.Y2; y += period) {
+			scan.X1 = -PCB_MAX_COORD;
+			scan.X2 = PCB_MAX_COORD;
+			scan.Y1 = y;
+			scan.Y2 = y+1;
+
+			is->used = 0;
+			is->at = y;
+			pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_hor, is, NULL);
+			qsort(is->coord, is->used, sizeof(pcb_coord_t), coord_cmp);
+			for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */
+				cb(ctx, is->coord[n-1], y, is->coord[n], y);
+		}
+	}
+
+	if (dir & PCB_CPOLY_HATCH_VERTICAL) {
+		pcb_coord_t x;
+
+		for(x = etr->bbox.X1; x <= etr->bbox.X2; x += period) {
+			scan.Y1 = -PCB_MAX_COORD;
+			scan.Y2 = PCB_MAX_COORD;
+			scan.X1 = x;
+			scan.X2 = x+1;
+
+			is->used = 0;
+			is->at = x;
+			pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_ver, is, NULL);
+			qsort(is->coord, is->used, sizeof(pcb_coord_t), coord_cmp);
+			for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */
+				cb(ctx, x, is->coord[n-1], x, is->coord[n]);
+		}
+	}
+
+	free(is);
+	pcb_cpoly_edgetree_destroy(etr);
+}
+
+
+typedef struct {
+	pcb_layer_t *dst;
+	pcb_coord_t thickness, clearance;
+	pcb_flag_t flags;
+} hatch_ctx_t;
+
+static void hatch_cb(void *ctx_, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	hatch_ctx_t *ctx = (hatch_ctx_t *)ctx_;
+	pcb_line_new(ctx->dst, x1, y1, x2, y2, ctx->thickness, ctx->clearance, ctx->flags);
+}
+
+void pcb_cpoly_hatch_lines(pcb_layer_t *dst, const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, pcb_coord_t period, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags)
+{
+	hatch_ctx_t ctx;
+
+
+	ctx.dst = dst;
+	ctx.thickness = thickness;
+	ctx.clearance = clearance;
+	ctx.flags = flags;
+
+	pcb_cpoly_hatch(src, dir, (thickness/2)+1, period, &ctx, hatch_cb);
+}
+
+
+static const char pcb_acts_PolyHatch[] = "PolyHatch([spacing], [hvcp])\nPolyHatch(interactive)\n";
+static const char pcb_acth_PolyHatch[] = "hatch the selected polygon(s) with lines of the current style; lines are drawn on the current layer; flags are h:horizontal, v:vertical, c:contour, p:poly";
+static fgw_error_t pcb_act_PolyHatch(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op, *arg = NULL;
+	pcb_coord_t period = 0;
+	pcb_cpoly_hatchdir_t dir = 0;
+	pcb_flag_t flg;
+	int want_contour = 0, want_poly = 0, cont_specd = 0;
+
+	PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str);
+
+	if (pcb_strcasecmp(op, "interactive") == 0) {
+		pcb_hid_attribute_t attrs[5];
+#define nattr sizeof(attrs)/sizeof(attrs[0])
+		static pcb_hid_attr_val_t results[nattr] = { {0}, {1}, {1}, {1}, {1} };
+
+		memset(attrs, 0, sizeof(attrs));
+
+		results[0].coord_value = conf_core.design.line_thickness * 2;
+		attrs[0].name = "Spacing";
+		attrs[0].help_text = "Distance between centerlines of adjacent hatch lines for vertical and horizontal hatching";
+		attrs[0].type = PCB_HATT_COORD;
+		attrs[0].default_val.coord_value = results[0].coord_value;
+		attrs[0].min_val = 1;
+		attrs[0].max_val = PCB_MM_TO_COORD(100);
+
+		attrs[1].name = "Draw contour";
+		attrs[1].help_text = "Draw the contour of the polygon";
+		attrs[1].type = PCB_HATT_BOOL;
+		attrs[1].default_val.int_value = results[1].int_value;
+
+		attrs[2].name = "Draw horizontal hatch";
+		attrs[2].help_text = "Draw evenly spaced horizontal hatch lines";
+		attrs[2].type = PCB_HATT_BOOL;
+		attrs[2].default_val.int_value = results[2].int_value;
+
+		attrs[3].name = "Draw vertical hatch";
+		attrs[3].help_text = "Draw evenly spaced vertical hatch lines";
+		attrs[3].type = PCB_HATT_BOOL;
+		attrs[3].default_val.int_value = results[3].int_value;
+
+		attrs[4].name = "Clear-line";
+		attrs[4].help_text = "Hatch lines have clearance";
+		attrs[4].type = PCB_HATT_BOOL;
+		attrs[4].default_val.int_value = results[4].int_value;
+
+		if (pcb_attribute_dialog(attrs, nattr, results, "Polygon hatch", "Hatch a polygon", NULL) != 0)
+			return 1;
+
+		period = results[0].coord_value;
+		if (results[1].int_value) want_contour = 1;
+		if (results[2].int_value) dir |= PCB_CPOLY_HATCH_HORIZONTAL;
+		if (results[3].int_value) dir |= PCB_CPOLY_HATCH_VERTICAL;
+		flg = pcb_flag_make(results[4].int_value ? PCB_FLAG_CLEARLINE : 0);
+	}
+	else {
+		if (op != NULL) {
+			pcb_bool succ;
+			period = pcb_get_value(op, NULL, NULL, &succ);
+			if (!succ) {
+				pcb_message(PCB_MSG_ERROR, "Invalid spacing value - must be a coordinate\n");
+				return -1;
+			}
+		}
+
+		if (arg != NULL) {
+			if (strchr(arg, 'c')) want_contour = 1;
+			if (strchr(arg, 'p')) want_poly = 1;
+			if (strchr(arg, 'h')) dir |= PCB_CPOLY_HATCH_HORIZONTAL;
+			if (strchr(arg, 'v')) dir |= PCB_CPOLY_HATCH_VERTICAL;
+			cont_specd = 1;
+		}
+
+		if (cont_specd == 0) {
+			dir = PCB_CPOLY_HATCH_HORIZONTAL | PCB_CPOLY_HATCH_VERTICAL;
+			want_contour = 1;
+		}
+		if (period == 0)
+			period = conf_core.design.line_thickness * 2;
+
+		flg = pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0);
+	}
+
+	PCB_POLY_ALL_LOOP(PCB->Data); {
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+			continue;
+		if (want_contour) {
+			pcb_poly_it_t it;
+			pcb_polyarea_t *pa;
+			for(pa = pcb_poly_island_first(polygon, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+				pcb_pline_t *pl = pcb_poly_contour(&it);
+				if (pl != NULL) { /* we have a contour */
+					pcb_pline_to_lines(CURRENT, pl, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg);
+					for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it))
+						pcb_pline_to_lines(CURRENT, pl, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg);
+				}
+			}
+		}
+		if (want_poly) {
+			pcb_poly_t *p = pcb_poly_new_from_poly(CURRENT, polygon, period, polygon->Clearance, polygon->Flags);
+			PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, p);
+		}
+		pcb_cpoly_hatch_lines(CURRENT, polygon, dir, period, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg);
+	} PCB_ENDALL_LOOP;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_PolyOffs[] = "PolyOffs(offset)\n";
+static const char pcb_acth_PolyOffs[] = "replicate the outer contour of the selected polygon(s) with growing or shrinking them by offset; the new polygon is drawn on the current layer";
+static fgw_error_t pcb_act_PolyOffs(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t offs;
+
+	PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1]));
+
+	PCB_POLY_ALL_LOOP(PCB->Data); {
+		pcb_poly_t *p;
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+			continue;
+
+		p = pcb_poly_new_from_poly(CURRENT, polygon, offs, polygon->Clearance, polygon->Flags);
+		PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, p);
+	} PCB_ENDALL_LOOP;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static pcb_action_t polyhelp_action_list[] = {
+	{"PolyHatch", pcb_act_PolyHatch, pcb_acth_PolyHatch, pcb_acts_PolyHatch},
+	{"PolyOffs", pcb_act_PolyOffs, pcb_acth_PolyOffs, pcb_acts_PolyOffs},
+	{"ToPoly", pcb_act_topoly, pcb_acth_topoly, pcb_acts_topoly}
+};
+PCB_REGISTER_ACTIONS(polyhelp_action_list, polyhelp_cookie)
+
+
+int pplg_check_ver_lib_polyhelp(int ver_needed) { return 0; }
+
+void pplg_uninit_lib_polyhelp(void)
+{
+	pcb_remove_actions_by_cookie(polyhelp_cookie);
+}
+
+#include "dolists.h"
+
+int pplg_init_lib_polyhelp(void)
+{
+	PCB_API_CHK_VER;
+
+	PCB_REGISTER_ACTIONS(polyhelp_action_list, polyhelp_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.h
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/polyhelp.h	(revision 18980)
@@ -0,0 +1,76 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "obj_poly.h"
+
+
+void pcb_pline_fprint_anim(FILE *f, const pcb_pline_t *pl);
+
+/* Add lines on dst tracing pline from the inner side (no line will extend
+   outside of the original pline, except when the original polygon has a hair
+   narrower than thickness). Returns number of lines created */
+pcb_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const pcb_pline_t *src, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags);
+
+/* Returns whether the clipped polygon is a simple rectangle (single island,
+   no-hole rectangle). */
+pcb_bool pcb_cpoly_is_simple_rect(const pcb_poly_t *p);
+
+/* Returns whether all edges of a pline are axis aligned */
+pcb_bool pcb_pline_is_aligned(const pcb_pline_t *src);
+
+/*** Generate an rtree of all edges if a polygon */
+
+typedef struct {
+	pcb_box_t bbox;
+	pcb_coord_t x1, y1, x2, y2;
+} pcb_cpoly_edge_t;
+
+typedef struct {
+	pcb_rtree_t *edge_tree;
+	pcb_box_t bbox;
+	pcb_cardinal_t used, alloced;
+	pcb_cpoly_edge_t edges[1];
+} pcb_cpoly_edgetree_t;
+
+pcb_cpoly_edgetree_t *pcb_cpoly_edgetree_create(const pcb_poly_t *src, pcb_coord_t offs);
+void pcb_cpoly_edgetree_destroy(pcb_cpoly_edgetree_t *etr);
+
+
+/*** hatching ***/
+
+/* bitfield to request horizontal and/or vertical hatching or striping */
+typedef enum {
+	PCB_CPOLY_HATCH_HORIZONTAL = 1,
+	PCB_CPOLY_HATCH_VERTICAL = 2
+} pcb_cpoly_hatchdir_t;
+
+/* hatch a polygon with horizontal and/or vertical lines drawn on dst,
+   one line per period */
+void pcb_cpoly_hatch_lines(pcb_layer_t *dst, const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, pcb_coord_t period, pcb_coord_t thickness, pcb_coord_t clearance, pcb_flag_t flags);
+
+/* Generic hor-ver hatch with a callback */
+void pcb_cpoly_hatch(const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, pcb_coord_t offs, pcb_coord_t period, void *ctx, void (*cb)(void *ctx, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2));
+
Index: tags/2.0.1/src_plugins/lib_polyhelp/topoly.c
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/topoly.c	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/topoly.c	(revision 18980)
@@ -0,0 +1,349 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <genvector/vtp0.h>
+#include <genvector/vti0.h>
+
+#include "topoly.h"
+
+#include "error.h"
+#include "rtree.h"
+#include "obj_arc.h"
+#include "obj_line.h"
+#include "obj_poly.h"
+#include "obj_poly_draw.h"
+#include "polygon.h"
+#include "search.h"
+#include "hid.h"
+#include "actions.h"
+
+#define VALID_TYPE(obj) (((obj)->type == PCB_OBJ_ARC)  || ((obj)->type == PCB_OBJ_LINE))
+#define CONT_TYPE (PCB_OBJ_LINE | PCB_OBJ_ARC)
+
+#define NEAR(x1, x2, y1, y2) (((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2)) < 4)
+
+/*** map the contour ***/
+typedef struct {
+	vtp0_t *list;
+	vti0_t *endlist;
+	pcb_any_obj_t *curr, *result;
+	pcb_coord_t tx, ty;
+} next_conn_t;
+
+/* Return whether the object is already on the list (but ignore the start object
+   so we can do a full circle) */
+static int already_found(next_conn_t *ctx, pcb_any_obj_t *obj)
+{
+	int n;
+	for(n = 1; n < vtp0_len(ctx->list); n++)
+		if (ctx->list->array[n] == obj)
+			return 1;
+	return 0;
+}
+
+static pcb_r_dir_t next_conn_found_arc(const pcb_box_t *box, void *cl)
+{
+	pcb_coord_t ex, ey;
+	next_conn_t *ctx = cl;
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)box;
+	int n;
+
+	if (obj == ctx->curr)
+		return PCB_R_DIR_NOT_FOUND; /* need the object connected to the other endpoint */
+
+	if (already_found(ctx, obj))
+		return PCB_R_DIR_NOT_FOUND;
+
+	for(n = 0; n < 2; n++) {
+		pcb_arc_get_end((pcb_arc_t *)obj, n, &ex, &ey);
+		if (NEAR(ctx->tx, ex, ctx->ty, ey)) {
+			vti0_append(ctx->endlist, n);
+			vtp0_append(ctx->list, obj);
+			ctx->result = obj;
+			return PCB_R_DIR_FOUND_CONTINUE;
+		}
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t next_conn_found_line(const pcb_box_t *box, void *cl)
+{
+	next_conn_t *ctx = cl;
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)box;
+	pcb_line_t *l = (pcb_line_t *)box;
+
+	if (obj == ctx->curr)
+		return PCB_R_DIR_NOT_FOUND; /* need the object connected to the other endpoint */
+
+	if (already_found(ctx, obj))
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (NEAR(ctx->tx, l->Point1.X, ctx->ty, l->Point1.Y)) {
+		vti0_append(ctx->endlist, 0);
+		vtp0_append(ctx->list, obj);
+		ctx->result = obj;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+
+	if (NEAR(ctx->tx, l->Point2.X, ctx->ty, l->Point2.Y)) {
+		vti0_append(ctx->endlist, 1);
+		vtp0_append(ctx->list, obj);
+		ctx->result = obj;
+		return PCB_R_DIR_FOUND_CONTINUE;
+	}
+
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_any_obj_t *next_conn(vtp0_t *list, vti0_t *endlist, pcb_any_obj_t *curr)
+{
+	pcb_line_t *l;
+	int n;
+	next_conn_t ctx;
+	pcb_coord_t cx[2], cy[2];
+
+	/* determine the endpoints of the current object */
+	switch(curr->type) {
+		case PCB_OBJ_ARC:
+			pcb_arc_get_end((pcb_arc_t *)curr, 0, &cx[0], &cy[0]);
+			pcb_arc_get_end((pcb_arc_t *)curr, 1, &cx[1], &cy[1]);
+			break;
+		case PCB_OBJ_LINE:
+			l = (pcb_line_t *)curr;
+			cx[0] = l->Point1.X; cy[0] = l->Point1.Y;
+			cx[1] = l->Point2.X; cy[1] = l->Point2.Y;
+			break;
+		default:
+			return NULL;
+	}
+
+	ctx.curr = curr;
+	ctx.list = list;
+	ctx.endlist = endlist;
+	ctx.result = NULL;
+
+	for(n = 0; n < 2; n++) {
+		pcb_box_t region;
+		int len;
+
+		region.X1 = cx[n]-1;
+		region.Y1 = cy[n]-1;
+		region.X2 = cx[n]+1;
+		region.Y2 = cy[n]+1;
+		ctx.tx = cx[n];
+		ctx.ty = cy[n];
+
+		pcb_r_search(curr->parent.layer->arc_tree, &region, NULL, next_conn_found_arc, &ctx, &len);
+		if (len > 1) {
+			pcb_message(PCB_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n");
+			return NULL;
+		}
+		if (ctx.result != NULL)
+			return ctx.result;
+
+		pcb_r_search(curr->parent.layer->line_tree, &region, NULL, next_conn_found_line, &ctx, &len);
+		if (len > 1) {
+			pcb_message(PCB_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n");
+			return NULL;
+		}
+		if (ctx.result != NULL)
+			return ctx.result;
+	}
+
+	return NULL; /* nothing found */
+}
+
+static int map_contour(vtp0_t *list, vti0_t *endlist, pcb_any_obj_t *start)
+{
+	pcb_any_obj_t *n;
+
+pcb_trace("loop start: %d\n", start->ID);
+	vtp0_append(list, start);
+	for(n = next_conn(list, endlist, start); n != start; n = next_conn(list, endlist, n)) {
+		if (n == NULL)
+			return -1;
+pcb_trace("      next: %d\n", n->ID);
+	}
+pcb_trace("    (next): %d\n", n->ID);
+
+	return 0;
+}
+
+pcb_poly_t *contour2poly(pcb_board_t *pcb, vtp0_t *objs, vti0_t *ends, pcb_topoly_t how)
+{
+	int n;
+	pcb_any_obj_t **obj = (pcb_any_obj_t **)(&objs->array[0]);
+	int *end = (int *)(&ends->array[0]);
+	pcb_layer_t *layer = (*obj)->parent.layer;
+	pcb_poly_t *poly = pcb_poly_alloc(layer);
+	pcb_coord_t x, y;
+
+	obj++;
+	for(n = 1; n < vtp0_len(objs); obj++,end++,n++) {
+		pcb_line_t *l = (pcb_line_t *)*obj;
+		pcb_arc_t *a = (pcb_arc_t *)*obj;
+
+		/* end[0] is the starting endpoint of the current *obj,
+		   end[1] is the starting endpoint of the next *obj */
+		switch((*obj)->type) {
+			case PCB_OBJ_LINE:
+				switch(end[0]) {
+					case 0: pcb_poly_point_new(poly, l->Point1.X, l->Point1.Y); break;
+					case 1: pcb_poly_point_new(poly, l->Point2.X, l->Point2.Y); break;
+					default: abort();
+				}
+				break;
+			case PCB_OBJ_ARC:
+#warning TODO: fix this with a real approx
+				pcb_arc_get_end(a, end[0], &x, &y);
+				pcb_poly_point_new(poly, x, y);
+				pcb_arc_middle(a, &x, &y);
+				pcb_poly_point_new(poly, x, y);
+				break;
+			default:
+				pcb_poly_free(poly);
+				return NULL;
+		}
+	}
+
+	if (!(how & PCB_TOPOLY_FLOATING)) {
+		pcb_add_poly_on_layer(layer, poly);
+		pcb_poly_init_clip(pcb->Data, layer, poly);
+		pcb_poly_invalidate_draw(layer, poly);
+#warning TODO: use pcb_board_set_changed_flag(), but decouple that from PCB
+		pcb->Changed = pcb_true;
+	}
+
+	return poly;
+}
+
+pcb_poly_t *pcb_topoly_conn(pcb_board_t *pcb, pcb_any_obj_t *start, pcb_topoly_t how)
+{
+	vtp0_t objs;
+	vti0_t ends;
+	int res;
+	pcb_poly_t *poly;
+
+	if (!VALID_TYPE(start)) {
+		pcb_message(PCB_MSG_ERROR, "pcb_topoly_conn(): starting object is not a line or arc\n");
+		return NULL;
+	}
+
+	vtp0_init(&objs);
+	vti0_init(&ends);
+	res = map_contour(&objs, &ends, start);
+	if (res != 0) {
+		pcb_message(PCB_MSG_ERROR, "pcb_topoly_conn(): failed to find a closed loop of lines and arcs\n");
+		vtp0_uninit(&objs);
+		vti0_uninit(&ends);
+		return NULL;
+	}
+
+	poly = contour2poly(pcb, &objs, &ends, how);
+
+	vtp0_uninit(&objs);
+	vti0_uninit(&ends);
+	return poly;
+}
+
+#define check(x, y, obj) \
+do { \
+	double dist = (double)x*(double)x + (double)y*(double)y; \
+	if (dist < bestd) { \
+		bestd = dist; \
+		best = (pcb_any_obj_t *)obj; \
+	} \
+} while(0)
+
+pcb_any_obj_t *pcb_topoly_find_1st_outline(pcb_board_t *pcb)
+{
+	pcb_layer_id_t lid;
+	pcb_layer_t *layer;
+	pcb_any_obj_t *best = NULL;
+	pcb_coord_t x, y;
+	double bestd = (double)pcb->MaxHeight*(double)pcb->MaxHeight + (double)pcb->MaxWidth*(double)pcb->MaxWidth;
+
+	if (pcb_layer_list(pcb, PCB_LYT_OUTLINE, &lid, 1) != 1)
+		return NULL;
+
+	layer = pcb_get_layer(PCB->Data, lid);
+	PCB_LINE_LOOP(layer) {
+		check(line->Point1.X, line->Point1.Y, line);
+		check(line->Point2.X, line->Point2.Y, line);
+	}
+	PCB_END_LOOP;
+
+	PCB_ARC_LOOP(layer) {
+
+		pcb_arc_get_end(arc, 0, &x, &y);
+		check(x, y, arc);
+		pcb_arc_get_end(arc, 1, &x, &y);
+		check(x, y, arc);
+		pcb_arc_middle(arc, &x, &y);
+		check(x, y, arc);
+	}
+	PCB_END_LOOP;
+
+	return best;
+}
+#undef check
+
+const char pcb_acts_topoly[] = "ToPoly()\nToPoly(outline)\n";
+const char pcb_acth_topoly[] = "convert a closed loop of lines and arcs into a polygon";
+fgw_error_t pcb_act_topoly(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *op = NULL;
+	void *r1, *r2, *r3;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str);
+
+	if (op == NULL) {
+		pcb_coord_t x, y;
+		pcb_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0);
+		if (pcb_search_screen(x, y, CONT_TYPE, &r1, &r2, &r3) == 0) {
+			pcb_message(PCB_MSG_ERROR, "ToPoly(): failed to find a line or arc there\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+	else {
+		if (strcmp(op, "outline") == 0) {
+			r2 = pcb_topoly_find_1st_outline(PCB);
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "Invalid first argument\n");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+
+	pcb_topoly_conn(PCB, r2, 0);
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/lib_polyhelp/topoly.h
===================================================================
--- tags/2.0.1/src_plugins/lib_polyhelp/topoly.h	(nonexistent)
+++ tags/2.0.1/src_plugins/lib_polyhelp/topoly.h	(revision 18980)
@@ -0,0 +1,51 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_TOPOLY_H
+#define PCB_TOPOLY_H
+
+#include "board.h"
+#include "obj_common.h"
+#include <libfungw/fungw.h>
+
+typedef enum pcb_topoly_e {
+	PCB_TOPOLY_KEEP_ORIG = 1,   /* keep original objects */
+	PCB_TOPOLY_FLOATING = 2     /* do not add the new polygon on any layer */
+} pcb_topoly_t;
+
+/* Convert a loop of connected objects into a polygon (with no holes); the first
+   object is named in start. */
+pcb_poly_t *pcb_topoly_conn(pcb_board_t *pcb, pcb_any_obj_t *start, pcb_topoly_t how);
+
+/* Find the first line/arc on the outline layer from top-left */
+pcb_any_obj_t *pcb_topoly_find_1st_outline(pcb_board_t *pcb);
+
+
+extern const char pcb_acts_topoly[];
+extern const char pcb_acth_topoly[];
+fgw_error_t pcb_act_topoly(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+#endif
Index: tags/2.0.1/src_plugins/loghid/Makefile
===================================================================
--- tags/2.0.1/src_plugins/loghid/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_loghid
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/loghid/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/loghid/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {loghid}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/loghid/loghid.o
+	$(PLUGDIR)/loghid/hid-logger.o
+@]
+
+switch /local/pcb/loghid/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/loghid/hid-logger.c
===================================================================
--- tags/2.0.1/src_plugins/loghid/hid-logger.c	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/hid-logger.c	(revision 18980)
@@ -0,0 +1,265 @@
+/*
+ * a HID mostly for debugging.
+ */
+#include "config.h"
+#include "hid-logger.h"
+#include "pcb-printf.h"
+
+#define ENUM_LOG_TEXT(e) case e: txt = #e; break
+
+/*
+ * Just having one instance for now. Keeping it
+ * local is fine.
+ */
+static pcb_hid_t *delegatee_ = NULL;
+static FILE *out_ = NULL;
+
+static pcb_hid_attribute_t *log_get_export_options(int *ret)
+{
+	pcb_hid_attribute_t *result = delegatee_->get_export_options(ret);
+	if (ret != NULL)
+		pcb_fprintf(out_, "get_export_options(ret) -> ret=%d\n", *ret);
+	else
+		pcb_fprintf(out_, "get_export_options(ret) -> ret=n/a\n");
+	return result;
+}
+
+static void log_do_exit(pcb_hid_t *hid)
+{
+	pcb_fprintf(out_, "do_exit()\n");
+	delegatee_->do_exit(delegatee_);
+}
+
+static int log_parse_arguments(int *argc, char ***argv)
+{
+	pcb_fprintf(out_, "parse_arguments()\n");
+	return delegatee_->parse_arguments(argc, argv);
+}
+
+static void log_invalidate_lr(pcb_coord_t left, pcb_coord_t right, pcb_coord_t top, pcb_coord_t bottom)
+{
+	pcb_fprintf(out_, "invalidate_lr(%mm, %mm, %mm, %mm)\n", left, right, top, bottom);
+	delegatee_->invalidate_lr(left, right, top, bottom);
+}
+
+static void log_invalidate_all(void)
+{
+	pcb_fprintf(out_, "invalidate_all()\n");
+	delegatee_->invalidate_all();
+}
+
+static void log_notify_crosshair_change(pcb_bool changes_complete)
+{
+	pcb_fprintf(out_, "pcb_notify_crosshair_change(%s)\n", changes_complete ? "true" : "false");
+	delegatee_->notify_crosshair_change(changes_complete);
+}
+
+static void log_notify_mark_change(pcb_bool changes_complete)
+{
+	pcb_fprintf(out_, "pcb_notify_mark_change(%s)\n", changes_complete ? "true" : "false");
+	delegatee_->notify_mark_change(changes_complete);
+}
+
+static int log_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty)
+{
+	pcb_fprintf(out_, "set_layer(group=%ld, layer=%ld, flags=%lx, empty=%s)\n", group, layer, flags, is_empty ? "true" : "false");
+	return delegatee_->set_layer_group(group, layer, flags, is_empty);
+}
+
+static void log_end_layer()
+{
+	pcb_fprintf(out_, "end_layer()\n");
+	delegatee_->end_layer();
+}
+
+static pcb_hid_gc_t log_make_gc()
+{
+	pcb_fprintf(out_, "make_gc()\n");
+	return delegatee_->make_gc();
+}
+
+static void log_destroy_gc(pcb_hid_gc_t gc)
+{
+	pcb_fprintf(out_, "destroy_gc()\n");
+	delegatee_->destroy_gc(gc);
+}
+
+static void log_set_drawing_mode(pcb_composite_op_t op, pcb_bool direct, const pcb_box_t *screen)
+{
+	if (screen != NULL)
+		pcb_fprintf(out_, "set_drawing_mode(%d,%d,[%mm;%mm,%mm;%mm])\n", op, direct, screen->X1, screen->Y1, screen->X2, screen->Y2);
+	else
+		pcb_fprintf(out_, "set_drawing_mode(%d,%d,[NULL-screen])\n", op, direct);
+	delegatee_->set_drawing_mode(op, direct, screen);
+}
+
+static void log_render_burst(pcb_burst_op_t op, const pcb_box_t *screen)
+{
+	pcb_fprintf(out_, "render_burst(%d,[%mm;%mm,%mm;%mm])\n", op, screen->X1, screen->Y1, screen->X2, screen->Y2);
+	delegatee_->render_burst(op, screen);
+	pcb_gui->coord_per_pix = delegatee_->coord_per_pix;
+}
+
+
+static void log_set_color(pcb_hid_gc_t gc, const char *name)
+{
+	pcb_fprintf(out_, "set_color(gc, %s)\n", name);
+	delegatee_->set_color(gc, name);
+}
+
+static void log_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style)
+{
+	const char *txt = "unknown";
+	switch (style) {
+		ENUM_LOG_TEXT(pcb_cap_square);
+		ENUM_LOG_TEXT(pcb_cap_round);
+	}
+	pcb_fprintf(out_, "set_line_cap(gc, %s)\n", txt);
+	delegatee_->set_line_cap(gc, style);
+}
+
+static void log_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width)
+{
+	pcb_fprintf(out_, "set_line_width(gc, %d)\n", width);
+	delegatee_->set_line_width(gc, width);
+}
+
+static void log_set_draw_xor(pcb_hid_gc_t gc, int xor)
+{
+	pcb_fprintf(out_, "set_draw_xor(gc, %s)\n", xor ? "true" : "false");
+	delegatee_->set_draw_xor(gc, xor);
+}
+
+static void log_set_draw_faded(pcb_hid_gc_t gc, int faded)
+{
+	pcb_fprintf(out_, "set_draw_faded(gc, %s)\n", faded ? "true" : "false");
+	delegatee_->set_draw_faded(gc, faded);
+}
+
+static void log_draw_line(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_fprintf(out_, "draw_line(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2);
+	delegatee_->draw_line(gc, x1, y1, x2, y2);
+}
+
+static void log_draw_arc(pcb_hid_gc_t gc, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t xradius, pcb_coord_t yradius, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+{
+	pcb_fprintf(out_, "draw_arc(gc, %mm, %mm, rx=%mm, ry=%mm, start_angle=%.1f, delta_a=%.1f)\n",
+		cx, cy, xradius, yradius, start_angle, delta_angle);
+	delegatee_->draw_arc(gc, cx, cy, xradius, yradius, start_angle, delta_angle);
+}
+
+static void log_draw_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_fprintf(out_, "draw_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2);
+	delegatee_->draw_rect(gc, x1, y1, x2, y2);
+}
+
+static void log_fill_circle(pcb_hid_gc_t gc, pcb_coord_t x, pcb_coord_t y, pcb_coord_t r)
+{
+	pcb_fprintf(out_, "fill_circle(gc, %mm, %mm, %mm)\n", x, y, r);
+	delegatee_->fill_circle(gc, x, y, r);
+}
+
+static void log_fill_polygon(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y)
+{
+	int i;
+	pcb_fprintf(out_, "fill_polygon(gc, %d", n_coords);
+	for (i = 0; i < n_coords; ++i) {
+		pcb_fprintf(out_, ", (%mm, %mm)", x[i], y[i]);
+	}
+	pcb_fprintf(out_, ")\n");
+	delegatee_->fill_polygon(gc, n_coords, x, y);
+}
+
+static void log_fill_polygon_offs(pcb_hid_gc_t gc, int n_coords, pcb_coord_t *x, pcb_coord_t *y, pcb_coord_t dx, pcb_coord_t dy)
+{
+	int i;
+	pcb_fprintf(out_, "fill_polygon_offs(gc, %d", n_coords);
+	for (i = 0; i < n_coords; ++i) {
+		pcb_fprintf(out_, ", (%mm, %mm)", x[i], y[i]);
+	}
+	pcb_fprintf(out_, ", {%mm,%mm})\n", dx, dy);
+	delegatee_->fill_polygon_offs(gc, n_coords, x, y, dx, dy);
+}
+
+static void log_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box)
+{
+	pcb_fprintf(out_, "fill_pcb_polygon(gc, poly->PointN=%d, ...)\n", poly->PointN);
+	delegatee_->fill_pcb_polygon(gc, poly, clip_box);
+}
+
+static void log_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t *poly, const pcb_box_t *clip_box)
+{
+	pcb_fprintf(out_, "thindraw_pcb_polygon(gc, poly->PointN=%d, ...)\n", poly->PointN);
+	delegatee_->thindraw_pcb_polygon(gc, poly, clip_box);
+}
+
+static void log_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2)
+{
+	pcb_fprintf(out_, "fill_rect(gc, %mm, %mm, %mm, %mm)\n", x1, y1, x2, y2);
+	delegatee_->fill_rect(gc, x1, y1, x2, y2);
+}
+
+static void log_report_dialog(const char *title, const char *msg)
+{
+	pcb_fprintf(out_, "report_dialog(\"%s\", \"%s\")\n", title, msg);
+	delegatee_->report_dialog(title, msg);
+}
+
+static void log_beep()
+{
+	pcb_fprintf(out_, "beep();   BEEEP   .... BEEEEEEEP\n");
+	delegatee_->beep();
+}
+
+void create_log_hid(FILE *log_out, pcb_hid_t *loghid, pcb_hid_t *delegatee)
+{
+	out_ = log_out;
+	delegatee_ = delegatee;
+
+	if (delegatee == NULL) {
+		pcb_message(PCB_MSG_ERROR, "loghid: Invalid target HID.\n");
+		exit(1);
+	}
+
+	/*
+	 * Setting up the output hid with a copy from the original, then
+	 * replace the functions we want to log.
+	 * We only log 'interesting' functions for now.
+	 */
+	*loghid = *delegatee;
+
+#define REGISTER_IF_NOT_NULL(fun) loghid->fun = delegatee->fun ? log_##fun : NULL
+	REGISTER_IF_NOT_NULL(get_export_options);
+	REGISTER_IF_NOT_NULL(do_exit);
+	REGISTER_IF_NOT_NULL(parse_arguments);
+	REGISTER_IF_NOT_NULL(invalidate_lr);
+	REGISTER_IF_NOT_NULL(invalidate_all);
+	REGISTER_IF_NOT_NULL(notify_crosshair_change);
+	REGISTER_IF_NOT_NULL(notify_mark_change);
+	REGISTER_IF_NOT_NULL(set_layer_group);
+	REGISTER_IF_NOT_NULL(end_layer);
+	REGISTER_IF_NOT_NULL(make_gc);
+	REGISTER_IF_NOT_NULL(destroy_gc);
+	REGISTER_IF_NOT_NULL(set_drawing_mode);
+	REGISTER_IF_NOT_NULL(render_burst);
+	REGISTER_IF_NOT_NULL(set_color);
+	REGISTER_IF_NOT_NULL(set_line_cap);
+	REGISTER_IF_NOT_NULL(set_line_width);
+	REGISTER_IF_NOT_NULL(set_draw_xor);
+	REGISTER_IF_NOT_NULL(set_draw_faded);
+	REGISTER_IF_NOT_NULL(draw_line);
+	REGISTER_IF_NOT_NULL(draw_arc);
+	REGISTER_IF_NOT_NULL(draw_rect);
+	REGISTER_IF_NOT_NULL(fill_circle);
+	REGISTER_IF_NOT_NULL(fill_polygon);
+	REGISTER_IF_NOT_NULL(fill_polygon_offs);
+	REGISTER_IF_NOT_NULL(fill_pcb_polygon);
+	REGISTER_IF_NOT_NULL(thindraw_pcb_polygon);
+	REGISTER_IF_NOT_NULL(fill_rect);
+	REGISTER_IF_NOT_NULL(report_dialog);
+	REGISTER_IF_NOT_NULL(beep);
+
+#undef REGISTER_IF_NOT_NULL
+}
Index: tags/2.0.1/src_plugins/loghid/hid-logger.h
===================================================================
--- tags/2.0.1/src_plugins/loghid/hid-logger.h	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/hid-logger.h	(revision 18980)
@@ -0,0 +1,12 @@
+#ifndef PCB_HID_LOGGER_H
+#define PCB_HID_LOGGER_H
+
+#include "hid.h"
+
+#include <stdio.h>
+
+/* Set up the delegating loghid that sends all calls to the delegatee but also
+   logs the calls. */
+void create_log_hid(FILE *log_out, pcb_hid_t *loghid, pcb_hid_t *delegatee);
+
+#endif
Index: tags/2.0.1/src_plugins/loghid/loghid.c
===================================================================
--- tags/2.0.1/src_plugins/loghid/loghid.c	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/loghid.c	(revision 18980)
@@ -0,0 +1,154 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "hid-logger.h"
+#include "hid_init.h"
+#include "hid_attrib.h"
+#include "hid_nogui.h"
+
+static const char *loghid_cookie = "loghid plugin";
+
+static pcb_hid_t loghid_gui;
+static pcb_hid_t loghid_exp;
+
+pcb_hid_attribute_t loghid_attribute_list[] = {
+	{"target-hid", "the real GUI or export HID to relay calls to",
+	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0}
+#define HA_target_hid 0
+};
+#define NUM_OPTIONS sizeof(loghid_attribute_list) / sizeof(loghid_attribute_list[0])
+
+static int loghid_parse_arguments_real(int *argc, char ***argv, int is_gui)
+{
+	pcb_hid_t *target, *me;
+	const char *target_name;
+
+	pcb_hid_register_attributes(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0);
+	pcb_hid_parse_command_line(argc, argv);
+
+	target_name = loghid_attribute_list[HA_target_hid].default_val.str_value;
+
+	if (is_gui) {
+		target = pcb_hid_find_gui(target_name);
+		me = &loghid_gui;
+	}
+	else {
+		target = pcb_hid_find_exporter(target_name);
+		me = &loghid_exp;
+	}
+
+	create_log_hid(stdout, me, target);
+	return target->parse_arguments(argc, argv);
+}
+
+static int loghid_parse_arguments_gui(int *argc, char ***argv)
+{
+	return loghid_parse_arguments_real(argc, argv, 1);
+}
+
+static int loghid_parse_arguments_exp(int *argc, char ***argv)
+{
+	return loghid_parse_arguments_real(argc, argv, 0);
+}
+
+
+static int loghid_usage(const char *topic)
+{
+	fprintf(stderr, "\nloghid command line arguments:\n\n");
+	pcb_hid_usage(loghid_attribute_list, NUM_OPTIONS);
+	fprintf(stderr, "\n");
+	fprintf(stderr, "Usage: pcb-rnd [generic_options] --gui loghid-gui --target-hid gtk2_gdk foo.pcb\n");
+	fprintf(stderr, "Usage: pcb-rnd [generic_options] --x loghid-exp --target-hid png foo.pcb\n");
+	fprintf(stderr, "\n");
+	return 0;
+}
+
+PCB_REGISTER_ATTRIBUTES(loghid_attribute_list, loghid_cookie)
+
+static pcb_hid_attribute_t *loghid_get_export_options(int *n)
+{
+/*	loghid_attribute_list[HA_psfile] = pcb_strdup("default?");*/
+
+	if (n)
+		*n = (sizeof(loghid_attribute_list)/sizeof(loghid_attribute_list[0]));
+	return loghid_attribute_list;
+}
+
+
+#include "dolists.h"
+
+int pplg_check_ver_loghid(int ver_needed) { return 0; }
+
+void pplg_uninit_loghid(void)
+{
+	pcb_hid_remove_attributes_by_cookie(loghid_cookie);
+}
+
+int pplg_init_loghid(void)
+{
+	PCB_API_CHK_VER;
+
+	pcb_hid_nogui_init(&loghid_gui);
+	pcb_hid_nogui_init(&loghid_exp);
+
+	/* gui version */
+	loghid_gui.struct_size = sizeof(pcb_hid_t);
+	loghid_gui.name = "loghid-gui";
+	loghid_gui.description = "log GUI HID calls";
+	loghid_gui.gui = 1;
+
+	loghid_gui.usage = loghid_usage;
+	loghid_gui.parse_arguments = loghid_parse_arguments_gui;
+
+	pcb_hid_register_hid(&loghid_gui);
+
+	/* export version */
+	loghid_exp.struct_size = sizeof(pcb_hid_t);
+	loghid_exp.name = "loghid-exp";
+	loghid_exp.description = "log export HID calls";
+	loghid_exp.exporter = 1;
+
+	loghid_exp.usage = loghid_usage;
+	loghid_exp.parse_arguments = loghid_parse_arguments_exp;
+
+	pcb_hid_register_hid(&loghid_exp);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/loghid/loghid.pup
===================================================================
--- tags/2.0.1/src_plugins/loghid/loghid.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/loghid/loghid.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short diagnostics: log HID calls
+$long Sits between a HID (or exporter) and the core and logs all core->plugin calls made through the HID structure.
+$state WIP
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/map_plugins.sh
===================================================================
--- tags/2.0.1/src_plugins/map_plugins.sh	(nonexistent)
+++ tags/2.0.1/src_plugins/map_plugins.sh	(revision 18980)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Run this script after changing or adding .pup files.
+# WARNING: this script requires a fair amount of tools - it is intended to
+#          run on developers' machines, not on users'
+
+export LANG=C
+PUPLUG=../src_3rd/puplug/util/puplug
+
+
+# generate scconfig's 3 state plugin list
+$PUPLUG findpups . '%$class$|%N|%3|%A|%$short$\n' | sed '
+s/^lib/1|lib/
+s/^feature/2|feature/
+s/^fp/3|fp/
+s/^import/4|import/
+s/^export/5|export/
+s/^io/6|io/
+s/^hid/7|hid/
+' | sort | awk -F "[|]" '
+BEGIN {
+	HDR["lib"] = "Library plugins"
+	HDR["feature"] = "Feature plugins"
+	HDR["fp"] = "Footprint backends"
+	HDR["import"] = "Import plugins"
+	HDR["export"] = "Export plugins"
+	HDR["io"] = "IO plugins (file formats)"
+	HDR["hid"] = "HID plugins"
+	print "/******************************************************************************"
+	print " Auto-generated by trunk/src_plugins/map_plugins.sh - do NOT edit,"
+	print " run make map_plugins in trunk/src/ - to change any of the data below,"
+	print " edit trunk/src_plugins/PLUGIN/PLUGIN.pup"
+	print "******************************************************************************/"
+}
+
+function q(s) { return "\"" s "\"," }
+
+($2 != last) {
+	print "\nplugin_header(\"\\n" HDR[$2] ":\\n\")"
+	last = $2
+}
+
+{
+	if ($4 == "")
+		print "Error: invalid default in plugin: " $3 > "/dev/stderr"
+	printf("plugin_def(%-20s%-35s%-10s%s)\n", q($3), q($6), $4 "," , $5)
+}
+
+END { print "\n" }
+
+' > ../scconfig/plugins.h
+
+$PUPLUG findpups . "" 'plugin_dep("%N", "%m")\n' | sort >> ../scconfig/plugins.h
+
+
+# Generate the plugin list
+echo "# List of all plugins - generated by make map_plugins - do NOT edit" > plugins_ALL.tmpasm
+$PUPLUG findpups . "include {../src_plugins/%D/Plug.tmpasm}\n" | sort >> plugins_ALL.tmpasm

Property changes on: tags/2.0.1/src_plugins/map_plugins.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/src_plugins/millpath/Makefile
===================================================================
--- tags/2.0.1/src_plugins/millpath/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_millpath
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/millpath/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/millpath/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,11 @@
+put /local/pcb/mod {millpath}
+append /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/millpath/millpath.o
+ $(PLUGDIR)/millpath/toolpath.o
+@]
+
+switch /local/pcb/millpath/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/millpath/millpath.c
===================================================================
--- tags/2.0.1/src_plugins/millpath/millpath.c	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/millpath.c	(revision 18980)
@@ -0,0 +1,77 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "plugins.h"
+#include "actions.h"
+#include "toolpath.h"
+
+#include "board.h"
+#include "data.h"
+#include "layer.h"
+
+const char *pcb_millpath_cookie = "millpath plugin";
+
+static pcb_tlp_session_t ctx;
+static pcb_coord_t tool_dias[] = {
+	PCB_MM_TO_COORD(0.5),
+	PCB_MM_TO_COORD(3)
+};
+static pcb_tlp_tools_t tools = { sizeof(tool_dias)/sizeof(tool_dias[0]), tool_dias};
+
+static const char pcb_acts_mill[] = "mill()";
+static const char pcb_acth_mill[] = "Calculate toolpath for milling away copper";
+fgw_error_t pcb_act_mill(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	ctx.edge_clearance = PCB_MM_TO_COORD(0.05);
+	ctx.tools = &tools;
+	PCB_ACT_IRES(pcb_tlp_mill_copper_layer(&ctx, CURRENT));
+	return 0;
+}
+
+
+pcb_action_t millpath_action_list[] = {
+	{"mill", pcb_act_mill, pcb_acth_mill, pcb_acts_mill}
+};
+
+PCB_REGISTER_ACTIONS(millpath_action_list, pcb_millpath_cookie)
+
+int pplg_check_ver_millpath(int ver_needed) { return 0; }
+
+void pplg_uninit_millpath(void)
+{
+	pcb_remove_actions_by_cookie(pcb_millpath_cookie);
+}
+
+
+#include "dolists.h"
+int pplg_init_millpath(void)
+{
+	PCB_API_CHK_VER;
+
+	PCB_REGISTER_ACTIONS(millpath_action_list, pcb_millpath_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/millpath/millpath.pup
===================================================================
--- tags/2.0.1/src_plugins/millpath/millpath.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/millpath.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short calculate toolpath for milling
+$long Calculate and simulate toolpath for milling away opper
+$state WIP
+default disable
+autoload 1
+dep lib_polyhelp
Index: tags/2.0.1/src_plugins/millpath/toolpath.c
===================================================================
--- tags/2.0.1/src_plugins/millpath/toolpath.c	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/toolpath.c	(revision 18980)
@@ -0,0 +1,225 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <assert.h>
+
+#include "toolpath.h"
+
+#include "board.h"
+#include "data.h"
+#include "flag.h"
+#include "layer.h"
+#include "layer_grp.h"
+#include "layer_ui.h"
+#include "obj_line.h"
+#include "obj_line_op.h"
+#include "obj_arc.h"
+#include "obj_poly.h"
+#include "obj_poly_op.h"
+#include "polygon.h"
+
+#include "src_plugins/lib_polyhelp/polyhelp.h"
+
+extern const char *pcb_millpath_cookie;
+
+static void sub_layer_all(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer, int centerline)
+{
+	pcb_line_t *line, line_tmp;
+	pcb_arc_t *arc, arc_tmp;
+	pcb_text_t *text;
+	pcb_rtree_it_t it;
+
+	for(line = (pcb_line_t *)pcb_r_first(layer->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it)) {
+		memcpy(&line_tmp, line, sizeof(line_tmp));
+		PCB_FLAG_SET(PCB_FLAG_CLEARLINE, &line_tmp);
+		if (centerline) {
+			line_tmp.Thickness = 1;
+			line_tmp.Clearance = result->edge_clearance;
+		}
+		else
+			line_tmp.Clearance = 1;
+		pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_LINE, &line_tmp);
+	}
+	pcb_r_end(&it);
+
+	for(arc = (pcb_arc_t *)pcb_r_first(layer->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it)) {
+		memcpy(&arc_tmp, arc, sizeof(arc_tmp));
+		PCB_FLAG_SET(PCB_FLAG_CLEARLINE, &arc_tmp);
+		if (centerline) {
+			arc_tmp.Thickness = 1;
+			arc_tmp.Clearance = result->edge_clearance;
+		}
+		else
+			arc_tmp.Clearance = 1;
+		pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_ARC, &arc_tmp);
+	}
+	pcb_r_end(&it);
+
+#warning TODO: centerline
+	for(text = (pcb_text_t *)pcb_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)pcb_r_next(&it))
+		pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_ARC, text);
+	pcb_r_end(&it);
+
+#warning TODO: subs poly: not supported by core
+}
+
+
+static void sub_group_all(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layergrp_t *grp, int centerline)
+{
+	int n;
+	for(n = 0; n < grp->len; n++) {
+		pcb_layer_t *l = pcb_get_layer(PCB->Data, grp->lid[n]);
+		if (l != NULL)
+			sub_layer_all(pcb, result, l, centerline);
+	}
+}
+
+static void sub_global_all(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer)
+{
+	pcb_pstk_t *ps, ps_tmp;
+	pcb_rtree_it_t it;
+
+#warning TODO: thermals: find out if any of our layers has thermal for the pin and if so, use that layer
+	for(ps = (pcb_pstk_t *)pcb_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)pcb_r_next(&it)) {
+		memcpy(&ps_tmp, ps, sizeof(ps_tmp));
+		ps_tmp.Clearance = 1;
+		pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_PSTK, &ps_tmp);
+	}
+	pcb_r_end(&it);
+}
+
+static void setup_ui_layers(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer)
+{
+	gdl_iterator_t it;
+	pcb_line_t *line;
+
+	if (result->res_ply == NULL)
+		result->res_ply = pcb_uilayer_alloc(pcb_millpath_cookie, "mill remove", "#EE9922");
+
+	if (result->res_path == NULL)
+		result->res_path = pcb_uilayer_alloc(pcb_millpath_cookie, "mill toolpath", "#886611");
+
+	if (result->fill != NULL)
+		pcb_polyop_destroy(NULL, result->res_ply, result->fill);
+
+	linelist_foreach(&result->res_path->Line, &it, line) {
+		pcb_lineop_destroy(NULL, result->res_path, line);
+	}
+}
+
+static void setup_remove_poly(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layer_t *layer)
+{
+	pcb_layergrp_id_t otl;
+	int has_otl;
+
+	assert(!layer->is_bound);
+
+	result->grp = pcb_get_layergrp(pcb, layer->meta.real.grp);
+	has_otl = (pcb_layergrp_list(pcb, PCB_LYT_OUTLINE, &otl, 1) == 1);
+
+	if (has_otl) { /* if there's an outline layer, the remove-poly shouldn't be bigger than that */
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+		pcb_rtree_it_t it;
+		pcb_box_t otlbb;
+		pcb_layergrp_t *og = pcb_get_layergrp(pcb, otl);
+		int n;
+		
+		otlbb.X1 = otlbb.Y1 = PCB_MAX_COORD;
+		otlbb.X2 = otlbb.Y2 = -PCB_MAX_COORD;
+
+		for(n = 0; n < og->len; n++) {
+			pcb_layer_t *l = pcb_get_layer(PCB->Data, og->lid[n]);
+			if (l == NULL)
+				continue;
+
+			for(line = (pcb_line_t *)pcb_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it))
+				pcb_box_bump_box(&otlbb, (pcb_box_t *)line);
+			pcb_r_end(&it);
+
+			for(arc = (pcb_arc_t *)pcb_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it))
+				pcb_box_bump_box(&otlbb, (pcb_box_t *)arc);
+			pcb_r_end(&it);
+		}
+		result->fill = pcb_poly_new_from_rectangle(result->res_ply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY));
+	}
+	else
+		result->fill = pcb_poly_new_from_rectangle(result->res_ply, 0, 0, pcb->MaxWidth, pcb->MaxHeight, 0, pcb_flag_make(PCB_FLAG_FULLPOLY));
+
+	pcb_poly_init_clip(pcb->Data, result->res_ply, result->fill);
+
+	sub_group_all(pcb, result, result->grp, 0);
+	if (has_otl)
+		sub_group_all(pcb, result, pcb_get_layergrp(pcb, otl), 1);
+
+	sub_global_all(pcb, result, layer);
+}
+
+static pcb_cardinal_t trace_contour(pcb_board_t *pcb, pcb_tlp_session_t *result, int tool_idx, pcb_coord_t extra_offs)
+{
+	pcb_poly_it_t it;
+	pcb_polyarea_t *pa;
+	pcb_coord_t tool_dia = result->tools->dia[tool_idx];
+	pcb_cardinal_t cnt = 0;
+	
+	for(pa = pcb_poly_island_first(result->fill, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
+		pcb_pline_t *pl = pcb_poly_contour(&it);
+		if (pl != NULL) { /* we have a contour */
+			pcb_pline_to_lines(result->res_path, pl, tool_dia + extra_offs, 0, pcb_no_flags());
+			cnt++;
+			for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it)) {
+				pcb_pline_to_lines(result->res_path, pl, tool_dia + extra_offs, 0, pcb_no_flags());
+				cnt++;
+			}
+		}
+	}
+	return cnt;
+}
+
+static void trace_spiral(pcb_board_t *pcb, pcb_tlp_session_t *result, int tool_idx, pcb_coord_t extra_offs)
+{
+	int n;
+	pcb_coord_t tool_dia = result->tools->dia[tool_idx];
+
+	while(trace_contour(pcb, result, tool_idx, extra_offs) > 0)
+		extra_offs += tool_dia;
+}
+
+
+int pcb_tlp_mill_copper_layer(pcb_tlp_session_t *result, pcb_layer_t *layer)
+{
+	pcb_board_t *pcb = pcb_data_get_top(layer->parent.data);
+
+	setup_ui_layers(pcb, result, layer);
+	setup_remove_poly(pcb, result, layer);
+
+	trace_contour(pcb, result, 0, 0);
+
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/millpath/toolpath.h
===================================================================
--- tags/2.0.1/src_plugins/millpath/toolpath.h	(nonexistent)
+++ tags/2.0.1/src_plugins/millpath/toolpath.h	(revision 18980)
@@ -0,0 +1,72 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "layer.h"
+#include "layer_grp.h"
+#include "polygon.h"
+
+typedef struct pcb_tlp_tools_s    pcb_tlp_tools_t;
+typedef struct pcb_tlp_line_s     pcb_tlp_line_t;
+typedef struct pcb_tlp_seg_s      pcb_tlp_seg_t;
+typedef struct pcb_tlp_session_s  pcb_tlp_session_t;
+
+typedef enum pcb_tlp_segtype_s {
+	PCB_TLP_SEG_LINE
+} pcb_tlp_segtype_t;
+
+
+struct pcb_tlp_tools_s {
+	int used;          /* number of tools */
+	pcb_coord_t *dia;  /* tool diameters */
+};
+
+struct pcb_tlp_line_s {
+	pcb_coord_t x1, y1, x2, y2;
+};
+
+struct pcb_tlp_seg_s {
+	pcb_tlp_segtype_t type;
+	union {
+		pcb_tlp_line_t line;
+	} seg;
+	/* TODO: list link */
+};
+
+struct pcb_tlp_session_s {
+	const pcb_tlp_tools_t *tools;
+	pcb_coord_t edge_clearance; /* when milling copper, keep this clearance from the edges */
+
+	/* temp data */
+	pcb_layer_t *res_ply;    /* resulting "remove" polygon */
+	pcb_layer_t *res_path;   /* resulting toolpath */
+	pcb_poly_t *fill;     /* base fill */
+
+	pcb_layergrp_t *grp;
+	
+	/* TODO: list on segments */
+};
+
+int pcb_tlp_mill_copper_layer(pcb_tlp_session_t *result, pcb_layer_t *layer);
Index: tags/2.0.1/src_plugins/mincut/Makefile
===================================================================
--- tags/2.0.1/src_plugins/mincut/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_mincut
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/mincut/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/mincut/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {mincut}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/mincut/rats_mincut.o $(PLUGDIR)/mincut/pcb-mincut/graph.o $(PLUGDIR)/mincut/pcb-mincut/solve.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/mincut/rats_mincut_conf.h}
+
+switch /local/pcb/mincut/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/mincut/mincut.pup
===================================================================
--- tags/2.0.1/src_plugins/mincut/mincut.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/mincut.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short minimal cut shorts
+$long Use the minimal cut algorithm to indicate shorts: instead of highlighting two random pins/pads, try to highlight the least number of objects that connect the two networks.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/COPYING
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/COPYING	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/COPYING	(revision 18980)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser 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 General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new 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 you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive 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) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice 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 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 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 at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be 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, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy 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 sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the 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 rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the 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 Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the 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 from a designated place, then offering equivalent
+access to copy the source 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 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.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the 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 particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain 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 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the 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 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE 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.
+
+                     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
+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.>
+    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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+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 called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+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 Lesser General
+Public License instead of this License.
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/H.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/H.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/H.in	(revision 18980)
@@ -0,0 +1,8 @@
+# a-1-b
+#   |
+# C-2-D
+
+net1 a b
+net2 C D
+neut 1 2
+conn C-2 D-2 a-1 b-1 1-2
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/Makefile
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/Makefile	(revision 18980)
@@ -0,0 +1,14 @@
+CFLAGS = -g -Wall -I../../../src_3rd/liblihata -I../../../src -I../../..
+LDFLAGS = -lm
+OBJS = main.o solve.o load.o graph.o ../../../src_3rd/liblihata/genht/htsi.o ../../../src_3rd/liblihata/genht/hash.o
+
+all: main
+
+main: $(OBJS)
+
+test:
+	cd test_cases && make
+
+
+clean:
+	rm $(OBJS) 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/README
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/README	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/README	(revision 18980)
@@ -0,0 +1,21 @@
+This mini-project demonstrates a minimal cut implementation tailored
+to solve geda/pcb "how to highlight shorts" problem.
+
+It should compile out of the box on GNU/Linux using make. Running
+a test case:
+
+./main < test_cases/H3.in
+
+If graphviz is installed, input graphs are drawn. Changing the
+#defines in solve.c causes more debug messages printed and/or
+debug graphs drawn.
+
+The code is not portable at all, since it is a proof-of-concept
+prototype.
+
+load.c is for easier testing; if the code ever gets merge in PCB it
+would use something native and load.c would be omitted. genht is a
+dependency of load.c.
+
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.c
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.c	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.c	(revision 18980)
@@ -0,0 +1,137 @@
+/*    pcb-mincut, a prototype project demonstrating how to highlight shorts
+ *    Copyright (C) 2012 Tibor 'Igor2' Palinkas
+ *
+ *   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 2 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, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include "graph.h"
+#include "safe_fs.h"
+
+/* allocate a new graph of n nodes with no edges */
+gr_t *gr_alloc(int n)
+{
+	gr_t *g = malloc(sizeof(gr_t));
+	g->n = n;
+	g->adj = calloc(n * n, sizeof(int));
+	return g;
+}
+
+/* create a new graph by cloning graph g */
+gr_t *gr_clone(gr_t *g)
+{
+	int size = g->n * g->n * sizeof(int);
+	gr_t *o = malloc(sizeof(gr_t));
+
+	o->n = g->n;
+	o->adj = malloc(size);
+	memcpy(o->adj, g->adj, size);
+	o->node2name = g->node2name;
+	return o;
+}
+
+/* free all resouces used by the graph */
+void gr_free(gr_t *g)
+{
+	free(g->adj);
+	free(g);
+}
+
+void gr_merge_nodes(gr_t *g, int n1, int n2)
+{
+	int n;
+	gr_bound_chk(g, n1, n2);
+
+	for(n = 0; n < g->n; n++) {
+		if (n != n2)
+			gr_add_(g, n, n1, gr_set_(g, n, n2, 0));
+		else
+			gr_add_(g, n1, n1, gr_set_(g, n2, n2, 0)/2);
+	}
+}
+
+void gr_print(gr_t *g, FILE *f, const char *prefix)
+{
+	int x, y;
+
+	fprintf(f, "%s      ", prefix);
+	for(x = 0; x < g->n; x++)
+		fprintf(f, "% 4d ", x);
+	fprintf(f, "\n");
+
+	for(y = 0; y < g->n; y++) {
+		fprintf(f, "%s % 4d ", prefix, y);
+		for(x = 0; x < g->n; x++)
+			fprintf(f, "% 4d ", gr_get_(g, x, y));
+		fprintf(f, "\n");
+	}
+	fprintf(f, "%s\n", prefix);
+	if (g->node2name != NULL) {
+	fprintf(f, "%snames:\n", prefix);
+		for(x = 0; x < g->n; x++)
+			fprintf(f, "%s % 4d=%s\n", prefix, x, g->node2name[x]);
+	}
+}
+
+int gr_draw(gr_t *g, const char *name, const char *type)
+{
+	char *cmd;
+	FILE *f;
+	int x, y;
+
+	if (type == NULL)
+		type = "png";
+
+	cmd = malloc(strlen(type)*2 + strlen(name) + 64);
+	sprintf(cmd, "dot -T%s -o %s.%s", type, name, type);
+	f = pcb_popen(cmd, "w");
+	if (f == NULL)
+		return -1;
+
+	fprintf(f, "graph %s {\n", name);
+
+	if (g->node2name != NULL)
+		for(x = 0; x < g->n; x++)
+			fprintf(f, "\t% 4d[label=\"%d\\n%s\"]\n", x, x, g->node2name[x] == NULL ? "NULL" : g->node2name[x]);
+
+	for(y = 0; y < g->n; y++) {
+		for(x = y; x < g->n; x++) {
+
+#ifdef MULTI_EDGE
+			int n;
+			for(n = gr_get_(g, x, y); n > 0; n--)
+				fprintf(f, "\t% 4d -- % 4d\n", x, y);
+#else
+			if (gr_get_(g, x, y) > 0)
+				fprintf(f, "\t% 4d -- % 4d [label=\"*%d\"]\n", x, y, gr_get_(g, x, y));
+#endif
+		}
+	}
+
+	fprintf(f, "}\n");
+	pcb_pclose(f);
+	return 0;
+}
+
+int gr_node_edges(gr_t *g, int node)
+{
+	int n, sum;
+	sum = 0;
+	gr_bound_chk(g, 0, node);
+	for(n = 0; n < g->n; n++)
+		sum += gr_get_(g, n, node);
+	return sum;
+}
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.h
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.h	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/graph.h	(revision 18980)
@@ -0,0 +1,98 @@
+/*    pcb-mincut, a prototype project demonstrating how to highlight shorts
+ *    Copyright (C) 2012 Tibor 'Igor2' Palinkas
+ *
+ *   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 2 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, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef GRAPH_H
+#define GRAPH_H
+#include <stdio.h>
+#include <assert.h>
+#include "../../../config.h"
+
+typedef struct gr_s {
+	int n;     /* number of nodes */
+	int *adj;  /* adjacency matrix of n*n ints */
+	char **node2name; /* optional node names */
+} gr_t;
+
+/* allocate a new graph of n nodes with no edges */
+gr_t *gr_alloc(int n);
+
+/* create a new graph by cloning graph g */
+gr_t *gr_clone(gr_t *g);
+
+/* free all resouces used by the graph */
+void gr_free(gr_t *g);
+
+
+PCB_INLINE void gr_bound_chk(gr_t *g, int n1, int n2)
+{
+	assert((n1 >= 0) && (n1 < g->n));
+	assert((n2 >= 0) && (n2 < g->n));
+}
+
+/* return number of edges between nodes n1 and n2 - without checks */
+PCB_INLINE int gr_get_(gr_t *g, int n1, int n2)
+{
+	return g->adj[n1 * g->n + n2];
+}
+
+/* return number of edges between nodes n1 and n2 - with checks */
+PCB_INLINE int gr_get(gr_t *g, int n1, int n2)
+{
+	gr_bound_chk(g, n1, n2);
+	return gr_get_(g, n1, n2);
+}
+
+/* return old number of edges between nodes n1 and n2 and change it to newnum - no check*/
+PCB_INLINE int gr_set_(gr_t *g, int n1, int n2, int newnum)
+{
+	int old;
+	old = g->adj[n1 * g->n + n2];
+	g->adj[n1 * g->n + n2] = newnum;
+	g->adj[n2 * g->n + n1] = newnum;
+	return old;
+}
+
+/* return old number of edges between nodes n1 and n2 and increase it by newnum - no check*/
+PCB_INLINE int gr_add_(gr_t *g, int n1, int n2, int newnum)
+{
+	int old;
+	old = g->adj[n1 * g->n + n2];
+	g->adj[n1 * g->n + n2] += newnum;
+	g->adj[n2 * g->n + n1] += newnum;
+	return old;
+}
+
+/* return old number of edges between nodes n1 and n2 and change it to newnum - check*/
+PCB_INLINE int gr_set(gr_t *g, int n1, int n2, int newnum)
+{
+	gr_bound_chk(g, n1, n2);
+	return gr_set_(g, n1, n2, newnum);
+}
+
+/* merge two nodes n1 and n2 (contraction) */
+void gr_merge_nodes(gr_t *g, int n1, int n2);
+
+/* print the connection matrix */
+void gr_print(gr_t *g, FILE *f, const char *prefix);
+
+/* draw graph using graphviz/dot */
+int gr_draw(gr_t *g, const char *name, const char *type);
+
+/* return total number of edges of a node */
+int gr_node_edges(gr_t *g, int node);
+#endif
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/load.c
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/load.c	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/load.c	(revision 18980)
@@ -0,0 +1,262 @@
+/*    pcb-mincut, a prototype project demonstrating how to highlight shorts
+ *    Copyright (C) 2012 Tibor 'Igor2' Palinkas
+ *
+ *   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 2 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, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "genht/htsi.h"
+#include "genht/hash.h"
+#include "graph.h"
+#include "compat_misc.h"
+
+/*#define DEBUG_GR*/
+
+/* maximum number of nodes */
+#define MAXNODES 1024
+
+/* maximum length of a name */
+#define NAMELEN 128
+
+/* how many edges net nodes are connected with - this would balance
+   mincut to avoid cutting such connections */
+#define NET_EDGES 8
+
+#define isspc(c) (((c) == ' ') || ((c) == '\t'))
+#define isid(c) ((((c) >= 'a') && ((c) <= 'z')) || (((c) >= 'A') && ((c) <= 'Z')) || (((c) >= '0') && ((c) <= '9')) || ((c) == '_'))
+
+htsi_t *name2node = NULL;              /* hash for looking up known node name -> node id pairs */
+char *node2name[MAXNODES] = {NULL};
+int num_nodes;
+
+static unsigned int keyhash(char *key) {
+	unsigned char *p = (unsigned char *)key;
+	unsigned int hash = 0;
+
+	while (*p)
+		hash += (hash << 2) + *p++;
+	return hash;
+}
+
+gr_t *load(FILE *f)
+{
+	int lineno;
+	int nets[2][MAXNODES];  /* nodes in nets */
+	int neut[MAXNODES];     /* neutral nodes */
+	int nn_net[2];          /* number of nodes in nets */
+	int nn_neut;            /* number of nodes in nets */
+	int nodes_fin;          /* 1 after reading the first conn line */
+	gr_t *g = NULL;
+
+/* peek at next char and return if it is a newline */
+#define return_at_eol \
+	do { \
+		char c; \
+		c = fgetc(f); \
+		if ((c == '\r') || (c == '\n')) \
+			return; \
+		ungetc(c, f); \
+	} while(0)
+
+
+	/* eat up space and tabs */
+	void eat_space(void)
+	{
+		int c;
+		do {
+			c = fgetc(f);
+		} while(isspc(c));
+		ungetc(c, f);
+	}
+
+	/* load next token of type id */
+	const char *token_id(void)
+	{
+		static char id[NAMELEN];
+		char *s;
+		int n;
+
+		n = sizeof(id) - 1;
+		s = id-1;
+		do {
+			s++;
+			*s = fgetc(f);
+			n--;
+			if (n <= 0) {
+				*s = '\0';
+				fprintf(stderr, "Error: name too long: %s...\n", id);
+			}
+		} while(isid(*s));
+		ungetc(*s, f);
+		*s = '\0';
+		return id;
+	}
+
+	/* read next id token and look it up as a node name; if it does not
+	   exist and alloc is 1, allocate it; if it does not exist and
+	   alloc is 0, abort with error */
+	int token_node(int alloc)
+	{
+		const char *id = token_id();
+		if (htsi_has(name2node, (char *)id))
+			return htsi_get(name2node, (char *)id);
+		if (alloc) {
+			node2name[num_nodes] = pcb_strdup(id);
+			htsi_set(name2node, node2name[num_nodes], num_nodes);
+			return num_nodes++;
+		}
+		fprintf(stderr, "Error: unknown node %s\n", id);
+		abort();
+	}
+
+	/* load a net1 or net2 statement */
+	void load_net(int net)
+	{
+		int node;
+		if (nodes_fin) {
+			fprintf(stderr, "Error: net%d after conn\n", net);
+			abort();
+		}
+		/* load each node and append */
+		while(1) {
+			eat_space();
+			return_at_eol;
+			node = token_node(1);
+			nets[net][nn_net[net]] = node;
+			nn_net[net]++;
+		}
+	}
+
+	/* load a neut statement */
+	void load_neut(void)
+	{
+		int node;
+		if (nodes_fin) {
+			fprintf(stderr, "Error: neut after conn\n");
+			abort();
+		}
+		/* load each node and append */
+		while(1) {
+			eat_space();
+			return_at_eol;
+			node = token_node(1);
+			neut[nn_neut] = node;
+			nn_neut++;
+		}
+	}
+
+	/* load a list of connections */
+	void load_conn(void)
+	{
+		int n1, n2;
+		char c;
+
+		/* if this is the first conn, create the graph */
+		if (!nodes_fin) {
+			g = gr_alloc(num_nodes);
+			g->node2name = node2name;
+		}
+		nodes_fin = 1;
+
+		/* load each n1-n2 pair */
+		while(1) {
+			eat_space();
+			return_at_eol;
+			n1 = token_node(0);
+			c = fgetc(f);
+			if (c != '-') {
+				fprintf(stderr, "Error: expected '-' between nodes in conn list (got '%c' instead)\n", c);
+				abort();
+			}
+			n2 = token_node(0);
+			gr_add_(g, n1, n2, 1);
+		}
+	}
+
+	name2node = htsi_alloc(keyhash, strkeyeq);
+	node2name[0] = pcb_strdup("(S)"); htsi_set(name2node, node2name[0], 0);
+	node2name[1] = pcb_strdup("(T)"); htsi_set(name2node, node2name[1], 1);
+	num_nodes = 2;
+	nn_net[0] = 0;
+	nn_net[1] = 0;
+	nn_neut = 0;
+
+	nodes_fin = 0;
+	lineno = 0;
+	while(!(feof(f))) {
+		char cmd[6];
+		lineno++;
+		eat_space();
+		*cmd = '\0';
+		fgets(cmd, 5, f);
+		if (*cmd == '#') {
+			char s[1024]; /* will break for comment lines longer than 1k */
+			fgets(s, sizeof(s), f);
+			continue;
+		}
+		if ((*cmd == '\n') || (*cmd == '\t') || (*cmd == '\0'))
+			continue;
+		if (strcmp(cmd, "net1") == 0)
+			load_net(0);
+		else if (strcmp(cmd, "net2") == 0)
+			load_net(1);
+		else if (strcmp(cmd, "neut") == 0)
+			load_neut();
+		else if (strcmp(cmd, "conn") == 0)
+			load_conn();
+	}
+
+
+#ifdef DEBUG_GR
+	gr_print(g, stdout, "(input0) ");
+	gr_draw(g, "input0", "png");
+#endif
+
+	/* preprocessing nets */
+	{
+		int net, node;
+
+#if 0
+/* this optimization looked like a good idea but fails for O.in because
+   it's always cheaper to cut T-> and S-> bounding than anything else */
+		/* merge net nodes into (S) and (T) */
+		for(net = 0; net < 2; net++)
+			for(node = 0; node < nn_net[net]; node++)
+				gr_merge_nodes(g, net, nets[net][node]);
+
+		/* make sure (S) and (T) connections are heavy */
+		for(net = 0; net < 2; net++)
+			for(node = 0; node < g->n; node++)
+				if (gr_get_(g, net, node))
+					gr_add_(g, net, node, NET_EDGES);
+#endif
+
+		/* make sure (S) and (T) connections are heavy */
+		for(net = 0; net < 2; net++)
+			for(node = 0; node < nn_net[net]; node++)
+				gr_add_(g, net, nets[net][node], NET_EDGES);
+	}
+
+#ifdef DEBUG_GR
+	gr_print(g, stdout, "(input1) ");
+	gr_draw(g, "input1", "png");
+#endif
+
+	return g;
+}
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/load.h
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/load.h	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/load.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include <stdio.h>
+#include "graph.h"
+
+/* load example input from FILE f and return the preprocessed graph */
+gr_t *load(FILE *f);
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/main.c
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/main.c	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/main.c	(revision 18980)
@@ -0,0 +1,34 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "graph.h"
+#include "load.h"
+#include "solve.h"
+
+#define strempty(s) ((s) == NULL ? "" : (s))
+
+#undef strdup
+
+char *pcb_strdup(const char *s) { return strdup(s); }
+int pcb_rand() { return rand(); }
+
+int main()
+{
+	int *best;
+	gr_t *g;
+	int n;
+
+	g = load(stdin);
+	if (g == NULL) {
+		fprintf(stderr, "Failed to load input, exiting\n");
+		exit(1);
+	}
+	best = solve(g, NULL);
+	for(n = 0; best[n*2] != -1; n++)
+		printf("%s-%s\n", strempty(g->node2name[best[n*2+0]]), strempty(g->node2name[best[n*2+1]]));
+
+	gr_free(g);
+	free(best);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/proposals.txt
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/proposals.txt	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/proposals.txt	(revision 18980)
@@ -0,0 +1,99 @@
+I start to lose track of all the diverse ideas. This post is an effort to 
+structure the major directions. May it be incomplete, feel free to complete 
+it.
+
+In case there is a short...
+
+I. check whether we have history, since this way the qeustion is "what
+  user modification introduced the short" which might be more useful
+  than answer "which object(s) cause(s) the short at the moment".
+
+ 1. bisect using the undo buffer (as Kai-Martin Knaak does manually) -
+    does not work accross sessions (restart/load) and as Markus
+    Hitter pointed it out, fails when new netlist is loaded
+
+ 2. tag objects according to their first connection as suggested by Peter
+    Clifton. This info could be easily saved, making it immune to reload.
+    With further improvments by John Doty and Levente Kovacs with detailed
+    method described by Chris Smith.
+
+ 3. separate connection/netlist history (saved with the PCB). No details
+    yet. Might be the same as I/2.
+
+ 4. Markus Hitter's proposal of pinning down rat lines later converted to
+    to copper. (This is not strictly about keeping track of object
+    history, unless we consider pinned down rats as history of a later copper
+    trace)
+
+II. no history available, try to highlight objects that are most likely to
+    help the user resolving the short. Nodes of the graph include
+    junctions, thermals, etc., much more verbose then the netlist.
+
+ 1. propagate nets from all nodes as suggested by Peter Clifton. Doing
+    this in parallel may cause a collision close to the "real place
+    of the short"
+
+ 2. find a minimal cut in a way the resulting graphs will reflect the
+    netlist and highlight only those cutting edge. To the end user this
+    means we find the smallest modification (deletion) that would fix the
+    problem (with or without leaving new rat lines). Sounds like an NP
+    hard problem, no working solution has been proposed in the thread yet.
+ 
+ 3. Peter Clifton's remove-edges-and-see-how-that-improves-the-situation.
+    A good metric is needed to make sure we can measure small improvements
+    in cases where multiple edges must be removed to resolve the short.
+    Likely to select more edges than the minimum.
+
+ 4.
+   stage 1
+    classify nodes/edges: each belongs to one of the affected nets or is
+    neutral (could be in multiple nets or could be removed without
+    breaking only short, not legal redundant connection in a net). Assume
+    only neutral nodes/edges may participate in the short. Question is how
+    to do the classification properly:
+
+    a. A modified version of Peter Clifton's propagation idea might work,
+       needs more thoughts.
+    b. A similar problem may be known in graph theory; Finding Steiner
+       tree for a net and trying to fit our nodes/edges on it would keep
+       the minimal amount (or length) of objects to form the net properly,
+       and take the rest as neutral. This Breaks badly with redundant
+       connections in a net. Needs more work.
+
+   stage 2
+    from stage 1 we already have sections with multiple nodes/edges that
+    are neutral and can be blamed for the short. If the user breaks each
+    such section, the short is resolved.
+
+    a. highlight these sections and let the user break each wherever
+       (s)he wants (need a way to differentiate between sections)
+    b. try to find the best place to cut each section
+       A. middle of the section
+       B. smallest modification (however we measure that)
+       C. heat up the section with the modified verison of Joshua Lansford
+          idea; this may be used to highlight the shortest/smallest
+          object
+
+
+ 5. minimal cut (proposed by Britton Kerin) with the S->T modified
+    connection graph; creating the modified graph is trival and there
+    should be pseudo code and/or libraries available for calculating
+    minimal cut. With uniformly wieghted edges it could reliably find the
+    smallest amount of cuts resolving the short.
+
+ 6. pick a random path from a random pin/pad of net1 to another random
+    pin/pad of net2 and let the user resolve this short. Once this is done,
+    the process can be repeated until all shorts are eliminated. Proposed
+    by Russell Dill.
+
+III. manual net tagging
+
+ 1. Do not use I. or II., require(?) the user to manually select a net
+    for each object placed and highlight shorts, as proposed by John Doty
+    and Levente Kovacs.
+
+ 2. I/2 combined with III/1; by default it follows I/2 but the user can
+    chose to manually edit tags as in III/1.
+
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.c
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.c	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.c	(revision 18980)
@@ -0,0 +1,275 @@
+/*    pcb-mincut, a prototype project demonstrating how to highlight shorts
+ *    Copyright (C) 2012 Tibor 'Igor2' Palinkas
+ *
+ *   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 2 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, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <time.h>
+#include "solve.h"
+#include "compat_misc.h"
+
+/* Karger's algorithm as described in the wikipedia article
+   http://en.wikipedia.org/wiki/Karger%27s_algorithm
+*/
+
+#define BAD 1000000
+
+/*#define DEBUG_MERGES*/
+/*#define DEBUG_TAGS*/
+/*#define DEBUG_SOLVE*/
+
+typedef struct {
+	gr_t *g;
+	int *avail;    /* nodes IDs still avaialble for merging */
+	int *neigh;    /* neighbor list */
+	int *tag;
+	int num_avail; /* number of nodes still avaialble for merging */
+} sstate_t;
+
+static int pick_del(sstate_t *st)
+{
+	int idx, ret, size;
+	idx = pcb_rand() % st->num_avail;
+	ret = st->avail[idx];
+	size = (st->num_avail-idx-1) * sizeof(int);
+	if (size > 0)
+		memmove(&st->avail[idx], &st->avail[idx+1], size);
+	st->num_avail--;
+	return ret;
+}
+
+static int pick_neigh(sstate_t *st, int node)
+{
+	int n, num_neigh;
+
+	num_neigh = 0;
+	for(n = 0; n < st->g->n; n++) {
+		if ((n != node) && (gr_get_(st->g, n, node) > 0)) {
+			st->neigh[num_neigh] = n;
+			num_neigh++;
+		}
+	}
+	if (num_neigh == 0)
+		return -1;
+	return st->neigh[pcb_rand() % num_neigh];
+}
+
+static void retag(sstate_t *st, int from, int to)
+{
+	int n;
+	for(n = 0; n < st->g->n; n++)
+		if (st->tag[n] == from)
+			st->tag[n] = to;
+}
+
+
+/* clone graph and do a randon contraction */
+int solve_(gr_t *g_, int *cuts)
+{
+	sstate_t st;
+	int n, result, tags;
+	static int solution = -1;
+#ifdef DEBUG_MERGES
+	int cnt = 0;
+	char fn[512];
+#endif
+
+	solution++;
+	st.g = gr_clone(g_);
+	st.avail = malloc(sizeof(int) * st.g->n);
+	st.neigh = malloc(sizeof(int) * st.g->n);
+	st.tag = malloc(sizeof(int) * st.g->n);
+
+#define FREE_ALL() \
+	gr_free(st.g); \
+	free(st.avail); \
+	free(st.neigh); \
+	free(st.tag);
+
+	for(n = 2; n < st.g->n; n++)
+		st.tag[n] = -1;
+	st.tag[0] = 0;
+	st.tag[1] = 1;
+	tags = 2;
+
+	st.num_avail = 0;
+	for(n = 0; n < st.g->n; n++) {
+		if (gr_node_edges(st.g, n) > 0) {
+			st.avail[st.num_avail] = n;
+			st.num_avail++;
+		}
+	}
+
+	while(st.num_avail > 2) {
+		int n1, n2;
+		n2 = pick_del(&st);
+		n1 = pick_neigh(&st, n2);
+		if (n1 < 0) {
+			FREE_ALL();
+			return BAD;
+		}
+#ifndef DEBUG_MERGES
+#ifdef DEBUG_SOLVE
+			printf("Merge %d (%s) into %d (%s)\n", n2, st.g->node2name[n2], n1, st.g->node2name[n1]);
+#endif
+#endif
+		assert(n2 != n1);
+
+		/* propagate tags */
+		if ((st.tag[n1] != -1) && (st.tag[n2] == -1))
+			st.tag[n2] = st.tag[n1];
+		else if ((st.tag[n1] == -1) && (st.tag[n2] != -1))
+			st.tag[n1] = st.tag[n2];
+		else if ((st.tag[n1] == -1) && (st.tag[n2] == -1))
+			st.tag[n1] = st.tag[n2] = tags++;
+		else if ((st.tag[n1] != -1) && (st.tag[n2] != -1)) {
+			if ((st.tag[n1] > 1) && (st.tag[n2] <= 1))
+				retag(&st, st.tag[n1], st.tag[n2]);
+			else if ((st.tag[n2] > 1) && (st.tag[n1] <= 1))
+				retag(&st, st.tag[n2], st.tag[n1]);
+			else {
+				/* tag collision means we won't be able to distinguish between our
+				   two groups and our cut won't resolve the short anyway */
+#ifdef DEBUG_TAGS
+				printf("Tag collision!\n");
+#endif
+				FREE_ALL();
+				return BAD;
+			}
+		}
+
+		gr_merge_nodes(st.g, n1, n2);
+
+#ifdef DEBUG_MERGES
+			sprintf(fn, "contraction_%02d_%02d", solution, cnt);
+			cnt++;
+			gr_draw(st.g, fn, "png");
+			printf("Merge %d into %d, result in %s leaving %d available nodes\n", n2, n1, fn, st.num_avail);
+#endif
+	}
+
+#ifdef DEBUG_SOLVE
+	{
+		char fn[128];
+		sprintf(fn, "contraction_%02d", solution);
+		gr_draw(st.g, fn, "png");
+	}
+#endif
+
+	result = gr_get(st.g, st.avail[0], st.avail[1]);
+
+#ifdef DEBUG_TAGS
+	{
+		int t, n;
+		printf("Groups:\n");
+		for(t = 0; t < 2; t++) {
+			printf("  [%d] is", t);
+			for(n = 0; n < st.g->n; n++) {
+				if (st.tag[n] == t)
+					printf(" %s", st.g->node2name[n]);
+			}
+			printf("\n");
+		}
+	}
+#endif
+	{
+		int x, y, num_cuts = 0;
+		for(y = 0; y < st.g->n; y++)
+			for(x = y+1; x < st.g->n; x++)
+				if ((gr_get_(g_, x, y) > 0) && (st.tag[x] != st.tag[y])) {
+#ifdef DEBUG_TAGS
+					printf("CUT %s-%s\n", st.g->node2name[x], st.g->node2name[y]);
+#endif
+					cuts[num_cuts*2+0] = x;
+					cuts[num_cuts*2+1] = y;
+					num_cuts++;
+				}
+		cuts[num_cuts*2+0] = -1;
+		cuts[num_cuts*2+1] = -1;
+	}
+	FREE_ALL();
+	return result;
+}
+
+#define strempty(s) ((s) == NULL ? "" : (s))
+int *solve(gr_t *g, int (*progress)(int so_far, int total, const char *msg))
+{
+	int n, best, res, till, cuts_size, have_progress = 0;
+	double nd;
+	int *cuts, *best_cuts;
+	time_t currt, nextt;
+
+	/* count how many nodes we really have - the ones not cut down from the graph by the preprocessor */
+	nd = 0;
+	for(n = 0; n < g->n; n++)
+		if (gr_node_edges(g, n) > 0)
+			nd++;
+
+	till = (int)(nd * (nd-1.0) / 2.0 * log(nd))+1;
+#ifdef DEBUG_SOLVE
+	printf("Running solver at most %d times for %d relevant nodes\n", till, (int)nd);
+#endif
+
+	cuts_size = ((nd * nd) + 1) * sizeof(int);
+	cuts = malloc(cuts_size);
+	best_cuts = malloc(cuts_size);
+
+	best = BAD;
+	nextt = time(NULL)+2;
+	for(n = 0; n < till; n++) {
+		if ((progress != NULL) && ((n % 128) == 0)) {
+			currt = time(NULL);
+			if (currt >= nextt) {
+				have_progress = 1;
+				if (progress(n, till, "Optimizing shortcircuit indication\nusing mincut... Press cancel\nto get a dumb indication"))
+					break;
+				nextt = currt+1;
+			}
+		}
+		res = solve_(g, cuts);
+#ifdef DEBUG_SOLVE
+		printf("solution %d=%d\n", n, res);
+#endif
+		if (res < best) {
+			best = res;
+			memcpy(best_cuts, cuts, cuts_size);
+		}
+		if (best == 1) /* we won't find a better solution ever */
+			break;
+	}
+
+	if (have_progress)
+		progress(0, 0, NULL);
+
+#ifdef DEBUG_SOLVE
+	printf("Best solution cuts %d edge%s:", best, best == 1 ? "" : "s");
+	for(n = 0; best_cuts[n*2] != -1; n++) {
+		printf(" %d:%s-%d:%s", best_cuts[n*2+0], strempty(g->node2name[best_cuts[n*2+0]]), best_cuts[n*2+1], strempty(g->node2name[best_cuts[n*2+1]]));
+	}
+	printf("\n");
+#endif
+	if (best == BAD) {
+		free(best_cuts);
+		free(cuts);
+		return NULL;
+	}
+	free(cuts);
+	return best_cuts;
+}
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.h
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.h	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/solve.h	(revision 18980)
@@ -0,0 +1,5 @@
+#include "graph.h"
+
+/* returns a list of object ID pairs (each nth and n+1th element) terminated
+   by a -1;-1. Cutting these vertices would separate g. */
+int *solve(gr_t *g, int (*progress)(int so_far, int total, const char *msg));
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.in	(revision 18980)
@@ -0,0 +1,9 @@
+# a---b
+# |
+# C---D
+
+net1 a b
+net2 C D
+conn a-b C-D
+conn a-C
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/C.ref	(revision 18980)
@@ -0,0 +1 @@
+C-a
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.in	(revision 18980)
@@ -0,0 +1,8 @@
+# a-1-b
+#   |
+# C-2-D
+
+net1 a b
+net2 C D
+neut 1 2
+conn C-2 D-2 a-1 b-1 1-2
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H.ref	(revision 18980)
@@ -0,0 +1 @@
+2-1
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.in	(revision 18980)
@@ -0,0 +1,16 @@
+# a-1-2-3-4-5-b
+#       |
+#       6
+#       |
+#       7
+#       |
+# C-8-9-10-11-D
+
+net1 a b
+net2 C D
+neut 1 2 3 4 5 6 7 8 9 10 11
+conn a-1 1-2 2-3 3-4 4-5 5-b
+conn C-8 8-9 9-10 10-11 11-D
+conn 3-6 6-7 7-10
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H2.ref	(revision 18980)
@@ -0,0 +1 @@
+7-6
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.in	(revision 18980)
@@ -0,0 +1,18 @@
+# a-1-2-3-4-5-b
+#       |
+#       6-+
+#       | |
+#       7-+
+#       |/
+# C-8-9-10-11-D
+
+net1 a b
+net2 C D
+neut 1 2 3 4 5 6 7 8 9 10 11
+conn a-1 1-2 2-3 3-4 4-5 5-b
+conn C-8 8-9 9-10 10-11 11-D
+conn 3-6 6-7 7-10
+
+#redundancy - cut 3-6 is the best:
+conn 6-7 7-10
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H3.ref	(revision 18980)
@@ -0,0 +1 @@
+6-3
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.in	(revision 18980)
@@ -0,0 +1,12 @@
+# a   b
+# |   |
+# 1---2
+# |   |
+# C   D
+
+net1 a b
+net2 C D
+neut 1 2
+conn a-1 b-2
+conn C-1 D-2
+conn 1-2
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/H4.ref	(revision 18980)
@@ -0,0 +1,2 @@
+1-C
+2-D
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/Makefile
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/Makefile	(revision 18980)
@@ -0,0 +1,12 @@
+TESTS = C.diff H.diff H2.diff H3.diff H4.diff O.diff \
+        rats1.diff rats2.diff rats3.diff
+
+all: $(TESTS)
+
+.SUFFIXES: .in .out .diff .ref
+
+.out.diff:
+	@diff -u $*.out $*.ref
+
+.in.out:
+	@../main < $*.in >$*.out
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.in	(revision 18980)
@@ -0,0 +1,9 @@
+# a---b
+# |   |
+# C---D
+
+net1 a b
+net2 C D
+conn a-b C-D
+conn a-C b-D
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/O.ref	(revision 18980)
@@ -0,0 +1,2 @@
+C-a
+D-b
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.in	(revision 18980)
@@ -0,0 +1,12 @@
+# a   b
+# |   |
+# 1   2
+# |   |
+# C   D
+
+net1 a b
+net2 C D
+neut 1 2
+conn a-1 b-2
+conn C-1 D-2
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats1.ref	(revision 18980)
@@ -0,0 +1,2 @@
+1-C
+2-D
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.in	(revision 18980)
@@ -0,0 +1,8 @@
+# a---C---b---D
+
+net1 a b
+net2 C D
+conn a-C C-b b-D
+
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats2.ref	(revision 18980)
@@ -0,0 +1,3 @@
+C-a
+C-b
+D-b
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.in	(revision 18980)
@@ -0,0 +1,9 @@
+# C---a---b---D
+
+net1 a b
+net2 C D
+conn C-a a-b b-D
+
+
+
+
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.ref
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.ref	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/rats3.ref	(revision 18980)
@@ -0,0 +1,2 @@
+C-a
+D-b
Index: tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/redundant.in
===================================================================
--- tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/redundant.in	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/pcb-mincut/test_cases/redundant.in	(revision 18980)
@@ -0,0 +1,20 @@
+# 12----13---14
+# |           |
+# a-1-2-3-4-5-b
+#       |
+#       6-+
+#       | |
+#       7-+
+#       |
+# C-8-9-10-11-D
+
+net1 a b
+net2 C D
+neut 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+conn a-1 1-2 2-3 3-4 4-5 5-b
+conn C-8 8-9 9-10 10-11 11-D
+conn 3-6 6-7 7-10
+conn a-12 12-13 13-14 14-b
+conn 6-7
+
+
Index: tags/2.0.1/src_plugins/mincut/rats_mincut.c
===================================================================
--- tags/2.0.1/src_plugins/mincut/rats_mincut.c	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/rats_mincut.c	(revision 18980)
@@ -0,0 +1,399 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2013..2015 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "plug_io.h"
+#include "find.h"
+#include "polygon.h"
+#include "search.h"
+#include "undo.h"
+#include "plugins.h"
+#include "compat_misc.h"
+#include "obj_common.h"
+#include "obj_subc_parent.h"
+
+#include "rats.h"
+#include "pcb-mincut/graph.h"
+#include "pcb-mincut/solve.h"
+
+#include "conf.h"
+#include "rats_mincut_conf.h"
+conf_mincut_t conf_mincut;
+
+/* define to 1 to enable debug prints */
+#if 0
+#	define debprintf pcb_trace
+#else
+	static void debprintf(const char *fmt, ...) {}
+#endif
+
+typedef struct short_conn_s short_conn_t;
+struct short_conn_s {
+	int gid;											/* id in the graph */
+	int from_type;
+/*	pcb_any_obj_t *from;*/
+	int from_id;
+	int to_type;
+	int edges;										/* number of edges */
+	pcb_any_obj_t *to;
+	pcb_found_conn_type_t type;
+	short_conn_t *next;
+};
+
+static short_conn_t *short_conns = NULL;
+static int num_short_conns = 0;
+static int short_conns_maxid = 0;
+
+static void proc_short_cb(int current_type, void *current_obj, int from_type, void *from_obj, pcb_found_conn_type_t type)
+{
+	pcb_any_obj_t *curr = current_obj, *from = from_obj;
+	short_conn_t *s;
+
+#warning find.c TODO: will not be needed after the big rewrite
+	if (from_type == PCB_OBJ_RAT) /* rat line is often rat point and has no ID */
+		from = NULL;
+
+	s = malloc(sizeof(short_conn_t));
+	if (from != NULL) {
+		s->from_type = from_type;
+		s->from_id = from->ID;
+	}
+	else {
+		s->from_type = 0;
+		s->from_id = -1;
+	}
+	s->to_type = current_type;
+	s->to = curr;
+	s->type = type;
+	s->edges = 0;
+	s->next = short_conns;
+	short_conns = s;
+	if (curr->ID > short_conns_maxid)
+		short_conns_maxid = curr->ID;
+	num_short_conns++;
+
+	debprintf(" found %d %d/%p type %d from %d\n", current_type, curr->ID, (void *)current_obj, type, from == NULL ? -1 : from->ID);
+}
+
+/* returns 0 on succes */
+static int proc_short(pcb_any_obj_t *term, int ignore)
+{
+	pcb_find_callback_t old_cb;
+	pcb_coord_t x, y;
+	short_conn_t *n, **lut_by_oid, **lut_by_gid, *next;
+	int gids;
+	gr_t *g;
+	void *S, *T;
+	int *solution;
+	int i, maxedges, nonterms = 0;
+	int bad_gr = 0;
+
+	if (!conf_mincut.plugins.mincut.enable)
+		return bad_gr;
+
+	pcb_obj_center(term, &x, &y);
+	debprintf("short on terminal\n");
+
+	/* run only if net is not ignored */
+	if (ignore)
+		return 0;
+
+	short_conns = NULL;
+	num_short_conns = 0;
+	short_conns_maxid = 0;
+
+	/* perform a search using PCB_FLAG_MINCUT, calling back proc_short_cb() with the connections */
+	old_cb = pcb_find_callback;
+	pcb_find_callback = proc_short_cb;
+	pcb_save_find_flag(PCB_FLAG_MINCUT);
+	pcb_lookup_conn(x, y, pcb_false, 1, PCB_FLAG_MINCUT);
+
+	debprintf("- alloced for %d\n", (short_conns_maxid + 1));
+	lut_by_oid = calloc(sizeof(short_conn_t *), (short_conns_maxid + 1));
+	lut_by_gid = calloc(sizeof(short_conn_t *), (num_short_conns + 3));
+
+	g = gr_alloc(num_short_conns + 2);
+
+	g->node2name = calloc(sizeof(char *), (num_short_conns + 2));
+
+	/* conn 0 is S and conn 1 is T and set up lookup arrays */
+	for (n = short_conns, gids = 2; n != NULL; n = n->next, gids++) {
+		char *s;
+		const char *typ;
+		pcb_subc_t *parent;
+		pcb_any_obj_t *o = (pcb_any_obj_t *)n->to;
+
+		n->gid = gids;
+		debprintf(" {%d} found %d %d/%p type %d from %d\n", n->gid, n->to_type, n->to->ID, (void *)n->to, n->type, n->from_id);
+		lut_by_oid[n->to->ID] = n;
+		lut_by_gid[n->gid] = n;
+
+		parent = NULL;
+		switch (n->to_type) {
+			case PCB_OBJ_LINE: typ = "line";       parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break;
+			case PCB_OBJ_ARC:  typ = "arc";        parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break;
+			case PCB_OBJ_POLY: typ = "polygon";    parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break;
+			case PCB_OBJ_TEXT: typ = "text";       parent = pcb_lobj_parent_subc(o->parent_type, &o->parent); break;
+			case PCB_OBJ_PSTK: typ = "padstack";   parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break;
+			case PCB_OBJ_SUBC: typ = "subcircuit"; parent = pcb_gobj_parent_subc(o->parent_type, &o->parent); break;
+			default: typ = "<unknown>";             parent = NULL; break;
+		}
+		if (parent != NULL) {
+			if (parent->refdes == NULL)
+				s = pcb_strdup_printf("%s #%ld \\nof #%ld", typ, n->to->ID, parent->ID);
+			else
+				s = pcb_strdup_printf("%s #%ld \\nof %s", typ, n->to->ID, parent->refdes);
+		}
+		else
+			s = pcb_strdup_printf("%s #%ld", typ, n->to->ID);
+
+		g->node2name[n->gid] = s;
+		if ((o->term == NULL) && (o->type != PCB_OBJ_RAT))
+			nonterms++;
+	}
+
+	/* Shortcut: do not even attempt to do the mincut if there are no objects
+	   between S and T that could be cut. This is a typical case when a lot of
+	   parts are thrown on the board with overlapping terminals after an initial
+	   import sch. */
+	if (nonterms < 1)
+		bad_gr = 1;
+
+	g->node2name[0] = pcb_strdup("S");
+	g->node2name[1] = pcb_strdup("T");
+
+	/* calculate how many edges each node has and the max edge count */
+	maxedges = 0;
+	for (n = short_conns; n != NULL; n = n->next) {
+		short_conn_t *from;
+
+		n->edges++;
+		if (n->edges > maxedges)
+			maxedges = n->edges;
+
+		if (n->from_id >= 0) {
+			from = lut_by_oid[n->from_id];
+			if (from == NULL) {
+				/* no from means broken graph (multiple components) */
+				if (n->from_id >= 2) {	/* ID 0 and 1 are start/stop, there won't be from for them */
+					fprintf(stderr, "rats_mincut.c error: graph has multiple components, bug in find.c (n->from_id=%d)!\n", n->from_id);
+					bad_gr = 1;
+				}
+				continue;
+			}
+			from->edges++;
+			if (from->edges > maxedges)
+				maxedges = from->edges;
+		}
+	}
+
+
+	S = NULL;
+	T = NULL;
+	for (n = short_conns; n != NULL; n = n->next) {
+		void *spare = ((pcb_any_obj_t *) n->to)->ratconn;
+
+		if (spare != NULL) {
+			void *net = &(((pcb_lib_menu_t *) spare)->Name[2]);
+			debprintf(" net=%s\n", net);
+			if (S == NULL) {
+				debprintf(" -> became S\n");
+				S = net;
+			}
+			else if ((T == NULL) && (net != S)) {
+				debprintf(" -> became T\n");
+				T = net;
+			}
+
+			if (net == S)
+				gr_add_(g, n->gid, 0, 100000);
+			else if (net == T)
+				gr_add_(g, n->gid, 1, 100000);
+		}
+		/* if we have a from object, look it up and make a connection between the two gids */
+		if (n->from_id >= 0) {
+			int weight;
+			short_conn_t *from = lut_by_oid[n->from_id];
+
+			from = lut_by_oid[n->from_id];
+			/* weight: 1 for connections we can break, large value for connections we shall not break */
+			if ((n->type == PCB_FCT_COPPER) || (n->type == PCB_FCT_START)) {
+				/* connection to a pin/pad is slightly stronger than the
+				   strongest obj-obj conn; obj-obj conns are weaker at junctions where many
+				   objects connect */
+				if ((n->from_type == PCB_OBJ_PSTK) || (n->to_type == PCB_OBJ_PSTK))
+					weight = maxedges * 2 + 2;
+				else
+					weight = maxedges * 2 - n->edges - from->edges + 1;
+			}
+			else
+				weight = 10000;
+			if (from != NULL) {
+				gr_add_(g, n->gid, from->gid, weight);
+				debprintf(" CONN %d %d\n", n->gid, from->gid);
+			}
+		}
+	}
+
+/*#define MINCUT_DRAW*/
+#ifdef MINCUT_DRAW
+	{
+		static int drw = 0;
+		char gfn[256];
+		drw++;
+		sprintf(gfn, "A_%d_a", drw);
+		debprintf("gfn=%s\n", gfn);
+		gr_draw(g, gfn, "png");
+	}
+#endif
+
+	if (!bad_gr) {
+		solution = solve(g, pcb_gui->progress);
+
+		if (solution != NULL) {
+			debprintf("Would cut:\n");
+			for (i = 0; solution[i] != -1; i++) {
+				short_conn_t *s;
+				debprintf("%d:", i);
+				s = lut_by_gid[solution[i]];
+				debprintf("%d %p", solution[i], (void *)s);
+				if (s != NULL) {
+					PCB_FLAG_SET(PCB_FLAG_WARN, s->to);
+					debprintf("  -> %d", s->to->ID);
+				}
+				debprintf("\n");
+			}
+
+			free(solution);
+		}
+		else {
+			fprintf(stderr, "mincut didn't find a solution, falling back to the old warn\n");
+			bad_gr = 1;
+		}
+	}
+	free(lut_by_oid);
+	free(lut_by_gid);
+
+	for (n = short_conns; n != NULL; n = next) {
+		next = n->next;
+		free(n);
+	}
+
+
+	pcb_reset_found_lines_polys(pcb_false);
+	pcb_reset_found_pins_vias_pads(pcb_false);
+	pcb_restore_find_flag();
+
+	for(i = 0; i < g->n; i++)
+		free(g->node2name[i]);
+	free(g->node2name);
+	gr_free(g);
+
+	pcb_find_callback = old_cb;
+	return bad_gr;
+}
+
+typedef struct pinpad_s pinpad_t;
+struct pinpad_s {
+	int ignore;										/* if 1, changed our mind, do not check */
+	pcb_any_obj_t *term;
+	const char *with_net;					/* the name of the net this pin/pad is in short with */
+	pinpad_t *next;
+};
+
+static pinpad_t *shorts = NULL;
+
+void rat_found_short(pcb_any_obj_t *term, const char *with_net)
+{
+	pinpad_t *pp;
+	pp = calloc(sizeof(pinpad_t), 1);
+	pp->term = term;
+	pp->with_net = with_net;
+	pp->next = shorts;
+	shorts = pp;
+}
+
+void rat_proc_shorts(void)
+{
+	pinpad_t *n, *i, *next;
+	int bad_gr = 0;
+	for (n = shorts; n != NULL; n = next) {
+		next = n->next;
+
+		PCB_FLAG_SET(PCB_FLAG_WARN, n->term);
+
+		/* run only if net is not ignored */
+		if ((!bad_gr) && (proc_short(n->term, n->ignore) != 0)) {
+			fprintf(stderr, "Can't run mincut :(\n");
+			bad_gr = 1;
+		}
+
+		if (!bad_gr) {
+			/* check if the rest of the shorts affect the same nets - ignore them if so */
+			for (i = n->next; i != NULL; i = i->next) {
+				pcb_lib_menu_t *spn, *spi;
+				spn = n->term->ratconn;
+				spi = i->term->ratconn;
+
+				if ((spn == NULL) || (spi == NULL))
+					continue;
+
+				/* can compare by pointer - names are never pcb_strdup()'d */
+				if ((&spn->Name[2] == i->with_net) || (&spi->Name[2] == n->with_net))
+					i->ignore = 1;
+			}
+		}
+		free(n);
+	}
+	shorts = NULL;
+}
+
+int pplg_check_ver_mincut(int ver_needed) { return 0; }
+
+void pplg_uninit_mincut(void)
+{
+	conf_unreg_fields("plugins/mincut/");
+}
+
+#include "stub_mincut.h"
+int pplg_init_mincut(void)
+{
+	PCB_API_CHK_VER;
+	pcb_stub_rat_found_short = rat_found_short;
+	pcb_stub_rat_proc_shorts = rat_proc_shorts;
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_mincut, field,isarray,type_name,cpath,cname,desc,flags);
+#include "rats_mincut_conf_fields.h"
+	return 0;
+}
Index: tags/2.0.1/src_plugins/mincut/rats_mincut_conf.h
===================================================================
--- tags/2.0.1/src_plugins/mincut/rats_mincut_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/mincut/rats_mincut_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_MINCUT_CONF_H
+#define PCB_MINCUT_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct mincut {
+			CFT_BOOLEAN enable;         /* Enable calculating mincut on shorts (rats_mincut.c) when non-zero */
+		} mincut;
+	} plugins;
+} conf_mincut_t;
+
+#endif
Index: tags/2.0.1/src_plugins/oldactions/Makefile
===================================================================
--- tags/2.0.1/src_plugins/oldactions/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/oldactions/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_oldactions
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/oldactions/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/oldactions/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/oldactions/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {oldactions}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/oldactions/oldactions.o @]
+
+switch /local/pcb/oldactions/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/oldactions/oldactions.c
===================================================================
--- tags/2.0.1/src_plugins/oldactions/oldactions.c	(nonexistent)
+++ tags/2.0.1/src_plugins/oldactions/oldactions.c	(revision 18980)
@@ -0,0 +1,471 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "conf.h"
+#include "data.h"
+#include "event.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+#include "plug_footprint.h"
+#include "obj_subc.h"
+#include "macro.h"
+#include "compat_misc.h"
+#include "netlist.h"
+
+static void conf_toggle(conf_role_t role, const char *path)
+{
+	conf_native_t *n = conf_get_field(path);
+	if (n == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Error: can't find config node %s to toggle\n", path);
+		return;
+	}
+	if (n->type != CFN_BOOLEAN) {
+		pcb_message(PCB_MSG_ERROR, "Error: config node %s is not a boolean, can't toggle\n", path);
+		return;
+	}
+
+	conf_set(role, path, -1, n->val.boolean[0] ? "0" : "1", POL_OVERWRITE);
+}
+
+/* -------------------------------------------------------------------------- */
+
+static const char pcb_acts_DumpLibrary[] = "DumpLibrary()";
+
+static const char pcb_acth_DumpLibrary[] = "Display the entire contents of the libraries.";
+
+/* %start-doc actions DumpLibrary
+
+
+%end-doc */
+static void ind(int level)
+{
+	static char inds[] = "                                                                               ";
+
+	if (level > sizeof(inds)-1)
+		return;
+	inds[level] = '\0';
+	printf("%s", inds);
+	inds[level] = ' ';
+}
+
+static void dump_lib_any(int level, pcb_fplibrary_t *l);
+
+static void dump_lib_dir(int level, pcb_fplibrary_t *l)
+{
+	pcb_cardinal_t n;
+
+	ind(level);
+	printf("%s/\n", l->name);
+	for(n = 0; n < vtlib_len(&l->data.dir.children); n++)
+		dump_lib_any(level+1, l->data.dir.children.array+n);
+}
+
+static void dump_lib_fp(int level, pcb_fplibrary_t *l)
+{
+	ind(level);
+	printf("%s", l->name);
+	switch(l->data.fp.type) {
+		case PCB_FP_INVALID:      printf(" type(INVALID)"); break;
+		case PCB_FP_DIR:          printf(" type(DIR)"); break;
+		case PCB_FP_FILE:         printf(" type(file)"); break;
+		case PCB_FP_PARAMETRIC:   printf(" type(parametric)"); break;
+	}
+	printf(" loc_info(%s)\n", l->data.fp.loc_info);
+}
+
+static void dump_lib_any(int level, pcb_fplibrary_t *l)
+{
+	switch(l->type) {
+		case LIB_INVALID:     printf("??\n"); break;
+		case LIB_DIR:         dump_lib_dir(level, l); break;
+		case LIB_FOOTPRINT:   dump_lib_fp(level, l); break;
+	}
+}
+
+
+static fgw_error_t pcb_act_DumpLibrary(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	dump_lib_any(0, &pcb_library);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ---------------------------------------------------------------------------
+ * no operation, just for testing purposes
+ * syntax: Bell(volume)
+ */
+static const char pcb_acts_Bell[] = "Bell()";
+
+static const char pcb_acth_Bell[] = "Attempt to produce audible notification (e.g. beep the speaker).";
+
+static fgw_error_t pcb_act_Bell(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_gui->beep();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_debug[] = "Debug(...)";
+
+static const char pcb_acth_debug[] = "Debug action.";
+
+/* %start-doc actions Debug
+
+This action exists to help debug scripts; it simply prints all its
+arguments to stdout.
+
+%end-doc */
+
+static const char pcb_acts_debugxy[] = "DebugXY(...)";
+
+static const char pcb_acth_debugxy[] = "Debug action, with coordinates";
+
+/* %start-doc actions DebugXY
+
+Like @code{Debug}, but requires a coordinate.  If the user hasn't yet
+indicated a location on the board, the user will be prompted to click
+on one.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Debug(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	int i;
+	printf("Debug:");
+	for (i = 1; i < argc; i++) {
+		const char *s;
+		PCB_ACT_CONVARG(i, FGW_STR, debugxy, s = argv[i].val.str);
+		printf(" [%d] `%s'", i, s);
+	}
+	pcb_hid_get_coords("Click X,Y for Debug", &x, &y, 0);
+	pcb_printf(" x,y %$mD\n", x, y);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_return[] = "Return(0|1)";
+
+static const char pcb_acth_return[] = "Simulate a passing or failing action.";
+
+/* %start-doc actions Return
+
+This is for testing.  If passed a 0, does nothing and succeeds.  If
+passed a 1, does nothing but pretends to fail.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Return(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int rv;
+	PCB_ACT_CONVARG(1, FGW_INT, return, rv = argv[1].val.nat_int);
+	PCB_ACT_IRES(rv);
+	return 0;
+}
+
+
+static const char pcb_acts_djopt_sao[] = "OptAutoOnly()";
+
+static const char pcb_acth_djopt_sao[] = "Toggles the optimize-only-autorouted flag.";
+
+/* %start-doc actions OptAutoOnly
+
+The original purpose of the trace optimizer was to clean up the traces
+created by the various autorouters that have been used with PCB.  When
+a board has a mix of autorouted and carefully hand-routed traces, you
+don't normally want the optimizer to move your hand-routed traces.
+But, sometimes you do.  By default, the optimizer only optimizes
+autorouted traces.  This action toggles that setting, so that you can
+optimize hand-routed traces also.
+
+%end-doc */
+
+
+
+fgw_error_t pcb_act_djopt_set_auto_only(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	conf_toggle(CFR_DESIGN, "plugins/djopt/auto_only");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ************************************************************ */
+
+static const char pcb_acts_toggle_vendor[] = "ToggleVendor()";
+
+static const char pcb_acth_toggle_vendor[] = "Toggles the state of automatic drill size mapping.";
+
+/* %start-doc actions ToggleVendor
+
+@cindex vendor map
+@cindex vendor drill table
+@findex ToggleVendor()
+
+When drill mapping is enabled, new instances of pins and vias will
+have their drill holes mapped to one of the allowed drill sizes
+specified in the currently loaded vendor drill table.  To enable drill
+mapping, a vendor lihata file containing a drill table must be
+loaded first.
+
+%end-doc */
+
+fgw_error_t pcb_act_ToggleVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	conf_toggle(CFR_DESIGN, "plugins/vendor/enable");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ************************************************************ */
+
+static const char pcb_acts_enable_vendor[] = "EnableVendor()";
+
+static const char pcb_acth_enable_vendor[] = "Enables automatic drill size mapping.";
+
+/* %start-doc actions EnableVendor
+
+@cindex vendor map
+@cindex vendor drill table
+@findex EnableVendor()
+
+When drill mapping is enabled, new instances of pins and vias will
+have their drill holes mapped to one of the allowed drill sizes
+specified in the currently loaded vendor drill table.  To enable drill
+mapping, a vendor lihata file containing a drill table must be
+loaded first.
+
+%end-doc */
+
+fgw_error_t pcb_act_EnableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "1", POL_OVERWRITE);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ************************************************************ */
+
+static const char pcb_acts_disable_vendor[] = "DisableVendor()";
+
+static const char pcb_acth_disable_vendor[] = "Disables automatic drill size mapping.";
+
+/* %start-doc actions DisableVendor
+
+@cindex vendor map
+@cindex vendor drill table
+@findex DisableVendor()
+
+When drill mapping is enabled, new instances of pins and vias will
+have their drill holes mapped to one of the allowed drill sizes
+specified in the currently loaded vendor drill table.
+
+%end-doc */
+
+fgw_error_t pcb_act_DisableVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "0", POL_OVERWRITE);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+fgw_error_t pcb_act_ListRotations(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		double rot;
+		const char *refdes = PCB_UNKNOWN(subc->refdes);
+		if (pcb_subc_get_rotation(subc, &rot) == 0)
+			pcb_message(PCB_MSG_INFO, "%f %s\n", rot, refdes);
+		else
+			pcb_message(PCB_MSG_INFO, "<unknown> %s\n", refdes);
+	}
+	PCB_END_LOOP;
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_PCBChanged[] = "PCBChanged([revert])";
+static const char pcb_acth_PCBChanged[] =
+	"Tells the GUI that the whole PCB has changed. The optional \"revert\""
+	"parameter can be used as a hint to the GUI that the same design is being"
+	"reloaded, and that it might keep some viewport settings";
+static fgw_error_t pcb_act_PCBChanged(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *rv = NULL;
+	PCB_ACT_IRES(0);
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, PCBChanged, rv = argv[1].val.str);
+	pcb_board_changed((rv != NULL) && (pcb_strcasecmp(rv, "revert") == 0));
+	return 0;
+}
+
+static const char pcb_acts_NetlistChanged[] = "NetlistChanged()";
+static const char pcb_acth_NetlistChanged[] = "Tells the GUI that the netlist has changed.";
+static fgw_error_t pcb_act_NetlistChanged(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_netlist_changed(0);
+	return 0;
+}
+
+
+static const char pcb_acts_RouteStylesChanged[] = "RouteStylesChanged()";
+static const char pcb_acth_RouteStylesChanged[] = "Tells the GUI that the routing styles have changed.";
+static fgw_error_t pcb_act_RouteStylesChanged(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL);
+	return 0;
+}
+
+static const char pcb_acts_LibraryChanged[] = "LibraryChanged()";
+static const char pcb_acth_LibraryChanged[] = "Tells the GUI that the libraries have changed.";
+static fgw_error_t pcb_act_LibraryChanged(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_event(PCB_EVENT_LIBRARY_CHANGED, NULL);
+	return 0;
+}
+
+/*** deprecated ***/
+
+static fgw_error_t pcb_act_ToggleHideName(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ToggleHideName: deprecated feature removed with subcircuits; just delete\nthe text object if it should not be on the silk of the final board.\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_MinMaskGap(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "MinMaskGap: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ChangeHole(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ChangeHole: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ChangePaste(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ChangePaste: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ChangeSquare(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ChangeSquare: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_SetSquare(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "SetSquare: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ClearSquare(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ClearSquare: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ChangeOctagon(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ChangeOctagon: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_SetOctagon(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "SetOctagon: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+static fgw_error_t pcb_act_ClearOctagon(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_ERROR, "ClearOctagon: deprecated feature; use padstackedit() instead\n");
+	return 1;
+}
+
+pcb_action_t oldactions_action_list[] = {
+	{"DumpLibrary", pcb_act_DumpLibrary, pcb_acth_DumpLibrary, pcb_acts_DumpLibrary},
+	{"Bell", pcb_act_Bell, pcb_acth_Bell, pcb_acts_Bell},
+	{"Debug", pcb_act_Debug, pcb_acth_debug, pcb_acts_debug},
+	{"DebugXY", pcb_act_Debug, pcb_acth_debugxy, pcb_acts_debugxy},
+	{"Return", pcb_act_Return, pcb_acth_return, pcb_acts_return},
+	{"OptAutoOnly", pcb_act_djopt_set_auto_only, pcb_acth_djopt_sao, pcb_acts_djopt_sao},
+	{"ToggleVendor", pcb_act_ToggleVendor, pcb_acth_toggle_vendor, pcb_acts_toggle_vendor},
+	{"EnableVendor", pcb_act_EnableVendor, pcb_acth_enable_vendor, pcb_acts_enable_vendor},
+	{"DisableVendor", pcb_act_DisableVendor, pcb_acth_disable_vendor, pcb_acts_disable_vendor},
+	{"ListRotations", pcb_act_ListRotations, 0, 0},
+	{"PCBChanged", pcb_act_PCBChanged, pcb_acth_PCBChanged, pcb_acts_PCBChanged},
+	{"NetlistChanged", pcb_act_NetlistChanged, pcb_acth_NetlistChanged, pcb_acts_NetlistChanged},
+	{"RouteStylesChanged", pcb_act_RouteStylesChanged, pcb_acth_RouteStylesChanged, pcb_acts_RouteStylesChanged},
+	{"LibraryChanged", pcb_act_LibraryChanged, pcb_acth_LibraryChanged, pcb_acts_LibraryChanged},
+
+	/* deprecated actions */
+	{"ToggleHideName", pcb_act_ToggleHideName, 0, 0},
+	{"MinMaskGap", pcb_act_MinMaskGap, 0, 0},
+	{"ChangeHole", pcb_act_ChangeHole, 0, 0},
+	{"ChangePaste", pcb_act_ChangePaste, 0, 0},
+	{"ChangeSquare", pcb_act_ChangeSquare, 0, 0},
+	{"ChangeOctagon", pcb_act_ChangeOctagon, 0, 0},
+	{"ClearSquare", pcb_act_ClearSquare, 0, 0},
+	{"ClearOctagon", pcb_act_ClearOctagon, 0, 0},
+	{"SetSquare", pcb_act_SetSquare, 0, 0},
+	{"SetOctagon", pcb_act_SetOctagon, 0, 0}
+};
+
+static const char *oldactions_cookie = "oldactions plugin";
+
+PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie)
+
+int pplg_check_ver_oldactions(int ver_needed) { return 0; }
+
+void pplg_uninit_oldactions(void)
+{
+	pcb_remove_actions_by_cookie(oldactions_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_oldactions(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(oldactions_action_list, oldactions_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/oldactions/oldactions.pup
===================================================================
--- tags/2.0.1/src_plugins/oldactions/oldactions.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/oldactions/oldactions.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short old/obsolete actions
+$long Random collection of old/obsolete actions. Bell(): audible feedback, DumpLibrary(): print footprint library on stdout, a set of debug actions useful for writing pcb scripts: Debug(), DebugXY(), Return(). Old plugin actions to toggle or set settings that are now accessible via the unified config system (vendordrill, djopt)
+$state works
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/plugins_ALL.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/plugins_ALL.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/plugins_ALL.tmpasm	(revision 18980)
@@ -0,0 +1,99 @@
+# List of all plugins - generated by make map_plugins - do NOT edit
+include {../src_plugins/acompnet/Plug.tmpasm}
+include {../src_plugins/autocrop/Plug.tmpasm}
+include {../src_plugins/autoplace/Plug.tmpasm}
+include {../src_plugins/autoroute/Plug.tmpasm}
+include {../src_plugins/boardflip/Plug.tmpasm}
+include {../src_plugins/cam/Plug.tmpasm}
+include {../src_plugins/ddraft/Plug.tmpasm}
+include {../src_plugins/diag/Plug.tmpasm}
+include {../src_plugins/dialogs/Plug.tmpasm}
+include {../src_plugins/distalign/Plug.tmpasm}
+include {../src_plugins/distaligntext/Plug.tmpasm}
+include {../src_plugins/djopt/Plug.tmpasm}
+include {../src_plugins/draw_csect/Plug.tmpasm}
+include {../src_plugins/draw_fab/Plug.tmpasm}
+include {../src_plugins/draw_fontsel/Plug.tmpasm}
+include {../src_plugins/expfeat/Plug.tmpasm}
+include {../src_plugins/export_bboard/Plug.tmpasm}
+include {../src_plugins/export_bom/Plug.tmpasm}
+include {../src_plugins/export_dsn/Plug.tmpasm}
+include {../src_plugins/export_dxf/Plug.tmpasm}
+include {../src_plugins/export_fidocadj/Plug.tmpasm}
+include {../src_plugins/export_gcode/Plug.tmpasm}
+include {../src_plugins/export_gerber/Plug.tmpasm}
+include {../src_plugins/export_ipcd356/Plug.tmpasm}
+include {../src_plugins/export_lpr/Plug.tmpasm}
+include {../src_plugins/export_nelma/Plug.tmpasm}
+include {../src_plugins/export_openems/Plug.tmpasm}
+include {../src_plugins/export_openscad/Plug.tmpasm}
+include {../src_plugins/export_png/Plug.tmpasm}
+include {../src_plugins/export_ps/Plug.tmpasm}
+include {../src_plugins/export_stat/Plug.tmpasm}
+include {../src_plugins/export_svg/Plug.tmpasm}
+include {../src_plugins/export_test/Plug.tmpasm}
+include {../src_plugins/export_xy/Plug.tmpasm}
+include {../src_plugins/extedit/Plug.tmpasm}
+include {../src_plugins/fontmode/Plug.tmpasm}
+include {../src_plugins/fp_board/Plug.tmpasm}
+include {../src_plugins/fp_fs/Plug.tmpasm}
+include {../src_plugins/fp_wget/Plug.tmpasm}
+include {../src_plugins/gpmi/Plug.tmpasm}
+include {../src_plugins/hid_batch/Plug.tmpasm}
+include {../src_plugins/hid_gtk2_gdk/Plug.tmpasm}
+include {../src_plugins/hid_gtk2_gl/Plug.tmpasm}
+include {../src_plugins/hid_gtk3_cairo/Plug.tmpasm}
+include {../src_plugins/hid_gtk3_gl/Plug.tmpasm}
+include {../src_plugins/hid_lesstif/Plug.tmpasm}
+include {../src_plugins/hid_remote/Plug.tmpasm}
+include {../src_plugins/import_dsn/Plug.tmpasm}
+include {../src_plugins/import_edif/Plug.tmpasm}
+include {../src_plugins/import_fpcb_nl/Plug.tmpasm}
+include {../src_plugins/import_hpgl/Plug.tmpasm}
+include {../src_plugins/import_ipcd356/Plug.tmpasm}
+include {../src_plugins/import_ltspice/Plug.tmpasm}
+include {../src_plugins/import_mentor_sch/Plug.tmpasm}
+include {../src_plugins/import_mucs/Plug.tmpasm}
+include {../src_plugins/import_netlist/Plug.tmpasm}
+include {../src_plugins/import_sch/Plug.tmpasm}
+include {../src_plugins/import_tinycad/Plug.tmpasm}
+include {../src_plugins/io_autotrax/Plug.tmpasm}
+include {../src_plugins/io_eagle/Plug.tmpasm}
+include {../src_plugins/io_hyp/Plug.tmpasm}
+include {../src_plugins/io_kicad/Plug.tmpasm}
+include {../src_plugins/io_kicad_legacy/Plug.tmpasm}
+include {../src_plugins/io_lihata/Plug.tmpasm}
+include {../src_plugins/io_mentor_cell/Plug.tmpasm}
+include {../src_plugins/io_pcb/Plug.tmpasm}
+include {../src_plugins/io_tedax/Plug.tmpasm}
+include {../src_plugins/jostle/Plug.tmpasm}
+include {../src_plugins/lib_compat_help/Plug.tmpasm}
+include {../src_plugins/lib_gensexpr/Plug.tmpasm}
+include {../src_plugins/lib_gtk_common/Plug.tmpasm}
+include {../src_plugins/lib_gtk_config/Plug.tmpasm}
+include {../src_plugins/lib_gtk_hid/Plug.tmpasm}
+include {../src_plugins/lib_hid_common/Plug.tmpasm}
+include {../src_plugins/lib_hid_gl/Plug.tmpasm}
+include {../src_plugins/lib_legacy_func/Plug.tmpasm}
+include {../src_plugins/lib_netmap/Plug.tmpasm}
+include {../src_plugins/lib_polyhelp/Plug.tmpasm}
+include {../src_plugins/loghid/Plug.tmpasm}
+include {../src_plugins/millpath/Plug.tmpasm}
+include {../src_plugins/mincut/Plug.tmpasm}
+include {../src_plugins/oldactions/Plug.tmpasm}
+include {../src_plugins/polycombine/Plug.tmpasm}
+include {../src_plugins/polystitch/Plug.tmpasm}
+include {../src_plugins/propedit/Plug.tmpasm}
+include {../src_plugins/puller/Plug.tmpasm}
+include {../src_plugins/query/Plug.tmpasm}
+include {../src_plugins/renumber/Plug.tmpasm}
+include {../src_plugins/report/Plug.tmpasm}
+include {../src_plugins/rubberband_orig/Plug.tmpasm}
+include {../src_plugins/script/Plug.tmpasm}
+include {../src_plugins/shand_cmd/Plug.tmpasm}
+include {../src_plugins/shape/Plug.tmpasm}
+include {../src_plugins/sketch_route/Plug.tmpasm}
+include {../src_plugins/smartdisperse/Plug.tmpasm}
+include {../src_plugins/stroke/Plug.tmpasm}
+include {../src_plugins/teardrops/Plug.tmpasm}
+include {../src_plugins/vendordrill/Plug.tmpasm}
Index: tags/2.0.1/src_plugins/polycombine/Makefile
===================================================================
--- tags/2.0.1/src_plugins/polycombine/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/polycombine/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_polycombine
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/polycombine/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/polycombine/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/polycombine/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {polycombine}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/polycombine/polycombine.o @]
+
+switch /local/pcb/polycombine/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/polycombine/polycombine.c
===================================================================
--- tags/2.0.1/src_plugins/polycombine/polycombine.c	(nonexistent)
+++ tags/2.0.1/src_plugins/polycombine/polycombine.c	(revision 18980)
@@ -0,0 +1,360 @@
+/*
+ * PolyCombine plug-in for PCB.
+ *
+ * Copyright (C) 2010 Peter Clifton <pcjc2@cam.ac.uk>
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ *
+ * Usage: PolyCombine()
+ *
+ * The selected polygons are combined together according to the ordering
+ * of their points.
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "macro.h"
+#include "remove.h"
+#include "hid.h"
+#include "error.h"
+#include "rtree.h"
+#include "polygon.h"
+#include "polyarea.h"
+#include "assert.h"
+#include "flag_str.h"
+#include "find.h"
+#include "draw.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+#include "obj_poly.h"
+
+static pcb_polyarea_t *original_poly(pcb_poly_t *p, pcb_bool *forward)
+{
+	pcb_pline_t *contour = NULL;
+	pcb_polyarea_t *np = NULL;
+	pcb_cardinal_t n;
+	pcb_vector_t v;
+	int hole = 0;
+
+	*forward = pcb_true;
+
+	if ((np = pcb_polyarea_create()) == NULL)
+		return NULL;
+
+	/* first make initial polygon contour */
+	for (n = 0; n < p->PointN; n++) {
+		/* No current contour? Make a new one starting at point */
+		/*   (or) Add point to existing contour */
+
+		v[0] = p->Points[n].X;
+		v[1] = p->Points[n].Y;
+		if (contour == NULL) {
+			if ((contour = pcb_poly_contour_new(v)) == NULL)
+				return NULL;
+		}
+		else {
+			pcb_poly_vertex_include(contour->head.prev, pcb_poly_node_create(v));
+		}
+
+		/* Is current point last in contour? If so process it. */
+		if (n == p->PointN - 1 || (hole < p->HoleIndexN && n == p->HoleIndex[hole] - 1)) {
+			pcb_poly_contour_pre(contour, pcb_true);
+
+			/* Log the direction in which the outer contour was specified */
+			if (hole == 0)
+				*forward = (contour->Flags.orient == PCB_PLF_DIR);
+
+			/* make sure it is a positive contour (outer) or negative (hole) */
+			if (contour->Flags.orient != (hole ? PCB_PLF_INV : PCB_PLF_DIR))
+				pcb_poly_contour_inv(contour);
+			assert(contour->Flags.orient == (hole ? PCB_PLF_INV : PCB_PLF_DIR));
+
+			pcb_polyarea_contour_include(np, contour);
+			contour = NULL;
+			assert(pcb_poly_valid(np));
+
+			hole++;
+		}
+	}
+	return np;
+}
+
+typedef struct poly_tree poly_tree;
+
+struct poly_tree {
+	pcb_poly_t *polygon;
+	pcb_bool forward;
+	pcb_polyarea_t *polyarea;
+	poly_tree *parent;
+	poly_tree *child;
+	poly_tree *prev;
+	poly_tree *next;
+};
+
+/*
+ *                      ______
+ *  ___________________|_  P6 |             +P1 ____ +P6
+ * | P1                | |    |              |
+ * |   _____      ____ |_|____|             -P2 ____ -P4 ____ -P5
+ * |  |P2   |    |P5  |  |                   |
+ * |  | []  |    |____|  |                  +P3
+ * |  |  P3 |            |
+ * |  |_____|            |
+ * |                     |
+ * |          ___        |
+ * |         |P4 |       |
+ * |         |___|       |
+ * |                     |
+ * |_____________________|
+ *
+ * As we encounter each polygon, it gets a record. We need to check
+ * whether it contains any of the polygons existing in our tree. If
+ * it does, it will become the parent of them. (Check breadth first).
+ *
+ * When processing, work top down (breadth first), although if the
+ * contours can be assumed not to overlap, we can drill down in this
+ * order: P1, P2, P3, P4, P5, P6.
+ */
+static pcb_bool PolygonContainsPolygon(pcb_polyarea_t *outer, pcb_polyarea_t *inner)
+{
+/*  int contours_isect;*/
+	/* Should check outer contours don't intersect? */
+/*  contours_isect = pcb_polyarea_touching(outer, inner);*/
+	/* Cheat and assume simple single contour polygons for now */
+/*  return contours_isect ?
+           0 : pcb_poly_contour_in_contour(outer->contours, inner->contours);*/
+	return pcb_poly_contour_in_contour(outer->contours, inner->contours);
+}
+
+
+static poly_tree *insert_node_recursive(poly_tree * start_point, poly_tree * to_insert)
+{
+	poly_tree *cur_node, *next = NULL;
+/*  bool to_insert_isects_cur_node;    Intersection */
+	pcb_bool to_insert_contains_cur_node;	/* Containment */
+	pcb_bool cur_node_contains_to_insert;	/* Containment */
+	pcb_bool placed_to_insert = pcb_false;
+
+	poly_tree *return_root = start_point;
+
+	if (start_point == NULL) {
+/*      printf ("start_point is NULL, so returning to_insert\n");
+		to_insert->parent = !!; UNDEFINED*/
+		return to_insert;
+	}
+
+	/* Investigate the start point and its peers first */
+	for (cur_node = start_point; cur_node != NULL; cur_node = next) {
+		next = cur_node->next;
+
+/*      to_insert_isects_cur_node = pcb_is_poly_in_poly(to_insert->polygon, cur_node->polygon);*/
+		to_insert_contains_cur_node = PolygonContainsPolygon(to_insert->polyarea, cur_node->polyarea);
+
+#if 0
+		printf("Inspecting polygon %ld %s, curnode is %ld %s: to_insert_isects_cur_node = %d, to_insert_contains_cur_node = %i\n",
+					 to_insert->polygon->ID,
+					 to_insert->forward ? "FWD" : "BWD",
+					 cur_node->polygon->ID, cur_node->forward ? "FWD" : "BWD", to_insert_isects_cur_node, to_insert_contains_cur_node);
+
+		if (to_insert_isects_cur_node) {	/* Place as peer of this node? */
+		}
+#endif
+
+		if (to_insert_contains_cur_node) {	/* Should be a parent of this node */
+			/* Remove cur_node from its peers */
+			if (cur_node->prev)
+				cur_node->prev->next = cur_node->next;
+			if (cur_node->next)
+				cur_node->next->prev = cur_node->prev;
+
+			/* If we've not yet got a home, insert the to_insert node where cur_node was previously */
+			if (!placed_to_insert) {
+				to_insert->parent = cur_node->parent;
+				to_insert->next = cur_node->next;
+				to_insert->prev = cur_node->prev;
+				if (to_insert->prev)
+					to_insert->prev->next = to_insert;
+				if (to_insert->next)
+					to_insert->next->prev = to_insert;
+				placed_to_insert = pcb_true;
+
+				if (cur_node == start_point)
+					return_root = to_insert;
+			}
+
+			/* Prepend cur_node to our list of children */
+			cur_node->parent = to_insert;
+
+			cur_node->prev = NULL;
+			cur_node->next = to_insert->child;
+			if (to_insert->child)
+				to_insert->child->prev = cur_node;
+			to_insert->child = cur_node;
+
+		}
+	}
+
+	if (placed_to_insert) {
+/*      printf ("Returning new root %ld\n", return_root->polygon->ID);*/
+		return return_root;
+	}
+/*    return (to_insert->parent == NULL) ? to_insert : to_insert->parent;*/
+
+	/* Ok, so we still didn't find anywhere which the to_insert contour contained,
+	 * we need to start looking at the children of the start_point and its peers.
+	 */
+/*  printf ("Looking at child nodes of the start_point\n");*/
+
+	/* Investigate the start point and its peers first */
+	for (cur_node = start_point; cur_node != NULL; cur_node = next) {
+		next = cur_node->next;
+
+		cur_node_contains_to_insert = PolygonContainsPolygon(cur_node->polyarea, to_insert->polyarea);
+
+#if 0
+		printf("Inspecting polygon %ld, curnode is %ld: cur_node_contains_to_insert = %d\n",
+					 to_insert->polygon->ID, cur_node->polygon->ID, cur_node_contains_to_insert);
+#endif
+
+		/* Need to look at the child, ONLY if we know it engulfs our to_insert polygon */
+		if (cur_node_contains_to_insert) {
+			/* Can't set the parent within the call, so: */
+			to_insert->parent = cur_node;
+			cur_node->child = insert_node_recursive(cur_node->child, to_insert);
+			return start_point;
+			/*return cur_node->parent;*/
+		}
+	}
+
+/*  if (!placed_to_insert)*/
+	/* prepend to_insert polygon to peer of start_point ? */
+/*  printf ("Prepending as peer to start_poly\n");*/
+	to_insert->parent = start_point->parent;
+	to_insert->prev = NULL;
+	to_insert->next = start_point;
+	to_insert->next->prev = to_insert;
+
+	return to_insert;
+}
+
+static pcb_polyarea_t *compute_polygon_recursive(poly_tree * root, pcb_polyarea_t * accumulate)
+{
+	pcb_polyarea_t *res;
+	poly_tree *cur_node;
+	for (cur_node = root; cur_node != NULL; cur_node = cur_node->next) {
+		/* Process this element */
+/*      printf ("Processing node %ld %s\n", cur_node->polygon->ID, cur_node->forward ? "FWD" : "BWD");*/
+		pcb_polyarea_boolean_free(accumulate, cur_node->polyarea, &res, cur_node->forward ? PCB_PBO_UNITE : PCB_PBO_SUB);
+		accumulate = res;
+
+		/* And its children if it has them */
+		if (cur_node->child) {
+/*          printf ("Processing children\n");*/
+			accumulate = compute_polygon_recursive(cur_node->child, accumulate);
+		}
+	}
+	return accumulate;
+}
+
+static fgw_error_t pcb_act_polycombine(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_polyarea_t *rs;
+	pcb_bool forward;
+	pcb_polyarea_t *np;
+/*  bool outer;
+    pcb_polyarea_t *pa;
+    pcb_pline_t *pline;
+    pcb_vnode_t *node;
+    pcb_poly_t *Polygon;*/
+	pcb_layer_t *Layer = NULL;
+	poly_tree *root = NULL;
+	poly_tree *this_node;
+
+	/* First pass to combine the forward and backward contours */
+	PCB_POLY_VISIBLE_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+			continue;
+
+		/* Pick the layer of the first polygon we find selected */
+		if (Layer == NULL)
+			Layer = layer;
+
+		/* Only combine polygons on the same layer */
+		if (Layer != layer)
+			continue;
+
+		np = original_poly(polygon, &forward);
+
+		/* Build a poly_tree record */
+		this_node = calloc(1, sizeof(poly_tree));
+		this_node->polygon = polygon;
+		this_node->forward = forward;
+		this_node->polyarea = np;
+
+		/* Check where we should place the node in the tree */
+		root = insert_node_recursive(root, this_node);
+
+		/*pcb_poly_remove(layer, polygon);*/
+	}
+	PCB_ENDALL_LOOP;
+
+	/* Now perform a traversal of the tree, computing a polygon */
+	rs = compute_polygon_recursive(root, NULL);
+
+	pcb_undo_save_serial();
+
+	/* Second pass to remove the input polygons */
+	PCB_POLY_VISIBLE_LOOP(PCB->Data);
+	{
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
+			continue;
+
+		/* Only combine polygons on the same layer */
+		if (Layer != layer)
+			continue;
+
+		pcb_poly_remove(layer, polygon);
+	}
+	PCB_ENDALL_LOOP;
+
+	/* Now de-construct the resulting polygon into raw PCB polygons */
+	pcb_poly_to_polygons_on_layer(PCB->Data, Layer, rs, pcb_strflg_board_s2f("clearpoly", NULL));
+	pcb_undo_restore_serial();
+	pcb_undo_inc_serial();
+	pcb_draw();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t polycombine_action_list[] = {
+	{"PolyCombine", pcb_act_polycombine, NULL, NULL}
+};
+
+char *polycombine_cookie = "polycombine plugin";
+
+PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie)
+
+int pplg_check_ver_polycombine(int ver_needed) { return 0; }
+
+void pplg_uninit_polycombine(void)
+{
+	pcb_remove_actions_by_cookie(polycombine_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_polycombine(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(polycombine_action_list, polycombine_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/polycombine/polycombine.pup
===================================================================
--- tags/2.0.1/src_plugins/polycombine/polycombine.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/polycombine/polycombine.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short combine selected polygons
+$long The selected polygons are combined together according to the ordering of their points.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/polystitch/Makefile
===================================================================
--- tags/2.0.1/src_plugins/polystitch/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/polystitch/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_polystitch
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/polystitch/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/polystitch/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/polystitch/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {polystitch}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/polystitch/polystitch.o @]
+
+switch /local/pcb/polystitch/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/polystitch/polystitch.c
===================================================================
--- tags/2.0.1/src_plugins/polystitch/polystitch.c	(nonexistent)
+++ tags/2.0.1/src_plugins/polystitch/polystitch.c	(revision 18980)
@@ -0,0 +1,146 @@
+/*
+ * PolyStitch plug-in for PCB.
+ *
+ * Copyright (C) 2010 DJ Delorie <dj@delorie.com>
+ *
+ * Licensed under the terms of the GNU General Public 
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ * Mostly rewritten for poly holes by Tibor 'Igor2' Palinkas in 2018.
+ *
+ * Original source: http://www.delorie.com/pcb/polystitch.c
+ *
+ * Usage: PolyStitch()
+ *
+ * The polygon under the cursor (based on closest-corner) is stitched
+ * together with the polygon surrounding it on the same layer.
+ * Use with pstoedit conversions where there's a "hole" in the shape -
+ * select the hole.
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "macro.h"
+#include "remove.h"
+#include "hid.h"
+#include "error.h"
+#include "rtree.h"
+#include "draw.h"
+#include "polygon.h"
+#include "plugins.h"
+#include "actions.h"
+#include "obj_poly.h"
+#include "obj_poly_draw.h"
+
+/* Given the X,Y, find the inmost (closest) polygon */
+static pcb_poly_t *find_crosshair_poly(pcb_coord_t x, pcb_coord_t y)
+{
+	double best = 0, dist;
+	pcb_poly_t *res = NULL;
+
+	PCB_POLY_VISIBLE_LOOP(PCB->Data);
+	{
+		/* layer, polygon */
+		PCB_POLY_POINT_LOOP(polygon);
+		{
+			/* point */
+			pcb_coord_t dx = x - point->X;
+			pcb_coord_t dy = y - point->Y;
+			dist = (double)dx * dx + (double)dy * dy;
+			if ((dist < best) || (res == NULL)) {
+				res = polygon;
+				best = dist;
+			}
+		}
+		PCB_END_LOOP;
+	}
+	PCB_ENDALL_LOOP;
+
+	if (res == NULL)
+		pcb_message(PCB_MSG_ERROR, "Cannot find any polygons");
+
+	return res;
+}
+
+/* Set outer_poly to the enclosing poly. We assume there's only one. */
+static pcb_poly_t *find_enclosing_poly(pcb_poly_t *inner_poly)
+{
+	pcb_layer_t *poly_layer = inner_poly->parent.layer;
+
+	PCB_POLY_LOOP(poly_layer);
+	{
+		if (polygon == inner_poly)
+			continue;
+		if (polygon->BoundingBox.X1 <= inner_poly->BoundingBox.X1
+				&& polygon->BoundingBox.X2 >= inner_poly->BoundingBox.X2
+				&& polygon->BoundingBox.Y1 <= inner_poly->BoundingBox.Y1 && polygon->BoundingBox.Y2 >= inner_poly->BoundingBox.Y2) {
+			return polygon;
+		}
+	}
+	PCB_END_LOOP;
+
+	pcb_message(PCB_MSG_ERROR, "Cannot find a polygon enclosing the one you selected");
+	return NULL;
+}
+
+
+static fgw_error_t pcb_act_polystitch(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t x, y;
+	pcb_poly_t *inner_poly, *outer_poly;
+
+	pcb_hid_get_coords("Select a corner on the inner polygon", &x, &y, 0);
+	inner_poly = find_crosshair_poly(x, y);
+
+	if (inner_poly) {
+		outer_poly = find_enclosing_poly(inner_poly);
+		if (outer_poly) {
+			pcb_cardinal_t n, end;
+
+			/* figure how many contour points the inner poly has (holes are going to be ignored) */
+			if (inner_poly->HoleIndexN > 0)
+				end = inner_poly->HoleIndex[0];
+			else
+				end = inner_poly->PointN;
+
+			/* convert the inner poly into a hole */
+			pcb_poly_hole_new(outer_poly);
+			for(n = 0; n < end; n++)
+				pcb_poly_point_new(outer_poly, inner_poly->Points[n].X, inner_poly->Points[n].Y);
+			pcb_poly_init_clip(PCB->Data, outer_poly->parent.layer, outer_poly);
+			pcb_poly_bbox(outer_poly);
+
+			pcb_poly_remove(inner_poly->parent.layer, inner_poly);
+		}
+	}
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t polystitch_action_list[] = {
+	{"PolyStitch", pcb_act_polystitch, NULL, NULL}
+};
+
+char *polystitch_cookie = "polystitch plugin";
+
+PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie)
+
+int pplg_check_ver_polystitch(int ver_needed) { return 0; }
+
+void pplg_uninit_polystitch(void)
+{
+	pcb_remove_actions_by_cookie(polystitch_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_polystitch(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(polystitch_action_list, polystitch_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/polystitch/polystitch.pup
===================================================================
--- tags/2.0.1/src_plugins/polystitch/polystitch.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/polystitch/polystitch.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short stitch polygon at cursor
+$long The polygon under the cursor (based on closest-corner) is stitched together with the polygon surrounding it on the same layer. Use with pstoedit conversions where there's a "hole" in the shape - select the hole.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/propedit/Makefile
===================================================================
--- tags/2.0.1/src_plugins/propedit/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_propedit
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/propedit/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/propedit/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {propedit}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/propedit/propedit.o $(PLUGDIR)/propedit/props.o $(PLUGDIR)/propedit/propsel.o @]
+
+switch /local/pcb/propedit/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/propedit/propedit.c
===================================================================
--- tags/2.0.1/src_plugins/propedit/propedit.c	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/propedit.c	(revision 18980)
@@ -0,0 +1,164 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <stdlib.h>
+#include "board.h"
+#include "data.h"
+#include "plugins.h"
+#include "config.h"
+#include "props.h"
+#include "propsel.h"
+#include "actions.h"
+#include "pcb-printf.h"
+#include "error.h"
+
+/* ************************************************************ */
+
+extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
+
+static const char pcb_acts_propedit[] = "propedit()";
+static const char pcb_acth_propedit[] = "Run the property editor";
+fgw_error_t pcb_act_propedit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pe_ctx_t ctx;
+	htsp_entry_t *pe;
+	pcb_layer_t *ly = NULL;
+	pcb_layergrp_t *lg = NULL;
+	pcb_layer_id_t lid;
+	pcb_layergrp_id_t gid;
+
+	PCB_ACT_IRES(1);
+
+	if ((pcb_gui == NULL) || (pcb_gui->propedit_start == NULL)) {
+		pcb_message(PCB_MSG_ERROR, "Error: there's no GUI or the active GUI can't edit properties.\n");
+		return 0;
+	}
+
+	ctx.core_props = pcb_props_init();
+	for(lid = 0; lid < PCB->Data->LayerN; lid++)
+		PCB->Data->Layer[lid].propedit = 0;
+	for(gid = 0; gid < PCB->LayerGroups.len; gid++)
+		PCB->LayerGroups.grp[gid].propedit = 0;
+	propedit_board = 0;
+
+	if (argc > 1) {
+		int n;
+		for(n = 1; n < argc; n++) {
+			char *op;
+
+			PCB_ACT_CONVARG(1, FGW_STR, propedit, op = argv[1].val.str);
+
+			if (strcmp(op, "board") == 0) {
+				propedit_board = 1;
+			}
+			else if (strcmp(op, "layers") == 0) {
+				for(lid = 0; lid < PCB->Data->LayerN; lid++)
+					PCB->Data->Layer[lid].propedit = 1;
+			}
+			else if (strncmp(op, "layer:", 6) == 0) {
+				const char *id = op+6;
+				if (strcmp(id, "current") == 0)
+					ly = CURRENT;
+				else
+					ly = pcb_get_layer(PCB->Data, atoi(id));
+				if (ly == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Invalid layer index %s\n", op);
+					goto err;
+				}
+				ly->propedit = 1;
+			}
+			if (strcmp(op, "layer_groups") == 0) {
+				for(gid = 0; gid < PCB->LayerGroups.len; gid++)
+					PCB->LayerGroups.grp[gid].propedit = 1;
+			}
+			else if (strncmp(op, "layer_group:", 12) == 0) {
+				const char *id = op+12;
+				if (strcmp(id, "current") == 0) {
+					lg = pcb_get_layergrp(PCB, pcb_actd_EditGroup_gid);
+					if ((lg == NULL) && (CURRENT != NULL) && (!CURRENT->is_bound))
+						lg = pcb_get_layergrp(PCB, CURRENT->meta.real.grp);
+				}
+				else
+					lg = pcb_get_layergrp(PCB, atoi(id));
+				if (lg == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Invalid layer group index %s\n", op);
+					goto err;
+				}
+				lg->propedit = 1;
+			}
+		}
+	}
+
+	pcb_propsel_map_core(ctx.core_props);
+
+	pcb_gui->propedit_start(&ctx, ctx.core_props->fill, propedit_query);
+	for (pe = htsp_first(ctx.core_props); pe; pe = htsp_next(ctx.core_props, pe))
+		propedit_ins_prop(&ctx, pe);
+
+	PCB_ACT_IRES(0);
+
+	err:;
+	pcb_gui->propedit_end(&ctx);
+	pcb_props_uninit(ctx.core_props);
+	return 0;
+}
+
+static const char pcb_acts_propset[] = "propset(name, value)";
+static const char pcb_acth_propset[] = "Change the named property of all selected objects to/by value";
+fgw_error_t pcb_act_propset(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *name, *val;
+
+	PCB_ACT_CONVARG(1, FGW_STR, propset, name = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str);
+
+	PCB_ACT_IRES(pcb_propsel_set(name, val));
+	return 0;
+}
+
+static const char *propedit_cookie = "propedit";
+
+pcb_action_t propedit_action_list[] = {
+	{"propedit", pcb_act_propedit, pcb_acth_propedit, pcb_acts_propedit},
+	{"propset", pcb_act_propset, pcb_acth_propset, pcb_acts_propset}
+};
+
+PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie)
+
+int pplg_check_ver_propedit(int ver_needed) { return 0; }
+
+void pplg_uninit_propedit(void)
+{
+	pcb_remove_actions_by_cookie(propedit_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_propedit(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(propedit_action_list, propedit_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/propedit/propedit.pup
===================================================================
--- tags/2.0.1/src_plugins/propedit/propedit.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/propedit.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short object property editor
+$long List and edit properties of a group of objects.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/propedit/props.c
===================================================================
--- tags/2.0.1/src_plugins/propedit/props.c	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/props.c	(revision 18980)
@@ -0,0 +1,329 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+#include "props.h"
+#include "propsel.h"
+#include "compat_misc.h"
+#include "pcb-printf.h"
+#include "hid.h"
+#include <genht/hash.h>
+/*#define HT_INVALID_VALUE ((pcb_propval_t){PCB_PROPT_invalid, {0}})*/
+#define HT(x) htprop_ ## x
+#include <genht/ht.c>
+#undef HT
+
+int propedit_board = 0;
+
+/* Type names in text */
+static const char *type_names[] = { "invalid", "string", "coord", "angle", "int" };
+
+/* A hash function for each known type */
+static unsigned int prophash_coord(pcb_propval_t key)  { return longhash(key.coord); }
+static unsigned int prophash_angle(pcb_propval_t key)  { return longhash(key.angle); }
+static unsigned int prophash_int(pcb_propval_t key)    { return longhash(key.i); }
+static unsigned int prophash_string(pcb_propval_t key) { return key.string == NULL ? 0 : strhash(key.string); }
+
+typedef unsigned int (*prophash_ft)(pcb_propval_t key);
+static prophash_ft prophash[PCB_PROPT_max] = {
+	NULL, prophash_string, prophash_coord, prophash_angle, prophash_int
+};
+
+/* A keyeq function for each known type */
+static int propkeyeq_coord(pcb_propval_t a, pcb_propval_t b)  { return a.coord == b.coord; }
+static int propkeyeq_angle(pcb_propval_t a, pcb_propval_t b)  { return a.angle == b.angle; }
+static int propkeyeq_int(pcb_propval_t a, pcb_propval_t b)    { return a.i == b.i; }
+static int propkeyeq_string(pcb_propval_t a, pcb_propval_t b)
+{
+	if ((b.string == NULL) && (a.string == NULL))
+		return 1;
+	if ((b.string == NULL) || (a.string == NULL))
+		return 0;
+	return (strcmp(a.string, b.string) == 0);
+}
+
+
+typedef int (*propkeyeq_ft)(pcb_propval_t a, pcb_propval_t b);
+static propkeyeq_ft propkeyeq[PCB_PROPT_max] = {
+	NULL, propkeyeq_string, propkeyeq_coord, propkeyeq_angle, propkeyeq_int
+};
+
+
+/* Init & uninit */
+htsp_t *pcb_props_init(void)
+{
+	return htsp_alloc(strhash, strkeyeq);
+}
+
+void pcb_props_uninit(htsp_t *props)
+{
+#warning TODO
+}
+
+/* Retrieve values for a prop */
+pcb_props_t *pcb_props_get(htsp_t *props, const char *propname)
+{
+	return htsp_get(props, propname);
+}
+
+/* Store a new value */
+pcb_props_t *pcb_props_add(htsp_t *props, const char *propname, pcb_prop_type_t type, pcb_propval_t val)
+{
+	pcb_props_t *p;
+	htprop_entry_t *e;
+
+	if ((type <= PCB_PROPT_invalid) || (type >= PCB_PROPT_max))
+		return NULL;
+
+	/* look up or create the value list (p) associated with the property name */
+	p = htsp_get(props, propname);
+	if (p == NULL) {
+		p = malloc(sizeof(pcb_props_t));
+		p->type = type;
+		htprop_init(&p->values, prophash[type], propkeyeq[type]);
+		htsp_set(props, pcb_strdup(propname), p);
+	}
+	else {
+		if (type != p->type)
+			return NULL;
+	}
+
+	/* Check if we already have this value */
+	e = htprop_getentry(&p->values, val);
+	if (e == NULL)
+		htprop_set(&p->values, val, 1);
+	else
+		e->value++;
+
+	return p;
+}
+
+
+const char *pcb_props_type_name(pcb_prop_type_t type)
+{
+	if (((int)type < 0) || (type >= PCB_PROPT_max))
+		return NULL;
+
+	return type_names[type];
+}
+
+#define STAT(val, field, cnt) \
+do { \
+	if (val.field < minp.field) minp = val; \
+	if (val.field > maxp.field) maxp = val; \
+	avgp.field += val.field * cnt; \
+} while(0)
+
+pcb_props_t *pcb_props_stat(htsp_t *props, const char *propname, pcb_propval_t *most_common, pcb_propval_t *min, pcb_propval_t *max, pcb_propval_t *avg)
+{
+	pcb_props_t *p;
+	htprop_entry_t *e;
+	pcb_propval_t bestp, minp, maxp, avgp;
+	unsigned long best = 0, num_vals = 0;
+
+	if (most_common != NULL)
+		most_common->string = NULL;
+	if (min != NULL)
+		min->string = NULL;
+	if (max != NULL)
+		max->string = NULL;
+	if (avg != NULL)
+		avg->string = NULL;
+
+	p = htsp_get(props, propname);
+	if (p == NULL)
+		return NULL;
+
+	if ((p->type == PCB_PROPT_STRING) && ((min != NULL) || (max != NULL) || (avg != NULL)))
+		return NULL;
+
+	/* set up internal avg, min, max */
+	memset(&avgp, 0, sizeof(avgp));
+	switch(p->type) {
+		case PCB_PROPT_invalid: break;
+		case PCB_PROPT_max: break;
+		case PCB_PROPT_STRING: break;
+		case PCB_PROPT_COORD:  minp.coord = COORD_MAX; maxp.coord = -minp.coord;  break;
+		case PCB_PROPT_ANGLE:  minp.angle = 100000;    maxp.angle = -minp.angle; break;
+		case PCB_PROPT_INT:    minp.i     = INT_MAX;   maxp.i = -minp.i; break;
+	}
+
+	/* walk through all known values */
+	for (e = htprop_first(&p->values); e; e = htprop_next(&p->values, e)) {
+		if (e->value > best) {
+			best = e->value;
+			bestp = e->key;
+		}
+		num_vals += e->value;
+		switch(p->type) {
+			case PCB_PROPT_invalid: break;
+			case PCB_PROPT_max: break;
+			case PCB_PROPT_STRING: break;
+			case PCB_PROPT_COORD:  STAT(e->key, coord, e->value); break;
+			case PCB_PROPT_ANGLE:  STAT(e->key, angle, e->value); break;
+			case PCB_PROPT_INT:    STAT(e->key, i,     e->value); break;
+		}
+	}
+
+	/* generate the result */
+	if (num_vals != 0) {
+		switch(p->type) {
+			case PCB_PROPT_invalid: break;
+			case PCB_PROPT_max: break;
+			case PCB_PROPT_STRING: break;
+			case PCB_PROPT_COORD:  avgp.coord = avgp.coord/num_vals;  break;
+			case PCB_PROPT_ANGLE:  avgp.angle = avgp.angle/num_vals;  break;
+			case PCB_PROPT_INT:    avgp.i     = avgp.i/num_vals;  break;
+		}
+		if (avg != NULL) *avg = avgp;
+		if (min != NULL) *min = minp;
+		if (max != NULL) *max = maxp;
+		if (most_common != NULL) *most_common = bestp;
+	}
+
+	return p;
+}
+
+#undef STAT
+
+static char buff[8][128];
+static int buff_idx = 0;
+const char *propedit_sprint_val(pcb_prop_type_t type, pcb_propval_t val)
+{
+	char *b;
+	buff_idx++;
+	if (buff_idx > 7)
+		buff_idx = 0;
+	b = buff[buff_idx];
+	switch(type) {
+		case PCB_PROPT_STRING: return val.string; break;
+		case PCB_PROPT_COORD:  pcb_snprintf(b, 128, "%.06$mm\n%.06$ml", val.coord, val.coord); break;
+		case PCB_PROPT_ANGLE:  sprintf(b, "%.2f", val.angle); break;
+		case PCB_PROPT_INT:    sprintf(b, "%d", val.i); break;
+		default: strcpy(b, "<unknown type>");
+	}
+	return b;
+}
+
+/*****************************************************************************/
+
+void propedit_ins_prop(pe_ctx_t *ctx, htsp_entry_t *pe)
+{
+	htprop_entry_t *e;
+	void *rowid;
+	pcb_props_t *p = pe->value;
+	pcb_propval_t common, min, max, avg;
+
+	if (pcb_gui->propedit_add_prop != NULL)
+		rowid = pcb_gui->propedit_add_prop(ctx, pe->key, 1, p->values.fill);
+
+	if (pcb_gui->propedit_add_stat != NULL) {
+		if (p->type == PCB_PROPT_STRING) {
+			pcb_props_stat(ctx->core_props, pe->key, &common, NULL, NULL, NULL);
+			pcb_gui->propedit_add_stat(ctx, pe->key, rowid, propedit_sprint_val(p->type, common), NULL, NULL, NULL);
+		}
+		else {
+			pcb_props_stat(ctx->core_props, pe->key, &common, &min, &max, &avg);
+			pcb_gui->propedit_add_stat(ctx, pe->key, rowid, propedit_sprint_val(p->type, common), propedit_sprint_val(p->type, min), propedit_sprint_val(p->type, max), propedit_sprint_val(p->type, avg));
+		}
+	}
+
+	if (pcb_gui->propedit_add_value != NULL)
+		for (e = htprop_first(&p->values); e; e = htprop_next(&p->values, e))
+			pcb_gui->propedit_add_value(ctx, pe->key, rowid, propedit_sprint_val(p->type, e->key), e->value);
+}
+
+
+const char *propedit_query(void *pe, const char *cmd, const char *key, const char *val, int idx)
+{
+	pe_ctx_t *ctx = pe;
+	const char *s;
+	static const char *ok = "ok";
+	static char typ[2];
+
+	if (memcmp(cmd, "v1st", 4) == 0) { /* get the first value */
+		ctx->qprop = htsp_get(ctx->core_props, key);
+		if (ctx->qprop == NULL)
+			return NULL;
+
+		ctx->qprope = htprop_first(&ctx->qprop->values);
+		goto vnxt;
+	}
+
+	else if (memcmp(cmd, "vnxt", 4) == 0) { /* get the next value */
+		vnxt:;
+		if (ctx->qprope == NULL)
+			return NULL;
+		s = propedit_sprint_val(ctx->qprop->type, ctx->qprope->key);
+		ctx->qprope = htprop_next(&ctx->qprop->values, ctx->qprope);
+		return s;
+	}
+
+	else if (memcmp(cmd, "vset", 4) == 0) { /* set value */
+		if (pcb_propsel_set(key, val) > 0) {
+			htsp_entry_t *pe;
+			pcb_props_uninit(ctx->core_props);
+			ctx->core_props = pcb_props_init();
+			pcb_propsel_map_core(ctx->core_props);
+			pe = htsp_getentry(ctx->core_props, key);
+			if (pe != NULL) {
+				propedit_ins_prop(ctx, pe);
+				return ok;
+			}
+		}
+		return NULL;
+	}
+
+	else if (memcmp(cmd, "vdel", 4) == 0) { /* remove an attribute value */
+		if (pcb_propsel_del(key) > 0)
+			return ok;
+		return NULL;
+	}
+
+	else if (memcmp(cmd, "type", 4) == 0) { /* return type char */
+		htsp_entry_t *pe;
+		pcb_props_t *p;
+
+		pe = htsp_getentry(ctx->core_props, key);
+		if (pe == NULL)
+			return NULL;
+
+		typ[1] = '\0';
+		p = pe->value;
+		switch(p->type) {
+			case PCB_PROPT_max:
+			case PCB_PROPT_invalid: return NULL;
+			case PCB_PROPT_STRING: typ[0] = 's'; return typ;
+			case PCB_PROPT_COORD:  typ[0] = 'c'; return typ;
+			case PCB_PROPT_ANGLE:  typ[0] = 'a'; return typ;
+			case PCB_PROPT_INT:    typ[0] = 'i'; return typ;
+		}
+		return NULL;
+	}
+
+	/* invalid query */
+	return NULL;
+}
+
Index: tags/2.0.1/src_plugins/propedit/props.h
===================================================================
--- tags/2.0.1/src_plugins/propedit/props.h	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/props.h	(revision 18980)
@@ -0,0 +1,120 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This API builds and maintains a collection of values for each named property.
+   A value can be added any time. All values ever seen for a property is stored.
+   Duplicate values per property are stored only once, but number of occurence
+   per value (per property) is kept track on. Typically at the end of
+   a query, but generally ny time, the caller may query for:
+    - all known properties (it's a htsp)
+    - all known values of a property
+    - statistics of values of a property
+*/
+
+#include <limits.h>
+#include "global_typedefs.h"
+#include <genht/htsp.h>
+
+typedef enum {
+	PCB_PROPT_invalid,
+	PCB_PROPT_STRING,
+	PCB_PROPT_COORD,
+	PCB_PROPT_ANGLE,
+	PCB_PROPT_INT,
+	PCB_PROPT_max
+} pcb_prop_type_t;
+
+typedef union {
+	const char *string;
+	pcb_coord_t coord;
+	pcb_angle_t angle;
+	int i;
+} pcb_propval_t;
+
+typedef pcb_propval_t htprop_key_t;
+typedef unsigned long int htprop_value_t;
+#define HT(x) htprop_ ## x
+#include <genht/ht.h>
+#undef HT
+
+typedef struct {
+	pcb_prop_type_t type;
+	htprop_t values;
+	unsigned core:1;  /* 1 if it is a core property */
+} pcb_props_t;
+
+/* A property list (props) is a string->pcb_props_t. Each entry is a named
+   property with a value that's a type and a value hash (vhash). vhash's
+   key is each value that the property ever took, and vhash's value is an
+   integer value of how many times the given property is taken */
+htsp_t *pcb_props_init(void);
+void pcb_props_uninit(htsp_t *props);
+
+/* Add a value of a named property; if the value is already known, its counter
+   is increased. If propname didn't exist, create it. Returns NULL on error.
+   Error conditions:
+    - invalid type
+    - mismatching type for the property (all values of a given property must be the same)
+*/
+pcb_props_t *pcb_props_add(htsp_t *props, const char *propname, pcb_prop_type_t type, pcb_propval_t val);
+
+/* Retrieve values for a prop - returns NULL if propname doesn't exist */
+pcb_props_t *pcb_props_get(htsp_t *props, const char *propname);
+
+
+/* Return the type name of a property type or NULL on error. */
+const char *pcb_props_type_name(pcb_prop_type_t type);
+
+/* Look up property propname and calculate statistics for all values occured so far.
+   Any of most_common, min, max and avg can be NULL. Returns NULL if propname
+   doesn't exist or stat values that can not be calculated for the given type
+   are not NULL. Invalid type/stat combinations:
+     type=string   min, max, avg
+*/
+pcb_props_t *pcb_props_stat(htsp_t *props, const char *propname, pcb_propval_t *most_common, pcb_propval_t *min, pcb_propval_t *max, pcb_propval_t *avg);
+
+/* String query API for HIDs to call back without having to link */
+const char *propedit_query(void *pe, const char *cmd, const char *key, const char *val, int idx);
+
+
+/* Return the value of a property as string - there's a set of static buffers,
+   old values are discarded after 8 calls! */
+const char *propedit_sprint_val(pcb_prop_type_t type, pcb_propval_t val);
+
+/* for internal use */
+typedef struct {
+	htsp_t *core_props;
+
+	/* query */
+	pcb_props_t *qprop;
+	htprop_entry_t *qprope;
+} pe_ctx_t;
+
+/* add a row in the gui propedit table */
+void propedit_ins_prop(pe_ctx_t *ctx, htsp_entry_t *pe);
+
+/* Whether the board is selected for editing */
+extern int propedit_board;
Index: tags/2.0.1/src_plugins/propedit/propsel.c
===================================================================
--- tags/2.0.1/src_plugins/propedit/propsel.c	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/propsel.c	(revision 18980)
@@ -0,0 +1,732 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include <ctype.h>
+#include "config.h"
+#include "data.h"
+#include "props.h"
+#include "propsel.h"
+#include "change.h"
+#include "misc_util.h"
+#include "flag_str.h"
+#include "compat_misc.h"
+#include "undo.h"
+#include "rotate.h"
+#include "obj_pstk_inlines.h"
+
+/*********** map ***********/
+typedef struct {
+	htsp_t *props;
+} map_ctx_t;
+
+#define map_chk_skip(ctx, obj) \
+	if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj)) return;
+
+#define type2field_String string
+#define type2field_pcb_coord_t coord
+#define type2field_pcb_angle_t angle
+#define type2field_int i
+
+#define type2TYPE_String PCB_PROPT_STRING
+#define type2TYPE_pcb_coord_t PCB_PROPT_COORD
+#define type2TYPE_pcb_angle_t PCB_PROPT_ANGLE
+#define type2TYPE_int PCB_PROPT_INT
+
+#define map_add_prop(ctx, name, type, val) \
+do { \
+	pcb_propval_t v; \
+	v.type2field_ ## type = (val);  \
+	pcb_props_add(((map_ctx_t *)ctx)->props, name, type2TYPE_ ## type, v); \
+} while(0)
+
+static void map_attr(void *ctx, const pcb_attribute_list_t *list)
+{
+	int i, bl = 0;
+	char small[256];
+	char *big = NULL;
+
+	small[0] = 'a';
+	small[1] = '/';
+
+	for (i = 0; i < list->Number; i++) {
+		int len = strlen(list->List[i].name);
+		char *nm;
+		if (len >= sizeof(small)-3) {
+			if (len > bl) {
+				bl = len + 128;
+				if (big != NULL)
+					free(big);
+				big = malloc(bl);
+				big[0] = 'a';
+				big[1] = '/';
+			}
+			nm = big;
+		}
+		else
+			nm = small;
+		strcpy(nm+2, list->List[i].name);
+		map_add_prop(ctx, nm, String, list->List[i].value);
+	}
+	if (big != NULL)
+		free(big);
+}
+
+static void map_common(void *ctx, pcb_any_obj_t *obj)
+{
+	unsigned long bit;
+	char name[256], *end;
+
+	strcpy(name, "p/flags/");
+	end = name + 8;
+	for(bit = 1; bit < (1UL<<31); bit <<= 1) {
+		const pcb_flag_bits_t *i;
+		if ((bit == PCB_FLAG_SELECTED) || (bit == PCB_FLAG_RUBBEREND))
+			continue;
+		i = pcb_strflg_1bit(bit, obj->type);
+		if (i == NULL)
+			continue;
+		strcpy(end, i->name);
+		map_add_prop(ctx, name, int, PCB_FLAG_TEST(bit, obj));
+	}
+}
+
+static int map_board_cb(void *ctx, pcb_board_t *pcb)
+{
+	if (!propedit_board)
+		return 0;
+
+	map_add_prop(ctx, "p/board/name",   String, pcb->Name);
+	map_add_prop(ctx, "p/board/width", pcb_coord_t, pcb->MaxWidth);
+	map_add_prop(ctx, "p/board/height", pcb_coord_t, pcb->MaxHeight);
+	map_attr(ctx, &pcb->Attributes);
+	return 0;
+}
+
+static int map_layer_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter)
+{
+	if (!layer->propedit)
+		return 0;
+
+	map_add_prop(ctx, "p/layer/name", String, layer->name);
+	map_add_prop(ctx, "p/layer/comb/negative", int, !!(layer->comb & PCB_LYC_SUB));
+	map_add_prop(ctx, "p/layer/comb/auto", int, !!(layer->comb & PCB_LYC_AUTO));
+	if (!layer->is_bound)
+		map_add_prop(ctx, "p/layer/color", String, layer->meta.real.color);
+	map_attr(ctx, &layer->Attributes);
+	return 0;
+}
+
+static int map_layergrp_cb(void *ctx, pcb_board_t *pcb, pcb_layergrp_t *grp)
+{
+	if (!grp->propedit)
+		return 0;
+
+	map_add_prop(ctx, "p/layer_group/name", String, grp->name);
+	map_attr(ctx, &grp->Attributes);
+	return 0;
+}
+
+static void map_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	map_chk_skip(ctx, line);
+	map_add_prop(ctx, "p/trace/thickness", pcb_coord_t, line->Thickness);
+	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, line->Clearance/2);
+	map_common(ctx, (pcb_any_obj_t *)line);
+	map_attr(ctx, &line->Attributes);
+}
+
+static void map_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	map_chk_skip(ctx, arc);
+	map_add_prop(ctx, "p/trace/thickness", pcb_coord_t, arc->Thickness);
+	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, arc->Clearance/2);
+	map_add_prop(ctx, "p/arc/width",       pcb_coord_t, arc->Width);
+	map_add_prop(ctx, "p/arc/height",      pcb_coord_t, arc->Height);
+	map_add_prop(ctx, "p/arc/angle/start", pcb_angle_t, arc->StartAngle);
+	map_add_prop(ctx, "p/arc/angle/delta", pcb_angle_t, arc->Delta);
+	map_common(ctx, (pcb_any_obj_t *)arc);
+	map_attr(ctx, &arc->Attributes);
+}
+
+static void map_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text)
+{
+	map_chk_skip(ctx, text);
+	map_add_prop(ctx, "p/text/scale", int, text->Scale);
+	map_add_prop(ctx, "p/text/rotation", int, text->Direction);
+	map_add_prop(ctx, "p/text/string", String, text->TextString);
+	map_common(ctx, (pcb_any_obj_t *)text);
+	map_attr(ctx, &text->Attributes);
+}
+
+static void map_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	map_chk_skip(ctx, poly);
+	map_attr(ctx, &poly->Attributes);
+	map_common(ctx, (pcb_any_obj_t *)poly);
+	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, poly->Clearance/2);
+}
+
+static void map_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
+{
+	pcb_pstk_proto_t *proto;
+	map_chk_skip(ctx, ps);
+
+	map_add_prop(ctx, "p/padstack/xmirror", pcb_coord_t, ps->xmirror);
+	map_add_prop(ctx, "p/padstack/smirror", pcb_coord_t, ps->smirror);
+	map_add_prop(ctx, "p/padstack/rotation", pcb_angle_t, ps->rot);
+	map_add_prop(ctx, "p/padstack/proto", pcb_coord_t, ps->proto);
+
+	proto = pcb_pstk_get_proto(ps);
+	map_add_prop(ctx, "p/padstack/clearance", pcb_coord_t, ps->Clearance);
+	map_add_prop(ctx, "p/padstack/hole", pcb_coord_t, proto->hdia);
+	map_add_prop(ctx, "p/padstack/plated", int, proto->hplated);
+	map_add_prop(ctx, "p/padstack/htop", int, proto->htop);
+	map_add_prop(ctx, "p/padstack/hbottom", int, proto->hbottom);
+
+	map_attr(ctx, &ps->Attributes);
+	map_common(ctx, (pcb_any_obj_t *)ps);
+}
+
+static void map_subc_cb_(void *ctx, pcb_board_t *pcb, pcb_subc_t *msubc)
+{
+	PCB_ARC_ALL_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, arc))
+			map_arc_cb(ctx, pcb, layer, arc);
+	} PCB_ENDALL_LOOP;
+	PCB_LINE_ALL_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, line))
+			map_line_cb(ctx, pcb, layer, line);
+	} PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, polygon))
+			map_poly_cb(ctx, pcb, layer, polygon);
+	} PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, text))
+			map_text_cb(ctx, pcb, layer, text);
+	} PCB_ENDALL_LOOP;
+	PCB_PADSTACK_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, padstack))
+			map_pstk_cb(ctx, pcb, padstack);
+	} PCB_END_LOOP;
+	PCB_SUBC_LOOP(msubc->data); {
+		if (pcb_subc_part_editable(pcb, subc))
+			map_subc_cb_(ctx, pcb, subc);
+	} PCB_END_LOOP;
+	map_chk_skip(ctx, msubc);
+	map_attr(ctx, &msubc->Attributes);
+	map_common(ctx, (pcb_any_obj_t *)msubc);
+}
+
+static int map_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
+{
+	map_subc_cb_(ctx, pcb, subc);
+	return 0;
+}
+
+void pcb_propsel_map_core(htsp_t *props)
+{
+	map_ctx_t ctx;
+	pcb_layergrp_id_t gid;
+
+	ctx.props = props;
+	
+	pcb_loop_all(PCB, &ctx,
+		map_layer_cb, map_line_cb, map_arc_cb, map_text_cb, map_poly_cb,
+		map_subc_cb,
+		map_pstk_cb
+	);
+	for(gid = 0; gid < PCB->LayerGroups.len; gid++)
+		map_layergrp_cb(&ctx, PCB, &PCB->LayerGroups.grp[gid]);
+	map_board_cb(&ctx, PCB);
+}
+
+/*******************/
+
+typedef struct set_ctx_s {
+	const char *name;
+	const char *value;
+	pcb_coord_t c;
+	double d;
+	pcb_bool c_absolute, d_absolute, c_valid, d_valid, is_trace, is_attr;
+
+	int set_cnt;
+} set_ctx_t;
+
+static void set_attr(set_ctx_t *st, pcb_attribute_list_t *list)
+{
+	const char *key = st->name+2;
+	const char *orig = pcb_attribute_get(list, key);
+
+	if ((orig != NULL) && (strcmp(orig, st->value) == 0))
+		return;
+
+	pcb_attribute_put(list, key, st->value);
+	st->set_cnt++;
+}
+
+#define set_chk_skip(ctx, obj) \
+	if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, obj)) return;
+
+#define DONE { st->set_cnt++; pcb_undo_restore_serial(); return; }
+#define DONE0 { st->set_cnt++; pcb_undo_restore_serial(); return 0; }
+#define DONE1 { st->set_cnt++; pcb_undo_restore_serial(); return 1; }
+
+static int set_common(set_ctx_t *st, pcb_board_t *pcb, pcb_any_obj_t *obj)
+{
+	const pcb_flag_bits_t *i = pcb_strflg_name(st->name + 8, obj->type);
+
+	if (i != NULL) {
+		pcb_flag_change(pcb, st->c ? PCB_CHGFLG_SET : PCB_CHGFLG_CLEAR, i->mask, obj->type, obj->parent.any, obj, obj);
+		DONE1;
+	}
+
+	return 0;
+}
+
+static int brd_resize(pcb_coord_t w, pcb_coord_t h)
+{
+	pcb_board_resize(w, h);
+	return 1;
+}
+
+static void set_board_cb(void *ctx, pcb_board_t *pcb)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 8;
+
+	if (!propedit_board)
+		return;
+
+	if (st->is_attr) {
+		set_attr(st, &pcb->Attributes);
+		return;
+	}
+
+	if ((strcmp(pn, "name") == 0) &&
+	    (pcb_board_change_name(pcb_strdup(st->value)))) DONE;
+
+	if (st->c_valid && (strcmp(pn, "width") == 0) &&
+	    brd_resize(st->c, PCB->MaxHeight)) DONE;
+
+	if (st->c_valid && (strcmp(pn, "height") == 0) &&
+	    brd_resize(PCB->MaxWidth,st->c)) DONE;
+
+	pcb_message(PCB_MSG_ERROR, "This property can not be changed from the property editor.\n");
+}
+
+
+static int set_layer_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 8;
+
+	if (!layer->propedit)
+		return 0;
+
+	if (st->is_attr) {
+		set_attr(st, &layer->Attributes);
+		return 0;
+	}
+
+	if ((strcmp(pn, "name") == 0) &&
+	    (pcb_layer_rename_(layer, pcb_strdup(st->value)) == 0)) DONE0;
+
+	if ((strcmp(pn, "color") == 0) &&
+	    (pcb_layer_recolor_(layer, pcb_strdup(st->value)) == 0)) DONE0;
+
+	pcb_message(PCB_MSG_ERROR, "This property can not be changed from the property editor.\n");
+	return 0;
+}
+
+
+static void set_layergrp_cb(void *ctx, pcb_board_t *pcb, pcb_layergrp_t *grp)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 14;
+
+	if (!grp->propedit)
+		return;
+
+	if (st->is_attr) {
+		set_attr(st, &grp->Attributes);
+		return;
+	}
+
+	if ((strcmp(pn, "name") == 0) &&
+	    (pcb_layergrp_rename_(grp, pcb_strdup(st->value)) == 0)) DONE;
+
+	pcb_message(PCB_MSG_ERROR, "This property can not be changed from the property editor.\n");
+}
+
+
+static void set_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 8;
+
+	set_chk_skip(st, line);
+
+	if (st->is_attr) {
+		set_attr(st, &line->Attributes);
+		return;
+	}
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)line)) return;
+
+	if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) &&
+	    pcb_chg_obj_1st_size(PCB_OBJ_LINE, layer, line, NULL, st->c, st->c_absolute)) DONE;
+
+	if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) &&
+	    pcb_chg_obj_clear_size(PCB_OBJ_LINE, layer, line, NULL, st->c*2, st->c_absolute)) DONE;
+}
+
+static void set_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 8;
+
+	set_chk_skip(st, arc);
+
+	if (st->is_attr) {
+		set_attr(st, &arc->Attributes);
+		return;
+	}
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)arc)) return;
+
+	if (st->is_trace && st->c_valid && (strcmp(pn, "thickness") == 0) &&
+	    pcb_chg_obj_1st_size(PCB_OBJ_ARC, layer, arc, NULL, st->c, st->c_absolute)) DONE;
+
+	if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) &&
+	    pcb_chg_obj_clear_size(PCB_OBJ_ARC, layer, arc, NULL, st->c*2, st->c_absolute)) DONE;
+
+	pn = st->name + 6;
+
+	if (!st->is_trace && st->c_valid && (strcmp(pn, "width") == 0) &&
+	    pcb_chg_obj_radius(PCB_OBJ_ARC, layer, arc, NULL, 0, st->c, st->c_absolute)) DONE;
+
+	if (!st->is_trace && st->c_valid && (strcmp(pn, "height") == 0) &&
+	    pcb_chg_obj_radius(PCB_OBJ_ARC, layer, arc, NULL, 1, st->c, st->c_absolute)) DONE;
+
+	if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/start") == 0) &&
+	    pcb_chg_obj_angle(PCB_OBJ_ARC, layer, arc, NULL, 0, st->d, st->d_absolute)) DONE;
+
+	if (!st->is_trace && st->d_valid && (strcmp(pn, "angle/delta") == 0) &&
+	    pcb_chg_obj_angle(PCB_OBJ_ARC, layer, arc, NULL, 1, st->d, st->d_absolute)) DONE;
+}
+
+static void set_text_cb_any(void *ctx, pcb_board_t *pcb, int type, void *layer_or_element, pcb_text_t *text)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 7;
+	char *old;
+
+	set_chk_skip(st, text);
+
+	if (st->is_attr) {
+		set_attr(st, &text->Attributes);
+		return;
+	}
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)text)) return;
+
+	if (st->d_valid && (strcmp(pn, "scale") == 0) &&
+	    pcb_chg_obj_size(type, layer_or_element, text, text, PCB_MIL_TO_COORD(st->d), st->d_absolute)) DONE;
+
+	if ((strcmp(pn, "string") == 0) &&
+	    (old = pcb_chg_obj_name(type, layer_or_element, text, NULL, pcb_strdup(st->value)))) {
+		free(old);
+		DONE;
+	}
+
+	if (st->d_valid && (strcmp(pn, "rotation") == 0)) {
+		int delta;
+		if (st->d_absolute) {
+			delta = (st->d - text->Direction);
+			if (delta < 0)
+				delta += 4;
+			delta = (unsigned int)delta & 3;
+		}
+		else
+			delta = st->d;
+		if (pcb_obj_rotate90(type, layer_or_element, text, text, text->X, text->Y, delta) != NULL)
+			DONE;
+	}
+}
+
+static void set_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text)
+{
+	set_text_cb_any(ctx, pcb, PCB_OBJ_TEXT, layer, text);
+}
+
+
+static void set_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 8;
+
+	set_chk_skip(st, poly);
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)poly)) return;
+
+	if (st->is_trace && st->c_valid && (strcmp(pn, "clearance") == 0) &&
+	    pcb_chg_obj_clear_size(PCB_OBJ_POLY, layer, poly, NULL, st->c*2, st->c_absolute)) DONE;
+
+	if (st->is_attr) {
+		set_attr(st, &poly->Attributes);
+		return;
+	}
+}
+
+static void set_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+	const char *pn = st->name + 11;
+	int i;
+	pcb_cardinal_t ca;
+	pcb_pstk_proto_t *proto;
+
+	set_chk_skip(st, ps);
+
+	if (st->is_attr) {
+		set_attr(st, &ps->Attributes);
+		return;
+	}
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)ps)) return;
+
+	ca = i = (st->c != 0);
+	proto = pcb_pstk_get_proto(ps);
+
+	if (st->c_valid && (strcmp(pn, "clearance") == 0) &&
+	    pcb_chg_obj_clear_size(PCB_OBJ_PSTK, ps, ps, NULL, st->c*2, st->c_absolute)) DONE;
+	if (st->d_valid && (strcmp(pn, "rotation") == 0)) {
+		if (st->d_absolute) {
+			if (pcb_obj_rotate(PCB_OBJ_PSTK, ps, ps, NULL, ps->x, ps->y, st->d - ps->rot)) DONE;
+		}
+		else {
+			if (pcb_obj_rotate(PCB_OBJ_PSTK, ps, ps, NULL, ps->x, ps->y, st->d)) DONE;
+		}
+		return;
+	}
+	if (st->c_valid && (strcmp(pn, "xmirror") == 0) &&
+	    (pcb_pstk_change_instance(ps, NULL, NULL, NULL, &i, NULL) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "smirror") == 0) &&
+	    (pcb_pstk_change_instance(ps, NULL, NULL, NULL, NULL, &i) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "proto") == 0) &&
+	    (pcb_pstk_change_instance(ps, &ca, NULL, NULL, NULL, NULL) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "hole") == 0) &&
+	    (pcb_pstk_proto_change_hole(proto, NULL, &st->c, NULL, NULL) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "plated") == 0) &&
+	    (pcb_pstk_proto_change_hole(proto, &i, NULL, NULL, NULL) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "htop") == 0) &&
+	    (pcb_pstk_proto_change_hole(proto, NULL, NULL, &i, NULL) == 0)) DONE;
+	if (st->c_valid && (strcmp(pn, "hbottom") == 0) &&
+	    (pcb_pstk_proto_change_hole(proto, NULL, NULL, NULL, &i) == 0)) DONE;
+}
+
+static void set_subc_cb_(void *ctx, pcb_board_t *pcb, pcb_subc_t *ssubc)
+{
+	set_ctx_t *st = (set_ctx_t *)ctx;
+
+	PCB_ARC_ALL_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, arc))
+			set_arc_cb(ctx, pcb, layer, arc);
+	} PCB_ENDALL_LOOP;
+	PCB_LINE_ALL_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, line))
+			set_line_cb(ctx, pcb, layer, line);
+	} PCB_ENDALL_LOOP;
+	PCB_POLY_ALL_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, polygon))
+			set_poly_cb(ctx, pcb, layer, polygon);
+	} PCB_ENDALL_LOOP;
+	PCB_TEXT_ALL_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, text))
+			set_text_cb(ctx, pcb, layer, text);
+	} PCB_ENDALL_LOOP;
+	PCB_PADSTACK_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, padstack))
+			set_pstk_cb(ctx, pcb, padstack);
+	} PCB_END_LOOP;
+	PCB_SUBC_LOOP(ssubc->data); {
+		if (pcb_subc_part_editable(pcb, subc))
+			set_subc_cb_(ctx, pcb, subc);
+	} PCB_END_LOOP;
+
+	set_chk_skip(st, ssubc);
+
+	if (set_common(st, pcb, (pcb_any_obj_t *)ssubc)) return;
+
+	if (st->is_attr) {
+		set_attr(st, &ssubc->Attributes);
+		return;
+	}
+}
+
+static int set_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
+{
+	set_subc_cb_(ctx, pcb, subc);
+	return 0;
+}
+
+/* use the callback if trc is true or prop matches a prefix or we are setting attributes, else NULL */
+#define MAYBE_PROP(trc, prefix, cb) \
+	(((ctx.is_attr) || (trc) || (strncmp(prop, (prefix), sizeof(prefix)-1) == 0) || (strncmp(prop, "p/flags/", 8) == 0) || (prop[0] == 'a')) ? (cb) : NULL)
+
+#define MAYBE_ATTR(cb) \
+	((ctx.is_attr) ? (cb) : NULL)
+
+int pcb_propsel_set(const char *prop, const char *value)
+{
+	set_ctx_t ctx;
+	char *end;
+	const char *start;
+	pcb_layergrp_id_t gid;
+
+	/* sanity checks for invalid props */
+	if (prop[1] != '/')
+		return 0;
+	if ((prop[0] != 'a') && (prop[0] != 'p'))
+		return 0;
+
+	ctx.is_trace = (strncmp(prop, "p/trace/", 8) == 0);
+	ctx.is_attr = (prop[0] == 'a');
+	ctx.name = prop;
+	ctx.value = value;
+	start = value;
+	while(isspace(*start)) start++;
+	if (*start == '#') {
+		ctx.d_absolute = 1;
+		start++;
+	}
+	else
+		ctx.d_absolute = ((*start != '-') && (*start != '+'));
+	ctx.c = pcb_get_value_ex(start, NULL, &ctx.c_absolute, NULL, NULL, &ctx.c_valid);
+	ctx.d = strtod(start, &end);
+	ctx.d_valid = (*end == '\0');
+	ctx.set_cnt = 0;
+
+	pcb_undo_save_serial();
+
+	pcb_loop_all(PCB, &ctx,
+		MAYBE_PROP(0, "p/layer/", set_layer_cb),
+		MAYBE_PROP(ctx.is_trace, "p/line/", set_line_cb),
+		MAYBE_PROP(ctx.is_trace, "p/arc/", set_arc_cb),
+		MAYBE_PROP(0, "p/text/", set_text_cb),
+		MAYBE_PROP(ctx.is_trace, "p/poly/", set_poly_cb),
+		MAYBE_PROP(0, "p/", set_subc_cb),
+		MAYBE_PROP(0, "p/padstack/", set_pstk_cb)
+	);
+
+	for(gid = 0; gid < PCB->LayerGroups.len; gid++)
+		set_layergrp_cb(&ctx, PCB, &PCB->LayerGroups.grp[gid]);
+
+	set_board_cb(&ctx, PCB);
+
+	pcb_undo_inc_serial();
+	return ctx.set_cnt;
+}
+
+#undef MAYBE_PROP
+#undef MAYBE_ATTR
+
+/*******************/
+
+typedef struct del_ctx_s {
+	const char *key;
+	int del_cnt;
+} del_ctx_t;
+
+static void del_attr(void *ctx, pcb_attribute_list_t *list)
+{
+	del_ctx_t *st = (del_ctx_t *)ctx;
+	if (pcb_attribute_remove(list, st->key+2))
+		st->del_cnt++;
+}
+
+static void del_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	map_chk_skip(ctx, line);
+	del_attr(ctx, &line->Attributes);
+}
+
+static void del_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	map_chk_skip(ctx, arc);
+	del_attr(ctx, &arc->Attributes);
+}
+
+static void del_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text)
+{
+	map_chk_skip(ctx, text);
+	del_attr(ctx, &text->Attributes);
+}
+
+static void del_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	map_chk_skip(ctx, poly);
+	del_attr(ctx, &poly->Attributes);
+}
+
+static void del_subc_cb_(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc)
+{
+	map_chk_skip(ctx, subc);
+	del_attr(ctx, &subc->Attributes);
+}
+
+static int del_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
+{
+	del_subc_cb_(ctx, pcb, subc);
+	return 0;
+}
+
+static void del_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
+{
+	map_chk_skip(ctx, ps);
+	del_attr(ctx, &ps->Attributes);
+}
+
+int pcb_propsel_del(const char *key)
+{
+	del_ctx_t st;
+
+	if ((key[0] != 'a') || (key[1] != '/')) /* do not attempt to remove anything but attributes */
+		return 0;
+
+	st.key = key;
+	st.del_cnt = 0;
+
+	pcb_loop_all(PCB, &st,
+		NULL, del_line_cb, del_arc_cb, del_text_cb, del_poly_cb,
+		del_subc_cb,
+		del_pstk_cb
+	);
+	return st.del_cnt;
+}
+
+
Index: tags/2.0.1/src_plugins/propedit/propsel.h
===================================================================
--- tags/2.0.1/src_plugins/propedit/propsel.h	(nonexistent)
+++ tags/2.0.1/src_plugins/propedit/propsel.h	(revision 18980)
@@ -0,0 +1,31 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* This API builds a prop list by looking at all selected objects on a design. */
+void pcb_propsel_map_core(htsp_t *props);
+
+int pcb_propsel_set(const char *prop, const char *value);
+int pcb_propsel_del(const char *attr_name);
Index: tags/2.0.1/src_plugins/puller/Makefile
===================================================================
--- tags/2.0.1/src_plugins/puller/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/puller/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_puller
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/puller/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/puller/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/puller/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {puller}
+append /local/pcb/mod/OBJS_C99 [@ $(PLUGDIR)/puller/puller.o @]
+
+switch /local/pcb/puller/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/puller/puller.c
===================================================================
--- tags/2.0.1/src_plugins/puller/puller.c	(nonexistent)
+++ tags/2.0.1/src_plugins/puller/puller.c	(revision 18980)
@@ -0,0 +1,2228 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2006 DJ Delorie
+ *  Copyright (C) 2011 PCB Contributers (See ChangeLog for details)
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+/* FIXME: Things that need to be fixed before this is "perfect".
+   Add to this list as we find things.
+
+   - respect the outline layer.
+
+   - don't consider points that are perpendicular to our start_arc.
+     I.e. when we have busses going around corners, we have a *lot* of
+     arcs and endpoints that are all in the same direction and all
+     equally "good", but rounding the arc angles to integers causes
+     all sorts of tiny differences that result in bumps, reversals,
+     and other messes.
+
+   - Store the X,Y values in our shadow struct so we don't fill up the
+     undo buffer with all our line reversals.
+
+   - at least check the other layers in our layer group.
+
+*/
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <math.h>
+#include <memory.h>
+#include <limits.h>
+#include <setjmp.h>
+#include <glib.h>
+
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "move.h"
+#include "pcb-printf.h"
+#include "remove.h"
+#include "rtree.h"
+#include "flag_str.h"
+#include "undo.h"
+#include "layer.h"
+#include "plugins.h"
+#include "actions.h"
+#include "misc_util.h"
+#include "compat_misc.h"
+#include "obj_pstk_inlines.h"
+#include "funchash_core.h"
+#include "search.h"
+#include "find.h"
+
+#define abort1() fprintf(stderr, "abort at line %d\n", __LINE__), abort()
+
+#define TRACE0 0
+#define TRACE1 0
+
+/* sine of one degree */
+#define SIN1D	0.0174524064372835
+
+static jmp_buf abort_buf;
+
+#define sqr(x) (1.0*(x)*(x))
+
+static int multi, line_exact, arc_exact;
+static pcb_line_t *the_line;
+static pcb_arc_t *the_arc;
+static double arc_dist;
+
+/* We canonicalize the arc and line such that the point to be moved is
+   always Point2 for the line, and at start+delta for the arc.  */
+
+static int x, y;								/* the point we're moving */
+static int cx, cy;							/* centerpoint of the arc */
+static int ex, ey;							/* fixed end of the line */
+
+/* 0 is left (-x), 90 is down (+y), 180 is right (+x), 270 is up (-y) */
+
+static int within(int x1, int y1, int x2, int y2, int r)
+{
+	return pcb_distance(x1, y1, x2, y2) <= r / 2;
+}
+
+static int arc_endpoint_is(pcb_arc_t *a, int angle, int x, int y)
+{
+	int ax = a->X, ay = a->Y;
+
+	if (angle % 90 == 0) {
+		int ai = (int) (angle / 90) & 3;
+		switch (ai) {
+		case 0:
+			ax -= a->Width;
+			break;
+		case 1:
+			ay += a->Height;
+			break;
+		case 2:
+			ax += a->Width;
+			break;
+		case 3:
+			ay -= a->Height;
+			break;
+		}
+	}
+	else {
+		double rad = angle * M_PI / 180;
+		ax -= a->Width * cos(rad);
+		ay += a->Width * sin(rad);
+	}
+#if TRACE1
+	pcb_printf(" - arc endpoint %#mD\n", ax, ay);
+#endif
+	arc_dist = pcb_distance(ax, ay, x, y);
+	if (arc_exact)
+		return arc_dist < 2;
+	return arc_dist < a->Thickness / 2;
+}
+
+/* Cross c->u and c->v, return the magnitute */
+static double cross2d(int cx, int cy, int ux, int uy, int vx, int vy)
+{
+	ux -= cx;
+	uy -= cy;
+	vx -= cx;
+	vy -= cy;
+	return (double) ux *vy - (double) uy *vx;
+}
+
+/* Likewise, for dot product. */
+static double dot2d(int cx, int cy, int ux, int uy, int vx, int vy)
+{
+	ux -= cx;
+	uy -= cy;
+	vx -= cx;
+	vy -= cy;
+	return (double) ux *vx + (double) uy *vy;
+}
+
+#if 0
+/* angle of c->v, relative to c->u, in radians.  Range is -pi..pi */
+static double angle2d(int cx, int cy, int ux, int uy, int vx, int vy)
+{
+	double cross;
+	double magu, magv, sintheta;
+#if TRACE1
+	printf("angle2d %d,%d %d,%d %d,%d\n", cx, cy, ux, uy, vx, vy);
+#endif
+	ux -= cx;
+	uy -= cy;
+	vx -= cx;
+	vy -= cy;
+#if TRACE1
+	printf(" = %d,%d %d,%d\n", ux, uy, vx, vy);
+#endif
+	cross = (double) ux *vy - (double) uy *vx;
+	magu = sqrt((double) ux * ux + (double) uy * uy);
+	magv = sqrt((double) vx * vx + (double) vy * vy);
+	sintheta = cross / (magu * magv);
+#if TRACE1
+	printf(" = %f / (%f * %f) = %f\n", cross, magu, magv, sintheta);
+#endif
+	return asin(sintheta);
+}
+#endif
+
+static int same_sign(double a, double b)
+{
+	return (a * b >= 0);
+}
+
+static double r2d(double r)
+{
+	return 180.0 * r / M_PI;
+}
+
+static double d2r(double d)
+{
+	return M_PI * d / 180.0;
+}
+
+/* | a b |
+   | c d | */
+static double det(double a, double b, double c, double d)
+{
+	return a * d - b * c;
+}
+
+/* The lines are x1y1-x2y2 and x3y3-x4y4.  Returns pcb_true if they
+   intersect.  */
+static int intersection_of_lines(int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4, int *xr, int *yr)
+{
+	double x, y, d;
+	d = det(x1 - x2, y1 - y2, x3 - x4, y3 - y4);
+	if (!d)
+		return 0;
+	x = (det(det(x1, y1, x2, y2), x1 - x2, det(x3, y3, x4, y4), x3 - x4) / d);
+	y = (det(det(x1, y1, x2, y2), y1 - y2, det(x3, y3, x4, y4), y3 - y4) / d);
+	*xr = (int) (x + 0.5);
+	*yr = (int) (y + 0.5);
+	return 1;
+}
+
+/* distance between a line and a point */
+static double dist_lp(int x1, int y1, int x2, int y2, int px, int py)
+{
+	double den = pcb_distance(x1, y1, x2, y2);
+	double rv = (fabs(((double) x2 - x1) * ((double) y1 - py)
+										- ((double) x1 - px) * ((double) y2 - y1))
+							 / den);
+#if TRACE1
+	pcb_printf("dist %#mD-%#mD to %#mD is %f\n", x1, y1, x2, y2, px, py, rv);
+#endif
+	return rv;
+}
+
+/*****************************************************************************/
+/*                                                                           */
+/*                       Single Pofgw_error_t pcb_act_Puller                                 */
+/*                                                                           */
+/*****************************************************************************/
+
+static pcb_r_dir_t line_callback(const pcb_box_t * b, void *cl)
+{
+	/* pcb_layer_t *layer = (pcb_layer_t *)cl; */
+	pcb_line_t *l = (pcb_line_t *) b;
+	double d1, d2, t;
+#if TRACE1
+	pcb_printf("line %#mD .. %#mD\n", l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y);
+#endif
+	d1 = pcb_distance(l->Point1.X, l->Point1.Y, x, y);
+	d2 = pcb_distance(l->Point2.X, l->Point2.Y, x, y);
+	if ((d1 < 2 || d2 < 2) && !line_exact) {
+		line_exact = 1;
+		the_line = 0;
+	}
+	t = line_exact ? 2 : l->Thickness / 2;
+	if (d1 < t || d2 < t) {
+		if (the_line)
+			multi = 1;
+		the_line = l;
+#if TRACE1
+		printf("picked, exact %d\n", line_exact);
+#endif
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static pcb_r_dir_t arc_callback(const pcb_box_t * b, void *cl)
+{
+	/* pcb_layer_t *layer = (pcb_layer_t *) cl; */
+	pcb_arc_t *a = (pcb_arc_t *) b;
+
+#if TRACE1
+	pcb_printf("arc a %#mD r %#mS sa %ld d %ld\n", a->X, a->Y, a->Width, a->StartAngle, a->Delta);
+#endif
+	if (!arc_endpoint_is(a, a->StartAngle, x, y)
+			&& !arc_endpoint_is(a, a->StartAngle + a->Delta, x, y))
+		return 1;
+	if (arc_dist < 2) {
+		if (!arc_exact) {
+			arc_exact = 1;
+			the_arc = 0;
+		}
+		if (the_arc)
+			multi = 1;
+		the_arc = a;
+#if TRACE1
+		printf("picked, exact %d\n", arc_exact);
+#endif
+	}
+	else if (!arc_exact) {
+		if (the_arc)
+			multi = 1;
+		the_arc = a;
+#if TRACE1
+		printf("picked, exact %d\n", arc_exact);
+#endif
+	}
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static int find_pair(int Px, int Py)
+{
+	pcb_box_t spot;
+
+#if TRACE1
+	pcb_printf("\nPuller find_pair at %#mD\n", pcb_crosshair.X, pcb_crosshair.Y);
+#endif
+
+	x = Px;
+	y = Py;
+	multi = 0;
+	line_exact = arc_exact = 0;
+	the_line = 0;
+	the_arc = 0;
+	spot.X1 = x - 1;
+	spot.Y1 = y - 1;
+	spot.X2 = x + 1;
+	spot.Y2 = y + 1;
+	pcb_r_search(CURRENT->line_tree, &spot, NULL, line_callback, CURRENT, NULL);
+	pcb_r_search(CURRENT->arc_tree, &spot, NULL, arc_callback, CURRENT, NULL);
+	if (the_line && the_arc && !multi)
+		return 1;
+	x = Px;
+	y = Py;
+	return 0;
+}
+
+
+static const char pcb_acts_Puller[] = "pcb_act_Puller()";
+
+static const char pcb_acth_Puller[] = "Pull an arc-line junction tight.";
+
+/* %start-doc actions pcb_act_Puller
+
+The @code{pcb_act_Puller()} action is a special-purpose optimization.  When
+invoked while the crosshair is over the junction of an arc and a line,
+it will adjust the arc's angle and the connecting line's endpoint such
+that the line intersects the arc at a tangent.  In the example below,
+the left side is ``before'' with the black target marking where to put
+the crosshair:
+
+@center @image{puller,,,Example of how puller works,png}
+
+The right side is ``after'' with the black target marking where the
+arc-line intersection was moved to.
+
+%end-doc */
+
+static fgw_error_t pcb_act_Puller(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_coord_t Ux, Uy;
+	double arc_angle, base_angle;
+#if TRACE1
+	double line_angle, rel_angle;
+#endif
+	double tangent;
+	int new_delta_angle;
+
+	pcb_hid_get_coords("Click on a line-arc intersection or line segment", &Ux, &Uy, 0);
+
+	if (!find_pair(pcb_crosshair.X, pcb_crosshair.Y)) {
+		if (!find_pair(Ux, Uy)) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+
+	if (within(the_line->Point1.X, the_line->Point1.Y, x, y, the_line->Thickness)) {
+		ex = the_line->Point2.X;
+		ey = the_line->Point2.Y;
+		the_line->Point2.X = the_line->Point1.X;
+		the_line->Point2.Y = the_line->Point1.Y;
+		the_line->Point1.X = ex;
+		the_line->Point1.Y = ey;
+	}
+	else if (!within(the_line->Point2.X, the_line->Point2.Y, x, y, the_line->Thickness)) {
+#if TRACE1
+		printf("Line endpoint not at cursor\n");
+#endif
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+	ex = the_line->Point1.X;
+	ey = the_line->Point1.Y;
+
+	cx = the_arc->X;
+	cy = the_arc->Y;
+	if (arc_endpoint_is(the_arc, the_arc->StartAngle, x, y)) {
+		pcb_arc_set_angles(CURRENT, the_arc, the_arc->StartAngle + the_arc->Delta, -the_arc->Delta);
+	}
+	else if (!arc_endpoint_is(the_arc, the_arc->StartAngle + the_arc->Delta, x, y)) {
+#if TRACE1
+		printf("arc not endpoints\n");
+#endif
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (within(cx, cy, ex, ey, the_arc->Width * 2)) {
+#if TRACE1
+		printf("line ends inside arc\n");
+#endif
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (the_arc->Delta > 0)
+		arc_angle = the_arc->StartAngle + the_arc->Delta + 90;
+	else
+		arc_angle = the_arc->StartAngle + the_arc->Delta - 90;
+	base_angle = r2d(atan2(ey - cy, cx - ex));
+
+	tangent = r2d(acos(the_arc->Width / pcb_distance(cx, cy, ex, ey)));
+
+#if TRACE1
+	line_angle = r2d(atan2(ey - y, x - ex));
+	rel_angle = line_angle - arc_angle;
+	printf("arc %g line %g rel %g base %g\n", arc_angle, line_angle, rel_angle, base_angle);
+	printf("tangent %g\n", tangent);
+
+	printf("arc was start %ld end %ld\n", the_arc->StartAngle, the_arc->StartAngle + the_arc->Delta);
+#endif
+
+	if (the_arc->Delta > 0)
+		arc_angle = base_angle - tangent;
+	else
+		arc_angle = base_angle + tangent;
+#if TRACE1
+	printf("new end angle %g\n", arc_angle);
+#endif
+
+	new_delta_angle = arc_angle - the_arc->StartAngle;
+	if (new_delta_angle > 180)
+		new_delta_angle -= 360;
+	if (new_delta_angle < -180)
+		new_delta_angle += 360;
+	pcb_arc_set_angles(CURRENT, the_arc, the_arc->StartAngle, new_delta_angle);
+
+#if TRACE1
+	printf("arc now start %ld end %ld\n", the_arc->StartAngle, the_arc->StartAngle + new_delta_angle);
+#endif
+
+	arc_angle = the_arc->StartAngle + the_arc->Delta;
+	x = the_arc->X - the_arc->Width * cos(d2r(arc_angle)) + 0.5;
+	y = the_arc->Y + the_arc->Height * sin(d2r(arc_angle)) + 0.5;
+
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, the_line, &(the_line->Point2), x - the_line->Point2.X, y - the_line->Point2.Y);
+
+	pcb_gui->invalidate_all();
+	pcb_undo_inc_serial();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/*****************************************************************************/
+/*                                                                           */
+/*                          Global pcb_act_Puller                                    */
+/*                                                                           */
+/*****************************************************************************/
+
+static const char pcb_acts_GlobalPuller[] = "pcb_act_GlobalPuller([Found|Selected])";
+
+static const char pcb_acth_GlobalPuller[] = "Pull all traces tight.";
+
+/* %start-doc actions pcb_act_GlobalPuller
+
+%end-doc */
+
+/* Ok, here's the deal.  We look for the intersection of two traces.
+   The triangle formed by those traces is searched for things we need
+   to avoid. From the other two corners of the triangle, we compute
+   the angle to each obstacle, and remember the ones closest to the
+   start angles.  If the two traces hit the same obstacle, we put in
+   the arc and we're done.  Else, we bring the traces up to the
+   obstacles and start again.
+
+   Note that we assume each start point is a tangent to an arc.  We
+   start with a radius of zero, but future steps use the arcs we
+   create as we go.
+
+   For obstacles, we list each round pin, pad, via, and line/arc
+   endpoints as points with a given radius.  For each square pin, pad,
+   via, and polygon points, we list each corner with a zero radius.
+   We also list arcs from their centerpoint.
+
+   We don't currently do anything to move vias, or intersections of
+   three or more traces.  In the future, three-way intersections will
+   be handles similarly to two-way - calculate the range of angles
+   valid from each of the three other endpoints, choose the angle
+   closest to making 120 degree angles at the center.  For four-way or
+   more intersections, we break them up into multiple three-way
+   intersections.
+
+   For simplicity, we only do the current layer at this time.  We will
+   also edit the lines and arcs in place so that the intersection is
+   always on the second point, and the other ends are always at
+   start+delta for arcs.
+
+   We also defer intersections which are blocked by other
+   intersections yet to be moved; the idea is to wait until those have
+   been moved so we don't end up with arcs that no longer wrap around
+   things.  At a later point, we may choose to pull arced corners in
+   also.
+
+   You'll see lots of variables of the form "foo_sign" which keep
+   track of which way things are pointing.  This is because everything
+   is relative to corners and arcs, not absolute directions.
+*/
+
+static int nloops, npulled;
+
+static void status()
+{
+	fprintf(stderr, "%6d loops, %d pulled   \r", nloops, npulled);
+}
+
+/* Extra data we need to temporarily attach to all lines and arcs.  */
+typedef struct End {
+	/* These point to "multi_next" if there are more than one.  */
+	struct Extra *next;
+	void *pin;
+	unsigned in_pin:1;
+	unsigned at_pin:1;
+	unsigned is_pad:1;
+	unsigned pending:1; /* set if this may be moved later */
+	int x, y;           /* arc endpoint */
+	/* If not NULL, points to End with pending==1 we're blocked on. */
+	struct End *waiting_for;
+} End;
+
+typedef struct Extra {
+	End start;
+	End end;
+	unsigned found:1;
+	unsigned deleted:1;
+	int type;
+	union {
+		pcb_line_t *line;
+		pcb_arc_t *arc;
+	} parent;
+} Extra;
+
+static Extra multi_next;
+static GHashTable *lines;
+static GHashTable *arcs;
+static int did_something;
+static int current_is_component, current_is_solder;
+
+/* If set, these are the pins/pads/vias that this path ends on.  */
+/* static void *start_pin_pad, *end_pin_pad; */
+
+#if TRACE1
+static void trace_paths();
+#endif
+static void mark_line_for_deletion(pcb_line_t *);
+
+#define LINE2EXTRA(l)    ((Extra *)g_hash_table_lookup (lines, l))
+#define ARC2EXTRA(a)     ((Extra *)g_hash_table_lookup (arcs, a))
+#define EXTRA2LINE(e)    (e->parent.line)
+#define EXTRA2ARC(e)     (e->parent.arc)
+#define EXTRA_IS_LINE(e) (e->type == PCB_OBJ_LINE)
+#define EXTRA_IS_ARC(e)  (e->type == PCB_OBJ_ARC)
+
+static void unlink_end(Extra * x, Extra ** e)
+{
+	if (*e) {
+		if ((*e)->start.next == x) {
+#if TRACE1
+			printf("%d: unlink_end, was %p\n", __LINE__, (void *)(*e)->start.next);
+#endif
+			(*e)->start.next = &multi_next;
+		}
+		if ((*e)->end.next == x) {
+#if TRACE1
+			printf("%d: unlink_end, was %p\n", __LINE__, (void *)(*e)->start.next);
+#endif
+			(*e)->end.next = &multi_next;
+		}
+	}
+#if TRACE1
+	printf("%d: unlink_end, was %p\n", __LINE__, (void *)(*e));
+#endif
+	(*e) = &multi_next;
+}
+
+#if TRACE1
+
+static void clear_found_cb(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	extra->found = 0;
+}
+
+static void clear_found()
+{
+	g_hash_table_foreach(lines, (GHFunc) clear_found_cb, NULL);
+	g_hash_table_foreach(arcs, (GHFunc) clear_found_cb, NULL);
+}
+#endif
+
+static void fix_arc_extra(pcb_arc_t *a, Extra * e)
+{
+#if TRACE1
+	printf("new arc angles %ld %ld\n", a->StartAngle, a->Delta);
+#endif
+	e->start.x = a->X - (a->Width * cos(d2r(a->StartAngle)) + 0.5);
+	e->start.y = a->Y + (a->Height * sin(d2r(a->StartAngle)) + 0.5);
+	e->end.x = a->X - (a->Width * cos(d2r(a->StartAngle + a->Delta)) + 0.5);
+	e->end.y = a->Y + (a->Height * sin(d2r(a->StartAngle + a->Delta)) + 0.5);
+#if TRACE1
+	pcb_printf("new X,Y is %#mD to %#mD\n", e->start.x, e->start.y, e->end.x, e->end.y);
+#endif
+}
+
+typedef struct {
+	void *me;
+	int x, y;
+	int is_arc;
+	Extra **extra_ptr;
+} FindPairCallbackStruct;
+
+#define NEAR(a,b) ((a) <= (b) + 2 && (a) >= (b) - 2)
+
+static pcb_r_dir_t find_pair_line_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+#if TRACE1
+	Extra *e = LINE2EXTRA(line);
+#endif
+	FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl;
+
+	if (line == fpcs->me)
+		return PCB_R_DIR_NOT_FOUND;
+#ifdef CHECK_LINE_PT_NEG
+	if (line->Point1.X < 0)
+		abort1();
+#endif
+#if TRACE1
+	pcb_printf(" - %p line %#mD or %#mD\n", (void *)e, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+#endif
+	if ((NEAR(line->Point1.X, fpcs->x) && NEAR(line->Point1.Y, fpcs->y))
+			|| (NEAR(line->Point2.X, fpcs->x) && NEAR(line->Point2.Y, fpcs->y))) {
+		if (*fpcs->extra_ptr) {
+#if TRACE1
+			printf("multiple, was %p\n", (void *)*fpcs->extra_ptr);
+#endif
+			*fpcs->extra_ptr = &multi_next;
+		}
+		else {
+			*fpcs->extra_ptr = LINE2EXTRA(line);
+#if TRACE1
+			printf(" - next now %p\n", (void *)*fpcs->extra_ptr);
+#endif
+		}
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t find_pair_arc_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	Extra *e = ARC2EXTRA(arc);
+	FindPairCallbackStruct *fpcs = (FindPairCallbackStruct *) cl;
+
+	if (arc == fpcs->me)
+		return PCB_R_DIR_NOT_FOUND;
+#if TRACE1
+	pcb_printf(" - %p arc %#mD or %#mD\n", (void *)e, e->start.x, e->start.y, e->end.x, e->end.y);
+#endif
+	if ((NEAR(e->start.x, fpcs->x) && NEAR(e->start.y, fpcs->y))
+			|| (NEAR(e->end.x, fpcs->x) && NEAR(e->end.y, fpcs->y))) {
+		if (*fpcs->extra_ptr) {
+#if TRACE1
+			printf("multiple, was %p\n", (void *)*fpcs->extra_ptr);
+#endif
+			*fpcs->extra_ptr = &multi_next;
+		}
+		else
+			*fpcs->extra_ptr = e;
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static void find_pairs_1(void *me, Extra ** e, int x, int y)
+{
+	FindPairCallbackStruct fpcs;
+	pcb_box_t b;
+
+	if (*e)
+		return;
+
+	fpcs.me = me;
+	fpcs.extra_ptr = e;
+	fpcs.x = x;
+	fpcs.y = y;
+#if TRACE1
+	pcb_printf("looking for %#mD\n", x, y);
+#endif
+	b.X1 = x - 10;
+	b.X2 = x + 10;
+	b.Y1 = y - 10;
+	b.Y2 = y + 10;
+	pcb_r_search(CURRENT->line_tree, &b, NULL, find_pair_line_callback, &fpcs, NULL);
+	pcb_r_search(CURRENT->arc_tree, &b, NULL, find_pair_arc_callback, &fpcs, NULL);
+}
+
+static int check_point_in_pstk(pcb_pstk_t *ps, pcb_layer_t *layer, int x, int y, End *e)
+{
+	pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, layer);
+	if (shape == NULL) return 0;
+	switch(shape->shape) {
+		case PCB_PSSH_POLY:
+			if (shape->data.poly.pa == NULL)
+				pcb_pstk_shape_update_pa(&shape->data.poly);
+			return pcb_pline_embraces_circ(shape->data.poly.pa->contours, x - ps->x, y - ps->y, 1);
+		case PCB_PSSH_LINE:
+		{
+			pcb_any_line_t tmp;
+			tmp.Point1.X = shape->data.line.x1 + ps->x;
+			tmp.Point1.Y = shape->data.line.y1 + ps->y;
+			tmp.Point2.X = shape->data.line.x2 + ps->x;
+			tmp.Point2.Y = shape->data.line.y2 + ps->y;
+			tmp.Clearance = 0;
+			tmp.Thickness = shape->data.line.thickness;
+			tmp.Flags = shape->data.line.square ? pcb_flag_make(PCB_FLAG_SQUARE) : pcb_no_flags();
+			return pcb_is_point_in_line(x, y, 1, &tmp);
+		}
+		case PCB_PSSH_CIRC:
+		{
+			pcb_coord_t cx = shape->data.circ.x + ps->x, cy = shape->data.circ.y + ps->y;
+			double max_dist2 = ((double)shape->data.circ.dia/2.0) * ((double)shape->data.circ.dia/2.0);
+			double dist2 = pcb_distance2(cx, cy, x, y);
+			return (dist2 <= max_dist2);
+		}
+	}
+	return 0;
+}
+
+static pcb_r_dir_t find_pair_pstkline_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *)b;
+	pcb_pstk_t *pin = (pcb_pstk_t *)cl;
+	Extra *e = LINE2EXTRA(line);
+	int hits;
+
+#ifdef CHECK_LINE_PT_NEG
+	if (line->Point1.X < 0)
+		abort1();
+#endif
+
+	assert(line->parent_type == PCB_PARENT_LAYER);
+	hits = check_point_in_pstk(pin, line->parent.layer, line->Point1.X, line->Point1.Y, &(e->start));
+	hits += check_point_in_pstk(pin, line->parent.layer, line->Point2.X, line->Point2.Y, &(e->end));
+
+	if (hits)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* See if the line passes through this pin - if so, split it into two
+	   lines so they can be pulled independently. */
+	if (pcb_pstk_intersect_line(pin, line)) {
+#if TRACE1
+		pcb_printf("splitting line %#mD-%#mD because it passes through pin %#mD r%d\n",
+							 line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, pin->x, pin->y, pin->Thickness / 2);
+#endif
+		unlink_end(e, &e->start.next);
+		unlink_end(e, &e->end.next);
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t find_pair_pstkarc_callback(const pcb_box_t *b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *)b;
+	pcb_pstk_t *pin = (pcb_pstk_t *)cl;
+	Extra *e = ARC2EXTRA(arc);
+	int hits;
+
+	assert(arc->parent_type == PCB_PARENT_LAYER);
+	hits = check_point_in_pstk(pin, arc->parent.layer, e->start.x, e->start.y, &(e->start));
+	hits += check_point_in_pstk(pin, arc->parent.layer, e->end.x, e->end.y, &(e->end));
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static void null_multi_next_ends(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	if (extra->start.next == &multi_next)
+		extra->start.next = NULL;
+
+	if (extra->end.next == &multi_next)
+		extra->end.next = NULL;
+}
+
+static Extra *new_line_extra(pcb_line_t * line)
+{
+	Extra *extra = g_slice_new0(Extra);
+	g_hash_table_insert(lines, line, extra);
+	extra->parent.line = line;
+	extra->type = PCB_OBJ_LINE;
+	return extra;
+}
+
+static Extra *new_arc_extra(pcb_arc_t * arc)
+{
+	Extra *extra = g_slice_new0(Extra);
+	g_hash_table_insert(arcs, arc, extra);
+	extra->parent.arc = arc;
+	extra->type = PCB_OBJ_ARC;
+	return extra;
+}
+
+static void find_pairs_pstk(pcb_data_t *data)
+{
+	PCB_PADSTACK_LOOP(PCB->Data); {
+		pcb_box_t box;
+		box = padstack->BoundingBox;
+		pcb_r_search(CURRENT->line_tree, &box, NULL, find_pair_pstkline_callback, padstack, NULL);
+		pcb_r_search(CURRENT->arc_tree, &box, NULL, find_pair_pstkarc_callback, padstack, NULL);
+	}
+	PCB_END_LOOP;
+}
+
+static void find_pairs_subc_pstk(pcb_data_t *data)
+{
+	PCB_SUBC_LOOP(data) {
+		find_pairs_pstk(subc->data);
+		find_pairs_subc_pstk(subc->data);
+	}
+	PCB_END_LOOP;
+}
+
+static void find_pairs()
+{
+	PCB_ARC_LOOP(CURRENT); {
+		Extra *e = new_arc_extra(arc);
+		fix_arc_extra(arc, e);
+	} PCB_END_LOOP;
+
+	PCB_LINE_LOOP(CURRENT); {
+		new_line_extra(line);
+	} PCB_END_LOOP;
+
+	PCB_LINE_LOOP(CURRENT); {
+		Extra *e = LINE2EXTRA(line);
+		if (line->Point1.X >= 0) {
+			find_pairs_1(line, &e->start.next, line->Point1.X, line->Point1.Y);
+			find_pairs_1(line, &e->end.next, line->Point2.X, line->Point2.Y);
+		}
+	}
+	PCB_END_LOOP;
+
+	PCB_ARC_LOOP(CURRENT); {
+		Extra *e = ARC2EXTRA(arc);
+		if (!e->deleted) {
+			find_pairs_1(arc, &e->start.next, e->start.x, e->start.y);
+			find_pairs_1(arc, &e->end.next, e->end.x, e->end.y);
+		}
+	}
+	PCB_END_LOOP;
+
+	find_pairs_pstk(PCB->Data);
+	find_pairs_subc_pstk(PCB->Data);
+
+	g_hash_table_foreach(lines, (GHFunc) null_multi_next_ends, NULL);
+	g_hash_table_foreach(arcs, (GHFunc) null_multi_next_ends, NULL);
+}
+
+#define PROP_NEXT(e,n,f) 		\
+      if (f->next->start.next == e) {	\
+	e = f->next;			\
+	n = & e->start;			\
+	f = & e->end;			\
+      } else {				\
+	e = f->next;			\
+	n = & e->end;			\
+	f = & e->start; }
+
+static void propogate_ends_at(Extra * e, End * near, End * far)
+{
+	while (far->in_pin && far->pin == near->pin) {
+		far->in_pin = 0;
+		if (!far->next)
+			return;
+		PROP_NEXT(e, near, far);
+		near->in_pin = 0;
+	}
+}
+
+static void propogate_end_pin(Extra * e, End * near, End * far)
+{
+	void *pinpad = near->pin;
+	int ispad = near->is_pad;
+	while (far->next) {
+		PROP_NEXT(e, near, far);
+		if (near->pin == pinpad)
+			break;
+		near->pin = pinpad;
+		near->is_pad = ispad;
+	}
+}
+
+static void propogate_end_step1_cb(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	if (extra->start.next != NULL && extra->start.next == extra->end.next) {
+		extra->end.next = NULL;
+		mark_line_for_deletion((pcb_line_t *) ptr);
+	}
+
+	if (extra->start.at_pin)
+		propogate_ends_at(extra, &extra->start, &extra->end);
+
+	if (extra->end.at_pin)
+		propogate_ends_at(extra, &extra->end, &extra->start);
+}
+
+static void propogate_end_step2_cb(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	if (extra->start.in_pin) {
+#if TRACE1
+		printf("MULTI at %d: was %p\n", __LINE__, (void *)extra->start.next);
+#endif
+		extra->start.next = NULL;
+	}
+	if (extra->end.in_pin) {
+#if TRACE1
+		printf("MULTI at %d: was %p\n", __LINE__, (void *)extra->end.next);
+#endif
+		extra->end.next = NULL;
+	}
+}
+
+static void propogate_end_step3_cb(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	if (extra->start.next)
+		propogate_end_pin(extra, &extra->end, &extra->start);
+	if (extra->end.next)
+		propogate_end_pin(extra, &extra->start, &extra->end);
+}
+
+static void propogate_ends()
+{
+	/* First, shut of "in pin" when we have an "at pin".  We also clean
+	   up zero-length lines.  */
+	g_hash_table_foreach(lines, (GHFunc) propogate_end_step1_cb, NULL);
+
+	/* Now end all paths at pins/pads.  */
+	g_hash_table_foreach(lines, (GHFunc) propogate_end_step2_cb, NULL);
+
+	/* Now, propogate the pin/pad/vias along paths.  */
+	g_hash_table_foreach(lines, (GHFunc) propogate_end_step3_cb, NULL);
+}
+
+static Extra *last_pextra = 0;
+
+static void print_extra(Extra * e, Extra * prev)
+{
+	int which = 0;
+	if (e->start.next == last_pextra)
+		which = 1;
+	else if (e->end.next == last_pextra)
+		which = 2;
+	switch (which) {
+	case 0:
+		printf("%10p %10p %10p :", (void *)e, (void *)e->start.next, (void *)e->end.next);
+		break;
+	case 1:
+		printf("%10p \033[33m%10p\033[0m %10p :", (void *)e, (void *)e->start.next, (void *)e->end.next);
+		break;
+	case 2:
+		printf("%10p %10p \033[33m%10p\033[0m :", (void *)e, (void *)e->start.next, (void *)e->end.next);
+		break;
+	}
+	last_pextra = e;
+	printf(" %c%c", e->deleted ? 'd' : '-', e->found ? 'f' : '-');
+	printf(" s:%s%s%s%s",
+				 e->start.in_pin ? "I" : "-", e->start.at_pin ? "A" : "-", e->start.is_pad ? "P" : "-", e->start.pending ? "p" : "-");
+	printf(" e:%s%s%s%s ",
+				 e->end.in_pin ? "I" : "-", e->end.at_pin ? "A" : "-", e->end.is_pad ? "P" : "-", e->end.pending ? "p" : "-");
+
+	if (EXTRA_IS_LINE(e)) {
+		pcb_line_t *line = EXTRA2LINE(e);
+		pcb_printf(" %p L %#mD-%#mD", (void *)line, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
+		printf("  %s %p %s %p\n", e->start.is_pad ? "pad" : "pin", (void *)e->start.pin, e->end.is_pad ? "pad" : "pin", (void *)e->end.pin);
+	}
+	else if (EXTRA_IS_ARC(e)) {
+		pcb_arc_t *arc = EXTRA2ARC(e);
+		pcb_printf(" %p A %#mD-%#mD", (void *)arc, e->start.x, e->start.y, e->end.x, e->end.y);
+		pcb_printf(" at %#mD ang %ld,%ld\n", arc->X, arc->Y, arc->StartAngle, arc->Delta);
+	}
+	else if (e == &multi_next) {
+		printf("-- Multi-next\n");
+	}
+	else {
+		printf("-- Unknown extra: %p\n", (void *)e);
+	}
+}
+
+#if TRACE1
+static void trace_path(Extra * e)
+{
+	Extra *prev = 0;
+	if ((e->start.next && e->end.next)
+			|| (!e->start.next && !e->end.next))
+		return;
+	if (e->found)
+		return;
+	printf("- path -\n");
+	last_pextra = 0;
+	while (e) {
+		e->found = 1;
+		print_extra(e, prev);
+		if (e->start.next == prev) {
+			prev = e;
+			e = e->end.next;
+		}
+		else {
+			prev = e;
+			e = e->start.next;
+		}
+	}
+}
+
+static void trace_paths()
+{
+	Extra *e;
+
+	clear_found();
+	PCB_LINE_LOOP(CURRENT); {
+		e = LINE2EXTRA(line);
+		trace_path(e);
+	} PCB_END_LOOP;
+	PCB_ARC_LOOP(CURRENT); {
+		e = ARC2EXTRA(arc);
+		trace_path(e);
+	} PCB_END_LOOP;
+}
+#endif
+
+static void reverse_line(pcb_line_t *line)
+{
+	Extra *e = LINE2EXTRA(line);
+	int x, y;
+	End etmp;
+
+	x = line->Point1.X;
+	y = line->Point1.Y;
+#if 1
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point1), line->Point2.X - line->Point1.X, line->Point2.Y - line->Point1.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, line, &(line->Point2), x - line->Point2.X, y - line->Point2.Y);
+#else
+	/* In theory, we should be using the above so that undo works.  */
+	line->Point1.X = line->Point2.X;
+	line->Point1.Y = line->Point2.Y;
+	line->Point2.X = x;
+	line->Point2.Y = y;
+#endif
+	memcpy(&etmp, &e->start, sizeof(End));
+	memcpy(&e->start, &e->end, sizeof(End));
+	memcpy(&e->end, &etmp, sizeof(End));
+}
+
+static void reverse_arc(pcb_arc_t *arc)
+{
+	Extra *e = ARC2EXTRA(arc);
+	End etmp;
+
+#if 1
+	pcb_arc_set_angles(CURRENT, arc, arc->StartAngle + arc->Delta, -arc->Delta);
+#else
+	/* Likewise, see above.  */
+	arc->StartAngle += arc->Delta;
+	arc->Delta *= -1;
+#endif
+	memcpy(&etmp, &e->start, sizeof(End));
+	memcpy(&e->start, &e->end, sizeof(End));
+	memcpy(&e->end, &etmp, sizeof(End));
+}
+
+static void expand_box(pcb_box_t *b, int x, int y, int t)
+{
+	b->X1 = MIN(b->X1, x - t);
+	b->X2 = MAX(b->X2, x + t);
+	b->Y1 = MIN(b->Y1, y - t);
+	b->Y2 = MAX(b->Y2, y + t);
+}
+
+/* ---------------------------------------------------------------------- */
+/* These are the state variables for the intersection we're currently
+   working on. */
+
+/* what we're working with */
+static pcb_arc_t *start_arc;
+static pcb_line_t *start_line;
+static pcb_line_t *end_line;
+static pcb_arc_t *end_arc;
+static Extra *start_extra, *end_extra;
+static Extra *sarc_extra, *earc_extra;
+static void *start_pinpad, *end_pinpad;
+static int thickness;
+
+/* Pre-computed values.  Note that all values are computed according
+   to CARTESIAN coordinates, not PCB coordinates.  Do an up-down board
+   flip before wrapping your brain around the math.  */
+
+/* se_sign is positive when you make a right turn going from start to end. */
+/* sa_sign is positive when start's arc is on the same side of start as end.  */
+/* ea_sign is positive when end's arc is on the same side of end as start.  */
+/* sa_sign and ea_sign may be zero if there's no arc.  */
+static double se_sign, sa_sign, ea_sign;
+
+static double best_angle, start_angle, end_dist;
+/* arc radii are positive when they're on the same side as the things
+   we're interested in. */
+static int sa_r, ea_r;
+static int sa_x, sa_y;					/* start "arc" point */
+
+/* what we've found so far */
+static int fx, fy, fr, fp;
+static End *fp_end;
+static double fa;								/* relative angle */
+
+#define gp_point_(x,y,t,e, file,line) gp_point_2(x,y,t,e,0,0, file ":" #line)
+#define gp_point(x,y,t,e) gp_point_(x,y,t,e, __FILE__, __LINE__)
+
+static int gp_point_force(int x, int y, int t, End * e, int esa, int eda, int force, const char *name)
+{
+	double r, a, d;
+	int scx, scy, sr;
+	double base_angle, rel_angle, point_angle;
+
+#if TRACE1
+	pcb_printf("\033[34mgp_point_force %#mD %#mS via %s\033[0m\n", x, y, t, name);
+#endif
+
+	if (start_arc) {
+		scx = start_arc->X;
+		scy = start_arc->Y;
+		sr = start_arc->Width;
+	}
+	else {
+		scx = start_line->Point1.X;
+		scy = start_line->Point1.Y;
+		sr = 0;
+	}
+
+	r = t + thickness;
+
+	/* See if the point is inside our start arc. */
+	d = pcb_distance(scx, scy, x, y);
+#if TRACE1
+	pcb_printf("%f = dist #mD to %#mD\n", d, scx, scy, x, y);
+	pcb_printf("sr %#mS r %f d %f\n", sr, r, d);
+#endif
+	if (d < sr - r) {
+#if TRACE1
+		printf("inside start arc, %f < %f\n", d, sr - r);
+#endif
+		return 0;
+	}
+	if (sr == 0 && d < r) {
+#if TRACE1
+		printf("start is inside arc, %f < %f\n", d, r);
+#endif
+		return 0;
+	}
+
+	/* Now for the same tricky math we needed for the single puller.
+	   sr and r are the radii for the two points scx,scy and x,y.  */
+
+	/* angle between points (NOT pcb arc angles) */
+	base_angle = atan2(y - scy, x - scx);
+#if TRACE1
+	pcb_printf("%.1f = atan2 (%#mS-%#mS = %#mS, %#mS-%#mS = %#mS)\n", r2d(base_angle), y, scy, y - scy, x, scx, x - scx);
+#endif
+
+	if ((sa_sign * sr - r) / d > 1 || (sa_sign * sr - r) / d < -1)
+		return 0;
+
+	/* Angle of tangent, relative to the angle between point centers.  */
+	rel_angle = se_sign * asin((sa_sign * sr - r) / d);
+#if TRACE1
+	printf("%.1f = %d * asin ((%d * %d - %f) / %f)\n", r2d(rel_angle), (int) se_sign, (int) sa_sign, sr, r, d);
+#endif
+
+	/* Absolute angle of tangent.  */
+	point_angle = base_angle + rel_angle;
+#if TRACE1
+	printf("base angle %.1f rel_angle %.1f point_angle %.1f\n", r2d(base_angle), r2d(rel_angle), r2d(point_angle));
+#endif
+
+	if (eda) {
+		/* Check arc angles */
+		double pa = point_angle;
+		double sa = d2r(180 - esa);
+		double da = d2r(-eda);
+
+		if (da < 0) {
+			sa = sa + da;
+			da = -da;
+		}
+
+		pa -= se_sign * M_PI / 2;
+		while (sa + da < pa)
+			sa += M_PI * 2;
+		while (sa > pa)
+			sa -= M_PI * 2;
+		if (sa + da < pa) {
+#if TRACE1
+			printf("arc doesn't apply: sa %.1f da %.1f pa %.1f\n", r2d(sa), r2d(da), r2d(pa));
+#endif
+			return 0;
+		}
+	}
+
+	a = point_angle - start_angle;
+	while (a > M_PI)
+		a -= M_PI * 2;
+	while (a < -M_PI)
+		a += M_PI * 2;
+#if TRACE1
+	printf(" - angle relative to S-E baseline is %.1f\n", r2d(a));
+#endif
+
+	if (!force && a * se_sign < -0.007) {
+		double new_r;
+#if TRACE1
+		printf("skipping, would increase angle (%f * %f)\n", a, se_sign);
+#endif
+		new_r = dist_lp(start_line->Point1.X, start_line->Point1.Y, start_line->Point2.X, start_line->Point2.Y, x, y);
+#if TRACE1
+		pcb_printf("point %#mD dist %#mS vs thickness %#mS\n", x, y, new_r, thickness);
+#endif
+		new_r -= thickness;
+		new_r = (int) new_r - 1;
+#if TRACE1
+		pcb_printf(" - new thickness %f old %#mS\n", new_r, t);
+#endif
+		if (new_r < t)
+			gp_point_force(x, y, new_r, e, esa, eda, 1, "gp_point_force");
+		return 0;
+	}
+
+#if TRACE1
+	printf("%f * %f < %f * %f ?\n", a, se_sign, best_angle, se_sign);
+#endif
+	if (a * se_sign == best_angle * se_sign) {
+		double old_d = pcb_distance(start_line->Point1.X, start_line->Point1.Y,
+														fx, fy);
+		double new_d = pcb_distance(start_line->Point1.X, start_line->Point1.Y,
+														x, y);
+		if (new_d > old_d) {
+			best_angle = a;
+			fx = x;
+			fy = y;
+			fr = r;
+			fa = a;
+			fp = e ? e->pending : 0;
+			fp_end = e;
+		}
+	}
+	else if (a * se_sign < best_angle * se_sign) {
+		best_angle = a;
+		fx = x;
+		fy = y;
+		fr = r;
+		fa = a;
+		fp = e ? e->pending : 0;
+		fp_end = e;
+	}
+
+	return 1;
+}
+
+static int gp_point_2(int x, int y, int t, End * e, int esa, int eda, const char *func)
+{
+	double sc, ec;
+	double sd, ed;
+
+	if (x == sa_x && y == sa_y)
+		return 0;
+
+#if TRACE1
+	pcb_printf("\033[34mgp_point %#mD %#mS via %s\033[0m\n", x, y, t, func);
+#endif
+
+	/* There are two regions we care about.  For points inside our
+	   triangle, we check the crosses against start_line and end_line to
+	   make sure the point is "inside" the triangle.  For points on the
+	   other side of the s-e line of the triangle, we check the dots to
+	   make sure it's between our endpoints.  */
+
+	/* See what side of the s-e line we're on */
+	sc = cross2d(start_line->Point1.X, start_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y, x, y);
+#if TRACE1
+	printf("s-e cross = %f\n", sc);
+#endif
+	if (t >= 0) {
+		if (same_sign(sc, se_sign)) {
+			/* Outside, check dots.  */
+
+			/* Ok, is it "in front of" our vectors? */
+			sd = dot2d(start_line->Point1.X, start_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y, x, y);
+#if TRACE1
+			printf("sd = %f\n", sd);
+#endif
+			if (sd <= 0)
+				return 0;
+
+			ed = dot2d(end_line->Point2.X, end_line->Point2.Y, start_line->Point1.X, start_line->Point1.Y, x, y);
+#if TRACE1
+			printf("ed = %f\n", ed);
+#endif
+			if (ed <= 0)
+				return 0;
+
+			sd = dist_lp(start_line->Point1.X, start_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y, x, y);
+			if (sd > t + thickness)
+				return 0;
+		}
+		else {
+			/* Inside, check crosses.  */
+
+			/* First off, is it on the correct side of the start line? */
+			sc = cross2d(start_line->Point1.X, start_line->Point1.Y, start_line->Point2.X, start_line->Point2.Y, x, y);
+#if TRACE1
+			printf("sc = %f\n", sc);
+#endif
+			if (!same_sign(sc, se_sign))
+				return 0;
+
+			/* Ok, is it on the correct side of the end line? */
+			ec = cross2d(end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y, x, y);
+#if TRACE1
+			printf("ec = %f\n", ec);
+#endif
+			if (!same_sign(ec, se_sign))
+				return 0;
+		}
+	}
+
+#if TRACE1
+	printf("in range!\n");
+#endif
+
+	return gp_point_force(x, y, t, e, esa, eda, 0, func);
+}
+
+static pcb_r_dir_t gp_line_cb(const pcb_box_t * b, void *cb)
+{
+	const pcb_line_t *l = (pcb_line_t *) b;
+	Extra *e = LINE2EXTRA(l);
+	if (l == start_line || l == end_line)
+		return PCB_R_DIR_NOT_FOUND;
+	if (e->deleted)
+		return PCB_R_DIR_NOT_FOUND;
+#ifdef CHECK_LINE_PT_NEG
+	if (l->Point1.X < 0)
+		abort1();
+#endif
+	if (!e->start.next || !EXTRA_IS_ARC(e->start.next))
+		gp_point(l->Point1.X, l->Point1.Y, l->Thickness / 2, &e->start);
+	if (!e->end.next || !EXTRA_IS_ARC(e->end.next))
+		gp_point(l->Point2.X, l->Point2.Y, l->Thickness / 2, &e->end);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t gp_arc_cb(const pcb_box_t * b, void *cb)
+{
+	const pcb_arc_t *a = (pcb_arc_t *) b;
+	Extra *e = ARC2EXTRA(a);
+	if (a == start_arc || a == end_arc)
+		return PCB_R_DIR_NOT_FOUND;
+	if (e->deleted)
+		return PCB_R_DIR_NOT_FOUND;
+	gp_point_2(a->X, a->Y, a->Width + a->Thickness / 2, 0, a->StartAngle, a->Delta, "gp_arc_cb");
+	if (start_arc && a->X == start_arc->X && a->Y == start_arc->Y)
+		return PCB_R_DIR_NOT_FOUND;
+	if (end_arc && a->X != end_arc->X && a->Y != end_arc->Y)
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (e->start.next || e->end.next)
+		return PCB_R_DIR_NOT_FOUND;
+
+	gp_point(e->start.x, e->start.y, a->Thickness / 2, 0);
+	gp_point(e->end.x, e->end.y, a->Thickness / 2, 0);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t gp_text_cb(const pcb_box_t * b, void *cb)
+{
+	const pcb_text_t *t = (pcb_text_t *) b;
+	/* FIXME: drop in the actual text-line endpoints later. */
+	gp_point(t->BoundingBox.X1, t->BoundingBox.Y1, 0, 0);
+	gp_point(t->BoundingBox.X1, t->BoundingBox.Y2, 0, 0);
+	gp_point(t->BoundingBox.X2, t->BoundingBox.Y2, 0, 0);
+	gp_point(t->BoundingBox.X2, t->BoundingBox.Y1, 0, 0);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t gp_poly_cb(const pcb_box_t * b, void *cb)
+{
+	int i;
+	const pcb_poly_t *p = (pcb_poly_t *) b;
+	for (i = 0; i < p->PointN; i++)
+		gp_point(p->Points[i].X, p->Points[i].Y, 0, 0);
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t gp_pstk_cb(const pcb_box_t *b, void *cb)
+{
+	pcb_pstk_t *ps = (pcb_pstk_t *)b; /* have to drop const because we may update the cache in ps */
+	pcb_layer_t *layer = CURRENT;
+	pcb_pstk_shape_t *shape = pcb_pstk_shape_at(PCB, ps, layer);
+
+	if (ps == start_pinpad || ps == end_pinpad)
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (shape == NULL) return 0;
+	switch(shape->shape) {
+		case PCB_PSSH_CIRC:
+			gp_point(ps->x + shape->data.circ.x, ps->y + shape->data.circ.y, shape->data.circ.dia/2, 0);
+			break;
+		case PCB_PSSH_POLY:
+#warning TODO: we lump poly padstacks in with square; safe, but not optimal; rather use the real shape
+		case PCB_PSSH_LINE:
+			gp_point(ps->BoundingBox.X1, ps->BoundingBox.Y1, 0, 0);
+			gp_point(ps->BoundingBox.X1, ps->BoundingBox.Y2, 0, 0);
+			gp_point(ps->BoundingBox.X2, ps->BoundingBox.Y1, 0, 0);
+			gp_point(ps->BoundingBox.X2, ps->BoundingBox.Y2, 0, 0);
+			break;
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_line_t *create_line(pcb_line_t *sample, int x1, int y1, int x2, int y2)
+{
+#if TRACE1
+	Extra *e;
+	pcb_printf("create_line from %#mD to %#mD\n", x1, y1, x2, y2);
+#endif
+	pcb_line_t *line = pcb_line_new(CURRENT, x1, y1, x2, y2,
+																					sample->Thickness, sample->Clearance, sample->Flags);
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, CURRENT, line, line);
+
+#if TRACE1
+	e =
+#endif
+		new_line_extra(line);
+#if TRACE1
+	printf(" - line extra is %p\n", (void *)e);
+#endif
+	return line;
+}
+
+static pcb_arc_t *create_arc(pcb_line_t *sample, int x, int y, int r, int sa, int da)
+{
+	Extra *e;
+	pcb_arc_t *arc;
+
+	if (r % 100 == 1)
+		r--;
+	if (r % 100 == 99)
+		r++;
+#if TRACE1
+	pcb_printf("create_arc at %#mD r %#mS sa %d delta %d\n", x, y, r, sa, da);
+#endif
+	arc = pcb_arc_new(CURRENT, x, y, r, r, sa, da, sample->Thickness, sample->Clearance, sample->Flags, pcb_true);
+	if (arc == 0) {
+		arc = pcb_arc_new(CURRENT, x, y, r, r, sa, da * 2, sample->Thickness, sample->Clearance, sample->Flags, pcb_true);
+	}
+	pcb_undo_add_obj_to_create(PCB_OBJ_ARC, CURRENT, arc, arc);
+
+	if (!arc)
+		longjmp(abort_buf, 1);
+
+	e = new_arc_extra(arc);
+#if TRACE1
+	printf(" - arc extra is %p\n", (void *)e);
+#endif
+	fix_arc_extra(arc, e);
+	return arc;
+}
+
+static void unlink_extras(Extra * e)
+{
+#if TRACE1
+	fprintf(stderr, "unlink %p\n", (void *)e);
+	print_extra(e, 0);
+#endif
+	if (e->start.next) {
+#if TRACE1
+		print_extra(e->start.next, 0);
+#endif
+		if (e->start.next->start.next == e) {
+#if TRACE1
+			fprintf(stderr, " - %p->start points to me\n", (void *)e->start.next);
+#endif
+			e->start.next->start.next = e->end.next;
+		}
+		else if (e->start.next->end.next == e) {
+#if TRACE1
+			fprintf(stderr, " - %p->end points to me\n", (void *)e->start.next);
+#endif
+			e->start.next->end.next = e->end.next;
+		}
+		else {
+			fprintf(stderr, " - %p doesn't point to me!\n", (void *)e->start.next);
+			abort();
+		}
+	}
+	if (e->end.next) {
+#if TRACE1
+		print_extra(e->end.next, 0);
+#endif
+		if (e->end.next->start.next == e) {
+#if TRACE1
+			fprintf(stderr, " - %p->end points to me\n", (void *)e->end.next);
+#endif
+			e->end.next->start.next = e->start.next;
+		}
+		else if (e->end.next->end.next == e) {
+#if TRACE1
+			fprintf(stderr, " - %p->end points to me\n", (void *)e->end.next);
+#endif
+			e->end.next->end.next = e->start.next;
+		}
+		else {
+			fprintf(stderr, " - %p doesn't point to me!\n", (void *)e->end.next);
+			abort();
+		}
+	}
+	e->start.next = e->end.next = 0;
+}
+
+static void mark_line_for_deletion(pcb_line_t *l)
+{
+	Extra *e = LINE2EXTRA(l);
+	if (e->deleted) {
+		fprintf(stderr, "double delete?\n");
+		abort();
+	}
+	e->deleted = 1;
+	unlink_extras(e);
+#if TRACE1
+	pcb_printf("pcb_marked line %p for deletion %#mD to %#mD\n", (void *)e, l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y);
+#endif
+#if 0
+	if (l->Point1.X < 0) {
+		fprintf(stderr, "double neg move?\n");
+		abort();
+	}
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point1), -1 - l->Point1.X, -1 - l->Point1.Y);
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, l, &(l->Point2), -1 - l->Point2.X, -1 - l->Point2.Y);
+#endif
+}
+
+static void mark_arc_for_deletion(pcb_arc_t *a)
+{
+	Extra *e = ARC2EXTRA(a);
+	e->deleted = 1;
+	unlink_extras(e);
+#if TRACE1
+	printf("pcb_marked arc %p for deletion %ld < %ld\n", (void *)e, a->StartAngle, a->Delta);
+#endif
+}
+
+/* Given a starting line, which may be attached to an arc, and which
+   intersects with an ending line, which also may be attached to an
+   arc, maybe pull them.  We assume start_line is attached to the arc
+   via Point1, and attached to the end line via Point2.  Likewise, we
+   make end_line attach to the start_line via Point1 and the arc via
+   Point 2.  We also make the arcs attach on the Delta end, not the
+   Start end.  Here's a picture:
+
+     S            S+D  P1            P2   P1          P2  S+D          S
+   *--- start_arc ---*--- start_line ---*--- end_line ---*--- end_arc ---*
+     S             E   S              E   S            E   E           S
+*/
+
+static void maybe_pull_1(pcb_line_t *line)
+{
+	pcb_box_t box;
+	/* Line half-thicknesses, including line space */
+	int ex, ey;
+	pcb_line_t *new_line;
+	Extra *new_lextra;
+	pcb_arc_t *new_arc;
+	Extra *new_aextra;
+	double abs_angle;
+
+	start_line = line;
+	start_extra = LINE2EXTRA(start_line);
+	end_extra = start_extra->end.next;
+	end_line = EXTRA2LINE(end_extra);
+	if (end_extra->deleted) {
+		start_extra->end.pending = 0;
+		return;
+	}
+
+	if (end_extra->end.next == start_extra)
+		reverse_line(end_line);
+
+	if (start_extra->start.next && EXTRA_IS_ARC(start_extra->start.next)) {
+		sarc_extra = start_extra->start.next;
+		start_arc = EXTRA2ARC(sarc_extra);
+		if (sarc_extra->start.next == start_extra)
+			reverse_arc(start_arc);
+	}
+	else {
+		start_arc = 0;
+		sarc_extra = 0;
+	}
+
+	if (end_extra->end.next && EXTRA_IS_ARC(end_extra->end.next)) {
+		earc_extra = end_extra->end.next;
+		end_arc = EXTRA2ARC(earc_extra);
+		if (earc_extra->start.next == end_extra)
+			reverse_arc(end_arc);
+	}
+	else {
+		end_arc = 0;
+		earc_extra = 0;
+	}
+
+#if TRACE1
+	printf("maybe_pull_1 %p %p %p %p\n", (void *)sarc_extra, (void *)start_extra, (void *)end_extra, (void *)earc_extra);
+	if (sarc_extra)
+		print_extra(sarc_extra, 0);
+	print_extra(start_extra, 0);
+	print_extra(end_extra, 0);
+	if (earc_extra)
+		print_extra(earc_extra, 0);
+
+	if (start_extra->deleted || end_extra->deleted || (sarc_extra && sarc_extra->deleted)
+			|| (earc_extra && earc_extra->deleted)) {
+		printf(" one is deleted?\n");
+		fflush(stdout);
+		abort();
+	}
+#endif
+
+	if (!start_extra->end.pending)
+		return;
+#if 0
+	if (start_extra->end.waiting_for && start_extra->end.waiting_for->pending)
+		return;
+#endif
+
+	if (start_line->Thickness != end_line->Thickness)
+		return;
+	thickness = (start_line->Thickness + 1) / 2 + conf_core.design.bloat;
+
+	/* At this point, our expectations are all met.  */
+
+	box.X1 = start_line->Point1.X - thickness;
+	box.X2 = start_line->Point1.X + thickness;
+	box.Y1 = start_line->Point1.Y - thickness;
+	box.Y2 = start_line->Point1.Y + thickness;
+	expand_box(&box, start_line->Point2.X, start_line->Point2.Y, thickness);
+	expand_box(&box, end_line->Point2.X, end_line->Point2.Y, thickness);
+	if (start_arc)
+		expand_box(&box, sarc_extra->start.x, sarc_extra->start.y, start_arc->Thickness / 2);
+	if (end_arc)
+		expand_box(&box, earc_extra->start.x, earc_extra->start.y, end_arc->Thickness / 2);
+
+
+	se_sign = copysign(1, cross2d(start_line->Point1.X, start_line->Point1.Y,
+																start_line->Point2.X, start_line->Point2.Y, end_line->Point2.X, end_line->Point2.Y));
+	best_angle = se_sign * M_PI;
+	if (start_arc) {
+		sa_sign = copysign(1, -start_arc->Delta);
+		sa_sign *= se_sign;
+	}
+	else
+		sa_sign = 0;
+	if (end_arc) {
+		ea_sign = copysign(1, -end_arc->Delta);
+		ea_sign *= -se_sign;
+	}
+	else
+		ea_sign = 0;
+
+	start_angle = atan2(start_line->Point2.Y - start_line->Point1.Y, start_line->Point2.X - start_line->Point1.X);
+#if TRACE1
+	printf("se_sign %f sa_sign %f ea_sign %f best_angle %f start_angle %f\n",
+				 se_sign, sa_sign, ea_sign, r2d(best_angle), r2d(start_angle));
+#endif
+
+	if (start_arc) {
+		sa_x = start_arc->X;
+		sa_y = start_arc->Y;
+		if (same_sign(start_arc->Delta, se_sign))
+			sa_r = -start_arc->Width;
+		else
+			sa_r = start_arc->Width;
+	}
+	else {
+		sa_x = start_line->Point1.X;
+		sa_y = start_line->Point1.Y;
+		sa_r = 0;
+	}
+
+	if (end_arc) {
+		if (ea_sign < 0)
+			ea_r = end_arc->Width;
+		else
+			ea_r = -end_arc->Width;
+	}
+	else
+		ea_r = 0;
+
+#if TRACE1
+	trace_path(sarc_extra ? sarc_extra : start_extra);
+#endif
+
+	if (end_arc) {
+		gp_point_force(end_arc->X, end_arc->Y, -ea_r - thickness, 0, 0, 0, 1, "end arc");
+		ex = end_arc->X;
+		ey = end_arc->Y;
+	}
+	else {
+		gp_point_force(end_line->Point2.X, end_line->Point2.Y, -thickness, 0, 0, 0, 1, "end arc");
+		ex = end_line->Point2.X;
+		ey = end_line->Point2.Y;
+	}
+
+	fx = ex;
+	fy = ey;
+	if (fx < 0) {
+		pcb_fprintf(stderr, "end line corrupt? f is %#mD\n", fx, fy);
+		print_extra(end_extra, 0);
+		if (earc_extra)
+			print_extra(earc_extra, 0);
+		abort();
+	}
+
+	end_dist = pcb_distance(end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y);
+
+	start_pinpad = start_extra->start.pin;
+	end_pinpad = start_extra->end.pin;
+	fp = 0;
+
+	pcb_r_search(CURRENT->line_tree, &box, NULL, gp_line_cb, 0, NULL);
+	pcb_r_search(CURRENT->arc_tree, &box, NULL, gp_arc_cb, 0, NULL);
+	pcb_r_search(CURRENT->text_tree, &box, NULL, gp_text_cb, 0, NULL);
+	pcb_r_search(CURRENT->polygon_tree, &box, NULL, gp_poly_cb, 0, NULL);
+	pcb_r_search(PCB->Data->padstack_tree, &box, NULL, gp_pstk_cb, 0, NULL);
+
+	/* radians, absolute angle of (at the moment) the start_line */
+	abs_angle = fa + start_angle;
+
+#if TRACE1
+	pcb_printf("\033[43;30mBest: at %#mD r %#mS, angle %.1f fp %d\033[0m\n", fx, fy, fr, r2d(fa), fp);
+#endif
+
+#if 0
+	if (fa > M_PI / 2 || fa < -M_PI / 2) {
+		PCB_FLAG_SET(PCB_FLAG_FOUND, line);
+		longjmp(abort_buf, 1);
+	}
+#endif
+
+	if (fp) {
+		start_extra->end.waiting_for = fp_end;
+		return;
+	}
+	start_extra->end.pending = 0;
+
+	/* Step 0: check for merged arcs (special case).  */
+
+	if (fx == ex && fy == ey && start_arc && end_arc && start_arc->X == end_arc->X && start_arc->Y == end_arc->Y) {
+		/* Merge arcs */
+		int new_delta;
+
+		new_delta = end_arc->StartAngle - start_arc->StartAngle;
+		if (start_arc->Delta > 0) {
+			while (new_delta > 360)
+				new_delta -= 360;
+			while (new_delta < 0)
+				new_delta += 360;
+		}
+		else {
+			while (new_delta < -360)
+				new_delta += 360;
+			while (new_delta > 0)
+				new_delta -= 360;
+		}
+#if TRACE1
+		pcb_printf("merging arcs at %#mS nd %d\n", start_arc->X, start_arc->Y, new_delta);
+		print_extra(sarc_extra, 0);
+		print_extra(earc_extra, 0);
+#endif
+		mark_arc_for_deletion(end_arc);
+		mark_line_for_deletion(start_line);
+		mark_line_for_deletion(end_line);
+		pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta);
+		fix_arc_extra(start_arc, sarc_extra);
+		did_something++;
+		return;
+	}
+
+	/* Step 1: adjust start_arc's angles and move start_line's Point1 to
+	   match it. */
+
+	if (start_arc) {
+		double new_delta;
+		int del_arc = 0;
+
+		/* We must always round towards "larger arcs", whichever way that is. */
+		new_delta = 180 - r2d(abs_angle);
+#if TRACE1
+		printf("new_delta starts at %d vs %d < %d\n", (int) new_delta, (int) start_arc->StartAngle, (int) start_arc->Delta);
+#endif
+		if (start_arc->Delta < 0)
+			new_delta = (int) (new_delta) + 90;
+		else
+			new_delta = (int) new_delta - 90;
+		new_delta = new_delta - start_arc->StartAngle;
+		while (new_delta > start_arc->Delta + 180)
+			new_delta -= 360;
+		while (new_delta < start_arc->Delta - 180)
+			new_delta += 360;
+#if TRACE1
+		printf("new_delta adjusts to %d\n", (int) new_delta);
+		printf("fa = %f, new_delta ends at %.1f vs start %d\n", fa, new_delta, (int) start_arc->StartAngle);
+#endif
+
+		if (new_delta * start_arc->Delta <= 0)
+			del_arc = 1;
+
+		pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta);
+		fix_arc_extra(start_arc, sarc_extra);
+		pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
+							 sarc_extra->end.x - start_line->Point1.X, sarc_extra->end.y - start_line->Point1.Y);
+
+		if (del_arc) {
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point1),
+								 sarc_extra->start.x - start_line->Point1.X, sarc_extra->start.y - start_line->Point1.Y);
+			mark_arc_for_deletion(start_arc);
+		}
+	}
+
+	/* Step 1.5: If the "obstacle" is right at the end, ignore it.  */
+
+	{
+		double oa = start_angle + fa - M_PI / 2 * se_sign;
+		double ox = fx + fr * cos(oa);
+		double oy = fy + fr * sin(oa);
+#if TRACE1
+		pcb_printf("obstacle at %#mD angle %d = arc starts at %#mD\n", fx, fy, (int) r2d(oa), (int) ox, (int) oy);
+#endif
+
+		if (pcb_distance(ox, oy, end_line->Point2.X, end_line->Point2.Y)
+				< fr * SIN1D) {
+			/* Pretend it doesn't exist.  */
+			fx = ex;
+			fy = ey;
+		}
+	}
+
+	/* Step 2: If we have no obstacles, connect start and end.  */
+
+#if TRACE1
+	pcb_printf("fx %#mS ex %#mS fy %#mS ey %#mS\n", fx, ex, fy, ey);
+#endif
+	if (fx == ex && fy == ey) {
+		/* No obstacles.  */
+#if TRACE1
+		printf("\033[32mno obstacles\033[0m\n");
+#endif
+		if (end_arc) {
+			int del_arc = 0;
+			int new_delta, end_angle, pcb_fa, end_change;
+
+			end_angle = end_arc->StartAngle + end_arc->Delta;
+			if (end_arc->Delta < 0)
+				end_angle -= 90;
+			else
+				end_angle += 90;
+
+			/* We must round so as to make the larger arc.  */
+			if (end_arc->Delta < 0)
+				pcb_fa = -r2d(start_angle + fa);
+			else
+				pcb_fa = 1 - r2d(start_angle + fa);
+			end_change = pcb_fa - end_angle;
+
+			while (end_change > 180)
+				end_change -= 360;
+			while (end_change < -180)
+				end_change += 360;
+			new_delta = end_arc->Delta + end_change;
+
+			if (new_delta * end_arc->Delta <= 0)
+				del_arc = 1;
+
+			pcb_arc_set_angles(CURRENT, end_arc, end_arc->StartAngle, new_delta);
+			fix_arc_extra(end_arc, earc_extra);
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+								 earc_extra->end.x - start_line->Point2.X, earc_extra->end.y - start_line->Point2.Y);
+
+			if (del_arc) {
+				pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+									 earc_extra->start.x - start_line->Point2.X, earc_extra->start.y - start_line->Point2.Y);
+				mark_arc_for_deletion(end_arc);
+			}
+		}
+		else {
+			pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+								 end_line->Point2.X - start_line->Point2.X, end_line->Point2.Y - start_line->Point2.Y);
+		}
+		mark_line_for_deletion(end_line);
+		start_extra->end.pending = 1;
+
+#if TRACE1
+		printf("\033[35mdid_something: no obstacles\033[0m\n");
+#endif
+		did_something++;
+		npulled++;
+		status();
+		return;
+	}
+
+	/* Step 3: Compute the new intersection of start_line and end_line.  */
+
+	ex = start_line->Point1.X + cos(start_angle + fa) * 10000.0;
+	ey = start_line->Point1.Y + sin(start_angle + fa) * 10000.0;
+#if TRACE1
+	pcb_printf("temp point %#mS\n", ex, ey);
+	pcb_printf("intersect %#mS-%#mS with %#mS-%#mS\n",
+						 start_line->Point1.X, start_line->Point1.Y,
+						 ex, ey, end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y);
+#endif
+	if (!intersection_of_lines(start_line->Point1.X, start_line->Point1.Y,
+														 ex, ey,
+														 end_line->Point1.X, end_line->Point1.Y, end_line->Point2.X, end_line->Point2.Y, &ex, &ey)) {
+		ex = end_line->Point2.X;
+		ey = end_line->Point2.Y;
+	}
+#if TRACE1
+	pcb_printf("new point %#mS\n", ex, ey);
+#endif
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, end_line, &(end_line->Point1), ex - end_line->Point1.X, ey - end_line->Point1.Y);
+
+	/* Step 4: Split start_line at the obstacle and insert a zero-delta
+	   arc at it.  */
+
+	new_arc = create_arc(start_line, fx, fy, fr, 90 - (int) (r2d(start_angle + fa) + 0.5) + 90 + 90 * se_sign, -se_sign);
+	new_aextra = ARC2EXTRA(new_arc);
+
+	if (start_arc)
+		sarc_extra = ARC2EXTRA(start_arc);
+	if (end_arc)
+		earc_extra = ARC2EXTRA(end_arc);
+
+	pcb_move_obj(PCB_OBJ_LINE_POINT, CURRENT, start_line, &(start_line->Point2),
+						 new_aextra->start.x - start_line->Point2.X, new_aextra->start.y - start_line->Point2.Y);
+
+	new_line = create_line(start_line, new_aextra->end.x, new_aextra->end.y, ex, ey);
+	start_extra = LINE2EXTRA(start_line);
+	new_lextra = LINE2EXTRA(new_line);
+	end_extra = LINE2EXTRA(end_line);
+
+	new_lextra->start.pin = start_extra->start.pin;
+	new_lextra->end.pin = start_extra->end.pin;
+	new_lextra->start.pending = 1;
+	new_lextra->end.pending = 1;
+
+	start_extra->end.next = new_aextra;
+	new_aextra->start.next = start_extra;
+	new_aextra->end.next = new_lextra;
+	new_lextra->start.next = new_aextra;
+	new_lextra->end.next = end_extra;
+	end_extra->start.next = new_lextra;
+
+	/* Step 5: Recurse.  */
+
+	did_something++;
+	npulled++;
+	status();
+#if TRACE0
+	printf("\033[35mdid_something: recursing\033[0m\n");
+	{
+		int i = pcb_gui->confirm_dialog("recurse?", 0);
+		printf("confirm = %d\n", i);
+		if (i == 0)
+			return;
+	}
+	printf("\n\033[33mRECURSING\033[0m\n\n");
+	pcb_undo_inc_serial();
+#endif
+	maybe_pull_1(new_line);
+}
+
+/* Given a line with a end_next, attempt to pull both ends.  */
+static void maybe_pull(pcb_line_t *line, Extra * e)
+{
+#if TRACE0
+	printf("maybe_pull: ");
+	print_extra(e, 0);
+#endif
+	if (e->end.next && EXTRA_IS_LINE(e->end.next)) {
+		maybe_pull_1(line);
+	}
+	else {
+		e->end.pending = 0;
+		if (e->start.next && EXTRA_IS_LINE(e->start.next)) {
+			reverse_line(line);
+			maybe_pull_1(line);
+		}
+		else
+			e->start.pending = 0;
+	}
+}
+
+static void validate_pair(Extra * e, End * end)
+{
+	if (!end->next)
+		return;
+	if (end->next->start.next == e)
+		return;
+	if (end->next->end.next == e)
+		return;
+	fprintf(stderr, "no backlink!\n");
+	print_extra(e, 0);
+	print_extra(end->next, 0);
+	abort();
+}
+
+static void validate_pair_cb(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	validate_pair(extra, &extra->start);
+	validate_pair(extra, &extra->end);
+}
+
+static void validate_pairs()
+{
+	g_hash_table_foreach(lines, (GHFunc) validate_pair_cb, NULL);
+#if TRACE1
+	printf("\narcs\n");
+#endif
+	g_hash_table_foreach(arcs, (GHFunc) validate_pair_cb, NULL);
+}
+
+static void FreeExtra(Extra * extra)
+{
+	g_slice_free(Extra, extra);
+}
+
+static void mark_ends_pending(pcb_line_t * line, Extra * extra, void *userdata)
+{
+	int *select_flags = userdata;
+	if (PCB_FLAGS_TEST(*select_flags, line)) {
+		extra->start.pending = 1;
+		extra->end.pending = 1;
+	}
+}
+
+#if TRACE1
+static void trace_print_extra(pcb_any_obj_t * ptr, Extra * extra, void *userdata)
+{
+	last_pextra = (Extra *) 1;
+	print_extra(extra, 0);
+}
+
+static void trace_print_lines_arcs(void)
+{
+	printf("\nlines\n");
+	g_hash_table_foreach(lines, (GHFunc) trace_print_extra, NULL);
+
+	printf("\narcs\n");
+	g_hash_table_foreach(arcs, (GHFunc) trace_print_extra, NULL);
+
+	printf("\n");
+}
+#endif
+
+static fgw_error_t pcb_act_GlobalPuller(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = -2, select_flags = 0;
+	unsigned int cflg;
+
+	setbuf(stdout, 0);
+	nloops = 0;
+	npulled = 0;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, GlobalPuller, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case F_Selected: select_flags = PCB_FLAG_SELECTED; break;
+		case F_Found:    select_flags = PCB_FLAG_FOUND; break;
+		case -2: select_flags = 0; break;
+		default:
+			PCB_ACT_FAIL(GlobalPuller);
+	}
+
+	/* This canonicalizes all the lines, and cleans up near-misses.  */
+	/* pcb_actionl("djopt", "puller", 0); */
+
+	cflg = pcb_layergrp_flags(PCB, pcb_layer_get_group_(CURRENT));
+	current_is_solder = (cflg & PCB_LYT_BOTTOM);
+	current_is_component = (cflg & PCB_LYT_TOP);
+
+	lines = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra);
+	arcs = g_hash_table_new_full(NULL, NULL, NULL, (GDestroyNotify) FreeExtra);
+
+	printf("pairing...\n");
+	find_pairs();
+	validate_pairs();
+
+	g_hash_table_foreach(lines, (GHFunc) mark_ends_pending, &select_flags);
+
+#if TRACE1
+	trace_print_lines_arcs();
+#endif
+
+	propogate_ends();
+
+#if TRACE1
+	trace_print_lines_arcs();
+	trace_paths();
+#endif
+
+	printf("pulling...\n");
+	if (setjmp(abort_buf) == 0) {
+#if TRACE0
+		int old_did_something = -1;
+#endif
+		did_something = 1;
+		while (did_something) {
+			nloops++;
+			status();
+			did_something = 0;
+			PCB_LINE_LOOP(CURRENT); {
+				Extra *e = LINE2EXTRA(line);
+				if (e->deleted)
+					continue;
+#ifdef CHECK_LINE_PT_NEG
+				if (line->Point1.X < 0)
+					abort1();
+#endif
+				if (e->start.next || e->end.next)
+					maybe_pull(line, e);
+#if TRACE0
+				if (did_something != old_did_something) {
+					pcb_undo_inc_serial();
+					old_did_something = did_something;
+					if (pcb_gui->confirm_dialog("more?", 0) == 0) {
+						did_something = 0;
+						break;
+					}
+				}
+#endif
+				/*pcb_gui->progress(0,0,0); */
+			}
+			PCB_END_LOOP;
+		}
+	}
+
+#if TRACE0
+	printf("\nlines\n");
+	g_hash_table_foreach(lines, (GHFunc) trace_print_extra, NULL);
+	printf("\narcs\n");
+	g_hash_table_foreach(arcs, (GHFunc) trace_print_extra, NULL);
+	printf("\n");
+	printf("\nlines\n");
+#endif
+
+	PCB_LINE_LOOP(CURRENT);
+	{
+		if (LINE2EXTRA(line)->deleted)
+			pcb_line_destroy(CURRENT, line);
+	}
+	PCB_END_LOOP;
+
+	PCB_ARC_LOOP(CURRENT);
+	{
+		if (ARC2EXTRA(arc)->deleted)
+			pcb_arc_destroy(CURRENT, arc);
+	}
+	PCB_END_LOOP;
+
+	g_hash_table_unref(lines);
+	g_hash_table_unref(arcs);
+
+	pcb_undo_inc_serial();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/*****************************************************************************/
+/*                                                                           */
+/*                             Actions                                       */
+/*                                                                           */
+/*****************************************************************************/
+
+pcb_action_t puller_action_list[] = {
+	{"Puller", pcb_act_Puller, pcb_acth_Puller, pcb_acts_Puller},
+	{"GlobalPuller", pcb_act_GlobalPuller, pcb_acth_GlobalPuller, pcb_acts_GlobalPuller}
+};
+
+static const char *puller_cookie = "puller plugin";
+
+PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie)
+
+int pplg_check_ver_puller(int ver_needed) { return 0; }
+
+void pplg_uninit_puller(void)
+{
+	pcb_remove_actions_by_cookie(puller_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_puller(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(puller_action_list, puller_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/puller/puller.pup
===================================================================
--- tags/2.0.1/src_plugins/puller/puller.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/puller/puller.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short puller
+$long Pull traces to minimize their length.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/query/Makefile
===================================================================
--- tags/2.0.1/src_plugins/query/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/query/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_query
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/query/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/query/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/query/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,20 @@
+put /local/pcb/mod {query}
+put /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/query/query.o
+ $(PLUGDIR)/query/query_access.o
+ $(PLUGDIR)/query/query_act.o
+ $(PLUGDIR)/query/query_exec.o
+ $(PLUGDIR)/query/query_l.o
+ $(PLUGDIR)/query/query_y.o
+ $(PLUGDIR)/query/basic_fnc.o
+ $(PLUGDIR)/query/fields_sphash.o
+@]
+put /local/pcb/mod/YACC {$(PLUGDIR)/query/query_y}
+put /local/pcb/mod/LEX  {$(PLUGDIR)/query/query_l}
+put /local/pcb/mod/SPHASH  {$(PLUGDIR)/query/fields.sphash}
+
+switch /local/pcb/query/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/query/basic_fnc.c
===================================================================
--- tags/2.0.1/src_plugins/query/basic_fnc.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/basic_fnc.c	(revision 18980)
@@ -0,0 +1,46 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+#include "data.h"
+#include "query_access.h"
+#include "query_exec.h"
+
+/* Query language - basic functions */
+static int fnc_llen(int argc, pcb_qry_val_t *argv, pcb_qry_val_t *res)
+{
+	if (argc != 1)
+		return -1;
+	if (argv[0].type != PCBQ_VT_LST)
+		PCB_QRY_RET_INV(res);
+	PCB_QRY_RET_INT(res, vtp0_len(&argv[0].data.lst));
+}
+
+
+
+void pcb_qry_basic_fnc_init(void)
+{
+	pcb_qry_fnc_reg("llen", fnc_llen);
+}
Index: tags/2.0.1/src_plugins/query/fields.sphash
===================================================================
--- tags/2.0.1/src_plugins/query/fields.sphash	(nonexistent)
+++ tags/2.0.1/src_plugins/query/fields.sphash	(revision 18980)
@@ -0,0 +1,44 @@
+a
+p
+x
+y
+cx
+cy
+x1
+y1
+x2
+y2
+thickness
+clearance
+layer
+width
+height
+name
+visible
+position
+type
+angle
+start
+delta
+scale
+rotation
+string
+points
+hole
+mask
+number
+description
+value
+ID
+bbox
+type
+area
+refdes
+length
+length2
+xmirror
+smirror
+plated
+shape
+subc
+side
Index: tags/2.0.1/src_plugins/query/query.c
===================================================================
--- tags/2.0.1/src_plugins/query/query.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query.c	(revision 18980)
@@ -0,0 +1,312 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - common code for the compiled tree and plugin administration */
+
+#include "config.h"
+#include <genht/hash.h>
+#include <genht/htsi.h>
+#include "conf.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "hid_init.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "query.h"
+#include "fptr_cast.h"
+
+/******** tree helper ********/
+
+const char *type_name[PCBQ_nodetype_max] = {
+	"PCBQ_RULE",
+	"PCBQ_RNAME",
+	"PCBQ_EXPR_PROG",
+	"PCBQ_EXPR",
+	"PCBQ_ITER_CTX",
+	"PCBQ_OP_AND",
+	"PCBQ_OP_OR",
+	"PCBQ_OP_EQ",
+	"PCBQ_OP_NEQ",
+	"PCBQ_OP_GTEQ",
+	"PCBQ_OP_LTEQ",
+	"PCBQ_OP_GT",
+	"PCBQ_OP_LT",
+	"PCBQ_OP_ADD",
+	"PCBQ_OP_SUB",
+	"PCBQ_OP_MUL",
+	"PCBQ_OP_DIV",
+	"PCBQ_OP_MATCH",
+	"PCBQ_OP_NOT",
+	"PCBQ_FIELD",
+	"PCBQ_FIELD_OF",
+	"PCBQ_LISTVAR",
+	"PCBQ_VAR",
+	"PCBQ_FNAME",
+	"PCBQ_FCALL",
+	"PCBQ_FLAG",
+	"PCBQ_DATA_COORD",
+	"PCBQ_DATA_DOUBLE",
+	"PCBQ_DATA_STRING",
+	"PCBQ_DATA_REGEX",
+	"PCBQ_DATA_CONST",
+	"PCBQ_DATA_INVALID",
+	"PCBQ_DATA_LYTC"
+};
+
+char *pcb_query_sprint_val(pcb_qry_val_t *val)
+{
+	switch(val->type) {
+		case PCBQ_VT_VOID:   return pcb_strdup("<void>");
+		case PCBQ_VT_COORD:  return pcb_strdup_printf("%mI=%$mH", val->data.crd, val->data.crd);
+		case PCBQ_VT_DOUBLE: return pcb_strdup_printf("%f", val->data.dbl);
+		case PCBQ_VT_STRING: return pcb_strdup_printf("\"%s\"", val->data.str);
+		case PCBQ_VT_OBJ:    return pcb_strdup("<obj>");
+		case PCBQ_VT_LST:    return pcb_strdup("<lst>");
+	}
+	return pcb_strdup("<invalid>");
+}
+
+const char *pcb_qry_nodetype_name(pcb_qry_nodetype_t ntype)
+{
+	int type = ntype;
+	if ((type < 0) || (type >= PCBQ_nodetype_max))
+		return "<invalid>";
+	return type_name[type];
+}
+
+pcb_qry_node_t *pcb_qry_n_alloc(pcb_qry_nodetype_t ntype)
+{
+	pcb_qry_node_t *nd = calloc(sizeof(pcb_qry_node_t), 1);
+	nd->type = ntype;
+	return nd;
+}
+
+pcb_qry_node_t *pcb_qry_n_insert(pcb_qry_node_t *parent, pcb_qry_node_t *ch)
+{
+	ch->next = parent->data.children;
+	parent->data.children = ch;
+	ch->parent = parent;
+	return parent;
+}
+
+static char ind[] = "                                                                                ";
+void pcb_qry_dump_tree_(const char *prefix, int level, pcb_qry_node_t *nd, pcb_query_iter_t *it_ctx)
+{
+	pcb_qry_node_t *n;
+	if (level < sizeof(ind))  ind[level] = '\0';
+	printf("%s%s%s    ", prefix, ind, pcb_qry_nodetype_name(nd->type));
+	switch(nd->type) {
+		case PCBQ_DATA_INVALID:pcb_printf("%s%s invalid (literal)\n", prefix, ind); break;
+		case PCBQ_DATA_COORD:  pcb_printf("%s%s %mI (%$mm)\n", prefix, ind, nd->data.crd, nd->data.crd); break;
+		case PCBQ_DATA_DOUBLE: pcb_printf("%s%s %f\n", prefix, ind, nd->data.dbl); break;
+		case PCBQ_DATA_CONST:  pcb_printf("%s%s %s\n", prefix, ind, nd->data.str); break;
+		case PCBQ_ITER_CTX:    pcb_printf("%s%s vars=%d\n", prefix, ind, nd->data.iter_ctx->num_vars); break;
+		case PCBQ_FLAG:        pcb_printf("%s%s %s\n", prefix, ind, nd->precomp.flg->name); break;
+		case PCBQ_VAR:
+			pcb_printf("%s%s ", prefix, ind);
+			if ((it_ctx != NULL) && (nd->data.crd < it_ctx->num_vars)) {
+				if (it_ctx->vects == NULL)
+					pcb_qry_iter_init(it_ctx);
+				printf("%s\n", it_ctx->vn[nd->data.crd]);
+			}
+			else
+				printf("<invalid:%d>\n", nd->data.crd);
+			break;
+		case PCBQ_FNAME:
+			{
+				const char *name = pcb_qry_fnc_name(nd->data.fnc);
+				if (name == NULL)
+					pcb_printf("%s%s <unknown>\n", prefix, ind);
+				else
+					pcb_printf("%s%s %s()\n", prefix, ind, name);
+			}
+			break;
+		case PCBQ_FIELD:
+		case PCBQ_LISTVAR:
+		case PCBQ_DATA_REGEX:
+		case PCBQ_DATA_STRING: pcb_printf("%s%s '%s'\n", prefix, ind, nd->data.str); break;
+		default:
+			printf("\n");
+			if (level < sizeof(ind))  ind[level] = ' ';
+			for(n = nd->data.children; n != NULL; n = n->next) {
+				if (n->parent != nd)
+					printf("#parent# ");
+				pcb_qry_dump_tree_(prefix, level+1, n, it_ctx);
+			}
+			return;
+	}
+	if (level < sizeof(ind))  ind[level] = ' ';
+}
+
+pcb_query_iter_t *pcb_qry_find_iter(pcb_qry_node_t *node)
+{
+	for(; node != NULL;node = node->parent) {
+		if (node->type == PCBQ_EXPR_PROG) {
+			if (node->data.children->type == PCBQ_ITER_CTX)
+				return node->data.children->data.iter_ctx;
+		}
+		if (node->type == PCBQ_EXPR_PROG) {
+			if (node->data.children->type == PCBQ_ITER_CTX)
+				return node->data.children->data.iter_ctx;
+		}
+	}
+
+	return NULL;
+}
+
+void pcb_qry_dump_tree(const char *prefix, pcb_qry_node_t *top)
+{
+	pcb_query_iter_t *iter_ctx = pcb_qry_find_iter(top);
+
+	if (iter_ctx == NULL)
+		printf("<can't find iter context>\n");
+
+	for(; top != NULL; top = top->next)
+		pcb_qry_dump_tree_(prefix, 0, top, iter_ctx);
+}
+
+/******** iter admin ********/
+pcb_query_iter_t *pcb_qry_iter_alloc(void)
+{
+	pcb_query_iter_t *it = calloc(1, sizeof(pcb_query_iter_t));
+	htsi_init(&it->names, strhash, strkeyeq);
+	return it;
+}
+
+
+int pcb_qry_iter_var(pcb_query_iter_t *it, const char *varname, int alloc)
+{
+	htsi_entry_t *e = htsi_getentry(&it->names, varname);
+
+	if (e != NULL)
+		return e->value;
+
+	if (!alloc)
+		return -1;
+
+	htsi_set(&it->names, pcb_strdup(varname), it->num_vars);
+	return it->num_vars++;
+}
+
+void pcb_qry_iter_init(pcb_query_iter_t *it)
+{
+	htsi_entry_t *e;
+
+	if (it->vn != NULL)
+		return;
+	it->vects  = calloc(sizeof(vtp0_t *), it->num_vars);
+	it->idx  = calloc(sizeof(pcb_cardinal_t), it->num_vars);
+	it->lst = calloc(sizeof(pcb_qry_val_t), it->num_vars);
+
+	it->vn = malloc(sizeof(char *) * it->num_vars);
+	for (e = htsi_first(&it->names); e; e = htsi_next(&it->names, e))
+		it->vn[e->value] = e->key;
+	it->all_idx = -1;
+}
+
+/******** functions ********/
+static htsp_t *qfnc = NULL;
+
+static void pcb_qry_fnc_destroy(void)
+{
+	htsp_entry_t *e;
+	for(e = htsp_first(qfnc); e != NULL; e = htsp_next(qfnc, e))
+		free(e->key);
+	htsp_free(qfnc);
+	qfnc = NULL;
+}
+
+int pcb_qry_fnc_reg(const char *name, pcb_qry_fnc_t fnc)
+{
+	if (qfnc == NULL)
+		qfnc = htsp_alloc(strhash, strkeyeq);
+	if (htsp_get(qfnc, name) != NULL)
+		return -1;
+
+	htsp_set(qfnc, pcb_strdup(name), pcb_cast_f2d((pcb_fptr_t)fnc));
+
+	return 0;
+}
+
+pcb_qry_fnc_t pcb_qry_fnc_lookup(const char *name)
+{
+	if (qfnc == NULL)
+		return NULL;
+
+	return (pcb_qry_fnc_t)pcb_cast_d2f(htsp_get(qfnc, name));
+}
+
+/* slow linear search: it's only for the dump */
+const char *pcb_qry_fnc_name(pcb_qry_fnc_t fnc)
+{
+	htsp_entry_t *e;
+	void *target = pcb_cast_f2d((pcb_fptr_t)fnc);
+
+	if (qfnc == NULL)
+		return NULL;
+
+	for(e = htsp_first(qfnc); e != NULL; e = htsp_next(qfnc, e))
+		if (e->value == target)
+			return e->key;
+	return NULL;
+}
+
+/******** parser helper ********/
+void qry_error(void *prog, const char *err)
+{
+	pcb_trace("qry_error: %s\n", err);
+}
+
+int qry_wrap()
+{
+	return 1;
+}
+
+/******** plugin helper ********/
+void query_action_reg(const char *cookie);
+
+static const char *query_cookie = "query plugin";
+
+int pplg_check_ver_query(int ver_needed) { return 0; }
+
+void pplg_uninit_query(void)
+{
+	pcb_remove_actions_by_cookie(query_cookie);
+	pcb_qry_fnc_destroy();
+}
+
+void pcb_qry_basic_fnc_init(void);
+
+int pplg_init_query(void)
+{
+	PCB_API_CHK_VER;
+	pcb_qry_basic_fnc_init();
+	query_action_reg(query_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/query/query.h
===================================================================
--- tags/2.0.1/src_plugins/query/query.h	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query.h	(revision 18980)
@@ -0,0 +1,168 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#ifndef PCB_QUERY_H
+#define PCB_QUERY_H
+
+#include <genvector/vtp0.h>
+#include <genht/htsi.h>
+#include <genregex/regex_se.h>
+#include "fields_sphash.h"
+#include "obj_common.h"
+#include "layer.h"
+#include "flag_str.h"
+
+typedef struct pcb_qry_val_s pcb_qry_val_t;
+typedef struct pcb_query_iter_s  pcb_query_iter_t;
+
+typedef int (*pcb_qry_fnc_t)(int argc, pcb_qry_val_t *argv, pcb_qry_val_t *res);
+
+/* value of an expression */
+typedef enum pcb_qry_valtype_e {
+	PCBQ_VT_VOID,
+	PCBQ_VT_OBJ,
+	PCBQ_VT_LST,
+	PCBQ_VT_COORD,   /* considered int */
+	PCBQ_VT_DOUBLE,
+	PCBQ_VT_STRING
+} pcb_qry_valtype_t;
+
+struct pcb_qry_val_s {
+	pcb_qry_valtype_t type;
+	union {
+		pcb_any_obj_t *obj;
+		vtp0_t lst;
+		pcb_coord_t crd;
+		double dbl;
+		const char *str;
+	} data;
+};
+
+/* Script parsed into a tree */
+typedef struct pcb_qry_node_s pcb_qry_node_t;
+typedef enum {
+	PCBQ_RULE,
+	PCBQ_RNAME,
+	PCBQ_EXPR_PROG,
+	PCBQ_EXPR,
+	PCBQ_ITER_CTX,
+
+	PCBQ_OP_AND,
+	PCBQ_OP_OR,
+	PCBQ_OP_EQ,
+	PCBQ_OP_NEQ,
+	PCBQ_OP_GTEQ,
+	PCBQ_OP_LTEQ,
+	PCBQ_OP_GT,
+	PCBQ_OP_LT,
+	PCBQ_OP_ADD,
+	PCBQ_OP_SUB,
+	PCBQ_OP_MUL,
+	PCBQ_OP_DIV,
+	PCBQ_OP_MATCH,
+	
+	PCBQ_OP_NOT,
+	PCBQ_FIELD,
+	PCBQ_FIELD_OF,
+	PCBQ_LISTVAR,
+	PCBQ_VAR,
+	PCBQ_FNAME,
+	PCBQ_FCALL,
+	PCBQ_FLAG,         /* leaf */
+
+	PCBQ_DATA_COORD,   /* leaf */
+	PCBQ_DATA_DOUBLE,  /* leaf */
+	PCBQ_DATA_STRING,  /* leaf */
+	PCBQ_DATA_REGEX,   /* leaf */
+	PCBQ_DATA_CONST,   /* leaf */
+	PCBQ_DATA_INVALID, /* leaf */
+	PCBQ_DATA_LYTC,    /* leaf */
+
+	PCBQ_nodetype_max
+} pcb_qry_nodetype_t;
+
+
+struct pcb_qry_node_s {
+	pcb_qry_nodetype_t type;
+	pcb_qry_node_t *next;         /* sibling on this level of the tree (or NULL) */
+	pcb_qry_node_t *parent;
+	union {                       /* field selection depends on ->type */
+		pcb_coord_t crd;
+		double dbl;
+		const char *str;
+		pcb_query_iter_t *iter_ctx;
+		pcb_qry_node_t *children;   /* first child (NULL for a leaf node) */
+		pcb_qry_fnc_t fnc;
+		struct pcb_qry_lytc_s {
+			pcb_layer_type_t lyt;
+			pcb_layer_combining_t lyc;
+		} lytc;
+	} data;
+	union {                       /* field selection depends on ->type */
+		query_fields_keys_t fld;    /* field_sphash value from str */
+		pcb_qry_val_t result;       /* of pure functions and subtrees */
+		re_se_t *regex;
+		long cnst;                  /* named constant */
+		pcb_flag_bits_t *flg;
+	} precomp;
+};
+
+
+pcb_qry_node_t *pcb_qry_n_alloc(pcb_qry_nodetype_t ntype);
+pcb_qry_node_t *pcb_qry_n_insert(pcb_qry_node_t *parent, pcb_qry_node_t *ch);
+
+void pcb_qry_dump_tree(const char *prefix, pcb_qry_node_t *top);
+
+void pcb_qry_set_input(const char *script);
+
+struct pcb_query_iter_s {
+	htsi_t names;         /* name->index hash */
+	int num_vars;
+
+	const char **vn;      /* pointers to the hash names so they can be indexed */
+	pcb_qry_val_t *lst;
+
+	/* iterator state for each variable - point into the correspoinding lst[] */
+	vtp0_t **vects;
+	pcb_cardinal_t *idx;
+
+	int all_idx;          /* index of the "@" variable or -1 */
+};
+
+pcb_query_iter_t *pcb_qry_iter_alloc(void);
+int pcb_qry_iter_var(pcb_query_iter_t *it, const char *varname, int alloc);
+void pcb_qry_iter_init(pcb_query_iter_t *it);
+
+pcb_query_iter_t *pcb_qry_find_iter(pcb_qry_node_t *node);
+
+char *pcb_query_sprint_val(pcb_qry_val_t *val);
+
+/* functions */
+int pcb_qry_fnc_reg(const char *name, pcb_qry_fnc_t fnc);
+pcb_qry_fnc_t pcb_qry_fnc_lookup(const char *name);
+const char *pcb_qry_fnc_name(pcb_qry_fnc_t fnc);
+
+#endif
Index: tags/2.0.1/src_plugins/query/query.pup
===================================================================
--- tags/2.0.1/src_plugins/query/query.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short query language
+$long pcb-rnd query language: execute expressions on objects and rules for the programmed drc.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/query/query_access.c
===================================================================
--- tags/2.0.1/src_plugins/query/query_access.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_access.c	(revision 18980)
@@ -0,0 +1,767 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - access to / extract core data */
+
+#include "config.h"
+#include "math_helper.h"
+#include "compat_misc.h"
+#include "board.h"
+#include "data.h"
+#include "query_access.h"
+#include "query_exec.h"
+#include "layer.h"
+#include "fields_sphash.h"
+#include "obj_pstk_inlines.h"
+#include "obj_subc_parent.h"
+
+#define APPEND(_lst_, _obj_) vtp0_append((vtp0_t *)_lst_, _obj_)
+
+static int list_layer_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, int enter)
+{
+	if (enter)
+		APPEND(ctx, layer);
+	return 0;
+}
+
+static void list_line_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
+{
+	APPEND(ctx, line);
+}
+
+static void list_arc_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_arc_t *arc)
+{
+	APPEND(ctx, arc);
+}
+
+static void list_text_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text)
+{
+	APPEND(ctx, text);
+}
+
+static void list_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly)
+{
+	APPEND(ctx, poly);
+}
+
+static void list_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
+{
+	APPEND(ctx, ps);
+}
+
+static int list_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
+{
+	
+	if (enter) {
+		pcb_data_t *data = subc->data;
+		APPEND(ctx, subc);
+
+		PCB_SUBC_LOOP(data);
+		{
+			list_subc_cb(ctx, pcb, subc, 1);
+		}
+		PCB_END_LOOP;
+		PCB_PADSTACK_LOOP(data);
+		{
+			list_pstk_cb(ctx, pcb, padstack);
+		}
+		PCB_END_LOOP;
+
+		PCB_ARC_ALL_LOOP(data);
+		{
+			list_arc_cb(ctx, pcb, layer, arc);
+		}
+		PCB_ENDALL_LOOP;
+		PCB_LINE_ALL_LOOP(data);
+		{
+			list_line_cb(ctx, pcb, layer, line);
+		}
+		PCB_ENDALL_LOOP;
+		PCB_TEXT_ALL_LOOP(data);
+		{
+			list_text_cb(ctx, pcb, layer, text);
+		}
+		PCB_ENDALL_LOOP;
+		PCB_POLY_ALL_LOOP(data);
+		{
+			list_poly_cb(ctx, pcb, layer, polygon);
+		}
+		PCB_ENDALL_LOOP;
+	}
+
+	return 0;
+}
+
+
+void pcb_qry_list_all(pcb_qry_val_t *lst, pcb_objtype_t mask)
+{
+	assert(lst->type == PCBQ_VT_LST);
+#warning layer TODO: make layer a real object with the common header
+#warning TODO: rather do rtree search here to avoid recursion
+	pcb_loop_all(PCB, &lst->data.lst,
+		/*(mask & PCB_OBJ_LAYER) ? list_layer_cb :*/ NULL,
+		(mask & PCB_OBJ_LINE) ? list_line_cb : NULL,
+		(mask & PCB_OBJ_ARC) ? list_arc_cb : NULL,
+		(mask & PCB_OBJ_TEXT) ? list_text_cb : NULL,
+		(mask & PCB_OBJ_POLY) ? list_poly_cb : NULL,
+		(mask & PCB_OBJ_SUBC) ? list_subc_cb : NULL,
+		(mask & PCB_OBJ_PSTK) ? list_pstk_cb : NULL
+	);
+}
+
+void pcb_qry_list_free(pcb_qry_val_t *lst_)
+{
+	vtp0_uninit(&lst_->data.lst);
+}
+
+int pcb_qry_list_cmp(pcb_qry_val_t *lst1, pcb_qry_val_t *lst2)
+{
+	abort();
+}
+
+/***********************/
+
+/* set dst to point to the idxth field assuming field 0 is fld. Returns -1
+   if there are not enough fields */
+#define fld_nth_req(dst, fld, idx) \
+do { \
+	int __i__ = idx; \
+	pcb_qry_node_t *__f__; \
+	for(__f__ = (fld); __i__ > 0; __i__--, __f__ = __f__->next) { \
+		if (__f__ == NULL) \
+			return -1; \
+	} \
+	(dst) = __f__; \
+} while(0)
+
+#define fld_nth_opt(dst, fld, idx) \
+do { \
+	int __i__ = idx; \
+	pcb_qry_node_t *__f__; \
+	for(__f__ = (fld); (__i__ > 0) && (__f__ != NULL); __i__--, __f__ = __f__->next) ; \
+	(dst) = __f__; \
+} while(0)
+
+/* sets const char *s to point to the string data of the idxth field. Returns
+   -1 if tere are not enooung fields */
+#define fld2str_req(s, fld, idx) \
+do { \
+	pcb_qry_node_t *_f_; \
+	fld_nth_req(_f_, fld, idx); \
+	if ((_f_ == NULL) || (_f_->type != PCBQ_FIELD)) \
+		return -1; \
+	(s) = _f_->data.str; \
+} while(0)
+
+/* Same, but doesn't return -1 on missing field but sets s to NULL */
+#define fld2str_opt(s, fld, idx) \
+do { \
+	pcb_qry_node_t *_f_; \
+	const char *__res__; \
+	fld_nth_opt(_f_, fld, idx); \
+	if (_f_ != NULL) { \
+		if (_f_->type != PCBQ_FIELD) \
+			return -1; \
+		__res__ = _f_->data.str; \
+	} \
+	else \
+		__res__ = NULL; \
+	(s) = __res__; \
+} while(0)
+
+/* sets query_fields_keys_t h to point to the precomp field of the idxth field.
+   Returns -1 if tere are not enooung fields */
+#define fld2hash_req(h, fld, idx) \
+do { \
+	pcb_qry_node_t *_f_; \
+	fld_nth_req(_f_, fld, idx); \
+	if ((_f_ == NULL) || (_f_->type != PCBQ_FIELD)) \
+		return -1; \
+	(h) = _f_->precomp.fld; \
+} while(0)
+
+/* Same, but doesn't return -1 on missing field but sets s to query_fields_SPHASH_INVALID */
+#define fld2hash_opt(h, fld, idx) \
+do { \
+	pcb_qry_node_t *_f_; \
+	query_fields_keys_t *__res__; \
+	fld_nth_opt(_f_, fld, idx); \
+	if (_f_ != NULL) { \
+		if (_f_->type != PCBQ_FIELD) \
+			return -1; \
+		__res__ = _f_->precomp.fld; \
+	} \
+	else \
+		__res__ = query_fields_SPHASH_INVALID; \
+	(s) = __res__; \
+} while(0)
+
+/* convert a layer type description and cache the result (overwriting the string in the field!) */
+#define fld2lyt_req(lyt, lyc, fld, idx) \
+do { \
+	pcb_qry_node_t *_f_; \
+	fld_nth_req(_f_, fld, idx); \
+	if (_f_->type != PCBQ_DATA_LYTC) { \
+		const char *_s2_; \
+		fld2str_req(_s2_, fld, 1); \
+		_f_->data.lytc = field_pstk_lyt(p, _s2_); \
+		_f_->type = PCBQ_DATA_LYTC; \
+	} \
+	lyt = _f_->data.lytc.lyt; \
+	lyc = _f_->data.lytc.lyc; \
+} while(0)
+
+#define COMMON_FIELDS(obj, fh1, fld, res) \
+do { \
+	if (fh1 == query_fields_a) { \
+		const char *s2; \
+		fld2str_req(s2, fld, 1); \
+		if (!PCB_OBJ_IS_CLASS(obj->type, PCB_OBJ_CLASS_OBJ)) \
+			PCB_QRY_RET_INV(res); \
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&obj->Attributes, s2)); \
+	} \
+ \
+	if (fh1 == query_fields_ID) { \
+		if (!PCB_OBJ_IS_CLASS(obj->type, PCB_OBJ_CLASS_OBJ)) \
+			PCB_QRY_RET_INV(res); \
+		PCB_QRY_RET_INT(res, obj->ID); \
+	} \
+ \
+	if (fh1 == query_fields_bbox) { \
+		query_fields_keys_t fh2; \
+ \
+		if (!PCB_OBJ_IS_CLASS(obj->type, PCB_OBJ_CLASS_OBJ)) \
+			PCB_QRY_RET_INV(res); \
+ \
+		fld2hash_req(fh2, fld, 1); \
+		switch(fh2) { \
+			case query_fields_x1:     PCB_QRY_RET_INT(res, obj->BoundingBox.X1); \
+			case query_fields_y1:     PCB_QRY_RET_INT(res, obj->BoundingBox.Y1); \
+			case query_fields_x2:     PCB_QRY_RET_INT(res, obj->BoundingBox.X2); \
+			case query_fields_y2:     PCB_QRY_RET_INT(res, obj->BoundingBox.Y2); \
+			case query_fields_width:  PCB_QRY_RET_INT(res, obj->BoundingBox.X2 - obj->BoundingBox.X1); \
+			case query_fields_height: PCB_QRY_RET_INT(res, obj->BoundingBox.Y2 - obj->BoundingBox.Y1); \
+			default:; \
+		} \
+		PCB_QRY_RET_INV(res); \
+	} \
+ \
+	if (fh1 == query_fields_type) \
+		PCB_QRY_RET_INT(res, obj->type); \
+ \
+	if (fh1 == query_fields_subc) \
+	 return field_subc_obj(obj, fld->next, res); \
+ \
+} while(0)
+
+static int field_layer(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_layer_t *l = (pcb_layer_t *)obj;
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&l->Attributes, s2));
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_name:     PCB_QRY_RET_STR(res, l->name);
+		case query_fields_visible:  PCB_QRY_RET_INT(res, l->meta.real.vis);
+		case query_fields_position: PCB_QRY_RET_INT(res, pcb_layer_flags_(l) & PCB_LYT_ANYWHERE);
+		case query_fields_type:     PCB_QRY_RET_INT(res, pcb_layer_flags_(l) & PCB_LYT_ANYTHING);
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_layer_from_ptr(pcb_layer_t *l, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	return field_layer((pcb_any_obj_t *)l, fld, res);
+}
+
+/* process from .layer */
+static int layer_of_obj(pcb_qry_node_t *fld, pcb_qry_val_t *res, pcb_layer_type_t mask)
+{
+	pcb_layer_id_t id;
+	const char *s1;
+
+	if (pcb_layer_list(PCB, mask, &id, 1) != 1)
+		PCB_QRY_RET_INV(res);
+
+	fld2str_req(s1, fld, 0);
+
+	if (s1 == NULL) {
+		res->type = PCBQ_VT_OBJ;
+		res->data.obj = (pcb_any_obj_t *)&(PCB->Data->Layer[id]);
+		return 0;
+	}
+
+	return field_layer_from_ptr(PCB->Data->Layer+id, fld, res);
+}
+
+static double pcb_line_len2(pcb_line_t *l)
+{
+	double x = l->Point1.X - l->Point2.X;
+	double y = l->Point1.Y - l->Point2.Y;
+	return x*x + y*y;
+}
+
+static int field_line(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_line_t *l = (pcb_line_t *)obj;
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&l->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_layer) {
+		if (obj->parent_type == PCB_PARENT_LAYER)
+			return field_layer_from_ptr(obj->parent.layer, fld->next, res);
+		else
+			PCB_QRY_RET_INV(res);
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_x1:         PCB_QRY_RET_INT(res, l->Point1.X);
+		case query_fields_y1:         PCB_QRY_RET_INT(res, l->Point1.Y);
+		case query_fields_x2:         PCB_QRY_RET_INT(res, l->Point2.X);
+		case query_fields_y2:         PCB_QRY_RET_INT(res, l->Point2.Y);
+		case query_fields_thickness:  PCB_QRY_RET_INT(res, l->Thickness);
+		case query_fields_clearance:  PCB_QRY_RET_INT(res, l->Clearance);
+		case query_fields_length:
+			PCB_QRY_RET_INT(res, ((pcb_coord_t)pcb_round(sqrt(pcb_line_len2(l)))));
+			break;
+		case query_fields_length2:
+			PCB_QRY_RET_DBL(res, pcb_line_len2(l));
+			break;
+		case query_fields_area:
+			{
+				double th = l->Thickness;
+				double len = pcb_round(sqrt(pcb_line_len2(l)));
+				if (PCB_FLAG_TEST(PCB_FLAG_SQUARE, l))
+					PCB_QRY_RET_DBL(res, (len+th) * th);
+				else
+					PCB_QRY_RET_DBL(res, len * th + th*th/4*M_PI);
+				break;
+			}
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static double pcb_arc_len(pcb_arc_t *a)
+{
+#warning TODO: this breaks for elliptics; see http://tutorial.math.lamar.edu/Classes/CalcII/ArcLength.aspx
+	double r = (a->Width + a->Height)/2;
+	return r * M_PI / 180.0 * a->Delta;
+}
+
+static int field_arc(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_arc_t *a = (pcb_arc_t *)obj;
+	query_fields_keys_t fh1, fh2;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&a->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_angle) {
+		fld2hash_req(fh2, fld, 1);
+		switch(fh2) {
+			case query_fields_start: PCB_QRY_RET_INT(res, a->StartAngle);
+			case query_fields_delta: PCB_QRY_RET_INT(res, a->Delta);
+			default:;
+		}
+		PCB_QRY_RET_INV(res);
+	}
+
+	if (fh1 == query_fields_layer) {
+		if (obj->parent_type == PCB_PARENT_LAYER)
+			return field_layer_from_ptr(obj->parent.layer, fld->next, res);
+		else
+			PCB_QRY_RET_INV(res);
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_cx:
+		case query_fields_x:         PCB_QRY_RET_INT(res, a->X);
+		case query_fields_cy:
+		case query_fields_y:         PCB_QRY_RET_INT(res, a->Y);
+		case query_fields_thickness: PCB_QRY_RET_INT(res, a->Thickness);
+		case query_fields_clearance: PCB_QRY_RET_INT(res, a->Clearance);
+		case query_fields_length:
+			PCB_QRY_RET_INT(res, ((pcb_coord_t)pcb_round(pcb_arc_len(a))));
+			break;
+		case query_fields_length2:
+			{
+				double l = pcb_arc_len(a);
+				PCB_QRY_RET_DBL(res, l*l);
+			}
+			break;
+		case query_fields_area:
+			{
+				double th = a->Thickness;
+				double len = pcb_arc_len(a);
+				PCB_QRY_RET_DBL(res, len * th + th*th/4*M_PI); /* approx */
+			}
+			break;
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_text(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_text_t *t = (pcb_text_t *)obj;
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&t->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_layer) {
+		if (obj->parent_type == PCB_PARENT_LAYER)
+			return field_layer_from_ptr(obj->parent.layer, fld->next, res);
+		else
+			PCB_QRY_RET_INV(res);
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_x:        PCB_QRY_RET_INT(res, t->X);
+		case query_fields_y:        PCB_QRY_RET_INT(res, t->Y);
+		case query_fields_scale:    PCB_QRY_RET_INT(res, t->Scale);
+		case query_fields_rotation: PCB_QRY_RET_INT(res, t->Direction);
+		case query_fields_string:   PCB_QRY_RET_STR(res, t->TextString);
+		case query_fields_area:     PCB_QRY_RET_DBL(res, (double)(t->BoundingBox.Y2 - t->BoundingBox.Y1) * (double)(t->BoundingBox.X2 - t->BoundingBox.X1));
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_polygon(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_poly_t *p = (pcb_poly_t *)obj;
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&p->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_layer) {
+		if (obj->parent_type == PCB_PARENT_LAYER)
+			return field_layer_from_ptr(obj->parent.layer, fld->next, res);
+		else
+			PCB_QRY_RET_INV(res);
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_points: PCB_QRY_RET_INT(res, p->PointN);
+		case query_fields_area:
+			PCB_QRY_RET_DBL(res, p->Clipped->contours->area);
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_rat(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+/*	const char *s1, *s2;
+
+	fld2str_req(s1, fld, 0);
+	fld2str_opt(s2, fld, 1);*/
+#warning TODO
+	PCB_QRY_RET_INV(res);
+}
+
+static struct pcb_qry_lytc_s field_pstk_lyt(pcb_pstk_t *ps, const char *where)
+{
+	struct pcb_qry_lytc_s lytc;
+	const char *start, *next;
+	int got_pol = 0;
+
+	lytc.lyt = 0;
+	lytc.lyc = 0;
+
+	start = next = where;
+	for(;;) {
+		int len;
+		next = strchr(start, '_');
+		if (next == 0)
+			len = strlen(start);
+		else
+			len = next - start;
+
+		if (strncmp(start, "top", len) == 0) lytc.lyt |= PCB_LYT_TOP;
+		else if (strncmp(start, "bottom", len) == 0) lytc.lyt |= PCB_LYT_BOTTOM;
+		else if (strncmp(start, "intern", len) == 0) lytc.lyt |= PCB_LYT_INTERN;
+		else if (strncmp(start, "copper", len) == 0) lytc.lyt |= PCB_LYT_COPPER;
+		else if (strncmp(start, "silk", len) == 0) lytc.lyt |= PCB_LYT_SILK;
+		else if (strncmp(start, "mask", len) == 0) lytc.lyt |= PCB_LYT_MASK;
+		else if (strncmp(start, "paste", len) == 0) lytc.lyt |= PCB_LYT_PASTE;
+		else if (strncmp(start, "outline", len) == 0) lytc.lyt |= PCB_LYT_OUTLINE;
+		else if (strncmp(start, "auto", len) == 0) { lytc.lyc |= PCB_LYC_AUTO; got_pol = 1; }
+		else if (strncmp(start, "sub", len) == 0) { lytc.lyc |= PCB_LYC_SUB; got_pol = 1; }
+		else if (strncmp(start, "neg", len) == 0) { lytc.lyc |= PCB_LYC_SUB; got_pol = 1; }
+		else if (strncmp(start, "add", len) == 0) { got_pol = 1; }
+		else if (strncmp(start, "pos", len) == 0) { got_pol = 1; }
+		else {
+			lytc.lyt = 0;
+			return lytc;
+		};
+
+		if (next == NULL)
+			break;
+		start = next+1;
+	}
+
+	/* implicit polarity (shorthand) */
+	if (!got_pol) {
+		if (lytc.lyt & PCB_LYT_MASK) lytc.lyc = PCB_LYC_SUB | PCB_LYC_AUTO;
+		if (lytc.lyt & PCB_LYT_PASTE) lytc.lyc = PCB_LYC_AUTO;
+	}
+	return lytc;
+}
+
+static int field_pstk(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_pstk_t *p = (pcb_pstk_t *)obj;
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(p);
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&p->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_shape) {
+		pcb_layer_type_t lyt;
+		pcb_layer_combining_t lyc = 0;
+		pcb_pstk_shape_t *shp;
+
+		fld2lyt_req(lyt, lyc, fld, 1);
+		if (lyt == 0)
+			PCB_QRY_RET_INV(res);
+
+		shp = pcb_pstk_shape(p, lyt, lyc);
+		if (shp != NULL) {
+			switch(shp->shape) {
+				case PCB_PSSH_POLY: PCB_QRY_RET_STR(res, "polygon");
+				case PCB_PSSH_LINE: PCB_QRY_RET_STR(res, "line");
+				case PCB_PSSH_CIRC: PCB_QRY_RET_STR(res, "circle");
+			}
+		}
+		PCB_QRY_RET_STR(res, "");
+	}
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_x:         PCB_QRY_RET_INT(res, p->x);
+		case query_fields_y:         PCB_QRY_RET_INT(res, p->y);
+		case query_fields_clearance: PCB_QRY_RET_INT(res, p->Clearance);
+		case query_fields_rotation:  PCB_QRY_RET_DBL(res, p->rot);
+		case query_fields_xmirror:   PCB_QRY_RET_INT(res, p->xmirror);
+		case query_fields_smirror:   PCB_QRY_RET_INT(res, p->smirror);
+		case query_fields_plated:    PCB_QRY_RET_INT(res, (proto->hdia > 0) && proto->hplated);
+		case query_fields_hole:      PCB_QRY_RET_INT(res, proto->hdia);
+		case query_fields_area:      PCB_QRY_RET_DBL(res, (double)(p->BoundingBox.Y2 - p->BoundingBox.Y1) * (double)(p->BoundingBox.X2 - p->BoundingBox.X1));
+		default:;
+	}
+
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_net(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+/*	const char *s1, *s2;
+
+	fld2str_req(s1, fld, 0);
+	fld2str_opt(s2, fld, 1);*/
+#warning TODO
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_subc(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_subc_t *p = (pcb_subc_t *)obj;
+	query_fields_keys_t fh1;
+	pcb_coord_t x, y;
+	double rot;
+	int on_bottom;
+
+	fld2hash_req(fh1, fld, 0);
+	if (fh1 == query_fields_a) {
+		const char *s2;
+		fld2str_req(s2, fld, 1);
+		PCB_QRY_RET_STR(res, pcb_attribute_get(&p->Attributes, s2));
+	}
+
+	if (fh1 == query_fields_layer)
+		return layer_of_obj(fld->next, res, PCB_LYT_SILK | (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, p) ? PCB_LYT_BOTTOM : PCB_LYT_TOP));
+
+	if (fld->next != NULL)
+		PCB_QRY_RET_INV(res);
+
+	switch(fh1) {
+		case query_fields_x:            pcb_subc_get_origin(p, &x, &y); PCB_QRY_RET_INT(res, x);
+		case query_fields_y:            pcb_subc_get_origin(p, &x, &y); PCB_QRY_RET_INT(res, y);
+		case query_fields_rotation:     pcb_subc_get_rotation(p, &rot); PCB_QRY_RET_DBL(res, rot);
+		case query_fields_side:         pcb_subc_get_side(p, &on_bottom); PCB_QRY_RET_SIDE(res, on_bottom);
+		case query_fields_refdes:       PCB_QRY_RET_STR(res, p->refdes);
+		case query_fields_area:         PCB_QRY_RET_DBL(res, (double)(p->BoundingBox.Y2 - p->BoundingBox.Y1) * (double)(p->BoundingBox.X2 - p->BoundingBox.X1));
+		default:;
+	}
+	PCB_QRY_RET_INV(res);
+}
+
+static int field_subc_obj(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res);
+
+static int field_subc_from_ptr(pcb_subc_t *s, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *)s;
+	query_fields_keys_t fh1;
+
+	fld2hash_req(fh1, fld, 0);
+	COMMON_FIELDS(obj, fh1, fld, res);
+
+	return field_subc(obj, fld, res);
+}
+
+static int field_subc_obj(pcb_any_obj_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	const char *s1;
+	pcb_subc_t *parent = pcb_obj_parent_subc(obj);
+
+	/* if parent is not a subc (or not available) evaluate to invalid */
+	if (parent == NULL)
+		PCB_QRY_RET_INV(res);
+
+	/* check subfield, if there's none, return the subcircuit object */
+	fld2str_opt(s1, fld, 0);
+	if (s1 == NULL) {
+		res->type = PCBQ_VT_OBJ;
+		res->data.obj = (pcb_any_obj_t *)parent;
+		return 0;
+	}
+
+	/* return subfields of the subcircuit */
+	return field_subc_from_ptr(parent, fld, res);
+}
+
+/***/
+
+static int pcb_qry_obj_flag(pcb_any_obj_t *obj, pcb_qry_node_t *nflg, pcb_qry_val_t *res)
+{
+	if (obj == NULL)
+		return -1;
+
+	if ((nflg->precomp.flg->object_types & obj->type) != obj->type) {
+		/* flag not applicable on object type */
+		PCB_QRY_RET_INV(res);
+	}
+	PCB_QRY_RET_INT(res, PCB_FLAG_TEST(nflg->precomp.flg->mask, obj));
+}
+
+int pcb_qry_obj_field(pcb_qry_val_t *objval, pcb_qry_node_t *fld, pcb_qry_val_t *res)
+{
+	pcb_any_obj_t *obj;
+	query_fields_keys_t fh1;
+
+	if (objval->type != PCBQ_VT_OBJ)
+		return -1;
+	obj = objval->data.obj;
+
+	if (fld->type == PCBQ_FLAG)
+		return pcb_qry_obj_flag(obj, fld, res);
+
+	fld2hash_req(fh1, fld, 0);
+
+	COMMON_FIELDS(obj, fh1, fld, res);
+
+	switch(obj->type) {
+/*		case PCB_OBJ_POINT:    return field_point(obj, fld, res);*/
+		case PCB_OBJ_LINE:     return field_line(obj, fld, res);
+		case PCB_OBJ_TEXT:     return field_text(obj, fld, res);
+		case PCB_OBJ_POLY:     return field_polygon(obj, fld, res);
+		case PCB_OBJ_ARC:      return field_arc(obj, fld, res);
+		case PCB_OBJ_RAT:      return field_rat(obj, fld, res);
+		case PCB_OBJ_PSTK:     return field_pstk(obj, fld, res);
+		case PCB_OBJ_SUBC:     return field_subc(obj, fld, res);
+
+		case PCB_OBJ_NET:      return field_net(obj, fld, res);
+		case PCB_OBJ_LAYER:    return field_layer(obj, fld, res);
+#warning layer TODO
+		case PCB_OBJ_LAYERGRP:
+		default:;
+	}
+
+	return -1;
+}
+
Index: tags/2.0.1/src_plugins/query/query_access.h
===================================================================
--- tags/2.0.1/src_plugins/query/query_access.h	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_access.h	(revision 18980)
@@ -0,0 +1,44 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - access to / extract core data */
+
+#ifndef PCB_QUERY_ACCESS_H
+#define PCB_QUERY_ACCESS_H
+
+#include "query.h"
+
+/* Append objects with matching type to lst */
+void pcb_qry_list_all(pcb_qry_val_t *lst, pcb_objtype_t mask);
+
+int pcb_qry_list_cmp(pcb_qry_val_t *lst1, pcb_qry_val_t *lst2);
+
+void pcb_qry_list_free(pcb_qry_val_t *lst_);
+
+int pcb_qry_obj_field(pcb_qry_val_t *obj, pcb_qry_node_t *fld, pcb_qry_val_t *res);
+
+
+#endif
Index: tags/2.0.1/src_plugins/query/query_act.c
===================================================================
--- tags/2.0.1/src_plugins/query/query_act.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_act.c	(revision 18980)
@@ -0,0 +1,199 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - actions */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "actions.h"
+#include "query.h"
+#include "query_y.h"
+#include "query_exec.h"
+#include "draw.h"
+#include "select.h"
+#include "board.h"
+#include "macro.h"
+
+static const char pcb_acts_query[] =
+	"query(dump, expr) - dry run: compile and dump an expression\n"
+	;
+static const char pcb_acth_query[] = "Perform various queries on PCB data.";
+
+typedef struct {
+	int trues, falses;
+} eval_stat_t;
+
+static void eval_cb(void *user_ctx, pcb_qry_val_t *res, pcb_any_obj_t *current)
+{
+	char *resv;
+	eval_stat_t *st = (eval_stat_t *)user_ctx;
+	int t;
+
+	if (res->type == PCBQ_VT_VOID) {
+		printf(" <void>\n");
+		st->falses++;
+		return;
+	}
+
+	if (res->type != PCBQ_VT_COORD) {
+		st->trues++;
+		resv = pcb_query_sprint_val(res);
+		printf(" %s\n", resv);
+		free(resv);
+		return;
+	}
+
+	t = pcb_qry_is_true(res);
+	printf(" %s", t ? "true" : "false");
+	if (t) {
+		resv = pcb_query_sprint_val(res);
+		printf(" (%s)\n", resv);
+		free(resv);
+		st->trues++;
+	}
+	else {
+		printf("\n");
+		st->falses++;
+	}
+}
+
+typedef struct {
+	pcb_cardinal_t cnt;
+	pcb_change_flag_t how;
+} select_t;
+
+static void select_cb(void *user_ctx, pcb_qry_val_t *res, pcb_any_obj_t *current)
+{
+	select_t *sel = (select_t *)user_ctx;
+	if (!pcb_qry_is_true(res))
+		return;
+	if (PCB_OBJ_IS_CLASS(current->type, PCB_OBJ_CLASS_OBJ)) {
+		int state_wanted = (sel->how == PCB_CHGFLG_SET);
+		int state_is     = PCB_FLAG_TEST(PCB_FLAG_SELECTED, current);
+		if (state_wanted != state_is) {
+			PCB_FLAG_CHANGE(sel->how, PCB_FLAG_SELECTED, current);
+			sel->cnt++;
+		}
+	}
+}
+
+static int run_script(const char *script, void (*cb)(void *user_ctx, pcb_qry_val_t *res, pcb_any_obj_t *current), void *user_ctx)
+{
+	pcb_qry_node_t *prg = NULL;
+
+	pcb_qry_set_input(script);
+	qry_parse(&prg);
+
+	if (prg == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Compilation error.\n");
+		return -1;
+	}
+
+	return pcb_qry_run(prg, cb, user_ctx);
+}
+
+static fgw_error_t pcb_act_query(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd, *arg = NULL;
+	select_t sel;
+
+	sel.cnt = 0;
+
+	PCB_ACT_CONVARG(1, FGW_STR, query, cmd = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, query, arg = argv[2].val.str);
+
+	if (strcmp(cmd, "version") == 0) {
+		PCB_ACT_IRES(0100); /* 1.0 */
+		return 0;
+	}
+
+	if (strcmp(cmd, "dump") == 0) {
+		pcb_qry_node_t *prg = NULL;
+		printf("Script dump: '%s'\n", arg);
+		pcb_qry_set_input(arg);
+		qry_parse(&prg);
+		pcb_qry_dump_tree(" ", prg);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	if (strcmp(cmd, "eval") == 0) {
+		int errs;
+		eval_stat_t st;
+
+		memset(&st, 0, sizeof(st));
+		printf("Script eval: '%s'\n", arg);
+		errs = run_script(arg, eval_cb, &st);
+
+		if (errs < 0)
+			printf("Failed to run the query\n");
+		else
+			printf("eval statistics: true=%d false=%d errors=%d\n", st.trues, st.falses, errs);
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	if (strcmp(cmd, "select") == 0) {
+		sel.how = PCB_CHGFLG_SET;
+		if (run_script(arg, select_cb, &sel) < 0)
+			printf("Failed to run the query\n");
+		if (sel.cnt > 0) {
+			pcb_board_set_changed_flag(pcb_true);
+			pcb_redraw();
+		}
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	if (strcmp(cmd, "unselect") == 0) {
+		sel.how = PCB_CHGFLG_CLEAR;
+		if (run_script(arg, select_cb, &sel) < 0)
+			printf("Failed to run the query\n");
+		if (sel.cnt > 0) {
+			pcb_board_set_changed_flag(pcb_true);
+			pcb_redraw();
+		}
+		PCB_ACT_IRES(0);
+		return 0;
+	}
+
+	PCB_ACT_IRES(-1);
+	return 0;
+}
+
+pcb_action_t query_action_list[] = {
+	{"query", pcb_act_query, pcb_acth_query, pcb_acts_query}
+};
+
+PCB_REGISTER_ACTIONS(query_action_list, NULL)
+
+#include "dolists.h"
+void query_action_reg(const char *cookie)
+{
+	PCB_REGISTER_ACTIONS(query_action_list, cookie)
+}
Index: tags/2.0.1/src_plugins/query/query_exec.c
===================================================================
--- tags/2.0.1/src_plugins/query/query_exec.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_exec.c	(revision 18980)
@@ -0,0 +1,521 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - execution */
+
+#include <stdio.h>
+#include "config.h"
+#include "data.h"
+#include "query.h"
+#include "query_exec.h"
+#include "query_access.h"
+#include "pcb-printf.h"
+
+void pcb_qry_init(pcb_qry_exec_t *ctx, pcb_qry_node_t *root)
+{
+	memset(ctx, 0, sizeof(pcb_qry_exec_t));
+	ctx->all.type = PCBQ_VT_LST;
+	pcb_qry_list_all(&ctx->all, PCB_OBJ_ANY);
+	ctx->root = root;
+	ctx->iter = NULL;
+}
+
+void pcb_qry_uninit(pcb_qry_exec_t *ctx)
+{
+	pcb_qry_list_free(&ctx->all);
+#warning TODO: free the iterator
+}
+
+int pcb_qry_run(pcb_qry_node_t *prg, void (*cb)(void *user_ctx, pcb_qry_val_t *res, pcb_any_obj_t *current), void *user_ctx)
+{
+	pcb_qry_exec_t ec;
+	pcb_qry_val_t res;
+	int errs = 0;
+
+	pcb_qry_init(&ec, prg);
+	if (pcb_qry_it_reset(&ec, prg) != 0)
+		return -1;
+
+	do {
+		if (pcb_qry_eval(&ec, prg, &res) == 0) {
+			pcb_any_obj_t **tmp, *current = NULL;
+			if (ec.iter->all_idx >= 0) {
+				tmp = (pcb_any_obj_t **)vtp0_get(ec.iter->vects[ec.iter->all_idx], ec.iter->idx[ec.iter->all_idx], 0);
+				if (tmp != NULL)
+					current = *tmp;
+				else
+					current = NULL;
+			}
+			if (current != NULL)
+				cb(user_ctx, &res, current);
+		}
+		else
+			errs++;
+	} while(pcb_qry_it_next(&ec));
+	pcb_qry_uninit(&ec);
+	return errs;
+}
+
+
+/* load unary operand to o1 */
+#define UNOP() \
+do { \
+	if ((node->data.children == NULL) || (node->data.children->next != NULL)) \
+		return -1; \
+	if (pcb_qry_eval(ctx, node->data.children, &o1) < 0) \
+		return -1; \
+} while(0)
+
+/* load 1st binary operand to o1 */
+#define BINOPS1() \
+do { \
+	if ((node->data.children == NULL) || (node->data.children->next == NULL) || (node->data.children->next->next != NULL)) \
+		return -1; \
+	if (pcb_qry_eval(ctx, node->data.children, &o1) < 0) \
+		return -1; \
+} while(0)
+
+/* load 2nd binary operand to o2 */
+#define BINOPS2() \
+do { \
+	if (pcb_qry_eval(ctx, node->data.children->next, &o2) < 0) \
+		return -1; \
+} while(0)
+
+/* load binary operands to o1 and o2 */
+#define BINOPS() \
+do { \
+	BINOPS1(); \
+	BINOPS2(); \
+} while(0)
+
+static int promote(pcb_qry_val_t *a, pcb_qry_val_t *b)
+{
+	if ((a->type == PCBQ_VT_VOID) || (b->type == PCBQ_VT_VOID)) {
+		a->type = b->type = PCBQ_VT_VOID;
+		return 0;
+	}
+	if (a->type == b->type)
+		return 0;
+	switch(a->type) {
+		case PCBQ_VT_OBJ:   return -1;
+		case PCBQ_VT_LST:   return -1;
+		case PCBQ_VT_COORD:
+			if (b->type == PCBQ_VT_DOUBLE)  PCB_QRY_RET_DBL(a, a->data.crd);
+			return -1;
+		case PCBQ_VT_DOUBLE:
+			if (b->type == PCBQ_VT_COORD)  PCB_QRY_RET_DBL(b, b->data.crd);
+			return -1;
+		case PCBQ_VT_STRING:
+		case PCBQ_VT_VOID:
+			return -1;
+	}
+	return -1;
+}
+
+static const char *op2str(char *buff, int buff_size, pcb_qry_val_t *val)
+{
+	switch(val->type) {
+		case PCBQ_VT_COORD:
+			pcb_snprintf(buff, buff_size, "%mI", val->data.crd);
+			return buff;
+		case PCBQ_VT_DOUBLE:
+			pcb_snprintf(buff, buff_size, "%f", val->data.crd);
+			return buff;
+		case PCBQ_VT_STRING:
+			return val->data.str;
+		case PCBQ_VT_VOID:
+		case PCBQ_VT_OBJ:
+		case PCBQ_VT_LST:   return NULL;
+	}
+	return NULL;
+}
+
+int pcb_qry_is_true(pcb_qry_val_t *val)
+{
+	switch(val->type) {
+		case PCBQ_VT_VOID:     return 0;
+		case PCBQ_VT_OBJ:      return val->data.obj->type != PCB_OBJ_VOID;
+		case PCBQ_VT_LST:      return vtp0_len(&val->data.lst) > 0;
+		case PCBQ_VT_COORD:    return val->data.crd;
+		case PCBQ_VT_DOUBLE:   return val->data.dbl;
+		case PCBQ_VT_STRING:   return (val->data.str != NULL) && (*val->data.str != '\0');
+	}
+	return 0;
+}
+
+static void setup_iter_list(pcb_qry_exec_t *ctx, int var_id, pcb_qry_val_t *listval)
+{
+	ctx->iter->lst[var_id] = *listval;
+	assert(listval->type == PCBQ_VT_LST);
+
+	ctx->iter->vects[var_id] = &listval->data.lst;
+	ctx->iter->idx[var_id] = 0;
+}
+
+int pcb_qry_it_reset(pcb_qry_exec_t *ctx, pcb_qry_node_t *node)
+{
+	int n;
+	ctx->iter = pcb_qry_find_iter(node);
+	if (ctx->iter == NULL)
+		return -1;
+
+	pcb_qry_iter_init(ctx->iter);
+
+	for(n = 0; n < ctx->iter->num_vars; n++) {
+		if (strcmp(ctx->iter->vn[n], "@") == 0) {
+			setup_iter_list(ctx, n, &ctx->all);
+			ctx->iter->all_idx = n;
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int pcb_qry_it_next(pcb_qry_exec_t *ctx)
+{
+	int i;
+	for(i = 0; i < ctx->iter->num_vars; i++) {
+		if (ctx->iter->vects[i] != NULL) {
+			ctx->iter->idx[i]++;
+			if (ctx->iter->idx[i] < vtp0_len(ctx->iter->vects[i]))
+				return 1;
+		}
+		ctx->iter->idx[i] = 0;
+	}
+	return 0;
+}
+
+/* load s1 and s2 from o1 and o2, convert empty string to NULL */
+#define load_strings_null() \
+do { \
+	s1 = o1.data.str; \
+	s2 = o2.data.str; \
+	if ((s1 != NULL) && (*s1 == '\0')) s1 = NULL; \
+	if ((s2 != NULL) && (*s2 == '\0')) s2 = NULL; \
+} while(0)
+
+static char *pcb_qry_empty = "";
+
+/* load s1 and s2 from o1 and o2, convert NULL to empty string */
+#define load_strings_empty() \
+do { \
+	s1 = o1.data.str; \
+	s2 = o2.data.str; \
+	if (s1 == NULL) s1 = pcb_qry_empty; \
+	if (s2 == NULL) s2 = pcb_qry_empty; \
+} while(0)
+
+int pcb_qry_eval(pcb_qry_exec_t *ctx, pcb_qry_node_t *node, pcb_qry_val_t *res)
+{
+	pcb_qry_val_t o1, o2;
+	pcb_any_obj_t **tmp;
+	const char *s1, *s2;
+
+	switch(node->type) {
+		case PCBQ_EXPR:
+			return pcb_qry_eval(ctx, node->data.children, res);
+
+		case PCBQ_EXPR_PROG: {
+			pcb_qry_node_t *itn, *exprn;
+			itn = node->data.children;
+			if (itn == NULL)
+				return -1;
+			exprn = itn->next;
+			if (exprn == NULL)
+				return -1;
+			if (itn->type != PCBQ_ITER_CTX)
+				return -1;
+			if (ctx->iter != itn->data.iter_ctx)
+				return -1;
+			return pcb_qry_eval(ctx, exprn, res);
+		}
+
+
+		case PCBQ_OP_AND: /* lazy */
+			BINOPS1();
+			if (!pcb_qry_is_true(&o1))
+				PCB_QRY_RET_INT(res, 0);
+			BINOPS2();
+			if (!pcb_qry_is_true(&o2))
+				PCB_QRY_RET_INT(res, 0);
+			PCB_QRY_RET_INT(res, 1);
+
+		case PCBQ_OP_OR: /* lazy */
+			BINOPS1();
+			if (pcb_qry_is_true(&o1))
+				PCB_QRY_RET_INT(res, 1);
+			BINOPS2();
+			if (pcb_qry_is_true(&o2))
+				PCB_QRY_RET_INT(res, 1);
+			PCB_QRY_RET_INT(res, 0);
+
+		case PCBQ_OP_EQ:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_OBJ:      PCB_QRY_RET_INT(res, ((o1.data.obj) == (o2.data.obj)));
+				case PCBQ_VT_LST:      PCB_QRY_RET_INT(res, pcb_qry_list_cmp(&o1, &o2));
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd == o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl == o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_null();
+					if (s1 == s2)
+						PCB_QRY_RET_INT(res, 1);
+					if ((s1 == NULL) || (s2 == NULL))
+						PCB_QRY_RET_INT(res, 0);
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) == 0);
+			}
+			return -1;
+
+		case PCBQ_OP_NEQ:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_OBJ:      PCB_QRY_RET_INT(res, ((o1.data.obj) != (o2.data.obj)));
+				case PCBQ_VT_LST:      PCB_QRY_RET_INT(res, !pcb_qry_list_cmp(&o1, &o2));
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd != o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl != o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_null();
+					if (s1 == s2)
+						PCB_QRY_RET_INT(res, 0);
+					if ((s1 == NULL) || (s2 == NULL))
+						PCB_QRY_RET_INT(res, 1);
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) != 0);
+			}
+			return -1;
+
+		case PCBQ_OP_GTEQ:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd >= o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl >= o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_empty();
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) >= 0);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_LTEQ:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd <= o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl <= o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_empty();
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) <= 0);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_GT:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd > o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl > o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_empty();
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) > 0);
+				default:               return -1;
+			}
+			return -1;
+		case PCBQ_OP_LT:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd < o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_INT(res, o1.data.dbl < o2.data.dbl);
+				case PCBQ_VT_STRING:
+					load_strings_empty();
+					PCB_QRY_RET_INT(res, strcmp(s1, s2) < 0);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_ADD:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd + o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_DBL(res, o1.data.dbl + o2.data.dbl);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_SUB:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd - o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_DBL(res, o1.data.dbl - o2.data.dbl);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_MUL:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd * o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_DBL(res, o1.data.dbl * o2.data.dbl);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_DIV:
+			BINOPS();
+			if (promote(&o1, &o2) != 0)
+				return -1;
+			switch(o1.type) {
+				case PCBQ_VT_VOID:     PCB_QRY_RET_INV(res);
+				case PCBQ_VT_COORD:    PCB_QRY_RET_INT(res, o1.data.crd / o2.data.crd);
+				case PCBQ_VT_DOUBLE:   PCB_QRY_RET_DBL(res, o1.data.dbl / o2.data.dbl);
+				default:               return -1;
+			}
+			return -1;
+
+		case PCBQ_OP_MATCH:
+			BINOPS1();
+			{
+				pcb_qry_node_t *o2n =node->data.children->next;
+				char buff[128];
+				const char *s;
+				if (o2n->type != PCBQ_DATA_REGEX)
+					return -1;
+				s = op2str(buff, sizeof(buff), &o1);
+				if (s != NULL)
+					PCB_QRY_RET_INT(res, re_se_exec(o2n->precomp.regex, s));
+			}
+			PCB_QRY_RET_INV(res);
+
+		case PCBQ_OP_NOT:
+			UNOP();
+			PCB_QRY_RET_INT(res, !pcb_qry_is_true(&o1));
+
+		case PCBQ_FIELD_OF:
+			if ((node->data.children == NULL) || (node->data.children->next == NULL))
+				return -1;
+			if (pcb_qry_eval(ctx, node->data.children, &o1) < 0)
+				return -1;
+			return pcb_qry_obj_field(&o1, node->data.children->next, res);
+
+		case PCBQ_VAR:
+			assert((node->data.crd >= 0) && (node->data.crd < ctx->iter->num_vars));
+			res->type = PCBQ_VT_VOID;
+			if (ctx->iter->vects[node->data.crd] == NULL)
+				return -1;
+			tmp = (pcb_any_obj_t **)vtp0_get(ctx->iter->vects[node->data.crd], ctx->iter->idx[node->data.crd], 0);
+			if ((tmp == NULL) || (*tmp == NULL))
+				return -1;
+			res->type = PCBQ_VT_OBJ;
+			res->data.obj = *tmp;
+			return 0;
+
+		case PCBQ_LISTVAR: {
+			int vi = pcb_qry_iter_var(ctx->iter, node->data.str, 0);
+			if ((vi < 0) && (strcmp(node->data.str, "@") == 0)) {
+				res->type = PCBQ_VT_LST;
+				res->data.lst = ctx->all.data.lst;
+				return 0;
+			}
+			if (vi >= 0) {
+				res->type = PCBQ_VT_LST;
+				res->data.lst = ctx->iter->lst[vi].data.lst;
+				return 0;
+			}
+		}
+		return -1;
+
+		case PCBQ_FNAME:
+			return -1; /* shall not eval such a node */
+
+		case PCBQ_FCALL: {
+			pcb_qry_val_t args[64];
+			int n;
+			pcb_qry_node_t *farg, *fname = node->data.children;
+			if (fname == NULL)
+				return -1;
+			farg = fname->next;
+			if ((fname->type !=  PCBQ_FNAME) || (fname->data.fnc == NULL))
+				return -1;
+			memset(args, 0, sizeof(args));
+			for(n = 0; (n < 64) && (farg != NULL); n++, farg = farg->next)
+				if (pcb_qry_eval(ctx, farg, &args[n]) < 0)
+					return -1;
+
+			if (farg != NULL) {
+				pcb_message(PCB_MSG_ERROR, "too many function arguments\n");
+				return -1;
+			}
+			printf("CALL n=%d\n", n);
+			return fname->data.fnc(n, args, res);
+		}
+
+		case PCBQ_DATA_COORD:       PCB_QRY_RET_INT(res, node->data.crd);
+		case PCBQ_DATA_DOUBLE:      PCB_QRY_RET_DBL(res, node->data.dbl);
+		case PCBQ_DATA_STRING:      PCB_QRY_RET_STR(res, node->data.str);
+		case PCBQ_DATA_CONST:       PCB_QRY_RET_INT(res, node->precomp.cnst);
+		case PCBQ_DATA_INVALID:     PCB_QRY_RET_INV(res);
+
+		/* not yet implemented: */
+		case PCBQ_RULE:
+
+		/* must not meet these while executing a node */
+		case PCBQ_FLAG:
+		case PCBQ_DATA_REGEX:
+		case PCBQ_nodetype_max:
+		case PCBQ_FIELD:
+		case PCBQ_RNAME:
+		case PCBQ_DATA_LYTC:
+		case PCBQ_ITER_CTX:
+			return -1;
+	}
+	return -1;
+}
Index: tags/2.0.1/src_plugins/query/query_exec.h
===================================================================
--- tags/2.0.1/src_plugins/query/query_exec.h	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_exec.h	(revision 18980)
@@ -0,0 +1,91 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Query language - execution */
+
+#ifndef PCB_QUERY_EXEC_H
+#define PCB_QUERY_EXEC_H
+
+typedef struct pcb_qry_exec_s {
+	pcb_qry_node_t *root;
+	pcb_qry_val_t all;       /* a list of all objects */
+	pcb_query_iter_t *iter;  /* current iterator */
+} pcb_qry_exec_t;
+
+void pcb_qry_init(pcb_qry_exec_t *ctx, pcb_qry_node_t *root);
+void pcb_qry_uninit(pcb_qry_exec_t *ctx);
+
+int pcb_qry_run(pcb_qry_node_t *prg, void (*cb)(void *user_ctx, pcb_qry_val_t *res, pcb_any_obj_t *current), void *user_ctx);
+
+int pcb_qry_is_true(pcb_qry_val_t *val);
+
+int pcb_qry_eval(pcb_qry_exec_t *ctx, pcb_qry_node_t *node, pcb_qry_val_t *res);
+
+int pcb_qry_it_reset(pcb_qry_exec_t *ctx, pcb_qry_node_t *node);
+
+/* Returns 1 if context iterator is valid, 0 if the loop is over */
+int pcb_qry_it_next(pcb_qry_exec_t *ctx);
+
+
+
+/* Helper macros: load value o and return 0 */
+#define PCB_QRY_RET_INT(o, value) \
+do { \
+	o->type = PCBQ_VT_COORD; \
+	o->data.crd = value; \
+	return 0; \
+} while(0)
+
+#define PCB_QRY_RET_DBL(o, value) \
+do { \
+	o->type = PCBQ_VT_DOUBLE; \
+	o->data.dbl = value; \
+	return 0; \
+} while(0)
+
+#define PCB_QRY_RET_STR(o, value) \
+do { \
+	o->type = PCBQ_VT_STRING; \
+	o->data.str = value; \
+	return 0; \
+} while(0)
+
+#define PCB_QRY_RET_SIDE(o, on_bottom) \
+do { \
+	o->type = PCBQ_VT_STRING; \
+	o->data.str = on_bottom ? "BOTTOM" : "TOP"; \
+	return 0; \
+} while(0)
+
+/* The case when the operation couldn't be carried out, sort of NaN */
+#define PCB_QRY_RET_INV(o) \
+do { \
+	o->type = PCBQ_VT_VOID; \
+	return 0; \
+} while(0)
+
+
+#endif
Index: tags/2.0.1/src_plugins/query/query_l.c
===================================================================
--- tags/2.0.1/src_plugins/query/query_l.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_l.c	(revision 18980)
@@ -0,0 +1,2256 @@
+#line 2 "query_l.c"
+
+#line 4 "query_l.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer qry__create_buffer
+#define yy_delete_buffer qry__delete_buffer
+#define yy_flex_debug qry__flex_debug
+#define yy_init_buffer qry__init_buffer
+#define yy_flush_buffer qry__flush_buffer
+#define yy_load_buffer_state qry__load_buffer_state
+#define yy_switch_to_buffer qry__switch_to_buffer
+#define yyin qry_in
+#define yyleng qry_leng
+#define yylex qry_lex
+#define yylineno qry_lineno
+#define yyout qry_out
+#define yyrestart qry_restart
+#define yytext qry_text
+#define yywrap qry_wrap
+#define yyalloc qry_alloc
+#define yyrealloc qry_realloc
+#define yyfree qry_free
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE qry_restart(qry_in  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int qry_leng;
+
+extern FILE *qry_in, *qry_out;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up qry_text. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up qry_text again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via qry_restart()), so that the user can continue scanning by
+	 * just pointing qry_in at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when qry_text is formed. */
+static char yy_hold_char;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int qry_leng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow qry_wrap()'s to do buffer switches
+ * instead of setting up a fresh qry_in.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void qry_restart (FILE *input_file  );
+void qry__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE qry__create_buffer (FILE *file,int size  );
+void qry__delete_buffer (YY_BUFFER_STATE b  );
+void qry__flush_buffer (YY_BUFFER_STATE b  );
+void qry_push_buffer_state (YY_BUFFER_STATE new_buffer  );
+void qry_pop_buffer_state (void );
+
+static void qry_ensure_buffer_stack (void );
+static void qry__load_buffer_state (void );
+static void qry__init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER qry__flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE qry__scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE qry__scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE qry__scan_bytes (yyconst char *bytes,int len  );
+
+void *qry_alloc (yy_size_t  );
+void *qry_realloc (void *,yy_size_t  );
+void qry_free (void *  );
+
+#define yy_new_buffer qry__create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        qry_ensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            qry__create_buffer(qry_in,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        qry_ensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            qry__create_buffer(qry_in,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+typedef unsigned char YY_CHAR;
+
+FILE *qry_in = (FILE *) 0, *qry_out = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int qry_lineno;
+
+int qry_lineno = 1;
+
+extern char *qry_text;
+#define yytext_ptr qry_text
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up qry_text.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	qry_leng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 62
+#define YY_END_OF_BUFFER 63
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[209] =
+    {   0,
+        0,    0,   63,   62,   61,   60,   59,   62,   62,   62,
+       59,   59,   55,   59,   62,   59,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   43,   58,   58,
+       58,   58,   62,   52,    0,    1,   50,    0,    2,   56,
+       57,   55,   54,   51,   53,   58,   58,   58,   58,   58,
+       58,   58,   58,   58,   58,   32,   58,   27,   58,   58,
+       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+        9,   58,   45,   58,   58,   58,   58,   58,   42,   46,
+        8,   58,   44,   49,   57,   16,   58,   58,   58,   58,
+
+       58,   58,   58,   58,   22,   31,   58,   58,   58,   58,
+       58,   17,   58,   58,   58,   33,   58,   58,   28,   58,
+       58,   58,   58,    3,   58,   47,   58,   58,   58,   58,
+       58,   58,   58,   13,   39,   58,   58,   58,   58,   19,
+       38,   20,   14,   25,   58,   58,   58,   48,   58,    6,
+        5,   58,   58,   29,   58,   58,   23,   58,   58,   58,
+       40,   58,   58,   58,   58,   58,   10,   58,   34,   37,
+       35,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+        4,   58,   58,   58,   58,   58,   41,   58,   15,   58,
+       58,   26,    7,   36,   58,   24,   58,   18,   58,   58,
+
+       30,   58,   58,   58,   11,   12,   21,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    3,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    1,    1,    1,    6,    7,    8,
+        8,    8,    8,    8,    8,    9,    8,   10,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,    1,    3,   11,
+       12,   13,    1,    8,   14,   15,   16,   17,   18,   19,
+       20,   21,   22,   21,   23,   24,   25,   26,   27,   28,
+       21,   29,   30,   31,   32,   33,   21,   34,   35,   21,
+        1,    1,    1,    1,   36,    1,   37,   21,   38,   39,
+
+       40,   41,   42,   43,   44,   21,   21,   45,   46,   47,
+       21,   48,   21,   49,   50,   51,   52,   53,   21,   21,
+       21,   21,    1,   54,    1,    8,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[55] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+        1,    1,    1,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[212] =
+    {   0,
+        0,    0,  227,  228,  228,  228,  214,  220,  218,  216,
+      228,  212,   46,  209,  208,  207,  189,  190,  189,    0,
+      201,  188,   43,  199,   40,   40,   46,  198,   39,   50,
+      189,  192,   53,  163,  163,  160,   30,   34,  160,  196,
+      152,  157,  148,  228,  196,  228,  228,  193,  228,  189,
+      188,   54,  228,  228,  228,    0,  181,  165,  167,  170,
+       50,  158,  166,  161,  159,    0,  170,    0,  157,   52,
+      163,  155,  154,  160,  168,  148,  153,  148,  149,  148,
+      228,  127,    0,  139,   37,  124,  124,  128,    0,    0,
+      228,  127,    0,  228,  161,    0,  139,  141,  138,  149,
+
+      144,  147,  146,  140,    0,    0,  138,  131,  129,  124,
+      135,    0,  134,  140,  124,    0,  136,  131,    0,  112,
+      109,  107,  112,    0,   97,    0,  107,  119,  127,  126,
+      114,  112,  112,  104,    0,  117,  107,  119,   64,    0,
+        0,  114,    0,    0,  120,   85,  124,    0,   87,    0,
+        0,  106,  101,    0,  103,  106,  107,   98,   99,  110,
+        0,   96,   94,   92,   96,   68,  228,   74,    0,    0,
+      103,  101,   86,   87,   95,   96,   85,   83,   93,   90,
+        0,   63,   77,   75,   70,   75,    0,   73,    0,   73,
+       62,    0,    0,    0,   75,    0,   66,    0,   65,   67,
+
+        0,   57,   56,   55,    0,    0,    0,  228,  103,  105,
+       83
+    } ;
+
+static yyconst flex_int16_t yy_def[212] =
+    {   0,
+      208,    1,  208,  208,  208,  208,  208,  209,  208,  210,
+      208,  208,  208,  208,  208,  208,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  208,  208,  209,  208,  208,  210,  208,  208,
+      208,  208,  208,  208,  208,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      208,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      208,  211,  211,  208,  208,  211,  211,  211,  211,  211,
+
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  208,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+      211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
+
+      211,  211,  211,  211,  211,  211,  211,    0,  208,  208,
+      208
+    } ;
+
+static yyconst flex_int16_t yy_nxt[283] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
+       14,   15,   16,   17,   18,   19,   20,   20,   21,   20,
+       20,   22,   20,   23,   24,   25,   26,   27,   28,   29,
+       30,   20,   31,   20,   32,   20,   33,   34,   20,   20,
+       35,   20,   20,   36,   37,   38,   39,   40,   41,   20,
+       20,   42,   20,   43,   51,   52,   62,   65,   67,   70,
+       74,   81,   51,   52,   63,   68,   66,   76,  108,   86,
+       75,   69,   71,   87,  122,   72,   77,   88,   78,   89,
+      100,  109,  101,  162,   56,  207,  206,  205,  204,  123,
+      203,  202,  201,  200,  199,  198,  197,  196,  195,  163,
+
+      194,  193,   82,   45,   45,   48,   48,  192,  191,  190,
+      189,  188,  187,  186,  185,  184,  183,  182,  181,  180,
+      179,  178,  177,  176,  175,  174,  173,  172,  171,  170,
+      169,  168,  167,  166,  165,  164,  161,  160,  159,  158,
+      157,  156,  155,  154,  153,  152,  151,  150,  149,  148,
+      147,  146,  145,  144,  143,  142,  141,  140,  139,  138,
+      137,  136,  135,  134,  133,  132,  131,  130,  129,  128,
+       95,  127,  126,  125,  124,  121,  120,  119,  118,  117,
+      116,  115,  114,  113,  112,  111,  110,  107,  106,  105,
+      104,  103,  102,   99,   98,   97,   96,   95,   50,   49,
+
+       46,   94,   93,   92,   91,   90,   85,   84,   83,   80,
+       79,   73,   64,   61,   60,   59,   58,   57,   55,   54,
+       53,   50,   49,   47,   46,   44,  208,    3,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208
+    } ;
+
+static yyconst flex_int16_t yy_chk[283] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,   13,   13,   23,   25,   26,   27,
+       29,   33,   52,   52,   23,   26,   25,   30,   70,   37,
+       29,   26,   27,   37,   85,   27,   30,   38,   30,   38,
+       61,   70,   61,  139,  211,  204,  203,  202,  200,   85,
+      199,  197,  195,  191,  190,  188,  186,  185,  184,  139,
+
+      183,  182,   33,  209,  209,  210,  210,  180,  179,  178,
+      177,  176,  175,  174,  173,  172,  171,  168,  166,  165,
+      164,  163,  162,  160,  159,  158,  157,  156,  155,  153,
+      152,  149,  147,  146,  145,  142,  138,  137,  136,  134,
+      133,  132,  131,  130,  129,  128,  127,  125,  123,  122,
+      121,  120,  118,  117,  115,  114,  113,  111,  110,  109,
+      108,  107,  104,  103,  102,  101,  100,   99,   98,   97,
+       95,   92,   88,   87,   86,   84,   82,   80,   79,   78,
+       77,   76,   75,   74,   73,   72,   71,   69,   67,   65,
+       64,   63,   62,   60,   59,   58,   57,   51,   50,   48,
+
+       45,   43,   42,   41,   40,   39,   36,   35,   34,   32,
+       31,   28,   24,   22,   21,   19,   18,   17,   16,   15,
+       14,   12,   10,    9,    8,    7,    3,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208,  208,  208,  208,  208,  208,  208,  208,  208,
+      208,  208
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int qry__flex_debug;
+int qry__flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *qry_text;
+#line 1 "query_l.l"
+#line 2 "query_l.l"
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/* Query language - compiler: lexical analyzer */
+
+#include "unit.h"
+#include "query.h"
+#include "query_y.h"
+#include "compat_misc.h"
+#include "layer.h"
+
+static const char *pcb_qry_program, *pcb_qry_program_ptr;
+static int qry_yy_input(char *buf, int buflen);
+static pcb_qry_node_t *make_constant(char *str, long val);
+#define YY_INPUT(buf, res, buflen) (res = qry_yy_input(buf, buflen))
+#line 646 "query_l.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int qry_lex_destroy (void );
+
+int qry_get_debug (void );
+
+void qry_set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE qry_get_extra (void );
+
+void qry_set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *qry_get_in (void );
+
+void qry_set_in  (FILE * in_str  );
+
+FILE *qry_get_out (void );
+
+void qry_set_out  (FILE * out_str  );
+
+int qry_get_leng (void );
+
+char *qry_get_text (void );
+
+int qry_get_lineno (void );
+
+void qry_set_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int qry_wrap (void );
+#else
+extern int qry_wrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO do { if (fwrite( qry_text, qry_leng, 1, qry_out )) {} } while (0)
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( qry_in )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( qry_in ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, qry_in))==0 && ferror(qry_in)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(qry_in); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int qry_lex (void);
+
+#define YY_DECL int qry_lex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after qry_text and qry_leng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 40 "query_l.l"
+
+#line 835 "query_l.c"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! qry_in )
+			qry_in = stdin;
+
+		if ( ! qry_out )
+			qry_out = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			qry_ensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				qry__create_buffer(qry_in,YY_BUF_SIZE );
+		}
+
+		qry__load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of qry_text. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 209 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 228 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+/* rule 1 can match eol */
+YY_RULE_SETUP
+#line 41 "query_l.l"
+{ qry_lval.s = pcb_strdup(qry_text+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ }
+	YY_BREAK
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+#line 42 "query_l.l"
+{ qry_lval.s = pcb_strdup(qry_text+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; }
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 44 "query_l.l"
+{ return T_LET; }
+	YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 45 "query_l.l"
+{ return T_ASSERT; }
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 46 "query_l.l"
+{ return T_RULE; }
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 47 "query_l.l"
+{ return T_LIST; }
+	YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 48 "query_l.l"
+{ return T_INVALID; }
+	YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 49 "query_l.l"
+{ return T_FLD_P; }
+	YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 50 "query_l.l"
+{ return T_FLD_A; }
+	YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 51 "query_l.l"
+{ return T_FLD_FLAG; }
+	YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 53 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_LINE_POINT); return T_CONST; }
+	YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 54 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_POLY_POINT); return T_CONST; }
+	YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 55 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_LINE); return T_CONST; }
+	YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 56 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_TEXT); return T_CONST; }
+	YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 57 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_POLY); return T_CONST; }
+	YY_BREAK
+case 16:
+YY_RULE_SETUP
+#line 58 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_ARC); return T_CONST; }
+	YY_BREAK
+case 17:
+YY_RULE_SETUP
+#line 59 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_RAT); return T_CONST; }
+	YY_BREAK
+case 18:
+YY_RULE_SETUP
+#line 60 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_PSTK); return T_CONST; }
+	YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 61 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_PSTK); return T_CONST; }
+	YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 62 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_SUBC); return T_CONST; }
+	YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 63 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_SUBC); return T_CONST; }
+	YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 64 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_NET); return T_CONST; }
+	YY_BREAK
+case 23:
+YY_RULE_SETUP
+#line 65 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_LAYER); return T_CONST; }
+	YY_BREAK
+case 24:
+YY_RULE_SETUP
+#line 66 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_OBJ_LAYERGRP); return T_CONST; }
+	YY_BREAK
+case 25:
+YY_RULE_SETUP
+#line 68 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 1); return T_CONST; }
+	YY_BREAK
+case 26:
+YY_RULE_SETUP
+#line 69 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 1); return T_CONST; }
+	YY_BREAK
+case 27:
+YY_RULE_SETUP
+#line 70 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 1); return T_CONST; }
+	YY_BREAK
+case 28:
+YY_RULE_SETUP
+#line 71 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 1); return T_CONST; }
+	YY_BREAK
+case 29:
+YY_RULE_SETUP
+#line 73 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 0); return T_CONST; }
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
+#line 74 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 0); return T_CONST; }
+	YY_BREAK
+case 31:
+YY_RULE_SETUP
+#line 75 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 0); return T_CONST; }
+	YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 76 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, 0); return T_CONST; }
+	YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 78 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_TOP); return T_CONST; }
+	YY_BREAK
+case 34:
+YY_RULE_SETUP
+#line 79 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_BOTTOM); return T_CONST; }
+	YY_BREAK
+case 35:
+YY_RULE_SETUP
+#line 80 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_INTERN); return T_CONST; }
+	YY_BREAK
+case 36:
+YY_RULE_SETUP
+#line 81 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_INTERN); return T_CONST; }
+	YY_BREAK
+case 37:
+YY_RULE_SETUP
+#line 82 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_COPPER); return T_CONST; }
+	YY_BREAK
+case 38:
+YY_RULE_SETUP
+#line 83 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_SILK); return T_CONST; }
+	YY_BREAK
+case 39:
+YY_RULE_SETUP
+#line 84 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_MASK); return T_CONST; }
+	YY_BREAK
+case 40:
+YY_RULE_SETUP
+#line 85 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_PASTE); return T_CONST; }
+	YY_BREAK
+case 41:
+YY_RULE_SETUP
+#line 86 "query_l.l"
+{ qry_lval.n = make_constant(qry_text, PCB_LYT_OUTLINE); return T_CONST; }
+	YY_BREAK
+case 42:
+YY_RULE_SETUP
+#line 90 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
+	YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 91 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
+	YY_BREAK
+case 44:
+YY_RULE_SETUP
+#line 92 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
+	YY_BREAK
+case 45:
+YY_RULE_SETUP
+#line 93 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
+	YY_BREAK
+case 46:
+YY_RULE_SETUP
+#line 94 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
+	YY_BREAK
+case 47:
+YY_RULE_SETUP
+#line 95 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
+	YY_BREAK
+case 48:
+YY_RULE_SETUP
+#line 96 "query_l.l"
+{ qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
+	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 98 "query_l.l"
+{ return T_OR; }
+	YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 99 "query_l.l"
+{ return T_AND; }
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 100 "query_l.l"
+{ return T_EQ; }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 101 "query_l.l"
+{ return T_NEQ; }
+	YY_BREAK
+case 53:
+YY_RULE_SETUP
+#line 102 "query_l.l"
+{ return T_GTEQ; }
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 103 "query_l.l"
+{ return T_LTEQ; }
+	YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 105 "query_l.l"
+{ qry_lval.c = strtol(qry_text, NULL, 10); return T_INT; }
+	YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 106 "query_l.l"
+{ qry_lval.d = strtod(qry_text, NULL); return T_DBL; }
+	YY_BREAK
+case 57:
+YY_RULE_SETUP
+#line 107 "query_l.l"
+{ qry_lval.d = strtod(qry_text, NULL); return T_DBL; }
+	YY_BREAK
+case 58:
+YY_RULE_SETUP
+#line 108 "query_l.l"
+{ qry_lval.s = pcb_strdup(qry_text); return T_STR; }
+	YY_BREAK
+case 59:
+YY_RULE_SETUP
+#line 110 "query_l.l"
+{ return *qry_text; }
+	YY_BREAK
+case 60:
+/* rule 60 can match eol */
+YY_RULE_SETUP
+#line 112 "query_l.l"
+{ return T_NL; }
+	YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 113 "query_l.l"
+{ continue; }
+	YY_BREAK
+case 62:
+YY_RULE_SETUP
+#line 115 "query_l.l"
+ECHO;
+	YY_BREAK
+#line 1231 "query_l.c"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed qry_in at a new source and called
+			 * qry_lex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = qry_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( qry_wrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * qry_text, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of qry_lex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					qry_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), (size_t) num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			qry_restart(qry_in  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) qry_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 209 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 209 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 208);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+	/* undo effects of setting up qry_text */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					qry_restart(qry_in );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( qry_wrap( ) )
+						return EOF;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve qry_text */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void qry_restart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        qry_ensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            qry__create_buffer(qry_in,YY_BUF_SIZE );
+	}
+
+	qry__init_buffer(YY_CURRENT_BUFFER,input_file );
+	qry__load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void qry__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		qry_pop_buffer_state();
+	 *		qry_push_buffer_state(new_buffer);
+     */
+	qry_ensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	qry__load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (qry_wrap()) processing, but the only time this flag
+	 * is looked at is after qry_wrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void qry__load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	qry_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE qry__create_buffer  (FILE * file, int  size )
+{
+	YY_BUFFER_STATE b;
+    
+	b = (YY_BUFFER_STATE) qry_alloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in qry__create_buffer()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) qry_alloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in qry__create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	qry__init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with qry__create_buffer()
+ * 
+ */
+    void qry__delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		qry_free((void *) b->yy_ch_buf  );
+
+	qry_free((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a qry_restart() or at EOF.
+ */
+    static void qry__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	qry__flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then qry__init_buffer was _probably_
+     * called from qry_restart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void qry__flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		qry__load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void qry_push_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	qry_ensure_buffer_stack();
+
+	/* This block is copied from qry__switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from qry__switch_to_buffer. */
+	qry__load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void qry_pop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	qry__delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		qry__load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void qry_ensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)qry_alloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in qry_ensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)qry_realloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in qry_ensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE qry__scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) qry_alloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in qry__scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	qry__switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to qry_lex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       qry__scan_bytes() instead.
+ */
+YY_BUFFER_STATE qry__scan_string (yyconst char * yystr )
+{
+    
+	return qry__scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to qry_lex() will
+ * scan from a @e copy of @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE qry__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n;
+	int i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) qry_alloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in qry__scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = qry__scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in qry__scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up qry_text. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		qry_text[qry_leng] = (yy_hold_char); \
+		(yy_c_buf_p) = qry_text + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		qry_leng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int qry_get_lineno  (void)
+{
+        
+    return qry_lineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *qry_get_in  (void)
+{
+        return qry_in;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *qry_get_out  (void)
+{
+        return qry_out;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int qry_get_leng  (void)
+{
+        return qry_leng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *qry_get_text  (void)
+{
+        return qry_text;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void qry_set_lineno (int  line_number )
+{
+    
+    qry_lineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see qry__switch_to_buffer
+ */
+void qry_set_in (FILE *  in_str )
+{
+        qry_in = in_str ;
+}
+
+void qry_set_out (FILE *  out_str )
+{
+        qry_out = out_str ;
+}
+
+int qry_get_debug  (void)
+{
+        return qry__flex_debug;
+}
+
+void qry_set_debug (int  bdebug )
+{
+        qry__flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from qry_lex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    qry_in = stdin;
+    qry_out = stdout;
+#else
+    qry_in = (FILE *) 0;
+    qry_out = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * qry_lex_init()
+     */
+    return 0;
+}
+
+/* qry_lex_destroy is for both reentrant and non-reentrant scanners. */
+int qry_lex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		qry__delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		qry_pop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	qry_free((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * qry_lex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *qry_alloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *qry_realloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void qry_free (void * ptr )
+{
+	free( (char *) ptr );	/* see qry_realloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 115 "query_l.l"
+
+
+
+static int qry_yy_input(char *buf, int buflen)
+{
+	int len;
+	for(len = 0; (*pcb_qry_program_ptr != '\0') && (buflen > 0); len++,buflen--) {
+/*		printf("IN: '%c'\n",  *pcb_qry_program_ptr);*/
+		*buf = *pcb_qry_program_ptr;
+		buf++;
+		pcb_qry_program_ptr++;
+	}
+	return len;
+}
+
+void pcb_qry_set_input(const char *script)
+{
+	pcb_qry_program = pcb_qry_program_ptr = script;
+}
+
+static pcb_qry_node_t *make_constant(char *str, long val)
+{
+	pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_CONST);
+	res->data.str = pcb_strdup(str);
+	res->precomp.cnst = val;
+	return res;
+}
+
Index: tags/2.0.1/src_plugins/query/query_l.h
===================================================================
--- tags/2.0.1/src_plugins/query/query_l.h	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_l.h	(revision 18980)
@@ -0,0 +1,332 @@
+#ifndef qry_HEADER_H
+#define qry_HEADER_H 1
+#define qry_IN_HEADER 1
+
+#line 6 "query_l.h"
+
+#line 8 "query_l.h"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int qry_leng;
+
+extern FILE *qry_in, *qry_out;
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	int yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+	/* Whether to try to fill the input buffer when we reach the
+	 * end of it.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+void qry_restart (FILE *input_file  );
+void qry__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE qry__create_buffer (FILE *file,int size  );
+void qry__delete_buffer (YY_BUFFER_STATE b  );
+void qry__flush_buffer (YY_BUFFER_STATE b  );
+void qry_push_buffer_state (YY_BUFFER_STATE new_buffer  );
+void qry_pop_buffer_state (void );
+
+YY_BUFFER_STATE qry__scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE qry__scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE qry__scan_bytes (yyconst char *bytes,int len  );
+
+void *qry_alloc (yy_size_t  );
+void *qry_realloc (void *,yy_size_t  );
+void qry_free (void *  );
+
+/* Begin user sect3 */
+
+extern int qry_lineno;
+
+extern char *qry_text;
+#define yytext_ptr qry_text
+
+#ifdef YY_HEADER_EXPORT_START_CONDITIONS
+#define INITIAL 0
+
+#endif
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int qry_lex_destroy (void );
+
+int qry_get_debug (void );
+
+void qry_set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE qry_get_extra (void );
+
+void qry_set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *qry_get_in (void );
+
+void qry_set_in  (FILE * in_str  );
+
+FILE *qry_get_out (void );
+
+void qry_set_out  (FILE * out_str  );
+
+int qry_get_leng (void );
+
+char *qry_get_text (void );
+
+int qry_get_lineno (void );
+
+void qry_set_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int qry_wrap (void );
+#else
+extern int qry_wrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int qry_lex (void);
+
+#define YY_DECL int qry_lex (void)
+#endif /* !YY_DECL */
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+
+#line 115 "query_l.l"
+
+
+#line 331 "query_l.h"
+#undef qry_IN_HEADER
+#endif /* qry_HEADER_H */
Index: tags/2.0.1/src_plugins/query/query_l.l
===================================================================
--- tags/2.0.1/src_plugins/query/query_l.l	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_l.l	(revision 18980)
@@ -0,0 +1,140 @@
+%{
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/* Query language - compiler: lexical analyzer */
+
+#include "unit.h"
+#include "query.h"
+#include "query_y.h"
+#include "compat_misc.h"
+#include "layer.h"
+
+static const char *pcb_qry_program, *pcb_qry_program_ptr;
+static int qry_yy_input(char *buf, int buflen);
+static pcb_qry_node_t *make_constant(char *str, long val);
+#define YY_INPUT(buf, res, buflen) (res = qry_yy_input(buf, buflen))
+%}
+
+%option prefix="qry_"
+
+%%
+["][^"]*["]     { qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; /*"*/ }
+['][^']*[']     { qry_lval.s = pcb_strdup(yytext+1); qry_lval.s[strlen(qry_lval.s)-1] = '\0'; return T_QSTR; }
+
+let             { return T_LET; }
+assert          { return T_ASSERT; }
+rule            { return T_RULE; }
+list            { return T_LIST; }
+invalid         { return T_INVALID; }
+p[.]            { return T_FLD_P; }
+a[.]            { return T_FLD_A; }
+flag[.]         { return T_FLD_FLAG; }
+
+"LINE_POINT"    { qry_lval.n = make_constant(yytext, PCB_OBJ_LINE_POINT); return T_CONST; }
+"POLY_POINT"    { qry_lval.n = make_constant(yytext, PCB_OBJ_POLY_POINT); return T_CONST; }
+"LINE"          { qry_lval.n = make_constant(yytext, PCB_OBJ_LINE); return T_CONST; }
+"TEXT"          { qry_lval.n = make_constant(yytext, PCB_OBJ_TEXT); return T_CONST; }
+"POLYGON"       { qry_lval.n = make_constant(yytext, PCB_OBJ_POLY); return T_CONST; }
+"ARC"           { qry_lval.n = make_constant(yytext, PCB_OBJ_ARC); return T_CONST; }
+"RAT"           { qry_lval.n = make_constant(yytext, PCB_OBJ_RAT); return T_CONST; }
+"PADSTACK"      { qry_lval.n = make_constant(yytext, PCB_OBJ_PSTK); return T_CONST; }
+"PSTK"          { qry_lval.n = make_constant(yytext, PCB_OBJ_PSTK); return T_CONST; }
+"SUBC"          { qry_lval.n = make_constant(yytext, PCB_OBJ_SUBC); return T_CONST; }
+"SUBCIRCUIT"    { qry_lval.n = make_constant(yytext, PCB_OBJ_SUBC); return T_CONST; }
+"NET"           { qry_lval.n = make_constant(yytext, PCB_OBJ_NET); return T_CONST; }
+"LAYER"         { qry_lval.n = make_constant(yytext, PCB_OBJ_LAYER); return T_CONST; }
+"LAYERGRP"      { qry_lval.n = make_constant(yytext, PCB_OBJ_LAYERGRP); return T_CONST; }
+
+"TRUE"          { qry_lval.n = make_constant(yytext, 1); return T_CONST; }
+"VISIBLE"       { qry_lval.n = make_constant(yytext, 1); return T_CONST; }
+"ON"            { qry_lval.n = make_constant(yytext, 1); return T_CONST; }
+"YES"           { qry_lval.n = make_constant(yytext, 1); return T_CONST; }
+
+"FALSE"         { qry_lval.n = make_constant(yytext, 0); return T_CONST; }
+"INVISIBLE"     { qry_lval.n = make_constant(yytext, 0); return T_CONST; }
+"OFF"           { qry_lval.n = make_constant(yytext, 0); return T_CONST; }
+"NO"            { qry_lval.n = make_constant(yytext, 0); return T_CONST; }
+
+"TOP"           { qry_lval.n = make_constant(yytext, PCB_LYT_TOP); return T_CONST; }
+"BOTTOM"        { qry_lval.n = make_constant(yytext, PCB_LYT_BOTTOM); return T_CONST; }
+"INTERN"        { qry_lval.n = make_constant(yytext, PCB_LYT_INTERN); return T_CONST; }
+"INTERNAL"      { qry_lval.n = make_constant(yytext, PCB_LYT_INTERN); return T_CONST; }
+"COPPER"        { qry_lval.n = make_constant(yytext, PCB_LYT_COPPER); return T_CONST; }
+"SILK"          { qry_lval.n = make_constant(yytext, PCB_LYT_SILK); return T_CONST; }
+"MASK"          { qry_lval.n = make_constant(yytext, PCB_LYT_MASK); return T_CONST; }
+"PASTE"         { qry_lval.n = make_constant(yytext, PCB_LYT_PASTE); return T_CONST; }
+"OUTLINE"       { qry_lval.n = make_constant(yytext, PCB_LYT_OUTLINE); return T_CONST; }
+
+
+
+mm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MM); return T_UNIT; }
+m               { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_M); return T_UNIT; }
+um              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_UM); return T_UNIT; }
+cm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_CM); return T_UNIT; }
+nm              { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_NM); return T_UNIT; }
+mil             { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_MIL); return T_UNIT; }
+inch            { qry_lval.u = get_unit_struct_by_allow(PCB_UNIT_ALLOW_IN); return T_UNIT; }
+
+[|][|]          { return T_OR; }
+[&][&]          { return T_AND; }
+[=][=]          { return T_EQ; }
+[!][=]          { return T_NEQ; }
+[>][=]          { return T_GTEQ; }
+[<][=]          { return T_LTEQ; }
+
+[0-9]+                    { qry_lval.c = strtol(yytext, NULL, 10); return T_INT; }
+[.][0-9]+                 { qry_lval.d = strtod(yytext, NULL); return T_DBL; }
+[0-9]+[.][0-9]*           { qry_lval.d = strtod(yytext, NULL); return T_DBL; }
+[A-Za-z_][0-9A-Za-z_]*    { qry_lval.s = pcb_strdup(yytext); return T_STR; }
+
+[@().,<>!*+/~-] { return *yytext; }
+
+[;\r\n]         { return T_NL; }
+[ \t]           { continue; }
+
+%%
+
+static int qry_yy_input(char *buf, int buflen)
+{
+	int len;
+	for(len = 0; (*pcb_qry_program_ptr != '\0') && (buflen > 0); len++,buflen--) {
+/*		printf("IN: '%c'\n",  *pcb_qry_program_ptr);*/
+		*buf = *pcb_qry_program_ptr;
+		buf++;
+		pcb_qry_program_ptr++;
+	}
+	return len;
+}
+
+void pcb_qry_set_input(const char *script)
+{
+	pcb_qry_program = pcb_qry_program_ptr = script;
+}
+
+static pcb_qry_node_t *make_constant(char *str, long val)
+{
+	pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_CONST);
+	res->data.str = pcb_strdup(str);
+	res->precomp.cnst = val;
+	return res;
+}
Index: tags/2.0.1/src_plugins/query/query_y.c
===================================================================
--- tags/2.0.1/src_plugins/query/query_y.c	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_y.c	(revision 18980)
@@ -0,0 +1,2044 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.2"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+/* Substitute the variable and function names.  */
+#define yyparse         qry_parse
+#define yylex           qry_lex
+#define yyerror         qry_error
+#define yydebug         qry_debug
+#define yynerrs         qry_nerrs
+
+#define yylval          qry_lval
+#define yychar          qry_char
+
+/* Copy the first part of user declarations.  */
+#line 1 "query_y.y" /* yacc.c:339  */
+
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Query language - compiler: grammar */
+
+#include <assert.h>
+#include "unit.h"
+#include "query.h"
+#include "query_l.h"
+#include "compat_misc.h"
+#include "flag_str.h"
+#include "fields_sphash.h"
+
+#define UNIT_CONV(dst, negative, val, unit) \
+do { \
+	dst = val; \
+	if (negative) \
+		dst = -dst; \
+	if (unit != NULL) { \
+		if (unit->family == PCB_UNIT_IMPERIAL) \
+			dst = PCB_MIL_TO_COORD(dst); \
+		else if (unit->family == PCB_UNIT_METRIC) \
+			dst = PCB_MM_TO_COORD(dst); \
+		dst /= unit->scale_factor; \
+	} \
+} while(0)
+
+#define BINOP(dst, op1, operator, op2) \
+do { \
+	assert(op2->next == NULL); \
+	assert(op2->next == NULL); \
+	dst = pcb_qry_n_alloc(operator); \
+	pcb_qry_n_insert(dst, op2); \
+	pcb_qry_n_insert(dst, op1); \
+} while(0)
+
+#define UNOP(dst, operator, op) \
+do { \
+	assert(op->next == NULL); \
+	dst = pcb_qry_n_alloc(operator); \
+	pcb_qry_n_insert(dst, op); \
+} while(0)
+
+static pcb_query_iter_t *iter_ctx;
+
+static char *attrib_prepend_free(char *orig, char *prep, char sep)
+{
+	int l1 = strlen(orig), l2 = strlen(prep);
+	char *res = malloc(l1+l2+2);
+	memcpy(res, prep, l2);
+	res[l2] = sep;
+	memcpy(res+l2+1, orig, l1+1);
+	free(orig);
+	free(prep);
+	return res;
+}
+
+static pcb_qry_node_t *make_regex_free(char *str)
+{
+	pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_REGEX);
+	res->data.str = str;
+	res->precomp.regex = re_se_comp(str);
+	if (res->precomp.regex == NULL)
+		yyerror(NULL, "Invalid regex\n");
+	return res;
+}
+
+
+static pcb_qry_node_t *make_flag_free(char *str)
+{
+	const pcb_flag_bits_t *i = pcb_strflg_name(str, 0x7FFFFFFF);
+	pcb_qry_node_t *nd;
+
+	if (i == NULL) {
+		yyerror(NULL, "Unknown flag");
+		free(str);
+		return NULL;
+	}
+
+	nd = pcb_qry_n_alloc(PCBQ_FLAG);
+	nd->precomp.flg = i;
+	free(str);
+	return nd;
+}
+
+
+
+#line 187 "query_y.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 1
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "query_y.h".  */
+#ifndef YY_QRY_QUERY_Y_H_INCLUDED
+# define YY_QRY_QUERY_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int qry_debug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    T_LET = 258,
+    T_ASSERT = 259,
+    T_RULE = 260,
+    T_LIST = 261,
+    T_INVALID = 262,
+    T_FLD_P = 263,
+    T_FLD_A = 264,
+    T_FLD_FLAG = 265,
+    T_OR = 266,
+    T_AND = 267,
+    T_EQ = 268,
+    T_NEQ = 269,
+    T_GTEQ = 270,
+    T_LTEQ = 271,
+    T_NL = 272,
+    T_UNIT = 273,
+    T_STR = 274,
+    T_QSTR = 275,
+    T_INT = 276,
+    T_DBL = 277,
+    T_CONST = 278
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 118 "query_y.y" /* yacc.c:355  */
+
+	char *s;
+	pcb_coord_t c;
+	double d;
+	const pcb_unit_t *u;
+	pcb_qry_node_t *n;
+
+#line 259 "query_y.c" /* yacc.c:355  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE qry_lval;
+
+int qry_parse (pcb_qry_node_t **prg_out);
+
+#endif /* !YY_QRY_QUERY_Y_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 274 "query_y.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  9
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   228
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  37
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  18
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  58
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  95
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   278
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    31,     2,     2,     2,     2,     2,     2,
+      32,    33,    28,    26,    36,    27,    30,    29,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      24,     2,    25,     2,    35,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,    34,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   156,   156,   157,   162,   162,   175,   176,   180,   192,
+     193,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   231,   232,   233,   234,   238,   242,
+     243,   247,   248,   249,   250,   251,   255,   256,   257,   261,
+     262,   263,   267,   268,   272,   286,   287,   291,   292
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 1
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_LET", "T_ASSERT", "T_RULE", "T_LIST",
+  "T_INVALID", "T_FLD_P", "T_FLD_A", "T_FLD_FLAG", "T_OR", "T_AND", "T_EQ",
+  "T_NEQ", "T_GTEQ", "T_LTEQ", "T_NL", "T_UNIT", "T_STR", "T_QSTR",
+  "T_INT", "T_DBL", "T_CONST", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'",
+  "'.'", "'!'", "'('", "')'", "'~'", "'@'", "','", "$accept", "program",
+  "program_expr", "$@1", "program_rules", "rule", "exprs", "expr",
+  "number", "string_literal", "maybe_unit", "fields", "attribs", "var",
+  "fcall", "fname", "fargs", "words", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,    60,    62,    43,    45,    42,    47,
+      46,    33,    40,    41,   126,    64,    44
+};
+# endif
+
+#define YYPACT_NINF -64
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-64)))
+
+#define YYTABLE_NINF -55
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+      26,   -18,    12,   -64,    40,   -64,    20,   -18,    10,   -64,
+       1,   -64,    16,   -64,    34,    34,   -64,   -11,    40,    40,
+     -64,   139,   -64,   -64,    43,   -64,    42,   -64,   -64,   -64,
+      47,   -64,   -64,   -64,    34,    34,    51,    91,    40,    40,
+      40,    40,    40,    40,    40,    40,    40,    40,    40,    40,
+      46,    49,    -3,    40,    53,   -64,   -64,   -64,   162,   179,
+     194,   194,   -21,   -21,   -21,   -21,    22,    22,    51,    51,
+     -64,   -64,    45,    50,    54,   -64,   -64,    65,    55,   115,
+     -64,    64,   -64,    57,   -64,   -64,    49,    40,   -64,   -64,
+     -64,    50,   -64,   -64,   -64
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       4,    57,     0,     3,     0,     2,     6,    57,     0,     1,
+       0,    14,    49,    38,    39,    39,    31,     0,     0,     0,
+      51,     5,    12,    13,    32,    11,     0,     7,    58,     9,
+       0,    40,    34,    35,    39,    39,    15,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     8,     0,    36,    37,    16,    18,    17,
+      19,    20,    21,    22,    24,    23,    25,    26,    27,    28,
+      29,    30,     0,     0,    41,    33,    53,    55,     0,     0,
+      50,     0,    43,    46,    48,    45,     0,     0,    52,    10,
+      44,     0,    42,    56,    47
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -64,   -64,   -64,   -64,    89,   -64,   -64,    -4,   -64,   -64,
+     -13,   -63,     5,   -64,   -64,   -64,    11,    90
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     2,     3,     4,     5,     6,    53,    77,    22,    23,
+      32,    75,    85,    24,    25,    26,    78,     8
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_int8 yytable[] =
+{
+      21,     7,    33,    10,    11,    46,    47,    48,    49,    82,
+      34,    35,     9,    50,    36,    37,    12,    13,    14,    15,
+      16,    55,    56,    92,    17,     1,    -6,    29,    18,    19,
+      76,     1,    20,    30,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    10,    11,   -54,    79,
+      48,    49,    31,    72,    73,    81,    50,    72,    73,    12,
+      13,    14,    15,    16,    74,    70,    71,    17,    74,    83,
+      84,    18,    19,    51,    52,    20,    38,    39,    40,    41,
+      42,    43,    54,    90,    86,    50,    80,    91,    88,    44,
+      45,    46,    47,    48,    49,    27,    94,    28,    93,    50,
+       0,    87,    38,    39,    40,    41,    42,    43,     0,     0,
+       0,     0,     0,     0,     0,    44,    45,    46,    47,    48,
+      49,     0,     0,     0,    57,    50,    38,    39,    40,    41,
+      42,    43,    89,     0,     0,     0,     0,     0,     0,    44,
+      45,    46,    47,    48,    49,     0,     0,     0,     0,    50,
+      38,    39,    40,    41,    42,    43,     0,     0,     0,     0,
+       0,     0,     0,    44,    45,    46,    47,    48,    49,     0,
+       0,     0,     0,    50,    39,    40,    41,    42,    43,     0,
+       0,     0,     0,     0,     0,     0,    44,    45,    46,    47,
+      48,    49,    40,    41,    42,    43,    50,     0,     0,     0,
+       0,     0,     0,    44,    45,    46,    47,    48,    49,    42,
+      43,     0,     0,    50,     0,     0,     0,     0,    44,    45,
+      46,    47,    48,    49,     0,     0,     0,     0,    50
+};
+
+static const yytype_int8 yycheck[] =
+{
+       4,    19,    15,     6,     7,    26,    27,    28,    29,    72,
+      21,    22,     0,    34,    18,    19,    19,    20,    21,    22,
+      23,    34,    35,    86,    27,     5,     0,    17,    31,    32,
+      33,     5,    35,    32,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,     6,     7,    32,    53,
+      28,    29,    18,     8,     9,    10,    34,     8,     9,    19,
+      20,    21,    22,    23,    19,    19,    20,    27,    19,    19,
+      20,    31,    32,    30,    32,    35,    11,    12,    13,    14,
+      15,    16,    35,    19,    30,    34,    33,    30,    33,    24,
+      25,    26,    27,    28,    29,     6,    91,     7,    87,    34,
+      -1,    36,    11,    12,    13,    14,    15,    16,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    24,    25,    26,    27,    28,
+      29,    -1,    -1,    -1,    33,    34,    11,    12,    13,    14,
+      15,    16,    17,    -1,    -1,    -1,    -1,    -1,    -1,    24,
+      25,    26,    27,    28,    29,    -1,    -1,    -1,    -1,    34,
+      11,    12,    13,    14,    15,    16,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    24,    25,    26,    27,    28,    29,    -1,
+      -1,    -1,    -1,    34,    12,    13,    14,    15,    16,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    24,    25,    26,    27,
+      28,    29,    13,    14,    15,    16,    34,    -1,    -1,    -1,
+      -1,    -1,    -1,    24,    25,    26,    27,    28,    29,    15,
+      16,    -1,    -1,    34,    -1,    -1,    -1,    -1,    24,    25,
+      26,    27,    28,    29,    -1,    -1,    -1,    -1,    34
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     5,    38,    39,    40,    41,    42,    19,    54,     0,
+       6,     7,    19,    20,    21,    22,    23,    27,    31,    32,
+      35,    44,    45,    46,    50,    51,    52,    41,    54,    17,
+      32,    18,    47,    47,    21,    22,    44,    44,    11,    12,
+      13,    14,    15,    16,    24,    25,    26,    27,    28,    29,
+      34,    30,    32,    43,    35,    47,    47,    33,    44,    44,
+      44,    44,    44,    44,    44,    44,    44,    44,    44,    44,
+      19,    20,     8,     9,    19,    48,    33,    44,    53,    44,
+      33,    10,    48,    19,    20,    49,    30,    36,    33,    17,
+      19,    30,    48,    53,    49
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    37,    38,    38,    40,    39,    41,    41,    42,    43,
+      43,    44,    44,    44,    44,    44,    44,    44,    44,    44,
+      44,    44,    44,    44,    44,    44,    44,    44,    44,    44,
+      44,    44,    44,    44,    45,    45,    45,    45,    46,    47,
+      47,    48,    48,    48,    48,    48,    49,    49,    49,    50,
+      50,    50,    51,    51,    52,    53,    53,    54,    54
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     0,     2,     0,     2,     4,     0,
+       3,     1,     1,     1,     1,     2,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     1,     1,     3,     2,     2,     3,     3,     1,     0,
+       1,     1,     3,     2,     3,     2,     1,     3,     1,     1,
+       4,     1,     4,     3,     1,     1,     3,     0,     2
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (prg_out, YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, prg_out); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, pcb_qry_node_t **prg_out)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  YYUSE (prg_out);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, pcb_qry_node_t **prg_out)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, prg_out);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, pcb_qry_node_t **prg_out)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              , prg_out);
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule, prg_out); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, pcb_qry_node_t **prg_out)
+{
+  YYUSE (yyvaluep);
+  YYUSE (prg_out);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (pcb_qry_node_t **prg_out)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 156 "query_y.y" /* yacc.c:1646  */
+    { *prg_out = (yyvsp[0].n); }
+#line 1440 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 3:
+#line 157 "query_y.y" /* yacc.c:1646  */
+    { *prg_out = (yyvsp[0].n); }
+#line 1446 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 4:
+#line 162 "query_y.y" /* yacc.c:1646  */
+    { iter_ctx = pcb_qry_iter_alloc(); }
+#line 1452 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 5:
+#line 163 "query_y.y" /* yacc.c:1646  */
+    {
+		(yyval.n) = pcb_qry_n_alloc(PCBQ_EXPR_PROG);
+		(yyval.n)->data.children = pcb_qry_n_alloc(PCBQ_ITER_CTX);
+		(yyval.n)->data.children->parent = (yyval.n);
+		(yyval.n)->data.children->data.iter_ctx = iter_ctx;
+		(yyval.n)->data.children->next = (yyvsp[0].n);
+		(yyvsp[0].n)->parent = (yyval.n);
+	}
+#line 1465 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 6:
+#line 175 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = NULL; }
+#line 1471 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 7:
+#line 176 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[-1].n); (yyvsp[-1].n)->next = (yyvsp[0].n); }
+#line 1477 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 8:
+#line 180 "query_y.y" /* yacc.c:1646  */
+    {
+		(yyval.n) = pcb_qry_n_alloc(PCBQ_RULE);
+		(yyval.n)->data.children = (yyvsp[-2].n);
+		(yyvsp[-2].n)->parent = (yyval.n);
+		(yyval.n)->data.children->next = pcb_qry_n_alloc(PCBQ_ITER_CTX);
+		(yyval.n)->data.children->next->data.iter_ctx = iter_ctx;
+		(yyval.n)->data.children->next->next = (yyvsp[0].n);
+		(yyvsp[0].n)->parent = (yyval.n);
+		}
+#line 1491 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 9:
+#line 192 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = NULL; }
+#line 1497 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 10:
+#line 193 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[-2].n); (yyvsp[-2].n)->next = (yyvsp[-1].n); }
+#line 1503 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 11:
+#line 197 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1509 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 12:
+#line 198 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1515 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 13:
+#line 199 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1521 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 14:
+#line 200 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_INVALID); }
+#line 1527 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 15:
+#line 201 "query_y.y" /* yacc.c:1646  */
+    { UNOP((yyval.n), PCBQ_OP_NOT, (yyvsp[0].n)); }
+#line 1533 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 16:
+#line 202 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[-1].n); }
+#line 1539 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 17:
+#line 203 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_AND, (yyvsp[0].n)); }
+#line 1545 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 18:
+#line 204 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_OR, (yyvsp[0].n)); }
+#line 1551 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 19:
+#line 205 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_EQ, (yyvsp[0].n)); }
+#line 1557 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 20:
+#line 206 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_NEQ, (yyvsp[0].n)); }
+#line 1563 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 21:
+#line 207 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_GTEQ, (yyvsp[0].n)); }
+#line 1569 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 22:
+#line 208 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_LTEQ, (yyvsp[0].n)); }
+#line 1575 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 23:
+#line 209 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_GT, (yyvsp[0].n)); }
+#line 1581 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 24:
+#line 210 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_LT, (yyvsp[0].n)); }
+#line 1587 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 25:
+#line 211 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_ADD, (yyvsp[0].n)); }
+#line 1593 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 26:
+#line 212 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_SUB, (yyvsp[0].n)); }
+#line 1599 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 27:
+#line 213 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MUL, (yyvsp[0].n)); }
+#line 1605 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 28:
+#line 214 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_DIV, (yyvsp[0].n)); }
+#line 1611 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 29:
+#line 215 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MATCH, make_regex_free((yyvsp[0].s))); }
+#line 1617 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 30:
+#line 216 "query_y.y" /* yacc.c:1646  */
+    { BINOP((yyval.n), (yyvsp[-2].n), PCBQ_OP_MATCH, make_regex_free((yyvsp[0].s))); }
+#line 1623 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 31:
+#line 217 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1629 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 32:
+#line 218 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1635 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 33:
+#line 219 "query_y.y" /* yacc.c:1646  */
+    {
+		pcb_qry_node_t *n;
+		(yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD_OF);
+		(yyval.n)->data.children = (yyvsp[-2].n);
+		(yyvsp[-2].n)->next = (yyvsp[0].n);
+		(yyvsp[-2].n)->parent = (yyval.n);
+		for(n = (yyvsp[0].n); n != NULL; n = n->next)
+			n->parent = (yyval.n);
+		}
+#line 1649 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 34:
+#line 231 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_COORD);  UNIT_CONV((yyval.n)->data.crd, 0, (yyvsp[-1].c), (yyvsp[0].u)); }
+#line 1655 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 35:
+#line 232 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV((yyval.n)->data.dbl, 0, (yyvsp[-1].d), (yyvsp[0].u)); }
+#line 1661 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 36:
+#line 233 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_COORD);  UNIT_CONV((yyval.n)->data.crd, 1, (yyvsp[-1].c), (yyvsp[0].u)); }
+#line 1667 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 37:
+#line 234 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV((yyval.n)->data.dbl, 1, (yyvsp[-1].d), (yyvsp[0].u)); }
+#line 1673 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 38:
+#line 238 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_DATA_STRING);  (yyval.n)->data.str = (yyvsp[0].s); }
+#line 1679 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 39:
+#line 242 "query_y.y" /* yacc.c:1646  */
+    { (yyval.u) = NULL; }
+#line 1685 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 40:
+#line 243 "query_y.y" /* yacc.c:1646  */
+    { (yyval.u) = (yyvsp[0].u); }
+#line 1691 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 41:
+#line 247 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); (yyval.n)->precomp.fld = query_fields_sphash((yyvsp[0].s)); }
+#line 1697 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 42:
+#line 248 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[-2].s); (yyval.n)->precomp.fld = query_fields_sphash((yyvsp[-2].s)); (yyval.n)->next = (yyvsp[0].n); }
+#line 1703 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 43:
+#line 249 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); /* just ignore .p. */ }
+#line 1709 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 44:
+#line 250 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = make_flag_free((yyvsp[0].s)); }
+#line 1715 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 45:
+#line 251 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = pcb_strdup("a"); (yyval.n)->precomp.fld = query_fields_sphash("a"); (yyval.n)->next = (yyvsp[0].n); }
+#line 1721 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 46:
+#line 255 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); }
+#line 1727 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 256 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = attrib_prepend_free((yyvsp[0].n)->data.str, (yyvsp[-2].s), '.'); }
+#line 1733 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 48:
+#line 257 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FIELD); (yyval.n)->data.str = (yyvsp[0].s); }
+#line 1739 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 49:
+#line 261 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_VAR); (yyval.n)->data.crd = pcb_qry_iter_var(iter_ctx, (yyvsp[0].s), 1); free((yyvsp[0].s)); }
+#line 1745 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 50:
+#line 262 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_LISTVAR); (yyval.n)->data.str = pcb_strdup("@"); }
+#line 1751 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 51:
+#line 263 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_VAR); (yyval.n)->data.crd = pcb_qry_iter_var(iter_ctx, "@", 1); }
+#line 1757 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 52:
+#line 267 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FCALL); (yyval.n)->data.children = (yyvsp[-3].n); (yyval.n)->data.children->next = (yyvsp[-1].n); (yyvsp[-3].n)->parent = (yyvsp[-1].n)->parent = (yyval.n); }
+#line 1763 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 53:
+#line 268 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_FCALL); (yyval.n)->data.children = (yyvsp[-2].n); (yyvsp[-2].n)->parent = (yyval.n); }
+#line 1769 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 54:
+#line 272 "query_y.y" /* yacc.c:1646  */
+    {
+		(yyval.n) = pcb_qry_n_alloc(PCBQ_FNAME);
+		(yyval.n)->data.fnc = pcb_qry_fnc_lookup((yyvsp[0].s));
+		if ((yyval.n)->data.fnc == NULL) {
+			yyerror("Unknown function");
+			free((yyvsp[0].s));
+			return -1;
+		}
+		free((yyvsp[0].s));
+	}
+#line 1784 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 55:
+#line 286 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[0].n); }
+#line 1790 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 56:
+#line 287 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = (yyvsp[-2].n); (yyval.n)->next = (yyvsp[0].n); }
+#line 1796 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 57:
+#line 291 "query_y.y" /* yacc.c:1646  */
+    { (yyval.n) = pcb_qry_n_alloc(PCBQ_RNAME); (yyval.n)->data.str = (const char *)pcb_strdup(""); }
+#line 1802 "query_y.c" /* yacc.c:1646  */
+    break;
+
+  case 58:
+#line 292 "query_y.y" /* yacc.c:1646  */
+    {
+			int l1 = strlen((yyvsp[0].n)->data.str), l2 = strlen((yyvsp[-1].s));
+			
+			(yyvsp[0].n)->data.str = (const char *)realloc((void *)(yyvsp[0].n)->data.str, l1+l2+2);
+			memcpy((char *)(yyvsp[0].n)->data.str+l1, (yyvsp[-1].s), l2+1);
+			free((yyvsp[-1].s));
+		}
+#line 1814 "query_y.c" /* yacc.c:1646  */
+    break;
+
+
+#line 1818 "query_y.c" /* yacc.c:1646  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (prg_out, YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (prg_out, yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, prg_out);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, prg_out);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (prg_out, YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval, prg_out);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, prg_out);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}
Index: tags/2.0.1/src_plugins/query/query_y.h
===================================================================
--- tags/2.0.1/src_plugins/query/query_y.h	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_y.h	(revision 18980)
@@ -0,0 +1,96 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
+   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 <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_QRY_QUERY_Y_H_INCLUDED
+# define YY_QRY_QUERY_Y_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int qry_debug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    T_LET = 258,
+    T_ASSERT = 259,
+    T_RULE = 260,
+    T_LIST = 261,
+    T_INVALID = 262,
+    T_FLD_P = 263,
+    T_FLD_A = 264,
+    T_FLD_FLAG = 265,
+    T_OR = 266,
+    T_AND = 267,
+    T_EQ = 268,
+    T_NEQ = 269,
+    T_GTEQ = 270,
+    T_LTEQ = 271,
+    T_NL = 272,
+    T_UNIT = 273,
+    T_STR = 274,
+    T_QSTR = 275,
+    T_INT = 276,
+    T_DBL = 277,
+    T_CONST = 278
+  };
+#endif
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
+{
+#line 118 "query_y.y" /* yacc.c:1909  */
+
+	char *s;
+	pcb_coord_t c;
+	double d;
+	const pcb_unit_t *u;
+	pcb_qry_node_t *n;
+
+#line 86 "query_y.h" /* yacc.c:1909  */
+};
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE qry_lval;
+
+int qry_parse (pcb_qry_node_t **prg_out);
+
+#endif /* !YY_QRY_QUERY_Y_H_INCLUDED  */
Index: tags/2.0.1/src_plugins/query/query_y.y
===================================================================
--- tags/2.0.1/src_plugins/query/query_y.y	(nonexistent)
+++ tags/2.0.1/src_plugins/query/query_y.y	(revision 18980)
@@ -0,0 +1,299 @@
+%{
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2016 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Query language - compiler: grammar */
+
+#include <assert.h>
+#include "unit.h"
+#include "query.h"
+#include "query_l.h"
+#include "compat_misc.h"
+#include "flag_str.h"
+#include "fields_sphash.h"
+
+#define UNIT_CONV(dst, negative, val, unit) \
+do { \
+	dst = val; \
+	if (negative) \
+		dst = -dst; \
+	if (unit != NULL) { \
+		if (unit->family == PCB_UNIT_IMPERIAL) \
+			dst = PCB_MIL_TO_COORD(dst); \
+		else if (unit->family == PCB_UNIT_METRIC) \
+			dst = PCB_MM_TO_COORD(dst); \
+		dst /= unit->scale_factor; \
+	} \
+} while(0)
+
+#define BINOP(dst, op1, operator, op2) \
+do { \
+	assert(op2->next == NULL); \
+	assert(op2->next == NULL); \
+	dst = pcb_qry_n_alloc(operator); \
+	pcb_qry_n_insert(dst, op2); \
+	pcb_qry_n_insert(dst, op1); \
+} while(0)
+
+#define UNOP(dst, operator, op) \
+do { \
+	assert(op->next == NULL); \
+	dst = pcb_qry_n_alloc(operator); \
+	pcb_qry_n_insert(dst, op); \
+} while(0)
+
+static pcb_query_iter_t *iter_ctx;
+
+static char *attrib_prepend_free(char *orig, char *prep, char sep)
+{
+	int l1 = strlen(orig), l2 = strlen(prep);
+	char *res = malloc(l1+l2+2);
+	memcpy(res, prep, l2);
+	res[l2] = sep;
+	memcpy(res+l2+1, orig, l1+1);
+	free(orig);
+	free(prep);
+	return res;
+}
+
+static pcb_qry_node_t *make_regex_free(char *str)
+{
+	pcb_qry_node_t *res = pcb_qry_n_alloc(PCBQ_DATA_REGEX);
+	res->data.str = str;
+	res->precomp.regex = re_se_comp(str);
+	if (res->precomp.regex == NULL)
+		yyerror(NULL, "Invalid regex\n");
+	return res;
+}
+
+
+static pcb_qry_node_t *make_flag_free(char *str)
+{
+	const pcb_flag_bits_t *i = pcb_strflg_name(str, 0x7FFFFFFF);
+	pcb_qry_node_t *nd;
+
+	if (i == NULL) {
+		yyerror(NULL, "Unknown flag");
+		free(str);
+		return NULL;
+	}
+
+	nd = pcb_qry_n_alloc(PCBQ_FLAG);
+	nd->precomp.flg = i;
+	free(str);
+	return nd;
+}
+
+
+%}
+
+%name-prefix "qry_"
+%error-verbose
+%parse-param {pcb_qry_node_t **prg_out}
+
+%union {
+	char *s;
+	pcb_coord_t c;
+	double d;
+	const pcb_unit_t *u;
+	pcb_qry_node_t *n;
+}
+
+%token     T_LET T_ASSERT T_RULE T_LIST T_INVALID T_FLD_P T_FLD_A T_FLD_FLAG
+%token     T_OR T_AND T_EQ T_NEQ T_GTEQ T_LTEQ
+%token     T_NL
+%token <u> T_UNIT
+%token <s> T_STR T_QSTR
+%token <c> T_INT
+%token <d> T_DBL
+%token <n> T_CONST
+
+/* the usual binary operators */
+%left T_OR
+%left T_AND
+%left T_EQ T_NEQ
+%left '<' '>' T_GTEQ T_LTEQ
+%left '+' '-'
+%left '*' '/'
+%left '.'
+
+/* Unary operators */
+%right '!'
+
+%left '('
+
+%type <n> number fields attribs var fname fcall fargs words string_literal
+%type <n> expr exprs program_expr program_rules rule flg
+%type <u> maybe_unit
+
+%%
+
+program:
+	  program_rules    { *prg_out = $1; }
+	| program_expr     { *prg_out = $1; }
+	;
+
+/* The program is a single expression - useful for search */
+program_expr:
+	{ iter_ctx = pcb_qry_iter_alloc(); }
+	expr               {
+		$$ = pcb_qry_n_alloc(PCBQ_EXPR_PROG);
+		$$->data.children = pcb_qry_n_alloc(PCBQ_ITER_CTX);
+		$$->data.children->parent = $$;
+		$$->data.children->data.iter_ctx = iter_ctx;
+		$$->data.children->next = $2;
+		$2->parent = $$;
+	}
+	;
+
+/* The program is a collection of rules - useful for the DRC */
+program_rules:
+	  /* empty */            { $$ = NULL; }
+	| rule program_rules     { $$ = $1; $1->next = $2; }
+	;
+
+rule:
+	T_RULE words T_NL exprs  {
+		$$ = pcb_qry_n_alloc(PCBQ_RULE);
+		$$->data.children = $2;
+		$2->parent = $$;
+		$$->data.children->next = pcb_qry_n_alloc(PCBQ_ITER_CTX);
+		$$->data.children->next->data.iter_ctx = iter_ctx;
+		$$->data.children->next->next = $4;
+		$4->parent = $$;
+		}
+	;
+
+exprs:
+	  /* empty */            { $$ = NULL; }
+	| exprs expr T_NL        { $$ = $1; $1->next = $2; }
+	;
+
+expr:
+	  fcall                  { $$ = $1; }
+	| number                 { $$ = $1; }
+	| string_literal         { $$ = $1; }
+	| T_INVALID              { $$ = pcb_qry_n_alloc(PCBQ_DATA_INVALID); }
+	| '!' expr               { UNOP($$, PCBQ_OP_NOT, $2); }
+	| '(' expr ')'           { $$ = $2; }
+	| expr T_AND expr        { BINOP($$, $1, PCBQ_OP_AND, $3); }
+	| expr T_OR expr         { BINOP($$, $1, PCBQ_OP_OR, $3); }
+	| expr T_EQ expr         { BINOP($$, $1, PCBQ_OP_EQ, $3); }
+	| expr T_NEQ expr        { BINOP($$, $1, PCBQ_OP_NEQ, $3); }
+	| expr T_GTEQ expr       { BINOP($$, $1, PCBQ_OP_GTEQ, $3); }
+	| expr T_LTEQ expr       { BINOP($$, $1, PCBQ_OP_LTEQ, $3); }
+	| expr '>' expr          { BINOP($$, $1, PCBQ_OP_GT, $3); }
+	| expr '<' expr          { BINOP($$, $1, PCBQ_OP_LT, $3); }
+	| expr '+' expr          { BINOP($$, $1, PCBQ_OP_ADD, $3); }
+	| expr '-' expr          { BINOP($$, $1, PCBQ_OP_SUB, $3); }
+	| expr '*' expr          { BINOP($$, $1, PCBQ_OP_MUL, $3); }
+	| expr '/' expr          { BINOP($$, $1, PCBQ_OP_DIV, $3); }
+	| expr '~' T_STR         { BINOP($$, $1, PCBQ_OP_MATCH, make_regex_free($3)); }
+	| expr '~' T_QSTR        { BINOP($$, $1, PCBQ_OP_MATCH, make_regex_free($3)); }
+	| T_CONST                { $$ = $1; }
+	| var                    { $$ = $1; }
+	| var '.' fields         {
+		pcb_qry_node_t *n;
+		$$ = pcb_qry_n_alloc(PCBQ_FIELD_OF);
+		$$->data.children = $1;
+		$1->next = $3;
+		$1->parent = $$;
+		for(n = $3; n != NULL; n = n->next)
+			n->parent = $$;
+		}
+	;
+
+number:
+	  T_INT maybe_unit       { $$ = pcb_qry_n_alloc(PCBQ_DATA_COORD);  UNIT_CONV($$->data.crd, 0, $1, $2); }
+	| T_DBL maybe_unit       { $$ = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV($$->data.dbl, 0, $1, $2); }
+	| '-' T_INT maybe_unit   { $$ = pcb_qry_n_alloc(PCBQ_DATA_COORD);  UNIT_CONV($$->data.crd, 1, $2, $3); }
+	| '-' T_DBL maybe_unit   { $$ = pcb_qry_n_alloc(PCBQ_DATA_DOUBLE); UNIT_CONV($$->data.dbl, 1, $2, $3); }
+	;
+
+string_literal:
+	T_QSTR                   { $$ = pcb_qry_n_alloc(PCBQ_DATA_STRING);  $$->data.str = $1; }
+	;
+
+maybe_unit:
+	  /* empty */            { $$ = NULL; }
+	| T_UNIT                 { $$ = $1; }
+	;
+
+fields:
+	  T_STR                  { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = $1; $$->precomp.fld = query_fields_sphash($1); }
+	| T_STR '.' fields       { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = $1; $$->precomp.fld = query_fields_sphash($1); $$->next = $3; }
+	| T_FLD_P fields         { $$ = $2; /* just ignore .p. */ }
+	| T_FLD_P T_FLD_FLAG T_STR { $$ = make_flag_free($3); }
+	| T_FLD_A attribs        { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = pcb_strdup("a"); $$->precomp.fld = query_fields_sphash("a"); $$->next = $2; }
+	;
+
+attribs:
+	  T_STR                  { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = $1; }
+	| T_STR '.' attribs      { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = attrib_prepend_free($3->data.str, $1, '.'); }
+	| T_QSTR                 { $$ = pcb_qry_n_alloc(PCBQ_FIELD); $$->data.str = $1; }
+	;
+
+var:
+	  T_STR                  { $$ = pcb_qry_n_alloc(PCBQ_VAR); $$->data.crd = pcb_qry_iter_var(iter_ctx, $1, 1); free($1); }
+	| T_LIST '(' '@' ')'     { $$ = pcb_qry_n_alloc(PCBQ_LISTVAR); $$->data.str = pcb_strdup("@"); }
+	| '@'                    { $$ = pcb_qry_n_alloc(PCBQ_VAR); $$->data.crd = pcb_qry_iter_var(iter_ctx, "@", 1); }
+	;
+
+fcall:
+	  fname '(' fargs ')'    { $$ = pcb_qry_n_alloc(PCBQ_FCALL); $$->data.children = $1; $$->data.children->next = $3; $1->parent = $3->parent = $$; }
+	| fname '(' ')'          { $$ = pcb_qry_n_alloc(PCBQ_FCALL); $$->data.children = $1; $1->parent = $$; }
+	;
+
+fname:
+	T_STR   {
+		$$ = pcb_qry_n_alloc(PCBQ_FNAME);
+		$$->data.fnc = pcb_qry_fnc_lookup($1);
+		if ($$->data.fnc == NULL) {
+			yyerror("Unknown function");
+			free($1);
+			return -1;
+		}
+		free($1);
+	}
+	;
+
+
+fargs:
+	  expr                   { $$ = $1; }
+	| expr ',' fargs         { $$ = $1; $$->next = $3; }
+	;
+
+words:
+	  /* empty */            { $$ = pcb_qry_n_alloc(PCBQ_RNAME); $$->data.str = (const char *)pcb_strdup(""); }
+	| T_STR words            {
+			int l1 = strlen($2->data.str), l2 = strlen($1);
+			
+			$2->data.str = (const char *)realloc((void *)$2->data.str, l1+l2+2);
+			memcpy((char *)$2->data.str+l1, $1, l2+1);
+			free($1);
+		}
+	;
Index: tags/2.0.1/src_plugins/renumber/Makefile
===================================================================
--- tags/2.0.1/src_plugins/renumber/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/renumber/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_renumber
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/renumber/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/renumber/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/renumber/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {renumber}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/renumber/renumber.o $(PLUGDIR)/renumber/renumberblock.o @]
+
+switch /local/pcb/renumber/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/renumber/renumber.c
===================================================================
--- tags/2.0.1/src_plugins/renumber/renumber.c	(nonexistent)
+++ tags/2.0.1/src_plugins/renumber/renumber.c	(revision 18980)
@@ -0,0 +1,400 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ *
+ *  Old contact info:
+ *  Harry Eaton, 6697 Buttonhole Ct, Columbia, MD 21044, USA
+ *  haceaton@aplcomm.jhuapl.edu
+ *
+ */
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "change.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "netlist.h"
+#include "safe_fs.h"
+#include "macro.h"
+
+#include "pcb-printf.h"
+
+/* --------------------------------------------------------------------------- */
+
+static const char pcb_acts_Renumber[] = "Renumber()\n" "Renumber(filename)";
+
+static const char pcb_acth_Renumber[] =
+	"Renumber all subcircuits.  The changes will be recorded to filename\n"
+	"for use in backannotating these changes to the schematic.";
+
+/* %start-doc actions Renumber
+
+%end-doc */
+
+#define WTF 0
+
+static const char *or_empty(const char *s)
+{
+	if (s == NULL) return "";
+	return s;
+}
+
+static fgw_error_t pcb_act_Renumber(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_bool changed = pcb_false;
+	pcb_subc_t **subc_list;
+	pcb_subc_t **locked_subc_list;
+	pcb_coord_t *ox_list, *oy_list;
+	unsigned int i, j, k, cnt, lock_cnt;
+	unsigned int tmpi;
+	size_t sz;
+	char *tmps;
+	const char *name = NULL;
+	FILE *out;
+	static char *default_file = NULL;
+	size_t cnt_list_sz = 100;
+	struct _cnt_list {
+		char *name;
+		unsigned int cnt;
+	} *cnt_list;
+	char **was, **is, *pin;
+	unsigned int c_cnt = 0, numsubc;
+	int ok;
+	pcb_bool free_name = pcb_false;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str);
+
+	if (name == NULL) {
+		/*
+		 * We deal with the case where name already exists in this
+		 * function so the GUI doesn't need to deal with it
+		 */
+		name = pcb_gui->fileselect(_("Save Renumber Annotation File As ..."),
+													 _("Choose a file to record the renumbering to.\n"
+														 "This file may be used to back annotate the\n"
+														 "change to the schematics.\n"), default_file, ".eco", "eco", 0);
+
+		free_name = pcb_true;
+	}
+
+	if (default_file) {
+		free(default_file);
+		default_file = NULL;
+	}
+
+	if (name && *name) {
+		default_file = pcb_strdup(name);
+	}
+
+	if ((out = pcb_fopen(name, "r"))) {
+		fclose(out);
+		if (!pcb_gui->confirm_dialog(_("File exists!  Ok to overwrite?"), 0)) {
+			if (free_name && name)
+				free((char*)name);
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+	}
+
+	if ((out = pcb_fopen(name, "w")) == NULL) {
+		pcb_message(PCB_MSG_ERROR, _("Could not open %s\n"), name);
+		if (free_name && name)
+			free((char*)name);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if (free_name && name)
+		free((char*)name);
+
+	fprintf(out, "*COMMENT* PCB Annotation File\n");
+	fprintf(out, "*FILEVERSION* 20061031\n");
+
+	/*
+	 * Make a first pass through all of the subcircuits and sort them out
+	 * by location on the board.  While here we also collect a list of
+	 * locked subcircuits.
+	 *
+	 * We'll actually renumber things in the 2nd pass.
+	 */
+	numsubc = pcb_subclist_length(&PCB->Data->subc);
+	subc_list = calloc(numsubc, sizeof(pcb_subc_t *));
+	ox_list = calloc(numsubc, sizeof(pcb_coord_t));
+	oy_list = calloc(numsubc, sizeof(pcb_coord_t));
+	locked_subc_list =  calloc(numsubc, sizeof(pcb_subc_t *));
+	was = calloc(numsubc, sizeof(char *));
+	is = calloc(numsubc, sizeof(char *));
+	if (subc_list == NULL || locked_subc_list == NULL || was == NULL || is == NULL || ox_list == NULL || oy_list == NULL) {
+		fprintf(stderr, "calloc() failed in pcb_act_Renumber\n");
+		exit(1);
+	}
+
+
+	cnt = 0;
+	lock_cnt = 0;
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		pcb_coord_t ox, oy;
+		
+		if (pcb_subc_get_origin(subc, &ox, &oy) != 0) {
+			ox = (subc->BoundingBox.X1 + subc->BoundingBox.X2)/2;
+			oy = (subc->BoundingBox.Y1 + subc->BoundingBox.Y2)/2;
+		}
+
+		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)) {
+			/* add to the list of locked subcircuits which we won't try to renumber and whose reference designators are now reserved. */
+			pcb_fprintf(out,
+				"*WARN* subc \"%s\" at %$md is locked and will not be renumbered.\n",
+				PCB_UNKNOWN(subc->refdes), ox, oy);
+			locked_subc_list[lock_cnt] = subc;
+			lock_cnt++;
+		}
+		else {
+			/* count of devices which will be renumbered */
+			cnt++;
+
+			/* search for correct position in the list */
+			i = 0;
+			while (subc_list[i] && oy > oy_list[i])
+				i++;
+
+			/* We have found the position where we have the first subcircuits that
+			 * has the same Y value or a lower Y value.  Now move forward if
+			 * needed through the X values */
+			while (subc_list[i] && oy == oy_list[i] && ox > ox_list[i])
+				i++;
+
+			for (j = cnt - 1; j > i; j--) {
+				subc_list[j] = subc_list[j - 1];
+				ox_list[j] = ox_list[j - 1];
+				oy_list[j] = oy_list[j - 1];
+			}
+			subc_list[i] = subc;
+			ox_list[j] = ox;
+			oy_list[j] = oy;
+		}
+	}
+	PCB_END_LOOP;
+
+
+	/*
+	 * Now that the subcircuits are sorted by board position, we go through
+	 * and renumber them.
+	 */
+
+	cnt_list = (struct _cnt_list *) calloc(cnt_list_sz, sizeof(struct _cnt_list));
+	for (i = 0; i < cnt; i++) {
+		if (subc_list[i]->refdes) {
+			/* figure out the prefix */
+			tmps = pcb_strdup(or_empty(subc_list[i]->refdes));
+			j = 0;
+			while (tmps[j] && (tmps[j] < '0' || tmps[j] > '9')
+						 && tmps[j] != '?')
+				j++;
+			tmps[j] = '\0';
+
+			/* check the counter for this prefix */
+			for (j = 0; cnt_list[j].name && (strcmp(cnt_list[j].name, tmps) != 0)
+					 && j < cnt_list_sz; j++);
+
+			/* grow the list if needed */
+			if (j == cnt_list_sz) {
+				cnt_list_sz += 100;
+				cnt_list = (struct _cnt_list *) realloc(cnt_list, cnt_list_sz);
+				if (cnt_list == NULL) {
+					fprintf(stderr, "realloc() failed in pcb_act_Renumber\n");
+					exit(1);
+				}
+				/* zero out the memory that we added */
+				for (tmpi = j; tmpi < cnt_list_sz; tmpi++) {
+					cnt_list[tmpi].name = NULL;
+					cnt_list[tmpi].cnt = 0;
+				}
+			}
+
+			/* start a new counter if we don't have a counter for this prefix */
+			if (!cnt_list[j].name) {
+				cnt_list[j].name = pcb_strdup(tmps);
+				cnt_list[j].cnt = 0;
+			}
+
+			/* check to see if the new refdes is already used by a locked subcircuit */
+			do {
+				ok = 1;
+				cnt_list[j].cnt++;
+				free(tmps);
+
+				/* space for the prefix plus 1 digit plus the '\0' */
+				sz = strlen(cnt_list[j].name) + 2;
+
+				/* and 1 more per extra digit needed to hold the number */
+				tmpi = cnt_list[j].cnt;
+				while (tmpi > 10) {
+					sz++;
+					tmpi = tmpi / 10;
+				}
+				tmps = (char *) malloc(sz * sizeof(char));
+				sprintf(tmps, "%s%d", cnt_list[j].name, cnt_list[j].cnt);
+
+				/*
+				 * now compare to the list of reserved (by locked
+				 * subcircuits) names
+				 */
+				for (k = 0; k < lock_cnt; k++) {
+					if (strcmp(PCB_UNKNOWN(locked_subc_list[k]->refdes), tmps) == 0) {
+						ok = 0;
+						break;
+					}
+				}
+
+			}
+			while (!ok);
+
+			if (strcmp(tmps, or_empty(subc_list[i]->refdes)) != 0) {
+				fprintf(out, "*RENAME* \"%s\" \"%s\"\n", or_empty(subc_list[i]->refdes), tmps);
+
+				/* add this rename to our table of renames so we can update the netlist */
+				was[c_cnt] = pcb_strdup(or_empty(subc_list[i]->refdes));
+				is[c_cnt] = pcb_strdup(tmps);
+				c_cnt++;
+
+				pcb_undo_add_obj_to_change_name(PCB_OBJ_SUBC, NULL, NULL, subc_list[i], or_empty(subc_list[i]->refdes));
+
+				pcb_chg_obj_name(PCB_OBJ_SUBC, subc_list[i], NULL, NULL, tmps);
+				changed = pcb_true;
+
+				/* we don't free tmps in this case because it is used */
+			}
+			else
+				free(tmps);
+		}
+		else {
+			/* If there is no refdes, maybe just spit out a warning */
+			pcb_fprintf(out, "*WARN* Subcircuit at %$md has no name.\n", ox_list[i], oy_list[i]);
+		}
+	}
+
+	fclose(out);
+
+	/* restore the unique flag setting */
+	conf_update(NULL, -1);
+
+	if (changed) {
+
+		/* update the netlist */
+		pcb_undo_add_netlist_lib(PCB->NetlistLib);
+
+		/* iterate over each net */
+		for (i = 0; i < PCB->NetlistLib[WTF].MenuN; i++) {
+
+			/* iterate over each pin on the net */
+			for (j = 0; j < PCB->NetlistLib[WTF].Menu[i].EntryN; j++) {
+
+				/* figure out the pin number part from strings like U3-21 */
+				tmps = pcb_strdup(PCB->NetlistLib[WTF].Menu[i].Entry[j].ListEntry);
+				for (k = 0; tmps[k] && tmps[k] != '-'; k++);
+				tmps[k] = '\0';
+				pin = tmps + k + 1;
+
+				/* iterate over the list of changed reference designators */
+				for (k = 0; k < c_cnt; k++) {
+					/*
+					 * if the pin needs to change, change it and quit
+					 * searching in the list.
+					 */
+					if (strcmp(tmps, was[k]) == 0) {
+						char *buffer;
+						free((char*)PCB->NetlistLib[WTF].Menu[i].Entry[j].ListEntry);
+						buffer = (char *) malloc((strlen(is[k]) + 1 + strlen(pin) + 1) * sizeof(char));
+						sprintf(buffer, "%s-%s", is[k], pin);
+						PCB->NetlistLib[WTF].Menu[i].Entry[j].ListEntry = buffer;
+						k = c_cnt;
+					}
+
+				}
+				free(tmps);
+			}
+		}
+		for (k = 0; k < c_cnt; k++) {
+			free(was[k]);
+			free(is[k]);
+		}
+
+		pcb_netlist_changed(0);
+		pcb_undo_inc_serial();
+		pcb_board_set_changed_flag(pcb_true);
+	}
+
+	free(locked_subc_list);
+	free(subc_list);
+	free(ox_list);
+	free(oy_list);
+	free(cnt_list);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+extern const char pcb_acts_RenumberBlock[];
+extern const char pcb_acth_RenumberBlock[];
+fgw_error_t pcb_act_RenumberBlock(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+extern const char pcb_acts_RenumberBuffer[];
+extern const char pcb_acth_RenumberBuffer[];
+fgw_error_t pcb_act_RenumberBuffer(fgw_arg_t *ores, int oargc, fgw_arg_t *oargv);
+
+
+static const char *renumber_cookie = "renumber plugin";
+
+pcb_action_t renumber_action_list[] = {
+	{"Renumber", pcb_act_Renumber, pcb_acth_Renumber, pcb_acts_Renumber},
+	{"RenumberBlock", pcb_act_RenumberBlock, pcb_acth_RenumberBlock, pcb_acts_RenumberBlock},
+	{"RenumberBuffer", pcb_act_RenumberBuffer, pcb_acth_RenumberBuffer, pcb_acts_RenumberBuffer}
+};
+
+int pplg_check_ver_renumber(int ver_needed) { return 0; }
+
+void pplg_uninit_renumber(void)
+{
+	pcb_remove_actions_by_cookie(renumber_cookie);
+}
+
+PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie)
+
+#include "dolists.h"
+int pplg_init_renumber(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/renumber/renumber.pup
===================================================================
--- tags/2.0.1/src_plugins/renumber/renumber.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/renumber/renumber.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short renumber action
+$long Renumber subcircuits (renaming them) and generate a text file for back annotation.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/renumber/renumberblock.c
===================================================================
--- tags/2.0.1/src_plugins/renumber/renumberblock.c	(nonexistent)
+++ tags/2.0.1/src_plugins/renumber/renumberblock.c	(revision 18980)
@@ -0,0 +1,122 @@
+/*
+ * RenumberBlock plug-in for PCB.
+ *
+ * Copyright (C) 2006 DJ Delorie <dj@delorie.com>
+ * Copyright (C) 2018 Tibor 'Igor2' Palinkas for pcb-rnd data model
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Original source: http://www.delorie.com/pcb/renumberblock.c
+ *
+ * Usage: RenumberBlock(oldnum,newnum)
+ *
+ * All selected elements are renumbered by adding (newnum-oldnum) to
+ * the existing number.  I.e. RenumberBlock(100,200) will change R213
+ * to R313.
+ *
+ * Usage: RenumberBuffer(oldnum,newnum)
+ *
+ * Same, but the paste buffer is renumbered.
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "board.h"
+#include "actions.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "error.h"
+#include "change.h"
+#include "conf_core.h"
+
+const char pcb_acts_RenumberBlock[] = "RenumberBlock(old_base,new_base)\n";
+const char pcb_acth_RenumberBlock[] = "TODO";
+
+fgw_error_t pcb_act_RenumberBlock(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char num_buf[15];
+	int old_base, new_base;
+
+	PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int);
+	PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int);
+
+	conf_set_editor(name_on_pcb, 1);
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		char *new_ref;
+		const char *old_ref, *cp, *refdes_split;
+		int num;
+
+		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc) || (subc->refdes == NULL))
+			continue;
+
+		old_ref = subc->refdes;
+		for (refdes_split = cp = old_ref; *cp; cp++)
+			if (!isdigit(*cp))
+				refdes_split = cp + 1;
+
+		num = atoi(refdes_split);
+		num += (new_base - old_base);
+		sprintf(num_buf, "%d", num);
+		new_ref = (char *) malloc(refdes_split - old_ref + strlen(num_buf) + 1);
+		memcpy(new_ref, old_ref, refdes_split - old_ref);
+		strcpy(new_ref + (refdes_split - old_ref), num_buf);
+
+		pcb_undo_add_obj_to_change_name(PCB_OBJ_SUBC, NULL, NULL, subc, subc->refdes);
+
+		pcb_chg_obj_name(PCB_OBJ_SUBC, subc, subc, subc, new_ref);
+	}
+	PCB_END_LOOP;
+	pcb_undo_inc_serial();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+const char pcb_acts_RenumberBuffer[] = "RenumberBlock(old_base,new_base)\n";
+const char pcb_acth_RenumberBuffer[] = "TODO";
+
+fgw_error_t pcb_act_RenumberBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	char num_buf[15];
+	int old_base, new_base;
+
+	PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int);
+	PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int);
+
+	conf_set_editor(name_on_pcb, 1);
+
+	PCB_SUBC_LOOP(PCB_PASTEBUFFER->Data);
+	{
+		const char *refdes_split, *cp, *old_ref;
+		char *new_ref;
+		int num;
+
+		if (subc->refdes == NULL)
+			continue;
+
+		old_ref = subc->refdes;
+		for (refdes_split = cp = old_ref; *cp; cp++)
+			if (!isdigit(*cp))
+				refdes_split = cp + 1;
+
+		num = atoi(refdes_split);
+		num += (new_base - old_base);
+		sprintf(num_buf, "%d", num);
+		new_ref = (char *) malloc(refdes_split - old_ref + strlen(num_buf) + 1);
+		memcpy(new_ref, old_ref, refdes_split - old_ref);
+		strcpy(new_ref + (refdes_split - old_ref), num_buf);
+
+		pcb_chg_obj_name(PCB_OBJ_SUBC, subc, subc, subc, new_ref);
+	}
+	PCB_END_LOOP;
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/report/Makefile
===================================================================
--- tags/2.0.1/src_plugins/report/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/report/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_report
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/report/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/report/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/report/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {report}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/report/report.o
+	$(PLUGDIR)/report/drill.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/report/report_conf.h}
+
+switch /local/pcb/report/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/report/drill.c
===================================================================
--- tags/2.0.1/src_plugins/report/drill.c	(nonexistent)
+++ tags/2.0.1/src_plugins/report/drill.c	(revision 18980)
@@ -0,0 +1,240 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  This module, drill.c, was written and is Copyright (C) 1997 harry eaton
+ *  and upgraded by Tibor 'Igor2' Palinkas for padstacks in 2017
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#include "config.h"
+
+#include "data.h"
+#include "drill.h"
+#include "macro.h"
+#include "obj_pstk_inlines.h"
+
+#define STEP_ELEMENT 50
+#define STEP_DRILL   30
+#define STEP_POINT   100
+
+static void drill_fill(pcb_drill_t * Drill, pcb_any_obj_t *hole, int unplated)
+{
+	pcb_cardinal_t n;
+	pcb_any_obj_t **pnew;
+	pcb_any_obj_t **hnew;
+
+	hnew = drill_pin_alloc(Drill);
+	*hnew = hole;
+	if (hole->parent_type == PCB_PARENT_SUBC) {
+		Drill->PinCount++;
+		for (n = Drill->ElementN - 1; n != -1; n--)
+			if (Drill->parent[n] == hole->parent.any)
+				break;
+		if (n == -1) {
+			pnew = drill_element_alloc(Drill);
+			*pnew = hole->parent.any;
+		}
+	}
+	else
+		Drill->ViaCount++;
+	if (unplated)
+		Drill->UnplatedCount++;
+}
+
+static int drill_qsort_cmp(const void *va, const void *vb)
+{
+	pcb_drill_t *a = (pcb_drill_t *) va;
+	pcb_drill_t *b = (pcb_drill_t *) vb;
+	return a->DrillSize - b->DrillSize;
+}
+
+pcb_drill_info_t *drill_get_info(pcb_data_t *top)
+{
+	pcb_drill_info_t *AllDrills;
+	pcb_drill_t *Drill = NULL;
+	pcb_bool DrillFound = pcb_false;
+	pcb_rtree_it_t it;
+	pcb_box_t *pb;
+
+	AllDrills = (pcb_drill_info_t *)calloc(1, sizeof(pcb_drill_info_t));
+
+	for(pb = pcb_r_first(top->padstack_tree, &it); pb != NULL; pb = pcb_r_next(&it)) {
+		pcb_pstk_t *ps = (pcb_pstk_t *)pb;
+		pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
+		if (proto->hdia <= 0)
+			continue;
+		if (!DrillFound) {
+			DrillFound = pcb_true;
+			Drill = drill_info_alloc(AllDrills);
+			Drill->DrillSize = proto->hdia;
+			drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+		}
+		else {
+			if (Drill->DrillSize != proto->hdia) {
+				DRILL_LOOP(AllDrills);
+				{
+					if (drill->DrillSize == proto->hdia) {
+						Drill = drill;
+						drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+						break;
+					}
+				}
+				PCB_END_LOOP;
+				if (Drill->DrillSize != proto->hdia) {
+					Drill = drill_info_alloc(AllDrills);
+					Drill->DrillSize = proto->hdia;
+					drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+				}
+			}
+			else
+				drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+		}
+	}
+	pcb_r_end(&it);
+
+	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(pcb_drill_t), drill_qsort_cmp);
+	return AllDrills;
+}
+
+#define ROUND(x,n) ((int)(((x)+(n)/2)/(n))*(n))
+
+void drill_round_info(pcb_drill_info_t *d, int roundto)
+{
+	unsigned int i = 0;
+
+	while ((d->DrillN > 0) && (i < d->DrillN - 1)) {
+		int diam1 = ROUND(d->Drill[i].DrillSize, roundto);
+		int diam2 = ROUND(d->Drill[i + 1].DrillSize, roundto);
+
+		if (diam1 == diam2) {
+			int ei, ej;
+
+			d->Drill[i].ElementMax = d->Drill[i].ElementN + d->Drill[i + 1].ElementN;
+			if (d->Drill[i].ElementMax) {
+				d->Drill[i].parent = realloc(d->Drill[i].parent, d->Drill[i].ElementMax * sizeof(pcb_any_obj_t *));
+
+				for (ei = 0; ei < d->Drill[i + 1].ElementN; ei++) {
+					for (ej = 0; ej < d->Drill[i].ElementN; ej++)
+						if (d->Drill[i].parent[ej] == d->Drill[i + 1].parent[ei])
+							break;
+					if (ej == d->Drill[i].ElementN)
+						d->Drill[i].parent[d->Drill[i].ElementN++]
+							= d->Drill[i + 1].parent[ei];
+				}
+			}
+			free(d->Drill[i + 1].parent);
+			d->Drill[i + 1].parent = NULL;
+
+			d->Drill[i].PinMax = d->Drill[i].PinN + d->Drill[i + 1].PinN;
+			d->Drill[i].hole = realloc(d->Drill[i].hole, d->Drill[i].PinMax * sizeof(pcb_any_obj_t *));
+			memcpy(d->Drill[i].hole + d->Drill[i].PinN, d->Drill[i + 1].hole, d->Drill[i + 1].PinN * sizeof(pcb_any_obj_t *));
+			d->Drill[i].PinN += d->Drill[i + 1].PinN;
+			free(d->Drill[i + 1].hole);
+			d->Drill[i + 1].hole = NULL;
+
+			d->Drill[i].PinCount += d->Drill[i + 1].PinCount;
+			d->Drill[i].ViaCount += d->Drill[i + 1].ViaCount;
+			d->Drill[i].UnplatedCount += d->Drill[i + 1].UnplatedCount;
+
+			d->Drill[i].DrillSize = diam1;
+
+			memmove(d->Drill + i + 1, d->Drill + i + 2, (d->DrillN - i - 2) * sizeof(pcb_drill_t));
+			d->DrillN--;
+		}
+		else {
+			d->Drill[i].DrillSize = diam1;
+			i++;
+		}
+	}
+}
+
+void drill_info_free(pcb_drill_info_t *Drills)
+{
+	DRILL_LOOP(Drills);
+	{
+		free(drill->parent);
+		free(drill->hole);
+	}
+	PCB_END_LOOP;
+	free(Drills->Drill);
+	free(Drills);
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a Drill, allocates memory if necessary
+ */
+pcb_drill_t *drill_info_alloc(pcb_drill_info_t *DrillInfo)
+{
+	pcb_drill_t *drill = DrillInfo->Drill;
+
+	/* realloc new memory if necessary and clear it */
+	if (DrillInfo->DrillN >= DrillInfo->DrillMax) {
+		DrillInfo->DrillMax += STEP_DRILL;
+		drill = (pcb_drill_t *) realloc(drill, DrillInfo->DrillMax * sizeof(pcb_drill_t));
+		DrillInfo->Drill = drill;
+		memset(drill + DrillInfo->DrillN, 0, STEP_DRILL * sizeof(pcb_drill_t));
+	}
+	return (drill + DrillInfo->DrillN++);
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a DrillPoint, allocates memory if necessary
+ */
+pcb_any_obj_t **drill_pin_alloc(pcb_drill_t *Drill)
+{
+	pcb_any_obj_t **pin;
+
+	pin = Drill->hole;
+
+	/* realloc new memory if necessary and clear it */
+	if (Drill->PinN >= Drill->PinMax) {
+		Drill->PinMax += STEP_POINT;
+		pin = realloc(pin, Drill->PinMax * sizeof(pcb_any_obj_t **));
+		Drill->hole = pin;
+		memset(pin + Drill->PinN, 0, STEP_POINT * sizeof(pcb_any_obj_t **));
+	}
+	return (pin + Drill->PinN++);
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a DrillElement, allocates memory if necessary
+ */
+pcb_any_obj_t **drill_element_alloc(pcb_drill_t *Drill)
+{
+	pcb_any_obj_t **element;
+
+	element = Drill->parent;
+
+	/* realloc new memory if necessary and clear it */
+	if (Drill->ElementN >= Drill->ElementMax) {
+		Drill->ElementMax += STEP_ELEMENT;
+		element = realloc(element, Drill->ElementMax * sizeof(pcb_any_obj_t **));
+		Drill->parent = element;
+		memset(element + Drill->ElementN, 0, STEP_ELEMENT * sizeof(pcb_subc_t **));
+	}
+	return (element + Drill->ElementN++);
+}
+
Index: tags/2.0.1/src_plugins/report/drill.h
===================================================================
--- tags/2.0.1/src_plugins/report/drill.h	(nonexistent)
+++ tags/2.0.1/src_plugins/report/drill.h	(revision 18980)
@@ -0,0 +1,66 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  This module, drill.h, was written and is Copyright (C) 1997 harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+#ifndef PCB_DRILL_H
+#define PCB_DRILL_H
+
+typedef struct {								/* holds drill information */
+	pcb_coord_t DrillSize;							/* this drill's diameter */
+	pcb_cardinal_t ElementN,						/* the number of elements using this drill size */
+	  ElementMax,									/* max number of elements from malloc() */
+	  PinCount,										/* number of pins drilled this size */
+	  ViaCount,										/* number of vias drilled this size */
+	  UnplatedCount,							/* number of these holes that are unplated */
+	  PinN,												/* number of drill coordinates in the list */
+	  PinMax;											/* max number of coordinates from malloc() */
+	pcb_any_obj_t **hole;					/* the objects that had the drill */
+	pcb_any_obj_t **parent;				/* all parents referenced by any hole above */
+} pcb_drill_t;
+
+typedef struct {								/* holds a range of Drill Infos */
+	pcb_cardinal_t DrillN,							/* number of drill sizes */
+	  DrillMax;										/* max number from malloc() */
+	pcb_drill_t *Drill;						/* plated holes */
+} pcb_drill_info_t;
+
+pcb_drill_info_t *drill_get_info(pcb_data_t *);
+void drill_info_free(pcb_drill_info_t *);
+void drill_round_info(pcb_drill_info_t *, int);
+pcb_drill_t *drill_info_alloc(pcb_drill_info_t *);
+pcb_any_obj_t **drill_pin_alloc(pcb_drill_t *);
+pcb_any_obj_t **drill_element_alloc(pcb_drill_t *);
+
+#define DRILL_LOOP(top) do             {                           \
+        pcb_cardinal_t        n;                                   \
+        pcb_drill_t   *drill;                                     \
+        for (n = 0; (top)->DrillN > 0 && n < (top)->DrillN; n++)   \
+        {                                                          \
+                drill = &(top)->Drill[n]
+
+#endif
Index: tags/2.0.1/src_plugins/report/report.c
===================================================================
--- tags/2.0.1/src_plugins/report/report.c	(nonexistent)
+++ tags/2.0.1/src_plugins/report/report.c	(revision 18980)
@@ -0,0 +1,867 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996,1997,1998,1999 Thomas Nau
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This module, report.c, was written and is Copyright (C) 1997 harry eaton
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <math.h>
+
+#include "report.h"
+#include "math_helper.h"
+#include "crosshair.h"
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "drill.h"
+#include "error.h"
+#include "search.h"
+#include "rats.h"
+#include "rtree.h"
+#include "flag_str.h"
+#include "macro.h"
+#include "undo.h"
+#include "find.h"
+#include "draw.h"
+#include "pcb-printf.h"
+#include "plugins.h"
+#include "actions.h"
+#include "misc_util.h"
+#include "report_conf.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "layer.h"
+#include "obj_term.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "obj_subc_parent.h"
+
+#include <genregex/regex_sei.h>
+
+conf_report_t conf_report;
+
+static const char pcb_acts_Report[] = "Report(Object|DrillReport|FoundPins|NetLength|NetLengthTo|AllNetLengths|[,name])";
+static const char pcb_acth_Report[] = "Produce various report.";
+
+#define USER_UNITMASK (conf_core.editor.grid_unit->allow)
+
+static int report_drills(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_drill_info_t *AllDrills;
+	pcb_cardinal_t n;
+	char *stringlist, *thestring;
+	int total_drills = 0;
+
+	AllDrills = drill_get_info(PCB->Data);
+	drill_round_info(AllDrills, 100);
+
+	for (n = 0; n < AllDrills->DrillN; n++) {
+		total_drills += AllDrills->Drill[n].PinCount;
+		total_drills += AllDrills->Drill[n].ViaCount;
+		total_drills += AllDrills->Drill[n].UnplatedCount;
+	}
+
+	stringlist = (char *) malloc(512L + AllDrills->DrillN * 64L);
+
+	/* Use tabs for formatting since can't count on a fixed font anymore.
+	   |  And even that probably isn't going to work in all cases.
+	 */
+	sprintf(stringlist,
+					"There are %d different drill sizes used in this layout, %d holes total\n\n"
+					"Drill Diam. (%s)\t# of Pins\t# of Vias\t# of Elements\t# Unplated\n",
+					AllDrills->DrillN, total_drills, conf_core.editor.grid_unit->suffix);
+	thestring = stringlist;
+	while (*thestring != '\0')
+		thestring++;
+	for (n = 0; n < AllDrills->DrillN; n++) {
+		pcb_sprintf(thestring,
+								"%10m*\t\t\t%d\t\t%d\t\t%d\t\t\t\t%d\n",
+								conf_core.editor.grid_unit->suffix,
+								AllDrills->Drill[n].DrillSize,
+								AllDrills->Drill[n].PinCount, AllDrills->Drill[n].ViaCount,
+								AllDrills->Drill[n].ElementN, AllDrills->Drill[n].UnplatedCount);
+		while (*thestring != '\0')
+			thestring++;
+	}
+	drill_info_free(AllDrills);
+	/* create dialog box */
+	pcb_gui->report_dialog("Drill Report", stringlist);
+
+	free(stringlist);
+	return 0;
+}
+
+
+static const char pcb_acts_reportdialog[] = "ReportObject()";
+
+static const char pcb_acth_reportdialog[] = "Report on the object under the crosshair";
+
+/* %start-doc actions ReportDialog
+
+This is a shortcut for @code{Report(Object)}.
+
+%end-doc */
+
+#define gen_locked(obj) (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj) ? "It is LOCKED.\n" : "")
+#define gen_term(obj) \
+	(((obj)->term != NULL) ? "It is terminal " : ""), \
+	(((obj)->term != NULL) ? (obj)->term : ""), \
+	(((obj)->term != NULL) ? "\n" : "")
+
+static const char *grpname(pcb_layergrp_id_t gid)
+{
+	pcb_layergrp_t *grp = pcb_get_layergrp(PCB, gid);
+	if (grp == NULL)
+		return "<invalid>";
+	if ((grp->name == NULL) || (*grp->name == '\0'))
+		return "<anonymous>";
+	return grp->name;
+}
+
+static fgw_error_t pcb_act_report_dialog(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	void *ptr1, *ptr2, *ptr3;
+	int type = REPORT_TYPES;
+	char *op = NULL, *report = NULL;
+	pcb_subc_t *subc;
+	pcb_coord_t x, y;
+	pcb_hid_get_coords("Click on object to report on", &x, &y, 0);
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, reportdialog, op = argv[1].val.str);
+
+	if (op != NULL) {
+		if (pcb_strncasecmp(op, "Subc", 4) == 0)
+			type = PCB_OBJ_SUBC;
+	}
+	type = pcb_search_screen(x, y, type, &ptr1, &ptr2, &ptr3);
+	if ((type == PCB_OBJ_VOID) && (op == NULL))
+		type = pcb_search_screen(x, y, REPORT_TYPES | PCB_OBJ_LOCKED, &ptr1, &ptr2, &ptr3);
+
+	switch (type) {
+	case PCB_OBJ_PSTK:
+		{
+			pcb_pstk_t *ps;
+			pcb_pstk_proto_t *proto;
+			gds_t tmp;
+
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_r_dump_tree(PCB->Data->padstack_tree, 0);
+				PCB_ACT_IRES(0);
+				return 0;
+			}
+#endif
+			ps = (pcb_pstk_t *)ptr2;
+			proto = pcb_pstk_get_proto(ps);
+			gds_init(&tmp);
+
+			pcb_append_printf(&tmp, "%m+PADSTACK ID# %ld; Flags:%s\n"
+				"(X,Y) = %$mD.\n", USER_UNITMASK, ps->ID, pcb_strflg_f2s(ps->Flags, PCB_OBJ_PSTK, NULL, 0),
+				ps->x, ps->y);
+
+			if ((proto != NULL) && (proto->hdia > 0))
+				pcb_append_printf(&tmp, "%m+Hole diameter: %$mS", USER_UNITMASK, proto->hdia);
+
+			pcb_append_printf(&tmp, "\n%s%s%s", gen_locked(ps), gen_term(ps));
+
+			report = tmp.array;
+			break;
+		}
+
+	case PCB_OBJ_LINE:
+		{
+			pcb_line_t *line;
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_layer_t *layer = (pcb_layer_t *) ptr1;
+				pcb_r_dump_tree(layer->line_tree, 0);
+				PCB_ACT_IRES(0);
+				return 0;
+			}
+#endif
+			line = (pcb_line_t *) ptr2;
+			report = pcb_strdup_printf("%m+LINE ID# %ld;  Flags:%s\n"
+									"FirstPoint(X,Y)  = %$mD, ID = %ld.\n"
+									"SecondPoint(X,Y) = %$mD, ID = %ld.\n"
+									"Width = %$mS.\nClearance = %$mS.\n"
+									"It is on layer %d\n"
+									"and has name \"%s\".\n"
+									"%s"
+									"%s%s", USER_UNITMASK,
+									line->ID, pcb_strflg_f2s(line->Flags, PCB_OBJ_LINE, NULL, 0),
+									line->Point1.X, line->Point1.Y, line->Point1.ID,
+									line->Point2.X, line->Point2.Y, line->Point2.ID,
+									line->Thickness, line->Clearance / 2,
+									pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1),
+									gen_locked(line), gen_term(line));
+			break;
+		}
+	case PCB_OBJ_RAT:
+		{
+			pcb_rat_t *line;
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_r_dump_tree(PCB->Data->rat_tree, 0);
+				PCB_ACT_IRES(0);
+				return 0;
+			}
+#endif
+			line = (pcb_rat_t *) ptr2;
+			report = pcb_strdup_printf("%m+RAT-LINE ID# %ld;  Flags:%s\n"
+									"FirstPoint(X,Y)  = %$mD; ID = %ld; "
+									"connects to layer group #%d (%s).\n"
+									"SecondPoint(X,Y) = %$mD; ID = %ld; "
+									"connects to layer group #%d (%s).\n",
+									USER_UNITMASK, line->ID, pcb_strflg_f2s(line->Flags, PCB_OBJ_LINE, NULL, 0),
+									line->Point1.X, line->Point1.Y, line->Point1.ID, line->group1, grpname(line->group1),
+									line->Point2.X, line->Point2.Y, line->Point2.ID, line->group2, grpname(line->group2));
+			break;
+		}
+	case PCB_OBJ_ARC:
+		{
+			pcb_arc_t *Arc;
+			pcb_box_t box;
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_layer_t *layer = (pcb_layer_t *) ptr1;
+				pcb_r_dump_tree(layer->arc_tree, 0);
+				return 0;
+			}
+#endif
+			Arc = (pcb_arc_t *) ptr2;
+		pcb_arc_get_end(Arc, 0, &box.X1, &box.Y1);
+		pcb_arc_get_end(Arc, 1, &box.X2, &box.Y2);
+
+			report = pcb_strdup_printf("%m+ARC ID# %ld;  Flags:%s\n"
+									"CenterPoint(X,Y) = %$mD.\n"
+									"Width = %$mS.\nClearance = %$mS.\n"
+									"Radius = %$mS, StartAngle = %ma degrees, DeltaAngle = %ma degrees.\n"
+									"Bounding Box is %$mD, %$mD.\n"
+									"That makes the end points at %$mD and %$mD.\n"
+									"It is on layer %d.\n"
+									"%s"
+									"%s%s%s", USER_UNITMASK, Arc->ID, pcb_strflg_f2s(Arc->Flags, PCB_OBJ_ARC, NULL, 0),
+									Arc->X, Arc->Y,
+									Arc->Thickness, Arc->Clearance / 2,
+									Arc->Width, Arc->StartAngle, Arc->Delta,
+									Arc->BoundingBox.X1, Arc->BoundingBox.Y1,
+									Arc->BoundingBox.X2, Arc->BoundingBox.Y2,
+									box.X1, box.Y1,
+									box.X2, box.Y2,
+									pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), gen_locked(Arc), gen_term(Arc));
+			break;
+		}
+	case PCB_OBJ_POLY:
+		{
+			pcb_poly_t *Polygon;
+			const char *aunit;
+			double area, u;
+
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_layer_t *layer = (pcb_layer_t *) ptr1;
+				pcb_r_dump_tree(layer->polygon_tree, 0);
+				PCB_ACT_IRES(0);
+				return 0;
+			}
+#endif
+			Polygon = (pcb_poly_t *) ptr2;
+
+			aunit = conf_core.editor.grid_unit->in_suffix;
+			if (aunit[1] == 'm')
+				u = PCB_MM_TO_COORD(1);
+			else
+				u = PCB_MIL_TO_COORD(1);
+
+			area = pcb_poly_area(Polygon);
+			area = area / u;
+			area = area / u;
+
+			report = pcb_strdup_printf("%m+POLYGON ID# %ld;  Flags:%s\n"
+									"Its bounding box is %$mD %$mD.\n"
+									"It has %d points and could store %d more\n"
+									"  without using more memory.\n"
+									"It has %d holes and resides on layer %d.\n"
+									"Its unclipped area is %f square %s.\n"
+									"%s"
+									"%s%s%s", USER_UNITMASK, Polygon->ID,
+									pcb_strflg_f2s(Polygon->Flags, PCB_OBJ_POLY, NULL, 0),
+									Polygon->BoundingBox.X1, Polygon->BoundingBox.Y1,
+									Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2,
+									Polygon->PointN, Polygon->PointMax - Polygon->PointN,
+									Polygon->HoleIndexN,
+									pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1),
+									area, aunit,
+									gen_locked(Polygon), gen_term(Polygon));
+			break;
+		}
+	case PCB_OBJ_SUBC:
+		{
+			pcb_subc_t *subc;
+#ifndef NDEBUG
+			if (pcb_gui->shift_is_pressed()) {
+				pcb_r_dump_tree(PCB->Data->subc_tree, 0);
+				PCB_ACT_IRES(0);
+				return 0;
+			}
+#endif
+			subc = (pcb_subc_t *)ptr2;
+			report = pcb_strdup_printf("%m+SUBCIRCUIT ID# %ld;  Flags:%s\n"
+									"BoundingBox %$mD %$mD.\n"
+									"Refdes \"%s\".\n"
+									"%s", USER_UNITMASK,
+									subc->ID, pcb_strflg_f2s(subc->Flags, PCB_OBJ_SUBC, NULL, 0),
+									subc->BoundingBox.X1, subc->BoundingBox.Y1,
+									subc->BoundingBox.X2, subc->BoundingBox.Y2,
+									PCB_EMPTY(subc->refdes),
+									gen_locked(subc));
+			break;
+		}
+	case PCB_OBJ_TEXT:
+#ifndef NDEBUG
+		if (pcb_gui->shift_is_pressed()) {
+			pcb_layer_t *layer = (pcb_layer_t *) ptr1;
+			pcb_r_dump_tree(layer->text_tree, 0);
+			PCB_ACT_IRES(0);
+			return 0;
+		}
+#endif
+	case PCB_OBJ_LINE_POINT:
+	case PCB_OBJ_POLY_POINT:
+		{
+			pcb_point_t *point = (pcb_point_t *) ptr2;
+			report = pcb_strdup_printf("%m+POINT ID# %ld.\n"
+									"Located at (X,Y) = %$mD.\n"
+									"It belongs to a %s on layer %d.\n", USER_UNITMASK, point->ID,
+									point->X, point->Y,
+									(type == PCB_OBJ_LINE_POINT) ? "line" : "polygon", pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1));
+			break;
+		}
+	case PCB_OBJ_VOID:
+		report = NULL;
+		break;
+
+	default:
+		report = pcb_strdup_printf("Unknown\n");
+		break;
+	}
+
+	if ((report == NULL) || (*report == '\0')) {
+		pcb_message(PCB_MSG_INFO, _("Nothing found to report on\n"));
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* create dialog box */
+	subc = pcb_obj_parent_subc((pcb_any_obj_t *)ptr2);
+	if (subc != NULL) {
+		int len = strlen(report);
+		report = realloc(report, len + 256);
+		sprintf(report + len, "\nPart of subcircuit #%ld\n", subc->ID);
+	}
+
+	pcb_gui->report_dialog("Report", report);
+	free(report);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static int report_found_pins(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	gds_t list;
+	int col = 0;
+	gdl_iterator_t sit;
+	pcb_subc_t *subc;
+
+	gds_init(&list);
+	gds_append_str(&list, "The following terminals are FOUND:\n");
+
+	subclist_foreach(&PCB->Data->subc, &sit, subc) {
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it))
+			if ((o->term != NULL) && (PCB_FLAG_TEST(PCB_FLAG_FOUND, o)))
+				pcb_append_printf(&list, "%s-%s,%c", subc->refdes, o->term, ((col++ % (conf_report.plugins.report.columns + 1)) == conf_report.plugins.report.columns) ? '\n' : ' ');
+	}
+
+	pcb_gui->report_dialog("Report", list.array);
+	gds_uninit(&list);
+	return 0;
+}
+
+/* Assumes that we start with a blank connection state,
+ * e.g. pcb_reset_conns() has been run.
+ * Does not add its own changes to the undo system
+ */
+static double xy_to_net_length(pcb_coord_t x, pcb_coord_t y, int *found)
+{
+	double length;
+
+	length = 0;
+	*found = 0;
+
+	/* NB: The third argument here, 'false' ensures LookupConnection
+	 *     does not add its changes to the undo system.
+	 */
+	pcb_lookup_conn(x, y, pcb_false, PCB->Grid, PCB_FLAG_FOUND);
+
+	PCB_LINE_ALL_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) {
+			double l;
+			int dx, dy;
+			dx = line->Point1.X - line->Point2.X;
+			dy = line->Point1.Y - line->Point2.Y;
+			l = sqrt((double) dx * dx + (double) dy * dy);
+			length += l;
+			*found = 1;
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	PCB_ARC_ALL_LOOP(PCB->Data);
+	{
+		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, arc)) {
+			double l;
+			/* FIXME: we assume width==height here */
+			l = M_PI * 2 * arc->Width * fabs(arc->Delta) / 360.0;
+			length += l;
+			*found = 1;
+		}
+	}
+	PCB_ENDALL_LOOP;
+
+	return length;
+}
+
+static int report_all_net_lengths(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int ni, found, want_undo;
+
+	/* Reset all connection flags and save an undo-state to get back
+	 * to the state the board was in when we started this function.
+	 *
+	 * After this, we don't add any changes to the undo system, but
+	 * ensure we get back to a point where we can pcb_undo() our changes
+	 * by resetting the connections with pcb_reset_conns() before
+	 * calling pcb_undo() at the end of the procedure.
+	 */
+	want_undo = pcb_reset_conns(pcb_true);
+	if (want_undo)
+		pcb_undo_inc_serial();
+
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		const char *netname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
+		const char *list_entry = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[0].ListEntry;
+		char *ename;
+		char *pname;
+		pcb_any_obj_t *term;
+
+		ename = pcb_strdup(list_entry);
+		pname = strchr(ename, '-');
+		if (!pname) {
+			free(ename);
+			continue;
+		}
+		*pname++ = 0;
+
+		term = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, ename, pname, 0, NULL, NULL);
+		free(ename);
+		if (term != NULL) {
+			char buf[50];
+			const char *units_name;
+			pcb_coord_t length;
+			pcb_coord_t x = 0, y = 0;
+
+			PCB_ACT_CONVARG(1, FGW_STR, Report, units_name = argv[2].val.str);
+
+			pcb_obj_center(term, &x, &y);
+
+			if (argc < 1)
+				units_name = conf_core.editor.grid_unit->suffix;
+
+			length = xy_to_net_length(x, y, &found);
+
+			/* Reset connectors for the next lookup */
+			pcb_reset_conns(pcb_false);
+
+			pcb_snprintf(buf, sizeof(buf), "%$m*", units_name, length);
+			pcb_message(PCB_MSG_INFO, "Net %s length %s\n", netname, buf);
+		}
+	}
+
+	pcb_reset_conns(pcb_false);
+	if (want_undo)
+		pcb_undo(pcb_true);
+	return 0;
+}
+
+/* find any found object with a terminal ID and return the associated netname */
+static const char *net_name_found(pcb_board_t *pcb)
+{
+	PCB_SUBC_LOOP(pcb->Data);
+	{
+		pcb_any_obj_t *o;
+		pcb_data_it_t it;
+
+		if (subc->refdes == NULL)
+			continue;
+
+		for(o = pcb_data_first(&it, subc->data, PCB_OBJ_CLASS_REAL); o != NULL; o = pcb_data_next(&it)) {
+			char *netn;
+			int ni, nei;
+
+			if (o->term == NULL)
+				continue;
+			if (!PCB_FLAG_TEST(PCB_FLAG_FOUND, o))
+				continue;
+
+			netn = pcb_concat(subc->refdes, "-", o->term, NULL);
+
+			for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+				for (nei = 0; nei < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].EntryN; nei++) {
+					if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry, netn) == 0) {
+						free(netn);
+						return PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
+					}
+				}
+			}
+			free(netn);
+		}
+	}
+	PCB_END_LOOP;
+	return NULL;
+}
+
+static int report_net_length_(fgw_arg_t *res, int argc, fgw_arg_t *argv, pcb_coord_t x, pcb_coord_t y)
+{
+	pcb_coord_t length = 0;
+	int found = 0, want_undo, ret;
+
+	/* Reset all connection flags and save an undo-state to get back
+	 * to the state the board was in when we started this function.
+	 *
+	 * After this, we don't add any changes to the undo system, but
+	 * ensure we get back to a point where we can pcb_undo() our changes
+	 * by resetting the connections with pcb_reset_conns() before
+	 * calling pcb_undo() at the end of the procedure.
+	 */
+	want_undo = pcb_reset_conns(pcb_true);
+	if (want_undo)
+		pcb_undo_inc_serial();
+
+	length = xy_to_net_length(x, y, &found);
+
+	if (found) {
+		char buf[50];
+		const char *netname = net_name_found(PCB);
+
+		pcb_snprintf(buf, sizeof(buf), "%$m*", conf_core.editor.grid_unit->suffix, length);
+		if (netname)
+			pcb_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
+		else
+			pcb_message(PCB_MSG_INFO, "Net length: %s\n", buf);
+
+		ret = 0;
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "No net under cursor.\n");
+		ret = 1;
+	}
+
+	pcb_reset_conns(pcb_false);
+	if (want_undo)
+		pcb_undo(pcb_true);
+
+	return ret;
+}
+
+static int report_net_length(fgw_arg_t *res, int argc, fgw_arg_t *argv, int split)
+{
+
+	if (split) {
+		void *r1, *r2, *r3;
+		pcb_line_t *l;
+		pcb_layer_t *ly;
+		int type;
+		pcb_coord_t ox, oy, x, y;
+
+		pcb_hid_get_coords("Click on a copper line", &x, &y, 0);
+
+		type = pcb_search_screen(x, y, PCB_OBJ_LINE, &r1, &r2, &r3);
+		if (type != PCB_OBJ_LINE) {
+			pcb_message(PCB_MSG_ERROR, "can't find a line to split\n");
+			return -1;
+		}
+		l = r2;
+		assert(l->parent_type == PCB_PARENT_LAYER);
+		ly = l->parent.layer;
+		if (!(pcb_layer_flags_(ly) & PCB_LYT_COPPER)) {
+			pcb_message(PCB_MSG_ERROR, "not a copper line, can't split it\n");
+			return -1;
+		}
+
+#define MINDIST PCB_MIL_TO_COORD(40)
+		if ((pcb_distance(l->Point1.X, l->Point1.Y, x, y) < MINDIST) || (pcb_distance(l->Point2.X, l->Point2.Y, x, y) < MINDIST)) {
+			pcb_message(PCB_MSG_ERROR, "Can not split near the endpoint of a line\n");
+			return -1;
+		}
+#undef MINDIST2
+
+		pcb_message(PCB_MSG_INFO, "The two arms of the net are:\n");
+		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		ox = l->Point1.X; oy = l->Point1.Y; l->Point1.X = x; l->Point1.Y = y;
+		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+		report_net_length_(res, argc, argv, x, y);
+		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		l->Point1.X = ox; l->Point1.Y = oy;
+		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+
+		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		ox = l->Point2.X; oy = l->Point2.Y; l->Point2.X = x; l->Point2.Y = y;
+		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+		report_net_length_(res, argc, argv, x, y);
+		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		l->Point2.X = ox; l->Point2.Y = oy;
+		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+
+		PCB_FLAG_SET(PCB_FLAG_SELECTED, l);
+
+		return 0;
+	}
+	else {
+		pcb_coord_t x, y;
+		pcb_hid_get_coords("Click on a network", &x, &y, 0);
+		return report_net_length_(res, argc, argv, x, y);
+	}
+}
+
+
+static int report_net_length_by_name(const char *tofind)
+{
+	char *netname = 0;
+	pcb_coord_t length = 0;
+	int found = 0, i, want_undo;
+	pcb_lib_menu_t *net;
+	pcb_connection_t conn;
+	int net_found = 0;
+	int use_re = 0;
+	re_sei_t *regex;
+	pcb_coord_t x, y;
+
+	if (!PCB)
+		return 1;
+
+	if (!tofind)
+		return 1;
+
+	use_re = 1;
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
+		if (pcb_strcasecmp(tofind, net->Name + 2) == 0)
+			use_re = 0;
+	}
+	if (use_re) {
+		regex = re_sei_comp(tofind);
+		if (re_sei_errno(regex) != 0) {
+			pcb_message(PCB_MSG_ERROR, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex)));
+			re_sei_free(regex);
+			return 1;
+		}
+	}
+
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
+
+		if (use_re) {
+			if (re_sei_exec(regex, net->Name + 2) == 0)
+				continue;
+		}
+		else {
+			if (pcb_strcasecmp(net->Name + 2, tofind))
+				continue;
+		}
+
+		if (pcb_rat_seek_pad(net->Entry, &conn, pcb_false)) {
+			pcb_obj_center(conn.obj, &x, &y);
+			if (conn.obj->term != NULL) {
+				net_found = 1;
+				break;
+			}
+		}
+	}
+
+	if (!net_found) {
+		pcb_message(PCB_MSG_ERROR, "No net named %s\n", tofind);
+		return 1;
+	}
+
+	if (use_re)
+		re_sei_free(regex);
+
+	/* Reset all connection flags and save an undo-state to get back
+	 * to the state the board was in when we started.
+	 *
+	 * After this, we don't add any changes to the undo system, but
+	 * ensure we get back to a point where we can pcb_undo() our changes
+	 * by resetting the connections with pcb_reset_conns() before
+	 * calling pcb_undo() when we are finished.
+	 */
+	want_undo = pcb_reset_conns(pcb_true);
+	if (want_undo)
+		pcb_undo_inc_serial();
+
+	length = xy_to_net_length(x, y, &found);
+	netname = net->Name + 2;
+
+	pcb_reset_conns(pcb_false);
+	if (want_undo)
+		pcb_undo(pcb_true);
+
+	if (!found) {
+		if (net_found)
+			pcb_message(PCB_MSG_INFO, "Net found, but no lines or arcs were flagged.\n");
+		else
+			pcb_message(PCB_MSG_ERROR, "Net not found.\n");
+
+		return 1;
+	}
+
+	{
+		char buf[50];
+		pcb_snprintf(buf, sizeof(buf), "%$m*", conf_core.editor.grid_unit->suffix, length);
+		if (netname)
+			pcb_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
+		else
+			pcb_message(PCB_MSG_INFO, "Net length: %s\n", buf);
+	}
+
+	return 0;
+}
+
+/* ---------------------------------------------------------------------------
+ * reports on an object
+ */
+
+
+/* %start-doc actions Report
+
+@table @code
+
+@item Object
+The object under the crosshair will be reported, describing various
+aspects of the object.
+
+@item DrillReport
+A report summarizing the number of drill sizes used, and how many of
+each, will be produced.
+
+@item FoundPins
+A report listing all pins and pads which are marked as ``found'' will
+be produced.
+
+@item NetLength
+The name and length of the net under the crosshair will be reported to
+the message log.
+
+@item AllNetLengths
+The name and length of the net under the crosshair will be reported to
+the message log.  An optional parameter specifies mm, mil, pcb, or in
+units
+
+@end table
+
+%end-doc */
+
+static fgw_error_t pcb_act_Report(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd, *name;
+	pcb_coord_t x, y;
+
+	PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str);
+
+	if (pcb_strcasecmp(cmd, "Object") == 0) {
+		pcb_hid_get_coords("Click on an object", &x, &y, 0);
+		return pcb_act_report_dialog(res, argc, argv);
+	}
+	else if (pcb_strncasecmp(cmd, "Subc", 4) == 0) {
+		pcb_hid_get_coords("Click on a subcircuit", &x, &y, 0);
+		return pcb_act_report_dialog(res, argc, argv);
+	}
+
+	pcb_hid_get_coords("Click on object to report on", &x, &y, 0);
+
+	if (pcb_strcasecmp(cmd, "DrillReport") == 0)
+		return report_drills(res, argc, argv);
+	else if (pcb_strcasecmp(cmd, "FoundPins") == 0)
+		return report_found_pins(res, argc, argv);
+	else if ((pcb_strcasecmp(cmd, "NetLength") == 0) && (argc == 2))
+		return report_net_length(res, argc, argv, 0);
+	else if ((pcb_strcasecmp(cmd, "NetLengthTo") == 0) && (argc == 2))
+		return report_net_length(res, argc, argv, 1);
+	else if (pcb_strcasecmp(cmd, "AllNetLengths") == 0)
+		return report_all_net_lengths(res, argc, argv);
+	else if (pcb_strcasecmp(cmd, "NetLength") == 0) {
+		PCB_ACT_CONVARG(2, FGW_STR, Report, name = argv[2].val.str);
+		return report_net_length_by_name(name);
+	}
+
+	PCB_ACT_FAIL(Report);
+}
+
+pcb_action_t report_action_list[] = {
+	{"ReportObject", pcb_act_report_dialog, pcb_acth_reportdialog, pcb_acts_reportdialog},
+	{"Report", pcb_act_Report, pcb_acth_Report, pcb_acts_Report}
+};
+
+static const char *report_cookie = "report plugin";
+
+PCB_REGISTER_ACTIONS(report_action_list, report_cookie)
+
+int pplg_check_ver_report(int ver_needed) { return 0; }
+
+void pplg_uninit_report(void)
+{
+	pcb_remove_actions_by_cookie(report_cookie);
+	conf_unreg_fields("plugins/report/");
+}
+
+#include "dolists.h"
+int pplg_init_report(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(report_action_list, report_cookie)
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_report, field,isarray,type_name,cpath,cname,desc,flags);
+#include "report_conf_fields.h"
+	return 0;
+}
Index: tags/2.0.1/src_plugins/report/report.h
===================================================================
--- tags/2.0.1/src_plugins/report/report.h	(nonexistent)
+++ tags/2.0.1/src_plugins/report/report.h	(revision 18980)
@@ -0,0 +1,39 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef PCB_REPORT_H
+#define PCB_REPORT_H
+
+#include "config.h"
+
+#define REPORT_TYPES \
+	(PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY | \
+	 PCB_OBJ_ARC | PCB_OBJ_RAT | PCB_OBJ_POLY_POINT | \
+	 PCB_OBJ_LINE_POINT | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC)
+
+#endif
Index: tags/2.0.1/src_plugins/report/report.pup
===================================================================
--- tags/2.0.1/src_plugins/report/report.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/report/report.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short report actions
+$long Report() and ReportObject() actions - print a report about design objects.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/report/report_conf.h
===================================================================
--- tags/2.0.1/src_plugins/report/report_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/report/report_conf.h	(revision 18980)
@@ -0,0 +1,16 @@
+#ifndef PCB_MINCUT_CONF_H
+#define PCB_MINCUT_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct report {
+			CFT_INTEGER columns;         /* @usage number of columns for found pin report  */
+		} report;
+	} plugins;
+} conf_report_t;
+
+extern conf_report_t conf_report;
+
+#endif
Index: tags/2.0.1/src_plugins/rubberband_orig/Makefile
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_rubberband_orig
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/rubberband_orig/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,12 @@
+put /local/pcb/mod {rubberband_orig}
+put /local/pcb/mod/OBJS [@
+	$(PLUGDIR)/rubberband_orig/rubberband.o
+	$(PLUGDIR)/rubberband_orig/fgeometry.o
+@]
+put /local/pcb/mod/CONF {$(PLUGDIR)/rubberband_orig/rubberband_conf.h}
+
+switch /local/pcb/rubberband_orig/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/rubberband_orig/fgeometry.c
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/fgeometry.c	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/fgeometry.c	(revision 18980)
@@ -0,0 +1,180 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2017 Luis de Arquer <ldearquer@gmail.com>
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+
+   some parts based on src/polygon1.c
+   based on:
+       poly_Boolean: a polygon clip library
+       Copyright (C) 1997  Alexey Nikitin, Michael Leonov
+       (also the authors of the paper describing the actual algorithm)
+       leonov@propro.iis.nsk.su
+
+   in turn based on:
+       nclip: a polygon clip library
+       Copyright (C) 1993  Klamer Schutte
+
+      polygon1.c
+      (C) 1997 Alexey Nikitin, Michael Leonov
+      (C) 1993 Klamer Schutte
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+*/
+
+
+#include "fgeometry.h"
+#include <math.h>
+#include <stdio.h>
+
+#define MIN_COMPONENT 0.000001
+
+int pcb_fvector_is_null (pcb_fvector_t v)
+{
+	return fabs(v.x) < MIN_COMPONENT && fabs(v.y) < MIN_COMPONENT;
+}
+
+double pcb_fvector_dot (pcb_fvector_t v1, pcb_fvector_t v2)
+{
+	return v1.x * v2.x + v1.y * v2.y;
+}
+
+
+void pcb_fvector_normalize (pcb_fvector_t *v)
+{
+	double module = sqrt(v->x * v->x + v->y * v->y);
+
+	v->x /= module;
+	v->y /= module;
+}
+
+int pcb_fline_is_valid(pcb_fline_t l)
+{
+	return !pcb_fvector_is_null(l.direction);
+}
+
+pcb_fline_t pcb_fline_create(pcb_any_line_t *line)
+{
+	pcb_fline_t ret;
+	
+	ret.point.x = line->Point1.X;
+	ret.point.y = line->Point1.Y;
+	ret.direction.x = line->Point2.X - line->Point1.X;
+	ret.direction.y = line->Point2.Y - line->Point1.Y;
+
+	if (!pcb_fvector_is_null (ret.direction))
+		pcb_fvector_normalize( &ret.direction );
+
+	return ret;
+}
+
+
+pcb_fline_t pcb_fline_create_from_points(struct pcb_point_s *base_point, struct pcb_point_s *other_point)
+{
+	pcb_fline_t ret;
+
+	ret.point.x = base_point->X;
+	ret.point.y = base_point->Y;
+	ret.direction.x = other_point->X - base_point->X;
+	ret.direction.y = other_point->Y - base_point->Y;
+
+	if (!pcb_fvector_is_null (ret.direction))
+		pcb_fvector_normalize( &ret.direction );
+
+	return ret;
+}
+
+
+pcb_fvector_t pcb_fline_intersection(pcb_fline_t l1, pcb_fline_t l2)
+{
+	pcb_fvector_t ret;
+	double lines_dot;
+
+	ret.x = 0;
+	ret.y = 0;
+
+	lines_dot = pcb_fvector_dot (l1.direction, l2.direction);
+	if (fabs(lines_dot) > 0.990 )
+	{
+		/* Consider them parallel. Return null point (vector) */
+		return ret;
+	}
+
+	{
+		/*
+		 * *** From polygon1.c ***
+		 * We have the lines:
+		 * l1: p1 + s*d1
+		 * l2: p2 + t*d2
+		 * And we want to know the intersection point.
+		 * Calculate t:
+		 * p1 + s*d1 = p2 + t*d2
+		 * which is similar to the two equations:
+		 * p1x + s * d1x = p2x + t * d2x
+		 * p1y + s * d1y = p2y + t * d2y
+		 * Multiplying these by d1y resp. d1x gives:
+		 * d1y * p1x + s * d1x * d1y = d1y * p2x + t * d1y * d2x
+		 * d1x * p1y + s * d1x * d1y = d1x * p2y + t * d1x * d2y
+		 * Subtracting these gives:
+		 * d1y * p1x - d1x * p1y = d1y * p2x - d1x * p2y + t * ( d1y * d2x - d1x * d2y )
+		 * So t can be isolated:
+		 * t = (d1y * ( p1x - p2x ) + d1x * ( - p1y + p2y )) / ( d1y * d2x - d1x * d2y )
+		 * and s can be found similarly
+		 * s = (d2y * ( p2x - p1x ) + d2x * ( p1y - p2y )) / ( d2y * d1x - d2x * d1y)
+		 */
+		
+		double t;
+		double p1x, p1y, d1x, d1y;
+		double p2x, p2y, d2x, d2y;
+
+		p1x = l1.point.x;
+		p1y = l1.point.y;
+		d1x = l1.direction.x;
+		d1y = l1.direction.y;
+
+		p2x = l2.point.x;
+		p2y = l2.point.y;
+		d2x = l2.direction.x;
+		d2y = l2.direction.y;
+
+		t = (d1y * ( p1x - p2x ) + d1x * ( - p1y + p2y )) / ( d1y * d2x - d1x * d2y );
+
+#if 0
+/* Can we remove this? */
+		{
+			double s = (d2y * ( p2x - p1x ) + d2x * ( p1y - p2y )) / ( d2y * d1x - d2x * d1y );
+			pcb_trace("Intersection t=%f, s=%f\n", t, s);
+
+			ret.x = p1x + s * d1x;
+			ret.y = p1y + s * d1y;
+		}
+#endif
+
+		ret.x = p2x + t * d2x;
+		ret.y = p2y + t * d2y;
+
+		/*pcb_trace("Intersection x=%f, y=%f\n", ret.x, ret.y);*/
+	}
+	return ret;
+}
+
+
Index: tags/2.0.1/src_plugins/rubberband_orig/fgeometry.h
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/fgeometry.h	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/fgeometry.h	(revision 18980)
@@ -0,0 +1,41 @@
+
+#ifndef PCB_FGEOMETRY_H
+#define PCB_FGEOMETRY_H
+
+#include "obj_common.h"
+
+typedef struct pcb_fvector_s
+{
+	double x;
+	double y;
+} pcb_fvector_t;
+
+
+/* flines should be created through fline_create* functions.
+ * Alternatively, they can be created manually as long as
+ * direction is normalized
+ */
+typedef struct pcb_fline_s
+{
+	pcb_fvector_t point;
+	pcb_fvector_t direction;
+} pcb_fline_t;
+
+int pcb_fvector_is_null(pcb_fvector_t v);
+
+
+/* Any vector given to the following functions has to be non-null */
+double pcb_fvector_dot(pcb_fvector_t v1, pcb_fvector_t v2);
+void pcb_fvector_normalize(pcb_fvector_t *v);
+
+
+pcb_fline_t pcb_fline_create(pcb_any_line_t *line);
+pcb_fline_t pcb_fline_create_from_points(struct pcb_point_s *base_point, struct pcb_point_s *other_point);
+
+int pcb_fline_is_valid(pcb_fline_t l);
+
+/* l1.direction and l2.direction are expected to be normalized */
+pcb_fvector_t pcb_fline_intersection(pcb_fline_t l1, pcb_fline_t l2);
+
+#endif
+
Index: tags/2.0.1/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/rubberband.c	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/rubberband.c	(revision 18980)
@@ -0,0 +1,1457 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+/* functions used by 'rubberband moves' */
+
+#define	STEP_RUBBERBAND		100
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <memory.h>
+#include <math.h>
+
+#include "board.h"
+#include "data.h"
+#include "data_it.h"
+#include "data_list.h"
+#include "error.h"
+#include "event.h"
+#include "undo.h"
+#include "operation.h"
+#include "rotate.h"
+#include "draw.h"
+#include "draw_wireframe.h"
+#include "crosshair.h"
+#include "obj_rat_draw.h"
+#include "obj_line_op.h"
+#include "obj_line_draw.h"
+#include "obj_pstk_inlines.h"
+#include "plugins.h"
+#include "conf_core.h"
+#include "layer_grp.h"
+#include "fgeometry.h"
+#include "search.h"
+
+#include "polygon.h"
+
+#include "rubberband_conf.h"
+conf_rubberband_orig_t conf_rbo;
+
+
+typedef struct {								/* rubberband lines for element moves */
+	pcb_layer_t *Layer;						/* layer that holds the line */
+	pcb_line_t *Line;							/* the line itself */
+/*	pcb_point_t *MovedPoint;	*/		/* and finally the point */
+/*
+	pcb_coord_t DX;
+	pcb_coord_t DY;
+	int delta_is_valid; */
+
+	int delta_index[2];           /* The index into the delta array for the two line points */
+} pcb_rubberband_t;
+
+typedef struct {
+	pcb_layer_t * Layer;					/* Layer that holds the arc */
+	pcb_arc_t 	* Arc;						/* The arc itself */
+	int						Ends;						/* 1 = first end, 2 = second end, 3 = both ends */
+	int           delta_index;    /* The index of the delta passed to rubber move events */
+} pcb_rubberband_arc_t;
+
+
+typedef struct {
+	pcb_cardinal_t RubberbandN;  /* number of lines in array */
+	pcb_cardinal_t RubberbandMax;
+	pcb_rubberband_t *Rubberband;
+	pcb_cardinal_t RubberbandArcN;  /* number of lines in array */
+	pcb_cardinal_t RubberbandArcMax;
+	pcb_rubberband_arc_t *RubberbandArcs;
+} rubber_ctx_t;
+
+static rubber_ctx_t rubber_band_state;
+
+
+struct rubber_info {
+	pcb_coord_t radius;
+	pcb_coord_t X, Y;
+	pcb_line_t *line;
+	pcb_box_t box;
+	pcb_layer_t *layer;
+	rubber_ctx_t *rbnd;
+	int delta_index;
+};
+
+
+static pcb_rubberband_t *pcb_rubber_band_alloc(rubber_ctx_t *rbnd);
+static pcb_rubberband_arc_t *pcb_rubber_band_arc_alloc(rubber_ctx_t *rbnd);
+static pcb_rubberband_t *pcb_rubber_band_create(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_line_t *Line, int point_number,int delta_index);
+static pcb_rubberband_arc_t *pcb_rubber_band_create_arc(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_arc_t *Line, int end);
+static void CheckLinePointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_line_t *, pcb_point_t *,int delta_index);
+static void CheckArcPointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_arc_t *, int *, pcb_bool);
+static void CheckArcForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_arc_t *, pcb_bool);
+static void CheckPolygonForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_poly_t *);
+static void CheckLinePointForRat(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_point_t *);
+static void CheckLineForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_line_t *);
+
+static void	calculate_route_rubber_arc_point_move(pcb_rubberband_arc_t * arcptr,pcb_coord_t group_dx,pcb_coord_t group_dy,pcb_route_t * route);
+
+static void CheckLinePointForRubberbandArcConnection(rubber_ctx_t *rbnd, pcb_layer_t *, pcb_line_t *, pcb_point_t *, pcb_bool);
+
+static pcb_r_dir_t rubber_callback(const pcb_box_t *b, void *cl);
+static pcb_r_dir_t rubber_callback_arc(const pcb_box_t * b, void *cl);
+
+static pcb_r_dir_t rubber_callback(const pcb_box_t * b, void *cl)
+{
+	pcb_line_t *line = (pcb_line_t *) b;
+	pcb_rubberband_t *have_line = NULL;
+	struct rubber_info *i = (struct rubber_info *) cl;
+	rubber_ctx_t *rbnd = i->rbnd;
+	double x, y, rad, dist1, dist2;
+	pcb_coord_t t;
+	int n, touches1 = 0, touches2 = 0;
+	int have_point1 = 0;
+	int have_point2 = 0;
+
+	t = line->Thickness / 2;
+
+	/* Don't add the line if both ends of it are already in the list. */
+	for(n = 0; (n < rbnd->RubberbandN) && (have_line == NULL); n++)
+		if (rbnd->Rubberband[n].Line == line) {
+			have_line = &rbnd->Rubberband[n];
+			if(rbnd->Rubberband[n].delta_index[0] >= 0)
+				have_point1 = 1;
+			if(rbnd->Rubberband[n].delta_index[1] >= 0)
+				have_point2 = 1;
+		}
+
+	if(have_point1 && have_point2)
+			return PCB_R_DIR_NOT_FOUND;
+
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+		return PCB_R_DIR_NOT_FOUND;
+
+	if (line == i->line)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/*
+	 * Check to see if the line touches a rectangular region.
+	 * To do this we need to look for the intersection of a circular
+	 * region and a rectangular region.
+	 */
+	if (i->radius == 0) {
+
+		if (!have_point1
+				&& line->Point1.X + t >= i->box.X1 && line->Point1.X - t <= i->box.X2
+				&& line->Point1.Y + t >= i->box.Y1 && line->Point1.Y - t <= i->box.Y2) {
+			if (((i->box.X1 <= line->Point1.X) &&
+					 (line->Point1.X <= i->box.X2)) || ((i->box.Y1 <= line->Point1.Y) && (line->Point1.Y <= i->box.Y2))) {
+				/*
+				 * The circle is positioned such that the closest point
+				 * on the rectangular region boundary is not at a corner
+				 * of the rectangle.  i.e. the shortest line from circle
+				 * center to rectangle intersects the rectangle at 90
+				 * degrees.  In this case our first test is sufficient
+				 */
+				touches1 = 1;
+			}
+			else {
+				/*
+				 * Now we must check the distance from the center of the
+				 * circle to the corners of the rectangle since the
+				 * closest part of the rectangular region is the corner.
+				 */
+				x = MIN(coord_abs(i->box.X1 - line->Point1.X), coord_abs(i->box.X2 - line->Point1.X));
+				x *= x;
+				y = MIN(coord_abs(i->box.Y1 - line->Point1.Y), coord_abs(i->box.Y2 - line->Point1.Y));
+				y *= y;
+				x = x + y - (t * t);
+
+				if (x <= 0)
+					touches1 = 1;
+			}
+		}
+		if (!have_point2
+				&& line->Point2.X + t >= i->box.X1 && line->Point2.X - t <= i->box.X2
+				&& line->Point2.Y + t >= i->box.Y1 && line->Point2.Y - t <= i->box.Y2) {
+			if (((i->box.X1 <= line->Point2.X) &&
+					 (line->Point2.X <= i->box.X2)) || ((i->box.Y1 <= line->Point2.Y) && (line->Point2.Y <= i->box.Y2))) {
+				touches2 = 1;
+			}
+			else {
+				x = MIN(coord_abs(i->box.X1 - line->Point2.X), coord_abs(i->box.X2 - line->Point2.X));
+				x *= x;
+				y = MIN(coord_abs(i->box.Y1 - line->Point2.Y), coord_abs(i->box.Y2 - line->Point2.Y));
+				y *= y;
+				x = x + y - (t * t);
+
+				if (x <= 0)
+					touches2 = 1;
+			}
+		}
+	}
+	else
+	{
+		/* circular search region */
+		if (i->radius < 0)
+			rad = 0;										/* require exact match */
+		else
+			rad = PCB_SQUARE(i->radius + t);
+
+		x = (i->X - line->Point1.X);
+		x *= x;
+		y = (i->Y - line->Point1.Y);
+		y *= y;
+		dist1 = x + y - rad;
+
+		x = (i->X - line->Point2.X);
+		x *= x;
+		y = (i->Y - line->Point2.Y);
+		y *= y;
+		dist2 = x + y - rad;
+
+		if (dist1 > 0 && dist2 > 0)
+			return PCB_R_DIR_NOT_FOUND;
+#if 0
+#ifdef CLOSEST_ONLY							/* keep this to remind me */
+		if ((dist1 < dist2) && !have_point1)
+			touches1 = 1;
+		else if(!have_point2)
+			touches2 = 1;
+#else
+		if ((dist1 <= 0) && !have_point1)
+			touches1 = 1;
+		if ((dist2 <= 0) && !have_point2)
+			touches2 = 1;
+#endif
+#endif
+		if ((dist1 <= 0) && !have_point1)
+			touches1 = 1;
+		if ((dist2 <= 0) && !have_point2)
+			touches2 = 1;
+	}
+
+	if (touches1) {
+		if(have_line)
+			have_line->delta_index[0] = i->delta_index;
+		else
+			have_line = pcb_rubber_band_create(rbnd, i->layer, line, 0,i->delta_index);
+	}
+
+	if (touches2) {
+		if(have_line)
+			have_line->delta_index[1] = i->delta_index;
+		else
+			pcb_rubber_band_create(rbnd, i->layer, line, 1,i->delta_index);
+	}
+
+	return touches1 || touches2 ? PCB_R_DIR_FOUND_CONTINUE : PCB_R_DIR_NOT_FOUND;
+}
+
+static pcb_r_dir_t rubber_callback_arc(const pcb_box_t * b, void *cl)
+{
+	pcb_arc_t *arc = (pcb_arc_t *) b;
+	struct rubber_info *i = (struct rubber_info *) cl;
+	rubber_ctx_t *rbnd = i->rbnd;
+	double x, y, rad, dist1, dist2;
+	pcb_coord_t t;
+	pcb_coord_t ex1, ey1;
+	pcb_coord_t ex2, ey2;
+	int n = 0;
+	int have_point1 = 0;
+	int have_point2 = 0;
+
+	/* If the arc is locked then don't add it to the rubberband list. */
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, arc))
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* Don't add the arc if both ends of it are already in the list. */
+	for(n = 0; n < rbnd->RubberbandArcN; n++)
+		if (rbnd->RubberbandArcs[n].Arc == arc) {
+			have_point1 = rbnd->RubberbandArcs[n].Ends & 1;
+			have_point2 = rbnd->RubberbandArcs[n].Ends & 2;
+		}
+
+	if(have_point1 && have_point2)
+			return PCB_R_DIR_NOT_FOUND;
+
+	/* Calculate the arc end points */	
+	pcb_arc_get_end(arc,0,&ex1, &ey1);
+	pcb_arc_get_end(arc,1,&ex2, &ey2);
+
+	/* circular search region */
+	t = arc->Thickness / 2;
+
+	if (i->radius < 0)
+		rad = 0;										/* require exact match */
+	else
+		rad = PCB_SQUARE(i->radius + t);
+
+	x = (i->X - ex1);
+	x *= x;
+	y = (i->Y - ey1);
+	y *= y;
+	dist1 = x + y - rad;
+
+	x = (i->X - ex2);
+	x *= x;
+	y = (i->Y - ey2);
+	y *= y;
+	dist2 = x + y - rad;
+
+	if (dist1 > 0 && dist2 > 0)
+		return PCB_R_DIR_NOT_FOUND;
+
+	/* The Arc end-point is touching so create an entry in the rubberband arc list */
+
+#ifdef CLOSEST_ONLY							/* keep this to remind me */
+	if ((dist1 < dist2) && !have_point1)
+		pcb_rubber_band_create_arc(rbnd, i->layer, arc, 1);
+	else if(!have_point2)
+		pcb_rubber_band_create_arc(rbnd, i->layer, arc, 2);
+#else
+	if ((dist1 <= 0) && !have_point1)
+		pcb_rubber_band_create_arc(rbnd, i->layer, arc, 1);
+	if ((dist2 <= 0) && !have_point2)
+		pcb_rubber_band_create_arc(rbnd, i->layer, arc, 2);
+#endif
+		
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+struct rinfo {
+	int type;
+	pcb_layergrp_id_t group;
+	pcb_pstk_t *pstk;
+	pcb_point_t *point;
+	rubber_ctx_t *rbnd;
+	int delta_index;
+};
+
+static pcb_r_dir_t rat_callback(const pcb_box_t * box, void *cl)
+{
+	pcb_rat_t *rat = (pcb_rat_t *) box;
+	struct rinfo *i = (struct rinfo *) cl;
+	rubber_ctx_t *rbnd = i->rbnd;
+
+	switch (i->type) {
+	case PCB_OBJ_PSTK:
+		if (rat->Point1.X == i->pstk->x && rat->Point1.Y == i->pstk->y)
+			pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 0,i->delta_index);
+		else if (rat->Point2.X == i->pstk->x && rat->Point2.Y == i->pstk->y)
+			pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 1,i->delta_index);
+		break;
+	case PCB_OBJ_LINE_POINT:
+		if (rat->group1 == i->group && rat->Point1.X == i->point->X && rat->Point1.Y == i->point->Y)
+			pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 0,i->delta_index);
+		else if (rat->group2 == i->group && rat->Point2.X == i->point->X && rat->Point2.Y == i->point->Y)
+			pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 1,i->delta_index);
+		break;
+	default:
+		pcb_message(PCB_MSG_ERROR, "hace: bad rubber-rat lookup callback\n");
+	}
+	return PCB_R_DIR_NOT_FOUND;
+}
+
+static void CheckPadstackForRat(rubber_ctx_t *rbnd, pcb_pstk_t *pstk)
+{
+	struct rinfo info;
+
+	info.type = PCB_OBJ_PSTK;
+	info.pstk = pstk;
+	info.rbnd = rbnd;
+	info.delta_index = 0;
+	pcb_r_search(PCB->Data->rat_tree, &pstk->BoundingBox, NULL, rat_callback, &info, NULL);
+}
+
+static void CheckLinePointForRat(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_point_t *Point)
+{
+	struct rinfo info;
+	info.group = pcb_layer_get_group_(Layer);
+	info.point = Point;
+	info.type = PCB_OBJ_LINE_POINT;
+	info.rbnd = rbnd;
+	info.delta_index = 0;
+
+	pcb_r_search(PCB->Data->rat_tree, (pcb_box_t *) Point, NULL, rat_callback, &info, NULL);
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed line.
+ * If one of the endpoints of the line is connected to an endpoint of the 
+ * passed line, the scanned line is added to the 'rubberband' list
+ */
+static void CheckLinePointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *LinePoint,int delta_index)
+{
+	const pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const pcb_coord_t t = Line->Thickness / 2;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+		struct rubber_info info;
+
+		info.radius = -1;
+		info.box.X1 = LinePoint->X - t;
+		info.box.X2 = LinePoint->X + t;
+		info.box.Y1 = LinePoint->Y - t;
+		info.box.Y2 = LinePoint->Y + t;
+		info.line = Line;
+		info.rbnd = rbnd;
+		info.X = LinePoint->X;
+		info.Y = LinePoint->Y;
+		info.delta_index = delta_index;
+
+		for(entry = 0;entry < length;++entry)	{
+			const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+			pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+			if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb))	{
+				info.layer = layer;
+				pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL);
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible arcs which belong to the same group as the passed line.
+ * If one of the endpoints of the arc lays * inside the passed line,
+ * the scanned arc is added to the 'rubberband' list
+ */
+static void CheckLinePointForRubberbandArcConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *LinePoint, pcb_bool Exact)
+{
+	const pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const pcb_coord_t t = Line->Thickness / 2;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+		struct rubber_info info;
+
+		info.radius = Exact ? -1 : MAX(Line->Thickness / 2, 1);
+		info.box.X1 = LinePoint->X - t;
+		info.box.X2 = LinePoint->X + t;
+		info.box.Y1 = LinePoint->Y - t;
+		info.box.Y2 = LinePoint->Y + t;
+		info.line = Line;
+		info.rbnd = rbnd;
+		info.X = LinePoint->X;
+		info.Y = LinePoint->Y;
+		info.delta_index = 0;
+
+		for(entry = 0;entry < length;++entry)	{
+			const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+			pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+			if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb))	{
+				info.layer = layer;
+				pcb_r_search(layer->arc_tree, &info.box, NULL, rubber_callback_arc, &info, NULL);
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed arc.
+ * If one of the endpoints of the line is on the selected arc end,
+ * the scanned line is added to the 'rubberband' list
+ */
+static void CheckArcPointForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_arc_t *Arc, int *end_pt, pcb_bool Exact)
+{
+	const pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const pcb_coord_t t = Arc->Thickness / 2;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+		struct rubber_info info;
+		int end; /* = end_pt == pcb_arc_start_ptr ? 0 : 1;*/
+	
+		for(end=0;end<=1;++end)	{
+			pcb_coord_t ex, ey;
+			pcb_arc_get_end(Arc, end, &ex, &ey);
+
+			info.radius = Exact ? -1 : MAX(Arc->Thickness / 2, 1);
+			info.box.X1 = ex - t;
+			info.box.X2 = ex + t;
+			info.box.Y1 = ey - t;
+			info.box.Y2 = ey + t;
+			info.line = NULL; /* used only to make sure the current object is not added - we are adding lines only and the current object is an arc */
+			info.rbnd = rbnd;
+			info.X = ex;
+			info.Y = ey;
+			info.delta_index = end;
+
+			for(entry = 0;entry < length;++entry)	{
+				const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+				pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+				if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb))	{
+					info.layer = layer;
+					pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL);
+				}
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed arc.
+ * If one of the endpoints of the line is on either of the selected arcs ends,
+ * the scanned line is added to the 'rubberband' list.
+ */
+static void CheckArcForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_arc_t *Arc, pcb_bool Exact)
+{
+	struct rubber_info info;
+	int which;
+	pcb_coord_t t = Arc->Thickness / 2, ex, ey;
+	const pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+
+		for(which=0; which<=1; ++which) {
+			pcb_arc_get_end(Arc,which,&ex, &ey);
+
+			/* lookup layergroup and check all visible lines in this group */
+			info.radius = Exact ? -1 : MAX(Arc->Thickness / 2, 1);
+			info.box.X1 = ex - t;
+			info.box.X2 = ex + t;
+			info.box.Y1 = ey - t;
+			info.box.Y2 = ey + t;
+			info.line = NULL; /* used only to make sure the current object is not added - we are adding lines only and the current object is an arc */
+			info.rbnd = rbnd;
+			info.X = ex;
+			info.Y = ey;
+			info.delta_index = which;
+
+			for(entry = 0;entry < length;++entry) {
+				const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+				pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+				if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) {
+					/* check all visible lines of the group member */
+					info.layer = layer;
+					pcb_r_search(layer->line_tree, &info.box, NULL, rubber_callback, &info, NULL);
+				}
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed Arc.
+ * If either of the endpoints of the line lays anywhere inside the passed Arc,
+ * the scanned line is added to the 'rubberband' list
+ */
+static void CheckEntireArcForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t * Layer, pcb_arc_t * Arc)
+{
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+	pcb_layergrp_id_t group;
+
+	if(board == NULL)
+		board = PCB;
+
+	/* lookup layergroup and check all visible lines in this group */
+	group = pcb_layer_get_group_(Layer);
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+
+		for(entry = 0;entry < length;++entry) {
+			const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+			pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+			if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) {
+				pcb_coord_t thick;
+
+				/* the following code just stupidly compares the endpoints of the lines */
+				PCB_LINE_LOOP(layer);
+				{
+					pcb_rubberband_t *have_line = NULL;
+					pcb_bool touches1 = pcb_false;
+					pcb_bool touches2 = pcb_false;
+					int l;
+
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+						continue;
+
+					/* Check whether the line is already in the rubberband list. */
+					for(l = 0; (l < rbnd->RubberbandN) && (have_line == NULL); l++)
+						if (rbnd->Rubberband[l].Line == line) 
+							have_line = &rbnd->Rubberband[l];
+
+					/* Check whether any of the scanned line points touch the passed line */
+					thick = (line->Thickness + 1) / 2;
+					touches1 = pcb_is_point_on_arc(line->Point1.X, line->Point1.Y, thick, Arc);
+					touches2 = pcb_is_point_on_arc(line->Point2.X, line->Point2.Y, thick, Arc);
+
+					if(touches1) {
+						if(have_line)
+							have_line->delta_index[0] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 0,0);
+					}
+
+					if(touches2) {
+						if(have_line)
+							have_line->delta_index[1] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 1,0);
+					}
+				}
+				PCB_END_LOOP;
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed polygon.
+ * If one of the endpoints of the line lays inside the passed polygon,
+ * the scanned line is added to the 'rubberband' list
+ */
+static void CheckPolygonForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_poly_t *Polygon)
+{
+	const pcb_bool clearpoly = PCB_FLAG_TEST(PCB_FLAG_CLEARPOLY,Polygon);
+	pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0)
+	{
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+
+		for(entry = 0;entry < length;++entry) {
+			const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+			pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+			if(layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) {
+				pcb_coord_t thick;
+
+				/* the following code just stupidly compares the endpoints
+				 * of the lines
+				 */
+				PCB_LINE_LOOP(layer);
+				{
+					pcb_rubberband_t *have_line = NULL;
+					int touches1 = 0, touches2 = 0;
+					int l;
+
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+						continue;
+					if ((pcb_layer_flags_(layer) & PCB_LYT_COPPER) && clearpoly && PCB_OBJ_HAS_CLEARANCE(line))
+						continue;
+
+					/* Check whether the line is already in the rubberband list. */
+					for(l = 0; (l < rbnd->RubberbandN) && (have_line == NULL); l++)
+						if (rbnd->Rubberband[l].Line == line) 
+							have_line = &rbnd->Rubberband[l];
+
+					/* Check whether any of the line points touch the polygon */
+					thick = (line->Thickness + 1) / 2;
+					touches1 = (pcb_poly_is_point_in_p(line->Point1.X, line->Point1.Y, thick, Polygon));
+					touches2 = (pcb_poly_is_point_in_p(line->Point2.X, line->Point2.Y, thick, Polygon));
+
+					if(touches1) {
+						if(have_line)
+							have_line->delta_index[0] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 0,0);
+					}
+
+					if(touches2) {
+						if(have_line)
+							have_line->delta_index[1] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 1,0);
+					}
+				}
+				PCB_END_LOOP;
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines which belong to the same group as the passed Line.
+ * If either of the endpoints of the line lays anywhere inside the passed line,
+ * the scanned line is added to the 'rubberband' list
+ */
+static void CheckLineForRubberbandConnection(rubber_ctx_t *rbnd, pcb_layer_t * Layer, pcb_line_t * Line)
+{
+	pcb_layergrp_id_t group = pcb_layer_get_group_(Layer);
+	pcb_board_t * board = pcb_data_get_top(PCB->Data);
+
+	if(board == NULL)
+		board = PCB;
+
+	if(group >= 0) {
+		pcb_cardinal_t length = board->LayerGroups.grp[group].len;
+		pcb_cardinal_t entry;
+		const int comb = Layer->comb & PCB_LYC_SUB;
+
+		for(entry = 0;entry < length;++entry) {
+			const pcb_layer_id_t layer_id = board->LayerGroups.grp[group].lid[entry];
+			pcb_layer_t * layer = &PCB->Data->Layer[layer_id];
+
+			if (layer->meta.real.vis && ((layer->comb & PCB_LYC_SUB) == comb)) {
+				pcb_coord_t thick;
+
+				/* the following code just stupidly compares the endpoints of the lines */
+				PCB_LINE_LOOP(layer);
+				{
+					pcb_rubberband_t *have_line = NULL;
+					pcb_bool touches1 = pcb_false;
+					pcb_bool touches2 = pcb_false;
+					int l;
+
+					if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+						continue;
+
+					/* Check whether the line is already in the rubberband list. */
+					for(l = 0; (l < rbnd->RubberbandN) && (have_line == NULL); l++)
+						if (rbnd->Rubberband[l].Line == line) 
+							have_line = &rbnd->Rubberband[l];
+
+					/* Check whether any of the scanned line points touch the passed line */
+					thick = (line->Thickness + 1) / 2;
+					touches1 = pcb_is_point_on_line(line->Point1.X, line->Point1.Y, thick, Line);
+					touches2 = pcb_is_point_on_line(line->Point2.X, line->Point2.Y, thick, Line);
+
+					if(touches1) {
+						if(have_line)
+							have_line->delta_index[0] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 0,0);
+					}
+
+					if(touches2) {
+						if(have_line)
+							have_line->delta_index[1] = 0;
+						else 
+							have_line =	pcb_rubber_band_create(rbnd, layer, line, 1,0);
+					}
+				}
+				PCB_END_LOOP;
+			}
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * checks all visible lines.  If either of the endpoints of the line lays 
+ * anywhere inside the passed padstack, the scanned line is added to the 
+ * 'rubberband' list.
+ */
+static void CheckPadStackForRubberbandConnection(rubber_ctx_t *rbnd,pcb_pstk_t * pstk)
+{
+	pcb_layergrp_id_t top;	
+	pcb_layergrp_id_t bottom;
+	pcb_bb_type_t bb_type;
+
+	bb_type = pcb_pstk_bbspan(PCB,pstk,&top,&bottom,NULL);
+
+	if(bb_type != PCB_BB_INVALID)
+	{
+		for(;top<=bottom;++top)
+		{
+			PCB_COPPER_GROUP_LOOP(PCB->Data, top);
+			{
+				if (layer->meta.real.vis) {
+					pcb_coord_t thick;
+
+					/* the following code just stupidly compares the endpoints of the lines */
+					PCB_LINE_LOOP(layer);
+					{
+						pcb_rubberband_t *have_line = NULL;
+						pcb_bool touches1 = pcb_false;
+						pcb_bool touches2 = pcb_false;
+						int l;
+
+						if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
+							continue;
+
+						/* Check whether the line is already in the rubberband list. */
+						for(l = 0; (l < rbnd->RubberbandN) && (have_line == NULL); l++)
+							if (rbnd->Rubberband[l].Line == line) 
+								have_line = &rbnd->Rubberband[l];
+
+						/* Check whether any of the scanned line points touch the passed padstack */
+						thick = (line->Thickness + 1) / 2;
+						touches1 = pcb_is_point_in_pstk(line->Point1.X, line->Point1.Y, thick, pstk, layer);
+						touches2 = pcb_is_point_in_pstk(line->Point2.X, line->Point2.Y, thick, pstk, layer);
+
+						if(touches1) {
+							if(have_line)
+								have_line->delta_index[0] = 0;
+							else 
+								have_line =	pcb_rubber_band_create(rbnd, layer, line, 0,0);
+						}
+
+						if(touches2) {
+							if(have_line)
+								have_line->delta_index[1] = 0;
+							else 
+								have_line =	pcb_rubber_band_create(rbnd, layer, line, 1,0);
+						}
+					}
+					PCB_END_LOOP;
+				}
+			}
+			PCB_END_LOOP;
+		}
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * lookup all lines that are connected to an object and save the
+ * data to 'pcb_crosshair.AttachedObject.Rubberband'
+ * lookup is only done for visible layers
+ */
+static void pcb_rubber_band_lookup_lines(rubber_ctx_t *rbnd, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+
+	/* the function is only supported for some types
+	 * check all visible lines;
+	 * it is only necessary to check if one of the endpoints
+	 * is connected
+	 */
+	switch (Type) {
+	case PCB_OBJ_PSTK:
+		CheckPadStackForRubberbandConnection(rbnd,(pcb_pstk_t *)Ptr1);
+		break;
+
+	case PCB_OBJ_SUBC:
+		{
+			pcb_subc_t * subc = (pcb_subc_t *)Ptr1;
+			pcb_data_it_t	it;
+			pcb_any_obj_t * p_obj;
+		 
+			p_obj	= pcb_data_first(&it,subc->data,PCB_OBJ_CLASS_REAL);
+
+			while(p_obj)
+			{
+				pcb_layer_t * layer = p_obj->parent.layer;
+				switch(p_obj->type)
+				{
+					case PCB_OBJ_LINE :	if(p_obj->term) CheckLineForRubberbandConnection(rbnd, layer, (pcb_line_t *) p_obj); break;
+					case PCB_OBJ_POLY :	if(p_obj->term) CheckPolygonForRubberbandConnection(rbnd, layer, (pcb_poly_t *) p_obj); break;
+					case PCB_OBJ_ARC :	/*if(p_obj->term)*/ CheckEntireArcForRubberbandConnection(rbnd, layer, (pcb_arc_t *) p_obj); break;
+					case PCB_OBJ_PSTK :	CheckPadStackForRubberbandConnection(rbnd, (pcb_pstk_t *) p_obj); break;
+					default : 					break;
+				}
+				p_obj = pcb_data_next(&it);
+			}
+			break;
+		}
+
+	case PCB_OBJ_LINE:
+		{
+			pcb_layer_t *layer = (pcb_layer_t *) Ptr1;
+			pcb_line_t *line = (pcb_line_t *) Ptr2;
+			CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point1,0 );
+			CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point2,1 );
+			break;
+		}
+
+	case PCB_OBJ_LINE_POINT:
+		CheckLinePointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3,0);
+		if(conf_rbo.plugins.rubberband_orig.enable_rubberband_arcs != 0)
+			CheckLinePointForRubberbandArcConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true);
+		break;
+
+	case PCB_OBJ_ARC_POINT:
+		CheckArcPointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3, pcb_true);
+		break;
+
+	case PCB_OBJ_ARC:
+		CheckArcForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, pcb_true);
+		break;
+
+	case PCB_OBJ_POLY:
+		CheckPolygonForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2);
+		break;
+	}
+}
+
+static void pcb_rubber_band_lookup_rat_lines(rubber_ctx_t *rbnd, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+{
+	switch (Type) {
+
+	case PCB_OBJ_SUBC:
+		{
+			pcb_subc_t *subc = (pcb_subc_t *) Ptr1;
+
+			PCB_PADSTACK_LOOP(subc->data);
+			{
+				CheckPadstackForRat(rbnd, padstack);
+			}
+			PCB_END_LOOP;
+			break;
+		}
+
+	case PCB_OBJ_LINE:
+		{
+			pcb_layer_t *layer = (pcb_layer_t *) Ptr1;
+			pcb_line_t *line = (pcb_line_t *) Ptr2;
+
+			CheckLinePointForRat(rbnd, layer, &line->Point1);
+			CheckLinePointForRat(rbnd, layer, &line->Point2);
+			break;
+		}
+
+	case PCB_OBJ_LINE_POINT:
+		CheckLinePointForRat(rbnd, (pcb_layer_t *) Ptr1, (pcb_point_t *) Ptr3);
+		break;
+
+	}
+}
+
+/* ---------------------------------------------------------------------------
+ * get next slot for a rubberband connection, allocates memory if necessary
+ */
+static pcb_rubberband_t *pcb_rubber_band_alloc(rubber_ctx_t *rbnd)
+{
+	pcb_rubberband_t *ptr = rbnd->Rubberband;
+
+	/* realloc new memory if necessary and clear it */
+	if (rbnd->RubberbandN >= rbnd->RubberbandMax) {
+		rbnd->RubberbandMax += STEP_RUBBERBAND;
+		ptr = (pcb_rubberband_t *) realloc(ptr, rbnd->RubberbandMax * sizeof(pcb_rubberband_t));
+		rbnd->Rubberband = ptr;
+		memset(ptr + rbnd->RubberbandN, 0, STEP_RUBBERBAND * sizeof(pcb_rubberband_t));
+	}
+	return (ptr + rbnd->RubberbandN++);
+}
+
+static pcb_rubberband_arc_t *pcb_rubber_band_arc_alloc(rubber_ctx_t *rbnd)
+{
+	pcb_rubberband_arc_t *ptr = rbnd->RubberbandArcs;
+
+	/* realloc new memory if necessary and clear it */
+	if (rbnd->RubberbandArcN >= rbnd->RubberbandArcMax) {
+		rbnd->RubberbandArcMax += STEP_RUBBERBAND;
+		ptr = (pcb_rubberband_arc_t *) realloc(ptr, rbnd->RubberbandArcMax * sizeof(pcb_rubberband_arc_t));
+		rbnd->RubberbandArcs = ptr;
+		memset(ptr + rbnd->RubberbandArcN, 0, STEP_RUBBERBAND * sizeof(pcb_rubberband_arc_t));
+	}
+	return (ptr + rbnd->RubberbandArcN++);
+}
+
+/* ---------------------------------------------------------------------------
+ * adds a new line to the rubberband list of 'pcb_crosshair.AttachedObject'
+ * if Layer == 0  it is a rat line
+ */
+static pcb_rubberband_t *pcb_rubber_band_create(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_line_t *Line, int point_number, int delta_index )
+{
+	pcb_rubberband_t *ptr = pcb_rubber_band_alloc(rbnd);
+
+	point_number &= 1;
+	ptr->Layer = Layer;
+	ptr->Line = Line;
+	ptr->delta_index[point_number] = delta_index;
+	ptr->delta_index[point_number^1] = -1;
+
+	return ptr;
+}
+
+static pcb_rubberband_arc_t *pcb_rubber_band_create_arc(rubber_ctx_t *rbnd, pcb_layer_t *Layer, pcb_arc_t *Arc, int end)
+{
+	pcb_rubberband_arc_t *ptr = NULL;
+	int n;
+
+	for(n = 0; (n < rbnd->RubberbandArcN) && (ptr == NULL); n++) 
+		if (rbnd->RubberbandArcs[n].Arc == Arc) 
+			ptr = &rbnd->RubberbandArcs[n];
+
+	if(ptr == NULL) {
+		ptr = pcb_rubber_band_arc_alloc(rbnd);
+		ptr->Layer = Layer;
+		ptr->Arc = Arc;
+		ptr->delta_index = (end == 2 ? 1 : 0);
+	}
+	
+	ptr->Ends |= end;
+	
+	return ptr;
+}
+
+/*** event handlers ***/
+static void rbe_reset(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	rbnd->RubberbandN = 0;
+	rbnd->RubberbandArcN = 0;
+}
+
+static void rbe_remove_subc(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	pcb_rubberband_t *ptr;
+	void *ptr1 = argv[1].d.p, *ptr2 = argv[2].d.p, *ptr3 = argv[3].d.p;
+	int i, type = PCB_OBJ_SUBC;
+
+	rbnd->RubberbandN = 0;
+	pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3);
+	ptr = rbnd->Rubberband;
+	for (i = 0; i < rbnd->RubberbandN; i++) {
+		if (PCB->RatOn)
+			pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line);
+
+		pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, ptr->Line, ptr->Line, ptr->Line);
+		ptr++;
+	}
+}
+
+static void rbe_move(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	pcb_rubberband_t *ptr = rbnd->Rubberband;
+	int direct = argv[1].d.i;
+
+
+	while (rbnd->RubberbandN) {
+		const int dindex1 = ptr->delta_index[0];
+		const int dindex2 = ptr->delta_index[1];
+
+		if((dindex1 >= 0) && (dindex2 >= 0) && !direct)	{
+			/* Move both ends with route. */
+			const int argi1 = (dindex1*2)+2;
+			const int argi2 = (dindex2*2)+2;
+			pcb_point_t point1 = ptr->Line->Point1;
+			pcb_point_t point2 = ptr->Line->Point2;
+			pcb_route_t route;
+
+			point1.X += argv[argi1].d.i;
+			point1.Y += argv[argi1+1].d.i;
+			point2.X += argv[argi2].d.i;
+			point2.Y += argv[argi2+1].d.i;
+
+			pcb_route_init(&route);
+			pcb_route_calculate(	PCB,
+														&route,
+														&point1,
+														&point2,
+														pcb_layer_id(PCB->Data,ptr->Layer),
+														ptr->Line->Thickness,
+														ptr->Line->Clearance,
+														ptr->Line->Flags,
+														pcb_gui->shift_is_pressed(),
+														pcb_gui->control_is_pressed() );
+			pcb_route_apply_to_line(&route,ptr->Layer,ptr->Line);
+			pcb_route_destroy(&route);
+		}
+		else {
+			if(dindex1 >= 0) {
+				const int argi = (dindex1*2)+2;
+				pcb_opctx_t ctx;
+				ctx.move.pcb = PCB;
+				ctx.move.dx = argv[argi].d.i;
+				ctx.move.dy = argv[argi+1].d.i;
+	
+				if(direct) {
+					pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, ctx.move.dx, ctx.move.dy);			
+					pcb_lineop_move_point(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point1);
+				}
+				else
+					pcb_lineop_move_point_with_route(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point1);
+			}
+
+			if(dindex2 >= 0) {
+				const int argi = (dindex2*2)+2;
+				pcb_opctx_t ctx;
+				ctx.move.pcb = PCB;
+				ctx.move.dx = argv[argi].d.i;
+				ctx.move.dy = argv[argi+1].d.i;
+	
+				if(direct) {
+					pcb_undo_add_obj_to_move(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, ctx.move.dx, ctx.move.dy);			
+					pcb_lineop_move_point(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point2);
+				}
+				else
+					pcb_lineop_move_point_with_route(&ctx, ptr->Layer, ptr->Line, &ptr->Line->Point2);
+			}
+		}
+
+		rbnd->RubberbandN--;
+		ptr++;
+	}
+
+	/* TODO: Move rubberband arcs. */
+}
+
+static void rbe_draw(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	pcb_rubberband_t *ptr;
+	pcb_cardinal_t i;
+	int direct = argv[1].d.i;
+
+	/* draw the attached rubberband lines too */
+	i = rbnd->RubberbandN;
+	ptr = rbnd->Rubberband;
+	while (i) {
+
+		if (PCB_FLAG_TEST(PCB_FLAG_VIA, ptr->Line)) {
+			/* this is a rat going to a polygon.  do not draw for rubberband */ ;
+		}
+		else {
+			pcb_coord_t x[2];
+			pcb_coord_t y[2];
+			int p;
+
+			x[0] = ptr->Line->Point1.X;
+			y[0] = ptr->Line->Point1.Y;
+			x[1] = ptr->Line->Point2.X;
+			y[1] = ptr->Line->Point2.Y;
+
+			for(p=0;p<2;++p)
+			{
+				const int dindex = ptr->delta_index[p];
+
+				if((dindex >= 0) ) /*&& (dindex<((argc-2)/2)))*/
+				{
+					const int argi = (dindex*2)+2;
+					x[p] += argv[argi].d.i;
+					y[p] += argv[argi+1].d.i;
+				}
+			}
+
+			if (PCB_FLAG_TEST(PCB_FLAG_RAT, ptr->Line)) {
+				pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.rat);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness, 0);
+			}
+			else if(direct || (conf_core.editor.move_linepoint_uses_route == 0)) {
+				pcb_gui->set_color(pcb_crosshair.GC,ptr->Layer->meta.real.color);
+				pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1], ptr->Line->Thickness, 0);
+				/* Draw the DRC outline if it is enabled */
+				if (conf_core.editor.show_drc) {
+					pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
+					pcb_draw_wireframe_line(pcb_crosshair.GC,x[0],y[0],x[1],y[1],ptr->Line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
+				}
+			}
+			else {
+				pcb_point_t point1;
+				pcb_point_t point2;
+				pcb_route_t route;
+
+				point1.X = x[0];
+				point1.Y = y[0];
+				point2.X = x[1];
+				point2.Y = y[1];
+
+				pcb_route_init(&route);
+				pcb_route_calculate(	PCB,
+															&route,
+															ptr->delta_index[0] < 0 ? &point1 : &point2,
+															ptr->delta_index[0] < 0 ? &point2 : &point1,
+															pcb_layer_id(PCB->Data,ptr->Layer),
+															ptr->Line->Thickness,
+															ptr->Line->Clearance,
+															ptr->Line->Flags,
+															pcb_gui->shift_is_pressed(),
+															pcb_gui->control_is_pressed() );
+				pcb_route_draw(&route,pcb_crosshair.GC);
+				if (conf_core.editor.show_drc)
+					pcb_route_draw_drc(&route,pcb_crosshair.GC);
+				pcb_route_destroy(&route);
+			}
+			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
+		}
+
+		ptr++;
+		i--;
+	}
+
+	/* TODO: 
+	 * draw the attached rubberband arcs */
+	/*
+	if(conf_rbo.plugins.rubberband_orig.enable_rubberband_arcs != 0) {
+		pcb_route_t route;
+		pcb_route_init(&route);
+		i = rbnd->RubberbandArcN;
+		arcptr = rbnd->RubberbandArcs;
+	
+		while (i) {
+			calculate_route_rubber_arc_point_move(arcptr,group_dx,group_dy,&route);
+			pcb_route_draw(&route,pcb_crosshair.GC);
+			pcb_route_reset(&route);
+			arcptr++;
+			i--;
+		}
+		pcb_route_destroy(&route);
+	}
+	*/
+}
+
+static void rbe_rotate90(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	pcb_rubberband_t *ptr;
+	pcb_coord_t cx = argv[5].d.c, cy = argv[6].d.c;
+	int steps = argv[7].d.i;
+	int *changed = argv[8].d.p;
+
+	/* move all the rubberband lines... and reset the counter */
+	ptr = rbnd->Rubberband;
+	while (rbnd->RubberbandN) {
+		const int dindex1 = ptr->delta_index[0];
+		const int dindex2 = ptr->delta_index[1];
+		
+		*changed = 1;
+		
+		if(dindex1 >= 0) 
+			pcb_undo_add_obj_to_rotate90(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point1, cx, cy, steps);
+		if(dindex2 >= 0) 
+			pcb_undo_add_obj_to_rotate90(PCB_OBJ_LINE_POINT, ptr->Layer, ptr->Line, &ptr->Line->Point2, cx, cy, steps);
+
+		pcb_line_invalidate_erase(ptr->Line);
+		if (ptr->Layer) {
+			pcb_poly_restore_to_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line);
+			pcb_r_delete_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line);
+		}
+		else
+			pcb_r_delete_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line);
+
+		if(dindex1 >= 0) 
+			pcb_point_rotate90(&ptr->Line->Point1, cx, cy, steps);
+		
+		if(dindex2 >= 0) 
+			pcb_point_rotate90(&ptr->Line->Point2, cx, cy, steps);
+	
+		pcb_line_bbox(ptr->Line);
+		if (ptr->Layer) {
+			pcb_r_insert_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line);
+			pcb_poly_clear_from_poly(PCB->Data, PCB_OBJ_LINE, ptr->Layer, ptr->Line);
+			pcb_line_invalidate_draw(ptr->Layer, ptr->Line);
+		}
+		else {
+			pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line);
+			pcb_rat_invalidate_draw((pcb_rat_t *) ptr->Line);
+		}
+
+		rbnd->RubberbandN--;
+		ptr++;
+	}
+}
+
+static void rbe_rotate(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+#warning TODO
+}
+
+static void rbe_rename(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+#warning TODO: rewrite this for subc - also move it out from rubberband, it has nothing to do with the feature - should be some generic rat line invalidation mechanism
+#if 0
+	rubber_ctx_t *rbnd = user_data;
+	int type = argv[1].d.i;
+	void *ptr1 = argv[2].d.p, *ptr2 = argv[3].d.p, *ptr3 = argv[4].d.p;
+/*	int pinnum = argv[5].d.i;*/
+
+	if (type == PCB_OBJ_ELEMENT) {
+		pcb_rubberband_t *ptr;
+		int i;
+
+		pcb_undo_restore_serial();
+		rbnd->RubberbandN = 0;
+		pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3);
+		ptr = rbnd->Rubberband;
+		for (i = 0; i < rbnd->RubberbandN; i++, ptr++) {
+			if (PCB->RatOn)
+				pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line);
+			pcb_undo_move_obj_to_remove(PCB_OBJ_RAT, ptr->Line, ptr->Line, ptr->Line);
+		}
+		pcb_undo_inc_serial();
+		pcb_draw();
+	}
+#endif
+}
+
+static void rbe_lookup_lines(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	int type = argv[1].d.i;
+	void *ptr1 = argv[2].d.p, *ptr2 = argv[3].d.p, *ptr3 = argv[4].d.p;
+
+	if (conf_core.editor.rubber_band_mode)
+		pcb_rubber_band_lookup_lines(rbnd, type, ptr1, ptr2, ptr3);
+}
+
+static void rbe_lookup_rats(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	int type = argv[1].d.i;
+	void *ptr1 = argv[2].d.p, *ptr2 = argv[3].d.p, *ptr3 = argv[4].d.p;
+
+	pcb_rubber_band_lookup_rat_lines(rbnd, type, ptr1, ptr2, ptr3);
+}
+
+static void rbe_constrain_main_line(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	rubber_ctx_t *rbnd = user_data;
+	pcb_line_t *line = argv[1].d.p;
+	int * constrained = argv[2].d.p;
+	pcb_coord_t * dx1 = argv[3].d.p;	/* in/out */
+	pcb_coord_t * dy1 = argv[4].d.p;	/* in/out */
+	pcb_coord_t * dx2 = argv[5].d.p;	/* out */
+	pcb_coord_t * dy2 = argv[6].d.p;	/* out */
+	pcb_line_t *rub1, *rub2;
+	int rub1end, rub2end;
+	pcb_fline_t fmain, frub1, frub2;
+	
+	*constrained = 0;
+
+	if (rbnd->RubberbandN != 2)
+		return;
+			
+	rub1 = rbnd->Rubberband[0].Line;
+	rub2 = rbnd->Rubberband[1].Line;
+	rub1end = rbnd->Rubberband[0].delta_index[0] >= 0 ? 1 : 2;
+	rub2end =	rbnd->Rubberband[1].delta_index[0] >= 0 ? 1 : 2;
+
+	/* Create float point-vector representations of the lines */
+	fmain = pcb_fline_create_from_points(&line->Point1, &line->Point2);
+
+	if (rub1end == 1)
+		frub1 = pcb_fline_create_from_points(&rub1->Point1, &rub1->Point2);
+	else
+		frub1 = pcb_fline_create_from_points(&rub1->Point2, &rub1->Point1);
+
+	if (rub2end == 1)
+		frub2 = pcb_fline_create_from_points(&rub2->Point1, &rub2->Point2);
+	else
+		frub2 = pcb_fline_create_from_points(&rub2->Point2, &rub2->Point1);
+
+	/* If either of the lines are parallel to the main line then the main line cannot be constrained */
+	if( (fabs(pcb_fvector_dot(fmain.direction,frub1.direction)) > 0.990) ||
+			(fabs(pcb_fvector_dot(fmain.direction,frub2.direction)) > 0.990) ) 
+		return;
+
+	*constrained = 1;
+
+	/* If they are valid (non-null directions) we carry on */
+	if (pcb_fline_is_valid(fmain) && pcb_fline_is_valid(frub1) && pcb_fline_is_valid(frub2)) {
+		pcb_fvector_t fmove;
+
+			fmove.x = *dx1;
+			fmove.y = *dy1;
+
+		if (!pcb_fvector_is_null(fmove)) {
+			pcb_fvector_t fnormal;
+			double rub1_move, rub2_move;
+
+			fnormal.x = fmain.direction.y;
+			fnormal.y = -fmain.direction.x;
+			if (pcb_fvector_dot(fnormal, fmove) < 0) {
+				fnormal.x = -fnormal.x;
+				fnormal.y = -fnormal.y;
+			}
+			rub1_move = pcb_fvector_dot(fmove, fnormal) / pcb_fvector_dot(frub1.direction, fnormal);
+			*dx1 = rub1_move*frub1.direction.x;
+			*dy1 = rub1_move*frub1.direction.y;
+
+			rub2_move = pcb_fvector_dot(fmove, fnormal) / pcb_fvector_dot(frub2.direction, fnormal);
+			*dx2 = rub2_move*frub2.direction.x;
+			*dy2 = rub2_move*frub2.direction.y;
+		}
+	}
+}
+
+static const char *rubber_cookie = "old rubberband";
+
+void rb_uninit(void)
+{
+	pcb_event_unbind_allcookie(rubber_cookie);
+}
+
+int pplg_check_ver_rubberband_orig(int ver_needed) { return 0; }
+
+void pplg_uninit_rubberband_orig(void)
+{
+	pcb_event_unbind_allcookie(rubber_cookie);
+	conf_unreg_fields("plugins/rubberband_orig/");
+}
+
+int pplg_init_rubberband_orig(void)
+{
+	void *ctx = &rubber_band_state;
+	PCB_API_CHK_VER;
+	pcb_event_bind(PCB_EVENT_RUBBER_RESET, rbe_reset, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_REMOVE_SUBC, rbe_remove_subc, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_MOVE, rbe_move, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_MOVE_DRAW, rbe_draw, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_ROTATE90, rbe_rotate90, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_ROTATE, rbe_rotate, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_RENAME, rbe_rename, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_LOOKUP_LINES, rbe_lookup_lines, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_LOOKUP_RATS, rbe_lookup_rats, ctx, rubber_cookie);
+	pcb_event_bind(PCB_EVENT_RUBBER_CONSTRAIN_MAIN_LINE, rbe_constrain_main_line, ctx, rubber_cookie);
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_rbo, field,isarray,type_name,cpath,cname,desc,flags);
+#include "rubberband_conf_fields.h"
+
+	return 0;
+}
+
+static void	
+calculate_route_rubber_arc_point_move(pcb_rubberband_arc_t * arcptr,pcb_coord_t group_dx,pcb_coord_t group_dy,pcb_route_t * route)
+{
+	/* TODO: Calculate a new route that represents the arc if the endpoint was moved by dx,dy. */
+}
+
Index: tags/2.0.1/src_plugins/rubberband_orig/rubberband.h
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/rubberband.h	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/rubberband.h	(revision 18980)
@@ -0,0 +1,38 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* Rubberband: when moving objects, try to keep connections to other objects -
+   sort of scretching nets as rubber bands */
+
+#ifndef	PCB_RUBBERBAND_H
+#define	PCB_RUBBERBAND_H
+
+/* temporary call until rubber band is moved out into a plugin */
+void pcb_rubberband_init(void);
+
+#endif
Index: tags/2.0.1/src_plugins/rubberband_orig/rubberband_conf.h
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/rubberband_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/rubberband_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_MINCUT_CONF_H
+#define PCB_MINCUT_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct rubberband_orig {
+			CFT_BOOLEAN enable_rubberband_arcs;   /* TODO: Enable to allow attached arcs to rubberband. */
+		} rubberband_orig;
+	} plugins;
+} conf_rubberband_orig_t;
+
+#endif
Index: tags/2.0.1/src_plugins/rubberband_orig/rubberband_orig.pup
===================================================================
--- tags/2.0.1/src_plugins/rubberband_orig/rubberband_orig.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/rubberband_orig/rubberband_orig.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short the original rubberband
+$long The original rubberband code.
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/script/Makefile
===================================================================
--- tags/2.0.1/src_plugins/script/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/script/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_script
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/script/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/script/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/script/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {script}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/script/script.o @]
+
+switch /local/pcb/script/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/script/script.c
===================================================================
--- tags/2.0.1/src_plugins/script/script.c	(nonexistent)
+++ tags/2.0.1/src_plugins/script/script.c	(revision 18980)
@@ -0,0 +1,205 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This module, debug, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <genht/htsp.h>
+#include <genht/hash.h>
+#include <puplug/puplug.h>
+
+#include "actions.h"
+#include "plugins.h"
+#include "error.h"
+#include "compat_misc.h"
+#include "compat_fs.h"
+#include "safe_fs.h"
+#include "pcb-printf.h"
+#include "globalconst.h"
+
+
+typedef struct {
+	char *id, *fn, *lang;
+	pup_plugin_t *pup;
+	fgw_obj_t *obj;
+} script_t;
+
+static htsp_t scripts; /* ID->script_t */
+
+static pup_context_t script_pup;
+
+static const char *script_pup_paths[] = {
+	"/usr/local/lib/puplug",
+	"/usr/lib/puplug",
+	NULL
+};
+
+static void script_unload_entry(htsp_entry_t *e)
+{
+	script_t *s = (script_t *)e->value;
+	if (s->obj != NULL)
+		fgw_obj_unreg(&pcb_fgw, s->obj);
+	pup_unload(&script_pup, s->pup, NULL);
+	free(s->id);
+	free(s->fn);
+	free(s);
+	e->key = NULL;
+	htsp_delentry(&scripts, e);
+}
+
+static int script_unload(const char *id)
+{
+	htsp_entry_t *e = htsp_getentry(&scripts, id);
+	if (e == NULL)
+		return -1;
+	script_unload_entry(e);
+	return 0;
+}
+
+static int script_load(const char *id, const char *fn, const char *lang)
+{
+	char name[PCB_PATH_MAX];
+	pup_plugin_t *pup;
+	script_t *s;
+	int st;
+
+	if (htsp_has(&scripts, id)) {
+		pcb_message(PCB_MSG_ERROR, "Can not load script %s from file %s: ID already in use\n", id, fn);
+		return -1;
+	}
+
+	if (lang == NULL) {
+#warning TODO: guess
+		pcb_message(PCB_MSG_ERROR, "Can not load script %s from file %s: failed to guess language from file name\n", id, fn);
+		return -1;
+	}
+
+	pcb_snprintf(name, sizeof(name), "fungw_%s", lang);
+
+
+
+	pup = pup_load(&script_pup, script_pup_paths, name, 0, &st);
+	if (pup == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Can not load script engine %s for language %s\n", name, lang);
+		return -1;
+	}
+
+	s = calloc(1, sizeof(script_t));
+	s->pup = pup;
+	s->id = pcb_strdup(id);
+	s->fn = pcb_strdup(fn);
+	s->lang = pcb_strdup(lang);
+	htsp_set(&scripts, s->id, s);
+
+	s->obj = fgw_obj_new(&pcb_fgw, s->id, s->lang, s->fn, NULL);
+	if (s->obj == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Failed to parse/execute %s script from file %s\n", id, fn);
+		return -1;
+	}
+	return 0;
+}
+
+void script_list(const char *pat)
+{
+	htsp_entry_t *e;
+	for(e = htsp_first(&scripts); e; e = htsp_next(&scripts, e)) {
+		script_t *s = (script_t *)e->value;
+		if ((pat == NULL) || (*pat == '\0'))
+			pcb_message(PCB_MSG_INFO, "id=%s fn=%s lang=%s\n", s->id, s->fn, s->lang);
+	}
+}
+
+static void oneliner_boilerplate(FILE *f, const char *lang, int pre)
+{
+	if (strcmp(lang, "mawk") == 0) {
+		if (pre)
+			fputs("BEGIN {\n", f);
+		else
+			fputs("}\n", f);
+	}
+}
+
+int script_oneliner(const char *lang, const char *src)
+{
+	FILE *f;
+	char *fn;
+	int res = 0;
+
+	fn = pcb_tempfile_name_new("oneliner");
+	f = pcb_fopen(fn, "w");
+	if (f == NULL) {
+		pcb_tempfile_unlink(fn);
+		pcb_message(PCB_MSG_ERROR, "script oneliner: can't open temp file for write\n");
+		return -1;
+	}
+	oneliner_boilerplate(f, lang, 1);
+	fputs(src, f);
+	fputs("\n", f);
+	oneliner_boilerplate(f, lang, 0);
+	fclose(f);
+
+	if (script_load("__oneliner", fn, lang) != 0) {
+		pcb_message(PCB_MSG_ERROR, "script oneliner: can't load/parse the script\n");
+		res = -1;
+	}
+	script_unload("__oneliner");
+
+	pcb_tempfile_unlink(fn);
+	return res;
+}
+
+#include "script_act.c"
+
+char *script_cookie = "script plugin";
+
+PCB_REGISTER_ACTIONS(script_action_list, script_cookie)
+
+int pplg_check_ver_script(int ver_needed) { return 0; }
+
+void pplg_uninit_script(void)
+{
+	htsp_entry_t *e;
+	pcb_remove_actions_by_cookie(script_cookie);
+	for(e = htsp_first(&scripts); e; e = htsp_next(&scripts, e))
+		script_unload_entry(e);
+
+	htsp_uninit(&scripts);
+	pup_uninit(&script_pup);
+}
+
+#include "dolists.h"
+int pplg_init_script(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(script_action_list, script_cookie);
+	htsp_init(&scripts, strhash, strkeyeq);
+	pup_init(&script_pup);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/script/script.pup
===================================================================
--- tags/2.0.1/src_plugins/script/script.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/script/script.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short fungw turing complete scripting
+$long Load and execute scripts written in any language supported by fungw
+$package (core)
+$state WIP
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/script/script_act.c
===================================================================
--- tags/2.0.1/src_plugins/script/script_act.c	(nonexistent)
+++ tags/2.0.1/src_plugins/script/script_act.c	(revision 18980)
@@ -0,0 +1,152 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  This module, debug, was written and is Copyright (C) 2016 by Tibor Palinkas
+ *  this module is also subject to the GNU GPL as described below
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+static const char pcb_acth_LoadScript[] = "Load a fungw script";
+static const char pcb_acts_LoadScript[] = "LoadScript(id, filename, [language])";
+static fgw_error_t pcb_act_LoadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *id, *fn, *lang = NULL;
+	PCB_ACT_CONVARG(1, FGW_STR, LoadScript, id = argv[1].val.str);
+	PCB_ACT_CONVARG(2, FGW_STR, LoadScript, fn = argv[2].val.str);
+	PCB_ACT_MAY_CONVARG(3, FGW_STR, LoadScript, lang = argv[3].val.str);
+
+	PCB_ACT_IRES(script_load(id, fn, lang));
+	return 0;
+}
+
+static const char pcb_acth_UnloadScript[] = "Unload a fungw script";
+static const char pcb_acts_UnloadScript[] = "UnloadScript(id)";
+static fgw_error_t pcb_act_UnloadScript(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *id = NULL;
+	PCB_ACT_CONVARG(1, FGW_STR, UnloadScript, id = argv[1].val.str);
+
+	PCB_ACT_IRES(script_unload(id));
+	return 0;
+}
+
+static const char pcb_acth_ListScripts[] = "List a fungw script";
+static const char pcb_acts_ListScripts[] = "ListScripts([pat])";
+static fgw_error_t pcb_act_ListScripts(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *pat = NULL;
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, ListScripts, pat = argv[1].val.str);
+
+	script_list(pat);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acth_Oneliner[] = "Execute a script one-liner using a specific language";
+static const char pcb_acts_Oneliner[] = "Oneliner(lang, script)";
+static fgw_error_t pcb_act_Oneliner(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *first = NULL, *lang = argv[0].val.func->name, *scr = NULL;
+	const char **s, *tr[] = {
+		"awk",         "mawk",
+		"ruby",        "mruby",
+		"py",          "python",
+		"js",          "duktape",
+		"javascript",  "duktape",
+		"stt",         "estutter",
+		NULL, NULL
+	};
+
+	if (strcmp(lang, "oneliner") == 0) {
+		/* call to oneliner(lang, script) */
+		PCB_ACT_CONVARG(1, FGW_STR, Oneliner, lang = argv[1].val.str);
+		PCB_ACT_CONVARG(2, FGW_STR, Oneliner, scr = argv[2].val.str);
+	}
+	else if (strcmp(lang, "/exit") == 0) {
+		PCB_ACT_IRES(pcb_cli_leave());
+		return 0;
+	}
+	else {
+		/* call to lang(script) */
+		PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, scr = argv[1].val.str);
+	}
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, Oneliner, first = argv[1].val.str);
+	if (first != NULL) {
+		if (*first == '/') {
+			if (pcb_strcasecmp(scr, "/exit") == 0) {
+				PCB_ACT_IRES(pcb_cli_leave());
+				return 0;
+			}
+			PCB_ACT_IRES(-1); /* ignore /click, /tab and others for now */
+			return 0;
+		}
+	}
+
+	/* translate short name to long name */
+	for(s = tr; *s != NULL; s += 2) {
+		if (strcmp(*s, lang) == 0) {
+			s++;
+			lang = *s;
+			break;
+		}
+	}
+
+	if (scr == NULL) {
+		PCB_ACT_IRES(pcb_cli_enter(lang, lang));
+		return 0;
+	}
+
+	if (pcb_strcasecmp(scr, "/exit") == 0) {
+		PCB_ACT_IRES(pcb_cli_leave());
+		return 0;
+	}
+
+	PCB_ACT_IRES(script_oneliner(lang, scr));
+	return 0;
+}
+
+static pcb_action_t script_action_list[] = {
+	{"LoadScript", pcb_act_LoadScript, pcb_acth_LoadScript, pcb_acts_LoadScript},
+	{"UnloadScript", pcb_act_UnloadScript, pcb_acth_UnloadScript, pcb_acts_UnloadScript},
+	{"ListScripts", pcb_act_ListScripts, pcb_acth_ListScripts, pcb_acts_ListScripts},
+
+	/* script shorthands */
+	{"awk",         pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"mawk",        pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"lua",         pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"tcl",         pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"javascript",  pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"js",          pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"stt",         pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"estutter",    pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"perl",        pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"ruby",        pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"mruby",       pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"py",          pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+	{"python",      pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner},
+
+	{"Oneliner", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}
+};
Index: tags/2.0.1/src_plugins/shand_cmd/Makefile
===================================================================
--- tags/2.0.1/src_plugins/shand_cmd/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/shand_cmd/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_shand_cmd
+	
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/shand_cmd/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/shand_cmd/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/shand_cmd/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {shand_cmd}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/shand_cmd/command.o @]
+
+switch /local/pcb/shand_cmd/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/shand_cmd/command.c
===================================================================
--- tags/2.0.1/src_plugins/shand_cmd/command.c	(nonexistent)
+++ tags/2.0.1/src_plugins/shand_cmd/command.c	(revision 18980)
@@ -0,0 +1,346 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996, 2005 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+/* executes commands from user
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "board.h"
+#include "build_run.h"
+#include "buffer.h"
+#include "command.h"
+#include "data.h"
+#include "error.h"
+#include "plug_io.h"
+#include "rats.h"
+#include "plugins.h"
+#include "actions.h"
+#include "compat_misc.h"
+#include "misc_util.h"
+#include "tool.h"
+
+/*  %start-doc actions 00macros
+
+@macro colonaction
+
+This is one of the command box helper actions.  While it is a regular
+action and can be used like any other action, its name and syntax are
+optimized for use with the command box (@code{:}) and thus the syntax
+is documented for that purpose.
+
+@end macro
+
+%end-doc */
+
+static const char pcb_acts_Help[] = "h";
+static const char pcb_acth_Help[] = "Print a help message for commands.";
+
+/* %start-doc actions h
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_Help(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_message(PCB_MSG_INFO,
+		"following shorthand commands are supported:\n"
+		"  h           display this help message\n"
+		"  l  [file]   load layout\n"
+		"  le [file]   load element to buffer\n"
+		"  m  [file]   load layout to buffer (merge)\n"
+		"  q           quits the application\n"
+		"  q!          quits without save warning\n"
+		"  rn [file]   read in a net-list file\n"
+		"  s  [file]   save layout\n"
+		"  w  [file]   save layout\n"
+		"  wq [file]   save layout and quit\n");
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_LoadLayout[] = "l [name] [format]";
+static const char pcb_acth_LoadLayout[] = "Loads layout data.";
+
+/* %start-doc actions l
+
+Loads a new datafile (layout) and, if confirmed, overwrites any
+existing unsaved data.  The filename and the searchpath
+(@emph{filePath}) are passed to the command defined by
+@emph{filepcb_act_}.  If no filename is specified a file select box
+will popup.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_LoadLayout(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *filename, *format = NULL;
+
+	PCB_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str);
+
+	if (!PCB->Changed || pcb_gui->confirm_dialog("OK to override layout data?", 0))
+		pcb_load_pcb(filename, format, pcb_true, 0);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_LoadElementToBuffer[] = "le [name]";
+static const char pcb_acth_LoadElementToBuffer[] = "Loads an element (subcircuit, footprint) into the current buffer.";
+
+/* %start-doc actions le
+
+The filename and the searchpath (@emph{elementSearchPaths}) are passed to the
+element loader.  If no filename is specified a file select box will popup.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_LoadElementToBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *filename;
+
+	PCB_ACT_CONVARG(1, FGW_STR, LoadElementToBuffer, filename = argv[1].val.str);
+
+	if (pcb_buffer_load_footprint(PCB_PASTEBUFFER, filename, NULL))
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_LoadLayoutToBuffer[] = "m [name]";
+static const char pcb_acth_LoadLayoutToBuffer[] = "Loads a layout into the current buffer.";
+
+/* %start-doc actions m
+
+The filename and the searchpath (@emph{filePath}) are passed to the
+command defined by @emph{filepcb_act_}.
+If no filename is specified a file select box will popup.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_LoadLayoutToBuffer(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *filename, *format = NULL;
+
+	PCB_ACT_CONVARG(1, FGW_STR, LoadLayoutToBuffer, filename = argv[1].val.str);
+	PCB_ACT_MAY_CONVARG(2, FGW_STR, LoadLayoutToBuffer, format = argv[2].val.str);
+
+	if (pcb_buffer_load_layout(PCB, PCB_PASTEBUFFER, filename, format))
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_Quit[] = "q";
+static const char pcb_acth_Quit[] = "Quits the application after confirming.";
+
+/* %start-doc actions q
+
+If you have unsaved changes, you will be prompted to confirm (or
+save) before quitting.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (!PCB->Changed || pcb_gui->close_confirm_dialog() == HID_CLOSE_CONFIRM_OK)
+		pcb_quit_app();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_ReallyQuit[] = "q!";
+static const char pcb_acth_ReallyQuit[] = "Quits the application without confirming.";
+
+/* %start-doc actions q!
+
+Note that this command neither saves your data nor prompts for
+confirmation.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_ReallyQuit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_quit_app();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_LoadNetlist[] = "rn [name]";
+static const char pcb_acth_LoadNetlist[] = "Reads netlist.";
+
+/* %start-doc actions rn
+
+If no filename is given a file select box will pop up.  The file is
+read via the command defined by the @emph{Ratpcb_act_} resource. The
+command must send its output to @emph{stdout}.
+
+Netlists are used for generating rat's nests (see @ref{Rats Nest}) and
+for verifying the board layout (which is also accomplished by the
+@emph{Ratsnest} command).
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_LoadNetlist(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *filename;
+
+	PCB_ACT_CONVARG(1, FGW_STR, LoadNetlist, filename = argv[1].val.str);
+
+	if (PCB->Netlistname)
+		free(PCB->Netlistname);
+	PCB->Netlistname = pcb_strdup_strip_wspace(filename);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_SaveLayout[] = "s [name]\nw [name]";
+static const char pcb_acth_SaveLayout[] = "Saves layout data.";
+
+/* %start-doc actions s
+
+Data and the filename are passed to the command defined by the
+resource @emph{savepcb_act_}. It must read the layout data from
+@emph{stdin}.  If no filename is entered, either the last one is used
+again or, if it is not available, a file select box will pop up.
+
+@colonaction
+
+%end-doc */
+
+/* %start-doc actions w
+
+This commands has been added for the convenience of @code{vi} users
+and has the same functionality as @code{s}.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_SaveLayout(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *filename = NULL;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, SaveLayout, filename = argv[1].val.str);
+
+	if (filename == NULL) {
+		if (PCB->Filename) {
+			if (pcb_save_pcb(PCB->Filename, NULL) == 0)
+				pcb_board_set_changed_flag(pcb_false);
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, "No filename to save to yet\n");
+	}
+	else {
+		if (pcb_save_pcb(filename, NULL) == 0) {
+			pcb_board_set_changed_flag(pcb_false);
+			free(PCB->Filename);
+			PCB->Filename = pcb_strdup(filename);
+			if (pcb_gui->notify_filename_changed != NULL)
+				pcb_gui->notify_filename_changed();
+		}
+	}
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_SaveLayoutAndQuit[] = "wq";
+static const char pcb_acth_SaveLayoutAndQuit[] = "Saves the layout data and quits.";
+
+/* %start-doc actions wq
+
+This command has been added for the convenience of @code{vi} users and
+has the same functionality as @code{s} combined with @code{q}.
+
+@colonaction
+
+%end-doc */
+
+static fgw_error_t pcb_act_SaveLayoutAndQuit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	if (PCB_ACT_CALL_C(pcb_act_SaveLayout, res, argc, argv) == 0)
+		return pcb_act_Quit(res, argc, argv);
+
+	PCB_ACT_IRES(1);
+	return 0;
+}
+
+pcb_action_t shand_cmd_action_list[] = {
+	{"h", pcb_act_Help, pcb_acth_Help, pcb_acts_Help},
+	{"l", pcb_act_LoadLayout, pcb_acth_LoadLayout, pcb_acts_LoadLayout},
+	{"le", pcb_act_LoadElementToBuffer, pcb_acth_LoadElementToBuffer, pcb_acts_LoadElementToBuffer},
+	{"m", pcb_act_LoadLayoutToBuffer, pcb_acth_LoadLayoutToBuffer, pcb_acts_LoadLayoutToBuffer},
+	{"q", pcb_act_Quit, pcb_acth_Quit, pcb_acts_Quit},
+	{"q!", pcb_act_ReallyQuit, pcb_acth_ReallyQuit, pcb_acts_ReallyQuit},
+	{"rn", pcb_act_LoadNetlist, pcb_acth_LoadNetlist, pcb_acts_LoadNetlist},
+	{"s", pcb_act_SaveLayout, pcb_acth_SaveLayout, pcb_acts_SaveLayout},
+	{"w", pcb_act_SaveLayout, pcb_acth_SaveLayout, pcb_acts_SaveLayout},
+	{"wq", pcb_act_SaveLayoutAndQuit, pcb_acth_SaveLayoutAndQuit, pcb_acts_SaveLayoutAndQuit}
+};
+
+static const char *shand_cmd_cookie = "shand_cmd plugin";
+
+PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie)
+
+int pplg_check_ver_shand_cmd(int ver_needed) { return 0; }
+
+void pplg_uninit_shand_cmd(void)
+{
+	pcb_remove_actions_by_cookie(shand_cmd_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_shand_cmd(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(shand_cmd_action_list, shand_cmd_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/shand_cmd/command.h
===================================================================
--- tags/2.0.1/src_plugins/shand_cmd/command.h	(nonexistent)
+++ tags/2.0.1/src_plugins/shand_cmd/command.h	(revision 18980)
@@ -0,0 +1,37 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 1994,1995,1996 Thomas Nau
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ *
+ */
+
+#ifndef	PCB_COMMAND_H
+#define	PCB_COMMAND_H
+
+#include "config.h"
+
+void ExecuteUserCommand(char *);
+void CallActionProc(char *action, char **arg, int argc);
+
+#endif
Index: tags/2.0.1/src_plugins/shand_cmd/shand_cmd.pup
===================================================================
--- tags/2.0.1/src_plugins/shand_cmd/shand_cmd.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/shand_cmd/shand_cmd.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short command shorthands
+$long vi-like command shorthands (1..3 character long commands)
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/shape/Makefile
===================================================================
--- tags/2.0.1/src_plugins/shape/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_shape
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/shape/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/shape/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,10 @@
+put /local/pcb/mod {shape}
+append /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/shape/shape.o
+@]
+
+switch /local/pcb/shape/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/shape/shape.c
===================================================================
--- tags/2.0.1/src_plugins/shape/shape.c	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/shape.c	(revision 18980)
@@ -0,0 +1,560 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+
+#include "shape.h"
+
+#include "plugins.h"
+#include "actions.h"
+
+#include "board.h"
+#include "buffer.h"
+#include "compat_misc.h"
+#include "conf_core.h"
+#include "data.h"
+#include "error.h"
+#include "event.h"
+#include "layer.h"
+#include "math_helper.h"
+#include "obj_poly.h"
+#include "obj_poly_draw.h"
+#include "rotate.h"
+#include "tool.h"
+
+const char *pcb_shape_cookie = "shape plugin";
+static pcb_layer_t pcb_shape_current_layer_;
+pcb_layer_t *pcb_shape_current_layer = &pcb_shape_current_layer_;
+
+static pcb_poly_t *regpoly(pcb_layer_t *layer, int corners, pcb_coord_t rx, pcb_coord_t ry, double rot_deg, pcb_coord_t cx, pcb_coord_t cy)
+{
+	int n, flags = PCB_FLAG_CLEARPOLY;
+	double cosra, sinra, a, da = 2*M_PI / (double)corners;
+	pcb_poly_t *p;
+
+	if (corners < 3)
+		return NULL;
+
+	if ((rx < 10) || (ry < 10))
+		return NULL;
+
+	if ((rot_deg >= 360.0) || (rot_deg <= -360.0))
+		rot_deg = fmod(rot_deg, 360.0);
+
+	if (conf_core.editor.full_poly)
+		flags |= PCB_FLAG_FULLPOLY;
+	if (conf_core.editor.clear_polypoly)
+		flags |= PCB_FLAG_CLEARPOLYPOLY;
+
+	p = pcb_poly_new(layer, 2 * conf_core.design.clearance, pcb_flag_make(flags));
+	if (p == NULL)
+		return NULL;
+
+	if (rot_deg != 0.0) {
+		cosra = cos(rot_deg / PCB_RAD_TO_DEG);
+		sinra = sin(rot_deg / PCB_RAD_TO_DEG);
+	}
+
+	for(n = 0,a = 0; n < corners; n++,a+=da) {
+		pcb_coord_t x,  y;
+		x = pcb_round(cos(a) * (double)rx + (double)cx);
+		y = pcb_round(sin(a) * (double)ry + (double)cy);
+		if (rot_deg != 0.0)
+			pcb_rotate(&x, &y, cx, cy, cosra, sinra);
+		pcb_poly_point_new(p, x, y);
+	}
+
+	pcb_add_poly_on_layer(layer, p);
+
+	return p;
+}
+
+static void elarc90(pcb_poly_t *p, pcb_coord_t cx, pcb_coord_t cy, pcb_coord_t sx, pcb_coord_t sy, pcb_coord_t ex, pcb_coord_t ey, pcb_coord_t rx, pcb_coord_t ry, double sa, int segs, int need_rot, double cosra, double sinra, pcb_coord_t rotcx, pcb_coord_t rotcy)
+{
+	pcb_coord_t lx, ly;
+	double da = M_PI/2.0/((double)segs-1);
+	int n;
+
+	/* add exact start point */
+	if (need_rot)
+		pcb_rotate(&sx, &sy, rotcx, rotcy, cosra, sinra);
+	pcb_poly_point_new(p, sx, sy);
+	lx = sx;
+	ly = sy;
+
+	/* add approximated ellipse points */
+	segs -= 2;
+	for(n = 0,sa+=da; n < segs; n++,sa+=da) {
+		pcb_coord_t x, y;
+		x = pcb_round((double)cx + cos(sa) * (double)rx);
+		y = pcb_round((double)cy - sin(sa) * (double)ry);
+		if (need_rot)
+			pcb_rotate(&x, &y, rotcx, rotcy, cosra, sinra);
+		if ((x != lx) || (y != ly))
+			pcb_poly_point_new(p, x, y);
+		lx = x;
+		ly = y;
+	}
+
+	/* add exact end point */
+	if (need_rot)
+		pcb_rotate(&ex, &ey, rotcx, rotcy, cosra, sinra);
+	if ((ex != lx) || (ey != ly))
+		pcb_poly_point_new(p, ex, ey);
+}
+
+#define CORNER(outx, outy, rect_signx, rect_signy, rsignx, rsigny) \
+	outx = pcb_round((double)cx + rect_signx * (double)w/2 + rsignx*rx); \
+	outy = pcb_round((double)cy + rect_signy * (double)h/2 + rsigny*ry);
+static pcb_poly_t *roundrect(pcb_layer_t *layer, pcb_coord_t w, pcb_coord_t h, pcb_coord_t rx, pcb_coord_t ry, double rot_deg, pcb_coord_t cx, pcb_coord_t cy)
+{
+	pcb_poly_t *p;
+	pcb_coord_t maxr = (w < h ? w : h) / 2, x, y, ex, ey, acx, acy;
+	int segs, need_rot, flags = PCB_FLAG_CLEARPOLY;
+	double cosra, sinra;
+
+	if ((w <= 10) || (h <= 10))
+		return NULL;
+
+	if ((rx > maxr) || (ry > maxr))
+		return NULL;
+
+	if (rot_deg != 0.0) {
+		cosra = cos(rot_deg / PCB_RAD_TO_DEG);
+		sinra = sin(rot_deg / PCB_RAD_TO_DEG);
+		need_rot = 1;
+	}
+	else
+		need_rot = 0;
+
+	segs = sqrt((double)(rx+ry) / (double)PCB_MM_TO_COORD(0.1));
+	if (segs < 3)  segs = 3;
+	if (segs > 15) segs = 15;
+
+	p = pcb_poly_new(layer, 2 * conf_core.design.clearance, pcb_flag_make(flags));
+	if (p == NULL)
+		return NULL;
+
+	/* top right */
+	CORNER(  x,   y, +1, -1,  0, +1); /* start */
+	CORNER(acx, acy, +1, -1, -1, +1);  /* center */
+	CORNER( ex,  ey, +1, -1, -1,  0); /* end */
+	elarc90(p, acx, acy, x, y, ex, ey, rx, ry, 0, segs, need_rot, cosra, sinra, cx, cy);
+
+	/* top left */
+	CORNER(  x,   y, -1, -1, +1,  0); /* start */
+	CORNER(acx, acy, -1, -1, +1, +1);  /* center */
+	CORNER( ex,  ey, -1, -1,  0, +1); /* end */
+	elarc90(p, acx, acy, x, y, ex, ey, rx, ry, M_PI/2.0, segs, need_rot, cosra, sinra, cx, cy);
+
+	/* bottom left */
+	CORNER(  x,   y, -1, +1,  0, -1); /* start */
+	CORNER(acx, acy, -1, +1, +1, -1);  /* center */
+	CORNER( ex,  ey, -1, +1, +1,  0); /* end */
+	elarc90(p, acx, acy, x, y, ex, ey, rx, ry, M_PI, segs, need_rot, cosra, sinra, cx, cy);
+
+	/* bottom roght*/
+	CORNER(  x,   y, +1, +1, -1,  0); /* start */
+	CORNER(acx, acy, +1, +1, -1, -1);  /* center */
+	CORNER( ex,  ey, +1, +1,  0, -1); /* end */
+	elarc90(p, acx, acy, x, y, ex, ey, rx, ry, M_PI*3.0/2.0, segs, need_rot, cosra, sinra, cx, cy);
+
+	pcb_add_poly_on_layer(layer, p);
+
+	return p;
+}
+#undef CORNER
+
+static pcb_poly_t *any_poly_place(pcb_data_t *data, pcb_layer_t *layer, pcb_poly_t *p)
+{
+	if (p == NULL)
+		return NULL;
+
+	pcb_poly_init_clip(PCB->Data, CURRENT, p);
+	pcb_poly_invalidate_draw(CURRENT, p);
+
+	if (data != PCB->Data) {
+		pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+		pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_POLY, CURRENT, p, p);
+		pcb_r_delete_entry(CURRENT->polygon_tree, (pcb_box_t *)p);
+		pcb_poly_free_fields(p);
+		pcb_poly_free(p);
+		pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+	}
+	return p;
+}
+
+static pcb_poly_t *regpoly_place(pcb_data_t *data, pcb_layer_t *layer, int corners, pcb_coord_t rx, pcb_coord_t ry, double rot_deg, pcb_coord_t cx, pcb_coord_t cy)
+{
+	pcb_poly_t *p;
+
+	if (layer == pcb_shape_current_layer)	
+		layer = CURRENT;
+
+	p = regpoly(layer, corners, rx, ry, rot_deg, cx, cy);
+	return any_poly_place(data, layer, p);
+}
+
+static pcb_poly_t *roundrect_place(pcb_data_t *data, pcb_layer_t *layer, pcb_coord_t w, pcb_coord_t h, pcb_coord_t rx, pcb_coord_t ry, double rot_deg, pcb_coord_t cx, pcb_coord_t cy)
+{
+	pcb_poly_t *p;
+
+	if (layer == pcb_shape_current_layer)
+		layer = CURRENT;
+
+	p = roundrect(layer, w, h, rx, ry, rot_deg, cx, cy);
+	return any_poly_place(data, layer, p);
+}
+
+static pcb_line_t *circle_place(pcb_data_t *data, pcb_layer_t *layer, pcb_coord_t dia, pcb_coord_t cx, pcb_coord_t cy)
+{
+	int flags = 0;
+	pcb_line_t *l;
+
+	if (layer == pcb_shape_current_layer)
+		layer = CURRENT;
+
+	if (conf_core.editor.clear_line)
+		flags |= PCB_FLAG_CLEARLINE;
+
+	l = pcb_line_new(layer, cx, cy, cx, cy, dia, conf_core.design.clearance*2, pcb_flag_make(flags));
+	if (l != NULL) {
+		if ((conf_core.editor.clear_line) && (data == PCB->Data))
+			pcb_poly_clear_from_poly(data, PCB_OBJ_LINE, layer, l);
+
+		if (data != PCB->Data) {
+			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
+			pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_LINE, CURRENT, l, l);
+			pcb_r_delete_entry(CURRENT->line_tree, (pcb_box_t *)l);
+			pcb_line_free(l);
+			pcb_tool_select_by_id(PCB_MODE_PASTE_BUFFER);
+		}
+	}
+	return l;
+}
+
+static int get_where(const char *arg, pcb_data_t **data, pcb_coord_t *x, pcb_coord_t *y, pcb_bool *have_coords)
+{
+	const char *dst;
+	char *end;
+	int a = 0;
+	pcb_bool succ;
+
+	dst = arg;
+	if (pcb_strncasecmp(dst, "buffer", 6) == 0) {
+		*data = PCB_PASTEBUFFER->Data;
+		dst += 6;
+		a = 1;
+	}
+	else
+		*data = PCB->Data;
+
+	end = strchr(dst, ';');
+	if (end != NULL) {
+		char *sx, *sy, *tmp;
+		int offs = end - dst;
+		*have_coords = pcb_true;
+		a = 1;
+		
+		tmp = pcb_strdup(dst);
+		tmp[offs] = '\0';
+		sx = tmp;
+		sy = tmp + offs + 1;
+		*x = pcb_get_value(sx, NULL, NULL, &succ);
+		if (succ)
+			*y = pcb_get_value(sy, NULL, NULL, &succ);
+		free(tmp);
+		if (!succ) {
+			pcb_message(PCB_MSG_ERROR, "regpoly(): invalid center coords '%s'\n", dst);
+			return -1;
+		}
+	}
+	return a;
+}
+
+static pcb_bool parse2coords(const char *arg, pcb_coord_t *rx, pcb_coord_t *ry)
+{
+	const char *dst;
+	char *end;
+	pcb_bool succ;
+
+	if (arg == NULL)
+		return pcb_false;
+
+	dst = arg;
+	end = strchr(dst, ';');
+	if (end != NULL) {
+		char *sx, *sy, *tmp = pcb_strdup(dst);
+		int offs = end - dst;
+		tmp[offs] = '\0';
+		sx = tmp;
+		sy = tmp + offs + 1;
+		*rx = pcb_get_value(sx, NULL, NULL, &succ);
+		if (succ)
+			*ry = pcb_get_value(sy, NULL, NULL, &succ);
+		free(tmp);
+	}
+	else
+		*rx = *ry = pcb_get_value(dst, NULL, NULL, &succ);
+	return succ;
+}
+
+static const char pcb_acts_regpoly[] = "regpoly([where,] corners, radius [,rotation])";
+static const char pcb_acth_regpoly[] = "Generate regular polygon. Where is x;y and radius is either r or rx;ry. Rotation is in degrees.";
+fgw_error_t pcb_act_regpoly(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *args[6];
+	double rot = 0;
+	pcb_coord_t x = 0, y = 0, rx, ry = 0;
+	pcb_bool succ, have_coords = pcb_false;
+	int corners = 0, a, n;
+	pcb_data_t *data;
+	char *end;
+
+	if (argc < 3) {
+		pcb_message(PCB_MSG_ERROR, "regpoly() needs at least two parameters\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	if (argc > 5) {
+		pcb_message(PCB_MSG_ERROR, "regpoly(): too many arguments\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	memset(args, 0, sizeof(args));
+	for(n = 1; n < argc; n++)
+		PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str);
+
+	a = get_where(args[0], &data, &x, &y, &have_coords);
+	if (a < 0) {
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	corners = strtol(args[a], &end, 10);
+	if (*end != '\0') {
+		pcb_message(PCB_MSG_ERROR, "regpoly(): invalid number of corners '%s'\n", args[a]);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	a++;
+
+	/* convert radii */
+	succ = parse2coords(args[a], &rx, &ry);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "regpoly(): invalid radius '%s'\n", args[a]);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	a++;
+
+	if (a < argc-1) {
+		rot = strtod(args[a], &end);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "regpoly(): invalid rotation '%s'\n", args[a]);
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+	}
+
+	if ((data == PCB->Data) && (!have_coords))
+		pcb_hid_get_coords("Click on the center of the polygon", &x, &y, 0);
+
+	if (regpoly_place(data, CURRENT, corners, rx, ry, rot, x, y) == NULL)
+		pcb_message(PCB_MSG_ERROR, "regpoly(): failed to create the polygon\n");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+
+static const char pcb_acts_roundrect[] = "roundrect([where,] width[;height] [,rx[;ry] [,rotation]])";
+static const char pcb_acth_roundrect[] = "Generate a rectangle with round corners";
+fgw_error_t pcb_act_roundrect(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *args[8];
+	int n, a;
+	pcb_data_t *data;
+	pcb_bool succ, have_coords = pcb_false;
+	pcb_coord_t x = 0, y = 0, w, h, rx, ry;
+	double rot = 0.0;
+	char *end;
+
+	if (argc < 2) {
+		pcb_message(PCB_MSG_ERROR, "roundrect() needs at least one parameters\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	if (argc > 6) {
+		pcb_message(PCB_MSG_ERROR, "roundrect(): too many arguments\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	memset(args, 0, sizeof(args));
+	for(n = 1; n < argc; n++)
+		PCB_ACT_MAY_CONVARG(n, FGW_STR, regpoly, args[n-1] = argv[n].val.str);
+
+	if (argc > 2) {
+		a = get_where(args[0], &data, &x, &y, &have_coords);
+		if (a < 0) {
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+	}
+	else {
+		a = 0;
+		data = PCB->Data;
+		have_coords = 1;
+		pcb_hid_get_coords("Click on the center of the rectangle", &x, &y, 0);
+	}
+
+	/* convert width;height */
+	succ = parse2coords(args[a], &w, &h);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "roundrect(): invalid width or height '%s'\n", args[a]);
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	a++;
+
+	/* convert radii */
+	if (a < argc-1) {
+		succ = parse2coords(args[a], &rx, &ry);
+		if (!succ) {
+			pcb_message(PCB_MSG_ERROR, "roundrect(): invalid width or height '%s'\n", args[a]);
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+		a++;
+	}
+	else
+		rx = ry = (w+h)/16; /* 1/8 of average w & h */
+
+	if (a < argc-1) {
+		rot = strtod(args[a], &end);
+		if (*end != '\0') {
+			pcb_message(PCB_MSG_ERROR, "roundrect(): invalid rotation '%s'\n", args[a]);
+			PCB_ACT_IRES(-1);
+			return 0;
+		}
+	}
+
+	if ((data == PCB->Data) && (!have_coords))
+		pcb_hid_get_coords("Click on the center of the polygon", &x, &y, 0);
+
+	if (roundrect_place(data, CURRENT, w, h, rx, ry, rot, x, y) == NULL)
+		pcb_message(PCB_MSG_ERROR, "roundrect(): failed to create the polygon\n");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_circle[] = "circle([where,] diameter)";
+static const char pcb_acth_circle[] = "Generate a filled circle (zero length round cap line)";
+fgw_error_t pcb_act_circle(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *args[6];
+	int n, a;
+	pcb_data_t *data;
+	pcb_bool succ, have_coords = pcb_false;
+	pcb_coord_t x = 0, y = 0, dia;
+
+	if (argc < 2) {
+		pcb_message(PCB_MSG_ERROR, "circle() needs at least one parameters (diameter)\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+	if (argc > 3) {
+		pcb_message(PCB_MSG_ERROR, "circle(): too many arguments\n");
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	memset(args, 0, sizeof(args));
+	for(n = 1; n < argc; n++)
+		PCB_ACT_MAY_CONVARG(n, FGW_STR, circle, args[n-1] = argv[n].val.str);
+
+	a = get_where(args[0], &data, &x, &y, &have_coords);
+	if (a < 0) {
+		PCB_ACT_IRES(-1);
+		return 0;
+	}
+
+	dia = pcb_get_value(args[a], NULL, NULL, &succ);
+	if (!succ) {
+		pcb_message(PCB_MSG_ERROR, "circle(): failed to convert dia: invalid coord (%s)\n", args[a]);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if ((dia < 1) || (dia > (PCB->MaxWidth + PCB->MaxHeight)/4)) {
+		pcb_message(PCB_MSG_ERROR, "circle(): invalid diameter\n");
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	if ((data == PCB->Data) && (!have_coords))
+		pcb_hid_get_coords("Click on the center of the circle", &x, &y, 0);
+
+	if (circle_place(PCB->Data, CURRENT, dia, x, y) == NULL)
+		pcb_message(PCB_MSG_ERROR, "circle(): failed to create the polygon\n");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+#include "shape_dialog.c"
+
+pcb_action_t shape_action_list[] = {
+	{"regpoly", pcb_act_regpoly, pcb_acth_regpoly, pcb_acts_regpoly},
+	{"roundrect", pcb_act_roundrect, pcb_acth_roundrect, pcb_acts_roundrect},
+	{"circle", pcb_act_circle, pcb_acth_circle, pcb_acts_circle},
+	{"shape", pcb_act_shape, pcb_acth_shape, pcb_acts_shape}
+};
+
+PCB_REGISTER_ACTIONS(shape_action_list, pcb_shape_cookie)
+
+int pplg_check_ver_shape(int ver_needed) { return 0; }
+
+void pplg_uninit_shape(void)
+{
+	pcb_event_unbind_allcookie(pcb_shape_cookie);
+	pcb_remove_actions_by_cookie(pcb_shape_cookie);
+}
+
+
+#include "dolists.h"
+int pplg_init_shape(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(shape_action_list, pcb_shape_cookie)
+
+	pcb_event_bind(PCB_EVENT_LAYERVIS_CHANGED, shape_layer_chg, NULL, pcb_shape_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/shape/shape.h
===================================================================
--- tags/2.0.1/src_plugins/shape/shape.h	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/shape.h	(revision 18980)
@@ -0,0 +1,41 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2017 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+#ifndef PCB_SHAPE_H
+#define PCB_SHAPE_H
+
+#include "board.h"
+#include "data.h"
+#include "layer.h"
+#include "pcb_bool.h"
+
+/* special layer: when used, the shape is always placed on the CURRENT layer */
+extern pcb_layer_t *pcb_shape_current_layer;
+
+void pcb_shape_dialog(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_t *layer, pcb_bool modal);
+
+#endif
+
+
Index: tags/2.0.1/src_plugins/shape/shape.pup
===================================================================
--- tags/2.0.1/src_plugins/shape/shape.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/shape.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short generate regular shapes
+$long Generate objects of regular shape (regular polygons, circle, round rect)
+$state works
+$package (core)
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/shape/shape_dialog.c
===================================================================
--- tags/2.0.1/src_plugins/shape/shape_dialog.c	(nonexistent)
+++ tags/2.0.1/src_plugins/shape/shape_dialog.c	(revision 18980)
@@ -0,0 +1,363 @@
+#include "hid_dad.h"
+
+typedef struct {
+	PCB_DAD_DECL_NOINIT(dlg)
+	pcb_board_t *pcb;
+	pcb_data_t *data;
+	pcb_layer_t *layer;
+	pcb_any_obj_t *obj;
+
+	/* tab management */
+	int tab;
+
+	/* regpoly */
+	int prx, pry, corners, pcx, pcy, prot, pell;
+
+	/* roundrect */
+	int w, h, rrect, rcx, rcy, rx, ry, rrot, rell;
+
+	/* circle */
+	int dia, ccx, ccy;
+
+} ctx_t;
+
+/* Last open non-modal shape dialog */
+static ctx_t *shape_active = NULL;
+
+static void shp_close_cb(void *caller_data, pcb_hid_attr_ev_t ev)
+{
+	ctx_t *shp = caller_data;
+
+	if (shp == shape_active)
+		shape_active = NULL;
+
+	PCB_DAD_FREE(shp->dlg);
+	free(shp);
+}
+
+static void del_obj(ctx_t *shp)
+{
+	if (shp->obj != NULL) {
+/*		pcb_remove_object(pcb_obj_type2oldtype(shp->obj->type), shp->layer, shp->obj, shp->obj);*/
+		shp->obj = NULL;
+	}
+}
+
+static void shp_chg_regpoly(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	ctx_t *shp = caller_data;
+
+	/* elliptical logics */
+	if (!shp->dlg[shp->pell].default_val.int_value) {
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_false);
+		PCB_DAD_SET_VALUE(hid_ctx, shp->pry, coord_value, shp->dlg[shp->prx].default_val.coord_value);
+	}
+	else
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_true);
+
+	del_obj(shp);
+	shp->obj = (pcb_any_obj_t *)regpoly_place(
+		shp->data, shp->layer, shp->dlg[shp->corners].default_val.int_value,
+		shp->dlg[shp->prx].default_val.coord_value, shp->dlg[shp->pry].default_val.coord_value,
+		shp->dlg[shp->prot].default_val.real_value,
+		shp->dlg[shp->pcx].default_val.coord_value, shp->dlg[shp->pcy].default_val.coord_value);
+}
+
+static void shp_chg_roundrect(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	ctx_t *shp = caller_data;
+
+	/* elliptical logics */
+	if (!shp->dlg[shp->rell].default_val.int_value) {
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_false);
+		PCB_DAD_SET_VALUE(hid_ctx, shp->ry, coord_value, shp->dlg[shp->rx].default_val.coord_value);
+	}
+	else
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_true);
+
+	/* rectangular logics */
+	if (!shp->dlg[shp->rrect].default_val.int_value) {
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_false);
+		PCB_DAD_SET_VALUE(hid_ctx, shp->h, coord_value, shp->dlg[shp->w].default_val.coord_value);
+	}
+	else
+		pcb_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_true);
+
+	del_obj(shp);
+	shp->obj = (pcb_any_obj_t *)roundrect_place(
+		shp->data, shp->layer,
+		shp->dlg[shp->w].default_val.coord_value, shp->dlg[shp->h].default_val.coord_value,
+		shp->dlg[shp->rx].default_val.coord_value, shp->dlg[shp->ry].default_val.coord_value,
+		shp->dlg[shp->rrot].default_val.real_value,
+		shp->dlg[shp->rcx].default_val.coord_value, shp->dlg[shp->rcy].default_val.coord_value);
+}
+
+static void shp_chg_circle(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
+{
+	ctx_t *shp = caller_data;
+	pcb_coord_t dia = shp->dlg[shp->dia].default_val.coord_value;
+
+	if ((dia < 1) || (dia > (PCB->MaxWidth + PCB->MaxHeight)/4)) {
+		pcb_message(PCB_MSG_ERROR, "Invalid diameter.\n");
+		return;
+	}
+
+	shp->obj = (pcb_any_obj_t *)circle_place(
+		shp->data, shp->layer,
+		dia,
+		shp->dlg[shp->ccx].default_val.coord_value, shp->dlg[shp->ccy].default_val.coord_value);
+}
+
+
+static void shape_layer_chg(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	void *hid_ctx;
+	int tab;
+
+	if (shape_active == NULL)
+		return;
+
+	hid_ctx = shape_active->dlg_hid_ctx;
+	tab = shape_active->dlg[shape_active->tab].default_val.int_value;
+	switch(tab) {
+		case 0: shp_chg_regpoly(hid_ctx, shape_active, NULL); break;
+		case 1: shp_chg_roundrect(hid_ctx, shape_active, NULL); break;
+		case 2: shp_chg_circle(hid_ctx, shape_active, NULL); break;
+	}
+}
+
+
+void pcb_shape_dialog(pcb_board_t *pcb, pcb_data_t *data, pcb_layer_t *layer, pcb_bool modal)
+{
+	ctx_t *shp = calloc(sizeof(ctx_t), 1);
+	pcb_coord_t mm2 = PCB_MM_TO_COORD(2);
+	pcb_coord_t maxr = PCB_MM_TO_COORD(1000);
+	const char *tabs[] = {"Regular polygon", "Round rectangle", "Filled circle", NULL};
+
+	shp->pcb = pcb;
+	shp->data = data;
+	shp->layer = layer;
+
+	PCB_DAD_BEGIN_TABBED(shp->dlg, tabs);
+/*		shp->tab = PCB_DAD_CURRENT(shp->dlg);
+		PCB_DAD_CHANGE_CB(shp->dlg, shp_tab);*/
+
+		/* regpoly tab */
+		PCB_DAD_BEGIN_VBOX(shp->dlg);
+			PCB_DAD_LABEL(shp->dlg, "Generate regular polygon");
+			PCB_DAD_BEGIN_TABLE(shp->dlg, 2);
+				PCB_DAD_LABEL(shp->dlg, "Number of corners");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_INTEGER(shp->dlg, "");
+						shp->corners = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINVAL(shp->dlg, 3);
+						PCB_DAD_MAXVAL(shp->dlg, 64);
+						PCB_DAD_DEFAULT(shp->dlg, 8);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Shape radius");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->prx = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "x (horizontal)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->pry = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "y (vertical)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_BOOL(shp->dlg, "");
+						shp->pell = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "elliptical");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Rotation angle:");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_REAL(shp->dlg, "");
+						shp->prot = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINVAL(shp->dlg, -360);
+						PCB_DAD_MAXVAL(shp->dlg, 360);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "deg");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Center offset");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->pcx = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "x (horizontal)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->pcy = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_regpoly);
+					PCB_DAD_LABEL(shp->dlg, "y (vertical)");
+				PCB_DAD_END(shp->dlg);
+			PCB_DAD_END(shp->dlg);
+
+		PCB_DAD_END(shp->dlg);
+
+		/* roundrect tab */
+		PCB_DAD_BEGIN_VBOX(shp->dlg);
+			PCB_DAD_LABEL(shp->dlg, "Generate rectange with rounded corners");
+			PCB_DAD_BEGIN_TABLE(shp->dlg, 2);
+
+				PCB_DAD_LABEL(shp->dlg, "Rectangle size");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->w = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "width (horizontal)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->h = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "height (vertical)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_BOOL(shp->dlg, "");
+						shp->rrect = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "rectangular");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Rounding radius");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->rx = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "x (horizontal)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->ry = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_DEFAULT(shp->dlg, mm2);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "y (vertical)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_BOOL(shp->dlg, "");
+						shp->rell = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "elliptical");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Rotation angle:");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_REAL(shp->dlg, "");
+						shp->rrot = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINVAL(shp->dlg, -360);
+						PCB_DAD_MAXVAL(shp->dlg, 360);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "deg");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "Center offset");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->rcx = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "x (horizontal)");
+				PCB_DAD_END(shp->dlg);
+
+				PCB_DAD_LABEL(shp->dlg, "");
+				PCB_DAD_BEGIN_HBOX(shp->dlg);
+					PCB_DAD_COORD(shp->dlg, "");
+						shp->rcy = PCB_DAD_CURRENT(shp->dlg);
+						PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+						PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_roundrect);
+					PCB_DAD_LABEL(shp->dlg, "y (vertical)");
+				PCB_DAD_END(shp->dlg);
+			PCB_DAD_END(shp->dlg);
+		PCB_DAD_END(shp->dlg);
+
+		/* circle tab */
+		PCB_DAD_BEGIN_VBOX(shp->dlg);
+			PCB_DAD_LABEL(shp->dlg, "Generate filled circle");
+			PCB_DAD_BEGIN_HBOX(shp->dlg);
+				PCB_DAD_LABEL(shp->dlg, "Diameter:");
+				PCB_DAD_COORD(shp->dlg, "");
+					shp->dia = PCB_DAD_CURRENT(shp->dlg);
+					PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+					PCB_DAD_DEFAULT(shp->dlg, mm2);
+					PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_circle);
+			PCB_DAD_END(shp->dlg);
+
+			PCB_DAD_LABEL(shp->dlg, "Center offset");
+			PCB_DAD_BEGIN_HBOX(shp->dlg);
+				PCB_DAD_COORD(shp->dlg, "");
+					shp->ccx = PCB_DAD_CURRENT(shp->dlg);
+					PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+					PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_circle);
+				PCB_DAD_LABEL(shp->dlg, "x (horizontal)");
+			PCB_DAD_END(shp->dlg);
+
+			PCB_DAD_LABEL(shp->dlg, "");
+			PCB_DAD_BEGIN_HBOX(shp->dlg);
+				PCB_DAD_COORD(shp->dlg, "");
+					shp->ccy = PCB_DAD_CURRENT(shp->dlg);
+					PCB_DAD_MINMAX(shp->dlg, 0, maxr);
+					PCB_DAD_CHANGE_CB(shp->dlg, shp_chg_circle);
+				PCB_DAD_LABEL(shp->dlg, "y (vertical)");
+			PCB_DAD_END(shp->dlg);
+		PCB_DAD_END(shp->dlg);
+	PCB_DAD_END(shp->dlg);
+
+	PCB_DAD_NEW(shp->dlg, "dlg_shape", "Generate shapes", shp, modal, shp_close_cb);
+	PCB_DAD_SET_VALUE(shp->dlg_hid_ctx, shp->dia, coord_value, PCB_MM_TO_COORD(25.4)); /* suppress a runtime warning on invalid dia (zero) */
+	shp_chg_circle(shp->dlg_hid_ctx, shp, NULL);
+	shp_chg_roundrect(shp->dlg_hid_ctx, shp, NULL);
+	shp_chg_regpoly(shp->dlg_hid_ctx, shp, NULL); /* has to be the last */
+	if (modal) {
+		PCB_DAD_RUN(shp->dlg);
+		PCB_DAD_FREE(shp->dlg);
+	}
+	else
+		shape_active = shp;
+}
+
+
+static const char pcb_acts_shape[] = "shape()";
+static const char pcb_acth_shape[] = "Interactive shape generator.";
+fgw_error_t pcb_act_shape(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, pcb_false);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
Index: tags/2.0.1/src_plugins/sketch_route/Makefile
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_sketch_route
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/sketch_route/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,19 @@
+put /local/pcb/mod {sketch_route}
+append /local/pcb/mod/OBJS [@
+ $(PLUGDIR)/sketch_route/sketch_route.o
+ $(PLUGDIR)/sketch_route/wire.o
+ $(PLUGDIR)/sketch_route/ewire.o
+ $(PLUGDIR)/sketch_route/ewire_point.o
+ $(PLUGDIR)/sketch_route/spoke.o
+ $(PLUGDIR)/sketch_route/pointdata.o
+ $(PLUGDIR)/sketch_route/cdt/cdt.o
+ $(PLUGDIR)/sketch_route/cdt/edge.o
+ $(PLUGDIR)/sketch_route/cdt/point.o
+ $(PLUGDIR)/sketch_route/cdt/triangle.o
+@]
+
+switch /local/pcb/sketch_route/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/sketch_route/cdt/Makefile
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/Makefile	(revision 18980)
@@ -0,0 +1,7 @@
+CFLAGS=-Wall -O0 -g3 -I. -I../../../src_3rd
+LDFLAGS=-lm
+
+cdt_test: cdt_test.o cdt.o point.o edge.o triangle.o
+
+%.o: %.c
+	gcc $(CFLAGS) -c $< -o $@
Index: tags/2.0.1/src_plugins/sketch_route/cdt/cdt.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/cdt.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/cdt.c	(revision 18980)
@@ -0,0 +1,849 @@
+/*
+ *  Copyright (C) 2018 Wojciech Krutnik
+ *
+ *  Constrained Delaunay Triangulation using incremental algorithm, as described in:
+ *    Yizhi Lu and Wayne Wei-Ming Dai, "A numerical stable algorithm for constructing
+ *    constrained Delaunay triangulation and application to multichip module layout,"
+ *    China., 1991 International Conference on Circuits and Systems, Shenzhen, 1991,
+ *    pp. 644-647 vol.2.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "cdt.h"
+
+#define DEBUG
+
+#define LEFTPOINT(p1, p2) ((p1)->pos.x < (p2)->pos.x || ((p1)->pos.x == (p2)->pos.x && (p1)->pos.y > (p2)->pos.y))
+
+
+static point_t *new_point(cdt_t *cdt, pos_t pos)
+{
+	point_t *p = *vtpoint_alloc_append(&cdt->points, 1);
+	p->pos = pos;
+	return p;
+}
+
+static edge_t *new_edge(cdt_t *cdt, point_t *p1, point_t *p2, int constrain)
+{
+	edge_t *e;
+	assert(p1->pos.x != p2->pos.x || p1->pos.y != p2->pos.y);
+	e = *vtedge_alloc_append(&cdt->edges, 1);
+	/* always orient the edge to the right (or down when x1==x2; requires epsilon check?) */
+	if (LEFTPOINT(p1, p2)) {
+		e->endp[0] = p1;
+		e->endp[1] = p2;
+	}
+	else {
+		e->endp[0] = p2;
+		e->endp[1] = p1;
+	}
+	e->is_constrained = constrain;
+	p1->adj_edges = edgelist_prepend(p1->adj_edges, &e);
+	p2->adj_edges = edgelist_prepend(p2->adj_edges, &e);
+	return e;
+}
+
+edge_t *get_edge_from_points(point_t *p1, point_t *p2)
+{
+	EDGELIST_FOREACH(e1, p1->adj_edges)
+		EDGELIST_FOREACH(e2, p2->adj_edges)
+			if (e1 == e2)
+				return e1;
+		POINTLIST_FOREACH_END();
+	EDGELIST_FOREACH_END();
+	return NULL;
+}
+
+static void order_triangle_points_ccw(point_t **p1, point_t **p2, point_t **p3)
+{
+	pointlist_node_t *points = NULL;
+	points = pointlist_prepend(points, p1);
+	points = pointlist_prepend(points, p2);
+	points = pointlist_prepend(points, p3);
+
+	/* first point */
+	*p1 = LEFTPOINT(*p1, *p2) ? *p1 : *p2;
+	*p1 = LEFTPOINT(*p1, *p3) ? *p1 : *p3;
+	points = pointlist_remove_item(points, p1);
+
+	/* two other points */
+	if (ORIENT_CCW(*p1, points->item, points->next->item)) {
+		*p2 = points->item;
+		*p3 = points->next->item;
+	} else {
+		*p2 = points->next->item;
+		*p3 = points->item;
+	}
+	points = pointlist_remove_front(points);
+	points = pointlist_remove_front(points);
+}
+
+static triangle_t *new_triangle(cdt_t *cdt, point_t *p1, point_t *p2, point_t *p3)
+{
+	edge_t *e1, *e2, *e3;
+	triangle_t *t = *vttriangle_alloc_append(&cdt->triangles, 1);
+
+	assert(!ORIENT_COLLINEAR(p1, p2, p3));	/* points cannot be colinear */
+
+	order_triangle_points_ccw(&p1, &p2, &p3);
+	t->p[0] = p1;
+	t->p[1] = p2;
+	t->p[2] = p3;
+	p1->adj_triangles = trianglelist_prepend(p1->adj_triangles, &t);
+	p2->adj_triangles = trianglelist_prepend(p2->adj_triangles, &t);
+	p3->adj_triangles = trianglelist_prepend(p3->adj_triangles, &t);
+
+	e1 = get_edge_from_points(p1, p2);
+	e2 = get_edge_from_points(p2, p3);
+	e3 = get_edge_from_points(p3, p1);
+	assert(e1 != NULL && e2 != NULL && e3 != NULL);
+	t->e[0] = e1;
+	t->e[1] = e2;
+	t->e[2] = e3;
+
+#define connect_adjacent_triangle(_t_, _edge_num_, _e_) \
+	if ((_e_)->adj_t[0] == NULL && (_e_)->adj_t[1] == NULL) \
+		(_e_)->adj_t[0] = (_t_); \
+	else { \
+		int i = (_e_)->adj_t[0] == NULL ? 0 : 1; \
+		(_e_)->adj_t[i] = (_t_); \
+		(_t_)->adj_t[(_edge_num_)] = (_e_)->adj_t[i^1]; \
+		if ((_t_)->adj_t[(_edge_num_)] != NULL) { \
+			for (i = 0; i < 3; i++) { \
+				if ((_t_)->adj_t[(_edge_num_)]->e[i] == (_e_)) \
+					(_t_)->adj_t[(_edge_num_)]->adj_t[i] = (_t_); \
+			} \
+		} \
+	}
+
+	connect_adjacent_triangle(t, 0, e1);
+	connect_adjacent_triangle(t, 1, e2);
+	connect_adjacent_triangle(t, 2, e3);
+#undef connect_adjacent_triangle
+
+	return t;
+}
+
+static void remove_triangle(cdt_t *cdt, triangle_t *t)
+{
+	int i, j;
+
+	for (i = 0; i < 3; i++) {
+		/* disconnect adjacent points */
+		t->p[i]->adj_triangles = trianglelist_remove_item(t->p[i]->adj_triangles, &t);
+		/* disconnect adjacent edges */
+		for (j = 0; j < 2; j++)
+			if (t->e[i]->adj_t[j] == t)
+				t->e[i]->adj_t[j] = NULL;
+		/* disconnect adjacent triangles */
+		for (j = 0; j < 3; j++) {
+			triangle_t *adj_t = t->adj_t[i];
+			if (adj_t != NULL && adj_t->adj_t[j] == t)
+				adj_t->adj_t[j] = NULL;
+		}
+	}
+
+	/* remove triangle */
+	for(i = 0; i < vttriangle_len(&cdt->triangles); i++) {
+		if (cdt->triangles.array[i] == t) {
+			vttriangle_remove(&cdt->triangles, i, 1);
+			break;
+		}
+	}
+}
+
+static void remove_edge(cdt_t *cdt, edge_t *e)
+{
+	int i;
+
+	assert(e != NULL);
+
+	/* disconnect adjacent triangles */
+	for (i = 0; i < 2; i++)
+		if (e->adj_t[i])
+			remove_triangle(cdt, e->adj_t[i]);
+	/* disconnect endpoints */
+	for (i = 0; i < 2; i++)
+		e->endp[i]->adj_edges = edgelist_remove_item(e->endp[i]->adj_edges, &e);
+
+	/* remove edge */
+	for(i = 0; i < vtedge_len(&cdt->edges); i++) {
+		if (cdt->edges.array[i] == e) {
+			vtedge_remove(&cdt->edges, i, 1);
+			break;
+		}
+	}
+}
+
+static int is_point_in_circumcircle(point_t *p, triangle_t *t)
+{
+	double x1 = t->p[0]->pos.x, x2 = t->p[1]->pos.x, x3 = t->p[2]->pos.x;
+	double y1 = t->p[0]->pos.y, y2 = t->p[1]->pos.y, y3 = t->p[2]->pos.y;
+	double d1, d2, d3, d4;
+	double n1, n2, n3;
+	double px = p->pos.x, py = p->pos.y;
+
+	n1 = (x1 * x1) + (y1 * y1);
+	n2 = (x2 * x2) + (y2 * y2);
+	n3 = (x3 * x3) + (y3 * y3);
+
+	d1 = (x1 * y2) + (x2 * y3) + (x3 * y1) - (x3 * y2) - (x1 * y3) - (x2 * y1);
+	d2 = (n1 * y2) + (n2 * y3) + (n3 * y1) - (n3 * y2) - (n1 * y3) - (n2 * y1);
+	d3 = (n1 * x2) + (n2 * x3) + (n3 * x1) - (n3 * x2) - (n1 * x3) - (n2 * x1);
+	d4 = (n1 * x2 * y3) + (n2 * x3 * y1) + (n3 * x1 * y2) - (n3 * x2 * y1) - (n1 * x3 * y2) - (n2 * x1 * y3);
+
+	return d1 * ( (px * (px*d1 - d2)) + (py * (py*d1 + d3)) - d4 ) < 0 ? 1 : 0;
+}
+
+static void init_bbox(cdt_t *cdt, coord_t bbox_x1, coord_t bbox_y1, coord_t bbox_x2, coord_t bbox_y2)
+{
+	pos_t bbox;
+	point_t *p_tl, *p_tr, *p_bl, *p_br;
+
+	bbox.x = bbox_x1;
+	bbox.y = bbox_y1;
+	cdt->bbox_tl = bbox;
+	p_bl = new_point(cdt, bbox);
+	bbox.x = bbox_x2;
+	bbox.y = bbox_y1;
+	p_br = new_point(cdt, bbox);
+	bbox.x = bbox_x1;
+	bbox.y = bbox_y2;
+	p_tl = new_point(cdt, bbox);
+	bbox.x = bbox_x2;
+	bbox.y = bbox_y2;
+	p_tr = new_point(cdt, bbox);
+	cdt->bbox_br = bbox;
+
+	new_edge(cdt, p_tl, p_bl, 1);
+	new_edge(cdt, p_bl, p_br, 1);
+	new_edge(cdt, p_br, p_tr, 1);
+	new_edge(cdt, p_tr, p_tl, 1);
+	new_edge(cdt, p_bl, p_tr, 0);	/* diagonal */
+
+	new_triangle(cdt, p_bl, p_br, p_tr);
+	new_triangle(cdt, p_tl, p_bl, p_tr);
+}
+
+void cdt_init(cdt_t *cdt, coord_t bbox_x1, coord_t bbox_y1, coord_t bbox_x2, coord_t bbox_y2)
+{
+	cdt->points.elem_constructor = vtpoint_constructor;
+	cdt->points.elem_destructor = vtpoint_destructor;
+	cdt->points.elem_copy = NULL;
+	vtpoint_init(&cdt->points);
+	cdt->edges.elem_constructor = vtedge_constructor;
+	cdt->edges.elem_destructor = vtedge_destructor;
+	cdt->edges.elem_copy = NULL;
+	vtedge_init(&cdt->edges);
+	cdt->triangles.elem_constructor = vttriangle_constructor;
+	cdt->triangles.elem_destructor = vttriangle_destructor;
+	cdt->triangles.elem_copy = NULL;
+	vttriangle_init(&cdt->triangles);
+
+	init_bbox(cdt, bbox_x1, bbox_y1, bbox_x2, bbox_y2);
+}
+
+void cdt_free(cdt_t *cdt)
+{
+	vttriangle_uninit(&cdt->triangles);
+	vtedge_uninit(&cdt->edges);
+	VTPOINT_FOREACH(p, &cdt->points)
+		trianglelist_free(p->adj_triangles);
+		edgelist_free(p->adj_edges);
+	VTPOINT_FOREACH_END();
+	vtpoint_uninit(&cdt->points);
+}
+
+static int is_point_in_triangle(point_t *p, triangle_t *t)
+{
+	return ORIENT_CCW_CL(t->p[0], t->p[1], p) && ORIENT_CCW_CL(t->p[1], t->p[2], p) && ORIENT_CCW_CL(t->p[2], t->p[0], p);
+}
+
+typedef struct {
+	edgelist_node_t *border_edges;
+	edgelist_node_t *edges_to_remove;
+} retriangulation_region_t;
+
+static void check_adjacent_triangle(triangle_t *adj_t, edge_t *adj_e, point_t *new_p, retriangulation_region_t *region)
+{
+	int i;
+
+	assert(adj_t != NULL && adj_e != NULL);
+
+	if (is_point_in_circumcircle(new_p, adj_t)) {
+		region->edges_to_remove = edgelist_prepend(region->edges_to_remove, &adj_e);
+		region->border_edges = edgelist_remove_item(region->border_edges, &adj_e);
+		for (i = 0; i < 3; i++) {
+			if (adj_t->e[i] == adj_e)
+				continue;
+			else {
+				edge_t *next_adj_e = adj_t->e[i];
+				triangle_t *next_adj_t = adj_t->adj_t[i];
+
+				region->border_edges = edgelist_prepend(region->border_edges, &next_adj_e);
+				if (!next_adj_e->is_constrained)
+					check_adjacent_triangle(next_adj_t, next_adj_e, new_p, region); /* recursive call */
+			}
+		}
+	}
+}
+
+#ifdef DEBUG
+void dump_pointlist(pointlist_node_t *list)
+{
+	POINTLIST_FOREACH(p, list)
+		fprintf(stderr, "\t{pos=(%d, %d) adj_t=(", p->pos.x, p->pos.y);
+		TRIANGLELIST_FOREACH(t, p->adj_triangles)
+			fprintf(stderr, "%p", (void*)t);
+			if(_node_->next != NULL)
+				fprintf(stderr, ", ");
+		TRIANGLELIST_FOREACH_END();
+		fprintf(stderr, ") adj_e=(");
+		EDGELIST_FOREACH(t, p->adj_edges)
+			fprintf(stderr, "%p", (void*)t);
+			if(_node_->next != NULL)
+				fprintf(stderr, ", ");
+		EDGELIST_FOREACH_END();
+		fprintf(stderr, ")}\n");
+	POINTLIST_FOREACH_END();
+}
+
+void dump_edgelist(edgelist_node_t *list)
+{
+	EDGELIST_FOREACH(e, list)
+		fprintf(stderr, "\t{endp1=(%p (pos=(%d, %d))) endp2=(%p (pos=(%d, %d))) adj_t=(",
+						(void*)e->endp[0], e->endp[0]->pos.x, e->endp[0]->pos.y, (void*)e->endp[1], e->endp[1]->pos.x, e->endp[1]->pos.y);
+		fprintf(stderr, "%p, %p)", (void*)e->adj_t[0], (void*)e->adj_t[1]);
+		fprintf(stderr, " %s}\n", e->is_constrained ? "constrained" : "");
+	EDGELIST_FOREACH_END();
+}
+
+void dump_trianglelist(trianglelist_node_t *list)
+{
+	TRIANGLELIST_FOREACH(t, list)
+		fprintf(stderr, "\t{p1=(%d, %d) p2=(%d, %d) p3=(%d, %d)",
+						t->p[0]->pos.x, t->p[0]->pos.y, t->p[1]->pos.x, t->p[1]->pos.y, t->p[2]->pos.x, t->p[2]->pos.y);
+		fprintf(stderr, " adj_e=(%p, %p, %p)", (void*)t->e[0], (void*)t->e[1], (void*)t->e[2]);
+		fprintf(stderr, " adj_t=(%p, %p, %p)}\n", (void*)t->adj_t[0], (void*)t->adj_t[1], (void*)t->adj_t[2]);
+	TRIANGLELIST_FOREACH_END();
+}
+#endif
+
+static pointlist_node_t *order_edges_adjacently(edgelist_node_t *edges)
+{
+	pointlist_node_t *plist_ordered = NULL;
+	edge_t *e1 = edges->item;
+	point_t *p = e1->endp[0];
+	int i = 1;
+
+	plist_ordered = pointlist_prepend(plist_ordered, &p);
+	edges = edgelist_remove_front(edges);
+
+	while (edges != NULL) {
+		p = e1->endp[i];
+		EDGELIST_FOREACH(e2, edges)
+			if (e2->endp[0] == p || e2->endp[1] == p) {
+				plist_ordered = pointlist_prepend(plist_ordered, &p);
+				edges = edgelist_remove(edges, _node_);
+				i = e2->endp[0] == p ? 1 : 0;
+				e1 = e2;
+				break;
+			}
+		EDGELIST_FOREACH_END();
+	}
+
+	return plist_ordered;
+}
+
+static void triangulate_polygon(cdt_t *cdt, pointlist_node_t *polygon)
+{
+	pointlist_node_t *current_point_node;
+	point_t *p[3];
+	int i;
+
+	assert(pointlist_length(polygon) >= 3);
+
+	current_point_node = polygon;
+	while (pointlist_length(polygon) > 3) {
+		triangle_t candidate_t;
+		edge_t candidate_e;
+		pointlist_node_t *pnode;
+
+		candidate_t.p[0] = current_point_node->item;
+		candidate_e.endp[0] = candidate_t.p[0];
+		if (current_point_node->next == NULL)
+			current_point_node = polygon; /* wrap around */
+		else
+			current_point_node = current_point_node->next;
+		candidate_t.p[1] = current_point_node->item;
+		if (current_point_node->next == NULL)
+			candidate_t.p[2] = polygon->item; /* wrap around */
+		else
+			candidate_t.p[2] = current_point_node->next->item;
+		candidate_e.endp[1] = candidate_t.p[2];
+
+		if (ORIENT_COLLINEAR(candidate_t.p[0], candidate_t.p[1], candidate_t.p[2]))
+			goto skip;
+
+		/* case 1: another point of the polygon violates the circle criterion */
+		POINTLIST_FOREACH(p, polygon)
+			if (p != candidate_t.p[0] && p != candidate_t.p[1] && p != candidate_t.p[2])
+				if (is_point_in_circumcircle(p, &candidate_t))
+					goto skip;
+		POINTLIST_FOREACH_END();
+
+		/* case 2: edge to be added already exists */
+		EDGELIST_FOREACH(e1, candidate_e.endp[0]->adj_edges)
+			EDGELIST_FOREACH(e2, candidate_e.endp[1]->adj_edges)
+				if (e1 == e2)
+					goto skip;
+			EDGELIST_FOREACH_END();
+		EDGELIST_FOREACH_END();
+
+		/* case 3: edge to be added intersects an existing edge */
+		/* case 4: a point adjacent to the current_point is in the candidate triangle */
+		EDGELIST_FOREACH(e, candidate_t.p[1]->adj_edges)
+			if (e != get_edge_from_points(candidate_t.p[0], candidate_t.p[1])
+					&& e != get_edge_from_points(candidate_t.p[1], candidate_t.p[2])) {
+				triangle_t ord_t;
+				if (LINES_INTERSECT(candidate_e.endp[0], candidate_e.endp[1], e->endp[0], e->endp[1]))
+					goto skip;
+				ord_t.p[0] = candidate_t.p[0];
+				ord_t.p[1] = candidate_t.p[1];
+				ord_t.p[2] = candidate_t.p[2];
+				order_triangle_points_ccw(&ord_t.p[0], &ord_t.p[1], &ord_t.p[2]);
+				if (is_point_in_triangle(e->endp[0] != candidate_t.p[1] ? e->endp[0] : e->endp[1], &ord_t))
+					goto skip;
+			}
+		EDGELIST_FOREACH_END();
+
+		new_edge(cdt, candidate_e.endp[0], candidate_e.endp[1], 0);
+		new_triangle(cdt, candidate_t.p[0], candidate_t.p[1], candidate_t.p[2]);
+
+		/* update polygon: remove the point now covered by the new edge */
+		if (current_point_node->next == NULL)
+			pnode = polygon; /* wrap around */
+		else
+			pnode = current_point_node->next;
+		polygon = pointlist_remove(polygon, current_point_node);
+		current_point_node = pnode;
+
+skip:
+		continue;
+	}
+
+	/* create triangle from the remaining edges */
+	for (i = 0; i < 3; i++) {
+		p[i] = polygon->item;
+		polygon = pointlist_remove_front(polygon);
+	}
+	new_triangle(cdt, p[0], p[1], p[2]);
+}
+
+static void insert_point_(cdt_t *cdt, point_t *new_p)
+{
+	triangle_t *enclosing_triangle = NULL;
+	retriangulation_region_t region = {NULL, NULL};
+	pointlist_node_t *points_to_attach, *prev_point_node;
+	int i;
+
+	/* find enclosing triangle */
+	VTTRIANGLE_FOREACH(t, &cdt->triangles)
+		if (is_point_in_triangle(new_p, t)) {
+			enclosing_triangle = t;
+			break;
+		}
+	VTTRIANGLE_FOREACH_END();
+	assert(enclosing_triangle != NULL);
+
+	/* remove invalid edges and attach enclosing points */
+	for (i = 0; i < 3; i++) {
+		edge_t *adj_e = enclosing_triangle->e[i];
+		triangle_t *adj_t = enclosing_triangle->adj_t[i];
+
+		region.border_edges = edgelist_prepend(region.border_edges, &adj_e);
+		if (!adj_e->is_constrained && adj_t != NULL)
+			check_adjacent_triangle(adj_t, adj_e, new_p, &region);
+	}
+	remove_triangle(cdt, enclosing_triangle);
+	EDGELIST_FOREACH(e, region.edges_to_remove)
+		remove_edge(cdt, e);
+	EDGELIST_FOREACH_END();
+	edgelist_free(region.edges_to_remove);
+
+	points_to_attach = order_edges_adjacently(region.border_edges);
+	prev_point_node = points_to_attach;
+	new_edge(cdt, points_to_attach->item, new_p, 0);
+	POINTLIST_FOREACH(p, points_to_attach->next)
+		point_t *prev_p = prev_point_node->item;
+		new_edge(cdt, p, new_p, 0);
+		new_triangle(cdt, prev_p, p, new_p);
+		prev_point_node = _node_;
+	POINTLIST_FOREACH_END();
+	new_triangle(cdt, prev_point_node->item, points_to_attach->item, new_p);
+	pointlist_free(points_to_attach);
+}
+
+point_t *cdt_insert_point(cdt_t *cdt, coord_t x, coord_t y)
+{
+	pos_t pos;
+	point_t *new_p;
+
+	pos.x = x;
+	pos.y = y;
+	VTPOINT_FOREACH(p, &cdt->points)
+		if (p->pos.x == pos.x && p->pos.y == pos.y)	/* point in the same pos already exists */
+			return p;
+	VTPOINT_FOREACH_END();
+
+	new_p = new_point(cdt, pos);
+	insert_point_(cdt, new_p);
+
+	return new_p;
+}
+
+void cdt_delete_point(cdt_t *cdt, point_t *p)
+{
+	edgelist_node_t *polygon_edges = NULL;
+	pointlist_node_t *polygon_points;
+	int i;
+
+	/* find opposite edges of adjacent triangles and add them to the polygon */
+	TRIANGLELIST_FOREACH(t, p->adj_triangles)
+		i = 0;
+		while(i < 3) {
+			edge_t *edge_of_triangle = t->e[i];
+			EDGELIST_FOREACH(edge_of_point, p->adj_edges)
+				if (edge_of_point == edge_of_triangle)
+					goto next_i;
+			EDGELIST_FOREACH_END();
+			polygon_edges = edgelist_prepend(polygon_edges, &edge_of_triangle);
+			break;
+next_i:
+			i++;
+		}
+	TRIANGLELIST_FOREACH_END();
+
+	/* remove adjacent edges */
+	EDGELIST_FOREACH(e, p->adj_edges)
+		assert(e->is_constrained == 0);
+		_node_ = _node_->next;
+		remove_edge(cdt, e);
+		continue;
+	EDGELIST_FOREACH_END();
+
+	/* remove point */
+	for(i = 0; i < vtpoint_len(&cdt->points); i++) {
+		if (cdt->points.array[i] == p) {
+			vtpoint_remove(&cdt->points, i, 1);
+			break;
+		}
+	}
+
+	polygon_points = order_edges_adjacently(polygon_edges);
+	triangulate_polygon(cdt, polygon_points);
+}
+
+static trianglelist_node_t *triangles_intersecting_line(point_t *p1, point_t *p2)
+{
+	trianglelist_node_t *triangles = NULL;
+	triangle_t *next_t = NULL;
+	edge_t *adj_e;
+	int i;
+
+	/* find first triangle */
+	TRIANGLELIST_FOREACH(t, p1->adj_triangles)
+		for (i = 0; i < 3; i++)
+			if (t->e[i]->endp[0] != p1 && t->e[i]->endp[1] != p1) /* opposite edge */
+				if (LINES_INTERSECT(p1, p2, t->e[i]->endp[0], t->e[i]->endp[1])) {
+					adj_e = t->e[i];
+					next_t = adj_e->adj_t[0] != t ? adj_e->adj_t[0] : adj_e->adj_t[1];
+					triangles = trianglelist_prepend(triangles, &t);
+					goto first_triangle_found;
+				}
+	TRIANGLELIST_FOREACH_END();
+
+first_triangle_found:
+	assert(next_t != NULL);
+
+	/* follow the path */
+	while (next_t->p[0] != p2 && next_t->p[1] != p2 && next_t->p[2] != p2) {
+		triangle_t *t = next_t;
+		for (i = 0; i < 3; i++)
+			if (t->e[i] != adj_e && LINES_INTERSECT(p1, p2, t->e[i]->endp[0], t->e[i]->endp[1])) {
+				adj_e = t->e[i];
+				next_t = adj_e->adj_t[0] != t ? adj_e->adj_t[0] : adj_e->adj_t[1];
+				triangles = trianglelist_prepend(triangles, &t);
+				break;
+			}
+	}
+
+	triangles = trianglelist_prepend(triangles, &next_t);
+	return triangles;
+}
+
+static void insert_constrained_edge_(cdt_t *cdt, point_t *p1, point_t *p2, pointlist_node_t **left_poly, pointlist_node_t **right_poly)
+{
+	edge_t *e;
+	triangle_t *t;
+	trianglelist_node_t *triangles;
+	pointlist_node_t *left_polygon = NULL, *right_polygon = NULL;
+	int i;
+
+	/* find intersecting edges and remove them */
+	triangles = triangles_intersecting_line(p1, p2);
+	t = triangles->item;
+	triangles = trianglelist_remove_front(triangles);
+	left_polygon = pointlist_prepend(left_polygon, &p2);	/* triangle list begins from p2 */
+	right_polygon = pointlist_prepend(right_polygon, &p2);
+	for (i = 0; i < 3; i++)
+		if (t->p[i] != p2) {
+			if (ORIENT_CCW(p1, p2, t->p[i]))
+				left_polygon = pointlist_prepend(left_polygon, &t->p[i]);
+			else
+				right_polygon = pointlist_prepend(right_polygon, &t->p[i]);
+		}
+
+	while (triangles->next != NULL) {
+		t = triangles->item;
+		triangles = trianglelist_remove_front(triangles);
+		e = get_edge_from_points(left_polygon->item, right_polygon->item);
+		for (i = 0; i < 3; i++)
+			if (t->p[i] != left_polygon->item && t->p[i] != right_polygon->item) {
+				if (ORIENT_CCW(p1, p2, t->p[i]))
+					left_polygon = pointlist_prepend(left_polygon, &t->p[i]);
+				else
+					right_polygon = pointlist_prepend(right_polygon, &t->p[i]);
+				break;
+			}
+		remove_edge(cdt, e);
+	}
+	triangles = trianglelist_remove_front(triangles);
+	remove_edge(cdt, get_edge_from_points(left_polygon->item, right_polygon->item));
+	left_polygon = pointlist_prepend(left_polygon, &p1);
+	right_polygon = pointlist_prepend(right_polygon, &p1);
+	*left_poly = left_polygon;
+	*right_poly = right_polygon;
+}
+
+edge_t *cdt_insert_constrained_edge(cdt_t *cdt, point_t *p1, point_t *p2)
+{
+	edge_t *e;
+	pointlist_node_t *left_polygon, *right_polygon;
+
+	/* edge already exists - just constrain it */
+	e = get_edge_from_points(p1, p2);
+	if (e != NULL) {
+		e->is_constrained = 1;
+		return e;
+	}
+
+	insert_constrained_edge_(cdt, p1, p2, &left_polygon, &right_polygon);
+
+	/* add new edge */
+	e = new_edge(cdt, p1, p2, 1);
+
+	/* triangulate the created polygons */
+	triangulate_polygon(cdt, left_polygon);
+	triangulate_polygon(cdt, right_polygon);
+
+	return e;
+}
+
+void cdt_delete_constrained_edge(cdt_t *cdt, edge_t *edge)
+{
+	pointlist_node_t *polygon = NULL;
+	edgelist_node_t *border_edges = NULL;
+	edgelist_node_t *constrained_edges_within_scope = NULL;
+	pointlist_node_t *isolated_points = NULL;
+	int i, j;
+
+	assert(edge->is_constrained);
+
+	/* initial polygon */
+	polygon = pointlist_prepend(polygon, &edge->endp[0]);
+	polygon = pointlist_prepend(polygon, &edge->endp[1]);
+	for (i = 0; i < 2; i++) {
+		triangle_t *t = edge->adj_t[i];
+		for(j = 0; j < 3; j++) {
+			if (t->p[j] != edge->endp[0] && t->p[j] != edge->endp[1])
+				polygon = pointlist_prepend(polygon, &edge->adj_t[i]->p[j]);
+			if (t->e[j] != edge)
+				border_edges = edgelist_prepend(border_edges, &t->e[j]);
+		}
+	}
+	remove_edge(cdt, edge);
+
+	/* find invalid edges and remove them */
+	EDGELIST_FOREACH(e, border_edges)
+		triangle_t *t = e->adj_t[0] != NULL ? e->adj_t[0] : e->adj_t[1];
+		edgelist_node_t *e_node = _node_;
+		int invalid_edge = 0;
+		if (t != NULL) {
+			POINTLIST_FOREACH(p, polygon)
+				if (p != t->p[0] && p != t->p[1] && p != t->p[2] && is_point_in_circumcircle(p, t)) {
+					for (i = 0; i < 3; i++) {
+						if (t->p[i] != e->endp[0] && t->p[i] != e->endp[1])
+							polygon = pointlist_prepend(polygon, &t->p[i]);
+						if (t->e[i] != e)
+							border_edges = edgelist_prepend(border_edges, &t->e[i]);
+					}
+					if (e->is_constrained) {	/* don't remove constrained edges - only detach them */
+						constrained_edges_within_scope = edgelist_prepend(constrained_edges_within_scope, &e);
+						for (i = 0; i < 2; i++)
+							e->endp[i]->adj_edges = edgelist_remove_item(e->endp[i]->adj_edges, &e);
+						remove_triangle(cdt, t);
+					}
+					else
+						remove_edge(cdt, e);
+					border_edges = edgelist_remove(border_edges, e_node);
+					invalid_edge = 1;
+					break;
+				}
+			POINTLIST_FOREACH_END();
+		}
+		else { /* triangle beyond a border edge was removed earlier - the edge should be removed too */
+			point_t *endp[2];
+			endp[0] = e->endp[0];
+			endp[1] = e->endp[1];
+			for (i = 0; i < 2; i++) /* check if the edge is not bbox of the triangulation */
+				if ((e->endp[i]->pos.x == cdt->bbox_tl.x && e->endp[i]->pos.y == cdt->bbox_tl.y)
+						|| (e->endp[i]->pos.x == cdt->bbox_br.x && e->endp[i]->pos.y == cdt->bbox_br.y))
+					goto next_edge;
+			border_edges = edgelist_remove(border_edges, e_node);
+			border_edges = edgelist_remove_item(border_edges, &e);
+			invalid_edge = 1; /* TODO: the loop doesn't have to start from the beginning, but border removal should preserve current node */
+			if (e->is_constrained) {
+				constrained_edges_within_scope = edgelist_prepend(constrained_edges_within_scope, &e);
+				for (i = 0; i < 2; i++)
+					endp[i]->adj_edges = edgelist_remove_item(endp[i]->adj_edges, &e); /* detach the edge */
+			}
+			else
+				remove_edge(cdt, e);
+			for (i = 0; i < 2; i++) {
+				if (endp[i]->adj_edges == NULL) { /* isolated point */
+					polygon = pointlist_remove_item(polygon, &endp[i]);
+					isolated_points = pointlist_prepend(isolated_points, &endp[i]);
+				}
+			}
+		}
+		if (invalid_edge) {
+			_node_ = border_edges;	/* start from the beginning (new point to check was added) */
+			continue;
+		}
+next_edge:
+	EDGELIST_FOREACH_END();
+	pointlist_free(polygon);
+
+	/* triangulate the resultant polygon */
+	polygon = order_edges_adjacently(border_edges);
+	triangulate_polygon(cdt, polygon);
+
+	/* reattach isolated points and constrained edges */
+	POINTLIST_FOREACH(p, isolated_points)
+		insert_point_(cdt, p);
+	POINTLIST_FOREACH_END();
+	pointlist_free(isolated_points);
+	EDGELIST_FOREACH(e, constrained_edges_within_scope)
+		pointlist_node_t *left_polygon, *right_polygon;
+		insert_constrained_edge_(cdt, e->endp[0], e->endp[1], &left_polygon, &right_polygon);
+		for (i = 0; i < 2; i++)
+			e->endp[i]->adj_edges = edgelist_prepend(e->endp[i]->adj_edges, &e); /* reattach the edge to the endpoints */
+		triangulate_polygon(cdt, left_polygon);
+		triangulate_polygon(cdt, right_polygon);
+	EDGELIST_FOREACH_END();
+	edgelist_free(constrained_edges_within_scope);
+}
+
+static void circumcircle(const triangle_t *t, pos_t *p, int *r)
+{
+	double x1 = t->p[0]->pos.x, x2 = t->p[1]->pos.x, x3 = t->p[2]->pos.x;
+	double y1 = t->p[0]->pos.y, y2 = t->p[1]->pos.y, y3 = t->p[2]->pos.y;
+	double d1, d2, d3, d4;
+	double n1, n2, n3;
+
+	n1 = (x1 * x1) + (y1 * y1);
+	n2 = (x2 * x2) + (y2 * y2);
+	n3 = (x3 * x3) + (y3 * y3);
+
+	d1 = (x1 * y2) + (x2 * y3) + (x3 * y1) - (x3 * y2) - (x1 * y3) - (x2 * y1);
+	d2 = (n1 * y2) + (n2 * y3) + (n3 * y1) - (n3 * y2) - (n1 * y3) - (n2 * y1);
+	d3 = (n1 * x2) + (n2 * x3) + (n3 * x1) - (n3 * x2) - (n1 * x3) - (n2 * x1);
+	d4 = (n1 * x2 * y3) + (n2 * x3 * y1) + (n3 * x1 * y2) - (n3 * x2 * y1) - (n1 * x3 * y2) - (n2 * x1 * y3);
+
+	p->x = d2/(2*d1);
+	p->y = -d3/(2*d1);
+	*r = sqrt((d2*d2)/(d1*d1) + (d3*d3)/(d1*d1) + 4*d4/d1)/2;
+}
+
+void cdt_dump_animator(cdt_t *cdt, int show_circles, pointlist_node_t *point_violations, trianglelist_node_t *triangle_violations)
+{
+	int last_c = 0;
+	int triangle_num = 0;
+	printf("frame\n");
+	printf("scale 0.9\n");
+	printf("viewport %f %f - %f %f\n", (double)cdt->bbox_tl.x - 1.0, (double)cdt->bbox_tl.y - 1.0, (double)cdt->bbox_br.x + 1.0, (double)cdt->bbox_br.y  + 1.0);
+
+	VTEDGE_FOREACH(edge, &cdt->edges)
+		if(last_c != edge->is_constrained) {
+			printf("color %s\n", edge->is_constrained ? "red" : "black");
+			printf("thick %s\n", edge->is_constrained ? "2" : "1");
+			last_c = edge->is_constrained;
+		}
+		printf("line %d %d %d %d\n", edge->endp[0]->pos.x, edge->endp[0]->pos.y, edge->endp[1]->pos.x, edge->endp[1]->pos.y);
+	VTEDGE_FOREACH_END();
+
+	printf("color green\n");
+	VTTRIANGLE_FOREACH(triangle, &cdt->triangles)
+		pos_t pos;
+		int r;
+		if (show_circles) {
+			circumcircle(triangle, &pos, &r);
+			printf("circle %d %d %d 50\n", pos.x, pos.y, r);
+		}
+		triangle_num++;
+	VTTRIANGLE_FOREACH_END();
+
+	printf("color red\n");
+	if (point_violations) {
+		POINTLIST_FOREACH(p, point_violations)
+			printf("circle %d %d 50 10\n", p->pos.x, p->pos.y);
+		POINTLIST_FOREACH_END();
+	}
+
+	printf("color darkred\n");
+	if (triangle_violations) {
+		TRIANGLELIST_FOREACH(t, triangle_violations)
+			pos_t pos;
+			int r;
+			circumcircle(t, &pos, &r);
+			printf("circle %d %d %d 50\n", pos.x, pos.y, r);
+		TRIANGLELIST_FOREACH_END();
+	}
+
+	printf("flush\n");
+	fprintf(stderr, "triangle num: %d\n", triangle_num);
+}
+
+int cdt_check_delaunay(cdt_t *cdt, pointlist_node_t **point_violations, trianglelist_node_t **triangle_violations)
+{
+	int delaunay = 1;
+	VTTRIANGLE_FOREACH(triangle, &cdt->triangles)
+		VTPOINT_FOREACH(point, &cdt->points)
+			if (is_point_in_circumcircle(point, triangle)
+					&& point != triangle->p[0]
+					&& point != triangle->p[1]
+					&& point != triangle->p[2]) {
+				delaunay = 0;
+				if (point_violations != NULL)
+					*point_violations = pointlist_prepend(*point_violations, &point);
+				if (triangle_violations != NULL)
+					*triangle_violations = trianglelist_prepend(*triangle_violations, &triangle);
+			}
+		VTPOINT_FOREACH_END();
+	VTTRIANGLE_FOREACH_END();
+	return delaunay;
+}
Index: tags/2.0.1/src_plugins/sketch_route/cdt/cdt.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/cdt.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/cdt.h	(revision 18980)
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (C) 2018 Wojciech Krutnik
+ *
+ *  Constrained Delaunay Triangulation using incremental algorithm, as described in:
+ *    Yizhi Lu and Wayne Wei-Ming Dai, "A numerical stable algorithm for constructing
+ *    constrained Delaunay triangulation and application to multichip module layout,"
+ *    China., 1991 International Conference on Circuits and Systems, Shenzhen, 1991,
+ *    pp. 644-647 vol.2.
+ */
+
+#ifndef CDT_H
+#define CDT_H
+
+#include "typedefs.h"
+#include "point.h"
+#include "edge.h"
+#include "triangle.h"
+
+
+typedef struct {
+	vtpoint_t points;
+	vtedge_t edges;
+	vttriangle_t triangles;
+
+	pos_t bbox_tl;
+	pos_t bbox_br;
+} cdt_t;
+
+
+void cdt_init(cdt_t *cdt, coord_t bbox_x1, coord_t bbox_y1, coord_t bbox_x2, coord_t bbox_y2);
+void cdt_free(cdt_t *cdt);
+
+point_t *cdt_insert_point(cdt_t *cdt, coord_t x, coord_t y);
+void cdt_delete_point(cdt_t *cdt, point_t *p);	/* any edge adjecent to this point cannot be constrained */
+edge_t *cdt_insert_constrained_edge(cdt_t *cdt, point_t *p1, point_t *p2);
+void cdt_delete_constrained_edge(cdt_t *cdt, edge_t *edge);
+
+int cdt_check_delaunay(cdt_t *cdt, pointlist_node_t **point_violations, trianglelist_node_t **triangle_violations);
+void cdt_dump_animator(cdt_t *cdt, int show_circles, pointlist_node_t *point_violations, trianglelist_node_t *triangle_violations);
+
+
+edge_t *get_edge_from_points(point_t *p1, point_t *p2);
+
+#define ORIENT_CCW(a, b, c) (orientation(a, b, c) < 0)
+#define ORIENT_CW(a, b, c) (orientation(a, b, c) > 0)
+#define ORIENT(dir, a, b, c) ((dir) ? ORIENT_CW(a, b, c) : ORIENT_CCW(a, b, c))
+/* TODO: check epsilon for collinear case? */
+#define ORIENT_COLLINEAR(a, b, c) (orientation(a, b, c) == 0)
+#define ORIENT_CCW_CL(a, b, c) (orientation(a, b, c) <= 0)
+static inline double orientation(point_t *p1, point_t *p2, point_t *p3)
+{
+	return ((double)p2->pos.y - (double)p1->pos.y) * ((double)p3->pos.x - (double)p2->pos.x)
+				 - ((double)p2->pos.x - (double)p1->pos.x) * ((double)p3->pos.y - (double)p2->pos.y);
+}
+
+#define LINES_INTERSECT(p1, q1, p2, q2) \
+	(ORIENT_CCW(p1, q1, p2) != ORIENT_CCW(p1, q1, q2) && ORIENT_CCW(p2, q2, p1) != ORIENT_CCW(p2, q2, q1))
+
+#define EDGE_OTHER_POINT(edge, point) \
+	((edge)->endp[0] != (point) ? (edge)->endp[0] : (edge)->endp[1])
+
+#define DIST2(p, q) \
+	(((double)((p)->pos.x - (q)->pos.x) * (double)((p)->pos.x - (q)->pos.x)) \
+	 + ((double)((p)->pos.y - (q)->pos.y) * (double)((p)->pos.y - (q)->pos.y)))
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/cdt/cdt_test.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/cdt_test.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/cdt_test.c	(revision 18980)
@@ -0,0 +1,222 @@
+#include <stdio.h>
+#include <time.h>
+#include "cdt.h"
+
+#define ORIENT_CCW(a, b, c) (orientation(a, b, c) < 0)
+#define ORIENT_CW(a, b, c) (orientation(a, b, c) > 0)
+/* TODO: check epsilon for collinear case? */
+#define ORIENT_COLLINEAR(a, b, c) (orientation(a, b, c) == 0)
+#define ORIENT_CCW_CL(a, b, c) (orientation(a, b, c) <= 0)
+static double orientation(point_t *p1, point_t *p2, point_t *p3)
+{
+	return ((double)p2->pos.y - (double)p1->pos.y) * ((double)p3->pos.x - (double)p2->pos.x)
+				 - ((double)p2->pos.x - (double)p1->pos.x) * ((double)p3->pos.y - (double)p2->pos.y);
+}
+#define LINES_INTERSECT(p1, q1, p2, q2) \
+	(ORIENT_CCW(p1, q1, p2) != ORIENT_CCW(p1, q1, q2) && ORIENT_CCW(p2, q2, p1) != ORIENT_CCW(p2, q2, q1))
+
+cdt_t cdt;
+
+int main(void)
+{
+	point_t *p, *p1, *p2, *pd[1000];
+	edge_t *e, *ed[500];
+	int i, j, e_num;
+	clock_t t;
+	pointlist_node_t *p_violations = NULL;
+
+	//cdt_init(&cdt, 1000, 1000, 5000, 5000);
+	cdt_init(&cdt, 0, 0, 100000, 100000);
+
+	/*
+	cdt_insert_point(&cdt, 2500, 3000);
+	cdt_insert_point(&cdt, 2600, 3000);
+	cdt_insert_point(&cdt, 2700, 3000);
+	cdt_insert_point(&cdt, 2800, 3000);
+	cdt_insert_point(&cdt, 2900, 3000);
+	cdt_insert_point(&cdt, 3000, 3000);
+	cdt_insert_point(&cdt, 3100, 3000);
+	cdt_insert_point(&cdt, 3200, 3000);
+	cdt_insert_point(&cdt, 3300, 3000);
+	cdt_insert_point(&cdt, 2800, 4800);
+	*/
+
+	/*
+	cdt_insert_point(&cdt, 2700, 2700);
+	cdt_insert_point(&cdt, 2400, 2400);
+	cdt_insert_point(&cdt, 2400, 3000);
+
+	cdt_insert_point(&cdt, 3400, 2700);
+	cdt_insert_point(&cdt, 3700, 2400);
+	cdt_insert_point(&cdt, 3700, 3000);
+
+	cdt_insert_point(&cdt, 2900, 2700);
+	cdt_insert_point(&cdt, 3000, 2700);
+	cdt_insert_point(&cdt, 3100, 2700);
+	cdt_insert_point(&cdt, 3200, 2700);
+	*/
+
+	/*
+	srand(time(NULL));
+	t = clock();
+	for (i = 0; i < 1000; i++) {
+		cdt_insert_point(&cdt, rand()%99999 + 1, rand()%99999 + 1);
+	}
+	t = clock() - t;
+	fprintf(stderr, "Triangulation time: %f\n", ((float)t)/CLOCKS_PER_SEC);
+	*/
+
+	/* octagon */
+	/*
+	cdt_insert_point(&cdt, 4000, 3000);
+	cdt_insert_point(&cdt, 3700, 3700);
+	cdt_insert_point(&cdt, 3000, 4000);
+	cdt_insert_point(&cdt, 2300, 3700);
+	cdt_insert_point(&cdt, 2000, 3000);
+	cdt_insert_point(&cdt, 2300, 2300);
+	cdt_insert_point(&cdt, 3000, 2000);
+	cdt_insert_point(&cdt, 3700, 2300);
+
+	p = cdt_insert_point(&cdt, 3000, 3000);
+	cdt_delete_point(&cdt, p);
+	*/
+
+	/* concave poly */
+	/*
+	cdt_insert_point(&cdt, 2000, 4000);
+	cdt_insert_point(&cdt, 3000, 3500);
+	cdt_insert_point(&cdt, 4000, 4000);
+	cdt_insert_point(&cdt, 4000, 2000);
+	cdt_insert_point(&cdt, 2000, 2000);
+
+	p = cdt_insert_point(&cdt, 3000, 3000);
+	cdt_delete_point(&cdt, p);
+	*/
+
+	/* constrained edge */
+	/*
+	p1 = cdt_insert_point(&cdt, 1500, 3000);
+	cdt_insert_point(&cdt, 2000, 3500);
+	cdt_insert_point(&cdt, 2500, 2500);
+	cdt_insert_point(&cdt, 3000, 3500);
+	cdt_insert_point(&cdt, 3500, 2500);
+	cdt_insert_point(&cdt, 4000, 3500);
+	p2 = cdt_insert_point(&cdt, 4500, 3000);
+
+	e = cdt_insert_constrained_edge(&cdt, p1, p2);
+	cdt_delete_constrained_edge(&cdt, e);
+	*/
+
+	/* constrained edge 2 */
+	/*
+	p1 = cdt_insert_point(&cdt, 1500, 3800);
+	cdt_insert_point(&cdt, 2700, 3000);
+	cdt_insert_point(&cdt, 2800, 3000);
+	cdt_insert_point(&cdt, 2900, 3000);
+	cdt_insert_point(&cdt, 3000, 3000);
+	cdt_insert_point(&cdt, 3100, 3000);
+	cdt_insert_point(&cdt, 3200, 3000);
+	cdt_insert_point(&cdt, 3300, 3000);
+	p2 = cdt_insert_point(&cdt, 4500, 3800);
+	cdt_insert_point(&cdt, 3000, 4800);
+
+	e = cdt_insert_constrained_edge(&cdt, p1, p2);
+	*/
+
+	/*
+	srand(time(NULL));
+	for (i = 0; i < 1000; i++) {
+		cdt_insert_point(&cdt, rand()%99999 + 1, rand()%99999 + 1);
+		pd[i] = cdt_insert_point(&cdt, rand()%99999 + 1, rand()%99999 + 1);
+	}
+	for (i = 0; i < 1000; i++) {
+		cdt_delete_point(&cdt, pd[i]);
+	}
+	*/
+
+	/* tricky case for triangulate_polygon */
+	/*
+	p = cdt_insert_point(&cdt, 98347, 51060);
+	cdt_insert_point(&cdt, 92086, 47852);
+	cdt_insert_point(&cdt, 95806, 44000);
+	cdt_insert_point(&cdt, 95030, 41242);
+	cdt_insert_point(&cdt, 94644, 55629);
+	cdt_insert_point(&cdt, 94000, 45300);
+
+	cdt_delete_point(&cdt, p);
+	*/
+
+	/* delete constrained edge */
+	/*
+	p1 = cdt_insert_point(&cdt, 1500, 3000);
+	cdt_insert_point(&cdt, 2000, 3500);
+	cdt_insert_point(&cdt, 1900, 2500);
+	cdt_insert_point(&cdt, 2400, 2500);
+
+	cdt_insert_point(&cdt, 2800, 3500);
+	cdt_insert_point(&cdt, 3000, 3500);
+	cdt_insert_point(&cdt, 3200, 3500);
+
+	cdt_insert_point(&cdt, 3600, 2500);
+	cdt_insert_point(&cdt, 4100, 2500);
+	cdt_insert_point(&cdt, 4000, 3500);
+	p2 = cdt_insert_point(&cdt, 4500, 3000);
+
+	e = cdt_insert_constrained_edge(&cdt, p1, p2);
+	cdt_delete_constrained_edge(&cdt, e);
+	*/
+
+	/* delete 2 constrained edges */
+	/*
+	p1 = cdt_insert_point(&cdt, 2400, 1500);
+	cdt_insert_point(&cdt, 2200, 3500);
+	cdt_insert_point(&cdt, 2200, 2000);
+	p2 = cdt_insert_point(&cdt, 2400, 4000);
+	ed[0] = cdt_insert_constrained_edge(&cdt, p1, p2);
+
+	p1 = cdt_insert_point(&cdt, 2500, 3000);
+	cdt_insert_point(&cdt, 3000, 2800);
+	cdt_insert_point(&cdt, 3500, 2800);
+	cdt_insert_point(&cdt, 2800, 3200);
+	cdt_insert_point(&cdt, 3500, 3200);
+	p2 = cdt_insert_point(&cdt, 4500, 3000);
+	ed[1] = cdt_insert_constrained_edge(&cdt, p1, p2);
+
+	p2 = cdt_insert_point(&cdt, 3500, 3500);
+	ed[2] = cdt_insert_constrained_edge(&cdt, p1, p2);
+
+	cdt_delete_constrained_edge(&cdt, ed[0]);
+	cdt_delete_constrained_edge(&cdt, ed[1]);
+	cdt_delete_constrained_edge(&cdt, ed[2]);
+	*/
+
+	srand(time(NULL));
+	e_num = 0;
+	for (i = 0; i < 100; i++) {
+		int isect = 0;
+		p1 = cdt_insert_point(&cdt, rand()%99999 + 1, rand()%99999 + 1);
+		p2 = cdt_insert_point(&cdt, rand()%99999 + 1, rand()%99999 + 1);
+		for (j = 0; j < e_num; j++)
+			if (LINES_INTERSECT(p1, p2, ed[j]->endp[0], ed[j]->endp[1])) {
+				isect = 1;
+				break;
+			}
+		if (!isect) {
+			ed[e_num] = cdt_insert_constrained_edge(&cdt, p1, p2);
+			e_num++;
+		}
+	}
+	for (i = 0; i < e_num; i++) {
+		fprintf(stderr, "deleting edge (%d, %d) - (%d, %d)\n", ed[i]->endp[0]->pos.x, ed[i]->endp[0]->pos.y, ed[i]->endp[1]->pos.x, ed[i]->endp[1]->pos.y);
+		cdt_delete_constrained_edge(&cdt, ed[i]);
+	}
+
+
+	if (cdt_check_delaunay(&cdt, &p_violations, NULL))
+		fprintf(stderr, "delaunay\n");
+	else
+		fprintf(stderr, "not delaunay\n");
+	cdt_dump_animator(&cdt, 0, p_violations, NULL);
+	pointlist_free(p_violations);
+	cdt_free(&cdt);
+}
Index: tags/2.0.1/src_plugins/sketch_route/cdt/edge.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/edge.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/edge.c	(revision 18980)
@@ -0,0 +1,22 @@
+#define LST_DONT_UNDEF
+#define GVT_DONT_UNDEF
+#include "edge.h"
+
+static int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return *a == *b;
+}
+
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  *elem = calloc(1, sizeof(**elem));
+  return *elem == NULL;
+}
+
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  free(*elem);
+}
+
+#include "list/list.c"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/cdt/edge.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/edge.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/edge.h	(revision 18980)
@@ -0,0 +1,72 @@
+#ifndef EDGE_H
+#define EDGE_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "typedefs.h"
+
+struct edge_s {
+	point_t *endp[2];
+	triangle_t *adj_t[2];
+
+	int is_constrained;
+	void *data;
+};
+
+typedef edge_t* edge_ptr_t;
+
+
+/* List */
+#define LST(x) edgelist_ ## x
+#define LST_ITEM_T edge_ptr_t
+#define LST_DONT_TYPEDEF_NODE
+
+#include "list/list.h"
+
+#ifndef LST_DONT_UNDEF
+	#undef LST
+	#undef LST_ITEM_T
+	#undef LST_DONT_TYPEDEF_NODE
+#endif
+
+#define EDGELIST_FOREACH(_loop_item_, _list_) do { \
+	edgelist_node_t *_node_ = _list_; \
+	while (_node_ != NULL) { \
+		edge_t *_loop_item_ = _node_->item;
+
+#define EDGELIST_FOREACH_END() \
+		_node_ = _node_->next; \
+	} \
+} while(0)
+
+
+/* Vector */
+#define GVT(x) vtedge_ ## x
+#define GVT_ELEM_TYPE edge_ptr_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+#define GVT_ELEM_CONSTRUCTOR
+#define GVT_ELEM_DESTRUCTOR
+#define GVT_ELEM_COPY
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+#include <genvector/genvector_undef.h>
+
+#define VTEDGE_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vtedge_len(_vt_); _i_++) { \
+		edge_t *_loop_item_ = (_vt_)->array[_i_];
+
+#define VTEDGE_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/cdt/list/list.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/list/list.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/list/list.c	(revision 18980)
@@ -0,0 +1,134 @@
+#include <stdlib.h>
+
+static LST(node_t) *LST(create)(LST_ITEM_T *item, LST(node_t) *next)
+{
+	LST(node_t) *new_node = (LST(node_t)*) malloc(sizeof(LST(node_t)));
+	new_node->item = *item;
+	new_node->next = next;
+	return new_node;
+}
+
+LST(node_t) *LST(prepend)(LST(node_t) *list, LST_ITEM_T *item)
+{
+	LST(node_t) *new_head = LST(create)(item, list);
+	return new_head;
+}
+
+LST(node_t) *LST(insert_after)(LST(node_t) *node, LST_ITEM_T *item)
+{
+	LST(node_t) *new_node;
+	if (node == NULL)
+		return NULL;
+	new_node = LST(create)(item, node->next);
+	node->next = new_node;
+	return new_node;
+}
+
+LST(node_t) *LST(insert_after_nth)(LST(node_t) *list, int n, LST_ITEM_T *item)
+{
+	return LST(insert_after)(LST(nth)(list, n), item);
+}
+
+LST(node_t) *LST(remove_front)(LST(node_t) *list)
+{
+	LST(node_t) *new_head;
+	if (list == NULL)
+		return NULL;
+	new_head = list->next;
+	free(list);
+	return new_head;
+}
+
+LST(node_t) *LST(remove)(LST(node_t) *list, LST(node_t) *node)
+{
+	LST(node_t) *prev_node;
+	if (list == NULL)
+		return NULL;
+	if (list == node)
+		return LST(remove_front)(list);
+  for (prev_node = list; prev_node->next != NULL; prev_node = prev_node->next) {
+		if (prev_node->next == node) {
+			prev_node->next = node->next;
+			free(node);
+			break;
+		}
+	}
+	return list;
+}
+
+LST(node_t) *LST(remove_item)(LST(node_t) *list, LST_ITEM_T *item)
+{
+	LST(node_t) *prev_node, *node;
+	if (list == NULL)
+		return NULL;
+	if (LST(compare_func)(&list->item, item))
+		return LST(remove_front)(list);
+  for (prev_node = list, node = prev_node->next; node != NULL; prev_node = prev_node->next, node = node->next) {
+		if (LST(compare_func)(&node->item, item)) {
+			prev_node->next = node->next;
+			free(node);
+			break;
+		}
+	}
+	return list;
+}
+
+LST(node_t) *LST(find)(LST(node_t) *list, LST_ITEM_T *item)
+{
+	LST(node_t) *node;
+  for (node = list; node != NULL; node = node->next) {
+		if (LST(compare_func)(&node->item, item)) {
+			return node;
+		}
+	}
+	return NULL;
+}
+
+LST(node_t) *LST(nth)(LST(node_t) *list, int n)
+{
+	int i;
+  for (i = 0; i < n && list != NULL; i++)
+		list = list->next;
+	return list;
+}
+
+LST(node_t) *LST(last)(LST(node_t) *list)
+{
+	if (list == NULL)
+		return NULL;
+	while (list->next != NULL)
+		list = list->next;
+	return list;
+}
+
+size_t LST(length)(LST(node_t) *list)
+{
+	size_t len = 0;
+	if (list == NULL)
+		return 0;
+	for (; list != NULL; list = list->next)
+		len++;
+	return len;
+}
+
+int LST(get_index)(LST(node_t) *list, LST(node_t) *node)
+{
+	int i;
+	if (list == NULL)
+		return -1;
+	for (i = 0; list != node && list != NULL; list = list->next)
+		i++;
+	if (list == NULL)
+		return -1;
+	return i;
+}
+
+void LST(free)(LST(node_t) *list)
+{
+	LST(node_t) *node, *next_node;
+	if (list == NULL)
+		return;
+  for (node = list, next_node = node->next; next_node != NULL; node = next_node, next_node = next_node->next)
+		free(node);
+	free(node);
+}
Index: tags/2.0.1/src_plugins/sketch_route/cdt/list/list.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/list/list.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/list/list.h	(revision 18980)
@@ -0,0 +1,24 @@
+
+struct LST(node_s) {
+	LST_ITEM_T item;
+	struct LST(node_s) *next;
+};
+
+#ifndef LST_DONT_TYPEDEF_NODE
+typedef struct LST(node_s) LST(node_t);
+#endif
+
+LST(node_t) *LST(prepend)(LST(node_t) *list, LST_ITEM_T *item);
+LST(node_t) *LST(insert_after)(LST(node_t) *node, LST_ITEM_T *item);
+LST(node_t) *LST(insert_after_nth)(LST(node_t) *list, int n, LST_ITEM_T *item);
+LST(node_t) *LST(remove_front)(LST(node_t) *list);
+LST(node_t) *LST(remove)(LST(node_t) *list, LST(node_t) *node);
+LST(node_t) *LST(remove_item)(LST(node_t) *list, LST_ITEM_T *item);
+LST(node_t) *LST(find)(LST(node_t) *list, LST_ITEM_T *item);
+LST(node_t) *LST(nth)(LST(node_t) *list, int n);
+LST(node_t) *LST(last)(LST(node_t) *list);
+
+size_t LST(length)(LST(node_t) *list);
+int LST(get_index)(LST(node_t) *list, LST(node_t) *node);
+
+void LST(free)(LST(node_t) *list);
Index: tags/2.0.1/src_plugins/sketch_route/cdt/list/testlist.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/list/testlist.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/list/testlist.c	(revision 18980)
@@ -0,0 +1,88 @@
+#include <stdio.h>
+
+typedef struct {
+	int x;
+	int y;
+} pos_t;
+
+#define LST(x) poslist_ ## x
+#define LST_ITEM_T pos_t
+int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return a->x == b->x && a->y == b->y;
+}
+#include "list.h"
+#include "list.c"
+#define POSLIST_FOREACH(loop_item, list) do { \
+  poslist_node_t *node = list; \
+  pos_t *loop_item; \
+  while (node != NULL) { \
+    loop_item = &node->item;
+
+#define POSLIST_FOREACH_END() \
+    node = node->next; \
+  } \
+} while(0)
+#undef LST
+#undef LST_ITEM_T
+
+#define LST(x) intlist_ ## x
+#define LST_ITEM_T int
+int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return *a == *b;
+}
+#include "list.h"
+#include "list.c"
+#define INTLIST_FOREACH(loop_item, list) do { \
+  intlist_node_t *node = list; \
+  int *loop_item; \
+  while (node != NULL) { \
+    loop_item = &node->item;
+
+#define INTLIST_FOREACH_END() \
+    node = node->next; \
+  } \
+} while(0)
+
+
+int main(void)
+{
+  poslist_node_t *list1 = NULL;
+  intlist_node_t *list2 = NULL;
+  intlist_node_t *list2_node = NULL;
+
+  pos_t p = {1, 2};
+  int i = 4;
+
+  list1 = poslist_prepend(list1, &p); p.x = 4; p.y = 5;
+  list1 = poslist_prepend(list1, &p); p.x = 8; p.y = 1;
+  list1 = poslist_prepend(list1, &p);
+
+  list2 = intlist_prepend(list2, &i); i = 1;
+  list2 = intlist_prepend(list2, &i); i = 5;
+  list2 = intlist_prepend(list2, &i);
+
+  i = 5;
+  list2 = intlist_remove_item(list2, &i);
+
+  //~ list2_node = list2->next;
+  //~ list2 = intlist_remove(list2, list2_node);
+
+  //~ list2 = intlist_remove_front(list2);
+  //~ list2 = intlist_remove_front(list2);
+  //~ list2 = intlist_remove_front(list2);
+  //~ list2 = intlist_remove_front(list2);
+  //~ list2 = intlist_remove_front(list2); i = 423;
+  //~ list2 = intlist_prepend(list2, &i);
+
+  printf("list1:\n");
+  POSLIST_FOREACH(pos, list1)
+    printf("%d, %d\n", pos->x, pos->y);
+  POSLIST_FOREACH_END();
+
+  printf("list2:\n");
+  INTLIST_FOREACH(num, list2)
+    printf("%d\n", *num);
+  INTLIST_FOREACH_END();
+}
Index: tags/2.0.1/src_plugins/sketch_route/cdt/point.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/point.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/point.c	(revision 18980)
@@ -0,0 +1,22 @@
+#define LST_DONT_UNDEF
+#define GVT_DONT_UNDEF
+#include "point.h"
+
+static int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return *a == *b;
+}
+
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  *elem = calloc(1, sizeof(**elem));
+  return *elem == NULL;
+}
+
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  free(*elem);
+}
+
+#include "list/list.c"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/cdt/point.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/point.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/point.h	(revision 18980)
@@ -0,0 +1,72 @@
+#ifndef POINT_H
+#define POINT_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "typedefs.h"
+
+struct point_s {
+	pos_t pos;
+	edgelist_node_t *adj_edges;
+	trianglelist_node_t *adj_triangles;
+
+	void *data;
+};
+
+typedef point_t* point_ptr_t;
+
+
+/* List */
+#define LST(x) pointlist_ ## x
+#define LST_ITEM_T point_ptr_t
+#define LST_DONT_TYPEDEF_NODE
+
+#include "list/list.h"
+
+#ifndef LST_DONT_UNDEF
+	#undef LST
+	#undef LST_ITEM_T
+	#undef LST_DONT_TYPEDEF_NODE
+#endif
+
+#define POINTLIST_FOREACH(_loop_item_, _list_) do { \
+	pointlist_node_t *_node_ = _list_; \
+	while (_node_ != NULL) { \
+		point_t *_loop_item_ = _node_->item;
+
+#define POINTLIST_FOREACH_END() \
+		_node_ = _node_->next; \
+	} \
+} while(0)
+
+
+/* Vector */
+#define GVT(x) vtpoint_ ## x
+#define GVT_ELEM_TYPE point_ptr_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+#define GVT_ELEM_CONSTRUCTOR
+#define GVT_ELEM_DESTRUCTOR
+#define GVT_ELEM_COPY
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+#include <genvector/genvector_undef.h>
+
+#define VTPOINT_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vtpoint_len(_vt_); _i_++) { \
+		point_t *_loop_item_ = (_vt_)->array[_i_];
+
+#define VTPOINT_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/cdt/triangle.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/triangle.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/triangle.c	(revision 18980)
@@ -0,0 +1,22 @@
+#define LST_DONT_UNDEF
+#define GVT_DONT_UNDEF
+#include "triangle.h"
+
+static int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return *a == *b;
+}
+
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  *elem = calloc(1, sizeof(**elem));
+  return *elem == NULL;
+}
+
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  free(*elem);
+}
+
+#include "list/list.c"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/cdt/triangle.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/triangle.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/triangle.h	(revision 18980)
@@ -0,0 +1,70 @@
+#ifndef TRIANGLE_H
+#define TRIANGLE_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "typedefs.h"
+
+struct triangle_s {
+	point_t *p[3];
+	edge_t *e[3];
+  triangle_t *adj_t[3];
+};
+
+typedef triangle_t* triangle_ptr_t;
+
+
+/* List */
+#define LST(x) trianglelist_ ## x
+#define LST_ITEM_T triangle_ptr_t
+#define LST_DONT_TYPEDEF_NODE
+
+#include "list/list.h"
+
+#ifndef LST_DONT_UNDEF
+	#undef LST
+	#undef LST_ITEM_T
+	#undef LST_DONT_TYPEDEF_NODE
+#endif
+
+#define TRIANGLELIST_FOREACH(_loop_item_, _list_) do { \
+	trianglelist_node_t *_node_ = _list_; \
+	while (_node_ != NULL) { \
+		triangle_t *_loop_item_ = _node_->item;
+
+#define TRIANGLELIST_FOREACH_END() \
+		_node_ = _node_->next; \
+	} \
+} while(0)
+
+
+/* Vector */
+#define GVT(x) vttriangle_ ## x
+#define GVT_ELEM_TYPE triangle_ptr_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+#define GVT_ELEM_CONSTRUCTOR
+#define GVT_ELEM_DESTRUCTOR
+#define GVT_ELEM_COPY
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+#include <genvector/genvector_undef.h>
+
+#define VTTRIANGLE_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vttriangle_len(_vt_); _i_++) { \
+		triangle_t *_loop_item_ = (_vt_)->array[_i_];
+
+#define VTTRIANGLE_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/cdt/typedefs.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/cdt/typedefs.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/cdt/typedefs.h	(revision 18980)
@@ -0,0 +1,19 @@
+#ifndef TYPEDEFS_H
+#define TYPEDEFS_H
+
+typedef int coord_t;
+
+typedef struct {
+	coord_t x;
+	coord_t y;
+} pos_t;
+
+typedef struct point_s point_t;
+typedef struct edge_s edge_t;
+typedef struct triangle_s triangle_t;
+
+typedef struct pointlist_node_s pointlist_node_t;
+typedef struct edgelist_node_s edgelist_node_t;
+typedef struct trianglelist_node_s trianglelist_node_t;
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/ewire.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/ewire.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/ewire.c	(revision 18980)
@@ -0,0 +1,71 @@
+#include <assert.h>
+
+#define GVT_DONT_UNDEF
+#include "ewire.h"
+
+void ewire_init(ewire_t *ew)
+{
+	vtewire_point_init(&ew->points);
+}
+
+void ewire_uninit(ewire_t *ew)
+{
+	vtewire_point_uninit(&ew->points);
+}
+
+void ewire_append_point(ewire_t *ew, spoke_t *sp, side_t side, int sp_slot, wirelist_node_t *w_node)
+{
+	ewire_insert_point(ew, ew->points.used-1, sp, side, sp_slot, w_node);
+}
+
+void ewire_insert_point(ewire_t *ew, int after_i, spoke_t *sp, side_t side, int sp_slot, wirelist_node_t *w_node)
+{
+	ewire_point_t *ewp = vtewire_point_alloc_append(&ew->points, 1);
+	ewp->sp = sp;
+	ewp->side = side;
+	ewp->sp_slot = sp_slot;
+	ewp->w_node = w_node;
+}
+
+void ewire_remove_point(ewire_t *ew, int i)
+{
+	vtewire_point_remove(&ew->points, i, 1);
+}
+
+ewire_point_t *ewire_get_point(ewire_t *ew, int i)
+{
+	assert(i < vtewire_point_len(&ew->points));
+	return &ew->points.array[i];
+}
+
+ewire_point_t *ewire_get_point_at_slot(ewire_t *ew, spoke_t *sp, int slot_num)
+{
+  int i;
+  for (i = 0; i < vtewire_point_len(&ew->points); i++) {
+    if (ew->points.array[i].sp == sp && ew->points.array[i].sp_slot == slot_num)
+      return &ew->points.array[i];
+  }
+  return NULL;
+}
+
+size_t ewire_length(ewire_t *ew)
+{
+	return vtewire_point_len(&ew->points);
+}
+
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  *elem = malloc(sizeof(**elem));
+  if (*elem == NULL)
+    return 1;
+  ewire_init(*elem);
+  return 0;
+}
+
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  ewire_uninit(*elem);
+  free(*elem);
+}
+
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/ewire.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/ewire.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/ewire.h	(revision 18980)
@@ -0,0 +1,64 @@
+#ifndef EWIRE_H
+#define EWIRE_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "sktypedefs.h"
+#ifdef GVT_DONT_UNDEF
+	#undef GVT_DONT_UNDEF
+	#include "ewire_point.h"
+	#define GVT_DONT_UNDEF
+#else
+	#include "ewire_point.h"
+#endif
+
+typedef struct {
+	vtewire_point_t points;
+	wire_t *wire;
+} ewire_t;
+
+typedef ewire_t* ewire_ptr_t;
+
+void ewire_init(ewire_t *ew);
+void ewire_uninit(ewire_t *ew);
+void ewire_append_point(ewire_t *ew, spoke_t *sp, side_t side, int sp_slot, wirelist_node_t *w_node);
+void ewire_insert_point(ewire_t *ew, int after_i, spoke_t *sp, side_t side, int sp_slot, wirelist_node_t *w_node);
+void ewire_remove_point(ewire_t *ew, int i);
+
+ewire_point_t *ewire_get_point(ewire_t *ew, int i);
+ewire_point_t *ewire_get_point_at_slot(ewire_t *ew, spoke_t *sp, int slot_num);
+
+size_t ewire_length(ewire_t *ew);
+
+
+/* ewire ptr Vector */
+#define GVT(x) vtewire_ ## x
+#define GVT_ELEM_TYPE ewire_ptr_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+#define GVT_ELEM_CONSTRUCTOR
+#define GVT_ELEM_DESTRUCTOR
+#define GVT_ELEM_COPY
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+#include <genvector/genvector_undef.h>
+
+#define VTEWIRE_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vtewire_len(_vt_); _i_++) { \
+		ewire_t *_loop_item_ = (_vt_)->array[_i_];
+
+#define VTEWIRE_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/ewire_point.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/ewire_point.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/ewire_point.c	(revision 18980)
@@ -0,0 +1,4 @@
+#define GVT_DONT_UNDEF
+#include "ewire_point.h"
+
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/ewire_point.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/ewire_point.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/ewire_point.h	(revision 18980)
@@ -0,0 +1,40 @@
+#ifndef EWIRE_POINT_H
+#define EWIRE_POINT_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "sktypedefs.h"
+
+typedef struct{
+	spoke_t *sp; /* set this to cdt point in case of terminal (side = SIDE_TERM) */
+	side_t side;
+	int sp_slot;
+	wirelist_node_t *w_node;
+} ewire_point_t;
+
+
+/* ewire_point Vector */
+#define GVT(x) vtewire_point_ ## x
+#define GVT_ELEM_TYPE ewire_point_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 256
+#define GVT_START_SIZE 8
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+#include <genvector/genvector_undef.h>
+
+#define VTEWIRE_POINT_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vtewire_point_len(_vt_); _i_++) { \
+		ewire_point_t *_loop_item_ = &(_vt_)->array[_i_];
+
+#define VTEWIRE_POINT_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/pointdata.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/pointdata.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/pointdata.c	(revision 18980)
@@ -0,0 +1,33 @@
+#include <assert.h>
+#include "pointdata.h"
+#include "wire.h"
+
+void pointdata_create(point_t *p, pcb_any_obj_t *obj)
+{
+	pointdata_t *pd;
+	int i;
+
+	assert(p->data == NULL);
+	p->data = calloc(1, sizeof(pointdata_t));
+	pd = p->data;
+	pd->obj = obj;
+
+	for (i = 0; i < 4; i++)
+		spoke_init(&pd->spoke[i], i, p);
+}
+
+void pointdata_free(point_t *p)
+{
+	pointdata_t *pd = p->data;
+	int i;
+
+	if (pd != NULL) {
+		wirelist_free(pd->terminal_wires);
+		wirelist_free(pd->uturn_wires);
+		wirelist_free(pd->attached_wires[0]);
+		wirelist_free(pd->attached_wires[1]);
+		for (i = 0; i < 4; i++)
+			spoke_uninit(&pd->spoke[i]);
+		free(pd);
+	}
+}
Index: tags/2.0.1/src_plugins/sketch_route/pointdata.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/pointdata.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/pointdata.h	(revision 18980)
@@ -0,0 +1,24 @@
+#ifndef POINTDATA_H
+#define POINTDATA_H
+
+#include "sktypedefs.h"
+#include "spoke.h"
+
+struct pointdata_s {
+	pcb_any_obj_t *obj;
+	/* these wirelists are ordered outside-to-inside */
+	/* two lists are used in corner case: when two subsequent wire segments are collinear and
+	 * wires are attached both on the left and on the right side of the point */
+	/* uturn wirelist is used when a wire turns back at a point */
+	wirelist_node_t *attached_wires[2];
+	wirelist_node_t *uturn_wires;
+	wirelist_node_t *terminal_wires;
+	/* spokes provide sufficient spacing of wires from objects;
+	 * there are 4 spokes for each of the directions: 45, 135, 225, 315 deg */
+	spoke_t spoke[4];
+};
+
+void pointdata_create(point_t *p, pcb_any_obj_t *obj);
+void pointdata_free(point_t *p);
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/sketch_route.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/sketch_route.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/sketch_route.c	(revision 18980)
@@ -0,0 +1,1179 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Wojciech Krutnik
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Literature:
+ * [1] C E Leiserson and F M Maley. 1985. Algorithms for routing and testing routability of planar VLSI layouts.
+ *     In Proceedings of the seventeenth annual ACM symposium on Theory of computing (STOC '85).
+ *     ACM, New York, NY, USA, 69-78. DOI=http://dx.doi.org/10.1145/22145.22153
+ */
+
+#include "config.h"
+
+#include "plugins.h"
+#include "actions.h"
+#include "board.h"
+#include "compat_nls.h"
+#include "conf_core.h"
+#include "data.h"
+#include "event.h"
+#include "list_common.h"
+#include "obj_line_list.h"
+#include "obj_pstk.h"
+#include "obj_pstk_inlines.h"
+#include "obj_subc_parent.h"
+#include "pcb-printf.h"
+#include "search.h"
+#include "tool.h"
+#include "layer_ui.h"
+
+#include "sktypedefs.h"
+#include "wire.h"
+#include "ewire.h"
+#include "ewire_point.h"
+#include "pointdata.h"
+#include "spoke.h"
+#include "cdt/cdt.h"
+#include <genht/htip.h>
+#include <genht/htpp.h>
+#include <genvector/vtp0.h>
+
+#define SK_DEBUG
+
+
+const char *pcb_sketch_route_cookie = "sketch_route plugin";
+
+
+typedef struct {
+	cdt_t *cdt;
+	htpp_t terminals; /* key - terminal object; value - cdt point */
+	vtwire_t wires;
+	vtewire_t ewires;
+	pcb_rtree_t *spoke_tree;
+	pcb_layer_t *ui_layer_cdt;
+	pcb_layer_t *ui_layer_erbs;
+} sketch_t;
+
+static htip_t sketches;
+static pcb_bool_t show_spokes = pcb_true; /* TODO: make this a config node */
+static pcb_bool_t check_net = pcb_false; /* TODO: make this a config node */
+
+
+static point_t *sketch_get_point_at_terminal(sketch_t *sk, pcb_any_obj_t *term)
+{
+	return htpp_getentry(&sk->terminals, term)->value;
+}
+
+static void sketch_update_cdt_layer(sketch_t *sk)
+{
+	pcb_layer_t *l = sk->ui_layer_cdt;
+
+	list_map0(&l->Line, pcb_line_t, pcb_line_free);
+	if (l->line_tree)
+		pcb_r_destroy_tree(&l->line_tree);
+	VTEDGE_FOREACH(e, &sk->cdt->edges)
+		pcb_line_new(l, e->endp[0]->pos.x, -e->endp[0]->pos.y, e->endp[1]->pos.x, -e->endp[1]->pos.y, 1, 0, pcb_no_flags());
+	VTEDGE_FOREACH_END();
+}
+
+static void sketch_update_erbs_layer(sketch_t *sk)
+{
+	pcb_layer_t *l = sk->ui_layer_erbs;
+	pcb_coord_t px, py, qx, qy;
+	int i;
+
+	list_map0(&l->Line, pcb_line_t, pcb_line_free);
+	if (l->line_tree)
+		pcb_r_destroy_tree(&l->line_tree);
+
+	VTEWIRE_FOREACH(ew, &sk->ewires)
+		ewire_point_t *ewp = &ew->points.array[0];
+		px = ((point_t *)ewp->sp)->pos.x;
+		py = -((point_t *)ewp->sp)->pos.y;
+		for (i = 1; i < vtewire_point_len(&ew->points) - 1; i++) {
+			ewp = &ew->points.array[i];
+			spoke_pos_at_slot(ewp->sp, ewp->sp_slot, &qx, &qy);
+			pcb_line_new(l, px, py, qx, qy, ew->wire->thickness, ew->wire->clearance, pcb_no_flags());
+			px = qx;
+			py = qy;
+		}
+		ewp = &ew->points.array[i];
+		qx = ((point_t *)ewp->sp)->pos.x;
+		qy = -((point_t *)ewp->sp)->pos.y;
+		pcb_line_new(l, px, py, qx, qy, ew->wire->thickness, ew->wire->clearance, pcb_no_flags());
+	VTEWIRE_FOREACH_END();
+
+	if (show_spokes) {
+		VTPOINT_FOREACH(p, &sk->cdt->points)
+			pointdata_t *pd = p->data;
+			if (pd != NULL) {
+				px = p->pos.x;
+				py = -p->pos.y;
+				for (i = 0; i < 4; i++) {
+					spoke_pos_at_end(&pd->spoke[i], 0, &qx, &qy);
+					pcb_line_new(l, px, py, qx, qy, 1, 0, pcb_no_flags());
+				}
+			}
+		VTPOINT_FOREACH_END();
+	}
+}
+
+static void sketch_validate_erbs(sketch_t *sk, ewire_t *ew)
+{
+	/* TODO: check ew spokes against not supported ewires conflicts */
+	/* TODO: check ewires segments, supported by ew spokes, against other spokes conflicts */
+}
+
+static ewire_t *sketch_insert_ewire(sketch_t *sk, wire_t *w)
+{
+	int i, j;
+	ewire_t *new_ew;
+
+	new_ew = *vtewire_alloc_append(&sk->ewires, 1);
+	new_ew->wire = w;
+	ewire_append_point(new_ew, (spoke_t *) w->points[0].p, SIDE_TERM, 0, w->points[0].wire_node);
+
+#ifdef SK_DEBUG
+	printf("\ninserting ERBS wire:\n");
+#endif
+
+	if (w->point_num == 2) {
+		ewire_append_point(new_ew, (spoke_t *) w->points[1].p, SIDE_TERM, 0, w->points[1].wire_node);
+		return new_ew;
+	}
+	else {
+		spoke_t *curr_sp, *next_sp;
+		point_t prev_p, curr_p, next_p;
+
+		for (i = 0; i < w->point_num-1; i++) {
+			wire_point_t *curr_wp = &w->points[i];
+			wire_point_t *next_wp = &w->points[i+1];
+			pointdata_t *curr_pd = (pointdata_t *) curr_wp->p->data;
+			pointdata_t *next_pd = (pointdata_t *) next_wp->p->data;
+			int curr_sp_slot_num = wire_point_position(curr_wp);
+			point_t curr_sp_p[4], next_sp_p[4];
+			int repeat_cnt;
+
+#ifdef SK_DEBUG
+			pcb_printf("  wire point %d at (%mm, %mm); ", i, curr_wp->p->pos.x, -curr_wp->p->pos.y);
+#endif
+
+			for (j = 0; j < 4; j++) {
+				spoke_pos_at_wire_point(&curr_pd->spoke[j], curr_wp, &curr_sp_p[j].pos.x, &curr_sp_p[j].pos.y);
+				curr_sp_p[j].pos.y = -curr_sp_p[j].pos.y;
+				spoke_pos_at_wire_point(&next_pd->spoke[j], next_wp, &next_sp_p[j].pos.x, &next_sp_p[j].pos.y);
+				next_sp_p[j].pos.y = -next_sp_p[j].pos.y;
+			}
+
+			if (i == 0)
+				curr_p = *curr_wp->p;
+			if (i == w->point_num-2)
+				next_p = *next_wp->p;
+
+			repeat_cnt = 0;
+repeat_current_point:
+
+			/* 1. find destination spoke */
+			if (i < w->point_num-2) { /* start terminal - spoke, or spoke - spoke */
+				point_t *p;
+				spoke_dir_t next_sp_dir;
+
+				/* select the leftmost spoke, if point is on the right and vice-versa */
+				p = &next_sp_p[0];
+				next_sp_dir = 0;
+				for (j = 1; j < 4; j++) {
+					if (ORIENT(next_wp->side == SIDE_LEFT, &curr_p, p, &next_sp_p[j])) {
+						p = &next_sp_p[j];
+						next_sp_dir = j;
+					}
+					/* check collinear case and select the closer spoke */
+					if (ORIENT_COLLINEAR(&curr_p, p, &next_sp_p[j])) {
+						next_sp_dir = DIST2(&curr_p, p) < DIST2(&curr_p, &next_sp_p[j]) ? next_sp_dir : j;
+						p = &next_sp_p[next_sp_dir];
+					}
+				}
+				next_sp = &next_pd->spoke[next_sp_dir];
+				next_p = next_sp_p[next_sp_dir];
+			}
+
+#ifdef SK_DEBUG
+			pcb_printf("dest spoke (dir %d) at (%mm, %mm); ", next_sp->dir, next_p.pos.x, -next_p.pos.y);
+#endif
+
+			/* 2. check if the ewire should be attached to any of the remaining spokes at the current point */
+			if (i > 0) { /* spoke - spoke, or spoke - end terminal */
+				point_t *p;
+				spoke_dir_t curr_sp_dir;
+
+				/* if point is on the left, select the rightmost spoke (if there is any) and vice-versa */
+				p = NULL;
+				for (j = 0; j < 4; j++) {
+					if (j == curr_sp->dir)
+						continue;
+					if (p == NULL) {
+						if(ORIENT(curr_wp->side == SIDE_LEFT, &curr_p, &next_p, &curr_sp_p[j])) {
+							p = &curr_sp_p[j];
+							curr_sp_dir = j;
+						}
+					}
+					else {
+						if(ORIENT(curr_wp->side == SIDE_LEFT, &curr_p, p, &curr_sp_p[j])) {
+							p = &curr_sp_p[j];
+							curr_sp_dir = j;
+						}
+					}
+				}
+				if (p != NULL) {
+					/* don't attach to the current point's spoke if spoke of the next point is closer */
+					if (DIST2(&curr_p, &next_p) < DIST2(&curr_p, p)) {
+						printf("necessary\n"); /* (not sure if this check is necessary) */
+					}
+					else {
+						ewire_append_point(new_ew, curr_sp, curr_wp->side, curr_sp_slot_num, curr_wp->wire_node);
+						spoke_insert_wire_at_slot(curr_sp, curr_sp_slot_num, new_ew);
+						curr_sp = &curr_pd->spoke[curr_sp_dir];
+						prev_p = curr_p;
+						curr_p = *p;
+#ifdef SK_DEBUG
+						pcb_printf("found obstructing spoke (dir %d) at (%mm, %mm); ", curr_sp->dir, curr_p.pos.x, -curr_p.pos.y);
+#endif
+						if (++repeat_cnt == 4)
+							break;
+						goto repeat_current_point;
+					}
+				}
+			}
+
+			/* 3. insert point if two subsequent segments are not concave */
+			/* TODO: concavity detection should propagate through the previous points, when one is found;
+			 *       maybe it could be done only in sketch_validate_erbs */
+			if (i > 0) {
+				/* if point is on the left, check if the next point is on the right of the previous segment */
+				if (!ORIENT(curr_wp->side == SIDE_LEFT, &prev_p, &curr_p, &next_p)) {
+					ewire_append_point(new_ew, curr_sp, curr_wp->side, curr_sp_slot_num, curr_wp->wire_node);
+					spoke_insert_wire_at_slot(curr_sp, curr_sp_slot_num, new_ew);
+				}
+				else {
+#ifdef SK_DEBUG
+						pcb_printf("found concavity, skip; ");
+#endif
+				}
+			}
+
+			curr_sp = next_sp;
+			prev_p = curr_p;
+			curr_p = next_p;
+#ifdef SK_DEBUG
+			pcb_printf("\n");
+#endif
+		}
+
+		ewire_append_point(new_ew, (spoke_t *) w->points[w->point_num-1].p, SIDE_TERM, 0, w->points[w->point_num-1].wire_node);
+		return new_ew;
+	}
+}
+
+static void sketch_update_erbs(sketch_t *sk)
+{
+	int i;
+
+	vtewire_uninit(&sk->ewires);
+	VTPOINT_FOREACH(p, &sk->cdt->points)
+		pointdata_t *pd = p->data;
+		if (pd != NULL)
+			for (i = 0; i < 4; i++)
+				spoke_uninit(&pd->spoke[i]);
+	VTPOINT_FOREACH_END();
+
+	VTWIRE_FOREACH(w, &sk->wires)
+		sketch_insert_ewire(sk, w);
+	VTWIRE_FOREACH_END();
+}
+
+static pcb_bool sketch_check_path(point_t *from_p, edge_t *from_e, edge_t *to_e, point_t *to_p)
+{
+	/* TODO */
+	return pcb_true;
+}
+
+#ifdef SK_DEBUG
+static void wire_print(wire_t *w, const char *tab)
+{
+	int i;
+	for (i = 0; i < w->point_num; i++)
+		pcb_printf("%sP%i: (%mm,%mm) %s\n", tab, i, w->points[i].p->pos.x, -w->points[i].p->pos.y,
+							 w->points[i].side == SIDE_LEFT ? "LEFT" : w->points[i].side == SIDE_RIGHT ? "RIGHT" : "TERM");
+}
+#endif
+
+static wire_t *sketch_find_shortest_path(wire_t *corridor)
+{
+	/* the algorithm is described in [1] */
+	static wire_t left;
+	wire_t right;
+	int i, b;
+
+	assert(corridor->points[0].side == SIDE_TERM && corridor->points[corridor->point_num-1].side == SIDE_TERM);
+
+	wire_init(&left);
+	wire_init(&right);
+	wire_push_point(&left, corridor->points[0].p, SIDE_TERM);
+	wire_push_point(&right, corridor->points[0].p, SIDE_TERM);
+
+#ifdef SK_DEBUG
+	printf("finding path through corridor:\n");
+	wire_print(corridor, "");
+#endif
+
+	for (i = 1, b = 1; i < corridor->point_num; i++) {
+		point_t *p = corridor->points[i].p;
+		int side = corridor->points[i].side;
+
+#ifdef SK_DEBUG
+		printf("\ncorridor point %i\n", i);
+		printf("left points:\n");
+		wire_print(&left, "\t");
+		printf("right points:\n");
+		wire_print(&right, "\t");
+#endif
+
+		if (side & SIDE_LEFT) {
+			while (left.point_num > b
+						 && ORIENT_CW(left.points[left.point_num-2].p, left.points[left.point_num-1].p, p)) {
+				wire_pop_point(&left);
+#ifdef SK_DEBUG
+				printf("\tpop left point\n");
+#endif
+			}
+
+			while (right.point_num > b
+						 && !ORIENT_CCW(right.points[b-1].p, right.points[b].p, p)) {
+				wire_push_point(&left, right.points[b].p, right.points[b].side);
+				b++;
+#ifdef SK_DEBUG
+				printf("\tswitch to right (b=%i)\n", b);
+#endif
+			}
+
+			wire_push_point(&left, p, side);
+		}
+		else {
+			while (right.point_num > b
+						 && ORIENT_CCW(right.points[right.point_num-2].p, right.points[right.point_num-1].p, p)) {
+				wire_pop_point(&right);
+#ifdef SK_DEBUG
+				printf("\tpop right point\n");
+#endif
+			}
+
+			while (left.point_num > b
+						 && !ORIENT_CW(left.points[b-1].p, left.points[b].p, p)) {
+				wire_push_point(&right, left.points[b].p, left.points[b].side);
+				b++;
+#ifdef SK_DEBUG
+				printf("\tswitch to left (b=%i)\n", b);
+#endif
+			}
+
+			wire_push_point(&right, p, side);
+		}
+	}
+
+#ifdef SK_DEBUG
+	printf("\npath:\n");
+	wire_print(&left, "\t");
+#endif
+
+	wire_uninit(&right);
+	return &left;
+}
+
+#define check_wires(wlist) do { \
+	WIRELIST_FOREACH(w, (wlist)); \
+		(void) w; \
+		if (wire_is_node_connected_with_point(_node_, wp->p)) \
+			n++; \
+	WIRELIST_FOREACH_END(); \
+} while(0)
+
+static int count_all_wires_coming_from_adjacent_point(pointdata_t *adj_pd, wire_point_t *wp)
+{
+	int n = 0;
+	check_wires(adj_pd->attached_wires[0]);
+	check_wires(adj_pd->attached_wires[1]);
+	check_wires(adj_pd->terminal_wires);
+	return n;
+}
+
+static int count_wires_coming_from_previous_point(wire_point_t *prev_wp, wire_point_t *wp, int list_num)
+{
+	wirelist_node_t *prev_list, *prev_list_term, *prev_list_uturn;
+	int n;
+
+	prev_list = ((pointdata_t *) prev_wp->p->data)->attached_wires[list_num];
+	prev_list_term = ((pointdata_t *) prev_wp->p->data)->terminal_wires;
+	prev_list_uturn = ((pointdata_t *) prev_wp->p->data)->uturn_wires;
+
+	if (prev_wp->side == wp->side) { /* case 1: the wire was on the same side at the previous point */
+		n = wirelist_get_index(prev_list, prev_wp->wire_node);
+		if (n == -1) /* wire was U-turned at the previous point */
+			n = wirelist_length(prev_list) + wirelist_get_index(prev_list_uturn, prev_wp->wire_node);
+	}
+	else if (prev_wp->side == SIDE_TERM) /* case 2: previous point was a terminal */
+		n = wirelist_length(prev_list) + wirelist_length(prev_list_uturn);
+	else { /* case 3: the wire was on an other side of the previous point */
+		int temp;
+		n = wirelist_length(prev_list);
+		check_wires(prev_list_uturn);
+		check_wires(prev_list_term);
+		temp = wirelist_get_index(prev_list_uturn, prev_wp->wire_node);
+		if (temp >= 0) /* wire coming from previous U-turn */
+			n += (wirelist_length(prev_wp->wire_node) - 1);
+		else {
+			check_wires(prev_list_uturn);
+			n += (wirelist_length(prev_wp->wire_node) - 1);
+		}
+	}
+	return n;
+}
+
+static int count_uturn_wires_coming_from_previous_point(wire_point_t *prev_wp, wire_point_t *wp, int list_num)
+{
+	wirelist_node_t *list_uturn, *prev_list, *prev_list2, *prev_list_uturn;
+	wirelist_node_t *prev_outer_node, *curr_outer_node;
+	int i;
+
+	list_uturn = ((pointdata_t *) wp->p->data)->uturn_wires;
+	prev_list = ((pointdata_t *) prev_wp->p->data)->attached_wires[list_num];
+	prev_list2 = ((pointdata_t *) prev_wp->p->data)->attached_wires[list_num^1];
+	prev_list_uturn = ((pointdata_t *) prev_wp->p->data)->uturn_wires;
+
+	if (prev_wp->side == wp->side) { /* case 1: the wire was on the same side at the previous point */
+		i = wirelist_get_index(prev_list, prev_wp->wire_node);
+		assert(i != -1);
+		if (i == 0)
+			return 0;
+		prev_outer_node = wirelist_nth(prev_list, i-1);
+		i = wire_node_index_at_connected_point(prev_outer_node, wp->p);
+		assert(i != -1);
+		curr_outer_node = prev_outer_node->item->points[i].wire_node;
+		return wirelist_get_index(list_uturn, curr_outer_node) + 1;
+	}
+	else {
+		if (prev_wp->side == SIDE_TERM) { /* case 2: previous point was a terminal */
+			prev_outer_node = wirelist_last(prev_list_uturn);
+			if (prev_outer_node == NULL) { /* no uturn wires at the previous point */
+				prev_outer_node = wirelist_last(prev_list);
+				if (prev_outer_node == NULL) /* no outer wires at the previous point at all */
+					return 0;
+			}
+			/* TODO: the result of this func can be ambiguous, so this need a deeper consideration
+			 * (connected point in case of uturns is both the previous and the next point) */
+			i = wire_node_index_at_connected_point(prev_outer_node, wp->p);
+			assert(i != -1);
+			curr_outer_node = prev_outer_node->item->points[i].wire_node;
+			return wirelist_get_index(list_uturn, curr_outer_node) + 1;
+		}
+		else { /* case 3: the wire was on an other side of the previous point */
+			prev_outer_node = prev_wp->wire_node->next;
+			if (prev_outer_node == NULL) { /* no inner wires at the previous point */
+				prev_outer_node = wirelist_last(prev_list2);
+				if (prev_outer_node == NULL) /* no wires at the previous point from the other side */
+					return 0;
+			}
+			/* TODO: uturn wires from the previous point, that may go to the current point, are _not_ taken into account */
+			i = wire_node_index_at_connected_point(prev_outer_node, wp->p);
+			if(i == -1)
+				return 0;
+			curr_outer_node = prev_outer_node->item->points[i].wire_node;
+			return wirelist_get_index(list_uturn, curr_outer_node) + 1;
+		}
+	}
+}
+#undef check_wires
+
+static void insert_wire_at_point(wire_point_t *wp, wire_t *w, wirelist_node_t **list, int n)
+{
+	assert(n >= -1);
+	if (n == -1) {
+		*list = wirelist_prepend(*list, &w);
+		wp->wire_node = *list;
+	}
+	else
+		wp->wire_node = wirelist_insert_after_nth(*list, n, &w);
+}
+
+static void sketch_insert_wire(sketch_t *sk, wire_t *wire)
+{
+	wire_t *new_w;
+	int i;
+
+	new_w = *vtwire_alloc_append(&sk->wires, 1);
+	wire_copy(new_w, wire);
+
+#ifdef SK_DEBUG
+	printf("\ninserting wire into sketch:\n");
+#endif
+
+	assert(new_w->point_num >= 2);
+	for (i = 0; i < new_w->point_num; i++) {
+		wire_point_t *wp = &new_w->points[i];
+		wire_point_t *prev_wp;
+		wire_point_t *next_wp;
+		pointdata_t *pd = wp->p->data;
+		pointdata_t *prev_pd;
+
+		assert(pd != NULL);
+
+		if (i > 0) {
+			prev_wp = &new_w->points[i-1];
+			prev_pd = prev_wp->p->data;
+		}
+		if (i < new_w->point_num - 1)
+			next_wp = &new_w->points[i+1];
+
+#ifdef SK_DEBUG
+			pcb_printf("  add point at (%mm, %mm); ", wp->p->pos.x, -wp->p->pos.y,
+								 wirelist_length(pd->terminal_wires) - 1);
+#endif
+
+		if (i == 0) { /* first point */
+			assert(wp->side == SIDE_TERM);
+			cdt_insert_constrained_edge(sk->cdt, wp->p, next_wp->p);
+			insert_wire_at_point(wp, new_w, &pd->terminal_wires, -1);
+#ifdef SK_DEBUG
+			pcb_printf("start terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1);
+#endif
+		}
+		else if (i == new_w->point_num - 1) { /* last point */
+			assert(wp->side == SIDE_TERM);
+			insert_wire_at_point(wp, new_w, &pd->terminal_wires, -1);
+#ifdef SK_DEBUG
+			pcb_printf("end terminal; %d other wires connected\n", wirelist_length(pd->terminal_wires) - 1);
+#endif
+		}
+		else { /* middle point */
+			assert(wp->side != SIDE_TERM);
+
+			cdt_insert_constrained_edge(sk->cdt, wp->p, next_wp->p);
+
+			if (ORIENT_COLLINEAR(prev_wp->p, wp->p, next_wp->p)) { /* collinear case */
+				edge_t *prev_e = get_edge_from_points(prev_wp->p, wp->p);
+				edge_t *e = get_edge_from_points(wp->p, next_wp->p);
+				int list_num, n;
+
+				if (prev_e != e) { /* 3 subsequent points collinear */
+					assert(prev_e->endp[1] == e->endp[0] || prev_e->endp[0] == e->endp[1]);
+					list_num = ((prev_e->endp[1] == wp->p) ^ (wp->side == SIDE_RIGHT) ? 1 : 0);
+
+					/* check if there was a wire, already attached to this point, that doesn't go through the same points
+					 * as the new wire and is on the opposite wirelist at this point */
+					if (pd->attached_wires[list_num^1] != NULL
+							&& !wire_is_coincident_at_node(pd->attached_wires[list_num^1], prev_wp->p, next_wp->p)) {
+						assert(pd->attached_wires[list_num] == NULL);
+						pd->attached_wires[list_num] = pd->attached_wires[list_num^1];
+						pd->attached_wires[list_num^1] = NULL;
+					}
+
+					/* find node to insert the new wire in the attached wirelist:
+					 * - determine index of the last wire attached to the previous point
+					 *   before the new wire as n (-1 if no wires attached to the previous point)
+					 * - insert the new wire in the current point's wirelist after n-th position */
+					n = -1;
+					n += count_wires_coming_from_previous_point(prev_wp, wp, list_num);
+					insert_wire_at_point(wp, new_w, &pd->attached_wires[list_num], n);
+#ifdef SK_DEBUG
+					pcb_printf("collinear; list_num=%d; n=%d; attached pos=%d; attached len=%d\n", list_num, n,
+										 wirelist_length(wp->wire_node)-1, wirelist_length(pd->attached_wires[list_num]));
+#endif
+				}
+				else { /* U-turn */
+					/* this list_num is related to the previous point, not the current one
+					 * (and is not used for selecting list to store the wire; only to determine uturn list index) */
+					if (prev_wp->side != SIDE_TERM) {
+						list_num = ((e->endp[1] == wp->p) ^ (prev_wp->side == SIDE_RIGHT) ? 1 : 0);
+						list_num = prev_pd->attached_wires[list_num] == NULL ? list_num^1 : list_num;
+					}
+					else /* except if previous point was a terminal */
+						list_num = ((e->endp[1] == wp->p) ^ (wp->side == SIDE_RIGHT) ? 1 : 0);
+
+					/* find node to insert the new wire in the U-turn wirelist:
+					 * - determine index of the wire in the previous attached wirelist
+					 * - subtract wires from the current attached wirelist;
+					 *   the result is the position in current U-turn wirelist */
+					n = -1;
+					n += count_uturn_wires_coming_from_previous_point(prev_wp, wp, list_num);
+					insert_wire_at_point(wp, new_w, &pd->uturn_wires, n);
+#ifdef SK_DEBUG
+					pcb_printf("uturn; list_num=%d; n=%d; uturn pos=%d; uturn len=%d\n", list_num, n,
+										 wirelist_length(wp->wire_node)-1, wirelist_length(pd->uturn_wires));
+#endif
+				}
+			}
+			else { /* not collinear case */
+				int list_num, n;
+
+				list_num = pd->attached_wires[1] != NULL ? 1 : 0;
+				assert(pd->attached_wires[list_num^1] == NULL);
+
+				/* find node to insert the new wire in the attached wirelist:
+				 * - find point's adjacent edges which have greater angle between subsequent segments
+				 *   than the new wire's edge (ie. are placed externally)
+				 * - count wires at all these edges and proper wires at the new wire's edge as n
+				 * - insert the new wire in the current point's wirelist after n-th position */
+				n = -1;
+				EDGELIST_FOREACH(e, wp->p->adj_edges)
+					point_t *adj_p = EDGE_OTHER_POINT(e, wp->p);
+					if (e->is_constrained
+							&& (wp->side == SIDE_RIGHT ? ORIENT_CCW(prev_wp->p, wp->p, adj_p) : ORIENT_CW(prev_wp->p, wp->p, adj_p))) {
+						pointdata_t *adj_pd = adj_p->data;
+						assert(adj_pd != NULL);
+						n += count_all_wires_coming_from_adjacent_point(adj_pd, wp);
+					}
+				EDGELIST_FOREACH_END();
+				n += count_wires_coming_from_previous_point(prev_wp, wp, list_num);
+				insert_wire_at_point(wp, new_w, &pd->attached_wires[list_num], n);
+#ifdef SK_DEBUG
+					pcb_printf("list_num=%d; n=%d, attached pos=%d; attached len=%d\n", list_num, n,
+										 wirelist_length(wp->wire_node)-1, wirelist_length(pd->attached_wires[list_num]));
+#endif
+			}
+		}
+	}
+}
+
+struct search_info {
+	pcb_layer_t *layer;
+	sketch_t *sk;
+};
+
+static pcb_r_dir_t r_search_cb(const pcb_box_t *box, void *cl)
+{
+	pcb_any_obj_t *obj = (pcb_any_obj_t *) box;
+	struct search_info *i = (struct search_info *) cl;
+	point_t *point;
+
+	if (obj->type == PCB_OBJ_PSTK) {
+		pcb_pstk_t *pstk = (pcb_pstk_t *) obj;
+		if (pcb_pstk_shape_at(PCB, pstk, i->layer) == NULL)
+			return PCB_R_DIR_NOT_FOUND;
+		point = cdt_insert_point(i->sk->cdt, pstk->x, -pstk->y);
+		pointdata_create(point, obj);
+	}
+	/* temporary: if a non-padstack obj is _not_ a terminal, then don't triangulate it */
+	/* long term (for non-terminal objects):
+	 * - lines should be triangulated on their endpoints and constrained
+	 * - polygons should be triangulated on vertices and edges constrained
+	 * - texts - same as polygons for their bbox
+	 * - arcs - same as polygons for their bbox */
+	else if (obj->term != NULL) {
+		coord_t cx, cy;
+		pcb_obj_center(obj, &cx, &cy);
+		point = cdt_insert_point(i->sk->cdt, cx, -cy);
+		pointdata_create(point, obj);
+	}
+
+	if (obj->term != NULL) {
+		pcb_subc_t *subc = pcb_obj_parent_subc(obj);
+		if (subc != NULL && subc->refdes != NULL)
+			htpp_insert(&i->sk->terminals, obj, point);
+	}
+
+	return PCB_R_DIR_FOUND_CONTINUE;
+}
+
+static void sketch_create_for_layer(sketch_t *sk, pcb_layer_t *layer)
+{
+	pcb_box_t bbox;
+	struct search_info info;
+	char name[256];
+
+	sk->cdt = malloc(sizeof(cdt_t));
+	cdt_init(sk->cdt, 0, 0, PCB->MaxWidth, -PCB->MaxHeight);
+	htpp_init(&sk->terminals, ptrhash, ptrkeyeq);
+	sk->wires.elem_constructor = vtwire_constructor;
+	sk->wires.elem_destructor = vtwire_destructor;
+	sk->wires.elem_copy = NULL;
+	vtwire_init(&sk->wires);
+	sk->ewires.elem_constructor = vtewire_constructor;
+	sk->ewires.elem_destructor = vtewire_destructor;
+	sk->ewires.elem_copy = NULL;
+	vtewire_init(&sk->ewires);
+
+	sk->spoke_tree = pcb_r_create_tree();
+
+	bbox.X1 = 0; bbox.Y1 = 0; bbox.X2 = PCB->MaxWidth; bbox.Y2 = PCB->MaxHeight;
+	info.layer = layer;
+	info.sk = sk;
+	pcb_r_search(PCB->Data->padstack_tree, &bbox, NULL, r_search_cb, &info, NULL);
+	pcb_r_search(layer->line_tree, &bbox, NULL, r_search_cb, &info, NULL);
+	pcb_r_search(layer->text_tree, &bbox, NULL, r_search_cb, &info, NULL);
+	pcb_r_search(layer->polygon_tree, &bbox, NULL, r_search_cb, &info, NULL);
+	pcb_r_search(layer->arc_tree, &bbox, NULL, r_search_cb, &info, NULL);
+
+	pcb_snprintf(name, sizeof(name), "%s: CDT", layer->name);
+	sk->ui_layer_cdt = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, layer->meta.real.color);
+	sk->ui_layer_cdt->meta.real.vis = pcb_false;
+	sketch_update_cdt_layer(sk);
+
+	pcb_snprintf(name, sizeof(name), "%s: ERBS", layer->name);
+	sk->ui_layer_erbs = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, layer->meta.real.color);
+	sketch_update_erbs_layer(sk);
+	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL);
+}
+
+static sketch_t *sketch_alloc()
+{
+	sketch_t *new_sk;
+	new_sk = calloc(1, sizeof(sketch_t));
+	return new_sk;
+}
+
+static void sketch_uninit(sketch_t *sk)
+{
+	if (sk->cdt != NULL) {
+		VTPOINT_FOREACH(p, &sk->cdt->points)
+			pointdata_free(p);
+		VTPOINT_FOREACH_END();
+		cdt_free(sk->cdt);
+		free(sk->cdt);
+		sk->cdt = NULL;
+	}
+	vtwire_uninit(&sk->wires);
+	vtewire_uninit(&sk->ewires);
+	htpp_uninit(&sk->terminals);
+	pcb_r_destroy_tree(&sk->spoke_tree);
+	pcb_uilayer_free(sk->ui_layer_cdt);
+	pcb_uilayer_free(sk->ui_layer_erbs);
+}
+
+
+static sketch_t *sketches_get_sketch_at_layer(pcb_layer_t *layer)
+{
+	return htip_getentry(&sketches, pcb_layer_id(PCB->Data, layer))->value;
+}
+
+static void sketches_init()
+{
+	pcb_layer_id_t lid[PCB_MAX_LAYER];
+	int i, num;
+
+	num = pcb_layer_list(PCB, PCB_LYT_COPPER, lid, PCB_MAX_LAYER);
+	htip_init(&sketches, longhash, longkeyeq);
+	for (i = 0; i < num; i++) {
+		sketch_t *sk = sketch_alloc();
+		sketch_create_for_layer(sk, pcb_get_layer(PCB->Data, lid[i]));
+		htip_insert(&sketches, lid[i], sk);
+	}
+}
+
+static void sketches_uninit()
+{
+	htip_entry_t *e;
+
+	for (e = htip_first(&sketches); e; e = htip_next(&sketches, e)) {
+		sketch_uninit(e->value);
+		free(e->value);
+		htip_delentry(&sketches, e);
+	}
+	htip_uninit(&sketches);
+}
+
+
+/*** sketch line tool ***/
+static void tool_skline_adjust_attached_objects(void);
+
+struct {
+	pcb_any_obj_t *start_term;
+	pcb_lib_menu_t *net;
+	vtp0_t lines;
+	point_t *start_p;
+	edgelist_node_t *visited_edges;
+	triangle_t *current_t;
+	wire_t corridor;
+	sketch_t *sketch;
+} attached_path = {0};
+
+static pcb_attached_line_t *attached_path_new_line()
+{
+	pcb_attached_line_t *new_l = calloc(1, sizeof(pcb_attached_line_t));
+	vtp0_append(&attached_path.lines, new_l);
+	return new_l;
+}
+
+static void attached_path_next_line()
+{
+	int last = vtp0_len(&attached_path.lines) - 1;
+	pcb_attached_line_t *next_l = attached_path_new_line();
+	if (last >= 0)
+		next_l->Point1 = ((pcb_attached_line_t *) attached_path.lines.array[last])->Point2;
+	tool_skline_adjust_attached_objects();
+}
+
+static pcb_bool attached_path_init(pcb_layer_t *layer, pcb_any_obj_t *start_term)
+{
+	pcb_attached_line_t *start_l;
+
+	attached_path.sketch = sketches_get_sketch_at_layer(layer);
+	attached_path.start_term = start_term;
+	attached_path.net = pcb_netlist_find_net4term(PCB, start_term);
+	if (check_net && attached_path.net == NULL)
+		return pcb_false;
+
+	vtp0_init(&attached_path.lines);
+	start_l = attached_path_new_line();
+	pcb_obj_center(start_term, &start_l->Point1.X, &start_l->Point1.Y);
+	tool_skline_adjust_attached_objects();
+
+	attached_path.start_p = sketch_get_point_at_terminal(attached_path.sketch, start_term);
+	attached_path.current_t = NULL;
+	attached_path.visited_edges = NULL;
+	wire_init(&attached_path.corridor);
+	wire_push_point(&attached_path.corridor, attached_path.start_p, SIDE_TERM);
+
+	return pcb_true;
+}
+
+static void attached_path_uninit()
+{
+	int i;
+	for (i = 0; i < vtp0_len(&attached_path.lines); i++)
+		free(attached_path.lines.array[i]);
+	vtp0_uninit(&attached_path.lines);
+	edgelist_free(attached_path.visited_edges);
+	attached_path.visited_edges = NULL;
+	wire_uninit(&attached_path.corridor);
+}
+
+static pcb_bool line_intersects_edge(pcb_attached_line_t *line, edge_t *edge)
+{
+	point_t p, q;
+	p.pos.x = line->Point1.X;
+	p.pos.y = -line->Point1.Y;
+	q.pos.x = line->Point2.X;
+	q.pos.y = -line->Point2.Y;
+	return LINES_INTERSECT(&p, &q, edge->endp[0], edge->endp[1]);
+}
+
+static pcb_bool attached_path_next_point(point_t *end_p)
+{
+	int last = vtp0_len(&attached_path.lines) - 1;
+	pcb_attached_line_t *attached_line = attached_path.lines.array[last];
+	edge_t *entrance_e = NULL;
+	wire_t corridor_ops;
+	int i;
+
+	wire_init(&corridor_ops);
+#define RETURN(r) do { \
+	wire_uninit(&corridor_ops); \
+	return (r); \
+} while (0)
+
+	/* move along the attached line to find intersecting triangles which form a corridor */
+	while(1) {
+		if (attached_path.current_t == NULL) { /* we haven't left the first triangle yet */
+			TRIANGLELIST_FOREACH(t, attached_path.start_p->adj_triangles)
+				for (i = 0; i < 3; i++)
+					if (t->e[i]->endp[0] != attached_path.start_p && t->e[i]->endp[1] != attached_path.start_p
+							&& t->e[i] != entrance_e && line_intersects_edge(attached_line, t->e[i])) {
+						if (sketch_check_path(attached_path.start_p, NULL, t->e[i], NULL) == pcb_false)
+							RETURN(pcb_false);
+						attached_path.current_t = t->adj_t[i];
+						wire_push_point(&corridor_ops, t->p[i], SIDE_RIGHT);
+						wire_push_point(&corridor_ops, t->p[(i+1)%3], SIDE_LEFT);
+						entrance_e = t->e[i];
+						attached_path.visited_edges = edgelist_prepend(attached_path.visited_edges, &entrance_e);
+						goto next_triangle;
+					}
+			TRIANGLELIST_FOREACH_END();
+		}
+		else { /* next triangle in the corridor */
+			triangle_t *t = attached_path.current_t;
+			for (i = 0; i < 3; i++) {
+				if (t->e[i] != entrance_e && line_intersects_edge(attached_line, t->e[i])) {
+					edge_t *last_entrance_e = attached_path.visited_edges->item;
+					entrance_e = t->e[i];
+					attached_path.current_t = t->adj_t[i];
+					if (t->e[i] != last_entrance_e) { /* going forward */
+						if (sketch_check_path(NULL, attached_path.visited_edges->item, t->e[i], NULL) == pcb_false)
+							RETURN(pcb_false);
+						wire_push_point(&corridor_ops,
+														t->p[t->e[(i+2)%3] == last_entrance_e ? (i+1)%3 : i],
+														t->e[(i+1)%3] == last_entrance_e ? SIDE_RIGHT : SIDE_LEFT);
+						attached_path.visited_edges = edgelist_prepend(attached_path.visited_edges, &entrance_e);
+						goto next_triangle;
+					}
+					else { /* going backward */
+						attached_path.visited_edges = edgelist_remove_front(attached_path.visited_edges);
+						wire_push_point(&corridor_ops, NULL, 0); /* NULL means to remove point */
+						if (attached_path.visited_edges == NULL) { /* came back to the first triangle */
+							wire_push_point(&corridor_ops, NULL, 0);
+							attached_path.current_t = NULL;
+						}
+						goto next_triangle;
+					}
+				}
+			}
+		}
+		break;
+next_triangle:
+		continue;
+	}
+
+	if (end_p != NULL) { /* connecting to the last point? */
+		if (attached_path.visited_edges == NULL) {
+			if (sketch_check_path(attached_path.start_p, NULL, NULL, end_p) == pcb_false)
+				RETURN(pcb_false);
+		}
+		else if (sketch_check_path(NULL, attached_path.visited_edges->item, NULL, end_p) == pcb_false)
+			RETURN(pcb_false);
+		wire_push_point(&corridor_ops, end_p, SIDE_TERM);
+	}
+
+	/* apply evaluated points additions/removals */
+	for (i = 0; i < corridor_ops.point_num; i++) {
+		if (corridor_ops.points[i].p != NULL)
+			wire_push_point(&attached_path.corridor, corridor_ops.points[i].p, corridor_ops.points[i].side);
+		else
+			wire_pop_point(&attached_path.corridor);
+	}
+
+	/* remove unwanted points which could be encountered around the end point */
+	if (end_p != NULL) {
+		int i, n = 0;
+		wire_pop_point(&attached_path.corridor); /* temporarily remove the end point */
+		EDGELIST_FOREACH(e, attached_path.visited_edges)
+			if (e->endp[0] == end_p || e->endp[1] == end_p)
+				n++; else break;
+		EDGELIST_FOREACH_END();
+		for (i = 0; i < n; i++)
+			wire_pop_point(&attached_path.corridor);
+		if (attached_path.corridor.points[attached_path.corridor.point_num - 1].p == end_p)
+			wire_pop_point(&attached_path.corridor);
+		wire_push_point(&attached_path.corridor, end_p, SIDE_TERM);
+	}
+
+	attached_path_next_line();
+	return pcb_true;
+#undef RETURN
+}
+
+static pcb_bool attached_path_finish(pcb_any_obj_t *end_term)
+{
+	pcb_subc_t *subc = pcb_obj_parent_subc(end_term);
+	pcb_bool net_valid = pcb_false;
+	int i;
+
+	if (check_net) {
+		if(end_term != attached_path.start_term && subc != NULL) {
+			char termname[128];
+			pcb_snprintf(termname, sizeof(termname), "%s-%s", subc->refdes, end_term->term);
+			for (i = 0; i < attached_path.net->EntryN; i++) {
+				if (strcmp(attached_path.net->Entry[i].ListEntry, termname) == 0)
+					net_valid = pcb_true;
+			}
+		}
+	}
+	else
+		net_valid = pcb_true;
+
+	if (net_valid) {
+		point_t *end_p;
+		wire_t *path;
+
+		end_p = sketch_get_point_at_terminal(attached_path.sketch, end_term);
+		if (attached_path_next_point(end_p) == pcb_false)
+			return pcb_false;
+
+		path = sketch_find_shortest_path(&attached_path.corridor);
+		path->thickness = conf_core.design.line_thickness;
+		path->clearance = conf_core.design.clearance;
+		sketch_insert_wire(attached_path.sketch, path);
+		sketch_update_cdt_layer(attached_path.sketch);
+		sketch_update_erbs(attached_path.sketch);
+		sketch_update_erbs_layer(attached_path.sketch);
+		wire_uninit(path);
+		return pcb_true;
+	}
+
+	return pcb_false;
+}
+
+static void tool_skline_init(void)
+{
+	if (htip_length(&sketches) == 0)
+		sketches_init();
+}
+
+static void tool_skline_uninit(void)
+{
+	pcb_notify_crosshair_change(pcb_false);
+	attached_path_uninit();
+	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+	pcb_notify_crosshair_change(pcb_true);
+}
+
+static void tool_skline_notify_mode(void)
+{
+	int type;
+	void *ptr1, *ptr2, *ptr3;
+	pcb_any_obj_t *term_obj;
+
+	switch (pcb_crosshair.AttachedObject.State) {
+	case PCB_CH_STATE_FIRST:
+		type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_CLASS_TERM, &ptr1, &ptr2, &ptr3);
+		/* TODO: check if an object is on the current layer */
+		if (type != PCB_OBJ_VOID) {
+			term_obj = ptr2;
+			if (term_obj->term != NULL
+					&& ((type == PCB_OBJ_PSTK && pcb_pstk_shape_at(PCB, (pcb_pstk_t *) term_obj, CURRENT) != NULL)
+							|| type != PCB_OBJ_PSTK)
+					&& attached_path_init(CURRENT, term_obj)) {
+				pcb_crosshair.AttachedObject.Type = PCB_OBJ_LINE;
+				pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
+			}
+			else
+				pcb_message(PCB_MSG_WARNING, _("Sketch lines can be only drawn from a terminal\n"));
+		}
+		break;
+
+	case PCB_CH_STATE_SECOND:
+		type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_OBJ_CLASS_TERM, &ptr1, &ptr2, &ptr3);
+		/* TODO: check if an object is on the current layer */
+		if (type != PCB_OBJ_VOID) {
+			term_obj = ptr2;
+			if (term_obj->term != NULL
+					&& ((type == PCB_OBJ_PSTK && pcb_pstk_shape_at(PCB, (pcb_pstk_t *) term_obj, CURRENT) != NULL)
+							|| type != PCB_OBJ_PSTK)) {
+				if (attached_path_finish(term_obj) == pcb_true) {
+					attached_path_uninit();
+					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
+					pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
+				} else {
+					pcb_message(PCB_MSG_WARNING, _("Cannot finish placing wire at this terminal\n"));
+					pcb_message(PCB_MSG_WARNING, _("(the terminal does not belong to the routed net or is the starting terminal)\n"));
+				}
+				break;
+			}
+		}
+		if (attached_path_next_point(NULL) == pcb_false)
+			pcb_message(PCB_MSG_WARNING, _("Cannot route the wire this way\n"));
+
+		break;
+	}
+}
+
+static void tool_skline_adjust_attached_objects(void)
+{
+	int last = vtp0_len(&attached_path.lines) - 1;
+	if (last >= 0) {
+		((pcb_attached_line_t *) attached_path.lines.array[last])->Point2.X = pcb_crosshair.X;
+		((pcb_attached_line_t *) attached_path.lines.array[last])->Point2.Y = pcb_crosshair.Y;
+	}
+}
+
+static void tool_skline_draw_attached(void)
+{
+	int i;
+	if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
+		for (i = 0; i < vtp0_len(&attached_path.lines); i++) {
+			pcb_point_t *p1 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point1;
+			pcb_point_t *p2 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point2;
+			pcb_gui->draw_line(pcb_crosshair.GC, p1->X, p1->Y, p2->X, p2->Y);
+		}
+	}
+}
+
+pcb_bool tool_skline_undo_act(void)
+{
+	/* TODO */
+	return pcb_false;
+}
+
+static pcb_tool_t tool_skline = {
+	"skline", NULL, 100,
+	tool_skline_init,
+	tool_skline_uninit,
+	tool_skline_notify_mode,
+	NULL,
+	tool_skline_adjust_attached_objects,
+	tool_skline_draw_attached,
+	tool_skline_undo_act,
+	NULL,
+
+	pcb_false
+};
+
+
+/*** actions ***/
+static const char pcb_acts_skretriangulate[] = "skretriangulate()";
+static const char pcb_acth_skretriangulate[] = "Reconstruct CDT on all layer groups";
+fgw_error_t pcb_act_skretriangulate(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	sketches_uninit();
+	sketches_init();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static const char pcb_acts_skline[] = "skline()";
+static const char pcb_acth_skline[] = "Tool for drawing sketch lines";
+fgw_error_t pcb_act_skline(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_tool_select_by_name("skline");
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+pcb_action_t sketch_route_action_list[] = {
+	{"skretriangulate", pcb_act_skretriangulate, pcb_acth_skretriangulate, pcb_acts_skretriangulate},
+	{"skline", pcb_act_skline, pcb_acth_skline, pcb_acts_skline}
+};
+
+PCB_REGISTER_ACTIONS(sketch_route_action_list, pcb_sketch_route_cookie)
+
+int pplg_check_ver_sketch_route(int ver_needed) { return 0; }
+
+void pplg_uninit_sketch_route(void)
+{
+	pcb_remove_actions_by_cookie(pcb_sketch_route_cookie);
+	pcb_tool_unreg_by_cookie(pcb_sketch_route_cookie); /* should be done before pcb_tool_uninit, somehow */
+	sketches_uninit();
+}
+
+
+#include "dolists.h"
+int pplg_init_sketch_route(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(sketch_route_action_list, pcb_sketch_route_cookie)
+
+	pcb_tool_reg(&tool_skline, pcb_sketch_route_cookie);
+
+	return 0;
+}
Index: tags/2.0.1/src_plugins/sketch_route/sketch_route.pup
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/sketch_route.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/sketch_route.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short assisted semi-auto-routing
+$long TODO
+$state WIP
+#$package auto
+default disable
+autoload 1
Index: tags/2.0.1/src_plugins/sketch_route/sktypedefs.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/sktypedefs.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/sktypedefs.h	(revision 18980)
@@ -0,0 +1,16 @@
+#ifndef SKTYPEDEFS_H
+#define SKTYPEDEFS_H
+
+typedef enum {
+  SIDE_LEFT = (1<<0),
+  SIDE_RIGHT = (1<<1),
+  SIDE_TERM = (1<<1)|(1<<0)
+} side_t;
+
+typedef struct spoke_s spoke_t;
+typedef struct pointdata_s pointdata_t;
+typedef struct wire_s wire_t;
+typedef struct wire_point_s wire_point_t;
+typedef struct wirelist_node_s wirelist_node_t;
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/spoke.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/spoke.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/spoke.c	(revision 18980)
@@ -0,0 +1,141 @@
+#include "config.h"
+#include "conf_core.h"
+
+#include "spoke.h"
+#include "pointdata.h"
+#include "wire.h"
+
+
+void spoke_init(spoke_t *sp, spoke_dir_t dir, point_t *p)
+{
+	vtp0_init(&sp->slots);
+	sp->dir = dir;
+	sp->p = p;
+	/* TODO:
+	spoke_bbox(sp);
+	pcb_r_insert_entry(spoke_tree, sp);
+	*/
+}
+
+void spoke_uninit(spoke_t *sp)
+{
+	/* TODO:
+	pcb_r_delete_entry(spoke_tree, &pd->spokes[i]);
+	*/
+	vtp0_uninit(&sp->slots);
+}
+
+static void spoke_pos(spoke_t *sp, pcb_coord_t spacing, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_box_t *obj_bbox = &((pointdata_t *) sp->p->data)->obj->bbox_naked;
+	pcb_coord_t half_obj_w, half_obj_h;
+
+	half_obj_w = (obj_bbox->X2 - obj_bbox->X1 + 1) / 2;
+	half_obj_h = (obj_bbox->Y2 - obj_bbox->Y1 + 1) / 2;
+
+	switch(sp->dir) {
+	case SPOKE_DIR_1PI4:
+		*x = sp->p->pos.x + half_obj_w + spacing;
+		*y = (-sp->p->pos.y) - half_obj_h - spacing;
+		break;
+	case SPOKE_DIR_3PI4:
+		*x = sp->p->pos.x - half_obj_w - spacing;
+		*y = (-sp->p->pos.y) - half_obj_h - spacing;
+		break;
+	case SPOKE_DIR_5PI4:
+		*x = sp->p->pos.x - half_obj_w - spacing;
+		*y = (-sp->p->pos.y) + half_obj_h + spacing;
+		break;
+	case SPOKE_DIR_7PI4:
+		*x = sp->p->pos.x + half_obj_w + spacing;
+		*y = (-sp->p->pos.y) + half_obj_h + spacing;
+		break;
+	}
+}
+
+void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pointdata_t *pd = wp->p->data;
+	wirelist_node_t *w_node = wp->wire_node;
+	pcb_coord_t spacing;
+
+	assert(w_node != NULL);
+
+	spacing = (w_node->item->thickness + 1)/2;
+	spacing += conf_core.design.bloat;
+	w_node = w_node->next;
+	if (wirelist_get_index(pd->uturn_wires, w_node) != -1) {
+		WIRELIST_FOREACH(w, wp->wire_node)
+			spacing += w->thickness;
+			spacing += conf_core.design.bloat;
+		WIRELIST_FOREACH_END();
+	}
+	else {
+		WIRELIST_FOREACH(w, w_node)
+			spacing += w->thickness;
+			spacing += conf_core.design.bloat;
+		WIRELIST_FOREACH_END();
+		WIRELIST_FOREACH(w, pd->uturn_wires)
+			spacing += w->thickness;
+			spacing += conf_core.design.bloat;
+		WIRELIST_FOREACH_END();
+	}
+
+	spoke_pos(sp, spacing, x, y);
+}
+
+void spoke_pos_at_slot(spoke_t *sp, int slot, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_coord_t spacing = 0;
+	int i;
+
+	assert(slot < vtp0_len(&sp->slots));
+
+	for (i = 0; i < slot; i++) {
+		spacing += conf_core.design.bloat;
+		spacing += ((ewire_t *) (sp->slots.array[i]))->wire->thickness;
+	}
+	spacing += conf_core.design.bloat;
+	spacing += (((ewire_t *) (sp->slots.array[slot]))->wire->thickness + 1)/2;
+
+	spoke_pos(sp, spacing, x, y);
+}
+
+void spoke_pos_at_end(spoke_t *sp, pcb_coord_t bloat, pcb_coord_t *x, pcb_coord_t *y)
+{
+	pcb_coord_t spacing = 0;
+	int i;
+
+	if (vtp0_len(&sp->slots) > 0) {
+		for (i = 0; i < vtp0_len(&sp->slots) - 1; i++) {
+			spacing += conf_core.design.bloat;
+			spacing += ((ewire_t *) (sp->slots.array[i]))->wire->thickness;
+		}
+		if (bloat < 0)
+			spacing += (((ewire_t *) (sp->slots.array[vtp0_len(&sp->slots) - 1]))->wire->thickness + 1)/2;
+		else
+			spacing += ((ewire_t *) (sp->slots.array[vtp0_len(&sp->slots) - 1]))->wire->thickness;
+	}
+
+	if (bloat >= 0) {
+		spacing += conf_core.design.bloat;
+		spacing += bloat;
+	}
+
+	spoke_pos(sp, spacing, x, y);
+}
+
+void spoke_insert_wire_at_slot(spoke_t *sp, int slot_num, ewire_t *ew)
+{
+	if (vtp0_in_bound(&sp->slots, slot_num) && sp->slots.array[slot_num] != NULL) {
+		int i;
+		/* move all slots, starting from the slot_num, one step outside */
+		for (i = slot_num; i < vtp0_len(&sp->slots); i++) {
+			ewire_point_t *ewp = ewire_get_point_at_slot(sp->slots.array[i], sp, i);
+			assert(ewp != NULL);
+			ewp->sp_slot = i + 1;
+		}
+		vtp0_alloc_insert(&sp->slots, slot_num, 1);
+	}
+	vtp0_set(&sp->slots, slot_num, ew);
+}
Index: tags/2.0.1/src_plugins/sketch_route/spoke.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/spoke.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/spoke.h	(revision 18980)
@@ -0,0 +1,36 @@
+#ifndef SPOKE_H
+#define SPOKE_H
+
+#include "sktypedefs.h"
+#include "obj_common.h"
+#include "ewire.h"
+#include "cdt/point.h"
+
+#include <genvector/vtp0.h>
+
+
+typedef enum {
+  SPOKE_DIR_1PI4 = 0,
+  SPOKE_DIR_3PI4 = 1,
+  SPOKE_DIR_5PI4 = 2,
+  SPOKE_DIR_7PI4 = 3
+} spoke_dir_t;
+
+struct spoke_s {
+  spoke_dir_t dir;
+	pcb_box_t bbox;
+	vtp0_t slots;
+  point_t *p;
+};
+
+
+void spoke_init(spoke_t *sp, spoke_dir_t dir, point_t *p);
+void spoke_uninit(spoke_t *sp);
+
+void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, pcb_coord_t *x, pcb_coord_t *y);
+void spoke_pos_at_slot(spoke_t *sp, int slot, pcb_coord_t *x, pcb_coord_t *y);
+void spoke_pos_at_end(spoke_t *sp, pcb_coord_t bloat, pcb_coord_t *x, pcb_coord_t *y);
+
+void spoke_insert_wire_at_slot(spoke_t *sp, int slot_num, ewire_t *ew);
+
+#endif
Index: tags/2.0.1/src_plugins/sketch_route/wire.c
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/wire.c	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/wire.c	(revision 18980)
@@ -0,0 +1,115 @@
+#include <assert.h>
+#include "pointdata.h"
+
+#define GVT_DONT_UNDEF
+#define LST_DONT_UNDEF
+#include "wire.h"
+
+#define WIRE_POINTS_STEP 10
+
+void wire_init(wire_t *w)
+{
+	w->point_num = 0;
+	w->point_max = WIRE_POINTS_STEP;
+	w->points = malloc(WIRE_POINTS_STEP*sizeof(wire_point_t));
+}
+
+void wire_uninit(wire_t *w)
+{
+	free(w->points);
+}
+
+void wire_push_point(wire_t *w, point_t *p, int side)
+{
+	w->points[w->point_num].p = p;
+	w->points[w->point_num].side = side;
+	if (++w->point_num >= w->point_max) {
+		w->point_max += WIRE_POINTS_STEP;
+		w->points = realloc(w->points, w->point_max*sizeof(wire_point_t));
+	}
+}
+
+void wire_pop_point(wire_t *w)
+{
+	if(w->point_num > 0)
+		w->point_num--;
+}
+
+void wire_copy(wire_t *dst, wire_t *src)
+{
+	wire_point_t *temp = dst->points;
+	memcpy(dst, src, sizeof(wire_point_t));
+	dst->points = temp;
+	dst->points = realloc(dst->points, src->point_max*sizeof(wire_point_t));
+	memcpy(dst->points, src->points, src->point_num*sizeof(wire_point_t));
+}
+
+int wire_node_index(wire_t *w, wirelist_node_t *node)
+{
+  int i;
+  for (i = 0; i < w->point_num; i++) {
+    if (w->points[i].wire_node == node)
+      return i;
+  }
+  return -1;
+}
+
+int wire_node_index_at_connected_point(wirelist_node_t *node, point_t *p)
+{
+	wire_t *w = node->item;
+  int i = wire_node_index(w, node);
+  if (i == -1)
+    return -1;
+  if (i == 0)
+    return w->points[1].p == p ? 1 : -1;
+  if (i == w->point_num - 1)
+    return w->points[w->point_num - 2].p == p ? (w->point_num - 2) : -1;
+  return (w->points[i - 1].p == p) ? i - 1
+				 : (w->points[i + 1].p == p) ? i + 1 : -1;
+}
+
+int wire_is_node_connected_with_point(wirelist_node_t *node, point_t *p)
+{
+	return wire_node_index_at_connected_point(node, p) != -1;
+}
+
+int wire_is_coincident_at_node(wirelist_node_t *node, point_t *p1, point_t *p2)
+{
+  wire_t *w = node->item;
+  int i = wire_node_index(w, node);
+  assert(i != -1 && i != 0 && i != w->point_num - 1);
+  return (w->points[i - 1].p == p1 && w->points[i + 1].p == p2)
+				 || (w->points[i + 1].p == p1 && w->points[i - 1].p == p2);
+}
+
+int wire_point_position(wire_point_t *wp)
+{
+  pointdata_t *pd = wp->p->data;
+  if (wirelist_get_index(pd->uturn_wires, wp->wire_node) != -1)
+    return wirelist_length(wp->wire_node) - 1;
+  else
+    return wirelist_length(wp->wire_node) + wirelist_length(pd->uturn_wires) - 1;
+}
+
+static int LST(compare_func)(LST_ITEM_T *a, LST_ITEM_T *b)
+{
+  return *a == *b;
+}
+
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  *elem = malloc(sizeof(**elem));
+  if (*elem == NULL)
+    return 1;
+  wire_init(*elem);
+  return 0;
+}
+
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem)
+{
+  wire_uninit(*elem);
+  free(*elem);
+}
+
+#include "cdt/list/list.c"
+#include <genvector/genvector_impl.c>
Index: tags/2.0.1/src_plugins/sketch_route/wire.h
===================================================================
--- tags/2.0.1/src_plugins/sketch_route/wire.h	(nonexistent)
+++ tags/2.0.1/src_plugins/sketch_route/wire.h	(revision 18980)
@@ -0,0 +1,93 @@
+#ifndef WIRE_H
+#define WIRE_H
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "cdt/typedefs.h"
+#include "sktypedefs.h"
+
+
+struct wire_point_s {
+	point_t *p;
+	side_t side;
+  wirelist_node_t *wire_node;
+};
+
+struct wire_s {
+	int point_num;
+	int point_max;
+	wire_point_t *points;
+	pcb_coord_t thickness;
+	pcb_coord_t clearance;
+};
+
+typedef wire_t* wire_ptr_t;
+
+void wire_init(wire_t *w);
+void wire_uninit(wire_t *w);
+void wire_push_point(wire_t *w, point_t *p, int side);
+void wire_pop_point(wire_t *w);
+void wire_copy(wire_t *dst, wire_t *src);
+
+int wire_node_index(wire_t *w, wirelist_node_t *node);
+int wire_node_index_at_connected_point(wirelist_node_t *node, point_t *p);
+int wire_is_node_connected_with_point(wirelist_node_t *node, point_t *p);
+int wire_is_coincident_at_node(wirelist_node_t *node, point_t *p1, point_t *p2);
+int wire_point_position(wire_point_t *wp); /* counting from the inside */
+
+
+/* List */
+#define LST(x) wirelist_ ## x
+#define LST_ITEM_T wire_ptr_t
+#define LST_DONT_TYPEDEF_NODE
+
+#include "cdt/list/list.h"
+
+#ifndef LST_DONT_UNDEF
+	#undef LST
+	#undef LST_ITEM_T
+	#undef LST_DONT_TYPEDEF_NODE
+#endif
+
+#define WIRELIST_FOREACH(_loop_item_, _list_) do { \
+	wirelist_node_t *_node_ = _list_; \
+	while (_node_ != NULL) { \
+		wire_t *_loop_item_ = _node_->item;
+
+#define WIRELIST_FOREACH_END() \
+		_node_ = _node_->next; \
+	} \
+} while(0)
+
+
+/* Vector */
+#define GVT(x) vtwire_ ## x
+#define GVT_ELEM_TYPE wire_ptr_t
+#define GVT_SIZE_TYPE size_t
+#define GVT_DOUBLING_THRS 4096
+#define GVT_START_SIZE 32
+#define GVT_FUNC
+#define GVT_SET_NEW_BYTES_TO 0
+#define GVT_ELEM_CONSTRUCTOR
+#define GVT_ELEM_DESTRUCTOR
+#define GVT_ELEM_COPY
+
+#include <genvector/genvector_impl.h>
+#define GVT_REALLOC(vect, ptr, size)  realloc(ptr, size)
+#define GVT_FREE(vect, ptr)           free(ptr)
+int GVT(constructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+void GVT(destructor)(GVT(t) *vect, GVT_ELEM_TYPE *elem);
+#include <genvector/genvector_undef.h>
+
+#define VTWIRE_FOREACH(_loop_item_, _vt_) do { \
+	int _i_; \
+	for (_i_ = 0; _i_ < vtwire_len(_vt_); _i_++) { \
+		wire_t *_loop_item_ = (_vt_)->array[_i_];
+
+#define VTWIRE_FOREACH_END() \
+	} \
+} while(0)
+
+#endif
Index: tags/2.0.1/src_plugins/smartdisperse/Makefile
===================================================================
--- tags/2.0.1/src_plugins/smartdisperse/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/smartdisperse/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_smartdisperse
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/smartdisperse/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/smartdisperse/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/smartdisperse/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {smartdisperse}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/smartdisperse/smartdisperse.o @]
+
+switch /local/pcb/smartdisperse/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- tags/2.0.1/src_plugins/smartdisperse/smartdisperse.c	(nonexistent)
+++ tags/2.0.1/src_plugins/smartdisperse/smartdisperse.c	(revision 18980)
@@ -0,0 +1,256 @@
+/*
+ * Smartdisperse plug-in for PCB.
+ *
+ * Copyright (C) 2007 Ben Jackson <ben@ben.com> based on
+ * teardrops.c by Copyright (C) 2006 DJ Delorie <dj@delorie.com> as well
+ * as the original action.c, and autoplace.c.
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ * Upgraded to subc by Tibor 'Igor2' Palinkas in 2017.
+ *
+ * Improve the initial dispersion of subcircuits by choosing an order based
+ * on the netlist, rather than the arbitrary subcircuit order.  This isn't
+ * the same as a global autoplace, it's more of a linear autoplace.  It
+ * might make some useful local groupings.  For example, you should not
+ * have to chase all over the board to find the resistor that goes with
+ * a given LED.
+ */
+
+#include <stdio.h>
+#include <math.h>
+
+#include <genht/htpi.h>
+
+#include "config.h"
+#include "board.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "rats.h"
+#include "error.h"
+#include "move.h"
+#include "draw.h"
+#include "plugins.h"
+#include "actions.h"
+#include "compat_nls.h"
+#include "obj_subc.h"
+#include "obj_subc_parent.h"
+#include "funchash_core.h"
+
+#define GAP 10000
+static pcb_coord_t minx;
+static pcb_coord_t miny;
+static pcb_coord_t maxx;
+static pcb_coord_t maxy;
+
+/* the same for subcircuits
+   Must initialize statics above before calling for the first time.
+   This was taken almost entirely from pcb_act_DisperseElements, with cleanup */
+static void place_subc(pcb_subc_t *sc)
+{
+	pcb_coord_t dx, dy, ox = 0, oy = 0;
+
+	pcb_subc_get_origin(sc, &ox, &oy);
+
+	/* figure out how much to move the subcircuit */
+	dx = minx - sc->BoundingBox.X1;
+	dy = miny - sc->BoundingBox.Y1;
+
+	/* snap to the grid */
+	dx -= (ox + dx) % PCB->Grid;
+	dx += PCB->Grid;
+	dy -= (oy + dy) % PCB->Grid;
+	dy += PCB->Grid;
+
+	/* and add one grid size so we make sure we always space by GAP or more */
+	dx += PCB->Grid;
+
+	/* Figure out if this row has room.  If not, start a new row */
+	if (minx != GAP && GAP + sc->BoundingBox.X2 + dx > PCB->MaxWidth) {
+		miny = maxy + GAP;
+		minx = GAP;
+		place_subc(sc); /* recurse can't loop, now minx==GAP */
+		return;
+	}
+
+	pcb_subc_move(sc, dx, dy, 1);
+	pcb_undo_add_obj_to_move(PCB_OBJ_SUBC, NULL, NULL, sc, dx, dy);
+
+	/* keep track of how tall this row is */
+	minx += sc->BoundingBox.X2 - sc->BoundingBox.X1 + GAP;
+	if (maxy < sc->BoundingBox.Y2)
+		maxy = sc->BoundingBox.Y2;
+}
+
+/* Return the X location of a connection's terminal within its subcircuit. */
+static pcb_coord_t padDX(pcb_connection_t * conn)
+{
+	pcb_subc_t *subc = (pcb_subc_t *)conn->ptr1;
+	pcb_any_obj_t *line = (pcb_any_obj_t *)conn->obj;
+
+	return line->BoundingBox.X1 - (subc->BoundingBox.X1 + subc->BoundingBox.X2) / 2;
+}
+
+/* Return true if ea,eb would be the best order, else eb,ea, based on pad loc. */
+static int padorder(pcb_connection_t * conna, pcb_connection_t * connb)
+{
+	pcb_coord_t dxa, dxb;
+
+	dxa = padDX(conna);
+	dxb = padDX(connb);
+	/* there are other cases that merit rotation, ignore them for now */
+	if (dxa > 0 && dxb < 0)
+		return 1;
+	return 0;
+}
+
+#define IS_IN_SUBC(CONN)  (pcb_obj_parent_subc((CONN)->obj) != NULL)
+
+#define set_visited(obj) htpi_set(&visited, ((void *)(obj)), 1)
+#define is_visited(obj)  htpi_has(&visited, ((void *)(obj)))
+
+static const char pcb_acts_smartdisperse[] = "SmartDisperse([All|Selected])";
+static const char pcb_acth_smartdisperse[] = "TODO";
+static fgw_error_t pcb_act_smartdisperse(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	int op = -2;
+	pcb_netlist_t *Nets;
+	htpi_t visited;
+	int all;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_KEYWORD, smartdisperse, op = fgw_keyword(&argv[1]));
+
+	switch(op) {
+		case -2:
+		case F_All: all = 1; break;
+		case F_Selected: all = 0; break;
+		default:
+			PCB_ACT_FAIL(smartdisperse);
+	}
+
+	Nets = pcb_rat_proc_netlist(&PCB->NetlistLib[0]);
+	if (!Nets) {
+		pcb_message(PCB_MSG_ERROR, _("Can't use SmartDisperse because no netlist is loaded.\n"));
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* remember which subcircuits we finish with */
+	htpi_init(&visited, ptrhash, ptrkeyeq);
+
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (!(all || PCB_FLAG_TEST(PCB_FLAG_SELECTED, subc)))
+			set_visited(subc);
+	}
+	PCB_END_LOOP;
+
+	/* initialize variables for place() */
+	minx = GAP;
+	miny = GAP;
+	maxx = GAP;
+	maxy = GAP;
+
+	/* Pick nets with two connections.  This is the start of a more
+	 * elaborate algorithm to walk serial nets, but the datastructures
+	 * are too gross so I'm going with the 80% solution. */
+	PCB_NET_LOOP(Nets);
+	{
+		pcb_connection_t *conna, *connb;
+		pcb_subc_t *ea, *eb;
+
+		if (net->ConnectionN != 2)
+			continue;
+
+		conna = &net->Connection[0];
+		connb = &net->Connection[1];
+		if (!IS_IN_SUBC(conna) || !IS_IN_SUBC(conna))
+			continue;
+
+		ea = (pcb_subc_t *) conna->ptr1;
+		eb = (pcb_subc_t *) connb->ptr1;
+
+		/* place this pair if possible */
+		if (is_visited(ea) || is_visited(eb))
+			continue;
+		set_visited(ea);
+		set_visited(eb);
+
+		/* a weak attempt to get the linked pads side-by-side */
+		if (padorder(conna, connb)) {
+			place_subc(ea);
+			place_subc(eb);
+		}
+		else {
+			place_subc(eb);
+			place_subc(ea);
+		}
+	}
+	PCB_END_LOOP;
+
+	/* Place larger nets, still grouping by net */
+	PCB_NET_LOOP(Nets);
+	{
+		PCB_CONNECTION_LOOP(net);
+		{
+			pcb_subc_t *parent;
+
+			if (!IS_IN_SUBC(connection))
+				continue;
+
+			parent = connection->ptr1;
+
+			/* place this one if needed */
+			if (is_visited(parent))
+				continue;
+			set_visited(parent);
+			place_subc(parent);
+		}
+		PCB_END_LOOP;
+	}
+	PCB_END_LOOP;
+
+	/* Place up anything else */
+	PCB_SUBC_LOOP(PCB->Data);
+	{
+		if (!is_visited(subc))
+			place_subc(subc);
+	}
+	PCB_END_LOOP;
+
+	htpi_uninit(&visited);
+
+	pcb_undo_inc_serial();
+	pcb_redraw();
+	pcb_board_set_changed_flag(1);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t smartdisperse_action_list[] = {
+	{"smartdisperse", pcb_act_smartdisperse, pcb_acth_smartdisperse, pcb_acts_smartdisperse}
+};
+
+char *smartdisperse_cookie = "smartdisperse plugin";
+
+PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie)
+
+int pplg_check_ver_smartdisperse(int ver_needed) { return 0; }
+
+void pplg_uninit_smartdisperse(void)
+{
+	pcb_remove_actions_by_cookie(smartdisperse_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_smartdisperse(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(smartdisperse_action_list, smartdisperse_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/smartdisperse/smartdisperse.pup
===================================================================
--- tags/2.0.1/src_plugins/smartdisperse/smartdisperse.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/smartdisperse/smartdisperse.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short netlist based dispenser
+$long Improve the initial dispersion of subcircuits by choosing an order based on the netlist, rather than the arbitrary subcircuit order.  This isn't the same as a global autoplace, it's more of a linear autoplace.  It might make some useful local groupings.  For example, you should not have to chase all over the board to find the resistor that goes with a given LED.
+$state works
+$package auto
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/stroke/Makefile
===================================================================
--- tags/2.0.1/src_plugins/stroke/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_stroke
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/stroke/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/stroke/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,32 @@
+put /local/pcb/mod {stroke}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/stroke/stroke.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/stroke/stroke_conf.h}
+
+switch /local/pcb/stroke/controls
+	case {disable} end;
+	default
+		put /local/pcb/mod/LDFLAGS         libs/gui/libstroke/ldflags
+		put /local/pcb/mod/CFLAGS          libs/gui/libstroke/cflags
+		end
+end
+
+
+switch /local/pcb/stroke/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
+
+switch /local/pcb/stroke/controls
+	case {disable}   end;
+	default
+		append /local/pcb/DEPDEPS { ../src_plugins/stroke/conf_internal.c }
+		append /local/pcb/DISTCLEANFILES { ../src_plugins/stroke/conf_internal.c }
+		append /local/pcb/rules/install_ {\n	$(SCCBOX) $(HOW) "../src_plugins/stroke/stroke.conf" "$(DATADIR)/stroke.conf"}
+
+		append /local/pcb/RULES [@
+../src_plugins/stroke/conf_internal.c: ../src_plugins/stroke/stroke.conf $(CQUOTE)
+	$(CQUOTE) -n stroke_conf_internal < ../src_plugins/stroke/stroke.conf > ../src_plugins/stroke/conf_internal.c
+@]
+	end
+end
Index: tags/2.0.1/src_plugins/stroke/stroke.c
===================================================================
--- tags/2.0.1/src_plugins/stroke/stroke.c	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/stroke.c	(revision 18980)
@@ -0,0 +1,182 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+/* Configurable mouse gestures using libstroke */
+
+#include "config.h"
+
+#include <stroke.h>
+
+#include "board.h"
+#include "conf_core.h"
+#include "crosshair.h"
+#include "actions.h"
+#include "unit.h"
+#include "plugins.h"
+#include "stub_stroke.h"
+#include "compat_misc.h"
+#include "tool.h"
+
+#include "../src_plugins/stroke/conf_internal.c"
+#include "stroke_conf.h"
+
+#define STROKE_CONF_FN "export_xy.conf"
+
+conf_stroke_t conf_stroke;
+
+#define SIDE_X(x)  ((conf_core.editor.view.flip_x ? PCB->MaxWidth - (x) : (x)))
+#define SIDE_Y(y)  ((conf_core.editor.view.flip_y ? PCB->MaxHeight - (y) : (y)))
+
+static const char *pcb_stroke_cookie = "stroke plugin";
+
+static pcb_coord_t stroke_first_x, stroke_first_y, stroke_last_x, stroke_last_y;
+
+static int pcb_stroke_exec(const char *seq)
+{
+	conf_listitem_t *item;
+	int idx;
+
+	conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) {
+		if ((strcmp(seq, item->name) == 0) && (pcb_parse_actions(item->val.string[0]) == 0))
+			return 0;
+	}
+	if (conf_stroke.plugins.stroke.warn4unknown)
+		pcb_message(PCB_MSG_WARNING, "Stroke: sequence '%s' is not configured.\n", seq);
+	return -1;
+}
+
+static int pcb_stroke_finish(void)
+{
+	char msg[255];
+
+	pcb_mid_stroke = pcb_false;
+	if (stroke_trans(msg))
+		return pcb_stroke_exec(msg);
+	return -1;
+}
+
+static void pcb_stroke_record(pcb_coord_t ev_x, pcb_coord_t ev_y)
+{
+	stroke_last_x = ev_x;
+	stroke_last_y = ev_y;
+	ev_x = SIDE_X(ev_x) - stroke_first_x;
+	ev_y = SIDE_Y(ev_y) - stroke_first_y;
+	stroke_record(ev_x / (1 << 16), ev_y / (1 << 16));
+	return;
+}
+
+static void pcb_stroke_start(void)
+{
+	pcb_mid_stroke = pcb_true;
+	stroke_first_x = SIDE_X(pcb_crosshair.X);
+	stroke_first_y = SIDE_Y(pcb_crosshair.Y);
+}
+
+/*** action ***/
+
+static const char pcb_acts_stroke[] = "stroke(gesture, seq)";
+static const char pcb_acth_stroke[] = "Various gesture recognition related functions";
+static fgw_error_t pcb_act_stroke(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *cmd, *arg = NULL;
+
+	PCB_ACT_CONVARG(1, FGW_STR, stroke,  cmd = argv[1].val.str);
+
+	if (strcmp(cmd, "gesture") == 0) {
+		PCB_ACT_MAY_CONVARG(2, FGW_STR, stroke,  arg = argv[2].val.str);
+		if (arg == NULL)
+			PCB_ACT_FAIL(stroke);
+		pcb_stroke_exec(arg);
+	}
+	else if (pcb_strcasecmp(cmd, "zoom") == 0) {
+		fgw_arg_t args[5];
+		fgw_func_t *f = fgw_func_lookup(&pcb_fgw, "zoomto");
+
+		if (f == NULL) {
+			pcb_message(PCB_MSG_ERROR, "zoomto action is not available");
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		args[0].type = FGW_FUNC; args[0].val.func = f;
+		args[1].type = FGW_COORD; fgw_coord(&args[1]) = stroke_first_x;
+		args[2].type = FGW_COORD; fgw_coord(&args[2]) = stroke_first_y;
+		args[3].type = FGW_COORD; fgw_coord(&args[3]) = stroke_last_x;
+		args[4].type = FGW_COORD; fgw_coord(&args[4]) = stroke_last_y;
+		return pcb_actionv_(f, res, 5, args);
+	}
+	else if (pcb_strcasecmp(cmd, "stopline") == 0) {
+		if (conf_core.editor.mode == PCB_MODE_LINE)
+			pcb_tool_select_by_id(PCB_MODE_LINE);
+		else if (conf_core.editor.mode == PCB_MODE_POLYGON)
+			pcb_tool_select_by_id(PCB_MODE_POLYGON);
+		else if (conf_core.editor.mode == PCB_MODE_POLYGON_HOLE)
+			pcb_tool_select_by_id(PCB_MODE_POLYGON_HOLE);
+	}
+	else
+		PCB_ACT_FAIL(stroke);
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/*** administration ***/
+
+pcb_action_t stroke_action_list[] = {
+	{"stroke", pcb_act_stroke, pcb_acth_stroke, pcb_acts_stroke}
+};
+PCB_REGISTER_ACTIONS(stroke_action_list, pcb_stroke_cookie)
+
+
+int pplg_check_ver_stroke(int ver_needed) { return 0; }
+
+int pplg_uninit_stroke(void)
+{
+	conf_unreg_file(STROKE_CONF_FN, stroke_conf_internal);
+	conf_unreg_fields("plugins/stroke/");
+	pcb_remove_actions_by_cookie(pcb_stroke_cookie);
+	return 0;
+}
+
+
+#include "dolists.h"
+int pplg_init_stroke(void)
+{
+	PCB_API_CHK_VER;
+	stroke_init();
+	conf_reg_file(STROKE_CONF_FN, stroke_conf_internal);
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_stroke, field,isarray,type_name,cpath,cname,desc,flags);
+#include "stroke_conf_fields.h"
+
+	PCB_REGISTER_ACTIONS(stroke_action_list, pcb_stroke_cookie)
+
+	pcb_stub_stroke_record = pcb_stroke_record;
+	pcb_stub_stroke_start  = pcb_stroke_start;
+	pcb_stub_stroke_finish = pcb_stroke_finish;
+	return 0;
+}
Index: tags/2.0.1/src_plugins/stroke/stroke.conf
===================================================================
--- tags/2.0.1/src_plugins/stroke/stroke.conf	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/stroke.conf	(revision 18980)
@@ -0,0 +1,64 @@
+li:pcb-rnd-conf-v1 {
+	ha:overwrite {
+		ha:plugins {
+			ha:stroke {
+				warn4unknown = 1
+				li:gestures {
+					# Gestures are written as a sequence of 'phone dial numbers', tracing
+					# the movement of the gesture on a dial pad. The digits are arranged
+					# like this:
+					#
+					# 1 2 3
+					# 4 5 6
+					# 7 8 9
+
+					# mode selection
+					258      = { Mode(Line) }
+					456      = { Stroke(stopline) }
+					852      = { Mode(Arrow) }
+					148963   = { Mode(Via) }
+					147863   = { Mode(Via) }
+					147853   = { Mode(Via) }
+					145863   = { Mode(Via) }
+
+					# rotation
+					9874123  = { Rotate90(-1) }
+					74123    = { Rotate90(-1) }
+					987412   = { Rotate90(-1) }
+					8741236  = { Rotate90(-1) }
+					874123   = { Rotate90(-1) }
+					7896321  = { Rotate90(+1) }
+					786321   = { Rotate90(+1) }
+					789632   = { Rotate90(+1) }
+					896321   = { Rotate90(+1) }
+
+					# undo and redo
+					1478963  = { Undo() }
+					147423   = { Redo() }
+					147523   = { Redo() }
+					1474123  = { Redo() }
+
+					# zoom
+					159      = { Stroke(Zoom) }
+					1269     = { Stroke(Zoom) }
+					1259     = { Stroke(Zoom) }
+					1459     = { Stroke(Zoom) }
+					1569     = { Stroke(Zoom) }
+					1589     = { Stroke(Zoom) }
+					12569    = { Stroke(Zoom) }
+					12589    = { Stroke(Zoom) }
+					14589    = { Stroke(Zoom) }
+					951      = { Zoom() }
+					9651     = { Zoom() }
+					9521     = { Zoom() }
+					9621     = { Zoom() }
+					9851     = { Zoom() }
+					9541     = { Zoom() }
+					96521    = { Zoom() }
+					96541    = { Zoom() }
+					98541    = { Zoom() }
+				}
+			}
+		}
+	}
+}
Index: tags/2.0.1/src_plugins/stroke/stroke.pup
===================================================================
--- tags/2.0.1/src_plugins/stroke/stroke.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/stroke.pup	(revision 18980)
@@ -0,0 +1,6 @@
+$class feature
+$short mouse gestures
+$long Configurable gesture recognition with libstroke.
+$state works
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/stroke/stroke_conf.h
===================================================================
--- tags/2.0.1/src_plugins/stroke/stroke_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/stroke/stroke_conf.h	(revision 18980)
@@ -0,0 +1,15 @@
+#ifndef PCB_VENDOR_CONF_H
+#define PCB_VENDOR_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct stroke {
+			CFT_LIST gestures;
+			CFT_BOOLEAN warn4unknown; /* Warn for unknown sequences */
+		} stroke;
+	} plugins;
+} conf_stroke_t;
+
+#endif
Index: tags/2.0.1/src_plugins/teardrops/Makefile
===================================================================
--- tags/2.0.1/src_plugins/teardrops/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/teardrops/Makefile	(revision 18980)
@@ -0,0 +1,5 @@
+all:
+	cd ../../src && $(MAKE) mod_teardrops
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
Index: tags/2.0.1/src_plugins/teardrops/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/teardrops/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/teardrops/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,8 @@
+put /local/pcb/mod {teardrops}
+put /local/pcb/mod/OBJS [@ $(PLUGDIR)/teardrops/teardrops.o @]
+
+switch /local/pcb/teardrops/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/teardrops/teardrops.c
===================================================================
--- tags/2.0.1/src_plugins/teardrops/teardrops.c	(nonexistent)
+++ tags/2.0.1/src_plugins/teardrops/teardrops.c	(revision 18980)
@@ -0,0 +1,291 @@
+/*
+ * Teardrops plug-in for PCB.
+ *
+ * Copyright (C) 2006 DJ Delorie <dj@delorie.com>
+ *
+ * Licensed under the terms of the GNU General Public
+ * License, version 2 or later.
+ *
+ * Ported to pcb-rnd by Tibor 'Igor2' Palinkas in 2016.
+ * Updated to new data model by Tibor 'Igor2' Palinkas in 2018.
+ *
+ * Original source: http://www.delorie.com/pcb/teardrops/
+*/
+
+#include <stdio.h>
+#include <math.h>
+
+#include "config.h"
+#include "math_helper.h"
+#include "board.h"
+#include "data.h"
+#include "hid.h"
+#include "rtree.h"
+#include "undo.h"
+#include "plugins.h"
+#include "actions.h"
+#include "obj_pstk_inlines.h"
+
+#define MIN_LINE_LENGTH 700
+#define MAX_DISTANCE 700
+
+/* changed MAX_DISTANCE to 0.5 mm below */
+ /* 0.5mm */
+/* #define MAX_DISTANCE 500000 */
+/* #define MAX_DISTANCE 2000000 */
+ /* 1 mm */
+/* #define MAX_DISTANCE 1000000 */
+
+#define MIN_LINE_LENGTH2 ((double)MIN_LINE_LENGTH*(double)MIN_LINE_LENGTH)
+#define MAX_DISTANCE2 ((double)MAX_DISTANCE*(double)MAX_DISTANCE)
+
+static pcb_pstk_t *pstk;
+static int layer;
+static pcb_coord_t px, py;
+static pcb_coord_t thickness;
+
+static int new_arcs = 0;
+
+static pcb_r_dir_t check_line_callback(const pcb_box_t * box, void *cl)
+{
+	pcb_layer_t *lay = &PCB->Data->Layer[layer];
+	pcb_line_t *l = (pcb_line_t *) box;
+	int x1, x2, y1, y2;
+	double a, b, c, x, r, t;
+	double dx, dy, len;
+	double ax, ay, lx, ly, theta;
+	double ldist, adist, radius;
+	double vx, vy, vr, vl;
+	int delta, aoffset, count;
+	pcb_arc_t *arc;
+
+	fprintf(stderr, "...Line ((%.6f, %.6f), (%.6f, %.6f)): ",
+					PCB_COORD_TO_MM(l->Point1.X), PCB_COORD_TO_MM(l->Point1.Y), PCB_COORD_TO_MM(l->Point2.X), PCB_COORD_TO_MM(l->Point2.Y));
+
+	/* if our line is to short ignore it */
+	if (pcb_distance2(l->Point1.X, l->Point1.Y, l->Point2.X, l->Point2.Y) < MIN_LINE_LENGTH2) {
+		fprintf(stderr, "not within max line length\n");
+		return 1;
+	}
+
+	fprintf(stderr, "......Point (%.6f, %.6f): ", PCB_COORD_TO_MM(px), PCB_COORD_TO_MM(py));
+
+	if (pcb_distance2(l->Point1.X, l->Point1.Y, px, py) < MAX_DISTANCE2) {
+		x1 = l->Point1.X;
+		y1 = l->Point1.Y;
+		x2 = l->Point2.X;
+		y2 = l->Point2.Y;
+	}
+	else if (pcb_distance(l->Point2.X, l->Point2.Y, px, py) < MAX_DISTANCE2) {
+		x1 = l->Point2.X;
+		y1 = l->Point2.Y;
+		x2 = l->Point1.X;
+		y2 = l->Point1.Y;
+	}
+	else {
+		fprintf(stderr, "not within max distance\n");
+		return 1;
+	}
+
+	/* r = pin->Thickness / 2.0; */
+	r = thickness / 2.0;
+	t = l->Thickness / 2.0;
+
+	if (t > r) {
+		fprintf(stderr, "t > r: t = %3.6f, r = %3.6f\n", PCB_COORD_TO_MM(t), PCB_COORD_TO_MM(r));
+		return 1;
+	}
+
+	a = 1;
+	b = 4 * t - 2 * r;
+	c = 2 * t * t - r * r;
+
+	x = (-b + sqrt(b * b - 4 * a * c)) / (2 * a);
+
+	len = sqrt(((double) x2 - x1) * (x2 - x1) + ((double) y2 - y1) * (y2 - y1));
+
+	if (len > (x + t)) {
+		adist = ldist = x + t;
+		radius = x + t;
+		delta = 45;
+
+		if (radius < r || radius < t) {
+			fprintf(stderr,
+							"(radius < r || radius < t): radius = %3.6f, r = %3.6f, t = %3.6f\n",
+							PCB_COORD_TO_MM(radius), PCB_COORD_TO_MM(r), PCB_COORD_TO_MM(t));
+			return 1;
+		}
+	}
+	else if (len > r + t) {
+		/* special "short teardrop" code */
+
+		x = (len * len - r * r + t * t) / (2 * (r - t));
+		ldist = len;
+		adist = x + t;
+		radius = x + t;
+		delta = atan2(len, x + t) * 180.0 / M_PI;
+	}
+	else
+		return 1;
+
+	dx = ((double) x2 - x1) / len;
+	dy = ((double) y2 - y1) / len;
+	theta = atan2(y2 - y1, x1 - x2) * 180.0 / M_PI;
+
+	lx = px + dx * ldist;
+	ly = py + dy * ldist;
+
+	/* We need one up front to determine how many segments it will take to fill.  */
+	ax = lx - dy * adist;
+	ay = ly + dx * adist;
+	vl = sqrt(r * r - t * t);
+	vx = px + dx * vl;
+	vy = py + dy * vl;
+	vx -= dy * t;
+	vy += dx * t;
+	vr = sqrt((ax - vx) * (ax - vx) + (ay - vy) * (ay - vy));
+
+	aoffset = 0;
+	count = 0;
+	do {
+		if (++count > 5) {
+			fprintf(stderr, "......a %d,%d v %d,%d adist %g radius %g vr %g\n",
+							(int) ax, (int) ay, (int) vx, (int) vy, adist, radius, vr);
+			printf("a %d,%d v %d,%d adist %g radius %g vr %g\n", (int) ax, (int) ay, (int) vx, (int) vy, adist, radius, vr);
+			return 1;
+		}
+
+		ax = lx - dy * adist;
+		ay = ly + dx * adist;
+
+		arc = pcb_arc_new(lay, (int) ax, (int) ay, (int) radius,
+															(int) radius, (int) theta + 90 + aoffset, delta - aoffset, l->Thickness, l->Clearance, l->Flags, pcb_true);
+		if (arc)
+			pcb_undo_add_obj_to_create(PCB_OBJ_ARC, lay, arc, arc);
+
+		ax = lx + dy * (x + t);
+		ay = ly - dx * (x + t);
+
+		arc = pcb_arc_new(lay, (int) ax, (int) ay, (int) radius,
+															(int) radius, (int) theta - 90 - aoffset, -delta + aoffset, l->Thickness, l->Clearance, l->Flags, pcb_true);
+		if (arc)
+			pcb_undo_add_obj_to_create(PCB_OBJ_ARC, lay, arc, arc);
+
+		radius += t * 1.9;
+		aoffset = acos((double) adist / radius) * 180.0 / M_PI;
+
+		new_arcs++;
+	} while (vr > radius - t);
+
+	fprintf(stderr, "done arc'ing\n");
+	return 1;
+}
+
+static void check_pstk(pcb_pstk_t *ps)
+{
+	pstk = ps;
+
+	for (layer = 0; layer < pcb_max_layer; layer++) {
+		pcb_layer_t *l = &(PCB->Data->Layer[layer]);
+		pcb_pstk_shape_t *shp;
+		pcb_box_t spot;
+		int n;
+		double mindist;
+
+		if (!(pcb_layer_flags(PCB, layer) & PCB_LYT_COPPER))
+			continue;
+
+		shp = pcb_pstk_shape_at(PCB, ps, l);
+		if (shp == NULL)
+			continue;
+
+		switch(shp->shape) {
+			case PCB_PSSH_POLY:
+				/* Simplistic approach on polygons; works only on the simplest cases
+				   How this could be handled better: list the 1 or 2 polygon edges
+				   that cross the incoming line's sides and do the teardrops there;
+				   but there are corner cases lurking: what if the next edges out
+				   from the 1..2 edges are curving back? */
+				px = py = 0;
+				for(n = 0; n < shp->data.poly.len; n++) {
+					px += shp->data.poly.x[n];
+					py += shp->data.poly.y[n];
+				}
+				px /= shp->data.poly.len;
+				py /= shp->data.poly.len;
+
+				mindist = PCB_MM_TO_COORD(8);
+				mindist *= mindist;
+				for(n = 0; n < shp->data.poly.len; n++) {
+					double dist = pcb_distance2(px, py, shp->data.poly.x[n], shp->data.poly.y[n]);
+					if (dist < mindist)
+						mindist = dist;
+				}
+				thickness = sqrt(mindist)*1.4;
+				px += ps->x;
+				py += ps->y;
+				break;
+
+			case PCB_PSSH_LINE:
+				thickness = shp->data.line.thickness;
+				px = ps->x + (shp->data.line.x1 + shp->data.line.x2)/2;
+				py = ps->y + (shp->data.line.y1 + shp->data.line.y2)/2;
+				break;
+
+			case PCB_PSSH_CIRC:
+				thickness = shp->data.circ.dia;
+				px = ps->x + shp->data.circ.x;
+				py = ps->y + shp->data.circ.y;
+				break;
+		}
+
+		spot.X1 = px - 10;
+		spot.Y1 = py - 10;
+		spot.X2 = px + 10;
+		spot.Y2 = py + 10;
+
+		pcb_r_search(l->line_tree, &spot, NULL, check_line_callback, l, NULL);
+	}
+}
+
+static fgw_error_t pcb_act_teardrops(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_box_t *b;
+	pcb_rtree_it_t it;
+	new_arcs = 0;
+
+	for(b = pcb_r_first(PCB->Data->padstack_tree, &it); b != NULL; b = pcb_r_next(&it))
+		check_pstk((pcb_pstk_t *)b);
+	pcb_r_end(&it);
+
+	pcb_gui->invalidate_all();
+
+	if (new_arcs)
+		pcb_undo_inc_serial();
+
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static pcb_action_t teardrops_action_list[] = {
+	{"Teardrops", pcb_act_teardrops, NULL, NULL}
+};
+
+char *teardrops_cookie = "teardrops plugin";
+
+PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie)
+
+int pplg_check_ver_teardrops(int ver_needed) { return 0; }
+
+void pplg_uninit_teardrops(void)
+{
+	pcb_remove_actions_by_cookie(teardrops_cookie);
+}
+
+#include "dolists.h"
+int pplg_init_teardrops(void)
+{
+	PCB_API_CHK_VER;
+	PCB_REGISTER_ACTIONS(teardrops_action_list, teardrops_cookie);
+	return 0;
+}
Index: tags/2.0.1/src_plugins/teardrops/teardrops.pup
===================================================================
--- tags/2.0.1/src_plugins/teardrops/teardrops.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/teardrops/teardrops.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short draw teardrops on pins
+$long Draw teardrops on pins.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/src_plugins/vendordrill/Makefile
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/Makefile	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/Makefile	(revision 18980)
@@ -0,0 +1,6 @@
+all:
+	cd ../../src && $(MAKE) mod_vendordrill
+
+clean:
+	rm *.o *.so 2>/dev/null ; true
+
Index: tags/2.0.1/src_plugins/vendordrill/Plug.tmpasm
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/Plug.tmpasm	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/Plug.tmpasm	(revision 18980)
@@ -0,0 +1,9 @@
+put /local/pcb/mod {vendordrill}
+append /local/pcb/mod/OBJS [@ $(PLUGDIR)/vendordrill/vendor.o @]
+put /local/pcb/mod/CONF {$(PLUGDIR)/vendordrill/vendor_conf.h}
+
+switch /local/pcb/vendordrill/controls
+	case {buildin}   include /local/pcb/tmpasm/buildin; end;
+	case {plugin}    include /local/pcb/tmpasm/plugin; end;
+	case {disable}   include /local/pcb/tmpasm/disable; end;
+end
Index: tags/2.0.1/src_plugins/vendordrill/vendor.c
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/vendor.c	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/vendor.c	(revision 18980)
@@ -0,0 +1,719 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  pcb-rnd, interactive printed circuit board design
+ *  (this file is based on PCB, interactive printed circuit board design)
+ *  Copyright (C) 2004, 2007 Dan McMahill
+ *  Copyright (C) 2018 Tibor 'Igor2' Palinkas
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact:
+ *    Project page: http://repo.hu/projects/pcb-rnd
+ *    lead developer: email to pcb-rnd (at) igor2.repo.hu
+ *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
+ */
+
+#include "config.h"
+#include "conf_core.h"
+
+#include <ctype.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <genregex/regex_sei.h>
+
+#include "change.h"
+#include "board.h"
+#include "data.h"
+#include "draw.h"
+#include "error.h"
+#include "undo.h"
+#include "plugins.h"
+#include "hid_flags.h"
+#include "actions.h"
+#include "hid_cfg.h"
+#include "vendor_conf.h"
+#include "compat_misc.h"
+#include "compat_nls.h"
+#include "obj_pstk_inlines.h"
+#include "event.h"
+#include "macro.h"
+#include <liblihata/lihata.h>
+#include <liblihata/tree.h>
+
+conf_vendor_t conf_vendor;
+
+static void add_to_drills(char *);
+static void apply_vendor_map(void);
+static void process_skips(lht_node_t *);
+static pcb_bool rematch(const char *, const char *);
+static void vendor_free_all(void);
+pcb_coord_t vendorDrillMap(pcb_coord_t in);
+
+
+/* list of vendor drills and a count of them */
+static pcb_coord_t *vendor_drills = NULL;
+static int n_vendor_drills = 0;
+
+static int cached_drill = -1;
+static int cached_map = -1;
+
+/* lists of elements to ignore */
+static char **ignore_refdes = NULL;
+static int n_refdes = 0;
+static char **ignore_value = NULL;
+static int n_value = 0;
+static char **ignore_descr = NULL;
+static int n_descr = 0;
+
+/* vendor name */
+static char *vendor_name = NULL;
+
+/* resource file to PCB units scale factor */
+static double sf;
+
+
+/* type of drill mapping */
+#define CLOSEST 1
+#define ROUND_UP 0
+static int rounding_method = ROUND_UP;
+
+#define FREE(x) if((x) != NULL) { free (x) ; (x) = NULL; }
+
+/* load a board metadata into conf_core */
+static void load_meta_coord(const char *path, pcb_coord_t crd)
+{
+	char tmp[128];
+	pcb_sprintf(tmp, "%$mm", crd);
+	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+}
+
+static pcb_bool vendorIsSubcMappable(pcb_subc_t *subc);
+
+/* ************************************************************ */
+
+static const char apply_vendor_syntax[] = "ApplyVendor()";
+
+static const char apply_vendor_help[] = "Applies the currently loaded vendor drill table to the current design.";
+
+/* %start-doc actions ApplyVendor
+@cindex vendor map
+@cindex vendor drill table
+@findex ApplyVendor()
+
+This will modify all of your drill holes to match the list of allowed
+sizes for your vendor.
+%end-doc */
+
+fgw_error_t pcb_act_ApplyVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	pcb_event(PCB_EVENT_BUSY, NULL);
+	apply_vendor_map();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ************************************************************ */
+
+static const char unload_vendor_syntax[] = "UnloadVendor()";
+
+static const char unload_vendor_help[] = "Unloads the current vendor drill mapping table.";
+
+/* %start-doc actions UnloadVendor
+
+@cindex vendor map
+@cindex vendor drill table
+@findex UnloadVendor()
+
+%end-doc */
+
+fgw_error_t pcb_act_UnloadVendor(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	cached_drill = -1;
+
+	vendor_free_all();
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+/* ************************************************************ */
+
+static const char pcb_acts_LoadVendorFrom[] = "LoadVendorFrom(filename)";
+
+static const char pcb_acth_LoadVendorFrom[] = "Loads the specified vendor lihata file.";
+
+/* %start-doc actions LoadVendorFrom
+
+@cindex vendor map
+@cindex vendor drill table
+@findex LoadVendorFrom()
+
+@table @var
+@item filename
+Name of the vendor lihata file.  If not specified, the user will
+be prompted to enter one.
+@end table
+
+%end-doc */
+
+fgw_error_t pcb_act_LoadVendorFrom(fgw_arg_t *res, int argc, fgw_arg_t *argv)
+{
+	const char *fname = NULL;
+	static char *default_file = NULL;
+	const char *sval;
+	lht_doc_t *doc;
+	lht_node_t *drlres;
+	pcb_bool free_fname = pcb_false;
+
+	cached_drill = -1;
+
+	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str);
+
+	if (!fname || !*fname) {
+		fname = pcb_gui->fileselect(_("Load Vendor Resource File..."),
+														_("Picks a vendor resource file to load.\n"
+															"This file can contain drc settings for a\n"
+															"particular vendor as well as a list of\n"
+															"predefined drills which are allowed."), default_file, ".res", "vendor", HID_FILESELECT_READ);
+		if (fname == NULL) {
+			PCB_ACT_IRES(1);
+			return 0;
+		}
+
+		free_fname = pcb_true;
+
+		free(default_file);
+		default_file = NULL;
+
+		if (fname && *fname)
+			default_file = pcb_strdup(fname);
+	}
+
+	vendor_free_all();
+
+	/* load the resource file */
+	doc = pcb_hid_cfg_load_lht(fname);
+	if (doc == NULL) {
+		pcb_message(PCB_MSG_ERROR, _("Could not load vendor resource file \"%s\"\n"), fname);
+		PCB_ACT_IRES(1);
+		return 0;
+	}
+
+	/* figure out the vendor name, if specified */
+	vendor_name = (char *) PCB_UNKNOWN(pcb_hid_cfg_text_value(doc, "vendor"));
+
+	/* figure out the units, if specified */
+	sval = pcb_hid_cfg_text_value(doc, "/units");
+	if (sval == NULL) {
+		sf = PCB_MIL_TO_COORD(1);
+	}
+	else if ((PCB_NSTRCMP(sval, "mil") == 0) || (PCB_NSTRCMP(sval, "mils") == 0)) {
+		sf = PCB_MIL_TO_COORD(1);
+	}
+	else if ((PCB_NSTRCMP(sval, "inch") == 0) || (PCB_NSTRCMP(sval, "inches") == 0)) {
+		sf = PCB_INCH_TO_COORD(1);
+	}
+	else if (PCB_NSTRCMP(sval, "mm") == 0) {
+		sf = PCB_MM_TO_COORD(1);
+	}
+	else {
+		pcb_message(PCB_MSG_ERROR, "\"%s\" is not a supported units.  Defaulting to inch\n", sval);
+		sf = PCB_INCH_TO_COORD(1);
+	}
+
+	/* default to ROUND_UP */
+	rounding_method = ROUND_UP;
+	sval = pcb_hid_cfg_text_value(doc, "/round");
+	if (sval != NULL) {
+		if (PCB_NSTRCMP(sval, "up") == 0) {
+			rounding_method = ROUND_UP;
+		}
+		else if (PCB_NSTRCMP(sval, "nearest") == 0) {
+			rounding_method = CLOSEST;
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, _("\"%s\" is not a valid rounding type.  Defaulting to up\n"), sval);
+			rounding_method = ROUND_UP;
+		}
+	}
+
+	process_skips(lht_tree_path(doc, "/", "/skips", 1, NULL));
+
+	/* extract the drillmap resource */
+	drlres = lht_tree_path(doc, "/", "/drillmap", 1, NULL);
+	if (drlres != NULL) {
+		if (drlres->type == LHT_LIST) {
+			lht_node_t *n;
+			for(n = drlres->data.list.first; n != NULL; n = n->next) {
+				if (n->type != LHT_TEXT)
+					pcb_hid_cfg_error(n, "Broken drillmap: /drillmap should contain text children only\n");
+				else
+					add_to_drills(n->data.text.value);
+			}
+		}
+		else
+			pcb_message(PCB_MSG_ERROR, _("Broken drillmap: /drillmap should be a list\n"));
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, _("No drillmap resource found\n"));
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_space");
+	if (sval != NULL) {
+		load_meta_coord("design/bloat", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper spacing to %ml mils\n"), conf_core.design.bloat);
+	}
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_overlap");
+	if (sval != NULL) {
+		load_meta_coord("design/shrink", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper overlap to %ml mils\n"), conf_core.design.shrink);
+	}
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_width");
+	if (sval != NULL) {
+		load_meta_coord("design/min_wid", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper spacing to %ml mils\n"), conf_core.design.min_wid);
+	}
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/silk_width");
+	if (sval != NULL) {
+		load_meta_coord("design/min_slk", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum silk width to %ml mils\n"), conf_core.design.min_slk);
+	}
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/min_drill");
+	if (sval != NULL) {
+		load_meta_coord("design/min_drill", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum drill diameter to %ml mils\n"), conf_core.design.min_drill);
+	}
+
+	sval = pcb_hid_cfg_text_value(doc, "/drc/min_ring");
+	if (sval != NULL) {
+		load_meta_coord("design/min_ring", floor(sf * atof(sval) + 0.5));
+		pcb_message(PCB_MSG_INFO, _("Set DRC minimum annular ring to %ml mils\n"), conf_core.design.min_ring);
+	}
+
+	pcb_message(PCB_MSG_INFO, _("Loaded %d vendor drills from %s\n"), n_vendor_drills, fname);
+	pcb_message(PCB_MSG_INFO, _("Loaded %d RefDes skips, %d Value skips, %d Descr skips\n"), n_refdes, n_value, n_descr);
+
+	conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "0", POL_OVERWRITE);
+
+	apply_vendor_map();
+	if (free_fname)
+		free((char*)fname);
+	lht_dom_uninit(doc);
+	PCB_ACT_IRES(0);
+	return 0;
+}
+
+static int apply_vendor_pstk1(pcb_pstk_t *pstk, pcb_cardinal_t *tot)
+{
+	pcb_pstk_proto_t *proto = pcb_pstk_get_proto(pstk);
+	pcb_coord_t target;
+	int res = 0;
+
+	if ((proto == NULL) || (proto->hdia == 0)) return 0;
+	(*tot)++;
+	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, pstk)) return 0;
+
+	target = vendorDrillMap(proto->hdia);
+	if (proto->hdia != target) {
+		if (pcb_chg_obj_2nd_size(PCB_OBJ_PSTK, pstk, pstk, pstk, target, pcb_true, pcb_false))
+			res = 1;
+		else {
+			pcb_message(PCB_MSG_WARNING, _
+				("Padstack at %ml, %ml not changed.  Possible reasons:\n"
+				 "\t- pad size too small\n"
+				 "\t- new size would be too large or too small\n"), pstk->x, pstk->y);
+		}
+	}
+	return res;
+}
+
+static pcb_cardinal_t apply_vendor_pstk(pcb_data_t *data, pcb_cardinal_t *tot)
+{
+	gdl_iterator_t it;
+	pcb_pstk_t *pstk;
+	pcb_cardinal_t changed = 0;
+
+	padstacklist_foreach(&data->padstack, &it, pstk)
+		if (apply_vendor_pstk1(pstk, tot))
+			changed++;
+	return changed;
+}
+
+static void apply_vendor_map(void)
+{
+	int i;
+	pcb_cardinal_t changed = 0, tot = 0;
+	pcb_bool state;
+
+	state = conf_vendor.plugins.vendor.enable;
+
+	/* enable mapping */
+	conf_force_set_bool(conf_vendor.plugins.vendor.enable, 1);
+
+	/* If we have loaded vendor drills, then apply them to the design */
+	if (n_vendor_drills > 0) {
+
+		/* global padsatcks (e.g. vias) */
+		changed += apply_vendor_pstk(PCB->Data, &tot);
+
+		PCB_SUBC_LOOP(PCB->Data);
+		{
+			if (vendorIsSubcMappable(subc))
+				changed += apply_vendor_pstk(subc->data, &tot);
+		}
+		PCB_END_LOOP;
+
+		pcb_message(PCB_MSG_INFO, _("Updated %ld drill sizes out of %ld total\n"), (long)changed, (long)tot);
+
+		/* Update the current Via */
+		if (conf_core.design.via_drilling_hole != vendorDrillMap(conf_core.design.via_drilling_hole)) {
+			changed++;
+			conf_setf(CFR_DESIGN, "design/via_drilling_hole", -1, "%$mm", vendorDrillMap(conf_core.design.via_drilling_hole));
+			pcb_message(PCB_MSG_INFO, _("Adjusted active via hole size to be %ml mils\n"), conf_core.design.via_drilling_hole);
+		}
+
+		/* and update the vias for the various routing styles */
+		for (i = 0; i < vtroutestyle_len(&PCB->RouteStyle); i++) {
+			if (PCB->RouteStyle.array[i].Hole != vendorDrillMap(PCB->RouteStyle.array[i].Hole)) {
+				changed++;
+				PCB->RouteStyle.array[i].Hole = vendorDrillMap(PCB->RouteStyle.array[i].Hole);
+				pcb_message(PCB_MSG_INFO, _
+								("Adjusted %s routing style hole size to be %ml mils\n"),
+								PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Hole);
+				if (PCB->RouteStyle.array[i].Diameter < PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER) {
+					PCB->RouteStyle.array[i].Diameter = PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER;
+					pcb_message(PCB_MSG_INFO, _
+									("Increased %s routing style via diameter to %ml mils\n"),
+									PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Diameter);
+				}
+			}
+		}
+
+		/*
+		 * if we've changed anything, indicate that we need to save the
+		 * file, redraw things, and make sure we can undo.
+		 */
+		if (changed) {
+			pcb_board_set_changed_flag(pcb_true);
+			pcb_redraw();
+			pcb_undo_inc_serial();
+		}
+	}
+
+	/* restore mapping on/off */
+	conf_force_set_bool(conf_vendor.plugins.vendor.enable, state);
+}
+
+/* for a given drill size, find the closest vendor drill size */
+pcb_coord_t vendorDrillMap(pcb_coord_t in)
+{
+	int i, min, max;
+
+	if (in == cached_drill)
+		return cached_map;
+	cached_drill = in;
+
+	/* skip the mapping if we don't have a vendor drill table */
+	if ((n_vendor_drills == 0) || (vendor_drills == NULL)
+			|| (!conf_vendor.plugins.vendor.enable)) {
+		cached_map = in;
+		return in;
+	}
+
+	/* are we smaller than the smallest drill? */
+	if (in <= vendor_drills[0]) {
+		cached_map = vendor_drills[0];
+		return vendor_drills[0];
+	}
+
+	/* are we larger than the largest drill? */
+	if (in > vendor_drills[n_vendor_drills - 1]) {
+		pcb_message(PCB_MSG_ERROR, _("Vendor drill list does not contain a drill >= %ml mil\n"
+							"Using %ml mil instead.\n"), in, vendor_drills[n_vendor_drills - 1]);
+		cached_map = vendor_drills[n_vendor_drills - 1];
+		return vendor_drills[n_vendor_drills - 1];
+	}
+
+	/* figure out which 2 drills are closest in size */
+	min = 0;
+	max = n_vendor_drills - 1;
+	while (max - min > 1) {
+		i = (max + min) / 2;
+		if (in > vendor_drills[i])
+			min = i;
+		else
+			max = i;
+	}
+	i = max;
+
+	/* now round per the rounding mode */
+	if (rounding_method == CLOSEST) {
+		/* find the closest drill size */
+		if ((in - vendor_drills[i - 1]) > (vendor_drills[i] - in)) {
+			cached_map = vendor_drills[i];
+			return vendor_drills[i];
+		}
+		else {
+			cached_map = vendor_drills[i - 1];
+			return vendor_drills[i - 1];
+		}
+	}
+	else {
+		/* always round up */
+		cached_map = vendor_drills[i];
+		return vendor_drills[i];
+	}
+
+}
+
+/* add a drill size to the vendor drill list */
+static void add_to_drills(char *sval)
+{
+	double tmpd;
+	int val;
+	int k, j;
+
+	/* increment the count and make sure we have memory */
+	n_vendor_drills++;
+	if ((vendor_drills = (int *) realloc(vendor_drills, n_vendor_drills * sizeof(int))) == NULL) {
+		fprintf(stderr, "realloc() failed to allocate %ld bytes\n", (unsigned long) n_vendor_drills * sizeof(int));
+		return;
+	}
+
+	/* string to a value with the units scale factor in place */
+	tmpd = atof(sval);
+	val = floor(sf * tmpd + 0.5);
+
+	/*
+	 * We keep the array of vendor drills sorted to make it easier to
+	 * do the rounding later.  The algorithm used here is not so efficient,
+	 * but we're not dealing with much in the way of data.
+	 */
+
+	/* figure out where to insert the value to keep the array sorted.  */
+	k = 0;
+	while ((k < n_vendor_drills - 1) && (vendor_drills[k] < val))
+		k++;
+
+	if (k == n_vendor_drills - 1) {
+		vendor_drills[n_vendor_drills - 1] = val;
+	}
+	else {
+		/* move up the existing drills to make room */
+		for (j = n_vendor_drills - 1; j > k; j--) {
+			vendor_drills[j] = vendor_drills[j - 1];
+		}
+
+		vendor_drills[k] = val;
+	}
+}
+
+/* deal with the "skip" subresource */
+static void process_skips(lht_node_t *res)
+{
+	char *sval;
+	int *cnt;
+	char ***lst = NULL;
+	lht_node_t *n;
+
+	if (res == NULL)
+		return;
+
+	if (res->type != LHT_LIST)
+		pcb_hid_cfg_error(res, "skips must be a list.\n");
+
+	for(n = res->data.list.first; n != NULL; n = n->next) {
+		if (n->type == LHT_TEXT) {
+			if (PCB_NSTRCMP(n->name, "refdes") == 0) {
+				cnt = &n_refdes;
+				lst = &ignore_refdes;
+			}
+			else if (PCB_NSTRCMP(n->name, "value") == 0) {
+				cnt = &n_value;
+				lst = &ignore_value;
+			}
+			else if (PCB_NSTRCMP(n->name, "descr") == 0) {
+				cnt = &n_descr;
+				lst = &ignore_descr;
+			}
+			else {
+				pcb_hid_cfg_error(n, "invalid skip name; must be one of refdes, value, descr");
+				continue;
+			}
+			/* add the entry to the appropriate list */
+			sval = n->data.text.value;
+			(*cnt)++;
+			if ((*lst = (char **) realloc(*lst, (*cnt) * sizeof(char *))) == NULL) {
+				fprintf(stderr, "realloc() failed\n");
+				exit(-1);
+			}
+			(*lst)[*cnt - 1] = pcb_strdup(sval);
+		}
+		else
+			pcb_hid_cfg_error(n, "invalid skip type; must be text");
+	}
+}
+
+static pcb_bool vendorIsSubcMappable(pcb_subc_t *subc)
+{
+	int i;
+	int noskip;
+
+	if (!conf_vendor.plugins.vendor.enable)
+		return pcb_false;
+
+#warning TODO: these 3 loops should be wrapped in a single loop that iterates over attribute keys
+	noskip = 1;
+	for (i = 0; i < n_refdes; i++) {
+		if ((PCB_NSTRCMP(PCB_UNKNOWN(subc->refdes), ignore_refdes[i]) == 0)
+				|| rematch(ignore_refdes[i], PCB_UNKNOWN(subc->refdes))) {
+			pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because refdes = %s matches %s\n"), PCB_UNKNOWN(subc->refdes), ignore_refdes[i]);
+			noskip = 0;
+		}
+	}
+	if (noskip) {
+		const char *vl = pcb_attribute_get(&subc->Attributes, "value");
+		for (i = 0; i < n_value; i++) {
+			if ((PCB_NSTRCMP(PCB_UNKNOWN(vl), ignore_value[i]) == 0)
+					|| rematch(ignore_value[i], PCB_UNKNOWN(vl))) {
+				pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because value = %s matches %s\n"), PCB_UNKNOWN(vl), ignore_value[i]);
+				noskip = 0;
+			}
+		}
+	}
+
+	if (noskip) {
+		const char *fp = pcb_attribute_get(&subc->Attributes, "footprint");
+		for (i = 0; i < n_descr; i++) {
+			if ((PCB_NSTRCMP(PCB_UNKNOWN(fp), ignore_descr[i]) == 0)
+					|| rematch(ignore_descr[i], PCB_UNKNOWN(fp))) {
+				pcb_message(PCB_MSG_INFO, _
+								("Vendor mapping skipped because descr = %s matches %s\n"),
+								PCB_UNKNOWN(fp), ignore_descr[i]);
+				noskip = 0;
+			}
+		}
+	}
+
+	if (noskip && PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)) {
+		pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because element %s is locked\n"), PCB_UNKNOWN(subc->refdes));
+		noskip = 0;
+	}
+
+	if (noskip)
+		return pcb_true;
+	else
+		return pcb_false;
+}
+
+static pcb_bool rematch(const char *re, const char *s)
+{
+	int result;
+	re_sei_t *regex;
+
+	/* compile the regular expression */
+	regex = re_sei_comp(re);
+	if (re_sei_errno(regex) != 0) {
+		pcb_message(PCB_MSG_ERROR, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex)));
+		re_sei_free(regex);
+		return pcb_false;
+	}
+
+	result = re_sei_exec(regex, s);
+	re_sei_free(regex);
+
+	if (result != 0)
+		return pcb_true;
+	else
+		return pcb_false;
+}
+
+static const char *vendor_cookie = "vendor drill mapping";
+
+pcb_action_t vendor_action_list[] = {
+	{"ApplyVendor", pcb_act_ApplyVendor, apply_vendor_help, apply_vendor_syntax},
+	{"UnloadVendor", pcb_act_UnloadVendor, unload_vendor_help, unload_vendor_syntax},
+	{"LoadVendorFrom", pcb_act_LoadVendorFrom, pcb_acth_LoadVendorFrom, pcb_acts_LoadVendorFrom}
+};
+
+PCB_REGISTER_ACTIONS(vendor_action_list, vendor_cookie)
+
+static char **vendor_free_vect(char **lst, int *len)
+{
+	if (lst != NULL) {
+		int n;
+		for(n = 0; n < *len; n++)
+			if (lst[n] != NULL)
+				free(lst[n]);
+		free(lst);
+	}
+	*len = 0;
+	return NULL;
+}
+
+static void vendor_free_all(void)
+{
+	ignore_refdes = vendor_free_vect(ignore_refdes, &n_refdes);
+	ignore_value = vendor_free_vect(ignore_value, &n_value);
+	ignore_descr = vendor_free_vect(ignore_descr, &n_descr);
+	if (vendor_drills != NULL) {
+		free(vendor_drills);
+		vendor_drills = NULL;
+		n_vendor_drills = 0;
+	}
+	cached_drill = -1;
+}
+
+/* Tune newly placed padstacks */
+static void vendor_new_pstk(void *user_data, int argc, pcb_event_arg_t argv[])
+{
+	pcb_pstk_t *ps;
+	pcb_cardinal_t dummy;
+
+	if ((argc < 2) || (argv[1].type != PCB_EVARG_PTR))
+		return;
+
+	ps = argv[1].d.p;
+	apply_vendor_pstk1(ps, &dummy);
+}
+
+int pplg_check_ver_vendordrill(int ver_needed) { return 0; }
+
+void pplg_uninit_vendordrill(void)
+{
+	pcb_event_unbind_allcookie(vendor_cookie);
+	pcb_remove_actions_by_cookie(vendor_cookie);
+	vendor_free_all();
+	conf_unreg_fields("plugins/vendor/");
+}
+
+#include "dolists.h"
+int pplg_init_vendordrill(void)
+{
+	PCB_API_CHK_VER;
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_vendor, field,isarray,type_name,cpath,cname,desc,flags);
+#include "vendor_conf_fields.h"
+
+	pcb_event_bind(PCB_EVENT_NEW_PSTK, vendor_new_pstk, NULL, vendor_cookie);
+	PCB_REGISTER_ACTIONS(vendor_action_list, vendor_cookie)
+	return 0;
+}
Index: tags/2.0.1/src_plugins/vendordrill/vendor.example.lht
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/vendor.example.lht	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/vendor.example.lht	(revision 18980)
@@ -0,0 +1,51 @@
+ha:vendor_drill_map {
+	# Optional name of the vendor
+	vendor = Vendor Name
+
+	# units for dimensions in this file.
+	# Allowed values:  mil/inch/mm
+	units = mil
+
+	# When mapping drill sizes, select the nearest size
+	# or always round up.  Allowed values:  up/nearest
+	round = up
+
+	# drill table
+	li:drillmap = {
+		# The list of vendor drill sizes.  Units are as specified
+		# above.
+		20
+		28
+		35
+		38
+		42
+		52
+		59.5
+		86
+		125
+		152
+	}
+
+	# optional section for skipping mapping of certain elements
+	# based on reference designator, value, or description
+	# this is useful for critical parts where you may not
+	# want to change the drill size.  Note that the strings
+	# are regular expressions.
+	li:skips = {
+		refdes = {^J3$}                   # Skip J3.
+		refdes = {J3}                     # Skip anything with J3 as part of the refdes.
+		refdes = {^U[1-3]$}               # Skip U1, U2, U3
+		refdes = {^X.*}                   # Skip anything starting with X.
+		value  = {^JOHNSTECH_.*}          # Skip all Johnstech footprints based on the value of a part.
+		descr  = {^AMP_MICTOR_767054_1$}  # Skip based on the description.
+	}
+
+	# If specified, this section will change the current DRC
+	# settings for the design.  Units are as specified above.
+	ha:drc = {
+		copper_space = 7
+		copper_width = 7
+		silk_width = 10
+		copper_overlap = 4
+	}
+}
Index: tags/2.0.1/src_plugins/vendordrill/vendor_conf.h
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/vendor_conf.h	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/vendor_conf.h	(revision 18980)
@@ -0,0 +1,14 @@
+#ifndef PCB_VENDOR_CONF_H
+#define PCB_VENDOR_CONF_H
+
+#include "conf.h"
+
+typedef struct {
+	const struct plugins {
+		const struct vendor {
+			CFT_BOOLEAN enable;         /* Enable vendor mapping */
+		} vendor;
+	} plugins;
+} conf_vendor_t;
+
+#endif
Index: tags/2.0.1/src_plugins/vendordrill/vendordrill.pup
===================================================================
--- tags/2.0.1/src_plugins/vendordrill/vendordrill.pup	(nonexistent)
+++ tags/2.0.1/src_plugins/vendordrill/vendordrill.pup	(revision 18980)
@@ -0,0 +1,7 @@
+$class feature
+$short vendor drill mapping
+$long Vendor drill mapping.
+$state works
+$package extra
+default buildin
+autoload 1
Index: tags/2.0.1/tests/Makefile
===================================================================
--- tags/2.0.1/tests/Makefile	(nonexistent)
+++ tags/2.0.1/tests/Makefile	(revision 18980)
@@ -0,0 +1,26 @@
+test:
+	cd RTT && $(MAKE) all && $(MAKE) test
+	cd pcbflags && $(MAKE) all && $(MAKE) test
+	cd conf && $(MAKE) all && $(MAKE) test
+	cd strflags && $(MAKE) all && $(MAKE) test
+	cd pcb-printf && $(MAKE) all && $(MAKE) test
+	cd uniq_name && $(MAKE) all && $(MAKE) test
+	cd propedit && $(MAKE) all && $(MAKE) test
+	cd remote && $(MAKE) all && $(MAKE) test
+#	cd gsch2pcb-rnd && $(MAKE) all && $(MAKE) test
+	@echo " "
+	@echo "+-------------------------------------------------+"
+	@echo "+  All tests passed, pcb-rnd is safe to install.  +"
+	@echo "+-------------------------------------------------+"
+
+clean:
+	cd RTT && $(MAKE) clean
+	cd pcbflags && $(MAKE) clean
+	cd conf && $(MAKE) clean
+	cd strflags && $(MAKE) clean
+	cd pcb-printf && $(MAKE) clean
+	cd uniq_name && $(MAKE) clean
+	cd propedit && $(MAKE) clean
+	cd remote && $(MAKE) clean
+#	cd gsch2pcb-rnd && $(MAKE) clean
+
Index: tags/2.0.1/tests/RTT/Export.sh
===================================================================
--- tags/2.0.1/tests/RTT/Export.sh	(nonexistent)
+++ tags/2.0.1/tests/RTT/Export.sh	(revision 18980)
@@ -0,0 +1,287 @@
+#!/bin/sh
+
+TRUNK=../..
+
+all=0
+valg=0
+global_args="-c design/fab_author=TEST -c rc/quiet=1 -c rc/default_pcb_file={} -c rc/default_font_file=./default_font"
+test_announce=0
+verbose=0
+CONVERT=convert
+
+if test -z "$pcb_rnd_bin"
+then
+	pcb_rnd_bin="$TRUNK/src/pcb-rnd"
+fi
+
+
+fmt_args=""
+
+need_convert()
+{
+	if test -z "`$CONVERT | grep ImageMagick`"
+	then
+		echo "WARNING: ImageMagick convert(1) not found - bitmap compare will be skipped."
+	fi
+}
+
+set_fmt_args()
+{
+	case "$fmt" in
+		bboard) need_convert; ext=.bbrd.png ;;
+		nelma) ext=.nelma.em ;;
+		bom) ext=.bom ;;
+		dsn) ext=.dsn ;;
+		IPC-D-356) ext=.net;;
+		ps)
+			ext=.ps
+			fmt_args="-c plugins/draw_fab/omit_date=1"
+			;;
+		eps)
+			ext=.eps
+#			fmt_args="-c plugins/draw_fab/omit_date=1"
+			;;
+		XY) ext=.xy ;;
+		openscad)
+			ext=.scad
+			fmt_args="--silk"
+			;;
+		png)
+			need_convert
+			fmt_args="--dpi 1200"
+			ext=.png
+			;;
+		gerber)
+			fmt_args="--cross-sect -c plugins/draw_fab/omit_date=1"
+# multifile: do not set ext
+			;;
+		remote)
+			ext=.remote
+			;;
+		svg)
+			ext=.svg
+			;;
+		fidocadj)
+			ext=.fcd
+			;;
+	esac
+}
+
+move_out()
+{
+	local raw_out="$1" final_out="$2" n
+
+# remove variable sections
+	case "$fmt" in
+		dsn) sed -i 's/[(]host_version[^)]*[)]/(host_version "<version>")/g' $raw_out ;;
+		bom|XY) sed -i "s/^# Date:.*$/# Date: <date>/" $raw_out ;;
+		IPC-D-356)
+			sed -i '
+				s/^C  File created on .*$/C  File created on <date>/
+				s/^C  IPC-D-356 Netlist generated by.*$/C  IPC-D-356 Netlist generated by <version>/
+			' $raw_out ;;
+		nelma)
+			sed -i 's@/[*] Made with PCB Nelma export HID [*]/.*@/* banner */@g' $raw_out ;;
+		gerber)
+			sed -i '
+				s/^G04 CreationDate:.*$/G04 CreationDate: <date>/
+				s/^G04 Creator:.*$/G04 Creator: <version>/
+			' $raw_out.*.gbr
+# do not save or compare the csect yet
+			rm $raw_out.*csect*.gbr
+			;;
+		ps)
+			sed -i '
+				s@%%CreationDate:.*@%%CreationDate: date@
+				s@%%Creator:.*@%%Creator: pcb-rnd@
+				s@%%Version:.*@%%Version: ver@
+				s@^[(]Created on.*@(Created on date@
+			' $raw_out
+			;;
+	esac
+
+# move the output file(s) to their final subdir (for multifile formats) and/or
+# compress them (for large text files)
+	case "$fmt" in
+		bboard)
+			mv ${raw_out%%.bbrd.png}.png $final_out
+			;;
+		gerber)
+			mkdir -p $final_out.gbr
+			mv $raw_out.*.gbr $final_out.gbr
+			mv $raw_out.*.cnc $final_out.gbr 2>/dev/null
+			;;
+		nelma)
+			mv $raw_out $final_out
+			# do not test the pngs for now
+			rm -f ${raw_out%%.em}*.png
+			;;
+		remote|ps)
+			gzip $raw_out
+			mv $raw_out.gz $final_out.gz
+			;;
+		*)
+			# common, single file output
+			if test -f "$raw_out"
+			then
+				mv $raw_out $final_out
+			fi
+			;;
+	esac
+}
+
+cmp_fmt()
+{
+	local ref="$1" out="$2" n bn otmp
+	case "$fmt" in
+		png)
+			if test ! -z "$CONVERT"
+			then
+				bn=`basename $out`
+				res=`compare "$ref" "$out"  -metric AE  diff/$bn 2>&1`
+				case "$res" in
+					*widths*)
+						otmp=$out.599.png
+						$CONVERT -crop 599x599+0x0 $out  $otmp
+						res=`compare "$ref" "$otmp" -metric AE  diff/$bn 2>&1`
+						;;
+				esac
+				test "$res" -lt 8 && rm diff/$bn
+				test "$res" -lt 8
+			fi
+			;;
+		bboard)
+			if test ! -z "$CONVERT"
+			then
+				bn=`basename $out`
+				res=`compare "$ref" "$out"  -metric AE  diff/$bn 2>&1`
+				test "$res" -lt 8 && rm diff/$bn
+				test "$res" -lt 8
+			fi
+			;;
+		gerber)
+			for n in `ls $ref.gbr/*.gbr $ref.gbr/*.cnc 2>/dev/null`
+			do
+				bn=`basename $n`
+				diff -u "$n" "$out.gbr/$bn"
+			done
+			;;
+		ps)
+			zcat "$ref.gz" > "$ref"
+			zcat "$out.gz" > "$out"
+			diff -u "$ref" "$out" && rm "$ref" "$out"
+			;;
+		*)
+			# simple text files: byte-to-byte match required
+			diff -u "$ref" "$out"
+			;;
+	esac
+}
+
+run_test()
+{
+	local fn="$1" valgr res res2
+
+	if test "$valg" -gt 0
+	then
+		valgr="valgrind -v --log-file=$fn.vlog"
+	fi
+
+	if test "$verbose" -gt 0
+	then
+		echo "=== Test: $fmt $fn ==="
+	fi
+
+	# run and save stderr in file res2 and stdout in variable res
+	res2=`mktemp`
+	res=`$valgr $pcb_rnd_bin -x "$fmt" $global_args $fmt_args "$fn" 2>$res2`
+
+	# special case error: empty design is not exported; skip the file
+	if test ! -z "$res"
+	then
+		case "$res" in
+			*"export empty board"*) rm $res2; return 0 ;;
+		esac
+	fi
+
+	# print error messages to the log
+	sed "s/^/[pcb-rnd:stderr]  /" < $res2 >&2
+	rm $res2
+
+	base=${fn%%.pcb}
+	base=${base%%.lht}
+	ref_fn=ref/$base$ext
+	fmt_fn=$base$ext
+	out_fn=out/$base$ext
+
+	move_out "$fmt_fn" "$out_fn"
+	cmp_fmt "$ref_fn" "$out_fn"
+}
+
+while test $# -gt 0
+do
+	case "$1"
+	in
+		--list)
+			$pcb_rnd_bin -x nonexistentexporter 2>&1 | sed '
+				/available/ { s/^[^:]*: *//; s/ /\n/g; q; }
+				{ d }
+			'
+			exit 0;;
+		-t) test_announce=1;;
+		-f|-x) fmt=$2; shift 1;;
+		-b) pcb_rnd_bin=$2; shift 1;;
+		-a) all=1;;
+		-V) valg=1;;
+		-v) verbose=1;;
+		*)
+			if test -z "$fn"
+			then
+				fn="$1"
+			else
+				echo "unknown switch $1; try --help" >&2
+				exit 1
+			fi
+			;;
+	esac
+	shift 1
+done
+
+if test -z "$fmt"
+then
+	echo "need a format" >&2
+fi
+
+set_fmt_args
+
+if test "$test_announce" -gt 0
+then
+	echo -n "$fmt: ... "
+fi
+
+bad=""
+if test "$all" -gt 0
+then
+	for n in `ls *.lht *.pcb 2>/dev/null`
+	do
+		run_test "$n" || bad="$bad $n"
+	done
+else
+	run_test "$fn" || bad="$bad $n"
+fi
+
+if test ! -z "$bad"
+then
+	if test "$verbose" -gt 0
+	then
+		echo "$fmt: ... BROKEN: $bad"
+	else
+		echo "$fmt: ... BROKEN"
+	fi
+	exit 1
+else
+	echo "ok"
+	exit 0
+fi
+
+

Property changes on: tags/2.0.1/tests/RTT/Export.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/Makefile
===================================================================
--- tags/2.0.1/tests/RTT/Makefile	(nonexistent)
+++ tags/2.0.1/tests/RTT/Makefile	(revision 18980)
@@ -0,0 +1,10 @@
+all:
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test:
+	@./Test_export.sh && echo "*** export: QC PASS ***"
+
+clean:
+	$(SCCBOX) rm -f out/*/* out/* diff/*
Index: tags/2.0.1/tests/RTT/Proto.pcb
===================================================================
--- tags/2.0.1/tests/RTT/Proto.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/Proto.pcb	(revision 18980)
@@ -0,0 +1,43 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/README
===================================================================
--- tags/2.0.1/tests/RTT/README	(nonexistent)
+++ tags/2.0.1/tests/RTT/README	(revision 18980)
@@ -0,0 +1,3 @@
+This directory contains a set of round-trip-test designs. Each design
+demonstrates a feature, as purely as possible. The purpose is to use these
+as test cases for automatic mapping of file format compatibility (TODO).
Index: tags/2.0.1/tests/RTT/RTT_kicad_legacy_summary.txt
===================================================================
--- tags/2.0.1/tests/RTT/RTT_kicad_legacy_summary.txt	(nonexistent)
+++ tags/2.0.1/tests/RTT/RTT_kicad_legacy_summary.txt	(revision 18980)
@@ -0,0 +1,17 @@
+feature	supported	partial_support	unsupported	reason	test_case
+round pins	Y	X	X	universal, lossless	x
+octagonal pins	X	Y	X	gEDA native, no kicad support, export as round	x
+rectangular SMD	Y	X	X	gEDA native, kicad native support	x
+copper arcs	X	Y	X	converted to lines on export	x
+copper line	Y	X	X	universal, lossless	x
+silk line	Y	X	X	universal, lossless	x
+silk arc	X	Y	X	kicad supports multiples of 90 degrees only	x
+silk circle	Y	X	X	universal, lossless	x
+element value, name	X	Y	X	gEDA does not store text label locations	x
+layout modules/footprints	Y	X	X	geometry preserved	x
+track netlist	X	X	Y	gEDA does not store netlist for tracks	x
+via	X	Y	X	kicad uses polygonal zones to manage via thermal properties within it	x
+copper pours	X	Y	X	kicad applies pullback to margins of polygonal zones	x
+polygon windows	X	X	Y	yet to be implemented	x
+text labels	X	Y	X	font kerning, placement not exact	x
+
Index: tags/2.0.1/tests/RTT/RTT_kicad_summary.txt
===================================================================
--- tags/2.0.1/tests/RTT/RTT_kicad_summary.txt	(nonexistent)
+++ tags/2.0.1/tests/RTT/RTT_kicad_summary.txt	(revision 18980)
@@ -0,0 +1,26 @@
+feature	supported	partial_support	unsupported	reason	test_case
+round pins	Y	X	X	universal	x
+octagonal pins	X	Y	X	gEDA native, no kicad support, export as round	x
+rectangular SMD	Y	X	X	gEDA native, kicad native support	x
+trapezoidal SMD	X	Y	X	converted to rectangular on import	x
+rounded corner SMD X       Y       X       converted to rectangular on import      x
+copper arcs	X	Y	X	converted to lines on export	x
+copper line	Y	X	X	universal, lossless	x
+track clearance	X	Y	X	per track clearance not preserved	x
+silk line	Y	X	X	universal, lossless	x
+silk arc	X	Y	X	kicad supports multiples of 90deg only	x
+silk circle	Y	X	X	universal, lossless	x
+element value, name	X	Y	X	gEDA does not store text label locations	x
+layout modules/footprints	Y	X	X	geometry preserved	x
+track netlist	X	X	Y	gEDA does not store netlist for tracks	x
+rat lines	X	X	Y	kicad does not have an equivalent	x
+via	X	Y	X	kicad uses polygonal zones to manage thermal properties within it	x
+copper pours	X	Y	X	kicad applied pullback to margins of polygonal zones	x
+polygon windows	X	X	Y	yet to be implemented	x
+text labels	X	Y	X	font kerning, placement not exact	x
+text style	X	X	Y	italic, bold, unsupported on import	x
+text size	X	Y	X	font size, kerning, placement not exact	x
+text clearline flag	X	X	Y	no kicad equivalent	x
+font data	X	X	Y	font symbol not preserved on export	x
+layer naming	X	Y	X	non standard kicad layer names are not preserved	layer_outline.pcb
+layer order	Y	X	X	layer order preserved, but names may not be	x
Index: tags/2.0.1/tests/RTT/Remote_dump.sh
===================================================================
--- tags/2.0.1/tests/RTT/Remote_dump.sh	(nonexistent)
+++ tags/2.0.1/tests/RTT/Remote_dump.sh	(revision 18980)
@@ -0,0 +1,12 @@
+#!/bin/sh
+# dump remote HID communication
+
+echo '
+	MakeGC(1)
+	Ready()
+	MakeGC(2)
+	MakeGC(3)
+	MakeGC(4)
+' | pcb-rnd --gui remote $1  | grep -v "^[A-Z]:" > out/${1%%.pcb}.remote
+rm -f out/${1%%.pcb}.remote.gz
+gzip out/${1%%.pcb}.remote

Property changes on: tags/2.0.1/tests/RTT/Remote_dump.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/Rtt.sh
===================================================================
--- tags/2.0.1/tests/RTT/Rtt.sh	(nonexistent)
+++ tags/2.0.1/tests/RTT/Rtt.sh	(revision 18980)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# local wrapper around pcb-rtrip so it all can be executed from the source
+# tree, without installation
+
+TRUNK=../..
+pcb_rnd_bin="$TRUNK/src/pcb-rnd"
+RTRIP="$TRUNK/util/devhelpers/pcb-rtrip"
+
+(
+	. $RTRIP
+	if test -f core
+	then
+		mv core "$fn.core"
+	fi
+)  2>&1  | grep -v "PCBChanged\|readres=-1\|No PCB loaded\|pcb-gpmi hid is loaded\|has no font information, using default font\|WARNING.*is not uninited\|but first saves\|WARNING.*left registered\|gpmi dirs:"

Property changes on: tags/2.0.1/tests/RTT/Rtt.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/Rtt_all.sh
===================================================================
--- tags/2.0.1/tests/RTT/Rtt_all.sh	(nonexistent)
+++ tags/2.0.1/tests/RTT/Rtt_all.sh	(revision 18980)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+ulimit -c unlimited
+rm core
+all=`ls *.pcb | grep -v "[.]new[.]pcb$\|[.]orig[.]pcb$\|^[.]"`
+num_all=`echo "$all" | wc -l`
+
+cnt=0
+for n in $all
+do
+	cnt=$(($cnt+1))
+	echo "----------------------$n"
+	echo "----------------------$n $cnt/$num_all" >&2
+	./Rtt.sh $n "$@"
+done > All.log
+

Property changes on: tags/2.0.1/tests/RTT/Rtt_all.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/Test_export.sh
===================================================================
--- tags/2.0.1/tests/RTT/Test_export.sh	(nonexistent)
+++ tags/2.0.1/tests/RTT/Test_export.sh	(revision 18980)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Run the export test on all formats that have refs _and_ are supported
+# by our current pcb-rnd executable
+
+tester="./Export.sh -t -a"
+
+# disabled until the rewrite:
+#IPC-D-356
+# disabled until figuring the rotation:
+#dsn
+want='
+bom
+eps
+ps
+XY  2>/dev/null
+png
+gerber
+svg 2>/dev/null
+'
+
+have=`./Export.sh  --list`
+
+export fail=0
+echo "$want" | while read fmt args
+do
+	if test ! -z "$fmt"
+	then
+		have_=`echo "$have"|grep "^$fmt$"`
+		if test ! -z "$have_"
+		then
+			eval "$tester -f $fmt $args"
+			if test "$?" -ne "0"
+			then
+				fail=1
+			fi
+		else
+			echo "$fmt: SKIP (plugin not enabled)"
+		fi
+	fi
+
+	# the only way to set the return value of the while()
+	if test "$fail" -ne "0"
+	then
+		false
+	else
+		true
+	fi
+done

Property changes on: tags/2.0.1/tests/RTT/Test_export.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/Vailidation.txt
===================================================================
--- tags/2.0.1/tests/RTT/Vailidation.txt	(nonexistent)
+++ tags/2.0.1/tests/RTT/Vailidation.txt	(revision 18980)
@@ -0,0 +1,111 @@
+ Validation state of references
+#
+# Each line is a file from ref/, in the following format:
+#  The first word is the file name, relative to ref/
+#  The second word is either "good" or "bad"
+#  The third word is the revision number the output file had at the moment of
+#   check (the "Last Changed Revision line in 'svn info ref/filename')
+#  The rest of the line is a real short summary on whaty's broken, if the
+#   second column was "bad".
+#
+# There's no particular order of lines. If you recheck a file, edit the exiting
+# line, each ref file should have only one line in this file. If you are doing
+# checks, please insert new lines somewhere in the list, preferrably not at the
+# end, so we can avoid svn conflicts in concurrent edits.
+#
+# Test method: open the .pcb file with pcb-rnd, open the ref/ file with
+# the appropriate viewer, look at them side by side and decide if the reference
+# output fully matches the input, in all relevant details. What relevent
+# details are can be file format specific.
+#
+
+Proto.bom good r5452
+coord_rounding.bom good r5652
+elem_pads.bom good r5652
+elem_pads_ds.bom good r5652
+elem_pins.bom good r5652
+elem_sides_smd.bom good r5652
+elem_sides_trh.bom good r5652
+arc_f_clear.bom good r6630
+arc_normal.bom good r6630
+arc_offpage.bom good r6630
+arc_sizes.bom good r6630
+arc_angles.bom good r6630
+arc_sizes.svg broken r6023 ellipticals not handled
+arc_angles.png good r6630
+arc_f_clear.png bad r6630
+arc_normal.png good r6630
+arc_offpage.png good r6630
+arc_sizes.png good r6630
+coord_rounding.png good r6630
+clearance.png bad r6630 missing pcb & text file?!
+elem_pads_ds.png good r6630
+elem_pads.png good r6630
+elem_pins.png good r6630
+elem_sides_smd.png good r6630
+elem_sides_trh.png good r6630
+layer_copper.png good r6630
+layer_outline.png good r6630
+layer_spc.png good r6630
+line_f_clear.png good r6630
+line_normal.png good r6630
+line_offpage.png good r6630
+line_overlap1.png good r6630
+line_overlap2.png good r6630
+line_overlap3.png good r6630
+line_overlap4.png good r6630
+line_zerolen.png good r6630
+netlist.png good r6630
+netlist_ba.png good r6630
+poly_hole.png good r6630
+poly_rect.png good r6630
+poly_triangle.png good r6630
+Proto.png good r6731
+rat.png good r6731
+text_rot.png good r6731
+text_scale.png good r6731
+text_sides.png good r6731
+thermal_last.png good r6731
+thermal_layer.png good r6731
+arc_angles.eps bad r13746 geometry is okay, outline layer missing
+arc_f_clear.eps bad r13746 geometry is okay, outline layer missing
+arc_normal.eps bad r13746 geometry is okay, outline layer missing
+arc_offpage.eps bad r13746 geometry is okay, outline layer missing
+arc_sizes.eps bad r13746 totally broken arc corner cases
+comp1.eps bad r13746 missing line, see bug_files/eps_comp1.png
+elem_pads.eps bad r13746 suspected pad placement rounding error, see bug_files/eps_elem_pads.png
+elem_pads_ds.eps bad r13746 geometry is okay, outline layer missing
+coord_rounding.dsn good r17050
+elem_pads.dsn good r17050
+elem_pins.dsn good r17050
+elem_sides_smd.dsn good r17050
+elem_sides_trh.dsn good r17050
+layer_copper.dsn good r17050
+line_overlap1.dsn good r17050
+line_overlap2.dsn good r17050
+line_overlap3.dsn good r17050
+line_overlap4.dsn good r17050 (poly missing)
+netlist_ba.dsn good r17050
+netlist.dsn good r17050
+padrot.dsn good r17050
+line_f_clear.dsn good r17050 (poly missing)
+line_normal.dsn good r17050 (poly missing)
+arc_angles.dsn good r17050 (arc missing)
+arc_f_clear.dsn good r17050 (arc missing)
+arc_normal.dsn good r17050 (arc missing)
+arc_offpage.dsn good r17050 (arc missing)
+arc_sizes.dsn good r17050 (arc missing)
+layer_outline.dsn good r17050
+layer_silk.dsn good r17050 (silk objects not exported)
+layer_spc.dsn good r17050
+poly_hole.dsn good r17050 (polys missing)
+poly_rect.dsn good r17050 (polys missing)
+poly_triangle.dsn good r17050 (polys missing)
+rat.dsn good r17050
+text_rot.dsn good r17050 (text missing)
+text_scale.dsn good r17050 (text missing)
+text_sides.dsn good r17050 (text missing)
+thermal_layer.dsn bad r17050 missing padstack via
+comp1.dsn bad r17050 missing padstack via
+padstack.dsn bad r17050 missing padstack via
+elem_pads_ds.dsn bad r17050 geo okay, but square in freerouting, rounded on pcb-rnd
Index: tags/2.0.1/tests/RTT/arc_angles.pcb
===================================================================
--- tags/2.0.1/tests/RTT/arc_angles.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/arc_angles.pcb	(revision 18980)
@@ -0,0 +1,46 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["arcs with different strange angles" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Arc[100mil 100mil 50mil 50mil 254000nm 1016000nm 0 750 ""]
+	Arc[300mil 100mil 50mil 50mil 254000nm 1016000nm 0 0 ""]
+	Arc[400mil 100mil 50mil 50mil 254000nm 1016000nm 0 -750 ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/arc_f_clear.pcb
===================================================================
--- tags/2.0.1/tests/RTT/arc_f_clear.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/arc_f_clear.pcb	(revision 18980)
@@ -0,0 +1,51 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Arc with clearline flag" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Arc[5080000nm 5715000nm 3175000nm 3175000nm 254000nm 1016000nm 0 90 "clearline"]
+	Arc[4445000nm 5715000nm 2540000nm 2540000nm 508000nm 1016000nm -10 -80 ""]
+	Arc[7620000nm 6985000nm 635000nm 635000nm 254000nm 1016000nm 0 300 "clearline"]
+	Arc[6350000nm 5715000nm 3175000nm 3175000nm 762000nm 1016000nm -70 -90 ""]
+	Polygon("clearpoly")
+	(
+		[635000nm 3810000nm] [12065000nm 3810000nm] [12065000nm 12065000nm] [635000nm 12065000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/arc_normal.pcb
===================================================================
--- tags/2.0.1/tests/RTT/arc_normal.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/arc_normal.pcb	(revision 18980)
@@ -0,0 +1,47 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Arcs with different sizes, normal cases" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Arc[5080000nm 5715000nm 3175000nm 3175000nm 254000nm 1016000nm 0 90 ""]
+	Arc[4445000nm 5715000nm 2540000nm 2540000nm 508000nm 1016000nm -10 -80 ""]
+	Arc[7620000nm 6985000nm 635000nm 635000nm 254000nm 1016000nm 0 300 ""]
+	Arc[6350000nm 5715000nm 3175000nm 3175000nm 762000nm 1016000nm -70 -90 ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/arc_offpage.pcb
===================================================================
--- tags/2.0.1/tests/RTT/arc_offpage.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/arc_offpage.pcb	(revision 18980)
@@ -0,0 +1,44 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Arcs with some parts off the page" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Arc[50mil 50mil 100mil 100mil 254000nm 1016000nm 0 230 ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/arc_sizes.pcb
===================================================================
--- tags/2.0.1/tests/RTT/arc_sizes.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/arc_sizes.pcb	(revision 18980)
@@ -0,0 +1,47 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["arcs with different strange sizes" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Arc[100mil 200mil 0mil 50mil 254000nm 1016000nm 0 90 ""]
+	Arc[200mil 200mil 50mil 0mil 254000nm 1016000nm 0 90 ""]
+	Arc[300mil 200mil 0mil 0mil 254000nm 1016000nm 0 90 ""]
+
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/comp1.pcb
===================================================================
--- tags/2.0.1/tests/RTT/comp1.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/comp1.pcb	(revision 18980)
@@ -0,0 +1,358 @@
+ha:pcb-rnd-board-v2 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:style1 {
+    diameter = 1.999995mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:style2 {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999997mm
+    clearance = 20.0mil
+   }
+   ha:style3 {
+    diameter = 3.500119mm
+    thickness = 80.0mil
+    hole = 1.199895mm
+    clearance = 25.0mil
+   }
+   ha:style4 {
+    diameter = 64.0mil
+    thickness = 100.0mil
+    hole = 31.5mil
+    clearance = 100.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 500.0mil
+    y = 500.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 0.0
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+
+   li:objects {
+    ha:via.31 {
+     x=250.0mil; y=75.0mil; hole=0.999998mm; mask=0.0; thickness=2.199894mm; clearance=40.0mil;
+     ha:flags {
+      via=1
+     }
+    }
+   }
+   li:layers {
+
+    ha:comp1 {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.38 {
+        x1=25.0mil; y1=150.0mil; x2=475.0mil; y2=150.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:solder1 {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.41 {
+        x1=25.0mil; y1=125.0mil; x2=475.0mil; y2=125.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:com2 {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:solder2 {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:inner1 {
+     lid=4
+     group=5
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:inner2 {
+     lid=5
+     group=7
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+    }
+
+    ha:silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:polygon.5 {
+        li:geometry {
+          ta:contour {
+           { 25.0mil; 25.0mil }
+           { 175.0mil; 25.0mil }
+           { 175.0mil; 175.0mil }
+           { 25.0mil; 175.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+       ha:polygon.21 {
+        li:geometry {
+          ta:contour {
+           { 200.0mil; 25.0mil }
+           { 475.0mil; 25.0mil }
+           { 475.0mil; 475.0mil }
+           { 200.0mil; 475.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:neg {
+     lid=9
+     group=1
+     ha:combining { sub=1;     }
+     visible=1
+
+      li:objects {
+       ha:line.10 {
+        x1=100.0mil; y1=250.0mil; x2=100.0mil; y2=125.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:arc.32 {
+        x=0.0; y=0.0; width=75.0mil; height=75.0mil; astart=90; adelta=90; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:polygon.26 {
+        li:geometry {
+          ta:contour {
+           { 225.0mil; 50.0mil }
+           { 450.0mil; 50.0mil }
+           { 450.0mil; 450.0mil }
+           { 225.0mil; 450.0mil }
+          }
+        }
+
+        ha:flags {
+         clearpoly=1
+        }
+       }
+      }
+    }
+
+    ha:pos {
+     lid=10
+     group=1
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.13 {
+        x1=100.0mil; y1=225.0mil; x2=100.0mil; y2=125.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+   }
+ }
+
+ ha:netlists {
+   li:input {
+   }
+ }
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers {    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8; 9; 10;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:8 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_8
+   }
+   ha:9 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    line_thickness = 20.00 mil
+    groups = {1,3,c:2,4,s:5:6:7}
+    via_thickness = 86.61 mil
+    via_drilling_hole = 39.37 mil
+    clearance = 20.00 mil
+   }
+   ha:editor {
+    live_routing = false
+    snap_pin = true
+    draw_grid = true
+    swap_start_direction = false
+    full_poly = false
+    clear_line = true
+    show_number = false
+    auto_drc = false
+    all_direction_lines = false
+    lock_names = false
+    unique_names = false
+    only_names = false
+    hide_names = false
+    orthogonal_moves = false
+    thin_draw = false
+    rubber_band_mode = false
+    name_on_pcb = true
+    thin_draw_poly = false
+    check_planes = false
+    description = false
+    local_ref = false
+    show_drc = false
+     grid_unit = mil
+   }
+   ha:plugins {
+    ha:mincut {
+     enable = false
+    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/tests/RTT/coord_rounding.pcb
===================================================================
--- tags/2.0.1/tests/RTT/coord_rounding.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/coord_rounding.pcb	(revision 18980)
@@ -0,0 +1,45 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["odd coordinates to check rounding errors" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[1270000nm 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Line[6000000nm 6100000nm 6110000nm 6111000nm 1mm 1mm ""]
+	Line[6111100nm 6111110nm 6111111nm 6111000nm 1mm 1mm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/default_font
===================================================================
--- tags/2.0.1/tests/RTT/default_font	(nonexistent)
+++ tags/2.0.1/tests/RTT/default_font	(revision 18980)
@@ -0,0 +1,309 @@
+# Minimal symbol set: space, 1..9, A..Z
+Symbol(' ' 18)
+(
+)
+Symbol('1' 12)
+(
+	SymbolLine( 0  8  8  0 8)
+	SymbolLine( 8  0  8 40 8)
+	SymbolLine( 0 40 15 40 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(25 5 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 25 40 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 35  5 40 8)
+
+	SymbolLine( 5 18 15 18 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(20 23 20 35 8)
+	SymbolLine(20 23 15 18 8)
+	SymbolLine(20 13 15 18 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 25 20 0 8)
+	SymbolLine(0 25 25 25 8)
+	SymbolLine(20 0 20 40 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(0 0 0 20 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(20 20 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15  0 20  5 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(15 18 20 23 8)
+	SymbolLine( 0 18 15 18 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 23 20 35 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine( 5 40 25  0 8)
+	SymbolLine( 0  0 25  0 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 27  0 35 8)
+	SymbolLine( 0 27  7 20 8)
+	SymbolLine( 7 20 13 20 8)
+	SymbolLine(13 20 20 27 8)
+	SymbolLine(20 27 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 13  7 20 8)
+	SymbolLine( 0  5  0 13 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(13 20 20 13 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(5 40 20 20 8)
+	SymbolLine(20 5 20 20 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 15 8)
+	SymbolLine(0 15 5 20 8)
+	SymbolLine(5 20 20 20 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine( 0 10  0 40 8)
+	SymbolLine( 0 10  7  0 8)
+	SymbolLine( 7  0 18  0 8)
+	SymbolLine(18  0 25 10 8)
+	SymbolLine(25 10 25 40 8)
+	SymbolLine( 0 20 25 20 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine( 0 40 20 40 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(25 23 25 35 8)
+	SymbolLine(20 18 25 23 8)
+	SymbolLine( 5 18 20 18 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 13 8)
+	SymbolLine(20 18 25 13 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(7 40 20 40 8)
+	SymbolLine(0 33  7 40 8)
+	SymbolLine(0  7  0 33 8)
+	SymbolLine(0  7  7  0 8)
+	SymbolLine(7  0 20  0 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(18  0 25  7 8)
+	SymbolLine(25  7 25 33 8)
+	SymbolLine(18 40 25 33 8)
+	SymbolLine( 0 40 18 40 8)
+	SymbolLine( 0  0 18  0 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 18 15 18 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
+	SymbolLine(0 18 15 18 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(25 25 25 35 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(10 20 20 20 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(25 0 25 40 8)
+	SymbolLine(0 20 25 20 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 0 10 0 8)
+	SymbolLine(5 0 5 40 8)
+	SymbolLine(0 40 10 40 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine( 7  0 15  0 8)
+	SymbolLine(15  0 15 35 8)
+	SymbolLine(10 40 15 35 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 35  0 30 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 20 20 0 8)
+	SymbolLine(0 20 20 40 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 40 20 40 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 0 15 20 8)
+	SymbolLine(15 20 30 0 8)
+	SymbolLine(30 0 30 40 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 0 0 40 8)
+	SymbolLine(0 0 25 40 8)
+	SymbolLine(25 0 25 40 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 5 0 35 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(5 0 15 0 8)
+	SymbolLine(15 0 20 5 8)
+	SymbolLine(20 5 20 35 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 0 5 40 8)
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(25 5 25 15 8)
+	SymbolLine(20 20 25 15 8)
+	SymbolLine(5 20 20 20 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 30 8)
+	SymbolLine(10 40 20 30 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(10 25 20 40 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 15 8)
+	SymbolLine(20 20 25 15 8)
+	SymbolLine( 5 20 20 20 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(13 20 25 40 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 0 25 5 8)
+	SymbolLine(5 0 20 0 8)
+	SymbolLine(0 5 5 0 8)
+	SymbolLine(0 5 0 15 8)
+	SymbolLine(0 15 5 20 8)
+	SymbolLine(5 20 20 20 8)
+	SymbolLine(20 20 25 25 8)
+	SymbolLine(25 25 25 35 8)
+	SymbolLine(20 40 25 35 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 0 20 0 8)
+	SymbolLine(10 0 10 40 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 0 0 35 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(5 40 15 40 8)
+	SymbolLine(15 40 20 35 8)
+	SymbolLine(20 0 20 35 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine( 0  0 10 40 8)
+	SymbolLine(10 40 20  0 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine( 0  0  0 20 8)
+	SymbolLine( 0 20  5 40 8)
+	SymbolLine( 5 40 15 20 8)
+	SymbolLine(15 20 25 40 8)
+	SymbolLine(25 40 30 20 8)
+	SymbolLine(30 20 30  0 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0  0 25 40 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine( 0  0 10 20 8)
+	SymbolLine(10 20 20  0 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine( 0  0 25  0 8)
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0 40 25 40 8)
+)
Index: tags/2.0.1/tests/RTT/elem_pads.pcb
===================================================================
--- tags/2.0.1/tests/RTT/elem_pads.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/elem_pads.pcb	(revision 18980)
@@ -0,0 +1,68 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["pads with different geometry" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "Standard SMT resistor, capacitor etc" "R1" "1206" 6350000nm 2540000nm -800100nm 1104900nm 0 100 ""]
+(
+	Pad[-1499870nm -299974nm -1499870nm 299974nm 1299972nm 508000nm 1452372nm "1" "1" "square"]
+	Pad[1499870nm -299974nm 1499870nm 299974nm 1299972nm 508000nm 1452372nm "2" "2" "square"]
+	ElementLine [-599948nm -949960nm 599948nm -949960nm 203200nm]
+	ElementLine [-599948nm 949960nm 599948nm 949960nm 203200nm]
+
+	)
+
+Element["" "SMT transistor, 5 pins" "U1" "SOT325" 5689600nm 9525000nm 25400nm 1016000nm 0 100 ""]
+(
+	Pad[0 -254000nm 0 254000nm 381000nm 762000nm 533400nm "1" "1" "square,edge2"]
+	Pad[1295400nm -254000nm 1295400nm 254000nm 381000nm 762000nm 533400nm "2" "2" "square,edge2"]
+	Pad[1295400nm -2032000nm 1295400nm -1524000nm 381000nm 762000nm 533400nm "3" "3" "square"]
+	Pad[660400nm -2032000nm 660400nm -1524000nm 381000nm 762000nm 533400nm "4" "4" "square"]
+	Pad[0 -2032000nm 0 -1524000nm 381000nm 762000nm 533400nm "5" "5" "square"]
+	ElementLine [-355600nm -2387600nm -355600nm 635000nm 254000nm]
+	ElementLine [-355600nm 635000nm 1676400nm 635000nm 254000nm]
+	ElementLine [1676400nm 635000nm 1676400nm -2387600nm 254000nm]
+	ElementLine [1676400nm -2387600nm -355600nm -2387600nm 254000nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/elem_pads_ds.pcb
===================================================================
--- tags/2.0.1/tests/RTT/elem_pads_ds.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/elem_pads_ds.pcb	(revision 18980)
@@ -0,0 +1,365 @@
+# release: pcb-rnd 1.1.3
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["element with pads on both sides" 50000 50000]
+
+Grid[2500 0 0 1]
+Cursor[0 10000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,1000,7874,3150,2000:style2,2000,8661,3937,2000:style3,8000,13780,4724,2500:style4,10000,6400,3150,10000"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 800 800 0 800]
+	SymbolLine[800 0 800 4000 800]
+	SymbolLine[0 4000 1500 4000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[0 4000 2500 1500 800]
+	SymbolLine[0 4000 2500 4000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 1800 1500 1800 800]
+	SymbolLine[2000 500 2000 1300 800]
+	SymbolLine[2000 2300 2000 3500 800]
+	SymbolLine[2000 2300 1500 1800 800]
+	SymbolLine[2000 1300 1500 1800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 2500 2000 0 800]
+	SymbolLine[0 2500 2500 2500 800]
+	SymbolLine[2000 0 2000 4000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[0 0 0 2000 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[2000 2000 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[1500 1800 2000 2300 800]
+	SymbolLine[0 1800 1500 1800 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[2000 2300 2000 3500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 4000 2500 0 800]
+	SymbolLine[0 0 2500 0 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 2700 0 3500 800]
+	SymbolLine[0 2700 700 2000 800]
+	SymbolLine[700 2000 1300 2000 800]
+	SymbolLine[1300 2000 2000 2700 800]
+	SymbolLine[2000 2700 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 1300 700 2000 800]
+	SymbolLine[0 500 0 1300 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 1300 800]
+	SymbolLine[1300 2000 2000 1300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 4000 2000 2000 800]
+	SymbolLine[2000 500 2000 2000 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 1500 800]
+	SymbolLine[0 1500 500 2000 800]
+	SymbolLine[500 2000 2000 2000 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 1000 700 0 800]
+	SymbolLine[700 0 1800 0 800]
+	SymbolLine[1800 0 2500 1000 800]
+	SymbolLine[2500 1000 2500 4000 800]
+	SymbolLine[0 2000 2500 2000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[2500 2300 2500 3500 800]
+	SymbolLine[2000 1800 2500 2300 800]
+	SymbolLine[500 1800 2000 1800 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1300 800]
+	SymbolLine[2000 1800 2500 1300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 4000 2000 4000 800]
+	SymbolLine[0 3300 700 4000 800]
+	SymbolLine[0 700 0 3300 800]
+	SymbolLine[0 700 700 0 800]
+	SymbolLine[700 0 2000 0 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[1800 0 2500 700 800]
+	SymbolLine[2500 700 2500 3300 800]
+	SymbolLine[1800 4000 2500 3300 800]
+	SymbolLine[0 4000 1800 4000 800]
+	SymbolLine[0 0 1800 0 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 1800 1500 1800 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2000 0 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[0 1800 1500 1800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[2500 2500 2500 3500 800]
+	SymbolLine[2000 2000 2500 2500 800]
+	SymbolLine[1000 2000 2000 2000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[2500 0 2500 4000 800]
+	SymbolLine[0 2000 2500 2000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 0 1000 0 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 4000 1000 4000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 0 1500 0 800]
+	SymbolLine[1500 0 1500 3500 800]
+	SymbolLine[1000 4000 1500 3500 800]
+	SymbolLine[500 4000 1000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 0 3000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 2000 2000 0 800]
+	SymbolLine[0 2000 2000 4000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 4000 2000 4000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 1500 2000 800]
+	SymbolLine[1500 2000 3000 0 800]
+	SymbolLine[3000 0 3000 4000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2500 4000 800]
+	SymbolLine[2500 0 2500 4000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[2000 2000 2500 1500 800]
+	SymbolLine[500 2000 2000 2000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 3000 800]
+	SymbolLine[1000 4000 2000 3000 800]
+	SymbolLine[500 4000 1000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[1000 2500 2000 4000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[2000 2000 2500 1500 800]
+	SymbolLine[500 2000 2000 2000 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[1300 2000 2500 4000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 1500 800]
+	SymbolLine[0 1500 500 2000 800]
+	SymbolLine[500 2000 2000 2000 800]
+	SymbolLine[2000 2000 2500 2500 800]
+	SymbolLine[2500 2500 2500 3500 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[1000 0 1000 4000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 0 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[2000 0 2000 3500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 0 1000 4000 800]
+	SymbolLine[1000 4000 2000 0 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 0 0 2000 800]
+	SymbolLine[0 2000 500 4000 800]
+	SymbolLine[500 4000 1500 2000 800]
+	SymbolLine[1500 2000 2500 4000 800]
+	SymbolLine[2500 4000 3000 2000 800]
+	SymbolLine[3000 2000 3000 0 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 4000 2500 0 800]
+	SymbolLine[0 0 2500 4000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 0 1000 2000 800]
+	SymbolLine[1000 2000 2000 0 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 0 2500 0 800]
+	SymbolLine[0 4000 2500 0 800]
+	SymbolLine[0 4000 2500 4000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::loader" "geda/pcb - mainline (centimils)")
+Attribute("PCB::conf::editor/show_solder_side" "0")
+Attribute("PCB::conf::editor/buffer_number" "0")
+Attribute("PCB::conf::editor/view/flip_x" "0")
+Attribute("PCB::conf::editor/view/flip_y" "0")
+
+Element["" "" "E1" "" 17500 15000 0 -7500 0 100 ""]
+(
+	Pad[0 0 7500 0 1000 4000 5000 "" "1" ""]
+	Pad[10000 2500 10000 10000 1000 4000 5000 "" "2" "onsolder,edge2"]
+	ElementLine [0 0 0 10000 1000]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/elem_pins.pcb
===================================================================
--- tags/2.0.1/tests/RTT/elem_pins.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/elem_pins.pcb	(revision 18980)
@@ -0,0 +1,71 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["pins with different shapes" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 1905000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "dip(2)" "U1" "2*300" 1905000nm 3175000nm 0 -2540000nm 0 100 ""]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "2" "edge2"]
+	ElementLine [-1270000nm -1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm 8890000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 2540000nm -1270000nm 254000nm]
+	ElementLine [5080000nm -1270000nm 8890000nm -1270000nm 254000nm]
+	ElementArc [3810000nm -1270000nm 1270000nm 1270000nm 0 180 254000nm]
+
+	)
+
+Element["" "dip(2)" "U2" "2*300" 1905000nm 8255000nm 0 -2540000nm 0 100 ""]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2,shape(2)"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "2" "square,edge2,shape(12)"]
+	ElementLine [-1270000nm -1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm 8890000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 2540000nm -1270000nm 254000nm]
+	ElementLine [5080000nm -1270000nm 8890000nm -1270000nm 254000nm]
+	ElementArc [3810000nm -1270000nm 1270000nm 1270000nm 0 180 254000nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/elem_sides_smd.pcb
===================================================================
--- tags/2.0.1/tests/RTT/elem_sides_smd.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/elem_sides_smd.pcb	(revision 18980)
@@ -0,0 +1,63 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["smd elements on both sides" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "Standard SMT resistor, capacitor etc" "R1" "1206" 5715000nm 3175000nm 3009900nm -800100nm 0 100 ""]
+(
+	Pad[-1499870nm -299974nm -1499870nm 299974nm 1299972nm 508000nm 1452372nm "1" "1" "square"]
+	Pad[1499870nm -299974nm 1499870nm 299974nm 1299972nm 508000nm 1452372nm "2" "2" "square"]
+	ElementLine [-599948nm -949960nm 599948nm -949960nm 203200nm]
+	ElementLine [-599948nm 949960nm 599948nm 949960nm 203200nm]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R2" "1206" 5715000nm 8890000nm 3009900nm 800100nm 0 100 "auto"]
+(
+	Pad[-1499870nm 299974nm -1499870nm -299974nm 1299972nm 508000nm 1452372nm "1" "1" "onsolder,square"]
+	Pad[1499870nm 299974nm 1499870nm -299974nm 1299972nm 508000nm 1452372nm "2" "2" "onsolder,square"]
+	ElementLine [-599948nm 949960nm 599948nm 949960nm 203200nm]
+	ElementLine [-599948nm -949960nm 599948nm -949960nm 203200nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/elem_sides_trh.pcb
===================================================================
--- tags/2.0.1/tests/RTT/elem_sides_trh.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/elem_sides_trh.pcb	(revision 18980)
@@ -0,0 +1,71 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["thru-hole elements on both sides" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "dip(2)" "U1" "2*300" 2540000nm 3810000nm 0 -2540000nm 0 100 ""]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "2" "edge2"]
+	ElementLine [-1270000nm -1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm -1270000nm 1270000nm 254000nm]
+	ElementLine [8890000nm 1270000nm 8890000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 2540000nm -1270000nm 254000nm]
+	ElementLine [5080000nm -1270000nm 8890000nm -1270000nm 254000nm]
+	ElementArc [3810000nm -1270000nm 1270000nm 1270000nm 0 180 254000nm]
+
+	)
+
+Element["onsolder" "dip(2)" "U2" "2*300" 2540000nm 8890000nm 0 2540000nm 0 100 "auto"]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "2" "edge2"]
+	ElementLine [-1270000nm 1270000nm -1270000nm -1270000nm 254000nm]
+	ElementLine [8890000nm -1270000nm -1270000nm -1270000nm 254000nm]
+	ElementLine [8890000nm -1270000nm 8890000nm 1270000nm 254000nm]
+	ElementLine [-1270000nm 1270000nm 2540000nm 1270000nm 254000nm]
+	ElementLine [5080000nm 1270000nm 8890000nm 1270000nm 254000nm]
+	ElementArc [3810000nm 1270000nm 1270000nm 1270000nm -0 -180 254000nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/layer_copper.pcb
===================================================================
--- tags/2.0.1/tests/RTT/layer_copper.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/layer_copper.pcb	(revision 18980)
@@ -0,0 +1,48 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["one line per each type of copper layer" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Layer(1 "comp1")
+(
+	Line[1270000nm 1905000nm 1270000nm 8890000nm 254000nm 1016000nm "clearline"]
+)
+Layer(2 "solder1")
+(
+	Line[1905000nm 1905000nm 10160000nm 1905000nm 254000nm 1016000nm "clearline"]
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+	Line[2540000nm 3810000nm 8255000nm 9525000nm 254000nm 1016000nm "clearline"]
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/layer_outline.pcb
===================================================================
--- tags/2.0.1/tests/RTT/layer_outline.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/layer_outline.pcb	(revision 18980)
@@ -0,0 +1,48 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["outline layer triangle" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+	Line[1905000nm 2540000nm 1905000nm 10160000nm 254000nm 1016000nm "clearline"]
+	Line[1905000nm 10160000nm 9525000nm 10160000nm 254000nm 1016000nm "clearline"]
+	Line[9525000nm 10160000nm 1905000nm 2540000nm 254000nm 1016000nm "clearline"]
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/layer_silk.pcb
===================================================================
--- tags/2.0.1/tests/RTT/layer_silk.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/layer_silk.pcb	(revision 18980)
@@ -0,0 +1,47 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["one line on each silk layer" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+	Line[1905000nm 10795000nm 7620000nm 5080000nm 254000nm 1016000nm "clearline"]
+)
+Layer(9 "silk")
+(
+	Line[1270000nm 1270000nm 1270000nm 10795000nm 254000nm 1016000nm "clearline"]
+)
Index: tags/2.0.1/tests/RTT/layer_spc.pcb
===================================================================
--- tags/2.0.1/tests/RTT/layer_spc.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/layer_spc.pcb	(revision 18980)
@@ -0,0 +1,43 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["space (and other dangerous characters) in layer name" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "component 1")
+(
+)
+Layer(2 "solder	1")
+(
+)
+Layer(3 " ")
+(
+)
+Layer(4 "solder{2}")
+(
+)
+Layer(5 "inner(1)")
+(
+)
+Layer(6 "inner/2")
+(
+)
+Layer(7 "out:line")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_f_clear.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_f_clear.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_f_clear.pcb	(revision 18980)
@@ -0,0 +1,51 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Clear and no-clear lines" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Line[3175000nm 6350000nm 10160000nm 6350000nm 381000nm 609602nm "clearline"]
+	Line[6350000nm 3175000nm 6350000nm 9525000nm 254000nm 2133600nm "clearline"]
+	Line[6350000nm 6350000nm 10160000nm 5080000nm 508000nm 1016000nm ""]
+	Line[6350000nm 6350000nm 3810000nm 3810000nm 127000nm 1016000nm ""]
+	Polygon("clearpoly")
+	(
+		[635000nm 635000nm] [12065000nm 635000nm] [12065000nm 12065000nm] [635000nm 12065000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_normal.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_normal.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_normal.pcb	(revision 18980)
@@ -0,0 +1,47 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Normal lines at different size and angle" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[1270000nm 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Line[3175000nm 6350000nm 10160000nm 6350000nm 381000nm 1016000nm ""]
+	Line[6350000nm 3175000nm 6350000nm 9525000nm 254000nm 1016000nm ""]
+	Line[6350000nm 6350000nm 10160000nm 5080000nm 508000nm 1016000nm ""]
+	Line[6350000nm 6350000nm 3810000nm 3810000nm 127000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_offpage.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_offpage.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_offpage.pcb	(revision 18980)
@@ -0,0 +1,44 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["A single line that extends beyond board boundary" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[0.0 50.0mil 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Line[100mil 200mil 600mil 200mil 254000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_overlap1.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_overlap1.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_overlap1.pcb	(revision 18980)
@@ -0,0 +1,45 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Two lines partially overlapping" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[50.0mil 0.0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Line[200mil 200mil 250mil 200mil 381000nm 1016000nm ""]
+	Line[220mil 200mil 300mil 200mil 381000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_overlap2.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_overlap2.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_overlap2.pcb	(revision 18980)
@@ -0,0 +1,45 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Two lines, one over the other, full cover" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[50.0mil 0.0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Line[200mil 200mil 350mil 200mil 381000nm 1016000nm ""]
+	Line[220mil 200mil 300mil 200mil 381000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_overlap3.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_overlap3.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_overlap3.pcb	(revision 18980)
@@ -0,0 +1,45 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Full overlap: the same line twice" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[50.0mil 0.0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Line[200mil 200mil 350mil 200mil 381000nm 1016000nm ""]
+	Line[200mil 200mil 350mil 200mil 381000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_overlap4.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_overlap4.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_overlap4.pcb	(revision 18980)
@@ -0,0 +1,49 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Full overlap: the same line twice with different settings" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[635000nm 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999994nm,800100nm,508000nm:style2,508000nm,2199894nm,999996nm,508000nm:style3,2032000nm,3500118nm,1199894nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Layer(1 "comp1")
+(
+	Line[5080000nm 5080000nm 8890000nm 5080000nm 127000nm 1016000nm "clearline"]
+	Line[5080000nm 5080000nm 8890000nm 5080000nm 381000nm 1016000nm ""]
+	Polygon("clearpoly")
+	(
+		[3810000nm 3810000nm] [7620000nm 3810000nm] [7620000nm 8255000nm] [3810000nm 8255000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/line_zerolen.pcb
===================================================================
--- tags/2.0.1/tests/RTT/line_zerolen.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/line_zerolen.pcb	(revision 18980)
@@ -0,0 +1,44 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["A single zero length line" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[50.0mil 0.0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Line[200mil 200mil 200mil 200mil 381000nm 1016000nm ""]
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/netlist.pcb
===================================================================
--- tags/2.0.1/tests/RTT/netlist.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/netlist.pcb	(revision 18980)
@@ -0,0 +1,74 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["board with minimal netlist" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 3810000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "dip(4)" "U1" "4*300" 2540000nm 4445000nm 0 -2540000nm 0 100 ""]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "4" "edge2"]
+	Pin[0 2540000nm 2032000nm 1270000nm 2184400nm 999998nm "" "2" "edge2"]
+	Pin[7620000nm 2540000nm 2032000nm 1270000nm 2184400nm 999998nm "" "3" "edge2"]
+	ElementLine [-1270000nm -1270000nm -1270000nm 3810000nm 254000nm]
+	ElementLine [8890000nm 3810000nm -1270000nm 3810000nm 254000nm]
+	ElementLine [8890000nm 3810000nm 8890000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 2540000nm -1270000nm 254000nm]
+	ElementLine [5080000nm -1270000nm 8890000nm -1270000nm 254000nm]
+	ElementArc [3810000nm -1270000nm 1270000nm 1270000nm 0 180 254000nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
+
+NetList()
+(
+	Net("foo" "(unknown)")
+	(
+		Connect("U1-1")
+		Connect("U1-3")
+	)
+	Net("bar" "(unknown)")
+	(
+		Connect("U1-2")
+		Connect("U1-4")
+	)
+)
Index: tags/2.0.1/tests/RTT/netlist_ba.pcb
===================================================================
--- tags/2.0.1/tests/RTT/netlist_ba.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/netlist_ba.pcb	(revision 18980)
@@ -0,0 +1,81 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["board with minimal netlist and some back-annotation changes" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 3810000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Element["" "dip(4)" "U1" "4*300" 2540000nm 4445000nm 0 -2540000nm 0 100 ""]
+(
+	Pin[0 0 2032000nm 1270000nm 2184400nm 999998nm "" "1" "square,edge2"]
+	Pin[7620000nm 0 2032000nm 1270000nm 2184400nm 999998nm "" "4" "edge2"]
+	Pin[0 2540000nm 2032000nm 1270000nm 2184400nm 999998nm "" "2" "edge2"]
+	Pin[7620000nm 2540000nm 2032000nm 1270000nm 2184400nm 999998nm "" "3" "edge2"]
+	ElementLine [-1270000nm -1270000nm -1270000nm 3810000nm 254000nm]
+	ElementLine [8890000nm 3810000nm -1270000nm 3810000nm 254000nm]
+	ElementLine [8890000nm 3810000nm 8890000nm -1270000nm 254000nm]
+	ElementLine [-1270000nm -1270000nm 2540000nm -1270000nm 254000nm]
+	ElementLine [5080000nm -1270000nm 8890000nm -1270000nm 254000nm]
+	ElementArc [3810000nm -1270000nm 1270000nm 1270000nm 0 180 254000nm]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
+
+NetList()
+(
+	Net("foo" "(unknown)")
+	(
+		Connect("U1-1")
+		Connect("U1-3")
+	)
+	Net("bar" "(unknown)")
+	(
+		Connect("U1-2")
+		Connect("U1-4")
+	)
+)
+
+NetListPatch()
+(
+	del_conn("U1-1" "foo")
+	add_conn("U1-1" "bar")
+	change_attrib("bar" "impedance" "50 ohm")
+)
Index: tags/2.0.1/tests/RTT/padrot.pcb
===================================================================
--- tags/2.0.1/tests/RTT/padrot.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/padrot.pcb	(revision 18980)
@@ -0,0 +1,127 @@
+# release: pcb-rnd 1.2.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Rotated round cap and square pads" 50000 50000]
+
+Grid[500 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:5:6:7:2,4,s")
+Styles["style1,1000,7874,3150,2000:style2,2000,8661,3937,2000:style3,8000,13780,4724,2500:style4,10000,6400,3150,10000"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::loader" "geda/pcb - mainline (centimils)")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::conf::editor/grid" "5.00 mil")
+
+Element["" "" "R1" "" 5000 5000 -3500 -3500 0 55 ""]
+(
+	Pad[0 0 7500 0 1000 4000 5000 "" "1" ""]
+	ElementLine [-2500 2500 10000 2500 500]
+	ElementLine [10000 2500 10000 -2500 500]
+	ElementLine [10000 -2500 -2500 -2500 500]
+	ElementLine [-2500 2500 -2500 -2500 500]
+
+	)
+
+Element["" "" "R3" "" 5000 20000 3000 3250 1 65 ""]
+(
+	Pad[0 -7500 0 0 1000 4000 5000 "" "1" ""]
+	ElementLine [2500 -10000 2500 2500 500]
+	ElementLine [-2500 -10000 2500 -10000 500]
+	ElementLine [-2500 -10000 -2500 2500 500]
+	ElementLine [-2500 2500 2500 2500 500]
+
+	)
+
+Element["" "" "R2" "" 20000 5000 11250 -2500 0 100 ""]
+(
+	Pad[0 0 7500 0 1000 4000 5000 "" "1" "square"]
+	ElementLine [-2500 2500 10000 2500 500]
+	ElementLine [10000 -2500 10000 2500 500]
+	ElementLine [-2500 -2500 10000 -2500 500]
+	ElementLine [-2500 -2500 -2500 2500 500]
+
+	)
+
+Element["" "" "R6" "" 5000 27500 2000 11500 3 100 ""]
+(
+	Pad[0 0 0 7500 1000 4000 5000 "" "1" "square"]
+	ElementLine [-2500 -2500 -2500 10000 500]
+	ElementLine [-2500 10000 2500 10000 500]
+	ElementLine [2500 -2500 2500 10000 500]
+	ElementLine [-2500 -2500 2500 -2500 500]
+
+	)
+
+Element["" "" "R4" "" 12500 15000 1500 -500 1 60 ""]
+(
+	Pad[0 0 5303 5303 1000 4000 5000 "" "1" ""]
+	ElementLine [-3536 0 5303 8839 500]
+	ElementLine [5303 8839 8839 5303 500]
+	ElementLine [0 -3536 8839 5303 500]
+	ElementLine [-3536 0 0 -3536 500]
+
+	)
+
+Element["" "" "R5" "" 22500 15000 13000 -1500 3 100 ""]
+(
+	Pad[0 0 5303 5303 1000 4000 5000 "" "1" "square"]
+	ElementLine [-3536 0 5303 8839 500]
+	ElementLine [5303 8839 8839 5303 500]
+	ElementLine [0 -3536 8839 5303 500]
+	ElementLine [-3536 0 0 -3536 500]
+
+	)
+
+Element["" "" "R7" "" 12500 30000 7000 6500 3 100 ""]
+(
+	Pad[0 0 6943 2836 1000 4000 5000 "" "1" ""]
+	ElementLine [-3260 1369 8312 6096 500]
+	ElementLine [8312 6096 10203 1467 500]
+	ElementLine [-1369 -3260 10203 1467 500]
+	ElementLine [-3260 1369 -1369 -3260 500]
+
+	)
+
+Element["" "" "R8" "" 27500 30000 6000 7500 3 100 ""]
+(
+	Pad[0 0 6943 2836 1000 4000 5000 "" "1" "square"]
+	ElementLine [-3260 1369 8312 6096 500]
+	ElementLine [8312 6096 10203 1467 500]
+	ElementLine [-1369 -3260 10203 1467 500]
+	ElementLine [-3260 1369 -1369 -3260 500]
+
+	)
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/padstack.lht
===================================================================
--- tags/2.0.1/tests/RTT/padstack.lht	(nonexistent)
+++ tags/2.0.1/tests/RTT/padstack.lht	(revision 18980)
@@ -0,0 +1,552 @@
+ha:pcb-rnd-board-v4 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:style1 {
+    diameter = 1.999995mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:style2 {
+    diameter = 2.199894mm
+    thickness = 20.0mil
+    hole = 0.999997mm
+    clearance = 20.0mil
+   }
+   ha:style3 {
+    diameter = 3.500119mm
+    thickness = 80.0mil
+    hole = 1.199895mm
+    clearance = 25.0mil
+   }
+   ha:style4 {
+    diameter = 64.0mil
+    thickness = 100.0mil
+    hole = 31.5mil
+    clearance = 100.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 500.0mil
+    y = 500.0mil
+    isle_area_nm2 = 199999999.999200
+   }
+   ha:cursor {
+    zoom = 0.000000
+    x = 0.0
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+   li:padstack_prototypes {
+     ha:ps_proto_v4.0 {
+      htop = 0
+      li:shape {
+       ha:ps_shape_v4 {
+        clearance = 40.0mil
+        ha:ps_line {
+         y2 = 0.0
+         thickness = 10.0mil
+         x1 = 75.0mil
+         x2 = -1270.0um
+         square = 0
+         y1 = 0.0
+        }
+        ha:layer_mask {
+         bottom = 1
+         copper = 1
+        }
+        ha:combining {
+        }
+       }
+       ha:ps_shape_v4 {
+        clearance = 40.0mil
+        ha:ps_line {
+         y2 = -1905.0um
+         thickness = 20.0mil
+         x1 = 0.0
+         x2 = 0.0
+         square = 0
+         y1 = 50.0mil
+        }
+        ha:layer_mask {
+         top = 1
+         paste = 1
+        }
+        ha:combining {
+ auto=1;        }
+       }
+       ha:ps_shape_v4 {
+        clearance = 40.0mil
+        li:ps_poly {
+         -1270.0um  
+         -1270.0um  
+         -1270.0um  
+         50.0mil  
+         50.0mil  
+         25.0mil  
+         50.0mil  
+         -1270.0um  
+        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        ha:combining {
+        }
+       }
+       ha:ps_shape_v4 {
+        clearance = 0.0
+        ha:ps_circ {
+         x = 0.0
+         y = 0.0
+         dia = 1.999996mm
+        }
+        ha:layer_mask {
+         copper = 1
+         intern = 1
+        }
+        ha:combining {
+        }
+       }
+      }
+      hdia = 31.5mil
+      hbottom = 0
+      hplated = 1
+     }
+      ha:ps_proto_v4.1 {
+       htop = 0
+       li:shape {
+        ha:ps_shape_v4 {
+         clearance = 0.0
+         ha:ps_circ {
+          x = 0.0
+          y = 0.0
+          dia = 2.199894mm
+         }
+         ha:layer_mask {
+          copper = 1
+          top = 1
+         }
+         ha:combining {
+         }
+        }
+        ha:ps_shape_v4 {
+         clearance = 0.0
+         ha:ps_circ {
+          x = 0.0
+          y = 0.0
+          dia = 2.199894mm
+         }
+         ha:layer_mask {
+          bottom = 1
+          copper = 1
+         }
+         ha:combining {
+         }
+        }
+        ha:ps_shape_v4 {
+         clearance = 0.0
+         ha:ps_circ {
+          x = 0.0
+          y = 0.0
+          dia = 2.199894mm
+         }
+         ha:layer_mask {
+          copper = 1
+          intern = 1
+         }
+         ha:combining {
+         }
+        }
+       }
+       hdia = 0.999998mm
+       hbottom = 0
+       hplated = 1
+      }
+       ha:ps_proto_v4.2 {
+        htop = 0
+        li:shape {
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.326894mm
+          }
+          ha:layer_mask {
+           copper = 1
+           top = 1
+          }
+          ha:combining {
+          }
+         }
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.326894mm
+          }
+          ha:layer_mask {
+           copper = 1
+           intern = 1
+          }
+          ha:combining {
+          }
+         }
+        }
+        hdia = 0.999998mm
+        hbottom = -1
+        hplated = 1
+       }
+       ha:ps_proto_v4.3 {
+        htop = 2
+        li:shape {
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.453894mm
+          }
+          ha:layer_mask {
+           bottom = 1
+           copper = 1
+          }
+          ha:combining {
+          }
+         }
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.453894mm
+          }
+          ha:layer_mask {
+           copper = 1
+           intern = 1
+          }
+          ha:combining {
+          }
+         }
+        }
+        hdia = 0.999998mm
+        hbottom = 0
+        hplated = 1
+       }
+       ha:ps_proto_v4.4 {
+        htop = 0
+        li:shape {
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.580894mm
+          }
+          ha:layer_mask {
+           copper = 1
+           top = 1
+          }
+          ha:combining {
+          }
+         }
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.580894mm
+          }
+          ha:layer_mask {
+           bottom = 1
+           copper = 1
+          }
+          ha:combining {
+          }
+         }
+         ha:ps_shape_v4 {
+          clearance = 0.0
+          ha:ps_circ {
+           x = 0.0
+           y = 0.0
+           dia = 2.580894mm
+          }
+          ha:layer_mask {
+           copper = 1
+           intern = 1
+          }
+          ha:combining {
+          }
+         }
+        }
+        hdia = 0.999998mm
+        hbottom = 0
+        hplated = 1
+       }
+   }
+
+   li:objects {
+     ha:padstack_ref.60 {
+      proto = 0
+      xmirror = 0
+      x = 75.0mil
+      rot = 0.000000
+      y = 100.0mil
+      li:thermal {
+      }
+ ha:flags ={ clearline=1
+ };      clearance = 20.0mil
+     }
+      ha:padstack_ref.62 {
+       proto = 1
+       xmirror = 0
+       x = 375.0mil
+       rot = 0.000000
+       y = 100.0mil
+       li:thermal {
+       }
+ ha:flags ={ clearline=1
+ };       clearance = 20.0mil
+      }
+      ha:padstack_ref.63 {
+       proto = 2
+       xmirror = 0
+       x = 75.0mil
+       rot = 0.000000
+       y = 325.0mil
+       li:thermal {
+       }
+ ha:flags ={ clearline=1
+ };       clearance = 20.0mil
+      }
+      ha:padstack_ref.64 {
+       proto = 3
+       xmirror = 0
+       x = 225.0mil
+       rot = 0.000000
+       y = 325.0mil
+       li:thermal {
+       }
+ ha:flags ={ clearline=1
+ };       clearance = 20.0mil
+      }
+   }
+   li:layers {
+
+    ha:comp1 {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:solder1 {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:com2 {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:solder2 {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:inner1 {
+     lid=4
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:inner2 {
+     lid=5
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+     ha:topmask {
+      lid=9
+      group=2
+      ha:combining { sub=1; auto=1;      }
+      visible=0
+
+       li:objects {
+       }
+     }
+
+     ha:toppaste {
+      lid=10
+      group=0
+      ha:combining { auto=1;      }
+      visible=0
+
+       li:objects {
+        ha:line.42 {
+         x1=100.0mil; y1=150.0mil; x2=100.0mil; y2=25.0mil; thickness=20.0mil; clearance=40.0mil;
+         ha:flags {
+          clearline=1
+         }
+        }
+       }
+     }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers {     10;}
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers {     9;}
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_4
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:6 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_6
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:8 {
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+     name = grp_8
+   }
+   ha:9 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers {    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers {    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/tests/RTT/poly_hole.pcb
===================================================================
--- tags/2.0.1/tests/RTT/poly_hole.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/poly_hole.pcb	(revision 18980)
@@ -0,0 +1,385 @@
+# release: pcb-rnd 1.2.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20100606]
+
+PCB["Polygons with holes" 50000 50000]
+
+Grid[2500 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,alldirection,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,1000,7874,3150,2000:style2,2000,8661,3937,2000:style3,8000,13780,4724,2500:style4,10000,6400,3150,10000"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 800 800 0 800]
+	SymbolLine[800 0 800 4000 800]
+	SymbolLine[0 4000 1500 4000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[0 4000 2500 1500 800]
+	SymbolLine[0 4000 2500 4000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 1800 1500 1800 800]
+	SymbolLine[2000 500 2000 1300 800]
+	SymbolLine[2000 2300 2000 3500 800]
+	SymbolLine[2000 2300 1500 1800 800]
+	SymbolLine[2000 1300 1500 1800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 2500 2000 0 800]
+	SymbolLine[0 2500 2500 2500 800]
+	SymbolLine[2000 0 2000 4000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[0 0 0 2000 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[2000 2000 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[1500 1800 2000 2300 800]
+	SymbolLine[0 1800 1500 1800 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[2000 2300 2000 3500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 4000 2500 0 800]
+	SymbolLine[0 0 2500 0 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 2700 0 3500 800]
+	SymbolLine[0 2700 700 2000 800]
+	SymbolLine[700 2000 1300 2000 800]
+	SymbolLine[1300 2000 2000 2700 800]
+	SymbolLine[2000 2700 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 1300 700 2000 800]
+	SymbolLine[0 500 0 1300 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 1300 800]
+	SymbolLine[1300 2000 2000 1300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 4000 2000 2000 800]
+	SymbolLine[2000 500 2000 2000 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 1500 800]
+	SymbolLine[0 1500 500 2000 800]
+	SymbolLine[500 2000 2000 2000 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 1000 700 0 800]
+	SymbolLine[700 0 1800 0 800]
+	SymbolLine[1800 0 2500 1000 800]
+	SymbolLine[2500 1000 2500 4000 800]
+	SymbolLine[0 2000 2500 2000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[2500 2300 2500 3500 800]
+	SymbolLine[2000 1800 2500 2300 800]
+	SymbolLine[500 1800 2000 1800 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1300 800]
+	SymbolLine[2000 1800 2500 1300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 4000 2000 4000 800]
+	SymbolLine[0 3300 700 4000 800]
+	SymbolLine[0 700 0 3300 800]
+	SymbolLine[0 700 700 0 800]
+	SymbolLine[700 0 2000 0 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[1800 0 2500 700 800]
+	SymbolLine[2500 700 2500 3300 800]
+	SymbolLine[1800 4000 2500 3300 800]
+	SymbolLine[0 4000 1800 4000 800]
+	SymbolLine[0 0 1800 0 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 1800 1500 1800 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2000 0 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[0 1800 1500 1800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[2500 2500 2500 3500 800]
+	SymbolLine[2000 2000 2500 2500 800]
+	SymbolLine[1000 2000 2000 2000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[2500 0 2500 4000 800]
+	SymbolLine[0 2000 2500 2000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 0 1000 0 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 4000 1000 4000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 0 1500 0 800]
+	SymbolLine[1500 0 1500 3500 800]
+	SymbolLine[1000 4000 1500 3500 800]
+	SymbolLine[500 4000 1000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 0 3000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 2000 2000 0 800]
+	SymbolLine[0 2000 2000 4000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 4000 2000 4000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 1500 2000 800]
+	SymbolLine[1500 2000 3000 0 800]
+	SymbolLine[3000 0 3000 4000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 0 0 4000 800]
+	SymbolLine[0 0 2500 4000 800]
+	SymbolLine[2500 0 2500 4000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 3500 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[2000 2000 2500 1500 800]
+	SymbolLine[500 2000 2000 2000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 500 0 3500 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[500 0 1500 0 800]
+	SymbolLine[1500 0 2000 500 800]
+	SymbolLine[2000 500 2000 3000 800]
+	SymbolLine[1000 4000 2000 3000 800]
+	SymbolLine[500 4000 1000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[1000 2500 2000 4000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[2500 500 2500 1500 800]
+	SymbolLine[2000 2000 2500 1500 800]
+	SymbolLine[500 2000 2000 2000 800]
+	SymbolLine[500 0 500 4000 800]
+	SymbolLine[1300 2000 2500 4000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 0 2500 500 800]
+	SymbolLine[500 0 2000 0 800]
+	SymbolLine[0 500 500 0 800]
+	SymbolLine[0 500 0 1500 800]
+	SymbolLine[0 1500 500 2000 800]
+	SymbolLine[500 2000 2000 2000 800]
+	SymbolLine[2000 2000 2500 2500 800]
+	SymbolLine[2500 2500 2500 3500 800]
+	SymbolLine[2000 4000 2500 3500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 0 2000 0 800]
+	SymbolLine[1000 0 1000 4000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 0 0 3500 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[500 4000 1500 4000 800]
+	SymbolLine[1500 4000 2000 3500 800]
+	SymbolLine[2000 0 2000 3500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 0 1000 4000 800]
+	SymbolLine[1000 4000 2000 0 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 0 0 2000 800]
+	SymbolLine[0 2000 500 4000 800]
+	SymbolLine[500 4000 1500 2000 800]
+	SymbolLine[1500 2000 2500 4000 800]
+	SymbolLine[2500 4000 3000 2000 800]
+	SymbolLine[3000 2000 3000 0 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 4000 2500 0 800]
+	SymbolLine[0 0 2500 4000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 0 1000 2000 800]
+	SymbolLine[1000 2000 2000 0 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 0 2500 0 800]
+	SymbolLine[0 4000 2500 0 800]
+	SymbolLine[0 4000 2500 4000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Attribute("PCB::loader" "geda/pcb - mainline (centimils)")
+Layer(1 "comp1")
+(
+	Polygon("clearpoly")
+	(
+		[2500 2500] [12500 2500] [2500 12500] 
+		Hole (
+			[5000 5000] [5000 7500] [7500 5000] 
+		)
+	)
+	Polygon("clearpoly")
+	(
+		[2500 15000] [15000 2500] [15000 15000] 
+		Hole (
+			[7500 12500] [12500 12500] [12500 10000] [10000 10000] 
+		)
+	)
+	Polygon("clearpoly")
+	(
+		[17500 15000] [30000 2500] [42500 15000] 
+		Hole (
+			[27500 7500] [27500 12500] [32500 12500] [32500 7500] 
+		)
+	)
+	Polygon("clearpoly")
+	(
+		[2500 17500] [30000 20000] [5000 35000] 
+		Hole (
+			[15000 22500] [15000 25000] [17500 25000] [17500 22500] 
+		)
+		Hole (
+			[7500 22500] [7500 27500] [10000 30000] [12500 27500] [12500 25000] 
+			[10000 22500] 
+		)
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/poly_rect.pcb
===================================================================
--- tags/2.0.1/tests/RTT/poly_rect.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/poly_rect.pcb	(revision 18980)
@@ -0,0 +1,59 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Normal rectangular polygons" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[0.0 150.0mil 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Polygon("")
+	(
+		[1270000nm 635000nm] [1905000nm 635000nm] [1905000nm 11430000nm] [1270000nm 11430000nm] 
+	)
+	Polygon("")
+	(
+		[3175000nm 635000nm] [12065000nm 635000nm] [12065000nm 1270000nm] [3175000nm 1270000nm] 
+	)
+	Polygon("")
+	(
+		[10795000nm 10795000nm] [11430000nm 10795000nm] [11430000nm 11430000nm] [10795000nm 11430000nm] 
+	)
+	Polygon("")
+	(
+		[3175000nm 1905000nm] [10160000nm 1905000nm] [10160000nm 11430000nm] [3175000nm 11430000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/poly_triangle.pcb
===================================================================
--- tags/2.0.1/tests/RTT/poly_triangle.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/poly_triangle.pcb	(revision 18980)
@@ -0,0 +1,59 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Normal triangular polygons" 500.0mil 500.0mil]
+
+Grid[25.0mil 0.0 0.0 1]
+Cursor[25.0mil 0.0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[12.0mil 9.0mil 10.0mil 7.0mil 15.0mil 10.0mil]
+Flags("nameonpcb,alldirection,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,10.0mil,78.7399606mil,31.5mil,20.0mil:style2,20.0mil,86.61mil,39.3699606mil,20.0mil:style3,80.0mil,137.7999606mil,47.2399606mil,25.0mil:style4,100.0mil,64.0mil,31.5mil,100.0mil"]
+
+Layer(1 "comp1")
+(
+	Polygon("clearpoly")
+	(
+		[635000nm 635000nm] [635000nm 3175000nm] [3175000nm 635000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[635000nm 3810000nm] [3810000nm 635000nm] [3810000nm 3810000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[4445000nm 3810000nm] [7620000nm 635000nm] [10795000nm 3810000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[635000nm 4445000nm] [1270000nm 8890000nm] [7620000nm 5080000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/rat.pcb
===================================================================
--- tags/2.0.1/tests/RTT/rat.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/rat.pcb	(revision 18980)
@@ -0,0 +1,46 @@
+# release: pcb-rnd 1.1.0
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["a rat line" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Rat[10000000nm 10000000nm 1 20000000nm 20000000nm 1  ""]
+
+
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/ref/Proto.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: 
+# Title: (unknown) - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/Proto.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb notnamed
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "gEDA pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "comp1"
+      (type signal)
+    )
+    (layer "inner1"
+      (type signal)
+    )
+    (layer "inner2"
+      (type signal)
+    )
+    (layer "solder1"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/Proto.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.eps	(revision 18980)
@@ -0,0 +1,31 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: Proto.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/Proto.gbr/Proto.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.gbr/Proto.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.gbr/Proto.fab.gbr	(revision 18980)
@@ -0,0 +1,1692 @@
+G04 start of page 2 for group -1 layer_idx 16777221 *
+G04 Title: (unknown), <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For:  *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD13C,0.0100*%
+%ADD12C,0.0001*%
+%ADD11C,0.0060*%
+G54D11*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D12*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D11*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D12*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D11*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D12*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D11*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D12*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D11*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D12*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D11*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D12*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D13*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D11*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D12*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D11*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D12*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D11*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D12*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D11*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D12*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D11*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D12*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D11*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D12*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D11*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D12*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D11*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D12*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D11*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D12*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D11*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D12*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D11*X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D12*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G54D11*X293900D02*Y104000D01*
+Y110000D02*X296900D01*
+X293900Y107300D02*X296150D01*
+G54D12*G36*
+X298700Y110000D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X325700D02*Y104000D01*
+X330200D01*
+Y110000D01*
+X325700D01*
+G37*
+G36*
+X331100D02*Y104000D01*
+X335600D01*
+Y110000D01*
+X331100D01*
+G37*
+G36*
+X336500D02*Y104000D01*
+X341000D01*
+Y110000D01*
+X336500D01*
+G37*
+G36*
+X341900D02*Y104000D01*
+X346400D01*
+Y110000D01*
+X341900D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G54D11*X356150D02*Y104000D01*
+X358100Y110000D02*X359150Y108950D01*
+Y105050D01*
+X358100Y104000D02*X359150Y105050D01*
+X355400Y104000D02*X358100D01*
+X355400Y110000D02*X358100D01*
+G54D12*G36*
+X360950D02*Y104000D01*
+X365450D01*
+Y110000D01*
+X360950D01*
+G37*
+G36*
+X366350D02*Y104000D01*
+X370850D01*
+Y110000D01*
+X366350D01*
+G37*
+G36*
+X371750D02*Y104000D01*
+X376250D01*
+Y110000D01*
+X371750D01*
+G37*
+G36*
+X377150D02*Y104000D01*
+X381650D01*
+Y110000D01*
+X377150D01*
+G37*
+G36*
+X382550D02*Y104000D01*
+X387050D01*
+Y110000D01*
+X382550D01*
+G37*
+G36*
+X387950D02*Y104000D01*
+X392450D01*
+Y110000D01*
+X387950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/Proto.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/Proto.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Proto.pcb
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/Proto.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/Proto.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/Proto.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/Proto.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.png.text	(revision 18980)
@@ -0,0 +1,5 @@
+r6731
+
+587 x 589 pix (489.167 x 490.833) inside the outline box
+
+
Index: tags/2.0.1/tests/RTT/ref/Proto.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/Proto.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/Proto.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/Proto.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/Proto.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/Proto.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/Proto.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.svg	(revision 18980)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/Proto.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/Proto.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/Proto.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: 
+# Title: (unknown) - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_angles.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: arcs with different strange angles - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_angles.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb arcs with different strange angles
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/arc_angles.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.eps	(revision 18980)
@@ -0,0 +1,37 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: arc_angles.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0 750 -0.05000 0.05000 0.10000 0.10000 0.200000 a
+0 0 -0.05000 0.05000 0.30000 0.10000 0.200000 a
+-750 0 -0.05000 0.05000 0.40000 0.10000 0.200000 a
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/arc_angles.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.fab.gbr	(revision 18980)
@@ -0,0 +1,1837 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: arcs with different strange angles, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X396500D02*Y104000D01*
+X401000D01*
+Y110000D01*
+X396500D01*
+G37*
+G36*
+X401900D02*Y104000D01*
+X406400D01*
+Y110000D01*
+X401900D01*
+G37*
+G36*
+X410000D02*Y104000D01*
+X414500D01*
+Y110000D01*
+X410000D01*
+G37*
+G54D12*X418100D02*Y104000D01*
+Y110000D02*X421100D01*
+X418100Y107300D02*X420350D01*
+G54D13*G36*
+X422900Y110000D02*Y104000D01*
+X427400D01*
+Y110000D01*
+X422900D01*
+G37*
+G36*
+X428300D02*Y104000D01*
+X432800D01*
+Y110000D01*
+X428300D01*
+G37*
+G36*
+X433700D02*Y104000D01*
+X438200D01*
+Y110000D01*
+X433700D01*
+G37*
+G36*
+X439100D02*Y104000D01*
+X443600D01*
+Y110000D01*
+X439100D01*
+G37*
+G36*
+X444500D02*Y104000D01*
+X449000D01*
+Y110000D01*
+X444500D01*
+G37*
+G36*
+X449900D02*Y104000D01*
+X454400D01*
+Y110000D01*
+X449900D01*
+G37*
+G36*
+X455300D02*Y104000D01*
+X459800D01*
+Y110000D01*
+X455300D01*
+G37*
+G36*
+X460700D02*Y104000D01*
+X465200D01*
+Y110000D01*
+X460700D01*
+G37*
+G36*
+X466100D02*Y104000D01*
+X470600D01*
+Y110000D01*
+X466100D01*
+G37*
+G36*
+X471500D02*Y104000D01*
+X476000D01*
+Y110000D01*
+X471500D01*
+G37*
+G54D12*X480350D02*Y104000D01*
+X482300Y110000D02*X483350Y108950D01*
+Y105050D01*
+X482300Y104000D02*X483350Y105050D01*
+X479600Y104000D02*X482300D01*
+X479600Y110000D02*X482300D01*
+G54D13*G36*
+X485150D02*Y104000D01*
+X489650D01*
+Y110000D01*
+X485150D01*
+G37*
+G36*
+X490550D02*Y104000D01*
+X495050D01*
+Y110000D01*
+X490550D01*
+G37*
+G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G36*
+X501350D02*Y104000D01*
+X505850D01*
+Y110000D01*
+X501350D01*
+G37*
+G36*
+X506750D02*Y104000D01*
+X511250D01*
+Y110000D01*
+X506750D01*
+G37*
+G36*
+X512150D02*Y104000D01*
+X516650D01*
+Y110000D01*
+X512150D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.gbr/arc_angles.top.gbr	(revision 18980)
@@ -0,0 +1,18 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: arcs with different strange angles, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X5000Y40000D02*G75*G03X15000Y40000I5000J0D01*G01*
+G75*G03X5000Y40000I-5000J0D01*G01*
+X25000Y40000D03*
+X35000D02*G75*G02X45000Y40000I5000J0D01*G01*
+G75*G02X35000Y40000I-5000J0D01*G01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_angles.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/arc_angles.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   arcs with different strange angles
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/arc_angles.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_angles.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_angles.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_angles.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.png.text	(revision 18980)
@@ -0,0 +1,22 @@
+r6630
+
+right circle
+132 pixels (110 mil) horizontally
+132 pixels (110 mil) vertically
+13 pixels (10.833 mil) wall thickness
+
+left circle
+132 pixels (110 mil) horizontally
+132 pixels (100 mil) vertically
+13 pixels (10.833 mil) wall thickness
+
+central dot
+13 pixel (10.833 mil) diameter
+
+air gap between right circle and central dot
+107 pixels (89.166 mil)
+
+air gap between left circle and central dot
+108 pixels (90 mil)
+
+
Index: tags/2.0.1/tests/RTT/ref/arc_angles.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_angles.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_angles.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_angles.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_angles.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_angles.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_angles.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.svg	(revision 18980)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <path d="M 3.81000000 2.54000000 A 1.2700 1.2700 0 0 1 1.2700 2.5400" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 1.27000000 2.54000000 A 1.2700 1.2700 0 0 1 3.8100 2.5400" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 6.35000100 2.53997900 A 1.2700 1.2700 0 0 0 6.3500 2.5400" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 11.43000000 2.54000000 A 1.2700 1.2700 0 0 1 8.8900 2.5400" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 8.89000000 2.54000000 A 1.2700 1.2700 0 0 1 11.4300 2.5400" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/arc_angles.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_angles.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_angles.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: arcs with different strange angles - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arc with clearline flag - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Arc with clearline flag
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.eps	(revision 18980)
@@ -0,0 +1,222 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: arc_f_clear.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.29999 0.15000 moveto
+0.47500 0.15000 lineto
+0.47500 0.47500 lineto
+0.29999 0.47500 lineto
+0.29999 0.32505 lineto
+0.30000 0.32505 lineto
+0.30436 0.32486 lineto
+0.30869 0.32429 lineto
+0.31295 0.32334 lineto
+0.31712 0.32203 lineto
+0.32115 0.32036 lineto
+0.32502 0.31834 lineto
+0.32871 0.31600 lineto
+0.33217 0.31334 lineto
+0.33539 0.31039 lineto
+0.33834 0.30717 lineto
+0.34100 0.30371 lineto
+0.34334 0.30002 lineto
+0.34536 0.29615 lineto
+0.34703 0.29212 lineto
+0.34834 0.28795 lineto
+0.34929 0.28369 lineto
+0.34986 0.27936 lineto
+0.35005 0.27500 lineto
+0.34986 0.27064 lineto
+0.34929 0.26631 lineto
+0.34834 0.26205 lineto
+0.34703 0.25788 lineto
+0.34536 0.25385 lineto
+0.34334 0.24998 lineto
+0.34100 0.24629 lineto
+0.33834 0.24283 lineto
+0.33539 0.23961 lineto
+0.33217 0.23666 lineto
+0.32871 0.23400 lineto
+0.32502 0.23166 lineto
+0.32115 0.22964 lineto
+0.31712 0.22797 lineto
+0.31295 0.22666 lineto
+0.30869 0.22571 lineto
+0.30436 0.22514 lineto
+0.30000 0.22495 lineto
+0.29999 0.22495 lineto
+fill
+0.13759 0.15000 moveto
+0.29999 0.15000 lineto
+0.29999 0.22495 lineto
+0.29564 0.22514 lineto
+0.29131 0.22571 lineto
+0.28705 0.22666 lineto
+0.28288 0.22797 lineto
+0.27885 0.22964 lineto
+0.27667 0.23078 lineto
+0.27612 0.23101 lineto
+0.27548 0.23140 lineto
+0.27498 0.23166 lineto
+0.27500 0.23169 lineto
+0.27276 0.23306 lineto
+0.26977 0.23562 lineto
+0.26721 0.23861 lineto
+0.26516 0.24196 lineto
+0.26365 0.24560 lineto
+0.26273 0.24943 lineto
+0.26242 0.25335 lineto
+0.26243 0.25339 lineto
+0.26026 0.25471 lineto
+0.25727 0.25727 lineto
+0.25471 0.26026 lineto
+0.25266 0.26362 lineto
+0.25115 0.26725 lineto
+0.25023 0.27108 lineto
+0.24992 0.27500 lineto
+0.25005 0.27668 lineto
+0.25014 0.27936 lineto
+0.25071 0.28369 lineto
+0.25166 0.28795 lineto
+0.25297 0.29212 lineto
+0.25464 0.29615 lineto
+0.25666 0.30002 lineto
+0.25900 0.30371 lineto
+0.26166 0.30717 lineto
+0.26461 0.31039 lineto
+0.26783 0.31334 lineto
+0.27129 0.31600 lineto
+0.27498 0.31834 lineto
+0.27885 0.32036 lineto
+0.28288 0.32203 lineto
+0.28705 0.32334 lineto
+0.29131 0.32429 lineto
+0.29564 0.32486 lineto
+0.29999 0.32505 lineto
+0.29999 0.47500 lineto
+0.13759 0.47500 lineto
+0.13759 0.36151 lineto
+0.14865 0.36609 lineto
+0.16114 0.37003 lineto
+0.17393 0.37286 lineto
+0.18691 0.37457 lineto
+0.20000 0.37514 lineto
+0.20394 0.37486 lineto
+0.20778 0.37394 lineto
+0.21143 0.37243 lineto
+0.21480 0.37037 lineto
+0.21780 0.36780 lineto
+0.22037 0.36480 lineto
+0.22243 0.36143 lineto
+0.22394 0.35778 lineto
+0.22486 0.35394 lineto
+0.22517 0.35000 lineto
+0.22486 0.34606 lineto
+0.22394 0.34222 lineto
+0.22243 0.33857 lineto
+0.22037 0.33520 lineto
+0.21780 0.33220 lineto
+0.21480 0.32963 lineto
+0.21143 0.32757 lineto
+0.20778 0.32606 lineto
+0.20394 0.32514 lineto
+0.20000 0.32490 lineto
+0.19128 0.32462 lineto
+0.18264 0.32348 lineto
+0.17412 0.32159 lineto
+0.16580 0.31897 lineto
+0.15774 0.31563 lineto
+0.15000 0.31160 lineto
+0.14264 0.30692 lineto
+0.13759 0.30304 lineto
+fill
+0.02500 0.15000 moveto
+0.13759 0.15000 lineto
+0.13759 0.30304 lineto
+0.13572 0.30160 lineto
+0.12929 0.29571 lineto
+0.12340 0.28928 lineto
+0.11808 0.28236 lineto
+0.11340 0.27500 lineto
+0.10937 0.26726 lineto
+0.10603 0.25920 lineto
+0.10341 0.25088 lineto
+0.10152 0.24236 lineto
+0.10038 0.23372 lineto
+0.10000 0.22500 lineto
+0.09977 0.22108 lineto
+0.09885 0.21725 lineto
+0.09734 0.21362 lineto
+0.09529 0.21026 lineto
+0.09273 0.20727 lineto
+0.08974 0.20471 lineto
+0.08638 0.20266 lineto
+0.08275 0.20115 lineto
+0.07892 0.20023 lineto
+0.07500 0.19992 lineto
+0.07108 0.20023 lineto
+0.06725 0.20115 lineto
+0.06362 0.20266 lineto
+0.06026 0.20471 lineto
+0.05727 0.20727 lineto
+0.05471 0.21026 lineto
+0.05266 0.21362 lineto
+0.05115 0.21725 lineto
+0.05023 0.22108 lineto
+0.05000 0.22500 lineto
+0.05043 0.23809 lineto
+0.05214 0.25107 lineto
+0.05497 0.26386 lineto
+0.05891 0.27635 lineto
+0.06392 0.28845 lineto
+0.06997 0.30007 lineto
+0.07701 0.31112 lineto
+0.08498 0.32151 lineto
+0.09383 0.33117 lineto
+0.10349 0.34002 lineto
+0.11388 0.34799 lineto
+0.12493 0.35503 lineto
+0.13655 0.36108 lineto
+0.13759 0.36151 lineto
+0.13759 0.47500 lineto
+0.02500 0.47500 lineto
+fill
+0.01000 setlinewidth
+1 setlinecap
+0 90 -0.12500 0.12500 0.20000 0.22500 0.080000 a
+0.02000 setlinewidth
+-90 -10 -0.10000 0.10000 0.17500 0.22500 0.200000 a
+0.01000 setlinewidth
+0 300 -0.02500 0.02500 0.30000 0.27500 0.400000 a
+0.03000 setlinewidth
+-160 -70 -0.12500 0.12500 0.25000 0.22500 0.240000 a
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.fcd	(revision 18980)
@@ -0,0 +1,2 @@
+[FIDOCAD]
+PP 5 30 95 30 95 95 5 95 5 30 2
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.fab.gbr	(revision 18980)
@@ -0,0 +1,1777 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Arc with clearline flag, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD17C,0.0100*%
+%ADD16C,0.0001*%
+%ADD15C,0.0060*%
+G54D15*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D16*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D15*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D16*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D15*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D16*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D15*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D16*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D15*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D16*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D15*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D16*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D17*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D15*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D16*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D15*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D16*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D15*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D16*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D15*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D16*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D15*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D16*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D15*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D16*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D15*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D16*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D15*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D16*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D15*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D16*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D15*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D16*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D15*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D16*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D15*X234500Y108500D02*Y104000D01*
+Y108500D02*X235550Y110000D01*
+X237200D01*
+X238250Y108500D01*
+Y104000D01*
+X234500Y107000D02*X238250D01*
+G54D16*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X253550D02*Y104000D01*
+X258050D01*
+Y110000D01*
+X253550D01*
+G37*
+G36*
+X258950D02*Y104000D01*
+X263450D01*
+Y110000D01*
+X258950D01*
+G37*
+G36*
+X264350D02*Y104000D01*
+X268850D01*
+Y110000D01*
+X264350D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X277850D02*Y104000D01*
+X282350D01*
+Y110000D01*
+X277850D01*
+G37*
+G36*
+X283250D02*Y104000D01*
+X287750D01*
+Y110000D01*
+X283250D01*
+G37*
+G36*
+X288650D02*Y104000D01*
+X293150D01*
+Y110000D01*
+X288650D01*
+G37*
+G36*
+X294050D02*Y104000D01*
+X298550D01*
+Y110000D01*
+X294050D01*
+G37*
+G36*
+X299450D02*Y104000D01*
+X303950D01*
+Y110000D01*
+X299450D01*
+G37*
+G36*
+X304850D02*Y104000D01*
+X309350D01*
+Y110000D01*
+X304850D01*
+G37*
+G36*
+X310250D02*Y104000D01*
+X314750D01*
+Y110000D01*
+X310250D01*
+G37*
+G36*
+X315650D02*Y104000D01*
+X320150D01*
+Y110000D01*
+X315650D01*
+G37*
+G36*
+X321050D02*Y104000D01*
+X325550D01*
+Y110000D01*
+X321050D01*
+G37*
+G36*
+X329150D02*Y104000D01*
+X333650D01*
+Y110000D01*
+X329150D01*
+G37*
+G36*
+X334550D02*Y104000D01*
+X339050D01*
+Y110000D01*
+X334550D01*
+G37*
+G36*
+X339950D02*Y104000D01*
+X344450D01*
+Y110000D01*
+X339950D01*
+G37*
+G36*
+X345350D02*Y104000D01*
+X349850D01*
+Y110000D01*
+X345350D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G54D15*X361550D02*Y104000D01*
+Y110000D02*X364550D01*
+X361550Y107300D02*X363800D01*
+G54D16*G36*
+X366350Y110000D02*Y104000D01*
+X370850D01*
+Y110000D01*
+X366350D01*
+G37*
+G36*
+X371750D02*Y104000D01*
+X376250D01*
+Y110000D01*
+X371750D01*
+G37*
+G36*
+X377150D02*Y104000D01*
+X381650D01*
+Y110000D01*
+X377150D01*
+G37*
+G36*
+X382550D02*Y104000D01*
+X387050D01*
+Y110000D01*
+X382550D01*
+G37*
+G36*
+X387950D02*Y104000D01*
+X392450D01*
+Y110000D01*
+X387950D01*
+G37*
+G36*
+X393350D02*Y104000D01*
+X397850D01*
+Y110000D01*
+X393350D01*
+G37*
+G36*
+X398750D02*Y104000D01*
+X403250D01*
+Y110000D01*
+X398750D01*
+G37*
+G36*
+X404150D02*Y104000D01*
+X408650D01*
+Y110000D01*
+X404150D01*
+G37*
+G36*
+X409550D02*Y104000D01*
+X414050D01*
+Y110000D01*
+X409550D01*
+G37*
+G36*
+X414950D02*Y104000D01*
+X419450D01*
+Y110000D01*
+X414950D01*
+G37*
+G54D15*X423800D02*Y104000D01*
+X425750Y110000D02*X426800Y108950D01*
+Y105050D01*
+X425750Y104000D02*X426800Y105050D01*
+X423050Y104000D02*X425750D01*
+X423050Y110000D02*X425750D01*
+G54D16*G36*
+X428600D02*Y104000D01*
+X433100D01*
+Y110000D01*
+X428600D01*
+G37*
+G36*
+X434000D02*Y104000D01*
+X438500D01*
+Y110000D01*
+X434000D01*
+G37*
+G36*
+X439400D02*Y104000D01*
+X443900D01*
+Y110000D01*
+X439400D01*
+G37*
+G36*
+X444800D02*Y104000D01*
+X449300D01*
+Y110000D01*
+X444800D01*
+G37*
+G36*
+X450200D02*Y104000D01*
+X454700D01*
+Y110000D01*
+X450200D01*
+G37*
+G36*
+X455600D02*Y104000D01*
+X460100D01*
+Y110000D01*
+X455600D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.gbr/arc_f_clear.top.gbr	(revision 18980)
@@ -0,0 +1,203 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Arc with clearline flag, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD14C,0.0300*%
+%ADD13C,0.0200*%
+%ADD12C,0.0100*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X29999Y35000D02*X47500D01*
+Y2500D01*
+X29999D01*
+Y17495D01*
+X30000Y17495D01*
+X30436Y17514D01*
+X30869Y17571D01*
+X31295Y17666D01*
+X31712Y17797D01*
+X32115Y17964D01*
+X32502Y18166D01*
+X32871Y18400D01*
+X33217Y18666D01*
+X33539Y18961D01*
+X33834Y19283D01*
+X34100Y19629D01*
+X34334Y19998D01*
+X34536Y20385D01*
+X34703Y20788D01*
+X34834Y21205D01*
+X34929Y21631D01*
+X34986Y22064D01*
+X35005Y22500D01*
+X34986Y22936D01*
+X34929Y23369D01*
+X34834Y23795D01*
+X34703Y24212D01*
+X34536Y24615D01*
+X34334Y25002D01*
+X34100Y25371D01*
+X33834Y25717D01*
+X33539Y26039D01*
+X33217Y26334D01*
+X32871Y26600D01*
+X32502Y26834D01*
+X32115Y27036D01*
+X31712Y27203D01*
+X31295Y27334D01*
+X30869Y27429D01*
+X30436Y27486D01*
+X30000Y27505D01*
+X29999Y27505D01*
+Y35000D01*
+G37*
+G36*
+X13759D02*X29999D01*
+Y27505D01*
+X29564Y27486D01*
+X29131Y27429D01*
+X28705Y27334D01*
+X28288Y27203D01*
+X27885Y27036D01*
+X27667Y26922D01*
+X27612Y26899D01*
+X27548Y26860D01*
+X27498Y26834D01*
+X27500Y26831D01*
+X27276Y26694D01*
+X26977Y26438D01*
+X26721Y26139D01*
+X26516Y25804D01*
+X26365Y25440D01*
+X26273Y25057D01*
+X26242Y24665D01*
+X26243Y24661D01*
+X26026Y24529D01*
+X25727Y24273D01*
+X25471Y23974D01*
+X25266Y23638D01*
+X25115Y23275D01*
+X25023Y22892D01*
+X24992Y22500D01*
+X25005Y22332D01*
+X25014Y22064D01*
+X25071Y21631D01*
+X25166Y21205D01*
+X25297Y20788D01*
+X25464Y20385D01*
+X25666Y19998D01*
+X25900Y19629D01*
+X26166Y19283D01*
+X26461Y18961D01*
+X26783Y18666D01*
+X27129Y18400D01*
+X27498Y18166D01*
+X27885Y17964D01*
+X28288Y17797D01*
+X28705Y17666D01*
+X29131Y17571D01*
+X29564Y17514D01*
+X29999Y17495D01*
+Y2500D01*
+X13759D01*
+Y13849D01*
+X14865Y13391D01*
+X16114Y12997D01*
+X17393Y12714D01*
+X18691Y12543D01*
+X20000Y12486D01*
+X20394Y12514D01*
+X20778Y12606D01*
+X21143Y12757D01*
+X21480Y12963D01*
+X21780Y13220D01*
+X22037Y13520D01*
+X22243Y13857D01*
+X22394Y14222D01*
+X22486Y14606D01*
+X22517Y15000D01*
+X22486Y15394D01*
+X22394Y15778D01*
+X22243Y16143D01*
+X22037Y16480D01*
+X21780Y16780D01*
+X21480Y17037D01*
+X21143Y17243D01*
+X20778Y17394D01*
+X20394Y17486D01*
+X20000Y17510D01*
+X19128Y17538D01*
+X18264Y17652D01*
+X17412Y17841D01*
+X16580Y18103D01*
+X15774Y18437D01*
+X15000Y18840D01*
+X14264Y19308D01*
+X13759Y19696D01*
+Y35000D01*
+G37*
+G36*
+X2500D02*X13759D01*
+Y19696D01*
+X13572Y19840D01*
+X12929Y20429D01*
+X12340Y21072D01*
+X11808Y21764D01*
+X11340Y22500D01*
+X10937Y23274D01*
+X10603Y24080D01*
+X10341Y24912D01*
+X10152Y25764D01*
+X10038Y26628D01*
+X10000Y27500D01*
+X9977Y27892D01*
+X9885Y28275D01*
+X9734Y28638D01*
+X9529Y28974D01*
+X9273Y29273D01*
+X8974Y29529D01*
+X8638Y29734D01*
+X8275Y29885D01*
+X7892Y29977D01*
+X7500Y30008D01*
+X7108Y29977D01*
+X6725Y29885D01*
+X6362Y29734D01*
+X6026Y29529D01*
+X5727Y29273D01*
+X5471Y28974D01*
+X5266Y28638D01*
+X5115Y28275D01*
+X5023Y27892D01*
+X5000Y27500D01*
+X5043Y26191D01*
+X5214Y24893D01*
+X5497Y23614D01*
+X5891Y22365D01*
+X6392Y21155D01*
+X6997Y19993D01*
+X7701Y18888D01*
+X8498Y17849D01*
+X9383Y16883D01*
+X10349Y15998D01*
+X11388Y15201D01*
+X12493Y14497D01*
+X13655Y13892D01*
+X13759Y13849D01*
+Y2500D01*
+X2500D01*
+Y35000D01*
+G37*
+G54D12*X7500Y27500D02*G75*G03X20000Y15000I12500J0D01*G01*
+G54D13*X7652Y29236D02*G75*G02X17500Y37500I9848J-1736D01*G01*
+G54D12*X27500Y22500D02*G75*G03X32500Y22500I2500J0D01*G01*
+G75*G03X28750Y24665I-2500J0D01*G01*
+G54D14*X20725Y39246D02*G75*G02X36746Y31775I4275J-11746D01*G01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Arc with clearline flag
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_f_clear.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.png.text	(revision 18980)
@@ -0,0 +1,25 @@
+r6630
+
+polygone
+width 541 pixels (450.833 mil)
+height 391 pixels (324.833 mil)
+----
+small near circle completely in polygon
+width 13 pixels (10.833 mils)
+clearance on the left 23 pixels (19.166 mil)
+clearance on the right 24 pixels (20 mil)
+clearance on the top 24 pixels (20 mil)
+clearance on the bottom 24 pixels (20 mil)
+
+longer arc completely in polygon
+line width 13 pixels(10.833 mil)
+width 162 pixels (135 mil)
+height 162 pixels (135 mil)
+clearance on the bottom right end 24 pixels (20 mil)
+clearance on the top right end 23 pixels (19.166 mil)
+clearance on the end right end 24 pixels (20 mil)
+clearance on the right top end 23 pixels (19.333 mil)
+clearance on the left top end 23 pixels (19.166 mil)
+
+
+
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_f_clear.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_f_clear.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.svg	(revision 18980)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="7.6196,3.8100 12.0650,3.8100 12.0650,12.0650 7.6196,12.0650 7.6196,8.2562 7.6200,8.2562 7.7308,8.2514 7.8407,8.2369 7.9490,8.2129 8.0548,8.1795 8.1572,8.1371 8.2556,8.0859 8.3491,8.0263 8.4371,7.9588 8.5189,7.8839 8.5938,7.8021 8.6613,7.7141 8.7209,7.6206 8.7721,7.5222 8.8145,7.4198 8.8479,7.3140 8.8719,7.2057 8.8864,7.0958 8.8912,6.9850 8.8864,6.8742 8.8719,6.7643 8.8479,6.6560 8.8145,6.5502 8.7721,6.4478 8.7209,6.3494 8.6613,6.2559 8.5938,6.1679 8.5189,6.0861 8.4371,6.0112 8.3491,5.9437 8.2556,5.8841 8.1572,5.8329 8.0548,5.7905 7.9490,5.7571 7.8407,5.7331 7.7308,5.7186 7.6200,5.7138 7.6196,5.7138 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="3.4947,3.8100 7.6196,3.8100 7.6196,5.7138 7.5092,5.7186 7.3993,5.7331 7.2910,5.7571 7.1852,5.7905 7.0828,5.8329 7.0274,5.8617 7.0133,5.8675 6.9971,5.8775 6.9844,5.8841 6.9849,5.8850 6.9281,5.9198 6.8521,5.9847 6.7872,6.0607 6.7350,6.1459 6.6967,6.2382 6.6734,6.3354 6.6655,6.4351 6.6656,6.4360 6.6106,6.4697 6.5346,6.5346 6.4697,6.6106 6.4175,6.6958 6.3792,6.7882 6.3559,6.8854 6.3480,6.9850 6.3514,7.0276 6.3536,7.0958 6.3681,7.2057 6.3921,7.3140 6.4255,7.4198 6.4679,7.5222 6.5191,7.6206 6.5787,7.7141 6.6462,7.8021 6.7211,7.8839 6.8029,7.9588 6.8909,8.0263 6.9844,8.0859 7.0828,8.1371 7.1852,8.1795 7.2910,8.2129 7.3993,8.2369 7.5092,8.2514 7.6196,8.2562 7.6196,12.0650 3.4947,12.0650 3.4947,9.1823 3.7757,9.2986 4.0930,9.3987 4.4178,9.4707 4.7476,9.5141 5.0800,9.5286 5.1800,9.5215 5.2776,9.4981 5.3703,9.4597 5.4558,9.4073 5.5321,9.3421 5.5973,9.2658 5.6497,9.1803 5.6881,9.0876 5.7115,8.9900 5.7194,8.8900 5.7115,8.7900 5.6881,8.6924 5.6497,8.5997 5.5973,8.5142 5.5321,8.4379 5.4558,8.3727 5.3703,8.3203 5.2776,8.2819 5.1800,8.2585 5.0800,8.2526 4.8586,8.2453 4.6389,8.2164 4.4226,8.1685 4.2113,8.1018 4.0065,8.0170 3.8100,7.9147 3.6231,7.7956 3.4947,7.6971 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,3.8100 3.4947,3.8100 3.4947,7.6971 3.4473,7.6608 3.2839,7.5111 3.1342,7.3477 2.9994,7.1719 2.8803,6.9850 2.7780,6.7885 2.6932,6.5837 2.6265,6.3724 2.5786,6.1561 2.5497,5.9364 2.5400,5.7150 2.5341,5.6154 2.5108,5.5182 2.4725,5.4258 2.4203,5.3406 2.3554,5.2646 2.2794,5.1997 2.1942,5.1475 2.1018,5.1092 2.0046,5.0859 1.9050,5.0780 1.8054,5.0859 1.7082,5.1092 1.6158,5.1475 1.5306,5.1997 1.4546,5.2646 1.3897,5.3406 1.3375,5.4258 1.2992,5.5182 1.2759,5.6154 1.2700,5.7150 1.2809,6.0474 1.3243,6.3772 1.3963,6.7020 1.4964,7.0193 1.6237,7.3267 1.7773,7.6218 1.9561,7.9024 2.1586,8.1664 2.3834,8.4116 2.6286,8.6364 2.8926,8.8389 3.1732,9.0177 3.4683,9.1713 3.4947,9.1823 3.4947,12.0650 0.6350,12.0650 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <path d="M 5.08000000 8.89000000 A 3.1750 3.1750 0 0 1 1.9050 5.7150" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 4.44500000 3.17500000 A 2.5400 2.5400 0 0 0 1.9436 5.2739" stroke-width="0.5080" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 7.30250000 6.43507400 A 0.6350 0.6350 0 1 1 6.9850 6.9850" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 9.33352400 4.62908600 A 3.1750 3.1750 0 0 0 5.2641 2.7315" stroke-width="0.7620" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/arc_f_clear.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_f_clear.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_f_clear.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arc with clearline flag - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_normal.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arcs with different sizes, normal cases - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_normal.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Arcs with different sizes, normal cases
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/arc_normal.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.eps	(revision 18980)
@@ -0,0 +1,41 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: arc_normal.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0 90 -0.12500 0.12500 0.20000 0.22500 0.080000 a
+0.02000 setlinewidth
+-90 -10 -0.10000 0.10000 0.17500 0.22500 0.200000 a
+0.01000 setlinewidth
+0 300 -0.02500 0.02500 0.30000 0.27500 0.400000 a
+0.03000 setlinewidth
+-160 -70 -0.12500 0.12500 0.25000 0.22500 0.240000 a
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/arc_normal.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.fab.gbr	(revision 18980)
@@ -0,0 +1,1861 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Arcs with different sizes, normal cases, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD16C,0.0100*%
+%ADD15C,0.0001*%
+%ADD14C,0.0060*%
+G54D14*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D15*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D14*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D15*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D14*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D15*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D14*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D15*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D14*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D15*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D14*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D15*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D16*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D14*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D15*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D14*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D15*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D14*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D15*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D14*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D15*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D14*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D15*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D14*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D15*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D14*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D15*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D14*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D15*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D14*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D15*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D14*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D15*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D14*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D15*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D14*X234500Y108500D02*Y104000D01*
+Y108500D02*X235550Y110000D01*
+X237200D01*
+X238250Y108500D01*
+Y104000D01*
+X234500Y107000D02*X238250D01*
+G54D15*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X258950D02*Y104000D01*
+X263450D01*
+Y110000D01*
+X258950D01*
+G37*
+G36*
+X264350D02*Y104000D01*
+X268850D01*
+Y110000D01*
+X264350D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X283250D02*Y104000D01*
+X287750D01*
+Y110000D01*
+X283250D01*
+G37*
+G36*
+X288650D02*Y104000D01*
+X293150D01*
+Y110000D01*
+X288650D01*
+G37*
+G36*
+X294050D02*Y104000D01*
+X298550D01*
+Y110000D01*
+X294050D01*
+G37*
+G36*
+X299450D02*Y104000D01*
+X303950D01*
+Y110000D01*
+X299450D01*
+G37*
+G36*
+X304850D02*Y104000D01*
+X309350D01*
+Y110000D01*
+X304850D01*
+G37*
+G36*
+X310250D02*Y104000D01*
+X314750D01*
+Y110000D01*
+X310250D01*
+G37*
+G36*
+X315650D02*Y104000D01*
+X320150D01*
+Y110000D01*
+X315650D01*
+G37*
+G36*
+X321050D02*Y104000D01*
+X325550D01*
+Y110000D01*
+X321050D01*
+G37*
+G36*
+X326450D02*Y104000D01*
+X330950D01*
+Y110000D01*
+X326450D01*
+G37*
+G36*
+X334550D02*Y104000D01*
+X339050D01*
+Y110000D01*
+X334550D01*
+G37*
+G36*
+X339950D02*Y104000D01*
+X344450D01*
+Y110000D01*
+X339950D01*
+G37*
+G36*
+X345350D02*Y104000D01*
+X349850D01*
+Y110000D01*
+X345350D01*
+G37*
+G36*
+X350750D02*Y104000D01*
+X355250D01*
+Y110000D01*
+X350750D01*
+G37*
+G36*
+X356150D02*Y104000D01*
+X360650D01*
+Y110000D01*
+X356150D01*
+G37*
+G36*
+X361550D02*Y104000D01*
+X366050D01*
+Y110000D01*
+X361550D01*
+G37*
+G36*
+X369650D02*Y104000D01*
+X374150D01*
+Y110000D01*
+X369650D01*
+G37*
+G36*
+X375050D02*Y104000D01*
+X379550D01*
+Y110000D01*
+X375050D01*
+G37*
+G36*
+X380450D02*Y104000D01*
+X384950D01*
+Y110000D01*
+X380450D01*
+G37*
+G36*
+X385850D02*Y104000D01*
+X390350D01*
+Y110000D01*
+X385850D01*
+G37*
+G36*
+X391250D02*Y104000D01*
+X395750D01*
+Y110000D01*
+X391250D01*
+G37*
+G36*
+X396650D02*Y104000D01*
+X401150D01*
+Y110000D01*
+X396650D01*
+G37*
+G36*
+X404750D02*Y104000D01*
+X409250D01*
+Y110000D01*
+X404750D01*
+G37*
+G36*
+X410150D02*Y104000D01*
+X414650D01*
+Y110000D01*
+X410150D01*
+G37*
+G36*
+X415550D02*Y104000D01*
+X420050D01*
+Y110000D01*
+X415550D01*
+G37*
+G36*
+X420950D02*Y104000D01*
+X425450D01*
+Y110000D01*
+X420950D01*
+G37*
+G36*
+X426350D02*Y104000D01*
+X430850D01*
+Y110000D01*
+X426350D01*
+G37*
+G36*
+X434450D02*Y104000D01*
+X438950D01*
+Y110000D01*
+X434450D01*
+G37*
+G54D14*X442550D02*Y104000D01*
+Y110000D02*X445550D01*
+X442550Y107300D02*X444800D01*
+G54D15*G36*
+X447350Y110000D02*Y104000D01*
+X451850D01*
+Y110000D01*
+X447350D01*
+G37*
+G36*
+X452750D02*Y104000D01*
+X457250D01*
+Y110000D01*
+X452750D01*
+G37*
+G36*
+X458150D02*Y104000D01*
+X462650D01*
+Y110000D01*
+X458150D01*
+G37*
+G36*
+X463550D02*Y104000D01*
+X468050D01*
+Y110000D01*
+X463550D01*
+G37*
+G36*
+X468950D02*Y104000D01*
+X473450D01*
+Y110000D01*
+X468950D01*
+G37*
+G36*
+X474350D02*Y104000D01*
+X478850D01*
+Y110000D01*
+X474350D01*
+G37*
+G36*
+X479750D02*Y104000D01*
+X484250D01*
+Y110000D01*
+X479750D01*
+G37*
+G36*
+X485150D02*Y104000D01*
+X489650D01*
+Y110000D01*
+X485150D01*
+G37*
+G36*
+X490550D02*Y104000D01*
+X495050D01*
+Y110000D01*
+X490550D01*
+G37*
+G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G54D14*X504800D02*Y104000D01*
+X506750Y110000D02*X507800Y108950D01*
+Y105050D01*
+X506750Y104000D02*X507800Y105050D01*
+X504050Y104000D02*X506750D01*
+X504050Y110000D02*X506750D01*
+G54D15*G36*
+X509600D02*Y104000D01*
+X514100D01*
+Y110000D01*
+X509600D01*
+G37*
+G36*
+X515000D02*Y104000D01*
+X519500D01*
+Y110000D01*
+X515000D01*
+G37*
+G36*
+X520400D02*Y104000D01*
+X524900D01*
+Y110000D01*
+X520400D01*
+G37*
+G36*
+X525800D02*Y104000D01*
+X530300D01*
+Y110000D01*
+X525800D01*
+G37*
+G36*
+X531200D02*Y104000D01*
+X535700D01*
+Y110000D01*
+X531200D01*
+G37*
+G36*
+X536600D02*Y104000D01*
+X541100D01*
+Y110000D01*
+X536600D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.gbr/arc_normal.top.gbr	(revision 18980)
@@ -0,0 +1,20 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Arcs with different sizes, normal cases, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0300*%
+%ADD12C,0.0200*%
+%ADD11C,0.0100*%
+G54D11*X7500Y27500D02*G75*G03X20000Y15000I12500J0D01*G01*
+G54D12*X7652Y29236D02*G75*G02X17500Y37500I9848J-1736D01*G01*
+G54D11*X27500Y22500D02*G75*G03X32500Y22500I2500J0D01*G01*
+G75*G03X28750Y24665I-2500J0D01*G01*
+G54D13*X20725Y39246D02*G75*G02X36746Y31775I4275J-11746D01*G01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_normal.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/arc_normal.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Arcs with different sizes, normal cases
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/arc_normal.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_normal.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_normal.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_normal.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.png.text	(revision 18980)
@@ -0,0 +1,22 @@
+r6630
+
+top left arc
+25 pixel line width (20.833 mil)
+124 pixels tall (103.333 mil)
+142 pixesl wide (118.333 mil)
+
+top right arc
+37 pixel line width (30.833 mil)
+227 pixels wide (189.166 mil)
+135 pixels tall (112.5 mil)
+
+lower left arc
+13 pixel line width (10.833 mil)
+162 pixels wide (135 mil)
+162 pixels tall
+
+lower right arc
+13 pixel line width (10.833 mil)
+72 pixels diameter (60 mil)
+
+
Index: tags/2.0.1/tests/RTT/ref/arc_normal.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_normal.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_normal.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_normal.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_normal.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_normal.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_normal.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.svg	(revision 18980)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <path d="M 5.08000000 8.89000000 A 3.1750 3.1750 0 0 1 1.9050 5.7150" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 4.44500000 3.17500000 A 2.5400 2.5400 0 0 0 1.9436 5.2739" stroke-width="0.5080" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 7.30250000 6.43507400 A 0.6350 0.6350 0 1 1 6.9850 6.9850" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+ <path d="M 9.33352400 4.62908600 A 3.1750 3.1750 0 0 0 5.2641 2.7315" stroke-width="0.7620" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/arc_normal.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_normal.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_normal.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arcs with different sizes, normal cases - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arcs with some parts off the page - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Arcs with some parts off the page
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.eps	(revision 18980)
@@ -0,0 +1,35 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: arc_offpage.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0 230 -0.10000 0.10000 0.05000 0.05000 0.100000 a
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.fab.gbr	(revision 18980)
@@ -0,0 +1,1819 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Arcs with some parts off the page, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500Y108500D02*Y104000D01*
+Y108500D02*X235550Y110000D01*
+X237200D01*
+X238250Y108500D01*
+Y104000D01*
+X234500Y107000D02*X238250D01*
+G54D13*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X258950D02*Y104000D01*
+X263450D01*
+Y110000D01*
+X258950D01*
+G37*
+G36*
+X264350D02*Y104000D01*
+X268850D01*
+Y110000D01*
+X264350D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X283250D02*Y104000D01*
+X287750D01*
+Y110000D01*
+X283250D01*
+G37*
+G36*
+X288650D02*Y104000D01*
+X293150D01*
+Y110000D01*
+X288650D01*
+G37*
+G36*
+X294050D02*Y104000D01*
+X298550D01*
+Y110000D01*
+X294050D01*
+G37*
+G36*
+X299450D02*Y104000D01*
+X303950D01*
+Y110000D01*
+X299450D01*
+G37*
+G36*
+X307550D02*Y104000D01*
+X312050D01*
+Y110000D01*
+X307550D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X323750D02*Y104000D01*
+X328250D01*
+Y110000D01*
+X323750D01*
+G37*
+G36*
+X329150D02*Y104000D01*
+X333650D01*
+Y110000D01*
+X329150D01*
+G37*
+G36*
+X337250D02*Y104000D01*
+X341750D01*
+Y110000D01*
+X337250D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X356150D02*Y104000D01*
+X360650D01*
+Y110000D01*
+X356150D01*
+G37*
+G36*
+X361550D02*Y104000D01*
+X366050D01*
+Y110000D01*
+X361550D01*
+G37*
+G36*
+X366950D02*Y104000D01*
+X371450D01*
+Y110000D01*
+X366950D01*
+G37*
+G36*
+X375050D02*Y104000D01*
+X379550D01*
+Y110000D01*
+X375050D01*
+G37*
+G36*
+X380450D02*Y104000D01*
+X384950D01*
+Y110000D01*
+X380450D01*
+G37*
+G36*
+X385850D02*Y104000D01*
+X390350D01*
+Y110000D01*
+X385850D01*
+G37*
+G36*
+X391250D02*Y104000D01*
+X395750D01*
+Y110000D01*
+X391250D01*
+G37*
+G36*
+X399350D02*Y104000D01*
+X403850D01*
+Y110000D01*
+X399350D01*
+G37*
+G54D12*X407450D02*Y104000D01*
+Y110000D02*X410450D01*
+X407450Y107300D02*X409700D01*
+G54D13*G36*
+X412250Y110000D02*Y104000D01*
+X416750D01*
+Y110000D01*
+X412250D01*
+G37*
+G36*
+X417650D02*Y104000D01*
+X422150D01*
+Y110000D01*
+X417650D01*
+G37*
+G36*
+X423050D02*Y104000D01*
+X427550D01*
+Y110000D01*
+X423050D01*
+G37*
+G36*
+X428450D02*Y104000D01*
+X432950D01*
+Y110000D01*
+X428450D01*
+G37*
+G36*
+X433850D02*Y104000D01*
+X438350D01*
+Y110000D01*
+X433850D01*
+G37*
+G36*
+X439250D02*Y104000D01*
+X443750D01*
+Y110000D01*
+X439250D01*
+G37*
+G36*
+X444650D02*Y104000D01*
+X449150D01*
+Y110000D01*
+X444650D01*
+G37*
+G36*
+X450050D02*Y104000D01*
+X454550D01*
+Y110000D01*
+X450050D01*
+G37*
+G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G54D12*X469700D02*Y104000D01*
+X471650Y110000D02*X472700Y108950D01*
+Y105050D01*
+X471650Y104000D02*X472700Y105050D01*
+X468950Y104000D02*X471650D01*
+X468950Y110000D02*X471650D01*
+G54D13*G36*
+X474500D02*Y104000D01*
+X479000D01*
+Y110000D01*
+X474500D01*
+G37*
+G36*
+X479900D02*Y104000D01*
+X484400D01*
+Y110000D01*
+X479900D01*
+G37*
+G36*
+X485300D02*Y104000D01*
+X489800D01*
+Y110000D01*
+X485300D01*
+G37*
+G36*
+X490700D02*Y104000D01*
+X495200D01*
+Y110000D01*
+X490700D01*
+G37*
+G36*
+X496100D02*Y104000D01*
+X500600D01*
+Y110000D01*
+X496100D01*
+G37*
+G36*
+X501500D02*Y104000D01*
+X506000D01*
+Y110000D01*
+X501500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.gbr/arc_offpage.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Arcs with some parts off the page, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X-5000Y45000D02*G75*G03X15000Y45000I10000J0D01*G01*
+Y45000D02*G75*G03X11428Y52660I-10000J0D01*G01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Arcs with some parts off the page
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_offpage.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.png.text	(revision 18980)
@@ -0,0 +1,10 @@
+r6630
+
+arc
+13 pixel line width (10.833 mil)
+180 pixels wide [measured from inside corner] (15.000 mil)
+186 pixels tall (154.167 mil)
+179 pixels wide [measured from inside corner] (14.917 mil)
+186 pixels wide (154.167 mil)
+
+
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_offpage.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_offpage.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <path d="M 2.90268100 -0.67575300 A 2.5400 2.5400 0 1 1 -1.2700 1.2700" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/arc_offpage.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_offpage.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_offpage.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Arcs with some parts off the page - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: arcs with different strange sizes - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb arcs with different strange sizes
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.eps	(revision 18980)
@@ -0,0 +1,37 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: arc_sizes.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0 90 0.00000 0.05000 0.10000 0.20000 2540000000.000000 a
+0 90 -0.05000 0.00000 0.20000 0.20000 0.200000 a
+0.30000 0.20000 0.00500 c
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.fab.gbr	(revision 18980)
@@ -0,0 +1,1831 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: arcs with different strange sizes, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X396500D02*Y104000D01*
+X401000D01*
+Y110000D01*
+X396500D01*
+G37*
+G36*
+X404600D02*Y104000D01*
+X409100D01*
+Y110000D01*
+X404600D01*
+G37*
+G54D12*X412700D02*Y104000D01*
+Y110000D02*X415700D01*
+X412700Y107300D02*X414950D01*
+G54D13*G36*
+X417500Y110000D02*Y104000D01*
+X422000D01*
+Y110000D01*
+X417500D01*
+G37*
+G36*
+X422900D02*Y104000D01*
+X427400D01*
+Y110000D01*
+X422900D01*
+G37*
+G36*
+X428300D02*Y104000D01*
+X432800D01*
+Y110000D01*
+X428300D01*
+G37*
+G36*
+X433700D02*Y104000D01*
+X438200D01*
+Y110000D01*
+X433700D01*
+G37*
+G36*
+X439100D02*Y104000D01*
+X443600D01*
+Y110000D01*
+X439100D01*
+G37*
+G36*
+X444500D02*Y104000D01*
+X449000D01*
+Y110000D01*
+X444500D01*
+G37*
+G36*
+X449900D02*Y104000D01*
+X454400D01*
+Y110000D01*
+X449900D01*
+G37*
+G36*
+X455300D02*Y104000D01*
+X459800D01*
+Y110000D01*
+X455300D01*
+G37*
+G36*
+X460700D02*Y104000D01*
+X465200D01*
+Y110000D01*
+X460700D01*
+G37*
+G36*
+X466100D02*Y104000D01*
+X470600D01*
+Y110000D01*
+X466100D01*
+G37*
+G54D12*X474950D02*Y104000D01*
+X476900Y110000D02*X477950Y108950D01*
+Y105050D01*
+X476900Y104000D02*X477950Y105050D01*
+X474200Y104000D02*X476900D01*
+X474200Y110000D02*X476900D01*
+G54D13*G36*
+X479750D02*Y104000D01*
+X484250D01*
+Y110000D01*
+X479750D01*
+G37*
+G36*
+X485150D02*Y104000D01*
+X489650D01*
+Y110000D01*
+X485150D01*
+G37*
+G36*
+X490550D02*Y104000D01*
+X495050D01*
+Y110000D01*
+X490550D01*
+G37*
+G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G36*
+X501350D02*Y104000D01*
+X505850D01*
+Y110000D01*
+X501350D01*
+G37*
+G36*
+X506750D02*Y104000D01*
+X511250D01*
+Y110000D01*
+X506750D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.gbr/arc_sizes.top.gbr	(revision 18980)
@@ -0,0 +1,52 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: arcs with different strange sizes, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X10000Y30000D02*Y29587D01*
+Y29177D01*
+Y28773D01*
+Y28377D01*
+Y27992D01*
+Y27620D01*
+Y27265D01*
+Y26929D01*
+Y26614D01*
+Y26321D01*
+Y26054D01*
+Y25814D01*
+Y25603D01*
+Y25421D01*
+Y25271D01*
+Y25153D01*
+Y25068D01*
+Y25017D01*
+Y25000D01*
+X15000Y30000D02*X15017D01*
+X15068D01*
+X15153D01*
+X15271D01*
+X15421D01*
+X15603D01*
+X15814D01*
+X16054D01*
+X16321D01*
+X16614D01*
+X16929D01*
+X17265D01*
+X17620D01*
+X17992D01*
+X18376D01*
+X18773D01*
+X19177D01*
+X19587D01*
+X20000D01*
+X30000D02*G75*G03X30000Y30000I0J0D01*G01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   arcs with different strange sizes
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_sizes.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.png.text	(revision 18980)
@@ -0,0 +1,18 @@
+r6630
+
+weird dot thing in the far right
+12 pixels across (10)
+12 pixels tall (10)
+
+weird dot to line (horizontal) 108 pixels
+
+horizontal line
+72 pixels long (60)
+12 pixels wide (10)
+
+vertical line
+72 pixels long (60)
+12 pixels wide (12)
+
+(mils)
+
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_sizes.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/arc_sizes.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="7.6200" y1="5.0800" x2="7.6200" y2="5.0800" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/arc_sizes.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/arc_sizes.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/arc_sizes.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: arcs with different strange sizes - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/comp1.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: (unknown) - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/comp1.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.dsn	(revision 18980)
@@ -0,0 +1,57 @@
+(pcb notnamed
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 31
+      (place 31 6.350000 10.795000 front 0 (PN 0))
+    )
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.508000 0.635000 8.890000 12.065000 8.890000)
+            (type protect))
+        (wire (path 10__bottom_copper 0.508000 0.635000 9.525000 12.065000 9.525000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/comp1.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.eps	(revision 18980)
@@ -0,0 +1,93 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: comp1.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.02000 setlinewidth
+1 setlinecap
+0.227451 0.372549 0.803922 setrgbcolor
+0.02500 0.12500 0.47500 0.12500 t
+0.8 0.8 0.8 setrgbcolor
+0.25000 0.07500 0.04331 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.25000 0.07500 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.25000 0.07500 0.04331 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.25000 0.07500 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.25000 0.07500 0.04331 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.25000 0.07500 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.02000 setlinewidth
+0.545098 0.137255 0.137255 setrgbcolor
+0.02500 0.15000 0.47500 0.15000 t
+0.498039 0.498039 0.498039 setrgbcolor
+0.25000 0.07500 0.04331 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.25000 0.07500 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+gsave
+0 0 0 setrgbcolor
+0.02500 0.02500 moveto
+0.17500 0.02500 lineto
+0.17500 0.17500 lineto
+0.02500 0.17500 lineto
+fill
+0.20000 0.02500 moveto
+0.47500 0.02500 lineto
+0.47500 0.47500 lineto
+0.20000 0.47500 lineto
+fill
+1 1 1 setrgbcolor
+0.22500 0.05000 moveto
+0.45000 0.05000 lineto
+0.45000 0.45000 lineto
+0.22500 0.45000 lineto
+fill
+0.08000 setlinewidth
+0.06000 0.25000 moveto 0.10000 0.12500 0.04000 -180 0 arc
+0.10000 0.25000 0.04000 0 180 arc
+nclip
+0.02000 setlinewidth
+90 180 -0.07500 0.07500 0.00000 0.00000 0.266667 a
+0 0 0 setrgbcolor
+0.10000 0.22500 0.10000 0.12500 t
+grestore
+% Layer bottomsilk group 12 drill 0 mask 0
+gsave
+% Layer plated-drill group -1 drill 1 mask 0
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.25000 0.07500 0.01968 c
+grestore
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/comp1.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.fcd	(revision 18980)
@@ -0,0 +1,9 @@
+[FIDOCAD]
+PL 5 30 95 30 4 2
+PL 5 25 95 25 4 1
+PP 5 5 35 5 35 35 5 35 5 5 3
+PP 40 5 95 5 95 95 40 95 40 5 3
+PL 20 50 20 25 16 3
+PP 45 10 90 10 90 90 45 90 45 10 3
+PL 20 45 20 25 4 3
+pa 50 1517 17 8 0
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.bottom.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: (unknown), bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD20C,0.0394*%
+%ADD19C,0.0866*%
+%ADD18C,0.0200*%
+G54D18*X2500Y37500D02*X47500D01*
+G54D19*X25000Y42500D03*
+G54D20*M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.fab.gbr	(revision 18980)
@@ -0,0 +1,1770 @@
+G04 start of page 8 for group -1 layer_idx 16777221 *
+G04 Title: (unknown), <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD28C,0.0100*%
+%ADD27C,0.0001*%
+%ADD26C,0.0060*%
+%ADD25C,0.0080*%
+G54D25*X25000Y42500D02*Y40900D01*
+Y42500D02*X26387Y43300D01*
+X25000Y42500D02*X23613Y43300D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D26*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y108800D02*X99200Y110000D01*
+Y104000D01*
+X98000D02*X100250D01*
+G54D27*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D26*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66750Y104000D02*X69000Y107000D01*
+Y109250D02*Y107000D01*
+X68250Y110000D02*X69000Y109250D01*
+X66750Y110000D02*X68250D01*
+X66000Y109250D02*X66750Y110000D01*
+X66000Y109250D02*Y107750D01*
+X66750Y107000D01*
+X69000D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D27*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D26*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D27*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D26*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D27*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D26*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D27*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D26*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D27*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D26*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D27*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D26*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D27*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D26*X268050Y138800D02*X269250Y140000D01*
+Y134000D01*
+X268050D02*X270300D01*
+G54D27*G36*
+X274800Y140000D02*Y134000D01*
+X279300D01*
+Y140000D01*
+X274800D01*
+G37*
+G36*
+X280200D02*Y134000D01*
+X284700D01*
+Y140000D01*
+X280200D01*
+G37*
+G36*
+X285600D02*Y134000D01*
+X290100D01*
+Y140000D01*
+X285600D01*
+G37*
+G36*
+X291000D02*Y134000D01*
+X295500D01*
+Y140000D01*
+X291000D01*
+G37*
+G36*
+X296400D02*Y134000D01*
+X300900D01*
+Y140000D01*
+X296400D01*
+G37*
+G36*
+X304500D02*Y134000D01*
+X309000D01*
+Y140000D01*
+X304500D01*
+G37*
+G36*
+X309900D02*Y134000D01*
+X314400D01*
+Y140000D01*
+X309900D01*
+G37*
+G36*
+X315300D02*Y134000D01*
+X319800D01*
+Y140000D01*
+X315300D01*
+G37*
+G36*
+X320700D02*Y134000D01*
+X325200D01*
+Y140000D01*
+X320700D01*
+G37*
+G36*
+X326100D02*Y134000D01*
+X330600D01*
+Y140000D01*
+X326100D01*
+G37*
+G54D28*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D26*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D27*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D26*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D27*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D26*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D27*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D26*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D27*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D26*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D27*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D26*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D27*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D26*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D27*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D26*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D27*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D26*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D27*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D26*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D27*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D26*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D27*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G54D26*X293900D02*Y104000D01*
+Y110000D02*X296900D01*
+X293900Y107300D02*X296150D01*
+G54D27*G36*
+X298700Y110000D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X325700D02*Y104000D01*
+X330200D01*
+Y110000D01*
+X325700D01*
+G37*
+G36*
+X331100D02*Y104000D01*
+X335600D01*
+Y110000D01*
+X331100D01*
+G37*
+G36*
+X336500D02*Y104000D01*
+X341000D01*
+Y110000D01*
+X336500D01*
+G37*
+G36*
+X341900D02*Y104000D01*
+X346400D01*
+Y110000D01*
+X341900D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G54D26*X356150D02*Y104000D01*
+X358100Y110000D02*X359150Y108950D01*
+Y105050D01*
+X358100Y104000D02*X359150Y105050D01*
+X355400Y104000D02*X358100D01*
+X355400Y110000D02*X358100D01*
+G54D27*G36*
+X360950D02*Y104000D01*
+X365450D01*
+Y110000D01*
+X360950D01*
+G37*
+G36*
+X366350D02*Y104000D01*
+X370850D01*
+Y110000D01*
+X366350D01*
+G37*
+G36*
+X371750D02*Y104000D01*
+X376250D01*
+Y110000D01*
+X371750D01*
+G37*
+G36*
+X377150D02*Y104000D01*
+X381650D01*
+Y110000D01*
+X377150D01*
+G37*
+G36*
+X382550D02*Y104000D01*
+X387050D01*
+Y110000D01*
+X382550D01*
+G37*
+G36*
+X387950D02*Y104000D01*
+X392450D01*
+Y110000D01*
+X387950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group5.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: (unknown), Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD15C,0.0394*%
+%ADD14C,0.0866*%
+G54D14*X25000Y42500D03*
+G54D15*M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.group7.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: (unknown), Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD17C,0.0394*%
+%ADD16C,0.0866*%
+G54D16*X25000Y42500D03*
+G54D17*M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,7 @@
+M48
+INCH
+T24C0.039
+%
+T24
+X002500Y004250
+M30
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.top.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: (unknown), top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0394*%
+%ADD12C,0.0866*%
+%ADD11C,0.0200*%
+G54D11*X2500Y35000D02*X47500D01*
+G54D12*X25000Y42500D03*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.gbr/comp1.topsilk.gbr	(revision 18980)
@@ -0,0 +1,38 @@
+G04 start of page 6 for group 1 layer_idx 8 *
+G04 Title: (unknown), top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD23C,0.0200*%
+%ADD22C,0.0800*%
+%ADD21C,0.0001*%
+G54D21*G36*
+X2500Y47500D02*X17500D01*
+Y32500D01*
+X2500D01*
+Y47500D01*
+G37*
+G36*
+X20000D02*X47500D01*
+Y2500D01*
+X20000D01*
+Y47500D01*
+G37*
+%LPC*%
+G36*
+X22500Y45000D02*X45000D01*
+Y5000D01*
+X22500D01*
+Y45000D01*
+G37*
+G54D22*X10000Y25000D02*Y37500D01*
+G54D23*X0Y42500D02*G75*G03X7500Y50000I0J7500D01*G01*
+%LPD*%
+X10000Y27500D02*Y37500D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/comp1.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.nelma.em	(revision 18980)
@@ -0,0 +1,75 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/comp1.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.net	(revision 18980)
@@ -0,0 +1,13 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   comp1.pcb
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317N/C              VIA   -     D0393PA00X+002500Y+004250X0866Y0000R000 S3      
+999
Index: tags/2.0.1/tests/RTT/ref/comp1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/comp1.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/comp1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/comp1.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/comp1.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/comp1.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/comp1.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.svg	(revision 18980)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <circle cx="6.3500" cy="1.9050" r="1.0999" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <circle cx="6.3500" cy="1.9050" r="1.0999" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <line x1="0.6350" y1="3.1750" x2="12.0650" y2="3.1750" stroke-width="0.5080" stroke="#3a5fcd" stroke-linecap="round"/>
+ <circle cx="6.3500" cy="1.9050" r="1.0999" stroke-width="0.5080" fill="#cccccc" stroke="none"/>
+ <circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="0.6350" y1="3.8100" x2="12.0650" y2="3.8100" stroke-width="0.5080" stroke="#8b2323" stroke-linecap="round"/>
+ <circle cx="6.3500" cy="1.9050" r="1.0999" stroke-width="0.5080" fill="#7f7f7f" stroke="none"/>
+ <circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+<!-- Composite: reset -->
+<defs>
+<g id="comp_pixel_1">
+ <polygon points="0.6350,0.6350 4.4450,0.6350 4.4450,4.4450 0.6350,4.4450 " stroke-width="0.010" stroke="#000000" fill="#000000"/>
+ <polygon points="5.0800,0.6350 12.0650,0.6350 12.0650,12.0650 5.0800,12.0650 " stroke-width="0.010" stroke="#000000" fill="#000000"/>
+ <polygon points="5.7150,1.2700 11.4300,1.2700 11.4300,11.4300 5.7150,11.4300 " stroke-width="0.010" stroke="#000000" fill="#000000"/>
+ <line x1="2.5400" y1="6.3500" x2="2.5400" y2="3.1750" stroke-width="2.0320" stroke="#000000" stroke-linecap="round"/>
+ <path d="M 1.90500000 0.00000000 A 1.9050 1.9050 0 0 1 0.0000 1.9050" stroke-width="0.5080" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <line x1="2.5400" y1="5.7150" x2="2.5400" y2="3.1750" stroke-width="0.5080" stroke="#000000" stroke-linecap="round"/>
+</g>
+<mask id="comp_clip_1" maskUnits="userSpaceOnUse" x="0" y="0" width="12.7000" height="12.7000">
+ <polygon points="0.6350,0.6350 4.4450,0.6350 4.4450,4.4450 0.6350,4.4450 " stroke-width="0.010" stroke="#FFFFFF" fill="#FFFFFF"/>
+ <polygon points="5.0800,0.6350 12.0650,0.6350 12.0650,12.0650 5.0800,12.0650 " stroke-width="0.010" stroke="#FFFFFF" fill="#FFFFFF"/>
+ <polygon points="5.7150,1.2700 11.4300,1.2700 11.4300,11.4300 5.7150,11.4300 " stroke-width="0.010" stroke="#000000" fill="#000000"/>
+<line x1="2.5400" y1="6.3500" x2="2.5400" y2="3.1750" stroke-width="2.0320" stroke="#000000" stroke-linecap="round"/>
+<path d="M 1.90500000 0.00000000 A 1.9050 1.9050 0 0 1 0.0000 1.9050" stroke-width="0.5080" stroke="#000000" stroke-linecap="round" fill="none"/>
+<line x1="2.5400" y1="5.7150" x2="2.5400" y2="3.1750" stroke-width="0.5080" stroke="#FFFFFF" stroke-linecap="round"/>
+</mask>
+</defs>
+<use xlink:href="#comp_pixel_1" mask="url(#comp_clip_1)"/>
+<!-- Composite: finished -->
+<!-- Composite: reset -->
+<defs>
+<g id="comp_pixel_2">
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<mask id="comp_clip_2" maskUnits="userSpaceOnUse" x="0" y="0" width="12.7000" height="12.7000">
+<circle cx="6.3500" cy="1.9050" r="0.5000" stroke-width="0.0000" fill="#FFFFFF" stroke="none"/>
+</mask>
+</defs>
+<use xlink:href="#comp_pixel_2" mask="url(#comp_clip_2)"/>
+<!-- Composite: finished -->
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/comp1.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/comp1.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/comp1.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: (unknown) - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: odd coordinates to check rounding errors - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb odd coordinates to check rounding errors
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 1.000000 6.000000 6.600000 6.110000 6.589000)
+            (type protect))
+        (wire (path 3__top_copper 1.000000 6.111100 6.588890 6.111111 6.589000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.eps	(revision 18980)
@@ -0,0 +1,36 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: coord_rounding.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.03937 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.23622 0.24016 0.24055 0.24059 t
+0.24059 0.24059 0.24059 0.24059 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 47 48 48 48 8 2
+PL 48 48 48 48 8 2
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.fab.gbr	(revision 18980)
@@ -0,0 +1,1867 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: odd coordinates to check rounding errors, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X253400D02*Y104000D01*
+X257900D01*
+Y110000D01*
+X253400D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X296600D02*Y104000D01*
+X301100D01*
+Y110000D01*
+X296600D01*
+G37*
+G36*
+X302000D02*Y104000D01*
+X306500D01*
+Y110000D01*
+X302000D01*
+G37*
+G36*
+X307400D02*Y104000D01*
+X311900D01*
+Y110000D01*
+X307400D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X358700D02*Y104000D01*
+X363200D01*
+Y110000D01*
+X358700D01*
+G37*
+G36*
+X364100D02*Y104000D01*
+X368600D01*
+Y110000D01*
+X364100D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X396500D02*Y104000D01*
+X401000D01*
+Y110000D01*
+X396500D01*
+G37*
+G36*
+X404600D02*Y104000D01*
+X409100D01*
+Y110000D01*
+X404600D01*
+G37*
+G36*
+X410000D02*Y104000D01*
+X414500D01*
+Y110000D01*
+X410000D01*
+G37*
+G36*
+X415400D02*Y104000D01*
+X419900D01*
+Y110000D01*
+X415400D01*
+G37*
+G36*
+X420800D02*Y104000D01*
+X425300D01*
+Y110000D01*
+X420800D01*
+G37*
+G36*
+X426200D02*Y104000D01*
+X430700D01*
+Y110000D01*
+X426200D01*
+G37*
+G36*
+X431600D02*Y104000D01*
+X436100D01*
+Y110000D01*
+X431600D01*
+G37*
+G36*
+X439700D02*Y104000D01*
+X444200D01*
+Y110000D01*
+X439700D01*
+G37*
+G54D12*X447800D02*Y104000D01*
+Y110000D02*X450800D01*
+X447800Y107300D02*X450050D01*
+G54D13*G36*
+X452600Y110000D02*Y104000D01*
+X457100D01*
+Y110000D01*
+X452600D01*
+G37*
+G36*
+X458000D02*Y104000D01*
+X462500D01*
+Y110000D01*
+X458000D01*
+G37*
+G36*
+X463400D02*Y104000D01*
+X467900D01*
+Y110000D01*
+X463400D01*
+G37*
+G36*
+X468800D02*Y104000D01*
+X473300D01*
+Y110000D01*
+X468800D01*
+G37*
+G36*
+X474200D02*Y104000D01*
+X478700D01*
+Y110000D01*
+X474200D01*
+G37*
+G36*
+X479600D02*Y104000D01*
+X484100D01*
+Y110000D01*
+X479600D01*
+G37*
+G36*
+X485000D02*Y104000D01*
+X489500D01*
+Y110000D01*
+X485000D01*
+G37*
+G36*
+X490400D02*Y104000D01*
+X494900D01*
+Y110000D01*
+X490400D01*
+G37*
+G36*
+X495800D02*Y104000D01*
+X500300D01*
+Y110000D01*
+X495800D01*
+G37*
+G36*
+X501200D02*Y104000D01*
+X505700D01*
+Y110000D01*
+X501200D01*
+G37*
+G54D12*X510050D02*Y104000D01*
+X512000Y110000D02*X513050Y108950D01*
+Y105050D01*
+X512000Y104000D02*X513050Y105050D01*
+X509300Y104000D02*X512000D01*
+X509300Y110000D02*X512000D01*
+G54D13*G36*
+X514850D02*Y104000D01*
+X519350D01*
+Y110000D01*
+X514850D01*
+G37*
+G36*
+X520250D02*Y104000D01*
+X524750D01*
+Y110000D01*
+X520250D01*
+G37*
+G36*
+X525650D02*Y104000D01*
+X530150D01*
+Y110000D01*
+X525650D01*
+G37*
+G36*
+X531050D02*Y104000D01*
+X535550D01*
+Y110000D01*
+X531050D01*
+G37*
+G36*
+X536450D02*Y104000D01*
+X540950D01*
+Y110000D01*
+X536450D01*
+G37*
+G36*
+X541850D02*Y104000D01*
+X546350D01*
+Y110000D01*
+X541850D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.gbr/coord_rounding.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: odd coordinates to check rounding errors, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0394*%
+G54D11*X23622Y25984D02*X24055Y25941D01*
+X24059Y25941D02*X24059Y25941D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   odd coordinates to check rounding errors
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/coord_rounding.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.png.text	(revision 18980)
@@ -0,0 +1,6 @@
+r6630
+
+weird dot thing
+48 pixels (40) tall
+53 pixels (44.167) wide
+
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/coord_rounding.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/coord_rounding.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.svg	(revision 18980)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="6.0000" y1="6.1000" x2="6.1100" y2="6.1110" stroke-width="1.0000" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.1111" y1="6.1111" x2="6.1111" y2="6.1110" stroke-width="1.0000" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/coord_rounding.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/coord_rounding.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/coord_rounding.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: odd coordinates to check rounding errors - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/elem_pads.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.bom	(revision 18980)
@@ -0,0 +1,9 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: pads with different geometry - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+1,"Standard SMT resistor, capacitor etc","1206",R1 
+1,"SMT transistor, 5 pins","SOT325",U1 
Index: tags/2.0.1/tests/RTT/ref/elem_pads.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.dsn	(revision 18980)
@@ -0,0 +1,130 @@
+(pcb pads with different geometry
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "R1" 6.350000 10.160000 front 0 (PN 0))
+    )
+    (component 27
+      (place "U1" 5.689600 3.175000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" -1.499870 0.000000)
+      (pin Pstk_shape_8 "2" 1.499870 0.000000)
+    )
+    (image 27
+      (pin Pstk_shape_29 "1" 0.000000 0.000000)
+      (pin Pstk_shape_30 "2" 1.295400 0.000000)
+      (pin Pstk_shape_31 "3" 1.295400 1.778000)
+      (pin Pstk_shape_32 "4" 0.660400 1.778000)
+      (pin Pstk_shape_33 "5" 0.000000 1.778000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "3__top_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_29
+      (shape
+        (polygon "3__top_copper" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_30
+      (shape
+        (polygon "3__top_copper" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_31
+      (shape
+        (polygon "3__top_copper" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_32
+      (shape
+        (polygon "3__top_copper" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_33
+      (shape
+        (polygon "3__top_copper" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/elem_pads.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.eps	(revision 18980)
@@ -0,0 +1,97 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: elem_pads.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.301961 0.301961 0.301961 setrgbcolor
+0.21654 0.06260 moveto
+0.16536 0.06260 lineto
+0.16536 0.13740 lineto
+0.21654 0.13740 lineto
+fill
+0.33464 0.06260 moveto
+0.28346 0.06260 lineto
+0.28346 0.13740 lineto
+0.33464 0.13740 lineto
+fill
+0.23150 0.35750 moveto
+0.21650 0.35750 lineto
+0.21650 0.39250 lineto
+0.23150 0.39250 lineto
+fill
+0.28250 0.35750 moveto
+0.26750 0.35750 lineto
+0.26750 0.39250 lineto
+0.28250 0.39250 lineto
+fill
+0.28250 0.28750 moveto
+0.26750 0.28750 lineto
+0.26750 0.32250 lineto
+0.28250 0.32250 lineto
+fill
+0.25750 0.28750 moveto
+0.24250 0.28750 lineto
+0.24250 0.32250 lineto
+0.25750 0.32250 lineto
+fill
+0.23150 0.28750 moveto
+0.21650 0.28750 lineto
+0.21650 0.32250 lineto
+0.23150 0.32250 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+0.00800 setlinewidth
+0 0 0 setrgbcolor
+0.22638 0.06260 0.27362 0.06260 t
+0.22638 0.13740 0.27362 0.13740 t
+0.01000 setlinewidth
+0.21000 0.28100 0.21000 0.40000 t
+0.21000 0.40000 0.29000 0.40000 t
+0.29000 0.40000 0.29000 0.28100 t
+0.29000 0.28100 0.21000 0.28100 t
+0.00700 setlinewidth
+0.21850 0.14350 0.23850 0.14350 t
+0.23850 0.14350 0.24350 0.14850 t
+0.24350 0.14850 0.24350 0.15850 t
+0.23850 0.16350 0.24350 0.15850 t
+0.22350 0.16350 0.23850 0.16350 t
+0.22350 0.14350 0.22350 0.18350 t
+0.23150 0.16350 0.24350 0.18350 t
+0.25550 0.15150 0.26350 0.14350 t
+0.26350 0.14350 0.26350 0.18350 t
+0.25550 0.18350 0.27050 0.18350 t
+0.22500 0.41500 0.22500 0.45000 t
+0.22500 0.45000 0.23000 0.45500 t
+0.23000 0.45500 0.24000 0.45500 t
+0.24000 0.45500 0.24500 0.45000 t
+0.24500 0.41500 0.24500 0.45000 t
+0.25700 0.42300 0.26500 0.41500 t
+0.26500 0.41500 0.26500 0.45500 t
+0.25700 0.45500 0.27200 0.45500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/elem_pads.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.fab.gbr	(revision 18980)
@@ -0,0 +1,1807 @@
+G04 start of page 6 for group -1 layer_idx 16777221 *
+G04 Title: pads with different geometry, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD19C,0.0100*%
+%ADD18C,0.0001*%
+%ADD17C,0.0060*%
+G54D17*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D18*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D17*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D18*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D17*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D18*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D17*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D18*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D17*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D18*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D17*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D18*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D19*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D17*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D18*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D17*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D18*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D17*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D18*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D17*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D18*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D17*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D18*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D17*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D18*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D17*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D18*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D17*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D18*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D17*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D18*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D17*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D18*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D17*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D18*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G36*
+X372200D02*Y104000D01*
+X376700D01*
+Y110000D01*
+X372200D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G54D17*X388400D02*Y104000D01*
+Y110000D02*X391400D01*
+X388400Y107300D02*X390650D01*
+G54D18*G36*
+X393200Y110000D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X398600D02*Y104000D01*
+X403100D01*
+Y110000D01*
+X398600D01*
+G37*
+G36*
+X404000D02*Y104000D01*
+X408500D01*
+Y110000D01*
+X404000D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G36*
+X436400D02*Y104000D01*
+X440900D01*
+Y110000D01*
+X436400D01*
+G37*
+G36*
+X441800D02*Y104000D01*
+X446300D01*
+Y110000D01*
+X441800D01*
+G37*
+G54D17*X450650D02*Y104000D01*
+X452600Y110000D02*X453650Y108950D01*
+Y105050D01*
+X452600Y104000D02*X453650Y105050D01*
+X449900Y104000D02*X452600D01*
+X449900Y110000D02*X452600D01*
+G54D18*G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+G36*
+X477050D02*Y104000D01*
+X481550D01*
+Y110000D01*
+X477050D01*
+G37*
+G36*
+X482450D02*Y104000D01*
+X486950D01*
+Y110000D01*
+X482450D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.top.gbr	(revision 18980)
@@ -0,0 +1,55 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: pads with different geometry, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X21654Y43740D02*X16536D01*
+Y36260D01*
+X21654D01*
+Y43740D01*
+G37*
+G36*
+X33464D02*X28346D01*
+Y36260D01*
+X33464D01*
+Y43740D01*
+G37*
+G36*
+X23150Y14250D02*X21650D01*
+Y10750D01*
+X23150D01*
+Y14250D01*
+G37*
+G36*
+X28250D02*X26750D01*
+Y10750D01*
+X28250D01*
+Y14250D01*
+G37*
+G36*
+Y21250D02*X26750D01*
+Y17750D01*
+X28250D01*
+Y21250D01*
+G37*
+G36*
+X25750D02*X24250D01*
+Y17750D01*
+X25750D01*
+Y21250D01*
+G37*
+G36*
+X23150D02*X21650D01*
+Y17750D01*
+X23150D01*
+Y21250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topmask.gbr	(revision 18980)
@@ -0,0 +1,55 @@
+G04 start of page 3 for group 2 layer_idx 9 *
+G04 Title: pads with different geometry, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD12C,0.0001*%
+G54D12*G36*
+X21954Y44040D02*X16236D01*
+Y35960D01*
+X21954D01*
+Y44040D01*
+G37*
+G36*
+X33764D02*X28046D01*
+Y35960D01*
+X33764D01*
+Y44040D01*
+G37*
+G36*
+X23450Y14550D02*X21350D01*
+Y10450D01*
+X23450D01*
+Y14550D01*
+G37*
+G36*
+X28550D02*X26450D01*
+Y10450D01*
+X28550D01*
+Y14550D01*
+G37*
+G36*
+Y21550D02*X26450D01*
+Y17450D01*
+X28550D01*
+Y21550D01*
+G37*
+G36*
+X26050D02*X23950D01*
+Y17450D01*
+X26050D01*
+Y21550D01*
+G37*
+G36*
+X23450D02*X21350D01*
+Y17450D01*
+X23450D01*
+Y21550D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.toppaste.gbr	(revision 18980)
@@ -0,0 +1,55 @@
+G04 start of page 5 for group 0 layer_idx 11 *
+G04 Title: pads with different geometry, top_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPPASTE*%
+%ADD16C,0.0001*%
+G54D16*G36*
+X21654Y43740D02*X16536D01*
+Y36260D01*
+X21654D01*
+Y43740D01*
+G37*
+G36*
+X33464D02*X28346D01*
+Y36260D01*
+X33464D01*
+Y43740D01*
+G37*
+G36*
+X23150Y14250D02*X21650D01*
+Y10750D01*
+X23150D01*
+Y14250D01*
+G37*
+G36*
+X28250D02*X26750D01*
+Y10750D01*
+X28250D01*
+Y14250D01*
+G37*
+G36*
+Y21250D02*X26750D01*
+Y17750D01*
+X28250D01*
+Y21250D01*
+G37*
+G36*
+X25750D02*X24250D01*
+Y17750D01*
+X25750D01*
+Y21250D01*
+G37*
+G36*
+X23150D02*X21650D01*
+Y17750D01*
+X23150D01*
+Y21250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.gbr/elem_pads.topsilk.gbr	(revision 18980)
@@ -0,0 +1,39 @@
+G04 start of page 4 for group 1 layer_idx 8 *
+G04 Title: pads with different geometry, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD15C,0.0070*%
+%ADD14C,0.0100*%
+%ADD13C,0.0080*%
+G54D13*X22638Y43740D02*X27362D01*
+X22638Y36260D02*X27362D01*
+G54D14*X21000Y21900D02*Y10000D01*
+X29000D01*
+Y21900D01*
+X21000D01*
+G54D15*X21850Y35650D02*X23850D01*
+X24350Y35150D01*
+Y34150D01*
+X23850Y33650D02*X24350Y34150D01*
+X22350Y33650D02*X23850D01*
+X22350Y35650D02*Y31650D01*
+X23150Y33650D02*X24350Y31650D01*
+X25550Y34850D02*X26350Y35650D01*
+Y31650D01*
+X25550D02*X27050D01*
+X22500Y8500D02*Y5000D01*
+X23000Y4500D01*
+X24000D01*
+X24500Y5000D01*
+Y8500D02*Y5000D01*
+X25700Y7700D02*X26500Y8500D01*
+Y4500D01*
+X25700D02*X27200D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/elem_pads.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.net	(revision 18980)
@@ -0,0 +1,19 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   pads with different geometry
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+327N/C              R1    -1          A01X+001909Y+004000X0511Y0748R000 S1      
+327N/C              R1    -2          A01X+003090Y+004000X0511Y0748R000 S1      
+327N/C              U1    -1          A01X+002240Y+001250X0150Y0350R000 S1      
+327N/C              U1    -2          A01X+002750Y+001250X0150Y0350R000 S1      
+327N/C              U1    -3          A01X+002750Y+001950X0150Y0350R000 S1      
+327N/C              U1    -4          A01X+002500Y+001950X0150Y0350R000 S1      
+327N/C              U1    -5          A01X+002240Y+001950X0150Y0350R000 S1      
+999
Index: tags/2.0.1/tests/RTT/ref/elem_pads.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.png.text	(revision 18980)
@@ -0,0 +1,13 @@
+r6630
+
+R1 pads
+61 x 89 pixels (50.833 x 74.167)
+distance between pads 81 pixels (67.5)
+
+U1 pads
+18 x 42 pixels (15 x 35)
+pad 5 upper to nearest silk screen corner 2 x 2 pixels (1.667 x 1.667)
+pad 5 distance to pad 4 is 13 pixels (10.833)
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/elem_pads.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.svg	(revision 18980)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="5.5001,1.5900 4.2001,1.5900 4.2001,3.4900 5.5001,3.4900 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="8.4999,1.5900 7.1999,1.5900 7.1999,3.4900 8.4999,3.4900 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="5.8801,9.0805 5.4991,9.0805 5.4991,9.9695 5.8801,9.9695 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="7.1755,9.0805 6.7945,9.0805 6.7945,9.9695 7.1755,9.9695 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="7.1755,7.3025 6.7945,7.3025 6.7945,8.1915 7.1755,8.1915 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="6.5405,7.3025 6.1595,7.3025 6.1595,8.1915 6.5405,8.1915 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="5.8801,7.3025 5.4991,7.3025 5.4991,8.1915 5.8801,8.1915 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="5.7501" y1="1.5900" x2="6.9499" y2="1.5900" stroke-width="0.2032" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7501" y1="3.4900" x2="6.9499" y2="3.4900" stroke-width="0.2032" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.3340" y1="7.1374" x2="5.3340" y2="10.1600" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.3340" y1="10.1600" x2="7.3660" y2="10.1600" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.3660" y1="10.1600" x2="7.3660" y2="7.1374" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.3660" y1="7.1374" x2="5.3340" y2="7.1374" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.5499" y1="3.6449" x2="6.0579" y2="3.6449" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.0579" y1="3.6449" x2="6.1849" y2="3.7719" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.1849" y1="3.7719" x2="6.1849" y2="4.0259" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.0579" y1="4.1529" x2="6.1849" y2="4.0259" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6769" y1="4.1529" x2="6.0579" y2="4.1529" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6769" y1="3.6449" x2="5.6769" y2="4.6609" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.8801" y1="4.1529" x2="6.1849" y2="4.6609" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.4897" y1="3.8481" x2="6.6929" y2="3.6449" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6929" y1="3.6449" x2="6.6929" y2="4.6609" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.4897" y1="4.6609" x2="6.8707" y2="4.6609" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="10.5410" x2="5.7150" y2="11.4300" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="11.4300" x2="5.8420" y2="11.5570" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.8420" y1="11.5570" x2="6.0960" y2="11.5570" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.0960" y1="11.5570" x2="6.2230" y2="11.4300" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.2230" y1="10.5410" x2="6.2230" y2="11.4300" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.5278" y1="10.7442" x2="6.7310" y2="10.5410" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.7310" y1="10.5410" x2="6.7310" y2="11.5570" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.5278" y1="11.5570" x2="6.9088" y2="11.5570" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/elem_pads.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads.xy	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: pads with different geometry - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+R1,"Standard SMT resistor, capacitor etc","1206",250.00,400.00,0,top
+U1,"SMT transistor, 5 pins","SOT325",249.60,167.00,90,top
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: element with pads on both sides - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+1,"(unknown)","(unknown)",E1 
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.dsn	(revision 18980)
@@ -0,0 +1,75 @@
+(pcb element with pads on both sides
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "E1" 4.445000 8.890000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.952500 0.000000)
+      (pin Pstk_shape_8 "2" 2.540000 -1.587500)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
+        1.079500 -0.127000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "10__bottom_copper" 0
+        -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
+        -0.127000 -1.079500
+        )
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.eps	(revision 18980)
@@ -0,0 +1,47 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: elem_pads_ds.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.27500 0.17500 0.27500 0.25000 t
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.301961 0.301961 0.301961 setrgbcolor
+0.17500 0.15000 0.25000 0.15000 t
+% Layer topsilk group 1 drill 0 mask 0
+0 0 0 setrgbcolor
+0.17500 0.15000 0.17500 0.25000 t
+0.00700 setlinewidth
+0.17500 0.09300 0.19000 0.09300 t
+0.17500 0.11500 0.19500 0.11500 t
+0.17500 0.07500 0.17500 0.11500 t
+0.17500 0.07500 0.19500 0.07500 t
+0.20700 0.08300 0.21500 0.07500 t
+0.21500 0.07500 0.21500 0.11500 t
+0.20700 0.11500 0.22200 0.11500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottom.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 3 for group 10 layer_idx 1 *
+G04 Title: element with pads on both sides, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD12C,0.0100*%
+G54D12*X27500Y32500D02*Y25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottommask.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 5 for group 11 layer_idx 10 *
+G04 Title: element with pads on both sides, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD14C,0.0500*%
+G54D14*X27500Y32500D02*Y25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottompaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottompaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.bottompaste.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 8 for group 13 layer_idx 12 *
+G04 Title: element with pads on both sides, bottom_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMPASTE*%
+%ADD18C,0.0100*%
+G54D18*X27500Y32500D02*Y25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.fab.gbr	(revision 18980)
@@ -0,0 +1,1813 @@
+G04 start of page 9 for group -1 layer_idx 16777221 *
+G04 Title: element with pads on both sides, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD21C,0.0100*%
+%ADD20C,0.0001*%
+%ADD19C,0.0060*%
+G54D19*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D20*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D19*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D20*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D19*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D20*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D19*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D20*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D19*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D20*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D19*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D20*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D21*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D19*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D20*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D19*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D20*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D19*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D20*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D19*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D20*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D19*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D20*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D19*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D20*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D19*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D20*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D19*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D20*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D19*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D20*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D19*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D20*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D19*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D20*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X323600D02*Y104000D01*
+X328100D01*
+Y110000D01*
+X323600D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X342500D02*Y104000D01*
+X347000D01*
+Y110000D01*
+X342500D01*
+G37*
+G36*
+X347900D02*Y104000D01*
+X352400D01*
+Y110000D01*
+X347900D01*
+G37*
+G36*
+X353300D02*Y104000D01*
+X357800D01*
+Y110000D01*
+X353300D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G36*
+X372200D02*Y104000D01*
+X376700D01*
+Y110000D01*
+X372200D01*
+G37*
+G36*
+X377600D02*Y104000D01*
+X382100D01*
+Y110000D01*
+X377600D01*
+G37*
+G36*
+X383000D02*Y104000D01*
+X387500D01*
+Y110000D01*
+X383000D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G54D19*X399200D02*Y104000D01*
+Y110000D02*X402200D01*
+X399200Y107300D02*X401450D01*
+G54D20*G36*
+X404000Y110000D02*Y104000D01*
+X408500D01*
+Y110000D01*
+X404000D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G36*
+X436400D02*Y104000D01*
+X440900D01*
+Y110000D01*
+X436400D01*
+G37*
+G36*
+X441800D02*Y104000D01*
+X446300D01*
+Y110000D01*
+X441800D01*
+G37*
+G36*
+X447200D02*Y104000D01*
+X451700D01*
+Y110000D01*
+X447200D01*
+G37*
+G36*
+X452600D02*Y104000D01*
+X457100D01*
+Y110000D01*
+X452600D01*
+G37*
+G54D19*X461450D02*Y104000D01*
+X463400Y110000D02*X464450Y108950D01*
+Y105050D01*
+X463400Y104000D02*X464450Y105050D01*
+X460700Y104000D02*X463400D01*
+X460700Y110000D02*X463400D01*
+G54D20*G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+G36*
+X477050D02*Y104000D01*
+X481550D01*
+Y110000D01*
+X477050D01*
+G37*
+G36*
+X482450D02*Y104000D01*
+X486950D01*
+Y110000D01*
+X482450D01*
+G37*
+G36*
+X487850D02*Y104000D01*
+X492350D01*
+Y110000D01*
+X487850D01*
+G37*
+G36*
+X493250D02*Y104000D01*
+X497750D01*
+Y110000D01*
+X493250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.top.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: element with pads on both sides, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X17500Y35000D02*X25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topmask.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 4 for group 2 layer_idx 9 *
+G04 Title: element with pads on both sides, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD13C,0.0500*%
+G54D13*X17500Y35000D02*X25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.toppaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.toppaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.toppaste.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 7 for group 0 layer_idx 11 *
+G04 Title: element with pads on both sides, top_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPPASTE*%
+%ADD17C,0.0100*%
+G54D17*X17500Y35000D02*X25000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.gbr/elem_pads_ds.topsilk.gbr	(revision 18980)
@@ -0,0 +1,22 @@
+G04 start of page 6 for group 1 layer_idx 8 *
+G04 Title: element with pads on both sides, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD16C,0.0070*%
+%ADD15C,0.0100*%
+G54D15*X17500Y35000D02*Y25000D01*
+G54D16*Y40700D02*X19000D01*
+X17500Y38500D02*X19500D01*
+X17500Y42500D02*Y38500D01*
+Y42500D02*X19500D01*
+X20700Y41700D02*X21500Y42500D01*
+Y38500D01*
+X20700D02*X22200D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.nelma.em	(revision 18980)
@@ -0,0 +1,75 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.net	(revision 18980)
@@ -0,0 +1,14 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   element with pads on both sides
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+327N/C              E1    -1          A01X+002125Y+003500X0850Y0100R000 S1      
+327N/C              E1    -2          A02X+002750Y+002875X0100Y0850R000 S2      
+999
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads_ds.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.png.text	(revision 18980)
@@ -0,0 +1,14 @@
+r6630
+
+E1
+2 pads 1 silk line + text (E1)
+
+silk line 132 pixels (110) long 12 pixels (10) wide
+
+copper pads 102 pixels (85) long 12 pixels (10) wide
+
+pad 1 shares it's terminus with the silk line
+
+pad 2's highest point is 114 x 18 pixels (95 x 15) over from the inside corner of pad 1 & the silk line
+
+pad 2's lenght 102 pixels (85) width 12 pixels (10) 
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads_ds.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pads_ds.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.svg	(revision 18980)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <line x1="6.9850" y1="4.4450" x2="6.9850" y2="6.3500" stroke-width="0.2540" stroke="#cccccc" stroke-linecap="round"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="4.4450" y1="3.8100" x2="6.3500" y2="3.8100" stroke-width="0.2540" stroke="#4d4d4d" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="4.4450" y1="3.8100" x2="4.4450" y2="6.3500" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="2.3622" x2="4.8260" y2="2.3622" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="2.9210" x2="4.9530" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="1.9050" x2="4.4450" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="1.9050" x2="4.9530" y2="1.9050" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.2578" y1="2.1082" x2="5.4610" y2="1.9050" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.4610" y1="1.9050" x2="5.4610" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.2578" y1="2.9210" x2="5.6388" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/elem_pads_ds.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pads_ds.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pads_ds.xy	(revision 18980)
@@ -0,0 +1,9 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: element with pads on both sides - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+E1,"(unknown)","(unknown)",243.75,318.75,0,top
Index: tags/2.0.1/tests/RTT/ref/elem_pins.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: pins with different shapes - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+2,"dip(2)","2*300",U1 U2 
Index: tags/2.0.1/tests/RTT/ref/elem_pins.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.dsn	(revision 18980)
@@ -0,0 +1,144 @@
+(pcb pins with different shapes
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "U1" 1.905000 9.525000 front 0 (PN 0))
+    )
+    (component 37
+      (place "U2" 1.905000 4.445000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "2" 7.620000 0.000000)
+    )
+    (image 37
+      (pin Pstk_shape_39 "1" 0.000000 0.000000)
+      (pin Pstk_shape_40 "2" 7.620000 0.000000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "5__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "7__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "10__bottom_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_39
+      (shape
+        (polygon "3__top_copper" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "5__Intern" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "7__Intern" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "10__bottom_copper" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_40
+      (shape
+        (polygon "3__top_copper" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "5__Intern" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "7__Intern" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "10__bottom_copper" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/elem_pins.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.eps	(revision 18980)
@@ -0,0 +1,201 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: elem_pins.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.03500 0.08500 moveto
+0.11500 0.08500 lineto
+0.11500 0.16500 lineto
+0.03500 0.16500 lineto
+fill
+0.37500 0.12500 0.04000 c
+0.15500 0.30843 moveto
+0.10814 0.28500 lineto
+0.05843 0.28500 lineto
+0.03500 0.30843 lineto
+0.03500 0.34157 lineto
+0.05843 0.36500 lineto
+0.10814 0.36500 lineto
+0.15500 0.34157 lineto
+fill
+0.45500 0.29186 moveto
+0.40814 0.24500 lineto
+0.34186 0.24500 lineto
+0.29500 0.29186 lineto
+0.29500 0.34157 lineto
+0.34186 0.36500 lineto
+0.40814 0.36500 lineto
+0.45500 0.34157 lineto
+fill
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.12500 0.01968 c
+0.37500 0.12500 0.01968 c
+0.07500 0.32500 0.01968 c
+0.37500 0.32500 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.03500 0.08500 moveto
+0.11500 0.08500 lineto
+0.11500 0.16500 lineto
+0.03500 0.16500 lineto
+fill
+0.37500 0.12500 0.04000 c
+0.15500 0.30843 moveto
+0.10814 0.28500 lineto
+0.05843 0.28500 lineto
+0.03500 0.30843 lineto
+0.03500 0.34157 lineto
+0.05843 0.36500 lineto
+0.10814 0.36500 lineto
+0.15500 0.34157 lineto
+fill
+0.45500 0.29186 moveto
+0.40814 0.24500 lineto
+0.34186 0.24500 lineto
+0.29500 0.29186 lineto
+0.29500 0.34157 lineto
+0.34186 0.36500 lineto
+0.40814 0.36500 lineto
+0.45500 0.34157 lineto
+fill
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.12500 0.01968 c
+0.37500 0.12500 0.01968 c
+0.07500 0.32500 0.01968 c
+0.37500 0.32500 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.03500 0.08500 moveto
+0.11500 0.08500 lineto
+0.11500 0.16500 lineto
+0.03500 0.16500 lineto
+fill
+0.37500 0.12500 0.04000 c
+0.15500 0.30843 moveto
+0.10814 0.28500 lineto
+0.05843 0.28500 lineto
+0.03500 0.30843 lineto
+0.03500 0.34157 lineto
+0.05843 0.36500 lineto
+0.10814 0.36500 lineto
+0.15500 0.34157 lineto
+fill
+0.45500 0.29186 moveto
+0.40814 0.24500 lineto
+0.34186 0.24500 lineto
+0.29500 0.29186 lineto
+0.29500 0.34157 lineto
+0.34186 0.36500 lineto
+0.40814 0.36500 lineto
+0.45500 0.34157 lineto
+fill
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.12500 0.01968 c
+0.37500 0.12500 0.01968 c
+0.07500 0.32500 0.01968 c
+0.37500 0.32500 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.301961 0.301961 0.301961 setrgbcolor
+0.03500 0.08500 moveto
+0.11500 0.08500 lineto
+0.11500 0.16500 lineto
+0.03500 0.16500 lineto
+fill
+0.37500 0.12500 0.04000 c
+0.15500 0.30843 moveto
+0.10814 0.28500 lineto
+0.05843 0.28500 lineto
+0.03500 0.30843 lineto
+0.03500 0.34157 lineto
+0.05843 0.36500 lineto
+0.10814 0.36500 lineto
+0.15500 0.34157 lineto
+fill
+0.45500 0.29186 moveto
+0.40814 0.24500 lineto
+0.34186 0.24500 lineto
+0.29500 0.29186 lineto
+0.29500 0.34157 lineto
+0.34186 0.36500 lineto
+0.40814 0.36500 lineto
+0.45500 0.34157 lineto
+fill
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.12500 0.01968 c
+0.37500 0.12500 0.01968 c
+0.07500 0.32500 0.01968 c
+0.37500 0.32500 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+0.01000 setlinewidth
+0 0 0 setrgbcolor
+0.02500 0.07500 0.02500 0.17500 t
+0.42500 0.17500 0.02500 0.17500 t
+0.02500 0.07500 0.17500 0.07500 t
+0.02500 0.27500 0.02500 0.37500 t
+0.27500 0.27500 0.42500 0.27500 t
+0.42500 0.37500 0.02500 0.37500 t
+0.42500 0.37500 0.42500 0.27500 t
+0.02500 0.27500 0.17500 0.27500 t
+0.42500 0.17500 0.42500 0.07500 t
+0.27500 0.07500 0.42500 0.07500 t
+0 180 -0.05000 0.05000 0.22500 0.07500 0.200000 a
+0 180 -0.05000 0.05000 0.22500 0.27500 0.200000 a
+0.00700 setlinewidth
+0.07500 0.02500 0.07500 0.06000 t
+0.07500 0.06000 0.08000 0.06500 t
+0.08000 0.06500 0.09000 0.06500 t
+0.09000 0.06500 0.09500 0.06000 t
+0.09500 0.02500 0.09500 0.06000 t
+0.10700 0.03300 0.11500 0.02500 t
+0.11500 0.02500 0.11500 0.06500 t
+0.10700 0.06500 0.12200 0.06500 t
+0.07500 0.22500 0.07500 0.26000 t
+0.07500 0.26000 0.08000 0.26500 t
+0.08000 0.26500 0.09000 0.26500 t
+0.09000 0.26500 0.09500 0.26000 t
+0.09500 0.22500 0.09500 0.26000 t
+0.10700 0.23000 0.11200 0.22500 t
+0.11200 0.22500 0.12700 0.22500 t
+0.12700 0.22500 0.13200 0.23000 t
+0.13200 0.23000 0.13200 0.24000 t
+0.10700 0.26500 0.13200 0.24000 t
+0.10700 0.26500 0.13200 0.26500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.12500 0.01968 c
+0.37500 0.12500 0.01968 c
+0.07500 0.32500 0.01968 c
+0.37500 0.32500 0.01968 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/elem_pins.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottom.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: pins with different shapes, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD22C,0.0394*%
+%ADD21C,0.0800*%
+%ADD20C,0.0001*%
+G54D20*G36*
+X3500Y41500D02*X11500D01*
+Y33500D01*
+X3500D01*
+Y41500D01*
+G37*
+G54D21*X37500Y37500D03*
+G54D20*G36*
+X15500Y19157D02*X10814Y21500D01*
+X5843D01*
+X3500Y19157D01*
+Y15843D01*
+X5843Y13500D01*
+X10814D01*
+X15500Y15843D01*
+Y19157D01*
+G37*
+G36*
+X45500Y20814D02*X40814Y25500D01*
+X34186D01*
+X29500Y20814D01*
+Y15843D01*
+X34186Y13500D01*
+X40814D01*
+X45500Y15843D01*
+Y20814D01*
+G37*
+G54D22*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.bottommask.gbr	(revision 18980)
@@ -0,0 +1,41 @@
+G04 start of page 7 for group 11 layer_idx 10 *
+G04 Title: pins with different shapes, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD26C,0.0860*%
+%ADD25C,0.0001*%
+G54D25*G36*
+X3200Y41800D02*X11800D01*
+Y33200D01*
+X3200D01*
+Y41800D01*
+G37*
+G54D26*X37500Y37500D03*
+G54D25*G36*
+X16100Y19281D02*X11062Y21800D01*
+X5719D01*
+X3200Y19281D01*
+Y15719D01*
+X5719Y13200D01*
+X11062D01*
+X16100Y15719D01*
+Y19281D01*
+G37*
+G36*
+X46100Y21062D02*X41062Y26100D01*
+X33938D01*
+X28900Y21062D01*
+Y15719D01*
+X33938Y13200D01*
+X41062D01*
+X46100Y15719D01*
+Y21062D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.fab.gbr	(revision 18980)
@@ -0,0 +1,1863 @@
+G04 start of page 10 for group -1 layer_idx 16777221 *
+G04 Title: pins with different shapes, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD33C,0.0100*%
+%ADD32C,0.0001*%
+%ADD31C,0.0060*%
+%ADD30C,0.0080*%
+G54D30*X7500Y37500D02*Y35900D01*
+Y37500D02*X8887Y38300D01*
+X7500Y37500D02*X6113Y38300D01*
+X37500Y37500D02*Y35900D01*
+Y37500D02*X38887Y38300D01*
+X37500Y37500D02*X36113Y38300D01*
+X7500Y17500D02*Y15900D01*
+Y17500D02*X8887Y18300D01*
+X7500Y17500D02*X6113Y18300D01*
+X37500Y17500D02*Y15900D01*
+Y17500D02*X38887Y18300D01*
+X37500Y17500D02*X36113Y18300D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D31*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y106250D02*X101000Y110000D01*
+X98000Y106250D02*X101750D01*
+X101000Y110000D02*Y104000D01*
+G54D32*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D31*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66750Y104000D02*X69000Y107000D01*
+Y109250D02*Y107000D01*
+X68250Y110000D02*X69000Y109250D01*
+X66750Y110000D02*X68250D01*
+X66000Y109250D02*X66750Y110000D01*
+X66000Y109250D02*Y107750D01*
+X66750Y107000D01*
+X69000D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D32*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D31*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D32*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D31*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D32*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D31*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D32*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D31*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D32*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D31*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D32*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D31*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D32*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D31*X268050Y136250D02*X271050Y140000D01*
+X268050Y136250D02*X271800D01*
+X271050Y140000D02*Y134000D01*
+G54D32*G36*
+X276300Y140000D02*Y134000D01*
+X280800D01*
+Y140000D01*
+X276300D01*
+G37*
+G36*
+X281700D02*Y134000D01*
+X286200D01*
+Y140000D01*
+X281700D01*
+G37*
+G36*
+X287100D02*Y134000D01*
+X291600D01*
+Y140000D01*
+X287100D01*
+G37*
+G36*
+X292500D02*Y134000D01*
+X297000D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297900D02*Y134000D01*
+X302400D01*
+Y140000D01*
+X297900D01*
+G37*
+G36*
+X306000D02*Y134000D01*
+X310500D01*
+Y140000D01*
+X306000D01*
+G37*
+G36*
+X311400D02*Y134000D01*
+X315900D01*
+Y140000D01*
+X311400D01*
+G37*
+G36*
+X316800D02*Y134000D01*
+X321300D01*
+Y140000D01*
+X316800D01*
+G37*
+G36*
+X322200D02*Y134000D01*
+X326700D01*
+Y140000D01*
+X322200D01*
+G37*
+G36*
+X327600D02*Y134000D01*
+X332100D01*
+Y140000D01*
+X327600D01*
+G37*
+G54D33*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D31*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D32*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D31*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D32*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D31*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D32*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D31*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D32*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D31*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D32*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D31*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D32*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D31*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D32*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D31*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D32*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D31*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D32*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D31*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D32*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D31*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D32*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G54D31*X377600D02*Y104000D01*
+Y110000D02*X380600D01*
+X377600Y107300D02*X379850D01*
+G54D32*G36*
+X382400Y110000D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X393200D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X398600D02*Y104000D01*
+X403100D01*
+Y110000D01*
+X398600D01*
+G37*
+G36*
+X404000D02*Y104000D01*
+X408500D01*
+Y110000D01*
+X404000D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G54D31*X439850D02*Y104000D01*
+X441800Y110000D02*X442850Y108950D01*
+Y105050D01*
+X441800Y104000D02*X442850Y105050D01*
+X439100Y104000D02*X441800D01*
+X439100Y110000D02*X441800D01*
+G54D32*G36*
+X444650D02*Y104000D01*
+X449150D01*
+Y110000D01*
+X444650D01*
+G37*
+G36*
+X450050D02*Y104000D01*
+X454550D01*
+Y110000D01*
+X450050D01*
+G37*
+G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group5.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: pins with different shapes, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD16C,0.0394*%
+%ADD15C,0.0800*%
+%ADD14C,0.0001*%
+G54D14*G36*
+X3500Y41500D02*X11500D01*
+Y33500D01*
+X3500D01*
+Y41500D01*
+G37*
+G54D15*X37500Y37500D03*
+G54D14*G36*
+X15500Y19157D02*X10814Y21500D01*
+X5843D01*
+X3500Y19157D01*
+Y15843D01*
+X5843Y13500D01*
+X10814D01*
+X15500Y15843D01*
+Y19157D01*
+G37*
+G36*
+X45500Y20814D02*X40814Y25500D01*
+X34186D01*
+X29500Y20814D01*
+Y15843D01*
+X34186Y13500D01*
+X40814D01*
+X45500Y15843D01*
+Y20814D01*
+G37*
+G54D16*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.group7.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: pins with different shapes, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD19C,0.0394*%
+%ADD18C,0.0800*%
+%ADD17C,0.0001*%
+G54D17*G36*
+X3500Y41500D02*X11500D01*
+Y33500D01*
+X3500D01*
+Y41500D01*
+G37*
+G54D18*X37500Y37500D03*
+G54D17*G36*
+X15500Y19157D02*X10814Y21500D01*
+X5843D01*
+X3500Y19157D01*
+Y15843D01*
+X5843Y13500D01*
+X10814D01*
+X15500Y15843D01*
+Y19157D01*
+G37*
+G36*
+X45500Y20814D02*X40814Y25500D01*
+X34186D01*
+X29500Y20814D01*
+Y15843D01*
+X34186Y13500D01*
+X40814D01*
+X45500Y15843D01*
+Y20814D01*
+G37*
+G54D19*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,10 @@
+M48
+INCH
+T29C0.039
+%
+T29
+X000750Y003750
+X003750Y003750
+X000750Y001750
+X003750Y001750
+M30
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.top.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: pins with different shapes, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0394*%
+%ADD12C,0.0800*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X3500Y41500D02*X11500D01*
+Y33500D01*
+X3500D01*
+Y41500D01*
+G37*
+G54D12*X37500Y37500D03*
+G54D11*G36*
+X15500Y19157D02*X10814Y21500D01*
+X5843D01*
+X3500Y19157D01*
+Y15843D01*
+X5843Y13500D01*
+X10814D01*
+X15500Y15843D01*
+Y19157D01*
+G37*
+G36*
+X45500Y20814D02*X40814Y25500D01*
+X34186D01*
+X29500Y20814D01*
+Y15843D01*
+X34186Y13500D01*
+X40814D01*
+X45500Y15843D01*
+Y20814D01*
+G37*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topmask.gbr	(revision 18980)
@@ -0,0 +1,41 @@
+G04 start of page 6 for group 2 layer_idx 9 *
+G04 Title: pins with different shapes, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD24C,0.0860*%
+%ADD23C,0.0001*%
+G54D23*G36*
+X3200Y41800D02*X11800D01*
+Y33200D01*
+X3200D01*
+Y41800D01*
+G37*
+G54D24*X37500Y37500D03*
+G54D23*G36*
+X16100Y19281D02*X11062Y21800D01*
+X5719D01*
+X3200Y19281D01*
+Y15719D01*
+X5719Y13200D01*
+X11062D01*
+X16100Y15719D01*
+Y19281D01*
+G37*
+G36*
+X46100Y21062D02*X41062Y26100D01*
+X33938D01*
+X28900Y21062D01*
+Y15719D01*
+X33938Y13200D01*
+X41062D01*
+X46100Y15719D01*
+Y21062D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.gbr/elem_pins.topsilk.gbr	(revision 18980)
@@ -0,0 +1,45 @@
+G04 start of page 8 for group 1 layer_idx 8 *
+G04 Title: pins with different shapes, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD28C,0.0070*%
+%ADD27C,0.0100*%
+G54D27*X2500Y42500D02*Y32500D01*
+X42500D02*X2500D01*
+Y42500D02*X17500D01*
+X2500Y22500D02*Y12500D01*
+X27500Y22500D02*X42500D01*
+Y12500D02*X2500D01*
+X42500D02*Y22500D01*
+X2500D02*X17500D01*
+X42500Y32500D02*Y42500D01*
+X27500D02*X42500D01*
+X17500D02*G75*G03X27500Y42500I5000J0D01*G01*
+X17500Y22500D02*G75*G03X27500Y22500I5000J0D01*G01*
+G54D28*X7500Y47500D02*Y44000D01*
+X8000Y43500D01*
+X9000D01*
+X9500Y44000D01*
+Y47500D02*Y44000D01*
+X10700Y46700D02*X11500Y47500D01*
+Y43500D01*
+X10700D02*X12200D01*
+X7500Y27500D02*Y24000D01*
+X8000Y23500D01*
+X9000D01*
+X9500Y24000D01*
+Y27500D02*Y24000D01*
+X10700Y27000D02*X11200Y27500D01*
+X12700D01*
+X13200Y27000D01*
+Y26000D01*
+X10700Y23500D02*X13200Y26000D01*
+X10700Y23500D02*X13200D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_pins.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/elem_pins.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   pins with different shapes
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317N/C              U1    -1    D0393PA00X+000750Y+003750X0800Y0800R000 S0      
+317N/C              U1    -2    D0393PA00X+003750Y+003750X0800Y0000R000 S0      
+317N/C              U2    -1    D0393PA00X+000750Y+001750X0800Y0800R000 S0      
+317N/C              U2    -2    D0393PA00X+003750Y+001750X0800Y0800R000 S0      
+999
Index: tags/2.0.1/tests/RTT/ref/elem_pins.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pins.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pins.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pins.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.png.text	(revision 18980)
@@ -0,0 +1,17 @@
+r6630
+
+U1
+6 x 6 pixel (5x5) distance from silk inside top corner to pin 1
+pin 1 dimensions 96 x 96 pixels (80x80)
+pin 2 97 pixel circle (80.808)
+pin 1 to pin 2 distance 264 pixels (303.333)
+pin 2 hole 47 pixels (39.167)
+
+U2
+pin 1 extremes 97 pixels (80.833) tall 145 wide (120.833)
+pin 2 extremes 145 pixels (120.833) tall 193 pixels (160.833) wide
+pin 1 to pin 2 distance 167 pixels (139.166)
+pin 1 to pin 2 vertical offset 0 pixels
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/elem_pins.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pins.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pins.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pins.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_pins.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_pins.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_pins.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.svg	(revision 18980)
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <polygon points="0.8890,2.1590 2.9210,2.1590 2.9210,4.1910 0.8890,4.1910 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="9.5250" cy="3.1750" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="3.9370,7.8342 2.7467,7.2390 1.4842,7.2390 0.8890,7.8342 0.8890,8.6758 1.4842,9.2710 2.7467,9.2710 3.9370,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <polygon points="11.5570,7.4133 10.3667,6.2230 8.6833,6.2230 7.4930,7.4133 7.4930,8.6758 8.6833,9.2710 10.3667,9.2710 11.5570,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="1.9050" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <polygon points="0.8890,2.1590 2.9210,2.1590 2.9210,4.1910 0.8890,4.1910 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="9.5250" cy="3.1750" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="3.9370,7.8342 2.7467,7.2390 1.4842,7.2390 0.8890,7.8342 0.8890,8.6758 1.4842,9.2710 2.7467,9.2710 3.9370,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <polygon points="11.5570,7.4133 10.3667,6.2230 8.6833,6.2230 7.4930,7.4133 7.4930,8.6758 8.6833,9.2710 10.3667,9.2710 11.5570,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="1.9050" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="0.8890,2.1590 2.9210,2.1590 2.9210,4.1910 0.8890,4.1910 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="9.5250" cy="3.1750" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="3.9370,7.8342 2.7467,7.2390 1.4842,7.2390 0.8890,7.8342 0.8890,8.6758 1.4842,9.2710 2.7467,9.2710 3.9370,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <polygon points="11.5570,7.4133 10.3667,6.2230 8.6833,6.2230 7.4930,7.4133 7.4930,8.6758 8.6833,9.2710 10.3667,9.2710 11.5570,8.6758 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="1.9050" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="0.8890,2.1590 2.9210,2.1590 2.9210,4.1910 0.8890,4.1910 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="9.5250" cy="3.1750" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <polygon points="3.9370,7.8342 2.7467,7.2390 1.4842,7.2390 0.8890,7.8342 0.8890,8.6758 1.4842,9.2710 2.7467,9.2710 3.9370,8.6758 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="11.5570,7.4133 10.3667,6.2230 8.6833,6.2230 7.4930,7.4133 7.4930,8.6758 8.6833,9.2710 10.3667,9.2710 11.5570,8.6758 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="1.9050" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="0.6350" y1="1.9050" x2="0.6350" y2="4.4450" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="10.7950" y1="4.4450" x2="0.6350" y2="4.4450" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="1.9050" x2="4.4450" y2="1.9050" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="6.9850" x2="0.6350" y2="9.5250" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.9850" y1="6.9850" x2="10.7950" y2="6.9850" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="10.7950" y1="9.5250" x2="0.6350" y2="9.5250" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="10.7950" y1="9.5250" x2="10.7950" y2="6.9850" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="6.9850" x2="4.4450" y2="6.9850" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="10.7950" y1="4.4450" x2="10.7950" y2="1.9050" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.9850" y1="1.9050" x2="10.7950" y2="1.9050" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <path d="M 6.98500000 1.90500000 A 1.2700 1.2700 0 0 1 4.4450 1.9050" stroke-width="0.2540" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <path d="M 6.98500000 6.98500000 A 1.2700 1.2700 0 0 1 4.4450 6.9850" stroke-width="0.2540" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <line x1="1.9050" y1="0.6350" x2="1.9050" y2="1.5240" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="1.5240" x2="2.0320" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="1.6510" x2="2.2860" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2860" y1="1.6510" x2="2.4130" y2="1.5240" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.4130" y1="0.6350" x2="2.4130" y2="1.5240" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7178" y1="0.8382" x2="2.9210" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.9210" y1="0.6350" x2="2.9210" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7178" y1="1.6510" x2="3.0988" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="5.7150" x2="1.9050" y2="6.6040" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="6.6040" x2="2.0320" y2="6.7310" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="6.7310" x2="2.2860" y2="6.7310" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2860" y1="6.7310" x2="2.4130" y2="6.6040" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.4130" y1="5.7150" x2="2.4130" y2="6.6040" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7178" y1="5.8420" x2="2.8448" y2="5.7150" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.8448" y1="5.7150" x2="3.2258" y2="5.7150" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.2258" y1="5.7150" x2="3.3528" y2="5.8420" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="5.8420" x2="3.3528" y2="6.0960" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7178" y1="6.7310" x2="3.3528" y2="6.0960" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7178" y1="6.7310" x2="3.3528" y2="6.7310" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="1.9050" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="3.1750" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/elem_pins.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_pins.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_pins.xy	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: pins with different shapes - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+U1,"dip(2)","2*300",225.00,375.00,0,top
+U2,"dip(2)","2*300",225.00,175.00,0,top
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: smd elements on both sides - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+2,"Standard SMT resistor, capacitor etc","1206",R1 R2 
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.dsn	(revision 18980)
@@ -0,0 +1,100 @@
+(pcb smd elements on both sides
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "R1" 5.715000 9.525000 front 0 (PN 0))
+    )
+    (component 27
+      (place "R2" 5.715000 3.810000 back 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" -1.499870 0.000000)
+      (pin Pstk_shape_8 "2" 1.499870 0.000000)
+    )
+    (image 27
+      (pin Pstk_shape_29 "1" 1.499870 0.000000)
+      (pin Pstk_shape_30 "2" -1.499870 0.000000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "3__top_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_29
+      (shape
+        (polygon "10__bottom_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_30
+      (shape
+        (polygon "10__bottom_copper" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.eps	(revision 18980)
@@ -0,0 +1,70 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: elem_sides_smd.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.14036 0.38740 moveto
+0.19154 0.38740 lineto
+0.19154 0.31260 lineto
+0.14036 0.31260 lineto
+fill
+0.25846 0.38740 moveto
+0.30964 0.38740 lineto
+0.30964 0.31260 lineto
+0.25846 0.31260 lineto
+fill
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.301961 0.301961 0.301961 setrgbcolor
+0.19154 0.08760 moveto
+0.14036 0.08760 lineto
+0.14036 0.16240 lineto
+0.19154 0.16240 lineto
+fill
+0.30964 0.08760 moveto
+0.25846 0.08760 lineto
+0.25846 0.16240 lineto
+0.30964 0.16240 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+0.00800 setlinewidth
+0 0 0 setrgbcolor
+0.20138 0.08760 0.24862 0.08760 t
+0.20138 0.16240 0.24862 0.16240 t
+0.00700 setlinewidth
+0.34350 0.09350 0.36350 0.09350 t
+0.36350 0.09350 0.36850 0.09850 t
+0.36850 0.09850 0.36850 0.10850 t
+0.36350 0.11350 0.36850 0.10850 t
+0.34850 0.11350 0.36350 0.11350 t
+0.34850 0.09350 0.34850 0.13350 t
+0.35650 0.11350 0.36850 0.13350 t
+0.38050 0.10150 0.38850 0.09350 t
+0.38850 0.09350 0.38850 0.13350 t
+0.38050 0.13350 0.39550 0.13350 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottom.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 3 for group 10 layer_idx 1 *
+G04 Title: smd elements on both sides, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD12C,0.0001*%
+G54D12*G36*
+X14036Y11260D02*X19154D01*
+Y18740D01*
+X14036D01*
+Y11260D01*
+G37*
+G36*
+X25846D02*X30964D01*
+Y18740D01*
+X25846D01*
+Y11260D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottommask.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 5 for group 11 layer_idx 10 *
+G04 Title: smd elements on both sides, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD14C,0.0001*%
+G54D14*G36*
+X13736Y10960D02*X19454D01*
+Y19040D01*
+X13736D01*
+Y10960D01*
+G37*
+G36*
+X25546D02*X31264D01*
+Y19040D01*
+X25546D01*
+Y10960D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottompaste.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 9 for group 13 layer_idx 12 *
+G04 Title: smd elements on both sides, bottom_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMPASTE*%
+%ADD20C,0.0001*%
+G54D20*G36*
+X14036Y11260D02*X19154D01*
+Y18740D01*
+X14036D01*
+Y11260D01*
+G37*
+G36*
+X25846D02*X30964D01*
+Y18740D01*
+X25846D01*
+Y11260D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottomsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottomsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.bottomsilk.gbr	(revision 18980)
@@ -0,0 +1,29 @@
+G04 start of page 7 for group 12 layer_idx 7 *
+G04 Title: smd elements on both sides, bottom_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMSILK*%
+%ADD18C,0.0070*%
+%ADD17C,0.0080*%
+G54D17*X20138Y11260D02*X24862D01*
+X20138Y18740D02*X24862D01*
+G54D18*X34350Y11850D02*X36350D01*
+X36850Y12350D01*
+Y13350D01*
+X36350Y13850D02*X36850Y13350D01*
+X34850Y13850D02*X36350D01*
+X34850Y11850D02*Y15850D01*
+X35650Y13850D02*X36850Y15850D01*
+X38050Y12350D02*X38550Y11850D01*
+X40050D01*
+X40550Y12350D01*
+Y13350D01*
+X38050Y15850D02*X40550Y13350D01*
+X38050Y15850D02*X40550D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.fab.gbr	(revision 18980)
@@ -0,0 +1,1789 @@
+G04 start of page 10 for group -1 layer_idx 16777221 *
+G04 Title: smd elements on both sides, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD23C,0.0100*%
+%ADD22C,0.0001*%
+%ADD21C,0.0060*%
+G54D21*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D22*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D21*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D22*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D21*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D22*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D21*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D22*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D21*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D22*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D21*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D22*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D23*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D21*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D22*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D21*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D22*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D21*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D22*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D21*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D22*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D21*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D22*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D21*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D22*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D21*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D22*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D21*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D22*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D21*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D22*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D21*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D22*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D21*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D22*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X253400D02*Y104000D01*
+X257900D01*
+Y110000D01*
+X253400D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X312800D02*Y104000D01*
+X317300D01*
+Y110000D01*
+X312800D01*
+G37*
+G36*
+X318200D02*Y104000D01*
+X322700D01*
+Y110000D01*
+X318200D01*
+G37*
+G36*
+X323600D02*Y104000D01*
+X328100D01*
+Y110000D01*
+X323600D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X342500D02*Y104000D01*
+X347000D01*
+Y110000D01*
+X342500D01*
+G37*
+G36*
+X347900D02*Y104000D01*
+X352400D01*
+Y110000D01*
+X347900D01*
+G37*
+G36*
+X353300D02*Y104000D01*
+X357800D01*
+Y110000D01*
+X353300D01*
+G37*
+G36*
+X358700D02*Y104000D01*
+X363200D01*
+Y110000D01*
+X358700D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G54D21*X374900D02*Y104000D01*
+Y110000D02*X377900D01*
+X374900Y107300D02*X377150D01*
+G54D22*G36*
+X379700Y110000D02*Y104000D01*
+X384200D01*
+Y110000D01*
+X379700D01*
+G37*
+G36*
+X385100D02*Y104000D01*
+X389600D01*
+Y110000D01*
+X385100D01*
+G37*
+G36*
+X390500D02*Y104000D01*
+X395000D01*
+Y110000D01*
+X390500D01*
+G37*
+G36*
+X395900D02*Y104000D01*
+X400400D01*
+Y110000D01*
+X395900D01*
+G37*
+G36*
+X401300D02*Y104000D01*
+X405800D01*
+Y110000D01*
+X401300D01*
+G37*
+G36*
+X406700D02*Y104000D01*
+X411200D01*
+Y110000D01*
+X406700D01*
+G37*
+G36*
+X412100D02*Y104000D01*
+X416600D01*
+Y110000D01*
+X412100D01*
+G37*
+G36*
+X417500D02*Y104000D01*
+X422000D01*
+Y110000D01*
+X417500D01*
+G37*
+G36*
+X422900D02*Y104000D01*
+X427400D01*
+Y110000D01*
+X422900D01*
+G37*
+G36*
+X428300D02*Y104000D01*
+X432800D01*
+Y110000D01*
+X428300D01*
+G37*
+G54D21*X437150D02*Y104000D01*
+X439100Y110000D02*X440150Y108950D01*
+Y105050D01*
+X439100Y104000D02*X440150Y105050D01*
+X436400Y104000D02*X439100D01*
+X436400Y110000D02*X439100D01*
+G54D22*G36*
+X441950D02*Y104000D01*
+X446450D01*
+Y110000D01*
+X441950D01*
+G37*
+G36*
+X447350D02*Y104000D01*
+X451850D01*
+Y110000D01*
+X447350D01*
+G37*
+G36*
+X452750D02*Y104000D01*
+X457250D01*
+Y110000D01*
+X452750D01*
+G37*
+G36*
+X458150D02*Y104000D01*
+X462650D01*
+Y110000D01*
+X458150D01*
+G37*
+G36*
+X463550D02*Y104000D01*
+X468050D01*
+Y110000D01*
+X463550D01*
+G37*
+G36*
+X468950D02*Y104000D01*
+X473450D01*
+Y110000D01*
+X468950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.top.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: smd elements on both sides, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X19154Y41240D02*X14036D01*
+Y33760D01*
+X19154D01*
+Y41240D01*
+G37*
+G36*
+X30964D02*X25846D01*
+Y33760D01*
+X30964D01*
+Y41240D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topmask.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 4 for group 2 layer_idx 9 *
+G04 Title: smd elements on both sides, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD13C,0.0001*%
+G54D13*G36*
+X19454Y41540D02*X13736D01*
+Y33460D01*
+X19454D01*
+Y41540D01*
+G37*
+G36*
+X31264D02*X25546D01*
+Y33460D01*
+X31264D01*
+Y41540D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.toppaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.toppaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.toppaste.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 8 for group 0 layer_idx 11 *
+G04 Title: smd elements on both sides, top_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPPASTE*%
+%ADD19C,0.0001*%
+G54D19*G36*
+X19154Y41240D02*X14036D01*
+Y33760D01*
+X19154D01*
+Y41240D01*
+G37*
+G36*
+X30964D02*X25846D01*
+Y33760D01*
+X30964D01*
+Y41240D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.gbr/elem_sides_smd.topsilk.gbr	(revision 18980)
@@ -0,0 +1,26 @@
+G04 start of page 6 for group 1 layer_idx 8 *
+G04 Title: smd elements on both sides, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD16C,0.0070*%
+%ADD15C,0.0080*%
+G54D15*X20138Y41240D02*X24862D01*
+X20138Y33760D02*X24862D01*
+G54D16*X34350Y40650D02*X36350D01*
+X36850Y40150D01*
+Y39150D01*
+X36350Y38650D02*X36850Y39150D01*
+X34850Y38650D02*X36350D01*
+X34850Y40650D02*Y36650D01*
+X35650Y38650D02*X36850Y36650D01*
+X38050Y39850D02*X38850Y40650D01*
+Y36650D01*
+X38050D02*X39550D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.nelma.em	(revision 18980)
@@ -0,0 +1,75 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   smd elements on both sides
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+327N/C              R1    -1          A01X+001659Y+003750X0511Y0748R000 S1      
+327N/C              R1    -2          A01X+002840Y+003750X0511Y0748R000 S1      
+327N/C              R2    -1          A02X+001659Y+001500X0511Y0748R000 S2      
+327N/C              R2    -2          A02X+002840Y+001500X0511Y0748R000 S2      
+999
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_smd.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.png.text	(revision 18980)
@@ -0,0 +1,10 @@
+R1
+pad1 61 x 89 pixels (50.833x74.167)
+pad2 61 x 89 pixels
+pad1 to pad2 81 pixels (67.5)
+
+R2 - on the bottom
+pad1 61 x 89 pixels 
+pad2 61 x 89 pixels
+
+(mils)
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_smd.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_smd.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.svg	(revision 18980)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="3.5651,9.8400 4.8651,9.8400 4.8651,7.9400 3.5651,7.9400 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <polygon points="6.5649,9.8400 7.8649,9.8400 7.8649,7.9400 6.5649,7.9400 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="4.8651,2.2250 3.5651,2.2250 3.5651,4.1250 4.8651,4.1250 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="7.8649,2.2250 6.5649,2.2250 6.5649,4.1250 7.8649,4.1250 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="5.1151" y1="2.2250" x2="6.3149" y2="2.2250" stroke-width="0.2032" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.1151" y1="4.1250" x2="6.3149" y2="4.1250" stroke-width="0.2032" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.7249" y1="2.3749" x2="9.2329" y2="2.3749" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.2329" y1="2.3749" x2="9.3599" y2="2.5019" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.3599" y1="2.5019" x2="9.3599" y2="2.7559" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.2329" y1="2.8829" x2="9.3599" y2="2.7559" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8519" y1="2.8829" x2="9.2329" y2="2.8829" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8519" y1="2.3749" x2="8.8519" y2="3.3909" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0551" y1="2.8829" x2="9.3599" y2="3.3909" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.6647" y1="2.5781" x2="9.8679" y2="2.3749" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.8679" y1="2.3749" x2="9.8679" y2="3.3909" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.6647" y1="3.3909" x2="10.0457" y2="3.3909" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/elem_sides_smd.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_smd.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_smd.xy	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: smd elements on both sides - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+R1,"Standard SMT resistor, capacitor etc","1206",225.00,375.00,0,top
+R2,"Standard SMT resistor, capacitor etc","1206",225.00,150.00,180,bottom
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thru-hole elements on both sides - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+2,"dip(2)","2*300",U1 U2 
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.dsn	(revision 18980)
@@ -0,0 +1,124 @@
+(pcb thru-hole elements on both sides
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "U1" 2.540000 8.890000 front 0 (PN 0))
+    )
+    (component 37
+      (place "U2" 2.540000 3.810000 back 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "2" 7.620000 0.000000)
+    )
+    (image 37
+      (pin Pstk_shape_39 "1" 0.000000 0.000000)
+      (pin Pstk_shape_40 "2" -7.620000 0.000000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "5__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "7__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "10__bottom_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_39
+      (shape
+        (polygon "3__top_copper" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "5__Intern" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "7__Intern" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "10__bottom_copper" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_40
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.eps	(revision 18980)
@@ -0,0 +1,136 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: elem_sides_trh.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.11000 moveto
+0.14000 0.11000 lineto
+0.14000 0.19000 lineto
+0.06000 0.19000 lineto
+fill
+0.40000 0.15000 0.04000 c
+0.06000 0.39000 moveto
+0.14000 0.39000 lineto
+0.14000 0.31000 lineto
+0.06000 0.31000 lineto
+fill
+0.40000 0.35000 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.15000 0.01968 c
+0.40000 0.15000 0.01968 c
+0.10000 0.35000 0.01968 c
+0.40000 0.35000 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.11000 moveto
+0.14000 0.11000 lineto
+0.14000 0.19000 lineto
+0.06000 0.19000 lineto
+fill
+0.40000 0.15000 0.04000 c
+0.06000 0.39000 moveto
+0.14000 0.39000 lineto
+0.14000 0.31000 lineto
+0.06000 0.31000 lineto
+fill
+0.40000 0.35000 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.15000 0.01968 c
+0.40000 0.15000 0.01968 c
+0.10000 0.35000 0.01968 c
+0.40000 0.35000 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.11000 moveto
+0.14000 0.11000 lineto
+0.14000 0.19000 lineto
+0.06000 0.19000 lineto
+fill
+0.40000 0.15000 0.04000 c
+0.06000 0.39000 moveto
+0.14000 0.39000 lineto
+0.14000 0.31000 lineto
+0.06000 0.31000 lineto
+fill
+0.40000 0.35000 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.15000 0.01968 c
+0.40000 0.15000 0.01968 c
+0.10000 0.35000 0.01968 c
+0.40000 0.35000 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.301961 0.301961 0.301961 setrgbcolor
+0.06000 0.11000 moveto
+0.14000 0.11000 lineto
+0.14000 0.19000 lineto
+0.06000 0.19000 lineto
+fill
+0.40000 0.15000 0.04000 c
+0.06000 0.39000 moveto
+0.14000 0.39000 lineto
+0.14000 0.31000 lineto
+0.06000 0.31000 lineto
+fill
+0.40000 0.35000 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.15000 0.01968 c
+0.40000 0.15000 0.01968 c
+0.10000 0.35000 0.01968 c
+0.40000 0.35000 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+0.01000 setlinewidth
+0 0 0 setrgbcolor
+0.05000 0.10000 0.05000 0.20000 t
+0.45000 0.20000 0.05000 0.20000 t
+0.45000 0.20000 0.45000 0.10000 t
+0.05000 0.10000 0.20000 0.10000 t
+0.30000 0.10000 0.45000 0.10000 t
+0 180 -0.05000 0.05000 0.25000 0.10000 0.200000 a
+0.00700 setlinewidth
+0.10000 0.05000 0.10000 0.08500 t
+0.10000 0.08500 0.10500 0.09000 t
+0.10500 0.09000 0.11500 0.09000 t
+0.11500 0.09000 0.12000 0.08500 t
+0.12000 0.05000 0.12000 0.08500 t
+0.13200 0.05800 0.14000 0.05000 t
+0.14000 0.05000 0.14000 0.09000 t
+0.13200 0.09000 0.14700 0.09000 t
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.15000 0.01968 c
+0.40000 0.15000 0.01968 c
+0.10000 0.35000 0.01968 c
+0.40000 0.35000 0.01968 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottom.gbr	(revision 18980)
@@ -0,0 +1,29 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: thru-hole elements on both sides, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD22C,0.0394*%
+%ADD21C,0.0800*%
+%ADD20C,0.0001*%
+G54D20*G36*
+X6000Y39000D02*X14000D01*
+Y31000D01*
+X6000D01*
+Y39000D01*
+G37*
+G54D21*X40000Y35000D03*
+G54D20*G36*
+X6000Y11000D02*X14000D01*
+Y19000D01*
+X6000D01*
+Y11000D01*
+G37*
+G54D21*X40000Y15000D03*
+G54D22*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottommask.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 7 for group 11 layer_idx 10 *
+G04 Title: thru-hole elements on both sides, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD26C,0.0860*%
+%ADD25C,0.0001*%
+G54D25*G36*
+X5700Y39300D02*X14300D01*
+Y30700D01*
+X5700D01*
+Y39300D01*
+G37*
+G54D26*X40000Y35000D03*
+G54D25*G36*
+X5700Y10700D02*X14300D01*
+Y19300D01*
+X5700D01*
+Y10700D01*
+G37*
+G54D26*X40000Y15000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottomsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottomsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.bottomsilk.gbr	(revision 18980)
@@ -0,0 +1,31 @@
+G04 start of page 9 for group 12 layer_idx 7 *
+G04 Title: thru-hole elements on both sides, bottom_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMSILK*%
+%ADD30C,0.0070*%
+%ADD29C,0.0100*%
+G54D29*X5000Y10000D02*Y20000D01*
+X45000D02*X5000D01*
+X45000D02*Y10000D01*
+X5000D02*X20000D01*
+X30000D02*X45000D01*
+X20000D02*G75*G02X30000Y10000I5000J0D01*G01*
+G54D30*X10000Y5000D02*Y8500D01*
+X10500Y9000D01*
+X11500D01*
+X12000Y8500D01*
+Y5000D02*Y8500D01*
+X13200Y5500D02*X13700Y5000D01*
+X15200D01*
+X15700Y5500D01*
+Y6500D01*
+X13200Y9000D02*X15700Y6500D01*
+X13200Y9000D02*X15700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.fab.gbr	(revision 18980)
@@ -0,0 +1,1893 @@
+G04 start of page 11 for group -1 layer_idx 16777221 *
+G04 Title: thru-hole elements on both sides, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD35C,0.0100*%
+%ADD34C,0.0001*%
+%ADD33C,0.0060*%
+%ADD32C,0.0080*%
+G54D32*X10000Y35000D02*Y33400D01*
+Y35000D02*X11387Y35800D01*
+X10000Y35000D02*X8613Y35800D01*
+X40000Y35000D02*Y33400D01*
+Y35000D02*X41387Y35800D01*
+X40000Y35000D02*X38613Y35800D01*
+X10000Y15000D02*Y13400D01*
+Y15000D02*X11387Y15800D01*
+X10000Y15000D02*X8613Y15800D01*
+X40000Y15000D02*Y13400D01*
+Y15000D02*X41387Y15800D01*
+X40000Y15000D02*X38613Y15800D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D33*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y106250D02*X101000Y110000D01*
+X98000Y106250D02*X101750D01*
+X101000Y110000D02*Y104000D01*
+G54D34*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D33*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66750Y104000D02*X69000Y107000D01*
+Y109250D02*Y107000D01*
+X68250Y110000D02*X69000Y109250D01*
+X66750Y110000D02*X68250D01*
+X66000Y109250D02*X66750Y110000D01*
+X66000Y109250D02*Y107750D01*
+X66750Y107000D01*
+X69000D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D34*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D33*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D34*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D33*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D34*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D33*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D34*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D33*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D34*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D33*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D34*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D33*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D34*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D33*X268050Y136250D02*X271050Y140000D01*
+X268050Y136250D02*X271800D01*
+X271050Y140000D02*Y134000D01*
+G54D34*G36*
+X276300Y140000D02*Y134000D01*
+X280800D01*
+Y140000D01*
+X276300D01*
+G37*
+G36*
+X281700D02*Y134000D01*
+X286200D01*
+Y140000D01*
+X281700D01*
+G37*
+G36*
+X287100D02*Y134000D01*
+X291600D01*
+Y140000D01*
+X287100D01*
+G37*
+G36*
+X292500D02*Y134000D01*
+X297000D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297900D02*Y134000D01*
+X302400D01*
+Y140000D01*
+X297900D01*
+G37*
+G36*
+X306000D02*Y134000D01*
+X310500D01*
+Y140000D01*
+X306000D01*
+G37*
+G36*
+X311400D02*Y134000D01*
+X315900D01*
+Y140000D01*
+X311400D01*
+G37*
+G36*
+X316800D02*Y134000D01*
+X321300D01*
+Y140000D01*
+X316800D01*
+G37*
+G36*
+X322200D02*Y134000D01*
+X326700D01*
+Y140000D01*
+X322200D01*
+G37*
+G36*
+X327600D02*Y134000D01*
+X332100D01*
+Y140000D01*
+X327600D01*
+G37*
+G54D35*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D33*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D34*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D33*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D34*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D33*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D34*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D33*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D34*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D33*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D34*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D33*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D34*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D33*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D34*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D33*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D34*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D33*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D34*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D33*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D34*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D33*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D34*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X296600D02*Y104000D01*
+X301100D01*
+Y110000D01*
+X296600D01*
+G37*
+G36*
+X302000D02*Y104000D01*
+X306500D01*
+Y110000D01*
+X302000D01*
+G37*
+G36*
+X307400D02*Y104000D01*
+X311900D01*
+Y110000D01*
+X307400D01*
+G37*
+G36*
+X312800D02*Y104000D01*
+X317300D01*
+Y110000D01*
+X312800D01*
+G37*
+G36*
+X318200D02*Y104000D01*
+X322700D01*
+Y110000D01*
+X318200D01*
+G37*
+G36*
+X323600D02*Y104000D01*
+X328100D01*
+Y110000D01*
+X323600D01*
+G37*
+G36*
+X331700D02*Y104000D01*
+X336200D01*
+Y110000D01*
+X331700D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X399200D02*Y104000D01*
+X403700D01*
+Y110000D01*
+X399200D01*
+G37*
+G54D33*X407300D02*Y104000D01*
+Y110000D02*X410300D01*
+X407300Y107300D02*X409550D01*
+G54D34*G36*
+X412100Y110000D02*Y104000D01*
+X416600D01*
+Y110000D01*
+X412100D01*
+G37*
+G36*
+X417500D02*Y104000D01*
+X422000D01*
+Y110000D01*
+X417500D01*
+G37*
+G36*
+X422900D02*Y104000D01*
+X427400D01*
+Y110000D01*
+X422900D01*
+G37*
+G36*
+X428300D02*Y104000D01*
+X432800D01*
+Y110000D01*
+X428300D01*
+G37*
+G36*
+X433700D02*Y104000D01*
+X438200D01*
+Y110000D01*
+X433700D01*
+G37*
+G36*
+X439100D02*Y104000D01*
+X443600D01*
+Y110000D01*
+X439100D01*
+G37*
+G36*
+X444500D02*Y104000D01*
+X449000D01*
+Y110000D01*
+X444500D01*
+G37*
+G36*
+X449900D02*Y104000D01*
+X454400D01*
+Y110000D01*
+X449900D01*
+G37*
+G36*
+X455300D02*Y104000D01*
+X459800D01*
+Y110000D01*
+X455300D01*
+G37*
+G36*
+X460700D02*Y104000D01*
+X465200D01*
+Y110000D01*
+X460700D01*
+G37*
+G54D33*X469550D02*Y104000D01*
+X471500Y110000D02*X472550Y108950D01*
+Y105050D01*
+X471500Y104000D02*X472550Y105050D01*
+X468800Y104000D02*X471500D01*
+X468800Y110000D02*X471500D01*
+G54D34*G36*
+X474350D02*Y104000D01*
+X478850D01*
+Y110000D01*
+X474350D01*
+G37*
+G36*
+X479750D02*Y104000D01*
+X484250D01*
+Y110000D01*
+X479750D01*
+G37*
+G36*
+X485150D02*Y104000D01*
+X489650D01*
+Y110000D01*
+X485150D01*
+G37*
+G36*
+X490550D02*Y104000D01*
+X495050D01*
+Y110000D01*
+X490550D01*
+G37*
+G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G36*
+X501350D02*Y104000D01*
+X505850D01*
+Y110000D01*
+X501350D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group5.gbr	(revision 18980)
@@ -0,0 +1,29 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: thru-hole elements on both sides, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD16C,0.0394*%
+%ADD15C,0.0800*%
+%ADD14C,0.0001*%
+G54D14*G36*
+X6000Y39000D02*X14000D01*
+Y31000D01*
+X6000D01*
+Y39000D01*
+G37*
+G54D15*X40000Y35000D03*
+G54D14*G36*
+X6000Y11000D02*X14000D01*
+Y19000D01*
+X6000D01*
+Y11000D01*
+G37*
+G54D15*X40000Y15000D03*
+G54D16*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.group7.gbr	(revision 18980)
@@ -0,0 +1,29 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: thru-hole elements on both sides, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD19C,0.0394*%
+%ADD18C,0.0800*%
+%ADD17C,0.0001*%
+G54D17*G36*
+X6000Y39000D02*X14000D01*
+Y31000D01*
+X6000D01*
+Y39000D01*
+G37*
+G54D18*X40000Y35000D03*
+G54D17*G36*
+X6000Y11000D02*X14000D01*
+Y19000D01*
+X6000D01*
+Y11000D01*
+G37*
+G54D18*X40000Y15000D03*
+G54D19*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,10 @@
+M48
+INCH
+T31C0.039
+%
+T31
+X001000Y003500
+X004000Y003500
+X001000Y001500
+X004000Y001500
+M30
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.top.gbr	(revision 18980)
@@ -0,0 +1,29 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: thru-hole elements on both sides, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0394*%
+%ADD12C,0.0800*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X6000Y39000D02*X14000D01*
+Y31000D01*
+X6000D01*
+Y39000D01*
+G37*
+G54D12*X40000Y35000D03*
+G54D11*G36*
+X6000Y11000D02*X14000D01*
+Y19000D01*
+X6000D01*
+Y11000D01*
+G37*
+G54D12*X40000Y15000D03*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topmask.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 6 for group 2 layer_idx 9 *
+G04 Title: thru-hole elements on both sides, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD24C,0.0860*%
+%ADD23C,0.0001*%
+G54D23*G36*
+X5700Y39300D02*X14300D01*
+Y30700D01*
+X5700D01*
+Y39300D01*
+G37*
+G54D24*X40000Y35000D03*
+G54D23*G36*
+X5700Y10700D02*X14300D01*
+Y19300D01*
+X5700D01*
+Y10700D01*
+G37*
+G54D24*X40000Y15000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.gbr/elem_sides_trh.topsilk.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 8 for group 1 layer_idx 8 *
+G04 Title: thru-hole elements on both sides, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD28C,0.0070*%
+%ADD27C,0.0100*%
+G54D27*X5000Y40000D02*Y30000D01*
+X45000D02*X5000D01*
+X45000D02*Y40000D01*
+X5000D02*X20000D01*
+X30000D02*X45000D01*
+X20000D02*G75*G03X30000Y40000I5000J0D01*G01*
+G54D28*X10000Y45000D02*Y41500D01*
+X10500Y41000D01*
+X11500D01*
+X12000Y41500D01*
+Y45000D02*Y41500D01*
+X13200Y44200D02*X14000Y45000D01*
+Y41000D01*
+X13200D02*X14700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   thru-hole elements on both sides
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317N/C              U1    -1    D0393PA00X+001000Y+003500X0800Y0800R000 S0      
+317N/C              U1    -2    D0393PA00X+004000Y+003500X0800Y0000R000 S0      
+317N/C              U2    -1    D0393PA00X+001000Y+001500X0800Y0800R000 S0      
+317N/C              U2    -2    D0393PA00X+004000Y+001500X0800Y0000R000 S0      
+999
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_trh.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.png.text	(revision 18980)
@@ -0,0 +1,17 @@
+r6630
+
+U1
+6 x 6 pixel (5x5) distance from silk inside top corner to pin 1
+pin 1 dimensions 96 x 96 pixels (80x80)
+pin 2 97 pixel diameter circle (80.833)
+pin 1 to pin 2 distance 264 pixels (220)
+
+U2
+pin 1 is 144 pixels (120) down from U1 Pin 1
+pin 1 is 96 x 96 pixels (80x80)
+pin 2 is an 97 pixel circle (80.833)
+pin 1 to pin 2 distance 264 pixels (220)
+
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_trh.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/elem_sides_trh.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.svg	(revision 18980)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <polygon points="1.5240,2.7940 3.5560,2.7940 3.5560,4.8260 1.5240,4.8260 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="3.8100" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="1.5240,9.9060 3.5560,9.9060 3.5560,7.8740 1.5240,7.8740 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="8.8900" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <polygon points="1.5240,2.7940 3.5560,2.7940 3.5560,4.8260 1.5240,4.8260 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="3.8100" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="1.5240,9.9060 3.5560,9.9060 3.5560,7.8740 1.5240,7.8740 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="8.8900" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="1.5240,2.7940 3.5560,2.7940 3.5560,4.8260 1.5240,4.8260 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="3.8100" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <polygon points="1.5240,9.9060 3.5560,9.9060 3.5560,7.8740 1.5240,7.8740 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="8.8900" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="1.5240,2.7940 3.5560,2.7940 3.5560,4.8260 1.5240,4.8260 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="10.1600" cy="3.8100" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <polygon points="1.5240,9.9060 3.5560,9.9060 3.5560,7.8740 1.5240,7.8740 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="10.1600" cy="8.8900" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.5400" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="1.2700" y1="2.5400" x2="1.2700" y2="5.0800" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="5.0800" x2="1.2700" y2="5.0800" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="5.0800" x2="11.4300" y2="2.5400" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="2.5400" x2="5.0800" y2="2.5400" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="2.5400" x2="11.4300" y2="2.5400" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <path d="M 7.62000000 2.54000000 A 1.2700 1.2700 0 0 1 5.0800 2.5400" stroke-width="0.2540" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <line x1="2.5400" y1="1.2700" x2="2.5400" y2="2.1590" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.5400" y1="2.1590" x2="2.6670" y2="2.2860" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6670" y1="2.2860" x2="2.9210" y2="2.2860" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.9210" y1="2.2860" x2="3.0480" y2="2.1590" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.0480" y1="1.2700" x2="3.0480" y2="2.1590" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="1.4732" x2="3.5560" y2="1.2700" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="1.2700" x2="3.5560" y2="2.2860" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="2.2860" x2="3.7338" y2="2.2860" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.5400" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="3.8100" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="8.8900" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/elem_sides_trh.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/elem_sides_trh.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/elem_sides_trh.xy	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thru-hole elements on both sides - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+U1,"dip(2)","2*300",250.00,350.00,0,top
+U2,"dip(2)","2*300",250.00,150.00,180,bottom
Index: tags/2.0.1/tests/RTT/ref/layer_copper.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: one line per each type of copper layer - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_copper.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.dsn	(revision 18980)
@@ -0,0 +1,56 @@
+(pcb one line per each type of copper layer
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.254000 1.270000 10.795000 1.270000 3.810000)
+            (type protect))
+        (wire (path 5__Intern 0.254000 2.540000 8.890000 8.255000 3.175000)
+            (type protect))
+        (wire (path 10__bottom_copper 0.254000 1.905000 10.795000 10.160000 10.795000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/layer_copper.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.eps	(revision 18980)
@@ -0,0 +1,39 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: layer_copper.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.227451 0.372549 0.803922 setrgbcolor
+0.07500 0.07500 0.40000 0.07500 t
+% Layer group5 group 5 drill 0 mask 0
+0.329412 0.545098 0.329412 setrgbcolor
+0.10000 0.15000 0.32500 0.37500 t
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.545098 0.137255 0.137255 setrgbcolor
+0.05000 0.07500 0.05000 0.35000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/layer_copper.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.fcd	(revision 18980)
@@ -0,0 +1,4 @@
+[FIDOCAD]
+PL 10 15 10 70 2 2
+PL 15 15 80 15 2 1
+PL 20 30 65 75 2 4
Index: tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.bottom.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 4 for group 10 layer_idx 1 *
+G04 Title: one line per each type of copper layer, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD13C,0.0100*%
+G54D13*X7500Y42500D02*X40000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.fab.gbr	(revision 18980)
@@ -0,0 +1,1843 @@
+G04 start of page 5 for group -1 layer_idx 16777221 *
+G04 Title: one line per each type of copper layer, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD16C,0.0100*%
+%ADD15C,0.0001*%
+%ADD14C,0.0060*%
+G54D14*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D15*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D14*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D15*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D14*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D15*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D14*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D15*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D14*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D15*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D14*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D15*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D16*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D14*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D15*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D14*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D15*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D14*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D15*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D14*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D15*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D14*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D15*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D14*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D15*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D14*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D15*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D14*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D15*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D14*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D15*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D14*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D15*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D14*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D15*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X253400D02*Y104000D01*
+X257900D01*
+Y110000D01*
+X253400D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X296600D02*Y104000D01*
+X301100D01*
+Y110000D01*
+X296600D01*
+G37*
+G36*
+X302000D02*Y104000D01*
+X306500D01*
+Y110000D01*
+X302000D01*
+G37*
+G36*
+X307400D02*Y104000D01*
+X311900D01*
+Y110000D01*
+X307400D01*
+G37*
+G36*
+X312800D02*Y104000D01*
+X317300D01*
+Y110000D01*
+X312800D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X331700D02*Y104000D01*
+X336200D01*
+Y110000D01*
+X331700D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X358700D02*Y104000D01*
+X363200D01*
+Y110000D01*
+X358700D01*
+G37*
+G36*
+X364100D02*Y104000D01*
+X368600D01*
+Y110000D01*
+X364100D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X393800D02*Y104000D01*
+X398300D01*
+Y110000D01*
+X393800D01*
+G37*
+G36*
+X399200D02*Y104000D01*
+X403700D01*
+Y110000D01*
+X399200D01*
+G37*
+G36*
+X404600D02*Y104000D01*
+X409100D01*
+Y110000D01*
+X404600D01*
+G37*
+G36*
+X410000D02*Y104000D01*
+X414500D01*
+Y110000D01*
+X410000D01*
+G37*
+G36*
+X415400D02*Y104000D01*
+X419900D01*
+Y110000D01*
+X415400D01*
+G37*
+G36*
+X423500D02*Y104000D01*
+X428000D01*
+Y110000D01*
+X423500D01*
+G37*
+G54D14*X431600D02*Y104000D01*
+Y110000D02*X434600D01*
+X431600Y107300D02*X433850D01*
+G54D15*G36*
+X436400Y110000D02*Y104000D01*
+X440900D01*
+Y110000D01*
+X436400D01*
+G37*
+G36*
+X441800D02*Y104000D01*
+X446300D01*
+Y110000D01*
+X441800D01*
+G37*
+G36*
+X447200D02*Y104000D01*
+X451700D01*
+Y110000D01*
+X447200D01*
+G37*
+G36*
+X452600D02*Y104000D01*
+X457100D01*
+Y110000D01*
+X452600D01*
+G37*
+G36*
+X458000D02*Y104000D01*
+X462500D01*
+Y110000D01*
+X458000D01*
+G37*
+G36*
+X463400D02*Y104000D01*
+X467900D01*
+Y110000D01*
+X463400D01*
+G37*
+G36*
+X468800D02*Y104000D01*
+X473300D01*
+Y110000D01*
+X468800D01*
+G37*
+G36*
+X474200D02*Y104000D01*
+X478700D01*
+Y110000D01*
+X474200D01*
+G37*
+G36*
+X479600D02*Y104000D01*
+X484100D01*
+Y110000D01*
+X479600D01*
+G37*
+G36*
+X485000D02*Y104000D01*
+X489500D01*
+Y110000D01*
+X485000D01*
+G37*
+G54D14*X493850D02*Y104000D01*
+X495800Y110000D02*X496850Y108950D01*
+Y105050D01*
+X495800Y104000D02*X496850Y105050D01*
+X493100Y104000D02*X495800D01*
+X493100Y110000D02*X495800D01*
+G54D15*G36*
+X498650D02*Y104000D01*
+X503150D01*
+Y110000D01*
+X498650D01*
+G37*
+G36*
+X504050D02*Y104000D01*
+X508550D01*
+Y110000D01*
+X504050D01*
+G37*
+G36*
+X509450D02*Y104000D01*
+X513950D01*
+Y110000D01*
+X509450D01*
+G37*
+G36*
+X514850D02*Y104000D01*
+X519350D01*
+Y110000D01*
+X514850D01*
+G37*
+G36*
+X520250D02*Y104000D01*
+X524750D01*
+Y110000D01*
+X520250D01*
+G37*
+G36*
+X525650D02*Y104000D01*
+X530150D01*
+Y110000D01*
+X525650D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.group5.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: one line per each type of copper layer, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD12C,0.0100*%
+G54D12*X10000Y35000D02*X32500Y12500D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.gbr/layer_copper.top.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: one line per each type of copper layer, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X5000Y42500D02*Y15000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_copper.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.nelma.em	(revision 18980)
@@ -0,0 +1,90 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer group-1 {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-13 {
+	height = 20
+	z-order = 13
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 14
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"group-1",
+		"substrate-13",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/layer_copper.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   one line per each type of copper layer
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/layer_copper.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_copper.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_copper.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_copper.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.png.text	(revision 18980)
@@ -0,0 +1,11 @@
+r6630
+
+3 lines each on a different layer
+
+highest point on red to highest point on green
+60 x 90 pixels (50x75)
+
+highest point on red to "nose" (left side) of blue
+24 x 6 pixels (20x5)
+
+(mils)
Index: tags/2.0.1/tests/RTT/ref/layer_copper.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_copper.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_copper.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_copper.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_copper.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_copper.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_copper.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.svg	(revision 18980)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <line x1="2.5400" y1="3.8100" x2="8.2550" y2="9.5250" stroke-width="0.2540" stroke="#548b54" stroke-linecap="round"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <line x1="1.9050" y1="1.9050" x2="10.1600" y2="1.9050" stroke-width="0.2540" stroke="#3a5fcd" stroke-linecap="round"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="1.2700" y1="1.9050" x2="1.2700" y2="8.8900" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/layer_copper.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_copper.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_copper.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: one line per each type of copper layer - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_outline.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: outline layer triangle - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_outline.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb outline layer triangle
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/layer_outline.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.eps	(revision 18980)
@@ -0,0 +1,38 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: layer_outline.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer outline group 9 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0 0.52549 0.545098 setrgbcolor
+0.07500 0.10000 0.07500 0.40000 t
+0.07500 0.40000 0.37500 0.40000 t
+0.37500 0.40000 0.07500 0.10000 t
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/layer_outline.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.fcd	(revision 18980)
@@ -0,0 +1,4 @@
+[FIDOCAD]
+PL 15 20 15 80 2 6
+PL 15 80 75 80 2 6
+PL 75 80 15 20 2 6
Index: tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.fab.gbr	(revision 18980)
@@ -0,0 +1,1145 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: outline layer triangle, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X7500Y40000D02*Y10000D01*
+X37500D01*
+X7500Y40000D01*
+G54D12*X12775Y-8000D02*X15775D01*
+X16525Y-7250D01*
+Y-5450D02*Y-7250D01*
+X15775Y-4700D02*X16525Y-5450D01*
+X13525Y-4700D02*X15775D01*
+X13525Y-2000D02*Y-8000D01*
+X12775Y-2000D02*X15775D01*
+X16525Y-2750D01*
+Y-3950D01*
+X15775Y-4700D02*X16525Y-3950D01*
+G54D13*G36*
+X18325Y-2000D02*Y-8000D01*
+X22825D01*
+Y-2000D01*
+X18325D01*
+G37*
+G36*
+X23725D02*Y-8000D01*
+X28225D01*
+Y-2000D01*
+X23725D01*
+G37*
+G36*
+X29125D02*Y-8000D01*
+X33625D01*
+Y-2000D01*
+X29125D01*
+G37*
+G36*
+X34525D02*Y-8000D01*
+X39025D01*
+Y-2000D01*
+X34525D01*
+G37*
+G36*
+X42625D02*Y-8000D01*
+X47125D01*
+Y-2000D01*
+X42625D01*
+G37*
+G36*
+X48025D02*Y-8000D01*
+X52525D01*
+Y-2000D01*
+X48025D01*
+G37*
+G36*
+X53425D02*Y-8000D01*
+X57925D01*
+Y-2000D01*
+X53425D01*
+G37*
+G36*
+X58825D02*Y-8000D01*
+X63325D01*
+Y-2000D01*
+X58825D01*
+G37*
+G36*
+X64225D02*Y-8000D01*
+X68725D01*
+Y-2000D01*
+X64225D01*
+G37*
+G36*
+X69625D02*Y-8000D01*
+X74125D01*
+Y-2000D01*
+X69625D01*
+G37*
+G36*
+X75025D02*Y-8000D01*
+X79525D01*
+Y-2000D01*
+X75025D01*
+G37*
+G36*
+X83125D02*Y-8000D01*
+X87625D01*
+Y-2000D01*
+X83125D01*
+G37*
+G36*
+X88525D02*Y-8000D01*
+X93025D01*
+Y-2000D01*
+X88525D01*
+G37*
+G36*
+X96625D02*Y-8000D01*
+X101125D01*
+Y-2000D01*
+X96625D01*
+G37*
+G36*
+X102025D02*Y-8000D01*
+X106525D01*
+Y-2000D01*
+X102025D01*
+G37*
+G36*
+X107425D02*Y-8000D01*
+X111925D01*
+Y-2000D01*
+X107425D01*
+G37*
+G36*
+X115525D02*Y-8000D01*
+X120025D01*
+Y-2000D01*
+X115525D01*
+G37*
+G36*
+X120925D02*Y-8000D01*
+X125425D01*
+Y-2000D01*
+X120925D01*
+G37*
+G36*
+X126325D02*Y-8000D01*
+X130825D01*
+Y-2000D01*
+X126325D01*
+G37*
+G36*
+X131725D02*Y-8000D01*
+X136225D01*
+Y-2000D01*
+X131725D01*
+G37*
+G36*
+X137125D02*Y-8000D01*
+X141625D01*
+Y-2000D01*
+X137125D01*
+G37*
+G36*
+X142525D02*Y-8000D01*
+X147025D01*
+Y-2000D01*
+X142525D01*
+G37*
+G36*
+X147925D02*Y-8000D01*
+X152425D01*
+Y-2000D01*
+X147925D01*
+G37*
+G36*
+X153325D02*Y-8000D01*
+X157825D01*
+Y-2000D01*
+X153325D01*
+G37*
+G36*
+X158725D02*Y-8000D01*
+X163225D01*
+Y-2000D01*
+X158725D01*
+G37*
+G36*
+X164125D02*Y-8000D01*
+X168625D01*
+Y-2000D01*
+X164125D01*
+G37*
+G36*
+X172225D02*Y-8000D01*
+X176725D01*
+Y-2000D01*
+X172225D01*
+G37*
+G36*
+X177625D02*Y-8000D01*
+X182125D01*
+Y-2000D01*
+X177625D01*
+G37*
+G36*
+X185725D02*Y-8000D01*
+X190225D01*
+Y-2000D01*
+X185725D01*
+G37*
+G36*
+X191125D02*Y-8000D01*
+X195625D01*
+Y-2000D01*
+X191125D01*
+G37*
+G36*
+X196525D02*Y-8000D01*
+X201025D01*
+Y-2000D01*
+X196525D01*
+G37*
+G36*
+X201925D02*Y-8000D01*
+X206425D01*
+Y-2000D01*
+X201925D01*
+G37*
+G36*
+X210025D02*Y-8000D01*
+X214525D01*
+Y-2000D01*
+X210025D01*
+G37*
+G36*
+X215425D02*Y-8000D01*
+X219925D01*
+Y-2000D01*
+X215425D01*
+G37*
+G36*
+X220825D02*Y-8000D01*
+X225325D01*
+Y-2000D01*
+X220825D01*
+G37*
+G36*
+X226225D02*Y-8000D01*
+X230725D01*
+Y-2000D01*
+X226225D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X296600D02*Y104000D01*
+X301100D01*
+Y110000D01*
+X296600D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X331700D02*Y104000D01*
+X336200D01*
+Y110000D01*
+X331700D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X342500D02*Y104000D01*
+X347000D01*
+Y110000D01*
+X342500D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G54D12*X358700D02*Y104000D01*
+Y110000D02*X361700D01*
+X358700Y107300D02*X360950D01*
+G54D13*G36*
+X363500Y110000D02*Y104000D01*
+X368000D01*
+Y110000D01*
+X363500D01*
+G37*
+G36*
+X368900D02*Y104000D01*
+X373400D01*
+Y110000D01*
+X368900D01*
+G37*
+G36*
+X374300D02*Y104000D01*
+X378800D01*
+Y110000D01*
+X374300D01*
+G37*
+G36*
+X379700D02*Y104000D01*
+X384200D01*
+Y110000D01*
+X379700D01*
+G37*
+G36*
+X385100D02*Y104000D01*
+X389600D01*
+Y110000D01*
+X385100D01*
+G37*
+G36*
+X390500D02*Y104000D01*
+X395000D01*
+Y110000D01*
+X390500D01*
+G37*
+G36*
+X395900D02*Y104000D01*
+X400400D01*
+Y110000D01*
+X395900D01*
+G37*
+G36*
+X401300D02*Y104000D01*
+X405800D01*
+Y110000D01*
+X401300D01*
+G37*
+G36*
+X406700D02*Y104000D01*
+X411200D01*
+Y110000D01*
+X406700D01*
+G37*
+G36*
+X412100D02*Y104000D01*
+X416600D01*
+Y110000D01*
+X412100D01*
+G37*
+G54D12*X420950D02*Y104000D01*
+X422900Y110000D02*X423950Y108950D01*
+Y105050D01*
+X422900Y104000D02*X423950Y105050D01*
+X420200Y104000D02*X422900D01*
+X420200Y110000D02*X422900D01*
+G54D13*G36*
+X425750D02*Y104000D01*
+X430250D01*
+Y110000D01*
+X425750D01*
+G37*
+G36*
+X431150D02*Y104000D01*
+X435650D01*
+Y110000D01*
+X431150D01*
+G37*
+G36*
+X436550D02*Y104000D01*
+X441050D01*
+Y110000D01*
+X436550D01*
+G37*
+G36*
+X441950D02*Y104000D01*
+X446450D01*
+Y110000D01*
+X441950D01*
+G37*
+G36*
+X447350D02*Y104000D01*
+X451850D01*
+Y110000D01*
+X447350D01*
+G37*
+G36*
+X452750D02*Y104000D01*
+X457250D01*
+Y110000D01*
+X452750D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.outline.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.outline.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.gbr/layer_outline.outline.gbr	(revision 18980)
@@ -0,0 +1,16 @@
+G04 start of page 2 for group 9 layer_idx 6 *
+G04 Title: outline layer triangle, global_outline *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNOUTLINE*%
+%ADD11C,0.0100*%
+G54D11*X7500Y40000D02*Y10000D01*
+X37500D01*
+X7500Y40000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_outline.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer outline {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"outline"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/layer_outline.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   outline layer triangle
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/layer_outline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_outline.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_outline.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_outline.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.png.text	(revision 18980)
@@ -0,0 +1,6 @@
+triangle
+base 372 x h 372 (pixels) (310 x 310 mil) measured to the outside of the line
+line thickness is 12  pixels (10mils)
+
+so the actual triangle dimensions are 300 x 300 mil
+
Index: tags/2.0.1/tests/RTT/ref/layer_outline.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_outline.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_outline.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_outline.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_outline.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_outline.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_outline.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <line x1="1.9050" y1="2.5400" x2="1.9050" y2="10.1600" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round"/>
+ <line x1="1.9050" y1="10.1600" x2="9.5250" y2="10.1600" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round"/>
+ <line x1="9.5250" y1="10.1600" x2="1.9050" y2="2.5400" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/layer_outline.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_outline.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_outline.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: outline layer triangle - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_silk.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: one line on each silk layer - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_silk.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb one line on each silk layer
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/layer_silk.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.eps	(revision 18980)
@@ -0,0 +1,35 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: layer_silk.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0 0 0 setrgbcolor
+0.05000 0.05000 0.05000 0.42500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/layer_silk.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 15 85 60 40 2 3
+PL 10 10 10 85 2 3
Index: tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.bottomsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.bottomsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.bottomsilk.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 3 for group 12 layer_idx 7 *
+G04 Title: one line on each silk layer, bottom_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMSILK*%
+%ADD12C,0.0100*%
+G54D12*X7500Y7500D02*X30000Y30000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.fab.gbr	(revision 18980)
@@ -0,0 +1,1789 @@
+G04 start of page 4 for group -1 layer_idx 16777221 *
+G04 Title: one line on each silk layer, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD15C,0.0100*%
+%ADD14C,0.0001*%
+%ADD13C,0.0060*%
+G54D13*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D14*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D13*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D14*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D13*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D14*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D13*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D14*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D13*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D14*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D13*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D14*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D15*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D13*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D14*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D13*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D14*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D13*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D14*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D13*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D14*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D13*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D14*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D13*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D14*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D13*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D14*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D13*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D14*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D13*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D14*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D13*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D14*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D13*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D14*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X253400D02*Y104000D01*
+X257900D01*
+Y110000D01*
+X253400D01*
+G37*
+G36*
+X258800D02*Y104000D01*
+X263300D01*
+Y110000D01*
+X258800D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X283100D02*Y104000D01*
+X287600D01*
+Y110000D01*
+X283100D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X296600D02*Y104000D01*
+X301100D01*
+Y110000D01*
+X296600D01*
+G37*
+G36*
+X302000D02*Y104000D01*
+X306500D01*
+Y110000D01*
+X302000D01*
+G37*
+G36*
+X307400D02*Y104000D01*
+X311900D01*
+Y110000D01*
+X307400D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X331700D02*Y104000D01*
+X336200D01*
+Y110000D01*
+X331700D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G54D13*X377600D02*Y104000D01*
+Y110000D02*X380600D01*
+X377600Y107300D02*X379850D01*
+G54D14*G36*
+X382400Y110000D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X393200D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X398600D02*Y104000D01*
+X403100D01*
+Y110000D01*
+X398600D01*
+G37*
+G36*
+X404000D02*Y104000D01*
+X408500D01*
+Y110000D01*
+X404000D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G54D13*X439850D02*Y104000D01*
+X441800Y110000D02*X442850Y108950D01*
+Y105050D01*
+X441800Y104000D02*X442850Y105050D01*
+X439100Y104000D02*X441800D01*
+X439100Y110000D02*X441800D01*
+G54D14*G36*
+X444650D02*Y104000D01*
+X449150D01*
+Y110000D01*
+X444650D01*
+G37*
+G36*
+X450050D02*Y104000D01*
+X454550D01*
+Y110000D01*
+X450050D01*
+G37*
+G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.gbr/layer_silk.topsilk.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 2 for group 1 layer_idx 8 *
+G04 Title: one line on each silk layer, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD11C,0.0100*%
+G54D11*X5000Y45000D02*Y7500D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_silk.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/layer_silk.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   one line on each silk layer
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/layer_silk.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_silk.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_silk.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_silk.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.png.text	(revision 18980)
@@ -0,0 +1,8 @@
+r6630
+
+line
+width 12 pixels (10)
+length 462 pixels (385)
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/layer_silk.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_silk.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_silk.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_silk.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_silk.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_silk.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_silk.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="1.2700" y1="1.2700" x2="1.2700" y2="10.7950" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/layer_silk.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_silk.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_silk.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: one line on each silk layer - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_spc.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: 
+# Title: space (and other dangerous characters) in layer name - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/layer_spc.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.dsn	(revision 18980)
@@ -0,0 +1,57 @@
+(pcb space (and other dangerous characters) in layer name
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "gEDA pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "component 1"
+      (type signal)
+    )
+    (layer "inner(1)"
+      (type signal)
+    )
+    (layer "inner/2"
+      (type signal)
+    )
+    (layer "out:line"
+      (type signal)
+    )
+    (layer "solder	1"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/layer_spc.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.eps	(revision 18980)
@@ -0,0 +1,32 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: layer_spc.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 11 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer group9 group 9 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 13 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/layer_spc.gbr/layer_spc.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.gbr/layer_spc.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.gbr/layer_spc.fab.gbr	(revision 18980)
@@ -0,0 +1,1908 @@
+G04 start of page 2 for group -1 layer_idx 16777221 *
+G04 Title: space (and other dangerous characters) in layer name, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For:  *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD13C,0.0100*%
+%ADD12C,0.0001*%
+%ADD11C,0.0060*%
+G54D11*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D12*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D11*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D12*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D11*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D12*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D11*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D12*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D11*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D12*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D11*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D12*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D13*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D11*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D12*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D11*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D12*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D11*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D12*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D11*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D12*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D11*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D12*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D11*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D12*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D11*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D12*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D11*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D12*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D11*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D12*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D11*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D12*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D11*X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D12*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X318200D02*Y104000D01*
+X322700D01*
+Y110000D01*
+X318200D01*
+G37*
+G36*
+X323600D02*Y104000D01*
+X328100D01*
+Y110000D01*
+X323600D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X396500D02*Y104000D01*
+X401000D01*
+Y110000D01*
+X396500D01*
+G37*
+G36*
+X401900D02*Y104000D01*
+X406400D01*
+Y110000D01*
+X401900D01*
+G37*
+G36*
+X407300D02*Y104000D01*
+X411800D01*
+Y110000D01*
+X407300D01*
+G37*
+G36*
+X412700D02*Y104000D01*
+X417200D01*
+Y110000D01*
+X412700D01*
+G37*
+G36*
+X418100D02*Y104000D01*
+X422600D01*
+Y110000D01*
+X418100D01*
+G37*
+G36*
+X423500D02*Y104000D01*
+X428000D01*
+Y110000D01*
+X423500D01*
+G37*
+G36*
+X431600D02*Y104000D01*
+X436100D01*
+Y110000D01*
+X431600D01*
+G37*
+G36*
+X437000D02*Y104000D01*
+X441500D01*
+Y110000D01*
+X437000D01*
+G37*
+G36*
+X445100D02*Y104000D01*
+X449600D01*
+Y110000D01*
+X445100D01*
+G37*
+G36*
+X450500D02*Y104000D01*
+X455000D01*
+Y110000D01*
+X450500D01*
+G37*
+G36*
+X455900D02*Y104000D01*
+X460400D01*
+Y110000D01*
+X455900D01*
+G37*
+G36*
+X461300D02*Y104000D01*
+X465800D01*
+Y110000D01*
+X461300D01*
+G37*
+G36*
+X466700D02*Y104000D01*
+X471200D01*
+Y110000D01*
+X466700D01*
+G37*
+G36*
+X474800D02*Y104000D01*
+X479300D01*
+Y110000D01*
+X474800D01*
+G37*
+G36*
+X480200D02*Y104000D01*
+X484700D01*
+Y110000D01*
+X480200D01*
+G37*
+G36*
+X485600D02*Y104000D01*
+X490100D01*
+Y110000D01*
+X485600D01*
+G37*
+G36*
+X491000D02*Y104000D01*
+X495500D01*
+Y110000D01*
+X491000D01*
+G37*
+G36*
+X499100D02*Y104000D01*
+X503600D01*
+Y110000D01*
+X499100D01*
+G37*
+G54D11*X507200D02*Y104000D01*
+Y110000D02*X510200D01*
+X507200Y107300D02*X509450D01*
+G54D12*G36*
+X512000Y110000D02*Y104000D01*
+X516500D01*
+Y110000D01*
+X512000D01*
+G37*
+G36*
+X517400D02*Y104000D01*
+X521900D01*
+Y110000D01*
+X517400D01*
+G37*
+G36*
+X522800D02*Y104000D01*
+X527300D01*
+Y110000D01*
+X522800D01*
+G37*
+G36*
+X528200D02*Y104000D01*
+X532700D01*
+Y110000D01*
+X528200D01*
+G37*
+G36*
+X533600D02*Y104000D01*
+X538100D01*
+Y110000D01*
+X533600D01*
+G37*
+G36*
+X539000D02*Y104000D01*
+X543500D01*
+Y110000D01*
+X539000D01*
+G37*
+G36*
+X544400D02*Y104000D01*
+X548900D01*
+Y110000D01*
+X544400D01*
+G37*
+G36*
+X549800D02*Y104000D01*
+X554300D01*
+Y110000D01*
+X549800D01*
+G37*
+G36*
+X555200D02*Y104000D01*
+X559700D01*
+Y110000D01*
+X555200D01*
+G37*
+G36*
+X560600D02*Y104000D01*
+X565100D01*
+Y110000D01*
+X560600D01*
+G37*
+G54D11*X569450D02*Y104000D01*
+X571400Y110000D02*X572450Y108950D01*
+Y105050D01*
+X571400Y104000D02*X572450Y105050D01*
+X568700Y104000D02*X571400D01*
+X568700Y110000D02*X571400D01*
+G54D12*G36*
+X574250D02*Y104000D01*
+X578750D01*
+Y110000D01*
+X574250D01*
+G37*
+G36*
+X579650D02*Y104000D01*
+X584150D01*
+Y110000D01*
+X579650D01*
+G37*
+G36*
+X585050D02*Y104000D01*
+X589550D01*
+Y110000D01*
+X585050D01*
+G37*
+G36*
+X590450D02*Y104000D01*
+X594950D01*
+Y110000D01*
+X590450D01*
+G37*
+G36*
+X595850D02*Y104000D01*
+X600350D01*
+Y110000D01*
+X595850D01*
+G37*
+G36*
+X601250D02*Y104000D01*
+X605750D01*
+Y110000D01*
+X601250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/layer_spc.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/layer_spc.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   space (and other dangerous characters) in layer name
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/layer_spc.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_spc.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_spc.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_spc.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.png.text	(revision 18980)
@@ -0,0 +1,4 @@
+empty page 600 x 600 pixels (500 x 500)
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/layer_spc.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_spc.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_spc.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_spc.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/layer_spc.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/layer_spc.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/layer_spc.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.svg	(revision 18980)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_group9">
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_11_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/layer_spc.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/layer_spc.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/layer_spc.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: 
+# Title: space (and other dangerous characters) in layer name - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Clear and no-clear lines - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.dsn	(revision 18980)
@@ -0,0 +1,58 @@
+(pcb Clear and no-clear lines
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 3.175000 6.350000 10.160000 6.350000)
+            (type protect))
+        (wire (path 3__top_copper 0.254000 6.350000 9.525000 6.350000 3.175000)
+            (type protect))
+        (wire (path 3__top_copper 0.508000 6.350000 6.350000 10.160000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.127000 6.350000 6.350000 3.810000 8.890000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.eps	(revision 18980)
@@ -0,0 +1,145 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_f_clear.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.26250 0.02500 moveto
+0.47500 0.02500 lineto
+0.47500 0.47500 lineto
+0.26250 0.47500 lineto
+0.26250 0.42033 lineto
+0.26457 0.41984 lineto
+0.27140 0.41701 lineto
+0.27771 0.41314 lineto
+0.28334 0.40834 lineto
+0.28814 0.40271 lineto
+0.29201 0.39640 lineto
+0.29484 0.38957 lineto
+0.29656 0.38238 lineto
+0.29700 0.37500 lineto
+0.29700 0.26950 lineto
+0.40000 0.26950 lineto
+0.40306 0.26932 lineto
+0.40604 0.26860 lineto
+0.40888 0.26743 lineto
+0.41150 0.26582 lineto
+0.41383 0.26383 lineto
+0.41582 0.26150 lineto
+0.41743 0.25888 lineto
+0.41860 0.25604 lineto
+0.41932 0.25306 lineto
+0.41956 0.25000 lineto
+0.41932 0.24694 lineto
+0.41860 0.24396 lineto
+0.41743 0.24112 lineto
+0.41582 0.23850 lineto
+0.41383 0.23617 lineto
+0.41150 0.23418 lineto
+0.40888 0.23257 lineto
+0.40604 0.23140 lineto
+0.40306 0.23068 lineto
+0.40000 0.23050 lineto
+0.29700 0.23050 lineto
+0.29700 0.12500 lineto
+0.29656 0.11762 lineto
+0.29484 0.11043 lineto
+0.29201 0.10360 lineto
+0.28814 0.09729 lineto
+0.28334 0.09166 lineto
+0.27771 0.08686 lineto
+0.27140 0.08299 lineto
+0.26457 0.08016 lineto
+0.26250 0.07967 lineto
+fill
+0.02500 0.02500 moveto
+0.26250 0.02500 lineto
+0.26250 0.07967 lineto
+0.25738 0.07844 lineto
+0.25000 0.07786 lineto
+0.24262 0.07844 lineto
+0.23543 0.08016 lineto
+0.22860 0.08299 lineto
+0.22229 0.08686 lineto
+0.21666 0.09166 lineto
+0.21186 0.09729 lineto
+0.20799 0.10360 lineto
+0.20516 0.11043 lineto
+0.20344 0.11762 lineto
+0.20300 0.12500 lineto
+0.20300 0.23050 lineto
+0.12500 0.23050 lineto
+0.12194 0.23068 lineto
+0.11896 0.23140 lineto
+0.11612 0.23257 lineto
+0.11350 0.23418 lineto
+0.11117 0.23617 lineto
+0.10918 0.23850 lineto
+0.10757 0.24112 lineto
+0.10640 0.24396 lineto
+0.10568 0.24694 lineto
+0.10544 0.25000 lineto
+0.10568 0.25306 lineto
+0.10640 0.25604 lineto
+0.10757 0.25888 lineto
+0.10918 0.26150 lineto
+0.11117 0.26383 lineto
+0.11350 0.26582 lineto
+0.11612 0.26743 lineto
+0.11896 0.26860 lineto
+0.12194 0.26932 lineto
+0.12500 0.26950 lineto
+0.20300 0.26950 lineto
+0.20300 0.37500 lineto
+0.20344 0.38238 lineto
+0.20516 0.38957 lineto
+0.20799 0.39640 lineto
+0.21186 0.40271 lineto
+0.21666 0.40834 lineto
+0.22229 0.41314 lineto
+0.22860 0.41701 lineto
+0.23543 0.41984 lineto
+0.24262 0.42156 lineto
+0.25000 0.42214 lineto
+0.25738 0.42156 lineto
+0.26250 0.42033 lineto
+0.26250 0.47500 lineto
+0.02500 0.47500 lineto
+fill
+0.01500 setlinewidth
+1 setlinecap
+0.12500 0.25000 0.40000 0.25000 t
+0.01000 setlinewidth
+0.25000 0.12500 0.25000 0.37500 t
+0.02000 setlinewidth
+0.25000 0.25000 0.40000 0.20000 t
+0.00500 setlinewidth
+0.25000 0.25000 0.15000 0.15000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.fcd	(revision 18980)
@@ -0,0 +1,6 @@
+[FIDOCAD]
+PL 25 50 80 50 3 2
+PL 50 25 50 75 2 2
+PL 50 50 80 40 4 2
+PL 50 50 30 30 1 2
+PP 5 5 95 5 95 95 5 95 5 5 2
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.fab.gbr	(revision 18980)
@@ -0,0 +1,1782 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Clear and no-clear lines, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD18C,0.0100*%
+%ADD17C,0.0001*%
+%ADD16C,0.0060*%
+G54D16*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D17*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D16*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D17*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D16*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D17*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D16*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D17*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D16*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D17*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D16*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D17*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D18*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D16*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D17*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D16*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D17*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D16*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D17*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D16*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D17*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D16*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D17*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D16*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D17*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D16*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D17*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D16*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D17*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D16*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D17*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D16*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D17*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D16*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D17*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D16*X235550Y104000D02*X237500D01*
+X234500Y105050D02*X235550Y104000D01*
+X234500Y108950D02*Y105050D01*
+Y108950D02*X235550Y110000D01*
+X237500D01*
+G54D17*G36*
+X239300D02*Y104000D01*
+X243800D01*
+Y110000D01*
+X239300D01*
+G37*
+G36*
+X244700D02*Y104000D01*
+X249200D01*
+Y110000D01*
+X244700D01*
+G37*
+G36*
+X250100D02*Y104000D01*
+X254600D01*
+Y110000D01*
+X250100D01*
+G37*
+G36*
+X255500D02*Y104000D01*
+X260000D01*
+Y110000D01*
+X255500D01*
+G37*
+G36*
+X263600D02*Y104000D01*
+X268100D01*
+Y110000D01*
+X263600D01*
+G37*
+G36*
+X269000D02*Y104000D01*
+X273500D01*
+Y110000D01*
+X269000D01*
+G37*
+G36*
+X274400D02*Y104000D01*
+X278900D01*
+Y110000D01*
+X274400D01*
+G37*
+G36*
+X282500D02*Y104000D01*
+X287000D01*
+Y110000D01*
+X282500D01*
+G37*
+G36*
+X287900D02*Y104000D01*
+X292400D01*
+Y110000D01*
+X287900D01*
+G37*
+G36*
+X293300D02*Y104000D01*
+X297800D01*
+Y110000D01*
+X293300D01*
+G37*
+G36*
+X298700D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X328400D02*Y104000D01*
+X332900D01*
+Y110000D01*
+X328400D01*
+G37*
+G36*
+X333800D02*Y104000D01*
+X338300D01*
+Y110000D01*
+X333800D01*
+G37*
+G36*
+X339200D02*Y104000D01*
+X343700D01*
+Y110000D01*
+X339200D01*
+G37*
+G36*
+X344600D02*Y104000D01*
+X349100D01*
+Y110000D01*
+X344600D01*
+G37*
+G36*
+X350000D02*Y104000D01*
+X354500D01*
+Y110000D01*
+X350000D01*
+G37*
+G36*
+X358100D02*Y104000D01*
+X362600D01*
+Y110000D01*
+X358100D01*
+G37*
+G54D16*X366200D02*Y104000D01*
+Y110000D02*X369200D01*
+X366200Y107300D02*X368450D01*
+G54D17*G36*
+X371000Y110000D02*Y104000D01*
+X375500D01*
+Y110000D01*
+X371000D01*
+G37*
+G36*
+X376400D02*Y104000D01*
+X380900D01*
+Y110000D01*
+X376400D01*
+G37*
+G36*
+X381800D02*Y104000D01*
+X386300D01*
+Y110000D01*
+X381800D01*
+G37*
+G36*
+X387200D02*Y104000D01*
+X391700D01*
+Y110000D01*
+X387200D01*
+G37*
+G36*
+X392600D02*Y104000D01*
+X397100D01*
+Y110000D01*
+X392600D01*
+G37*
+G36*
+X398000D02*Y104000D01*
+X402500D01*
+Y110000D01*
+X398000D01*
+G37*
+G36*
+X403400D02*Y104000D01*
+X407900D01*
+Y110000D01*
+X403400D01*
+G37*
+G36*
+X408800D02*Y104000D01*
+X413300D01*
+Y110000D01*
+X408800D01*
+G37*
+G36*
+X414200D02*Y104000D01*
+X418700D01*
+Y110000D01*
+X414200D01*
+G37*
+G36*
+X419600D02*Y104000D01*
+X424100D01*
+Y110000D01*
+X419600D01*
+G37*
+G54D16*X428450D02*Y104000D01*
+X430400Y110000D02*X431450Y108950D01*
+Y105050D01*
+X430400Y104000D02*X431450Y105050D01*
+X427700Y104000D02*X430400D01*
+X427700Y110000D02*X430400D01*
+G54D17*G36*
+X433250D02*Y104000D01*
+X437750D01*
+Y110000D01*
+X433250D01*
+G37*
+G36*
+X438650D02*Y104000D01*
+X443150D01*
+Y110000D01*
+X438650D01*
+G37*
+G36*
+X444050D02*Y104000D01*
+X448550D01*
+Y110000D01*
+X444050D01*
+G37*
+G36*
+X449450D02*Y104000D01*
+X453950D01*
+Y110000D01*
+X449450D01*
+G37*
+G36*
+X454850D02*Y104000D01*
+X459350D01*
+Y110000D01*
+X454850D01*
+G37*
+G36*
+X460250D02*Y104000D01*
+X464750D01*
+Y110000D01*
+X460250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.gbr/line_f_clear.top.gbr	(revision 18980)
@@ -0,0 +1,125 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Clear and no-clear lines, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD15C,0.0050*%
+%ADD14C,0.0200*%
+%ADD13C,0.0100*%
+%ADD12C,0.0150*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X26250Y47500D02*X47500D01*
+Y2500D01*
+X26250D01*
+Y7967D01*
+X26457Y8016D01*
+X27140Y8299D01*
+X27771Y8686D01*
+X28334Y9166D01*
+X28814Y9729D01*
+X29201Y10360D01*
+X29484Y11043D01*
+X29656Y11762D01*
+X29700Y12500D01*
+Y23050D01*
+X40000D01*
+X40306Y23068D01*
+X40604Y23140D01*
+X40888Y23257D01*
+X41150Y23418D01*
+X41383Y23617D01*
+X41582Y23850D01*
+X41743Y24112D01*
+X41860Y24396D01*
+X41932Y24694D01*
+X41956Y25000D01*
+X41932Y25306D01*
+X41860Y25604D01*
+X41743Y25888D01*
+X41582Y26150D01*
+X41383Y26383D01*
+X41150Y26582D01*
+X40888Y26743D01*
+X40604Y26860D01*
+X40306Y26932D01*
+X40000Y26950D01*
+X29700D01*
+Y37500D01*
+X29656Y38238D01*
+X29484Y38957D01*
+X29201Y39640D01*
+X28814Y40271D01*
+X28334Y40834D01*
+X27771Y41314D01*
+X27140Y41701D01*
+X26457Y41984D01*
+X26250Y42033D01*
+Y47500D01*
+G37*
+G36*
+X2500D02*X26250D01*
+Y42033D01*
+X25738Y42156D01*
+X25000Y42214D01*
+X24262Y42156D01*
+X23543Y41984D01*
+X22860Y41701D01*
+X22229Y41314D01*
+X21666Y40834D01*
+X21186Y40271D01*
+X20799Y39640D01*
+X20516Y38957D01*
+X20344Y38238D01*
+X20300Y37500D01*
+Y26950D01*
+X12500D01*
+X12194Y26932D01*
+X11896Y26860D01*
+X11612Y26743D01*
+X11350Y26582D01*
+X11117Y26383D01*
+X10918Y26150D01*
+X10757Y25888D01*
+X10640Y25604D01*
+X10568Y25306D01*
+X10544Y25000D01*
+X10568Y24694D01*
+X10640Y24396D01*
+X10757Y24112D01*
+X10918Y23850D01*
+X11117Y23617D01*
+X11350Y23418D01*
+X11612Y23257D01*
+X11896Y23140D01*
+X12194Y23068D01*
+X12500Y23050D01*
+X20300D01*
+Y12500D01*
+X20344Y11762D01*
+X20516Y11043D01*
+X20799Y10360D01*
+X21186Y9729D01*
+X21666Y9166D01*
+X22229Y8686D01*
+X22860Y8299D01*
+X23543Y8016D01*
+X24262Y7844D01*
+X25000Y7786D01*
+X25738Y7844D01*
+X26250Y7967D01*
+Y2500D01*
+X2500D01*
+Y47500D01*
+G37*
+G54D12*X12500Y25000D02*X40000D01*
+G54D13*X25000Y37500D02*Y12500D01*
+G54D14*Y25000D02*X40000Y30000D01*
+G54D15*X25000Y25000D02*X15000Y35000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Clear and no-clear lines
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_f_clear.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.png.text	(revision 18980)
@@ -0,0 +1,24 @@
+r6630
+
+rectangle
+width 541 pixels (450.833)
+height 541 pixels (450.833)
+
+veritcal line
+width 12 pixels (10)
+length 312 pixels (260)
+clearance 49/50 pixels (left/right) (40.833/41.667)
+
+horizontal line
+width 18 pixels (15)
+length 348 pixels (290)
+clearance 14/14 pixels (top/bottom) (11.666/12.5)
+
+left diangonal line
+45 degrees
+
+right diagonal line
+18 degrees
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_f_clear.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_f_clear.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.svg	(revision 18980)
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="6.6675,0.6350 12.0650,0.6350 12.0650,12.0650 6.6675,12.0650 6.6675,10.6765 6.7200,10.6639 6.8936,10.5920 7.0539,10.4938 7.1967,10.3717 7.3188,10.2289 7.4170,10.0686 7.4889,9.8950 7.5327,9.7123 7.5438,9.5250 7.5438,6.8453 10.1600,6.8453 10.2377,6.8407 10.3135,6.8225 10.3856,6.7927 10.4520,6.7519 10.5113,6.7013 10.5619,6.6420 10.6027,6.5756 10.6325,6.5035 10.6507,6.4277 10.6568,6.3500 10.6507,6.2723 10.6325,6.1965 10.6027,6.1244 10.5619,6.0580 10.5113,5.9987 10.4520,5.9481 10.3856,5.9073 10.3135,5.8775 10.2377,5.8593 10.1600,5.8547 7.5438,5.8547 7.5438,3.1750 7.5327,2.9877 7.4889,2.8050 7.4170,2.6314 7.3188,2.4711 7.1967,2.3283 7.0539,2.2062 6.8936,2.1080 6.7200,2.0361 6.6675,2.0235 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,0.6350 6.6675,0.6350 6.6675,2.0235 6.5373,1.9923 6.3500,1.9775 6.1627,1.9923 5.9800,2.0361 5.8064,2.1080 5.6461,2.2062 5.5033,2.3283 5.3812,2.4711 5.2830,2.6314 5.2111,2.8050 5.1673,2.9877 5.1562,3.1750 5.1562,5.8547 3.1750,5.8547 3.0973,5.8593 3.0215,5.8775 2.9494,5.9073 2.8830,5.9481 2.8237,5.9987 2.7731,6.0580 2.7323,6.1244 2.7025,6.1965 2.6843,6.2723 2.6782,6.3500 2.6843,6.4277 2.7025,6.5035 2.7323,6.5756 2.7731,6.6420 2.8237,6.7013 2.8830,6.7519 2.9494,6.7927 3.0215,6.8225 3.0973,6.8407 3.1750,6.8453 5.1562,6.8453 5.1562,9.5250 5.1673,9.7123 5.2111,9.8950 5.2830,10.0686 5.3812,10.2289 5.5033,10.3717 5.6461,10.4938 5.8064,10.5920 5.9800,10.6639 6.1627,10.7077 6.3500,10.7225 6.5373,10.7077 6.6675,10.6765 6.6675,12.0650 0.6350,12.0650 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <line x1="3.1750" y1="6.3500" x2="10.1600" y2="6.3500" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="3.1750" x2="6.3500" y2="9.5250" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="6.3500" x2="10.1600" y2="5.0800" stroke-width="0.5080" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="6.3500" x2="3.8100" y2="3.8100" stroke-width="0.1270" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_f_clear.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_f_clear.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_f_clear.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Clear and no-clear lines - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_normal.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal lines at different size and angle - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_normal.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.dsn	(revision 18980)
@@ -0,0 +1,58 @@
+(pcb Normal lines at different size and angle
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 3.175000 6.350000 10.160000 6.350000)
+            (type protect))
+        (wire (path 3__top_copper 0.254000 6.350000 9.525000 6.350000 3.175000)
+            (type protect))
+        (wire (path 3__top_copper 0.508000 6.350000 6.350000 10.160000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.127000 6.350000 6.350000 3.810000 8.890000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_normal.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.eps	(revision 18980)
@@ -0,0 +1,41 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_normal.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01500 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.12500 0.25000 0.40000 0.25000 t
+0.01000 setlinewidth
+0.25000 0.12500 0.25000 0.37500 t
+0.02000 setlinewidth
+0.25000 0.25000 0.40000 0.20000 t
+0.00500 setlinewidth
+0.25000 0.25000 0.15000 0.15000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_normal.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.fcd	(revision 18980)
@@ -0,0 +1,5 @@
+[FIDOCAD]
+PL 25 50 80 50 3 2
+PL 50 25 50 75 2 2
+PL 50 50 80 40 4 2
+PL 50 50 30 30 1 2
Index: tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.fab.gbr	(revision 18980)
@@ -0,0 +1,1858 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Normal lines at different size and angle, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD17C,0.0100*%
+%ADD16C,0.0001*%
+%ADD15C,0.0060*%
+G54D15*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D16*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D15*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D16*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D15*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D16*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D15*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D16*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D15*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D16*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D15*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D16*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D17*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D15*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D16*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D15*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D16*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D15*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D16*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D15*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D16*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D15*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D16*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D15*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D16*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D15*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D16*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D15*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D16*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D15*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D16*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D15*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D16*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D15*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D16*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D15*X234500D02*Y104000D01*
+Y110000D02*X238250Y104000D01*
+Y110000D02*Y104000D01*
+G54D16*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X256250D02*Y104000D01*
+X260750D01*
+Y110000D01*
+X256250D01*
+G37*
+G36*
+X261650D02*Y104000D01*
+X266150D01*
+Y110000D01*
+X261650D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X280550D02*Y104000D01*
+X285050D01*
+Y110000D01*
+X280550D01*
+G37*
+G36*
+X285950D02*Y104000D01*
+X290450D01*
+Y110000D01*
+X285950D01*
+G37*
+G36*
+X291350D02*Y104000D01*
+X295850D01*
+Y110000D01*
+X291350D01*
+G37*
+G36*
+X299450D02*Y104000D01*
+X303950D01*
+Y110000D01*
+X299450D01*
+G37*
+G36*
+X304850D02*Y104000D01*
+X309350D01*
+Y110000D01*
+X304850D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X323750D02*Y104000D01*
+X328250D01*
+Y110000D01*
+X323750D01*
+G37*
+G36*
+X329150D02*Y104000D01*
+X333650D01*
+Y110000D01*
+X329150D01*
+G37*
+G36*
+X334550D02*Y104000D01*
+X339050D01*
+Y110000D01*
+X334550D01*
+G37*
+G36*
+X339950D02*Y104000D01*
+X344450D01*
+Y110000D01*
+X339950D01*
+G37*
+G36*
+X345350D02*Y104000D01*
+X349850D01*
+Y110000D01*
+X345350D01*
+G37*
+G36*
+X350750D02*Y104000D01*
+X355250D01*
+Y110000D01*
+X350750D01*
+G37*
+G36*
+X356150D02*Y104000D01*
+X360650D01*
+Y110000D01*
+X356150D01*
+G37*
+G36*
+X364250D02*Y104000D01*
+X368750D01*
+Y110000D01*
+X364250D01*
+G37*
+G36*
+X369650D02*Y104000D01*
+X374150D01*
+Y110000D01*
+X369650D01*
+G37*
+G36*
+X375050D02*Y104000D01*
+X379550D01*
+Y110000D01*
+X375050D01*
+G37*
+G36*
+X380450D02*Y104000D01*
+X384950D01*
+Y110000D01*
+X380450D01*
+G37*
+G36*
+X388550D02*Y104000D01*
+X393050D01*
+Y110000D01*
+X388550D01*
+G37*
+G36*
+X393950D02*Y104000D01*
+X398450D01*
+Y110000D01*
+X393950D01*
+G37*
+G36*
+X399350D02*Y104000D01*
+X403850D01*
+Y110000D01*
+X399350D01*
+G37*
+G36*
+X407450D02*Y104000D01*
+X411950D01*
+Y110000D01*
+X407450D01*
+G37*
+G36*
+X412850D02*Y104000D01*
+X417350D01*
+Y110000D01*
+X412850D01*
+G37*
+G36*
+X418250D02*Y104000D01*
+X422750D01*
+Y110000D01*
+X418250D01*
+G37*
+G36*
+X423650D02*Y104000D01*
+X428150D01*
+Y110000D01*
+X423650D01*
+G37*
+G36*
+X429050D02*Y104000D01*
+X433550D01*
+Y110000D01*
+X429050D01*
+G37*
+G36*
+X437150D02*Y104000D01*
+X441650D01*
+Y110000D01*
+X437150D01*
+G37*
+G54D15*X445250D02*Y104000D01*
+Y110000D02*X448250D01*
+X445250Y107300D02*X447500D01*
+G54D16*G36*
+X450050Y110000D02*Y104000D01*
+X454550D01*
+Y110000D01*
+X450050D01*
+G37*
+G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+G36*
+X477050D02*Y104000D01*
+X481550D01*
+Y110000D01*
+X477050D01*
+G37*
+G36*
+X482450D02*Y104000D01*
+X486950D01*
+Y110000D01*
+X482450D01*
+G37*
+G36*
+X487850D02*Y104000D01*
+X492350D01*
+Y110000D01*
+X487850D01*
+G37*
+G36*
+X493250D02*Y104000D01*
+X497750D01*
+Y110000D01*
+X493250D01*
+G37*
+G36*
+X498650D02*Y104000D01*
+X503150D01*
+Y110000D01*
+X498650D01*
+G37*
+G54D15*X507500D02*Y104000D01*
+X509450Y110000D02*X510500Y108950D01*
+Y105050D01*
+X509450Y104000D02*X510500Y105050D01*
+X506750Y104000D02*X509450D01*
+X506750Y110000D02*X509450D01*
+G54D16*G36*
+X512300D02*Y104000D01*
+X516800D01*
+Y110000D01*
+X512300D01*
+G37*
+G36*
+X517700D02*Y104000D01*
+X522200D01*
+Y110000D01*
+X517700D01*
+G37*
+G36*
+X523100D02*Y104000D01*
+X527600D01*
+Y110000D01*
+X523100D01*
+G37*
+G36*
+X528500D02*Y104000D01*
+X533000D01*
+Y110000D01*
+X528500D01*
+G37*
+G36*
+X533900D02*Y104000D01*
+X538400D01*
+Y110000D01*
+X533900D01*
+G37*
+G36*
+X539300D02*Y104000D01*
+X543800D01*
+Y110000D01*
+X539300D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.gbr/line_normal.top.gbr	(revision 18980)
@@ -0,0 +1,20 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Normal lines at different size and angle, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD14C,0.0050*%
+%ADD13C,0.0200*%
+%ADD12C,0.0100*%
+%ADD11C,0.0150*%
+G54D11*X12500Y25000D02*X40000D01*
+G54D12*X25000Y37500D02*Y12500D01*
+G54D13*Y25000D02*X40000Y30000D01*
+G54D14*X25000Y25000D02*X15000Y35000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_normal.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_normal.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Normal lines at different size and angle
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_normal.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_normal.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_normal.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_normal.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.png.text	(revision 18980)
@@ -0,0 +1,13 @@
+horizontal line
+348 pixels (290)
+18 pixel thickness (15)
+
+vertical line
+312 pixels long (260)
+12 pixel thickness (10)
+
+fine diagonal line
+7.07 pixels (5.892)
+
+thick diagonal line
+unsure of readings
Index: tags/2.0.1/tests/RTT/ref/line_normal.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_normal.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_normal.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_normal.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_normal.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_normal.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_normal.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.svg	(revision 18980)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="3.1750" y1="6.3500" x2="10.1600" y2="6.3500" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="3.1750" x2="6.3500" y2="9.5250" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="6.3500" x2="10.1600" y2="5.0800" stroke-width="0.5080" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="6.3500" y1="6.3500" x2="3.8100" y2="3.8100" stroke-width="0.1270" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_normal.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_normal.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_normal.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal lines at different size and angle - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_offpage.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: A single line that extends beyond board boundary - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_offpage.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.dsn	(revision 18980)
@@ -0,0 +1,52 @@
+(pcb A single line that extends beyond board boundary
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.254000 2.540000 7.620000 15.240000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_offpage.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.eps	(revision 18980)
@@ -0,0 +1,35 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_offpage.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.10000 0.20000 0.60000 0.20000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_offpage.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.fcd	(revision 18980)
@@ -0,0 +1,2 @@
+[FIDOCAD]
+PL 20 40 120 40 2 2
Index: tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.fab.gbr	(revision 18980)
@@ -0,0 +1,1903 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: A single line that extends beyond board boundary, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500Y108500D02*Y104000D01*
+Y108500D02*X235550Y110000D01*
+X237200D01*
+X238250Y108500D01*
+Y104000D01*
+X234500Y107000D02*X238250D01*
+G54D13*G36*
+X242750Y110000D02*Y104000D01*
+X247250D01*
+Y110000D01*
+X242750D01*
+G37*
+G36*
+X248150D02*Y104000D01*
+X252650D01*
+Y110000D01*
+X248150D01*
+G37*
+G36*
+X253550D02*Y104000D01*
+X258050D01*
+Y110000D01*
+X253550D01*
+G37*
+G36*
+X258950D02*Y104000D01*
+X263450D01*
+Y110000D01*
+X258950D01*
+G37*
+G36*
+X264350D02*Y104000D01*
+X268850D01*
+Y110000D01*
+X264350D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X277850D02*Y104000D01*
+X282350D01*
+Y110000D01*
+X277850D01*
+G37*
+G36*
+X283250D02*Y104000D01*
+X287750D01*
+Y110000D01*
+X283250D01*
+G37*
+G36*
+X288650D02*Y104000D01*
+X293150D01*
+Y110000D01*
+X288650D01*
+G37*
+G36*
+X294050D02*Y104000D01*
+X298550D01*
+Y110000D01*
+X294050D01*
+G37*
+G36*
+X302150D02*Y104000D01*
+X306650D01*
+Y110000D01*
+X302150D01*
+G37*
+G36*
+X307550D02*Y104000D01*
+X312050D01*
+Y110000D01*
+X307550D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X326450D02*Y104000D01*
+X330950D01*
+Y110000D01*
+X326450D01*
+G37*
+G36*
+X331850D02*Y104000D01*
+X336350D01*
+Y110000D01*
+X331850D01*
+G37*
+G36*
+X337250D02*Y104000D01*
+X341750D01*
+Y110000D01*
+X337250D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G36*
+X358850D02*Y104000D01*
+X363350D01*
+Y110000D01*
+X358850D01*
+G37*
+G36*
+X366950D02*Y104000D01*
+X371450D01*
+Y110000D01*
+X366950D01*
+G37*
+G36*
+X372350D02*Y104000D01*
+X376850D01*
+Y110000D01*
+X372350D01*
+G37*
+G36*
+X377750D02*Y104000D01*
+X382250D01*
+Y110000D01*
+X377750D01*
+G37*
+G36*
+X383150D02*Y104000D01*
+X387650D01*
+Y110000D01*
+X383150D01*
+G37*
+G36*
+X388550D02*Y104000D01*
+X393050D01*
+Y110000D01*
+X388550D01*
+G37*
+G36*
+X393950D02*Y104000D01*
+X398450D01*
+Y110000D01*
+X393950D01*
+G37*
+G36*
+X402050D02*Y104000D01*
+X406550D01*
+Y110000D01*
+X402050D01*
+G37*
+G36*
+X407450D02*Y104000D01*
+X411950D01*
+Y110000D01*
+X407450D01*
+G37*
+G36*
+X412850D02*Y104000D01*
+X417350D01*
+Y110000D01*
+X412850D01*
+G37*
+G36*
+X418250D02*Y104000D01*
+X422750D01*
+Y110000D01*
+X418250D01*
+G37*
+G36*
+X423650D02*Y104000D01*
+X428150D01*
+Y110000D01*
+X423650D01*
+G37*
+G36*
+X431750D02*Y104000D01*
+X436250D01*
+Y110000D01*
+X431750D01*
+G37*
+G36*
+X437150D02*Y104000D01*
+X441650D01*
+Y110000D01*
+X437150D01*
+G37*
+G36*
+X442550D02*Y104000D01*
+X447050D01*
+Y110000D01*
+X442550D01*
+G37*
+G36*
+X447950D02*Y104000D01*
+X452450D01*
+Y110000D01*
+X447950D01*
+G37*
+G36*
+X453350D02*Y104000D01*
+X457850D01*
+Y110000D01*
+X453350D01*
+G37*
+G36*
+X458750D02*Y104000D01*
+X463250D01*
+Y110000D01*
+X458750D01*
+G37*
+G36*
+X464150D02*Y104000D01*
+X468650D01*
+Y110000D01*
+X464150D01*
+G37*
+G36*
+X469550D02*Y104000D01*
+X474050D01*
+Y110000D01*
+X469550D01*
+G37*
+G36*
+X477650D02*Y104000D01*
+X482150D01*
+Y110000D01*
+X477650D01*
+G37*
+G54D12*X485750D02*Y104000D01*
+Y110000D02*X488750D01*
+X485750Y107300D02*X488000D01*
+G54D13*G36*
+X490550Y110000D02*Y104000D01*
+X495050D01*
+Y110000D01*
+X490550D01*
+G37*
+G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G36*
+X501350D02*Y104000D01*
+X505850D01*
+Y110000D01*
+X501350D01*
+G37*
+G36*
+X506750D02*Y104000D01*
+X511250D01*
+Y110000D01*
+X506750D01*
+G37*
+G36*
+X512150D02*Y104000D01*
+X516650D01*
+Y110000D01*
+X512150D01*
+G37*
+G36*
+X517550D02*Y104000D01*
+X522050D01*
+Y110000D01*
+X517550D01*
+G37*
+G36*
+X522950D02*Y104000D01*
+X527450D01*
+Y110000D01*
+X522950D01*
+G37*
+G36*
+X528350D02*Y104000D01*
+X532850D01*
+Y110000D01*
+X528350D01*
+G37*
+G36*
+X533750D02*Y104000D01*
+X538250D01*
+Y110000D01*
+X533750D01*
+G37*
+G36*
+X539150D02*Y104000D01*
+X543650D01*
+Y110000D01*
+X539150D01*
+G37*
+G54D12*X548000D02*Y104000D01*
+X549950Y110000D02*X551000Y108950D01*
+Y105050D01*
+X549950Y104000D02*X551000Y105050D01*
+X547250Y104000D02*X549950D01*
+X547250Y110000D02*X549950D01*
+G54D13*G36*
+X552800D02*Y104000D01*
+X557300D01*
+Y110000D01*
+X552800D01*
+G37*
+G36*
+X558200D02*Y104000D01*
+X562700D01*
+Y110000D01*
+X558200D01*
+G37*
+G36*
+X563600D02*Y104000D01*
+X568100D01*
+Y110000D01*
+X563600D01*
+G37*
+G36*
+X569000D02*Y104000D01*
+X573500D01*
+Y110000D01*
+X569000D01*
+G37*
+G36*
+X574400D02*Y104000D01*
+X578900D01*
+Y110000D01*
+X574400D01*
+G37*
+G36*
+X579800D02*Y104000D01*
+X584300D01*
+Y110000D01*
+X579800D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.gbr/line_offpage.top.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: A single line that extends beyond board boundary, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0100*%
+G54D11*X10000Y30000D02*X60000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_offpage.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_offpage.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   A single line that extends beyond board boundary
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_offpage.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_offpage.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_offpage.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_offpage.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.png.text	(revision 18980)
@@ -0,0 +1,5 @@
+12 pixel line (10)
+486 pixel [guessing middle of outline] on the page (more off) (405) (this is a pain to measure in gimp because of the edge issues)
+480 pixels if you remove the outline wall thickness (400)
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/line_offpage.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_offpage.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_offpage.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_offpage.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_offpage.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_offpage.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_offpage.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="2.5400" y1="5.0800" x2="15.2400" y2="5.0800" stroke-width="0.2540" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_offpage.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_offpage.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_offpage.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: A single line that extends beyond board boundary - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Two lines partially overlapping - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb Two lines partially overlapping
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 6.350000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.381000 5.588000 7.620000 7.620000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.eps	(revision 18980)
@@ -0,0 +1,36 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_overlap1.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01500 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.20000 0.20000 0.25000 0.20000 t
+0.22000 0.20000 0.30000 0.20000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 40 40 50 40 3 2
+PL 44 40 60 40 3 2
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.fab.gbr	(revision 18980)
@@ -0,0 +1,1821 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Two lines partially overlapping, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500D02*X237500D01*
+X236000D02*Y104000D01*
+G54D13*G36*
+X239300Y110000D02*Y104000D01*
+X243800D01*
+Y110000D01*
+X239300D01*
+G37*
+G36*
+X244700D02*Y104000D01*
+X249200D01*
+Y110000D01*
+X244700D01*
+G37*
+G36*
+X252800D02*Y104000D01*
+X257300D01*
+Y110000D01*
+X252800D01*
+G37*
+G36*
+X258200D02*Y104000D01*
+X262700D01*
+Y110000D01*
+X258200D01*
+G37*
+G36*
+X263600D02*Y104000D01*
+X268100D01*
+Y110000D01*
+X263600D01*
+G37*
+G36*
+X269000D02*Y104000D01*
+X273500D01*
+Y110000D01*
+X269000D01*
+G37*
+G36*
+X274400D02*Y104000D01*
+X278900D01*
+Y110000D01*
+X274400D01*
+G37*
+G36*
+X282500D02*Y104000D01*
+X287000D01*
+Y110000D01*
+X282500D01*
+G37*
+G36*
+X287900D02*Y104000D01*
+X292400D01*
+Y110000D01*
+X287900D01*
+G37*
+G36*
+X293300D02*Y104000D01*
+X297800D01*
+Y110000D01*
+X293300D01*
+G37*
+G36*
+X298700D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X325700D02*Y104000D01*
+X330200D01*
+Y110000D01*
+X325700D01*
+G37*
+G36*
+X333800D02*Y104000D01*
+X338300D01*
+Y110000D01*
+X333800D01*
+G37*
+G36*
+X339200D02*Y104000D01*
+X343700D01*
+Y110000D01*
+X339200D01*
+G37*
+G36*
+X344600D02*Y104000D01*
+X349100D01*
+Y110000D01*
+X344600D01*
+G37*
+G36*
+X350000D02*Y104000D01*
+X354500D01*
+Y110000D01*
+X350000D01*
+G37*
+G36*
+X355400D02*Y104000D01*
+X359900D01*
+Y110000D01*
+X355400D01*
+G37*
+G36*
+X360800D02*Y104000D01*
+X365300D01*
+Y110000D01*
+X360800D01*
+G37*
+G36*
+X366200D02*Y104000D01*
+X370700D01*
+Y110000D01*
+X366200D01*
+G37*
+G36*
+X371600D02*Y104000D01*
+X376100D01*
+Y110000D01*
+X371600D01*
+G37*
+G36*
+X377000D02*Y104000D01*
+X381500D01*
+Y110000D01*
+X377000D01*
+G37*
+G36*
+X382400D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X395900D02*Y104000D01*
+X400400D01*
+Y110000D01*
+X395900D01*
+G37*
+G54D12*X404000D02*Y104000D01*
+Y110000D02*X407000D01*
+X404000Y107300D02*X406250D01*
+G54D13*G36*
+X408800Y110000D02*Y104000D01*
+X413300D01*
+Y110000D01*
+X408800D01*
+G37*
+G36*
+X414200D02*Y104000D01*
+X418700D01*
+Y110000D01*
+X414200D01*
+G37*
+G36*
+X419600D02*Y104000D01*
+X424100D01*
+Y110000D01*
+X419600D01*
+G37*
+G36*
+X425000D02*Y104000D01*
+X429500D01*
+Y110000D01*
+X425000D01*
+G37*
+G36*
+X430400D02*Y104000D01*
+X434900D01*
+Y110000D01*
+X430400D01*
+G37*
+G36*
+X435800D02*Y104000D01*
+X440300D01*
+Y110000D01*
+X435800D01*
+G37*
+G36*
+X441200D02*Y104000D01*
+X445700D01*
+Y110000D01*
+X441200D01*
+G37*
+G36*
+X446600D02*Y104000D01*
+X451100D01*
+Y110000D01*
+X446600D01*
+G37*
+G36*
+X452000D02*Y104000D01*
+X456500D01*
+Y110000D01*
+X452000D01*
+G37*
+G36*
+X457400D02*Y104000D01*
+X461900D01*
+Y110000D01*
+X457400D01*
+G37*
+G54D12*X466250D02*Y104000D01*
+X468200Y110000D02*X469250Y108950D01*
+Y105050D01*
+X468200Y104000D02*X469250Y105050D01*
+X465500Y104000D02*X468200D01*
+X465500Y110000D02*X468200D01*
+G54D13*G36*
+X471050D02*Y104000D01*
+X475550D01*
+Y110000D01*
+X471050D01*
+G37*
+G36*
+X476450D02*Y104000D01*
+X480950D01*
+Y110000D01*
+X476450D01*
+G37*
+G36*
+X481850D02*Y104000D01*
+X486350D01*
+Y110000D01*
+X481850D01*
+G37*
+G36*
+X487250D02*Y104000D01*
+X491750D01*
+Y110000D01*
+X487250D01*
+G37*
+G36*
+X492650D02*Y104000D01*
+X497150D01*
+Y110000D01*
+X492650D01*
+G37*
+G36*
+X498050D02*Y104000D01*
+X502550D01*
+Y110000D01*
+X498050D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.gbr/line_overlap1.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Two lines partially overlapping, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0150*%
+G54D11*X20000Y30000D02*X25000D01*
+X22000D02*X30000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Two lines partially overlapping
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.png.text	(revision 18980)
@@ -0,0 +1,8 @@
+r6630
+
+18 pixel width (15)
+138 pixel length (115)
+
+(it is actually 2 traces that should export as 1)
+
+(mil)
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap1.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap1.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.svg	(revision 18980)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="5.0800" y1="5.0800" x2="6.3500" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="5.5880" y1="5.0800" x2="7.6200" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_overlap1.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap1.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap1.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Two lines partially overlapping - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Two lines, one over the other, full cover - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb Two lines, one over the other, full cover
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.381000 5.588000 7.620000 7.620000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.eps	(revision 18980)
@@ -0,0 +1,36 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_overlap2.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01500 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.20000 0.20000 0.35000 0.20000 t
+0.22000 0.20000 0.30000 0.20000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 40 40 70 40 3 2
+PL 44 40 60 40 3 2
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.fab.gbr	(revision 18980)
@@ -0,0 +1,1857 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Two lines, one over the other, full cover, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500D02*X237500D01*
+X236000D02*Y104000D01*
+G54D13*G36*
+X239300Y110000D02*Y104000D01*
+X243800D01*
+Y110000D01*
+X239300D01*
+G37*
+G36*
+X244700D02*Y104000D01*
+X249200D01*
+Y110000D01*
+X244700D01*
+G37*
+G36*
+X252800D02*Y104000D01*
+X257300D01*
+Y110000D01*
+X252800D01*
+G37*
+G36*
+X258200D02*Y104000D01*
+X262700D01*
+Y110000D01*
+X258200D01*
+G37*
+G36*
+X263600D02*Y104000D01*
+X268100D01*
+Y110000D01*
+X263600D01*
+G37*
+G36*
+X269000D02*Y104000D01*
+X273500D01*
+Y110000D01*
+X269000D01*
+G37*
+G36*
+X274400D02*Y104000D01*
+X278900D01*
+Y110000D01*
+X274400D01*
+G37*
+G36*
+X279800D02*Y104000D01*
+X284300D01*
+Y110000D01*
+X279800D01*
+G37*
+G36*
+X287900D02*Y104000D01*
+X292400D01*
+Y110000D01*
+X287900D01*
+G37*
+G36*
+X293300D02*Y104000D01*
+X297800D01*
+Y110000D01*
+X293300D01*
+G37*
+G36*
+X298700D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X306800D02*Y104000D01*
+X311300D01*
+Y110000D01*
+X306800D01*
+G37*
+G36*
+X312200D02*Y104000D01*
+X316700D01*
+Y110000D01*
+X312200D01*
+G37*
+G36*
+X317600D02*Y104000D01*
+X322100D01*
+Y110000D01*
+X317600D01*
+G37*
+G36*
+X323000D02*Y104000D01*
+X327500D01*
+Y110000D01*
+X323000D01*
+G37*
+G36*
+X331100D02*Y104000D01*
+X335600D01*
+Y110000D01*
+X331100D01*
+G37*
+G36*
+X336500D02*Y104000D01*
+X341000D01*
+Y110000D01*
+X336500D01*
+G37*
+G36*
+X341900D02*Y104000D01*
+X346400D01*
+Y110000D01*
+X341900D01*
+G37*
+G36*
+X350000D02*Y104000D01*
+X354500D01*
+Y110000D01*
+X350000D01*
+G37*
+G36*
+X355400D02*Y104000D01*
+X359900D01*
+Y110000D01*
+X355400D01*
+G37*
+G36*
+X360800D02*Y104000D01*
+X365300D01*
+Y110000D01*
+X360800D01*
+G37*
+G36*
+X366200D02*Y104000D01*
+X370700D01*
+Y110000D01*
+X366200D01*
+G37*
+G36*
+X371600D02*Y104000D01*
+X376100D01*
+Y110000D01*
+X371600D01*
+G37*
+G36*
+X377000D02*Y104000D01*
+X381500D01*
+Y110000D01*
+X377000D01*
+G37*
+G36*
+X385100D02*Y104000D01*
+X389600D01*
+Y110000D01*
+X385100D01*
+G37*
+G36*
+X390500D02*Y104000D01*
+X395000D01*
+Y110000D01*
+X390500D01*
+G37*
+G36*
+X395900D02*Y104000D01*
+X400400D01*
+Y110000D01*
+X395900D01*
+G37*
+G36*
+X401300D02*Y104000D01*
+X405800D01*
+Y110000D01*
+X401300D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G36*
+X439100D02*Y104000D01*
+X443600D01*
+Y110000D01*
+X439100D01*
+G37*
+G54D12*X447200D02*Y104000D01*
+Y110000D02*X450200D01*
+X447200Y107300D02*X449450D01*
+G54D13*G36*
+X452000Y110000D02*Y104000D01*
+X456500D01*
+Y110000D01*
+X452000D01*
+G37*
+G36*
+X457400D02*Y104000D01*
+X461900D01*
+Y110000D01*
+X457400D01*
+G37*
+G36*
+X462800D02*Y104000D01*
+X467300D01*
+Y110000D01*
+X462800D01*
+G37*
+G36*
+X468200D02*Y104000D01*
+X472700D01*
+Y110000D01*
+X468200D01*
+G37*
+G36*
+X473600D02*Y104000D01*
+X478100D01*
+Y110000D01*
+X473600D01*
+G37*
+G36*
+X479000D02*Y104000D01*
+X483500D01*
+Y110000D01*
+X479000D01*
+G37*
+G36*
+X484400D02*Y104000D01*
+X488900D01*
+Y110000D01*
+X484400D01*
+G37*
+G36*
+X489800D02*Y104000D01*
+X494300D01*
+Y110000D01*
+X489800D01*
+G37*
+G36*
+X495200D02*Y104000D01*
+X499700D01*
+Y110000D01*
+X495200D01*
+G37*
+G36*
+X500600D02*Y104000D01*
+X505100D01*
+Y110000D01*
+X500600D01*
+G37*
+G54D12*X509450D02*Y104000D01*
+X511400Y110000D02*X512450Y108950D01*
+Y105050D01*
+X511400Y104000D02*X512450Y105050D01*
+X508700Y104000D02*X511400D01*
+X508700Y110000D02*X511400D01*
+G54D13*G36*
+X514250D02*Y104000D01*
+X518750D01*
+Y110000D01*
+X514250D01*
+G37*
+G36*
+X519650D02*Y104000D01*
+X524150D01*
+Y110000D01*
+X519650D01*
+G37*
+G36*
+X525050D02*Y104000D01*
+X529550D01*
+Y110000D01*
+X525050D01*
+G37*
+G36*
+X530450D02*Y104000D01*
+X534950D01*
+Y110000D01*
+X530450D01*
+G37*
+G36*
+X535850D02*Y104000D01*
+X540350D01*
+Y110000D01*
+X535850D01*
+G37*
+G36*
+X541250D02*Y104000D01*
+X545750D01*
+Y110000D01*
+X541250D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.gbr/line_overlap2.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Two lines, one over the other, full cover, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0150*%
+G54D11*X20000Y30000D02*X35000D01*
+X22000D02*X30000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Two lines, one over the other, full cover
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap2.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.png.text	(revision 18980)
@@ -0,0 +1,6 @@
+r6630
+
+18 pixel width (15)
+198 pixel length (165)
+
+(it is actually 3 traces that should export as 1)
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap2.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap2.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.svg	(revision 18980)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="5.0800" y1="5.0800" x2="8.8900" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="5.5880" y1="5.0800" x2="7.6200" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_overlap2.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap2.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap2.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Two lines, one over the other, full cover - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Full overlap: the same line twice - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb Full overlap: the same line twice
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.eps	(revision 18980)
@@ -0,0 +1,36 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_overlap3.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01500 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.20000 0.20000 0.35000 0.20000 t
+0.20000 0.20000 0.35000 0.20000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 40 40 70 40 3 2
+PL 40 40 70 40 3 2
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.fab.gbr	(revision 18980)
@@ -0,0 +1,1822 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Full overlap: the same line twice, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500D02*Y104000D01*
+Y110000D02*X237500D01*
+X234500Y107300D02*X236750D01*
+G54D13*G36*
+X239300Y110000D02*Y104000D01*
+X243800D01*
+Y110000D01*
+X239300D01*
+G37*
+G36*
+X244700D02*Y104000D01*
+X249200D01*
+Y110000D01*
+X244700D01*
+G37*
+G36*
+X250100D02*Y104000D01*
+X254600D01*
+Y110000D01*
+X250100D01*
+G37*
+G36*
+X258200D02*Y104000D01*
+X262700D01*
+Y110000D01*
+X258200D01*
+G37*
+G36*
+X263600D02*Y104000D01*
+X268100D01*
+Y110000D01*
+X263600D01*
+G37*
+G36*
+X269000D02*Y104000D01*
+X273500D01*
+Y110000D01*
+X269000D01*
+G37*
+G36*
+X274400D02*Y104000D01*
+X278900D01*
+Y110000D01*
+X274400D01*
+G37*
+G36*
+X279800D02*Y104000D01*
+X284300D01*
+Y110000D01*
+X279800D01*
+G37*
+G36*
+X285200D02*Y104000D01*
+X289700D01*
+Y110000D01*
+X285200D01*
+G37*
+G36*
+X290600D02*Y104000D01*
+X295100D01*
+Y110000D01*
+X290600D01*
+G37*
+G36*
+X296000D02*Y104000D01*
+X300500D01*
+Y110000D01*
+X296000D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X323000D02*Y104000D01*
+X327500D01*
+Y110000D01*
+X323000D01*
+G37*
+G36*
+X328400D02*Y104000D01*
+X332900D01*
+Y110000D01*
+X328400D01*
+G37*
+G36*
+X333800D02*Y104000D01*
+X338300D01*
+Y110000D01*
+X333800D01*
+G37*
+G36*
+X339200D02*Y104000D01*
+X343700D01*
+Y110000D01*
+X339200D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G36*
+X352700D02*Y104000D01*
+X357200D01*
+Y110000D01*
+X352700D01*
+G37*
+G36*
+X358100D02*Y104000D01*
+X362600D01*
+Y110000D01*
+X358100D01*
+G37*
+G36*
+X363500D02*Y104000D01*
+X368000D01*
+Y110000D01*
+X363500D01*
+G37*
+G36*
+X371600D02*Y104000D01*
+X376100D01*
+Y110000D01*
+X371600D01*
+G37*
+G36*
+X377000D02*Y104000D01*
+X381500D01*
+Y110000D01*
+X377000D01*
+G37*
+G36*
+X382400D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X393200D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X401300D02*Y104000D01*
+X405800D01*
+Y110000D01*
+X401300D01*
+G37*
+G54D12*X409400D02*Y104000D01*
+Y110000D02*X412400D01*
+X409400Y107300D02*X411650D01*
+G54D13*G36*
+X414200Y110000D02*Y104000D01*
+X418700D01*
+Y110000D01*
+X414200D01*
+G37*
+G36*
+X419600D02*Y104000D01*
+X424100D01*
+Y110000D01*
+X419600D01*
+G37*
+G36*
+X425000D02*Y104000D01*
+X429500D01*
+Y110000D01*
+X425000D01*
+G37*
+G36*
+X430400D02*Y104000D01*
+X434900D01*
+Y110000D01*
+X430400D01*
+G37*
+G36*
+X435800D02*Y104000D01*
+X440300D01*
+Y110000D01*
+X435800D01*
+G37*
+G36*
+X441200D02*Y104000D01*
+X445700D01*
+Y110000D01*
+X441200D01*
+G37*
+G36*
+X446600D02*Y104000D01*
+X451100D01*
+Y110000D01*
+X446600D01*
+G37*
+G36*
+X452000D02*Y104000D01*
+X456500D01*
+Y110000D01*
+X452000D01*
+G37*
+G36*
+X457400D02*Y104000D01*
+X461900D01*
+Y110000D01*
+X457400D01*
+G37*
+G36*
+X462800D02*Y104000D01*
+X467300D01*
+Y110000D01*
+X462800D01*
+G37*
+G54D12*X471650D02*Y104000D01*
+X473600Y110000D02*X474650Y108950D01*
+Y105050D01*
+X473600Y104000D02*X474650Y105050D01*
+X470900Y104000D02*X473600D01*
+X470900Y110000D02*X473600D01*
+G54D13*G36*
+X476450D02*Y104000D01*
+X480950D01*
+Y110000D01*
+X476450D01*
+G37*
+G36*
+X481850D02*Y104000D01*
+X486350D01*
+Y110000D01*
+X481850D01*
+G37*
+G36*
+X487250D02*Y104000D01*
+X491750D01*
+Y110000D01*
+X487250D01*
+G37*
+G36*
+X492650D02*Y104000D01*
+X497150D01*
+Y110000D01*
+X492650D01*
+G37*
+G36*
+X498050D02*Y104000D01*
+X502550D01*
+Y110000D01*
+X498050D01*
+G37*
+G36*
+X503450D02*Y104000D01*
+X507950D01*
+Y110000D01*
+X503450D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.gbr/line_overlap3.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Full overlap: the same line twice, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0150*%
+G54D11*X20000Y30000D02*X35000D01*
+X20000D02*X35000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Full overlap: the same line twice
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.png.text	(revision 18980)
@@ -0,0 +1,5 @@
+18 pixel width (15)
+198 pixel length (165)
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap3.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap3.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.svg	(revision 18980)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="5.0800" y1="5.0800" x2="8.8900" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="5.0800" y1="5.0800" x2="8.8900" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_overlap3.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap3.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap3.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Full overlap: the same line twice - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Full overlap: the same line twice with different settings - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb Full overlap: the same line twice with different settings
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.127000 5.080000 7.620000 8.890000 7.620000)
+            (type protect))
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 8.890000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.eps	(revision 18980)
@@ -0,0 +1,67 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_overlap4.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.15000 0.15000 moveto
+0.30000 0.15000 lineto
+0.30000 0.17750 lineto
+0.20000 0.17750 lineto
+0.19647 0.17771 lineto
+0.19303 0.17854 lineto
+0.18975 0.17989 lineto
+0.18673 0.18174 lineto
+0.18404 0.18404 lineto
+0.18174 0.18673 lineto
+0.17989 0.18975 lineto
+0.17854 0.19303 lineto
+0.17771 0.19647 lineto
+0.17743 0.20000 lineto
+0.17771 0.20353 lineto
+0.17854 0.20697 lineto
+0.17989 0.21025 lineto
+0.18174 0.21327 lineto
+0.18404 0.21596 lineto
+0.18673 0.21826 lineto
+0.18975 0.22011 lineto
+0.19303 0.22146 lineto
+0.19647 0.22229 lineto
+0.20000 0.22250 lineto
+0.30000 0.22250 lineto
+0.30000 0.32500 lineto
+0.15000 0.32500 lineto
+fill
+0.00500 setlinewidth
+1 setlinecap
+0.20000 0.20000 0.35000 0.20000 t
+0.01500 setlinewidth
+0.20000 0.20000 0.35000 0.20000 t
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.fcd	(revision 18980)
@@ -0,0 +1,4 @@
+[FIDOCAD]
+PL 40 40 70 40 1 2
+PL 40 40 70 40 3 2
+PP 30 30 60 30 60 36 40 36 39 36 39 36 38 36 37 36 37 37 36 37 36 38 36 39 36 39 35 40 36 41 36 41 36 42 36 43 37 43 37 44 38 44 39 44 39 44 40 45 60 45 60 65 30 65 30 30 2
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.fab.gbr	(revision 18980)
@@ -0,0 +1,1948 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Full overlap: the same line twice with different settings, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD16C,0.0100*%
+%ADD15C,0.0001*%
+%ADD14C,0.0060*%
+G54D14*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D15*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D14*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D15*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D14*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D15*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D14*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D15*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D14*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D15*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D14*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D15*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D16*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D14*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D15*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D14*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D15*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D14*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D15*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D14*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D15*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D14*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D15*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D14*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D15*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D14*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D15*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D14*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D15*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D14*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D15*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D14*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D15*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D14*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D15*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D14*X234500D02*Y104000D01*
+Y110000D02*X237500D01*
+X234500Y107300D02*X236750D01*
+G54D15*G36*
+X239300Y110000D02*Y104000D01*
+X243800D01*
+Y110000D01*
+X239300D01*
+G37*
+G36*
+X244700D02*Y104000D01*
+X249200D01*
+Y110000D01*
+X244700D01*
+G37*
+G36*
+X250100D02*Y104000D01*
+X254600D01*
+Y110000D01*
+X250100D01*
+G37*
+G36*
+X258200D02*Y104000D01*
+X262700D01*
+Y110000D01*
+X258200D01*
+G37*
+G36*
+X263600D02*Y104000D01*
+X268100D01*
+Y110000D01*
+X263600D01*
+G37*
+G36*
+X269000D02*Y104000D01*
+X273500D01*
+Y110000D01*
+X269000D01*
+G37*
+G36*
+X274400D02*Y104000D01*
+X278900D01*
+Y110000D01*
+X274400D01*
+G37*
+G36*
+X279800D02*Y104000D01*
+X284300D01*
+Y110000D01*
+X279800D01*
+G37*
+G36*
+X285200D02*Y104000D01*
+X289700D01*
+Y110000D01*
+X285200D01*
+G37*
+G36*
+X290600D02*Y104000D01*
+X295100D01*
+Y110000D01*
+X290600D01*
+G37*
+G36*
+X296000D02*Y104000D01*
+X300500D01*
+Y110000D01*
+X296000D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X323000D02*Y104000D01*
+X327500D01*
+Y110000D01*
+X323000D01*
+G37*
+G36*
+X328400D02*Y104000D01*
+X332900D01*
+Y110000D01*
+X328400D01*
+G37*
+G36*
+X333800D02*Y104000D01*
+X338300D01*
+Y110000D01*
+X333800D01*
+G37*
+G36*
+X339200D02*Y104000D01*
+X343700D01*
+Y110000D01*
+X339200D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G36*
+X352700D02*Y104000D01*
+X357200D01*
+Y110000D01*
+X352700D01*
+G37*
+G36*
+X358100D02*Y104000D01*
+X362600D01*
+Y110000D01*
+X358100D01*
+G37*
+G36*
+X363500D02*Y104000D01*
+X368000D01*
+Y110000D01*
+X363500D01*
+G37*
+G36*
+X371600D02*Y104000D01*
+X376100D01*
+Y110000D01*
+X371600D01*
+G37*
+G36*
+X377000D02*Y104000D01*
+X381500D01*
+Y110000D01*
+X377000D01*
+G37*
+G36*
+X382400D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X393200D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X401300D02*Y104000D01*
+X405800D01*
+Y110000D01*
+X401300D01*
+G37*
+G36*
+X406700D02*Y104000D01*
+X411200D01*
+Y110000D01*
+X406700D01*
+G37*
+G36*
+X412100D02*Y104000D01*
+X416600D01*
+Y110000D01*
+X412100D01*
+G37*
+G36*
+X417500D02*Y104000D01*
+X422000D01*
+Y110000D01*
+X417500D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G36*
+X436400D02*Y104000D01*
+X440900D01*
+Y110000D01*
+X436400D01*
+G37*
+G36*
+X441800D02*Y104000D01*
+X446300D01*
+Y110000D01*
+X441800D01*
+G37*
+G36*
+X447200D02*Y104000D01*
+X451700D01*
+Y110000D01*
+X447200D01*
+G37*
+G36*
+X452600D02*Y104000D01*
+X457100D01*
+Y110000D01*
+X452600D01*
+G37*
+G36*
+X458000D02*Y104000D01*
+X462500D01*
+Y110000D01*
+X458000D01*
+G37*
+G36*
+X463400D02*Y104000D01*
+X467900D01*
+Y110000D01*
+X463400D01*
+G37*
+G36*
+X468800D02*Y104000D01*
+X473300D01*
+Y110000D01*
+X468800D01*
+G37*
+G36*
+X476900D02*Y104000D01*
+X481400D01*
+Y110000D01*
+X476900D01*
+G37*
+G36*
+X482300D02*Y104000D01*
+X486800D01*
+Y110000D01*
+X482300D01*
+G37*
+G36*
+X487700D02*Y104000D01*
+X492200D01*
+Y110000D01*
+X487700D01*
+G37*
+G36*
+X493100D02*Y104000D01*
+X497600D01*
+Y110000D01*
+X493100D01*
+G37*
+G36*
+X498500D02*Y104000D01*
+X503000D01*
+Y110000D01*
+X498500D01*
+G37*
+G36*
+X503900D02*Y104000D01*
+X508400D01*
+Y110000D01*
+X503900D01*
+G37*
+G36*
+X509300D02*Y104000D01*
+X513800D01*
+Y110000D01*
+X509300D01*
+G37*
+G36*
+X514700D02*Y104000D01*
+X519200D01*
+Y110000D01*
+X514700D01*
+G37*
+G36*
+X522800D02*Y104000D01*
+X527300D01*
+Y110000D01*
+X522800D01*
+G37*
+G54D14*X530900D02*Y104000D01*
+Y110000D02*X533900D01*
+X530900Y107300D02*X533150D01*
+G54D15*G36*
+X535700Y110000D02*Y104000D01*
+X540200D01*
+Y110000D01*
+X535700D01*
+G37*
+G36*
+X541100D02*Y104000D01*
+X545600D01*
+Y110000D01*
+X541100D01*
+G37*
+G36*
+X546500D02*Y104000D01*
+X551000D01*
+Y110000D01*
+X546500D01*
+G37*
+G36*
+X551900D02*Y104000D01*
+X556400D01*
+Y110000D01*
+X551900D01*
+G37*
+G36*
+X557300D02*Y104000D01*
+X561800D01*
+Y110000D01*
+X557300D01*
+G37*
+G36*
+X562700D02*Y104000D01*
+X567200D01*
+Y110000D01*
+X562700D01*
+G37*
+G36*
+X568100D02*Y104000D01*
+X572600D01*
+Y110000D01*
+X568100D01*
+G37*
+G36*
+X573500D02*Y104000D01*
+X578000D01*
+Y110000D01*
+X573500D01*
+G37*
+G36*
+X578900D02*Y104000D01*
+X583400D01*
+Y110000D01*
+X578900D01*
+G37*
+G36*
+X584300D02*Y104000D01*
+X588800D01*
+Y110000D01*
+X584300D01*
+G37*
+G54D14*X593150D02*Y104000D01*
+X595100Y110000D02*X596150Y108950D01*
+Y105050D01*
+X595100Y104000D02*X596150Y105050D01*
+X592400Y104000D02*X595100D01*
+X592400Y110000D02*X595100D01*
+G54D15*G36*
+X597950D02*Y104000D01*
+X602450D01*
+Y110000D01*
+X597950D01*
+G37*
+G36*
+X603350D02*Y104000D01*
+X607850D01*
+Y110000D01*
+X603350D01*
+G37*
+G36*
+X608750D02*Y104000D01*
+X613250D01*
+Y110000D01*
+X608750D01*
+G37*
+G36*
+X614150D02*Y104000D01*
+X618650D01*
+Y110000D01*
+X614150D01*
+G37*
+G36*
+X619550D02*Y104000D01*
+X624050D01*
+Y110000D01*
+X619550D01*
+G37*
+G36*
+X624950D02*Y104000D01*
+X629450D01*
+Y110000D01*
+X624950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.gbr/line_overlap4.top.gbr	(revision 18980)
@@ -0,0 +1,46 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Full overlap: the same line twice with different settings, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0150*%
+%ADD12C,0.0050*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X15000Y35000D02*X30000D01*
+Y32250D01*
+X20000D01*
+X19647Y32229D01*
+X19303Y32146D01*
+X18975Y32011D01*
+X18673Y31826D01*
+X18404Y31596D01*
+X18174Y31327D01*
+X17989Y31025D01*
+X17854Y30697D01*
+X17771Y30353D01*
+X17743Y30000D01*
+X17771Y29647D01*
+X17854Y29303D01*
+X17989Y28975D01*
+X18174Y28673D01*
+X18404Y28404D01*
+X18673Y28174D01*
+X18975Y27989D01*
+X19303Y27854D01*
+X19647Y27771D01*
+X20000Y27750D01*
+X30000D01*
+Y17500D01*
+X15000D01*
+Y35000D01*
+G37*
+G54D12*X20000Y30000D02*X35000D01*
+G54D13*X20000D02*X35000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Full overlap: the same line twice with different settings
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap4.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.png.text	(revision 18980)
@@ -0,0 +1,6 @@
+18 pixel width (15)
+198 pixel length (165)
+18 pixel clearance (15)
+
+in a poly
+181 x 211 pixels (150.833 x 175.833)
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap4.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_overlap4.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.svg	(revision 18980)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="3.8100,3.8100 7.6200,3.8100 7.6200,4.5085 5.0800,4.5085 4.9903,4.5138 4.9029,4.5348 4.8197,4.5692 4.7430,4.6162 4.6746,4.6746 4.6162,4.7430 4.5692,4.8197 4.5348,4.9029 4.5138,4.9903 4.5067,5.0800 4.5138,5.1697 4.5348,5.2571 4.5692,5.3403 4.6162,5.4170 4.6746,5.4854 4.7430,5.5438 4.8197,5.5908 4.9029,5.6252 4.9903,5.6462 5.0800,5.6515 7.6200,5.6515 7.6200,8.2550 3.8100,8.2550 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <line x1="5.0800" y1="5.0800" x2="8.8900" y2="5.0800" stroke-width="0.1270" stroke="#8b2323" stroke-linecap="round"/>
+ <line x1="5.0800" y1="5.0800" x2="8.8900" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_overlap4.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_overlap4.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_overlap4.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Full overlap: the same line twice with different settings - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: A single zero length line - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.dsn	(revision 18980)
@@ -0,0 +1,52 @@
+(pcb A single zero length line
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+        (wire (path 3__top_copper 0.381000 5.080000 7.620000 5.080000 7.620000)
+            (type protect))
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.eps	(revision 18980)
@@ -0,0 +1,35 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: line_zerolen.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01500 setlinewidth
+1 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.20000 0.20000 0.00750 c
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.fcd	(revision 18980)
@@ -0,0 +1,2 @@
+[FIDOCAD]
+PL 40 40 40 40 3 2
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.fab.gbr	(revision 18980)
@@ -0,0 +1,1783 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: A single zero length line, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500Y108500D02*Y104000D01*
+Y108500D02*X235550Y110000D01*
+X237200D01*
+X238250Y108500D01*
+Y104000D01*
+X234500Y107000D02*X238250D01*
+G54D13*G36*
+X242750Y110000D02*Y104000D01*
+X247250D01*
+Y110000D01*
+X242750D01*
+G37*
+G36*
+X248150D02*Y104000D01*
+X252650D01*
+Y110000D01*
+X248150D01*
+G37*
+G36*
+X253550D02*Y104000D01*
+X258050D01*
+Y110000D01*
+X253550D01*
+G37*
+G36*
+X258950D02*Y104000D01*
+X263450D01*
+Y110000D01*
+X258950D01*
+G37*
+G36*
+X264350D02*Y104000D01*
+X268850D01*
+Y110000D01*
+X264350D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X277850D02*Y104000D01*
+X282350D01*
+Y110000D01*
+X277850D01*
+G37*
+G36*
+X283250D02*Y104000D01*
+X287750D01*
+Y110000D01*
+X283250D01*
+G37*
+G36*
+X288650D02*Y104000D01*
+X293150D01*
+Y110000D01*
+X288650D01*
+G37*
+G36*
+X294050D02*Y104000D01*
+X298550D01*
+Y110000D01*
+X294050D01*
+G37*
+G36*
+X302150D02*Y104000D01*
+X306650D01*
+Y110000D01*
+X302150D01*
+G37*
+G36*
+X307550D02*Y104000D01*
+X312050D01*
+Y110000D01*
+X307550D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X323750D02*Y104000D01*
+X328250D01*
+Y110000D01*
+X323750D01*
+G37*
+G36*
+X329150D02*Y104000D01*
+X333650D01*
+Y110000D01*
+X329150D01*
+G37*
+G36*
+X337250D02*Y104000D01*
+X341750D01*
+Y110000D01*
+X337250D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G36*
+X361550D02*Y104000D01*
+X366050D01*
+Y110000D01*
+X361550D01*
+G37*
+G54D12*X369650D02*Y104000D01*
+Y110000D02*X372650D01*
+X369650Y107300D02*X371900D01*
+G54D13*G36*
+X374450Y110000D02*Y104000D01*
+X378950D01*
+Y110000D01*
+X374450D01*
+G37*
+G36*
+X379850D02*Y104000D01*
+X384350D01*
+Y110000D01*
+X379850D01*
+G37*
+G36*
+X385250D02*Y104000D01*
+X389750D01*
+Y110000D01*
+X385250D01*
+G37*
+G36*
+X390650D02*Y104000D01*
+X395150D01*
+Y110000D01*
+X390650D01*
+G37*
+G36*
+X396050D02*Y104000D01*
+X400550D01*
+Y110000D01*
+X396050D01*
+G37*
+G36*
+X401450D02*Y104000D01*
+X405950D01*
+Y110000D01*
+X401450D01*
+G37*
+G36*
+X406850D02*Y104000D01*
+X411350D01*
+Y110000D01*
+X406850D01*
+G37*
+G36*
+X412250D02*Y104000D01*
+X416750D01*
+Y110000D01*
+X412250D01*
+G37*
+G36*
+X417650D02*Y104000D01*
+X422150D01*
+Y110000D01*
+X417650D01*
+G37*
+G36*
+X423050D02*Y104000D01*
+X427550D01*
+Y110000D01*
+X423050D01*
+G37*
+G54D12*X431900D02*Y104000D01*
+X433850Y110000D02*X434900Y108950D01*
+Y105050D01*
+X433850Y104000D02*X434900Y105050D01*
+X431150Y104000D02*X433850D01*
+X431150Y110000D02*X433850D01*
+G54D13*G36*
+X436700D02*Y104000D01*
+X441200D01*
+Y110000D01*
+X436700D01*
+G37*
+G36*
+X442100D02*Y104000D01*
+X446600D01*
+Y110000D01*
+X442100D01*
+G37*
+G36*
+X447500D02*Y104000D01*
+X452000D01*
+Y110000D01*
+X447500D01*
+G37*
+G36*
+X452900D02*Y104000D01*
+X457400D01*
+Y110000D01*
+X452900D01*
+G37*
+G36*
+X458300D02*Y104000D01*
+X462800D01*
+Y110000D01*
+X458300D01*
+G37*
+G36*
+X463700D02*Y104000D01*
+X468200D01*
+Y110000D01*
+X463700D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.gbr/line_zerolen.top.gbr	(revision 18980)
@@ -0,0 +1,14 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: A single zero length line, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0150*%
+G54D11*X20000Y30000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   A single zero length line
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_zerolen.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.png.text	(revision 18980)
@@ -0,0 +1 @@
+19 pixel (15.833) diameter point made of a trace with zero length
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_zerolen.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/line_zerolen.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.svg	(revision 18980)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="5.0800" y1="5.0800" x2="5.0800" y2="5.0800" stroke-width="0.3810" stroke="#8b2323" stroke-linecap="round"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/line_zerolen.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/line_zerolen.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/line_zerolen.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: A single zero length line - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/netlist.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: board with minimal netlist - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+1,"dip(4)","4*300",U1 
Index: tags/2.0.1/tests/RTT/ref/netlist.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.dsn	(revision 18980)
@@ -0,0 +1,113 @@
+(pcb board with minimal netlist
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "U1" 2.540000 8.255000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "4" 7.620000 0.000000)
+      (pin Pstk_shape_9 "2" 0.000000 -2.540000)
+      (pin Pstk_shape_10 "3" 7.620000 -2.540000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "5__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "7__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "10__bottom_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_9
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_10
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+  )
+  (network
+    (net "bar"
+      (pins "U1"-"2" "U1"-"4")
+    )
+    (net "foo"
+      (pins "U1"-"1" "U1"-"3")
+    )
+    (class geda_default "bar" "foo"
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/netlist.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.eps	(revision 18980)
@@ -0,0 +1,120 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: netlist.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.301961 0.301961 0.301961 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+0.01000 setlinewidth
+0 0 0 setrgbcolor
+0.05000 0.12500 0.05000 0.32500 t
+0.45000 0.32500 0.05000 0.32500 t
+0.45000 0.32500 0.45000 0.12500 t
+0.05000 0.12500 0.20000 0.12500 t
+0.30000 0.12500 0.45000 0.12500 t
+0 180 -0.05000 0.05000 0.25000 0.12500 0.200000 a
+0.00700 setlinewidth
+0.10000 0.07500 0.10000 0.11000 t
+0.10000 0.11000 0.10500 0.11500 t
+0.10500 0.11500 0.11500 0.11500 t
+0.11500 0.11500 0.12000 0.11000 t
+0.12000 0.07500 0.12000 0.11000 t
+0.13200 0.08300 0.14000 0.07500 t
+0.14000 0.07500 0.14000 0.11500 t
+0.13200 0.11500 0.14700 0.11500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/netlist.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottom.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: board with minimal netlist, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD22C,0.0394*%
+%ADD21C,0.0800*%
+%ADD20C,0.0001*%
+G54D20*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D21*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D22*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.bottommask.gbr	(revision 18980)
@@ -0,0 +1,23 @@
+G04 start of page 7 for group 11 layer_idx 10 *
+G04 Title: board with minimal netlist, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD26C,0.0860*%
+%ADD25C,0.0001*%
+G54D25*G36*
+X5700Y36800D02*X14300D01*
+Y28200D01*
+X5700D01*
+Y36800D01*
+G37*
+G54D26*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.fab.gbr	(revision 18980)
@@ -0,0 +1,1863 @@
+G04 start of page 10 for group -1 layer_idx 16777221 *
+G04 Title: board with minimal netlist, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD33C,0.0100*%
+%ADD32C,0.0001*%
+%ADD31C,0.0060*%
+%ADD30C,0.0080*%
+G54D30*X10000Y32500D02*Y30900D01*
+Y32500D02*X11387Y33300D01*
+X10000Y32500D02*X8613Y33300D01*
+X40000Y32500D02*Y30900D01*
+Y32500D02*X41387Y33300D01*
+X40000Y32500D02*X38613Y33300D01*
+X10000Y22500D02*Y20900D01*
+Y22500D02*X11387Y23300D01*
+X10000Y22500D02*X8613Y23300D01*
+X40000Y22500D02*Y20900D01*
+Y22500D02*X41387Y23300D01*
+X40000Y22500D02*X38613Y23300D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D31*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y106250D02*X101000Y110000D01*
+X98000Y106250D02*X101750D01*
+X101000Y110000D02*Y104000D01*
+G54D32*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D31*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66750Y104000D02*X69000Y107000D01*
+Y109250D02*Y107000D01*
+X68250Y110000D02*X69000Y109250D01*
+X66750Y110000D02*X68250D01*
+X66000Y109250D02*X66750Y110000D01*
+X66000Y109250D02*Y107750D01*
+X66750Y107000D01*
+X69000D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D32*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D31*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D32*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D31*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D32*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D31*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D32*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D31*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D32*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D31*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D32*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D31*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D32*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D31*X268050Y136250D02*X271050Y140000D01*
+X268050Y136250D02*X271800D01*
+X271050Y140000D02*Y134000D01*
+G54D32*G36*
+X276300Y140000D02*Y134000D01*
+X280800D01*
+Y140000D01*
+X276300D01*
+G37*
+G36*
+X281700D02*Y134000D01*
+X286200D01*
+Y140000D01*
+X281700D01*
+G37*
+G36*
+X287100D02*Y134000D01*
+X291600D01*
+Y140000D01*
+X287100D01*
+G37*
+G36*
+X292500D02*Y134000D01*
+X297000D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297900D02*Y134000D01*
+X302400D01*
+Y140000D01*
+X297900D01*
+G37*
+G36*
+X306000D02*Y134000D01*
+X310500D01*
+Y140000D01*
+X306000D01*
+G37*
+G36*
+X311400D02*Y134000D01*
+X315900D01*
+Y140000D01*
+X311400D01*
+G37*
+G36*
+X316800D02*Y134000D01*
+X321300D01*
+Y140000D01*
+X316800D01*
+G37*
+G36*
+X322200D02*Y134000D01*
+X326700D01*
+Y140000D01*
+X322200D01*
+G37*
+G36*
+X327600D02*Y134000D01*
+X332100D01*
+Y140000D01*
+X327600D01*
+G37*
+G54D33*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D31*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D32*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D31*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D32*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D31*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D32*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D31*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D32*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D31*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D32*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D31*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D32*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D31*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D32*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D31*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D32*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D31*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D32*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D31*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D32*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D31*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D32*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G54D31*X377600D02*Y104000D01*
+Y110000D02*X380600D01*
+X377600Y107300D02*X379850D01*
+G54D32*G36*
+X382400Y110000D02*Y104000D01*
+X386900D01*
+Y110000D01*
+X382400D01*
+G37*
+G36*
+X387800D02*Y104000D01*
+X392300D01*
+Y110000D01*
+X387800D01*
+G37*
+G36*
+X393200D02*Y104000D01*
+X397700D01*
+Y110000D01*
+X393200D01*
+G37*
+G36*
+X398600D02*Y104000D01*
+X403100D01*
+Y110000D01*
+X398600D01*
+G37*
+G36*
+X404000D02*Y104000D01*
+X408500D01*
+Y110000D01*
+X404000D01*
+G37*
+G36*
+X409400D02*Y104000D01*
+X413900D01*
+Y110000D01*
+X409400D01*
+G37*
+G36*
+X414800D02*Y104000D01*
+X419300D01*
+Y110000D01*
+X414800D01*
+G37*
+G36*
+X420200D02*Y104000D01*
+X424700D01*
+Y110000D01*
+X420200D01*
+G37*
+G36*
+X425600D02*Y104000D01*
+X430100D01*
+Y110000D01*
+X425600D01*
+G37*
+G36*
+X431000D02*Y104000D01*
+X435500D01*
+Y110000D01*
+X431000D01*
+G37*
+G54D31*X439850D02*Y104000D01*
+X441800Y110000D02*X442850Y108950D01*
+Y105050D01*
+X441800Y104000D02*X442850Y105050D01*
+X439100Y104000D02*X441800D01*
+X439100Y110000D02*X441800D01*
+G54D32*G36*
+X444650D02*Y104000D01*
+X449150D01*
+Y110000D01*
+X444650D01*
+G37*
+G36*
+X450050D02*Y104000D01*
+X454550D01*
+Y110000D01*
+X450050D01*
+G37*
+G36*
+X455450D02*Y104000D01*
+X459950D01*
+Y110000D01*
+X455450D01*
+G37*
+G36*
+X460850D02*Y104000D01*
+X465350D01*
+Y110000D01*
+X460850D01*
+G37*
+G36*
+X466250D02*Y104000D01*
+X470750D01*
+Y110000D01*
+X466250D01*
+G37*
+G36*
+X471650D02*Y104000D01*
+X476150D01*
+Y110000D01*
+X471650D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group5.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: board with minimal netlist, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD16C,0.0394*%
+%ADD15C,0.0800*%
+%ADD14C,0.0001*%
+G54D14*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D15*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D16*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.group7.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: board with minimal netlist, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD19C,0.0394*%
+%ADD18C,0.0800*%
+%ADD17C,0.0001*%
+G54D17*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D18*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D19*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,10 @@
+M48
+INCH
+T29C0.039
+%
+T29
+X001000Y003250
+X004000Y003250
+X001000Y002250
+X004000Y002250
+M30
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.top.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: board with minimal netlist, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0394*%
+%ADD12C,0.0800*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D12*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topmask.gbr	(revision 18980)
@@ -0,0 +1,23 @@
+G04 start of page 6 for group 2 layer_idx 9 *
+G04 Title: board with minimal netlist, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD24C,0.0860*%
+%ADD23C,0.0001*%
+G54D23*G36*
+X5700Y36800D02*X14300D01*
+Y28200D01*
+X5700D01*
+Y36800D01*
+G37*
+G54D24*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.gbr/netlist.topsilk.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 8 for group 1 layer_idx 8 *
+G04 Title: board with minimal netlist, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD28C,0.0070*%
+%ADD27C,0.0100*%
+G54D27*X5000Y37500D02*Y17500D01*
+X45000D02*X5000D01*
+X45000D02*Y37500D01*
+X5000D02*X20000D01*
+X30000D02*X45000D01*
+X20000D02*G75*G03X30000Y37500I5000J0D01*G01*
+G54D28*X10000Y42500D02*Y39000D01*
+X10500Y38500D01*
+X11500D01*
+X12000Y39000D01*
+Y42500D02*Y39000D01*
+X13200Y41700D02*X14000Y42500D01*
+Y38500D01*
+X13200D02*X14700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.nelma.em	(revision 18980)
@@ -0,0 +1,61 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+net bar {
+	objects = {
+
+	}
+}
+net foo {
+	objects = {
+
+	}
+}
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/netlist.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   board with minimal netlist
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317foo              U1    -1    D0393PA00X+001000Y+003250X0800Y0800R000 S0      
+317bar              U1    -4    D0393PA00X+004000Y+003250X0800Y0000R000 S0      
+317bar              U1    -2    D0393PA00X+001000Y+002250X0800Y0000R000 S0      
+317foo              U1    -3    D0393PA00X+004000Y+002250X0800Y0000R000 S0      
+999
Index: tags/2.0.1/tests/RTT/ref/netlist.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.png.text	(revision 18980)
@@ -0,0 +1,15 @@
+r6630
+
+One component U1
+
+U1 (4pin dip)
+Silk line thickness 12 pix (10)
+Inside silk screen corner to Pin1 top corner 6 x 6 pix (5 x 5 mil)
+Pin1 96 x 96 pix (80 x 80)
+Pin1 hole 47 pix (39.166) in diameter
+Pin2 to Pin1 distance 24 pix (20)
+Pin2 97 pix (80.833) circle
+Pin2 to Pin3 distance 263 pix (219.166)
+Pin2 hole 47 pix (39.166) in diameter
+
+
Index: tags/2.0.1/tests/RTT/ref/netlist.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.svg	(revision 18980)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="1.2700" y1="3.1750" x2="1.2700" y2="8.2550" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="8.2550" x2="1.2700" y2="8.2550" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="8.2550" x2="11.4300" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="3.1750" x2="5.0800" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="3.1750" x2="11.4300" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <path d="M 7.62000000 3.17500000 A 1.2700 1.2700 0 0 1 5.0800 3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <line x1="2.5400" y1="1.9050" x2="2.5400" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.5400" y1="2.7940" x2="2.6670" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6670" y1="2.9210" x2="2.9210" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.9210" y1="2.9210" x2="3.0480" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.0480" y1="1.9050" x2="3.0480" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="2.1082" x2="3.5560" y2="1.9050" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="1.9050" x2="3.5560" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="2.9210" x2="3.7338" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/netlist.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist.xy	(revision 18980)
@@ -0,0 +1,9 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: board with minimal netlist - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+U1,"dip(4)","4*300",250.00,275.00,0,top
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: board with minimal netlist and some back-annotation changes - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+1,"dip(4)","4*300",U1 
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.dsn	(revision 18980)
@@ -0,0 +1,113 @@
+(pcb board with minimal netlist and some back-annotation changes
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "U1" 2.540000 8.255000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "4" 7.620000 0.000000)
+      (pin Pstk_shape_9 "2" 0.000000 -2.540000)
+      (pin Pstk_shape_10 "3" 7.620000 -2.540000)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "5__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "7__Intern" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "10__bottom_copper" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_9
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_10
+      (shape
+        (circle "3__top_copper" 2.032000)
+        (circle "5__Intern" 2.032000)
+        (circle "7__Intern" 2.032000)
+        (circle "10__bottom_copper" 2.032000)
+      )
+      (attach off)
+    )
+  )
+  (network
+    (net "bar"
+      (pins "U1"-"2" "U1"-"4" "U1"-"1")
+    )
+    (net "foo"
+      (pins "U1"-"3")
+    )
+    (class geda_default "bar" "foo"
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.eps	(revision 18980)
@@ -0,0 +1,120 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: netlist_ba.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.301961 0.301961 0.301961 setrgbcolor
+0.06000 0.13500 moveto
+0.14000 0.13500 lineto
+0.14000 0.21500 lineto
+0.06000 0.21500 lineto
+fill
+0.40000 0.17500 0.04000 c
+0.10000 0.27500 0.04000 c
+0.40000 0.27500 0.04000 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+0.01000 setlinewidth
+0 0 0 setrgbcolor
+0.05000 0.12500 0.05000 0.32500 t
+0.45000 0.32500 0.05000 0.32500 t
+0.45000 0.32500 0.45000 0.12500 t
+0.05000 0.12500 0.20000 0.12500 t
+0.30000 0.12500 0.45000 0.12500 t
+0 180 -0.05000 0.05000 0.25000 0.12500 0.200000 a
+0.00700 setlinewidth
+0.10000 0.07500 0.10000 0.11000 t
+0.10000 0.11000 0.10500 0.11500 t
+0.10500 0.11500 0.11500 0.11500 t
+0.11500 0.11500 0.12000 0.11000 t
+0.12000 0.07500 0.12000 0.11000 t
+0.13200 0.08300 0.14000 0.07500 t
+0.14000 0.07500 0.14000 0.11500 t
+0.13200 0.11500 0.14700 0.11500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.17500 0.01968 c
+0.40000 0.17500 0.01968 c
+0.10000 0.27500 0.01968 c
+0.40000 0.27500 0.01968 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottom.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: board with minimal netlist and some back-annotation changes, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD22C,0.0394*%
+%ADD21C,0.0800*%
+%ADD20C,0.0001*%
+G54D20*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D21*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D22*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottommask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottommask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.bottommask.gbr	(revision 18980)
@@ -0,0 +1,23 @@
+G04 start of page 7 for group 11 layer_idx 10 *
+G04 Title: board with minimal netlist and some back-annotation changes, bottom_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMMASK*%
+%ADD26C,0.0860*%
+%ADD25C,0.0001*%
+G54D25*G36*
+X5700Y36800D02*X14300D01*
+Y28200D01*
+X5700D01*
+Y36800D01*
+G37*
+G54D26*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.fab.gbr	(revision 18980)
@@ -0,0 +1,2037 @@
+G04 start of page 10 for group -1 layer_idx 16777221 *
+G04 Title: board with minimal netlist and some back-annotation changes, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD33C,0.0100*%
+%ADD32C,0.0001*%
+%ADD31C,0.0060*%
+%ADD30C,0.0080*%
+G54D30*X10000Y32500D02*Y30900D01*
+Y32500D02*X11387Y33300D01*
+X10000Y32500D02*X8613Y33300D01*
+X40000Y32500D02*Y30900D01*
+Y32500D02*X41387Y33300D01*
+X40000Y32500D02*X38613Y33300D01*
+X10000Y22500D02*Y20900D01*
+Y22500D02*X11387Y23300D01*
+X10000Y22500D02*X8613Y23300D01*
+X40000Y22500D02*Y20900D01*
+Y22500D02*X41387Y23300D01*
+X40000Y22500D02*X38613Y23300D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D31*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y106250D02*X101000Y110000D01*
+X98000Y106250D02*X101750D01*
+X101000Y110000D02*Y104000D01*
+G54D32*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D31*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66750Y104000D02*X69000Y107000D01*
+Y109250D02*Y107000D01*
+X68250Y110000D02*X69000Y109250D01*
+X66750Y110000D02*X68250D01*
+X66000Y109250D02*X66750Y110000D01*
+X66000Y109250D02*Y107750D01*
+X66750Y107000D01*
+X69000D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D32*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D31*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D32*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D31*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D32*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D31*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D32*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D31*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D32*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D31*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D32*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D31*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D32*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D31*X268050Y136250D02*X271050Y140000D01*
+X268050Y136250D02*X271800D01*
+X271050Y140000D02*Y134000D01*
+G54D32*G36*
+X276300Y140000D02*Y134000D01*
+X280800D01*
+Y140000D01*
+X276300D01*
+G37*
+G36*
+X281700D02*Y134000D01*
+X286200D01*
+Y140000D01*
+X281700D01*
+G37*
+G36*
+X287100D02*Y134000D01*
+X291600D01*
+Y140000D01*
+X287100D01*
+G37*
+G36*
+X292500D02*Y134000D01*
+X297000D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297900D02*Y134000D01*
+X302400D01*
+Y140000D01*
+X297900D01*
+G37*
+G36*
+X306000D02*Y134000D01*
+X310500D01*
+Y140000D01*
+X306000D01*
+G37*
+G36*
+X311400D02*Y134000D01*
+X315900D01*
+Y140000D01*
+X311400D01*
+G37*
+G36*
+X316800D02*Y134000D01*
+X321300D01*
+Y140000D01*
+X316800D01*
+G37*
+G36*
+X322200D02*Y134000D01*
+X326700D01*
+Y140000D01*
+X322200D01*
+G37*
+G36*
+X327600D02*Y134000D01*
+X332100D01*
+Y140000D01*
+X327600D01*
+G37*
+G54D33*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D31*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D32*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D31*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D32*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D31*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D32*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D31*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D32*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D31*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D32*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D31*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D32*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D31*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D32*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D31*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D32*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D31*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D32*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D31*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D32*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D31*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D32*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X264200D02*Y104000D01*
+X268700D01*
+Y110000D01*
+X264200D01*
+G37*
+G36*
+X269600D02*Y104000D01*
+X274100D01*
+Y110000D01*
+X269600D01*
+G37*
+G36*
+X275000D02*Y104000D01*
+X279500D01*
+Y110000D01*
+X275000D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X288500D02*Y104000D01*
+X293000D01*
+Y110000D01*
+X288500D01*
+G37*
+G36*
+X293900D02*Y104000D01*
+X298400D01*
+Y110000D01*
+X293900D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X329000D02*Y104000D01*
+X333500D01*
+Y110000D01*
+X329000D01*
+G37*
+G36*
+X334400D02*Y104000D01*
+X338900D01*
+Y110000D01*
+X334400D01*
+G37*
+G36*
+X339800D02*Y104000D01*
+X344300D01*
+Y110000D01*
+X339800D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X369500D02*Y104000D01*
+X374000D01*
+Y110000D01*
+X369500D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X388400D02*Y104000D01*
+X392900D01*
+Y110000D01*
+X388400D01*
+G37*
+G36*
+X393800D02*Y104000D01*
+X398300D01*
+Y110000D01*
+X393800D01*
+G37*
+G36*
+X399200D02*Y104000D01*
+X403700D01*
+Y110000D01*
+X399200D01*
+G37*
+G36*
+X404600D02*Y104000D01*
+X409100D01*
+Y110000D01*
+X404600D01*
+G37*
+G36*
+X412700D02*Y104000D01*
+X417200D01*
+Y110000D01*
+X412700D01*
+G37*
+G36*
+X418100D02*Y104000D01*
+X422600D01*
+Y110000D01*
+X418100D01*
+G37*
+G36*
+X423500D02*Y104000D01*
+X428000D01*
+Y110000D01*
+X423500D01*
+G37*
+G36*
+X428900D02*Y104000D01*
+X433400D01*
+Y110000D01*
+X428900D01*
+G37*
+G36*
+X434300D02*Y104000D01*
+X438800D01*
+Y110000D01*
+X434300D01*
+G37*
+G36*
+X439700D02*Y104000D01*
+X444200D01*
+Y110000D01*
+X439700D01*
+G37*
+G36*
+X445100D02*Y104000D01*
+X449600D01*
+Y110000D01*
+X445100D01*
+G37*
+G36*
+X450500D02*Y104000D01*
+X455000D01*
+Y110000D01*
+X450500D01*
+G37*
+G36*
+X455900D02*Y104000D01*
+X460400D01*
+Y110000D01*
+X455900D01*
+G37*
+G36*
+X461300D02*Y104000D01*
+X465800D01*
+Y110000D01*
+X461300D01*
+G37*
+G36*
+X466700D02*Y104000D01*
+X471200D01*
+Y110000D01*
+X466700D01*
+G37*
+G36*
+X472100D02*Y104000D01*
+X476600D01*
+Y110000D01*
+X472100D01*
+G37*
+G36*
+X477500D02*Y104000D01*
+X482000D01*
+Y110000D01*
+X477500D01*
+G37*
+G36*
+X482900D02*Y104000D01*
+X487400D01*
+Y110000D01*
+X482900D01*
+G37*
+G36*
+X488300D02*Y104000D01*
+X492800D01*
+Y110000D01*
+X488300D01*
+G37*
+G36*
+X496400D02*Y104000D01*
+X500900D01*
+Y110000D01*
+X496400D01*
+G37*
+G36*
+X501800D02*Y104000D01*
+X506300D01*
+Y110000D01*
+X501800D01*
+G37*
+G36*
+X507200D02*Y104000D01*
+X511700D01*
+Y110000D01*
+X507200D01*
+G37*
+G36*
+X512600D02*Y104000D01*
+X517100D01*
+Y110000D01*
+X512600D01*
+G37*
+G36*
+X518000D02*Y104000D01*
+X522500D01*
+Y110000D01*
+X518000D01*
+G37*
+G36*
+X523400D02*Y104000D01*
+X527900D01*
+Y110000D01*
+X523400D01*
+G37*
+G36*
+X528800D02*Y104000D01*
+X533300D01*
+Y110000D01*
+X528800D01*
+G37*
+G36*
+X536900D02*Y104000D01*
+X541400D01*
+Y110000D01*
+X536900D01*
+G37*
+G54D31*X545000D02*Y104000D01*
+Y110000D02*X548000D01*
+X545000Y107300D02*X547250D01*
+G54D32*G36*
+X549800Y110000D02*Y104000D01*
+X554300D01*
+Y110000D01*
+X549800D01*
+G37*
+G36*
+X555200D02*Y104000D01*
+X559700D01*
+Y110000D01*
+X555200D01*
+G37*
+G36*
+X560600D02*Y104000D01*
+X565100D01*
+Y110000D01*
+X560600D01*
+G37*
+G36*
+X566000D02*Y104000D01*
+X570500D01*
+Y110000D01*
+X566000D01*
+G37*
+G36*
+X571400D02*Y104000D01*
+X575900D01*
+Y110000D01*
+X571400D01*
+G37*
+G36*
+X576800D02*Y104000D01*
+X581300D01*
+Y110000D01*
+X576800D01*
+G37*
+G36*
+X582200D02*Y104000D01*
+X586700D01*
+Y110000D01*
+X582200D01*
+G37*
+G36*
+X587600D02*Y104000D01*
+X592100D01*
+Y110000D01*
+X587600D01*
+G37*
+G36*
+X593000D02*Y104000D01*
+X597500D01*
+Y110000D01*
+X593000D01*
+G37*
+G36*
+X598400D02*Y104000D01*
+X602900D01*
+Y110000D01*
+X598400D01*
+G37*
+G54D31*X607250D02*Y104000D01*
+X609200Y110000D02*X610250Y108950D01*
+Y105050D01*
+X609200Y104000D02*X610250Y105050D01*
+X606500Y104000D02*X609200D01*
+X606500Y110000D02*X609200D01*
+G54D32*G36*
+X612050D02*Y104000D01*
+X616550D01*
+Y110000D01*
+X612050D01*
+G37*
+G36*
+X617450D02*Y104000D01*
+X621950D01*
+Y110000D01*
+X617450D01*
+G37*
+G36*
+X622850D02*Y104000D01*
+X627350D01*
+Y110000D01*
+X622850D01*
+G37*
+G36*
+X628250D02*Y104000D01*
+X632750D01*
+Y110000D01*
+X628250D01*
+G37*
+G36*
+X633650D02*Y104000D01*
+X638150D01*
+Y110000D01*
+X633650D01*
+G37*
+G36*
+X639050D02*Y104000D01*
+X643550D01*
+Y110000D01*
+X639050D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group5.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: board with minimal netlist and some back-annotation changes, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD16C,0.0394*%
+%ADD15C,0.0800*%
+%ADD14C,0.0001*%
+G54D14*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D15*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D16*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.group7.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: board with minimal netlist and some back-annotation changes, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD19C,0.0394*%
+%ADD18C,0.0800*%
+%ADD17C,0.0001*%
+G54D17*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D18*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D19*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,10 @@
+M48
+INCH
+T29C0.039
+%
+T29
+X001000Y003250
+X004000Y003250
+X001000Y002250
+X004000Y002250
+M30
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.top.gbr	(revision 18980)
@@ -0,0 +1,24 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: board with minimal netlist and some back-annotation changes, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0394*%
+%ADD12C,0.0800*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X6000Y36500D02*X14000D01*
+Y28500D01*
+X6000D01*
+Y36500D01*
+G37*
+G54D12*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topmask.gbr	(revision 18980)
@@ -0,0 +1,23 @@
+G04 start of page 6 for group 2 layer_idx 9 *
+G04 Title: board with minimal netlist and some back-annotation changes, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD24C,0.0860*%
+%ADD23C,0.0001*%
+G54D23*G36*
+X5700Y36800D02*X14300D01*
+Y28200D01*
+X5700D01*
+Y36800D01*
+G37*
+G54D24*X40000Y32500D03*
+X10000Y22500D03*
+X40000D03*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.gbr/netlist_ba.topsilk.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 8 for group 1 layer_idx 8 *
+G04 Title: board with minimal netlist and some back-annotation changes, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD28C,0.0070*%
+%ADD27C,0.0100*%
+G54D27*X5000Y37500D02*Y17500D01*
+X45000D02*X5000D01*
+X45000D02*Y37500D01*
+X5000D02*X20000D01*
+X30000D02*X45000D01*
+X20000D02*G75*G03X30000Y37500I5000J0D01*G01*
+G54D28*X10000Y42500D02*Y39000D01*
+X10500Y38500D01*
+X11500D01*
+X12000Y39000D01*
+Y42500D02*Y39000D01*
+X13200Y41700D02*X14000Y42500D01*
+Y38500D01*
+X13200D02*X14700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.nelma.em	(revision 18980)
@@ -0,0 +1,61 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+net bar {
+	objects = {
+
+	}
+}
+net foo {
+	objects = {
+
+	}
+}
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   board with minimal netlist and some back-annotation changes
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317bar              U1    -1    D0393PA00X+001000Y+003250X0800Y0800R000 S0      
+317bar              U1    -4    D0393PA00X+004000Y+003250X0800Y0000R000 S0      
+317bar              U1    -2    D0393PA00X+001000Y+002250X0800Y0000R000 S0      
+317foo              U1    -3    D0393PA00X+004000Y+002250X0800Y0000R000 S0      
+999
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist_ba.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.png.text	(revision 18980)
@@ -0,0 +1,15 @@
+r6630
+
+One component U1
+
+U1 (4pin dip)
+Silk line thickness 12 pix (10)
+Inside silk screen corner to Pin1 top corner 6 x 6 pix (5 x 5 mil)
+Pin1 96 x 96 pix (80 x 80)
+Pin1 hole 47 pix (39.166) in diameter
+Pin2 to Pin1 distance 24 pix (20)
+Pin2 97 pix (80.833) circle
+Pin2 to Pin3 distance 263 pix (219.166)
+Pin2 hole 47 pix (39.166) in diameter
+
+
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist_ba.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/netlist_ba.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.svg	(revision 18980)
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#cccccc" fill="#cccccc"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="1.5240,3.4290 3.5560,3.4290 3.5560,5.4610 1.5240,5.4610 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <circle cx="10.1600" cy="4.4450" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="1.0160" stroke-width="0.0000" fill="#4d4d4d" stroke="none"/>
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="1.2700" y1="3.1750" x2="1.2700" y2="8.2550" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="8.2550" x2="1.2700" y2="8.2550" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="11.4300" y1="8.2550" x2="11.4300" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="3.1750" x2="5.0800" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="3.1750" x2="11.4300" y2="3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round"/>
+ <path d="M 7.62000000 3.17500000 A 1.2700 1.2700 0 0 1 5.0800 3.1750" stroke-width="0.2540" stroke="#000000" stroke-linecap="round" fill="none"/>
+ <line x1="2.5400" y1="1.9050" x2="2.5400" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.5400" y1="2.7940" x2="2.6670" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6670" y1="2.9210" x2="2.9210" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.9210" y1="2.9210" x2="3.0480" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.0480" y1="1.9050" x2="3.0480" y2="2.7940" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="2.1082" x2="3.5560" y2="1.9050" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="1.9050" x2="3.5560" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3528" y1="2.9210" x2="3.7338" y2="2.9210" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.5400" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="4.4450" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="10.1600" cy="6.9850" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/netlist_ba.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/netlist_ba.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/netlist_ba.xy	(revision 18980)
@@ -0,0 +1,9 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: board with minimal netlist and some back-annotation changes - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+U1,"dip(4)","4*300",250.00,275.00,0,top
Index: tags/2.0.1/tests/RTT/ref/padrot.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.bom	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Rotated round cap and square pads - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+8,"(unknown)","(unknown)",R1 R3 R2 R6 R4 R5 R7 R8 
Index: tags/2.0.1/tests/RTT/ref/padrot.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.dsn	(revision 18980)
@@ -0,0 +1,170 @@
+(pcb Rotated round cap and square pads
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place "R1" 1.270000 11.430000 front 0 (PN 0))
+    )
+    (component 32
+      (place "R3" 1.270000 7.620000 front 0 (PN 0))
+    )
+    (component 59
+      (place "R2" 5.080000 11.430000 front 0 (PN 0))
+    )
+    (component 86
+      (place "R6" 1.270000 5.715000 front 0 (PN 0))
+    )
+    (component 113
+      (place "R4" 3.175000 8.890000 front 0 (PN 0))
+    )
+    (component 140
+      (place "R5" 5.715000 8.890000 front 0 (PN 0))
+    )
+    (component 167
+      (place "R7" 3.175000 5.080000 front 0 (PN 0))
+    )
+    (component 194
+      (place "R8" 6.985000 5.080000 front 0 (PN 0))
+    )
+  )
+  (library
+    (image 5
+      (pin Pstk_shape_7 "1" 0.952500 0.000000)
+    )
+    (image 32
+      (pin Pstk_shape_34 "1" 0.000000 0.952500)
+    )
+    (image 59
+      (pin Pstk_shape_61 "1" 0.952500 0.000000)
+    )
+    (image 86
+      (pin Pstk_shape_88 "1" 0.000000 -0.952500)
+    )
+    (image 113
+      (pin Pstk_shape_115 "1" 0.673481 -0.673481)
+    )
+    (image 140
+      (pin Pstk_shape_142 "1" 0.673481 -0.673481)
+    )
+    (image 167
+      (pin Pstk_shape_169 "1" 0.881761 -0.360172)
+    )
+    (image 194
+      (pin Pstk_shape_196 "1" 0.881761 -0.360172)
+    )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "3__top_copper" 0
+        -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
+        1.079500 -0.127000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_34
+      (shape
+        (polygon "3__top_copper" 0
+        -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
+        -0.127000 -1.079500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_61
+      (shape
+        (polygon "3__top_copper" 0
+        -1.079499 0.126999 -1.079499 -0.126999 1.079499 -0.126999
+        1.079499 0.126999
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_88
+      (shape
+        (polygon "3__top_copper" 0
+        0.126999 1.079499 -0.126999 1.079499 -0.126999 -1.079499
+        0.126999 -1.079499
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_115
+      (shape
+        (polygon "3__top_copper" 0
+        -0.853086 0.673481 -0.673481 0.853086 0.853086 -0.673481
+        0.673481 -0.853086
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_142
+      (shape
+        (polygon "3__top_copper" 0
+        -0.673481 0.853085 -0.853085 0.673481 0.673481 -0.853085
+        0.853085 -0.673481
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_169
+      (shape
+        (polygon "3__top_copper" 0
+        -1.047355 0.290626 -0.951307 0.525766 1.047355 -0.290626
+        0.951307 -0.525766
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_196
+      (shape
+        (polygon "3__top_copper" 0
+        -0.951308 0.525765 -1.047354 0.290625 0.951308 -0.525765
+        1.047354 -0.290625
+        )
+      )
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/padrot.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.eps	(revision 18980)
@@ -0,0 +1,208 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: padrot.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.301961 0.301961 0.301961 setrgbcolor
+0.05000 0.05000 0.12500 0.05000 t
+0.05000 0.12500 0.05000 0.20000 t
+0.19500 0.04500 moveto
+0.19500 0.05500 lineto
+0.28000 0.05500 lineto
+0.28000 0.04500 lineto
+fill
+0.05500 0.27000 moveto
+0.04500 0.27000 lineto
+0.04500 0.35500 lineto
+0.05500 0.35500 lineto
+fill
+0.12500 0.15000 0.17803 0.20303 t
+0.22500 0.14293 moveto
+0.21793 0.15000 lineto
+0.27803 0.21010 lineto
+0.28510 0.20303 lineto
+fill
+0.12500 0.30000 0.19443 0.32836 t
+0.27226 0.29348 moveto
+0.26848 0.30274 lineto
+0.34717 0.33488 lineto
+0.35095 0.32562 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+0.00500 setlinewidth
+0 0 0 setrgbcolor
+0.02500 0.07500 0.15000 0.07500 t
+0.15000 0.07500 0.15000 0.02500 t
+0.15000 0.02500 0.02500 0.02500 t
+0.02500 0.07500 0.02500 0.02500 t
+0.02500 0.10000 0.07500 0.10000 t
+0.07500 0.10000 0.07500 0.22500 t
+0.02500 0.10000 0.02500 0.22500 t
+0.02500 0.22500 0.07500 0.22500 t
+0.02500 0.25000 0.02500 0.37500 t
+0.02500 0.37500 0.07500 0.37500 t
+0.07500 0.25000 0.07500 0.37500 t
+0.02500 0.25000 0.07500 0.25000 t
+0.17500 0.07500 0.30000 0.07500 t
+0.30000 0.02500 0.30000 0.07500 t
+0.17500 0.02500 0.30000 0.02500 t
+0.17500 0.02500 0.17500 0.07500 t
+0.08964 0.15000 0.12500 0.11464 t
+0.08964 0.15000 0.17803 0.23839 t
+0.12500 0.11464 0.21339 0.20303 t
+0.17803 0.23839 0.21339 0.20303 t
+0.18964 0.15000 0.27803 0.23839 t
+0.27803 0.23839 0.31339 0.20303 t
+0.22500 0.11464 0.31339 0.20303 t
+0.18964 0.15000 0.22500 0.11464 t
+0.09240 0.31369 0.20812 0.36096 t
+0.20812 0.36096 0.22703 0.31467 t
+0.24240 0.31369 0.35812 0.36096 t
+0.35812 0.36096 0.37703 0.31467 t
+0.11131 0.26740 0.22703 0.31467 t
+0.26131 0.26740 0.37703 0.31467 t
+0.24240 0.31369 0.26131 0.26740 t
+0.09240 0.31369 0.11131 0.26740 t
+0.00700 setlinewidth
+0.01500 0.01500 0.02600 0.01500 t
+0.02600 0.01500 0.02875 0.01775 t
+0.02875 0.01775 0.02875 0.02325 t
+0.02600 0.02600 0.02875 0.02325 t
+0.01775 0.02600 0.02600 0.02600 t
+0.01775 0.01500 0.01775 0.03700 t
+0.02215 0.02600 0.02875 0.03700 t
+0.03535 0.01940 0.03975 0.01500 t
+0.03975 0.01500 0.03975 0.03700 t
+0.03535 0.03700 0.04360 0.03700 t
+0.31250 0.02500 0.33250 0.02500 t
+0.33250 0.02500 0.33750 0.03000 t
+0.33750 0.03000 0.33750 0.04000 t
+0.33250 0.04500 0.33750 0.04000 t
+0.31750 0.04500 0.33250 0.04500 t
+0.31750 0.02500 0.31750 0.06500 t
+0.32550 0.04500 0.33750 0.06500 t
+0.34950 0.03000 0.35450 0.02500 t
+0.35450 0.02500 0.36950 0.02500 t
+0.36950 0.02500 0.37450 0.03000 t
+0.37450 0.03000 0.37450 0.04000 t
+0.34950 0.06500 0.37450 0.04000 t
+0.34950 0.06500 0.37450 0.06500 t
+0.14000 0.13300 0.14000 0.14500 t
+0.14000 0.13300 0.14300 0.13000 t
+0.14300 0.13000 0.14900 0.13000 t
+0.15200 0.13300 0.14900 0.13000 t
+0.15200 0.13300 0.15200 0.14200 t
+0.14000 0.14200 0.16400 0.14200 t
+0.15200 0.13720 0.16400 0.13000 t
+0.15500 0.12280 0.14000 0.11080 t
+0.15500 0.10780 0.15500 0.12280 t
+0.14000 0.11080 0.16400 0.11080 t
+0.35500 0.13500 0.35500 0.15500 t
+0.35500 0.15500 0.35000 0.16000 t
+0.34000 0.16000 0.35000 0.16000 t
+0.33500 0.15500 0.34000 0.16000 t
+0.33500 0.14000 0.33500 0.15500 t
+0.31500 0.14000 0.35500 0.14000 t
+0.33500 0.14800 0.31500 0.16000 t
+0.35500 0.17200 0.35500 0.19200 t
+0.33500 0.17200 0.35500 0.17200 t
+0.33500 0.17200 0.34000 0.17700 t
+0.34000 0.17700 0.34000 0.18700 t
+0.34000 0.18700 0.33500 0.19200 t
+0.32000 0.19200 0.33500 0.19200 t
+0.31500 0.18700 0.32000 0.19200 t
+0.31500 0.17700 0.31500 0.18700 t
+0.32000 0.17200 0.31500 0.17700 t
+0.08000 0.21950 0.08000 0.23250 t
+0.08000 0.21950 0.08325 0.21625 t
+0.08325 0.21625 0.08975 0.21625 t
+0.09300 0.21950 0.08975 0.21625 t
+0.09300 0.21950 0.09300 0.22925 t
+0.08000 0.22925 0.10600 0.22925 t
+0.09300 0.22405 0.10600 0.21625 t
+0.08325 0.20845 0.08000 0.20520 t
+0.08000 0.19870 0.08000 0.20520 t
+0.08000 0.19870 0.08325 0.19545 t
+0.10600 0.19870 0.10275 0.19545 t
+0.10600 0.19870 0.10600 0.20520 t
+0.10275 0.20845 0.10600 0.20520 t
+0.09170 0.19870 0.09170 0.20520 t
+0.08325 0.19545 0.08845 0.19545 t
+0.09495 0.19545 0.10275 0.19545 t
+0.09495 0.19545 0.09170 0.19870 t
+0.08845 0.19545 0.09170 0.19870 t
+0.07000 0.39000 0.07000 0.41000 t
+0.07000 0.41000 0.06500 0.41500 t
+0.05500 0.41500 0.06500 0.41500 t
+0.05000 0.41000 0.05500 0.41500 t
+0.05000 0.39500 0.05000 0.41000 t
+0.03000 0.39500 0.07000 0.39500 t
+0.05000 0.40300 0.03000 0.41500 t
+0.07000 0.44200 0.06500 0.44700 t
+0.07000 0.43200 0.07000 0.44200 t
+0.06500 0.42700 0.07000 0.43200 t
+0.03500 0.42700 0.06500 0.42700 t
+0.03500 0.42700 0.03000 0.43200 t
+0.05200 0.44200 0.04700 0.44700 t
+0.05200 0.42700 0.05200 0.44200 t
+0.03000 0.43200 0.03000 0.44200 t
+0.03000 0.44200 0.03500 0.44700 t
+0.03500 0.44700 0.04700 0.44700 t
+0.19500 0.36500 0.19500 0.38500 t
+0.19500 0.38500 0.19000 0.39000 t
+0.18000 0.39000 0.19000 0.39000 t
+0.17500 0.38500 0.18000 0.39000 t
+0.17500 0.37000 0.17500 0.38500 t
+0.15500 0.37000 0.19500 0.37000 t
+0.17500 0.37800 0.15500 0.39000 t
+0.15500 0.40700 0.19500 0.42700 t
+0.19500 0.40200 0.19500 0.42700 t
+0.33500 0.37500 0.33500 0.39500 t
+0.33500 0.39500 0.33000 0.40000 t
+0.32000 0.40000 0.33000 0.40000 t
+0.31500 0.39500 0.32000 0.40000 t
+0.31500 0.38000 0.31500 0.39500 t
+0.29500 0.38000 0.33500 0.38000 t
+0.31500 0.38800 0.29500 0.40000 t
+0.30000 0.41200 0.29500 0.41700 t
+0.30000 0.41200 0.30800 0.41200 t
+0.30800 0.41200 0.31500 0.41900 t
+0.31500 0.41900 0.31500 0.42500 t
+0.31500 0.42500 0.30800 0.43200 t
+0.30000 0.43200 0.30800 0.43200 t
+0.29500 0.42700 0.30000 0.43200 t
+0.29500 0.41700 0.29500 0.42700 t
+0.32200 0.41200 0.31500 0.41900 t
+0.32200 0.41200 0.33000 0.41200 t
+0.33000 0.41200 0.33500 0.41700 t
+0.33500 0.41700 0.33500 0.42700 t
+0.33500 0.42700 0.33000 0.43200 t
+0.32200 0.43200 0.33000 0.43200 t
+0.31500 0.42500 0.32200 0.43200 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/padrot.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.fcd	(revision 18980)
@@ -0,0 +1 @@
+[FIDOCAD]
Index: tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.fab.gbr	(revision 18980)
@@ -0,0 +1,1826 @@
+G04 start of page 6 for group -1 layer_idx 16777221 *
+G04 Title: Rotated round cap and square pads, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD21C,0.0100*%
+%ADD20C,0.0001*%
+%ADD19C,0.0060*%
+G54D19*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D20*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D19*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D20*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D19*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D20*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D19*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D20*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D19*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D20*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D19*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D20*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D21*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D19*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D20*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D19*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D20*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D19*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D20*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D19*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D20*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D19*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D20*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D19*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D20*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D19*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D20*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D19*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D20*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D19*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D20*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D19*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D20*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D19*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D20*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D19*X234500D02*X237500D01*
+X238250Y109250D01*
+Y107750D01*
+X237500Y107000D02*X238250Y107750D01*
+X235250Y107000D02*X237500D01*
+X235250Y110000D02*Y104000D01*
+X236450Y107000D02*X238250Y104000D01*
+G54D20*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X256250D02*Y104000D01*
+X260750D01*
+Y110000D01*
+X256250D01*
+G37*
+G36*
+X261650D02*Y104000D01*
+X266150D01*
+Y110000D01*
+X261650D01*
+G37*
+G36*
+X267050D02*Y104000D01*
+X271550D01*
+Y110000D01*
+X267050D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X280550D02*Y104000D01*
+X285050D01*
+Y110000D01*
+X280550D01*
+G37*
+G36*
+X285950D02*Y104000D01*
+X290450D01*
+Y110000D01*
+X285950D01*
+G37*
+G36*
+X291350D02*Y104000D01*
+X295850D01*
+Y110000D01*
+X291350D01*
+G37*
+G36*
+X296750D02*Y104000D01*
+X301250D01*
+Y110000D01*
+X296750D01*
+G37*
+G36*
+X304850D02*Y104000D01*
+X309350D01*
+Y110000D01*
+X304850D01*
+G37*
+G36*
+X310250D02*Y104000D01*
+X314750D01*
+Y110000D01*
+X310250D01*
+G37*
+G36*
+X315650D02*Y104000D01*
+X320150D01*
+Y110000D01*
+X315650D01*
+G37*
+G36*
+X323750D02*Y104000D01*
+X328250D01*
+Y110000D01*
+X323750D01*
+G37*
+G36*
+X329150D02*Y104000D01*
+X333650D01*
+Y110000D01*
+X329150D01*
+G37*
+G36*
+X334550D02*Y104000D01*
+X339050D01*
+Y110000D01*
+X334550D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G36*
+X358850D02*Y104000D01*
+X363350D01*
+Y110000D01*
+X358850D01*
+G37*
+G36*
+X364250D02*Y104000D01*
+X368750D01*
+Y110000D01*
+X364250D01*
+G37*
+G36*
+X369650D02*Y104000D01*
+X374150D01*
+Y110000D01*
+X369650D01*
+G37*
+G36*
+X377750D02*Y104000D01*
+X382250D01*
+Y110000D01*
+X377750D01*
+G37*
+G36*
+X383150D02*Y104000D01*
+X387650D01*
+Y110000D01*
+X383150D01*
+G37*
+G36*
+X388550D02*Y104000D01*
+X393050D01*
+Y110000D01*
+X388550D01*
+G37*
+G36*
+X393950D02*Y104000D01*
+X398450D01*
+Y110000D01*
+X393950D01*
+G37*
+G36*
+X402050D02*Y104000D01*
+X406550D01*
+Y110000D01*
+X402050D01*
+G37*
+G54D19*X410150D02*Y104000D01*
+Y110000D02*X413150D01*
+X410150Y107300D02*X412400D01*
+G54D20*G36*
+X414950Y110000D02*Y104000D01*
+X419450D01*
+Y110000D01*
+X414950D01*
+G37*
+G36*
+X420350D02*Y104000D01*
+X424850D01*
+Y110000D01*
+X420350D01*
+G37*
+G36*
+X425750D02*Y104000D01*
+X430250D01*
+Y110000D01*
+X425750D01*
+G37*
+G36*
+X431150D02*Y104000D01*
+X435650D01*
+Y110000D01*
+X431150D01*
+G37*
+G36*
+X436550D02*Y104000D01*
+X441050D01*
+Y110000D01*
+X436550D01*
+G37*
+G36*
+X441950D02*Y104000D01*
+X446450D01*
+Y110000D01*
+X441950D01*
+G37*
+G36*
+X447350D02*Y104000D01*
+X451850D01*
+Y110000D01*
+X447350D01*
+G37*
+G36*
+X452750D02*Y104000D01*
+X457250D01*
+Y110000D01*
+X452750D01*
+G37*
+G36*
+X458150D02*Y104000D01*
+X462650D01*
+Y110000D01*
+X458150D01*
+G37*
+G36*
+X463550D02*Y104000D01*
+X468050D01*
+Y110000D01*
+X463550D01*
+G37*
+G54D19*X472400D02*Y104000D01*
+X474350Y110000D02*X475400Y108950D01*
+Y105050D01*
+X474350Y104000D02*X475400Y105050D01*
+X471650Y104000D02*X474350D01*
+X471650Y110000D02*X474350D01*
+G54D20*G36*
+X477200D02*Y104000D01*
+X481700D01*
+Y110000D01*
+X477200D01*
+G37*
+G36*
+X482600D02*Y104000D01*
+X487100D01*
+Y110000D01*
+X482600D01*
+G37*
+G36*
+X488000D02*Y104000D01*
+X492500D01*
+Y110000D01*
+X488000D01*
+G37*
+G36*
+X493400D02*Y104000D01*
+X497900D01*
+Y110000D01*
+X493400D01*
+G37*
+G36*
+X498800D02*Y104000D01*
+X503300D01*
+Y110000D01*
+X498800D01*
+G37*
+G36*
+X504200D02*Y104000D01*
+X508700D01*
+Y110000D01*
+X504200D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.top.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Rotated round cap and square pads, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD12C,0.0001*%
+%ADD11C,0.0100*%
+G54D11*X5000Y45000D02*X12500D01*
+X5000Y37500D02*Y30000D01*
+G54D12*G36*
+X19500Y45500D02*Y44500D01*
+X28000D01*
+Y45500D01*
+X19500D01*
+G37*
+G36*
+X5500Y23000D02*X4500D01*
+Y14500D01*
+X5500D01*
+Y23000D01*
+G37*
+G54D11*X12500Y35000D02*X17803Y29697D01*
+G54D12*G36*
+X22500Y35707D02*X21793Y35000D01*
+X27803Y28990D01*
+X28510Y29697D01*
+X22500Y35707D01*
+G37*
+G54D11*X12500Y20000D02*X19443Y17164D01*
+G54D12*G36*
+X27226Y20652D02*X26848Y19726D01*
+X34717Y16512D01*
+X35095Y17438D01*
+X27226Y20652D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topmask.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 3 for group 2 layer_idx 9 *
+G04 Title: Rotated round cap and square pads, top_mask *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPMASK*%
+%ADD14C,0.0001*%
+%ADD13C,0.0500*%
+G54D13*X5000Y45000D02*X12500D01*
+X5000Y37500D02*Y30000D01*
+G54D14*G36*
+X17500Y47500D02*Y42500D01*
+X30000D01*
+Y47500D01*
+X17500D01*
+G37*
+G36*
+X7500Y25000D02*X2500D01*
+Y12500D01*
+X7500D01*
+Y25000D01*
+G37*
+G54D13*X12500Y35000D02*X17803Y29697D01*
+G54D14*G36*
+X22500Y38536D02*X18964Y35000D01*
+X27803Y26161D01*
+X31339Y29697D01*
+X22500Y38536D01*
+G37*
+G54D13*X12500Y20000D02*X19443Y17164D01*
+G54D14*G36*
+X26131Y23260D02*X24240Y18631D01*
+X35812Y13904D01*
+X37703Y18533D01*
+X26131Y23260D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.toppaste.gbr	(revision 18980)
@@ -0,0 +1,42 @@
+G04 start of page 5 for group 0 layer_idx 11 *
+G04 Title: Rotated round cap and square pads, top_paste *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPPASTE*%
+%ADD18C,0.0001*%
+%ADD17C,0.0100*%
+G54D17*X5000Y45000D02*X12500D01*
+X5000Y37500D02*Y30000D01*
+G54D18*G36*
+X19500Y45500D02*Y44500D01*
+X28000D01*
+Y45500D01*
+X19500D01*
+G37*
+G36*
+X5500Y23000D02*X4500D01*
+Y14500D01*
+X5500D01*
+Y23000D01*
+G37*
+G54D17*X12500Y35000D02*X17803Y29697D01*
+G54D18*G36*
+X22500Y35707D02*X21793Y35000D01*
+X27803Y28990D01*
+X28510Y29697D01*
+X22500Y35707D01*
+G37*
+G54D17*X12500Y20000D02*X19443Y17164D01*
+G54D18*G36*
+X27226Y20652D02*X26848Y19726D01*
+X34717Y16512D01*
+X35095Y17438D01*
+X27226Y20652D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.gbr/padrot.topsilk.gbr	(revision 18980)
@@ -0,0 +1,161 @@
+G04 start of page 4 for group 1 layer_idx 8 *
+G04 Title: Rotated round cap and square pads, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD16C,0.0070*%
+%ADD15C,0.0050*%
+G54D15*X2500Y42500D02*X15000D01*
+Y47500D01*
+X2500D01*
+Y42500D02*Y47500D01*
+Y40000D02*X7500D01*
+Y27500D01*
+X2500Y40000D02*Y27500D01*
+X7500D01*
+X2500Y25000D02*Y12500D01*
+X7500D01*
+Y25000D02*Y12500D01*
+X2500Y25000D02*X7500D01*
+X17500Y42500D02*X30000D01*
+Y47500D02*Y42500D01*
+X17500Y47500D02*X30000D01*
+X17500D02*Y42500D01*
+X8964Y35000D02*X12500Y38536D01*
+X8964Y35000D02*X17803Y26161D01*
+X12500Y38536D02*X21339Y29697D01*
+X17803Y26161D02*X21339Y29697D01*
+X18964Y35000D02*X27803Y26161D01*
+X31339Y29697D01*
+X22500Y38536D02*X31339Y29697D01*
+X18964Y35000D02*X22500Y38536D01*
+X9240Y18631D02*X20812Y13904D01*
+X22703Y18533D01*
+X24240Y18631D02*X35812Y13904D01*
+X37703Y18533D01*
+X11131Y23260D02*X22703Y18533D01*
+X26131Y23260D02*X37703Y18533D01*
+X24240Y18631D02*X26131Y23260D01*
+X9240Y18631D02*X11131Y23260D01*
+G54D16*X1500Y48500D02*X2600D01*
+X2875Y48225D01*
+Y47675D01*
+X2600Y47400D02*X2875Y47675D01*
+X1775Y47400D02*X2600D01*
+X1775Y48500D02*Y46300D01*
+X2215Y47400D02*X2875Y46300D01*
+X3535Y48060D02*X3975Y48500D01*
+Y46300D01*
+X3535D02*X4360D01*
+X31250Y47500D02*X33250D01*
+X33750Y47000D01*
+Y46000D01*
+X33250Y45500D02*X33750Y46000D01*
+X31750Y45500D02*X33250D01*
+X31750Y47500D02*Y43500D01*
+X32550Y45500D02*X33750Y43500D01*
+X34950Y47000D02*X35450Y47500D01*
+X36950D01*
+X37450Y47000D01*
+Y46000D01*
+X34950Y43500D02*X37450Y46000D01*
+X34950Y43500D02*X37450D01*
+X14000Y36700D02*Y35500D01*
+Y36700D02*X14300Y37000D01*
+X14900D01*
+X15200Y36700D02*X14900Y37000D01*
+X15200Y36700D02*Y35800D01*
+X14000D02*X16400D01*
+X15200Y36280D02*X16400Y37000D01*
+X15500Y37720D02*X14000Y38920D01*
+X15500Y39220D02*Y37720D01*
+X14000Y38920D02*X16400D01*
+X35500Y36500D02*Y34500D01*
+X35000Y34000D01*
+X34000D02*X35000D01*
+X33500Y34500D02*X34000Y34000D01*
+X33500Y36000D02*Y34500D01*
+X31500Y36000D02*X35500D01*
+X33500Y35200D02*X31500Y34000D01*
+X35500Y32800D02*Y30800D01*
+X33500Y32800D02*X35500D01*
+X33500D02*X34000Y32300D01*
+Y31300D01*
+X33500Y30800D01*
+X32000D02*X33500D01*
+X31500Y31300D02*X32000Y30800D01*
+X31500Y32300D02*Y31300D01*
+X32000Y32800D02*X31500Y32300D01*
+X8000Y28050D02*Y26750D01*
+Y28050D02*X8325Y28375D01*
+X8975D01*
+X9300Y28050D02*X8975Y28375D01*
+X9300Y28050D02*Y27075D01*
+X8000D02*X10600D01*
+X9300Y27595D02*X10600Y28375D01*
+X8325Y29155D02*X8000Y29480D01*
+Y30130D02*Y29480D01*
+Y30130D02*X8325Y30455D01*
+X10600Y30130D02*X10275Y30455D01*
+X10600Y30130D02*Y29480D01*
+X10275Y29155D02*X10600Y29480D01*
+X9170Y30130D02*Y29480D01*
+X8325Y30455D02*X8845D01*
+X9495D02*X10275D01*
+X9495D02*X9170Y30130D01*
+X8845Y30455D02*X9170Y30130D01*
+X7000Y11000D02*Y9000D01*
+X6500Y8500D01*
+X5500D02*X6500D01*
+X5000Y9000D02*X5500Y8500D01*
+X5000Y10500D02*Y9000D01*
+X3000Y10500D02*X7000D01*
+X5000Y9700D02*X3000Y8500D01*
+X7000Y5800D02*X6500Y5300D01*
+X7000Y6800D02*Y5800D01*
+X6500Y7300D02*X7000Y6800D01*
+X3500Y7300D02*X6500D01*
+X3500D02*X3000Y6800D01*
+X5200Y5800D02*X4700Y5300D01*
+X5200Y7300D02*Y5800D01*
+X3000Y6800D02*Y5800D01*
+X3500Y5300D01*
+X4700D01*
+X19500Y13500D02*Y11500D01*
+X19000Y11000D01*
+X18000D02*X19000D01*
+X17500Y11500D02*X18000Y11000D01*
+X17500Y13000D02*Y11500D01*
+X15500Y13000D02*X19500D01*
+X17500Y12200D02*X15500Y11000D01*
+Y9300D02*X19500Y7300D01*
+Y9800D02*Y7300D01*
+X33500Y12500D02*Y10500D01*
+X33000Y10000D01*
+X32000D02*X33000D01*
+X31500Y10500D02*X32000Y10000D01*
+X31500Y12000D02*Y10500D01*
+X29500Y12000D02*X33500D01*
+X31500Y11200D02*X29500Y10000D01*
+X30000Y8800D02*X29500Y8300D01*
+X30000Y8800D02*X30800D01*
+X31500Y8100D01*
+Y7500D01*
+X30800Y6800D01*
+X30000D02*X30800D01*
+X29500Y7300D02*X30000Y6800D01*
+X29500Y8300D02*Y7300D01*
+X32200Y8800D02*X31500Y8100D01*
+X32200Y8800D02*X33000D01*
+X33500Y8300D01*
+Y7300D01*
+X33000Y6800D01*
+X32200D02*X33000D01*
+X31500Y7500D02*X32200Y6800D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padrot.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/padrot.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.net	(revision 18980)
@@ -0,0 +1,20 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Rotated round cap and square pads
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+327N/C              R1    -1          A01X+000875Y+004500X0850Y0100R000 S1      
+327N/C              R3    -1          A01X+000500Y+003375X0100Y0850R000 S1      
+327N/C              R2    -1          A01X+002375Y+004500X0850Y0100R000 S1      
+327N/C              R6    -1          A01X+000500Y+001875X0100Y0850R000 S1      
+327N/C              R4    -1          A01X+001515Y+003234X0630Y0630R000 S1      
+327N/C              R5    -1          A01X+002515Y+003234X0630Y0630R000 S1      
+327N/C              R7    -1          A01X+001597Y+001858X0794Y0383R000 S1      
+327N/C              R8    -1          A01X+003097Y+001858X0794Y0383R000 S1      
+999
Index: tags/2.0.1/tests/RTT/ref/padrot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/padrot.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/padrot.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/padrot.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/padrot.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/padrot.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/padrot.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.svg	(revision 18980)
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <line x1="1.2700" y1="1.2700" x2="3.1750" y2="1.2700" stroke-width="0.2540" stroke="#4d4d4d" stroke-linecap="round"/>
+ <line x1="1.2700" y1="3.1750" x2="1.2700" y2="5.0800" stroke-width="0.2540" stroke="#4d4d4d" stroke-linecap="round"/>
+ <polygon points="4.9530,1.1430 4.9530,1.3970 7.1120,1.3970 7.1120,1.1430 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <polygon points="1.3970,6.8580 1.1430,6.8580 1.1430,9.0170 1.3970,9.0170 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <line x1="3.1750" y1="3.8100" x2="4.5220" y2="5.1570" stroke-width="0.2540" stroke="#4d4d4d" stroke-linecap="round"/>
+ <polygon points="5.7150,3.6304 5.5354,3.8100 7.0620,5.3366 7.2416,5.1570 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+ <line x1="3.1750" y1="7.6200" x2="4.9385" y2="8.3403" stroke-width="0.2540" stroke="#4d4d4d" stroke-linecap="round"/>
+ <polygon points="6.9155,7.4544 6.8194,7.6895 8.8181,8.5059 8.9141,8.2708 " stroke-width="0.010" stroke="#4d4d4d" fill="#4d4d4d"/>
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="0.6350" y1="1.9050" x2="3.8100" y2="1.9050" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="1.9050" x2="3.8100" y2="0.6350" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="0.6350" x2="0.6350" y2="0.6350" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="1.9050" x2="0.6350" y2="0.6350" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="2.5400" x2="1.9050" y2="2.5400" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="2.5400" x2="1.9050" y2="5.7150" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="2.5400" x2="0.6350" y2="5.7150" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="5.7150" x2="1.9050" y2="5.7150" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="6.3500" x2="0.6350" y2="9.5250" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="9.5250" x2="1.9050" y2="9.5250" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="6.3500" x2="1.9050" y2="9.5250" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6350" y1="6.3500" x2="1.9050" y2="6.3500" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="1.9050" x2="7.6200" y2="1.9050" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="0.6350" x2="7.6200" y2="1.9050" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="0.6350" x2="7.6200" y2="0.6350" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="0.6350" x2="4.4450" y2="1.9050" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2769" y1="3.8100" x2="3.1750" y2="2.9119" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2769" y1="3.8100" x2="4.5220" y2="6.0551" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.1750" y1="2.9119" x2="5.4201" y2="5.1570" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.5220" y1="6.0551" x2="5.4201" y2="5.1570" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.8169" y1="3.8100" x2="7.0620" y2="6.0551" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.0620" y1="6.0551" x2="7.9601" y2="5.1570" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="2.9119" x2="7.9601" y2="5.1570" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.8169" y1="3.8100" x2="5.7150" y2="2.9119" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3470" y1="7.9677" x2="5.2862" y2="9.1684" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.2862" y1="9.1684" x2="5.7666" y2="7.9926" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.1570" y1="7.9677" x2="9.0962" y2="9.1684" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0962" y1="9.1684" x2="9.5766" y2="7.9926" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.8273" y1="6.7920" x2="5.7666" y2="7.9926" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6373" y1="6.7920" x2="9.5766" y2="7.9926" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.1570" y1="7.9677" x2="6.6373" y2="6.7920" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3470" y1="7.9677" x2="2.8273" y2="6.7920" stroke-width="0.1270" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.3810" y1="0.3810" x2="0.6604" y2="0.3810" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6604" y1="0.3810" x2="0.7302" y2="0.4508" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.7302" y1="0.4508" x2="0.7302" y2="0.5906" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.6604" y1="0.6604" x2="0.7302" y2="0.5906" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.4508" y1="0.6604" x2="0.6604" y2="0.6604" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.4508" y1="0.3810" x2="0.4508" y2="0.9398" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.5626" y1="0.6604" x2="0.7302" y2="0.9398" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.8979" y1="0.4928" x2="1.0097" y2="0.3810" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.0097" y1="0.3810" x2="1.0097" y2="0.9398" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.8979" y1="0.9398" x2="1.1074" y2="0.9398" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.9375" y1="0.6350" x2="8.4455" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.4455" y1="0.6350" x2="8.5725" y2="0.7620" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5725" y1="0.7620" x2="8.5725" y2="1.0160" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.4455" y1="1.1430" x2="8.5725" y2="1.0160" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0645" y1="1.1430" x2="8.4455" y2="1.1430" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0645" y1="0.6350" x2="8.0645" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.2677" y1="1.1430" x2="8.5725" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8773" y1="0.7620" x2="9.0043" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0043" y1="0.6350" x2="9.3853" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.3853" y1="0.6350" x2="9.5123" y2="0.7620" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.5123" y1="0.7620" x2="9.5123" y2="1.0160" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8773" y1="1.6510" x2="9.5123" y2="1.0160" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8773" y1="1.6510" x2="9.5123" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="3.3782" x2="3.5560" y2="3.6830" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="3.3782" x2="3.6322" y2="3.3020" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.6322" y1="3.3020" x2="3.7846" y2="3.3020" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8608" y1="3.3782" x2="3.7846" y2="3.3020" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8608" y1="3.3782" x2="3.8608" y2="3.6068" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="3.6068" x2="4.1656" y2="3.6068" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8608" y1="3.4849" x2="4.1656" y2="3.3020" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="3.1191" x2="3.5560" y2="2.8143" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="2.7381" x2="3.9370" y2="3.1191" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.5560" y1="2.8143" x2="4.1656" y2="2.8143" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0170" y1="3.4290" x2="9.0170" y2="3.9370" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0170" y1="3.9370" x2="8.8900" y2="4.0640" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.6360" y1="4.0640" x2="8.8900" y2="4.0640" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="3.9370" x2="8.6360" y2="4.0640" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="3.5560" x2="8.5090" y2="3.9370" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="3.5560" x2="9.0170" y2="3.5560" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="3.7592" x2="8.0010" y2="4.0640" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="9.0170" y1="4.3688" x2="9.0170" y2="4.8768" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="4.3688" x2="9.0170" y2="4.3688" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="4.3688" x2="8.6360" y2="4.4958" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.6360" y1="4.4958" x2="8.6360" y2="4.7498" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.6360" y1="4.7498" x2="8.5090" y2="4.8768" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1280" y1="4.8768" x2="8.5090" y2="4.8768" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="4.7498" x2="8.1280" y2="4.8768" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="4.4958" x2="8.0010" y2="4.7498" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1280" y1="4.3688" x2="8.0010" y2="4.4958" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="5.5753" x2="2.0320" y2="5.9055" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="5.5753" x2="2.1145" y2="5.4928" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.1145" y1="5.4928" x2="2.2797" y2="5.4928" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3622" y1="5.5753" x2="2.2797" y2="5.4928" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3622" y1="5.5753" x2="2.3622" y2="5.8229" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="5.8229" x2="2.6924" y2="5.8229" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3622" y1="5.6909" x2="2.6924" y2="5.4928" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.1145" y1="5.2946" x2="2.0320" y2="5.2121" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="5.0470" x2="2.0320" y2="5.2121" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.0320" y1="5.0470" x2="2.1145" y2="4.9644" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6924" y1="5.0470" x2="2.6098" y2="4.9644" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6924" y1="5.0470" x2="2.6924" y2="5.2121" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.6098" y1="5.2946" x2="2.6924" y2="5.2121" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.3292" y1="5.0470" x2="2.3292" y2="5.2121" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.1145" y1="4.9644" x2="2.2466" y2="4.9644" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.4117" y1="4.9644" x2="2.6098" y2="4.9644" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.4117" y1="4.9644" x2="2.3292" y2="5.0470" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2466" y1="4.9644" x2="2.3292" y2="5.0470" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.7780" y1="9.9060" x2="1.7780" y2="10.4140" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.7780" y1="10.4140" x2="1.6510" y2="10.5410" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3970" y1="10.5410" x2="1.6510" y2="10.5410" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="10.4140" x2="1.3970" y2="10.5410" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="10.0330" x2="1.2700" y2="10.4140" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.7620" y1="10.0330" x2="1.7780" y2="10.0330" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="10.2362" x2="0.7620" y2="10.5410" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.7780" y1="11.2268" x2="1.6510" y2="11.3538" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.7780" y1="10.9728" x2="1.7780" y2="11.2268" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.6510" y1="10.8458" x2="1.7780" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.8890" y1="10.8458" x2="1.6510" y2="10.8458" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.8890" y1="10.8458" x2="0.7620" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3208" y1="11.2268" x2="1.1938" y2="11.3538" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3208" y1="10.8458" x2="1.3208" y2="11.2268" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.7620" y1="10.9728" x2="0.7620" y2="11.2268" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.7620" y1="11.2268" x2="0.8890" y2="11.3538" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="0.8890" y1="11.3538" x2="1.1938" y2="11.3538" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.9530" y1="9.2710" x2="4.9530" y2="9.7790" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.9530" y1="9.7790" x2="4.8260" y2="9.9060" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.5720" y1="9.9060" x2="4.8260" y2="9.9060" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="9.7790" x2="4.5720" y2="9.9060" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="9.3980" x2="4.4450" y2="9.7790" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="9.3980" x2="4.9530" y2="9.3980" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.4450" y1="9.6012" x2="3.9370" y2="9.9060" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="10.3378" x2="4.9530" y2="10.8458" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.9530" y1="10.2108" x2="4.9530" y2="10.8458" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="9.5250" x2="8.5090" y2="10.0330" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="10.0330" x2="8.3820" y2="10.1600" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1280" y1="10.1600" x2="8.3820" y2="10.1600" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="10.0330" x2="8.1280" y2="10.1600" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="9.6520" x2="8.0010" y2="10.0330" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.4930" y1="9.6520" x2="8.5090" y2="9.6520" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="9.8552" x2="7.4930" y2="10.1600" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="10.4648" x2="7.4930" y2="10.5918" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="10.4648" x2="7.8232" y2="10.4648" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.8232" y1="10.4648" x2="8.0010" y2="10.6426" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="10.6426" x2="8.0010" y2="10.7950" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="10.7950" x2="7.8232" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.6200" y1="10.9728" x2="7.8232" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.4930" y1="10.8458" x2="7.6200" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.4930" y1="10.5918" x2="7.4930" y2="10.8458" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1788" y1="10.4648" x2="8.0010" y2="10.6426" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1788" y1="10.4648" x2="8.3820" y2="10.4648" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.3820" y1="10.4648" x2="8.5090" y2="10.5918" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="10.5918" x2="8.5090" y2="10.8458" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.5090" y1="10.8458" x2="8.3820" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.1788" y1="10.9728" x2="8.3820" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.0010" y1="10.7950" x2="8.1788" y2="10.9728" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/padrot.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/padrot.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padrot.xy	(revision 18980)
@@ -0,0 +1,16 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Rotated round cap and square pads - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
+R1,"(unknown)","(unknown)",87.50,450.00,0,top
+R3,"(unknown)","(unknown)",50.00,337.50,0,top
+R2,"(unknown)","(unknown)",237.50,450.00,0,top
+R6,"(unknown)","(unknown)",50.00,187.50,0,top
+R4,"(unknown)","(unknown)",151.51,323.49,0,top
+R5,"(unknown)","(unknown)",251.51,323.49,0,top
+R7,"(unknown)","(unknown)",159.72,185.82,0,top
+R8,"(unknown)","(unknown)",309.71,185.82,0,top
Index: tags/2.0.1/tests/RTT/ref/padstack.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: (unknown) - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/padstack.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.dsn	(revision 18980)
@@ -0,0 +1,62 @@
+(pcb notnamed
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 60
+      (place 60 1.905000 10.160000 front 0 (PN 0))
+    )
+    (component 62
+      (place 62 9.525000 10.160000 front 0 (PN 0))
+    )
+    (component 63
+      (place 63 1.905000 4.445000 front 0 (PN 0))
+    )
+    (component 64
+      (place 64 5.715000 4.445000 front 0 (PN 0))
+    )
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/padstack.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.eps	(revision 18980)
@@ -0,0 +1,79 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: padstack.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.01000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.15000 0.10000 0.02500 0.10000 t
+0.37500 0.10000 0.04331 c
+0.22500 0.32500 0.04831 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.10000 0.01575 c
+0.37500 0.10000 0.01968 c
+0.22500 0.32500 0.01968 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.07500 0.10000 0.03937 c
+0.37500 0.10000 0.04331 c
+0.07500 0.32500 0.04580 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.10000 0.01575 c
+0.37500 0.10000 0.01968 c
+0.07500 0.32500 0.01968 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.07500 0.10000 0.03937 c
+0.37500 0.10000 0.04331 c
+0.22500 0.32500 0.04831 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.10000 0.01575 c
+0.37500 0.10000 0.01968 c
+0.22500 0.32500 0.01968 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.498039 0.498039 0.498039 setrgbcolor
+0.02500 0.05000 moveto
+0.02500 0.15000 lineto
+0.12500 0.12500 lineto
+0.12500 0.05000 lineto
+fill
+0.37500 0.10000 0.04331 c
+0.07500 0.32500 0.04580 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.07500 0.10000 0.01575 c
+0.37500 0.10000 0.01968 c
+0.07500 0.32500 0.01968 c
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.07500 0.10000 0.01575 c
+0.37500 0.10000 0.01968 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/padstack.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+PL 20 30 20 5 4 8
+pa 75 20 17 17 8 0
Index: tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.bottom.gbr	(revision 18980)
@@ -0,0 +1,20 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: (unknown), bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD30C,0.0394*%
+%ADD29C,0.0315*%
+%ADD28C,0.0966*%
+%ADD27C,0.0866*%
+%ADD26C,0.0100*%
+G54D26*X15000Y40000D02*X2500D01*
+G54D27*X37500D03*
+G54D28*X22500Y17500D03*
+G54D29*G54D30*M02*
Index: tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.fab.gbr	(revision 18980)
@@ -0,0 +1,1845 @@
+G04 start of page 8 for group -1 layer_idx 16777221 *
+G04 Title: (unknown), <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD37C,0.0100*%
+%ADD36C,0.0001*%
+%ADD35C,0.0060*%
+%ADD34C,0.0080*%
+G54D34*X37500Y41600D02*Y38400D01*
+X35900Y40000D02*X39100D01*
+X7500Y19100D02*Y15900D01*
+X5900Y17500D02*X9100D01*
+X22500Y19100D02*Y15900D01*
+X20900Y17500D02*X24100D01*
+X15000Y92850D02*Y89650D01*
+X13400Y91250D02*X16600D01*
+G54D35*X135000Y95000D02*X136500Y92000D01*
+X138000Y95000D01*
+X136500Y92000D02*Y89000D01*
+X139800Y92300D02*X142050D01*
+X139800Y89000D02*X142800D01*
+X139800Y95000D02*Y89000D01*
+Y95000D02*X142800D01*
+X147600D02*X148350Y94250D01*
+X145350Y95000D02*X147600D01*
+X144600Y94250D02*X145350Y95000D01*
+X144600Y94250D02*Y92750D01*
+X145350Y92000D01*
+X147600D01*
+X148350Y91250D01*
+Y89750D01*
+X147600Y89000D02*X148350Y89750D01*
+X145350Y89000D02*X147600D01*
+X144600Y89750D02*X145350Y89000D01*
+X98000Y94250D02*X98750Y95000D01*
+X100250D01*
+X101000Y94250D01*
+X100250Y89000D02*X101000Y89750D01*
+X98750Y89000D02*X100250D01*
+X98000Y89750D02*X98750Y89000D01*
+Y92300D02*X100250D01*
+X101000Y94250D02*Y93050D01*
+Y91550D02*Y89750D01*
+Y91550D02*X100250Y92300D01*
+X101000Y93050D02*X100250Y92300D01*
+G54D36*G36*
+X45000Y95000D02*Y89000D01*
+X49500D01*
+Y95000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y89000D01*
+X54900D01*
+Y95000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y89000D01*
+X60300D01*
+Y95000D01*
+X55800D01*
+G37*
+G54D35*X61200Y94250D02*X61950Y95000D01*
+X63450D01*
+X64200Y94250D01*
+X63450Y89000D02*X64200Y89750D01*
+X61950Y89000D02*X63450D01*
+X61200Y89750D02*X61950Y89000D01*
+Y92300D02*X63450D01*
+X64200Y94250D02*Y93050D01*
+Y91550D02*Y89750D01*
+Y91550D02*X63450Y92300D01*
+X64200Y93050D02*X63450Y92300D01*
+X66750Y89000D02*X69000Y92000D01*
+Y94250D02*Y92000D01*
+X68250Y95000D02*X69000Y94250D01*
+X66750Y95000D02*X68250D01*
+X66000Y94250D02*X66750Y95000D01*
+X66000Y94250D02*Y92750D01*
+X66750Y92000D01*
+X69000D01*
+X7500Y40000D02*Y38400D01*
+Y40000D02*X8887Y40800D01*
+X7500Y40000D02*X6113Y40800D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y108800D02*X99200Y110000D01*
+Y104000D01*
+X98000D02*X100250D01*
+G54D36*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D35*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66000Y109250D02*X66750Y110000D01*
+X69000D01*
+X69750Y109250D01*
+Y107750D01*
+X66000Y104000D02*X69750Y107750D01*
+X66000Y104000D02*X69750D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D36*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D35*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D36*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D35*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D36*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D35*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D36*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D35*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D36*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D35*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D36*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D35*X48000Y139250D02*X48750Y140000D01*
+X51000D01*
+X51750Y139250D01*
+Y137750D01*
+X48000Y134000D02*X51750Y137750D01*
+X48000Y134000D02*X51750D01*
+G54D36*G36*
+X56250Y140000D02*Y134000D01*
+X60750D01*
+Y140000D01*
+X56250D01*
+G37*
+G36*
+X61650D02*Y134000D01*
+X66150D01*
+Y140000D01*
+X61650D01*
+G37*
+G36*
+X67050D02*Y134000D01*
+X71550D01*
+Y140000D01*
+X67050D01*
+G37*
+G36*
+X72450D02*Y134000D01*
+X76950D01*
+Y140000D01*
+X72450D01*
+G37*
+G36*
+X77850D02*Y134000D01*
+X82350D01*
+Y140000D01*
+X77850D01*
+G37*
+G36*
+X83250D02*Y134000D01*
+X87750D01*
+Y140000D01*
+X83250D01*
+G37*
+G36*
+X88650D02*Y134000D01*
+X93150D01*
+Y140000D01*
+X88650D01*
+G37*
+G36*
+X94050D02*Y134000D01*
+X98550D01*
+Y140000D01*
+X94050D01*
+G37*
+G36*
+X99450D02*Y134000D01*
+X103950D01*
+Y140000D01*
+X99450D01*
+G37*
+G36*
+X107550D02*Y134000D01*
+X112050D01*
+Y140000D01*
+X107550D01*
+G37*
+G36*
+X112950D02*Y134000D01*
+X117450D01*
+Y140000D01*
+X112950D01*
+G37*
+G36*
+X118350D02*Y134000D01*
+X122850D01*
+Y140000D01*
+X118350D01*
+G37*
+G36*
+X123750D02*Y134000D01*
+X128250D01*
+Y140000D01*
+X123750D01*
+G37*
+G36*
+X129150D02*Y134000D01*
+X133650D01*
+Y140000D01*
+X129150D01*
+G37*
+G36*
+X137250D02*Y134000D01*
+X141750D01*
+Y140000D01*
+X137250D01*
+G37*
+G36*
+X142650D02*Y134000D01*
+X147150D01*
+Y140000D01*
+X142650D01*
+G37*
+G36*
+X148050D02*Y134000D01*
+X152550D01*
+Y140000D01*
+X148050D01*
+G37*
+G36*
+X153450D02*Y134000D01*
+X157950D01*
+Y140000D01*
+X153450D01*
+G37*
+G36*
+X158850D02*Y134000D01*
+X163350D01*
+Y140000D01*
+X158850D01*
+G37*
+G36*
+X166950D02*Y134000D01*
+X171450D01*
+Y140000D01*
+X166950D01*
+G37*
+G36*
+X172350D02*Y134000D01*
+X176850D01*
+Y140000D01*
+X172350D01*
+G37*
+G36*
+X177750D02*Y134000D01*
+X182250D01*
+Y140000D01*
+X177750D01*
+G37*
+G36*
+X183150D02*Y134000D01*
+X187650D01*
+Y140000D01*
+X183150D01*
+G37*
+G36*
+X191250D02*Y134000D01*
+X195750D01*
+Y140000D01*
+X191250D01*
+G37*
+G36*
+X196650D02*Y134000D01*
+X201150D01*
+Y140000D01*
+X196650D01*
+G37*
+G36*
+X204750D02*Y134000D01*
+X209250D01*
+Y140000D01*
+X204750D01*
+G37*
+G36*
+X210150D02*Y134000D01*
+X214650D01*
+Y140000D01*
+X210150D01*
+G37*
+G36*
+X215550D02*Y134000D01*
+X220050D01*
+Y140000D01*
+X215550D01*
+G37*
+G36*
+X220950D02*Y134000D01*
+X225450D01*
+Y140000D01*
+X220950D01*
+G37*
+G36*
+X229050D02*Y134000D01*
+X233550D01*
+Y140000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y134000D01*
+X238950D01*
+Y140000D01*
+X234450D01*
+G37*
+G36*
+X239850D02*Y134000D01*
+X244350D01*
+Y140000D01*
+X239850D01*
+G37*
+G36*
+X245250D02*Y134000D01*
+X249750D01*
+Y140000D01*
+X245250D01*
+G37*
+G36*
+X250650D02*Y134000D01*
+X255150D01*
+Y140000D01*
+X250650D01*
+G37*
+G36*
+X256050D02*Y134000D01*
+X260550D01*
+Y140000D01*
+X256050D01*
+G37*
+G36*
+X261450D02*Y134000D01*
+X265950D01*
+Y140000D01*
+X261450D01*
+G37*
+G54D35*X269550Y136250D02*X272550Y140000D01*
+X269550Y136250D02*X273300D01*
+X272550Y140000D02*Y134000D01*
+G54D36*G36*
+X277800Y140000D02*Y134000D01*
+X282300D01*
+Y140000D01*
+X277800D01*
+G37*
+G36*
+X283200D02*Y134000D01*
+X287700D01*
+Y140000D01*
+X283200D01*
+G37*
+G36*
+X288600D02*Y134000D01*
+X293100D01*
+Y140000D01*
+X288600D01*
+G37*
+G36*
+X294000D02*Y134000D01*
+X298500D01*
+Y140000D01*
+X294000D01*
+G37*
+G36*
+X299400D02*Y134000D01*
+X303900D01*
+Y140000D01*
+X299400D01*
+G37*
+G36*
+X307500D02*Y134000D01*
+X312000D01*
+Y140000D01*
+X307500D01*
+G37*
+G36*
+X312900D02*Y134000D01*
+X317400D01*
+Y140000D01*
+X312900D01*
+G37*
+G36*
+X318300D02*Y134000D01*
+X322800D01*
+Y140000D01*
+X318300D01*
+G37*
+G36*
+X323700D02*Y134000D01*
+X328200D01*
+Y140000D01*
+X323700D01*
+G37*
+G36*
+X329100D02*Y134000D01*
+X333600D01*
+Y140000D01*
+X329100D01*
+G37*
+G54D37*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D35*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D36*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D35*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D36*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D35*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D36*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D35*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D36*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D35*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D36*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D35*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D36*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D35*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D36*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D35*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D36*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D35*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D36*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D35*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D36*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D35*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D36*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G54D35*X293900D02*Y104000D01*
+Y110000D02*X296900D01*
+X293900Y107300D02*X296150D01*
+G54D36*G36*
+X298700Y110000D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X325700D02*Y104000D01*
+X330200D01*
+Y110000D01*
+X325700D01*
+G37*
+G36*
+X331100D02*Y104000D01*
+X335600D01*
+Y110000D01*
+X331100D01*
+G37*
+G36*
+X336500D02*Y104000D01*
+X341000D01*
+Y110000D01*
+X336500D01*
+G37*
+G36*
+X341900D02*Y104000D01*
+X346400D01*
+Y110000D01*
+X341900D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G54D35*X356150D02*Y104000D01*
+X358100Y110000D02*X359150Y108950D01*
+Y105050D01*
+X358100Y104000D02*X359150Y105050D01*
+X355400Y104000D02*X358100D01*
+X355400Y110000D02*X358100D01*
+G54D36*G36*
+X360950D02*Y104000D01*
+X365450D01*
+Y110000D01*
+X360950D01*
+G37*
+G36*
+X366350D02*Y104000D01*
+X370850D01*
+Y110000D01*
+X366350D01*
+G37*
+G36*
+X371750D02*Y104000D01*
+X376250D01*
+Y110000D01*
+X371750D01*
+G37*
+G36*
+X377150D02*Y104000D01*
+X381650D01*
+Y110000D01*
+X377150D01*
+G37*
+G36*
+X382550D02*Y104000D01*
+X387050D01*
+Y110000D01*
+X382550D01*
+G37*
+G36*
+X387950D02*Y104000D01*
+X392450D01*
+Y110000D01*
+X387950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group5.gbr	(revision 18980)
@@ -0,0 +1,20 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: (unknown), Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD20C,0.0394*%
+%ADD19C,0.0315*%
+%ADD18C,0.0916*%
+%ADD17C,0.0866*%
+%ADD16C,0.0787*%
+G54D16*X7500Y40000D03*
+G54D17*X37500D03*
+G54D18*X7500Y17500D03*
+G54D19*G54D20*M02*
Index: tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.group7.gbr	(revision 18980)
@@ -0,0 +1,20 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: (unknown), Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD25C,0.0394*%
+%ADD24C,0.0315*%
+%ADD23C,0.0966*%
+%ADD22C,0.0866*%
+%ADD21C,0.0787*%
+G54D21*X7500Y40000D03*
+G54D22*X37500D03*
+G54D23*X22500Y17500D03*
+G54D24*G54D25*M02*
Index: tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.gbr/padstack.top.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: (unknown), top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD15C,0.0394*%
+%ADD14C,0.0315*%
+%ADD13C,0.0916*%
+%ADD12C,0.0866*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X2500Y45000D02*Y35000D01*
+X12500Y37500D01*
+Y45000D01*
+X2500D01*
+G37*
+G54D12*X37500Y40000D03*
+G54D13*X7500Y17500D03*
+G54D14*G54D15*M02*
Index: tags/2.0.1/tests/RTT/ref/padstack.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.nelma.em	(revision 18980)
@@ -0,0 +1,105 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer group-1 {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-13 {
+	height = 20
+	z-order = 13
+	material = "composite"
+}
+layer group-1 {
+	height = 1
+	z-order = 14
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-15 {
+	height = 20
+	z-order = 15
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 16
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"group-1",
+		"substrate-13",
+		"group-1",
+		"substrate-15",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/padstack.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   padstack.lht
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/padstack.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/padstack.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/padstack.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/padstack.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/padstack.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/padstack.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/padstack.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.svg	(revision 18980)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <circle cx="1.9050" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="1.0999" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="5.7150" cy="8.2550" r="1.2269" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="1.9050" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="5.7150" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <circle cx="1.9050" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="1.0999" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="1.1634" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="1.9050" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <line x1="3.8100" y1="2.5400" x2="0.6350" y2="2.5400" stroke-width="0.2540" stroke="#cccccc" stroke-linecap="round"/>
+ <circle cx="9.5250" cy="2.5400" r="1.0999" stroke-width="0.2540" fill="#cccccc" stroke="none"/>
+ <circle cx="5.7150" cy="8.2550" r="1.2269" stroke-width="0.2540" fill="#cccccc" stroke="none"/>
+ <circle cx="1.9050" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="5.7150" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="0.6350,1.2700 0.6350,3.8100 3.1750,3.1750 3.1750,1.2700 " stroke-width="0.010" stroke="#7f7f7f" fill="#7f7f7f"/>
+ <circle cx="9.5250" cy="2.5400" r="1.0999" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="1.1634" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="1.9050" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="1.9050" cy="8.2550" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="1.9050" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="9.5250" cy="2.5400" r="0.5000" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/padstack.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/padstack.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/padstack.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: (unknown) - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_hole.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Polygons with holes - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_hole.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Polygons with holes
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/poly_hole.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.eps	(revision 18980)
@@ -0,0 +1,112 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: poly_hole.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.06250 0.02500 moveto
+0.12500 0.02500 lineto
+0.06250 0.08750 lineto
+0.06250 0.06250 lineto
+0.07500 0.05000 lineto
+0.06250 0.05000 lineto
+fill
+0.02500 0.02500 moveto
+0.06250 0.02500 lineto
+0.06250 0.05000 lineto
+0.05000 0.05000 lineto
+0.05000 0.07500 lineto
+0.06250 0.06250 lineto
+0.06250 0.08750 lineto
+0.02500 0.12500 lineto
+fill
+0.10000 0.07500 moveto
+0.15000 0.02500 lineto
+0.15000 0.15000 lineto
+0.10000 0.15000 lineto
+0.10000 0.12500 lineto
+0.12500 0.12500 lineto
+0.12500 0.10000 lineto
+0.10000 0.10000 lineto
+fill
+0.02500 0.15000 moveto
+0.10000 0.07500 lineto
+0.10000 0.10000 lineto
+0.07500 0.12500 lineto
+0.10000 0.12500 lineto
+0.10000 0.15000 lineto
+fill
+0.30000 0.02500 moveto
+0.42500 0.15000 lineto
+0.30000 0.15000 lineto
+0.30000 0.12500 lineto
+0.32500 0.12500 lineto
+0.32500 0.07500 lineto
+0.30000 0.07500 lineto
+fill
+0.17500 0.15000 moveto
+0.30000 0.02500 lineto
+0.30000 0.07500 lineto
+0.27500 0.07500 lineto
+0.27500 0.12500 lineto
+0.30000 0.12500 lineto
+0.30000 0.15000 lineto
+fill
+0.16250 0.18750 moveto
+0.30000 0.20000 lineto
+0.16250 0.28250 lineto
+0.16250 0.25000 lineto
+0.17500 0.25000 lineto
+0.17500 0.22500 lineto
+0.16250 0.22500 lineto
+fill
+0.10000 0.18182 moveto
+0.16250 0.18750 lineto
+0.16250 0.22500 lineto
+0.15000 0.22500 lineto
+0.15000 0.25000 lineto
+0.16250 0.25000 lineto
+0.16250 0.28250 lineto
+0.10000 0.32000 lineto
+0.10000 0.30000 lineto
+0.12500 0.27500 lineto
+0.12500 0.25000 lineto
+0.10000 0.22500 lineto
+fill
+0.02500 0.17500 moveto
+0.10000 0.18182 lineto
+0.10000 0.22500 lineto
+0.07500 0.22500 lineto
+0.07500 0.27500 lineto
+0.10000 0.30000 lineto
+0.10000 0.32000 lineto
+0.05000 0.35000 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/poly_hole.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.fcd	(revision 18980)
@@ -0,0 +1,5 @@
+[FIDOCAD]
+PP 5 5 25 5 5 25 5 5 2
+PP 5 30 30 5 30 30 5 30 2
+PP 35 30 60 5 85 30 35 30 2
+PP 5 35 60 40 10 70 5 35 2
Index: tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.fab.gbr	(revision 18980)
@@ -0,0 +1,1759 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Polygons with holes, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X235250D02*Y104000D01*
+X234500Y110000D02*X237500D01*
+X238250Y109250D01*
+Y107750D01*
+X237500Y107000D02*X238250Y107750D01*
+X235250Y107000D02*X237500D01*
+G54D13*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X256250D02*Y104000D01*
+X260750D01*
+Y110000D01*
+X256250D01*
+G37*
+G36*
+X261650D02*Y104000D01*
+X266150D01*
+Y110000D01*
+X261650D01*
+G37*
+G36*
+X267050D02*Y104000D01*
+X271550D01*
+Y110000D01*
+X267050D01*
+G37*
+G36*
+X272450D02*Y104000D01*
+X276950D01*
+Y110000D01*
+X272450D01*
+G37*
+G36*
+X280550D02*Y104000D01*
+X285050D01*
+Y110000D01*
+X280550D01*
+G37*
+G36*
+X285950D02*Y104000D01*
+X290450D01*
+Y110000D01*
+X285950D01*
+G37*
+G36*
+X291350D02*Y104000D01*
+X295850D01*
+Y110000D01*
+X291350D01*
+G37*
+G36*
+X296750D02*Y104000D01*
+X301250D01*
+Y110000D01*
+X296750D01*
+G37*
+G36*
+X304850D02*Y104000D01*
+X309350D01*
+Y110000D01*
+X304850D01*
+G37*
+G36*
+X310250D02*Y104000D01*
+X314750D01*
+Y110000D01*
+X310250D01*
+G37*
+G36*
+X315650D02*Y104000D01*
+X320150D01*
+Y110000D01*
+X315650D01*
+G37*
+G36*
+X321050D02*Y104000D01*
+X325550D01*
+Y110000D01*
+X321050D01*
+G37*
+G36*
+X326450D02*Y104000D01*
+X330950D01*
+Y110000D01*
+X326450D01*
+G37*
+G36*
+X334550D02*Y104000D01*
+X339050D01*
+Y110000D01*
+X334550D01*
+G37*
+G54D12*X342650D02*Y104000D01*
+Y110000D02*X345650D01*
+X342650Y107300D02*X344900D01*
+G54D13*G36*
+X347450Y110000D02*Y104000D01*
+X351950D01*
+Y110000D01*
+X347450D01*
+G37*
+G36*
+X352850D02*Y104000D01*
+X357350D01*
+Y110000D01*
+X352850D01*
+G37*
+G36*
+X358250D02*Y104000D01*
+X362750D01*
+Y110000D01*
+X358250D01*
+G37*
+G36*
+X363650D02*Y104000D01*
+X368150D01*
+Y110000D01*
+X363650D01*
+G37*
+G36*
+X369050D02*Y104000D01*
+X373550D01*
+Y110000D01*
+X369050D01*
+G37*
+G36*
+X374450D02*Y104000D01*
+X378950D01*
+Y110000D01*
+X374450D01*
+G37*
+G36*
+X379850D02*Y104000D01*
+X384350D01*
+Y110000D01*
+X379850D01*
+G37*
+G36*
+X385250D02*Y104000D01*
+X389750D01*
+Y110000D01*
+X385250D01*
+G37*
+G36*
+X390650D02*Y104000D01*
+X395150D01*
+Y110000D01*
+X390650D01*
+G37*
+G36*
+X396050D02*Y104000D01*
+X400550D01*
+Y110000D01*
+X396050D01*
+G37*
+G54D12*X404900D02*Y104000D01*
+X406850Y110000D02*X407900Y108950D01*
+Y105050D01*
+X406850Y104000D02*X407900Y105050D01*
+X404150Y104000D02*X406850D01*
+X404150Y110000D02*X406850D01*
+G54D13*G36*
+X409700D02*Y104000D01*
+X414200D01*
+Y110000D01*
+X409700D01*
+G37*
+G36*
+X415100D02*Y104000D01*
+X419600D01*
+Y110000D01*
+X415100D01*
+G37*
+G36*
+X420500D02*Y104000D01*
+X425000D01*
+Y110000D01*
+X420500D01*
+G37*
+G36*
+X425900D02*Y104000D01*
+X430400D01*
+Y110000D01*
+X425900D01*
+G37*
+G36*
+X431300D02*Y104000D01*
+X435800D01*
+Y110000D01*
+X431300D01*
+G37*
+G36*
+X436700D02*Y104000D01*
+X441200D01*
+Y110000D01*
+X436700D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.gbr/poly_hole.top.gbr	(revision 18980)
@@ -0,0 +1,100 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Polygons with holes, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X6250Y47500D02*X12500D01*
+X6250Y41250D01*
+Y43750D01*
+X7500Y45000D01*
+X6250D01*
+Y47500D01*
+G37*
+G36*
+X2500D02*X6250D01*
+Y45000D01*
+X5000D01*
+Y42500D01*
+X6250Y43750D01*
+Y41250D01*
+X2500Y37500D01*
+Y47500D01*
+G37*
+G36*
+X10000Y42500D02*X15000Y47500D01*
+Y35000D01*
+X10000D01*
+Y37500D01*
+X12500D01*
+Y40000D01*
+X10000D01*
+Y42500D01*
+G37*
+G36*
+X2500Y35000D02*X10000Y42500D01*
+Y40000D01*
+X7500Y37500D01*
+X10000D01*
+Y35000D01*
+X2500D01*
+G37*
+G36*
+X30000Y47500D02*X42500Y35000D01*
+X30000D01*
+Y37500D01*
+X32500D01*
+Y42500D01*
+X30000D01*
+Y47500D01*
+G37*
+G36*
+X17500Y35000D02*X30000Y47500D01*
+Y42500D01*
+X27500D01*
+Y37500D01*
+X30000D01*
+Y35000D01*
+X17500D01*
+G37*
+G36*
+X16250Y31250D02*X30000Y30000D01*
+X16250Y21750D01*
+Y25000D01*
+X17500D01*
+Y27500D01*
+X16250D01*
+Y31250D01*
+G37*
+G36*
+X10000Y31818D02*X16250Y31250D01*
+Y27500D01*
+X15000D01*
+Y25000D01*
+X16250D01*
+Y21750D01*
+X10000Y18000D01*
+Y20000D01*
+X12500Y22500D01*
+Y25000D01*
+X10000Y27500D01*
+Y31818D01*
+G37*
+G36*
+X2500Y32500D02*X10000Y31818D01*
+Y27500D01*
+X7500D01*
+Y22500D01*
+X10000Y20000D01*
+Y18000D01*
+X5000Y15000D01*
+X2500Y32500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_hole.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/poly_hole.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Polygons with holes
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/poly_hole.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_hole.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_hole.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_hole.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.png.text	(revision 18980)
@@ -0,0 +1,18 @@
+r6630
+
+500 x 500 mil outline
+
+upper left triangle
+Top left corner to top left cutout corner 30 pixels down 31 pixels over
+cutout 29 pixels (24.166) wide
+cutout 29 pixels (24.166) high
+
+upper right triangle
+bottom right corner to bottom right on cutout 31 x 31 pixels
+cutout 59 pixels (49.167) wide <- this is not a measurement error. we count the edge pixel
+cutout 30 pixels (25) high
+
+far right piramid
+cutout 59 x 60 (49.166 x 50) pixels
+cutout located 60 (50) pixels down from the apex
+
Index: tags/2.0.1/tests/RTT/ref/poly_hole.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_hole.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_hole.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_hole.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_hole.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_hole.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_hole.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.svg	(revision 18980)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="1.5875,0.6350 3.1750,0.6350 1.5875,2.2225 1.5875,1.5875 1.9050,1.2700 1.5875,1.2700 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,0.6350 1.5875,0.6350 1.5875,1.2700 1.2700,1.2700 1.2700,1.9050 1.5875,1.5875 1.5875,2.2225 0.6350,3.1750 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="2.5400,1.9050 3.8100,0.6350 3.8100,3.8100 2.5400,3.8100 2.5400,3.1750 3.1750,3.1750 3.1750,2.5400 2.5400,2.5400 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,3.8100 2.5400,1.9050 2.5400,2.5400 1.9050,3.1750 2.5400,3.1750 2.5400,3.8100 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="7.6200,0.6350 10.7950,3.8100 7.6200,3.8100 7.6200,3.1750 8.2550,3.1750 8.2550,1.9050 7.6200,1.9050 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="4.4450,3.8100 7.6200,0.6350 7.6200,1.9050 6.9850,1.9050 6.9850,3.1750 7.6200,3.1750 7.6200,3.8100 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="4.1275,4.7625 7.6200,5.0800 4.1275,7.1755 4.1275,6.3500 4.4450,6.3500 4.4450,5.7150 4.1275,5.7150 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="2.5400,4.6182 4.1275,4.7625 4.1275,5.7150 3.8100,5.7150 3.8100,6.3500 4.1275,6.3500 4.1275,7.1755 2.5400,8.1280 2.5400,7.6200 3.1750,6.9850 3.1750,6.3500 2.5400,5.7150 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,4.4450 2.5400,4.6182 2.5400,5.7150 1.9050,5.7150 1.9050,6.9850 2.5400,7.6200 2.5400,8.1280 1.2700,8.8900 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/poly_hole.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_hole.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_hole.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Polygons with holes - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_rect.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal rectangular polygons - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_rect.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Normal rectangular polygons
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/poly_rect.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.eps	(revision 18980)
@@ -0,0 +1,54 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: poly_rect.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.05000 0.02500 moveto
+0.07500 0.02500 lineto
+0.07500 0.45000 lineto
+0.05000 0.45000 lineto
+fill
+0.12500 0.02500 moveto
+0.47500 0.02500 lineto
+0.47500 0.05000 lineto
+0.12500 0.05000 lineto
+fill
+0.42500 0.42500 moveto
+0.45000 0.42500 lineto
+0.45000 0.45000 lineto
+0.42500 0.45000 lineto
+fill
+0.12500 0.07500 moveto
+0.40000 0.07500 lineto
+0.40000 0.45000 lineto
+0.12500 0.45000 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/poly_rect.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.fcd	(revision 18980)
@@ -0,0 +1,5 @@
+[FIDOCAD]
+PP 10 5 15 5 15 90 10 90 10 5 2
+PP 25 5 95 5 95 10 25 10 25 5 2
+PP 85 85 90 85 90 90 85 90 85 85 2
+PP 25 15 80 15 80 90 25 90 25 15 2
Index: tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.fab.gbr	(revision 18980)
@@ -0,0 +1,1804 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Normal rectangular polygons, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500D02*Y104000D01*
+Y110000D02*X238250Y104000D01*
+Y110000D02*Y104000D01*
+G54D13*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X256250D02*Y104000D01*
+X260750D01*
+Y110000D01*
+X256250D01*
+G37*
+G36*
+X261650D02*Y104000D01*
+X266150D01*
+Y110000D01*
+X261650D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X280550D02*Y104000D01*
+X285050D01*
+Y110000D01*
+X280550D01*
+G37*
+G36*
+X285950D02*Y104000D01*
+X290450D01*
+Y110000D01*
+X285950D01*
+G37*
+G36*
+X291350D02*Y104000D01*
+X295850D01*
+Y110000D01*
+X291350D01*
+G37*
+G36*
+X296750D02*Y104000D01*
+X301250D01*
+Y110000D01*
+X296750D01*
+G37*
+G36*
+X302150D02*Y104000D01*
+X306650D01*
+Y110000D01*
+X302150D01*
+G37*
+G36*
+X307550D02*Y104000D01*
+X312050D01*
+Y110000D01*
+X307550D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X323750D02*Y104000D01*
+X328250D01*
+Y110000D01*
+X323750D01*
+G37*
+G36*
+X331850D02*Y104000D01*
+X336350D01*
+Y110000D01*
+X331850D01*
+G37*
+G36*
+X337250D02*Y104000D01*
+X341750D01*
+Y110000D01*
+X337250D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G36*
+X358850D02*Y104000D01*
+X363350D01*
+Y110000D01*
+X358850D01*
+G37*
+G36*
+X364250D02*Y104000D01*
+X368750D01*
+Y110000D01*
+X364250D01*
+G37*
+G36*
+X369650D02*Y104000D01*
+X374150D01*
+Y110000D01*
+X369650D01*
+G37*
+G36*
+X377750D02*Y104000D01*
+X382250D01*
+Y110000D01*
+X377750D01*
+G37*
+G54D12*X385850D02*Y104000D01*
+Y110000D02*X388850D01*
+X385850Y107300D02*X388100D01*
+G54D13*G36*
+X390650Y110000D02*Y104000D01*
+X395150D01*
+Y110000D01*
+X390650D01*
+G37*
+G36*
+X396050D02*Y104000D01*
+X400550D01*
+Y110000D01*
+X396050D01*
+G37*
+G36*
+X401450D02*Y104000D01*
+X405950D01*
+Y110000D01*
+X401450D01*
+G37*
+G36*
+X406850D02*Y104000D01*
+X411350D01*
+Y110000D01*
+X406850D01*
+G37*
+G36*
+X412250D02*Y104000D01*
+X416750D01*
+Y110000D01*
+X412250D01*
+G37*
+G36*
+X417650D02*Y104000D01*
+X422150D01*
+Y110000D01*
+X417650D01*
+G37*
+G36*
+X423050D02*Y104000D01*
+X427550D01*
+Y110000D01*
+X423050D01*
+G37*
+G36*
+X428450D02*Y104000D01*
+X432950D01*
+Y110000D01*
+X428450D01*
+G37*
+G36*
+X433850D02*Y104000D01*
+X438350D01*
+Y110000D01*
+X433850D01*
+G37*
+G36*
+X439250D02*Y104000D01*
+X443750D01*
+Y110000D01*
+X439250D01*
+G37*
+G54D12*X448100D02*Y104000D01*
+X450050Y110000D02*X451100Y108950D01*
+Y105050D01*
+X450050Y104000D02*X451100Y105050D01*
+X447350Y104000D02*X450050D01*
+X447350Y110000D02*X450050D01*
+G54D13*G36*
+X452900D02*Y104000D01*
+X457400D01*
+Y110000D01*
+X452900D01*
+G37*
+G36*
+X458300D02*Y104000D01*
+X462800D01*
+Y110000D01*
+X458300D01*
+G37*
+G36*
+X463700D02*Y104000D01*
+X468200D01*
+Y110000D01*
+X463700D01*
+G37*
+G36*
+X469100D02*Y104000D01*
+X473600D01*
+Y110000D01*
+X469100D01*
+G37*
+G36*
+X474500D02*Y104000D01*
+X479000D01*
+Y110000D01*
+X474500D01*
+G37*
+G36*
+X479900D02*Y104000D01*
+X484400D01*
+Y110000D01*
+X479900D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.gbr/poly_rect.top.gbr	(revision 18980)
@@ -0,0 +1,37 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Normal rectangular polygons, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X5000Y47500D02*X7500D01*
+Y5000D01*
+X5000D01*
+Y47500D01*
+G37*
+G36*
+X12500D02*X47500D01*
+Y45000D01*
+X12500D01*
+Y47500D01*
+G37*
+G36*
+X42500Y7500D02*X45000D01*
+Y5000D01*
+X42500D01*
+Y7500D01*
+G37*
+G36*
+X12500Y42500D02*X40000D01*
+Y5000D01*
+X12500D01*
+Y42500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_rect.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/poly_rect.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Normal rectangular polygons
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/poly_rect.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_rect.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_rect.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_rect.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.png.text	(revision 18980)
@@ -0,0 +1,17 @@
+r6630
+
+outline 500 x 500 mils
+
+vertical polygon
+31 x 511 pixels (25.833 x 425.833)
+
+horizontal polygon
+421 x 31 pixels (350.833 x 25.833)
+
+giant middle polygon
+331 x 451 pixels (275.833 x 375.833)
+
+smallest polygon (bottom right)
+31 x 31 pixels (25.833 x 25.833)
+
+
Index: tags/2.0.1/tests/RTT/ref/poly_rect.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_rect.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_rect.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_rect.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_rect.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_rect.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_rect.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.svg	(revision 18980)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="1.2700,0.6350 1.9050,0.6350 1.9050,11.4300 1.2700,11.4300 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="3.1750,0.6350 12.0650,0.6350 12.0650,1.2700 3.1750,1.2700 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="10.7950,10.7950 11.4300,10.7950 11.4300,11.4300 10.7950,11.4300 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="3.1750,1.9050 10.1600,1.9050 10.1600,11.4300 3.1750,11.4300 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/poly_rect.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_rect.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_rect.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal rectangular polygons - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal triangular polygons - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb Normal triangular polygons
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.eps	(revision 18980)
@@ -0,0 +1,50 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: poly_triangle.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.137255 0.137255 setrgbcolor
+0.02500 0.02500 moveto
+0.12500 0.02500 lineto
+0.02500 0.12500 lineto
+fill
+0.02500 0.15000 moveto
+0.15000 0.02500 lineto
+0.15000 0.15000 lineto
+fill
+0.17500 0.15000 moveto
+0.30000 0.02500 lineto
+0.42500 0.15000 lineto
+fill
+0.02500 0.17500 moveto
+0.30000 0.20000 lineto
+0.05000 0.35000 lineto
+fill
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.fcd	(revision 18980)
@@ -0,0 +1,5 @@
+[FIDOCAD]
+PP 5 5 25 5 5 25 5 5 2
+PP 5 30 30 5 30 30 5 30 2
+PP 35 30 60 5 85 30 35 30 2
+PP 5 35 60 40 10 70 5 35 2
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.fab.gbr	(revision 18980)
@@ -0,0 +1,1798 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: Normal triangular polygons, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0100*%
+%ADD13C,0.0001*%
+%ADD12C,0.0060*%
+G54D12*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D13*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D12*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D13*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D12*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D13*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D12*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D13*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D12*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D13*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D12*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D13*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D13*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D12*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D13*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D12*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D13*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D12*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D13*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D12*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D13*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D12*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D13*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D12*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D13*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D12*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D13*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D12*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D13*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D12*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D12*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D13*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G54D12*X234500D02*Y104000D01*
+Y110000D02*X238250Y104000D01*
+Y110000D02*Y104000D01*
+G54D13*G36*
+X240050Y110000D02*Y104000D01*
+X244550D01*
+Y110000D01*
+X240050D01*
+G37*
+G36*
+X245450D02*Y104000D01*
+X249950D01*
+Y110000D01*
+X245450D01*
+G37*
+G36*
+X250850D02*Y104000D01*
+X255350D01*
+Y110000D01*
+X250850D01*
+G37*
+G36*
+X256250D02*Y104000D01*
+X260750D01*
+Y110000D01*
+X256250D01*
+G37*
+G36*
+X261650D02*Y104000D01*
+X266150D01*
+Y110000D01*
+X261650D01*
+G37*
+G36*
+X269750D02*Y104000D01*
+X274250D01*
+Y110000D01*
+X269750D01*
+G37*
+G36*
+X275150D02*Y104000D01*
+X279650D01*
+Y110000D01*
+X275150D01*
+G37*
+G36*
+X280550D02*Y104000D01*
+X285050D01*
+Y110000D01*
+X280550D01*
+G37*
+G36*
+X285950D02*Y104000D01*
+X290450D01*
+Y110000D01*
+X285950D01*
+G37*
+G36*
+X291350D02*Y104000D01*
+X295850D01*
+Y110000D01*
+X291350D01*
+G37*
+G36*
+X296750D02*Y104000D01*
+X301250D01*
+Y110000D01*
+X296750D01*
+G37*
+G36*
+X302150D02*Y104000D01*
+X306650D01*
+Y110000D01*
+X302150D01*
+G37*
+G36*
+X307550D02*Y104000D01*
+X312050D01*
+Y110000D01*
+X307550D01*
+G37*
+G36*
+X312950D02*Y104000D01*
+X317450D01*
+Y110000D01*
+X312950D01*
+G37*
+G36*
+X318350D02*Y104000D01*
+X322850D01*
+Y110000D01*
+X318350D01*
+G37*
+G36*
+X326450D02*Y104000D01*
+X330950D01*
+Y110000D01*
+X326450D01*
+G37*
+G36*
+X331850D02*Y104000D01*
+X336350D01*
+Y110000D01*
+X331850D01*
+G37*
+G36*
+X337250D02*Y104000D01*
+X341750D01*
+Y110000D01*
+X337250D01*
+G37*
+G36*
+X342650D02*Y104000D01*
+X347150D01*
+Y110000D01*
+X342650D01*
+G37*
+G36*
+X348050D02*Y104000D01*
+X352550D01*
+Y110000D01*
+X348050D01*
+G37*
+G36*
+X353450D02*Y104000D01*
+X357950D01*
+Y110000D01*
+X353450D01*
+G37*
+G36*
+X358850D02*Y104000D01*
+X363350D01*
+Y110000D01*
+X358850D01*
+G37*
+G36*
+X364250D02*Y104000D01*
+X368750D01*
+Y110000D01*
+X364250D01*
+G37*
+G36*
+X372350D02*Y104000D01*
+X376850D01*
+Y110000D01*
+X372350D01*
+G37*
+G54D12*X380450D02*Y104000D01*
+Y110000D02*X383450D01*
+X380450Y107300D02*X382700D01*
+G54D13*G36*
+X385250Y110000D02*Y104000D01*
+X389750D01*
+Y110000D01*
+X385250D01*
+G37*
+G36*
+X390650D02*Y104000D01*
+X395150D01*
+Y110000D01*
+X390650D01*
+G37*
+G36*
+X396050D02*Y104000D01*
+X400550D01*
+Y110000D01*
+X396050D01*
+G37*
+G36*
+X401450D02*Y104000D01*
+X405950D01*
+Y110000D01*
+X401450D01*
+G37*
+G36*
+X406850D02*Y104000D01*
+X411350D01*
+Y110000D01*
+X406850D01*
+G37*
+G36*
+X412250D02*Y104000D01*
+X416750D01*
+Y110000D01*
+X412250D01*
+G37*
+G36*
+X417650D02*Y104000D01*
+X422150D01*
+Y110000D01*
+X417650D01*
+G37*
+G36*
+X423050D02*Y104000D01*
+X427550D01*
+Y110000D01*
+X423050D01*
+G37*
+G36*
+X428450D02*Y104000D01*
+X432950D01*
+Y110000D01*
+X428450D01*
+G37*
+G36*
+X433850D02*Y104000D01*
+X438350D01*
+Y110000D01*
+X433850D01*
+G37*
+G54D12*X442700D02*Y104000D01*
+X444650Y110000D02*X445700Y108950D01*
+Y105050D01*
+X444650Y104000D02*X445700Y105050D01*
+X441950Y104000D02*X444650D01*
+X441950Y110000D02*X444650D01*
+G54D13*G36*
+X447500D02*Y104000D01*
+X452000D01*
+Y110000D01*
+X447500D01*
+G37*
+G36*
+X452900D02*Y104000D01*
+X457400D01*
+Y110000D01*
+X452900D01*
+G37*
+G36*
+X458300D02*Y104000D01*
+X462800D01*
+Y110000D01*
+X458300D01*
+G37*
+G36*
+X463700D02*Y104000D01*
+X468200D01*
+Y110000D01*
+X463700D01*
+G37*
+G36*
+X469100D02*Y104000D01*
+X473600D01*
+Y110000D01*
+X469100D01*
+G37*
+G36*
+X474500D02*Y104000D01*
+X479000D01*
+Y110000D01*
+X474500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.gbr/poly_triangle.top.gbr	(revision 18980)
@@ -0,0 +1,33 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: Normal triangular polygons, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X2500Y47500D02*X12500D01*
+X2500Y37500D01*
+Y47500D01*
+G37*
+G36*
+Y35000D02*X15000Y47500D01*
+Y35000D01*
+X2500D01*
+G37*
+G36*
+X17500D02*X30000Y47500D01*
+X42500Y35000D01*
+X17500D01*
+G37*
+G36*
+X2500Y32500D02*X30000Y30000D01*
+X5000Y15000D01*
+X2500Y32500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.nelma.em	(revision 18980)
@@ -0,0 +1,60 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   Normal triangular polygons
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_triangle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.png.text	(revision 18980)
@@ -0,0 +1,33 @@
+r6630
+
+upper left triangle
+121 pixels (100.833) wide
+121 pixels (100.83) tall
+
+gap from lower left triangle to upper left triangle
+29 pixels (24.166) horizontally
+29 pixels (24.166) vertically
+
+lower left triangle
+151 pixels (125.833) wide
+151 pixels (125.833) tall
+
+gap from lower left triangle to far right piramid
+29 pixels (24.166)
+
+far right piramid
+151 pixels (125.833) height
+301 pixels (250.833) base
+
+bottom triangle
+331 pixels (275.833) across
+211 pixels (175.833) up
+top edge
+332.4 pixels (277) long 5.18 degrees
+side edge
+213.1 pixels (177.5833) long 91.91 degrees
+bottom edge
+351.2 pixels (292.666) long 31.02 degrees
+
+(mil)
+
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_triangle.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/poly_triangle.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.svg	(revision 18980)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="0.6350,0.6350 3.1750,0.6350 0.6350,3.1750 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,3.8100 3.8100,0.6350 3.8100,3.8100 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="4.4450,3.8100 7.6200,0.6350 10.7950,3.8100 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,4.4450 7.6200,5.0800 1.2700,8.8900 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/poly_triangle.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/poly_triangle.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/poly_triangle.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: Normal triangular polygons - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/rat.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: 
+# Title: a rat line - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/rat.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.dsn	(revision 18980)
@@ -0,0 +1,54 @@
+(pcb a rat line
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "gEDA pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "comp1"
+      (type signal)
+    )
+    (layer "inner1"
+      (type signal)
+    )
+    (layer "inner2"
+      (type signal)
+    )
+    (layer "solder1"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
+      (attach off)
+    )
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/rat.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.eps	(revision 18980)
@@ -0,0 +1,31 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: rat.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/rat.gbr/rat.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.gbr/rat.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.gbr/rat.fab.gbr	(revision 18980)
@@ -0,0 +1,1686 @@
+G04 start of page 2 for group -1 layer_idx 16777221 *
+G04 Title: a rat line, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For:  *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD13C,0.0100*%
+%ADD12C,0.0001*%
+%ADD11C,0.0060*%
+G54D11*X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D12*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D11*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D12*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D11*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D12*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D11*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D12*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D11*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D12*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D11*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D12*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G36*
+X48000D02*Y134000D01*
+X52500D01*
+Y140000D01*
+X48000D01*
+G37*
+G36*
+X56100D02*Y134000D01*
+X60600D01*
+Y140000D01*
+X56100D01*
+G37*
+G36*
+X61500D02*Y134000D01*
+X66000D01*
+Y140000D01*
+X61500D01*
+G37*
+G36*
+X66900D02*Y134000D01*
+X71400D01*
+Y140000D01*
+X66900D01*
+G37*
+G36*
+X72300D02*Y134000D01*
+X76800D01*
+Y140000D01*
+X72300D01*
+G37*
+G36*
+X77700D02*Y134000D01*
+X82200D01*
+Y140000D01*
+X77700D01*
+G37*
+G36*
+X83100D02*Y134000D01*
+X87600D01*
+Y140000D01*
+X83100D01*
+G37*
+G36*
+X88500D02*Y134000D01*
+X93000D01*
+Y140000D01*
+X88500D01*
+G37*
+G36*
+X93900D02*Y134000D01*
+X98400D01*
+Y140000D01*
+X93900D01*
+G37*
+G36*
+X99300D02*Y134000D01*
+X103800D01*
+Y140000D01*
+X99300D01*
+G37*
+G36*
+X107400D02*Y134000D01*
+X111900D01*
+Y140000D01*
+X107400D01*
+G37*
+G36*
+X112800D02*Y134000D01*
+X117300D01*
+Y140000D01*
+X112800D01*
+G37*
+G36*
+X118200D02*Y134000D01*
+X122700D01*
+Y140000D01*
+X118200D01*
+G37*
+G36*
+X123600D02*Y134000D01*
+X128100D01*
+Y140000D01*
+X123600D01*
+G37*
+G36*
+X129000D02*Y134000D01*
+X133500D01*
+Y140000D01*
+X129000D01*
+G37*
+G36*
+X137100D02*Y134000D01*
+X141600D01*
+Y140000D01*
+X137100D01*
+G37*
+G36*
+X142500D02*Y134000D01*
+X147000D01*
+Y140000D01*
+X142500D01*
+G37*
+G36*
+X147900D02*Y134000D01*
+X152400D01*
+Y140000D01*
+X147900D01*
+G37*
+G36*
+X153300D02*Y134000D01*
+X157800D01*
+Y140000D01*
+X153300D01*
+G37*
+G36*
+X158700D02*Y134000D01*
+X163200D01*
+Y140000D01*
+X158700D01*
+G37*
+G36*
+X166800D02*Y134000D01*
+X171300D01*
+Y140000D01*
+X166800D01*
+G37*
+G36*
+X172200D02*Y134000D01*
+X176700D01*
+Y140000D01*
+X172200D01*
+G37*
+G36*
+X177600D02*Y134000D01*
+X182100D01*
+Y140000D01*
+X177600D01*
+G37*
+G36*
+X183000D02*Y134000D01*
+X187500D01*
+Y140000D01*
+X183000D01*
+G37*
+G36*
+X191100D02*Y134000D01*
+X195600D01*
+Y140000D01*
+X191100D01*
+G37*
+G36*
+X196500D02*Y134000D01*
+X201000D01*
+Y140000D01*
+X196500D01*
+G37*
+G36*
+X204600D02*Y134000D01*
+X209100D01*
+Y140000D01*
+X204600D01*
+G37*
+G36*
+X210000D02*Y134000D01*
+X214500D01*
+Y140000D01*
+X210000D01*
+G37*
+G36*
+X215400D02*Y134000D01*
+X219900D01*
+Y140000D01*
+X215400D01*
+G37*
+G36*
+X220800D02*Y134000D01*
+X225300D01*
+Y140000D01*
+X220800D01*
+G37*
+G36*
+X228900D02*Y134000D01*
+X233400D01*
+Y140000D01*
+X228900D01*
+G37*
+G36*
+X234300D02*Y134000D01*
+X238800D01*
+Y140000D01*
+X234300D01*
+G37*
+G36*
+X239700D02*Y134000D01*
+X244200D01*
+Y140000D01*
+X239700D01*
+G37*
+G36*
+X245100D02*Y134000D01*
+X249600D01*
+Y140000D01*
+X245100D01*
+G37*
+G36*
+X250500D02*Y134000D01*
+X255000D01*
+Y140000D01*
+X250500D01*
+G37*
+G36*
+X255900D02*Y134000D01*
+X260400D01*
+Y140000D01*
+X255900D01*
+G37*
+G36*
+X261300D02*Y134000D01*
+X265800D01*
+Y140000D01*
+X261300D01*
+G37*
+G36*
+X269400D02*Y134000D01*
+X273900D01*
+Y140000D01*
+X269400D01*
+G37*
+G36*
+X277500D02*Y134000D01*
+X282000D01*
+Y140000D01*
+X277500D01*
+G37*
+G36*
+X282900D02*Y134000D01*
+X287400D01*
+Y140000D01*
+X282900D01*
+G37*
+G36*
+X288300D02*Y134000D01*
+X292800D01*
+Y140000D01*
+X288300D01*
+G37*
+G36*
+X293700D02*Y134000D01*
+X298200D01*
+Y140000D01*
+X293700D01*
+G37*
+G36*
+X299100D02*Y134000D01*
+X303600D01*
+Y140000D01*
+X299100D01*
+G37*
+G36*
+X307200D02*Y134000D01*
+X311700D01*
+Y140000D01*
+X307200D01*
+G37*
+G36*
+X312600D02*Y134000D01*
+X317100D01*
+Y140000D01*
+X312600D01*
+G37*
+G36*
+X318000D02*Y134000D01*
+X322500D01*
+Y140000D01*
+X318000D01*
+G37*
+G36*
+X323400D02*Y134000D01*
+X327900D01*
+Y140000D01*
+X323400D01*
+G37*
+G36*
+X328800D02*Y134000D01*
+X333300D01*
+Y140000D01*
+X328800D01*
+G37*
+G54D13*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D11*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D12*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D11*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D12*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D11*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D12*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D11*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D12*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D11*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D12*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D11*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D12*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D11*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D12*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D11*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D12*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D11*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D12*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D11*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D12*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D11*X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D12*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X242600D02*Y104000D01*
+X247100D01*
+Y110000D01*
+X242600D01*
+G37*
+G36*
+X248000D02*Y104000D01*
+X252500D01*
+Y110000D01*
+X248000D01*
+G37*
+G36*
+X253400D02*Y104000D01*
+X257900D01*
+Y110000D01*
+X253400D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X277700D02*Y104000D01*
+X282200D01*
+Y110000D01*
+X277700D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G54D11*X293900D02*Y104000D01*
+Y110000D02*X296900D01*
+X293900Y107300D02*X296150D01*
+G54D12*G36*
+X298700Y110000D02*Y104000D01*
+X303200D01*
+Y110000D01*
+X298700D01*
+G37*
+G36*
+X304100D02*Y104000D01*
+X308600D01*
+Y110000D01*
+X304100D01*
+G37*
+G36*
+X309500D02*Y104000D01*
+X314000D01*
+Y110000D01*
+X309500D01*
+G37*
+G36*
+X314900D02*Y104000D01*
+X319400D01*
+Y110000D01*
+X314900D01*
+G37*
+G36*
+X320300D02*Y104000D01*
+X324800D01*
+Y110000D01*
+X320300D01*
+G37*
+G36*
+X325700D02*Y104000D01*
+X330200D01*
+Y110000D01*
+X325700D01*
+G37*
+G36*
+X331100D02*Y104000D01*
+X335600D01*
+Y110000D01*
+X331100D01*
+G37*
+G36*
+X336500D02*Y104000D01*
+X341000D01*
+Y110000D01*
+X336500D01*
+G37*
+G36*
+X341900D02*Y104000D01*
+X346400D01*
+Y110000D01*
+X341900D01*
+G37*
+G36*
+X347300D02*Y104000D01*
+X351800D01*
+Y110000D01*
+X347300D01*
+G37*
+G54D11*X356150D02*Y104000D01*
+X358100Y110000D02*X359150Y108950D01*
+Y105050D01*
+X358100Y104000D02*X359150Y105050D01*
+X355400Y104000D02*X358100D01*
+X355400Y110000D02*X358100D01*
+G54D12*G36*
+X360950D02*Y104000D01*
+X365450D01*
+Y110000D01*
+X360950D01*
+G37*
+G36*
+X366350D02*Y104000D01*
+X370850D01*
+Y110000D01*
+X366350D01*
+G37*
+G36*
+X371750D02*Y104000D01*
+X376250D01*
+Y110000D01*
+X371750D01*
+G37*
+G36*
+X377150D02*Y104000D01*
+X381650D01*
+Y110000D01*
+X377150D01*
+G37*
+G36*
+X382550D02*Y104000D01*
+X387050D01*
+Y110000D01*
+X382550D01*
+G37*
+G36*
+X387950D02*Y104000D01*
+X392450D01*
+Y110000D01*
+X387950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/rat.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/rat.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   a rat line
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/rat.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/rat.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/rat.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/rat.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.png.text	(revision 18980)
@@ -0,0 +1,6 @@
+r6731
+
+outline thickness 6 x 7 pixels (top/left) (5/5.833)
+
+outline (inside lines) 587 x 589 pixels (489.167 x 490.833)
+
Index: tags/2.0.1/tests/RTT/ref/rat.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/rat.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/rat.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/rat.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/rat.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/rat.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/rat.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.svg	(revision 18980)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/rat.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/rat.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/rat.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: 
+# Title: a rat line - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_rot.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text rotations - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_rot.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb text rotations
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/text_rot.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.eps	(revision 18980)
@@ -0,0 +1,81 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: text_rot.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+0.00700 setlinewidth
+1 setlinecap
+0 0 0 setrgbcolor
+0.22500 0.16000 0.22500 0.19000 t
+0.22500 0.16000 0.23200 0.15000 t
+0.23200 0.15000 0.24300 0.15000 t
+0.24300 0.15000 0.25000 0.16000 t
+0.25000 0.16000 0.25000 0.19000 t
+0.22500 0.17000 0.25000 0.17000 t
+0.26200 0.15800 0.27000 0.15000 t
+0.27000 0.15000 0.27000 0.19000 t
+0.26200 0.19000 0.27700 0.19000 t
+0.16000 0.27500 0.19000 0.27500 t
+0.16000 0.27500 0.15000 0.26800 t
+0.15000 0.25700 0.15000 0.26800 t
+0.15000 0.25700 0.16000 0.25000 t
+0.16000 0.25000 0.19000 0.25000 t
+0.17000 0.25000 0.17000 0.27500 t
+0.15500 0.23800 0.15000 0.23300 t
+0.15000 0.21800 0.15000 0.23300 t
+0.15000 0.21800 0.15500 0.21300 t
+0.15500 0.21300 0.16500 0.21300 t
+0.19000 0.23800 0.16500 0.21300 t
+0.19000 0.21300 0.19000 0.23800 t
+0.27500 0.31000 0.27500 0.34000 t
+0.27500 0.34000 0.26800 0.35000 t
+0.25700 0.35000 0.26800 0.35000 t
+0.25700 0.35000 0.25000 0.34000 t
+0.25000 0.31000 0.25000 0.34000 t
+0.25000 0.33000 0.27500 0.33000 t
+0.23800 0.34500 0.23300 0.35000 t
+0.22300 0.35000 0.23300 0.35000 t
+0.22300 0.35000 0.21800 0.34500 t
+0.22300 0.31000 0.21800 0.31500 t
+0.22300 0.31000 0.23300 0.31000 t
+0.23800 0.31500 0.23300 0.31000 t
+0.22300 0.33200 0.23300 0.33200 t
+0.21800 0.33700 0.21800 0.34500 t
+0.21800 0.31500 0.21800 0.32700 t
+0.21800 0.32700 0.22300 0.33200 t
+0.21800 0.33700 0.22300 0.33200 t
+0.31000 0.22500 0.34000 0.22500 t
+0.34000 0.22500 0.35000 0.23200 t
+0.35000 0.23200 0.35000 0.24300 t
+0.35000 0.24300 0.34000 0.25000 t
+0.31000 0.25000 0.34000 0.25000 t
+0.33000 0.22500 0.33000 0.25000 t
+0.32500 0.26200 0.35000 0.28200 t
+0.32500 0.26200 0.32500 0.28700 t
+0.31000 0.28200 0.35000 0.28200 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/text_rot.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.fcd	(revision 18980)
@@ -0,0 +1,5 @@
+[FIDOCAD]
+TY 45 30 7 5 0 1 3 * A1
+TY 30 55 7 5 90 1 3 * A2
+TY 55 70 7 5 180 1 3 * A3
+TY 70 45 7 5 270 1 3 * A4
Index: tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.fab.gbr	(revision 18980)
@@ -0,0 +1,1974 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: text rotations, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD15C,0.0060*%
+%ADD14C,0.0100*%
+%ADD13C,0.0080*%
+%ADD12C,0.0001*%
+G54D12*G36*
+X0Y125000D02*Y117500D01*
+X3750D01*
+Y125000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y117500D01*
+X8250D01*
+Y125000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y117500D01*
+X12750D01*
+Y125000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y117500D01*
+X17250D01*
+Y125000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y117500D01*
+X21750D01*
+Y125000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y117500D01*
+X26250D01*
+Y125000D01*
+X22500D01*
+G37*
+G54D13*X0Y116500D03*
+G54D12*G36*
+X41000Y125000D02*Y117500D01*
+X44750D01*
+Y125000D01*
+X41000D01*
+G37*
+G36*
+X45500D02*Y117500D01*
+X49250D01*
+Y125000D01*
+X45500D01*
+G37*
+G36*
+X50000D02*Y117500D01*
+X53750D01*
+Y125000D01*
+X50000D01*
+G37*
+G36*
+X54500D02*Y117500D01*
+X58250D01*
+Y125000D01*
+X54500D01*
+G37*
+G36*
+X59000D02*Y117500D01*
+X62750D01*
+Y125000D01*
+X59000D01*
+G37*
+G36*
+X63500D02*Y117500D01*
+X67250D01*
+Y125000D01*
+X63500D01*
+G37*
+G36*
+X68000D02*Y117500D01*
+X71750D01*
+Y125000D01*
+X68000D01*
+G37*
+G36*
+X72500D02*Y117500D01*
+X76250D01*
+Y125000D01*
+X72500D01*
+G37*
+G36*
+X77000D02*Y117500D01*
+X80750D01*
+Y125000D01*
+X77000D01*
+G37*
+G36*
+X81500D02*Y117500D01*
+X85250D01*
+Y125000D01*
+X81500D01*
+G37*
+G36*
+X86000D02*Y117500D01*
+X89750D01*
+Y125000D01*
+X86000D01*
+G37*
+G36*
+X90500D02*Y117500D01*
+X94250D01*
+Y125000D01*
+X90500D01*
+G37*
+G54D13*X41000Y116500D03*
+G54D12*G36*
+X95000Y125000D02*Y117500D01*
+X98750D01*
+Y125000D01*
+X95000D01*
+G37*
+G36*
+X99500D02*Y117500D01*
+X103250D01*
+Y125000D01*
+X99500D01*
+G37*
+G36*
+X104000D02*Y117500D01*
+X107750D01*
+Y125000D01*
+X104000D01*
+G37*
+G36*
+X108500D02*Y117500D01*
+X112250D01*
+Y125000D01*
+X108500D01*
+G37*
+G36*
+X113000D02*Y117500D01*
+X116750D01*
+Y125000D01*
+X113000D01*
+G37*
+G54D13*X95000Y116500D03*
+G54D12*G36*
+X130000Y125000D02*Y117500D01*
+X133750D01*
+Y125000D01*
+X130000D01*
+G37*
+G36*
+X134500D02*Y117500D01*
+X138250D01*
+Y125000D01*
+X134500D01*
+G37*
+G36*
+X139000D02*Y117500D01*
+X142750D01*
+Y125000D01*
+X139000D01*
+G37*
+G36*
+X143500D02*Y117500D01*
+X147250D01*
+Y125000D01*
+X143500D01*
+G37*
+G36*
+X148000D02*Y117500D01*
+X151750D01*
+Y125000D01*
+X148000D01*
+G37*
+G36*
+X152500D02*Y117500D01*
+X156250D01*
+Y125000D01*
+X152500D01*
+G37*
+G36*
+X157000D02*Y117500D01*
+X160750D01*
+Y125000D01*
+X157000D01*
+G37*
+G54D13*X130000Y116500D03*
+G54D12*G36*
+X0Y140000D02*Y132500D01*
+X3750D01*
+Y140000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y132500D01*
+X8250D01*
+Y140000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y132500D01*
+X12750D01*
+Y140000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y132500D01*
+X17250D01*
+Y140000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y132500D01*
+X21750D01*
+Y140000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y132500D01*
+X26250D01*
+Y140000D01*
+X22500D01*
+G37*
+G36*
+X27000D02*Y132500D01*
+X30750D01*
+Y140000D01*
+X27000D01*
+G37*
+G36*
+X31500D02*Y132500D01*
+X35250D01*
+Y140000D01*
+X31500D01*
+G37*
+G36*
+X36000D02*Y132500D01*
+X39750D01*
+Y140000D01*
+X36000D01*
+G37*
+G36*
+X40500D02*Y132500D01*
+X44250D01*
+Y140000D01*
+X40500D01*
+G37*
+G36*
+X45000D02*Y132500D01*
+X48750D01*
+Y140000D01*
+X45000D01*
+G37*
+G36*
+X49500D02*Y132500D01*
+X53250D01*
+Y140000D01*
+X49500D01*
+G37*
+G36*
+X54000D02*Y132500D01*
+X57750D01*
+Y140000D01*
+X54000D01*
+G37*
+G36*
+X58500D02*Y132500D01*
+X62250D01*
+Y140000D01*
+X58500D01*
+G37*
+G36*
+X63000D02*Y132500D01*
+X66750D01*
+Y140000D01*
+X63000D01*
+G37*
+G36*
+X67500D02*Y132500D01*
+X71250D01*
+Y140000D01*
+X67500D01*
+G37*
+G36*
+X72000D02*Y132500D01*
+X75750D01*
+Y140000D01*
+X72000D01*
+G37*
+G36*
+X76500D02*Y132500D01*
+X80250D01*
+Y140000D01*
+X76500D01*
+G37*
+G36*
+X81000D02*Y132500D01*
+X84750D01*
+Y140000D01*
+X81000D01*
+G37*
+G36*
+X85500D02*Y132500D01*
+X89250D01*
+Y140000D01*
+X85500D01*
+G37*
+G36*
+X90000D02*Y132500D01*
+X93750D01*
+Y140000D01*
+X90000D01*
+G37*
+G36*
+X94500D02*Y132500D01*
+X98250D01*
+Y140000D01*
+X94500D01*
+G37*
+G36*
+X99000D02*Y132500D01*
+X102750D01*
+Y140000D01*
+X99000D01*
+G37*
+G36*
+X103500D02*Y132500D01*
+X107250D01*
+Y140000D01*
+X103500D01*
+G37*
+G36*
+X108000D02*Y132500D01*
+X111750D01*
+Y140000D01*
+X108000D01*
+G37*
+G36*
+X112500D02*Y132500D01*
+X116250D01*
+Y140000D01*
+X112500D01*
+G37*
+G36*
+X117000D02*Y132500D01*
+X120750D01*
+Y140000D01*
+X117000D01*
+G37*
+G36*
+X121500D02*Y132500D01*
+X125250D01*
+Y140000D01*
+X121500D01*
+G37*
+G36*
+X126000D02*Y132500D01*
+X129750D01*
+Y140000D01*
+X126000D01*
+G37*
+G36*
+X130500D02*Y132500D01*
+X134250D01*
+Y140000D01*
+X130500D01*
+G37*
+G36*
+X135000D02*Y132500D01*
+X138750D01*
+Y140000D01*
+X135000D01*
+G37*
+G36*
+X139500D02*Y132500D01*
+X143250D01*
+Y140000D01*
+X139500D01*
+G37*
+G36*
+X144000D02*Y132500D01*
+X147750D01*
+Y140000D01*
+X144000D01*
+G37*
+G36*
+X148500D02*Y132500D01*
+X152250D01*
+Y140000D01*
+X148500D01*
+G37*
+G36*
+X153000D02*Y132500D01*
+X156750D01*
+Y140000D01*
+X153000D01*
+G37*
+G36*
+X157500D02*Y132500D01*
+X161250D01*
+Y140000D01*
+X157500D01*
+G37*
+G36*
+X162000D02*Y132500D01*
+X165750D01*
+Y140000D01*
+X162000D01*
+G37*
+G36*
+X166500D02*Y132500D01*
+X170250D01*
+Y140000D01*
+X166500D01*
+G37*
+G36*
+X171000D02*Y132500D01*
+X174750D01*
+Y140000D01*
+X171000D01*
+G37*
+G36*
+X175500D02*Y132500D01*
+X179250D01*
+Y140000D01*
+X175500D01*
+G37*
+G36*
+X180000D02*Y132500D01*
+X183750D01*
+Y140000D01*
+X180000D01*
+G37*
+G36*
+X184500D02*Y132500D01*
+X188250D01*
+Y140000D01*
+X184500D01*
+G37*
+G36*
+X189000D02*Y132500D01*
+X192750D01*
+Y140000D01*
+X189000D01*
+G37*
+G36*
+X193500D02*Y132500D01*
+X197250D01*
+Y140000D01*
+X193500D01*
+G37*
+G36*
+X198000D02*Y132500D01*
+X201750D01*
+Y140000D01*
+X198000D01*
+G37*
+G36*
+X202500D02*Y132500D01*
+X206250D01*
+Y140000D01*
+X202500D01*
+G37*
+G36*
+X207000D02*Y132500D01*
+X210750D01*
+Y140000D01*
+X207000D01*
+G37*
+G36*
+X211500D02*Y132500D01*
+X215250D01*
+Y140000D01*
+X211500D01*
+G37*
+G36*
+X216000D02*Y132500D01*
+X219750D01*
+Y140000D01*
+X216000D01*
+G37*
+G36*
+X220500D02*Y132500D01*
+X224250D01*
+Y140000D01*
+X220500D01*
+G37*
+G36*
+X225000D02*Y132500D01*
+X228750D01*
+Y140000D01*
+X225000D01*
+G37*
+G36*
+X229500D02*Y132500D01*
+X233250D01*
+Y140000D01*
+X229500D01*
+G37*
+G36*
+X234000D02*Y132500D01*
+X237750D01*
+Y140000D01*
+X234000D01*
+G37*
+G36*
+X238500D02*Y132500D01*
+X242250D01*
+Y140000D01*
+X238500D01*
+G37*
+G36*
+X243000D02*Y132500D01*
+X246750D01*
+Y140000D01*
+X243000D01*
+G37*
+G36*
+X247500D02*Y132500D01*
+X251250D01*
+Y140000D01*
+X247500D01*
+G37*
+G36*
+X252000D02*Y132500D01*
+X255750D01*
+Y140000D01*
+X252000D01*
+G37*
+G36*
+X256500D02*Y132500D01*
+X260250D01*
+Y140000D01*
+X256500D01*
+G37*
+G36*
+X261000D02*Y132500D01*
+X264750D01*
+Y140000D01*
+X261000D01*
+G37*
+G36*
+X265500D02*Y132500D01*
+X269250D01*
+Y140000D01*
+X265500D01*
+G37*
+G36*
+X270000D02*Y132500D01*
+X273750D01*
+Y140000D01*
+X270000D01*
+G37*
+G36*
+X274500D02*Y132500D01*
+X278250D01*
+Y140000D01*
+X274500D01*
+G37*
+G36*
+X279000D02*Y132500D01*
+X282750D01*
+Y140000D01*
+X279000D01*
+G37*
+G36*
+X283500D02*Y132500D01*
+X287250D01*
+Y140000D01*
+X283500D01*
+G37*
+G36*
+X288000D02*Y132500D01*
+X291750D01*
+Y140000D01*
+X288000D01*
+G37*
+G36*
+X292500D02*Y132500D01*
+X296250D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297000D02*Y132500D01*
+X300750D01*
+Y140000D01*
+X297000D01*
+G37*
+G36*
+X301500D02*Y132500D01*
+X305250D01*
+Y140000D01*
+X301500D01*
+G37*
+G54D14*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D12*G36*
+X200000Y65000D02*Y57500D01*
+X203750D01*
+Y65000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y57500D01*
+X208250D01*
+Y65000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y57500D01*
+X212750D01*
+Y65000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y57500D01*
+X217250D01*
+Y65000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y57500D01*
+X221750D01*
+Y65000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y57500D01*
+X226250D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y57500D01*
+X230750D01*
+Y65000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y57500D01*
+X235250D01*
+Y65000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y57500D01*
+X239750D01*
+Y65000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y57500D01*
+X244250D01*
+Y65000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y57500D01*
+X248750D01*
+Y65000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y57500D01*
+X253250D01*
+Y65000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y57500D01*
+X257750D01*
+Y65000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y57500D01*
+X262250D01*
+Y65000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y57500D01*
+X266750D01*
+Y65000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y57500D01*
+X271250D01*
+Y65000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y57500D01*
+X275750D01*
+Y65000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y57500D01*
+X280250D01*
+Y65000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y57500D01*
+X284750D01*
+Y65000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y57500D01*
+X289250D01*
+Y65000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y57500D01*
+X293750D01*
+Y65000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y57500D01*
+X298250D01*
+Y65000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y57500D01*
+X302750D01*
+Y65000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y57500D01*
+X307250D01*
+Y65000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y57500D01*
+X311750D01*
+Y65000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y57500D01*
+X316250D01*
+Y65000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y57500D01*
+X320750D01*
+Y65000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y57500D01*
+X325250D01*
+Y65000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y57500D01*
+X329750D01*
+Y65000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y57500D01*
+X334250D01*
+Y65000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y57500D01*
+X338750D01*
+Y65000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y57500D01*
+X343250D01*
+Y65000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y57500D01*
+X347750D01*
+Y65000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y57500D01*
+X352250D01*
+Y65000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y57500D01*
+X356750D01*
+Y65000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y57500D01*
+X361250D01*
+Y65000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y57500D01*
+X365750D01*
+Y65000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y57500D01*
+X370250D01*
+Y65000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y57500D01*
+X374750D01*
+Y65000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y57500D01*
+X379250D01*
+Y65000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y57500D01*
+X383750D01*
+Y65000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y57500D01*
+X388250D01*
+Y65000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y57500D01*
+X392750D01*
+Y65000D01*
+X389000D01*
+G37*
+G36*
+X393500D02*Y57500D01*
+X397250D01*
+Y65000D01*
+X393500D01*
+G37*
+G36*
+X398000D02*Y57500D01*
+X401750D01*
+Y65000D01*
+X398000D01*
+G37*
+G36*
+X402500D02*Y57500D01*
+X406250D01*
+Y65000D01*
+X402500D01*
+G37*
+G36*
+X407000D02*Y57500D01*
+X410750D01*
+Y65000D01*
+X407000D01*
+G37*
+G36*
+X411500D02*Y57500D01*
+X415250D01*
+Y65000D01*
+X411500D01*
+G37*
+G36*
+X416000D02*Y57500D01*
+X419750D01*
+Y65000D01*
+X416000D01*
+G37*
+G36*
+X420500D02*Y57500D01*
+X424250D01*
+Y65000D01*
+X420500D01*
+G37*
+G36*
+X425000D02*Y57500D01*
+X428750D01*
+Y65000D01*
+X425000D01*
+G37*
+G36*
+X429500D02*Y57500D01*
+X433250D01*
+Y65000D01*
+X429500D01*
+G37*
+G36*
+X434000D02*Y57500D01*
+X437750D01*
+Y65000D01*
+X434000D01*
+G37*
+G36*
+X438500D02*Y57500D01*
+X442250D01*
+Y65000D01*
+X438500D01*
+G37*
+G36*
+X443000D02*Y57500D01*
+X446750D01*
+Y65000D01*
+X443000D01*
+G37*
+G36*
+X447500D02*Y57500D01*
+X451250D01*
+Y65000D01*
+X447500D01*
+G37*
+G36*
+X452000D02*Y57500D01*
+X455750D01*
+Y65000D01*
+X452000D01*
+G37*
+G36*
+X456500D02*Y57500D01*
+X460250D01*
+Y65000D01*
+X456500D01*
+G37*
+G36*
+X461000D02*Y57500D01*
+X464750D01*
+Y65000D01*
+X461000D01*
+G37*
+G36*
+X465500D02*Y57500D01*
+X469250D01*
+Y65000D01*
+X465500D01*
+G37*
+G36*
+X470000D02*Y57500D01*
+X473750D01*
+Y65000D01*
+X470000D01*
+G37*
+G36*
+X474500D02*Y57500D01*
+X478250D01*
+Y65000D01*
+X474500D01*
+G37*
+G36*
+X25000Y-2000D02*Y-9500D01*
+X28750D01*
+Y-2000D01*
+X25000D01*
+G37*
+G36*
+X29500D02*Y-9500D01*
+X33250D01*
+Y-2000D01*
+X29500D01*
+G37*
+G36*
+X34000D02*Y-9500D01*
+X37750D01*
+Y-2000D01*
+X34000D01*
+G37*
+G36*
+X38500D02*Y-9500D01*
+X42250D01*
+Y-2000D01*
+X38500D01*
+G37*
+G36*
+X43000D02*Y-9500D01*
+X46750D01*
+Y-2000D01*
+X43000D01*
+G37*
+G36*
+X47500D02*Y-9500D01*
+X51250D01*
+Y-2000D01*
+X47500D01*
+G37*
+G36*
+X52000D02*Y-9500D01*
+X55750D01*
+Y-2000D01*
+X52000D01*
+G37*
+G36*
+X56500D02*Y-9500D01*
+X60250D01*
+Y-2000D01*
+X56500D01*
+G37*
+G36*
+X61000D02*Y-9500D01*
+X64750D01*
+Y-2000D01*
+X61000D01*
+G37*
+G36*
+X65500D02*Y-9500D01*
+X69250D01*
+Y-2000D01*
+X65500D01*
+G37*
+G36*
+X70000D02*Y-9500D01*
+X73750D01*
+Y-2000D01*
+X70000D01*
+G37*
+G36*
+X74500D02*Y-9500D01*
+X78250D01*
+Y-2000D01*
+X74500D01*
+G37*
+G36*
+X79000D02*Y-9500D01*
+X82750D01*
+Y-2000D01*
+X79000D01*
+G37*
+G36*
+X83500D02*Y-9500D01*
+X87250D01*
+Y-2000D01*
+X83500D01*
+G37*
+G36*
+X88000D02*Y-9500D01*
+X91750D01*
+Y-2000D01*
+X88000D01*
+G37*
+G36*
+X92500D02*Y-9500D01*
+X96250D01*
+Y-2000D01*
+X92500D01*
+G37*
+G36*
+X97000D02*Y-9500D01*
+X100750D01*
+Y-2000D01*
+X97000D01*
+G37*
+G36*
+X101500D02*Y-9500D01*
+X105250D01*
+Y-2000D01*
+X101500D01*
+G37*
+G36*
+X106000D02*Y-9500D01*
+X109750D01*
+Y-2000D01*
+X106000D01*
+G37*
+G36*
+X110500D02*Y-9500D01*
+X114250D01*
+Y-2000D01*
+X110500D01*
+G37*
+G36*
+X115000D02*Y-9500D01*
+X118750D01*
+Y-2000D01*
+X115000D01*
+G37*
+G36*
+X119500D02*Y-9500D01*
+X123250D01*
+Y-2000D01*
+X119500D01*
+G37*
+G36*
+X124000D02*Y-9500D01*
+X127750D01*
+Y-2000D01*
+X124000D01*
+G37*
+G36*
+X128500D02*Y-9500D01*
+X132250D01*
+Y-2000D01*
+X128500D01*
+G37*
+G36*
+X133000D02*Y-9500D01*
+X136750D01*
+Y-2000D01*
+X133000D01*
+G37*
+G36*
+X137500D02*Y-9500D01*
+X141250D01*
+Y-2000D01*
+X137500D01*
+G37*
+G36*
+X142000D02*Y-9500D01*
+X145750D01*
+Y-2000D01*
+X142000D01*
+G37*
+G36*
+X146500D02*Y-9500D01*
+X150250D01*
+Y-2000D01*
+X146500D01*
+G37*
+G36*
+X151000D02*Y-9500D01*
+X154750D01*
+Y-2000D01*
+X151000D01*
+G37*
+G36*
+X155500D02*Y-9500D01*
+X159250D01*
+Y-2000D01*
+X155500D01*
+G37*
+G36*
+X160000D02*Y-9500D01*
+X163750D01*
+Y-2000D01*
+X160000D01*
+G37*
+G36*
+X164500D02*Y-9500D01*
+X168250D01*
+Y-2000D01*
+X164500D01*
+G37*
+G36*
+X169000D02*Y-9500D01*
+X172750D01*
+Y-2000D01*
+X169000D01*
+G37*
+G36*
+X173500D02*Y-9500D01*
+X177250D01*
+Y-2000D01*
+X173500D01*
+G37*
+G36*
+X178000D02*Y-9500D01*
+X181750D01*
+Y-2000D01*
+X178000D01*
+G37*
+G36*
+X182500D02*Y-9500D01*
+X186250D01*
+Y-2000D01*
+X182500D01*
+G37*
+G36*
+X187000D02*Y-9500D01*
+X190750D01*
+Y-2000D01*
+X187000D01*
+G37*
+G36*
+X191500D02*Y-9500D01*
+X195250D01*
+Y-2000D01*
+X191500D01*
+G37*
+G36*
+X196000D02*Y-9500D01*
+X199750D01*
+Y-2000D01*
+X196000D01*
+G37*
+G36*
+X200500D02*Y-9500D01*
+X204250D01*
+Y-2000D01*
+X200500D01*
+G37*
+G36*
+X205000D02*Y-9500D01*
+X208750D01*
+Y-2000D01*
+X205000D01*
+G37*
+G36*
+X209500D02*Y-9500D01*
+X213250D01*
+Y-2000D01*
+X209500D01*
+G37*
+G36*
+X214000D02*Y-9500D01*
+X217750D01*
+Y-2000D01*
+X214000D01*
+G37*
+G36*
+X218500D02*Y-9500D01*
+X222250D01*
+Y-2000D01*
+X218500D01*
+G37*
+G36*
+X223000D02*Y-9500D01*
+X226750D01*
+Y-2000D01*
+X223000D01*
+G37*
+G36*
+X227500D02*Y-9500D01*
+X231250D01*
+Y-2000D01*
+X227500D01*
+G37*
+G36*
+X232000D02*Y-9500D01*
+X235750D01*
+Y-2000D01*
+X232000D01*
+G37*
+G36*
+X236500D02*Y-9500D01*
+X240250D01*
+Y-2000D01*
+X236500D01*
+G37*
+G36*
+X241000D02*Y-9500D01*
+X244750D01*
+Y-2000D01*
+X241000D01*
+G37*
+G36*
+X245500D02*Y-9500D01*
+X249250D01*
+Y-2000D01*
+X245500D01*
+G37*
+G36*
+X250000D02*Y-9500D01*
+X253750D01*
+Y-2000D01*
+X250000D01*
+G37*
+G36*
+X254500D02*Y-9500D01*
+X258250D01*
+Y-2000D01*
+X254500D01*
+G37*
+G36*
+X259000D02*Y-9500D01*
+X262750D01*
+Y-2000D01*
+X259000D01*
+G37*
+G36*
+X263500D02*Y-9500D01*
+X267250D01*
+Y-2000D01*
+X263500D01*
+G37*
+G36*
+X268000D02*Y-9500D01*
+X271750D01*
+Y-2000D01*
+X268000D01*
+G37*
+G36*
+X272500D02*Y-9500D01*
+X276250D01*
+Y-2000D01*
+X272500D01*
+G37*
+G36*
+X277000D02*Y-9500D01*
+X280750D01*
+Y-2000D01*
+X277000D01*
+G37*
+G36*
+X281500D02*Y-9500D01*
+X285250D01*
+Y-2000D01*
+X281500D01*
+G37*
+G36*
+X286000D02*Y-9500D01*
+X289750D01*
+Y-2000D01*
+X286000D01*
+G37*
+G36*
+X290500D02*Y-9500D01*
+X294250D01*
+Y-2000D01*
+X290500D01*
+G37*
+G36*
+X295000D02*Y-9500D01*
+X298750D01*
+Y-2000D01*
+X295000D01*
+G37*
+G36*
+X299500D02*Y-9500D01*
+X303250D01*
+Y-2000D01*
+X299500D01*
+G37*
+G36*
+X304000D02*Y-9500D01*
+X307750D01*
+Y-2000D01*
+X304000D01*
+G37*
+G36*
+X308500D02*Y-9500D01*
+X312250D01*
+Y-2000D01*
+X308500D01*
+G37*
+G36*
+X313000D02*Y-9500D01*
+X316750D01*
+Y-2000D01*
+X313000D01*
+G37*
+G36*
+X317500D02*Y-9500D01*
+X321250D01*
+Y-2000D01*
+X317500D01*
+G37*
+G36*
+X322000D02*Y-9500D01*
+X325750D01*
+Y-2000D01*
+X322000D01*
+G37*
+G36*
+X326500D02*Y-9500D01*
+X330250D01*
+Y-2000D01*
+X326500D01*
+G37*
+G36*
+X331000D02*Y-9500D01*
+X334750D01*
+Y-2000D01*
+X331000D01*
+G37*
+G36*
+X335500D02*Y-9500D01*
+X339250D01*
+Y-2000D01*
+X335500D01*
+G37*
+G36*
+X340000D02*Y-9500D01*
+X343750D01*
+Y-2000D01*
+X340000D01*
+G37*
+G36*
+X344500D02*Y-9500D01*
+X348250D01*
+Y-2000D01*
+X344500D01*
+G37*
+G36*
+X349000D02*Y-9500D01*
+X352750D01*
+Y-2000D01*
+X349000D01*
+G37*
+G36*
+X353500D02*Y-9500D01*
+X357250D01*
+Y-2000D01*
+X353500D01*
+G37*
+G36*
+X358000D02*Y-9500D01*
+X361750D01*
+Y-2000D01*
+X358000D01*
+G37*
+G36*
+X362500D02*Y-9500D01*
+X366250D01*
+Y-2000D01*
+X362500D01*
+G37*
+G36*
+X367000D02*Y-9500D01*
+X370750D01*
+Y-2000D01*
+X367000D01*
+G37*
+G36*
+X371500D02*Y-9500D01*
+X375250D01*
+Y-2000D01*
+X371500D01*
+G37*
+G36*
+X376000D02*Y-9500D01*
+X379750D01*
+Y-2000D01*
+X376000D01*
+G37*
+G36*
+X380500D02*Y-9500D01*
+X384250D01*
+Y-2000D01*
+X380500D01*
+G37*
+G36*
+X385000D02*Y-9500D01*
+X388750D01*
+Y-2000D01*
+X385000D01*
+G37*
+G36*
+X389500D02*Y-9500D01*
+X393250D01*
+Y-2000D01*
+X389500D01*
+G37*
+G36*
+X394000D02*Y-9500D01*
+X397750D01*
+Y-2000D01*
+X394000D01*
+G37*
+G36*
+X398500D02*Y-9500D01*
+X402250D01*
+Y-2000D01*
+X398500D01*
+G37*
+G36*
+X403000D02*Y-9500D01*
+X406751D01*
+Y-2000D01*
+X403000D01*
+G37*
+G36*
+X407501D02*Y-9500D01*
+X411251D01*
+Y-2000D01*
+X407501D01*
+G37*
+G36*
+X412001D02*Y-9500D01*
+X415751D01*
+Y-2000D01*
+X412001D01*
+G37*
+G36*
+X416501D02*Y-9500D01*
+X420251D01*
+Y-2000D01*
+X416501D01*
+G37*
+G36*
+X421001D02*Y-9500D01*
+X424751D01*
+Y-2000D01*
+X421001D01*
+G37*
+G36*
+X425501D02*Y-9500D01*
+X429251D01*
+Y-2000D01*
+X425501D01*
+G37*
+G36*
+X430001D02*Y-9500D01*
+X433751D01*
+Y-2000D01*
+X430001D01*
+G37*
+G36*
+X434501D02*Y-9500D01*
+X438251D01*
+Y-2000D01*
+X434501D01*
+G37*
+G36*
+X439001D02*Y-9500D01*
+X442751D01*
+Y-2000D01*
+X439001D01*
+G37*
+G36*
+X443501D02*Y-9500D01*
+X447251D01*
+Y-2000D01*
+X443501D01*
+G37*
+G36*
+X448001D02*Y-9500D01*
+X451751D01*
+Y-2000D01*
+X448001D01*
+G37*
+G36*
+X452501D02*Y-9500D01*
+X456251D01*
+Y-2000D01*
+X452501D01*
+G37*
+G36*
+X457001D02*Y-9500D01*
+X460751D01*
+Y-2000D01*
+X457001D01*
+G37*
+G36*
+X461501D02*Y-9500D01*
+X465251D01*
+Y-2000D01*
+X461501D01*
+G37*
+G36*
+X200000Y80000D02*Y72500D01*
+X203750D01*
+Y80000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y72500D01*
+X208250D01*
+Y80000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y72500D01*
+X212750D01*
+Y80000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y72500D01*
+X217250D01*
+Y80000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y72500D01*
+X221750D01*
+Y80000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y72500D01*
+X226250D01*
+Y80000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y72500D01*
+X230750D01*
+Y80000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y72500D01*
+X235250D01*
+Y80000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y72500D01*
+X239750D01*
+Y80000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y72500D01*
+X244250D01*
+Y80000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y72500D01*
+X248750D01*
+Y80000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y72500D01*
+X253250D01*
+Y80000D01*
+X249500D01*
+G37*
+G54D15*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D12*G36*
+X205550Y95000D02*Y87500D01*
+X209300D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210050D02*Y87500D01*
+X213800D01*
+Y95000D01*
+X210050D01*
+G37*
+G36*
+X214550D02*Y87500D01*
+X218300D01*
+Y95000D01*
+X214550D01*
+G37*
+G36*
+X219050D02*Y87500D01*
+X222800D01*
+Y95000D01*
+X219050D01*
+G37*
+G36*
+X223550D02*Y87500D01*
+X227300D01*
+Y95000D01*
+X223550D01*
+G37*
+G36*
+X228050D02*Y87500D01*
+X231800D01*
+Y95000D01*
+X228050D01*
+G37*
+G36*
+X232550D02*Y87500D01*
+X236300D01*
+Y95000D01*
+X232550D01*
+G37*
+G36*
+X237050D02*Y87500D01*
+X240800D01*
+Y95000D01*
+X237050D01*
+G37*
+G36*
+X241550D02*Y87500D01*
+X245300D01*
+Y95000D01*
+X241550D01*
+G37*
+G36*
+X246050D02*Y87500D01*
+X249800D01*
+Y95000D01*
+X246050D01*
+G37*
+G36*
+X250550D02*Y87500D01*
+X254300D01*
+Y95000D01*
+X250550D01*
+G37*
+G36*
+X200000Y110000D02*Y102500D01*
+X203750D01*
+Y110000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y102500D01*
+X208250D01*
+Y110000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y102500D01*
+X212750D01*
+Y110000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y102500D01*
+X217250D01*
+Y110000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y102500D01*
+X221750D01*
+Y110000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y102500D01*
+X226250D01*
+Y110000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y102500D01*
+X230750D01*
+Y110000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y102500D01*
+X235250D01*
+Y110000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y102500D01*
+X239750D01*
+Y110000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y102500D01*
+X244250D01*
+Y110000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y102500D01*
+X248750D01*
+Y110000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y102500D01*
+X253250D01*
+Y110000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y102500D01*
+X257750D01*
+Y110000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y102500D01*
+X262250D01*
+Y110000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y102500D01*
+X266750D01*
+Y110000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y102500D01*
+X271250D01*
+Y110000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y102500D01*
+X275750D01*
+Y110000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y102500D01*
+X280250D01*
+Y110000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y102500D01*
+X284750D01*
+Y110000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y102500D01*
+X289250D01*
+Y110000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y102500D01*
+X293750D01*
+Y110000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y102500D01*
+X298250D01*
+Y110000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y102500D01*
+X302750D01*
+Y110000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y102500D01*
+X307250D01*
+Y110000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y102500D01*
+X311750D01*
+Y110000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y102500D01*
+X316250D01*
+Y110000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y102500D01*
+X320750D01*
+Y110000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y102500D01*
+X325250D01*
+Y110000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y102500D01*
+X329750D01*
+Y110000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y102500D01*
+X334250D01*
+Y110000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y102500D01*
+X338750D01*
+Y110000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y102500D01*
+X343250D01*
+Y110000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y102500D01*
+X347750D01*
+Y110000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y102500D01*
+X352250D01*
+Y110000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y102500D01*
+X356750D01*
+Y110000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y102500D01*
+X361250D01*
+Y110000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y102500D01*
+X365750D01*
+Y110000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y102500D01*
+X370250D01*
+Y110000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y102500D01*
+X374750D01*
+Y110000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y102500D01*
+X379250D01*
+Y110000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y102500D01*
+X383750D01*
+Y110000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y102500D01*
+X388250D01*
+Y110000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y102500D01*
+X392750D01*
+Y110000D01*
+X389000D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.gbr/text_rot.topsilk.gbr	(revision 18980)
@@ -0,0 +1,60 @@
+G04 start of page 2 for group 1 layer_idx 8 *
+G04 Title: text rotations, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD11C,0.0070*%
+G54D11*X22500Y34000D02*Y31000D01*
+Y34000D02*X23200Y35000D01*
+X24300D01*
+X25000Y34000D01*
+Y31000D01*
+X22500Y33000D02*X25000D01*
+X26200Y34200D02*X27000Y35000D01*
+Y31000D01*
+X26200D02*X27700D01*
+X16000Y22500D02*X19000D01*
+X16000D02*X15000Y23200D01*
+Y24300D02*Y23200D01*
+Y24300D02*X16000Y25000D01*
+X19000D01*
+X17000D02*Y22500D01*
+X15500Y26200D02*X15000Y26700D01*
+Y28200D02*Y26700D01*
+Y28200D02*X15500Y28700D01*
+X16500D01*
+X19000Y26200D02*X16500Y28700D01*
+X19000D02*Y26200D01*
+X27500Y19000D02*Y16000D01*
+X26800Y15000D01*
+X25700D02*X26800D01*
+X25700D02*X25000Y16000D01*
+Y19000D02*Y16000D01*
+Y17000D02*X27500D01*
+X23800Y15500D02*X23300Y15000D01*
+X22300D02*X23300D01*
+X22300D02*X21800Y15500D01*
+X22300Y19000D02*X21800Y18500D01*
+X22300Y19000D02*X23300D01*
+X23800Y18500D02*X23300Y19000D01*
+X22300Y16800D02*X23300D01*
+X21800Y16300D02*Y15500D01*
+Y18500D02*Y17300D01*
+X22300Y16800D01*
+X21800Y16300D02*X22300Y16800D01*
+X31000Y27500D02*X34000D01*
+X35000Y26800D01*
+Y25700D01*
+X34000Y25000D01*
+X31000D02*X34000D01*
+X33000Y27500D02*Y25000D01*
+X32500Y23800D02*X35000Y21800D01*
+X32500Y23800D02*Y21300D01*
+X31000Y21800D02*X35000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_rot.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/text_rot.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   text rotations
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/text_rot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_rot.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_rot.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_rot.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.png.text	(revision 18980)
@@ -0,0 +1,13 @@
+r6731
+
+A's are all 8 pixels thick
+1 8 (6.67) pixels thick
+2 8 pixels thick
+3 8 pixels thick
+4 8 pixels thick
+
+All text is spaced @ 6 pixels (5)
+
+136 pixels (113.333) from under A2 to under A4
+136 pixels from under A1 to under A3
+
Index: tags/2.0.1/tests/RTT/ref/text_rot.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_rot.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_rot.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_rot.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_rot.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_rot.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_rot.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.svg	(revision 18980)
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="5.7150" y1="4.0640" x2="5.7150" y2="4.8260" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="4.0640" x2="5.8928" y2="3.8100" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.8928" y1="3.8100" x2="6.1722" y2="3.8100" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.1722" y1="3.8100" x2="6.3500" y2="4.0640" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.3500" y1="4.0640" x2="6.3500" y2="4.8260" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="4.3180" x2="6.3500" y2="4.3180" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6548" y1="4.0132" x2="6.8580" y2="3.8100" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.8580" y1="3.8100" x2="6.8580" y2="4.8260" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6548" y1="4.8260" x2="7.0358" y2="4.8260" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.0640" y1="6.9850" x2="4.8260" y2="6.9850" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.0640" y1="6.9850" x2="3.8100" y2="6.8072" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="6.5278" x2="3.8100" y2="6.8072" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="6.5278" x2="4.0640" y2="6.3500" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.0640" y1="6.3500" x2="4.8260" y2="6.3500" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.3180" y1="6.3500" x2="4.3180" y2="6.9850" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="6.0452" x2="3.8100" y2="5.9182" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="5.5372" x2="3.8100" y2="5.9182" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.8100" y1="5.5372" x2="3.9370" y2="5.4102" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.9370" y1="5.4102" x2="4.1910" y2="5.4102" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.8260" y1="6.0452" x2="4.1910" y2="5.4102" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.8260" y1="5.4102" x2="4.8260" y2="6.0452" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.9850" y1="7.8740" x2="6.9850" y2="8.6360" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.9850" y1="8.6360" x2="6.8072" y2="8.8900" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.5278" y1="8.8900" x2="6.8072" y2="8.8900" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.5278" y1="8.8900" x2="6.3500" y2="8.6360" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.3500" y1="7.8740" x2="6.3500" y2="8.6360" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.3500" y1="8.3820" x2="6.9850" y2="8.3820" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.0452" y1="8.7630" x2="5.9182" y2="8.8900" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6642" y1="8.8900" x2="5.9182" y2="8.8900" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6642" y1="8.8900" x2="5.5372" y2="8.7630" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6642" y1="7.8740" x2="5.5372" y2="8.0010" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6642" y1="7.8740" x2="5.9182" y2="7.8740" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.0452" y1="8.0010" x2="5.9182" y2="7.8740" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.6642" y1="8.4328" x2="5.9182" y2="8.4328" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.5372" y1="8.5598" x2="5.5372" y2="8.7630" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.5372" y1="8.0010" x2="5.5372" y2="8.3058" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.5372" y1="8.3058" x2="5.6642" y2="8.4328" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.5372" y1="8.5598" x2="5.6642" y2="8.4328" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.8740" y1="5.7150" x2="8.6360" y2="5.7150" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.6360" y1="5.7150" x2="8.8900" y2="5.8928" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8900" y1="5.8928" x2="8.8900" y2="6.1722" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.8900" y1="6.1722" x2="8.6360" y2="6.3500" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.8740" y1="6.3500" x2="8.6360" y2="6.3500" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.3820" y1="5.7150" x2="8.3820" y2="6.3500" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.2550" y1="6.6548" x2="8.8900" y2="7.1628" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="8.2550" y1="6.6548" x2="8.2550" y2="7.2898" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="7.8740" y1="7.1628" x2="8.8900" y2="7.1628" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/text_rot.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_rot.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_rot.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text rotations - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_scale.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text sizes (scales) - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_scale.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb text sizes (scales)
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/text_scale.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.eps	(revision 18980)
@@ -0,0 +1,73 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: text_scale.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+0.00700 setlinewidth
+1 setlinecap
+0 0 0 setrgbcolor
+0.05000 0.03500 0.05000 0.06500 t
+0.05000 0.03500 0.05700 0.02500 t
+0.05700 0.02500 0.06800 0.02500 t
+0.06800 0.02500 0.07500 0.03500 t
+0.07500 0.03500 0.07500 0.06500 t
+0.05000 0.04500 0.07500 0.04500 t
+0.08700 0.03300 0.09500 0.02500 t
+0.09500 0.02500 0.09500 0.06500 t
+0.08700 0.06500 0.10200 0.06500 t
+0.05000 0.20100 0.05000 0.20400 t
+0.05000 0.20100 0.05070 0.20000 t
+0.05070 0.20000 0.05180 0.20000 t
+0.05180 0.20000 0.05250 0.20100 t
+0.05250 0.20100 0.05250 0.20400 t
+0.05000 0.20200 0.05250 0.20200 t
+0.05370 0.20050 0.05420 0.20000 t
+0.05420 0.20000 0.05570 0.20000 t
+0.05570 0.20000 0.05620 0.20050 t
+0.05620 0.20050 0.05620 0.20150 t
+0.05370 0.20400 0.05620 0.20150 t
+0.05370 0.20400 0.05620 0.20400 t
+0.01280 setlinewidth
+0.05000 0.33200 0.05000 0.42800 t
+0.05000 0.33200 0.07240 0.30000 t
+0.07240 0.30000 0.10760 0.30000 t
+0.10760 0.30000 0.13000 0.33200 t
+0.13000 0.33200 0.13000 0.42800 t
+0.05000 0.36400 0.13000 0.36400 t
+0.16840 0.31600 0.18440 0.30000 t
+0.18440 0.30000 0.21640 0.30000 t
+0.21640 0.30000 0.23240 0.31600 t
+0.21640 0.42800 0.23240 0.41200 t
+0.18440 0.42800 0.21640 0.42800 t
+0.16840 0.41200 0.18440 0.42800 t
+0.18440 0.35760 0.21640 0.35760 t
+0.23240 0.31600 0.23240 0.34160 t
+0.23240 0.37360 0.23240 0.41200 t
+0.23240 0.37360 0.21640 0.35760 t
+0.23240 0.34160 0.21640 0.35760 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/text_scale.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.fcd	(revision 18980)
@@ -0,0 +1,4 @@
+[FIDOCAD]
+TY 10 5 7 5 0 1 3 * A1
+TY 10 40 1 1 0 1 3 * A2
+TY 10 60 21 17 0 1 3 * A3
Index: tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.fab.gbr	(revision 18980)
@@ -0,0 +1,2004 @@
+G04 start of page 3 for group -1 layer_idx 16777221 *
+G04 Title: text sizes (scales), <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD16C,0.0060*%
+%ADD15C,0.0100*%
+%ADD14C,0.0080*%
+%ADD13C,0.0001*%
+G54D13*G36*
+X0Y125000D02*Y117500D01*
+X3750D01*
+Y125000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y117500D01*
+X8250D01*
+Y125000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y117500D01*
+X12750D01*
+Y125000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y117500D01*
+X17250D01*
+Y125000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y117500D01*
+X21750D01*
+Y125000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y117500D01*
+X26250D01*
+Y125000D01*
+X22500D01*
+G37*
+G54D14*X0Y116500D03*
+G54D13*G36*
+X41000Y125000D02*Y117500D01*
+X44750D01*
+Y125000D01*
+X41000D01*
+G37*
+G36*
+X45500D02*Y117500D01*
+X49250D01*
+Y125000D01*
+X45500D01*
+G37*
+G36*
+X50000D02*Y117500D01*
+X53750D01*
+Y125000D01*
+X50000D01*
+G37*
+G36*
+X54500D02*Y117500D01*
+X58250D01*
+Y125000D01*
+X54500D01*
+G37*
+G36*
+X59000D02*Y117500D01*
+X62750D01*
+Y125000D01*
+X59000D01*
+G37*
+G36*
+X63500D02*Y117500D01*
+X67250D01*
+Y125000D01*
+X63500D01*
+G37*
+G36*
+X68000D02*Y117500D01*
+X71750D01*
+Y125000D01*
+X68000D01*
+G37*
+G36*
+X72500D02*Y117500D01*
+X76250D01*
+Y125000D01*
+X72500D01*
+G37*
+G36*
+X77000D02*Y117500D01*
+X80750D01*
+Y125000D01*
+X77000D01*
+G37*
+G36*
+X81500D02*Y117500D01*
+X85250D01*
+Y125000D01*
+X81500D01*
+G37*
+G36*
+X86000D02*Y117500D01*
+X89750D01*
+Y125000D01*
+X86000D01*
+G37*
+G36*
+X90500D02*Y117500D01*
+X94250D01*
+Y125000D01*
+X90500D01*
+G37*
+G54D14*X41000Y116500D03*
+G54D13*G36*
+X95000Y125000D02*Y117500D01*
+X98750D01*
+Y125000D01*
+X95000D01*
+G37*
+G36*
+X99500D02*Y117500D01*
+X103250D01*
+Y125000D01*
+X99500D01*
+G37*
+G36*
+X104000D02*Y117500D01*
+X107750D01*
+Y125000D01*
+X104000D01*
+G37*
+G36*
+X108500D02*Y117500D01*
+X112250D01*
+Y125000D01*
+X108500D01*
+G37*
+G36*
+X113000D02*Y117500D01*
+X116750D01*
+Y125000D01*
+X113000D01*
+G37*
+G54D14*X95000Y116500D03*
+G54D13*G36*
+X130000Y125000D02*Y117500D01*
+X133750D01*
+Y125000D01*
+X130000D01*
+G37*
+G36*
+X134500D02*Y117500D01*
+X138250D01*
+Y125000D01*
+X134500D01*
+G37*
+G36*
+X139000D02*Y117500D01*
+X142750D01*
+Y125000D01*
+X139000D01*
+G37*
+G36*
+X143500D02*Y117500D01*
+X147250D01*
+Y125000D01*
+X143500D01*
+G37*
+G36*
+X148000D02*Y117500D01*
+X151750D01*
+Y125000D01*
+X148000D01*
+G37*
+G36*
+X152500D02*Y117500D01*
+X156250D01*
+Y125000D01*
+X152500D01*
+G37*
+G36*
+X157000D02*Y117500D01*
+X160750D01*
+Y125000D01*
+X157000D01*
+G37*
+G54D14*X130000Y116500D03*
+G54D13*G36*
+X0Y140000D02*Y132500D01*
+X3750D01*
+Y140000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y132500D01*
+X8250D01*
+Y140000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y132500D01*
+X12750D01*
+Y140000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y132500D01*
+X17250D01*
+Y140000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y132500D01*
+X21750D01*
+Y140000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y132500D01*
+X26250D01*
+Y140000D01*
+X22500D01*
+G37*
+G36*
+X27000D02*Y132500D01*
+X30750D01*
+Y140000D01*
+X27000D01*
+G37*
+G36*
+X31500D02*Y132500D01*
+X35250D01*
+Y140000D01*
+X31500D01*
+G37*
+G36*
+X36000D02*Y132500D01*
+X39750D01*
+Y140000D01*
+X36000D01*
+G37*
+G36*
+X40500D02*Y132500D01*
+X44250D01*
+Y140000D01*
+X40500D01*
+G37*
+G36*
+X45000D02*Y132500D01*
+X48750D01*
+Y140000D01*
+X45000D01*
+G37*
+G36*
+X49500D02*Y132500D01*
+X53250D01*
+Y140000D01*
+X49500D01*
+G37*
+G36*
+X54000D02*Y132500D01*
+X57750D01*
+Y140000D01*
+X54000D01*
+G37*
+G36*
+X58500D02*Y132500D01*
+X62250D01*
+Y140000D01*
+X58500D01*
+G37*
+G36*
+X63000D02*Y132500D01*
+X66750D01*
+Y140000D01*
+X63000D01*
+G37*
+G36*
+X67500D02*Y132500D01*
+X71250D01*
+Y140000D01*
+X67500D01*
+G37*
+G36*
+X72000D02*Y132500D01*
+X75750D01*
+Y140000D01*
+X72000D01*
+G37*
+G36*
+X76500D02*Y132500D01*
+X80250D01*
+Y140000D01*
+X76500D01*
+G37*
+G36*
+X81000D02*Y132500D01*
+X84750D01*
+Y140000D01*
+X81000D01*
+G37*
+G36*
+X85500D02*Y132500D01*
+X89250D01*
+Y140000D01*
+X85500D01*
+G37*
+G36*
+X90000D02*Y132500D01*
+X93750D01*
+Y140000D01*
+X90000D01*
+G37*
+G36*
+X94500D02*Y132500D01*
+X98250D01*
+Y140000D01*
+X94500D01*
+G37*
+G36*
+X99000D02*Y132500D01*
+X102750D01*
+Y140000D01*
+X99000D01*
+G37*
+G36*
+X103500D02*Y132500D01*
+X107250D01*
+Y140000D01*
+X103500D01*
+G37*
+G36*
+X108000D02*Y132500D01*
+X111750D01*
+Y140000D01*
+X108000D01*
+G37*
+G36*
+X112500D02*Y132500D01*
+X116250D01*
+Y140000D01*
+X112500D01*
+G37*
+G36*
+X117000D02*Y132500D01*
+X120750D01*
+Y140000D01*
+X117000D01*
+G37*
+G36*
+X121500D02*Y132500D01*
+X125250D01*
+Y140000D01*
+X121500D01*
+G37*
+G36*
+X126000D02*Y132500D01*
+X129750D01*
+Y140000D01*
+X126000D01*
+G37*
+G36*
+X130500D02*Y132500D01*
+X134250D01*
+Y140000D01*
+X130500D01*
+G37*
+G36*
+X135000D02*Y132500D01*
+X138750D01*
+Y140000D01*
+X135000D01*
+G37*
+G36*
+X139500D02*Y132500D01*
+X143250D01*
+Y140000D01*
+X139500D01*
+G37*
+G36*
+X144000D02*Y132500D01*
+X147750D01*
+Y140000D01*
+X144000D01*
+G37*
+G36*
+X148500D02*Y132500D01*
+X152250D01*
+Y140000D01*
+X148500D01*
+G37*
+G36*
+X153000D02*Y132500D01*
+X156750D01*
+Y140000D01*
+X153000D01*
+G37*
+G36*
+X157500D02*Y132500D01*
+X161250D01*
+Y140000D01*
+X157500D01*
+G37*
+G36*
+X162000D02*Y132500D01*
+X165750D01*
+Y140000D01*
+X162000D01*
+G37*
+G36*
+X166500D02*Y132500D01*
+X170250D01*
+Y140000D01*
+X166500D01*
+G37*
+G36*
+X171000D02*Y132500D01*
+X174750D01*
+Y140000D01*
+X171000D01*
+G37*
+G36*
+X175500D02*Y132500D01*
+X179250D01*
+Y140000D01*
+X175500D01*
+G37*
+G36*
+X180000D02*Y132500D01*
+X183750D01*
+Y140000D01*
+X180000D01*
+G37*
+G36*
+X184500D02*Y132500D01*
+X188250D01*
+Y140000D01*
+X184500D01*
+G37*
+G36*
+X189000D02*Y132500D01*
+X192750D01*
+Y140000D01*
+X189000D01*
+G37*
+G36*
+X193500D02*Y132500D01*
+X197250D01*
+Y140000D01*
+X193500D01*
+G37*
+G36*
+X198000D02*Y132500D01*
+X201750D01*
+Y140000D01*
+X198000D01*
+G37*
+G36*
+X202500D02*Y132500D01*
+X206250D01*
+Y140000D01*
+X202500D01*
+G37*
+G36*
+X207000D02*Y132500D01*
+X210750D01*
+Y140000D01*
+X207000D01*
+G37*
+G36*
+X211500D02*Y132500D01*
+X215250D01*
+Y140000D01*
+X211500D01*
+G37*
+G36*
+X216000D02*Y132500D01*
+X219750D01*
+Y140000D01*
+X216000D01*
+G37*
+G36*
+X220500D02*Y132500D01*
+X224250D01*
+Y140000D01*
+X220500D01*
+G37*
+G36*
+X225000D02*Y132500D01*
+X228750D01*
+Y140000D01*
+X225000D01*
+G37*
+G36*
+X229500D02*Y132500D01*
+X233250D01*
+Y140000D01*
+X229500D01*
+G37*
+G36*
+X234000D02*Y132500D01*
+X237750D01*
+Y140000D01*
+X234000D01*
+G37*
+G36*
+X238500D02*Y132500D01*
+X242250D01*
+Y140000D01*
+X238500D01*
+G37*
+G36*
+X243000D02*Y132500D01*
+X246750D01*
+Y140000D01*
+X243000D01*
+G37*
+G36*
+X247500D02*Y132500D01*
+X251250D01*
+Y140000D01*
+X247500D01*
+G37*
+G36*
+X252000D02*Y132500D01*
+X255750D01*
+Y140000D01*
+X252000D01*
+G37*
+G36*
+X256500D02*Y132500D01*
+X260250D01*
+Y140000D01*
+X256500D01*
+G37*
+G36*
+X261000D02*Y132500D01*
+X264750D01*
+Y140000D01*
+X261000D01*
+G37*
+G36*
+X265500D02*Y132500D01*
+X269250D01*
+Y140000D01*
+X265500D01*
+G37*
+G36*
+X270000D02*Y132500D01*
+X273750D01*
+Y140000D01*
+X270000D01*
+G37*
+G36*
+X274500D02*Y132500D01*
+X278250D01*
+Y140000D01*
+X274500D01*
+G37*
+G36*
+X279000D02*Y132500D01*
+X282750D01*
+Y140000D01*
+X279000D01*
+G37*
+G36*
+X283500D02*Y132500D01*
+X287250D01*
+Y140000D01*
+X283500D01*
+G37*
+G36*
+X288000D02*Y132500D01*
+X291750D01*
+Y140000D01*
+X288000D01*
+G37*
+G36*
+X292500D02*Y132500D01*
+X296250D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297000D02*Y132500D01*
+X300750D01*
+Y140000D01*
+X297000D01*
+G37*
+G36*
+X301500D02*Y132500D01*
+X305250D01*
+Y140000D01*
+X301500D01*
+G37*
+G54D15*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D13*G36*
+X200000Y65000D02*Y57500D01*
+X203750D01*
+Y65000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y57500D01*
+X208250D01*
+Y65000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y57500D01*
+X212750D01*
+Y65000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y57500D01*
+X217250D01*
+Y65000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y57500D01*
+X221750D01*
+Y65000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y57500D01*
+X226250D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y57500D01*
+X230750D01*
+Y65000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y57500D01*
+X235250D01*
+Y65000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y57500D01*
+X239750D01*
+Y65000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y57500D01*
+X244250D01*
+Y65000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y57500D01*
+X248750D01*
+Y65000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y57500D01*
+X253250D01*
+Y65000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y57500D01*
+X257750D01*
+Y65000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y57500D01*
+X262250D01*
+Y65000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y57500D01*
+X266750D01*
+Y65000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y57500D01*
+X271250D01*
+Y65000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y57500D01*
+X275750D01*
+Y65000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y57500D01*
+X280250D01*
+Y65000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y57500D01*
+X284750D01*
+Y65000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y57500D01*
+X289250D01*
+Y65000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y57500D01*
+X293750D01*
+Y65000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y57500D01*
+X298250D01*
+Y65000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y57500D01*
+X302750D01*
+Y65000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y57500D01*
+X307250D01*
+Y65000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y57500D01*
+X311750D01*
+Y65000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y57500D01*
+X316250D01*
+Y65000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y57500D01*
+X320750D01*
+Y65000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y57500D01*
+X325250D01*
+Y65000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y57500D01*
+X329750D01*
+Y65000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y57500D01*
+X334250D01*
+Y65000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y57500D01*
+X338750D01*
+Y65000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y57500D01*
+X343250D01*
+Y65000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y57500D01*
+X347750D01*
+Y65000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y57500D01*
+X352250D01*
+Y65000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y57500D01*
+X356750D01*
+Y65000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y57500D01*
+X361250D01*
+Y65000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y57500D01*
+X365750D01*
+Y65000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y57500D01*
+X370250D01*
+Y65000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y57500D01*
+X374750D01*
+Y65000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y57500D01*
+X379250D01*
+Y65000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y57500D01*
+X383750D01*
+Y65000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y57500D01*
+X388250D01*
+Y65000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y57500D01*
+X392750D01*
+Y65000D01*
+X389000D01*
+G37*
+G36*
+X393500D02*Y57500D01*
+X397250D01*
+Y65000D01*
+X393500D01*
+G37*
+G36*
+X398000D02*Y57500D01*
+X401750D01*
+Y65000D01*
+X398000D01*
+G37*
+G36*
+X402500D02*Y57500D01*
+X406250D01*
+Y65000D01*
+X402500D01*
+G37*
+G36*
+X407000D02*Y57500D01*
+X410750D01*
+Y65000D01*
+X407000D01*
+G37*
+G36*
+X411500D02*Y57500D01*
+X415250D01*
+Y65000D01*
+X411500D01*
+G37*
+G36*
+X416000D02*Y57500D01*
+X419750D01*
+Y65000D01*
+X416000D01*
+G37*
+G36*
+X420500D02*Y57500D01*
+X424250D01*
+Y65000D01*
+X420500D01*
+G37*
+G36*
+X425000D02*Y57500D01*
+X428750D01*
+Y65000D01*
+X425000D01*
+G37*
+G36*
+X429500D02*Y57500D01*
+X433250D01*
+Y65000D01*
+X429500D01*
+G37*
+G36*
+X434000D02*Y57500D01*
+X437750D01*
+Y65000D01*
+X434000D01*
+G37*
+G36*
+X438500D02*Y57500D01*
+X442250D01*
+Y65000D01*
+X438500D01*
+G37*
+G36*
+X443000D02*Y57500D01*
+X446750D01*
+Y65000D01*
+X443000D01*
+G37*
+G36*
+X447500D02*Y57500D01*
+X451250D01*
+Y65000D01*
+X447500D01*
+G37*
+G36*
+X452000D02*Y57500D01*
+X455750D01*
+Y65000D01*
+X452000D01*
+G37*
+G36*
+X456500D02*Y57500D01*
+X460250D01*
+Y65000D01*
+X456500D01*
+G37*
+G36*
+X461000D02*Y57500D01*
+X464750D01*
+Y65000D01*
+X461000D01*
+G37*
+G36*
+X465500D02*Y57500D01*
+X469250D01*
+Y65000D01*
+X465500D01*
+G37*
+G36*
+X470000D02*Y57500D01*
+X473750D01*
+Y65000D01*
+X470000D01*
+G37*
+G36*
+X474500D02*Y57500D01*
+X478250D01*
+Y65000D01*
+X474500D01*
+G37*
+G36*
+X25000Y-2000D02*Y-9500D01*
+X28750D01*
+Y-2000D01*
+X25000D01*
+G37*
+G36*
+X29500D02*Y-9500D01*
+X33250D01*
+Y-2000D01*
+X29500D01*
+G37*
+G36*
+X34000D02*Y-9500D01*
+X37750D01*
+Y-2000D01*
+X34000D01*
+G37*
+G36*
+X38500D02*Y-9500D01*
+X42250D01*
+Y-2000D01*
+X38500D01*
+G37*
+G36*
+X43000D02*Y-9500D01*
+X46750D01*
+Y-2000D01*
+X43000D01*
+G37*
+G36*
+X47500D02*Y-9500D01*
+X51250D01*
+Y-2000D01*
+X47500D01*
+G37*
+G36*
+X52000D02*Y-9500D01*
+X55750D01*
+Y-2000D01*
+X52000D01*
+G37*
+G36*
+X56500D02*Y-9500D01*
+X60250D01*
+Y-2000D01*
+X56500D01*
+G37*
+G36*
+X61000D02*Y-9500D01*
+X64750D01*
+Y-2000D01*
+X61000D01*
+G37*
+G36*
+X65500D02*Y-9500D01*
+X69250D01*
+Y-2000D01*
+X65500D01*
+G37*
+G36*
+X70000D02*Y-9500D01*
+X73750D01*
+Y-2000D01*
+X70000D01*
+G37*
+G36*
+X74500D02*Y-9500D01*
+X78250D01*
+Y-2000D01*
+X74500D01*
+G37*
+G36*
+X79000D02*Y-9500D01*
+X82750D01*
+Y-2000D01*
+X79000D01*
+G37*
+G36*
+X83500D02*Y-9500D01*
+X87250D01*
+Y-2000D01*
+X83500D01*
+G37*
+G36*
+X88000D02*Y-9500D01*
+X91750D01*
+Y-2000D01*
+X88000D01*
+G37*
+G36*
+X92500D02*Y-9500D01*
+X96250D01*
+Y-2000D01*
+X92500D01*
+G37*
+G36*
+X97000D02*Y-9500D01*
+X100750D01*
+Y-2000D01*
+X97000D01*
+G37*
+G36*
+X101500D02*Y-9500D01*
+X105250D01*
+Y-2000D01*
+X101500D01*
+G37*
+G36*
+X106000D02*Y-9500D01*
+X109750D01*
+Y-2000D01*
+X106000D01*
+G37*
+G36*
+X110500D02*Y-9500D01*
+X114250D01*
+Y-2000D01*
+X110500D01*
+G37*
+G36*
+X115000D02*Y-9500D01*
+X118750D01*
+Y-2000D01*
+X115000D01*
+G37*
+G36*
+X119500D02*Y-9500D01*
+X123250D01*
+Y-2000D01*
+X119500D01*
+G37*
+G36*
+X124000D02*Y-9500D01*
+X127750D01*
+Y-2000D01*
+X124000D01*
+G37*
+G36*
+X128500D02*Y-9500D01*
+X132250D01*
+Y-2000D01*
+X128500D01*
+G37*
+G36*
+X133000D02*Y-9500D01*
+X136750D01*
+Y-2000D01*
+X133000D01*
+G37*
+G36*
+X137500D02*Y-9500D01*
+X141250D01*
+Y-2000D01*
+X137500D01*
+G37*
+G36*
+X142000D02*Y-9500D01*
+X145750D01*
+Y-2000D01*
+X142000D01*
+G37*
+G36*
+X146500D02*Y-9500D01*
+X150250D01*
+Y-2000D01*
+X146500D01*
+G37*
+G36*
+X151000D02*Y-9500D01*
+X154750D01*
+Y-2000D01*
+X151000D01*
+G37*
+G36*
+X155500D02*Y-9500D01*
+X159250D01*
+Y-2000D01*
+X155500D01*
+G37*
+G36*
+X160000D02*Y-9500D01*
+X163750D01*
+Y-2000D01*
+X160000D01*
+G37*
+G36*
+X164500D02*Y-9500D01*
+X168250D01*
+Y-2000D01*
+X164500D01*
+G37*
+G36*
+X169000D02*Y-9500D01*
+X172750D01*
+Y-2000D01*
+X169000D01*
+G37*
+G36*
+X173500D02*Y-9500D01*
+X177250D01*
+Y-2000D01*
+X173500D01*
+G37*
+G36*
+X178000D02*Y-9500D01*
+X181750D01*
+Y-2000D01*
+X178000D01*
+G37*
+G36*
+X182500D02*Y-9500D01*
+X186250D01*
+Y-2000D01*
+X182500D01*
+G37*
+G36*
+X187000D02*Y-9500D01*
+X190750D01*
+Y-2000D01*
+X187000D01*
+G37*
+G36*
+X191500D02*Y-9500D01*
+X195250D01*
+Y-2000D01*
+X191500D01*
+G37*
+G36*
+X196000D02*Y-9500D01*
+X199750D01*
+Y-2000D01*
+X196000D01*
+G37*
+G36*
+X200500D02*Y-9500D01*
+X204250D01*
+Y-2000D01*
+X200500D01*
+G37*
+G36*
+X205000D02*Y-9500D01*
+X208750D01*
+Y-2000D01*
+X205000D01*
+G37*
+G36*
+X209500D02*Y-9500D01*
+X213250D01*
+Y-2000D01*
+X209500D01*
+G37*
+G36*
+X214000D02*Y-9500D01*
+X217750D01*
+Y-2000D01*
+X214000D01*
+G37*
+G36*
+X218500D02*Y-9500D01*
+X222250D01*
+Y-2000D01*
+X218500D01*
+G37*
+G36*
+X223000D02*Y-9500D01*
+X226750D01*
+Y-2000D01*
+X223000D01*
+G37*
+G36*
+X227500D02*Y-9500D01*
+X231250D01*
+Y-2000D01*
+X227500D01*
+G37*
+G36*
+X232000D02*Y-9500D01*
+X235750D01*
+Y-2000D01*
+X232000D01*
+G37*
+G36*
+X236500D02*Y-9500D01*
+X240250D01*
+Y-2000D01*
+X236500D01*
+G37*
+G36*
+X241000D02*Y-9500D01*
+X244750D01*
+Y-2000D01*
+X241000D01*
+G37*
+G36*
+X245500D02*Y-9500D01*
+X249250D01*
+Y-2000D01*
+X245500D01*
+G37*
+G36*
+X250000D02*Y-9500D01*
+X253750D01*
+Y-2000D01*
+X250000D01*
+G37*
+G36*
+X254500D02*Y-9500D01*
+X258250D01*
+Y-2000D01*
+X254500D01*
+G37*
+G36*
+X259000D02*Y-9500D01*
+X262750D01*
+Y-2000D01*
+X259000D01*
+G37*
+G36*
+X263500D02*Y-9500D01*
+X267250D01*
+Y-2000D01*
+X263500D01*
+G37*
+G36*
+X268000D02*Y-9500D01*
+X271750D01*
+Y-2000D01*
+X268000D01*
+G37*
+G36*
+X272500D02*Y-9500D01*
+X276250D01*
+Y-2000D01*
+X272500D01*
+G37*
+G36*
+X277000D02*Y-9500D01*
+X280750D01*
+Y-2000D01*
+X277000D01*
+G37*
+G36*
+X281500D02*Y-9500D01*
+X285250D01*
+Y-2000D01*
+X281500D01*
+G37*
+G36*
+X286000D02*Y-9500D01*
+X289750D01*
+Y-2000D01*
+X286000D01*
+G37*
+G36*
+X290500D02*Y-9500D01*
+X294250D01*
+Y-2000D01*
+X290500D01*
+G37*
+G36*
+X295000D02*Y-9500D01*
+X298750D01*
+Y-2000D01*
+X295000D01*
+G37*
+G36*
+X299500D02*Y-9500D01*
+X303250D01*
+Y-2000D01*
+X299500D01*
+G37*
+G36*
+X304000D02*Y-9500D01*
+X307750D01*
+Y-2000D01*
+X304000D01*
+G37*
+G36*
+X308500D02*Y-9500D01*
+X312250D01*
+Y-2000D01*
+X308500D01*
+G37*
+G36*
+X313000D02*Y-9500D01*
+X316750D01*
+Y-2000D01*
+X313000D01*
+G37*
+G36*
+X317500D02*Y-9500D01*
+X321250D01*
+Y-2000D01*
+X317500D01*
+G37*
+G36*
+X322000D02*Y-9500D01*
+X325750D01*
+Y-2000D01*
+X322000D01*
+G37*
+G36*
+X326500D02*Y-9500D01*
+X330250D01*
+Y-2000D01*
+X326500D01*
+G37*
+G36*
+X331000D02*Y-9500D01*
+X334750D01*
+Y-2000D01*
+X331000D01*
+G37*
+G36*
+X335500D02*Y-9500D01*
+X339250D01*
+Y-2000D01*
+X335500D01*
+G37*
+G36*
+X340000D02*Y-9500D01*
+X343750D01*
+Y-2000D01*
+X340000D01*
+G37*
+G36*
+X344500D02*Y-9500D01*
+X348250D01*
+Y-2000D01*
+X344500D01*
+G37*
+G36*
+X349000D02*Y-9500D01*
+X352750D01*
+Y-2000D01*
+X349000D01*
+G37*
+G36*
+X353500D02*Y-9500D01*
+X357250D01*
+Y-2000D01*
+X353500D01*
+G37*
+G36*
+X358000D02*Y-9500D01*
+X361750D01*
+Y-2000D01*
+X358000D01*
+G37*
+G36*
+X362500D02*Y-9500D01*
+X366250D01*
+Y-2000D01*
+X362500D01*
+G37*
+G36*
+X367000D02*Y-9500D01*
+X370750D01*
+Y-2000D01*
+X367000D01*
+G37*
+G36*
+X371500D02*Y-9500D01*
+X375250D01*
+Y-2000D01*
+X371500D01*
+G37*
+G36*
+X376000D02*Y-9500D01*
+X379750D01*
+Y-2000D01*
+X376000D01*
+G37*
+G36*
+X380500D02*Y-9500D01*
+X384250D01*
+Y-2000D01*
+X380500D01*
+G37*
+G36*
+X385000D02*Y-9500D01*
+X388750D01*
+Y-2000D01*
+X385000D01*
+G37*
+G36*
+X389500D02*Y-9500D01*
+X393250D01*
+Y-2000D01*
+X389500D01*
+G37*
+G36*
+X394000D02*Y-9500D01*
+X397750D01*
+Y-2000D01*
+X394000D01*
+G37*
+G36*
+X398500D02*Y-9500D01*
+X402250D01*
+Y-2000D01*
+X398500D01*
+G37*
+G36*
+X403000D02*Y-9500D01*
+X406751D01*
+Y-2000D01*
+X403000D01*
+G37*
+G36*
+X407501D02*Y-9500D01*
+X411251D01*
+Y-2000D01*
+X407501D01*
+G37*
+G36*
+X412001D02*Y-9500D01*
+X415751D01*
+Y-2000D01*
+X412001D01*
+G37*
+G36*
+X416501D02*Y-9500D01*
+X420251D01*
+Y-2000D01*
+X416501D01*
+G37*
+G36*
+X421001D02*Y-9500D01*
+X424751D01*
+Y-2000D01*
+X421001D01*
+G37*
+G36*
+X425501D02*Y-9500D01*
+X429251D01*
+Y-2000D01*
+X425501D01*
+G37*
+G36*
+X430001D02*Y-9500D01*
+X433751D01*
+Y-2000D01*
+X430001D01*
+G37*
+G36*
+X434501D02*Y-9500D01*
+X438251D01*
+Y-2000D01*
+X434501D01*
+G37*
+G36*
+X439001D02*Y-9500D01*
+X442751D01*
+Y-2000D01*
+X439001D01*
+G37*
+G36*
+X443501D02*Y-9500D01*
+X447251D01*
+Y-2000D01*
+X443501D01*
+G37*
+G36*
+X448001D02*Y-9500D01*
+X451751D01*
+Y-2000D01*
+X448001D01*
+G37*
+G36*
+X452501D02*Y-9500D01*
+X456251D01*
+Y-2000D01*
+X452501D01*
+G37*
+G36*
+X457001D02*Y-9500D01*
+X460751D01*
+Y-2000D01*
+X457001D01*
+G37*
+G36*
+X461501D02*Y-9500D01*
+X465251D01*
+Y-2000D01*
+X461501D01*
+G37*
+G36*
+X200000Y80000D02*Y72500D01*
+X203750D01*
+Y80000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y72500D01*
+X208250D01*
+Y80000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y72500D01*
+X212750D01*
+Y80000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y72500D01*
+X217250D01*
+Y80000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y72500D01*
+X221750D01*
+Y80000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y72500D01*
+X226250D01*
+Y80000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y72500D01*
+X230750D01*
+Y80000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y72500D01*
+X235250D01*
+Y80000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y72500D01*
+X239750D01*
+Y80000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y72500D01*
+X244250D01*
+Y80000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y72500D01*
+X248750D01*
+Y80000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y72500D01*
+X253250D01*
+Y80000D01*
+X249500D01*
+G37*
+G54D16*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y87500D01*
+X209300D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210050D02*Y87500D01*
+X213800D01*
+Y95000D01*
+X210050D01*
+G37*
+G36*
+X214550D02*Y87500D01*
+X218300D01*
+Y95000D01*
+X214550D01*
+G37*
+G36*
+X219050D02*Y87500D01*
+X222800D01*
+Y95000D01*
+X219050D01*
+G37*
+G36*
+X223550D02*Y87500D01*
+X227300D01*
+Y95000D01*
+X223550D01*
+G37*
+G36*
+X228050D02*Y87500D01*
+X231800D01*
+Y95000D01*
+X228050D01*
+G37*
+G36*
+X232550D02*Y87500D01*
+X236300D01*
+Y95000D01*
+X232550D01*
+G37*
+G36*
+X237050D02*Y87500D01*
+X240800D01*
+Y95000D01*
+X237050D01*
+G37*
+G36*
+X241550D02*Y87500D01*
+X245300D01*
+Y95000D01*
+X241550D01*
+G37*
+G36*
+X246050D02*Y87500D01*
+X249800D01*
+Y95000D01*
+X246050D01*
+G37*
+G36*
+X250550D02*Y87500D01*
+X254300D01*
+Y95000D01*
+X250550D01*
+G37*
+G36*
+X200000Y110000D02*Y102500D01*
+X203750D01*
+Y110000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y102500D01*
+X208250D01*
+Y110000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y102500D01*
+X212750D01*
+Y110000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y102500D01*
+X217250D01*
+Y110000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y102500D01*
+X221750D01*
+Y110000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y102500D01*
+X226250D01*
+Y110000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y102500D01*
+X230750D01*
+Y110000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y102500D01*
+X235250D01*
+Y110000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y102500D01*
+X239750D01*
+Y110000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y102500D01*
+X244250D01*
+Y110000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y102500D01*
+X248750D01*
+Y110000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y102500D01*
+X253250D01*
+Y110000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y102500D01*
+X257750D01*
+Y110000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y102500D01*
+X262250D01*
+Y110000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y102500D01*
+X266750D01*
+Y110000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y102500D01*
+X271250D01*
+Y110000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y102500D01*
+X275750D01*
+Y110000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y102500D01*
+X280250D01*
+Y110000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y102500D01*
+X284750D01*
+Y110000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y102500D01*
+X289250D01*
+Y110000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y102500D01*
+X293750D01*
+Y110000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y102500D01*
+X298250D01*
+Y110000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y102500D01*
+X302750D01*
+Y110000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y102500D01*
+X307250D01*
+Y110000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y102500D01*
+X311750D01*
+Y110000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y102500D01*
+X316250D01*
+Y110000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y102500D01*
+X320750D01*
+Y110000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y102500D01*
+X325250D01*
+Y110000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y102500D01*
+X329750D01*
+Y110000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y102500D01*
+X334250D01*
+Y110000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y102500D01*
+X338750D01*
+Y110000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y102500D01*
+X343250D01*
+Y110000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y102500D01*
+X347750D01*
+Y110000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y102500D01*
+X352250D01*
+Y110000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y102500D01*
+X356750D01*
+Y110000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y102500D01*
+X361250D01*
+Y110000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y102500D01*
+X365750D01*
+Y110000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y102500D01*
+X370250D01*
+Y110000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y102500D01*
+X374750D01*
+Y110000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y102500D01*
+X379250D01*
+Y110000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y102500D01*
+X383750D01*
+Y110000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y102500D01*
+X388250D01*
+Y110000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y102500D01*
+X392750D01*
+Y110000D01*
+X389000D01*
+G37*
+G36*
+X393500D02*Y102500D01*
+X397250D01*
+Y110000D01*
+X393500D01*
+G37*
+G36*
+X398000D02*Y102500D01*
+X401750D01*
+Y110000D01*
+X398000D01*
+G37*
+G36*
+X402500D02*Y102500D01*
+X406250D01*
+Y110000D01*
+X402500D01*
+G37*
+G36*
+X407000D02*Y102500D01*
+X410750D01*
+Y110000D01*
+X407000D01*
+G37*
+G36*
+X411500D02*Y102500D01*
+X415250D01*
+Y110000D01*
+X411500D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.gbr/text_scale.topsilk.gbr	(revision 18980)
@@ -0,0 +1,52 @@
+G04 start of page 2 for group 1 layer_idx 8 *
+G04 Title: text sizes (scales), top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD12C,0.0128*%
+%ADD11C,0.0070*%
+G54D11*X5000Y46500D02*Y43500D01*
+Y46500D02*X5700Y47500D01*
+X6800D01*
+X7500Y46500D01*
+Y43500D01*
+X5000Y45500D02*X7500D01*
+X8700Y46700D02*X9500Y47500D01*
+Y43500D01*
+X8700D02*X10200D01*
+X5000Y29900D02*Y29600D01*
+Y29900D02*X5070Y30000D01*
+X5180D01*
+X5250Y29900D01*
+Y29600D01*
+X5000Y29800D02*X5250D01*
+X5370Y29950D02*X5420Y30000D01*
+X5570D01*
+X5620Y29950D01*
+Y29850D01*
+X5370Y29600D02*X5620Y29850D01*
+X5370Y29600D02*X5620D01*
+G54D12*X5000Y16800D02*Y7200D01*
+Y16800D02*X7240Y20000D01*
+X10760D01*
+X13000Y16800D01*
+Y7200D01*
+X5000Y13600D02*X13000D01*
+X16840Y18400D02*X18440Y20000D01*
+X21640D01*
+X23240Y18400D01*
+X21640Y7200D02*X23240Y8800D01*
+X18440Y7200D02*X21640D01*
+X16840Y8800D02*X18440Y7200D01*
+Y14240D02*X21640D01*
+X23240Y18400D02*Y15840D01*
+Y12640D02*Y8800D01*
+Y12640D02*X21640Y14240D01*
+X23240Y15840D02*X21640Y14240D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_scale.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/text_scale.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   text sizes (scales)
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/text_scale.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_scale.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_scale.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_scale.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.png.text	(revision 18980)
@@ -0,0 +1,23 @@
+
+top text A1
+A line width 8 (6.666) pixels
+A width 38 pixels (31.666)
+A height 56 pixels (46.666)
+1 line width 8 pixels (6.666)
+1 width 26 pixels (21.666)
+1 height 56 pixels (46.666)
+
+gap from A to 1 is 6 pixels (5)
+
+dot thing in the page
+13 pixels (10.833) tall
+15 pixels (12.5) wide
+
+bottom text A3 
+A line width 15 pixels (12.5)
+A width 111 pixels (92.5)
+A height 169 pixels (140.833)
+3 line width 15 pixels (12.5)
+3 width 92 pixels (75.833)
+3 height 169 pixels (140.833)
+
Index: tags/2.0.1/tests/RTT/ref/text_scale.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_scale.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_scale.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_scale.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_scale.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_scale.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_scale.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.svg	(revision 18980)
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="1.2700" y1="0.8890" x2="1.2700" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="0.8890" x2="1.4478" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.4478" y1="0.6350" x2="1.7272" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.7272" y1="0.6350" x2="1.9050" y2="0.8890" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.9050" y1="0.8890" x2="1.9050" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="1.1430" x2="1.9050" y2="1.1430" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2098" y1="0.8382" x2="2.4130" y2="0.6350" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.4130" y1="0.6350" x2="2.4130" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.2098" y1="1.6510" x2="2.5908" y2="1.6510" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="5.1054" x2="1.2700" y2="5.1816" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="5.1054" x2="1.2878" y2="5.0800" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2878" y1="5.0800" x2="1.3157" y2="5.0800" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3157" y1="5.0800" x2="1.3335" y2="5.1054" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3335" y1="5.1054" x2="1.3335" y2="5.1816" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="5.1308" x2="1.3335" y2="5.1308" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3640" y1="5.0927" x2="1.3767" y2="5.0800" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3767" y1="5.0800" x2="1.4148" y2="5.0800" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.4148" y1="5.0800" x2="1.4275" y2="5.0927" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.4275" y1="5.0927" x2="1.4275" y2="5.1181" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3640" y1="5.1816" x2="1.4275" y2="5.1181" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.3640" y1="5.1816" x2="1.4275" y2="5.1816" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="8.4328" x2="1.2700" y2="10.8712" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="8.4328" x2="1.8390" y2="7.6200" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.8390" y1="7.6200" x2="2.7330" y2="7.6200" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="2.7330" y1="7.6200" x2="3.3020" y2="8.4328" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="3.3020" y1="8.4328" x2="3.3020" y2="10.8712" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="1.2700" y1="9.2456" x2="3.3020" y2="9.2456" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.2774" y1="8.0264" x2="4.6838" y2="7.6200" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.6838" y1="7.6200" x2="5.4966" y2="7.6200" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.4966" y1="7.6200" x2="5.9030" y2="8.0264" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.4966" y1="10.8712" x2="5.9030" y2="10.4648" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.6838" y1="10.8712" x2="5.4966" y2="10.8712" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.2774" y1="10.4648" x2="4.6838" y2="10.8712" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="4.6838" y1="9.0830" x2="5.4966" y2="9.0830" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.9030" y1="8.0264" x2="5.9030" y2="8.6766" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.9030" y1="9.4894" x2="5.9030" y2="10.4648" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.9030" y1="9.4894" x2="5.4966" y2="9.0830" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.9030" y1="8.6766" x2="5.4966" y2="9.0830" stroke-width="0.3251" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/text_scale.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_scale.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_scale.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text sizes (scales) - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_sides.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text on both sides - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/text_sides.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.dsn	(revision 18980)
@@ -0,0 +1,50 @@
+(pcb text on both sides
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/text_sides.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.eps	(revision 18980)
@@ -0,0 +1,43 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: text_sides.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+% Layer group5 group 5 drill 0 mask 0
+% Layer group7 group 7 drill 0 mask 0
+% Layer top group 3 drill 0 mask 0
+% Layer topsilk group 1 drill 0 mask 0
+0.00700 setlinewidth
+1 setlinecap
+0 0 0 setrgbcolor
+0.22500 0.18500 0.22500 0.21500 t
+0.22500 0.18500 0.23200 0.17500 t
+0.23200 0.17500 0.24300 0.17500 t
+0.24300 0.17500 0.25000 0.18500 t
+0.25000 0.18500 0.25000 0.21500 t
+0.22500 0.19500 0.25000 0.19500 t
+0.26200 0.18300 0.27000 0.17500 t
+0.27000 0.17500 0.27000 0.21500 t
+0.26200 0.21500 0.27700 0.21500 t
+% Layer bottomsilk group 12 drill 0 mask 0
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/text_sides.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.fcd	(revision 18980)
@@ -0,0 +1,3 @@
+[FIDOCAD]
+TY 45 60 7 5 0 1 3 * A2
+TY 45 35 7 5 0 1 3 * A1
Index: tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.bottomsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.bottomsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.bottomsilk.gbr	(revision 18980)
@@ -0,0 +1,25 @@
+G04 start of page 3 for group 12 layer_idx 7 *
+G04 Title: text on both sides, bottom_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOMSILK*%
+%ADD12C,0.0070*%
+G54D12*X22500Y21000D02*Y24000D01*
+Y21000D02*X23200Y20000D01*
+X24300D01*
+X25000Y21000D01*
+Y24000D01*
+X22500Y22000D02*X25000D01*
+X26200Y20500D02*X26700Y20000D01*
+X28200D01*
+X28700Y20500D01*
+Y21500D01*
+X26200Y24000D02*X28700Y21500D01*
+X26200Y24000D02*X28700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.fab.gbr	(revision 18980)
@@ -0,0 +1,1998 @@
+G04 start of page 4 for group -1 layer_idx 16777221 *
+G04 Title: text on both sides, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD16C,0.0060*%
+%ADD15C,0.0100*%
+%ADD14C,0.0080*%
+%ADD13C,0.0001*%
+G54D13*G36*
+X0Y125000D02*Y117500D01*
+X3750D01*
+Y125000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y117500D01*
+X8250D01*
+Y125000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y117500D01*
+X12750D01*
+Y125000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y117500D01*
+X17250D01*
+Y125000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y117500D01*
+X21750D01*
+Y125000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y117500D01*
+X26250D01*
+Y125000D01*
+X22500D01*
+G37*
+G54D14*X0Y116500D03*
+G54D13*G36*
+X41000Y125000D02*Y117500D01*
+X44750D01*
+Y125000D01*
+X41000D01*
+G37*
+G36*
+X45500D02*Y117500D01*
+X49250D01*
+Y125000D01*
+X45500D01*
+G37*
+G36*
+X50000D02*Y117500D01*
+X53750D01*
+Y125000D01*
+X50000D01*
+G37*
+G36*
+X54500D02*Y117500D01*
+X58250D01*
+Y125000D01*
+X54500D01*
+G37*
+G36*
+X59000D02*Y117500D01*
+X62750D01*
+Y125000D01*
+X59000D01*
+G37*
+G36*
+X63500D02*Y117500D01*
+X67250D01*
+Y125000D01*
+X63500D01*
+G37*
+G36*
+X68000D02*Y117500D01*
+X71750D01*
+Y125000D01*
+X68000D01*
+G37*
+G36*
+X72500D02*Y117500D01*
+X76250D01*
+Y125000D01*
+X72500D01*
+G37*
+G36*
+X77000D02*Y117500D01*
+X80750D01*
+Y125000D01*
+X77000D01*
+G37*
+G36*
+X81500D02*Y117500D01*
+X85250D01*
+Y125000D01*
+X81500D01*
+G37*
+G36*
+X86000D02*Y117500D01*
+X89750D01*
+Y125000D01*
+X86000D01*
+G37*
+G36*
+X90500D02*Y117500D01*
+X94250D01*
+Y125000D01*
+X90500D01*
+G37*
+G54D14*X41000Y116500D03*
+G54D13*G36*
+X95000Y125000D02*Y117500D01*
+X98750D01*
+Y125000D01*
+X95000D01*
+G37*
+G36*
+X99500D02*Y117500D01*
+X103250D01*
+Y125000D01*
+X99500D01*
+G37*
+G36*
+X104000D02*Y117500D01*
+X107750D01*
+Y125000D01*
+X104000D01*
+G37*
+G36*
+X108500D02*Y117500D01*
+X112250D01*
+Y125000D01*
+X108500D01*
+G37*
+G36*
+X113000D02*Y117500D01*
+X116750D01*
+Y125000D01*
+X113000D01*
+G37*
+G54D14*X95000Y116500D03*
+G54D13*G36*
+X130000Y125000D02*Y117500D01*
+X133750D01*
+Y125000D01*
+X130000D01*
+G37*
+G36*
+X134500D02*Y117500D01*
+X138250D01*
+Y125000D01*
+X134500D01*
+G37*
+G36*
+X139000D02*Y117500D01*
+X142750D01*
+Y125000D01*
+X139000D01*
+G37*
+G36*
+X143500D02*Y117500D01*
+X147250D01*
+Y125000D01*
+X143500D01*
+G37*
+G36*
+X148000D02*Y117500D01*
+X151750D01*
+Y125000D01*
+X148000D01*
+G37*
+G36*
+X152500D02*Y117500D01*
+X156250D01*
+Y125000D01*
+X152500D01*
+G37*
+G36*
+X157000D02*Y117500D01*
+X160750D01*
+Y125000D01*
+X157000D01*
+G37*
+G54D14*X130000Y116500D03*
+G54D13*G36*
+X0Y140000D02*Y132500D01*
+X3750D01*
+Y140000D01*
+X0D01*
+G37*
+G36*
+X4500D02*Y132500D01*
+X8250D01*
+Y140000D01*
+X4500D01*
+G37*
+G36*
+X9000D02*Y132500D01*
+X12750D01*
+Y140000D01*
+X9000D01*
+G37*
+G36*
+X13500D02*Y132500D01*
+X17250D01*
+Y140000D01*
+X13500D01*
+G37*
+G36*
+X18000D02*Y132500D01*
+X21750D01*
+Y140000D01*
+X18000D01*
+G37*
+G36*
+X22500D02*Y132500D01*
+X26250D01*
+Y140000D01*
+X22500D01*
+G37*
+G36*
+X27000D02*Y132500D01*
+X30750D01*
+Y140000D01*
+X27000D01*
+G37*
+G36*
+X31500D02*Y132500D01*
+X35250D01*
+Y140000D01*
+X31500D01*
+G37*
+G36*
+X36000D02*Y132500D01*
+X39750D01*
+Y140000D01*
+X36000D01*
+G37*
+G36*
+X40500D02*Y132500D01*
+X44250D01*
+Y140000D01*
+X40500D01*
+G37*
+G36*
+X45000D02*Y132500D01*
+X48750D01*
+Y140000D01*
+X45000D01*
+G37*
+G36*
+X49500D02*Y132500D01*
+X53250D01*
+Y140000D01*
+X49500D01*
+G37*
+G36*
+X54000D02*Y132500D01*
+X57750D01*
+Y140000D01*
+X54000D01*
+G37*
+G36*
+X58500D02*Y132500D01*
+X62250D01*
+Y140000D01*
+X58500D01*
+G37*
+G36*
+X63000D02*Y132500D01*
+X66750D01*
+Y140000D01*
+X63000D01*
+G37*
+G36*
+X67500D02*Y132500D01*
+X71250D01*
+Y140000D01*
+X67500D01*
+G37*
+G36*
+X72000D02*Y132500D01*
+X75750D01*
+Y140000D01*
+X72000D01*
+G37*
+G36*
+X76500D02*Y132500D01*
+X80250D01*
+Y140000D01*
+X76500D01*
+G37*
+G36*
+X81000D02*Y132500D01*
+X84750D01*
+Y140000D01*
+X81000D01*
+G37*
+G36*
+X85500D02*Y132500D01*
+X89250D01*
+Y140000D01*
+X85500D01*
+G37*
+G36*
+X90000D02*Y132500D01*
+X93750D01*
+Y140000D01*
+X90000D01*
+G37*
+G36*
+X94500D02*Y132500D01*
+X98250D01*
+Y140000D01*
+X94500D01*
+G37*
+G36*
+X99000D02*Y132500D01*
+X102750D01*
+Y140000D01*
+X99000D01*
+G37*
+G36*
+X103500D02*Y132500D01*
+X107250D01*
+Y140000D01*
+X103500D01*
+G37*
+G36*
+X108000D02*Y132500D01*
+X111750D01*
+Y140000D01*
+X108000D01*
+G37*
+G36*
+X112500D02*Y132500D01*
+X116250D01*
+Y140000D01*
+X112500D01*
+G37*
+G36*
+X117000D02*Y132500D01*
+X120750D01*
+Y140000D01*
+X117000D01*
+G37*
+G36*
+X121500D02*Y132500D01*
+X125250D01*
+Y140000D01*
+X121500D01*
+G37*
+G36*
+X126000D02*Y132500D01*
+X129750D01*
+Y140000D01*
+X126000D01*
+G37*
+G36*
+X130500D02*Y132500D01*
+X134250D01*
+Y140000D01*
+X130500D01*
+G37*
+G36*
+X135000D02*Y132500D01*
+X138750D01*
+Y140000D01*
+X135000D01*
+G37*
+G36*
+X139500D02*Y132500D01*
+X143250D01*
+Y140000D01*
+X139500D01*
+G37*
+G36*
+X144000D02*Y132500D01*
+X147750D01*
+Y140000D01*
+X144000D01*
+G37*
+G36*
+X148500D02*Y132500D01*
+X152250D01*
+Y140000D01*
+X148500D01*
+G37*
+G36*
+X153000D02*Y132500D01*
+X156750D01*
+Y140000D01*
+X153000D01*
+G37*
+G36*
+X157500D02*Y132500D01*
+X161250D01*
+Y140000D01*
+X157500D01*
+G37*
+G36*
+X162000D02*Y132500D01*
+X165750D01*
+Y140000D01*
+X162000D01*
+G37*
+G36*
+X166500D02*Y132500D01*
+X170250D01*
+Y140000D01*
+X166500D01*
+G37*
+G36*
+X171000D02*Y132500D01*
+X174750D01*
+Y140000D01*
+X171000D01*
+G37*
+G36*
+X175500D02*Y132500D01*
+X179250D01*
+Y140000D01*
+X175500D01*
+G37*
+G36*
+X180000D02*Y132500D01*
+X183750D01*
+Y140000D01*
+X180000D01*
+G37*
+G36*
+X184500D02*Y132500D01*
+X188250D01*
+Y140000D01*
+X184500D01*
+G37*
+G36*
+X189000D02*Y132500D01*
+X192750D01*
+Y140000D01*
+X189000D01*
+G37*
+G36*
+X193500D02*Y132500D01*
+X197250D01*
+Y140000D01*
+X193500D01*
+G37*
+G36*
+X198000D02*Y132500D01*
+X201750D01*
+Y140000D01*
+X198000D01*
+G37*
+G36*
+X202500D02*Y132500D01*
+X206250D01*
+Y140000D01*
+X202500D01*
+G37*
+G36*
+X207000D02*Y132500D01*
+X210750D01*
+Y140000D01*
+X207000D01*
+G37*
+G36*
+X211500D02*Y132500D01*
+X215250D01*
+Y140000D01*
+X211500D01*
+G37*
+G36*
+X216000D02*Y132500D01*
+X219750D01*
+Y140000D01*
+X216000D01*
+G37*
+G36*
+X220500D02*Y132500D01*
+X224250D01*
+Y140000D01*
+X220500D01*
+G37*
+G36*
+X225000D02*Y132500D01*
+X228750D01*
+Y140000D01*
+X225000D01*
+G37*
+G36*
+X229500D02*Y132500D01*
+X233250D01*
+Y140000D01*
+X229500D01*
+G37*
+G36*
+X234000D02*Y132500D01*
+X237750D01*
+Y140000D01*
+X234000D01*
+G37*
+G36*
+X238500D02*Y132500D01*
+X242250D01*
+Y140000D01*
+X238500D01*
+G37*
+G36*
+X243000D02*Y132500D01*
+X246750D01*
+Y140000D01*
+X243000D01*
+G37*
+G36*
+X247500D02*Y132500D01*
+X251250D01*
+Y140000D01*
+X247500D01*
+G37*
+G36*
+X252000D02*Y132500D01*
+X255750D01*
+Y140000D01*
+X252000D01*
+G37*
+G36*
+X256500D02*Y132500D01*
+X260250D01*
+Y140000D01*
+X256500D01*
+G37*
+G36*
+X261000D02*Y132500D01*
+X264750D01*
+Y140000D01*
+X261000D01*
+G37*
+G36*
+X265500D02*Y132500D01*
+X269250D01*
+Y140000D01*
+X265500D01*
+G37*
+G36*
+X270000D02*Y132500D01*
+X273750D01*
+Y140000D01*
+X270000D01*
+G37*
+G36*
+X274500D02*Y132500D01*
+X278250D01*
+Y140000D01*
+X274500D01*
+G37*
+G36*
+X279000D02*Y132500D01*
+X282750D01*
+Y140000D01*
+X279000D01*
+G37*
+G36*
+X283500D02*Y132500D01*
+X287250D01*
+Y140000D01*
+X283500D01*
+G37*
+G36*
+X288000D02*Y132500D01*
+X291750D01*
+Y140000D01*
+X288000D01*
+G37*
+G36*
+X292500D02*Y132500D01*
+X296250D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297000D02*Y132500D01*
+X300750D01*
+Y140000D01*
+X297000D01*
+G37*
+G36*
+X301500D02*Y132500D01*
+X305250D01*
+Y140000D01*
+X301500D01*
+G37*
+G54D15*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D13*G36*
+X200000Y65000D02*Y57500D01*
+X203750D01*
+Y65000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y57500D01*
+X208250D01*
+Y65000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y57500D01*
+X212750D01*
+Y65000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y57500D01*
+X217250D01*
+Y65000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y57500D01*
+X221750D01*
+Y65000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y57500D01*
+X226250D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y57500D01*
+X230750D01*
+Y65000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y57500D01*
+X235250D01*
+Y65000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y57500D01*
+X239750D01*
+Y65000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y57500D01*
+X244250D01*
+Y65000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y57500D01*
+X248750D01*
+Y65000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y57500D01*
+X253250D01*
+Y65000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y57500D01*
+X257750D01*
+Y65000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y57500D01*
+X262250D01*
+Y65000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y57500D01*
+X266750D01*
+Y65000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y57500D01*
+X271250D01*
+Y65000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y57500D01*
+X275750D01*
+Y65000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y57500D01*
+X280250D01*
+Y65000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y57500D01*
+X284750D01*
+Y65000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y57500D01*
+X289250D01*
+Y65000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y57500D01*
+X293750D01*
+Y65000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y57500D01*
+X298250D01*
+Y65000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y57500D01*
+X302750D01*
+Y65000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y57500D01*
+X307250D01*
+Y65000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y57500D01*
+X311750D01*
+Y65000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y57500D01*
+X316250D01*
+Y65000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y57500D01*
+X320750D01*
+Y65000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y57500D01*
+X325250D01*
+Y65000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y57500D01*
+X329750D01*
+Y65000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y57500D01*
+X334250D01*
+Y65000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y57500D01*
+X338750D01*
+Y65000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y57500D01*
+X343250D01*
+Y65000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y57500D01*
+X347750D01*
+Y65000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y57500D01*
+X352250D01*
+Y65000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y57500D01*
+X356750D01*
+Y65000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y57500D01*
+X361250D01*
+Y65000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y57500D01*
+X365750D01*
+Y65000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y57500D01*
+X370250D01*
+Y65000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y57500D01*
+X374750D01*
+Y65000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y57500D01*
+X379250D01*
+Y65000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y57500D01*
+X383750D01*
+Y65000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y57500D01*
+X388250D01*
+Y65000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y57500D01*
+X392750D01*
+Y65000D01*
+X389000D01*
+G37*
+G36*
+X393500D02*Y57500D01*
+X397250D01*
+Y65000D01*
+X393500D01*
+G37*
+G36*
+X398000D02*Y57500D01*
+X401750D01*
+Y65000D01*
+X398000D01*
+G37*
+G36*
+X402500D02*Y57500D01*
+X406250D01*
+Y65000D01*
+X402500D01*
+G37*
+G36*
+X407000D02*Y57500D01*
+X410750D01*
+Y65000D01*
+X407000D01*
+G37*
+G36*
+X411500D02*Y57500D01*
+X415250D01*
+Y65000D01*
+X411500D01*
+G37*
+G36*
+X416000D02*Y57500D01*
+X419750D01*
+Y65000D01*
+X416000D01*
+G37*
+G36*
+X420500D02*Y57500D01*
+X424250D01*
+Y65000D01*
+X420500D01*
+G37*
+G36*
+X425000D02*Y57500D01*
+X428750D01*
+Y65000D01*
+X425000D01*
+G37*
+G36*
+X429500D02*Y57500D01*
+X433250D01*
+Y65000D01*
+X429500D01*
+G37*
+G36*
+X434000D02*Y57500D01*
+X437750D01*
+Y65000D01*
+X434000D01*
+G37*
+G36*
+X438500D02*Y57500D01*
+X442250D01*
+Y65000D01*
+X438500D01*
+G37*
+G36*
+X443000D02*Y57500D01*
+X446750D01*
+Y65000D01*
+X443000D01*
+G37*
+G36*
+X447500D02*Y57500D01*
+X451250D01*
+Y65000D01*
+X447500D01*
+G37*
+G36*
+X452000D02*Y57500D01*
+X455750D01*
+Y65000D01*
+X452000D01*
+G37*
+G36*
+X456500D02*Y57500D01*
+X460250D01*
+Y65000D01*
+X456500D01*
+G37*
+G36*
+X461000D02*Y57500D01*
+X464750D01*
+Y65000D01*
+X461000D01*
+G37*
+G36*
+X465500D02*Y57500D01*
+X469250D01*
+Y65000D01*
+X465500D01*
+G37*
+G36*
+X470000D02*Y57500D01*
+X473750D01*
+Y65000D01*
+X470000D01*
+G37*
+G36*
+X474500D02*Y57500D01*
+X478250D01*
+Y65000D01*
+X474500D01*
+G37*
+G36*
+X25000Y-2000D02*Y-9500D01*
+X28750D01*
+Y-2000D01*
+X25000D01*
+G37*
+G36*
+X29500D02*Y-9500D01*
+X33250D01*
+Y-2000D01*
+X29500D01*
+G37*
+G36*
+X34000D02*Y-9500D01*
+X37750D01*
+Y-2000D01*
+X34000D01*
+G37*
+G36*
+X38500D02*Y-9500D01*
+X42250D01*
+Y-2000D01*
+X38500D01*
+G37*
+G36*
+X43000D02*Y-9500D01*
+X46750D01*
+Y-2000D01*
+X43000D01*
+G37*
+G36*
+X47500D02*Y-9500D01*
+X51250D01*
+Y-2000D01*
+X47500D01*
+G37*
+G36*
+X52000D02*Y-9500D01*
+X55750D01*
+Y-2000D01*
+X52000D01*
+G37*
+G36*
+X56500D02*Y-9500D01*
+X60250D01*
+Y-2000D01*
+X56500D01*
+G37*
+G36*
+X61000D02*Y-9500D01*
+X64750D01*
+Y-2000D01*
+X61000D01*
+G37*
+G36*
+X65500D02*Y-9500D01*
+X69250D01*
+Y-2000D01*
+X65500D01*
+G37*
+G36*
+X70000D02*Y-9500D01*
+X73750D01*
+Y-2000D01*
+X70000D01*
+G37*
+G36*
+X74500D02*Y-9500D01*
+X78250D01*
+Y-2000D01*
+X74500D01*
+G37*
+G36*
+X79000D02*Y-9500D01*
+X82750D01*
+Y-2000D01*
+X79000D01*
+G37*
+G36*
+X83500D02*Y-9500D01*
+X87250D01*
+Y-2000D01*
+X83500D01*
+G37*
+G36*
+X88000D02*Y-9500D01*
+X91750D01*
+Y-2000D01*
+X88000D01*
+G37*
+G36*
+X92500D02*Y-9500D01*
+X96250D01*
+Y-2000D01*
+X92500D01*
+G37*
+G36*
+X97000D02*Y-9500D01*
+X100750D01*
+Y-2000D01*
+X97000D01*
+G37*
+G36*
+X101500D02*Y-9500D01*
+X105250D01*
+Y-2000D01*
+X101500D01*
+G37*
+G36*
+X106000D02*Y-9500D01*
+X109750D01*
+Y-2000D01*
+X106000D01*
+G37*
+G36*
+X110500D02*Y-9500D01*
+X114250D01*
+Y-2000D01*
+X110500D01*
+G37*
+G36*
+X115000D02*Y-9500D01*
+X118750D01*
+Y-2000D01*
+X115000D01*
+G37*
+G36*
+X119500D02*Y-9500D01*
+X123250D01*
+Y-2000D01*
+X119500D01*
+G37*
+G36*
+X124000D02*Y-9500D01*
+X127750D01*
+Y-2000D01*
+X124000D01*
+G37*
+G36*
+X128500D02*Y-9500D01*
+X132250D01*
+Y-2000D01*
+X128500D01*
+G37*
+G36*
+X133000D02*Y-9500D01*
+X136750D01*
+Y-2000D01*
+X133000D01*
+G37*
+G36*
+X137500D02*Y-9500D01*
+X141250D01*
+Y-2000D01*
+X137500D01*
+G37*
+G36*
+X142000D02*Y-9500D01*
+X145750D01*
+Y-2000D01*
+X142000D01*
+G37*
+G36*
+X146500D02*Y-9500D01*
+X150250D01*
+Y-2000D01*
+X146500D01*
+G37*
+G36*
+X151000D02*Y-9500D01*
+X154750D01*
+Y-2000D01*
+X151000D01*
+G37*
+G36*
+X155500D02*Y-9500D01*
+X159250D01*
+Y-2000D01*
+X155500D01*
+G37*
+G36*
+X160000D02*Y-9500D01*
+X163750D01*
+Y-2000D01*
+X160000D01*
+G37*
+G36*
+X164500D02*Y-9500D01*
+X168250D01*
+Y-2000D01*
+X164500D01*
+G37*
+G36*
+X169000D02*Y-9500D01*
+X172750D01*
+Y-2000D01*
+X169000D01*
+G37*
+G36*
+X173500D02*Y-9500D01*
+X177250D01*
+Y-2000D01*
+X173500D01*
+G37*
+G36*
+X178000D02*Y-9500D01*
+X181750D01*
+Y-2000D01*
+X178000D01*
+G37*
+G36*
+X182500D02*Y-9500D01*
+X186250D01*
+Y-2000D01*
+X182500D01*
+G37*
+G36*
+X187000D02*Y-9500D01*
+X190750D01*
+Y-2000D01*
+X187000D01*
+G37*
+G36*
+X191500D02*Y-9500D01*
+X195250D01*
+Y-2000D01*
+X191500D01*
+G37*
+G36*
+X196000D02*Y-9500D01*
+X199750D01*
+Y-2000D01*
+X196000D01*
+G37*
+G36*
+X200500D02*Y-9500D01*
+X204250D01*
+Y-2000D01*
+X200500D01*
+G37*
+G36*
+X205000D02*Y-9500D01*
+X208750D01*
+Y-2000D01*
+X205000D01*
+G37*
+G36*
+X209500D02*Y-9500D01*
+X213250D01*
+Y-2000D01*
+X209500D01*
+G37*
+G36*
+X214000D02*Y-9500D01*
+X217750D01*
+Y-2000D01*
+X214000D01*
+G37*
+G36*
+X218500D02*Y-9500D01*
+X222250D01*
+Y-2000D01*
+X218500D01*
+G37*
+G36*
+X223000D02*Y-9500D01*
+X226750D01*
+Y-2000D01*
+X223000D01*
+G37*
+G36*
+X227500D02*Y-9500D01*
+X231250D01*
+Y-2000D01*
+X227500D01*
+G37*
+G36*
+X232000D02*Y-9500D01*
+X235750D01*
+Y-2000D01*
+X232000D01*
+G37*
+G36*
+X236500D02*Y-9500D01*
+X240250D01*
+Y-2000D01*
+X236500D01*
+G37*
+G36*
+X241000D02*Y-9500D01*
+X244750D01*
+Y-2000D01*
+X241000D01*
+G37*
+G36*
+X245500D02*Y-9500D01*
+X249250D01*
+Y-2000D01*
+X245500D01*
+G37*
+G36*
+X250000D02*Y-9500D01*
+X253750D01*
+Y-2000D01*
+X250000D01*
+G37*
+G36*
+X254500D02*Y-9500D01*
+X258250D01*
+Y-2000D01*
+X254500D01*
+G37*
+G36*
+X259000D02*Y-9500D01*
+X262750D01*
+Y-2000D01*
+X259000D01*
+G37*
+G36*
+X263500D02*Y-9500D01*
+X267250D01*
+Y-2000D01*
+X263500D01*
+G37*
+G36*
+X268000D02*Y-9500D01*
+X271750D01*
+Y-2000D01*
+X268000D01*
+G37*
+G36*
+X272500D02*Y-9500D01*
+X276250D01*
+Y-2000D01*
+X272500D01*
+G37*
+G36*
+X277000D02*Y-9500D01*
+X280750D01*
+Y-2000D01*
+X277000D01*
+G37*
+G36*
+X281500D02*Y-9500D01*
+X285250D01*
+Y-2000D01*
+X281500D01*
+G37*
+G36*
+X286000D02*Y-9500D01*
+X289750D01*
+Y-2000D01*
+X286000D01*
+G37*
+G36*
+X290500D02*Y-9500D01*
+X294250D01*
+Y-2000D01*
+X290500D01*
+G37*
+G36*
+X295000D02*Y-9500D01*
+X298750D01*
+Y-2000D01*
+X295000D01*
+G37*
+G36*
+X299500D02*Y-9500D01*
+X303250D01*
+Y-2000D01*
+X299500D01*
+G37*
+G36*
+X304000D02*Y-9500D01*
+X307750D01*
+Y-2000D01*
+X304000D01*
+G37*
+G36*
+X308500D02*Y-9500D01*
+X312250D01*
+Y-2000D01*
+X308500D01*
+G37*
+G36*
+X313000D02*Y-9500D01*
+X316750D01*
+Y-2000D01*
+X313000D01*
+G37*
+G36*
+X317500D02*Y-9500D01*
+X321250D01*
+Y-2000D01*
+X317500D01*
+G37*
+G36*
+X322000D02*Y-9500D01*
+X325750D01*
+Y-2000D01*
+X322000D01*
+G37*
+G36*
+X326500D02*Y-9500D01*
+X330250D01*
+Y-2000D01*
+X326500D01*
+G37*
+G36*
+X331000D02*Y-9500D01*
+X334750D01*
+Y-2000D01*
+X331000D01*
+G37*
+G36*
+X335500D02*Y-9500D01*
+X339250D01*
+Y-2000D01*
+X335500D01*
+G37*
+G36*
+X340000D02*Y-9500D01*
+X343750D01*
+Y-2000D01*
+X340000D01*
+G37*
+G36*
+X344500D02*Y-9500D01*
+X348250D01*
+Y-2000D01*
+X344500D01*
+G37*
+G36*
+X349000D02*Y-9500D01*
+X352750D01*
+Y-2000D01*
+X349000D01*
+G37*
+G36*
+X353500D02*Y-9500D01*
+X357250D01*
+Y-2000D01*
+X353500D01*
+G37*
+G36*
+X358000D02*Y-9500D01*
+X361750D01*
+Y-2000D01*
+X358000D01*
+G37*
+G36*
+X362500D02*Y-9500D01*
+X366250D01*
+Y-2000D01*
+X362500D01*
+G37*
+G36*
+X367000D02*Y-9500D01*
+X370750D01*
+Y-2000D01*
+X367000D01*
+G37*
+G36*
+X371500D02*Y-9500D01*
+X375250D01*
+Y-2000D01*
+X371500D01*
+G37*
+G36*
+X376000D02*Y-9500D01*
+X379750D01*
+Y-2000D01*
+X376000D01*
+G37*
+G36*
+X380500D02*Y-9500D01*
+X384250D01*
+Y-2000D01*
+X380500D01*
+G37*
+G36*
+X385000D02*Y-9500D01*
+X388750D01*
+Y-2000D01*
+X385000D01*
+G37*
+G36*
+X389500D02*Y-9500D01*
+X393250D01*
+Y-2000D01*
+X389500D01*
+G37*
+G36*
+X394000D02*Y-9500D01*
+X397750D01*
+Y-2000D01*
+X394000D01*
+G37*
+G36*
+X398500D02*Y-9500D01*
+X402250D01*
+Y-2000D01*
+X398500D01*
+G37*
+G36*
+X403000D02*Y-9500D01*
+X406751D01*
+Y-2000D01*
+X403000D01*
+G37*
+G36*
+X407501D02*Y-9500D01*
+X411251D01*
+Y-2000D01*
+X407501D01*
+G37*
+G36*
+X412001D02*Y-9500D01*
+X415751D01*
+Y-2000D01*
+X412001D01*
+G37*
+G36*
+X416501D02*Y-9500D01*
+X420251D01*
+Y-2000D01*
+X416501D01*
+G37*
+G36*
+X421001D02*Y-9500D01*
+X424751D01*
+Y-2000D01*
+X421001D01*
+G37*
+G36*
+X425501D02*Y-9500D01*
+X429251D01*
+Y-2000D01*
+X425501D01*
+G37*
+G36*
+X430001D02*Y-9500D01*
+X433751D01*
+Y-2000D01*
+X430001D01*
+G37*
+G36*
+X434501D02*Y-9500D01*
+X438251D01*
+Y-2000D01*
+X434501D01*
+G37*
+G36*
+X439001D02*Y-9500D01*
+X442751D01*
+Y-2000D01*
+X439001D01*
+G37*
+G36*
+X443501D02*Y-9500D01*
+X447251D01*
+Y-2000D01*
+X443501D01*
+G37*
+G36*
+X448001D02*Y-9500D01*
+X451751D01*
+Y-2000D01*
+X448001D01*
+G37*
+G36*
+X452501D02*Y-9500D01*
+X456251D01*
+Y-2000D01*
+X452501D01*
+G37*
+G36*
+X457001D02*Y-9500D01*
+X460751D01*
+Y-2000D01*
+X457001D01*
+G37*
+G36*
+X461501D02*Y-9500D01*
+X465251D01*
+Y-2000D01*
+X461501D01*
+G37*
+G36*
+X200000Y80000D02*Y72500D01*
+X203750D01*
+Y80000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y72500D01*
+X208250D01*
+Y80000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y72500D01*
+X212750D01*
+Y80000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y72500D01*
+X217250D01*
+Y80000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y72500D01*
+X221750D01*
+Y80000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y72500D01*
+X226250D01*
+Y80000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y72500D01*
+X230750D01*
+Y80000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y72500D01*
+X235250D01*
+Y80000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y72500D01*
+X239750D01*
+Y80000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y72500D01*
+X244250D01*
+Y80000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y72500D01*
+X248750D01*
+Y80000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y72500D01*
+X253250D01*
+Y80000D01*
+X249500D01*
+G37*
+G54D16*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D13*G36*
+X205550Y95000D02*Y87500D01*
+X209300D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210050D02*Y87500D01*
+X213800D01*
+Y95000D01*
+X210050D01*
+G37*
+G36*
+X214550D02*Y87500D01*
+X218300D01*
+Y95000D01*
+X214550D01*
+G37*
+G36*
+X219050D02*Y87500D01*
+X222800D01*
+Y95000D01*
+X219050D01*
+G37*
+G36*
+X223550D02*Y87500D01*
+X227300D01*
+Y95000D01*
+X223550D01*
+G37*
+G36*
+X228050D02*Y87500D01*
+X231800D01*
+Y95000D01*
+X228050D01*
+G37*
+G36*
+X232550D02*Y87500D01*
+X236300D01*
+Y95000D01*
+X232550D01*
+G37*
+G36*
+X237050D02*Y87500D01*
+X240800D01*
+Y95000D01*
+X237050D01*
+G37*
+G36*
+X241550D02*Y87500D01*
+X245300D01*
+Y95000D01*
+X241550D01*
+G37*
+G36*
+X246050D02*Y87500D01*
+X249800D01*
+Y95000D01*
+X246050D01*
+G37*
+G36*
+X250550D02*Y87500D01*
+X254300D01*
+Y95000D01*
+X250550D01*
+G37*
+G36*
+X200000Y110000D02*Y102500D01*
+X203750D01*
+Y110000D01*
+X200000D01*
+G37*
+G36*
+X204500D02*Y102500D01*
+X208250D01*
+Y110000D01*
+X204500D01*
+G37*
+G36*
+X209000D02*Y102500D01*
+X212750D01*
+Y110000D01*
+X209000D01*
+G37*
+G36*
+X213500D02*Y102500D01*
+X217250D01*
+Y110000D01*
+X213500D01*
+G37*
+G36*
+X218000D02*Y102500D01*
+X221750D01*
+Y110000D01*
+X218000D01*
+G37*
+G36*
+X222500D02*Y102500D01*
+X226250D01*
+Y110000D01*
+X222500D01*
+G37*
+G36*
+X227000D02*Y102500D01*
+X230750D01*
+Y110000D01*
+X227000D01*
+G37*
+G36*
+X231500D02*Y102500D01*
+X235250D01*
+Y110000D01*
+X231500D01*
+G37*
+G36*
+X236000D02*Y102500D01*
+X239750D01*
+Y110000D01*
+X236000D01*
+G37*
+G36*
+X240500D02*Y102500D01*
+X244250D01*
+Y110000D01*
+X240500D01*
+G37*
+G36*
+X245000D02*Y102500D01*
+X248750D01*
+Y110000D01*
+X245000D01*
+G37*
+G36*
+X249500D02*Y102500D01*
+X253250D01*
+Y110000D01*
+X249500D01*
+G37*
+G36*
+X254000D02*Y102500D01*
+X257750D01*
+Y110000D01*
+X254000D01*
+G37*
+G36*
+X258500D02*Y102500D01*
+X262250D01*
+Y110000D01*
+X258500D01*
+G37*
+G36*
+X263000D02*Y102500D01*
+X266750D01*
+Y110000D01*
+X263000D01*
+G37*
+G36*
+X267500D02*Y102500D01*
+X271250D01*
+Y110000D01*
+X267500D01*
+G37*
+G36*
+X272000D02*Y102500D01*
+X275750D01*
+Y110000D01*
+X272000D01*
+G37*
+G36*
+X276500D02*Y102500D01*
+X280250D01*
+Y110000D01*
+X276500D01*
+G37*
+G36*
+X281000D02*Y102500D01*
+X284750D01*
+Y110000D01*
+X281000D01*
+G37*
+G36*
+X285500D02*Y102500D01*
+X289250D01*
+Y110000D01*
+X285500D01*
+G37*
+G36*
+X290000D02*Y102500D01*
+X293750D01*
+Y110000D01*
+X290000D01*
+G37*
+G36*
+X294500D02*Y102500D01*
+X298250D01*
+Y110000D01*
+X294500D01*
+G37*
+G36*
+X299000D02*Y102500D01*
+X302750D01*
+Y110000D01*
+X299000D01*
+G37*
+G36*
+X303500D02*Y102500D01*
+X307250D01*
+Y110000D01*
+X303500D01*
+G37*
+G36*
+X308000D02*Y102500D01*
+X311750D01*
+Y110000D01*
+X308000D01*
+G37*
+G36*
+X312500D02*Y102500D01*
+X316250D01*
+Y110000D01*
+X312500D01*
+G37*
+G36*
+X317000D02*Y102500D01*
+X320750D01*
+Y110000D01*
+X317000D01*
+G37*
+G36*
+X321500D02*Y102500D01*
+X325250D01*
+Y110000D01*
+X321500D01*
+G37*
+G36*
+X326000D02*Y102500D01*
+X329750D01*
+Y110000D01*
+X326000D01*
+G37*
+G36*
+X330500D02*Y102500D01*
+X334250D01*
+Y110000D01*
+X330500D01*
+G37*
+G36*
+X335000D02*Y102500D01*
+X338750D01*
+Y110000D01*
+X335000D01*
+G37*
+G36*
+X339500D02*Y102500D01*
+X343250D01*
+Y110000D01*
+X339500D01*
+G37*
+G36*
+X344000D02*Y102500D01*
+X347750D01*
+Y110000D01*
+X344000D01*
+G37*
+G36*
+X348500D02*Y102500D01*
+X352250D01*
+Y110000D01*
+X348500D01*
+G37*
+G36*
+X353000D02*Y102500D01*
+X356750D01*
+Y110000D01*
+X353000D01*
+G37*
+G36*
+X357500D02*Y102500D01*
+X361250D01*
+Y110000D01*
+X357500D01*
+G37*
+G36*
+X362000D02*Y102500D01*
+X365750D01*
+Y110000D01*
+X362000D01*
+G37*
+G36*
+X366500D02*Y102500D01*
+X370250D01*
+Y110000D01*
+X366500D01*
+G37*
+G36*
+X371000D02*Y102500D01*
+X374750D01*
+Y110000D01*
+X371000D01*
+G37*
+G36*
+X375500D02*Y102500D01*
+X379250D01*
+Y110000D01*
+X375500D01*
+G37*
+G36*
+X380000D02*Y102500D01*
+X383750D01*
+Y110000D01*
+X380000D01*
+G37*
+G36*
+X384500D02*Y102500D01*
+X388250D01*
+Y110000D01*
+X384500D01*
+G37*
+G36*
+X389000D02*Y102500D01*
+X392750D01*
+Y110000D01*
+X389000D01*
+G37*
+G36*
+X393500D02*Y102500D01*
+X397250D01*
+Y110000D01*
+X393500D01*
+G37*
+G36*
+X398000D02*Y102500D01*
+X401750D01*
+Y110000D01*
+X398000D01*
+G37*
+G36*
+X402500D02*Y102500D01*
+X406250D01*
+Y110000D01*
+X402500D01*
+G37*
+G36*
+X407000D02*Y102500D01*
+X410750D01*
+Y110000D01*
+X407000D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.topsilk.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.topsilk.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.gbr/text_sides.topsilk.gbr	(revision 18980)
@@ -0,0 +1,22 @@
+G04 start of page 2 for group 1 layer_idx 8 *
+G04 Title: text on both sides, top_silk *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOPSILK*%
+%ADD11C,0.0070*%
+G54D11*X22500Y31500D02*Y28500D01*
+Y31500D02*X23200Y32500D01*
+X24300D01*
+X25000Y31500D01*
+Y28500D01*
+X22500Y30500D02*X25000D01*
+X26200Y31700D02*X27000Y32500D01*
+Y28500D01*
+X26200D02*X27700D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/text_sides.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.nelma.em	(revision 18980)
@@ -0,0 +1,51 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/text_sides.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.net	(revision 18980)
@@ -0,0 +1,12 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   text on both sides
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+999
Index: tags/2.0.1/tests/RTT/ref/text_sides.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_sides.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_sides.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_sides.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.png.text	(revision 18980)
@@ -0,0 +1,8 @@
+r6731
+
+??? between the bottom of A1 and bottom of A2
+(underside text is missing in png file!)
+
+all text is 8 pixels thick (6.666)
+
+(mil)
Index: tags/2.0.1/tests/RTT/ref/text_sides.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_sides.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_sides.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_sides.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/text_sides.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/text_sides.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/text_sides.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.svg	(revision 18980)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+</g>
+<g id="layer_5_group5">
+</g>
+<g id="layer_10_bottom">
+</g>
+<g id="layer_3_top">
+</g>
+<g id="layer_1_topsilk">
+<!--normal-->
+ <line x1="5.7150" y1="4.6990" x2="5.7150" y2="5.4610" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="4.6990" x2="5.8928" y2="4.4450" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.8928" y1="4.4450" x2="6.1722" y2="4.4450" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.1722" y1="4.4450" x2="6.3500" y2="4.6990" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.3500" y1="4.6990" x2="6.3500" y2="5.4610" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="5.7150" y1="4.9530" x2="6.3500" y2="4.9530" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6548" y1="4.6482" x2="6.8580" y2="4.4450" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.8580" y1="4.4450" x2="6.8580" y2="5.4610" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+ <line x1="6.6548" y1="5.4610" x2="7.0358" y2="5.4610" stroke-width="0.1778" stroke="#000000" stroke-linecap="round"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/text_sides.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/text_sides.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/text_sides.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: text on both sides - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/thermal_last.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/thermal_last.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.dsn	(revision 18980)
@@ -0,0 +1,53 @@
+(pcb thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place 5 2.540000 10.160000 front 0 (PN 0))
+    )
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/thermal_last.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.eps	(revision 18980)
@@ -0,0 +1,206 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: thermal_last.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.329412 0.545098 0.329412 setrgbcolor
+0.02500 0.02500 moveto
+0.12500 0.02500 lineto
+0.12500 0.04609 lineto
+0.11840 0.04336 lineto
+0.10932 0.04118 lineto
+0.10000 0.04045 lineto
+0.09068 0.04118 lineto
+0.08160 0.04336 lineto
+0.07296 0.04694 lineto
+0.06560 0.05145 lineto
+0.08014 0.06600 lineto
+0.08207 0.06481 lineto
+0.08780 0.06244 lineto
+0.09382 0.06099 lineto
+0.10000 0.06051 lineto
+0.10618 0.06099 lineto
+0.11220 0.06244 lineto
+0.11793 0.06481 lineto
+0.11986 0.06600 lineto
+0.12500 0.06086 lineto
+0.12500 0.12500 lineto
+0.06086 0.12500 lineto
+0.06600 0.11986 lineto
+0.06481 0.11793 lineto
+0.06244 0.11220 lineto
+0.06099 0.10618 lineto
+0.06051 0.10000 lineto
+0.06099 0.09382 lineto
+0.06244 0.08780 lineto
+0.06481 0.08207 lineto
+0.06600 0.08014 lineto
+0.05145 0.06560 lineto
+0.04694 0.07296 lineto
+0.04336 0.08160 lineto
+0.04118 0.09068 lineto
+0.04045 0.10000 lineto
+0.04118 0.10932 lineto
+0.04336 0.11840 lineto
+0.04609 0.12500 lineto
+0.02500 0.12500 lineto
+fill
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.545098 0.45098 0.333333 setrgbcolor
+0.07500 0.07500 moveto
+0.13830 0.07500 lineto
+0.13826 0.07504 lineto
+0.13732 0.07630 lineto
+0.13658 0.07770 lineto
+0.13608 0.07920 lineto
+0.13581 0.08076 lineto
+0.13579 0.08234 lineto
+0.13602 0.08390 lineto
+0.13652 0.08540 lineto
+0.13778 0.08892 lineto
+0.13866 0.09256 lineto
+0.13919 0.09626 lineto
+0.13937 0.10000 lineto
+0.13919 0.10374 lineto
+0.13866 0.10744 lineto
+0.13778 0.11108 lineto
+0.13656 0.11461 lineto
+0.13606 0.11611 lineto
+0.13583 0.11766 lineto
+0.13585 0.11924 lineto
+0.13612 0.12079 lineto
+0.13662 0.12228 lineto
+0.13736 0.12367 lineto
+0.13830 0.12493 lineto
+0.13942 0.12603 lineto
+0.14071 0.12694 lineto
+0.14212 0.12764 lineto
+0.14362 0.12811 lineto
+0.14518 0.12833 lineto
+0.14675 0.12832 lineto
+0.14831 0.12805 lineto
+0.14980 0.12754 lineto
+0.15119 0.12681 lineto
+0.15245 0.12587 lineto
+0.15355 0.12475 lineto
+0.15446 0.12346 lineto
+0.15513 0.12204 lineto
+0.15704 0.11672 lineto
+0.15837 0.11123 lineto
+0.15917 0.10564 lineto
+0.15944 0.10000 lineto
+0.15917 0.09436 lineto
+0.15837 0.08877 lineto
+0.15704 0.08328 lineto
+0.15519 0.07794 lineto
+0.15450 0.07652 lineto
+0.15358 0.07523 lineto
+0.15336 0.07500 lineto
+0.17500 0.07500 lineto
+0.17500 0.17500 lineto
+0.07500 0.17500 lineto
+0.07500 0.15330 lineto
+0.07525 0.15355 lineto
+0.07654 0.15446 lineto
+0.07796 0.15513 lineto
+0.08328 0.15704 lineto
+0.08877 0.15837 lineto
+0.09436 0.15917 lineto
+0.10000 0.15944 lineto
+0.10564 0.15917 lineto
+0.11123 0.15837 lineto
+0.11672 0.15704 lineto
+0.12206 0.15519 lineto
+0.12348 0.15450 lineto
+0.12477 0.15358 lineto
+0.12591 0.15248 lineto
+0.12685 0.15121 lineto
+0.12759 0.14981 lineto
+0.12809 0.14832 lineto
+0.12836 0.14676 lineto
+0.12838 0.14518 lineto
+0.12815 0.14361 lineto
+0.12768 0.14210 lineto
+0.12698 0.14069 lineto
+0.12607 0.13939 lineto
+0.12496 0.13826 lineto
+0.12370 0.13732 lineto
+0.12230 0.13658 lineto
+0.12080 0.13608 lineto
+0.11924 0.13581 lineto
+0.11766 0.13579 lineto
+0.11610 0.13602 lineto
+0.11460 0.13652 lineto
+0.11108 0.13778 lineto
+0.10744 0.13866 lineto
+0.10374 0.13919 lineto
+0.10000 0.13937 lineto
+0.09626 0.13919 lineto
+0.09256 0.13866 lineto
+0.08892 0.13778 lineto
+0.08539 0.13656 lineto
+0.08389 0.13606 lineto
+0.08234 0.13583 lineto
+0.08076 0.13585 lineto
+0.07921 0.13612 lineto
+0.07772 0.13662 lineto
+0.07633 0.13736 lineto
+0.07507 0.13830 lineto
+0.07500 0.13836 lineto
+fill
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+0.498039 0.498039 0.498039 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.10000 0.10000 0.01575 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/thermal_last.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.fcd	(revision 18980)
@@ -0,0 +1,4 @@
+[FIDOCAD]
+PP 5 5 25 5 25 9 24 9 22 8 20 8 18 8 16 9 15 9 13 10 16 13 16 13 18 12 19 12 20 12 21 12 22 12 24 13 24 13 25 12 25 25 12 25 13 24 13 24 12 22 12 21 12 20 12 19 12 18 13 16 13 16 10 13 9 15 9 16 8 18 8 20 8 22 9 24 9 25 5 25 5 5 4
+PP 15 15 28 15 28 15 27 15 27 16 27 16 27 16 27 16 27 17 27 17 28 18 28 19 28 19 28 20 28 21 28 21 28 22 27 23 27 23 27 24 27 24 27 24 27 24 27 25 28 25 28 25 28 25 28 26 29 26 29 26 29 26 30 26 30 26 30 25 30 25 31 25 31 25 31 24 31 23 32 22 32 21 32 20 32 19 32 18 31 17 31 16 31 15 31 15 31 15 35 15 35 35 15 35 15 31 15 31 15 31 16 31 17 31 18 32 19 32 20 32 21 32 22 32 23 31 24 31 25 31 25 31 25 30 25 30 26 30 26 30 26 29 26 29 26 29 26 28 25 28 25 28 25 28 25 27 24 27 24 27 24 27 24 27 23 27 23 27 22 28 21 28 21 28 20 28 19 28 19 28 18 28 17 27 17 27 16 27 16 27 16 27 16 27 15 27 15 28 15 28 15 15 5
+pa 20 20 16 16 6 0
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.bottom.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD20C,0.0315*%
+%ADD19C,0.0787*%
+G54D19*X10000Y40000D03*
+G54D20*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.fab.gbr	(revision 18980)
@@ -0,0 +1,2155 @@
+G04 start of page 7 for group -1 layer_idx 16777221 *
+G04 Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD25C,0.0100*%
+%ADD24C,0.0075*%
+%ADD23C,0.0060*%
+%ADD22C,0.0080*%
+G54D22*X10000Y40000D02*Y38400D01*
+Y40000D02*X11387Y40800D01*
+X10000Y40000D02*X8613Y40800D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D23*X135000Y108500D02*X136500Y105500D01*
+X138000Y108500D01*
+X136500Y105500D02*Y102500D01*
+X139800Y105800D02*X142050D01*
+X139800Y102500D02*X142800D01*
+X139800Y108500D02*Y102500D01*
+Y108500D02*X142800D01*
+X147600D02*X148350Y107750D01*
+X145350Y108500D02*X147600D01*
+X144600Y107750D02*X145350Y108500D01*
+X144600Y107750D02*Y106250D01*
+X145350Y105500D01*
+X147600D01*
+X148350Y104750D01*
+Y103250D01*
+X147600Y102500D02*X148350Y103250D01*
+X145350Y102500D02*X147600D01*
+X144600Y103250D02*X145350Y102500D01*
+X98000Y107300D02*X99200Y108500D01*
+Y102500D01*
+X98000D02*X100250D01*
+X45000Y103250D02*X45750Y102500D01*
+X45000Y107750D02*Y103250D01*
+Y107750D02*X45750Y108500D01*
+X47250D01*
+X48000Y107750D01*
+Y103250D01*
+X47250Y102500D02*X48000Y103250D01*
+X45750Y102500D02*X47250D01*
+X45000Y104000D02*X48000Y107000D01*
+X49800Y102500D02*X50550D01*
+X52350Y103250D02*X53100Y102500D01*
+X52350Y107750D02*Y103250D01*
+Y107750D02*X53100Y108500D01*
+X54600D01*
+X55350Y107750D01*
+Y103250D01*
+X54600Y102500D02*X55350Y103250D01*
+X53100Y102500D02*X54600D01*
+X52350Y104000D02*X55350Y107000D01*
+X57150Y107750D02*X57900Y108500D01*
+X59400D01*
+X60150Y107750D01*
+X59400Y102500D02*X60150Y103250D01*
+X57900Y102500D02*X59400D01*
+X57150Y103250D02*X57900Y102500D01*
+Y105800D02*X59400D01*
+X60150Y107750D02*Y106550D01*
+Y105050D02*Y103250D01*
+Y105050D02*X59400Y105800D01*
+X60150Y106550D02*X59400Y105800D01*
+X61950Y107750D02*X62700Y108500D01*
+X64950D01*
+X65700Y107750D01*
+Y106250D01*
+X61950Y102500D02*X65700Y106250D01*
+X61950Y102500D02*X65700D01*
+X3000Y123500D02*X3750Y122750D01*
+X750Y123500D02*X3000D01*
+X0Y122750D02*X750Y123500D01*
+X0Y122750D02*Y121250D01*
+X750Y120500D01*
+X3000D01*
+X3750Y119750D01*
+Y118250D01*
+X3000Y117500D02*X3750Y118250D01*
+X750Y117500D02*X3000D01*
+X0Y118250D02*X750Y117500D01*
+X5550Y120500D02*Y118250D01*
+X6300Y117500D01*
+X8550Y120500D02*Y116000D01*
+X7800Y115250D02*X8550Y116000D01*
+X6300Y115250D02*X7800D01*
+X5550Y116000D02*X6300Y115250D01*
+Y117500D02*X7800D01*
+X8550Y118250D01*
+X11100Y119750D02*Y117500D01*
+Y119750D02*X11850Y120500D01*
+X12600D01*
+X13350Y119750D01*
+Y117500D01*
+Y119750D02*X14100Y120500D01*
+X14850D01*
+X15600Y119750D01*
+Y117500D01*
+X10350Y120500D02*X11100Y119750D01*
+X17400Y123500D02*Y117500D01*
+Y118250D02*X18150Y117500D01*
+X19650D01*
+X20400Y118250D01*
+Y119750D02*Y118250D01*
+X19650Y120500D02*X20400Y119750D01*
+X18150Y120500D02*X19650D01*
+X17400Y119750D02*X18150Y120500D01*
+X22200Y119750D02*Y118250D01*
+Y119750D02*X22950Y120500D01*
+X24450D01*
+X25200Y119750D01*
+Y118250D01*
+X24450Y117500D02*X25200Y118250D01*
+X22950Y117500D02*X24450D01*
+X22200Y118250D02*X22950Y117500D01*
+X27000Y123500D02*Y118250D01*
+X27750Y117500D01*
+X0Y114250D02*X29250D01*
+X41750Y123500D02*Y117500D01*
+X43700Y123500D02*X44750Y122450D01*
+Y118550D01*
+X43700Y117500D02*X44750Y118550D01*
+X41000Y117500D02*X43700D01*
+X41000Y123500D02*X43700D01*
+G54D24*X46550Y122000D02*Y121850D01*
+G54D23*Y119750D02*Y117500D01*
+X50300Y120500D02*X51050Y119750D01*
+X48800Y120500D02*X50300D01*
+X48050Y119750D02*X48800Y120500D01*
+X48050Y119750D02*Y118250D01*
+X48800Y117500D01*
+X51050Y120500D02*Y118250D01*
+X51800Y117500D01*
+X48800D02*X50300D01*
+X51050Y118250D01*
+X54350Y119750D02*Y117500D01*
+Y119750D02*X55100Y120500D01*
+X55850D01*
+X56600Y119750D01*
+Y117500D01*
+Y119750D02*X57350Y120500D01*
+X58100D01*
+X58850Y119750D01*
+Y117500D01*
+X53600Y120500D02*X54350Y119750D01*
+X60650Y117500D02*X61400D01*
+X65900Y118250D02*X66650Y117500D01*
+X65900Y122750D02*X66650Y123500D01*
+X65900Y122750D02*Y118250D01*
+X68450Y123500D02*X69950D01*
+X69200D02*Y117500D01*
+X68450D02*X69950D01*
+X72500Y119750D02*Y117500D01*
+Y119750D02*X73250Y120500D01*
+X74000D01*
+X74750Y119750D01*
+Y117500D01*
+X71750Y120500D02*X72500Y119750D01*
+X77300Y120500D02*X79550D01*
+X76550Y119750D02*X77300Y120500D01*
+X76550Y119750D02*Y118250D01*
+X77300Y117500D01*
+X79550D01*
+X81350Y123500D02*Y117500D01*
+Y119750D02*X82100Y120500D01*
+X83600D01*
+X84350Y119750D01*
+Y117500D01*
+X86150Y123500D02*X86900Y122750D01*
+Y118250D01*
+X86150Y117500D02*X86900Y118250D01*
+X41000Y114250D02*X88700D01*
+X96050Y117500D02*X98000D01*
+X95000Y118550D02*X96050Y117500D01*
+X95000Y122450D02*Y118550D01*
+Y122450D02*X96050Y123500D01*
+X98000D01*
+X99800Y119750D02*Y118250D01*
+Y119750D02*X100550Y120500D01*
+X102050D01*
+X102800Y119750D01*
+Y118250D01*
+X102050Y117500D02*X102800Y118250D01*
+X100550Y117500D02*X102050D01*
+X99800Y118250D02*X100550Y117500D01*
+X104600Y120500D02*Y118250D01*
+X105350Y117500D01*
+X106850D01*
+X107600Y118250D01*
+Y120500D02*Y118250D01*
+X110150Y119750D02*Y117500D01*
+Y119750D02*X110900Y120500D01*
+X111650D01*
+X112400Y119750D01*
+Y117500D01*
+X109400Y120500D02*X110150Y119750D01*
+X114950Y123500D02*Y118250D01*
+X115700Y117500D01*
+X114200Y121250D02*X115700D01*
+X95000Y114250D02*X117200D01*
+X130750Y123500D02*Y117500D01*
+X130000Y123500D02*X133000D01*
+X133750Y122750D01*
+Y121250D01*
+X133000Y120500D02*X133750Y121250D01*
+X130750Y120500D02*X133000D01*
+X135550Y123500D02*Y118250D01*
+X136300Y117500D01*
+X140050Y120500D02*X140800Y119750D01*
+X138550Y120500D02*X140050D01*
+X137800Y119750D02*X138550Y120500D01*
+X137800Y119750D02*Y118250D01*
+X138550Y117500D01*
+X140800Y120500D02*Y118250D01*
+X141550Y117500D01*
+X138550D02*X140050D01*
+X140800Y118250D01*
+X144100Y123500D02*Y118250D01*
+X144850Y117500D01*
+X143350Y121250D02*X144850D01*
+X147100Y117500D02*X149350D01*
+X146350Y118250D02*X147100Y117500D01*
+X146350Y119750D02*Y118250D01*
+Y119750D02*X147100Y120500D01*
+X148600D01*
+X149350Y119750D01*
+X146350Y119000D02*X149350D01*
+Y119750D02*Y119000D01*
+X154150Y123500D02*Y117500D01*
+X153400D02*X154150Y118250D01*
+X151900Y117500D02*X153400D01*
+X151150Y118250D02*X151900Y117500D01*
+X151150Y119750D02*Y118250D01*
+Y119750D02*X151900Y120500D01*
+X153400D01*
+X154150Y119750D01*
+X157450Y120500D02*Y119750D01*
+Y118250D02*Y117500D01*
+X155950Y122750D02*Y122000D01*
+Y122750D02*X156700Y123500D01*
+X158200D01*
+X158950Y122750D01*
+Y122000D01*
+X157450Y120500D02*X158950Y122000D01*
+X130000Y114250D02*X160750D01*
+X0Y138500D02*X3000D01*
+X1500D02*Y132500D01*
+X4800Y138500D02*Y132500D01*
+Y134750D02*X5550Y135500D01*
+X7050D01*
+X7800Y134750D01*
+Y132500D01*
+X10350D02*X12600D01*
+X9600Y133250D02*X10350Y132500D01*
+X9600Y134750D02*Y133250D01*
+Y134750D02*X10350Y135500D01*
+X11850D01*
+X12600Y134750D01*
+X9600Y134000D02*X12600D01*
+Y134750D02*Y134000D01*
+X15150Y134750D02*Y132500D01*
+Y134750D02*X15900Y135500D01*
+X17400D01*
+X14400D02*X15150Y134750D01*
+X19950Y132500D02*X22200D01*
+X19200Y133250D02*X19950Y132500D01*
+X19200Y134750D02*Y133250D01*
+Y134750D02*X19950Y135500D01*
+X21450D01*
+X22200Y134750D01*
+X19200Y134000D02*X22200D01*
+Y134750D02*Y134000D01*
+X28950Y135500D02*X29700Y134750D01*
+X27450Y135500D02*X28950D01*
+X26700Y134750D02*X27450Y135500D01*
+X26700Y134750D02*Y133250D01*
+X27450Y132500D01*
+X29700Y135500D02*Y133250D01*
+X30450Y132500D01*
+X27450D02*X28950D01*
+X29700Y133250D01*
+X33000Y134750D02*Y132500D01*
+Y134750D02*X33750Y135500D01*
+X35250D01*
+X32250D02*X33000Y134750D01*
+X37800Y132500D02*X40050D01*
+X37050Y133250D02*X37800Y132500D01*
+X37050Y134750D02*Y133250D01*
+Y134750D02*X37800Y135500D01*
+X39300D01*
+X40050Y134750D01*
+X37050Y134000D02*X40050D01*
+Y134750D02*Y134000D01*
+X44550Y137300D02*X45750Y138500D01*
+Y132500D01*
+X44550D02*X46800D01*
+X54300Y138500D02*Y132500D01*
+X53550D02*X54300Y133250D01*
+X52050Y132500D02*X53550D01*
+X51300Y133250D02*X52050Y132500D01*
+X51300Y134750D02*Y133250D01*
+Y134750D02*X52050Y135500D01*
+X53550D01*
+X54300Y134750D01*
+G54D24*X56100Y137000D02*Y136850D01*
+G54D23*Y134750D02*Y132500D01*
+X58350Y137750D02*Y132500D01*
+Y137750D02*X59100Y138500D01*
+X59850D01*
+X57600Y135500D02*X59100D01*
+X62100Y137750D02*Y132500D01*
+Y137750D02*X62850Y138500D01*
+X63600D01*
+X61350Y135500D02*X62850D01*
+X65850Y132500D02*X68100D01*
+X65100Y133250D02*X65850Y132500D01*
+X65100Y134750D02*Y133250D01*
+Y134750D02*X65850Y135500D01*
+X67350D01*
+X68100Y134750D01*
+X65100Y134000D02*X68100D01*
+Y134750D02*Y134000D01*
+X70650Y134750D02*Y132500D01*
+Y134750D02*X71400Y135500D01*
+X72900D01*
+X69900D02*X70650Y134750D01*
+X75450Y132500D02*X77700D01*
+X74700Y133250D02*X75450Y132500D01*
+X74700Y134750D02*Y133250D01*
+Y134750D02*X75450Y135500D01*
+X76950D01*
+X77700Y134750D01*
+X74700Y134000D02*X77700D01*
+Y134750D02*Y134000D01*
+X80250Y134750D02*Y132500D01*
+Y134750D02*X81000Y135500D01*
+X81750D01*
+X82500Y134750D01*
+Y132500D01*
+X79500Y135500D02*X80250Y134750D01*
+X85050Y138500D02*Y133250D01*
+X85800Y132500D01*
+X84300Y136250D02*X85800D01*
+X93000Y138500D02*Y132500D01*
+X92250D02*X93000Y133250D01*
+X90750Y132500D02*X92250D01*
+X90000Y133250D02*X90750Y132500D01*
+X90000Y134750D02*Y133250D01*
+Y134750D02*X90750Y135500D01*
+X92250D01*
+X93000Y134750D01*
+X95550D02*Y132500D01*
+Y134750D02*X96300Y135500D01*
+X97800D01*
+X94800D02*X95550Y134750D01*
+G54D24*X99600Y137000D02*Y136850D01*
+G54D23*Y134750D02*Y132500D01*
+X101100Y138500D02*Y133250D01*
+X101850Y132500D01*
+X103350Y138500D02*Y133250D01*
+X104100Y132500D01*
+X109050D02*X111300D01*
+X112050Y133250D01*
+X111300Y134000D02*X112050Y133250D01*
+X109050Y134000D02*X111300D01*
+X108300Y134750D02*X109050Y134000D01*
+X108300Y134750D02*X109050Y135500D01*
+X111300D01*
+X112050Y134750D01*
+X108300Y133250D02*X109050Y132500D01*
+G54D24*X113850Y137000D02*Y136850D01*
+G54D23*Y134750D02*Y132500D01*
+X115350Y135500D02*X118350D01*
+X115350Y132500D02*X118350Y135500D01*
+X115350Y132500D02*X118350D01*
+X120900D02*X123150D01*
+X120150Y133250D02*X120900Y132500D01*
+X120150Y134750D02*Y133250D01*
+Y134750D02*X120900Y135500D01*
+X122400D01*
+X123150Y134750D01*
+X120150Y134000D02*X123150D01*
+Y134750D02*Y134000D01*
+X125700Y132500D02*X127950D01*
+X128700Y133250D01*
+X127950Y134000D02*X128700Y133250D01*
+X125700Y134000D02*X127950D01*
+X124950Y134750D02*X125700Y134000D01*
+X124950Y134750D02*X125700Y135500D01*
+X127950D01*
+X128700Y134750D01*
+X124950Y133250D02*X125700Y132500D01*
+X133200Y135500D02*Y133250D01*
+X133950Y132500D01*
+X135450D01*
+X136200Y133250D01*
+Y135500D02*Y133250D01*
+X138750Y132500D02*X141000D01*
+X141750Y133250D01*
+X141000Y134000D02*X141750Y133250D01*
+X138750Y134000D02*X141000D01*
+X138000Y134750D02*X138750Y134000D01*
+X138000Y134750D02*X138750Y135500D01*
+X141000D01*
+X141750Y134750D01*
+X138000Y133250D02*X138750Y132500D01*
+X144300D02*X146550D01*
+X143550Y133250D02*X144300Y132500D01*
+X143550Y134750D02*Y133250D01*
+Y134750D02*X144300Y135500D01*
+X145800D01*
+X146550Y134750D01*
+X143550Y134000D02*X146550D01*
+Y134750D02*Y134000D01*
+X151350Y138500D02*Y132500D01*
+X150600D02*X151350Y133250D01*
+X149100Y132500D02*X150600D01*
+X148350Y133250D02*X149100Y132500D01*
+X148350Y134750D02*Y133250D01*
+Y134750D02*X149100Y135500D01*
+X150600D01*
+X151350Y134750D01*
+G54D24*X155850Y137000D02*Y136850D01*
+G54D23*Y134750D02*Y132500D01*
+X158100Y134750D02*Y132500D01*
+Y134750D02*X158850Y135500D01*
+X159600D01*
+X160350Y134750D01*
+Y132500D01*
+X157350Y135500D02*X158100Y134750D01*
+X165600Y138500D02*Y133250D01*
+X166350Y132500D01*
+X164850Y136250D02*X166350D01*
+X167850Y138500D02*Y132500D01*
+Y134750D02*X168600Y135500D01*
+X170100D01*
+X170850Y134750D01*
+Y132500D01*
+G54D24*X172650Y137000D02*Y136850D01*
+G54D23*Y134750D02*Y132500D01*
+X174900D02*X177150D01*
+X177900Y133250D01*
+X177150Y134000D02*X177900Y133250D01*
+X174900Y134000D02*X177150D01*
+X174150Y134750D02*X174900Y134000D01*
+X174150Y134750D02*X174900Y135500D01*
+X177150D01*
+X177900Y134750D01*
+X174150Y133250D02*X174900Y132500D01*
+X182400Y138500D02*Y133250D01*
+X183150Y132500D01*
+X186900Y135500D02*X187650Y134750D01*
+X185400Y135500D02*X186900D01*
+X184650Y134750D02*X185400Y135500D01*
+X184650Y134750D02*Y133250D01*
+X185400Y132500D01*
+X187650Y135500D02*Y133250D01*
+X188400Y132500D01*
+X185400D02*X186900D01*
+X187650Y133250D01*
+X190200Y135500D02*Y133250D01*
+X190950Y132500D01*
+X193200Y135500D02*Y131000D01*
+X192450Y130250D02*X193200Y131000D01*
+X190950Y130250D02*X192450D01*
+X190200Y131000D02*X190950Y130250D01*
+Y132500D02*X192450D01*
+X193200Y133250D01*
+X195000Y134750D02*Y133250D01*
+Y134750D02*X195750Y135500D01*
+X197250D01*
+X198000Y134750D01*
+Y133250D01*
+X197250Y132500D02*X198000Y133250D01*
+X195750Y132500D02*X197250D01*
+X195000Y133250D02*X195750Y132500D01*
+X199800Y135500D02*Y133250D01*
+X200550Y132500D01*
+X202050D01*
+X202800Y133250D01*
+Y135500D02*Y133250D01*
+X205350Y138500D02*Y133250D01*
+X206100Y132500D01*
+X204600Y136250D02*X206100D01*
+X207600Y131000D02*X209100Y132500D01*
+X213600Y137300D02*X214800Y138500D01*
+Y132500D01*
+X213600D02*X215850D01*
+X220350Y138500D02*Y132500D01*
+Y134750D02*X221100Y135500D01*
+X222600D01*
+X223350Y134750D01*
+Y132500D01*
+X225150Y134750D02*Y133250D01*
+Y134750D02*X225900Y135500D01*
+X227400D01*
+X228150Y134750D01*
+Y133250D01*
+X227400Y132500D02*X228150Y133250D01*
+X225900Y132500D02*X227400D01*
+X225150Y133250D02*X225900Y132500D01*
+X229950Y138500D02*Y133250D01*
+X230700Y132500D01*
+X232950D02*X235200D01*
+X232200Y133250D02*X232950Y132500D01*
+X232200Y134750D02*Y133250D01*
+Y134750D02*X232950Y135500D01*
+X234450D01*
+X235200Y134750D01*
+X232200Y134000D02*X235200D01*
+Y134750D02*Y134000D01*
+X237750Y132500D02*X240000D01*
+X240750Y133250D01*
+X240000Y134000D02*X240750Y133250D01*
+X237750Y134000D02*X240000D01*
+X237000Y134750D02*X237750Y134000D01*
+X237000Y134750D02*X237750Y135500D01*
+X240000D01*
+X240750Y134750D01*
+X237000Y133250D02*X237750Y132500D01*
+X246000Y138500D02*Y133250D01*
+X246750Y132500D01*
+X245250Y136250D02*X246750D01*
+X248250Y134750D02*Y133250D01*
+Y134750D02*X249000Y135500D01*
+X250500D01*
+X251250Y134750D01*
+Y133250D01*
+X250500Y132500D02*X251250Y133250D01*
+X249000Y132500D02*X250500D01*
+X248250Y133250D02*X249000Y132500D01*
+X253800Y138500D02*Y133250D01*
+X254550Y132500D01*
+X253050Y136250D02*X254550D01*
+X258300Y135500D02*X259050Y134750D01*
+X256800Y135500D02*X258300D01*
+X256050Y134750D02*X256800Y135500D01*
+X256050Y134750D02*Y133250D01*
+X256800Y132500D01*
+X259050Y135500D02*Y133250D01*
+X259800Y132500D01*
+X256800D02*X258300D01*
+X259050Y133250D01*
+X261600Y138500D02*Y133250D01*
+X262350Y132500D01*
+G54D25*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D23*X200000Y63500D02*Y57500D01*
+Y63500D02*X202250Y60500D01*
+X204500Y63500D01*
+Y57500D01*
+X208550Y60500D02*X209300Y59750D01*
+X207050Y60500D02*X208550D01*
+X206300Y59750D02*X207050Y60500D01*
+X206300Y59750D02*Y58250D01*
+X207050Y57500D01*
+X209300Y60500D02*Y58250D01*
+X210050Y57500D01*
+X207050D02*X208550D01*
+X209300Y58250D01*
+X211850Y60500D02*X214850Y57500D01*
+X211850D02*X214850Y60500D01*
+G54D24*X216650Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X218900Y59750D02*Y57500D01*
+Y59750D02*X219650Y60500D01*
+X220400D01*
+X221150Y59750D01*
+Y57500D01*
+Y59750D02*X221900Y60500D01*
+X222650D01*
+X223400Y59750D01*
+Y57500D01*
+X218150Y60500D02*X218900Y59750D01*
+X225200Y60500D02*Y58250D01*
+X225950Y57500D01*
+X227450D01*
+X228200Y58250D01*
+Y60500D02*Y58250D01*
+X230750Y59750D02*Y57500D01*
+Y59750D02*X231500Y60500D01*
+X232250D01*
+X233000Y59750D01*
+Y57500D01*
+Y59750D02*X233750Y60500D01*
+X234500D01*
+X235250Y59750D01*
+Y57500D01*
+X230000Y60500D02*X230750Y59750D01*
+X240500Y63500D02*Y57500D01*
+X242450Y63500D02*X243500Y62450D01*
+Y58550D01*
+X242450Y57500D02*X243500Y58550D01*
+X239750Y57500D02*X242450D01*
+X239750Y63500D02*X242450D01*
+G54D24*X245300Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X247550Y59750D02*Y57500D01*
+Y59750D02*X248300Y60500D01*
+X249050D01*
+X249800Y59750D01*
+Y57500D01*
+Y59750D02*X250550Y60500D01*
+X251300D01*
+X252050Y59750D01*
+Y57500D01*
+X246800Y60500D02*X247550Y59750D01*
+X254600Y57500D02*X256850D01*
+X253850Y58250D02*X254600Y57500D01*
+X253850Y59750D02*Y58250D01*
+Y59750D02*X254600Y60500D01*
+X256100D01*
+X256850Y59750D01*
+X253850Y59000D02*X256850D01*
+Y59750D02*Y59000D01*
+X259400Y59750D02*Y57500D01*
+Y59750D02*X260150Y60500D01*
+X260900D01*
+X261650Y59750D01*
+Y57500D01*
+X258650Y60500D02*X259400Y59750D01*
+X264200Y57500D02*X266450D01*
+X267200Y58250D01*
+X266450Y59000D02*X267200Y58250D01*
+X264200Y59000D02*X266450D01*
+X263450Y59750D02*X264200Y59000D01*
+X263450Y59750D02*X264200Y60500D01*
+X266450D01*
+X267200Y59750D01*
+X263450Y58250D02*X264200Y57500D01*
+G54D24*X269000Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X270500Y59750D02*Y58250D01*
+Y59750D02*X271250Y60500D01*
+X272750D01*
+X273500Y59750D01*
+Y58250D01*
+X272750Y57500D02*X273500Y58250D01*
+X271250Y57500D02*X272750D01*
+X270500Y58250D02*X271250Y57500D01*
+X276050Y59750D02*Y57500D01*
+Y59750D02*X276800Y60500D01*
+X277550D01*
+X278300Y59750D01*
+Y57500D01*
+X275300Y60500D02*X276050Y59750D01*
+X280850Y57500D02*X283100D01*
+X283850Y58250D01*
+X283100Y59000D02*X283850Y58250D01*
+X280850Y59000D02*X283100D01*
+X280100Y59750D02*X280850Y59000D01*
+X280100Y59750D02*X280850Y60500D01*
+X283100D01*
+X283850Y59750D01*
+X280100Y58250D02*X280850Y57500D01*
+X285650Y61250D02*X286400D01*
+X285650Y59750D02*X286400D01*
+X290900Y63500D02*X293900D01*
+X290900D02*Y60500D01*
+X291650Y61250D01*
+X293150D01*
+X293900Y60500D01*
+Y58250D01*
+X293150Y57500D02*X293900Y58250D01*
+X291650Y57500D02*X293150D01*
+X290900Y58250D02*X291650Y57500D01*
+X295700Y58250D02*X296450Y57500D01*
+X295700Y62750D02*Y58250D01*
+Y62750D02*X296450Y63500D01*
+X297950D01*
+X298700Y62750D01*
+Y58250D01*
+X297950Y57500D02*X298700Y58250D01*
+X296450Y57500D02*X297950D01*
+X295700Y59000D02*X298700Y62000D01*
+X300500Y58250D02*X301250Y57500D01*
+X300500Y62750D02*Y58250D01*
+Y62750D02*X301250Y63500D01*
+X302750D01*
+X303500Y62750D01*
+Y58250D01*
+X302750Y57500D02*X303500Y58250D01*
+X301250Y57500D02*X302750D01*
+X300500Y59000D02*X303500Y62000D01*
+X305300Y57500D02*X306050D01*
+X307850Y58250D02*X308600Y57500D01*
+X307850Y62750D02*Y58250D01*
+Y62750D02*X308600Y63500D01*
+X310100D01*
+X310850Y62750D01*
+Y58250D01*
+X310100Y57500D02*X310850Y58250D01*
+X308600Y57500D02*X310100D01*
+X307850Y59000D02*X310850Y62000D01*
+X312650Y58250D02*X313400Y57500D01*
+X312650Y62750D02*Y58250D01*
+Y62750D02*X313400Y63500D01*
+X314900D01*
+X315650Y62750D01*
+Y58250D01*
+X314900Y57500D02*X315650Y58250D01*
+X313400Y57500D02*X314900D01*
+X312650Y59000D02*X315650Y62000D01*
+X317450Y58250D02*X318200Y57500D01*
+X317450Y62750D02*Y58250D01*
+Y62750D02*X318200Y63500D01*
+X319700D01*
+X320450Y62750D01*
+Y58250D01*
+X319700Y57500D02*X320450Y58250D01*
+X318200Y57500D02*X319700D01*
+X317450Y59000D02*X320450Y62000D01*
+X322250Y58250D02*X323000Y57500D01*
+X322250Y62750D02*Y58250D01*
+Y62750D02*X323000Y63500D01*
+X324500D01*
+X325250Y62750D01*
+Y58250D01*
+X324500Y57500D02*X325250Y58250D01*
+X323000Y57500D02*X324500D01*
+X322250Y59000D02*X325250Y62000D01*
+X327050Y58250D02*X327800Y57500D01*
+X327050Y62750D02*Y58250D01*
+Y62750D02*X327800Y63500D01*
+X329300D01*
+X330050Y62750D01*
+Y58250D01*
+X329300Y57500D02*X330050Y58250D01*
+X327800Y57500D02*X329300D01*
+X327050Y59000D02*X330050Y62000D01*
+X331850Y58250D02*X332600Y57500D01*
+X331850Y62750D02*Y58250D01*
+Y62750D02*X332600Y63500D01*
+X334100D01*
+X334850Y62750D01*
+Y58250D01*
+X334100Y57500D02*X334850Y58250D01*
+X332600Y57500D02*X334100D01*
+X331850Y59000D02*X334850Y62000D01*
+X340100Y59750D02*Y57500D01*
+Y59750D02*X340850Y60500D01*
+X341600D01*
+X342350Y59750D01*
+Y57500D01*
+Y59750D02*X343100Y60500D01*
+X343850D01*
+X344600Y59750D01*
+Y57500D01*
+X339350Y60500D02*X340100Y59750D01*
+G54D24*X346400Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X347900Y63500D02*Y58250D01*
+X348650Y57500D01*
+X350900D02*X353150D01*
+X353900Y58250D01*
+X353150Y59000D02*X353900Y58250D01*
+X350900Y59000D02*X353150D01*
+X350150Y59750D02*X350900Y59000D01*
+X350150Y59750D02*X350900Y60500D01*
+X353150D01*
+X353900Y59750D01*
+X350150Y58250D02*X350900Y57500D01*
+X358400Y60500D02*Y58250D01*
+X359150Y57500D01*
+X359900D01*
+X360650Y58250D01*
+Y60500D02*Y58250D01*
+X361400Y57500D01*
+X362150D01*
+X362900Y58250D01*
+Y60500D02*Y58250D01*
+G54D24*X364700Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X369200Y63500D02*Y57500D01*
+X368450D02*X369200Y58250D01*
+X366950Y57500D02*X368450D01*
+X366200Y58250D02*X366950Y57500D01*
+X366200Y59750D02*Y58250D01*
+Y59750D02*X366950Y60500D01*
+X368450D01*
+X369200Y59750D01*
+X371750Y57500D02*X374000D01*
+X371000Y58250D02*X371750Y57500D01*
+X371000Y59750D02*Y58250D01*
+Y59750D02*X371750Y60500D01*
+X373250D01*
+X374000Y59750D01*
+X371000Y59000D02*X374000D01*
+Y59750D02*Y59000D01*
+X375800Y56000D02*X377300Y57500D01*
+X381800Y63500D02*X384800D01*
+X381800D02*Y60500D01*
+X382550Y61250D01*
+X384050D01*
+X384800Y60500D01*
+Y58250D01*
+X384050Y57500D02*X384800Y58250D01*
+X382550Y57500D02*X384050D01*
+X381800Y58250D02*X382550Y57500D01*
+X386600Y58250D02*X387350Y57500D01*
+X386600Y62750D02*Y58250D01*
+Y62750D02*X387350Y63500D01*
+X388850D01*
+X389600Y62750D01*
+Y58250D01*
+X388850Y57500D02*X389600Y58250D01*
+X387350Y57500D02*X388850D01*
+X386600Y59000D02*X389600Y62000D01*
+X391400Y58250D02*X392150Y57500D01*
+X391400Y62750D02*Y58250D01*
+Y62750D02*X392150Y63500D01*
+X393650D01*
+X394400Y62750D01*
+Y58250D01*
+X393650Y57500D02*X394400Y58250D01*
+X392150Y57500D02*X393650D01*
+X391400Y59000D02*X394400Y62000D01*
+X396200Y57500D02*X396950D01*
+X398750Y58250D02*X399500Y57500D01*
+X398750Y62750D02*Y58250D01*
+Y62750D02*X399500Y63500D01*
+X401000D01*
+X401750Y62750D01*
+Y58250D01*
+X401000Y57500D02*X401750Y58250D01*
+X399500Y57500D02*X401000D01*
+X398750Y59000D02*X401750Y62000D01*
+X403550Y58250D02*X404300Y57500D01*
+X403550Y62750D02*Y58250D01*
+Y62750D02*X404300Y63500D01*
+X405800D01*
+X406550Y62750D01*
+Y58250D01*
+X405800Y57500D02*X406550Y58250D01*
+X404300Y57500D02*X405800D01*
+X403550Y59000D02*X406550Y62000D01*
+X408350Y58250D02*X409100Y57500D01*
+X408350Y62750D02*Y58250D01*
+Y62750D02*X409100Y63500D01*
+X410600D01*
+X411350Y62750D01*
+Y58250D01*
+X410600Y57500D02*X411350Y58250D01*
+X409100Y57500D02*X410600D01*
+X408350Y59000D02*X411350Y62000D01*
+X413150Y58250D02*X413900Y57500D01*
+X413150Y62750D02*Y58250D01*
+Y62750D02*X413900Y63500D01*
+X415400D01*
+X416150Y62750D01*
+Y58250D01*
+X415400Y57500D02*X416150Y58250D01*
+X413900Y57500D02*X415400D01*
+X413150Y59000D02*X416150Y62000D01*
+X417950Y58250D02*X418700Y57500D01*
+X417950Y62750D02*Y58250D01*
+Y62750D02*X418700Y63500D01*
+X420200D01*
+X420950Y62750D01*
+Y58250D01*
+X420200Y57500D02*X420950Y58250D01*
+X418700Y57500D02*X420200D01*
+X417950Y59000D02*X420950Y62000D01*
+X422750Y58250D02*X423500Y57500D01*
+X422750Y62750D02*Y58250D01*
+Y62750D02*X423500Y63500D01*
+X425000D01*
+X425750Y62750D01*
+Y58250D01*
+X425000Y57500D02*X425750Y58250D01*
+X423500Y57500D02*X425000D01*
+X422750Y59000D02*X425750Y62000D01*
+X431000Y59750D02*Y57500D01*
+Y59750D02*X431750Y60500D01*
+X432500D01*
+X433250Y59750D01*
+Y57500D01*
+Y59750D02*X434000Y60500D01*
+X434750D01*
+X435500Y59750D01*
+Y57500D01*
+X430250Y60500D02*X431000Y59750D01*
+G54D24*X437300Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X438800Y63500D02*Y58250D01*
+X439550Y57500D01*
+X441800D02*X444050D01*
+X444800Y58250D01*
+X444050Y59000D02*X444800Y58250D01*
+X441800Y59000D02*X444050D01*
+X441050Y59750D02*X441800Y59000D01*
+X441050Y59750D02*X441800Y60500D01*
+X444050D01*
+X444800Y59750D01*
+X441050Y58250D02*X441800Y57500D01*
+X449300Y63500D02*Y57500D01*
+Y59750D02*X450050Y60500D01*
+X451550D01*
+X452300Y59750D01*
+Y57500D01*
+G54D24*X454100Y62000D02*Y61850D01*
+G54D23*Y59750D02*Y57500D01*
+X457850Y60500D02*X458600Y59750D01*
+X456350Y60500D02*X457850D01*
+X455600Y59750D02*X456350Y60500D01*
+X455600Y59750D02*Y58250D01*
+X456350Y57500D01*
+X457850D01*
+X458600Y58250D01*
+X455600Y56000D02*X456350Y55250D01*
+X457850D01*
+X458600Y56000D01*
+Y60500D02*Y56000D01*
+X460400Y63500D02*Y57500D01*
+Y59750D02*X461150Y60500D01*
+X462650D01*
+X463400Y59750D01*
+Y57500D01*
+X0Y-9500D02*X3000D01*
+X3750Y-8750D01*
+Y-6950D02*Y-8750D01*
+X3000Y-6200D02*X3750Y-6950D01*
+X750Y-6200D02*X3000D01*
+X750Y-3500D02*Y-9500D01*
+X0Y-3500D02*X3000D01*
+X3750Y-4250D01*
+Y-5450D01*
+X3000Y-6200D02*X3750Y-5450D01*
+X5550Y-7250D02*Y-8750D01*
+Y-7250D02*X6300Y-6500D01*
+X7800D01*
+X8550Y-7250D01*
+Y-8750D01*
+X7800Y-9500D02*X8550Y-8750D01*
+X6300Y-9500D02*X7800D01*
+X5550Y-8750D02*X6300Y-9500D01*
+X12600Y-6500D02*X13350Y-7250D01*
+X11100Y-6500D02*X12600D01*
+X10350Y-7250D02*X11100Y-6500D01*
+X10350Y-7250D02*Y-8750D01*
+X11100Y-9500D01*
+X13350Y-6500D02*Y-8750D01*
+X14100Y-9500D01*
+X11100D02*X12600D01*
+X13350Y-8750D01*
+X16650Y-7250D02*Y-9500D01*
+Y-7250D02*X17400Y-6500D01*
+X18900D01*
+X15900D02*X16650Y-7250D01*
+X23700Y-3500D02*Y-9500D01*
+X22950D02*X23700Y-8750D01*
+X21450Y-9500D02*X22950D01*
+X20700Y-8750D02*X21450Y-9500D01*
+X20700Y-7250D02*Y-8750D01*
+Y-7250D02*X21450Y-6500D01*
+X22950D01*
+X23700Y-7250D01*
+X28200D02*Y-8750D01*
+Y-7250D02*X28950Y-6500D01*
+X30450D01*
+X31200Y-7250D01*
+Y-8750D01*
+X30450Y-9500D02*X31200Y-8750D01*
+X28950Y-9500D02*X30450D01*
+X28200Y-8750D02*X28950Y-9500D01*
+X33000Y-6500D02*Y-8750D01*
+X33750Y-9500D01*
+X35250D01*
+X36000Y-8750D01*
+Y-6500D02*Y-8750D01*
+X38550Y-3500D02*Y-8750D01*
+X39300Y-9500D01*
+X37800Y-5750D02*X39300D01*
+X40800Y-3500D02*Y-8750D01*
+X41550Y-9500D01*
+G54D24*X43050Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X45300Y-7250D02*Y-9500D01*
+Y-7250D02*X46050Y-6500D01*
+X46800D01*
+X47550Y-7250D01*
+Y-9500D01*
+X44550Y-6500D02*X45300Y-7250D01*
+X50100Y-9500D02*X52350D01*
+X49350Y-8750D02*X50100Y-9500D01*
+X49350Y-7250D02*Y-8750D01*
+Y-7250D02*X50100Y-6500D01*
+X51600D01*
+X52350Y-7250D01*
+X49350Y-8000D02*X52350D01*
+Y-7250D02*Y-8000D01*
+G54D24*X56850Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X59100D02*X61350D01*
+X62100Y-8750D01*
+X61350Y-8000D02*X62100Y-8750D01*
+X59100Y-8000D02*X61350D01*
+X58350Y-7250D02*X59100Y-8000D01*
+X58350Y-7250D02*X59100Y-6500D01*
+X61350D01*
+X62100Y-7250D01*
+X58350Y-8750D02*X59100Y-9500D01*
+X67350Y-3500D02*Y-8750D01*
+X68100Y-9500D01*
+X66600Y-5750D02*X68100D01*
+X69600Y-3500D02*Y-9500D01*
+Y-7250D02*X70350Y-6500D01*
+X71850D01*
+X72600Y-7250D01*
+Y-9500D01*
+X75150D02*X77400D01*
+X74400Y-8750D02*X75150Y-9500D01*
+X74400Y-7250D02*Y-8750D01*
+Y-7250D02*X75150Y-6500D01*
+X76650D01*
+X77400Y-7250D01*
+X74400Y-8000D02*X77400D01*
+Y-7250D02*Y-8000D01*
+X82650Y-6500D02*X84900D01*
+X81900Y-7250D02*X82650Y-6500D01*
+X81900Y-7250D02*Y-8750D01*
+X82650Y-9500D01*
+X84900D01*
+X87450D02*X89700D01*
+X86700Y-8750D02*X87450Y-9500D01*
+X86700Y-7250D02*Y-8750D01*
+Y-7250D02*X87450Y-6500D01*
+X88950D01*
+X89700Y-7250D01*
+X86700Y-8000D02*X89700D01*
+Y-7250D02*Y-8000D01*
+X92250Y-7250D02*Y-9500D01*
+Y-7250D02*X93000Y-6500D01*
+X93750D01*
+X94500Y-7250D01*
+Y-9500D01*
+X91500Y-6500D02*X92250Y-7250D01*
+X97050Y-3500D02*Y-8750D01*
+X97800Y-9500D01*
+X96300Y-5750D02*X97800D01*
+X100050Y-9500D02*X102300D01*
+X99300Y-8750D02*X100050Y-9500D01*
+X99300Y-7250D02*Y-8750D01*
+Y-7250D02*X100050Y-6500D01*
+X101550D01*
+X102300Y-7250D01*
+X99300Y-8000D02*X102300D01*
+Y-7250D02*Y-8000D01*
+X104850Y-7250D02*Y-9500D01*
+Y-7250D02*X105600Y-6500D01*
+X107100D01*
+X104100D02*X104850Y-7250D01*
+X108900Y-3500D02*Y-8750D01*
+X109650Y-9500D01*
+G54D24*X111150Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X113400Y-7250D02*Y-9500D01*
+Y-7250D02*X114150Y-6500D01*
+X114900D01*
+X115650Y-7250D01*
+Y-9500D01*
+X112650Y-6500D02*X113400Y-7250D01*
+X118200Y-9500D02*X120450D01*
+X117450Y-8750D02*X118200Y-9500D01*
+X117450Y-7250D02*Y-8750D01*
+Y-7250D02*X118200Y-6500D01*
+X119700D01*
+X120450Y-7250D01*
+X117450Y-8000D02*X120450D01*
+Y-7250D02*Y-8000D01*
+X124950Y-7250D02*Y-8750D01*
+Y-7250D02*X125700Y-6500D01*
+X127200D01*
+X127950Y-7250D01*
+Y-8750D01*
+X127200Y-9500D02*X127950Y-8750D01*
+X125700Y-9500D02*X127200D01*
+X124950Y-8750D02*X125700Y-9500D01*
+X130500Y-4250D02*Y-9500D01*
+Y-4250D02*X131250Y-3500D01*
+X132000D01*
+X129750Y-6500D02*X131250D01*
+X136950Y-3500D02*Y-8750D01*
+X137700Y-9500D01*
+X136200Y-5750D02*X137700D01*
+X139200Y-3500D02*Y-9500D01*
+Y-7250D02*X139950Y-6500D01*
+X141450D01*
+X142200Y-7250D01*
+Y-9500D01*
+G54D24*X144000Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X146250D02*X148500D01*
+X149250Y-8750D01*
+X148500Y-8000D02*X149250Y-8750D01*
+X146250Y-8000D02*X148500D01*
+X145500Y-7250D02*X146250Y-8000D01*
+X145500Y-7250D02*X146250Y-6500D01*
+X148500D01*
+X149250Y-7250D01*
+X145500Y-8750D02*X146250Y-9500D01*
+X153750Y-8750D02*X154500Y-9500D01*
+X153750Y-7550D02*Y-8750D01*
+Y-7550D02*X154800Y-6500D01*
+X155700D01*
+X156750Y-7550D01*
+Y-8750D01*
+X156000Y-9500D02*X156750Y-8750D01*
+X154500Y-9500D02*X156000D01*
+X153750Y-5450D02*X154800Y-6500D01*
+X153750Y-4250D02*Y-5450D01*
+Y-4250D02*X154500Y-3500D01*
+X156000D01*
+X156750Y-4250D01*
+Y-5450D01*
+X155700Y-6500D02*X156750Y-5450D01*
+X158550Y-9500D02*X159300D01*
+X161100Y-8750D02*X161850Y-9500D01*
+X161100Y-4250D02*Y-8750D01*
+Y-4250D02*X161850Y-3500D01*
+X163350D01*
+X164100Y-4250D01*
+Y-8750D01*
+X163350Y-9500D02*X164100Y-8750D01*
+X161850Y-9500D02*X163350D01*
+X161100Y-8000D02*X164100Y-5000D01*
+X165900Y-8750D02*X166650Y-9500D01*
+X165900Y-4250D02*Y-8750D01*
+Y-4250D02*X166650Y-3500D01*
+X168150D01*
+X168900Y-4250D01*
+Y-8750D01*
+X168150Y-9500D02*X168900Y-8750D01*
+X166650Y-9500D02*X168150D01*
+X165900Y-8000D02*X168900Y-5000D01*
+X170700Y-8750D02*X171450Y-9500D01*
+X170700Y-4250D02*Y-8750D01*
+Y-4250D02*X171450Y-3500D01*
+X172950D01*
+X173700Y-4250D01*
+Y-8750D01*
+X172950Y-9500D02*X173700Y-8750D01*
+X171450Y-9500D02*X172950D01*
+X170700Y-8000D02*X173700Y-5000D01*
+X175500Y-8750D02*X176250Y-9500D01*
+X175500Y-4250D02*Y-8750D01*
+Y-4250D02*X176250Y-3500D01*
+X177750D01*
+X178500Y-4250D01*
+Y-8750D01*
+X177750Y-9500D02*X178500Y-8750D01*
+X176250Y-9500D02*X177750D01*
+X175500Y-8000D02*X178500Y-5000D01*
+X180300Y-8750D02*X181050Y-9500D01*
+X180300Y-4250D02*Y-8750D01*
+Y-4250D02*X181050Y-3500D01*
+X182550D01*
+X183300Y-4250D01*
+Y-8750D01*
+X182550Y-9500D02*X183300Y-8750D01*
+X181050Y-9500D02*X182550D01*
+X180300Y-8000D02*X183300Y-5000D01*
+X185100Y-8750D02*X185850Y-9500D01*
+X185100Y-4250D02*Y-8750D01*
+Y-4250D02*X185850Y-3500D01*
+X187350D01*
+X188100Y-4250D01*
+Y-8750D01*
+X187350Y-9500D02*X188100Y-8750D01*
+X185850Y-9500D02*X187350D01*
+X185100Y-8000D02*X188100Y-5000D01*
+X193350Y-7250D02*Y-9500D01*
+Y-7250D02*X194100Y-6500D01*
+X194850D01*
+X195600Y-7250D01*
+Y-9500D01*
+Y-7250D02*X196350Y-6500D01*
+X197100D01*
+X197850Y-7250D01*
+Y-9500D01*
+X192600Y-6500D02*X193350Y-7250D01*
+G54D24*X199650Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X201150Y-3500D02*Y-8750D01*
+X201900Y-9500D01*
+X206850Y-7250D02*Y-9500D01*
+Y-7250D02*X207600Y-6500D01*
+X209100D01*
+X206100D02*X206850Y-7250D01*
+X211650Y-9500D02*X213900D01*
+X210900Y-8750D02*X211650Y-9500D01*
+X210900Y-7250D02*Y-8750D01*
+Y-7250D02*X211650Y-6500D01*
+X213150D01*
+X213900Y-7250D01*
+X210900Y-8000D02*X213900D01*
+Y-7250D02*Y-8000D01*
+X216450Y-6500D02*X218700D01*
+X215700Y-7250D02*X216450Y-6500D01*
+X215700Y-7250D02*Y-8750D01*
+X216450Y-9500D01*
+X218700D01*
+X221250Y-3500D02*Y-8750D01*
+X222000Y-9500D01*
+X220500Y-5750D02*X222000D01*
+X225750Y-6500D02*X226500Y-7250D01*
+X224250Y-6500D02*X225750D01*
+X223500Y-7250D02*X224250Y-6500D01*
+X223500Y-7250D02*Y-8750D01*
+X224250Y-9500D01*
+X226500Y-6500D02*Y-8750D01*
+X227250Y-9500D01*
+X224250D02*X225750D01*
+X226500Y-8750D01*
+X229800Y-7250D02*Y-9500D01*
+Y-7250D02*X230550Y-6500D01*
+X231300D01*
+X232050Y-7250D01*
+Y-9500D01*
+X229050Y-6500D02*X229800Y-7250D01*
+X236100Y-6500D02*X236850Y-7250D01*
+X234600Y-6500D02*X236100D01*
+X233850Y-7250D02*X234600Y-6500D01*
+X233850Y-7250D02*Y-8750D01*
+X234600Y-9500D01*
+X236100D01*
+X236850Y-8750D01*
+X233850Y-11000D02*X234600Y-11750D01*
+X236100D01*
+X236850Y-11000D01*
+Y-6500D02*Y-11000D01*
+X238650Y-3500D02*Y-8750D01*
+X239400Y-9500D01*
+X241650D02*X243900D01*
+X240900Y-8750D02*X241650Y-9500D01*
+X240900Y-7250D02*Y-8750D01*
+Y-7250D02*X241650Y-6500D01*
+X243150D01*
+X243900Y-7250D01*
+X240900Y-8000D02*X243900D01*
+Y-7250D02*Y-8000D01*
+X248400Y-6500D02*X251400D01*
+X255900Y-8750D02*X256650Y-9500D01*
+X255900Y-4250D02*Y-8750D01*
+Y-4250D02*X256650Y-3500D01*
+X258150D01*
+X258900Y-4250D01*
+Y-8750D01*
+X258150Y-9500D02*X258900Y-8750D01*
+X256650Y-9500D02*X258150D01*
+X255900Y-8000D02*X258900Y-5000D01*
+X260700Y-11000D02*X262200Y-9500D01*
+X264000Y-8750D02*X264750Y-9500D01*
+X264000Y-4250D02*Y-8750D01*
+Y-4250D02*X264750Y-3500D01*
+X266250D01*
+X267000Y-4250D01*
+Y-8750D01*
+X266250Y-9500D02*X267000Y-8750D01*
+X264750Y-9500D02*X266250D01*
+X264000Y-8000D02*X267000Y-5000D01*
+X272250Y-3500D02*Y-8750D01*
+X273000Y-9500D01*
+X271500Y-5750D02*X273000D01*
+X274500Y-7250D02*Y-8750D01*
+Y-7250D02*X275250Y-6500D01*
+X276750D01*
+X277500Y-7250D01*
+Y-8750D01*
+X276750Y-9500D02*X277500Y-8750D01*
+X275250Y-9500D02*X276750D01*
+X274500Y-8750D02*X275250Y-9500D01*
+X282000Y-3500D02*X285000D01*
+X282000D02*Y-6500D01*
+X282750Y-5750D01*
+X284250D01*
+X285000Y-6500D01*
+Y-8750D01*
+X284250Y-9500D02*X285000Y-8750D01*
+X282750Y-9500D02*X284250D01*
+X282000Y-8750D02*X282750Y-9500D01*
+X286800Y-8750D02*X287550Y-9500D01*
+X286800Y-4250D02*Y-8750D01*
+Y-4250D02*X287550Y-3500D01*
+X289050D01*
+X289800Y-4250D01*
+Y-8750D01*
+X289050Y-9500D02*X289800Y-8750D01*
+X287550Y-9500D02*X289050D01*
+X286800Y-8000D02*X289800Y-5000D01*
+X291600Y-8750D02*X292350Y-9500D01*
+X291600Y-4250D02*Y-8750D01*
+Y-4250D02*X292350Y-3500D01*
+X293850D01*
+X294600Y-4250D01*
+Y-8750D01*
+X293850Y-9500D02*X294600Y-8750D01*
+X292350Y-9500D02*X293850D01*
+X291600Y-8000D02*X294600Y-5000D01*
+X296400Y-9500D02*X297150D01*
+X298950Y-8750D02*X299700Y-9500D01*
+X298950Y-4250D02*Y-8750D01*
+Y-4250D02*X299700Y-3500D01*
+X301200D01*
+X301950Y-4250D01*
+Y-8750D01*
+X301200Y-9500D02*X301950Y-8750D01*
+X299700Y-9500D02*X301200D01*
+X298950Y-8000D02*X301950Y-5000D01*
+X303750Y-8750D02*X304500Y-9500D01*
+X303750Y-4250D02*Y-8750D01*
+Y-4250D02*X304500Y-3500D01*
+X306000D01*
+X306750Y-4250D01*
+Y-8750D01*
+X306000Y-9500D02*X306750Y-8750D01*
+X304500Y-9500D02*X306000D01*
+X303750Y-8000D02*X306750Y-5000D01*
+X308550Y-8750D02*X309300Y-9500D01*
+X308550Y-4250D02*Y-8750D01*
+Y-4250D02*X309300Y-3500D01*
+X310800D01*
+X311550Y-4250D01*
+Y-8750D01*
+X310800Y-9500D02*X311550Y-8750D01*
+X309300Y-9500D02*X310800D01*
+X308550Y-8000D02*X311550Y-5000D01*
+X313350Y-8750D02*X314100Y-9500D01*
+X313350Y-4250D02*Y-8750D01*
+Y-4250D02*X314100Y-3500D01*
+X315600D01*
+X316350Y-4250D01*
+Y-8750D01*
+X315600Y-9500D02*X316350Y-8750D01*
+X314100Y-9500D02*X315600D01*
+X313350Y-8000D02*X316350Y-5000D01*
+X318150Y-8750D02*X318900Y-9500D01*
+X318150Y-4250D02*Y-8750D01*
+Y-4250D02*X318900Y-3500D01*
+X320400D01*
+X321150Y-4250D01*
+Y-8750D01*
+X320400Y-9500D02*X321150Y-8750D01*
+X318900Y-9500D02*X320400D01*
+X318150Y-8000D02*X321150Y-5000D01*
+X322950Y-8750D02*X323700Y-9500D01*
+X322950Y-4250D02*Y-8750D01*
+Y-4250D02*X323700Y-3500D01*
+X325200D01*
+X325950Y-4250D01*
+Y-8750D01*
+X325200Y-9500D02*X325950Y-8750D01*
+X323700Y-9500D02*X325200D01*
+X322950Y-8000D02*X325950Y-5000D01*
+X327750Y-11000D02*X329250Y-9500D01*
+X331050Y-3500D02*X334050D01*
+X331050D02*Y-6500D01*
+X331800Y-5750D01*
+X333300D01*
+X334050Y-6500D01*
+Y-8750D01*
+X333300Y-9500D02*X334050Y-8750D01*
+X331800Y-9500D02*X333300D01*
+X331050Y-8750D02*X331800Y-9500D01*
+X335850Y-8750D02*X336600Y-9500D01*
+X335850Y-4250D02*Y-8750D01*
+Y-4250D02*X336600Y-3500D01*
+X338100D01*
+X338850Y-4250D01*
+Y-8750D01*
+X338100Y-9500D02*X338850Y-8750D01*
+X336600Y-9500D02*X338100D01*
+X335850Y-8000D02*X338850Y-5000D01*
+X340650Y-8750D02*X341400Y-9500D01*
+X340650Y-4250D02*Y-8750D01*
+Y-4250D02*X341400Y-3500D01*
+X342900D01*
+X343650Y-4250D01*
+Y-8750D01*
+X342900Y-9500D02*X343650Y-8750D01*
+X341400Y-9500D02*X342900D01*
+X340650Y-8000D02*X343650Y-5000D01*
+X345450Y-9500D02*X346200D01*
+X348000Y-8750D02*X348750Y-9500D01*
+X348000Y-4250D02*Y-8750D01*
+Y-4250D02*X348750Y-3500D01*
+X350250D01*
+X351000Y-4250D01*
+Y-8750D01*
+X350250Y-9500D02*X351000Y-8750D01*
+X348750Y-9500D02*X350250D01*
+X348000Y-8000D02*X351000Y-5000D01*
+X352800Y-8750D02*X353550Y-9500D01*
+X352800Y-4250D02*Y-8750D01*
+Y-4250D02*X353550Y-3500D01*
+X355050D01*
+X355800Y-4250D01*
+Y-8750D01*
+X355050Y-9500D02*X355800Y-8750D01*
+X353550Y-9500D02*X355050D01*
+X352800Y-8000D02*X355800Y-5000D01*
+X357600Y-8750D02*X358350Y-9500D01*
+X357600Y-4250D02*Y-8750D01*
+Y-4250D02*X358350Y-3500D01*
+X359850D01*
+X360600Y-4250D01*
+Y-8750D01*
+X359850Y-9500D02*X360600Y-8750D01*
+X358350Y-9500D02*X359850D01*
+X357600Y-8000D02*X360600Y-5000D01*
+X362400Y-8750D02*X363150Y-9500D01*
+X362400Y-4250D02*Y-8750D01*
+Y-4250D02*X363150Y-3500D01*
+X364650D01*
+X365400Y-4250D01*
+Y-8750D01*
+X364650Y-9500D02*X365400Y-8750D01*
+X363150Y-9500D02*X364650D01*
+X362400Y-8000D02*X365400Y-5000D01*
+X367200Y-8750D02*X367950Y-9500D01*
+X367200Y-4250D02*Y-8750D01*
+Y-4250D02*X367950Y-3500D01*
+X369450D01*
+X370200Y-4250D01*
+Y-8750D01*
+X369450Y-9500D02*X370200Y-8750D01*
+X367950Y-9500D02*X369450D01*
+X367200Y-8000D02*X370200Y-5000D01*
+X372000Y-8750D02*X372750Y-9500D01*
+X372000Y-4250D02*Y-8750D01*
+Y-4250D02*X372750Y-3500D01*
+X374250D01*
+X375000Y-4250D01*
+Y-8750D01*
+X374250Y-9500D02*X375000Y-8750D01*
+X372750Y-9500D02*X374250D01*
+X372000Y-8000D02*X375000Y-5000D01*
+X380250Y-7250D02*Y-9500D01*
+Y-7250D02*X381000Y-6500D01*
+X381750D01*
+X382500Y-7250D01*
+Y-9500D01*
+Y-7250D02*X383250Y-6500D01*
+X384000D01*
+X384750Y-7250D01*
+Y-9500D01*
+X379500Y-6500D02*X380250Y-7250D01*
+G54D24*X386550Y-5000D02*Y-5150D01*
+G54D23*Y-7250D02*Y-9500D01*
+X388050Y-3500D02*Y-8750D01*
+X388800Y-9500D01*
+X391050D02*X393300D01*
+X394050Y-8750D01*
+X393300Y-8000D02*X394050Y-8750D01*
+X391050Y-8000D02*X393300D01*
+X390300Y-7250D02*X391050Y-8000D01*
+X390300Y-7250D02*X391050Y-6500D01*
+X393300D01*
+X394050Y-7250D01*
+X390300Y-8750D02*X391050Y-9500D01*
+X200750Y78500D02*Y72500D01*
+X202700Y78500D02*X203750Y77450D01*
+Y73550D01*
+X202700Y72500D02*X203750Y73550D01*
+X200000Y72500D02*X202700D01*
+X200000Y78500D02*X202700D01*
+X207800Y75500D02*X208550Y74750D01*
+X206300Y75500D02*X207800D01*
+X205550Y74750D02*X206300Y75500D01*
+X205550Y74750D02*Y73250D01*
+X206300Y72500D01*
+X208550Y75500D02*Y73250D01*
+X209300Y72500D01*
+X206300D02*X207800D01*
+X208550Y73250D01*
+X211850Y78500D02*Y73250D01*
+X212600Y72500D01*
+X211100Y76250D02*X212600D01*
+X214850Y72500D02*X217100D01*
+X214100Y73250D02*X214850Y72500D01*
+X214100Y74750D02*Y73250D01*
+Y74750D02*X214850Y75500D01*
+X216350D01*
+X217100Y74750D01*
+X214100Y74000D02*X217100D01*
+Y74750D02*Y74000D01*
+X218900Y76250D02*X219650D01*
+X218900Y74750D02*X219650D01*
+X224150Y75500D02*X225650Y77000D01*
+X224150Y75500D02*X225650Y74000D01*
+X230450Y78500D02*Y72500D01*
+X229700D02*X230450Y73250D01*
+X228200Y72500D02*X229700D01*
+X227450Y73250D02*X228200Y72500D01*
+X227450Y74750D02*Y73250D01*
+Y74750D02*X228200Y75500D01*
+X229700D01*
+X230450Y74750D01*
+X234500Y75500D02*X235250Y74750D01*
+X233000Y75500D02*X234500D01*
+X232250Y74750D02*X233000Y75500D01*
+X232250Y74750D02*Y73250D01*
+X233000Y72500D01*
+X235250Y75500D02*Y73250D01*
+X236000Y72500D01*
+X233000D02*X234500D01*
+X235250Y73250D01*
+X238550Y78500D02*Y73250D01*
+X239300Y72500D01*
+X237800Y76250D02*X239300D01*
+X241550Y72500D02*X243800D01*
+X240800Y73250D02*X241550Y72500D01*
+X240800Y74750D02*Y73250D01*
+Y74750D02*X241550Y75500D01*
+X243050D01*
+X243800Y74750D01*
+X240800Y74000D02*X243800D01*
+Y74750D02*Y74000D01*
+X245600Y77000D02*X247100Y75500D01*
+X245600Y74000D02*X247100Y75500D01*
+X200000Y92000D02*Y87500D01*
+Y92000D02*X201050Y93500D01*
+X202700D01*
+X203750Y92000D01*
+Y87500D01*
+X200000Y90500D02*X203750D01*
+X205550D02*Y88250D01*
+X206300Y87500D01*
+X207800D01*
+X208550Y88250D01*
+Y90500D02*Y88250D01*
+X211100Y93500D02*Y88250D01*
+X211850Y87500D01*
+X210350Y91250D02*X211850D01*
+X213350Y93500D02*Y87500D01*
+Y89750D02*X214100Y90500D01*
+X215600D01*
+X216350Y89750D01*
+Y87500D01*
+X218150Y89750D02*Y88250D01*
+Y89750D02*X218900Y90500D01*
+X220400D01*
+X221150Y89750D01*
+Y88250D01*
+X220400Y87500D02*X221150Y88250D01*
+X218900Y87500D02*X220400D01*
+X218150Y88250D02*X218900Y87500D01*
+X223700Y89750D02*Y87500D01*
+Y89750D02*X224450Y90500D01*
+X225950D01*
+X222950D02*X223700Y89750D01*
+X227750Y91250D02*X228500D01*
+X227750Y89750D02*X228500D01*
+X233000Y93500D02*X236000D01*
+X234500D02*Y87500D01*
+X237800Y90800D02*X240050D01*
+X237800Y87500D02*X240800D01*
+X237800Y93500D02*Y87500D01*
+Y93500D02*X240800D01*
+X245600D02*X246350Y92750D01*
+X243350Y93500D02*X245600D01*
+X242600Y92750D02*X243350Y93500D01*
+X242600Y92750D02*Y91250D01*
+X243350Y90500D01*
+X245600D01*
+X246350Y89750D01*
+Y88250D01*
+X245600Y87500D02*X246350Y88250D01*
+X243350Y87500D02*X245600D01*
+X242600Y88250D02*X243350Y87500D01*
+X248150Y93500D02*X251150D01*
+X249650D02*Y87500D01*
+X200000Y108500D02*X203000D01*
+X201500D02*Y102500D01*
+G54D24*X204800Y107000D02*Y106850D01*
+G54D23*Y104750D02*Y102500D01*
+X207050Y108500D02*Y103250D01*
+X207800Y102500D01*
+X206300Y106250D02*X207800D01*
+X209300Y108500D02*Y103250D01*
+X210050Y102500D01*
+X212300D02*X214550D01*
+X211550Y103250D02*X212300Y102500D01*
+X211550Y104750D02*Y103250D01*
+Y104750D02*X212300Y105500D01*
+X213800D01*
+X214550Y104750D01*
+X211550Y104000D02*X214550D01*
+Y104750D02*Y104000D01*
+X216350Y106250D02*X217100D01*
+X216350Y104750D02*X217100D01*
+X222350Y108500D02*Y103250D01*
+X223100Y102500D01*
+X221600Y106250D02*X223100D01*
+X224600Y108500D02*Y102500D01*
+Y104750D02*X225350Y105500D01*
+X226850D01*
+X227600Y104750D01*
+Y102500D01*
+X230150D02*X232400D01*
+X229400Y103250D02*X230150Y102500D01*
+X229400Y104750D02*Y103250D01*
+Y104750D02*X230150Y105500D01*
+X231650D01*
+X232400Y104750D01*
+X229400Y104000D02*X232400D01*
+Y104750D02*Y104000D01*
+X234950Y104750D02*Y102500D01*
+Y104750D02*X235700Y105500D01*
+X237200D01*
+X234200D02*X234950Y104750D01*
+X239750D02*Y102500D01*
+Y104750D02*X240500Y105500D01*
+X241250D01*
+X242000Y104750D01*
+Y102500D01*
+Y104750D02*X242750Y105500D01*
+X243500D01*
+X244250Y104750D01*
+Y102500D01*
+X239000Y105500D02*X239750Y104750D01*
+X248300Y105500D02*X249050Y104750D01*
+X246800Y105500D02*X248300D01*
+X246050Y104750D02*X246800Y105500D01*
+X246050Y104750D02*Y103250D01*
+X246800Y102500D01*
+X249050Y105500D02*Y103250D01*
+X249800Y102500D01*
+X246800D02*X248300D01*
+X249050Y103250D01*
+X251600Y108500D02*Y103250D01*
+X252350Y102500D01*
+X254600D02*X256850D01*
+X257600Y103250D01*
+X256850Y104000D02*X257600Y103250D01*
+X254600Y104000D02*X256850D01*
+X253850Y104750D02*X254600Y104000D01*
+X253850Y104750D02*X254600Y105500D01*
+X256850D01*
+X257600Y104750D01*
+X253850Y103250D02*X254600Y102500D01*
+X262100Y104750D02*Y103250D01*
+Y104750D02*X262850Y105500D01*
+X264350D01*
+X265100Y104750D01*
+Y103250D01*
+X264350Y102500D02*X265100Y103250D01*
+X262850Y102500D02*X264350D01*
+X262100Y103250D02*X262850Y102500D01*
+X267650Y104750D02*Y102500D01*
+Y104750D02*X268400Y105500D01*
+X269150D01*
+X269900Y104750D01*
+Y102500D01*
+X266900Y105500D02*X267650Y104750D01*
+X275150Y108500D02*Y103250D01*
+X275900Y102500D01*
+X274400Y106250D02*X275900D01*
+X277400Y108500D02*Y102500D01*
+Y104750D02*X278150Y105500D01*
+X279650D01*
+X280400Y104750D01*
+Y102500D01*
+X282950D02*X285200D01*
+X282200Y103250D02*X282950Y102500D01*
+X282200Y104750D02*Y103250D01*
+Y104750D02*X282950Y105500D01*
+X284450D01*
+X285200Y104750D01*
+X282200Y104000D02*X285200D01*
+Y104750D02*Y104000D01*
+X289700Y108500D02*Y103250D01*
+X290450Y102500D01*
+X294200Y105500D02*X294950Y104750D01*
+X292700Y105500D02*X294200D01*
+X291950Y104750D02*X292700Y105500D01*
+X291950Y104750D02*Y103250D01*
+X292700Y102500D01*
+X294950Y105500D02*Y103250D01*
+X295700Y102500D01*
+X292700D02*X294200D01*
+X294950Y103250D01*
+X298250Y102500D02*X300500D01*
+X301250Y103250D01*
+X300500Y104000D02*X301250Y103250D01*
+X298250Y104000D02*X300500D01*
+X297500Y104750D02*X298250Y104000D01*
+X297500Y104750D02*X298250Y105500D01*
+X300500D01*
+X301250Y104750D01*
+X297500Y103250D02*X298250Y102500D01*
+X303800Y108500D02*Y103250D01*
+X304550Y102500D01*
+X303050Y106250D02*X304550D01*
+X308750Y107750D02*X309500Y108500D01*
+X311750D01*
+X312500Y107750D01*
+Y106250D01*
+X308750Y102500D02*X312500Y106250D01*
+X308750Y102500D02*X312500D01*
+X317000Y108500D02*Y103250D01*
+X317750Y102500D01*
+X321500Y105500D02*X322250Y104750D01*
+X320000Y105500D02*X321500D01*
+X319250Y104750D02*X320000Y105500D01*
+X319250Y104750D02*Y103250D01*
+X320000Y102500D01*
+X322250Y105500D02*Y103250D01*
+X323000Y102500D01*
+X320000D02*X321500D01*
+X322250Y103250D01*
+X324800Y105500D02*Y103250D01*
+X325550Y102500D01*
+X327800Y105500D02*Y101000D01*
+X327050Y100250D02*X327800Y101000D01*
+X325550Y100250D02*X327050D01*
+X324800Y101000D02*X325550Y100250D01*
+Y102500D02*X327050D01*
+X327800Y103250D01*
+X330350Y102500D02*X332600D01*
+X329600Y103250D02*X330350Y102500D01*
+X329600Y104750D02*Y103250D01*
+Y104750D02*X330350Y105500D01*
+X331850D01*
+X332600Y104750D01*
+X329600Y104000D02*X332600D01*
+Y104750D02*Y104000D01*
+X335150Y104750D02*Y102500D01*
+Y104750D02*X335900Y105500D01*
+X337400D01*
+X334400D02*X335150Y104750D01*
+X339950Y102500D02*X342200D01*
+X342950Y103250D01*
+X342200Y104000D02*X342950Y103250D01*
+X339950Y104000D02*X342200D01*
+X339200Y104750D02*X339950Y104000D01*
+X339200Y104750D02*X339950Y105500D01*
+X342200D01*
+X342950Y104750D01*
+X339200Y103250D02*X339950Y102500D01*
+X347450Y105500D02*X350450D01*
+X355700D02*X357950D01*
+X354950Y104750D02*X355700Y105500D01*
+X354950Y104750D02*Y103250D01*
+X355700Y102500D01*
+X357950D01*
+X362000Y105500D02*X362750Y104750D01*
+X360500Y105500D02*X362000D01*
+X359750Y104750D02*X360500Y105500D01*
+X359750Y104750D02*Y103250D01*
+X360500Y102500D01*
+X362750Y105500D02*Y103250D01*
+X363500Y102500D01*
+X360500D02*X362000D01*
+X362750Y103250D01*
+X366050Y108500D02*Y103250D01*
+X366800Y102500D01*
+X365300Y106250D02*X366800D01*
+X369050Y105500D02*X371300D01*
+X368300Y104750D02*X369050Y105500D01*
+X368300Y104750D02*Y103250D01*
+X369050Y102500D01*
+X371300D01*
+X373100Y108500D02*Y102500D01*
+Y104750D02*X373850Y105500D01*
+X375350D01*
+X376100Y104750D01*
+Y102500D01*
+X380600Y104750D02*Y103250D01*
+Y104750D02*X381350Y105500D01*
+X382850D01*
+X383600Y104750D01*
+Y103250D01*
+X382850Y102500D02*X383600Y103250D01*
+X381350Y102500D02*X382850D01*
+X380600Y103250D02*X381350Y102500D01*
+X386150Y107750D02*Y102500D01*
+Y107750D02*X386900Y108500D01*
+X387650D01*
+X385400Y105500D02*X386900D01*
+X389900Y107750D02*Y102500D01*
+Y107750D02*X390650Y108500D01*
+X391400D01*
+X389150Y105500D02*X390650D01*
+X392900D02*X395900D01*
+X397700Y108500D02*Y102500D01*
+Y103250D02*X398450Y102500D01*
+X399950D01*
+X400700Y103250D01*
+Y104750D02*Y103250D01*
+X399950Y105500D02*X400700Y104750D01*
+X398450Y105500D02*X399950D01*
+X397700Y104750D02*X398450Y105500D01*
+X402500D02*Y103250D01*
+X403250Y102500D01*
+X405500Y105500D02*Y101000D01*
+X404750Y100250D02*X405500Y101000D01*
+X403250Y100250D02*X404750D01*
+X402500Y101000D02*X403250Y100250D01*
+Y102500D02*X404750D01*
+X405500Y103250D01*
+X407300Y105500D02*X410300D01*
+X412100Y104750D02*Y103250D01*
+Y104750D02*X412850Y105500D01*
+X414350D01*
+X415100Y104750D01*
+Y103250D01*
+X414350Y102500D02*X415100Y103250D01*
+X412850Y102500D02*X414350D01*
+X412100Y103250D02*X412850Y102500D01*
+X417650Y104750D02*Y102500D01*
+Y104750D02*X418400Y105500D01*
+X419150D01*
+X419900Y104750D01*
+Y102500D01*
+X416900Y105500D02*X417650Y104750D01*
+X422450Y102500D02*X424700D01*
+X421700Y103250D02*X422450Y102500D01*
+X421700Y104750D02*Y103250D01*
+Y104750D02*X422450Y105500D01*
+X423950D01*
+X424700Y104750D01*
+X421700Y104000D02*X424700D01*
+Y104750D02*Y104000D01*
+X429200Y108500D02*Y102500D01*
+Y103250D02*X429950Y102500D01*
+X431450D01*
+X432200Y103250D01*
+Y104750D02*Y103250D01*
+X431450Y105500D02*X432200Y104750D01*
+X429950Y105500D02*X431450D01*
+X429200Y104750D02*X429950Y105500D01*
+X434000D02*Y103250D01*
+X434750Y102500D01*
+X436250D01*
+X437000Y103250D01*
+Y105500D02*Y103250D01*
+X441050Y105500D02*X441800Y104750D01*
+X439550Y105500D02*X441050D01*
+X438800Y104750D02*X439550Y105500D01*
+X438800Y104750D02*Y103250D01*
+X439550Y102500D01*
+X441050D01*
+X441800Y103250D01*
+X438800Y101000D02*X439550Y100250D01*
+X441050D01*
+X441800Y101000D01*
+Y105500D02*Y101000D01*
+X444350Y102500D02*X446600D01*
+X447350Y103250D01*
+X446600Y104000D02*X447350Y103250D01*
+X444350Y104000D02*X446600D01*
+X443600Y104750D02*X444350Y104000D01*
+X443600Y104750D02*X444350Y105500D01*
+X446600D01*
+X447350Y104750D01*
+X443600Y103250D02*X444350Y102500D01*
+X454850Y108500D02*Y102500D01*
+X454100D02*X454850Y103250D01*
+X452600Y102500D02*X454100D01*
+X451850Y103250D02*X452600Y102500D01*
+X451850Y104750D02*Y103250D01*
+Y104750D02*X452600Y105500D01*
+X454100D01*
+X454850Y104750D01*
+X456650Y105500D02*Y103250D01*
+X457400Y102500D01*
+X458900D01*
+X459650Y103250D01*
+Y105500D02*Y103250D01*
+X462200Y102500D02*X464450D01*
+X461450Y103250D02*X462200Y102500D01*
+X461450Y104750D02*Y103250D01*
+Y104750D02*X462200Y105500D01*
+X463700D01*
+X464450Y104750D01*
+X461450Y104000D02*X464450D01*
+Y104750D02*Y104000D01*
+X469700Y108500D02*Y103250D01*
+X470450Y102500D01*
+X468950Y106250D02*X470450D01*
+X471950Y104750D02*Y103250D01*
+Y104750D02*X472700Y105500D01*
+X474200D01*
+X474950Y104750D01*
+Y103250D01*
+X474200Y102500D02*X474950Y103250D01*
+X472700Y102500D02*X474200D01*
+X471950Y103250D02*X472700Y102500D01*
+X480200Y108500D02*Y103250D01*
+X480950Y102500D01*
+X479450Y106250D02*X480950D01*
+X482450Y108500D02*Y102500D01*
+Y104750D02*X483200Y105500D01*
+X484700D01*
+X485450Y104750D01*
+Y102500D01*
+X488000D02*X490250D01*
+X487250Y103250D02*X488000Y102500D01*
+X487250Y104750D02*Y103250D01*
+Y104750D02*X488000Y105500D01*
+X489500D01*
+X490250Y104750D01*
+X487250Y104000D02*X490250D01*
+Y104750D02*Y104000D01*
+X494750Y103250D02*X495500Y102500D01*
+X494750Y107750D02*Y103250D01*
+Y107750D02*X495500Y108500D01*
+X497000D01*
+X497750Y107750D01*
+Y103250D01*
+X497000Y102500D02*X497750Y103250D01*
+X495500Y102500D02*X497000D01*
+X494750Y104000D02*X497750Y107000D01*
+X499550Y105500D02*X502550D01*
+X504350Y108500D02*Y102500D01*
+Y103250D02*X505100Y102500D01*
+X506600D01*
+X507350Y103250D01*
+Y104750D02*Y103250D01*
+X506600Y105500D02*X507350Y104750D01*
+X505100Y105500D02*X506600D01*
+X504350Y104750D02*X505100Y105500D01*
+X511400D02*X512150Y104750D01*
+X509900Y105500D02*X511400D01*
+X509150Y104750D02*X509900Y105500D01*
+X509150Y104750D02*Y103250D01*
+X509900Y102500D01*
+X512150Y105500D02*Y103250D01*
+X512900Y102500D01*
+X509900D02*X511400D01*
+X512150Y103250D01*
+X515450Y102500D02*X517700D01*
+X518450Y103250D01*
+X517700Y104000D02*X518450Y103250D01*
+X515450Y104000D02*X517700D01*
+X514700Y104750D02*X515450Y104000D01*
+X514700Y104750D02*X515450Y105500D01*
+X517700D01*
+X518450Y104750D01*
+X514700Y103250D02*X515450Y102500D01*
+X521000D02*X523250D01*
+X520250Y103250D02*X521000Y102500D01*
+X520250Y104750D02*Y103250D01*
+Y104750D02*X521000Y105500D01*
+X522500D01*
+X523250Y104750D01*
+X520250Y104000D02*X523250D01*
+Y104750D02*Y104000D01*
+G54D24*X527750Y107000D02*Y106850D01*
+G54D23*Y104750D02*Y102500D01*
+X530000Y104750D02*Y102500D01*
+Y104750D02*X530750Y105500D01*
+X531500D01*
+X532250Y104750D01*
+Y102500D01*
+X529250Y105500D02*X530000Y104750D01*
+X537050Y108500D02*Y102500D01*
+X536300D02*X537050Y103250D01*
+X534800Y102500D02*X536300D01*
+X534050Y103250D02*X534800Y102500D01*
+X534050Y104750D02*Y103250D01*
+Y104750D02*X534800Y105500D01*
+X536300D01*
+X537050Y104750D01*
+X539600Y102500D02*X541850D01*
+X538850Y103250D02*X539600Y102500D01*
+X538850Y104750D02*Y103250D01*
+Y104750D02*X539600Y105500D01*
+X541100D01*
+X541850Y104750D01*
+X538850Y104000D02*X541850D01*
+Y104750D02*Y104000D01*
+X543650Y105500D02*X546650Y102500D01*
+X543650D02*X546650Y105500D01*
+X551150Y104750D02*Y103250D01*
+Y104750D02*X551900Y105500D01*
+X553400D01*
+X554150Y104750D01*
+Y103250D01*
+X553400Y102500D02*X554150Y103250D01*
+X551900Y102500D02*X553400D01*
+X551150Y103250D02*X551900Y102500D01*
+X556700Y107750D02*Y102500D01*
+Y107750D02*X557450Y108500D01*
+X558200D01*
+X555950Y105500D02*X557450D01*
+X563150Y108500D02*Y103250D01*
+X563900Y102500D01*
+X562400Y106250D02*X563900D01*
+X565400Y108500D02*Y102500D01*
+Y104750D02*X566150Y105500D01*
+X567650D01*
+X568400Y104750D01*
+Y102500D01*
+X570950D02*X573200D01*
+X570200Y103250D02*X570950Y102500D01*
+X570200Y104750D02*Y103250D01*
+Y104750D02*X570950Y105500D01*
+X572450D01*
+X573200Y104750D01*
+X570200Y104000D02*X573200D01*
+Y104750D02*Y104000D01*
+X575750Y104750D02*Y102500D01*
+Y104750D02*X576500Y105500D01*
+X578000D01*
+X575000D02*X575750Y104750D01*
+X580550D02*Y102500D01*
+Y104750D02*X581300Y105500D01*
+X582050D01*
+X582800Y104750D01*
+Y102500D01*
+Y104750D02*X583550Y105500D01*
+X584300D01*
+X585050Y104750D01*
+Y102500D01*
+X579800Y105500D02*X580550Y104750D01*
+X589100Y105500D02*X589850Y104750D01*
+X587600Y105500D02*X589100D01*
+X586850Y104750D02*X587600Y105500D01*
+X586850Y104750D02*Y103250D01*
+X587600Y102500D01*
+X589850Y105500D02*Y103250D01*
+X590600Y102500D01*
+X587600D02*X589100D01*
+X589850Y103250D01*
+X592400Y108500D02*Y103250D01*
+X593150Y102500D01*
+X595400D02*X597650D01*
+X598400Y103250D01*
+X597650Y104000D02*X598400Y103250D01*
+X595400Y104000D02*X597650D01*
+X594650Y104750D02*X595400Y104000D01*
+X594650Y104750D02*X595400Y105500D01*
+X597650D01*
+X598400Y104750D01*
+X594650Y103250D02*X595400Y102500D01*
+X602900Y105500D02*X605900D01*
+X610400Y108500D02*Y102500D01*
+Y108500D02*X613400D01*
+X610400Y105800D02*X612650D01*
+X617450Y105500D02*X618200Y104750D01*
+X615950Y105500D02*X617450D01*
+X615200Y104750D02*X615950Y105500D01*
+X615200Y104750D02*Y103250D01*
+X615950Y102500D01*
+X618200Y105500D02*Y103250D01*
+X618950Y102500D01*
+X615950D02*X617450D01*
+X618200Y103250D01*
+X620750Y108500D02*Y102500D01*
+Y103250D02*X621500Y102500D01*
+X623000D01*
+X623750Y103250D01*
+Y104750D02*Y103250D01*
+X623000Y105500D02*X623750Y104750D01*
+X621500Y105500D02*X623000D01*
+X620750Y104750D02*X621500Y105500D01*
+X626300Y104750D02*Y102500D01*
+Y104750D02*X627050Y105500D01*
+X628550D01*
+X625550D02*X626300Y104750D01*
+G54D24*X630350Y107000D02*Y106850D01*
+G54D23*Y104750D02*Y102500D01*
+X632601Y105500D02*X634851D01*
+X631851Y104750D02*X632601Y105500D01*
+X631851Y104750D02*Y103250D01*
+X632601Y102500D01*
+X634851D01*
+X638901Y105500D02*X639651Y104750D01*
+X637401Y105500D02*X638901D01*
+X636651Y104750D02*X637401Y105500D01*
+X636651Y104750D02*Y103250D01*
+X637401Y102500D01*
+X639651Y105500D02*Y103250D01*
+X640401Y102500D01*
+X637401D02*X638901D01*
+X639651Y103250D01*
+X642951Y108500D02*Y103250D01*
+X643701Y102500D01*
+X642201Y106250D02*X643701D01*
+G54D24*X645201Y107000D02*Y106850D01*
+G54D23*Y104750D02*Y102500D01*
+X646701Y104750D02*Y103250D01*
+Y104750D02*X647451Y105500D01*
+X648951D01*
+X649701Y104750D01*
+Y103250D01*
+X648951Y102500D02*X649701Y103250D01*
+X647451Y102500D02*X648951D01*
+X646701Y103250D02*X647451Y102500D01*
+X652251Y104750D02*Y102500D01*
+Y104750D02*X653001Y105500D01*
+X653751D01*
+X654501Y104750D01*
+Y102500D01*
+X651501Y105500D02*X652251Y104750D01*
+X659751Y108500D02*Y102500D01*
+X661701Y108500D02*X662751Y107450D01*
+Y103550D01*
+X661701Y102500D02*X662751Y103550D01*
+X659001Y102500D02*X661701D01*
+X659001Y108500D02*X661701D01*
+X665301Y104750D02*Y102500D01*
+Y104750D02*X666051Y105500D01*
+X667551D01*
+X664551D02*X665301Y104750D01*
+X671601Y105500D02*X672351Y104750D01*
+X670101Y105500D02*X671601D01*
+X669351Y104750D02*X670101Y105500D01*
+X669351Y104750D02*Y103250D01*
+X670101Y102500D01*
+X672351Y105500D02*Y103250D01*
+X673101Y102500D01*
+X670101D02*X671601D01*
+X672351Y103250D01*
+X674901Y105500D02*Y103250D01*
+X675651Y102500D01*
+X676401D01*
+X677151Y103250D01*
+Y105500D02*Y103250D01*
+X677901Y102500D01*
+X678651D01*
+X679401Y103250D01*
+Y105500D02*Y103250D01*
+G54D24*X681201Y107000D02*Y106850D01*
+G54D23*Y104750D02*Y102500D01*
+X683451Y104750D02*Y102500D01*
+Y104750D02*X684201Y105500D01*
+X684951D01*
+X685701Y104750D01*
+Y102500D01*
+X682701Y105500D02*X683451Y104750D01*
+X689751Y105500D02*X690501Y104750D01*
+X688251Y105500D02*X689751D01*
+X687501Y104750D02*X688251Y105500D01*
+X687501Y104750D02*Y103250D01*
+X688251Y102500D01*
+X689751D01*
+X690501Y103250D01*
+X687501Y101000D02*X688251Y100250D01*
+X689751D01*
+X690501Y101000D01*
+Y105500D02*Y101000D01*
+M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group5.gbr	(revision 18980)
@@ -0,0 +1,58 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD15C,0.0315*%
+%ADD14C,0.0787*%
+%ADD13C,0.0001*%
+G54D13*G36*
+X2500Y47500D02*X12500D01*
+Y45391D01*
+X11840Y45664D01*
+X10932Y45882D01*
+X10000Y45955D01*
+X9068Y45882D01*
+X8160Y45664D01*
+X7296Y45306D01*
+X6560Y44855D01*
+X8014Y43400D01*
+X8207Y43519D01*
+X8780Y43756D01*
+X9382Y43901D01*
+X10000Y43949D01*
+X10618Y43901D01*
+X11220Y43756D01*
+X11793Y43519D01*
+X11986Y43400D01*
+X12500Y43914D01*
+Y37500D01*
+X6086D01*
+X6600Y38014D01*
+X6481Y38207D01*
+X6244Y38780D01*
+X6099Y39382D01*
+X6051Y40000D01*
+X6099Y40618D01*
+X6244Y41220D01*
+X6481Y41793D01*
+X6600Y41986D01*
+X5145Y43440D01*
+X4694Y42704D01*
+X4336Y41840D01*
+X4118Y40932D01*
+X4045Y40000D01*
+X4118Y39068D01*
+X4336Y38160D01*
+X4609Y37500D01*
+X2500D01*
+Y47500D01*
+G37*
+G54D14*X10000Y40000D03*
+G54D15*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.group7.gbr	(revision 18980)
@@ -0,0 +1,118 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD18C,0.0315*%
+%ADD17C,0.0787*%
+%ADD16C,0.0001*%
+G54D16*G36*
+X7500Y42500D02*X13830D01*
+X13826Y42496D01*
+X13732Y42370D01*
+X13658Y42230D01*
+X13608Y42080D01*
+X13581Y41924D01*
+X13579Y41766D01*
+X13602Y41610D01*
+X13652Y41460D01*
+X13778Y41108D01*
+X13866Y40744D01*
+X13919Y40374D01*
+X13937Y40000D01*
+X13919Y39626D01*
+X13866Y39256D01*
+X13778Y38892D01*
+X13656Y38539D01*
+X13606Y38389D01*
+X13583Y38234D01*
+X13585Y38076D01*
+X13612Y37921D01*
+X13662Y37772D01*
+X13736Y37633D01*
+X13830Y37507D01*
+X13942Y37397D01*
+X14071Y37306D01*
+X14212Y37236D01*
+X14362Y37189D01*
+X14518Y37167D01*
+X14675Y37168D01*
+X14831Y37195D01*
+X14980Y37246D01*
+X15119Y37319D01*
+X15245Y37413D01*
+X15355Y37525D01*
+X15446Y37654D01*
+X15513Y37796D01*
+X15704Y38328D01*
+X15837Y38877D01*
+X15917Y39436D01*
+X15944Y40000D01*
+X15917Y40564D01*
+X15837Y41123D01*
+X15704Y41672D01*
+X15519Y42206D01*
+X15450Y42348D01*
+X15358Y42477D01*
+X15336Y42500D01*
+X17500D01*
+Y32500D01*
+X7500D01*
+Y34670D01*
+X7525Y34645D01*
+X7654Y34554D01*
+X7796Y34487D01*
+X8328Y34296D01*
+X8877Y34163D01*
+X9436Y34083D01*
+X10000Y34056D01*
+X10564Y34083D01*
+X11123Y34163D01*
+X11672Y34296D01*
+X12206Y34481D01*
+X12348Y34550D01*
+X12477Y34642D01*
+X12591Y34752D01*
+X12685Y34879D01*
+X12759Y35019D01*
+X12809Y35168D01*
+X12836Y35324D01*
+X12838Y35482D01*
+X12815Y35639D01*
+X12768Y35790D01*
+X12698Y35931D01*
+X12607Y36061D01*
+X12496Y36174D01*
+X12370Y36268D01*
+X12230Y36342D01*
+X12080Y36392D01*
+X11924Y36419D01*
+X11766Y36421D01*
+X11610Y36398D01*
+X11460Y36348D01*
+X11108Y36222D01*
+X10744Y36134D01*
+X10374Y36081D01*
+X10000Y36063D01*
+X9626Y36081D01*
+X9256Y36134D01*
+X8892Y36222D01*
+X8539Y36344D01*
+X8389Y36394D01*
+X8234Y36417D01*
+X8076Y36415D01*
+X7921Y36388D01*
+X7772Y36338D01*
+X7633Y36264D01*
+X7507Y36170D01*
+X7500Y36164D01*
+Y42500D01*
+G37*
+G54D17*X10000Y40000D03*
+G54D18*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,7 @@
+M48
+INCH
+T21C0.032
+%
+T21
+X001000Y004000
+M30
Index: tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.gbr/thermal_last.top.gbr	(revision 18980)
@@ -0,0 +1,15 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD12C,0.0315*%
+%ADD11C,0.0787*%
+G54D11*X10000Y40000D03*
+G54D12*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_last.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.nelma.em	(revision 18980)
@@ -0,0 +1,75 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer group-1 {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer group-1 {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"group-1",
+		"substrate-11",
+		"group-1"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/thermal_last.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.net	(revision 18980)
@@ -0,0 +1,13 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317N/C              VIA   -     D0315PA00X+001000Y+004000X0787Y0000R000 S3      
+999
Index: tags/2.0.1/tests/RTT/ref/thermal_last.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_last.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_last.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_last.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.png.text	(revision 18980)
@@ -0,0 +1,10 @@
+r6731
+
+121 x 121 pixels (100.833 x 100.833) for both polygons
+
+via copper width 95 pixels (79.166)
+Via drill width 39 pixels (32.5)
+clearance 23 pixels (19.166)
+
+
+
Index: tags/2.0.1/tests/RTT/ref/thermal_last.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_last.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_last.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_last.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_last.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_last.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_last.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.svg	(revision 18980)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <polygon points="1.9050,1.9050 3.5128,1.9050 3.5119,1.9059 3.4879,1.9381 3.4692,1.9737 3.4563,2.0117 3.4495,2.0513 3.4490,2.0914 3.4548,2.1312 3.4675,2.1692 3.4996,2.2586 3.5220,2.3510 3.5355,2.4451 3.5400,2.5400 3.5355,2.6349 3.5220,2.7290 3.4996,2.8214 3.4686,2.9112 3.4559,2.9491 3.4502,2.9886 3.4507,3.0286 3.4574,3.0680 3.4702,3.1059 3.4888,3.1413 3.5127,3.1733 3.5414,3.2012 3.5740,3.2243 3.6098,3.2421 3.6480,3.2539 3.6876,3.2597 3.7275,3.2592 3.7670,3.2525 3.8048,3.2396 3.8402,3.2210 3.8723,3.1971 3.9002,3.1685 3.9233,3.1359 3.9403,3.0998 3.9887,2.9648 4.0225,2.8253 4.0429,2.6833 4.0497,2.5400 4.0429,2.3967 4.0225,2.2547 3.9887,2.1152 3.9418,1.9796 3.9243,1.9435 3.9011,1.9107 3.8954,1.9050 4.4450,1.9050 4.4450,4.4450 1.9050,4.4450 1.9050,3.8939 1.9115,3.9002 1.9441,3.9233 1.9802,3.9403 2.1152,3.9887 2.2547,4.0225 2.3967,4.0429 2.5400,4.0497 2.6833,4.0429 2.8253,4.0225 2.9648,3.9887 3.1004,3.9418 3.1365,3.9243 3.1693,3.9011 3.1980,3.8730 3.2220,3.8408 3.2407,3.8053 3.2536,3.7672 3.2603,3.7276 3.2608,3.6875 3.2550,3.6478 3.2431,3.6094 3.2253,3.5734 3.2021,3.5406 3.1741,3.5119 3.1419,3.4879 3.1063,3.4692 3.0683,3.4563 3.0287,3.4495 2.9886,3.4490 2.9488,3.4548 2.9108,3.4675 2.8214,3.4996 2.7290,3.5220 2.6349,3.5355 2.5400,3.5400 2.4451,3.5355 2.3510,3.5220 2.2586,3.4996 2.1688,3.4686 2.1309,3.4559 2.0914,3.4502 2.0514,3.4507 2.0120,3.4574 1.9741,3.4702 1.9387,3.4888 1.9067,3.5127 1.9050,3.5144 " stroke-width="0.010" stroke="#8b7355" fill="#8b7355"/>
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <polygon points="0.6350,0.6350 3.1750,0.6350 3.1750,1.1708 3.0074,1.1014 2.7766,1.0460 2.5400,1.0274 2.3034,1.0460 2.0726,1.1014 1.8533,1.1922 1.6661,1.3069 2.0355,1.6763 2.0846,1.6462 2.2300,1.5860 2.3831,1.5493 2.5400,1.5369 2.6969,1.5493 2.8500,1.5860 2.9954,1.6462 3.0445,1.6763 3.1750,1.5458 3.1750,3.1750 1.5458,3.1750 1.6763,3.0445 1.6462,2.9954 1.5860,2.8500 1.5493,2.6969 1.5369,2.5400 1.5493,2.3831 1.5860,2.2300 1.6462,2.0846 1.6763,2.0355 1.3069,1.6661 1.1922,1.8533 1.1014,2.0726 1.0460,2.3034 1.0274,2.5400 1.0460,2.7766 1.1014,3.0074 1.1708,3.1750 0.6350,3.1750 " stroke-width="0.010" stroke="#548b54" fill="#548b54"/>
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/thermal_last.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_last.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_last.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.bom
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.bom	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.bom	(revision 18980)
@@ -0,0 +1,7 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thermals vs. multiple layer polygons - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.dsn
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.dsn	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.dsn	(revision 18980)
@@ -0,0 +1,62 @@
+(pcb thermals vs. multiple layer polygons
+  (parser
+    (string_quote ")
+    (space_in_quoted_tokens on)
+    (host_cad "pcb-rnd")
+    (host_version "<version>")
+  )
+  (resolution mm 1000000)
+  (structure
+    (layer "3__top_copper"
+      (type signal)
+    )
+    (layer "5__Intern"
+      (type signal)
+    )
+    (layer "7__Intern"
+      (type signal)
+    )
+    (layer "10__bottom_copper"
+      (type signal)
+    )
+    (boundary
+      (rect pcb 0.0 0.0 12.700000 12.700000)
+    )
+    (via via_685800_381000)
+    (rule
+      (width 0.2032)
+      (clear 0.2032)
+      (clear 0.2032 (type wire_area))
+      (clear 0.2032 (type via_smd via_pin))
+      (clear 0.2032 (type smd_smd))
+      (clear 0.2032 (type default_smd))
+    )
+  )
+  (placement
+    (component 5
+      (place 5 2.540000 10.160000 front 0 (PN 0))
+    )
+    (component 6
+      (place 6 6.985000 10.160000 front 0 (PN 0))
+    )
+    (component 7
+      (place 7 2.540000 5.715000 front 0 (PN 0))
+    )
+    (component 8
+      (place 8 6.985000 5.715000 front 0 (PN 0))
+    )
+  )
+  (library
+  )
+  (network
+    (class geda_default
+      (circuit
+        (use_via via_685800_381000)
+      )
+      (rule (width 0.203200))
+    )
+  )
+    (wiring
+
+    )
+)
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.eps
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.eps	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.eps	(revision 18980)
@@ -0,0 +1,427 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 0 0 37.000000 37.000000
+%%Pages: 1
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: thermal_layer.eps
+
+72 72 scale
+1 dup neg scale
+1 dup scale
+0.00000 -0.50000 translate
+/nclip { -0.01000 -0.01000 moveto -0.01000 0.51000 lineto 0.51000 0.51000 lineto 0.51000 -0.01000 lineto -0.01000 -0.01000 lineto eoclip newpath } def
+/t { moveto lineto stroke } bind def
+/tc { moveto lineto strokepath nclip } bind def
+/r { /y2 exch def /x2 exch def /y1 exch def /x1 exch def
+     x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto closepath fill } bind def
+/c { 0 360 arc fill } bind def
+/cc { 0 360 arc nclip } bind def
+/a { gsave setlinewidth translate scale 0 0 1 5 3 roll arc stroke grestore} bind def
+% Layer bottom group 10 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.227451 0.372549 0.803922 setrgbcolor
+0.07500 0.07500 moveto
+0.13914 0.07500 lineto
+0.13400 0.08014 lineto
+0.13519 0.08207 lineto
+0.13756 0.08780 lineto
+0.13901 0.09382 lineto
+0.13937 0.10000 lineto
+0.13901 0.10618 lineto
+0.13756 0.11220 lineto
+0.13519 0.11793 lineto
+0.13400 0.11986 lineto
+0.14855 0.13440 lineto
+0.15306 0.12704 lineto
+0.15664 0.11840 lineto
+0.15882 0.10932 lineto
+0.15937 0.10000 lineto
+0.15882 0.09068 lineto
+0.15664 0.08160 lineto
+0.15391 0.07500 lineto
+0.17500 0.07500 lineto
+0.17500 0.17500 lineto
+0.07500 0.17500 lineto
+0.07500 0.15391 lineto
+0.08160 0.15664 lineto
+0.09068 0.15882 lineto
+0.10000 0.15955 lineto
+0.10932 0.15882 lineto
+0.11840 0.15664 lineto
+0.12704 0.15306 lineto
+0.13440 0.14855 lineto
+0.11986 0.13400 lineto
+0.11793 0.13519 lineto
+0.11220 0.13756 lineto
+0.10618 0.13901 lineto
+0.10000 0.13949 lineto
+0.09382 0.13901 lineto
+0.08780 0.13756 lineto
+0.08207 0.13519 lineto
+0.08014 0.13400 lineto
+0.07500 0.13914 lineto
+fill
+0.07500 0.25000 moveto
+0.17500 0.25000 lineto
+0.17500 0.35000 lineto
+0.07500 0.35000 lineto
+fill
+1 setlinecap
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.27500 0.10000 0.03937 c
+0.10000 0.27500 0.03937 c
+0.27500 0.27500 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+0.27500 0.10000 0.01575 c
+0.10000 0.27500 0.01575 c
+0.27500 0.27500 0.01575 c
+% Layer group5 group 5 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.27500 0.10000 0.03937 c
+0.10000 0.27500 0.03937 c
+0.27500 0.27500 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+0.27500 0.10000 0.01575 c
+0.10000 0.27500 0.01575 c
+0.27500 0.27500 0.01575 c
+% Layer group7 group 7 drill 0 mask 0
+0.00000 setlinewidth
+0.8 0.8 0.8 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.27500 0.10000 0.03937 c
+0.10000 0.27500 0.03937 c
+0.27500 0.27500 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+0.27500 0.10000 0.01575 c
+0.10000 0.27500 0.01575 c
+0.27500 0.27500 0.01575 c
+% Layer top group 3 drill 0 mask 0
+0.00000 setlinewidth
+2 setlinecap
+0.0627451 0.305882 0.545098 setrgbcolor
+0.25000 0.07500 moveto
+0.31414 0.07500 lineto
+0.30900 0.08014 lineto
+0.31019 0.08207 lineto
+0.31256 0.08780 lineto
+0.31401 0.09382 lineto
+0.31437 0.10000 lineto
+0.31401 0.10618 lineto
+0.31256 0.11220 lineto
+0.31019 0.11793 lineto
+0.30900 0.11986 lineto
+0.32355 0.13440 lineto
+0.32806 0.12704 lineto
+0.33164 0.11840 lineto
+0.33382 0.10932 lineto
+0.33437 0.10000 lineto
+0.33382 0.09068 lineto
+0.33164 0.08160 lineto
+0.32891 0.07500 lineto
+0.35000 0.07500 lineto
+0.35000 0.17500 lineto
+0.25000 0.17500 lineto
+0.25000 0.15391 lineto
+0.25660 0.15664 lineto
+0.26568 0.15882 lineto
+0.27500 0.15955 lineto
+0.28432 0.15882 lineto
+0.29340 0.15664 lineto
+0.30204 0.15306 lineto
+0.30940 0.14855 lineto
+0.29486 0.13400 lineto
+0.29293 0.13519 lineto
+0.28720 0.13756 lineto
+0.28118 0.13901 lineto
+0.27500 0.13949 lineto
+0.26882 0.13901 lineto
+0.26280 0.13756 lineto
+0.25707 0.13519 lineto
+0.25514 0.13400 lineto
+0.25000 0.13914 lineto
+fill
+0.25000 0.25000 moveto
+0.35000 0.25000 lineto
+0.35000 0.35000 lineto
+0.25000 0.35000 lineto
+fill
+0.545098 0.137255 0.137255 setrgbcolor
+0.02500 0.02500 moveto
+0.12500 0.02500 lineto
+0.12500 0.04670 lineto
+0.12475 0.04645 lineto
+0.12346 0.04554 lineto
+0.12204 0.04487 lineto
+0.11672 0.04296 lineto
+0.11123 0.04163 lineto
+0.10564 0.04083 lineto
+0.10000 0.04056 lineto
+0.09436 0.04083 lineto
+0.08877 0.04163 lineto
+0.08328 0.04296 lineto
+0.07794 0.04481 lineto
+0.07652 0.04550 lineto
+0.07523 0.04642 lineto
+0.07409 0.04752 lineto
+0.07315 0.04879 lineto
+0.07241 0.05019 lineto
+0.07191 0.05168 lineto
+0.07164 0.05324 lineto
+0.07162 0.05482 lineto
+0.07185 0.05639 lineto
+0.07232 0.05790 lineto
+0.07302 0.05931 lineto
+0.07393 0.06061 lineto
+0.07504 0.06174 lineto
+0.07630 0.06268 lineto
+0.07770 0.06342 lineto
+0.07920 0.06392 lineto
+0.08076 0.06419 lineto
+0.08234 0.06421 lineto
+0.08390 0.06398 lineto
+0.08540 0.06348 lineto
+0.08892 0.06222 lineto
+0.09256 0.06134 lineto
+0.09626 0.06081 lineto
+0.10000 0.06063 lineto
+0.10374 0.06081 lineto
+0.10744 0.06134 lineto
+0.11108 0.06222 lineto
+0.11461 0.06344 lineto
+0.11611 0.06394 lineto
+0.11766 0.06417 lineto
+0.11924 0.06415 lineto
+0.12079 0.06388 lineto
+0.12228 0.06338 lineto
+0.12367 0.06264 lineto
+0.12493 0.06170 lineto
+0.12500 0.06164 lineto
+0.12500 0.12500 lineto
+0.06170 0.12500 lineto
+0.06174 0.12496 lineto
+0.06268 0.12370 lineto
+0.06342 0.12230 lineto
+0.06392 0.12080 lineto
+0.06419 0.11924 lineto
+0.06421 0.11766 lineto
+0.06398 0.11610 lineto
+0.06348 0.11460 lineto
+0.06222 0.11108 lineto
+0.06134 0.10744 lineto
+0.06081 0.10374 lineto
+0.06063 0.10000 lineto
+0.06081 0.09626 lineto
+0.06134 0.09256 lineto
+0.06222 0.08892 lineto
+0.06344 0.08539 lineto
+0.06394 0.08389 lineto
+0.06417 0.08234 lineto
+0.06415 0.08076 lineto
+0.06388 0.07921 lineto
+0.06338 0.07772 lineto
+0.06264 0.07633 lineto
+0.06170 0.07507 lineto
+0.06058 0.07397 lineto
+0.05929 0.07306 lineto
+0.05788 0.07236 lineto
+0.05638 0.07189 lineto
+0.05482 0.07167 lineto
+0.05325 0.07168 lineto
+0.05169 0.07195 lineto
+0.05020 0.07246 lineto
+0.04881 0.07319 lineto
+0.04755 0.07413 lineto
+0.04645 0.07525 lineto
+0.04554 0.07654 lineto
+0.04487 0.07796 lineto
+0.04296 0.08328 lineto
+0.04163 0.08877 lineto
+0.04083 0.09436 lineto
+0.04056 0.10000 lineto
+0.04083 0.10564 lineto
+0.04163 0.11123 lineto
+0.04296 0.11672 lineto
+0.04481 0.12206 lineto
+0.04550 0.12348 lineto
+0.04642 0.12477 lineto
+0.04664 0.12500 lineto
+0.02500 0.12500 lineto
+fill
+0.20000 0.02500 moveto
+0.30000 0.02500 lineto
+0.30000 0.04670 lineto
+0.29975 0.04645 lineto
+0.29846 0.04554 lineto
+0.29704 0.04487 lineto
+0.29172 0.04296 lineto
+0.28623 0.04163 lineto
+0.28064 0.04083 lineto
+0.27500 0.04056 lineto
+0.26936 0.04083 lineto
+0.26377 0.04163 lineto
+0.25828 0.04296 lineto
+0.25294 0.04481 lineto
+0.25152 0.04550 lineto
+0.25023 0.04642 lineto
+0.24909 0.04752 lineto
+0.24815 0.04879 lineto
+0.24741 0.05019 lineto
+0.24691 0.05168 lineto
+0.24664 0.05324 lineto
+0.24662 0.05482 lineto
+0.24685 0.05639 lineto
+0.24732 0.05790 lineto
+0.24802 0.05931 lineto
+0.24893 0.06061 lineto
+0.25004 0.06174 lineto
+0.25130 0.06268 lineto
+0.25270 0.06342 lineto
+0.25420 0.06392 lineto
+0.25576 0.06419 lineto
+0.25734 0.06421 lineto
+0.25890 0.06398 lineto
+0.26040 0.06348 lineto
+0.26392 0.06222 lineto
+0.26756 0.06134 lineto
+0.27126 0.06081 lineto
+0.27500 0.06063 lineto
+0.27874 0.06081 lineto
+0.28244 0.06134 lineto
+0.28608 0.06222 lineto
+0.28961 0.06344 lineto
+0.29111 0.06394 lineto
+0.29266 0.06417 lineto
+0.29424 0.06415 lineto
+0.29579 0.06388 lineto
+0.29728 0.06338 lineto
+0.29867 0.06264 lineto
+0.29993 0.06170 lineto
+0.30000 0.06164 lineto
+0.30000 0.12500 lineto
+0.23670 0.12500 lineto
+0.23674 0.12496 lineto
+0.23768 0.12370 lineto
+0.23842 0.12230 lineto
+0.23892 0.12080 lineto
+0.23919 0.11924 lineto
+0.23921 0.11766 lineto
+0.23898 0.11610 lineto
+0.23848 0.11460 lineto
+0.23722 0.11108 lineto
+0.23634 0.10744 lineto
+0.23581 0.10374 lineto
+0.23563 0.10000 lineto
+0.23581 0.09626 lineto
+0.23634 0.09256 lineto
+0.23722 0.08892 lineto
+0.23844 0.08539 lineto
+0.23894 0.08389 lineto
+0.23917 0.08234 lineto
+0.23915 0.08076 lineto
+0.23888 0.07921 lineto
+0.23838 0.07772 lineto
+0.23764 0.07633 lineto
+0.23670 0.07507 lineto
+0.23558 0.07397 lineto
+0.23429 0.07306 lineto
+0.23288 0.07236 lineto
+0.23138 0.07189 lineto
+0.22982 0.07167 lineto
+0.22825 0.07168 lineto
+0.22669 0.07195 lineto
+0.22520 0.07246 lineto
+0.22381 0.07319 lineto
+0.22255 0.07413 lineto
+0.22145 0.07525 lineto
+0.22054 0.07654 lineto
+0.21987 0.07796 lineto
+0.21796 0.08328 lineto
+0.21663 0.08877 lineto
+0.21583 0.09436 lineto
+0.21556 0.10000 lineto
+0.21583 0.10564 lineto
+0.21663 0.11123 lineto
+0.21796 0.11672 lineto
+0.21981 0.12206 lineto
+0.22050 0.12348 lineto
+0.22142 0.12477 lineto
+0.22164 0.12500 lineto
+0.20000 0.12500 lineto
+fill
+0.02500 0.20000 moveto
+0.12500 0.20000 lineto
+0.12500 0.22109 lineto
+0.11840 0.21836 lineto
+0.10932 0.21618 lineto
+0.10000 0.21545 lineto
+0.09068 0.21618 lineto
+0.08160 0.21836 lineto
+0.07296 0.22194 lineto
+0.06500 0.22682 lineto
+0.05789 0.23289 lineto
+0.05182 0.24000 lineto
+0.04694 0.24796 lineto
+0.04336 0.25660 lineto
+0.04118 0.26568 lineto
+0.04045 0.27500 lineto
+0.04118 0.28432 lineto
+0.04336 0.29340 lineto
+0.04609 0.30000 lineto
+0.02500 0.30000 lineto
+fill
+0.20000 0.20000 moveto
+0.30000 0.20000 lineto
+0.30000 0.22109 lineto
+0.29340 0.21836 lineto
+0.28432 0.21618 lineto
+0.27500 0.21545 lineto
+0.26568 0.21618 lineto
+0.25660 0.21836 lineto
+0.24796 0.22194 lineto
+0.24000 0.22682 lineto
+0.23289 0.23289 lineto
+0.22682 0.24000 lineto
+0.22194 0.24796 lineto
+0.21836 0.25660 lineto
+0.21618 0.26568 lineto
+0.21545 0.27500 lineto
+0.21618 0.28432 lineto
+0.21836 0.29340 lineto
+0.22109 0.30000 lineto
+0.20000 0.30000 lineto
+fill
+1 setlinecap
+0.498039 0.498039 0.498039 setrgbcolor
+0.10000 0.10000 0.03937 c
+0.27500 0.10000 0.03937 c
+0.10000 0.27500 0.03937 c
+0.27500 0.27500 0.03937 c
+0.00000 setlinewidth
+1 1 1 setrgbcolor
+0.10000 0.10000 0.01575 c
+0.27500 0.10000 0.01575 c
+0.10000 0.27500 0.01575 c
+0.27500 0.27500 0.01575 c
+% Layer topsilk group 1 drill 0 mask 0
+% Layer bottomsilk group 12 drill 0 mask 0
+% Layer plated-drill group -1 drill 1 mask 0
+0.10000 0.10000 0.01575 c
+0.27500 0.10000 0.01575 c
+0.10000 0.27500 0.01575 c
+0.27500 0.27500 0.01575 c
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.fcd
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.fcd	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.fcd	(revision 18980)
@@ -0,0 +1,13 @@
+[FIDOCAD]
+PP 5 5 25 5 25 9 25 9 25 9 24 9 23 9 22 8 21 8 20 8 19 8 18 8 17 9 16 9 15 9 15 9 15 10 15 10 14 10 14 10 14 11 14 11 14 11 14 12 15 12 15 12 15 12 15 13 16 13 16 13 16 13 16 13 17 13 17 13 18 12 19 12 19 12 20 12 21 12 21 12 22 12 23 13 23 13 24 13 24 13 24 13 24 13 25 13 25 12 25 12 25 25 12 25 12 25 13 25 13 24 13 24 13 24 13 24 13 23 13 23 12 22 12 21 12 21 12 20 12 19 12 19 12 18 13 17 13 17 13 16 13 16 13 16 13 16 13 15 12 15 12 15 12 15 12 14 11 14 11 14 11 14 10 14 10 14 10 15 10 15 9 15 9 15 9 16 9 17 8 18 8 19 8 20 8 21 8 22 9 23 9 24 9 25 9 25 9 25 5 25 5 5 2
+PP 40 5 60 5 60 9 60 9 60 9 59 9 58 9 57 8 56 8 55 8 54 8 53 8 52 9 51 9 50 9 50 9 50 10 50 10 49 10 49 10 49 11 49 11 49 11 49 12 50 12 50 12 50 12 50 13 51 13 51 13 51 13 51 13 52 13 52 13 53 12 54 12 54 12 55 12 56 12 56 12 57 12 58 13 58 13 59 13 59 13 59 13 59 13 60 13 60 12 60 12 60 25 47 25 47 25 48 25 48 24 48 24 48 24 48 24 48 23 48 23 47 22 47 21 47 21 47 20 47 19 47 19 47 18 48 17 48 17 48 16 48 16 48 16 48 16 48 15 47 15 47 15 47 15 47 14 46 14 46 14 46 14 45 14 45 14 45 15 45 15 44 15 44 15 44 16 44 17 43 18 43 19 43 20 43 21 43 22 44 23 44 24 44 25 44 25 44 25 40 25 40 5 2
+PP 5 40 25 40 25 44 24 44 22 43 20 43 18 43 16 44 15 44 13 45 12 47 10 48 9 50 9 51 8 53 8 55 8 57 9 59 9 60 5 60 5 40 2
+PP 40 40 60 40 60 44 59 44 57 43 55 43 53 43 51 44 50 44 48 45 47 47 45 48 44 50 44 51 43 53 43 55 43 57 44 59 44 60 40 60 40 40 2
+PP 15 15 28 15 27 16 27 16 28 18 28 19 28 20 28 21 28 22 27 24 27 24 30 27 31 25 31 24 32 22 32 20 32 18 31 16 31 15 35 15 35 35 15 35 15 31 16 31 18 32 20 32 22 32 24 31 25 31 27 30 24 27 24 27 22 28 21 28 20 28 19 28 18 28 16 27 16 27 15 28 15 15 1
+PP 15 50 35 50 35 70 15 70 15 50 1
+PP 50 15 63 15 62 16 62 16 63 18 63 19 63 20 63 21 63 22 62 24 62 24 65 27 66 25 66 24 67 22 67 20 67 18 66 16 66 15 70 15 70 35 50 35 50 31 51 31 53 32 55 32 57 32 59 31 60 31 62 30 59 27 59 27 57 28 56 28 55 28 54 28 53 28 51 27 51 27 50 28 50 15 2
+PP 50 50 70 50 70 70 50 70 50 50 2
+pa 20 20 16 16 6 0
+pa 55 20 16 16 6 0
+pa 20 55 16 16 6 0
+pa 55 55 16 16 6 0
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.bottom.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.bottom.gbr	(revision 18980)
@@ -0,0 +1,67 @@
+G04 start of page 5 for group 10 layer_idx 1 *
+G04 Title: thermals vs. multiple layer polygons, bottom_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD20C,0.0315*%
+%ADD19C,0.0787*%
+%ADD18C,0.0001*%
+G54D18*G36*
+X7500Y42500D02*X13914D01*
+X13400Y41986D01*
+X13519Y41793D01*
+X13756Y41220D01*
+X13901Y40618D01*
+X13937Y40000D01*
+X13901Y39382D01*
+X13756Y38780D01*
+X13519Y38207D01*
+X13400Y38014D01*
+X14855Y36560D01*
+X15306Y37296D01*
+X15664Y38160D01*
+X15882Y39068D01*
+X15937Y40000D01*
+X15882Y40932D01*
+X15664Y41840D01*
+X15391Y42500D01*
+X17500D01*
+Y32500D01*
+X7500D01*
+Y34609D01*
+X8160Y34336D01*
+X9068Y34118D01*
+X10000Y34045D01*
+X10932Y34118D01*
+X11840Y34336D01*
+X12704Y34694D01*
+X13440Y35145D01*
+X11986Y36600D01*
+X11793Y36481D01*
+X11220Y36244D01*
+X10618Y36099D01*
+X10000Y36051D01*
+X9382Y36099D01*
+X8780Y36244D01*
+X8207Y36481D01*
+X8014Y36600D01*
+X7500Y36086D01*
+Y42500D01*
+G37*
+G36*
+Y25000D02*X17500D01*
+Y15000D01*
+X7500D01*
+Y25000D01*
+G37*
+G54D19*X10000Y40000D03*
+X27500D03*
+X10000Y22500D03*
+X27500D03*
+G54D20*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.fab.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.fab.gbr	(revision 18980)
@@ -0,0 +1,1915 @@
+G04 start of page 7 for group -1 layer_idx 16777221 *
+G04 Title: thermals vs. multiple layer polygons, <virtual group> *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD25C,0.0100*%
+%ADD24C,0.0001*%
+%ADD23C,0.0060*%
+%ADD22C,0.0080*%
+G54D22*X10000Y40000D02*Y38400D01*
+Y40000D02*X11387Y40800D01*
+X10000Y40000D02*X8613Y40800D01*
+X27500Y40000D02*Y38400D01*
+Y40000D02*X28887Y40800D01*
+X27500Y40000D02*X26113Y40800D01*
+X10000Y22500D02*Y20900D01*
+Y22500D02*X11387Y23300D01*
+X10000Y22500D02*X8613Y23300D01*
+X27500Y22500D02*Y20900D01*
+Y22500D02*X28887Y23300D01*
+X27500Y22500D02*X26113Y23300D01*
+X15000Y106250D02*Y104650D01*
+Y106250D02*X16387Y107050D01*
+X15000Y106250D02*X13613Y107050D01*
+G54D23*X135000Y110000D02*X136500Y107000D01*
+X138000Y110000D01*
+X136500Y107000D02*Y104000D01*
+X139800Y107300D02*X142050D01*
+X139800Y104000D02*X142800D01*
+X139800Y110000D02*Y104000D01*
+Y110000D02*X142800D01*
+X147600D02*X148350Y109250D01*
+X145350Y110000D02*X147600D01*
+X144600Y109250D02*X145350Y110000D01*
+X144600Y109250D02*Y107750D01*
+X145350Y107000D01*
+X147600D01*
+X148350Y106250D01*
+Y104750D01*
+X147600Y104000D02*X148350Y104750D01*
+X145350Y104000D02*X147600D01*
+X144600Y104750D02*X145350Y104000D01*
+X98000Y106250D02*X101000Y110000D01*
+X98000Y106250D02*X101750D01*
+X101000Y110000D02*Y104000D01*
+G54D24*G36*
+X45000Y110000D02*Y104000D01*
+X49500D01*
+Y110000D01*
+X45000D01*
+G37*
+G36*
+X50400D02*Y104000D01*
+X54900D01*
+Y110000D01*
+X50400D01*
+G37*
+G36*
+X55800D02*Y104000D01*
+X60300D01*
+Y110000D01*
+X55800D01*
+G37*
+G54D23*X61200Y109250D02*X61950Y110000D01*
+X63450D01*
+X64200Y109250D01*
+X63450Y104000D02*X64200Y104750D01*
+X61950Y104000D02*X63450D01*
+X61200Y104750D02*X61950Y104000D01*
+Y107300D02*X63450D01*
+X64200Y109250D02*Y108050D01*
+Y106550D02*Y104750D01*
+Y106550D02*X63450Y107300D01*
+X64200Y108050D02*X63450Y107300D01*
+X66000Y109250D02*X66750Y110000D01*
+X69000D01*
+X69750Y109250D01*
+Y107750D01*
+X66000Y104000D02*X69750Y107750D01*
+X66000Y104000D02*X69750D01*
+X3000Y125000D02*X3750Y124250D01*
+X750Y125000D02*X3000D01*
+X0Y124250D02*X750Y125000D01*
+X0Y124250D02*Y122750D01*
+X750Y122000D01*
+X3000D01*
+X3750Y121250D01*
+Y119750D01*
+X3000Y119000D02*X3750Y119750D01*
+X750Y119000D02*X3000D01*
+X0Y119750D02*X750Y119000D01*
+G54D24*G36*
+X5550Y125000D02*Y119000D01*
+X10050D01*
+Y125000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y119000D01*
+X15450D01*
+Y125000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y119000D01*
+X20850D01*
+Y125000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y119000D01*
+X26250D01*
+Y125000D01*
+X21750D01*
+G37*
+G36*
+X27150D02*Y119000D01*
+X31650D01*
+Y125000D01*
+X27150D01*
+G37*
+G54D23*X0Y118000D02*X5550D01*
+X41750Y125000D02*Y119000D01*
+X43700Y125000D02*X44750Y123950D01*
+Y120050D01*
+X43700Y119000D02*X44750Y120050D01*
+X41000Y119000D02*X43700D01*
+X41000Y125000D02*X43700D01*
+G54D24*G36*
+X46550D02*Y119000D01*
+X51050D01*
+Y125000D01*
+X46550D01*
+G37*
+G36*
+X51950D02*Y119000D01*
+X56450D01*
+Y125000D01*
+X51950D01*
+G37*
+G36*
+X57350D02*Y119000D01*
+X61850D01*
+Y125000D01*
+X57350D01*
+G37*
+G36*
+X62750D02*Y119000D01*
+X67250D01*
+Y125000D01*
+X62750D01*
+G37*
+G36*
+X70850D02*Y119000D01*
+X75350D01*
+Y125000D01*
+X70850D01*
+G37*
+G54D23*X76250D02*X77750D01*
+X77000D02*Y119000D01*
+X76250D02*X77750D01*
+G54D24*G36*
+X79550Y125000D02*Y119000D01*
+X84050D01*
+Y125000D01*
+X79550D01*
+G37*
+G36*
+X84950D02*Y119000D01*
+X89450D01*
+Y125000D01*
+X84950D01*
+G37*
+G36*
+X90350D02*Y119000D01*
+X94850D01*
+Y125000D01*
+X90350D01*
+G37*
+G36*
+X95750D02*Y119000D01*
+X100250D01*
+Y125000D01*
+X95750D01*
+G37*
+G54D23*X41000Y118000D02*X52550D01*
+X96050Y119000D02*X98000D01*
+X95000Y120050D02*X96050Y119000D01*
+X95000Y123950D02*Y120050D01*
+Y123950D02*X96050Y125000D01*
+X98000D01*
+G54D24*G36*
+X99800D02*Y119000D01*
+X104300D01*
+Y125000D01*
+X99800D01*
+G37*
+G36*
+X105200D02*Y119000D01*
+X109700D01*
+Y125000D01*
+X105200D01*
+G37*
+G36*
+X110600D02*Y119000D01*
+X115100D01*
+Y125000D01*
+X110600D01*
+G37*
+G36*
+X116000D02*Y119000D01*
+X120500D01*
+Y125000D01*
+X116000D01*
+G37*
+G54D23*X95000Y118000D02*X99800D01*
+X130750Y125000D02*Y119000D01*
+X130000Y125000D02*X133000D01*
+X133750Y124250D01*
+Y122750D01*
+X133000Y122000D02*X133750Y122750D01*
+X130750Y122000D02*X133000D01*
+G54D24*G36*
+X135550Y125000D02*Y119000D01*
+X140050D01*
+Y125000D01*
+X135550D01*
+G37*
+G36*
+X140950D02*Y119000D01*
+X145450D01*
+Y125000D01*
+X140950D01*
+G37*
+G36*
+X146350D02*Y119000D01*
+X150850D01*
+Y125000D01*
+X146350D01*
+G37*
+G36*
+X151750D02*Y119000D01*
+X156250D01*
+Y125000D01*
+X151750D01*
+G37*
+G36*
+X157150D02*Y119000D01*
+X161650D01*
+Y125000D01*
+X157150D01*
+G37*
+G36*
+X162550D02*Y119000D01*
+X167050D01*
+Y125000D01*
+X162550D01*
+G37*
+G54D23*X130000Y118000D02*X135550D01*
+X0Y140000D02*X3000D01*
+X1500D02*Y134000D01*
+G54D24*G36*
+X4800Y140000D02*Y134000D01*
+X9300D01*
+Y140000D01*
+X4800D01*
+G37*
+G36*
+X10200D02*Y134000D01*
+X14700D01*
+Y140000D01*
+X10200D01*
+G37*
+G36*
+X15600D02*Y134000D01*
+X20100D01*
+Y140000D01*
+X15600D01*
+G37*
+G36*
+X21000D02*Y134000D01*
+X25500D01*
+Y140000D01*
+X21000D01*
+G37*
+G36*
+X29100D02*Y134000D01*
+X33600D01*
+Y140000D01*
+X29100D01*
+G37*
+G36*
+X34500D02*Y134000D01*
+X39000D01*
+Y140000D01*
+X34500D01*
+G37*
+G36*
+X39900D02*Y134000D01*
+X44400D01*
+Y140000D01*
+X39900D01*
+G37*
+G54D23*X48000Y138800D02*X49200Y140000D01*
+Y134000D01*
+X48000D02*X50250D01*
+G54D24*G36*
+X54750Y140000D02*Y134000D01*
+X59250D01*
+Y140000D01*
+X54750D01*
+G37*
+G36*
+X60150D02*Y134000D01*
+X64650D01*
+Y140000D01*
+X60150D01*
+G37*
+G36*
+X65550D02*Y134000D01*
+X70050D01*
+Y140000D01*
+X65550D01*
+G37*
+G36*
+X70950D02*Y134000D01*
+X75450D01*
+Y140000D01*
+X70950D01*
+G37*
+G36*
+X76350D02*Y134000D01*
+X80850D01*
+Y140000D01*
+X76350D01*
+G37*
+G36*
+X81750D02*Y134000D01*
+X86250D01*
+Y140000D01*
+X81750D01*
+G37*
+G36*
+X87150D02*Y134000D01*
+X91650D01*
+Y140000D01*
+X87150D01*
+G37*
+G36*
+X92550D02*Y134000D01*
+X97050D01*
+Y140000D01*
+X92550D01*
+G37*
+G36*
+X97950D02*Y134000D01*
+X102450D01*
+Y140000D01*
+X97950D01*
+G37*
+G36*
+X106050D02*Y134000D01*
+X110550D01*
+Y140000D01*
+X106050D01*
+G37*
+G36*
+X111450D02*Y134000D01*
+X115950D01*
+Y140000D01*
+X111450D01*
+G37*
+G36*
+X116850D02*Y134000D01*
+X121350D01*
+Y140000D01*
+X116850D01*
+G37*
+G36*
+X122250D02*Y134000D01*
+X126750D01*
+Y140000D01*
+X122250D01*
+G37*
+G36*
+X127650D02*Y134000D01*
+X132150D01*
+Y140000D01*
+X127650D01*
+G37*
+G36*
+X135750D02*Y134000D01*
+X140250D01*
+Y140000D01*
+X135750D01*
+G37*
+G36*
+X141150D02*Y134000D01*
+X145650D01*
+Y140000D01*
+X141150D01*
+G37*
+G36*
+X146550D02*Y134000D01*
+X151050D01*
+Y140000D01*
+X146550D01*
+G37*
+G36*
+X151950D02*Y134000D01*
+X156450D01*
+Y140000D01*
+X151950D01*
+G37*
+G36*
+X157350D02*Y134000D01*
+X161850D01*
+Y140000D01*
+X157350D01*
+G37*
+G36*
+X165450D02*Y134000D01*
+X169950D01*
+Y140000D01*
+X165450D01*
+G37*
+G36*
+X170850D02*Y134000D01*
+X175350D01*
+Y140000D01*
+X170850D01*
+G37*
+G36*
+X176250D02*Y134000D01*
+X180750D01*
+Y140000D01*
+X176250D01*
+G37*
+G36*
+X181650D02*Y134000D01*
+X186150D01*
+Y140000D01*
+X181650D01*
+G37*
+G36*
+X189750D02*Y134000D01*
+X194250D01*
+Y140000D01*
+X189750D01*
+G37*
+G36*
+X195150D02*Y134000D01*
+X199650D01*
+Y140000D01*
+X195150D01*
+G37*
+G36*
+X203250D02*Y134000D01*
+X207750D01*
+Y140000D01*
+X203250D01*
+G37*
+G36*
+X208650D02*Y134000D01*
+X213150D01*
+Y140000D01*
+X208650D01*
+G37*
+G36*
+X214050D02*Y134000D01*
+X218550D01*
+Y140000D01*
+X214050D01*
+G37*
+G36*
+X219450D02*Y134000D01*
+X223950D01*
+Y140000D01*
+X219450D01*
+G37*
+G36*
+X227550D02*Y134000D01*
+X232050D01*
+Y140000D01*
+X227550D01*
+G37*
+G36*
+X232950D02*Y134000D01*
+X237450D01*
+Y140000D01*
+X232950D01*
+G37*
+G36*
+X238350D02*Y134000D01*
+X242850D01*
+Y140000D01*
+X238350D01*
+G37*
+G36*
+X243750D02*Y134000D01*
+X248250D01*
+Y140000D01*
+X243750D01*
+G37*
+G36*
+X249150D02*Y134000D01*
+X253650D01*
+Y140000D01*
+X249150D01*
+G37*
+G36*
+X254550D02*Y134000D01*
+X259050D01*
+Y140000D01*
+X254550D01*
+G37*
+G36*
+X259950D02*Y134000D01*
+X264450D01*
+Y140000D01*
+X259950D01*
+G37*
+G54D23*X268050Y136250D02*X271050Y140000D01*
+X268050Y136250D02*X271800D01*
+X271050Y140000D02*Y134000D01*
+G54D24*G36*
+X276300Y140000D02*Y134000D01*
+X280800D01*
+Y140000D01*
+X276300D01*
+G37*
+G36*
+X281700D02*Y134000D01*
+X286200D01*
+Y140000D01*
+X281700D01*
+G37*
+G36*
+X287100D02*Y134000D01*
+X291600D01*
+Y140000D01*
+X287100D01*
+G37*
+G36*
+X292500D02*Y134000D01*
+X297000D01*
+Y140000D01*
+X292500D01*
+G37*
+G36*
+X297900D02*Y134000D01*
+X302400D01*
+Y140000D01*
+X297900D01*
+G37*
+G36*
+X306000D02*Y134000D01*
+X310500D01*
+Y140000D01*
+X306000D01*
+G37*
+G36*
+X311400D02*Y134000D01*
+X315900D01*
+Y140000D01*
+X311400D01*
+G37*
+G36*
+X316800D02*Y134000D01*
+X321300D01*
+Y140000D01*
+X316800D01*
+G37*
+G36*
+X322200D02*Y134000D01*
+X326700D01*
+Y140000D01*
+X322200D01*
+G37*
+G36*
+X327600D02*Y134000D01*
+X332100D01*
+Y140000D01*
+X327600D01*
+G37*
+G54D25*X0Y50000D02*X50000D01*
+X0D02*Y0D01*
+X50000Y50000D02*Y0D01*
+X0D02*X50000D01*
+G54D23*X200000Y65000D02*Y59000D01*
+Y65000D02*X202250Y62000D01*
+X204500Y65000D01*
+Y59000D01*
+G54D24*G36*
+X206300Y65000D02*Y59000D01*
+X210800D01*
+Y65000D01*
+X206300D01*
+G37*
+G36*
+X211700D02*Y59000D01*
+X216200D01*
+Y65000D01*
+X211700D01*
+G37*
+G36*
+X217100D02*Y59000D01*
+X221600D01*
+Y65000D01*
+X217100D01*
+G37*
+G36*
+X222500D02*Y59000D01*
+X227000D01*
+Y65000D01*
+X222500D01*
+G37*
+G36*
+X227900D02*Y59000D01*
+X232400D01*
+Y65000D01*
+X227900D01*
+G37*
+G36*
+X233300D02*Y59000D01*
+X237800D01*
+Y65000D01*
+X233300D01*
+G37*
+G54D23*X242150D02*Y59000D01*
+X244100Y65000D02*X245150Y63950D01*
+Y60050D01*
+X244100Y59000D02*X245150Y60050D01*
+X241400Y59000D02*X244100D01*
+X241400Y65000D02*X244100D01*
+G54D24*G36*
+X246950D02*Y59000D01*
+X251450D01*
+Y65000D01*
+X246950D01*
+G37*
+G36*
+X252350D02*Y59000D01*
+X256850D01*
+Y65000D01*
+X252350D01*
+G37*
+G36*
+X257750D02*Y59000D01*
+X262250D01*
+Y65000D01*
+X257750D01*
+G37*
+G36*
+X263150D02*Y59000D01*
+X267650D01*
+Y65000D01*
+X263150D01*
+G37*
+G36*
+X268550D02*Y59000D01*
+X273050D01*
+Y65000D01*
+X268550D01*
+G37*
+G36*
+X273950D02*Y59000D01*
+X278450D01*
+Y65000D01*
+X273950D01*
+G37*
+G36*
+X279350D02*Y59000D01*
+X283850D01*
+Y65000D01*
+X279350D01*
+G37*
+G36*
+X284750D02*Y59000D01*
+X289250D01*
+Y65000D01*
+X284750D01*
+G37*
+G36*
+X290150D02*Y59000D01*
+X294650D01*
+Y65000D01*
+X290150D01*
+G37*
+G36*
+X295550D02*Y59000D01*
+X300050D01*
+Y65000D01*
+X295550D01*
+G37*
+G54D23*X303650D02*X306650D01*
+X303650D02*Y62000D01*
+X304400Y62750D01*
+X305900D01*
+X306650Y62000D01*
+Y59750D01*
+X305900Y59000D02*X306650Y59750D01*
+X304400Y59000D02*X305900D01*
+X303650Y59750D02*X304400Y59000D01*
+G54D24*G36*
+X308450Y65000D02*Y59000D01*
+X312950D01*
+Y65000D01*
+X308450D01*
+G37*
+G36*
+X313850D02*Y59000D01*
+X318350D01*
+Y65000D01*
+X313850D01*
+G37*
+G36*
+X319250D02*Y59000D01*
+X323750D01*
+Y65000D01*
+X319250D01*
+G37*
+G36*
+X324650D02*Y59000D01*
+X329150D01*
+Y65000D01*
+X324650D01*
+G37*
+G36*
+X330050D02*Y59000D01*
+X334550D01*
+Y65000D01*
+X330050D01*
+G37*
+G36*
+X335450D02*Y59000D01*
+X339950D01*
+Y65000D01*
+X335450D01*
+G37*
+G36*
+X340850D02*Y59000D01*
+X345350D01*
+Y65000D01*
+X340850D01*
+G37*
+G36*
+X346250D02*Y59000D01*
+X350750D01*
+Y65000D01*
+X346250D01*
+G37*
+G36*
+X351650D02*Y59000D01*
+X356150D01*
+Y65000D01*
+X351650D01*
+G37*
+G36*
+X359750D02*Y59000D01*
+X364250D01*
+Y65000D01*
+X359750D01*
+G37*
+G36*
+X365150D02*Y59000D01*
+X369650D01*
+Y65000D01*
+X365150D01*
+G37*
+G36*
+X370550D02*Y59000D01*
+X375050D01*
+Y65000D01*
+X370550D01*
+G37*
+G36*
+X375950D02*Y59000D01*
+X380450D01*
+Y65000D01*
+X375950D01*
+G37*
+G36*
+X384050D02*Y59000D01*
+X388550D01*
+Y65000D01*
+X384050D01*
+G37*
+G36*
+X389450D02*Y59000D01*
+X393950D01*
+Y65000D01*
+X389450D01*
+G37*
+G36*
+X394850D02*Y59000D01*
+X399350D01*
+Y65000D01*
+X394850D01*
+G37*
+G36*
+X400250D02*Y59000D01*
+X404750D01*
+Y65000D01*
+X400250D01*
+G37*
+G36*
+X405650D02*Y59000D01*
+X410150D01*
+Y65000D01*
+X405650D01*
+G37*
+G54D23*X413750D02*X416750D01*
+X413750D02*Y62000D01*
+X414500Y62750D01*
+X416000D01*
+X416750Y62000D01*
+Y59750D01*
+X416000Y59000D02*X416750Y59750D01*
+X414500Y59000D02*X416000D01*
+X413750Y59750D02*X414500Y59000D01*
+G54D24*G36*
+X418550Y65000D02*Y59000D01*
+X423050D01*
+Y65000D01*
+X418550D01*
+G37*
+G36*
+X423950D02*Y59000D01*
+X428450D01*
+Y65000D01*
+X423950D01*
+G37*
+G36*
+X429350D02*Y59000D01*
+X433850D01*
+Y65000D01*
+X429350D01*
+G37*
+G36*
+X434750D02*Y59000D01*
+X439250D01*
+Y65000D01*
+X434750D01*
+G37*
+G36*
+X440150D02*Y59000D01*
+X444650D01*
+Y65000D01*
+X440150D01*
+G37*
+G36*
+X445550D02*Y59000D01*
+X450050D01*
+Y65000D01*
+X445550D01*
+G37*
+G36*
+X450950D02*Y59000D01*
+X455450D01*
+Y65000D01*
+X450950D01*
+G37*
+G36*
+X456350D02*Y59000D01*
+X460850D01*
+Y65000D01*
+X456350D01*
+G37*
+G36*
+X461750D02*Y59000D01*
+X466250D01*
+Y65000D01*
+X461750D01*
+G37*
+G36*
+X469850D02*Y59000D01*
+X474350D01*
+Y65000D01*
+X469850D01*
+G37*
+G36*
+X475250D02*Y59000D01*
+X479750D01*
+Y65000D01*
+X475250D01*
+G37*
+G36*
+X480650D02*Y59000D01*
+X485150D01*
+Y65000D01*
+X480650D01*
+G37*
+G36*
+X486050D02*Y59000D01*
+X490550D01*
+Y65000D01*
+X486050D01*
+G37*
+G36*
+X494150D02*Y59000D01*
+X498650D01*
+Y65000D01*
+X494150D01*
+G37*
+G36*
+X499550D02*Y59000D01*
+X504050D01*
+Y65000D01*
+X499550D01*
+G37*
+G36*
+X504950D02*Y59000D01*
+X509450D01*
+Y65000D01*
+X504950D01*
+G37*
+G36*
+X510350D02*Y59000D01*
+X514850D01*
+Y65000D01*
+X510350D01*
+G37*
+G54D23*X0Y-8000D02*X3000D01*
+X3750Y-7250D01*
+Y-5450D02*Y-7250D01*
+X3000Y-4700D02*X3750Y-5450D01*
+X750Y-4700D02*X3000D01*
+X750Y-2000D02*Y-8000D01*
+X0Y-2000D02*X3000D01*
+X3750Y-2750D01*
+Y-3950D01*
+X3000Y-4700D02*X3750Y-3950D01*
+G54D24*G36*
+X5550Y-2000D02*Y-8000D01*
+X10050D01*
+Y-2000D01*
+X5550D01*
+G37*
+G36*
+X10950D02*Y-8000D01*
+X15450D01*
+Y-2000D01*
+X10950D01*
+G37*
+G36*
+X16350D02*Y-8000D01*
+X20850D01*
+Y-2000D01*
+X16350D01*
+G37*
+G36*
+X21750D02*Y-8000D01*
+X26250D01*
+Y-2000D01*
+X21750D01*
+G37*
+G36*
+X29850D02*Y-8000D01*
+X34350D01*
+Y-2000D01*
+X29850D01*
+G37*
+G36*
+X35250D02*Y-8000D01*
+X39750D01*
+Y-2000D01*
+X35250D01*
+G37*
+G36*
+X40650D02*Y-8000D01*
+X45150D01*
+Y-2000D01*
+X40650D01*
+G37*
+G36*
+X46050D02*Y-8000D01*
+X50550D01*
+Y-2000D01*
+X46050D01*
+G37*
+G36*
+X51450D02*Y-8000D01*
+X55950D01*
+Y-2000D01*
+X51450D01*
+G37*
+G36*
+X56850D02*Y-8000D01*
+X61350D01*
+Y-2000D01*
+X56850D01*
+G37*
+G36*
+X62250D02*Y-8000D01*
+X66750D01*
+Y-2000D01*
+X62250D01*
+G37*
+G36*
+X70350D02*Y-8000D01*
+X74850D01*
+Y-2000D01*
+X70350D01*
+G37*
+G36*
+X75750D02*Y-8000D01*
+X80250D01*
+Y-2000D01*
+X75750D01*
+G37*
+G36*
+X83850D02*Y-8000D01*
+X88350D01*
+Y-2000D01*
+X83850D01*
+G37*
+G36*
+X89250D02*Y-8000D01*
+X93750D01*
+Y-2000D01*
+X89250D01*
+G37*
+G36*
+X94650D02*Y-8000D01*
+X99150D01*
+Y-2000D01*
+X94650D01*
+G37*
+G36*
+X102750D02*Y-8000D01*
+X107250D01*
+Y-2000D01*
+X102750D01*
+G37*
+G36*
+X108150D02*Y-8000D01*
+X112650D01*
+Y-2000D01*
+X108150D01*
+G37*
+G36*
+X113550D02*Y-8000D01*
+X118050D01*
+Y-2000D01*
+X113550D01*
+G37*
+G36*
+X118950D02*Y-8000D01*
+X123450D01*
+Y-2000D01*
+X118950D01*
+G37*
+G36*
+X124350D02*Y-8000D01*
+X128850D01*
+Y-2000D01*
+X124350D01*
+G37*
+G36*
+X129750D02*Y-8000D01*
+X134250D01*
+Y-2000D01*
+X129750D01*
+G37*
+G36*
+X135150D02*Y-8000D01*
+X139650D01*
+Y-2000D01*
+X135150D01*
+G37*
+G36*
+X140550D02*Y-8000D01*
+X145050D01*
+Y-2000D01*
+X140550D01*
+G37*
+G36*
+X145950D02*Y-8000D01*
+X150450D01*
+Y-2000D01*
+X145950D01*
+G37*
+G36*
+X151350D02*Y-8000D01*
+X155850D01*
+Y-2000D01*
+X151350D01*
+G37*
+G36*
+X159450D02*Y-8000D01*
+X163950D01*
+Y-2000D01*
+X159450D01*
+G37*
+G36*
+X164850D02*Y-8000D01*
+X169350D01*
+Y-2000D01*
+X164850D01*
+G37*
+G36*
+X172950D02*Y-8000D01*
+X177450D01*
+Y-2000D01*
+X172950D01*
+G37*
+G36*
+X178350D02*Y-8000D01*
+X182850D01*
+Y-2000D01*
+X178350D01*
+G37*
+G36*
+X183750D02*Y-8000D01*
+X188250D01*
+Y-2000D01*
+X183750D01*
+G37*
+G36*
+X189150D02*Y-8000D01*
+X193650D01*
+Y-2000D01*
+X189150D01*
+G37*
+G54D23*X197250Y-7250D02*X198000Y-8000D01*
+X197250Y-6050D02*Y-7250D01*
+Y-6050D02*X198300Y-5000D01*
+X199200D01*
+X200250Y-6050D01*
+Y-7250D01*
+X199500Y-8000D02*X200250Y-7250D01*
+X198000Y-8000D02*X199500D01*
+X197250Y-3950D02*X198300Y-5000D01*
+X197250Y-2750D02*Y-3950D01*
+Y-2750D02*X198000Y-2000D01*
+X199500D01*
+X200250Y-2750D01*
+Y-3950D01*
+X199200Y-5000D02*X200250Y-3950D01*
+G54D24*G36*
+X202050Y-2000D02*Y-8000D01*
+X206550D01*
+Y-2000D01*
+X202050D01*
+G37*
+G36*
+X207450D02*Y-8000D01*
+X211950D01*
+Y-2000D01*
+X207450D01*
+G37*
+G36*
+X212850D02*Y-8000D01*
+X217350D01*
+Y-2000D01*
+X212850D01*
+G37*
+G36*
+X218250D02*Y-8000D01*
+X222750D01*
+Y-2000D01*
+X218250D01*
+G37*
+G36*
+X223650D02*Y-8000D01*
+X228150D01*
+Y-2000D01*
+X223650D01*
+G37*
+G36*
+X229050D02*Y-8000D01*
+X233550D01*
+Y-2000D01*
+X229050D01*
+G37*
+G36*
+X234450D02*Y-8000D01*
+X238950D01*
+Y-2000D01*
+X234450D01*
+G37*
+G36*
+X242550D02*Y-8000D01*
+X247050D01*
+Y-2000D01*
+X242550D01*
+G37*
+G36*
+X247950D02*Y-8000D01*
+X252450D01*
+Y-2000D01*
+X247950D01*
+G37*
+G36*
+X253350D02*Y-8000D01*
+X257850D01*
+Y-2000D01*
+X253350D01*
+G37*
+G36*
+X261450D02*Y-8000D01*
+X265950D01*
+Y-2000D01*
+X261450D01*
+G37*
+G36*
+X266850D02*Y-8000D01*
+X271350D01*
+Y-2000D01*
+X266850D01*
+G37*
+G36*
+X272250D02*Y-8000D01*
+X276750D01*
+Y-2000D01*
+X272250D01*
+G37*
+G36*
+X277650D02*Y-8000D01*
+X282150D01*
+Y-2000D01*
+X277650D01*
+G37*
+G36*
+X283050D02*Y-8000D01*
+X287550D01*
+Y-2000D01*
+X283050D01*
+G37*
+G36*
+X288450D02*Y-8000D01*
+X292950D01*
+Y-2000D01*
+X288450D01*
+G37*
+G36*
+X293850D02*Y-8000D01*
+X298350D01*
+Y-2000D01*
+X293850D01*
+G37*
+G36*
+X299250D02*Y-8000D01*
+X303750D01*
+Y-2000D01*
+X299250D01*
+G37*
+G36*
+X304650D02*Y-8000D01*
+X309150D01*
+Y-2000D01*
+X304650D01*
+G37*
+G36*
+X312750D02*Y-8000D01*
+X317250D01*
+Y-2000D01*
+X312750D01*
+G37*
+G36*
+X320850D02*Y-8000D01*
+X325350D01*
+Y-2000D01*
+X320850D01*
+G37*
+G36*
+X326250D02*Y-8000D01*
+X330750D01*
+Y-2000D01*
+X326250D01*
+G37*
+G36*
+X331650D02*Y-8000D01*
+X336150D01*
+Y-2000D01*
+X331650D01*
+G37*
+G36*
+X339750D02*Y-8000D01*
+X344250D01*
+Y-2000D01*
+X339750D01*
+G37*
+G36*
+X345150D02*Y-8000D01*
+X349650D01*
+Y-2000D01*
+X345150D01*
+G37*
+G54D23*X353250D02*X356250D01*
+X353250D02*Y-5000D01*
+X354000Y-4250D01*
+X355500D01*
+X356250Y-5000D01*
+Y-7250D01*
+X355500Y-8000D02*X356250Y-7250D01*
+X354000Y-8000D02*X355500D01*
+X353250Y-7250D02*X354000Y-8000D01*
+G54D24*G36*
+X358050Y-2000D02*Y-8000D01*
+X362550D01*
+Y-2000D01*
+X358050D01*
+G37*
+G36*
+X363450D02*Y-8000D01*
+X367950D01*
+Y-2000D01*
+X363450D01*
+G37*
+G36*
+X368850D02*Y-8000D01*
+X373350D01*
+Y-2000D01*
+X368850D01*
+G37*
+G36*
+X374250D02*Y-8000D01*
+X378750D01*
+Y-2000D01*
+X374250D01*
+G37*
+G36*
+X379650D02*Y-8000D01*
+X384150D01*
+Y-2000D01*
+X379650D01*
+G37*
+G36*
+X385050D02*Y-8000D01*
+X389550D01*
+Y-2000D01*
+X385050D01*
+G37*
+G36*
+X390450D02*Y-8000D01*
+X394950D01*
+Y-2000D01*
+X390450D01*
+G37*
+G36*
+X395850D02*Y-8000D01*
+X400350D01*
+Y-2000D01*
+X395850D01*
+G37*
+G36*
+X401250D02*Y-8000D01*
+X405750D01*
+Y-2000D01*
+X401250D01*
+G37*
+G36*
+X406650D02*Y-8000D01*
+X411150D01*
+Y-2000D01*
+X406650D01*
+G37*
+G54D23*X412050D02*X415050D01*
+X412050D02*Y-5000D01*
+X412800Y-4250D01*
+X414300D01*
+X415050Y-5000D01*
+Y-7250D01*
+X414300Y-8000D02*X415050Y-7250D01*
+X412800Y-8000D02*X414300D01*
+X412050Y-7250D02*X412800Y-8000D01*
+G54D24*G36*
+X416850Y-2000D02*Y-8000D01*
+X421350D01*
+Y-2000D01*
+X416850D01*
+G37*
+G36*
+X422250D02*Y-8000D01*
+X426750D01*
+Y-2000D01*
+X422250D01*
+G37*
+G36*
+X427650D02*Y-8000D01*
+X432150D01*
+Y-2000D01*
+X427650D01*
+G37*
+G36*
+X433050D02*Y-8000D01*
+X437550D01*
+Y-2000D01*
+X433050D01*
+G37*
+G36*
+X438450D02*Y-8000D01*
+X442950D01*
+Y-2000D01*
+X438450D01*
+G37*
+G36*
+X443850D02*Y-8000D01*
+X448350D01*
+Y-2000D01*
+X443850D01*
+G37*
+G36*
+X449250D02*Y-8000D01*
+X453750D01*
+Y-2000D01*
+X449250D01*
+G37*
+G36*
+X454650D02*Y-8000D01*
+X459150D01*
+Y-2000D01*
+X454650D01*
+G37*
+G36*
+X460050D02*Y-8000D01*
+X464550D01*
+Y-2000D01*
+X460050D01*
+G37*
+G36*
+X468150D02*Y-8000D01*
+X472650D01*
+Y-2000D01*
+X468150D01*
+G37*
+G36*
+X473550D02*Y-8000D01*
+X478050D01*
+Y-2000D01*
+X473550D01*
+G37*
+G36*
+X478950D02*Y-8000D01*
+X483450D01*
+Y-2000D01*
+X478950D01*
+G37*
+G36*
+X484350D02*Y-8000D01*
+X488850D01*
+Y-2000D01*
+X484350D01*
+G37*
+G54D23*X200750Y80000D02*Y74000D01*
+X202700Y80000D02*X203750Y78950D01*
+Y75050D01*
+X202700Y74000D02*X203750Y75050D01*
+X200000Y74000D02*X202700D01*
+X200000Y80000D02*X202700D01*
+G54D24*G36*
+X205550D02*Y74000D01*
+X210050D01*
+Y80000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y74000D01*
+X215450D01*
+Y80000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y74000D01*
+X220850D01*
+Y80000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y74000D01*
+X226250D01*
+Y80000D01*
+X221750D01*
+G37*
+G36*
+X229850D02*Y74000D01*
+X234350D01*
+Y80000D01*
+X229850D01*
+G37*
+G36*
+X235250D02*Y74000D01*
+X239750D01*
+Y80000D01*
+X235250D01*
+G37*
+G36*
+X240650D02*Y74000D01*
+X245150D01*
+Y80000D01*
+X240650D01*
+G37*
+G36*
+X246050D02*Y74000D01*
+X250550D01*
+Y80000D01*
+X246050D01*
+G37*
+G36*
+X251450D02*Y74000D01*
+X255950D01*
+Y80000D01*
+X251450D01*
+G37*
+G36*
+X256850D02*Y74000D01*
+X261350D01*
+Y80000D01*
+X256850D01*
+G37*
+G54D23*X200000Y93500D02*Y89000D01*
+Y93500D02*X201050Y95000D01*
+X202700D01*
+X203750Y93500D01*
+Y89000D01*
+X200000Y92000D02*X203750D01*
+G54D24*G36*
+X205550Y95000D02*Y89000D01*
+X210050D01*
+Y95000D01*
+X205550D01*
+G37*
+G36*
+X210950D02*Y89000D01*
+X215450D01*
+Y95000D01*
+X210950D01*
+G37*
+G36*
+X216350D02*Y89000D01*
+X220850D01*
+Y95000D01*
+X216350D01*
+G37*
+G36*
+X221750D02*Y89000D01*
+X226250D01*
+Y95000D01*
+X221750D01*
+G37*
+G36*
+X227150D02*Y89000D01*
+X231650D01*
+Y95000D01*
+X227150D01*
+G37*
+G36*
+X232550D02*Y89000D01*
+X237050D01*
+Y95000D01*
+X232550D01*
+G37*
+G54D23*X240650D02*X243650D01*
+X242150D02*Y89000D01*
+X245450Y92300D02*X247700D01*
+X245450Y89000D02*X248450D01*
+X245450Y95000D02*Y89000D01*
+Y95000D02*X248450D01*
+X253250D02*X254000Y94250D01*
+X251000Y95000D02*X253250D01*
+X250250Y94250D02*X251000Y95000D01*
+X250250Y94250D02*Y92750D01*
+X251000Y92000D01*
+X253250D01*
+X254000Y91250D01*
+Y89750D01*
+X253250Y89000D02*X254000Y89750D01*
+X251000Y89000D02*X253250D01*
+X250250Y89750D02*X251000Y89000D01*
+X255800Y95000D02*X258800D01*
+X257300D02*Y89000D01*
+X200000Y110000D02*X203000D01*
+X201500D02*Y104000D01*
+G54D24*G36*
+X204800Y110000D02*Y104000D01*
+X209300D01*
+Y110000D01*
+X204800D01*
+G37*
+G36*
+X210200D02*Y104000D01*
+X214700D01*
+Y110000D01*
+X210200D01*
+G37*
+G36*
+X215600D02*Y104000D01*
+X220100D01*
+Y110000D01*
+X215600D01*
+G37*
+G36*
+X221000D02*Y104000D01*
+X225500D01*
+Y110000D01*
+X221000D01*
+G37*
+G36*
+X226400D02*Y104000D01*
+X230900D01*
+Y110000D01*
+X226400D01*
+G37*
+G36*
+X234500D02*Y104000D01*
+X239000D01*
+Y110000D01*
+X234500D01*
+G37*
+G36*
+X239900D02*Y104000D01*
+X244400D01*
+Y110000D01*
+X239900D01*
+G37*
+G36*
+X245300D02*Y104000D01*
+X249800D01*
+Y110000D01*
+X245300D01*
+G37*
+G36*
+X250700D02*Y104000D01*
+X255200D01*
+Y110000D01*
+X250700D01*
+G37*
+G36*
+X256100D02*Y104000D01*
+X260600D01*
+Y110000D01*
+X256100D01*
+G37*
+G36*
+X261500D02*Y104000D01*
+X266000D01*
+Y110000D01*
+X261500D01*
+G37*
+G36*
+X266900D02*Y104000D01*
+X271400D01*
+Y110000D01*
+X266900D01*
+G37*
+G36*
+X272300D02*Y104000D01*
+X276800D01*
+Y110000D01*
+X272300D01*
+G37*
+G36*
+X280400D02*Y104000D01*
+X284900D01*
+Y110000D01*
+X280400D01*
+G37*
+G36*
+X285800D02*Y104000D01*
+X290300D01*
+Y110000D01*
+X285800D01*
+G37*
+G36*
+X291200D02*Y104000D01*
+X295700D01*
+Y110000D01*
+X291200D01*
+G37*
+G36*
+X299300D02*Y104000D01*
+X303800D01*
+Y110000D01*
+X299300D01*
+G37*
+G36*
+X304700D02*Y104000D01*
+X309200D01*
+Y110000D01*
+X304700D01*
+G37*
+G36*
+X310100D02*Y104000D01*
+X314600D01*
+Y110000D01*
+X310100D01*
+G37*
+G36*
+X315500D02*Y104000D01*
+X320000D01*
+Y110000D01*
+X315500D01*
+G37*
+G36*
+X320900D02*Y104000D01*
+X325400D01*
+Y110000D01*
+X320900D01*
+G37*
+G36*
+X326300D02*Y104000D01*
+X330800D01*
+Y110000D01*
+X326300D01*
+G37*
+G36*
+X331700D02*Y104000D01*
+X336200D01*
+Y110000D01*
+X331700D01*
+G37*
+G36*
+X337100D02*Y104000D01*
+X341600D01*
+Y110000D01*
+X337100D01*
+G37*
+G36*
+X345200D02*Y104000D01*
+X349700D01*
+Y110000D01*
+X345200D01*
+G37*
+G36*
+X350600D02*Y104000D01*
+X355100D01*
+Y110000D01*
+X350600D01*
+G37*
+G36*
+X356000D02*Y104000D01*
+X360500D01*
+Y110000D01*
+X356000D01*
+G37*
+G36*
+X361400D02*Y104000D01*
+X365900D01*
+Y110000D01*
+X361400D01*
+G37*
+G36*
+X366800D02*Y104000D01*
+X371300D01*
+Y110000D01*
+X366800D01*
+G37*
+G36*
+X374900D02*Y104000D01*
+X379400D01*
+Y110000D01*
+X374900D01*
+G37*
+G36*
+X380300D02*Y104000D01*
+X384800D01*
+Y110000D01*
+X380300D01*
+G37*
+G36*
+X385700D02*Y104000D01*
+X390200D01*
+Y110000D01*
+X385700D01*
+G37*
+G36*
+X391100D02*Y104000D01*
+X395600D01*
+Y110000D01*
+X391100D01*
+G37*
+G36*
+X396500D02*Y104000D01*
+X401000D01*
+Y110000D01*
+X396500D01*
+G37*
+G36*
+X401900D02*Y104000D01*
+X406400D01*
+Y110000D01*
+X401900D01*
+G37*
+G36*
+X407300D02*Y104000D01*
+X411800D01*
+Y110000D01*
+X407300D01*
+G37*
+G36*
+X412700D02*Y104000D01*
+X417200D01*
+Y110000D01*
+X412700D01*
+G37*
+G36*
+X420800D02*Y104000D01*
+X425300D01*
+Y110000D01*
+X420800D01*
+G37*
+G54D23*X428900D02*Y104000D01*
+Y110000D02*X431900D01*
+X428900Y107300D02*X431150D01*
+G54D24*G36*
+X433700Y110000D02*Y104000D01*
+X438200D01*
+Y110000D01*
+X433700D01*
+G37*
+G36*
+X439100D02*Y104000D01*
+X443600D01*
+Y110000D01*
+X439100D01*
+G37*
+G36*
+X444500D02*Y104000D01*
+X449000D01*
+Y110000D01*
+X444500D01*
+G37*
+G36*
+X449900D02*Y104000D01*
+X454400D01*
+Y110000D01*
+X449900D01*
+G37*
+G36*
+X455300D02*Y104000D01*
+X459800D01*
+Y110000D01*
+X455300D01*
+G37*
+G36*
+X460700D02*Y104000D01*
+X465200D01*
+Y110000D01*
+X460700D01*
+G37*
+G36*
+X466100D02*Y104000D01*
+X470600D01*
+Y110000D01*
+X466100D01*
+G37*
+G36*
+X471500D02*Y104000D01*
+X476000D01*
+Y110000D01*
+X471500D01*
+G37*
+G36*
+X476900D02*Y104000D01*
+X481400D01*
+Y110000D01*
+X476900D01*
+G37*
+G36*
+X482300D02*Y104000D01*
+X486800D01*
+Y110000D01*
+X482300D01*
+G37*
+G54D23*X491150D02*Y104000D01*
+X493100Y110000D02*X494150Y108950D01*
+Y105050D01*
+X493100Y104000D02*X494150Y105050D01*
+X490400Y104000D02*X493100D01*
+X490400Y110000D02*X493100D01*
+G54D24*G36*
+X495950D02*Y104000D01*
+X500450D01*
+Y110000D01*
+X495950D01*
+G37*
+G36*
+X501350D02*Y104000D01*
+X505850D01*
+Y110000D01*
+X501350D01*
+G37*
+G36*
+X506750D02*Y104000D01*
+X511250D01*
+Y110000D01*
+X506750D01*
+G37*
+G36*
+X512150D02*Y104000D01*
+X516650D01*
+Y110000D01*
+X512150D01*
+G37*
+G36*
+X517550D02*Y104000D01*
+X522050D01*
+Y110000D01*
+X517550D01*
+G37*
+G36*
+X522950D02*Y104000D01*
+X527450D01*
+Y110000D01*
+X522950D01*
+G37*
+M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group5.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group5.gbr	(revision 18980)
@@ -0,0 +1,18 @@
+G04 start of page 3 for group 5 layer_idx 4 *
+G04 Title: thermals vs. multiple layer polygons, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP5*%
+%ADD15C,0.0315*%
+%ADD14C,0.0787*%
+G54D14*X10000Y40000D03*
+X27500D03*
+X10000Y22500D03*
+X27500D03*
+G54D15*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group7.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group7.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.group7.gbr	(revision 18980)
@@ -0,0 +1,18 @@
+G04 start of page 4 for group 7 layer_idx 5 *
+G04 Title: thermals vs. multiple layer polygons, Intern *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP7*%
+%ADD17C,0.0315*%
+%ADD16C,0.0787*%
+G54D16*X10000Y40000D03*
+X27500D03*
+X10000Y22500D03*
+X27500D03*
+G54D17*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,10 @@
+M48
+INCH
+T21C0.032
+%
+T21
+X001000Y004000
+X002750Y004000
+X001000Y002250
+X002750Y002250
+M30
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.top.gbr
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.gbr/thermal_layer.top.gbr	(revision 18980)
@@ -0,0 +1,315 @@
+G04 start of page 2 for group 3 layer_idx 0 *
+G04 Title: thermals vs. multiple layer polygons, top_copper *
+G04 Creator: <version>
+G04 CreationDate: <date>
+G04 For: TEST *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 50000 50000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD13C,0.0315*%
+%ADD12C,0.0787*%
+%ADD11C,0.0001*%
+G54D11*G36*
+X25000Y42500D02*X31414D01*
+X30900Y41986D01*
+X31019Y41793D01*
+X31256Y41220D01*
+X31401Y40618D01*
+X31437Y40000D01*
+X31401Y39382D01*
+X31256Y38780D01*
+X31019Y38207D01*
+X30900Y38014D01*
+X32355Y36560D01*
+X32806Y37296D01*
+X33164Y38160D01*
+X33382Y39068D01*
+X33437Y40000D01*
+X33382Y40932D01*
+X33164Y41840D01*
+X32891Y42500D01*
+X35000D01*
+Y32500D01*
+X25000D01*
+Y34609D01*
+X25660Y34336D01*
+X26568Y34118D01*
+X27500Y34045D01*
+X28432Y34118D01*
+X29340Y34336D01*
+X30204Y34694D01*
+X30940Y35145D01*
+X29486Y36600D01*
+X29293Y36481D01*
+X28720Y36244D01*
+X28118Y36099D01*
+X27500Y36051D01*
+X26882Y36099D01*
+X26280Y36244D01*
+X25707Y36481D01*
+X25514Y36600D01*
+X25000Y36086D01*
+Y42500D01*
+G37*
+G36*
+Y25000D02*X35000D01*
+Y15000D01*
+X25000D01*
+Y25000D01*
+G37*
+G36*
+X2500Y47500D02*X12500D01*
+Y45330D01*
+X12475Y45355D01*
+X12346Y45446D01*
+X12204Y45513D01*
+X11672Y45704D01*
+X11123Y45837D01*
+X10564Y45917D01*
+X10000Y45944D01*
+X9436Y45917D01*
+X8877Y45837D01*
+X8328Y45704D01*
+X7794Y45519D01*
+X7652Y45450D01*
+X7523Y45358D01*
+X7409Y45248D01*
+X7315Y45121D01*
+X7241Y44981D01*
+X7191Y44832D01*
+X7164Y44676D01*
+X7162Y44518D01*
+X7185Y44361D01*
+X7232Y44210D01*
+X7302Y44069D01*
+X7393Y43939D01*
+X7504Y43826D01*
+X7630Y43732D01*
+X7770Y43658D01*
+X7920Y43608D01*
+X8076Y43581D01*
+X8234Y43579D01*
+X8390Y43602D01*
+X8540Y43652D01*
+X8892Y43778D01*
+X9256Y43866D01*
+X9626Y43919D01*
+X10000Y43937D01*
+X10374Y43919D01*
+X10744Y43866D01*
+X11108Y43778D01*
+X11461Y43656D01*
+X11611Y43606D01*
+X11766Y43583D01*
+X11924Y43585D01*
+X12079Y43612D01*
+X12228Y43662D01*
+X12367Y43736D01*
+X12493Y43830D01*
+X12500Y43836D01*
+Y37500D01*
+X6170D01*
+X6174Y37504D01*
+X6268Y37630D01*
+X6342Y37770D01*
+X6392Y37920D01*
+X6419Y38076D01*
+X6421Y38234D01*
+X6398Y38390D01*
+X6348Y38540D01*
+X6222Y38892D01*
+X6134Y39256D01*
+X6081Y39626D01*
+X6063Y40000D01*
+X6081Y40374D01*
+X6134Y40744D01*
+X6222Y41108D01*
+X6344Y41461D01*
+X6394Y41611D01*
+X6417Y41766D01*
+X6415Y41924D01*
+X6388Y42079D01*
+X6338Y42228D01*
+X6264Y42367D01*
+X6170Y42493D01*
+X6058Y42603D01*
+X5929Y42694D01*
+X5788Y42764D01*
+X5638Y42811D01*
+X5482Y42833D01*
+X5325Y42832D01*
+X5169Y42805D01*
+X5020Y42754D01*
+X4881Y42681D01*
+X4755Y42587D01*
+X4645Y42475D01*
+X4554Y42346D01*
+X4487Y42204D01*
+X4296Y41672D01*
+X4163Y41123D01*
+X4083Y40564D01*
+X4056Y40000D01*
+X4083Y39436D01*
+X4163Y38877D01*
+X4296Y38328D01*
+X4481Y37794D01*
+X4550Y37652D01*
+X4642Y37523D01*
+X4664Y37500D01*
+X2500D01*
+Y47500D01*
+G37*
+G36*
+X20000D02*X30000D01*
+Y45330D01*
+X29975Y45355D01*
+X29846Y45446D01*
+X29704Y45513D01*
+X29172Y45704D01*
+X28623Y45837D01*
+X28064Y45917D01*
+X27500Y45944D01*
+X26936Y45917D01*
+X26377Y45837D01*
+X25828Y45704D01*
+X25294Y45519D01*
+X25152Y45450D01*
+X25023Y45358D01*
+X24909Y45248D01*
+X24815Y45121D01*
+X24741Y44981D01*
+X24691Y44832D01*
+X24664Y44676D01*
+X24662Y44518D01*
+X24685Y44361D01*
+X24732Y44210D01*
+X24802Y44069D01*
+X24893Y43939D01*
+X25004Y43826D01*
+X25130Y43732D01*
+X25270Y43658D01*
+X25420Y43608D01*
+X25576Y43581D01*
+X25734Y43579D01*
+X25890Y43602D01*
+X26040Y43652D01*
+X26392Y43778D01*
+X26756Y43866D01*
+X27126Y43919D01*
+X27500Y43937D01*
+X27874Y43919D01*
+X28244Y43866D01*
+X28608Y43778D01*
+X28961Y43656D01*
+X29111Y43606D01*
+X29266Y43583D01*
+X29424Y43585D01*
+X29579Y43612D01*
+X29728Y43662D01*
+X29867Y43736D01*
+X29993Y43830D01*
+X30000Y43836D01*
+Y37500D01*
+X23670D01*
+X23674Y37504D01*
+X23768Y37630D01*
+X23842Y37770D01*
+X23892Y37920D01*
+X23919Y38076D01*
+X23921Y38234D01*
+X23898Y38390D01*
+X23848Y38540D01*
+X23722Y38892D01*
+X23634Y39256D01*
+X23581Y39626D01*
+X23563Y40000D01*
+X23581Y40374D01*
+X23634Y40744D01*
+X23722Y41108D01*
+X23844Y41461D01*
+X23894Y41611D01*
+X23917Y41766D01*
+X23915Y41924D01*
+X23888Y42079D01*
+X23838Y42228D01*
+X23764Y42367D01*
+X23670Y42493D01*
+X23558Y42603D01*
+X23429Y42694D01*
+X23288Y42764D01*
+X23138Y42811D01*
+X22982Y42833D01*
+X22825Y42832D01*
+X22669Y42805D01*
+X22520Y42754D01*
+X22381Y42681D01*
+X22255Y42587D01*
+X22145Y42475D01*
+X22054Y42346D01*
+X21987Y42204D01*
+X21796Y41672D01*
+X21663Y41123D01*
+X21583Y40564D01*
+X21556Y40000D01*
+X21583Y39436D01*
+X21663Y38877D01*
+X21796Y38328D01*
+X21981Y37794D01*
+X22050Y37652D01*
+X22142Y37523D01*
+X22164Y37500D01*
+X20000D01*
+Y47500D01*
+G37*
+G36*
+X2500Y30000D02*X12500D01*
+Y27891D01*
+X11840Y28164D01*
+X10932Y28382D01*
+X10000Y28455D01*
+X9068Y28382D01*
+X8160Y28164D01*
+X7296Y27806D01*
+X6500Y27318D01*
+X5789Y26711D01*
+X5182Y26000D01*
+X4694Y25204D01*
+X4336Y24340D01*
+X4118Y23432D01*
+X4045Y22500D01*
+X4118Y21568D01*
+X4336Y20660D01*
+X4609Y20000D01*
+X2500D01*
+Y30000D01*
+G37*
+G36*
+X20000D02*X30000D01*
+Y27891D01*
+X29340Y28164D01*
+X28432Y28382D01*
+X27500Y28455D01*
+X26568Y28382D01*
+X25660Y28164D01*
+X24796Y27806D01*
+X24000Y27318D01*
+X23289Y26711D01*
+X22682Y26000D01*
+X22194Y25204D01*
+X21836Y24340D01*
+X21618Y23432D01*
+X21545Y22500D01*
+X21618Y21568D01*
+X21836Y20660D01*
+X22109Y20000D01*
+X20000D01*
+Y30000D01*
+G37*
+G54D12*X10000Y40000D03*
+X27500D03*
+X10000Y22500D03*
+X27500D03*
+G54D13*M02*
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.nelma.em
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.nelma.em	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.nelma.em	(revision 18980)
@@ -0,0 +1,75 @@
+/* banner */
+ */
+/* **** Nets **** */
+
+
+/* **** Objects **** */
+
+
+/* **** Layers **** */
+
+layer air-top {
+	height = 40
+	z-order = 1
+	material = "air"
+}
+layer air-bottom {
+	height = 40
+	z-order = 1000
+	material = "air"
+}
+layer top {
+	height = 1
+	z-order = 10
+	material = "air"
+	objects = {
+
+	}
+}
+layer substrate-11 {
+	height = 20
+	z-order = 11
+	material = "composite"
+}
+layer bottom {
+	height = 1
+	z-order = 12
+	material = "air"
+	objects = {
+
+	}
+}
+
+/* **** Materials **** */
+
+material copper {
+	type = "metal"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material air {
+	type = "dielectric"
+	permittivity = 8.850000e-12
+	conductivity = 0.0
+	permeability = 0.0
+}
+material composite {
+	type = "dielectric"
+	permittivity = 3.540000e-11
+	conductivity = 0.0
+	permeability = 0.0
+}
+
+/* **** Space **** */
+
+space pcb {
+	step = { 2.540000e-04, 2.540000e-04, 1.000000e-04 }
+	layers = {
+		"air-top",
+		"air-bottom",
+		"top",
+		"substrate-11",
+		"bottom"
+	}
+}
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.net
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.net	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.net	(revision 18980)
@@ -0,0 +1,16 @@
+C  IPC-D-356 Netlist generated by <version>
+C  
+C  File created on <date>
+C  
+P  JOB   thermals vs. multiple layer polygons
+P  CODE  00
+P  UNITS CUST 0
+P  DIM   N
+P  VER   IPC-D-356
+P  IMAGE PRIMARY
+C  
+317N/C              VIA   -     D0315PA00X+001000Y+004000X0787Y0000R000 S3      
+317N/C              VIA   -     D0315PA00X+002750Y+004000X0787Y0000R000 S3      
+317N/C              VIA   -     D0315PA00X+001000Y+002250X0787Y0000R000 S3      
+317N/C              VIA   -     D0315PA00X+002750Y+002250X0787Y0000R000 S3      
+999
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.png
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.png	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.png	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_layer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.png.text
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.png.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.png.text	(revision 18980)
@@ -0,0 +1,10 @@
+r6731
+
+each red polygon is 121x121 pixels (100.833 x 100.833)
+each blue polygon is 121x121 pixels (100.833 x 100.833)
+
+clearance 23 pixels (19.167)
+copper width 95 pixels (79.166)
+drill width 39 pixels (32.5)
+
+lower two vias are cleared with only 23 pixels (19.166)
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.ps.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.ps.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.ps.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.ps.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_layer.ps.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.remote.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.remote.gz
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.remote.gz	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.remote.gz	(revision 18980)

Property changes on: tags/2.0.1/tests/RTT/ref/thermal_layer.remote.gz
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.svg
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.svg	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.svg	(revision 18980)
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="1625.6000" height="1625.6000" viewBox="-2.0000 -2.0000 17.7000 17.7000">
+<g id="layer_9_outline">
+<!--normal-->
+ <rect x="0.0000" y="0.0000" width="12.7000" height="12.7000" stroke-width="0.2540" stroke="#00868b" stroke-linecap="round" fill="none"/>
+</g>
+<g id="layer_7_group7">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_5_group5">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_10_bottom">
+<!--normal-->
+ <polygon points="1.9050,1.9050 3.5342,1.9050 3.4037,2.0355 3.4338,2.0846 3.4940,2.2300 3.5307,2.3831 3.5400,2.5400 3.5307,2.6969 3.4940,2.8500 3.4338,2.9954 3.4037,3.0445 3.7731,3.4139 3.8878,3.2267 3.9786,3.0074 4.0340,2.7766 4.0480,2.5400 4.0340,2.3034 3.9786,2.0726 3.9092,1.9050 4.4450,1.9050 4.4450,4.4450 1.9050,4.4450 1.9050,3.9092 2.0726,3.9786 2.3034,4.0340 2.5400,4.0526 2.7766,4.0340 3.0074,3.9786 3.2267,3.8878 3.4139,3.7731 3.0445,3.4037 2.9954,3.4338 2.8500,3.4940 2.6969,3.5307 2.5400,3.5431 2.3831,3.5307 2.2300,3.4940 2.0846,3.4338 2.0355,3.4037 1.9050,3.5342 " stroke-width="0.010" stroke="#3a5fcd" fill="#3a5fcd"/>
+ <polygon points="1.9050,6.3500 4.4450,6.3500 4.4450,8.8900 1.9050,8.8900 " stroke-width="0.010" stroke="#3a5fcd" fill="#3a5fcd"/>
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#cccccc" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_3_top">
+<!--normal-->
+ <polygon points="6.3500,1.9050 7.9792,1.9050 7.8487,2.0355 7.8788,2.0846 7.9390,2.2300 7.9757,2.3831 7.9850,2.5400 7.9757,2.6969 7.9390,2.8500 7.8788,2.9954 7.8487,3.0445 8.2181,3.4139 8.3328,3.2267 8.4236,3.0074 8.4790,2.7766 8.4930,2.5400 8.4790,2.3034 8.4236,2.0726 8.3542,1.9050 8.8900,1.9050 8.8900,4.4450 6.3500,4.4450 6.3500,3.9092 6.5176,3.9786 6.7484,4.0340 6.9850,4.0526 7.2216,4.0340 7.4524,3.9786 7.6717,3.8878 7.8589,3.7731 7.4895,3.4037 7.4404,3.4338 7.2950,3.4940 7.1419,3.5307 6.9850,3.5431 6.8281,3.5307 6.6750,3.4940 6.5296,3.4338 6.4805,3.4037 6.3500,3.5342 " stroke-width="0.010" stroke="#104e8b" fill="#104e8b"/>
+ <polygon points="6.3500,6.3500 8.8900,6.3500 8.8900,8.8900 6.3500,8.8900 " stroke-width="0.010" stroke="#104e8b" fill="#104e8b"/>
+ <polygon points="0.6350,0.6350 3.1750,0.6350 3.1750,1.1861 3.1685,1.1798 3.1359,1.1567 3.0998,1.1397 2.9648,1.0913 2.8253,1.0575 2.6833,1.0371 2.5400,1.0303 2.3967,1.0371 2.2547,1.0575 2.1152,1.0913 1.9796,1.1382 1.9435,1.1557 1.9107,1.1789 1.8820,1.2070 1.8580,1.2392 1.8393,1.2747 1.8264,1.3128 1.8197,1.3524 1.8192,1.3925 1.8250,1.4322 1.8369,1.4706 1.8547,1.5066 1.8779,1.5394 1.9059,1.5681 1.9381,1.5921 1.9737,1.6108 2.0117,1.6237 2.0513,1.6305 2.0914,1.6310 2.1312,1.6252 2.1692,1.6125 2.2586,1.5804 2.3510,1.5580 2.4451,1.5445 2.5400,1.5400 2.6349,1.5445 2.7290,1.5580 2.8214,1.5804 2.9112,1.6114 2.9491,1.6241 2.9886,1.6298 3.0286,1.6293 3.0680,1.6226 3.1059,1.6098 3.1413,1.5912 3.1733,1.5673 3.1750,1.5656 3.1750,3.1750 1.5672,3.1750 1.5681,3.1741 1.5921,3.1419 1.6108,3.1063 1.6237,3.0683 1.6305,3.0287 1.6310,2.9886 1.6252,2.9488 1.6125,2.9108 1.5804,2.8214 1.5580,2.7290 1.5445,2.6349 1.5400,2.5400 1.5445,2.4451 1.5580,2.3510 1.5804,2.2586 1.6114,2.1688 1.6241,2.1309 1.6298,2.0914 1.6293,2.0514 1.6226,2.0120 1.6098,1.9741 1.5912,1.9387 1.5673,1.9067 1.5386,1.8787 1.5060,1.8557 1.4702,1.8379 1.4320,1.8261 1.3924,1.8203 1.3525,1.8208 1.3130,1.8275 1.2752,1.8404 1.2398,1.8590 1.2077,1.8829 1.1798,1.9115 1.1567,1.9441 1.1397,1.9802 1.0913,2.1152 1.0575,2.2547 1.0371,2.3967 1.0303,2.5400 1.0371,2.6833 1.0575,2.8253 1.0913,2.9648 1.1382,3.1004 1.1557,3.1365 1.1789,3.1693 1.1846,3.1750 0.6350,3.1750 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="5.0800,0.6350 7.6200,0.6350 7.6200,1.1861 7.6135,1.1798 7.5809,1.1567 7.5448,1.1397 7.4098,1.0913 7.2703,1.0575 7.1283,1.0371 6.9850,1.0303 6.8417,1.0371 6.6997,1.0575 6.5602,1.0913 6.4246,1.1382 6.3885,1.1557 6.3557,1.1789 6.3270,1.2070 6.3030,1.2392 6.2843,1.2747 6.2714,1.3128 6.2647,1.3524 6.2642,1.3925 6.2700,1.4322 6.2819,1.4706 6.2997,1.5066 6.3229,1.5394 6.3509,1.5681 6.3831,1.5921 6.4187,1.6108 6.4567,1.6237 6.4963,1.6305 6.5364,1.6310 6.5762,1.6252 6.6142,1.6125 6.7036,1.5804 6.7960,1.5580 6.8901,1.5445 6.9850,1.5400 7.0799,1.5445 7.1740,1.5580 7.2664,1.5804 7.3562,1.6114 7.3941,1.6241 7.4336,1.6298 7.4736,1.6293 7.5130,1.6226 7.5509,1.6098 7.5863,1.5912 7.6183,1.5673 7.6200,1.5656 7.6200,3.1750 6.0122,3.1750 6.0131,3.1741 6.0371,3.1419 6.0558,3.1063 6.0687,3.0683 6.0755,3.0287 6.0760,2.9886 6.0702,2.9488 6.0575,2.9108 6.0254,2.8214 6.0030,2.7290 5.9895,2.6349 5.9850,2.5400 5.9895,2.4451 6.0030,2.3510 6.0254,2.2586 6.0564,2.1688 6.0691,2.1309 6.0748,2.0914 6.0743,2.0514 6.0676,2.0120 6.0548,1.9741 6.0362,1.9387 6.0123,1.9067 5.9836,1.8787 5.9510,1.8557 5.9152,1.8379 5.8770,1.8261 5.8374,1.8203 5.7975,1.8208 5.7580,1.8275 5.7202,1.8404 5.6848,1.8590 5.6527,1.8829 5.6248,1.9115 5.6017,1.9441 5.5847,1.9802 5.5363,2.1152 5.5025,2.2547 5.4821,2.3967 5.4753,2.5400 5.4821,2.6833 5.5025,2.8253 5.5363,2.9648 5.5832,3.1004 5.6007,3.1365 5.6239,3.1693 5.6296,3.1750 5.0800,3.1750 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="0.6350,5.0800 3.1750,5.0800 3.1750,5.6158 3.0074,5.5464 2.7766,5.4910 2.5400,5.4724 2.3034,5.4910 2.0726,5.5464 1.8533,5.6372 1.6509,5.7612 1.4704,5.9154 1.3162,6.0959 1.1922,6.2983 1.1014,6.5176 1.0460,6.7484 1.0274,6.9850 1.0460,7.2216 1.1014,7.4524 1.1708,7.6200 0.6350,7.6200 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <polygon points="5.0800,5.0800 7.6200,5.0800 7.6200,5.6158 7.4524,5.5464 7.2216,5.4910 6.9850,5.4724 6.7484,5.4910 6.5176,5.5464 6.2983,5.6372 6.0959,5.7612 5.9154,5.9154 5.7612,6.0959 5.6372,6.2983 5.5464,6.5176 5.4910,6.7484 5.4724,6.9850 5.4910,7.2216 5.5464,7.4524 5.6158,7.6200 5.0800,7.6200 " stroke-width="0.010" stroke="#8b2323" fill="#8b2323"/>
+ <circle cx="2.5400" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="1.0000" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="1.0000" stroke-width="0.0000" fill="#7f7f7f" stroke="none"/>
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+<g id="layer_1_topsilk">
+</g>
+<g id="layer_-1_plated-drill">
+<!--normal-->
+ <circle cx="2.5400" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="2.5400" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="2.5400" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+ <circle cx="6.9850" cy="6.9850" r="0.4001" stroke-width="0.0000" fill="#ffffff" stroke="none"/>
+</g>
+</svg>
Index: tags/2.0.1/tests/RTT/ref/thermal_layer.xy
===================================================================
--- tags/2.0.1/tests/RTT/ref/thermal_layer.xy	(nonexistent)
+++ tags/2.0.1/tests/RTT/ref/thermal_layer.xy	(revision 18980)
@@ -0,0 +1,8 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: <date>
+# Author: TEST
+# Title: thermals vs. multiple layer polygons - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mil.  rotation in degrees.
+# --------------------------------------------
Index: tags/2.0.1/tests/RTT/text_rot.pcb
===================================================================
--- tags/2.0.1/tests/RTT/text_rot.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/text_rot.pcb	(revision 18980)
@@ -0,0 +1,95 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["text rotations" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Symbol['A' 304800nm]
+(
+	SymbolLine[0 508000nm 0 1270000nm 203200nm]
+	SymbolLine[0 508000nm 177800nm 254000nm 203200nm]
+	SymbolLine[177800nm 254000nm 457200nm 254000nm 203200nm]
+	SymbolLine[457200nm 254000nm 635000nm 508000nm 203200nm]
+	SymbolLine[635000nm 508000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 635000nm 762000nm 203200nm]
+)
+Symbol['1' 304800nm]
+(
+	SymbolLine[0 457200nm 203200nm 254000nm 203200nm]
+	SymbolLine[203200nm 254000nm 203200nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 381000nm 1270000nm 203200nm]
+)
+Symbol['2' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['3' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 711200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 584200nm 203200nm]
+	SymbolLine[508000nm 838200nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 838200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 584200nm 381000nm 711200nm 203200nm]
+)
+Symbol['4' 304800nm]
+(
+	SymbolLine[0 889000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 889000nm 635000nm 889000nm 203200nm]
+	SymbolLine[508000nm 254000nm 508000nm 1270000nm 203200nm]
+)
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+	Text[5715000nm 3810000nm 0 100 "A1" "clearline"]
+	Text[3810000nm 6985000nm 1 100 "A2" "clearline"]
+	Text[6985000nm 8890000nm 2 100 "A3" "clearline"]
+	Text[8890000nm 5715000nm 3 100 "A4" "clearline"]
+)
Index: tags/2.0.1/tests/RTT/text_scale.pcb
===================================================================
--- tags/2.0.1/tests/RTT/text_scale.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/text_scale.pcb	(revision 18980)
@@ -0,0 +1,87 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["text sizes (scales)" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Symbol['A' 304800nm]
+(
+	SymbolLine[0 508000nm 0 1270000nm 203200nm]
+	SymbolLine[0 508000nm 177800nm 254000nm 203200nm]
+	SymbolLine[177800nm 254000nm 457200nm 254000nm 203200nm]
+	SymbolLine[457200nm 254000nm 635000nm 508000nm 203200nm]
+	SymbolLine[635000nm 508000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 635000nm 762000nm 203200nm]
+)
+Symbol['1' 304800nm]
+(
+	SymbolLine[0 457200nm 203200nm 254000nm 203200nm]
+	SymbolLine[203200nm 254000nm 203200nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 381000nm 1270000nm 203200nm]
+)
+Symbol['2' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['3' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 711200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 584200nm 203200nm]
+	SymbolLine[508000nm 838200nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 838200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 584200nm 381000nm 711200nm 203200nm]
+)
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+	Text[1270000nm 635000nm 0 100 "A1" "clearline"]
+	Text[1270000nm 5080000nm 0 10 "A2" "clearline"]
+	Text[1270000nm 7620000nm 0 320 "A3" "clearline"]
+)
Index: tags/2.0.1/tests/RTT/text_sides.pcb
===================================================================
--- tags/2.0.1/tests/RTT/text_sides.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/text_sides.pcb	(revision 18980)
@@ -0,0 +1,74 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["text on both sides" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[1905000nm 635000nm 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+
+Symbol['A' 304800nm]
+(
+	SymbolLine[0 508000nm 0 1270000nm 203200nm]
+	SymbolLine[0 508000nm 177800nm 254000nm 203200nm]
+	SymbolLine[177800nm 254000nm 457200nm 254000nm 203200nm]
+	SymbolLine[457200nm 254000nm 635000nm 508000nm 203200nm]
+	SymbolLine[635000nm 508000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 635000nm 762000nm 203200nm]
+)
+Symbol['1' 304800nm]
+(
+	SymbolLine[0 457200nm 203200nm 254000nm 203200nm]
+	SymbolLine[203200nm 254000nm 203200nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 381000nm 1270000nm 203200nm]
+)
+Symbol['2' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 1270000nm 203200nm]
+)
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+	Text[5715000nm 7620000nm 0 100 "A2" "clearline,onsolder"]
+)
+Layer(9 "silk")
+(
+	Text[5715000nm 4445000nm 0 100 "A1" "clearline"]
+)
Index: tags/2.0.1/tests/RTT/thermal_last.pcb
===================================================================
--- tags/2.0.1/tests/RTT/thermal_last.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/thermal_last.pcb	(revision 18980)
@@ -0,0 +1,826 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["thermals on the last 2 layers - catch off-by-one bugs due to the 0-base index of thermals" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Symbol[' ' 457200nm]
+(
+)
+Symbol['!' 304800nm]
+(
+	SymbolLine[0 1143000nm 0 1270000nm 203200nm]
+	SymbolLine[0 254000nm 0 889000nm 203200nm]
+)
+Symbol['"' 304800nm]
+(
+	SymbolLine[0 254000nm 0 508000nm 203200nm]
+	SymbolLine[254000nm 254000nm 254000nm 508000nm 203200nm]
+)
+Symbol['#' 304800nm]
+(
+	SymbolLine[0 889000nm 508000nm 889000nm 203200nm]
+	SymbolLine[0 635000nm 508000nm 635000nm 203200nm]
+	SymbolLine[381000nm 508000nm 381000nm 1016000nm 203200nm]
+	SymbolLine[127000nm 508000nm 127000nm 1016000nm 203200nm]
+)
+Symbol['$' 304800nm]
+(
+	SymbolLine[381000nm 381000nm 508000nm 508000nm 203200nm]
+	SymbolLine[127000nm 381000nm 381000nm 381000nm 203200nm]
+	SymbolLine[0 508000nm 127000nm 381000nm 203200nm]
+	SymbolLine[0 508000nm 0 635000nm 203200nm]
+	SymbolLine[0 635000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[381000nm 1143000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[127000nm 1143000nm 381000nm 1143000nm 203200nm]
+	SymbolLine[0 1016000nm 127000nm 1143000nm 203200nm]
+	SymbolLine[254000nm 254000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['%' 304800nm]
+(
+	SymbolLine[0 381000nm 0 508000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 254000nm 254000nm 203200nm]
+	SymbolLine[254000nm 254000nm 381000nm 381000nm 203200nm]
+	SymbolLine[381000nm 381000nm 381000nm 508000nm 203200nm]
+	SymbolLine[254000nm 635000nm 381000nm 508000nm 203200nm]
+	SymbolLine[127000nm 635000nm 254000nm 635000nm 203200nm]
+	SymbolLine[0 508000nm 127000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 1016000nm 254000nm 203200nm]
+	SymbolLine[889000nm 1270000nm 1016000nm 1143000nm 203200nm]
+	SymbolLine[1016000nm 1016000nm 1016000nm 1143000nm 203200nm]
+	SymbolLine[889000nm 889000nm 1016000nm 1016000nm 203200nm]
+	SymbolLine[762000nm 889000nm 889000nm 889000nm 203200nm]
+	SymbolLine[635000nm 1016000nm 762000nm 889000nm 203200nm]
+	SymbolLine[635000nm 1016000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[635000nm 1143000nm 762000nm 1270000nm 203200nm]
+	SymbolLine[762000nm 1270000nm 889000nm 1270000nm 203200nm]
+)
+Symbol['&' 304800nm]
+(
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 381000nm 0 635000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 889000nm 381000nm 508000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[0 635000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 254000nm 254000nm 254000nm 203200nm]
+	SymbolLine[254000nm 254000nm 381000nm 381000nm 203200nm]
+	SymbolLine[381000nm 381000nm 381000nm 508000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+)
+Symbol[''' 304800nm]
+(
+	SymbolLine[0 508000nm 254000nm 254000nm 203200nm]
+)
+Symbol['(' 304800nm]
+(
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+)
+Symbol[')' 304800nm]
+(
+	SymbolLine[0 254000nm 127000nm 381000nm 203200nm]
+	SymbolLine[127000nm 381000nm 127000nm 1143000nm 203200nm]
+	SymbolLine[0 1270000nm 127000nm 1143000nm 203200nm]
+)
+Symbol['*' 304800nm]
+(
+	SymbolLine[0 508000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[0 1016000nm 508000nm 508000nm 203200nm]
+	SymbolLine[0 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[254000nm 508000nm 254000nm 1016000nm 203200nm]
+)
+Symbol['+' 304800nm]
+(
+	SymbolLine[0 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[254000nm 508000nm 254000nm 1016000nm 203200nm]
+)
+Symbol[',' 304800nm]
+(
+	SymbolLine[0 1524000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['-' 304800nm]
+(
+	SymbolLine[0 762000nm 508000nm 762000nm 203200nm]
+)
+Symbol['.' 304800nm]
+(
+	SymbolLine[0 1270000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['/' 304800nm]
+(
+	SymbolLine[0 1143000nm 762000nm 381000nm 203200nm]
+)
+Symbol['0' 304800nm]
+(
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1016000nm 508000nm 508000nm 203200nm]
+)
+Symbol['1' 304800nm]
+(
+	SymbolLine[0 457200nm 203200nm 254000nm 203200nm]
+	SymbolLine[203200nm 254000nm 203200nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 381000nm 1270000nm 203200nm]
+)
+Symbol['2' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 635000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['3' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 711200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 584200nm 203200nm]
+	SymbolLine[508000nm 838200nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 838200nm 381000nm 711200nm 203200nm]
+	SymbolLine[508000nm 584200nm 381000nm 711200nm 203200nm]
+)
+Symbol['4' 304800nm]
+(
+	SymbolLine[0 889000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 889000nm 635000nm 889000nm 203200nm]
+	SymbolLine[508000nm 254000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['5' 304800nm]
+(
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 254000nm 0 762000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 635000nm 203200nm]
+	SymbolLine[127000nm 635000nm 381000nm 635000nm 203200nm]
+	SymbolLine[381000nm 635000nm 508000nm 762000nm 203200nm]
+	SymbolLine[508000nm 762000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['6' 304800nm]
+(
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 711200nm 508000nm 838200nm 203200nm]
+	SymbolLine[0 711200nm 381000nm 711200nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 838200nm 508000nm 1143000nm 203200nm]
+)
+Symbol['7' 304800nm]
+(
+	SymbolLine[127000nm 1270000nm 635000nm 254000nm 203200nm]
+	SymbolLine[0 254000nm 635000nm 254000nm 203200nm]
+)
+Symbol['8' 304800nm]
+(
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 939800nm 0 1143000nm 203200nm]
+	SymbolLine[0 939800nm 177800nm 762000nm 203200nm]
+	SymbolLine[177800nm 762000nm 330200nm 762000nm 203200nm]
+	SymbolLine[330200nm 762000nm 508000nm 939800nm 203200nm]
+	SymbolLine[508000nm 939800nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 584200nm 177800nm 762000nm 203200nm]
+	SymbolLine[0 381000nm 0 584200nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 584200nm 203200nm]
+	SymbolLine[330200nm 762000nm 508000nm 584200nm 203200nm]
+)
+Symbol['9' 304800nm]
+(
+	SymbolLine[127000nm 1270000nm 508000nm 762000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 762000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 0 635000nm 203200nm]
+	SymbolLine[0 635000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+)
+Symbol[':' 304800nm]
+(
+	SymbolLine[0 635000nm 127000nm 635000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 889000nm 203200nm]
+)
+Symbol[';' 304800nm]
+(
+	SymbolLine[0 1270000nm 254000nm 1016000nm 203200nm]
+	SymbolLine[254000nm 635000nm 254000nm 762000nm 203200nm]
+)
+Symbol['<' 304800nm]
+(
+	SymbolLine[0 762000nm 254000nm 508000nm 203200nm]
+	SymbolLine[0 762000nm 254000nm 1016000nm 203200nm]
+)
+Symbol['=' 304800nm]
+(
+	SymbolLine[0 635000nm 508000nm 635000nm 203200nm]
+	SymbolLine[0 889000nm 508000nm 889000nm 203200nm]
+)
+Symbol['>' 304800nm]
+(
+	SymbolLine[0 508000nm 254000nm 762000nm 203200nm]
+	SymbolLine[0 1016000nm 254000nm 762000nm 203200nm]
+)
+Symbol['?' 304800nm]
+(
+	SymbolLine[254000nm 762000nm 254000nm 889000nm 203200nm]
+	SymbolLine[254000nm 1143000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[0 381000nm 0 508000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 508000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 508000nm 203200nm]
+)
+Symbol['@' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1016000nm 203200nm]
+	SymbolLine[0 1016000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 1016000nm 1270000nm 203200nm]
+	SymbolLine[1270000nm 889000nm 1270000nm 254000nm 203200nm]
+	SymbolLine[1270000nm 254000nm 1016000nm 0 203200nm]
+	SymbolLine[1016000nm 0 254000nm 0 203200nm]
+	SymbolLine[254000nm 0 0 254000nm 203200nm]
+	SymbolLine[381000nm 508000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 762000nm 889000nm 203200nm]
+	SymbolLine[762000nm 889000nm 889000nm 762000nm 203200nm]
+	SymbolLine[889000nm 762000nm 1016000nm 889000nm 203200nm]
+	SymbolLine[889000nm 762000nm 889000nm 381000nm 203200nm]
+	SymbolLine[889000nm 508000nm 762000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 762000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 381000nm 508000nm 203200nm]
+	SymbolLine[1016000nm 889000nm 1270000nm 889000nm 203200nm]
+)
+Symbol['A' 304800nm]
+(
+	SymbolLine[0 508000nm 0 1270000nm 203200nm]
+	SymbolLine[0 508000nm 177800nm 254000nm 203200nm]
+	SymbolLine[177800nm 254000nm 457200nm 254000nm 203200nm]
+	SymbolLine[457200nm 254000nm 635000nm 508000nm 203200nm]
+	SymbolLine[635000nm 508000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 635000nm 762000nm 203200nm]
+)
+Symbol['B' 304800nm]
+(
+	SymbolLine[0 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[635000nm 838200nm 635000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 711200nm 635000nm 838200nm 203200nm]
+	SymbolLine[127000nm 711200nm 508000nm 711200nm 203200nm]
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 584200nm 203200nm]
+	SymbolLine[508000nm 711200nm 635000nm 584200nm 203200nm]
+)
+Symbol['C' 304800nm]
+(
+	SymbolLine[177800nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 1092200nm 177800nm 1270000nm 203200nm]
+	SymbolLine[0 431800nm 0 1092200nm 203200nm]
+	SymbolLine[0 431800nm 177800nm 254000nm 203200nm]
+	SymbolLine[177800nm 254000nm 508000nm 254000nm 203200nm]
+)
+Symbol['D' 304800nm]
+(
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[457200nm 254000nm 635000nm 431800nm 203200nm]
+	SymbolLine[635000nm 431800nm 635000nm 1092200nm 203200nm]
+	SymbolLine[457200nm 1270000nm 635000nm 1092200nm 203200nm]
+	SymbolLine[0 1270000nm 457200nm 1270000nm 203200nm]
+	SymbolLine[0 254000nm 457200nm 254000nm 203200nm]
+)
+Symbol['E' 304800nm]
+(
+	SymbolLine[0 711200nm 381000nm 711200nm 203200nm]
+	SymbolLine[0 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+)
+Symbol['F' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 711200nm 381000nm 711200nm 203200nm]
+)
+Symbol['G' 304800nm]
+(
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[635000nm 889000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 889000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 762000nm 203200nm]
+)
+Symbol['H' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[635000nm 254000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 635000nm 762000nm 203200nm]
+)
+Symbol['I' 304800nm]
+(
+	SymbolLine[0 254000nm 254000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['J' 304800nm]
+(
+	SymbolLine[177800nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 381000nm 1143000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 381000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 0 1016000nm 203200nm]
+)
+Symbol['K' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 762000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 762000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['L' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['M' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 254000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 762000nm 254000nm 203200nm]
+	SymbolLine[762000nm 254000nm 762000nm 1270000nm 203200nm]
+)
+Symbol['N' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 254000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[635000nm 254000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['O' 304800nm]
+(
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['P' 304800nm]
+(
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 635000nm 203200nm]
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+)
+Symbol['Q' 304800nm]
+(
+	SymbolLine[0 381000nm 0 1143000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[381000nm 254000nm 508000nm 381000nm 203200nm]
+	SymbolLine[508000nm 381000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[254000nm 889000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['R' 304800nm]
+(
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[635000nm 381000nm 635000nm 635000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 635000nm 203200nm]
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[330200nm 762000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['S' 304800nm]
+(
+	SymbolLine[508000nm 254000nm 635000nm 381000nm 203200nm]
+	SymbolLine[127000nm 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 381000nm 0 635000nm 203200nm]
+	SymbolLine[0 635000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 889000nm 203200nm]
+	SymbolLine[635000nm 889000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['T' 304800nm]
+(
+	SymbolLine[0 254000nm 508000nm 254000nm 203200nm]
+	SymbolLine[254000nm 254000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['U' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 254000nm 508000nm 1143000nm 203200nm]
+)
+Symbol['V' 304800nm]
+(
+	SymbolLine[0 254000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 508000nm 254000nm 203200nm]
+)
+Symbol['W' 304800nm]
+(
+	SymbolLine[0 254000nm 0 762000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[635000nm 1270000nm 762000nm 762000nm 203200nm]
+	SymbolLine[762000nm 762000nm 762000nm 254000nm 203200nm]
+)
+Symbol['X' 304800nm]
+(
+	SymbolLine[0 1270000nm 635000nm 254000nm 203200nm]
+	SymbolLine[0 254000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['Y' 304800nm]
+(
+	SymbolLine[0 254000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 254000nm 203200nm]
+	SymbolLine[254000nm 762000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['Z' 304800nm]
+(
+	SymbolLine[0 254000nm 635000nm 254000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 254000nm 203200nm]
+	SymbolLine[0 1270000nm 635000nm 1270000nm 203200nm]
+)
+Symbol['[' 304800nm]
+(
+	SymbolLine[0 254000nm 127000nm 254000nm 203200nm]
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['\' 304800nm]
+(
+	SymbolLine[0 381000nm 762000nm 1143000nm 203200nm]
+)
+Symbol[']' 304800nm]
+(
+	SymbolLine[0 254000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['^' 304800nm]
+(
+	SymbolLine[0 381000nm 127000nm 254000nm 203200nm]
+	SymbolLine[127000nm 254000nm 254000nm 381000nm 203200nm]
+)
+Symbol['_' 304800nm]
+(
+	SymbolLine[0 1270000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['a' 304800nm]
+(
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 762000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 1143000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+)
+Symbol['b' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+)
+Symbol['c' 304800nm]
+(
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['d' 304800nm]
+(
+	SymbolLine[508000nm 254000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+)
+Symbol['e' 304800nm]
+(
+	SymbolLine[127000nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[0 1016000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[508000nm 1016000nm 508000nm 889000nm 203200nm]
+)
+Symbol['f' 254000nm]
+(
+	SymbolLine[127000nm 381000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 381000nm 254000nm 254000nm 203200nm]
+	SymbolLine[254000nm 254000nm 381000nm 254000nm 203200nm]
+	SymbolLine[0 762000nm 254000nm 762000nm 203200nm]
+)
+Symbol['g' 304800nm]
+(
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[0 1524000nm 127000nm 1651000nm 203200nm]
+	SymbolLine[127000nm 1651000nm 381000nm 1651000nm 203200nm]
+	SymbolLine[381000nm 1651000nm 508000nm 1524000nm 203200nm]
+	SymbolLine[508000nm 762000nm 508000nm 1524000nm 203200nm]
+)
+Symbol['h' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['i' 254000nm]
+(
+	SymbolLine[0 508000nm 0 533400nm 254000nm]
+	SymbolLine[0 889000nm 0 1270000nm 203200nm]
+)
+Symbol['j' 254000nm]
+(
+	SymbolLine[127000nm 508000nm 127000nm 533400nm 254000nm]
+	SymbolLine[127000nm 889000nm 127000nm 1524000nm 203200nm]
+	SymbolLine[0 1651000nm 127000nm 1524000nm 203200nm]
+)
+Symbol['k' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+	SymbolLine[0 889000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 889000nm 254000nm 635000nm 203200nm]
+)
+Symbol['l' 254000nm]
+(
+	SymbolLine[0 254000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['m' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 889000nm 635000nm 762000nm 203200nm]
+	SymbolLine[635000nm 762000nm 762000nm 762000nm 203200nm]
+	SymbolLine[762000nm 762000nm 889000nm 889000nm 203200nm]
+	SymbolLine[889000nm 889000nm 889000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+)
+Symbol['n' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+)
+Symbol['o' 304800nm]
+(
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['p' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1651000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 889000nm 203200nm]
+	SymbolLine[635000nm 889000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1143000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['q' 304800nm]
+(
+	SymbolLine[508000nm 889000nm 508000nm 1651000nm 203200nm]
+	SymbolLine[381000nm 762000nm 508000nm 889000nm 203200nm]
+	SymbolLine[127000nm 762000nm 381000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[0 889000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+)
+Symbol['r' 304800nm]
+(
+	SymbolLine[127000nm 889000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+)
+Symbol['s' 304800nm]
+(
+	SymbolLine[127000nm 1270000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 1016000nm 635000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1016000nm 508000nm 1016000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 1016000nm 203200nm]
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[508000nm 762000nm 635000nm 889000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+)
+Symbol['t' 254000nm]
+(
+	SymbolLine[127000nm 254000nm 127000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1143000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[0 635000nm 254000nm 635000nm 203200nm]
+)
+Symbol['u' 304800nm]
+(
+	SymbolLine[0 762000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+	SymbolLine[508000nm 762000nm 508000nm 1143000nm 203200nm]
+)
+Symbol['v' 304800nm]
+(
+	SymbolLine[0 762000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 762000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['w' 304800nm]
+(
+	SymbolLine[0 762000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 254000nm 1270000nm 203200nm]
+	SymbolLine[254000nm 1270000nm 381000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 762000nm 381000nm 1143000nm 203200nm]
+	SymbolLine[381000nm 1143000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 1270000nm 635000nm 1270000nm 203200nm]
+	SymbolLine[635000nm 1270000nm 762000nm 1143000nm 203200nm]
+	SymbolLine[762000nm 762000nm 762000nm 1143000nm 203200nm]
+)
+Symbol['x' 304800nm]
+(
+	SymbolLine[0 762000nm 508000nm 1270000nm 203200nm]
+	SymbolLine[0 1270000nm 508000nm 762000nm 203200nm]
+)
+Symbol['y' 304800nm]
+(
+	SymbolLine[0 762000nm 0 1143000nm 203200nm]
+	SymbolLine[0 1143000nm 127000nm 1270000nm 203200nm]
+	SymbolLine[508000nm 762000nm 508000nm 1524000nm 203200nm]
+	SymbolLine[381000nm 1651000nm 508000nm 1524000nm 203200nm]
+	SymbolLine[127000nm 1651000nm 381000nm 1651000nm 203200nm]
+	SymbolLine[0 1524000nm 127000nm 1651000nm 203200nm]
+	SymbolLine[127000nm 1270000nm 381000nm 1270000nm 203200nm]
+	SymbolLine[381000nm 1270000nm 508000nm 1143000nm 203200nm]
+)
+Symbol['z' 304800nm]
+(
+	SymbolLine[0 762000nm 508000nm 762000nm 203200nm]
+	SymbolLine[0 1270000nm 508000nm 762000nm 203200nm]
+	SymbolLine[0 1270000nm 508000nm 1270000nm 203200nm]
+)
+Symbol['{' 304800nm]
+(
+	SymbolLine[127000nm 381000nm 254000nm 254000nm 203200nm]
+	SymbolLine[127000nm 381000nm 127000nm 635000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 635000nm 203200nm]
+	SymbolLine[0 762000nm 127000nm 889000nm 203200nm]
+	SymbolLine[127000nm 889000nm 127000nm 1143000nm 203200nm]
+	SymbolLine[127000nm 1143000nm 254000nm 1270000nm 203200nm]
+)
+Symbol['|' 304800nm]
+(
+	SymbolLine[0 254000nm 0 1270000nm 203200nm]
+)
+Symbol['}' 304800nm]
+(
+	SymbolLine[0 254000nm 127000nm 381000nm 203200nm]
+	SymbolLine[127000nm 381000nm 127000nm 635000nm 203200nm]
+	SymbolLine[127000nm 635000nm 254000nm 762000nm 203200nm]
+	SymbolLine[127000nm 889000nm 254000nm 762000nm 203200nm]
+	SymbolLine[127000nm 889000nm 127000nm 1143000nm 203200nm]
+	SymbolLine[0 1270000nm 127000nm 1143000nm 203200nm]
+)
+Symbol['~' 304800nm]
+(
+	SymbolLine[0 889000nm 127000nm 762000nm 203200nm]
+	SymbolLine[127000nm 762000nm 254000nm 762000nm 203200nm]
+	SymbolLine[254000nm 762000nm 381000nm 889000nm 203200nm]
+	SymbolLine[381000nm 889000nm 508000nm 889000nm 203200nm]
+	SymbolLine[508000nm 889000nm 635000nm 762000nm 203200nm]
+)
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Via[2540000nm 2540000nm 1999995nm 1016000nm 0 800100nm "" "thermal(4,5X)"]
+Layer(1 "comp1")
+(
+)
+Layer(2 "solder1")
+(
+)
+Layer(3 "com2")
+(
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+	Polygon("clearpoly")
+	(
+		[635000nm 635000nm] [3175000nm 635000nm] [3175000nm 3175000nm] [635000nm 3175000nm] 
+	)
+)
+Layer(6 "inner2")
+(
+	Polygon("clearpoly")
+	(
+		[1905000nm 1905000nm] [4445000nm 1905000nm] [4445000nm 4445000nm] [1905000nm 4445000nm] 
+	)
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/thermal_layer.pcb
===================================================================
--- tags/2.0.1/tests/RTT/thermal_layer.pcb	(nonexistent)
+++ tags/2.0.1/tests/RTT/thermal_layer.pcb	(revision 18980)
@@ -0,0 +1,81 @@
+# release: pcb-rnd 1.1.1
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["thermals vs. multiple layer polygons" 12700000nm 12700000nm]
+
+Grid[635000nm 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[304800nm 228600nm 254000nm 177800nm 381000nm 254000nm]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,c:2,4,s:5:6:7")
+Styles["style1,254000nm,1999995nm,800100nm,508000nm:style2,508000nm,2199894nm,999997nm,508000nm:style3,2032000nm,3500119nm,1199895nm,635000nm:style4,2540000nm,1625600nm,800100nm,2540000nm"]
+
+Attribute("PCB::grid::unit" "mil")
+Attribute("PCB::conf::editor/draw_grid" "true")
+Via[2540000nm 2540000nm 1999995nm 1016000nm 0 800100nm "" "thermal(0X,1)"]
+Via[6985000nm 2540000nm 1999995nm 1016000nm 0 800100nm "" "thermal(0X,2)"]
+Via[2540000nm 6985000nm 1999995nm 1016000nm 0 800100nm "" "thermal(1S)"]
+Via[6985000nm 6985000nm 1999995nm 1016000nm 0 800100nm "" "thermal(2S)"]
+Layer(1 "comp1")
+(
+	Polygon("clearpoly")
+	(
+		[635000nm 635000nm] [3175000nm 635000nm] [3175000nm 3175000nm] [635000nm 3175000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[5080000nm 635000nm] [7620000nm 635000nm] [7620000nm 3175000nm] [5080000nm 3175000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[635000nm 5080000nm] [3175000nm 5080000nm] [3175000nm 7620000nm] [635000nm 7620000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[5080000nm 5080000nm] [7620000nm 5080000nm] [7620000nm 7620000nm] [5080000nm 7620000nm] 
+	)
+)
+Layer(2 "solder1")
+(
+	Polygon("clearpoly")
+	(
+		[1905000nm 1905000nm] [4445000nm 1905000nm] [4445000nm 4445000nm] [1905000nm 4445000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[1905000nm 6350000nm] [4445000nm 6350000nm] [4445000nm 8890000nm] [1905000nm 8890000nm] 
+	)
+)
+Layer(3 "com2")
+(
+	Polygon("clearpoly")
+	(
+		[6350000nm 1905000nm] [8890000nm 1905000nm] [8890000nm 4445000nm] [6350000nm 4445000nm] 
+	)
+	Polygon("clearpoly")
+	(
+		[6350000nm 6350000nm] [8890000nm 6350000nm] [8890000nm 8890000nm] [6350000nm 8890000nm] 
+	)
+)
+Layer(4 "solder2")
+(
+)
+Layer(5 "inner1")
+(
+)
+Layer(6 "inner2")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "silk")
+(
+)
+Layer(9 "silk")
+(
+)
Index: tags/2.0.1/tests/RTT/valid_info/Proto.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/Proto.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/Proto.pcb.text	(revision 18980)
@@ -0,0 +1,5 @@
+6731
+
+500 x 500 mils outline
+inside the outline 490 x 490 mils
+no other content
Index: tags/2.0.1/tests/RTT/valid_info/README
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/README	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/README	(revision 18980)
@@ -0,0 +1,4 @@
+This directory contains information that may help manual validation of
+the sample files.
+
+*.text -> specific distances measured on screen in pcb-rnd
Index: tags/2.0.1/tests/RTT/valid_info/arc_angles.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/arc_angles.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/arc_angles.pcb.text	(revision 18980)
@@ -0,0 +1,19 @@
+
+right circle
+110mils h
+110mils v
+~10mils thick
+
+left circle
+110 mils h
+110 mils v (measurement problem)
+~10mils thick
+
+central dot
+~10mils
+
+air gap between right circle and central dot
+90mils
+
+air gap between left circle and central dot
+90mils
Index: tags/2.0.1/tests/RTT/valid_info/arc_f_clear.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/arc_f_clear.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/arc_f_clear.pcb.text	(revision 18980)
@@ -0,0 +1,22 @@
+polygone
+width 450mils
+height 325mils
+
+small near circle completely in polygon
+line width 10mils
+width 60mils
+clearance on the left ~20mils
+clearance on the right ~20.05mils
+clearance on the top ~20.05mils
+clearance on the bottom 20.05mils
+
+longer arc completely in polygon
+line width ~135mils
+width 135mils
+height 
+clearance on the bottom right end ~20.2mils
+clearance on the top right end 
+clearance on the end right end 
+clearance on the right top end ~20.05mils
+clearance on the left top end 20mils
+
Index: tags/2.0.1/tests/RTT/valid_info/arc_normal.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/arc_normal.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/arc_normal.pcb.text	(revision 18980)
@@ -0,0 +1,25 @@
+outline 500 x 500 mils
+
+upper left arc
+102.60 mils tall
+118.50 mils wide
+20 mil thickness
+
+upper right arc
+190.20 mils wide
+112.20 mils tall
+30mils thick
+
+lower left arc
+135 mils tall
+135 mils wide
+10mils thick
+
+lower right arc (near circle)
+10mils thick
+about 60mils tall
+about 60mils wide (duh)
+
+
+
+
Index: tags/2.0.1/tests/RTT/valid_info/arc_offpage.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/arc_offpage.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/arc_offpage.pcb.text	(revision 18980)
@@ -0,0 +1,5 @@
+arc
+10mil line width
+155mil tall
+155mil pixels wide
+
Index: tags/2.0.1/tests/RTT/valid_info/arc_sizes.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/arc_sizes.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/arc_sizes.pcb.text	(revision 18980)
@@ -0,0 +1,17 @@
+
+weird dot thing in the far right
+10mil across
+10mil tall
+
+weird dot to line (horizontal) 108 pixels
+
+horizontal line
+60mil long
+10mil wide
+
+vertical line
+10mil long
+60mil wide
+
+
+
Index: tags/2.0.1/tests/RTT/valid_info/coord_rounding.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/coord_rounding.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/coord_rounding.pcb.text	(revision 18980)
@@ -0,0 +1,6 @@
+
+weird dot thing
+39.8 mil tall
+43.75 mil wide
+
+
Index: tags/2.0.1/tests/RTT/valid_info/elem_pads.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/elem_pads.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/elem_pads.pcb.text	(revision 18980)
@@ -0,0 +1,9 @@
+R1 pads
+51.20 x 74.80 mils (approximately)
+
+U1 pads
+15 x 35 mils
+pad 5 upper to nearest silk screen corner 1.5 x 1.5 mils
+pad 5 distance to pad 4 is 11 mils
+
+
Index: tags/2.0.1/tests/RTT/valid_info/elem_pads_ds.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/elem_pads_ds.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/elem_pads_ds.pcb.text	(revision 18980)
@@ -0,0 +1,10 @@
+E1
+2 pads 1 silk line + text (E1)
+
+silk line 110 mils long 10 mils wide
+
+copper pads 85 mils long 10 mils wide
+
+pad 1 shares it's terminus with the silk line
+
+pad 2's highest point is 95 x 15 mils over from the inside corner of pad 1 & the silk line
Index: tags/2.0.1/tests/RTT/valid_info/elem_pins.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/elem_pins.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/elem_pins.pcb.text	(revision 18980)
@@ -0,0 +1,11 @@
+U1
+5 x 5 mils distance from silk inside top corner to pin 1
+pin 1 dimensions 80 x 80 mils
+pin 2 80 mil circle
+pin 1 to pin 2 distance 220 mils
+
+U2
+pin 1 extremes 80 mils tall 120 mils wide
+pin 2 extremes 120 mills tall 160 mils wide
+pin 1 to pin 2 distance 140 mils
+pin 1 to pin 2 vertical offset 0 mils
Index: tags/2.0.1/tests/RTT/valid_info/elem_sides_smd.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/elem_sides_smd.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/elem_sides_smd.pcb.text	(revision 18980)
@@ -0,0 +1,7 @@
+R1
+pad1 51.20 mils x 74.80 mils approximately
+pad2 51.20 mils x 74.80 mils approximately
+
+R2 - on the bottom
+pad1 51.20 mils x 74.80 mils approximately
+pad2 51.20 mils x 74.80 mils approximately
Index: tags/2.0.1/tests/RTT/valid_info/elem_sides_trh.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/elem_sides_trh.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/elem_sides_trh.pcb.text	(revision 18980)
@@ -0,0 +1,14 @@
+r6630
+
+U1
+5 x 5 mils distance from silk inside top corner to pin 1
+pin 1 dimensions 80 x 80 mils
+pin 2 80 mil circle
+pin 1 to pin 2 distance 220 mils
+
+U2
+pin 1 is 120 mils down from U1 Pin 1
+pin 1 is 80 x 80 mils
+pin 2 is an 80 mil circle
+pin 1 to pin 2 distance 220 mils
+
Index: tags/2.0.1/tests/RTT/valid_info/layer_copper.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/layer_copper.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/layer_copper.pcb.text	(revision 18980)
@@ -0,0 +1,7 @@
+3 lines each on a different layer
+
+highest point on red to highest point on green
+50 x 75
+
+highest point on red to "nose" (left side) of blue
+20 x 5
Index: tags/2.0.1/tests/RTT/valid_info/layer_outline.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/layer_outline.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/layer_outline.pcb.text	(revision 18980)
@@ -0,0 +1,4 @@
+board outline
+right triangle
+300 mils tall
+300 mils wide
Index: tags/2.0.1/tests/RTT/valid_info/layer_silk.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/layer_silk.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/layer_silk.pcb.text	(revision 18980)
@@ -0,0 +1,5 @@
+
+line
+width 10mils
+length 385 mils
+
Index: tags/2.0.1/tests/RTT/valid_info/layer_spc.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/layer_spc.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/layer_spc.pcb.text	(revision 18980)
@@ -0,0 +1,2 @@
+
+This is blank. It should be 500 mils by 500 mils
Index: tags/2.0.1/tests/RTT/valid_info/line_f_clear.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_f_clear.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_f_clear.pcb.text	(revision 18980)
@@ -0,0 +1,20 @@
+rectangle
+width 
+height 
+
+veritcal line
+width 10mils
+length 260mils
+clearance 42/42 mils (left/right)
+
+horizontal line
+width ~15mils
+length 290mils
+clearance 12/12 mils (top/bottom)
+
+left diangonal line
+45 degrees
+
+right diagonal line
+? degrees
+
Index: tags/2.0.1/tests/RTT/valid_info/line_normal.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_normal.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_normal.pcb.text	(revision 18980)
@@ -0,0 +1,13 @@
+horizontal line
+290 mils
+15 mil thickness
+
+vertical line
+260 mils 
+10 mil thickness
+
+fine diagonal line
+5 mils
+
+thick diagonal line
+20 mils
Index: tags/2.0.1/tests/RTT/valid_info/line_offpage.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_offpage.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_offpage.pcb.text	(revision 18980)
@@ -0,0 +1,3 @@
+10 mil line
+405 mils on the page (more off)
+
Index: tags/2.0.1/tests/RTT/valid_info/line_overlap1.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_overlap1.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_overlap1.pcb.text	(revision 18980)
@@ -0,0 +1,4 @@
+15 mil width
+115 mil length
+
+(it is actually 2 traces that should export as 1)
Index: tags/2.0.1/tests/RTT/valid_info/line_overlap2.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_overlap2.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_overlap2.pcb.text	(revision 18980)
@@ -0,0 +1,4 @@
+15 mil width
+165 mil length
+
+(it is actually 3 traces that should export as 1)
Index: tags/2.0.1/tests/RTT/valid_info/line_overlap3.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_overlap3.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_overlap3.pcb.text	(revision 18980)
@@ -0,0 +1,3 @@
+15 mil width
+165 mil length
+
Index: tags/2.0.1/tests/RTT/valid_info/line_overlap4.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_overlap4.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_overlap4.pcb.text	(revision 18980)
@@ -0,0 +1,6 @@
+15 mil width
+165 mil length
+15 mil clearance
+
+in a poly
+150 x 175 mils
Index: tags/2.0.1/tests/RTT/valid_info/line_zerolen.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/line_zerolen.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/line_zerolen.pcb.text	(revision 18980)
@@ -0,0 +1 @@
+15 mil diameter point made of a trace with zero length
Index: tags/2.0.1/tests/RTT/valid_info/netlist.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/netlist.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/netlist.pcb.text	(revision 18980)
@@ -0,0 +1,8 @@
+U1
+Inside silk screen corner to Pin1 top corner 5 x 5 milsooo
+Pin1 80 x 80 mils
+Pin1 hole 39.40 mils in diameter
+Pin2 to Pin1 distance 20 mils
+Pin2 80 mil circle
+Pin2 to Pin3 distance 220 mils
+Pin2 hole 39.40 mils in diameter
Index: tags/2.0.1/tests/RTT/valid_info/netlist_ba.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/netlist_ba.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/netlist_ba.pcb.text	(revision 18980)
@@ -0,0 +1,8 @@
+U1
+Inside silk screen corner to Pin1 top corner 5 x 5 milsooo
+Pin1 80 x 80 mils
+Pin1 hole 39.40 mils in diameter
+Pin2 to Pin1 distance 20 mils
+Pin2 80 mil circle
+Pin2 to Pin3 distance 220 mils
+Pin2 hole 39.40 mils in diameter
Index: tags/2.0.1/tests/RTT/valid_info/poly_hole.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/poly_hole.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/poly_hole.pcb.text	(revision 18980)
@@ -0,0 +1,20 @@
+r6630
+
+500 x 500 mil outline
+
+upper left triangle
+Top left corner to top left cutout corner 25 mils down 25 mils over
+cutout 25 mils wide
+cutout 25 mils high
+
+upper right triangle
+bottom right corner to bottom right on cutout 25 x 25 mils
+cutout 50mils wide
+cutout 25 mils high
+
+far right piramid
+cutout 50mils x 50mils
+cutout located 50mils down from the apex
+
+
+
Index: tags/2.0.1/tests/RTT/valid_info/poly_rect.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/poly_rect.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/poly_rect.pcb.text	(revision 18980)
@@ -0,0 +1,17 @@
+
+outline 500 x 500 mils
+
+vertical polygon
+25 x 425 mils
+
+horizontal polygon
+350 x 25 mils
+
+giant middle polygon
+275 x 375 mils
+
+smallest polygon (bottom right)
+25 x 25 mils
+
+
+
Index: tags/2.0.1/tests/RTT/valid_info/poly_triangle.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/poly_triangle.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/poly_triangle.pcb.text	(revision 18980)
@@ -0,0 +1,31 @@
+
+upper left triangle
+100 mils wide
+100 mils tall
+
+gap from lower left triangle to upper left triangle
+25 mils horizontally
+25 mils vertically
+
+lower left triangle
+125 mils wide
+125 mils tall
+
+gap from lower left triangle to far right piramid
+25 mils
+
+far right piramid
+125 mils height
+250 mils base
+
+bottom triangle
+275 mils across
+175 mils up
+top edge
+276.13 mils long __ degrees
+side edge
+176.78 mils long __ degrees
+bottom edge
+291.55 mils long __ degrees
+
+
Index: tags/2.0.1/tests/RTT/valid_info/text_rot.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/text_rot.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/text_rot.pcb.text	(revision 18980)
@@ -0,0 +1,14 @@
+layout is 500mils by 500mils
+
+A's are all 7mils thick
+1 7 mils thick
+2 7 mils thick
+3 7 mils thick
+4 7 mils thick
+
+All text is spaced @ 5 mils
+
+113 mils from under A2 to under A4
+113 mils from under A1 to under A3
+
+
Index: tags/2.0.1/tests/RTT/valid_info/text_scale.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/text_scale.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/text_scale.pcb.text	(revision 18980)
@@ -0,0 +1,26 @@
+top text A1
+A line width 7 mils
+A width 32
+A height 47
+1 line width 7
+1 width 22
+1 height 47
+
+gap from A to 1 is 5 mils
+
+dot thing in the page
+ tall 11
+ wide 13.2
+
+bottom text A3 
+A line width 12.8
+A width 92.8
+A height 140.8
+3 line width 12.8
+3 width 76.8
+3 height 140.8
+A to 3 is 25.6
+
+all measurements in mils
+
+
Index: tags/2.0.1/tests/RTT/valid_info/text_sides.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/text_sides.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/text_sides.pcb.text	(revision 18980)
@@ -0,0 +1,5 @@
+layout 500 x 500 mils
+
+38 mils between the bottom of A1 and bottom of A2
+
+all text is 7 mils thick
Index: tags/2.0.1/tests/RTT/valid_info/thermal_last.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/thermal_last.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/thermal_last.pcb.text	(revision 18980)
@@ -0,0 +1,8 @@
+500 x 500 mil outline
+
+100 mil x 100 mil for both polygons
+
+via copper width 78.74 mils
+Via drill width 31.50 mils
+annulus 23.62 mils
+clearance 20 mils
Index: tags/2.0.1/tests/RTT/valid_info/thermal_layer.pcb.text
===================================================================
--- tags/2.0.1/tests/RTT/valid_info/thermal_layer.pcb.text	(nonexistent)
+++ tags/2.0.1/tests/RTT/valid_info/thermal_layer.pcb.text	(revision 18980)
@@ -0,0 +1,8 @@
+500 x 500 mil outline
+
+each red polygon is 100x100 mils
+each blue polygon is 100x100 mils
+
+clearance should be exactly 20.00mils
+copper width 78.74 mils
+drill width 31.50 mils
Index: tags/2.0.1/tests/action/padstack.lht
===================================================================
--- tags/2.0.1/tests/action/padstack.lht	(nonexistent)
+++ tags/2.0.1/tests/action/padstack.lht	(revision 18980)
@@ -0,0 +1,440 @@
+ha:pcb-rnd-board-v4 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 2.0mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1.0mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 127.0mm
+    y = 127.0mm
+    isle_area_nm2 = 200000000.000000
+   }
+   ha:cursor {
+    zoom = 1.000000
+    x = 0.0
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+   li:padstack_prototypes {
+    ha:ps_proto_v4 {
+     htop = 0
+     group = 1
+     hdia = 31.5mil
+     li:shape {
+      ha:ps_shape_v4 {
+       clearance = 40.0mil
+       li:ps_poly {
+        125.0mil  
+        125.0mil  
+        -3175.0um  
+        125.0mil  
+        0.0  
+        -8890.0um  
+       }
+       ha:layer_mask {
+        copper = 1
+        top = 1
+       }
+       ha:combining {
+       }
+      }
+     }
+     hbottom = 0
+     hplated = 1
+    }
+   }
+
+   li:objects {
+     ha:padstack_ref.21 {
+      proto = 0
+      li:thermal {
+      }
+      x = 400.0mil
+      y = 600.0mil
+     }
+     ha:padstack_ref.22 {
+      proto = 0
+      li:thermal {
+      }
+      x = 800.0mil
+      y = 600.0mil
+     }
+     ha:padstack_ref.23 {
+      proto = 0
+      li:thermal {
+      }
+      x = 30.48mm
+      y = 600.0mil
+     }
+     ha:padstack_ref.24 {
+      proto = 0
+      li:thermal {
+      }
+      x = 1.6in
+      y = 600.0mil
+     }
+     ha:padstack_ref.25 {
+      proto = 0
+      li:thermal {
+      }
+      x = 2.0in
+      y = 600.0mil
+     }
+     ha:padstack_ref.26 {
+      proto = 0
+      li:thermal {
+      }
+      x = 60.96mm
+      y = 600.0mil
+     }
+     ha:padstack_ref.27 {
+      proto = 0
+      li:thermal {
+      }
+      x = 2.8in
+      y = 600.0mil
+     }
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.28 {
+        x1=200.0mil; y1=375.0mil; x2=375.0mil; y2=375.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.31 {
+        x1=800.0mil; y1=225.0mil; x2=800.0mil; y2=225.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.40 {
+        x1=29.21mm; y1=425.0mil; x2=29.21mm; y2=425.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.43 {
+        x1=36.83mm; y1=250.0mil; x2=1.725in; y2=250.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.46 {
+        x1=47.625mm; y1=425.0mil; x2=51.435mm; y2=650.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.49 {
+        x1=175.0mil; y1=375.0mil; x2=175.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.52 {
+        x1=175.0mil; y1=75.0mil; x2=74.93mm; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.55 {
+        x1=800.0mil; y1=200.0mil; x2=800.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.58 {
+        x1=1.125in; y1=400.0mil; x2=1.125in; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.61 {
+        x1=37.465mm; y1=250.0mil; x2=37.465mm; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.64 {
+        x1=47.625mm; y1=425.0mil; x2=47.625mm; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.67 {
+        x1=56.515mm; y1=425.0mil; x2=2.55in; y2=425.0mil; thickness=80.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.73 {
+        x1=2.25in; y1=425.0mil; x2=2.25in; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.76 {
+        x1=2.8in; y1=25.0mil; x2=2.8in; y2=1.125in; thickness=265.0mil; clearance=50.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:int-sig2 {
+     lid=4
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:int-sig1 {
+     lid=5
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:top-silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.79 {
+        string=line touching padstack; x=975.0mil; y=800.0mil; scale=175; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:top-paste {
+     lid=9
+     group=0
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:top-mask {
+     lid=10
+     group=2
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-mask {
+     lid=11
+     group=11
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-paste {
+     lid=12
+     group=13
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 9;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 10;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:6 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:8 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:9 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 11;    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 12;    }
+   }
+  }
+ }
+}
Index: tags/2.0.1/tests/action/padstack2.lht
===================================================================
--- tags/2.0.1/tests/action/padstack2.lht	(nonexistent)
+++ tags/2.0.1/tests/action/padstack2.lht	(revision 18980)
@@ -0,0 +1,673 @@
+ha:pcb-rnd-board-v4 {
+
+ ha:attributes {
+   {PCB::grid::unit}=mil
+ }
+
+ li:styles {
+   ha:Signal {
+    diameter = 2.0mm
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 20.0mil
+   }
+   ha:Power {
+    diameter = 2.2mm
+    thickness = 20.0mil
+    hole = 1.0mm
+    clearance = 20.0mil
+   }
+   ha:Fat {
+    diameter = 137.8mil
+    thickness = 80.0mil
+    hole = 47.24mil
+    clearance = 25.0mil
+   }
+   ha:Sig-tight {
+    diameter = 64.0mil
+    thickness = 10.0mil
+    hole = 31.5mil
+    clearance = 12.0mil
+   }
+ }
+
+ ha:meta {
+   ha:size {
+    thermal_scale = 0.500000
+    x = 600.0mil
+    y = 600.0mil
+    isle_area_nm2 = 200000000.000000
+   }
+   ha:cursor {
+    zoom = 1.000000
+    x = 0.0
+    y = 0.0
+   }
+   ha:drc {
+    min_drill = 15.0mil
+    min_ring = 10.0mil
+    bloat = 12.0mil
+    shrink = 9.0mil
+    min_width = 10.0mil
+    min_silk = 7.0mil
+   }
+   ha:grid {
+    spacing = 25.0mil
+    offs_x = 0.0
+    offs_y = 0.0
+   }
+ }
+
+ ha:data {
+  li:padstack_prototypes {
+
+   ha:ps_proto_v4.0 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_line { x1=0.0; y1=-952.5um; x2=0.0; y2=37.5mil; thickness=25.0mil; square=0;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=40.0mil
+       }
+     }
+   }
+
+   ha:ps_proto_v4.1 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=40.0mil
+         li:ps_poly {
+          -0.001um  
+          -952.501um  
+          -635.001um  
+          0.952499mm  
+          0.634999mm  
+          0.952499mm  
+         }
+       }
+     }
+   }
+
+   ha:ps_proto_v4.2 {
+     hdia=0.0; hplated=0; htop=0; hbottom=0;
+     li:shape {
+
+       ha:ps_shape_v4 {
+        ha:ps_circ { x=0.0; y=0.0; dia=35.0mil;        }
+        ha:combining {        }
+        ha:layer_mask {
+         copper = 1
+         top = 1
+        }
+        clearance=40.0mil
+       }
+     }
+   }
+  }
+
+   li:objects {
+    ha:padstack_ref.34 {
+     proto=0; x=75.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.44 {
+     proto=0; x=150.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.45 {
+     proto=0; x=225.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.47 {
+     proto=1; x=150.0mil; y=185.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.49 {
+     proto=0; x=75.0mil; y=199.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.51 {
+     proto=2; x=226.0mil; y=167.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.53 {
+     proto=1; x=325.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.54 {
+     proto=1; x=425.0mil; y=100.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.65 {
+     proto=1; x=328.0mil; y=174.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.67 {
+     proto=2; x=395.0mil; y=154.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.69 {
+     proto=2; x=509.0mil; y=84.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.70 {
+     proto=2; x=502.0mil; y=118.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.149 {
+     proto=0; x=75.0mil; y=375.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.150 {
+     proto=0; x=150.0mil; y=375.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.151 {
+     proto=0; x=225.0mil; y=375.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.153 {
+     proto=0; x=59.0mil; y=470.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.154 {
+     proto=2; x=202.0mil; y=433.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.155 {
+     proto=1; x=325.0mil; y=375.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.156 {
+     proto=1; x=425.0mil; y=375.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.157 {
+     proto=1; x=294.0mil; y=434.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.158 {
+     proto=2; x=392.0mil; y=378.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.159 {
+     proto=2; x=509.0mil; y=359.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.160 {
+     proto=2; x=481.0mil; y=381.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+    ha:padstack_ref.162 {
+     proto=1; x=131.0mil; y=434.0mil; rot=0.000000; xmirror=0; smirror=0; clearance=20.0mil;
+     ha:flags {
+      clearline=1
+     }
+
+     li:thermal {
+     }
+    }
+   }
+   li:layers {
+
+    ha:top-sig {
+     lid=0
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+       ha:line.37 {
+        x1=25.0mil; y1=550.0mil; x2=25.0mil; y2=25.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.40 {
+        x1=25.0mil; y1=25.0mil; x2=525.0mil; y2=25.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.74 {
+        x1=75.0mil; y1=25.0mil; x2=75.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.77 {
+        x1=150.0mil; y1=25.0mil; x2=150.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.80 {
+        x1=225.0mil; y1=25.0mil; x2=225.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.86 {
+        x1=325.0mil; y1=25.0mil; x2=325.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.89 {
+        x1=425.0mil; y1=25.0mil; x2=425.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.92 {
+        x1=500.0mil; y1=25.0mil; x2=500.0mil; y2=75.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.128 {
+        x1=25.0mil; y1=300.0mil; x2=525.0mil; y2=300.0mil; thickness=20.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.131 {
+        x1=75.0mil; y1=300.0mil; x2=75.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.134 {
+        x1=150.0mil; y1=300.0mil; x2=150.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.137 {
+        x1=225.0mil; y1=300.0mil; x2=225.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.140 {
+        x1=325.0mil; y1=300.0mil; x2=325.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.143 {
+        x1=425.0mil; y1=300.0mil; x2=425.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:line.146 {
+        x1=500.0mil; y1=300.0mil; x2=500.0mil; y2=350.0mil; thickness=10.0mil; clearance=40.0mil;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:bottom-sig {
+     lid=1
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:top-gnd {
+     lid=2
+     group=3
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-gnd {
+     lid=3
+     group=10
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:int-sig2 {
+     lid=4
+     group=7
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:int-sig1 {
+     lid=5
+     group=5
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:outline {
+     lid=6
+     group=9
+     ha:combining {     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-silk {
+     lid=7
+     group=12
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+      }
+    }
+
+    ha:top-silk {
+     lid=8
+     group=1
+     ha:combining { auto=1;     }
+     visible=1
+
+      li:objects {
+       ha:text.167 {
+        string=overlap; x=425.0mil; y=175.0mil; scale=45; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+       ha:text.169 {
+        string=no overlap; x=375.0mil; y=425.0mil; scale=45; fid=0; direction=0;
+        ha:flags {
+         clearline=1
+        }
+       }
+      }
+    }
+
+    ha:top-paste {
+     lid=9
+     group=0
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:top-mask {
+     lid=10
+     group=2
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-mask {
+     lid=11
+     group=11
+     ha:combining { sub=1; auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+
+    ha:bottom-paste {
+     lid=12
+     group=13
+     ha:combining { auto=1;     }
+     visible=0
+
+      li:objects {
+      }
+    }
+   }
+ }
+
+ ha:layer_stack {
+  li:groups {
+   ha:0 {
+    name = top_paste
+    ha:type { top=1; paste=1;    }
+    li:layers { 9;    }
+   }
+   ha:1 {
+    name = top_silk
+    ha:type { silk=1; top=1;    }
+    li:layers { 8;    }
+   }
+   ha:2 {
+    name = top_mask
+    ha:type { top=1; mask=1;    }
+    li:layers { 10;    }
+   }
+   ha:3 {
+    name = top_copper
+    ha:type { copper=1; top=1;    }
+    li:layers { 0; 2;    }
+   }
+   ha:4 {
+    name = grp_4
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:5 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 5;    }
+   }
+   ha:6 {
+    name = grp_6
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:7 {
+    name = Intern
+    ha:type { copper=1; intern=1;    }
+    li:layers { 4;    }
+   }
+   ha:8 {
+    name = grp_8
+    ha:type { substrate=1; intern=1;    }
+    li:layers {    }
+   }
+   ha:9 {
+    name = global outline
+    ha:type { outline=1; intern=1;    }
+    li:layers { 6;    }
+   }
+   ha:10 {
+    name = bottom_copper
+    ha:type { bottom=1; copper=1;    }
+    li:layers { 1; 3;    }
+   }
+   ha:11 {
+    name = bottom_mask
+    ha:type { bottom=1; mask=1;    }
+    li:layers { 11;    }
+   }
+   ha:12 {
+    name = bottom_silk
+    ha:type { silk=1; bottom=1;    }
+    li:layers { 7;    }
+   }
+   ha:13 {
+    name = bottom_paste
+    ha:type { bottom=1; paste=1;    }
+    li:layers { 12;    }
+   }
+  }
+ }
+ li:pcb-rnd-conf-v1 {
+  ha:overwrite {
+   ha:design {
+    min_ring = 10.00 mil
+    clearance = 20.00 mil
+    via_thickness = 2.0000 mm
+    via_drilling_hole = 31.50 mil
+    min_slk = 7.00 mil
+    max_height = 600.00 mil
+    line_thickness = 10.00 mil
+    shrink = 9.00 mil
+    poly_isle_area = 200000000.000000
+    max_width = 600.00 mil
+    min_wid = 10.00 mil
+    bloat = 12.00 mil
+    min_drill = 15.00 mil
+   }
+   ha:editor {
+    grid_unit = mil
+    all_direction_lines = false
+     buffer_number = 0
+     grid = 25.00 mil
+   }
+  }
+ }
+}
Index: tags/2.0.1/tests/conf/Makefile
===================================================================
--- tags/2.0.1/tests/conf/Makefile	(nonexistent)
+++ tags/2.0.1/tests/conf/Makefile	(revision 18980)
@@ -0,0 +1,74 @@
+CFLAGS = -Wall -g -I../.. -I../../src_3rd -I../../src
+LDLIBS = -lm
+
+LIB_PCB_OBJS= \
+	../../src/hid_cfg.o \
+	../../src/misc_util.o \
+	../../src/unit.o \
+	../../src/list_conf.o \
+	../../src/paths.o \
+	../../src/conf.o \
+	../../src/conf_core.o \
+	../../src/conf_hid.o \
+	../../src/conf_internal.o \
+	../../src/pcb-printf.o \
+	../../src/compat_misc.o \
+	../../src/compat_fs.o \
+	../../src/safe_fs.o
+
+LIB_PLUGIN_OBJS=\
+	../../src_plugins/diag/diag_conf.o
+
+LIB_3RD_OBJS= \
+	../../src_3rd/liblihata/parser.o \
+	../../src_3rd/liblihata/dom.o \
+	../../src_3rd/liblihata/dom_list.o \
+	../../src_3rd/liblihata/dom_hash.o \
+	../../src_3rd/liblihata/dom_table.o \
+	../../src_3rd/liblihata/lihata.o \
+	../../src_3rd/liblihata/hash_str.o \
+	../../src_3rd/liblihata/tree.o \
+	../../src_3rd/liblihata/tree_list.o \
+	../../src_3rd/liblihata/tree_hash.o \
+	../../src_3rd/liblihata/tree_table.o \
+	../../src_3rd/liblihata/tree_symlink.o \
+	../../src_3rd/liblihata/tree_path.o \
+	../../src_3rd/genht/hash.o \
+	../../src_3rd/genht/htsp.o \
+	../../src_3rd/genht/htpi.o \
+	../../src_3rd/genht/htsi.o \
+	../../src_3rd/genht/htip.o \
+	../../src_3rd/genht/htpp.o \
+	../../src_3rd/genvector/gds_char.o \
+	../../src_3rd/genvector/vtp0.o
+
+DEPH = \
+	../../src/conf.h \
+	../../src/conf_hid.h \
+	../../src/conf_core.h \
+	../../src/compat_misc.h \
+	../../src_plugins/diag/diag_conf.h \
+
+OBJS = conftest.o help.o
+
+all: conftest
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+conftest: $(OBJS) $(LIB_3RD_OBJS) $(LIB_PCB_OBJS) $(LIB_PLUGIN_OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) $(LIB_3RD_OBJS) $(LIB_PCB_OBJS) $(LIB_PLUGIN_OBJS) $(LDLIBS) -o conftest
+
+conftest.o: conftest.c $(DEPH)
+	$(CC) $(CFLAGS) -c conftest.c -o conftest.o
+
+help.o: help.c
+
+$(LIB_3RD_OBJS) $(LIB_PCB_OBJS):
+	cd ../../src && make
+
+test:
+	cd tests && $(MAKE) all
+
+clean:
+	-$(SCCBOX) rm -f conftest tests/*.out $(OBJS)
Index: tags/2.0.1/tests/conf/conftest.c
===================================================================
--- tags/2.0.1/tests/conf/conftest.c	(nonexistent)
+++ tags/2.0.1/tests/conf/conftest.c	(revision 18980)
@@ -0,0 +1,406 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include "hid.h"
+#include "conf.h"
+#include "conf_hid.h"
+#include "conf_core.h"
+#include "compat_misc.h"
+#include "src_plugins/diag/diag_conf.h"
+
+int lineno = 0;
+int global_notify = 0;
+conf_hid_id_t hid_id;
+const char *hid_cookie = "conftest cookie";
+pcb_hid_t *pcb_gui = NULL;
+
+void pcb_message(enum pcb_message_level level, const char *Format, ...)
+{
+	va_list args;
+
+	fprintf(stderr, "Error in line %d: ", lineno);
+
+	va_start(args, Format);
+	vfprintf(stderr, Format, args);
+	va_end(args);
+
+	fprintf(stderr, "\n");
+}
+
+const char *pcb_board_get_filename(void)
+{
+	return "dummy_brd.lht";
+}
+
+const char *pcb_board_get_name(void)
+{
+	return "dummy_brd";
+}
+
+int pcb_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc)
+{
+	return 0;
+}
+
+int pcb_file_loaded_del_at(const char *catname, const char *name)
+{
+	return 0;
+}
+
+
+void watch_pre(conf_native_t *cfg, int idx)
+{
+	printf("watch_pre:  '%s' old value\n", cfg->hash_path);
+}
+
+void watch_post(conf_native_t *cfg, int idx)
+{
+	printf("watch_post: '%s' new value\n", cfg->hash_path);
+}
+
+void notify_pre(conf_native_t *cfg, int idx)
+{
+	if (global_notify)
+		printf("notify_pre:  '%s' old value\n", cfg->hash_path);
+}
+
+void notify_post(conf_native_t *cfg, int idx)
+{
+	if (global_notify)
+		printf("notify_post: '%s' new value\n", cfg->hash_path);
+}
+
+conf_hid_callbacks_t watch_cbs = {watch_pre, watch_post, NULL, NULL};
+conf_hid_callbacks_t global_cbs = {notify_pre, notify_post, NULL, NULL};
+
+
+extern lht_doc_t *conf_main_root[];
+void cmd_dump(char *arg)
+{
+	if (arg == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Need an arg: native or lihata");
+		return;
+	}
+	if (strncmp(arg, "native", 6) == 0) {
+		arg+=7;
+		while(isspace(*arg)) arg++;
+		conf_dump(stdout, "", 1, arg);
+	}
+	else if (strncmp(arg, "lihata", 6) == 0) {
+		conf_role_t role;
+		arg+=7;
+		while(isspace(*arg)) arg++;
+		role = conf_role_parse(arg);
+		if (role == CFR_invalid) {
+			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+			return;
+		}
+		if (conf_main_root[role] != NULL)
+			lht_dom_export(conf_main_root[role]->root, stdout, "");
+		else
+			printf("<empty>\n");
+	}
+	else
+		pcb_message(PCB_MSG_ERROR, "Invalid dump mode: '%s'", arg);
+}
+
+void cmd_print(char *arg)
+{
+	conf_native_t *node;
+	gds_t s;
+
+	if (arg == NULL) {
+		pcb_message(PCB_MSG_ERROR, "Need an arg: a native path");
+		return;
+	}
+	node = conf_get_field(arg);
+	if (node == NULL) {
+		pcb_message(PCB_MSG_ERROR, "No such path: '%s'", arg);
+		return;
+	}
+	gds_init(&s);
+	conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node);
+	printf("%s='%s'\n", node->hash_path, s.array);
+	gds_uninit(&s);
+}
+
+void cmd_load(char *arg, int is_text)
+{
+	char *fn;
+	conf_role_t role ;
+
+	if (arg == NULL) {
+		help:;
+		pcb_message(PCB_MSG_ERROR, "Need 2 args: role and %s", (is_text ? "lihata text" : "file name"));
+		return;
+	}
+
+	if (*arg == '*') {
+		conf_load_all(NULL, NULL);
+		return;
+	}
+
+	fn = strchr(arg, ' ');
+	if (fn == NULL)
+		goto help;
+	*fn = '\0';
+	fn++;
+	while(isspace(*fn)) fn++;
+
+	role = conf_role_parse(arg);
+	if (role == CFR_invalid) {
+		pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+		return;
+	}
+	printf("Result: %d\n", conf_load_as(role, fn, is_text));
+	conf_update(NULL, -1);
+}
+
+conf_policy_t current_policy = POL_OVERWRITE;
+conf_role_t current_role = CFR_DESIGN;
+
+void cmd_policy(char *arg)
+{
+	conf_policy_t np = conf_policy_parse(arg);
+	if (np == POL_invalid)
+		pcb_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg);
+	else
+		current_policy = np;
+}
+
+void cmd_role(char *arg)
+{
+	conf_role_t nr = conf_role_parse(arg);
+	if (nr == CFR_invalid)
+		pcb_message(PCB_MSG_ERROR, "Invalid/unknown role: '%s'", arg);
+	else
+		current_role = nr;
+}
+
+void cmd_chprio(char *arg)
+{
+	char *end;
+	int np = strtol(arg == NULL ? "" : arg, &end, 10);
+	lht_node_t *first;
+
+	if ((*end != '\0') || (np < 0)) {
+		pcb_message(PCB_MSG_ERROR, "Invalid integer prio: '%s'", arg);
+		return;
+	}
+	first = conf_lht_get_first(current_role, 0);
+	if (first != NULL) {
+		char tmp[128];
+		char *end;
+		end = strchr(first->name, '-');
+		if (end != NULL)
+			*end = '\0';
+		sprintf(tmp, "%s-%d", first->name, np);
+		free(first->name);
+		first->name = pcb_strdup(tmp);
+		conf_update(NULL, -1);
+	}
+}
+
+void cmd_chpolicy(char *arg)
+{
+	conf_policy_t np;
+	lht_node_t *first;
+
+	if (arg == NULL) {
+		pcb_message(PCB_MSG_ERROR, "need a policy", arg);
+		return;
+	}
+	np = conf_policy_parse(arg);
+	if (np == POL_invalid) {
+		pcb_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg);
+		return;
+	}
+
+	first = conf_lht_get_first(current_role, 0);
+	if (first != NULL) {
+		char tmp[128];
+		char *end;
+		end = strchr(first->name, '-');
+		if (end != NULL) {
+			sprintf(tmp, "%s%s", arg, end);
+			free(first->name);
+			first->name = pcb_strdup(tmp);
+		}
+		else {
+			free(first->name);
+			first->name = pcb_strdup(arg);
+		}
+		conf_update(NULL, -1);
+	}
+}
+
+void cmd_set(char *arg)
+{
+	char *path, *val;
+	int res;
+
+	path = arg;
+	val = strpbrk(path, " \t=");
+	if (val == NULL) {
+		pcb_message(PCB_MSG_ERROR, "set needs a value");
+		return;
+	}
+	*val = '\0';
+	val++;
+	while(isspace(*val) || (*val == '=')) val++;
+
+	res = conf_set(current_role, path, -1, val, current_policy);
+	if (res != 0)
+		printf("set error: %d\n", res);
+}
+
+void cmd_watch(char *arg, int add)
+{
+	conf_native_t *n = conf_get_field(arg);
+	if (n == NULL) {
+		pcb_message(PCB_MSG_ERROR, "unknown path");
+		return;
+	}
+	conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL));
+}
+
+void cmd_notify(char *arg)
+{
+	if (arg != NULL) {
+		if (strcmp(arg, "on") == 0)
+			global_notify = 1;
+		else if (strcmp(arg, "off") == 0)
+			global_notify = 0;
+	}
+	printf("Notify is %s\n", global_notify ? "on" : "off");
+}
+
+void cmd_echo(char *arg)
+{
+	if (arg != NULL)
+		printf("%s\n", arg);
+}
+
+void cmd_reset(char *arg)
+{
+	if (arg == NULL) {
+		conf_reset(current_role, "<cmd_reset current>");
+	}
+	else if (*arg == '*') {
+		int n;
+		for(n = 0; n < CFR_max_real; n++)
+			conf_reset(n, "<cmd_reset *>");
+	}
+	else {
+		conf_role_t role = conf_role_parse(arg);
+		if (role == CFR_invalid) {
+			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+			return;
+		}
+		conf_reset(role, "<cmd_reset role>");
+	}
+	conf_update(NULL, -1);
+}
+
+extern void cmd_help(char *arg);
+
+
+char line[8192];
+
+/* returns 1 if there's more to read */
+int getline_cont(FILE *f)
+{
+	char *end = line + strlen(line) - 1;
+	int offs = 0, cont;
+
+	if (feof(f))
+		return 0;
+
+	do {
+		int remain = sizeof(line)-offs;
+		assert(remain > 0);
+		cont = 0;
+		if (fgets(line+offs, remain, f)) {
+			char *start = line+offs;
+			int len = strlen(start);
+			lineno++;
+			end = start + len - 1;
+			while((end >= start) && ((*end == '\n') || (*end == '\r'))) {
+				*end = '\0';
+				end--;
+			}
+			if ((end >= start) && (*end == '\\')) {
+				cont = 1;
+				*end = '\n';
+			}
+			offs += len-1;
+		}
+		else {
+			if (offs == 0)
+				return 0;
+		}
+	} while(cont);
+	return 1;
+}
+
+int main()
+{
+
+	hid_id = conf_hid_reg(hid_cookie, &global_cbs);
+
+	conf_init();
+	conf_core_init();
+	conf_core_postproc();
+	conf_reset(CFR_SYSTEM, "<main>");
+	conf_reset(CFR_USER, "<main>");
+
+	while(getline_cont(stdin)) {
+		char *arg, *cmd = line;
+		while(isspace(*cmd)) cmd++;
+		if ((*cmd == '#') || (*cmd == '\0'))
+			continue;
+		arg = strpbrk(cmd, " \t");
+		if (arg != NULL) {
+			*arg = '\0';
+			arg++;
+			while(isspace(*arg)) arg++;
+		}
+
+		if (strcmp(cmd, "dump") == 0)
+			cmd_dump(arg);
+		else if (strcmp(cmd, "print") == 0)
+			cmd_print(arg);
+		else if (strcmp(cmd, "load") == 0)
+			cmd_load(arg, 0);
+		else if (strcmp(cmd, "paste") == 0)
+			cmd_load(arg, 1);
+		else if (strcmp(cmd, "reset") == 0)
+			cmd_reset(arg);
+		else if (strcmp(cmd, "set") == 0)
+			cmd_set(arg);
+		else if (strcmp(cmd, "policy") == 0)
+			cmd_policy(arg);
+		else if (strcmp(cmd, "chprio") == 0)
+			cmd_chprio(arg);
+		else if (strcmp(cmd, "chpolicy") == 0)
+			cmd_chpolicy(arg);
+		else if (strcmp(cmd, "role") == 0)
+			cmd_role(arg);
+		else if (strcmp(cmd, "watch") == 0)
+			cmd_watch(arg, 1);
+		else if (strcmp(cmd, "unwatch") == 0)
+			cmd_watch(arg, 0);
+		else if (strcmp(cmd, "notify") == 0)
+			cmd_notify(arg);
+		else if (strcmp(cmd, "echo") == 0)
+			cmd_echo(arg);
+		else if (strcmp(cmd, "help") == 0)
+			cmd_help(arg);
+		else
+			pcb_message(PCB_MSG_ERROR, "unknown command '%s'", cmd);
+	}
+
+	conf_hid_unreg(hid_cookie);
+	conf_uninit();
+	return 0;
+}
Index: tags/2.0.1/tests/conf/help.c
===================================================================
--- tags/2.0.1/tests/conf/help.c	(nonexistent)
+++ tags/2.0.1/tests/conf/help.c	(revision 18980)
@@ -0,0 +1,90 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+static const char *help[] = {
+	"dump", "native",
+	"Dump all settings as ended up in the native database after the last merge/udpate.",
+
+	"dump", "lihata role",
+	"Dump all in-memory lihata settings of a given role. For roles, see: help roles",
+
+	"load", "role filename",
+	"Load a lihata file as role",
+
+	"load", "*",
+	"Load all roles from disk - the same way as it happens on a normal pcb-rnd startup.",
+
+	"paste", "role lhttxt",
+	"Paste in-line lihata document lhttxt as role, like if it was loaded from a file",
+
+	"policy", "pol",
+	"Change current set-policy to pol. This only affects whether a set command inserts, appends or overwrites list-type settings. For valid policies, see: help policies",
+
+	"role", "rol",
+	"Change current set-policy to rol. This only affects the destination of subsequent set commands. For valid roles, see: help roles",
+
+	"chprio", "prio",
+	"Change the priority of the first confroot of the current role's in-memory lihata document to prio and merge. Prio is an integer value.",
+
+	"chpolicy", "pol",
+	"Change the policy of the first confroot of the current role's in-memory lihata document to pol and merge. Pol is a policy, see: help policies",
+
+	"set", "path value",
+	"Call conf_set() on a given path with the given value, using the current set-role and the current set-policy. See also: help role; help policy.",
+
+	"watch", "path",
+	"Announce changes of a given path. See also: help unwatch",
+
+	"unwatch", "path",
+	"Stop announcing changes of a given path. See also: help watch",
+
+	"notify", "on",
+	"Turn on global notification on config changes.",
+
+	"notify", "off",
+	"Turn off global notification on config changes.",
+
+	"echo", "text...",
+	"Print multi-word text.",
+
+	"reset", "role",
+	"Reset (make empty) the in-memory lihata document of role; see also: help roles",
+
+	"reset", "*",
+	"Reset (make empty) all in-memory lihata documents",
+
+/* misc */
+	"roles", NULL,
+	"Valid roles: system, defaultpcb, user, env, project, design, cli",
+
+	"policies", NULL,
+	"Valid policies: prepend, append, overwrite",
+
+	NULL, NULL, NULL
+};
+
+void cmd_help(char *arg)
+{
+	const char **s;
+
+	printf("\n");
+
+	if (arg == NULL) {
+		const char *last = "";
+		printf("Try help topic. Available topics:\n");
+		for(s = help; s[2] != NULL; s+=3) {
+			if (strcmp(last, s[0]) != 0)
+				printf("  %s\n", s[0]);
+			last = s[0];
+		}
+		return;
+	}
+
+	for(s = help; s[2] != NULL; s+=3) {
+		if (strcmp(arg, s[0]) == 0) {
+			printf("%s %s\n", s[0], (s[1] == NULL ? "" : s[1]));
+			printf("%s\n\n", s[2]);
+		}
+	}
+}
Index: tags/2.0.1/tests/conf/tests/Makefile
===================================================================
--- tags/2.0.1/tests/conf/tests/Makefile	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/Makefile	(revision 18980)
@@ -0,0 +1,23 @@
+TESTS =  \
+	list_merge.diff \
+	list_set.diff \
+	arr_merge.diff \
+	arr_set.diff \
+	scalar.diff
+
+.SUFFIXES: .ref .test .out .diff .REF
+
+all: $(TESTS)
+	@echo "conf:                *** QC PASS ***"
+
+.test.out:
+	@../conftest < $*.test >$*.out
+
+.test.REF:
+	@../conftest < $*.test >$*.ref
+	@echo $*.ref generated, please validate the content
+
+.out.diff:
+	@diff -u $*.ref $*.out
+
+
Index: tags/2.0.1/tests/conf/tests/arr_merge.ref
===================================================================
--- tags/2.0.1/tests/conf/tests/arr_merge.ref	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/arr_merge.ref	(revision 18980)
@@ -0,0 +1,31 @@
+=== initial state: empty ===
+ I appearance/color/layer[] = <empty>
+=== import 3 levels ===
+Result: 0
+ I appearance/color/layer[0] = sys1 <<prio=200 from=embedded:4>> conf_rev=1
+ I appearance/color/layer[1] = sys2 <<prio=200 from=embedded:5>> conf_rev=1
+Result: 0
+ I appearance/color/layer[0] = user1 <<prio=400 from=embedded:4>> conf_rev=2
+ I appearance/color/layer[1] = user2 <<prio=400 from=embedded:5>> conf_rev=2
+Result: 0
+ I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=3
+ I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=3
+=== change policy: design->prepend (design, user) ===
+ I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=4
+ I appearance/color/layer[2] = user1 <<prio=400 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[3] = user2 <<prio=400 from=embedded:5>> conf_rev=4
+=== change policy: user->append (design, sys, user) ===
+ I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=5
+ I appearance/color/layer[2] = sys1 <<prio=200 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[3] = sys2 <<prio=200 from=embedded:5>> conf_rev=5
+ I appearance/color/layer[4] = user1 <<prio=400 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[5] = user2 <<prio=400 from=embedded:5>> conf_rev=5
+=== change policy: design->append (sys, user, design) ===
+ I appearance/color/layer[0] = sys1 <<prio=200 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[1] = sys2 <<prio=200 from=embedded:5>> conf_rev=6
+ I appearance/color/layer[2] = user1 <<prio=400 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[3] = user2 <<prio=400 from=embedded:5>> conf_rev=6
+ I appearance/color/layer[4] = design1 <<prio=700 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[5] = design2 <<prio=700 from=embedded:5>> conf_rev=6
Index: tags/2.0.1/tests/conf/tests/arr_merge.test
===================================================================
--- tags/2.0.1/tests/conf/tests/arr_merge.test	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/arr_merge.test	(revision 18980)
@@ -0,0 +1,55 @@
+echo === initial state: empty ===
+reset *
+dump native appearance/color/layer
+
+echo === import 3 levels ===
+paste system \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:appearance { \
+				ha:color { \
+					li:layer = { sys1; sys2 } \
+				} \
+			} \
+		} \
+	}
+dump native appearance/color/layer
+
+paste user \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:appearance { \
+				ha:color { \
+					li:layer = { user1; user2 } \
+				} \
+			} \
+		} \
+	}
+dump native appearance/color/layer
+
+paste design \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:appearance { \
+				ha:color { \
+					li:layer = { design1; design2 } \
+				} \
+			} \
+		} \
+	}
+dump native appearance/color/layer
+
+echo === change policy: design->prepend (design, user) ===
+role design
+chpolicy prepend
+dump native appearance/color/layer
+
+echo === change policy: user->append (design, sys, user) ===
+role user
+chpolicy append
+dump native appearance/color/layer
+
+echo === change policy: design->append (sys, user, design) ===
+role design
+chpolicy append
+dump native appearance/color/layer
Index: tags/2.0.1/tests/conf/tests/arr_set.ref
===================================================================
--- tags/2.0.1/tests/conf/tests/arr_set.ref	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/arr_set.ref	(revision 18980)
@@ -0,0 +1,37 @@
+=== initial state: empty ===
+ I appearance/color/layer[] = <empty>
+=== append two items ===
+ I appearance/color/layer[0] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=1
+ I appearance/color/layer[0] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
+ I appearance/color/layer[1] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
+=== prepend two items ===
+ I appearance/color/layer[0] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[1] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[2] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[1] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+=== overwrite item ===
+ I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[4] = NEW2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[4] = NEW2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[5] = <NULL> <<prio=0>> conf_rev=8
+ I appearance/color/layer[6] = <NULL> <<prio=0>> conf_rev=8
+ I appearance/color/layer[7] = NEW3 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+=== overwrite array ===
+ I appearance/color/layer[0] = new <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[1] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
Index: tags/2.0.1/tests/conf/tests/arr_set.test
===================================================================
--- tags/2.0.1/tests/conf/tests/arr_set.test	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/arr_set.test	(revision 18980)
@@ -0,0 +1,44 @@
+role design
+
+echo === initial state: empty ===
+reset *
+dump native appearance/color/layer
+
+echo === append two items ===
+policy append
+
+set appearance/color/layer foo
+dump native appearance/color/layer
+
+set appearance/color/layer bar
+dump native appearance/color/layer
+
+echo === prepend two items ===
+policy prepend
+
+set appearance/color/layer pre1
+dump native appearance/color/layer
+
+set appearance/color/layer pre2
+dump native appearance/color/layer
+
+echo === overwrite item ===
+policy overwrite
+chprio 710
+
+set appearance/color/layer[1] NEW1
+dump native appearance/color/layer
+
+set appearance/color/layer[4] NEW2
+dump native appearance/color/layer
+
+set appearance/color/layer[7] NEW3
+dump native appearance/color/layer
+
+
+echo === overwrite array ===
+policy overwrite
+chprio 720
+
+set appearance/color/layer new
+dump native appearance/color/layer
Index: tags/2.0.1/tests/conf/tests/list_merge.ref
===================================================================
--- tags/2.0.1/tests/conf/tests/list_merge.ref	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/list_merge.ref	(revision 18980)
@@ -0,0 +1,13 @@
+=== initial state: empty ===
+ I rc/library_search_paths = <empty list> <<prio=0>> conf_rev=0
+=== import 3 levels ===
+Result: 0
+ I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;} <<prio=0>> conf_rev=1
+Result: 0
+ I rc/library_search_paths = {user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=2
+Result: 0
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=3
+=== change policies ===
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=4
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=5
+ I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=6
Index: tags/2.0.1/tests/conf/tests/list_merge.test
===================================================================
--- tags/2.0.1/tests/conf/tests/list_merge.test	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/list_merge.test	(revision 18980)
@@ -0,0 +1,47 @@
+echo === initial state: empty ===
+reset *
+dump native rc/library_search_paths
+
+echo === import 3 levels ===
+paste system \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:rc { \
+				li:library_search_paths = { sys1; sys2 } \
+			} \
+		} \
+	}
+dump native rc/library_search_paths
+
+paste user \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:rc { \
+				li:library_search_paths = { user1; user2 } \
+			} \
+		} \
+	}
+dump native rc/library_search_paths
+
+paste design \
+	li:pcb-rnd-conf-v1 { \
+		ha:overwrite { \
+			ha:rc { \
+				li:library_search_paths = { design1; design2 } \
+			} \
+		} \
+	}
+dump native rc/library_search_paths
+
+echo === change policies ===
+role design
+chpolicy prepend
+dump native rc/library_search_paths
+
+role user
+chpolicy append
+dump native rc/library_search_paths
+
+role design
+chpolicy append
+dump native rc/library_search_paths
Index: tags/2.0.1/tests/conf/tests/list_set.ref
===================================================================
--- tags/2.0.1/tests/conf/tests/list_set.ref	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/list_set.ref	(revision 18980)
@@ -0,0 +1,10 @@
+=== initial state: empty ===
+ I rc/library_search_paths = <empty list> <<prio=0>> conf_rev=0
+=== append two items ===
+ I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=1
+ I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=2
+=== prepend two items ===
+ I rc/library_search_paths = {pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=3
+ I rc/library_search_paths = {pre2 <<prio=700 from=<cmd_reset *>:0>>;pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=4
+=== overwrite ===
+ I rc/library_search_paths = {new <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=6
Index: tags/2.0.1/tests/conf/tests/list_set.test
===================================================================
--- tags/2.0.1/tests/conf/tests/list_set.test	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/list_set.test	(revision 18980)
@@ -0,0 +1,31 @@
+role design
+
+echo === initial state: empty ===
+reset *
+dump native rc/library_search_paths
+
+echo === append two items ===
+policy append
+
+set rc/library_search_paths foo
+dump native rc/library_search_paths
+
+set rc/library_search_paths bar
+dump native rc/library_search_paths
+
+echo === prepend two items ===
+policy prepend
+
+set rc/library_search_paths pre1
+dump native rc/library_search_paths
+
+set rc/library_search_paths pre2
+dump native rc/library_search_paths
+
+echo === overwrite ===
+policy overwrite
+chprio 710
+# NOTE: have to raise priority because previous prepend and append subtrees also remain in the tree
+
+set rc/library_search_paths new
+dump native rc/library_search_paths
Index: tags/2.0.1/tests/conf/tests/scalar.ref
===================================================================
--- tags/2.0.1/tests/conf/tests/scalar.ref	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/scalar.ref	(revision 18980)
@@ -0,0 +1,11 @@
+=== initial state ===
+ I rc/library_shell = <NULL> <<prio=0>> conf_rev=0
+=== setting new values on higher prio should change the final render ===
+ I rc/library_shell = from_user <<prio=400 from=<main>:0>> conf_rev=0
+ I rc/library_shell = from_design <<prio=700 from=<null-design>:0>> conf_rev=1
+ I rc/library_shell = from_cli <<prio=800 from=<commandline>:0>> conf_rev=2
+=== setting new values on lower prio should NOT change the final render ===
+ I rc/library_shell = from_cli <<prio=800 from=<commandline>:0>> conf_rev=3
+ I rc/library_shell = from_cli <<prio=800 from=<commandline>:0>> conf_rev=4
+=== change prio to reorder ===
+ I rc/library_shell = from_design2 <<prio=700 from=<null-design>:0>> conf_rev=5
Index: tags/2.0.1/tests/conf/tests/scalar.test
===================================================================
--- tags/2.0.1/tests/conf/tests/scalar.test	(nonexistent)
+++ tags/2.0.1/tests/conf/tests/scalar.test	(revision 18980)
@@ -0,0 +1,29 @@
+echo === initial state ===
+dump native rc/library_shell
+
+echo === setting new values on higher prio should change the final render ===
+role user
+set rc/library_shell from_user
+dump native rc/library_shell
+
+role design
+set rc/library_shell from_design
+dump native rc/library_shell
+
+role cli
+set rc/library_shell from_cli
+dump native rc/library_shell
+
+echo === setting new values on lower prio should NOT change the final render ===
+role user
+set rc/library_shell from_user2
+dump native rc/library_shell
+
+role design
+set rc/library_shell from_design2
+dump native rc/library_shell
+
+echo === change prio to reorder ===
+role cli
+chprio 1
+dump native rc/library_shell
Index: tags/2.0.1/tests/gsch2pcb-rnd/Makefile
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/Makefile	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/Makefile	(revision 18980)
@@ -0,0 +1,12 @@
+all:
+	cd simple && $(MAKE) all
+
+test:
+	cd simple && $(MAKE) test
+	@echo "gsch2pcb-rnd:        *** QC PASS ***"
+
+clean:
+	cd simple && $(MAKE) clean
+
+distclean:
+	cd simple && $(MAKE) distclean
Index: tags/2.0.1/tests/gsch2pcb-rnd/Makefile.common
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/Makefile.common	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/Makefile.common	(revision 18980)
@@ -0,0 +1,9 @@
+CONF = \
+ -c rc/library_search_paths+=$(TRUNK)/pcblib \
+ -c rc/default_pcb_file=$(TRUNK)/src/default.pcb
+
+GSCH2PCB = $(TRUNK)/util/gsch2pcb-rnd/gsch2pcb-rnd
+
+DIFF = diff -u
+
+FORCE:
Index: tags/2.0.1/tests/gsch2pcb-rnd/simple/Makefile
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/simple/Makefile	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/simple/Makefile	(revision 18980)
@@ -0,0 +1,12 @@
+TRUNK=../../..
+all:
+
+include ../Makefile.common
+
+test: FORCE
+	@make clean
+	@$(GSCH2PCB) -m import $(CONF) main.sch > main.log
+	@$(DIFF) main.cmd.ref main.cmd
+
+clean:
+	@rm main.pcb main.cmd main.log 2>/dev/null; true
\ No newline at end of file
Index: tags/2.0.1/tests/gsch2pcb-rnd/simple/main.cmd.ref
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/simple/main.cmd.ref	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/simple/main.cmd.ref	(revision 18980)
@@ -0,0 +1,68 @@
+Netlist(Freeze)
+Netlist(Clear)
+Netlist(Add,unnamed_net2,C3-2)
+Netlist(Add,unnamed_net2,CONN2-1)
+Netlist(Add,unnamed_net2,U1-3)
+Netlist(Add,GND,C3-1)
+Netlist(Add,GND,CONN2-2)
+Netlist(Add,GND,CONN1-2)
+Netlist(Add,GND,C1-2)
+Netlist(Add,GND,C2-1)
+Netlist(Add,GND,U1-2)
+Netlist(Add,unnamed_net1,C2-2)
+Netlist(Add,unnamed_net1,C1-1)
+Netlist(Add,unnamed_net1,CONN1-1)
+Netlist(Add,unnamed_net1,U1-1)
+Netlist(Sort)
+Netlist(Thaw)
+ElementList(Start)
+ElementList(Need,"C3","1206","unknown")
+ElementSetAttr("C3","device","CAPACITOR")
+ElementSetAttr("C3","manufacturer","unknown")
+ElementSetAttr("C3","manufacturer_part_number","unknown")
+ElementSetAttr("C3","vendor","unknown")
+ElementSetAttr("C3","vendor_part_number","unknown")
+ChangePinName("C3", 2, "2")
+ChangePinName("C3", 1, "1")
+ElementList(Need,"CONN2","connector(1,2)","unknown")
+ElementSetAttr("CONN2","device","CONNECTOR_2")
+ElementSetAttr("CONN2","manufacturer","unknown")
+ElementSetAttr("CONN2","manufacturer_part_number","unknown")
+ElementSetAttr("CONN2","vendor","unknown")
+ElementSetAttr("CONN2","vendor_part_number","unknown")
+ChangePinName("CONN2", 2, "2")
+ChangePinName("CONN2", 1, "1")
+ElementList(Need,"CONN1","connector(1,2)","unknown")
+ElementSetAttr("CONN1","device","CONNECTOR_2")
+ElementSetAttr("CONN1","manufacturer","unknown")
+ElementSetAttr("CONN1","manufacturer_part_number","unknown")
+ElementSetAttr("CONN1","vendor","unknown")
+ElementSetAttr("CONN1","vendor_part_number","unknown")
+ChangePinName("CONN1", 2, "2")
+ChangePinName("CONN1", 1, "1")
+ElementList(Need,"C1","TANT_A","unknown")
+ElementSetAttr("C1","device","POLARIZED_CAPACITOR")
+ElementSetAttr("C1","manufacturer","unknown")
+ElementSetAttr("C1","manufacturer_part_number","unknown")
+ElementSetAttr("C1","vendor","unknown")
+ElementSetAttr("C1","vendor_part_number","unknown")
+ChangePinName("C1", 2, "-")
+ChangePinName("C1", 1, "+")
+ElementList(Need,"C2","1206","unknown")
+ElementSetAttr("C2","device","CAPACITOR")
+ElementSetAttr("C2","manufacturer","unknown")
+ElementSetAttr("C2","manufacturer_part_number","unknown")
+ElementSetAttr("C2","vendor","unknown")
+ElementSetAttr("C2","vendor_part_number","unknown")
+ChangePinName("C2", 2, "2")
+ChangePinName("C2", 1, "1")
+ElementList(Need,"U1","TO220","unknown")
+ElementSetAttr("U1","device","7805")
+ElementSetAttr("U1","manufacturer","unknown")
+ElementSetAttr("U1","manufacturer_part_number","unknown")
+ElementSetAttr("U1","vendor","unknown")
+ElementSetAttr("U1","vendor_part_number","unknown")
+ChangePinName("U1", 3, "3")
+ChangePinName("U1", 2, "2")
+ChangePinName("U1", 1, "1")
+ElementList(Done)
Index: tags/2.0.1/tests/gsch2pcb-rnd/simple/main.out.ref
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/simple/main.out.ref	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/simple/main.out.ref	(revision 18980)
@@ -0,0 +1,20 @@
+  ../../../src/default.pcb -> 0
+
+----------------------------------
+Done processing.  Work performed:
+6 file elements added to main.pcb.
+
+Next step:
+1.  Run pcb on your file main.pcb.
+    You will find all your footprints in a bundle ready for you to place
+    or disperse with "Select -> Disperse all elements" in PCB.
+
+2.  From within PCB, select "File -> Load netlist file" and select 
+    main.net to load the netlist.
+
+3.  From within PCB, enter
+
+           :ExecuteFile(main.cmd)
+
+    to propagate the pin names of all footprints to the layout.
+
Index: tags/2.0.1/tests/gsch2pcb-rnd/simple/main.sch
===================================================================
--- tags/2.0.1/tests/gsch2pcb-rnd/simple/main.sch	(nonexistent)
+++ tags/2.0.1/tests/gsch2pcb-rnd/simple/main.sch	(revision 18980)
@@ -0,0 +1,80 @@
+v 20130925 2
+C 27800 50500 1 0 0 lm7805-1.sym
+{
+T 29400 51800 5 10 0 0 0 0 1
+device=7805
+T 29200 51500 5 10 1 1 0 6 1
+refdes=U1
+T 28100 51500 5 10 1 1 0 0 1
+footprint=TO220
+}
+C 27700 50000 1 90 0 capacitor-1.sym
+{
+T 27000 50200 5 10 0 0 90 0 1
+device=CAPACITOR
+T 27800 50600 5 10 1 1 90 0 1
+refdes=C2
+T 26800 50200 5 10 0 0 90 0 1
+symversion=0.1
+T 27800 49900 5 10 1 1 90 0 1
+footprint=1206
+}
+C 26500 50900 1 270 0 capacitor-2.sym
+{
+T 27200 50700 5 10 0 0 270 0 1
+device=POLARIZED_CAPACITOR
+T 26400 49700 5 10 1 1 90 0 1
+refdes=C1
+T 27400 50700 5 10 0 0 270 0 1
+symversion=0.1
+T 26400 50100 5 10 1 1 90 0 1
+footprint=TANT_A
+}
+C 25700 50300 1 0 1 connector2-2.sym
+{
+T 25000 51600 5 10 1 1 0 0 1
+refdes=CONN1
+T 25400 51550 5 10 0 0 0 6 1
+device=CONNECTOR_2
+T 25400 51750 5 10 0 0 0 6 1
+footprint=connector(1,2)
+}
+N 25700 51100 27800 51100 4
+C 31700 50300 1 0 0 connector2-2.sym
+{
+T 32400 51600 5 10 1 1 0 6 1
+refdes=CONN2
+T 32000 51550 5 10 0 0 0 0 1
+device=CONNECTOR_2
+T 32000 51750 5 10 0 0 0 0 1
+footprint=connector(1,2)
+}
+N 31700 51100 29400 51100 4
+C 30100 50000 1 90 0 capacitor-1.sym
+{
+T 29400 50200 5 10 0 0 90 0 1
+device=CAPACITOR
+T 30200 50600 5 10 1 1 90 0 1
+refdes=C3
+T 29200 50200 5 10 0 0 90 0 1
+symversion=0.1
+T 30200 49900 5 10 1 1 90 0 1
+footprint=1206
+}
+N 25700 50700 26000 50700 4
+N 26000 50700 26000 49300 4
+N 31700 50700 31500 50700 4
+N 31500 50700 31500 49300 4
+N 26700 50900 26700 51100 4
+N 27500 50900 27500 51100 4
+N 29900 50900 29900 51100 4
+N 28600 50500 28600 49300 4
+C 28500 49000 1 0 0 gnd-1.sym
+C 29800 49000 1 0 0 gnd-1.sym
+C 31400 49000 1 0 0 gnd-1.sym
+C 27400 49000 1 0 0 gnd-1.sym
+C 26600 49000 1 0 0 gnd-1.sym
+C 25900 49000 1 0 0 gnd-1.sym
+N 26700 49300 26700 50000 4
+N 27500 49300 27500 50000 4
+N 29900 49300 29900 50000 4
Index: tags/2.0.1/tests/orig/README.txt
===================================================================
--- tags/2.0.1/tests/orig/README.txt	(nonexistent)
+++ tags/2.0.1/tests/orig/README.txt	(revision 18980)
@@ -0,0 +1,108 @@
+This is the old test suite inherited from mainline.
+
+Please read this file before making any modifications to the test suite.
+
+**********************************************************************
+**********************************************************************
+* Overview
+**********************************************************************
+**********************************************************************
+
+The test suite is based on a shell script, 'run_tests.sh', which
+calls pcb to export various test case layouts to different output
+formats.  The tests to be run are defined in the file 'tests.list'.
+The 'tests.list' file defines the export command line options passed
+to pcb, the name of the input .pcb file, and the names and file types
+for the expected output files.
+
+After a particular test is run, the output files are compared against
+a set of "golden" files which are in the golden/ subdirectory.
+ALL CHANGES TO THE GOLDEN FILES MUST BE HAND VERIFIED.  This point
+can not be emphasized too much.  
+
+While this testsuite is clearly not comprehensive (the GUI is totally
+left out of the testing for example), it is still better than nothing
+and can help detect newly introduced bugs.
+
+**********************************************************************
+**********************************************************************
+* Running an existing test
+**********************************************************************
+**********************************************************************
+
+To run all of the tests defined in tests.list run:
+
+  ./run_tests.sh
+
+To only run a specific test or tests, then simply list them by name
+on the command line like:
+
+  ./run_tests.sh test_one test_two ... 
+
+**********************************************************************
+**********************************************************************
+* Updating existing "golden" files
+**********************************************************************
+**********************************************************************
+
+./run_tests.sh --regen <testname>
+
+will regenerate the golden file for <testname>.  If you are generating
+ASCII output such as BOMs or RS-274X files, then use the diff(3) program
+to examine all differences.  If you are generating a graphics file
+such as a PNG, then I suggest saving off a copy and using ImageMagick
+to look for the differences visually.  The run_tests.sh script has
+examples of comparing .png files.  Make sure the changes are only
+the expected ones and then check the new files back into svn.  Do
+not blindly update these files as that defeats the purpose of the tests.
+
+**********************************************************************
+**********************************************************************
+* Adding New Tests
+**********************************************************************
+**********************************************************************
+
+----------------------------------------------------------------------
+Create input files
+----------------------------------------------------------------------
+
+Create a *small* layout input file and put it in the inputs/
+directory.  The goal is to have a file which tests one particular aspect
+of the capabilities of pcb.
+
+----------------------------------------------------------------------
+Add to tests.list
+----------------------------------------------------------------------
+
+Add an entry to the tests.list file for your new tests.  Use existing
+entries as an example.
+
+----------------------------------------------------------------------
+Generate the reference files
+----------------------------------------------------------------------
+
+Generate the reference files for your new tests using the following
+
+./run_tests.sh --regen <new_test_name> 
+
+where <new_test_name> is the name of your new test from tests.list.  If you
+are adding multiple tests, then you can list them all on the same
+command line.
+
+*IMPORTANT*
+Verify that the generated .png files for your new tests are correct.  These
+files will have been placed in the golden/ subdirectory.
+
+----------------------------------------------------------------------
+Update Makefile.am's
+----------------------------------------------------------------------
+
+Update inputs/Makefile.am and golden/Makefile.am to include your new
+files.  If you added new Makefile.am's then be sure to also update
+configure.ac at the top level of the source tree.
+
+----------------------------------------------------------------------
+Add the new files to svn
+----------------------------------------------------------------------
+
+
Index: tags/2.0.1/tests/orig/golden/hid_bom1/bom_general.bom
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_bom1/bom_general.bom	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_bom1/bom_general.bom	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: Wed Jun 24 21:42:21 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+8,"Standard SMT resistor, capacitor etc","RESC3216N",R90_TOP R180_TOP R270_TOP R0_TOP R270_BOT R180_BOT R90_BOT R0_BOT 
+8,"Dual in-line package, narrow (300 mil)","DIP8",UDIP90_TOP UDIP180_TOP UDIP270_TOP UDIP0_TOP UDIP270_BOT UDIP180_BOT UDIP90_BOT UDIP0_BOT 
+8,"Small outline package, narrow (150mil)","SO8",USO90_TOP USO180_TOP USO270_TOP USO0_TOP USO270_BOT USO180_BOT USO90_BOT USO0_BOT 
Index: tags/2.0.1/tests/orig/golden/hid_bom2/test.bom
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_bom2/test.bom	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_bom2/test.bom	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: Wed Jun 24 21:42:22 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+8,"Standard SMT resistor, capacitor etc","RESC3216N",R90_TOP R180_TOP R270_TOP R0_TOP R270_BOT R180_BOT R90_BOT R0_BOT 
+8,"Dual in-line package, narrow (300 mil)","DIP8",UDIP90_TOP UDIP180_TOP UDIP270_TOP UDIP0_TOP UDIP270_BOT UDIP180_BOT UDIP90_BOT UDIP0_BOT 
+8,"Small outline package, narrow (150mil)","SO8",USO90_TOP USO180_TOP USO270_TOP USO0_TOP USO270_BOT USO180_BOT USO90_BOT USO0_BOT 
Index: tags/2.0.1/tests/orig/golden/hid_bom3/bom_general.bom
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_bom3/bom_general.bom	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_bom3/bom_general.bom	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: Wed Jun 24 21:42:22 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+8,"Standard SMT resistor, capacitor etc","RESC3216N",R90_TOP R180_TOP R270_TOP R0_TOP R270_BOT R180_BOT R90_BOT R0_BOT 
+8,"Dual in-line package, narrow (300 mil)","DIP8",UDIP90_TOP UDIP180_TOP UDIP270_TOP UDIP0_TOP UDIP270_BOT UDIP180_BOT UDIP90_BOT UDIP0_BOT 
+8,"Small outline package, narrow (150mil)","SO8",USO90_TOP USO180_TOP USO270_TOP USO0_TOP USO270_BOT USO180_BOT USO90_BOT USO0_BOT 
Index: tags/2.0.1/tests/orig/golden/hid_bom4/bom_general.bom
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_bom4/bom_general.bom	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_bom4/bom_general.bom	(revision 18980)
@@ -0,0 +1,10 @@
+# $Id$
+# PcbBOM Version 1.0
+# Date: Wed Jun 24 21:42:23 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB BOM
+# Quantity, Description, Value, RefDes
+# --------------------------------------------
+8,"Standard SMT resistor, capacitor etc","RESC3216N",R90_TOP R180_TOP R270_TOP R0_TOP R270_BOT R180_BOT R90_BOT R0_BOT 
+8,"Dual in-line package, narrow (300 mil)","DIP8",UDIP90_TOP UDIP180_TOP UDIP270_TOP UDIP0_TOP UDIP270_BOT UDIP180_BOT UDIP90_BOT UDIP0_BOT 
+8,"Small outline package, narrow (150mil)","SO8",USO90_TOP USO180_TOP USO270_TOP USO0_TOP USO270_BOT USO180_BOT USO90_BOT USO0_BOT 
Index: tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:31:54 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:31:54 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode1/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:31:51 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:32 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=0.002000  (safe Z)
+#101=-0.000050  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.462000    (start point)
+G1 Z#101
+G1 X27.516667 Y13.335000
+G1 X27.347333 Y13.208000
+G1 X7.408333 Y13.165667
+G1 X7.112000 Y12.869333
+G1 X7.112000 Y12.488333
+G1 X7.408333 Y12.192000
+G1 X27.347333 Y12.149667
+G1 X27.643667 Y11.938000
+G1 X27.940000 Y11.895667
+G1 X28.278667 Y11.980333
+G1 X28.532667 Y12.192000
+G1 X28.702000 Y12.530667
+G1 X28.702000 Y12.827000
+G1 X28.532667 Y13.165667
+G1 X28.321000 Y13.335000
+G1 X28.024667 Y13.462000
+G1 X27.770667 Y13.462000
+G0 Z#100
+(polygon end, distance 44.84)
+(end, total distance 44.84mm = 1.77in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:32 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=0.002000  (safe Z)
+#101=-0.002000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode10/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:28 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=0.002000  (safe Z)
+#101=-0.000050  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.462000    (start point)
+G1 Z#101
+G1 X22.479000 Y13.335000
+G1 X22.309667 Y13.208000
+G1 X2.370667 Y13.165667
+G1 X2.074333 Y12.869333
+G1 X2.074333 Y12.488333
+G1 X2.370667 Y12.192000
+G1 X22.309667 Y12.149667
+G1 X22.606000 Y11.938000
+G1 X22.902333 Y11.895667
+G1 X23.241000 Y11.980333
+G1 X23.495000 Y12.192000
+G1 X23.664333 Y12.530667
+G1 X23.664333 Y12.827000
+G1 X23.495000 Y13.165667
+G1 X23.283333 Y13.335000
+G1 X22.987000 Y13.462000
+G1 X22.733000 Y13.462000
+G0 Z#100
+(polygon end, distance 44.84)
+(end, total distance 44.84mm = 1.77in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,49 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:55 2010 )
+(600 dpi)
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G0 Z#100
+(polygon 1)
+G0 X1.085000 Y0.630000    (start point)
+G1 Z#101
+G1 X1.063333 Y0.625000
+G1 X1.055000 Y0.621667
+G1 X0.276667 Y0.618333
+G1 X0.251667 Y0.610000
+G1 X0.230000 Y0.598333
+G1 X0.200000 Y0.568333
+G1 X0.188333 Y0.546667
+G1 X0.180000 Y0.521667
+G1 X0.180000 Y0.476667
+G1 X0.188333 Y0.451667
+G1 X0.200000 Y0.430000
+G1 X0.230000 Y0.400000
+G1 X0.251667 Y0.388333
+G1 X0.276667 Y0.380000
+G1 X1.055000 Y0.376667
+G1 X1.068333 Y0.371667
+G1 X1.093333 Y0.368333
+G1 X1.121667 Y0.370000
+G1 X1.140000 Y0.375000
+G1 X1.171667 Y0.390000
+G1 X1.191667 Y0.406667
+G1 X1.208333 Y0.426667
+G1 X1.223333 Y0.458333
+G1 X1.228333 Y0.478333
+G1 X1.228333 Y0.520000
+G1 X1.223333 Y0.540000
+G1 X1.208333 Y0.571667
+G1 X1.191667 Y0.591667
+G1 X1.171667 Y0.608333
+G1 X1.140000 Y0.623333
+G1 X1.121667 Y0.628333
+G1 X1.085000 Y0.630000
+G0 Z#100
+(polygon end, distance 2.39)
+(end, total distance 60.74mm = 2.39in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:55 2010 )
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G81 X1.100000 Y0.500000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode11/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,45 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:43 2010 )
+(600 dpi)
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G0 Z#100
+(polygon 1)
+G0 X0.886667 Y0.630000    (start point)
+G1 Z#101
+G1 X0.865000 Y0.625000
+G1 X0.856667 Y0.621667
+G1 X0.078333 Y0.618333
+G1 X0.053333 Y0.610000
+G1 X0.031667 Y0.598333
+G1 X0.000000 Y0.566667
+G1 X0.000000 Y0.431667
+G1 X0.031667 Y0.400000
+G1 X0.053333 Y0.388333
+G1 X0.078333 Y0.380000
+G1 X0.856667 Y0.376667
+G1 X0.870000 Y0.371667
+G1 X0.895000 Y0.368333
+G1 X0.923333 Y0.370000
+G1 X0.941667 Y0.375000
+G1 X0.973333 Y0.390000
+G1 X0.993333 Y0.406667
+G1 X1.010000 Y0.426667
+G1 X1.025000 Y0.458333
+G1 X1.030000 Y0.478333
+G1 X1.030000 Y0.520000
+G1 X1.025000 Y0.540000
+G1 X1.010000 Y0.571667
+G1 X0.993333 Y0.591667
+G1 X0.973333 Y0.608333
+G1 X0.941667 Y0.623333
+G1 X0.923333 Y0.628333
+G1 X0.886667 Y0.630000
+G0 Z#100
+(polygon end, distance 2.38)
+(end, total distance 60.56mm = 2.38in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode2/out.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode2/out.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode2/out.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:35:19 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode2/out.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode2/out.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode2/out.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:35:19 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode2/out.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode2/out.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode2/out.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:35:16 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,40 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:36:04 2010 )
+(1200 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.813000 Y13.546667    (start point)
+G1 Z#101
+G1 X27.664833 Y13.504333
+G1 X27.453167 Y13.398500
+G1 X27.326167 Y13.292667
+G1 X7.535333 Y13.292667
+G1 X7.323667 Y13.229167
+G1 X7.069667 Y12.975167
+G1 X7.006167 Y12.763500
+G1 X7.006167 Y12.615333
+G1 X7.069667 Y12.403667
+G1 X7.323667 Y12.149667
+G1 X7.535333 Y12.086167
+G1 X27.326167 Y12.086167
+G1 X27.495500 Y11.959167
+G1 X27.728333 Y11.853333
+G1 X28.130500 Y11.853333
+G1 X28.448000 Y12.001500
+G1 X28.638500 Y12.213167
+G1 X28.765500 Y12.488333
+G1 X28.765500 Y12.890500
+G1 X28.638500 Y13.165667
+G1 X28.448000 Y13.377333
+G1 X28.130500 Y13.525500
+G1 X27.813000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.35)
+(end, total distance 45.35mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:36:04 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode3/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,40 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:35:46 2010 )
+(1200 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.754167 Y13.546667    (start point)
+G1 Z#101
+G1 X22.606000 Y13.504333
+G1 X22.394333 Y13.398500
+G1 X22.267333 Y13.292667
+G1 X2.476500 Y13.292667
+G1 X2.264833 Y13.229167
+G1 X2.010833 Y12.975167
+G1 X1.947333 Y12.763500
+G1 X1.947333 Y12.615333
+G1 X2.010833 Y12.403667
+G1 X2.264833 Y12.149667
+G1 X2.476500 Y12.086167
+G1 X22.267333 Y12.086167
+G1 X22.436667 Y11.959167
+G1 X22.669500 Y11.853333
+G1 X23.071667 Y11.853333
+G1 X23.389167 Y12.001500
+G1 X23.579667 Y12.213167
+G1 X23.706667 Y12.488333
+G1 X23.706667 Y12.890500
+G1 X23.579667 Y13.165667
+G1 X23.389167 Y13.377333
+G1 X23.071667 Y13.525500
+G1 X22.754167 Y13.546667
+G0 Z#100
+(polygon end, distance 45.35)
+(end, total distance 45.35mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:36:12 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=5.000000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:36:12 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode4/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:36:08 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=5.000000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 18:06:42 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=10.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 18:06:42 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=10.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode5/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 18:06:40 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=10.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,43 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:05 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X0.000000 Y25.400000    (start point)
+G1 Z#101
+G1 X0.000000 Y0.000000
+G1 X37.295667 Y0.000000
+G1 X38.057667 Y0.635000
+G1 X39.073667 Y1.524000
+G1 X39.962667 Y2.540000
+G1 X40.597667 Y3.302000
+G1 X41.486667 Y4.656667
+G1 X41.952333 Y5.503333
+G1 X42.418000 Y6.477000
+G1 X42.883667 Y7.704667
+G1 X43.264667 Y9.017000
+G1 X43.518667 Y10.329333
+G1 X43.645667 Y11.514667
+G1 X43.645667 Y13.843000
+G1 X43.518667 Y15.028333
+G1 X43.264667 Y16.340667
+G1 X42.883667 Y17.653000
+G1 X42.418000 Y18.880667
+G1 X41.952333 Y19.854333
+G1 X41.486667 Y20.701000
+G1 X40.597667 Y22.055667
+G1 X39.962667 Y22.817667
+G1 X39.073667 Y23.833667
+G1 X38.057667 Y24.722667
+G1 X37.253333 Y25.400000
+G1 X0.000000 Y25.400000
+G0 Z#100
+(polygon end, distance 129.45)
+(end, total distance 129.45mm = 5.10in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:05 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode6/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,43 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:39:31 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X0.000000 Y25.400000    (start point)
+G1 Z#101
+G1 X0.000000 Y0.000000
+G1 X32.258000 Y0.000000
+G1 X33.020000 Y0.635000
+G1 X34.036000 Y1.524000
+G1 X34.925000 Y2.540000
+G1 X35.560000 Y3.302000
+G1 X36.449000 Y4.656667
+G1 X36.914667 Y5.503333
+G1 X37.380333 Y6.477000
+G1 X37.846000 Y7.704667
+G1 X38.227000 Y9.017000
+G1 X38.481000 Y10.329333
+G1 X38.608000 Y11.514667
+G1 X38.608000 Y13.843000
+G1 X38.481000 Y15.028333
+G1 X38.227000 Y16.340667
+G1 X37.846000 Y17.653000
+G1 X37.380333 Y18.880667
+G1 X36.914667 Y19.854333
+G1 X36.449000 Y20.701000
+G1 X35.560000 Y22.055667
+G1 X34.925000 Y22.817667
+G1 X34.036000 Y23.833667
+G1 X33.020000 Y24.722667
+G1 X32.215667 Y25.400000
+G1 X0.000000 Y25.400000
+G0 Z#100
+(polygon end, distance 119.38)
+(end, total distance 119.38mm = 4.70in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:12 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:12 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=70.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode7/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:08 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:19 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X27.770667 Y13.546667    (start point)
+G1 Z#101
+G1 X27.559000 Y13.462000
+G1 X27.305000 Y13.292667
+G1 X7.450667 Y13.292667
+G1 X7.196667 Y13.081000
+G1 X6.985000 Y12.827000
+G1 X6.985000 Y12.530667
+G1 X7.196667 Y12.276667
+G1 X7.450667 Y12.065000
+G1 X27.305000 Y12.065000
+G1 X27.643667 Y11.853333
+G1 X28.194000 Y11.853333
+G1 X28.532667 Y12.065000
+G1 X28.744333 Y12.403667
+G1 X28.744333 Y12.954000
+G1 X28.532667 Y13.292667
+G1 X28.194000 Y13.504333
+G1 X27.770667 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:19 2010 )
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-2.000000  (drill depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G81 X27.940000 Y12.700000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode8/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:16 2010 )
+(600 dpi)
+(Unit: mm)
+(Board size: 50.80x25.40 mm)
+#100=2.000000  (safe Z)
+#101=-0.050000  (cutting depth)
+(---------------------------------)
+G17 G21 G90 G64 P0.003 M3 S3000 M7 F25
+G0 Z#100
+(polygon 1)
+G0 X22.733000 Y13.546667    (start point)
+G1 Z#101
+G1 X22.521333 Y13.462000
+G1 X22.267333 Y13.292667
+G1 X2.413000 Y13.292667
+G1 X2.159000 Y13.081000
+G1 X1.947333 Y12.827000
+G1 X1.947333 Y12.530667
+G1 X2.159000 Y12.276667
+G1 X2.413000 Y12.065000
+G1 X22.267333 Y12.065000
+G1 X22.606000 Y11.853333
+G1 X23.156333 Y11.853333
+G1 X23.495000 Y12.065000
+G1 X23.706667 Y12.403667
+G1 X23.706667 Y12.954000
+G1 X23.495000 Y13.292667
+G1 X23.156333 Y13.504333
+G1 X22.733000 Y13.546667
+G0 Z#100
+(polygon end, distance 45.38)
+(end, total distance 45.38mm = 1.79in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.bottom.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.bottom.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.bottom.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:25 2010 )
+(600 dpi)
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=0.002000  (safe Z)
+#101=-0.000050  (cutting depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G0 Z#100
+(polygon 1)
+G0 X1.093333 Y0.530000    (start point)
+G1 Z#101
+G1 X1.083333 Y0.525000
+G1 X1.076667 Y0.520000
+G1 X0.291667 Y0.518333
+G1 X0.280000 Y0.506667
+G1 X0.280000 Y0.491667
+G1 X0.291667 Y0.480000
+G1 X1.076667 Y0.478333
+G1 X1.088333 Y0.470000
+G1 X1.100000 Y0.468333
+G1 X1.113333 Y0.471667
+G1 X1.123333 Y0.480000
+G1 X1.130000 Y0.493333
+G1 X1.130000 Y0.505000
+G1 X1.123333 Y0.518333
+G1 X1.115000 Y0.525000
+G1 X1.103333 Y0.530000
+G1 X1.093333 Y0.530000
+G0 Z#100
+(polygon end, distance 1.77)
+(end, total distance 44.84mm = 1.77in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.drill.cnc	(revision 18980)
@@ -0,0 +1,12 @@
+(Created by G-code exporter)
+(drill file: 1 drills)
+( Tue Mar  9 17:45:25 2010 )
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=0.002000  (safe Z)
+#101=-0.002000  (drill depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G81 X1.100000 Y0.500000 Z#101 R#100
+M5 M9 M2
+(end, total distance 0.00mm = 0.00in)
Index: tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.top.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.top.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gcode9/gcode_oneline.gcode.top.cnc	(revision 18980)
@@ -0,0 +1,34 @@
+(Created by G-code exporter)
+( Tue Mar  9 17:45:22 2010 )
+(600 dpi)
+(Unit: inch)
+(Board size: 2.00x1.00 inches)
+#100=0.002000  (safe Z)
+#101=-0.000050  (cutting depth)
+(---------------------------------)
+G17 G20 G90 G64 P0.003 M3 S3000 M7 F1
+G0 Z#100
+(polygon 1)
+G0 X0.895000 Y0.530000    (start point)
+G1 Z#101
+G1 X0.885000 Y0.525000
+G1 X0.878333 Y0.520000
+G1 X0.093333 Y0.518333
+G1 X0.081667 Y0.506667
+G1 X0.081667 Y0.491667
+G1 X0.093333 Y0.480000
+G1 X0.878333 Y0.478333
+G1 X0.890000 Y0.470000
+G1 X0.901667 Y0.468333
+G1 X0.915000 Y0.471667
+G1 X0.925000 Y0.480000
+G1 X0.931667 Y0.493333
+G1 X0.931667 Y0.505000
+G1 X0.925000 Y0.518333
+G1 X0.916667 Y0.525000
+G1 X0.905000 Y0.530000
+G1 X0.895000 Y0.530000
+G0 Z#100
+(polygon end, distance 1.77)
+(end, total distance 44.84mm = 1.77in)
+M5 M9 M2
Index: tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.bottom.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.bottom.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 3 for group 1 idx 1 *
+G04 Title: Basic Single Trace RS274-X Test, solder *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 21:42:24 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBACK*%
+%ADD11C,0.0400*%
+%ADD12C,0.0600*%
+%ADD13C,0.0350*%
+G54D11*X170000Y50000D02*X90000D01*
+G54D12*D03*
+G54D13*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.fab.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.fab.gbr	(revision 18980)
@@ -0,0 +1,1734 @@
+G04 start of page 5 for group -3984 idx -3984 *
+G04 Title: Basic Single Trace RS274-X Test, fab *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 21:42:24 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0080*%
+%ADD15C,0.0060*%
+%ADD16C,0.0100*%
+G54D14*X90000Y50000D02*Y48400D01*
+Y50000D02*X91386Y50800D01*
+X90000Y50000D02*X88614Y50800D01*
+X15000Y156250D02*Y154650D01*
+Y156250D02*X16386Y157050D01*
+X15000Y156250D02*X13614Y157050D01*
+G54D15*X135000Y158500D02*Y157750D01*
+X136500Y156250D01*
+X138000Y157750D01*
+Y158500D02*Y157750D01*
+X136500Y156250D02*Y152500D01*
+X139801Y155500D02*X142051D01*
+X139801Y152500D02*X142801D01*
+X139801Y158500D02*Y152500D01*
+Y158500D02*X142801D01*
+X147603D02*X148353Y157750D01*
+X145353Y158500D02*X147603D01*
+X144603Y157750D02*X145353Y158500D01*
+X144603Y157750D02*Y156250D01*
+X145353Y155500D01*
+X147603D01*
+X148353Y154750D01*
+Y153250D01*
+X147603Y152500D02*X148353Y153250D01*
+X145353Y152500D02*X147603D01*
+X144603Y153250D02*X145353Y152500D01*
+X135000Y149249D02*X150154D01*
+X98750Y152500D02*X100250D01*
+X99500Y158500D02*Y152500D01*
+X98000Y157000D02*X99500Y158500D01*
+X98000Y149249D02*X102051D01*
+X45000Y153250D02*X45750Y152500D01*
+X45000Y157750D02*Y153250D01*
+Y157750D02*X45750Y158500D01*
+X47250D01*
+X48000Y157750D01*
+Y153250D01*
+X47250Y152500D02*X48000Y153250D01*
+X45750Y152500D02*X47250D01*
+X45000Y154000D02*X48000Y157000D01*
+X49801Y152500D02*X50551D01*
+X52353Y153250D02*X53103Y152500D01*
+X52353Y157750D02*Y153250D01*
+Y157750D02*X53103Y158500D01*
+X54603D01*
+X55353Y157750D01*
+Y153250D01*
+X54603Y152500D02*X55353Y153250D01*
+X53103Y152500D02*X54603D01*
+X52353Y154000D02*X55353Y157000D01*
+X57154Y157750D02*X57904Y158500D01*
+X59404D01*
+X60154Y157750D01*
+Y153250D01*
+X59404Y152500D02*X60154Y153250D01*
+X57904Y152500D02*X59404D01*
+X57154Y153250D02*X57904Y152500D01*
+Y155500D02*X60154D01*
+X61956Y158500D02*X64956D01*
+X61956D02*Y155500D01*
+X62706Y156250D01*
+X64206D01*
+X64956Y155500D01*
+Y153250D01*
+X64206Y152500D02*X64956Y153250D01*
+X62706Y152500D02*X64206D01*
+X61956Y153250D02*X62706Y152500D01*
+X45000Y149249D02*X66757D01*
+X3000Y173500D02*X3750Y172750D01*
+X750Y173500D02*X3000D01*
+X0Y172750D02*X750Y173500D01*
+X0Y172750D02*Y171250D01*
+X750Y170500D01*
+X3000D01*
+X3750Y169750D01*
+Y168250D01*
+X3000Y167500D02*X3750Y168250D01*
+X750Y167500D02*X3000D01*
+X0Y168250D02*X750Y167500D01*
+X5551Y170500D02*Y168250D01*
+X6301Y167500D01*
+X8551Y170500D02*Y166000D01*
+X7801Y165250D02*X8551Y166000D01*
+X6301Y165250D02*X7801D01*
+X5551Y166000D02*X6301Y165250D01*
+Y167500D02*X7801D01*
+X8551Y168250D01*
+X11103Y169750D02*Y167500D01*
+Y169750D02*X11853Y170500D01*
+X12603D01*
+X13353Y169750D01*
+Y167500D01*
+Y169750D02*X14103Y170500D01*
+X14853D01*
+X15603Y169750D01*
+Y167500D01*
+X10353Y170500D02*X11103Y169750D01*
+X17404Y173500D02*Y167500D01*
+Y168250D02*X18154Y167500D01*
+X19654D01*
+X20404Y168250D01*
+Y169750D02*Y168250D01*
+X19654Y170500D02*X20404Y169750D01*
+X18154Y170500D02*X19654D01*
+X17404Y169750D02*X18154Y170500D01*
+X22206Y169750D02*Y168250D01*
+Y169750D02*X22956Y170500D01*
+X24456D01*
+X25206Y169750D01*
+Y168250D01*
+X24456Y167500D02*X25206Y168250D01*
+X22956Y167500D02*X24456D01*
+X22206Y168250D02*X22956Y167500D01*
+X27007Y173500D02*Y168250D01*
+X27757Y167500D01*
+X41750Y173500D02*Y167500D01*
+X44000Y173500D02*X44750Y172750D01*
+Y168250D01*
+X44000Y167500D02*X44750Y168250D01*
+X41000Y167500D02*X44000D01*
+X41000Y173500D02*X44000D01*
+X46551Y172000D02*Y171250D01*
+Y169750D02*Y167500D01*
+X50303Y170500D02*X51053Y169750D01*
+X48803Y170500D02*X50303D01*
+X48053Y169750D02*X48803Y170500D01*
+X48053Y169750D02*Y168250D01*
+X48803Y167500D01*
+X51053Y170500D02*Y168250D01*
+X51803Y167500D01*
+X48803D02*X50303D01*
+X51053Y168250D01*
+X54354Y169750D02*Y167500D01*
+Y169750D02*X55104Y170500D01*
+X55854D01*
+X56604Y169750D01*
+Y167500D01*
+Y169750D02*X57354Y170500D01*
+X58104D01*
+X58854Y169750D01*
+Y167500D01*
+X53604Y170500D02*X54354Y169750D01*
+X60656Y167500D02*X61406D01*
+X65907Y168250D02*X66657Y167500D01*
+X65907Y172750D02*X66657Y173500D01*
+X65907Y172750D02*Y168250D01*
+X68459Y173500D02*X69959D01*
+X69209D02*Y167500D01*
+X68459D02*X69959D01*
+X72510Y169750D02*Y167500D01*
+Y169750D02*X73260Y170500D01*
+X74010D01*
+X74760Y169750D01*
+Y167500D01*
+X71760Y170500D02*X72510Y169750D01*
+X77312Y170500D02*X79562D01*
+X76562Y169750D02*X77312Y170500D01*
+X76562Y169750D02*Y168250D01*
+X77312Y167500D01*
+X79562D01*
+X81363Y173500D02*Y167500D01*
+Y169750D02*X82113Y170500D01*
+X83613D01*
+X84363Y169750D01*
+Y167500D01*
+X86165Y173500D02*X86915Y172750D01*
+Y168250D01*
+X86165Y167500D02*X86915Y168250D01*
+X95750Y167500D02*X98000D01*
+X95000Y168250D02*X95750Y167500D01*
+X95000Y172750D02*Y168250D01*
+Y172750D02*X95750Y173500D01*
+X98000D01*
+X99801Y169750D02*Y168250D01*
+Y169750D02*X100551Y170500D01*
+X102051D01*
+X102801Y169750D01*
+Y168250D01*
+X102051Y167500D02*X102801Y168250D01*
+X100551Y167500D02*X102051D01*
+X99801Y168250D02*X100551Y167500D01*
+X104603Y170500D02*Y168250D01*
+X105353Y167500D01*
+X106853D01*
+X107603Y168250D01*
+Y170500D02*Y168250D01*
+X110154Y169750D02*Y167500D01*
+Y169750D02*X110904Y170500D01*
+X111654D01*
+X112404Y169750D01*
+Y167500D01*
+X109404Y170500D02*X110154Y169750D01*
+X114956Y173500D02*Y168250D01*
+X115706Y167500D01*
+X114206Y171250D02*X115706D01*
+X130750Y173500D02*Y167500D01*
+X130000Y173500D02*X133000D01*
+X133750Y172750D01*
+Y171250D01*
+X133000Y170500D02*X133750Y171250D01*
+X130750Y170500D02*X133000D01*
+X135551Y173500D02*Y168250D01*
+X136301Y167500D01*
+X140053Y170500D02*X140803Y169750D01*
+X138553Y170500D02*X140053D01*
+X137803Y169750D02*X138553Y170500D01*
+X137803Y169750D02*Y168250D01*
+X138553Y167500D01*
+X140803Y170500D02*Y168250D01*
+X141553Y167500D01*
+X138553D02*X140053D01*
+X140803Y168250D01*
+X144104Y173500D02*Y168250D01*
+X144854Y167500D01*
+X143354Y171250D02*X144854D01*
+X147106Y167500D02*X149356D01*
+X146356Y168250D02*X147106Y167500D01*
+X146356Y169750D02*Y168250D01*
+Y169750D02*X147106Y170500D01*
+X148606D01*
+X149356Y169750D01*
+X146356Y169000D02*X149356D01*
+Y169750D02*Y169000D01*
+X154157Y173500D02*Y167500D01*
+X153407D02*X154157Y168250D01*
+X151907Y167500D02*X153407D01*
+X151157Y168250D02*X151907Y167500D01*
+X151157Y169750D02*Y168250D01*
+Y169750D02*X151907Y170500D01*
+X153407D01*
+X154157Y169750D01*
+X157459Y170500D02*Y169750D01*
+Y168250D02*Y167500D01*
+X155959Y172750D02*Y172000D01*
+Y172750D02*X156709Y173500D01*
+X158209D01*
+X158959Y172750D01*
+Y172000D01*
+X157459Y170500D02*X158959Y172000D01*
+X0Y188500D02*X3000D01*
+X1500D02*Y182500D01*
+X4801Y188500D02*Y182500D01*
+Y184750D02*X5551Y185500D01*
+X7051D01*
+X7801Y184750D01*
+Y182500D01*
+X10353D02*X12603D01*
+X9603Y183250D02*X10353Y182500D01*
+X9603Y184750D02*Y183250D01*
+Y184750D02*X10353Y185500D01*
+X11853D01*
+X12603Y184750D01*
+X9603Y184000D02*X12603D01*
+Y184750D02*Y184000D01*
+X15154Y184750D02*Y182500D01*
+Y184750D02*X15904Y185500D01*
+X17404D01*
+X14404D02*X15154Y184750D01*
+X19956Y182500D02*X22206D01*
+X19206Y183250D02*X19956Y182500D01*
+X19206Y184750D02*Y183250D01*
+Y184750D02*X19956Y185500D01*
+X21456D01*
+X22206Y184750D01*
+X19206Y184000D02*X22206D01*
+Y184750D02*Y184000D01*
+X28957Y185500D02*X29707Y184750D01*
+X27457Y185500D02*X28957D01*
+X26707Y184750D02*X27457Y185500D01*
+X26707Y184750D02*Y183250D01*
+X27457Y182500D01*
+X29707Y185500D02*Y183250D01*
+X30457Y182500D01*
+X27457D02*X28957D01*
+X29707Y183250D01*
+X33009Y184750D02*Y182500D01*
+Y184750D02*X33759Y185500D01*
+X35259D01*
+X32259D02*X33009Y184750D01*
+X37810Y182500D02*X40060D01*
+X37060Y183250D02*X37810Y182500D01*
+X37060Y184750D02*Y183250D01*
+Y184750D02*X37810Y185500D01*
+X39310D01*
+X40060Y184750D01*
+X37060Y184000D02*X40060D01*
+Y184750D02*Y184000D01*
+X45312Y182500D02*X46812D01*
+X46062Y188500D02*Y182500D01*
+X44562Y187000D02*X46062Y188500D01*
+X54313D02*Y182500D01*
+X53563D02*X54313Y183250D01*
+X52063Y182500D02*X53563D01*
+X51313Y183250D02*X52063Y182500D01*
+X51313Y184750D02*Y183250D01*
+Y184750D02*X52063Y185500D01*
+X53563D01*
+X54313Y184750D01*
+X56115Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X58366Y187750D02*Y182500D01*
+Y187750D02*X59116Y188500D01*
+X59866D01*
+X57616Y185500D02*X59116D01*
+X62118Y187750D02*Y182500D01*
+Y187750D02*X62868Y188500D01*
+X63618D01*
+X61368Y185500D02*X62868D01*
+X65869Y182500D02*X68119D01*
+X65119Y183250D02*X65869Y182500D01*
+X65119Y184750D02*Y183250D01*
+Y184750D02*X65869Y185500D01*
+X67369D01*
+X68119Y184750D01*
+X65119Y184000D02*X68119D01*
+Y184750D02*Y184000D01*
+X70671Y184750D02*Y182500D01*
+Y184750D02*X71421Y185500D01*
+X72921D01*
+X69921D02*X70671Y184750D01*
+X75472Y182500D02*X77722D01*
+X74722Y183250D02*X75472Y182500D01*
+X74722Y184750D02*Y183250D01*
+Y184750D02*X75472Y185500D01*
+X76972D01*
+X77722Y184750D01*
+X74722Y184000D02*X77722D01*
+Y184750D02*Y184000D01*
+X80274Y184750D02*Y182500D01*
+Y184750D02*X81024Y185500D01*
+X81774D01*
+X82524Y184750D01*
+Y182500D01*
+X79524Y185500D02*X80274Y184750D01*
+X85075Y188500D02*Y183250D01*
+X85825Y182500D01*
+X84325Y186250D02*X85825D01*
+X93027Y188500D02*Y182500D01*
+X92277D02*X93027Y183250D01*
+X90777Y182500D02*X92277D01*
+X90027Y183250D02*X90777Y182500D01*
+X90027Y184750D02*Y183250D01*
+Y184750D02*X90777Y185500D01*
+X92277D01*
+X93027Y184750D01*
+X95578D02*Y182500D01*
+Y184750D02*X96328Y185500D01*
+X97828D01*
+X94828D02*X95578Y184750D01*
+X99630Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X101131Y188500D02*Y183250D01*
+X101881Y182500D01*
+X103383Y188500D02*Y183250D01*
+X104133Y182500D01*
+X109084D02*X111334D01*
+X112084Y183250D01*
+X111334Y184000D02*X112084Y183250D01*
+X109084Y184000D02*X111334D01*
+X108334Y184750D02*X109084Y184000D01*
+X108334Y184750D02*X109084Y185500D01*
+X111334D01*
+X112084Y184750D01*
+X108334Y183250D02*X109084Y182500D01*
+X113886Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X115387Y185500D02*X118387D01*
+X115387Y182500D02*X118387Y185500D01*
+X115387Y182500D02*X118387D01*
+X120939D02*X123189D01*
+X120189Y183250D02*X120939Y182500D01*
+X120189Y184750D02*Y183250D01*
+Y184750D02*X120939Y185500D01*
+X122439D01*
+X123189Y184750D01*
+X120189Y184000D02*X123189D01*
+Y184750D02*Y184000D01*
+X125740Y182500D02*X127990D01*
+X128740Y183250D01*
+X127990Y184000D02*X128740Y183250D01*
+X125740Y184000D02*X127990D01*
+X124990Y184750D02*X125740Y184000D01*
+X124990Y184750D02*X125740Y185500D01*
+X127990D01*
+X128740Y184750D01*
+X124990Y183250D02*X125740Y182500D01*
+X133242Y185500D02*Y183250D01*
+X133992Y182500D01*
+X135492D01*
+X136242Y183250D01*
+Y185500D02*Y183250D01*
+X138793Y182500D02*X141043D01*
+X141793Y183250D01*
+X141043Y184000D02*X141793Y183250D01*
+X138793Y184000D02*X141043D01*
+X138043Y184750D02*X138793Y184000D01*
+X138043Y184750D02*X138793Y185500D01*
+X141043D01*
+X141793Y184750D01*
+X138043Y183250D02*X138793Y182500D01*
+X144345D02*X146595D01*
+X143595Y183250D02*X144345Y182500D01*
+X143595Y184750D02*Y183250D01*
+Y184750D02*X144345Y185500D01*
+X145845D01*
+X146595Y184750D01*
+X143595Y184000D02*X146595D01*
+Y184750D02*Y184000D01*
+X151396Y188500D02*Y182500D01*
+X150646D02*X151396Y183250D01*
+X149146Y182500D02*X150646D01*
+X148396Y183250D02*X149146Y182500D01*
+X148396Y184750D02*Y183250D01*
+Y184750D02*X149146Y185500D01*
+X150646D01*
+X151396Y184750D01*
+X155898Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X158149Y184750D02*Y182500D01*
+Y184750D02*X158899Y185500D01*
+X159649D01*
+X160399Y184750D01*
+Y182500D01*
+X157399Y185500D02*X158149Y184750D01*
+X165651Y188500D02*Y183250D01*
+X166401Y182500D01*
+X164901Y186250D02*X166401D01*
+X167902Y188500D02*Y182500D01*
+Y184750D02*X168652Y185500D01*
+X170152D01*
+X170902Y184750D01*
+Y182500D01*
+X172704Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X174955D02*X177205D01*
+X177955Y183250D01*
+X177205Y184000D02*X177955Y183250D01*
+X174955Y184000D02*X177205D01*
+X174205Y184750D02*X174955Y184000D01*
+X174205Y184750D02*X174955Y185500D01*
+X177205D01*
+X177955Y184750D01*
+X174205Y183250D02*X174955Y182500D01*
+X182457Y188500D02*Y183250D01*
+X183207Y182500D01*
+X186958Y185500D02*X187708Y184750D01*
+X185458Y185500D02*X186958D01*
+X184708Y184750D02*X185458Y185500D01*
+X184708Y184750D02*Y183250D01*
+X185458Y182500D01*
+X187708Y185500D02*Y183250D01*
+X188458Y182500D01*
+X185458D02*X186958D01*
+X187708Y183250D01*
+X190260Y185500D02*Y183250D01*
+X191010Y182500D01*
+X193260Y185500D02*Y181000D01*
+X192510Y180250D02*X193260Y181000D01*
+X191010Y180250D02*X192510D01*
+X190260Y181000D02*X191010Y180250D01*
+Y182500D02*X192510D01*
+X193260Y183250D01*
+X195061Y184750D02*Y183250D01*
+Y184750D02*X195811Y185500D01*
+X197311D01*
+X198061Y184750D01*
+Y183250D01*
+X197311Y182500D02*X198061Y183250D01*
+X195811Y182500D02*X197311D01*
+X195061Y183250D02*X195811Y182500D01*
+X199863Y185500D02*Y183250D01*
+X200613Y182500D01*
+X202113D01*
+X202863Y183250D01*
+Y185500D02*Y183250D01*
+X205414Y188500D02*Y183250D01*
+X206164Y182500D01*
+X204664Y186250D02*X206164D01*
+X207666Y181000D02*X209166Y182500D01*
+X214417D02*X215917D01*
+X215167Y188500D02*Y182500D01*
+X213667Y187000D02*X215167Y188500D01*
+X220419D02*Y182500D01*
+Y184750D02*X221169Y185500D01*
+X222669D01*
+X223419Y184750D01*
+Y182500D01*
+X225220Y184750D02*Y183250D01*
+Y184750D02*X225970Y185500D01*
+X227470D01*
+X228220Y184750D01*
+Y183250D01*
+X227470Y182500D02*X228220Y183250D01*
+X225970Y182500D02*X227470D01*
+X225220Y183250D02*X225970Y182500D01*
+X230022Y188500D02*Y183250D01*
+X230772Y182500D01*
+X233023D02*X235273D01*
+X232273Y183250D02*X233023Y182500D01*
+X232273Y184750D02*Y183250D01*
+Y184750D02*X233023Y185500D01*
+X234523D01*
+X235273Y184750D01*
+X232273Y184000D02*X235273D01*
+Y184750D02*Y184000D01*
+X237825Y182500D02*X240075D01*
+X240825Y183250D01*
+X240075Y184000D02*X240825Y183250D01*
+X237825Y184000D02*X240075D01*
+X237075Y184750D02*X237825Y184000D01*
+X237075Y184750D02*X237825Y185500D01*
+X240075D01*
+X240825Y184750D01*
+X237075Y183250D02*X237825Y182500D01*
+X246076Y188500D02*Y183250D01*
+X246826Y182500D01*
+X245326Y186250D02*X246826D01*
+X248328Y184750D02*Y183250D01*
+Y184750D02*X249078Y185500D01*
+X250578D01*
+X251328Y184750D01*
+Y183250D01*
+X250578Y182500D02*X251328Y183250D01*
+X249078Y182500D02*X250578D01*
+X248328Y183250D02*X249078Y182500D01*
+X253879Y188500D02*Y183250D01*
+X254629Y182500D01*
+X253129Y186250D02*X254629D01*
+X258381Y185500D02*X259131Y184750D01*
+X256881Y185500D02*X258381D01*
+X256131Y184750D02*X256881Y185500D01*
+X256131Y184750D02*Y183250D01*
+X256881Y182500D01*
+X259131Y185500D02*Y183250D01*
+X259881Y182500D01*
+X256881D02*X258381D01*
+X259131Y183250D01*
+X261682Y188500D02*Y183250D01*
+X262432Y182500D01*
+G54D16*X0Y100000D02*X200000D01*
+X0D02*Y0D01*
+X200000Y100000D02*Y0D01*
+X0D02*X200000D01*
+G54D15*Y113500D02*Y107500D01*
+Y113500D02*X202250Y111250D01*
+X204500Y113500D01*
+Y107500D01*
+X208551Y110500D02*X209301Y109750D01*
+X207051Y110500D02*X208551D01*
+X206301Y109750D02*X207051Y110500D01*
+X206301Y109750D02*Y108250D01*
+X207051Y107500D01*
+X209301Y110500D02*Y108250D01*
+X210051Y107500D01*
+X207051D02*X208551D01*
+X209301Y108250D01*
+X211853Y110500D02*X214853Y107500D01*
+X211853D02*X214853Y110500D01*
+X216654Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X218906Y109750D02*Y107500D01*
+Y109750D02*X219656Y110500D01*
+X220406D01*
+X221156Y109750D01*
+Y107500D01*
+Y109750D02*X221906Y110500D01*
+X222656D01*
+X223406Y109750D01*
+Y107500D01*
+X218156Y110500D02*X218906Y109750D01*
+X225207Y110500D02*Y108250D01*
+X225957Y107500D01*
+X227457D01*
+X228207Y108250D01*
+Y110500D02*Y108250D01*
+X230759Y109750D02*Y107500D01*
+Y109750D02*X231509Y110500D01*
+X232259D01*
+X233009Y109750D01*
+Y107500D01*
+Y109750D02*X233759Y110500D01*
+X234509D01*
+X235259Y109750D01*
+Y107500D01*
+X230009Y110500D02*X230759Y109750D01*
+X240510Y113500D02*Y107500D01*
+X242760Y113500D02*X243510Y112750D01*
+Y108250D01*
+X242760Y107500D02*X243510Y108250D01*
+X239760Y107500D02*X242760D01*
+X239760Y113500D02*X242760D01*
+X245312Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X247563Y109750D02*Y107500D01*
+Y109750D02*X248313Y110500D01*
+X249063D01*
+X249813Y109750D01*
+Y107500D01*
+Y109750D02*X250563Y110500D01*
+X251313D01*
+X252063Y109750D01*
+Y107500D01*
+X246813Y110500D02*X247563Y109750D01*
+X254615Y107500D02*X256865D01*
+X253865Y108250D02*X254615Y107500D01*
+X253865Y109750D02*Y108250D01*
+Y109750D02*X254615Y110500D01*
+X256115D01*
+X256865Y109750D01*
+X253865Y109000D02*X256865D01*
+Y109750D02*Y109000D01*
+X259416Y109750D02*Y107500D01*
+Y109750D02*X260166Y110500D01*
+X260916D01*
+X261666Y109750D01*
+Y107500D01*
+X258666Y110500D02*X259416Y109750D01*
+X264218Y107500D02*X266468D01*
+X267218Y108250D01*
+X266468Y109000D02*X267218Y108250D01*
+X264218Y109000D02*X266468D01*
+X263468Y109750D02*X264218Y109000D01*
+X263468Y109750D02*X264218Y110500D01*
+X266468D01*
+X267218Y109750D01*
+X263468Y108250D02*X264218Y107500D01*
+X269019Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X270521Y109750D02*Y108250D01*
+Y109750D02*X271271Y110500D01*
+X272771D01*
+X273521Y109750D01*
+Y108250D01*
+X272771Y107500D02*X273521Y108250D01*
+X271271Y107500D02*X272771D01*
+X270521Y108250D02*X271271Y107500D01*
+X276072Y109750D02*Y107500D01*
+Y109750D02*X276822Y110500D01*
+X277572D01*
+X278322Y109750D01*
+Y107500D01*
+X275322Y110500D02*X276072Y109750D01*
+X280874Y107500D02*X283124D01*
+X283874Y108250D01*
+X283124Y109000D02*X283874Y108250D01*
+X280874Y109000D02*X283124D01*
+X280124Y109750D02*X280874Y109000D01*
+X280124Y109750D02*X280874Y110500D01*
+X283124D01*
+X283874Y109750D01*
+X280124Y108250D02*X280874Y107500D01*
+X285675Y111250D02*X286425D01*
+X285675Y109750D02*X286425D01*
+X290927Y112750D02*X291677Y113500D01*
+X293927D01*
+X294677Y112750D01*
+Y111250D01*
+X290927Y107500D02*X294677Y111250D01*
+X290927Y107500D02*X294677D01*
+X296478Y108250D02*X297228Y107500D01*
+X296478Y112750D02*Y108250D01*
+Y112750D02*X297228Y113500D01*
+X298728D01*
+X299478Y112750D01*
+Y108250D01*
+X298728Y107500D02*X299478Y108250D01*
+X297228Y107500D02*X298728D01*
+X296478Y109000D02*X299478Y112000D01*
+X301280Y108250D02*X302030Y107500D01*
+X301280Y112750D02*Y108250D01*
+Y112750D02*X302030Y113500D01*
+X303530D01*
+X304280Y112750D01*
+Y108250D01*
+X303530Y107500D02*X304280Y108250D01*
+X302030Y107500D02*X303530D01*
+X301280Y109000D02*X304280Y112000D01*
+X306081Y108250D02*X306831Y107500D01*
+X306081Y112750D02*Y108250D01*
+Y112750D02*X306831Y113500D01*
+X308331D01*
+X309081Y112750D01*
+Y108250D01*
+X308331Y107500D02*X309081Y108250D01*
+X306831Y107500D02*X308331D01*
+X306081Y109000D02*X309081Y112000D01*
+X314333Y109750D02*Y107500D01*
+Y109750D02*X315083Y110500D01*
+X315833D01*
+X316583Y109750D01*
+Y107500D01*
+Y109750D02*X317333Y110500D01*
+X318083D01*
+X318833Y109750D01*
+Y107500D01*
+X313583Y110500D02*X314333Y109750D01*
+X320634Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X322136Y113500D02*Y108250D01*
+X322886Y107500D01*
+X325137D02*X327387D01*
+X328137Y108250D01*
+X327387Y109000D02*X328137Y108250D01*
+X325137Y109000D02*X327387D01*
+X324387Y109750D02*X325137Y109000D01*
+X324387Y109750D02*X325137Y110500D01*
+X327387D01*
+X328137Y109750D01*
+X324387Y108250D02*X325137Y107500D01*
+X332639Y110500D02*Y108250D01*
+X333389Y107500D01*
+X334139D01*
+X334889Y108250D01*
+Y110500D02*Y108250D01*
+X335639Y107500D01*
+X336389D01*
+X337139Y108250D01*
+Y110500D02*Y108250D01*
+X338940Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X343442Y113500D02*Y107500D01*
+X342692D02*X343442Y108250D01*
+X341192Y107500D02*X342692D01*
+X340442Y108250D02*X341192Y107500D01*
+X340442Y109750D02*Y108250D01*
+Y109750D02*X341192Y110500D01*
+X342692D01*
+X343442Y109750D01*
+X345993Y107500D02*X348243D01*
+X345243Y108250D02*X345993Y107500D01*
+X345243Y109750D02*Y108250D01*
+Y109750D02*X345993Y110500D01*
+X347493D01*
+X348243Y109750D01*
+X345243Y109000D02*X348243D01*
+Y109750D02*Y109000D01*
+X350045Y106000D02*X351545Y107500D01*
+X356796D02*X358296D01*
+X357546Y113500D02*Y107500D01*
+X356046Y112000D02*X357546Y113500D01*
+X360098Y108250D02*X360848Y107500D01*
+X360098Y112750D02*Y108250D01*
+Y112750D02*X360848Y113500D01*
+X362348D01*
+X363098Y112750D01*
+Y108250D01*
+X362348Y107500D02*X363098Y108250D01*
+X360848Y107500D02*X362348D01*
+X360098Y109000D02*X363098Y112000D01*
+X364899Y108250D02*X365649Y107500D01*
+X364899Y112750D02*Y108250D01*
+Y112750D02*X365649Y113500D01*
+X367149D01*
+X367899Y112750D01*
+Y108250D01*
+X367149Y107500D02*X367899Y108250D01*
+X365649Y107500D02*X367149D01*
+X364899Y109000D02*X367899Y112000D01*
+X369701Y108250D02*X370451Y107500D01*
+X369701Y112750D02*Y108250D01*
+Y112750D02*X370451Y113500D01*
+X371951D01*
+X372701Y112750D01*
+Y108250D01*
+X371951Y107500D02*X372701Y108250D01*
+X370451Y107500D02*X371951D01*
+X369701Y109000D02*X372701Y112000D01*
+X377952Y109750D02*Y107500D01*
+Y109750D02*X378702Y110500D01*
+X379452D01*
+X380202Y109750D01*
+Y107500D01*
+Y109750D02*X380952Y110500D01*
+X381702D01*
+X382452Y109750D01*
+Y107500D01*
+X377202Y110500D02*X377952Y109750D01*
+X384254Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X385755Y113500D02*Y108250D01*
+X386505Y107500D01*
+X388757D02*X391007D01*
+X391757Y108250D01*
+X391007Y109000D02*X391757Y108250D01*
+X388757Y109000D02*X391007D01*
+X388007Y109750D02*X388757Y109000D01*
+X388007Y109750D02*X388757Y110500D01*
+X391007D01*
+X391757Y109750D01*
+X388007Y108250D02*X388757Y107500D01*
+X396258Y113500D02*Y107500D01*
+Y109750D02*X397008Y110500D01*
+X398508D01*
+X399258Y109750D01*
+Y107500D01*
+X401060Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X404811Y110500D02*X405561Y109750D01*
+X403311Y110500D02*X404811D01*
+X402561Y109750D02*X403311Y110500D01*
+X402561Y109750D02*Y108250D01*
+X403311Y107500D01*
+X404811D01*
+X405561Y108250D01*
+X402561Y106000D02*X403311Y105250D01*
+X404811D01*
+X405561Y106000D01*
+Y110500D02*Y106000D01*
+X407363Y113500D02*Y107500D01*
+Y109750D02*X408113Y110500D01*
+X409613D01*
+X410363Y109750D01*
+Y107500D01*
+X0Y-9500D02*X3000D01*
+X3750Y-8750D01*
+Y-7250D02*Y-8750D01*
+X3000Y-6500D02*X3750Y-7250D01*
+X750Y-6500D02*X3000D01*
+X750Y-3500D02*Y-9500D01*
+X0Y-3500D02*X3000D01*
+X3750Y-4250D01*
+Y-5750D01*
+X3000Y-6500D02*X3750Y-5750D01*
+X5551Y-7250D02*Y-8750D01*
+Y-7250D02*X6301Y-6500D01*
+X7801D01*
+X8551Y-7250D01*
+Y-8750D01*
+X7801Y-9500D02*X8551Y-8750D01*
+X6301Y-9500D02*X7801D01*
+X5551Y-8750D02*X6301Y-9500D01*
+X12603Y-6500D02*X13353Y-7250D01*
+X11103Y-6500D02*X12603D01*
+X10353Y-7250D02*X11103Y-6500D01*
+X10353Y-7250D02*Y-8750D01*
+X11103Y-9500D01*
+X13353Y-6500D02*Y-8750D01*
+X14103Y-9500D01*
+X11103D02*X12603D01*
+X13353Y-8750D01*
+X16654Y-7250D02*Y-9500D01*
+Y-7250D02*X17404Y-6500D01*
+X18904D01*
+X15904D02*X16654Y-7250D01*
+X23706Y-3500D02*Y-9500D01*
+X22956D02*X23706Y-8750D01*
+X21456Y-9500D02*X22956D01*
+X20706Y-8750D02*X21456Y-9500D01*
+X20706Y-7250D02*Y-8750D01*
+Y-7250D02*X21456Y-6500D01*
+X22956D01*
+X23706Y-7250D01*
+X28207D02*Y-8750D01*
+Y-7250D02*X28957Y-6500D01*
+X30457D01*
+X31207Y-7250D01*
+Y-8750D01*
+X30457Y-9500D02*X31207Y-8750D01*
+X28957Y-9500D02*X30457D01*
+X28207Y-8750D02*X28957Y-9500D01*
+X33009Y-6500D02*Y-8750D01*
+X33759Y-9500D01*
+X35259D01*
+X36009Y-8750D01*
+Y-6500D02*Y-8750D01*
+X38560Y-3500D02*Y-8750D01*
+X39310Y-9500D01*
+X37810Y-5750D02*X39310D01*
+X40812Y-3500D02*Y-8750D01*
+X41562Y-9500D01*
+X43063Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X45315Y-7250D02*Y-9500D01*
+Y-7250D02*X46065Y-6500D01*
+X46815D01*
+X47565Y-7250D01*
+Y-9500D01*
+X44565Y-6500D02*X45315Y-7250D01*
+X50116Y-9500D02*X52366D01*
+X49366Y-8750D02*X50116Y-9500D01*
+X49366Y-7250D02*Y-8750D01*
+Y-7250D02*X50116Y-6500D01*
+X51616D01*
+X52366Y-7250D01*
+X49366Y-8000D02*X52366D01*
+Y-7250D02*Y-8000D01*
+X56868Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X59119D02*X61369D01*
+X62119Y-8750D01*
+X61369Y-8000D02*X62119Y-8750D01*
+X59119Y-8000D02*X61369D01*
+X58369Y-7250D02*X59119Y-8000D01*
+X58369Y-7250D02*X59119Y-6500D01*
+X61369D01*
+X62119Y-7250D01*
+X58369Y-8750D02*X59119Y-9500D01*
+X67371Y-3500D02*Y-8750D01*
+X68121Y-9500D01*
+X66621Y-5750D02*X68121D01*
+X69622Y-3500D02*Y-9500D01*
+Y-7250D02*X70372Y-6500D01*
+X71872D01*
+X72622Y-7250D01*
+Y-9500D01*
+X75174D02*X77424D01*
+X74424Y-8750D02*X75174Y-9500D01*
+X74424Y-7250D02*Y-8750D01*
+Y-7250D02*X75174Y-6500D01*
+X76674D01*
+X77424Y-7250D01*
+X74424Y-8000D02*X77424D01*
+Y-7250D02*Y-8000D01*
+X82675Y-6500D02*X84925D01*
+X81925Y-7250D02*X82675Y-6500D01*
+X81925Y-7250D02*Y-8750D01*
+X82675Y-9500D01*
+X84925D01*
+X87477D02*X89727D01*
+X86727Y-8750D02*X87477Y-9500D01*
+X86727Y-7250D02*Y-8750D01*
+Y-7250D02*X87477Y-6500D01*
+X88977D01*
+X89727Y-7250D01*
+X86727Y-8000D02*X89727D01*
+Y-7250D02*Y-8000D01*
+X92278Y-7250D02*Y-9500D01*
+Y-7250D02*X93028Y-6500D01*
+X93778D01*
+X94528Y-7250D01*
+Y-9500D01*
+X91528Y-6500D02*X92278Y-7250D01*
+X97080Y-3500D02*Y-8750D01*
+X97830Y-9500D01*
+X96330Y-5750D02*X97830D01*
+X100081Y-9500D02*X102331D01*
+X99331Y-8750D02*X100081Y-9500D01*
+X99331Y-7250D02*Y-8750D01*
+Y-7250D02*X100081Y-6500D01*
+X101581D01*
+X102331Y-7250D01*
+X99331Y-8000D02*X102331D01*
+Y-7250D02*Y-8000D01*
+X104883Y-7250D02*Y-9500D01*
+Y-7250D02*X105633Y-6500D01*
+X107133D01*
+X104133D02*X104883Y-7250D01*
+X108934Y-3500D02*Y-8750D01*
+X109684Y-9500D01*
+X111186Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X113437Y-7250D02*Y-9500D01*
+Y-7250D02*X114187Y-6500D01*
+X114937D01*
+X115687Y-7250D01*
+Y-9500D01*
+X112687Y-6500D02*X113437Y-7250D01*
+X118239Y-9500D02*X120489D01*
+X117489Y-8750D02*X118239Y-9500D01*
+X117489Y-7250D02*Y-8750D01*
+Y-7250D02*X118239Y-6500D01*
+X119739D01*
+X120489Y-7250D01*
+X117489Y-8000D02*X120489D01*
+Y-7250D02*Y-8000D01*
+X124990Y-7250D02*Y-8750D01*
+Y-7250D02*X125740Y-6500D01*
+X127240D01*
+X127990Y-7250D01*
+Y-8750D01*
+X127240Y-9500D02*X127990Y-8750D01*
+X125740Y-9500D02*X127240D01*
+X124990Y-8750D02*X125740Y-9500D01*
+X130542Y-4250D02*Y-9500D01*
+Y-4250D02*X131292Y-3500D01*
+X132042D01*
+X129792Y-6500D02*X131292D01*
+X136993Y-3500D02*Y-8750D01*
+X137743Y-9500D01*
+X136243Y-5750D02*X137743D01*
+X139245Y-3500D02*Y-9500D01*
+Y-7250D02*X139995Y-6500D01*
+X141495D01*
+X142245Y-7250D01*
+Y-9500D01*
+X144046Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X146298D02*X148548D01*
+X149298Y-8750D01*
+X148548Y-8000D02*X149298Y-8750D01*
+X146298Y-8000D02*X148548D01*
+X145548Y-7250D02*X146298Y-8000D01*
+X145548Y-7250D02*X146298Y-6500D01*
+X148548D01*
+X149298Y-7250D01*
+X145548Y-8750D02*X146298Y-9500D01*
+X154549D02*X156049D01*
+X155299Y-3500D02*Y-9500D01*
+X153799Y-5000D02*X155299Y-3500D01*
+X157851Y-8750D02*X158601Y-9500D01*
+X157851Y-4250D02*Y-8750D01*
+Y-4250D02*X158601Y-3500D01*
+X160101D01*
+X160851Y-4250D01*
+Y-8750D01*
+X160101Y-9500D02*X160851Y-8750D01*
+X158601Y-9500D02*X160101D01*
+X157851Y-8000D02*X160851Y-5000D01*
+X166102Y-7250D02*Y-9500D01*
+Y-7250D02*X166852Y-6500D01*
+X167602D01*
+X168352Y-7250D01*
+Y-9500D01*
+Y-7250D02*X169102Y-6500D01*
+X169852D01*
+X170602Y-7250D01*
+Y-9500D01*
+X165352Y-6500D02*X166102Y-7250D01*
+X172404Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X173905Y-3500D02*Y-8750D01*
+X174655Y-9500D01*
+X179607Y-7250D02*Y-9500D01*
+Y-7250D02*X180357Y-6500D01*
+X181857D01*
+X178857D02*X179607Y-7250D01*
+X184408Y-9500D02*X186658D01*
+X183658Y-8750D02*X184408Y-9500D01*
+X183658Y-7250D02*Y-8750D01*
+Y-7250D02*X184408Y-6500D01*
+X185908D01*
+X186658Y-7250D01*
+X183658Y-8000D02*X186658D01*
+Y-7250D02*Y-8000D01*
+X189210Y-6500D02*X191460D01*
+X188460Y-7250D02*X189210Y-6500D01*
+X188460Y-7250D02*Y-8750D01*
+X189210Y-9500D01*
+X191460D01*
+X194011Y-3500D02*Y-8750D01*
+X194761Y-9500D01*
+X193261Y-5750D02*X194761D01*
+X198513Y-6500D02*X199263Y-7250D01*
+X197013Y-6500D02*X198513D01*
+X196263Y-7250D02*X197013Y-6500D01*
+X196263Y-7250D02*Y-8750D01*
+X197013Y-9500D01*
+X199263Y-6500D02*Y-8750D01*
+X200013Y-9500D01*
+X197013D02*X198513D01*
+X199263Y-8750D01*
+X202564Y-7250D02*Y-9500D01*
+Y-7250D02*X203314Y-6500D01*
+X204064D01*
+X204814Y-7250D01*
+Y-9500D01*
+X201814Y-6500D02*X202564Y-7250D01*
+X208866Y-6500D02*X209616Y-7250D01*
+X207366Y-6500D02*X208866D01*
+X206616Y-7250D02*X207366Y-6500D01*
+X206616Y-7250D02*Y-8750D01*
+X207366Y-9500D01*
+X208866D01*
+X209616Y-8750D01*
+X206616Y-11000D02*X207366Y-11750D01*
+X208866D01*
+X209616Y-11000D01*
+Y-6500D02*Y-11000D01*
+X211417Y-3500D02*Y-8750D01*
+X212167Y-9500D01*
+X214419D02*X216669D01*
+X213669Y-8750D02*X214419Y-9500D01*
+X213669Y-7250D02*Y-8750D01*
+Y-7250D02*X214419Y-6500D01*
+X215919D01*
+X216669Y-7250D01*
+X213669Y-8000D02*X216669D01*
+Y-7250D02*Y-8000D01*
+X221170Y-6500D02*X224170D01*
+X228672Y-8750D02*X229422Y-9500D01*
+X228672Y-4250D02*Y-8750D01*
+Y-4250D02*X229422Y-3500D01*
+X230922D01*
+X231672Y-4250D01*
+Y-8750D01*
+X230922Y-9500D02*X231672Y-8750D01*
+X229422Y-9500D02*X230922D01*
+X228672Y-8000D02*X231672Y-5000D01*
+X233473Y-11000D02*X234973Y-9500D01*
+X236775Y-8750D02*X237525Y-9500D01*
+X236775Y-4250D02*Y-8750D01*
+Y-4250D02*X237525Y-3500D01*
+X239025D01*
+X239775Y-4250D01*
+Y-8750D01*
+X239025Y-9500D02*X239775Y-8750D01*
+X237525Y-9500D02*X239025D01*
+X236775Y-8000D02*X239775Y-5000D01*
+X245026Y-3500D02*Y-8750D01*
+X245776Y-9500D01*
+X244276Y-5750D02*X245776D01*
+X247278Y-7250D02*Y-8750D01*
+Y-7250D02*X248028Y-6500D01*
+X249528D01*
+X250278Y-7250D01*
+Y-8750D01*
+X249528Y-9500D02*X250278Y-8750D01*
+X248028Y-9500D02*X249528D01*
+X247278Y-8750D02*X248028Y-9500D01*
+X254779Y-4250D02*X255529Y-3500D01*
+X257779D01*
+X258529Y-4250D01*
+Y-5750D01*
+X254779Y-9500D02*X258529Y-5750D01*
+X254779Y-9500D02*X258529D01*
+X260331Y-8750D02*X261081Y-9500D01*
+X260331Y-4250D02*Y-8750D01*
+Y-4250D02*X261081Y-3500D01*
+X262581D01*
+X263331Y-4250D01*
+Y-8750D01*
+X262581Y-9500D02*X263331Y-8750D01*
+X261081Y-9500D02*X262581D01*
+X260331Y-8000D02*X263331Y-5000D01*
+X265132Y-8750D02*X265882Y-9500D01*
+X265132Y-4250D02*Y-8750D01*
+Y-4250D02*X265882Y-3500D01*
+X267382D01*
+X268132Y-4250D01*
+Y-8750D01*
+X267382Y-9500D02*X268132Y-8750D01*
+X265882Y-9500D02*X267382D01*
+X265132Y-8000D02*X268132Y-5000D01*
+X269934Y-8750D02*X270684Y-9500D01*
+X269934Y-4250D02*Y-8750D01*
+Y-4250D02*X270684Y-3500D01*
+X272184D01*
+X272934Y-4250D01*
+Y-8750D01*
+X272184Y-9500D02*X272934Y-8750D01*
+X270684Y-9500D02*X272184D01*
+X269934Y-8000D02*X272934Y-5000D01*
+X274735Y-11000D02*X276235Y-9500D01*
+X278787D02*X280287D01*
+X279537Y-3500D02*Y-9500D01*
+X278037Y-5000D02*X279537Y-3500D01*
+X282088Y-8750D02*X282838Y-9500D01*
+X282088Y-4250D02*Y-8750D01*
+Y-4250D02*X282838Y-3500D01*
+X284338D01*
+X285088Y-4250D01*
+Y-8750D01*
+X284338Y-9500D02*X285088Y-8750D01*
+X282838Y-9500D02*X284338D01*
+X282088Y-8000D02*X285088Y-5000D01*
+X286890Y-8750D02*X287640Y-9500D01*
+X286890Y-4250D02*Y-8750D01*
+Y-4250D02*X287640Y-3500D01*
+X289140D01*
+X289890Y-4250D01*
+Y-8750D01*
+X289140Y-9500D02*X289890Y-8750D01*
+X287640Y-9500D02*X289140D01*
+X286890Y-8000D02*X289890Y-5000D01*
+X291691Y-8750D02*X292441Y-9500D01*
+X291691Y-4250D02*Y-8750D01*
+Y-4250D02*X292441Y-3500D01*
+X293941D01*
+X294691Y-4250D01*
+Y-8750D01*
+X293941Y-9500D02*X294691Y-8750D01*
+X292441Y-9500D02*X293941D01*
+X291691Y-8000D02*X294691Y-5000D01*
+X299943Y-7250D02*Y-9500D01*
+Y-7250D02*X300693Y-6500D01*
+X301443D01*
+X302193Y-7250D01*
+Y-9500D01*
+Y-7250D02*X302943Y-6500D01*
+X303693D01*
+X304443Y-7250D01*
+Y-9500D01*
+X299193Y-6500D02*X299943Y-7250D01*
+X306244Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X307746Y-3500D02*Y-8750D01*
+X308496Y-9500D01*
+X310747D02*X312997D01*
+X313747Y-8750D01*
+X312997Y-8000D02*X313747Y-8750D01*
+X310747Y-8000D02*X312997D01*
+X309997Y-7250D02*X310747Y-8000D01*
+X309997Y-7250D02*X310747Y-6500D01*
+X312997D01*
+X313747Y-7250D01*
+X309997Y-8750D02*X310747Y-9500D01*
+X200750Y128500D02*Y122500D01*
+X203000Y128500D02*X203750Y127750D01*
+Y123250D01*
+X203000Y122500D02*X203750Y123250D01*
+X200000Y122500D02*X203000D01*
+X200000Y128500D02*X203000D01*
+X207801Y125500D02*X208551Y124750D01*
+X206301Y125500D02*X207801D01*
+X205551Y124750D02*X206301Y125500D01*
+X205551Y124750D02*Y123250D01*
+X206301Y122500D01*
+X208551Y125500D02*Y123250D01*
+X209301Y122500D01*
+X206301D02*X207801D01*
+X208551Y123250D01*
+X211853Y128500D02*Y123250D01*
+X212603Y122500D01*
+X211103Y126250D02*X212603D01*
+X214854Y122500D02*X217104D01*
+X214104Y123250D02*X214854Y122500D01*
+X214104Y124750D02*Y123250D01*
+Y124750D02*X214854Y125500D01*
+X216354D01*
+X217104Y124750D01*
+X214104Y124000D02*X217104D01*
+Y124750D02*Y124000D01*
+X218906Y126250D02*X219656D01*
+X218906Y124750D02*X219656D01*
+X224157Y128500D02*Y122500D01*
+X226407Y124750D01*
+X228657Y122500D01*
+Y128500D02*Y122500D01*
+X231209D02*X233459D01*
+X230459Y123250D02*X231209Y122500D01*
+X230459Y124750D02*Y123250D01*
+Y124750D02*X231209Y125500D01*
+X232709D01*
+X233459Y124750D01*
+X230459Y124000D02*X233459D01*
+Y124750D02*Y124000D01*
+X238260Y128500D02*Y122500D01*
+X237510D02*X238260Y123250D01*
+X236010Y122500D02*X237510D01*
+X235260Y123250D02*X236010Y122500D01*
+X235260Y124750D02*Y123250D01*
+Y124750D02*X236010Y125500D01*
+X237510D01*
+X238260Y124750D01*
+X242762Y128500D02*X245012D01*
+Y123250D01*
+X244262Y122500D02*X245012Y123250D01*
+X243512Y122500D02*X244262D01*
+X242762Y123250D02*X243512Y122500D01*
+X246813Y125500D02*Y123250D01*
+X247563Y122500D01*
+X249063D01*
+X249813Y123250D01*
+Y125500D02*Y123250D01*
+X252365Y124750D02*Y122500D01*
+Y124750D02*X253115Y125500D01*
+X253865D01*
+X254615Y124750D01*
+Y122500D01*
+X251615Y125500D02*X252365Y124750D01*
+X259116Y127750D02*X259866Y128500D01*
+X262116D01*
+X262866Y127750D01*
+Y126250D01*
+X259116Y122500D02*X262866Y126250D01*
+X259116Y122500D02*X262866D01*
+X264668Y125500D02*X267668Y128500D01*
+X264668Y125500D02*X268418D01*
+X267668Y128500D02*Y122500D01*
+X272919Y127750D02*X273669Y128500D01*
+X275919D01*
+X276669Y127750D01*
+Y126250D01*
+X272919Y122500D02*X276669Y126250D01*
+X272919Y122500D02*X276669D01*
+X279221D02*X280721D01*
+X279971Y128500D02*Y122500D01*
+X278471Y127000D02*X279971Y128500D01*
+X282522Y126250D02*X283272D01*
+X282522Y124750D02*X283272D01*
+X285074Y125500D02*X288074Y128500D01*
+X285074Y125500D02*X288824D01*
+X288074Y128500D02*Y122500D01*
+X290625Y127750D02*X291375Y128500D01*
+X293625D01*
+X294375Y127750D01*
+Y126250D01*
+X290625Y122500D02*X294375Y126250D01*
+X290625Y122500D02*X294375D01*
+X296177Y126250D02*X296927D01*
+X296177Y124750D02*X296927D01*
+X298728Y127750D02*X299478Y128500D01*
+X301728D01*
+X302478Y127750D01*
+Y126250D01*
+X298728Y122500D02*X302478Y126250D01*
+X298728Y122500D02*X302478D01*
+X304280Y125500D02*X307280Y128500D01*
+X304280Y125500D02*X308030D01*
+X307280Y128500D02*Y122500D01*
+X312531Y127750D02*X313281Y128500D01*
+X315531D01*
+X316281Y127750D01*
+Y126250D01*
+X312531Y122500D02*X316281Y126250D01*
+X312531Y122500D02*X316281D01*
+X318083Y123250D02*X318833Y122500D01*
+X318083Y127750D02*Y123250D01*
+Y127750D02*X318833Y128500D01*
+X320333D01*
+X321083Y127750D01*
+Y123250D01*
+X320333Y122500D02*X321083Y123250D01*
+X318833Y122500D02*X320333D01*
+X318083Y124000D02*X321083Y127000D01*
+X322884Y123250D02*X323634Y122500D01*
+X322884Y127750D02*Y123250D01*
+Y127750D02*X323634Y128500D01*
+X325134D01*
+X325884Y127750D01*
+Y123250D01*
+X325134Y122500D02*X325884Y123250D01*
+X323634Y122500D02*X325134D01*
+X322884Y124000D02*X325884Y127000D01*
+X327686Y122500D02*X330686Y125500D01*
+Y127750D02*Y125500D01*
+X329936Y128500D02*X330686Y127750D01*
+X328436Y128500D02*X329936D01*
+X327686Y127750D02*X328436Y128500D01*
+X327686Y127750D02*Y126250D01*
+X328436Y125500D01*
+X330686D01*
+X335187Y128500D02*Y123250D01*
+X335937Y122500D01*
+X337437D01*
+X338187Y123250D01*
+Y128500D02*Y123250D01*
+X339989Y128500D02*X342989D01*
+X341489D02*Y122500D01*
+X345540D02*X347790D01*
+X344790Y123250D02*X345540Y122500D01*
+X344790Y127750D02*Y123250D01*
+Y127750D02*X345540Y128500D01*
+X347790D01*
+X200000Y142750D02*Y137500D01*
+Y142750D02*X200750Y143500D01*
+X203000D01*
+X203750Y142750D01*
+Y137500D01*
+X200000Y140500D02*X203750D01*
+X205551D02*Y138250D01*
+X206301Y137500D01*
+X207801D01*
+X208551Y138250D01*
+Y140500D02*Y138250D01*
+X211103Y143500D02*Y138250D01*
+X211853Y137500D01*
+X210353Y141250D02*X211853D01*
+X213354Y143500D02*Y137500D01*
+Y139750D02*X214104Y140500D01*
+X215604D01*
+X216354Y139750D01*
+Y137500D01*
+X218156Y139750D02*Y138250D01*
+Y139750D02*X218906Y140500D01*
+X220406D01*
+X221156Y139750D01*
+Y138250D01*
+X220406Y137500D02*X221156Y138250D01*
+X218906Y137500D02*X220406D01*
+X218156Y138250D02*X218906Y137500D01*
+X223707Y139750D02*Y137500D01*
+Y139750D02*X224457Y140500D01*
+X225957D01*
+X222957D02*X223707Y139750D01*
+X227759Y141250D02*X228509D01*
+X227759Y139750D02*X228509D01*
+X233760Y143500D02*Y137500D01*
+X236010Y143500D02*X236760Y142750D01*
+Y138250D01*
+X236010Y137500D02*X236760Y138250D01*
+X233010Y137500D02*X236010D01*
+X233010Y143500D02*X236010D01*
+X240812Y140500D02*X241562Y139750D01*
+X239312Y140500D02*X240812D01*
+X238562Y139750D02*X239312Y140500D01*
+X238562Y139750D02*Y138250D01*
+X239312Y137500D01*
+X241562Y140500D02*Y138250D01*
+X242312Y137500D01*
+X239312D02*X240812D01*
+X241562Y138250D01*
+X244863Y139750D02*Y137500D01*
+Y139750D02*X245613Y140500D01*
+X246363D01*
+X247113Y139750D01*
+Y137500D01*
+X244113Y140500D02*X244863Y139750D01*
+X251615Y143500D02*Y137500D01*
+Y143500D02*X253865Y141250D01*
+X256115Y143500D01*
+Y137500D01*
+X258666Y140500D02*X260916D01*
+X257916Y139750D02*X258666Y140500D01*
+X257916Y139750D02*Y138250D01*
+X258666Y137500D01*
+X260916D01*
+X262718Y143500D02*Y137500D01*
+Y143500D02*X264968Y141250D01*
+X267218Y143500D01*
+Y137500D01*
+X271269Y140500D02*X272019Y139750D01*
+X269769Y140500D02*X271269D01*
+X269019Y139750D02*X269769Y140500D01*
+X269019Y139750D02*Y138250D01*
+X269769Y137500D01*
+X272019Y140500D02*Y138250D01*
+X272769Y137500D01*
+X269769D02*X271269D01*
+X272019Y138250D01*
+X274571Y143500D02*Y137500D01*
+Y139750D02*X275321Y140500D01*
+X276821D01*
+X277571Y139750D01*
+Y137500D01*
+X279372Y142000D02*Y141250D01*
+Y139750D02*Y137500D01*
+X280874Y143500D02*Y138250D01*
+X281624Y137500D01*
+X283125Y143500D02*Y138250D01*
+X283875Y137500D01*
+X200000Y158500D02*X203000D01*
+X201500D02*Y152500D01*
+X204801Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X207053Y158500D02*Y153250D01*
+X207803Y152500D01*
+X206303Y156250D02*X207803D01*
+X209304Y158500D02*Y153250D01*
+X210054Y152500D01*
+X212306D02*X214556D01*
+X211556Y153250D02*X212306Y152500D01*
+X211556Y154750D02*Y153250D01*
+Y154750D02*X212306Y155500D01*
+X213806D01*
+X214556Y154750D01*
+X211556Y154000D02*X214556D01*
+Y154750D02*Y154000D01*
+X216357Y156250D02*X217107D01*
+X216357Y154750D02*X217107D01*
+X221609Y152500D02*X224609D01*
+X225359Y153250D01*
+Y154750D02*Y153250D01*
+X224609Y155500D02*X225359Y154750D01*
+X222359Y155500D02*X224609D01*
+X222359Y158500D02*Y152500D01*
+X221609Y158500D02*X224609D01*
+X225359Y157750D01*
+Y156250D01*
+X224609Y155500D02*X225359Y156250D01*
+X229410Y155500D02*X230160Y154750D01*
+X227910Y155500D02*X229410D01*
+X227160Y154750D02*X227910Y155500D01*
+X227160Y154750D02*Y153250D01*
+X227910Y152500D01*
+X230160Y155500D02*Y153250D01*
+X230910Y152500D01*
+X227910D02*X229410D01*
+X230160Y153250D01*
+X233462Y152500D02*X235712D01*
+X236462Y153250D01*
+X235712Y154000D02*X236462Y153250D01*
+X233462Y154000D02*X235712D01*
+X232712Y154750D02*X233462Y154000D01*
+X232712Y154750D02*X233462Y155500D01*
+X235712D01*
+X236462Y154750D01*
+X232712Y153250D02*X233462Y152500D01*
+X238263Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X240515Y155500D02*X242765D01*
+X239765Y154750D02*X240515Y155500D01*
+X239765Y154750D02*Y153250D01*
+X240515Y152500D01*
+X242765D01*
+X250266Y158500D02*X251016Y157750D01*
+X248016Y158500D02*X250266D01*
+X247266Y157750D02*X248016Y158500D01*
+X247266Y157750D02*Y156250D01*
+X248016Y155500D01*
+X250266D01*
+X251016Y154750D01*
+Y153250D01*
+X250266Y152500D02*X251016Y153250D01*
+X248016Y152500D02*X250266D01*
+X247266Y153250D02*X248016Y152500D01*
+X252818Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X255069Y154750D02*Y152500D01*
+Y154750D02*X255819Y155500D01*
+X256569D01*
+X257319Y154750D01*
+Y152500D01*
+X254319Y155500D02*X255069Y154750D01*
+X261371Y155500D02*X262121Y154750D01*
+X259871Y155500D02*X261371D01*
+X259121Y154750D02*X259871Y155500D01*
+X259121Y154750D02*Y153250D01*
+X259871Y152500D01*
+X261371D01*
+X262121Y153250D01*
+X259121Y151000D02*X259871Y150250D01*
+X261371D01*
+X262121Y151000D01*
+Y155500D02*Y151000D01*
+X263922Y158500D02*Y153250D01*
+X264672Y152500D01*
+X266924D02*X269174D01*
+X266174Y153250D02*X266924Y152500D01*
+X266174Y154750D02*Y153250D01*
+Y154750D02*X266924Y155500D01*
+X268424D01*
+X269174Y154750D01*
+X266174Y154000D02*X269174D01*
+Y154750D02*Y154000D01*
+X273675Y158500D02*X276675D01*
+X275175D02*Y152500D01*
+X279227Y154750D02*Y152500D01*
+Y154750D02*X279977Y155500D01*
+X281477D01*
+X278477D02*X279227Y154750D01*
+X285528Y155500D02*X286278Y154750D01*
+X284028Y155500D02*X285528D01*
+X283278Y154750D02*X284028Y155500D01*
+X283278Y154750D02*Y153250D01*
+X284028Y152500D01*
+X286278Y155500D02*Y153250D01*
+X287028Y152500D01*
+X284028D02*X285528D01*
+X286278Y153250D01*
+X289580Y155500D02*X291830D01*
+X288830Y154750D02*X289580Y155500D01*
+X288830Y154750D02*Y153250D01*
+X289580Y152500D01*
+X291830D01*
+X294381D02*X296631D01*
+X293631Y153250D02*X294381Y152500D01*
+X293631Y154750D02*Y153250D01*
+Y154750D02*X294381Y155500D01*
+X295881D01*
+X296631Y154750D01*
+X293631Y154000D02*X296631D01*
+Y154750D02*Y154000D01*
+X301133Y158500D02*X304133D01*
+X304883Y157750D01*
+Y156250D01*
+X304133Y155500D02*X304883Y156250D01*
+X301883Y155500D02*X304133D01*
+X301883Y158500D02*Y152500D01*
+Y155500D02*X304883Y152500D01*
+X309684Y158500D02*X310434Y157750D01*
+X307434Y158500D02*X309684D01*
+X306684Y157750D02*X307434Y158500D01*
+X306684Y157750D02*Y156250D01*
+X307434Y155500D01*
+X309684D01*
+X310434Y154750D01*
+Y153250D01*
+X309684Y152500D02*X310434Y153250D01*
+X307434Y152500D02*X309684D01*
+X306684Y153250D02*X307434Y152500D01*
+X312236Y157750D02*X312986Y158500D01*
+X315236D01*
+X315986Y157750D01*
+Y156250D01*
+X312236Y152500D02*X315986Y156250D01*
+X312236Y152500D02*X315986D01*
+X317787D02*X321537Y156250D01*
+Y158500D02*Y156250D01*
+X317787Y158500D02*X321537D01*
+X323339Y155500D02*X326339Y158500D01*
+X323339Y155500D02*X327089D01*
+X326339Y158500D02*Y152500D01*
+X328890Y155500D02*X331890D01*
+X333692Y158500D02*Y157750D01*
+X337442Y154000D01*
+Y152500D01*
+X333692Y154000D02*Y152500D01*
+Y154000D02*X337442Y157750D01*
+Y158500D02*Y157750D01*
+X341943Y158500D02*X344943D01*
+X343443D02*Y152500D01*
+X347495D02*X349745D01*
+X346745Y153250D02*X347495Y152500D01*
+X346745Y154750D02*Y153250D01*
+Y154750D02*X347495Y155500D01*
+X348995D01*
+X349745Y154750D01*
+X346745Y154000D02*X349745D01*
+Y154750D02*Y154000D01*
+X352296Y152500D02*X354546D01*
+X355296Y153250D01*
+X354546Y154000D02*X355296Y153250D01*
+X352296Y154000D02*X354546D01*
+X351546Y154750D02*X352296Y154000D01*
+X351546Y154750D02*X352296Y155500D01*
+X354546D01*
+X355296Y154750D01*
+X351546Y153250D02*X352296Y152500D01*
+X357848Y158500D02*Y153250D01*
+X358598Y152500D01*
+X357098Y156250D02*X358598D01*
+X362799Y155500D02*X365799D01*
+X370301Y158500D02*Y152500D01*
+Y158500D02*X373301D01*
+X370301Y155500D02*X372551D01*
+X377352D02*X378102Y154750D01*
+X375852Y155500D02*X377352D01*
+X375102Y154750D02*X375852Y155500D01*
+X375102Y154750D02*Y153250D01*
+X375852Y152500D01*
+X378102Y155500D02*Y153250D01*
+X378852Y152500D01*
+X375852D02*X377352D01*
+X378102Y153250D01*
+X380654Y158500D02*Y152500D01*
+Y153250D02*X381404Y152500D01*
+X382904D01*
+X383654Y153250D01*
+Y154750D02*Y153250D01*
+X382904Y155500D02*X383654Y154750D01*
+X381404Y155500D02*X382904D01*
+X380654Y154750D02*X381404Y155500D01*
+X386205Y154750D02*Y152500D01*
+Y154750D02*X386955Y155500D01*
+X388455D01*
+X385455D02*X386205Y154750D01*
+X390257Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X392508Y155500D02*X394758D01*
+X391758Y154750D02*X392508Y155500D01*
+X391758Y154750D02*Y153250D01*
+X392508Y152500D01*
+X394758D01*
+X398810Y155500D02*X399560Y154750D01*
+X397310Y155500D02*X398810D01*
+X396560Y154750D02*X397310Y155500D01*
+X396560Y154750D02*Y153250D01*
+X397310Y152500D01*
+X399560Y155500D02*Y153250D01*
+X400310Y152500D01*
+X397310D02*X398810D01*
+X399560Y153250D01*
+X402861Y158500D02*Y153250D01*
+X403611Y152500D01*
+X402111Y156250D02*X403611D01*
+X405113Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X406614Y154750D02*Y153250D01*
+Y154750D02*X407364Y155500D01*
+X408864D01*
+X409614Y154750D01*
+Y153250D01*
+X408864Y152500D02*X409614Y153250D01*
+X407364Y152500D02*X408864D01*
+X406614Y153250D02*X407364Y152500D01*
+X412166Y154750D02*Y152500D01*
+Y154750D02*X412916Y155500D01*
+X413666D01*
+X414416Y154750D01*
+Y152500D01*
+X411416Y155500D02*X412166Y154750D01*
+X419667Y158500D02*Y152500D01*
+X421917Y158500D02*X422667Y157750D01*
+Y153250D01*
+X421917Y152500D02*X422667Y153250D01*
+X418917Y152500D02*X421917D01*
+X418917Y158500D02*X421917D01*
+X425219Y154750D02*Y152500D01*
+Y154750D02*X425969Y155500D01*
+X427469D01*
+X424469D02*X425219Y154750D01*
+X431520Y155500D02*X432270Y154750D01*
+X430020Y155500D02*X431520D01*
+X429270Y154750D02*X430020Y155500D01*
+X429270Y154750D02*Y153250D01*
+X430020Y152500D01*
+X432270Y155500D02*Y153250D01*
+X433020Y152500D01*
+X430020D02*X431520D01*
+X432270Y153250D01*
+X434822Y155500D02*Y153250D01*
+X435572Y152500D01*
+X436322D01*
+X437072Y153250D01*
+Y155500D02*Y153250D01*
+X437822Y152500D01*
+X438572D01*
+X439322Y153250D01*
+Y155500D02*Y153250D01*
+X441123Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X443375Y154750D02*Y152500D01*
+Y154750D02*X444125Y155500D01*
+X444875D01*
+X445625Y154750D01*
+Y152500D01*
+X442625Y155500D02*X443375Y154750D01*
+X449676Y155500D02*X450426Y154750D01*
+X448176Y155500D02*X449676D01*
+X447426Y154750D02*X448176Y155500D01*
+X447426Y154750D02*Y153250D01*
+X448176Y152500D01*
+X449676D01*
+X450426Y153250D01*
+X447426Y151000D02*X448176Y150250D01*
+X449676D01*
+X450426Y151000D01*
+Y155500D02*Y151000D01*
+M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,7 @@
+M48
+INCH
+T13C0.035
+%
+T13
+X009000Y005000
+M30
Index: tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.top.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber1/gerber_oneline.top.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 2 for group 0 idx 0 *
+G04 Title: Basic Single Trace RS274-X Test, component *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 21:42:24 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFRONT*%
+%ADD11C,0.0400*%
+%ADD12C,0.0600*%
+%ADD13C,0.0350*%
+G54D11*X10000Y50000D02*X90000D01*
+G54D12*D03*
+G54D13*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber2/out.bottom.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber2/out.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber2/out.bottom.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 3 for group 1 idx 1 *
+G04 Title: Basic Single Trace RS274-X Test, solder *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 22:05:35 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBACK*%
+%ADD11C,0.0400*%
+%ADD12C,0.0600*%
+%ADD13C,0.0350*%
+G54D11*X170000Y50000D02*X90000D01*
+G54D12*D03*
+G54D13*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber2/out.fab.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber2/out.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber2/out.fab.gbr	(revision 18980)
@@ -0,0 +1,1754 @@
+G04 start of page 5 for group -3984 idx -3984 *
+G04 Title: Basic Single Trace RS274-X Test, fab *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 22:05:35 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD14C,0.0080*%
+%ADD15C,0.0060*%
+%ADD16C,0.0100*%
+G54D14*X90000Y50000D02*Y48400D01*
+Y50000D02*X91386Y50800D01*
+X90000Y50000D02*X88614Y50800D01*
+X15000Y156250D02*Y154650D01*
+Y156250D02*X16386Y157050D01*
+X15000Y156250D02*X13614Y157050D01*
+G54D15*X135000Y158500D02*Y157750D01*
+X136500Y156250D01*
+X138000Y157750D01*
+Y158500D02*Y157750D01*
+X136500Y156250D02*Y152500D01*
+X139801Y155500D02*X142051D01*
+X139801Y152500D02*X142801D01*
+X139801Y158500D02*Y152500D01*
+Y158500D02*X142801D01*
+X147603D02*X148353Y157750D01*
+X145353Y158500D02*X147603D01*
+X144603Y157750D02*X145353Y158500D01*
+X144603Y157750D02*Y156250D01*
+X145353Y155500D01*
+X147603D01*
+X148353Y154750D01*
+Y153250D01*
+X147603Y152500D02*X148353Y153250D01*
+X145353Y152500D02*X147603D01*
+X144603Y153250D02*X145353Y152500D01*
+X135000Y149249D02*X150154D01*
+X98750Y152500D02*X100250D01*
+X99500Y158500D02*Y152500D01*
+X98000Y157000D02*X99500Y158500D01*
+X98000Y149249D02*X102051D01*
+X45000Y153250D02*X45750Y152500D01*
+X45000Y157750D02*Y153250D01*
+Y157750D02*X45750Y158500D01*
+X47250D01*
+X48000Y157750D01*
+Y153250D01*
+X47250Y152500D02*X48000Y153250D01*
+X45750Y152500D02*X47250D01*
+X45000Y154000D02*X48000Y157000D01*
+X49801Y152500D02*X50551D01*
+X52353Y153250D02*X53103Y152500D01*
+X52353Y157750D02*Y153250D01*
+Y157750D02*X53103Y158500D01*
+X54603D01*
+X55353Y157750D01*
+Y153250D01*
+X54603Y152500D02*X55353Y153250D01*
+X53103Y152500D02*X54603D01*
+X52353Y154000D02*X55353Y157000D01*
+X57154Y157750D02*X57904Y158500D01*
+X59404D01*
+X60154Y157750D01*
+Y153250D01*
+X59404Y152500D02*X60154Y153250D01*
+X57904Y152500D02*X59404D01*
+X57154Y153250D02*X57904Y152500D01*
+Y155500D02*X60154D01*
+X61956Y158500D02*X64956D01*
+X61956D02*Y155500D01*
+X62706Y156250D01*
+X64206D01*
+X64956Y155500D01*
+Y153250D01*
+X64206Y152500D02*X64956Y153250D01*
+X62706Y152500D02*X64206D01*
+X61956Y153250D02*X62706Y152500D01*
+X45000Y149249D02*X66757D01*
+X3000Y173500D02*X3750Y172750D01*
+X750Y173500D02*X3000D01*
+X0Y172750D02*X750Y173500D01*
+X0Y172750D02*Y171250D01*
+X750Y170500D01*
+X3000D01*
+X3750Y169750D01*
+Y168250D01*
+X3000Y167500D02*X3750Y168250D01*
+X750Y167500D02*X3000D01*
+X0Y168250D02*X750Y167500D01*
+X5551Y170500D02*Y168250D01*
+X6301Y167500D01*
+X8551Y170500D02*Y166000D01*
+X7801Y165250D02*X8551Y166000D01*
+X6301Y165250D02*X7801D01*
+X5551Y166000D02*X6301Y165250D01*
+Y167500D02*X7801D01*
+X8551Y168250D01*
+X11103Y169750D02*Y167500D01*
+Y169750D02*X11853Y170500D01*
+X12603D01*
+X13353Y169750D01*
+Y167500D01*
+Y169750D02*X14103Y170500D01*
+X14853D01*
+X15603Y169750D01*
+Y167500D01*
+X10353Y170500D02*X11103Y169750D01*
+X17404Y173500D02*Y167500D01*
+Y168250D02*X18154Y167500D01*
+X19654D01*
+X20404Y168250D01*
+Y169750D02*Y168250D01*
+X19654Y170500D02*X20404Y169750D01*
+X18154Y170500D02*X19654D01*
+X17404Y169750D02*X18154Y170500D01*
+X22206Y169750D02*Y168250D01*
+Y169750D02*X22956Y170500D01*
+X24456D01*
+X25206Y169750D01*
+Y168250D01*
+X24456Y167500D02*X25206Y168250D01*
+X22956Y167500D02*X24456D01*
+X22206Y168250D02*X22956Y167500D01*
+X27007Y173500D02*Y168250D01*
+X27757Y167500D01*
+X41750Y173500D02*Y167500D01*
+X44000Y173500D02*X44750Y172750D01*
+Y168250D01*
+X44000Y167500D02*X44750Y168250D01*
+X41000Y167500D02*X44000D01*
+X41000Y173500D02*X44000D01*
+X46551Y172000D02*Y171250D01*
+Y169750D02*Y167500D01*
+X50303Y170500D02*X51053Y169750D01*
+X48803Y170500D02*X50303D01*
+X48053Y169750D02*X48803Y170500D01*
+X48053Y169750D02*Y168250D01*
+X48803Y167500D01*
+X51053Y170500D02*Y168250D01*
+X51803Y167500D01*
+X48803D02*X50303D01*
+X51053Y168250D01*
+X54354Y169750D02*Y167500D01*
+Y169750D02*X55104Y170500D01*
+X55854D01*
+X56604Y169750D01*
+Y167500D01*
+Y169750D02*X57354Y170500D01*
+X58104D01*
+X58854Y169750D01*
+Y167500D01*
+X53604Y170500D02*X54354Y169750D01*
+X60656Y167500D02*X61406D01*
+X65907Y168250D02*X66657Y167500D01*
+X65907Y172750D02*X66657Y173500D01*
+X65907Y172750D02*Y168250D01*
+X68459Y173500D02*X69959D01*
+X69209D02*Y167500D01*
+X68459D02*X69959D01*
+X72510Y169750D02*Y167500D01*
+Y169750D02*X73260Y170500D01*
+X74010D01*
+X74760Y169750D01*
+Y167500D01*
+X71760Y170500D02*X72510Y169750D01*
+X77312Y170500D02*X79562D01*
+X76562Y169750D02*X77312Y170500D01*
+X76562Y169750D02*Y168250D01*
+X77312Y167500D01*
+X79562D01*
+X81363Y173500D02*Y167500D01*
+Y169750D02*X82113Y170500D01*
+X83613D01*
+X84363Y169750D01*
+Y167500D01*
+X86165Y173500D02*X86915Y172750D01*
+Y168250D01*
+X86165Y167500D02*X86915Y168250D01*
+X95750Y167500D02*X98000D01*
+X95000Y168250D02*X95750Y167500D01*
+X95000Y172750D02*Y168250D01*
+Y172750D02*X95750Y173500D01*
+X98000D01*
+X99801Y169750D02*Y168250D01*
+Y169750D02*X100551Y170500D01*
+X102051D01*
+X102801Y169750D01*
+Y168250D01*
+X102051Y167500D02*X102801Y168250D01*
+X100551Y167500D02*X102051D01*
+X99801Y168250D02*X100551Y167500D01*
+X104603Y170500D02*Y168250D01*
+X105353Y167500D01*
+X106853D01*
+X107603Y168250D01*
+Y170500D02*Y168250D01*
+X110154Y169750D02*Y167500D01*
+Y169750D02*X110904Y170500D01*
+X111654D01*
+X112404Y169750D01*
+Y167500D01*
+X109404Y170500D02*X110154Y169750D01*
+X114956Y173500D02*Y168250D01*
+X115706Y167500D01*
+X114206Y171250D02*X115706D01*
+X130750Y173500D02*Y167500D01*
+X130000Y173500D02*X133000D01*
+X133750Y172750D01*
+Y171250D01*
+X133000Y170500D02*X133750Y171250D01*
+X130750Y170500D02*X133000D01*
+X135551Y173500D02*Y168250D01*
+X136301Y167500D01*
+X140053Y170500D02*X140803Y169750D01*
+X138553Y170500D02*X140053D01*
+X137803Y169750D02*X138553Y170500D01*
+X137803Y169750D02*Y168250D01*
+X138553Y167500D01*
+X140803Y170500D02*Y168250D01*
+X141553Y167500D01*
+X138553D02*X140053D01*
+X140803Y168250D01*
+X144104Y173500D02*Y168250D01*
+X144854Y167500D01*
+X143354Y171250D02*X144854D01*
+X147106Y167500D02*X149356D01*
+X146356Y168250D02*X147106Y167500D01*
+X146356Y169750D02*Y168250D01*
+Y169750D02*X147106Y170500D01*
+X148606D01*
+X149356Y169750D01*
+X146356Y169000D02*X149356D01*
+Y169750D02*Y169000D01*
+X154157Y173500D02*Y167500D01*
+X153407D02*X154157Y168250D01*
+X151907Y167500D02*X153407D01*
+X151157Y168250D02*X151907Y167500D01*
+X151157Y169750D02*Y168250D01*
+Y169750D02*X151907Y170500D01*
+X153407D01*
+X154157Y169750D01*
+X157459Y170500D02*Y169750D01*
+Y168250D02*Y167500D01*
+X155959Y172750D02*Y172000D01*
+Y172750D02*X156709Y173500D01*
+X158209D01*
+X158959Y172750D01*
+Y172000D01*
+X157459Y170500D02*X158959Y172000D01*
+X0Y188500D02*X3000D01*
+X1500D02*Y182500D01*
+X4801Y188500D02*Y182500D01*
+Y184750D02*X5551Y185500D01*
+X7051D01*
+X7801Y184750D01*
+Y182500D01*
+X10353D02*X12603D01*
+X9603Y183250D02*X10353Y182500D01*
+X9603Y184750D02*Y183250D01*
+Y184750D02*X10353Y185500D01*
+X11853D01*
+X12603Y184750D01*
+X9603Y184000D02*X12603D01*
+Y184750D02*Y184000D01*
+X15154Y184750D02*Y182500D01*
+Y184750D02*X15904Y185500D01*
+X17404D01*
+X14404D02*X15154Y184750D01*
+X19956Y182500D02*X22206D01*
+X19206Y183250D02*X19956Y182500D01*
+X19206Y184750D02*Y183250D01*
+Y184750D02*X19956Y185500D01*
+X21456D01*
+X22206Y184750D01*
+X19206Y184000D02*X22206D01*
+Y184750D02*Y184000D01*
+X28957Y185500D02*X29707Y184750D01*
+X27457Y185500D02*X28957D01*
+X26707Y184750D02*X27457Y185500D01*
+X26707Y184750D02*Y183250D01*
+X27457Y182500D01*
+X29707Y185500D02*Y183250D01*
+X30457Y182500D01*
+X27457D02*X28957D01*
+X29707Y183250D01*
+X33009Y184750D02*Y182500D01*
+Y184750D02*X33759Y185500D01*
+X35259D01*
+X32259D02*X33009Y184750D01*
+X37810Y182500D02*X40060D01*
+X37060Y183250D02*X37810Y182500D01*
+X37060Y184750D02*Y183250D01*
+Y184750D02*X37810Y185500D01*
+X39310D01*
+X40060Y184750D01*
+X37060Y184000D02*X40060D01*
+Y184750D02*Y184000D01*
+X45312Y182500D02*X46812D01*
+X46062Y188500D02*Y182500D01*
+X44562Y187000D02*X46062Y188500D01*
+X54313D02*Y182500D01*
+X53563D02*X54313Y183250D01*
+X52063Y182500D02*X53563D01*
+X51313Y183250D02*X52063Y182500D01*
+X51313Y184750D02*Y183250D01*
+Y184750D02*X52063Y185500D01*
+X53563D01*
+X54313Y184750D01*
+X56115Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X58366Y187750D02*Y182500D01*
+Y187750D02*X59116Y188500D01*
+X59866D01*
+X57616Y185500D02*X59116D01*
+X62118Y187750D02*Y182500D01*
+Y187750D02*X62868Y188500D01*
+X63618D01*
+X61368Y185500D02*X62868D01*
+X65869Y182500D02*X68119D01*
+X65119Y183250D02*X65869Y182500D01*
+X65119Y184750D02*Y183250D01*
+Y184750D02*X65869Y185500D01*
+X67369D01*
+X68119Y184750D01*
+X65119Y184000D02*X68119D01*
+Y184750D02*Y184000D01*
+X70671Y184750D02*Y182500D01*
+Y184750D02*X71421Y185500D01*
+X72921D01*
+X69921D02*X70671Y184750D01*
+X75472Y182500D02*X77722D01*
+X74722Y183250D02*X75472Y182500D01*
+X74722Y184750D02*Y183250D01*
+Y184750D02*X75472Y185500D01*
+X76972D01*
+X77722Y184750D01*
+X74722Y184000D02*X77722D01*
+Y184750D02*Y184000D01*
+X80274Y184750D02*Y182500D01*
+Y184750D02*X81024Y185500D01*
+X81774D01*
+X82524Y184750D01*
+Y182500D01*
+X79524Y185500D02*X80274Y184750D01*
+X85075Y188500D02*Y183250D01*
+X85825Y182500D01*
+X84325Y186250D02*X85825D01*
+X93027Y188500D02*Y182500D01*
+X92277D02*X93027Y183250D01*
+X90777Y182500D02*X92277D01*
+X90027Y183250D02*X90777Y182500D01*
+X90027Y184750D02*Y183250D01*
+Y184750D02*X90777Y185500D01*
+X92277D01*
+X93027Y184750D01*
+X95578D02*Y182500D01*
+Y184750D02*X96328Y185500D01*
+X97828D01*
+X94828D02*X95578Y184750D01*
+X99630Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X101131Y188500D02*Y183250D01*
+X101881Y182500D01*
+X103383Y188500D02*Y183250D01*
+X104133Y182500D01*
+X109084D02*X111334D01*
+X112084Y183250D01*
+X111334Y184000D02*X112084Y183250D01*
+X109084Y184000D02*X111334D01*
+X108334Y184750D02*X109084Y184000D01*
+X108334Y184750D02*X109084Y185500D01*
+X111334D01*
+X112084Y184750D01*
+X108334Y183250D02*X109084Y182500D01*
+X113886Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X115387Y185500D02*X118387D01*
+X115387Y182500D02*X118387Y185500D01*
+X115387Y182500D02*X118387D01*
+X120939D02*X123189D01*
+X120189Y183250D02*X120939Y182500D01*
+X120189Y184750D02*Y183250D01*
+Y184750D02*X120939Y185500D01*
+X122439D01*
+X123189Y184750D01*
+X120189Y184000D02*X123189D01*
+Y184750D02*Y184000D01*
+X125740Y182500D02*X127990D01*
+X128740Y183250D01*
+X127990Y184000D02*X128740Y183250D01*
+X125740Y184000D02*X127990D01*
+X124990Y184750D02*X125740Y184000D01*
+X124990Y184750D02*X125740Y185500D01*
+X127990D01*
+X128740Y184750D01*
+X124990Y183250D02*X125740Y182500D01*
+X133242Y185500D02*Y183250D01*
+X133992Y182500D01*
+X135492D01*
+X136242Y183250D01*
+Y185500D02*Y183250D01*
+X138793Y182500D02*X141043D01*
+X141793Y183250D01*
+X141043Y184000D02*X141793Y183250D01*
+X138793Y184000D02*X141043D01*
+X138043Y184750D02*X138793Y184000D01*
+X138043Y184750D02*X138793Y185500D01*
+X141043D01*
+X141793Y184750D01*
+X138043Y183250D02*X138793Y182500D01*
+X144345D02*X146595D01*
+X143595Y183250D02*X144345Y182500D01*
+X143595Y184750D02*Y183250D01*
+Y184750D02*X144345Y185500D01*
+X145845D01*
+X146595Y184750D01*
+X143595Y184000D02*X146595D01*
+Y184750D02*Y184000D01*
+X151396Y188500D02*Y182500D01*
+X150646D02*X151396Y183250D01*
+X149146Y182500D02*X150646D01*
+X148396Y183250D02*X149146Y182500D01*
+X148396Y184750D02*Y183250D01*
+Y184750D02*X149146Y185500D01*
+X150646D01*
+X151396Y184750D01*
+X155898Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X158149Y184750D02*Y182500D01*
+Y184750D02*X158899Y185500D01*
+X159649D01*
+X160399Y184750D01*
+Y182500D01*
+X157399Y185500D02*X158149Y184750D01*
+X165651Y188500D02*Y183250D01*
+X166401Y182500D01*
+X164901Y186250D02*X166401D01*
+X167902Y188500D02*Y182500D01*
+Y184750D02*X168652Y185500D01*
+X170152D01*
+X170902Y184750D01*
+Y182500D01*
+X172704Y187000D02*Y186250D01*
+Y184750D02*Y182500D01*
+X174955D02*X177205D01*
+X177955Y183250D01*
+X177205Y184000D02*X177955Y183250D01*
+X174955Y184000D02*X177205D01*
+X174205Y184750D02*X174955Y184000D01*
+X174205Y184750D02*X174955Y185500D01*
+X177205D01*
+X177955Y184750D01*
+X174205Y183250D02*X174955Y182500D01*
+X182457Y188500D02*Y183250D01*
+X183207Y182500D01*
+X186958Y185500D02*X187708Y184750D01*
+X185458Y185500D02*X186958D01*
+X184708Y184750D02*X185458Y185500D01*
+X184708Y184750D02*Y183250D01*
+X185458Y182500D01*
+X187708Y185500D02*Y183250D01*
+X188458Y182500D01*
+X185458D02*X186958D01*
+X187708Y183250D01*
+X190260Y185500D02*Y183250D01*
+X191010Y182500D01*
+X193260Y185500D02*Y181000D01*
+X192510Y180250D02*X193260Y181000D01*
+X191010Y180250D02*X192510D01*
+X190260Y181000D02*X191010Y180250D01*
+Y182500D02*X192510D01*
+X193260Y183250D01*
+X195061Y184750D02*Y183250D01*
+Y184750D02*X195811Y185500D01*
+X197311D01*
+X198061Y184750D01*
+Y183250D01*
+X197311Y182500D02*X198061Y183250D01*
+X195811Y182500D02*X197311D01*
+X195061Y183250D02*X195811Y182500D01*
+X199863Y185500D02*Y183250D01*
+X200613Y182500D01*
+X202113D01*
+X202863Y183250D01*
+Y185500D02*Y183250D01*
+X205414Y188500D02*Y183250D01*
+X206164Y182500D01*
+X204664Y186250D02*X206164D01*
+X207666Y181000D02*X209166Y182500D01*
+X214417D02*X215917D01*
+X215167Y188500D02*Y182500D01*
+X213667Y187000D02*X215167Y188500D01*
+X220419D02*Y182500D01*
+Y184750D02*X221169Y185500D01*
+X222669D01*
+X223419Y184750D01*
+Y182500D01*
+X225220Y184750D02*Y183250D01*
+Y184750D02*X225970Y185500D01*
+X227470D01*
+X228220Y184750D01*
+Y183250D01*
+X227470Y182500D02*X228220Y183250D01*
+X225970Y182500D02*X227470D01*
+X225220Y183250D02*X225970Y182500D01*
+X230022Y188500D02*Y183250D01*
+X230772Y182500D01*
+X233023D02*X235273D01*
+X232273Y183250D02*X233023Y182500D01*
+X232273Y184750D02*Y183250D01*
+Y184750D02*X233023Y185500D01*
+X234523D01*
+X235273Y184750D01*
+X232273Y184000D02*X235273D01*
+Y184750D02*Y184000D01*
+X237825Y182500D02*X240075D01*
+X240825Y183250D01*
+X240075Y184000D02*X240825Y183250D01*
+X237825Y184000D02*X240075D01*
+X237075Y184750D02*X237825Y184000D01*
+X237075Y184750D02*X237825Y185500D01*
+X240075D01*
+X240825Y184750D01*
+X237075Y183250D02*X237825Y182500D01*
+X246076Y188500D02*Y183250D01*
+X246826Y182500D01*
+X245326Y186250D02*X246826D01*
+X248328Y184750D02*Y183250D01*
+Y184750D02*X249078Y185500D01*
+X250578D01*
+X251328Y184750D01*
+Y183250D01*
+X250578Y182500D02*X251328Y183250D01*
+X249078Y182500D02*X250578D01*
+X248328Y183250D02*X249078Y182500D01*
+X253879Y188500D02*Y183250D01*
+X254629Y182500D01*
+X253129Y186250D02*X254629D01*
+X258381Y185500D02*X259131Y184750D01*
+X256881Y185500D02*X258381D01*
+X256131Y184750D02*X256881Y185500D01*
+X256131Y184750D02*Y183250D01*
+X256881Y182500D01*
+X259131Y185500D02*Y183250D01*
+X259881Y182500D01*
+X256881D02*X258381D01*
+X259131Y183250D01*
+X261682Y188500D02*Y183250D01*
+X262432Y182500D01*
+G54D16*X0Y100000D02*X200000D01*
+X0D02*Y0D01*
+X200000Y100000D02*Y0D01*
+X0D02*X200000D01*
+G54D15*Y113500D02*Y107500D01*
+Y113500D02*X202250Y111250D01*
+X204500Y113500D01*
+Y107500D01*
+X208551Y110500D02*X209301Y109750D01*
+X207051Y110500D02*X208551D01*
+X206301Y109750D02*X207051Y110500D01*
+X206301Y109750D02*Y108250D01*
+X207051Y107500D01*
+X209301Y110500D02*Y108250D01*
+X210051Y107500D01*
+X207051D02*X208551D01*
+X209301Y108250D01*
+X211853Y110500D02*X214853Y107500D01*
+X211853D02*X214853Y110500D01*
+X216654Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X218906Y109750D02*Y107500D01*
+Y109750D02*X219656Y110500D01*
+X220406D01*
+X221156Y109750D01*
+Y107500D01*
+Y109750D02*X221906Y110500D01*
+X222656D01*
+X223406Y109750D01*
+Y107500D01*
+X218156Y110500D02*X218906Y109750D01*
+X225207Y110500D02*Y108250D01*
+X225957Y107500D01*
+X227457D01*
+X228207Y108250D01*
+Y110500D02*Y108250D01*
+X230759Y109750D02*Y107500D01*
+Y109750D02*X231509Y110500D01*
+X232259D01*
+X233009Y109750D01*
+Y107500D01*
+Y109750D02*X233759Y110500D01*
+X234509D01*
+X235259Y109750D01*
+Y107500D01*
+X230009Y110500D02*X230759Y109750D01*
+X240510Y113500D02*Y107500D01*
+X242760Y113500D02*X243510Y112750D01*
+Y108250D01*
+X242760Y107500D02*X243510Y108250D01*
+X239760Y107500D02*X242760D01*
+X239760Y113500D02*X242760D01*
+X245312Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X247563Y109750D02*Y107500D01*
+Y109750D02*X248313Y110500D01*
+X249063D01*
+X249813Y109750D01*
+Y107500D01*
+Y109750D02*X250563Y110500D01*
+X251313D01*
+X252063Y109750D01*
+Y107500D01*
+X246813Y110500D02*X247563Y109750D01*
+X254615Y107500D02*X256865D01*
+X253865Y108250D02*X254615Y107500D01*
+X253865Y109750D02*Y108250D01*
+Y109750D02*X254615Y110500D01*
+X256115D01*
+X256865Y109750D01*
+X253865Y109000D02*X256865D01*
+Y109750D02*Y109000D01*
+X259416Y109750D02*Y107500D01*
+Y109750D02*X260166Y110500D01*
+X260916D01*
+X261666Y109750D01*
+Y107500D01*
+X258666Y110500D02*X259416Y109750D01*
+X264218Y107500D02*X266468D01*
+X267218Y108250D01*
+X266468Y109000D02*X267218Y108250D01*
+X264218Y109000D02*X266468D01*
+X263468Y109750D02*X264218Y109000D01*
+X263468Y109750D02*X264218Y110500D01*
+X266468D01*
+X267218Y109750D01*
+X263468Y108250D02*X264218Y107500D01*
+X269019Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X270521Y109750D02*Y108250D01*
+Y109750D02*X271271Y110500D01*
+X272771D01*
+X273521Y109750D01*
+Y108250D01*
+X272771Y107500D02*X273521Y108250D01*
+X271271Y107500D02*X272771D01*
+X270521Y108250D02*X271271Y107500D01*
+X276072Y109750D02*Y107500D01*
+Y109750D02*X276822Y110500D01*
+X277572D01*
+X278322Y109750D01*
+Y107500D01*
+X275322Y110500D02*X276072Y109750D01*
+X280874Y107500D02*X283124D01*
+X283874Y108250D01*
+X283124Y109000D02*X283874Y108250D01*
+X280874Y109000D02*X283124D01*
+X280124Y109750D02*X280874Y109000D01*
+X280124Y109750D02*X280874Y110500D01*
+X283124D01*
+X283874Y109750D01*
+X280124Y108250D02*X280874Y107500D01*
+X285675Y111250D02*X286425D01*
+X285675Y109750D02*X286425D01*
+X290927Y112750D02*X291677Y113500D01*
+X293927D01*
+X294677Y112750D01*
+Y111250D01*
+X290927Y107500D02*X294677Y111250D01*
+X290927Y107500D02*X294677D01*
+X296478Y108250D02*X297228Y107500D01*
+X296478Y112750D02*Y108250D01*
+Y112750D02*X297228Y113500D01*
+X298728D01*
+X299478Y112750D01*
+Y108250D01*
+X298728Y107500D02*X299478Y108250D01*
+X297228Y107500D02*X298728D01*
+X296478Y109000D02*X299478Y112000D01*
+X301280Y108250D02*X302030Y107500D01*
+X301280Y112750D02*Y108250D01*
+Y112750D02*X302030Y113500D01*
+X303530D01*
+X304280Y112750D01*
+Y108250D01*
+X303530Y107500D02*X304280Y108250D01*
+X302030Y107500D02*X303530D01*
+X301280Y109000D02*X304280Y112000D01*
+X306081Y108250D02*X306831Y107500D01*
+X306081Y112750D02*Y108250D01*
+Y112750D02*X306831Y113500D01*
+X308331D01*
+X309081Y112750D01*
+Y108250D01*
+X308331Y107500D02*X309081Y108250D01*
+X306831Y107500D02*X308331D01*
+X306081Y109000D02*X309081Y112000D01*
+X314333Y109750D02*Y107500D01*
+Y109750D02*X315083Y110500D01*
+X315833D01*
+X316583Y109750D01*
+Y107500D01*
+Y109750D02*X317333Y110500D01*
+X318083D01*
+X318833Y109750D01*
+Y107500D01*
+X313583Y110500D02*X314333Y109750D01*
+X320634Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X322136Y113500D02*Y108250D01*
+X322886Y107500D01*
+X325137D02*X327387D01*
+X328137Y108250D01*
+X327387Y109000D02*X328137Y108250D01*
+X325137Y109000D02*X327387D01*
+X324387Y109750D02*X325137Y109000D01*
+X324387Y109750D02*X325137Y110500D01*
+X327387D01*
+X328137Y109750D01*
+X324387Y108250D02*X325137Y107500D01*
+X332639Y110500D02*Y108250D01*
+X333389Y107500D01*
+X334139D01*
+X334889Y108250D01*
+Y110500D02*Y108250D01*
+X335639Y107500D01*
+X336389D01*
+X337139Y108250D01*
+Y110500D02*Y108250D01*
+X338940Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X343442Y113500D02*Y107500D01*
+X342692D02*X343442Y108250D01*
+X341192Y107500D02*X342692D01*
+X340442Y108250D02*X341192Y107500D01*
+X340442Y109750D02*Y108250D01*
+Y109750D02*X341192Y110500D01*
+X342692D01*
+X343442Y109750D01*
+X345993Y107500D02*X348243D01*
+X345243Y108250D02*X345993Y107500D01*
+X345243Y109750D02*Y108250D01*
+Y109750D02*X345993Y110500D01*
+X347493D01*
+X348243Y109750D01*
+X345243Y109000D02*X348243D01*
+Y109750D02*Y109000D01*
+X350045Y106000D02*X351545Y107500D01*
+X356796D02*X358296D01*
+X357546Y113500D02*Y107500D01*
+X356046Y112000D02*X357546Y113500D01*
+X360098Y108250D02*X360848Y107500D01*
+X360098Y112750D02*Y108250D01*
+Y112750D02*X360848Y113500D01*
+X362348D01*
+X363098Y112750D01*
+Y108250D01*
+X362348Y107500D02*X363098Y108250D01*
+X360848Y107500D02*X362348D01*
+X360098Y109000D02*X363098Y112000D01*
+X364899Y108250D02*X365649Y107500D01*
+X364899Y112750D02*Y108250D01*
+Y112750D02*X365649Y113500D01*
+X367149D01*
+X367899Y112750D01*
+Y108250D01*
+X367149Y107500D02*X367899Y108250D01*
+X365649Y107500D02*X367149D01*
+X364899Y109000D02*X367899Y112000D01*
+X369701Y108250D02*X370451Y107500D01*
+X369701Y112750D02*Y108250D01*
+Y112750D02*X370451Y113500D01*
+X371951D01*
+X372701Y112750D01*
+Y108250D01*
+X371951Y107500D02*X372701Y108250D01*
+X370451Y107500D02*X371951D01*
+X369701Y109000D02*X372701Y112000D01*
+X377952Y109750D02*Y107500D01*
+Y109750D02*X378702Y110500D01*
+X379452D01*
+X380202Y109750D01*
+Y107500D01*
+Y109750D02*X380952Y110500D01*
+X381702D01*
+X382452Y109750D01*
+Y107500D01*
+X377202Y110500D02*X377952Y109750D01*
+X384254Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X385755Y113500D02*Y108250D01*
+X386505Y107500D01*
+X388757D02*X391007D01*
+X391757Y108250D01*
+X391007Y109000D02*X391757Y108250D01*
+X388757Y109000D02*X391007D01*
+X388007Y109750D02*X388757Y109000D01*
+X388007Y109750D02*X388757Y110500D01*
+X391007D01*
+X391757Y109750D01*
+X388007Y108250D02*X388757Y107500D01*
+X396258Y113500D02*Y107500D01*
+Y109750D02*X397008Y110500D01*
+X398508D01*
+X399258Y109750D01*
+Y107500D01*
+X401060Y112000D02*Y111250D01*
+Y109750D02*Y107500D01*
+X404811Y110500D02*X405561Y109750D01*
+X403311Y110500D02*X404811D01*
+X402561Y109750D02*X403311Y110500D01*
+X402561Y109750D02*Y108250D01*
+X403311Y107500D01*
+X404811D01*
+X405561Y108250D01*
+X402561Y106000D02*X403311Y105250D01*
+X404811D01*
+X405561Y106000D01*
+Y110500D02*Y106000D01*
+X407363Y113500D02*Y107500D01*
+Y109750D02*X408113Y110500D01*
+X409613D01*
+X410363Y109750D01*
+Y107500D01*
+X0Y-9500D02*X3000D01*
+X3750Y-8750D01*
+Y-7250D02*Y-8750D01*
+X3000Y-6500D02*X3750Y-7250D01*
+X750Y-6500D02*X3000D01*
+X750Y-3500D02*Y-9500D01*
+X0Y-3500D02*X3000D01*
+X3750Y-4250D01*
+Y-5750D01*
+X3000Y-6500D02*X3750Y-5750D01*
+X5551Y-7250D02*Y-8750D01*
+Y-7250D02*X6301Y-6500D01*
+X7801D01*
+X8551Y-7250D01*
+Y-8750D01*
+X7801Y-9500D02*X8551Y-8750D01*
+X6301Y-9500D02*X7801D01*
+X5551Y-8750D02*X6301Y-9500D01*
+X12603Y-6500D02*X13353Y-7250D01*
+X11103Y-6500D02*X12603D01*
+X10353Y-7250D02*X11103Y-6500D01*
+X10353Y-7250D02*Y-8750D01*
+X11103Y-9500D01*
+X13353Y-6500D02*Y-8750D01*
+X14103Y-9500D01*
+X11103D02*X12603D01*
+X13353Y-8750D01*
+X16654Y-7250D02*Y-9500D01*
+Y-7250D02*X17404Y-6500D01*
+X18904D01*
+X15904D02*X16654Y-7250D01*
+X23706Y-3500D02*Y-9500D01*
+X22956D02*X23706Y-8750D01*
+X21456Y-9500D02*X22956D01*
+X20706Y-8750D02*X21456Y-9500D01*
+X20706Y-7250D02*Y-8750D01*
+Y-7250D02*X21456Y-6500D01*
+X22956D01*
+X23706Y-7250D01*
+X28207D02*Y-8750D01*
+Y-7250D02*X28957Y-6500D01*
+X30457D01*
+X31207Y-7250D01*
+Y-8750D01*
+X30457Y-9500D02*X31207Y-8750D01*
+X28957Y-9500D02*X30457D01*
+X28207Y-8750D02*X28957Y-9500D01*
+X33009Y-6500D02*Y-8750D01*
+X33759Y-9500D01*
+X35259D01*
+X36009Y-8750D01*
+Y-6500D02*Y-8750D01*
+X38560Y-3500D02*Y-8750D01*
+X39310Y-9500D01*
+X37810Y-5750D02*X39310D01*
+X40812Y-3500D02*Y-8750D01*
+X41562Y-9500D01*
+X43063Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X45315Y-7250D02*Y-9500D01*
+Y-7250D02*X46065Y-6500D01*
+X46815D01*
+X47565Y-7250D01*
+Y-9500D01*
+X44565Y-6500D02*X45315Y-7250D01*
+X50116Y-9500D02*X52366D01*
+X49366Y-8750D02*X50116Y-9500D01*
+X49366Y-7250D02*Y-8750D01*
+Y-7250D02*X50116Y-6500D01*
+X51616D01*
+X52366Y-7250D01*
+X49366Y-8000D02*X52366D01*
+Y-7250D02*Y-8000D01*
+X56868Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X59119D02*X61369D01*
+X62119Y-8750D01*
+X61369Y-8000D02*X62119Y-8750D01*
+X59119Y-8000D02*X61369D01*
+X58369Y-7250D02*X59119Y-8000D01*
+X58369Y-7250D02*X59119Y-6500D01*
+X61369D01*
+X62119Y-7250D01*
+X58369Y-8750D02*X59119Y-9500D01*
+X67371Y-3500D02*Y-8750D01*
+X68121Y-9500D01*
+X66621Y-5750D02*X68121D01*
+X69622Y-3500D02*Y-9500D01*
+Y-7250D02*X70372Y-6500D01*
+X71872D01*
+X72622Y-7250D01*
+Y-9500D01*
+X75174D02*X77424D01*
+X74424Y-8750D02*X75174Y-9500D01*
+X74424Y-7250D02*Y-8750D01*
+Y-7250D02*X75174Y-6500D01*
+X76674D01*
+X77424Y-7250D01*
+X74424Y-8000D02*X77424D01*
+Y-7250D02*Y-8000D01*
+X82675Y-6500D02*X84925D01*
+X81925Y-7250D02*X82675Y-6500D01*
+X81925Y-7250D02*Y-8750D01*
+X82675Y-9500D01*
+X84925D01*
+X87477D02*X89727D01*
+X86727Y-8750D02*X87477Y-9500D01*
+X86727Y-7250D02*Y-8750D01*
+Y-7250D02*X87477Y-6500D01*
+X88977D01*
+X89727Y-7250D01*
+X86727Y-8000D02*X89727D01*
+Y-7250D02*Y-8000D01*
+X92278Y-7250D02*Y-9500D01*
+Y-7250D02*X93028Y-6500D01*
+X93778D01*
+X94528Y-7250D01*
+Y-9500D01*
+X91528Y-6500D02*X92278Y-7250D01*
+X97080Y-3500D02*Y-8750D01*
+X97830Y-9500D01*
+X96330Y-5750D02*X97830D01*
+X100081Y-9500D02*X102331D01*
+X99331Y-8750D02*X100081Y-9500D01*
+X99331Y-7250D02*Y-8750D01*
+Y-7250D02*X100081Y-6500D01*
+X101581D01*
+X102331Y-7250D01*
+X99331Y-8000D02*X102331D01*
+Y-7250D02*Y-8000D01*
+X104883Y-7250D02*Y-9500D01*
+Y-7250D02*X105633Y-6500D01*
+X107133D01*
+X104133D02*X104883Y-7250D01*
+X108934Y-3500D02*Y-8750D01*
+X109684Y-9500D01*
+X111186Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X113437Y-7250D02*Y-9500D01*
+Y-7250D02*X114187Y-6500D01*
+X114937D01*
+X115687Y-7250D01*
+Y-9500D01*
+X112687Y-6500D02*X113437Y-7250D01*
+X118239Y-9500D02*X120489D01*
+X117489Y-8750D02*X118239Y-9500D01*
+X117489Y-7250D02*Y-8750D01*
+Y-7250D02*X118239Y-6500D01*
+X119739D01*
+X120489Y-7250D01*
+X117489Y-8000D02*X120489D01*
+Y-7250D02*Y-8000D01*
+X124990Y-7250D02*Y-8750D01*
+Y-7250D02*X125740Y-6500D01*
+X127240D01*
+X127990Y-7250D01*
+Y-8750D01*
+X127240Y-9500D02*X127990Y-8750D01*
+X125740Y-9500D02*X127240D01*
+X124990Y-8750D02*X125740Y-9500D01*
+X130542Y-4250D02*Y-9500D01*
+Y-4250D02*X131292Y-3500D01*
+X132042D01*
+X129792Y-6500D02*X131292D01*
+X136993Y-3500D02*Y-8750D01*
+X137743Y-9500D01*
+X136243Y-5750D02*X137743D01*
+X139245Y-3500D02*Y-9500D01*
+Y-7250D02*X139995Y-6500D01*
+X141495D01*
+X142245Y-7250D01*
+Y-9500D01*
+X144046Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X146298D02*X148548D01*
+X149298Y-8750D01*
+X148548Y-8000D02*X149298Y-8750D01*
+X146298Y-8000D02*X148548D01*
+X145548Y-7250D02*X146298Y-8000D01*
+X145548Y-7250D02*X146298Y-6500D01*
+X148548D01*
+X149298Y-7250D01*
+X145548Y-8750D02*X146298Y-9500D01*
+X154549D02*X156049D01*
+X155299Y-3500D02*Y-9500D01*
+X153799Y-5000D02*X155299Y-3500D01*
+X157851Y-8750D02*X158601Y-9500D01*
+X157851Y-4250D02*Y-8750D01*
+Y-4250D02*X158601Y-3500D01*
+X160101D01*
+X160851Y-4250D01*
+Y-8750D01*
+X160101Y-9500D02*X160851Y-8750D01*
+X158601Y-9500D02*X160101D01*
+X157851Y-8000D02*X160851Y-5000D01*
+X166102Y-7250D02*Y-9500D01*
+Y-7250D02*X166852Y-6500D01*
+X167602D01*
+X168352Y-7250D01*
+Y-9500D01*
+Y-7250D02*X169102Y-6500D01*
+X169852D01*
+X170602Y-7250D01*
+Y-9500D01*
+X165352Y-6500D02*X166102Y-7250D01*
+X172404Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X173905Y-3500D02*Y-8750D01*
+X174655Y-9500D01*
+X179607Y-7250D02*Y-9500D01*
+Y-7250D02*X180357Y-6500D01*
+X181857D01*
+X178857D02*X179607Y-7250D01*
+X184408Y-9500D02*X186658D01*
+X183658Y-8750D02*X184408Y-9500D01*
+X183658Y-7250D02*Y-8750D01*
+Y-7250D02*X184408Y-6500D01*
+X185908D01*
+X186658Y-7250D01*
+X183658Y-8000D02*X186658D01*
+Y-7250D02*Y-8000D01*
+X189210Y-6500D02*X191460D01*
+X188460Y-7250D02*X189210Y-6500D01*
+X188460Y-7250D02*Y-8750D01*
+X189210Y-9500D01*
+X191460D01*
+X194011Y-3500D02*Y-8750D01*
+X194761Y-9500D01*
+X193261Y-5750D02*X194761D01*
+X198513Y-6500D02*X199263Y-7250D01*
+X197013Y-6500D02*X198513D01*
+X196263Y-7250D02*X197013Y-6500D01*
+X196263Y-7250D02*Y-8750D01*
+X197013Y-9500D01*
+X199263Y-6500D02*Y-8750D01*
+X200013Y-9500D01*
+X197013D02*X198513D01*
+X199263Y-8750D01*
+X202564Y-7250D02*Y-9500D01*
+Y-7250D02*X203314Y-6500D01*
+X204064D01*
+X204814Y-7250D01*
+Y-9500D01*
+X201814Y-6500D02*X202564Y-7250D01*
+X208866Y-6500D02*X209616Y-7250D01*
+X207366Y-6500D02*X208866D01*
+X206616Y-7250D02*X207366Y-6500D01*
+X206616Y-7250D02*Y-8750D01*
+X207366Y-9500D01*
+X208866D01*
+X209616Y-8750D01*
+X206616Y-11000D02*X207366Y-11750D01*
+X208866D01*
+X209616Y-11000D01*
+Y-6500D02*Y-11000D01*
+X211417Y-3500D02*Y-8750D01*
+X212167Y-9500D01*
+X214419D02*X216669D01*
+X213669Y-8750D02*X214419Y-9500D01*
+X213669Y-7250D02*Y-8750D01*
+Y-7250D02*X214419Y-6500D01*
+X215919D01*
+X216669Y-7250D01*
+X213669Y-8000D02*X216669D01*
+Y-7250D02*Y-8000D01*
+X221170Y-6500D02*X224170D01*
+X228672Y-8750D02*X229422Y-9500D01*
+X228672Y-4250D02*Y-8750D01*
+Y-4250D02*X229422Y-3500D01*
+X230922D01*
+X231672Y-4250D01*
+Y-8750D01*
+X230922Y-9500D02*X231672Y-8750D01*
+X229422Y-9500D02*X230922D01*
+X228672Y-8000D02*X231672Y-5000D01*
+X233473Y-11000D02*X234973Y-9500D01*
+X236775Y-8750D02*X237525Y-9500D01*
+X236775Y-4250D02*Y-8750D01*
+Y-4250D02*X237525Y-3500D01*
+X239025D01*
+X239775Y-4250D01*
+Y-8750D01*
+X239025Y-9500D02*X239775Y-8750D01*
+X237525Y-9500D02*X239025D01*
+X236775Y-8000D02*X239775Y-5000D01*
+X245026Y-3500D02*Y-8750D01*
+X245776Y-9500D01*
+X244276Y-5750D02*X245776D01*
+X247278Y-7250D02*Y-8750D01*
+Y-7250D02*X248028Y-6500D01*
+X249528D01*
+X250278Y-7250D01*
+Y-8750D01*
+X249528Y-9500D02*X250278Y-8750D01*
+X248028Y-9500D02*X249528D01*
+X247278Y-8750D02*X248028Y-9500D01*
+X254779Y-4250D02*X255529Y-3500D01*
+X257779D01*
+X258529Y-4250D01*
+Y-5750D01*
+X254779Y-9500D02*X258529Y-5750D01*
+X254779Y-9500D02*X258529D01*
+X260331Y-8750D02*X261081Y-9500D01*
+X260331Y-4250D02*Y-8750D01*
+Y-4250D02*X261081Y-3500D01*
+X262581D01*
+X263331Y-4250D01*
+Y-8750D01*
+X262581Y-9500D02*X263331Y-8750D01*
+X261081Y-9500D02*X262581D01*
+X260331Y-8000D02*X263331Y-5000D01*
+X265132Y-8750D02*X265882Y-9500D01*
+X265132Y-4250D02*Y-8750D01*
+Y-4250D02*X265882Y-3500D01*
+X267382D01*
+X268132Y-4250D01*
+Y-8750D01*
+X267382Y-9500D02*X268132Y-8750D01*
+X265882Y-9500D02*X267382D01*
+X265132Y-8000D02*X268132Y-5000D01*
+X269934Y-8750D02*X270684Y-9500D01*
+X269934Y-4250D02*Y-8750D01*
+Y-4250D02*X270684Y-3500D01*
+X272184D01*
+X272934Y-4250D01*
+Y-8750D01*
+X272184Y-9500D02*X272934Y-8750D01*
+X270684Y-9500D02*X272184D01*
+X269934Y-8000D02*X272934Y-5000D01*
+X274735Y-11000D02*X276235Y-9500D01*
+X278787D02*X280287D01*
+X279537Y-3500D02*Y-9500D01*
+X278037Y-5000D02*X279537Y-3500D01*
+X282088Y-8750D02*X282838Y-9500D01*
+X282088Y-4250D02*Y-8750D01*
+Y-4250D02*X282838Y-3500D01*
+X284338D01*
+X285088Y-4250D01*
+Y-8750D01*
+X284338Y-9500D02*X285088Y-8750D01*
+X282838Y-9500D02*X284338D01*
+X282088Y-8000D02*X285088Y-5000D01*
+X286890Y-8750D02*X287640Y-9500D01*
+X286890Y-4250D02*Y-8750D01*
+Y-4250D02*X287640Y-3500D01*
+X289140D01*
+X289890Y-4250D01*
+Y-8750D01*
+X289140Y-9500D02*X289890Y-8750D01*
+X287640Y-9500D02*X289140D01*
+X286890Y-8000D02*X289890Y-5000D01*
+X291691Y-8750D02*X292441Y-9500D01*
+X291691Y-4250D02*Y-8750D01*
+Y-4250D02*X292441Y-3500D01*
+X293941D01*
+X294691Y-4250D01*
+Y-8750D01*
+X293941Y-9500D02*X294691Y-8750D01*
+X292441Y-9500D02*X293941D01*
+X291691Y-8000D02*X294691Y-5000D01*
+X299943Y-7250D02*Y-9500D01*
+Y-7250D02*X300693Y-6500D01*
+X301443D01*
+X302193Y-7250D01*
+Y-9500D01*
+Y-7250D02*X302943Y-6500D01*
+X303693D01*
+X304443Y-7250D01*
+Y-9500D01*
+X299193Y-6500D02*X299943Y-7250D01*
+X306244Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X307746Y-3500D02*Y-8750D01*
+X308496Y-9500D01*
+X310747D02*X312997D01*
+X313747Y-8750D01*
+X312997Y-8000D02*X313747Y-8750D01*
+X310747Y-8000D02*X312997D01*
+X309997Y-7250D02*X310747Y-8000D01*
+X309997Y-7250D02*X310747Y-6500D01*
+X312997D01*
+X313747Y-7250D01*
+X309997Y-8750D02*X310747Y-9500D01*
+X200750Y128500D02*Y122500D01*
+X203000Y128500D02*X203750Y127750D01*
+Y123250D01*
+X203000Y122500D02*X203750Y123250D01*
+X200000Y122500D02*X203000D01*
+X200000Y128500D02*X203000D01*
+X207801Y125500D02*X208551Y124750D01*
+X206301Y125500D02*X207801D01*
+X205551Y124750D02*X206301Y125500D01*
+X205551Y124750D02*Y123250D01*
+X206301Y122500D01*
+X208551Y125500D02*Y123250D01*
+X209301Y122500D01*
+X206301D02*X207801D01*
+X208551Y123250D01*
+X211853Y128500D02*Y123250D01*
+X212603Y122500D01*
+X211103Y126250D02*X212603D01*
+X214854Y122500D02*X217104D01*
+X214104Y123250D02*X214854Y122500D01*
+X214104Y124750D02*Y123250D01*
+Y124750D02*X214854Y125500D01*
+X216354D01*
+X217104Y124750D01*
+X214104Y124000D02*X217104D01*
+Y124750D02*Y124000D01*
+X218906Y126250D02*X219656D01*
+X218906Y124750D02*X219656D01*
+X224157Y128500D02*Y122500D01*
+X226407Y124750D01*
+X228657Y122500D01*
+Y128500D02*Y122500D01*
+X231209D02*X233459D01*
+X230459Y123250D02*X231209Y122500D01*
+X230459Y124750D02*Y123250D01*
+Y124750D02*X231209Y125500D01*
+X232709D01*
+X233459Y124750D01*
+X230459Y124000D02*X233459D01*
+Y124750D02*Y124000D01*
+X238260Y128500D02*Y122500D01*
+X237510D02*X238260Y123250D01*
+X236010Y122500D02*X237510D01*
+X235260Y123250D02*X236010Y122500D01*
+X235260Y124750D02*Y123250D01*
+Y124750D02*X236010Y125500D01*
+X237510D01*
+X238260Y124750D01*
+X242762Y128500D02*X245012D01*
+Y123250D01*
+X244262Y122500D02*X245012Y123250D01*
+X243512Y122500D02*X244262D01*
+X242762Y123250D02*X243512Y122500D01*
+X246813Y125500D02*Y123250D01*
+X247563Y122500D01*
+X249063D01*
+X249813Y123250D01*
+Y125500D02*Y123250D01*
+X252365Y124750D02*Y122500D01*
+Y124750D02*X253115Y125500D01*
+X253865D01*
+X254615Y124750D01*
+Y122500D01*
+X251615Y125500D02*X252365Y124750D01*
+X259116Y127750D02*X259866Y128500D01*
+X262116D01*
+X262866Y127750D01*
+Y126250D01*
+X259116Y122500D02*X262866Y126250D01*
+X259116Y122500D02*X262866D01*
+X264668Y125500D02*X267668Y128500D01*
+X264668Y125500D02*X268418D01*
+X267668Y128500D02*Y122500D01*
+X272919Y127750D02*X273669Y128500D01*
+X275919D01*
+X276669Y127750D01*
+Y126250D01*
+X272919Y122500D02*X276669Y126250D01*
+X272919Y122500D02*X276669D01*
+X278471Y127750D02*X279221Y128500D01*
+X281471D01*
+X282221Y127750D01*
+Y126250D01*
+X278471Y122500D02*X282221Y126250D01*
+X278471Y122500D02*X282221D01*
+X284022Y126250D02*X284772D01*
+X284022Y124750D02*X284772D01*
+X286574Y123250D02*X287324Y122500D01*
+X286574Y127750D02*Y123250D01*
+Y127750D02*X287324Y128500D01*
+X288824D01*
+X289574Y127750D01*
+Y123250D01*
+X288824Y122500D02*X289574Y123250D01*
+X287324Y122500D02*X288824D01*
+X286574Y124000D02*X289574Y127000D01*
+X291375Y128500D02*X294375D01*
+X291375D02*Y125500D01*
+X292125Y126250D01*
+X293625D01*
+X294375Y125500D01*
+Y123250D01*
+X293625Y122500D02*X294375Y123250D01*
+X292125Y122500D02*X293625D01*
+X291375Y123250D02*X292125Y122500D01*
+X296177Y126250D02*X296927D01*
+X296177Y124750D02*X296927D01*
+X298728Y127750D02*X299478Y128500D01*
+X300978D01*
+X301728Y127750D01*
+Y123250D01*
+X300978Y122500D02*X301728Y123250D01*
+X299478Y122500D02*X300978D01*
+X298728Y123250D02*X299478Y122500D01*
+Y125500D02*X301728D01*
+X303530Y128500D02*X306530D01*
+X303530D02*Y125500D01*
+X304280Y126250D01*
+X305780D01*
+X306530Y125500D01*
+Y123250D01*
+X305780Y122500D02*X306530Y123250D01*
+X304280Y122500D02*X305780D01*
+X303530Y123250D02*X304280Y122500D01*
+X311031Y127750D02*X311781Y128500D01*
+X314031D01*
+X314781Y127750D01*
+Y126250D01*
+X311031Y122500D02*X314781Y126250D01*
+X311031Y122500D02*X314781D01*
+X316583Y123250D02*X317333Y122500D01*
+X316583Y127750D02*Y123250D01*
+Y127750D02*X317333Y128500D01*
+X318833D01*
+X319583Y127750D01*
+Y123250D01*
+X318833Y122500D02*X319583Y123250D01*
+X317333Y122500D02*X318833D01*
+X316583Y124000D02*X319583Y127000D01*
+X321384Y123250D02*X322134Y122500D01*
+X321384Y127750D02*Y123250D01*
+Y127750D02*X322134Y128500D01*
+X323634D01*
+X324384Y127750D01*
+Y123250D01*
+X323634Y122500D02*X324384Y123250D01*
+X322134Y122500D02*X323634D01*
+X321384Y124000D02*X324384Y127000D01*
+X326186Y122500D02*X329186Y125500D01*
+Y127750D02*Y125500D01*
+X328436Y128500D02*X329186Y127750D01*
+X326936Y128500D02*X328436D01*
+X326186Y127750D02*X326936Y128500D01*
+X326186Y127750D02*Y126250D01*
+X326936Y125500D01*
+X329186D01*
+X333687Y128500D02*Y123250D01*
+X334437Y122500D01*
+X335937D01*
+X336687Y123250D01*
+Y128500D02*Y123250D01*
+X338489Y128500D02*X341489D01*
+X339989D02*Y122500D01*
+X344040D02*X346290D01*
+X343290Y123250D02*X344040Y122500D01*
+X343290Y127750D02*Y123250D01*
+Y127750D02*X344040Y128500D01*
+X346290D01*
+X200000Y142750D02*Y137500D01*
+Y142750D02*X200750Y143500D01*
+X203000D01*
+X203750Y142750D01*
+Y137500D01*
+X200000Y140500D02*X203750D01*
+X205551D02*Y138250D01*
+X206301Y137500D01*
+X207801D01*
+X208551Y138250D01*
+Y140500D02*Y138250D01*
+X211103Y143500D02*Y138250D01*
+X211853Y137500D01*
+X210353Y141250D02*X211853D01*
+X213354Y143500D02*Y137500D01*
+Y139750D02*X214104Y140500D01*
+X215604D01*
+X216354Y139750D01*
+Y137500D01*
+X218156Y139750D02*Y138250D01*
+Y139750D02*X218906Y140500D01*
+X220406D01*
+X221156Y139750D01*
+Y138250D01*
+X220406Y137500D02*X221156Y138250D01*
+X218906Y137500D02*X220406D01*
+X218156Y138250D02*X218906Y137500D01*
+X223707Y139750D02*Y137500D01*
+Y139750D02*X224457Y140500D01*
+X225957D01*
+X222957D02*X223707Y139750D01*
+X227759Y141250D02*X228509D01*
+X227759Y139750D02*X228509D01*
+X233760Y143500D02*Y137500D01*
+X236010Y143500D02*X236760Y142750D01*
+Y138250D01*
+X236010Y137500D02*X236760Y138250D01*
+X233010Y137500D02*X236010D01*
+X233010Y143500D02*X236010D01*
+X240812Y140500D02*X241562Y139750D01*
+X239312Y140500D02*X240812D01*
+X238562Y139750D02*X239312Y140500D01*
+X238562Y139750D02*Y138250D01*
+X239312Y137500D01*
+X241562Y140500D02*Y138250D01*
+X242312Y137500D01*
+X239312D02*X240812D01*
+X241562Y138250D01*
+X244863Y139750D02*Y137500D01*
+Y139750D02*X245613Y140500D01*
+X246363D01*
+X247113Y139750D01*
+Y137500D01*
+X244113Y140500D02*X244863Y139750D01*
+X251615Y143500D02*Y137500D01*
+Y143500D02*X253865Y141250D01*
+X256115Y143500D01*
+Y137500D01*
+X258666Y140500D02*X260916D01*
+X257916Y139750D02*X258666Y140500D01*
+X257916Y139750D02*Y138250D01*
+X258666Y137500D01*
+X260916D01*
+X262718Y143500D02*Y137500D01*
+Y143500D02*X264968Y141250D01*
+X267218Y143500D01*
+Y137500D01*
+X271269Y140500D02*X272019Y139750D01*
+X269769Y140500D02*X271269D01*
+X269019Y139750D02*X269769Y140500D01*
+X269019Y139750D02*Y138250D01*
+X269769Y137500D01*
+X272019Y140500D02*Y138250D01*
+X272769Y137500D01*
+X269769D02*X271269D01*
+X272019Y138250D01*
+X274571Y143500D02*Y137500D01*
+Y139750D02*X275321Y140500D01*
+X276821D01*
+X277571Y139750D01*
+Y137500D01*
+X279372Y142000D02*Y141250D01*
+Y139750D02*Y137500D01*
+X280874Y143500D02*Y138250D01*
+X281624Y137500D01*
+X283125Y143500D02*Y138250D01*
+X283875Y137500D01*
+X200000Y158500D02*X203000D01*
+X201500D02*Y152500D01*
+X204801Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X207053Y158500D02*Y153250D01*
+X207803Y152500D01*
+X206303Y156250D02*X207803D01*
+X209304Y158500D02*Y153250D01*
+X210054Y152500D01*
+X212306D02*X214556D01*
+X211556Y153250D02*X212306Y152500D01*
+X211556Y154750D02*Y153250D01*
+Y154750D02*X212306Y155500D01*
+X213806D01*
+X214556Y154750D01*
+X211556Y154000D02*X214556D01*
+Y154750D02*Y154000D01*
+X216357Y156250D02*X217107D01*
+X216357Y154750D02*X217107D01*
+X221609Y152500D02*X224609D01*
+X225359Y153250D01*
+Y154750D02*Y153250D01*
+X224609Y155500D02*X225359Y154750D01*
+X222359Y155500D02*X224609D01*
+X222359Y158500D02*Y152500D01*
+X221609Y158500D02*X224609D01*
+X225359Y157750D01*
+Y156250D01*
+X224609Y155500D02*X225359Y156250D01*
+X229410Y155500D02*X230160Y154750D01*
+X227910Y155500D02*X229410D01*
+X227160Y154750D02*X227910Y155500D01*
+X227160Y154750D02*Y153250D01*
+X227910Y152500D01*
+X230160Y155500D02*Y153250D01*
+X230910Y152500D01*
+X227910D02*X229410D01*
+X230160Y153250D01*
+X233462Y152500D02*X235712D01*
+X236462Y153250D01*
+X235712Y154000D02*X236462Y153250D01*
+X233462Y154000D02*X235712D01*
+X232712Y154750D02*X233462Y154000D01*
+X232712Y154750D02*X233462Y155500D01*
+X235712D01*
+X236462Y154750D01*
+X232712Y153250D02*X233462Y152500D01*
+X238263Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X240515Y155500D02*X242765D01*
+X239765Y154750D02*X240515Y155500D01*
+X239765Y154750D02*Y153250D01*
+X240515Y152500D01*
+X242765D01*
+X250266Y158500D02*X251016Y157750D01*
+X248016Y158500D02*X250266D01*
+X247266Y157750D02*X248016Y158500D01*
+X247266Y157750D02*Y156250D01*
+X248016Y155500D01*
+X250266D01*
+X251016Y154750D01*
+Y153250D01*
+X250266Y152500D02*X251016Y153250D01*
+X248016Y152500D02*X250266D01*
+X247266Y153250D02*X248016Y152500D01*
+X252818Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X255069Y154750D02*Y152500D01*
+Y154750D02*X255819Y155500D01*
+X256569D01*
+X257319Y154750D01*
+Y152500D01*
+X254319Y155500D02*X255069Y154750D01*
+X261371Y155500D02*X262121Y154750D01*
+X259871Y155500D02*X261371D01*
+X259121Y154750D02*X259871Y155500D01*
+X259121Y154750D02*Y153250D01*
+X259871Y152500D01*
+X261371D01*
+X262121Y153250D01*
+X259121Y151000D02*X259871Y150250D01*
+X261371D01*
+X262121Y151000D01*
+Y155500D02*Y151000D01*
+X263922Y158500D02*Y153250D01*
+X264672Y152500D01*
+X266924D02*X269174D01*
+X266174Y153250D02*X266924Y152500D01*
+X266174Y154750D02*Y153250D01*
+Y154750D02*X266924Y155500D01*
+X268424D01*
+X269174Y154750D01*
+X266174Y154000D02*X269174D01*
+Y154750D02*Y154000D01*
+X273675Y158500D02*X276675D01*
+X275175D02*Y152500D01*
+X279227Y154750D02*Y152500D01*
+Y154750D02*X279977Y155500D01*
+X281477D01*
+X278477D02*X279227Y154750D01*
+X285528Y155500D02*X286278Y154750D01*
+X284028Y155500D02*X285528D01*
+X283278Y154750D02*X284028Y155500D01*
+X283278Y154750D02*Y153250D01*
+X284028Y152500D01*
+X286278Y155500D02*Y153250D01*
+X287028Y152500D01*
+X284028D02*X285528D01*
+X286278Y153250D01*
+X289580Y155500D02*X291830D01*
+X288830Y154750D02*X289580Y155500D01*
+X288830Y154750D02*Y153250D01*
+X289580Y152500D01*
+X291830D01*
+X294381D02*X296631D01*
+X293631Y153250D02*X294381Y152500D01*
+X293631Y154750D02*Y153250D01*
+Y154750D02*X294381Y155500D01*
+X295881D01*
+X296631Y154750D01*
+X293631Y154000D02*X296631D01*
+Y154750D02*Y154000D01*
+X301133Y158500D02*X304133D01*
+X304883Y157750D01*
+Y156250D01*
+X304133Y155500D02*X304883Y156250D01*
+X301883Y155500D02*X304133D01*
+X301883Y158500D02*Y152500D01*
+Y155500D02*X304883Y152500D01*
+X309684Y158500D02*X310434Y157750D01*
+X307434Y158500D02*X309684D01*
+X306684Y157750D02*X307434Y158500D01*
+X306684Y157750D02*Y156250D01*
+X307434Y155500D01*
+X309684D01*
+X310434Y154750D01*
+Y153250D01*
+X309684Y152500D02*X310434Y153250D01*
+X307434Y152500D02*X309684D01*
+X306684Y153250D02*X307434Y152500D01*
+X312236Y157750D02*X312986Y158500D01*
+X315236D01*
+X315986Y157750D01*
+Y156250D01*
+X312236Y152500D02*X315986Y156250D01*
+X312236Y152500D02*X315986D01*
+X317787D02*X321537Y156250D01*
+Y158500D02*Y156250D01*
+X317787Y158500D02*X321537D01*
+X323339Y155500D02*X326339Y158500D01*
+X323339Y155500D02*X327089D01*
+X326339Y158500D02*Y152500D01*
+X328890Y155500D02*X331890D01*
+X333692Y158500D02*Y157750D01*
+X337442Y154000D01*
+Y152500D01*
+X333692Y154000D02*Y152500D01*
+Y154000D02*X337442Y157750D01*
+Y158500D02*Y157750D01*
+X341943Y158500D02*X344943D01*
+X343443D02*Y152500D01*
+X347495D02*X349745D01*
+X346745Y153250D02*X347495Y152500D01*
+X346745Y154750D02*Y153250D01*
+Y154750D02*X347495Y155500D01*
+X348995D01*
+X349745Y154750D01*
+X346745Y154000D02*X349745D01*
+Y154750D02*Y154000D01*
+X352296Y152500D02*X354546D01*
+X355296Y153250D01*
+X354546Y154000D02*X355296Y153250D01*
+X352296Y154000D02*X354546D01*
+X351546Y154750D02*X352296Y154000D01*
+X351546Y154750D02*X352296Y155500D01*
+X354546D01*
+X355296Y154750D01*
+X351546Y153250D02*X352296Y152500D01*
+X357848Y158500D02*Y153250D01*
+X358598Y152500D01*
+X357098Y156250D02*X358598D01*
+X362799Y155500D02*X365799D01*
+X370301Y158500D02*Y152500D01*
+Y158500D02*X373301D01*
+X370301Y155500D02*X372551D01*
+X377352D02*X378102Y154750D01*
+X375852Y155500D02*X377352D01*
+X375102Y154750D02*X375852Y155500D01*
+X375102Y154750D02*Y153250D01*
+X375852Y152500D01*
+X378102Y155500D02*Y153250D01*
+X378852Y152500D01*
+X375852D02*X377352D01*
+X378102Y153250D01*
+X380654Y158500D02*Y152500D01*
+Y153250D02*X381404Y152500D01*
+X382904D01*
+X383654Y153250D01*
+Y154750D02*Y153250D01*
+X382904Y155500D02*X383654Y154750D01*
+X381404Y155500D02*X382904D01*
+X380654Y154750D02*X381404Y155500D01*
+X386205Y154750D02*Y152500D01*
+Y154750D02*X386955Y155500D01*
+X388455D01*
+X385455D02*X386205Y154750D01*
+X390257Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X392508Y155500D02*X394758D01*
+X391758Y154750D02*X392508Y155500D01*
+X391758Y154750D02*Y153250D01*
+X392508Y152500D01*
+X394758D01*
+X398810Y155500D02*X399560Y154750D01*
+X397310Y155500D02*X398810D01*
+X396560Y154750D02*X397310Y155500D01*
+X396560Y154750D02*Y153250D01*
+X397310Y152500D01*
+X399560Y155500D02*Y153250D01*
+X400310Y152500D01*
+X397310D02*X398810D01*
+X399560Y153250D01*
+X402861Y158500D02*Y153250D01*
+X403611Y152500D01*
+X402111Y156250D02*X403611D01*
+X405113Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X406614Y154750D02*Y153250D01*
+Y154750D02*X407364Y155500D01*
+X408864D01*
+X409614Y154750D01*
+Y153250D01*
+X408864Y152500D02*X409614Y153250D01*
+X407364Y152500D02*X408864D01*
+X406614Y153250D02*X407364Y152500D01*
+X412166Y154750D02*Y152500D01*
+Y154750D02*X412916Y155500D01*
+X413666D01*
+X414416Y154750D01*
+Y152500D01*
+X411416Y155500D02*X412166Y154750D01*
+X419667Y158500D02*Y152500D01*
+X421917Y158500D02*X422667Y157750D01*
+Y153250D01*
+X421917Y152500D02*X422667Y153250D01*
+X418917Y152500D02*X421917D01*
+X418917Y158500D02*X421917D01*
+X425219Y154750D02*Y152500D01*
+Y154750D02*X425969Y155500D01*
+X427469D01*
+X424469D02*X425219Y154750D01*
+X431520Y155500D02*X432270Y154750D01*
+X430020Y155500D02*X431520D01*
+X429270Y154750D02*X430020Y155500D01*
+X429270Y154750D02*Y153250D01*
+X430020Y152500D01*
+X432270Y155500D02*Y153250D01*
+X433020Y152500D01*
+X430020D02*X431520D01*
+X432270Y153250D01*
+X434822Y155500D02*Y153250D01*
+X435572Y152500D01*
+X436322D01*
+X437072Y153250D01*
+Y155500D02*Y153250D01*
+X437822Y152500D01*
+X438572D01*
+X439322Y153250D01*
+Y155500D02*Y153250D01*
+X441123Y157000D02*Y156250D01*
+Y154750D02*Y152500D01*
+X443375Y154750D02*Y152500D01*
+Y154750D02*X444125Y155500D01*
+X444875D01*
+X445625Y154750D01*
+Y152500D01*
+X442625Y155500D02*X443375Y154750D01*
+X449676Y155500D02*X450426Y154750D01*
+X448176Y155500D02*X449676D01*
+X447426Y154750D02*X448176Y155500D01*
+X447426Y154750D02*Y153250D01*
+X448176Y152500D01*
+X449676D01*
+X450426Y153250D01*
+X447426Y151000D02*X448176Y150250D01*
+X449676D01*
+X450426Y151000D01*
+Y155500D02*Y151000D01*
+M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber2/out.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber2/out.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber2/out.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,7 @@
+M48
+INCH
+T13C0.035
+%
+T13
+X009000Y005000
+M30
Index: tags/2.0.1/tests/orig/golden/hid_gerber2/out.top.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber2/out.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber2/out.top.gbr	(revision 18980)
@@ -0,0 +1,17 @@
+G04 start of page 2 for group 0 idx 0 *
+G04 Title: Basic Single Trace RS274-X Test, component *
+G04 Creator: pcb 1.99y *
+G04 CreationDate: Wed Jun 24 22:05:35 2009 UTC *
+G04 For: dan *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 200000 100000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFRONT*%
+%ADD11C,0.0400*%
+%ADD12C,0.0600*%
+%ADD13C,0.0350*%
+G54D11*X10000Y50000D02*X90000D01*
+G54D12*D03*
+G54D13*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.bottom.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.bottom.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.bottom.gbr	(revision 18980)
@@ -0,0 +1,23 @@
+G04 start of page 5 for group 5 idx 5 *
+G04 Title: (unknown), bottom *
+G04 Creator: pcb 1.99z *
+G04 CreationDate: Fri Jun 17 03:18:51 2011 UTC *
+G04 For: apoelstra *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 3000000 2000000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNBOTTOM*%
+%ADD32C,0.2500*%
+%ADD31C,0.5000*%
+%ADD30C,1.0000*%
+%ADD29C,0.6500*%
+%ADD28C,0.7500*%
+G54D28*X600000Y450000D03*
+G54D29*Y290000D03*
+G54D30*X450000Y600000D03*
+X600000D03*
+G54D29*X450000Y290000D03*
+G54D28*Y450000D03*
+G54D31*G54D32*G54D31*G54D32*G54D31*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.fab.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.fab.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.fab.gbr	(revision 18980)
@@ -0,0 +1,2025 @@
+G04 start of page 7 for group -3984 idx -3984 *
+G04 Title: (unknown), fab *
+G04 Creator: pcb 1.99z *
+G04 CreationDate: Fri Jun 17 03:18:51 2011 UTC *
+G04 For: apoelstra *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 3000000 2000000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNFAB*%
+%ADD37C,0.0100*%
+%ADD36C,0.0060*%
+%ADD35C,0.0080*%
+G54D35*X600000Y451600D02*Y448400D01*
+X598400Y450000D02*X601600D01*
+X450000Y601600D02*Y598400D01*
+X448400Y600000D02*X451600D01*
+X600000Y601600D02*Y598400D01*
+X598400Y600000D02*X601600D01*
+X450000Y451600D02*Y448400D01*
+X448400Y450000D02*X451600D01*
+X15000Y2042850D02*Y2039650D01*
+X13400Y2041250D02*X16600D01*
+G54D36*X135000Y2043500D02*Y2042750D01*
+X136500Y2041250D01*
+X138000Y2042750D01*
+Y2043500D02*Y2042750D01*
+X136500Y2041250D02*Y2037500D01*
+X139801Y2040500D02*X142051D01*
+X139801Y2037500D02*X142801D01*
+X139801Y2043500D02*Y2037500D01*
+Y2043500D02*X142801D01*
+X147603D02*X148353Y2042750D01*
+X145353Y2043500D02*X147603D01*
+X144603Y2042750D02*X145353Y2043500D01*
+X144603Y2042750D02*Y2041250D01*
+X145353Y2040500D01*
+X147603D01*
+X148353Y2039750D01*
+Y2038250D01*
+X147603Y2037500D02*X148353Y2038250D01*
+X145353Y2037500D02*X147603D01*
+X144603Y2038250D02*X145353Y2037500D01*
+X135000Y2034249D02*X150154D01*
+X98000Y2040500D02*X101000Y2043500D01*
+X98000Y2040500D02*X101750D01*
+X101000Y2043500D02*Y2037500D01*
+X98000Y2034249D02*X103551D01*
+X45000Y2038250D02*X45750Y2037500D01*
+X45000Y2042750D02*Y2038250D01*
+Y2042750D02*X45750Y2043500D01*
+X47250D01*
+X48000Y2042750D01*
+Y2038250D01*
+X47250Y2037500D02*X48000Y2038250D01*
+X45750Y2037500D02*X47250D01*
+X45000Y2039000D02*X48000Y2042000D01*
+X49801Y2037500D02*X50551D01*
+X52353Y2043500D02*X55353D01*
+X52353D02*Y2040500D01*
+X53103Y2041250D01*
+X54603D01*
+X55353Y2040500D01*
+Y2038250D01*
+X54603Y2037500D02*X55353Y2038250D01*
+X53103Y2037500D02*X54603D01*
+X52353Y2038250D02*X53103Y2037500D01*
+X57154Y2038250D02*X57904Y2037500D01*
+X57154Y2042750D02*Y2038250D01*
+Y2042750D02*X57904Y2043500D01*
+X59404D01*
+X60154Y2042750D01*
+Y2038250D01*
+X59404Y2037500D02*X60154Y2038250D01*
+X57904Y2037500D02*X59404D01*
+X57154Y2039000D02*X60154Y2042000D01*
+X61956Y2038250D02*X62706Y2037500D01*
+X61956Y2042750D02*Y2038250D01*
+Y2042750D02*X62706Y2043500D01*
+X64206D01*
+X64956Y2042750D01*
+Y2038250D01*
+X64206Y2037500D02*X64956Y2038250D01*
+X62706Y2037500D02*X64206D01*
+X61956Y2039000D02*X64956Y2042000D01*
+X45000Y2034249D02*X66757D01*
+X600000Y290000D02*Y288400D01*
+Y290000D02*X601386Y290800D01*
+X600000Y290000D02*X598614Y290800D01*
+X450000Y290000D02*Y288400D01*
+Y290000D02*X451386Y290800D01*
+X450000Y290000D02*X448614Y290800D01*
+X15000Y2056250D02*Y2054650D01*
+Y2056250D02*X16386Y2057050D01*
+X15000Y2056250D02*X13614Y2057050D01*
+X135000Y2058500D02*Y2057750D01*
+X136500Y2056250D01*
+X138000Y2057750D01*
+Y2058500D02*Y2057750D01*
+X136500Y2056250D02*Y2052500D01*
+X139801Y2055500D02*X142051D01*
+X139801Y2052500D02*X142801D01*
+X139801Y2058500D02*Y2052500D01*
+Y2058500D02*X142801D01*
+X147603D02*X148353Y2057750D01*
+X145353Y2058500D02*X147603D01*
+X144603Y2057750D02*X145353Y2058500D01*
+X144603Y2057750D02*Y2056250D01*
+X145353Y2055500D01*
+X147603D01*
+X148353Y2054750D01*
+Y2053250D01*
+X147603Y2052500D02*X148353Y2053250D01*
+X145353Y2052500D02*X147603D01*
+X144603Y2053250D02*X145353Y2052500D01*
+X135000Y2049249D02*X150154D01*
+X98000Y2057750D02*X98750Y2058500D01*
+X101000D01*
+X101750Y2057750D01*
+Y2056250D01*
+X98000Y2052500D02*X101750Y2056250D01*
+X98000Y2052500D02*X101750D01*
+X98000Y2049249D02*X103551D01*
+X45000Y2053250D02*X45750Y2052500D01*
+X45000Y2057750D02*Y2053250D01*
+Y2057750D02*X45750Y2058500D01*
+X47250D01*
+X48000Y2057750D01*
+Y2053250D01*
+X47250Y2052500D02*X48000Y2053250D01*
+X45750Y2052500D02*X47250D01*
+X45000Y2054000D02*X48000Y2057000D01*
+X49801Y2052500D02*X50551D01*
+X52353Y2057750D02*X53103Y2058500D01*
+X55353D01*
+X56103Y2057750D01*
+Y2056250D01*
+X52353Y2052500D02*X56103Y2056250D01*
+X52353Y2052500D02*X56103D01*
+X57904Y2058500D02*X60904D01*
+X57904D02*Y2055500D01*
+X58654Y2056250D01*
+X60154D01*
+X60904Y2055500D01*
+Y2053250D01*
+X60154Y2052500D02*X60904Y2053250D01*
+X58654Y2052500D02*X60154D01*
+X57904Y2053250D02*X58654Y2052500D01*
+X62706Y2053250D02*X63456Y2052500D01*
+X62706Y2057750D02*Y2053250D01*
+Y2057750D02*X63456Y2058500D01*
+X64956D01*
+X65706Y2057750D01*
+Y2053250D01*
+X64956Y2052500D02*X65706Y2053250D01*
+X63456Y2052500D02*X64956D01*
+X62706Y2054000D02*X65706Y2057000D01*
+X45000Y2049249D02*X67507D01*
+X3000Y2073500D02*X3750Y2072750D01*
+X750Y2073500D02*X3000D01*
+X0Y2072750D02*X750Y2073500D01*
+X0Y2072750D02*Y2071250D01*
+X750Y2070500D01*
+X3000D01*
+X3750Y2069750D01*
+Y2068250D01*
+X3000Y2067500D02*X3750Y2068250D01*
+X750Y2067500D02*X3000D01*
+X0Y2068250D02*X750Y2067500D01*
+X5551Y2070500D02*Y2068250D01*
+X6301Y2067500D01*
+X8551Y2070500D02*Y2066000D01*
+X7801Y2065250D02*X8551Y2066000D01*
+X6301Y2065250D02*X7801D01*
+X5551Y2066000D02*X6301Y2065250D01*
+Y2067500D02*X7801D01*
+X8551Y2068250D01*
+X11103Y2069750D02*Y2067500D01*
+Y2069750D02*X11853Y2070500D01*
+X12603D01*
+X13353Y2069750D01*
+Y2067500D01*
+Y2069750D02*X14103Y2070500D01*
+X14853D01*
+X15603Y2069750D01*
+Y2067500D01*
+X10353Y2070500D02*X11103Y2069750D01*
+X17404Y2073500D02*Y2067500D01*
+Y2068250D02*X18154Y2067500D01*
+X19654D01*
+X20404Y2068250D01*
+Y2069750D02*Y2068250D01*
+X19654Y2070500D02*X20404Y2069750D01*
+X18154Y2070500D02*X19654D01*
+X17404Y2069750D02*X18154Y2070500D01*
+X22206Y2069750D02*Y2068250D01*
+Y2069750D02*X22956Y2070500D01*
+X24456D01*
+X25206Y2069750D01*
+Y2068250D01*
+X24456Y2067500D02*X25206Y2068250D01*
+X22956Y2067500D02*X24456D01*
+X22206Y2068250D02*X22956Y2067500D01*
+X27007Y2073500D02*Y2068250D01*
+X27757Y2067500D01*
+X41750Y2073500D02*Y2067500D01*
+X44000Y2073500D02*X44750Y2072750D01*
+Y2068250D01*
+X44000Y2067500D02*X44750Y2068250D01*
+X41000Y2067500D02*X44000D01*
+X41000Y2073500D02*X44000D01*
+X46551Y2072000D02*Y2071250D01*
+Y2069750D02*Y2067500D01*
+X50303Y2070500D02*X51053Y2069750D01*
+X48803Y2070500D02*X50303D01*
+X48053Y2069750D02*X48803Y2070500D01*
+X48053Y2069750D02*Y2068250D01*
+X48803Y2067500D01*
+X51053Y2070500D02*Y2068250D01*
+X51803Y2067500D01*
+X48803D02*X50303D01*
+X51053Y2068250D01*
+X54354Y2069750D02*Y2067500D01*
+Y2069750D02*X55104Y2070500D01*
+X55854D01*
+X56604Y2069750D01*
+Y2067500D01*
+Y2069750D02*X57354Y2070500D01*
+X58104D01*
+X58854Y2069750D01*
+Y2067500D01*
+X53604Y2070500D02*X54354Y2069750D01*
+X60656Y2067500D02*X61406D01*
+X65907Y2068250D02*X66657Y2067500D01*
+X65907Y2072750D02*X66657Y2073500D01*
+X65907Y2072750D02*Y2068250D01*
+X68459Y2073500D02*X69959D01*
+X69209D02*Y2067500D01*
+X68459D02*X69959D01*
+X72510Y2069750D02*Y2067500D01*
+Y2069750D02*X73260Y2070500D01*
+X74010D01*
+X74760Y2069750D01*
+Y2067500D01*
+X71760Y2070500D02*X72510Y2069750D01*
+X77312Y2070500D02*X79562D01*
+X76562Y2069750D02*X77312Y2070500D01*
+X76562Y2069750D02*Y2068250D01*
+X77312Y2067500D01*
+X79562D01*
+X81363Y2073500D02*Y2067500D01*
+Y2069750D02*X82113Y2070500D01*
+X83613D01*
+X84363Y2069750D01*
+Y2067500D01*
+X86165Y2073500D02*X86915Y2072750D01*
+Y2068250D01*
+X86165Y2067500D02*X86915Y2068250D01*
+X95750Y2067500D02*X98000D01*
+X95000Y2068250D02*X95750Y2067500D01*
+X95000Y2072750D02*Y2068250D01*
+Y2072750D02*X95750Y2073500D01*
+X98000D01*
+X99801Y2069750D02*Y2068250D01*
+Y2069750D02*X100551Y2070500D01*
+X102051D01*
+X102801Y2069750D01*
+Y2068250D01*
+X102051Y2067500D02*X102801Y2068250D01*
+X100551Y2067500D02*X102051D01*
+X99801Y2068250D02*X100551Y2067500D01*
+X104603Y2070500D02*Y2068250D01*
+X105353Y2067500D01*
+X106853D01*
+X107603Y2068250D01*
+Y2070500D02*Y2068250D01*
+X110154Y2069750D02*Y2067500D01*
+Y2069750D02*X110904Y2070500D01*
+X111654D01*
+X112404Y2069750D01*
+Y2067500D01*
+X109404Y2070500D02*X110154Y2069750D01*
+X114956Y2073500D02*Y2068250D01*
+X115706Y2067500D01*
+X114206Y2071250D02*X115706D01*
+X130750Y2073500D02*Y2067500D01*
+X130000Y2073500D02*X133000D01*
+X133750Y2072750D01*
+Y2071250D01*
+X133000Y2070500D02*X133750Y2071250D01*
+X130750Y2070500D02*X133000D01*
+X135551Y2073500D02*Y2068250D01*
+X136301Y2067500D01*
+X140053Y2070500D02*X140803Y2069750D01*
+X138553Y2070500D02*X140053D01*
+X137803Y2069750D02*X138553Y2070500D01*
+X137803Y2069750D02*Y2068250D01*
+X138553Y2067500D01*
+X140803Y2070500D02*Y2068250D01*
+X141553Y2067500D01*
+X138553D02*X140053D01*
+X140803Y2068250D01*
+X144104Y2073500D02*Y2068250D01*
+X144854Y2067500D01*
+X143354Y2071250D02*X144854D01*
+X147106Y2067500D02*X149356D01*
+X146356Y2068250D02*X147106Y2067500D01*
+X146356Y2069750D02*Y2068250D01*
+Y2069750D02*X147106Y2070500D01*
+X148606D01*
+X149356Y2069750D01*
+X146356Y2069000D02*X149356D01*
+Y2069750D02*Y2069000D01*
+X154157Y2073500D02*Y2067500D01*
+X153407D02*X154157Y2068250D01*
+X151907Y2067500D02*X153407D01*
+X151157Y2068250D02*X151907Y2067500D01*
+X151157Y2069750D02*Y2068250D01*
+Y2069750D02*X151907Y2070500D01*
+X153407D01*
+X154157Y2069750D01*
+X157459Y2070500D02*Y2069750D01*
+Y2068250D02*Y2067500D01*
+X155959Y2072750D02*Y2072000D01*
+Y2072750D02*X156709Y2073500D01*
+X158209D01*
+X158959Y2072750D01*
+Y2072000D01*
+X157459Y2070500D02*X158959Y2072000D01*
+X0Y2088500D02*X3000D01*
+X1500D02*Y2082500D01*
+X4801Y2088500D02*Y2082500D01*
+Y2084750D02*X5551Y2085500D01*
+X7051D01*
+X7801Y2084750D01*
+Y2082500D01*
+X10353D02*X12603D01*
+X9603Y2083250D02*X10353Y2082500D01*
+X9603Y2084750D02*Y2083250D01*
+Y2084750D02*X10353Y2085500D01*
+X11853D01*
+X12603Y2084750D01*
+X9603Y2084000D02*X12603D01*
+Y2084750D02*Y2084000D01*
+X15154Y2084750D02*Y2082500D01*
+Y2084750D02*X15904Y2085500D01*
+X17404D01*
+X14404D02*X15154Y2084750D01*
+X19956Y2082500D02*X22206D01*
+X19206Y2083250D02*X19956Y2082500D01*
+X19206Y2084750D02*Y2083250D01*
+Y2084750D02*X19956Y2085500D01*
+X21456D01*
+X22206Y2084750D01*
+X19206Y2084000D02*X22206D01*
+Y2084750D02*Y2084000D01*
+X28957Y2085500D02*X29707Y2084750D01*
+X27457Y2085500D02*X28957D01*
+X26707Y2084750D02*X27457Y2085500D01*
+X26707Y2084750D02*Y2083250D01*
+X27457Y2082500D01*
+X29707Y2085500D02*Y2083250D01*
+X30457Y2082500D01*
+X27457D02*X28957D01*
+X29707Y2083250D01*
+X33009Y2084750D02*Y2082500D01*
+Y2084750D02*X33759Y2085500D01*
+X35259D01*
+X32259D02*X33009Y2084750D01*
+X37810Y2082500D02*X40060D01*
+X37060Y2083250D02*X37810Y2082500D01*
+X37060Y2084750D02*Y2083250D01*
+Y2084750D02*X37810Y2085500D01*
+X39310D01*
+X40060Y2084750D01*
+X37060Y2084000D02*X40060D01*
+Y2084750D02*Y2084000D01*
+X44562Y2087750D02*X45312Y2088500D01*
+X47562D01*
+X48312Y2087750D01*
+Y2086250D01*
+X44562Y2082500D02*X48312Y2086250D01*
+X44562Y2082500D02*X48312D01*
+X55813Y2088500D02*Y2082500D01*
+X55063D02*X55813Y2083250D01*
+X53563Y2082500D02*X55063D01*
+X52813Y2083250D02*X53563Y2082500D01*
+X52813Y2084750D02*Y2083250D01*
+Y2084750D02*X53563Y2085500D01*
+X55063D01*
+X55813Y2084750D01*
+X57615Y2087000D02*Y2086250D01*
+Y2084750D02*Y2082500D01*
+X59866Y2087750D02*Y2082500D01*
+Y2087750D02*X60616Y2088500D01*
+X61366D01*
+X59116Y2085500D02*X60616D01*
+X63618Y2087750D02*Y2082500D01*
+Y2087750D02*X64368Y2088500D01*
+X65118D01*
+X62868Y2085500D02*X64368D01*
+X67369Y2082500D02*X69619D01*
+X66619Y2083250D02*X67369Y2082500D01*
+X66619Y2084750D02*Y2083250D01*
+Y2084750D02*X67369Y2085500D01*
+X68869D01*
+X69619Y2084750D01*
+X66619Y2084000D02*X69619D01*
+Y2084750D02*Y2084000D01*
+X72171Y2084750D02*Y2082500D01*
+Y2084750D02*X72921Y2085500D01*
+X74421D01*
+X71421D02*X72171Y2084750D01*
+X76972Y2082500D02*X79222D01*
+X76222Y2083250D02*X76972Y2082500D01*
+X76222Y2084750D02*Y2083250D01*
+Y2084750D02*X76972Y2085500D01*
+X78472D01*
+X79222Y2084750D01*
+X76222Y2084000D02*X79222D01*
+Y2084750D02*Y2084000D01*
+X81774Y2084750D02*Y2082500D01*
+Y2084750D02*X82524Y2085500D01*
+X83274D01*
+X84024Y2084750D01*
+Y2082500D01*
+X81024Y2085500D02*X81774Y2084750D01*
+X86575Y2088500D02*Y2083250D01*
+X87325Y2082500D01*
+X85825Y2086250D02*X87325D01*
+X94527Y2088500D02*Y2082500D01*
+X93777D02*X94527Y2083250D01*
+X92277Y2082500D02*X93777D01*
+X91527Y2083250D02*X92277Y2082500D01*
+X91527Y2084750D02*Y2083250D01*
+Y2084750D02*X92277Y2085500D01*
+X93777D01*
+X94527Y2084750D01*
+X97078D02*Y2082500D01*
+Y2084750D02*X97828Y2085500D01*
+X99328D01*
+X96328D02*X97078Y2084750D01*
+X101130Y2087000D02*Y2086250D01*
+Y2084750D02*Y2082500D01*
+X102631Y2088500D02*Y2083250D01*
+X103381Y2082500D01*
+X104883Y2088500D02*Y2083250D01*
+X105633Y2082500D01*
+X110584D02*X112834D01*
+X113584Y2083250D01*
+X112834Y2084000D02*X113584Y2083250D01*
+X110584Y2084000D02*X112834D01*
+X109834Y2084750D02*X110584Y2084000D01*
+X109834Y2084750D02*X110584Y2085500D01*
+X112834D01*
+X113584Y2084750D01*
+X109834Y2083250D02*X110584Y2082500D01*
+X115386Y2087000D02*Y2086250D01*
+Y2084750D02*Y2082500D01*
+X116887Y2085500D02*X119887D01*
+X116887Y2082500D02*X119887Y2085500D01*
+X116887Y2082500D02*X119887D01*
+X122439D02*X124689D01*
+X121689Y2083250D02*X122439Y2082500D01*
+X121689Y2084750D02*Y2083250D01*
+Y2084750D02*X122439Y2085500D01*
+X123939D01*
+X124689Y2084750D01*
+X121689Y2084000D02*X124689D01*
+Y2084750D02*Y2084000D01*
+X127240Y2082500D02*X129490D01*
+X130240Y2083250D01*
+X129490Y2084000D02*X130240Y2083250D01*
+X127240Y2084000D02*X129490D01*
+X126490Y2084750D02*X127240Y2084000D01*
+X126490Y2084750D02*X127240Y2085500D01*
+X129490D01*
+X130240Y2084750D01*
+X126490Y2083250D02*X127240Y2082500D01*
+X134742Y2085500D02*Y2083250D01*
+X135492Y2082500D01*
+X136992D01*
+X137742Y2083250D01*
+Y2085500D02*Y2083250D01*
+X140293Y2082500D02*X142543D01*
+X143293Y2083250D01*
+X142543Y2084000D02*X143293Y2083250D01*
+X140293Y2084000D02*X142543D01*
+X139543Y2084750D02*X140293Y2084000D01*
+X139543Y2084750D02*X140293Y2085500D01*
+X142543D01*
+X143293Y2084750D01*
+X139543Y2083250D02*X140293Y2082500D01*
+X145845D02*X148095D01*
+X145095Y2083250D02*X145845Y2082500D01*
+X145095Y2084750D02*Y2083250D01*
+Y2084750D02*X145845Y2085500D01*
+X147345D01*
+X148095Y2084750D01*
+X145095Y2084000D02*X148095D01*
+Y2084750D02*Y2084000D01*
+X152896Y2088500D02*Y2082500D01*
+X152146D02*X152896Y2083250D01*
+X150646Y2082500D02*X152146D01*
+X149896Y2083250D02*X150646Y2082500D01*
+X149896Y2084750D02*Y2083250D01*
+Y2084750D02*X150646Y2085500D01*
+X152146D01*
+X152896Y2084750D01*
+X157398Y2087000D02*Y2086250D01*
+Y2084750D02*Y2082500D01*
+X159649Y2084750D02*Y2082500D01*
+Y2084750D02*X160399Y2085500D01*
+X161149D01*
+X161899Y2084750D01*
+Y2082500D01*
+X158899Y2085500D02*X159649Y2084750D01*
+X167151Y2088500D02*Y2083250D01*
+X167901Y2082500D01*
+X166401Y2086250D02*X167901D01*
+X169402Y2088500D02*Y2082500D01*
+Y2084750D02*X170152Y2085500D01*
+X171652D01*
+X172402Y2084750D01*
+Y2082500D01*
+X174204Y2087000D02*Y2086250D01*
+Y2084750D02*Y2082500D01*
+X176455D02*X178705D01*
+X179455Y2083250D01*
+X178705Y2084000D02*X179455Y2083250D01*
+X176455Y2084000D02*X178705D01*
+X175705Y2084750D02*X176455Y2084000D01*
+X175705Y2084750D02*X176455Y2085500D01*
+X178705D01*
+X179455Y2084750D01*
+X175705Y2083250D02*X176455Y2082500D01*
+X183957Y2088500D02*Y2083250D01*
+X184707Y2082500D01*
+X188458Y2085500D02*X189208Y2084750D01*
+X186958Y2085500D02*X188458D01*
+X186208Y2084750D02*X186958Y2085500D01*
+X186208Y2084750D02*Y2083250D01*
+X186958Y2082500D01*
+X189208Y2085500D02*Y2083250D01*
+X189958Y2082500D01*
+X186958D02*X188458D01*
+X189208Y2083250D01*
+X191760Y2085500D02*Y2083250D01*
+X192510Y2082500D01*
+X194760Y2085500D02*Y2081000D01*
+X194010Y2080250D02*X194760Y2081000D01*
+X192510Y2080250D02*X194010D01*
+X191760Y2081000D02*X192510Y2080250D01*
+Y2082500D02*X194010D01*
+X194760Y2083250D01*
+X196561Y2084750D02*Y2083250D01*
+Y2084750D02*X197311Y2085500D01*
+X198811D01*
+X199561Y2084750D01*
+Y2083250D01*
+X198811Y2082500D02*X199561Y2083250D01*
+X197311Y2082500D02*X198811D01*
+X196561Y2083250D02*X197311Y2082500D01*
+X201363Y2085500D02*Y2083250D01*
+X202113Y2082500D01*
+X203613D01*
+X204363Y2083250D01*
+Y2085500D02*Y2083250D01*
+X206914Y2088500D02*Y2083250D01*
+X207664Y2082500D01*
+X206164Y2086250D02*X207664D01*
+X209166Y2081000D02*X210666Y2082500D01*
+X217417Y2088500D02*X218167Y2087750D01*
+X215917Y2088500D02*X217417D01*
+X215167Y2087750D02*X215917Y2088500D01*
+X215167Y2087750D02*Y2083250D01*
+X215917Y2082500D01*
+X217417Y2085500D02*X218167Y2084750D01*
+X215167Y2085500D02*X217417D01*
+X215917Y2082500D02*X217417D01*
+X218167Y2083250D01*
+Y2084750D02*Y2083250D01*
+X222669Y2088500D02*Y2082500D01*
+Y2084750D02*X223419Y2085500D01*
+X224919D01*
+X225669Y2084750D01*
+Y2082500D01*
+X227470Y2084750D02*Y2083250D01*
+Y2084750D02*X228220Y2085500D01*
+X229720D01*
+X230470Y2084750D01*
+Y2083250D01*
+X229720Y2082500D02*X230470Y2083250D01*
+X228220Y2082500D02*X229720D01*
+X227470Y2083250D02*X228220Y2082500D01*
+X232272Y2088500D02*Y2083250D01*
+X233022Y2082500D01*
+X235273D02*X237523D01*
+X234523Y2083250D02*X235273Y2082500D01*
+X234523Y2084750D02*Y2083250D01*
+Y2084750D02*X235273Y2085500D01*
+X236773D01*
+X237523Y2084750D01*
+X234523Y2084000D02*X237523D01*
+Y2084750D02*Y2084000D01*
+X240075Y2082500D02*X242325D01*
+X243075Y2083250D01*
+X242325Y2084000D02*X243075Y2083250D01*
+X240075Y2084000D02*X242325D01*
+X239325Y2084750D02*X240075Y2084000D01*
+X239325Y2084750D02*X240075Y2085500D01*
+X242325D01*
+X243075Y2084750D01*
+X239325Y2083250D02*X240075Y2082500D01*
+X248326Y2088500D02*Y2083250D01*
+X249076Y2082500D01*
+X247576Y2086250D02*X249076D01*
+X250578Y2084750D02*Y2083250D01*
+Y2084750D02*X251328Y2085500D01*
+X252828D01*
+X253578Y2084750D01*
+Y2083250D01*
+X252828Y2082500D02*X253578Y2083250D01*
+X251328Y2082500D02*X252828D01*
+X250578Y2083250D02*X251328Y2082500D01*
+X256129Y2088500D02*Y2083250D01*
+X256879Y2082500D01*
+X255379Y2086250D02*X256879D01*
+X260631Y2085500D02*X261381Y2084750D01*
+X259131Y2085500D02*X260631D01*
+X258381Y2084750D02*X259131Y2085500D01*
+X258381Y2084750D02*Y2083250D01*
+X259131Y2082500D01*
+X261381Y2085500D02*Y2083250D01*
+X262131Y2082500D01*
+X259131D02*X260631D01*
+X261381Y2083250D01*
+X263932Y2088500D02*Y2083250D01*
+X264682Y2082500D01*
+G54D37*X0Y2000000D02*X3000000D01*
+X0D02*Y0D01*
+X3000000Y2000000D02*Y0D01*
+X0D02*X3000000D01*
+G54D36*X200000Y2013500D02*Y2007500D01*
+Y2013500D02*X202250Y2011250D01*
+X204500Y2013500D01*
+Y2007500D01*
+X208551Y2010500D02*X209301Y2009750D01*
+X207051Y2010500D02*X208551D01*
+X206301Y2009750D02*X207051Y2010500D01*
+X206301Y2009750D02*Y2008250D01*
+X207051Y2007500D01*
+X209301Y2010500D02*Y2008250D01*
+X210051Y2007500D01*
+X207051D02*X208551D01*
+X209301Y2008250D01*
+X211853Y2010500D02*X214853Y2007500D01*
+X211853D02*X214853Y2010500D01*
+X216654Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X218906Y2009750D02*Y2007500D01*
+Y2009750D02*X219656Y2010500D01*
+X220406D01*
+X221156Y2009750D01*
+Y2007500D01*
+Y2009750D02*X221906Y2010500D01*
+X222656D01*
+X223406Y2009750D01*
+Y2007500D01*
+X218156Y2010500D02*X218906Y2009750D01*
+X225207Y2010500D02*Y2008250D01*
+X225957Y2007500D01*
+X227457D01*
+X228207Y2008250D01*
+Y2010500D02*Y2008250D01*
+X230759Y2009750D02*Y2007500D01*
+Y2009750D02*X231509Y2010500D01*
+X232259D01*
+X233009Y2009750D01*
+Y2007500D01*
+Y2009750D02*X233759Y2010500D01*
+X234509D01*
+X235259Y2009750D01*
+Y2007500D01*
+X230009Y2010500D02*X230759Y2009750D01*
+X240510Y2013500D02*Y2007500D01*
+X242760Y2013500D02*X243510Y2012750D01*
+Y2008250D01*
+X242760Y2007500D02*X243510Y2008250D01*
+X239760Y2007500D02*X242760D01*
+X239760Y2013500D02*X242760D01*
+X245312Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X247563Y2009750D02*Y2007500D01*
+Y2009750D02*X248313Y2010500D01*
+X249063D01*
+X249813Y2009750D01*
+Y2007500D01*
+Y2009750D02*X250563Y2010500D01*
+X251313D01*
+X252063Y2009750D01*
+Y2007500D01*
+X246813Y2010500D02*X247563Y2009750D01*
+X254615Y2007500D02*X256865D01*
+X253865Y2008250D02*X254615Y2007500D01*
+X253865Y2009750D02*Y2008250D01*
+Y2009750D02*X254615Y2010500D01*
+X256115D01*
+X256865Y2009750D01*
+X253865Y2009000D02*X256865D01*
+Y2009750D02*Y2009000D01*
+X259416Y2009750D02*Y2007500D01*
+Y2009750D02*X260166Y2010500D01*
+X260916D01*
+X261666Y2009750D01*
+Y2007500D01*
+X258666Y2010500D02*X259416Y2009750D01*
+X264218Y2007500D02*X266468D01*
+X267218Y2008250D01*
+X266468Y2009000D02*X267218Y2008250D01*
+X264218Y2009000D02*X266468D01*
+X263468Y2009750D02*X264218Y2009000D01*
+X263468Y2009750D02*X264218Y2010500D01*
+X266468D01*
+X267218Y2009750D01*
+X263468Y2008250D02*X264218Y2007500D01*
+X269019Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X270521Y2009750D02*Y2008250D01*
+Y2009750D02*X271271Y2010500D01*
+X272771D01*
+X273521Y2009750D01*
+Y2008250D01*
+X272771Y2007500D02*X273521Y2008250D01*
+X271271Y2007500D02*X272771D01*
+X270521Y2008250D02*X271271Y2007500D01*
+X276072Y2009750D02*Y2007500D01*
+Y2009750D02*X276822Y2010500D01*
+X277572D01*
+X278322Y2009750D01*
+Y2007500D01*
+X275322Y2010500D02*X276072Y2009750D01*
+X280874Y2007500D02*X283124D01*
+X283874Y2008250D01*
+X283124Y2009000D02*X283874Y2008250D01*
+X280874Y2009000D02*X283124D01*
+X280124Y2009750D02*X280874Y2009000D01*
+X280124Y2009750D02*X280874Y2010500D01*
+X283124D01*
+X283874Y2009750D01*
+X280124Y2008250D02*X280874Y2007500D01*
+X285675Y2011250D02*X286425D01*
+X285675Y2009750D02*X286425D01*
+X290927Y2012750D02*X291677Y2013500D01*
+X293177D01*
+X293927Y2012750D01*
+Y2008250D01*
+X293177Y2007500D02*X293927Y2008250D01*
+X291677Y2007500D02*X293177D01*
+X290927Y2008250D02*X291677Y2007500D01*
+Y2010500D02*X293927D01*
+X295728Y2008250D02*X296478Y2007500D01*
+X295728Y2012750D02*Y2008250D01*
+Y2012750D02*X296478Y2013500D01*
+X297978D01*
+X298728Y2012750D01*
+Y2008250D01*
+X297978Y2007500D02*X298728Y2008250D01*
+X296478Y2007500D02*X297978D01*
+X295728Y2009000D02*X298728Y2012000D01*
+X300530Y2008250D02*X301280Y2007500D01*
+X300530Y2012750D02*Y2008250D01*
+Y2012750D02*X301280Y2013500D01*
+X302780D01*
+X303530Y2012750D01*
+Y2008250D01*
+X302780Y2007500D02*X303530Y2008250D01*
+X301280Y2007500D02*X302780D01*
+X300530Y2009000D02*X303530Y2012000D01*
+X305331Y2008250D02*X306081Y2007500D01*
+X305331Y2012750D02*Y2008250D01*
+Y2012750D02*X306081Y2013500D01*
+X307581D01*
+X308331Y2012750D01*
+Y2008250D01*
+X307581Y2007500D02*X308331Y2008250D01*
+X306081Y2007500D02*X307581D01*
+X305331Y2009000D02*X308331Y2012000D01*
+X310133Y2008250D02*X310883Y2007500D01*
+X310133Y2012750D02*Y2008250D01*
+Y2012750D02*X310883Y2013500D01*
+X312383D01*
+X313133Y2012750D01*
+Y2008250D01*
+X312383Y2007500D02*X313133Y2008250D01*
+X310883Y2007500D02*X312383D01*
+X310133Y2009000D02*X313133Y2012000D01*
+X314934Y2007500D02*X315684D01*
+X317486Y2008250D02*X318236Y2007500D01*
+X317486Y2012750D02*Y2008250D01*
+Y2012750D02*X318236Y2013500D01*
+X319736D01*
+X320486Y2012750D01*
+Y2008250D01*
+X319736Y2007500D02*X320486Y2008250D01*
+X318236Y2007500D02*X319736D01*
+X317486Y2009000D02*X320486Y2012000D01*
+X322287Y2008250D02*X323037Y2007500D01*
+X322287Y2012750D02*Y2008250D01*
+Y2012750D02*X323037Y2013500D01*
+X324537D01*
+X325287Y2012750D01*
+Y2008250D01*
+X324537Y2007500D02*X325287Y2008250D01*
+X323037Y2007500D02*X324537D01*
+X322287Y2009000D02*X325287Y2012000D01*
+X327089Y2008250D02*X327839Y2007500D01*
+X327089Y2012750D02*Y2008250D01*
+Y2012750D02*X327839Y2013500D01*
+X329339D01*
+X330089Y2012750D01*
+Y2008250D01*
+X329339Y2007500D02*X330089Y2008250D01*
+X327839Y2007500D02*X329339D01*
+X327089Y2009000D02*X330089Y2012000D01*
+X331890Y2008250D02*X332640Y2007500D01*
+X331890Y2012750D02*Y2008250D01*
+Y2012750D02*X332640Y2013500D01*
+X334140D01*
+X334890Y2012750D01*
+Y2008250D01*
+X334140Y2007500D02*X334890Y2008250D01*
+X332640Y2007500D02*X334140D01*
+X331890Y2009000D02*X334890Y2012000D01*
+X336692Y2008250D02*X337442Y2007500D01*
+X336692Y2012750D02*Y2008250D01*
+Y2012750D02*X337442Y2013500D01*
+X338942D01*
+X339692Y2012750D01*
+Y2008250D01*
+X338942Y2007500D02*X339692Y2008250D01*
+X337442Y2007500D02*X338942D01*
+X336692Y2009000D02*X339692Y2012000D01*
+X341493Y2008250D02*X342243Y2007500D01*
+X341493Y2012750D02*Y2008250D01*
+Y2012750D02*X342243Y2013500D01*
+X343743D01*
+X344493Y2012750D01*
+Y2008250D01*
+X343743Y2007500D02*X344493Y2008250D01*
+X342243Y2007500D02*X343743D01*
+X341493Y2009000D02*X344493Y2012000D01*
+X349745Y2009750D02*Y2007500D01*
+Y2009750D02*X350495Y2010500D01*
+X351245D01*
+X351995Y2009750D01*
+Y2007500D01*
+Y2009750D02*X352745Y2010500D01*
+X353495D01*
+X354245Y2009750D01*
+Y2007500D01*
+X348995Y2010500D02*X349745Y2009750D01*
+X356046Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X357548Y2013500D02*Y2008250D01*
+X358298Y2007500D01*
+X360549D02*X362799D01*
+X363549Y2008250D01*
+X362799Y2009000D02*X363549Y2008250D01*
+X360549Y2009000D02*X362799D01*
+X359799Y2009750D02*X360549Y2009000D01*
+X359799Y2009750D02*X360549Y2010500D01*
+X362799D01*
+X363549Y2009750D01*
+X359799Y2008250D02*X360549Y2007500D01*
+X368051Y2010500D02*Y2008250D01*
+X368801Y2007500D01*
+X369551D01*
+X370301Y2008250D01*
+Y2010500D02*Y2008250D01*
+X371051Y2007500D01*
+X371801D01*
+X372551Y2008250D01*
+Y2010500D02*Y2008250D01*
+X374352Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X378854Y2013500D02*Y2007500D01*
+X378104D02*X378854Y2008250D01*
+X376604Y2007500D02*X378104D01*
+X375854Y2008250D02*X376604Y2007500D01*
+X375854Y2009750D02*Y2008250D01*
+Y2009750D02*X376604Y2010500D01*
+X378104D01*
+X378854Y2009750D01*
+X381405Y2007500D02*X383655D01*
+X380655Y2008250D02*X381405Y2007500D01*
+X380655Y2009750D02*Y2008250D01*
+Y2009750D02*X381405Y2010500D01*
+X382905D01*
+X383655Y2009750D01*
+X380655Y2009000D02*X383655D01*
+Y2009750D02*Y2009000D01*
+X385457Y2006000D02*X386957Y2007500D01*
+X391458Y2012750D02*X392208Y2013500D01*
+X394458D01*
+X395208Y2012750D01*
+Y2011250D01*
+X391458Y2007500D02*X395208Y2011250D01*
+X391458Y2007500D02*X395208D01*
+X397010Y2008250D02*X397760Y2007500D01*
+X397010Y2012750D02*Y2008250D01*
+Y2012750D02*X397760Y2013500D01*
+X399260D01*
+X400010Y2012750D01*
+Y2008250D01*
+X399260Y2007500D02*X400010Y2008250D01*
+X397760Y2007500D02*X399260D01*
+X397010Y2009000D02*X400010Y2012000D01*
+X401811Y2008250D02*X402561Y2007500D01*
+X401811Y2012750D02*Y2008250D01*
+Y2012750D02*X402561Y2013500D01*
+X404061D01*
+X404811Y2012750D01*
+Y2008250D01*
+X404061Y2007500D02*X404811Y2008250D01*
+X402561Y2007500D02*X404061D01*
+X401811Y2009000D02*X404811Y2012000D01*
+X406613Y2008250D02*X407363Y2007500D01*
+X406613Y2012750D02*Y2008250D01*
+Y2012750D02*X407363Y2013500D01*
+X408863D01*
+X409613Y2012750D01*
+Y2008250D01*
+X408863Y2007500D02*X409613Y2008250D01*
+X407363Y2007500D02*X408863D01*
+X406613Y2009000D02*X409613Y2012000D01*
+X411414Y2008250D02*X412164Y2007500D01*
+X411414Y2012750D02*Y2008250D01*
+Y2012750D02*X412164Y2013500D01*
+X413664D01*
+X414414Y2012750D01*
+Y2008250D01*
+X413664Y2007500D02*X414414Y2008250D01*
+X412164Y2007500D02*X413664D01*
+X411414Y2009000D02*X414414Y2012000D01*
+X416216Y2007500D02*X416966D01*
+X418767Y2008250D02*X419517Y2007500D01*
+X418767Y2012750D02*Y2008250D01*
+Y2012750D02*X419517Y2013500D01*
+X421017D01*
+X421767Y2012750D01*
+Y2008250D01*
+X421017Y2007500D02*X421767Y2008250D01*
+X419517Y2007500D02*X421017D01*
+X418767Y2009000D02*X421767Y2012000D01*
+X423569Y2008250D02*X424319Y2007500D01*
+X423569Y2012750D02*Y2008250D01*
+Y2012750D02*X424319Y2013500D01*
+X425819D01*
+X426569Y2012750D01*
+Y2008250D01*
+X425819Y2007500D02*X426569Y2008250D01*
+X424319Y2007500D02*X425819D01*
+X423569Y2009000D02*X426569Y2012000D01*
+X428370Y2008250D02*X429120Y2007500D01*
+X428370Y2012750D02*Y2008250D01*
+Y2012750D02*X429120Y2013500D01*
+X430620D01*
+X431370Y2012750D01*
+Y2008250D01*
+X430620Y2007500D02*X431370Y2008250D01*
+X429120Y2007500D02*X430620D01*
+X428370Y2009000D02*X431370Y2012000D01*
+X433172Y2008250D02*X433922Y2007500D01*
+X433172Y2012750D02*Y2008250D01*
+Y2012750D02*X433922Y2013500D01*
+X435422D01*
+X436172Y2012750D01*
+Y2008250D01*
+X435422Y2007500D02*X436172Y2008250D01*
+X433922Y2007500D02*X435422D01*
+X433172Y2009000D02*X436172Y2012000D01*
+X437973Y2008250D02*X438723Y2007500D01*
+X437973Y2012750D02*Y2008250D01*
+Y2012750D02*X438723Y2013500D01*
+X440223D01*
+X440973Y2012750D01*
+Y2008250D01*
+X440223Y2007500D02*X440973Y2008250D01*
+X438723Y2007500D02*X440223D01*
+X437973Y2009000D02*X440973Y2012000D01*
+X442775Y2008250D02*X443525Y2007500D01*
+X442775Y2012750D02*Y2008250D01*
+Y2012750D02*X443525Y2013500D01*
+X445025D01*
+X445775Y2012750D01*
+Y2008250D01*
+X445025Y2007500D02*X445775Y2008250D01*
+X443525Y2007500D02*X445025D01*
+X442775Y2009000D02*X445775Y2012000D01*
+X451026Y2009750D02*Y2007500D01*
+Y2009750D02*X451776Y2010500D01*
+X452526D01*
+X453276Y2009750D01*
+Y2007500D01*
+Y2009750D02*X454026Y2010500D01*
+X454776D01*
+X455526Y2009750D01*
+Y2007500D01*
+X450276Y2010500D02*X451026Y2009750D01*
+X457328Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X458829Y2013500D02*Y2008250D01*
+X459579Y2007500D01*
+X461831D02*X464081D01*
+X464831Y2008250D01*
+X464081Y2009000D02*X464831Y2008250D01*
+X461831Y2009000D02*X464081D01*
+X461081Y2009750D02*X461831Y2009000D01*
+X461081Y2009750D02*X461831Y2010500D01*
+X464081D01*
+X464831Y2009750D01*
+X461081Y2008250D02*X461831Y2007500D01*
+X469332Y2013500D02*Y2007500D01*
+Y2009750D02*X470082Y2010500D01*
+X471582D01*
+X472332Y2009750D01*
+Y2007500D01*
+X474134Y2012000D02*Y2011250D01*
+Y2009750D02*Y2007500D01*
+X477885Y2010500D02*X478635Y2009750D01*
+X476385Y2010500D02*X477885D01*
+X475635Y2009750D02*X476385Y2010500D01*
+X475635Y2009750D02*Y2008250D01*
+X476385Y2007500D01*
+X477885D01*
+X478635Y2008250D01*
+X475635Y2006000D02*X476385Y2005250D01*
+X477885D01*
+X478635Y2006000D01*
+Y2010500D02*Y2006000D01*
+X480437Y2013500D02*Y2007500D01*
+Y2009750D02*X481187Y2010500D01*
+X482687D01*
+X483437Y2009750D01*
+Y2007500D01*
+X1292034Y-9500D02*X1295034D01*
+X1295784Y-8750D01*
+Y-7250D02*Y-8750D01*
+X1295034Y-6500D02*X1295784Y-7250D01*
+X1292784Y-6500D02*X1295034D01*
+X1292784Y-3500D02*Y-9500D01*
+X1292034Y-3500D02*X1295034D01*
+X1295784Y-4250D01*
+Y-5750D01*
+X1295034Y-6500D02*X1295784Y-5750D01*
+X1297585Y-7250D02*Y-8750D01*
+Y-7250D02*X1298335Y-6500D01*
+X1299835D01*
+X1300585Y-7250D01*
+Y-8750D01*
+X1299835Y-9500D02*X1300585Y-8750D01*
+X1298335Y-9500D02*X1299835D01*
+X1297585Y-8750D02*X1298335Y-9500D01*
+X1304637Y-6500D02*X1305387Y-7250D01*
+X1303137Y-6500D02*X1304637D01*
+X1302387Y-7250D02*X1303137Y-6500D01*
+X1302387Y-7250D02*Y-8750D01*
+X1303137Y-9500D01*
+X1305387Y-6500D02*Y-8750D01*
+X1306137Y-9500D01*
+X1303137D02*X1304637D01*
+X1305387Y-8750D01*
+X1308688Y-7250D02*Y-9500D01*
+Y-7250D02*X1309438Y-6500D01*
+X1310938D01*
+X1307938D02*X1308688Y-7250D01*
+X1315740Y-3500D02*Y-9500D01*
+X1314990D02*X1315740Y-8750D01*
+X1313490Y-9500D02*X1314990D01*
+X1312740Y-8750D02*X1313490Y-9500D01*
+X1312740Y-7250D02*Y-8750D01*
+Y-7250D02*X1313490Y-6500D01*
+X1314990D01*
+X1315740Y-7250D01*
+X1320241D02*Y-8750D01*
+Y-7250D02*X1320991Y-6500D01*
+X1322491D01*
+X1323241Y-7250D01*
+Y-8750D01*
+X1322491Y-9500D02*X1323241Y-8750D01*
+X1320991Y-9500D02*X1322491D01*
+X1320241Y-8750D02*X1320991Y-9500D01*
+X1325043Y-6500D02*Y-8750D01*
+X1325793Y-9500D01*
+X1327293D01*
+X1328043Y-8750D01*
+Y-6500D02*Y-8750D01*
+X1330594Y-3500D02*Y-8750D01*
+X1331344Y-9500D01*
+X1329844Y-5750D02*X1331344D01*
+X1332846Y-3500D02*Y-8750D01*
+X1333596Y-9500D01*
+X1335097Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1337349Y-7250D02*Y-9500D01*
+Y-7250D02*X1338099Y-6500D01*
+X1338849D01*
+X1339599Y-7250D01*
+Y-9500D01*
+X1336599Y-6500D02*X1337349Y-7250D01*
+X1342150Y-9500D02*X1344400D01*
+X1341400Y-8750D02*X1342150Y-9500D01*
+X1341400Y-7250D02*Y-8750D01*
+Y-7250D02*X1342150Y-6500D01*
+X1343650D01*
+X1344400Y-7250D01*
+X1341400Y-8000D02*X1344400D01*
+Y-7250D02*Y-8000D01*
+X1348902Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1351153D02*X1353403D01*
+X1354153Y-8750D01*
+X1353403Y-8000D02*X1354153Y-8750D01*
+X1351153Y-8000D02*X1353403D01*
+X1350403Y-7250D02*X1351153Y-8000D01*
+X1350403Y-7250D02*X1351153Y-6500D01*
+X1353403D01*
+X1354153Y-7250D01*
+X1350403Y-8750D02*X1351153Y-9500D01*
+X1359405Y-3500D02*Y-8750D01*
+X1360155Y-9500D01*
+X1358655Y-5750D02*X1360155D01*
+X1361656Y-3500D02*Y-9500D01*
+Y-7250D02*X1362406Y-6500D01*
+X1363906D01*
+X1364656Y-7250D01*
+Y-9500D01*
+X1367208D02*X1369458D01*
+X1366458Y-8750D02*X1367208Y-9500D01*
+X1366458Y-7250D02*Y-8750D01*
+Y-7250D02*X1367208Y-6500D01*
+X1368708D01*
+X1369458Y-7250D01*
+X1366458Y-8000D02*X1369458D01*
+Y-7250D02*Y-8000D01*
+X1374709Y-6500D02*X1376959D01*
+X1373959Y-7250D02*X1374709Y-6500D01*
+X1373959Y-7250D02*Y-8750D01*
+X1374709Y-9500D01*
+X1376959D01*
+X1379511D02*X1381761D01*
+X1378761Y-8750D02*X1379511Y-9500D01*
+X1378761Y-7250D02*Y-8750D01*
+Y-7250D02*X1379511Y-6500D01*
+X1381011D01*
+X1381761Y-7250D01*
+X1378761Y-8000D02*X1381761D01*
+Y-7250D02*Y-8000D01*
+X1384312Y-7250D02*Y-9500D01*
+Y-7250D02*X1385062Y-6500D01*
+X1385812D01*
+X1386562Y-7250D01*
+Y-9500D01*
+X1383562Y-6500D02*X1384312Y-7250D01*
+X1389114Y-3500D02*Y-8750D01*
+X1389864Y-9500D01*
+X1388364Y-5750D02*X1389864D01*
+X1392115Y-9500D02*X1394365D01*
+X1391365Y-8750D02*X1392115Y-9500D01*
+X1391365Y-7250D02*Y-8750D01*
+Y-7250D02*X1392115Y-6500D01*
+X1393615D01*
+X1394365Y-7250D01*
+X1391365Y-8000D02*X1394365D01*
+Y-7250D02*Y-8000D01*
+X1396917Y-7250D02*Y-9500D01*
+Y-7250D02*X1397667Y-6500D01*
+X1399167D01*
+X1396167D02*X1396917Y-7250D01*
+X1400968Y-3500D02*Y-8750D01*
+X1401718Y-9500D01*
+X1403220Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1405471Y-7250D02*Y-9500D01*
+Y-7250D02*X1406221Y-6500D01*
+X1406971D01*
+X1407721Y-7250D01*
+Y-9500D01*
+X1404721Y-6500D02*X1405471Y-7250D01*
+X1410273Y-9500D02*X1412523D01*
+X1409523Y-8750D02*X1410273Y-9500D01*
+X1409523Y-7250D02*Y-8750D01*
+Y-7250D02*X1410273Y-6500D01*
+X1411773D01*
+X1412523Y-7250D01*
+X1409523Y-8000D02*X1412523D01*
+Y-7250D02*Y-8000D01*
+X1417024Y-7250D02*Y-8750D01*
+Y-7250D02*X1417774Y-6500D01*
+X1419274D01*
+X1420024Y-7250D01*
+Y-8750D01*
+X1419274Y-9500D02*X1420024Y-8750D01*
+X1417774Y-9500D02*X1419274D01*
+X1417024Y-8750D02*X1417774Y-9500D01*
+X1422576Y-4250D02*Y-9500D01*
+Y-4250D02*X1423326Y-3500D01*
+X1424076D01*
+X1421826Y-6500D02*X1423326D01*
+X1429027Y-3500D02*Y-8750D01*
+X1429777Y-9500D01*
+X1428277Y-5750D02*X1429777D01*
+X1431279Y-3500D02*Y-9500D01*
+Y-7250D02*X1432029Y-6500D01*
+X1433529D01*
+X1434279Y-7250D01*
+Y-9500D01*
+X1436080Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1438332D02*X1440582D01*
+X1441332Y-8750D01*
+X1440582Y-8000D02*X1441332Y-8750D01*
+X1438332Y-8000D02*X1440582D01*
+X1437582Y-7250D02*X1438332Y-8000D01*
+X1437582Y-7250D02*X1438332Y-6500D01*
+X1440582D01*
+X1441332Y-7250D01*
+X1437582Y-8750D02*X1438332Y-9500D01*
+X1445833Y-8750D02*X1446583Y-9500D01*
+X1445833Y-7250D02*Y-8750D01*
+Y-7250D02*X1446583Y-6500D01*
+X1448083D01*
+X1448833Y-7250D01*
+Y-8750D01*
+X1448083Y-9500D02*X1448833Y-8750D01*
+X1446583Y-9500D02*X1448083D01*
+X1445833Y-5750D02*X1446583Y-6500D01*
+X1445833Y-4250D02*Y-5750D01*
+Y-4250D02*X1446583Y-3500D01*
+X1448083D01*
+X1448833Y-4250D01*
+Y-5750D01*
+X1448083Y-6500D02*X1448833Y-5750D01*
+X1450635Y-9500D02*X1451385D01*
+X1453186Y-8750D02*X1453936Y-9500D01*
+X1453186Y-4250D02*Y-8750D01*
+Y-4250D02*X1453936Y-3500D01*
+X1455436D01*
+X1456186Y-4250D01*
+Y-8750D01*
+X1455436Y-9500D02*X1456186Y-8750D01*
+X1453936Y-9500D02*X1455436D01*
+X1453186Y-8000D02*X1456186Y-5000D01*
+X1457988Y-8750D02*X1458738Y-9500D01*
+X1457988Y-4250D02*Y-8750D01*
+Y-4250D02*X1458738Y-3500D01*
+X1460238D01*
+X1460988Y-4250D01*
+Y-8750D01*
+X1460238Y-9500D02*X1460988Y-8750D01*
+X1458738Y-9500D02*X1460238D01*
+X1457988Y-8000D02*X1460988Y-5000D01*
+X1462789Y-8750D02*X1463539Y-9500D01*
+X1462789Y-4250D02*Y-8750D01*
+Y-4250D02*X1463539Y-3500D01*
+X1465039D01*
+X1465789Y-4250D01*
+Y-8750D01*
+X1465039Y-9500D02*X1465789Y-8750D01*
+X1463539Y-9500D02*X1465039D01*
+X1462789Y-8000D02*X1465789Y-5000D01*
+X1467591Y-8750D02*X1468341Y-9500D01*
+X1467591Y-4250D02*Y-8750D01*
+Y-4250D02*X1468341Y-3500D01*
+X1469841D01*
+X1470591Y-4250D01*
+Y-8750D01*
+X1469841Y-9500D02*X1470591Y-8750D01*
+X1468341Y-9500D02*X1469841D01*
+X1467591Y-8000D02*X1470591Y-5000D01*
+X1472392Y-8750D02*X1473142Y-9500D01*
+X1472392Y-4250D02*Y-8750D01*
+Y-4250D02*X1473142Y-3500D01*
+X1474642D01*
+X1475392Y-4250D01*
+Y-8750D01*
+X1474642Y-9500D02*X1475392Y-8750D01*
+X1473142Y-9500D02*X1474642D01*
+X1472392Y-8000D02*X1475392Y-5000D01*
+X1477194Y-8750D02*X1477944Y-9500D01*
+X1477194Y-4250D02*Y-8750D01*
+Y-4250D02*X1477944Y-3500D01*
+X1479444D01*
+X1480194Y-4250D01*
+Y-8750D01*
+X1479444Y-9500D02*X1480194Y-8750D01*
+X1477944Y-9500D02*X1479444D01*
+X1477194Y-8000D02*X1480194Y-5000D01*
+X1485445Y-7250D02*Y-9500D01*
+Y-7250D02*X1486195Y-6500D01*
+X1486945D01*
+X1487695Y-7250D01*
+Y-9500D01*
+Y-7250D02*X1488445Y-6500D01*
+X1489195D01*
+X1489945Y-7250D01*
+Y-9500D01*
+X1484695Y-6500D02*X1485445Y-7250D01*
+X1491747Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1493248Y-3500D02*Y-8750D01*
+X1493998Y-9500D01*
+X1498950Y-7250D02*Y-9500D01*
+Y-7250D02*X1499700Y-6500D01*
+X1501200D01*
+X1498200D02*X1498950Y-7250D01*
+X1503751Y-9500D02*X1506001D01*
+X1503001Y-8750D02*X1503751Y-9500D01*
+X1503001Y-7250D02*Y-8750D01*
+Y-7250D02*X1503751Y-6500D01*
+X1505251D01*
+X1506001Y-7250D01*
+X1503001Y-8000D02*X1506001D01*
+Y-7250D02*Y-8000D01*
+X1508553Y-6500D02*X1510803D01*
+X1507803Y-7250D02*X1508553Y-6500D01*
+X1507803Y-7250D02*Y-8750D01*
+X1508553Y-9500D01*
+X1510803D01*
+X1513354Y-3500D02*Y-8750D01*
+X1514104Y-9500D01*
+X1512604Y-5750D02*X1514104D01*
+X1517856Y-6500D02*X1518606Y-7250D01*
+X1516356Y-6500D02*X1517856D01*
+X1515606Y-7250D02*X1516356Y-6500D01*
+X1515606Y-7250D02*Y-8750D01*
+X1516356Y-9500D01*
+X1518606Y-6500D02*Y-8750D01*
+X1519356Y-9500D01*
+X1516356D02*X1517856D01*
+X1518606Y-8750D01*
+X1521907Y-7250D02*Y-9500D01*
+Y-7250D02*X1522657Y-6500D01*
+X1523407D01*
+X1524157Y-7250D01*
+Y-9500D01*
+X1521157Y-6500D02*X1521907Y-7250D01*
+X1528209Y-6500D02*X1528959Y-7250D01*
+X1526709Y-6500D02*X1528209D01*
+X1525959Y-7250D02*X1526709Y-6500D01*
+X1525959Y-7250D02*Y-8750D01*
+X1526709Y-9500D01*
+X1528209D01*
+X1528959Y-8750D01*
+X1525959Y-11000D02*X1526709Y-11750D01*
+X1528209D01*
+X1528959Y-11000D01*
+Y-6500D02*Y-11000D01*
+X1530760Y-3500D02*Y-8750D01*
+X1531510Y-9500D01*
+X1533762D02*X1536012D01*
+X1533012Y-8750D02*X1533762Y-9500D01*
+X1533012Y-7250D02*Y-8750D01*
+Y-7250D02*X1533762Y-6500D01*
+X1535262D01*
+X1536012Y-7250D01*
+X1533012Y-8000D02*X1536012D01*
+Y-7250D02*Y-8000D01*
+X1540513Y-6500D02*X1543513D01*
+X1548015Y-8750D02*X1548765Y-9500D01*
+X1548015Y-4250D02*Y-8750D01*
+Y-4250D02*X1548765Y-3500D01*
+X1550265D01*
+X1551015Y-4250D01*
+Y-8750D01*
+X1550265Y-9500D02*X1551015Y-8750D01*
+X1548765Y-9500D02*X1550265D01*
+X1548015Y-8000D02*X1551015Y-5000D01*
+X1552816Y-11000D02*X1554316Y-9500D01*
+X1556118Y-8750D02*X1556868Y-9500D01*
+X1556118Y-4250D02*Y-8750D01*
+Y-4250D02*X1556868Y-3500D01*
+X1558368D01*
+X1559118Y-4250D01*
+Y-8750D01*
+X1558368Y-9500D02*X1559118Y-8750D01*
+X1556868Y-9500D02*X1558368D01*
+X1556118Y-8000D02*X1559118Y-5000D01*
+X1564369Y-3500D02*Y-8750D01*
+X1565119Y-9500D01*
+X1563619Y-5750D02*X1565119D01*
+X1566621Y-7250D02*Y-8750D01*
+Y-7250D02*X1567371Y-6500D01*
+X1568871D01*
+X1569621Y-7250D01*
+Y-8750D01*
+X1568871Y-9500D02*X1569621Y-8750D01*
+X1567371Y-9500D02*X1568871D01*
+X1566621Y-8750D02*X1567371Y-9500D01*
+X1574122Y-4250D02*X1574872Y-3500D01*
+X1576372D01*
+X1577122Y-4250D01*
+Y-8750D01*
+X1576372Y-9500D02*X1577122Y-8750D01*
+X1574872Y-9500D02*X1576372D01*
+X1574122Y-8750D02*X1574872Y-9500D01*
+Y-6500D02*X1577122D01*
+X1578924Y-8750D02*X1579674Y-9500D01*
+X1578924Y-4250D02*Y-8750D01*
+Y-4250D02*X1579674Y-3500D01*
+X1581174D01*
+X1581924Y-4250D01*
+Y-8750D01*
+X1581174Y-9500D02*X1581924Y-8750D01*
+X1579674Y-9500D02*X1581174D01*
+X1578924Y-8000D02*X1581924Y-5000D01*
+X1583725Y-8750D02*X1584475Y-9500D01*
+X1583725Y-4250D02*Y-8750D01*
+Y-4250D02*X1584475Y-3500D01*
+X1585975D01*
+X1586725Y-4250D01*
+Y-8750D01*
+X1585975Y-9500D02*X1586725Y-8750D01*
+X1584475Y-9500D02*X1585975D01*
+X1583725Y-8000D02*X1586725Y-5000D01*
+X1588527Y-8750D02*X1589277Y-9500D01*
+X1588527Y-4250D02*Y-8750D01*
+Y-4250D02*X1589277Y-3500D01*
+X1590777D01*
+X1591527Y-4250D01*
+Y-8750D01*
+X1590777Y-9500D02*X1591527Y-8750D01*
+X1589277Y-9500D02*X1590777D01*
+X1588527Y-8000D02*X1591527Y-5000D01*
+X1593328Y-8750D02*X1594078Y-9500D01*
+X1593328Y-4250D02*Y-8750D01*
+Y-4250D02*X1594078Y-3500D01*
+X1595578D01*
+X1596328Y-4250D01*
+Y-8750D01*
+X1595578Y-9500D02*X1596328Y-8750D01*
+X1594078Y-9500D02*X1595578D01*
+X1593328Y-8000D02*X1596328Y-5000D01*
+X1598130Y-9500D02*X1598880D01*
+X1600681Y-8750D02*X1601431Y-9500D01*
+X1600681Y-4250D02*Y-8750D01*
+Y-4250D02*X1601431Y-3500D01*
+X1602931D01*
+X1603681Y-4250D01*
+Y-8750D01*
+X1602931Y-9500D02*X1603681Y-8750D01*
+X1601431Y-9500D02*X1602931D01*
+X1600681Y-8000D02*X1603681Y-5000D01*
+X1605483Y-8750D02*X1606233Y-9500D01*
+X1605483Y-4250D02*Y-8750D01*
+Y-4250D02*X1606233Y-3500D01*
+X1607733D01*
+X1608483Y-4250D01*
+Y-8750D01*
+X1607733Y-9500D02*X1608483Y-8750D01*
+X1606233Y-9500D02*X1607733D01*
+X1605483Y-8000D02*X1608483Y-5000D01*
+X1610284Y-8750D02*X1611034Y-9500D01*
+X1610284Y-4250D02*Y-8750D01*
+Y-4250D02*X1611034Y-3500D01*
+X1612534D01*
+X1613284Y-4250D01*
+Y-8750D01*
+X1612534Y-9500D02*X1613284Y-8750D01*
+X1611034Y-9500D02*X1612534D01*
+X1610284Y-8000D02*X1613284Y-5000D01*
+X1615086Y-8750D02*X1615836Y-9500D01*
+X1615086Y-4250D02*Y-8750D01*
+Y-4250D02*X1615836Y-3500D01*
+X1617336D01*
+X1618086Y-4250D01*
+Y-8750D01*
+X1617336Y-9500D02*X1618086Y-8750D01*
+X1615836Y-9500D02*X1617336D01*
+X1615086Y-8000D02*X1618086Y-5000D01*
+X1619887Y-8750D02*X1620637Y-9500D01*
+X1619887Y-4250D02*Y-8750D01*
+Y-4250D02*X1620637Y-3500D01*
+X1622137D01*
+X1622887Y-4250D01*
+Y-8750D01*
+X1622137Y-9500D02*X1622887Y-8750D01*
+X1620637Y-9500D02*X1622137D01*
+X1619887Y-8000D02*X1622887Y-5000D01*
+X1624689Y-8750D02*X1625439Y-9500D01*
+X1624689Y-4250D02*Y-8750D01*
+Y-4250D02*X1625439Y-3500D01*
+X1626939D01*
+X1627689Y-4250D01*
+Y-8750D01*
+X1626939Y-9500D02*X1627689Y-8750D01*
+X1625439Y-9500D02*X1626939D01*
+X1624689Y-8000D02*X1627689Y-5000D01*
+X1629490Y-11000D02*X1630990Y-9500D01*
+X1632792Y-4250D02*X1633542Y-3500D01*
+X1635792D01*
+X1636542Y-4250D01*
+Y-5750D01*
+X1632792Y-9500D02*X1636542Y-5750D01*
+X1632792Y-9500D02*X1636542D01*
+X1638343Y-8750D02*X1639093Y-9500D01*
+X1638343Y-4250D02*Y-8750D01*
+Y-4250D02*X1639093Y-3500D01*
+X1640593D01*
+X1641343Y-4250D01*
+Y-8750D01*
+X1640593Y-9500D02*X1641343Y-8750D01*
+X1639093Y-9500D02*X1640593D01*
+X1638343Y-8000D02*X1641343Y-5000D01*
+X1643145Y-8750D02*X1643895Y-9500D01*
+X1643145Y-4250D02*Y-8750D01*
+Y-4250D02*X1643895Y-3500D01*
+X1645395D01*
+X1646145Y-4250D01*
+Y-8750D01*
+X1645395Y-9500D02*X1646145Y-8750D01*
+X1643895Y-9500D02*X1645395D01*
+X1643145Y-8000D02*X1646145Y-5000D01*
+X1647946Y-8750D02*X1648696Y-9500D01*
+X1647946Y-4250D02*Y-8750D01*
+Y-4250D02*X1648696Y-3500D01*
+X1650196D01*
+X1650946Y-4250D01*
+Y-8750D01*
+X1650196Y-9500D02*X1650946Y-8750D01*
+X1648696Y-9500D02*X1650196D01*
+X1647946Y-8000D02*X1650946Y-5000D01*
+X1652748Y-8750D02*X1653498Y-9500D01*
+X1652748Y-4250D02*Y-8750D01*
+Y-4250D02*X1653498Y-3500D01*
+X1654998D01*
+X1655748Y-4250D01*
+Y-8750D01*
+X1654998Y-9500D02*X1655748Y-8750D01*
+X1653498Y-9500D02*X1654998D01*
+X1652748Y-8000D02*X1655748Y-5000D01*
+X1657549Y-9500D02*X1658299D01*
+X1660101Y-8750D02*X1660851Y-9500D01*
+X1660101Y-4250D02*Y-8750D01*
+Y-4250D02*X1660851Y-3500D01*
+X1662351D01*
+X1663101Y-4250D01*
+Y-8750D01*
+X1662351Y-9500D02*X1663101Y-8750D01*
+X1660851Y-9500D02*X1662351D01*
+X1660101Y-8000D02*X1663101Y-5000D01*
+X1664902Y-8750D02*X1665652Y-9500D01*
+X1664902Y-4250D02*Y-8750D01*
+Y-4250D02*X1665652Y-3500D01*
+X1667152D01*
+X1667902Y-4250D01*
+Y-8750D01*
+X1667152Y-9500D02*X1667902Y-8750D01*
+X1665652Y-9500D02*X1667152D01*
+X1664902Y-8000D02*X1667902Y-5000D01*
+X1669704Y-8750D02*X1670454Y-9500D01*
+X1669704Y-4250D02*Y-8750D01*
+Y-4250D02*X1670454Y-3500D01*
+X1671954D01*
+X1672704Y-4250D01*
+Y-8750D01*
+X1671954Y-9500D02*X1672704Y-8750D01*
+X1670454Y-9500D02*X1671954D01*
+X1669704Y-8000D02*X1672704Y-5000D01*
+X1674505Y-8750D02*X1675255Y-9500D01*
+X1674505Y-4250D02*Y-8750D01*
+Y-4250D02*X1675255Y-3500D01*
+X1676755D01*
+X1677505Y-4250D01*
+Y-8750D01*
+X1676755Y-9500D02*X1677505Y-8750D01*
+X1675255Y-9500D02*X1676755D01*
+X1674505Y-8000D02*X1677505Y-5000D01*
+X1679307Y-8750D02*X1680057Y-9500D01*
+X1679307Y-4250D02*Y-8750D01*
+Y-4250D02*X1680057Y-3500D01*
+X1681557D01*
+X1682307Y-4250D01*
+Y-8750D01*
+X1681557Y-9500D02*X1682307Y-8750D01*
+X1680057Y-9500D02*X1681557D01*
+X1679307Y-8000D02*X1682307Y-5000D01*
+X1684108Y-8750D02*X1684858Y-9500D01*
+X1684108Y-4250D02*Y-8750D01*
+Y-4250D02*X1684858Y-3500D01*
+X1686358D01*
+X1687108Y-4250D01*
+Y-8750D01*
+X1686358Y-9500D02*X1687108Y-8750D01*
+X1684858Y-9500D02*X1686358D01*
+X1684108Y-8000D02*X1687108Y-5000D01*
+X1692360Y-7250D02*Y-9500D01*
+Y-7250D02*X1693110Y-6500D01*
+X1693860D01*
+X1694610Y-7250D01*
+Y-9500D01*
+Y-7250D02*X1695360Y-6500D01*
+X1696110D01*
+X1696860Y-7250D01*
+Y-9500D01*
+X1691610Y-6500D02*X1692360Y-7250D01*
+X1698661Y-5000D02*Y-5750D01*
+Y-7250D02*Y-9500D01*
+X1700163Y-3500D02*Y-8750D01*
+X1700913Y-9500D01*
+X1703164D02*X1705414D01*
+X1706164Y-8750D01*
+X1705414Y-8000D02*X1706164Y-8750D01*
+X1703164Y-8000D02*X1705414D01*
+X1702414Y-7250D02*X1703164Y-8000D01*
+X1702414Y-7250D02*X1703164Y-6500D01*
+X1705414D01*
+X1706164Y-7250D01*
+X1702414Y-8750D02*X1703164Y-9500D01*
+X200750Y2028500D02*Y2022500D01*
+X203000Y2028500D02*X203750Y2027750D01*
+Y2023250D01*
+X203000Y2022500D02*X203750Y2023250D01*
+X200000Y2022500D02*X203000D01*
+X200000Y2028500D02*X203000D01*
+X207801Y2025500D02*X208551Y2024750D01*
+X206301Y2025500D02*X207801D01*
+X205551Y2024750D02*X206301Y2025500D01*
+X205551Y2024750D02*Y2023250D01*
+X206301Y2022500D01*
+X208551Y2025500D02*Y2023250D01*
+X209301Y2022500D01*
+X206301D02*X207801D01*
+X208551Y2023250D01*
+X211853Y2028500D02*Y2023250D01*
+X212603Y2022500D01*
+X211103Y2026250D02*X212603D01*
+X214854Y2022500D02*X217104D01*
+X214104Y2023250D02*X214854Y2022500D01*
+X214104Y2024750D02*Y2023250D01*
+Y2024750D02*X214854Y2025500D01*
+X216354D01*
+X217104Y2024750D01*
+X214104Y2024000D02*X217104D01*
+Y2024750D02*Y2024000D01*
+X218906Y2026250D02*X219656D01*
+X218906Y2024750D02*X219656D01*
+X224157Y2028500D02*Y2022500D01*
+Y2028500D02*X227157D01*
+X224157Y2025500D02*X226407D01*
+X229709Y2024750D02*Y2022500D01*
+Y2024750D02*X230459Y2025500D01*
+X231959D01*
+X228959D02*X229709Y2024750D01*
+X233760Y2027000D02*Y2026250D01*
+Y2024750D02*Y2022500D01*
+X237962Y2028500D02*X240212D01*
+Y2023250D01*
+X239462Y2022500D02*X240212Y2023250D01*
+X238712Y2022500D02*X239462D01*
+X237962Y2023250D02*X238712Y2022500D01*
+X242013Y2025500D02*Y2023250D01*
+X242763Y2022500D01*
+X244263D01*
+X245013Y2023250D01*
+Y2025500D02*Y2023250D01*
+X247565Y2024750D02*Y2022500D01*
+Y2024750D02*X248315Y2025500D01*
+X249065D01*
+X249815Y2024750D01*
+Y2022500D01*
+X246815Y2025500D02*X247565Y2024750D01*
+X255066Y2022500D02*X256566D01*
+X255816Y2028500D02*Y2022500D01*
+X254316Y2027000D02*X255816Y2028500D01*
+X258368Y2022500D02*X262118Y2026250D01*
+Y2028500D02*Y2026250D01*
+X258368Y2028500D02*X262118D01*
+X266619Y2023250D02*X267369Y2022500D01*
+X266619Y2027750D02*Y2023250D01*
+Y2027750D02*X267369Y2028500D01*
+X268869D01*
+X269619Y2027750D01*
+Y2023250D01*
+X268869Y2022500D02*X269619Y2023250D01*
+X267369Y2022500D02*X268869D01*
+X266619Y2024000D02*X269619Y2027000D01*
+X271421Y2027750D02*X272171Y2028500D01*
+X273671D01*
+X274421Y2027750D01*
+Y2023250D01*
+X273671Y2022500D02*X274421Y2023250D01*
+X272171Y2022500D02*X273671D01*
+X271421Y2023250D02*X272171Y2022500D01*
+Y2025500D02*X274421D01*
+X276222Y2026250D02*X276972D01*
+X276222Y2024750D02*X276972D01*
+X279524Y2022500D02*X281024D01*
+X280274Y2028500D02*Y2022500D01*
+X278774Y2027000D02*X280274Y2028500D01*
+X282825Y2023250D02*X283575Y2022500D01*
+X282825Y2024750D02*Y2023250D01*
+Y2024750D02*X283575Y2025500D01*
+X285075D01*
+X285825Y2024750D01*
+Y2023250D01*
+X285075Y2022500D02*X285825Y2023250D01*
+X283575Y2022500D02*X285075D01*
+X282825Y2026250D02*X283575Y2025500D01*
+X282825Y2027750D02*Y2026250D01*
+Y2027750D02*X283575Y2028500D01*
+X285075D01*
+X285825Y2027750D01*
+Y2026250D01*
+X285075Y2025500D02*X285825Y2026250D01*
+X287627D02*X288377D01*
+X287627Y2024750D02*X288377D01*
+X290178Y2028500D02*X293178D01*
+X290178D02*Y2025500D01*
+X290928Y2026250D01*
+X292428D01*
+X293178Y2025500D01*
+Y2023250D01*
+X292428Y2022500D02*X293178Y2023250D01*
+X290928Y2022500D02*X292428D01*
+X290178Y2023250D02*X290928Y2022500D01*
+X295730D02*X297230D01*
+X296480Y2028500D02*Y2022500D01*
+X294980Y2027000D02*X296480Y2028500D01*
+X301731Y2027750D02*X302481Y2028500D01*
+X304731D01*
+X305481Y2027750D01*
+Y2026250D01*
+X301731Y2022500D02*X305481Y2026250D01*
+X301731Y2022500D02*X305481D01*
+X307283Y2023250D02*X308033Y2022500D01*
+X307283Y2027750D02*Y2023250D01*
+Y2027750D02*X308033Y2028500D01*
+X309533D01*
+X310283Y2027750D01*
+Y2023250D01*
+X309533Y2022500D02*X310283Y2023250D01*
+X308033Y2022500D02*X309533D01*
+X307283Y2024000D02*X310283Y2027000D01*
+X312834Y2022500D02*X314334D01*
+X313584Y2028500D02*Y2022500D01*
+X312084Y2027000D02*X313584Y2028500D01*
+X316886Y2022500D02*X318386D01*
+X317636Y2028500D02*Y2022500D01*
+X316136Y2027000D02*X317636Y2028500D01*
+X322887D02*Y2023250D01*
+X323637Y2022500D01*
+X325137D01*
+X325887Y2023250D01*
+Y2028500D02*Y2023250D01*
+X327689Y2028500D02*X330689D01*
+X329189D02*Y2022500D01*
+X333240D02*X335490D01*
+X332490Y2023250D02*X333240Y2022500D01*
+X332490Y2027750D02*Y2023250D01*
+Y2027750D02*X333240Y2028500D01*
+X335490D01*
+X200000Y2042750D02*Y2037500D01*
+Y2042750D02*X200750Y2043500D01*
+X203000D01*
+X203750Y2042750D01*
+Y2037500D01*
+X200000Y2040500D02*X203750D01*
+X205551D02*Y2038250D01*
+X206301Y2037500D01*
+X207801D01*
+X208551Y2038250D01*
+Y2040500D02*Y2038250D01*
+X211103Y2043500D02*Y2038250D01*
+X211853Y2037500D01*
+X210353Y2041250D02*X211853D01*
+X213354Y2043500D02*Y2037500D01*
+Y2039750D02*X214104Y2040500D01*
+X215604D01*
+X216354Y2039750D01*
+Y2037500D01*
+X218156Y2039750D02*Y2038250D01*
+Y2039750D02*X218906Y2040500D01*
+X220406D01*
+X221156Y2039750D01*
+Y2038250D01*
+X220406Y2037500D02*X221156Y2038250D01*
+X218906Y2037500D02*X220406D01*
+X218156Y2038250D02*X218906Y2037500D01*
+X223707Y2039750D02*Y2037500D01*
+Y2039750D02*X224457Y2040500D01*
+X225957D01*
+X222957D02*X223707Y2039750D01*
+X227759Y2041250D02*X228509D01*
+X227759Y2039750D02*X228509D01*
+X233010Y2043500D02*Y2037500D01*
+Y2043500D02*X236010D01*
+X233010Y2040500D02*X235260D01*
+X240062D02*X240812Y2039750D01*
+X238562Y2040500D02*X240062D01*
+X237812Y2039750D02*X238562Y2040500D01*
+X237812Y2039750D02*Y2038250D01*
+X238562Y2037500D01*
+X240812Y2040500D02*Y2038250D01*
+X241562Y2037500D01*
+X238562D02*X240062D01*
+X240812Y2038250D01*
+X243363Y2043500D02*Y2037500D01*
+Y2038250D02*X244113Y2037500D01*
+X245613D01*
+X246363Y2038250D01*
+Y2039750D02*Y2038250D01*
+X245613Y2040500D02*X246363Y2039750D01*
+X244113Y2040500D02*X245613D01*
+X243363Y2039750D02*X244113Y2040500D01*
+X248165Y2037500D02*X251165D01*
+X252966Y2042750D02*Y2037500D01*
+Y2042750D02*X253716Y2043500D01*
+X255966D01*
+X256716Y2042750D01*
+Y2037500D01*
+X252966Y2040500D02*X256716D01*
+X258518D02*Y2038250D01*
+X259268Y2037500D01*
+X260768D01*
+X261518Y2038250D01*
+Y2040500D02*Y2038250D01*
+X264069Y2043500D02*Y2038250D01*
+X264819Y2037500D01*
+X263319Y2041250D02*X264819D01*
+X266321Y2043500D02*Y2037500D01*
+Y2039750D02*X267071Y2040500D01*
+X268571D01*
+X269321Y2039750D01*
+Y2037500D01*
+X271122Y2039750D02*Y2038250D01*
+Y2039750D02*X271872Y2040500D01*
+X273372D01*
+X274122Y2039750D01*
+Y2038250D01*
+X273372Y2037500D02*X274122Y2038250D01*
+X271872Y2037500D02*X273372D01*
+X271122Y2038250D02*X271872Y2037500D01*
+X276674Y2039750D02*Y2037500D01*
+Y2039750D02*X277424Y2040500D01*
+X278924D01*
+X275924D02*X276674Y2039750D01*
+X200000Y2058500D02*X203000D01*
+X201500D02*Y2052500D01*
+X204801Y2057000D02*Y2056250D01*
+Y2054750D02*Y2052500D01*
+X207053Y2058500D02*Y2053250D01*
+X207803Y2052500D01*
+X206303Y2056250D02*X207803D01*
+X209304Y2058500D02*Y2053250D01*
+X210054Y2052500D01*
+X212306D02*X214556D01*
+X211556Y2053250D02*X212306Y2052500D01*
+X211556Y2054750D02*Y2053250D01*
+Y2054750D02*X212306Y2055500D01*
+X213806D01*
+X214556Y2054750D01*
+X211556Y2054000D02*X214556D01*
+Y2054750D02*Y2054000D01*
+X216357Y2056250D02*X217107D01*
+X216357Y2054750D02*X217107D01*
+X221609Y2053250D02*X222359Y2052500D01*
+X221609Y2057750D02*X222359Y2058500D01*
+X221609Y2057750D02*Y2053250D01*
+X224160Y2055500D02*Y2053250D01*
+X224910Y2052500D01*
+X226410D01*
+X227160Y2053250D01*
+Y2055500D02*Y2053250D01*
+X229712Y2054750D02*Y2052500D01*
+Y2054750D02*X230462Y2055500D01*
+X231212D01*
+X231962Y2054750D01*
+Y2052500D01*
+X228962Y2055500D02*X229712Y2054750D01*
+X233763Y2058500D02*Y2052500D01*
+Y2054750D02*X236013Y2052500D01*
+X233763Y2054750D02*X235263Y2056250D01*
+X238565Y2054750D02*Y2052500D01*
+Y2054750D02*X239315Y2055500D01*
+X240065D01*
+X240815Y2054750D01*
+Y2052500D01*
+X237815Y2055500D02*X238565Y2054750D01*
+X242616D02*Y2053250D01*
+Y2054750D02*X243366Y2055500D01*
+X244866D01*
+X245616Y2054750D01*
+Y2053250D01*
+X244866Y2052500D02*X245616Y2053250D01*
+X243366Y2052500D02*X244866D01*
+X242616Y2053250D02*X243366Y2052500D01*
+X247418Y2055500D02*Y2053250D01*
+X248168Y2052500D01*
+X248918D01*
+X249668Y2053250D01*
+Y2055500D02*Y2053250D01*
+X250418Y2052500D01*
+X251168D01*
+X251918Y2053250D01*
+Y2055500D02*Y2053250D01*
+X254469Y2054750D02*Y2052500D01*
+Y2054750D02*X255219Y2055500D01*
+X255969D01*
+X256719Y2054750D01*
+Y2052500D01*
+X253719Y2055500D02*X254469Y2054750D01*
+X258521Y2058500D02*X259271Y2057750D01*
+Y2053250D01*
+X258521Y2052500D02*X259271Y2053250D01*
+X263772Y2055500D02*X266772D01*
+X271274Y2058500D02*Y2052500D01*
+Y2058500D02*X274274D01*
+X271274Y2055500D02*X273524D01*
+X278325D02*X279075Y2054750D01*
+X276825Y2055500D02*X278325D01*
+X276075Y2054750D02*X276825Y2055500D01*
+X276075Y2054750D02*Y2053250D01*
+X276825Y2052500D01*
+X279075Y2055500D02*Y2053250D01*
+X279825Y2052500D01*
+X276825D02*X278325D01*
+X279075Y2053250D01*
+X281627Y2058500D02*Y2052500D01*
+Y2053250D02*X282377Y2052500D01*
+X283877D01*
+X284627Y2053250D01*
+Y2054750D02*Y2053250D01*
+X283877Y2055500D02*X284627Y2054750D01*
+X282377Y2055500D02*X283877D01*
+X281627Y2054750D02*X282377Y2055500D01*
+X287178Y2054750D02*Y2052500D01*
+Y2054750D02*X287928Y2055500D01*
+X289428D01*
+X286428D02*X287178Y2054750D01*
+X291230Y2057000D02*Y2056250D01*
+Y2054750D02*Y2052500D01*
+X293481Y2055500D02*X295731D01*
+X292731Y2054750D02*X293481Y2055500D01*
+X292731Y2054750D02*Y2053250D01*
+X293481Y2052500D01*
+X295731D01*
+X299783Y2055500D02*X300533Y2054750D01*
+X298283Y2055500D02*X299783D01*
+X297533Y2054750D02*X298283Y2055500D01*
+X297533Y2054750D02*Y2053250D01*
+X298283Y2052500D01*
+X300533Y2055500D02*Y2053250D01*
+X301283Y2052500D01*
+X298283D02*X299783D01*
+X300533Y2053250D01*
+X303834Y2058500D02*Y2053250D01*
+X304584Y2052500D01*
+X303084Y2056250D02*X304584D01*
+X306086Y2057000D02*Y2056250D01*
+Y2054750D02*Y2052500D01*
+X307587Y2054750D02*Y2053250D01*
+Y2054750D02*X308337Y2055500D01*
+X309837D01*
+X310587Y2054750D01*
+Y2053250D01*
+X309837Y2052500D02*X310587Y2053250D01*
+X308337Y2052500D02*X309837D01*
+X307587Y2053250D02*X308337Y2052500D01*
+X313139Y2054750D02*Y2052500D01*
+Y2054750D02*X313889Y2055500D01*
+X314639D01*
+X315389Y2054750D01*
+Y2052500D01*
+X312389Y2055500D02*X313139Y2054750D01*
+X320640Y2058500D02*Y2052500D01*
+X322890Y2058500D02*X323640Y2057750D01*
+Y2053250D01*
+X322890Y2052500D02*X323640Y2053250D01*
+X319890Y2052500D02*X322890D01*
+X319890Y2058500D02*X322890D01*
+X326192Y2054750D02*Y2052500D01*
+Y2054750D02*X326942Y2055500D01*
+X328442D01*
+X325442D02*X326192Y2054750D01*
+X332493Y2055500D02*X333243Y2054750D01*
+X330993Y2055500D02*X332493D01*
+X330243Y2054750D02*X330993Y2055500D01*
+X330243Y2054750D02*Y2053250D01*
+X330993Y2052500D01*
+X333243Y2055500D02*Y2053250D01*
+X333993Y2052500D01*
+X330993D02*X332493D01*
+X333243Y2053250D01*
+X335795Y2055500D02*Y2053250D01*
+X336545Y2052500D01*
+X337295D01*
+X338045Y2053250D01*
+Y2055500D02*Y2053250D01*
+X338795Y2052500D01*
+X339545D01*
+X340295Y2053250D01*
+Y2055500D02*Y2053250D01*
+X342096Y2057000D02*Y2056250D01*
+Y2054750D02*Y2052500D01*
+X344348Y2054750D02*Y2052500D01*
+Y2054750D02*X345098Y2055500D01*
+X345848D01*
+X346598Y2054750D01*
+Y2052500D01*
+X343598Y2055500D02*X344348Y2054750D01*
+X350649Y2055500D02*X351399Y2054750D01*
+X349149Y2055500D02*X350649D01*
+X348399Y2054750D02*X349149Y2055500D01*
+X348399Y2054750D02*Y2053250D01*
+X349149Y2052500D01*
+X350649D01*
+X351399Y2053250D01*
+X348399Y2051000D02*X349149Y2050250D01*
+X350649D01*
+X351399Y2051000D01*
+Y2055500D02*Y2051000D01*
+M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group11.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group11.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group11.gbr	(revision 18980)
@@ -0,0 +1,48 @@
+G04 start of page 4 for group 4 idx 4 *
+G04 Title: (unknown), power *
+G04 Creator: pcb 1.99z *
+G04 CreationDate: Fri Jun 17 03:18:51 2011 UTC *
+G04 For: apoelstra *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 3000000 2000000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP4*%
+%ADD27C,0.5000*%
+%ADD26C,1.0000*%
+%ADD25C,0.6500*%
+%ADD24C,0.7500*%
+%ADD23C,0.2500*%
+G54D23*X1300000Y630000D02*X1302367Y604884D01*
+X1309462Y579867D01*
+X1321255Y555048D01*
+X1337700Y530525D01*
+X1358732Y506394D01*
+X1384268Y482751D01*
+X1414207Y459689D01*
+X1448431Y437299D01*
+X1486806Y415670D01*
+X1529179Y394886D01*
+X1575384Y375031D01*
+X1625237Y356182D01*
+X1678543Y338413D01*
+X1735091Y321795D01*
+X1794657Y306394D01*
+X1857007Y292269D01*
+X1921895Y279478D01*
+X1989064Y268070D01*
+X2058250Y258090D01*
+X2129179Y249578D01*
+X2201572Y242567D01*
+X2275142Y237086D01*
+X2349600Y233155D01*
+X2424651Y230790D01*
+X2499999Y230000D01*
+G54D24*X600000Y450000D03*
+G54D25*Y290000D03*
+G54D26*X450000Y600000D03*
+X600000D03*
+G54D25*X450000Y290000D03*
+G54D24*Y450000D03*
+G54D27*G54D23*G54D27*G54D23*G54D27*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group5.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group5.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.group5.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 3 for group 1 idx 1 *
+G04 Title: (unknown), ground *
+G04 Creator: pcb 1.99z *
+G04 CreationDate: Fri Jun 17 03:18:51 2011 UTC *
+G04 For: apoelstra *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 3000000 2000000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNGROUP1*%
+%ADD22C,0.6500*%
+%ADD21C,0.7500*%
+%ADD20C,1.0000*%
+%ADD19C,0.5000*%
+%ADD18C,0.2500*%
+%ADD17C,0.1000*%
+G54D17*X1497000Y1791000D02*G75*G03X2430000Y858000I933000J0D01*G01*
+G54D18*X1861000Y1776000D02*G75*G02X2415000Y1222000I0J-554000D01*G01*
+G54D19*X1845000Y1608000D02*G75*G02X2203000Y1250000I0J-358000D01*G01*
+G54D20*X1845000Y1455000D02*G75*G02X2029000Y1271000I0J-184000D01*G01*
+G54D21*X600000Y450000D03*
+G54D22*Y290000D03*
+G54D20*X450000Y600000D03*
+X600000D03*
+G54D22*X450000Y290000D03*
+G54D21*Y450000D03*
+G54D19*G54D18*G54D19*G54D18*G54D19*M02*
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.plated-drill.cnc
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.plated-drill.cnc	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.plated-drill.cnc	(revision 18980)
@@ -0,0 +1,14 @@
+M48
+INCH
+T37C0.250
+T36C0.500
+%
+T37
+X060000Y029000
+X045000Y029000
+T36
+X060000Y045000
+X045000Y060000
+X060000Y060000
+X045000Y045000
+M30
Index: tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.top.gbr
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.top.gbr	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_gerber3/arcs.top.gbr	(revision 18980)
@@ -0,0 +1,28 @@
+G04 start of page 2 for group 0 idx 0 *
+G04 Title: (unknown), top *
+G04 Creator: pcb 1.99z *
+G04 CreationDate: Fri Jun 17 03:18:51 2011 UTC *
+G04 For: apoelstra *
+G04 Format: Gerber/RS-274X *
+G04 PCB-Dimensions: 3000000 2000000 *
+G04 PCB-Coordinate-Origin: lower left *
+%MOIN*%
+%FSLAX25Y25*%
+%LNTOP*%
+%ADD16C,0.2500*%
+%ADD15C,0.5000*%
+%ADD14C,1.0000*%
+%ADD13C,0.6500*%
+%ADD12C,0.7500*%
+%ADD11C,0.0100*%
+G54D11*X1266000Y1791000D02*G75*G02X775000Y1300000I-491000J0D01*G01*
+X772000Y1303000D02*G75*G03X286000Y817000I0J-486000D01*G01*
+X285999D02*G75*G03X772000Y1303000I0J486000D01*G01*
+X775000Y1300000D02*G75*G02X1266000Y1791000I491000J0D01*G01*
+G54D12*X600000Y450000D03*
+G54D13*Y290000D03*
+G54D14*X450000Y600000D03*
+X600000D03*
+G54D13*X450000Y290000D03*
+G54D12*Y450000D03*
+G54D15*G54D16*G54D15*G54D16*G54D15*M02*
Index: tags/2.0.1/tests/orig/golden/hid_png1/gerber_oneline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/orig/golden/hid_png1/gerber_oneline.png
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_png1/gerber_oneline.png	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_png1/gerber_oneline.png	(revision 18980)

Property changes on: tags/2.0.1/tests/orig/golden/hid_png1/gerber_oneline.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/orig/golden/hid_png2/myfile.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/orig/golden/hid_png2/myfile.png
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_png2/myfile.png	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_png2/myfile.png	(revision 18980)

Property changes on: tags/2.0.1/tests/orig/golden/hid_png2/myfile.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/orig/golden/hid_png3/gerber_oneline.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tags/2.0.1/tests/orig/golden/hid_png3/gerber_oneline.png
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_png3/gerber_oneline.png	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_png3/gerber_oneline.png	(revision 18980)

Property changes on: tags/2.0.1/tests/orig/golden/hid_png3/gerber_oneline.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: tags/2.0.1/tests/orig/golden/hid_xy1/bom_general.xy
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_xy1/bom_general.xy	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_xy1/bom_general.xy	(revision 18980)
@@ -0,0 +1,32 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: Wed Jun 24 21:42:21 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mils.  rotation in degrees.
+# --------------------------------------------
+R90_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,4300.00,90,top
+R180_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,4300.00,180,top
+R270_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,4300.00,270,top
+R0_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,4300.00,0,top
+UDIP90_TOP,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,1450.00,180,top
+UDIP180_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,1450.00,270,top
+UDIP270_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,1450.00,0,top
+UDIP0_TOP,"Dual in-line package, narrow (300 mil)","DIP8",550.00,1450.00,90,top
+USO90_TOP,"Small outline package, narrow (150mil)","SO8",1700.00,3200.00,180,top
+USO180_TOP,"Small outline package, narrow (150mil)","SO8",1300.00,3200.00,270,top
+USO270_TOP,"Small outline package, narrow (150mil)","SO8",1000.00,3200.00,0,top
+USO0_TOP,"Small outline package, narrow (150mil)","SO8",600.00,3200.00,90,top
+UDIP270_BOT,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,650.00,270,bottom
+UDIP180_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,650.00,180,bottom
+UDIP90_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,650.00,90,bottom
+UDIP0_BOT,"Dual in-line package, narrow (300 mil)","DIP8",550.00,650.00,0,bottom
+USO270_BOT,"Small outline package, narrow (150mil)","SO8",1700.00,2600.00,270,bottom
+USO180_BOT,"Small outline package, narrow (150mil)","SO8",1300.00,2600.00,180,bottom
+USO90_BOT,"Small outline package, narrow (150mil)","SO8",1000.00,2600.00,90,bottom
+USO0_BOT,"Small outline package, narrow (150mil)","SO8",600.00,2600.00,0,bottom
+R270_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,3900.00,270,bottom
+R180_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,3900.00,180,bottom
+R90_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,3900.00,90,bottom
+R0_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,3900.00,0,bottom
Index: tags/2.0.1/tests/orig/golden/hid_xy2/bom_general.xy
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_xy2/bom_general.xy	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_xy2/bom_general.xy	(revision 18980)
@@ -0,0 +1,32 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: Wed Jun 24 21:42:22 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mils.  rotation in degrees.
+# --------------------------------------------
+R90_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,4300.00,90,top
+R180_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,4300.00,180,top
+R270_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,4300.00,270,top
+R0_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,4300.00,0,top
+UDIP90_TOP,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,1450.00,180,top
+UDIP180_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,1450.00,270,top
+UDIP270_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,1450.00,0,top
+UDIP0_TOP,"Dual in-line package, narrow (300 mil)","DIP8",550.00,1450.00,90,top
+USO90_TOP,"Small outline package, narrow (150mil)","SO8",1700.00,3200.00,180,top
+USO180_TOP,"Small outline package, narrow (150mil)","SO8",1300.00,3200.00,270,top
+USO270_TOP,"Small outline package, narrow (150mil)","SO8",1000.00,3200.00,0,top
+USO0_TOP,"Small outline package, narrow (150mil)","SO8",600.00,3200.00,90,top
+UDIP270_BOT,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,650.00,270,bottom
+UDIP180_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,650.00,180,bottom
+UDIP90_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,650.00,90,bottom
+UDIP0_BOT,"Dual in-line package, narrow (300 mil)","DIP8",550.00,650.00,0,bottom
+USO270_BOT,"Small outline package, narrow (150mil)","SO8",1700.00,2600.00,270,bottom
+USO180_BOT,"Small outline package, narrow (150mil)","SO8",1300.00,2600.00,180,bottom
+USO90_BOT,"Small outline package, narrow (150mil)","SO8",1000.00,2600.00,90,bottom
+USO0_BOT,"Small outline package, narrow (150mil)","SO8",600.00,2600.00,0,bottom
+R270_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,3900.00,270,bottom
+R180_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,3900.00,180,bottom
+R90_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,3900.00,90,bottom
+R0_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,3900.00,0,bottom
Index: tags/2.0.1/tests/orig/golden/hid_xy3/test.xy
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_xy3/test.xy	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_xy3/test.xy	(revision 18980)
@@ -0,0 +1,32 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: Wed Jun 24 21:42:22 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mils.  rotation in degrees.
+# --------------------------------------------
+R90_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,4300.00,90,top
+R180_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,4300.00,180,top
+R270_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,4300.00,270,top
+R0_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,4300.00,0,top
+UDIP90_TOP,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,1450.00,180,top
+UDIP180_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,1450.00,270,top
+UDIP270_TOP,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,1450.00,0,top
+UDIP0_TOP,"Dual in-line package, narrow (300 mil)","DIP8",550.00,1450.00,90,top
+USO90_TOP,"Small outline package, narrow (150mil)","SO8",1700.00,3200.00,180,top
+USO180_TOP,"Small outline package, narrow (150mil)","SO8",1300.00,3200.00,270,top
+USO270_TOP,"Small outline package, narrow (150mil)","SO8",1000.00,3200.00,0,top
+USO0_TOP,"Small outline package, narrow (150mil)","SO8",600.00,3200.00,90,top
+UDIP270_BOT,"Dual in-line package, narrow (300 mil)","DIP8",2650.00,650.00,270,bottom
+UDIP180_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1950.00,650.00,180,bottom
+UDIP90_BOT,"Dual in-line package, narrow (300 mil)","DIP8",1250.00,650.00,90,bottom
+UDIP0_BOT,"Dual in-line package, narrow (300 mil)","DIP8",550.00,650.00,0,bottom
+USO270_BOT,"Small outline package, narrow (150mil)","SO8",1700.00,2600.00,270,bottom
+USO180_BOT,"Small outline package, narrow (150mil)","SO8",1300.00,2600.00,180,bottom
+USO90_BOT,"Small outline package, narrow (150mil)","SO8",1000.00,2600.00,90,bottom
+USO0_BOT,"Small outline package, narrow (150mil)","SO8",600.00,2600.00,0,bottom
+R270_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1700.00,3900.00,270,bottom
+R180_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1300.00,3900.00,180,bottom
+R90_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",1000.00,3900.00,90,bottom
+R0_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",600.00,3900.00,0,bottom
Index: tags/2.0.1/tests/orig/golden/hid_xy4/bom_general.xy
===================================================================
--- tags/2.0.1/tests/orig/golden/hid_xy4/bom_general.xy	(nonexistent)
+++ tags/2.0.1/tests/orig/golden/hid_xy4/bom_general.xy	(revision 18980)
@@ -0,0 +1,32 @@
+# $Id$
+# PcbXY Version 1.0
+# Date: Wed Jun 24 21:42:23 2009 UTC
+# Author: Dan McMahill
+# Title: Basic BOM/XY Test - PCB X-Y
+# RefDes, Description, Value, X, Y, rotation, top/bottom
+# X,Y in mm.  rotation in degrees.
+# --------------------------------------------
+R90_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",43.18,109.22,90,top
+R180_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",33.02,109.22,180,top
+R270_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",25.40,109.22,270,top
+R0_TOP,"Standard SMT resistor, capacitor etc","RESC3216N",15.24,109.22,0,top
+UDIP90_TOP,"Dual in-line package, narrow (300 mil)","DIP8",67.31,36.83,180,top
+UDIP180_TOP,"Dual in-line package, narrow (300 mil)","DIP8",49.53,36.83,270,top
+UDIP270_TOP,"Dual in-line package, narrow (300 mil)","DIP8",31.75,36.83,0,top
+UDIP0_TOP,"Dual in-line package, narrow (300 mil)","DIP8",13.97,36.83,90,top
+USO90_TOP,"Small outline package, narrow (150mil)","SO8",43.18,81.28,180,top
+USO180_TOP,"Small outline package, narrow (150mil)","SO8",33.02,81.28,270,top
+USO270_TOP,"Small outline package, narrow (150mil)","SO8",25.40,81.28,0,top
+USO0_TOP,"Small outline package, narrow (150mil)","SO8",15.24,81.28,90,top
+UDIP270_BOT,"Dual in-line package, narrow (300 mil)","DIP8",67.31,16.51,270,bottom
+UDIP180_BOT,"Dual in-line package, narrow (300 mil)","DIP8",49.53,16.51,180,bottom
+UDIP90_BOT,"Dual in-line package, narrow (300 mil)","DIP8",31.75,16.51,90,bottom
+UDIP0_BOT,"Dual in-line package, narrow (300 mil)","DIP8",13.97,16.51,0,bottom
+USO270_BOT,"Small outline package, narrow (150mil)","SO8",43.18,66.04,270,bottom
+USO180_BOT,"Small outline package, narrow (150mil)","SO8",33.02,66.04,180,bottom
+USO90_BOT,"Small outline package, narrow (150mil)","SO8",25.40,66.04,90,bottom
+USO0_BOT,"Small outline package, narrow (150mil)","SO8",15.24,66.04,0,bottom
+R270_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",43.18,99.06,270,bottom
+R180_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",33.02,99.06,180,bottom
+R90_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",25.40,99.06,90,bottom
+R0_BOT,"Standard SMT resistor, capacitor etc","RESC3216N",15.24,99.06,0,bottom
Index: tags/2.0.1/tests/orig/inputs/bom_general.pcb
===================================================================
--- tags/2.0.1/tests/orig/inputs/bom_general.pcb	(nonexistent)
+++ tags/2.0.1/tests/orig/inputs/bom_general.pcb	(revision 18980)
@@ -0,0 +1,1211 @@
+# release: pcb 1.99y
+
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Basic BOM/XY Test" 600000 500000]
+
+Grid[10000.000000 0 0 1]
+Cursor[0 500000 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
+
+Symbol(' ' 18)
+(
+)
+Symbol('!' 12)
+(
+	SymbolLine(0 45 0 50 8)
+	SymbolLine(0 10 0 35 8)
+)
+Symbol('"' 12)
+(
+	SymbolLine(0 10 0 20 8)
+	SymbolLine(10 10 10 20 8)
+)
+Symbol('#' 12)
+(
+	SymbolLine(0 35 20 35 8)
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(15 20 15 40 8)
+	SymbolLine(5 20 5 40 8)
+)
+Symbol('$' 12)
+(
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 40 8)
+	SymbolLine(15 45 20 40 8)
+	SymbolLine(5 45 15 45 8)
+	SymbolLine(0 40 5 45 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('%' 12)
+(
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(10 25 15 20 8)
+	SymbolLine(5 25 10 25 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(0 50 40 10 8)
+	SymbolLine(35 50 40 45 8)
+	SymbolLine(40 40 40 45 8)
+	SymbolLine(35 35 40 40 8)
+	SymbolLine(30 35 35 35 8)
+	SymbolLine(25 40 30 35 8)
+	SymbolLine(25 40 25 45 8)
+	SymbolLine(25 45 30 50 8)
+	SymbolLine(30 50 35 50 8)
+)
+Symbol('&' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 35 15 20 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(0 25 25 50 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(0 35 0 45 8)
+)
+Symbol(''' 12)
+(
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('(' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+)
+Symbol(')' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('*' 12)
+(
+	SymbolLine(0 20 20 40 8)
+	SymbolLine(0 40 20 20 8)
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('+' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol(',' 12)
+(
+	SymbolLine(0 60 10 50 8)
+)
+Symbol('-' 12)
+(
+	SymbolLine(0 30 20 30 8)
+)
+Symbol('.' 12)
+(
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('/' 12)
+(
+	SymbolLine(0 45 30 15 8)
+)
+Symbol('0' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 40 20 20 8)
+)
+Symbol('1' 12)
+(
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(10 10 10 50 8)
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 25 30 8)
+	SymbolLine(20 10 20 50 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 10 0 30 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(5 25 15 25 8)
+	SymbolLine(15 25 20 30 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(25 10 25 25 8)
+	SymbolLine(0 10 25 10 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 25 8)
+	SymbolLine(15 30 20 25 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(20 15 20 30 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol(':' 12)
+(
+	SymbolLine(0 25 5 25 8)
+	SymbolLine(0 35 5 35 8)
+)
+Symbol(';' 12)
+(
+	SymbolLine(0 50 10 40 8)
+	SymbolLine(10 25 10 30 8)
+)
+Symbol('<' 12)
+(
+	SymbolLine(0 30 10 20 8)
+	SymbolLine(0 30 10 40 8)
+)
+Symbol('=' 12)
+(
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(0 35 20 35 8)
+)
+Symbol('>' 12)
+(
+	SymbolLine(0 20 10 30 8)
+	SymbolLine(0 40 10 30 8)
+)
+Symbol('?' 12)
+(
+	SymbolLine(10 30 10 35 8)
+	SymbolLine(10 45 10 50 8)
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 20 8)
+	SymbolLine(10 30 20 20 8)
+)
+Symbol('@' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 40 50 8)
+	SymbolLine(50 35 50 10 8)
+	SymbolLine(50 10 40 0 8)
+	SymbolLine(40 0 10 0 8)
+	SymbolLine(10 0 0 10 8)
+	SymbolLine(15 20 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 30 35 8)
+	SymbolLine(30 35 35 30 8)
+	SymbolLine(35 30 40 35 8)
+	SymbolLine(35 30 35 15 8)
+	SymbolLine(35 20 30 15 8)
+	SymbolLine(20 15 30 15 8)
+	SymbolLine(20 15 15 20 8)
+	SymbolLine(40 35 50 35 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine(0 15 0 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 30 15 30 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(10 30 20 30 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(25 10 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 10 10 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 10 50 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine(0 10 15 10 8)
+	SymbolLine(15 10 15 45 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 20 50 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 15 25 8)
+	SymbolLine(15 25 30 10 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 10 25 50 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(10 40 20 50 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(5 30 25 50 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 10 20 45 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 10 20 40 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 15 35 8)
+	SymbolLine(15 35 30 50 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 40 25 50 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(25 10 25 15 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 10 25 8)
+	SymbolLine(10 25 20 15 8)
+	SymbolLine(20 10 20 15 8)
+	SymbolLine(10 25 10 50 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine(0 10 25 10 8)
+	SymbolLine(25 10 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('[' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('\' 12)
+(
+	SymbolLine(0 15 30 45 8)
+)
+Symbol(']' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('^' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 15 8)
+)
+Symbol('_' 12)
+(
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('a' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(20 45 25 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('b' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+)
+Symbol('c' 12)
+(
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+)
+Symbol('d' 12)
+(
+	SymbolLine(20 10 20 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+)
+Symbol('e' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(20 40 20 35 8)
+)
+Symbol('f' 10)
+(
+	SymbolLine(5 15 5 50 8)
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(10 10 15 10 8)
+	SymbolLine(0 30 10 30 8)
+)
+Symbol('g' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(20 30 20 60 8)
+)
+Symbol('h' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+)
+Symbol('i' 10)
+(
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 35 0 50 8)
+)
+Symbol('j' 10)
+(
+	SymbolLine(5 20 5 25 8)
+	SymbolLine(5 35 5 60 8)
+	SymbolLine(0 65 5 60 8)
+)
+Symbol('k' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 15 50 8)
+	SymbolLine(0 35 10 25 8)
+)
+Symbol('l' 10)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('m' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(20 35 25 30 8)
+	SymbolLine(25 30 30 30 8)
+	SymbolLine(30 30 35 35 8)
+	SymbolLine(35 35 35 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('n' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('o' 12)
+(
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('p' 12)
+(
+	SymbolLine(5 35 5 65 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(10 50 20 50 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('q' 12)
+(
+	SymbolLine(20 35 20 65 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('r' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('s' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(20 40 25 45 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('t' 10)
+(
+	SymbolLine(5 10 5 45 8)
+	SymbolLine(5 45 10 50 8)
+	SymbolLine(0 25 10 25 8)
+)
+Symbol('u' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 30 20 45 8)
+)
+Symbol('v' 12)
+(
+	SymbolLine(0 30 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 30 20 40 8)
+)
+Symbol('w' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(15 30 15 45 8)
+	SymbolLine(15 45 20 50 8)
+	SymbolLine(20 50 25 50 8)
+	SymbolLine(25 50 30 45 8)
+	SymbolLine(30 30 30 45 8)
+)
+Symbol('x' 12)
+(
+	SymbolLine(0 30 20 50 8)
+	SymbolLine(0 50 20 30 8)
+)
+Symbol('y' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 60 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('z' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('{' 12)
+(
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('|' 12)
+(
+	SymbolLine(0 10 0 50 8)
+)
+Symbol('}' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(5 25 10 30 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('~' 12)
+(
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 10 30 8)
+	SymbolLine(10 30 15 35 8)
+	SymbolLine(15 35 20 35 8)
+	SymbolLine(20 35 25 30 8)
+)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R0_BOT" "RESC3216N" 60000 110000 -13150 13150 0 100 "auto"]
+(
+	Pad[-5905 -984 -5905 984 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[5905 -984 5905 984 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [-1968 -3543 1968 -3543 800]
+	ElementLine [-1968 3543 1968 3543 800]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R90_BOT" "RESC3216N" 100000 110000 -13150 -13150 1 100 "auto"]
+(
+	Pad[-984 -5905 984 -5905 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[-984 5905 984 5905 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [3543 1968 3543 -1968 800]
+	ElementLine [-3543 1968 -3543 -1968 800]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R180_BOT" "RESC3216N" 130000 110000 13150 6850 2 100 "auto"]
+(
+	Pad[5905 -984 5905 984 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[-5905 -984 -5905 984 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [-1968 3543 1968 3543 800]
+	ElementLine [-1968 -3543 1968 -3543 800]
+
+	)
+
+Element["onsolder" "Standard SMT resistor, capacitor etc" "R270_BOT" "RESC3216N" 170000 110000 -6850 13150 3 100 "auto"]
+(
+	Pad[-984 5905 984 5905 5118 2000 5718 "1" "1" "onsolder,square"]
+	Pad[-984 -5905 984 -5905 5118 2000 5718 "2" "2" "onsolder,square"]
+	ElementLine [-3543 1968 -3543 -1968 800]
+	ElementLine [3543 1968 3543 -1968 800]
+
+	)
+
+Element["onsolder" "Small outline package, narrow (150mil)" "USO0_BOT" "SO8" 60000 240000 -17500 13500 0 100 "auto"]
+(
+	Pad[-13500 7500 -7000 7500 2000 1000 3000 "1" "1" "onsolder,square"]
+	Pad[-13500 2500 -7000 2500 2000 1000 3000 "2" "2" "onsolder,square"]
+	Pad[-13500 -2500 -7000 -2500 2000 1000 3000 "3" "3" "onsolder,square"]
+	Pad[-13500 -7500 -7000 -7500 2000 1000 3000 "4" "4" "onsolder,square"]
+	Pad[7000 -7500 13500 -7500 2000 1000 3000 "5" "5" "onsolder,square,edge2"]
+	Pad[7000 -2500 13500 -2500 2000 1000 3000 "6" "6" "onsolder,square,edge2"]
+	Pad[7000 2500 13500 2500 2000 1000 3000 "7" "7" "onsolder,square,edge2"]
+	Pad[7000 7500 13500 7500 2000 1000 3000 "8" "8" "onsolder,square,edge2"]
+	ElementLine [15500 9500 2500 9500 1000]
+	ElementLine [-15500 9500 -2500 9500 1000]
+	ElementLine [15500 -9500 15500 9500 1000]
+	ElementLine [-15500 -9500 15500 -9500 1000]
+	ElementLine [-15500 9500 -15500 -9500 1000]
+	ElementArc [0 9500 2500 2500 180 180 1000]
+
+	)
+
+Element["onsolder" "Small outline package, narrow (150mil)" "USO90_BOT" "SO8" 100000 240000 -21500 -3000 1 100 "auto"]
+(
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "1" "1" "onsolder,square"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "2" "2" "onsolder,square"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "3" "3" "onsolder,square"]
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "4" "4" "onsolder,square"]
+	Pad[7500 7000 7500 13500 2000 1000 3000 "5" "5" "onsolder,square,edge2"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "6" "6" "onsolder,square,edge2"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "7" "7" "onsolder,square,edge2"]
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "8" "8" "onsolder,square,edge2"]
+	ElementLine [-9500 15500 -9500 2500 1000]
+	ElementLine [-9500 -2500 -9500 -15500 1000]
+	ElementLine [-9500 15500 9500 15500 1000]
+	ElementLine [9500 15500 9500 -15500 1000]
+	ElementLine [-9500 -15500 9500 -15500 1000]
+	ElementArc [-9500 0 2500 2500 90 180 1000]
+
+	)
+
+Element["onsolder" "Small outline package, narrow (150mil)" "USO180_BOT" "SO8" 130000 240000 22000 -16000 2 100 "auto"]
+(
+	Pad[7000 -7500 13500 -7500 2000 1000 3000 "1" "1" "onsolder,square,edge2"]
+	Pad[7000 -2500 13500 -2500 2000 1000 3000 "2" "2" "onsolder,square,edge2"]
+	Pad[7000 2500 13500 2500 2000 1000 3000 "3" "3" "onsolder,square,edge2"]
+	Pad[7000 7500 13500 7500 2000 1000 3000 "4" "4" "onsolder,square,edge2"]
+	Pad[-13500 7500 -7000 7500 2000 1000 3000 "5" "5" "onsolder,square"]
+	Pad[-13500 2500 -7000 2500 2000 1000 3000 "6" "6" "onsolder,square"]
+	Pad[-13500 -2500 -7000 -2500 2000 1000 3000 "7" "7" "onsolder,square"]
+	Pad[-13500 -7500 -7000 -7500 2000 1000 3000 "8" "8" "onsolder,square"]
+	ElementLine [-15500 -9500 -2500 -9500 1000]
+	ElementLine [2500 -9500 15500 -9500 1000]
+	ElementLine [-15500 9500 -15500 -9500 1000]
+	ElementLine [-15500 9500 15500 9500 1000]
+	ElementLine [15500 9500 15500 -9500 1000]
+	ElementArc [0 -9500 2500 2500 0 180 1000]
+
+	)
+
+Element["onsolder" "Small outline package, narrow (150mil)" "USO270_BOT" "SO8" 170000 240000 24000 18000 3 100 "auto"]
+(
+	Pad[7500 7000 7500 13500 2000 1000 3000 "1" "1" "onsolder,square,edge2"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "2" "2" "onsolder,square,edge2"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "3" "3" "onsolder,square,edge2"]
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "4" "4" "onsolder,square,edge2"]
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "5" "5" "onsolder,square"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "6" "6" "onsolder,square"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "7" "7" "onsolder,square"]
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "8" "8" "onsolder,square"]
+	ElementLine [9500 -2500 9500 -15500 1000]
+	ElementLine [9500 15500 9500 2500 1000]
+	ElementLine [-9500 -15500 9500 -15500 1000]
+	ElementLine [-9500 15500 -9500 -15500 1000]
+	ElementLine [-9500 15500 9500 15500 1000]
+	ElementArc [9500 0 2500 2500 270 180 1000]
+
+	)
+
+Element["onsolder" "Dual in-line package, narrow (300 mil)" "UDIP0_BOT" "DIP8" 40000 450000 17000 -5000 3 100 "auto"]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 -10000 6000 3000 6600 2800 "2" "2" ""]
+	Pin[0 -20000 6000 3000 6600 2800 "3" "3" ""]
+	Pin[0 -30000 6000 3000 6600 2800 "4" "4" ""]
+	Pin[30000 -30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[30000 -20000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[30000 -10000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[30000 0 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [20000 5000 35000 5000 1000]
+	ElementLine [-5000 5000 10000 5000 1000]
+	ElementLine [35000 -35000 35000 5000 1000]
+	ElementLine [-5000 -35000 35000 -35000 1000]
+	ElementLine [-5000 5000 -5000 -35000 1000]
+	ElementArc [15000 5000 5000 5000 180 180 1000]
+
+	)
+
+Element["onsolder" "Dual in-line package, narrow (300 mil)" "UDIP90_BOT" "DIP8" 110000 420000 5000 17000 0 100 "auto"]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[10000 0 6000 3000 6600 2800 "2" "2" ""]
+	Pin[20000 0 6000 3000 6600 2800 "3" "3" ""]
+	Pin[30000 0 6000 3000 6600 2800 "4" "4" ""]
+	Pin[30000 30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[20000 30000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[10000 30000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[0 30000 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [-5000 35000 -5000 20000 1000]
+	ElementLine [-5000 10000 -5000 -5000 1000]
+	ElementLine [-5000 35000 35000 35000 1000]
+	ElementLine [35000 35000 35000 -5000 1000]
+	ElementLine [-5000 -5000 35000 -5000 1000]
+	ElementArc [-5000 15000 5000 5000 90 180 1000]
+
+	)
+
+Element["onsolder" "Dual in-line package, narrow (300 mil)" "UDIP180_BOT" "DIP8" 210000 420000 -17000 5000 1 100 "auto"]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 10000 6000 3000 6600 2800 "2" "2" ""]
+	Pin[0 20000 6000 3000 6600 2800 "3" "3" ""]
+	Pin[0 30000 6000 3000 6600 2800 "4" "4" ""]
+	Pin[-30000 30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[-30000 20000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[-30000 10000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[-30000 0 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [-35000 -5000 -20000 -5000 1000]
+	ElementLine [-10000 -5000 5000 -5000 1000]
+	ElementLine [-35000 35000 -35000 -5000 1000]
+	ElementLine [-35000 35000 5000 35000 1000]
+	ElementLine [5000 35000 5000 -5000 1000]
+	ElementArc [-15000 -5000 5000 5000 0 180 1000]
+
+	)
+
+Element["onsolder" "Dual in-line package, narrow (300 mil)" "UDIP270_BOT" "DIP8" 280000 450000 -5000 -17000 2 100 "auto"]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[-10000 0 6000 3000 6600 2800 "2" "2" ""]
+	Pin[-20000 0 6000 3000 6600 2800 "3" "3" ""]
+	Pin[-30000 0 6000 3000 6600 2800 "4" "4" ""]
+	Pin[-30000 -30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[-20000 -30000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[-10000 -30000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[0 -30000 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [5000 -20000 5000 -35000 1000]
+	ElementLine [5000 5000 5000 -10000 1000]
+	ElementLine [-35000 -35000 5000 -35000 1000]
+	ElementLine [-35000 5000 -35000 -35000 1000]
+	ElementLine [-35000 5000 5000 5000 1000]
+	ElementArc [5000 -15000 5000 5000 270 180 1000]
+
+	)
+
+Element["" "Small outline package, narrow (150mil)" "USO0_TOP" "SO8" 60000 180000 -16000 -22500 0 100 ""]
+(
+	Pad[-13500 -7500 -7000 -7500 2000 1000 3000 "1" "1" "square"]
+	Pad[-13500 -2500 -7000 -2500 2000 1000 3000 "2" "2" "square"]
+	Pad[-13500 2500 -7000 2500 2000 1000 3000 "3" "3" "square"]
+	Pad[-13500 7500 -7000 7500 2000 1000 3000 "4" "4" "square"]
+	Pad[7000 7500 13500 7500 2000 1000 3000 "5" "5" "square,edge2"]
+	Pad[7000 2500 13500 2500 2000 1000 3000 "6" "6" "square,edge2"]
+	Pad[7000 -2500 13500 -2500 2000 1000 3000 "7" "7" "square,edge2"]
+	Pad[7000 -7500 13500 -7500 2000 1000 3000 "8" "8" "square,edge2"]
+	ElementLine [15500 -9500 2500 -9500 1000]
+	ElementLine [-15500 -9500 -2500 -9500 1000]
+	ElementLine [15500 9500 15500 -9500 1000]
+	ElementLine [-15500 9500 15500 9500 1000]
+	ElementLine [-15500 -9500 -15500 9500 1000]
+	ElementArc [0 -9500 2500 2500 0 180 1000]
+
+	)
+
+Element["" "Small outline package, narrow (150mil)" "USO270_TOP" "SO8" 100000 180000 -16000 22000 1 100 ""]
+(
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "1" "1" "square,edge2"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "2" "2" "square,edge2"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "3" "3" "square,edge2"]
+	Pad[7500 7000 7500 13500 2000 1000 3000 "4" "4" "square,edge2"]
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "5" "5" "square"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "6" "6" "square"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "7" "7" "square"]
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "8" "8" "square"]
+	ElementLine [-9500 -15500 -9500 -2500 1000]
+	ElementLine [-9500 2500 -9500 15500 1000]
+	ElementLine [-9500 -15500 9500 -15500 1000]
+	ElementLine [9500 -15500 9500 15500 1000]
+	ElementLine [-9500 15500 9500 15500 1000]
+	ElementArc [-9500 0 2500 2500 90 180 1000]
+
+	)
+
+Element["" "Small outline package, narrow (150mil)" "USO180_TOP" "SO8" 130000 180000 9000 17000 2 100 ""]
+(
+	Pad[7000 7500 13500 7500 2000 1000 3000 "1" "1" "square,edge2"]
+	Pad[7000 2500 13500 2500 2000 1000 3000 "2" "2" "square,edge2"]
+	Pad[7000 -2500 13500 -2500 2000 1000 3000 "3" "3" "square,edge2"]
+	Pad[7000 -7500 13500 -7500 2000 1000 3000 "4" "4" "square,edge2"]
+	Pad[-13500 -7500 -7000 -7500 2000 1000 3000 "5" "5" "square"]
+	Pad[-13500 -2500 -7000 -2500 2000 1000 3000 "6" "6" "square"]
+	Pad[-13500 2500 -7000 2500 2000 1000 3000 "7" "7" "square"]
+	Pad[-13500 7500 -7000 7500 2000 1000 3000 "8" "8" "square"]
+	ElementLine [-15500 9500 -2500 9500 1000]
+	ElementLine [2500 9500 15500 9500 1000]
+	ElementLine [-15500 -9500 -15500 9500 1000]
+	ElementLine [-15500 -9500 15500 -9500 1000]
+	ElementLine [15500 -9500 15500 9500 1000]
+	ElementArc [0 9500 2500 2500 180 180 1000]
+
+	)
+
+Element["" "Small outline package, narrow (150mil)" "USO90_TOP" "SO8" 170000 180000 15500 -13500 3 100 ""]
+(
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "1" "1" "square"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "2" "2" "square"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "3" "3" "square"]
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "4" "4" "square"]
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "5" "5" "square,edge2"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "6" "6" "square,edge2"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "7" "7" "square,edge2"]
+	Pad[7500 7000 7500 13500 2000 1000 3000 "8" "8" "square,edge2"]
+	ElementLine [9500 2500 9500 15500 1000]
+	ElementLine [9500 -15500 9500 -2500 1000]
+	ElementLine [-9500 15500 9500 15500 1000]
+	ElementLine [-9500 -15500 -9500 15500 1000]
+	ElementLine [-9500 -15500 9500 -15500 1000]
+	ElementArc [9500 0 2500 2500 270 180 1000]
+
+	)
+
+Element["" "Dual in-line package, narrow (300 mil)" "UDIP0_TOP" "DIP8" 40000 340000 17000 -35000 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 10000 6000 3000 6600 2800 "2" "2" ""]
+	Pin[0 20000 6000 3000 6600 2800 "3" "3" ""]
+	Pin[0 30000 6000 3000 6600 2800 "4" "4" ""]
+	Pin[30000 30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[30000 20000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[30000 10000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[30000 0 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [20000 -5000 35000 -5000 1000]
+	ElementLine [-5000 -5000 10000 -5000 1000]
+	ElementLine [35000 35000 35000 -5000 1000]
+	ElementLine [-5000 35000 35000 35000 1000]
+	ElementLine [-5000 -5000 -5000 35000 1000]
+	ElementArc [15000 -5000 5000 5000 0 180 1000]
+
+	)
+
+Element["" "Dual in-line package, narrow (300 mil)" "UDIP270_TOP" "DIP8" 110000 370000 5000 -17000 0 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[10000 0 6000 3000 6600 2800 "2" "2" ""]
+	Pin[20000 0 6000 3000 6600 2800 "3" "3" ""]
+	Pin[30000 0 6000 3000 6600 2800 "4" "4" ""]
+	Pin[30000 -30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[20000 -30000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[10000 -30000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[0 -30000 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [-5000 -35000 -5000 -20000 1000]
+	ElementLine [-5000 -10000 -5000 5000 1000]
+	ElementLine [-5000 -35000 35000 -35000 1000]
+	ElementLine [35000 -35000 35000 5000 1000]
+	ElementLine [-5000 5000 35000 5000 1000]
+	ElementArc [-5000 -15000 5000 5000 90 180 1000]
+
+	)
+
+Element["" "Dual in-line package, narrow (300 mil)" "UDIP180_TOP" "DIP8" 210000 370000 -17000 -5000 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 -10000 6000 3000 6600 2800 "2" "2" ""]
+	Pin[0 -20000 6000 3000 6600 2800 "3" "3" ""]
+	Pin[0 -30000 6000 3000 6600 2800 "4" "4" ""]
+	Pin[-30000 -30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[-30000 -20000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[-30000 -10000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[-30000 0 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [-35000 5000 -20000 5000 1000]
+	ElementLine [-10000 5000 5000 5000 1000]
+	ElementLine [-35000 -35000 -35000 5000 1000]
+	ElementLine [-35000 -35000 5000 -35000 1000]
+	ElementLine [5000 -35000 5000 5000 1000]
+	ElementArc [-15000 5000 5000 5000 180 180 1000]
+
+	)
+
+Element["" "Dual in-line package, narrow (300 mil)" "UDIP90_TOP" "DIP8" 280000 340000 -5000 17000 2 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[-10000 0 6000 3000 6600 2800 "2" "2" ""]
+	Pin[-20000 0 6000 3000 6600 2800 "3" "3" ""]
+	Pin[-30000 0 6000 3000 6600 2800 "4" "4" ""]
+	Pin[-30000 30000 6000 3000 6600 2800 "5" "5" ""]
+	Pin[-20000 30000 6000 3000 6600 2800 "6" "6" ""]
+	Pin[-10000 30000 6000 3000 6600 2800 "7" "7" ""]
+	Pin[0 30000 6000 3000 6600 2800 "8" "8" ""]
+	ElementLine [5000 20000 5000 35000 1000]
+	ElementLine [5000 -5000 5000 10000 1000]
+	ElementLine [-35000 35000 5000 35000 1000]
+	ElementLine [-35000 -5000 -35000 35000 1000]
+	ElementLine [-35000 -5000 5000 -5000 1000]
+	ElementArc [5000 15000 5000 5000 270 180 1000]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R0_TOP" "RESC3216N" 60000 70000 -11960 -10150 0 100 ""]
+(
+	Pad[-5905 -984 -5905 984 5118 2000 5718 "1" "1" "square"]
+	Pad[5905 -984 5905 984 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-1968 3543 1968 3543 800]
+	ElementLine [-1968 -3543 1968 -3543 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R270_TOP" "RESC3216N" 100000 70000 -13150 13150 1 100 ""]
+(
+	Pad[-984 5905 984 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-984 -5905 984 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [3543 -1968 3543 1968 800]
+	ElementLine [-3543 -1968 -3543 1968 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R180_TOP" "RESC3216N" 130000 70000 13150 13150 2 100 ""]
+(
+	Pad[5905 -984 5905 984 5118 2000 5718 "1" "1" "square"]
+	Pad[-5905 -984 -5905 984 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-1968 -3543 1968 -3543 800]
+	ElementLine [-1968 3543 1968 3543 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "R90_TOP" "RESC3216N" 170000 70000 15261 -7039 3 100 ""]
+(
+	Pad[-984 -5905 984 -5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-984 5905 984 5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3543 -1968 -3543 1968 800]
+	ElementLine [3543 -1968 3543 1968 800]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "GND")
+(
+)
+Layer(4 "power")
+(
+)
+Layer(5 "signal1")
+(
+)
+Layer(6 "signal2")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "signal4")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Text[270000 80000 0 100 "2-pin surface mount elements" ""]
+	Text[270000 90000 0 100 "0/90/180/270 degree rotations" ""]
+	Text[270000 100000 0 100 "both sides ofthe board" ""]
+	Text[270000 190000 0 100 "multi-pin surface mount elements" ""]
+	Text[270000 200000 0 100 "0/90/180/270 degree rotations" ""]
+	Text[270000 210000 0 100 "both sides ofthe board" ""]
+	Text[310000 380000 0 100 "multi-pin leaded elements" "selected"]
+	Text[310000 390000 0 100 "0/90/180/270 degree rotations" ""]
+	Text[310000 400000 0 100 "both sides ofthe board" ""]
+)
Index: tags/2.0.1/tests/orig/inputs/gcode_oneline.pcb
===================================================================
--- tags/2.0.1/tests/orig/inputs/gcode_oneline.pcb	(nonexistent)
+++ tags/2.0.1/tests/orig/inputs/gcode_oneline.pcb	(revision 18980)
@@ -0,0 +1,829 @@
+# release: pcb 1.99y
+
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Basic Single Trace RS274-X Test" 200000 100000]
+
+Grid[10000.000000 0 0 1]
+Cursor[0 500000 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
+
+Symbol(' ' 18)
+(
+)
+Symbol('!' 12)
+(
+	SymbolLine(0 45 0 50 8)
+	SymbolLine(0 10 0 35 8)
+)
+Symbol('"' 12)
+(
+	SymbolLine(0 10 0 20 8)
+	SymbolLine(10 10 10 20 8)
+)
+Symbol('#' 12)
+(
+	SymbolLine(0 35 20 35 8)
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(15 20 15 40 8)
+	SymbolLine(5 20 5 40 8)
+)
+Symbol('$' 12)
+(
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 40 8)
+	SymbolLine(15 45 20 40 8)
+	SymbolLine(5 45 15 45 8)
+	SymbolLine(0 40 5 45 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('%' 12)
+(
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(10 25 15 20 8)
+	SymbolLine(5 25 10 25 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(0 50 40 10 8)
+	SymbolLine(35 50 40 45 8)
+	SymbolLine(40 40 40 45 8)
+	SymbolLine(35 35 40 40 8)
+	SymbolLine(30 35 35 35 8)
+	SymbolLine(25 40 30 35 8)
+	SymbolLine(25 40 25 45 8)
+	SymbolLine(25 45 30 50 8)
+	SymbolLine(30 50 35 50 8)
+)
+Symbol('&' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 35 15 20 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(0 25 25 50 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(0 35 0 45 8)
+)
+Symbol(''' 12)
+(
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('(' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+)
+Symbol(')' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('*' 12)
+(
+	SymbolLine(0 20 20 40 8)
+	SymbolLine(0 40 20 20 8)
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('+' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol(',' 12)
+(
+	SymbolLine(0 60 10 50 8)
+)
+Symbol('-' 12)
+(
+	SymbolLine(0 30 20 30 8)
+)
+Symbol('.' 12)
+(
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('/' 12)
+(
+	SymbolLine(0 45 30 15 8)
+)
+Symbol('0' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 40 20 20 8)
+)
+Symbol('1' 12)
+(
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(10 10 10 50 8)
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 25 30 8)
+	SymbolLine(20 10 20 50 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 10 0 30 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(5 25 15 25 8)
+	SymbolLine(15 25 20 30 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(25 10 25 25 8)
+	SymbolLine(0 10 25 10 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 25 8)
+	SymbolLine(15 30 20 25 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(20 15 20 30 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol(':' 12)
+(
+	SymbolLine(0 25 5 25 8)
+	SymbolLine(0 35 5 35 8)
+)
+Symbol(';' 12)
+(
+	SymbolLine(0 50 10 40 8)
+	SymbolLine(10 25 10 30 8)
+)
+Symbol('<' 12)
+(
+	SymbolLine(0 30 10 20 8)
+	SymbolLine(0 30 10 40 8)
+)
+Symbol('=' 12)
+(
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(0 35 20 35 8)
+)
+Symbol('>' 12)
+(
+	SymbolLine(0 20 10 30 8)
+	SymbolLine(0 40 10 30 8)
+)
+Symbol('?' 12)
+(
+	SymbolLine(10 30 10 35 8)
+	SymbolLine(10 45 10 50 8)
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 20 8)
+	SymbolLine(10 30 20 20 8)
+)
+Symbol('@' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 40 50 8)
+	SymbolLine(50 35 50 10 8)
+	SymbolLine(50 10 40 0 8)
+	SymbolLine(40 0 10 0 8)
+	SymbolLine(10 0 0 10 8)
+	SymbolLine(15 20 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 30 35 8)
+	SymbolLine(30 35 35 30 8)
+	SymbolLine(35 30 40 35 8)
+	SymbolLine(35 30 35 15 8)
+	SymbolLine(35 20 30 15 8)
+	SymbolLine(20 15 30 15 8)
+	SymbolLine(20 15 15 20 8)
+	SymbolLine(40 35 50 35 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine(0 15 0 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 30 15 30 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(10 30 20 30 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(25 10 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 10 10 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 10 50 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine(0 10 15 10 8)
+	SymbolLine(15 10 15 45 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 20 50 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 15 25 8)
+	SymbolLine(15 25 30 10 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 10 25 50 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(10 40 20 50 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(5 30 25 50 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 10 20 45 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 10 20 40 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 15 35 8)
+	SymbolLine(15 35 30 50 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 40 25 50 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(25 10 25 15 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 10 25 8)
+	SymbolLine(10 25 20 15 8)
+	SymbolLine(20 10 20 15 8)
+	SymbolLine(10 25 10 50 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine(0 10 25 10 8)
+	SymbolLine(25 10 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('[' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('\' 12)
+(
+	SymbolLine(0 15 30 45 8)
+)
+Symbol(']' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('^' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 15 8)
+)
+Symbol('_' 12)
+(
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('a' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(20 45 25 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('b' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+)
+Symbol('c' 12)
+(
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+)
+Symbol('d' 12)
+(
+	SymbolLine(20 10 20 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+)
+Symbol('e' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(20 40 20 35 8)
+)
+Symbol('f' 10)
+(
+	SymbolLine(5 15 5 50 8)
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(10 10 15 10 8)
+	SymbolLine(0 30 10 30 8)
+)
+Symbol('g' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(20 30 20 60 8)
+)
+Symbol('h' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+)
+Symbol('i' 10)
+(
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 35 0 50 8)
+)
+Symbol('j' 10)
+(
+	SymbolLine(5 20 5 25 8)
+	SymbolLine(5 35 5 60 8)
+	SymbolLine(0 65 5 60 8)
+)
+Symbol('k' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 15 50 8)
+	SymbolLine(0 35 10 25 8)
+)
+Symbol('l' 10)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('m' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(20 35 25 30 8)
+	SymbolLine(25 30 30 30 8)
+	SymbolLine(30 30 35 35 8)
+	SymbolLine(35 35 35 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('n' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('o' 12)
+(
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('p' 12)
+(
+	SymbolLine(5 35 5 65 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(10 50 20 50 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('q' 12)
+(
+	SymbolLine(20 35 20 65 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('r' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('s' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(20 40 25 45 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('t' 10)
+(
+	SymbolLine(5 10 5 45 8)
+	SymbolLine(5 45 10 50 8)
+	SymbolLine(0 25 10 25 8)
+)
+Symbol('u' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 30 20 45 8)
+)
+Symbol('v' 12)
+(
+	SymbolLine(0 30 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 30 20 40 8)
+)
+Symbol('w' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(15 30 15 45 8)
+	SymbolLine(15 45 20 50 8)
+	SymbolLine(20 50 25 50 8)
+	SymbolLine(25 50 30 45 8)
+	SymbolLine(30 30 30 45 8)
+)
+Symbol('x' 12)
+(
+	SymbolLine(0 30 20 50 8)
+	SymbolLine(0 50 20 30 8)
+)
+Symbol('y' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 60 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('z' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('{' 12)
+(
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('|' 12)
+(
+	SymbolLine(0 10 0 50 8)
+)
+Symbol('}' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(5 25 10 30 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('~' 12)
+(
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 10 30 8)
+	SymbolLine(10 30 15 35 8)
+	SymbolLine(15 35 20 35 8)
+	SymbolLine(20 35 25 30 8)
+)
+Via[90000 50000 6000 2000 0 3500 "" ""]
+Layer(1 "component")
+(
+	Line[10000 50000 90000 50000 4000 2000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[170000 50000 90000 50000 4000 2000 "clearline"]
+)
+Layer(3 "GND")
+(
+)
+Layer(4 "power")
+(
+)
+Layer(5 "signal1")
+(
+)
+Layer(6 "signal2")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "signal4")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/tests/orig/inputs/gerber_arcs.pcb
===================================================================
--- tags/2.0.1/tests/orig/inputs/gerber_arcs.pcb	(nonexistent)
+++ tags/2.0.1/tests/orig/inputs/gerber_arcs.pcb	(revision 18980)
@@ -0,0 +1,844 @@
+# release: pcb 20100929
+# date:    Thu Jun 16 20:10:40 2011
+# user:    username ()
+# host:    titanic.lan
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20100606]
+
+PCB["" 3000000 2000000]
+
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[14941 14941 14941 14941 22411 14941]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2:3:4:5:6,s:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,50000,65000,25000,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
+
+Symbol(' ' 18)
+(
+)
+Symbol('!' 12)
+(
+	SymbolLine(0 45 0 50 8)
+	SymbolLine(0 10 0 35 8)
+)
+Symbol('"' 12)
+(
+	SymbolLine(0 10 0 20 8)
+	SymbolLine(10 10 10 20 8)
+)
+Symbol('#' 12)
+(
+	SymbolLine(0 35 20 35 8)
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(15 20 15 40 8)
+	SymbolLine(5 20 5 40 8)
+)
+Symbol('$' 12)
+(
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 40 8)
+	SymbolLine(15 45 20 40 8)
+	SymbolLine(5 45 15 45 8)
+	SymbolLine(0 40 5 45 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('%' 12)
+(
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(10 25 15 20 8)
+	SymbolLine(5 25 10 25 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(0 50 40 10 8)
+	SymbolLine(35 50 40 45 8)
+	SymbolLine(40 40 40 45 8)
+	SymbolLine(35 35 40 40 8)
+	SymbolLine(30 35 35 35 8)
+	SymbolLine(25 40 30 35 8)
+	SymbolLine(25 40 25 45 8)
+	SymbolLine(25 45 30 50 8)
+	SymbolLine(30 50 35 50 8)
+)
+Symbol('&' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 35 15 20 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(0 25 25 50 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(0 35 0 45 8)
+)
+Symbol(''' 12)
+(
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('(' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+)
+Symbol(')' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('*' 12)
+(
+	SymbolLine(0 20 20 40 8)
+	SymbolLine(0 40 20 20 8)
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('+' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol(',' 12)
+(
+	SymbolLine(0 60 10 50 8)
+)
+Symbol('-' 12)
+(
+	SymbolLine(0 30 20 30 8)
+)
+Symbol('.' 12)
+(
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('/' 12)
+(
+	SymbolLine(0 45 30 15 8)
+)
+Symbol('0' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 40 20 20 8)
+)
+Symbol('1' 12)
+(
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(10 10 10 50 8)
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 25 30 8)
+	SymbolLine(20 10 20 50 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 10 0 30 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(5 25 15 25 8)
+	SymbolLine(15 25 20 30 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(25 10 25 25 8)
+	SymbolLine(0 10 25 10 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 25 8)
+	SymbolLine(15 30 20 25 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(20 15 20 30 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol(':' 12)
+(
+	SymbolLine(0 25 5 25 8)
+	SymbolLine(0 35 5 35 8)
+)
+Symbol(';' 12)
+(
+	SymbolLine(0 50 10 40 8)
+	SymbolLine(10 25 10 30 8)
+)
+Symbol('<' 12)
+(
+	SymbolLine(0 30 10 20 8)
+	SymbolLine(0 30 10 40 8)
+)
+Symbol('=' 12)
+(
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(0 35 20 35 8)
+)
+Symbol('>' 12)
+(
+	SymbolLine(0 20 10 30 8)
+	SymbolLine(0 40 10 30 8)
+)
+Symbol('?' 12)
+(
+	SymbolLine(10 30 10 35 8)
+	SymbolLine(10 45 10 50 8)
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 20 8)
+	SymbolLine(10 30 20 20 8)
+)
+Symbol('@' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 40 50 8)
+	SymbolLine(50 35 50 10 8)
+	SymbolLine(50 10 40 0 8)
+	SymbolLine(40 0 10 0 8)
+	SymbolLine(10 0 0 10 8)
+	SymbolLine(15 20 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 30 35 8)
+	SymbolLine(30 35 35 30 8)
+	SymbolLine(35 30 40 35 8)
+	SymbolLine(35 30 35 15 8)
+	SymbolLine(35 20 30 15 8)
+	SymbolLine(20 15 30 15 8)
+	SymbolLine(20 15 15 20 8)
+	SymbolLine(40 35 50 35 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine(0 15 0 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 30 15 30 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(10 30 20 30 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(25 10 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 10 10 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 10 50 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine(0 10 15 10 8)
+	SymbolLine(15 10 15 45 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 20 50 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 15 25 8)
+	SymbolLine(15 25 30 10 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 10 25 50 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(10 40 20 50 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(5 30 25 50 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 10 20 45 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 10 20 40 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 15 35 8)
+	SymbolLine(15 35 30 50 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 40 25 50 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(25 10 25 15 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 10 25 8)
+	SymbolLine(10 25 20 15 8)
+	SymbolLine(20 10 20 15 8)
+	SymbolLine(10 25 10 50 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine(0 10 25 10 8)
+	SymbolLine(25 10 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('[' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('\' 12)
+(
+	SymbolLine(0 15 30 45 8)
+)
+Symbol(']' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('^' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 15 8)
+)
+Symbol('_' 12)
+(
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('a' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(20 45 25 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('b' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+)
+Symbol('c' 12)
+(
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+)
+Symbol('d' 12)
+(
+	SymbolLine(20 10 20 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+)
+Symbol('e' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(20 40 20 35 8)
+)
+Symbol('f' 10)
+(
+	SymbolLine(5 15 5 50 8)
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(10 10 15 10 8)
+	SymbolLine(0 30 10 30 8)
+)
+Symbol('g' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(20 30 20 60 8)
+)
+Symbol('h' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+)
+Symbol('i' 10)
+(
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 35 0 50 8)
+)
+Symbol('j' 10)
+(
+	SymbolLine(5 20 5 25 8)
+	SymbolLine(5 35 5 60 8)
+	SymbolLine(0 65 5 60 8)
+)
+Symbol('k' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 15 50 8)
+	SymbolLine(0 35 10 25 8)
+)
+Symbol('l' 10)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('m' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(20 35 25 30 8)
+	SymbolLine(25 30 30 30 8)
+	SymbolLine(30 30 35 35 8)
+	SymbolLine(35 35 35 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('n' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('o' 12)
+(
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('p' 12)
+(
+	SymbolLine(5 35 5 65 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(10 50 20 50 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('q' 12)
+(
+	SymbolLine(20 35 20 65 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('r' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('s' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(20 40 25 45 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('t' 10)
+(
+	SymbolLine(5 10 5 45 8)
+	SymbolLine(5 45 10 50 8)
+	SymbolLine(0 25 10 25 8)
+)
+Symbol('u' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 30 20 45 8)
+)
+Symbol('v' 12)
+(
+	SymbolLine(0 30 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 30 20 40 8)
+)
+Symbol('w' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(15 30 15 45 8)
+	SymbolLine(15 45 20 50 8)
+	SymbolLine(20 50 25 50 8)
+	SymbolLine(25 50 30 45 8)
+	SymbolLine(30 30 30 45 8)
+)
+Symbol('x' 12)
+(
+	SymbolLine(0 30 20 50 8)
+	SymbolLine(0 50 20 30 8)
+)
+Symbol('y' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 60 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('z' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('{' 12)
+(
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('|' 12)
+(
+	SymbolLine(0 10 0 50 8)
+)
+Symbol('}' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(5 25 10 30 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('~' 12)
+(
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 10 30 8)
+	SymbolLine(10 30 15 35 8)
+	SymbolLine(15 35 20 35 8)
+	SymbolLine(20 35 25 30 8)
+)
+Via[600000 1550000 75000 2000 0 50000 "" ""]
+Via[600000 1710000 65000 2000 0 25000 "" ""]
+Via[450000 1400000 100000 2000 0 50000 "" ""]
+Via[600000 1400000 100000 2000 0 50000 "" ""]
+Via[450000 1710000 65000 2000 0 25000 "" ""]
+Via[450000 1550000 75000 2000 0 50000 "" ""]
+Layer(1 "top")
+(
+	Arc[775000 209000 491000 491000 1000 2000 180 -90 "clearline"]
+	Arc[772000 1183000 486000 486000 1000 2000 -90 90 "clearline"]
+	Arc[286000 697000 486000 486000 1000 2000 90 90 "clearline"]
+	Arc[1266000 700000 491000 491000 1000 2000 0 -90 "clearline"]
+)
+Layer(2 "ground")
+(
+	Arc[2430000 209000 933000 933000 10000 2000 0 90 "clearline"]
+	Arc[1861000 778000 554000 554000 25000 2000 -90 -90 "clearline"]
+	Arc[1845000 750000 358000 358000 50000 2000 -90 -90 "clearline"]
+	Arc[1845000 729000 184000 184000 100000 2000 -90 -90 "clearline"]
+)
+Layer(3 "signal2")
+(
+)
+Layer(4 "signal3")
+(
+)
+Layer(5 "power")
+(
+	Arc[2500000 1370000 1200000 400000 25000 1000 0 90 "clearline"]
+)
+Layer(6 "bottom")
+(
+)
+Layer(7 "outline")
+(
+)
+Layer(8 "spare")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/tests/orig/inputs/gerber_oneline.pcb
===================================================================
--- tags/2.0.1/tests/orig/inputs/gerber_oneline.pcb	(nonexistent)
+++ tags/2.0.1/tests/orig/inputs/gerber_oneline.pcb	(revision 18980)
@@ -0,0 +1,829 @@
+# release: pcb 1.99y
+
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["Basic Single Trace RS274-X Test" 200000 100000]
+
+Grid[10000.000000 0 0 1]
+Cursor[0 500000 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
+
+Symbol(' ' 18)
+(
+)
+Symbol('!' 12)
+(
+	SymbolLine(0 45 0 50 8)
+	SymbolLine(0 10 0 35 8)
+)
+Symbol('"' 12)
+(
+	SymbolLine(0 10 0 20 8)
+	SymbolLine(10 10 10 20 8)
+)
+Symbol('#' 12)
+(
+	SymbolLine(0 35 20 35 8)
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(15 20 15 40 8)
+	SymbolLine(5 20 5 40 8)
+)
+Symbol('$' 12)
+(
+	SymbolLine(15 15 20 20 8)
+	SymbolLine(5 15 15 15 8)
+	SymbolLine(0 20 5 15 8)
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 40 8)
+	SymbolLine(15 45 20 40 8)
+	SymbolLine(5 45 15 45 8)
+	SymbolLine(0 40 5 45 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('%' 12)
+(
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(10 25 15 20 8)
+	SymbolLine(5 25 10 25 8)
+	SymbolLine(0 20 5 25 8)
+	SymbolLine(0 50 40 10 8)
+	SymbolLine(35 50 40 45 8)
+	SymbolLine(40 40 40 45 8)
+	SymbolLine(35 35 40 40 8)
+	SymbolLine(30 35 35 35 8)
+	SymbolLine(25 40 30 35 8)
+	SymbolLine(25 40 25 45 8)
+	SymbolLine(25 45 30 50 8)
+	SymbolLine(30 50 35 50 8)
+)
+Symbol('&' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 35 15 20 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(0 25 25 50 8)
+	SymbolLine(5 10 10 10 8)
+	SymbolLine(10 10 15 15 8)
+	SymbolLine(15 15 15 20 8)
+	SymbolLine(0 35 0 45 8)
+)
+Symbol(''' 12)
+(
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('(' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+)
+Symbol(')' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('*' 12)
+(
+	SymbolLine(0 20 20 40 8)
+	SymbolLine(0 40 20 20 8)
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol('+' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(10 20 10 40 8)
+)
+Symbol(',' 12)
+(
+	SymbolLine(0 60 10 50 8)
+)
+Symbol('-' 12)
+(
+	SymbolLine(0 30 20 30 8)
+)
+Symbol('.' 12)
+(
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('/' 12)
+(
+	SymbolLine(0 45 30 15 8)
+)
+Symbol('0' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 40 20 20 8)
+)
+Symbol('1' 12)
+(
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(10 10 10 50 8)
+	SymbolLine(0 20 10 10 8)
+)
+Symbol('2' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('3' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('4' 12)
+(
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 25 30 8)
+	SymbolLine(20 10 20 50 8)
+)
+Symbol('5' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 10 0 30 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(5 25 15 25 8)
+	SymbolLine(15 25 20 30 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('6' 12)
+(
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+)
+Symbol('7' 12)
+(
+	SymbolLine(0 50 25 25 8)
+	SymbolLine(25 10 25 25 8)
+	SymbolLine(0 10 25 10 8)
+)
+Symbol('8' 12)
+(
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 25 8)
+	SymbolLine(15 30 20 25 8)
+)
+Symbol('9' 12)
+(
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(20 15 20 30 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol(':' 12)
+(
+	SymbolLine(0 25 5 25 8)
+	SymbolLine(0 35 5 35 8)
+)
+Symbol(';' 12)
+(
+	SymbolLine(0 50 10 40 8)
+	SymbolLine(10 25 10 30 8)
+)
+Symbol('<' 12)
+(
+	SymbolLine(0 30 10 20 8)
+	SymbolLine(0 30 10 40 8)
+)
+Symbol('=' 12)
+(
+	SymbolLine(0 25 20 25 8)
+	SymbolLine(0 35 20 35 8)
+)
+Symbol('>' 12)
+(
+	SymbolLine(0 20 10 30 8)
+	SymbolLine(0 40 10 30 8)
+)
+Symbol('?' 12)
+(
+	SymbolLine(10 30 10 35 8)
+	SymbolLine(10 45 10 50 8)
+	SymbolLine(0 15 0 20 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 20 8)
+	SymbolLine(10 30 20 20 8)
+)
+Symbol('@' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 40 50 8)
+	SymbolLine(50 35 50 10 8)
+	SymbolLine(50 10 40 0 8)
+	SymbolLine(40 0 10 0 8)
+	SymbolLine(10 0 0 10 8)
+	SymbolLine(15 20 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 30 35 8)
+	SymbolLine(30 35 35 30 8)
+	SymbolLine(35 30 40 35 8)
+	SymbolLine(35 30 35 15 8)
+	SymbolLine(35 20 30 15 8)
+	SymbolLine(20 15 30 15 8)
+	SymbolLine(20 15 15 20 8)
+	SymbolLine(40 35 50 35 8)
+)
+Symbol('A' 12)
+(
+	SymbolLine(0 15 0 50 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('B' 12)
+(
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+)
+Symbol('C' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 20 10 8)
+)
+Symbol('D' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('E' 12)
+(
+	SymbolLine(0 30 15 30 8)
+	SymbolLine(0 50 20 50 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+)
+Symbol('F' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(0 30 15 30 8)
+)
+Symbol('G' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(10 30 20 30 8)
+)
+Symbol('H' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(25 10 25 50 8)
+	SymbolLine(0 30 25 30 8)
+)
+Symbol('I' 12)
+(
+	SymbolLine(0 10 10 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 10 50 8)
+)
+Symbol('J' 12)
+(
+	SymbolLine(0 10 15 10 8)
+	SymbolLine(15 10 15 45 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('K' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 30 20 10 8)
+	SymbolLine(0 30 20 50 8)
+)
+Symbol('L' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('M' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 15 25 8)
+	SymbolLine(15 25 30 10 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('N' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 10 25 50 8)
+)
+Symbol('O' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('P' 12)
+(
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+)
+Symbol('Q' 12)
+(
+	SymbolLine(0 15 0 45 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 15 10 8)
+	SymbolLine(15 10 20 15 8)
+	SymbolLine(20 15 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(10 40 20 50 8)
+)
+Symbol('R' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(25 15 25 25 8)
+	SymbolLine(20 30 25 25 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(5 30 25 50 8)
+)
+Symbol('S' 12)
+(
+	SymbolLine(20 10 25 15 8)
+	SymbolLine(5 10 20 10 8)
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(0 15 0 25 8)
+	SymbolLine(0 25 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('T' 12)
+(
+	SymbolLine(0 10 20 10 8)
+	SymbolLine(10 10 10 50 8)
+)
+Symbol('U' 12)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 10 20 45 8)
+)
+Symbol('V' 12)
+(
+	SymbolLine(0 10 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 10 20 40 8)
+)
+Symbol('W' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 15 35 8)
+	SymbolLine(15 35 30 50 8)
+	SymbolLine(30 10 30 50 8)
+)
+Symbol('X' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 25 40 8)
+	SymbolLine(25 40 25 50 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(25 10 25 15 8)
+)
+Symbol('Y' 12)
+(
+	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 15 10 25 8)
+	SymbolLine(10 25 20 15 8)
+	SymbolLine(20 10 20 15 8)
+	SymbolLine(10 25 10 50 8)
+)
+Symbol('Z' 12)
+(
+	SymbolLine(0 10 25 10 8)
+	SymbolLine(25 10 25 15 8)
+	SymbolLine(0 40 25 15 8)
+	SymbolLine(0 40 0 50 8)
+	SymbolLine(0 50 25 50 8)
+)
+Symbol('[' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('\' 12)
+(
+	SymbolLine(0 15 30 45 8)
+)
+Symbol(']' 12)
+(
+	SymbolLine(0 10 5 10 8)
+	SymbolLine(5 10 5 50 8)
+	SymbolLine(0 50 5 50 8)
+)
+Symbol('^' 12)
+(
+	SymbolLine(0 15 5 10 8)
+	SymbolLine(5 10 10 15 8)
+)
+Symbol('_' 12)
+(
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('a' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 45 8)
+	SymbolLine(20 45 25 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('b' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+)
+Symbol('c' 12)
+(
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 20 50 8)
+)
+Symbol('d' 12)
+(
+	SymbolLine(20 10 20 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+)
+Symbol('e' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(0 40 20 40 8)
+	SymbolLine(20 40 20 35 8)
+)
+Symbol('f' 10)
+(
+	SymbolLine(5 15 5 50 8)
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(10 10 15 10 8)
+	SymbolLine(0 30 10 30 8)
+)
+Symbol('g' 12)
+(
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(20 30 20 60 8)
+)
+Symbol('h' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+)
+Symbol('i' 10)
+(
+	SymbolLine(0 20 0 25 8)
+	SymbolLine(0 35 0 50 8)
+)
+Symbol('j' 10)
+(
+	SymbolLine(5 20 5 25 8)
+	SymbolLine(5 35 5 60 8)
+	SymbolLine(0 65 5 60 8)
+)
+Symbol('k' 12)
+(
+	SymbolLine(0 10 0 50 8)
+	SymbolLine(0 35 15 50 8)
+	SymbolLine(0 35 10 25 8)
+)
+Symbol('l' 10)
+(
+	SymbolLine(0 10 0 45 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('m' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(20 35 25 30 8)
+	SymbolLine(25 30 30 30 8)
+	SymbolLine(30 30 35 35 8)
+	SymbolLine(35 35 35 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('n' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 50 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('o' 12)
+(
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(20 35 20 45 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('p' 12)
+(
+	SymbolLine(5 35 5 65 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(25 35 25 45 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(10 50 20 50 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('q' 12)
+(
+	SymbolLine(20 35 20 65 8)
+	SymbolLine(15 30 20 35 8)
+	SymbolLine(5 30 15 30 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(0 35 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('r' 12)
+(
+	SymbolLine(5 35 5 50 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(10 30 20 30 8)
+	SymbolLine(0 30 5 35 8)
+)
+Symbol('s' 12)
+(
+	SymbolLine(5 50 20 50 8)
+	SymbolLine(20 50 25 45 8)
+	SymbolLine(20 40 25 45 8)
+	SymbolLine(5 40 20 40 8)
+	SymbolLine(0 35 5 40 8)
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 20 30 8)
+	SymbolLine(20 30 25 35 8)
+	SymbolLine(0 45 5 50 8)
+)
+Symbol('t' 10)
+(
+	SymbolLine(5 10 5 45 8)
+	SymbolLine(5 45 10 50 8)
+	SymbolLine(0 25 10 25 8)
+)
+Symbol('u' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+	SymbolLine(20 30 20 45 8)
+)
+Symbol('v' 12)
+(
+	SymbolLine(0 30 0 40 8)
+	SymbolLine(0 40 10 50 8)
+	SymbolLine(10 50 20 40 8)
+	SymbolLine(20 30 20 40 8)
+)
+Symbol('w' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(5 50 10 50 8)
+	SymbolLine(10 50 15 45 8)
+	SymbolLine(15 30 15 45 8)
+	SymbolLine(15 45 20 50 8)
+	SymbolLine(20 50 25 50 8)
+	SymbolLine(25 50 30 45 8)
+	SymbolLine(30 30 30 45 8)
+)
+Symbol('x' 12)
+(
+	SymbolLine(0 30 20 50 8)
+	SymbolLine(0 50 20 30 8)
+)
+Symbol('y' 12)
+(
+	SymbolLine(0 30 0 45 8)
+	SymbolLine(0 45 5 50 8)
+	SymbolLine(20 30 20 60 8)
+	SymbolLine(15 65 20 60 8)
+	SymbolLine(5 65 15 65 8)
+	SymbolLine(0 60 5 65 8)
+	SymbolLine(5 50 15 50 8)
+	SymbolLine(15 50 20 45 8)
+)
+Symbol('z' 12)
+(
+	SymbolLine(0 30 20 30 8)
+	SymbolLine(0 50 20 30 8)
+	SymbolLine(0 50 20 50 8)
+)
+Symbol('{' 12)
+(
+	SymbolLine(5 15 10 10 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(0 30 5 25 8)
+	SymbolLine(0 30 5 35 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(5 45 10 50 8)
+)
+Symbol('|' 12)
+(
+	SymbolLine(0 10 0 50 8)
+)
+Symbol('}' 12)
+(
+	SymbolLine(0 10 5 15 8)
+	SymbolLine(5 15 5 25 8)
+	SymbolLine(5 25 10 30 8)
+	SymbolLine(5 35 10 30 8)
+	SymbolLine(5 35 5 45 8)
+	SymbolLine(0 50 5 45 8)
+)
+Symbol('~' 12)
+(
+	SymbolLine(0 35 5 30 8)
+	SymbolLine(5 30 10 30 8)
+	SymbolLine(10 30 15 35 8)
+	SymbolLine(15 35 20 35 8)
+	SymbolLine(20 35 25 30 8)
+)
+Via[90000 50000 6000 2000 0 3500 "" ""]
+Layer(1 "component")
+(
+	Line[10000 50000 90000 50000 4000 2000 "clearline"]
+)
+Layer(2 "solder")
+(
+	Line[170000 50000 90000 50000 4000 2000 "clearline"]
+)
+Layer(3 "GND")
+(
+)
+Layer(4 "power")
+(
+)
+Layer(5 "signal1")
+(
+)
+Layer(6 "signal2")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "signal4")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/tests/orig/run_tests.sh
===================================================================
--- tags/2.0.1/tests/orig/run_tests.sh	(nonexistent)
+++ tags/2.0.1/tests/orig/run_tests.sh	(revision 18980)
@@ -0,0 +1,677 @@
+#!/bin/sh
+#
+# $Id: run_tests.sh,v 1.8 2009/02/17 00:42:31 danmc Exp $
+#
+# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Dan McMahill
+
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of version 2 of the GNU General Public License as
+#  published by the Free Software Foundation
+#
+#  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, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+# All rights reserved.
+#
+# This code was derived from code written by Dan McMahill as part of the
+# latex-mk testsuite.  The original code was covered by a BSD license
+# but the copyright holder (Dan McMahill) has re-released the code under
+# the GPL.
+
+if test -z `which gerbv`
+then
+	echo "Please install gerbv before running the tests." >&2
+	exit 1
+fi
+
+if test -z `which convert`
+then
+	echo "Please install imagemagick before running the tests." >&2
+	exit 1
+fi
+
+magic_test_skip=${PCB_MAGIC_TEST_SKIP:-no}
+
+if test "x${magic_test_skip}" = "xyes" ; then
+	cat << EOF
+
+The environment variable PCB_MAGIC_TEST_SKIP is set to yes.
+This causes the testsuite to skip all tests and report no errors.
+This is used for certain debugging *only*.  The primary use is to 
+allow testing of the 'distcheck' target without including the effects
+of the testsuite. The reason this is useful is that due to minor differences
+in library versions and perhaps roundoff in different CPU's, the testsuite
+may falsely report failures on some systems.  These reported failures
+prevent using 'distcheck' for verifying the rest of the build system.
+These comments only apply to the tests which try to compare image files
+like PNG files.
+
+EOF
+
+	exit 0
+fi
+
+regen=no
+
+usage() {
+cat <<EOF
+
+$0 -- Run pcb regression tests
+
+$0 -h|--help
+$0 [-d | --debug] [-g | --golden dir] [-r|--regen] [testname1 [testname2[ ...]]]
+
+OVERVIEW
+
+The $0 script is used both for running the pcb regression testsuite
+as well as maintaining it.  The way the test suite works is a number
+of different layouts are exported using the various export HID's.
+
+The resulting output files are examined in various ways to make sure
+they are correct.  The exact details of how they are compared varies.
+For example, the PNG outputs are compared using tools from the ImageMagick
+suite while the ASCII centroid and bill of materials files are normalized
+with awk and then compared with the standard diff utility.  The normalization
+removes things like a comment line which contains the creation date.
+
+OPTIONS
+
+-d | --debug              Enables extra debug output
+
+-g | --golden <dir>    :  Specifies that <dir> should be used for the
+                          reference files. 
+
+LIMITATIONS
+
+- The GUI interface is not checked via the regression testsuite.
+
+- Currently actions are also not exercised
+
+EOF
+}
+
+show_sep() {
+    echo "----------------------------------------------------------------------"
+}
+
+##########################################################################
+#
+# debug print out
+#
+
+do_debug=no
+debug() {
+    if test $do_debug = yes ; then
+	cat <<EOF
+$*
+EOF
+    fi
+}
+
+##########################################################################
+#
+# command line processing
+#
+
+
+all_tests=""
+while test -n "$1"
+  do
+  case "$1"
+      in
+      
+      -d|--debug)
+	  do_debug=yes
+	  shift
+	  ;;
+
+      -h|--help)
+	  usage
+	  exit 0
+	  ;;
+      
+      -g|--golden)
+	# set the 'golden' directory.
+	  REFDIR="$2"
+	  shift 2
+	  ;;
+      
+      -r|--regen)
+	# regenerate the 'golden' output files.  Use this with caution.
+	# In particular, all differences should be noted and understood.
+	  regen=yes
+	  shift
+	  ;;
+      
+      -*)
+	  echo "unknown option: $1"
+	  exit 1
+	  ;;
+      
+      *)
+	  break
+	  ;;
+      
+  esac
+done
+
+##########################################################################
+#
+# set up various tools
+#
+
+
+all_tests="$*"
+
+# Source directory
+srcdir=${srcdir:-.}
+top_srcdir=${top_srcdir:-.}
+
+# The pcb wrapper script we want to test
+#
+# by default we will be running it from $(top_builddir)/tests/outputs/testname
+# so we need to look 3 levels up and then down to src
+PCB=${PCB:-../../../../src/pcb-rnd}
+
+# The gerbv executable 
+GERBV=${GERBV:-gerbv}
+GERBV_DEFAULT_FLAGS=${GERBV_DEFAULT_FLAGS:---export=png --window=640x480}
+
+# various ImageMagick tools
+IM_ANIMATE=${IM_ANIMATE:-animate}
+IM_COMPARE=${IM_COMPARE:-compare}
+IM_COMPOSITE=${IM_COMPOSITE:-composite}
+IM_CONVERT=${IM_CONVERT:-convert}
+IM_DISPLAY=${IM_DISPLAY:-display}
+IM_MONTAGE=${IM_MONTAGE:-montage}
+
+# golden directories
+INDIR=${INDIR:-${srcdir}/inputs}
+OUTDIR=outputs
+REFDIR=${REFDIR:-${srcdir}/golden}
+
+# some system tools
+AWK=${AWK:-awk}
+
+# the list of tests to run
+TESTLIST=${srcdir}/tests.list
+
+if test "X$regen" = "Xyes" ; then
+    OUTDIR="${REFDIR}"
+fi
+
+# create output directory
+if test ! -d $OUTDIR ; then
+    mkdir -p $OUTDIR
+    if test $? -ne 0 ; then
+	echo "Failed to create output directory ${OUTDIR}"
+	exit 1
+    fi
+fi
+
+if test -z "$all_tests" ; then
+    if test ! -f ${TESTLIST} ; then
+	echo "ERROR: ($0)  Test list $TESTLIST does not exist"
+	exit 1
+    fi
+    all_tests=`${AWK} 'BEGIN{FS="|"} /^#/{next} {print $1}' ${TESTLIST} | sed 's; ;;g'`
+fi
+
+if test -z "${all_tests}" ; then
+    echo "$0:  No tests specified"
+    exit 0
+fi
+
+
+# fail/pass/total counts
+fail=0
+pass=0
+skip=0
+tot=0
+
+##########################################################################
+#
+# config summary
+#
+
+
+cat << EOF
+
+srcdir                ${srcdir}
+top_srcdir            ${top_srcdir}
+
+AWK                   ${AWK}
+PCB                   ${PCB}
+INDIR                 ${INDIR}
+OUTDIR                ${OUTDIR}
+REFDIR                ${REFDIR}
+TESTLIST              ${TESTLIST}
+
+Gerbv:
+
+GERBV                 ${GERBV}
+GERBV_DEFAULT_FLAGS   ${GERBV_DEFAULT_FLAGS}
+
+ImageMagick Tools:
+
+IM_ANIMATE               ${IM_ANIMATE}
+IM_COMPARE               ${IM_COMPARE}
+IM_COMPOSITE             ${IM_COMPOSITE}
+IM_CONVERT               ${IM_CONVERT}
+IM_DISPLAY               ${IM_DISPLAY}
+IM_MONTAGE               ${IM_MONTAGE}
+
+EOF
+
+tmpd=/tmp/pcb_tests.$$
+mkdir -p -m 0700 $tmpd
+rc=$?
+if test $rc -ne 0 ; then
+    echo "$0:  ERROR:  could not create $tmpd"
+    exit 1
+fi
+
+##########################################################################
+#
+# utility functions for comparison
+#
+
+# Usage:
+#  compare_check "test_name" "file1" "file2"
+#
+# Makes sure that file1 and file2 both exist.  If not, mark the current
+# test as skipped and give an error message
+#
+compare_check() {
+    fn="$1"
+    f1="$2"
+    f2="$3"
+
+    if test ! -f "$f1" ; then 
+	echo "$0:  ${fn}(): $f1 does not exist"
+	test_skipped=yes
+	return 1
+    fi
+
+    if test ! -f "$f2" ; then 
+	echo "$0:  ${fn}(): $f2 does not exist"
+	test_skipped=yes
+	return 1
+    fi
+    return 0
+}
+
+##########################################################################
+#
+# ASCII file comparison routines
+#
+
+# Usage:
+#   run_diff "file1" "file2"
+#
+run_diff() {
+    f1="$1"
+    f2="$2"
+    diff -U 2 $f1 $f2
+    if test $? -ne 0 ; then return 1 ; fi
+    return 0
+}
+
+##########################################################################
+#
+# BOM comparison routines
+#
+
+# used to remove things like creation date from BOM files
+normalize_bom() {
+    f1="$1"
+    f2="$2"
+    $AWK '
+	/^# Date:/ {print "# Date: today"; next}
+	/^# Author:/ {print "# Author: PCB"; next}
+	{print}' \
+	$f1 > $f2
+}
+
+# top level function to compare BOM output
+compare_bom() {
+    f1="$1"
+    f2="$2"
+    compare_check "compare_bom" "$f1" "$f2" || return 1
+
+    # an example BOM file is:
+
+    #  # $Id$
+    #  # PcbBOM Version 1.0
+    #  # Date: Wed Jun 17 14:41:43 2009 UTC
+    #  # Author: Dan McMahill
+    #  # Title: Basic BOM/XY Test - PCB BOM
+    #  # Quantity, Description, Value, RefDes
+    #  # --------------------------------------------
+    #  8,"Standard SMT resistor, capacitor etc","RESC3216N",R90_TOP R180_TOP R270_TOP R0_TOP R270_BOT R180_BOT R90_BOT R0_BOT 
+    #  8,"Dual in-line package, narrow (300 mil)","DIP8",UDIP90_TOP UDIP180_TOP UDIP270_TOP UDIP0_TOP UDIP270_BOT UDIP180_BOT UDIP90_BOT UDIP0_BOT 
+    #  8,"Small outline package, narrow (150mil)","SO8",USO90_TOP USO180_TOP USO270_TOP USO0_TOP USO270_BOT USO180_BOT USO90_BOT USO0_BOT 
+
+    #  For comparison, we need to ignore changes in the Date and Author lines.
+    cf1=${tmpd}/`basename $f1` 
+    cf2=${tmpd}/`basename $f2` 
+
+    normalize_bom $f1 $cf1
+    normalize_bom $f2 $cf2
+    run_diff $cf1 $cf2 || test_failed=yes
+}
+
+##########################################################################
+#
+# X-Y (centroid) comparison routines
+#
+
+# used to remove things like creation date from BOM files
+normalize_xy() {
+    f1="$1"
+    f2="$2"
+    $AWK '
+	/^# Date:/ {print "# Date: today"; next}
+	/^# Author:/ {print "# Author: PCB"; next}
+	{print}' \
+	$f1 > $f2
+}
+
+compare_xy() {
+    f1="$1"
+    f2="$2"
+    compare_check "compare_xy" "$f1" "$f2" || return 1
+    normalize_xy "$f1" "$cf1"
+    normalize_xy "$f2" "$cf2"
+    run_diff "$cf1" "$cf2" || test_failed=yes
+}
+
+##########################################################################
+#
+# GCODE comparison routines
+#
+
+# used to remove things like creation date from gcode files
+normalize_gcode() {
+    f1="$1"
+    f2="$2"
+    $AWK '
+	d == 1 {gsub(/ .* /, "Creation Date and Time"); d = 0;}
+	/^\(Created by G-code exporter\)/ {d=1}
+	{print}' \
+	$f1 > $f2
+}
+
+compare_gcode() {
+    f1="$1"
+    f2="$2"
+    compare_check "compare_gcode" "$f1" "$f2" || return 1
+
+    #  For comparison, we need to ignore changes in the Date and Author lines.
+    cf1=${tmpd}/`basename $f1` 
+    cf2=${tmpd}/`basename $f2` 
+
+    normalize_gcode $f1 $cf1
+    normalize_gcode $f2 $cf2
+    run_diff "$cf1" "$cf2" || test_failed=yes
+}
+
+##########################################################################
+#
+# RS274-X and Excellon comparison
+#
+
+compare_rs274x() {
+    f1="$1"
+    f2="$2"
+    compare_check "compare_rs274x" "$f1" "$f2" || return 1
+
+    # use gerbv to export our reference RS274-X file and our generated
+    # RS274-X file to png.  Then we'll use ImageMagick to see
+    # if there are any differences in the resulting files
+    pngdir=${rundir}/png
+    mkdir -p ${pngdir}
+    nb=`basename $f1`
+    png1=${pngdir}/${nb}-ref.png
+    png2=${pngdir}/${nb}-out.png
+
+    debug "${GERBV} ${GERBV_DEFAULT_FLAGS} --output=${png1} ${f1}"
+    ${GERBV} ${GERBV_DEFAULT_FLAGS} --output=${png1} ${f1}
+
+    debug "${GERBV} ${GERBV_DEFAULT_FLAGS} --output=${png2} ${f2}"
+    ${GERBV} ${GERBV_DEFAULT_FLAGS} --output=${png2} ${f2}
+
+    compare_image ${png1} ${png2}
+
+}
+
+compare_cnc() {
+    compare_rs274x $*
+}
+
+##########################################################################
+#
+# GIF/JPEG/PNG comparison routines
+#
+
+compare_image() {
+    f1="$1"
+    f2="$2"
+    compare_check "compare_image" "$f1" "$f2" || return 1
+
+    # now see if the image files are the same
+    debug "${IM_COMPARE} -metric MAE ${f1} ${f2}  null:"
+    same=`${IM_COMPARE} -metric MAE ${f1} ${f2}  null: 2>&1 | \
+          ${AWK} '{if($1 == 0){print "yes"} else {print "no"}}'`
+    debug "compare_image():  same = $same"
+
+    if test "$same" != yes ; then
+	test_failed=yes
+	echo "FAILED:  See ${errdir}"
+	mkdir -p ${errdir}
+	${IM_COMPARE} ${f1} ${f2} ${errdir}/compare.png
+	${IM_COMPOSITE} ${f1} ${f2} -compose difference ${errdir}/composite.png
+	${IM_CONVERT} ${f1} ${f2} -compose difference -composite  -colorspace gray   ${errdir}/gray.png
+	cat > ${errdir}/animate.sh << EOF
+#!/bin/sh
+${IM_CONVERT} -label "%f" ${f1} ${f2} miff:- | \
+${IM_MONTAGE} - -geometry +0+0 -tile 1x1 miff:- | \
+${IM_ANIMATE} -delay 0.5 -loop 0 -
+EOF
+	chmod a+x ${errdir}/animate.sh
+    fi
+}
+
+##########################################################################
+#
+# The main program loop
+#
+
+for t in $all_tests ; do
+    show_sep
+    echo "Test:  $t"
+
+    tot=`expr $tot + 1`
+
+    ######################################################################
+    #
+    # extract the details for the test
+    #
+
+    pcb_flags="${PCB_DEFAULT_FLAGS}"
+
+    rundir="${OUTDIR}/${t}"
+    refdir="${REFDIR}/${t}"
+    errdir=${rundir}/mismatch
+
+    # test_name | layout file(s) | [export hid name] | [optional arguments to pcb] |  [mismatch] 
+    # | output files
+    name=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {print $1}'`
+    files=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {print $2}'`
+    hid=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {gsub(/[ \t]*/, ""); print $3}'`
+    args=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {print $4}'`
+    mismatch=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {if($5 == "mismatch"){print "yes"}else{print "no"}}'`
+    out_files=`grep "^[ \t]*${t}[ \t]*|" $TESTLIST | $AWK 'BEGIN{FS="|"} {print $6}'`
+   
+    if test "X${name}" = "X" ; then
+	echo "ERROR:  Specified test ${t} does not appear to exist"
+	skip=`expr $skip + 1`
+	continue
+    fi
+    
+    if test "X${args}" != "X" ; then
+	pcb_flags="${args}"
+    fi
+
+    ######################################################################
+    #
+    # Set up the run directory
+    #
+
+    test -d ${rundir} && rm -fr ${rundir}
+    mkdir -p ${rundir}
+    if test $? -ne 0 ; then
+	echo "$0:  Could not create run directory ${rundir}"
+	skip=`expr $skip + 1`
+	continue
+    fi
+
+
+    ######################################################################
+    #
+    # check to see if the files we need exist and copy them to the run
+    # directory
+    #
+
+    missing_files=no
+    path_files=""
+    for f in $files ; do
+	if test ! -f ${INDIR}/${f} ; then
+	    echo "ERROR:  File $f specified as part of the $t test does not exist"
+	    missing_files=yes
+	else
+	    path_files="${path_files} ${INDIR}/${f}"
+	    cp "${INDIR}/${f}" "${rundir}"
+	fi
+    done
+
+    if test "$missing_files" = "yes" ; then
+	echo "${t} had missing input files.  Skipping test"
+	skip=`expr $skip + 1`
+	continue
+    fi
+    
+    ######################################################################
+    #
+    # run PCB
+    #
+
+    echo "cd ${rundir} && ${PCB} -x ${hid} ${pcb_flags} ${files}"
+    (cd ${rundir} && ${PCB} -x ${hid} ${pcb_flags} ${files})
+    pcb_rc=$?
+
+    if test $pcb_rc -ne 0 ; then
+	echo "${PCB} returned ${pcb_rc}.  This is a failure."
+	fail=`expr $fail + 1`
+	continue
+    fi
+
+    # and clean up the input files we'd copied over
+    for f in $files ; do
+	rm -f ${rundir}/${f}
+    done
+
+    ######################################################################
+    #
+    # check the result
+    #
+
+    if test "X$regen" = "Xyes" ; then
+	echo "Regenerated ${t}"
+    else
+	# compare the result to our reference file
+	test_failed=no
+	test_skipped=no
+	for f in $out_files ; do
+	    debug "processing $f"
+	    # break apart type:fn into the type and file name
+	    type=`echo $f | sed 's;:.*;;g'`
+	    fn=`echo $f | sed 's;.*:;;g'`
+
+	    case $type in
+		# BOM HID
+		bom)
+		    compare_bom ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+	        xy)
+		    compare_xy ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		# GCODE HID
+		gcode)
+		    compare_gcode ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		# GERBER HID
+		cnc)
+		    compare_cnc ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		gbx)
+		    compare_rs274x ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		# PNG HID
+	        gif)
+		    compare_image ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		jpg)
+		    compare_image ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		png)
+		    compare_image ${refdir}/${fn} ${rundir}/${fn}
+		    ;;
+
+		# unknown
+		*)
+		    echo "internal error:  $type is not a known file type"
+		    exit 1
+		    ;;
+	    esac
+
+	done
+
+
+	if test $test_failed = yes ; then
+	    echo "FAIL"
+	    fail=`expr $fail + 1`
+	elif test $test_skipped = yes ; then
+	    echo "SKIPPED"
+	    skip=`expr $skip + 1`
+	else
+	    echo "PASSED"
+	    pass=`expr $pass + 1`
+	fi
+
+    fi
+    
+done
+
+show_sep
+echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
+
+rc=0
+if test $pass -ne $tot ; then
+    rc=1
+fi
+
+exit $rc
+

Property changes on: tags/2.0.1/tests/orig/run_tests.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/orig/tests.list
===================================================================
--- tags/2.0.1/tests/orig/tests.list	(nonexistent)
+++ tags/2.0.1/tests/orig/tests.list	(revision 18980)
@@ -0,0 +1,173 @@
+# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2009, 2010 Dan McMahill
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of version 2 of the GNU General Public License as
+#  published by the Free Software Foundation
+#
+#  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, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
+#  All rights reserved.
+#
+# This code was derived from code written by Dan McMahill as part of the
+# latex-mk testsuite.  The original code was covered by a BSD license
+# but the copyright holder is releasing the version for pcb under the GPL.
+#
+#
+# Format:
+#
+# test_name | layout file(s) | [export hid name] | [optional arguments to pcb] |  [mismatch]
+# | output file(s)
+#
+# test_name - a single string with no spaces, tabs, *, +, ? (i.e. any "special"
+# characters) that identifies the test.
+#
+# layout file(s) - a list of layout files.  Files listed are relative to
+# the $(top_srcdir)/tests/inputs directory.
+#
+# [export hid name] - the name of the export HID to use.  This is used both for
+# running pcb as well as determining how we process the output
+#
+# [optional arguments to pcb] - a list of additional arguments to be passed to pcb.
+# This is where one would specify additional options which are specific to a particular
+# export HID.
+#
+# [mismatch] If specified as "mismatch" (no quotes), then the result 
+# should *not* match the reference.  This can be thought of as a test
+# on the testsuite to make sure we can properly detect when a change has
+# occurred.
+#
+# output file(s) - a list of output files and their associated types.  For
+# example:
+#  bom:bom_general.bom xy:test.txt
+# specifies that "bom_general.bom" is created and it is a bill of materials file
+# and that "test.txt" is created and it is a centroid (X-Y) file.
+#
+# File types grouped by which HID produces them are:
+#
+# BOM
+#
+#    bom -- PCB bill of materials file
+#    xy  -- PCB centroid file
+#
+# GCODE
+#
+#    gcode -- G-Code file.  Note that these typically have .cnc as the 
+#             extension but we're already using the 'cnc' type for 
+#             Excellon drill files.
+#
+# GERBER
+#
+#    cnc -- Excellon drill file
+#    gbx -- RS274-X (Gerber) file
+#
+# PNG
+#
+#    gif -- GIF file
+#    jpg -- JPEG file
+#    png -- Portable network graphics (PNG) file
+#
+######################################################################
+# ---------------------------------------------
+# BOM export HID
+# ---------------------------------------------
+######################################################################
+#
+# options:
+#  --bomfile <string>             BOM output file
+#  --xyfile <string>              XY output file
+#  --xy-in-mm                     XY dimensions in mm instead of mils
+#
+#
+# Produces a bill of materials (BOM) file and a centroid (XY) file
+#
+hid_bom1 | bom_general.pcb | bom | | | bom:bom_general.bom
+hid_bom2 | bom_general.pcb | bom | --bomfile test.bom | | bom:test.bom
+hid_bom3 | bom_general.pcb | bom | | | bom:bom_general.bom
+hid_bom4 | bom_general.pcb | bom | | |  bom:bom_general.bom
+
+hid_xy1 | bom_general.pcb | XY | | | xy:bom_general.xy
+hid_xy2 | bom_general.pcb | XY | | | xy:bom_general.xy
+hid_xy3 | bom_general.pcb | XY | --xyfile  test.xy  | | xy:test.xy
+hid_xy4 | bom_general.pcb | XY | --xy-in-mm | |  xy:bom_general.xy
+
+
+
+######################################################################
+# ---------------------------------------------
+# Gcode export HID
+# ---------------------------------------------
+######################################################################
+#
+# options:
+# --basename <string>            File name prefix
+# --dpi <num>                    Resolution of intermediate image (pixels/inch).
+# --mill depth <num>             Milling depth.
+# --safe Z <num>                 Safe Z for traverse move.
+# --tool radius <num>            Milling tool radius compensation.
+# --drill depth <num>            Drilling depth.
+# --measurement unit <mm|mil|um|inch>    Measurement unit
+#
+hid_gcode1 | gcode_oneline.pcb | gcode | | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode2 | gcode_oneline.pcb | gcode | --basename out | | gcode:out.top.cnc gcode:out.bottom.cnc gcode:out.drill.cnc
+hid_gcode3 | gcode_oneline.pcb | gcode | --dpi 1200 | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode4 | gcode_oneline.pcb | gcode | --mill-depth 5 | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode5 | gcode_oneline.pcb | gcode | --safe-Z 10 | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode6 | gcode_oneline.pcb | gcode | --tool-radius 15 | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode7 | gcode_oneline.pcb | gcode | --drill-depth 70 | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode8 | gcode_oneline.pcb | gcode | --measurement-unit mm | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode9 | gcode_oneline.pcb | gcode | --measurement-unit mil | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode10 | gcode_oneline.pcb | gcode | --measurement-unit um | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+hid_gcode11 | gcode_oneline.pcb | gcode | --measurement-unit inch | | gcode:gcode_oneline.gcode.top.cnc gcode:gcode_oneline.gcode.bottom.cnc gcode:gcode_oneline.gcode.drill.cnc
+#
+######################################################################
+# ---------------------------------------------
+# Gerber export HID
+# ---------------------------------------------
+######################################################################
+#
+# options:
+#  --gerberfile <string>          Basename for output file
+#
+# Produces RS274-X (a.k.a. gerber) photo plot files and Excellon drill files
+#
+# we can't include gbx:gerber_oneline.fab.gbr yet because it has a name and a date stamp
+hid_gerber1 | gerber_oneline.pcb | gerber | | | gbx:gerber_oneline.bottom.gbr  gbx:gerber_oneline.top.gbr cnc:gerber_oneline.plated-drill.cnc
+hid_gerber2 | gerber_oneline.pcb | gerber | --gerberfile out | | gbx:out.bottom.gbr  gbx:out.top.gbr cnc:out.plated-drill.cnc
+hid_gerber3 | gerber_arcs.pcb | gerber | --gerberfile arcs | | gbx:arcs.top.gbr gbx:arcs.group11.gbr gbx:arcs.group5.gbr cnc:arcs.plated-drill.cnc
+#
+
+
+######################################################################
+# ---------------------------------------------
+# PNG export HID
+# ---------------------------------------------
+######################################################################
+#
+# options:
+#   --outfile <string>             Graphics output file
+#   --dpi <num>                    Scale factor (pixels/inch). 0 to scale to fix specified size
+#   --x-max <num>                  Maximum width (pixels).  0 to not constrain.
+#   --y-max <num>                  Maximum height (pixels).  0 to not constrain.
+#   --xy-max <num>                 Maximum width and height (pixels).  0 to not constrain.
+#   --as-shown                     Export layers as shown on screen
+#   --monochrome                   Convert to monochrome
+#   --only-visible                 Limit the bounds of the PNG file to the visible items
+#   --use-alpha                    Make the bottomground and any holes transparent
+#   --format <GIF|JPEG|PNG>        Graphics file format
+#   --photo-mode                   Photo-realistic mode
+#   --photo-flip-x                 Show reverse side of the board, left-right flip
+#   --photo-flip-y                 Show reverse side of the board, up-down flip
+#
+# Produces GIF/JPEG/PNG (image) files
+#
+hid_png1 | gerber_oneline.pcb | png | | | png:gerber_oneline.png
+hid_png2 | gerber_oneline.pcb | png | --outfile myfile.png | | png:myfile.png
+#hid_png3 | gerber_oneline.pcb | png | --dpi 300 | | png:gerber_oneline.png
+#
+
Index: tags/2.0.1/tests/pcb-printf/Makefile
===================================================================
--- tags/2.0.1/tests/pcb-printf/Makefile	(nonexistent)
+++ tags/2.0.1/tests/pcb-printf/Makefile	(revision 18980)
@@ -0,0 +1,54 @@
+TRUNK = ../..
+SRC=$(TRUNK)/src
+CFLAGS_OP = -O3
+CFLAGS = -I$(TRUNK) -I$(SRC) -I$(TRUNK)/src_3rd -I$(TRUNK)/src_3rd/liblihata
+LDLIBS = -lm
+
+GDS= $(TRUNK)/src_3rd/genvector/gds_char.o
+LIBPCB_BASE= $(SRC)/unit.o $(SRC)/compat_misc.o
+
+all: tester tester_spd prcli prclimq
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test: tester.diff
+	@echo "pcb-printf:          *** QC PASS ***"
+	@rm tester.stdout ; true
+
+prcli: prcli.o $(SRC)/pcb-printf.o $(SRC)/misc_util.o $(LIBPCB_BASE) $(GDS)
+
+prclimq: prclimq.o $(SRC)/pcb-printf.o $(SRC)/misc_util.o $(LIBPCB_BASE) $(GDS)
+
+prcli.o: prcli.c
+
+prclimq.o: prclimq.c
+
+tester: tester.o $(SRC)/pcb-printf.o $(LIBPCB_BASE)  $(GDS)
+	$(CC) $(LDFLAGS) -o tester tester.o $(SRC)/pcb-printf.o $(LIBPCB_BASE)  $(GDS) $(LDLIBS)
+
+tester_spd: tester_spd.o $(SRC)/pcb-printf_spd.o $(LIBPCB_BASE) $(GDS)
+	$(CC) $(LDFLAGS) -o tester_spd tester_spd.o $(SRC)/pcb-printf_spd.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
+
+tester.o: tester.c
+	$(CC) -c $(CFLAGS) -o $@ tester.c
+
+tester_spd.o: tester.c
+	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ tester.c
+
+tester.stdout: tester
+	./tester > tester.stdout
+
+tester.diff: tester.stdout
+	diff -u tester.ref tester.stdout
+
+$(SRC)/pcb-printf.o: $(SRC)/pcb-printf.c $(SRC)/pcb-printf.h
+
+$(SRC)/unit.o: $(SRC)/unit.c $(SRC)/unit.h
+
+$(SRC)/pcb-printf_spd.o: $(SRC)/pcb-printf.c $(SRC)/pcb-printf.h
+	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ $(SRC)/pcb-printf.c
+
+clean:
+	-$(SCCBOX) rm -f tester tester.o prcli prcli.o tester_spd tester_spd.o $(SRC)/pcb-printf_spd.o
+
Index: tags/2.0.1/tests/pcb-printf/prcli.c
===================================================================
--- tags/2.0.1/tests/pcb-printf/prcli.c	(nonexistent)
+++ tags/2.0.1/tests/pcb-printf/prcli.c	(revision 18980)
@@ -0,0 +1,29 @@
+#include <stdio.h>
+#include "misc_util.h"
+#include "pcb-printf.h"
+#include "pcb_bool.h"
+
+int main(int argc, char *argv[])
+{
+	const char *fmt = argv[1];
+	pcb_coord_t crd;
+	int n;
+
+	pcb_printf_slot[0] = "%mr";
+
+	for(n = 2; n < argc; n++) {
+		pcb_bool success;
+		double val = pcb_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
+		if (!success) {
+			fprintf(stderr, "Unable to convert '%s' to pcb_coord_t\n", argv[n]);
+			return 1;
+		}
+		crd = val;
+	}
+
+	pcb_fprintf(stdout, fmt, crd, 70000, 70000, 70000, 70000);
+
+	printf("\n");
+
+	return 0;
+}
Index: tags/2.0.1/tests/pcb-printf/prclimq.c
===================================================================
--- tags/2.0.1/tests/pcb-printf/prclimq.c	(nonexistent)
+++ tags/2.0.1/tests/pcb-printf/prclimq.c	(revision 18980)
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include "misc_util.h"
+#include "pcb-printf.h"
+#include "pcb_bool.h"
+
+int main(int argc, char *argv[])
+{
+	pcb_printf_slot[0] = "%{ ()}mq";
+	pcb_fprintf(stdout, argv[1], argv[2]);
+	printf("\n");
+	return 0;
+}
Index: tags/2.0.1/tests/pcb-printf/tester.c
===================================================================
--- tags/2.0.1/tests/pcb-printf/tester.c	(nonexistent)
+++ tags/2.0.1/tests/pcb-printf/tester.c	(revision 18980)
@@ -0,0 +1,74 @@
+#include <time.h>
+#include <locale.h>
+#include "config.h"
+#include "pcb-printf.h"
+
+#ifdef SPEED
+	char buff[8192];
+	int pc = 0;
+#	define NUMREP 4000
+#	define PCB_PRINTF(fmt, ...) \
+	do { \
+		pc++; \
+		pcb_snprintf(buff, sizeof(buff), fmt, __VA_ARGS__); \
+	} while(0)
+#else
+#	define NUMREP 1
+#	define PCB_PRINTF pcb_printf
+#endif
+
+int main()
+{
+	pcb_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
+	char *fmt[] = {
+	"%mI",  "%mm",  "%mM",  "%ml",  "%mL",  "%ms",  "%mS",  "%md",  "%mD",  "%m3",  "%mr",
+	"%$mI", "%$mm", "%$mM", "%$ml", "%$mL", "%$ms", "%$mS", "%$md", "%$mD", "%$m3", "%$mr",
+	NULL };
+	char **f;
+	int n, rep;
+
+	setlocale(LC_ALL, "");
+
+	for(rep = 0; rep < NUMREP; rep++) {
+		for(n = 0; n < sizeof(c) / sizeof(c[0]); n++) {
+#ifndef SPEED
+			printf("---------------\n");
+#endif
+			/* common format strings */
+			for(f = fmt; *f != NULL; f++) {
+				char fmt_tmp[32];
+				sprintf(fmt_tmp, "%s=%s\n", (*f)+1, *f);
+				PCB_PRINTF(fmt_tmp, c[n], c[n], c[n]);
+			}
+
+			/* special: custom argument list */
+			PCB_PRINTF("m*=%m* mil\n", "mil", c[n]);
+			PCB_PRINTF("m*=%m* mm\n", "mm", c[n]);
+
+			PCB_PRINTF("ma=%ma\n", 1.1234);
+			PCB_PRINTF("ma=%ma\n", 130.1234);
+			PCB_PRINTF("ma=%ma\n", 555.1234);
+
+			PCB_PRINTF("m+=%m+%mS mil\n", PCB_UNIT_ALLOW_MIL, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm\n", PCB_UNIT_ALLOW_MM, c[n]);
+			PCB_PRINTF("m+=%m+%mS m\n", PCB_UNIT_ALLOW_M, c[n]);
+			PCB_PRINTF("m+=%m+%mS mm or m\n", PCB_UNIT_ALLOW_MM | PCB_UNIT_ALLOW_M, c[n]);
+		}
+#ifndef SPEED
+			printf("---------------\n");
+#endif
+		PCB_PRINTF("mf=%.08mf\n", (double)1.2345);
+	}
+
+#ifdef SPEED
+	{
+		double spent = (double)clock() / (double)CLOCKS_PER_SEC;
+		printf("total number of pcb_printf calls:  %d\n", pc);
+		printf("total number of CPU seconds spent: %.4f\n", spent);
+		printf("Average prints per second: %.4f\n", (double)pc/spent);
+	}
+#endif
+	return 0;
+}
+
+
Index: tags/2.0.1/tests/pcb-printf/tester.ref
===================================================================
--- tags/2.0.1/tests/pcb-printf/tester.ref	(nonexistent)
+++ tags/2.0.1/tests/pcb-printf/tester.ref	(revision 18980)
@@ -0,0 +1,162 @@
+---------------
+mI=0
+mm=0.0000
+mM=0
+ml=0.00
+mL=0
+ms=0.0000
+mS=0
+md=(0.0000, 0.0000)
+mD=(0, 0)
+m3=(0, 0, 0)
+mr=0
+$mI=0
+$mm=0.0000
+$mM=0
+$ml=0.00
+$mL=0
+$ms=0.0000
+$mS=0
+$md=(0.0000, 0.0000) mm
+$mD=(0, 0) nm
+$m3=(0, 0, 0) nm
+$mr=0
+m*=0.00 mil
+m*=0.0000 mm
+ma=1
+ma=130
+ma=555
+m+=0.00 mil
+m+=0.0000 mm
+m+=0.00000 m
+m+=0.0000 mm or m
+---------------
+mI=1
+mm=0.0000
+mM=1
+ml=0.00
+mL=0
+ms=0.0000
+mS=1
+md=(0.0000, 0.0000)
+mD=(1, 1)
+m3=(1, 1, 1)
+mr=0
+$mI=1
+$mm=0.0000 mm
+$mM=1 nm
+$ml=0.00 mil
+$mL=0 cmil
+$ms=0.0000 mm
+$mS=1 nm
+$md=(0.0000, 0.0000) mm
+$mD=(1, 1) nm
+$m3=(1, 1, 1) nm
+$mr=0
+m*=0.00 mil
+m*=0.0000 mm
+ma=1
+ma=130
+ma=555
+m+=0.00 mil
+m+=0.0000 mm
+m+=0.00000 m
+m+=0.0000 mm or m
+---------------
+mI=1024
+mm=0.0010
+mM=1024
+ml=0.04
+mL=4
+ms=0.0010
+mS=1024
+md=(0.0010, 0.0010)
+mD=(1024, 1024)
+m3=(1024, 1024, 1024)
+mr=4
+$mI=1024
+$mm=0.0010 mm
+$mM=1024 nm
+$ml=0.04 mil
+$mL=4 cmil
+$ms=0.0010 mm
+$mS=1024 nm
+$md=(0.0010, 0.0010) mm
+$mD=(1024, 1024) nm
+$m3=(1024, 1024, 1024) nm
+$mr=4
+m*=0.04 mil
+m*=0.0010 mm
+ma=1
+ma=130
+ma=555
+m+=0.04 mil
+m+=0.0010 mm
+m+=0.00000 m
+m+=0.0010 mm or m
+---------------
+mI=1048576
+mm=1.0486
+mM=1048.58
+ml=41.28
+mL=41.28
+ms=1.0486
+mS=1048.58
+md=(1.0486, 1.0486)
+mD=(1048.58, 1048.58)
+m3=(1048.58, 1048.58, 1048.58)
+mr=4128
+$mI=1048576
+$mm=1.0486 mm
+$mM=1048.58 um
+$ml=41.28 mil
+$mL=41.28 mil
+$ms=1.0486 mm
+$mS=1048.58 um
+$md=(1.0486, 1.0486) mm
+$mD=(1048.58, 1048.58) um
+$m3=(1048.58, 1048.58, 1048.58) um
+$mr=4128
+m*=41.28 mil
+m*=1.0486 mm
+ma=1
+ma=130
+ma=555
+m+=41.28 mil
+m+=1.0486 mm
+m+=0.00105 m
+m+=1.0486 mm or m
+---------------
+mI=1073741824
+mm=1073.7418
+mM=107.37418
+ml=42273.30
+mL=42.27330
+ms=1073.7418
+mS=1073.7418
+md=(1073.7418, 1073.7418)
+mD=(107.37418, 107.37418)
+m3=(107.37418, 107.37418, 107.37418)
+mr=4227330
+$mI=1073741824
+$mm=1073.7418 mm
+$mM=107.37418 cm
+$ml=42273.30 mil
+$mL=42.27330 in
+$ms=1073.7418 mm
+$mS=1073.7418 mm
+$md=(1073.7418, 1073.7418) mm
+$mD=(107.37418, 107.37418) cm
+$m3=(107.37418, 107.37418, 107.37418) cm
+$mr=4227330
+m*=42273.30 mil
+m*=1073.7418 mm
+ma=1
+ma=130
+ma=555
+m+=42273.30 mil
+m+=1073.7418 mm
+m+=1.07374 m
+m+=1073.7418 mm or m
+---------------
+mf=1.2345
Index: tags/2.0.1/tests/pcbflags/Makefile
===================================================================
--- tags/2.0.1/tests/pcbflags/Makefile	(nonexistent)
+++ tags/2.0.1/tests/pcbflags/Makefile	(revision 18980)
@@ -0,0 +1,12 @@
+all:
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test:
+	@./test.sh && echo "pcbflags:            *** QC PASS ***"
+
+clean:
+	mv vanilla.pcb vanilla.save
+	-$(SCCBOX) rm -f *.pcb *.log
+	mv vanilla.save vanilla.pcb
Index: tags/2.0.1/tests/pcbflags/readme.txt
===================================================================
--- tags/2.0.1/tests/pcbflags/readme.txt	(nonexistent)
+++ tags/2.0.1/tests/pcbflags/readme.txt	(revision 18980)
@@ -0,0 +1,2 @@
+Test whether chaning design configuration flags one by one result in saving
+the right pcb flags in the original file format.
Index: tags/2.0.1/tests/pcbflags/test.sh
===================================================================
--- tags/2.0.1/tests/pcbflags/test.sh	(nonexistent)
+++ tags/2.0.1/tests/pcbflags/test.sh	(revision 18980)
@@ -0,0 +1,99 @@
+#!/bin/sh
+src_dir=../../src
+pwd=`pwd`
+
+# $1 must be a .pcb file name
+run_pcb()
+{
+	local fn
+	if test ! -z "$1"
+	then
+		fn="$pwd/$1"
+		shift 1
+	fi
+	(
+		cd "$src_dir"
+		if test -z "$fn"
+		then
+			./pcb-rnd --gui batch "$@"
+		else
+			./pcb-rnd --gui batch "$fn" "$@"
+		fi
+	)
+}
+
+
+test_flag()
+{
+	local name="`basename $1`" newf expect="Flags(\"$3\")" res
+	if test -z "$name"
+	then
+		name="0"
+	fi
+	rm $name 2>/dev/null
+	echo "
+conf(set, $1, $2, design)
+SaveTo(LayoutAs, $pwd/$name.pcb)
+dumpconf(lihata,design)
+" | run_pcb vanilla.pcb >$name.log 2>&1
+	newf=`grep ^Flags $name.pcb`
+	test "$newf" = "$expect"
+	res=$?
+	if test $res != 0
+	then
+		echo "$1 save broken: expected '$expect' got '$newf'"
+		return 1
+	fi
+
+
+	echo "###### load test" >> $name.log
+	echo "
+conf(reset, system)
+conf(reset, project)
+LoadFrom(Layout, $pwd/$name.pcb)
+SaveTo(LayoutAs, $pwd/$name.2.pcb)
+dumpconf(lihata,design)
+" | run_pcb >>$name.log 2>&1
+
+	newf=`grep ^Flags $name.2.pcb`
+	test "$newf" = "$expect"
+	res=$?
+	if test $res != 0
+	then
+		echo "$1 load broken: expected '$expect' got '$newf'"
+		return 1
+	fi
+
+	return 0
+}
+
+diag=`cd "$src_dir" && ./pcb-rnd --dump-plugins | grep diag`
+if test -z "$diag"
+then
+	echo "pcbflags: can't run tests because the diag plugin is not compiled."
+	exit 0
+fi
+
+
+test_flag "plugins/mincut/enable" "true" "enablemincut"
+test_flag "editor/show_number" "true" "shownumber"
+test_flag "editor/show_drc" "true" "showdrc"
+test_flag "editor/rubber_band_mode" "true" "rubberband"
+test_flag "editor/auto_drc" "true" "autodrc"
+test_flag "editor/all_direction_lines" "true" "alldirection"
+test_flag "editor/swap_start_direction" "true" "swapstartdir"
+test_flag "editor/unique_names" "true" "uniquename"
+test_flag "editor/clear_line" "true" "clearnew"
+test_flag "editor/full_poly" "true" "newfullpoly"
+test_flag "editor/snap_pin" "true" "snappin"
+test_flag "editor/orthogonal_moves" "true" "orthomove"
+test_flag "editor/live_routing" "true" "liveroute"
+test_flag "editor/only_names" "true" "onlynames"
+test_flag "editor/lock_names" "true" "locknames"
+test_flag "editor/hide_names" "true" "hidenames"
+test_flag "editor/thin_draw" "true" "thindraw"
+test_flag "editor/thin_draw_poly" "true" "thindrawpoly"
+test_flag "editor/local_ref" "true" "localref"
+test_flag "editor/check_planes" "true" "checkplanes"
+test_flag "editor/description" "true" "description"
+test_flag "editor/name_on_pcb" "true" "nameonpcb"

Property changes on: tags/2.0.1/tests/pcbflags/test.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/pcbflags/vanilla.pcb
===================================================================
--- tags/2.0.1/tests/pcbflags/vanilla.pcb	(nonexistent)
+++ tags/2.0.1/tests/pcbflags/vanilla.pcb	(revision 18980)
@@ -0,0 +1,21 @@
+# release: pcb-rnd 1.0.7
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 600000 500000]
+
+Grid[2500.0 0 0 1]
+Cursor[282500 172500 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("")
+Groups("1,c:2,s")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,20000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+Layer(1 "c")
+(
+)
+Layer(2 "s")
+(
+)
Index: tags/2.0.1/tests/propedit/Makefile
===================================================================
--- tags/2.0.1/tests/propedit/Makefile	(nonexistent)
+++ tags/2.0.1/tests/propedit/Makefile	(revision 18980)
@@ -0,0 +1,42 @@
+ROOT=../..
+PED=$(ROOT)/src_plugins/propedit
+LHT=$(ROOT)/src_3rd
+SRC=$(ROOT)/src
+
+CFLAGS = -g -Wall -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd
+LDLIBS = -lm
+LIB_OBJS = \
+ $(LHT)/genht/htsp.o \
+ $(LHT)/genht/hash.o \
+ $(SRC)/compat_misc.o \
+ $(SRC)/misc_util.o \
+ $(SRC)/pcb-printf.o \
+ $(SRC)/unit.o \
+ $(ROOT)/src_3rd/genvector/gds_char.o
+
+OBJS = tester.o $(PED)/props.o
+
+all: tester
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test: tester.diff
+	@echo "propedit:            *** QC PASS ***"
+	@rm tester.out
+
+tester: $(OBJS) $(LIB_OBJS)
+	$(CC) $(LDFLAGS) -o tester $(OBJS) $(LIB_OBJS)  $(LDLIBS)
+
+tester.o: tester.c $(PED)/props.h
+
+$(PED)/props.o: $(PED)/props.c $(PED)/props.h
+
+tester.diff: tester.ref tester.out
+	@diff -u tester.ref tester.out
+
+tester.out: tester
+	./tester > tester.out
+
+clean:
+	-$(SCCBOX) rm -f tester.out tester $(OBJS)
Index: tags/2.0.1/tests/propedit/tester.c
===================================================================
--- tags/2.0.1/tests/propedit/tester.c	(nonexistent)
+++ tags/2.0.1/tests/propedit/tester.c	(revision 18980)
@@ -0,0 +1,127 @@
+#include <stdio.h>
+#include <assert.h>
+#include "props.h"
+
+void *pcb_gui = NULL;
+
+int pcb_propsel_set(const char *prop, const char *value)
+{
+	return 0;
+}
+
+int pcb_propsel_del(const char *key)
+{
+	return 0;
+}
+
+void pcb_propsel_map_core(htsp_t *props)
+{
+}
+
+
+
+static void print_val(pcb_prop_type_t type, pcb_propval_t val)
+{
+	switch(type) {
+		case PCB_PROPT_STRING: printf("%s", val.string); break;
+		case PCB_PROPT_COORD:  printf("%d", val.coord); break;
+		case PCB_PROPT_ANGLE:  printf("%f", val.angle); break;
+		case PCB_PROPT_INT:    printf("%d", val.i); break;
+		default: printf(" ???");
+	}
+}
+
+static void print_all(htsp_t *props)
+{
+	htsp_entry_t *pe;
+	for (pe = htsp_first(props); pe; pe = htsp_next(props, pe)) {
+		htprop_entry_t *e;
+		pcb_props_t *p = pe->value;
+		printf("%s [%s]\n", pe->key, pcb_props_type_name(p->type));
+		for (e = htprop_first(&p->values); e; e = htprop_next(&p->values, e)) {
+			printf(" ");
+			print_val(p->type, e->key);
+			printf(" (%lu)\n", e->value);
+		}
+	}
+}
+
+static pcb_props_t *print_stat(htsp_t *props, const char *name, int all)
+{
+	pcb_propval_t most_common, min, max, avg;
+	pcb_props_t *p;
+
+	if (all)
+		p = pcb_props_stat(props, name, &most_common, &min, &max, &avg);
+	else
+		p = pcb_props_stat(props, name, &most_common, NULL, NULL, NULL);
+
+	if (p == NULL)
+		return NULL;
+
+	printf("Stats %s:", name);
+	printf("  common: "); print_val(p->type, most_common);
+	if (all) {
+		printf("  min: "); print_val(p->type, min);
+		printf("  max: "); print_val(p->type, max);
+		printf("  avg: "); print_val(p->type, avg);
+	}
+	printf("\n");
+
+	return p;
+}
+
+int main()
+{
+	htsp_t *props = pcb_props_init();
+	assert(props != NULL);
+	pcb_propval_t v;
+
+	/* --- add a few items properly - should work --- */
+	
+	/* coord */
+	v.coord = 42; assert(pcb_props_add(props, "crd", PCB_PROPT_COORD, v) != NULL);
+	v.coord = 10; assert(pcb_props_add(props, "crd", PCB_PROPT_COORD, v) != NULL);
+	v.coord = 42; assert(pcb_props_add(props, "crd", PCB_PROPT_COORD, v) != NULL);
+	v.coord = 42; assert(pcb_props_add(props, "crd", PCB_PROPT_COORD, v) != NULL);
+
+	/* int */
+	v.i = 42; assert(pcb_props_add(props, "num", PCB_PROPT_INT, v) != NULL);
+	v.i = 10; assert(pcb_props_add(props, "num", PCB_PROPT_INT, v) != NULL);
+	v.i = 42; assert(pcb_props_add(props, "num", PCB_PROPT_INT, v) != NULL);
+	v.i = 42; assert(pcb_props_add(props, "num", PCB_PROPT_INT, v) != NULL);
+
+	/* angle */
+	v.angle = 42.0; assert(pcb_props_add(props, "ang", PCB_PROPT_ANGLE, v) != NULL);
+	v.angle = 10.5; assert(pcb_props_add(props, "ang", PCB_PROPT_ANGLE, v) != NULL);
+	v.angle = 42.0; assert(pcb_props_add(props, "ang", PCB_PROPT_ANGLE, v) != NULL);
+	v.angle = 42.0; assert(pcb_props_add(props, "ang", PCB_PROPT_ANGLE, v) != NULL);
+
+	/* string */
+	v.string = "foo"; assert(pcb_props_add(props, "str", PCB_PROPT_STRING, v) != NULL);
+	v.string = "bar"; assert(pcb_props_add(props, "str", PCB_PROPT_STRING, v) != NULL);
+	v.string = "BAZ"; assert(pcb_props_add(props, "str", PCB_PROPT_STRING, v) != NULL);
+	v.string = "foo"; assert(pcb_props_add(props, "str", PCB_PROPT_STRING, v) != NULL);
+	v.string = "foo"; assert(pcb_props_add(props, "str", PCB_PROPT_STRING, v) != NULL);
+
+	/* --- add a items with the wrong type - should fail --- */
+	v.i = 42; assert(pcb_props_add(props, "crd", PCB_PROPT_INT, v) == NULL);
+	v.i = 42; assert(pcb_props_add(props, "crd", 1234, v) == NULL);
+	v.i = 42; assert(pcb_props_add(props, "ang", 1234, v) == NULL);
+
+	print_all(props);
+
+	/* --- get some stats --- */
+
+	/* these should work */
+	assert(print_stat(props, "crd", 1) != NULL);
+	assert(print_stat(props, "num", 1) != NULL);
+	assert(print_stat(props, "ang", 1) != NULL);
+	assert(print_stat(props, "str", 0) != NULL);
+
+	/* these should fail */
+	assert(print_stat(props, "str", 1) == NULL);
+	assert(print_stat(props, "HAH", 1) == NULL);
+
+	return 0;
+}
Index: tags/2.0.1/tests/propedit/tester.ref
===================================================================
--- tags/2.0.1/tests/propedit/tester.ref	(nonexistent)
+++ tags/2.0.1/tests/propedit/tester.ref	(revision 18980)
@@ -0,0 +1,17 @@
+num [int]
+ 42 (3)
+ 10 (1)
+ang [angle]
+ 42.000000 (3)
+ 10.500000 (1)
+crd [coord]
+ 42 (3)
+ 10 (1)
+str [string]
+ foo (3)
+ bar (1)
+ BAZ (1)
+Stats crd:  common: 42  min: 10  max: 42  avg: 34
+Stats num:  common: 42  min: 10  max: 42  avg: 34
+Stats ang:  common: 42.000000  min: 10.500000  max: 42.000000  avg: 34.125000
+Stats str:  common: foo
Index: tags/2.0.1/tests/remote/Makefile
===================================================================
--- tags/2.0.1/tests/remote/Makefile	(nonexistent)
+++ tags/2.0.1/tests/remote/Makefile	(revision 18980)
@@ -0,0 +1,19 @@
+ROOT=../..
+REM=$(ROOT)/src_plugins/hid_remote
+CFLAGS = -Wall -g -I$(REM) -I$(ROOT)/src -I$(ROOT)
+
+all: test_parse
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test_parse: test_parse.o
+	$(CC) $(LDFLAGS) -o test_parse test_parse.o  $(LDLIBS)
+
+test_parse.o: test_parse.c $(REM)/proto_lowcommon.h $(REM)/proto_lowparse.h $(REM)/proto_lowdbg.h
+
+test:
+	@./test_all.sh
+
+clean:
+	-$(SCCBOX) rm -f test_parse test_parse.o
Index: tags/2.0.1/tests/remote/bin.msg
===================================================================
--- tags/2.0.1/tests/remote/bin.msg	(nonexistent)
+++ tags/2.0.1/tests/remote/bin.msg	(revision 18980)
@@ -0,0 +1,6 @@
+cmd{B=1 C=ab D=123}
+empty{A= A= A=}
+nasty{D={}
+ D= #=}
+
+
Index: tags/2.0.1/tests/remote/bin.ref
===================================================================
--- tags/2.0.1/tests/remote/bin.ref	(nonexistent)
+++ tags/2.0.1/tests/remote/bin.ref	(revision 18980)
@@ -0,0 +1,18 @@
+msg 'cmd'
+ list (bin):
+  str (bin): 1/'1'
+  str (bin): 2/'ab'
+  str (bin): 3/'123'
+
+msg 'empty'
+ list (bin):
+  str (bin): 0/'(null)'
+  str (bin): 0/'(null)'
+  str (bin): 0/'(null)'
+
+msg 'nasty'
+ list (bin):
+  str (bin): 3/'{}
+'
+  str (bin): 3/' #='
+
Index: tags/2.0.1/tests/remote/lists.msg
===================================================================
--- tags/2.0.1/tests/remote/lists.msg	(nonexistent)
+++ tags/2.0.1/tests/remote/lists.msg	(revision 18980)
@@ -0,0 +1 @@
+bar((A B)(1 2 3){B=a B=b {C=11 C=12}})
Index: tags/2.0.1/tests/remote/lists.ref
===================================================================
--- tags/2.0.1/tests/remote/lists.ref	(nonexistent)
+++ tags/2.0.1/tests/remote/lists.ref	(revision 18980)
@@ -0,0 +1,16 @@
+msg 'bar'
+ list (text):
+  list (text):
+   str (text): 1/'A'
+   str (text): 1/'B'
+  list (text):
+   str (text): 1/'1'
+   str (text): 1/'2'
+   str (text): 1/'3'
+  list (bin):
+   str (bin): 1/'a'
+   str (bin): 1/'b'
+   list (bin):
+    str (bin): 2/'11'
+    str (bin): 2/'12'
+
Index: tags/2.0.1/tests/remote/simple.msg
===================================================================
--- tags/2.0.1/tests/remote/simple.msg	(nonexistent)
+++ tags/2.0.1/tests/remote/simple.msg	(revision 18980)
@@ -0,0 +1,2 @@
+foo()
+bar{}
Index: tags/2.0.1/tests/remote/simple.ref
===================================================================
--- tags/2.0.1/tests/remote/simple.ref	(nonexistent)
+++ tags/2.0.1/tests/remote/simple.ref	(revision 18980)
@@ -0,0 +1,6 @@
+msg 'foo'
+ list (text):
+
+msg 'bar'
+ list (bin):
+
Index: tags/2.0.1/tests/remote/test_all.sh
===================================================================
--- tags/2.0.1/tests/remote/test_all.sh	(nonexistent)
+++ tags/2.0.1/tests/remote/test_all.sh	(revision 18980)
@@ -0,0 +1,23 @@
+#!/bin/sh
+fail=0
+all=0
+for ref in *.ref
+do
+	bn=${ref%%.ref}
+	./test_parse < $bn.msg > $bn.out
+	diff -u $bn.ref $bn.out
+	if test $? = 0
+	then
+		rm $bn.out
+	else
+		fail=$(($fail+1))
+	fi
+	all=$(($all+1))
+done
+
+if test $fail = 0
+then
+	echo "remote:              *** QC PASS ***"
+else
+	echo "remote:  FAIL: $fail of $all"
+fi

Property changes on: tags/2.0.1/tests/remote/test_all.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/tests/remote/test_parse.c
===================================================================
--- tags/2.0.1/tests/remote/test_parse.c	(nonexistent)
+++ tags/2.0.1/tests/remote/test_parse.c	(revision 18980)
@@ -0,0 +1,41 @@
+#include <string.h>
+#include "base64.c"
+#include "proto_lowcommon.h"
+#include "proto_lowparse.h"
+#include "proto_lowdbg.h"
+
+int main()
+{
+	int line = 1, col = 1;
+	proto_ctx_t pctx;
+
+	memset(&pctx, 0, sizeof(pctx));
+
+	for(;;) {
+		parse_res_t res;
+		int c = getchar();
+		if (c == EOF)
+			return -1;
+		if (c == '\n') {
+			col = 1;
+			line++;
+		}
+		else
+			col++;
+		res = parse_char(&pctx, c);
+		switch(res) {
+			case PRES_ERR:
+				printf("parse error at %d:%d\n", line, col);
+				return 1;
+			case PRES_GOT_MSG:
+				printf("msg '%s'\n", pctx.pcmd);
+				proto_node_print(pctx.targ, 1);
+				printf("\n");
+				proto_node_free(pctx.targ);
+				break;
+			case PRES_PROCEED:
+				break;
+		}
+	}
+	return 0;
+}
Index: tags/2.0.1/tests/remote/text.msg
===================================================================
--- tags/2.0.1/tests/remote/text.msg	(nonexistent)
+++ tags/2.0.1/tests/remote/text.msg	(revision 18980)
@@ -0,0 +1 @@
+cmd(a e _ # foo bar)
Index: tags/2.0.1/tests/remote/text.ref
===================================================================
--- tags/2.0.1/tests/remote/text.ref	(nonexistent)
+++ tags/2.0.1/tests/remote/text.ref	(revision 18980)
@@ -0,0 +1,9 @@
+msg 'cmd'
+ list (text):
+  str (text): 1/'a'
+  str (text): 1/'e'
+  str (text): 1/'_'
+  str (text): 1/'#'
+  str (text): 3/'foo'
+  str (text): 3/'bar'
+
Index: tags/2.0.1/tests/strflags/Makefile
===================================================================
--- tags/2.0.1/tests/strflags/Makefile	(nonexistent)
+++ tags/2.0.1/tests/strflags/Makefile	(revision 18980)
@@ -0,0 +1,30 @@
+TRUNK=../..
+IO=$(TRUNK)/src_plugins/io_pcb
+CFLAGS = -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO) -I$(TRUNK)/src_3rd
+LDLIBS = -lm
+GDS= $(TRUNK)/src_3rd/genvector/gds_char.o
+
+all: tester
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test: tester.diff
+	@echo "strflags:            *** QC PASS ***"
+	@rm tester.stdout
+
+tester: tester.o $(GDS)
+	$(CC) $(LDFLAGS) -o tester tester.o $(GDS) $(LDLIBS)
+
+tester.o: tester.c
+	$(CC) -c $(CFLAGS) -o $@ tester.c
+
+tester.stdout: tester
+	./tester > tester.stdout
+
+tester.diff: tester.stdout
+	diff -u tester.ref tester.stdout
+
+clean:
+	-$(SCCBOX) rm -f tester tester.o
+
Index: tags/2.0.1/tests/strflags/tester.c
===================================================================
--- tags/2.0.1/tests/strflags/tester.c	(nonexistent)
+++ tags/2.0.1/tests/strflags/tester.c	(revision 18980)
@@ -0,0 +1,157 @@
+/*
+ *                            COPYRIGHT
+ *
+ *  PCB, interactive printed circuit board design
+ *  Copyright (C) 2005 DJ Delorie
+ *
+ *  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 2 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, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Contact addresses for paper mail and Email:
+ *  DJ Delorie, 334 North Road, Deerfield NH 03037-1110, USA
+ *  dj@delorie.com
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include "compat_misc.h"
+
+#define FLAG_TEST
+#include "flag_str.c"
+#include "flag.c"
+#include "compat_misc.c"
+
+static void dump_flag(pcb_flag_t * f)
+{
+	int l;
+	printf("F:%08x T:[", f->f);
+	for (l = 0; l < (PCB_MAX_LAYER + 7) / 8; l++)
+		printf(" %02x", f->t[l]);
+	printf("]");
+}
+
+int main()
+{
+	time_t now;
+	int i;
+	int errors = 0, count = 0;
+
+	time(&now);
+	srandom((unsigned int) now + getpid());
+
+	grow_layer_list(0);
+	for (i = 0; i < 16; i++) {
+		int j;
+		char *p;
+		if (i != 1 && i != 4 && i != 5 && i != 9)
+			set_layer_list(i, 1);
+		else
+			set_layer_list(i, 0);
+		p = print_layer_list();
+		printf("%2d : %20s =", i, p);
+		parse_layer_list(p + 1, 0);
+		for (j = 0; j < num_layers; j++)
+			printf(" %d", layers[j]);
+		printf("\n");
+	}
+
+	while (count < 1000000) {
+		FlagHolder fh;
+		char *str;
+		pcb_flag_t new_flags;
+		int i;
+		int otype;
+		unsigned char intconn;
+
+		otype = PCB_OBJ_ANY;
+		fh.Flags = empty_flags;
+		for (i = 0; i < PCB_ENTRIES(pcb_object_flagbits); i++) {
+			if (PCB_FLAG_TEST(pcb_object_flagbits[i].mask, &fh))
+				continue;
+			if ((otype & pcb_object_flagbits[i].object_types) == 0)
+				continue;
+			if ((random() & 4) == 0)
+				continue;
+
+			otype &= pcb_object_flagbits[i].object_types;
+			PCB_FLAG_SET(pcb_object_flagbits[i].mask, &fh);
+		}
+
+		if (otype & PCB_OBJ_CLASS_PIN)
+			for (i = 0; i < PCB_MAX_LAYER; i++)
+				if (random() & 4)
+					PCB_FLAG_THERM_ASSIGN(i, 3, &fh);
+
+		str = pcb_strflg_f2s(fh.Flags, otype, &intconn, 0);
+		new_flags = pcb_strflg_s2f(str, 0, &intconn, 0);
+
+		count++;
+		if (PCB_FLAG_EQ(fh.Flags, new_flags))
+			continue;
+		dump_flag(&fh.Flags);
+		printf(" ");
+		dump_flag(&new_flags);
+		printf("\n");
+		if (++errors == 5)
+			goto bad;
+	}
+
+	while (count < 1000000) {
+		FlagHolder fh;
+		char *str;
+		pcb_flag_t new_flags;
+		int i;
+		int otype;
+
+		otype = PCB_OBJ_ANY;
+		fh.Flags = empty_flags;
+		for (i = 0; i < PCB_ENTRIES(pcb_flagbits); i++) {
+			if (PCB_FLAG_TEST(pcb_flagbits[i].mask, &fh))
+				continue;
+			if ((random() & 4) == 0)
+				continue;
+
+			otype &= pcb_flagbits[i].object_types;
+			PCB_FLAG_SET(pcb_flagbits[i].mask, &fh);
+		}
+
+		str = pcb_strflg_board_f2s(fh.Flags);
+		new_flags = pcb_strflg_board_s2f(str, 0);
+
+		count++;
+		if (PCB_FLAG_EQ(fh.Flags, new_flags))
+			continue;
+
+		dump_flag(&fh.Flags);
+		printf(" ");
+		dump_flag(&new_flags);
+		printf("\n");
+
+		if (++errors == 5)
+			goto bad;
+	}
+	printf("%d out of %d failed\n", errors, count);
+	return errors;
+
+	bad:;
+	printf("%d out of %d FAILED\n", errors, count);
+	return errors;
+}
+
Index: tags/2.0.1/tests/strflags/tester.ref
===================================================================
--- tags/2.0.1/tests/strflags/tester.ref	(nonexistent)
+++ tags/2.0.1/tests/strflags/tester.ref	(revision 18980)
@@ -0,0 +1,17 @@
+ 0 :                  (0) = 1
+ 1 :                  (0) = 1
+ 2 :                (0,2) = 1 0 1
+ 3 :              (0,2,3) = 1 0 1 1
+ 4 :              (0,2,3) = 1 0 1 1
+ 5 :              (0,2,3) = 1 0 1 1
+ 6 :            (0,2,3,6) = 1 0 1 1 0 0 1
+ 7 :          (0,2,3,6,7) = 1 0 1 1 0 0 1 1
+ 8 :          (0,2,3,6-8) = 1 0 1 1 0 0 1 1 1
+ 9 :          (0,2,3,6-8) = 1 0 1 1 0 0 1 1 1
+10 :       (0,2,3,6-8,10) = 1 0 1 1 0 0 1 1 1 0 1
+11 :    (0,2,3,6-8,10,11) = 1 0 1 1 0 0 1 1 1 0 1 1
+12 :    (0,2,3,6-8,10-12) = 1 0 1 1 0 0 1 1 1 0 1 1 1
+13 :    (0,2,3,6-8,10-13) = 1 0 1 1 0 0 1 1 1 0 1 1 1 1
+14 :    (0,2,3,6-8,10-14) = 1 0 1 1 0 0 1 1 1 0 1 1 1 1 1
+15 :    (0,2,3,6-8,10-15) = 1 0 1 1 0 0 1 1 1 0 1 1 1 1 1 1
+0 out of 1000000 failed
Index: tags/2.0.1/tests/uniq_name/Makefile
===================================================================
--- tags/2.0.1/tests/uniq_name/Makefile	(nonexistent)
+++ tags/2.0.1/tests/uniq_name/Makefile	(revision 18980)
@@ -0,0 +1,33 @@
+ROOT=../..
+UNM=$(ROOT)/src_plugins/io_kicad
+LHT=$(ROOT)/src_3rd
+SRC=$(ROOT)/src
+
+CFLAGS = -Wall -I$(UNM) -I$(LHT) -I$(SRC) -I$(ROOT)
+LDLIBS = -lm
+LIB_OBJS=$(LHT)/genht/htsp.o $(LHT)/genht/hash.o $(SRC)/compat_misc.o $(LHT)/genvector/gds_char.o
+
+all: tester
+
+ROOT=../..
+include $(ROOT)/Makefile.conf
+
+test: tester.diff
+	@echo "uniq_name:           *** QC PASS ***"
+	@rm tester.out
+
+tester: tester.o $(UNM)/uniq_name.o $(LIB_OBJS)
+	$(CC) $(LDFLAGS) -o tester tester.o $(UNM)/uniq_name.o $(LIB_OBJS)  $(LDLIBS)
+
+tester.o: tester.c $(UNM)/uniq_name.h
+
+$(UNM)/uniq_name.o: $(UNM)/uniq_name.c $(UNM)/uniq_name.h
+
+tester.diff: tester.ref tester.out
+	@diff -u tester.ref tester.out
+
+tester.out: tester
+	./tester > tester.out
+
+clean:
+	-$(SCCBOX) rm -f tester.out tester tester.o
Index: tags/2.0.1/tests/uniq_name/tester.c
===================================================================
--- tags/2.0.1/tests/uniq_name/tester.c	(nonexistent)
+++ tags/2.0.1/tests/uniq_name/tester.c	(revision 18980)
@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include "uniq_name.h"
+
+int main()
+{
+	unm_t group1;
+
+	/* Initialize the group with defaults */
+	unm_init(&group1);
+
+	printf("'%s'\n", unm_name(&group1, "foo", (void *)0x01));
+	printf("'%s'\n", unm_name(&group1, "bar", (void *)0x42));
+	printf("'%s'\n", unm_name(&group1, "bar", (void *)0x66));
+	printf("'%s'\n", unm_name(&group1, "baz", NULL));
+
+	/* test forced collision */
+	printf("'%s'\n", unm_name(&group1, "forced", NULL));
+	printf("'%s'\n", unm_name(&group1, "forced_dup1", NULL));
+	printf("'%s'\n", unm_name(&group1, "forced_dup2", NULL));
+	printf("'%s'\n", unm_name(&group1, "forced", NULL)); /* this would end up as forced_dup3 */
+	printf("'%s'\n", unm_name(&group1, "forced", NULL)); /* ... _dup4 */
+
+	/* test global dup ctr */
+	printf("'%s'\n", unm_name(&group1, "foo", NULL)); /* ... _dup5 */
+
+	/* unknown name gets named */
+	printf("'%s'\n", unm_name(&group1, NULL, NULL)); /* this is the first unnamed item, so it won't get a suffix */
+	printf("'%s'\n", unm_name(&group1, NULL, NULL)); /* gets suffixed because of the collision */
+
+	/* empty name is like unknown name too */
+	printf("'%s'\n", unm_name(&group1, "", NULL));
+
+
+	/* Optional: change configuration, even on the fly: */
+	group1.unnamed = "anonymous";
+	group1.suffix_sep = "::";
+
+	/* Note: it is safe to reset the counter - worst case the collision loop
+	   will run some more before it finds a free name, but there won't be
+	   a collision */
+	group1.ctr = 0;
+
+	/* Adding three more unnamed items will demonstrate how the new config settings take effect */
+	printf("'%s'\n", unm_name(&group1, NULL, NULL));
+	printf("'%s'\n", unm_name(&group1, NULL, NULL));
+	printf("'%s'\n", unm_name(&group1, NULL, NULL));
+
+	/* Optional: iterate over all items once more, e.g. to generate an index
+	   Warning: order is not guaranteed. */
+	{
+		htsp_entry_t *e;
+		for (e = htsp_first(&group1.seen); e; e = htsp_next(&group1.seen, e)) {
+			printf("name='%s' user_data='", e->key);
+			if (e->value == NULL)
+				printf("(nil)'\n");
+			else
+				printf("%p'\n", e->value);
+		}
+	}
+
+	/* Release all memory */
+	unm_uninit(&group1);
+	return 0;
+}
Index: tags/2.0.1/tests/uniq_name/tester.ref
===================================================================
--- tags/2.0.1/tests/uniq_name/tester.ref	(nonexistent)
+++ tags/2.0.1/tests/uniq_name/tester.ref	(revision 18980)
@@ -0,0 +1,32 @@
+'foo'
+'bar'
+'bar_dup0'
+'baz'
+'forced'
+'forced_dup1'
+'forced_dup2'
+'forced_dup3'
+'forced_dup4'
+'foo_dup5'
+'unnamed'
+'unnamed_dup6'
+'unnamed_dup7'
+'anonymous'
+'anonymous::0'
+'anonymous::1'
+name='forced_dup1' user_data='(nil)'
+name='forced_dup2' user_data='(nil)'
+name='forced_dup3' user_data='(nil)'
+name='forced_dup4' user_data='(nil)'
+name='foo' user_data='0x1'
+name='baz' user_data='(nil)'
+name='bar_dup0' user_data='0x66'
+name='unnamed_dup6' user_data='(nil)'
+name='forced' user_data='(nil)'
+name='unnamed_dup7' user_data='(nil)'
+name='unnamed' user_data='(nil)'
+name='anonymous' user_data='(nil)'
+name='anonymous::0' user_data='(nil)'
+name='anonymous::1' user_data='(nil)'
+name='bar' user_data='0x42'
+name='foo_dup5' user_data='(nil)'
Index: tags/2.0.1/util/Makefile
===================================================================
--- tags/2.0.1/util/Makefile	(nonexistent)
+++ tags/2.0.1/util/Makefile	(revision 18980)
@@ -0,0 +1,35 @@
+# plain old hand crafted Makefile
+ROOT=..
+
+all:
+	cd gsch2pcb-rnd && $(MAKE) all
+
+include $(ROOT)/Makefile.conf
+
+clean:
+	cd gsch2pcb-rnd && $(MAKE) clean
+
+distclean:
+	cd gsch2pcb-rnd && $(MAKE) distclean
+
+install_all:
+	$(SCCBOX) mkdir -p  "$(BINDIR)" "$(LIBDIR)"
+	$(SCCBOX) $(HOW) "fp2anim" "$(BINDIR)/fp2anim"
+	$(SCCBOX) $(HOW) "fp2subc" "$(BINDIR)/fp2subc"
+	$(SCCBOX) $(HOW) "pcb-strip" "$(BINDIR)/pcb-strip"
+	$(SCCBOX) $(HOW) "pcb-prj2lht" "$(BINDIR)/pcb-prj2lht"
+	$(SCCBOX) $(HOW) "gnet-pcbrndfwd.scm" "$(LIBDIR)/gnet-pcbrndfwd.scm"
+	$(SCCBOX) $(HOW) "gnet-pcbrndfwd_elem.scm" "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
+
+install:
+	$(MAKE) install_all HOW="install -f"
+	cd gsch2pcb-rnd && $(MAKE) install
+
+linstall:
+	$(MAKE) install_all HOW="linstall -f"
+	cd gsch2pcb-rnd && $(MAKE) linstall
+
+uninstall:
+	$(MAKE) install_all HOW="uninstall"
+	cd gsch2pcb-rnd && $(MAKE) uninstall
+
Index: tags/2.0.1/util/README
===================================================================
--- tags/2.0.1/util/README	(nonexistent)
+++ tags/2.0.1/util/README	(revision 18980)
@@ -0,0 +1,3 @@
+Programs and scripts that are not integral part of the pcb executable.
+
+These are typically used as standalone utilities along with pcb-rnd.
Index: tags/2.0.1/util/bisecter/bisecter
===================================================================
--- tags/2.0.1/util/bisecter/bisecter	(nonexistent)
+++ tags/2.0.1/util/bisecter/bisecter	(revision 18980)
@@ -0,0 +1,339 @@
+#!/bin/sh
+#
+#   bisecter - cached svn bisection
+#   Copyright (C) 2017 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+#
+
+if test -z "$CONF"
+then
+	CONF="./bisecter.conf"
+fi
+
+if test ! -f "$CONF"
+then
+	echo "Can't find the config file $CONF; please copy bisect.conf.in to $CONF and edit" >&2
+	exit 1
+fi
+
+. $CONF
+mkdir -p "$cache"
+
+wlog()
+{
+	echo "$*"
+}
+
+svn_list_externs()
+{
+	svn --xml stat "$1" | awk '
+		BEGIN { q="\"" }
+		function strip(s) {
+			sub("^[^=]*=" q, "", s)
+			sub(q ".*$", "", s)
+			return s
+		}
+		/[<]entry/ { state=1 }
+		(state == 1) && /path=\"/ { path=strip($0) }
+		(state == 1) && /wc-status/ { state = 2 }
+		(state == 2) && /item=\"/ { item=strip($0) }
+		/[<]\/entry/ {
+			if ((item == "external") && (path != ""))
+				print path
+			item=""
+			path=""
+			state = 0
+		}
+	'
+}
+
+svn_get_date()
+{
+	svn info "$1" | awk '
+		/Last Changed Date:/ {
+			print $4, $5
+		}
+	'
+}
+
+svn_get_rev()
+{
+	svn info "$1" | awk '
+		/Last Changed Rev:/ {
+			print $4
+		}
+	'
+}
+
+svn_co()
+{
+	local rev=$1 dt e
+	svn checkout $url@$rev "$tmp/$rev"
+	dt=`svn_get_date "$tmp/$rev"`
+	for e in `svn_list_externs "$tmp/$rev"`
+	do
+		svn up $e -r "{$dt}"
+	done
+}
+
+svn_cleanup()
+{
+	local rev=$1
+	rm -rf "$tmp/$rev"
+}
+
+cache_save()
+{
+	local rev=$1 exebn
+	exebn=`basename $exe`
+
+	cp "$tmp/$rev/$exe" "$cache/$exebn.$rev"
+	if test ! -z "$cache_strip"
+	then
+		eval $cache_strip "$cache/$exebn.$rev" $redir
+	fi
+
+	if test ! -z "$cache_compress"
+	then
+		eval $cache_compress "$cache/$exebn.$rev" $redir
+	fi
+}
+
+cache_build()
+{
+	local rev=$1 save=$2 redir=">>log.$1 2>&1" exebn
+
+	(echo -n "#########################################"; date) >> log.$1
+
+	wlog "Checkout r$1"
+	eval "svn_co $rev $redir"
+
+	wlog "Compile r$1"
+	eval "(cd \"$tmp/$rev\" && ./configure $confopts && make) $redir"
+
+	if test ! -f "$tmp/$rev/$exe"
+	then
+		echo '#!/bin/sh
+		      echo Sorry, revision '$rev' can not be compiled.' > "$tmp/$rev/$exe"
+		chmod +x "$tmp/$rev/$exe"
+	fi
+
+	if test "0$save" -gt 0
+	then
+		exebn=`basename $exe`
+		cp "$tmp/$rev/$exe" "./$exebn.$rev"
+	fi
+
+	wlog "Cache save r$1"
+	cache_save "$rev"
+
+	wlog "Cleanup r$1"
+	eval svn_cleanup $rev $redir
+
+	mv log.$1 $cache
+	if test ! -z "$cache_compress"
+	then
+		$cache_compress "$cache/log.$1"
+	fi
+}
+
+cache_get()
+{
+	local rev=$1 exebn
+
+	exebn=`basename $exe`
+
+	if test -f "$cache/$exebn.$rev$cache_compsuffix"
+	then
+		echo "Retrieving $exebn.$rev from cache..."
+		cp $cache/$exebn.$rev$cache_compsuffix .
+		if test ! -z "$cache_decompress"
+		then
+			$cache_decompress "$exebn.$rev$cache_compsuffix"
+		fi
+	else
+		cache_build $rev 1
+	fi
+}
+
+run()
+{
+	local rev=$1 exebn
+
+	shift 1
+	exebn=`basename $exe`
+
+	cache_get $rev
+	./$exebn.$rev \
+		-c "rc/default_font_file=" \
+		-c "rc/default_pcb_file=" \
+		"$@"
+	rm $exebn.$rev
+}
+
+bisect()
+{
+	local first="$1" last="$2"
+
+	if test -z "$first"
+	then
+		first=$first_rev
+	fi
+
+	if test -z "$last"
+	then
+		last=`svn_get_rev $url`
+	fi
+
+	gawk -v "first=$first" -v "last=$last" '
+		BEGIN {
+			print "Bisecting between " first " and " last ", inclusive"
+			print "Usage:"
+			print "  Type \"rev good\" or \"rev bad\""
+			print "  (rev is the revision number you ran; can be omitted when the)"
+			print "  it is the revision that the script last offered)"
+			print ""
+			last_good=first
+			first_bad=last
+			offer()
+		}
+
+		function offer() {
+			if (last_good+1 == first_bad) {
+				print ""
+				print "-------- Result --------"
+				print "last_good=" last_good " first_bad=" first_bad
+				exit 0
+			}
+			offered=int((last_good+first_bad)/2)
+			tries=int(log(first_bad-last_good)/log(2) + 0.5)
+			print ""
+			print "(last_good=" last_good " first_bad=" first_bad " in about " tries " tries)"
+			print "Next rev to test: " offered
+			printf "> "
+			fflush()
+		}
+
+		{
+			rev=$1
+			if (rev != int(rev)) {
+				rev = offered
+				res = tolower($1)
+			}
+			else
+				res=tolower($2)
+			if (rev <= last_good) {
+				print "rev error " rev ": too low"
+				flush
+				next
+			}
+			if (rev > first_bad) {
+				print "rev error " rev ": too high"
+				flush
+				next
+			}
+
+			if (res == "good")
+				last_good = rev
+			else if (res == "bad")
+				first_bad = rev
+			else {
+				print "Syntax error " $2 ": please say good or bad"
+				flush
+				next
+			}
+
+			offer()
+		}
+	'
+}
+
+near()
+{
+	local rev=$1 exebn
+	exebn=`basename $exe`
+	ls $cache/$exebn.* | gawk -v "front=$cache/$exebn." -v "rev=$rev" '
+	BEGIN {
+		fl=length(front)
+		rev=int(rev)
+	}
+	{
+		r = substr($0, fl+1)
+		sub("[.].*$", "", r)
+		r = int(r)
+		print r
+	}
+	' | sort -n | gawk -v "rev=$rev" '
+	{
+		r=$0
+		if (r == rev) {
+			print r
+			found = 1
+			exit
+		}
+		if (r > rev) {
+			print last, r
+			found = 1
+			exit
+		}
+		last = r
+	}
+	END {
+		if (!found)
+			print last
+	}
+	'
+}
+
+help()
+{
+	echo "bisecter - support bisecting by cached executables"
+	echo ""
+	echo "Usage: ./bisecter command [args]"
+	echo "Commands:"
+	echo "  build rev       force check out and build rev"
+	echo "  get rev         get the executable of rev in CWD (build if needed)"
+	echo "  co rev          safely check out rev in tmp, but do not compile"
+	echo "  run rev [args]  get rev and run it with args"
+	echo "  near rev        print revisions present in the cache that are close to rev"
+	echo "  bisect [st end] bisect suggestions, optionally between revisions st and end"
+	echo "  help            this help screen"
+	echo ""
+}
+
+cmd="$1"
+if test -z "$cmd"
+then
+	help
+	exit 1
+fi
+
+shift 1
+
+case "$cmd"
+in
+	build) cache_build "$@" ;;
+	get) cache_get "$@" ;;
+	co|checkout) svn_co "$@" && echo "checked out to $tmp/$rev/$1" ;;
+	run) run "$@" ;;
+	bisect) bisect "$@" ;;
+	near) near "$@" ;;
+	*) help ;;
+esac
+
+

Property changes on: tags/2.0.1/util/bisecter/bisecter
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/bisecter/bisecter.conf.in
===================================================================
--- tags/2.0.1/util/bisecter/bisecter.conf.in	(nonexistent)
+++ tags/2.0.1/util/bisecter/bisecter.conf.in	(revision 18980)
@@ -0,0 +1,29 @@
+# where to do test compilations
+tmp=/tmp/bisecter
+
+# where to cache executables
+cache=./cache
+
+# command to use for stripping executables for the cache
+cache_strip=strip
+
+# how to compress executables for the cache
+cache_compress="xz -9"
+
+# how to decompress executables for the cache
+cache_decompress="xz -d"
+
+# suffix the compressor appends
+cache_compsuffix=".xz"
+
+# url to use
+url=svn://repo.hu/pcb-rnd/trunk
+
+# relative path of the executabe from url
+exe=src/pcb-rnd
+
+# ./configure options
+confopts="--debug --all=buildin --disable-acompnet"
+
+# first rev that's safe to test
+first_rev=3800
Index: tags/2.0.1/util/build_ps.sh
===================================================================
--- tags/2.0.1/util/build_ps.sh	(nonexistent)
+++ tags/2.0.1/util/build_ps.sh	(revision 18980)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# convert an ordered list of html documents into ps, using .png versions of
+# .svg images, inserting a page break between any two files.
+
+(for n in "$@"
+do
+	echo "<!--NewPage-->";
+	if test -z $HTML2PS_SED
+	then
+		cat $n
+	else
+		sed "$HMTL2PS_SED" $n
+	fi
+done) | sed "s/\.svg/.png/g" | html2ps $HTML2PS_OPTS --colour
+
+echo html2ps $HTML2PS_OPTS --colour >&2

Property changes on: tags/2.0.1/util/build_ps.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/cgi_common.sh
===================================================================
--- tags/2.0.1/util/cgi_common.sh	(nonexistent)
+++ tags/2.0.1/util/cgi_common.sh	(revision 18980)
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# shell lib
+
+url_decode()
+{
+awk '
+	function cd(n)
+	{
+		chr=sprintf("%c", n);
+		if (chr == "&")
+			chr = "\\&"
+		code="%" sprintf("%02x", n);
+		CODE[tolower(code)] = chr;
+		CODE[toupper(code)] = chr;
+	}
+
+	BEGIN {
+		for(n = 1; n < 256; n++)
+			cd(n);
+	}
+
+	{
+		tmp = $0;
+		gsub("[+]", " ", tmp);
+		for(c in CODE) {
+			gsub(c, CODE[c], tmp)
+		}
+		print tmp
+	}
+'
+}
+
+error()
+{
+	echo "Content-type: text/plain"
+	echo ""
+	echo "Error: $*"
+	exit 0
+}
+
+radio()
+{
+	local chk
+	if test "$3" = "$2"
+	then
+		chk=" checked=\"true\""
+	fi
+	echo "<input type=\"radio\" name=\"$1\" value=\"$2\"$chk>"
+}
+
+checked()
+{
+	if test ! -z "$1"
+	then
+		echo " checked=\"true\""
+	fi
+}
+
+fix_ltgt()
+{
+	sed "s/</\&lt;/g;s/>/\&gt;/g"
+}
+
+cgi_png()
+{
+	echo "Content-type: image/png"
+	echo ""
+	cparm=""
+	if test ! -z "$QS_mm"
+	then
+		cparm="$cparm --mm"
+	fi
+	if test ! -z "$QS_grid"
+	then
+		cparm="$cparm --grid-unit $QS_grid"
+	fi
+	if test ! -z "$QS_annotation"
+	then
+		annot=$QS_annotation
+	fi
+	if test ! -z "$QS_diamond"
+	then
+		cparm="$cparm --diamond"
+	fi
+	if test ! -z "$QS_photo"
+	then
+		cparm="$cparm --photo"
+	fi
+	if test ! -z "$QS_dimvalue"
+	then
+		annot="$annot:dimvalue"
+	fi
+	if test ! -z "$QS_dimname"
+	then
+		annot="$annot:dimname"
+	fi
+	if test ! -z "$QS_pins"
+	then
+		annot="$annot:pins"
+	fi
+	if test ! -z "$QS_background"
+	then
+		annot="$annot:background"
+	fi
+	case "$QS_thumb"
+	in
+		1) animarg="-x 64 -y 48" ;;
+		2) animarg="-x 128 -y 96" ;;
+		3) animarg="-x 192 -y 144" ;;
+		*) animarg="" ;;
+	esac
+	if test ! -z  "$annot"
+	then
+			cparm="$cparm --annotation $annot"
+	fi
+	(echo "$fptext" | $fp2anim $cparm; echo 'screenshot "/dev/stdout"') | $animator -H $animarg
+}
Index: tags/2.0.1/util/devhelpers/404.sh
===================================================================
--- tags/2.0.1/util/devhelpers/404.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/404.sh	(revision 18980)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# search the official web page for broken links
+
+echo "Collecting the log..." >&2
+wget --spider -o 404.raw.log -r -p http://repo.hu/projects/pcb-rnd
+
+echo "Evaluatng the log..." >&2
+awk '
+	function report() {
+		print url
+		rerorted = 1
+	}
+
+	/^--/ {
+		url=$0
+		sub("--.*--  *", "", url)
+		sub("^[(]try[^)]*[)] *", "", url)
+	}
+	/^$/ { url = ""; reported = 0 }
+	(reported) { next }
+	/response.*404/ { report() }
+	/broken link/ { report() }
+' < 404.raw.log | tee 404.log

Property changes on: tags/2.0.1/util/devhelpers/404.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/chgstat.sh
===================================================================
--- tags/2.0.1/util/devhelpers/chgstat.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/chgstat.sh	(revision 18980)
@@ -0,0 +1,231 @@
+#!/bin/sh
+#   chgstat - svn statistics on lines changed since the fork
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+if test -z $trunk
+then
+	trunk=../..
+fi
+dirs="$trunk/src $trunk/src_plugins"
+import=2
+exclude=""
+
+echo "Updating blame files..." >&2
+for d in $dirs
+do
+	for f in `find $d -name '*.[chly]'`
+	do
+		case "$f" in
+			*parse_y.c|*parse_y.h|*parse_l.c|*parse_l.h|*_sphash*) ;;
+			*)
+				src_date=`stat -c %Y $f`
+				if test -f $f.blm
+				then
+					blm_date=`stat -c %Y $f.blm`
+				else
+					blm_date=0
+				fi
+				if test $src_date -gt $blm_date
+				then
+					echo "blame: $f" >&2
+					svn blame $f > $f.blm
+				fi
+				;;
+		esac
+	done
+done
+
+echo "Calculating stats..." >&2
+for d in $dirs
+do
+	if test -d $d
+	then
+		cat `find $d -name '*.blm'`
+	fi
+done | awk -v import=$import '
+		BEGIN {
+			MASK[6735]++
+			MASK[6720]++
+			MASK[6719]++
+			MASK[6718]++
+			MASK[6713]++
+			MASK[6710]++
+			MASK[6709]++
+			MASK[6707]++
+			MASK[6705]++
+			MASK[6703]++
+			MASK[6701]++
+			MASK[6700]++
+			MASK[6699]++
+			MASK[6690]++
+			MASK[6689]++
+			MASK[6686]++
+			MASK[6683]++
+			MASK[6681]++
+			MASK[6679]++
+			MASK[6668]++
+			MASK[6667]++
+			MASK[6657]++
+			MASK[6610]++
+			MASK[6581]++
+			MASK[6570]++
+			MASK[6963]++
+###
+			MASK[7353]++
+			MASK[7344]++
+			MASK[7333]++
+			MASK[7312]++
+			MASK[7300]++
+			MASK[7297]++
+			MASK[7295]++
+			MASK[7293]++
+			MASK[7292]++
+			MASK[7291]++
+			MASK[7289]++
+			MASK[7288]++
+			MASK[7287]++
+			MASK[7217]++
+			MASK[7213]++
+			MASK[7212]++
+			MASK[7211]++
+			MASK[7185]++
+			MASK[7117]++
+			MASK[7086]++
+			MASK[7056]++
+			MASK[7044]++
+			MASK[7042]++
+			MASK[6975]++
+			MASK[6966]++
+			MASK[7357]++
+##
+			MASK[7371]++
+			MASK[7370]++
+			MASK[7369]++
+			MASK[7367]++
+			MASK[7365]++
+			MASK[7372]++
+##
+			MASK[7560]++
+			MASK[7564]++
+			MASK[7595]++
+			MASK[9342]++
+			MASK[9597]++
+			MASK[9766]++
+			MASK[10659]++
+			MASK[10662]++
+			MASK[10727]++
+			MASK[10752]++
+			MASK[10801]++
+			MASK[11028]++
+			MASK[11034]++
+			MASK[11035]++
+			MASK[11036]++
+			MASK[11074]++
+			MASK[11301]++
+			MASK[11302]++
+			MASK[11304]++
+			MASK[11320]++
+			MASK[11321]++
+			MASK[12102]++
+			MASK[12101]++
+			MASK[12100]++
+			MASK[12099]++
+			MASK[12098]++
+			MASK[12097]++
+			MASK[12096]++
+			MASK[12093]++
+			MASK[12092]++
+			MASK[12091]++
+			MASK[12089]++
+			MASK[12088]++
+			MASK[12087]++
+			MASK[12086]++
+			MASK[12083]++
+			MASK[12081]++
+			MASK[12080]++
+			MASK[12078]++
+			MASK[12068]++
+			MASK[12067]++
+
+			MASK[12120]++
+			MASK[12121]++
+			MASK[12122]++
+			MASK[12123]++
+			MASK[12124]++
+			MASK[12125]++
+			MASK[12126]++
+			MASK[12228]++
+			MASK[12273]++
+			MASK[12280]++
+			MASK[12292]++
+			MASK[12293]++
+			MASK[12377]++
+			MASK[12420]++
+			MASK[12421]++
+			MASK[12485]++
+			MASK[12563]++
+			MASK[12618]++
+			MASK[12640]++
+			MASK[12678]++
+			MASK[12695]++
+			MASK[12700]++
+			MASK[12721]++
+			MASK[12757]++
+			MASK[12788]++
+			MASK[12824]++
+			MASK[12954]++
+			MASK[13008]++
+			MASK[13516]++
+			MASK[13558]++
+			MASK[13890]++
+			MASK[13910]++
+			MASK[14168]++
+			MASK[14174]++
+		}
+
+		{
+			rev=int($1)
+			if (((rev >= 3871) && (rev <= 3914)) || ((rev >= 4065) && (rev <= 4068)) || (rev == 4023) || (rev == 4033) || (rev == 4095) || (rev == 4096) || (rev == 4122)) {
+# old plugins and export plugin import
+				old++
+			}
+			else if ((rev == 4550) || ((rev <= 4548) && (rev >= 4536)) || ((rev <= 4534) && (rev >= 4530)) || ((rev <= 4528) && (rev >= 4524)) || ((rev <= 4522) && (rev >= 4502)) || ((rev <= 4500) && (rev >= 4493)) || ((rev <= 4491) && (rev >= 4486)) || ((rev <= 4633) && (rev >= 4562)) || (rev == 4776) || (rev == 4847) || (rev == 4850) || (rev == 4856) || (rev == 4863) || (rev == 4866) || (rev == 4878) || (rev == 4914) || (rev == 4916) || (rev == 5002) || (rev == 5014) || (rev == 5253) || (rev == 5487) || (rev == 5665)) {
+# unravel
+				old++
+			}
+			else if ((rev == 6046) || (rev == 6063) || (rev == 6066) || (rev == 6072) || (rev == 6077) || (rev == 6079) || (rev == 6083) || (rev == 6084) || (rev == 6365) || (rev == 6447) || (rev == 6449) || (rev == 6487) || (rev == 6491) || ((rev >= 6507) && (rev <= 6511))  || (rev == 6548)) {
+# gtk splitup
+				old++
+			}
+			else if (rev in MASK) {
+# random maskout
+				old++
+			}
+			else if ((rev <= import) || (rev == 1022) || (rev == 3539) || (rev == 4187) || (rev == 6230) || (rev == 6292) || (rev == 6293) || (rev == 6297) || (rev == 6298) || (rev == 6299))
+				old++
+			else
+				new++
+		}
+
+		END {
+			print "old: " old
+			print "new: " new
+			print new/(old+new) * 100
+		}
+	'

Property changes on: tags/2.0.1/util/devhelpers/chgstat.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/chgstat_graph.sh
===================================================================
--- tags/2.0.1/util/devhelpers/chgstat_graph.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/chgstat_graph.sh	(revision 18980)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+URL=svn://repo.hu/pcb-rnd
+#URL=svn://10.0.0.3/pcb-rnd
+
+#tmp=`mktemp -d`
+tmp=/tmp/chgstat_graph
+export trunk="$tmp/trunk"
+mkdir -p $tmp
+
+for year in 2015 2016 2017
+do
+	for month in 1 2 3 4 5 6 7 8 9 10 11 12
+	do
+		svn checkout "$URL/trunk" "$trunk"  -r "{$year-$month-01}" >&2
+		echo "$year-$month"
+		./chgstat.sh
+		rm `find $trunk -name '*.blm'`
+	done
+done | tee -a CHG.GR
+

Property changes on: tags/2.0.1/util/devhelpers/chgstat_graph.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/chlog.sh
===================================================================
--- tags/2.0.1/util/devhelpers/chlog.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/chlog.sh	(revision 18980)
@@ -0,0 +1,2 @@
+#!/bin/sh
+svn log -r$1:HEAD | grep -v "^\(-*$\|r[0-9]\+\)"

Property changes on: tags/2.0.1/util/devhelpers/chlog.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/chlog_sort.sh
===================================================================
--- tags/2.0.1/util/devhelpers/chlog_sort.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/chlog_sort.sh	(revision 18980)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# read the outpot of chlog.sh and split it per topic and save the lines
+# into changelog-formatted files
+
+awk '
+	BEGIN {
+		IGNORE["todo"]=1
+		IGNORE["devlog"]=1
+		IGNORE["bugreport"]=1
+		IGNORE["blog_queue"]=1
+	}
+	
+	($1 ~ "^[[][^]]*\]$") {
+		tag=tolower($1)
+		sub("[[]", "", tag)
+		sub("\]", "", tag)
+
+		if (tag in IGNORE)
+			next
+
+		$1=""
+		line=$0
+		sub("^[ \t]*", "		", line)
+		if (!(tag in SEEN)) {
+			print "	[" tag "]" > "CHG." tag
+			SEEN[tag]++
+		}
+		print line > "CHG." tag
+		next
+	}
+	{
+		line=$0
+		sub("^[ \t]*", "		", line)
+		print line > "CHG.MISC"
+	}
+'

Property changes on: tags/2.0.1/util/devhelpers/chlog_sort.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/copyright_miss.sh
===================================================================
--- tags/2.0.1/util/devhelpers/copyright_miss.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/copyright_miss.sh	(revision 18980)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# This file is placed in the Public Domain.
+
+# Print the path of source files that may miss the copyright banner among
+# with their length in line
+
+find . -name '*.[chly]' -exec sh -c 'grep "^ [*]  Copyright [(]C[)]" {} >/dev/null || wc -l "{}"' \;

Property changes on: tags/2.0.1/util/devhelpers/copyright_miss.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/deblist.sh
===================================================================
--- tags/2.0.1/util/devhelpers/deblist.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/deblist.sh	(revision 18980)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# Process the debian/control file and produce a html table that explains
+# the purpose of each package
+
+echo '
+<html>
+<!-- THIS FILE IS GENERATED BY deblist.sh, DO NOT EDIT -->
+<head>
+	<title> pcb-rnd - Debian package list </title>
+<!--AUTO head begin-->
+
+<!--AUTO head end-->
+</head>
+<body>
+
+<!--AUTO navbar begin-->
+
+<!--AUTO navbar end-->
+
+<h1> pcb-rnd - Debian package list </h1>
+<table border=1 cellspacing=0>
+<tr><th>name <th> internal dependencies <th> description
+'
+
+awk '
+function out()
+{
+	if (pkg == "")
+		return
+	print "<tr><td><b>" pkg "</b><td>" deps "<td>" desc
+	pkg=""
+	deps=""
+	desc=""
+	para=0
+}
+
+/^Package:/ {
+	out();
+	pkg=$2
+	para=0
+}
+#Depends: ${misc:Depends}, ${shlibs:Depends}, pcb-rnd-core, pcb-rnd-gtk
+/^Depends:/ {
+	deps=$0
+	sub("Depends: *", "", deps)
+	gsub("[$][{][^}]*[}],?", "", deps)
+}
+
+/^ [.]/ {
+	if (para > 0)
+		desc = desc "<p>"
+	para++
+	next
+}
+
+(para > 0) {
+	desc = desc " " $0
+}
+
+END {
+	out()
+}
+'
+
+
+echo '
+</table>
+'
\ No newline at end of file

Property changes on: tags/2.0.1/util/devhelpers/deblist.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/font2c.sh
===================================================================
--- tags/2.0.1/util/devhelpers/font2c.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/font2c.sh	(revision 18980)
@@ -0,0 +1,96 @@
+#!/bin/sh
+#   font2c - convert a pcb font to simplified embedded font structs for pcb-rnd
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+awk '
+
+BEGIN {
+	minx = 100000
+	miny = 100000
+	maxx = 0
+	maxy = 0
+	print "/* This file is autogenerated by font2c.sh - DO NOT EDIT */"
+	print ""
+	print "/* Internal copy of the default font; used when no font file is found */"
+	print ""
+}
+
+function bump(x, y)
+{
+	if (x < minx) minx = x
+	if (y < miny) miny = y
+	if (x > maxx) maxx = x
+	if (y > maxy) maxy = y
+}
+
+/Symbol[(]/ {
+	sym=substr($0, 9, 1)
+	ADV[sym]=int(substr($0, 11, length($0)))
+	NLINE[sym] = 0
+}
+
+/SymbolLine[(]/ {
+	sub("[ \t]*SymbolLine[(]", "", $0)
+	X1[sym, NLINE[sym]] = int($1)
+	Y1[sym, NLINE[sym]] = int($2)
+	X2[sym, NLINE[sym]] = int($3)
+	Y2[sym, NLINE[sym]] = int($4)
+	TH[sym, NLINE[sym]] = int($5)
+	bump(int($1), int($2))
+	bump(int($3), int($4))
+	NLINE[sym]++
+}
+
+END {
+	for(n = 0; n < 128; n++) {
+		c = sprintf("%c", n)
+		if (c in ADV) {
+			if ((n > 32) && !(c ~ "[{}()]"))
+				annot = " /* " c " */"
+			else
+				annot = ""
+			print "static embf_line_t embf_line_" n "[] = {" annot
+			for(l = 0; l < NLINE[c]; l++)
+				print "	{" X1[c, l] ", " Y1[c, l] ",\t\t" X2[c, l] ", " Y2[c, l] ",\t\t" TH[c, l] "}" ((l < NLINE[c]-1) ? "," : "")
+			if (NLINE[c] == 0)
+				print "	{0,0,0,0}"
+			print "};"
+		};
+	}
+
+	print "/***************************************************************/"
+	print "static int embf_minx = " minx ";"
+	print "static int embf_miny = " miny ";"
+	print "static int embf_maxx = " maxx ";"
+	print "static int embf_maxy = " maxy ";"
+
+	print "static embf_font_t embf_font[] = {"
+	for(n = 0; n < 128; n++) {
+		c = sprintf("%c", n)
+		comma = ((n < 127) ? "," : "")
+		if (c in ADV) {
+			print "	{" ADV[c] ", embf_line_" n ", " NLINE[c] "}" comma
+		}
+		else {
+			print "	{0, NULL, 0}" comma
+		}
+	}
+	print "};"
+}
+'

Property changes on: tags/2.0.1/util/devhelpers/font2c.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/inc_valid.sh
===================================================================
--- tags/2.0.1/util/devhelpers/inc_valid.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/inc_valid.sh	(revision 18980)
@@ -0,0 +1,56 @@
+#!/bin/sh
+#   inc_weed_out - check whether a source file has valid #includes for pcb-rnd
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+# include validation:
+#  - in .c files config.h must be included
+#  - warn for duplicate #includes
+
+# Usage:
+#  1. compile the whole project so that all dependencies of the target file are compiled
+#  2. inc_valid.sh foo.c
+#  3. check the output, fix #includes
+#  4. compile by hand to check
+#
+#  NOTE: conditional code also requires manual examination 
+
+# set up file names
+fn_c=$1
+
+# comment one #include (index is $1, save output in $2, print the #include line to stdout)
+valid()
+{
+	awk -v "fn=$1" '
+		/^#[ \t]*include/ {
+			SEEN[$2]++
+		}
+		END {
+			for(h in SEEN)
+				if (SEEN[h] > 1)
+					print "W " fn ": multiple include of " h
+			if ((fn ~ "[.]c$") && (! ("\"config.h\"" in SEEN)))
+				print "E " fn ": missing config.h"
+		}
+	' < "$1"
+}
+
+for n in "$@"
+do
+	valid "$n"
+done

Property changes on: tags/2.0.1/util/devhelpers/inc_valid.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/inc_weed_out.sh
===================================================================
--- tags/2.0.1/util/devhelpers/inc_weed_out.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/inc_weed_out.sh	(revision 18980)
@@ -0,0 +1,94 @@
+#!/bin/sh
+#   inc_weed_out - list #includes that can be removed without introducing warnings
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+# include weed-out: attempt to compile an object with each #include lines
+# commented out one by one; if commenting an #include doesn't change compiler
+# warnings, that include is potentially unneeded.
+
+# Usage:
+#  1. compile the whole project so that all dependencies of the target file are compiled
+#  2. inc_weed_out.sh foo.c
+#  3. check the output, remove #includes
+#  4. compile by hand to check
+#
+#  NOTE: the script runs 'make foo.o' - your local Makefile needs to be able
+#        to compile foo.o
+#  NOTE: sometimes disabling multiple #includes have different effect than
+#        disabling them one by one - always check manually.
+#  NOTE: conditional code also requires manual examination - the script may
+#        find an #include can be removed with the current settings but the
+#        same include may be needed with different ./configure settings
+
+# set up file names
+fn_c=$1
+fn_o=${1%.c}.o
+fn_c_backup=$fn_c.inc_weed_out
+fn_refo=$1.refo
+fn_tmpo=$1.tmpo
+
+# comment one #include (index is $1, save output in $2, print the #include line to stdout)
+weed_out()
+{
+	awk -v "target=$1" -v "outf=$2" '
+		/^#[ \t]*include/ {
+			count++
+			if (count == target) {
+				print "/*" $0 "*/" > outf
+				print $0
+				found=1
+				next
+			}
+		}
+		{ print $0 > outf }
+		END {
+			exit(found!=1)
+		}
+	'
+}
+
+# make a backup
+cp $fn_c $fn_c_backup
+
+# generate initial/reference warning text
+touch $fn_c
+make $fn_o >/dev/null 2>$fn_refo
+
+# loop over #include indices
+cnt=1
+while true
+do
+	# comment out the next #include or break if there's no more
+	name=`weed_out $cnt < $fn_c_backup $fn_c`
+	if test -z "$name"
+	then
+		break
+	fi
+
+	# test compile to see if we got new warnings compared to the reference
+	make $fn_o 2>$fn_tmpo >/dev/null
+	diff $fn_refo $fn_tmpo >/dev/null && echo REMOVE: $fn_c $cnt $name
+
+	# start over
+	cnt=$(($cnt+1))
+done
+
+# clean up
+mv $fn_c_backup $fn_c
+rm $fn_refo $fn_tmpo

Property changes on: tags/2.0.1/util/devhelpers/inc_weed_out.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/pcb-rtrip
===================================================================
--- tags/2.0.1/util/devhelpers/pcb-rtrip	(nonexistent)
+++ tags/2.0.1/util/devhelpers/pcb-rtrip	(revision 18980)
@@ -0,0 +1,122 @@
+#!/bin/sh
+#   pcb-rtrip - load-save-load round trip tester
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+pcb_rtrip()
+{
+	rm -f "$fn.new.pcb"
+
+	if test ! -z "$remtgt"
+	then
+		rm -f "$fn.trgt.$ext"
+	fi
+
+echo '
+SaveTo(LayoutAs, '$fn'.orig.pcb, pcb)
+LoadFrom(Layout, '$fn'.orig.pcb)
+SaveTo(LayoutAs, '$fn'.trgt.'$ext', '$fmt')
+LoadFrom(Layout, '$fn'.trgt.'$ext', '$fmt')
+SaveTo(LayoutAs, '$fn'.new.pcb, pcb)
+' | $valg $pcb_rnd_bin --gui batch "$fn"
+
+	if test -f "$fn.orig.pcb" -a -f "$fn.new.pcb"
+	then
+		diff -u "$fn.orig.pcb" "$fn.new.pcb"
+	else
+		if test ! -f "$fn.orig.pcb"
+		then
+			echo "Failed to load $fn"
+		else
+			echo "Failed to load $fn.trgt.$ext"
+		fi
+	fi
+}
+
+set_ext()
+{
+	case "$fmt"
+	in
+		lihata) ext="lht";;
+		pcb) ext="pcb";;
+		*) ext="$fmt";;
+	esac
+}
+
+help()
+{
+	echo "pcb-rtrip - load-save-load round trip tester"
+	echo ""
+	echo "Load a board, save it (*.orig.pcb), load it, save it in the target"
+	echo "format (*.trgt.*), load it again and save it (*.new.pcb). Calculate"
+	echo "the diff between *.orig.pcb and *.new.pcb; if load-save-load round trip"
+	echo "of a target format is lossles, the diff is empty."
+	echo ""
+	echo "Invocation: $0 [-f fmt] [input.pcb]"
+	echo "Switches:"
+	echo " -f fmt   format (e.g. lihata)"
+	echo " -r       remove target before overwrite"
+	echo " -b bin   run bin instead of \"pcb-rnd\""
+	echo " -V       wrap the binary in valgrind"
+	echo ""
+}
+
+
+# defaults
+fmt="lihata"
+fn=""
+remtgt=""
+if test -z "$pcb_rnd_bin"
+then
+	pcb_rnd_bin="pcb-rnd"
+fi
+valg=""
+
+while test $# -gt 0
+do
+	case "$1"
+	in
+		--help) help "$0"; exit 0;;
+		-f) fmt=$2; shift 1;;
+		-b) pcb_rnd_bin=$2; shift 1;;
+		-V) valg="valgrind -v";;
+		-r) remtgt=1;;
+		*)
+			if test -z "$fn"
+			then
+				fn="$1"
+			else
+				echo "unknown switch $1; try --help" >&2
+				exit 1
+			fi
+			;;
+		-*) echo "unknown switch $1; try --help" >&2; exit 1;;
+	esac
+	shift 1
+done
+
+if test -z "$fn"
+then
+	echo "no fn"
+	exit 1
+	fn="pcb-rtrip.pcb"
+	cat >$fn
+fi
+
+set_ext
+pcb_rtrip

Property changes on: tags/2.0.1/util/devhelpers/pcb-rtrip
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/rename.sh
===================================================================
--- tags/2.0.1/util/devhelpers/rename.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/rename.sh	(revision 18980)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+find . -name '*.[chly]' -exec sed -i "$@" {} \;
+

Property changes on: tags/2.0.1/util/devhelpers/rename.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/renamea.sh
===================================================================
--- tags/2.0.1/util/devhelpers/renamea.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/renamea.sh	(revision 18980)
@@ -0,0 +1,10 @@
+#!/bin/sh
+echo "Renaming action $1" >&2
+
+na=`echo $1 | sed "s/^Action//"`
+lc=`echo $na | tr "[A-Z]" "[a-z]"`
+
+./renameo.sh "$1"            "pcb_act_$na"
+./renameo.sh "${lc}_help"    "pcb_acth_$na"
+./renameo.sh "${lc}_syntax"  "pcb_acts_$na"
+./rename.sh "s/\\([^a-zA-Z0-9_]\\)AFAIL[(]${lc}[)]/\\1PCB_ACT_FAIL($na)/g"

Property changes on: tags/2.0.1/util/devhelpers/renamea.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/renamef.sh
===================================================================
--- tags/2.0.1/util/devhelpers/renamef.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/renamef.sh	(revision 18980)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Rename a function and log
+
+./rename.sh "s/\\([^a-zA-Z0-9_>.]\\)${1}[ \t]*[(]/\\1$2(/g"
+./rename.sh "s/^${1}[ \t]*[(]/$2(/g"
+
+echo "$1 -> $2" >> doc/developer/renames

Property changes on: tags/2.0.1/util/devhelpers/renamef.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/renameo.sh
===================================================================
--- tags/2.0.1/util/devhelpers/renameo.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/renameo.sh	(revision 18980)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+./rename.sh "
+	s/\\([^a-zA-Z0-9_]\\)${1}\\([^a-zA-Z0-9_]\\)/\\1$2\\2/g;
+	s/^${1}\\([^a-zA-Z0-9_]\\)/$2\\1/g;
+	s/\\([^a-zA-Z0-9_]\\)${1}$/\\1$2/g;
+"
+
+echo "$1 -> $2" >> doc/developer/renames

Property changes on: tags/2.0.1/util/devhelpers/renameo.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/subst/README
===================================================================
--- tags/2.0.1/util/devhelpers/subst/README	(nonexistent)
+++ tags/2.0.1/util/devhelpers/subst/README	(revision 18980)
@@ -0,0 +1,3 @@
+Scripts to convert mainline code to pcb-rnd after the namespace cleanups in
+trunk/
+
Index: tags/2.0.1/util/devhelpers/subst/subst_const.sh
===================================================================
--- tags/2.0.1/util/devhelpers/subst/subst_const.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/subst/subst_const.sh	(revision 18980)
@@ -0,0 +1,25 @@
+#!/bin/sh
+for n in `find . -name "*.[chly]"`
+do
+sed '
+{
+
+s/COORD_TO_MIL/PCB_COORD_TO_MIL/g
+s/MIL_TO_COORD/PCB_MIL_TO_COORD/g
+s/COORD_TO_MM/PCB_COORD_TO_MM/g
+s/MM_TO_COORD/PCB_MM_TO_COORD/g
+s/COORD_TO_INCH/PCB_COORD_TO_INCH/g
+s/INCH_TO_COORD/PCB_INCH_TO_COORD/g
+
+s/RAD_TO_DEG/PCB_RAD_TO_DEG/g
+s/TAN_22_5_DEGREE_2/PCB_TAN_22_5_DEGREE_2/g
+s/COS_22_5_DEGREE/PCB_COS_22_5_DEGREE/g
+s/TAN_30_DEGREE/PCB_TAN_30_DEGREE/g
+s/TAN_60_DEGREE/PCB_TAN_60_DEGREE/g
+s/LN_2_OVER_2/PCB_LN_2_OVER_2/g
+s/UNSCALE_TEXT/PCB_UNSCALE_TEXT/g
+s/SCALE_TEXT/PCB_SCALE_TEXT/g
+s/M180/PCB_M180/g
+}
+' -i $n
+done

Property changes on: tags/2.0.1/util/devhelpers/subst/subst_const.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/subst/subst_flags.sh
===================================================================
--- tags/2.0.1/util/devhelpers/subst/subst_flags.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/subst/subst_flags.sh	(revision 18980)
@@ -0,0 +1,38 @@
+#!/bin/sh
+for n in `find . -name "*.[chly]"`
+do
+sed '
+{
+s/NOPASTEFLAG/PCB_FLAG_NOPASTE/g
+s/PININPOLYFLAG/PCB_FLAG_PININPOLY/g
+s/CLEARPOLYFLAG/PCB_FLAG_CLEARPOLY/g
+s/HIDENAMEFLAG/PCB_FLAG_HIDENAME/g
+s/DISPLAYNAMEFLAG/PCB_FLAG_DISPLAYNAME/g
+s/CLEARLINEFLAG/PCB_FLAG_CLEARLINE/g
+s/FULLPOLYFLAG/PCB_FLAG_FULLPOLY/g
+s/SELECTEDFLAG/PCB_FLAG_SELECTED/g
+s/ONSOLDERFLAG/PCB_FLAG_ONSOLDER/g
+s/SQUAREFLAG/PCB_FLAG_SQUARE/g
+s/RUBBERENDFLAG/PCB_FLAG_RUBBEREND/g
+s/USETHERMALFLAG/PCB_FLAG_USETHERMAL/g
+s/ONSILKFLAG/PCB_FLAG_ONSILK/g
+s/OCTAGONFLAG/PCB_FLAG_OCTAGON/g
+s/LOCKFLAG/PCB_FLAG_LOCK/g
+s/EDGE2FLAG/PCB_FLAG_EDGE2/g
+s/VISITFLAG/PCB_FLAG_VISIT/g
+s/NONETLISTFLAG/PCB_FLAG_NONETLIST/g
+s/MINCUTFLAG/PCB_FLAG_MINCUT/g
+s/ONPOINTFLAG/PCB_FLAG_ONPOINT/g
+s/NOCOPY_FLAGS/PCB_FLAG_NOCOPY/g
+s/FOUNDFLAG/PCB_FLAG_FOUND/g
+s/HOLEFLAG/PCB_FLAG_HOLE/g
+s/AUTOFLAG/PCB_FLAG_AUTO/g
+s/WARNFLAG/PCB_FLAG_WARN/g
+s/RATFLAG/PCB_FLAG_RAT/g
+s/PINFLAG/PCB_FLAG_PIN/g
+s/VIAFLAG/PCB_FLAG_VIA/g
+s/DRCFLAG/PCB_FLAG_DRC/g
+s/NOFLAG/PCB_FLAG_NO/g
+}
+' -i $n
+done

Property changes on: tags/2.0.1/util/devhelpers/subst/subst_flags.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/subst/subst_mode.sh
===================================================================
--- tags/2.0.1/util/devhelpers/subst/subst_mode.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/subst/subst_mode.sh	(revision 18980)
@@ -0,0 +1,27 @@
+#!/bin/sh
+for n in `find . -name "*.[chly]"`
+do
+sed '
+{
+	s/RECTANGLE_MODE/PCB_MODE_RECTANGLE/g
+	s/POLYGON_MODE/PCB_MODE_POLYGON/g
+	s/PASTEBUFFER_MODE/PCB_MODE_PASTE_BUFFER/g
+	s/ROTATE_MODE/PCB_MODE_ROTATE/g
+	s/REMOVE_MODE/PCB_MODE_REMOVE/g
+	s/INSERTPOINT_MODE/PCB_MODE_INSERT_POINT/g
+	s/RUBBERBANDMOVE_MODE/PCB_MODE_RUBBERBAND_MOVE/g
+	s/THERMAL_MODE/PCB_MODE_THERMAL/g
+	s/ARROW_MODE/PCB_MODE_ARROW/g
+	s/LOCK_MODE/PCB_MODE_LOCK/g
+	s/POLYGONHOLE_MODE/PCB_MODE_POLYGON_HOLE/g
+	s/ARC_MODE/PCB_MODE_ARC/g
+	s/PAN_MODE/PCB_MODE_PAN/g
+	s/MOVE_MODE/PCB_MODE_MOVE/g
+	s/COPY_MODE/PCB_MODE_COPY/g
+	s/TEXT_MODE/PCB_MODE_TEXT/g
+	s/NO_MODE/PCB_MODE_NO/g
+	s/VIA_MODE/PCB_MODE_VIA/g
+	s/LINE_MODE/PCB_MODE_LINE/g
+}
+' -i $n
+done

Property changes on: tags/2.0.1/util/devhelpers/subst/subst_mode.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/devhelpers/subst/subst_objtype.sh
===================================================================
--- tags/2.0.1/util/devhelpers/subst/subst_objtype.sh	(nonexistent)
+++ tags/2.0.1/util/devhelpers/subst/subst_objtype.sh	(revision 18980)
@@ -0,0 +1,30 @@
+#!/bin/sh
+for n in `find . -name *.[chly]`
+do
+sed '
+{
+s/PIN_TYPES/PCB_TYPEMASK_PIN/g;
+s/LOCK_TYPES/PCB_TYPEMASK_LOCK/g;
+s/ALL_TYPES/PCB_TYPEMASK_ALL/g;
+
+s/RATLINE_TYPE/PCB_TYPE_RATLINE/g;
+s/ELEMENTNAME_TYPE/PCB_TYPE_ELEMENT_NAME/g;
+s/POLYGONPOINT_TYPE/PCB_TYPE_POLYGON_POINT/g;
+s/LINEPOINT_TYPE/PCB_TYPE_LINE_POINT/g;
+s/ELEMENTLINE_TYPE/PCB_TYPE_ELEMENT_LINE/g;
+s/ELEMENTARC_TYPE/PCB_TYPE_ELEMENT_ARC/g;
+
+s/NO_TYPE/PCB_TYPE_NONE/g;
+s/VIA_TYPE/PCB_TYPE_VIA/g;
+s/ELEMENT_TYPE/PCB_TYPE_ELEMENT/g;
+s/LINE_TYPE/PCB_TYPE_LINE/g;
+s/POLYGON_TYPE/PCB_TYPE_POLYGON/g;
+s/TEXT_TYPE/PCB_TYPE_TEXT/g;
+s/PIN_TYPE/PCB_TYPE_PIN/g;
+s/PAD_TYPE/PCB_TYPE_PAD/g;
+s/ARC_TYPE/PCB_TYPE_ARC/g;
+s/LOCKED_TYPE/PCB_TYPE_LOCKED/g;
+s/NET_TYPE/PCB_TYPE_NET/g;
+}
+' -i $n
+done

Property changes on: tags/2.0.1/util/devhelpers/subst/subst_objtype.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/fp2anim
===================================================================
--- tags/2.0.1/util/fp2anim	(nonexistent)
+++ tags/2.0.1/util/fp2anim	(revision 18980)
@@ -0,0 +1,703 @@
+#!/bin/sh
+
+photo=0
+grid_unit="mil"
+
+annotation=pins
+
+while test $# -gt 0
+do
+	case $1 in
+		--photo|p) photo=1;;
+		--grid-unit|g) grid_unit=$2; shift 1;;
+		--mm) grid_unit="mm";;
+		--diamond) diamond=1;;
+		--annotation) annotation=$2; shift 1;;
+	esac
+	shift 1
+done
+
+
+
+awk -v "photo=$photo" -v "grid_unit=$grid_unit" -v "diamond=$diamond" -v "annotation=$annotation" '
+
+BEGIN {
+	diamond_x = 0
+	diamond_y = 0
+
+	dim_arrow_len = 2000
+
+	q="\""
+
+	ds = 100*20
+	offs_3d = 150
+
+	if (photo) {
+		clr_board[-1] = "#003300"
+		clr_board[0]  = "#006600"
+		clr_board[1]  = "#22AA22"
+
+		clr_plated[-1] = "#555555"
+		clr_plated[0]  = "#777777"
+		clr_plated[1]  = "#999999"
+
+		clr_silk[-1] = "#AAAAAA"
+		clr_silk[0] = "#CCCCCC"
+		clr_silk[1] = "#FFFFFF"
+
+		clr_solderstop[0] = "#00BB00"
+
+
+		clr_hole[0] = "black"
+		clr_grid[0] = "blue"
+	}
+	else {
+		clr_board[0] = "darkgreen"
+		clr_plated[0] = "#777777"
+		clr_hole[0] = "white"
+		clr_silk[0] = "black"
+		clr_solderstop[0] = "white"
+		clr_grid[0] = "blue"
+	}
+
+	clr_annotation[0] = "#ff0000"
+	clr_annotationbg[0] = "#ffffff"
+
+	marg=100000
+
+	if (annotation != "none") {
+		enable_annot = 1
+		if (annotation ~ "pins")
+			enable_pinnum = 1
+		if (annotation ~ "dimname")
+			enable_dim_name = 1
+		if (annotation ~ "dimvalue")
+			enable_dim_value = 1
+		if (annotation ~ "background")
+			enable_annotbg = 1
+	}
+
+	if (grid_unit == "mil") {
+		gstep = 10000
+		gmul = 1/100
+	}
+	else {
+		gstep = 3937
+		gmul = 1/3937
+	}
+
+	vf_data = vf_load("/usr/share/animator/romansimplexmono")
+}
+
+### vector font ###
+function vf_load(fn,       s)
+{
+	while((getline < fn) == 1) {
+		if ($1 == "!")
+			glyphw[$2] = $3
+		else if ($1 == "!font")
+			for(i=32; i<=127; i++)
+				font[$2 sprintf("%c", i)] = $(i-29)
+		else
+			s = s "\n" $0
+	}
+	close(fn)
+	return s
+}
+
+function vf_textwidth(fnt, text,                           x,k) {
+	x=0
+	for(k=1; k<=length(text); k+=1)
+		x += glyphw[font[fnt substr(text,k,1)]]
+	return x
+}
+
+function vf_show(fnt, text,                                  k,s) {
+	for(k=1; k<=length(text); k+=1)
+		s = s "\ninvoke hf" font[fnt substr(text,k,1)]
+	return s
+}
+
+###
+
+function directive(term     ,tmp)
+{
+	while(!($0 ~ term "[ \t]*$")) {
+		if ((getline tmp) < 1) {
+			print "Premature end of file looking for " term " of " $1 > "/dev/stderr"
+			exit 1
+		}
+		$0 = $0 " " tmp
+	}
+#	print "directive: |" term "|" $0 "|" > "/dev/stderr"
+}
+
+function edges(x, y)
+{
+	if ((xmin == "") || (x < xmin))
+		xmin = x
+	if ((ymin == "") || (y < ymin))
+		ymin = y
+	if ((xmax == "") || (x > xmax))
+		xmax = x
+	if ((ymax == "") || (y > ymax))
+		ymax = y
+}
+
+# draw a line with rounded ends
+# do not draw end circles if omit_ends is non-zero
+# extend both ends by length_bloat
+function rline(x1, y1, x2, y2, width    ,omit_ends , length_bloat    ,nx,ny,vx,vy, len)
+{
+
+	nx = y2-y1
+	ny = -(x2-x1)
+
+	len=sqrt(nx*nx+ny*ny)
+	if (len != 0) {
+		nx /= len
+		ny /= len
+		vx = -ny
+		vy = nx
+
+		if (length_bloat != 0) {
+			x1 -= length_bloat * vx
+			x2 += length_bloat * vx
+			y1 -= length_bloat * vy
+			y2 += length_bloat * vy
+		}
+
+# if there are no end circles, we are square and should extend by extra width/2
+		if (omit_ends) {
+			x1 -= (width/2) * vx
+			x2 += (width/2) * vx
+			y1 -= (width/2) * vy
+			y2 += (width/2) * vy
+		}
+
+		print "poly", x1+nx*width/2, y1+ny*width/2, x2+nx*width/2, y2+ny*width/2, x2-nx*width/2, y2-ny*width/2, x1-nx*width/2, y1-ny*width/2
+		edges(x1+nx*width/2, y1+ny*width/2)
+		edges(x2+nx*width/2, y2+ny*width/2)
+		edges(x2-nx*width/2, y2-ny*width/2)
+		edges(x1-nx*width/2, y1-ny*width/2)
+	}
+
+	if (!omit_ends) {
+		print "fillcircle", x1, y1, width/2, width/10
+		if ((x1 != x2) || (y1 != y2))
+			print "fillcircle", x2, y2, width/2, width/10
+
+		edges(x1-width/2, y1-width/2)
+		edges(x2+width/2, y2+width/2)
+	}
+
+	edges(x1, y1)
+	edges(x2, y2)
+}
+
+function deg2rad(d)
+{
+	return d/180*3.141592654
+}
+
+function rarc(cx, cy, rx, ry, a_start, a_delta, width   ,a1, a2)
+{
+	if ((rx < 0) || (ry < 0))
+		return
+
+	if (a_delta < 0) {
+		a_start = 180-a_start
+		a_delta = -a_delta
+	}
+
+	step = a_delta * 100 * 2 / (((rx > ry) ? rx : ry) + 1)
+	if (step > 45)
+		step = 45
+
+	for(a1 = a_start; a1 < a_start + a_delta - step; a1 += step) {
+		a2 = a1+step
+		rline( cx - rx * cos(deg2rad(a1)), cy + ry * sin(deg2rad(a1)),
+		       cx - rx * cos(deg2rad(a2)), cy + ry * sin(deg2rad(a2)),
+		       width, 0)
+	}
+
+	a1 = a2;
+	a2 = a_start+a_delta
+	rline( cx - rx * cos(deg2rad(a1)), cy + ry * sin(deg2rad(a1)),
+	       cx - rx * cos(deg2rad(a2)), cy + ry * sin(deg2rad(a2)),
+	       width, 0)
+
+}
+
+function rsquare(x1, y1, x2, y2, r   ,tmp)
+{
+	if (x1 < x2) {
+		tmp=x1
+		x1 = x2
+		x2 = tmp
+	}
+	if (y1 < y2) {
+		tmp=y1
+		y1 = y2
+		y2 = tmp
+	}
+
+	print "poly", x1, y1-r,x1-r, y1,  x2+r,y1, x2, y1-r,    x2, y2+r,   x2+r,y2,     x1-r, y2,  x1, y2+r
+	print "fillcircle", x1-r, y1-r, r, r/10
+	print "fillcircle", x2+r, y2+r, r, r/10
+	print "fillcircle", x2+r, y1-r, r, r/10
+	print "fillcircle", x1-r, y2+r, r, r/10
+}
+
+function flash(x, y, dia, square, roundr)
+{
+	if (square) {
+		if (roundr != "")
+			rsquare(x-dia/2, y-dia/2, x+dia/2, y+dia/2, roundr)
+		else
+			print "fillrect", x-dia/2, y-dia/2, dia, dia
+	}
+	else
+		print "fillcircle", x, y, dia/2, dia/10
+}
+
+function hole(x, y, ring, clr, mask, drill, name, square)
+{
+	if (photo) {
+		print "macro push mask"
+		flash(x, y, (ring+clr), square, (ring+clr)/10)
+		print "endmacro"
+	}
+
+	print "macro push copper"
+	flash(x, y, ring, square)
+	print "endmacro"
+
+	has_hole=1
+	print "macro push hole"
+	flash(x, y, drill, 0)
+	print "endmacro"
+
+	if (enable_pinnum) {
+		gsub("[\"]", "", name)
+		annot(x, y, name, 0, 0, 1)
+	}
+
+	edges(x-(ring+clr)/2, y-(ring+clr)/2)
+	edges(x+(ring+clr)/2, y+(ring+clr)/2)
+}
+
+function pad(x1, y1, x2, y2, thickness, clr, mask, name, square)
+{
+	if (photo) {
+		print "macro push mask"
+		rline(x1, y1, x2, y2, thickness+clr, square)
+		print "endmacro"
+	}
+
+
+	print "macro push copper"
+	rline(x1, y1, x2, y2, thickness, square)
+	print "endmacro"
+
+	if (enable_pinnum) {
+		gsub("[\"]", "", name)
+		annot((x2+x1)/2, (y2+y1)/2, name, 0, 0, 1)
+	}
+}
+
+function vf_text(x, y, txt, rot, elev, vcenter   ,TXT,v,n,W,maxw,s,sep,bg,maxh)
+{
+	gsub("[|]", "", txt)
+
+	v = split(txt, TXT, "[|]")
+	sep = " "
+
+	s = s "\n" "push"
+	s = s "\n" "shift "  x sep y
+	if (rot)
+		s = s "\n" "shift " (-1*elev) sep 0
+	else
+		s = s "\n" "shift " 0 sep (-1*elev)
+
+	s = s "\n" "scale %textscale% %textscale%"
+	s = s "\n" "scale 1 -1"
+
+	for(n = 1; n <= v; n++) {
+		W[n] = vf_textwidth("roman-simplex-mono", TXT[n])
+		if (W[n] > maxw)
+			maxw = W[n]
+		maxh++
+	}
+
+	if (vcenter)
+		s = s "\n" "shift 0 " (-maxh/2)
+
+	if (rot)
+		s = s "\n" "rotate 90"
+
+	for(n = v; n > 0; n--) {
+		s = s "\n" "!TXT " TXT[n]
+		s = s "\n" "push"
+
+		s = s "\n" "shift " ((maxw - W[n])/(2)) - maxw/2 sep 0
+
+		if (enable_annotbg) {
+			s = s "\n" "color " clr_annotationbg[0]
+			s = s "\n" "alpha 0.2"
+			s = s "\n" "fillrect " W[n]*-0.1 sep -0.1 "-" sep W[n]*1.1 sep 1.1
+			s = s "\n" "alpha 0.1"
+			s = s "\n" "fillrect " W[n]*-0.17 sep -0.17 "-" sep W[n]*1.17 sep 1.17
+			s = s "\n" "alpha 1"
+			s = s "\n" "color " clr_annotation[0]
+		}
+
+#		s = s "\n" "thick %textthick%"
+		s = s "\n" vf_show("roman-simplex-mono", TXT[n])
+#		s = s "\n" "thick 1"
+		s = s "\n" "pop"
+		s = s "\n" "shift 0 1.15"
+	}
+	s = s "\n" "pop"
+	return s
+}
+
+
+
+function annot(x, y, txt, rot, elev, hcenter)
+{
+	annot_pend = annot_pend "\n" vf_text(x, y, txt, rot, elev, hcenter)
+}
+
+
+function dimension(x1, y1, x2, y2, dist, name, value     ,vx,vy,nx,ny,X1,Y1,X2,Y2,len,alen,awidth,tmp, ang,negdist,cx,cy,dx,dy,D)
+{
+	alen = dim_arrow_len
+
+	vx = x2-x1
+	vy = y2-y1
+	len = vx*vx+vy*vy
+	if (len == 0)
+		return
+	len = sqrt(len)
+	vx = vx/len
+	vy = vy/len
+	nx = vy
+	ny = -vx
+
+	if (dist ~ "^[@]") {
+		cx = (x1+x2)/2
+		cy = (y1+y2)/2
+		sub("@", "", dist)
+		split(dist, D, ";")
+		nx = D[1] - cx
+		ny = D[2] - cy
+
+		X1 = x1+nx
+		Y1 = y1+ny
+		X2 = x2+nx
+		Y2 = y2+ny
+
+		dist = nx*nx+ny*ny
+		if (dist > 0)
+			dist = sqrt(dist)
+
+		nx /= dist
+		ny /= dist
+	}
+	else {
+		if (dist < 0) {
+			tmp = x1
+			x1 = x2
+			x2 = tmp
+			tmp = y1
+			y1 = y2
+			y2 = tmp
+			dist = -dist
+
+			vx = -vx
+			vy = -vy
+			nx = -nx
+			ny = -ny
+		}
+
+		X1 = x1+nx*dist
+		Y1 = y1+ny*dist
+		X2 = x2+nx*dist
+		Y2 = y2+ny*dist
+	}
+
+
+	if (alen > len/4)
+		alen=len/4
+
+	awidth=alen/6
+
+	ang = atan2(vx, vy)
+
+	print "macro push annotation"
+	print "line", x1, y1, X1+nx*awidth, Y1+ny*awidth
+	print "line", x2, y2, X2+nx*awidth, Y2+ny*awidth
+	print "line", X1, Y1, X2, Y2
+
+	print "poly", X1, Y1,  X1+vx*alen+nx*awidth, Y1+vy*alen+ny*awidth ,  X1+vx*alen-nx*awidth, Y1+vy*alen-ny*awidth
+	print "poly", X2, Y2,  X2-vx*alen+nx*awidth, Y2-vy*alen+ny*awidth ,  X2-vx*alen-nx*awidth, Y2-vy*alen-ny*awidth
+	print "endmacro"
+
+	if (enable_dim_value) {
+		if (value == "")
+			value = len
+		else if (value == "!")
+			value = ""
+		if (value != "")
+			value *= gmul
+	}
+	else
+		value = ""
+
+	if (!enable_dim_name)
+		name = ""
+
+	if ((name != "") && (value != ""))
+		name = name "=|" value
+	else if ((value != "") && (name == ""))
+		name = value
+
+	if (name != "") {
+		if (ang < 0)
+			ang = -ang
+		if ((ang < 3.1415*3/4) && (ang > 3.1415*1/4))
+			annot((X1+X2)/2, (Y1+Y2)/2, name, 0, awidth*1.1,0)
+		else
+			annot((X1+X2)/2, (Y1+Y2)/2, name, 1, awidth*1.1,0)
+	}
+
+	edges(X1+nx*awidth, Y1+ny*awidth)
+	edges(X2+nx*awidth, Y2+ny*awidth)
+}
+
+/^[ \t]*#dimension/ {
+	if ((enable_dim_name) || (enable_dim_value))
+		dimension($2, $3, $4, $5, $6, $7, $8)
+}
+
+/^[ \t]*#/ { next }
+
+/ElementLine[ \t]*[[]/ {
+	directive("]")
+	sub(".*ElementLine[ \t]*[[]", "", $0)
+	sub("]$", "", $0)
+
+	print "macro push silk"
+	rline($1, $2, $3, $4, $5)
+	print "endmacro"
+
+	next
+}
+
+/ElementLine[ \t]*[(]/ {
+	directive(")")
+	sub(".*ElementLine[ \t]*[(]", "", $0)
+	sub(")$", "", $0)
+
+	print "macro push silk"
+	rline($1*100, $2*100, $3*100, $4*100, $5*100)
+	print "endmacro"
+
+	next
+}
+
+
+
+/ElementArc[ \t]*[[]/ {
+	directive("]")
+	sub(".*ElementArc[ \t]*[[]", "", $0)
+	sub("]$", "", $0)
+
+	print "macro push silk"
+	rarc($1, $2,  $3, $4,  $5, $6,  $7)
+	print "endmacro"
+
+	next
+}
+
+#   ElementArc(0 0 59 59    45  90 10)
+/ElementArc[ \t]*[(]/ {
+	directive(")")
+	sub(".*ElementArc[ \t]*[(]", "", $0)
+	sub(")$", "", $0)
+
+	print "macro push silk"
+	rarc($1*100, $2*100,  $3*100, $4*100,  $5, $6,  $7*100)
+	print "endmacro"
+
+	next
+}
+
+
+#	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+/Pin[ \t]*[[]/ {
+	directive("]")
+	sub(".*Pin[ \t]*[[]", "", $0)
+	sub("]$", "", $0)
+	hole($1, $2, $3, $4, $5, $6, $8, ($9 ~ "square"))
+}
+
+#	Pin(300 800 90 60 "3" 0x01)
+/Pin[ \t]*[(]/ {
+	directive(")")
+	sub(".*Pin[ \t]*[(]", "", $0)
+	sub("]$", "", $0)
+	hole($1*100, $2*100, $3*100, $4*100, 3000, 2000, $5, ($6 ~ "0x10"))
+}
+
+#	Pad[ 0 0 0 0 0 5000 8600 "" "4" ""]
+/Pad[ \t]*[[]/ {
+	directive("]")
+	sub(".*Pad[ \t]*[[]", "", $0)
+	sub("]$", "", $0)
+
+	pad($1, $2, $3, $4, $5, $6, $7, $9,   ($10 ~ "square"))
+}
+
+/Pad[ \t]*[(]/ {
+	directive(")")
+	sub(".*Pad[ \t]*[(]", "", $0)
+	sub(")$", "", $0)
+
+	if (NF > 8)
+		pad($1*100, $2*100, $3*100, $4*100, $5*100, $6*100, $7*100, $9,   1)
+	else
+		pad($1*100, $2*100, $3*100, $4*100, $5*100, $6*100, $7*100, $6,   1)
+
+}
+
+/Mark[ \t]*[(]/ {
+	directive(")")
+	sub(".*Mark[ \t]*[(]", "", $0)
+	sub(")$", "", $0)
+
+	diamond_x = $1*100
+	diamond_y = $2*100
+}
+
+
+function layer_3d(name, color,  offs)
+{
+	if ((offs == "") || (offs == 1))
+		offs = offs_3d
+	else if (offs == -1)
+		offs = -offs_3d
+
+	if (1 in color) {
+		print "push"
+		print "shift", (-1*offs), (-1*offs)
+		print "color", color[1]
+		print "invoke ", name
+		print "pop"
+	}
+
+	if (-1 in color) {
+		print "push"
+		print "shift", (offs), (offs)
+		print "color", color[-1]
+		print "invoke ", name
+		print "pop"
+	}
+
+	if (0 in color) {
+		print "color", color[0]
+		print "invoke ", name
+	}
+}
+
+function draw_grid()
+{
+	while ((size/gstep) > 10)
+		gstep=gstep*2
+
+	for(x = 0 - int(marg/gstep)*gstep; x < size+marg; x+=gstep) {
+		print "line", x, ymin-marg, x, ymin+size+marg
+		print "line", xmin-marg, x, xmin+size+marg, x
+		print "text", x, ymax+gstep/2, q x*gmul "\\n" grid_unit q
+		print "text", xmax+gstep/2, x, q x*gmul "\\n" grid_unit q
+	}
+
+}
+
+END {
+	print "frame"
+	print vf_data
+
+# make sure all macros exist even if the footprint does not use them
+	print "macro push silk\nendmacro"
+	print "macro push copper\nendmacro"
+	print "macro push mask\nendmacro"
+	print "macro push annotation\nendmacro"
+
+	if (photo) {
+		xmin -= offs_3d*2
+		ymin -= offs_3d*2
+		xmax += offs_3d*2
+		ymax += offs_3d*2
+	}
+
+	sx = xmax-xmin
+	sy = ymax-ymin
+
+
+	size = sx > sy ? sx : sy
+
+	print "scale 1 -1"
+	print "viewport", xmin, ymin, "-", xmin+size, ymin+size
+	print "bg", clr_solderstop[0]
+	print "shift", (size-sx)/2, (size-sy)/2
+	print "scale 0.85"
+
+
+	print "dash 0xaaaa"
+	print "color", clr_grid[0]
+
+	if ((grid_unit != "") == (grid_unit != "none"))
+		draw_grid()
+
+	print "dash 0xffff"
+
+	if (diamond) {
+		print "macro push annotation"
+		print "lines", diamond_x-ds, diamond_y,   diamond_x,diamond_y+ds,   diamond_x+ds,diamond_y,   diamond_x,diamond_y-ds,   diamond_x-ds,diamond_y
+		print "endmacro"
+	}
+
+
+	if (photo) {
+		layer_3d("mask", clr_board, -1)
+	}
+
+
+	print "color", clr_plated[0]
+	print "invoke copper"
+	layer_3d("copper", clr_plated, 1)
+	if (has_hole) {
+		layer_3d("hole", clr_hole, -1)
+	}
+
+
+	layer_3d("silk", clr_silk)
+
+	if (enable_annot) {
+		gsub("%textscale%", size/40, annot_pend)
+#		gsub("%textthick%", size/15000, annot_pend)
+
+		print "macro push annotation"
+		print annot_pend
+		print "endmacro"
+
+		print "color", clr_annotation[0]
+		print "invoke annotation"
+	}
+
+	print "flush"
+}
+
+'

Property changes on: tags/2.0.1/util/fp2anim
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/fp2subc
===================================================================
--- tags/2.0.1/util/fp2subc	(nonexistent)
+++ tags/2.0.1/util/fp2subc	(revision 18980)
@@ -0,0 +1,129 @@
+#!/bin/sh
+#   fp2subc - convert old pcb footprints to subcircuit
+#   Copyright (C) 2017 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+
+conv_custom_fp()
+{
+local in_fp out_subc
+in_fp=`realpath $1`
+out_subc="$2"
+echo '
+LoadFrom(ElementToBuffer, "'$in_fp'")
+PasteBuffer(Restore)
+PasteBuffer(ToLayout, 0, 0)
+
+# convert to subc
+Select(All)
+PasteBuffer(ConvertSubc)
+
+# save 
+SaveTo(PasteBuffer, "'$out_subc'", "lihata board v4")
+' | $dbg "$pcb_rnd" $conf --gui batch
+}
+
+conv_lib_fp()
+{
+echo '
+LoadFootprint("'$1'")
+PasteBuffer(Restore)
+PasteBuffer(ToLayout, 0, 0)
+
+# convert to subc
+Select(All)
+PasteBuffer(ConvertSubc)
+
+# save 
+SaveTo(PasteBuffer, "'$2'")
+' | $dbg "$pcb_rnd" $conf --gui batch
+}
+
+help()
+{
+	echo "fp2subc - convert old pcb footprints to subcircuit"
+	echo "fp2subc [-l] [-c key=val] [-p path] fp [subc]"
+	echo "  -l          fp is not a file path, use the normal library search for fp"
+	echo "  --lib       same as -l"
+	echo "  -p path     specify the full path of the pcb-rnd executable to use"
+	echo "  --pcb-rnd   same as -p"
+	echo "  -d path     specify the the debugger to wrap pcb-rnd in (e.g. valgrind)"
+	echo "  --debugger  same as -d"
+	echo "  -c key=val  pass on a configuration setting to pcb-rnd"
+	echo "  fp          the path or library name of the footprint"
+	echo "  subc        the path of the output subc file"
+	echo ""
+}
+
+lib=0
+in_fp=""
+out_subc=""
+pcb_rnd=pcb-rnd
+dbg=""
+conf=""
+while test $# -gt 0
+do
+	cmd="$1"
+	shift 1
+	case "$cmd" in
+		-d|--debugger) dbg="$1"; shift 1;;
+		-p|--pcb-rnd) pcb_rnd="$1"; shift 1;;
+		-c) conf="$conf -c $1"; shift 1;;
+		-l|--lib) lib=1 ;;
+		-h|--help) help; exit 0;;
+		*)
+			if test -z "$in_fp"
+			then
+				in_fp="$cmd"
+			else
+				if test -z "$out_subc"
+				then
+					out_subc="$out_subc"
+				else
+					echo "fp2subc error: can't use 3 filenames" >&2
+					exit 1
+				fi
+			fi
+			;;
+	esac
+done
+
+if test -z "$in_fp"
+then
+	echo "fp2subc error: need at least an input file name"
+	exit 1
+fi
+
+if test -z "$out_subc"
+then
+	if test $lib -eq 0
+	then
+		out_subc=`echo "$in_fp" | sed "s/.fp$//;s/$/.subc.lht/"`
+	else
+		out_subc=`echo "$in_fp" | sed "s/[^A-Za-z0-9_.-]*//g;s/.fp$//;s/$/.subc.lht/"`
+	fi
+	echo "fp2subc: saving subcircuit in $out_subc"
+fi
+
+
+if test $lib -eq 0
+then
+	conv_custom_fp "$in_fp" "$out_subc"
+else
+	conv_lib_fp "$in_fp" "$out_subc"
+fi

Property changes on: tags/2.0.1/util/fp2subc
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/genref.sh
===================================================================
--- tags/2.0.1/util/genref.sh	(nonexistent)
+++ tags/2.0.1/util/genref.sh	(revision 18980)
@@ -0,0 +1,226 @@
+#!/bin/sh
+
+# generate reference html from gpmi headers
+# requires c99tree (probably svn HEAD version)
+
+prinit='
+#define GPMI_GPMI_PACKAGE_H
+#define multiple __attribute__((multiple))
+#define dynamic __attribute__((dynamic))
+#define direct __attribute__((direct))
+#define nowrap __attribute__((nowrap))
+
+#define gpmi_define_event(name) void GPMI_EVENT__ ## name
+'
+
+fn="$1"
+root="$2"
+refname="$3"
+shift 3
+
+pkgfn=`basename $fn`
+pkg=${pkgfn%%.h}
+echo "<html>
+<body>
+<h1>PCB GPMI</h1>
+<h2>Reference manual for package $pkg</h2>
+<small>Automatically generated from $pkgfn</small>
+"
+
+
+c99tree awk -I$root -I$root/src_3rd "$@" \
+  --gtx 'events=([] /+  d=[type == DECL]) && (d / i=[name ~ "GPMI_EVENT"]) && (i .+ [type == TYPE] . a=[type  == ARGLIST] ) && (d : [loc_is_local == "1"])' \
+  --gtx 'funcs=([] /+  d=[type == DECL]) && (d / i=[!name ~ "GPMI_EVENT"]) && (i .+ [type == TYPE] . [] >* a=[type  == ARGLIST] ) && (d : [loc_is_local == "1"])' \
+  --gtx 'enums=([] /+  i=[type == ENUM]) && (i : [loc_is_local == "1"])' \
+  --paste "$prinit" $fn --awk-s '
+
+function load(fn,    s)
+{
+	while((getline line < fn) > 0)
+		s = s line "\n"
+	return s
+}
+
+#function getsrc(source, uid   ,L)
+#{
+#	print TREE[uid, C99F_LOCSTR]
+#	if (split(TREE[uid, C99F_LOCSTR], L, ":") != 2)
+#		return "???"
+#
+#	print L[1] "-" L[2] 
+#	return substr(source, L[1], L[2]-L[1])
+#}
+
+function print_tree(TREE, uid, ind,    jump_next,s)
+{
+	while(uid != "") {
+#print "U", ind, uid, "ty=" C99SYM[TREE[uid, C99F_TYPE]] " nm=" TREE[uid, C99F_NAME]
+		s = s ind C99SYM[TREE[uid, C99F_TYPE]] " " TREE[uid, C99F_NAME] " [0:0] (-1)\n"
+		s = s print_tree(TREE, TREE[uid, C99F_CHILD, 0], ind " ", 1)
+		if (!jump_next)
+			break;
+		uid = TREE[uid, C99F_NEXT]
+	}
+	return s
+}
+
+function to_c(TREE, uid   ,tr,line,all)
+{
+	tr = "FILE  (%l)\n GRAMMAR_TREE  [0:0] (-1)\n"
+	tr = tr print_tree(TREE, uid, "  ")
+
+	cmd = "echo \"" tr "\" | c99tree-cc -tind -Tc"
+	close(cmd)
+	while((cmd | getline line) > 0)
+		all = all line " "
+	close(cmd)
+	return all
+}
+
+function get_any_comment(TREE, uid, bump_uid, dir   ,cmt_uid,cmt)
+{
+	cmt_uid = TREE[uid, C99F_TWIN_PARENT]
+	bump_uid = TREE[bump_uid, C99F_TWIN_PARENT]
+	while(cmt_uid != "") {
+		cmt_uid = TREE[cmt_uid, dir]
+		if (cmt_uid == bump_uid) {
+			cmt = cmt "&lt;comment missing in the header&gt;"
+			break
+		}
+		if (TREE[cmt_uid, C99F_TYPE] == C99T_COMMENT) {
+			cmt = TREE[cmt_uid, C99F_NAME]
+			break
+		}
+	}
+	sub("^[/][*]", "", cmt)
+	sub("[*][/]$", "", cmt)
+	return cmt
+}
+
+function get_pre_comment(TREE, uid, bump_uid)
+{
+	return get_any_comment(TREE, uid, bump_uid, C99F_PREV)
+}
+
+function get_post_comment(TREE, uid, bump_uid)
+{
+	return get_any_comment(TREE, uid, bump_uid, C99F_NEXT)
+}
+
+function genid(type, id)
+{
+	print "<a id=\"" id "\">"
+	print type, id, refname "#" id > fn_ref
+}
+
+BEGIN {
+	pkg="'$pkg'"
+	c99tree_unknown(TREE)
+	gtx_init(TREE)
+	pkgfn="'$pkgfn'"
+	fn_ref = "'$pkgfn'"
+	sub(".h$", "", fn_ref)
+	fn_ref = "REF." fn_ref
+	refname="'$refname'"
+
+
+#	source=load("'$fn'")
+
+	enums = gtx_find_results(TREE, "enums")
+	if (TREE[enums, C99F_CHILDREN] > 0) {
+	print "<h3> Enums </h3>"
+	print "<dl>"
+	print "<p>Enum values should be passed on as strings."
+	for(r = 0; 1; r++) {
+		if (gtx_get_map(TREE, MAP, enums, r) == "")
+			break
+		id = TREE[MAP["i"], C99F_NAME]
+
+		genid("enum", id);
+		print "<H4> " id "</H4>"
+		print "<pre>"
+		print get_pre_comment(TREE, MAP["i"])
+		print "</pre>"
+
+		print "<table border=1>"
+		print "<tr><th>value <th>meaning"
+		for(c = 0; c < TREE[MAP["i"], C99F_CHILDREN]; c++) {
+			uid = TREE[MAP["i"], C99F_CHILD, c]
+			nuid = TREE[MAP["i"], C99F_CHILD, c+1]
+			if (nuid == "")
+				nuid=TREE[TREE[MAP["i"], C99F_PARENT], C99F_NEXT]
+			print "<tr><td>", TREE[uid, C99F_NAME], "<td>", get_post_comment(TREE, uid, nuid)
+		}
+		print "</table>"
+	}
+	print "</dl>"
+	}
+
+	events = gtx_find_results(TREE, "events")
+	if (TREE[events, C99F_CHILDREN] > 0) {
+	print "<h3> Events </h3>"
+	print "<dl>"
+	print "<p>Events do not have return value. The first argument is always <a href=\"event_id.html\">the even id</a>. Event handlers defined in scripts get all event arguments converted to string (types below are informational)."
+	for(r = 0; 1; r++) {
+		if (gtx_get_map(TREE, MAP, events, r) == "")
+			break
+		id = TREE[MAP["i"], C99F_NAME]
+		sub("^GPMI_EVENT__", "", id)
+		proto = to_c(TREE, MAP["d"])
+		sub("^[ \t]*void[ \t]*GPMI_EVENT__", "", proto)
+		sub("[(]", "(int event_id,", proto)
+# proto = getsrc(source, MAP["d"])
+
+		genid("event", id);
+		print "<H4> " proto "</H4>"
+		print "<pre>"
+		luid=TREE[MAP["d"], C99F_PREV]
+		print get_pre_comment(TREE, MAP["a"], luid)
+		print "</pre>"
+	}
+	print "</dl>"
+	}
+
+	funcs = gtx_find_results(TREE, "funcs")
+	if (TREE[funcs, C99F_CHILDREN] > 0) {
+	print "<h3> Functions </h3>"
+	print "<dl>"
+	print "<p>The following functions are registered in script context."
+	for(r = 0; 1; r++) {
+		if (gtx_get_map(TREE, MAP, funcs, r) == "")
+			break
+		id = TREE[MAP["i"], C99F_NAME]
+		if (id ~ "^package_" pkg "_")
+			continue
+		if (id ~ "^pkg_" pkg "_")
+			continue
+
+		sub("^GPMI_EVENT__", "", id)
+#		print "<i>" getsrc(source, MAP["d"]) "</i>"
+		proto = to_c(TREE, MAP["d"])
+# proto = getsrc(source, MAP["d"])
+
+		gsub("[(][ \t]*", "(", proto)
+		genid("function", id);
+		print "<H4>", proto, "</H4>"
+		print "<pre>"
+		luid=TREE[MAP["d"], C99F_PREV]
+		if (TREE[luid, C99F_TWIN_PARENT] == "")
+			luid = TREE[luid, C99F_CHILD, 0]
+		if (TREE[luid, C99F_TWIN_PARENT] == "")
+			luid = TREE[luid, C99F_CHILD, 0]
+
+		print get_pre_comment(TREE, MAP["a"], luid)
+		print "</pre>"
+	}
+	print "</dl>"
+	}
+}
+'
+
+echo "
+</body>
+</html>
+"
+
+

Property changes on: tags/2.0.1/util/genref.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/gnet-pcbrndfwd.scm
===================================================================
--- tags/2.0.1/util/gnet-pcbrndfwd.scm	(nonexistent)
+++ tags/2.0.1/util/gnet-pcbrndfwd.scm	(revision 18980)
@@ -0,0 +1,125 @@
+;;; gEDA - GPL Electronic Design Automation
+;;; gnetlist - gEDA Netlist
+;;; Copyright (C) 1998-2008 Ales Hvezda
+;;; Copyright (C) 1998-2008 gEDA Contributors (see ChangeLog for details)
+;;;
+;;; 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 2 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, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+;; PCB forward annotation script
+
+(use-modules (ice-9 regex))
+(use-modules (ice-9 format))
+
+;; This is a list of attributes which are propogated to the pcb
+;; elements.  Note that refdes, value, and footprint need not be
+;; listed here.
+(define pcbrndfwd:element-attrs
+  '("device"
+    "manufacturer"
+    "manufacturer_part_number"
+    "vendor"
+    "vendor_part_number"
+    ))
+
+(define (pcbrndfwd:quote-string s)
+  (string-append "\""
+		 (regexp-substitute/global #f "\"" s 'pre "\\\"" 'post)
+		 "\"")
+  )
+
+(define (pcbrndfwd:pinfmt pin)
+  (format #f "~a-~a" (car pin) (car (cdr pin)))
+  )
+
+(define (pcbrndfwd:each-pin net pins port)
+  (if (not (null? pins))
+      (let ((pin (car pins)))
+	(format port "Netlist(Add,~a,~a)~%" net (pcbrndfwd:pinfmt pin))
+	(pcbrndfwd:each-pin net (cdr pins) port))))
+
+(define (pcbrndfwd:each-net netnames port)
+  (if (not (null? netnames))
+      (let ((netname (car netnames)))
+	(pcbrndfwd:each-pin netname (gnetlist:get-all-connections netname) port)
+	(pcbrndfwd:each-net (cdr netnames) port))))
+
+(define (pcbrndfwd:each-attr refdes attrs port)
+  (if (not (null? attrs))
+      (let ((attr (car attrs)))
+	(format port "ElementSetAttr(~a,~a,~a)~%"
+		(pcbrndfwd:quote-string refdes)
+		(pcbrndfwd:quote-string attr)
+		(pcbrndfwd:quote-string (gnetlist:get-package-attribute refdes attr)))
+	(pcbrndfwd:each-attr refdes (cdr attrs) port))))
+
+;; write out the pins for a particular component
+(define pcbrndfwd:component_pins
+  (lambda (port package pins)
+    (if (and (not (null? package)) (not (null? pins)))
+	(begin
+	  (let (
+		(pin (car pins))
+		(label #f)
+		(pinnum #f)
+		)
+	    (display "ChangePinName(" port)
+	    (display (pcbrndfwd:quote-string package) port)
+	    (display ", " port)
+
+	    (set! pinnum (gnetlist:get-attribute-by-pinnumber package pin "pinnumber"))
+
+	    (display pinnum port)
+	    (display ", " port)
+
+	    (set! label (gnetlist:get-attribute-by-pinnumber package pin "pinlabel"))
+	    (if (string=? label "unknown") 
+		(set! label pinnum)
+		)
+	    (display (pcbrndfwd:quote-string label) port)
+	    (display ")\n" port)
+	    )
+	  (pcbrndfwd:component_pins port package (cdr pins))
+	  )
+	)
+    )
+  )
+
+(define (pcbrndfwd:each-element elements port)
+  (if (not (null? elements))
+      (let* ((refdes (car elements))
+	     (value (gnetlist:get-package-attribute refdes "value"))
+	     (footprint (gnetlist:get-package-attribute refdes "footprint"))
+	     )
+
+	(format port "ElementList(Need,~a,~a,~a)~%"
+		(pcbrndfwd:quote-string refdes)
+		(pcbrndfwd:quote-string footprint)
+		(pcbrndfwd:quote-string value))
+	(pcbrndfwd:each-attr refdes pcbrndfwd:element-attrs port)
+	(pcbrndfwd:component_pins port refdes (gnetlist:get-pins refdes))
+
+	(pcbrndfwd:each-element (cdr elements) port))))
+
+(define (pcbrndfwd output-filename)
+  (let ((port (open-output-file output-filename)))
+    (format port "Netlist(Freeze)\n")
+    (format port "Netlist(Clear)\n")
+    (pcbrndfwd:each-net (gnetlist:get-all-unique-nets "dummy") port)
+    (format port "Netlist(Sort)\n")
+    (format port "Netlist(Thaw)\n")
+    (format port "ElementList(Start)\n")
+    (pcbrndfwd:each-element packages port)
+    (format port "ElementList(Done)\n")
+    (close-output-port port)))
Index: tags/2.0.1/util/gnet-pcbrndfwd_elem.scm
===================================================================
--- tags/2.0.1/util/gnet-pcbrndfwd_elem.scm	(nonexistent)
+++ tags/2.0.1/util/gnet-pcbrndfwd_elem.scm	(revision 18980)
@@ -0,0 +1,107 @@
+;;; gEDA - GPL Electronic Design Automation
+;;; gnetlist - gEDA Netlist
+;;; Copyright (C) 1998-2008 Ales Hvezda
+;;; Copyright (C) 1998-2008 gEDA Contributors (see ChangeLog for details)
+;;;
+;;; 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 2 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, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+;; PCB forward annotation script;
+;; modified version of pcbrndfwd: do not do the net list, only elements,
+;; this way nets can be imported in the traditional netlist-way
+
+(use-modules (ice-9 regex))
+(use-modules (ice-9 format))
+
+;; This is a list of attributes which are propogated to the pcb
+;; elements.  Note that refdes, value, and footprint need not be
+;; listed here.
+(define pcbrndfwd:element-attrs
+  '("device"
+    "manufacturer"
+    "manufacturer_part_number"
+    "vendor"
+    "vendor_part_number"
+    ))
+
+(define (pcbrndfwd:quote-string s)
+  (string-append "\""
+		 (regexp-substitute/global #f "\"" s 'pre "\\\"" 'post)
+		 "\"")
+  )
+
+
+(define (pcbrndfwd:each-attr refdes attrs port)
+  (if (not (null? attrs))
+      (let ((attr (car attrs)))
+	(format port "ElementSetAttr(~a,~a,~a)~%"
+		(pcbrndfwd:quote-string refdes)
+		(pcbrndfwd:quote-string attr)
+		(pcbrndfwd:quote-string (gnetlist:get-package-attribute refdes attr)))
+	(pcbrndfwd:each-attr refdes (cdr attrs) port))))
+
+;; write out the pins for a particular component
+(define pcbrndfwd:component_pins
+  (lambda (port package pins)
+    (if (and (not (null? package)) (not (null? pins)))
+	(begin
+	  (let (
+		(pin (car pins))
+		(label #f)
+		(pinnum #f)
+		)
+	    (display "ChangePinName(" port)
+	    (display (pcbrndfwd:quote-string package) port)
+	    (display ", " port)
+
+	    (set! pinnum (gnetlist:get-attribute-by-pinnumber package pin "pinnumber"))
+
+	    (display pinnum port)
+	    (display ", " port)
+
+	    (set! label (gnetlist:get-attribute-by-pinnumber package pin "pinlabel"))
+	    (if (string=? label "unknown") 
+		(set! label pinnum)
+		)
+	    (display (pcbrndfwd:quote-string label) port)
+	    (display ")\n" port)
+	    )
+	  (pcbrndfwd:component_pins port package (cdr pins))
+	  )
+	)
+    )
+  )
+
+(define (pcbrndfwd:each-element elements port)
+  (if (not (null? elements))
+      (let* ((refdes (car elements))
+	     (value (gnetlist:get-package-attribute refdes "value"))
+	     (footprint (gnetlist:get-package-attribute refdes "footprint"))
+	     )
+
+	(format port "ElementList(Need,~a,~a,~a)~%"
+		(pcbrndfwd:quote-string refdes)
+		(pcbrndfwd:quote-string footprint)
+		(pcbrndfwd:quote-string value))
+	(pcbrndfwd:each-attr refdes pcbrndfwd:element-attrs port)
+	(pcbrndfwd:component_pins port refdes (gnetlist:get-pins refdes))
+
+	(pcbrndfwd:each-element (cdr elements) port))))
+
+(define (pcbrndfwd_elem output-filename)
+  (let ((port (open-output-file output-filename)))
+    (format port "ElementList(Start)\n")
+    (pcbrndfwd:each-element packages port)
+    (format port "ElementList(Done)\n")
+    (close-output-port port)))
Index: tags/2.0.1/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/Makefile.in	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/Makefile.in	(revision 18980)
@@ -0,0 +1,129 @@
+put /local/pcb/CFLAGS cc/cflags
+append /local/pcb/CFLAGS {-I../.. -I../../src_3rd -I../../src_3rd/liblihata -DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
+append /local/pcb/LDFLAGS cc/ldflags
+include {../scconfig/template/debug.tmpasm}
+
+print [@
+ROOT=../..
+PLUGDIR=../../src_plugins
+CFLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@
+LDFLAGS=-lm @/local/pcb/LDFLAGS@
+CC=@cc/cc@
+@]
+
+if ?libs/script/fungw/presents
+then
+	print {HASHOBJ=}
+else
+# no system installed fungw: need local hash objects
+	print {HASHOBJ=../../src_3rd//genht/hash.o ../../src_3rd//genht/htsp.o ../../src_3rd//genht/htpp.o ../../src_3rd//genht/htsi.o}
+end
+
+print [@
+VECTOBJ=../../src_3rd/genvector/gds_char.o ../../src_3rd/genvector/vtp0.o ../../src_3rd/genvector/vts0.o
+LISTOBJ=../../src_3rd/genlist/genadlist.o ../../src_3rd/genlist/genlistalloc.o
+QPARSE=../../src_3rd/qparse/qparse.o
+LHTOBJ= \
+	../../src_3rd/liblihata/parser.o \
+	../../src_3rd/liblihata/dom.o \
+	../../src_3rd/liblihata/dom_list.o \
+	../../src_3rd/liblihata/dom_hash.o \
+	../../src_3rd/liblihata/dom_table.o \
+	../../src_3rd/liblihata/lihata.o \
+	../../src_3rd/liblihata/hash_str.o \
+	../../src_3rd/liblihata/tree.o \
+	../../src_3rd/liblihata/tree_list.o \
+	../../src_3rd/liblihata/tree_hash.o \
+	../../src_3rd/liblihata/tree_table.o \
+	../../src_3rd/liblihata/tree_symlink.o \
+	../../src_3rd/liblihata/tree_path.o
+@]
+
+put /local/pcb/tmpasm/buildin  {../src_plugins/Buildin.tmpasm}
+put /local/pcb/tmpasm/plugin   {../src_plugins/Plugin.tmpasm}
+put /local/pcb/tmpasm/disable  {../src_plugins/Disable.tmpasm}
+
+put /local/pcb/RULES {}
+put /local/pcb/OBJS {}
+put /local/pcb/LDFLAGS {}
+put /local/pcb/CFLAGS {}
+put /local/pcb/buildin_init_code {}
+put /local/pcb/buildin_init_extern {}
+
+uniq /local/pcb/OBJS
+
+print [@
+
+FP_OBJS    = @/local/pcb/OBJS@ ../../src/plug_footprint.o
+CONF_OBJS  = ../../src/vtlibrary.o ../../src/compat_fs.o ../../src/paths.o ../../src/conf.o ../../src/conf_core.o ../../src/hid_cfg.o ../../src/misc_util.o ../../src/unit.o ../../src/conf_internal.o ../../src/list_conf.o ../../src/conf_hid.o ../../src/pcb-printf.o ../../src/compat_misc.o ../../src/safe_fs.o
+FP_LDFLAGS = @/local/pcb/LDFLAGS@
+FP_CFLAGS  = @/local/pcb/CFLAGS@
+OBJS = \
+ gsch2pcb.o \
+ help.o \
+ netlister.o \
+ run.o \
+ glue.o \
+ method_import.o
+
+all:
+	$(MAKE) revcheck
+	$(MAKE) gsch2pcb-rnd$(EXE)
+
+revcheck:
+	cd ../../scconfig && ./revtest Rev.stamp < Rev.tab
+
+gsch2pcb-rnd$(EXE): $(OBJS)  $(CONF_OBJS) $(HASHOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(FP_OBJS) $(LHTOBJ)
+	$(CC) $(OBJS) $(CONF_OBJS)  $(FP_OBJS) $(HASHOBJ) $(VECTOBJ) $(LISTOBJ) $(QPARSE) $(LHTOBJ) -o gsch2pcb-rnd$(EXE) $(LDFLAGS) $(FP_LDFLAGS)
+
+gsch2pcb.o: gsch2pcb.c ../../config.h
+	$(CC) -c $(CFLAGS) $(FP_CFLAGS) gsch2pcb.c -o gsch2pcb.o
+
+# TODO: this should be the base lib only
+# run the Makefile in src for the common objects:
+$(HASHOBJ) $(QPARSE) $(LHTOBJ) \
+../../src_3rd/genvector/gds_char.o ../../src_3rd/genvector/vtp0.o \
+../../src_3rd/genvector/vts0.o ../../src_3rd/genadlist/genlist.o \
+../../src_3rd/genlist/genlistalloc.o:
+	cd ../../src && $(MAKE) util_deps
+
+$(LHTOBJ): $(HASHOBJ)
+
+##### module rules begin #####
+@/local/pcb/RULES@
+##### module rules end #####
+@]
+
+# generate explicit rules for .c -> .o
+put /local/comp/OBJS /local/pcb/OBJS
+include {../scconfig/template/compile.tmpasm}
+
+print [@
+
+gsch2pcb.o: gsch2pcb_rnd_conf_fields.h
+
+gsch2pcb_rnd_conf_fields.h: gsch2pcb_rnd_conf.h
+	AWK=@/host/fstools/awk@ ../../scconfig/gen_conf.sh < gsch2pcb_rnd_conf.h > gsch2pcb_rnd_conf_fields.h
+
+install_all:
+	$(SCCBOX) mkdir -p "$(BINDIR)" "$(LIBDIR)"
+	$(SCCBOX) $(HOW) "gsch2pcb-rnd$(EXE)" "$(BINDIR)/gsch2pcb-rnd$(EXE)"
+	$(SCCBOX) $(HOW) "gnet-gsch2pcb-rnd.scm" "$(LIBDIR)/gnet-gsch2pcb-rnd.scm"
+
+install:
+	$(MAKE) install_all HOW="install"
+
+linstall:
+	$(MAKE) install_all HOW="linstall -f"
+
+uninstall:
+	$(MAKE) install_all HOW="uninstall"
+
+clean:
+	$(SCCBOX) rm -f -q gsch2pcb-rnd$(EXE) $(OBJS) gsch2pcb_rnd_conf_fields.h
+
+distclean: clean
+
+include $(ROOT)/Makefile.conf
+
+@]
Index: tags/2.0.1/util/gsch2pcb-rnd/glue.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/glue.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/glue.c	(revision 18980)
@@ -0,0 +1,84 @@
+/* gsch2pcb-rnd
+ *  (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <stdio.h>
+#include <stdarg.h>
+#include "../src/error.h"
+#include "../src/event.h"
+#include "../src/plugins.h"
+#include "../src/hid.h"
+#include "gsch2pcb_rnd_conf.h"
+
+/* glue for pcb-rnd core */
+
+pcb_hid_t *pcb_gui = NULL;
+
+void pcb_chdir_error_message(const char *DirName)
+{
+	pcb_message(PCB_MSG_WARNING, "warning: can't cd to %s\n", DirName);
+}
+
+void pcb_opendir_error_message(const char *DirName)
+{
+	pcb_message(PCB_MSG_WARNING, "warning: can't opendir %s\n", DirName);
+}
+
+void pcb_popen_error_message(const char *cmd)
+{
+	pcb_message(PCB_MSG_WARNING, "warning: can't popen %s\n", cmd);
+}
+
+void pcb_message(enum pcb_message_level level, const char *fmt, ...)
+{
+	va_list args;
+	fprintf(stderr, "gsch2pcb-rnd: ");
+	va_start(args, fmt);
+	vfprintf(stderr, fmt, args);
+	va_end(args);
+	fprintf(stderr, "\n");
+}
+
+void pcb_trace(const char *Format, ...)
+{
+#ifndef NDEBUG
+	va_list args;
+	va_start(args, Format);
+	vfprintf(stderr, Format, args);
+	va_end(args);
+#endif
+}
+
+const char *pcb_board_get_filename(void) { return NULL; }
+const char *pcb_board_get_name(void) { return NULL; }
+
+void pcb_event(pcb_event_id_t ev, const char *fmt, ...)
+{
+
+}
+
+int pcb_file_loaded_set_at(const char *catname, const char *name, const char *path, const char *desc)
+{
+	return 0;
+}
+
+int pcb_file_loaded_del_at(const char *catname, const char *name)
+{
+	return 0;
+}
+
+
Index: tags/2.0.1/util/gsch2pcb-rnd/gnet-gsch2pcb-rnd.scm
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gnet-gsch2pcb-rnd.scm	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gnet-gsch2pcb-rnd.scm	(revision 18980)
@@ -0,0 +1,56 @@
+;;; -*-scheme-*-
+;;;
+
+;;; gEDA - GPL Electronic Design Automation
+;;; gnetlist - gEDA Netlist
+;;; Copyright (C) 1998-2010 Ales Hvezda
+;;;
+;;; 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 2 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, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;;; MA 02111-1301 USA.
+
+;;  gsch2pcb format  (based on PCBboard format by JM Routoure & Stefan Petersen)
+;;  Bill Wilson    billw@wt.net
+;;  6/17/2003
+
+;; Simplified (thrown out m4 support) specially for Igor2 by vzh
+
+;; Splits a string with space separated words and returns a list
+;; of the words (still as strings).
+(define (gsch2pcb-rnd:split-to-list the-string)
+  (filter!
+   (lambda (x) (not (string=? "" x)))
+   (string-split the-string #\space)))
+
+;; Write the footprint for the package `refdes' to `port'.
+(define (gsch2pcb-rnd:write-value-footprint refdes port)
+
+  (let ((value (gnetlist:get-package-attribute refdes "value"))
+         (footprint (gsch2pcb-rnd:split-to-list
+                     (gnetlist:get-package-attribute refdes "footprint"))))
+
+    (format port "PKG(~A,~A,~A)\n" (string-join footprint " ") refdes value)))
+
+;; Write the footprints for all the refdes' in `lst'.
+(define (gsch2pcb-rnd:write-value-footprints port lst)
+  (for-each (lambda (x) (gsch2pcb-rnd:write-value-footprint x port)) lst))
+
+
+(define (gsch2pcb-rnd output-filename)
+  (begin
+;;    (set-current-output-port (gnetlist:output-port output-filename))
+    (set-current-output-port (open-output-file output-filename))
+
+    ;; don't use m4
+    (gsch2pcb-rnd:write-value-footprints (current-output-port) packages)))
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.c	(revision 18980)
@@ -0,0 +1,481 @@
+/* gsch2pcb-rnd
+ *
+ *  Original version: Bill Wilson    billw@wt.net
+ *  rnd-version: (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ * Retrieved from the official git (2015.07.15)
+
+ Behavior different from the original:
+  - use getenv() instead of g_getenv(): on windows this won't do recursive variable expansion
+  - use rnd-specific .scm
+  - use pcb-rnd's conf system
+  - use pcb_popen() instead of glib's spawn (stderr is always printed to stderr)
+ */
+
+#include "config.h"
+
+#define LOCAL_PROJECT_FILE "project.lht"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "../src/plug_footprint.h"
+#include "../src/conf.h"
+#include "../src/conf_core.h"
+#include "../src_3rd/qparse/qparse.h"
+#include "../config.h"
+#include "../src/error.h"
+#include "../src/plugins.h"
+#include "../src/compat_misc.h"
+#include "../src/compat_fs.h"
+#include "../src/misc_util.h"
+#include "../src/safe_fs.h"
+#include "method.h"
+#include "help.h"
+#include "gsch2pcb_rnd_conf.h"
+#include "gsch2pcb.h"
+#include "method_import.h"
+
+static const char *want_method_default = "import";
+
+gdl_list_t pcb_element_list; /* initialized to 0 */
+gadl_list_t schematics, extra_gnetlist_arg_list, extra_gnetlist_list;
+
+int n_deleted, n_added_ef, n_fixed, n_PKG_removed_new,
+    n_PKG_removed_old, n_preserved, n_changed_value, n_not_found,
+    n_unknown, n_none, n_empty;
+
+int bak_done, need_PKG_purge;
+
+conf_gsch2pcb_rnd_t conf_g2pr;
+
+method_t *methods = NULL, *current_method;
+
+void method_register(method_t *method)
+{
+	method->next = methods;
+	methods = method;
+}
+
+method_t *method_find(const char *name)
+{
+	method_t *m;
+	for(m = methods; m != NULL; m = m->next)
+		if (strcmp(m->name, name) == 0)
+			return m;
+	return NULL;
+}
+
+/* Return a pointer to the suffix if inp ends in that suffix */
+static const char *loc_str_has_suffix(const char *inp, const char *suffix, int suff_len)
+{
+	int len = strlen(inp);
+	if ((len >= suff_len) && (strcmp(inp + len - suff_len, suffix) == 0))
+		return inp + len - suff_len;
+	return NULL;
+}
+
+char *fix_spaces(char * str)
+{
+	char *s;
+
+	if (!str)
+		return NULL;
+	for (s = str; *s; ++s)
+		if (*s == ' ' || *s == '\t')
+			*s = '_';
+	return str;
+}
+
+static void add_schematic(const char *sch)
+{
+	char **n;
+	n = gadl_new(&schematics);
+	*n = pcb_strdup(sch);
+	gadl_append(&schematics, n);
+	if (!conf_g2pr.utils.gsch2pcb_rnd.sch_basename) {
+		const char *suff = loc_str_has_suffix(sch, ".sch", 4);
+		if (suff != NULL) {
+			char *tmp = pcb_strndup(sch, suff - sch);
+			conf_set(CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, tmp, POL_OVERWRITE);
+			free(tmp);
+		}
+	}
+}
+
+static void add_multiple_schematics(const char * sch)
+{
+	/* parse the string using shell semantics */
+	int count;
+	char **args;
+	char *tmp = pcb_strdup(sch);
+
+	count = qparse(tmp, &args);
+	free(tmp);
+	if (count > 0) {
+		int i;
+		for (i = 0; i < count; ++i)
+			if (*args[i] != '\0')
+				add_schematic(args[i]);
+		qparse_free(count, &args);
+	}
+	else {
+		fprintf(stderr, "invalid `schematics' option: %s\n", sch);
+	}
+}
+
+static int parse_config(char * config, char * arg)
+{
+	char *s;
+
+	/* remove trailing white space otherwise strange things can happen */
+	if ((arg != NULL) && (strlen(arg) >= 1)) {
+		s = arg + strlen(arg) - 1;
+		while ((*s == ' ' || *s == '\t') && (s != arg))
+			s--;
+		s++;
+		*s = '\0';
+	}
+	if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
+		printf("    %s \"%s\"\n", config, arg ? arg : "");
+
+	if (!strcmp(config, "remove-unfound") || !strcmp(config, "r")) {
+		/* This is default behavior set in header section */
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "1", POL_OVERWRITE);
+		return 0;
+	}
+	if (!strcmp(config, "keep-unfound") || !strcmp(config, "k")) {
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/remove_unfound_elements", -1, "0", POL_OVERWRITE);
+		return 0;
+	}
+	if (!strcmp(config, "quiet") || !strcmp(config, "q")) {
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/quiet_mode", -1, "1", POL_OVERWRITE);
+		return 0;
+	}
+	if (!strcmp(config, "preserve") || !strcmp(config, "p")) {
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/preserve", -1, "1", POL_OVERWRITE);
+		return 0;
+	}
+	if (!strcmp(config, "elements-shell") || !strcmp(config, "s"))
+		conf_set(CFR_CLI, "rc/library_shell", -1, arg, POL_OVERWRITE);
+	else if (!strcmp(config, "elements-dir") || !strcmp(config, "d")) {
+		static int warned = 0;
+		if (!warned) {
+			pcb_message(PCB_MSG_WARNING, "WARNING: using elements-dir from %s - this overrides the normal pcb-rnd configured library search paths\n", config);
+			warned = 1;
+		}
+		conf_set(CFR_CLI, "rc/library_search_paths", -1, arg, POL_PREPEND);
+	}
+	else if (!strcmp(config, "output-name") || !strcmp(config, "o"))
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/sch_basename", -1, arg, POL_OVERWRITE);
+	else if (!strcmp(config, "default-pcb") || !strcmp(config, "P"))
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/default_pcb", -1, arg, POL_OVERWRITE);
+	else if (!strcmp(config, "schematics"))
+		add_multiple_schematics(arg);
+	else if (!strcmp(config, "gnetlist")) {
+		char **n;
+		n = gadl_new(&extra_gnetlist_list);
+		*n = pcb_strdup(arg);
+		gadl_append(&extra_gnetlist_list, n);
+	}
+	else if (!strcmp(config, "empty-footprint"))
+		conf_set(CFR_CLI, "utils/gsch2pcb_rnd/empty_footprint_name", -1, arg, POL_OVERWRITE);
+	else
+		return -1;
+
+	return 1;
+}
+
+static void load_project(char * path)
+{
+	FILE *f;
+	char *s, buf[1024], config[32], arg[768];
+	int n;
+
+	f = pcb_fopen(path, "r");
+	if (!f)
+		return;
+
+	/* check if we have a lihata project file or config file by looking at the first 16 non-comments */
+	for(n = 0; n < 16;) {
+		if (fgets(buf, sizeof(buf), f) == NULL)
+			break;
+		s = buf;
+		while(isspace(*s)) s++;
+		if ((*s == '#') || (*s == '\r') || (*s == '\n') || (*s == '\0'))
+			continue;
+		/* look for known lihata roots */
+		if (strncmp(s, "ha:geda-project-v1", 18) == 0)
+			goto lihata_prj;
+		if (strncmp(s, "li:pcb-rnd-conf-v1", 18) == 0)
+			goto lihata_prj;
+		n++;
+	}
+
+	rewind(f);
+
+	if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
+		printf("Reading project file: %s\n", path);
+	while (fgets(buf, sizeof(buf), f)) {
+		for (s = buf; *s == ' ' || *s == '\t' || *s == '\n'; ++s);
+		if (!*s || *s == '#' || *s == '/' || *s == ';')
+			continue;
+		arg[0] = '\0';
+		sscanf(s, "%31s %767[^\n]", config, arg);
+		parse_config(config, arg);
+	}
+	fclose(f);
+	return;
+
+lihata_prj:;
+	fclose(f);
+	if (conf_load_as(CFR_PROJECT, path, 0) != 0) {
+		pcb_message(PCB_MSG_ERROR, "Failed to parse project file %s.\n", path);
+		exit(1);
+	}
+	conf_update(NULL, -1); /* because of our new project file */
+}
+
+static void load_extra_project_files(void)
+{
+	char *path;
+	static int done = FALSE;
+
+	if (done)
+		return;
+
+	load_project("/etc/gsch2pcb");
+	load_project("/usr/local/etc/gsch2pcb");
+
+	path = pcb_concat(conf_core.rc.path.home, PCB_DIR_SEPARATOR_S, ".gEDA", PCB_DIR_SEPARATOR_S, "gsch2pcb", NULL);
+	load_project(path);
+	free(path);
+
+	done = TRUE;
+}
+
+int have_cli_project_file = 0;
+int have_cli_schematics = 0;
+static void get_args(int argc, char ** argv)
+{
+	char *opt, *arg;
+	int i, r;
+
+	for (i = 1; i < argc; ++i) {
+		opt = argv[i];
+		arg = argv[i + 1];
+		if (*opt == '-') {
+			++opt;
+			if (*opt == '-')
+				++opt;
+			if (!strcmp(opt, "version") || !strcmp(opt, "V")) {
+				printf("gsch2pcb-rnd %s\n", GSCH2PCB_RND_VERSION);
+				exit(0);
+			}
+			else if (!strcmp(opt, "verbose") || !strcmp(opt, "v")) {
+				char tmp[16];
+				sprintf(tmp, "%ld", conf_g2pr.utils.gsch2pcb_rnd.verbose + 1);
+				conf_set(CFR_CLI, "utils/gsch2pcb_rnd/verbose", -1, tmp, POL_OVERWRITE);
+				continue;
+			}
+			else if (!strcmp(opt, "m") || !strcmp(opt, "method")) {
+				if (method_find(arg) == NULL) {
+					pcb_message(PCB_MSG_ERROR, "Error: can't use unknown method '%s'; try --help\n", arg);
+					exit(1);
+				}
+				conf_set(CFR_CLI, "utils/gsch2pcb_rnd/method", -1, arg, POL_OVERWRITE);
+				i++;
+				continue;
+			}
+			else if (!strcmp(opt, "c") || !strcmp(opt, "conf")) {
+				const char *stmp;
+				if (conf_set_from_cli(NULL, arg, NULL, &stmp) != 0) {
+					fprintf(stderr, "Error: failed to set config %s: %s\n", arg, stmp);
+					exit(1);
+				}
+				i++;
+				continue;
+			}
+			else if (!strcmp(opt, "fix-elements")) {
+				conf_set(CFR_CLI, "utils/gsch2pcb_rnd/fix_elements", -1, "1", POL_OVERWRITE);
+				continue;
+			}
+			else if (!strcmp(opt, "gnetlist-arg")) {
+				char **n;
+				n = gadl_new(&extra_gnetlist_arg_list);
+				*n = pcb_strdup(arg);
+				gadl_append(&extra_gnetlist_arg_list, n);
+				i++;
+				continue;
+			}
+			else if (!strcmp(opt, "help") || !strcmp(opt, "h"))
+				usage();
+			else if (i < argc && ((r = parse_config(opt, (i < argc - 1) ? arg : NULL))
+														>= 0)
+				) {
+				i += r;
+				continue;
+			}
+			printf("gsch2pcb: bad or incomplete arg: %s\n", argv[i]);
+			usage();
+		}
+		else {
+			if (loc_str_has_suffix(argv[i], ".sch", 4) == NULL) {
+				if (have_cli_project_file) {
+					pcb_message(PCB_MSG_ERROR, "ERROR: multiple project files specified on the command line (last one: %s). Either use multiple schematics or a single project file. Try %s --help\n", argv[i], argv[0]);
+					exit(1);
+				}
+				load_extra_project_files();
+				load_project(argv[i]);
+				have_cli_project_file = 1;
+			}
+			else {
+				add_schematic(argv[i]);
+				have_cli_schematics = 1;
+			}
+		}
+	}
+}
+
+void free_strlist(gadl_list_t *lst)
+{
+	char **s;
+
+	while((s = gadl_first(lst)) != NULL) {
+		char *str = *s;
+		gadl_free(s);
+		free(str);
+	}
+}
+
+void require_gnetlist_backend(const char *dir, const char *backend)
+{
+	char *path = pcb_strdup_printf("%s/gnet-%s.scm", dir, backend);
+	if (!pcb_file_readable(path))
+		pcb_message(PCB_MSG_WARNING, "WARNING: %s is not found, gnetlist will probably fail; please check your pcb-rnd installation!\n", path);
+	free(path);
+}
+
+
+const char *local_project_pcb_name = NULL;
+
+/************************ main ***********************/
+int main(int argc, char ** argv)
+{
+	const char *want_method;
+
+	method_import_register();
+
+	conf_init();
+	conf_core_init();
+	conf_core_postproc(); /* to get all the paths initialized */
+
+	gadl_list_init(&schematics, sizeof(char *), NULL, NULL);
+	gadl_list_init(&extra_gnetlist_arg_list, sizeof(char *), NULL, NULL);
+	gadl_list_init(&extra_gnetlist_list, sizeof(char *), NULL, NULL);
+
+#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
+	conf_reg_field(conf_g2pr, field,isarray,type_name,cpath,cname,desc,flags);
+#include "gsch2pcb_rnd_conf_fields.h"
+
+	get_args(argc, argv);
+
+	conf_load_all(NULL, NULL);
+	conf_update(NULL, -1);
+
+	load_extra_project_files();
+	conf_update(NULL, -1); /* because of CLI changes */
+
+	if (!have_cli_project_file && !have_cli_schematics) {
+		if (!pcb_file_readable(LOCAL_PROJECT_FILE)) {
+			pcb_message(PCB_MSG_ERROR, "Don't know what to do: no project or schematics given, no local project file %s found. Try %s --help\n", LOCAL_PROJECT_FILE, argv[0]);
+			exit(1);
+		}
+		if (conf_load_as(CFR_PROJECT, LOCAL_PROJECT_FILE, 0) != 0) {
+			pcb_message(PCB_MSG_ERROR, "Failed to load project file %s. Try %s --help\n", LOCAL_PROJECT_FILE, argv[0]);
+			exit(1);
+		}
+		conf_update(NULL, -1); /* because of our new project file */
+	}
+	else if ((local_project_pcb_name != NULL) && (!have_cli_project_file))
+		conf_load_project(NULL, local_project_pcb_name);
+
+	if (!have_cli_schematics) {  /* load all schematics from the project file unless we have schematics from the cli */
+		conf_native_t *nat = conf_get_field("utils/gsch2pcb_rnd/schematics");
+		if (nat != NULL) {
+			conf_listitem_t *ci;
+			for (ci = conflist_first(nat->val.list); ci != NULL; ci = conflist_next(ci)) {
+				const char *p = ci->val.string[0];
+				if (ci->type != CFN_STRING)
+					continue;
+				add_schematic(p);
+			}
+		}
+		else {
+			pcb_message(PCB_MSG_ERROR, "No schematics specified on the cli or in project files. Try %s --help\n", argv[0]);
+			exit(1);
+		}
+	}
+
+	if (gadl_length(&schematics) == 0) {
+		pcb_message(PCB_MSG_ERROR, "No schematics specified on the cli; can't find any in the project files/configs either. Try %s --help\n", argv[0]);
+		exit(1);
+	}
+
+	conf_update(NULL, -1); /* because of the project file */
+
+	want_method = conf_g2pr.utils.gsch2pcb_rnd.method;
+	if (want_method == NULL) {
+		method_t *m;
+		for(m = methods; m != NULL; m = m->next) {
+			if (m->not_by_guess)
+				continue;
+			if (m->guess_out_name()) {
+				current_method = m;
+				break;
+			}
+		}
+		if (current_method == NULL) {
+			want_method = want_method_default;
+			pcb_message(PCB_MSG_WARNING, "Warning: method not specified for a project (that has no board or project file yet); defaulting to -m %s. This warning is harmless if you are running gsch2pcb-rnd for the first time on this project and you are fine with this method.", want_method);
+		}
+	}
+
+	if (current_method == NULL) {
+		current_method = method_find(want_method);
+		if (current_method == NULL) {
+			pcb_message(PCB_MSG_ERROR, "Error: can't find method %s\n", want_method);
+			exit(1);
+		}
+	}
+
+	current_method->init();
+	conf_update(NULL, -1);
+
+
+	current_method->go(); /* the traditional, "parse element and edit the pcb file" approach */
+
+	current_method->uninit();
+
+	conf_uninit();
+
+	free_strlist(&schematics);
+	free_strlist(&extra_gnetlist_arg_list);
+	free_strlist(&extra_gnetlist_list);
+
+	return 0;
+}
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb.h	(revision 18980)
@@ -0,0 +1,47 @@
+#include "../src_3rd/genlist/gendlist.h"
+#include "../src_3rd/genlist/genadlist.h"
+
+#define TRUE 1
+#define FALSE 0
+
+#define GSCH2PCB_RND_VERSION "2.0.0"
+
+#define DEFAULT_PCB_INC "pcb.inc"
+
+#define SEP_STRING "--------\n"
+
+typedef struct {
+	char *refdes, *value, *description, *changed_description, *changed_value;
+	char *flags, *tail;
+	char *x, *y;
+	char *pkg_name_fix;
+	char res_char;
+
+	gdl_elem_t all_elems;
+
+	unsigned still_exists:1;
+	unsigned new_format:1;
+	unsigned hi_res_format:1;
+	unsigned quoted_flags:1;
+	unsigned omit_PKG:1;
+	unsigned nonetlist:1;
+} PcbElement;
+
+typedef struct {
+	char *part_number, *element_name;
+} ElementMap;
+
+extern gdl_list_t pcb_element_list;
+extern gadl_list_t schematics, extra_gnetlist_arg_list, extra_gnetlist_list;
+
+extern int n_deleted, n_added_ef, n_fixed, n_PKG_removed_new,
+           n_PKG_removed_old, n_preserved, n_changed_value, n_not_found,
+           n_unknown, n_none, n_empty;
+
+extern int bak_done, need_PKG_purge;
+
+const char *local_project_pcb_name; /* file name of the design from which the local project file name shall be derived */
+
+char *fix_spaces(char * str);
+void require_gnetlist_backend(const char *dir, const char *backend);
+
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h	(revision 18980)
@@ -0,0 +1,24 @@
+#ifndef PCB_MINCUT_CONF_H
+#define PCB_MINCUT_CONF_H
+
+#include "../src/conf.h"
+
+typedef struct {
+	const struct utils {
+		const struct gsch2pcb_rnd {
+			CFT_BOOLEAN remove_unfound_elements; /*  = TRUE */
+			CFT_BOOLEAN quiet_mode; /*  = FALSE */
+			CFT_INTEGER verbose;
+			CFT_BOOLEAN preserve;
+			CFT_BOOLEAN fix_elements;
+			CFT_STRING sch_basename;
+			CFT_STRING default_pcb;            /* override default pcb with a given file */
+			CFT_STRING empty_footprint_name;
+			CFT_STRING method;
+			CFT_LIST schematics;               /* use these schematics as input */
+		} gsch2pcb_rnd;
+	} utils;
+} conf_gsch2pcb_rnd_t;
+
+extern conf_gsch2pcb_rnd_t conf_g2pr;
+#endif
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/Makefile
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/Makefile	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/Makefile	(revision 18980)
@@ -0,0 +1,17 @@
+names = c1 c2 c3
+schematics = $(names:%=%.sch)
+netlists   = $(names:%=%.net)
+goldens    = $(names:%=golden/%.net)
+diffs      = $(names:%=%.diff)
+
+.PHONY: all clean $(netlists)
+all: $(diffs)
+
+$(diffs): %.diff: %.net golden/%.net
+	diff $^ > $@
+
+$(netlists): %.net: %.sch
+	gnetlist -g gsch2pcb-rnd -o $@ -m ../gnet-gsch2pcb-rnd.scm $<
+
+clean: 
+	-rm -rf $(diffs) $(netlists)
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c1.sch
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c1.sch	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c1.sch	(revision 18980)
@@ -0,0 +1,13 @@
+v 20130925 2
+C 18400 56000 1 0 0 connector3-2.sym
+{
+T 19100 57700 5 10 1 1 0 6 1
+refdes=CONN1
+T 18700 57650 5 10 0 0 0 0 1
+device=CONNECTOR_3
+T 18700 57850 5 10 0 0 0 0 1
+footprint=CONNECTOR 3 1
+}
+N 18400 57200 17800 57200 4
+N 17800 56400 17800 57200 4
+N 17800 56400 18400 56400 4
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c2.sch
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c2.sch	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c2.sch	(revision 18980)
@@ -0,0 +1,15 @@
+v 20130925 2
+C 18400 56000 1 0 0 connector3-2.sym
+{
+T 19100 57700 5 10 1 1 0 6 1
+refdes=CONN1
+T 18700 57650 5 10 0 0 0 0 1
+device=CONNECTOR_3
+T 18700 57850 5 10 0 0 0 0 1
+footprint=CONNECTOR 3 1
+T 19300 56200 5 10 1 0 90 0 1
+value=val123
+}
+N 18400 57200 17800 57200 4
+N 17800 56400 17800 57200 4
+N 17800 56400 18400 56400 4
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c3.sch
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c3.sch	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/c3.sch	(revision 18980)
@@ -0,0 +1,15 @@
+v 20130925 2
+C 18400 56000 1 0 0 connector3-2.sym
+{
+T 19100 57700 5 10 1 1 0 6 1
+refdes=CONN1
+T 18700 57650 5 10 0 0 0 0 1
+device=CONNECTOR_3
+T 18700 57850 5 10 0 0 0 0 1
+footprint=CONNECTOR(3, 1, silkmark=external)
+T 19300 56200 5 10 1 0 90 0 1
+value=val123
+}
+N 18400 57200 17800 57200 4
+N 17800 56400 17800 57200 4
+N 17800 56400 18400 56400 4
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c1.net
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c1.net	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c1.net	(revision 18980)
@@ -0,0 +1 @@
+PKG(CONNECTOR 3 1,CONN1,unknown)
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c2.net
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c2.net	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c2.net	(revision 18980)
@@ -0,0 +1 @@
+PKG(CONNECTOR 3 1,CONN1,val123)
Index: tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c3.net
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c3.net	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/gsch2pcb_scm/golden/c3.net	(revision 18980)
@@ -0,0 +1 @@
+PKG(CONNECTOR(3, 1, silkmark=external),CONN1,val123)
Index: tags/2.0.1/util/gsch2pcb-rnd/help.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/help.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/help.c	(revision 18980)
@@ -0,0 +1,156 @@
+/* gsch2pcb-rnd
+ *
+ *  Original version: Bill Wilson    billw@wt.net
+ *  rnd-version: (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ * Retrieved from the official git (2015.07.15)
+
+ Behavior different from the original:
+  - use getenv() instead of g_getenv(): on windows this won't do recursive variable expansion
+  - use rnd-specific .scm
+  - use pcb_popen() instead of glib's spawn (stderr is always printed to stderr)
+ */
+#include "config.h"
+#include "method.h"
+#include <stdlib.h>
+#include <stdio.h>
+
+
+extern char *pcb_file_name, *pcb_new_file_name, *bak_file_name, *pins_file_name, *net_file_name;
+
+static char *usage_string0a =
+	"usage: gsch2pcb [options] {project | foo.sch [foo1.sch ...]}\n"
+	"\n"
+	"Generate a PCB annotation file from a set of gschem schematics.\n"
+	"   gnetlist -g PCB is run to generate foo.net from the schematics.\n" "\n";
+/* TODO */
+/*  "   gnetlist -g gsch2pcb is run to get PCB elements which\n"
+  "   match schematic footprints.  For schematic footprints which don't match\n"
+  "   any PCB layout elements, search a set of file element directories in\n"
+  "   an attempt to find matching PCB file elements.\n"*/
+static char *usage_string0b =
+	"   Output to foo.cmd if it doesn't exist.\n"
+	"   The annotation command file (to be run by the user from pcb-rnd) contains:.\n"
+	"   If any elements with a non-empty element name on the board\n"
+	"   have no matching schematic component, then remove those elements from\n"
+	"   the board unless it's marked nonetlist. Load and palce the footprints\n"
+	"   for new elements; replace elements in-place if their footprint changed;"
+	"   update attributes, value and other metadata in-place."
+	"\n";
+static char *usage_string0c =
+	"   gnetlist -g pcbpins is run to get a PCB actions file which will rename all\n"
+	"   of the pins in a .pcb file to match pin names from the schematic.\n"
+	"\n"
+	"   \"project\" is a file (not ending in .sch) containing a list of\n"
+	"   schematics to process and some options.  A schematics line is like:\n"
+	"       schematics foo1.sch foo2.sch ...\n"
+	"   Options in a project file are like command line args without the \"-\":\n"
+	"       output-name myproject\n"
+	"\n"
+	"options (may be included in a project file):\n";
+static char *usage_string0d =
+	"   -d, --elements-dir D    Search D for PCB file elements.  These defaults\n"
+	"                           are searched if they exist. See the default\n"
+	"                           search paths at the end of this text."
+	"   -c, --elements-dir-clr  Clear the elements dir. Useful before a series\n"
+	"                           if -d's to flush defaults.\n"
+	"   -m, --method M          Use method M for the import. See available\n"
+	"                           methods below.\n";
+static char *usage_string0e =
+	"   -s, --elements-shell S  Use S as a prefix for running parametric footrint\n"
+	"                           generators. It is useful on systems where popen()\n"
+	"                           doesn't do the right thing or the process should\n"
+	"                           be wrapped. Example -s \"/bin/sh -c\"\n"
+	"   -P, --default-pcb       Change the default PCB file's name; this file is\n"
+	"                           inserted on top of the *.new.pcb generated, for\n"
+	"                           PCB default settings\n";
+static char *usage_string0f =
+	"   -o, --output-name N     Use output file names N.net, N.pcb, and N.new.pcb\n"
+	"                           instead of foo.net, ... where foo is the basename\n"
+	"                           of the first command line .sch file.\n"
+	"   -r, --remove-unfound    Don't include references to unfound elements in\n"
+	"                           the generated .pcb files.  Use if you want PCB to\n"
+	"                           be able to load the (incomplete) .pcb file.\n"
+	"                           This is the default behavior.\n";
+static char *usage_string0g =
+	"   -k, --keep-unfound      Keep include references to unfound elements in\n"
+	"                           the generated .pcb files.  Use if you want to hand\n"
+	"                           edit or otherwise preprocess the generated .pcb file\n"
+	"                           before running pcb.\n";
+static char *usage_string0h =
+	"   -p, --preserve          Preserve elements in PCB files which are not found\n"
+	"                           in the schematics.  Note that elements with an empty\n"
+	"                           element name (schematic refdes) are never deleted,\n"
+	"                           so you really shouldn't need this option.\n";
+static char *usage_string0i =
+	"   -q, --quiet             Don't tell the user what to do next after running\n"
+	"                           gsch2pcb-rnd.\n" "\n";
+
+static char *usage_string1a =
+	"   --gnetlist backend    A convenience run of extra gnetlist -g commands.\n"
+	"                         Example:  gnetlist partslist3\n"
+	"                         Creates:  myproject.partslist3\n"
+	" --empty-footprint name  See the project.sample file.\n"
+	"\n";
+static char *usage_string1b =
+	"options (not recognized in a project file):\n"
+	"   --gnetlist-arg arg    Allows additional arguments to be passed to gnetlist.\n"
+	"       --fix-elements    If a schematic component footprint is not equal\n"
+	"                         to its PCB element Description, update the\n"
+	"                         Description instead of replacing the element.\n"
+	"                         Do this the first time gsch2pcb is used with\n"
+	"                         PCB files originally created with gschem2pcb.\n";
+static char *usage_string1c =
+	"   -v, --verbose         Use -v -v for additional file element debugging.\n"
+	"   -V, --version\n\n"
+	"environment variables:\n"
+	"   GNETLIST              If set, this specifies the name of the gnetlist program\n"
+	"                         to execute.\n"
+	"\n";
+
+static char *usage_string_foot =
+	"Additional Resources:\n"
+	"\n"
+	"  pcb-rnd homepage:     http://repo.hu/projects/pcb-rnd\n"
+	"  gnetlist user guide:  http://wiki.geda-project.org/geda:gnetlist_ug\n"
+	"  gEDA homepage:        http://www.geda-project.org\n"
+	"\n";
+
+
+void usage(void)
+{
+	method_t *m;
+	printf("%s", usage_string0a);
+	printf("%s", usage_string0b);
+	printf("%s", usage_string0c);
+	printf("%s", usage_string0d);
+	printf("%s", usage_string0e);
+	printf("%s", usage_string0f);
+	printf("%s", usage_string0g);
+	printf("%s", usage_string0h);
+	printf("%s", usage_string0i);
+	printf("%s", usage_string1a);
+	printf("%s", usage_string1b);
+	printf("%s", usage_string1c);
+
+	printf("\nMethods available:\n");
+	for(m = methods; m != NULL; m = m->next)
+		printf("  %-12s %s\n", m->name, m->desc);
+	printf("\n");
+	printf("%s", usage_string_foot);
+	exit(0);
+}
Index: tags/2.0.1/util/gsch2pcb-rnd/help.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/help.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/help.h	(revision 18980)
@@ -0,0 +1 @@
+void usage(void);
Index: tags/2.0.1/util/gsch2pcb-rnd/method.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/method.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/method.h	(revision 18980)
@@ -0,0 +1,16 @@
+typedef struct method_s  method_t;
+
+struct method_s {
+	const char *name;
+	const char *desc;
+	void (*init)(void);
+	void (*go)(void);
+	void (*uninit)(void);
+	int (*guess_out_name)(void); /* returns 1 if the output file of the format exists for the current project */
+	int not_by_guess;            /* if non-zero, never try to use this method automatically, guessing from file names or anything else */
+	method_t *next;
+};
+
+extern method_t *methods;
+
+void method_register(method_t *fmt);
Index: tags/2.0.1/util/gsch2pcb-rnd/method_import.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/method_import.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/method_import.c	(revision 18980)
@@ -0,0 +1,145 @@
+/* gsch2pcb-rnd
+ *
+ *  Original version: Bill Wilson    billw@wt.net
+ *  rnd-version: (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "gsch2pcb.h"
+#include "gsch2pcb_rnd_conf.h"
+#include "method_import.h"
+#include "run.h"
+#include "netlister.h"
+#include "method.h"
+#include "../src/conf.h"
+#include "../src/conf_core.h"
+#include "../src/compat_misc.h"
+#include "../src/compat_fs.h"
+#include "../src/misc_util.h"
+
+char *cmd_file_name;
+char *pcb_file_name;
+char *net_file_name;
+
+static void method_import_init(void)
+{
+	pcb_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb", NULL);
+	cmd_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".cmd", NULL);
+	net_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".net", NULL);
+	local_project_pcb_name = pcb_file_name;
+}
+
+static void import_go(int sep_net)
+{
+	char *verbose_str = NULL;
+	const char *gnetlist, *backend;
+
+	gnetlist = gnetlist_name();
+	if (!conf_g2pr.utils.gsch2pcb_rnd.verbose)
+		verbose_str = "-q";
+
+	backend = sep_net ? "pcbrndfwd_elem" : "pcbrndfwd";
+	require_gnetlist_backend(SCMDIR, backend);
+	if (!build_and_run_command("%s %s -L %s -g %s -o %s %L %L", gnetlist, verbose_str, PCBLIBDIR, backend, cmd_file_name, &extra_gnetlist_arg_list, &schematics)) {
+		fprintf(stderr, "Failed to run gnetlist with backend %s to generate the elements\n", backend);
+		exit(1);
+	}
+
+	if (sep_net) {
+		if (!build_and_run_command("%s %s -L %s -g PCB -o %s %L %L", gnetlist, verbose_str, PCBLIBDIR, net_file_name, &extra_gnetlist_arg_list, &schematics)) {
+			fprintf(stderr, "Failed to run gnetlist net file\n");
+			exit(1);
+		}
+	}
+
+	/* Tell user what to do next */
+	printf("\nNext step:\n");
+	printf("1.  Run pcb-rnd on your board file (or on an empty board if it's the first time).\n");
+	printf("2.  From within pcb-rnd, enter\n\n");
+	printf("    :ExecuteFile(%s)\n\n", cmd_file_name);
+
+	if (sep_net) {
+		printf("    (this will update the elements)\n\n");
+		printf("3.  From within pcb-rnd, select \"File -> Load netlist file\" and select \n");
+		printf("    %s to load the updated netlist.\n\n", net_file_name);
+	}
+	else
+		printf("    (this will update the elements and the netlist)\n\n");
+}
+
+static void method_import_go()
+{
+	import_go(0);
+}
+
+static void method_import_sep_go()
+{
+	import_go(1);
+}
+
+
+static int method_import_guess_out_name(void)
+{
+	int res;
+	char *name;
+	
+	name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".lht", NULL);
+	res = pcb_file_readable(name);
+	free(name);
+	if (!res) {
+		name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb.lht", NULL);
+		res = pcb_file_readable(name);
+		free(name);
+	}
+	return res;
+}
+
+static void method_import_uninit(void)
+{
+	if (pcb_file_name != NULL)
+		free(pcb_file_name);
+	if (cmd_file_name != NULL)
+		free(cmd_file_name);
+	if (net_file_name != NULL)
+		free(net_file_name);
+}
+
+static method_t method_import;
+static method_t method_import_sep;
+
+void method_import_register(void)
+{
+	method_import.name = "import";
+	method_import.desc = "import schematics (pure action script)";
+	method_import.init = method_import_init;
+	method_import.go = method_import_go;
+	method_import.uninit = method_import_uninit;
+	method_import.guess_out_name = method_import_guess_out_name;
+	method_import.not_by_guess = 0;
+	method_register(&method_import);
+
+	method_import_sep.name = "importsep";
+	method_import_sep.desc = "import schematics (separate action script and netlist)";
+	method_import_sep.init = method_import_init;
+	method_import_sep.go = method_import_sep_go;
+	method_import_sep.uninit = method_import_uninit;
+	method_import_sep.guess_out_name = method_import_guess_out_name;
+	method_import_sep.not_by_guess = 1;
+	method_register(&method_import_sep);
+}
Index: tags/2.0.1/util/gsch2pcb-rnd/method_import.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/method_import.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/method_import.h	(revision 18980)
@@ -0,0 +1 @@
+void method_import_register(void);
Index: tags/2.0.1/util/gsch2pcb-rnd/netlister.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/netlister.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/netlister.c	(revision 18980)
@@ -0,0 +1,111 @@
+/* gsch2pcb-rnd
+ *
+ *  Original version: Bill Wilson    billw@wt.net
+ *  rnd-version: (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+/*#include <ctype.h>*/
+#include <time.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include "../src/plug_footprint.h"
+#include "../src/paths.h"
+#include "../src/conf.h"
+#include "../src/conf_core.h"
+#include "../config.h"
+#include "../src/compat_misc.h"
+#include "gsch2pcb_rnd_conf.h"
+#include "gsch2pcb.h"
+#include "../src/misc_util.h"
+#include "run.h"
+
+const char *gnetlist_name(void)
+{
+	const char *gnetlist;
+	/* Allow the user to specify a full path or a different name for
+	 * the gnetlist command.  Especially useful if multiple copies
+	 * are installed at once.
+	 */
+	gnetlist = getenv("GNETLIST");
+	if (gnetlist == NULL)
+		gnetlist = "gnetlist";
+	return gnetlist;
+}
+
+int run_gnetlist(const char *pins_file, const char *net_file, const char *pcb_file, const char * basename, const gadl_list_t *largs)
+{
+	struct stat st;
+	time_t mtime;
+	const char *gnetlist;
+	gadl_iterator_t it;
+	char **sp;
+	char *verbose_str = NULL;
+
+	gnetlist = gnetlist_name();
+
+	if (!conf_g2pr.utils.gsch2pcb_rnd.verbose)
+		verbose_str = "-q";
+
+
+	if (!build_and_run_command("%s %s -g pcbpins -o %s %L %L", gnetlist, verbose_str, pins_file, &extra_gnetlist_arg_list, largs))
+		return FALSE;
+
+	if (!build_and_run_command("%s %s -g PCB -o %s %L %L", gnetlist, verbose_str, net_file, &extra_gnetlist_arg_list, largs))
+		return FALSE;
+
+	mtime = (stat(pcb_file, &st) == 0) ? st.st_mtime : 0;
+
+	require_gnetlist_backend(SCMDIR, "gsch2pcb-rnd");
+
+	if (!build_and_run_command("%s %s -L " SCMDIR " -g gsch2pcb-rnd -o %s %L %L",
+														 gnetlist, verbose_str, pcb_file, &extra_gnetlist_arg_list, largs)) {
+		if (stat(pcb_file, &st) != 0 || mtime == st.st_mtime) {
+			fprintf(stderr, "gsch2pcb: gnetlist command failed, `%s' not updated\n", pcb_file);
+			return FALSE;
+		}
+		return FALSE;
+	}
+
+	gadl_foreach(&extra_gnetlist_list, &it, sp) {
+		const char *s = *sp;
+		const char *s2 = strstr(s, " -o ");
+		char *out_file;
+		char *backend;
+		if (!s2) {
+			out_file = pcb_concat(basename, ".", s, NULL);
+			backend = pcb_strdup(s);
+		}
+		else {
+			out_file = pcb_strdup(s2 + 4);
+			backend = pcb_strndup(s, s2 - s);
+		}
+
+		if (!build_and_run_command("%s %s -g %s -o %s %L %L",
+															 gnetlist, verbose_str, backend, out_file, &extra_gnetlist_arg_list, largs))
+			return FALSE;
+		free(out_file);
+		free(backend);
+	}
+
+	return TRUE;
+}
Index: tags/2.0.1/util/gsch2pcb-rnd/netlister.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/netlister.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/netlister.h	(revision 18980)
@@ -0,0 +1,11 @@
+/* Run gnetlist to generate a netlist and a PCB board file.  gnetlist
+ * has exit status of 0 even if it's given an invalid arg, so do some
+ * stat() hoops to decide if gnetlist successfully generated the PCB
+ * board file (only gnetlist >= 20030901 recognizes -m).
+ */
+int run_gnetlist(const char *pins_file, const char *net_file, const char *pcb_file, const char * basename, const gadl_list_t *largs);
+
+
+/* Return the name of gnetlist that should be executed */
+const char *gnetlist_name(void);
+
Index: tags/2.0.1/util/gsch2pcb-rnd/run.c
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/run.c	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/run.c	(revision 18980)
@@ -0,0 +1,134 @@
+/* gsch2pcb-rnd
+ *
+ *  Original version: Bill Wilson    billw@wt.net
+ *  rnd-version: (C) 2015..2016, Tibor 'Igor2' Palinkas
+ *
+ *  This program is free software which I release under the GNU General Public
+ *  License. You may redistribute and/or modify this program under the terms
+ *  of that license as published by the Free Software Foundation; either
+ *  version 2 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.  Version 2 is in the
+ *  COPYRIGHT file in the top level directory of this distribution.
+ *
+ *  To get a copy of the GNU General Puplic License, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include "gsch2pcb.h"
+#include "../src_3rd/genvector/vts0.h"
+#include "../src/compat_misc.h"
+#include "../src/safe_fs.h"
+#include "gsch2pcb_rnd_conf.h"
+
+
+int build_and_run_command(const char * format_, ...)
+{
+	va_list vargs;
+	int result = FALSE;
+	vts0_t args;
+	char *format, *s, *start;
+
+	/* Translate the format string; args elements point to const char *'s
+	   within a copy of the format string. The format string is copied so
+	   that these parts can be terminated by overwriting whitepsace with \0 */
+	va_start(vargs, format_);
+	format = pcb_strdup(format_);
+	vts0_init(&args);
+	for(s = start = format; *s != '\0'; s++) {
+		/* if word separator is reached, save the previous word */
+		if (isspace(s[0])) {
+			if (start == s) { /* empty word - skip */
+				start++;
+				continue;
+			}
+			*s = '\0';
+			vts0_append(&args, start);
+			start = s+1;
+			continue;
+		}
+
+		/* check if current word is a format */
+		if ((s == start) && (s[0] == '%') && (s[1] != '\0') && ((s[2] == '\0') || isspace(s[2]))) {
+			switch(s[1]) {
+				case 'L': /* append contents of char * gadl_list_t */
+					{
+						gadl_list_t *list = va_arg(vargs, gadl_list_t *);
+						gadl_iterator_t it;
+						char **s;
+						gadl_foreach(list, &it, s) {
+							vts0_append(&args, *s);
+						}
+					}
+					start = s+2;
+					s++;
+					continue;
+				case 's':
+					{
+						char *arg = va_arg(vargs, char *);
+						if (arg != NULL)
+							vts0_append(&args, arg);
+						start = s+2;
+						s++;
+					}
+					continue;
+			}
+		}
+	}
+	va_end(vargs);
+
+	if (args.used > 0) {
+		int i, l;
+		char *cmd, *end, line[1024];
+		FILE *f;
+
+		l = 0;
+		for (i = 0; i < args.used; i++)
+			l += strlen(args.array[i]) + 3;
+
+		end = cmd = malloc(l+1);
+		for (i = 0; i < args.used; i++) {
+			l = strlen(args.array[i]);
+			*end = '"'; end++;
+			memcpy(end, args.array[i], l);
+			end += l;
+			*end = '"'; end++;
+			*end = ' '; end++;
+		}
+		end--;
+		*end = '\0';
+
+		/* we have something in the list, build & call command */
+		if (conf_g2pr.utils.gsch2pcb_rnd.verbose) {
+			printf("Running command:\n\t%s\n", cmd);
+			printf("%s", SEP_STRING);
+		}
+
+		f = pcb_popen(cmd, "r");
+		while(fgets(line, sizeof(line), f) != NULL) {
+			if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
+				fputs(line, stdout);
+		}
+
+		if (pcb_pclose(f) == 0)
+			result = TRUE;
+		else
+			fprintf(stderr, "Failed to execute external program\n");
+		free(cmd);
+
+		if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
+			printf("\n%s", SEP_STRING);
+	}
+
+	free(format);
+	vts0_uninit(&args);
+	return result;
+}
Index: tags/2.0.1/util/gsch2pcb-rnd/run.h
===================================================================
--- tags/2.0.1/util/gsch2pcb-rnd/run.h	(nonexistent)
+++ tags/2.0.1/util/gsch2pcb-rnd/run.h	(revision 18980)
@@ -0,0 +1,13 @@
+/**
+ * Build and run a command. No redirection or error handling is
+ * done.  Format string is split on whitespace. Specifiers %l and %s
+ * are replaced with contents of positional args. To be recognized,
+ * specifiers must be separated from other arguments in the format by
+ * whitespace.
+ *  - %L expects a gadl_list_t vith char * payload, contents used as separate arguments
+ *  - %s expects a char*, contents used as a single argument (omitted if NULL)
+ * @param[in] format  used to specify command to be executed
+ * @param[in] ...     positional parameters
+ */
+int build_and_run_command(const char * format_, ...);
+
Index: tags/2.0.1/util/keylist.sh
===================================================================
--- tags/2.0.1/util/keylist.sh	(nonexistent)
+++ tags/2.0.1/util/keylist.sh	(revision 18980)
@@ -0,0 +1,375 @@
+#!/bin/sh
+#   keylist - list hotkey->actions found in .lht files in a html table
+#   Copyright (C) 2015..2016, 2018 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+AWK=awk
+
+export LANG=C
+
+need_lht()
+{
+	echo "lhtflat not found. Please install lihata to run this script. The" >&2
+	echo "svn extern in src_3rd/ is not enough, this script requires a full" >&2
+	echo "installation from svn://repo.hu/lihata/trunk" >&2
+	exit 1
+}
+
+# make sure lhtflat is installed
+echo "" | lhtflat || need_lht
+
+
+if test -z "$*"
+then
+	echo ""
+	echo "$0: Generate a html table from pcb menu lht files."
+	echo "Usage: $0 file1 [file2 [file3 ... [fileN]]]"
+	echo ""
+	exit
+else
+	cmd="html"
+	while test $# -gt 0
+	do
+		case "$1" in
+			--html) cmd="html";;
+			--boxed) cmd="boxed";;
+			--lst) cmd="lst";;
+			--dot) cmd="dot"; nodenames=$2; shift 1;;
+			*) res_files="$res_files $1" ;;
+		esac
+		shift 1
+	done
+fi
+
+extract_from_lht()
+{
+	lhtflat | $AWK -F '[\t]' -v "fn=$1" '
+
+#data	text	//main_menu/1::Edit/submenu/11::Edit name of/submenu/1::pin on layout/a	Shift Ctrl<Key>n
+#data	text	//main_menu/1::Edit/submenu/11::Edit name of/submenu/1::pin on layout/action	ChangeName(Object, Number) 
+
+	{
+		tmp = $3
+		if ($3 ~ "/a/[0-9]*::$") {
+			# li:a = {}
+			sub("/[0-9]*::$", "", tmp)
+		}
+		parent=tmp
+		sub("/[^/]*$","", parent)
+		node=tmp
+		sub("^.*/","", node)
+	}
+
+
+	(($1 == "data") && ($2 == "text")) {
+		# simple text node: accel key
+		if (node == "a") {
+			seq=$0
+			sub("[^\t]*[\t]*[^\t]*[\t]*[^\t]*[\t]*", "", seq)
+			gsub(" ", "", seq)
+			v = split(tolower(seq), S, "[;]")
+			ktmp = ""
+			for(n = 1; n <= v; n++) {
+				if (S[n] ~ "<key>")
+					split(S[n], K, "<key>")
+				else
+					split(S[n], K, "<char>")
+				if (K[1] != "") {
+					mods = ""
+					if (K[1] ~ "alt")   mods = mods "-alt"
+					if (K[1] ~ "ctrl")  mods = mods "-ctrl"
+					if (K[1] ~ "shift") mods = mods "-shift"
+				}
+				else
+					mods = ""
+				if (ktmp == "")
+					ktmp = K[2] mods
+				else
+					ktmp = ktmp ";" K[2] mods
+			}
+			if (KEY[parent] == "")
+				KEY[parent] = ktmp
+			else
+				KEY[parent] = KEY[parent] SUBSEP ktmp
+		}
+
+		# simple text node: action
+		if (node == "action")
+			ACTION[parent] = $4
+
+		# list item: action
+		if ($3 ~ "/action/[0-9]+::$") {
+			parent = $3
+			sub("/action/[^/]*$", "", parent)
+			if (ACTION[parent] != "")
+				ACTION[parent] = ACTION[parent] ";" $4
+			else
+				ACTION[parent] = $4
+		}
+	}
+
+	END {
+		for(n in KEY) {
+			menuname = n
+			sub(".*::", "", menuname)
+			v = split(KEY[n], K, "[" SUBSEP "]")
+			for(i = 1; i <= v; i++)
+				print K[i] "\t" fn "\t" ACTION[n] "\t" menuname
+		}
+	}
+	'
+}
+
+# convert a "key src action" to a html table with rowspans for base keys
+gen_html()
+{
+	$AWK -F '[\t]' '
+	BEGIN {
+		CLR[0] = "#FFFFFF"
+		CLR[1] = "#DDFFFF"
+		key_combos = 0
+	}
+	function to_base_key(combo)
+	{
+		sub("-.*", "", combo)
+		return combo
+	}
+
+	function to_mods(combo)
+	{
+		if (!(combo ~ ".-"))
+			return ""
+		sub("^[^-]*[-]", "", combo)
+		return combo
+	}
+
+	{
+		k = $1
+		if (last != k) {
+			LIST[key_combos++] = k
+#			ROWSPAN[to_base_key(k)]++
+		}
+		ACTION[$2, k] = $3
+		MENUNAME[$2, k] = $4
+		HIDS[$2]++
+		last = k
+
+		v = split(k, K, ";")
+		p = ""
+		for(n = 1; n <= v; n++) {
+			p = p K[n] ";"
+			if (($2, p) in PREFIX) {
+				err = err "<br>" $2 ": " k " vs. " p
+				ERR[$2, p]++
+				ERR[$2, k]++
+			}
+		}
+		p = k ";"
+		PREFIX[$2, p]++
+	}
+
+	function cleanup(s)
+	{
+		gsub("\260", "\\&deg;", s)
+		gsub("\\\\37777777660", "\\&deg;", s)
+		gsub("\\\\057", "/", s)
+		return s
+	}
+
+	END {
+		q="\""
+		print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">"
+		print "<html>"
+		print "<!-- This file is generated by util/keylist.sh. DO NOT EDIT. -->"
+		print "<head>"
+		print "\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=us-ascii\">"
+		print "\t<title> Key to action bindings </title>"
+		print "<!--AUTO head begin-->"
+		print "<link rel=\"icon\" href=\"http://repo.hu/projects/pcb-rnd/resources/logo16.png\">"
+		print "<!--AUTO head end-->"
+		print "</head>"
+		print "<body>"
+		print "<h1> Key to action bindings </h1>"
+		print "<table border=1 cellspacing=0>"
+		printf("<tr><th> key")
+		colspan = 2
+		for(h in HIDS) {
+			printf(" <th>%s", h)
+			colspan++
+		}
+		print ""
+		for(n = 0; n < key_combos; n++) {
+			clr_cnt++
+			key = LIST[n]
+			print "<tr bgcolor=" q CLR[clr_cnt % 2] q ">"
+
+			kv = split(key, K, ";")
+			keystr = ""
+			ind=""
+			for(kn = 1; kn <= kv; kn++) {
+				if (kn > 1)
+					keystr = keystr "<br>"
+				keystr = keystr ind K[kn]
+				ind = ind "&nbsp;"
+			}
+			
+
+			print "	<th align=left>" cleanup(keystr)
+			for(h in HIDS) {
+				mn = cleanup(MENUNAME[h, key])
+				act = cleanup(ACTION[h, key])
+				if ((act == "") && (mn == ""))
+					act = "&nbsp;"
+				else {
+					gsub(");", "); ", act)
+					if (mn != "")
+						act = "<I>" mn "</I>" "<br>" act
+				}
+				print "	<td>", act
+				if ((h, key) in ERR)
+					print "<br> <b>Error: key prefix collision</b>"
+			}
+			last_base = base
+		}
+		print "</table>"
+		print err
+		print "</body></html>"
+	}
+	'
+}
+
+gen_list()
+{
+	local n
+	for n in $res_files 
+	do
+		extract_from_lht "`basename $n`" < $n
+	done | sort
+}
+
+# load node names and generate a dot drawing of the multikey bindings
+gen_dot()
+{
+	$AWK -v "names=$nodenames"  '
+		BEGIN {
+			q="\""
+			print "digraph keytree {"
+			print "rankdir=LR"
+			print "ranksep=0.2"
+			while((getline < names) == 1) {
+				path=$1
+				$1=""
+				desc = $0
+				node(path, desc, "shape=box")
+			}
+			close(names)
+			FS="[\t]"
+		}
+
+		function arrow_(curr)
+		{
+			if (!(curr in ARROW_SEEN)) {
+				print curr
+				ARROW_SEEN[curr]=1
+			}
+		}
+
+		function arrow(path   ,n,v,P,last,curr)
+		{
+			sub("^[/;_]", "", path)
+			sub("[/;_]$", "", path)
+			v = split(path, P, "[/;_]")
+
+#			curr = "root -> " q P[1] q
+#			arrow_(curr)
+			last = P[1]
+			for(n = 2; n <= v; n++) {
+				curr = q last q "->"  q last "_" P[n] q
+				arrow_(curr)
+				last = last "_" P[n]
+			}
+		}
+
+		function cleanup(s)
+		{
+			gsub("\260", "\\&deg;", s)
+			gsub("\\\\37777777660", "\\&deg;", s)
+			gsub("\\\\057", "/", s)
+			return s
+		}
+
+		function node(path, desc, shape,    orig)
+		{
+			orig=path
+			desc=cleanup(desc)
+			sub("^[/_;]", "", orig)
+			sub("[/_;]$", "", orig)
+			gsub("[/_;]", " ", orig)
+			sub("^[/;]", "", path)
+			sub("[/;]$", "", path)
+			gsub("[/;]", "_", path)
+			gsub("[\"]", "", desc)
+			print q path q " [label=" q "{" orig "} \\n" desc q " " shape "]"
+			arrow(path)
+		}
+
+		(($1 ~ "^[a-z]$") || ($1 ~ "^[a-z];[a-z];") || ($1 ~ "^[a-z];[a-z]$")) {
+			node($1, $4, "")
+		}
+
+		END {
+			print "}"
+		}
+	'
+}
+
+gen_boxed_html()
+{
+	$AWK -F '[\t]' '
+		/^[a-z][;]/ {
+			key=substr($0, 1, 1)
+			TBL[key] = TBL[key] "\n<tr><td>" $1 "<td>" $4
+		}
+		END {
+			print "<html><head><style>"
+			print "div.key {"
+			print "	margin: auto;"
+			print "	background: #bbffff;"
+			print "	float: left;"
+			print "	margin: 15px;"
+			print "}"
+			print "</style></head>"
+			print "<body><h1>pcb-rnd 2.x.x keys - cheat sheet </h1>"
+			for(n = 0; n < 26; n++) {
+				key = sprintf("%c", 97+n)
+				print "<div class=\"key\"><table border=1 cellspacing=0 width=400px>"
+				print TBL[key]
+				print "</table></div>"
+				print ""
+			}
+		}
+	'
+}
+
+case "$cmd" in
+	html) gen_list | gen_html ;;
+	boxed) gen_list | gen_boxed_html ;;
+	dot) gen_list | gen_dot ;;
+	lst) gen_list ;;
+esac
+

Property changes on: tags/2.0.1/util/keylist.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/menu2svg.sh
===================================================================
--- tags/2.0.1/util/menu2svg.sh	(nonexistent)
+++ tags/2.0.1/util/menu2svg.sh	(revision 18980)
@@ -0,0 +1,147 @@
+#!/bin/sh
+#   menu2svg - visualize a menu file using graphviz
+#   Copyright (C) 2017 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+fn="$1"
+if test -z $fn
+then
+	fn="../src/pcb-menu-gtk.lht"
+fi
+
+lhtflat < $fn  | tee LHT | awk -F "[\t]" '
+!($3 ~ "^//main_menu/") { next }
+
+{
+	menu_path = $3
+	sub("//main_menu/", "", menu_path)
+	gsub("/submenu", "", menu_path)
+	gsub("[0-9]+::", "", menu_path)
+}
+
+(($1 == "open") && ($2 == "hash")) {
+	if (current != "")
+		print current
+	current = menu_path
+}
+
+(($1 == "data") && ($2 == "text") && (current != "")) {
+	if ($3 ~ "/a$") {
+		PROPS["key"] = $4
+		sub("<[Kk]ey>", " ", PROPS["key"])
+	}
+	else if ($3 ~ "/action$") {
+		PROPS["act"] = $4
+	}
+
+
+}
+
+(($1 == "close") && (current != "")) {
+	print current "\t" PROPS["key"] "\t" PROPS["act"]
+	current = ""
+	delete PROPS
+}
+' | tee Menu.flat | awk -F "[\t]" '
+BEGIN {
+	q = "\""
+	print "digraph menu {"
+	print "rankdir=LR;"
+#	print "ranksep=4;"
+	print "node [shape=record];"
+
+	reg_node("/")
+}
+
+function reg_node(path)
+{
+	last_id++
+	PATH2ID[path] = last_id
+	ID2PATH[last_id] = path
+}
+
+function add_ch(parent, child)
+{
+	if (NUM_CH[parent] == "")
+		NUM_CH[parent] = 0
+	if (IS_CH[parent, child])
+		return
+	IS_CH[parent, child] = 1
+	CH[parent, NUM_CH[parent]] = child
+
+	NUM_CH[parent]++
+}
+
+{
+	path=$1
+	KEY[path] = $2
+	ACT[path] = $3
+	reg_node(path)
+	while(path ~ "/") {
+		parent = path
+		sub("/[^/]*$", "", parent)
+		add_ch(parent, path)
+		path = parent
+	}
+	add_ch("/", path)
+}
+
+function gen_menus(parent   ,n,child,short,chp)
+{
+	short=parent
+	sub(".*/", "", short)
+	if (!(parent in PATH2ID))
+		reg_node(parent)
+	printf "	m" PATH2ID[parent] " [label=\"<menu> [[" short "]]"
+	for(n = 0; n < NUM_CH[parent]; n++) {
+		child=CH[parent, n]
+		short=child
+		sub(".*/", "", short)
+		printf("|<m%d> %s", PATH2ID[child], short)
+	}
+	print "\"]"
+
+	for(n = 0; n < NUM_CH[parent]; n++) {
+		child=CH[parent, n]
+		if (NUM_CH[child] > 0) {
+			chp = gen_menus(child)
+			print "	m" PATH2ID[parent] ":m" PATH2ID[child] " -> " chp ":menu"
+		}
+	}
+
+	return "m" PATH2ID[parent]
+}
+
+
+END {
+	for(n = 0; n < NUM_CH["/"]; n++) {
+		child=CH["/", n]
+		curr = gen_menus(child)
+		if (last != NULL) {
+			print "tmp" n " [shape=point]"
+			print last ":menu -> tmp" n " [weight=10000 arrowhead=none]"
+			print "tmp" n " -> " curr ":menu [weight=10000 arrowhead=none]"
+		}
+		last = curr
+	}
+	print "}"
+}
+' > Menu.dot
+
+dot -Tsvg Menu.dot > Menu.svg
+

Property changes on: tags/2.0.1/util/menu2svg.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcb-prj2lht
===================================================================
--- tags/2.0.1/util/pcb-prj2lht	(nonexistent)
+++ tags/2.0.1/util/pcb-prj2lht	(revision 18980)
@@ -0,0 +1,158 @@
+#!/bin/sh
+#   pcb-prj2lht - convert an old gsch2pcb project file to geda project lht
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+# Convert and old gsch2pcb-rnd project file to the new, multi-program
+# geda project lihata file format.
+
+prj2lht() {
+	awk '
+		BEGIN {
+			INDENT["elements-dir"] = "     "
+			INDENT["schematics"] = "      "
+		}
+	
+		function lht_quote(s) {
+			if (s ~ "[^a-zA-Z0-9_.-]")
+				return "{" s "}"
+			return s
+		}
+	
+		function parse() {
+			name = $1
+			$1=""
+			CFG[name] = $0
+			sub("^[ \t]*", "", CFG[name])
+		}
+	
+		function list_add(key, val) {
+			CFG[key] = CFG[key] INDENT[key] lht_quote(val) "\n"
+		}
+	
+		function list_add_split(key, val   ,n,v,T) {
+			v = split(val, T, "[ \t]+")
+			for(n = 1; n <= v; n++)
+				if (T[n] != "")
+					list_add(key, T[n])
+		}
+	
+		function qparse(    tmp,name) {
+			name = $1
+			$1=""
+			tmp=$0
+			sub("^[ \t]*", "", tmp)
+			while(match(tmp, "\"[^\"]*\"")) {
+				list_add_split(name, substr(tmp, 1, RSTART-1))
+				list_add(name, substr(tmp, RSTART+1, RLENGTH-2))
+				tmp = substr(tmp, RSTART+RLENGTH, length(tmp))
+			}
+			# leftover after the last quote
+			list_add_split(name, tmp)
+		}
+
+		($1 == "elements-dir")    { qparse() }
+		($1 == "elements-shell")  { parse() }
+		($1 == "schematics")      { qparse() }
+		($1 == "output-name")     { parse() }
+		($1 == "remove-unfound")  { CFG["remove-unfound"] = 1 }
+		($1 == "keep-unfound")    { CFG["remove-unfound"] = 0 }
+		($1 == "quiet")           { CFG[$1] = 1 }
+		($1 == "preserve")        { CFG[$1] = 1 }
+		($1 == "default-pcb")     { parse() }
+		($1 == "gnetlist")        { parse() }
+		($1 == "enpty-footprint") { parse() }
+
+		function print_val(cfgkey, outkey) {
+			if (cfgkey in CFG)
+				print "     " outkey " = " lht_quote(CFG[cfgkey])
+		}
+
+		END {
+			print "ha:geda-project-v1 {"
+			print " li:pcb-rnd-conf-v1 {"
+	
+			print "  ha:overwrite {"
+			print "   ha:utils {"
+			print "    ha:gsch2pcb_rnd {"
+			print_val("remove-unfound", "remove_unfound_elements")
+			print_val("quiet", "quiet_mode")
+			print_val("preserve", "preserve")
+			print_val("output-name", "sch_basename")
+			print_val("default-pcb", "default_pcb")
+			print_val("gnetlist", "gnetlist")
+			print_val("empty-footprint", "empty_footprint_name")
+			if ("schematics" in CFG) {
+				print "     li:schematics {"
+				printf("%s", CFG["schematics"])
+				print "     }"
+			}
+			print "    }"
+			print "   }"
+			print "   ha:rc {"
+			print_val("elements-shell", "library_shell")
+			print "   }"
+			print "  }"
+	
+			if ("elements-dir" in CFG) {
+				print "  ha:prepend {"
+				print "   ha:rc {"
+				print "    li:library_search_paths {"
+				printf("%s", CFG["elements-dir"])
+				print "    }"
+				print "   }"
+				print "  }"
+			}
+	
+			print " }"
+			print "}"
+		}
+	'
+}
+
+help()
+{
+	echo "pcb-prj2lht - convert a gsch2pcb project file to pcb-rnd lihata project file"
+	echo ""
+	echo "Invocation: pcb-prj2lht [something.prj]"
+	echo ""
+	echo "If the project file is specified, a new file is created with the .prj"
+	echo "part replaced with .lht. If no file name specified, read the project"
+	echo "on STDIN and write the result to STDOUT."
+	echo ""
+}
+
+########## main ##########
+
+if test "$1" = "--help"
+then
+	help
+	exit
+fi
+
+if test $# -gt 0
+then
+	for n in "$@"
+	do
+		out=${n%%.prj}.lht
+		prj2lht < $n > $out || echo "Failed to convert $n to $out" >&2
+	done
+else
+	# stdio operation
+	prj2lht
+fi

Property changes on: tags/2.0.1/util/pcb-prj2lht
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcb-strip
===================================================================
--- tags/2.0.1/util/pcb-strip	(nonexistent)
+++ tags/2.0.1/util/pcb-strip	(revision 18980)
@@ -0,0 +1,87 @@
+#!/bin/sh
+#   pcb-strip - remove sections of a .pcb file
+#   Copyright (C) 2016 Tibor 'Igor2' Palinkas
+#
+#   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 2 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, write to the Free Software Foundation, Inc.,
+#   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#   http://repo.hu/projects/pcb-rnd
+
+pcb_strip()
+{
+	awk -v "strip_sym=$strip_sym" -v "strip_attr=$strip_attr" '
+		BEGIN {
+			symst = 0
+		}
+
+		strip_attr && /^[ \t]*Attribute/ { next }
+
+		strip_sym && (symst == 0) && /^[ \t]*Symbol/ { symst = 1 }
+		strip_sym && (symst == 1) && /^[ \t]*[(]/ { symst = 2 }
+		strip_sym && (symst == 2) && /^[ \t]*[)]/ { symst = 0; next }
+
+		(symst == 0) { print $0 }
+	'
+}
+
+help()
+{
+	echo "pcb-strip - remove sections of a pcb file"
+	echo "Invocation:"
+	echo "     $0 [-a] [-s] <foo.pcb >bar.pcb"
+	echo " or  $0 [-a] [-s] foo.pcb"
+	echo ""
+	echo "Switches:"
+	echo " -a       remove Attributes"
+	echo " -s       remove symbols"
+	echo ""
+}
+
+strip_sym=0
+strip_attr=0
+fn=""
+while test $# -gt 0
+do
+	case "$1"
+	in
+		--help) help "$0"; exit 0;;
+		-s) strip_sym=1;;
+		-a) strip_attr=1;;
+		-*) echo "unknown switch $1; try --help" >&2; exit 1;;
+		*)
+			if test -z "$fn"
+			then
+				fn="$1"
+			else
+				echo "unknown switch $1; try --help" >&2
+				exit
+			fi
+			;;
+	esac
+	shift 1
+done
+
+if test -z "$fn"
+then
+# operate on stdio
+	pcb_strip
+else
+# use a file by name
+	tmp=`mktemp`
+	if test -z "$tmp"
+	then
+		tmp="$fn.strip"
+	fi
+	mv $fn $tmp && pcb_strip < $tmp > $fn && rm $tmp
+fi

Property changes on: tags/2.0.1/util/pcb-strip
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib-map/Makefile
===================================================================
--- tags/2.0.1/util/pcblib-map/Makefile	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/Makefile	(revision 18980)
@@ -0,0 +1,16 @@
+OUT = map.html conn.html parametric.html smd2.html smd3.html smdN.html \
+      trh2.html trh3.html trhN.html cache
+
+all: $(OUT)
+
+map.html map.png: map.pcb
+	./imgmap_page.sh map
+
+%.html %.png: %.pcb
+	./imgmap_fp.sh $*
+
+cache:
+	./cache.sh > cache
+
+clean:
+	rm $(OUT)
Index: tags/2.0.1/util/pcblib-map/cache.sh
===================================================================
--- tags/2.0.1/util/pcblib-map/cache.sh	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/cache.sh	(revision 18980)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+digest()
+{
+	local fn bn
+	fn=$1
+
+	bn=${fn#./}
+
+	if test -d "$fn"
+	then
+		echo "D $bn"
+		return
+	fi
+
+	prm=`grep "@@purpose" $fn`
+	if test -z "$prm"
+	then
+		tags=`awk '
+		/^##/ {
+			tag=$0
+			sub("^##","", tag)
+			printf " %s", tag
+		}
+		' < $fn`
+		echo "S $bn $tags"
+	else
+		tags=`awk '
+		/^@@tag/ {
+			tag=$0
+			sub("^@@tag *","", tag)
+			printf " %s", tag
+		}
+		' < $fn`
+		echo "P $bn $tags"
+	fi
+
+}
+
+(
+cd ../../pcblib
+for n in `find .`
+do
+	case $n in
+		*.svn*) ;;
+		.) ;;
+		*)
+			digest $n
+	esac
+done
+)

Property changes on: tags/2.0.1/util/pcblib-map/cache.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib-map/conn.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/conn.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/conn.pcb	(revision 18980)
@@ -0,0 +1,1342 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 270000 500000]
+
+Grid[10000.0 0 0 1]
+Cursor[0 30000 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[270000 500000 7874 4000 0 3150 "" ""]
+
+Element["" "DSUB connector, female/male" "" "DB15F" 20000 50000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[5600 102600 25000 3000 25600 12500 "C1" "16" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "17" ""]
+	ElementLine [39100 114600 42100 114600 1000]
+	ElementLine [39100 -39000 39100 114600 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 114600 1000]
+	ElementLine [39100 108600 42100 108600 1000]
+	ElementLine [39100 96600 42100 96600 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 91600 39100 91600 2000]
+	ElementLine [28600 -16000 28600 91600 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 91600 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB15M" 110000 50000 -5000 75600 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "16" ""]
+	Pin[-5000 102600 25000 3000 25600 12500 "C2" "17" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 114600 1000]
+	ElementLine [-38500 114600 -41500 114600 1000]
+	ElementLine [-41500 114600 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 108600 -38500 108600 1000]
+	ElementLine [-41500 96600 -38500 96600 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 91600 2000]
+	ElementLine [-28000 91600 -38500 91600 2000]
+	ElementLine [-38500 91600 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB25F" 160000 50000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[0 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[0 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[0 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[0 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[0 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "20" "20" ""]
+	Pin[11200 81000 6000 3000 6600 3500 "21" "21" ""]
+	Pin[11200 91800 6000 3000 6600 3500 "22" "22" ""]
+	Pin[11200 102600 6000 3000 6600 3500 "23" "23" ""]
+	Pin[11200 113400 6000 3000 6600 3500 "24" "24" ""]
+	Pin[11200 124200 6000 3000 6600 3500 "25" "25" ""]
+	Pin[5600 156600 25000 3000 25600 12500 "C1" "26" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "27" ""]
+	ElementLine [39100 168600 42100 168600 1000]
+	ElementLine [39100 -39000 39100 168600 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 168600 1000]
+	ElementLine [39100 162600 42100 162600 1000]
+	ElementLine [39100 150600 42100 150600 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 145600 39100 145600 2000]
+	ElementLine [28600 -16000 28600 145600 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 145600 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [4000 86400 28600 86400 2000]
+	ElementLine [4000 97200 28600 97200 2000]
+	ElementLine [4000 108000 28600 108000 2000]
+	ElementLine [4000 118800 28600 118800 2000]
+	ElementLine [4000 129600 28600 129600 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+	ElementLine [15200 81000 28600 81000 2000]
+	ElementLine [15200 91800 28600 91800 2000]
+	ElementLine [15200 102600 28600 102600 2000]
+	ElementLine [15200 113400 28600 113400 2000]
+	ElementLine [15200 124200 28600 124200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB25M" 250000 50000 -5000 129600 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[600 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[600 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[600 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[600 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[600 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "20" "20" ""]
+	Pin[-10600 81000 6000 3000 6600 3500 "21" "21" ""]
+	Pin[-10600 91800 6000 3000 6600 3500 "22" "22" ""]
+	Pin[-10600 102600 6000 3000 6600 3500 "23" "23" ""]
+	Pin[-10600 113400 6000 3000 6600 3500 "24" "24" ""]
+	Pin[-10600 124200 6000 3000 6600 3500 "25" "25" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "26" ""]
+	Pin[-5000 156600 25000 3000 25600 12500 "C2" "27" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 168600 1000]
+	ElementLine [-38500 168600 -41500 168600 1000]
+	ElementLine [-41500 168600 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 162600 -38500 162600 1000]
+	ElementLine [-41500 150600 -38500 150600 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 145600 2000]
+	ElementLine [-28000 145600 -38500 145600 2000]
+	ElementLine [-38500 145600 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-3400 86400 -28000 86400 2000]
+	ElementLine [-3400 97200 -28000 97200 2000]
+	ElementLine [-3400 108000 -28000 108000 2000]
+	ElementLine [-3400 118800 -28000 118800 2000]
+	ElementLine [-3400 129600 -28000 129600 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+	ElementLine [-14600 81000 -28000 81000 2000]
+	ElementLine [-14600 91800 -28000 91800 2000]
+	ElementLine [-14600 102600 -28000 102600 2000]
+	ElementLine [-14600 113400 -28000 113400 2000]
+	ElementLine [-14600 124200 -28000 124200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB37F" 20000 260000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[0 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[0 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[0 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[0 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[0 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[0 140400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[0 151200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[0 162000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[0 172800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[0 183600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[0 194400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "20" "20" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "21" "21" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "22" "22" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "23" "23" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "24" "24" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "25" "25" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "26" "26" ""]
+	Pin[11200 81000 6000 3000 6600 3500 "27" "27" ""]
+	Pin[11200 91800 6000 3000 6600 3500 "28" "28" ""]
+	Pin[11200 102600 6000 3000 6600 3500 "29" "29" ""]
+	Pin[11200 113400 6000 3000 6600 3500 "30" "30" ""]
+	Pin[11200 124200 6000 3000 6600 3500 "31" "31" ""]
+	Pin[11200 135000 6000 3000 6600 3500 "32" "32" ""]
+	Pin[11200 145800 6000 3000 6600 3500 "33" "33" ""]
+	Pin[11200 156600 6000 3000 6600 3500 "34" "34" ""]
+	Pin[11200 167400 6000 3000 6600 3500 "35" "35" ""]
+	Pin[11200 178200 6000 3000 6600 3500 "36" "36" ""]
+	Pin[11200 189000 6000 3000 6600 3500 "37" "37" ""]
+	Pin[5600 221400 25000 3000 25600 12500 "C1" "38" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "39" ""]
+	ElementLine [39100 233400 42100 233400 1000]
+	ElementLine [39100 -39000 39100 233400 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 233400 1000]
+	ElementLine [39100 227400 42100 227400 1000]
+	ElementLine [39100 215400 42100 215400 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 210400 39100 210400 2000]
+	ElementLine [28600 -16000 28600 210400 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 210400 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [4000 86400 28600 86400 2000]
+	ElementLine [4000 97200 28600 97200 2000]
+	ElementLine [4000 108000 28600 108000 2000]
+	ElementLine [4000 118800 28600 118800 2000]
+	ElementLine [4000 129600 28600 129600 2000]
+	ElementLine [4000 140400 28600 140400 2000]
+	ElementLine [4000 151200 28600 151200 2000]
+	ElementLine [4000 162000 28600 162000 2000]
+	ElementLine [4000 172800 28600 172800 2000]
+	ElementLine [4000 183600 28600 183600 2000]
+	ElementLine [4000 194400 28600 194400 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+	ElementLine [15200 81000 28600 81000 2000]
+	ElementLine [15200 91800 28600 91800 2000]
+	ElementLine [15200 102600 28600 102600 2000]
+	ElementLine [15200 113400 28600 113400 2000]
+	ElementLine [15200 124200 28600 124200 2000]
+	ElementLine [15200 135000 28600 135000 2000]
+	ElementLine [15200 145800 28600 145800 2000]
+	ElementLine [15200 156600 28600 156600 2000]
+	ElementLine [15200 167400 28600 167400 2000]
+	ElementLine [15200 178200 28600 178200 2000]
+	ElementLine [15200 189000 28600 189000 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB37M" 110000 260000 -5000 194400 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[600 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[600 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[600 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[600 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[600 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[600 140400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[600 151200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[600 162000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[600 172800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[600 183600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[600 194400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "20" "20" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "21" "21" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "22" "22" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "23" "23" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "24" "24" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "25" "25" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "26" "26" ""]
+	Pin[-10600 81000 6000 3000 6600 3500 "27" "27" ""]
+	Pin[-10600 91800 6000 3000 6600 3500 "28" "28" ""]
+	Pin[-10600 102600 6000 3000 6600 3500 "29" "29" ""]
+	Pin[-10600 113400 6000 3000 6600 3500 "30" "30" ""]
+	Pin[-10600 124200 6000 3000 6600 3500 "31" "31" ""]
+	Pin[-10600 135000 6000 3000 6600 3500 "32" "32" ""]
+	Pin[-10600 145800 6000 3000 6600 3500 "33" "33" ""]
+	Pin[-10600 156600 6000 3000 6600 3500 "34" "34" ""]
+	Pin[-10600 167400 6000 3000 6600 3500 "35" "35" ""]
+	Pin[-10600 178200 6000 3000 6600 3500 "36" "36" ""]
+	Pin[-10600 189000 6000 3000 6600 3500 "37" "37" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "38" ""]
+	Pin[-5000 221400 25000 3000 25600 12500 "C2" "39" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 233400 1000]
+	ElementLine [-38500 233400 -41500 233400 1000]
+	ElementLine [-41500 233400 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 227400 -38500 227400 1000]
+	ElementLine [-41500 215400 -38500 215400 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 210400 2000]
+	ElementLine [-28000 210400 -38500 210400 2000]
+	ElementLine [-38500 210400 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-3400 86400 -28000 86400 2000]
+	ElementLine [-3400 97200 -28000 97200 2000]
+	ElementLine [-3400 108000 -28000 108000 2000]
+	ElementLine [-3400 118800 -28000 118800 2000]
+	ElementLine [-3400 129600 -28000 129600 2000]
+	ElementLine [-3400 140400 -28000 140400 2000]
+	ElementLine [-3400 151200 -28000 151200 2000]
+	ElementLine [-3400 162000 -28000 162000 2000]
+	ElementLine [-3400 172800 -28000 172800 2000]
+	ElementLine [-3400 183600 -28000 183600 2000]
+	ElementLine [-3400 194400 -28000 194400 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+	ElementLine [-14600 81000 -28000 81000 2000]
+	ElementLine [-14600 91800 -28000 91800 2000]
+	ElementLine [-14600 102600 -28000 102600 2000]
+	ElementLine [-14600 113400 -28000 113400 2000]
+	ElementLine [-14600 124200 -28000 124200 2000]
+	ElementLine [-14600 135000 -28000 135000 2000]
+	ElementLine [-14600 145800 -28000 145800 2000]
+	ElementLine [-14600 156600 -28000 156600 2000]
+	ElementLine [-14600 167400 -28000 167400 2000]
+	ElementLine [-14600 178200 -28000 178200 2000]
+	ElementLine [-14600 189000 -28000 189000 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB9F" 160000 290000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "6" "6" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "7" "7" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "8" "8" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "9" "9" ""]
+	Pin[5600 70200 25000 3000 25600 12500 "C1" "10" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "11" ""]
+	ElementLine [39100 82200 42100 82200 1000]
+	ElementLine [39100 -39000 39100 82200 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 82200 1000]
+	ElementLine [39100 76200 42100 76200 1000]
+	ElementLine [39100 64200 42100 64200 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 59200 39100 59200 2000]
+	ElementLine [28600 -16000 28600 59200 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 59200 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB9M" 250000 290000 -5000 43200 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "6" "6" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "7" "7" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "8" "8" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "9" "9" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "10" ""]
+	Pin[-5000 70200 25000 3000 25600 12500 "C2" "11" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 82200 1000]
+	ElementLine [-38500 82200 -41500 82200 1000]
+	ElementLine [-41500 82200 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 76200 -38500 76200 1000]
+	ElementLine [-41500 64200 -38500 64200 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 59200 2000]
+	ElementLine [-28000 59200 -38500 59200 2000]
+	ElementLine [-38500 59200 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+
+	)
+
+Element["" "right angle BNC" "" "BNC_LAY" 150000 440000 20000 0 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 -10000 6000 3000 6600 3500 "2" "2" ""]
+	Pin[20000 -20000 10000 3000 10600 8100 "m1" "3" ""]
+	Pin[20000 20000 10000 3000 10600 8100 "m2" "4" ""]
+	ElementLine [-6000 -29000 49000 -29000 1000]
+	ElementLine [49000 -29000 49000 29000 1000]
+	ElementLine [49000 29000 -6000 29000 1000]
+	ElementLine [-6000 29000 -6000 -29000 1000]
+
+	)
+
+Element["" "" "" "pwrjack" 240000 470000 0 0 0 100 ""]
+(
+	Pin[0 0 19685 2000 20285 11811 "" "2" ""]
+	Pin[0 -27559 19685 2000 20285 11811 "" "1" ""]
+	Pin[-17717 -13779 19685 2000 20285 11811 "" "3" ""]
+	ElementLine [-17717 -55118 -17717 0 1000]
+	ElementLine [-17717 0 17716 0 1000]
+	ElementLine [17716 0 17716 -55118 1000]
+	ElementLine [17716 -55118 -17717 -55118 1000]
+	ElementLine [-17717 -43307 17716 -43307 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/util/pcblib-map/imgmap_fp.sh
===================================================================
--- tags/2.0.1/util/pcblib-map/imgmap_fp.sh	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/imgmap_fp.sh	(revision 18980)
@@ -0,0 +1,127 @@
+#!/bin/sh
+pcb=$1.pcb
+
+pcb -x png --dpi 300 --photo-mode $pcb
+png=$1.png
+html=$1.html
+
+png_dims=`file $png | awk -F "[,]" '{ sub("x", " ", $2); print $2}'`
+
+
+
+awk -v "png_dims=$png_dims" -v "png_url=$png" '
+BEGIN {
+	q = "\""
+	sub("^ *", "", png_dims)
+	sub(" *$", "", png_dims)
+	split(png_dims, A, " +")
+	png_sx = A[1]
+	png_sy = A[2]
+	ne = 0
+}
+
+function bump(idx, x, y)
+{
+	if ((E[idx, "minx"] == "") || (x < E[idx, "minx"]))
+		E[idx, "minx"] = x
+	if ((E[idx, "maxx"] == "") || (x > E[idx, "maxx"]))
+		E[idx, "maxx"] = x
+	if ((E[idx, "miny"] == "") || (y < E[idx, "miny"]))
+		E[idx, "miny"] = y
+	if ((E[idx, "maxy"] == "") || (y > E[idx, "maxy"]))
+		E[idx, "maxy"] = y
+}
+
+# Element["" "rcy(150, bar-sign)" "C1" "acy150" 22500 95000 -2000 -4500 1 100 ""]
+/^Element *[[]/ {
+	coords=$0
+	sub("Element *[[]", "", coords)
+	for(n = 1; n <= 4; n++) {
+		match(coords, "[\"][^\"]*[\"]")
+		P[n] = substr(coords, RSTART+1, RLENGTH-2)
+		sub("[\"][^\"]*[\"]", "", coords)
+	}
+	split(coords, A, " ")
+	E[ne, "cmd"] = P[2]
+	E[ne, "cx"] = A[1]
+	E[ne, "cy"] = A[2]
+	E[ne, "file"] = P[4]
+	ne++
+	next
+}
+
+#ElementLine [-11811 -13006 -11811 -11250 3937]
+/^[ \t]*ElementLine *[[]/ {
+	sub("ElementLine *[[]", "", $0)
+	bump(ne-1, $1, $2)
+	bump(ne-1, $3, $4)
+	next
+}
+
+#ElementArc [-11811 -13006 -11811 -11250 3937]
+/^[ \t]*ElementArc *[[]/ {
+	sub("ElementArc *[[]", "", $0)
+	x = $1
+	y = $2
+	rx = $3
+	ry = $4
+	bump(ne-1, x-rx, y-ry)
+	bump(ne-1, x+rx, y+ry)
+	next
+}
+
+#Via[260000 120000 7874 4000 0 3150 "" ""]
+/^[ \t]*Via *[[]/ {
+	sub("Via *[[]", "", $0)
+	pcb_sx = $1
+	pcb_sy = $2
+	next
+}
+
+
+END {
+	scale_x = png_sx/pcb_sx
+	scale_y = png_sy/pcb_sy
+	print "<html><body>"
+	print "<img src=" q png_url q " usemap=\"#fpmap\">"
+	print "<map name=\"fpmap\">"
+	for(n = 0; n < ne; n++) {
+#		print E[n, "minx"], E[n, "maxx"], E[n, "miny"], E[n, "maxy"]
+		x1 = int((E[n, "minx"] + E[n, "cx"]) * scale_x)
+		x2 = int((E[n, "maxx"] + E[n, "cx"]) * scale_x)
+		y1 = int((E[n, "miny"] + E[n, "cy"]) * scale_y)
+		y2 = int((E[n, "maxy"] + E[n, "cy"]) * scale_y)
+		if (x1 < 0)
+			x1 = 0
+		if (y1 < 0)
+			y1 = 0
+		if (x1 > x2) {
+			tmp = x1
+			x1 = x2
+			x2 = tmp
+		}
+		if (y1 > y2) {
+			tmp = y1
+			y1 = y2
+			y2 = tmp
+		}
+		x1 -= 5
+		y1 -= 5
+		x2 += 5
+		y2 += 5
+#		print n, x1, y1, x2, y2, E[n, "cmd"]
+		cmd =  E[n, "cmd"]
+		if (cmd ~ "^[^ ]*[(]")
+			url="http://igor2.repo.hu/cgi-bin/pcblib-param.cgi?cmd=" cmd
+		else
+			url="http://igor2.repo.hu/cgi-bin/pcblib-static.cgi?fp=" E[n, "file"]
+		gsub(" ", "+", url)
+		print "<area shape=\"rect\" coords=" q x1 "," y1 "," x2 "," y2 q " href=" q url q " alt=" q E[n, "cmd"] q ">"
+	}
+	print "</map>"
+	print "</body></html>"
+}
+
+' < $pcb > $html
+
+

Property changes on: tags/2.0.1/util/pcblib-map/imgmap_fp.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib-map/imgmap_page.sh
===================================================================
--- tags/2.0.1/util/pcblib-map/imgmap_page.sh	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/imgmap_page.sh	(revision 18980)
@@ -0,0 +1,131 @@
+#!/bin/sh
+pcb=$1.pcb
+
+pcb -x png --dpi 100 --photo-mode $pcb
+png=$1.png
+
+png_dims=`file $png | awk -F "[,]" '{ sub("x", " ", $2); print $2}'`
+
+awk -v "png_dims=$png_dims" -v "png_url=$png" '
+BEGIN {
+	q = "\""
+	sub("^ *", "", png_dims)
+	sub(" *$", "", png_dims)
+	split(png_dims, A, " +")
+	png_sx = A[1]
+	png_sy = A[2]
+	ne = 0
+	te = 0
+}
+
+
+#	Polygon("clearpoly")
+#	(
+#		[5000 2500] [277500 2500] [277500 547500] [5000 547500] 
+#	)
+
+function bump(idx, x, y)
+{
+	if ((E[idx, "minx"] == "") || (x < E[idx, "minx"]))
+		E[idx, "minx"] = x
+	if ((E[idx, "maxx"] == "") || (x > E[idx, "maxx"]))
+		E[idx, "maxx"] = x
+	if ((E[idx, "miny"] == "") || (y < E[idx, "miny"]))
+		E[idx, "miny"] = y
+	if ((E[idx, "maxy"] == "") || (y > E[idx, "maxy"]))
+		E[idx, "maxy"] = y
+}
+
+/^[ \t]*Polygon[(]/ {
+	getline
+	getline
+	gsub("[[\\]]", "", $0)
+	for(n = 1; n < NF; n+=2)
+		bump(ne, $n, $(n+1))
+	ne++
+	next
+}
+
+#	Text[296338 119704 0 670 "PARAMETRIC" "clearline"]
+/^[ \t]*Text[[]/ {
+	sub("^[ \t]*Text[[]", "", $0)
+	T[te, "x"] = $1
+	T[te, "y"] = $2
+	T[te, "text"] = $5
+	gsub("[\"]", "", T[te, "text"])
+	te++
+	next
+}
+
+#Via[260000 120000 7874 4000 0 3150 "" ""]
+/^[ \t]*Via *[[]/ {
+	sub("Via *[[]", "", $0)
+	pcb_sx = $1
+	pcb_sy = $2
+	next
+}
+
+
+END {
+	scale_x = png_sx/pcb_sx
+	scale_y = png_sy/pcb_sy
+
+	print "<html><body>"
+	print "<img src=" q png_url q " usemap=\"#fpmap\">"
+	print "<map name=\"fpmap\">"
+	for(n = 0; n < ne; n++) {
+		x1=(E[n, "minx"] + E[n, "cx"])
+		x2=(E[n, "maxx"] + E[n, "cx"])
+		y1=(E[n, "miny"] + E[n, "cy"])
+		y2=(E[n, "maxy"] + E[n, "cy"])
+		t = ""
+
+
+		for(i = 0; i < te; i++) {
+			x=T[i, "x"]
+			y=T[i, "y"]
+			if ((x>=x1) && (x<=x2) && (y>=y1) && (y<=y2)) {
+				t = i
+				break;
+			}
+		}
+#		print n, x1, y1, x2, y2, "|", t, T[t, "x"], T[t, "y"], T[t, "text"] > "/dev/stderr"
+
+		x1 = int(x1 * scale_x)
+		x2 = int(x2 * scale_x)
+		y1 = int(y1 * scale_y)
+		y2 = int(y2 * scale_y)
+		if (x1 < 0)
+			x1 = 0
+		if (y1 < 0)
+			y1 = 0
+		if (x1 > x2) {
+			tmp = x1
+			x1 = x2
+			x2 = tmp
+		}
+		if (y1 > y2) {
+			tmp = y1
+			y1 = y2
+			y2 = tmp
+		}
+		x1 -= 5
+		y1 -= 5
+		x2 += 5
+		y2 += 5
+		if (x1 < 0)
+			x1 = 0
+		if (y1 < 0)
+			y1 = 0
+		url="http://igor2.repo.hu/tmp/pcblib/" tolower(T[t, "text"]) ".html"
+		gsub(" ", "+", url)
+		print "<area shape=\"rect\" coords=" q x1 "," y1 "," x2 "," y2 q " href=" q url q " alt=" q T[t, "text"] q ">"
+		T[t, "text"] = "-"
+	}
+	print "</map>"
+	print "</body></html>"
+}
+
+' < $pcb > map.html
+
+

Property changes on: tags/2.0.1/util/pcblib-map/imgmap_page.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib-map/map.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/map.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/map.pcb	(revision 18980)
@@ -0,0 +1,2737 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 540000 1120030]
+
+Grid[2500.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[540000 1120000 7874 4000 0 3150 "" ""]
+
+Element["" "DSUB connector, female/male" "" "DB15F" 30000 50000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[5600 102600 25000 3000 25600 12500 "C1" "16" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "17" ""]
+	ElementLine [39100 114600 42100 114600 1000]
+	ElementLine [39100 -39000 39100 114600 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 114600 1000]
+	ElementLine [39100 108600 42100 108600 1000]
+	ElementLine [39100 96600 42100 96600 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 91600 39100 91600 2000]
+	ElementLine [28600 -16000 28600 91600 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 91600 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB15M" 120000 50000 -5000 75600 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "16" ""]
+	Pin[-5000 102600 25000 3000 25600 12500 "C2" "17" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 114600 1000]
+	ElementLine [-38500 114600 -41500 114600 1000]
+	ElementLine [-41500 114600 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 108600 -38500 108600 1000]
+	ElementLine [-41500 96600 -38500 96600 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 91600 2000]
+	ElementLine [-28000 91600 -38500 91600 2000]
+	ElementLine [-38500 91600 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB25F" 170000 50000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[0 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[0 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[0 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[0 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[0 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "20" "20" ""]
+	Pin[11200 81000 6000 3000 6600 3500 "21" "21" ""]
+	Pin[11200 91800 6000 3000 6600 3500 "22" "22" ""]
+	Pin[11200 102600 6000 3000 6600 3500 "23" "23" ""]
+	Pin[11200 113400 6000 3000 6600 3500 "24" "24" ""]
+	Pin[11200 124200 6000 3000 6600 3500 "25" "25" ""]
+	Pin[5600 156600 25000 3000 25600 12500 "C1" "26" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "27" ""]
+	ElementLine [39100 168600 42100 168600 1000]
+	ElementLine [39100 -39000 39100 168600 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 168600 1000]
+	ElementLine [39100 162600 42100 162600 1000]
+	ElementLine [39100 150600 42100 150600 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 145600 39100 145600 2000]
+	ElementLine [28600 -16000 28600 145600 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 145600 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [4000 86400 28600 86400 2000]
+	ElementLine [4000 97200 28600 97200 2000]
+	ElementLine [4000 108000 28600 108000 2000]
+	ElementLine [4000 118800 28600 118800 2000]
+	ElementLine [4000 129600 28600 129600 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+	ElementLine [15200 81000 28600 81000 2000]
+	ElementLine [15200 91800 28600 91800 2000]
+	ElementLine [15200 102600 28600 102600 2000]
+	ElementLine [15200 113400 28600 113400 2000]
+	ElementLine [15200 124200 28600 124200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB25M" 260000 50000 -5000 129600 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[600 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[600 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[600 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[600 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[600 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "20" "20" ""]
+	Pin[-10600 81000 6000 3000 6600 3500 "21" "21" ""]
+	Pin[-10600 91800 6000 3000 6600 3500 "22" "22" ""]
+	Pin[-10600 102600 6000 3000 6600 3500 "23" "23" ""]
+	Pin[-10600 113400 6000 3000 6600 3500 "24" "24" ""]
+	Pin[-10600 124200 6000 3000 6600 3500 "25" "25" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "26" ""]
+	Pin[-5000 156600 25000 3000 25600 12500 "C2" "27" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 168600 1000]
+	ElementLine [-38500 168600 -41500 168600 1000]
+	ElementLine [-41500 168600 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 162600 -38500 162600 1000]
+	ElementLine [-41500 150600 -38500 150600 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 145600 2000]
+	ElementLine [-28000 145600 -38500 145600 2000]
+	ElementLine [-38500 145600 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-3400 86400 -28000 86400 2000]
+	ElementLine [-3400 97200 -28000 97200 2000]
+	ElementLine [-3400 108000 -28000 108000 2000]
+	ElementLine [-3400 118800 -28000 118800 2000]
+	ElementLine [-3400 129600 -28000 129600 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+	ElementLine [-14600 81000 -28000 81000 2000]
+	ElementLine [-14600 91800 -28000 91800 2000]
+	ElementLine [-14600 102600 -28000 102600 2000]
+	ElementLine [-14600 113400 -28000 113400 2000]
+	ElementLine [-14600 124200 -28000 124200 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB37F" 30000 260000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[0 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[0 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[0 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[0 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[0 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[0 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[0 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[0 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[0 140400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[0 151200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[0 162000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[0 172800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[0 183600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[0 194400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "20" "20" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "21" "21" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "22" "22" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "23" "23" ""]
+	Pin[11200 48600 6000 3000 6600 3500 "24" "24" ""]
+	Pin[11200 59400 6000 3000 6600 3500 "25" "25" ""]
+	Pin[11200 70200 6000 3000 6600 3500 "26" "26" ""]
+	Pin[11200 81000 6000 3000 6600 3500 "27" "27" ""]
+	Pin[11200 91800 6000 3000 6600 3500 "28" "28" ""]
+	Pin[11200 102600 6000 3000 6600 3500 "29" "29" ""]
+	Pin[11200 113400 6000 3000 6600 3500 "30" "30" ""]
+	Pin[11200 124200 6000 3000 6600 3500 "31" "31" ""]
+	Pin[11200 135000 6000 3000 6600 3500 "32" "32" ""]
+	Pin[11200 145800 6000 3000 6600 3500 "33" "33" ""]
+	Pin[11200 156600 6000 3000 6600 3500 "34" "34" ""]
+	Pin[11200 167400 6000 3000 6600 3500 "35" "35" ""]
+	Pin[11200 178200 6000 3000 6600 3500 "36" "36" ""]
+	Pin[11200 189000 6000 3000 6600 3500 "37" "37" ""]
+	Pin[5600 221400 25000 3000 25600 12500 "C1" "38" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "39" ""]
+	ElementLine [39100 233400 42100 233400 1000]
+	ElementLine [39100 -39000 39100 233400 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 233400 1000]
+	ElementLine [39100 227400 42100 227400 1000]
+	ElementLine [39100 215400 42100 215400 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 210400 39100 210400 2000]
+	ElementLine [28600 -16000 28600 210400 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 210400 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [4000 54000 28600 54000 2000]
+	ElementLine [4000 64800 28600 64800 2000]
+	ElementLine [4000 75600 28600 75600 2000]
+	ElementLine [4000 86400 28600 86400 2000]
+	ElementLine [4000 97200 28600 97200 2000]
+	ElementLine [4000 108000 28600 108000 2000]
+	ElementLine [4000 118800 28600 118800 2000]
+	ElementLine [4000 129600 28600 129600 2000]
+	ElementLine [4000 140400 28600 140400 2000]
+	ElementLine [4000 151200 28600 151200 2000]
+	ElementLine [4000 162000 28600 162000 2000]
+	ElementLine [4000 172800 28600 172800 2000]
+	ElementLine [4000 183600 28600 183600 2000]
+	ElementLine [4000 194400 28600 194400 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+	ElementLine [15200 48600 28600 48600 2000]
+	ElementLine [15200 59400 28600 59400 2000]
+	ElementLine [15200 70200 28600 70200 2000]
+	ElementLine [15200 81000 28600 81000 2000]
+	ElementLine [15200 91800 28600 91800 2000]
+	ElementLine [15200 102600 28600 102600 2000]
+	ElementLine [15200 113400 28600 113400 2000]
+	ElementLine [15200 124200 28600 124200 2000]
+	ElementLine [15200 135000 28600 135000 2000]
+	ElementLine [15200 145800 28600 145800 2000]
+	ElementLine [15200 156600 28600 156600 2000]
+	ElementLine [15200 167400 28600 167400 2000]
+	ElementLine [15200 178200 28600 178200 2000]
+	ElementLine [15200 189000 28600 189000 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB37M" 120000 260000 -5000 194400 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[600 54000 6000 3000 6600 3500 "6" "6" ""]
+	Pin[600 64800 6000 3000 6600 3500 "7" "7" ""]
+	Pin[600 75600 6000 3000 6600 3500 "8" "8" ""]
+	Pin[600 86400 6000 3000 6600 3500 "9" "9" ""]
+	Pin[600 97200 6000 3000 6600 3500 "10" "10" ""]
+	Pin[600 108000 6000 3000 6600 3500 "11" "11" ""]
+	Pin[600 118800 6000 3000 6600 3500 "12" "12" ""]
+	Pin[600 129600 6000 3000 6600 3500 "13" "13" ""]
+	Pin[600 140400 6000 3000 6600 3500 "14" "14" ""]
+	Pin[600 151200 6000 3000 6600 3500 "15" "15" ""]
+	Pin[600 162000 6000 3000 6600 3500 "16" "16" ""]
+	Pin[600 172800 6000 3000 6600 3500 "17" "17" ""]
+	Pin[600 183600 6000 3000 6600 3500 "18" "18" ""]
+	Pin[600 194400 6000 3000 6600 3500 "19" "19" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "20" "20" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "21" "21" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "22" "22" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "23" "23" ""]
+	Pin[-10600 48600 6000 3000 6600 3500 "24" "24" ""]
+	Pin[-10600 59400 6000 3000 6600 3500 "25" "25" ""]
+	Pin[-10600 70200 6000 3000 6600 3500 "26" "26" ""]
+	Pin[-10600 81000 6000 3000 6600 3500 "27" "27" ""]
+	Pin[-10600 91800 6000 3000 6600 3500 "28" "28" ""]
+	Pin[-10600 102600 6000 3000 6600 3500 "29" "29" ""]
+	Pin[-10600 113400 6000 3000 6600 3500 "30" "30" ""]
+	Pin[-10600 124200 6000 3000 6600 3500 "31" "31" ""]
+	Pin[-10600 135000 6000 3000 6600 3500 "32" "32" ""]
+	Pin[-10600 145800 6000 3000 6600 3500 "33" "33" ""]
+	Pin[-10600 156600 6000 3000 6600 3500 "34" "34" ""]
+	Pin[-10600 167400 6000 3000 6600 3500 "35" "35" ""]
+	Pin[-10600 178200 6000 3000 6600 3500 "36" "36" ""]
+	Pin[-10600 189000 6000 3000 6600 3500 "37" "37" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "38" ""]
+	Pin[-5000 221400 25000 3000 25600 12500 "C2" "39" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 233400 1000]
+	ElementLine [-38500 233400 -41500 233400 1000]
+	ElementLine [-41500 233400 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 227400 -38500 227400 1000]
+	ElementLine [-41500 215400 -38500 215400 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 210400 2000]
+	ElementLine [-28000 210400 -38500 210400 2000]
+	ElementLine [-38500 210400 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-3400 54000 -28000 54000 2000]
+	ElementLine [-3400 64800 -28000 64800 2000]
+	ElementLine [-3400 75600 -28000 75600 2000]
+	ElementLine [-3400 86400 -28000 86400 2000]
+	ElementLine [-3400 97200 -28000 97200 2000]
+	ElementLine [-3400 108000 -28000 108000 2000]
+	ElementLine [-3400 118800 -28000 118800 2000]
+	ElementLine [-3400 129600 -28000 129600 2000]
+	ElementLine [-3400 140400 -28000 140400 2000]
+	ElementLine [-3400 151200 -28000 151200 2000]
+	ElementLine [-3400 162000 -28000 162000 2000]
+	ElementLine [-3400 172800 -28000 172800 2000]
+	ElementLine [-3400 183600 -28000 183600 2000]
+	ElementLine [-3400 194400 -28000 194400 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+	ElementLine [-14600 48600 -28000 48600 2000]
+	ElementLine [-14600 59400 -28000 59400 2000]
+	ElementLine [-14600 70200 -28000 70200 2000]
+	ElementLine [-14600 81000 -28000 81000 2000]
+	ElementLine [-14600 91800 -28000 91800 2000]
+	ElementLine [-14600 102600 -28000 102600 2000]
+	ElementLine [-14600 113400 -28000 113400 2000]
+	ElementLine [-14600 124200 -28000 124200 2000]
+	ElementLine [-14600 135000 -28000 135000 2000]
+	ElementLine [-14600 145800 -28000 145800 2000]
+	ElementLine [-14600 156600 -28000 156600 2000]
+	ElementLine [-14600 167400 -28000 167400 2000]
+	ElementLine [-14600 178200 -28000 178200 2000]
+	ElementLine [-14600 189000 -28000 189000 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB9F" 170000 290000 5600 0 3 150 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[0 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[0 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[0 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[11200 5400 6000 3000 6600 3500 "6" "6" ""]
+	Pin[11200 16200 6000 3000 6600 3500 "7" "7" ""]
+	Pin[11200 27000 6000 3000 6600 3500 "8" "8" ""]
+	Pin[11200 37800 6000 3000 6600 3500 "9" "9" ""]
+	Pin[5600 70200 25000 3000 25600 12500 "C1" "10" ""]
+	Pin[5600 -27000 25000 3000 25600 12500 "C2" "11" ""]
+	ElementLine [39100 82200 42100 82200 1000]
+	ElementLine [39100 -39000 39100 82200 1000]
+	ElementLine [39100 -39000 42100 -39000 1000]
+	ElementLine [42100 -39000 42100 82200 1000]
+	ElementLine [39100 76200 42100 76200 1000]
+	ElementLine [39100 64200 42100 64200 1000]
+	ElementLine [39100 -33000 42100 -33000 1000]
+	ElementLine [39100 -21000 42100 -21000 1000]
+	ElementLine [28600 59200 39100 59200 2000]
+	ElementLine [28600 -16000 28600 59200 2000]
+	ElementLine [28600 -16000 39100 -16000 2000]
+	ElementLine [39100 -16000 39100 59200 1000]
+	ElementLine [4000 0 28600 0 2000]
+	ElementLine [4000 10800 28600 10800 2000]
+	ElementLine [4000 21600 28600 21600 2000]
+	ElementLine [4000 32400 28600 32400 2000]
+	ElementLine [4000 43200 28600 43200 2000]
+	ElementLine [15200 5400 28600 5400 2000]
+	ElementLine [15200 16200 28600 16200 2000]
+	ElementLine [15200 27000 28600 27000 2000]
+	ElementLine [15200 37800 28600 37800 2000]
+
+	)
+
+Element["" "DSUB connector, female/male" "" "DB9M" 260000 290000 -5000 43200 1 150 ""]
+(
+	Pin[600 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[600 10800 6000 3000 6600 3500 "2" "2" ""]
+	Pin[600 21600 6000 3000 6600 3500 "3" "3" ""]
+	Pin[600 32400 6000 3000 6600 3500 "4" "4" ""]
+	Pin[600 43200 6000 3000 6600 3500 "5" "5" ""]
+	Pin[-10600 5400 6000 3000 6600 3500 "6" "6" ""]
+	Pin[-10600 16200 6000 3000 6600 3500 "7" "7" ""]
+	Pin[-10600 27000 6000 3000 6600 3500 "8" "8" ""]
+	Pin[-10600 37800 6000 3000 6600 3500 "9" "9" ""]
+	Pin[-5000 -27000 25000 3000 25600 12500 "C1" "10" ""]
+	Pin[-5000 70200 25000 3000 25600 12500 "C2" "11" ""]
+	ElementLine [-41500 -39000 -38500 -39000 1000]
+	ElementLine [-38500 -39000 -38500 82200 1000]
+	ElementLine [-38500 82200 -41500 82200 1000]
+	ElementLine [-41500 82200 -41500 -39000 1000]
+	ElementLine [-41500 -33000 -38500 -33000 1000]
+	ElementLine [-41500 -21000 -38500 -21000 1000]
+	ElementLine [-41500 76200 -38500 76200 1000]
+	ElementLine [-41500 64200 -38500 64200 1000]
+	ElementLine [-38500 -16000 -28000 -16000 2000]
+	ElementLine [-28000 -16000 -28000 59200 2000]
+	ElementLine [-28000 59200 -38500 59200 2000]
+	ElementLine [-38500 59200 -38500 -16000 1000]
+	ElementLine [-3400 0 -28000 0 2000]
+	ElementLine [-3400 10800 -28000 10800 2000]
+	ElementLine [-3400 21600 -28000 21600 2000]
+	ElementLine [-3400 32400 -28000 32400 2000]
+	ElementLine [-3400 43200 -28000 43200 2000]
+	ElementLine [-14600 5400 -28000 5400 2000]
+	ElementLine [-14600 16200 -28000 16200 2000]
+	ElementLine [-14600 27000 -28000 27000 2000]
+	ElementLine [-14600 37800 -28000 37800 2000]
+
+	)
+
+Element["" "right angle BNC" "" "BNC_LAY" 152500 442500 20000 0 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3500 "1" "1" "square"]
+	Pin[0 -10000 6000 3000 6600 3500 "2" "2" ""]
+	Pin[20000 -20000 10000 3000 10600 8100 "m1" "3" ""]
+	Pin[20000 20000 10000 3000 10600 8100 "m2" "4" ""]
+	ElementLine [-6000 -29000 49000 -29000 1000]
+	ElementLine [49000 -29000 49000 29000 1000]
+	ElementLine [49000 29000 -6000 29000 1000]
+	ElementLine [-6000 29000 -6000 -29000 1000]
+
+	)
+
+Element["" "rcy(150, bar-sign)" "C1" "acy150" 302500 95000 -2000 -4500 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -15000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -28500 0 -24500 1000]
+	ElementLine [0 9500 0 13500 1000]
+	ElementLine [-2000 11500 2000 11500 1000]
+	ElementLine [7874 -17883 7874 -11250 3937]
+	ElementLine [-7874 -17883 -7874 -11250 3937]
+	ElementLine [9842 -16040 9842 -11250 3937]
+	ElementLine [-9842 -16040 -9842 -11250 3937]
+	ElementLine [11811 -13006 11811 -11250 3937]
+	ElementLine [-11811 -13006 -11811 -11250 3937]
+	ElementArc [0 -7500 15000 15000 90 360 1000]
+
+	)
+
+Element["" "so(8)" "" "8*250" 337500 82500 -10000 0 1 100 ""]
+(
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "" "1" "square,edge2"]
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "" "8" "square"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "" "2" "square,edge2"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "" "7" "square"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "" "3" "square,edge2"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "" "6" "square"]
+	Pad[7500 7000 7500 13500 2000 1000 3000 "" "4" "square,edge2"]
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "" "5" "square"]
+	ElementLine [-10000 16000 10000 16000 1000]
+	ElementLine [10000 -16000 10000 16000 1000]
+	ElementLine [-10000 -16000 10000 -16000 1000]
+	ElementLine [-10000 2500 -10000 16000 1000]
+	ElementLine [-10000 -16000 -10000 -2500 1000]
+	ElementArc [-10000 0 2500 2500 90 180 1000]
+
+	)
+
+Element["" "dip(4)" "" "4*300" 365000 102500 -10000 0 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 0 8000 5000 8600 3937 "" "2" ""]
+	Pin[10000 -30000 8000 5000 8600 3937 "" "3" ""]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 -35000 15000 5000 1000]
+	ElementLine [-5000 -35000 15000 -35000 1000]
+	ElementLine [-5000 -10000 -5000 5000 1000]
+	ElementLine [-5000 -35000 -5000 -20000 1000]
+	ElementArc [-5000 -15000 5000 5000 90 180 1000]
+
+	)
+
+Element["" "tssop(8)" "" "8*6.4mm" 397500 82500 -10000 0 1 100 ""]
+(
+	Pad[-3838 10236 -3838 14173 1771 1000 3000 "" "1" "square,edge2"]
+	Pad[-3838 -14173 -3838 -10236 1771 1000 3000 "" "8" "square"]
+	Pad[-1278 10236 -1278 14173 1771 1000 3000 "" "2" "square,edge2"]
+	Pad[-1278 -14173 -1278 -10236 1771 1000 3000 "" "7" "square"]
+	Pad[1280 10236 1280 14173 1771 1000 3000 "" "3" "square,edge2"]
+	Pad[1280 -14173 1280 -10236 1771 1000 3000 "" "6" "square"]
+	Pad[3839 10236 3839 14173 1771 1000 3000 "" "4" "square,edge2"]
+	Pad[3839 -14173 3839 -10236 1771 1000 3000 "" "5" "square"]
+	ElementLine [-6038 15973 6039 15973 1000]
+	ElementLine [6039 -15973 6039 15973 1000]
+	ElementLine [-6038 -15973 6039 -15973 1000]
+	ElementLine [-6038 2500 -6038 15973 1000]
+	ElementLine [-6038 -15973 -6038 -2500 1000]
+	ElementArc [-6038 0 2500 2500 90 180 1000]
+
+	)
+
+Element["" "connector(2,3)" "" "2*3" 422500 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 0 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 10000 8000 5000 8600 3937 "" "5" ""]
+	Pin[10000 20000 8000 5000 8600 3937 "" "6" ""]
+	ElementLine [-5000 -5000 -5000 25000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 25000 -5000 25000 1000]
+	ElementLine [15000 25000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "connector(2,3,eshift=x)" "" "2*3" 455000 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 5000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 15000 8000 5000 8600 3937 "" "5" ""]
+	Pin[10000 25000 8000 5000 8600 3937 "" "6" ""]
+	ElementLine [-5000 -5000 -5000 30000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 30000 -5000 30000 1000]
+	ElementLine [15000 30000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "connector(2,3,eshift=x,etrunc=1)" "" "2*3" 487500 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 5000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 15000 8000 5000 8600 3937 "" "5" ""]
+	ElementLine [-5000 -5000 -5000 25000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 25000 -5000 25000 1000]
+	ElementLine [15000 25000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "acy(300)" "" "acy300" 300000 50000 -12000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+
+	)
+
+Element["" "acy(300, endcap)" "" "acy300" 320000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [2500 -20625 2500 -9375 1000]
+	ElementLine [2500 -9375 3000 -9166 1000]
+	ElementLine [2500 -20625 3000 -20833 1000]
+	ElementLine [-2500 -20625 -2500 -9375 1000]
+	ElementLine [-2500 -9375 -3000 -9166 1000]
+	ElementLine [-2500 -20625 -3000 -20833 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-3000 -9166 -3000 -8000 1000]
+	ElementLine [3000 -9166 3000 -8000 1000]
+	ElementLine [-3000 -22000 -3000 -20833 1000]
+	ElementLine [3000 -22000 3000 -20833 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementArc [-2500 -8000 500 500 0 90 1000]
+	ElementArc [2500 -8000 500 500 90 90 1000]
+	ElementArc [-2500 -22000 500 500 270 90 1000]
+	ElementArc [2500 -22000 500 500 180 90 1000]
+
+	)
+
+Element["" "acy(300, coil, dot)" "" "acy300" 340000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementArc [0 -9375 1875 1875 270 180 1000]
+	ElementArc [0 -13125 1875 1875 270 180 1000]
+	ElementArc [0 -16875 1875 1875 270 180 1000]
+	ElementArc [0 -20625 1875 1875 270 180 1000]
+	ElementArc [-1250 -5500 666 666 90 360 1000]
+
+	)
+
+Element["" "acy(300, pol=bar)" "" "acy300" 360000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-2500 -6500 2500 -6500 1000]
+	ElementLine [-2500 -8500 -2500 -6500 1000]
+	ElementLine [2500 -8500 2500 -6500 1000]
+	ElementLine [-2500 -8500 2500 -8500 1000]
+
+	)
+
+Element["" "acy(300, wiper=aarrow)" "" "acy300" 380000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 9000 5000 9600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [5000 -12500 -8000 -17500 1000]
+	ElementLine [-8000 -17500 -6492 -15848 1000]
+	ElementLine [-8000 -17500 -5774 -17715 1000]
+	ElementLine [-5774 -17715 -6492 -15848 1000]
+
+	)
+
+Element["" "acy(300, wiper=parrow)" "" "acy300" 400000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-8000 -15000 -2500 -15000 1000]
+	ElementLine [-2500 -15000 -4500 -16000 1000]
+	ElementLine [-2500 -15000 -4500 -14000 1000]
+	ElementLine [-4500 -16000 -4500 -14000 1000]
+
+	)
+
+Element["" "acy(300, wiper=looparrow)" "" "acy300" 420000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-8000 -15000 -2500 -15000 1000]
+	ElementLine [-2500 -15000 -4500 -16000 1000]
+	ElementLine [-2500 -15000 -4500 -14000 1000]
+	ElementLine [-4500 -16000 -4500 -14000 1000]
+	ElementLine [-8000 -24375 -8000 -15000 1000]
+	ElementLine [-8000 -24375 0 -24375 1000]
+
+	)
+
+Element["" "acy(300, zigzag)" "" "acy300" 440000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [0 -7500 -2500 -8750 1000]
+	ElementLine [-2500 -8750 2500 -11250 1000]
+	ElementLine [2500 -11250 0 -12500 1000]
+	ElementLine [0 -12500 -2500 -13750 1000]
+	ElementLine [-2500 -13750 2500 -16250 1000]
+	ElementLine [2500 -16250 0 -17500 1000]
+	ElementLine [0 -17500 -2500 -18750 1000]
+	ElementLine [-2500 -18750 2500 -21250 1000]
+	ElementLine [2500 -21250 0 -22500 1000]
+
+	)
+
+Element["" "acy(300, core)" "" "acy300" 460000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-4875 -22500 -4875 -7500 1000]
+	ElementArc [0 -9375 1875 1875 270 180 1000]
+	ElementArc [0 -13125 1875 1875 270 180 1000]
+	ElementArc [0 -16875 1875 1875 270 180 1000]
+	ElementArc [0 -20625 1875 1875 270 180 1000]
+
+	)
+
+Element["" "acy(200, standing, pol=sign, dia=100)" "" "acy200" 520000 90000 -2000 -6000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -20000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -5000 0 0 1000]
+	ElementLine [0 -20000 0 -15000 1000]
+	ElementLine [0 -20000 0 0 1000]
+	ElementLine [2200 -6100 2200 -4100 1000]
+	ElementLine [2200 -15900 2200 -13900 1000]
+	ElementLine [1200 -14900 3200 -14900 1000]
+	ElementArc [0 0 10000 10000 90 360 1000]
+
+	)
+
+Element["" "alf(300,schottky)" "" "acy300" 480000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-3500 -10000 3500 -10000 1000]
+	ElementArc [-3500 -11500 1500 1500 270 180 1000]
+	ElementArc [3500 -8500 1500 1500 90 180 1000]
+
+	)
+
+Element["" "alf(300,tunnel)" "" "acy300" 500000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-5000 -10000 5000 -10000 1000]
+	ElementLine [5000 -11500 5000 -10000 1000]
+	ElementLine [-5000 -11500 -5000 -10000 1000]
+
+	)
+
+Element["" "alf(300,zener)" "" "acy300" 520000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-5000 -10000 5000 -10000 1000]
+	ElementLine [5000 -10000 5000 -8500 1000]
+	ElementLine [-5000 -11500 -5000 -10000 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SC70_3" 315000 420000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "1" "1" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "3" "3" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SC90" 330000 420000 7600 -7800 3 100 ""]
+(
+	Pad[0 -200 0 200 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[3900 -200 3900 200 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[1900 -6100 1900 -5700 2400 3000 3000 "3" "3" "square"]
+	ElementLine [-1700 -7800 -1700 2000 1000]
+	ElementLine [-1700 2000 5600 2000 1000]
+	ElementLine [5600 2000 5600 -7800 1000]
+	ElementLine [5600 -7800 -1700 -7800 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SOT23" 311100 453200 12300 -11000 3 100 ""]
+(
+	Pad[0 -300 0 300 3400 3000 4000 "1" "1" "square,edge2"]
+	Pad[7800 -300 7800 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[3900 -8500 3900 -7900 3400 3000 4000 "3" "3" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 10300 2900 1000]
+	ElementLine [10300 2900 10300 -11000 1000]
+	ElementLine [10300 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOT23D" 311100 473200 12300 -11000 3 100 ""]
+(
+	Pad[0 -300 0 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[7800 -300 7800 300 3400 3000 4000 "3" "3" "square,edge2"]
+	Pad[3900 -8500 3900 -7900 3400 3000 4000 "1" "1" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 10300 2900 1000]
+	ElementLine [10300 2900 10300 -11000 1000]
+	ElementLine [10300 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SOT323" 332400 452000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "1" "1" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "3" "3" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOT323D" 332400 472000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "3" "3" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "1" "1" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SC70_4" 415000 435000 9300 -9400 3 100 ""]
+(
+	Pad[300 0 600 0 2900 3000 3500 "1" "1" "square"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[5100 -7300 5100 -6700 2900 3000 3500 "3" "3" "square"]
+	Pad[0 -7300 0 -6700 2900 3000 3500 "4" "4" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "Pressure transducer" "" "MPAK" 485000 480000 20300 -49700 3 100 ""]
+(
+	Pad[0 -2800 0 2800 3100 3000 3700 "1" "1" "square,edge2"]
+	Pad[5000 -2800 5000 2800 3100 3000 3700 "2" "2" "square,edge2"]
+	Pad[10000 -2800 10000 2800 3100 3000 3700 "3" "3" "square,edge2"]
+	Pad[15000 -2800 15000 2800 3100 3000 3700 "4" "4" "square,edge2"]
+	Pad[3800 -43700 11200 -43700 8700 3000 9300 "5" "5" "square"]
+	ElementLine [-3200 -49700 -3200 6100 1000]
+	ElementLine [-3200 6100 18300 6100 1000]
+	ElementLine [18300 6100 18300 -49700 1000]
+	ElementLine [18300 -49700 -3200 -49700 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT143" 430000 435000 11900 -11000 3 100 ""]
+(
+	Pad[300 0 600 0 3400 3000 4000 "1" "1" "square"]
+	Pad[7400 -300 7400 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[7400 -8500 7400 -7900 3400 3000 4000 "3" "3" "square"]
+	Pad[0 -8500 0 -7900 3400 3000 4000 "4" "4" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 9900 2900 1000]
+	ElementLine [9900 2900 9900 -11000 1000]
+	ElementLine [9900 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT223" 450000 480000 25300 -32900 3 100 ""]
+(
+	Pad[0 -3300 0 3300 5600 3000 6200 "1" "1" "square,edge2"]
+	Pad[9000 -3300 9000 3300 5600 3000 6200 "2" "2" "square,edge2"]
+	Pad[18100 -3300 18100 3300 5600 3000 6200 "3" "3" "square,edge2"]
+	Pad[4500 -24400 13500 -24400 12200 3000 12800 "4" "4" "square"]
+	ElementLine [-5200 -32900 -5200 8500 1000]
+	ElementLine [-5200 8500 23300 8500 1000]
+	ElementLine [23300 8500 23300 -32900 1000]
+	ElementLine [23300 -32900 -5200 -32900 1000]
+
+	)
+
+Element["" "SMT transistor, 5 pins" "" "SOT25" 445000 435000 11800 -11000 3 100 ""]
+(
+	Pad[0 -800 0 800 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[7800 -800 7800 800 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[7800 -9000 7800 -7400 2400 3000 3000 "3" "3" "square"]
+	Pad[3900 -9000 3900 -7400 2400 3000 3000 "4" "4" "square"]
+	Pad[0 -9000 0 -7400 2400 3000 3000 "5" "5" "square"]
+	ElementLine [-2000 -11000 -2000 2900 1000]
+	ElementLine [-2000 2900 9800 2900 1000]
+	ElementLine [9800 2900 9800 -11000 1000]
+	ElementLine [9800 -11000 -2000 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 6 pins" "" "SOT26" 461100 435000 11800 -11000 3 100 ""]
+(
+	Pad[0 -800 0 800 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[3900 -800 3900 800 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[7800 -800 7800 800 2400 3000 3000 "3" "3" "square,edge2"]
+	Pad[7800 -9000 7800 -7400 2400 3000 3000 "4" "4" "square"]
+	Pad[3900 -9000 3900 -7400 2400 3000 3000 "5" "5" "square"]
+	Pad[0 -9000 0 -7400 2400 3000 3000 "6" "6" "square"]
+	ElementLine [-2000 -11000 -2000 2900 1000]
+	ElementLine [-2000 2900 9800 2900 1000]
+	ElementLine [9800 2900 9800 -11000 1000]
+	ElementLine [9800 -11000 -2000 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 5 pins" "" "SOT325" 419900 485000 8600 -9400 3 100 ""]
+(
+	Pad[0 -1000 0 1000 1500 3000 2100 "1" "1" "square,edge2"]
+	Pad[5100 -1000 5100 1000 1500 3000 2100 "2" "2" "square,edge2"]
+	Pad[5100 -8000 5100 -6000 1500 3000 2100 "3" "3" "square"]
+	Pad[2600 -8000 2600 -6000 1500 3000 2100 "4" "4" "square"]
+	Pad[0 -8000 0 -6000 1500 3000 2100 "5" "5" "square"]
+	ElementLine [-1400 -9400 -1400 2500 1000]
+	ElementLine [-1400 2500 6600 2500 1000]
+	ElementLine [6600 2500 6600 -9400 1000]
+	ElementLine [6600 -9400 -1400 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 6 pins" "" "SOT326" 432400 485000 8600 -9400 3 100 ""]
+(
+	Pad[0 -1000 0 1000 1500 3000 2100 "1" "1" "square,edge2"]
+	Pad[2600 -1000 2600 1000 1500 3000 2100 "2" "2" "square,edge2"]
+	Pad[5100 -1000 5100 1000 1500 3000 2100 "3" "3" "square,edge2"]
+	Pad[5100 -8000 5100 -6000 1500 3000 2100 "4" "4" "square"]
+	Pad[2600 -8000 2600 -6000 1500 3000 2100 "5" "5" "square"]
+	Pad[0 -8000 0 -6000 1500 3000 2100 "6" "6" "square"]
+	ElementLine [-1400 -9400 -1400 2500 1000]
+	ElementLine [-1400 2500 6600 2500 1000]
+	ElementLine [6600 2500 6600 -9400 1000]
+	ElementLine [6600 -9400 -1400 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT89" 418900 465000 17300 -16400 3 100 ""]
+(
+	Pad[0 -1200 0 1200 3700 3000 4300 "1" "1" "square,edge2"]
+	Pad[6100 -1200 6100 1200 3700 3000 4300 "2" "2" "square,edge2"]
+	Pad[12200 -1200 12200 1200 3700 3000 4300 "3" "3" "square,edge2"]
+	Pad[3100 -12200 9100 -12200 6100 3000 6700 "4" "4" "square"]
+	ElementLine [-3000 -16400 -3000 4300 1000]
+	ElementLine [-3000 4300 15300 4300 1000]
+	ElementLine [15300 4300 15300 -16400 1000]
+	ElementLine [15300 -16400 -3000 -16400 1000]
+
+	)
+
+Element["" "Crystals" "" "HC49U_3" 30000 620000 -15100 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square"]
+	Pin[0 -9600 6000 3000 6600 3200 "2" "2" ""]
+	Pin[0 -19200 6000 3000 6600 3200 "3" "3" ""]
+	ElementLine [-9100 -22300 -9100 3000 2000]
+	ElementLine [9200 -22300 9200 3000 2000]
+	ElementArc [0 -22300 9100 9100 180 180 2000]
+	ElementArc [0 3000 9100 9100 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49U_3H" 110000 620000 -67500 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square,edge2"]
+	Pin[0 -9600 6000 3000 6600 3200 "2" "2" "edge2"]
+	Pin[0 -19200 6000 3000 6600 3200 "3" "3" "edge2"]
+	ElementLine [-61500 -31400 -61500 12100 2000]
+	ElementLine [-61500 -31400 -10000 -31400 2000]
+	ElementLine [-10000 -31400 -10000 12100 2000]
+	ElementLine [-61500 12100 -10000 12100 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126" 140000 790000 -2000 -12000 1 100 ""]
+(
+	Pin[1000 0 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 0 8000 3000 8600 5200 "2" "2" ""]
+	Pin[19000 0 8000 3000 8600 5200 "3" "3" ""]
+	Pin[10000 -43000 13000 3000 13600 11000 "4" "4" ""]
+	ElementLine [0 -10000 0 0 3000]
+	ElementLine [10000 -10000 10000 0 3000]
+	ElementLine [20000 -10000 20000 0 3000]
+	ElementLine [-5000 -10000 25000 -10000 2000]
+	ElementLine [25000 -53000 25000 -10000 2000]
+	ElementLine [-5000 -53000 25000 -53000 2000]
+	ElementLine [-5000 -53000 -5000 -10000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126S" 199000 790000 -2000 -12000 1 100 ""]
+(
+	Pin[1000 0 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[19000 0 8000 3000 8600 5200 "3" "3" ""]
+	Pin[10000 -43000 13000 3000 13600 11000 "4" "4" ""]
+	ElementLine [0 -10000 0 0 3000]
+	ElementLine [10000 -10000 10000 10000 3000]
+	ElementLine [20000 -10000 20000 0 3000]
+	ElementLine [-5000 -10000 25000 -10000 2000]
+	ElementLine [25000 -53000 25000 -10000 2000]
+	ElementLine [-5000 -53000 25000 -53000 2000]
+	ElementLine [-5000 -53000 -5000 -10000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126SW" 40000 680000 7000 -17000 1 100 ""]
+(
+	Pin[0 -1000 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 -10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[0 -19000 8000 3000 8600 5200 "3" "3" ""]
+	ElementLine [5000 -10000 10000 -10000 3000]
+	ElementLine [-5000 -25000 -5000 5000 2000]
+	ElementLine [-5000 -25000 5000 -25000 2000]
+	ElementLine [5000 -25000 5000 5000 2000]
+	ElementLine [-5000 5000 5000 5000 2000]
+	ElementLine [-5000 -5000 5000 -5000 1000]
+	ElementLine [-5000 -15000 5000 -15000 1000]
+
+	)
+
+Element["" "Transistor" "" "TO126W" 70000 680000 7000 4000 1 100 ""]
+(
+	Pin[0 -1000 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[0 -10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[0 -19000 8000 3000 8600 5200 "3" "3" ""]
+	ElementLine [-5000 -25000 -5000 5000 2000]
+	ElementLine [-5000 -25000 5000 -25000 2000]
+	ElementLine [5000 -25000 5000 5000 2000]
+	ElementLine [-5000 5000 5000 5000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO18" 165000 600000 6000 7000 0 100 ""]
+(
+	Pin[0 -5000 5500 3000 6100 3500 "1" "1" ""]
+	Pin[-5000 0 5500 3000 6100 3500 "2" "2" ""]
+	Pin[0 5000 5500 3000 6100 3500 "3" "3" ""]
+	ElementLine [6700 -7900 9400 -10600 1000]
+	ElementLine [7300 -7300 10000 -10000 1000]
+	ElementLine [7900 -6700 10600 -9400 1000]
+	ElementLine [9400 -10600 10600 -9400 1000]
+	ElementArc [0 0 9800 9800 0 360 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO218" 224000 691900 -21000 -58700 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-26000 8800 -6000 8800 2000]
+	ElementLine [-6000 -52700 -6000 8800 2000]
+	ElementLine [-26000 -52700 -6000 -52700 2000]
+	ElementLine [-26000 -52700 -26000 8800 2000]
+	ElementLine [-21000 -52700 -21000 8800 1000]
+	ElementLine [-26000 -14400 -21000 -14400 1000]
+	ElementLine [-26000 -29400 -21000 -29400 1000]
+
+	)
+
+Element["" "Transistor" "" "TO220" 90000 790000 -15000 -23000 1 100 ""]
+(
+	Pin[-10000 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 0 9000 3000 9600 6000 "2" "2" ""]
+	Pin[10000 0 9000 3000 9600 6000 "3" "3" ""]
+	Pin[0 -67000 15000 3000 15600 13000 "4" "4" ""]
+	ElementLine [-10000 -18000 -10000 0 3000]
+	ElementLine [0 -18000 0 0 3000]
+	ElementLine [10000 -18000 10000 0 3000]
+	ElementLine [-20000 -18000 20000 -18000 2000]
+	ElementLine [20000 -55500 20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [-20000 -55500 -20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [20000 -68000 20000 -55500 2000]
+	ElementLine [18500 -68000 20000 -68000 2000]
+	ElementLine [18500 -75000 18500 -68000 2000]
+	ElementLine [18500 -75000 20000 -75000 2000]
+	ElementLine [20000 -79000 20000 -75000 2000]
+	ElementLine [-20000 -79000 20000 -79000 2000]
+	ElementLine [-20000 -79000 -20000 -75000 2000]
+	ElementLine [-20000 -75000 -18500 -75000 2000]
+	ElementLine [-18500 -75000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -20000 -55500 2000]
+
+	)
+
+Element["" "Transistor" "" "TO220S" 30000 790000 -15000 -23000 1 100 ""]
+(
+	Pin[-10000 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[10000 0 9000 3000 9600 6000 "3" "3" ""]
+	Pin[0 -67000 15000 3000 15600 13000 "4" "4" ""]
+	ElementLine [-10000 -18000 -10000 0 3000]
+	ElementLine [0 -18000 0 10000 3000]
+	ElementLine [10000 -18000 10000 0 3000]
+	ElementLine [-20000 -18000 20000 -18000 2000]
+	ElementLine [20000 -55500 20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [-20000 -55500 -20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [20000 -68000 20000 -55500 2000]
+	ElementLine [18500 -68000 20000 -68000 2000]
+	ElementLine [18500 -75000 18500 -68000 2000]
+	ElementLine [18500 -75000 20000 -75000 2000]
+	ElementLine [20000 -79000 20000 -75000 2000]
+	ElementLine [-20000 -79000 20000 -79000 2000]
+	ElementLine [-20000 -79000 -20000 -75000 2000]
+	ElementLine [-20000 -75000 -18500 -75000 2000]
+	ElementLine [-18500 -75000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -20000 -55500 2000]
+
+	)
+
+Element["" "Transistor" "" "TO220SW" 130000 680000 -19000 10000 1 100 ""]
+(
+	Pin[0 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[10000 -10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[0 -20000 9000 3000 9600 6000 "3" "3" ""]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 6000 -30000 2000]
+	ElementLine [6000 -30000 6000 10000 2000]
+	ElementLine [-12000 10000 6000 10000 2000]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 -6000 -30000 2000]
+	ElementLine [-6000 -30000 -6000 10000 2000]
+	ElementLine [-12000 10000 -6000 10000 2000]
+	ElementLine [-12000 -3000 -6000 -3000 1000]
+	ElementLine [-12000 -17000 -6000 -17000 1000]
+	ElementLine [6000 -10000 10000 -10000 3000]
+
+	)
+
+Element["" "Transistor" "" "TO220W" 100000 680000 -19000 10000 1 100 ""]
+(
+	Pin[0 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 -10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[0 -20000 9000 3000 9600 6000 "3" "3" ""]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 6000 -30000 2000]
+	ElementLine [6000 -30000 6000 10000 2000]
+	ElementLine [-12000 10000 6000 10000 2000]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 -6000 -30000 2000]
+	ElementLine [-6000 -30000 -6000 10000 2000]
+	ElementLine [-12000 10000 -6000 10000 2000]
+	ElementLine [-12000 -3000 -6000 -3000 1000]
+	ElementLine [-12000 -17000 -6000 -17000 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO247" 184000 691900 -22000 -59400 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-27000 9600 -6000 9600 2000]
+	ElementLine [-6000 -53400 -6000 9600 2000]
+	ElementLine [-27000 -53400 -6000 -53400 2000]
+	ElementLine [-27000 -53400 -27000 9600 2000]
+	ElementLine [-22000 -53400 -22000 9600 1000]
+	ElementLine [-27000 -14400 -22000 -14400 1000]
+	ElementLine [-27000 -29400 -22000 -29400 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO251" 19000 679000 -9000 -28300 0 100 ""]
+(
+	Pin[-9000 0 7000 3000 7600 4000 "1" "1" "square"]
+	Pin[-9000 -9000 7000 3000 7600 4000 "2" "2" ""]
+	Pin[-9000 -18000 7000 3000 7600 4000 "3" "3" ""]
+	ElementLine [-14000 4200 -4000 4200 2000]
+	ElementLine [-4000 -22300 -4000 4200 2000]
+	ElementLine [-14000 -22300 -4000 -22300 2000]
+	ElementLine [-14000 -22300 -14000 4200 2000]
+	ElementLine [-9000 -22300 -9000 4200 1000]
+	ElementLine [-14000 -1500 -9000 -1500 1000]
+	ElementLine [-14000 -16500 -9000 -16500 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO264" 264000 691900 -22000 -67900 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-27000 18100 -6000 18100 2000]
+	ElementLine [-6000 -61900 -6000 18100 2000]
+	ElementLine [-27000 -61900 -6000 -61900 2000]
+	ElementLine [-27000 -61900 -27000 18100 2000]
+	ElementLine [-22000 -61900 -22000 18100 1000]
+	ElementLine [-27000 -14400 -22000 -14400 1000]
+	ElementLine [-27000 -29400 -22000 -29400 1000]
+
+	)
+
+Element["" "Transistor" "" "TO39" 210000 600000 6000 7000 0 100 ""]
+(
+	Pin[0 -10000 5500 3000 6100 3500 "1" "1" "square"]
+	Pin[-10000 0 5500 3000 6100 3500 "2" "2" ""]
+	Pin[0 10000 5500 3000 6100 3500 "3" "3" ""]
+	ElementLine [12700 -13900 14800 -16000 1000]
+	ElementLine [13300 -13300 15400 -15400 1000]
+	ElementLine [13900 -12700 16000 -14800 1000]
+	ElementLine [16000 -14800 14800 -16000 1000]
+	ElementArc [0 0 18300 18300 0 360 1000]
+
+	)
+
+Element["" "Transistor" "" "TO92" 250000 610000 -13000 -1000 1 100 ""]
+(
+	Pin[0 -20000 7200 3000 7800 4200 "1" "1" "square"]
+	Pin[0 -10000 7200 3000 7800 4200 "2" "2" ""]
+	Pin[0 0 7200 3000 7800 4200 "3" "3" ""]
+	ElementLine [-7000 -17000 -7000 -3000 1000]
+	ElementArc [0 -10000 10000 10000 45 270 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO247_2" 360000 1050000 59400 -22000 3 100 ""]
+(
+	Pin[0 -14000 10000 3000 10600 6000 "1" "1" "square,edge2"]
+	Pin[43800 -14000 10000 3000 10600 6000 "2" "2" "edge2"]
+	ElementLine [-9600 -27000 -9600 -6000 2000]
+	ElementLine [-9600 -6000 53400 -6000 2000]
+	ElementLine [53400 -6000 53400 -27000 2000]
+	ElementLine [53400 -27000 -9600 -27000 2000]
+	ElementLine [-9600 -22000 53400 -22000 1000]
+	ElementLine [14400 -27000 14400 -22000 1000]
+	ElementLine [29400 -27000 29400 -22000 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO220ACSTAND" 300000 1052000 36000 -17000 3 100 ""]
+(
+	Pin[0 -12000 8000 3000 8600 4000 "1" "1" "square,edge2"]
+	Pin[20000 -12000 8000 3000 8600 4000 "2" "2" "edge2"]
+	ElementLine [-10000 -22000 -10000 -4000 2000]
+	ElementLine [-10000 -4000 30000 -4000 2000]
+	ElementLine [30000 -4000 30000 -22000 2000]
+	ElementLine [30000 -22000 -10000 -22000 2000]
+	ElementLine [-10000 -17000 30000 -17000 1000]
+	ElementLine [2500 -22000 2500 -17000 1000]
+	ElementLine [17500 -22000 17500 -17000 1000]
+
+	)
+
+Element["" "LED, size in mm (pin 1 is +, 2 is -)" "" "LED5" 200000 1035000 7000 -10000 1 100 ""]
+(
+	Pin[0 5000 6500 3000 7100 4300 "1" "1" "square"]
+	Pin[0 -5000 6500 3000 7100 4300 "2" "2" ""]
+	ElementArc [0 0 11800 11800 90 360 1000]
+	ElementArc [0 0 13800 13800 90 360 1000]
+
+	)
+
+Element["" "LED, size in mm (pin 1 is +, 2 is -)" "" "LED3" 160000 1035000 7000 -10000 1 100 ""]
+(
+	Pin[0 5000 6500 3000 7100 4300 "1" "1" "square"]
+	Pin[0 -5000 6500 3000 7100 4300 "2" "2" ""]
+	ElementArc [0 0 5900 5900 135 90 1000]
+	ElementArc [0 0 5900 5900 315 90 1000]
+	ElementArc [0 0 7900 7900 135 90 1000]
+	ElementArc [0 0 7900 7900 315 90 1000]
+
+	)
+
+Element["" "Crystals" "" "HC51UH" 420000 980000 -103500 13600 1 100 ""]
+(
+	Pin[0 0 8000 3000 8600 4000 "1" "1" "square,edge2"]
+	Pin[0 -48500 8000 3000 8600 4000 "2" "2" "edge2"]
+	ElementLine [-97500 -62100 -97500 13600 2000]
+	ElementLine [-97500 -62100 -20000 -62100 2000]
+	ElementLine [-20000 -62100 -20000 13600 2000]
+	ElementLine [-97500 13600 -20000 13600 2000]
+
+	)
+
+Element["" "Crystals" "" "HC51U" 220000 978500 -23600 13600 1 100 ""]
+(
+	Pin[0 0 8000 3000 8600 4000 "1" "1" "square"]
+	Pin[0 -48500 8000 3000 8600 4000 "2" "2" ""]
+	ElementLine [-17600 -44500 -17600 -4000 2000]
+	ElementLine [17600 -44500 17600 -4000 2000]
+	ElementArc [0 -44500 17600 17600 180 180 2000]
+	ElementArc [0 -4000 17600 17600 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49UH" 310000 960000 -67500 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square,edge2"]
+	Pin[0 -19200 6000 3000 6600 3200 "2" "2" "edge2"]
+	ElementLine [-61500 -31400 -61500 12100 2000]
+	ElementLine [-61500 -31400 -10000 -31400 2000]
+	ElementLine [-10000 -31400 -10000 12100 2000]
+	ElementLine [-61500 12100 -10000 12100 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49U" 180000 949200 -15100 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square"]
+	Pin[0 -19200 6000 3000 6600 3200 "2" "2" ""]
+	ElementLine [-9100 -22300 -9100 3000 2000]
+	ElementLine [9200 -22300 9200 3000 2000]
+	ElementArc [0 -22300 9100 9100 180 180 2000]
+	ElementArc [0 3000 9100 9100 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49" 150000 950000 -11000 5000 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 -20000 6000 3000 6600 2800 "2" "2" ""]
+	ElementLine [-5000 -20000 -5000 0 2000]
+	ElementLine [5000 -20000 5000 0 2000]
+	ElementArc [0 -20000 5000 5000 180 180 2000]
+	ElementArc [0 0 5000 5000 0 180 2000]
+
+	)
+
+Element["" "" "" "" 245000 467500 0 0 0 100 ""]
+(
+	Pin[0 0 19685 2000 20285 11811 "" "2" ""]
+	Pin[0 -27559 19685 2000 20285 11811 "" "1" ""]
+	Pin[-17717 -13779 19685 2000 20285 11811 "" "3" ""]
+	ElementLine [-17717 -55118 -17717 0 1000]
+	ElementLine [-17717 0 17716 0 1000]
+	ElementLine [17716 0 17716 -55118 1000]
+	ElementLine [17716 -55118 -17717 -55118 1000]
+	ElementLine [-17717 -43307 17716 -43307 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "HEPTAWATT" 441400 635000 -19900 -41500 0 100 ""]
+(
+	Pin[6100 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[-13900 -5000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[6100 -10000 9000 3000 9600 6000 "3" "3" ""]
+	Pin[-13900 -15000 9000 3000 9600 6000 "4" "4" ""]
+	Pin[6100 -20000 9000 3000 9600 6000 "5" "5" ""]
+	Pin[-13900 -25000 9000 3000 9600 6000 "6" "6" ""]
+	Pin[6100 -30000 9000 3000 9600 6000 "7" "7" ""]
+	ElementLine [-24900 5400 -6000 5400 2000]
+	ElementLine [-6000 -35500 -6000 5400 2000]
+	ElementLine [-24900 -35500 -6000 -35500 2000]
+	ElementLine [-24900 -35500 -24900 5400 2000]
+	ElementLine [-19900 -35500 -19900 5400 1000]
+	ElementLine [-24900 -7500 -19900 -7500 1000]
+	ElementLine [-24900 -22500 -19900 -22500 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT11" 317500 628000 79500 -21000 3 100 ""]
+(
+	Pin[0 12000 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[6700 -8000 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[13400 12000 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[20100 -8000 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[26800 12000 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[33500 -8000 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[40200 12000 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[46900 -8000 9000 3000 9600 6000 "8" "8" "edge2"]
+	Pin[53600 12000 9000 3000 9600 6000 "9" "9" "edge2"]
+	Pin[60300 -8000 9000 3000 9600 6000 "10" "10" "edge2"]
+	Pin[67000 12000 9000 3000 9600 6000 "11" "11" "edge2"]
+	ElementLine [-6500 -26000 -6500 -6000 2000]
+	ElementLine [-6500 -6000 73500 -6000 2000]
+	ElementLine [73500 -6000 73500 -26000 2000]
+	ElementLine [73500 -26000 -6500 -26000 2000]
+	ElementLine [-6500 -21000 73500 -21000 1000]
+	ElementLine [26000 -26000 26000 -21000 1000]
+	ElementLine [41000 -26000 41000 -21000 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT15" 317500 688000 81000 -21000 3 100 ""]
+(
+	Pin[0 12000 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[5000 -8000 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[10000 12000 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[15000 -8000 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[20000 12000 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[25000 -8000 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[30000 12000 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[35000 -8000 9000 3000 9600 6000 "8" "8" "edge2"]
+	Pin[40000 12000 9000 3000 9600 6000 "9" "9" "edge2"]
+	Pin[45000 -8000 9000 3000 9600 6000 "10" "10" "edge2"]
+	Pin[50000 12000 9000 3000 9600 6000 "11" "11" "edge2"]
+	Pin[55000 -8000 9000 3000 9600 6000 "12" "12" "edge2"]
+	Pin[60000 12000 9000 3000 9600 6000 "13" "13" "edge2"]
+	Pin[65000 -8000 9000 3000 9600 6000 "14" "14" "edge2"]
+	Pin[70000 12000 9000 3000 9600 6000 "15" "15" "edge2"]
+	ElementLine [-5000 -26000 -5000 -6000 2000]
+	ElementLine [-5000 -6000 75000 -6000 2000]
+	ElementLine [75000 -6000 75000 -26000 2000]
+	ElementLine [75000 -26000 -5000 -26000 2000]
+	ElementLine [-5000 -21000 75000 -21000 1000]
+	ElementLine [27500 -26000 27500 -21000 1000]
+	ElementLine [42500 -26000 42500 -21000 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT8" 317500 754500 81000 -21000 3 100 ""]
+(
+	Pin[0 -14500 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[10000 -14500 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[20000 -14500 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[30000 -14500 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[40000 -14500 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[50000 -14500 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[60000 -14500 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[70000 -14500 9000 3000 9600 6000 "8" "8" "edge2"]
+	ElementLine [-5000 -26000 -5000 -6000 2000]
+	ElementLine [-5000 -6000 75000 -6000 2000]
+	ElementLine [75000 -6000 75000 -26000 2000]
+	ElementLine [75000 -26000 -5000 -26000 2000]
+	ElementLine [-5000 -21000 75000 -21000 1000]
+	ElementLine [27500 -26000 27500 -21000 1000]
+	ElementLine [42500 -26000 42500 -21000 1000]
+
+	)
+
+Element["" "Crystal oscillator" "" "OSC14" 427500 700000 20000 -17000 0 100 ""]
+(
+	Pin[0 0 5000 3000 5600 2800 "NC" "1" "edge2"]
+	Pin[60000 0 5000 3000 5600 2800 "GND" "2" "edge2"]
+	Pin[60000 -30000 5000 3000 5600 2800 "CLK" "3" "edge2"]
+	Pin[0 -30000 5000 3000 5600 2800 "VCC" "4" "edge2"]
+	ElementLine [-9500 -30000 -9500 9500 1000]
+	ElementLine [0 -39500 60000 -39500 1000]
+	ElementLine [69500 -30000 69500 0 1000]
+	ElementLine [-9500 9500 60000 9500 1000]
+	ElementLine [-4000 -30000 -4000 0 1000]
+	ElementLine [0 -34000 60000 -34000 1000]
+	ElementLine [64000 -30000 64000 0 1000]
+	ElementLine [0 4000 60000 4000 1000]
+	ElementArc [0 -30000 9500 9500 270 90 1000]
+	ElementArc [60000 -30000 9500 9500 180 90 1000]
+	ElementArc [60000 0 9500 9500 90 90 1000]
+	ElementArc [0 -30000 4000 4000 270 90 1000]
+	ElementArc [60000 -30000 4000 4000 180 90 1000]
+	ElementArc [60000 0 4000 4000 90 90 1000]
+	ElementArc [0 0 4000 4000 0 90 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "PENTAWATT" 494700 636700 -19900 -39900 0 100 ""]
+(
+	Pin[8500 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[-7200 -6700 9000 3000 9600 6000 "2" "2" ""]
+	Pin[8500 -13400 9000 3000 9600 6000 "3" "3" ""]
+	Pin[-7200 -20100 9000 3000 9600 6000 "4" "4" ""]
+	Pin[8500 -26800 9000 3000 9600 6000 "5" "5" ""]
+	ElementLine [-24900 7000 -6000 7000 2000]
+	ElementLine [-6000 -33900 -6000 7000 2000]
+	ElementLine [-24900 -33900 -6000 -33900 2000]
+	ElementLine [-24900 -33900 -24900 7000 2000]
+	ElementLine [-19900 -33900 -19900 7000 1000]
+	ElementLine [-24900 -5900 -19900 -5900 1000]
+	ElementLine [-24900 -20900 -19900 -20900 1000]
+
+	)
+
+Element["" "" "" "" 457500 740000 -12500 -9000 0 100 ""]
+(
+	Pin[13091 9000 9000 5000 9600 3937 "" "4" "edge2,intconn(2)"]
+	Pin[-12500 9000 9000 5000 9600 3937 "" "3" "edge2,intconn(2)"]
+	Pin[13091 -9000 9000 5000 9600 3937 "" "2" "edge2,intconn(1)"]
+	Pin[-12500 -9000 9000 5000 9600 3937 "" "1" "edge2,intconn(1)"]
+	ElementLine [12181 11736 12181 -11886 787]
+	ElementLine [-11441 11736 12181 11736 787]
+	ElementLine [-11441 -11886 -11441 11736 787]
+	ElementLine [-11441 -11886 12181 -11886 787]
+	ElementArc [7815 -8031 2756 2756 90 90 787]
+	ElementArc [7815 -8031 2756 2756 0 90 787]
+	ElementArc [7815 -8031 2756 2756 270 90 787]
+	ElementArc [7815 -8031 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 0 90 787]
+	ElementArc [7815 7717 2756 2756 270 90 787]
+	ElementArc [7815 7717 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 270 90 787]
+	ElementArc [-7933 7717 2756 2756 180 90 787]
+	ElementArc [-7933 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 180 90 787]
+	ElementArc [-7933 -8031 2756 2756 90 90 787]
+	ElementArc [-7933 -8031 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 270 90 787]
+	ElementArc [-59 -157 6693 6693 270 90 787]
+	ElementArc [-59 -157 6693 6693 180 90 787]
+	ElementArc [-59 -157 6693 6693 90 90 787]
+	ElementArc [-59 -157 6693 6693 0 90 787]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "01005" 330000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-19 807 19 807 984 2000 1584 "1" "1" "square"]
+	Pad[-19 -807 19 -807 984 2000 1584 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0201" 335000 195000 -3150 3150 1 100 ""]
+(
+	Pad[0 1181 0 1181 1574 2000 2174 "1" "1" "square"]
+	Pad[0 -1181 0 -1181 1574 2000 2174 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0402" 340000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+	Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0603" 350000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-492 2559 492 2559 2952 2000 3552 "1" "1" "square"]
+	Pad[-492 -2559 492 -2559 2952 2000 3552 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0805" 360000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-393 3543 393 3543 5118 2000 5718 "1" "1" "square"]
+	Pad[-393 -3543 393 -3543 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2755 -393 -2755 393 800]
+	ElementLine [2755 -393 2755 393 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1008" 375000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-2362 5118 2362 5118 4330 2000 4930 "1" "1" "square"]
+	Pad[-2362 -5118 2362 -5118 4330 2000 4930 "2" "2" "square"]
+	ElementLine [-4527 -1377 -4527 1377 800]
+	ElementLine [4527 -1377 4527 1377 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1206" 390000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1210" 405000 195000 -3150 3150 1 100 ""]
+(
+	Pad[-2755 5905 2755 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-2755 -5905 2755 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-5314 -1968 -5314 1968 800]
+	ElementLine [5314 -1968 5314 1968 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1806" 335000 220000 -3150 3150 1 100 ""]
+(
+	Pad[-3543 7874 3543 7874 6299 2000 6899 "1" "1" "square"]
+	Pad[-3543 -7874 3543 -7874 6299 2000 6899 "2" "2" "square"]
+	ElementLine [-6692 -3149 -6692 3149 800]
+	ElementLine [6692 -3149 6692 3149 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1825" 360000 220000 -3150 3150 1 100 ""]
+(
+	Pad[-10236 7874 10236 7874 6299 2000 6899 "1" "1" "square"]
+	Pad[-10236 -7874 10236 -7874 6299 2000 6899 "2" "2" "square"]
+	ElementLine [-13385 -3149 -13385 3149 800]
+	ElementLine [13385 -3149 13385 3149 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "2706" 395000 220000 -17900 0 1 100 ""]
+(
+	Pad[10800 -300 10800 300 7800 2000 8400 "1" "1" "square"]
+	Pad[-10800 -300 -10800 300 7800 2000 8400 "2" "2" "square"]
+	ElementLine [15900 -5400 15900 5400 1000]
+	ElementLine [-15900 -5400 15900 -5400 1000]
+	ElementLine [-15900 -5400 -15900 5400 1000]
+	ElementLine [-15900 5400 15900 5400 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "DO214" 470000 270000 0 22100 2 100 ""]
+(
+	Pad[-1900 -10600 1900 -10600 14000 2000 14600 "1" "1" "square"]
+	Pad[-1900 10600 1900 10600 14000 2000 14600 "2" "2" "square"]
+	ElementLine [-8900 -21100 8900 -21100 2000]
+	ElementLine [-8900 -21100 -11400 -14100 1000]
+	ElementLine [-11400 -14100 -11400 20100 1000]
+	ElementLine [-11400 20100 11400 20100 1000]
+	ElementLine [11400 -14100 11400 20100 1000]
+	ElementLine [11400 -14100 8900 -21100 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "DO214AB" 470000 320000 0 22700 2 100 ""]
+(
+	Pad[-2000 -10900 2000 -10900 14500 2000 15100 "1" "1" "square"]
+	Pad[-2000 10900 2000 10900 14500 2000 15100 "2" "2" "square"]
+	ElementLine [-9200 -21700 9200 -21700 2000]
+	ElementLine [-9200 -21700 -11800 -14500 1000]
+	ElementLine [-11800 -14500 -11800 20700 1000]
+	ElementLine [-11800 20700 11800 20700 1000]
+	ElementLine [11800 -14500 11800 20700 1000]
+	ElementLine [11800 -14500 9200 -21700 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD106A" 425000 265000 0 16600 2 100 ""]
+(
+	Pad[-1700 -7600 1700 -7600 10200 2000 10800 "1" "1" "square"]
+	Pad[-1700 7600 1700 7600 10200 2000 10800 "2" "2" "square"]
+	ElementLine [-6800 -15600 6800 -15600 2000]
+	ElementLine [-6800 -15600 -8700 -10500 1000]
+	ElementLine [-8700 -10500 -8700 14600 1000]
+	ElementLine [-8700 14600 8700 14600 1000]
+	ElementLine [8700 -10500 8700 14600 1000]
+	ElementLine [8700 -10500 6800 -15600 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD110" 335000 265000 0 8300 2 100 ""]
+(
+	Pad[-1500 -2900 1500 -2900 4600 2000 5200 "1" "1" "square"]
+	Pad[-1500 2900 1500 2900 4600 2000 5200 "2" "2" "square"]
+	ElementLine [-3800 -7300 3800 -7300 2000]
+	ElementLine [-3800 -7300 -4900 -5000 1000]
+	ElementLine [-4900 -5000 -4900 6300 1000]
+	ElementLine [-4900 6300 4900 6300 1000]
+	ElementLine [4900 -5000 4900 6300 1000]
+	ElementLine [4900 -5000 3800 -7300 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD123" 380000 265000 0 12000 2 100 ""]
+(
+	Pad[-600 -5500 600 -5500 6900 2000 7500 "1" "1" "square"]
+	Pad[-600 5500 600 5500 6900 2000 7500 "2" "2" "square"]
+	ElementLine [-4000 -11000 4000 -11000 2000]
+	ElementLine [-4000 -11000 -5100 -7600 1000]
+	ElementLine [-5100 -7600 -5100 10000 1000]
+	ElementLine [-5100 10000 5100 10000 1000]
+	ElementLine [5100 -7600 5100 10000 1000]
+	ElementLine [5100 -7600 4000 -11000 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD323" 350000 265000 0 9300 2 100 ""]
+(
+	Pad[-1000 -3700 1000 -3700 5100 2000 5700 "1" "1" "square"]
+	Pad[-1000 3700 1000 3700 5100 2000 5700 "2" "2" "square"]
+	ElementLine [-3500 -8300 3500 -8300 2000]
+	ElementLine [-3500 -8300 -4500 -5800 1000]
+	ElementLine [-4500 -5800 -4500 7300 1000]
+	ElementLine [-4500 7300 4500 7300 1000]
+	ElementLine [4500 -5800 4500 7300 1000]
+	ElementLine [4500 -5800 3500 -8300 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD80" 365000 265000 0 11600 2 100 ""]
+(
+	Pad[-1600 -5800 1600 -5800 5300 2000 5900 "1" "1" "square"]
+	Pad[-1600 5800 1600 5800 5300 2000 5900 "2" "2" "square"]
+	ElementLine [-4300 -10600 4300 -10600 2000]
+	ElementLine [-4300 -10600 -5500 -8000 1000]
+	ElementLine [-5500 -8000 -5500 9600 1000]
+	ElementLine [-5500 9600 5500 9600 1000]
+	ElementLine [5500 -8000 5500 9600 1000]
+	ElementLine [5500 -8000 4300 -10600 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD87" 400000 265000 0 12400 2 100 ""]
+(
+	Pad[-2600 -5800 2600 -5800 6100 2000 6700 "1" "1" "square"]
+	Pad[-2600 5800 2600 5800 6100 2000 6700 "2" "2" "square"]
+	ElementLine [-5700 -11400 5700 -11400 2000]
+	ElementLine [-5700 -11400 -7300 -8400 1000]
+	ElementLine [-7300 -8400 -7300 10400 1000]
+	ElementLine [-7300 10400 7300 10400 1000]
+	ElementLine [7300 -8400 7300 10400 1000]
+	ElementLine [7300 -8400 5700 -11400 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_A" 430000 325000 0 10600 2 100 ""]
+(
+	Pad[-1800 -5000 1800 -5000 4900 2000 5500 "1" "1" "square"]
+	Pad[-1800 5000 1800 5000 4900 2000 5500 "2" "2" "square"]
+	ElementLine [-4300 -9600 4300 -9600 2000]
+	ElementLine [-4300 -9600 -5500 -7200 1000]
+	ElementLine [-5500 -7200 -5500 8600 1000]
+	ElementLine [-5500 8600 5500 8600 1000]
+	ElementLine [5500 -7200 5500 8600 1000]
+	ElementLine [5500 -7200 4300 -9600 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_B" 405000 325000 0 13200 2 100 ""]
+(
+	Pad[-4100 -5500 4100 -5500 7100 2000 7700 "1" "1" "square"]
+	Pad[-4100 5500 4100 5500 7100 2000 7700 "2" "2" "square"]
+	ElementLine [-7700 -12200 7700 -12200 2000]
+	ElementLine [-7700 -12200 -9900 -8700 1000]
+	ElementLine [-9900 -8700 -9900 11200 1000]
+	ElementLine [-9900 11200 9900 11200 1000]
+	ElementLine [9900 -8700 9900 11200 1000]
+	ElementLine [9900 -8700 7700 -12200 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_C" 375000 320000 0 18800 2 100 ""]
+(
+	Pad[-3900 -9400 3900 -9400 9700 2000 10300 "1" "1" "square"]
+	Pad[-3900 9400 3900 9400 9700 2000 10300 "2" "2" "square"]
+	ElementLine [-8700 -17800 8700 -17800 2000]
+	ElementLine [-8700 -17800 -11200 -13000 1000]
+	ElementLine [-11200 -13000 -11200 16800 1000]
+	ElementLine [-11200 16800 11200 16800 1000]
+	ElementLine [11200 -13000 11200 16800 1000]
+	ElementLine [11200 -13000 8700 -17800 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_D" 343500 316500 0 22900 2 100 ""]
+(
+	Pad[-5600 -11500 5600 -11500 12300 2000 12900 "1" "1" "square"]
+	Pad[-5600 11500 5600 11500 12300 2000 12900 "2" "2" "square"]
+	ElementLine [-11700 -21900 11700 -21900 2000]
+	ElementLine [-11700 -21900 -15000 -15800 1000]
+	ElementLine [-15000 -15800 -15000 20900 1000]
+	ElementLine [-15000 20900 15000 20900 1000]
+	ElementLine [15000 -15800 15000 20900 1000]
+	ElementLine [15000 -15800 11700 -21900 1000]
+
+	)
+
+Element["" "" "" "" 455000 207500 12913 3720 1 70 ""]
+(
+	Pad[-984 -7087 984 -7087 5118 5000 7618 "" "1" "square"]
+	Pad[-984 7087 984 7087 5118 5000 7618 "" "2" "square"]
+	ElementLine [-3150 -3937 -3150 3937 787]
+	ElementLine [3150 -3937 3150 3937 787]
+
+	)
+Layer(1 "component")
+(
+	Line[280000 400000 540000 400000 8000 5000 "clearline"]
+	Line[280000 0 280000 870000 8000 5000 "clearline"]
+	Line[0 550000 540000 550000 8000 5000 "clearline"]
+	Line[390000 550000 390000 400000 8000 5000 "clearline"]
+	Line[280000 160000 540000 160000 8000 5000 "clearline"]
+	Line[540000 0 540000 1120000 8000 5000 "clearline"]
+	Line[0 1120000 0 0 8000 5000 "clearline"]
+	Line[0 0 540000 0 8000 5000 "clearline"]
+	Line[540000 870000 0 870000 8000 5000 "clearline"]
+	Line[540000 1120000 0 1120000 8000 5000 "clearline"]
+	Text[296338 119704 0 670 "PARAMETRIC" "clearline"]
+	Text[108838 502204 0 670 "CONN" "clearline"]
+	Text[366338 349704 0 670 "SMD2" "clearline"]
+	Text[286338 499704 0 670 "SMD3" "clearline"]
+	Text[416338 499704 0 670 "SMDN" "clearline"]
+	Text[86338 819704 0 670 "TRH3" "clearline"]
+	Text[376338 809704 0 670 "TRHN" "clearline"]
+	Text[256338 1069704 0 670 "TRH2" "clearline"]
+)
+Layer(2 "solder")
+(
+	Polygon("clearpoly")
+	(
+		[5000 2500] [277500 2500] [277500 547500] [5000 547500] 
+	)
+	Polygon("clearpoly")
+	(
+		[282500 2500] [537500 2500] [537500 157500] [282500 157500] 
+	)
+	Polygon("clearpoly")
+	(
+		[282500 162500] [537500 162500] [537500 397500] [282500 397500] 
+	)
+	Polygon("clearpoly")
+	(
+		[282500 402500] [387500 402500] [387500 547500] [282500 547500] 
+	)
+	Polygon("clearpoly")
+	(
+		[392500 402500] [537500 402500] [537500 547500] [392500 547500] 
+	)
+	Polygon("clearpoly")
+	(
+		[2500 552500] [277500 552500] [277500 867500] [2500 867500] 
+	)
+	Polygon("clearpoly")
+	(
+		[282500 552500] [537500 552500] [537500 867500] [282500 867500] 
+	)
+	Polygon("clearpoly")
+	(
+		[2500 872500] [540000 872500] [540000 1120000] [2500 1120000] 
+	)
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[305000 430000 360000 430000 1000 4000 "clearline"]
+	Line[0 640000 150000 640000 1000 4000 "clearline"]
+	Line[150000 640000 150000 570000 1000 4000 "clearline"]
+	Line[260000 1010000 260000 1060000 1000 4000 "clearline"]
+	Line[130000 1010000 460000 1010000 1000 4000 "clearline"]
+	Line[325000 240000 495000 240000 1000 4000 "clearline"]
+	Line[325000 285000 455000 285000 1000 4000 "clearline"]
+	Line[420000 185000 420000 240000 1000 4000 "clearline"]
+	Line[455000 240000 455000 345000 1000 4000 "clearline"]
+	Text[340000 410000 0 200 "SC" "clearline"]
+	Text[345000 465000 1 200 "SOT" "clearline"]
+	Text[130000 600000 0 200 "HC" "clearline"]
+	Text[250000 760000 0 200 "TO" "clearline"]
+	Text[430000 1030000 0 200 "TO" "clearline"]
+	Text[230000 1030000 0 200 "LED" "clearline"]
+	Text[440000 950000 0 200 "HC" "clearline"]
+	Text[440000 330000 1 200 "TANT" "clearline"]
+	Text[440000 275000 1 200 "SOD" "clearline"]
+	Text[482500 300000 1 200 "DO" "clearline"]
+	Text[437500 222500 0 200 "minimelf" "clearline"]
+)
Index: tags/2.0.1/util/pcblib-map/parametric.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/parametric.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/parametric.pcb	(revision 18980)
@@ -0,0 +1,1153 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 260000 120000]
+
+Grid[10000.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin,onlynames")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[260000 120000 7874 4000 0 3150 "" ""]
+
+Element["" "rcy(150, bar-sign)" "C1" "acy150" 22500 95000 -2000 -4500 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -15000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -28500 0 -24500 1000]
+	ElementLine [0 9500 0 13500 1000]
+	ElementLine [-2000 11500 2000 11500 1000]
+	ElementLine [7874 -17883 7874 -11250 3937]
+	ElementLine [-7874 -17883 -7874 -11250 3937]
+	ElementLine [9842 -16040 9842 -11250 3937]
+	ElementLine [-9842 -16040 -9842 -11250 3937]
+	ElementLine [11811 -13006 11811 -11250 3937]
+	ElementLine [-11811 -13006 -11811 -11250 3937]
+	ElementArc [0 -7500 15000 15000 90 360 1000]
+
+	)
+
+Element["" "so(8)" "" "8*250" 57500 82500 -10000 0 1 100 ""]
+(
+	Pad[-7500 7000 -7500 13500 2000 1000 3000 "" "1" "square,edge2"]
+	Pad[-7500 -13500 -7500 -7000 2000 1000 3000 "" "8" "square"]
+	Pad[-2500 7000 -2500 13500 2000 1000 3000 "" "2" "square,edge2"]
+	Pad[-2500 -13500 -2500 -7000 2000 1000 3000 "" "7" "square"]
+	Pad[2500 7000 2500 13500 2000 1000 3000 "" "3" "square,edge2"]
+	Pad[2500 -13500 2500 -7000 2000 1000 3000 "" "6" "square"]
+	Pad[7500 7000 7500 13500 2000 1000 3000 "" "4" "square,edge2"]
+	Pad[7500 -13500 7500 -7000 2000 1000 3000 "" "5" "square"]
+	ElementLine [-10000 16000 10000 16000 1000]
+	ElementLine [10000 -16000 10000 16000 1000]
+	ElementLine [-10000 -16000 10000 -16000 1000]
+	ElementLine [-10000 2500 -10000 16000 1000]
+	ElementLine [-10000 -16000 -10000 -2500 1000]
+	ElementArc [-10000 0 2500 2500 90 180 1000]
+
+	)
+
+Element["" "dip(4)" "" "4*300" 85000 102500 -10000 0 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 0 8000 5000 8600 3937 "" "2" ""]
+	Pin[10000 -30000 8000 5000 8600 3937 "" "3" ""]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 -35000 15000 5000 1000]
+	ElementLine [-5000 -35000 15000 -35000 1000]
+	ElementLine [-5000 -10000 -5000 5000 1000]
+	ElementLine [-5000 -35000 -5000 -20000 1000]
+	ElementArc [-5000 -15000 5000 5000 90 180 1000]
+
+	)
+
+Element["" "tssop(8)" "" "8*6.4mm" 117500 82500 -10000 0 1 100 ""]
+(
+	Pad[-3838 10236 -3838 14173 1771 1000 3000 "" "1" "square,edge2"]
+	Pad[-3838 -14173 -3838 -10236 1771 1000 3000 "" "8" "square"]
+	Pad[-1278 10236 -1278 14173 1771 1000 3000 "" "2" "square,edge2"]
+	Pad[-1278 -14173 -1278 -10236 1771 1000 3000 "" "7" "square"]
+	Pad[1280 10236 1280 14173 1771 1000 3000 "" "3" "square,edge2"]
+	Pad[1280 -14173 1280 -10236 1771 1000 3000 "" "6" "square"]
+	Pad[3839 10236 3839 14173 1771 1000 3000 "" "4" "square,edge2"]
+	Pad[3839 -14173 3839 -10236 1771 1000 3000 "" "5" "square"]
+	ElementLine [-6038 15973 6039 15973 1000]
+	ElementLine [6039 -15973 6039 15973 1000]
+	ElementLine [-6038 -15973 6039 -15973 1000]
+	ElementLine [-6038 2500 -6038 15973 1000]
+	ElementLine [-6038 -15973 -6038 -2500 1000]
+	ElementArc [-6038 0 2500 2500 90 180 1000]
+
+	)
+
+Element["" "connector(2,3)" "" "2*3" 142500 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 0 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 10000 8000 5000 8600 3937 "" "5" ""]
+	Pin[10000 20000 8000 5000 8600 3937 "" "6" ""]
+	ElementLine [-5000 -5000 -5000 25000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 25000 -5000 25000 1000]
+	ElementLine [15000 25000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "connector(2,3,eshift=x)" "" "2*3" 175000 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 5000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 15000 8000 5000 8600 3937 "" "5" ""]
+	Pin[10000 25000 8000 5000 8600 3937 "" "6" ""]
+	ElementLine [-5000 -5000 -5000 30000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 30000 -5000 30000 1000]
+	ElementLine [15000 30000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "connector(2,3,eshift=x,etrunc=1)" "" "2*3" 207500 72500 0 -10000 0 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 10000 8000 5000 8600 3937 "" "2" ""]
+	Pin[0 20000 8000 5000 8600 3937 "" "3" ""]
+	Pin[10000 5000 8000 5000 8600 3937 "" "4" ""]
+	Pin[10000 15000 8000 5000 8600 3937 "" "5" ""]
+	ElementLine [-5000 -5000 -5000 25000 1000]
+	ElementLine [-5000 -5000 15000 -5000 1000]
+	ElementLine [15000 25000 -5000 25000 1000]
+	ElementLine [15000 25000 15000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 -5000 5000 5000 1000]
+
+	)
+
+Element["" "acy(300)" "" "acy300" 20000 50000 -12000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+
+	)
+
+Element["" "acy(300, endcap)" "" "acy300" 40000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [2500 -20625 2500 -9375 1000]
+	ElementLine [2500 -9375 3000 -9166 1000]
+	ElementLine [2500 -20625 3000 -20833 1000]
+	ElementLine [-2500 -20625 -2500 -9375 1000]
+	ElementLine [-2500 -9375 -3000 -9166 1000]
+	ElementLine [-2500 -20625 -3000 -20833 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-3000 -9166 -3000 -8000 1000]
+	ElementLine [3000 -9166 3000 -8000 1000]
+	ElementLine [-3000 -22000 -3000 -20833 1000]
+	ElementLine [3000 -22000 3000 -20833 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementArc [-2500 -8000 500 500 0 90 1000]
+	ElementArc [2500 -8000 500 500 90 90 1000]
+	ElementArc [-2500 -22000 500 500 270 90 1000]
+	ElementArc [2500 -22000 500 500 180 90 1000]
+
+	)
+
+Element["" "acy(300, coil, dot)" "" "acy300" 60000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementArc [0 -9375 1875 1875 270 180 1000]
+	ElementArc [0 -13125 1875 1875 270 180 1000]
+	ElementArc [0 -16875 1875 1875 270 180 1000]
+	ElementArc [0 -20625 1875 1875 270 180 1000]
+	ElementArc [-1250 -5500 666 666 90 360 1000]
+
+	)
+
+Element["" "acy(300, pol=bar)" "" "acy300" 80000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-2500 -6500 2500 -6500 1000]
+	ElementLine [-2500 -8500 -2500 -6500 1000]
+	ElementLine [2500 -8500 2500 -6500 1000]
+	ElementLine [-2500 -8500 2500 -8500 1000]
+
+	)
+
+Element["" "acy(300, wiper=aarrow)" "" "acy300" 100000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [5000 -12500 -8000 -17500 1000]
+	ElementLine [-8000 -17500 -6492 -15848 1000]
+	ElementLine [-8000 -17500 -5774 -17715 1000]
+	ElementLine [-5774 -17715 -6492 -15848 1000]
+
+	)
+
+Element["" "acy(300, wiper=parrow)" "" "acy300" 120000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-8000 -15000 -2500 -15000 1000]
+	ElementLine [-2500 -15000 -4500 -16000 1000]
+	ElementLine [-2500 -15000 -4500 -14000 1000]
+	ElementLine [-4500 -16000 -4500 -14000 1000]
+
+	)
+
+Element["" "acy(300, wiper=looparrow)" "" "acy300" 140000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-2500 -7500 2500 -7500 1000]
+	ElementLine [-2500 -22500 -2500 -7500 1000]
+	ElementLine [2500 -22500 2500 -7500 1000]
+	ElementLine [-2500 -22500 2500 -22500 1000]
+	ElementLine [-8000 -15000 -2500 -15000 1000]
+	ElementLine [-2500 -15000 -4500 -16000 1000]
+	ElementLine [-2500 -15000 -4500 -14000 1000]
+	ElementLine [-4500 -16000 -4500 -14000 1000]
+	ElementLine [-8000 -24375 -8000 -15000 1000]
+	ElementLine [-8000 -24375 0 -24375 1000]
+
+	)
+
+Element["" "acy(300, zigzag)" "" "acy300" 160000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [0 -7500 -2500 -8750 1000]
+	ElementLine [-2500 -8750 2500 -11250 1000]
+	ElementLine [2500 -11250 0 -12500 1000]
+	ElementLine [0 -12500 -2500 -13750 1000]
+	ElementLine [-2500 -13750 2500 -16250 1000]
+	ElementLine [2500 -16250 0 -17500 1000]
+	ElementLine [0 -17500 -2500 -18750 1000]
+	ElementLine [-2500 -18750 2500 -21250 1000]
+	ElementLine [2500 -21250 0 -22500 1000]
+
+	)
+
+Element["" "acy(300, core)" "" "acy300" 180000 50000 -2000 -9000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -7500 0 0 1000]
+	ElementLine [0 -30000 0 -22500 1000]
+	ElementLine [-4875 -22500 -4875 -7500 1000]
+	ElementArc [0 -9375 1875 1875 270 180 1000]
+	ElementArc [0 -13125 1875 1875 270 180 1000]
+	ElementArc [0 -16875 1875 1875 270 180 1000]
+	ElementArc [0 -20625 1875 1875 270 180 1000]
+
+	)
+
+Element["" "acy(200, standing, pol=sign, dia=100)" "" "acy200" 240000 90000 -2000 -6000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -20000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -5000 0 0 1000]
+	ElementLine [0 -20000 0 -15000 1000]
+	ElementLine [0 -20000 0 0 1000]
+	ElementLine [2200 -6100 2200 -4100 1000]
+	ElementLine [2200 -15900 2200 -13900 1000]
+	ElementLine [1200 -14900 3200 -14900 1000]
+	ElementArc [0 0 10000 10000 90 360 1000]
+
+	)
+
+Element["" "alf(300,schottky)" "" "acy300" 200000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-3500 -10000 3500 -10000 1000]
+	ElementArc [-3500 -11500 1500 1500 270 180 1000]
+	ElementArc [3500 -8500 1500 1500 90 180 1000]
+
+	)
+
+Element["" "alf(300,tunnel)" "" "acy300" 220000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-5000 -10000 5000 -10000 1000]
+	ElementLine [5000 -11500 5000 -10000 1000]
+	ElementLine [-5000 -11500 -5000 -10000 1000]
+
+	)
+
+Element["" "alf(300,zener)" "" "acy300" 240000 50000 -5000 -22000 1 100 ""]
+(
+	Pin[0 0 8000 5000 8600 3937 "" "1" "square"]
+	Pin[0 -30000 8000 5000 8600 3937 "" "2" ""]
+	ElementLine [0 -10000 0 0 1000]
+	ElementLine [0 -30000 0 -20000 1000]
+	ElementLine [-5000 -20000 5000 -20000 1000]
+	ElementLine [-5000 -20000 0 -10000 1000]
+	ElementLine [5000 -20000 0 -10000 1000]
+	ElementLine [-5000 -10000 5000 -10000 1000]
+	ElementLine [5000 -10000 5000 -8500 1000]
+	ElementLine [-5000 -11500 -5000 -10000 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/util/pcblib-map/smd2.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/smd2.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/smd2.pcb	(revision 18980)
@@ -0,0 +1,1086 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 170000 160000]
+
+Grid[2500.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[170000 160000 7874 4000 0 3150 "" ""]
+
+Element["" "Standard SMT resistor, capacitor etc" "" "01005" 5000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-19 807 19 807 984 2000 1584 "1" "1" "square"]
+	Pad[-19 -807 19 -807 984 2000 1584 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0201" 10000 10000 -3150 3150 1 100 ""]
+(
+	Pad[0 1181 0 1181 1574 2000 2174 "1" "1" "square"]
+	Pad[0 -1181 0 -1181 1574 2000 2174 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0402" 15000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-393 1574 393 1574 1968 2000 2568 "1" "1" "square"]
+	Pad[-393 -1574 393 -1574 1968 2000 2568 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0603" 25000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-492 2559 492 2559 2952 2000 3552 "1" "1" "square"]
+	Pad[-492 -2559 492 -2559 2952 2000 3552 "2" "2" "square"]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "0805" 35000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-393 3543 393 3543 5118 2000 5718 "1" "1" "square"]
+	Pad[-393 -3543 393 -3543 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-2755 -393 -2755 393 800]
+	ElementLine [2755 -393 2755 393 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1008" 50000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-2362 5118 2362 5118 4330 2000 4930 "1" "1" "square"]
+	Pad[-2362 -5118 2362 -5118 4330 2000 4930 "2" "2" "square"]
+	ElementLine [-4527 -1377 -4527 1377 800]
+	ElementLine [4527 -1377 4527 1377 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1206" 65000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-1181 5905 1181 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-1181 -5905 1181 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-3740 -2362 -3740 2362 800]
+	ElementLine [3740 -2362 3740 2362 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1210" 80000 10000 -3150 3150 1 100 ""]
+(
+	Pad[-2755 5905 2755 5905 5118 2000 5718 "1" "1" "square"]
+	Pad[-2755 -5905 2755 -5905 5118 2000 5718 "2" "2" "square"]
+	ElementLine [-5314 -1968 -5314 1968 800]
+	ElementLine [5314 -1968 5314 1968 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1806" 10000 35000 -3150 3150 1 100 ""]
+(
+	Pad[-3543 7874 3543 7874 6299 2000 6899 "1" "1" "square"]
+	Pad[-3543 -7874 3543 -7874 6299 2000 6899 "2" "2" "square"]
+	ElementLine [-6692 -3149 -6692 3149 800]
+	ElementLine [6692 -3149 6692 3149 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "1825" 35000 35000 -3150 3150 1 100 ""]
+(
+	Pad[-10236 7874 10236 7874 6299 2000 6899 "1" "1" "square"]
+	Pad[-10236 -7874 10236 -7874 6299 2000 6899 "2" "2" "square"]
+	ElementLine [-13385 -3149 -13385 3149 800]
+	ElementLine [13385 -3149 13385 3149 800]
+
+	)
+
+Element["" "Standard SMT resistor, capacitor etc" "" "2706" 70000 35000 -17900 0 1 100 ""]
+(
+	Pad[10800 -300 10800 300 7800 2000 8400 "1" "1" "square"]
+	Pad[-10800 -300 -10800 300 7800 2000 8400 "2" "2" "square"]
+	ElementLine [15900 -5400 15900 5400 1000]
+	ElementLine [-15900 -5400 15900 -5400 1000]
+	ElementLine [-15900 -5400 -15900 5400 1000]
+	ElementLine [-15900 5400 15900 5400 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "DO214" 145000 85000 0 22100 2 100 ""]
+(
+	Pad[-1900 -10600 1900 -10600 14000 2000 14600 "1" "1" "square"]
+	Pad[-1900 10600 1900 10600 14000 2000 14600 "2" "2" "square"]
+	ElementLine [-8900 -21100 8900 -21100 2000]
+	ElementLine [-8900 -21100 -11400 -14100 1000]
+	ElementLine [-11400 -14100 -11400 20100 1000]
+	ElementLine [-11400 20100 11400 20100 1000]
+	ElementLine [11400 -14100 11400 20100 1000]
+	ElementLine [11400 -14100 8900 -21100 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "DO214AB" 145000 135000 0 22700 2 100 ""]
+(
+	Pad[-2000 -10900 2000 -10900 14500 2000 15100 "1" "1" "square"]
+	Pad[-2000 10900 2000 10900 14500 2000 15100 "2" "2" "square"]
+	ElementLine [-9200 -21700 9200 -21700 2000]
+	ElementLine [-9200 -21700 -11800 -14500 1000]
+	ElementLine [-11800 -14500 -11800 20700 1000]
+	ElementLine [-11800 20700 11800 20700 1000]
+	ElementLine [11800 -14500 11800 20700 1000]
+	ElementLine [11800 -14500 9200 -21700 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD106A" 100000 80000 0 16600 2 100 ""]
+(
+	Pad[-1700 -7600 1700 -7600 10200 2000 10800 "1" "1" "square"]
+	Pad[-1700 7600 1700 7600 10200 2000 10800 "2" "2" "square"]
+	ElementLine [-6800 -15600 6800 -15600 2000]
+	ElementLine [-6800 -15600 -8700 -10500 1000]
+	ElementLine [-8700 -10500 -8700 14600 1000]
+	ElementLine [-8700 14600 8700 14600 1000]
+	ElementLine [8700 -10500 8700 14600 1000]
+	ElementLine [8700 -10500 6800 -15600 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD110" 10000 80000 0 8300 2 100 ""]
+(
+	Pad[-1500 -2900 1500 -2900 4600 2000 5200 "1" "1" "square"]
+	Pad[-1500 2900 1500 2900 4600 2000 5200 "2" "2" "square"]
+	ElementLine [-3800 -7300 3800 -7300 2000]
+	ElementLine [-3800 -7300 -4900 -5000 1000]
+	ElementLine [-4900 -5000 -4900 6300 1000]
+	ElementLine [-4900 6300 4900 6300 1000]
+	ElementLine [4900 -5000 4900 6300 1000]
+	ElementLine [4900 -5000 3800 -7300 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD123" 55000 80000 0 12000 2 100 ""]
+(
+	Pad[-600 -5500 600 -5500 6900 2000 7500 "1" "1" "square"]
+	Pad[-600 5500 600 5500 6900 2000 7500 "2" "2" "square"]
+	ElementLine [-4000 -11000 4000 -11000 2000]
+	ElementLine [-4000 -11000 -5100 -7600 1000]
+	ElementLine [-5100 -7600 -5100 10000 1000]
+	ElementLine [-5100 10000 5100 10000 1000]
+	ElementLine [5100 -7600 5100 10000 1000]
+	ElementLine [5100 -7600 4000 -11000 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD323" 25000 80000 0 9300 2 100 ""]
+(
+	Pad[-1000 -3700 1000 -3700 5100 2000 5700 "1" "1" "square"]
+	Pad[-1000 3700 1000 3700 5100 2000 5700 "2" "2" "square"]
+	ElementLine [-3500 -8300 3500 -8300 2000]
+	ElementLine [-3500 -8300 -4500 -5800 1000]
+	ElementLine [-4500 -5800 -4500 7300 1000]
+	ElementLine [-4500 7300 4500 7300 1000]
+	ElementLine [4500 -5800 4500 7300 1000]
+	ElementLine [4500 -5800 3500 -8300 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD80" 40000 80000 0 11600 2 100 ""]
+(
+	Pad[-1600 -5800 1600 -5800 5300 2000 5900 "1" "1" "square"]
+	Pad[-1600 5800 1600 5800 5300 2000 5900 "2" "2" "square"]
+	ElementLine [-4300 -10600 4300 -10600 2000]
+	ElementLine [-4300 -10600 -5500 -8000 1000]
+	ElementLine [-5500 -8000 -5500 9600 1000]
+	ElementLine [-5500 9600 5500 9600 1000]
+	ElementLine [5500 -8000 5500 9600 1000]
+	ElementLine [5500 -8000 4300 -10600 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOD87" 75000 80000 0 12400 2 100 ""]
+(
+	Pad[-2600 -5800 2600 -5800 6100 2000 6700 "1" "1" "square"]
+	Pad[-2600 5800 2600 5800 6100 2000 6700 "2" "2" "square"]
+	ElementLine [-5700 -11400 5700 -11400 2000]
+	ElementLine [-5700 -11400 -7300 -8400 1000]
+	ElementLine [-7300 -8400 -7300 10400 1000]
+	ElementLine [-7300 10400 7300 10400 1000]
+	ElementLine [7300 -8400 7300 10400 1000]
+	ElementLine [7300 -8400 5700 -11400 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_A" 105000 140000 0 10600 2 100 ""]
+(
+	Pad[-1800 -5000 1800 -5000 4900 2000 5500 "1" "1" "square"]
+	Pad[-1800 5000 1800 5000 4900 2000 5500 "2" "2" "square"]
+	ElementLine [-4300 -9600 4300 -9600 2000]
+	ElementLine [-4300 -9600 -5500 -7200 1000]
+	ElementLine [-5500 -7200 -5500 8600 1000]
+	ElementLine [-5500 8600 5500 8600 1000]
+	ElementLine [5500 -7200 5500 8600 1000]
+	ElementLine [5500 -7200 4300 -9600 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_B" 80000 140000 0 13200 2 100 ""]
+(
+	Pad[-4100 -5500 4100 -5500 7100 2000 7700 "1" "1" "square"]
+	Pad[-4100 5500 4100 5500 7100 2000 7700 "2" "2" "square"]
+	ElementLine [-7700 -12200 7700 -12200 2000]
+	ElementLine [-7700 -12200 -9900 -8700 1000]
+	ElementLine [-9900 -8700 -9900 11200 1000]
+	ElementLine [-9900 11200 9900 11200 1000]
+	ElementLine [9900 -8700 9900 11200 1000]
+	ElementLine [9900 -8700 7700 -12200 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_C" 50000 135000 0 18800 2 100 ""]
+(
+	Pad[-3900 -9400 3900 -9400 9700 2000 10300 "1" "1" "square"]
+	Pad[-3900 9400 3900 9400 9700 2000 10300 "2" "2" "square"]
+	ElementLine [-8700 -17800 8700 -17800 2000]
+	ElementLine [-8700 -17800 -11200 -13000 1000]
+	ElementLine [-11200 -13000 -11200 16800 1000]
+	ElementLine [-11200 16800 11200 16800 1000]
+	ElementLine [11200 -13000 11200 16800 1000]
+	ElementLine [11200 -13000 8700 -17800 1000]
+
+	)
+
+Element["" "Tantalum SMT capacitor (pin 1 is +)" "" "TANT_D" 18500 131500 0 22900 2 100 ""]
+(
+	Pad[-5600 -11500 5600 -11500 12300 2000 12900 "1" "1" "square"]
+	Pad[-5600 11500 5600 11500 12300 2000 12900 "2" "2" "square"]
+	ElementLine [-11700 -21900 11700 -21900 2000]
+	ElementLine [-11700 -21900 -15000 -15800 1000]
+	ElementLine [-15000 -15800 -15000 20900 1000]
+	ElementLine [-15000 20900 15000 20900 1000]
+	ElementLine [15000 -15800 15000 20900 1000]
+	ElementLine [15000 -15800 11700 -21900 1000]
+
+	)
+
+Element["" "" "" "" 130000 22500 12913 3720 1 70 ""]
+(
+	Pad[-984 -7087 984 -7087 5118 5000 7618 "" "1" "square"]
+	Pad[-984 7087 984 7087 5118 5000 7618 "" "2" "square"]
+	ElementLine [-3150 -3937 -3150 3937 787]
+	ElementLine [3150 -3937 3150 3937 787]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[0 55000 170000 55000 1000 4000 "clearline"]
+	Line[0 100000 130000 100000 1000 4000 "clearline"]
+	Line[95000 0 95000 55000 1000 4000 "clearline"]
+	Line[130000 55000 130000 160000 1000 4000 "clearline"]
+	Text[115000 145000 1 200 "TANT" "clearline"]
+	Text[115000 90000 1 200 "SOD" "clearline"]
+	Text[157500 115000 1 200 "DO" "clearline"]
+	Text[112500 37500 0 200 "minimelf" "clearline"]
+)
Index: tags/2.0.1/util/pcblib-map/smd3.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/smd3.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/smd3.pcb	(revision 18980)
@@ -0,0 +1,895 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 55000 75000]
+
+Grid[5000.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[55000 75000 7874 4000 0 3150 "" ""]
+
+Element["" "SMT transistor, 3 pins" "" "SC70_3" 10000 15000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "1" "1" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "3" "3" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SC90" 25000 15000 7600 -7800 3 100 ""]
+(
+	Pad[0 -200 0 200 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[3900 -200 3900 200 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[1900 -6100 1900 -5700 2400 3000 3000 "3" "3" "square"]
+	ElementLine [-1700 -7800 -1700 2000 1000]
+	ElementLine [-1700 2000 5600 2000 1000]
+	ElementLine [5600 2000 5600 -7800 1000]
+	ElementLine [5600 -7800 -1700 -7800 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SOT23" 6100 48200 12300 -11000 3 100 ""]
+(
+	Pad[0 -300 0 300 3400 3000 4000 "1" "1" "square,edge2"]
+	Pad[7800 -300 7800 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[3900 -8500 3900 -7900 3400 3000 4000 "3" "3" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 10300 2900 1000]
+	ElementLine [10300 2900 10300 -11000 1000]
+	ElementLine [10300 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOT23D" 6100 68200 12300 -11000 3 100 ""]
+(
+	Pad[0 -300 0 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[7800 -300 7800 300 3400 3000 4000 "3" "3" "square,edge2"]
+	Pad[3900 -8500 3900 -7900 3400 3000 4000 "1" "1" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 10300 2900 1000]
+	ElementLine [10300 2900 10300 -11000 1000]
+	ElementLine [10300 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 3 pins" "" "SOT323" 27400 47000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "1" "1" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "3" "3" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "SMT diode (pin 1 is cathode)" "" "SOT323D" 27400 67000 9300 -9400 3 100 ""]
+(
+	Pad[0 -300 0 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "3" "3" "square,edge2"]
+	Pad[2600 -7300 2600 -6700 2900 3000 3500 "1" "1" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[0 25000 55000 25000 1000 4000 "clearline"]
+	Text[35000 5000 0 200 "SC" "clearline"]
+	Text[40000 60000 1 200 "SOT" "clearline"]
+)
Index: tags/2.0.1/util/pcblib-map/smdN.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/smdN.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/smdN.pcb	(revision 18980)
@@ -0,0 +1,944 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 100000 75000]
+
+Grid[5000.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[100000 75000 7874 4000 0 3150 "" ""]
+
+Element["" "SMT transistor, 4 pins" "" "SC70_4" 5000 15000 9300 -9400 3 100 ""]
+(
+	Pad[300 0 600 0 2900 3000 3500 "1" "1" "square"]
+	Pad[5100 -300 5100 300 2900 3000 3500 "2" "2" "square,edge2"]
+	Pad[5100 -7300 5100 -6700 2900 3000 3500 "3" "3" "square"]
+	Pad[0 -7300 0 -6700 2900 3000 3500 "4" "4" "square"]
+	ElementLine [-2100 -9400 -2100 2500 1000]
+	ElementLine [-2100 2500 7300 2500 1000]
+	ElementLine [7300 2500 7300 -9400 1000]
+	ElementLine [7300 -9400 -2100 -9400 1000]
+
+	)
+
+Element["" "Pressure transducer" "" "MPAK" 75000 60000 20300 -49700 3 100 ""]
+(
+	Pad[0 -2800 0 2800 3100 3000 3700 "1" "1" "square,edge2"]
+	Pad[5000 -2800 5000 2800 3100 3000 3700 "2" "2" "square,edge2"]
+	Pad[10000 -2800 10000 2800 3100 3000 3700 "3" "3" "square,edge2"]
+	Pad[15000 -2800 15000 2800 3100 3000 3700 "4" "4" "square,edge2"]
+	Pad[3800 -43700 11200 -43700 8700 3000 9300 "5" "5" "square"]
+	ElementLine [-3200 -49700 -3200 6100 1000]
+	ElementLine [-3200 6100 18300 6100 1000]
+	ElementLine [18300 6100 18300 -49700 1000]
+	ElementLine [18300 -49700 -3200 -49700 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT143" 20000 15000 11900 -11000 3 100 ""]
+(
+	Pad[300 0 600 0 3400 3000 4000 "1" "1" "square"]
+	Pad[7400 -300 7400 300 3400 3000 4000 "2" "2" "square,edge2"]
+	Pad[7400 -8500 7400 -7900 3400 3000 4000 "3" "3" "square"]
+	Pad[0 -8500 0 -7900 3400 3000 4000 "4" "4" "square"]
+	ElementLine [-2500 -11000 -2500 2900 1000]
+	ElementLine [-2500 2900 9900 2900 1000]
+	ElementLine [9900 2900 9900 -11000 1000]
+	ElementLine [9900 -11000 -2500 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT223" 40000 60000 25300 -32900 3 100 ""]
+(
+	Pad[0 -3300 0 3300 5600 3000 6200 "1" "1" "square,edge2"]
+	Pad[9000 -3300 9000 3300 5600 3000 6200 "2" "2" "square,edge2"]
+	Pad[18100 -3300 18100 3300 5600 3000 6200 "3" "3" "square,edge2"]
+	Pad[4500 -24400 13500 -24400 12200 3000 12800 "4" "4" "square"]
+	ElementLine [-5200 -32900 -5200 8500 1000]
+	ElementLine [-5200 8500 23300 8500 1000]
+	ElementLine [23300 8500 23300 -32900 1000]
+	ElementLine [23300 -32900 -5200 -32900 1000]
+
+	)
+
+Element["" "SMT transistor, 5 pins" "" "SOT25" 35000 15000 11800 -11000 3 100 ""]
+(
+	Pad[0 -800 0 800 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[7800 -800 7800 800 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[7800 -9000 7800 -7400 2400 3000 3000 "3" "3" "square"]
+	Pad[3900 -9000 3900 -7400 2400 3000 3000 "4" "4" "square"]
+	Pad[0 -9000 0 -7400 2400 3000 3000 "5" "5" "square"]
+	ElementLine [-2000 -11000 -2000 2900 1000]
+	ElementLine [-2000 2900 9800 2900 1000]
+	ElementLine [9800 2900 9800 -11000 1000]
+	ElementLine [9800 -11000 -2000 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 6 pins" "" "SOT26" 51100 15000 11800 -11000 3 100 ""]
+(
+	Pad[0 -800 0 800 2400 3000 3000 "1" "1" "square,edge2"]
+	Pad[3900 -800 3900 800 2400 3000 3000 "2" "2" "square,edge2"]
+	Pad[7800 -800 7800 800 2400 3000 3000 "3" "3" "square,edge2"]
+	Pad[7800 -9000 7800 -7400 2400 3000 3000 "4" "4" "square"]
+	Pad[3900 -9000 3900 -7400 2400 3000 3000 "5" "5" "square"]
+	Pad[0 -9000 0 -7400 2400 3000 3000 "6" "6" "square"]
+	ElementLine [-2000 -11000 -2000 2900 1000]
+	ElementLine [-2000 2900 9800 2900 1000]
+	ElementLine [9800 2900 9800 -11000 1000]
+	ElementLine [9800 -11000 -2000 -11000 1000]
+
+	)
+
+Element["" "SMT transistor, 5 pins" "" "SOT325" 9900 65000 8600 -9400 3 100 ""]
+(
+	Pad[0 -1000 0 1000 1500 3000 2100 "1" "1" "square,edge2"]
+	Pad[5100 -1000 5100 1000 1500 3000 2100 "2" "2" "square,edge2"]
+	Pad[5100 -8000 5100 -6000 1500 3000 2100 "3" "3" "square"]
+	Pad[2600 -8000 2600 -6000 1500 3000 2100 "4" "4" "square"]
+	Pad[0 -8000 0 -6000 1500 3000 2100 "5" "5" "square"]
+	ElementLine [-1400 -9400 -1400 2500 1000]
+	ElementLine [-1400 2500 6600 2500 1000]
+	ElementLine [6600 2500 6600 -9400 1000]
+	ElementLine [6600 -9400 -1400 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 6 pins" "" "SOT326" 22400 65000 8600 -9400 3 100 ""]
+(
+	Pad[0 -1000 0 1000 1500 3000 2100 "1" "1" "square,edge2"]
+	Pad[2600 -1000 2600 1000 1500 3000 2100 "2" "2" "square,edge2"]
+	Pad[5100 -1000 5100 1000 1500 3000 2100 "3" "3" "square,edge2"]
+	Pad[5100 -8000 5100 -6000 1500 3000 2100 "4" "4" "square"]
+	Pad[2600 -8000 2600 -6000 1500 3000 2100 "5" "5" "square"]
+	Pad[0 -8000 0 -6000 1500 3000 2100 "6" "6" "square"]
+	ElementLine [-1400 -9400 -1400 2500 1000]
+	ElementLine [-1400 2500 6600 2500 1000]
+	ElementLine [6600 2500 6600 -9400 1000]
+	ElementLine [6600 -9400 -1400 -9400 1000]
+
+	)
+
+Element["" "SMT transistor, 4 pins" "" "SOT89" 8900 45000 17300 -16400 3 100 ""]
+(
+	Pad[0 -1200 0 1200 3700 3000 4300 "1" "1" "square,edge2"]
+	Pad[6100 -1200 6100 1200 3700 3000 4300 "2" "2" "square,edge2"]
+	Pad[12200 -1200 12200 1200 3700 3000 4300 "3" "3" "square,edge2"]
+	Pad[3100 -12200 9100 -12200 6100 3000 6700 "4" "4" "square"]
+	ElementLine [-3000 -16400 -3000 4300 1000]
+	ElementLine [-3000 4300 15300 4300 1000]
+	ElementLine [15300 4300 15300 -16400 1000]
+	ElementLine [15300 -16400 -3000 -16400 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/util/pcblib-map/trh2.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/trh2.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/trh2.pcb	(revision 18980)
@@ -0,0 +1,928 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 330000 150000]
+
+Grid[10000.0 0 0 1]
+Cursor[10000 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[330000 150000 7874 4000 0 3150 "" ""]
+
+Element["" "Crystals" "" "HC49" 20000 40000 -11000 5000 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 2800 "1" "1" "square"]
+	Pin[0 -20000 6000 3000 6600 2800 "2" "2" ""]
+	ElementLine [-5000 -20000 -5000 0 2000]
+	ElementLine [5000 -20000 5000 0 2000]
+	ElementArc [0 -20000 5000 5000 180 180 2000]
+	ElementArc [0 0 5000 5000 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49U" 50000 39200 -15100 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square"]
+	Pin[0 -19200 6000 3000 6600 3200 "2" "2" ""]
+	ElementLine [-9100 -22300 -9100 3000 2000]
+	ElementLine [9200 -22300 9200 3000 2000]
+	ElementArc [0 -22300 9100 9100 180 180 2000]
+	ElementArc [0 3000 9100 9100 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49UH" 180000 50000 -67500 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square,edge2"]
+	Pin[0 -19200 6000 3000 6600 3200 "2" "2" "edge2"]
+	ElementLine [-61500 -31400 -61500 12100 2000]
+	ElementLine [-61500 -31400 -10000 -31400 2000]
+	ElementLine [-10000 -31400 -10000 12100 2000]
+	ElementLine [-61500 12100 -10000 12100 2000]
+
+	)
+
+Element["" "Crystals" "" "HC51U" 90000 68500 -23600 13600 1 100 ""]
+(
+	Pin[0 0 8000 3000 8600 4000 "1" "1" "square"]
+	Pin[0 -48500 8000 3000 8600 4000 "2" "2" ""]
+	ElementLine [-17600 -44500 -17600 -4000 2000]
+	ElementLine [17600 -44500 17600 -4000 2000]
+	ElementArc [0 -44500 17600 17600 180 180 2000]
+	ElementArc [0 -4000 17600 17600 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC51UH" 290000 70000 -103500 13600 1 100 ""]
+(
+	Pin[0 0 8000 3000 8600 4000 "1" "1" "square,edge2"]
+	Pin[0 -48500 8000 3000 8600 4000 "2" "2" "edge2"]
+	ElementLine [-97500 -62100 -97500 13600 2000]
+	ElementLine [-97500 -62100 -20000 -62100 2000]
+	ElementLine [-20000 -62100 -20000 13600 2000]
+	ElementLine [-97500 13600 -20000 13600 2000]
+
+	)
+
+Element["" "LED, size in mm (pin 1 is +, 2 is -)" "" "LED3" 30000 125000 7000 -10000 1 100 ""]
+(
+	Pin[0 5000 6500 3000 7100 4300 "1" "1" "square"]
+	Pin[0 -5000 6500 3000 7100 4300 "2" "2" ""]
+	ElementArc [0 0 5900 5900 135 90 1000]
+	ElementArc [0 0 5900 5900 315 90 1000]
+	ElementArc [0 0 7900 7900 135 90 1000]
+	ElementArc [0 0 7900 7900 315 90 1000]
+
+	)
+
+Element["" "LED, size in mm (pin 1 is +, 2 is -)" "" "LED5" 70000 125000 7000 -10000 1 100 ""]
+(
+	Pin[0 5000 6500 3000 7100 4300 "1" "1" "square"]
+	Pin[0 -5000 6500 3000 7100 4300 "2" "2" ""]
+	ElementArc [0 0 11800 11800 90 360 1000]
+	ElementArc [0 0 13800 13800 90 360 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO220ACSTAND" 170000 142000 36000 -17000 3 100 ""]
+(
+	Pin[0 -12000 8000 3000 8600 4000 "1" "1" "square,edge2"]
+	Pin[20000 -12000 8000 3000 8600 4000 "2" "2" "edge2"]
+	ElementLine [-10000 -22000 -10000 -4000 2000]
+	ElementLine [-10000 -4000 30000 -4000 2000]
+	ElementLine [30000 -4000 30000 -22000 2000]
+	ElementLine [30000 -22000 -10000 -22000 2000]
+	ElementLine [-10000 -17000 30000 -17000 1000]
+	ElementLine [2500 -22000 2500 -17000 1000]
+	ElementLine [17500 -22000 17500 -17000 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO247_2" 230000 140000 59400 -22000 3 100 ""]
+(
+	Pin[0 -14000 10000 3000 10600 6000 "1" "1" "square,edge2"]
+	Pin[43800 -14000 10000 3000 10600 6000 "2" "2" "edge2"]
+	ElementLine [-9600 -27000 -9600 -6000 2000]
+	ElementLine [-9600 -6000 53400 -6000 2000]
+	ElementLine [53400 -6000 53400 -27000 2000]
+	ElementLine [53400 -27000 -9600 -27000 2000]
+	ElementLine [-9600 -22000 53400 -22000 1000]
+	ElementLine [14400 -27000 14400 -22000 1000]
+	ElementLine [29400 -27000 29400 -22000 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[0 100000 330000 100000 1000 4000 "clearline"]
+	Line[130000 100000 130000 150000 1000 4000 "clearline"]
+	Text[310000 40000 0 200 "HC" "clearline"]
+	Text[100000 120000 0 200 "LED" "clearline"]
+	Text[300000 120000 0 200 "TO" "clearline"]
+)
Index: tags/2.0.1/util/pcblib-map/trh3.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/trh3.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/trh3.pcb	(revision 18980)
@@ -0,0 +1,1096 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 270000 240000]
+
+Grid[10000.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[270000 240000 7874 4000 0 3150 "" ""]
+
+Element["" "Crystals" "" "HC49U_3" 30000 50000 -15100 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square"]
+	Pin[0 -9600 6000 3000 6600 3200 "2" "2" ""]
+	Pin[0 -19200 6000 3000 6600 3200 "3" "3" ""]
+	ElementLine [-9100 -22300 -9100 3000 2000]
+	ElementLine [9200 -22300 9200 3000 2000]
+	ElementArc [0 -22300 9100 9100 180 180 2000]
+	ElementArc [0 3000 9100 9100 0 180 2000]
+
+	)
+
+Element["" "Crystals" "" "HC49U_3H" 110000 50000 -67500 12100 1 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3200 "1" "1" "square,edge2"]
+	Pin[0 -9600 6000 3000 6600 3200 "2" "2" "edge2"]
+	Pin[0 -19200 6000 3000 6600 3200 "3" "3" "edge2"]
+	ElementLine [-61500 -31400 -61500 12100 2000]
+	ElementLine [-61500 -31400 -10000 -31400 2000]
+	ElementLine [-10000 -31400 -10000 12100 2000]
+	ElementLine [-61500 12100 -10000 12100 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126" 140000 220000 -2000 -12000 1 100 ""]
+(
+	Pin[1000 0 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 0 8000 3000 8600 5200 "2" "2" ""]
+	Pin[19000 0 8000 3000 8600 5200 "3" "3" ""]
+	Pin[10000 -43000 13000 3000 13600 11000 "4" "4" ""]
+	ElementLine [0 -10000 0 0 3000]
+	ElementLine [10000 -10000 10000 0 3000]
+	ElementLine [20000 -10000 20000 0 3000]
+	ElementLine [-5000 -10000 25000 -10000 2000]
+	ElementLine [25000 -53000 25000 -10000 2000]
+	ElementLine [-5000 -53000 25000 -53000 2000]
+	ElementLine [-5000 -53000 -5000 -10000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126S" 199000 220000 -2000 -12000 1 100 ""]
+(
+	Pin[1000 0 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[19000 0 8000 3000 8600 5200 "3" "3" ""]
+	Pin[10000 -43000 13000 3000 13600 11000 "4" "4" ""]
+	ElementLine [0 -10000 0 0 3000]
+	ElementLine [10000 -10000 10000 10000 3000]
+	ElementLine [20000 -10000 20000 0 3000]
+	ElementLine [-5000 -10000 25000 -10000 2000]
+	ElementLine [25000 -53000 25000 -10000 2000]
+	ElementLine [-5000 -53000 25000 -53000 2000]
+	ElementLine [-5000 -53000 -5000 -10000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO126SW" 40000 110000 7000 -17000 1 100 ""]
+(
+	Pin[0 -1000 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[10000 -10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[0 -19000 8000 3000 8600 5200 "3" "3" ""]
+	ElementLine [5000 -10000 10000 -10000 3000]
+	ElementLine [-5000 -25000 -5000 5000 2000]
+	ElementLine [-5000 -25000 5000 -25000 2000]
+	ElementLine [5000 -25000 5000 5000 2000]
+	ElementLine [-5000 5000 5000 5000 2000]
+	ElementLine [-5000 -5000 5000 -5000 1000]
+	ElementLine [-5000 -15000 5000 -15000 1000]
+
+	)
+
+Element["" "Transistor" "" "TO126W" 70000 110000 7000 4000 1 100 ""]
+(
+	Pin[0 -1000 8000 3000 8600 5200 "1" "1" "square"]
+	Pin[0 -10000 8000 3000 8600 5200 "2" "2" ""]
+	Pin[0 -19000 8000 3000 8600 5200 "3" "3" ""]
+	ElementLine [-5000 -25000 -5000 5000 2000]
+	ElementLine [-5000 -25000 5000 -25000 2000]
+	ElementLine [5000 -25000 5000 5000 2000]
+	ElementLine [-5000 5000 5000 5000 2000]
+
+	)
+
+Element["" "Transistor" "" "TO18" 165000 30000 6000 7000 0 100 ""]
+(
+	Pin[0 -5000 5500 3000 6100 3500 "1" "1" ""]
+	Pin[-5000 0 5500 3000 6100 3500 "2" "2" ""]
+	Pin[0 5000 5500 3000 6100 3500 "3" "3" ""]
+	ElementLine [6700 -7900 9400 -10600 1000]
+	ElementLine [7300 -7300 10000 -10000 1000]
+	ElementLine [7900 -6700 10600 -9400 1000]
+	ElementLine [9400 -10600 10600 -9400 1000]
+	ElementArc [0 0 9800 9800 0 360 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO218" 224000 121900 -21000 -58700 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-26000 8800 -6000 8800 2000]
+	ElementLine [-6000 -52700 -6000 8800 2000]
+	ElementLine [-26000 -52700 -6000 -52700 2000]
+	ElementLine [-26000 -52700 -26000 8800 2000]
+	ElementLine [-21000 -52700 -21000 8800 1000]
+	ElementLine [-26000 -14400 -21000 -14400 1000]
+	ElementLine [-26000 -29400 -21000 -29400 1000]
+
+	)
+
+Element["" "Transistor" "" "TO220" 90000 220000 -15000 -23000 1 100 ""]
+(
+	Pin[-10000 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 0 9000 3000 9600 6000 "2" "2" ""]
+	Pin[10000 0 9000 3000 9600 6000 "3" "3" ""]
+	Pin[0 -67000 15000 3000 15600 13000 "4" "4" ""]
+	ElementLine [-10000 -18000 -10000 0 3000]
+	ElementLine [0 -18000 0 0 3000]
+	ElementLine [10000 -18000 10000 0 3000]
+	ElementLine [-20000 -18000 20000 -18000 2000]
+	ElementLine [20000 -55500 20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [-20000 -55500 -20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [20000 -68000 20000 -55500 2000]
+	ElementLine [18500 -68000 20000 -68000 2000]
+	ElementLine [18500 -75000 18500 -68000 2000]
+	ElementLine [18500 -75000 20000 -75000 2000]
+	ElementLine [20000 -79000 20000 -75000 2000]
+	ElementLine [-20000 -79000 20000 -79000 2000]
+	ElementLine [-20000 -79000 -20000 -75000 2000]
+	ElementLine [-20000 -75000 -18500 -75000 2000]
+	ElementLine [-18500 -75000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -20000 -55500 2000]
+
+	)
+
+Element["" "Transistor" "" "TO220S" 30000 220000 -15000 -23000 1 100 ""]
+(
+	Pin[-10000 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[10000 0 9000 3000 9600 6000 "3" "3" ""]
+	Pin[0 -67000 15000 3000 15600 13000 "4" "4" ""]
+	ElementLine [-10000 -18000 -10000 0 3000]
+	ElementLine [0 -18000 0 10000 3000]
+	ElementLine [10000 -18000 10000 0 3000]
+	ElementLine [-20000 -18000 20000 -18000 2000]
+	ElementLine [20000 -55500 20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [-20000 -55500 -20000 -18000 2000]
+	ElementLine [-20000 -55500 20000 -55500 2000]
+	ElementLine [20000 -68000 20000 -55500 2000]
+	ElementLine [18500 -68000 20000 -68000 2000]
+	ElementLine [18500 -75000 18500 -68000 2000]
+	ElementLine [18500 -75000 20000 -75000 2000]
+	ElementLine [20000 -79000 20000 -75000 2000]
+	ElementLine [-20000 -79000 20000 -79000 2000]
+	ElementLine [-20000 -79000 -20000 -75000 2000]
+	ElementLine [-20000 -75000 -18500 -75000 2000]
+	ElementLine [-18500 -75000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -18500 -68000 2000]
+	ElementLine [-20000 -68000 -20000 -55500 2000]
+
+	)
+
+Element["" "Transistor" "" "TO220SW" 130000 110000 -19000 10000 1 100 ""]
+(
+	Pin[0 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[10000 -10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[0 -20000 9000 3000 9600 6000 "3" "3" ""]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 6000 -30000 2000]
+	ElementLine [6000 -30000 6000 10000 2000]
+	ElementLine [-12000 10000 6000 10000 2000]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 -6000 -30000 2000]
+	ElementLine [-6000 -30000 -6000 10000 2000]
+	ElementLine [-12000 10000 -6000 10000 2000]
+	ElementLine [-12000 -3000 -6000 -3000 1000]
+	ElementLine [-12000 -17000 -6000 -17000 1000]
+	ElementLine [6000 -10000 10000 -10000 3000]
+
+	)
+
+Element["" "Transistor" "" "TO220W" 100000 110000 -19000 10000 1 100 ""]
+(
+	Pin[0 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[0 -10000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[0 -20000 9000 3000 9600 6000 "3" "3" ""]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 6000 -30000 2000]
+	ElementLine [6000 -30000 6000 10000 2000]
+	ElementLine [-12000 10000 6000 10000 2000]
+	ElementLine [-12000 -30000 -12000 10000 2000]
+	ElementLine [-12000 -30000 -6000 -30000 2000]
+	ElementLine [-6000 -30000 -6000 10000 2000]
+	ElementLine [-12000 10000 -6000 10000 2000]
+	ElementLine [-12000 -3000 -6000 -3000 1000]
+	ElementLine [-12000 -17000 -6000 -17000 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO247" 184000 121900 -22000 -59400 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-27000 9600 -6000 9600 2000]
+	ElementLine [-6000 -53400 -6000 9600 2000]
+	ElementLine [-27000 -53400 -6000 -53400 2000]
+	ElementLine [-27000 -53400 -27000 9600 2000]
+	ElementLine [-22000 -53400 -22000 9600 1000]
+	ElementLine [-27000 -14400 -22000 -14400 1000]
+	ElementLine [-27000 -29400 -22000 -29400 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO251" 19000 109000 -9000 -28300 0 100 ""]
+(
+	Pin[-9000 0 7000 3000 7600 4000 "1" "1" "square"]
+	Pin[-9000 -9000 7000 3000 7600 4000 "2" "2" ""]
+	Pin[-9000 -18000 7000 3000 7600 4000 "3" "3" ""]
+	ElementLine [-14000 4200 -4000 4200 2000]
+	ElementLine [-4000 -22300 -4000 4200 2000]
+	ElementLine [-14000 -22300 -4000 -22300 2000]
+	ElementLine [-14000 -22300 -14000 4200 2000]
+	ElementLine [-9000 -22300 -9000 4200 1000]
+	ElementLine [-14000 -1500 -9000 -1500 1000]
+	ElementLine [-14000 -16500 -9000 -16500 1000]
+
+	)
+
+Element["" "diode in TO220" "" "TO264" 264000 121900 -22000 -67900 0 100 ""]
+(
+	Pin[-14000 0 10000 3000 10600 6000 "1" "1" "square"]
+	Pin[-14000 -21900 10000 3000 10600 6000 "2" "2" ""]
+	Pin[-14000 -43800 10000 3000 10600 6000 "3" "3" ""]
+	ElementLine [-27000 18100 -6000 18100 2000]
+	ElementLine [-6000 -61900 -6000 18100 2000]
+	ElementLine [-27000 -61900 -6000 -61900 2000]
+	ElementLine [-27000 -61900 -27000 18100 2000]
+	ElementLine [-22000 -61900 -22000 18100 1000]
+	ElementLine [-27000 -14400 -22000 -14400 1000]
+	ElementLine [-27000 -29400 -22000 -29400 1000]
+
+	)
+
+Element["" "Transistor" "" "TO39" 210000 30000 6000 7000 0 100 ""]
+(
+	Pin[0 -10000 5500 3000 6100 3500 "1" "1" "square"]
+	Pin[-10000 0 5500 3000 6100 3500 "2" "2" ""]
+	Pin[0 10000 5500 3000 6100 3500 "3" "3" ""]
+	ElementLine [12700 -13900 14800 -16000 1000]
+	ElementLine [13300 -13300 15400 -15400 1000]
+	ElementLine [13900 -12700 16000 -14800 1000]
+	ElementLine [16000 -14800 14800 -16000 1000]
+	ElementArc [0 0 18300 18300 0 360 1000]
+
+	)
+
+Element["" "Transistor" "" "TO92" 250000 40000 -13000 -1000 1 100 ""]
+(
+	Pin[0 -20000 7200 3000 7800 4200 "1" "1" "square"]
+	Pin[0 -10000 7200 3000 7800 4200 "2" "2" ""]
+	Pin[0 0 7200 3000 7800 4200 "3" "3" ""]
+	ElementLine [-7000 -17000 -7000 -3000 1000]
+	ElementArc [0 -10000 10000 10000 45 270 1000]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+	Line[0 70000 150000 70000 1000 4000 "clearline"]
+	Line[150000 70000 150000 0 1000 4000 "clearline"]
+	Text[130000 30000 0 200 "HC" "clearline"]
+	Text[250000 190000 0 200 "TO" "clearline"]
+)
Index: tags/2.0.1/util/pcblib-map/trhN.pcb
===================================================================
--- tags/2.0.1/util/pcblib-map/trhN.pcb	(nonexistent)
+++ tags/2.0.1/util/pcblib-map/trhN.pcb	(revision 18980)
@@ -0,0 +1,983 @@
+# release: pcb 20110918
+
+# To read pcb files, the pcb version (or the git source date) must be >= the file version
+FileVersion[20070407]
+
+PCB["" 220000 170000]
+
+Grid[10000.0 0 0 1]
+Cursor[0 0 0.000000]
+PolyArea[3100.006200]
+Thermal[0.500000]
+DRC[1200 900 1000 700 1500 1000]
+Flags("nameonpcb,clearnew,snappin")
+Groups("1,3,4,c:2,5,6,s:7:8")
+Styles["Signal,1000,7874,3150,2000:Power,2000,8661,3937,2000:Fat,8000,13780,4724,2500:Sig-tight,1000,6400,3150,1200"]
+
+Symbol[' ' 1800]
+(
+)
+Symbol['!' 1200]
+(
+	SymbolLine[0 4500 0 5000 800]
+	SymbolLine[0 1000 0 3500 800]
+)
+Symbol['"' 1200]
+(
+	SymbolLine[0 1000 0 2000 800]
+	SymbolLine[1000 1000 1000 2000 800]
+)
+Symbol['#' 1200]
+(
+	SymbolLine[0 3500 2000 3500 800]
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[1500 2000 1500 4000 800]
+	SymbolLine[500 2000 500 4000 800]
+)
+Symbol['$' 1200]
+(
+	SymbolLine[1500 1500 2000 2000 800]
+	SymbolLine[500 1500 1500 1500 800]
+	SymbolLine[0 2000 500 1500 800]
+	SymbolLine[0 2000 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4000 800]
+	SymbolLine[1500 4500 2000 4000 800]
+	SymbolLine[500 4500 1500 4500 800]
+	SymbolLine[0 4000 500 4500 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['%' 1200]
+(
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[1000 2500 1500 2000 800]
+	SymbolLine[500 2500 1000 2500 800]
+	SymbolLine[0 2000 500 2500 800]
+	SymbolLine[0 5000 4000 1000 800]
+	SymbolLine[3500 5000 4000 4500 800]
+	SymbolLine[4000 4000 4000 4500 800]
+	SymbolLine[3500 3500 4000 4000 800]
+	SymbolLine[3000 3500 3500 3500 800]
+	SymbolLine[2500 4000 3000 3500 800]
+	SymbolLine[2500 4000 2500 4500 800]
+	SymbolLine[2500 4500 3000 5000 800]
+	SymbolLine[3000 5000 3500 5000 800]
+)
+Symbol['&' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 3500 1500 2000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[0 2500 2500 5000 800]
+	SymbolLine[500 1000 1000 1000 800]
+	SymbolLine[1000 1000 1500 1500 800]
+	SymbolLine[1500 1500 1500 2000 800]
+	SymbolLine[0 3500 0 4500 800]
+)
+Symbol[''' 1200]
+(
+	SymbolLine[0 2000 1000 1000 800]
+)
+Symbol['(' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+)
+Symbol[')' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['*' 1200]
+(
+	SymbolLine[0 2000 2000 4000 800]
+	SymbolLine[0 4000 2000 2000 800]
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol['+' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[1000 2000 1000 4000 800]
+)
+Symbol[',' 1200]
+(
+	SymbolLine[0 6000 1000 5000 800]
+)
+Symbol['-' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+)
+Symbol['.' 1200]
+(
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['/' 1200]
+(
+	SymbolLine[0 4500 3000 1500 800]
+)
+Symbol['0' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4000 2000 2000 800]
+)
+Symbol['1' 1200]
+(
+	SymbolLine[0 1800 800 1000 800]
+	SymbolLine[800 1000 800 5000 800]
+	SymbolLine[0 5000 1500 5000 800]
+)
+Symbol['2' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[0 5000 2500 2500 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['3' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 2800 1500 2800 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[2000 3300 2000 4500 800]
+	SymbolLine[2000 3300 1500 2800 800]
+	SymbolLine[2000 2300 1500 2800 800]
+)
+Symbol['4' 1200]
+(
+	SymbolLine[0 3500 2000 1000 800]
+	SymbolLine[0 3500 2500 3500 800]
+	SymbolLine[2000 1000 2000 5000 800]
+)
+Symbol['5' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[500 2500 1500 2500 800]
+	SymbolLine[1500 2500 2000 3000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['6' 1200]
+(
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1500 2800 2000 3300 800]
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3300 2000 4500 800]
+)
+Symbol['7' 1200]
+(
+	SymbolLine[500 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 1000 800]
+)
+Symbol['8' 1200]
+(
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3700 0 4500 800]
+	SymbolLine[0 3700 700 3000 800]
+	SymbolLine[700 3000 1300 3000 800]
+	SymbolLine[1300 3000 2000 3700 800]
+	SymbolLine[2000 3700 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 2300 700 3000 800]
+	SymbolLine[0 1500 0 2300 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2300 800]
+	SymbolLine[1300 3000 2000 2300 800]
+)
+Symbol['9' 1200]
+(
+	SymbolLine[500 5000 2000 3000 800]
+	SymbolLine[2000 1500 2000 3000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol[':' 1200]
+(
+	SymbolLine[0 2500 500 2500 800]
+	SymbolLine[0 3500 500 3500 800]
+)
+Symbol[';' 1200]
+(
+	SymbolLine[0 5000 1000 4000 800]
+	SymbolLine[1000 2500 1000 3000 800]
+)
+Symbol['<' 1200]
+(
+	SymbolLine[0 3000 1000 2000 800]
+	SymbolLine[0 3000 1000 4000 800]
+)
+Symbol['=' 1200]
+(
+	SymbolLine[0 2500 2000 2500 800]
+	SymbolLine[0 3500 2000 3500 800]
+)
+Symbol['>' 1200]
+(
+	SymbolLine[0 2000 1000 3000 800]
+	SymbolLine[0 4000 1000 3000 800]
+)
+Symbol['?' 1200]
+(
+	SymbolLine[1000 3000 1000 3500 800]
+	SymbolLine[1000 4500 1000 5000 800]
+	SymbolLine[0 1500 0 2000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 2000 800]
+	SymbolLine[1000 3000 2000 2000 800]
+)
+Symbol['@' 1200]
+(
+	SymbolLine[0 1000 0 4000 800]
+	SymbolLine[0 4000 1000 5000 800]
+	SymbolLine[1000 5000 4000 5000 800]
+	SymbolLine[5000 3500 5000 1000 800]
+	SymbolLine[5000 1000 4000 0 800]
+	SymbolLine[4000 0 1000 0 800]
+	SymbolLine[1000 0 0 1000 800]
+	SymbolLine[1500 2000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 3000 3500 800]
+	SymbolLine[3000 3500 3500 3000 800]
+	SymbolLine[3500 3000 4000 3500 800]
+	SymbolLine[3500 3000 3500 1500 800]
+	SymbolLine[3500 2000 3000 1500 800]
+	SymbolLine[2000 1500 3000 1500 800]
+	SymbolLine[2000 1500 1500 2000 800]
+	SymbolLine[4000 3500 5000 3500 800]
+)
+Symbol['A' 1200]
+(
+	SymbolLine[0 2000 0 5000 800]
+	SymbolLine[0 2000 700 1000 800]
+	SymbolLine[700 1000 1800 1000 800]
+	SymbolLine[1800 1000 2500 2000 800]
+	SymbolLine[2500 2000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['B' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3300 2500 4500 800]
+	SymbolLine[2000 2800 2500 3300 800]
+	SymbolLine[500 2800 2000 2800 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2300 800]
+	SymbolLine[2000 2800 2500 2300 800]
+)
+Symbol['C' 1200]
+(
+	SymbolLine[700 5000 2000 5000 800]
+	SymbolLine[0 4300 700 5000 800]
+	SymbolLine[0 1700 0 4300 800]
+	SymbolLine[0 1700 700 1000 800]
+	SymbolLine[700 1000 2000 1000 800]
+)
+Symbol['D' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1800 1000 2500 1700 800]
+	SymbolLine[2500 1700 2500 4300 800]
+	SymbolLine[1800 5000 2500 4300 800]
+	SymbolLine[0 5000 1800 5000 800]
+	SymbolLine[0 1000 1800 1000 800]
+)
+Symbol['E' 1200]
+(
+	SymbolLine[0 2800 1500 2800 800]
+	SymbolLine[0 5000 2000 5000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+)
+Symbol['F' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[0 2800 1500 2800 800]
+)
+Symbol['G' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[1000 3000 2000 3000 800]
+)
+Symbol['H' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+	SymbolLine[0 3000 2500 3000 800]
+)
+Symbol['I' 1200]
+(
+	SymbolLine[0 1000 1000 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 1000 5000 800]
+)
+Symbol['J' 1200]
+(
+	SymbolLine[700 1000 1500 1000 800]
+	SymbolLine[1500 1000 1500 4500 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 4500 0 4000 800]
+)
+Symbol['K' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3000 2000 1000 800]
+	SymbolLine[0 3000 2000 5000 800]
+)
+Symbol['L' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['M' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 1500 3000 800]
+	SymbolLine[1500 3000 3000 1000 800]
+	SymbolLine[3000 1000 3000 5000 800]
+)
+Symbol['N' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 1000 2500 5000 800]
+	SymbolLine[2500 1000 2500 5000 800]
+)
+Symbol['O' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['P' 1200]
+(
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+)
+Symbol['Q' 1200]
+(
+	SymbolLine[0 1500 0 4500 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1500 1000 800]
+	SymbolLine[1500 1000 2000 1500 800]
+	SymbolLine[2000 1500 2000 4000 800]
+	SymbolLine[1000 5000 2000 4000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[1000 3500 2000 5000 800]
+)
+Symbol['R' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[2500 1500 2500 2500 800]
+	SymbolLine[2000 3000 2500 2500 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[1300 3000 2500 5000 800]
+)
+Symbol['S' 1200]
+(
+	SymbolLine[2000 1000 2500 1500 800]
+	SymbolLine[500 1000 2000 1000 800]
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[0 1500 0 2500 800]
+	SymbolLine[0 2500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['T' 1200]
+(
+	SymbolLine[0 1000 2000 1000 800]
+	SymbolLine[1000 1000 1000 5000 800]
+)
+Symbol['U' 1200]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 1000 2000 4500 800]
+)
+Symbol['V' 1200]
+(
+	SymbolLine[0 1000 1000 5000 800]
+	SymbolLine[1000 5000 2000 1000 800]
+)
+Symbol['W' 1200]
+(
+	SymbolLine[0 1000 0 3000 800]
+	SymbolLine[0 3000 500 5000 800]
+	SymbolLine[500 5000 1500 3000 800]
+	SymbolLine[1500 3000 2500 5000 800]
+	SymbolLine[2500 5000 3000 3000 800]
+	SymbolLine[3000 3000 3000 1000 800]
+)
+Symbol['X' 1200]
+(
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 1000 2500 5000 800]
+)
+Symbol['Y' 1200]
+(
+	SymbolLine[0 1000 1000 3000 800]
+	SymbolLine[1000 3000 2000 1000 800]
+	SymbolLine[1000 3000 1000 5000 800]
+)
+Symbol['Z' 1200]
+(
+	SymbolLine[0 1000 2500 1000 800]
+	SymbolLine[0 5000 2500 1000 800]
+	SymbolLine[0 5000 2500 5000 800]
+)
+Symbol['[' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['\' 1200]
+(
+	SymbolLine[0 1500 3000 4500 800]
+)
+Symbol[']' 1200]
+(
+	SymbolLine[0 1000 500 1000 800]
+	SymbolLine[500 1000 500 5000 800]
+	SymbolLine[0 5000 500 5000 800]
+)
+Symbol['^' 1200]
+(
+	SymbolLine[0 1500 500 1000 800]
+	SymbolLine[500 1000 1000 1500 800]
+)
+Symbol['_' 1200]
+(
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['a' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 4500 800]
+	SymbolLine[2000 4500 2500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['b' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+)
+Symbol['c' 1200]
+(
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 2000 5000 800]
+)
+Symbol['d' 1200]
+(
+	SymbolLine[2000 1000 2000 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+)
+Symbol['e' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[0 4000 2000 4000 800]
+	SymbolLine[2000 4000 2000 3500 800]
+)
+Symbol['f' 1000]
+(
+	SymbolLine[500 1500 500 5000 800]
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[1000 1000 1500 1000 800]
+	SymbolLine[0 3000 1000 3000 800]
+)
+Symbol['g' 1200]
+(
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+)
+Symbol['h' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+)
+Symbol['i' 1000]
+(
+	SymbolLine[0 2000 0 2100 1000]
+	SymbolLine[0 3500 0 5000 800]
+)
+Symbol['j' 1000]
+(
+	SymbolLine[500 2000 500 2100 1000]
+	SymbolLine[500 3500 500 6000 800]
+	SymbolLine[0 6500 500 6000 800]
+)
+Symbol['k' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+	SymbolLine[0 3500 1500 5000 800]
+	SymbolLine[0 3500 1000 2500 800]
+)
+Symbol['l' 1000]
+(
+	SymbolLine[0 1000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['m' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[2000 3500 2500 3000 800]
+	SymbolLine[2500 3000 3000 3000 800]
+	SymbolLine[3000 3000 3500 3500 800]
+	SymbolLine[3500 3500 3500 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['n' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 5000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['o' 1200]
+(
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[2000 3500 2000 4500 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['p' 1200]
+(
+	SymbolLine[500 3500 500 6500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[2500 3500 2500 4500 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[1000 5000 2000 5000 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['q' 1200]
+(
+	SymbolLine[2000 3500 2000 6500 800]
+	SymbolLine[1500 3000 2000 3500 800]
+	SymbolLine[500 3000 1500 3000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[0 3500 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['r' 1200]
+(
+	SymbolLine[500 3500 500 5000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[1000 3000 2000 3000 800]
+	SymbolLine[0 3000 500 3500 800]
+)
+Symbol['s' 1200]
+(
+	SymbolLine[500 5000 2000 5000 800]
+	SymbolLine[2000 5000 2500 4500 800]
+	SymbolLine[2000 4000 2500 4500 800]
+	SymbolLine[500 4000 2000 4000 800]
+	SymbolLine[0 3500 500 4000 800]
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 2000 3000 800]
+	SymbolLine[2000 3000 2500 3500 800]
+	SymbolLine[0 4500 500 5000 800]
+)
+Symbol['t' 1000]
+(
+	SymbolLine[500 1000 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+	SymbolLine[0 2500 1000 2500 800]
+)
+Symbol['u' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+	SymbolLine[2000 3000 2000 4500 800]
+)
+Symbol['v' 1200]
+(
+	SymbolLine[0 3000 1000 5000 800]
+	SymbolLine[2000 3000 1000 5000 800]
+)
+Symbol['w' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[500 5000 1000 5000 800]
+	SymbolLine[1000 5000 1500 4500 800]
+	SymbolLine[1500 3000 1500 4500 800]
+	SymbolLine[1500 4500 2000 5000 800]
+	SymbolLine[2000 5000 2500 5000 800]
+	SymbolLine[2500 5000 3000 4500 800]
+	SymbolLine[3000 3000 3000 4500 800]
+)
+Symbol['x' 1200]
+(
+	SymbolLine[0 3000 2000 5000 800]
+	SymbolLine[0 5000 2000 3000 800]
+)
+Symbol['y' 1200]
+(
+	SymbolLine[0 3000 0 4500 800]
+	SymbolLine[0 4500 500 5000 800]
+	SymbolLine[2000 3000 2000 6000 800]
+	SymbolLine[1500 6500 2000 6000 800]
+	SymbolLine[500 6500 1500 6500 800]
+	SymbolLine[0 6000 500 6500 800]
+	SymbolLine[500 5000 1500 5000 800]
+	SymbolLine[1500 5000 2000 4500 800]
+)
+Symbol['z' 1200]
+(
+	SymbolLine[0 3000 2000 3000 800]
+	SymbolLine[0 5000 2000 3000 800]
+	SymbolLine[0 5000 2000 5000 800]
+)
+Symbol['{' 1200]
+(
+	SymbolLine[500 1500 1000 1000 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[0 3000 500 2500 800]
+	SymbolLine[0 3000 500 3500 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[500 4500 1000 5000 800]
+)
+Symbol['|' 1200]
+(
+	SymbolLine[0 1000 0 5000 800]
+)
+Symbol['}' 1200]
+(
+	SymbolLine[0 1000 500 1500 800]
+	SymbolLine[500 1500 500 2500 800]
+	SymbolLine[500 2500 1000 3000 800]
+	SymbolLine[500 3500 1000 3000 800]
+	SymbolLine[500 3500 500 4500 800]
+	SymbolLine[0 5000 500 4500 800]
+)
+Symbol['~' 1200]
+(
+	SymbolLine[0 3500 500 3000 800]
+	SymbolLine[500 3000 1000 3000 800]
+	SymbolLine[1000 3000 1500 3500 800]
+	SymbolLine[1500 3500 2000 3500 800]
+	SymbolLine[2000 3500 2500 3000 800]
+)
+Attribute("PCB::grid::unit" "mil")
+Via[220000 170000 7874 4000 0 3150 "" ""]
+
+Element["" "Power IC, as in MULTIWATT15" "" "HEPTAWATT" 143900 45000 -19900 -41500 0 100 ""]
+(
+	Pin[6100 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[-13900 -5000 9000 3000 9600 6000 "2" "2" ""]
+	Pin[6100 -10000 9000 3000 9600 6000 "3" "3" ""]
+	Pin[-13900 -15000 9000 3000 9600 6000 "4" "4" ""]
+	Pin[6100 -20000 9000 3000 9600 6000 "5" "5" ""]
+	Pin[-13900 -25000 9000 3000 9600 6000 "6" "6" ""]
+	Pin[6100 -30000 9000 3000 9600 6000 "7" "7" ""]
+	ElementLine [-24900 5400 -6000 5400 2000]
+	ElementLine [-6000 -35500 -6000 5400 2000]
+	ElementLine [-24900 -35500 -6000 -35500 2000]
+	ElementLine [-24900 -35500 -24900 5400 2000]
+	ElementLine [-19900 -35500 -19900 5400 1000]
+	ElementLine [-24900 -7500 -19900 -7500 1000]
+	ElementLine [-24900 -22500 -19900 -22500 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT11" 20000 38000 79500 -21000 3 100 ""]
+(
+	Pin[0 12000 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[6700 -8000 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[13400 12000 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[20100 -8000 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[26800 12000 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[33500 -8000 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[40200 12000 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[46900 -8000 9000 3000 9600 6000 "8" "8" "edge2"]
+	Pin[53600 12000 9000 3000 9600 6000 "9" "9" "edge2"]
+	Pin[60300 -8000 9000 3000 9600 6000 "10" "10" "edge2"]
+	Pin[67000 12000 9000 3000 9600 6000 "11" "11" "edge2"]
+	ElementLine [-6500 -26000 -6500 -6000 2000]
+	ElementLine [-6500 -6000 73500 -6000 2000]
+	ElementLine [73500 -6000 73500 -26000 2000]
+	ElementLine [73500 -26000 -6500 -26000 2000]
+	ElementLine [-6500 -21000 73500 -21000 1000]
+	ElementLine [26000 -26000 26000 -21000 1000]
+	ElementLine [41000 -26000 41000 -21000 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT15" 20000 98000 81000 -21000 3 100 ""]
+(
+	Pin[0 12000 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[5000 -8000 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[10000 12000 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[15000 -8000 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[20000 12000 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[25000 -8000 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[30000 12000 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[35000 -8000 9000 3000 9600 6000 "8" "8" "edge2"]
+	Pin[40000 12000 9000 3000 9600 6000 "9" "9" "edge2"]
+	Pin[45000 -8000 9000 3000 9600 6000 "10" "10" "edge2"]
+	Pin[50000 12000 9000 3000 9600 6000 "11" "11" "edge2"]
+	Pin[55000 -8000 9000 3000 9600 6000 "12" "12" "edge2"]
+	Pin[60000 12000 9000 3000 9600 6000 "13" "13" "edge2"]
+	Pin[65000 -8000 9000 3000 9600 6000 "14" "14" "edge2"]
+	Pin[70000 12000 9000 3000 9600 6000 "15" "15" "edge2"]
+	ElementLine [-5000 -26000 -5000 -6000 2000]
+	ElementLine [-5000 -6000 75000 -6000 2000]
+	ElementLine [75000 -6000 75000 -26000 2000]
+	ElementLine [75000 -26000 -5000 -26000 2000]
+	ElementLine [-5000 -21000 75000 -21000 1000]
+	ElementLine [27500 -26000 27500 -21000 1000]
+	ElementLine [42500 -26000 42500 -21000 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "MULTIWATT8" 20000 164500 81000 -21000 3 100 ""]
+(
+	Pin[0 -14500 9000 3000 9600 6000 "1" "1" "square,edge2"]
+	Pin[10000 -14500 9000 3000 9600 6000 "2" "2" "edge2"]
+	Pin[20000 -14500 9000 3000 9600 6000 "3" "3" "edge2"]
+	Pin[30000 -14500 9000 3000 9600 6000 "4" "4" "edge2"]
+	Pin[40000 -14500 9000 3000 9600 6000 "5" "5" "edge2"]
+	Pin[50000 -14500 9000 3000 9600 6000 "6" "6" "edge2"]
+	Pin[60000 -14500 9000 3000 9600 6000 "7" "7" "edge2"]
+	Pin[70000 -14500 9000 3000 9600 6000 "8" "8" "edge2"]
+	ElementLine [-5000 -26000 -5000 -6000 2000]
+	ElementLine [-5000 -6000 75000 -6000 2000]
+	ElementLine [75000 -6000 75000 -26000 2000]
+	ElementLine [75000 -26000 -5000 -26000 2000]
+	ElementLine [-5000 -21000 75000 -21000 1000]
+	ElementLine [27500 -26000 27500 -21000 1000]
+	ElementLine [42500 -26000 42500 -21000 1000]
+
+	)
+
+Element["" "Crystal oscillator" "" "OSC14" 130000 110000 20000 -17000 0 100 ""]
+(
+	Pin[0 0 5000 3000 5600 2800 "NC" "1" "edge2"]
+	Pin[60000 0 5000 3000 5600 2800 "GND" "2" "edge2"]
+	Pin[60000 -30000 5000 3000 5600 2800 "CLK" "3" "edge2"]
+	Pin[0 -30000 5000 3000 5600 2800 "VCC" "4" "edge2"]
+	ElementLine [-9500 -30000 -9500 9500 1000]
+	ElementLine [0 -39500 60000 -39500 1000]
+	ElementLine [69500 -30000 69500 0 1000]
+	ElementLine [-9500 9500 60000 9500 1000]
+	ElementLine [-4000 -30000 -4000 0 1000]
+	ElementLine [0 -34000 60000 -34000 1000]
+	ElementLine [64000 -30000 64000 0 1000]
+	ElementLine [0 4000 60000 4000 1000]
+	ElementArc [0 -30000 9500 9500 270 90 1000]
+	ElementArc [60000 -30000 9500 9500 180 90 1000]
+	ElementArc [60000 0 9500 9500 90 90 1000]
+	ElementArc [0 -30000 4000 4000 270 90 1000]
+	ElementArc [60000 -30000 4000 4000 180 90 1000]
+	ElementArc [60000 0 4000 4000 90 90 1000]
+	ElementArc [0 0 4000 4000 0 90 1000]
+
+	)
+
+Element["" "Power IC, as in MULTIWATT15" "" "PENTAWATT" 197200 46700 -19900 -39900 0 100 ""]
+(
+	Pin[8500 0 9000 3000 9600 6000 "1" "1" "square"]
+	Pin[-7200 -6700 9000 3000 9600 6000 "2" "2" ""]
+	Pin[8500 -13400 9000 3000 9600 6000 "3" "3" ""]
+	Pin[-7200 -20100 9000 3000 9600 6000 "4" "4" ""]
+	Pin[8500 -26800 9000 3000 9600 6000 "5" "5" ""]
+	ElementLine [-24900 7000 -6000 7000 2000]
+	ElementLine [-6000 -33900 -6000 7000 2000]
+	ElementLine [-24900 -33900 -6000 -33900 2000]
+	ElementLine [-24900 -33900 -24900 7000 2000]
+	ElementLine [-19900 -33900 -19900 7000 1000]
+	ElementLine [-24900 -5900 -19900 -5900 1000]
+	ElementLine [-24900 -20900 -19900 -20900 1000]
+
+	)
+
+Element["" "" "" "" 160000 150000 -12500 -9000 0 100 ""]
+(
+	Pin[13091 9000 9000 5000 9600 3937 "" "4" "edge2,intconn(2)"]
+	Pin[-12500 9000 9000 5000 9600 3937 "" "3" "edge2,intconn(2)"]
+	Pin[13091 -9000 9000 5000 9600 3937 "" "2" "edge2,intconn(1)"]
+	Pin[-12500 -9000 9000 5000 9600 3937 "" "1" "edge2,intconn(1)"]
+	ElementLine [12181 11736 12181 -11886 787]
+	ElementLine [-11441 11736 12181 11736 787]
+	ElementLine [-11441 -11886 -11441 11736 787]
+	ElementLine [-11441 -11886 12181 -11886 787]
+	ElementArc [7815 -8031 2756 2756 90 90 787]
+	ElementArc [7815 -8031 2756 2756 0 90 787]
+	ElementArc [7815 -8031 2756 2756 270 90 787]
+	ElementArc [7815 -8031 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 0 90 787]
+	ElementArc [7815 7717 2756 2756 270 90 787]
+	ElementArc [7815 7717 2756 2756 180 90 787]
+	ElementArc [7815 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 270 90 787]
+	ElementArc [-7933 7717 2756 2756 180 90 787]
+	ElementArc [-7933 7717 2756 2756 90 90 787]
+	ElementArc [-7933 7717 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 180 90 787]
+	ElementArc [-7933 -8031 2756 2756 90 90 787]
+	ElementArc [-7933 -8031 2756 2756 0 90 787]
+	ElementArc [-7933 -8031 2756 2756 270 90 787]
+	ElementArc [-59 -157 6693 6693 270 90 787]
+	ElementArc [-59 -157 6693 6693 180 90 787]
+	ElementArc [-59 -157 6693 6693 90 90 787]
+	ElementArc [-59 -157 6693 6693 0 90 787]
+
+	)
+Layer(1 "component")
+(
+)
+Layer(2 "solder")
+(
+)
+Layer(3 "comp-GND")
+(
+)
+Layer(4 "comp-power")
+(
+)
+Layer(5 "sold-GND")
+(
+)
+Layer(6 "sold-power")
+(
+)
+Layer(7 "signal3")
+(
+)
+Layer(8 "outline")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
+(
+)
Index: tags/2.0.1/util/pcblib-param.cgi
===================================================================
--- tags/2.0.1/util/pcblib-param.cgi	(nonexistent)
+++ tags/2.0.1/util/pcblib-param.cgi	(revision 18980)
@@ -0,0 +1,480 @@
+#!/bin/bash
+
+ulimit -t 5
+ulimit -v 80000
+
+# read the config
+. /etc/pcblib.cgi.conf
+CGI=$CGI_param
+
+# import the lib
+. $pcb_rnd_util/cgi_common.sh
+
+gen()
+{
+	cd $gendir
+	params=`echo $QS_cmd | sed "s/.*[(]//;s/[)]//" `
+	./$gen "$params"
+}
+
+help_params()
+{
+awk  -v "CGI=$CGI" "$@" '
+BEGIN {
+	prm=0
+	q="\""
+	fp_base=fp
+	sub("[(].*", "", fp_base)
+	thumbsize=1
+}
+
+function urlencode(s)
+{
+	gsub("[#]", "%23", s)
+	return s
+}
+
+function proc_include(fn)
+{
+	close(fn)
+	while(getline < fn)
+		proc_line()
+	close(fn)
+}
+
+function proc_line()
+{
+	if (/^[^\"]*@@include/) {
+		proc_include(gendir $2)
+		return
+	}
+
+	if ((match($0, "@@desc") || match($0, "@@params") || match($0, "@@purpose") || match($0, "@@example"))) {
+		txt=$0
+		key=substr($0, RSTART, RLENGTH)
+		sub(".*" key "[ \t]*", "", txt)
+		HELP[key] = HELP[key] " " txt
+		next
+	}
+
+	if (/@@thumbsize/) {
+		sub(".*@@thumbsize", "", $0)
+		if ($1 ~ ":") {
+			sub("^:", "", $1)
+			PDATA[$1,"thumbsize"] = $2
+		}
+		else
+			thumbsize=$1
+		return
+	}
+
+	if (/@@thumbnum/) {
+		sub(".*@@thumbnum", "", $0)
+		if ($1 ~ ":") {
+			sub("^:", "", $1)
+			PDATA[$1,"thumbnum"] = $2
+		}
+		return
+	}
+
+	if (/@@param:/) {
+		sub(".*@@param:", "", $0)
+		p=$1
+		sub(p "[\t ]*", "", $0)
+		PARAM[prm] = p 
+		PDESC[prm] = $0
+		prm++
+		return
+	}
+
+# build PPROP[paramname,propname], e.g. PPROP[pin_mask, dim]=1
+	if (/@@optional:/ || /@@dim:/ || /@@bool:/) {
+		key = $0
+		sub("^.*@@", "", key)
+		val = key
+		sub(":.*", "", key)
+		sub("^[^:]*:", "", val)
+		PPROP[val,key] = 1
+		return
+	}
+
+# build PDATA[paramname,propname], e.g. PDATA[pin_mask, default]=123
+	if ((/@@default:/) || (/@@preview_args:/)) {
+		key = $1
+
+		txt = $0
+		txt = substr(txt, length(key)+1, length(txt))
+		sub("^[ \t]*", "", txt)
+
+		sub("^.*@@", "", key)
+		val = key
+		sub(":.*", "", key)
+		sub("^[^:]*:", "", val)
+		PDATA[val,key] = txt
+		return
+	}
+
+# build:
+#  PDATAK[paramname,n]=key (name of the value)
+#  PDATAV[paramname,n]=description (of the given value)
+#  PDATAN[paramname]=n number of parameter values
+	if (/@@enum:/) {
+		key = $1
+
+		txt = $0
+		txt = substr(txt, length(key)+1, length(txt))
+		sub("^[ \t]*", "", txt)
+
+		sub("^.*@@enum:", "", key)
+		val = key
+		sub(":.*", "", key)
+		sub("^[^:]*:", "", val)
+		idx = int(PDATAN[key])
+		PDATAK[key,idx] = val
+		PDATAV[key,idx] = txt
+		PDATAN[key]++
+		return
+	}
+}
+
+{ proc_line() }
+
+function thumb(prv, gthumbsize, lthumbsize, thumbnum    ,lnk,lnk_gen, thumbsize,ann)
+{
+	if (lthumbsize != "")
+		thumbsize = lthumbsize
+	else
+		thumbsize = gthumbsize
+	if (!thumbnum)
+		ann="&annotation=none"
+	lnk=q CGI "?cmd=" prv "&output=png&grid=none" ann "&thumb=" thumbsize q
+	lnk_gen=q CGI "?cmd=" prv q
+	print "<a href=" lnk_gen ">"
+	print "<img src=" lnk ">"
+	print "</a>"
+}
+
+END {
+	if (header) {
+		print "<b>" HELP["@@purpose"] "</b>"
+		print "<p>"
+		print HELP["@@desc"]
+	}
+
+	if (content)
+		print "<h4>" content "</h4>"
+
+	if ((print_params) && (HELP["@@params"] != ""))
+		print "<p>Ordered list (positions): " HELP["@@params"]
+
+
+	if (content) {
+		print "<table border=1 cellspacing=0 cellpadding=10>"
+		print "<tr><th align=left>name <th align=left>man<br>dat<br>ory<th align=left>description <th align=left>value (bold: default)"
+		for(p = 0; p < prm; p++) {
+			name=PARAM[p]
+			print "<tr><td>" name
+			if (PPROP[name, "optional"])
+				print "<td> &nbsp;"
+			else
+				print "<td> yes"
+			print "<td>" PDESC[p]
+			print "<td>"
+			vdone=0
+			if (PDATAN[name] > 0) {
+				print "<table border=1 cellpadding=10 cellspacing=0>"
+				for(v = 0; v < PDATAN[name]; v++) {
+					print "<tr><td>"
+					isdef = (PDATA[name, "default"] == PDATAK[name, v])
+					if (isdef)
+						print "<b>"
+					print PDATAK[name, v]
+					if (isdef)
+						print "</b>"
+
+					print "<td>" PDATAV[name, v]
+					if (PDATA[name, "preview_args"] != "") {
+						prv= fp_base "(" PDATA[name, "preview_args"] "," name "=" PDATAK[name, v] ")"
+						print "<td>"
+						thumb(prv, thumbsize, PDATA[name, "thumbsize"], PDATA[name, "thumbnum"])
+					}
+				}
+				print "</table>"
+				vdone++
+			}
+			if (PPROP[name, "dim"]) {
+				print "Dimension: a number with an optional unit (mm or mil, default is mil)"
+				if (PDATA[name, "default"] != "")
+					print "<br>Default: <b>" PDATA[name, "default"] "</b>"
+				vdone++
+			}
+			if (PPROP[name, "bool"]) {
+				print "Boolean: yes/no, true/false, 1/0"
+				if (PDATA[name, "default"] != "")
+					print "; Default: <b>" PDATA[name, "default"] "</b>"
+				if (PDATA[name, "preview_args"] != "") {
+					print "<br>"
+					print "<table border=0>"
+					print "<tr><td>true:<td>"
+					thumb(fp_base "(" PDATA[name, "preview_args"] "," name "=" 1 ")", thumbsize, PDATA[name, "thumbsize"], PDATA[name, "thumbnum"])
+					print "<td>false:<td>"
+					thumb(fp_base "(" PDATA[name, "preview_args"] "," name "=" 0 ")", thumbsize, PDATA[name, "thumbsize"], PDATA[name, "thumbnum"])
+					print "</table>"
+				}
+			}
+			if (!vdone)
+				print "&nbsp;"
+		}
+		print "</table>"
+	}
+
+	if (footer) {
+		print "<h3>Example</h3>"
+		print "<a href=" q CGI "?cmd=" urlencode(HELP["@@example"]) q ">"
+		print HELP["@@example"]
+		print "</a>"
+		print "</body></html>"
+	}
+}
+'
+}
+
+help()
+{
+	local incl n
+	echo "
+<html>
+<body>
+<h1> pcblib-param help for $QS_cmd() </h1>
+"
+
+	incl=`tempfile`
+
+
+# generate the table
+	help_params -v "fp=$QS_cmd" -v "header=1" -v "content=$gen parameters" -v "print_params=1" -v "gendir=$gendir" < $gendir/$gen
+
+# generate the footer
+	help_params -v "fp=$QS_cmd" -v "footer=1" -v "gendir=$gendir" < $gendir/$gen 2>/dev/null
+
+}
+
+list_gens()
+{
+	awk -v "CGI=$CGI" '
+		BEGIN {
+			q="\""
+		}
+		/@@purpose/ {
+			sub(".*@@purpose", "", $0)
+			PURPOSE[FILENAME] = PURPOSE[FILENAME] $0
+			next
+		}
+		/@@example/ {
+			sub(".*@@example", "", $0)
+			EXAMPLE[FILENAME] = EXAMPLE[FILENAME] $0
+			next
+		}
+
+		/@@params/ {
+			sub(".*@@params", "", $0)
+			PARAMS[FILENAME] = PARAMS[FILENAME] $0
+			next
+		}
+
+		function urlencode(s)
+		{
+			gsub("[#]", "%23", s)
+			return s
+		}
+
+		END {
+			for(fn in PURPOSE) {
+				gn=fn
+				sub(".*/", "", gn)
+				params=PARAMS[fn]
+				sub("^[ \t]*", "", params)
+				sub("[ \t]*$", "", params)
+				print "<li> <a href=" q CGI "?cmd=" urlencode(EXAMPLE[fn]) q ">" gn "(<small>" params "</small>) </a> - " PURPOSE[fn]
+				print "- <a href=" q CGI "?cmd=" gn "&output=help"  q "> HELP </a>"
+			}
+		}
+	' $gendir/*
+}
+
+qs=`echo "$QUERY_STRING" | tr "&" "\n"`
+
+for n in $qs
+do
+	exp="QS_$n"
+	export $exp
+done
+
+export QS_cmd=`echo "$QS_cmd" | url_decode`
+
+if test -z "$QS_cmd"
+then
+	export QS_cmd='connector(2,3)'
+	export QS_diamond=1
+	gen=connector
+else
+	gen=`awk -v "n=$QS_cmd" '
+	BEGIN {
+		sub("[(].*", "", n)
+		gsub("[^a-zA-Z0-9_]", "", n)
+		print n
+	}
+	'`
+	
+	ptmp=`grep "@@purpose" $gendir/$gen`
+	if test -z "$ptmp"
+	then
+		error "Invalid generator \"$gen\" (file)"
+	fi
+fi
+
+
+if test "$QS_output" = "help"
+then
+	echo "Content-type: text/html"
+	echo ""
+	help
+	exit
+fi
+
+fptext=`gen`
+if test ! "$?" = 0
+then
+	echo "Content-type: text/plain"
+	echo ""
+	echo "Error generating the footprint:"
+	gen 2>&1 | grep -i error
+	exit
+fi
+
+if test "$QS_output" = "text"
+then
+	echo "Content-type: text/plain"
+	echo ""
+	gen
+	exit
+fi
+
+if test "$QS_output" = "png"
+then
+	cgi_png
+	exit
+fi
+
+echo "Content-type: text/html"
+echo ""
+
+echo "<html>"
+echo "<body>"
+echo "<H1> pcblib-param test page </H1>"
+echo '
+
+<table border=1 cellpadding=10 cellspacing=0>
+<tr><td bgcolor="lightgrey">
+<i>
+"Do you remember the good old days? When I was
+<br> young, I said <b>footprint=CONNECTOR 2 13</b>
+<br> in gschem and got a 2*13 pin connector in PCB."</i>
+</table>
+
+<br> &nbsp;<br> &nbsp;
+<p>
+
+<table border=0  cellpadding=10 cellspacing=10>
+<tr>
+<td valign=top width=40%>
+<h3> Syntax </h3>
+<p>
+In <a href="http://repo.hu/projects/pcb-rnd">pcb-rnd</a>,
+automatic footprint generation on the fly is called "parametric
+footprints". It is a smaller and more generic infrastructure compared
+to the m4 footprints in pcb. The goal was to fix three problems.
+<ul>
+	<li> 1. Languages: m4 should not be mandatory for footprint generators - the user should be free to choose any language
+	<li> 2. Simplicity: references to m4 should not be hardwired in pcb, gsch2pcb and gsch2pcb.scm, but footprint generation should be generic, transparent and external
+	<li> 3. Unambiguity: gsch2pcb should not be guessing whether to use file elements or call a generator. Instead of complex heuristics, there should be a simple, distinct syntax for parametric footprints.
+</ul>
+<p>
+The new syntax is that if a footprint attribute contains parenthesis, it is
+a parametric footprint, else it is a file footprint. Parametric footprints
+are sort of a function call. The actual syntax is similar to the one in
+<a href="http://www.openscad.org"> openscad </a>:
+parameters are separated by commas, and they are either positional (value)
+or named (name=value).
+<p>
+For example a simple pin-grid
+connector has the "prototype" of <i>connector(nx, ny, spacing)</i>, where
+nx and ny are the number of pins needed in X and Y directions, spacing is
+the distance between pin centers, with a default of 100 mil. The following
+calls will output the same 2*3 pin, 100 mil footprint:
+<ul>
+	<li> connector(2, 3)
+	<li> connector(2, 3, 100)
+	<li> connector(nx=2, ny=3, spacing=100)
+	<li> connector(spacing=100, nx=2, ny=3)
+	<li> connector(ny=3, spacing=100, nx=2)
+</ul>
+
+<td> &nbsp;&nbsp;&nbsp;
+<td valign=top bgcolor="#eefeee">
+<h3>Generators available</h3>
+<ul>
+'
+list_gens
+echo '
+</ul>
+</table>
+'
+
+
+echo "<h2> Try it online </h2>"
+echo "<b>source:</b>"
+
+echo "<form action=\"$CGI\" method=get>"
+echo "<textarea id=\"cmd\" name=\"cmd\" cols=80 rows=3>$QS_cmd</textarea>"
+echo "<ul>"
+echo "	<li><input type=\"checkbox\" name=\"mm\" value=\"1\" `checked $QS_mm`> draw grid in mm"
+echo "	<li><input type=\"checkbox\" name=\"photo\" value=\"1\" `checked $QS_photo`> draw in \"photo mode\""
+echo "	<li><input type=\"checkbox\" name=\"diamond\" value=\"1\" `checked $QS_diamond`> diamond at origin"
+echo "	<li><input type=\"checkbox\" name=\"pins\" value=\"1\" `checked $QS_pins`> annotate pin names"
+echo "	<li><input type=\"checkbox\" name=\"dimname\" value=\"1\" `checked $QS_dimname`> annotate dimension names"
+echo "	<li><input type=\"checkbox\" name=\"dimvalue\" value=\"1\" `checked $QS_dimvalue`> annotate dimension values (in grid units)"
+echo "	<li><input type=\"checkbox\" name=\"background\" value=\"1\" `checked $QS_background`> lighten annotataion background"
+echo "</ul>"
+echo "<p>"
+echo "<input type=\"submit\" value=\"Generate my footprint!\">"
+echo "</form>"
+
+
+
+QS_format=${QS_cmd##*_}
+QS_cmd_=${QS_cmd%%_*}
+
+if test ! -z "$QS_cmd"
+then
+echo "<h2> Result </h2>"
+	echo "<h3> $QS_cmd </H3>"
+
+	echo "<table border=0>"
+	echo "<tr><td valign=top>"
+	echo "<img src=\"$CGI?$QUERY_STRING&output=png\">"
+
+	echo "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
+
+	echo "<td valign=top>"
+	echo "<pre>"
+	echo "$fptext"
+	echo "</pre>"
+	echo "<p>Downloads:"
+	echo "<br> <a href=\"$CGI?$QUERY_STRING&output=text\">footprint file</a>"
+	echo "</table>"
+fi
+
+
+echo "</body>"
+echo "</html>"

Property changes on: tags/2.0.1/util/pcblib-param.cgi
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib-static.cgi
===================================================================
--- tags/2.0.1/util/pcblib-static.cgi	(nonexistent)
+++ tags/2.0.1/util/pcblib-static.cgi	(revision 18980)
@@ -0,0 +1,237 @@
+#!/bin/bash
+
+ulimit -t 5
+ulimit -v 80000
+
+# read the config
+. /etc/pcblib.cgi.conf
+CGI=$CGI_static
+
+# import the lib
+. $pcb_rnd_util/cgi_common.sh
+
+find_fp()
+{
+	awk -v "fp=$QS_fp" -v "fpdir=$fpdir" '
+		BEGIN {
+			fp=tolower(fp)
+		}
+		($1 == "S") {
+			n=tolower($2)
+			sub("^.*/", "", n)
+			sub(".fp$", "", n)
+			sub(".ele$", "", n)
+			if (n == fp) {
+				print fpdir $2
+				exit
+			}
+		}
+	' < $sdir/cache
+}
+
+list_fps()
+{
+	find $fpdir | awk -v "fpdir=$fpdir" -v "CGI=$CGI" '
+		/.svn/ { next }
+		/parametric/ { next }
+
+		{
+			name=$0
+			sub(fpdir, "", name)
+			if (!(name ~ "/"))
+				next
+			dir=name
+			fn=name
+			sub("/.*", "", dir)
+			sub("^[^/]*/", "", fn)
+			vfn = fn
+			sub(".fp$", "", vfn)
+
+			LLEN[dir] += length(vfn)
+			
+			vfn = "<a href=" q CGI "?fp=" vfn q ">" vfn "</a>"
+			
+			if (LLEN[dir] > 8) {
+				LLEN[dir] = 0
+				sep = "<br>"
+			}
+			else
+				sep = "&nbsp;"
+			if (DIR[dir] != "")
+				DIR[dir] = DIR[dir] sep vfn
+			else
+				DIR[dir] = vfn
+		}
+
+		END {
+			print "<table border=1 cellpadding=20>"
+			print "<tr>"
+			for(n in DIR)
+				print "<th>" n
+			print "<tr>"
+			for(n in DIR)
+				print "<td valign=top>" DIR[n]
+			print "</table>"
+		}
+	'
+}
+
+qs=`echo "$QUERY_STRING" | tr "&" "\n"`
+
+for n in $qs
+do
+    exp="QS_$n"
+    export $exp
+done
+
+export QS_cmd=`echo "$QS_cmd" | url_decode`
+
+if test -z "$QS_fp"
+then
+	export QS_fp='TO220'
+	export QS_diamond=1
+	gen=connector
+fi
+
+fn=`find_fp`
+if test ! "$?" = 0
+then
+	echo "Content-type: text/plain"
+	echo ""
+	echo "Error: couldn't find $QS_fp"
+	exit
+fi
+
+fptext=`cat $fn`
+if test ! "$?" = 0
+then
+	echo "Content-type: text/plain"
+	echo ""
+	echo "Error reading footprint file for $QS_fp $fn"
+	exit
+fi
+
+if test "$QS_output" = "text"
+then
+	echo "Content-type: text/plain"
+	echo ""
+	echo "$fptext"
+	exit
+fi
+
+if test "$QS_output" = "png"
+then
+	echo "Content-type: image/png"
+	echo ""
+	cparm=""
+	if test ! -z "$QS_mm"
+	then
+		cparm="$cparm --mm"
+	fi
+	if test ! -z "$QS_diamond"
+	then
+		cparm="$cparm --diamond"
+	fi
+	if test ! -z "$QS_photo"
+	then
+		cparm="$cparm --photo"
+	fi
+	(echo "$fptext" | $fp2anim $cparm; echo 'screenshot "/dev/stdout"') | $animator -H
+	exit
+fi
+
+echo "Content-type: text/html"
+echo ""
+
+echo "<html>"
+echo "<body>"
+echo "<H1> pcblib-static browse page </H1>"
+echo '
+
+<table border=1 cellpadding=10 cellspacing=0>
+<tr><td bgcolor="lightgrey">
+<i>
+An outburst while looking for a powerjack connector <br>
+footprint in the stock library: <br>
+"What on earth is an <i>MSP430F1121 <u>footprint</u></i> and <br>
+why do I need it in the default library?!"</i>
+</table>
+
+<br> &nbsp;<br> &nbsp;
+<p>
+
+<table border=0  cellpadding=10 cellspacing=10>
+<tr>
+<td valign=top width=40%>
+<h3> pcblib </h3>
+<p>
+The default library in <a href="http://repo.hu/projects/pcb-rnd">pcb-rnd</a>
+is called the "pcblib" (lib and newlib are already used by vanilla pcb).
+Pcblib content consists of 
+<a href="http://igor2.repo.hu/cgi-bin/pcblib-param.cgi">parametric (generated) footprints</a>
+and static footprints ("file elements"). This page queries static footprints.
+<p>
+The goal of pcblib is to ship a minimalistic library of the real essential
+parts, targeting small projects and hobbysts. Pcblib assumes users can
+grow their own library by downloading footprints from various online sources
+(e.g. <a href="http://gedasymbols.org"> gedasymbols</a>) or draw their own
+as needed. Thus instead of trying to be a complete collection of footprints
+ever drawn, it tries to collect the common base so that it is likely that 90%
+of pcblib users will use 90% of the footprints in their projects.
+
+<td> &nbsp;&nbsp;&nbsp;
+<td valign=top bgcolor="#eefeee">
+<h3>List of static footprints</h3>
+<ul>
+'
+
+
+list_fps
+
+echo '
+</ul>
+</table>
+'
+
+
+echo "<h2> Search and preview </h2>"
+
+echo "<form action=\"$CGI\" method=get>"
+echo "name: <input name=\"fp\" value=\"$QS_fp\">"
+echo "<ul>"
+echo "	<li><input type=\"checkbox\" name=\"mm\" value=\"1\" `checked $QS_mm`> draw grid in mm"
+echo "	<li><input type=\"checkbox\" name=\"photo\" value=\"1\" `checked $QS_photo`> draw in \"photo mode\""
+echo "	<li><input type=\"checkbox\" name=\"diamond\" value=\"1\" `checked $QS_diamond`> diamond at origin"
+echo "</ul>"
+echo "<p>"
+echo "<input type=\"submit\" value=\"Find my footprint!\">"
+echo "</form>"
+
+
+
+QS_format=${QS_cmd##*_}
+QS_fp_=${QS_cmd%%_*}
+
+if test ! -z "$QS_fp"
+then
+echo "<h2> Result </h2>"
+	echo "<h3> $QS_fp </H3>"
+
+	echo "<table border=0>"
+	echo "<tr><td valign=top>"
+	echo "<img src=\"$CGI?$QUERY_STRING&output=png\">"
+
+	echo "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
+
+	echo "<td valign=top>"
+	echo "<pre>"
+	echo "$fptext"
+	echo "</pre>"
+	echo "<p>Downloads:"
+	echo "<br> <a href=\"$CGI?fp=$QS_fp&output=text\">footprint file</a>"
+	echo "</table>"
+fi
+
+
+echo "</body>"
+echo "</html>"

Property changes on: tags/2.0.1/util/pcblib-static.cgi
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/pcblib.cgi.conf
===================================================================
--- tags/2.0.1/util/pcblib.cgi.conf	(nonexistent)
+++ tags/2.0.1/util/pcblib.cgi.conf	(revision 18980)
@@ -0,0 +1,34 @@
+# shell syntax
+
+### change these to reflect your installation ###
+
+# absolute path to the trunk directory of the pcb-rnd checkout from
+# svn://repo.hu/pcb-rnd/trunk
+pcb_rnd_trunk=/home/igor2/C/pcb-rnd
+
+# CGI url to use for self-reference when generating html pages;
+# this should be a relative URL
+CGI_param=/cgi-bin/pcblib-param.cgi
+CGI_static=/cgi-bin/pcblib-static.cgi
+
+# the executable file name of animator
+animator=/usr/local/bin/animator
+
+# pcblib-static.cgi: absolute path to the map directory that is put
+# online (svn://repo.hu/pcb-rnd/trunk/util/pcblib-map)
+# NOTE: run make there after the checkout or an update
+sdir=/var/www/tmp/pcblib
+
+### these are less likely to change ###
+
+# absolute path to util/ under the trunk checkout
+pcb_rnd_util=$pcb_rnd_trunk/util
+
+# absolute path to the footprint generators - has to end with /
+gendir=$pcb_rnd_trunk/pcblib/parametric/
+
+# absolute path to the root of the static footprint tree - has to end with /
+fpdir=$pcb_rnd_trunk/pcblib/
+
+# absolute path to the fp2anim script
+fp2anim=$pcb_rnd_util/fp2anim

Property changes on: tags/2.0.1/util/pcblib.cgi.conf
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,0 ##
Index: tags/2.0.1/util/workarounds/unwarn.sh
===================================================================
--- tags/2.0.1/util/workarounds/unwarn.sh	(nonexistent)
+++ tags/2.0.1/util/workarounds/unwarn.sh	(revision 18980)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This file is placed in the Public Domain.
+
+# Comment all #warnings in a file given as $1.
+# Useful on systems with CC with no support for #warning.
+
+sed '
+	/^#[ \t]*warning.*/ {
+		s@^@/*@
+		s@$@*/@
+	}
+' < "$1" > "$1.tmp" && mv "$1.tmp" "$1"

Property changes on: tags/2.0.1/util/workarounds/unwarn.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: tags/2.0.1/util/workarounds/unwarn_all.sh
===================================================================
--- tags/2.0.1/util/workarounds/unwarn_all.sh	(nonexistent)
+++ tags/2.0.1/util/workarounds/unwarn_all.sh	(revision 18980)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# This file is placed in the Public Domain.
+
+# Comment all #warnings in all .h and .c files, recursively.
+# Useful on systems with CC with no support for #warning.
+
+action=`echo "$0" | sed "s/_all//"`
+
+find . -name '*.[ch]' -exec $action {} \;

Property changes on: tags/2.0.1/util/workarounds/unwarn_all.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property